This patch should be applied to an un-modified XFree86 version 4.0 source
tree.  It is the first of two patches that will convert the source tree
to XFree86 version 4.0.1.

To apply the patches, run the following from the directory containing your
'xc' directory:

    patch -p0 -E < 4.0-4.0.1.diff1
    patch -p0 -E < 4.0-4.0.1.diff2

-------------------------------------------------------------------------------

Prereq: 4.0

Index: xc/programs/Xserver/hw/xfree86/xf86Version.h
diff -u xc/programs/Xserver/hw/xfree86/xf86Version.h:3.428 xc/programs/Xserver/hw/xfree86/xf86Version.h:3.441
--- xc/programs/Xserver/hw/xfree86/xf86Version.h:3.428	Wed Mar  8 07:14:43 2000
+++ xc/programs/Xserver/hw/xfree86/xf86Version.h	Sat Jul  1 19:35:26 2000
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.428 2000/03/08 15:14:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.441 2000/07/02 02:35:26 dawes Exp $ */
 
-#define XF86_VERSION " 4.0 "
+#define XF86_VERSION " 4.0.1 "
 
 /* The finer points in versions... */
 #define XF86_VERSION_MAJOR	4
 #define XF86_VERSION_MINOR	0
-#define XF86_VERSION_SUBMINOR	0
+#define XF86_VERSION_SUBMINOR	1
 #define XF86_VERSION_BETA	0	/* 0="", 1="A", 2="B", etc... */
 #define XF86_VERSION_ALPHA	0	/* 0="", 1="a", 2="b", etc... */
 
@@ -18,6 +18,6 @@
 			XF86_VERSION_BETA,			\
 			XF86_VERSION_ALPHA)
 
-#define XF86_DATE	"8 March 2000"
+#define XF86_DATE	"1 July 2000"
 
 /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
Index: xc/Imakefile
diff -u xc/Imakefile:3.17 xc/Imakefile:3.19
--- xc/Imakefile:3.17	Tue Oct  6 02:55:46 1998
+++ xc/Imakefile	Wed May 31 08:02:54 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/138 1997/12/29 16:37:30 kaleb $
-XCOMM $XFree86: xc/Imakefile,v 3.17 1998/10/06 09:55:46 dawes Exp $
+XCOMM $XFree86: xc/Imakefile,v 3.19 2000/05/31 15:02:54 eich Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 
@@ -197,6 +197,10 @@
 
 #ifndef MakeManKeywords
 #define MakeManKeywords YES	/* install.man rebuilds "man -k" database? */
+#endif
+
+#ifndef MakeHtmlManIndex
+#define MakeHtmlManIndex YES	/* install.man generates HTML man page index */
 #endif
 
 #undef BootstrapCleanSubdirs
Index: xc/Makefile
diff -u xc/Makefile:3.15 xc/Makefile:3.16
--- xc/Makefile:3.15	Sat Aug 14 03:48:56 1999
+++ xc/Makefile	Wed Mar 22 13:23:30 2000
@@ -1,5 +1,5 @@
 # $TOG: Makefile /main/37 1998/02/17 14:30:04 kaleb $
-# $XFree86: xc/Makefile,v 3.15 1999/08/14 10:48:56 dawes Exp $
+# $XFree86: xc/Makefile,v 3.16 2000/03/22 21:23:30 dawes Exp $
 
 # Luna users will need to either run make as "make MAKE=make"
 # or add "MAKE = make" to this file.
@@ -91,7 +91,7 @@
 	cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap
 
 $(IMAKESRC)/Makefile.proto: depend.bootstrap
-	$(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC)
+	$(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) -DBootStrap
 
 imake.bootstrap: $(IMAKESRC)/Makefile.proto
 	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend
Index: xc/config/cf/FreeBSD.cf
diff -u xc/config/cf/FreeBSD.cf:3.91 xc/config/cf/FreeBSD.cf:3.95
--- xc/config/cf/FreeBSD.cf:3.91	Tue Feb 15 05:51:38 2000
+++ xc/config/cf/FreeBSD.cf	Fri Jun 23 12:50:58 2000
@@ -2,7 +2,7 @@
 XCOMM
 XCOMM
 XCOMM
-XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.91 2000/02/15 13:51:38 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.95 2000/06/23 19:50:58 dawes Exp $
 
 #ifndef UseElfFormat
 #define UseElfFormat		DefaultToElfFormat
@@ -29,8 +29,16 @@
 #ifndef OSTeenyVersion
 #define OSTeenyVersion		DefaultOSTeenyVersion
 #endif
-XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
 
+#ifndef OSRelVersion
+/* Include this to get finer-grained information about the OS version */
+#include "/usr/include/osreldate.h"
+#define OSRelVersion __FreeBSD_version
+#endif
+
+XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OsRelVersion)
+
+
 #define HasGcc			YES
 #define HasGcc2			YES
 #define HasCplusplus		YES
@@ -86,7 +94,9 @@
 #endif
 #ifndef ExtraLibraries
 /* support for multi-byte locales is in libxpg4 rather than libc */
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
+#if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \
+    !(OSMajorVersion == 4 && OSRelVersion >= 400020) && \
+    !(OSRelVersion >= 500005)
 #define ExtraLibraries		-lxpg4
 #else
 #define ExtraLibraries		/**/
@@ -115,6 +125,16 @@
 #endif
 #endif
 
+/*
+ * Drivers that don't need AGP can work with 4.0, but we don't have a
+ * mechanism for specifying a subset of drivers in the OS.cf files yet.
+ */
+#ifndef BuildXF86DRI
+#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)
+#define BuildXF86DRI		YES
+#endif
+#endif
+
 /* 
  * This doesn't work the way it does on every other system. On FreeBSD it's
  * only a "hint, not a demand", whatever that means. Note that this is not 
@@ -382,6 +402,8 @@
 
 #ifndef InstallManPageLong
 #define InstallManPageLong(file,destdir,dest)				@@\
+BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+									@@\
 install.man:: file.man							@@\
 	MakeDir($(DESTDIR)destdir)					@@\
 	$(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*			@@\
@@ -392,6 +414,8 @@
 
 #ifndef InstallGenManPageLong
 #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+BuildInstallHtmlManPage(file,dest,suffix)				@@\
+									@@\
 install.man:: file.man							@@\
 	MakeDir($(DESTDIR)destdir)					@@\
 	$(RM) $(DESTDIR)destdir/dest.suffix*				@@\
@@ -418,8 +442,8 @@
 /*
  * InstallManPageAliases - install soft links for aliases.
  */
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases)			@@\
+#ifndef InstallManPageAliasesBase
+#define InstallManPageAliasesBase(file,destdir,aliases)			@@\
 install.man::								@@\
 	@(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\
 	for i in aliases; do (set -x; \					@@\
@@ -429,12 +453,22 @@
 	done)
 #endif
 
+#ifndef InstallManPageAliases
+#define InstallManPageAliases(file,destdir,aliases)			@@\
+InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
+#endif
+
+
 /*
  * InstallGenManPageAliases - install soft links for aliases.
  */
 #ifndef InstallGenManPageAliases
 #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
+InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
 #endif
 #endif
 
@@ -464,7 +498,7 @@
  * A hack to work around an optimisation problem with the compiler on
  * FreeBSD 4.0-current in late 1999/early 2000.
  */
-#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0
+#if OSMajorVersion >= 4
 #define FreeBSDGccOptBug
 #endif
 
Index: xc/config/cf/Imake.cf
diff -u xc/config/cf/Imake.cf:3.53 xc/config/cf/Imake.cf:3.58
--- xc/config/cf/Imake.cf:3.53	Sat Feb 12 12:45:01 2000
+++ xc/config/cf/Imake.cf	Fri Jun 30 10:15:05 2000
@@ -17,7 +17,7 @@
  *
  *     4.  Create a .cf file with the name given by MacroFile.
  */
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.58 2000/06/30 17:15:05 dawes Exp $
 
 #if defined(clipper) || defined(__clipper__)
 # undef clipper
@@ -53,10 +53,19 @@
 # define MacroIncludeFile <bsdi.cf>
 # define MacroFile bsdi.cf
 # undef bsdi
-# define BSD386Architecture
-# define i386BsdArchitecture
-# define i386Architecture
-# undef i386
+# define BSDOSArchitecture
+# if defined(__i386__) || defined(i386)
+#  define i386BsdArchitecture
+#  define i386Architecture
+#  undef i386
+#  undef __i386__
+# endif
+# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
+#  define SparcArchitecture
+#  undef sparc
+#  undef __sparc__
+#  undef __sparc_v9__
+# endif
 #endif /* bsdi */
 
 #ifdef __OpenBSD__
@@ -332,6 +341,7 @@
 # undef sgi
 # define SGIArchitecture
 # undef mips
+# undef __mips
 # define MipsArchitecture
 # ifdef _SVR4
 #  undef _SVR4
@@ -562,6 +572,10 @@
 # ifdef i386
 #  define i386Architecture
 #  undef i386
+XCOMM Keep cpp from replacing path elements containing i486/i586/i686
+#  undef i486
+#  undef i586
+#  undef i686
 # endif /* i386 */
 # ifdef __i386__
 #  ifndef i386Architecture
@@ -603,6 +617,21 @@
 #  endif
 #  undef __sparc__
 # endif
+# ifdef ia64 
+#  define ia64Architecture
+#  undef ia64 
+# endif
+# ifdef __ia64__
+#  ifndef ia64Architecture
+#   define ia64Architecture
+#  endif
+#  undef __ia64__
+# endif
+# if defined(mips) || defined(__mips__)
+#  define MipsArchitecture
+#  undef mips
+#  undef __mips__
+# endif
 /* for compatibility with 3.3.x */
 # ifdef PpcArchitecture
 #  define PowerPCArchitecture
@@ -747,6 +776,12 @@
 #endif
 #endif
 #endif /* QNX/Neutrino */
+
+#ifdef SparcArchitecture
+# if defined(__sparc_v9) || defined(__arch64__)
+#  define Sparc64Architecture
+# endif
+#endif
 
 #ifndef MacroIncludeFile
 XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
Index: xc/config/cf/Imake.rules
diff -u xc/config/cf/Imake.rules:3.65 xc/config/cf/Imake.rules:3.76
--- xc/config/cf/Imake.rules:3.65	Sun Mar  5 08:59:00 2000
+++ xc/config/cf/Imake.rules	Thu Jun 15 13:49:55 2000
@@ -5,7 +5,7 @@
 XCOMM
 XCOMM
 XCOMM
-XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.65 2000/03/05 16:59:00 dawes Exp $
+XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.76 2000/06/15 20:49:55 dawes Exp $
 
 /*
  *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
@@ -127,6 +127,7 @@
  * SpecialObjectRule		(objs,depends,options)
  * SpecialCObjectRule		(basename,depends,options)
  * LexFile			(file)
+ * M4File			(file,includes)
  * YaccFile			(file,flags)
  * YaccFileNoFlags		(file)
  * MakeLibrary			(libname,objlist)
@@ -1138,6 +1139,17 @@
 
 
 /*
+ * InstallDriverSDKLibraryModule - rule to install Driver SDK library module.
+ *                           (only used for XFree86). This is a no-op
+ *                           rule so that Imakefiles on non-XFree86 systems
+ *                           continue to build Makefiles correctly.
+ */
+#ifndef InstallDriverSDKLibraryModule
+#define InstallDriverSDKLibraryModule(lib,dlib,dir)
+#endif
+
+
+/*
  * MergeIntoInstalledLibrary - generate rules to merge one library into another
  */
 #ifndef MergeIntoInstalledLibrary
@@ -1177,6 +1189,8 @@
  */
 #ifndef InstallManPageLong
 #define	InstallManPageLong(file,destdir,dest)				@@\
+BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+									@@\
 InstallNamedTarget(install.man,file.man,$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
 #endif /* InstallManPageLong */
 
@@ -1195,6 +1209,8 @@
  */
 #ifndef InstallManPageAliases
 #define	InstallManPageAliases(file,destdir,aliases)			@@\
+InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+									@@\
 install.man::								@@\
 	@(TMP=/tmp/tmp.$$$$; \						@@\
 	RemoveFile($${TMP}); \						@@\
@@ -1212,6 +1228,8 @@
  */
 #ifndef InstallGenManPageLong
 #define	InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+BuildInstallHtmlManPage(file,dest,suffix)				@@\
+									@@\
 install.man:: file.man							@@\
 	MakeDir($(DESTDIR)destdir)					@@\
 	$(INSTALL) -c $(INSTMANFLAGS) file.man $(DESTDIR)destdir/dest.suffix
@@ -1232,6 +1250,8 @@
  */
 #ifndef InstallGenManPageAliases
 #define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
+InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+									@@\
 install.man::								@@\
 	@(TMP=/tmp/tmp.$$$$; \						@@\
 	RemoveFile($${TMP}); \						@@\
@@ -1242,6 +1262,82 @@
 	RemoveFile($${TMP}))
 #endif /* InstallGenManPageAliases */
 
+
+/*
+ * RmanDependency - generate rules to build the rman program if 
+ * this Imakefile is within the source tree.
+ */
+#ifndef RmanDependency
+#ifdef UseInstalled
+#define RmanDependency() /**/
+#else
+#define RmanDependency() 						@@\
+NoCmpScript(ProgramTargetName($(RMAN)))					@@\
+									@@\
+ProgramTargetName($(RMAN)):						@@\
+	@echo "checking $@ over in $(TOP)/config/util first..."; \	@@\
+	cd $(TOP)/config/util && $(MAKE) rman; \			@@\
+	echo "okay, continuing in $(CURRENT_DIR)"
+
+#endif /* UseInstalled */
+#endif /* RmanDependency */
+
+#ifndef RmanCmdDependency
+#ifdef UseInstalled
+#define RmanCmdDependency	/**/
+#else
+#define RmanCmdDependency	ProgramTargetName($(RMAN))
+#endif
+#endif
+
+#ifndef BuildInstallHtmlManPage
+#if BuildHtmlManPages
+#define BuildInstallHtmlManPage(file,dest,suffix)			@@\
+AllTarget(dest.suffix.html)						@@\
+									@@\
+dest.suffix.html: file.man RmanCmdDependency				@@\
+	RemoveFiles(dest.suffix.html dest.suffix-html)			@@\
+	RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) &&\ @@\
+	  $(MV) dest.suffix-html $@					@@\
+									@@\
+install.man:: dest.suffix.html						@@\
+	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
+	@(SUF=`expr dest.suffix.html \: '.*\.\(.\).*\.'`; \		@@\
+	 set -x; \							@@\
+	 $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) dest.suffix.html $(DESTDIR)$(DOCHTMLDIR)/dest.$$SUF.html)						@@\
+									@@\
+clean::									@@\
+	RemoveFiles(dest.suffix.html dest.suffix-html)
+#else
+#define BuildInstallHtmlManPage(file,dest,suffix) /**/
+#endif
+#endif
+
+#ifndef InstallHtmlManPageAliases
+#if BuildHtmlManPages
+#define InstallHtmlManPageAliases(file,aliases,suffix)			@@\
+install.man:: file.suffix.html						@@\
+	@for i in aliases; do (set -x; \				@@\
+	  RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.suffix.html); \	@@\
+	  (cd $(DESTDIR)$(DOCHTMLDIR); \				@@\
+	    $(LN) file.suffix.html $$i.suffix.html)); \			@@\
+	done
+#else
+#define InstallHtmlManPageAliases(file,aliases,suffix) /**/
+#endif
+#endif
+
+#ifndef HtmlManIndex
+#if BuildHtmlManPages
+#define HtmlManIndex							@@\
+html_index::								@@\
+	$(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR)
+#else
+#define HtmlManIndex	html_index::
+#endif
+#endif
+
+
 /*
  * ManKeywordsTarget - generate the database used by "man -k".
  * This rule updates the index in the directory "manpath", which
@@ -2106,6 +2202,19 @@
 	RemoveFiles(lex.yy.c file.c)
 #endif /* LexFile */
 
+
+#ifndef M4File
+#define M4File(file,includes)						@@\
+file: file.m4 includes							@@\
+	RemoveFile(file)						@@\
+	$(M4) $(M4FLAGS) file.m4 >file					@@\
+									@@\
+depend:: file 								@@\
+									@@\
+clean::									@@\
+	RemoveFile(file)
+#endif /* M4File */
+
 #ifndef YaccFile
 #if HasGnuMake
 #define YaccFile(file,flags)						@@\
@@ -2668,6 +2777,9 @@
  */
 #ifndef InstallDriverSDKObjectModule
 #define InstallDriverSDKObjectModule(module,dest,subdir)
+#endif
+#ifndef InstallDriverSDKObjectSubModule
+#define InstallDriverSDKObjectSubModule(module,dest,subdir)
 #endif
 
 
Index: xc/config/cf/Imake.tmpl
diff -u xc/config/cf/Imake.tmpl:3.70 xc/config/cf/Imake.tmpl:3.81
--- xc/config/cf/Imake.tmpl:3.70	Tue Mar  7 06:31:34 2000
+++ xc/config/cf/Imake.tmpl	Sun Jun 25 13:17:28 2000
@@ -5,7 +5,7 @@
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.70 2000/03/07 14:31:34 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.81 2000/06/25 20:17:28 dawes Exp $
 XCOMM ----------------------------------------------------------------------
 
 /*
@@ -102,15 +102,27 @@
 
 /* the following are needed before we can include Imake.rules */
 
+#ifndef NothingOutsideProjectRoot
+#define NothingOutsideProjectRoot NO
+#endif
+
 #ifndef HasVarDirectory
 #define HasVarDirectory		YES
 #endif
 #ifndef UseEtcX11
 #define UseEtcX11		YES
 #endif
+#if NothingOutsideProjectRoot
+#undef UseEtcX11
+#define UseEtcX11		NO
+#endif
 #ifndef UseSeparateConfDir
 #define UseSeparateConfDir	(UseEtcX11 || HasVarDirectory)
 #endif
+#if NothingOutsideProjectRoot
+#undef UseSeparateConfDir
+#define UseSeparateConfDir	NO
+#endif
 #ifndef SystemV
 #define SystemV			NO	/* SYSV (R3) */
 #endif
@@ -174,6 +186,39 @@
 #define HasSymLinks YES
 #endif
 
+#ifndef BuildRman
+#define BuildRman YES
+#endif
+
+#ifndef RmanCmd
+#if BuildRman
+#ifdef UseInstalled		/* assume BINDIR in path */
+#define RmanCmd rman
+#else
+#define RmanCmd $(TOP)/config/util/rman
+#endif
+#endif
+#endif
+
+#ifndef RmanOptions
+#if BuildRman
+#define RmanOptions -f HTML
+#endif
+#endif
+
+#ifndef BuildHtmlManPages
+#ifdef RmanCmd
+#define BuildHtmlManPages YES
+#else
+#define BuildHtmlManPages NO
+#endif
+#endif
+/* Can't do this while bootstrapping imake */
+#ifdef BootStrap
+#undef BuildHtmlManPages
+#define BuildHtmlManPages NO
+#endif
+
 #include <Imake.rules>
 
 #ifndef HasSharedLibraries
@@ -335,6 +380,9 @@
 #ifndef HasSecureRPC
 #define HasSecureRPC		NO	/* if you have Secure RPC */
 #endif
+#ifndef HasKrbIV
+#define HasKrbIV		NO	/* if you have Kerberos IV */
+#endif
 #ifndef HasKrb5
 #define HasKrb5			NO      /* if you have Kerberos V5 */
 #endif
@@ -363,6 +411,14 @@
 #ifndef GzipLibrary	/* if OS config didn't define it, assume it's -lz */
 #define GzipLibrary -lz
 #endif
+#if HasKrbIV
+#ifndef KrbIVIncludes
+#define KrbIVIncludes /**/
+#endif
+#ifndef KrbIVLibraries
+#define KrbIVLibraries -lkafs -lkrb -ldes
+#endif
+#endif
 #if HasKrb5
 #ifndef Krb5Includes
 #define Krb5Includes -I/krb5/include
@@ -561,6 +617,18 @@
 #endif
 #endif
 
+/*
+ * SystemUsrLibDir is independent of ProjectRoot.  It is used primarily
+ * to allow links for shared libraries in /usr/lib for compliance to
+ * various standards (e.g., Linux/OpenGL).
+ */
+#ifndef SystemUsrLibDir
+#define SystemUsrLibDir /usr/lib
+#endif
+#ifndef SystemUsrIncDir
+#define SystemUsrIncDir /usr/include
+#endif
+
 #ifndef ShLibDir
 #define ShLibDir UsrLibDir
 #endif
@@ -632,6 +700,12 @@
 #define ExtraManDefs -D__projectroot__=$(PROJECTROOT)
 #endif
 
+#ifndef HtmlIndexCmd
+#if BuildHtmlManPages
+#define HtmlIndexCmd $(MKHTMLINDEX)
+#endif
+#endif
+
 #ifndef LogDirectory
 #if HasVarDirectory
 #define LogDirectory /var/log
@@ -873,6 +947,12 @@
 #ifndef LdCmd
 #define LdCmd ld
 #endif
+#ifndef M4Cmd
+#define M4Cmd m4
+#endif
+#ifndef M4Flags
+#define M4Flags /**/
+#endif
 #ifndef LexCmd
 #define LexCmd lex
 #endif
@@ -1253,6 +1333,8 @@
         MKDIRHIER = MkdirHierCmd
           REVPATH = RevPathCmd
     EXPORTLISTGEN = ExportListCmd
+             RMAN = RmanCmd
+      RMANOPTIONS = RmanOptions
         CONFIGSRC = ConfigSrc
          IMAKESRC = $(CONFIGSRC)/imake
         DEPENDSRC = DependDir
@@ -1260,6 +1342,8 @@
           INCROOT = IncRoot		/* base of where to put header files */
         USRLIBDIR = UsrLibDir		/* nonshared libraries */
         VARLIBDIR = VarLibDir		/* xdm runtime files */
+  SYSTEMUSRLIBDIR = SystemUsrLibDir	/* system's "/usr/lib" */
+  SYSTEMUSRINCDIR = SystemUsrIncDir	/* system's "/usr/include" */
          SHLIBDIR = ShLibDir            /* shared libraries */
        LINTLIBDIR = LintlibDir		/* lint libraries */
           MANPATH = ManPath		/* top of manual page tree */
@@ -1312,6 +1396,8 @@
      INSTALLFLAGS = InstallFlags
                LD = LdCmd
               LEX = LexCmd
+               M4 = M4Cmd
+          M4FLAGS = M4Flags
            LEXLIB = LexLib
              YACC = YaccCmd
            CCYACC = CplusplusYaccCmd
@@ -1619,6 +1705,10 @@
 MakefileTarget()
 #endif
 
+#if BuildHtmlManPages
+RmanDependency()
+#endif
+
 TagsTarget()
 #ifdef MakefileAdditions
 MakefileAdditions()
@@ -1630,6 +1720,8 @@
 
 ManKeywordsTarget($(MANPATH))
 
+HtmlManIndex
+
 #ifdef IHaveSubdirs
 XCOMM ----------------------------------------------------------------------
 XCOMM rules for building in SUBDIRS - do not edit
@@ -1647,6 +1739,11 @@
 /* must be after all install.man rules that install anything */
 #if MakeManKeywords		/* typically only at top level */
 install.man:: man_keywords
+#endif
+
+/* must be after all install.man rules that install anything */
+#if MakeHtmlManIndex		/* typically only at top level */
+install.man:: html_index
 #endif
 
 #ifndef IHaveSubdirs
Index: xc/config/cf/NetBSD.cf
diff -u xc/config/cf/NetBSD.cf:3.80 xc/config/cf/NetBSD.cf:3.83
--- xc/config/cf/NetBSD.cf:3.80	Mon Feb 28 19:08:55 2000
+++ xc/config/cf/NetBSD.cf	Tue Jun 13 17:16:02 2000
@@ -2,7 +2,7 @@
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.80 2000/02/29 03:08:55 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.83 2000/06/14 00:16:02 dawes Exp $
 
 
 #ifndef OSName
@@ -133,14 +133,14 @@
  *
  * Disabled for NetBSD/vax until I figure out the scheme. --CS 
  */
-#if ((OSMajorVersion > 0) && \
-     !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
-    UseElfFormat
-#if !defined(Arm32Architecture) && !defined(VaxArchitecture)
+#if (OSMajorVersion > 0) && defined(i386Architecture)
 #  ifndef DoLoadableServer
 #  define DoLoadableServer	YES
 #  endif
-#endif
+#else
+#  ifndef DoLoadableServer
+#  define DoLoadableServer	NO
+#  endif
 #endif
 
 #if UseElfFormat
@@ -190,16 +190,20 @@
 #  endif
 # endif
 #else
-# if defined(AlphaArchitecture)
-#  define ServerExtraDefines GccGasOption -D_XSERVER64
+# if defined(SparcArchitecture)
+#  define ServerExtraDefines XFree86ServerDefines
 # else
-#  ifdef Arm32Architecture
-#   define ServerExtraDefines GccGasOption XFree86ServerDefines
-#   ifndef XFree86ConsoleDefines
-#    define XFree86ConsoleDefines -DPCCONS_SUPPORT
-#   endif
+#  if defined(AlphaArchitecture)
+#   define ServerExtraDefines GccGasOption -D_XSERVER64
 #  else
-#  define ServerExtraDefines GccGasOption
+#   ifdef Arm32Architecture
+#    define ServerExtraDefines GccGasOption XFree86ServerDefines
+#    ifndef XFree86ConsoleDefines
+#     define XFree86ConsoleDefines -DPCCONS_SUPPORT
+#    endif
+#   else
+#   define ServerExtraDefines GccGasOption
+#  endif
 # endif
 #endif
 #endif
@@ -307,7 +311,8 @@
 #define FileManSuffix	5
 #define ManSourcePath	$(MANPATH)/cat
 
-#define InstallManPageLong(file,destdir,dest)                           @@\
+#define InstallManPageLongBase(file,destdir,dest)			@@\
+									@@\
 all:: file.0								@@\
 									@@\
 file.0:: file.man							@@\
@@ -328,8 +333,15 @@
 clean::									@@\
 	RemoveFile(file.0)
 
+#define InstallManPageLong(file,destdir,dest)				@@\
+BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+									@@\
+InstallManPageLongBase(file,destdir,dest)
+
 #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-	InstallManPageLong(file,destdir,dest)
+BuildInstallHtmlManPage(file,dest,suffix)				@@\
+									@@\
+InstallManPageLongBase(file,destdir,dest)
 
 #define InstallMultipleMan(list,dest)                                   @@\
 install.man:: 								@@\
@@ -358,7 +370,7 @@
 	  $(RM) $$i.0 ); \						@@\
 	done
 
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
+#define InstallManPageAliasesBase(file,destdir,aliases)			@@\
 install.man:: 								@@\
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
 	for i in aliases; do \                                          @@\
@@ -368,8 +380,15 @@
 		); \							@@\
 	done
 
+#define InstallManPageAliases(file,destdir,aliases)			@@\
+InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
+
 #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
+InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
 
 /*
  * Shared libraries supported starting in 1.0 on a.out platforms,
@@ -431,6 +450,10 @@
 #ifndef UseRgbTxt
 #define UseRgbTxt	YES
 #endif
+#define BuildXF86VidModeExt	NO
+#define BuildXF86DGA		NO
+#define BuildXInputExt		NO
+#include <xfree86.cf>
 #endif
 
 /*
@@ -449,6 +472,8 @@
  */
 #ifdef AlphaArchitecture
 #define	BuildServer	NO
+/* Build the shared XDM greeter on Alph if it supports shared libs */
+#define SharedLibXdmGreet HasSharedLibraries
 #endif
 
 /*
@@ -456,4 +481,8 @@
  */
 #ifdef VaxArchitecture
 #define BuildServer	NO
+#endif
+
+#ifndef SharedLibXdmGreet
+#define SharedLibXdmGreet NO
 #endif
Index: xc/config/cf/OpenBSD.cf
diff -u xc/config/cf/OpenBSD.cf:3.30 xc/config/cf/OpenBSD.cf:3.37
--- xc/config/cf/OpenBSD.cf:3.30	Mon Mar  6 17:30:40 2000
+++ xc/config/cf/OpenBSD.cf	Sat Jun 24 10:43:44 2000
@@ -1,7 +1,5 @@
-XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.30 2000/03/07 01:30:40 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.37 2000/06/24 17:43:44 dawes Exp $
 XCOMM
-XCOMM $OpenBSD: OpenBSD.cf,v 1.33 1998/09/27 04:52:48 rahnds Exp $
-XCOMM
 
 #ifndef OSName
 #define OSName			DefaultOSName OSBinaryType
@@ -37,30 +35,48 @@
 #define HasWChar32		YES
 #define HasMkstemp		YES
 #define HasZlib			YES
+#ifndef HasKrbIV
+#define HasKrbIV		YES
+#endif
 #define HasDlopen		YES
 #define DlLibrary		/**/
 #define HasUsableFileMmap	YES
 
 #define HasNCurses		YES
 #define NCursesLibName		-lcurses
+#if defined(TermcapLibrary)
+#undef TermcapLibrary
+#endif
+#define TermcapLibrary		-lcurses
 
 #define HasVarRun		YES
 #define HasVarDb		YES
 
+#ifndef HasLibPthread
+#define HasLibPthread		NO
+#endif
+
 /*
  * Multi-thread safe libs 
  */	
 #if OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3
-#define HasPosixThreads		YES
-#define ThreadedX		YES
-#define BuildThreadStubLibrary  YES 
-#define NeedUIThrStubs          YES 
-#define HasThreadSafeAPI	YES
-#define SystemMTDefines		-D_REENTRANT
-#define ThreadsCompileFlags	-pthread
-#define ThreadsLibraries 	-lc_r
+# define HasPosixThreads	YES
+# define ThreadedX		YES
+# define SystemMTDefines	-D_REENTRANT
+# if HasLibPthread
+#  define ThreadsLibraries	-lpthread
+# else
+#  define BuildThreadStubLibrary  YES 
+#  define NeedUIThrStubs          YES 
+#  define ThreadsCompileFlags	-pthread
+#  define ThreadsLibraries 	-lc_r
+# endif
 #endif
 
+#if OSMajorVersion == 2 && OSMinorVersion > 6 || OSMajorVersion >= 3
+# define HasThreadSafeAPI	YES
+#endif
+
 /*
  * Compiler Features
  */
@@ -129,20 +145,20 @@
 #  endif
 # endif
 #else
-# if defined(AlphaArchitecture)
-#  define ServerExtraDefines GccGasOption -D_XSERVER64
+# if defined(SparcArchitecture)
+#  define ServerExtraDefines  XFree86ServerDefines
 # else
-#  define ServerExtraDefines GccGasOption
+#  if defined(AlphaArchitecture)
+#   define ServerExtraDefines GccGasOption -D_XSERVER64
+#  else
+#   define ServerExtraDefines GccGasOption
+#  endif
 # endif
 #endif
 
 #define StandardDefines	-DCSRG_BASED
 #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 
-#ifndef DoLoadableServer
-#define DoLoadableServer	YES
-#endif
-
 #ifndef ExtraLibraries
 #define ExtraLibraries		/**/
 #endif
@@ -198,15 +214,14 @@
 #define FileManSuffix	5
 #define ManSourcePath	$(MANPATH)/cat
 
-#define InstallManPageLong(file,destdir,dest)                           @@\
+#define InstallManPageLongBase(file,destdir,dest)			@@\
 all:: file.0								@@\
 									@@\
 file.0:: file.man							@@\
 	@if [ -f file.man ]; \						@@\
 	then \								@@\
-	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
-	cp /tmp/$$$$.man file.0; \					@@\
-	$(RM) /tmp/$$$$.man; \						@@\
+	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \	@@\
+		| $(COL) > file.0; \					@@\
 	fi 								@@\
 									@@\
 install.man::                                                           @@\
@@ -219,8 +234,15 @@
 clean::									@@\
 	RemoveFile(file.0)
 
+#define InstallManPageLong(file,destdir,dest)				@@\
+BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+									@@\
+InstallManPageLongBase(file,destdir,dest)
+
 #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-	InstallManPageLong(file,destdir,dest)
+BuildInstallHtmlManPage(file,dest,suffix)				@@\
+									@@\
+InstallManPageLongBase(file,destdir,dest)
 
 #define InstallMultipleMan(list,dest)                                   @@\
 install.man:: 								@@\
@@ -249,7 +271,7 @@
 	  $(RM) $$i.0 ); \						@@\
 	done
 
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
+#define InstallManPageAliasesBase(file,destdir,aliases)			@@\
 install.man:: 								@@\
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
 	for i in aliases; do \                                          @@\
@@ -259,8 +281,15 @@
 		); \							@@\
 	done
 
+#define InstallManPageAliases(file,destdir,aliases)			@@\
+InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
+
 #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
+InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
 
 
 /*
@@ -333,27 +362,31 @@
  */
 #ifdef i386Architecture
 
+# ifndef DoLoadableServer
+# define DoLoadableServer	YES
+# endif
+
 /* 2.7 and later will have support for setting MTRRs */
-#ifndef HasMTRRSupport
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6)
-#define HasMTRRSupport		YES
-#else
-#define HasMTRRSupport		NO
-#endif
-#endif
+# ifndef HasMTRRSupport
+#  if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6)
+#   define HasMTRRSupport		YES
+#  else
+#   define HasMTRRSupport		NO
+#  endif
+# endif
 
 /* Support for USB Mices */
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
-#define UsbMouseSupport		YES
-#endif
+# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
+#  define UsbMouseSupport		YES
+# endif
 
 /*
  * A hack to work around an optimisation problem with the compiler on
  * OpenBSD 2.6-current in late 1999/early 2000.
  */
-#if OSMajorVersion == 2 && OSMinorVersion == 6 
-#define FreeBSDGccOptBug
-#endif
+# if OSMajorVersion == 2 && OSMinorVersion >= 6 
+#  define FreeBSDGccOptBug
+# endif
 
 # include <xfree86.cf>
 
@@ -468,11 +501,11 @@
 # ifndef BuildXKBlib
 #  define BuildXKBlib     	NO
 # endif
+#endif
 
 # ifndef BuildPexExt
 #  define BuildPexExt 		(XsunServer || Xsun24Server)
 # endif
-#endif
 
 #endif /* Sun3Architecture */
 
@@ -518,20 +551,30 @@
 # define UseRgbTxt		NO
 
 #endif /* PmaxArchitecture */
+
+/*
+ * Definitions for the PowerPC architecture 
+ */
+#ifdef PpcArchitecture
+
+/* #define GccWarningOptions -Wall -Wpointer-artith */
+
+# include <xf86.rules>
+# ifndef BuildServer
+#  define BuildServer		NO
+# endif
 
-#ifdef ppcArchitecture
 # define HasSharedLibraries	NO
 # define UseElfFormat		YES
 # define BuildDynamicLoading	NO
-#endif
 
+#endif /* PpcArchitecture */
+
 /*
  * Definitions for the sparc architecture
  */
 #ifdef SparcArchitecture
 
-# include <xf86.rules>
-
 # ifndef Xsun24Server
 # define Xsun24Server		YES
 # endif
@@ -547,6 +590,12 @@
 # ifndef BuildPexExt
 #  define BuildPexExt 	(XsunServer || Xsun24Server)
 # endif
+
+# define BuildXF86VidModeExt	NO
+# define BuildXF86DGA		NO
+# define BuildXInputExt		NO
+# include <xfree86.cf>
+
 #endif /* SparcArchitecture */
 
 
@@ -554,8 +603,13 @@
 
 /*
  * Generic settings for all architectures
+ * which can be overridden by architecture specific sections above
  */
 
+#ifndef DoLoadableServer
+#define DoLoadableServer		NO
+#endif
+
 #ifndef XVirtualFramebufferServer
 # undef BuildServer
 # define BuildServer			YES
@@ -578,6 +632,10 @@
 
 #ifndef CompressAllFonts
 # define CompressAllFonts		YES
+#endif
+
+#ifndef SharedLibXdmGreet
+# define SharedLibXdmGreet		NO
 #endif
 
 /*
Index: xc/config/cf/README
diff -u xc/config/cf/README:1.10 xc/config/cf/README:1.11
--- xc/config/cf/README:1.10	Thu Oct  1 23:15:01 1998
+++ xc/config/cf/README	Tue Jun 13 17:16:02 2000
@@ -3,7 +3,7 @@
 
 
 
-$XFree86: xc/config/cf/README,v 1.10 1998/10/02 06:15:01 dawes Exp $
+$XFree86: xc/config/cf/README,v 1.11 2000/06/14 00:16:02 dawes Exp $
 
 The easiest way to write an Imakefile is to find another one that does
 something similar and copy/modify it!
@@ -65,6 +65,7 @@
 	HasGcc2			boolean for system has GNU gcc 2.x compiler
 	HasGcc2ForCplusplus	use gcc 2 for C++ programs?
 	HasGnuMake		use the GNU make program?
+	HasKrbIV		system has Kerberos version IV support?
 	HasKrb5			system has Kerberos version 5 support?
 	HasLargeTmp		boolean for system has /tmp space
 	HasLatex		system has LaTeX document preparation software
@@ -97,6 +98,8 @@
 	InstPgmFlags		install flags for normal programs
 	InstUidFlags		install flags for xterm to chown /dev/ptys
 	InstallCmd		command to install files
+	KrbIVIncludes		where to include KerberosIV header files from
+	KrbIVLibraries		where to load KerberosIV libraries from
 	Krb5Includes		where to include Kerberos header files from
 	Krb5Libraries		where to load Kerberos libraries from
 	LdCmd			command to run loader
@@ -230,6 +233,7 @@
 	InstallSecurityConfig	install server security policy file over old?
 	InstallXdmConfig	install xdm config files over old?
 	InstallXinitConfig	install xinit config files over old?
+	KrbIVDefines		defines for use with KerberosIV
 	LibDir			directory in which to install X11 support files
 	LibManSuffix		man suffix for library pages
 	LibmanDir		directory in which to install library man pages
Index: xc/config/cf/X11.tmpl
diff -u xc/config/cf/X11.tmpl:1.62 xc/config/cf/X11.tmpl:1.71
--- xc/config/cf/X11.tmpl:1.62	Thu Mar  2 09:52:50 2000
+++ xc/config/cf/X11.tmpl	Sun Jun 25 13:17:28 2000
@@ -5,7 +5,7 @@
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.62 2000/03/02 17:52:50 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.71 2000/06/25 20:17:28 dawes Exp $
 
 /***************************************************************************
  *                                                                         *
@@ -774,6 +774,13 @@
 #ifndef ServerOSDefines
 #define ServerOSDefines /**/
 #endif
+#if HasKrbIV
+#ifndef KrbIVDefines
+#define KrbIVDefines -DKERBEROS
+#endif
+#else
+#define KrbIVDefines /**/
+#endif
 #if HasKrb5
 #ifndef Krb5Defines
 #define Krb5Defines -DK5AUTH
@@ -1068,6 +1075,10 @@
 #define XkbComp xkbcomp
 #endif
 
+#ifndef PsWrap
+#define PsWrap $(PSWRAPSRC)/pswrap
+#endif
+
 #ifndef ResourceConfigurationManagement 
 #define ResourceConfigurationManagement YES
 #endif
@@ -1141,12 +1152,16 @@
               RGB = $(BINDIR)/rgb
             FONTC = $(BINDIR)/bdftopcf
         MKFONTDIR = $(BINDIR)/mkfontdir
+      MKHTMLINDEX = $(BINDIR)/mkhtmlindex
 #else
               RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
             FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
         MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir
+      MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh
 #endif
 
+     HTMLINDEXCMD = HtmlIndexCmd
+
        DOCUTILSRC = $(XTOP)/doc/util
         CLIENTSRC = $(TOP)/clients
           DEMOSRC = $(TOP)/demos
@@ -1170,6 +1185,7 @@
         EXTINCSRC = $(XTOP)/include/extensions
       FTSOURCEDIR = FreeTypeSrcDir
      XTTSOURCEDIR = XTrueTypeSrcDir
+        PSWRAPSRC = $(XTOP)/config/pswrap
      TRANSCOMMSRC = $(LIBSRC)/xtrans
    TRANS_INCLUDES = -I$(TRANSCOMMSRC)
  CONNECTION_FLAGS = ConnectionFlags ExtraConnectionDefs
@@ -1422,7 +1438,7 @@
 #define SharedLibGlx		HasSharedLibraries
 #endif
 #ifndef NormalLibGlx
-#define NormalLibGlx		YES
+#define NormalLibGlx		(!SharedLibX11 | ForceNormalLib)
 #endif
 #ifndef DebugLibGlx
 #define DebugLibGlx		NO
@@ -1430,7 +1446,21 @@
 #ifndef ProfileLibGlx
 #define ProfileLibGlx		NO
 #endif
+#ifndef LinkGLToUsrLib
+#define LinkGLToUsrLib		NO
 #endif
+#if NothingOutsideProjectRoot
+#undef LinkGLToUsrLib
+#define LinkGLToUsrLib		NO
+#endif
+#ifndef LinkGLToUsrInclude
+#define LinkGLToUsrInclude	NO
+#endif
+#if NothingOutsideProjectRoot
+#undef LinkGLToUsrInclude
+#define LinkGLToUsrInclude	NO
+#endif
+#endif
 
 #ifndef SharedLibXext
 #define SharedLibXext HasSharedLibraries
@@ -1544,6 +1574,18 @@
 #endif
 #endif
 
+#if BuildXineramaLibrary
+    XINERAMALIBSRC = $(LIBSRC)/Xinerama
+#if SharedLibXinerama
+#ifndef SharedXineramaRev
+#define SharedXineramaRev 1.0
+#endif
+SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
+#else
+ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
+#endif
+#endif
+
 #if BuildDPSLibrary
     DPSLIBSRC = $(LIBSRC)/dps
 #if SharedLibDps
@@ -2504,6 +2546,6 @@
 #endif
 
 #ifndef InstallRoffDoc
-
 #define InstallRoffDoc(name) InstallDoc(name,name.PS name.txt)
 #endif
+
Index: xc/config/cf/bsdi.cf
diff -u xc/config/cf/bsdi.cf:3.27 xc/config/cf/bsdi.cf:3.30
--- xc/config/cf/bsdi.cf:3.27	Sat Apr 17 02:08:04 1999
+++ xc/config/cf/bsdi.cf	Fri Jun 30 10:15:05 2000
@@ -1,28 +1,63 @@
 XCOMM platform:  $XConsortium: bsdi.cf /main/22 1996/09/28 16:09:30 rws $
-XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.27 1999/04/17 09:08:04 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.30 2000/06/30 17:15:05 dawes Exp $
 
 #ifndef OSName
-#define OSName            BSD/OS 2.0
+#define OSName		DefaultOSName
 #endif
 #ifndef OSVendor
-#define OSVendor          BSDI
+#define OSVendor	BSDI
 #endif
-XCOMM operating system:  OSName
 #ifndef OSMajorVersion
-#define OSMajorVersion    2
+#define OSMajorVersion	DefaultOSMajorVersion
 #endif
 #ifndef OSMinorVersion
-#define OSMinorVersion    0
+#define OSMinorVersion	DefaultOSMinorVersion
 #endif
+#ifndef OSTeenyVersion
+#define OSTeenyVersion	DefaultOSTeenyVersion
+#endif
+XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+
+#define HasBSD44Sockets		YES
+#define HasBsdMake		YES
+#define HasDlopen		YES
+#define HasPutenv		YES
+#define HasSnprintf		YES
+#define HasUsableFileMmap	YES
+#define HasZlib			YES
+
+#if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4)
+#define HasNCurses		YES
+#else
+#define HasNCurses		NO
+#endif
+
+#define BuildLBX		YES
+#define GzipFontCompression	NO
 
-#define HasPutenv	YES
-#define HasBSD44Sockets	YES
+XCOMM BSD/OS 4.1 (intel) comes with gcc 2.91.66 installed as gcc and cc.
+XCOMM BSD/OS 4.1 (sparc) comes with gcc 2.95.2 installed as gcc and cc.
+
+XCOMM BSD/OS 4.0.1 (intel) comes with gcc 2.7.2.1 installed as gcc2, gcc and cc.
+XCOMM BSD/OS 4.0.1 (sparc) comes with gcc 2.7.2.1 installed as gcc2, gcc and cc.
+XCOMM Punt on OS revs earlier than 4.0.1
+
+XCOMM BSDI uses shlicc for compiling C and shlic++ for compiling C++
+XCOMM using static shared libraries.  We also build ELF dynamic shared
+XCOMM libraries as well as normal archive libraries.
+
+XCOMM BSD/OS 3.0 comes with gcc 2.7.2 installed as gcc2 and gcc.
+XCOMM gcc 1.42 is installed as cc.
+
+XCOMM BSD/OS 2.1 comes with gcc 2.7.1 installed as gcc2 and gcc.
+XCOMM gcc 1.42 is installed as cc.
 
 XCOMM BSD/OS 2.0 comes with gcc 2.6.3 installed as gcc2 and gcc.
 XCOMM gcc 1.42 is installed as cc.
+
 XCOMM BSD/386 1.1 comes with gcc 2.5.8 installed as gcc2.
 XCOMM BSD/386 1.0 comes with gcc 1.40 as the only compiler.
-XCOMM The default is to use gcc2 on release 2.0 and 1.1 and gcc1 on 1.0
+XCOMM The default is to use gcc2 on release 2.1, 2.0 and 1.1 and gcc1 on 1.0
 XCOMM The defaults can be altered by defining "HasGcc2" as YES or NO in
 XCOMM xf86site.def
 
@@ -37,29 +72,39 @@
 #if HasGcc2
 # ifndef HasGcc2ForCplusplus
 #  define HasGcc2ForCplusplus	YES
+# endif
+# ifdef i386Architecture
+#  define CcCmd			gcc /* shlicc */
+#  define CplusplusCmd		g++ /* shlicc++ */
+#  define OptimizedCDebugFlags	-O2 -m486
+# else
+#  define CcCmd			gcc
+#  define CplusplusCmd		g++
+#  define OptimizedCDebugFlags	-O4 -mv8
 # endif
-# define CcCmd			gcc2
-# define OptimizedCDebugFlags	DefaultGcc2i386Opt
 #else
 # define CcCmd			cc
 # define OptimizedCDebugFlags	-O
 #endif
+
 #define CppCmd		/usr/bin/cpp
 #define TroffCmd	groff -Tps
 #define MkdirHierCmd	mkdir -p
 #define SetTtyGroup	YES
 #define HasNdbm		YES
+#define	DBMLibrary	/**/
 #define HasWChar32      YES
 #define DirFailPrefix -
 #define AvoidNullMakeCommand YES
+
 # ifndef GccUsesGas
 #  define GccUsesGas    YES
 # endif
 #if HasGcc
-#if defined(UseInstalled)
+#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
 #define DefaultCCOptions	/**/
 #else
-#define DefaultCCOptions	-ansi
+#define DefaultCCOptions	/* -ansi */
 #endif
 #endif
 
@@ -68,18 +113,58 @@
 #else
 # define GccGasOption /**/
 #endif
+
+#ifdef i386Architecture
+#ifndef BuildXF86DRI
+#define BuildXF86DRI            NO
+#endif
+#endif
+
+#ifdef i386Architecture
+# define HasTk        YES
+# define TkLibName    tk4.2
+# define TkLibDir     /usr/contrib/lib
+# define TkIncDir     /usr/include
+# define XF86SetupUsesStaticTk        NO
+# define HasTcl       YES
+# define TclLibName   tcl7.6
+# define TclLibDir    /usr/contrib/lib
+# define TclIncDir    /usr/include
+# define XF86SetupUsesStaticTcl       NO
+# define ServerExtraDefines GccGasOption XFree86ServerDefines -I/sys
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# define XFree86ConsoleDefines /**/
+# define AsmDefines -DUSE_GAS
+# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 1)
+#  include <bsdiLib.rules>
+#  define DontUseLibPathVar
+#  define BuildDynamicLoading YES
+#  define ServerCcCmd         cc
+#  define ServerExtraSysLibs  DlLibrary
+# endif
+#endif
+
+#ifdef SparcArchitecture
+# define ServerExtraDefines
+# define ServerOSDefines   -DDDXOSINIT
+#endif
+
+#ifdef PpcArchitecture
+# define BuildServer		NO
+#endif
 
-#define HasShm		YES
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-#define XFree86ConsoleDefines /**/
+#define HasShm			YES
 #define AsmDefines -DUSE_GAS
 
-#define StandardDefines	-DCSRG_BASED
+#ifndef LdPreLib
+#define LdPreLib -L$(BUILDLIBDIR) -L$(USRLIBDIR)
+#endif
+
+#define StandardDefines	-D__ELF__ -DCSRG_BASED
 
 #define InstallCmd /usr/bin/install
-#define EqnCmd eqn -Tps
-#define NeqnCmd eqn -Tascii
+#define	EqnCmd eqn -Tps
+#define	NeqnCmd eqn -Tascii
           COL = col
          NEQN = NeqnCmd
         NROFF = nroff
@@ -87,6 +172,15 @@
 #define DefaultUserPath		:/bin:/usr/bin:/usr/local/bin:$(BINDIR)
 #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
 
+#define StripInstalledPrograms	YES
+#define InstPgmFlags		-s -m 0555 -o bin -g bin
+#define InstBinFlags		-m 0555 -o bin -g bin
+#define InstUidFlags		-m 4555 -o root -g bin
+#define InstLibFlags		-m 0444 -o bin -g bin
+#define InstIncFlags		-m 0444 -o bin -g bin
+#define InstManFlags		-m 0444 -o bin -g bin
+#define InstDatFlags		-m 0444 -o bin -g bin
+
 XCOMM Man pages need to be formatted when installed, so override the default
 XCOMM imake rules.
 
@@ -104,8 +198,6 @@
 	$(RM) /tmp/$$$$.man; \						@@\
 	fi 								@@\
 									@@\
-file.man::								@@\
-									@@\
 install.man::                                                           @@\
 	MakeDir($(DESTDIR)destdir)					@@\
 	-@if [ -f file.0 ]; \						@@\
@@ -146,6 +238,43 @@
 /*
  * These seem redundant, but leave them in for now.
  */
+#ifdef i386Architecture
 #define i386Bsd 1
 #define i386Bsdi 1
 #include <xfree86.cf>
+#endif
+
+#ifdef SparcArchitecture
+#ifndef       XsunMonoServer
+#define       XsunMonoServer  NO              /* monochrome only */
+#endif
+#ifndef       XsunServer
+#define       XsunServer      YES             /* mono + 8 bit color */
+#endif
+#ifndef       Xsun24Server
+#define       Xsun24Server    NO              /* mono + 8 bit color + 24 bit c
+olor */
+#endif
+
+#ifndef       BuildPexExt
+#define       BuildPexExt     (XsunServer || Xsun24Server)
+#endif
+
+#ifndef NeedConstPrototypes
+#define NeedConstPrototypes YES
+#endif
+#ifndef NeedNestedPrototypes
+#define NeedNestedPrototypes YES
+#endif
+#ifndef NeedVarargsPrototypes
+#define NeedVarargsPrototypes YES
+#endif
+
+#define PexCCOptions DefaultCCOptions
+
+#ifndef       BuildXKB
+#define       BuildXKB        YES
+#endif
+
+#endif /* SparcArchitecture */
+
Index: xc/config/cf/bsdiLib.rules
diff -u /dev/null xc/config/cf/bsdiLib.rules:3.1
--- /dev/null	Sat Jul  1 20:41:53 2000
+++ xc/config/cf/bsdiLib.rules	Wed May 17 17:33:16 2000
@@ -0,0 +1,246 @@
+XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.1 2000/05/18 00:33:16 dawes Exp $
+
+/*
+ * BSDI shared library rules (converted from SVr4/Linux rules)
+ */
+
+#ifndef HasSharedLibraries
+#define HasSharedLibraries YES
+#endif
+#ifndef ForceNormalLib
+#define ForceNormalLib YES
+#endif
+#ifndef SharedDataSeparation
+#define SharedDataSeparation NO
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef /**/
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef /**/
+#endif
+#ifndef ShLibIncludeFile
+#define ShLibIncludeFile <bsdiLib.tmpl>
+#endif
+#ifndef SharedLibraryLoadFlags
+#define SharedLibraryLoadFlags -shared
+#endif
+#ifndef PositionIndependentCFlags
+#define PositionIndependentCFlags -fPIC
+#endif
+#ifndef PositionIndependentCplusplusFlags
+#define PositionIndependentCplusplusFlags -fPIC
+#endif
+#ifndef BaseShLibReqs
+#define BaseShLibReqs -lc
+#endif
+#ifndef RanlibInstFlags
+#define	RanlibInstFlags -t
+#endif
+#ifndef SharedCCLdCmd
+/* NOT $(CC), which is probably 'shlicc'.  */
+#define	SharedCCLdCmd cc
+#endif
+
+/*
+ * InstallSharedLibrary - generate rules to install the shared library.
+ */
+#ifndef InstallSharedLibrary
+#define	InstallSharedLibrary(libname,rev,dest)				@@\
+install:: Concat(lib,libname.so.rev) 					@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
+	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
+#endif /* InstallSharedLibrary */
+
+/*
+ * InstallSharedLibraryData - generate rules to install the shared library data
+ */
+#ifndef InstallSharedLibraryData
+#define	InstallSharedLibraryData(libname,rev,dest)
+#endif /* InstallSharedLibraryData */
+
+
+/*
+ * SharedLibraryTarget - generate rules to create a shared library;
+ * build it into a different name so that we do not hose people by having
+ * the library gone for long periods.
+ */
+#ifndef SharedLibraryTarget
+#ifdef UseInstalled  
+#define LinkBuildSonameLibrary(lib) true
+#else
+#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+#endif
+
+#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  solist					@@\
+	$(RM) $@~							@@\
+	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
+	(cd down; $(CCENVSETUP) SharedCCLdCmd -o up/$@~ $(SHLIBLDFLAGS)	  \
+	   -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs);	  \
+	$(RM) $$SONAME; $(LN) $@ $$SONAME;				  \
+	LinkBuildSonameLibrary($$SONAME)				@@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	@SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
+	set -x; $(RM) $$SONAME						@@\
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+
+#endif /* SharedLibraryTarget */
+
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library;
+ * build it into a different name so that we do not hose people by having
+ * the library gone for long periods.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist					@@\
+	$(RM) $@~							@@\
+	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
+	(cd down; $(CCENVSETUP) SharedCCLdCmd -o up/$@~ $(SHLIBLDFLAGS)	  \
+	   -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs);	  \
+	$(RM) $$SONAME; $(LN) $@ $$SONAME;				  \
+	LinkBuildSonameLibrary($$SONAME)				@@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	@SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
+	set -x; $(RM) $$SONAME						@@\
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+
+#endif /* SharedDepLibraryTarget */
+
+#ifndef SharedDepModuleTarget
+#define SharedDepModuleTarget(name,deps,solist)				@@\
+AllTarget(name)								@@\
+									@@\
+name: deps								@@\
+	$(RM) $@~							@@\
+	$(CCENVSETUP) SharedCCLdCmd -o $@~ $(SHLIBLDFLAGS)		  \
+		solist $(REQUIREDLIBS) BaseShLibReqs			@@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+									@@\
+clean::									@@\
+	$(RM) name
+
+#endif /* SharedDepModuleTarget */
+
+
+/*
+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+ */
+#ifndef SharedLibraryDataTarget
+#define SharedLibraryDataTarget(libname,rev,salist)
+#endif /* SharedLibraryTarget */
+
+/*
+ * Hacks for BSD/OS static shared libraries.
+ * We replace the normal library build and install rules.
+ */
+
+SHLIB_MAP=$${SHLIB_MAP-/etc/shlib.map}
+
+#define	BsdiStaticLibraryName(libname)Concat(Concat(lib,libname),_s)
+#define	BsdiStaticStubLibraryName(libname)BsdiStaticLibraryName(libname).a
+
+#define	MakeBsdiStaticSharedLibrary(libname)				  \
+	@SHARED=;							  \
+	eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \
+	    'echo "TADDR=$$2;";'					  \
+	    'echo "DADDR=$$3;";'					  \
+	    'echo "SHARED=$$5;";'					  \
+	    'shift 5; echo "ARGS='"'"'"$$@"'"'"';";'			  \
+	    'exit 0; }'; cat $(SHLIB_MAP)) | sh);			  \
+	[ -n "$$SHARED" ] || exit 0;					  \
+	echo building static shared libname library;			  \
+	shlib -m $(SHLIB_MAP) -t $$TADDR -d $$DADDR			  \
+	    -n BsdiStaticLibraryName(libname)				  \
+	    -s BsdiStaticStubLibraryName(libname)			  \
+	    $$( [ -f 'loader.lib'libname'.c' ] &&			  \
+		echo -b 'loader.lib'libname'.c')			  \
+	    $$( [ -f 'lib'libname'.const' ] &&				  \
+		echo -c 'lib'libname'.const')				  \
+	    $$( [ -f 'lib'libname'.except' ] &&				  \
+		echo -e 'lib'libname'.except')				  \
+	    $$( [ -f $$SHARED ] && echo -i $$SHARED)			  \
+	    $$ARGS LibraryTargetName(libname)
+
+#define	InstallBsdiStaticSharedLibrary(libname)				  \
+	@SHARED=;							  \
+	eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \
+	    'echo "SHARED=$$5;";'					  \
+	    'echo "STUB=$$(dirname $$4)/$$(basename $$5).a;";'		  \
+	    'exit 0; }'; cat $(SHLIB_MAP)) | sh);			  \
+	[ -n "$$SHARED" ] || exit 0;					  \
+	echo installing static shared libname library;			  \
+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)			  \
+	    BsdiStaticLibraryName(libname) $(DESTDIR)$$SHARED;		  \
+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)			  \
+	    BsdiStaticStubLibraryName(libname) $(DESTDIR)$$STUB;	  \
+	RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)$$STUB)			@@\
+	-@eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \
+	    'echo "LDIR=$$(dirname $$4)"; exit 0; }';		  \
+	    cat $(SHLIB_MAP)) | sh);					  \
+	[ -f Concat(loader.lib,libname.c) ] &&				  \
+	    $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)		  	  \
+		Concat(loader.lib,libname.c)				  \
+		$(DESTDIR)$$LDIR/Concat(loader.lib,libname.c); 		  \
+	[ -f Concat(lib,libname.const) ] &&				  \
+	    $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)			  \
+		Concat(lib,libname.const)				  \
+		$(DESTDIR)$$LDIR/Concat(lib,libname.const);		  \
+	[ -f Concat(lib,libname.except) ] &&				  \
+	    $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)			  \
+		Concat(lib,libname.except)				  \
+		$(DESTDIR)$$LDIR/Concat(lib,libname.except); exit 0
+
+#ifndef UnsharedLibraryTarget
+#define	UnsharedLibraryTarget(libname,objlist,down,up)			@@\
+AllTarget(LibraryTargetName(libname))					@@\
+									@@\
+LibraryTargetName(libname): objlist					@@\
+	RemoveFile($@)							@@\
+	(cd down; MakeLibrary(up/$@,objlist))				@@\
+	RanLibrary($@)							@@\
+	_LinkBuildLibrary($@)						@@\
+	MakeBsdiStaticSharedLibrary(libname)				@@\
+									@@\
+clean::									@@\
+	$(RM) BsdiStaticLibraryName(libname) BsdiStaticStubLibraryName(libname)
+#endif /* UnsharedLibraryTarget */
+
+#ifndef UnsharedLibraryTarget3
+#define	UnsharedLibraryTarget3(libname,objlist1,objlist2,objlist3,down,up) @@\
+	UnsharedLibraryTarget(libname,objlist1 objlist2 objlist3,down,up)
+#endif /* UnsharedLibraryTarget3 */
+
+#ifndef InstallLibrary
+#define	InstallLibrary(libname,dest)					@@\
+install:: LibraryTargetName(libname)					@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)			  \
+	    LibraryTargetName(libname) $(DESTDIR)dest			@@\
+	RanLibrary($(RANLIBINSTFLAGS)					  \
+	    $(DESTDIR)dest/LibraryTargetName(libname))			@@\
+	InstallBsdiStaticSharedLibrary(libname)
+#endif /* InstallLibrary */
Index: xc/config/cf/bsdiLib.tmpl
diff -u /dev/null xc/config/cf/bsdiLib.tmpl:3.1
--- /dev/null	Sat Jul  1 20:41:53 2000
+++ xc/config/cf/bsdiLib.tmpl	Wed May 17 17:33:16 2000
@@ -0,0 +1,44 @@
+XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.1 2000/05/18 00:33:16 dawes Exp $
+
+/*
+ * BSDI shared library template (converted from Linux template)
+ */
+
+/*
+ * Linux ELF shared libraries (which BSDI uses)
+ * are deficient in link semantics...
+ */
+
+#ifndef FixupLibReferences
+#define FixupLibReferences()						@@\
+XMULIBONLY = -lXmu							@@\
+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+#endif
+
+#ifndef XawClientLibs
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#endif
+
+#define CplusplusLibC
+#define FrescoSysLibs	CplusplusLibC MathLibrary
+
+#define SharedX11Reqs
+#define SharedOldXReqs	$(LDPRELIB) $(XLIBONLY)
+#define SharedXtReqs	$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
+#define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define SharedXaw6Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXextReqs	$(LDPRELIB) $(XLIBONLY)
+#define SharedXiReqs	$(LDPRELIB) $(XLIB)
+#define SharedPexReqs	$(LDPRELIB) $(XLIBONLY) MathLibrary
+#define SharedXtstReqs	$(LDPRELIB) $(XLIB)
+#define SharedXieReqs	$(LDPRELIB) $(XLIBONLY)
+#define SharedSMReqs	$(LDPRELIB) $(ICELIB)
+#define SharedFrescoReqs	$(LDPRELIB) $(XLIBONLY) FrescoSysLibs
+#define SharedXtfReqs	$(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs
+
+/* Motif lib requirements */
+#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB)
+#define SharedXmReqs $(LDPRELIB) SharedXReqs
+#define SharedMrmReqs $(LDPRELIB) $(XMLIB) SharedXReqs
+#define SharedUilReqs $(LDPRELIB) $(XMLIB) SharedXReqs
Index: xc/config/cf/itsy.cf
diff -u xc/config/cf/itsy.cf:1.1 xc/config/cf/itsy.cf:1.2
--- xc/config/cf/itsy.cf:1.1	Wed Dec 29 19:57:05 1999
+++ xc/config/cf/itsy.cf	Fri Mar 31 12:13:11 2000
@@ -2,8 +2,8 @@
  * This configuration file contains additional configuration needed
  * to cross compile X for the Compaq Itsy handheld computer.
  * To use this, add the following to host.def:
+   #define KDriveXServer YES
    #define XItsyServer YES
-   #define KDriveServer YES
  */
  
 #define CrossCompiling YES
Index: xc/config/cf/kdrive.cf
diff -u xc/config/cf/kdrive.cf:1.2 xc/config/cf/kdrive.cf:1.3
--- xc/config/cf/kdrive.cf:1.2	Wed Dec 29 19:56:16 1999
+++ xc/config/cf/kdrive.cf	Fri Mar 31 14:55:14 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.2 1999/12/30 03:56:16 robin Exp $
+XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.3 2000/03/31 22:55:14 dawes Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the XFree86 based X Servers.
@@ -198,6 +198,7 @@
 #define InstallDriverSDKMultipleDestFlags(list,dest,flags)		/**/
 #define InstallDriverSDKDynamicModule(module,dest,subdir)		/**/
 #define InstallDriverSDKObjectModule(module,dest,subdir)		/**/
+#define InstallDriverSDKObjectSubModule(module,dest,subdir)		/**/
 #define InstallDriverSDKLibraryModule(module,dest,subdir)		/**/
 #define ServerDriverSDKTarget(program)					/**/
 #define InstallDriverSDKProgramWithFlags(program,dest,flags)		/**/
Index: xc/config/cf/linux.cf
diff -u xc/config/cf/linux.cf:3.119 xc/config/cf/linux.cf:3.129
--- xc/config/cf/linux.cf:3.119	Thu Mar  2 17:11:05 2000
+++ xc/config/cf/linux.cf	Sat Jun 24 10:43:44 2000
@@ -1,5 +1,5 @@
 XCOMM platform:  $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
-XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.119 2000/03/03 01:11:05 mvojkovi Exp $
+XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.129 2000/06/24 17:43:44 dawes Exp $
 
 #ifndef LinuxElfDefault
 #define LinuxElfDefault		YES
@@ -172,12 +172,14 @@
 /* The DRM module requires kernel services that appeared in late 2.1.x
    kernels and are known to be present in 2.2.x kernels. */
 #ifndef BuildXF86DRI
-#  ifdef i386Architecture
+#  if defined(i386Architecture)
 #    if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
 #      define BuildXF86DRI            YES
 #    else
 #      define BuildXF86DRI            NO
 #    endif
+#  elif defined(SparcArchitecture)
+#    define BuildXF86DRI              YES
 #  else
 #    define BuildXF86DRI              NO
 #  endif
@@ -270,7 +272,9 @@
 #endif
 
 #define AvoidNullMakeCommand	YES
-#define DebuggableLibraries	YES
+#ifndef DebuggableLibraries
+#define DebuggableLibraries	NO
+#endif
 #define CompressAllFonts	YES
 #define Malloc0ReturnsNull	YES
 #define NeedConstPrototypes	YES
@@ -289,6 +293,14 @@
 #define MkdirHierCmd		mkdir -p
 #if LinuxElfDefault
 #if UseElfFormat
+# ifdef MipsArchitecture
+#  ifndef AsCmd
+#    define AsCmd                gcc -c -x assembler-with-cpp
+#  endif
+#  ifndef DoLoadableServer
+#    define DoLoadableServer NO
+#  endif
+# endif /* MipsArchitecure */
 #ifndef CcCmd
 #define CcCmd			gcc
 #endif
@@ -336,7 +348,6 @@
 #define AsCmd                 as
 #define LdCmd                 ld
 #define AsmDefines            -DUSE_GAS -U__ELF__
-#define HasSharedLibraries    NO
 #endif /* ia64Architecture */
 #ifdef i386Architecture
 #define CcCmd			gcc -b i486-linuxaout
@@ -368,7 +379,6 @@
 #define AsCmd                 as
 #define LdCmd                 ld
 #define AsmDefines            -D__ELF__
-#define HasSharedLibraries    NO
 #endif /* ia64Architecture */
 #ifdef i386Architecture
 #define CcCmd			gcc -b i486-linux
@@ -396,7 +406,9 @@
 #define DoLoadableServer	YES
 #endif
 #endif
+#ifndef CppCmd
 #define CppCmd			/lib/cpp
+#endif
 /* Some Linux distributions have yacc, some don't. All have bison. */
 #define YaccCmd			bison -y
 #define LexCmd			flex -l
@@ -414,8 +426,8 @@
 #define HasVarRun		YES
 #define VarDbDirectory		/var/state
 
-#ifndef XF86ExtraCardDrivers
-#define XF86ExtraCardDrivers	v4l
+#ifndef XF86OSCardDrivers
+#define XF86OSCardDrivers	v4l
 #endif
 
 #ifdef i386Architecture
@@ -441,6 +453,7 @@
 #define LinuxMachineDefines   -D__ia64__
 #define ServerOSDefines       XFree86ServerOSDefines -DDDXTIME -DPART_NET
 #define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#define DoLoadableServer      NO
 #endif /* ia64Architecture */
 
 #ifdef Mc68020Architecture
@@ -465,10 +478,21 @@
 #define LinuxMachineDefines	-D__sparc__
 #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
 #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#define PositionIndependentCFlags -fpic
-#define PositionIndependentCplusplusFlags -fpic
+#define AsVISOption		-Av9a
+#ifdef Sparc64Architecture
+#define AsOutputArchSize	64
+#else
+#define AsOutputArchSize	32
+#endif
 #endif
 
+#ifdef MipsArchitecture
+#define OptimizedCDebugFlags	-O2
+#define LinuxMachineDefines	-D__mips__
+#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
+#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+#endif 
+
 #ifndef StandardDefines
 #define StandardDefines		-Dlinux LinuxMachineDefines LinuxSourceDefines
 #endif
@@ -511,6 +535,14 @@
 #ifndef StaticLibrary
 #define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
 #endif
+
+#ifndef LinkGLToUsrLib
+#define LinkGLToUsrLib	YES
+#endif
+#ifndef LinkGLToUsrInclude
+#define LinkGLToUsrInclude	YES
+#endif
+
 
 #define HasGnuMake	YES
 
Index: xc/config/cf/lnxLib.rules
diff -u xc/config/cf/lnxLib.rules:3.37 xc/config/cf/lnxLib.rules:3.38
--- xc/config/cf/lnxLib.rules:3.37	Sun Jun  6 01:47:44 1999
+++ xc/config/cf/lnxLib.rules	Thu Jun 15 13:49:56 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $
-XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.37 1999/06/06 08:47:44 dawes Exp $
+XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.38 2000/06/15 20:49:56 dawes Exp $
 
 /*
  * Linux shared library rules (DLL & ELF versions)
@@ -11,7 +11,9 @@
 #define ForceNormalLib NO
 #endif
 
+#ifndef SharedOldX
 #define SharedOldX NO
+#endif
 
 #if UseElfFormat
 
Index: xc/config/cf/lynx.cf
diff -u xc/config/cf/lynx.cf:3.33 xc/config/cf/lynx.cf:3.37
--- xc/config/cf/lynx.cf:3.33	Mon Feb 14 11:20:18 2000
+++ xc/config/cf/lynx.cf	Tue Jun 20 13:07:56 2000
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.33 2000/02/14 19:20:18 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.37 2000/06/20 20:07:56 dawes Exp $
 
 
 #ifndef OSName
@@ -50,10 +50,15 @@
 #ifndef HasPosixRegex
 #define HasPosixRegex		NO
 #endif
+#if OSMajorVersion == 3 && OSMinorVersion == 1
+# ifndef UseSmartScheduler
+#  define UseSmartScheduler	NO
+# endif
+#endif
 
 #define HasPosixThreads		YES
 #define ThreadedX		YES
-#define HasThreadSafeAPI	YES	/* only 2.[345].0 ?? */
+#define HasThreadSafeAPI	YES
 #if HasGcc2
 # if OSMajorVersion == 2 && OSMinorVersion == 3
 #  define ThreadsCompileFlags	-mposix -mthreads
@@ -69,7 +74,7 @@
 #if OSMajorVersion == 2 && OSMinorVersion < 3
 # define ThreadsLibraries /lib/thread/libc.a /lib/thread/libc_p.a
 #endif
-#if OSMajorVersion == 3 || (OSMajorVersion == 2 && OSMinorVersion <= 5)
+#if (OSMajorVersion == 3 && OSMinorVersion == 0) || (OSMajorVersion == 2 && OSMinorVersion <= 5)
 # define ThreadPreStdAPIDefines	-DXPRE_STANDARD_API
 #endif
 #define AvoidNullMakeCommand	YES
@@ -206,13 +211,21 @@
 /* 3.0 ships with a useable Tcl/Tk for XF86Setup */
 #if OSMajorVersion == 3
 # ifndef TkLibName
-#  define TkLibName             tk4.2
+#  if OSMinorVersion == 0
+#   define TkLibName		tk4.2
+#  else
+#   define TkLibName		tk8.0
+#  endif
 # endif
 # ifndef TkLibDir
 #  define TkLibDir              /usr/lib
 # endif
 # ifndef TclLibName
-#  define TclLibName            tcl7.6
+#  if OSMinorVersion == 0
+#   define TclLibName		tcl7.6
+#  else
+#   define TclLibName		tcl8.0
+#  endif
 # endif
 # ifndef TclLibDir
 #  define TclLibDir             /usr/lib
@@ -267,6 +280,8 @@
  */
 #ifndef InstallManPageLong
 #define InstallManPageLong(file,destdir,dest)                           @@\
+BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+									@@\
 install.man:: file.man                                                  @@\
 	MakeDir($(DESTDIR)destdir)					@@\
 	$(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*			@@\
@@ -282,6 +297,8 @@
 
 #ifndef InstallManPageAliases
 #define InstallManPageAliases(file,destdir,aliases)                     @@\
+InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+									@@\
 install.man::                                                           @@\
 	@(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \	@@\
 	for i in aliases; do (set -x; \ 				@@\
@@ -294,6 +311,8 @@
 
 #ifndef InstallGenManPageLong
 #define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
+BuildInstallHtmlManPage(file,dest,suffix)				@@\
+									@@\
 install.man:: file.man                                                  @@\
 	MakeDir($(DESTDIR)destdir)					@@\
 	$(RM) $(DESTDIR)destdir/dest.suffix*				@@\
Index: xc/config/cf/os2.cf
diff -u xc/config/cf/os2.cf:3.28 xc/config/cf/os2.cf:3.29
--- xc/config/cf/os2.cf:3.28	Thu Apr 29 02:13:20 1999
+++ xc/config/cf/os2.cf	Wed Apr  5 11:13:08 2000
@@ -2,7 +2,7 @@
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.29 2000/04/05 18:13:08 dawes Exp $
 
 #define OSName           OS/2
 #define OSVendor	 IBM
@@ -37,7 +37,8 @@
  * Please report any directories missed to Holger.Veit@gmd.de 
 */
 #ifdef UseInstalled
-#define IncRoot $(X11ROOT)/XFree86/include
+/*#define IncRoot $(X11ROOT)/XFree86/include*/
+#define ConfigDir $(X11ROOT)$(LIBDIR)/config
 #define LdPreLib -L$(X11ROOT)/XFree86/lib
 #endif
 
@@ -53,6 +54,7 @@
 #define FileManSuffix	4
 #define XmanSearchPath	/XFree86/man/man
 #define ManSourcePath	$(MANPATH)
+#define DontUseLibPAthVar YES
 
 /* you must have installed groff! */
 #define TblCmd		tbl
@@ -75,6 +77,12 @@
 #ifndef BuildLBX
 #define BuildLBX		YES
 #endif
+#ifndef DoLoadableServer
+#define DoLoadableServer        YES
+#endif
+#undef MakeDLLModules
+#define MakeDLLModules          NO
+
 
 /* some more properties of the OS/2 implementation */
 #define HasNdbm         	YES
@@ -82,6 +90,7 @@
 #define HasSockets		YES
 #define HasSnprintf		YES
 #define HasBsearch		NO
+#define HasFchown		NO
 #define HasLargeTmp		NO
 #define HasPoll			NO
 #define HasBSD44Sockets 	NO
@@ -90,6 +99,7 @@
 #define HasVFork		NO
 #define HasVarDirectory		NO
 #define HasStrcasecmp		NO
+#define StrcasecmpDefines	-DNEED_STRCASECMP -Dstrcasecmp=stricmp -Dstrncasecmp=strnicmp
 #define Malloc0ReturnsNull	YES
 #define SetTtyGroup     	NO
 #ifndef HasLibCrypt
@@ -101,6 +111,7 @@
 #define ConnectionFlags		-DTCPCONN -DOS2PIPECONN
 #define StdIncDir $(C_INCLUDE_PATH)
 #define HasStickyDirBit		NO
+#define HasMkstemp		NO
 
 /* XF86Setup stuff - does not work yet! */
 #define HasTcl			NO
@@ -205,18 +216,9 @@
 #define InstDatFlags /**/
 #define InstallFlags /**/
 
-#ifdef i386Architecture
-# define OptimizedCDebugFlags 	DefaultGcc2i386Opt
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-#else
-# define OptimizedCDebugFlags 	-O
-# define ServerOSDefines 	/**/
-#endif
-#ifdef i386Architecture
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-#else
-#define ServerExtraDefines GccGasOption
-#endif
+#define OptimizedCDebugFlags 	DefaultGcc2i386Opt
+#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
+#define ServerExtraDefines	GccGasOption XFree86ServerDefines
 
 /*
  * Make & install Features
@@ -263,6 +265,9 @@
 Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
 LintLibReferences(varname,libname,libsource)
 #endif
+
+#define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S)
+
 
 #include <os2.rules>
 #include <os2Lib.rules>
Index: xc/config/cf/os2.rules
diff -u xc/config/cf/os2.rules:3.20 xc/config/cf/os2.rules:3.21
--- xc/config/cf/os2.rules:3.20	Sat Jul 10 00:24:34 1999
+++ xc/config/cf/os2.rules	Wed Apr  5 11:13:09 2000
@@ -2,7 +2,7 @@
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/os2.rules,v 3.20 1999/07/10 07:24:34 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/os2.rules,v 3.21 2000/04/05 18:13:09 dawes Exp $
 
 .SUFFIXES: .Osuf .c .CCsuf
 
@@ -22,6 +22,7 @@
 #define Fontc \bdftopcf
 #define MkFontDir \mkfontdir
 #define XkbComp \xkbcomp
+#define PsWrap \pswrap
 #else
 #define ImakeHelper imakesvc
 #define IMmode u
@@ -30,6 +31,7 @@
 #define Fontc bdftopcf
 #define MkFontDir mkfontdir
 #define XkbComp xkbcomp
+#define PsWrap pswrap
 #endif
 
 #define echo ImakeHelper 8 
@@ -248,10 +250,10 @@
 	RMoveToBakFile(Makefile)					@@\
 	ImakeSubCmdHelper -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) imakeflags
 
-#define AssembleObject(flags) $(RM) $@                                  @@\
+#define AssembleObject(flags) RemoveFile($@)                            @@\
 	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags $*.S | grep -v '^\#' > _tmp_.s @@\
 	$(CC) $(CFLAGS) -o $*.Osuf -c _tmp_.s                           @@\
-	$(RM) _tmp_.s
+	RemoveFile(_tmp_.s)
 
 #define NormalAsmObjectRule()                                           @@\
 .S.Osuf:                                                                @@\
@@ -316,11 +318,11 @@
 	$(MAKE) SHELL= MAKE=x11make $(MFLAGS) extra Concat(Build,target)			@@\
 									@@\
 Concat(Build,target):							@@\
-	$(RM) target.c							@@\
+	RemoveFile(target.c)						@@\
 	script args							@@\
 									@@\
 clean::									@@\
-	$(RM) target.c
+	RemoveFile(target.c)
 
 #ifndef ServerTargetWithFlags
 #define	ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
@@ -562,3 +564,14 @@
 	ImakeHelper 13 $(BUILDMODULEDIR) $(BUILDMODULETOP)/$(CURRENT_DIR)/module name
 #endif /* LinkBuildNamedModule */
 
+#ifndef MakeEncDir
+#define MakeEncDir(deplist,inst,dirlist )				@@\
+AllTarget(encodings.dir)						@@\
+									@@\
+encodings.dir: deplist							@@\
+	RemoveFiles(encodings.dir fonts.dir)				@@\
+	ImakeHelper 16 MkFontDir dirlist				@@\
+									@@\
+clean::									@@\
+	RemoveFiles(fonts.dir encodings.dir)
+#endif
Index: xc/config/cf/os2Lib.rules
diff -u xc/config/cf/os2Lib.rules:3.10 xc/config/cf/os2Lib.rules:3.11
--- xc/config/cf/os2Lib.rules:3.10	Thu Apr 29 02:13:20 1999
+++ xc/config/cf/os2Lib.rules	Wed Apr  5 11:13:09 2000
@@ -2,7 +2,7 @@
 
 
 
-XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.10 1999/04/29 09:13:20 dawes Exp $
+XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.11 2000/04/05 18:13:09 dawes Exp $
 
 /*
  * OS2/EMX shared library rules (DLL version)
@@ -40,7 +40,7 @@
 #endif
 
 #ifndef NormalSharedLibObjCompile
-#define NormalSharedLibObjCompile(options) $(RM) $@                        @@\
+#define NormalSharedLibObjCompile(options) RemoveFile($@)                       @@\
 	$(CC) -c $(CFLAGS) options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $*.c @@\
 	touch $*.o
 #endif
@@ -113,12 +113,12 @@
 
 #ifndef SharedLibraryTarget
 #define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(libname.dll)							@@\
+AllTarget(Concat3(libname,rev,.dll))					@@\
 .SUFFIXES: .obj .rsp .def						@@\
         LBRPATH = $(subst /,\,$(LIBRARY_PATH))				@@\
-        LBRDEF = Concat3(libname,os2,.def)				@@\
-	LBRCPPDEF = Concat3(libname,os2,-def.cpp)			@@\
-	LBRRSP = Concat3(libname,os2,.rsp)				@@\
+        LBRDEF = Concat4(libname,rev,os2,.def)				@@\
+	LBRCPPDEF = Concat4(libname,rev,os2,-def.cpp)			@@\
+	LBRRSP = Concat4(libname,rev,os2,.rsp)				@@\
 									@@\
 link.rsp: $(LBRRSP) $(LBRDEF)						@@\
 	@echo $(LBRPATH)\\dll0.obj+ >link.rsp				@@\
@@ -126,13 +126,13 @@
 	@echo $(LBRPATH)\\mt\\ $(LBRPATH)\\ $(REQUIREDLIBS) bsd socket c_alias c_static c_import os2 emx2 end >>link.rsp	@@\
 	@echo $(LBRDEF) >>link.rsp					@@\
 									@@\
-libname.dll:  $(OBJS) link.rsp						@@\
+Concat3(libname,rev,.dll):  $(OBJS) link.rsp				@@\
 	link386 @link.rsp >nul						@@\
-	BuildDllSupportLibs2(libname)					@@\
-	LinkBuildLibrary(libname.dll)					@@\
+	BuildDllSupportLibs2(Concat(libname,rev))			@@\
+	LinkBuildLibrary(Concat3(libname,rev,.dll))			@@\
 									@@\
 clean::									@@\
-	$(RM) libname.lib libname.imp *.obj link.rsp
+	RemoveFiles(Concat3(libname,rev,.lib) Concat3(libname,rev,.imp) *.obj link.rsp)
 #endif /* SharedLibraryTarget */
 
 #ifndef NormalLibraryTarget
Index: xc/config/cf/os2Lib.tmpl
diff -u xc/config/cf/os2Lib.tmpl:3.8 xc/config/cf/os2Lib.tmpl:3.9
--- xc/config/cf/os2Lib.tmpl:3.8	Sun Jun  6 05:13:23 1999
+++ xc/config/cf/os2Lib.tmpl	Wed Apr  5 11:13:10 2000
@@ -2,7 +2,7 @@
 
 
 
-XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $
+XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.9 2000/04/05 18:13:10 dawes Exp $
 
 /*
  * OS2/EMX shared library template
@@ -13,6 +13,7 @@
 
 /* note these are special because of linking with link386 */
 #ifdef NOT_EMX
+#define SharedX11Libs $(LDPRELIB) $(SHM)
 #define SharedXtReqs $(LDPRELIB) $(XLIBONLY)
 #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
 #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
@@ -29,9 +30,13 @@
 #define SharedGLReqs $(LDPRELIBS) $(XLIB)
 #define SharedXfontReqs $(LDPRELIBS) $(XLIB)
 #define SharedXpmReqs $(LDPRELIBS) $(XLIB)
+#define SharedDPSReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedDPSTKReqs $(LDPRELIBS) $(DPSLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
 #else
+#define SharedX11Reqs shm
 #define SharedXtReqs ..\\..\\exports\\lib\\ ICE SM X11
 #define SharedXawReqs ..\\..\\exports\\lib\\ Xmu Xt Xpm X11 Xext
+#define SharedXaw6Reqs ..\\..\\exports\\lib\\ Xmu Xt Xpm X11 Xext
 #define SharedXmuReqs ..\\..\\exports\\lib\\ Xt X11 Xext
 #define SharedSMReqs ..\\..\\exports\\lib\\ ICE
 #define SharedXextReqs ..\\..\\exports\\lib\\ X11
@@ -45,8 +50,48 @@
 #define SharedGLReqs ..\\..\\exports\\lib\\ X11 Xext
 #define SharedXfontReqs ..\\..\\exports\\lib\\ X11
 #define SharedXpmReqs ..\\..\\exports\\lib\\ X11
+#define SharedDPSReqs ..\\..\\exports\\lib\\ Xmu Xt X11
+#define SharedDPSTKReqs ..\\..\\exports\\lib\\ DPS Xmu Xt X11
 #endif
 
+/* library revisions, these are typically empty! */
+#define SharedX11Rev /**/
+#define SharedXThrStubRev /**/
+#define SharedXextRev /**/
+#define SharedXssRev /**/
+#define SharedXxf86miscRev /**/
+#define SharedXxf86vmRev /**/
+#define SharedXxf86dgaRev /**/
+#define SharedXxf86rushRev /**/
+#define SharedXvRev /**/
+#define SharedXineramaRev /**/
+#define SharedDpsRev /**/
+#define SharedDpsTkRev /**/
+#define SharedPSResRev /**/
+#define SharedXantiRev /**/
+#define SharedGlxRev /**/
+#define SharedXfontcacheRev /**/
+#define SharedXauRev /**/
+#define SharedXdmcpRev /**/
+#define SharedXmuRev /**/
+#define SharedOldXRev /**/
+#define SharedXpRev /**/
+#define SharedXtRev /**/
+#define SharedXaRev /**/
+#define SharedXawRev /**/
+#define SharedXaw6Rev 6
+#define SharedXiRev /**/
+#define SharedXtstRev /**/
+#define SharedPexRev /**/
+#define SharedXieRev /**/
+#define SharedPhigsRev /**/
+#define SharedICERev /**/
+#define SharedSMRev /**/
+#define SharedXkeyRev /**/
+#define SharedFSRev /**/
+#define SharedFontRev /**/
+#define SharedXpmRev /**/
+
 /*
  * By setting this in your Imakefile, you can force using static libraries
  * to be linked with you app, rather than DLLs
@@ -61,6 +106,7 @@
 #define SDlibXmu -lXmu_s
 #define SDlibXt -lXt_s
 #define SDlibXaw -lXaw_s
+#define SDlibXaw6 -lXaw_s
 #define SDlibXi -lXi_s
 #define SDlibXIE -lXIE_s
 #define SDlibXtst -lXtst_s
@@ -68,12 +114,15 @@
 #define SDlibXp -lXp_s
 #define SDlibXv -lXv_s
 #define SDlibGL -lGL_s
+#define SDlibDPS -lDPS_s
+#define SDlibDPSTK -lDPSTK_s
 #else
 #define SDlibX11 -lX11
 #define SDlibXExt -lXExt
 #define SDlibXmu -lXmu
 #define SDlibXt -lXt
 #define SDlibXaw -lXaw
+#define SDlibXaw6 -lXaw
 #define SDlibXi -lXi
 #define SDlibXIE -lXIE
 #define SDlibXtst -lXtst
@@ -81,6 +130,8 @@
 #define SDlibXp -lXp
 #define SDlibXv -lXv
 #define SDlibGL -lGL
+#define SDlibDPS -lDPS
+#define SDlibDPSTK -lDPSTK
 #endif
 
 /*
@@ -114,6 +165,10 @@
        DEPXAWLIB = 
           XAWLIB = _Use(SDlibXaw,-L$(AWIDGETSRC) SDlibXaw)
 #endif
+#if SharedLibXaw6
+      DEPXAW6LIB = 
+         XAW6LIB = _Use(SDlibXaw6,-L$(AWIDGETSRC) SDlibXaw6)
+#endif
 #if SharedLibXi
         DEPXILIB = 
            XILIB = _Use(SDlibXi,-L$(XILIBSRC) SDlibXi)
@@ -127,14 +182,22 @@
          PEXLIB = _Use(SDlibPEX5,-L$(PEXLIBSRC) SDlibPEX5)
 #endif
 #if SharedLibXp
- DEPEXTENSIONLIB = 
-    EXTENSIONLIB = _Use(SDlibXp,-L$(EXTENSIONSRC)/lib SDlibXp)
+       DEPXPLIB = 
+          XPLIB = _Use(SDlibXp,-L$(EXTENSIONSRC)/lib SDlibXp)
 #endif
 #if SharedLibXv
- DEPEXTENSIONLIB = 
-    EXTENSIONLIB = _Use(SDlibXv,-L$(EXTENSIONSRC)/lib SDlibXv)
+       DEPXVLIB = 
+          XVLIB = _Use(SDlibXv,-L$(EXTENSIONSRC)/lib SDlibXv)
 #endif
 #if SharedLibGL
- DEPEXTENSIONLIB = 
-    EXTENSIONLIB = _Use(SDlibGL,-L$(EXTENSIONSRC)/lib SDlibGL)
+       DEPGLLIB = 
+          GLLIB = _Use(SDlibGL,-L$(EXTENSIONSRC)/lib SDlibGL)
+#endif
+#if SharedLibDPS
+      DEPDPSLIB = 
+         DPSLIB = _Use(SDlibDPS,-L$(EXTENSIONSRC)/lib SDlibDPS)
+#endif
+#if SharedLibDPSTK
+    DEPDPSTKLIB = 
+       DPSTKLIB = _Use(SDlibDPSTK,-L$(EXTENSIONSRC)/lib SDlibDPSTK)
 #endif
Index: xc/config/cf/sgiLib.rules
diff -u xc/config/cf/sgiLib.rules:1.2 xc/config/cf/sgiLib.rules:1.3
--- xc/config/cf/sgiLib.rules:1.2	Sun Jan 10 21:13:08 1999
+++ xc/config/cf/sgiLib.rules	Thu Jun 15 13:49:56 2000
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: sgiLib.rules /main/16 1996/09/28 18:11:04 rws $
-XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $
+XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.3 2000/06/15 20:49:56 dawes Exp $
 
 #ifndef HasSharedLibraries
 #define HasSharedLibraries YES
@@ -180,5 +180,25 @@
 #ifndef SharedLibraryDataTarget
 #define SharedLibraryDataTarget(libname,rev,salist)
 #endif /* SharedLibraryTarget */
+
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)           @@\
+AllTarget(Concat(lib,libname.so.rev))                                 @@\
+                                                                      @@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)              @@\
+      $(RM) $@~                                                       @@\
+      (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -soname $@ solist $(REQUIREDLIBS))      @@\
+      $(RM) $@                                                        @@\
+      $(MV) $@~ $@                                                    @@\
+      $(RM) Concat(lib,libname.so)                                    @@\
+      $(LN) $@ Concat(lib,libname.so)                                 @@\
+      LinkBuildLibrary($@)                                            @@\
+      LinkBuildLibrary(Concat(lib,libname.so))                        @@\
+      sgiX11soHack(libname)                                           @@\
+                                                                      @@\
+clean::                                                                      @@\
+      $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) so_locations
+
+#endif /* SharedDepLibraryTarget */
 
 #endif /* OsMajorVersion < 5 else */
Index: xc/config/cf/site.def
diff -u xc/config/cf/site.def:3.22 xc/config/cf/site.def:3.24
--- xc/config/cf/site.def:3.22	Thu Oct  1 23:15:06 1998
+++ xc/config/cf/site.def	Sun Jun 25 13:17:29 2000
@@ -21,7 +21,7 @@
  * .cf file, not overridden in site.def.                                   *
  *                                                                         *
  ***************************************************************************/
-XCOMM site:  $XFree86: xc/config/cf/site.def,v 3.22 1998/10/02 06:15:06 dawes Exp $
+XCOMM site:  $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $
 
 /* if you want host-specific customization, this is one way to do it */
 /*
@@ -86,6 +86,22 @@
 #ifndef ProjectRoot
 #define ProjectRoot /usr/X11R6
 #endif
+
+/*
+ * On some platforms, some things may be installed outside of ProjectRoot
+ * by default.  To disable this, uncomment the following line.
+ *
+#define NothingOutsideProjectRoot YES
+ */
+
+/*
+ * Set EtcX11Directory if you want config file links installed under
+ * ProjectRoot rather than in /etc/X11.  See also HasVarDirectory,
+ * UseEtcX11 and UseSeparateConfDir.
+ *
+#define EtcX11Directory ProjectRoot/etc
+ */
+
 
 /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
 /* #define HasXdmAuth YES */
Index: xc/config/cf/sun.cf
diff -u xc/config/cf/sun.cf:3.50 xc/config/cf/sun.cf:3.52
--- xc/config/cf/sun.cf:3.50	Sat Mar 27 18:34:19 1999
+++ xc/config/cf/sun.cf	Tue Jun 20 15:08:36 2000
@@ -3,7 +3,7 @@
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/sun.cf,v 3.50 1999/03/28 02:34:19 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/sun.cf,v 3.52 2000/06/20 22:08:36 dawes Exp $
 
 #ifndef OSName
 # define OSName		DefaultOSName
@@ -238,7 +238,7 @@
 #  endif
 # endif 		/* OSMinorVersion > 1 */
 # ifndef UseExportLists
-#  if OSMinorVersion > 4
+#  if (OSMinorVersion > 4) && !HasGcc2
 #   define UseExportLists YES
 #  else
 #   define UseExportLists NO
@@ -287,6 +287,14 @@
 # ifndef BuildPexExt
 #  define BuildPexExt	  (XsunServer || Xsun24Server)
 # endif
+#if (OSMajorVersion > 4)
+# ifdef UseGas
+#  define AsVISOption		-Av9a
+# else
+#  define AsVISOption		-xarch=v8plus
+#endif
+# define AsOutputArchSize	32
+#endif
 #endif /* not i386Architecture */
 
 #if OSMajorVersion >= 4
Index: xc/config/cf/svr3.cf
diff -u xc/config/cf/svr3.cf:3.12 xc/config/cf/svr3.cf:3.13
--- xc/config/cf/svr3.cf:3.12	Mon Feb 28 19:08:56 2000
+++ xc/config/cf/svr3.cf	Tue Mar 21 11:56:59 2000
@@ -2,7 +2,7 @@
 
 
 
-XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.12 2000/02/29 03:08:56 dawes Exp $
+XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.13 2000/03/21 19:56:59 dawes Exp $
 
 #ifndef HasGcc
 #define HasGcc      YES
@@ -255,6 +255,8 @@
 
 #ifndef InstallManPageLong
 #define InstallManPageLong(file,destdir,dest)                           @@\
+BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
+									@@\
 install.man:: file.man                                                  @@\
         MakeDir($(DESTDIR)destdir)                                      @@\
         $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*                      @@\
@@ -266,6 +268,8 @@
 
 #ifndef InstallGenManPageLong
 #define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
+BuildInstallHtmlManPage(file,dest,suffix)				@@\
+									@@\
 install.man:: file.man                                                  @@\
         MakeDir($(DESTDIR)destdir)                                      @@\
         $(RM) $(DESTDIR)destdir/dest.suffix*                            @@\
@@ -295,8 +299,9 @@
  * InstallManPageAliases - generate rules to install manual page aliases.
  * (Make hard links on SVR3.)
  */
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
+#ifndef InstallManPageAliasesBase
+#define InstallManPageAliasesBase(file,destdir,aliases)			@@\
+
 install.man::                                                           @@\
         @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \     @@\
         for i in aliases; do (set -x; \                                 @@\
@@ -306,9 +311,18 @@
         done)
 #endif
 
+#ifndef InstallManPageAliases
+#define InstallManPageAliases(file,destdir,aliases)			@@\
+InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
+#endif
+
 #ifndef InstallGenManPageAliases
 #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
+InstallHtmlManPageAliases(file,aliases,suffix)				@@\
+									@@\
+InstallManPageAliasesBase(file,destdir,aliases)
 #endif
 
 #endif /* FormattedManPages */
Index: xc/config/cf/svr4.cf
diff -u xc/config/cf/svr4.cf:3.38 xc/config/cf/svr4.cf:3.40
--- xc/config/cf/svr4.cf:3.38	Wed Dec  8 13:36:55 1999
+++ xc/config/cf/svr4.cf	Fri Jun 16 18:40:39 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $
-XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.38 1999/12/08 21:36:55 robin Exp $
+XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.40 2000/06/17 01:40:39 dawes Exp $
 /*
  * A default OS name
  */
@@ -133,7 +133,10 @@
 #ifndef XawI18nDefines
 #define XawI18nDefines		-DUSE_XWCHAR_STRING
 #endif
+#ifndef UseSmartScheduler
+#define UseSmartScheduler	NO
 #endif
+#endif
 #ifdef i386Architecture
 #ifndef HasPosixRegex
 #define HasPosixRegex		NO
@@ -222,6 +225,10 @@
 #if !HasGcc
 #define StaticLibrary(libpath,libname) -B static Concat(-L,libpath) Concat(-l,libname) -B dynamic
 #endif
+#endif
+
+#ifndef SharedLibXdmGreet
+#define SharedLibXdmGreet	YES
 #endif
 
 #if defined(i386Architecture) || defined(PpcArchitecture)
Index: xc/config/cf/xf86.rules
diff -u xc/config/cf/xf86.rules:3.30 xc/config/cf/xf86.rules:3.31
--- xc/config/cf/xf86.rules:3.30	Wed Oct 13 09:49:02 1999
+++ xc/config/cf/xf86.rules	Fri Mar 31 14:55:15 2000
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $
-XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.30 1999/10/13 16:49:02 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.31 2000/03/31 22:55:15 dawes Exp $
 
 /*
  * These rules are needed to build the XFree86 X Servers
@@ -222,6 +222,21 @@
 #else
 #define InstallDriverSDKObjectModule(module,dest,subdir)		@@\
 InstallDriverSDKDynamicModule(Concat(module,_drv.o),dest,subdir)
+#endif
+#endif
+#endif
+
+
+#ifndef InstallDriverSDKObjectSubModule
+#if !DoLoadableServer
+#define InstallDriverSDKObjectSubModule(module,dest,subdir)		/**/
+#else
+#if MakeDllModules
+#define InstallDriverSDKObjectSubModule(module,dest,subdir)		@@\
+InstallDriverSDKDynamicModule(Concat(module,.o),dest,subdir)
+#else
+#define InstallDriverSDKObjectSubModule(module,dest,subdir)		@@\
+InstallDriverSDKDynamicModule(Concat(module,.o),dest,subdir)
 #endif
 #endif
 #endif
Index: xc/config/cf/xf86site.def
diff -u xc/config/cf/xf86site.def:3.159 xc/config/cf/xf86site.def:3.162
--- xc/config/cf/xf86site.def:3.159	Tue Mar  7 07:23:00 2000
+++ xc/config/cf/xf86site.def	Wed May 31 00:14:52 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.159 2000/03/07 15:23:00 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.162 2000/05/31 07:14:52 eich Exp $
 /******************************************************************************/
 /*
  * This file is to provide a quick method for most people to change the
@@ -125,7 +125,7 @@
  */
 
 /*
- * To disable the internal Xserver malloc, set this to NO
+ * To enable the internal Xserver malloc, uncomment this
  *
 #define UseInternalMalloc	YES
  */
@@ -255,10 +255,18 @@
 				neomagic i740 tdfx \
 				cirrus tseng trident chips apm \
 				GlideDriver fbdev \
-				ati r128 vga XF86ExtraCardDrivers
+				ati r128 AgpGartDrivers cyrix \
+				vga XF86OSCardDrivers XF86ExtraCardDrivers
  */
 
 /*
+ * To add third party drivers to the standard driver list, set the
+ * following.
+ *
+#define XF86ExtraCardDrivers	extradriver1 extradriver2 ...
+ */
+
+/*
  * Build XAA.  This can be disabled with:
  *
 #define XF86XAA			NO
@@ -674,6 +682,13 @@
  * Set the path to your Glide 3 include files.
  *
 #define Glide3IncDir /usr/include/glide3
+ */
+
+/*
+ * Undefine the following if you don't want to have config files and
+ * app-defaults installed in a separate directory (i.e. /etc/X11).
+ *
+#define UseSeparateConfDir NO
  */
 
 /*
Index: xc/config/cf/xfree86.cf
diff -u xc/config/cf/xfree86.cf:3.282 xc/config/cf/xfree86.cf:3.300
--- xc/config/cf/xfree86.cf:3.282	Tue Mar  7 06:31:36 2000
+++ xc/config/cf/xfree86.cf	Fri Jun 30 12:30:15 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.282 2000/03/07 14:31:36 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.300 2000/06/30 19:30:15 dawes Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the XFree86 based X Servers.
@@ -34,7 +34,8 @@
 /* XInput drivers */
 #ifndef XInputDrivers
 #if 1
-#define XInputDrivers		mouse dynapro microtouch wacom void
+#define XInputDrivers		mouse dynapro elographics microtouch mutouch \
+				wacom void
 #else
 #define XInputDrivers		mouse dynapro elo2300 elographics magellan \
 				microtouch mutouch spaceorb wacom void
@@ -42,6 +43,11 @@
 #endif
 
 /* OS.cf files may set this for OS-specific drivers */
+#ifndef XF86OSCardDrivers
+#define XF86OSCardDrivers /**/
+#endif
+
+/* This may be set in host.def for 3rd party drivers */
 #ifndef XF86ExtraCardDrivers
 #define XF86ExtraCardDrivers /**/
 #endif
@@ -137,19 +143,28 @@
  * support (when it is useful to do so).
  */
 # if HasAgpGart
-#  define AgpGartDrivers		i810
+#  define AgpGartDrivers	i810
 # else
-#  define AgpGartDrivers		/**/
+#  define AgpGartDrivers	/**/
 # endif
 
+/* Drivers under development, but not ready for binary releases */
+# ifndef DevelDrivers
+#  if XFree86Devel
+#   define DevelDrivers		imstt
+#  else
+#   define DevelDrivers		/**/
+#  endif
+# endif
+
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
 #  define XF86CardDrivers	mga glint nv tga s3virge sis rendition \
 				neomagic i740 tdfx \
 				cirrus tseng trident chips apm \
 				GlideDriver fbdev \
-				ati r128 AgpGartDrivers cyrix \
-				vga XF86ExtraCardDrivers
+				ati r128 AgpGartDrivers DevelDrivers cyrix \
+				vga XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
 #endif
 
@@ -235,7 +250,7 @@
 
 /* Sparc drivers */
 
-#if defined(SparcArchitecture) && !defined(LynxOSArchitecture)
+#if defined(SparcArchitecture) && !defined(LynxOSArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture) && !defined(SunArchitecture)
 # ifndef XF86Server
 #  define XF86Server            YES
 # endif
@@ -243,6 +258,26 @@
 # ifndef XF1Bpp
 #  define XF1Bpp                YES
 # endif
+/* 4bpp module */
+# ifndef XF4Bpp
+#  define XF4Bpp		YES
+# endif
+/* 8/32wid fb module */
+# ifndef XF8_32Wid
+#  define XF8_32Wid		YES
+# endif
+/* 8/32bpp overlay module */
+# ifndef XF8_32Bpp
+#  define XF8_32Bpp		YES
+# endif
+/* 8/16bpp dual fb module */
+# ifndef XF8_16Bpp
+#  define XF8_16Bpp		YES
+# endif
+/* 24/32bpp conversion module */
+# ifndef XF24_32Bpp
+#  define XF24_32Bpp		YES
+# endif
 /* shadow fb module */
 # ifndef XFShadowFB
 #  define XFShadowFB		YES
@@ -255,17 +290,64 @@
 # ifndef XF86XAA
 #  define XF86XAA               YES
 # endif
+/* ramdac module */
+# ifndef XF86Ramdac
+#  define XF86Ramdac		YES
+# endif
+/* I2C module */
+# ifndef XF86I2C
+#  define XF86I2C		YES
+# endif
 /* DDC module */
 # ifndef XF86DDC
 #  define XF86DDC		YES
 # endif
+/* RAC (Resource Access Control) module */
+# ifndef XF86RAC
+#  define XF86RAC		YES
+# endif
 
+/* Pure SBUS and PCI drivers should go first */
 # ifndef XF86CardDrivers
-#  define XF86CardDrivers	fbdev XF86ExtraCardDrivers
+#  define XF86CardDrivers	sunffb sunleo suncg6 suncg3 suncg14 suntcx \
+				sunbw2 ati glint fbdev \
+				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
 
 #endif
 
+/* Mips drivers */
+
+#ifdef MipsArchitecture
+# ifndef XF86Server
+#  define XF86Server            YES
+# endif
+/* shadow fb module */
+# ifndef XFShadowFB
+#  define XFShadowFB            YES
+# endif
+/* XAA module */
+# ifndef XF86XAA
+#  define XF86XAA               YES
+# endif
+/* ramdac module */
+# ifndef XF86Ramdac
+#  define XF86Ramdac            YES
+# endif
+/* RAC (Resource Access Control) module */
+# ifndef XF86RAC
+#  define XF86RAC		YES
+# endif
+/* int10 module */
+# ifndef XF86Int10
+#  define XF86Int10		YES
+# endif
+
+# ifndef XF86CardDrivers
+#  define XF86CardDrivers      	XF86OSCardDrivers XF86ExtraCardDrivers
+# endif
+#endif
+
 /*
  * For Digital Alpha platforms, the default is to build all modules which
  * are supported on this platform.
@@ -335,7 +417,7 @@
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
 #  define XF86CardDrivers	mga tdfx glint s3virge rendition tga \
-				r128 vga XF86ExtraCardDrivers
+				r128 vga XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
 #endif
 
@@ -411,7 +493,8 @@
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
 #  define XF86CardDrivers	r128 mga glint s3virge sis cirrus tseng \
-				trident chips fbdev vga XF86ExtraCardDrivers
+				trident chips fbdev \
+				vga XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
 #endif
 
@@ -512,12 +595,27 @@
 #  ifndef GlxBuiltInTdfx
 #    define GlxBuiltInTdfx         NO
 #  endif
+#  ifndef GlxBuiltInMga
+#    define GlxBuiltInMga          NO
+#  endif
+#  ifndef GlxBuiltInI810
+#    define GlxBuiltInI810         NO
+#  endif
+#  ifndef GlxBuiltInR128
+#    define GlxBuiltInR128         NO
+#  endif
+#  ifndef GlxBuiltInFfb
+#    define GlxBuiltInFfb          NO
+#  endif
+#  ifndef GlxBuiltInSIS
+#    define GlxBuiltInSIS          NO
+#  endif
 
-#  if GlxBuiltInTdfx
+#  if GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuildInFfb || GlxBuiltInSIS
 #    define GlxDriverUsesMesa      YES
 #  endif
 
-#  if GlxBuiltInGamma || GlxBuiltInMesa || GlxBuiltInTdfx
+#  if GlxBuiltInGamma || GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuiltInFfb || GlxBuiltInMesa
 #    define GlxUseBuiltInDRIDriver YES
 #    define DRIDynLoadDefines /**/
 #  else
@@ -560,8 +658,14 @@
 #    define GlxCoreLibDefines /**/
 #  endif
 
+#  if defined(SparcArchitecture) || defined(AlphaArchitecture)
+#    define GlxArchDefines -D__GLX_ALIGN64
+#  else
+#    define GlxArchDefines /**/
+#  endif
+
 #  ifndef GlxExtraDefines
-#    define GlxExtraDefines DRIDefines GlxCoreLibDefines
+#    define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines
 #  endif
 
 #else
@@ -685,7 +789,7 @@
  * Build the XFree86-Misc extension
  */
 #ifndef BuildXF86MiscExt
-# define BuildXF86MiscExt		NO
+# define BuildXF86MiscExt		YES
 #endif
 
 /*
@@ -756,7 +860,7 @@
 #endif
 
 #ifndef UseInternalMalloc
-# define UseInternalMalloc	YES
+# define UseInternalMalloc	NO
 #endif
 
 #ifndef HasDlsymBug
@@ -919,6 +1023,16 @@
 # define ServerSnprintfDefines /**/
 #endif
 
+#ifndef UseSmartScheduler
+#define UseSmartScheduler YES
+#endif
+
+#if UseSmartScheduler
+#define SmartScheduleDefines -DSMART_SCHEDULE
+#else
+#define SmartScheduleDefines /**/
+#endif
+
 /* Server defines required for all OSs */
 #ifndef XFree86ServerDefines
 # define XFree86ServerDefines	-DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \
@@ -926,13 +1040,13 @@
 				XFree86LoaderDefines -DXFree86Server \
 				VidModeExtensionDefines \
 				ServerSnprintfDefines \
-				-DX_BYTE_ORDER=ByteOrder \
-				-DSMART_SCHEDULE
+				SmartScheduleDefines \
+				-DX_BYTE_ORDER=ByteOrder
 #endif
 
 #ifndef XFree86ServerOSDefines
 # define XFree86ServerOSDefines	-DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \
-				-DDDXOSVERRORF -DSMART_SCHEDULE
+				-DDDXOSVERRORF
 #endif
 
 #ifndef XFree86ConsoleDefines
@@ -1022,8 +1136,19 @@
 # define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules
 #endif
 
+/*
+ * As of 3.9.15, XFree86 release versions are X.Y.Z, and XFree86Version is:
+ *
+ *    X * 1000 + Y * 100 + Z
+ *
+ * For the 3.3.x branch, the versions are X.Y.Z.W, with XFree86Version
+ * calculated as:
+ *
+ *    X * 1000 + Y * 100 + Z * 10 + W
+ *
+ */
 #ifndef XFree86Version
-# define XFree86Version	4000
+# define XFree86Version	4001
 #endif
 
 #ifndef XVendorString
Index: xc/config/imake/imake.c
diff -u xc/config/imake/imake.c:3.33 xc/config/imake/imake.c:3.35
--- xc/config/imake/imake.c:3.33	Sun Dec 26 16:39:17 1999
+++ xc/config/imake/imake.c	Mon Jun 12 19:28:27 2000
@@ -8,7 +8,7 @@
  * be passed to the template file.                                         *
  *                                                                         *
  ***************************************************************************/
-/* $XFree86: xc/config/imake/imake.c,v 3.33 1999/12/27 00:39:17 robin Exp $ */
+/* $XFree86: xc/config/imake/imake.c,v 3.35 2000/06/13 02:28:27 dawes Exp $ */
 
 /*
  * 
@@ -293,6 +293,10 @@
 #include <sys/utsname.h>
 #endif
 
+#if !(defined(Lynx) || defined(__Lynx__) || (defined(SVR4) && !defined(sun)))
+#define HAS_MKSTEMP
+#endif
+
 #define	TRUE		1
 #define	FALSE		0
 
@@ -404,11 +408,27 @@
 
 	Imakefile = FindImakefile(Imakefile);
 	CheckImakefileC(ImakefileC);
-	if (Makefile)
-		tmpMakefile = Makefile;
-	else {
+	if (Makefile) {
+                tmpMakefile = Makefile;
+                if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
+                   LogFatal("Cannot create temporary file %s.", tmpMakefile);
+	} else {
+	        int fd;
 		tmpMakefile = Strdup(tmpMakefile);
-		(void) mktemp(tmpMakefile);
+#ifndef HAS_MKSTEMP
+		if (mktemp(tmpMakefile) == NULL ||
+		    (tmpfd = fopen(tmpMakefile, "w+")) == NULL) {
+		   LogFatal("Cannot create temporary file %s.", tmpMakefile);
+		}
+#else
+	        fd = mkstemp(tmpMakefile);
+	        if (fd == -1 || (tmpfd = fdopen(fd, "w+")) == NULL) {
+		   if (fd != -1) {
+		      unlink(tmpMakefile); close(fd);
+		   }
+		   LogFatal("Cannot create temporary file %s.", tmpMakefile);
+		}
+#endif
 	}
 	AddMakeArg("-f");
 	AddMakeArg( tmpMakefile );
@@ -417,9 +437,6 @@
 	sprintf(makefileMacro, "MAKEFILE=%s", Imakefile);
 	AddMakeArg( makefileMacro );
 
-	if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
-		LogFatal("Cannot create temporary file %s.", tmpMakefile);
-
 	cleanedImakefile = CleanCppInput(Imakefile);
 	cppit(cleanedImakefile, Template, ImakefileC, tmpfd, tmpMakefile);
 
@@ -1150,7 +1167,7 @@
     }
   }
   if (buf[0])
-    fprintf (inFile, "#define DefaultGccIncludeDir %s\n", buf);
+    fprintf (inFile, "#define DefaultGccIncludeDir \"%s\"\n", buf);
 }
 #endif
 
@@ -1339,12 +1356,26 @@
 		    strcmp(ptoken, "pragma") &&
 		    strcmp(ptoken, "undef")) {
 		    if (outFile == NULL) {
+		        int fd;
 			tmpImakefile = Strdup(tmpImakefile);
-			(void) mktemp(tmpImakefile);
-			outFile = fopen(tmpImakefile, "w");
-			if (outFile == NULL)
+#ifndef HAS_MKSTEMP
+			if (mktemp(tmpImakefile) == NULL ||
+			    (outFile = fopen(tmpImakefile, "w+")) == NULL) {
 			    LogFatal("Cannot open %s for write.",
 				tmpImakefile);
+			}
+#else
+			fd=mkstemp(tmpImakefile);
+			if (fd != -1)
+			    outFile = fdopen(fd, "w");
+			if (outFile == NULL) {
+			    if (fd != -1) {
+			       unlink(tmpImakefile); close(fd);
+			    }
+			    LogFatal("Cannot open %s for write.",
+				tmpImakefile);
+			}
+#endif
 		    }
 		    writetmpfile(outFile, punwritten, pbuf-punwritten,
 				 tmpImakefile);
Index: xc/config/imake/imakemdep.h
diff -u xc/config/imake/imakemdep.h:3.36 xc/config/imake/imakemdep.h:3.39
--- xc/config/imake/imakemdep.h:3.36	Wed Dec 29 18:09:25 1999
+++ xc/config/imake/imakemdep.h	Thu Jun 15 13:49:57 2000
@@ -20,7 +20,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.36 1999/12/30 02:09:25 robin Exp $ */
+/* $XFree86: xc/config/imake/imakemdep.h,v 3.39 2000/06/15 20:49:57 dawes Exp $ */
 
 
 /* 
@@ -215,7 +215,7 @@
  *     all colons).  One way to tell if you need this is to see whether or not
  *     your Makefiles have no tabs in them and lots of @@ strings.
  */
-#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__)
+#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi)
 #define FIXUP_CPP_WHITESPACE
 #endif
 #ifdef WIN32
@@ -277,10 +277,10 @@
 #ifdef _CRAY
 #define DEFAULT_CPP "/lib/pcpp"
 #endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__386BSD__)
 #define DEFAULT_CPP "/usr/libexec/cpp"
 #endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__)
 #define USE_CC_E
 #endif
 #if defined(__sgi) && defined(__ANSI_CPP__)
@@ -328,7 +328,7 @@
 	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
 #endif
 #endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__)
+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) || defined(__bsdi__)
 # ifdef __i386__
 	"-D__i386__",
 # endif
@@ -683,7 +683,7 @@
 # define DEFAULT_OS_MAJOR_REV	"v V%[0-9]"
 # define DEFAULT_OS_MINOR_REV	"v V%*dL%[0-9]"
 # define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(linux)
+#elif defined(linux) || defined(__bsdi__)
 # define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
 # define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
 # define DEFAULT_OS_TEENY_REV	"r %*d.%*d.%[0-9]"
Index: xc/config/imake/imakesvc.cmd
diff -u xc/config/imake/imakesvc.cmd:3.13 xc/config/imake/imakesvc.cmd:3.14
--- xc/config/imake/imakesvc.cmd:3.13	Thu Apr 29 02:13:23 1999
+++ xc/config/imake/imakesvc.cmd	Wed Apr  5 11:13:11 2000
@@ -2,7 +2,7 @@
  * This script serves as a helper cmd file for imake. Install this in
  * the path just like imake itself.
  *
- * $XFree86: xc/config/imake/imakesvc.cmd,v 3.13 1999/04/29 09:13:23 dawes Exp $
+ * $XFree86: xc/config/imake/imakesvc.cmd,v 3.14 2000/04/05 18:13:11 dawes Exp $
  */
 '@echo off'
 ADDRESS CMD
@@ -184,7 +184,7 @@
       END
    END
    WHEN code=15 THEN DO
-      /* imakesvc 14 destdir suffix srcfile... */
+      /* imakesvc 15 destdir suffix srcfile... */
       destdir = TRANSLATE(WORD(all,2),'\','/')
       suffix = WORD(all,3)
       DO i=4 TO WORDS(all)
@@ -192,6 +192,16 @@
 	tgt = destdir'\'src'.'suffix
 	'groff -e -t -man -Tascii 'src'.man | col -b >'tgt
       END
+   END
+   WHEN code=16 THEN DO
+      /* imakesvc 16 dirlist...*/
+      mkfontdir = TRANSLATE(WORD(all,2),'\','/')
+      earg=''
+      DO i=3 TO WORDS(all)
+        arg = WORD(all,i)
+        earg = earg' -e 'arg
+      END
+      mkfontdir' -r -p inst/ 'earg' .'
    END
    OTHERWISE NOP
 END
Index: xc/config/makedepend/cppsetup.c
diff -u xc/config/makedepend/cppsetup.c:3.4 xc/config/makedepend/cppsetup.c:3.5
--- xc/config/makedepend/cppsetup.c:3.4	Mon Oct  5 06:21:48 1998
+++ xc/config/makedepend/cppsetup.c	Tue Apr  4 12:24:45 2000
@@ -20,7 +20,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.4 1998/10/05 13:21:48 dawes Exp $ */
+/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.5 2000/04/04 19:24:45 dawes Exp $ */
 
 #include "def.h"
 
@@ -188,7 +188,7 @@
 	return 0;
     do {
 	var = (*s)->s_value;
-	if (!isvarfirstletter(*var))
+	if (!isvarfirstletter(*var) || !strcmp((*s)->s_name, var))
 	    break;
 	s = lookup_variable (ip, var, strlen(var));
     } while (s);
Index: xc/config/pswrap/Imakefile
diff -u xc/config/pswrap/Imakefile:1.1 xc/config/pswrap/Imakefile:1.6
--- xc/config/pswrap/Imakefile:1.1	Sat Feb 12 16:12:28 2000
+++ xc/config/pswrap/Imakefile	Wed Jun  7 14:58:25 2000
@@ -1,21 +1,30 @@
-XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.1 2000/02/13 00:12:28 dawes Exp $
+XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.6 2000/06/07 21:58:25 tsi Exp $
 
-   FRIENDSDEF = -DFRIENDSFILE='"<DPS/dpsfriends.h>"'
+   FRIENDSDEF = -DFRIENDSFILE='"<DPS/dpsclient.h>"'
       DEFINES = -DXENVIRONMENT
       DEPLIBS =
        YFLAGS = -d
 
-SRCS = main.c pswdict.c pswfile.c yyerror.c \
+SRCS = main.c pswdict.c pswfile.c \
 	systemnames.c psw.c pswstring.c pswsemantics.c
 
-OBJS = main.o pswparser.o lexer.o pswdict.o pswfile.o yyerror.o \
+OBJS = main.o pswparser.o lexer.o pswdict.o pswfile.o \
 	systemnames.o psw.o pswstring.o pswsemantics.o
 
+#if CrossCompiling
+ComplexHostProgramTarget(pswrap)
+#else
 ComplexProgramTarget(pswrap)
+#endif
 
-SpecialObjectRule(pswfile.o,NullParameter,$(FRIENDSDEF))
+SpecialObjectRule(pswfile.o,pswfile.c,$(FRIENDSDEF))
 
 LexFile(lexer)
 
 YaccFile(pswparser,$(YFLAGS))
+
+#ifdef OS2Architecture
+all::
+	$(CP) ProgramTargetName(pswrap) /
+#endif
 
Index: xc/config/pswrap/lexer.l
diff -u xc/config/pswrap/lexer.l:1.6 xc/config/pswrap/lexer.l:1.9
--- xc/config/pswrap/lexer.l:1.6	Fri Feb 18 04:18:42 2000
+++ xc/config/pswrap/lexer.l	Wed Jun  7 12:48:09 2000
@@ -36,25 +36,20 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
-/* $XFree86: xc/config/pswrap/lexer.l,v 1.6 2000/02/18 12:18:42 tsi Exp $ */
+/* $XFree86: xc/config/pswrap/lexer.l,v 1.9 2000/06/07 19:48:09 tsi Exp $ */
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "pswpriv.h"
 #include "pswparser.h"
 
-#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT)
+/* flex of EMX seems to be too old */
+#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__EMX__)
 int yylineno = 1;
 #endif
 
-extern int outlineno;		/* output line number */
-
-extern int maxstring;		/* max PS string length to scan (-s) */
-extern char *string_temp;	/* buffer of that size for scanning strings */
-extern char *psw_malloc();
-extern void stringerr();	/* report string overflow */
-extern char *ifile;		/* input file name for error messages */
-
 static int parens = 0;		/* current paren balancing */
 static char *sbody;		/* cur pointer into string_temp */
 static int curleng = 0;		/* current scanned string length */
@@ -75,6 +70,39 @@
 
 #undef YYLMAX
 #define YYLMAX 16384
+
+/* ErrIntro prints a standard intro for error messages;
+ * change it if your system uses something else.  We have many options:
+ *
+ * to match Macintosh:  #define FMT "File \"%s\"; Line %d # "
+ * to match BSD cc:	#define FMT "\"%s\", line %d: "
+ * to match gcc:	#define FMT "%s:%d: "
+ * to match Mips cc:	#define FMT "pswrap: Error: %s, line %d: "
+ */
+#define INTRO	"# In function %s -\n"
+
+#ifdef macintosh
+#define FMT "File \"%s\"; Line %d # "
+#else /* macintosh */
+#define FMT "\"%s\", line %d: "
+#endif /* macintosh */
+
+void ErrIntro(int line)
+{
+    if (! reportedPSWName && currentPSWName) {
+		reportedPSWName = 1;
+		fprintf(stderr,INTRO,currentPSWName);
+    }
+    fprintf(stderr,FMT,ifile,line);
+    errorCount++;
+}
+
+
+void yyerror(char *errmsg)
+{
+    ErrIntro(yylineno);
+    fprintf(stderr,"%s near text \"%s\"\n",errmsg,yytext);
+}
 %}
 
 %o 3500
@@ -318,7 +346,7 @@
 	    DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext));
 	    /* I have no idea why the cast is needed in the next line,
 	       but it seems to make the compiler happy on alpha */
-	    sscanf((char *) yytext,"%lo",&yylval.intobj);
+	    sscanf((char *) yytext,"%o",&yylval.intobj);
 	    return CINTEGER;
 	}
 }
@@ -327,7 +355,7 @@
 	if (nonComment) {
 	    DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext));
 	    /* See previous comment... */
-	    sscanf((char *) yytext,"0x%lx",&yylval.intobj);
+	    sscanf((char *) yytext,"0x%x",&yylval.intobj);
 	    return CINTEGER;
 	}
 }
@@ -377,7 +405,7 @@
 
 <PS>{DIGIT}+#{RADIXDIGIT}+ {	/* a radix number */
 #define MAX_ULONG ((unsigned long) -1)
-	int base = 0;
+	unsigned base = 0;
 	unsigned char *s = (unsigned char *) yytext;
 	register unsigned long x, limit;
 	register unsigned long i = 0;
@@ -483,8 +511,11 @@
 		return PSSTRING;
 	}
 	curleng += 4;
-	sprintf(sbody,"\\%03.3s",(yytext + 1));
-	sbody += 4;
+	sprintf(sbody,"\\%3.3s",(yytext + 1));
+	while (*sbody) {
+	    if (*sbody == ' ') *sbody = '0';
+	    sbody++;
+	}
 }
 
 
@@ -759,7 +790,7 @@
 
 %%
 
-int yywrap () {
+int yywrap (void) {
     if (!feof(yyin))
     	return (0);
 /* The following appears not to work with flex.  As it is error
@@ -773,12 +804,8 @@
     return (1);
 }
 
-void stringerr(type)
-	int type;
+void stringerr(int type)
 {
-    extern char *currentPSWName;
-    extern char *ifile;
-
     ErrIntro(strlineno);
     fprintf(stderr,"%sstring too long (caught at line %d)\n",
     	((type==1)?"":"hex "),yylineno);
Index: xc/config/pswrap/main.c
diff -u xc/config/pswrap/main.c:1.2 xc/config/pswrap/main.c:1.4
--- xc/config/pswrap/main.c:1.2	Fri Feb 18 04:18:43 2000
+++ xc/config/pswrap/main.c	Wed Jun  7 12:50:47 2000
@@ -35,7 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
-/* $XFree86: xc/config/pswrap/main.c,v 1.2 2000/02/18 12:18:43 tsi Exp $ */
+/* $XFree86: xc/config/pswrap/main.c,v 1.4 2000/06/07 19:50:47 tsi Exp $ */
 
 #include <stdio.h>
 
@@ -54,6 +54,7 @@
 
 /* global data */
 char	*prog;			/* program name */
+char	*special_h = NULL;	/* -f option */
 char	*hfile = NULL;		/* name of -h file */
 char	*ofile = NULL;		/* name of -o file */
 char	*ifile = NULL;		/* name of input file */
@@ -74,69 +75,21 @@
                   		/* file.  Used only when building shlibs */
 #endif /* __MACH__ */
 
-extern char *psw_malloc();
-extern void InitWellKnownPSNames();
-
-static void ScanArgs();
-static void Usage();
-static void FatalError();
-
-main(argc,argv)
-int argc; char *argv[];
+static void Usage(void)
 {
-    extern int	errorCount;	/* non-fatal errs */
-    int		retval;		/* return from yyparse */
-	
-    ScanArgs(argc, argv);
-
-    if (ifile == NULL)
-	ifile = "stdin";
-    else {
-	gotInFile = 1;
-	if (freopen(ifile,"r",stdin) == NULL)
-	    FatalError("can't open %s for input",ifile);
-    }
-    if ((string_temp = (char *) malloc((unsigned) (maxstring+1))) == 0)
-	FatalError("can't allocate %d char string; try a smaller -s value",maxstring);
-    if (ofile == NULL)
-		ofile = "stdout";
-    else {
-#ifdef __MACH__
- 		(void)unlink(ofile);
-#endif /* __MACH__ */
-    	if (freopen(ofile,"w",stdout) == NULL)
-			FatalError("can't open %s for output",ofile);
-	}
-    InitOFile();
-
-    if (hfile != NULL) {
-#ifdef __MACH__
- 		(void)unlink(hfile);
-#endif /* __MACH__ */
- 		if ((header = fopen(hfile,"w")) == NULL)
- 	    	FatalError("can't open %s for output",hfile);
-    }
-    if (header != NULL)	InitHFile();
-
-    InitWellKnownPSNames();
-
-    if ((retval = yyparse()) != 0)
-	fprintf(stderr,"%s: error in parsing %s\n",prog,ifile);
-    else if (errorCount != 0) {
-	fprintf(stderr,"%s: errors were encountered\n",prog);
-	retval = errorCount;
-    }
-
-    if (hfile != NULL) FinishHFile();
-
-    exit (retval);
+    fprintf(stderr,"Usage:  pswrap [options] [input-file]\n");
+    fprintf(stderr,"    -a              produce ANSI C procedure prototypes\n");
+    fprintf(stderr,"    -b              process a big file\n");
+    fprintf(stderr,"    -f filename     include special header\n");
+    fprintf(stderr,"    -h filename     specify header filename\n");
+    fprintf(stderr,"    -o filename     specify output C filename\n");
+    fprintf(stderr,"    -r              make wraps re-entrant\n");
+    fprintf(stderr,"    -s length       set maximum string length\n");
+    exit(1);
 }
 
-static void ScanArgs(argc, argv)
-    int argc;
-    char *argv[];
+static void ScanArgs(int argc, char *argv[])
 {
-    extern int	lexdebug;	/* debug flag for lexer */
     char	*slash;		/* index of last / in hfile */
     char	*c;		/* pointer into headid for conversion */
     int 	i = 0;
@@ -147,8 +100,12 @@
 	prog = slash + 1;
     while (i < argc) {
 	if (*argv[i] != '-') {
-	    if (ifile != NULL) Usage("Only one input file can be specified.");
-	    else ifile = argv[i];
+	    if (ifile != NULL) {
+		fprintf(stderr, "%s:  Only one input file can be specified.\n", prog);
+		Usage();
+	    } else {
+		ifile = argv[i];
+	    }
 	} else {
 	    switch (*(argv[i]+1)) {
 	    case 'a':
@@ -163,6 +120,9 @@
 	    	lexdebug++;
 		break;
 #endif /* PSWDEBUG */
+	    case 'f':
+		special_h = argv[++i];
+		break;
 	    case 'h':
 		hfile = argv[++i];
 		slash = rindex(hfile,SLASH);
@@ -198,7 +158,8 @@
 		pad++;
 		break;
 	    default:
-		Usage("bad option '-%c'", *(argv[i]+1));
+		fprintf(stderr, "%s:  bad option '-%c'\n", prog, *(argv[i]+1));
+		Usage();
 		break;
 	    } /* switch */
 	} /* else */
@@ -206,27 +167,59 @@
     } /* while */
 } /* ScanArgs */
 
-static void Usage(msg, arg1, arg2, arg3, arg4) 
-	char *msg;
+int main(int argc, char *argv[])
 {
-    fprintf(stderr,"%s:  ", prog);
-    fprintf(stderr, msg, arg1, arg2, arg3, arg4);
-    fprintf(stderr,"\nUsage:  pswrap [options] [input-file]\n");
-    fprintf(stderr,"    -a              produce ANSI C procedure prototypes\n");
-    fprintf(stderr,"    -b              process a big file\n");
-    fprintf(stderr,"    -h filename     specify header filename\n");
-    fprintf(stderr,"    -o filename     specify output C filename\n");
-    fprintf(stderr,"    -r              make wraps re-entrant\n");
-    fprintf(stderr,"    -s length       set maximum string length\n");
-    exit(1);
-}
+    int		retval;		/* return from yyparse */
+	
+    ScanArgs(argc, argv);
 
-/* a - d are optional args for fprintf */
-static void FatalError(msg, a, b, c, d)
-    char *msg;
-{
-    fprintf(stderr,"%s:  ", prog);
-    fprintf(stderr, msg, a, b, c, d);
-    fprintf(stderr, "\n");
-    exit(1);
-} /* FatalError */
+    if (ifile == NULL)
+	ifile = "stdin";
+    else {
+	gotInFile = 1;
+	if (freopen(ifile,"r",stdin) == NULL) {
+	    fprintf(stderr, "%s:  can't open %s for input\n", prog, ifile);
+	    exit(1);
+	}
+    }
+    if ((string_temp = (char *) malloc((unsigned) (maxstring+1))) == 0) {
+	fprintf(stderr, "%s:  can't allocate %d char string; try a smaller -s value\n", prog, maxstring);
+	exit(1);
+    }
+    if (ofile == NULL)
+		ofile = "stdout";
+    else {
+#ifdef __MACH__
+ 		(void)unlink(ofile);
+#endif /* __MACH__ */
+    	if (freopen(ofile,"w",stdout) == NULL) {
+	    fprintf(stderr, "%s:  can't open %s for output\n", prog, ofile);
+	    exit(1);
+	}
+    }
+    InitOFile();
+
+    if (hfile != NULL) {
+#ifdef __MACH__
+ 		(void)unlink(hfile);
+#endif /* __MACH__ */
+	if ((header = fopen(hfile,"w")) == NULL) {
+	    fprintf(stderr, "%s:  can't open %s for output\n", prog, hfile);
+	    exit(1);
+	}
+    }
+    if (header != NULL)	InitHFile();
+
+    InitWellKnownPSNames();
+
+    if ((retval = yyparse()) != 0)
+	fprintf(stderr,"%s: error in parsing %s\n",prog,ifile);
+    else if (errorCount != 0) {
+	fprintf(stderr,"%s: errors were encountered\n",prog);
+	retval = errorCount;
+    }
+
+    if (hfile != NULL) FinishHFile();
+
+    exit (retval);
+}
Index: xc/config/pswrap/psw.c
diff -u xc/config/pswrap/psw.c:1.1 xc/config/pswrap/psw.c:1.5
--- xc/config/pswrap/psw.c:1.1	Sat Feb 12 16:12:30 2000
+++ xc/config/pswrap/psw.c	Wed Jun  7 14:36:56 2000
@@ -35,12 +35,14 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/config/pswrap/psw.c,v 1.5 2000/06/07 21:36:56 tsi Exp $ */
 
 /***********/
 /* Imports */
 /***********/
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #ifdef XENVIRONMENT
 #include <X11/Xos.h>
@@ -50,26 +52,8 @@
 
 #include "pswdict.h"
 #include "pswpriv.h"
+#include "pswsemantics.h"
 
-char *psw_malloc();
-char *psw_calloc();
-
-extern FILE *header;
-extern PSWDict wellKnownPSNames;
-extern int PSWStringLength();
-extern int PSWHexStringLength();
-extern void PSWOutputStringChars();
-extern void PSWOutputHexStringChars();
-extern int outlineno;
-extern int reentrant;
-extern int maxstring;
-
-extern Token PSWToken(/* type, val */);
-
-extern int doANSI;	/* -a flag */
-extern int pad;		/* -p flag */
-extern boolean noUserNames;  	/* -n flag */
-
 #define DPS_HEADER_SIZE 4
 #define DPS_LONG_HEADER_SIZE 8
 #define DPS_BINOBJ_SIZE 8	/* sizeof(DPSBinObjGeneric) */
@@ -107,21 +91,16 @@
 /* Utility procedures */
 
 
-static void CantHappen() {
-  int *p;
-  fprintf(stderr, "CantHappen");
-  /* now dump core with the following gross and disgusting kludge */
-  p = (int *) (-1);
-  *p = 0;
-  }
+#define CantHappen() { fprintf(stderr, "CantHappen"); abort(); }
   
-#define Assert(b)  if (!(b)) CantHappen(); else ;
+#define Assert(b)  if (!(b)) { CantHappen(); }
 
 #define SafeStrCpy(dst,src) \
 	dst = psw_malloc(strlen(src)+1) , \
 	strcpy(dst, src)
 
-static int NumArgs(args) Args args; {
+static int NumArgs(Args args)
+{
   register int n = 0;
   register Arg arg;
   register Item item;
@@ -129,22 +108,25 @@
     for (item = arg->items; item; item = item->next)
       n++;
   return n;
-  }
+}
 
-static int NumTokens(body) register Body body; {
+static int NumTokens(Body body)
+{
   register int n = 0;
   while (body) { n++; body = body->next; }
   return n;
-  }
+}
 
-static TokenList ConsToken (t, ll) Token t; TokenList ll; {
+static TokenList ConsToken (Token t, TokenList ll)
+{
   TokenList tt = (TokenList) psw_calloc(sizeof(TokenListRec), 1);
   tt->token = t;
   tt->next = ll;
   return tt;
-  }
+}
   
-static TokenList ConsNameToken (t, ll) Token t; TokenList ll; {
+static TokenList ConsNameToken (Token t, TokenList ll)
+{
   TokenList temp, tt = (TokenList) psw_calloc(sizeof(TokenListRec), 1);
   
   tt->token = t;
@@ -157,27 +139,31 @@
   tt->next = temp->next;
   temp->next = tt;
   return (ll);
-  }
+}
   
-static boolean IsCharType(t) Type t; {
+static boolean IsCharType(Type t)
+{
   return (t == T_CHAR || t == T_UCHAR);
-  }
+}
   
-static boolean IsNumStrType(t) Type t; {
+static boolean IsNumStrType(Type t)
+{
 	return (t == T_NUMSTR
 			|| t == T_FLOATNUMSTR
 			|| t == T_LONGNUMSTR
 			|| t == T_SHORTNUMSTR);
 }
 
-static boolean IsPadNumStrType(t) Type t; {
+static boolean IsPadNumStrType(Type t)
+{
 	return (t == T_NUMSTR || t == T_SHORTNUMSTR);
 }
   
 /*************************/
 /* Type-code conversions */
 
-static char *TypeToText(type) Type type; {
+static char *TypeToText(Type type)
+{
   switch ((int) type) {
     case T_CONTEXT:
       return "DPSContext";
@@ -216,9 +202,10 @@
       CantHappen();
     }
     /*NOTREACHED*/
-  }
+}
 
-static char *CTypeToDPSType(type) int type; {
+static char *CTypeToDPSType(int type)
+{
   switch (type) {
     case T_BOOLEAN:
       return("DPS_BOOL");
@@ -239,9 +226,10 @@
     default: CantHappen();
     }
     /*NOTREACHED*/
-  }
+}
 
-static char *CTypeToResultType(type) int type; {
+static char *CTypeToResultType(int type)
+{
   switch (type) {
     case T_BOOLEAN:
       return("dps_tBoolean");
@@ -277,12 +265,10 @@
     default: CantHappen();
     }
     /*NOTREACHED*/
-  }
+}
 
-static void FreeTokenList(tokenList)
-  register TokenList tokenList;
+static void FreeTokenList(TokenList tokenList)
 {
-  extern int bigFile;
   register TokenList tl;
   if (bigFile)
     while (tokenList) {
@@ -296,7 +282,8 @@
 /********************************************/
 /* Support procedures that generate no code */
 
-static void SetNameTag(t) Token t; {
+static void SetNameTag(Token t)
+{
   PSWDictValue tag;
   Assert(t->type == T_NAME || t->type == T_LITNAME);
   tag = PSWDictLookup(wellKnownPSNames, (char *)(t->val));
@@ -312,7 +299,7 @@
     t->wellKnownName = true;
     t->body.cnst = tag;
     }
-  }
+}
 
 /* If the wrap has result parameters, DPSAwaitReturnValues
    must be told when execution if the body is complete. The 
@@ -321,7 +308,8 @@
    	0 doneTag printobject flush
    where doneTag = (last result parameter tag + 1).
 */
-static Body AppendResultFlush(body, n) Body body; int n; {
+static Body AppendResultFlush(Body body, int n)
+{
   Token t, token;
   char *ss;
 
@@ -339,13 +327,14 @@
 
   t->next = token;
   return body;
-  }
+}
 
 
 /*****************************************/
 /* Support procedures that generate code */
 
-static void EmitArgPrototypes(stm, hdr) FILE *stm; Header hdr; {
+static void EmitArgPrototypes(FILE *stm, Header hdr)
+{
   register Arg arg;
   register Item item;
   for (arg = hdr->inArgs; arg; arg = arg->next) {
@@ -368,9 +357,22 @@
       }
     fprintf(stm, "; ");
     }
+}
+
+/* use default promotions in prototypes unless it's a pointer/array */
+static char *TypeToDefault(int type)
+{
+  char *result = TypeToText(type);
+  switch (type) {
+    case T_FLOAT: result = "double"; break;
+    case T_USHORTINT: result = "unsigned"; break;
+    case T_SHORTINT: result = "int"; break;
   }
+  return result;
+}
 
-static void EmitANSIPrototypes(stm, hdr) FILE *stm; Header hdr; {
+static void EmitANSIPrototypes(FILE *stm, Header hdr)
+{
   register Arg arg;
   register Item item;
   register char *type;
@@ -382,7 +384,10 @@
     type = TypeToText(arg->type);
     for (item = arg->items; item; item = item->next) {
       if (arg->type == T_CONTEXT) ctxName = item->name;
-      fprintf(stm, "%s%s %s%s", item->starred || item-> subscripted ? "const " : "", type, item->starred ? "*" : "", item->name);
+      fprintf(stm, "%s%s %s%s",
+	(item->starred || item-> subscripted) ? "const " : "",
+	(item->starred || item-> subscripted) ? type : TypeToDefault(arg->type),
+	item->starred ? "*" : "", item->name);
       if (item->subscripted) fprintf(stm, "[]");
       if (item->next) fprintf(stm, ", ");
       }
@@ -392,17 +397,20 @@
   for (arg = hdr->outArgs; arg; arg = arg->next) {
     type = TypeToText(arg->type);
     for (item = arg->items; item; item = item->next) {
-      fprintf(stm, "%s %s%s", type, item->starred ? "*" : "", item->name);
+      fprintf(stm, "%s %s%s",
+	(item->starred || item-> subscripted) ? type : TypeToDefault(arg->type),
+	item->starred ? "*" : "",
+	item->name);
       if (item->subscripted) fprintf(stm, "[]");
       if (item->next) fprintf(stm, ", ");
       }
     if (arg->next) fprintf(stm, ", ");
     }
-  }
+}
 
 /* Procedures for generating type declarations in the body */
 
-static void StartBinObjSeqDef() 
+static void StartBinObjSeqDef(void) 
 {
   /* start type defn of binobjseq */
   printf("  typedef struct {\n");
@@ -419,7 +427,8 @@
   outlineno += 5;
 }
 
-static void EmitFieldType(t) Token t; {
+static void EmitFieldType(Token t)
+{
   if ((t->type == T_FLOAT)
   || (t->type == T_NAME && t->namedFormal
      && (!t->namedFormal->subscripted)
@@ -432,10 +441,9 @@
     printf("    DPSBinObjGeneric");
     }
   printf (" obj%d;\n", t->tokenIndex); outlineno++;
-  }
+}
 
-static int CheckSize(body)
-  Body body;
+static int CheckSize(Body body)
 {
   Adr nextAdr;
   register TokenList bodies = NULL;
@@ -580,15 +588,14 @@
 	
 } /* CheckSize */
   
-static void BuildTypesAndAssignAddresses(body, sz, nObjs, psize)
-  Body body; Adr *sz; long int *nObjs; unsigned *psize;
+static void BuildTypesAndAssignAddresses(
+  Body body, Adr *sz, long int *nObjs, unsigned *psize)
 {
   long int objN = 0;
   Adr nextAdr;
   register TokenList bodies = NULL;
   register TokenList tl;
   boolean firstBody = true;
-  extern int yylineno;
   PSWDict wrapDict;
   int strCount = 0;
  
@@ -700,9 +707,9 @@
     free(c);
     } /* while */
     
-*psize = nextAdr.cnst;
+  *psize = nextAdr.cnst;
     
-if(nNames)
+  if(nNames)
 	writable = true; 	/* SetNameTag couldn't find the name */	
   
   if (namedInputArrays && literalStrings) {
@@ -744,7 +751,7 @@
 	stringBytes += ln;
  
 	/* emit the string type as the next record field */
-	printf("    char obj%d[%d];\n", objN++, ln); outlineno++;
+	printf("    char obj%ld[%d];\n", objN++, ln); outlineno++;
     } else {
     	t->body = nextAdr;
 	t->body.cnst = loc;
@@ -785,7 +792,8 @@
 
 /* Procedures for generating static declarations for local types */
 
-static void StartStatic(first) boolean first; {
+static void StartStatic(boolean first)
+{
   /* start static def for bin obj seq or for array data (aux) */
   if (first) {
     if(reentrant && writable) {
@@ -809,53 +817,55 @@
   outlineno++;
 }
 
-static void FirstStatic(nTopObjects, sz)
-  int nTopObjects; Adr *sz; {
+static void FirstStatic(int nTopObjects, Adr *sz)
+{
   char *numFormat = "DPS_DEF_TOKENTYPE";
 
   outlineno++;
   if(large) {
 	fprintf(datafil, "    %s, 0, %d, ", numFormat, nTopObjects);
-	fprintf(datafil, "%d,\n", sz->cnst + dpsHeaderSize);
+	fprintf(datafil, "%ld,\n", sz->cnst + dpsHeaderSize);
   } else {
 	fprintf(datafil, "    %s, %d, ", numFormat, nTopObjects);
-	fprintf(datafil, "%d,\n", sz->cnst + dpsHeaderSize);
+	fprintf(datafil, "%ld,\n", sz->cnst + dpsHeaderSize);
   }
 }
 
-static void EndStatic(first) boolean first; {
+static void EndStatic(boolean first)
+{
   /* end static template defn */
   if (first)
     printf("    }; /* _dpsQ */\n");
   else
     printf("    }; /* _dpsQ1 */\n");
   outlineno++;
-  }
+}
 
 /* char that separates object attributes */
 #define ATT_SEP '|'
 
-static void EmitFieldConstructor(t) register Token t; {
+static void EmitFieldConstructor(Token t)
+{
     char *comment = NULL, *commentName = NULL;
     fprintf(datafil, "    {");
 
     switch (t->type) {
       case T_BOOLEAN:
-        fprintf(datafil, "DPS_LITERAL%cDPS_BOOL, 0, 0, %d", ATT_SEP, t->val);
+        fprintf(datafil, "DPS_LITERAL%cDPS_BOOL, 0, 0, %d", ATT_SEP, (int) t->val);
         break;
       case T_INT:
-        fprintf(datafil, "DPS_LITERAL%cDPS_INT, 0, 0, %d", ATT_SEP, t->val);
+        fprintf(datafil, "DPS_LITERAL%cDPS_INT, 0, 0, %d", ATT_SEP, (int) t->val);
         break;
       case T_FLOAT:
         fprintf(datafil, "DPS_LITERAL%cDPS_REAL, 0, 0, %s", ATT_SEP, (char *)t->val);
         break;
 
       case T_ARRAY:
-        fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, %d, %d", ATT_SEP,
+        fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, %d, %ld", ATT_SEP,
 	  NumTokens((Body) (t->val)), t->body.cnst);
         break;
       case T_PROC:
-        fprintf(datafil, "DPS_EXEC%cDPS_ARRAY, 0, %d, %d", ATT_SEP,
+        fprintf(datafil, "DPS_EXEC%cDPS_ARRAY, 0, %d, %ld", ATT_SEP,
 	  NumTokens((Body) (t->val)), t->body.cnst);
         break;
 
@@ -866,16 +876,16 @@
           if (t->type == T_STRING)
             ln = PSWStringLength((char *)t->val);
           else ln = PSWHexStringLength((char *)t->val);
-          fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %d", ATT_SEP,
+          fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %ld", ATT_SEP,
 	    ln, t->body.cnst);
         } else {
           Item item = t->namedFormal;
 	  if (item->subscripted && item->subscript->constant) {  
-            fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %d",
+            fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %ld",
 	    		    ATT_SEP,item->subscript->val, t->body.cnst);
             comment = "param[const]: ";
 	  } else {
-            fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, 0, %d",
+            fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, 0, %ld",
 	    						ATT_SEP,t->body.cnst);
             comment = "param ";
 	  }
@@ -886,18 +896,18 @@
       case T_LITNAME:
         commentName = (char *)t->val;
         if (t->wellKnownName) {
-          fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, DPSSYSNAME, %d", ATT_SEP, t->body.cnst);
+          fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, DPSSYSNAME, %ld", ATT_SEP, t->body.cnst);
           }
         else if (t->namedFormal == NULL) {
           int ln;
 	  if (noUserNames) {
 	      ln = PSWStringLength((char *)t->val);
-	      fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, %d, %d", ATT_SEP, ln, t->body.cnst);
+	      fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, %d, %ld", ATT_SEP, ln, t->body.cnst);
 	  } else
 	      fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, 0, 0", ATT_SEP);
         }
         else {
-          fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, 0, %d", ATT_SEP, t->body.cnst);
+          fprintf(datafil, "DPS_LITERAL%cDPS_NAME, 0, 0, %ld", ATT_SEP, t->body.cnst);
           comment = "param ";
           }
         break;
@@ -905,13 +915,13 @@
       case T_NAME:
         commentName = (char *)t->val;
         if (t->wellKnownName) {
-          fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, DPSSYSNAME, %d", ATT_SEP, t->body.cnst);
+          fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, DPSSYSNAME, %ld", ATT_SEP, t->body.cnst);
           }
         else if (t->namedFormal == NULL) {
           int ln;
 	  if (noUserNames) {
 	    ln = PSWStringLength((char *)t->val);
-	    fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, %d, %d", ATT_SEP,
+	    fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, %d, %ld", ATT_SEP,
 	      ln, t->body.cnst);
 	  } else
 	    fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, 0, 0", ATT_SEP);
@@ -920,12 +930,12 @@
           Item item = t->namedFormal;
           if (IsCharType(item->type)) {
             if (item->subscripted && t->namedFormal->subscript->constant) {
-              fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, %d, %d", ATT_SEP,
+              fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, %d, %ld", ATT_SEP,
 		t->namedFormal->subscript->val, t->body.cnst);
               comment = "param[const]: ";
               }
 	    else {
-              fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, 0, %d", ATT_SEP, t->body.cnst);
+              fprintf(datafil, "DPS_EXEC%cDPS_NAME, 0, 0, %ld", ATT_SEP, t->body.cnst);
               comment = "param ";
               }
             }
@@ -933,20 +943,20 @@
             if (item->subscripted) {
               if (t->namedFormal->subscript->constant) {
 		if(IsNumStrType(item->type))
-	          fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %d",
+	          fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, %d, %ld",
 		          ATT_SEP, t->namedFormal->subscript->val 
 		          + NUMSTR_HEADER_SIZE, t->body.cnst);
 	        else 
-		  fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, %d, %d",
+		  fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, %d, %ld",
 		          ATT_SEP, t->namedFormal->subscript->val, 
 			  t->body.cnst);
 	        comment = "param[const]: ";
               } else {
 		if(IsNumStrType(item->type))
-		  fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, 0, %d",
+		  fprintf(datafil, "DPS_LITERAL%cDPS_STRING, 0, 0, %ld",
 		          ATT_SEP, t->body.cnst);
 	        else 
-		  fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, 0, %d", ATT_SEP,
+		  fprintf(datafil, "DPS_LITERAL%cDPS_ARRAY, 0, 0, %ld", ATT_SEP,
 			  t->body.cnst);
 	        comment = "param[var]: ";
               }
@@ -983,10 +993,10 @@
       else fprintf(datafil, "},	/* %s%s */\n", comment, commentName);
     }
     outlineno++;
-  } /* EmitFieldConstructor */
+} /* EmitFieldConstructor */
 
-static void ConstructStatics(body, sz, nObjs)
-  Body body; Adr *sz; int nObjs; {
+static void ConstructStatics(Body body, Adr *sz, int nObjs)
+{
   int objN = 0;
   register TokenList strings = NULL, bodies = NULL;
   register TokenList tl;
@@ -1091,12 +1101,13 @@
   Assert(objN  == nObjs);
   
   DestroyPSWDict(wrapDict);
-  } /* ConstructStatics */
+} /* ConstructStatics */
   
 
 /* Procedures for managing the result table */
 
-static void EmitResultTagTableDecls(outArgs) Args outArgs; {
+static void EmitResultTagTableDecls(Args outArgs)
+{
   register Arg arg;
   register Item item;
   int count = 0;
@@ -1154,14 +1165,16 @@
   printf("\n"); outlineno++;
 }
 
-static void EmitResultTagTableAssignments(outArgs) Args outArgs; {
+static void EmitResultTagTableAssignments(Args outArgs)
+{
   printf("  DPSSetResultTable(%s, _dpsR, %d);\n",ctxName,NumArgs(outArgs));
   outlineno++;
-  }
+}
 
 /* Procedure for acquiring name tags */
 
-static void EmitNameTagAcquisition() {
+static void EmitNameTagAcquisition(void)
+{
     register TokenList n;
     int i;
     char *last_str;
@@ -1231,13 +1244,12 @@
     }
     printf("    }\n  }\n\n");
     outlineno += 3;
-  } /* EmitNameTagAcquisition */
+} /* EmitNameTagAcquisition */
 
 
 /* Miscellaneous procedures */
 
-static void EmitLocals(sz)
-unsigned sz;
+static void EmitLocals(unsigned sz)
 {
   if(reentrant && writable) {
 	printf("  _dpsQ _dpsF;	/* local copy  */\n");
@@ -1267,7 +1279,8 @@
   }
 }
 
-static boolean AllLiterals(body) Body body; {
+static boolean AllLiterals(Body body)
+{
   Token t;
 
   for (t = body; t; t = t->next) {
@@ -1296,10 +1309,10 @@
       } /* switch */
     } /* for */
   return true;
-  } /* AllLiterals */
+} /* AllLiterals */
 
-static void FlattenSomeArrays(body, inSquiggles)
-  Body body; boolean inSquiggles; {
+static void FlattenSomeArrays(Body body, boolean inSquiggles)
+{
   Token t;
   for (t = body; t; t = t->next) {
     switch (t->type) {
@@ -1352,10 +1365,10 @@
         CantHappen();
       } /* switch */
     } /* for */
-  } /* FlattenSomeArrays */
+} /* FlattenSomeArrays */
 
 
-static void FixupOffsets()
+static void FixupOffsets(void)
 {
     register TokenList tl; Token t;
     register Item item;
@@ -1452,7 +1465,7 @@
 		    t->tokenIndex);
 		else
 		    printf("  _dpsP[%d].val.stringVal = _dps_offset + %d;\n",
-		    t->tokenIndex,strOffset);
+		    t->tokenIndex, (int) strOffset);
 		outlineno++;
 	    }       
 	} /* literalStrings */
@@ -1465,8 +1478,7 @@
 } /* FixupOffsets */
 
 
-static int EmitValueAssignments(body,item)
-Body body; Item item;
+static int EmitValueAssignments(Body body, Item item)
 {
     register Token t;
     int gotit = 0;
@@ -1548,11 +1560,10 @@
 	} /* switch */
     } /* token */
     return (gotit);
-  } /* EmitValueAssignments */
+} /* EmitValueAssignments */
 
 
-static void EmitElementValueAssignments(body,item)
-Body body; Item item;
+static void EmitElementValueAssignments(Body body, Item item)
 {
     register Token t;
 
@@ -1592,8 +1603,7 @@
 } /* EmitElementValueAssignments */
 
 
-static void ScanParamsAndEmitValues(body,args)
-Body body; Args args;
+static void ScanParamsAndEmitValues(Body body, Args args)
 {
     register Arg arg;	/* a list of parameters */
     register Item item;	/* a parameter */
@@ -1650,7 +1660,7 @@
     printf("\n"); outlineno++;
 }
 
-static void EmitMappedNames()
+static void EmitMappedNames(void)
 {
 register TokenList n;
 int i=0;
@@ -1661,8 +1671,7 @@
     }
 }
   
-static void WriteObjSeq(sz)
-unsigned sz;
+static void WriteObjSeq(unsigned sz)
 {
   register TokenList tl;
    
@@ -1739,13 +1748,14 @@
       ctxName,stringBytes);
     outlineno++;
     }
-  }  /* WriteObjSeq */
+}  /* WriteObjSeq */
 
 
 /*************************************************************/
 /* Public procedures, called by the semantic action routines */
 
-void EmitPrototype(hdr) Header hdr; {
+void EmitPrototype(Header hdr)
+{
   /* emit procedure prototype to the output .h file, if any */
   
   fprintf(header, "\n");
@@ -1757,9 +1767,10 @@
     fprintf(header, "*/ ");
     }
   fprintf(header, ");\n");
-  }
+}
 
-void EmitBodyHeader(hdr) Header hdr; {
+void EmitBodyHeader(Header hdr)
+{
   /* emit procedure header */
   register Arg arg;
   register Item item;
@@ -1801,7 +1812,8 @@
     }
 } /* EmitBodyHeader */
 
-void EmitBody(body, hdr) Tokens body; Header hdr; {
+void EmitBody(Tokens body, Header hdr)
+{
   Args arg, outArgs = hdr->outArgs;
   Item item;
   long int nObjs;
@@ -1817,7 +1829,7 @@
 
   FlattenSomeArrays(body, false);
   
-  if (large = ((NumTokens(body) > 0xff)) || CheckSize(body))
+  if ((large = (((NumTokens(body) > 0xff)) || CheckSize(body))) != 0)
   	dpsHeaderSize = DPS_LONG_HEADER_SIZE;
   else
   	dpsHeaderSize = DPS_HEADER_SIZE;
@@ -1889,12 +1901,10 @@
     outlineno++;
   }
 #endif
-  } /* EmitBody */
+} /* EmitBody */
 
-static void AllocFailure()
+static void AllocFailure(void)
 {
-    extern int yylineno;
-    extern int bigFile;
     ErrIntro(yylineno);
     fprintf(stderr, "pswrap is out of storage; ");
     if (bigFile)
@@ -1906,7 +1916,6 @@
 
 char *psw_malloc(s) int s; {
     char *temp;
-    extern char *malloc();
     if ((temp = malloc((unsigned) s)) == NULL)
         AllocFailure();
     return(temp);
@@ -1914,12 +1923,12 @@
 
 char *psw_calloc(n,s) int n,s; {
     char *temp;
-    extern char *calloc();
     if ((temp = calloc((unsigned) n, (unsigned) s)) == NULL)
         AllocFailure();
     return(temp);
 }
 
+void
 FreeBody(body) Body body; {
   register Token t, nexttoken;
 
Index: xc/config/pswrap/psw.h
diff -u xc/config/pswrap/psw.h:1.1 xc/config/pswrap/psw.h:1.3
--- xc/config/pswrap/psw.h:1.1	Sat Feb 12 16:12:30 2000
+++ xc/config/pswrap/psw.h	Thu May 18 17:25:42 2000
@@ -39,8 +39,6 @@
 #ifndef	PSW_H
 #define	PSW_H
 
-extern char *currentPSWName; /* valid between DEFINEPS and ENDPS */
-
 /* C types */
 
 #define T_BOOLEAN	   101
@@ -80,5 +78,15 @@
    T_USEROBJECT is used for userobjects
 
 */
+
+/* psw.c */
+extern char *psw_malloc(int);
+extern char *psw_calloc(int, int);
+
+/* pswstring.c */
+extern int PSWStringLength(char *);
+extern int PSWHexStringLength(char *);
+extern void PSWOutputStringChars(char *);
+extern void PSWOutputHexStringChars(char *);
 
 #endif /* PSW_H */
Index: xc/config/pswrap/pswdict.c
diff -u xc/config/pswrap/pswdict.c:1.1 xc/config/pswrap/pswdict.c:1.2
--- xc/config/pswrap/pswdict.c:1.1	Sat Feb 12 16:12:31 2000
+++ xc/config/pswrap/pswdict.c	Thu May 18 16:46:08 2000
@@ -40,8 +40,11 @@
 /* Imports */
 /***********/
 
+#include <stdlib.h>
+
 #include "pswtypes.h"
 #include "pswdict.h"
+#include "psw.h"
 
 #ifdef XENVIRONMENT
 #include <X11/Xos.h>
@@ -49,9 +52,6 @@
 #include <string.h>
 #endif
 
-extern char *psw_calloc();
-extern char *psw_malloc();
-
 /********************/
 /* Types */
 /********************/
@@ -60,13 +60,13 @@
   struct _t_EntryRec *next;
   char *name;
   PSWDictValue value;
-  } EntryRec, *Entry;
+} EntryRec, *Entry;
 
  /* The concrete definition for a dictionary */
- typedef struct _t_PSWDictRec {
+typedef struct _t_PSWDictRec {
   int nEntries;
   Entry *entries;
-  } PSWDictRec;
+} PSWDictRec;
 
 PSWDict atoms;
 
@@ -75,37 +75,40 @@
 /**************************/
 
 /* Creates and returns a new dictionary. nEntries is a hint. */
-PSWDict CreatePSWDict(nEntries) int nEntries; {
+PSWDict CreatePSWDict(int nEntries)
+{
   PSWDict d = (PSWDict)psw_calloc(sizeof(PSWDictRec), 1);
   d->nEntries = nEntries;
   d->entries = (Entry *)psw_calloc(sizeof(EntryRec), d->nEntries);
   return d;
-  }
+}
 
 /* Destroys a dictionary */
-void DestroyPSWDict(dict) PSWDict dict; {
+void DestroyPSWDict(PSWDict dict)
+{
   free(dict->entries);
   free(dict);
-  }
+}
 
-static int Hash(name, nEntries) char *name; int nEntries; {
+static int Hash(char *name, int nEntries)
+{
   register int val = 0;
   while (*name) val += *name++;
   if (val < 0) val = -val;
   return (val % nEntries);
-  }
+}
 
-static Entry Probe(d, x, name) PSWDict d; int x; char *name; {
+static Entry Probe(PSWDict d, int x, char *name)
+{
   register Entry e;
   for (e = (d->entries)[x]; e; e = e->next) {
     if (strcmp(name, e->name) == 0) break;
     }
   return e;
-  }
+}
 
-static Entry PrevProbe(prev, d, x, name)
-  Entry *prev; PSWDict d; int x; char *name;
-  {
+static Entry PrevProbe(Entry *prev, PSWDict d, int x, char *name)
+{
   register Entry e;
   *prev = NULL;
   for (e = (d->entries)[x]; e; e = e->next) {
@@ -113,21 +116,21 @@
     *prev = e;
     }
   return e;
-  }
+}
 
 /* -1 => not found */
-PSWDictValue PSWDictLookup(dict, name) PSWDict dict; char *name; {
+PSWDictValue PSWDictLookup(PSWDict dict, char *name)
+{
   Entry e;
   e = Probe(dict, Hash(name, dict->nEntries), name);
   if (e == NULL) return -1;
   return e->value;
-  }
+}
 
 /*  0 => normal return (not found)
    -1 => found. If found, value is replaced. */
-PSWDictValue PSWDictEnter(dict, name, value)
-  PSWDict dict; char *name; PSWDictValue value;
-  {
+PSWDictValue PSWDictEnter(PSWDict dict, char *name, PSWDictValue value)
+{
   Entry e;
   int x = Hash(name, dict->nEntries);
   e = Probe(dict, x, name);
@@ -140,10 +143,11 @@
   e->value = value;
   e->name = MakeAtom(name);
   return 0;
-  }
+}
 
 /* -1 => not found. If found, value is returned. */
-PSWDictValue PSWDictRemove(dict, name) PSWDict dict; char *name; {
+PSWDictValue PSWDictRemove(PSWDict dict, char *name)
+{
   Entry e, prev;
   PSWDictValue value;
   int x = Hash(name, dict->nEntries);
@@ -154,9 +158,10 @@
   if (prev == NULL) (dict->entries)[x] = e->next; else prev->next = e->next;
   free(e);
   return value;
-  }
+}
 
-PSWAtom MakeAtom(name) char *name; {
+PSWAtom MakeAtom(char *name)
+{
   Entry e;
   int x = Hash(name, 511);
   char *newname;
@@ -172,5 +177,4 @@
     e->name = newname;
     }
   return e->name;
-  }
-
+}
Index: xc/config/pswrap/pswdict.h
diff -u xc/config/pswrap/pswdict.h:1.1 xc/config/pswrap/pswdict.h:1.2
--- xc/config/pswrap/pswdict.h:1.1	Sat Feb 12 16:12:31 2000
+++ xc/config/pswrap/pswdict.h	Thu May 18 16:46:08 2000
@@ -52,23 +52,25 @@
    None of the name parameters are handed off, i.e. the caller is
    responsible for managing their storage. */
 
-extern PSWDict CreatePSWDict(/* int nEntries */);
+extern PSWDict CreatePSWDict(int /* nEntries */);
 /* nEntries is a hint. Creates and returns a new dictionary */
 
-extern void DestroyPSWDict(/* PSWDict dict */);
+extern void DestroyPSWDict(PSWDict /* dict */);
 /* Destroys a dictionary */
 
-extern PSWDictValue PSWDictLookup(/* PSWDict dict; char *name */);
+extern PSWDictValue PSWDictLookup(PSWDict /* dict */, char * /* name */);
 /* -1 => not found. */
 
 extern PSWDictValue PSWDictEnter
-  (/* PSWDict dict; char *name; PSWDictValue value; */);
+  (PSWDict /* dict */, char * /* name */, PSWDictValue /* value */);
 /*  0 => normal return (not found)
    -1 => found. If found, the old value gets replaced with the new one. */
 
-extern PSWDictValue PSWDictRemove(/* PSWDict dict; char *name */);
+extern PSWDictValue PSWDictRemove(PSWDict /* dict */, char * /* name */);
 /* -1 => not found. If found, value is returned. */
 
-extern PSWAtom MakeAtom(/* char *name */);
+extern PSWAtom MakeAtom(char * /* name */);
+
+extern PSWDict wellKnownPSNames;
 
 #endif /* PSWDICT_H */
Index: xc/config/pswrap/pswfile.c
diff -u xc/config/pswrap/pswfile.c:1.1 xc/config/pswrap/pswfile.c:1.4
--- xc/config/pswrap/pswfile.c:1.1	Sat Feb 12 16:12:31 2000
+++ xc/config/pswrap/pswfile.c	Wed Jun  7 14:58:25 2000
@@ -35,74 +35,41 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/config/pswrap/pswfile.c,v 1.4 2000/06/07 21:58:25 tsi Exp $ */
 
 #include <stdio.h>
 #include "pswversion.h"
+#include "pswpriv.h"
 
-extern int outlineno;		/* line number in output file */
-
-extern FILE *header;
-extern char headid[];
-extern char *ifile;
-extern char *hfile;
-extern char *ofile;
 #ifdef __MACH__
 extern char *shlibInclude;
 #endif /* __MACH__ */
-
 
-#ifdef _NO_PROTO
-#include <varargs.h>
+static int dpsops = 0;
 
-/* for debugging */
-myprintf (va_alist)
-  va_dcl
+static int EmitVersion(FILE *f, char *infname, char *outfname)
 {
-	printf(va_alist);
-}
-
-#else /* _NO_PROTO */
-
-#include <stdarg.h>
+    dpsops = (*infname == 'd') || (*infname == 'd');
 
-/* for debugging */
-myprintf (char *fmt, ...)
-{
-    va_list args;
-
-#if defined(__STDC__) || defined(AIXV3) || defined(ultrix)
-    va_start(args, fmt);
-#else
-    va_start(args);
-#endif
-
-    vprintf(fmt, args);
-    va_end(args);
-}
-
-#endif /* _NO_PROTO */
-
-static int EmitVersion(f, infname, outfname)
-    FILE *f;
-    char *infname, *outfname;
-{
-    extern char *prog;
     fprintf(f,"/* %s generated from %s\n",outfname,infname);
     fprintf(f,"   by %s %s %s\n */\n\n",PSW_OS,prog,PSW_VERSION);
     return 4;  /* number of output lines */
 }
 
-InitHFile(){
+void InitHFile(void)
+{
     (void) EmitVersion(header, ifile, hfile);
     fprintf(header,"#ifndef %s\n#define %s\n",headid,headid);
 }
 
-FinishHFile() {
+void FinishHFile(void)
+{
     fprintf(header,"\n#endif /* %s */\n",headid);
     fclose(header);
 }
 
-InitOFile() {
+void InitOFile(void)
+{
     outlineno += EmitVersion(stdout, ifile, ofile);
 #ifdef __MACH__
     if( shlibInclude ) {
@@ -113,9 +80,13 @@
     }
 #endif /* __MACH__ */
     printf("#include %s\n", FRIENDSFILE);
-    printf("#include <string.h>\n\n");
-    outlineno += 3;  /* UPDATE this if you add more prolog */
+    printf("#include <string.h>\n");
+    if (special_h == 0) {
+	printf("#include \"%spsops.h\"\n\n", dpsops ? "d" : "");
+    } else {
+	printf("#include \"%s\"\n\n", special_h);
+    }
+    outlineno += 4;  /* UPDATE this if you add more prolog */
     printf("#line 1 \"%s\"\n",ifile);
     outlineno++;
 }
-
Index: xc/config/pswrap/pswparser.y
diff -u xc/config/pswrap/pswparser.y:1.1 xc/config/pswrap/pswparser.y:1.4
--- xc/config/pswrap/pswparser.y:1.1	Sat Feb 12 16:12:31 2000
+++ xc/config/pswrap/pswparser.y	Thu May 18 16:46:08 2000
@@ -35,7 +35,14 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/config/pswrap/pswparser.y,v 1.4 2000/05/18 23:46:08 dawes Exp $ */
 
+/* 
+ * Not all yaccs understand this.
+ *
+%expect 1
+ */
+
 %{
 
 #include "pswpriv.h"
@@ -186,7 +193,7 @@
 	| CNAME '[' Subscript ']'
 		{ $$ = PSWSubscriptItem($1, $3); }
 	| CNAME '[' Subscript ']' ':' CNAME
-		{ $$ = PSWScaleItem($1, $3, $6, NULL); }
+		{ $$ = PSWScaleItem($1, $3, $6, 0); }
 	| CNAME '[' Subscript ']' ':' CINTEGER
 		{ $$ = PSWScaleItem($1, $3, NULL, $6); }
 	| CNAME
@@ -249,7 +256,7 @@
 
 Token:
 	PSINTEGER
-		{ $$ = PSWToken(T_INT, $1); }
+		{ $$ = PSWToken(T_INT, (char *)$1); }
 	| PSREAL
 		{ $$ = PSWToken(T_FLOAT, $1); }
 	| PSBOOLEAN
@@ -265,7 +272,7 @@
 	| PSSUBNAME PSINDEX
 		{ $$ = PSWToken2(T_SUBSCRIPTED, $1, $2); }
 	| '[' Body ']'
-		{ $$ = PSWToken(T_ARRAY, $2); }
+		{ $$ = PSWToken(T_ARRAY, (char *)$2); }
 	| '{' Body '}'
-		{ $$ = PSWToken(T_PROC, $2); }
+		{ $$ = PSWToken(T_PROC, (char *)$2); }
 	;
Index: xc/config/pswrap/pswpriv.h
diff -u xc/config/pswrap/pswpriv.h:1.1 xc/config/pswrap/pswpriv.h:1.6
--- xc/config/pswrap/pswpriv.h:1.1	Sat Feb 12 16:12:32 2000
+++ xc/config/pswrap/pswpriv.h	Wed Jun  7 14:58:25 2000
@@ -35,10 +35,13 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/config/pswrap/pswpriv.h,v 1.6 2000/06/07 21:58:25 tsi Exp $ */
 
 #ifndef PSWPRIV_H
 #define PSWPRIV_H
 
+#include <stdio.h>
+
 #include "pswtypes.h"
 #include "psw.h"
 
@@ -125,5 +128,52 @@
   Token token;
   } TokenListRec, *TokenList;
 
+extern FILE *header;
+extern boolean noUserNames;  	/* -n flag */
+extern char *currentPSWName;
+extern char *hfile;
+extern char *ifile;
+extern char *ifile;		/* input file name for error messages */
+extern char *ofile;
+extern char *prog;
+extern char *special_h;		/* -f option */
+extern char *string_temp;	/* buffer of that size for scanning strings */
+extern char headid[];
+extern int bigFile;
+extern int doANSI;		/* -a flag */
+extern int errorCount;
+extern int maxstring;		/* max PS string length to scan (-s) */
+extern int lexdebug;		/* debug flag for lexer */
+extern int errorCount;		/* non-fatal errs */
+extern int outlineno;		/* line number in output file */
+extern int pad;			/* -p flag */
+extern int reentrant;
+extern int reportedPSWName;
+extern int yylineno;		/* current line number in pswrap source file */
+
+/* lexer.l */
+extern int yylex(void);
+extern void stringerr(int);	/* report string overflow */
+
+/* psw.c */
+extern void EmitPrototype(Header);
+extern void EmitBodyHeader(Header);
+extern void EmitBody(Tokens, Header);
+extern void FreeBody(Body);
+
+/* pswfile.c */
+extern void FinishHFile(void);
+extern void InitHFile(void);
+extern void InitOFile(void);
+
+/* pswparser.y */
+extern int yyparse (void);
+
+/* systemnames.c */
+extern void InitWellKnownPSNames(void);
+
+/* yyerror.c */
+extern void ErrIntro(int);
+extern void yyerror(char *);
 
 #endif /* PSWPRIV_H */
Index: xc/config/pswrap/pswsemantics.c
diff -u xc/config/pswrap/pswsemantics.c:1.1 xc/config/pswrap/pswsemantics.c:1.2
--- xc/config/pswrap/pswsemantics.c:1.1	Sat Feb 12 16:12:32 2000
+++ xc/config/pswrap/pswsemantics.c	Thu May 18 16:46:08 2000
@@ -40,6 +40,7 @@
 /* Imports */
 /***********/
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #ifdef XENVIRONMENT
@@ -50,21 +51,8 @@
 
 #include "pswdict.h"
 #include "pswpriv.h"
+#include "pswsemantics.h"
 
-extern char *hfile;
-extern char *ofile;
-extern char *ifile;
-extern FILE *header;
-extern int yylineno; /* current line number in pswrap source file */
-extern int outlineno;
-
-extern void EmitPrototype();
-extern void EmitBodyHeader();
-extern void EmitBody();
-
-extern char *psw_malloc();
-extern char *psw_calloc();
-
 /***********************/
 /* Module-wide globals */
 /***********************/
@@ -79,29 +67,29 @@
 /* Procedures called by the parser's annotations */
 /*************************************************/
 
-static boolean IsCharType(t) Type t; {
+static boolean IsCharType(Type t)
+{
   return (t == T_CHAR || t == T_UCHAR);
-  }
+}
 
-static boolean IsNumStrType(t) Type t; {
+static boolean IsNumStrType(Type t)
+{
 	return (t == T_NUMSTR
 			|| t == T_FLOATNUMSTR
 			|| t == T_LONGNUMSTR
 			|| t == T_SHORTNUMSTR);
 }
   
-void PSWName(s) char *s; {
+void PSWName(char *s)
+{
   currentPSWName = psw_malloc(strlen(s)+1);
   strcpy(currentPSWName, s);
   reportedPSWName = 0;
-  }
+}
   
   /* Generate the code for this wrap now */
-void FinalizePSWrapDef(hdr, body)
-  Header hdr; Body body;
+void FinalizePSWrapDef(Header hdr, Body body)
 {
-  extern int bigFile;
-  
   if (header && ! hdr->isStatic) EmitPrototype(hdr); 
 
   printf("#line %d \"%s\"\n", ++outlineno, ofile);
@@ -152,11 +140,11 @@
   currentDict = NULL;
   currentPSWName = NULL;
   reportedPSWName = 0;
-  }
+}
 
   /* Complete construction of the Header tree and make some semantic checks */
-Header PSWHeader(isStatic, inArgs, outArgs)
-  boolean isStatic; Args inArgs, outArgs; {
+Header PSWHeader(boolean isStatic, Args inArgs, Args outArgs)
+{
   char *name = currentPSWName;
   register Arg arg, prevArg;
   register Item item, prevItem;
@@ -229,7 +217,7 @@
     for (item = arg->items; item; item = item->next) {
       if (arg->type == T_USEROBJECT) {
  	     ErrIntro(item->sourceLine);
-         fprintf(stderr,"output parameter can not be of type userobject\n",
+         fprintf(stderr,"output parameter %s can not be of type userobject\n",
                item->name);
  	     /* remove item from list */
  	     if (prevItem) {prevItem->next = item->next;}
@@ -337,15 +325,12 @@
   hdr->outArgs = outArgs;
 
   return hdr;
-  }
+}
 
-Token PSWToken(type, val)
-  Type type;
-  char *val; {
+Token PSWToken(Type type, char *val)
+{
   register Token token = (Token)psw_calloc(sizeof(TokenRec), 1);
-  extern int errorCount;
-  extern char *ifile;
-  
+ 
   token->next = NULL;
   token->type = type;
   token->val = val;
@@ -378,14 +363,11 @@
     }
 
   return token;
-  }
+}
 
-Token PSWToken2(type, val, ind)
-  Type type;
-  char *val; char *ind; {
+Token PSWToken2(Type type, char *val, char *ind)
+{
   register Token token = (Token)psw_calloc(sizeof(TokenRec), 1);
-  extern int errorCount;
-  extern char *ifile;
   Item dictVal = (Item) PSWDictLookup(currentDict, val);
   Item dvi;
 
@@ -428,38 +410,38 @@
   /*  ERRORS fall through */
   free(token);
   return (PSWToken(T_NAME,val));
-  }
+}
 
-Arg PSWArg(type, items)
-  Type type; Items items; {
+Arg PSWArg(Type type, Items items)
+{
   register Arg arg = (Arg)psw_calloc(sizeof(ArgRec), 1);
   arg->next = NULL;
   arg->type = type;
   arg->items = items;
   return arg;
-  }
+}
 
-Item PSWItem(name)
-  char *name; {
+Item PSWItem(char *name)
+{
   register Item item = (Item)psw_calloc(sizeof(ItemRec), 1);
   item->next = NULL;
   item->name = name;
   item->sourceLine = yylineno;
   return item;
-  }
+}
 
-Item PSWStarItem(name)
-  char *name; {
+Item PSWStarItem(char *name)
+{
   register Item item = (Item)psw_calloc(sizeof(ItemRec), 1);
   item->next = NULL;
   item->name = name;
   item->starred = true;
   item->sourceLine = yylineno;
   return item;
-  }
+}
 
-Item PSWSubscriptItem(name, subscript)
-  char *name; Subscript subscript; {
+Item PSWSubscriptItem(char *name, Subscript subscript)
+{
   register Item item = (Item)psw_calloc(sizeof(ItemRec), 1);
   item->next = NULL;
   item->name = name;
@@ -467,13 +449,9 @@
   item->subscripted = true;
   item->sourceLine = yylineno;
   return item;
-  }
+}
 
-Item PSWScaleItem(name, subscript, nameval, val)
-  char *name;
-  Subscript subscript;
-  char *nameval;
-  int val;
+Item PSWScaleItem(char *name, Subscript subscript, char *nameval, int val)
 {
   Item item;
   Scale scale = (Scale)psw_calloc(sizeof(ScaleRec), 1);
@@ -489,29 +467,29 @@
   return(item);
 }
   
-Subscript PSWNameSubscript(name)
-  char *name; {
+Subscript PSWNameSubscript(char *name)
+{
   Subscript subscript = (Subscript)psw_calloc(sizeof(SubscriptRec), 1);
   subscript->name = name;
   return subscript;
-  }
+}
 
-Subscript PSWIntegerSubscript(val)
-  int val; {
+Subscript PSWIntegerSubscript(int val)
+{
   Subscript subscript = (Subscript)psw_calloc(sizeof(SubscriptRec), 1);
   subscript->constant = true;
   subscript->val = val;
   return subscript;
-  }
+}
 
-Args ConsPSWArgs(arg, args)
-  Arg arg; Args args; {
+Args ConsPSWArgs(Arg arg, Args args)
+{
   arg->next = args;
   return arg;
-  }
+}
 
-Tokens AppendPSWToken(token, tokens)
-  register Token token; Tokens tokens; {
+Tokens AppendPSWToken(Token token, Tokens tokens)
+{
   register Token t;
   static Token firstToken, lastToken;	/* cache ptr to last */
   
@@ -546,10 +524,10 @@
   lastToken = t->next = token;
 
   return tokens;
-  }
+}
 
-Args AppendPSWArgs(arg, args)
-  Arg arg; Args args; {
+Args AppendPSWArgs(Arg arg, Args args)
+{
   register Arg a;
   arg->next = NULL;
   if (args == NULL) return arg;
@@ -558,10 +536,10 @@
 
   a->next = arg; 
   return args;
-  }
+}
 
-Items AppendPSWItems(item, items)
-  Item item; Items items; {
+Items AppendPSWItems(Item item, Items items)
+{
   register Item t;
   item->next = NULL;
   if (items == NULL) return item;
@@ -570,5 +548,4 @@
 
   t->next = item; 
   return items;
-  }
-
+}
Index: xc/config/pswrap/pswsemantics.h
diff -u xc/config/pswrap/pswsemantics.h:1.1 xc/config/pswrap/pswsemantics.h:1.2
--- xc/config/pswrap/pswsemantics.h:1.1	Sat Feb 12 16:12:34 2000
+++ xc/config/pswrap/pswsemantics.h	Thu May 18 16:46:08 2000
@@ -43,21 +43,21 @@
 
 /* PROCEDURES */
 
-extern void PSWName(/* char *s */);
-extern void FinalizePSWrapDef(/* hdr, body */);
-extern Header PSWHeader(/* isStatic, inArgs, outArgs */);
-extern Token PSWToken(/* type, val */);
-extern Token PSWToken2(/* type, val, ind */);
-extern Arg PSWArg(/* type, items */);
-extern Item PSWItem(/* name */);
-extern Item PSWStarItem(/* name */);
-extern Item PSWSubscriptItem(/* name, subscript */);
-extern Item PSWScaleItem(/* name, subscript */);
-extern Subscript PSWNameSubscript(/* name */);
-extern Subscript PSWIntegerSubscript(/* val */);
-extern Args ConsPSWArgs(/* arg, args */);
-extern Tokens AppendPSWToken(/* token, tokens */);
-extern Args AppendPSWArgs(/* arg, args */);
-extern Items AppendPSWItems(/* item, items */);
+extern Arg PSWArg(Type, Items);
+extern Args AppendPSWArgs(Arg, Args);
+extern Args ConsPSWArgs(Arg, Args);
+extern Header PSWHeader(boolean, Args, Args);
+extern Item PSWItem(char *);
+extern Item PSWScaleItem(char *, Subscript, char *, int);
+extern Item PSWStarItem(char *);
+extern Item PSWSubscriptItem(char *, Subscript);
+extern Items AppendPSWItems(Item, Items);
+extern Subscript PSWIntegerSubscript(int);
+extern Subscript PSWNameSubscript(char *);
+extern Token PSWToken(Type, char *);
+extern Token PSWToken2(Type, char *, char *);
+extern Tokens AppendPSWToken(Token, Tokens);
+extern void FinalizePSWrapDef(Header, Body);
+extern void PSWName(char *);
 
 #endif /* PSWSEMANTICS_H */
Index: xc/config/pswrap/pswstring.c
diff -u xc/config/pswrap/pswstring.c:1.1 xc/config/pswrap/pswstring.c:1.2
--- xc/config/pswrap/pswstring.c:1.1	Sat Feb 12 16:12:34 2000
+++ xc/config/pswrap/pswstring.c	Thu May 18 16:46:09 2000
@@ -39,12 +39,14 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#include "pswpriv.h"
+#include "psw.h"
+
 #define outfil stdout
 #define MAX_PER_LINE 16
-
-extern int outlineno;		/* line number in output file */
 
-int PSWStringLength(s) char *s; {
+int PSWStringLength(char *s)
+{
     register char *c = s;
     register int len = 0;
 
@@ -57,7 +59,8 @@
     return (len);
 }
 
-void PSWOutputStringChars(s) char *s; {
+void PSWOutputStringChars(char *s)
+{
     register char *c = s;
     register char b;
     register int perline = 0;
@@ -109,12 +112,12 @@
 }
 
 
-int PSWHexStringLength(s) char *s; {
+int PSWHexStringLength(char *s)
+{
     return ((int) (strlen(s)+1)/2);
 }
 
-void PSWOutputHexStringChars(s)
-    register char *s;
+void PSWOutputHexStringChars(register char *s)
 {
     register int perline = 0;
     char tmp[3];
Index: xc/config/pswrap/systemnames.c
diff -u xc/config/pswrap/systemnames.c:1.1 xc/config/pswrap/systemnames.c:1.2
--- xc/config/pswrap/systemnames.c:1.1	Sat Feb 12 16:12:36 2000
+++ xc/config/pswrap/systemnames.c	Thu May 18 16:46:09 2000
@@ -36,11 +36,12 @@
  * Author:  Adobe Systems Incorporated
  */
 
+#include "pswpriv.h"
 #include "pswdict.h"
 
 PSWDict wellKnownPSNames;
 
-void InitWellKnownPSNames()
+void InitWellKnownPSNames(void)
 {
 #include "sysname_gen.c"
 }
Index: xc/config/pswrap/yyerror.c
diff -u xc/config/pswrap/yyerror.c:1.1 xc/config/pswrap/yyerror.c:1.2
--- xc/config/pswrap/yyerror.c:1.1	Sat Feb 12 16:12:36 2000
+++ xc/config/pswrap/yyerror.c	Thu May 18 16:46:09 2000
@@ -39,6 +39,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#include "pswpriv.h"
+
 /* ErrIntro prints a standard intro for error messages;
  * change it if your system uses something else.  We have many options:
  *
@@ -56,13 +58,9 @@
 #else /* macintosh */
 #define FMT "\"%s\", line %d: "
 #endif /* macintosh */
-
-ErrIntro(line) int line; {
-    extern char *ifile;
-    extern int reportedPSWName;
-    extern char	*currentPSWName;
-    extern int errorCount;
 
+void ErrIntro(int line)
+{
     if (! reportedPSWName && currentPSWName) {
 		reportedPSWName = 1;
 		fprintf(stderr,INTRO,currentPSWName);
@@ -72,13 +70,8 @@
 }
 
 
-yyerror(errmsg)
-char *errmsg;
+void yyerror(char *errmsg)
 {
-    extern char yytext[];
-    extern int yylineno;
-
     ErrIntro(yylineno);
     fprintf(stderr,"%s near text \"%s\"\n",errmsg,yytext);
 }
-
Index: xc/config/util/Imakefile
diff -u xc/config/util/Imakefile:3.23 xc/config/util/Imakefile:3.28
--- xc/config/util/Imakefile:3.23	Wed Dec 29 19:56:16 1999
+++ xc/config/util/Imakefile	Fri Mar 31 12:13:12 2000
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $
-XCOMM $XFree86: xc/config/util/Imakefile,v 3.23 1999/12/30 03:56:16 robin Exp $
+XCOMM $XFree86: xc/config/util/Imakefile,v 3.28 2000/03/31 20:13:12 dawes Exp $
 
 #if UseCCMakeDepend
 MDEP_PROG = makedepend
@@ -18,12 +18,16 @@
 LNDIR_PROG = ProgramTargetName(lndir)
 #endif
 
+#if BuildRman
+RMAN_PROG = ProgramTargetName(rman)
+#endif
+
 #ifdef QNX4Architecture
 QNXCopyInstaller($(PROJECTROOT)/bin/install.qnx,./install.sh)
 #endif
 
 PROGRAMS = xmkmf $(MDEP_PROG) $(GCCMDEP_PROG) mergelib $(LNDIR_PROG) \
-	   ProgramTargetName(revpath) \
+	   $(RMAN_PROG) ProgramTargetName(revpath) \
 	   ProgramTargetName(makestrs) $(EXPORTLISTGEN) $(CMKDIRHIER)
 DEPLIBS =
 #ifndef Win32Architecture
@@ -83,6 +87,18 @@
 AllTarget(ProgramTargetName(revpath))
 SimpleProgramTarget_4(revpath)
 
+#if BuildRman
+VOLLIST="1:2:3:4:5:6:7:8:9:o:l:n:p"
+MANTITLEPRINTF="%s(%s) manual page"
+MANREFPRINTF="%s.%s.html"
+RMANVERSION="3.0.8+XFree86"
+AllTarget(ProgramTargetName(rman))
+SimpleProgramTarget_5(rman)
+SpecialCObjectRule(rman,NullParameter,-DVOLLIST='$(VOLLIST)' -DMANTITLEPRINTF='$(MANTITLEPRINTF)' -DMANREFPRINTF='$(MANREFPRINTF)' -DPOLYGLOTMANVERSION='$(RMANVERSION)' -DXFree86)
+LinkSourceFile(rman.c,$(TOP)/extras/rman)
+LinkFile(rman.man,$(TOP)/extras/rman/rman.1)
+#endif
+
 InstallManPage(xmkmf,$(MANDIR))
 
 #if defined(OS2Architecture)
@@ -106,6 +122,7 @@
 InstallNamedProg(mergelib,mergelib,$(BINDIR))
 InstallNamedProg(makeg.sh,makeg,$(BINDIR))
 InstallManPage(makeg,$(MANDIR))
+InstallNamedProg(mkhtmlindex.sh,mkhtmlindex,$(BINDIR))
 #endif
 InstallManPage(mkdirhier,$(MANDIR))
 #if UseCCMakeDepend
Index: xc/config/util/buildos2.cmd
diff -u xc/config/util/buildos2.cmd:3.9 xc/config/util/buildos2.cmd:3.10
--- xc/config/util/buildos2.cmd:3.9	Thu Apr 29 02:13:24 1999
+++ xc/config/util/buildos2.cmd	Wed Apr  5 11:13:12 2000
@@ -1,5 +1,5 @@
 /* REXX */
-/* $XFree86: xc/config/util/buildos2.cmd,v 3.9 1999/04/29 09:13:24 dawes Exp $
+/* $XFree86: xc/config/util/buildos2.cmd,v 3.10 2000/04/05 18:13:12 dawes Exp $
  * this file is supposed to run from the xc/ dir.
  * you must copy it manually to there before using. It is just here
  * in order not to be in the root dir.
@@ -23,7 +23,7 @@
 'emxload -e x11make.exe rm.exe mv.exe'
 'emxload -e -gcc -omf'
 
-'x11make MAKE=x11make SHELL= MFLAGS="MAKE=x11make CC=gcc BOOTSTRAPCFLAGS=-DBSD43 SHELL= " World.OS2 2>&1 | tee buildxc.log'
+'x11make MAKE=x11make SHELL= MFLAGS="MAKE=x11make CC=gcc BOOTSTRAPCFLAGS=-DBSD43 SHELL= " World.OS2 2>&1 | tee buildos2.log'
 
 EXIT
 
Index: xc/config/util/indir.cmd
diff -u xc/config/util/indir.cmd:3.1 xc/config/util/indir.cmd:3.2
--- xc/config/util/indir.cmd:3.1	Wed Jan 24 13:56:12 1996
+++ xc/config/util/indir.cmd	Wed Apr  5 11:13:13 2000
@@ -1,23 +1,28 @@
 /* OS/2 rexx script to emulate the "cd dir; command" mechanism in make
  * which does not work with stupid CMD.EXE
  *
- * $XFree86: xc/config/util/indir.cmd,v 3.1 1996/01/24 21:56:12 dawes Exp $
+ * $XFree86: xc/config/util/indir.cmd,v 3.2 2000/04/05 18:13:13 dawes Exp $
  */
 curdir = directory()
-line = fixbadprefix(arg(1))
-new = directory(word(line,1))
-subword(line,2)
-old = directory(curdir)
-exit
+line = fixbadprefix(ARG(1))
+w1 = TRANSLATE(WORD(line,1),'\','/')
+new = directory(w1)
+/*IF (SUBSTR(w1,1,2) = '..') | (POS(w1,new) > 0) THEN DO*/
+  subword(line,2)
+  old = directory(curdir)
+/*END
+ELSE DO
+  say 'Directory 'new' does not exist, ignoring command (nonfatal)'
+END*/
+EXIT
 
 /* somehow make or cmd manages to convert a relative path ..\..\. to ..... */
 fixbadprefix:
 count = 1
 str = ARG(1)
-DO WHILE SUBSTR(str,count,2) = '..'
+DO WHILE SUBSTR(str,count,3) = '...'
    count = count+1
    str = INSERT('\',str,count)
    count = count+2
 END
 RETURN str
-
Index: xc/config/util/lndir.c
diff -u xc/config/util/lndir.c:3.9 xc/config/util/lndir.c:3.10
--- xc/config/util/lndir.c:3.9	Tue Oct 19 09:32:37 1999
+++ xc/config/util/lndir.c	Mon Apr 17 09:29:45 2000
@@ -22,7 +22,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/util/lndir.c,v 3.9 1999/10/19 16:32:37 tsi Exp $ */
+/* $XFree86: xc/config/util/lndir.c,v 3.10 2000/04/17 16:29:45 eich Exp $ */
 
 /* From the original /bin/sh script:
 
@@ -199,7 +199,8 @@
     }
 
     p = buf + strlen (buf);
-    *p++ = '/';
+    if (*(p - 1) != '/')
+	*p++ = '/';
     n_dirs = fs->st_nlink;
     while ((dp = readdir (df))) {
 	if (dp->d_name[strlen(dp->d_name) - 1] == '~')
Index: xc/config/util/mkhtmlindex.sh
diff -u /dev/null xc/config/util/mkhtmlindex.sh:1.2
--- /dev/null	Sat Jul  1 20:41:55 2000
+++ xc/config/util/mkhtmlindex.sh	Wed Mar 22 13:23:34 2000
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+# $XFree86: xc/config/util/mkhtmlindex.sh,v 1.2 2000/03/22 21:23:34 dawes Exp $
+#
+# Copyright © 2000 by Precision Insight, Inc.
+#
+# Generate index files for the HTML man pages
+#
+# Author:	David Dawes <dawes@xfree86.org>
+#
+
+VOLLIST="1 2 3 4 5 6 7 8 9 o l n p"
+INDEX="manindex"
+
+if [ $# != 1 ]; then
+	echo Usage: $0 htmlmandir
+	exit 1
+fi
+
+if [ ! -d $1 ]; then
+	echo $1 is not a directory
+	exit 1
+fi
+
+cd $1
+
+for s in $VOLLIST; do
+	list="`ls *.$s.html 2> /dev/null`" 
+	if [ X"$list" != X ]; then
+		file=$INDEX$s.html
+		rm -f $file
+		cat <<EOF > $file
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>XFree86[tm] Manual pages: Section $s</TITLE>
+</HEAD>
+<BODY BGCOLOR="#efefef" TEXT="black" LINK="blue" VLINK="#551A8B" ALINK="red">
+
+<H1>XFree86[tm] Manual pages: Section $s</H1>
+<P>
+<UL>
+EOF
+		for i in $list; do
+			title="`egrep '^[0-9A-Za-z]' $i | egrep -v '^Name' | head -1`"
+			name="`echo $title | sed -e 's/ - .*//'`"
+			desc="`echo $title | sed -e 's/[^-]* - //' -e 's/<P>//'`"
+			echo "<LI><A href=\"$i\">$name</A> - $desc</LI>" >> $file
+		done
+		cat <<EOF >> $file
+</UL>
+<P>
+</BODY>
+</HTML>
+EOF
+	fi
+done
+
+exit 0
Index: xc/programs/Imakefile
diff -u xc/programs/Imakefile:3.28 xc/programs/Imakefile:3.29
--- xc/programs/Imakefile:3.28	Fri Feb 25 21:35:07 2000
+++ xc/programs/Imakefile	Thu Jun 15 13:49:59 2000
@@ -2,7 +2,7 @@
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/programs/Imakefile,v 3.28 2000/02/26 05:35:07 dawes Exp $
+XCOMM $XFree86: xc/programs/Imakefile,v 3.29 2000/06/15 20:49:59 dawes Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 
@@ -43,7 +43,9 @@
        XDMSRCDIR = xdm
 XFINDPROXYSRCDIR = xfindproxy
       XFWPSRCDIR = xfwp
+#if BuildXF86VidModeExt
     XGAMMASRCDIR = xgamma
+#endif
      XHOSTSRCDIR = xhost
 #if BuildPlugin
        XRXSRCDIR = xrx
Index: xc/programs/Xserver/Imakefile
diff -u xc/programs/Xserver/Imakefile:3.182 xc/programs/Xserver/Imakefile:3.184
--- xc/programs/Xserver/Imakefile:3.182	Tue Feb 29 07:24:15 2000
+++ xc/programs/Xserver/Imakefile	Fri Jun 16 17:03:10 2000
@@ -2,7 +2,7 @@
 /*
  * Server Master Makefile
  */
-XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.182 2000/02/29 15:24:15 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.184 2000/06/17 00:03:10 martin Exp $
 
 #ifndef InstallXserverSetUID
 #define InstallXserverSetUID NO
@@ -619,7 +619,7 @@
 XF86IDRVLIBS = $(XF86IDRIVERLIB)
 XF86SCANLIB = $(XF86SRC)/scanpci/LibraryTargetName(scanpci)
 XF86LIBS  = $(XF86INIT) $(XF86COMLIB) $(XF86RACLIB) $(XF86PARSLIB) \
-	    $(XF86OSLIB) $(XF86INT10LIB)
+	    $(XF86OSLIB) $(XF86INT10LIB) $(XF86DDCLIB)
 #else
 XF86LIBS  = $(XF86INIT) $(XF86COMLIB) $(XF86PARSLIB) $(XF86OSLIB) 
 #endif
@@ -634,7 +634,8 @@
 #endif
 XF86SERVEROBJS = $(XF86DRVOBJS) $(XF86IDRVOBJS)
 XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \
-		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB)
+		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) \
+		 $(XF86DDCLIB)
 #if HasParallelMake
 MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS))
 #endif
@@ -728,6 +729,31 @@
 ServerTarget(Xsavage,$(SAVAGEDIRS),$(SAVAGEOBJS),$(SAVAGELIBS),$(SAVAGESYSLIBS))
 #endif /* XSAVAGEServer */
 
+#if XIgsServer
+XCOMM
+XCOMM server with Keith's S3 Igs driver
+XCOMM
+
+       IGSDIR = $(KDRIVE)/igs
+          IGS = $(IGSDIR)/LibraryTargetName(igs)
+    
+       KDDIRS = StdKdDirs
+   
+      IGSDIRS = $(STDDIRS) $(KDDIRS) $(IGSDIR)
+   
+      IGSLIBS = PreFbLibs $(IGS) KdLibs FbPostFbLibs
+   IGSSYSLIBS = StdKdSysLibs
+
+#if HasParallelMake
+MakeMutex($(IGSDIRS) $(IGSOBJS) $(IGSLIBS) $(IGSSYSLIBS))
+#endif
+#if ForceServerRemake
+$(IGSOBJS) $(XIGS) $(IGSLIBS) $(IGSSYSLIBS):: $(IGSDIRS)
+	@if [ -f $@ ]; then touch $@; fi
+#endif
+ServerTarget(Xigs,$(IGSDIRS),$(IGSOBJS),$(IGSLIBS),$(IGSSYSLIBS))
+#endif /* XIGSServer */
+
 #if XTridentServer
 XCOMM
 XCOMM server with Keith's TRIDENT Cyber9525 driver
@@ -861,7 +887,7 @@
 #endif /* XItsyServer */
 
 KDRIVEDIRS=$(KDDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(SIS530DIR) \
-	$(TRIODIR) $(TS300DIR) $(ITSYDIR)
+	$(TRIODIR) $(TS300DIR) $(ITSYDIR) $(IGSDIR)
 
 #if XprtServer && !MakeDllModules
 XCOMM
Index: xc/programs/Xserver/GL/dri/dri.c
diff -u xc/programs/Xserver/GL/dri/dri.c:1.13 xc/programs/Xserver/GL/dri/dri.c:1.19
--- xc/programs/Xserver/GL/dri/dri.c:1.13	Fri Mar  3 17:53:01 2000
+++ xc/programs/Xserver/GL/dri/dri.c	Sun Jun 25 09:03:43 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.13 2000/03/04 01:53:01 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.19 2000/06/25 16:03:43 tsi Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -32,7 +32,7 @@
  *
  */
 
-#if XFree86LOADER
+#ifdef XFree86LOADER
 #include "xf86.h"
 #include "xf86_ansic.h"
 #else
@@ -93,15 +93,12 @@
 }
 
 Bool
-DRIScreenInit(
-    ScreenPtr pScreen,
-    DRIInfoPtr pDRIInfo,
-    int* pDRMFD)
+DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 {
     DRIScreenPrivPtr 	pDRIPriv;
     drmContextPtr       reserved;
     int                 reserved_count;
-    int		     i;
+    int	                i, fd, drmWasAvailable;
 
     if (DRIGeneration != serverGeneration) {
 	if ((DRIScreenPrivIndex = AllocateScreenPrivateIndex()) < 0)
@@ -109,28 +106,38 @@
 	DRIGeneration = serverGeneration;
     }
 
-    if (!drmAvailable()) {
-	return FALSE;
+    drmWasAvailable = drmAvailable();
+
+    /* Note that drmOpen will try to load the kernel module, if needed. */
+    fd = drmOpen(pDRIInfo->drmDriverName, NULL);
+    if (fd < 0) {
+        /* failed to open DRM */
+        pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
+        return FALSE;
     }
 
-    if (!(pDRIPriv = (DRIScreenPrivPtr)xalloc(sizeof(DRIScreenPrivRec)))) {
-	return FALSE;
+    if (!drmWasAvailable) {
+       /* drmOpen loaded the kernel module, print a message to say so */
+       DRIDrvMsg(pScreen->myNum, X_INFO,
+                 "[drm] loaded kernel module \"%s\"\n",
+                 pDRIInfo->drmDriverName);
     }
-    pScreen->devPrivates[DRIScreenPrivIndex].ptr = (pointer)pDRIPriv;
 
+    pDRIPriv = (DRIScreenPrivPtr) xalloc(sizeof(DRIScreenPrivRec));
+    if (!pDRIPriv) {
+        pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
+        return FALSE;
+    }
+
+    pScreen->devPrivates[DRIScreenPrivIndex].ptr = (pointer) pDRIPriv;
+    pDRIPriv->drmFD = fd;
     pDRIPriv->directRenderingSupport = TRUE;
     pDRIPriv->pDriverInfo = pDRIInfo;
+    pDRIPriv->nrWindows = 0;
 
-    /* setup device independent direct rendering memory maps */
-
-    if ((pDRIPriv->drmFD = drmOpen(pDRIPriv->pDriverInfo->drmDriverName,
-				   NULL)) < 0) {
-	pDRIPriv->directRenderingSupport = FALSE;
-	return FALSE;
-    }
-
     if (drmSetBusid(pDRIPriv->drmFD, pDRIPriv->pDriverInfo->busIdString) < 0) {
 	pDRIPriv->directRenderingSupport = FALSE;
+	pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
 	drmClose(pDRIPriv->drmFD);
 	return FALSE;
     }
@@ -149,6 +156,7 @@
 		   &pDRIPriv->hSAREA) < 0)
     {
 	pDRIPriv->directRenderingSupport = FALSE;
+	pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
 	drmClose(pDRIPriv->drmFD);
 	return FALSE;
     }
@@ -162,6 +170,7 @@
 		(drmAddressPtr)(&pDRIPriv->pSAREA)) < 0)
     {
 	pDRIPriv->directRenderingSupport = FALSE;
+	pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
 	drmClose(pDRIPriv->drmFD);
 	return FALSE;
     }
@@ -176,6 +185,7 @@
 		   &pDRIPriv->hFrameBuffer) < 0)
     {
 	pDRIPriv->directRenderingSupport = FALSE;
+	pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
 	drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize);
 	drmClose(pDRIPriv->drmFD);
 	return FALSE;
@@ -334,8 +344,9 @@
 	pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;
 	pScreen->CopyWindow = pDRIInfo->wrap.CopyWindow;
     }
-    miClipNotify(DRIClipNotify);
-
+    if (pDRIInfo->wrap.ClipNotify)
+       miClipNotify(pDRIInfo->wrap.ClipNotify);
+   
     DRIDrvMsg(pScreen->myNum, X_INFO, "[DRI] installation complete\n");
 
     return TRUE;
@@ -432,8 +443,7 @@
 }
 
 void
-DRIReset(
-)
+DRIReset(void)
 {
     /*
      * This stub routine is called when the X Server recycles, resources
@@ -445,10 +455,7 @@
 }
 
 Bool
-DRIQueryDirectRenderingCapable(
-    ScreenPtr pScreen,
-    Bool* isCapable
-)
+DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
@@ -461,11 +468,7 @@
 }
 
 Bool
-DRIOpenConnection(
-    ScreenPtr pScreen,
-    drmHandlePtr hSAREA,
-    char **busIdString
-)
+DRIOpenConnection(ScreenPtr pScreen, drmHandlePtr hSAREA, char **busIdString)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
@@ -476,10 +479,7 @@
 }
 
 Bool
-DRIAuthConnection(
-    ScreenPtr pScreen,
-    drmMagic magic
-)
+DRIAuthConnection(ScreenPtr pScreen, drmMagic magic)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
@@ -488,23 +488,17 @@
 }
 
 Bool
-DRICloseConnection(
-    ScreenPtr pScreen
-)
+DRICloseConnection(ScreenPtr pScreen)
 {
-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
     return TRUE;
 }
 
 Bool
-DRIGetClientDriverName(
-    ScreenPtr pScreen,
-    int* ddxDriverMajorVersion,
-    int* ddxDriverMinorVersion,
-    int* ddxDriverPatchVersion,
-    char** clientDriverName
-)
+DRIGetClientDriverName(ScreenPtr pScreen,
+                       int *ddxDriverMajorVersion,
+                       int *ddxDriverMinorVersion,
+                       int *ddxDriverPatchVersion,
+                       char **clientDriverName)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
@@ -616,11 +610,8 @@
 }
 
 Bool
-DRICreateContext(
-    ScreenPtr pScreen,
-    VisualPtr visual,
-    XID context,
-    drmContextPtr pHWContext
+DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
+                 XID context, drmContextPtr pHWContext
 )
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -652,7 +643,7 @@
 				                      visual, 
 				                      *pHWContext, 
 				                      *pVisualConfigPriv,
-						      contextStore))) {
+						      (int)contextStore))) {
 	    DRIDestroyContextPriv(pDRIContextPriv);
 	    return FALSE;
 	}
@@ -665,10 +656,7 @@
 }
 
 Bool
-DRIDestroyContext(
-    ScreenPtr pScreen,
-    XID context
-)
+DRIDestroyContext(ScreenPtr pScreen, XID context)
 {
     FreeResourceByType(context, DRIContextPrivResType, FALSE);
 
@@ -677,9 +665,7 @@
 
 /* DRIContextPrivDelete is called by the resource manager. */
 Bool
-DRIContextPrivDelete(
-    pointer pResource,
-    XID id)
+DRIContextPrivDelete(pointer pResource, XID id)
 {
     DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr)pResource;
     DRIScreenPrivPtr pDRIPriv;
@@ -689,19 +675,75 @@
     if (pDRIPriv->pDriverInfo->DestroyContext) {
       contextStore=DRIGetContextStore(pDRIContextPriv);
       (pDRIPriv->pDriverInfo->DestroyContext)(pDRIContextPriv->pScreen,
-					     pDRIContextPriv->hwContext,
-					     contextStore);
+					      pDRIContextPriv->hwContext,
+					      (int)contextStore);
     }
     return DRIDestroyContextPriv(pDRIContextPriv);
 }
 
+
+/* This walks the drawable timestamp array and invalidates all of them
+ * in the case of transition from private to shared backbuffers.  It's
+ * not necessary for correctness, because DRIClipNotify gets called in
+ * time to prevent any conflict, but the transition from
+ * shared->private is sometimes missed if we don't do this.  
+ */
+static void 
+DRIClipNotifyAllDrawables(ScreenPtr pScreen)
+{
+   int i;
+   DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+   for( i=0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {
+      pDRIPriv->pSAREA->drawableTable[i].stamp = DRIDrawableValidationStamp++;
+   }   
+}
+
+
+static void 
+DRITransitionToSharedBuffers(ScreenPtr pScreen)
+{
+/*     ErrorF("DRITransitionToSharedBuffers\n"); */
+   DRIClipNotifyAllDrawables( pScreen );
+}
+
+
+static void 
+DRITransitionToPrivateBuffers(ScreenPtr pScreen)
+{
+/*     ErrorF("DRITransitionToPrivateBuffers\n"); */
+   DRIClipNotifyAllDrawables( pScreen );
+}
+
+
+static void
+DRITransitionTo3d(ScreenPtr pScreen)
+{
+   DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+   DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
+
+/*     ErrorF("DRITransitionTo3d\n"); */
+
+   if (pDRIInfo->TransitionTo3d)
+      pDRIInfo->TransitionTo3d( pScreen );
+}
+
+static void
+DRITransitionTo2d(ScreenPtr pScreen)
+{
+   DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+   DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
+
+/*     ErrorF("DRITransitionTo2d\n"); */
+
+   if (pDRIInfo->TransitionTo2d)
+      pDRIInfo->TransitionTo2d( pScreen );
+}
+
+
 Bool
-DRICreateDrawable(
-    ScreenPtr pScreen,
-    Drawable id,
-    DrawablePtr pDrawable,
-    drmDrawablePtr hHWDrawable
-)
+DRICreateDrawable(ScreenPtr pScreen, Drawable id,
+                  DrawablePtr pDrawable, drmDrawablePtr hHWDrawable)
 {
     DRIScreenPrivPtr	pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIDrawablePrivPtr	pDRIDrawablePriv;
@@ -734,6 +776,17 @@
 	    pWin->devPrivates[DRIWindowPrivIndex].ptr = 
 						(pointer)pDRIDrawablePriv;
 
+	    switch (++pDRIPriv->nrWindows) {
+	    case 1:
+	       DRITransitionTo3d( pScreen );
+	       break;
+	    case 2:
+	       DRITransitionToSharedBuffers( pScreen );
+	       break;
+	    default:
+	       break;
+	    }
+
 	    /* track this in case this window is destroyed */
 	    AddResource(id, DRIDrawablePrivResType, (pointer)pWin);
 	}
@@ -747,22 +800,19 @@
 }
 
 Bool
-DRIDestroyDrawable(
-    ScreenPtr pScreen,
-    Drawable id,
-    DrawablePtr pDrawable
-)
+DRIDestroyDrawable(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable)
 {
     DRIDrawablePrivPtr	pDRIDrawablePriv;
     WindowPtr		pWin;
 
+
     if (pDrawable->type == DRAWABLE_WINDOW) {
 	pWin = (WindowPtr)pDrawable;
 	pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
 	pDRIDrawablePriv->refCount--;
 	if (pDRIDrawablePriv->refCount <= 0) {
 	    /* This calls back DRIDrawablePrivDelete which frees private area */
-	    FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
+	    FreeResourceByType(id, DRIDrawablePrivResType, FALSE);	    
 	}
     }
     else { /* pixmap (or for GLX 1.3, a PBuffer) */
@@ -774,9 +824,7 @@
 }
 
 Bool
-DRIDrawablePrivDelete(
-    pointer pResource,
-    XID id)
+DRIDrawablePrivDelete(pointer pResource, XID id)
 {
     DrawablePtr		pDrawable = (DrawablePtr)pResource;
     DRIScreenPrivPtr	pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);
@@ -798,6 +846,17 @@
 	}
 	xfree(pDRIDrawablePriv);
 	pWin->devPrivates[DRIWindowPrivIndex].ptr = NULL;
+
+	switch (--pDRIPriv->nrWindows) {
+	case 0:
+	   DRITransitionTo2d( pDrawable->pScreen );
+	   break;
+	case 1:
+	   DRITransitionToPrivateBuffers( pDrawable->pScreen );
+	   break;
+	default:
+	   break;
+	}
     }
     else { /* pixmap (or for GLX 1.3, a PBuffer) */
 	/* NOT_DONE */
@@ -808,25 +867,28 @@
 }
 
 Bool
-DRIGetDrawableInfo(
-    ScreenPtr pScreen,
-    DrawablePtr pDrawable,
-    unsigned int* index,
-    unsigned int* stamp,
-    int* X,
-    int* Y,
-    int* W,
-    int* H,
-    int* numClipRects,
-    XF86DRIClipRectPtr* pClipRects
-)
+DRIGetDrawableInfo(ScreenPtr pScreen,
+                   DrawablePtr pDrawable,
+                   unsigned int* index,
+                   unsigned int* stamp,
+                   int* X,
+                   int* Y,
+                   int* W,
+                   int* H,
+                   int* numClipRects,
+                   XF86DRIClipRectPtr* pClipRects,
+                   int* backX,
+                   int* backY,
+                   int* numBackClipRects,
+                   XF86DRIClipRectPtr* pBackClipRects)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIDrawablePrivPtr	pDRIDrawablePriv, pOldDrawPriv;
     WindowPtr		pWin, pOldWin;
-    int			i, oldestIndex = 0;
-    unsigned int	oldestStamp;
+    int			i;
 
+    printf("maxDrawableTableEntry = %d\n", pDRIPriv->pDriverInfo->maxDrawableTableEntry);
+
     if (pDrawable->type == DRAWABLE_WINDOW) {
 	pWin = (WindowPtr)pDrawable;
 	if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
@@ -849,7 +911,8 @@
 
 		/* Search table for oldest entry */
 		if (i == pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
-		    oldestStamp = ~0;
+                    unsigned int oldestStamp = ~0;
+                    int oldestIndex = 0;
 		    i = pDRIPriv->pDriverInfo->maxDrawableTableEntry;
 		    while (i--) {
 			if (pDRIPriv->pSAREA->drawableTable[i].stamp < 
@@ -867,10 +930,10 @@
 		    pOldDrawPriv->drawableIndex = -1;
 
 		    /* claim drawable table entry */
-		    pDRIPriv->DRIDrawables[i] = pDrawable;
+		    pDRIPriv->DRIDrawables[oldestIndex] = pDrawable;
 
 		    /* validate SAREA entry */
-		    pDRIPriv->pSAREA->drawableTable[i].stamp = 
+		    pDRIPriv->pSAREA->drawableTable[oldestIndex].stamp = 
 					DRIDrawableValidationStamp++;
 
 		    /* check for stamp wrap around */
@@ -886,6 +949,13 @@
 		    }
 		}
 
+		/* If the driver wants to be notified when the index is
+		 * set for a drawable, let it know now.
+		 */
+		if (pDRIPriv->pDriverInfo->SetDrawableIndex)
+			pDRIPriv->pDriverInfo->SetDrawableIndex(pWin,
+				pDRIDrawablePriv->drawableIndex);
+
 		/* reinit drawable ID if window is visible */
 		if ((pWin->viewable) && 
 		    (pDRIPriv->pDriverInfo->bufferRequests != DRI_NO_WINDOWS))
@@ -907,6 +977,35 @@
 	    *H = (int)(pWin->drawable.height);
 	    *numClipRects = REGION_NUM_RECTS(&pWin->clipList);
 	    *pClipRects = (XF86DRIClipRectPtr)REGION_RECTS(&pWin->clipList);
+	    
+	    *backX = *X;
+	    *backY = *Y;
+
+	    if (pDRIPriv->nrWindows == 1 && *numClipRects) {
+	       /* Use a single cliprect. */
+
+	       int x0 = *X;
+	       int y0 = *Y;
+	       int x1 = x0 + *W;
+	       int y1 = y0 + *H;
+
+	       if (x0 < 0) x0 = 0;
+	       if (y0 < 0) y0 = 0;
+	       if (x1 > pScreen->width-1) x1 = pScreen->width-1;
+	       if (y1 > pScreen->height-1) y1 = pScreen->height-1;
+
+	       pDRIPriv->private_buffer_rect.x1 = x0;
+	       pDRIPriv->private_buffer_rect.y1 = y0;
+	       pDRIPriv->private_buffer_rect.x2 = x1;
+	       pDRIPriv->private_buffer_rect.y2 = y1;
+
+	       *numBackClipRects = 1;
+	       *pBackClipRects = &(pDRIPriv->private_buffer_rect);
+	    } else {
+	       /* Use the frontbuffer cliprects for back buffers.  */
+	       *numBackClipRects = 0;
+	       *pBackClipRects = 0;
+	    }
 	}
 	else {
 	    /* Not a DRIDrawable */
@@ -922,15 +1021,13 @@
 }
 
 Bool
-DRIGetDeviceInfo(
-    ScreenPtr pScreen,
-    drmHandlePtr hFrameBuffer,
-    int* fbOrigin,
-    int* fbSize,
-    int* fbStride,
-    int* devPrivateSize,
-    void** pDevPrivate
-)
+DRIGetDeviceInfo(ScreenPtr pScreen,
+                 drmHandlePtr hFrameBuffer,
+                 int* fbOrigin,
+                 int* fbSize,
+                 int* fbStride,
+                 int* devPrivateSize,
+                 void** pDevPrivate)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
@@ -961,6 +1058,11 @@
     inforec->wrap.CopyWindow            = DRICopyWindow;
     inforec->wrap.ValidateTree          = DRIValidateTree;
     inforec->wrap.PostValidateTree      = DRIPostValidateTree;
+    inforec->wrap.ClipNotify            = DRIClipNotify;
+
+    inforec->TransitionTo2d = 0;
+    inforec->TransitionTo3d = 0;
+    inforec->SetDrawableIndex = 0;
 
     return inforec;
 }
@@ -972,11 +1074,9 @@
     xfree((char*)DRIInfo);
 }
 
+
 void
-DRIWakeupHandler(
-    pointer wakeupData,
-    int result,
-    pointer pReadmask)
+DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
 {
     int i;
 
@@ -992,10 +1092,7 @@
 }
 
 void
-DRIBlockHandler(
-    pointer blockData,
-    OSTimePtr pTimeout,
-    pointer pReadmask)
+DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
 {
     int i;
 
@@ -1011,11 +1108,8 @@
 }
 
 void
-DRIDoWakeupHandler(
-    int screenNum,
-    pointer wakeupData,
-    unsigned long result,
-    pointer pReadmask)
+DRIDoWakeupHandler(int screenNum, pointer wakeupData,
+                   unsigned long result, pointer pReadmask)
 {
     ScreenPtr pScreen = screenInfo.screens[screenNum];
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1033,11 +1127,8 @@
 }
 
 void 
-DRIDoBlockHandler(
-    int screenNum,
-    pointer blockData,
-    pointer pTimeout,
-    pointer pReadmask)
+DRIDoBlockHandler(int screenNum, pointer blockData,
+                  pointer pTimeout, pointer pReadmask)
 {
     ScreenPtr pScreen = screenInfo.screens[screenNum];
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1055,11 +1146,7 @@
 }
 
 void 
-DRISwapContext(
-    int drmFD,
-    void *oldctx,
-    void *newctx
-)
+DRISwapContext(int drmFD, void *oldctx, void *newctx)
 {
     DRIContextPrivPtr oldContext      = (DRIContextPrivPtr)oldctx;
     DRIContextPrivPtr newContext      = (DRIContextPrivPtr)newctx;
@@ -1214,10 +1301,7 @@
 }
 
 void 
-DRIPaintWindow(
-    WindowPtr pWin,
-    RegionPtr prgn,
-    int what)
+DRIPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1279,10 +1363,7 @@
 }
 
 void 
-DRICopyWindow(
-    WindowPtr pWin,
-    DDXPointRec ptOldOrg,
-    RegionPtr prgnSrc)
+DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1320,10 +1401,10 @@
 }
 
 static void
-DRIGetSecs(unsigned long *secs, unsigned long *usecs)
+DRIGetSecs(long *secs, long *usecs)
 {
-#if XFree86LOADER
-    xf86getsecs(secs,usecs);
+#ifdef XFree86LOADER
+    getsecs(secs,usecs);
 #else
     struct timeval tv;
 
@@ -1348,12 +1429,12 @@
 static void
 DRISpinLockTimeout(drmLock *lock, int val, unsigned long timeout /* in mS */)
 {
-    int           count = 10000;
-    char          ret;
-    unsigned long s_secs, s_usecs;
-    unsigned long f_secs, f_usecs;
-    unsigned long msecs;
-    unsigned long prev  = 0;
+    int  count = 10000;
+    char ret;
+    long s_secs, s_usecs;
+    long f_secs, f_usecs;
+    long msecs;
+    long prev  = 0;
 
     DRIGetSecs(&s_secs, &s_usecs);
 
@@ -1376,10 +1457,7 @@
 }
 
 int
-DRIValidateTree(
-    WindowPtr pParent,
-    WindowPtr pChild,
-    VTKind    kind)
+DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
 {
     ScreenPtr pScreen = pParent->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1434,10 +1512,7 @@
 }
 
 void
-DRIPostValidateTree(
-    WindowPtr pParent,
-    WindowPtr pChild,
-    VTKind    kind)
+DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
 {
     ScreenPtr pScreen;
     DRIScreenPrivPtr pDRIPriv;
@@ -1468,10 +1543,7 @@
 }
 
 void
-DRIClipNotify(
-    WindowPtr pWin,
-    int dx,
-    int dy)
+DRIClipNotify(WindowPtr pWin, int dx, int dy)
 {
     DRIScreenPrivPtr pDRIPriv;
     DRIDrawablePrivPtr	pDRIDrawablePriv;
@@ -1484,8 +1556,7 @@
 }
 
 CARD32 
-DRIGetDrawableIndex(
-    WindowPtr pWin)
+DRIGetDrawableIndex(WindowPtr pWin)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1502,10 +1573,26 @@
     return index;
 }
 
+unsigned int 
+DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    return pDRIPriv->pSAREA->drawableTable[drawable_index].stamp;
+}
+
+
 void
-DRILock(ScreenPtr pScreen, int flags) {
+DRIPrintDrawableLock(ScreenPtr pScreen, char *msg)
+{
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    
+    ErrorF("%s: %d\n", msg,  pDRIPriv->pSAREA->drawable_lock.lock);
+}
 
+void
+DRILock(ScreenPtr pScreen, int flags) {
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+   
     if (!lockRefCount)
       DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext, flags);
     lockRefCount++;
@@ -1528,17 +1615,38 @@
       DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext);
 }
 
-void *DRIGetSAREAPrivate(ScreenPtr pScreen)
+void *
+DRIGetSAREAPrivate(ScreenPtr pScreen)
 {
   DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
   if (!pDRIPriv) return 0;
-  return ((void*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec);
+  return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec));
 }
 
-drmContext DRIGetContext(ScreenPtr pScreen)
+drmContext
+DRIGetContext(ScreenPtr pScreen)
 {
   DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
   if (!pDRIPriv) return 0;
   return pDRIPriv->myContext;
 }
   
+/* This lets get at the unwrapped functions so that they can correctly
+ * call the lowerlevel functions, and choose whether they will be
+ * called at every level of recursion (eg in validatetree).  
+ */
+DRIWrappedFuncsRec *
+DRIGetWrappedFuncs(ScreenPtr pScreen)
+{
+   return &(DRI_SCREEN_PRIV(pScreen)->wrap);
+}
+
+void
+DRIQueryVersion(int *majorVersion,
+                int *minorVersion,
+                int *patchVersion)
+{
+   *majorVersion = XF86DRI_MAJOR_VERSION;
+   *minorVersion = XF86DRI_MINOR_VERSION;
+   *patchVersion = XF86DRI_PATCH_VERSION;
+}
Index: xc/programs/Xserver/GL/dri/dri.h
diff -u xc/programs/Xserver/GL/dri/dri.h:1.9 xc/programs/Xserver/GL/dri/dri.h:1.12
--- xc/programs/Xserver/GL/dri/dri.h:1.9	Fri Mar  3 17:53:02 2000
+++ xc/programs/Xserver/GL/dri/dri.h	Fri Jun 23 12:29:41 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.9 2000/03/04 01:53:02 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.12 2000/06/23 19:29:41 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -69,6 +69,10 @@
 #define DRI_3D_WINDOWS_ONLY  1
 #define DRI_ALL_WINDOWS      2
 
+
+typedef void (*ClipNotifyPtr)( WindowPtr, int, int );
+
+
 /*
  * These functions can be wrapped by the DRI.  Each of these have
  * generic default funcs (initialized in DRICreateInfoRec) and can be
@@ -82,8 +86,12 @@
     CopyWindowProcPtr            CopyWindow;
     ValidateTreeProcPtr          ValidateTree;
     PostValidateTreeProcPtr      PostValidateTree;
+    ClipNotifyPtr                ClipNotify;
 } DRIWrappedFuncsRec, *DRIWrappedFuncsPtr;
 
+
+
+
 typedef struct {
     /* driver call back functions */
     Bool	(*CreateContext)(ScreenPtr pScreen,
@@ -107,6 +115,9 @@
 			       DDXPointRec ptOldOrg,
 			       RegionPtr prgnSrc,
 			       CARD32 index);
+    void        (*TransitionTo3d)(ScreenPtr pScreen);
+    void        (*TransitionTo2d)(ScreenPtr pScreen);
+    void	(*SetDrawableIndex)(WindowPtr pWin, CARD32 index);
 
     /* wrapped functions */
     DRIWrappedFuncsRec  wrap;
@@ -130,132 +141,159 @@
     int			devPrivateSize;
     void*		devPrivate;
 } DRIInfoRec, *DRIInfoPtr;
+
+
+extern Bool DRIScreenInit(ScreenPtr pScreen,
+                          DRIInfoPtr pDRIInfo,
+                          int *pDRMFD);
+
+extern void DRICloseScreen(ScreenPtr pScreen);
+
+extern Bool DRIExtensionInit(void);
+
+extern void DRIReset(void);
+
+extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen,
+                                           Bool *isCapable);
+
+extern Bool DRIOpenConnection(ScreenPtr pScreen,
+                              drmHandlePtr hSAREA,
+                              char **busIdString);
+
+extern Bool DRIAuthConnection(ScreenPtr pScreen, drmMagic magic);
+
+extern Bool DRICloseConnection(ScreenPtr pScreen);
+
+extern Bool DRIGetClientDriverName(ScreenPtr pScreen,
+                                   int* ddxDriverMajorVersion,
+                                   int* ddxDriverMinorVersion,
+                                   int* ddxDriverPatchVersion,
+                                   char** clientDriverName);
+
+extern Bool DRICreateContext(ScreenPtr pScreen,
+                             VisualPtr visual,
+                             XID context,
+                             drmContextPtr pHWContext);
+
+extern Bool DRIDestroyContext(ScreenPtr pScreen, XID context);
+
+extern Bool DRIContextPrivDelete(pointer pResource, XID id);
+
+extern Bool DRICreateDrawable(ScreenPtr pScreen,
+                              Drawable id,
+                              DrawablePtr pDrawable,
+                              drmDrawablePtr hHWDrawable);
+
+extern Bool DRIDestroyDrawable(ScreenPtr pScreen, 
+                               Drawable id,
+                               DrawablePtr pDrawable);
+
+extern Bool DRIDrawablePrivDelete(pointer pResource,
+                                  XID id);
+
+extern Bool DRIGetDrawableInfo(ScreenPtr pScreen,
+                               DrawablePtr pDrawable,
+                               unsigned int* index,
+                               unsigned int* stamp,
+                               int* X,
+                               int* Y,
+                               int* W,
+                               int* H,
+                               int* numClipRects,
+                               XF86DRIClipRectPtr* pClipRects,
+                               int* backX,
+                               int* backY,
+                               int* numBackClipRects,
+                               XF86DRIClipRectPtr* pBackClipRects);
+
+extern Bool DRIGetDeviceInfo(ScreenPtr pScreen,
+                             drmHandlePtr hFrameBuffer,
+                             int* fbOrigin,
+                             int* fbSize,
+                             int* fbStride,
+                             int* devPrivateSize,
+                             void** pDevPrivate);
+
+extern DRIInfoPtr DRICreateInfoRec(void);
+
+extern void DRIDestroyInfoRec(DRIInfoPtr DRIInfo);
+
+extern Bool DRIFinishScreenInit(ScreenPtr pScreen);
+
+extern void DRIWakeupHandler(pointer wakeupData,
+                             int result,
+                             pointer pReadmask);
+
+extern void DRIBlockHandler(pointer blockData,
+                            OSTimePtr pTimeout,
+                            pointer pReadmask);
+
+extern void DRIDoWakeupHandler(int screenNum,
+                               pointer wakeupData,
+                               unsigned long result,
+                               pointer pReadmask);
+
+extern void DRIDoBlockHandler(int screenNum,
+                              pointer blockData,
+                              pointer pTimeout,
+                              pointer pReadmask);
+
+extern void DRISwapContext(int drmFD,
+                           void *oldctx,
+                           void *newctx);
+
+extern void *DRIGetContextStore(DRIContextPrivPtr context);
+
+extern void DRIPaintWindow(WindowPtr pWin,
+                           RegionPtr prgn,
+                           int what);
+
+extern void DRICopyWindow(WindowPtr pWin,
+                          DDXPointRec ptOldOrg,
+                          RegionPtr prgnSrc);
+
+extern int DRIValidateTree(WindowPtr pParent,
+                           WindowPtr pChild,
+                           VTKind    kind);
+
+extern void DRIPostValidateTree(WindowPtr pParent,
+                                WindowPtr pChild,
+                                VTKind    kind);
+
+extern void DRIClipNotify(WindowPtr pWin,
+                          int dx,
+                          int dy);
+
+extern CARD32 DRIGetDrawableIndex(WindowPtr pWin);
+
+extern void DRIPrintDrawableLock(ScreenPtr pScreen, char *msg);
+
+extern void DRILock(ScreenPtr pScreen, int flags);
+
+extern void DRIUnlock(ScreenPtr pScreen);
+
+extern DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen);
+
+extern void *DRIGetSAREAPrivate(ScreenPtr pScreen);
+
+extern unsigned int DRIGetDrawableStamp(ScreenPtr pScreen,
+                                        CARD32 drawable_index);
+
+extern DRIContextPrivPtr DRICreateContextPriv(ScreenPtr pScreen,
+                                              drmContextPtr pHWContext,
+                                              DRIContextFlags flags);
+
+extern DRIContextPrivPtr DRICreateContextPrivFromHandle(ScreenPtr pScreen,
+                                                        drmContext hHWContext,
+                                                        DRIContextFlags flags);
+
+extern Bool DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv);
+
+extern drmContext DRIGetContext(ScreenPtr pScreen);
 
-extern Bool DRIScreenInit(
-    ScreenPtr pScreen,
-    DRIInfoPtr pDRIInfo,
-    int* pDRMFD);
-void DRICloseScreen(ScreenPtr pScreen);
-Bool DRIExtensionInit(void);
-void DRIReset(void);
-Bool DRIQueryDirectRenderingCapable( ScreenPtr pScreen, Bool* isCapable);
-Bool DRIOpenConnection(
-    ScreenPtr pScreen,
-    drmHandlePtr hSAREA,
-    char **busIdString
-);
-Bool DRIAuthConnection(ScreenPtr pScreen, drmMagic magic);
-Bool DRICloseConnection( ScreenPtr pScreen);
-Bool DRIGetClientDriverName(
-    ScreenPtr pScreen,
-    int* ddxDriverMajorVersion,
-    int* ddxDriverMinorVersion,
-    int* ddxDriverPatchVersion,
-    char** clientDriverName
-);
-Bool DRICreateContext(
-    ScreenPtr pScreen,
-    VisualPtr visual,
-    XID context,
-    drmContextPtr pHWContext
-);
-Bool DRIDestroyContext( ScreenPtr pScreen, XID context);
-Bool DRIContextPrivDelete(
-    pointer pResource,
-    XID id);
-Bool DRICreateDrawable(
-    ScreenPtr pScreen,
-    Drawable id,
-    DrawablePtr pDrawable,
-    drmDrawablePtr hHWDrawable
-);
-Bool DRIDestroyDrawable( ScreenPtr pScreen, 
-    Drawable id,
-    DrawablePtr pDrawable);
-Bool DRIDrawablePrivDelete(
-    pointer pResource,
-    XID id);
-Bool DRIGetDrawableInfo(
-    ScreenPtr pScreen,
-    DrawablePtr pDrawable,
-    unsigned int* index,
-    unsigned int* stamp,
-    int* X,
-    int* Y,
-    int* W,
-    int* H,
-    int* numClipRects,
-    XF86DRIClipRectPtr* pClipRects
-);
-Bool DRIGetDeviceInfo(
-    ScreenPtr pScreen,
-    drmHandlePtr hFrameBuffer,
-    int* fbOrigin,
-    int* fbSize,
-    int* fbStride,
-    int* devPrivateSize,
-    void** pDevPrivate
-);
-DRIInfoPtr DRICreateInfoRec(void);
-void DRIDestroyInfoRec(DRIInfoPtr DRIInfo);
-Bool DRIFinishScreenInit(ScreenPtr pScreen);
-void DRIWakeupHandler(
-    pointer wakeupData,
-    int result,
-    pointer pReadmask);
-void DRIBlockHandler(
-    pointer blockData,
-    OSTimePtr pTimeout,
-    pointer pReadmask);
-void DRIDoWakeupHandler(
-    int screenNum,
-    pointer wakeupData,
-    unsigned long result,
-    pointer pReadmask);
-void DRIDoBlockHandler(
-    int screenNum,
-    pointer blockData,
-    pointer pTimeout,
-    pointer pReadmask);
-void DRISwapContext(
-    int drmFD,
-    void *oldctx,
-    void *newctx);
-void* DRIGetContextStore(DRIContextPrivPtr context);
-void DRIPaintWindow(
-    WindowPtr pWin,
-    RegionPtr prgn,
-    int what);
-void DRICopyWindow(
-    WindowPtr pWin,
-    DDXPointRec ptOldOrg,
-    RegionPtr prgnSrc);
-int DRIValidateTree(
-    WindowPtr pParent,
-    WindowPtr pChild,
-    VTKind    kind);
-void DRIPostValidateTree(
-    WindowPtr pParent,
-    WindowPtr pChild,
-    VTKind    kind);
-void DRIClipNotify(
-    WindowPtr pWin,
-    int dx,
-    int dy);
-CARD32 DRIGetDrawableIndex(
-    WindowPtr pWin);
-void DRILock(ScreenPtr pScreen, int flags);
-void DRIUnlock(ScreenPtr pScreen);
-void *DRIGetSAREAPrivate(ScreenPtr pScreen);
-DRIContextPrivPtr
-DRICreateContextPriv(ScreenPtr pScreen,
-		     drmContextPtr pHWContext,
-		     DRIContextFlags flags);
-DRIContextPrivPtr
-DRICreateContextPrivFromHandle(ScreenPtr pScreen,
-			       drmContext hHWContext,
-			       DRIContextFlags flags);
-Bool DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv);
+extern void DRIQueryVersion(int *majorVersion,
+                            int *minorVersion,
+                            int *patchVersion);
 
 #define _DRI_H_
 
Index: xc/programs/Xserver/GL/dri/dristruct.h
diff -u xc/programs/Xserver/GL/dri/dristruct.h:1.7 xc/programs/Xserver/GL/dri/dristruct.h:1.8
--- xc/programs/Xserver/GL/dri/dristruct.h:1.7	Thu Mar  2 08:07:38 2000
+++ xc/programs/Xserver/GL/dri/dristruct.h	Fri Jun 16 17:03:12 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.7 2000/03/02 16:07:38 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.8 2000/06/17 00:03:12 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -87,6 +87,8 @@
     void**		hiddenContextStore;    /* hidden X context          */
     void**		partial3DContextStore; /* parital 3D context        */
     DRIInfoPtr		pDriverInfo;
+    int                 nrWindows;
+    XF86DRIClipRectRec  private_buffer_rect; /* management of private buffers */
     DRIWrappedFuncsRec	wrap;
     DrawablePtr		DRIDrawables[SAREA_MAX_DRAWABLES];
 } DRIScreenPrivRec, *DRIScreenPrivPtr;
Index: xc/programs/Xserver/GL/dri/xf86dri.c
diff -u xc/programs/Xserver/GL/dri/xf86dri.c:1.6 xc/programs/Xserver/GL/dri/xf86dri.c:1.8
--- xc/programs/Xserver/GL/dri/xf86dri.c:1.6	Tue Feb 22 20:46:52 2000
+++ xc/programs/Xserver/GL/dri/xf86dri.c	Sun Jun 25 09:03:43 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.6 2000/02/23 04:46:52 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.8 2000/06/25 16:03:43 tsi Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -33,7 +33,7 @@
  *
  */
 
-#if XFree86LOADER
+#ifdef XFree86LOADER
 #include "xf86.h"
 #include "xf86_ansic.h"
 #endif
@@ -161,6 +161,9 @@
     }
     rep.isCapable = isCapable;
 
+    if (!LocalClient(client))
+	rep.isCapable = 0;
+
     WriteToClient(client, 
 	sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep);
     return (client->noClientException);
@@ -210,12 +213,21 @@
     register ClientPtr client
 )
 {
+    xXF86DRIAuthConnectionReply rep;
+    
     REQUEST(xXF86DRIAuthConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRIAuthConnectionReq);
 
-    if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic))
-	ErrorF("Failed to authenticate %u\n", stuff->magic);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.authenticated = 1;
 
+    if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic)) {
+        ErrorF("Failed to authenticate %u\n", stuff->magic);
+	rep.authenticated = 0;
+    }
+    WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep);
     return (client->noClientException);
 }
 
@@ -388,6 +400,8 @@
     DrawablePtr pDrawable;
     int X, Y, W, H;
     XF86DRIClipRectPtr pClipRects;
+    XF86DRIClipRectPtr pBackClipRects;
+    int backX, backY;
 
     REQUEST(xXF86DRIGetDrawableInfoReq);
     REQUEST_SIZE_MATCH(xXF86DRIGetDrawableInfoReq);
@@ -411,7 +425,11 @@
 			     (int*)&W,
 			     (int*)&H,
 			     (int*)&rep.numClipRects,
-			     &pClipRects)) {
+			     &pClipRects,
+			     &backX, 
+			     &backY,
+			     (int*)&rep.numBackClipRects,
+			     &pBackClipRects)) {
 	return BadValue;
     }
 
@@ -419,18 +437,32 @@
     rep.drawableY = Y;
     rep.drawableWidth = W;
     rep.drawableHeight = H;
+    rep.length = (SIZEOF(xXF86DRIGetDrawableInfoReply) - 
+		  SIZEOF(xGenericReply));
 
-    rep.length = 0;
+    rep.backX = backX;
+    rep.backY = backY;
+        
+    if (rep.numBackClipRects) 
+       rep.length += sizeof(XF86DRIClipRectRec) * rep.numBackClipRects;    
+
+    if (rep.numClipRects) 
+       rep.length += sizeof(XF86DRIClipRectRec) * rep.numClipRects;
+    
+    WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), (char *)&rep);
+
     if (rep.numClipRects) {
-	rep.length = (SIZEOF(xXF86DRIGetDrawableInfoReply) - 
-		      SIZEOF(xGenericReply) +
-		      sizeof(XF86DRIClipRectRec) * rep.numClipRects);
+	WriteToClient(client,  
+		      sizeof(XF86DRIClipRectRec) * rep.numClipRects,
+		      (char *)pClipRects);
     }
 
-    WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), (char *)&rep);
-    if (rep.length) {
-	WriteToClient(client, rep.length, (char *)pClipRects);
+    if (rep.numBackClipRects) {
+       WriteToClient(client, 
+		     sizeof(XF86DRIClipRectRec) * rep.numBackClipRects,
+		     (char *)pBackClipRects);
     }
+
     return (client->noClientException);
 }
 
@@ -487,15 +519,19 @@
 {
     REQUEST(xReq);
 
-    if (!LocalClient(client))
-	return DRIErrorBase + XF86DRIClientNotLocal;
-
     switch (stuff->data)
     {
     case X_XF86DRIQueryVersion:
 	return ProcXF86DRIQueryVersion(client);
     case X_XF86DRIQueryDirectRenderingCapable:
 	return ProcXF86DRIQueryDirectRenderingCapable(client);
+    }
+
+    if (!LocalClient(client))
+	return DRIErrorBase + XF86DRIClientNotLocal;
+
+    switch (stuff->data)
+    {
     case X_XF86DRIOpenConnection:
 	return ProcXF86DRIOpenConnection(client);
     case X_XF86DRICloseConnection:
Index: xc/programs/Xserver/GL/glx/glxcmds.c
diff -u xc/programs/Xserver/GL/glx/glxcmds.c:1.4 xc/programs/Xserver/GL/glx/glxcmds.c:1.5
--- xc/programs/Xserver/GL/glx/glxcmds.c:1.4	Sun Jul 18 01:34:22 1999
+++ xc/programs/Xserver/GL/glx/glxcmds.c	Fri Jun 16 17:03:12 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.4 1999/07/18 08:34:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.5 2000/06/17 00:03:12 martin Exp $ */
 /*
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
@@ -139,8 +139,13 @@
 	    ** NOTE: no support for sharing display lists between direct
 	    ** contexts, even if they are in the same address space.
 	    */
+#if 0
+            /* Disabling this code seems to allow shared display lists
+             * and texture objects to work.  We'll leave it disabled for now.
+             */
 	    client->errorValue = shareList;
 	    return BadMatch;
+#endif
 	} else {
 	    /*
 	    ** Create an indirect context regardless of what the client asked
Index: xc/programs/Xserver/GL/glx/glxscreens.c
diff -u xc/programs/Xserver/GL/glx/glxscreens.c:1.2 xc/programs/Xserver/GL/glx/glxscreens.c:1.4
--- xc/programs/Xserver/GL/glx/glxscreens.c:1.2	Mon Jun 14 00:31:32 1999
+++ xc/programs/Xserver/GL/glx/glxscreens.c	Fri Jun 16 17:03:12 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.2 1999/06/14 07:31:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.4 2000/06/17 00:03:12 martin Exp $ */
 /*
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
@@ -20,8 +20,13 @@
 ** $SGI$
 */
 
+#ifdef IN_MODULE
+#include <xf86_ansic.h>
+#else
 #include <string.h>
 #include <signal.h>
+#endif
+
 #include <windowstr.h>
 
 #include "glxserver.h"
@@ -246,9 +251,14 @@
 	    if ((*__glXScreens[j]->screenProbe)(i)) {
 		__glXActiveScreens[i] = *__glXScreens[j];
 
+#if 0
+                /* we don't use this since matchVisuals doesn't allow alpha */
 		__glXActiveScreens[i].numUsableVisuals =
 		    matchVisuals(__glXActiveScreens[i].pGlxVisual,
 			         __glXActiveScreens[i].numVisuals, i); 
+#else
+		__glXActiveScreens[i].numUsableVisuals = __glXActiveScreens[i].numVisuals;
+#endif
 		__glXActiveScreens[i].GLXvendor = __glXStrdup(GLXServerVendorName);
 		__glXActiveScreens[i].GLXversion = __glXStrdup(GLXServerVersion);
 		__glXActiveScreens[i].GLXextensions = __glXStrdup(GLXServerExtensions);
Index: xc/programs/Xserver/GL/mesa/include/GL/Imakefile
diff -u xc/programs/Xserver/GL/mesa/include/GL/Imakefile:1.4 xc/programs/Xserver/GL/mesa/include/GL/Imakefile:1.5
--- xc/programs/Xserver/GL/mesa/include/GL/Imakefile:1.4	Tue Feb 22 20:46:55 2000
+++ xc/programs/Xserver/GL/mesa/include/GL/Imakefile	Fri Jun 30 11:27:01 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/include/GL/Imakefile,v 1.4 2000/02/23 04:46:55 martin Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/include/GL/Imakefile,v 1.5 2000/06/30 18:27:01 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -6,7 +6,8 @@
       DEFINES = $(GLX_DEFINES)
 
 LinkSourceFile(gl.h, ../../../../../../extras/Mesa/include/GL)
-LinkSourceFile(glx.h, ../../../../../../extras/Mesa/include/GL)
+LinkSourceFile(glx.h, ../../../../../../../xc/include/GL)
+LinkSourceFile(glxtokens.h, ../../../../../../../xc/include/GL)
 LinkSourceFile(xmesa.h, ../../../../../../extras/Mesa/include/GL)
 LinkSourceFile(xmesa_x.h, ../../../../../../extras/Mesa/include/GL)
 LinkSourceFile(xmesa_xf86.h, ../../../../../../extras/Mesa/include/GL)
Index: xc/programs/Xserver/GL/mesa/src/Imakefile
diff -u xc/programs/Xserver/GL/mesa/src/Imakefile:1.13 xc/programs/Xserver/GL/mesa/src/Imakefile:1.14
--- xc/programs/Xserver/GL/mesa/src/Imakefile:1.13	Thu Mar  2 08:07:38 2000
+++ xc/programs/Xserver/GL/mesa/src/Imakefile	Fri Jun 16 17:03:13 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.13 2000/03/02 16:07:38 martin Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.14 2000/06/17 00:03:13 martin Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -7,6 +7,9 @@
 
       SUBDIRS = X
 
+LinkSourceFile(aatriangle.c,../../../../../extras/Mesa/src)
+LinkSourceFile(aatriangle.h,../../../../../extras/Mesa/src)
+LinkSourceFile(aatritemp.h,../../../../../extras/Mesa/src)
 LinkSourceFile(accum.c,../../../../../extras/Mesa/src)
 LinkSourceFile(accum.h,../../../../../extras/Mesa/src)
 LinkSourceFile(all.h,../../../../../extras/Mesa/src)
@@ -115,6 +118,8 @@
 LinkSourceFile(pipeline.h,../../../../../extras/Mesa/src)
 LinkSourceFile(pixel.c,../../../../../extras/Mesa/src)
 LinkSourceFile(pixel.h,../../../../../extras/Mesa/src)
+LinkSourceFile(pixeltex.c,../../../../../extras/Mesa/src)
+LinkSourceFile(pixeltex.h,../../../../../extras/Mesa/src)
 LinkSourceFile(points.c,../../../../../extras/Mesa/src)
 LinkSourceFile(points.h,../../../../../extras/Mesa/src)
 LinkSourceFile(polygon.c,../../../../../extras/Mesa/src)
@@ -184,7 +189,8 @@
 LinkSourceFile(zoom.c,../../../../../extras/Mesa/src)
 LinkSourceFile(zoom.h,../../../../../extras/Mesa/src)
 
-    CORE_SRCS = accum.c \
+    CORE_SRCS = aatriangle.c \
+		accum.c \
 		alpha.c \
 		alphabuf.c \
                 attrib.c \
@@ -226,6 +232,7 @@
 		pb.c \
 		pipeline.c \
 		pixel.c \
+		pixeltex.c \
 		points.c \
 		polygon.c \
 		quads.c \
@@ -257,7 +264,8 @@
 		xform.c \
 		zoom.c
 
-    CORE_OBJS = accum.o \
+    CORE_OBJS = aatriangle.o \
+		accum.o \
 		alpha.o \
 		alphabuf.o \
                 attrib.o \
@@ -300,6 +308,7 @@
 		pb.o \
 		pipeline.o \
 		pixel.o \
+		pixeltex.o \
 		points.o \
 		polygon.o \
 		quads.o \
Index: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c
diff -u xc/programs/Xserver/GL/mesa/src/X/xf86glx.c:1.7 xc/programs/Xserver/GL/mesa/src/X/xf86glx.c:1.9
--- xc/programs/Xserver/GL/mesa/src/X/xf86glx.c:1.7	Tue Feb 22 20:46:56 2000
+++ xc/programs/Xserver/GL/mesa/src/X/xf86glx.c	Fri Jun 16 17:03:13 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.7 2000/02/23 04:46:56 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.9 2000/06/17 00:03:13 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,6 +29,7 @@
 /*
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Brian E. Paul <brian@precisioninsight.com>
  *
  */
 
@@ -93,13 +94,14 @@
     __MESA_setVisualConfigs
 };
 
-__MESA_screen  MESAScreens[MAXSCREENS];
-__GLcontext   *MESA_CC        = NULL;
+static __MESA_screen  MESAScreens[MAXSCREENS];
+static __GLcontext   *MESA_CC        = NULL;
 
-int                 numConfigs     = 0;
-__GLXvisualConfig  *visualConfigs  = NULL;
-void              **visualPrivates = NULL;
+static int                 numConfigs     = 0;
+static __GLXvisualConfig  *visualConfigs  = NULL;
+static void              **visualPrivates = NULL;
 
+
 static int count_bits(unsigned int n)
 {
    int bits = 0;
@@ -111,6 +113,7 @@
    return bits;
 }
 
+
 static XMesaVisual find_mesa_visual(int screen, VisualID vid)
 {
     XMesaVisual xm_vis = NULL;
@@ -129,251 +132,148 @@
     return xm_vis;
 }
 
-#define VISUAL_CONFIG(rgba,accum,back,depth,stencil,rating)                  \
-{                                                                            \
-    -1,                 /* vid */                                            \
-    -1,                 /* class */                                          \
-    rgba,               /* rgba */                                           \
-    -1, -1, -1, 0,      /* rgba sizes, alpha not supported, yet */           \
-    -1, -1, -1, 0,      /* rgba masks, alpha not supported, yet */           \
-    accum, accum, accum, accum, /* rgba accum sizes */                       \
-    back,               /* doubleBuffer */                                   \
-    GL_FALSE,           /* stereo */                                         \
-    -1,                 /* bufferSize */                                     \
-    depth,              /* depthSize */                                      \
-    stencil,            /* stencilSize */                                    \
-    0,                  /* auxBuffers */                                     \
-    0,                  /* level */                                          \
-    rating,             /* visualRating */                                   \
-    0,                  /* transparentPixel */                               \
-    0, 0, 0, 0,         /* transparent rgba color (floats scaled to ints) */ \
-    0                   /* transparentIndex */                               \
-}
 
-#define IS_RGBA     GL_TRUE
-#define IS_CI       GL_FALSE
-#define HAS_ACCUM   ACCUM_BITS
-#define NO_ACCUM    0
-#define HAS_BACK    GL_TRUE
-#define NO_BACK     GL_FALSE
-#define HAS_DEPTH   DEPTH_BITS
-#define NO_DEPTH    0
-#define HAS_STENCIL STENCIL_BITS
-#define NO_STENCIL  0
-
-static __GLXvisualConfig __MESAvisualConfigs[] = {
-    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK, HAS_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK,  NO_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK, HAS_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
-    VISUAL_CONFIG(IS_RGBA, HAS_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
-    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK, HAS_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK,  NO_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
-    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
-    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
+/*
+ * In the case the driver has no GLX visuals we'll use these.
+ * [0] = RGB, double buffered
+ * [1] = RGB, double buffered, stencil, accum
+ * [2] = CI, double buffered
+ */
+#define NUM_FALLBACK_CONFIGS 3
+static __GLXvisualConfig FallbackConfigs[NUM_FALLBACK_CONFIGS] = {
+  {
+    -1,                 /* vid */
+    -1,                 /* class */
+    True,               /* rgba */
+    -1, -1, -1, 0,      /* rgba sizes */
+    -1, -1, -1, 0,      /* rgba masks */
+     0,  0,  0, 0,      /* rgba accum sizes */
+    True,               /* doubleBuffer */
+    False,              /* stereo */
+    -1,                 /* bufferSize */
+    16,                 /* depthSize */
+    0,                  /* stencilSize */
+    0,                  /* auxBuffers */
+    0,                  /* level */
+    GLX_NONE_EXT,       /* visualRating */
+    0,                  /* transparentPixel */
+    0, 0, 0, 0,         /* transparent rgba color (floats scaled to ints) */
+    0                   /* transparentIndex */
+  },
+  {
+    -1,                 /* vid */
+    -1,                 /* class */
+    True,               /* rgba */
+    -1, -1, -1, 0,      /* rgba sizes */
+    -1, -1, -1, 0,      /* rgba masks */
+    16, 16, 16, 0,      /* rgba accum sizes */
+    True,               /* doubleBuffer */
+    False,              /* stereo */
+    -1,                 /* bufferSize */
+    16,                 /* depthSize */
+    8,                  /* stencilSize */
+    0,                  /* auxBuffers */
+    0,                  /* level */
+    GLX_NONE_EXT,       /* visualRating */
+    0,                  /* transparentPixel */
+    0, 0, 0, 0,         /* transparent rgba color (floats scaled to ints) */
+    0                   /* transparentIndex */
+  },
+  {
+    -1,                 /* vid */
+    -1,                 /* class */
+    False,              /* color index */
+    -1, -1, -1, 0,      /* rgba sizes */
+    -1, -1, -1, 0,      /* rgba masks */
+     0,  0,  0, 0,      /* rgba accum sizes */
+    True,               /* doubleBuffer */
+    False,              /* stereo */
+    -1,                 /* bufferSize */
+    16,                 /* depthSize */
+    0,                  /* stencilSize */
+    0,                  /* auxBuffers */
+    0,                  /* level */
+    GLX_NONE_EXT,       /* visualRating */
+    0,                  /* transparentPixel */
+    0, 0, 0, 0,         /* transparent rgba color (floats scaled to ints) */
+    0                   /* transparentIndex */
+  },
 };
 
-static int __numMESAvisualConfigs =
-                    sizeof(__MESAvisualConfigs)/sizeof(__GLXvisualConfig);
-static int __numRGBconfigs        = -1;
-static int __numCIconfigs         = -1;
 
 static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
 			 VisualID *defaultVisp,
 			 int ndepth, DepthPtr pdepth,
 			 int rootDepth)
 {
+    int numRGBconfigs;
+    int numCIconfigs;
     int numVisuals = *nvisualp;
-    int numMesaVisuals = 0;
-    int numMergedVisualConfigs = 0;
+    int numNewVisuals;
+    int numNewConfigs;
     VisualPtr pVisual = *visualp;
     VisualPtr pVisualNew = NULL;
     VisualID *orig_vid = NULL;
     __GLXvisualConfig *glXVisualPtr = NULL;
-    __GLXvisualConfig *pMergedVisualConfigs = NULL;
+    __GLXvisualConfig *pNewVisualConfigs = NULL;
     void **glXVisualPriv;
-    void **pMergedVisualPriv;
-    int *mesaConfigUsed;
-    int *driverConfigUsed;
-    int found_default = FALSE;
+    void **pNewVisualPriv;
+    int found_default;
     int i, j, k;
-    int is_rgb;
-    Bool match;
 
-    /* Alloc space for the list of merged GLX visuals */
-    pMergedVisualConfigs =
-	(__GLXvisualConfig *)__glXMalloc((numConfigs +
-					  __numMESAvisualConfigs) * 
-					 sizeof(__GLXvisualConfig));
-    if (!pMergedVisualConfigs) {
+    if (numConfigs > 0)
+        numNewConfigs = numConfigs;
+    else
+        numNewConfigs = NUM_FALLBACK_CONFIGS;
+
+    /* Alloc space for the list of new GLX visuals */
+    pNewVisualConfigs = (__GLXvisualConfig *)
+                     __glXMalloc(numNewConfigs * sizeof(__GLXvisualConfig));
+    if (!pNewVisualConfigs) {
 	return FALSE;
     }
 
-    /* Alloc space for the list of merged GLX visual privates */
-    pMergedVisualPriv =
-	(void **)__glXMalloc((numConfigs + __numMESAvisualConfigs) *
-			     sizeof(void *));
-    if (!pMergedVisualPriv) {
-	__glXFree(pMergedVisualConfigs);
+    /* Alloc space for the list of new GLX visual privates */
+    pNewVisualPriv = (void **) __glXMalloc(numNewConfigs * sizeof(void *));
+    if (!pNewVisualPriv) {
+	__glXFree(pNewVisualConfigs);
 	return FALSE;
     }
 
-    /* Compute the intersection of the driver's visual configs */
-    mesaConfigUsed = __glXCalloc(__numMESAvisualConfigs, sizeof(int));
-    driverConfigUsed = __glXCalloc(numConfigs, sizeof(int));
-
-    for (i = j = 0; i < numConfigs; i++) {
-	k = 0;
-	while ((k < __numMESAvisualConfigs) && (!driverConfigUsed[i])) {
-	    if (!mesaConfigUsed[k]) {
-
-#ifdef DEBUG_VISUAL_CONFIG
-#define TEST_AND_COPY(fld) do {						    \
-	if (match) {							    \
-	    if ((__MESAvisualConfigs[k].fld == visualConfigs[i].fld) ||	    \
-		(__MESAvisualConfigs[k].fld == -1)) {		    	    \
-		pMergedVisualConfigs[j].fld = visualConfigs[i].fld; 	    \
-	    } 								    \
-	    else if (visualConfigs[i].fld == -1) {			    \
-		pMergedVisualConfigs[j].fld = __MESAvisualConfigs[k].fld;   \
-	    }								    \
-	    else {							    \
-		match = FALSE;						    \
-		xf86DrvMsg (0, 0, "[GLXVisualInit] mismatch: "		    \
-		    "(%s) DriverVisualConfig[%d] MesaVisualConfig[%d]\n",   \
-		    #fld, i, k);					    \
-	    } 								    \
-	} 								    \
-    } while (0)
-#else
-#define TEST_AND_COPY(fld) do {						    \
-	if (match) {							    \
-	    if ((__MESAvisualConfigs[k].fld == visualConfigs[i].fld) ||	    \
-		(__MESAvisualConfigs[k].fld == -1)) {		    	    \
-		pMergedVisualConfigs[j].fld = visualConfigs[i].fld; 	    \
-	    } 								    \
-	    else if (visualConfigs[i].fld == -1) {			    \
-		pMergedVisualConfigs[j].fld = __MESAvisualConfigs[k].fld;   \
-	    }								    \
-	    else {							    \
-		match = FALSE;						    \
-	    } 								    \
-	} 								    \
-    } while (0)
-#endif
-
-		match = TRUE;
-		TEST_AND_COPY(class);
-		TEST_AND_COPY(rgba);
-		TEST_AND_COPY(redSize);
-		TEST_AND_COPY(greenSize);
-		TEST_AND_COPY(blueSize);
-		TEST_AND_COPY(alphaSize);
-		TEST_AND_COPY(redMask);
-		TEST_AND_COPY(greenMask);
-		TEST_AND_COPY(blueMask);
-		TEST_AND_COPY(alphaMask);
-		TEST_AND_COPY(accumRedSize);
-		TEST_AND_COPY(accumGreenSize);
-		TEST_AND_COPY(accumBlueSize);
-		TEST_AND_COPY(accumAlphaSize);
-		TEST_AND_COPY(doubleBuffer);
-		TEST_AND_COPY(stereo);
-		TEST_AND_COPY(bufferSize);
-		TEST_AND_COPY(depthSize);
-		TEST_AND_COPY(stencilSize);
-		TEST_AND_COPY(auxBuffers);
-		TEST_AND_COPY(level);
-		TEST_AND_COPY(visualRating);
-		TEST_AND_COPY(transparentPixel);
-		TEST_AND_COPY(transparentRed);
-		TEST_AND_COPY(transparentGreen);
-		TEST_AND_COPY(transparentBlue);
-		TEST_AND_COPY(transparentAlpha);
-		TEST_AND_COPY(transparentIndex);
-		if (match) {
-		    driverConfigUsed[i] = TRUE;
-		    mesaConfigUsed[k] = TRUE;
-		    pMergedVisualPriv[j] = visualPrivates[i];
-		    j++;
-#ifdef DEBUG_VISUAL_CONFIG
-		    xf86DrvMsg (0, 0, "[GLXVisualInit] MATCH: "
-			"DriverVisualConfig[%d] MesaVisualConfig[%d]\n", i, k);
-#endif
-		}
-	    }
-	    k++;
-	}
-    }
-
-    /*
-    ** If SetVisualConfigs was not called, then just make all of Mesa's
-    ** visual configs available.
-    */
-    if (!numConfigs) {
-	memcpy(pMergedVisualConfigs, __MESAvisualConfigs,
-	       sizeof(__GLXvisualConfig) * __numMESAvisualConfigs);
-	memset(pMergedVisualPriv, 0, sizeof(void *) * __numMESAvisualConfigs);
-	memset(mesaConfigUsed, TRUE, sizeof(int) * __numMESAvisualConfigs);
-	j = __numMESAvisualConfigs;
-    }
-
     /*
-    ** This code is not currently used.  When the visual caveat
-    ** extension is supported by the DRI and Mesa, we can take advantage
-    ** of this code.
+    ** If SetVisualConfigs was not called, then use default GLX
+    ** visual configs.
     */
-#if 0
-    /* Add any unclaimed MESA configs w/ slow caveat */
-    for (i = 0; i < __numMESAvisualConfigs; i++) {
-	if (!mesaConfigUsed[i]) {
-	    memcpy(&pMergedVisualConfigs[j], &__MESAvisualConfigs[i],
-		   sizeof(__GLXvisualConfig));
-	    pMergedVisualConfigs[j].visualRating = GLX_SLOW_VISUAL_EXT;
-	    j++;
-#ifdef DEBUG_VISUAL_CONFIG
-	    xf86DrvMsg (0, 0, "[GLXVisualInit] slow config: "
-				    "MesaVisualConfig[%d]\n", i);
-#endif
-	}
+    if (numConfigs == 0) {
+	memcpy(pNewVisualConfigs, FallbackConfigs,
+               NUM_FALLBACK_CONFIGS * sizeof(__GLXvisualConfig));
+	memset(pNewVisualPriv, 0, NUM_FALLBACK_CONFIGS * sizeof(void *));
+    }
+    else {
+        /* copy driver's visual config info */
+        for (i = 0; i < numConfigs; i++) {
+            pNewVisualConfigs[i] = visualConfigs[i];
+            pNewVisualPriv[i] = visualPrivates[i];
+        }
     }
 
-    /* Add any unclaimed driver configs w/ nonconformant caveat */
-    for (i = 0; i < numConfigs; i++) {
-	if (!driverConfigUsed[i]) {
-	    memcpy(&pMergedVisualConfigs[j], &visualConfigs[i],
-		   sizeof(__GLXvisualConfig));
-	    pMergedVisualConfigs[j].visualRating = GLX_NON_CONFORMANT_VISUAL_EXT;
-	    j++;
-#ifdef DEBUG_VISUAL_CONFIG
-	    xf86DrvMsg (0, 0, "[GLXVisualInit] non-conformant config: "
-				    "DriverVisualConfig[%d]\n", i);
-#endif
-	}
-    }
-#endif
 
-    numMergedVisualConfigs = j;
-
     /* Count the number of RGB and CI visual configs */
-    __numRGBconfigs = __numCIconfigs = 0;
-    for (i = 0; i < numMergedVisualConfigs; i++) {
-	if (pMergedVisualConfigs[i].rgba)
-	    __numRGBconfigs++;
+    numRGBconfigs = 0;
+    numCIconfigs = 0;
+    for (i = 0; i < numNewConfigs; i++) {
+	if (pNewVisualConfigs[i].rgba)
+	    numRGBconfigs++;
 	else
-	    __numCIconfigs++;
+	    numCIconfigs++;
     }
 
     /* Count the total number of visuals to compute */
+    numNewVisuals = 0;
     for (i = 0; i < numVisuals; i++) {
-        numMesaVisuals +=
+        numNewVisuals +=
 	    (pVisual[i].class == TrueColor || pVisual[i].class == DirectColor)
-	    ? __numRGBconfigs : __numCIconfigs;
+	    ? numRGBconfigs : numCIconfigs;
     }
 
     /* Reset variables for use with the next screen/driver's visual configs */
@@ -381,51 +281,52 @@
     numConfigs = 0;
 
     /* Alloc temp space for the list of orig VisualIDs for each new visual */
-    orig_vid = (VisualID *)__glXMalloc(numMesaVisuals * sizeof(VisualID));
+    orig_vid = (VisualID *)__glXMalloc(numNewVisuals * sizeof(VisualID));
     if (!orig_vid) {
-	__glXFree(pMergedVisualPriv);
-	__glXFree(pMergedVisualConfigs);
+	__glXFree(pNewVisualPriv);
+	__glXFree(pNewVisualConfigs);
 	return FALSE;
     }
 
     /* Alloc space for the list of glXVisuals */
-    glXVisualPtr = (__GLXvisualConfig *)__glXMalloc(numMesaVisuals *
+    glXVisualPtr = (__GLXvisualConfig *)__glXMalloc(numNewVisuals *
 						    sizeof(__GLXvisualConfig));
     if (!glXVisualPtr) {
 	__glXFree(orig_vid);
-	__glXFree(pMergedVisualPriv);
-	__glXFree(pMergedVisualConfigs);
+	__glXFree(pNewVisualPriv);
+	__glXFree(pNewVisualConfigs);
 	return FALSE;
     }
 
     /* Alloc space for the list of glXVisualPrivates */
-    glXVisualPriv = (void **)__glXMalloc(numMesaVisuals * sizeof(void *));
+    glXVisualPriv = (void **)__glXMalloc(numNewVisuals * sizeof(void *));
     if (!glXVisualPriv) {
 	__glXFree(glXVisualPtr);
 	__glXFree(orig_vid);
-	__glXFree(pMergedVisualPriv);
-	__glXFree(pMergedVisualConfigs);
+	__glXFree(pNewVisualPriv);
+	__glXFree(pNewVisualConfigs);
 	return FALSE;
     }
 
     /* Alloc space for the new list of the X server's visuals */
-    pVisualNew = (VisualPtr)__glXMalloc(numMesaVisuals * sizeof(VisualRec));
+    pVisualNew = (VisualPtr)__glXMalloc(numNewVisuals * sizeof(VisualRec));
     if (!pVisualNew) {
 	__glXFree(glXVisualPriv);
 	__glXFree(glXVisualPtr);
 	__glXFree(orig_vid);
-	__glXFree(pMergedVisualPriv);
-	__glXFree(pMergedVisualConfigs);
+	__glXFree(pNewVisualPriv);
+	__glXFree(pNewVisualConfigs);
 	return FALSE;
     }
 
     /* Initialize the new visuals */
+    found_default = FALSE;
     for (i = j = 0; i < numVisuals; i++) {
-	is_rgb = (pVisual[i].class == TrueColor ||
-		  pVisual[i].class == DirectColor);
+        int is_rgb = (pVisual[i].class == TrueColor ||
+		      pVisual[i].class == DirectColor);
 
-	for (k = 0; k < numMergedVisualConfigs; k++) {
-	    if (pMergedVisualConfigs[k].rgba != is_rgb)
+	for (k = 0; k < numNewConfigs; k++) {
+	    if (pNewVisualConfigs[k].rgba != is_rgb)
 		continue;
 
 	    /* Initialize the new visual */
@@ -442,7 +343,7 @@
 	    orig_vid[j] = pVisual[i].vid;
 
 	    /* Initialize the glXVisual */
-	    glXVisualPtr[j] = pMergedVisualConfigs[k];
+	    glXVisualPtr[j] = pNewVisualConfigs[k];
 	    glXVisualPtr[j].vid = pVisualNew[j].vid;
 
 	    /*
@@ -456,23 +357,25 @@
 		glXVisualPtr[j].redSize    = count_bits(pVisual[i].redMask);
 		glXVisualPtr[j].greenSize  = count_bits(pVisual[i].greenMask);
 		glXVisualPtr[j].blueSize   = count_bits(pVisual[i].blueMask);
-		glXVisualPtr[j].alphaSize  = 0; /* Not supported in Mesa */
+		glXVisualPtr[j].alphaSize  = glXVisualPtr[j].alphaSize;
 		glXVisualPtr[j].redMask    = pVisual[i].redMask;
 		glXVisualPtr[j].greenMask  = pVisual[i].greenMask;
 		glXVisualPtr[j].blueMask   = pVisual[i].blueMask;
-		glXVisualPtr[j].alphaMask  = 0; /* Not supported in Mesa */
+		glXVisualPtr[j].alphaMask  = glXVisualPtr[j].alphaMask;
 		glXVisualPtr[j].bufferSize = rootDepth;
 	    }
 
 	    /* Save the device-dependent private for this visual */
-	    glXVisualPriv[j] = pMergedVisualPriv[k];
+	    glXVisualPriv[j] = pNewVisualPriv[k];
 
 	    j++;
 	}
     }
 
+    assert(j <= numNewVisuals);
+
     /* Save the GLX visuals in the screen structure */
-    MESAScreens[screenInfo.numScreens-1].num_vis = numMesaVisuals;
+    MESAScreens[screenInfo.numScreens-1].num_vis = numNewVisuals;
     MESAScreens[screenInfo.numScreens-1].glx_vis = glXVisualPtr;
     MESAScreens[screenInfo.numScreens-1].private = glXVisualPriv;
 
@@ -484,7 +387,7 @@
 
 	/* Count the new number of VisualIDs at this depth */
 	for (j = 0; j < pdepth[i].numVids; j++)
-	    for (k = 0; k < numMesaVisuals; k++)
+	    for (k = 0; k < numNewVisuals; k++)
 		if (pdepth[i].vids[j] == orig_vid[k])
 		    numVids++;
 
@@ -493,7 +396,7 @@
 
 	/* Initialize the new list of VisualIDs for this depth */
 	for (j = 0; j < pdepth[i].numVids; j++)
-	    for (k = 0; k < numMesaVisuals; k++)
+	    for (k = 0; k < numNewVisuals; k++)
 		if (pdepth[i].vids[j] == orig_vid[k])
 		    pVids[n++] = pVisualNew[k].vid;
 
@@ -504,7 +407,7 @@
     }
 
     /* Update the X server's visuals */
-    *nvisualp = numMesaVisuals;
+    *nvisualp = numNewVisuals;
     *visualp = pVisualNew;
 
     /* Free the old list of the X server's visuals */
@@ -512,11 +415,12 @@
 
     /* Clean up temporary allocations */
     __glXFree(orig_vid);
-    __glXFree(pMergedVisualPriv);
-    __glXFree(pMergedVisualConfigs);
+    __glXFree(pNewVisualPriv);
+    __glXFree(pNewVisualConfigs);
 
     /* Free the private list created by DDX HW driver */
-    if (visualPrivates) xfree(visualPrivates);
+    if (visualPrivates)
+        xfree(visualPrivates);
     visualPrivates = NULL;
 
     return TRUE;
@@ -584,6 +488,8 @@
     /* Alloc space for the list of XMesa visuals */
     pXMesaVisual = (XMesaVisual *)__glXMalloc(MESAScreens[screen].num_vis *
 					      sizeof(XMesaVisual));
+    __glXMemset(pXMesaVisual, 0,
+		MESAScreens[screen].num_vis * sizeof(XMesaVisual));
 
     used = (int *)__glXMalloc(pScreen->numVisuals * sizeof(int));
     __glXMemset(used, 0, pScreen->numVisuals * sizeof(int));
@@ -603,18 +509,22 @@
 
 		    /* Create the XMesa visual */
 		    pXMesaVisual[i] =
-			XMesaCreateVisual(pScreen,
-					  pVis,
-					  pGLXVis->rgba,
-					  (pGLXVis->alphaSize > 0),
-					  pGLXVis->doubleBuffer,
-					  pGLXVis->stereo,
-					  GL_TRUE, /* ximage_flag */
-					  pGLXVis->depthSize,
-					  pGLXVis->stencilSize,
-					  pGLXVis->accumRedSize,
-					  pGLXVis->level);
-
+                         XMesaCreateVisual(pScreen,
+					   pVis,
+					   pGLXVis->rgba,
+					   (pGLXVis->alphaSize > 0),
+					   pGLXVis->doubleBuffer,
+					   pGLXVis->stereo,
+					   GL_TRUE, /* ximage_flag */
+					   pGLXVis->depthSize,
+					   pGLXVis->stencilSize,
+					   pGLXVis->accumRedSize,
+					   pGLXVis->accumGreenSize,
+					   pGLXVis->accumBlueSize,
+					   pGLXVis->accumAlphaSize,
+                                           0,  /* numSamples */
+					   pGLXVis->level,
+                                           pGLXVis->visualRating );
 		    /* Set the VisualID */
 		    pGLXVis->vid = pVis->vid;
 
@@ -670,7 +580,8 @@
 
     for (i = 0; i < screenInfo.numScreens; i++) {
 	for (j = 0; j < MESAScreens[i].num_vis; j++) {
-	    XMesaDestroyVisual(MESAScreens[i].xm_vis[j]);
+	    if (MESAScreens[i].xm_vis[j])
+	        XMesaDestroyVisual(MESAScreens[i].xm_vis[j]);
 	}
 	__glXFree(MESAScreens[i].glx_vis);
 	MESAScreens[i].glx_vis = NULL;
Index: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c
diff -u xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c:3.6 xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c:3.7
--- xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c:3.6	Sun Oct  4 02:34:23 1998
+++ xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c	Wed Apr  5 11:13:28 2000
@@ -42,11 +42,10 @@
 SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c,v 3.6 1998/10/04 09:34:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c,v 3.7 2000/04/05 18:13:28 dawes Exp $ */
 
 #define TRIMING 1
 
-#include <math.h>
 #include "mipex.h"
 #include "misc.h"
 #include "miscstruct.h"
@@ -58,6 +57,11 @@
 #include "miNurbs.h"
 #include "pexos.h"
 
+#if !defined(IN_MODULE) /* hv: not a module header file */
+#include <math.h>
+#else
+#include <xf86_ansic.h>
+#endif
 
 static ddpex3rtn       build_surf_reps();
 static int             add_grid();
Index: xc/programs/Xserver/Xext/Imakefile
diff -u xc/programs/Xserver/Xext/Imakefile:3.32 xc/programs/Xserver/Xext/Imakefile:3.33
--- xc/programs/Xserver/Xext/Imakefile:3.32	Sat Feb 12 22:15:30 2000
+++ xc/programs/Xserver/Xext/Imakefile	Thu Jun 15 13:49:59 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/63 1997/11/24 16:48:40 kaleb $
-XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.32 2000/02/13 06:15:30 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.33 2000/06/15 20:49:59 dawes Exp $
 
 #include <Server.tmpl>
 
@@ -117,7 +117,10 @@
 	      xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \
 	      $(XF86BIGFOBJS)
 
+#ifdef XFree86Version
+/* XXX Check if this can be eliminated */
 XF86INCLUDES = -I$(XF86COMSRC)
+#endif
     INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		$(PNRXINCLUDES) $(XF86INCLUDES) -I$(FONTINCSRC) \
  		$(FONTCACHEINCLUDES)
Index: xc/programs/Xserver/Xext/dgaproc.h
diff -u xc/programs/Xserver/Xext/dgaproc.h:1.19 xc/programs/Xserver/Xext/dgaproc.h:1.21
--- xc/programs/Xserver/Xext/dgaproc.h:1.19	Wed Oct 13 15:32:47 1999
+++ xc/programs/Xserver/Xext/dgaproc.h	Fri Jun 30 12:06:54 2000
@@ -1,8 +1,10 @@
-/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.19 1999/10/13 22:32:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */
 
 #ifndef __DGAPROC_H
 #define __DGAPROC_H
 
+#include "Xproto.h"
+#include "pixmap.h"
 
 #define DGA_CONCURRENT_ACCESS	0x00000001
 #define DGA_FILL_RECT		0x00000002
@@ -58,36 +60,43 @@
 
 int
 DGASetMode(
-   int index,
+   int Index,
    int num,
    XDGAModePtr mode,
    PixmapPtr *pPix
 );
 
+void
+DGASetInputMode(
+   int Index,
+   Bool keyboard,
+   Bool mouse
+);
+
 void 
 DGASelectInput(
-   int index,
+   int Index,
    ClientPtr client,
    long mask
 );
 
-Bool DGAAvailable(int index);
-Bool DGAActive(int index);
+Bool DGAAvailable(int Index);
+Bool DGAActive(int Index);
 void DGAShutdown(void);
 void DGAInstallCmap(ColormapPtr cmap);
-int DGAGetViewportStatus(int index); 
-int DGASync(int index);
+int DGAGetViewportStatus(int Index); 
+int DGASync(int Index);
 
 int
 DGAFillRect(
-   int index,
+   int Index,
    int x, int y, int w, int h,
    unsigned long color
 );
 
 int
 DGABlitRect(
-   int index,
+   int Index,
    int srcx, int srcy, 
    int w, int h, 
    int dstx, int dsty
@@ -95,7 +104,7 @@
 
 int
 DGABlitTransRect(
-   int index,
+   int Index,
    int srcx, int srcy, 
    int w, int h, 
    int dstx, int dsty,
@@ -104,28 +113,28 @@
 
 int
 DGASetViewport(
-   int index,
+   int Index,
    int x, int y,
    int mode
 ); 
 
-int DGAGetModes(int index);
-int DGAGetOldDGAMode(int index);
+int DGAGetModes(int Index);
+int DGAGetOldDGAMode(int Index);
 
-int DGAGetModeInfo(int index, XDGAModePtr mode, int num);
+int DGAGetModeInfo(int Index, XDGAModePtr mode, int num);
 
 Bool DGAVTSwitch(void);
-Bool DGAStealMouseEvent(int index, xEvent *e, int dx, int dy);
-Bool DGAStealKeyEvent(int index, xEvent *e);
+Bool DGAStealMouseEvent(int Index, xEvent *e, int dx, int dy);
+Bool DGAStealKeyEvent(int Index, xEvent *e);
 Bool DGAIsDgaEvent (xEvent *e);
 
 Bool DGADeliverEvent (ScreenPtr pScreen, xEvent *e);
 	    
-Bool DGAOpenFramebuffer(int index, char **name, unsigned char **mem, 
+Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem, 
 			int *size, int *offset, int *flags);
-void DGACloseFramebuffer(int index);
-Bool DGAChangePixmapMode(int index, int *x, int *y, int mode);
-int DGACreateColormap(int index, ClientPtr client, int id, int mode, 
+void DGACloseFramebuffer(int Index);
+Bool DGAChangePixmapMode(int Index, int *x, int *y, int mode);
+int DGACreateColormap(int Index, ClientPtr client, int id, int mode, 
 			int alloc);
 
 extern unsigned char DGAReqCode;
Index: xc/programs/Xserver/Xext/panoramiX.c
diff -u xc/programs/Xserver/Xext/panoramiX.c:3.17 xc/programs/Xserver/Xext/panoramiX.c:3.22
--- xc/programs/Xserver/Xext/panoramiX.c:3.17	Fri Mar  3 14:17:37 2000
+++ xc/programs/Xserver/Xext/panoramiX.c	Thu May 25 14:12:30 2000
@@ -19,12 +19,13 @@
 *   or  in  FAR 52.227-19, as applicable.                       *
 *                                                               *
 *****************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.17 2000/03/03 22:17:37 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.22 2000/05/25 21:12:30 mvojkovi Exp $ */
 
 #define NEED_REPLIES
 #include <stdio.h>
 #include "X.h"
 #include "Xproto.h"
+#include "Xarch.h"
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -102,7 +103,7 @@
 int PanoramiXMapWindow(), 	PanoramiXMapSubwindows();
 int PanoramiXUnmapWindow(), 	PanoramiXUnmapSubwindows();
 int PanoramiXConfigureWindow(), PanoramiXCirculateWindow();
-int PanoramiXGetGeometry();	
+int PanoramiXGetGeometry(),	PanoramiXTranslateCoords();	
 int PanoramiXCreatePixmap(), 	PanoramiXFreePixmap();
 int PanoramiXCreateGC(), 	PanoramiXChangeGC();
 int PanoramiXCopyGC(),		PanoramiXCopyColormapAndFree();
@@ -331,7 +332,7 @@
 
 
 
-static int
+int
 XineramaDeleteResource(pointer data, XID id)
 {
     xfree(data);
@@ -571,6 +572,7 @@
     ProcVector[X_ConfigureWindow] = PanoramiXConfigureWindow;
     ProcVector[X_CirculateWindow] = PanoramiXCirculateWindow;
     ProcVector[X_GetGeometry] = PanoramiXGetGeometry;
+    ProcVector[X_TranslateCoords] = PanoramiXTranslateCoords;
     ProcVector[X_CreatePixmap] = PanoramiXCreatePixmap;
     ProcVector[X_FreePixmap] = PanoramiXFreePixmap;
     ProcVector[X_CreateGC] = PanoramiXCreateGC;
@@ -840,6 +842,7 @@
 
     for (i =  0; i < PanoramiXNumScreens; i++) {
 	root->info[i].id = WindowTable[i]->drawable.id;
+	root->u.win.class = InputOutput;
 	defmap->info[i].id = (screenInfo.screens[i])->defColormap;
     }
 
@@ -1058,10 +1061,13 @@
 }
 
 
-
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
 #define SHIFT_L(v,s) (v) << (s)
 #define SHIFT_R(v,s) (v) >> (s)
-
+#else
+#define SHIFT_L(v,s) (v) >> (s)
+#define SHIFT_R(v,s) (v) << (s)
+#endif
 
 static void
 CopyBits(char *dst, int shiftL, char *src, int bytes)
@@ -1202,7 +1208,7 @@
 			}
 		    }
 		} else {
-		    j = pDraw->bitsPerPixel >> 3;
+		    j = BitsPerPixel(depth) >> 3;
 		    x = (pbox->x1 - SrcBox.x1) * j;
 		    y = pbox->y1 - SrcBox.y1;
 		    w *= j;
Index: xc/programs/Xserver/Xext/panoramiXprocs.c
diff -u xc/programs/Xserver/Xext/panoramiXprocs.c:3.22 xc/programs/Xserver/Xext/panoramiXprocs.c:3.27
--- xc/programs/Xserver/Xext/panoramiXprocs.c:3.22	Sun Feb 27 15:15:30 2000
+++ xc/programs/Xserver/Xext/panoramiXprocs.c	Sat Apr  8 12:18:54 2000
@@ -22,7 +22,7 @@
 
 /* Massively rewritten by Mark Vojkovich <markv@valinux.com> */
 
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.22 2000/02/27 23:15:30 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.27 2000/04/08 19:18:54 mvojkovi Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -494,7 +494,9 @@
 	}
     }
 
-    FOR_NSCREENS_BACKWARD(j) {
+    /* have to go forward or you get expose events before 
+	ConfigureNotify events */
+    FOR_NSCREENS_FORWARD(j) {
 	stuff->window = win->info[j].id;
 	if(sib)
 	    *((CARD32 *) &stuff[1] + sib_offset) = sib->info[j].id;
@@ -543,34 +545,105 @@
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.root = WindowTable[pDraw->pScreen->myNum]->drawable.id;
+    rep.root = WindowTable[0]->drawable.id;
     rep.depth = pDraw->depth;
+    rep.width = pDraw->width;
+    rep.height = pDraw->height;
+    rep.x = rep.y = rep.borderWidth = 0;
 
-    if (stuff->id == WindowTable[0]->drawable.id) {
+    if (stuff->id == rep.root) {
 	xWindowRoot *root  = (xWindowRoot *)
 				    (ConnectionInfo + connBlockScreenStart);
 
 	rep.width = root->pixWidth;
 	rep.height = root->pixHeight;
-    } else {
-	rep.width = pDraw->width;
-	rep.height = pDraw->height;
-    }
-
-    if ((pDraw->type == UNDRAWABLE_WINDOW) ||
-        ((pDraw->type == DRAWABLE_WINDOW) && (stuff->id == pDraw->id))) {
+    } else 
+    if ((pDraw->type == UNDRAWABLE_WINDOW) || (pDraw->type == DRAWABLE_WINDOW))
+    {
         WindowPtr pWin = (WindowPtr)pDraw;
 	rep.x = pWin->origin.x - wBorderWidth (pWin);
 	rep.y = pWin->origin.y - wBorderWidth (pWin);
+	if(pWin->parent == WindowTable[0]) {
+	   rep.x += panoramiXdataPtr[0].x;
+	   rep.y += panoramiXdataPtr[0].y;
+	}
 	rep.borderWidth = pWin->borderWidth;
-    } else { 			/* DRAWABLE_PIXMAP or DRAWABLE_BUFFER */
-	rep.x = rep.y = rep.borderWidth = 0;
     }
+
     WriteReplyToClient(client, sizeof(xGetGeometryReply), &rep);
     return (client->noClientException);
 }
 
+int PanoramiXTranslateCoords(ClientPtr client)
+{
+    INT16 x, y;
+    REQUEST(xTranslateCoordsReq);
+
+    register WindowPtr pWin, pDst;
+    xTranslateCoordsReply rep;
+
+    REQUEST_SIZE_MATCH(xTranslateCoordsReq);
+    pWin = (WindowPtr)SecurityLookupWindow(stuff->srcWid, client,
+					   SecurityReadAccess);
+    if (!pWin)
+        return(BadWindow);
+    pDst = (WindowPtr)SecurityLookupWindow(stuff->dstWid, client,
+					   SecurityReadAccess);
+    if (!pDst)
+        return(BadWindow);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.sameScreen = xTrue;
+    rep.child = None;
+
+    if(pWin == WindowTable[0]) {
+	x = stuff->srcX - panoramiXdataPtr[0].x;
+	y = stuff->srcY - panoramiXdataPtr[0].y;
+    } else {
+	x = pWin->drawable.x + stuff->srcX;
+	y = pWin->drawable.y + stuff->srcY;
+    }
+    pWin = pDst->firstChild;
+    while (pWin) {
+#ifdef SHAPE
+	    BoxRec  box;
+#endif
+	    if ((pWin->mapped) &&
+		(x >= pWin->drawable.x - wBorderWidth (pWin)) &&
+		(x < pWin->drawable.x + (int)pWin->drawable.width +
+		 wBorderWidth (pWin)) &&
+		(y >= pWin->drawable.y - wBorderWidth (pWin)) &&
+		(y < pWin->drawable.y + (int)pWin->drawable.height +
+		 wBorderWidth (pWin))
+#ifdef SHAPE
+		/* When a window is shaped, a further check
+		 * is made to see if the point is inside
+		 * borderSize
+		 */
+		&& (!wBoundingShape(pWin) ||
+		    POINT_IN_REGION(pWin->drawable.pScreen, 
+					&pWin->borderSize, x, y, &box))
+#endif
+		)
+            {
+		rep.child = pWin->drawable.id;
+		pWin = (WindowPtr) NULL;
+	    }
+	    else
+		pWin = pWin->nextSib;
+    }
+    rep.dstX = x - pDst->drawable.x;
+    rep.dstY = y - pDst->drawable.y;
+    if(pDst == WindowTable[0]) {
+	rep.dstX += panoramiXdataPtr[0].x;
+	rep.dstY += panoramiXdataPtr[0].y;
+    }
 
+    WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep);
+    return(client->noClientException);
+}
+
 int PanoramiXCreatePixmap(ClientPtr client)
 {
     PanoramiXRes *refDraw, *newPix;
@@ -961,8 +1034,8 @@
 	FOR_NSCREENS(j)
 	    VERIFY_DRAWABLE(drawables[j], src->info[j].id, client);
 
-	pitch = PixmapBytePad(stuff->width, drawables[0]->depth);
-	if(!(data = xcalloc(stuff->height, pitch)))
+	pitch = PixmapBytePad(stuff->width, drawables[0]->depth); 
+	if(!(data = xcalloc(1, stuff->height * pitch)))
 	    return BadAlloc;
 
 	XineramaGetImageData(drawables, srcx, srcy, 
@@ -972,15 +1045,17 @@
 	FOR_NSCREENS_BACKWARD(j) {
 	    stuff->gc = gc->info[j].id;
 	    VALIDATE_DRAWABLE_AND_GC(dst->info[j].id, pDst, pGC, client);
-	     
+
+	    if(drawables[0]->depth != pDst->depth) {
+		client->errorValue = stuff->dstDrawable;
+		xfree(data);
+		return (BadMatch);
+	    }
+
 	    (*pGC->ops->PutImage) (pDst, pGC, pDst->depth, dstx, dsty, 
 				   stuff->width, stuff->height, 
 				   0, ZPixmap, data);
 
-	    if(pGC->graphicsExposures) {
-		/* Ugh */
-	    }
-
 	    if(dstShared) break;
 	}
 
@@ -1695,9 +1770,6 @@
     Mask		plane, planemask;
     int			linesDone, nlines, linesPerBuf;
     long		widthBytesLine, length;
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    long		widthBytesLineProto, lengthProto;
-#endif
 
     REQUEST(xGetImageReq);
 
@@ -1761,10 +1833,7 @@
 	widthBytesLine = PixmapBytePad(w, pDraw->depth);
 	length = widthBytesLine * h;
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	widthBytesLineProto = PixmapBytePadProto(w, pDraw->depth);
-	lengthProto 	    = widthBytesLineProto * h;
-#endif
+
     } else {
 	widthBytesLine = BitmapBytePad(w);
 	plane = ((Mask)1) << (pDraw->depth - 1);
@@ -1772,18 +1841,9 @@
 	length = widthBytesLine * h *
 		 Ones(planemask & (plane | (plane - 1)));
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	widthBytesLineProto = BitmapBytePadProto(w);
-	lengthProto = (length / widthBytesLine) * widthBytesLineProto;
-#endif
     }
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    xgi.length = (lengthProto + 3) >> 2;
-#else
     xgi.length = (length + 3) >> 2;
-#endif
-
 
     if (widthBytesLine == 0 || h == 0)
 	linesPerBuf = 0;
@@ -1814,14 +1874,6 @@
 	    XineramaGetImageData(drawables, x, y + linesDone, w, nlines,
 			format, planemask, pBuf, widthBytesLine, isRoot);
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	    if ( widthBytesLine != widthBytesLineProto ) {
-		char *linePtr = pBuf;
-		for(i = 0; i < nlines; i++, linePtr += widthBytesLine) {
-		    (void)WriteToClient(client, widthBytesLineProto, linePtr);
-		}
-	    } else
-#endif
 		(void)WriteToClient(client,
 				    (int)(nlines * widthBytesLine),
 				    pBuf);
@@ -1840,15 +1892,7 @@
 					nlines, format, plane, pBuf,
 					widthBytesLine, isRoot);
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	    if ( widthBytesLine != widthBytesLineProto ) {
-		char *linePtr = pBuf;
-		for(i = 0; i < nlines; i++, linePtr += widthBytesLine) {
-		    (void)WriteToClient(client, widthBytesLineProto, linePtr);
-		}
-	    } else
-#endif
-		(void)WriteToClient(client,
+		    (void)WriteToClient(client,
 				    (int)(nlines * widthBytesLine),
 				    pBuf);
 
Index: xc/programs/Xserver/Xext/panoramiXsrv.h
diff -u xc/programs/Xserver/Xext/panoramiXsrv.h:1.5 xc/programs/Xserver/Xext/panoramiXsrv.h:1.6
--- xc/programs/Xserver/Xext/panoramiXsrv.h:1.5	Fri Mar  3 14:17:37 2000
+++ xc/programs/Xserver/Xext/panoramiXsrv.h	Thu Mar 30 10:20:35 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.5 2000/03/03 22:17:37 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.6 2000/03/30 18:20:35 mvojkovi Exp $ */
 
 #ifndef _PANORAMIXSRV_H_
 #define _PANORAMIXSRV_H_
@@ -16,6 +16,7 @@
 extern PanoramiXRes * PanoramiXFindIDOnAnyScreen(RESTYPE, XID);
 extern WindowPtr PanoramiXChangeWindow(int, WindowPtr);
 extern Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
+extern int XineramaDeleteResource(pointer, XID);
 
 extern RegionRec XineramaScreenRegions[MAXSCREENS];
 
Index: xc/programs/Xserver/Xext/saver.c
diff -u xc/programs/Xserver/Xext/saver.c:3.2 xc/programs/Xserver/Xext/saver.c:3.3
--- xc/programs/Xserver/Xext/saver.c:3.2	Mon Jun 10 02:11:17 1996
+++ xc/programs/Xserver/Xext/saver.c	Wed Apr  5 11:13:29 2000
@@ -1,6 +1,6 @@
 /*
  * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
- * $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.2 1996/06/10 09:11:17 dawes Exp $
+ * $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.3 2000/04/05 18:13:29 dawes Exp $
  *
 Copyright (c) 1992  X Consortium
 
@@ -30,7 +30,6 @@
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <stdio.h>
 #include "X.h"
 #include "Xproto.h"
 #include "misc.h"
@@ -46,6 +45,12 @@
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
+
+#ifdef IN_MODULE
+#include <xf86_ansic.h>
+#else
+#include <stdio.h>
+#endif
 
 static unsigned char ScreenSaverReqCode = 0;
 static int ScreenSaverEventBase = 0;
Index: xc/programs/Xserver/Xext/shm.c
diff -u xc/programs/Xserver/Xext/shm.c:3.21 xc/programs/Xserver/Xext/shm.c:3.26
--- xc/programs/Xserver/Xext/shm.c:3.21	Sun Mar  5 08:59:01 2000
+++ xc/programs/Xserver/Xext/shm.c	Thu Apr 27 09:26:44 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.21 2000/03/05 16:59:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.26 2000/04/27 16:26:44 eich Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
@@ -92,6 +92,8 @@
 #endif
     );
 
+static Bool ShmDestroyPixmap (PixmapPtr pPixmap);
+
 static DISPATCH_PROC(ProcShmAttach);
 static DISPATCH_PROC(ProcShmCreatePixmap);
 static DISPATCH_PROC(ProcShmDetach);
@@ -112,12 +114,16 @@
 static unsigned char ShmReqCode;
 int ShmCompletionCode;
 int BadShmSegCode;
-RESTYPE ShmSegType, ShmPixType;
+RESTYPE ShmSegType;
 static ShmDescPtr Shmsegs;
 static Bool sharedPixmaps;
 static int pixmapFormat;
 static int shmPixFormat[MAXSCREENS];
 static ShmFuncsPtr shmFuncs[MAXSCREENS];
+static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
+#ifdef PIXPRIV
+static int  shmPixmapPrivate;
+#endif
 static ShmFuncs miFuncs = {NULL, miShmPutImage};
 static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
 
@@ -200,7 +206,6 @@
 
     sharedPixmaps = xFalse;
     pixmapFormat = 0;
-#ifndef INTERNAL_VS_EXTERNAL_PADDING
     {
       sharedPixmaps = xTrue;
       pixmapFormat = shmPixFormat[0];
@@ -218,11 +223,26 @@
       }
       if (!pixmapFormat)
 	pixmapFormat = ZPixmap;
-    }
+      if (sharedPixmaps)
+      {
+	for (i = 0; i < screenInfo.numScreens; i++)
+	{
+	    destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap;
+	    screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;
+	}
+#ifdef PIXPRIV
+	shmPixmapPrivate = AllocatePixmapPrivateIndex();
+	for (i = 0; i < screenInfo.numScreens; i++)
+	{
+	    if (!AllocatePixmapPrivate(screenInfo.screens[i],
+				       shmPixmapPrivate, 0))
+		return;
+	}
 #endif
+      }
+    }
     ShmSegType = CreateNewResourceType(ShmDetachSegment);
-    ShmPixType = CreateNewResourceType(ShmDetachSegment);
-    if (ShmSegType && ShmPixType &&
+    if (ShmSegType &&
 	(extEntry = AddExtension(SHMNAME, ShmNumberEvents, ShmNumberErrors,
 				 ProcShmDispatch, SProcShmDispatch,
 				 ShmResetProc, StandardMinorOpcode)))
@@ -264,6 +284,41 @@
     shmPixFormat[pScreen->myNum] = format;
 }
 
+static Bool
+ShmDestroyPixmap (PixmapPtr pPixmap)
+{
+    ScreenPtr	    pScreen = pPixmap->drawable.pScreen;
+    Bool	    ret;
+    if (pPixmap->refcnt == 1)
+    {
+	ShmDescPtr  shmdesc;
+#ifdef PIXPRIV
+	shmdesc = (ShmDescPtr) pPixmap->devPrivates[shmPixmapPrivate].ptr;
+#else
+	char	*base = (char *) pPixmap->devPrivate.ptr;
+	
+	if (base != (pointer) (pPixmap + 1))
+	{
+	    for (shmdesc = Shmsegs; shmdesc; shmdesc = shmdesc->next)
+	    {
+		if (shmdesc->addr <= base && base <= shmdesc->addr + shmdesc->size)
+		    break;
+	    }
+	}
+	else
+	    shmdesc = 0;
+#endif
+	if (shmdesc)
+	    ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id);
+    }
+    
+    pScreen->DestroyPixmap = destroyPixmap[pScreen->myNum];
+    ret = (*pScreen->DestroyPixmap) (pPixmap);
+    destroyPixmap[pScreen->myNum] = pScreen->DestroyPixmap;
+    pScreen->DestroyPixmap = ShmDestroyPixmap;
+    return ret;
+}
+
 void
 ShmRegisterFbFuncs(pScreen)
     ScreenPtr pScreen;
@@ -497,13 +552,6 @@
     Mask		plane, planemask;
     long		lenPer, length, widthBytesLine;
     Bool		isRoot;
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    long                widthBytesLineProto;
-    long                lenPerProto,lengthProto;
-    char                *tmpImage;
-    int                 tmpAlloced = 0;
-#endif
-
 
     REQUEST(xShmGetImageReq);
 
@@ -567,106 +615,30 @@
     if(format == ZPixmap) {
 	widthBytesLine = PixmapBytePad(w, pDraw->depth);
 	length = widthBytesLine * h;
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	widthBytesLineProto =  PixmapBytePadProto(w, pDraw->depth);
-	lengthProto = widthBytesLineProto * h;
-#endif
     } else {
 	widthBytesLine = PixmapBytePad(w, 1);
 	lenPer = widthBytesLine * h;
 	plane = ((Mask)1) << (pDraw->depth - 1);
 	length = lenPer * Ones(planemask & (plane | (plane - 1)));
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	widthBytesLineProto = PixmapBytePadProto(w, 1);
-	lenPerProto = widthBytesLineProto * h;
-	lengthProto = (length / lenPer) * lenPerProto;
-#endif
     }
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    VERIFY_SHMSIZE(shmdesc, stuff->offset, lengthProto, client);
-    xgi.size = lengthProto;
-#else
     VERIFY_SHMSIZE(shmdesc, stuff->offset, length, client);
     xgi.size = length;
-#endif
 
     if (length == 0) {/* nothing to do */ }
     else if (format == ZPixmap) {
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-        /* check for protocol/server padding differences.
-	 */
-        if ((widthBytesLine != widthBytesLineProto) ||
-	    ((unsigned long)shmdesc->addr + stuff->offset & (sizeof(long)-1))) 
-	{
-	    /* temp stuff for 64 bit alignment stuff */
-	    char * bufPtr, * protoPtr;
-	    int i;
-
-	    if(!(tmpImage = (char *) xalloc(length))) 
-	      return (BadAlloc);
-	    tmpAlloced = 1;
-	    
-	    XineramaGetImageData(drawables, x, y, w, h, format, planemask,
-					 tmpImage, widthBytesLine, isRoot);
-	    
-	    
-	    /* for 64-bit server, convert image to pad to 32 bits */
-	    bzero(shmdesc->addr + stuff->offset,lengthProto);
-	    
-	    for (i=0,bufPtr=tmpImage,protoPtr=shmdesc->addr + stuff->offset; 
-		 i < h;
-		 bufPtr += widthBytesLine,protoPtr += widthBytesLineProto, 
-		 i++)
-		memmove(protoPtr,bufPtr,widthBytesLineProto);
-	} else 
-#endif
 	    XineramaGetImageData(drawables, x, y, w, h, format, planemask,
 					shmdesc->addr + stuff->offset,
 					widthBytesLine, isRoot);
     } else {
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	/* check for protocol/server padding differences.
-	 */
-	if ((widthBytesLine != widthBytesLineProto) ||
-	    ((unsigned long)shmdesc->addr + stuff->offset & 
-	     (sizeof(long)-1))) 
-	{
-	    if(!(tmpImage = (char *) xalloc(length)))
-	      return (BadAlloc);
-	    tmpAlloced = 1;
-	}
-#endif
 
 	length = stuff->offset;
         for (; plane; plane >>= 1) {
 	    if (planemask & plane) {
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-		if ((widthBytesLine != widthBytesLineProto) ||
-		    ((unsigned long)shmdesc->addr + stuff->offset & 
-		     (sizeof(long)-1))) 
-		{
-		    /* get image for each plane. */
-
-		    XineramaGetImageData(drawables, x, y, w, h,
-					format, plane, tmpImage,
-					widthBytesLine, isRoot);
-
-		    
-		    /* for 64-bit server, convert image to pad to 32 bits */
-		    bzero(shmdesc->addr+length, widthBytesLine);
-		    memmove(shmdesc->addr+length, tmpImage, 
-							widthBytesLineProto);
-		    /* increment length */
-		    length += lenPerProto;
-		} else /* no diff between protocol and server */
-#endif
-		{
-		    XineramaGetImageData(drawables, x, y, w, h, 
-					format, plane, shmdesc->addr + length,
-					widthBytesLine, isRoot);
-		    length += lenPer;
-		}
+		XineramaGetImageData(drawables, x, y, w, h, 
+				     format, plane, shmdesc->addr + length,
+				     widthBytesLine, isRoot);
+		length += lenPer;
 	    }
 	}
     }
@@ -680,11 +652,6 @@
     }
     WriteToClient(client, sizeof(xShmGetImageReply), (char *)&xgi);
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    if (tmpAlloced)
-	xfree(tmpImage);
-#endif
-
     return(client->noClientException);
 }
 
@@ -746,6 +713,10 @@
 				shmdesc->addr + stuff->offset);
 
 	if (pMap) {
+#ifdef PIXPRIV
+            pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
+#endif
+            shmdesc->refcnt++;
 	    pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
 	    pMap->drawable.id = newPix->info[j].id;
 	    if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) {
@@ -765,11 +736,8 @@
 	    FreeResource(newPix->info[j].id, RT_NONE);
 	}
 	xfree(newPix);
-    } else {
-	shmdesc->refcnt++;
-	AddResource(stuff->pid, ShmPixType, shmdesc);
+    } else 
 	AddResource(stuff->pid, XRT_PIXMAP, newPix);
-    }
 
     return result;
 }
@@ -783,11 +751,6 @@
     register GCPtr pGC;
     register DrawablePtr pDraw;
     long length;
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    long lengthProto;
-    char *tmpImage;
-    int  tmpAlloced = 0;
-#endif
     ShmDescPtr shmdesc;
     REQUEST(xShmPutImageReq);
 
@@ -801,9 +764,6 @@
         if (stuff->depth != 1)
             return BadMatch;
         length = PixmapBytePad(stuff->totalWidth, 1);
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-        lengthProto = PixmapBytePadProto(stuff->totalWidth, 1);
-#endif
     }
     else if (stuff->format == XYPixmap)
     {
@@ -811,19 +771,12 @@
             return BadMatch;
         length = PixmapBytePad(stuff->totalWidth, 1);
 	length *= stuff->depth;
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-        lengthProto = PixmapBytePadProto(stuff->totalWidth, 1);
-	lengthProto *= stuff->depth;
-#endif
     }
     else if (stuff->format == ZPixmap)
     {
         if (pDraw->depth != stuff->depth)
             return BadMatch;
         length = PixmapBytePad(stuff->totalWidth, stuff->depth);
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-        lengthProto = PixmapBytePadProto(stuff->totalWidth, stuff->depth);
-#endif
     }
     else
     {
@@ -831,13 +784,8 @@
         return BadValue;
     }
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    VERIFY_SHMSIZE(shmdesc, stuff->offset, lengthProto * stuff->totalHeight,
-		   client);
-#else
     VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight,
 		   client);
-#endif
     if (stuff->srcX > stuff->totalWidth)
     {
 	client->errorValue = stuff->srcX;
@@ -859,62 +807,6 @@
 	return BadValue;
     }
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    /* handle 64 bit case where protocol may pad to 32 and we want 64 
-     * In this case, length is what the server wants and lengthProto is
-     * what the protocol thinks it is.  If the the two are different,
-     * copy the protocol version (i.e. the memory shared between the 
-     * server and the client) to a version with a scanline pad of 64.
-     */
-    if (length != lengthProto) 
-    {
-	register int 	i;
-	char 		* stuffptr, /* pointer into protocol data */
-			* tmpptr;   /* new location to copy to */
-
-        if(!(tmpImage = (char *) ALLOCATE_LOCAL(length*stuff->totalHeight)))
-            return (BadAlloc);
-	tmpAlloced = 1;
-    
-	bzero(tmpImage,length*stuff->totalHeight);
-    
-	if (stuff->format == XYPixmap) 
-	{
-	    int lineBytes =  PixmapBytePad(stuff->totalWidth, 1);
-	    int lineBytesProto = PixmapBytePadProto(stuff->totalWidth, 1);
-	    int depth = stuff->depth;
-
-	    stuffptr = shmdesc->addr + stuff->offset ;
-	    tmpptr = tmpImage;
-	    for (i = 0; i < stuff->totalHeight*stuff->depth;
-		 stuffptr += lineBytesProto,tmpptr += lineBytes, i++) 
-	        memmove(tmpptr,stuffptr,lineBytesProto);
-	}
-	else 
-	{
-	    for (i = 0,
-		 stuffptr = shmdesc->addr + stuff->offset,
-		 tmpptr=tmpImage;
-		 i < stuff->totalHeight;
-		 stuffptr += lengthProto,tmpptr += length, i++) 
-	        memmove(tmpptr,stuffptr,lengthProto);
-	}
-    }
-    /* handle 64-bit case where stuff is not 64-bit aligned 
-     */
-    else if ((unsigned long)(shmdesc->addr+stuff->offset) & 
-	     (sizeof(long)-1)) 
-    {
-        if(!(tmpImage = (char *) ALLOCATE_LOCAL(length*stuff->totalHeight)))
-            return (BadAlloc);
-	tmpAlloced = 1;
-	memmove(tmpImage,(char *)(shmdesc->addr+stuff->offset),
-	      length*stuff->totalHeight);
-    }
-    else
-	tmpImage = (char *)(shmdesc->addr+stuff->offset);
-#endif
-
     if ((((stuff->format == ZPixmap) && (stuff->srcX == 0)) ||
 	 ((stuff->format != ZPixmap) &&
 	  (stuff->srcX < screenInfo.bitmapScanlinePad) &&
@@ -926,11 +818,7 @@
 			       stuff->dstX, stuff->dstY,
 			       stuff->totalWidth, stuff->srcHeight, 
 			       stuff->srcX, stuff->format, 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-			       tmpImage +
-#else
 			       shmdesc->addr + stuff->offset +
-#endif
 			       (stuff->srcY * length));
     else
 	(*shmFuncs[pDraw->pScreen->myNum]->PutImage)(
@@ -939,12 +827,7 @@
 			       stuff->srcX, stuff->srcY,
 			       stuff->srcWidth, stuff->srcHeight,
 			       stuff->dstX, stuff->dstY,
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-			       tmpImage);
-    
-#else
                                shmdesc->addr + stuff->offset);
-#endif
 
     if (stuff->sendEvent)
     {
@@ -959,13 +842,8 @@
 	ev.offset = stuff->offset;
 	WriteEventsToClient(client, 1, (xEvent *) &ev);
     }
-
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    if (tmpAlloced)
-        DEALLOCATE_LOCAL(tmpImage);
-#endif
 
-     return (client->noClientException);
+    return (client->noClientException);
 }
 
 
@@ -980,12 +858,6 @@
     xShmGetImageReply	xgi;
     ShmDescPtr		shmdesc;
     int			n;
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    long		widthBytesLine,widthBytesLineProto;
-    long 		lenPerProto,lengthProto;
-    char 		*tmpImage;
-    int  		tmpAlloced = 0;
-#endif
 
     REQUEST(xShmGetImageReq);
 
@@ -1033,43 +905,18 @@
     xgi.depth = pDraw->depth;
     if(stuff->format == ZPixmap)
     {
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	widthBytesLine = PixmapBytePad(stuff->width, pDraw->depth);
-	length = widthBytesLine * stuff->height;
-	widthBytesLineProto =  PixmapBytePadProto(stuff->width, pDraw->depth);
-	lengthProto = widthBytesLineProto * stuff->height;
-#else
 	length = PixmapBytePad(stuff->width, pDraw->depth) * stuff->height;
-#endif
     }
     else 
     {
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	widthBytesLine = PixmapBytePad(stuff->width, 1);
-	lenPer = widthBytesLine * stuff->height;
-	plane = ((Mask)1) << (pDraw->depth - 1);
-	/* only planes asked for */
-	length = lenPer * Ones(stuff->planeMask & (plane | (plane - 1)));
-
-	widthBytesLineProto = PixmapBytePadProto(stuff->width, 1);
-	lenPerProto = widthBytesLineProto * stuff->height;
-	lengthProto = lenPerProto * Ones(stuff->planeMask & 
-					 (plane | (plane - 1)));
-#else
 	lenPer = PixmapBytePad(stuff->width, 1) * stuff->height;
 	plane = ((Mask)1) << (pDraw->depth - 1);
 	/* only planes asked for */
 	length = lenPer * Ones(stuff->planeMask & (plane | (plane - 1)));
-#endif
     }
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    VERIFY_SHMSIZE(shmdesc, stuff->offset, lengthProto, client);
-    xgi.size = lengthProto;
-#else
     VERIFY_SHMSIZE(shmdesc, stuff->offset, length, client);
     xgi.size = length;
-#endif
 
     if (length == 0)
     {
@@ -1077,105 +924,25 @@
     }
     else if (stuff->format == ZPixmap)
     {
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-        /* check for protocol/server padding differences.
-	 */
-        if ((widthBytesLine != widthBytesLineProto) ||
-	    ((unsigned long)shmdesc->addr + stuff->offset & (sizeof(long)-1))) 
-	{
-	    /* temp stuff for 64 bit alignment stuff */
-	    register char * bufPtr, * protoPtr;
-	    register int i;
-
-	    if(!(tmpImage = (char *) ALLOCATE_LOCAL(length))) 
-	      return (BadAlloc);
-	    tmpAlloced = 1;
-	    
-	    (*pDraw->pScreen->GetImage)(pDraw, stuff->x, stuff->y,
-					stuff->width, stuff->height,
-					stuff->format, stuff->planeMask,
-					tmpImage);
-	    
-	    /* for 64-bit server, convert image to pad to 32 bits 
-	     */
-	    bzero(shmdesc->addr + stuff->offset,lengthProto);
-	    
-	    for (i=0,bufPtr=tmpImage,protoPtr=shmdesc->addr + stuff->offset; 
-		 i < stuff->height;
-		 bufPtr += widthBytesLine,protoPtr += widthBytesLineProto, 
-		 i++)
-		memmove(protoPtr,bufPtr,widthBytesLineProto);
-	}
-	else 
-	{
-	    (*pDraw->pScreen->GetImage)(pDraw, stuff->x, stuff->y,
-					stuff->width, stuff->height,
-					stuff->format, stuff->planeMask,
-					shmdesc->addr + stuff->offset);
-	}
-#else
 	(*pDraw->pScreen->GetImage)(pDraw, stuff->x, stuff->y,
 				    stuff->width, stuff->height,
 				    stuff->format, stuff->planeMask,
 				    shmdesc->addr + stuff->offset);
-#endif
     }
     else
     {
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-	/* check for protocol/server padding differences.
-	 */
-	if ((widthBytesLine != widthBytesLineProto) ||
-	    ((unsigned long)shmdesc->addr + stuff->offset & 
-	     (sizeof(long)-1))) 
-	{
-	    if(!(tmpImage = (char *) ALLOCATE_LOCAL(length)))
-	      return (BadAlloc);
-	    tmpAlloced = 1;
-	}
-#endif
 
 	length = stuff->offset;
         for (; plane; plane >>= 1)
 	{
 	    if (stuff->planeMask & plane)
 	    {
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-		if ((widthBytesLine != widthBytesLineProto) ||
-		    ((unsigned long)shmdesc->addr + stuff->offset & 
-		     (sizeof(long)-1))) 
-		{
-		    /* get image for each plane. 
-		     */
-		    (*pDraw->pScreen->GetImage)(pDraw,
-						stuff->x, stuff->y,
-						stuff->width, stuff->height,
-						stuff->format, plane,
-						tmpImage);
-		    
-		    /* for 64-bit server, convert image to pad to 32 bits */
-		    bzero(shmdesc->addr+length, widthBytesLine);
-		    memmove(shmdesc->addr+length, tmpImage, widthBytesLineProto);
-		    /* increment length */
-		    length += lenPerProto;
-		}
-		else /* no diff between protocol and server */
-		{
-		    (*pDraw->pScreen->GetImage)(pDraw,
-						stuff->x, stuff->y,
-						stuff->width, stuff->height,
-						stuff->format, plane,
-						shmdesc->addr + length);
-		    length += lenPer;
-		}
-#else
 		(*pDraw->pScreen->GetImage)(pDraw,
 					    stuff->x, stuff->y,
 					    stuff->width, stuff->height,
 					    stuff->format, plane,
 					    shmdesc->addr + length);
 		length += lenPer;
-#endif
 	    }
 	}
     }
@@ -1188,11 +955,6 @@
     }
     WriteToClient(client, sizeof(xShmGetImageReply), (char *)&xgi);
 
-#ifdef INTERNAL_VS_EXTERNAL_PADDING
-    if (tmpAlloced)
-	DEALLOCATE_LOCAL(tmpImage);
-#endif
-
     return(client->noClientException);
 }
 
@@ -1260,14 +1022,15 @@
 			    shmdesc->addr + stuff->offset);
     if (pMap)
     {
+#ifdef PIXPRIV
+	pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
+#endif
+	shmdesc->refcnt++;
 	pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
 	pMap->drawable.id = stuff->pid;
 	if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
 	{
-	    shmdesc->refcnt++;
-	    if (AddResource(stuff->pid, ShmPixType, (pointer)shmdesc))
-		return(client->noClientException);
-	    FreeResource(stuff->pid, RT_NONE);
+	    return(client->noClientException);
 	}
     }
     return (BadAlloc);
Index: xc/programs/Xserver/Xext/xf86bigfont.c
diff -u xc/programs/Xserver/Xext/xf86bigfont.c:1.5 xc/programs/Xserver/Xext/xf86bigfont.c:1.9
--- xc/programs/Xserver/Xext/xf86bigfont.c:1.5	Mon Feb 28 19:09:07 2000
+++ xc/programs/Xserver/Xext/xf86bigfont.c	Thu Jun 22 09:59:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.5 2000/02/29 03:09:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.9 2000/06/22 16:59:25 tsi Exp $ */
 /*
  * BIGFONT extension for sharing font metrics between clients (if possible)
  * and for transmitting font metrics to clients in a compressed form.
@@ -37,9 +37,6 @@
 
 #include <sys/types.h>
 #ifdef HAS_SHM
-#ifdef CSRG_BASED
-#include <sys/param.h>
-#endif
 #if defined(linux) && !defined(__GNU_LIBRARY__)
 /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
    Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
@@ -57,6 +54,7 @@
 #include <sys/shm.h>
 #include <sys/stat.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <time.h>
 #include <errno.h>
 #endif
@@ -165,8 +163,16 @@
 
 	FontShmdescIndex = AllocateFontPrivateIndex();
 
+#if !defined(CSRG_BASED)
 	pagesize = SHMLBA;
+#else
+# ifdef _SC_PAGESIZE
+	pagesize = sysconf(_SC_PAGESIZE);
+# else
+	pagesize = getpagesize();
+# endif
 #endif
+#endif
     }
 }
 
@@ -204,6 +210,15 @@
 	return (ShmDescPtr) NULL;
 #endif
 
+    /* On some older Linux systems, the number of shared memory segments
+       system-wide is 127. In Linux 2.4, it is 4095.
+       Therefore there is a tradeoff to be made between allocating a
+       shared memory segment on one hand, and allocating memory and piping
+       the glyph metrics on the other hand. If the glyph metrics size is
+       small, we prefer the traditional way. */
+    if (size < 3500)
+	return (ShmDescPtr) NULL;
+
     pDesc = (ShmDescRec *) xalloc(sizeof(ShmDescRec));
     if (!pDesc)
 	return (ShmDescPtr) NULL;
@@ -318,7 +333,11 @@
     reply.minorVersion = XF86BIGFONT_MINOR_VERSION;
     reply.uid = geteuid();
     reply.gid = getegid();
+#ifdef HAS_SHM
     reply.signature = signature;
+#else
+    reply.signature = 0; /* This is redundant. Avoids uninitialized memory. */
+#endif
     reply.capabilities =
 #ifdef HAS_SHM
 	(LocalClient(client) && !client->swapped ? XF86Bigfont_CAP_LocalShm : 0)
Index: xc/programs/Xserver/Xext/xf86dga.c
diff -u xc/programs/Xserver/Xext/xf86dga.c:3.19 xc/programs/Xserver/Xext/xf86dga.c:3.21
--- xc/programs/Xserver/Xext/xf86dga.c:3.19	Sun Aug  1 00:56:59 1999
+++ xc/programs/Xserver/Xext/xf86dga.c	Fri Jun 30 12:06:54 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.19 1999/08/01 07:56:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.21 2000/06/30 19:06:54 keithp Exp $ */
 
 /*
 
@@ -100,6 +100,10 @@
     if(Success != DGASetMode(stuff->screen, num, &mode, &pix))
 	return (DGAErrorBase + XF86DGAScreenNotActive);
 
+    DGASetInputMode (stuff->screen, 
+		     (stuff->enable & XF86DGADirectKeyb) != 0,
+		     (stuff->enable & XF86DGADirectMouse) != 0);
+
     return (client->noClientException);
 }
 
@@ -145,7 +149,16 @@
     REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq);
 
     if (!DGAActive(stuff->screen))
-	return (DGAErrorBase + XF86DGADirectNotActivated);
+    {
+	int num;
+	PixmapPtr pix;
+	XDGAModeRec mode;
+	
+	if(!(num = DGAGetOldDGAMode(stuff->screen)))
+	    return (DGAErrorBase + XF86DGANoDirectVideoMode);
+	if(Success != DGASetMode(stuff->screen, num, &mode, &pix))
+	    return (DGAErrorBase + XF86DGAScreenNotActive);
+    }
 
     if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE)
 		!= Success)
Index: xc/programs/Xserver/Xext/xf86dga2.c
diff -u xc/programs/Xserver/Xext/xf86dga2.c:1.14 xc/programs/Xserver/Xext/xf86dga2.c:1.16
--- xc/programs/Xserver/Xext/xf86dga2.c:1.14	Wed Oct 13 15:32:47 1999
+++ xc/programs/Xserver/Xext/xf86dga2.c	Fri Jun 30 12:06:54 2000
@@ -3,7 +3,7 @@
 
    Written by Mark Vojkovich
 */
-/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.14 1999/10/13 22:32:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.16 2000/06/30 19:06:54 keithp Exp $ */
 
 
 #define NEED_REPLIES
@@ -218,8 +218,12 @@
     rep.number = 0;
     rep.sequenceNumber = client->sequence;
 
-    if (!DGAAvailable(stuff->screen)) 
-        return DGAErrorBase + XF86DGANoDirectVideoMode;
+    if (!DGAAvailable(stuff->screen)) {
+	rep.number = 0;
+	rep.length = 0;
+	WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
+	return (client->noClientException);
+    }
 
     if(!(num = DGAGetModes(stuff->screen))) {
 	WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
@@ -665,6 +669,42 @@
    return DGAErrorBase + XF86DGAClientNotLocal;
 }
 
+#if 0
+#define DGA_REQ_DEBUG
+#endif
+
+#ifdef DGA_REQ_DEBUG
+static char *dgaMinor[] = {
+    "QueryVersion",
+    "GetVideoLL",
+    "DirectVideo",
+    "GetViewPortSize",
+    "SetViewPort",
+    "GetVidPage",
+    "SetVidPage",
+    "InstallColormap",
+    "QueryDirectVideo",
+    "ViewPortChanged",
+    "10",
+    "11",
+    "QueryModes",
+    "SetMode",
+    "SetViewport",
+    "InstallColormap",
+    "SelectInput",
+    "FillRectangle",
+    "CopyArea",
+    "CopyTransparentArea",
+    "GetViewportStatus",
+    "Sync",
+    "OpenFramebuffer",
+    "CloseFramebuffer",
+    "SetClientVersion",
+    "ChangePixmapMode",
+    "CreateColormap",
+};
+#endif
+
 static int
 ProcXDGADispatch (ClientPtr client)
 {
@@ -673,6 +713,11 @@
     if (!LocalClient(client))
 	return DGAErrorBase + XF86DGAClientNotLocal;
 
+#ifdef DGA_REQ_DEBUG
+    if (stuff->data <= X_XDGACreateColormap)
+	fprintf (stderr, "    DGA %s\n", dgaMinor[stuff->data]);
+#endif
+    
     /* divert old protocol */
 #if 1
     if( (stuff->data <= X_XF86DGAViewPortChanged) && 
Index: xc/programs/Xserver/Xext/xf86misc.c
diff -u xc/programs/Xserver/Xext/xf86misc.c:3.31 xc/programs/Xserver/Xext/xf86misc.c:3.33
--- xc/programs/Xserver/Xext/xf86misc.c:3.31	Sat Jul 10 05:17:15 1999
+++ xc/programs/Xserver/Xext/xf86misc.c	Tue May  2 17:43:42 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86misc.c,v 3.31 1999/07/10 12:17:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86misc.c,v 3.33 2000/05/03 00:43:42 tsi Exp $ */
 
 /*
  * Copyright (c) 1995, 1996  The XFree86 Project, Inc
@@ -24,6 +24,7 @@
 #include "Xfuncproto.h"
 #include "xf86miscproc.h"
 
+#if 0
 #include <X11/Xtrans.h>
 #include "../os/osdep.h"
 #include <X11/Xauth.h>
@@ -38,6 +39,7 @@
 #include <lan/socket.h>
 #endif
 #endif /* USL */
+#endif
 
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
@@ -74,7 +76,6 @@
 
 static unsigned char XF86MiscReqCode = 0;
 
-#define DEBUG
 #ifdef DEBUG
 # define DEBUG_P(x) ErrorF(x"\n");
 #else
@@ -249,6 +250,8 @@
     	swapl(&rep.flags, n);
     }
     WriteToClient(client, SIZEOF(xXF86MiscGetMouseSettingsReply), (char *)&rep);
+    MiscExtDestroyStruct(mouse, MISC_POINTER);
+    
     if (rep.devnamelen)
         WriteToClient(client, rep.devnamelen, devname);
     return (client->noClientException);
@@ -321,13 +324,14 @@
     MiscExtSetMouseValue(mouse, MISC_MSE_FLAGS,		stuff->flags);
 
     switch ((ret = MiscExtApply(mouse, MISC_POINTER))) {
-	case MISC_RET_SUCCESS:      break;
+        case MISC_RET_SUCCESS:      break;
 	case MISC_RET_BADVAL:       return BadValue;
 	case MISC_RET_BADMSEPROTO:  return MISCERR(XF86MiscBadMouseProtocol);
 	case MISC_RET_BADBAUDRATE:  return MISCERR(XF86MiscBadMouseBaudRate);
 	case MISC_RET_BADFLAGS:     return MISCERR(XF86MiscBadMouseFlags);
-	case MISC_RET_BADCOMBO:     return MISCERR(XF86MiscBadMouseCombo);
-	default:
+        case MISC_RET_BADCOMBO:     return MISCERR(XF86MiscBadMouseCombo);
+        case MISC_RET_NOMODULE:     return MISCERR(XF86MiscNoModule);
+        default:
 	    ErrorF("Unexpected return from MiscExtApply(POINTER) = %d\n", ret);
 	    return BadImplementation;
     }
Index: xc/programs/Xserver/Xext/xf86miscproc.h
diff -u xc/programs/Xserver/Xext/xf86miscproc.h:1.1 xc/programs/Xserver/Xext/xf86miscproc.h:1.2
--- xc/programs/Xserver/Xext/xf86miscproc.h:1.1	Sat Jul 10 05:17:15 1999
+++ xc/programs/Xserver/Xext/xf86miscproc.h	Mon Apr 17 09:29:48 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.1 1999/07/10 12:17:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.2 2000/04/17 16:29:48 eich Exp $ */
 
 /* Prototypes for Pointer/Keyboard functions that the DDX must provide */
 
@@ -31,7 +31,8 @@
     MISC_RET_BADBAUDRATE,
     MISC_RET_BADFLAGS,
     MISC_RET_BADCOMBO,
-    MISC_RET_BADKBDTYPE
+    MISC_RET_BADKBDTYPE,
+    MISC_RET_NOMODULE
 } MiscExtReturn;
 
 typedef enum {
Index: xc/programs/Xserver/Xext/xvdisp.c
diff -u xc/programs/Xserver/Xext/xvdisp.c:1.10 xc/programs/Xserver/Xext/xvdisp.c:1.15
--- xc/programs/Xserver/Xext/xvdisp.c:1.10	Tue Jan 18 17:12:18 2000
+++ xc/programs/Xserver/Xext/xvdisp.c	Sat Jun 10 15:00:26 2000
@@ -21,7 +21,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.10 2000/01/19 01:12:18 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.15 2000/06/10 22:00:26 mvojkovi Exp $ */
 
 /*
 ** File: 
@@ -68,6 +68,17 @@
 #include "xf86_ansic.h"
 #endif
 
+#ifdef PANORAMIX
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
+
+XvAdaptorPtr XineramaAdaptors[MAXSCREENS];
+static int XineramaXvShmPutImage(ClientPtr);
+static int XineramaXvPutImage(ClientPtr);
+static int XineramaXvSetPortAttribute(ClientPtr);
+static int XineramaXvStopVideo(ClientPtr);
+#endif
+
 /* INTERNAL */
 
 static int ProcXvQueryExtension(ClientPtr);
@@ -215,13 +226,37 @@
     case xv_UngrabPort: return(ProcXvUngrabPort(client));
     case xv_SelectVideoNotify: return(ProcXvSelectVideoNotify(client));
     case xv_SelectPortNotify: return(ProcXvSelectPortNotify(client));
-    case xv_StopVideo: return(ProcXvStopVideo(client));
-    case xv_SetPortAttribute: return(ProcXvSetPortAttribute(client));
+    case xv_StopVideo: 
+#ifdef PANORAMIX
+        if(!noPanoramiXExtension)
+	    return(XineramaXvStopVideo(client));
+	else
+#endif
+	    return(ProcXvStopVideo(client));
+    case xv_SetPortAttribute: 
+#ifdef PANORAMIX
+        if(!noPanoramiXExtension)
+	    return(XineramaXvSetPortAttribute(client));
+	else
+#endif
+	    return(ProcXvSetPortAttribute(client));
     case xv_GetPortAttribute: return(ProcXvGetPortAttribute(client));
     case xv_QueryBestSize: return(ProcXvQueryBestSize(client));
     case xv_QueryPortAttributes: return(ProcXvQueryPortAttributes(client));
-    case xv_PutImage: return(ProcXvPutImage(client));
-    case xv_ShmPutImage: return(ProcXvShmPutImage(client));
+    case xv_PutImage:
+#ifdef PANORAMIX
+        if(!noPanoramiXExtension)
+	    return(XineramaXvPutImage(client));
+	else
+#endif
+	    return(ProcXvPutImage(client));
+    case xv_ShmPutImage: 
+#ifdef PANORAMIX
+        if(!noPanoramiXExtension)
+	    return(XineramaXvShmPutImage(client));
+	else
+#endif
+	    return(ProcXvShmPutImage(client));
     case xv_QueryImageAttributes: return(ProcXvQueryImageAttributes(client));
     case xv_ListImageFormats: return(ProcXvListImageFormats(client));
     default:
@@ -292,6 +327,7 @@
 
   rep.type = X_Reply;
   rep.sequenceNumber = client->sequence;
+  rep.length = 0;
   rep.version = XvVersion;
   rep.revision = XvRevision;
 
@@ -819,7 +855,6 @@
       client->errorValue = stuff->value;
 
   return status;
-
 }
 
 static int
@@ -1136,6 +1171,7 @@
   return status;
 }
 
+
 static int 
 ProcXvQueryImageAttributes(ClientPtr client)
 {
@@ -1777,3 +1813,228 @@
 
   return Success;
 }
+
+
+#ifdef PANORAMIX
+
+
+static int
+XineramaXvStopVideo(ClientPtr client)
+{
+  int result, i, portoffset;
+  PanoramiXRes *draw;
+  XvPortPtr pPort;
+  REQUEST(xvStopVideoReq);
+  REQUEST_SIZE_MATCH(xvStopVideoReq);
+
+  if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+                client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
+        return BadDrawable;
+
+  portoffset = stuff->port - XineramaAdaptors[0]->base_id;
+
+  FOR_NSCREENS_BACKWARD(i) {
+     if(XineramaAdaptors[i]) {
+	stuff->drawable = draw->info[i].id;
+        stuff->port = XineramaAdaptors[i]->base_id + portoffset;
+	result = ProcXvStopVideo(client);
+     }
+  }
+
+  return result;
+}
+
+static int
+XineramaXvSetPortAttribute(ClientPtr client)
+{
+    REQUEST(xvSetPortAttributeReq);
+    int result, i, portoffset;
+
+    REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
+
+    portoffset = stuff->port - XineramaAdaptors[0]->base_id;
+
+    FOR_NSCREENS_BACKWARD(i) {
+	if(XineramaAdaptors[i]) {
+	   stuff->port = XineramaAdaptors[i]->base_id + portoffset;
+	   result = ProcXvSetPortAttribute(client);
+	}
+    }
+    return result;
+}
+
+
+static int 
+XineramaXvShmPutImage(ClientPtr client)
+{
+    REQUEST(xvShmPutImageReq);
+    PanoramiXRes *draw, *gc;
+    Bool send_event = stuff->send_event;
+    Bool isRoot;
+    int result, i, x, y, portoffset;
+
+    REQUEST_SIZE_MATCH(xvShmPutImageReq);
+
+    if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+                client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
+        return BadDrawable;
+
+    if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
+                client, stuff->gc, XRT_GC, SecurityReadAccess)))
+        return BadGC;    
+ 
+    isRoot = (draw->type == XRT_WINDOW) &&
+                (stuff->drawable == WindowTable[0]->drawable.id);
+
+    x = stuff->drw_x;
+    y = stuff->drw_y;
+
+    portoffset = stuff->port - XineramaAdaptors[0]->base_id;
+
+    FOR_NSCREENS_BACKWARD(i) {
+	if(XineramaAdaptors[i]) {
+	   stuff->drawable = draw->info[i].id;
+	   stuff->port = XineramaAdaptors[i]->base_id + portoffset;
+	   stuff->gc = gc->info[i].id;
+	   stuff->drw_x = x;
+	   stuff->drw_y = y;
+	   if(isRoot) {
+		stuff->drw_x -= panoramiXdataPtr[i].x;
+		stuff->drw_y -= panoramiXdataPtr[i].y;
+	   }
+	   stuff->send_event = (send_event && !i) ? 1 : 0;
+
+	   result = ProcXvShmPutImage(client);
+	   if(result != Success) break;
+	}
+    }
+    return result;
+}
+
+static int 
+XineramaXvPutImage(ClientPtr client)
+{
+    REQUEST(xvPutImageReq);
+    PanoramiXRes *draw, *gc;
+    Bool isRoot;
+    int result, i, x, y, portoffset;
+
+    REQUEST_AT_LEAST_SIZE(xvPutImageReq);
+
+    if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
+                client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
+        return BadDrawable;
+
+    if(!(gc = (PanoramiXRes *)SecurityLookupIDByType(
+                client, stuff->gc, XRT_GC, SecurityReadAccess)))
+        return BadGC;    
+ 
+    isRoot = (draw->type == XRT_WINDOW) &&
+                (stuff->drawable == WindowTable[0]->drawable.id);
+
+    x = stuff->drw_x;
+    y = stuff->drw_y;
+
+    portoffset = stuff->port - XineramaAdaptors[0]->base_id;
+
+    FOR_NSCREENS_BACKWARD(i) {
+	if(XineramaAdaptors[i]) {
+	   stuff->drawable = draw->info[i].id;
+	   stuff->port = XineramaAdaptors[i]->base_id + portoffset;
+	   stuff->gc = gc->info[i].id;
+	   stuff->drw_x = x;
+	   stuff->drw_y = y;
+	   if(isRoot) {
+		stuff->drw_x -= panoramiXdataPtr[i].x;
+		stuff->drw_y -= panoramiXdataPtr[i].y;
+	   }
+
+	   result = ProcXvPutImage(client);
+	   if(result != Success) break;
+	}
+    }
+    return result;
+}
+
+
+void XineramifyXv(void)
+{
+  ScreenPtr pScreen;
+  XvScreenPtr pxvs;
+  XvAdaptorPtr pAdapt, refAdapt;
+  XvImagePtr refImage;
+  int imageHeads = 0;
+  Bool match, blast;
+  int max_w = 0, max_h = 0;
+  int i, j, k, n;
+
+  /* find which heads can do images */
+  for(i = 0; i < PanoramiXNumScreens; i++) {
+     pScreen = screenInfo.screens[i];
+     XineramaAdaptors[i] = NULL;
+     pxvs = (XvScreenPtr)pScreen->devPrivates[XvScreenIndex].ptr;
+     if(pxvs) {
+        for(j = 0; j < pxvs->nAdaptors; j++) {
+           pAdapt = pxvs->pAdaptors + j;
+           if((pAdapt->type & XvImageMask) && (pAdapt->nImages > 0)) {
+              imageHeads++;
+              XineramaAdaptors[i] = pAdapt;
+              break;  /* assuming only one XvImage capable adaptor per head */
+           }
+        }
+     }
+  }
+
+  if(!imageHeads || !XineramaAdaptors[0]) return;
+
+  /* filter out image types not common on all */
+  refAdapt = XineramaAdaptors[0];
+
+  for(i = 0; i < refAdapt->nEncodings; i++) {
+      if(!strcmp(refAdapt->pEncodings[i].name, "XV_IMAGE")) {
+          max_w = refAdapt->pEncodings[i].width;
+          max_h = refAdapt->pEncodings[i].height;
+	  break;
+      }
+  }
+
+  for(i = 0; i < refAdapt->nImages; i++) {
+     refImage = refAdapt->pImages + i;
+
+     blast = FALSE;
+     for(j = 0; j < PanoramiXNumScreens; j++) {
+	match = FALSE;
+	if((pAdapt = XineramaAdaptors[j])) {
+           for(k = 0; k < pAdapt->nImages; k++) {
+               if(pAdapt->pImages[k].id == refImage->id) {
+                   match = TRUE;
+                   for(n = 0; n < pAdapt->nEncodings; n++) {
+                      if(!strcmp(pAdapt->pEncodings[n].name, "XV_IMAGE")) {
+                          if(max_w > pAdapt->pEncodings[n].width)
+                             max_w = pAdapt->pEncodings[n].width;
+                          if(max_h > pAdapt->pEncodings[n].height)
+                             max_h = pAdapt->pEncodings[n].height;
+                          break;
+                      }
+                   }
+                   break;
+               }
+           }
+	}
+	if(!match) {
+           blast = TRUE;
+           break;
+        }
+     }
+     if(blast) {
+        if(i < (refAdapt->nImages - 1))
+            memcpy(refAdapt->pImages + i, refAdapt->pImages + i + 1,
+                      (refAdapt->nImages - 1 - i) * sizeof(XvImageRec));
+        refAdapt->nImages--;
+     }
+  }
+
+  if(!refAdapt->nImages) /* no image formats in common between heads */
+     refAdapt->type &= ~XvImageMask;
+}
+#endif
Index: xc/programs/Xserver/Xext/xvmain.c
diff -u xc/programs/Xserver/Xext/xvmain.c:1.8 xc/programs/Xserver/Xext/xvmain.c:1.9
--- xc/programs/Xserver/Xext/xvmain.c:1.8	Tue Jan 18 08:35:40 2000
+++ xc/programs/Xserver/Xext/xvmain.c	Thu Mar 30 10:20:36 2000
@@ -21,7 +21,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.8 2000/01/18 16:35:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.9 2000/03/30 18:20:36 mvojkovi Exp $ */
 
 /*
 ** File: 
@@ -98,10 +98,16 @@
 #include "xf86_ansic.h"
 #endif
 
+#ifdef PANORAMIX
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
+extern void XineramifyXv(void);
+#endif
+
 int  XvScreenIndex = -1;
-unsigned long XvExtensionGeneration;
-unsigned long XvScreenGeneration;
-unsigned long XvResourceGeneration;
+unsigned long XvExtensionGeneration = 0;
+unsigned long XvScreenGeneration = 0;
+unsigned long XvResourceGeneration = 0;
 
 int XvReqCode;
 int XvEventBase;
@@ -125,8 +131,6 @@
 static void WriteSwappedPortNotifyEvent(xvEvent *, xvEvent *);
 static Bool CreateResourceTypes(void);
 
-static int lastScreenWithAdaptors = 0;
-
 static Bool XvCloseScreen(int, ScreenPtr);
 static Bool XvDestroyPixmap(PixmapPtr);
 static Bool XvDestroyWindow(WindowPtr);
@@ -151,12 +155,10 @@
 void 
 XvExtensionInit()
 {
-  int ii;
-  register ExtensionEntry *extEntry;
+  ExtensionEntry *extEntry;
 
   /* LOOK TO SEE IF ANY SCREENS WERE INITIALIZED; IF NOT THEN
      INIT GLOBAL VARIABLES SO THE EXTENSION CAN FUNCTION */
-
   if (XvScreenGeneration != serverGeneration)
     {
       if (!CreateResourceTypes())
@@ -170,22 +172,12 @@
 	  ErrorF("XvExtensionInit: Unable to allocate screen private index\n");
 	  return;
 	}
-
+#ifdef PANORAMIX
+        XineramaRegisterConnectionBlockCallback(XineramifyXv);
+#endif
       XvScreenGeneration = serverGeneration;
     }
 
-  /* ITS A LITTLE HARD TO UNDERSTAND WHAT THIS DOES, BUT ESSENTIALLY I WANT 
-     ALL SCREEN THAT HAVE ADAPTORS TO HAVE A VALID DEVPRIVATE POINTER AND ANY 
-     THAT DON'T TO HAVE NULL DEVPRIVATE POINTERS; THIS WAY I DON'T HAVE TO 
-     CALL A SPECIAL XV SCREEN INITIALIZE FOR SCREENS WITHOUT ADAPTORS; THERE
-     SHOULD BE AN EASIER WAY TO DO THIS, BUT main.c DOESN'T INITIALIZE THE 
-     DEVPRIVATE POINTERS FOR A NEWLY CREATED SCREEN, NOR ARE THEY INITIALIZED
-     WHEN A NEW SCREEN PRIVATE INDEX IS ALLOCATED */
-
-  for (ii=lastScreenWithAdaptors; ii<screenInfo.numScreens; ii++)
-    screenInfo.screens[ii]->devPrivates[XvScreenIndex].ptr = (pointer)NULL;
-  lastScreenWithAdaptors = screenInfo.numScreens;
-
   if (XvExtensionGeneration != serverGeneration)
     {
       XvExtensionGeneration = serverGeneration;
@@ -264,8 +256,6 @@
 int
 XvScreenInit(ScreenPtr pScreen)
 {
-
-  int ii;
   XvScreenPtr pxvs;
 
   if (XvScreenGeneration != serverGeneration)
@@ -281,21 +271,12 @@
 	  ErrorF("XvScreenInit: Unable to allocate screen private index\n");
 	  return BadAlloc;
 	}
+#ifdef PANORAMIX
+        XineramaRegisterConnectionBlockCallback(XineramifyXv);
+#endif
       XvScreenGeneration = serverGeneration; 
     }
 
-  /* ITS A LITTLE HARD TO UNDERSTAND WHAT THIS DOES, BUT ESSENTIALLY I WANT 
-     ALL SCREEN THAT HAVE ADAPTORS TO HAVE A VALID DEVPRIVATE POINTER AND ANY 
-     THAT DON'T TO HAVE NULL DEVPRIVATE POINTERS; THIS WAY I DON'T HAVE TO 
-     CALL A SPECIAL XV SCREEN INITIALIZE FOR SCREENS WITHOUT ADAPTORS; THERE
-     SHOULD BE AN EASIER WAY TO DO THIS, BUT main.c DOESN'T INITIALIZE THE 
-     DEVPRIVATE POINTERS FOR A NEWLY CREATED SCREEN, NOR ARE THEY INITIALIZED
-     WHEN A NEW SCREEN PRIVATE INDEX IS ALLOCATED */
-
-  for (ii=lastScreenWithAdaptors; ii<screenInfo.numScreens; ii++)
-    screenInfo.screens[ii]->devPrivates[XvScreenIndex].ptr = (pointer)NULL;
-  lastScreenWithAdaptors = screenInfo.numScreens;
-
   if (pScreen->devPrivates[XvScreenIndex].ptr)
     {
       ErrorF("XvScreenInit: screen devPrivates ptr non-NULL before init\n");
@@ -351,7 +332,6 @@
 static void
 XvResetProc(ExtensionEntry* extEntry)
 {
-  lastScreenWithAdaptors = 0;
 }
 
 int
Index: xc/programs/Xserver/dbe/Imakefile
diff -u xc/programs/Xserver/dbe/Imakefile:3.7 xc/programs/Xserver/dbe/Imakefile:3.9
--- xc/programs/Xserver/dbe/Imakefile:3.7	Sat Aug 14 03:49:27 1999
+++ xc/programs/Xserver/dbe/Imakefile	Thu Apr  6 07:47:46 2000
@@ -3,30 +3,34 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/dbe/Imakefile,v 3.7 1999/08/14 10:49:27 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/dbe/Imakefile,v 3.9 2000/04/06 14:47:46 dawes Exp $
 
-#define IHaveModules
+#if DoLoadableServer
+#define IHaveSubdirs
+#endif
+
 #include <Server.tmpl>
 
 #if DoLoadableServer
-      MSRCS = dbemodule.c
-      MOBJS = dbemodule.o
+    SUBDIRS = module
 #endif
 
-       SRCS = dbe.c midbe.c $(MSRCS)
-       OBJS = dbe.o midbe.o $(MOBJS)
-   INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(EXTRAINCLUDES)
+       SRCS = dbe.c midbe.c 
+       OBJS = dbe.o midbe.o 
+   INCLUDES = -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(EXTRAINCLUDES)
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
-ModuleObjectRule()
+NormalLibraryObjectRule()
 
-LibraryModuleTarget(dbe,$(OBJS))
+NormalLibraryTarget(dbe,$(OBJS))
 
 LintLibraryTarget(dbe,$(SRCS))
 NormalLintTarget($(SRCS))
 
-InstallLibraryModule(dbe,$(MODULEDIR),extensions)
+#if DoLoadableServer
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
 
 DependTarget()
 
-InstallDriverSDKLibraryModule(dbe,$(DRIVERSDKMODULEDIR),extensions)
Index: xc/programs/Xserver/dbe/midbe.c
diff -u xc/programs/Xserver/dbe/midbe.c:3.0 xc/programs/Xserver/dbe/midbe.c:3.2
--- xc/programs/Xserver/dbe/midbe.c:3.0	Fri Jan  5 05:17:38 1996
+++ xc/programs/Xserver/dbe/midbe.c	Thu Apr  6 07:47:46 2000
@@ -30,13 +30,13 @@
  *     Machine-independent DBE code
  *
  *****************************************************************************/
+/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.2 2000/04/06 14:47:46 dawes Exp $ */
 
 
 /* INCLUDES */
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <stdio.h>
 #include "X.h"
 #include "Xproto.h"
 #include "misc.h"
@@ -54,6 +54,11 @@
 #include "gcstruct.h"
 #include "inputstr.h"
 
+#ifndef IN_MODULE
+#include <stdio.h>
+#else
+#include "xf86_ansic.h"
+#endif
 
 /* DEFINES */
 
Index: xc/programs/Xserver/dbe/module/Imakefile
diff -u /dev/null xc/programs/Xserver/dbe/module/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:42:10 2000
+++ xc/programs/Xserver/dbe/module/Imakefile	Thu Apr  6 08:35:03 2000
@@ -0,0 +1,33 @@
+XCOMM $XConsortium: Imakefile /main/2 1996/09/28 17:06:40 rws $
+
+XCOMM $XFree86: xc/programs/Xserver/dbe/module/Imakefile,v 1.1 2000/04/06 15:35:03 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+#if DoLoadableServer
+      MSRCS = dbemodule.c
+      MOBJS = dbemodule.o
+#endif
+
+       SRCS = dbe.c midbe.c $(MSRCS)
+       OBJS = dbe.o midbe.o $(MOBJS)
+   INCLUDES = -I.. -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(EXTRAINCLUDES)
+   LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln
+
+LinkSourceFile(dbemodule.c,..)
+LinkSourceFile(midbe.c,..)
+LinkSourceFile(dbe.c,..)
+
+ModuleObjectRule()
+
+LibraryModuleTarget(dbe,$(OBJS))
+
+LintLibraryTarget(dbe,$(SRCS))
+NormalLintTarget($(SRCS))
+
+InstallLibraryModule(dbe,$(MODULEDIR),extensions)
+
+DependTarget()
+
+InstallDriverSDKLibraryModule(dbe,$(DRIVERSDKMODULEDIR),extensions)
Index: xc/programs/Xserver/dix/dispatch.c
diff -u xc/programs/Xserver/dix/dispatch.c:3.18 xc/programs/Xserver/dix/dispatch.c:3.19
--- xc/programs/Xserver/dix/dispatch.c:3.18	Fri Feb 11 19:39:39 2000
+++ xc/programs/Xserver/dix/dispatch.c	Fri May  5 10:53:46 2000
@@ -64,7 +64,7 @@
 *                                                               *
 *****************************************************************/
 
-/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.18 2000/02/12 03:39:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.19 2000/05/05 17:53:46 keithp Exp $ */
 
 #ifdef PANORAMIX_DEBUG
 #include <stdio.h>
@@ -253,17 +253,18 @@
 }
 #ifdef SMART_SCHEDULE
 
+#undef SMART_DEBUG
+
 #define SMART_SCHEDULE_DEFAULT_INTERVAL	20	    /* ms */
 #define SMART_SCHEDULE_MAX_SLICE	200	    /* ms */
 
 Bool	    SmartScheduleDisable;
-int	    SmartMaxPriority = 20;
-int	    SmartMinPriority = -20;
 long	    SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL;
 long	    SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;
+long	    SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;
 long	    SmartScheduleTime;
 ClientPtr   SmartLastClient;
-int	    SmartLastIndex;
+int	    SmartLastIndex[SMART_MAX_PRIORITY-SMART_MIN_PRIORITY+1];
 
 #ifdef SMART_DEBUG
 long	    SmartLastPrint;
@@ -283,20 +284,21 @@
 
     bestPrio = -0x7fffffff;
     bestRobin = 0;
-    idle = nready * 2 * SmartScheduleSlice;
+    idle = 2 * SmartScheduleSlice;
     for (i = 0; i < nready; i++)
     {
 	client = clientReady[i];
 	pClient = clients[client];
 	/* Praise clients which are idle */
-	if ((now - pClient->smart_stop_tick) >= idle)
+	if ((now - pClient->smart_check_tick) >= idle)
 	{
 	    if (pClient->smart_priority < 0)
 		pClient->smart_priority++;
 	}
+	pClient->smart_check_tick = now;
 	
 	/* check priority to select best client */
-	robin = (pClient->index - SmartLastIndex) & 0xff;
+	robin = (pClient->index - SmartLastIndex[pClient->smart_priority-SMART_MIN_PRIORITY]) & 0xff;
 	if (pClient->smart_priority > bestPrio ||
 	    (pClient->smart_priority == bestPrio && robin > bestRobin))
 	{
@@ -316,14 +318,15 @@
 	SmartLastPrint = now;
     }
 #endif
+    pClient = clients[best];
+    SmartLastIndex[bestPrio-SMART_MIN_PRIORITY] = pClient->index;
     /*
      * Set current client pointer
      */
-    if (SmartLastClient != clients[best])
+    if (SmartLastClient != pClient)
     {
-	SmartLastClient = clients[best];
-	SmartLastIndex = SmartLastClient->index;
-	SmartLastClient->smart_start_tick = now;
+	pClient->smart_start_tick = now;
+	SmartLastClient = pClient;
     }
     /*
      * Adjust slice
@@ -335,10 +338,10 @@
 	 * has run, bump the slice up to get maximal
 	 * performance from a single client
 	 */
-	if ((now - SmartLastClient->smart_start_tick) > 1000 &&
-	    SmartScheduleSlice < SMART_SCHEDULE_MAX_SLICE)
+	if ((now - pClient->smart_start_tick) > 1000 &&
+	    SmartScheduleSlice < SmartScheduleMaxSlice)
 	{
-	    SmartScheduleSlice += 20;
+	    SmartScheduleSlice += SmartScheduleInterval;
 	}
     }
     else
@@ -425,7 +428,7 @@
 		    (SmartScheduleTime - start_tick) >= SmartScheduleSlice)
 		{
 		    /* Penalize clients which consume ticks */
-		    if (client->smart_priority > SmartMinPriority)
+		    if (client->smart_priority > SMART_MIN_PRIORITY)
 			client->smart_priority--;
 		    break;
 		}
@@ -3697,6 +3700,7 @@
     client->smart_priority = 0;
     client->smart_start_tick = SmartScheduleTime;
     client->smart_stop_tick = SmartScheduleTime;
+    client->smart_check_tick = SmartScheduleTime;
 #endif
 }
 
Index: xc/programs/Xserver/dix/dixfonts.c
diff -u xc/programs/Xserver/dix/dixfonts.c:3.22 xc/programs/Xserver/dix/dixfonts.c:3.23
--- xc/programs/Xserver/dix/dixfonts.c:3.22	Tue Feb  8 09:18:54 2000
+++ xc/programs/Xserver/dix/dixfonts.c	Tue Apr  4 12:24:47 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.22 2000/02/08 17:18:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.23 2000/04/04 19:24:47 dawes Exp $ */
 /************************************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -1732,12 +1732,13 @@
 
 static int
 #if NeedFunctionPrototypes
-SetFontPathElements(int npaths, unsigned char *paths, int *bad)
+SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
 #else
-SetFontPathElements(npaths, paths, bad)
+SetFontPathElements(npaths, paths, bad, persist)
     int         npaths;
     unsigned char *paths;
     int        *bad;
+    Bool	persist;
 #endif
 {
     int         i,
@@ -1758,71 +1759,83 @@
 	if (fpe_functions[i].set_path_hook)
 	    (*fpe_functions[i].set_path_hook) ();
     }
-    for (i = 0; i < npaths; i++) {
+    for (i = 0; i < npaths; i++) 
+    {
 	len = (unsigned int) (*cp++);
 
-	if (len) {
+	if (len == 0) 
+	{
+	    if (persist)
+		ErrorF ("Removing empty element from the valid list of fontpaths\n");
+	    err = BadValue;
+	}
+	else
+	{
 	    /* if it's already in our active list, just reset it */
 	    /*
 	     * note that this can miss FPE's in limbo -- may be worth catching
 	     * them, though it'd muck up refcounting
 	     */
 	    fpe = find_existing_fpe(font_path_elements, num_fpes, cp, len);
-	    if (fpe) {
+	    if (fpe) 
+	    {
 		err = (*fpe_functions[fpe->type].reset_fpe) (fpe);
-		if (err == Successful) {
+		if (err == Successful) 
+		{
 		    UseFPE(fpe);/* since it'll be decref'd later when freed
 				 * from the old list */
-		    fplist[valid_paths++] = fpe;
-		    cp += len;
-		    continue;
 		}
-		/* if error or can't do it, act like it's a new one */
-	    }
-	    fpe = (FontPathElementPtr) xalloc(sizeof(FontPathElementRec));
-	    if (!fpe) {
-		err = BadAlloc;
-		goto bail;
-	    }
-	    fpe->name = (char *) xalloc(len + 1);
-	    if (!fpe->name) {
-		xfree(fpe);
-		err = BadAlloc;
-		goto bail;
-	    }
-	    fpe->refcount = 1;
-
-	    strncpy(fpe->name, (char *) cp, (int) len);
-	    cp += len;
-	    fpe->name[len] = '\0';
-	    fpe->name_length = len;
-	    fpe->type = DetermineFPEType(fpe->name);
-	    if (fpe->type == -1) {
-		xfree(fpe->name);
-		xfree(fpe);
-		err = BadValue;
-		goto bail;
+		else
+		    fpe = 0;
 	    }
-	    err = (*fpe_functions[fpe->type].init_fpe) (fpe);
-	    if (!loadableFonts) {
-		if (err != Successful) {
-		    xfree(fpe->name);
+	    /* if error or can't do it, act like it's a new one */
+	    if (!fpe)
+	    {
+		fpe = (FontPathElementPtr) xalloc(sizeof(FontPathElementRec));
+		if (!fpe) 
+		{
+		    err = BadAlloc;
+		    goto bail;
+		}
+		fpe->name = (char *) xalloc(len + 1);
+		if (!fpe->name) 
+		{
 		    xfree(fpe);
-		    err = BadValue;
+		    err = BadAlloc;
 		    goto bail;
 		}
-		fplist[valid_paths++] = fpe;
-	    } else {
-		if (err == Successful) /* a successful font, add it to list */
-		    fplist[valid_paths++] = fpe;
+		fpe->refcount = 1;
+    
+		strncpy(fpe->name, (char *) cp, (int) len);
+		fpe->name[len] = '\0';
+		fpe->name_length = len;
+		fpe->type = DetermineFPEType(fpe->name);
+		if (fpe->type == -1)
+		    err = BadValue;
 		else
-		    ErrorF("Removing %s from the valid list of fontpaths\n",
-			   fpe->name);
+		    err = (*fpe_functions[fpe->type].init_fpe) (fpe);
+		if (err != Successful)
+		{
+		    if (persist)
+		    {
+			ErrorF("Could not init font path element %s, removing from list!\n",
+			       fpe->name);
+		    }
+		    xfree (fpe->name);
+		    xfree (fpe);
+		}
 	    }
-	} else {
-	    err = BadValue;
-	    goto bail;
 	}
+	if (err != Successful)
+	{
+	    if (!persist)
+		goto bail;
+	}
+	else
+	{
+	    fplist[valid_paths++] = fpe;
+	}
+	cp += len;
     }
 
     FreeFontPath(font_path_elements, num_fpes, FALSE);
@@ -1834,8 +1847,8 @@
     return Success;
 bail:
     *bad = i;
-    while (--i >= 0)
-	FreeFPE(fplist[i]);
+    while (--valid_paths >= 0)
+	FreeFPE(fplist[valid_paths]);
     xfree(fplist);
     return err;
 }
@@ -1854,7 +1867,7 @@
 	if (SetDefaultFontPath(defaultFontPath) != Success)
 	    return BadName;
     } else {
-	err = SetFontPathElements(npaths, paths, error);
+	err = SetFontPathElements(npaths, paths, error, FALSE);
     }
     return err;
 }
@@ -1894,7 +1907,7 @@
     }
     *nump = (unsigned char) size;
 
-    err = SetFontPathElements(num, newpath, &bad);
+    err = SetFontPathElements(num, newpath, &bad, TRUE);
 
     DEALLOCATE_LOCAL(newpath);
 
Index: xc/programs/Xserver/dix/events.c
diff -u xc/programs/Xserver/dix/events.c:3.29 xc/programs/Xserver/dix/events.c:3.34
--- xc/programs/Xserver/dix/events.c:3.29	Sun Feb 20 17:16:28 2000
+++ xc/programs/Xserver/dix/events.c	Fri May  5 10:53:48 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.29 2000/02/21 01:16:28 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.34 2000/05/05 17:53:48 keithp Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -282,7 +282,7 @@
 
 static CARD8 criticalEvents[32] =
 {
-    0x3c				/* key and button events */
+    0x7c				/* key and button events */
 };
 
 #ifdef PANORAMIX
@@ -1584,9 +1584,7 @@
 	if (BitIsOn(criticalEvents, type))
 	{
 #ifdef SMART_SCHEDULE
-	    extern int	SmartMaxPriority;
-	    
-	    if (client->smart_priority < SmartMaxPriority)
+	    if (client->smart_priority < SMART_MAX_PRIORITY)
 		client->smart_priority++;
 #endif
 	    SetCriticalOutputPending();
@@ -1821,16 +1819,6 @@
 	XE_KBPTR.rootX - pWin->drawable.x;
 	XE_KBPTR.eventY =
 	XE_KBPTR.rootY - pWin->drawable.y;
-#ifdef PANORAMIX
-	if(!noPanoramiXExtension) {
-	    XE_KBPTR.rootX += panoramiXdataPtr[0].x;
-	    XE_KBPTR.rootY += panoramiXdataPtr[0].y;
-	    if(pWin == WindowTable[0]) {
-		XE_KBPTR.eventX += panoramiXdataPtr[0].x;
-		XE_KBPTR.eventY += panoramiXdataPtr[0].y;
-	    }
-	}
-#endif
     }
     else
     {
@@ -2186,6 +2174,117 @@
     if (newScreen != sprite.hotPhys.pScreen)
 	ConfineCursorToWindow(WindowTable[newScreen->myNum], TRUE, FALSE);
 }
+
+#ifdef PANORAMIX
+
+static Bool
+PanoramiXPointInWindowIsVisible(
+    WindowPtr pWin,
+    int x,
+    int y
+)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    BoxRec box;
+    int i, xoff, yoff;
+
+    if (!pWin->realized) return FALSE;
+
+    if (POINT_IN_REGION(pScreen, &pWin->borderClip, x, y, &box))
+        return TRUE;
+    
+    if(!PanoramiXSetWindowPntrs(pWin)) return FALSE;
+
+    xoff = x + panoramiXdataPtr[0].x;  
+    yoff = y + panoramiXdataPtr[0].y;  
+
+    for(i = 1; i < PanoramiXNumScreens; i++) {
+	pWin = sprite.windows[i];
+	pScreen = pWin->drawable.pScreen;
+	x = xoff - panoramiXdataPtr[i].x;
+	y = yoff - panoramiXdataPtr[i].y;
+
+	if(POINT_IN_REGION(pScreen, &pWin->borderClip, x, y, &box))
+            return TRUE;
+
+    }
+
+    return FALSE;
+}
+
+static int
+PanoramiXWarpPointer(ClientPtr client)
+{
+    WindowPtr	dest = NULL;
+    int		x, y;
+
+    REQUEST(xWarpPointerReq);
+
+
+    if (stuff->dstWid != None)
+    {
+	dest = SecurityLookupWindow(stuff->dstWid, client, SecurityReadAccess);
+	if (!dest)
+	    return BadWindow;
+    }
+    x = sprite.hotPhys.x;
+    y = sprite.hotPhys.y;
+
+    if (stuff->srcWid != None)
+    {
+	int     winX, winY;
+ 	XID 	winID = stuff->srcWid;
+        WindowPtr source;
+	
+	source = SecurityLookupWindow(winID, client, SecurityReadAccess);
+	if (!source) return BadWindow;
+
+	winX = source->drawable.x;
+	winY = source->drawable.y;
+	if(source == WindowTable[0]) {
+	    winX -= panoramiXdataPtr[0].x;
+	    winY -= panoramiXdataPtr[0].y;
+	}
+	if (x < winX + stuff->srcX ||
+	    y < winY + stuff->srcY ||
+	    (stuff->srcWidth != 0 &&
+	     winX + stuff->srcX + (int)stuff->srcWidth < x) ||
+	    (stuff->srcHeight != 0 &&
+	     winY + stuff->srcY + (int)stuff->srcHeight < y) ||
+	    !PanoramiXPointInWindowIsVisible(source, x, y))
+	    return Success;
+    }
+    if (dest) {
+	x = dest->drawable.x;
+	y = dest->drawable.y;
+	if(dest == WindowTable[0]) {
+	    x -= panoramiXdataPtr[0].x;
+	    y -= panoramiXdataPtr[0].y;
+	}
+    } 
+
+    x += stuff->dstX;
+    y += stuff->dstY;
+
+    if (x < sprite.physLimits.x1)
+	x = sprite.physLimits.x1;
+    else if (x >= sprite.physLimits.x2)
+	x = sprite.physLimits.x2 - 1;
+    if (y < sprite.physLimits.y1)
+	y = sprite.physLimits.y1;
+    else if (y >= sprite.physLimits.y2)
+	y = sprite.physLimits.y2 - 1;
+    if (sprite.hotShape)
+	ConfineToShape(sprite.hotShape, &x, &y);
+
+    PanoramiXSetCursorPosition(x, y, TRUE);
+
+    return Success;
+}
+
+#endif
+
+
 int
 ProcWarpPointer(client)
     ClientPtr client;
@@ -2197,6 +2296,12 @@
     REQUEST(xWarpPointerReq);
 
     REQUEST_SIZE_MATCH(xWarpPointerReq);
+
+#ifdef PANORAMIX
+    if(!noPanoramiXExtension)
+	return PanoramiXWarpPointer(client);
+#endif
+
     if (stuff->dstWid != None)
     {
 	dest = SecurityLookupWindow(stuff->dstWid, client, SecurityReadAccess);
@@ -2227,7 +2332,8 @@
 	    !PointInWindowIsVisible(source, x, y))
 	    return Success;
     }
-    if (dest) {
+    if (dest) 
+    {
 	x = dest->drawable.x;
 	y = dest->drawable.y;
 	newScreen = dest->drawable.pScreen;
@@ -2237,19 +2343,14 @@
     x += stuff->dstX;
     y += stuff->dstY;
 
-#ifdef PANORAMIX
-    if(noPanoramiXExtension) /* Clip to the SLS not Screen 0 */
-#endif
-    {
-	if (x < 0)
-	    x = 0;
-	else if (x >= newScreen->width)
-	    x = newScreen->width - 1;
-	if (y < 0)
-	    y = 0;
-	else if (y >= newScreen->height)
-	    y = newScreen->height - 1;
-    }
+    if (x < 0)
+	x = 0;
+    else if (x >= newScreen->width)
+	x = newScreen->width - 1;
+    if (y < 0)
+	y = 0;
+    else if (y >= newScreen->height)
+	y = newScreen->height - 1;
 
     if (newScreen == sprite.hotPhys.pScreen)
     {
@@ -2261,15 +2362,10 @@
 	    y = sprite.physLimits.y1;
 	else if (y >= sprite.physLimits.y2)
 	    y = sprite.physLimits.y2 - 1;
-#if defined(SHAPE) || defined(PANORAMIX)
+#if defined(SHAPE)
 	if (sprite.hotShape)
 	    ConfineToShape(sprite.hotShape, &x, &y);
 #endif
-#ifdef PANORAMIX
-	if(!noPanoramiXExtension)
-	    PanoramiXSetCursorPosition(x, y, TRUE);
-	else
-#endif
 	(*newScreen->SetCursorPosition)(newScreen, x, y, TRUE);
     }
     else if (!PointerConfinedToScreen())
@@ -3856,18 +3952,12 @@
     rep.root = (ROOT)->drawable.id;
     rep.rootX = sprite.hot.x;
     rep.rootY = sprite.hot.y;
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension) {
-	rep.rootX += panoramiXdataPtr[0].x;
-	rep.rootY += panoramiXdataPtr[0].y;
-    }
-#endif
     rep.child = None;
     if (sprite.hot.pScreen == pWin->drawable.pScreen)
     {
 	rep.sameScreen = xTrue;
 	rep.winX = sprite.hot.x - pWin->drawable.x;
-	rep.winY =sprite.hot.y - pWin->drawable.y;
+	rep.winY = sprite.hot.y - pWin->drawable.y;
 	for (t = sprite.win; t; t = t->parent)
 	    if (t->parent == pWin)
 	    {
@@ -3882,6 +3972,17 @@
 	rep.winY = 0;
     }
 
+#ifdef PANORAMIX
+    if(!noPanoramiXExtension) {
+	rep.rootX += panoramiXdataPtr[0].x;
+	rep.rootY += panoramiXdataPtr[0].y;
+	if(stuff->id == rep.root) {
+	    rep.winX += panoramiXdataPtr[0].x;
+	    rep.winY += panoramiXdataPtr[0].y;
+	}
+    }
+#endif
+
     WriteReplyToClient(client, sizeof(xQueryPointerReply), &rep);
 
     return(Success);    
@@ -4409,12 +4510,49 @@
     int		count;
     xEvent	*events;
 {
+#ifdef PANORAMIX
+    xEvent    eventCopy;
+#endif
     xEvent    eventTo, *eventFrom;
     int       i;
 
 #ifdef XKB
     if ((!noXkbExtension)&&(!XkbFilterEvents(pClient, count, events)))
 	return;
+#endif
+
+#ifdef PANORAMIX
+    if(!noPanoramiXExtension && 
+       (panoramiXdataPtr[0].x || panoramiXdataPtr[0].y)) 
+    {
+	switch(events->u.u.type) {
+	case MotionNotify:
+	case ButtonPress:
+	case ButtonRelease:
+	case KeyPress:
+	case KeyRelease:
+	case EnterNotify:
+	case LeaveNotify:
+	/* 
+	   When multiple clients want the same event DeliverEventsToWindow
+	   passes the same event structure multiple times so we can't 
+	   modify the one passed to us 
+        */
+	    count = 1;  /* should always be 1 */
+	    memcpy(&eventCopy, events, sizeof(xEvent));
+	    eventCopy.u.keyButtonPointer.rootX += panoramiXdataPtr[0].x;
+	    eventCopy.u.keyButtonPointer.rootY += panoramiXdataPtr[0].y;
+	    if(eventCopy.u.keyButtonPointer.event == 
+	       eventCopy.u.keyButtonPointer.root) 
+	    {
+		eventCopy.u.keyButtonPointer.eventX += panoramiXdataPtr[0].x;
+		eventCopy.u.keyButtonPointer.eventY += panoramiXdataPtr[0].y;
+	    }
+	    events = &eventCopy;
+	    break;
+	default: break;
+	}
+    }
 #endif
 
     if (EventCallback)
Index: xc/programs/Xserver/dix/main.c
diff -u xc/programs/Xserver/dix/main.c:3.28 xc/programs/Xserver/dix/main.c:3.29
--- xc/programs/Xserver/dix/main.c:3.28	Fri Feb 11 19:39:41 2000
+++ xc/programs/Xserver/dix/main.c	Thu Jun 15 18:50:19 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.28 2000/02/12 03:39:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.29 2000/06/16 01:50:19 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -250,9 +250,10 @@
 #endif
 
 int
-main(argc, argv)
+main(argc, argv, envp)
     int		argc;
     char	*argv[];
+    char	*envp[];
 {
     int		i, j, k, error;
     HWEventQueueType	alwaysCheckForInput[2];
@@ -263,6 +264,8 @@
 	FatalError("server restarted. Jumped through uninitialized pointer?\n");
     else
 	restart = 1;
+
+    CheckUserParameters(argc, argv, envp);
 
 #ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS
     ExpandCommandLine(&argc, &argv);
Index: xc/programs/Xserver/fb/Imakefile
diff -u xc/programs/Xserver/fb/Imakefile:1.4 xc/programs/Xserver/fb/Imakefile:1.8
--- xc/programs/Xserver/fb/Imakefile:1.4	Wed Feb 23 12:29:40 2000
+++ xc/programs/Xserver/fb/Imakefile	Sat May  6 14:09:29 2000
@@ -1,8 +1,9 @@
-XCOMM $XFree86: xc/programs/Xserver/fb/Imakefile,v 1.4 2000/02/23 20:29:40 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/fb/Imakefile,v 1.8 2000/05/06 21:09:29 keithp Exp $
 XCOMM 
 XCOMM 
 XCOMM Id: Imakefile,v 1.1 1999/11/02 03:54:44 keithp Exp $
-#define IHaveModule
+
+#define IHaveModules
 #include <Server.tmpl>
 
 #ifdef FbNoPixelAddrCode
@@ -32,6 +33,7 @@
 	fbglyph.c \
 	fbimage.c \
 	fbline.c \
+	fboverlay.c \
 	fbpixmap.c \
 	fbpoint.c \
 	fbpush.c \
@@ -42,7 +44,8 @@
 	fbstipple.c \
 	fbtile.c \
 	fbutil.c \
-	fbwindow.c
+	fbwindow.c \
+	fb24_32.c
 
 OBJS =	$(XFMODOBJ) \
 	fbarc.o \
@@ -61,6 +64,7 @@
 	fbglyph.o \
 	fbimage.o \
 	fbline.o \
+	fboverlay.o \
 	fbpixmap.o \
 	fbpoint.o \
 	fbpush.o \
@@ -71,7 +75,8 @@
 	fbstipple.o \
 	fbtile.o \
 	fbutil.o \
-	fbwindow.o
+	fbwindow.o \
+	fb24_32.o
 	
    INCLUDES = -I. -I../mi -I../include -I$(XINCLUDESRC) \
 	      -I$(FONTINCSRC) -I$(XF86SRC)/common $(EXTRAINCLUDES)
@@ -90,3 +95,6 @@
 DependTarget()
 #endif
 
+InstallDriverSDKLibraryModule(fb,$(DRIVERSDKMODULEDIR),.)
+InstallDriverSDKNonExecFile(fb.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(fbrop.h,$(DRIVERSDKINCLUDEDIR))
Index: xc/programs/Xserver/fb/fb.h
diff -u xc/programs/Xserver/fb/fb.h:1.13 xc/programs/Xserver/fb/fb.h:1.16
--- xc/programs/Xserver/fb/fb.h:1.13	Tue Feb 29 16:25:14 2000
+++ xc/programs/Xserver/fb/fb.h	Sat May  6 14:09:30 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fb.h,v 1.13 2000/03/01 00:25:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fb.h,v 1.16 2000/05/06 21:09:30 keithp Exp $ */
 
 #ifndef _FB_H_
 #define _FB_H_
@@ -77,6 +77,17 @@
 #undef FB_24BIT
 #endif
 
+/*
+ * Unless otherwise instructed, fb includes code to advertise 24bpp
+ * windows with 32bpp image format for application compatibility
+ */
+
+#ifdef FB_24BIT
+#ifndef FBNO24_32
+#define FB_24_32BIT
+#endif
+#endif
+
 #define FB_STIP_SHIFT	LOG2_BITMAP_PAD
 #define FB_STIP_UNIT	(1 << FB_STIP_SHIFT)
 #define FB_STIP_MASK	(FB_STIP_UNIT - 1)
@@ -204,10 +215,10 @@
 #ifdef FBNOPIXADDR
 #define FbMaskBitsBytes(x,w,copy,l,lb,n,r,rb) FbMaskBits(x,w,l,n,r)
 #define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \
-    *dst = FbDoRRop(*dst,and,xor,l);
+    *dst = FbDoMaskRRop(*dst,and,xor,l); \
 }
 #define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \
-    *dst = FbDoRRop(*dst,and,xor,r);
+    *dst = FbDoMaskRRop(*dst,and,xor,r); \
 }
 #else
 
@@ -502,6 +513,9 @@
 #define FbCheck24Pix(p)	((p) == FbNext24Pix(p))
 
 extern int	fbGCPrivateIndex;
+#ifndef FB_NO_WINDOW_PIXMAPS
+extern int	fbWinPrivateIndex;
+#endif
 extern const GCOps	fbGCOps;
 extern const GCFuncs	fbGCFuncs;
 
@@ -514,6 +528,23 @@
 extern WindowPtr    *WindowTable;
 #endif
 
+#ifdef FB_24_32BIT
+#define FB_SCREEN_PRIVATE
+#endif
+
+#ifdef FB_SCREEN_PRIVATE
+extern int	fbScreenPrivateIndex;
+
+/* private field of a screen */
+typedef struct {
+    unsigned char	win32bpp;	/* window bpp for 32-bpp images */
+    unsigned char	pix32bpp;	/* pixmap bpp for 32-bpp images */
+} FbScreenPrivRec, *FbScreenPrivPtr;
+
+#define fbGetScreenPrivate(pScreen) ((FbScreenPrivPtr) \
+				     (pScreen)->devPrivates[fbScreenPrivateIndex].ptr)
+#endif
+
 /* private field of GC */
 typedef struct {
 #ifdef FB_OLD_GC
@@ -529,8 +560,9 @@
     FbBits		bgand, bgxor;	/* for stipples */
     FbBits		fg, bg, pm;	/* expanded and filled */
     unsigned int	dashLength;	/* total of all dash elements */
-    Bool		oneRect;	/* clip list is single rectangle */
-    Bool		evenStipple;	/* stipple is even */
+    unsigned char    	oneRect;	/* clip list is single rectangle */
+    unsigned char    	evenStipple;	/* stipple is even */
+    unsigned char    	bpp;		/* current drawable bpp */
 } FbGCPrivRec, *FbGCPrivPtr;
 
 #define fbGetGCPrivate(pGC)	((FbGCPrivPtr)\
@@ -549,7 +581,12 @@
 #endif
 
 #define fbGetScreenPixmap(s)	((PixmapPtr) (s)->devPrivate)
+#ifdef FB_NO_WINDOW_PIXMAPS
 #define fbGetWindowPixmap(d)	fbGetScreenPixmap((d)->pScreen)
+#else
+#define fbGetWindowPixmap(pWin)	((PixmapPtr)\
+	((WindowPtr) (pWin))->devPrivates[fbWinPrivateIndex].ptr)
+#endif
 
 #define fbGetDrawable(pDrawable, pointer, stride, bpp) { \
     PixmapPtr   _pPix; \
@@ -604,6 +641,76 @@
 #define FbEvenStip(w,bpp)   ((w) * (bpp) <= FB_UNIT && FbPowerOfTwo(w) && FbPowerOfTwo(bpp))
 
 /*
+ * fb24_32.c
+ */
+void
+fb24_32GetSpans(DrawablePtr	pDrawable, 
+		int		wMax, 
+		DDXPointPtr	ppt, 
+		int		*pwidth, 
+		int		nspans, 
+		char		*pchardstStart);
+
+void
+fb24_32SetSpans (DrawablePtr	    pDrawable,
+		 GCPtr		    pGC,
+		 char		    *src,
+		 DDXPointPtr	    ppt,
+		 int		    *pwidth,
+		 int		    nspans,
+		 int		    fSorted);
+
+void
+fb24_32PutZImage (DrawablePtr	pDrawable,
+		  RegionPtr	pClip,
+		  int		alu,
+		  FbBits	pm,
+		  int		x,
+		  int		y,
+		  int		width,
+		  int		height,
+		  CARD8		*src,
+		  FbStride	srcStride);
+    
+void
+fb24_32GetImage (DrawablePtr     pDrawable,
+		 int             x,
+		 int             y,
+		 int             w,
+		 int             h,
+		 unsigned int    format,
+		 unsigned long   planeMask,
+		 char            *d);
+
+void
+fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
+		 DrawablePtr pDstDrawable,
+		 GCPtr       pGC,
+		 BoxPtr      pbox,
+		 int         nbox,
+		 int         dx,
+		 int         dy,
+		 Bool        reverse,
+		 Bool        upsidedown,
+		 Pixel       bitplane,
+		 void        *closure);
+
+PixmapPtr
+fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel);
+    
+Bool
+fb24_32CreateScreenResources(ScreenPtr pScreen);
+
+Bool
+fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
+			   int         width,
+			   int         height,
+			   int         depth,
+			   int         bitsPerPixel,
+			   int         devKind,
+			   pointer     pPixData);
+
+/*
  * fballpriv.c
  */
 Bool
@@ -1385,6 +1492,9 @@
 /*
  * fbpixmap.c
  */
+
+PixmapPtr
+fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp);
 
 PixmapPtr
 fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth);
Index: xc/programs/Xserver/fb/fb24_32.c
diff -u /dev/null xc/programs/Xserver/fb/fb24_32.c:1.3
--- /dev/null	Sat Jul  1 20:42:11 2000
+++ xc/programs/Xserver/fb/fb24_32.c	Sat May  6 14:09:31 2000
@@ -0,0 +1,616 @@
+/*
+ * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.3 2000/05/06 21:09:31 keithp Exp $
+ *
+ * Copyright © 2000 SuSE, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of SuSE not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  SuSE makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Keith Packard, SuSE, Inc.
+ */
+
+#ifdef XFree86LOADER
+#include "xf86.h"
+#include "xf86_ansic.h"
+#endif
+
+#include "fb.h"
+
+/* X apps don't like 24bpp images, this code exposes 32bpp images */
+
+/*
+ * These two functions do a full CopyArea while reformatting
+ * the data between 24 and 32bpp.  They try to go a bit faster
+ * by reading/writing aligned CARD32s where it's easy
+ */
+
+#define Get8(a)	((CARD32) *(a))
+
+#if BITMAP_BIT_ORDER == MSBFirst
+#define Get24(a)    ((Get8(a) << 16) | (Get8((a)+1) << 8) | Get8((a)+2))
+#define Put24(a,p)  (((a)[0] = (CARD8) ((p) >> 16)), \
+		     ((a)[1] = (CARD8) ((p) >> 8)), \
+		     ((a)[2] = (CARD8) (p)))
+#else
+#define Get24(a)    (Get8(a) | (Get8((a)+1) << 8) | (Get8((a)+2)<<16))
+#define Put24(a,p)  (((a)[0] = (CARD8) (p)), \
+		     ((a)[1] = (CARD8) ((p) >> 8)), \
+		     ((a)[2] = (CARD8) ((p) >> 16)))
+#endif
+
+typedef void (*fb24_32BltFunc) (CARD8	    *srcLine,
+				FbStride    srcStride,
+				int	    srcX,
+
+				CARD8	    *dstLine,
+				FbStride    dstStride,
+				int	    dstX,
+
+				int	    width, 
+				int	    height,
+
+				int	    alu,
+				FbBits	    pm);
+
+static void
+fb24_32BltDown (CARD8	    *srcLine,
+		FbStride    srcStride,
+		int	    srcX,
+
+		CARD8	    *dstLine,
+		FbStride    dstStride,
+		int	    dstX,
+
+		int	    width, 
+		int	    height,
+
+		int	    alu,
+		FbBits	    pm)
+{
+    CARD32  *src;
+    CARD8   *dst;
+    int	    w;
+    Bool    destInvarient;
+    CARD32  pixel, dpixel;
+    FbDeclareMergeRop ();
+    
+    srcLine += srcX * 4;
+    dstLine += dstX * 3;
+
+    FbInitializeMergeRop(alu, (pm | ~(FbBits) 0xffffff));
+    destInvarient = FbDestInvarientMergeRop();
+
+    while (height--)
+    {
+	src = (CARD32 *) srcLine;
+	dst = dstLine;
+	srcLine += srcStride;
+	dstLine += dstStride;
+	w = width;
+	if (destInvarient)
+	{
+	    while (((long) dst & 3) && w)
+	    {
+		w--;
+		pixel = *src++;
+		pixel = FbDoDestInvarientMergeRop(pixel);
+		Put24 (dst, pixel);
+		dst += 3;
+	    }
+	    /* Do four aligned pixels at a time */
+	    while (w >= 4)
+	    {
+		CARD32  s0, s1;
+		s0 = *src++;
+		s0 = FbDoDestInvarientMergeRop(s0);
+		s1 = *src++;
+		s1 = FbDoDestInvarientMergeRop(s1);
+#if BITMAP_BIT_ORDER == LSBFirst
+		*(CARD32 *)(dst) = (s0 & 0xffffff) | (s1 << 24);
+#else
+		*(CARD32 *)(dst) = (s0 << 8) | ((s1 & 0xffffff) >> 16);
+#endif
+		s0 = *src++;
+		s0 = FbDoDestInvarientMergeRop(s0);
+#if BITMAP_BIT_ORDER == LSBFirst
+		*(CARD32 *)(dst+4) = ((s1 & 0xffffff) >> 8) | (s0 << 16);
+#else
+		*(CARD32 *)(dst+4) = (s1 << 16) | ((s0 & 0xffffff) >> 8);
+#endif
+		s1 = *src++;
+		s1 = FbDoDestInvarientMergeRop(s1);
+#if BITMAP_BIT_ORDER == LSBFirst
+		*(CARD32 *)(dst+8) = ((s0 & 0xffffff) >> 16) | (s1 << 8);
+#else
+		*(CARD32 *)(dst+8) = (s0 << 24) | (s1 & 0xffffff);
+#endif
+		dst += 12;
+		w -= 4;
+	    }
+	    while (w--)
+	    {
+		pixel = *src++;
+		pixel = FbDoDestInvarientMergeRop(pixel);
+		Put24 (dst, pixel);
+		dst += 3;
+	    }
+	}
+	else
+	{
+	    while (w--)
+	    {
+		pixel = *src++;
+		dpixel = Get24 (dst);
+		pixel = FbDoMergeRop(pixel, dpixel);
+		Put24 (dst, pixel);
+		dst += 3;
+	    }
+	}
+    }
+}
+
+static void
+fb24_32BltUp (CARD8	    *srcLine,
+	      FbStride	    srcStride,
+	      int	    srcX,
+
+	      CARD8	    *dstLine,
+	      FbStride	    dstStride,
+	      int	    dstX,
+
+	      int	    width, 
+	      int	    height,
+
+	      int	    alu,
+	      FbBits	    pm)
+{
+    CARD8   *src;
+    CARD32  *dst;
+    int	    w;
+    Bool    destInvarient;
+    CARD32  pixel;
+    FbDeclareMergeRop ();
+    
+    FbInitializeMergeRop(alu, (pm | (~(FbBits) 0xffffff)));
+    destInvarient = FbDestInvarientMergeRop();
+
+    srcLine += srcX * 3;
+    dstLine += dstX * 4;
+
+    while (height--)
+    {
+	w = width;
+	src = srcLine;
+	dst = (CARD32 *) dstLine;
+	srcLine += srcStride;
+	dstLine += dstStride;
+	if (destInvarient)
+	{
+	    while (((long) src & 3) && w)
+	    {
+		w--;
+		pixel = Get24(src);
+		src += 3;
+		*dst++ = FbDoDestInvarientMergeRop(pixel);
+	    }
+	    /* Do four aligned pixels at a time */
+	    while (w >= 4)
+	    {
+		CARD32  s0, s1;
+
+		s0 = *(CARD32 *)(src);
+#if BITMAP_BIT_ORDER == LSBFirst
+		pixel = s0 & 0xffffff;
+#else
+		pixel = s0 >> 8;
+#endif
+		*dst++ = FbDoDestInvarientMergeRop(pixel);
+		s1 = *(CARD32 *)(src+4);
+#if BITMAP_BIT_ORDER == LSBFirst
+		pixel = (s0 >> 24) | ((s1 << 8) & 0xffffff);
+#else
+		pixel = ((s0 << 16) & 0xffffff) | (s1 >> 16);
+#endif
+		*dst++ = FbDoDestInvarientMergeRop(pixel);
+		s0 = *(CARD32 *)(src+8);
+#if BITMAP_BIT_ORDER == LSBFirst
+		pixel = (s1 >> 16) | ((s0 << 16) & 0xffffff);
+#else
+		pixel = ((s1 << 8) & 0xffffff) | (s0 >> 24);
+#endif
+		*dst++ = FbDoDestInvarientMergeRop(pixel);
+#if BITMAP_BIT_ORDER == LSBFirst
+		pixel = s0 >> 8;
+#else
+		pixel = s0 & 0xffffff;
+#endif
+		*dst++ = FbDoDestInvarientMergeRop(pixel);
+		src += 12;
+		w -= 4;
+	    }
+	    while (w)
+	    {
+		w--;
+		pixel = Get24(src);
+		src += 3;
+		*dst++ = FbDoDestInvarientMergeRop(pixel);
+	    }
+	}
+	else
+	{
+	    while (w--)
+	    {
+		pixel = Get24(src);
+		src += 3;
+		*dst = FbDoMergeRop(pixel, *dst);
+		dst++;
+	    }
+	}
+    }
+}
+
+/*
+ * Spans functions; probably unused.
+ */
+void
+fb24_32GetSpans(DrawablePtr	pDrawable, 
+		int		wMax, 
+		DDXPointPtr	ppt, 
+		int		*pwidth, 
+		int		nspans, 
+		char		*pchardstStart)
+{
+    FbBits	    *srcBits;
+    CARD8	    *src;
+    FbStride	    srcStride;
+    int		    srcBpp;
+    CARD8	    *dst;
+    
+    fbGetDrawable (pDrawable, srcBits, srcStride, srcBpp);
+    src = (CARD8 *) srcBits;
+    srcStride *= sizeof (FbBits);
+    
+    while (nspans--)
+    {
+	dst = (CARD8 *) pchardstStart;
+	fb24_32BltUp (src + ppt->y * srcStride, srcStride,
+		      ppt->x,
+	       
+		      dst,
+		      1,
+		      0,
+
+		      *pwidth,
+		      1,
+
+		      GXcopy,
+		      FB_ALLONES);
+	
+	pchardstStart += PixmapBytePad(*pwidth, pDrawable->depth);
+	ppt++;
+	pwidth++;
+    }
+}
+
+void
+fb24_32SetSpans (DrawablePtr	    pDrawable,
+		 GCPtr		    pGC,
+		 char		    *src,
+		 DDXPointPtr	    ppt,
+		 int		    *pwidth,
+		 int		    nspans,
+		 int		    fSorted)
+{
+    FbGCPrivPtr	    pPriv = fbGetGCPrivate (pGC);
+    RegionPtr	    pClip = fbGetCompositeClip(pGC);
+    FbBits	    *dstBits;
+    CARD8	    *dst, *d, *s;
+    FbStride	    dstStride;
+    int		    dstBpp;
+    BoxPtr	    pbox;
+    int		    n;
+    int		    x1, x2;
+
+    fbGetDrawable (pDrawable, dstBits, dstStride, dstBpp);
+    dst = (CARD8 *) dstBits;
+    dstStride *= sizeof (FbBits);
+    while (nspans--)
+    {
+	d = dst + ppt->y * dstStride;
+	s = (CARD8 *) src;
+	n = REGION_NUM_RECTS(pClip);
+	pbox = REGION_RECTS (pClip);
+	while (n--)
+	{
+	    if (pbox->y1 > ppt->y)
+		break;
+	    if (pbox->y2 > ppt->y)
+	    {
+		x1 = ppt->x;
+		x2 = x1 + *pwidth;
+		if (pbox->x1 > x1)
+		    x1 = pbox->x1;
+		if (pbox->x2 < x2)
+		    x2 = pbox->x2;
+		if (x1 < x2)
+		    fb24_32BltDown (s,
+				    0,
+				    (x1 - ppt->x),
+				    d,
+				    dstStride,
+				    x1,
+
+				    (x2 - x1),
+				    1,
+				    pGC->alu,
+				    pPriv->pm);
+	    }
+	}
+	src += PixmapBytePad (*pwidth, pDrawable->depth);
+	ppt++;
+	pwidth++;
+    }
+}
+
+/*
+ * Clip and put 32bpp Z-format images to a 24bpp drawable
+ */
+void
+fb24_32PutZImage (DrawablePtr	pDrawable,
+		  RegionPtr	pClip,
+		  int		alu,
+		  FbBits	pm,
+		  int		x,
+		  int		y,
+		  int		width,
+		  int		height,
+		  CARD8		*src,
+		  FbStride	srcStride)
+{
+    FbBits	*dstBits;
+    CARD8	*dst;
+    FbStride	dstStride;
+    int		dstBpp;
+    int		nbox;
+    BoxPtr	pbox;
+    int		x1, y1, x2, y2;
+
+    fbGetDrawable (pDrawable, dstBits, dstStride, dstBpp);
+    dstStride *= sizeof(FbBits);
+    dst = (CARD8 *) dstBits;
+
+    for (nbox = REGION_NUM_RECTS (pClip),
+	 pbox = REGION_RECTS(pClip);
+	 nbox--;
+	 pbox++)
+    {
+	x1 = x;
+	y1 = y;
+	x2 = x + width;
+	y2 = y + height;
+	if (x1 < pbox->x1)
+	    x1 = pbox->x1;
+	if (y1 < pbox->y1)
+	    y1 = pbox->y1;
+	if (x2 > pbox->x2)
+	    x2 = pbox->x2;
+	if (y2 > pbox->y2)
+	    y2 = pbox->y2;
+	if (x1 >= x2 || y1 >= y2)
+	    continue;
+	fb24_32BltDown (src + (y1 - y) * srcStride,
+			srcStride,
+			(x1 - x),
+
+			dst + y1 * dstStride,
+			dstStride,
+			x1,
+
+			(x2 - x1),
+			(y2 - y1),
+
+			alu,
+			pm);
+    }
+}
+
+void
+fb24_32GetImage (DrawablePtr     pDrawable,
+		 int             x,
+		 int             y,
+		 int             w,
+		 int             h,
+		 unsigned int    format,
+		 unsigned long   planeMask,
+		 char            *d)
+{
+    FbBits	    *srcBits;
+    CARD8	    *src;
+    FbStride	    srcStride;
+    int		    srcBpp;
+    FbStride	    dstStride;
+    FbBits	    pm;
+
+    fbGetDrawable (pDrawable, srcBits, srcStride, srcBpp);
+    src = (CARD8 *) srcBits;
+    srcStride *= sizeof (FbBits);
+
+    x += pDrawable->x;
+    y += pDrawable->y;
+    
+    pm = fbReplicatePixel (planeMask, 32);
+    dstStride = PixmapBytePad(w, pDrawable->depth);
+    if (pm != FB_ALLONES)
+	memset (d, 0, dstStride * h);
+    fb24_32BltUp (src + y * srcStride, srcStride, x,
+		  (CARD8 *) d, dstStride, 0,
+		  w, h, GXcopy, pm);
+}
+
+void
+fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
+		 DrawablePtr pDstDrawable,
+		 GCPtr       pGC,
+		 BoxPtr      pbox,
+		 int         nbox,
+		 int         dx,
+		 int         dy,
+		 Bool        reverse,
+		 Bool        upsidedown,
+		 Pixel       bitplane,
+		 void        *closure)
+{
+    FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
+    FbBits	*srcBits;
+    CARD8	*src;
+    FbStride	srcStride;
+    int		srcBpp;
+    FbBits	*dstBits;
+    CARD8	*dst;
+    FbStride	dstStride;
+    int		dstBpp;
+    fb24_32BltFunc  blt;
+    
+    fbGetDrawable (pSrcDrawable, srcBits, srcStride, srcBpp);
+    src = (CARD8 *) srcBits;
+    srcStride *= sizeof (FbBits);
+    fbGetDrawable (pDstDrawable, dstBits, dstStride, dstBpp);
+    dst = (CARD8 *) dstBits;
+    dstStride *= sizeof (FbBits);
+    if (srcBpp == 24)
+	blt = fb24_32BltUp;
+    else
+	blt = fb24_32BltDown;
+    
+    while (nbox--)
+    {
+	(*blt) (src + (pbox->y1 + dy) * srcStride,
+		srcStride,
+		(pbox->x1 + dx),
+
+		dst + (pbox->y1) * dstStride,
+		dstStride,
+		(pbox->x1),
+
+		(pbox->x2 - pbox->x1),
+		(pbox->y2 - pbox->y1),
+
+		pGC->alu,
+		pPriv->pm);
+	pbox++;
+    }
+}
+
+PixmapPtr
+fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
+{
+    ScreenPtr	pScreen = pOldTile->drawable.pScreen;
+    PixmapPtr	pNewTile;
+    FbBits	*old, *new;
+    FbStride	oldStride, newStride;
+    int		oldBpp, newBpp;
+    fb24_32BltFunc  blt;
+
+    pNewTile = fbCreatePixmapBpp (pScreen,
+				  pOldTile->drawable.width,
+				  pOldTile->drawable.height,
+				  pOldTile->drawable.depth,
+				  bitsPerPixel);
+    if (!pNewTile)
+	return 0;
+    fbGetDrawable (&pOldTile->drawable, 
+		   old, oldStride, oldBpp);
+    fbGetDrawable (&pNewTile->drawable, 
+		   new, newStride, newBpp);
+    if (oldBpp == 24)
+	blt = fb24_32BltUp;
+    else
+	blt = fb24_32BltDown;
+
+    (*blt) ((CARD8 *) old,
+	    oldStride * sizeof (FbBits),
+	    0,
+
+	    (CARD8 *) new,
+	    newStride * sizeof (FbBits),
+	    0,
+
+	    pOldTile->drawable.width,
+	    pOldTile->drawable.height,
+
+	    GXcopy,
+	    FB_ALLONES);
+
+    (*pScreen->DestroyPixmap) (pOldTile);
+    return pNewTile;
+}
+
+typedef struct {
+    pointer pbits; 
+    int width;   
+} miScreenInitParmsRec, *miScreenInitParmsPtr;
+
+Bool
+fb24_32CreateScreenResources(ScreenPtr pScreen)
+{
+    miScreenInitParmsPtr pScrInitParms;
+    int pitch;
+    Bool retval;
+
+    /* get the pitch before mi destroys it */
+    pScrInitParms = (miScreenInitParmsPtr)pScreen->devPrivate;
+    pitch = BitmapBytePad(pScrInitParms->width * 24);
+
+    if((retval = miCreateScreenResources(pScreen))) {
+	/* fix the screen pixmap */
+	PixmapPtr pPix = (PixmapPtr)pScreen->devPrivate;
+	pPix->drawable.bitsPerPixel = 24;
+	pPix->devKind = pitch;
+    }
+
+    return retval;
+}
+
+Bool
+fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
+			   int         width,
+			   int         height,
+			   int         depth,
+			   int         bitsPerPixel,
+			   int         devKind,
+			   pointer     pPixData)
+{
+    int	    bpp, w;
+
+    if (!pPixmap)
+	return FALSE;
+    bpp = bitsPerPixel;
+    if (bpp <= 0)
+	bpp = pPixmap->drawable.bitsPerPixel;
+    if (bpp == 24)
+    {
+	if (devKind < 0)
+	{
+	    w = width;
+	    if (w <= 0)
+		w = pPixmap->drawable.width;
+	    devKind = BitmapBytePad(w * 24);
+	}
+    }
+    return miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel,
+				devKind, pPixData);	
+}		
Index: xc/programs/Xserver/fb/fb24_32.h
diff -u /dev/null xc/programs/Xserver/fb/fb24_32.h:1.1
--- /dev/null	Sat Jul  1 20:42:11 2000
+++ xc/programs/Xserver/fb/fb24_32.h	Tue Apr  4 12:24:49 2000
@@ -0,0 +1,49 @@
+/*
+ * $XFree86: xc/programs/Xserver/fb/fb24_32.h,v 1.1 2000/04/04 19:24:49 dawes Exp $
+ *
+ * Copyright © 2000 SuSE, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of SuSE not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  SuSE makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Keith Packard, SuSE, Inc.
+ */
+
+#ifndef _FB24_32_H_
+#define _FB24_32_H_
+
+Bool
+fb24_32FinishScreenInit(ScreenPtr    pScreen,
+			pointer      pbits,
+			int          xsize,
+			int          ysize,
+			int          dpix,
+			int          dpiy,
+			int          width,
+			int          bpp);
+
+Bool
+fb24_32ScreenInit(ScreenPtr  pScreen,
+		  pointer    pbits,
+		  int        xsize,
+		  int        ysize,
+		  int        dpix,
+		  int        dpiy,
+		  int        width,
+		  int        bpp);
+
+#endif
Index: xc/programs/Xserver/fb/fballpriv.c
diff -u xc/programs/Xserver/fb/fballpriv.c:1.3 xc/programs/Xserver/fb/fballpriv.c:1.4
--- xc/programs/Xserver/fb/fballpriv.c:1.3	Wed Feb 23 12:29:41 2000
+++ xc/programs/Xserver/fb/fballpriv.c	Sat May  6 14:09:31 2000
@@ -21,11 +21,17 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.4 2000/05/06 21:09:31 keithp Exp $ */
 
 #include "fb.h"
 
+#ifdef FB_SCREEN_PRIVATE
+int fbScreenPrivateIndex;
+#endif
 int fbGCPrivateIndex;
+#ifndef FB_NO_WINDOW_PIXMAPS
+int fbWinPrivateIndex;
+#endif
 int fbGeneration;
 
 #ifdef FB_OLD_SCREEN
@@ -38,11 +44,34 @@
     if (fbGeneration != serverGeneration)
     {
 	fbGCPrivateIndex = miAllocateGCPrivateIndex ();
+#ifndef FB_NO_WINDOW_PIXMAPS
+	fbWinPrivateIndex = AllocateWindowPrivateIndex();
+#endif
+#ifdef FB_SCREEN_PRIVATE
+	fbScreenPrivateIndex = AllocateScreenPrivateIndex ();
+	if (fbScreenPrivateIndex == -1)
+	    return FALSE;
+#endif
+	
 	fbGeneration = serverGeneration;
     }
     if (pGCIndex)
 	*pGCIndex = fbGCPrivateIndex;
     if (!AllocateGCPrivate(pScreen, fbGCPrivateIndex, sizeof(FbGCPrivRec)))
 	return FALSE;
+#ifndef FB_NO_WINDOW_PIXMAPS
+    if (!AllocateWindowPrivate(pScreen, fbWinPrivateIndex, 0))
+	return FALSE;
+#endif
+#ifdef FB_SCREEN_PRIVATE
+    {
+	FbScreenPrivPtr	pScreenPriv;
+
+	pScreenPriv = (FbScreenPrivPtr) xalloc (sizeof (FbScreenPrivRec));
+	if (!pScreenPriv)
+	    return FALSE;
+	pScreen->devPrivates[fbScreenPrivateIndex].ptr = (pointer) pScreenPriv;
+    }
+#endif
     return TRUE;
 }
Index: xc/programs/Xserver/fb/fbarc.c
diff -u xc/programs/Xserver/fb/fbarc.c:1.3 xc/programs/Xserver/fb/fbarc.c:1.5
--- xc/programs/Xserver/fb/fbarc.c:1.3	Wed Feb 23 12:29:41 2000
+++ xc/programs/Xserver/fb/fbarc.c	Thu Apr  6 08:27:24 2000
@@ -21,10 +21,13 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.5 2000/04/06 15:27:24 dawes Exp $ */
 
 #include "fb.h"
 #include "mizerarc.h"
+#ifdef IN_MODULE
+#include "xf86_ansic.h"
+#endif
 
 typedef void	(*FbArc) (FbBits    *dst, 
 			  FbStride  dstStride, 
Index: xc/programs/Xserver/fb/fbbltone.c
diff -u xc/programs/Xserver/fb/fbbltone.c:1.7 xc/programs/Xserver/fb/fbbltone.c:1.9
--- xc/programs/Xserver/fb/fbbltone.c:1.7	Wed Feb 23 12:29:42 2000
+++ xc/programs/Xserver/fb/fbbltone.c	Sat May  6 14:09:32 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.7 2000/02/23 20:29:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.9 2000/05/06 21:09:32 keithp Exp $ */
 
 #include "fb.h"
 
@@ -823,7 +823,10 @@
 	    if (srcBits & srcMask)
 		dstBits |= dstMask;
 	    dstUnion |= dstMask;
-	    srcMask = FbScrRight(srcMask,srcBpp);
+	    if (srcBpp == FB_UNIT)
+		srcMask = 0;
+	    else
+		srcMask = FbScrRight(srcMask,srcBpp);
 	    dstMask = FbStipRight(dstMask,1);
 	}
 	if (dstUnion)
Index: xc/programs/Xserver/fb/fbcopy.c
diff -u xc/programs/Xserver/fb/fbcopy.c:1.4 xc/programs/Xserver/fb/fbcopy.c:1.7
--- xc/programs/Xserver/fb/fbcopy.c:1.4	Wed Feb 23 12:29:43 2000
+++ xc/programs/Xserver/fb/fbcopy.c	Sat May  6 14:09:32 2000
@@ -21,9 +21,12 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.4 2000/02/23 20:29:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.7 2000/05/06 21:09:32 keithp Exp $ */
 
 #include "fb.h"
+#ifdef IN_MODULE
+#include "xf86_ansic.h"
+#endif
 
 void
 fbCopyNtoN (DrawablePtr	pSrcDrawable,
@@ -599,8 +602,16 @@
 	    int		xOut, 
 	    int		yOut)
 {
+    fbCopyProc	copy;
+    
+#ifdef FB_24_32BIT
+    if (pSrcDrawable->bitsPerPixel != pDstDrawable->bitsPerPixel)
+	copy = fb24_32CopyMtoN;
+    else
+#endif
+	copy = fbCopyNtoN;
     return fbDoCopy (pSrcDrawable, pDstDrawable, pGC, xIn, yIn,
-		     widthSrc, heightSrc, xOut, yOut, fbCopyNtoN, 0, 0);
+		     widthSrc, heightSrc, xOut, yOut, copy, 0, 0);
 }
 
 RegionPtr
Index: xc/programs/Xserver/fb/fbgc.c
diff -u xc/programs/Xserver/fb/fbgc.c:1.6 xc/programs/Xserver/fb/fbgc.c:1.9
--- xc/programs/Xserver/fb/fbgc.c:1.6	Wed Feb 23 12:29:44 2000
+++ xc/programs/Xserver/fb/fbgc.c	Sat May  6 14:09:32 2000
@@ -21,9 +21,12 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.6 2000/02/23 20:29:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.9 2000/05/06 21:09:32 keithp Exp $ */
 
 #include "fb.h"
+#ifdef IN_MODULE
+#include "xf86_ansic.h"
+#endif
 
 const GCFuncs fbGCFuncs = {
     fbValidateGC,
@@ -77,6 +80,7 @@
     fbGetExpose(pGC) = 1;
     fbGetFreeCompClip(pGC) = 0;
     fbGetCompositeClip(pGC) = 0;
+    fbGetGCPrivate(pGC)->bpp = BitsPerPixel (pGC->depth);
     return TRUE;
 }
 
@@ -204,6 +208,28 @@
 	pPriv->oneRect = REGION_NUM_RECTS(fbGetCompositeClip(pGC)) == 1;
     }
     
+#ifdef FB_24_32BIT    
+    if (pPriv->bpp != pDrawable->bitsPerPixel)
+    {
+	changes |= GCStipple|GCForeground|GCBackground|GCPlaneMask;
+	pPriv->bpp = pDrawable->bitsPerPixel;
+    }
+    if (pGC->fillStyle == FillTiled)
+    {
+	PixmapPtr	pOldTile, pNewTile;
+
+	pOldTile = pGC->tile.pixmap;
+	if (pOldTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel)
+	{
+	    pNewTile = fb24_32ReformatTile (pOldTile, pDrawable->bitsPerPixel);
+	    if (pNewTile)
+	    {
+		pGC->tile.pixmap = pNewTile;
+		changes |= GCTile;
+	    }
+	}
+    }
+#endif
     if (changes & GCTile)
     {
 	if (!pGC->tileIsPixel && 
Index: xc/programs/Xserver/fb/fbgetsp.c
diff -u xc/programs/Xserver/fb/fbgetsp.c:1.4 xc/programs/Xserver/fb/fbgetsp.c:1.5
--- xc/programs/Xserver/fb/fbgetsp.c:1.4	Wed Feb 23 12:29:44 2000
+++ xc/programs/Xserver/fb/fbgetsp.c	Sat May  6 14:09:33 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.4 2000/02/23 20:29:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.5 2000/05/06 21:09:33 keithp Exp $ */
 
 #include "fb.h"
 
@@ -44,6 +44,14 @@
      */
     if (!fbDrawableEnabled(pDrawable))
 	return;
+    
+#ifdef FB_24_32BIT
+    if (pDrawable->bitsPerPixel != BitsPerPixel(pDrawable->depth))
+    {
+	fb24_32GetSpans (pDrawable, wMax, ppt, pwidth, nspans, pchardstStart);
+	return;
+    }
+#endif
     
     fbGetDrawable (pDrawable, src, srcStride, srcBpp);
     
Index: xc/programs/Xserver/fb/fbimage.c
diff -u xc/programs/Xserver/fb/fbimage.c:1.5 xc/programs/Xserver/fb/fbimage.c:1.6
--- xc/programs/Xserver/fb/fbimage.c:1.5	Wed Feb 23 12:29:45 2000
+++ xc/programs/Xserver/fb/fbimage.c	Sat May  6 14:09:33 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.5 2000/02/23 20:29:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.6 2000/05/06 21:09:33 keithp Exp $ */
 
 #include "fb.h"
 #ifdef XFree86LOADER
@@ -88,13 +88,29 @@
 	}
 	break;
     case ZPixmap:
-	srcStride = PixmapBytePad(w, pDrawable->depth) / sizeof (FbStip);
-	fbPutZImage (pDrawable,
-		     fbGetCompositeClip(pGC),
-		     pGC->alu,
-		     pPriv->pm,
-		     x, y, w, h, 
-		     src, srcStride);
+#ifdef FB_24_32BIT
+	if (pDrawable->bitsPerPixel != BitsPerPixel(pDrawable->depth))
+	{
+	    srcStride = PixmapBytePad(w, pDrawable->depth);
+	    fb24_32PutZImage (pDrawable,
+			      fbGetCompositeClip(pGC),
+			      pGC->alu,
+			      (FbBits) pGC->planemask,
+			      x, y, w, h,
+			      (CARD8 *) pImage,
+			      srcStride);
+	}
+	else
+#endif
+	{
+	    srcStride = PixmapBytePad(w, pDrawable->depth) / sizeof (FbStip);
+	    fbPutZImage (pDrawable,
+			 fbGetCompositeClip(pGC),
+			 pGC->alu,
+			 pPriv->pm,
+			 x, y, w, h, 
+			 src, srcStride);
+	}
     }
 }
 
@@ -283,6 +299,15 @@
      */
     if (!fbDrawableEnabled(pDrawable))
 	return;
+    
+#ifdef FB_24_32BIT
+    if (format == ZPixmap &&
+	pDrawable->bitsPerPixel != BitsPerPixel (pDrawable->depth))
+    {
+	fb24_32GetImage (pDrawable, x, y, w, h, format, planeMask, d);
+	return;
+    }
+#endif
     
     fbGetDrawable (pDrawable, src, srcStride, srcBpp);
     
Index: xc/programs/Xserver/fb/fboverlay.c
diff -u /dev/null xc/programs/Xserver/fb/fboverlay.c:1.2
--- /dev/null	Sat Jul  1 20:42:11 2000
+++ xc/programs/Xserver/fb/fboverlay.c	Thu May 11 11:14:13 2000
@@ -0,0 +1,192 @@
+/*
+ * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.2 2000/05/11 18:14:13 tsi Exp $
+ *
+ * Copyright © 2000 SuSE, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of SuSE not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  SuSE makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Keith Packard, SuSE, Inc.
+ */
+
+#include "fb.h"
+#include "fboverlay.h"
+
+int	fbOverlayGeneration;
+int	fbOverlayScreenPrivateIndex;
+
+/*
+ * Replace this if you want something supporting
+ * multiple overlays with the same depth
+ */
+Bool
+fbOverlayCreateWindow(WindowPtr pWin)
+{
+    FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
+    int			i;
+    
+    if (pWin->drawable.class != InputOutput)
+	return TRUE;
+    for (i = 0; i < pScrPriv->nlayers; i++)
+	 if (pWin->drawable.depth == pScrPriv->pLayer[i]->drawable.depth)
+	 {
+	    pWin->devPrivates[fbWinPrivateIndex].ptr = (pointer) pScrPriv->pLayer[i];
+	    return TRUE;
+	 }
+    return FALSE;
+}
+
+Bool
+fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen)
+{
+    FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pScreen);
+    int			i;
+
+    for (i = 0; i < pScrPriv->nlayers; i++)
+	(*pScreen->DestroyPixmap)(pScrPriv->pLayer[i]);
+    return TRUE;
+}
+
+Bool
+fbOverlayCreateScreenResources(ScreenPtr pScreen)
+{
+    int			i;
+    FbOverlayScrInitPtr	pInit = (FbOverlayScrInitPtr) (pScreen)->devPrivates[fbOverlayScreenPrivateIndex].ptr;
+    FbOverlayScrPrivPtr	pScrPriv;
+    PixmapPtr		pPixmap;
+    FbOverlayInitPtr	overlay;
+    
+    if (!miCreateScreenResources(pScreen))
+	return FALSE;
+    
+    pScrPriv = xalloc (sizeof (FbOverlayScrPrivRec));
+    if (!pScrPriv)
+	return FALSE;
+
+    for (i = 0; i < pInit->nlayers; i++)
+    {
+	overlay = &pInit->init[i];
+	pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, overlay->depth);
+	if (!pPixmap)
+	    return FALSE;
+	if (!(*pScreen->ModifyPixmapHeader)(pPixmap, pScreen->width,
+					    pScreen->height, overlay->depth,
+					    BitsPerPixel(overlay->depth),
+					    PixmapBytePad(overlay->width, overlay->depth),
+					    overlay->pbits))
+	    return FALSE;
+	pScrPriv->pLayer[i] = pPixmap;
+    }
+    pScrPriv->nlayers = pInit->nlayers;
+    xfree (pInit);
+    (pScreen)->devPrivates[fbOverlayScreenPrivateIndex].ptr = (pointer) pScrPriv;
+    pScreen->devPrivate = pScrPriv->pLayer[0];
+    return TRUE;
+}
+
+Bool
+fbOverlaySetupScreen(ScreenPtr	pScreen,
+		     pointer	pbits1,
+		     pointer	pbits2,
+		     int	xsize,
+		     int	ysize,
+		     int	dpix,
+		     int	dpiy,
+		     int	width1,
+		     int	width2,
+		     int	bpp1,
+		     int	bpp2)
+{
+    return fbSetupScreen (pScreen,
+			  pbits1,
+			  xsize,
+			  ysize,
+			  dpix,
+			  dpiy,
+			  width1,
+			  bpp1);
+}
+
+Bool
+fbOverlayFinishScreenInit(ScreenPtr	pScreen,
+			  pointer	pbits1,
+			  pointer	pbits2,
+			  int		xsize,
+			  int		ysize,
+			  int		dpix,
+			  int		dpiy,
+			  int		width1,
+			  int		width2,
+			  int		bpp1,
+			  int		bpp2,
+			  int		depth1,
+			  int		depth2)
+{
+    VisualPtr	visuals;
+    DepthPtr	depths;
+    int		nvisuals;
+    int		ndepths;
+    VisualID	defaultVisual;
+    FbOverlayScrInitPtr	pInit;
+
+    if (fbOverlayGeneration != serverGeneration)
+    {
+	fbOverlayScreenPrivateIndex = AllocateScreenPrivateIndex ();
+	fbOverlayGeneration = serverGeneration;
+    }
+    
+    pInit = xalloc (sizeof (FbOverlayScrInitRec));
+    if (!pInit)
+	return FALSE;
+    
+    
+    if (!fbInitVisuals (&visuals, &depths, &nvisuals, &ndepths, &depth1,
+			&defaultVisual, ((unsigned long)1<<(bpp1-1)) |
+			((unsigned long)1<<(bpp2-1)), 8))
+	return FALSE;
+    if (! miScreenInit(pScreen, 0, xsize, ysize, dpix, dpiy, 0,
+			depth1, ndepths, depths,
+			defaultVisual, nvisuals, visuals
+#ifdef FB_OLD_SCREEN
+		       , (miBSFuncPtr) 0
+#endif
+		       ))
+	return FALSE;
+    /* MI thinks there's no frame buffer */
+#ifdef MITSHM
+    ShmRegisterFbFuncs(pScreen);
+#endif
+    pScreen->minInstalledCmaps = 1;
+    pScreen->maxInstalledCmaps = 2;
+    
+    pInit->nlayers = 2;
+    pInit->init[0].pbits = pbits1;
+    pInit->init[0].width = width1;
+    pInit->init[0].depth = depth1;
+    
+    pInit->init[1].pbits = pbits2;
+    pInit->init[1].width = width2;
+    pInit->init[1].depth = depth2;
+
+    pScreen->devPrivates[fbOverlayScreenPrivateIndex].ptr = (pointer) pInit;
+    
+    /* overwrite miCloseScreen with our own */
+    pScreen->CloseScreen = fbOverlayCloseScreen;
+    pScreen->CreateScreenResources = fbOverlayCreateScreenResources;
+    pScreen->CreateWindow = fbOverlayCreateWindow;
+    return TRUE;
+}
Index: xc/programs/Xserver/fb/fboverlay.h
diff -u /dev/null xc/programs/Xserver/fb/fboverlay.h:1.2
--- /dev/null	Sat Jul  1 20:42:11 2000
+++ xc/programs/Xserver/fb/fboverlay.h	Thu May 11 11:14:13 2000
@@ -0,0 +1,91 @@
+/*
+ * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.2 2000/05/11 18:14:13 tsi Exp $
+ *
+ * Copyright © 2000 SuSE, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of SuSE not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  SuSE makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Keith Packard, SuSE, Inc.
+ */
+
+#ifndef _FBOVERLAY_H_
+#define _FBOVERLAY_H_
+
+extern int	fbOverlayGeneration;
+extern int	fbOverlayScreenPrivateIndex;
+
+#define FB_OVERLAY_MAX	3
+
+typedef struct _fbOverlayScrPriv {
+    int		nlayers;
+    PixmapPtr	pLayer[FB_OVERLAY_MAX];
+} FbOverlayScrPrivRec, *FbOverlayScrPrivPtr;
+
+#define fbOverlayGetScrPriv(s)	((FbOverlayScrPrivPtr) \
+				 (s)->devPrivates[fbOverlayScreenPrivateIndex].ptr)
+
+typedef struct _fbOverlayInit {
+    pointer		pbits;
+    int			width;
+    int			depth;
+} FbOverlayInitRec, *FbOverlayInitPtr;
+
+typedef struct _fbOverlayScrInit {
+    int			nlayers;
+    FbOverlayInitRec	init[FB_OVERLAY_MAX];
+} FbOverlayScrInitRec, *FbOverlayScrInitPtr;
+
+Bool
+fbOverlayCreateWindow(WindowPtr pWin);
+
+Bool
+fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen);
+
+Bool
+fbOverlayCreateScreenResources(ScreenPtr pScreen);
+
+
+Bool
+fbOverlaySetupScreen(ScreenPtr	pScreen,
+		     pointer	pbits1,
+		     pointer	pbits2,
+		     int	xsize,
+		     int	ysize,
+		     int	dpix,
+		     int	dpiy,
+		     int	width1,
+		     int	width2,
+		     int	bpp1,
+		     int	bpp2);
+
+Bool
+fbOverlayFinishScreenInit(ScreenPtr	pScreen,
+			  pointer	pbits1,
+			  pointer	pbits2,
+			  int		xsize,
+			  int		ysize,
+			  int		dpix,
+			  int		dpiy,
+			  int		width1,
+			  int		width2,
+			  int		bpp1,
+			  int		bpp2,
+			  int		depth1,
+			  int		depth2);
+
+#endif /* _FBOVERLAY_H_ */
Index: xc/programs/Xserver/fb/fbpixmap.c
diff -u xc/programs/Xserver/fb/fbpixmap.c:1.3 xc/programs/Xserver/fb/fbpixmap.c:1.7
--- xc/programs/Xserver/fb/fbpixmap.c:1.3	Wed Feb 23 12:29:45 2000
+++ xc/programs/Xserver/fb/fbpixmap.c	Sat May  6 14:09:34 2000
@@ -21,21 +21,22 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.3 2000/02/23 20:29:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.7 2000/05/06 21:09:34 keithp Exp $ */
 
 #include "fb.h"
+#ifdef IN_MODULE
+#include "xf86_ansic.h"
+#endif
 
 PixmapPtr
-fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth)
+fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
 {
     PixmapPtr	pPixmap;
     int		datasize;
     int		paddedWidth;
-    int		bpp;
     int		adjust;
     int		base;
 
-    bpp = BitsPerPixel(depth);
     paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
     datasize = height * paddedWidth;
 #ifdef PIXPRIV
@@ -74,6 +75,19 @@
     return pPixmap;
 }
 
+PixmapPtr
+fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth)
+{
+    int	bpp;
+
+    bpp = BitsPerPixel (depth);
+#ifdef FB_SCREEN_PRIVATE
+    if (bpp == 32)
+	bpp = fbGetScreenPrivate(pScreen)->pix32bpp;
+#endif
+    return fbCreatePixmapBpp (pScreen, width, height, depth, bpp);
+}
+
 Bool
 fbDestroyPixmap (PixmapPtr pPixmap)
 {
@@ -130,7 +144,7 @@
     register FbBits	mask0 = FB_ALLONES & ~FbScrRight(FB_ALLONES, 1);
     FbBits		*pwLine;
     int			nWidth;
-
+    
     pReg = REGION_CREATE(pPix->drawable.pScreen, NULL, 1);
     if(!pReg)
 	return NullRegion;
Index: xc/programs/Xserver/fb/fbscreen.c
diff -u xc/programs/Xserver/fb/fbscreen.c:1.8 xc/programs/Xserver/fb/fbscreen.c:1.9
--- xc/programs/Xserver/fb/fbscreen.c:1.8	Wed Feb 23 12:29:46 2000
+++ xc/programs/Xserver/fb/fbscreen.c	Sat May  6 14:09:34 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.8 2000/02/23 20:29:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.9 2000/05/06 21:09:34 keithp Exp $ */
 
 #include "fb.h"
 
@@ -146,6 +146,7 @@
     int		ndepths;
     int		rootdepth;
     VisualID	defaultVisual;
+    int		imagebpp = bpp;
 
 #ifdef FB_DEBUG
     int	stride;
@@ -158,9 +159,43 @@
     fbSetBits ((FbStip *) ((char *) pbits + stride * ysize),
 			   stride / sizeof (FbStip), FB_TAIL_BITS);
 #endif
+    /*
+     * By default, a 24bpp screen will use 32bpp images, this avoids
+     * problems with many applications which just can't handle packed
+     * pixels.  If you want real 24bit images, include a 24bpp
+     * format in the pixmap formats
+     */
+#ifdef FB_24_32BIT
+    if (bpp == 24)
+    {
+	int	f;
+	
+	imagebpp = 32;
+	/*
+	 * Check to see if we're advertising a 24bpp image format,
+	 * in which case windows will use it in preference to a 32 bit
+	 * format.
+	 */
+	for (f = 0; f < screenInfo.numPixmapFormats; f++)
+	{
+	    if (screenInfo.formats[f].bitsPerPixel == 24)
+	    {
+		imagebpp = 24;
+		break;
+	    }
+	}	    
+    }
+#endif
+#ifdef FB_SCREEN_PRIVATE
+    if (imagebpp == 32)
+    {
+	fbGetScreenPrivate(pScreen)->win32bpp = bpp;
+	fbGetScreenPrivate(pScreen)->pix32bpp = bpp;
+    }
+#endif
     rootdepth = 0;
     if (!fbInitVisuals (&visuals, &depths, &nvisuals, &ndepths, &rootdepth,
-			&defaultVisual,((unsigned long)1<<(bpp-1)), 8))
+			&defaultVisual,((unsigned long)1<<(imagebpp-1)), 8))
 	return FALSE;
     if (! miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
 			rootdepth, ndepths, depths,
@@ -172,6 +207,13 @@
 	return FALSE;
     /* overwrite miCloseScreen with our own */
     pScreen->CloseScreen = fbCloseScreen;
+#ifdef FB_24_32BIT
+    if (bpp == 24 && imagebpp == 32)
+    {
+	pScreen->ModifyPixmapHeader = fb24_32ModifyPixmapHeader;
+	pScreen->CreateScreenResources = fb24_32CreateScreenResources;
+    }
+#endif
 #if 0
     /* leave backing store initialization to the enclosing code so
      * it can choose the correct order of wrappers
Index: xc/programs/Xserver/fb/fbsetsp.c
diff -u xc/programs/Xserver/fb/fbsetsp.c:1.3 xc/programs/Xserver/fb/fbsetsp.c:1.4
--- xc/programs/Xserver/fb/fbsetsp.c:1.3	Wed Feb 23 12:29:47 2000
+++ xc/programs/Xserver/fb/fbsetsp.c	Sat May  6 14:09:34 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.3 2000/02/23 20:29:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.4 2000/05/06 21:09:34 keithp Exp $ */
 
 #include "fb.h"
 
@@ -44,6 +44,13 @@
     int		    xoff;
     int		    x1, x2;
     
+#ifdef FB_24_32BIT
+    if (pDrawable->bitsPerPixel != BitsPerPixel(pDrawable->depth))
+    {
+	fb24_32SetSpans (pDrawable, pGC, src, ppt, pwidth, nspans, fSorted);
+	return;
+    }
+#endif
     fbGetDrawable (pDrawable, dst, dstStride, dstBpp);
     while (nspans--)
     {
Index: xc/programs/Xserver/fb/fbwindow.c
diff -u xc/programs/Xserver/fb/fbwindow.c:1.3 xc/programs/Xserver/fb/fbwindow.c:1.6
--- xc/programs/Xserver/fb/fbwindow.c:1.3	Wed Feb 23 12:29:48 2000
+++ xc/programs/Xserver/fb/fbwindow.c	Sat May  6 14:09:34 2000
@@ -21,13 +21,24 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.3 2000/02/23 20:29:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.6 2000/05/06 21:09:34 keithp Exp $ */
 
 #include "fb.h"
+#ifdef IN_MODULE
+#include "xf86_ansic.h"
+#endif
 
 Bool
 fbCreateWindow(WindowPtr pWin)
 {
+#ifndef FB_NO_WINDOW_PIXMAPS
+    pWin->devPrivates[fbWinPrivateIndex].ptr = 
+	(pointer) fbGetScreenPixmap(pWin->drawable.pScreen);
+#endif
+#ifdef FB_SCREEN_PRIVATE
+    if (pWin->drawable.bitsPerPixel == 32)
+	pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp;
+#endif
     return TRUE;
 }
 
@@ -140,6 +151,15 @@
 	if (pWin->backgroundState == BackgroundPixmap)
 	{
 	    pPixmap = pWin->background.pixmap;
+#ifdef FB_24_32BIT
+	    if (pPixmap->drawable.bitsPerPixel != pWin->drawable.bitsPerPixel)
+	    {
+		pPixmap = fb24_32ReformatTile (pPixmap,
+					       pWin->drawable.bitsPerPixel);
+		if (pPixmap)
+		    pWin->background.pixmap = pPixmap;
+	    }
+#endif
 	    if (FbEvenTile (pPixmap->drawable.width *
 			    pPixmap->drawable.bitsPerPixel))
 		fbPadPixmap (pPixmap);
@@ -150,6 +170,16 @@
 	if (pWin->borderIsPixel == FALSE)
 	{
 	    pPixmap = pWin->border.pixmap;
+#ifdef FB_24_32BIT
+	    if (pPixmap->drawable.bitsPerPixel !=
+		pWin->drawable.bitsPerPixel)
+	    {
+		pPixmap = fb24_32ReformatTile (pPixmap,
+					       pWin->drawable.bitsPerPixel);
+		if (pPixmap)
+		    pWin->border.pixmap = pPixmap;
+	    }
+#endif
 	    if (FbEvenTile (pPixmap->drawable.width *
 			    pPixmap->drawable.bitsPerPixel))
 		fbPadPixmap (pPixmap);
Index: xc/programs/Xserver/hw/kdrive/kcmap.c
diff -u xc/programs/Xserver/hw/kdrive/kcmap.c:1.2 xc/programs/Xserver/hw/kdrive/kcmap.c:1.4
--- xc/programs/Xserver/hw/kdrive/kcmap.c:1.2	Wed Feb 23 12:29:52 2000
+++ xc/programs/Xserver/hw/kdrive/kcmap.c	Wed May 24 16:57:56 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kcmap.c,v 1.2 2000/02/23 20:29:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/kcmap.c,v 1.4 2000/05/24 23:57:56 keithp Exp $ */
 
 #include "kdrive.h"
 
@@ -30,10 +30,10 @@
  */
 
 void
-KdSetColormap (ScreenPtr pScreen)
+KdSetColormap (ScreenPtr pScreen, int fb)
 {
     KdScreenPriv(pScreen);
-    ColormapPtr	pCmap = pScreenPriv->pInstalledmap;
+    ColormapPtr	pCmap = pScreenPriv->pInstalledmap[fb];
     Pixel	pixels[KD_MAX_PSEUDO_SIZE];
     xrgb	colors[KD_MAX_PSEUDO_SIZE];
     xColorItem	defs[KD_MAX_PSEUDO_SIZE];
@@ -41,7 +41,7 @@
 
     if (!pScreenPriv->card->cfuncs->putColors)
 	return;
-    if (pScreenPriv->screen->depth > KD_MAX_PSEUDO_DEPTH)
+    if (pScreenPriv->screen->fb[fb].depth > KD_MAX_PSEUDO_DEPTH)
 	return;
     
     if (!pScreenPriv->enabled)
@@ -55,12 +55,12 @@
      * true/direct as well as pseudo/static visuals
      */
     
-    for (i = 0; i < (1 << pScreenPriv->screen->depth); i++)
+    for (i = 0; i < (1 << pScreenPriv->screen->fb[fb].depth); i++)
 	pixels[i] = i;
 
-    QueryColors (pCmap, (1 << pScreenPriv->screen->depth), pixels, colors);
+    QueryColors (pCmap, (1 << pScreenPriv->screen->fb[fb].depth), pixels, colors);
     
-    for (i = 0; i < (1 << pScreenPriv->screen->depth); i++)
+    for (i = 0; i < (1 << pScreenPriv->screen->fb[fb].depth); i++)
     {
 	defs[i].pixel = i;
 	defs[i].red = colors[i].red;
@@ -69,9 +69,9 @@
 	defs[i].flags = DoRed|DoGreen|DoBlue;
     }
 
-    (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen, 
-					   (1 << pScreenPriv->screen->depth),
-					   defs);
+    (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen, fb,
+					     (1 << pScreenPriv->screen->fb[fb].depth),
+					     defs);
 
     /* recolor hardware cursor */
     if (pScreenPriv->card->cfuncs->recolorCursor)
@@ -87,35 +87,80 @@
 {
     KdScreenPriv(pScreen);
     int	    i;
+    int	    fb;
+    Bool    done = FALSE;
 
     if (!pScreenPriv->card->cfuncs->putColors)
 	return;
-    if (pScreenPriv->screen->depth <= KD_MAX_PSEUDO_DEPTH)
+    for (fb = 0; fb < KD_MAX_FB && pScreenPriv->screen->fb[fb].depth; fb++)
     {
-	for (i = 0; i < (1 << pScreenPriv->screen->depth); i++)
-	    pScreenPriv->systemPalette[i].pixel = i;
-	(*pScreenPriv->card->cfuncs->getColors) (pScreen,
-					       (1 << pScreenPriv->screen->depth),
-					       pScreenPriv->systemPalette);
+	if (pScreenPriv->screen->fb[fb].depth <= KD_MAX_PSEUDO_DEPTH && !done)
+	{
+	    for (i = 0; i < (1 << pScreenPriv->screen->fb[fb].depth); i++)
+		pScreenPriv->systemPalette[i].pixel = i;
+	    (*pScreenPriv->card->cfuncs->getColors) (pScreen, fb,
+						   (1 << pScreenPriv->screen->fb[fb].depth),
+						   pScreenPriv->systemPalette);
+	    done = TRUE;
+	}
+	KdSetColormap (pScreen, fb);
     }
-    KdSetColormap (pScreen);
 }
 
 void
 KdDisableColormap (ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
+    int	    fb;
 
     if (!pScreenPriv->card->cfuncs->putColors)
-	return;
-    if (pScreenPriv->screen->depth > KD_MAX_PSEUDO_DEPTH)
 	return;
-    
-    (*pScreenPriv->card->cfuncs->putColors) (pScreen,
-					   (1 << pScreenPriv->screen->depth),
-					   pScreenPriv->systemPalette);
+    for (fb = 0; fb < KD_MAX_FB && pScreenPriv->screen->fb[fb].depth; fb++)
+    {
+	if (pScreenPriv->screen->fb[fb].depth <= KD_MAX_PSEUDO_DEPTH)
+	{
+	    (*pScreenPriv->card->cfuncs->putColors) (pScreen, fb,
+						     (1 << pScreenPriv->screen->fb[fb].depth),
+						     pScreenPriv->systemPalette);
+	    break;
+	}
+    }
 }
 
+int
+KdColormapFb (ColormapPtr   pCmap)
+{
+    ScreenPtr	pScreen = pCmap->pScreen;
+    KdScreenPriv (pScreen);
+    KdScreenInfo    *screen = pScreenPriv->screen;
+    int		d;
+    DepthPtr	depth;
+    int		v, vi;
+    VisualPtr	visual;
+    VisualID	vid = pCmap->pVisual->vid;
+    int		fb;
+
+    if (screen->fb[1].depth)
+    {
+	for (d = 0; d < pScreen->numDepths; d++)
+	{
+	    depth = &pScreen->allowedDepths[d];
+	    for (v = 0; v < depth->numVids; v++)
+	    {
+		if (depth->vids[v] == vid)
+		{
+		    for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++)
+		    {
+			if (depth->depth == screen->fb[fb].depth)
+			    return fb;
+		    }
+		}
+	    }
+	}
+    }
+    return 0;
+}
+
 /*
  * KdInstallColormap
  *
@@ -129,19 +174,20 @@
 KdInstallColormap (ColormapPtr pCmap)
 {
     KdScreenPriv(pCmap->pScreen);
+    int		fb = KdColormapFb (pCmap);
 
-    if (pCmap == pScreenPriv->pInstalledmap)
+    if (pCmap == pScreenPriv->pInstalledmap[fb])
 	return;
 
     /* Tell X clients that the installed colormap is going away. */
-    if (pScreenPriv->pInstalledmap)
-	WalkTree(pScreenPriv->pInstalledmap->pScreen, TellLostMap,
-		 (pointer) &(pScreenPriv->pInstalledmap->mid));
+    if (pScreenPriv->pInstalledmap[fb])
+	WalkTree(pScreenPriv->pInstalledmap[fb]->pScreen, TellLostMap,
+		 (pointer) &(pScreenPriv->pInstalledmap[fb]->mid));
 
     /* Take note of the new installed colorscreen-> */
-    pScreenPriv->pInstalledmap = pCmap;
+    pScreenPriv->pInstalledmap[fb] = pCmap;
 
-    KdSetColormap (pCmap->pScreen);
+    KdSetColormap (pCmap->pScreen, fb);
     
     /* Tell X clients of the new colorscreen-> */
     WalkTree(pCmap->pScreen, TellGainedMap, (pointer) &(pCmap->mid));
@@ -157,8 +203,9 @@
 KdUninstallColormap (ColormapPtr pCmap)
 {
     KdScreenPriv(pCmap->pScreen);
+    int		fb = KdColormapFb (pCmap);
 
-    if (pCmap == pScreenPriv->pInstalledmap) 
+    if (pCmap == pScreenPriv->pInstalledmap[0]) 
     {
 	Colormap defMapID = pCmap->pScreen->defColormap;
 
@@ -176,13 +223,18 @@
 KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps)
 {
     KdScreenPriv(pScreen);
+    int		fb;
+    int		n = 0;
     
-    if (pScreenPriv->pInstalledmap)
+    for (fb = 0; fb < KD_MAX_FB && pScreenPriv->screen->fb[fb].depth; fb++)
     {
-	*pCmaps = pScreenPriv->pInstalledmap->mid;
-	return 1;
+	if (pScreenPriv->pInstalledmap[fb])
+	{
+	    *pCmaps++ = pScreenPriv->pInstalledmap[fb]->mid;
+	    n++;
+	}
     }
-    return 0;
+    return n;
 }
 
 /*
@@ -198,14 +250,15 @@
     KdScreenPriv(pCmap->pScreen);
     VisualPtr           pVisual;
     xColorItem          expanddefs[KD_MAX_PSEUDO_SIZE];
+    int			fb = KdColormapFb (pCmap);
 
-    if (pCmap != pScreenPriv->pInstalledmap)
+    if (pCmap != pScreenPriv->pInstalledmap[fb])
 	return;
     
     if (!pScreenPriv->card->cfuncs->putColors)
 	return;
     
-    if (pScreenPriv->screen->depth > KD_MAX_PSEUDO_DEPTH)
+    if (pScreenPriv->screen->fb[fb].depth > KD_MAX_PSEUDO_DEPTH)
 	return;
     
     if (!pScreenPriv->enabled)
@@ -223,7 +276,7 @@
 	pdefs = expanddefs;
     }
 
-    (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen, ndef, pdefs);
+    (*pScreenPriv->card->cfuncs->putColors) (pCmap->pScreen, fb, ndef, pdefs);
     
     /* recolor hardware cursor */
     if (pScreenPriv->card->cfuncs->recolorCursor)
Index: xc/programs/Xserver/hw/kdrive/kcurscol.c
diff -u xc/programs/Xserver/hw/kdrive/kcurscol.c:1.2 xc/programs/Xserver/hw/kdrive/kcurscol.c:1.4
--- xc/programs/Xserver/hw/kdrive/kcurscol.c:1.2	Wed Feb 23 12:29:53 2000
+++ xc/programs/Xserver/hw/kdrive/kcurscol.c	Thu May 11 11:14:13 2000
@@ -1,5 +1,5 @@
 /*
- * Id: kcurscol.c,v 1.3 1999/12/21 03:51:56 keithp Exp $
+ * $XFree86: xc/programs/Xserver/hw/kdrive/kcurscol.c,v 1.4 2000/05/11 18:14:13 tsi Exp $
  *
  * Copyright © 1999 Keith Packard
  *
@@ -45,6 +45,7 @@
 
 void
 KdAllocateCursorPixels (ScreenPtr	pScreen,
+			int		fb,
 			CursorPtr	pCursor, 
 			Pixel		*source,
 			Pixel		*mask)
@@ -53,18 +54,18 @@
     int		    r, g, b;
     KdScreenPriv(pScreen);
 
-    if (pScreenPriv->screen->redMask)
+    if (pScreenPriv->screen->fb[fb].redMask)
     {
 
-	r = KdComputeCmapShift (pScreenPriv->screen->redMask);
-	g = KdComputeCmapShift (pScreenPriv->screen->greenMask);
-	b = KdComputeCmapShift (pScreenPriv->screen->blueMask);
-	*source = ((Shift(pCursor->foreRed,r) & pScreenPriv->screen->redMask) |
-			    (Shift(pCursor->foreGreen,g) & pScreenPriv->screen->greenMask) |
-			    (Shift(pCursor->foreBlue,b) & pScreenPriv->screen->blueMask));
-	*mask = ((Shift(pCursor->backRed,r) & pScreenPriv->screen->redMask) |
-			  (Shift(pCursor->backGreen,g) & pScreenPriv->screen->greenMask) |
-			  (Shift(pCursor->backBlue,b) & pScreenPriv->screen->blueMask));
+	r = KdComputeCmapShift (pScreenPriv->screen->fb[fb].redMask);
+	g = KdComputeCmapShift (pScreenPriv->screen->fb[fb].greenMask);
+	b = KdComputeCmapShift (pScreenPriv->screen->fb[fb].blueMask);
+	*source = ((Shift(pCursor->foreRed,r) & pScreenPriv->screen->fb[fb].redMask) |
+			    (Shift(pCursor->foreGreen,g) & pScreenPriv->screen->fb[fb].greenMask) |
+			    (Shift(pCursor->foreBlue,b) & pScreenPriv->screen->fb[fb].blueMask));
+	*mask = ((Shift(pCursor->backRed,r) & pScreenPriv->screen->fb[fb].redMask) |
+			  (Shift(pCursor->backGreen,g) & pScreenPriv->screen->fb[fb].greenMask) |
+			  (Shift(pCursor->backBlue,b) & pScreenPriv->screen->fb[fb].blueMask));
     }
     else
     {
@@ -79,13 +80,13 @@
 	sourceColor.red = pCursor->foreRed;
 	sourceColor.green = pCursor->foreGreen;
 	sourceColor.blue = pCursor->foreBlue;
-	FakeAllocColor(pScreenPriv->pInstalledmap, &sourceColor);
+	FakeAllocColor(pScreenPriv->pInstalledmap[fb], &sourceColor);
 	maskColor.red = pCursor->backRed;
 	maskColor.green = pCursor->backGreen;
 	maskColor.blue = pCursor->backBlue;
-	FakeAllocColor(pScreenPriv->pInstalledmap, &maskColor);
-	FakeFreeColor(pScreenPriv->pInstalledmap, sourceColor.pixel);
-	FakeFreeColor(pScreenPriv->pInstalledmap, maskColor.pixel);
+	FakeAllocColor(pScreenPriv->pInstalledmap[fb], &maskColor);
+	FakeFreeColor(pScreenPriv->pInstalledmap[fb], sourceColor.pixel);
+	FakeFreeColor(pScreenPriv->pInstalledmap[fb], maskColor.pixel);
 	*source = sourceColor.pixel;
 	*mask = maskColor.pixel;
     }
Index: xc/programs/Xserver/hw/kdrive/kdrive.c
diff -u xc/programs/Xserver/hw/kdrive/kdrive.c:1.3 xc/programs/Xserver/hw/kdrive/kdrive.c:1.5
--- xc/programs/Xserver/hw/kdrive/kdrive.c:1.3	Wed Feb 23 12:29:53 2000
+++ xc/programs/Xserver/hw/kdrive/kdrive.c	Wed May 24 16:57:56 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.3 2000/02/23 20:29:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.5 2000/05/24 23:57:56 keithp Exp $ */
 
 #include "kdrive.h"
 #ifdef PSEUDO8
@@ -58,7 +58,7 @@
 #ifndef FB_OLD_SCREEN
     WindowPtr	pWin = WindowTable[pScreen->myNum];
     WindowPtr	pChild;
-    Bool	WasViewable = (Bool)(pWin->viewable);
+    Bool	WasViewable;
     Bool	anyMarked;
     RegionPtr	pOldClip, bsExposed;
 #ifdef DO_SAVE_UNDERS
@@ -67,6 +67,9 @@
     WindowPtr   pLayerWin;
     BoxRec	box;
 
+    if (!pWin)
+	return;
+    WasViewable = (Bool)(pWin->viewable);
     if (WasViewable)
     {
 	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)
@@ -301,10 +304,14 @@
 KdParseScreen (KdScreenInfo *screen,
 	       char	    *arg)
 {
+    char    *bpp;
+    int	    fb;
+    
     screen->width = 0;
     screen->height = 0;
-    screen->depth = 0;
     screen->rate = 0;
+    for (fb = 0; fb < KD_MAX_FB; fb++)
+	screen->fb[fb].depth = 0;
     if (!arg)
 	return;
     
@@ -319,8 +326,28 @@
     if (!arg)
 	return;
     arg++;
+
+    fb = 0;
+    while (fb < KD_MAX_FB)
+    {
+	screen->fb[fb].depth = atoi(arg);
+    
+	bpp = strchr (arg, '/');
+	if (bpp)
+	{
+	    bpp++;
+	    screen->fb[fb].bitsPerPixel = atoi(bpp);
+	    arg = bpp;
+	}
+	else
+	    screen->fb[fb].bitsPerPixel = 0;
+	bpp = strchr (arg, ',');
+	if (!bpp)
+	    break;
+	arg = bpp+1;
+	fb++;
+    }
 
-    screen->depth = atoi(arg);
     arg = strchr (arg, 'x');
     if (!arg)
 	return;
@@ -551,7 +578,7 @@
 	}
     }
 #endif
-    return TRUE;
+    return fbCreateWindow (pWin);
 }
 
 /* Pass through AddScreen, which doesn't take any closure */
@@ -563,6 +590,7 @@
     KdScreenInfo	*screen = kdCurrentScreen;
     KdCardInfo		*card = screen->card;
     KdPrivScreenPtr	pScreenPriv;
+    int			fb;
 
     KdAllocatePrivates (pScreen);
 
@@ -571,7 +599,8 @@
     screen->pScreen = pScreen;
     pScreenPriv->screen = screen;
     pScreenPriv->card = card;
-    pScreenPriv->bytesPerPixel = screen->bitsPerPixel >> 3;
+    for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++)
+	pScreenPriv->bytesPerPixel[fb] = screen->fb[fb].bitsPerPixel >> 3;
     pScreenPriv->dpmsState = KD_DPMS_NORMAL;
 
     /*
@@ -580,11 +609,11 @@
      * backing store
      */
     if (!fbSetupScreen (pScreen, 
-			screen->frameBuffer, 
+			screen->fb[0].frameBuffer, 
 			screen->width, screen->height, 
 			screen->dpix, screen->dpiy, 
-			screen->pixelStride,
-			screen->bitsPerPixel))
+			screen->fb[0].pixelStride,
+			screen->fb[0].bitsPerPixel))
     {
 	return FALSE;
     }
@@ -608,15 +637,35 @@
     pScreenPriv->BackingStoreFuncs.GetSpansPixmap = 0;
 #endif
 
-    if (!fbFinishScreenInit (pScreen, 
-			     screen->frameBuffer, 
-			     screen->width, screen->height, 
-			     screen->dpix, screen->dpiy, 
-			     screen->pixelStride,
-			     screen->bitsPerPixel))
+    if (screen->fb[1].depth)
     {
-	return FALSE;
+	if (!fbOverlayFinishScreenInit (pScreen, 
+					screen->fb[0].frameBuffer, 
+					screen->fb[1].frameBuffer, 
+					screen->width, screen->height, 
+					screen->dpix, screen->dpiy, 
+					screen->fb[0].pixelStride,
+					screen->fb[1].pixelStride,
+					screen->fb[0].bitsPerPixel,
+					screen->fb[1].bitsPerPixel,
+					screen->fb[0].depth,
+					screen->fb[1].depth))
+	{
+	    return FALSE;
+	}
     }
+    else
+    {
+	if (!fbFinishScreenInit (pScreen, 
+				 screen->fb[0].frameBuffer, 
+				 screen->width, screen->height, 
+				 screen->dpix, screen->dpiy, 
+				 screen->fb[0].pixelStride,
+				 screen->fb[0].bitsPerPixel))
+	{
+	    return FALSE;
+	}
+    }
     
     /*
      * Plug in our own block/wakeup handlers.
@@ -720,6 +769,8 @@
     KdCardInfo	    *card;
     KdScreenInfo    *screen;
     int		    i;
+    int		    bpp;
+    int		    fb;
     PixmapFormatRec *format;
 
     for (i = 1; i <= 32; i++)
@@ -735,10 +786,16 @@
     {
 	for (screen = card->screenList; screen; screen = screen->next)
 	{
-	    if (!depthToBpp[screen->depth])
-		depthToBpp[screen->depth] = screen->bitsPerPixel;
-	    else if (depthToBpp[screen->depth] != screen->bitsPerPixel)
-		return FALSE;
+	    for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++)
+	    {
+		bpp = screen->fb[fb].bitsPerPixel;
+		if (bpp == 24)
+		    bpp = 32;
+		if (!depthToBpp[screen->fb[fb].depth])
+		    depthToBpp[screen->fb[fb].depth] = bpp;
+		else if (depthToBpp[screen->fb[fb].depth] != bpp) 
+		    return FALSE;
+	    }
 	}
     }
     
@@ -784,18 +841,20 @@
     {
 	unsigned long	visuals;
 	Pixel		rm, gm, bm;
+	int		fb;
 	
-	if (pScreenInfo->formats[i].depth == screen->depth)
-	{
-	    visuals = screen->visuals;
-	    rm = screen->redMask;
-	    gm = screen->greenMask;
-	    bm = screen->blueMask;
-	}
-	else
+	visuals = 0;
+	rm = gm = bm = 0;
+	for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++)
 	{
-	    visuals = 0;
-	    rm = gm = bm = 0;
+	    if (pScreenInfo->formats[i].depth == screen->fb[fb].depth)
+	    {
+		visuals = screen->fb[fb].visuals;
+		rm = screen->fb[fb].redMask;
+		gm = screen->fb[fb].greenMask;
+		bm = screen->fb[fb].blueMask;
+		break;
+	    }
 	}
 	fbSetVisualTypesAndMasks (pScreenInfo->formats[i].depth,
 				  visuals,
@@ -806,6 +865,17 @@
     kdCurrentScreen = screen;
     
     AddScreen (KdScreenInit, argc, argv);
+}
+
+int
+KdDepthToFb (ScreenPtr	pScreen, int depth)
+{
+    KdScreenPriv(pScreen);
+    int	    fb;
+
+    for (fb = 0; fb <= KD_MAX_FB && pScreenPriv->screen->fb[fb].frameBuffer; fb++)
+	if (pScreenPriv->screen->fb[fb].depth == depth)
+	    return fb;
 }
 
 void
Index: xc/programs/Xserver/hw/kdrive/kdrive.h
diff -u xc/programs/Xserver/hw/kdrive/kdrive.h:1.4 xc/programs/Xserver/hw/kdrive/kdrive.h:1.5
--- xc/programs/Xserver/hw/kdrive/kdrive.h:1.4	Wed Feb 23 12:29:53 2000
+++ xc/programs/Xserver/hw/kdrive/kdrive.h	Sat May  6 15:17:40 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.4 2000/02/23 20:29:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.5 2000/05/06 22:17:40 keithp Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -40,6 +40,7 @@
 #include "mi.h"
 #include "dix.h"
 #include "fb.h"
+#include "fboverlay.h"
 
 extern WindowPtr    *WindowTable;
 
@@ -49,10 +50,18 @@
 #define KD_DPMS_POWERDOWN   3
 #define KD_DPMS_MAX	    KD_DPMS_POWERDOWN
 
+#ifndef KD_MAX_FB
+#define KD_MAX_FB   2
+#endif
+
+#ifndef KD_MAX_CARD_ADDRESS
+#define KD_MAX_CARD_ADDRESS 8
+#endif
+
 /*
  * Configuration information per video card
  */
-#define KD_MAX_CARD_ADDRESS 8
+
 typedef struct _KdCardAttr {
     CARD32  io;
     CARD32  address[KD_MAX_CARD_ADDRESS];
@@ -75,25 +84,30 @@
 /*
  * Configuration information per X screen
  */
+typedef struct _KdFrameBuffer {
+    CARD8	*frameBuffer;
+    int		depth;
+    int		bitsPerPixel;
+    int		pixelStride;
+    int		byteStride;
+    unsigned long   visuals;
+    Pixel       redMask, greenMask, blueMask;
+    void	*closure;
+} KdFrameBuffer;
+
 typedef struct _KdScreenInfo {
     struct _KdScreenInfo    *next;
     KdCardInfo	*card;
     ScreenPtr	pScreen;
     void	*driver;
-    CARD8	*frameBuffer;
     int		width;
     int		height;
-    int		depth;
     int		rate;
-    int		bitsPerPixel;
-    int		pixelStride;
-    int		byteStride;
     int         dpix, dpiy;
-    unsigned long   visuals;
-    Pixel       redMask, greenMask, blueMask;
     Bool        dumb;
     Bool        softCursor;
     int		mynum;
+    KdFrameBuffer   fb[KD_MAX_FB];
 } KdScreenInfo;
 
 typedef struct _KdCardFuncs {
@@ -120,8 +134,8 @@
     void        (*disableAccel) (ScreenPtr);
     void        (*finiAccel) (ScreenPtr);
 
-    void        (*getColors) (ScreenPtr, int, xColorItem *);
-    void        (*putColors) (ScreenPtr, int, xColorItem *);
+    void        (*getColors) (ScreenPtr, int, int, xColorItem *);
+    void        (*putColors) (ScreenPtr, int, int, xColorItem *);
 } KdCardFuncs;
 
 #define KD_MAX_PSEUDO_DEPTH 8
@@ -133,11 +147,11 @@
 
     Bool	    enabled;
     Bool	    closed;
-    int		    bytesPerPixel;
+    int		    bytesPerPixel[KD_MAX_FB];
 
     int		    dpmsState;
     
-    ColormapPtr     pInstalledmap;                  /* current colormap */
+    ColormapPtr     pInstalledmap[KD_MAX_FB];         /* current colormap */
     xColorItem      systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */
 
     CloseScreenProcPtr  CloseScreen;
@@ -341,7 +355,7 @@
 
 /* kcmap.c */
 void
-KdSetColormap (ScreenPtr pScreen);
+KdSetColormap (ScreenPtr pScreen, int fb);
 
 void
 KdEnableColormap (ScreenPtr pScreen);
@@ -364,6 +378,7 @@
 /* kcurscol.c */
 void
 KdAllocateCursorPixels (ScreenPtr	pScreen,
+			int		fb,
 			CursorPtr	pCursor, 
 			Pixel		*source,
 			Pixel		*mask);
Index: xc/programs/Xserver/hw/kdrive/kinput.c
diff -u xc/programs/Xserver/hw/kdrive/kinput.c:1.3 xc/programs/Xserver/hw/kdrive/kinput.c:1.4
--- xc/programs/Xserver/hw/kdrive/kinput.c:1.3	Wed Feb 23 12:29:54 2000
+++ xc/programs/Xserver/hw/kdrive/kinput.c	Sat May  6 15:17:40 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.3 2000/02/23 20:29:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.4 2000/05/06 22:17:40 keithp Exp $ */
 
 #include "kdrive.h"
 #include "inputstr.h"
@@ -137,6 +137,9 @@
     memset (&act, '\0', sizeof act);
     act.sa_handler = KdSigio;
     sigemptyset (&act.sa_mask);
+    sigaddset (&act.sa_mask, SIGIO);
+    sigaddset (&act.sa_mask, SIGALRM);
+    sigaddset (&act.sa_mask, SIGVTALRM);
     sigaction (SIGIO, &act, 0);
     sigemptyset (&set);
     sigprocmask (SIG_SETMASK, &set, 0);
Index: xc/programs/Xserver/hw/kdrive/kmode.c
diff -u xc/programs/Xserver/hw/kdrive/kmode.c:1.2 xc/programs/Xserver/hw/kdrive/kmode.c:1.5
--- xc/programs/Xserver/hw/kdrive/kmode.c:1.2	Wed Feb 23 12:29:55 2000
+++ xc/programs/Xserver/hw/kdrive/kmode.c	Wed May 24 16:57:56 2000
@@ -1,5 +1,5 @@
 /*
- * Id: kmode.c,v 1.2 1999/12/21 03:50:49 keithp Exp $
+ * $XFree86: xc/programs/Xserver/hw/kdrive/kmode.c,v 1.5 2000/05/24 23:57:56 keithp Exp $
  *
  * Copyright 1999 SuSE, Inc.
  *
@@ -56,8 +56,8 @@
 		    1,	    20,	    24,	    KdSyncNegative, /* 72.809 */
     },
     {	640,	480,	60,	25175,			    /* VESA */
-		    8,	    40,	    144,    KdSyncNegative, /* 31.469 */
-		    2,	    25,	    29,	    KdSyncNegative, /* 59.940 */
+		   16,	    48,	    160,    KdSyncNegative, /* 31.469 */
+		   10,	    33,	    45,	    KdSyncNegative, /* 59.940 */
     },
     
     /* 800x600 modes */
@@ -295,10 +295,12 @@
 	/*
 	 * Fix requested depth and geometry until it works
 	 */
-	if (screen->depth > 16)
-	    screen->depth = 16;
-	else if (screen->depth > 8)
-	    screen->depth = 8;
+	if (screen->fb[1].depth)
+	    screen->fb[1].depth = 0;
+	else if (screen->fb[0].depth > 16)
+	    screen->fb[0].depth = 16;
+	else if (screen->fb[0].depth > 8)
+	    screen->fb[0].depth = 8;
 	else 
 	{
 	    t = kdFindPrevSize (KdFindMode (screen, supported));
Index: xc/programs/Xserver/hw/kdrive/vga.c
diff -u xc/programs/Xserver/hw/kdrive/vga.c:1.3 xc/programs/Xserver/hw/kdrive/vga.c:1.4
--- xc/programs/Xserver/hw/kdrive/vga.c:1.3	Wed Feb 23 12:29:56 2000
+++ xc/programs/Xserver/hw/kdrive/vga.c	Wed May 24 16:57:56 2000
@@ -21,18 +21,23 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/vga.c,v 1.3 2000/02/23 20:29:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/vga.c,v 1.4 2000/05/24 23:57:56 keithp Exp $ */
 
 #include "vga.h"
 #include <stdio.h>
 
 #ifdef linux
+#ifdef __i386__
 #define extern static
 #include <asm/io.h>
 #undef extern
 
 #define _VgaInb(r)	inb(r)
 #define _VgaOutb(v,r)	outb(v,r)
+#else
+#define _VgaInb(r)	0
+#define _VgaOutb(v,r)	
+#endif
 
 #define _VgaByteAddr(a)	((VGAVOL8 *) (a))
 #define _VgaBytePort(a)	(a)
Index: xc/programs/Xserver/hw/kdrive/vga.h
diff -u xc/programs/Xserver/hw/kdrive/vga.h:1.3 xc/programs/Xserver/hw/kdrive/vga.h:1.4
--- xc/programs/Xserver/hw/kdrive/vga.h:1.3	Wed Feb 23 12:29:56 2000
+++ xc/programs/Xserver/hw/kdrive/vga.h	Wed May 24 16:57:56 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/vga.h,v 1.3 2000/02/23 20:29:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/vga.h,v 1.4 2000/05/24 23:57:56 keithp Exp $ */
 
 #ifndef _VGA_H_
 #define _VGA_H_
@@ -57,7 +57,7 @@
 
 typedef enum _vgaAccess {
     VgaAccessMem, VgaAccessIo, VgaAccessIndMem, VgaAccessIndIo,
-    VgaAccessDone,
+    VgaAccessDone
 } VgaAccess;
 
 typedef struct _vgaMap {
Index: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c
diff -u xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c:1.3 xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c:1.4
--- xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c:1.3	Wed Feb 23 12:29:57 2000
+++ xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c	Sat May  6 15:17:41 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.3 2000/02/23 20:29:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.4 2000/05/06 22:17:41 keithp Exp $ */
 
 #include "fbdev.h"
 
@@ -88,40 +88,40 @@
 
     screen->width = priv->var.xres;
     screen->height = priv->var.yres;
-    screen->depth = priv->var.bits_per_pixel;
-    screen->bitsPerPixel = priv->var.bits_per_pixel;
-    screen->byteStride = priv->fix.line_length;
-    screen->pixelStride = (priv->fix.line_length * 8 / 
+    screen->fb[0].depth = priv->var.bits_per_pixel;
+    screen->fb[0].bitsPerPixel = priv->var.bits_per_pixel;
+    screen->fb[0].byteStride = priv->fix.line_length;
+    screen->fb[0].pixelStride = (priv->fix.line_length * 8 / 
 			   priv->var.bits_per_pixel);
     switch (priv->fix.visual) {
     case FB_VISUAL_PSEUDOCOLOR:
-	screen->visuals = ((1 << StaticGray) |
+	screen->fb[0].visuals = ((1 << StaticGray) |
 			   (1 << GrayScale) |
 			   (1 << StaticColor) |
 			   (1 << PseudoColor) |
 			   (1 << TrueColor) |
 			   (1 << DirectColor));
-	screen->blueMask  = 0x00;
-	screen->greenMask = 0x00;
-	screen->redMask   = 0x00;
+	screen->fb[0].blueMask  = 0x00;
+	screen->fb[0].greenMask = 0x00;
+	screen->fb[0].redMask   = 0x00;
 	break;
     case FB_VISUAL_TRUECOLOR:
-	screen->visuals = (1 << TrueColor);
-	screen->redMask = FbStipMask (priv->var.red.offset, priv->var.red.length);
-	screen->greenMask = FbStipMask (priv->var.green.offset, priv->var.green.length);
-	screen->blueMask = FbStipMask (priv->var.blue.offset, priv->var.blue.length);
-	allbits = screen->redMask | screen->greenMask | screen->blueMask;
+	screen->fb[0].visuals = (1 << TrueColor);
+	screen->fb[0].redMask = FbStipMask (priv->var.red.offset, priv->var.red.length);
+	screen->fb[0].greenMask = FbStipMask (priv->var.green.offset, priv->var.green.length);
+	screen->fb[0].blueMask = FbStipMask (priv->var.blue.offset, priv->var.blue.length);
+	allbits = screen->fb[0].redMask | screen->fb[0].greenMask | screen->fb[0].blueMask;
 	depth = 32;
 	while (depth && !(allbits & (1 << (depth - 1))))
 	    depth--;
-	screen->depth = depth;
+	screen->fb[0].depth = depth;
 	break;
     default:
 	return FALSE;
 	break;
     }
     screen->rate = 72;
-    screen->frameBuffer = (CARD8 *) (priv->fb);
+    screen->fb[0].frameBuffer = (CARD8 *) (priv->fb);
     return TRUE;
 }
 
@@ -191,7 +191,7 @@
 }
 
 void
-fbdevGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs)
+fbdevGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
 {
     KdScreenPriv(pScreen);
     FbdevPriv	    *priv = pScreenPriv->card->driver;
@@ -232,7 +232,7 @@
 }
 
 void
-fbdevPutColors (ScreenPtr pScreen, int n, xColorItem *pdefs)
+fbdevPutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
 {
     KdScreenPriv(pScreen);
     FbdevPriv	*priv = pScreenPriv->card->driver;
Index: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h
diff -u xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h:1.3 xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h:1.4
--- xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h:1.3	Wed Feb 23 12:29:58 2000
+++ xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sat May  6 15:17:42 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h,v 1.3 2000/02/23 20:29:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h,v 1.4 2000/05/06 22:17:42 keithp Exp $ */
 
 #ifndef _FBDEV_H_
 #define _FBDEV_H_
@@ -75,10 +75,10 @@
 fbdevCardFini (KdCardInfo *card);
 
 void
-fbdevGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs);
+fbdevGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs);
 
 void
-fbdevPutColors (ScreenPtr pScreen, int n, xColorItem *pdefs);
+fbdevPutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs);
 
 
 #endif /* _FBDEV_H_ */
Index: xc/programs/Xserver/hw/kdrive/igs/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/Imakefile:1.2
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/Imakefile	Wed May 24 16:52:47 2000
@@ -0,0 +1,14 @@
+XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/igs/Imakefile,v 1.2 2000/05/24 23:52:47 keithp Exp $
+#include <Server.tmpl>
+
+SRCS = 	igs.c igscmap.c igscurs.c igsdraw.c igsreg.c igsstub.c
+
+OBJS = 	igs.o igscmap.o igscurs.o igsdraw.o igsreg.o igsstub.o
+
+INCLUDES = -I.. -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
+	   -I../../../fb -I../../../mi -I../../../include -I../../../os  \
+           -I$(EXTINCSRC) -I$(XINCLUDESRC)
+
+NormalLibraryObjectRule()
+NormalLibraryTarget(igs,$(OBJS))
+DependTarget()
Index: xc/programs/Xserver/hw/kdrive/igs/igs.c
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igs.c:1.2
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igs.c	Wed May 24 16:52:47 2000
@@ -0,0 +1,665 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igs.c,v 1.2 2000/05/24 23:52:47 keithp Exp $
+ *
+ * Copyright © 1999 SuSE, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of SuSE not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  SuSE makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Keith Packard, SuSE, Inc.
+ */
+
+#include "igs.h"
+
+Bool
+igsCardInit (KdCardInfo *card)
+{
+    int		k;
+    char	*pixels;
+    IgsCardInfo	*igsc;
+
+    igsc = (IgsCardInfo *) xalloc (sizeof (IgsCardInfo));
+    if (!igsc)
+	return FALSE;
+    
+    memset (igsc, '\0', sizeof (IgsCardInfo));
+
+    igsc->frameBuffer = (CARD8 *) KdMapDevice (card->attr.address[0] +
+					       IGS_FB,
+					       IGS_MEM);
+    
+    igsc->vga = (VOL8 *) KdMapDevice (card->attr.address[0] +
+				      IGS_VGA,
+				      64 * 1024);
+
+    igsc->cop = (Cop5xxx *) KdMapDevice (card->attr.address[0] + 
+					 IGS_COP_OFFSET,
+					 sizeof (Cop5xxx));
+    
+    igsc->copData = (VOL32 *) KdMapDevice (card->attr.address[0] +
+					   IGS_COP_DATA,
+					   IGS_COP_DATA_LEN);
+    
+    igsRegInit (&igsc->igsvga, igsc->vga);
+
+    card->driver = igsc;
+    
+    return TRUE;
+}
+
+Bool
+igsModeSupported (KdScreenInfo		*screen,
+		 const KdMonitorTiming	*t)
+{
+    /* make sure the clock isn't too fast */
+    if (t->clock > IGS_MAX_CLOCK)
+	return FALSE;
+    /* width must be a multiple of 16 */
+    if (t->horizontal & 0xf)
+	return FALSE;
+    return TRUE;
+}
+
+Bool
+igsModeUsable (KdScreenInfo	*screen)
+{
+    KdCardInfo	    *card = screen->card;
+    int		    screen_size;
+    int		    pixel_width;
+    int		    byte_width;
+    int		    fb = 0;
+    
+    screen_size = 0;
+    if (screen->fb[fb].depth >= 24)
+    {
+	screen->fb[fb].depth = 24;
+	if (screen->fb[fb].bitsPerPixel != 24)
+	    screen->fb[fb].bitsPerPixel = 32;
+    }
+    else if (screen->fb[fb].depth >= 16)
+    {
+	screen->fb[fb].depth = 16;
+	screen->fb[fb].bitsPerPixel = 16;
+    }
+    else if (screen->fb[fb].depth >= 15)
+    {
+	screen->fb[fb].depth = 15;
+	screen->fb[fb].bitsPerPixel = 16;
+    }
+    else if (screen->fb[fb].depth >= 12)
+    {
+	screen->fb[fb].depth = 12;
+	screen->fb[fb].bitsPerPixel = 16;
+    }
+    else
+    {
+	screen->fb[fb].depth = 8;
+	screen->fb[fb].bitsPerPixel = 8;
+    }
+
+    byte_width = screen->width * (screen->fb[fb].bitsPerPixel >> 3);
+    pixel_width = screen->width;
+    screen->fb[fb].pixelStride = pixel_width;
+    screen->fb[fb].byteStride = byte_width;
+    screen_size += byte_width * screen->height;
+
+    return TRUE;
+}
+
+Bool
+igsScreenInit (KdScreenInfo *screen)
+{
+    IgsCardInfo		*igsc = screen->card->driver;
+    int			fb = 0;
+    IgsScreenInfo	*igss;
+    int			screen_size, memory;
+    int			pattern_size;
+    int			tile_size;
+    int			stipple_size;
+    int			poffset, boffset;
+    const KdMonitorTiming *t;
+
+    if (!screen->width || !screen->height)
+    {
+	screen->width = 800;
+	screen->height = 600;
+	screen->rate = 72;
+    }
+    if (!screen->fb[0].depth)
+	screen->fb[0].depth = 8;
+    
+    t = KdFindMode (screen, igsModeSupported);
+
+    screen->rate = t->rate;
+    screen->width = t->horizontal;
+    screen->height = t->vertical;
+
+    if (!KdTuneMode (screen, igsModeUsable, igsModeSupported))
+    {
+	return FALSE;
+    }
+    
+    igss = (IgsScreenInfo *) xalloc (sizeof (IgsScreenInfo));
+    if (!igss)
+	return FALSE;
+
+    memset (igss, '\0', sizeof (IgsScreenInfo));
+
+    screen_size = screen->fb[fb].byteStride * screen->height;
+    memory = IGS_MEM;
+    memory -= screen_size;
+    if (memory >= 1024)
+    {
+	igss->cursor_offset = memory - 1024;
+#if BITMAP_BIT_ORDER == MSBFirst
+	igss->cursor_base = (CARD8 *) KdMapDevice (card->attr.address[0] +
+						   igss->cursor_offset,
+						   1024);
+#else
+	igss->cursor_base = igsc->frameBuffer + igss->cursor_offset;
+#endif
+	memory -= 1024;
+    }
+    else
+	igss->cursor_base = 0;
+
+    tile_size = IgsTileSize(screen->fb[fb].bitsPerPixel) * IGS_NUM_PATTERN;
+    stipple_size = IgsStippleSize(screen->fb[fb].bitsPerPixel) * IGS_NUM_PATTERN;
+    pattern_size = tile_size + stipple_size;
+    if (memory >= pattern_size)
+    {
+	boffset = screen_size;
+	poffset = boffset * 8 / screen->fb[fb].bitsPerPixel;
+	igss->tile.offset = poffset;
+	igss->tile.base = igsc->frameBuffer + boffset;
+	
+	boffset = screen_size + tile_size;
+	poffset = boffset * 8 / screen->fb[fb].bitsPerPixel;
+	igss->stipple.offset = poffset;
+	igss->stipple.base = igsc->frameBuffer + boffset;
+	
+	memory -= pattern_size;
+    }
+    else
+    {
+	igss->tile.base = 0;
+	igss->stipple.base = 0;
+    }
+    
+    switch (screen->fb[fb].depth) {
+    case 8:
+	screen->fb[fb].visuals = ((1 << StaticGray) |
+				  (1 << GrayScale) |
+				  (1 << StaticColor) |
+				  (1 << PseudoColor) |
+				  (1 << TrueColor) |
+				  (1 << DirectColor));
+	screen->fb[fb].blueMask  = 0x00;
+	screen->fb[fb].greenMask = 0x00;
+	screen->fb[fb].redMask   = 0x00;
+	break;
+    case 15:
+	screen->fb[fb].visuals = (1 << TrueColor);
+	screen->fb[fb].blueMask  = 0x001f;
+	screen->fb[fb].greenMask = 0x03e0;
+	screen->fb[fb].redMask   = 0x7c00;
+	break;
+    case 16:
+	screen->fb[fb].visuals = (1 << TrueColor);
+	screen->fb[fb].blueMask  = 0x001f;
+	screen->fb[fb].greenMask = 0x07e0;
+	screen->fb[fb].redMask   = 0xf800;
+	break;
+    case 24:
+	screen->fb[fb].visuals = (1 << TrueColor);
+	screen->fb[fb].blueMask  = 0x0000ff;
+	screen->fb[fb].greenMask = 0x00ff00;
+	screen->fb[fb].redMask   = 0xff0000;
+	break;
+    }
+
+    screen->fb[fb].pixelStride = screen->width;
+    screen->fb[fb].byteStride = screen->width * (screen->fb[fb].bitsPerPixel >> 3);
+    screen->fb[fb].frameBuffer = igsc->frameBuffer;
+    if (!igsc->cop)
+	screen->dumb = TRUE;
+    screen->driver = igss;
+    return TRUE;
+}
+
+Bool
+igsInitScreen(ScreenPtr pScreen)
+{
+    return TRUE;
+}
+    
+void
+igsPreserve (KdCardInfo *card)
+{
+    IgsCardInfo	*igsc = card->driver;
+    IgsVga	*igsvga = &igsc->igsvga;
+    
+    igsSave (igsvga);
+}
+
+void
+igsSetBlank (IgsVga    *igsvga, Bool blank)
+{
+    igsSetImm(igsvga, igs_screen_off, blank ? 1 : 0);
+}
+
+void
+igsSetSync (IgsCardInfo *igsc, int hsync, int vsync)
+{
+    IgsVga   *igsvga = &igsc->igsvga;
+    
+    igsSet (igsvga, igs_mexhsyn, hsync);
+    igsSet (igsvga, igs_mexvsyn, vsync);
+    VgaFlush (&igsvga->card);
+}
+
+
+/*
+ * Clock synthesis:
+ *
+ *  scale = p ? (2 * p) : 1
+ *  f_out = f_ref * ((M + 1) / ((N + 1) * scale))
+ *
+ *  Constraints:
+ *
+ *  1.	115MHz <= f_ref * ((M + 1) / (N + 1)) <= 260 MHz
+ *  2.	N >= 1
+ *
+ *  Vertical refresh rate = clock / ((hsize + hblank) * (vsize + vblank))
+ *  Horizontal refresh rate = clock / (hsize + hblank)
+ */
+ 
+/* all in kHz */
+
+void
+igsGetClock (int target, int *Mp, int *Np, int *Pp, int maxM, int maxN, int maxP, int minVco)
+{
+    int	    M, N, P, bestM, bestN;
+    int	    f_vco, f_out;
+    int	    err, abserr, besterr;
+
+    /*
+     * Compute correct P value to keep VCO in range
+     */
+    for (P = 0; P <= maxP; P++)
+    {
+	f_vco = target * IGS_SCALE(P);
+	if (f_vco >= minVco)
+	    break;
+    }
+
+    /* M = f_out / f_ref * ((N + 1) * IGS_SCALE(P)); */
+    besterr = target;
+    for (N = 1; N <= maxN; N++)
+    {
+	M = ((target * (N + 1) * IGS_SCALE(P) + (IGS_CLOCK_REF/2)) + IGS_CLOCK_REF/2) / IGS_CLOCK_REF - 1;
+	if (0 <= M && M <= maxM)
+	{
+	    f_out = IGS_CLOCK(M,N,P);
+	    err = target - f_out;
+	    if (err < 0)
+		err = -err;
+	    if (err < besterr)
+	    {
+		besterr = err;
+		bestM = M;
+		bestN = N;
+	    }
+	}
+    }
+    *Mp = bestM;
+    *Np = bestN;
+    *Pp = P;
+}
+
+void
+igsEnable (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdCardInfo	    *card = pScreenPriv->card;
+    KdScreenInfo    *screen = pScreenPriv->screen;
+    IgsCardInfo	    *igsc = card->driver;
+    IgsVga	    *igsvga = &igsc->igsvga;
+    const KdMonitorTiming *t;
+    int	    hactive, hblank, hfp, hbp;
+    int	    vactive, vblank, vfp, vbp;
+    int	    hsize;
+    int	    fb = 0;
+    int	    m, n, r;
+    int	    h_total;
+    int	    h_display_end;
+    int	    h_blank_start;
+    int	    h_blank_end;
+    int	    h_sync_start;
+    int	    h_sync_end;
+    int	    h_screen_off;
+    int	    v_total;
+    int	    v_retrace_start;
+    int	    v_retrace_end;
+    int	    v_display_end;
+    int	    v_blank_start;
+    int	    v_blank_end;
+    int	    offset;
+    int	    num_fetch;
+    int	    m_m, m_n, m_r;
+    
+    
+    igsSetBlank (igsvga, TRUE);
+    
+    t = KdFindMode (screen, igsModeSupported);
+    
+    igsGetClock (t->clock, &m, &n, &r, 2047, 255, 7, IGS_MIN_VCO);
+
+    /*
+     * Set the chip so that 0x400000 is a big-endian frame buffer
+     * with the correct byte swapping enabled
+     */
+    igsSet (igsvga, igs_biga22force, 0);
+    igsSet (igsvga, igs_biga22en, 1);
+    igsSet (igsvga, igs_biga24en, 1);
+    /*
+     * Enable 8-bit DACs
+     */
+    igsSet (igsvga, igs_rampwdn, 0);
+    igsSet (igsvga, igs_dac6_8, 1);
+    igsSet (igsvga, igs_dacpwdn, 0);
+    /*
+     * Set overscan to black
+     */
+    igsSet (igsvga, igs_overscan_red, 0x00);
+    igsSet (igsvga, igs_overscan_green, 0x00);
+    igsSet (igsvga, igs_overscan_blue, 0x00);
+    /*
+     * Enable PCI retries
+     */
+    igsSet (igsvga, igs_iow_retry, 1);
+    igsSet (igsvga, igs_mw_retry, 1);
+    igsSet (igsvga, igs_mr_retry, 1);
+    igsSet (igsvga, igs_pci_burst_write, 1);
+    igsSet (igsvga, igs_pci_burst_read, 1);
+    /*
+     * Set FIFO
+     */
+    igsSet (igsvga, igs_memgopg, 1);
+    igsSet (igsvga, igs_memr2wpg, 0);
+    igsSet (igsvga, igs_crtff16, 0);
+    igsSet (igsvga, igs_fifomust, 0xff);
+    igsSet (igsvga, igs_fifogen, 0xff);
+    /*
+     * Enable CRT reg access
+     */
+    igsSetImm (igsvga, igs_ena_vr_access, 1);
+    igsSetImm (igsvga, igs_crt_protect, 0);
+
+    hfp = t->hfp;
+    hbp = t->hbp;
+    hblank = t->hblank;
+    hactive = t->horizontal;
+    offset = screen->fb[0].byteStride;
+    
+    vfp = t->vfp;
+    vbp = t->vbp;
+    vblank = t->vblank;
+    vactive = t->vertical;
+
+    /*
+     * Compute character lengths for horizontal timing values
+     */
+    hactive = screen->width / 8;
+    hblank /= 8;
+    hfp /= 8;
+    hbp /= 8;
+    offset /= 8;
+    
+    switch (screen->fb[fb].bitsPerPixel) {
+    case 8:
+	igsSet (igsvga, igs_overscan_red, pScreen->blackPixel);
+	igsSet (igsvga, igs_overscan_green, pScreen->blackPixel);
+	igsSet (igsvga, igs_overscan_blue, pScreen->blackPixel);
+	igsSet (igsvga, igs_bigswap, IGS_BIGSWAP_8);
+	igsSet (igsvga, igs_mode_sel, IGS_MODE_8);
+	igsSet (igsvga, igs_ramdacbypass, 0);
+	break;
+    case 16:
+	igsSet (igsvga, igs_bigswap, IGS_BIGSWAP_16);
+	igsSet (igsvga, igs_ramdacbypass, 1);
+	switch (screen->fb[fb].depth) {
+	case 12:
+	    igsSet (igsvga, igs_mode_sel, IGS_MODE_4444);
+	    break;
+	case 15:
+	    igsSet (igsvga, igs_mode_sel, IGS_MODE_5551);
+	    break;
+	case 16:
+	    igsSet (igsvga, igs_mode_sel, IGS_MODE_565);
+	    break;
+	}
+	break;
+    case 24:
+	igsSet (igsvga, igs_ramdacbypass, 1);
+	igsSet (igsvga, igs_bigswap, IGS_BIGSWAP_8);
+	igsSet (igsvga, igs_mode_sel, IGS_MODE_888);
+	break;
+    case 32:
+	igsSet (igsvga, igs_ramdacbypass, 1);
+	igsSet (igsvga, igs_bigswap, IGS_BIGSWAP_32);
+	igsSet (igsvga, igs_mode_sel, IGS_MODE_8888);
+	break;
+    }
+
+    /*
+     * Compute horizontal register values from timings
+     */
+    h_total = hactive + hblank - 5;
+    h_display_end = hactive - 1;
+   
+    h_sync_start = hactive + hfp;
+    h_sync_end = hactive + hblank - hbp;
+    /* 
+     * pad the blank values narrow a bit and use the border_select to
+     * eliminate the remaining border; don't know why, but it doesn't
+     * work in the documented fashion
+     */
+    h_blank_start = hactive - 1;
+    h_blank_end = hactive + hblank - 1 - 1;
+
+    num_fetch = (t->horizontal * screen->fb[fb].bitsPerPixel / 64) + 1;
+    
+    v_total = vactive + vblank - 2;
+    v_display_end = vactive - 1;
+    
+    v_blank_start = vactive - 1;
+    v_blank_end = v_blank_start + vblank - 1;
+    
+    v_retrace_start = vactive + vfp;
+    v_retrace_end = vactive + vblank - vbp;
+
+#if 0
+#define chk(a,b,c)  fprintf (stderr, "%20.20s: BIOS %6d X %6d\n", a, igsGet(igsvga, b), c);
+
+    chk("h_total", igs_h_total, h_total);
+    chk("h_display_end", igs_h_de_end, h_display_end);
+    chk("h_sync_start", igs_h_rstart, h_sync_start);
+    chk("h_sync_end", igs_h_rend, h_sync_end&0x1f);
+    chk("h_blank_start", igs_h_bstart, h_blank_start);
+    chk("h_blank_end", igs_h_bend, h_blank_end&0x3f);
+    chk("offset", igs_offset, offset);
+    chk("num_fetch", igs_num_fetch, num_fetch);
+    
+    chk("v_total", igs_v_total, v_total);
+    chk("v_display_end", igs_v_de_end, v_display_end);
+    chk("v_blank_start", igs_v_bstart, v_blank_start);
+    chk("v_blank_end", igs_v_bend, v_blank_end&0xf);
+    chk("v_retrace_start", igs_v_rstart, v_retrace_start);
+    chk("v_retrace_end", igs_v_rend, v_retrace_end&0xf);
+    chk("vclk_m", igs_vclk_m, m);
+    chk("vclk_n", igs_vclk_n, n);
+    chk("vclk_p", igs_vclk_p, r);
+
+    fprintf (stderr, "%20.20s: BIOS %6d X %6d\n", "vclk",
+	     IGS_CLOCK(igsGet(igsvga,igs_vclk_m),
+		       igsGet(igsvga,igs_vclk_n),
+		       igsGet(igsvga,igs_vclk_p)),
+	     IGS_CLOCK(m,n,r));
+#endif
+    igsSet (igsvga, igs_h_total, h_total);
+    igsSet (igsvga, igs_h_de_end, h_display_end);
+    igsSet (igsvga, igs_h_rstart, h_sync_start);
+    igsSet (igsvga, igs_h_rend, h_sync_end);
+    igsSet (igsvga, igs_h_bstart, h_blank_start);
+    igsSet (igsvga, igs_h_bend, h_blank_end);
+    igsSet (igsvga, igs_offset, offset);
+    igsSet (igsvga, igs_num_fetch, num_fetch);
+    
+    igsSet (igsvga, igs_v_total, v_total);
+    igsSet (igsvga, igs_v_de_end, v_display_end);
+    igsSet (igsvga, igs_v_bstart, v_blank_start);
+    igsSet (igsvga, igs_v_bend, v_blank_end&0xf);
+    igsSet (igsvga, igs_v_rstart, v_retrace_start);
+    igsSet (igsvga, igs_v_rend, v_retrace_end&0xf);
+
+    igsSet (igsvga, igs_vclk_m, m);
+    igsSet (igsvga, igs_vclk_n, n);
+    igsSet (igsvga, igs_vclk_p, r);
+    igsSet (igsvga, igs_vfsel, IGS_CLOCK(m, n, 0) >= 180000);
+    VgaFlush (&igsvga->card);
+
+    igsSetImm (igsvga, igs_frqlat, 0);
+    igsSetImm (igsvga, igs_frqlat, 1);
+    igsSetImm (igsvga, igs_frqlat, 0);
+    
+    igsSetBlank (igsvga, FALSE);
+#if 0
+#define dbg(a,b) fprintf(stderr, "%20.20s = 0x%x\n", a, igsGet(igsvga,b))
+    
+#include "reg.dbg"
+
+    {
+	VGA16	reg;
+	char	buf[128];
+
+	for (reg = 0; reg < IGS_NREG; reg++)
+	    fprintf(stderr, "%20.20s = 0x%02x\n", igsRegName(buf, reg),
+		    VgaFetch (&igsvga->card, reg));
+    }
+#endif
+}
+
+Bool
+igsDPMS (ScreenPtr pScreen, int mode)
+{
+    KdScreenPriv(pScreen);
+    IgsCardInfo	*igsc = pScreenPriv->card->driver;
+    IgsVga	*igsvga = &igsc->igsvga;
+    
+    switch (mode) {
+    case KD_DPMS_NORMAL:
+	igsSetSync (igsc, 0, 0);
+	igsSetBlank (igsvga, FALSE);
+	break;
+    case KD_DPMS_STANDBY:
+	igsSetBlank (igsvga, TRUE);
+	igsSetSync (igsc, 1, 0);
+	break;
+    case KD_DPMS_SUSPEND:
+	igsSetBlank (igsvga, TRUE);
+	igsSetSync (igsc, 0, 1);
+	break;
+    case KD_DPMS_POWERDOWN:
+	igsSetBlank (igsvga, TRUE);
+	igsSetSync (igsc, 1, 1);
+	break;
+    }
+    return TRUE;
+}
+
+void
+igsDisable (ScreenPtr pScreen)
+{
+}
+
+void
+igsRestore (KdCardInfo *card)
+{
+    IgsCardInfo	*igsc = card->driver;
+    IgsVga	*igsvga = &igsc->igsvga;
+    
+    igsReset (igsvga);
+}
+    
+void
+igsScreenFini (KdScreenInfo *screen)
+{
+    IgsScreenInfo   *igss = (IgsScreenInfo *) screen->driver;
+
+#if BITMAP_BIT_ORDER == MSBFirst
+    if (igss->cursor_base)
+	KdUnmapDevice ((void *) igss->cursor_base, 1024);
+#endif
+    xfree (igss);
+    screen->driver = 0;
+}
+    
+void
+igsCardFini (KdCardInfo *card)
+{
+    IgsCardInfo	*igsc = card->driver;
+
+    if (igsc->copData)
+	KdUnmapDevice ((void *) igsc->copData, IGS_COP_DATA_LEN);
+    if (igsc->cop)
+	KdUnmapDevice ((void *) igsc->cop, sizeof (Cop5xxx));
+    if (igsc->vga)
+	KdUnmapDevice ((void *) igsc->vga, 64 * 1024);
+    if (igsc->frameBuffer)
+	KdUnmapDevice (igsc->frameBuffer, IGS_MEM);
+    xfree (igsc);
+    card->driver = 0;
+}
+
+KdCardFuncs	igsFuncs = {
+    igsCardInit,	    /* cardinit */
+    igsScreenInit,	    /* scrinit */
+    igsInitScreen,
+    igsPreserve,	    /* preserve */
+    igsEnable,		    /* enable */
+    igsDPMS,		    /* dpms */
+    igsDisable,		    /* disable */
+    igsRestore,		    /* restore */
+    igsScreenFini,	    /* scrfini */
+    igsCardFini,	    /* cardfini */
+    
+    igsCursorInit,    	    /* initCursor */
+    igsCursorEnable,	    /* enableCursor */
+    igsCursorDisable,	    /* disableCursor */
+    igsCursorFini,    	    /* finiCursor */
+    0,			    /* recolorCursor */
+    
+    igsDrawInit,    	    /* initAccel */
+    igsDrawEnable,    	    /* enableAccel */
+    igsDrawSync,	    /* drawSync */
+    igsDrawDisable,    	    /* disableAccel */
+    igsDrawFini,    	    /* finiAccel */
+    
+    igsGetColors,    	    /* getColors */
+    igsPutColors, 	    /* putColors */
+};
Index: xc/programs/Xserver/hw/kdrive/igs/igs.h
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igs.h:1.2
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igs.h	Wed May 24 16:52:47 2000
@@ -0,0 +1,329 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igs.h,v 1.2 2000/05/24 23:52:47 keithp Exp $
+ *
+ * Copyright © 1999 SuSE, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of SuSE not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  SuSE makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Keith Packard, SuSE, Inc.
+ */
+
+#ifndef _IGS_H_
+#define _IGS_H_
+
+#include "kdrive.h"
+#include "igsreg.h"
+
+extern KdCardFuncs  igsFuncs;
+
+/*
+ * FB		0x00000000
+ * VGA		0x00800000
+ * Blt window	0x008a0000
+ * Coprocessor	0x008bf000
+ */
+
+#if BITMAP_BIT_ORDER == MSBFirst
+#define IGS_FB		    0x00400000
+#else
+#define IGS_FB		    0x00000000
+#endif
+#define IGS_VGA		    0x00800000
+#define IGS_COP_DATA	    0x008a0000
+#define IGS_COP_DATA_LEN    0x00010000
+#define IGS_COP_OFFSET	    0x008bf000
+/* give audio 1/2 meg at end */
+#if 1
+#define IGS_MEM		    ((4096-512)*1024)
+#else
+#define IGS_MEM		    ((4096)*1024)
+#endif
+
+#define IGS_CLOCK_REF	24576	/* KHz */
+
+#define IGS_SCALE(p)	((p) ? (2 * (p)) : 1)
+
+#define IGS_CLOCK(m,n,p)	((IGS_CLOCK_REF * ((m) + 1)) / (((n) + 1) * IGS_SCALE(p)))
+
+#define IGS_MAX_CLOCK	260000
+
+#define IGS_MIN_VCO	115000
+
+typedef volatile CARD8	VOL8;
+typedef volatile CARD16	VOL16;
+typedef volatile CARD32	VOL32;
+
+typedef struct _Cop5xxx {
+    VOL8	pad000[0x10];		    /* 0x000 */
+    
+    VOL32	control;		    /* 0x010 */
+#define IGS_CONTROL_HBLTW_RDYZ	    0x0100
+#define IGS_CONTROL_MALLWBEPTZ	    0x0200
+#define IGS_CONTROL_CMDFF	    0x0400
+#define IGS_CONTROL_SOP		    0x0800
+#define IGS_CONTROL_OPS		    0x1000
+#define IGS_CONTROL_TER		    0x2000
+#define IGS_CONTROL_HBACKZ	    0x4000
+#define IGS_CONTROL_BUSY	    0x8000
+    
+    VOL8	pad014[0x04];		    /* 0x014 */
+    
+    VOL32	src1_stride;		    /* 0x018 */
+    
+    VOL32	format;			    /* 0x01c */
+
+#define IGS_FORMAT_8BPP	    0
+#define IGS_FORMAT_16BPP    1
+#define IGS_FORMAT_24BPP    2
+#define IGS_FORMAT_32BPP    3
+
+    VOL32	bres_error;		    /* 0x020 */
+    VOL32	bres_k1;		    /* 0x024 */
+    VOL32	bres_k2;		    /* 0x028 */
+    VOL8	pad02c[0x1c];		    /* 0x02c */
+    
+    VOL32	mix;			    /* 0x048 */
+#define IGS_MIX_FG	0x00ff
+#define IGS_MIX_BG	0xff00
+#define IGS_MAKE_MIX(fg,bg)	((fg) | ((bg) << 8))
+
+#define IGS_MIX_ZERO		    0x0
+#define IGS_MIX_SRC_AND_DST	    0x1
+#define IGS_MIX_SRC_AND_NOT_DST	    0x2
+#define IGS_MIX_SRC		    0x3
+#define IGS_MIX_NOT_SRC_AND_DST	    0x4
+#define IGS_MIX_DST		    0x5
+#define IGS_MIX_SRC_XOR_DST	    0x6
+#define IGS_MIX_SRC_OR_DST	    0x7
+#define IGS_MIX_NOT_SRC_AND_NOT_DST 0x8
+#define IGS_MIX_SRC_XOR_NOT_DST	    0x9
+#define IGS_MIX_NOT_DST		    0xa
+#define IGS_MIX_SRC_OR_NOT_DST	    0xb
+#define IGS_MIX_NOT_SRC		    0xc
+#define IGS_MIX_NOT_SRC_OR_DST	    0xd
+#define IGS_MIX_NOT_SRC_OR_NOT_DST  0xe
+#define IGS_MIX_ONE		    0xf
+    
+    VOL32	colorComp;		    /* 0x04c */
+    VOL32	planemask;		    /* 0x050 */
+    
+    VOL8	pad054[0x4];		    /* 0x054 */
+    
+    VOL32	fg;			    /* 0x058 */
+    VOL32	bg;			    /* 0x05c */
+    VOL32	dim;			    /* 0x060 */
+#define IGS_MAKE_DIM(w,h)   ((w) | ((h) << 16))
+    VOL8	pad5[0x0c];		    /* 0x064 */
+    
+    VOL32	src1_base_address;	    /* 0x070 */
+    VOL8	pad074[0x04];		    /* 0x074 */
+    
+    VOL32	rotate;			    /* 0x078 */
+#define IGS_MAKE_ROTATE(x,y)	((x) | ((y) << 16))
+    VOL32	operation;		    /* 0x07c */
+
+/* OCT[2:0] */
+#define IGS_DRAW_X_MAJOR	0x00000000
+#define IGS_DRAW_Y_MAJOR	0x00000001
+#define IGS_DRAW_T_B		0x00000000
+#define IGS_DRAW_B_T		0x00000002
+#define IGS_DRAW_L_R		0x00000000
+#define IGS_DRAW_R_L		0x00000004
+    
+/* Draw_Mode[1:0] */
+#define IGS_DRAW_ALL		0x00000000
+#define IGS_DRAW_NOT_FIRST	0x00000010
+#define IGS_DRAW_NOT_LAST	0x00000020
+#define IGS_DRAW_NOT_FIRST_LAST	0x00000030
+
+/* TRPS[1:0] */
+#define IGS_TRANS_SRC1		0x00000000
+#define IGS_TRANS_SRC2		0x00000100
+#define IGS_TRANS_DST		0x00000200
+/* TRPS2 Transparent Invert */
+#define IGS_TRANS_INVERT	0x00000400
+/* TRPS3, Transparent Enable */
+#define IGS_TRANS_ENABLE	0x00000800
+
+/* PPS[3:0], Pattern Pixel Select */
+#define IGS_PIXEL_TEXT_OPAQUE	0x00001000
+#define IGS_PIXEL_STIP_OPAQUE	0x00002000
+#define IGS_PIXEL_LINE_OPAQUE	0x00003000
+#define IGS_PIXEL_TEXT_TRANS	0x00005000
+#define IGS_PIXEL_STIP_TRANS	0x00006000
+#define IGS_PIXEL_LINE_TRANS	0x00007000
+#define IGS_PIXEL_FG		0x00008000
+#define IGS_PIXEL_TILE		0x00009000
+#define IGS_PIXEL_TILE_OPAQUE	0x0000d000
+    
+/* HostBltEnable[1:0] */
+#define IGS_HBLT_DISABLE	0x00000000
+#define IGS_HBLT_READ		0x00010000
+#define IGS_HBLT_WRITE_1	0x00020000
+#define IGS_HBLT_WRITE_2	0x00030000
+
+/* Src2MapSelect[2:0], Src2 map select mode */
+#define IGS_SRC2_NORMAL		0x00000000
+#define IGS_SRC2_MONO_OPAQUE	0x00100000
+#define IGS_SRC2_FG		0x00200000
+#define IGS_SRC2_MONO_TRANS	0x00500000
+
+/* StepFunction[3:0], Step function select */
+#define IGS_STEP_DRAW_AND_STEP	0x04000000
+#define IGS_STEP_LINE_DRAW	0x05000000
+#define IGS_STEP_PXBLT		0x08000000
+#define IGS_STEP_INVERT_PXBLT	0x09000000
+#define IGS_STEP_TERNARY_PXBLT	0x0b000000
+
+/* FGS */
+#define IGS_FGS_FG		0x00000000
+#define IGS_FGS_SRC		0x20000000
+    
+/* BGS */
+#define IGS_BGS_BG		0x00000000
+#define IGS_BGS_SRC		0x80000000
+    VOL8	pad080[0x90];		    /* 0x080 */
+    
+    VOL32	debug_control;		    /* 0x110 */
+    VOL8	pad114[0x04];		    /* 0x114 */
+    
+    VOL32	src2_stride;		    /* 0x118 */
+    VOL8	pad11c[0x14];		    /* 0x11c */
+    
+    VOL32	extension;		    /* 0x130 */
+
+#define IGS_BURST_ENABLE    0x01
+#define IGS_STYLE_LINE	    0x02
+#define IGS_ADDITIONAL_WAIT 0x04
+#define	IGS_BLOCK_COP_REG   0x08
+#define IGS_TURBO_MONO	    0x10
+#define IGS_SELECT_SAMPLE   0x40
+#define IGS_MDSBL_RD_B_WR   0x80
+#define IGS_WRMRSTZ	    0x100
+#define IGS_TEST_MTST	    0x200
+
+    VOL32	style_line;		    /* 0x134 */
+#define IGS_MAKE_STILE_LINE(roll_over,inc,pattern,accumulator) \
+    ((roll_over) | \
+     ((style_line_inc) << 8) | \
+     ((style_line_patern) << 16) | \
+     ((style_line_accumullator) << 24))
+    VOL32	style_line_pattern_index;   /* 0x138 */
+
+    VOL32	mono_burst_total;	    /* 0x13c */
+    VOL8	pad140[0x10];		    /* 0x140 */
+    
+    VOL32	pat_x_rotate;		    /* 0x150 */
+    VOL8	pad154[0x1c];		    /* 0x154 */
+
+    VOL32	src1_start;		    /* 0x170 */
+    VOL32	src2_start;		    /* 0x174 */
+    VOL32	dst_start;		    /* 0x178 */
+    VOL8	pad17c[0x9c];		    /* 0x17c */
+    
+    VOL32	dst_stride;		    /* 0x218 */
+} Cop5xxx;
+
+typedef struct _igsCardInfo {
+    Cop5xxx	*cop;
+    VOL8	*vga;
+    VOL32	*copData;
+    CARD8	*frameBuffer;
+    IgsVga	igsvga;
+} IgsCardInfo;
+    
+#define getIgsCardInfo(kd)  ((IgsCardInfo *) ((kd)->card->driver))
+#define igsCardInfo(kd)	    IgsCardInfo	*igsc = getIgsCardInfo(kd)
+
+typedef struct _igsCursor {
+    int		width, height;
+    int		xhot, yhot;
+    Bool	has_cursor;
+    CursorPtr	pCursor;
+    Pixel	source, mask;
+} IgsCursor;
+
+#define IGS_CURSOR_WIDTH	64
+#define IGS_CURSOR_HEIGHT	64
+
+typedef struct _igsPattern {
+    INT32	xrot, yrot;
+    CARD32	serial_number;
+    CARD8	*base;
+    CARD32	offset;
+} IgsPattern;
+
+#define IGS_NUM_PATTERN		8
+#define IGS_PATTERN_WIDTH	8
+#define IGS_PATTERN_HEIGHT	8
+
+typedef struct _igsPatternCache {
+    CARD8	*base;
+    CARD32	offset;
+    IgsPattern	pattern[IGS_NUM_PATTERN];
+    int		next;
+} IgsPatternCache;
+
+typedef struct _igsScreenInfo {
+    CARD8	    *cursor_base;
+    CARD32	    cursor_offset;
+    IgsCursor	    cursor;
+    IgsPatternCache tile;
+    IgsPatternCache stipple;
+} IgsScreenInfo;
+
+#define IgsTileSize(bpp)	(IGS_PATTERN_WIDTH*(bpp)/8*IGS_PATTERN_HEIGHT)
+#define IgsStippleSize(bpp)	(IGS_PATTERN_WIDTH/8*IGS_PATTERN_HEIGHT)
+
+#define getIgsScreenInfo(kd) ((IgsScreenInfo *) ((kd)->screen->driver))
+#define igsScreenInfo(kd)    IgsScreenInfo *igss = getIgsScreenInfo(kd)
+
+Bool
+igsDrawInit (ScreenPtr pScreen);
+
+void
+igsDrawEnable (ScreenPtr pScreen);
+
+void
+igsDrawDisable (ScreenPtr pScreen);
+
+void
+igsDrawSync (ScreenPtr pScreen);
+
+void
+igsDrawFini (ScreenPtr pScreen);
+
+void
+igsGetColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs);
+
+void
+igsPutColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs);
+
+Bool
+igsCursorInit (ScreenPtr pScreen);
+
+void
+igsCursorEnable (ScreenPtr pScreen);
+
+void
+igsCursorDisable (ScreenPtr pScreen);
+
+void
+igsCursorFini (ScreenPtr pScreen);
+
+#endif /* _IGS_H_ */
Index: xc/programs/Xserver/hw/kdrive/igs/igscmap.c
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igscmap.c:1.1
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igscmap.c	Wed May 24 16:52:48 2000
@@ -0,0 +1,61 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igscmap.c,v 1.1 2000/05/24 23:52:48 keithp Exp $
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "igs.h"
+
+#define IGS_DAC_SHIFT	8
+void
+igsGetColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs)
+{
+    KdScreenPriv(pScreen);
+    igsCardInfo(pScreenPriv);
+    IgsVga   *igsvga = &igsc->igsvga;
+
+    while (ndef--)
+    {
+	igsSetImm (igsvga, igs_dac_read_index, pdefs->pixel);
+	pdefs->red = igsGetImm (igsvga, igs_dac_data) << IGS_DAC_SHIFT;
+	pdefs->green = igsGetImm (igsvga, igs_dac_data) << IGS_DAC_SHIFT;
+	pdefs->blue = igsGetImm (igsvga, igs_dac_data) << IGS_DAC_SHIFT;
+	pdefs++;
+    }
+}
+
+void
+igsPutColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs)
+{
+    KdScreenPriv(pScreen);
+    igsCardInfo(pScreenPriv);
+    IgsVga   *igsvga = &igsc->igsvga;
+
+    while (ndef--)
+    {
+	igsSetImm (igsvga, igs_dac_write_index, pdefs->pixel);
+	igsSetImm (igsvga, igs_dac_data, pdefs->red >> IGS_DAC_SHIFT);
+	igsSetImm (igsvga, igs_dac_data, pdefs->green >> IGS_DAC_SHIFT);
+	igsSetImm (igsvga, igs_dac_data, pdefs->blue >> IGS_DAC_SHIFT);
+	pdefs++;
+    }
+}
+
Index: xc/programs/Xserver/hw/kdrive/igs/igscurs.c
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igscurs.c:1.1
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igscurs.c	Wed May 24 16:52:48 2000
@@ -0,0 +1,344 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igscurs.c,v 1.1 2000/05/24 23:52:48 keithp Exp $
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "igs.h"
+#include "cursorstr.h"
+
+#define SetupCursor(s)	    KdScreenPriv(s); \
+			    igsCardInfo(pScreenPriv); \
+			    igsScreenInfo(pScreenPriv); \
+			    IgsCursor *pCurPriv = &igss->cursor; \
+			    IgsVga    *igsvga = &igsc->igsvga
+
+static void
+_igsMoveCursor (ScreenPtr pScreen, int x, int y)
+{
+    SetupCursor(pScreen);
+    CARD8   xoff, yoff;
+
+    x -= pCurPriv->xhot;
+    xoff = 0;
+    if (x < 0)
+    {
+	xoff = -x;
+	x = 0;
+    }
+    y -= pCurPriv->yhot;
+    yoff = 0;
+    if (y < 0)
+    {
+	yoff = -y;
+	y = 0;
+    }
+
+    igsSet (igsvga, igs_sprite_x, x);
+    igsSet (igsvga, igs_sprite_preset_x, xoff);
+    igsSet (igsvga, igs_sprite_y, y);
+    igsSet (igsvga, igs_sprite_preset_y, yoff);
+}
+
+static void
+igsMoveCursor (ScreenPtr pScreen, int x, int y)
+{
+    SetupCursor (pScreen);
+    
+    if (!pCurPriv->has_cursor)
+	return;
+    
+    if (!pScreenPriv->enabled)
+	return;
+    
+    _igsMoveCursor (pScreen, x, y);
+    VgaFlush (&igsvga->card);
+}
+
+
+static void
+igsSetCursorColors (ScreenPtr pScreen)
+{
+    SetupCursor (pScreen);
+    CursorPtr	pCursor = pCurPriv->pCursor;
+    
+    igsSetImm (igsvga, igs_cursor_write_index, 0);
+    igsSetImm (igsvga, igs_cursor_data, pCursor->backRed >> 8);
+    igsSetImm (igsvga, igs_cursor_data, pCursor->backGreen >> 8);
+    igsSetImm (igsvga, igs_cursor_data, pCursor->backBlue >> 8);
+    igsSetImm (igsvga, igs_cursor_write_index, 1);
+    igsSetImm (igsvga, igs_cursor_data, pCursor->foreRed >> 8);
+    igsSetImm (igsvga, igs_cursor_data, pCursor->foreGreen >> 8);
+    igsSetImm (igsvga, igs_cursor_data, pCursor->foreBlue >> 8);
+}
+    
+#if BITMAP_BIT_ORDER == MSBFirst
+#define IgsAdjustCursor(v) { \
+    v = ((v & 0x55555555) << 1) | ((v >> 1) & 0x55555555); \
+    v = ((v & 0x33333333) << 2) | ((v >> 2) & 0x33333333); \
+    v = ((v & 0x0f0f0f0f) << 4) | ((v >> 4) & 0x0f0f0f0f); \
+    v = ((v & 0x00ff00ff) << 8) | ((v >> 8) & 0x00ff00ff); \
+    v = ((v & 0x0000ffff) <<16) | ((v >>16) & 0x0000ffff); \
+}
+#else
+#define IgsAdjustCursor(v)
+#endif
+
+#define ExplodeBits2(v)	    (((v) & 1) | (((v) & 2) << 1))
+#define ExplodeBits4(v)     ((ExplodeBits2((v) >> 2) << 4) | \
+			     (ExplodeBits2((v) & 0x3)))
+#define ExplodeBits8(v)	    ((ExplodeBits4((v) >> 4) << 8) | \
+			     (ExplodeBits4((v) & 0xf)))
+#define ExplodeBits16(v)    ((ExplodeBits8((v) >> 8) << 16) | \
+			     (ExplodeBits8((v) & 0xff)))
+static void
+igsLoadCursor (ScreenPtr pScreen, int x, int y)
+{
+    SetupCursor(pScreen);
+    CursorPtr	    pCursor = pCurPriv->pCursor;
+    CursorBitsPtr   bits = pCursor->bits;
+    int	w, h;
+    CARD32	    *ram, *msk, *mskLine, *src, *srcLine;
+    int		    i, j;
+    int		    cursor_address;
+    int		    lwsrc;
+    unsigned char   ramdac_control_;
+    CARD32	    offset;
+    CARD32	    b0, b1;
+
+    pCurPriv->pCursor = pCursor;
+    pCurPriv->xhot = pCursor->bits->xhot;
+    pCurPriv->yhot = pCursor->bits->yhot;
+    
+    /*
+     * Stick new image into cursor memory
+     */
+    ram = (CARD32 *) igss->cursor_base;
+    mskLine = (CARD32 *) bits->mask;
+    srcLine = (CARD32 *) bits->source;
+
+    h = bits->height;
+    if (h > IGS_CURSOR_HEIGHT)
+	h = IGS_CURSOR_HEIGHT;
+
+    lwsrc = BitmapBytePad(bits->width) / 4;        /* words per line */
+
+    for (i = 0; i < IGS_CURSOR_HEIGHT; i++) {
+	msk = mskLine;
+	src = srcLine;
+	mskLine += lwsrc;
+	srcLine += lwsrc;
+	for (j = 0; j < IGS_CURSOR_WIDTH / 32; j++) {
+
+	    CARD32  m, s;
+
+	    if (i < h && j < lwsrc) 
+	    {
+		m = *msk++;
+		s = *src++;
+		IgsAdjustCursor(m);
+		IgsAdjustCursor(s);
+	    }
+	    else
+	    {
+		m = 0;
+		s = 0;
+	    }
+	    s &= m;
+	    m = ~m;
+	    b0 = ExplodeBits16(s&0xffff) | (ExplodeBits16(m&0xffff)<<1);
+	    b1 = ExplodeBits16(s>>16) | (ExplodeBits16(m>>16)<<1);
+	    *ram++ = b0;
+	    *ram++ = b1;
+	}
+    }
+    
+    /* Set new color */
+    igsSetCursorColors (pScreen);
+     
+    /* Set address for cursor bits */
+    offset = igss->cursor_offset;
+    offset >>= 10;
+    igsSet (igsvga, igs_sprite_addr, offset);
+    
+    /* Assume TV interpolation off */
+    igsSet (igsvga, igs_hcshf, 3);
+    /* Enable the cursor */
+    igsSet (igsvga, igs_sprite_visible, 1);
+    igsSet (igsvga, igs_sprite_64x64, 1);
+    /* Move to new position */
+    _igsMoveCursor (pScreen, x, y);
+
+    VgaFlush (&igsvga->card);
+}
+
+static void
+igsUnloadCursor (ScreenPtr pScreen)
+{
+    SetupCursor (pScreen);
+    
+    /* Disable cursor */
+    igsSet (igsvga, igs_sprite_visible, 0);
+    VgaFlush (&igsvga->card);
+}
+
+static Bool
+igsRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
+{
+    SetupCursor(pScreen);
+
+    if (!pScreenPriv->enabled)
+	return TRUE;
+    
+    /* miRecolorCursor does this */
+    if (pCurPriv->pCursor == pCursor)
+    {
+	if (pCursor)
+	{
+	    int	    x, y;
+	    
+	    miPointerPosition (&x, &y);
+	    igsLoadCursor (pScreen, x, y);
+	}
+    }
+    return TRUE;
+}
+
+static Bool
+igsUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
+{
+    return TRUE;
+}
+
+static void
+igsSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
+{
+    SetupCursor(pScreen);
+
+    pCurPriv->pCursor = pCursor;
+    
+    if (!pScreenPriv->enabled)
+	return;
+    
+    if (pCursor)
+	igsLoadCursor (pScreen, x, y);
+    else
+	igsUnloadCursor (pScreen);
+}
+
+miPointerSpriteFuncRec igsPointerSpriteFuncs = {
+    igsRealizeCursor,
+    igsUnrealizeCursor,
+    igsSetCursor,
+    igsMoveCursor,
+};
+
+static void
+igsQueryBestSize (int class, 
+		 unsigned short *pwidth, unsigned short *pheight, 
+		 ScreenPtr pScreen)
+{
+    SetupCursor (pScreen);
+
+    switch (class)
+    {
+    case CursorShape:
+	if (*pwidth > pCurPriv->width)
+	    *pwidth = pCurPriv->width;
+	if (*pheight > pCurPriv->height)
+	    *pheight = pCurPriv->height;
+	if (*pwidth > pScreen->width)
+	    *pwidth = pScreen->width;
+	if (*pheight > pScreen->height)
+	    *pheight = pScreen->height;
+	break;
+    default:
+	fbQueryBestSize (class, pwidth, pheight, pScreen);
+	break;
+    }
+}
+
+Bool
+igsCursorInit (ScreenPtr pScreen)
+{
+    SetupCursor (pScreen);
+
+    if (!igss->cursor_base)
+    {
+	pCurPriv->has_cursor = FALSE;
+	return FALSE;
+    }
+    
+    pCurPriv->width = IGS_CURSOR_WIDTH;
+    pCurPriv->height= IGS_CURSOR_HEIGHT;
+    pScreen->QueryBestSize = igsQueryBestSize;
+    miPointerInitialize (pScreen,
+			 &igsPointerSpriteFuncs,
+			 &kdPointerScreenFuncs,
+			 FALSE);
+    pCurPriv->has_cursor = TRUE;
+    pCurPriv->pCursor = NULL;
+    return TRUE;
+}
+
+void
+igsCursorEnable (ScreenPtr pScreen)
+{
+    SetupCursor (pScreen);
+
+    if (pCurPriv->has_cursor)
+    {
+	if (pCurPriv->pCursor)
+	{
+	    int	    x, y;
+	    
+	    miPointerPosition (&x, &y);
+	    igsLoadCursor (pScreen, x, y);
+	}
+	else
+	    igsUnloadCursor (pScreen);
+    }
+}
+
+void
+igsCursorDisable (ScreenPtr pScreen)
+{
+    SetupCursor (pScreen);
+
+    if (!pScreenPriv->enabled)
+	return;
+    
+    if (pCurPriv->has_cursor)
+    {
+	if (pCurPriv->pCursor)
+	{
+	    igsUnloadCursor (pScreen);
+	}
+    }
+}
+
+void
+igsCursorFini (ScreenPtr pScreen)
+{
+    SetupCursor (pScreen);
+
+    pCurPriv->pCursor = NULL;
+}
Index: xc/programs/Xserver/hw/kdrive/igs/igsdraw.c
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igsdraw.c:1.2
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igsdraw.c	Wed May 24 16:52:48 2000
@@ -0,0 +1,1532 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igsdraw.c,v 1.2 2000/05/24 23:52:48 keithp Exp $
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "igs.h"
+#include "igsdraw.h"
+
+#include	"Xmd.h"
+#include	"gcstruct.h"
+#include	"scrnintstr.h"
+#include	"pixmapstr.h"
+#include	"regionstr.h"
+#include	"mistruct.h"
+#include	"fontstruct.h"
+#include	"dixfontstr.h"
+#include	"fb.h"
+#include	"migc.h"
+#include	"miline.h"
+
+CARD8 igsPatRop[16] = {
+    /* GXclear      */      0x00,         /* 0 */
+    /* GXand        */      0xa0,         /* src AND dst */
+    /* GXandReverse */      0x50,         /* src AND NOT dst */
+    /* GXcopy       */      0xf0,         /* src */
+    /* GXandInverted*/      0x0a,         /* NOT src AND dst */
+    /* GXnoop       */      0xaa,         /* dst */
+    /* GXxor        */      0x5a,         /* src XOR dst */
+    /* GXor         */      0xfa,         /* src OR dst */
+    /* GXnor        */      0x05,         /* NOT src AND NOT dst */
+    /* GXequiv      */      0xa5,         /* NOT src XOR dst */
+    /* GXinvert     */      0x55,         /* NOT dst */
+    /* GXorReverse  */      0xf5,         /* src OR NOT dst */
+    /* GXcopyInverted*/     0x0f,         /* NOT src */
+    /* GXorInverted */      0xaf,         /* NOT src OR dst */
+    /* GXnand       */      0x5f,         /* NOT src OR NOT dst */
+    /* GXset        */      0xff,         /* 1 */
+};
+
+/*
+ * Handle pixel transfers
+ */
+
+#define BURST
+#ifdef BURST
+#define PixTransDeclare	VOL32	*pix_trans_base = igsc->copData,\
+				*pix_trans = pix_trans_base
+#define PixTransStart(n)	if (pix_trans + (n) > pix_trans_base + 16384) pix_trans = pix_trans_base
+#define PixTransStore(t)	*pix_trans++ = (t)
+#else
+#define PixTransDeclare	VOL32	*pix_trans = igsc->copData
+#define PixTransStart(n)	
+#define PixTransStore(t)	*pix_trans = (t)
+#endif
+
+static IgsPattern *
+igsSetPattern (ScreenPtr    pScreen,
+	       PixmapPtr    pPixmap,
+	       CARD8	    fillStyle,
+	       INT32	    xrot,
+	       INT32	    yrot)
+{
+    KdScreenPriv(pScreen);
+    igsCardInfo(pScreenPriv);
+    igsScreenInfo(pScreenPriv);
+    int		i;
+    IgsPatternCache *c;
+    IgsPattern	*p;
+
+    if (fillStyle == FillTiled)
+	c = &igss->tile;
+    else
+	c = &igss->stipple;
+    for (i = 0; i < IGS_NUM_PATTERN; i++)
+    {
+	p = &c->pattern[i];
+	if (p->serial_number == pPixmap->drawable.serialNumber &&
+	    p->xrot == xrot &&
+	    p->yrot == yrot)
+	{
+	    return p;
+	}
+    }
+    p = &c->pattern[c->next];
+    if (++c->next == IGS_NUM_PATTERN)
+	c->next = 0;
+    p->serial_number = pPixmap->drawable.serialNumber;
+    p->xrot = xrot;
+    p->yrot = yrot;
+
+    if (fillStyle != FillTiled)
+    {
+	FbStip	    *pix;
+	FbStride    pixStride;
+	int	    pixBpp;
+	CARD8	    tmp[8];
+	CARD32	    *pat;
+	int	    stipX, stipY;
+	int	    y;
+	FbStip	    bits;
+
+	modulus (-yrot, pPixmap->drawable.height, stipY);
+	modulus (-xrot, FB_UNIT, stipX);
+
+	pat = (CARD32 *) p->base;
+
+	fbGetStipDrawable (&pPixmap->drawable, pix, pixStride, pixBpp);
+	
+	for (y = 0; y < 8; y++)
+	{
+	    bits = pix[stipY * pixStride];
+	    FbRotLeft (bits, stipX);
+	    tmp[y] = (CARD8) bits;
+	    stipY++;
+	    if (stipY == pPixmap->drawable.height)
+		stipY = 0;
+	}
+	for (i = 0; i < 2; i++)
+	{
+	    bits = (tmp[i*4+0] | 
+		      (tmp[i*4+1] << 8) | 
+		      (tmp[i*4+2] << 16) |
+		      (tmp[i*4+3] << 24));
+	    IgsAdjustBits32 (bits);
+	    *pat++ = bits;
+	}
+    }
+    else
+    {
+	FbBits	    *pix;
+	FbStride    pixStride;
+	int	    pixBpp;
+	FbBits	    *pat;
+	FbStride    patStride;
+	int	    patBpp;
+	
+	fbGetDrawable (&pPixmap->drawable, pix, pixStride, pixBpp);
+
+	pat = (FbBits *) p->base;
+	patBpp = pixBpp;
+	patStride = (patBpp * IGS_PATTERN_WIDTH) / (8 * sizeof (FbBits));
+
+	fbTile (pat, patStride, 0,
+		patBpp * IGS_PATTERN_WIDTH, IGS_PATTERN_HEIGHT,
+
+		pix, pixStride, 
+		pPixmap->drawable.width * pixBpp,
+		pPixmap->drawable.height,
+		GXcopy, FB_ALLONES, pixBpp,
+		xrot * pixBpp, yrot);
+    }
+    return p;
+}
+
+void
+igsFillBoxSolid (DrawablePtr pDrawable, int nBox, BoxPtr pBox, 
+		 unsigned long pixel, int alu, unsigned long planemask)
+{
+    SetupIgs(pDrawable->pScreen);
+    CARD32	cmd;
+
+    _igsSetSolidRect(cop,alu,planemask,pixel,cmd);
+    while (nBox--) 
+    {
+	_igsRect(cop,pBox->x1,pBox->y1,pBox->x2-pBox->x1,pBox->y2-pBox->y1,cmd);
+	pBox++;
+    }
+    KdMarkSync (pDrawable->pScreen);
+}
+
+void
+igsFillBoxTiled (DrawablePtr pDrawable, int nBox, BoxPtr pBox,
+		 PixmapPtr pPixmap, int xrot, int yrot, int alu)
+{
+    SetupIgs(pDrawable->pScreen);
+    CARD32      cmd;
+    IgsPattern	*p = igsSetPattern (pDrawable->pScreen,
+				    pPixmap,
+				    FillTiled,
+				    xrot, yrot);
+    
+    _igsSetTiledRect(cop,alu,planemask,p->offset,cmd);
+    while (nBox--) 
+    {
+	_igsPatRect(cop,pBox->x1,pBox->y1,pBox->x2-pBox->x1,pBox->y2-pBox->y1,cmd);
+	pBox++;
+    }
+    KdMarkSync (pDrawable->pScreen);
+}
+
+void
+igsFillBoxStippled (DrawablePtr pDrawable, GCPtr pGC,
+		    int nBox, BoxPtr pBox)
+{
+    SetupIgs(pDrawable->pScreen);
+    CARD32      cmd;
+    int		xrot = pGC->patOrg.x + pDrawable->x;
+    int		yrot = pGC->patOrg.y + pDrawable->y;
+    IgsPattern	*p = igsSetPattern (pDrawable->pScreen,
+				    pGC->stipple,
+				    pGC->fillStyle,
+				    xrot, yrot);
+    if (pGC->fillStyle == FillStippled)
+    {
+	_igsSetStippledRect (cop,pGC->alu,planemask,pGC->fgPixel,p->offset,cmd);
+    }
+    else
+    {
+	_igsSetOpaqueStippledRect (cop,pGC->alu,planemask,
+				   pGC->fgPixel,pGC->bgPixel,p->offset,cmd);
+    }
+    while (nBox--) 
+    {
+	_igsPatRect(cop,pBox->x1,pBox->y1,pBox->x2-pBox->x1,pBox->y2-pBox->y1,cmd);
+	pBox++;
+    }
+    KdMarkSync (pDrawable->pScreen);
+}
+
+
+void
+igsStipple (ScreenPtr	pScreen,
+	    CARD32	cmd,
+	    FbStip	*psrcBase,
+	    FbStride	widthSrc,
+	    int		srcx,
+	    int		srcy,
+	    int		dstx,
+	    int		dsty,
+	    int		width,
+	    int		height)
+{
+    SetupIgs(pScreen);
+    FbStip	*psrcLine, *psrc;
+    FbStride	widthRest;
+    FbStip	bits, tmp, lastTmp;
+    int		leftShift, rightShift;
+    int		nl, nlMiddle;
+    int		r;
+    PixTransDeclare;
+    
+    /* Compute blt address and parameters */
+    psrc = psrcBase + srcy * widthSrc + (srcx >> 5);
+    nlMiddle = (width + 31) >> 5;
+    leftShift = srcx & 0x1f;
+    rightShift = 32 - leftShift;
+    widthRest = widthSrc - nlMiddle;
+    
+    _igsPlaneBlt(cop,dstx,dsty,width,height,cmd);
+    
+    if (leftShift == 0)
+    {
+	while (height--)
+	{
+	    nl = nlMiddle;
+	    PixTransStart(nl);
+	    while (nl--)
+	    {
+		tmp = *psrc++;
+		IgsAdjustBits32 (tmp);
+		PixTransStore (tmp);
+	    }
+	    psrc += widthRest;
+	}
+    }
+    else
+    {
+	widthRest--;
+	while (height--)
+	{
+	    bits = *psrc++;
+	    nl = nlMiddle;
+	    PixTransStart(nl);
+	    while (nl--)
+	    {
+		tmp = FbStipLeft(bits, leftShift);
+		bits = *psrc++;
+		tmp |= FbStipRight(bits, rightShift);
+		IgsAdjustBits32(tmp);
+		PixTransStore (tmp);
+	    }
+	    psrc += widthRest;
+	}
+    }
+}
+	    
+void
+igsCopyNtoN (DrawablePtr	pSrcDrawable,
+	    DrawablePtr	pDstDrawable,
+	    GCPtr	pGC,
+	    BoxPtr	pbox,
+	    int		nbox,
+	    int		dx,
+	    int		dy,
+	    Bool	reverse,
+	    Bool	upsidedown,
+	    Pixel	bitplane,
+	    void	*closure)
+{
+    SetupIgs(pDstDrawable->pScreen);
+    int	    srcX, srcY, dstX, dstY;
+    int	    w, h;
+    CARD32  flags;
+    CARD32  cmd;
+    CARD8   alu;
+    
+    if (pGC)
+    {
+	alu = pGC->alu;
+	if (sourceInvarient (pGC->alu))
+	{
+	    igsFillBoxSolid (pDstDrawable, nbox, pbox, 0, pGC->alu, pGC->planemask);
+	    return;
+	}
+    }
+    else
+	alu = GXcopy;
+    
+    _igsSetBlt(cop,alu,pGC->planemask,reverse,upsidedown,cmd);
+    while (nbox--)
+    {
+	w = pbox->x2 - pbox->x1;
+	h = pbox->y2 - pbox->y1;
+	if (reverse)
+	    dstX = pbox->x2 - 1;
+	else
+	    dstX = pbox->x1;
+	srcX = dstX + dx;
+	
+	if (upsidedown)
+	    dstY = pbox->y2 - 1;
+	else
+	    dstY = pbox->y1;
+	
+	srcY = dstY + dy;
+	
+	_igsBlt (cop, srcX, srcY, dstX, dstY, w, h, cmd);
+	pbox++;
+    }
+    KdMarkSync (pDstDrawable->pScreen);
+}
+
+RegionPtr
+igsCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
+	   int srcx, int srcy, int width, int height, int dstx, int dsty)
+{
+    KdScreenPriv(pDstDrawable->pScreen);
+    FbBits	    depthMask;
+    
+    depthMask = FbFullMask (pDstDrawable->depth);
+    if ((pGC->planemask & depthMask) == depthMask &&
+	pSrcDrawable->type == DRAWABLE_WINDOW &&
+	pDstDrawable->type == DRAWABLE_WINDOW)
+    {
+	return fbDoCopy (pSrcDrawable, pDstDrawable, pGC, 
+			 srcx, srcy, width, height, 
+			 dstx, dsty, igsCopyNtoN, 0, 0);
+    }
+    return KdCheckCopyArea (pSrcDrawable, pDstDrawable, pGC, 
+		       srcx, srcy, width, height, dstx, dsty);
+}
+
+typedef struct _igs1toNargs {
+    unsigned long	copyPlaneFG, copyPlaneBG;
+    Bool		opaque;
+} igs1toNargs;
+
+void
+igsCopy1toN (DrawablePtr    pSrcDrawable,
+	     DrawablePtr    pDstDrawable,
+	     GCPtr	    pGC,
+	     BoxPtr	    pbox,
+	     int	    nbox,
+	     int	    dx,
+	     int	    dy,
+	     Bool	    reverse,
+	     Bool	    upsidedown,
+	     Pixel	    bitplane,
+	     void	    *closure)
+{
+    SetupIgs(pDstDrawable->pScreen);
+    
+    igs1toNargs		*args = closure;
+    int			dstx, dsty;
+    FbStip		*psrcBase;
+    FbStride		widthSrc;
+    int			srcBpp;
+    CARD32		cmd;
+
+    if (args->opaque && sourceInvarient (pGC->alu))
+    {
+	igsFillBoxSolid (pDstDrawable, nbox, pbox,
+			 pGC->bgPixel, pGC->alu, pGC->planemask);
+	return;
+    }
+    
+    fbGetStipDrawable (pSrcDrawable, psrcBase, widthSrc, srcBpp);
+    
+    if (args->opaque)
+    {
+	_igsSetOpaquePlaneBlt (cop, pGC->alu, pGC->planemask, args->copyPlaneFG,
+			       args->copyPlaneBG, cmd);
+    }
+    else
+    {
+	_igsSetTransparentPlaneBlt (cop, pGC->alu, pGC->planemask,
+				    args->copyPlaneFG, cmd);
+    }
+    
+    while (nbox--)
+    {
+	dstx = pbox->x1;
+	dsty = pbox->y1;
+	
+	igsStipple (pDstDrawable->pScreen, cmd,
+		    psrcBase, widthSrc, 
+		    dstx + dx, dsty + dy,
+		    dstx, dsty, 
+		    pbox->x2 - dstx, pbox->y2 - dsty);
+	pbox++;
+    }
+    KdMarkSync (pDstDrawable->pScreen);
+}
+
+RegionPtr
+igsCopyPlane (DrawablePtr   pSrcDrawable,
+	      DrawablePtr   pDstDrawable,
+	      GCPtr	    pGC,
+	      int	    srcx,
+	      int	    srcy,
+	      int	    width,
+	      int	    height, 
+	      int	    dstx,
+	      int	    dsty,
+	      unsigned long bitPlane)
+{
+    RegionPtr	    ret;
+    igs1toNargs	    args;
+    FbBits	    depthMask;
+
+    depthMask = FbFullMask (pDstDrawable->depth);
+    if ((pGC->planemask & depthMask) == depthMask &&
+	pDstDrawable->type == DRAWABLE_WINDOW &&
+	pSrcDrawable->depth == 1)
+    {
+	args.copyPlaneFG = pGC->fgPixel;
+	args.copyPlaneBG = pGC->bgPixel;
+	args.opaque = TRUE;
+	return fbDoCopy (pSrcDrawable, pDstDrawable, pGC, 
+			 srcx, srcy, width, height, 
+			 dstx, dsty, igsCopy1toN, bitPlane, &args);
+    }
+    return KdCheckCopyPlane(pSrcDrawable, pDstDrawable, pGC, 
+			    srcx, srcy, width, height, 
+			    dstx, dsty, bitPlane);
+}
+
+#if 0
+/* would you believe this is slower than fb? */
+void
+igsPushPixels (GCPtr	    pGC,
+	       PixmapPtr    pBitmap,
+	       DrawablePtr  pDrawable,
+	       int	    w,
+	       int	    h,
+	       int	    x,
+	       int	    y)
+{
+    igs1toNargs		args;
+    FbBits	    depthMask;
+
+    depthMask = FbFullMask (pDstDrawable->depth);
+    if ((pGC->planemask & depthMask) == depthMask &&
+	pDrawable->type == DRAWABLE_WINDOW && 
+	pGC->fillStyle == FillSolid)
+    {
+	args.opaque = FALSE;
+	args.copyPlaneFG = pGC->fgPixel;
+	(void) fbDoCopy ((DrawablePtr) pBitmap, pDrawable, pGC,
+			  0, 0, w, h, x, y, igsCopy1toN, 1, &args);
+    }
+    else
+    {
+	KdCheckPushPixels (pGC, pBitmap, pDrawable, w, h, x, y);
+    }
+}
+#else
+#define igsPushPixels KdCheckPushPixels
+#endif
+
+BOOL
+igsFillOk (GCPtr pGC)
+{
+    FbBits  depthMask;
+
+    depthMask = FbFullMask(pGC->depth);
+    if ((pGC->planemask & depthMask) != depthMask)
+	return FALSE;
+    switch (pGC->fillStyle) {
+    case FillSolid:
+	return TRUE;
+    case FillTiled:
+	return (igsPatternDimOk (pGC->tile.pixmap->drawable.width) &&
+		igsPatternDimOk (pGC->tile.pixmap->drawable.height));
+    case FillStippled:
+    case FillOpaqueStippled:
+	return (igsPatternDimOk (pGC->stipple->drawable.width) &&
+		igsPatternDimOk (pGC->stipple->drawable.height));
+    }
+    return FALSE;
+}
+
+void
+igsFillSpans (DrawablePtr pDrawable, GCPtr pGC, int n, 
+	     DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    SetupIgs(pDrawable->pScreen);
+    DDXPointPtr	    pptFree;
+    FbGCPrivPtr	    fbPriv = fbGetGCPrivate(pGC);
+    int		    *pwidthFree;/* copies of the pointers to free */
+    CARD32	    cmd;
+    int		    nTmp;
+    INT16	    x, y;
+    int		    width;
+    IgsPattern	    *p;
+    
+    if (!igsFillOk (pGC))
+    {
+	KdCheckFillSpans (pDrawable, pGC, n, ppt, pwidth, fSorted);
+	return;
+    }
+    nTmp = n * miFindMaxBand(fbGetCompositeClip(pGC));
+    pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
+    pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
+    if(!pptFree || !pwidthFree)
+    {
+	if (pptFree) DEALLOCATE_LOCAL(pptFree);
+	if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
+	return;
+    }
+    n = miClipSpans(fbGetCompositeClip(pGC),
+		     ppt, pwidth, n,
+		     pptFree, pwidthFree, fSorted);
+    pwidth = pwidthFree;
+    ppt = pptFree;
+    switch (pGC->fillStyle) {
+    case FillSolid:
+	_igsSetSolidRect(cop,pGC->alu,pGC->planemask,pGC->fgPixel,cmd);
+	break;
+    case FillTiled:
+	p = igsSetPattern (pDrawable->pScreen,
+			   pGC->tile.pixmap,
+			   FillTiled,
+			   pGC->patOrg.x + pDrawable->x,
+			   pGC->patOrg.y + pDrawable->y);
+	_igsSetTiledRect (cop,pGC->alu,pGC->planemask,p->offset,cmd);
+	break;
+    default:
+	p = igsSetPattern (pDrawable->pScreen,
+			   pGC->stipple,
+			   pGC->fillStyle,
+			   pGC->patOrg.x + pDrawable->x,
+			   pGC->patOrg.y + pDrawable->y);
+	if (pGC->fillStyle == FillStippled)
+	{
+	    _igsSetStippledRect (cop,pGC->alu,pGC->planemask,
+				 pGC->fgPixel,p->offset,cmd);
+	}
+	else
+	{
+	    _igsSetOpaqueStippledRect (cop,pGC->alu,pGC->planemask,
+				       pGC->fgPixel,pGC->bgPixel,p->offset,cmd);
+	}
+	break;
+    }
+    while (n--)
+    {
+	x = ppt->x;
+	y = ppt->y;
+	ppt++;
+	width = *pwidth++;
+	if (width)
+	{
+	    _igsPatRect(cop,x,y,width,1,cmd);
+	}
+    }
+    DEALLOCATE_LOCAL(pptFree);
+    DEALLOCATE_LOCAL(pwidthFree);
+    KdMarkSync (pDrawable->pScreen);
+}
+
+#define NUM_STACK_RECTS	1024
+
+void
+igsPolyFillRect (DrawablePtr pDrawable, GCPtr pGC, 
+		int nrectFill, xRectangle *prectInit)
+{
+    SetupIgs(pDrawable->pScreen);
+    xRectangle	    *prect;
+    RegionPtr	    prgnClip;
+    register BoxPtr pbox;
+    register BoxPtr pboxClipped;
+    BoxPtr	    pboxClippedBase;
+    BoxPtr	    pextent;
+    BoxRec	    stackRects[NUM_STACK_RECTS];
+    FbGCPrivPtr	    fbPriv = fbGetGCPrivate (pGC);
+    int		    numRects;
+    int		    n;
+    int		    xorg, yorg;
+    int		    x, y;
+    
+    if (!igsFillOk (pGC))
+    {
+	KdCheckPolyFillRect (pDrawable, pGC, nrectFill, prectInit);
+	return;
+    }
+    prgnClip = fbGetCompositeClip (pGC);
+    xorg = pDrawable->x;
+    yorg = pDrawable->y;
+    
+    if (xorg || yorg)
+    {
+	prect = prectInit;
+	n = nrectFill;
+	while(n--)
+	{
+	    prect->x += xorg;
+	    prect->y += yorg;
+	    prect++;
+	}
+    }
+    
+    prect = prectInit;
+
+    numRects = REGION_NUM_RECTS(prgnClip) * nrectFill;
+    if (numRects > NUM_STACK_RECTS)
+    {
+	pboxClippedBase = (BoxPtr)xalloc(numRects * sizeof(BoxRec));
+	if (!pboxClippedBase)
+	    return;
+    }
+    else
+	pboxClippedBase = stackRects;
+
+    pboxClipped = pboxClippedBase;
+	
+    if (REGION_NUM_RECTS(prgnClip) == 1)
+    {
+	int x1, y1, x2, y2, bx2, by2;
+
+	pextent = REGION_RECTS(prgnClip);
+	x1 = pextent->x1;
+	y1 = pextent->y1;
+	x2 = pextent->x2;
+	y2 = pextent->y2;
+    	while (nrectFill--)
+    	{
+	    if ((pboxClipped->x1 = prect->x) < x1)
+		pboxClipped->x1 = x1;
+    
+	    if ((pboxClipped->y1 = prect->y) < y1)
+		pboxClipped->y1 = y1;
+    
+	    bx2 = (int) prect->x + (int) prect->width;
+	    if (bx2 > x2)
+		bx2 = x2;
+	    pboxClipped->x2 = bx2;
+    
+	    by2 = (int) prect->y + (int) prect->height;
+	    if (by2 > y2)
+		by2 = y2;
+	    pboxClipped->y2 = by2;
+
+	    prect++;
+	    if ((pboxClipped->x1 < pboxClipped->x2) &&
+		(pboxClipped->y1 < pboxClipped->y2))
+	    {
+		pboxClipped++;
+	    }
+    	}
+    }
+    else
+    {
+	int x1, y1, x2, y2, bx2, by2;
+
+	pextent = REGION_EXTENTS(pGC->pScreen, prgnClip);
+	x1 = pextent->x1;
+	y1 = pextent->y1;
+	x2 = pextent->x2;
+	y2 = pextent->y2;
+    	while (nrectFill--)
+    	{
+	    BoxRec box;
+    
+	    if ((box.x1 = prect->x) < x1)
+		box.x1 = x1;
+    
+	    if ((box.y1 = prect->y) < y1)
+		box.y1 = y1;
+    
+	    bx2 = (int) prect->x + (int) prect->width;
+	    if (bx2 > x2)
+		bx2 = x2;
+	    box.x2 = bx2;
+    
+	    by2 = (int) prect->y + (int) prect->height;
+	    if (by2 > y2)
+		by2 = y2;
+	    box.y2 = by2;
+    
+	    prect++;
+    
+	    if ((box.x1 >= box.x2) || (box.y1 >= box.y2))
+	    	continue;
+    
+	    n = REGION_NUM_RECTS (prgnClip);
+	    pbox = REGION_RECTS(prgnClip);
+    
+	    /* clip the rectangle to each box in the clip region
+	       this is logically equivalent to calling Intersect()
+	    */
+	    while(n--)
+	    {
+		pboxClipped->x1 = max(box.x1, pbox->x1);
+		pboxClipped->y1 = max(box.y1, pbox->y1);
+		pboxClipped->x2 = min(box.x2, pbox->x2);
+		pboxClipped->y2 = min(box.y2, pbox->y2);
+		pbox++;
+
+		/* see if clipping left anything */
+		if(pboxClipped->x1 < pboxClipped->x2 && 
+		   pboxClipped->y1 < pboxClipped->y2)
+		{
+		    pboxClipped++;
+		}
+	    }
+    	}
+    }
+    if (pboxClipped != pboxClippedBase)
+    {
+	switch (pGC->fillStyle) {
+	case FillSolid:
+	    igsFillBoxSolid(pDrawable,
+			   pboxClipped-pboxClippedBase, pboxClippedBase,
+			   pGC->fgPixel, pGC->alu, pGC->planemask);
+	    break;
+	case FillTiled:
+	    igsFillBoxTiled(pDrawable,
+			    pboxClipped-pboxClippedBase, pboxClippedBase,
+			    pGC->tile.pixmap,
+			    pGC->patOrg.x + pDrawable->x,
+			    pGC->patOrg.y + pDrawable->y,
+			    pGC->alu);
+	    break;
+	case FillStippled:
+	case FillOpaqueStippled:
+	    igsFillBoxStippled (pDrawable, pGC,
+				pboxClipped-pboxClippedBase, pboxClippedBase);
+	    break;
+	}
+    }
+    if (pboxClippedBase != stackRects)
+    	xfree(pboxClippedBase);
+}
+
+int
+igsTextInRegion (GCPtr		pGC,
+		 int		x,
+		 int		y,
+		 unsigned int	nglyph,
+		 CharInfoPtr	*ppci)
+{
+    int		    w;
+    FontPtr	    pfont = pGC->font;
+    BoxRec	    bbox;
+    
+    if (FONTCONSTMETRICS(pfont))
+	w = FONTMAXBOUNDS(pfont,characterWidth) * nglyph;
+    else
+    {
+	w = 0;
+	while (nglyph--)
+	    w += (*ppci++)->metrics.characterWidth;
+    }
+    if (w < 0)
+    {
+	bbox.x1 = x + w;
+	bbox.x2 = x;
+    }
+    else
+    {
+	bbox.x1 = x;
+	bbox.x2 = x + w;
+    }
+    w = FONTMINBOUNDS(pfont,leftSideBearing);
+    if (w < 0)
+	bbox.x1 += w;
+    w = FONTMAXBOUNDS(pfont, rightSideBearing) - FONTMINBOUNDS(pfont, characterWidth);
+    if (w > 0)
+	bbox.x2 += w;
+    bbox.y1 = y - FONTMAXBOUNDS(pfont,ascent);
+    bbox.y2 = y + FONTMAXBOUNDS(pfont,descent);
+    
+    return RECT_IN_REGION(pGC->pScreen, fbGetCompositeClip(pGC), &bbox);
+}
+		 
+void
+igsGlyphBltClipped (DrawablePtr	    pDrawable,
+		    GCPtr	    pGC,
+		    int		    x,
+		    int		    y,
+		    unsigned int    nglyph,
+		    CharInfoPtr	    *ppciInit,
+		    Bool	    image)
+{
+    SetupIgs(pDrawable->pScreen);
+    CARD32	    cmd;
+    int		    h;
+    int		    w;
+    int		    xBack, yBack;
+    int		    hBack, wBack;
+    int		    lw;
+    FontPtr	    pfont = pGC->font;
+    CharInfoPtr	    pci;
+    unsigned long   *bits;
+    BoxPtr	    extents;
+    BoxRec	    bbox;
+    CARD32	    b;
+    CharInfoPtr	    *ppci;
+    FbGCPrivPtr	    fbPriv = fbGetGCPrivate(pGC);
+    RegionPtr	    pClip = fbGetCompositeClip(pGC);
+    BoxPtr	    pBox;
+    int		    nbox;
+    int		    x1, y1, x2, y2;
+    unsigned char   alu;
+    Bool	    set;
+    PixTransDeclare;
+
+    if (image)
+    {
+	xBack = x;
+	yBack = y - FONTASCENT(pGC->font);
+	wBack = 0;
+	hBack = FONTASCENT(pGC->font) + FONTDESCENT(pGC->font);
+	if (hBack)
+	{
+	    h = nglyph;
+	    ppci = ppciInit;
+	    while (h--)
+		wBack += (*ppci++)->metrics.characterWidth;
+	}
+	if (wBack < 0)
+	{
+	    xBack = xBack + wBack;
+	    wBack = -wBack;
+	}
+	if (hBack < 0)
+	{
+	    yBack = yBack + hBack;
+	    hBack = -hBack;
+	}
+	alu = GXcopy;
+	if (wBack)
+	{
+	    _igsSetSolidRect (cop, GXcopy, pGC->planemask, pGC->bgPixel, cmd);
+	    for (nbox = REGION_NUM_RECTS (pClip),
+		 pBox = REGION_RECTS (pClip);
+		 nbox--;
+		 pBox++)
+	    {
+		x1 = xBack;
+		x2 = xBack + wBack;
+		y1 = yBack;
+		y2 = yBack + hBack;
+		if (x1 < pBox->x1) x1 = pBox->x1;
+		if (x2 > pBox->x2) x2 = pBox->x2;
+		if (y1 < pBox->y1) y1 = pBox->y1;
+		if (y2 > pBox->y2) y2 = pBox->y2;
+		if (x1 < x2 && y1 < y2)
+		{
+		    _igsRect (cop, x1, y1, x2 - x1, y2 - y1, cmd);
+		}
+	    }
+	    KdMarkSync (pDrawable->pScreen);
+	}
+    }
+    else
+    {
+	wBack = 0;
+	alu = pGC->alu;
+    }
+    
+    ppci = ppciInit;
+    set = FALSE;
+    while (nglyph--)
+    {
+	pci = *ppci++;
+	h = pci->metrics.ascent + pci->metrics.descent;
+	w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
+	x1 = x + pci->metrics.leftSideBearing;
+	y1 = y - pci->metrics.ascent;
+	bbox.x1 = x1;
+	bbox.y1 = y1;
+	bbox.x2 = x1 + w;
+	bbox.y2 = y1 + h;
+	switch (RECT_IN_REGION(pGC->pScreen, pClip, &bbox))
+	{
+	case rgnIN:
+	    lw = h * ((w + 31) >> 5);
+	    if (lw)
+	    {
+		if (!set)
+		{
+		    _igsSetTransparentPlaneBlt (cop, alu, pGC->planemask, pGC->fgPixel, cmd);
+		    set = TRUE;
+		}
+		_igsPlaneBlt(cop,
+			     x + pci->metrics.leftSideBearing,
+			     y - pci->metrics.ascent,
+			     w, h, cmd);
+		bits = (unsigned long *) pci->bits;
+		PixTransStart (lw);
+		while (lw--) 
+		{
+		    b = *bits++;
+		    IgsAdjustBits32 (b);
+		    PixTransStore(b);
+		}
+		KdMarkSync (pDrawable->pScreen);
+	    }
+	    break;
+	case rgnPART:
+	    set = FALSE;
+	    KdCheckSync (pDrawable->pScreen);
+	    fbPutXYImage (pDrawable,
+			  pClip,
+			  fbPriv->fg,
+			  fbPriv->bg,
+			  fbPriv->pm,
+			  alu,
+			  FALSE,
+			  x1, y1,
+			  w, h,
+			  (FbStip *) pci->bits,
+			  (w + 31) >> 5,
+			  0);
+	    break;
+	case rgnOUT:
+	    break;
+	}
+	x += pci->metrics.characterWidth;
+    }
+}
+		       
+void
+igsGlyphBlt (DrawablePtr    pDrawable, 
+	     GCPtr	    pGC, 
+	     int	    x,
+	     int	    y, 
+	     unsigned int   nglyph,
+	     CharInfoPtr    *ppciInit,
+	     Bool	    image)
+{
+    SetupIgs(pDrawable->pScreen);
+    CARD32	    cmd;
+    int		    h;
+    int		    w;
+    int		    xBack, yBack;
+    int		    hBack, wBack;
+    int		    lw;
+    FontPtr	    pfont = pGC->font;
+    CharInfoPtr	    pci;
+    unsigned long   *bits;
+    BoxPtr	    extents;
+    BoxRec	    bbox;
+    CARD32	    b;
+    CharInfoPtr	    *ppci;
+    unsigned char   alu;
+    PixTransDeclare;
+
+    /*
+     * Paint background for image text
+     */
+    if (image)
+    {
+	xBack = x;
+	yBack = y - FONTASCENT(pGC->font);
+	wBack = 0;
+	hBack = FONTASCENT(pGC->font) + FONTDESCENT(pGC->font);
+	if (hBack)
+	{
+	    h = nglyph;
+	    ppci = ppciInit;
+	    while (h--)
+		wBack += (*ppci++)->metrics.characterWidth;
+	}
+	if (wBack < 0)
+	{
+	    xBack = xBack + wBack;
+	    wBack = -wBack;
+	}
+	if (hBack < 0)
+	{
+	    yBack = yBack + hBack;
+	    hBack = -hBack;
+	}
+	alu = GXcopy;
+	if (wBack)
+	{
+	    _igsSetSolidRect (cop, GXcopy, pGC->planemask, pGC->bgPixel, cmd);
+	    _igsRect (cop, xBack, yBack, wBack, hBack, cmd);
+	}
+    }
+    else
+    {
+	wBack = 0;
+	alu = pGC->alu;
+    }
+    
+    _igsSetTransparentPlaneBlt (cop, alu, pGC->planemask, pGC->fgPixel, cmd);
+    ppci = ppciInit;
+    while (nglyph--)
+    {
+	pci = *ppci++;
+	h = pci->metrics.ascent + pci->metrics.descent;
+	w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
+	lw = h * ((w + 31) >> 5);
+	if (lw)
+	{
+	    _igsPlaneBlt(cop,
+			 x + pci->metrics.leftSideBearing,
+			 y - pci->metrics.ascent,
+			 w, h, cmd);
+	    bits = (unsigned long *) pci->bits;
+	    PixTransStart(lw);
+	    while (lw--) 
+	    {
+		b = *bits++;
+		IgsAdjustBits32 (b);
+		PixTransStore(b);
+	    }
+	}
+	x += pci->metrics.characterWidth;
+    }
+    KdMarkSync (pDrawable->pScreen);
+}
+
+void
+igsTEGlyphBlt (DrawablePtr  pDrawable,
+	       GCPtr	    pGC,
+	       int	    xInit,
+	       int	    yInit,
+	       unsigned int nglyph,
+	       CharInfoPtr  *ppci,
+	       Bool	    image)
+{
+    SetupIgs(pDrawable->pScreen);
+    CARD32	    cmd;
+    int		    x, y;
+    int		    h, lw, lwTmp;
+    int		    w;
+    FontPtr	    pfont = pGC->font;
+    unsigned long   *char1, *char2, *char3, *char4;
+    int		    widthGlyphs, widthGlyph;
+    BoxRec	    bbox;
+    CARD32	    tmp;
+    PixTransDeclare;
+
+    widthGlyph = FONTMAXBOUNDS(pfont,characterWidth);
+    if (!widthGlyph)
+	return;
+    
+    h = FONTASCENT(pfont) + FONTDESCENT(pfont);
+    if (!h)
+	return;
+    
+    x = xInit + FONTMAXBOUNDS(pfont,leftSideBearing);
+    y = yInit - FONTASCENT(pfont);
+    
+    if (image)
+    {
+	_igsSetOpaquePlaneBlt (cop, GXcopy, pGC->planemask, pGC->fgPixel, pGC->bgPixel, cmd);
+    }
+    else
+    {
+	_igsSetTransparentPlaneBlt (cop, pGC->alu, pGC->planemask, pGC->fgPixel, cmd);
+    }
+
+#if BITMAP_BIT_ORDER == LSBFirst
+#define SHIFT	<<
+#else
+#define SHIFT	>>
+#endif
+    
+#define LoopIt(count, w, loadup, fetch) \
+    while (nglyph >= count) \
+    { \
+	nglyph -= count; \
+	_igsPlaneBlt (cop, x, y, w, h, cmd); \
+	x += w; \
+	loadup \
+	lwTmp = h; \
+	PixTransStart(h); \
+	while (lwTmp--) { \
+	    tmp = fetch; \
+	    IgsAdjustBits32(tmp); \
+	    PixTransStore(tmp); \
+	} \
+    }
+
+    if (widthGlyph <= 8)
+    {
+	widthGlyphs = widthGlyph << 2;
+	LoopIt(4, widthGlyphs,
+	       char1 = (unsigned long *) (*ppci++)->bits;
+	       char2 = (unsigned long *) (*ppci++)->bits;
+	       char3 = (unsigned long *) (*ppci++)->bits;
+	       char4 = (unsigned long *) (*ppci++)->bits;,
+	       (*char1++ | ((*char2++ | ((*char3++ | (*char4++
+						      SHIFT widthGlyph))
+					 SHIFT widthGlyph))
+			    SHIFT widthGlyph)))
+    }
+    else if (widthGlyph <= 10)
+    {
+	widthGlyphs = (widthGlyph << 1) + widthGlyph;
+	LoopIt(3, widthGlyphs,
+	       char1 = (unsigned long *) (*ppci++)->bits;
+	       char2 = (unsigned long *) (*ppci++)->bits;
+	       char3 = (unsigned long *) (*ppci++)->bits;,
+	       (*char1++ | ((*char2++ | (*char3++ SHIFT widthGlyph)) SHIFT widthGlyph)))
+    }
+    else if (widthGlyph <= 16)
+    {
+	widthGlyphs = widthGlyph << 1;
+	LoopIt(2, widthGlyphs,
+	       char1 = (unsigned long *) (*ppci++)->bits;
+	       char2 = (unsigned long *) (*ppci++)->bits;,
+	       (*char1++ | (*char2++ SHIFT widthGlyph)))
+    }
+    lw = h * ((widthGlyph + 31) >> 5);
+    while (nglyph--) 
+    {
+	_igsPlaneBlt (cop, x, y, widthGlyph, h, cmd);
+	x += widthGlyph;
+	char1 = (unsigned long *) (*ppci++)->bits;
+	lwTmp = lw;
+	PixTransStart(lw);
+	while (lwTmp--)
+	{
+	    tmp = *char1++;
+	    IgsAdjustBits32(tmp);
+	    PixTransStore(tmp);
+	}
+    }
+    KdMarkSync (pDrawable->pScreen);
+}
+
+/*
+ * Blt glyphs using image transfer window
+ */
+
+void
+igsPolyGlyphBlt (DrawablePtr	pDrawable, 
+		 GCPtr		pGC, 
+		 int		x,
+		 int		y, 
+		 unsigned int	nglyph,
+		 CharInfoPtr	*ppci, 
+		 pointer	pglyphBase)
+{
+    if (pGC->fillStyle != FillSolid ||
+	fbGetGCPrivate(pGC)->pm != FB_ALLONES)
+    {
+	KdCheckPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+	return;
+    }
+    x += pDrawable->x;
+    y += pDrawable->y;
+
+    switch (igsTextInRegion (pGC, x, y, nglyph, ppci)) {
+    case rgnIN:
+	if (TERMINALFONT(pGC->font))
+	    igsTEGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, FALSE);
+	else
+	    igsGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, FALSE);
+	break;
+    case rgnPART:
+	igsGlyphBltClipped (pDrawable, pGC, x, y, nglyph, ppci, FALSE);
+	break;
+    case rgnOUT:
+	break;
+    }
+}
+
+void
+igsImageGlyphBlt (DrawablePtr pDrawable, 
+		GCPtr pGC, 
+		int x, int y, 
+		unsigned int nglyph, 
+		CharInfoPtr *ppci, 
+		pointer pglyphBase)
+{
+    if (fbGetGCPrivate(pGC)->pm != FB_ALLONES)
+    {
+	KdCheckImageGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+	return;
+    }
+    x += pDrawable->x;
+    y += pDrawable->y;
+
+    switch (igsTextInRegion (pGC, x, y, nglyph, ppci)) {
+    case rgnIN:
+	if (TERMINALFONT(pGC->font))
+	    igsTEGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, TRUE);
+	else
+	    igsGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, TRUE);
+	break;
+    case rgnPART:
+	igsGlyphBltClipped (pDrawable, pGC, x, y, nglyph, ppci, TRUE);
+	break;
+    case rgnOUT:
+	break;
+    }
+}
+
+static void
+igsInvalidatePattern (IgsPatternCache	*c,
+		      PixmapPtr		pPixmap)
+{
+    int i;
+
+    if (c->base)
+    {
+	for (i = 0; i < IGS_NUM_PATTERN; i++)
+	{
+	    if (c->pattern[i].serial_number == pPixmap->drawable.serialNumber)
+		c->pattern[i].serial_number = ~0;
+	}
+    }    
+}
+
+static void
+igsInitPattern (IgsPatternCache *c, int bsize, int psize)
+{
+    int	    i;
+    int	    boffset;
+    int	    poffset;
+
+    for (i = 0; i < IGS_NUM_PATTERN; i++)
+    {
+	boffset = i * bsize;
+	poffset = i * psize;
+	c->pattern[i].xrot = -1;
+	c->pattern[i].yrot = -1;
+	c->pattern[i].serial_number = ~0;
+	c->pattern[i].offset = c->offset + poffset;
+	c->pattern[i].base = c->base + boffset;
+    }
+    c->next = 0;
+}
+	
+static const GCOps	igsOps = {
+    igsFillSpans,
+    KdCheckSetSpans,
+    KdCheckPutImage,
+    igsCopyArea,
+    igsCopyPlane,
+    KdCheckPolyPoint,
+    KdCheckPolylines,
+    KdCheckPolySegment,
+    miPolyRectangle,
+    KdCheckPolyArc,
+    miFillPolygon,
+    igsPolyFillRect,
+    KdCheckPolyFillArc,
+    miPolyText8,
+    miPolyText16,
+    miImageText8,
+    miImageText16,
+    igsImageGlyphBlt,
+    igsPolyGlyphBlt,
+    igsPushPixels,
+#ifdef NEED_LINEHELPER
+    ,NULL
+#endif
+};
+
+void
+igsValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
+{
+    FbGCPrivPtr fbPriv = fbGetGCPrivate(pGC);
+    
+    fbValidateGC (pGC, changes, pDrawable);
+    
+    if (pDrawable->type == DRAWABLE_WINDOW)
+	pGC->ops = (GCOps *) &igsOps;
+    else
+	pGC->ops = (GCOps *) &fbGCOps;
+}
+
+GCFuncs	igsGCFuncs = {
+    igsValidateGC,
+    miChangeGC,
+    miCopyGC,
+    miDestroyGC,
+    miChangeClip,
+    miDestroyClip,
+    miCopyClip
+};
+
+int
+igsCreateGC (GCPtr pGC)
+{
+    if (!fbCreateGC (pGC))
+	return FALSE;
+
+    if (pGC->depth != 1)
+	pGC->funcs = &igsGCFuncs;
+    
+    return TRUE;
+}
+
+void
+igsCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+    ScreenPtr	pScreen = pWin->drawable.pScreen;
+    KdScreenPriv(pScreen);
+    RegionRec	rgnDst;
+    int		dx, dy;
+    WindowPtr	pwinRoot;
+
+    pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];
+
+    dx = ptOldOrg.x - pWin->drawable.x;
+    dy = ptOldOrg.y - pWin->drawable.y;
+    REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
+
+    REGION_INIT (pWin->drawable.pScreen, &rgnDst, NullBox, 0);
+    
+    REGION_INTERSECT(pWin->drawable.pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
+
+    fbCopyRegion ((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,
+		  0,
+		  &rgnDst, dx, dy, igsCopyNtoN, 0, 0);
+    
+    REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
+}
+
+void
+igsPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
+{
+    KdScreenPriv(pWin->drawable.pScreen);
+    PixmapPtr	pTile;
+
+    if (!REGION_NUM_RECTS(pRegion)) 
+	return;
+    switch (what) {
+    case PW_BACKGROUND:
+	switch (pWin->backgroundState) {
+	case None:
+	    return;
+	case ParentRelative:
+	    do {
+		pWin = pWin->parent;
+	    } while (pWin->backgroundState == ParentRelative);
+	    (*pWin->drawable.pScreen->PaintWindowBackground)(pWin, pRegion,
+							     what);
+	    return;
+	case BackgroundPixmap:
+	    pTile = pWin->background.pixmap;
+	    if (igsPatternDimOk (pTile->drawable.width) &&
+		igsPatternDimOk (pTile->drawable.height))
+	    {
+		igsFillBoxTiled ((DrawablePtr)pWin,
+				 (int)REGION_NUM_RECTS(pRegion),
+				 REGION_RECTS(pRegion),
+				 pTile, 
+				 pWin->drawable.x, pWin->drawable.y, GXcopy);
+		return;
+	    }
+	    break;
+	case BackgroundPixel:
+	    igsFillBoxSolid((DrawablePtr)pWin,
+			     (int)REGION_NUM_RECTS(pRegion),
+			     REGION_RECTS(pRegion),
+			     pWin->background.pixel, GXcopy, ~0);
+	    return;
+    	}
+    	break;
+    case PW_BORDER:
+	if (pWin->borderIsPixel)
+	{
+	    igsFillBoxSolid((DrawablePtr)pWin,
+			     (int)REGION_NUM_RECTS(pRegion),
+			     REGION_RECTS(pRegion),
+			     pWin->border.pixel, GXcopy, ~0);
+	    return;
+	}
+	else
+	{
+	    pTile = pWin->border.pixmap;
+	    if (igsPatternDimOk (pTile->drawable.width) &&
+		igsPatternDimOk (pTile->drawable.height))
+	    {
+		igsFillBoxTiled ((DrawablePtr)pWin,
+				 (int)REGION_NUM_RECTS(pRegion),
+				 REGION_RECTS(pRegion),
+				 pTile, 
+				 pWin->drawable.x, pWin->drawable.y, GXcopy);
+		return;
+	    }
+	}
+	break;
+    }
+    KdCheckPaintWindow (pWin, pRegion, what);
+}
+
+Bool
+igsDrawInit (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    igsCardInfo(pScreenPriv);
+    igsScreenInfo(pScreenPriv);
+    int i;
+    int pattern_size;
+    int boffset, poffset;
+    
+    KdScreenInitAsync (pScreen);
+    
+    /*
+     * Replace various fb screen functions
+     */
+    pScreen->CreateGC = igsCreateGC;
+    pScreen->CopyWindow = igsCopyWindow;
+    pScreen->PaintWindowBackground = igsPaintWindow;
+    pScreen->PaintWindowBorder = igsPaintWindow;
+    
+    /*
+     * Initialize patterns
+     */
+    if (igss->tile.base)
+    {
+	pattern_size = IgsTileSize(pScreenPriv->screen->fb[0].bitsPerPixel);
+	igsInitPattern (&igss->tile,
+			pattern_size,
+			pattern_size * 8 / pScreenPriv->screen->fb[0].bitsPerPixel);
+	pattern_size = IgsStippleSize(pScreenPriv->screen->fb[0].bitsPerPixel);
+	igsInitPattern (&igss->stipple,
+			pattern_size,
+			pattern_size * 8 / pScreenPriv->screen->fb[0].bitsPerPixel);
+    }
+    return TRUE;
+}
+
+void
+igsDrawEnable (ScreenPtr pScreen)
+{
+    SetupIgs(pScreen);
+    CARD32  cmd;
+    CARD32  base;
+    CARD16  stride;
+    CARD32  format;
+    
+    stride = pScreenPriv->screen->fb[0].pixelStride;
+    _igsWaitIdleEmpty(cop);
+    _igsReset(cop);
+    switch (pScreenPriv->screen->fb[0].bitsPerPixel) {
+    case 8:
+	format = IGS_FORMAT_8BPP;
+	break;
+    case 16:
+	format = IGS_FORMAT_16BPP;
+	break;
+    case 24:
+	format = IGS_FORMAT_24BPP;
+	break;
+    case 32:
+	format = IGS_FORMAT_32BPP;
+	break;
+    }
+    cop->format = format;
+    cop->dst_stride = stride - 1;
+    cop->src1_stride = stride - 1;
+    cop->src2_stride = stride - 1;
+    cop->src1_start = 0;
+    cop->src2_start = 0;
+    cop->extension |= IGS_BLOCK_COP_REG | IGS_BURST_ENABLE;
+    
+    _igsSetSolidRect(cop, GXcopy, ~0, pScreen->blackPixel, cmd);
+    _igsRect (cop, 0, 0, 
+	      pScreenPriv->screen->width, pScreenPriv->screen->height,
+	      cmd);
+    _igsWaitIdleEmpty (cop);
+}
+
+void
+igsDrawDisable (ScreenPtr pScreen)
+{
+}
+
+void
+igsDrawFini (ScreenPtr pScreen)
+{
+}
+
+void
+igsDrawSync (ScreenPtr pScreen)
+{
+    SetupIgs(pScreen);
+
+    _igsWaitIdleEmpty(cop);
+}
Index: xc/programs/Xserver/hw/kdrive/igs/igsdraw.h
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igsdraw.h:1.2
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igsdraw.h	Wed May 24 16:52:48 2000
@@ -0,0 +1,260 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igsdraw.h,v 1.2 2000/05/24 23:52:48 keithp Exp $
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _IGSDRAW_H_
+#define _IGSDRAW_H_
+
+extern CARD8	igsPatRop[];
+
+#define SetupIgs(s) KdScreenPriv(s); \
+		    igsCardInfo(pScreenPriv); \
+		    Cop5xxx *cop = igsc->cop; \
+		    int	    cop_stride = pScreenPriv->screen->fb[0].pixelStride
+
+#define _igsWaitLoop(cop,mask,value) { \
+    int __loop = 1000000; \
+    while (((cop)->control & (mask)) != (value)) { \
+	if (--__loop <= 0) { \
+	    FatalError("Warning: igsWaitLoop 0x%x 0x%x failed\n", mask, value); \
+	} \
+    } \
+}
+
+#define _igsWaitDone(cop)   _igsWaitLoop(cop, \
+					 (IGS_CONTROL_BUSY| \
+					  IGS_CONTROL_MALLWBEPTZ), \
+					 0)
+
+#if 1
+#define _igsWaitFull(cop)   _igsWaitLoop(cop, \
+					 IGS_CONTROL_CMDFF, \
+					 0)
+#else
+#define _igsWaitFull(cop)   _igsWaitDone(cop)
+#endif
+
+#define _igsWaitIdleEmpty(cop)	_igsWaitDone(cop)
+#define _igsWaitHostBltAck(cop)	_igsWaitLoop(cop, \
+					     (IGS_CONTROL_HBACKZ| \
+					      IGS_CONTROL_CMDFF), \
+					     0)
+					      
+#define _igsReset(cop)		((cop)->control = 0)
+
+#define IgsInvertBits32(v) { \
+    v = ((v & 0x55555555) << 1) | ((v >> 1) & 0x55555555); \
+    v = ((v & 0x33333333) << 2) | ((v >> 2) & 0x33333333); \
+    v = ((v & 0x0f0f0f0f) << 4) | ((v >> 4) & 0x0f0f0f0f); \
+}
+
+#define IgsInvertBits16(v) { \
+    v = ((v & 0x5555) << 1) | ((v >> 1) & 0x5555); \
+    v = ((v & 0x3333) << 2) | ((v >> 2) & 0x3333); \
+    v = ((v & 0x0f0f) << 4) | ((v >> 4) & 0x0f0f); \
+}
+
+#define IgsInvertBits8(v) { \
+    v = ((v & 0x55) << 1) | ((v >> 1) & 0x55); \
+    v = ((v & 0x33) << 2) | ((v >> 2) & 0x33); \
+    v = ((v & 0x0f) << 4) | ((v >> 4) & 0x0f); \
+}
+
+#define IgsByteSwap32(x)    	((x) = (((x) >> 24) | \
+					(((x) >> 8) & 0xff00) | \
+					(((x) << 8) & 0xff0000) | \
+					((x) << 24)))
+
+#define IgsByteSwap16(x)    	((x) = ((x) << 8) | ((x) >> 8))
+
+#define igsPatternDimOk(d)  ((d) <= IGS_PATTERN_WIDTH && (((d) & ((d) - 1)) == 0))
+
+#if BITMAP_BIT_ORDER == LSBFirst
+#define IgsAdjustBits32(b)	IgsInvertBits32(b)
+#define IgsAdjustBits16(x)	IgsInvertBits16(x)
+#else
+#define IgsAdjustBits32(x)	IgsByteSwap32(x)
+#define IgsAdjustBits16(x)	IgsByteSwap16(x)
+#endif
+
+#define _igsSetSolidRect(cop,alu,pm,pix,cmd) {\
+    _igsWaitFull(cop); \
+    (cop)->mix = IGS_MAKE_MIX(alu,alu); \
+    (cop)->fg = (pix); \
+    (cmd) = (IGS_DRAW_T_B | \
+	     IGS_DRAW_L_R | \
+	     IGS_DRAW_ALL | \
+	     IGS_PIXEL_FG | \
+	     IGS_HBLT_DISABLE | \
+	     IGS_SRC2_NORMAL | \
+	     IGS_STEP_PXBLT | \
+	     IGS_FGS_FG | \
+	     IGS_BGS_BG); \
+}
+
+#define _igsSetTiledRect(cop,alu,pm,base,cmd) {\
+    _igsWaitFull(cop); \
+    (cop)->mix = IGS_MAKE_MIX(alu,alu); \
+    (cop)->src1_stride = IGS_PATTERN_WIDTH - 1; \
+    (cop)->src1_start = (base); \
+    (cmd) = (IGS_DRAW_T_B | \
+	     IGS_DRAW_L_R | \
+	     IGS_DRAW_ALL | \
+	     IGS_PIXEL_TILE | \
+	     IGS_HBLT_DISABLE | \
+	     IGS_SRC2_NORMAL | \
+	     IGS_STEP_PXBLT | \
+	     IGS_FGS_SRC | \
+	     IGS_BGS_BG); \
+}
+
+#define _igsSetStippledRect(cop,alu,pm,pix,base,cmd) {\
+    _igsWaitFull(cop); \
+    (cop)->mix = IGS_MAKE_MIX(alu,alu); \
+    (cop)->src1_start = (base); \
+    (cop)->fg = (pix); \
+    (cmd) = (IGS_DRAW_T_B | \
+	     IGS_DRAW_L_R | \
+	     IGS_DRAW_ALL | \
+	     IGS_PIXEL_STIP_TRANS | \
+	     IGS_HBLT_DISABLE | \
+	     IGS_SRC2_NORMAL | \
+	     IGS_STEP_PXBLT | \
+	     IGS_FGS_FG | \
+	     IGS_BGS_BG); \
+}
+
+#define _igsSetOpaqueStippledRect(cop,alu,pm,_fg,_bg,base,cmd) {\
+    _igsWaitFull(cop); \
+    (cop)->mix = IGS_MAKE_MIX(alu,alu); \
+    (cop)->src1_start = (base); \
+    (cop)->fg = (_fg); \
+    (cop)->bg = (_bg); \
+    (cmd) = (IGS_DRAW_T_B | \
+	     IGS_DRAW_L_R | \
+	     IGS_DRAW_ALL | \
+	     IGS_PIXEL_STIP_OPAQUE | \
+	     IGS_HBLT_DISABLE | \
+	     IGS_SRC2_NORMAL | \
+	     IGS_STEP_PXBLT | \
+	     IGS_FGS_FG | \
+	     IGS_BGS_BG); \
+}
+
+#define _igsRect(cop,x,y,w,h,cmd) { \
+    _igsWaitFull(cop); \
+    (cop)->dst_start = (x) + (y) * (cop_stride); \
+    (cop)->dim = IGS_MAKE_DIM(w-1,h-1); \
+    (cop)->operation = (cmd); \
+}
+
+#define _igsPatRect(cop,x,y,w,h,cmd) { \
+    _igsWaitFull(cop); \
+    (cop)->dst_start = (x) + (y) * (cop_stride); \
+    (cop)->rotate = IGS_MAKE_ROTATE(x&7,y&7); \
+    (cop)->dim = IGS_MAKE_DIM(w-1,h-1); \
+    (cop)->operation = (cmd); \
+}
+
+#define _igsSetBlt(cop,alu,pm,backwards,upsidedown,cmd) { \
+    _igsWaitFull(cop); \
+    (cop)->mix = IGS_MAKE_MIX(alu,alu); \
+    (cop)->src1_stride = cop_stride - 1; \
+    (cmd) = (IGS_DRAW_ALL | \
+	     IGS_PIXEL_FG | \
+	     IGS_HBLT_DISABLE | \
+	     IGS_SRC2_NORMAL | \
+	     IGS_STEP_PXBLT | \
+	     IGS_FGS_SRC | \
+	     IGS_BGS_BG); \
+    if (backwards) (cmd) |= IGS_DRAW_R_L; \
+    if (upsidedown) (cmd) |= IGS_DRAW_B_T; \
+}
+
+#if 0
+#define _igsPreparePlaneBlt(cop) { \
+    _igsReset(cop); \
+    (cop)->dst_stride = cop_stride - 1; \
+    (cop)->src1_stride = cop_stride - 1; \
+    (cop)->src2_stride = cop_stride - 1; \
+    (cop)->format = IGS_FORMAT_16BPP;  \
+    (cop)->src1_start = 0; \
+    (cop)->src2_start = 0; \
+}
+#else
+#define _igsPreparePlaneBlt(cop)
+#endif
+    
+#define _igsSetTransparentPlaneBlt(cop,alu,pm,fg_pix,cmd) { \
+    _igsWaitIdleEmpty(cop); \
+    _igsPreparePlaneBlt(cop); \
+    (cop)->mix = IGS_MAKE_MIX(igsPatRop[alu],igsPatRop[alu]); \
+    (cop)->fg = (fg_pix); \
+    (cmd) = (IGS_DRAW_T_B | \
+	     IGS_DRAW_L_R | \
+	     IGS_DRAW_ALL | \
+	     IGS_PIXEL_FG | \
+	     IGS_HBLT_WRITE_2 | \
+	     IGS_SRC2_MONO_TRANS | \
+	     IGS_STEP_TERNARY_PXBLT | \
+	     IGS_FGS_FG | \
+	     IGS_BGS_BG); \
+}
+
+#define _igsSetOpaquePlaneBlt(cop,alu,pm,fg_pix,bg_pix,cmd) { \
+    _igsWaitIdleEmpty(cop); \
+    _igsPreparePlaneBlt(cop); \
+    (cop)->mix = IGS_MAKE_MIX(igsPatRop[alu],igsPatRop[alu]); \
+    (cop)->fg = (fg_pix); \
+    (cop)->bg = (bg_pix); \
+    (cmd) = (IGS_DRAW_T_B | \
+	     IGS_DRAW_L_R | \
+	     IGS_DRAW_ALL | \
+	     IGS_PIXEL_FG | \
+	     IGS_HBLT_WRITE_2 | \
+	     IGS_SRC2_MONO_OPAQUE | \
+	     IGS_STEP_TERNARY_PXBLT | \
+	     IGS_FGS_FG | \
+	     IGS_BGS_BG); \
+}
+
+#define _igsPlaneBlt(cop,x,y,w,h,cmd) { \
+/*    _igsWaitFull(cop); */ \
+    (cop)->dst_start = (x) + (y) * (cop_stride); \
+    (cop)->dim = IGS_MAKE_DIM((w)-1,(h)-1); \
+    (cop)->operation = (cmd); \
+/*    _igsWaitHostBltAck(cop); */ \
+}
+    
+#define _igsBlt(cop,sx,sy,dx,dy,w,h,cmd) { \
+    _igsWaitFull(cop); \
+    (cop)->dst_start = (dx) + (dy) * cop_stride; \
+    (cop)->src1_start = (sx) + (sy) * cop_stride; \
+    (cop)->src1_stride = cop_stride - 1; \
+    (cop)->dim = IGS_MAKE_DIM(w-1,h-1); \
+    (cop)->operation = (cmd); \
+}
+
+#define sourceInvarient(alu)	(((alu) & 3) == (((alu) >> 2) & 3))
+
+#endif
Index: xc/programs/Xserver/hw/kdrive/igs/igsreg.c
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igsreg.c:1.1
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igsreg.c	Wed May 24 16:52:48 2000
@@ -0,0 +1,968 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igsreg.c,v 1.1 2000/05/24 23:52:48 keithp Exp $
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "igsreg.h"
+#include <stdio.h>
+
+#define CR00 IGS_CR+0x00
+#define CR01 IGS_CR+0x01
+#define CR02 IGS_CR+0x02
+#define CR03 IGS_CR+0x03
+#define CR04 IGS_CR+0x04
+#define CR05 IGS_CR+0x05
+#define CR06 IGS_CR+0x06
+#define CR07 IGS_CR+0x07
+#define CR08 IGS_CR+0x08
+#define CR09 IGS_CR+0x09
+#define CR0A IGS_CR+0x0A
+#define CR0B IGS_CR+0x0B
+#define CR0C IGS_CR+0x0C
+#define CR0D IGS_CR+0x0D
+#define CR0E IGS_CR+0x0E
+#define CR0F IGS_CR+0x0F
+#define CR10 IGS_CR+0x10
+#define CR11 IGS_CR+0x11
+#define CR12 IGS_CR+0x12
+#define CR13 IGS_CR+0x13
+#define CR14 IGS_CR+0x14
+#define CR15 IGS_CR+0x15
+#define CR16 IGS_CR+0x16
+#define CR17 IGS_CR+0x17
+#define CR18 IGS_CR+0x18
+#define CR19 IGS_CR+0x19
+#define CR1A IGS_CR+0x1A
+#define CR1B IGS_CR+0x1B
+#define CR1C IGS_CR+0x1C
+#define CR1D IGS_CR+0x1D
+#define CR1E IGS_CR+0x1E
+#define CR1F IGS_CR+0x1F
+#define CR20 IGS_CR+0x20
+#define CR21 IGS_CR+0x21
+#define CR22 IGS_CR+0x22
+#define CR23 IGS_CR+0x23
+#define CR24 IGS_CR+0x24
+#define CR25 IGS_CR+0x25
+#define CR26 IGS_CR+0x26
+#define CR27 IGS_CR+0x27
+#define CR28 IGS_CR+0x28
+#define CR29 IGS_CR+0x29
+#define CR2A IGS_CR+0x2A
+#define CR2B IGS_CR+0x2B
+#define CR2C IGS_CR+0x2C
+#define CR2D IGS_CR+0x2D
+#define CR2E IGS_CR+0x2E
+#define CR2F IGS_CR+0x2F
+#define CR30 IGS_CR+0x30
+#define CR31 IGS_CR+0x31
+#define CR32 IGS_CR+0x32
+#define CR33 IGS_CR+0x33
+#define CR34 IGS_CR+0x34
+#define CR35 IGS_CR+0x35
+#define CR36 IGS_CR+0x36
+#define CR37 IGS_CR+0x37
+#define CR38 IGS_CR+0x38
+#define CR39 IGS_CR+0x39
+#define CR3A IGS_CR+0x3A
+#define CR3B IGS_CR+0x3B
+#define CR3C IGS_CR+0x3C
+#define CR3D IGS_CR+0x3D
+#define CR3E IGS_CR+0x3E
+#define CR3F IGS_CR+0x3F
+#define CR40 IGS_CR+0x40
+#define CR41 IGS_CR+0x41
+#define CR42 IGS_CR+0x42
+#define CR43 IGS_CR+0x43
+#define CR44 IGS_CR+0x44
+#define CR45 IGS_CR+0x45
+#define CR46 IGS_CR+0x46
+#define CR47 IGS_CR+0x47
+#define CR48 IGS_CR+0x48
+
+#define CR_FIRST    CR00
+#define CR_LAST	    CR48
+
+#define SR00 IGS_SR+0x00
+#define SR01 IGS_SR+0x01
+#define SR02 IGS_SR+0x02
+#define SR03 IGS_SR+0x03
+#define SR04 IGS_SR+0x04
+
+#define SR_FIRST    SR00
+#define SR_LAST	    SR04
+
+#define AR00 IGS_AR+0x00
+#define AR01 IGS_AR+0x01
+#define AR02 IGS_AR+0x02
+#define AR03 IGS_AR+0x03
+#define AR04 IGS_AR+0x04
+#define AR05 IGS_AR+0x05
+#define AR06 IGS_AR+0x06
+#define AR07 IGS_AR+0x07
+#define AR08 IGS_AR+0x08
+#define AR09 IGS_AR+0x09
+#define AR0A IGS_AR+0x0A
+#define AR0B IGS_AR+0x0B
+#define AR0C IGS_AR+0x0C
+#define AR0D IGS_AR+0x0D
+#define AR0E IGS_AR+0x0E
+#define AR0F IGS_AR+0x0F
+#define AR10 IGS_AR+0x10
+#define AR11 IGS_AR+0x11
+#define AR12 IGS_AR+0x12
+#define AR13 IGS_AR+0x13
+#define AR14 IGS_AR+0x14
+
+#define AR_FIRST    AR00
+#define AR_LAST	    AR14
+
+#define GR00 IGS_GR+0x00
+#define GR01 IGS_GR+0x01
+#define GR02 IGS_GR+0x02
+#define GR03 IGS_GR+0x03
+#define GR04 IGS_GR+0x04
+#define GR05 IGS_GR+0x05
+#define GR06 IGS_GR+0x06
+#define GR07 IGS_GR+0x07
+#define GR08 IGS_GR+0x08
+#define GR09 IGS_GR+0x09
+#define GR0A IGS_GR+0x0A
+#define GR0B IGS_GR+0x0B
+#define GR0C IGS_GR+0x0C
+#define GR0D IGS_GR+0x0D
+#define GR0E IGS_GR+0x0E
+#define GR0F IGS_GR+0x0F
+#define GR10 IGS_GR+0x10
+#define GR11 IGS_GR+0x11
+#define GR12 IGS_GR+0x12
+#define GR13 IGS_GR+0x13
+#define GR14 IGS_GR+0x14
+#define GR15 IGS_GR+0x15
+#define GR16 IGS_GR+0x16
+#define GR17 IGS_GR+0x17
+#define GR18 IGS_GR+0x18
+#define GR19 IGS_GR+0x19
+#define GR1A IGS_GR+0x1A
+#define GR1B IGS_GR+0x1B
+#define GR1C IGS_GR+0x1C
+#define GR1D IGS_GR+0x1D
+#define GR1E IGS_GR+0x1E
+#define GR1F IGS_GR+0x1F
+#define GR20 IGS_GR+0x20
+#define GR21 IGS_GR+0x21
+#define GR22 IGS_GR+0x22
+#define GR23 IGS_GR+0x23
+#define GR24 IGS_GR+0x24
+#define GR25 IGS_GR+0x25
+#define GR26 IGS_GR+0x26
+#define GR27 IGS_GR+0x27
+#define GR28 IGS_GR+0x28
+#define GR29 IGS_GR+0x29
+#define GR2A IGS_GR+0x2A
+#define GR2B IGS_GR+0x2B
+#define GR2C IGS_GR+0x2C
+#define GR2D IGS_GR+0x2D
+#define GR2E IGS_GR+0x2E
+#define GR2F IGS_GR+0x2F
+#define GR30 IGS_GR+0x30
+#define GR31 IGS_GR+0x31
+#define GR32 IGS_GR+0x32
+#define GR33 IGS_GR+0x33
+#define GR34 IGS_GR+0x34
+#define GR35 IGS_GR+0x35
+#define GR36 IGS_GR+0x36
+#define GR37 IGS_GR+0x37
+#define GR38 IGS_GR+0x38
+#define GR39 IGS_GR+0x39
+#define GR3A IGS_GR+0x3A
+#define GR3B IGS_GR+0x3B
+#define GR3C IGS_GR+0x3C
+#define GR3D IGS_GR+0x3D
+#define GR3E IGS_GR+0x3E
+#define GR3F IGS_GR+0x3F
+#define GR40 IGS_GR+0x40
+#define GR41 IGS_GR+0x41
+#define GR42 IGS_GR+0x42
+#define GR43 IGS_GR+0x43
+#define GR44 IGS_GR+0x44
+#define GR45 IGS_GR+0x45
+#define GR46 IGS_GR+0x46
+#define GR47 IGS_GR+0x47
+#define GR48 IGS_GR+0x48
+#define GR49 IGS_GR+0x49
+#define GR4A IGS_GR+0x4A
+#define GR4B IGS_GR+0x4B
+#define GR4C IGS_GR+0x4C
+#define GR4D IGS_GR+0x4D
+#define GR4E IGS_GR+0x4E
+#define GR4F IGS_GR+0x4F
+#define GR50 IGS_GR+0x50
+#define GR51 IGS_GR+0x51
+#define GR52 IGS_GR+0x52
+#define GR53 IGS_GR+0x53
+#define GR54 IGS_GR+0x54
+#define GR55 IGS_GR+0x55
+#define GR56 IGS_GR+0x56
+#define GR57 IGS_GR+0x57
+#define GR58 IGS_GR+0x58
+#define GR59 IGS_GR+0x59
+#define GR5A IGS_GR+0x5A
+#define GR5B IGS_GR+0x5B
+#define GR5C IGS_GR+0x5C
+#define GR5D IGS_GR+0x5D
+#define GR5E IGS_GR+0x5E
+#define GR5F IGS_GR+0x5F
+#define GR60 IGS_GR+0x60
+#define GR61 IGS_GR+0x61
+#define GR62 IGS_GR+0x62
+#define GR63 IGS_GR+0x63
+#define GR64 IGS_GR+0x64
+#define GR65 IGS_GR+0x65
+#define GR66 IGS_GR+0x66
+#define GR67 IGS_GR+0x67
+#define GR68 IGS_GR+0x68
+#define GR69 IGS_GR+0x69
+#define GR6A IGS_GR+0x6A
+#define GR6B IGS_GR+0x6B
+#define GR6C IGS_GR+0x6C
+#define GR6D IGS_GR+0x6D
+#define GR6E IGS_GR+0x6E
+#define GR6F IGS_GR+0x6F
+#define GR70 IGS_GR+0x70
+#define GR71 IGS_GR+0x71
+#define GR72 IGS_GR+0x72
+#define GR73 IGS_GR+0x73
+#define GR74 IGS_GR+0x74
+#define GR75 IGS_GR+0x75
+#define GR76 IGS_GR+0x76
+#define GR77 IGS_GR+0x77
+#define GR78 IGS_GR+0x78
+#define GR79 IGS_GR+0x79
+#define GR7A IGS_GR+0x7A
+#define GR7B IGS_GR+0x7B
+#define GR7C IGS_GR+0x7C
+#define GR7D IGS_GR+0x7D
+#define GR7E IGS_GR+0x7E
+#define GR7F IGS_GR+0x7F
+#define GR80 IGS_GR+0x80
+#define GR81 IGS_GR+0x81
+#define GR82 IGS_GR+0x82
+#define GR83 IGS_GR+0x83
+#define GR84 IGS_GR+0x84
+#define GR85 IGS_GR+0x85
+#define GR86 IGS_GR+0x86
+#define GR87 IGS_GR+0x87
+#define GR88 IGS_GR+0x88
+#define GR89 IGS_GR+0x89
+#define GR8A IGS_GR+0x8A
+#define GR8B IGS_GR+0x8B
+#define GR8C IGS_GR+0x8C
+#define GR8D IGS_GR+0x8D
+#define GR8E IGS_GR+0x8E
+#define GR8F IGS_GR+0x8F
+#define GR90 IGS_GR+0x90
+#define GR91 IGS_GR+0x91
+#define GR92 IGS_GR+0x92
+#define GR93 IGS_GR+0x93
+#define GR94 IGS_GR+0x94
+#define GR95 IGS_GR+0x95
+#define GR96 IGS_GR+0x96
+#define GR97 IGS_GR+0x97
+#define GR98 IGS_GR+0x98
+#define GR99 IGS_GR+0x99
+#define GR9A IGS_GR+0x9A
+#define GR9B IGS_GR+0x9B
+#define GR9C IGS_GR+0x9C
+#define GR9D IGS_GR+0x9D
+#define GR9E IGS_GR+0x9E
+#define GR9F IGS_GR+0x9F
+#define GRA0 IGS_GR+0xA0
+#define GRA1 IGS_GR+0xA1
+#define GRA2 IGS_GR+0xA2
+#define GRA3 IGS_GR+0xA3
+#define GRA4 IGS_GR+0xA4
+#define GRA5 IGS_GR+0xA5
+#define GRA6 IGS_GR+0xA6
+#define GRA7 IGS_GR+0xA7
+#define GRA8 IGS_GR+0xA8
+#define GRA9 IGS_GR+0xA9
+#define GRAA IGS_GR+0xAA
+#define GRAB IGS_GR+0xAB
+#define GRAC IGS_GR+0xAC
+#define GRAD IGS_GR+0xAD
+#define GRAE IGS_GR+0xAE
+#define GRAF IGS_GR+0xAF
+#define GRB0 IGS_GR+0xB0
+#define GRB1 IGS_GR+0xB1
+#define GRB2 IGS_GR+0xB2
+#define GRB3 IGS_GR+0xB3
+#define GRB4 IGS_GR+0xB4
+#define GRB5 IGS_GR+0xB5
+#define GRB6 IGS_GR+0xB6
+#define GRB7 IGS_GR+0xB7
+#define GRB8 IGS_GR+0xB8
+#define GRB9 IGS_GR+0xB9
+#define GRBA IGS_GR+0xBA
+#define GRBB IGS_GR+0xBB
+#define GRBC IGS_GR+0xBC
+#define GRBD IGS_GR+0xBD
+#define GRBE IGS_GR+0xBE
+#define GRBF IGS_GR+0xBF
+
+#define GR_FIRST    GR00
+#define GR_LAST	    GRBF
+
+#define GREX3C	IGS_GREX+(0x3c-IGS_GREXBASE)
+
+VgaReg igs_h_total[] = {
+    CR00,   0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_h_de_end[] = {
+    CR01,   0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_h_bstart[] = {
+    CR02,   0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_h_bend[] = {
+    CR03,   0, 5,
+    CR05,   7, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_de_skew[] = {
+    CR03,   5, 2,
+    VGA_REG_END
+};
+
+VgaReg igs_ena_vr_access[] = {
+    CR03,   7, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_h_rstart[] = {
+    CR04,   0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_h_rend[] = {
+    CR05,   0, 5,
+    VGA_REG_END
+};
+
+VgaReg igs_h_rdelay[] = {
+    CR05,   5, 2,
+    VGA_REG_END
+};
+
+VgaReg igs_v_total[] = {
+    CR06,   0, 8,
+    CR07,   0, 1,
+    CR07,   5, 1,
+    GR11,   0, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_v_rstart[] = {
+    CR10,   0, 8,
+    CR07,   2, 1,
+    CR07,   7, 1,
+    GR11,   2, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_v_rend[] = {
+    CR11,   0, 4,
+    VGA_REG_END
+};
+
+VgaReg igs_clear_v_int[] = {
+    CR11,   4, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_disable_v_int[] = {
+    CR11,   5, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_bandwidth[] = {
+    CR11,   6, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_crt_protect[] = {
+    CR11,   7, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_v_de_end[] = {
+    CR12,   0, 8,
+    CR07,   1, 1,
+    CR07,   6, 1,
+    GR11,   1, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_offset[] = {
+    CR13,   0, 8,
+    GR15,   4, 2,
+    VGA_REG_END
+};
+
+VgaReg igs_v_bstart[] = {
+    CR15,   0, 8,
+    CR07,   3, 1,
+    CR09,   5, 1,
+    GR11,   3, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_v_bend[] = {
+    CR16,   0, 7,
+    VGA_REG_END
+};
+
+VgaReg igs_linecomp[] = {
+    CR18,   0, 8,
+    CR07,   4, 1,
+    CR09,   6, 1,
+    GR11,   4, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_ivideo[] = {
+    GR11,   5, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_num_fetch[] = {
+    GR14,   0, 8,
+    GR15,   0, 2,
+    VGA_REG_END
+};
+
+VgaReg igs_wcrt0[] = {
+    CR1F, 0, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_wcrt1[] = {
+    CR1F, 1, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_rcrts1[] = {
+    CR1F, 4, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_selwk[] = {
+    CR1F, 6, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_dot_clock_8[] = {
+    SR01, 0, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_screen_off[] = {
+    SR01, 5, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_enable_write_plane[] = {
+    SR02, 0, 4,
+    VGA_REG_END
+};
+
+VgaReg igs_mexhsyn[] = {
+    GR16,   0, 2,
+    VGA_REG_END
+};
+
+VgaReg igs_mexvsyn[] = {
+    GR16,   2, 2,
+    VGA_REG_END
+};
+
+VgaReg igs_pci_burst_write[] = {
+    GR30,   5, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_pci_burst_read[] = {
+    GR30,   7, 1,
+    VGA_REG_END
+};
+
+VgaReg	igs_iow_retry[] = {
+    GREX3C, 0, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_mw_retry[] = {
+    GREX3C, 1, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_mr_retry[] = {
+    GREX3C, 2, 1,
+    VGA_REG_END
+};
+
+
+
+VgaReg	igs_biga22en[] = {
+    GR3D,   4, 1,
+    VGA_REG_END
+};
+
+VgaReg	igs_biga24en[] = {
+    GR3D,   5, 1,
+    VGA_REG_END
+};
+
+VgaReg	igs_biga22force[] = {
+    GR3D,   6, 1,
+    VGA_REG_END
+};
+
+VgaReg	igs_bigswap[] = {
+    GR3F,   0, 6,
+    VGA_REG_END
+};
+
+/* #define IGS_BIGSWAP_8	0x3f */
+/* #define IGS_BIGSWAP_16	0x2a */
+/* #define IGS_BIGSWAP_32	0x00 */
+
+VgaReg  igs_sprite_x[] = {
+    GR50,   0, 8,
+    GR51,   0, 3,
+    VGA_REG_END
+};
+
+VgaReg  igs_sprite_preset_x[] = {
+    GR52,   0, 6,
+    VGA_REG_END
+};
+
+VgaReg  igs_sprite_y[] = {
+    GR53,   0, 8,
+    GR54,   0, 3,
+    VGA_REG_END
+};
+
+VgaReg  igs_sprite_preset_y[] = {
+    GR55,   0, 6,
+    VGA_REG_END
+};
+
+VgaReg	igs_sprite_visible[] = {
+    GR56,   0, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_sprite_64x64[] = {
+    GR56,   1, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_mgrext[] = {
+    GR57,   0, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_hcshf[] = {
+    GR57,   4, 2,
+    VGA_REG_END
+};
+
+VgaReg	igs_mbpfix[] = {
+    GR57,   6, 2,
+    VGA_REG_END
+};
+
+VgaReg igs_overscan_red[] = {
+    GR58, 0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_overscan_green[] = {
+    GR59, 0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_overscan_blue[] = {
+    GR5A, 0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_memgopg[] = {
+    GR73,   2, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_memr2wpg[] = {
+    GR73,   1, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_crtff16[] = {
+    GR73,   3, 1,
+    VGA_REG_END
+};
+
+VgaReg igs_fifomust[] = {
+    GR74,   0, 5,
+    VGA_REG_END
+};
+
+VgaReg igs_fifogen[] = {
+    GR75,   0, 5,
+    VGA_REG_END
+};
+
+VgaReg igs_mode_sel[] = {
+    GR77,   0, 4,
+    VGA_REG_END
+};
+
+/* #define IGS_MODE_TEXT	0 */
+/* #define IGS_MODE_8	1 */
+/* #define IGS_MODE_565	2 */
+/* #define IGS_MODE_5551	6 */
+/* #define IGS_MODE_8888	3 */
+/* #define IGS_MODE_888	4 */
+/* #define IGS_MODE_332	9 */
+/* #define IGS_MODE_4444	10 */
+
+VgaReg  igs_sprite_addr[] = {
+    GR7E,   0, 8,
+    GR7F,   0, 4,
+    VGA_REG_END
+};
+
+VgaReg  igs_fastmpie[] = {
+    GR9E,   0, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_vclk_m[] = {
+    GRB0,   0, 8,
+    GRBA,   0, 3,
+    VGA_REG_END
+};
+
+VgaReg  igs_vclk_n[] = {
+    GRB1,   0, 5,
+    GRBA,   3, 3,
+    VGA_REG_END
+};
+
+VgaReg  igs_vfsel[] = {
+    GRB1,   5, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_vclk_p[] = {
+    GRB1,   6, 2,
+    GRBA,   6, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_frqlat[] = {
+    GRB9, 7, 1,
+    VGA_REG_END
+};
+
+
+VgaReg igs_dac_mask[] = {
+    IGS_DAC + 0,	0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_dac_read_index[] = {
+    IGS_DAC + 1, 0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_dac_write_index[] = {
+    IGS_DAC + 2, 0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_dac_data[] = {
+    IGS_DAC + 3, 0, 8,
+    VGA_REG_END
+};
+
+VgaReg	igs_rampwdn[] = {
+    IGS_DACEX + 0,   0, 1,
+    VGA_REG_END
+};
+
+VgaReg	igs_dac6_8[] = {
+    IGS_DACEX + 0,   1, 1,
+    VGA_REG_END
+};
+
+VgaReg  igs_ramdacbypass[] = {
+    IGS_DACEX + 0,   4, 1,
+    VGA_REG_END
+};
+
+VgaReg	igs_dacpwdn[] = {
+    IGS_DACEX + 0,   6, 1,
+    VGA_REG_END
+};
+
+VgaReg	igs_cursor_read_index[] = {
+    IGS_DACEX + 1, 0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_cursor_write_index[] = {
+    IGS_DACEX + 2, 0, 8,
+    VGA_REG_END
+};
+
+VgaReg igs_cursor_data[] = {
+    IGS_DACEX + 3, 0, 8,
+    VGA_REG_END
+};
+
+VGA8
+_igsInb (VgaCard *card, VGA16 port)
+{
+    VGAVOL8 *reg;
+    
+    if (card->closure)
+	return VgaReadMemb ((VGA32) card->closure + port);
+    else
+	return VgaInb (port);
+}
+
+void
+_igsOutb (VgaCard *card, VGA8 value, VGA16 port)
+{
+    if (card->closure)
+	VgaWriteMemb (value, (VGA32) card->closure + port);
+    else
+	VgaOutb (value, port);
+}
+
+void
+_igsRegMap (VgaCard *card, VGA16 reg, VgaMap *map, VGABOOL write)
+{
+    if (reg < IGS_SR + IGS_NSR)
+    {
+	map->access = VgaAccessIndIo;
+	map->port = 0x3c4;
+	map->addr = 0;
+	map->value = 1;
+	map->index = reg - IGS_SR;
+    }
+    else if (reg < IGS_GR + IGS_NGR)
+    {
+	map->access = VgaAccessIndIo;
+	map->port = 0x3ce;
+	map->addr = 0;
+	map->value = 1;
+	map->index = reg - IGS_GR;
+    }
+    else if (reg < IGS_GREX + IGS_NGREX)
+    {
+	VGA8	gr33;
+
+	map->access = VgaAccessDone;
+	_igsOutb (card, 0x33, 0x3ce);
+	gr33 = _igsInb (card, 0x3cf);
+	_igsOutb (card, gr33 | 0x40, 0x3cf);
+	_igsOutb (card, IGS_GREXBASE + reg - IGS_GREX, 0x3ce);
+	if (write)
+	    _igsOutb (card, map->value, 0x3cf);
+	else
+	    map->value = _igsInb (card, 0x3cf);
+	_igsOutb (card, 0x33, 0x3ce);
+	_igsOutb (card, gr33, 0x3cf);
+	return;
+    }
+    else if (reg < IGS_AR + IGS_NAR)
+    {
+	reg -= IGS_AR;
+	map->access = VgaAccessDone;
+	/* reset AFF to index */
+	(void) _igsInb (card, 0x3da);
+	if (reg >= 16)
+	    reg |= 0x20;
+	_igsOutb (card, reg, 0x3c0);
+	if (write)
+	    _igsOutb (card, map->value, 0x3c0);
+	else
+	    map->value = _igsInb (card, 0x3c1);
+	if (!(reg & 0x20))
+	{
+	    /* enable video display again */
+	    (void) _igsInb (card, 0x3da);
+	    _igsOutb (card, 0x20, 0x3c0);
+	}
+	return;
+    }
+    else if (reg < IGS_CR + IGS_NCR)
+    {
+	map->access = VgaAccessIndIo;
+	map->port = 0x3d4;
+	map->addr = 0;
+	map->value = 1;
+	map->index = reg - IGS_CR;
+    }
+    else if (reg < IGS_DAC + IGS_NDAC)
+    {
+	map->access = VgaAccessIo;
+	map->port = 0x3c6 + reg - IGS_DAC;
+    }
+    else if (reg < IGS_DACEX + IGS_NDACEX)
+    {
+	VGA8	gr56;
+	reg = 0x3c6 + reg - IGS_DACEX;
+	map->access = VgaAccessDone;
+	_igsOutb (card, 0x56, 0x3ce);
+	gr56 = _igsInb (card, 0x3cf);
+	_igsOutb (card, gr56 | 4, 0x3cf);
+	if (write)
+	    _igsOutb (card, map->value, reg);
+	else
+	    map->value = _igsInb (card, reg);
+	_igsOutb (card, gr56, 0x3cf);
+	return;
+    }
+    else switch (reg) {
+    case IGS_MISC_OUT:
+	map->access = VgaAccessIo;
+	if (write)
+	    map->port = 0x3c2;
+	else
+	    map->port = 0x3cc;
+	break;
+    case IGS_INPUT_STATUS_1:
+	map->access = VgaAccessIo;
+	map->port = 0x3da;
+	break;
+    }
+    if (card->closure)
+    {
+	map->port = map->port + (VGA32) card->closure;
+	if (map->access == VgaAccessIo)
+	    map->access = VgaAccessMem;
+	if (map->access == VgaAccessIndIo)
+	    map->access = VgaAccessIndMem;
+    }
+}
+
+VgaSave	    igsSaves[] = {
+    CR00, CR18,
+    SR01, SR02,
+    GR11, GRBA,
+    IGS_MISC_OUT, IGS_MISC_OUT,
+    VGA_SAVE_END
+};
+
+void
+igsRegInit (IgsVga *igsvga, VGAVOL8 *mmio)
+{
+    igsvga->card.map = _igsRegMap;
+    igsvga->card.closure = (void *) mmio;
+    igsvga->card.max = IGS_NREG;
+    igsvga->card.values = igsvga->values;
+    igsvga->card.saves = igsSaves;
+}
+
+void
+igsSave (IgsVga *igsvga)
+{
+    igsSetImm (igsvga, igs_wcrt0, 1);
+    igsSetImm (igsvga, igs_wcrt1, 1);
+    igsSetImm (igsvga, igs_rcrts1, 1);
+    igsSetImm (igsvga, igs_selwk, 1);
+    VgaPreserve (&igsvga->card);
+}
+
+void
+igsReset (IgsVga *igsvga)
+{
+    VgaRestore (&igsvga->card);
+    igsSetImm (igsvga, igs_frqlat, 0);
+    igsSetImm (igsvga, igs_frqlat, 1);
+    igsSetImm (igsvga, igs_frqlat, 0);    
+    VgaFinish (&igsvga->card);
+}
+
+char *
+igsRegName(char *buf, VGA16 reg)
+{
+    if (reg < IGS_SR + IGS_NSR)
+    {
+	sprintf (buf, "  SR%02X", reg - IGS_SR);
+    }
+    else if (reg < IGS_GR + IGS_NGR)
+    {
+	sprintf (buf, "  GR%02X", reg - IGS_GR);
+    }
+    else if (reg < IGS_GREX + IGS_NGREX)
+    {
+	sprintf (buf, " GRX%02X", reg - IGS_GREX + IGS_GREXBASE);
+    }
+    else if (reg < IGS_AR + IGS_NAR)
+    {
+	sprintf (buf, "  AR%02X", reg - IGS_AR);
+    }
+    else if (reg < IGS_CR + IGS_NCR)
+    {
+	sprintf (buf, "  CR%02X", reg - IGS_CR);
+    }
+    else if (reg < IGS_DAC + IGS_NDAC)
+    {
+	sprintf (buf, " DAC%02X", reg - IGS_DAC);
+    }
+    else if (reg < IGS_DACEX + IGS_NDACEX)
+    {
+	sprintf (buf, "DACX%02X", reg - IGS_DACEX);
+    }
+    else switch (reg) {
+    case IGS_MISC_OUT:
+	sprintf (buf, "MISC_O");
+	break;
+    case IGS_INPUT_STATUS_1:
+	sprintf (buf, "IN_S_1");
+	break;
+    }
+    return buf;
+}
Index: xc/programs/Xserver/hw/kdrive/igs/igsreg.h
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igsreg.h:1.1
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igsreg.h	Wed May 24 16:52:48 2000
@@ -0,0 +1,70 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igsreg.h,v 1.1 2000/05/24 23:52:48 keithp Exp $
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _IGSREG_H_
+#define _IGSREG_H_
+
+#include "vga.h"
+
+#define IGS_SR	    0
+#define IGS_NSR	    5
+#define IGS_GR	    (IGS_SR+IGS_NSR)
+#define IGS_NGR	    0xC0
+#define IGS_GREX    (IGS_GR+IGS_NGR)
+#define IGS_GREXBASE	0x3c
+#define IGS_NGREX   1
+#define IGS_AR	    (IGS_GREX+IGS_NGREX)
+#define IGS_NAR	    0x15
+#define IGS_CR	    (IGS_AR+IGS_NAR)
+#define IGS_NCR	    0x48
+#define IGS_DAC	    (IGS_CR+IGS_NCR)
+#define IGS_NDAC    4
+#define IGS_DACEX   (IGS_DAC+IGS_NDAC)
+#define IGS_NDACEX  4
+#define IGS_MISC_OUT	    (IGS_DACEX + IGS_NDACEX)
+#define IGS_INPUT_STATUS_1  (IGS_MISC_OUT+1)
+#define IGS_NREG	    (IGS_INPUT_STATUS_1+1)
+
+#include "igsregs.t"
+
+#define igsGet(sv,r)	    VgaGet(&(sv)->card, (r))
+#define igsGetImm(sv,r)	    VgaGetImm(&(sv)->card, (r))
+#define igsSet(sv,r,v)	    VgaSet(&(sv)->card, (r), (v))
+#define igsSetImm(sv,r,v)    VgaSetImm(&(sv)->card, (r), (v))
+
+typedef struct _igsVga {
+    VgaCard	card;
+    VgaValue	values[IGS_NREG];
+} IgsVga;
+
+void
+igsRegInit (IgsVga *igsvga, VGAVOL8 *mmio);
+
+void
+igsSave (IgsVga *igsvga);
+
+void
+igsReset (IgsVga *igsvga);
+
+#endif /* _IGSREG_H_ */
Index: xc/programs/Xserver/hw/kdrive/igs/igsstub.c
diff -u /dev/null xc/programs/Xserver/hw/kdrive/igs/igsstub.c:1.2
--- /dev/null	Sat Jul  1 20:42:15 2000
+++ xc/programs/Xserver/hw/kdrive/igs/igsstub.c	Wed May 24 16:52:48 2000
@@ -0,0 +1,63 @@
+/*
+ * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igsstub.c,v 1.2 2000/05/24 23:52:48 keithp Exp $
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "igs.h"
+
+void
+InitCard (char *name)
+{
+    KdCardAttr	attr;
+    CARD32	count;
+
+    count = 0;
+#ifdef EMBED
+    attr.address[0] = 0x10000000;  /* Adomo Wing video base address  */
+    attr.io = 0;
+    attr.naddr = 1;
+#else
+    while (LinuxFindPci (0x10ea, 0x5000, count, &attr))
+#endif
+    {
+	KdCardInfoAdd (&igsFuncs, &attr, 0);
+	count++;
+    }
+}
+
+void
+InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
+{
+    KdInitOutput (pScreenInfo, argc, argv);
+}
+
+void
+InitInput (int argc, char **argv)
+{
+    KdInitInput (&Ps2MouseFuncs, &LinuxKeyboardFuncs);
+}
+
+int
+ddxProcessArgument (int argc, char **argv, int i)
+{
+    return KdProcessArgument (argc, argv, i);
+}
Index: xc/programs/Xserver/hw/kdrive/savage/s3.c
diff -u xc/programs/Xserver/hw/kdrive/savage/s3.c:1.3 xc/programs/Xserver/hw/kdrive/savage/s3.c:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3.c:1.3	Wed Feb 23 12:30:01 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3.c	Sat May  6 15:17:44 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.3 2000/02/23 20:30:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.4 2000/05/06 22:17:44 keithp Exp $ */
 
 #include "s3.h"
 
@@ -30,6 +30,8 @@
 #define PACKED_OFFSET	    (0x8100)
 #define IOMAP_OFFSET	    (0x8000)
 
+#define S3_MIN_CLOCK	    250000
+
 static void
 _s3SetBlank (S3Ptr s3, S3Vga *s3vga, Bool blank)
 {
@@ -171,6 +173,15 @@
 s3ModeSupported (KdScreenInfo		*screen,
 		 const KdMonitorTiming	*t)
 {
+    if (screen->fb[1].depth)
+    {
+	/*
+	 * Must have at least one true color stream
+	 */
+	if (screen->fb[0].depth <= 8 &&
+	    screen->fb[1].depth <= 8)
+	    return FALSE;
+    }
     /* make sure the clock isn't too fast */
     if (t->clock > S3_MAX_CLOCK * 2)
 	return FALSE;
@@ -188,35 +199,40 @@
     int		    screen_size;
     int		    pixel_width;
     int		    byte_width;
+    int		    fb;
     
-    if (screen->depth >= 24)
-    {
-	screen->depth = 24;
-	screen->bitsPerPixel = 32;
-    }
-    else if (screen->depth >= 16)
-    {
-	screen->depth = 16;
-	screen->bitsPerPixel = 16;
-    }
-    else if (screen->depth >= 15)
-    {
-	screen->depth = 15;
-	screen->bitsPerPixel = 16;
-    }
-    else
+    screen_size = 0;
+    for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++)
     {
-	screen->depth = 8;
-	screen->bitsPerPixel = 8;
+	if (screen->fb[fb].depth >= 24)
+	{
+	    screen->fb[fb].depth = 24;
+	    if (screen->fb[fb].bitsPerPixel != 24)
+		screen->fb[fb].bitsPerPixel = 32;
+	}
+	else if (screen->fb[fb].depth >= 16)
+	{
+	    screen->fb[fb].depth = 16;
+	    screen->fb[fb].bitsPerPixel = 16;
+	}
+	else if (screen->fb[fb].depth >= 15)
+	{
+	    screen->fb[fb].depth = 15;
+	    screen->fb[fb].bitsPerPixel = 16;
+	}
+	else
+	{
+	    screen->fb[fb].depth = 8;
+	    screen->fb[fb].bitsPerPixel = 8;
+	}
+    
+	byte_width = screen->width * (screen->fb[fb].bitsPerPixel >> 3);
+	pixel_width = screen->width;
+	screen->fb[fb].pixelStride = pixel_width;
+	screen->fb[fb].byteStride = byte_width;
+	screen_size += byte_width * screen->height;
     }
 
-    byte_width = screen->width * (screen->bitsPerPixel >> 3);
-    pixel_width = screen->width;
-    screen->pixelStride = pixel_width;
-    screen->byteStride = byte_width;
-
-    screen_size = byte_width * screen->height;
-
     return screen_size <= s3c->memory;
 }
 
@@ -233,6 +249,8 @@
     int		    i;
     const KdMonitorTiming *t;
     int		    screen_size;
+    int		    fb;
+    int		    ma;
 
     s3s = (S3ScreenInfo *) xalloc (sizeof (S3ScreenInfo));
     if (!s3s)
@@ -252,23 +270,25 @@
 	screen->height = 600;
 	screen->rate = 72;
     }
-    if (!screen->depth)
-	screen->depth = 8;
+    if (!screen->fb[0].depth)
+	screen->fb[0].depth = 8;
     
     t = KdFindMode (screen, s3ModeSupported);
     screen->rate = t->rate;
     screen->width = t->horizontal;
     screen->height = t->vertical;
-    s3GetClock (t->clock, &m, &n, &r, 511, 127, 4);
+    s3GetClock (t->clock, &m, &n, &r, 511, 127, 4, 250000);
 #ifdef DEBUG
     fprintf (stderr, "computed %d,%d,%d (%d)\n",
 	     m, n, r, S3_CLOCK(m,n,r));
 #endif
+#if 0
     /*
      * Can only operate in pixel-doubled mode at 8 or 16 bits per pixel
      */
     if (screen->depth > 16 && S3_CLOCK(m,n,r) > S3_MAX_CLOCK)
 	screen->depth = 16;
+#endif
     
     if (!KdTuneMode (screen, s3ModeUsable, s3ModeSupported))
     {
@@ -276,14 +296,31 @@
 	return FALSE;
     }
     
-    screen_size = screen->byteStride * screen->height;
+    s3s->fbmap[2] = -1;
+    if (screen->fb[1].depth)
+    {
+	if (screen->fb[0].bitsPerPixel >= 16)
+	{
+	    s3s->fbmap[0] = 1;
+	    s3s->fbmap[1] = 0;
+	}
+	else
+	{
+	    s3s->fbmap[0] = 0;
+	    s3s->fbmap[1] = 1;
+	}
+    }
+    else
+    {
+	s3s->fbmap[0] = 0;
+	s3s->fbmap[1] = -1;
+    }
     
-    memory = s3c->memory - screen_size;
+    screen_size = 0;
+    for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++)
+	screen_size += screen->fb[fb].byteStride * screen->height;
     
-    /*
-     * Stick frame buffer at start of memory
-     */
-    screen->frameBuffer = s3c->frameBuffer;
+    memory = s3c->memory - screen_size;
     
     /*
      * Stick cursor at end of memory
@@ -296,60 +333,61 @@
     else
 	s3s->cursor_base = 0;
 
-    /*
-     * Use remaining memory for off-screen storage, but only use
-     * one piece (either right or bottom).
-     */
-    if (memory >= screen->byteStride * S3_TILE_SIZE)
+    screen_size = 0;
+    for (ma = 0; s3s->fbmap[ma] >= 0; ma++)
     {
-	s3s->offscreen = s3c->frameBuffer + screen_size;
-	s3s->offscreen_x = 0;
-	s3s->offscreen_y = screen_size / screen->byteStride;
-	s3s->offscreen_width = screen->pixelStride;
-	s3s->offscreen_height = memory / screen->byteStride;
-	memory -= s3s->offscreen_height * screen->byteStride;
-    }
-    else if (screen->pixelStride - screen->width >= S3_TILE_SIZE)
-    {
-	s3s->offscreen = s3c->frameBuffer + screen->width;
-	s3s->offscreen_x = screen->width;
-	s3s->offscreen_y = 0;
-	s3s->offscreen_width = screen->pixelStride - screen->width;
-	s3s->offscreen_height = screen->height;
-    }
-    else
-	s3s->offscreen = 0;
+	fb = s3s->fbmap[ma];
+	screen->fb[fb].frameBuffer = s3c->frameBuffer + screen_size;
+	screen_size += screen->fb[fb].byteStride * screen->height;
+	
+	/*
+	 * Use remaining memory for off-screen storage, but only use
+	 * one piece (either right or bottom).
+	 */
+	if (memory >= screen->fb[fb].byteStride * S3_TILE_SIZE)
+	{
+	    s3s->fb[ma].offscreen = screen->fb[fb].frameBuffer;
+	    s3s->fb[ma].offscreen_x = 0;
+	    s3s->fb[ma].offscreen_y = screen->height;
+	    s3s->fb[ma].offscreen_width = screen->fb[fb].pixelStride;
+	    s3s->fb[ma].offscreen_height = S3_TILE_SIZE;
+	    memory -= s3s->fb[ma].offscreen_height * screen->fb[fb].byteStride;
+	    screen_size += s3s->fb[ma].offscreen_height * screen->fb[fb].byteStride;
+	}
+	else
+	    s3s->fb[ma].offscreen = 0;
     
-    switch (screen->depth) {
-    case 8:
-	screen->visuals = ((1 << StaticGray) |
-			   (1 << GrayScale) |
-			   (1 << StaticColor) |
-			   (1 << PseudoColor) |
-			   (1 << TrueColor) |
-			   (1 << DirectColor));
-	screen->blueMask  = 0x00;
-	screen->greenMask = 0x00;
-	screen->redMask   = 0x00;
-	break;
-    case 15:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x001f;
-	screen->greenMask = 0x03e0;
-	screen->redMask   = 0x7c00;
-	break;
-    case 16:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x001f;
-	screen->greenMask = 0x07e0;
-	screen->redMask   = 0xf800;
-	break;
-    case 24:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x0000ff;
-	screen->greenMask = 0x00ff00;
-	screen->redMask   = 0xff0000;
-	break;
+	switch (screen->fb[fb].depth) {
+	case 8:
+	    screen->fb[fb].visuals = ((1 << StaticGray) |
+				      (1 << GrayScale) |
+				      (1 << StaticColor) |
+				      (1 << PseudoColor) |
+				      (1 << TrueColor) |
+				      (1 << DirectColor));
+	    screen->fb[fb].blueMask  = 0x00;
+	    screen->fb[fb].greenMask = 0x00;
+	    screen->fb[fb].redMask   = 0x00;
+	    break;
+	case 15:
+	    screen->fb[fb].visuals = (1 << TrueColor);
+	    screen->fb[fb].blueMask  = 0x001f;
+	    screen->fb[fb].greenMask = 0x03e0;
+	    screen->fb[fb].redMask   = 0x7c00;
+	    break;
+	case 16:
+	    screen->fb[fb].visuals = (1 << TrueColor);
+	    screen->fb[fb].blueMask  = 0x001f;
+	    screen->fb[fb].greenMask = 0x07e0;
+	    screen->fb[fb].redMask   = 0xf800;
+	    break;
+	case 24:
+	    screen->fb[fb].visuals = (1 << TrueColor);
+	    screen->fb[fb].blueMask  = 0x0000ff;
+	    screen->fb[fb].greenMask = 0x00ff00;
+	    screen->fb[fb].redMask   = 0xff0000;
+	    break;
+	}
     }
     
     screen->driver = s3s;
@@ -821,6 +859,7 @@
     S3Save  *save = &s3c->save;
     CARD8   t1, t2;
     CARD8   *cursor_base;
+    CARD8   streams_mode;
 
     s3Save (s3vga);
     if (!s3c->bios_initialized)
@@ -842,9 +881,30 @@
     save->write_mask = s3->write_mask;
     save->fg = s3->fg;
     save->bg = s3->bg;
+    /*
+     * Preserve streams processor state
+     */
+    streams_mode = s3Get (s3vga, s3_streams_mode);
+    s3SetImm (s3vga, s3_streams_mode, 3);
     save->global_bitmap_1 = s3->global_bitmap_1;
     save->global_bitmap_2 = s3->global_bitmap_2;
+    save->adv_func_cntl = s3->adv_func_cntl;
     save->primary_bitmap_1 = s3->primary_bitmap_1;
+    save->primary_bitmap_2 = s3->primary_bitmap_2;
+    save->secondary_bitmap_1 = s3->secondary_bitmap_1;
+    save->secondary_bitmap_2 = s3->secondary_bitmap_2;
+    save->primary_stream_control = s3->primary_stream_control;
+    save->blend_control = s3->blend_control;
+    save->primary_stream_addr_0 = s3->primary_stream_addr_0;
+    save->primary_stream_addr_1 = s3->primary_stream_addr_1;
+    save->primary_stream_stride = s3->primary_stream_stride;
+    save->primary_stream_xy = s3->primary_stream_xy;
+    save->primary_stream_size = s3->primary_stream_size;
+    save->primary_stream_mem = s3->primary_stream_mem;
+    save->secondary_stream_xy = s3->secondary_stream_xy;
+    save->secondary_stream_size = s3->secondary_stream_size;
+    save->streams_fifo = s3->streams_fifo;
+    s3SetImm (s3vga, s3_streams_mode, streams_mode);
     _s3SetBlank (s3, s3vga, FALSE);
 }
 
@@ -855,6 +915,49 @@
 int  s3CpuTimeout, s3AccelTimeout;
 
 void
+s3SetGlobalBitmap (ScreenPtr pScreen, int ma)
+{
+    KdScreenPriv(pScreen);
+    s3ScreenInfo (pScreenPriv);
+    
+    if (s3s->current_ma != ma)
+    {
+	s3CardInfo (pScreenPriv);
+	S3Vga   *s3vga = &s3c->s3vga;
+	S3Ptr   s3 = s3c->s3;
+	CARD32  gb1, gb2;
+	int	    depth;
+	int	    length;
+	KdCheckSync (pScreen);
+	switch (s3s->fb[ma].accel_bpp) {
+	case 8:
+	case 24:
+	    length = 0;
+	    break;
+	case 16:
+	    length = 1;
+	    break;
+	case 32:
+	    length = 3;
+	    break;
+	}
+	s3SetImm (s3vga, s3_pixel_length, length);
+	gb1 = s3s->fb[ma].bitmap_offset;
+	gb2 = ((1 << 0) |
+	       (0 << 2) |
+	       (1 << 3) |
+	       ((s3s->fb[ma].accel_stride >> 4) << 4) |
+	       (s3s->fb[ma].accel_bpp << 16) |
+	       (0 << 24) |
+	       (1 << 28));
+	s3->global_bitmap_1 = gb1;
+	s3->global_bitmap_2 = gb2;
+	s3->global_bitmap_2 = gb2;
+	s3s->current_ma = ma;
+    }
+}
+
+void
 s3Enable (ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
@@ -878,7 +981,7 @@
     int	    h_screen_off;
     int	    h_start_fifo_fetch;
 
-    int	    primary_stream_l1;
+    int	    primary_stream_l1[KD_MAX_FB];
 
     int	    v_total;
     int	    v_retrace_start;
@@ -886,9 +989,14 @@
     int	    v_display_end;
     int	    v_blank_start;
     int	    v_blank_end;
+    int	    v_blank_start_adjust = 0;
+    int	    v_blank_end_adjust = 0;
 
-    int	    h_blank_start_adjust;
-    int	    h_blank_end_adjust;
+    int	    h_blank_start_adjust = 0;
+    int	    h_blank_end_adjust = 0;
+    int	    h_sync_start_adjust = 0;
+    int	    h_sync_end_adjust = 0;
+    int	    h_start_fifo_fetch_adjust = 0;
     int	    h_sync_extend;
     int	    h_blank_extend;
     int	    i;
@@ -899,7 +1007,14 @@
     int	    cpu_timeout;
     int	    accel_timeout;
     int	    bytes_per_ms;
+    CARD32  control[2];
+    int	    fb;
+    int	    ma;
+    
+    s3s->primary_depth = screen->fb[s3s->fbmap[0]].depth;
     
+    s3s->use_streams = TRUE;
+    
     t = KdFindMode (screen, s3ModeSupported);
     
     hfp = t->hfp;
@@ -912,24 +1027,38 @@
     vblank = t->vblank;
     vactive = t->vertical;
 
+    
     m = s3Get (s3vga, s3_dclk_m);
     n = s3Get (s3vga, s3_dclk_n);
     r = s3Get (s3vga, s3_dclk_r);
-#ifdef DEBUG
-    fprintf (stderr, "old clock %d, %d, %d\n", m, n, r);
+#define DEBUG_CLOCK
+#ifdef DEBUG_CLOCK
+    fprintf (stderr, "old clock %d, %d, %d (%d)\n", m, n, r, S3_CLOCK(m,n,r));
 #endif
     clock_double = FALSE;
-    s3GetClock (t->clock, &m, &n, &r, 511, 127, 4);
-    if (S3_CLOCK(m,n,r) > S3_MAX_CLOCK)
+    s3GetClock (t->clock, &m, &n, &r, 511, 127, 4, 250000);
+    if (S3_CLOCK(m,n,r) > S3_MAX_CLOCK && !s3s->use_streams)
 	clock_double = TRUE;
     s3Set (s3vga, s3_clock_select, 3);
     s3Set (s3vga, s3_dclk_m, m);
     s3Set (s3vga, s3_dclk_n, n);
     s3Set (s3vga, s3_dclk_r, r);
-#ifdef DEBUG
+#ifdef DEBUG_CLOCK
     fprintf (stderr, "new clock %d, %d, %d (%d)\n", m, n, r, S3_CLOCK(m,n,r));
 #endif
 
+    if (s3s->use_streams)
+    {
+	s3Set (s3vga, s3_streams_mode, 3);
+	s3Set (s3vga, s3_enable_l1_parameter, 1);
+    }
+    else
+    {
+	s3Set (s3vga, s3_streams_mode, 0);
+	s3Set (s3vga, s3_enable_l1_parameter, 0);
+    }
+    s3Set (s3vga, s3_flat_panel_output_control_1, 0);
+    s3Set (s3vga, s3_flat_panel_output_control_2, 0);
     s3Set (s3vga, s3_select_graphics_mode, 1);
     s3Set (s3vga, s3_enable_blinking, 0);
     s3Set (s3vga, s3_enable_vga_16bit, 0);
@@ -949,10 +1078,12 @@
     s3Set (s3vga, s3_enable_2d_3d, 1);
     s3Set (s3vga, s3_refresh_control, 1);
     s3Set (s3vga, s3_disable_pci_read_bursts, 0);
+    s3Set (s3vga, s3_pci_disconnect_enable, 1);
+    s3Set (s3vga, s3_primary_load_control, 0);
+    s3Set (s3vga, s3_secondary_load_control, 0);
     s3Set (s3vga, s3_pci_retry_enable, 1);
     s3Set (s3vga, s3_enable_256, 1);
-/*    s3Set (s3vga, s3_border_select, 1);	/* eliminate white border */
-    s3Set (s3vga, s3_border_select, 0);	/* eliminate white border */
+    s3Set (s3vga, s3_border_select, 1);	/* eliminate white border */
     s3SetImm (s3vga, s3_lock_palette, 0);	/* unlock palette/border regs */
     s3Set (s3vga, s3_disable_v_retrace_int, 1);
     if (t->hpol == KdSyncPositive)
@@ -976,17 +1107,49 @@
     s3Set (s3vga, s3_enable_clock_double, 0);
     s3Set (s3vga, s3_dclk_over_2, 0);
 
-    s3Set (s3vga, s3_fifo_fetch_timing, 1);
-    s3Set (s3vga, s3_fifo_drain_delay, 7);
-
-
     s3Set (s3vga, s3_delay_h_enable, 0);
     s3Set (s3vga, s3_sdclk_skew, 0);
     
     s3Set (s3vga, s3_dac_mask, 0xff);
     
-    s3Set (s3vga, s3_dac_power_saving_disable, 1);
+#if 0
+#ifdef DEBUG_CLOCK
+    m = s3Get (s3vga, s3_mclk_m);
+    n = s3Get (s3vga, s3_mclk_n);
+    r = s3Get (s3vga, s3_mclk_r);
+    fprintf (stderr, "old mclk %d, %d, %d (%d)\n", m, n, r, S3_CLOCK(m,n,r));
+#endif
+    
+    s3GetClock (125282, &m, &n, &r, 127, 31, 3, 250000);
+
+#ifdef DEBUG_CLOCK
+    fprintf (stderr, "new mclk %d, %d, %d (%d)\n", m, n, r,S3_CLOCK(m,n,r));
+#endif
+    
+    s3Set (s3vga, s3_mclk_m, m);
+    s3Set (s3vga, s3_mclk_n, n);
+    s3Set (s3vga, s3_mclk_r, r);
     
+#ifdef DEBUG_CLOCK
+    m = s3Get (s3vga, s3_eclk_m);
+    n = s3Get (s3vga, s3_eclk_n);
+    r = s3Get (s3vga, s3_eclk_r);
+    fprintf (stderr, "old eclk %d, %d, %d (%d)\n", m, n, r, S3_CLOCK(m,n,r));
+#endif
+    
+#define S3_ECLK	125282
+    
+    s3GetClock (S3_ECLK, &m, &n, &r, 127, 31, 3, 250000);
+
+#ifdef DEBUG_CLOCK
+    fprintf (stderr, "new eclk %d, %d, %d (%d)\n", m, n, r,S3_CLOCK(m,n,r));
+#endif
+    
+    s3Set (s3vga, s3_eclk_m, m);
+    s3Set (s3vga, s3_eclk_n, n);
+    s3Set (s3vga, s3_eclk_r, r);
+#endif
+    
     s3s->manage_border = FALSE;
     /*
      * Compute character lengths for horizontal timing values
@@ -998,61 +1161,85 @@
     /*
      * Set pixel size, choose clock doubling mode
      */
-    h_blank_start_adjust = 0;
-    h_blank_end_adjust = 0;
 
-    switch (screen->bitsPerPixel) {
-    case 8:
-	h_screen_off = hactive;
-	s3Set (s3vga, s3_pixel_length, 0);
-	s3Set (s3vga, s3_color_mode, 0);
-	/*
-	 * Set up for double-pixel mode, switch color modes,
-	 * divide the dclk and delay h blank by 2 dclks
-	 */
-	if (clock_double)
-	{
-	    s3Set (s3vga, s3_color_mode, 1);
-	    s3Set (s3vga, s3_dclk_over_2, 1);
-	    s3Set (s3vga, s3_enable_clock_double, 1);
-	    s3Set (s3vga, s3_border_select, 0);
-/*	    s3Set (s3vga, s3_border_color, pScreen->blackPixel); */
-	    h_blank_start_adjust = 4;
-	    h_blank_end_adjust = -4;
-	    s3s->manage_border = TRUE;
-	}
-	break;
-    case 16:
-	h_screen_off = hactive * 2;
-	s3Set (s3vga, s3_pixel_length, 1);
-	if (clock_double)
-	{
-	    if (screen->depth == 15)
-		s3Set (s3vga, s3_color_mode, 3);
+    bytes_per_ms = 0;
+    
+    for (ma = 0; s3s->fbmap[ma] >= 0; ma++)
+    {
+	fb = s3s->fbmap[ma];
+	s3s->fb[ma].accel_bpp = screen->fb[fb].bitsPerPixel;
+	s3s->fb[ma].accel_stride = screen->fb[fb].pixelStride;
+	s3s->fb[ma].bitmap_offset = screen->fb[fb].frameBuffer - s3c->frameBuffer;
+	switch (s3s->fb[ma].accel_bpp) {
+	case 8:
+	    h_screen_off = hactive;
+	    s3Set (s3vga, s3_pixel_length, 0);
+	    s3Set (s3vga, s3_color_mode, 0);
+	    control[ma] = 0;	
+	    /*
+	     * Set up for double-pixel mode, switch color modes,
+	     * divide the dclk and delay h blank by 2 dclks
+	     */
+	    if (clock_double)
+	    {
+		s3Set (s3vga, s3_color_mode, 1);
+		s3Set (s3vga, s3_dclk_over_2, 1);
+		s3Set (s3vga, s3_enable_clock_double, 1);
+		s3Set (s3vga, s3_h_skew, 1);
+		h_blank_start_adjust = -3;
+		h_blank_end_adjust = -4;
+		s3Set (s3vga, s3_border_select, 0);
+#if 0
+		s3s->manage_border = TRUE;
+		/*	    s3Set (s3vga, s3_border_color, pScreen->blackPixel); */
+#endif
+	    }
+	    break;
+	case 16:
+	    h_screen_off = hactive * 2;
+	    s3Set (s3vga, s3_pixel_length, 1);
+	    if (screen->fb[fb].depth == 15)
+		control[ma] = 3 << 24;
 	    else
-		s3Set (s3vga, s3_color_mode, 5);
-	    s3Set (s3vga, s3_dclk_over_2, 1);
-	    s3Set (s3vga, s3_enable_clock_double, 1);
-	    s3Set (s3vga, s3_border_select, 0);
-	    h_blank_start_adjust = 4;
-	    h_blank_end_adjust = -4;
-	}
-	else
-	{
-	    if (screen->depth == 15)
-		s3Set (s3vga, s3_color_mode, 2);
+		control[ma] = 5 << 24;
+	    if (clock_double)
+	    {
+		if (screen->fb[fb].depth == 15)
+		    s3Set (s3vga, s3_color_mode, 3);
+		else
+		    s3Set (s3vga, s3_color_mode, 5);
+		s3Set (s3vga, s3_dclk_over_2, 1);
+		s3Set (s3vga, s3_enable_clock_double, 1);
+		s3Set (s3vga, s3_border_select, 0);
+		h_blank_start_adjust = 4;
+		h_blank_end_adjust = -4;
+	    }
 	    else
-		s3Set (s3vga, s3_color_mode, 4);
-	    s3Set (s3vga, s3_dclk_over_2, 0);
-	    s3Set (s3vga, s3_enable_clock_double, 0);
-	    s3Set (s3vga, s3_delay_blank, 0);
+	    {
+		if (screen->fb[fb].depth == 15)
+		    s3Set (s3vga, s3_color_mode, 2);
+		else
+		    s3Set (s3vga, s3_color_mode, 4);
+		s3Set (s3vga, s3_dclk_over_2, 0);
+		s3Set (s3vga, s3_enable_clock_double, 0);
+		s3Set (s3vga, s3_delay_blank, 0);
+	    }
+	    break;
+	case 24:
+	    control[ma] = 6 << 24;
+	    h_screen_off = hactive * 3;
+	    s3s->fb[ma].accel_bpp = 8;
+	    s3s->fb[ma].accel_stride = screen->fb[fb].pixelStride * 3;
+	    break;
+	case 32:
+	    control[ma] = 7 << 24;
+	    h_screen_off = hactive * 4;
+	    s3Set (s3vga, s3_pixel_length, 3);
+	    s3Set (s3vga, s3_color_mode, 0xd);
+	    break;
 	}
-	break;
-    case 32:
-	h_screen_off = hactive * 4;
-	s3Set (s3vga, s3_pixel_length, 3);
-	s3Set (s3vga, s3_color_mode, 0xd);
-	break;
+	bytes_per_ms += t->clock * (screen->fb[fb].bitsPerPixel / 8);
+	primary_stream_l1[ma] = (screen->width * screen->fb[fb].bitsPerPixel / (8 * 8)) - 1;
     }
 
     /*
@@ -1060,11 +1247,9 @@
      */
     s3Set (s3vga, s3_start_address, 0);
     
-    
     /*
      * Set various registers to avoid snow on the screen
      */
-    bytes_per_ms = t->clock * (screen->bitsPerPixel / 8);
     
     fprintf (stderr, "bytes_per_ms %d\n", bytes_per_ms);
     fprintf (stderr, "primary 0x%x master 0x%x command 0x%x lpb 0x%x cpu 0x%x 2d 0x%x\n",
@@ -1075,28 +1260,105 @@
 	     s3Get (s3vga, s3_cpu_timeout),
 	     s3Get (s3vga, s3_2d_graphics_engine_timeout));
 
-    /*		cpu	2d
-     * 576000	
-     * 288000	0x1f	0x19
-     
+    /*
+     *	Test:
+     *	    accel	x11perf -line500
+     *	    cpu		x11perf -circle500
+     *
+     *				    cpu	    accel
+     *	1600x1200x32x85 (918000)    1	    1	    not enough
+     *  1600x1200x32x75 (810000)    3	    2
+     *	1600x1200x32x70 (756000)    4	    3
+     *	1600x1200x32x60 (648000)    6	    5
+     *
+     *	1280x1024x32x85 (630000)    6	    4
+     *	1280x1024x32x75 (540000)    a	    6
+     *	1280x1024x32x60 (432000)    1f	    a
+     *
+     *	1152x900x32x85	(490000)    a	    6
+     *	1152x900x32x75	(433000)    1f	    8
+     *	1152x900x32x70	(401000)    1f	    a
+     *	1152x900x32x66	(380000)    1f	    a
+     *
+     *	1024x768x32x85	(378000)    1f	    a
+     *	1024x768x32x75	(315000)    1f	    b
+     *	1024x768x32x70	(300000)    1f	    b
+     *	1024x768x32x60	(260000)    1f	    12
+     *
+     *	800x600x32x85	(225000)    1f	    1a
+     *	800x600x32x72	(200000)    1f	    1d
+     *	800x600x32x75	(198000)    1f	    1d
+     *
+     *	1600x1200x16x85 (459000)    1f	    8
+     *	1600x1200x16x75	(405000)    1f	    a
+     *	1600x1200x16x70	(378000)    1f	    b
+     *	1600x1200x16x60	(324000)    1f	    f
+     *
+     *  1280x1024x16x85 (315000)    1f	    12
+     *	1280x1024x16x75 (270000)    1f	    16
+     *	1280x1024x16x60 (216000)    1f	    1d
+     *
+     *	1600x1200x8x85	(229000)    1f	    1f
+     *
      */
+    
     if (s3CpuTimeout)
     {
-	cpu_timeout = s3CpuTimeout;
-	if (s3AccelTimeout)
+	if (s3CpuTimeout < 0)
+	    cpu_timeout = 0;
+	else
+	    cpu_timeout = s3CpuTimeout;
+	if (s3AccelTimeout < 0)
+	    accel_timeout = 0;
+	else if (s3AccelTimeout)
 	    accel_timeout = s3AccelTimeout;
 	else
 	    accel_timeout = s3CpuTimeout;
+    }
+    else if (bytes_per_ms >= 900000)
+    {
+	cpu_timeout = 0x01;
+	accel_timeout = 0x01;
+    }
+    else if (bytes_per_ms >= 800000)
+    {
+	cpu_timeout = 0x03;
+	accel_timeout = 0x02;
+    }
+    else if (bytes_per_ms >= 700000)
+    {
+	cpu_timeout = 0x04;
+	accel_timeout = 0x03;
+    }
+    else if (bytes_per_ms >= 600000)
+    {
+	cpu_timeout = 0x06;
+	accel_timeout = 0x04;
+    }
+    else if (bytes_per_ms >= 475000)
+    {
+	cpu_timeout = 0x0a;
+	accel_timeout = 0x06;
+    }
+    else if (bytes_per_ms >= 425000)
+    {
+	cpu_timeout = 0x1f;
+	accel_timeout = 0x8;
     }
-    else if (bytes_per_ms > 400000)
+    else if (bytes_per_ms >= 300000)
     {
-	cpu_timeout = 0x10;
-	accel_timeout = 0x7;
+	cpu_timeout = 0x1f;
+	accel_timeout = 0x0a;
     }
-    else if (bytes_per_ms > 250000)
+    else if (bytes_per_ms >= 250000)
     {
-	cpu_timeout = 0x10;
-	accel_timeout = 0x18;
+	cpu_timeout = 0x1f;
+	accel_timeout = 0x12;
+    }
+    else if (bytes_per_ms >= 200000)
+    {
+	cpu_timeout = 0x1f;
+	accel_timeout = 0x1a;
     }
     else
     {
@@ -1104,6 +1366,8 @@
 	accel_timeout = 0x1f;
     }
 	
+    fprintf (stderr, "cpu 0x%x accel 0x%x\n", cpu_timeout, accel_timeout);
+    
     s3Set (s3vga, s3_primary_stream_timeout, 0xc0);
     s3Set (s3vga, s3_master_control_unit_timeout, 0xf);
     s3Set (s3vga, s3_command_buffer_timeout, 0x1f);
@@ -1111,14 +1375,17 @@
     s3Set (s3vga, s3_2d_graphics_engine_timeout, accel_timeout);
     s3Set (s3vga, s3_cpu_timeout, cpu_timeout);
     
+    s3Set (s3vga, s3_fifo_fetch_timing, 1);
+    s3Set (s3vga, s3_fifo_drain_delay, 2);
+
     /*
      * Compute horizontal register values from timings
      */
     h_total = hactive + hblank - 5;
     h_display_end = hactive - 1;
     
-    h_sync_start = hactive + hfp;
-    h_sync_end = hactive + hblank - hbp;
+    h_sync_start = hactive + hfp + h_sync_start_adjust;
+    h_sync_end = hactive + hblank - hbp + h_sync_end_adjust;
     /* 
      * pad the blank values narrow a bit and use the border_select to
      * eliminate the remaining border; don't know why, but it doesn't
@@ -1141,6 +1408,7 @@
     else
 	h_start_fifo_fetch = h_total - 5;
 
+    h_start_fifo_fetch += h_start_fifo_fetch_adjust;
     if (h_blank_end - h_blank_start >= 0x40)
 	h_blank_extend = 1;
     else
@@ -1151,8 +1419,6 @@
     else
 	h_sync_extend = 0;
     
-    primary_stream_l1 = (screen->width * screen->bitsPerPixel / (8 * 8)) - 1;
-    
 #ifdef DEBUG
     fprintf (stderr, "h_total %d h_display_end %d\n",
 	     h_total, h_display_end);
@@ -1172,19 +1438,19 @@
     s3Set (s3vga, s3_h_start_fifo_fetch, h_start_fifo_fetch);
     s3Set (s3vga, s3_h_sync_extend, h_sync_extend);
     s3Set (s3vga, s3_h_blank_extend, h_blank_extend);
+    
+    s3Set (s3vga, s3_dac_power_saving_disable, 0);
+    s3Set (s3vga, s3_dac_power_up_time, hactive + hblank);
     
-    s3Set (s3vga, s3_primary_stream_l1, primary_stream_l1);
+    s3Set (s3vga, s3_primary_stream_l1, primary_stream_l1[0]);
 
+    s3Set (s3vga, s3_streams_fifo_delay, 0);
+    
     v_total = vactive + vblank - 2;
     v_display_end = vactive - 1;
     
-#if 0
-    v_blank_start = vactive - 1;
-    v_blank_end = v_blank_start + vblank - 1;
-#else
-    v_blank_start = vactive - 1;
-    v_blank_end = v_blank_start + vblank - 1;
-#endif
+    v_blank_start = vactive - 1 + v_blank_start_adjust;
+    v_blank_end = v_blank_start + vblank - 1 + v_blank_end_adjust;
     
     v_retrace_start = vactive + vfp;
     v_retrace_end = vactive + vblank - vbp;
@@ -1206,7 +1472,7 @@
      */
     if (!screen->softCursor)
     {
-	cursor_address = (s3s->cursor_base - screen->frameBuffer) / 1024;
+	cursor_address = (s3s->cursor_base - s3c->frameBuffer) / 1024;
 
 	s3Set (s3vga, s3_cursor_address, cursor_address);
 	s3Set (s3vga, s3_cursor_ms_x11, 0);
@@ -1225,12 +1491,14 @@
      * Set accelerator
      */
     switch (screen->width) {
-    case 640:	s3Set (s3vga, s3_ge_screen_width, 1); break;
-    case 800:	s3Set (s3vga, s3_ge_screen_width, 2); break;
-    case 1024:	s3Set (s3vga, s3_ge_screen_width, 0); break;
-    case 1152:	s3Set (s3vga, s3_ge_screen_width, 4); break;
-    case 1280:	s3Set (s3vga, s3_ge_screen_width, 3); break;
-    case 1600:	s3Set (s3vga, s3_ge_screen_width, 6); break;
+#if 0
+    case 640: s3Set (s3vga, s3_ge_screen_width, 1); break;
+    case 800: s3Set (s3vga, s3_ge_screen_width, 2); break;
+    case 1024:        s3Set (s3vga, s3_ge_screen_width, 0); break;
+    case 1152:        s3Set (s3vga, s3_ge_screen_width, 4); break;
+    case 1280:        s3Set (s3vga, s3_ge_screen_width, 3); break;
+    case 1600:        s3Set (s3vga, s3_ge_screen_width, 6); break;
+#endif
     default:
 	s3Set (s3vga, s3_ge_screen_width, 7);   /* use global bitmap descriptor */
     }
@@ -1246,17 +1514,70 @@
     s3Set (s3vga, s3_vsync_control, 0);
     
     _s3SetBlank (s3, s3vga, TRUE);
+    if (s3s->use_streams)
+	s3Set (s3vga, s3_primary_stream_definition, 1);
+    else
+	s3Set (s3vga, s3_primary_stream_definition, 0);
+
     VgaFlush(&s3vga->card);
     VgaSetImm (&s3vga->card, s3_clock_load_imm, 1);
     VgaSetImm(&s3vga->card, s3_clock_load_imm, 0);
-    s3->global_bitmap_1 = 0;
-    s3->global_bitmap_2 = MAKE_GBF (1,    /* 64 bit bitmap descriptor size */
-				    0,    /* disable BCI */
-				    pScreenPriv->screen->pixelStride >> 4,
-				    pScreenPriv->screen->bitsPerPixel,
-				    0);   /* tile format */
+    if (s3s->use_streams)
+    {
+	fb = s3s->fbmap[0];
+	s3->primary_stream_control = control[0];
+	s3->primary_stream_addr_0 =
+	s3->primary_stream_addr_1 = s3s->fb[0].bitmap_offset;
+	s3->primary_stream_stride = screen->fb[fb].byteStride;
+	s3->primary_stream_xy = (1 << 16) | 1;
+	s3->primary_stream_size = ((screen->fb[fb].pixelStride - 1) << 16) | screen->height;
+	s3->primary_stream_mem = (screen->fb[fb].byteStride * screen->height) / 8 - 1;
+	if (s3s->fbmap[1] >= 0)
+	{
+	    fb = s3s->fbmap[1];
+	    s3->blend_control = 5 << 24;
+	    if (s3s->fb[0].accel_bpp == 8)
+		s3->chroma_key_control = 0x330000ff;
+	    else
+		s3->chroma_key_control = 0x13010101;
+	    s3->secondary_stream_control = control[1] | screen->width;
+	    s3->secondary_stream_h_scale = (1 << 15);
+	    s3->color_adjustment = 0;
+	    s3->secondary_stream_vscale = (1 << 15);
+	    s3->secondary_stream_vinit = 0;
+	    s3->secondary_stream_mbuf = 0;
+	    s3->secondary_stream_addr_0 =
+	    s3->secondary_stream_addr_1 = s3s->fb[1].bitmap_offset;
+	    s3->secondary_stream_stride = screen->fb[fb].byteStride;
+	    s3->secondary_stream_scount = screen->height;
+	    s3->secondary_stream_xy = (1 << 16) | 1;
+	    s3->secondary_stream_size = ((screen->fb[fb].pixelStride - 1) << 16) | screen->height;
+	    s3->secondary_stream_mem = (1 << 22) | ((screen->fb[fb].byteStride * screen->height) / 8 - 1);
+	}
+	else
+	{
+	    s3->blend_control = 1 << 24;
+	    s3->secondary_stream_xy = 0x07ff07ff;
+	    s3->secondary_stream_size = 0x00010001;
+	}
+	s3->streams_fifo = (0x20 << 11) | (0x20 << 5) | 0x2;
+    }
+    s3->mult_misc_read_sel = (((1 << 9) |
+			       (1 << 11) |
+			       (0xe << 12)) |
+			      (((0xe << 0) |
+				(0xf << 12)) << 16));
+    
+    s3->cmd_overflow_buf_ptr = (1 << 3);
+    s3->bci_power_management = (1 << 9);
+    s3->adv_func_cntl = (3 << 8) | (1 << 4) | (1 << 2) | 1;
+    s3->primary_bitmap_1 = 0;
+    s3->primary_bitmap_2 = 0;
+    s3->secondary_bitmap_1 = 0;
+    s3->secondary_bitmap_2 = 0;
+    s3s->current_ma = -1;
     _s3SetBlank (s3, s3vga, FALSE);
-#if 1
+#if 0
     {
 	VGA16	r;
 	static CARD32	streams[][2] = {
@@ -1354,10 +1675,32 @@
     S3Vga	*s3vga = &s3c->s3vga;
     S3Save	*save = &s3c->save;
     CARD8	*cursor_base;
+    CARD8	streams_mode;
 
-    /* graphics engine state */
+    _s3SetBlank (s3, s3vga, TRUE);
+    /* streams processor state */
+    streams_mode = s3Get (s3vga, s3_streams_mode);
+    s3SetImm (s3vga, s3_streams_mode, 3);
     s3->global_bitmap_1 = save->global_bitmap_1;
     s3->global_bitmap_2 = save->global_bitmap_2;
+    s3->adv_func_cntl = save->adv_func_cntl;
+    s3->primary_bitmap_1 = save->primary_bitmap_1;
+    s3->primary_bitmap_2 = save->primary_bitmap_2;
+    s3->secondary_bitmap_1 = save->secondary_bitmap_1;
+    s3->secondary_bitmap_2 = save->secondary_bitmap_2;
+    s3->primary_stream_control = save->primary_stream_control;
+    s3->blend_control = save->blend_control;
+    s3->primary_stream_addr_0 = save->primary_stream_addr_0;
+    s3->primary_stream_addr_0 = save->primary_stream_addr_0;
+    s3->primary_stream_stride = save->primary_stream_stride;
+    s3->primary_stream_xy = save->primary_stream_xy;
+    s3->primary_stream_size = save->primary_stream_size;
+    s3->primary_stream_mem = save->primary_stream_mem;
+    s3->secondary_stream_xy = save->secondary_stream_xy;
+    s3->secondary_stream_size = save->secondary_stream_size;
+    s3->streams_fifo = save->streams_fifo;
+    s3SetImm (s3vga, s3_streams_mode, streams_mode);
+    /* graphics engine state */
     s3->alt_mix = save->alt_mix;
     s3->write_mask = save->write_mask;
     s3->fg = save->fg;
@@ -1366,7 +1709,6 @@
     s3->scissors_tl = 0x00000000;
     s3->scissors_br = 0x0fff0fff;
     
-    _s3SetBlank (s3, s3vga, TRUE);
     VgaRestore (&s3vga->card);
     s3Set (s3vga, s3_linear_window_size, 3);
     s3Set (s3vga, s3_enable_linear, 1);
@@ -1417,6 +1759,100 @@
 }
 
 void
+s3DumbPaintChromaKey (WindowPtr pWin, RegionPtr pRegion)
+{
+    ScreenPtr	pScreen = pWin->drawable.pScreen;
+    KdScreenPriv(pScreen);
+    KdCardInfo	    *card = pScreenPriv->card;
+    KdScreenInfo    *screen = pScreenPriv->screen;
+    s3CardInfo (pScreenPriv);
+    s3ScreenInfo (pScreenPriv);
+    
+    if (pWin->drawable.depth != s3s->primary_depth)
+    {
+	int	    nBox = REGION_NUM_RECTS(pRegion);
+	BoxPtr	    pBox = REGION_RECTS(pRegion);
+	PixmapPtr   pPixmap;
+	FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pScreen);
+	FbBits	    *dst;
+	FbStride    dstStride;
+	int	    dstBpp;
+
+	if (pScrPriv->pLayer[0]->drawable.depth == pWin->drawable.depth)
+	    pPixmap = pScrPriv->pLayer[1];
+	else
+	    pPixmap = pScrPriv->pLayer[0];
+	fbGetDrawable (&pPixmap->drawable, dst, dstStride, dstBpp);
+	while (nBox--)
+	{
+	    fbSolid (dst + pBox->y1 * dstStride,
+		     dstStride,
+		     pBox->x1 * dstBpp,
+		     dstBpp,
+		     (pBox->x2 - pBox->x1) * dstBpp,
+		     (pBox->y2 - pBox->y1),
+		     0x0, FB_ALLONES);
+	    pBox++;
+	}
+    }
+}
+
+void
+s3DumbPaintWindow (WindowPtr pWin, RegionPtr pRegion, int what)
+{
+    s3DumbPaintChromaKey (pWin, pRegion);
+    fbPaintWindow (pWin, pRegion, what);
+}
+
+void
+s3DumbCopyWindow (WindowPtr pWin, 
+	     DDXPointRec    ptOldOrg, 
+	     RegionPtr	    prgnSrc)
+{
+    ScreenPtr		pScreen = pWin->drawable.pScreen;
+    RegionRec		rgnDst;
+    int			dx, dy;
+    PixmapPtr		pPixmap;
+    FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pScreen);
+    int			fb;
+
+    KdCheckSync (pScreen);
+    dx = ptOldOrg.x - pWin->drawable.x;
+    dy = ptOldOrg.y - pWin->drawable.y;
+    REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
+
+    REGION_INIT (pWin->drawable.pScreen, &rgnDst, NullBox, 0);
+    
+    REGION_INTERSECT(pWin->drawable.pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
+
+    for (fb = 0; fb < pScrPriv->nlayers; fb++)
+    {
+	pPixmap = pScrPriv->pLayer[fb];
+	fbCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
+		      0,
+		      &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
+    }
+    
+    REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
+    fbValidateDrawable (&pWin->drawable);
+}
+
+Bool
+s3InitScreen(ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdCardInfo	    *card = pScreenPriv->card;
+    KdScreenInfo    *screen = pScreenPriv->screen;
+    s3CardInfo (pScreenPriv);
+    s3ScreenInfo (pScreenPriv);
+
+    pScreen->PaintWindowBackground = s3DumbPaintWindow;
+    pScreen->PaintWindowBorder = s3DumbPaintWindow;
+    pScreen->CopyWindow = s3DumbCopyWindow;
+    return TRUE;
+}
+
+void
 s3ScreenFini (KdScreenInfo *screen)
 {
     S3ScreenInfo    *s3s = (S3ScreenInfo *) screen->driver;
@@ -1439,7 +1875,7 @@
 KdCardFuncs	s3Funcs = {
     s3CardInit,
     s3ScreenInit,
-    0,
+    s3InitScreen,
     s3Preserve,
     s3Enable,
     s3DPMS,
Index: xc/programs/Xserver/hw/kdrive/savage/s3.h
diff -u xc/programs/Xserver/hw/kdrive/savage/s3.h:1.3 xc/programs/Xserver/hw/kdrive/savage/s3.h:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3.h:1.3	Wed Feb 23 12:30:02 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3.h	Sat May  6 15:17:45 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3.h,v 1.3 2000/02/23 20:30:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3.h,v 1.4 2000/05/06 22:17:45 keithp Exp $ */
 
 #ifndef _S3_H_
 #define _S3_H_
@@ -98,110 +98,37 @@
     VOL32	blend_control;		/* 81a0 */
     VOL8	_pad3c[0x1c];		/* 81a4 */
     VOL32	primary_stream_addr_0;	/* 81c0 */
-    VOL8	_pad3d[0x124];		/* 81c4 */
-#if 0
-    VOL16	cur_y;			/* 82e8 */
-    VOL8	_pad4[0xc6];		/* 82ea */
-#else
+    VOL32	primary_stream_addr_1;	/* 81c4 */
+    VOL32	primary_stream_stride;	/* 81c8 */
+    VOL32       secondary_stream_mbuf;	/* 81cc */
+    VOL32       secondary_stream_addr_0;/* 81d0 */
+    VOL32       secondary_stream_addr_1;/* 81d4 */
+    VOL32       secondary_stream_stride;/* 81d8 */
+    VOL8	_pad81dc[4];		/* 81dc */
+    VOL32       secondary_stream_vscale;/* 81e0 */
+    VOL32       secondary_stream_vinit;	/* 81e4 */
+    VOL32       secondary_stream_scount;/* 81e8 */
+    VOL32       streams_fifo;		/* 81ec */
+    VOL32       primary_stream_xy;	/* 81f0 */
+    VOL32       primary_stream_size;	/* 81f4 */
+    VOL32	secondary_stream_xy;	/* 81f8 */
+    VOL32	secondary_stream_size;	/* 81fc */
+    VOL8	_pad8200[0xe8];		/* 8200 */
     VOL32	cur_y;			/* 82e8 */
-    VOL8	_pad4[0xc4];		/* 82ec */
-#endif
-    
-#if 0
-    VOL8	crt_vga_3b0;		/* 83b0 */
-    VOL8	crt_vga_3b1;		/* 83b1 */
-    VOL8	crt_vga_3b2;		/* 83b2 */
-    VOL8	crt_vga_3b3;		/* 83b3 */
-    VOL8	crt_vga_3b4;		/* 83b4 */
-    VOL8	crt_vga_3b5;		/* 83b5 */
-    VOL8	crt_vga_3b6;		/* 83b6 */
-    VOL8	crt_vga_3b7;    	/* 83b7 */
-    VOL8	crt_vga_3b8;    	/* 83b8 */
-    VOL8	crt_vga_3b9;    	/* 83b9 */
-    VOL8	crt_vga_3ba;		/* 83ba */
-    VOL8	crt_vga_3bb;		/* 83bb */
-    VOL8	crt_vga_3bc;		/* 83bc */
-    VOL8	crt_vga_3bd;		/* 83bd */
-    VOL8	crt_vga_3be;		/* 83be */
-    VOL8	crt_vga_3bf;		/* 83bf */
-    
-    VOL8	crt_vga_3c0;		/* 83c0 */
-    VOL8	crt_vga_3c1;		/* 83c1 */
-    VOL8	crt_vga_3c2;		/* 83c2 */
-    VOL8	crt_vga_3c3;		/* 83c3 */
-    VOL8	crt_vga_3c4;		/* 83c4 */
-    VOL8	crt_vga_3c5;		/* 83c5 */
-    VOL8	crt_vga_dac_ad_mk;	/* 83c6 */
-    VOL8	crt_vga_dac_rd_ad;    	/* 83c7 */
-    VOL8	crt_vga_dac_wt_ad;    	/* 83c8 */
-    VOL8	crt_vga_dac_data;    	/* 83c9 */
-    VOL8	crt_vga_3ca;		/* 83ca */
-    VOL8	crt_vga_3cb;		/* 83cb */
-    VOL8	crt_vga_3cc;		/* 83cc */
-    VOL8	crt_vga_3cd;		/* 83cd */
-    VOL8	crt_vga_3ce;		/* 83ce */
-    VOL8	crt_vga_3cf;		/* 83cf */
-    
-    VOL8	crt_vga_3d0;		/* 83d0 */
-    VOL8	crt_vga_3d1;		/* 83d1 */
-    VOL8	crt_vga_3d2;		/* 83d2 */
-    VOL8	crt_vga_3d3;		/* 83d3 */
-    VOL8	crt_vga_3d4;		/* 83d4 */
-    VOL8	crt_vga_3d5;		/* 83d5 */
-    VOL8	crt_vga_3d6;		/* 83d6 */
-    VOL8	crt_vga_3d7;    	/* 83d7 */
-    VOL8	crt_vga_3d8;    	/* 83d8 */
-    VOL8	crt_vga_3d9;    	/* 83d9 */
-    VOL8	crt_vga_status_1;    	/* 83da */
-    VOL8	crt_vga_3db;		/* 83db */
-    VOL8	crt_vga_3dc;		/* 83dc */
-    VOL8	crt_vga_3dd;		/* 83dd */
-    VOL8	crt_vga_3de;		/* 83de */
-    VOL8	crt_vga_3df;		/* 83df */
-    
-    VOL8	_pad5[0x124];		/* 83e0 */
-    VOL16	subsys_status;		/* 8504 */
-    VOL8	_pad6[0x6];		/* 8506 */
-    VOL32	subsys_status;		/* 8504 */
-    VOL8	_pad6[0x4];		/* 8508 */
-    VOL16	adv_control;		/* 850c */
-    VOL8	_pad7[0x1da];		/* 850e */
-    VOL16	cur_x;			/* 86e8 */
-    VOL8	_pad8[0x3fe];		/* 86ea */
-    VOL16	desty_axstp;		/* 8ae8 */
-    VOL8	_pad9[0x3fe];		/* 8aea */
-    VOL16	destx_diastp;		/* 8ee8 */
-    VOL8	_pad10[0x3fe];		/* 8eea */
-    VOL16	enh_err_term;		/* 92e8 */
-    VOL8	_pad11[0x3fe];		/* 92ea */
-    VOL16	maj_axis_pcnt;		/* 96e8 */
-    VOL8	_pad12[0x3fe];		/* 96ea */
-    VOL16	enh_cmd_gp_stat;    	/* 9ae8 */
-    VOL8	_pad13[0x3fe];		/* 9aea */
-    VOL16	enh_short_stroke;    	/* 9ee8 */
-    VOL8	_pad14[0x3fe];		/* 9eea */
-    VOL16	enh_bg;			/* a2e8 */
-    VOL8	_pad15[0x3fe];		/* a2ea */
-    VOL16	enh_fg;			/* a6e8 */
-    VOL8	_pad16[0x3fe];		/* a6ea */
-    VOL16	enh_wrt_mask;		/* aae8 */
-    VOL8	_pad17[0x3fe];		/* aaea */
-    VOL16	enh_rd_mask;	    	/* aee8 */
-    VOL8	_pad18[0x3fe];		/* aeea */
-    VOL16	enh_color_cmp;		/* b2e8 */
-    VOL8	_pad19[0x3fe];		/* b2ea */
-    VOL16	enh_bg_mix;    		/* b6e8 */
-    VOL8	_pad20[0x3fe];		/* b6ea */
-    VOL16	enh_fg_mix;    		/* bae8 */
-    VOL8	_pad21[0x3fe];		/* baea */
-    VOL16	enh_rd_reg_dt;		/* bee8 */
-    VOL8	_pad22[0x23fe];		/* beea */
-#else
-    VOL8	_pad_reg[0x5f38];	/* 83b0 */
-#endif
+    VOL8	_pad4[0x14];		/* 82ec */
+    VOL32	primary_stream_mem;	/* 8300 */
+    VOL32	secondary_stream_mem;	/* 8304 */
+    VOL8	_pad8308[0xD2];		/* 8308 */
+    VOL8	input_status_1;		/* 83da */
+    VOL8	_pad83db[0x131];	/* 83db */
+    VOL32	adv_func_cntl;		/* 850c */
+    VOL8	_pad8510[0x5dd8];	/* 8510 */
     VOL32	pix_trans;		/* e2e8 */
-    
-    VOL8	_pad23[0x3a974];	/*  e2ec */
+    VOL8	_pade2ec[0x3a92c];	/*  e2ec */
+    VOL32	cmd_overflow_buf_ptr;	/* 48c18 */
+    VOL8	_pad48c1c[0x8];		/* 48c1c */
+    VOL32	bci_power_management;	/* 48c24 */
+    VOL8	_pad48c28[0x38];	/* 48c28 */
     VOL32	alt_status_0;		/* 48c60 */
     VOL32	alt_status_1;		/* 48c64 */
 } S3, *S3Ptr;
@@ -368,6 +295,22 @@
 #define COLCMPOP_GT	0x0038
 #define	PLANEMODE	0x0004
 
+/* Multifunction Control Misc 8144 */
+#define MISC_DST_BA_0	(0x0 << 0)
+#define MISC_DST_BA_1	(0x1 << 0)
+#define MISC_DST_BA_2	(0x2 << 0)
+#define MISC_DST_BA_3	(0x3 << 0)
+#define MISC_SRC_BA_0	(0x0 << 2)
+#define MISC_SRC_BA_1	(0x1 << 2)
+#define MISC_SRC_BA_2	(0x2 << 2)
+#define MISC_SRC_BA_3	(0x3 << 2)
+#define MISC_RSF	(1 << 4)
+#define MISC_EXT_CLIP	(1 << 5)
+#define MISC_SRC_NE	(1 << 7)
+#define MISC_ENB_CMP	(1 << 8)
+#define MISC_32B	(1 << 9)
+#define MISC_DC		(1 << 11)
+#define MISC_INDEX_E	(0xe << 12)
 
 #define S3_SAVAGE4_SLOTS    0x0001ffff
 #define S3_SAVAGE4_2DI	    0x00800000
@@ -393,8 +336,7 @@
 }
     
 #define _s3WaitEmpty(s3)	_s3WaitLoop(s3,S3_SAVAGE4_SLOTS, 0)
-#define _s3WaitIdleEmpty(s3)	_s3WaitLoop(s3,S3_SAVAGE4_SLOTS|S3_SAVAGE4_2DI, \
-					    S3_SAVAGE4_2DI)
+#define _s3WaitIdleEmpty(s3)	_s3WaitLoop(s3,S3_SAVAGE4_SLOTS|S3_SAVAGE4_2DI, S3_SAVAGE4_2DI)
 #define _s3WaitIdle(s3)		_s3WaitLoop(s3,S3_SAVAGE4_2DI, S3_SAVAGE4_2DI)
 
 typedef struct _s3Cursor {
@@ -457,8 +399,22 @@
     CARD32		bg;
     CARD32		global_bitmap_1;
     CARD32		global_bitmap_2;
+    CARD32		adv_func_cntl;
     CARD32		primary_bitmap_1;
     CARD32		primary_bitmap_2;
+    CARD32		secondary_bitmap_1;
+    CARD32		secondary_bitmap_2;
+    CARD32		primary_stream_control;
+    CARD32		blend_control;
+    CARD32		primary_stream_addr_0;
+    CARD32		primary_stream_addr_1;
+    CARD32		primary_stream_stride;
+    CARD32		primary_stream_xy;
+    CARD32		primary_stream_size;
+    CARD32		primary_stream_mem;
+    CARD32		secondary_stream_xy;
+    CARD32		secondary_stream_size;
+    CARD32		streams_fifo;
     CARD8		text_save[S3_TEXT_SAVE];
 } S3Save;
 
@@ -473,18 +429,29 @@
     Bool	bios_initialized;   /* whether the bios has been run */
 } S3CardInfo;
 
-typedef struct _s3ScreenInfo {
-    CARD8	*cursor_base;	    /* pointer to cursor area */
+typedef struct _s3FbInfo {
     CARD8	*offscreen;	    /* pointer to offscreen area */
     int		offscreen_y;	    /* top y coordinate of offscreen area */
     int		offscreen_x;	    /* top x coordinate of offscreen area */
     int		offscreen_width;    /* width of offscreen area */
     int		offscreen_height;   /* height of offscreen area */
-    S3Cursor	cursor;
     S3Patterns	patterns;
+    CARD32	bitmap_offset;
+    int		accel_stride;
+    int		accel_bpp;
+} S3FBInfo;
+    
+typedef struct _s3ScreenInfo {
+    CARD8	*cursor_base;	    /* pointer to cursor area */
+    S3Cursor	cursor;
     Bool	manage_border;
     Bool	managing_border;
+    Bool	use_streams;
+    int		primary_depth;
+    int		current_ma;
     CARD32	border_pixel;
+    S3FBInfo	fb[KD_MAX_FB];
+    int		fbmap[KD_MAX_FB+1];   /* map from fb to stream */
 } S3ScreenInfo;
 
 #define getS3CardInfo(kd)   ((S3CardInfo *) ((kd)->card->driver))
@@ -505,18 +472,21 @@
 void	s3CursorFini (ScreenPtr pScreen);
 void	s3RecolorCursor (ScreenPtr pScreen, int ndef, xColorItem *pdefs);
 
+void	s3DumbPaintWindow (WindowPtr pWin, RegionPtr pRegion, int what);
+void	s3DumbCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
+    
 Bool	s3DrawInit (ScreenPtr pScreen);
 void	s3DrawEnable (ScreenPtr pScreen);
 void	s3DrawSync (ScreenPtr pScreen);
 void	s3DrawDisable (ScreenPtr pScreen);
 void	s3DrawFini (ScreenPtr pScreen);
 
-void	s3GetColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs);
-void	s3PutColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs);
+void	s3GetColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs);
+void	s3PutColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs);
 
 void	S3InitCard (KdCardAttr *attr);
 
-void	s3GetClock (int target, int *Mp, int *Np, int *Rp, int maxM, int maxN, int maxR);
+void	s3GetClock (int target, int *Mp, int *Np, int *Rp, int maxM, int maxN, int maxR, int minVco);
 
 extern KdCardFuncs  s3Funcs;
 
@@ -538,6 +508,13 @@
     while (s3GetImm(s3vga, s3_vertical_sync_active) != 0) S3_RETRACE_LOOP_CHECK; \
     _loop_count = 0; \
     while (s3GetImm(s3vga, s3_vertical_sync_active) == 0) S3_RETRACE_LOOP_CHECK; \
+}
+#define _s3WaitVRetraceFast(s3) { \
+    int _loop_count; \
+    _loop_count = 0; \
+    while (s3->input_status_1 & 8) S3_RETRACE_LOOP_CHECK; \
+    _loop_count = 0; \
+    while ((s3->input_status_1 & 8) == 0) S3_RETRACE_LOOP_CHECK; \
 }
 /*
  * Wait for the begining of the retrace interval
Index: xc/programs/Xserver/hw/kdrive/savage/s3clock.c
diff -u xc/programs/Xserver/hw/kdrive/savage/s3clock.c:1.3 xc/programs/Xserver/hw/kdrive/savage/s3clock.c:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3clock.c:1.3	Wed Feb 23 12:30:02 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3clock.c	Sat May  6 15:17:45 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */
 
 #include "s3.h"
 
@@ -41,11 +41,9 @@
  */
  
 /* all in kHz */
-#define MIN_VCO	135000.0
-#define MAX_VCO 270000.0
 
 void
-s3GetClock (int target, int *Mp, int *Np, int *Rp, int maxM, int maxN, int maxR)
+s3GetClock (int target, int *Mp, int *Np, int *Rp, int maxM, int maxN, int maxR, int minVco)
 {
     int	    M, N, R, bestM, bestN;
     int	    f_vco, f_out;
@@ -57,15 +55,15 @@
     for (R = 0; R <= maxR; R++)
     {
 	f_vco = target * (1 << R);
-	if (f_vco >= MIN_VCO)
+	if (f_vco >= minVco)
 	    break;
     }
 
     /* M = f_out / f_ref * ((N + 2) * (1 << R)); */
     besterr = target;
-    for (N = 0; N <= maxN; N++)
+    for (N = 1; N <= maxN; N++)
     {
-	M = (target * (N + 2) * (1 << R) + (S3_CLOCK_REF/2)) / S3_CLOCK_REF - 2;
+	M = ((target * (N + 2) * (1 << R) + (S3_CLOCK_REF/2)) + S3_CLOCK_REF/2) / S3_CLOCK_REF - 2;
 	if (0 <= M && M <= maxM)
 	{
 	    f_out = S3_CLOCK(M,N,R);
Index: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c
diff -u xc/programs/Xserver/hw/kdrive/savage/s3cmap.c:1.3 xc/programs/Xserver/hw/kdrive/savage/s3cmap.c:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3cmap.c:1.3	Wed Feb 23 12:30:02 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3cmap.c	Sat May  6 15:17:45 2000
@@ -22,12 +22,12 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */
 
 #include "s3.h"
 
 void
-s3GetColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs)
+s3GetColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs)
 {
     KdScreenPriv(pScreen);
     s3CardInfo(pScreenPriv);
@@ -44,7 +44,7 @@
 }
 
 void
-s3PutColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs)
+s3PutColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs)
 {
     KdScreenPriv(pScreen);
     s3CardInfo(pScreenPriv);
@@ -53,7 +53,12 @@
     Bool    hit_border = FALSE;
     Bool    check_border = FALSE;
 
+#if 0
     _s3WaitVRetrace (s3vga);
+#else
+    S3Ptr   s3 = s3c->s3;
+    _s3WaitVRetraceFast(s3);
+#endif
     if (pScreenPriv->enabled && s3s->manage_border && !s3s->managing_border)
 	check_border = TRUE;
     while (ndef--)
@@ -77,10 +82,10 @@
 	black.green = 0;
 	black.blue = 0;
 	s3s->managing_border = TRUE;
-	FakeAllocColor (pScreenPriv->pInstalledmap,
+	FakeAllocColor (pScreenPriv->pInstalledmap[fb],
 			&black);
 	s3s->border_pixel = black.pixel;
-	FakeFreeColor (pScreenPriv->pInstalledmap, s3s->border_pixel);
+	FakeFreeColor (pScreenPriv->pInstalledmap[fb], s3s->border_pixel);
 /*	s3SetImm (&s3c->s3vga, s3_border_color, (VGA8) s3s->border_pixel); */
     }
 }
Index: xc/programs/Xserver/hw/kdrive/savage/s3curs.c
diff -u xc/programs/Xserver/hw/kdrive/savage/s3curs.c:1.3 xc/programs/Xserver/hw/kdrive/savage/s3curs.c:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3curs.c:1.3	Wed Feb 23 12:30:03 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3curs.c	Sat May  6 15:17:46 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.4 2000/05/06 22:17:46 keithp Exp $ */
 
 #include "s3.h"
 #include "s3draw.h"
@@ -90,24 +90,42 @@
     _s3MoveCursor (pScreen, x, y);
 }
 
+#define S3Trunc(c)  (((c) >> 8) & 0xff)
+
+#define S3CursColor(r,g,b)  ((S3Trunc(r) << 16) | \
+			     (S3Trunc(g) << 8) | \
+			     (S3Trunc(b)))
+
 static void
 s3AllocCursorColors (ScreenPtr pScreen)
 {
     SetupCursor (pScreen);
     CursorPtr	    pCursor = pCurPriv->pCursor;
     
-    KdAllocateCursorPixels (pScreen, pCursor, 
-			    &pCurPriv->source, &pCurPriv->mask);
-    switch (pScreenPriv->screen->bitsPerPixel) {
-    case 4:
-	pCurPriv->source |= pCurPriv->source << 4;
-	pCurPriv->mask |= pCurPriv->mask << 4;
-    case 8:
-	pCurPriv->source |= pCurPriv->source << 8;
-	pCurPriv->mask |= pCurPriv->mask << 8;
-    case 16:
-	pCurPriv->source |= pCurPriv->source << 16;
-	pCurPriv->mask |= pCurPriv->mask << 16;
+    if (s3s->use_streams)
+    {
+	pCurPriv->source = S3CursColor(pCursor->foreRed,
+				       pCursor->foreGreen,
+				       pCursor->foreBlue);
+	pCurPriv->mask = S3CursColor(pCursor->backRed,
+				     pCursor->backGreen,
+				     pCursor->backBlue);
+    }
+    else
+    {
+	KdAllocateCursorPixels (pScreen, 0, pCursor, 
+				&pCurPriv->source, &pCurPriv->mask);
+	switch (pScreenPriv->screen->fb[0].bitsPerPixel) {
+	case 4:
+	    pCurPriv->source |= pCurPriv->source << 4;
+	    pCurPriv->mask |= pCurPriv->mask << 4;
+	case 8:
+	    pCurPriv->source |= pCurPriv->source << 8;
+	    pCurPriv->mask |= pCurPriv->mask << 8;
+	case 16:
+	    pCurPriv->source |= pCurPriv->source << 16;
+	    pCurPriv->mask |= pCurPriv->mask << 16;
+	}
     }
 }
 
@@ -221,6 +239,13 @@
 		
 	    S3AdjustBits32(and);
 	    S3AdjustBits32(xor);
+#define S3SwapNibbles(x)    ((x) = (((x) & 0x0f0f0f0f) << 4 | \
+				    ((x) >> 4) & 0x0f0f0f0f))
+	    if (s3s->use_streams)
+	    {
+		S3SwapNibbles(and);
+		S3SwapNibbles(xor);
+	    }
 	    *ram++ = (and & 0xffff) | (xor << 16);
 	    *ram++ = (and >> 16) | (xor & 0xffff0000);
 	}
Index: xc/programs/Xserver/hw/kdrive/savage/s3draw.c
diff -u xc/programs/Xserver/hw/kdrive/savage/s3draw.c:1.3 xc/programs/Xserver/hw/kdrive/savage/s3draw.c:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3draw.c:1.3	Wed Feb 23 12:30:03 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3draw.c	Sat May  6 15:17:46 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.4 2000/05/06 22:17:46 keithp Exp $ */
 
 #include	"s3.h"
 #include	"s3draw.h"
@@ -114,6 +114,7 @@
 	return;
     }
     
+    s3SetGlobalBitmap (pDstDrawable->pScreen, s3GCMap (pGC));
     _s3SetBlt(s3,pGC->alu,pGC->planemask);
     DRAW_DEBUG ((DEBUG_RENDER, "s3CopyNtoN alu %d planemask 0x%x",
 		pGC->alu, pGC->planemask));
@@ -265,6 +266,7 @@
 	return;
     }
     
+    s3SetGlobalBitmap (pDstDrawable->pScreen, s3GCMap (pGC));
     fbGetStipDrawable (pSrcDrawable, psrcBase, widthSrc, srcBpp);
     
     if (args->opaque)
@@ -345,6 +347,7 @@
     SetupS3(pDrawable->pScreen);
     register int	r;
 
+    s3SetGlobalBitmap (pDrawable->pScreen, s3DrawMap (pDrawable));
     _s3SetSolidFill(s3,pixel,alu,planemask);
     
     while (nBox--) {
@@ -355,13 +358,13 @@
 }
 
 void
-_s3SetPattern (ScreenPtr pScreen,
+_s3SetPattern (ScreenPtr pScreen, int ma,
 	      int alu, unsigned long planemask, s3PatternPtr pPattern)
 {
     SetupS3(pScreen);
     S3PatternCache  *cache;
     
-    _s3LoadPattern (pScreen, pPattern);
+    _s3LoadPattern (pScreen, ma, pPattern);
     cache = pPattern->cache;
     
     switch (pPattern->fillStyle) {
@@ -385,7 +388,8 @@
     S3PatternCache    	*cache;
     int			patx, paty;
 
-    _s3SetPattern (pDrawable->pScreen, alu, planemask, pPattern);
+    s3SetGlobalBitmap (pDrawable->pScreen, s3DrawMap (pDrawable));
+    _s3SetPattern (pDrawable->pScreen, s3DrawMap(pDrawable), alu, planemask, pPattern);
     cache = pPattern->cache;
     while (nBox--) 
     {
@@ -415,6 +419,7 @@
     stipHeight = pStipple->height;
     fbGetStipDrawable (pStipple, stip, stipStride, stipBpp);
 
+    s3SetGlobalBitmap (pDrawable->pScreen, s3DrawMap (pDrawable));
     if (pGC->fillStyle == FillOpaqueStippled)
     {
 	_s3SetOpaquePlaneBlt(s3,pGC->alu,pGC->planemask,
@@ -648,6 +653,7 @@
     int		stipWidth, stipHeight;
     int		dstX, dstY, width, height;
     
+    s3SetGlobalBitmap (pDrawable->pScreen, s3GCMap (pGC));
     stipWidth = pStipple->width;
     stipHeight = pStipple->height;
     fbGetStipDrawable (pStipple, stip, stipStride, stipBpp);
@@ -711,6 +717,7 @@
     S3PatternCache  *cache;
     RegionPtr	    pClip = fbGetCompositeClip (pGC);
 
+    s3SetGlobalBitmap (pDrawable->pScreen, s3GCMap (pGC));
     if (REGION_NUM_RECTS(pClip) == 1 && 
 	(pGC->fillStyle == FillSolid  || s3Priv->pPattern))
     {
@@ -726,7 +733,7 @@
 	}
 	else
 	{
-	    _s3SetPattern (pDrawable->pScreen, pGC->alu, pGC->planemask,
+	    _s3SetPattern (pDrawable->pScreen, s3GCMap(pGC), pGC->alu, pGC->planemask,
 			   s3Priv->pPattern);
 	    cache = s3Priv->pPattern->cache;
 	}
@@ -793,7 +800,7 @@
 	}
 	else if (s3Priv->pPattern)
 	{
-	    _s3SetPattern (pDrawable->pScreen, pGC->alu, pGC->planemask,
+	    _s3SetPattern (pDrawable->pScreen, s3GCMap(pGC), pGC->alu, pGC->planemask,
 			   s3Priv->pPattern);
 	    cache = s3Priv->pPattern->cache;
 	    while (n--)
@@ -843,6 +850,7 @@
 static void
 _s3FillEllipse (DrawablePtr pDraw, S3Ptr s3, xArc *arc)
 {
+    KdScreenPriv(pDraw->pScreen);
     int x, y, e;
     int yk, xk, ym, xm, dx, dy, xorg, yorg;
     int	y_top, y_bot;
@@ -850,6 +858,7 @@
     register int xpos;
     int	slw;
 
+    s3SetGlobalBitmap (pDraw->pScreen, s3DrawMap (pDraw));
     miFillArcSetup(arc, &info);
     MIFILLARCSETUP();
     y_top = pDraw->y + yorg - y;
@@ -873,6 +882,7 @@
 static void
 _s3FillArcSlice (DrawablePtr pDraw, GCPtr pGC, S3Ptr s3, xArc *arc)
 {
+    KdScreenPriv(pDraw->pScreen);
     int yk, xk, ym, xm, dx, dy, xorg, yorg, slw;
     register int x, y, e;
     miFillArcRec info;
@@ -880,6 +890,7 @@
     int xl, xr, xc;
     int	y_top, y_bot;
 
+    s3SetGlobalBitmap (pDraw->pScreen, s3DrawMap (pDraw));
     DRAW_DEBUG ((DEBUG_ARCS, "slice %dx%d+%d+%d %d->%d",
 		 arc->width, arc->height, arc->x, arc->y,
 		 arc->angle1, arc->angle2));
@@ -1013,6 +1024,7 @@
 	return;
     }
     
+    s3SetGlobalBitmap (pDrawable->pScreen, s3GCMap (pGC));
     fbPriv = fbGetGCPrivate(pGC);
     sy = pDrawable->y;
     sx = pDrawable->x;
@@ -1258,6 +1270,7 @@
     Bool	    set;
     PixTransDeclare;
 
+    s3SetGlobalBitmap (pDrawable->pScreen, s3GCMap (pGC));
     x += pDrawable->x;
     y += pDrawable->y;
 
@@ -1408,6 +1421,7 @@
     unsigned char   alu;
     PixTransDeclare;
 
+    s3SetGlobalBitmap (pDrawable->pScreen, s3GCMap (pGC));
     x += pDrawable->x;
     y += pDrawable->y;
 
@@ -1549,6 +1563,7 @@
     CARD32	    tmp;
     PixTransDeclare;
 
+    s3SetGlobalBitmap (pDrawable->pScreen, s3GCMap (pGC));
     widthGlyph = FONTMAXBOUNDS(pfont,characterWidth);
     if (!widthGlyph)
 	return;
@@ -1701,6 +1716,7 @@
     unsigned int oc1;	/* outcode of point 1 */
     unsigned int oc2;	/* outcode of point 2 */
 
+    s3SetGlobalBitmap (pDrawable->pScreen, s3GCMap (pGC));
     nBox = REGION_NUM_RECTS (pClip);
     pBox = REGION_RECTS (pClip);
     CalcLineDeltas(x1, y1, x2, y2, adx, ady, signdx, signdy,
@@ -1875,6 +1891,7 @@
 			     
 Bool
 s3AllocPattern (ScreenPtr pScreen,
+		int ma,
 		PixmapPtr pPixmap, 
 		int xorg, int yorg,
 		int fillStyle, Pixel fg, Pixel bg,
@@ -1884,7 +1901,7 @@
     s3ScreenInfo(pScreenPriv);
     s3PatternPtr    pPattern;
     
-    if (s3s->patterns.cache && fillStyle != FillSolid &&
+    if (s3s->fb[ma].patterns.cache && fillStyle != FillSolid &&
 	s3CheckPattern (pPixmap->drawable.width, pPixmap->drawable.height))
     {
 	if (!(pPattern = *ppPattern))
@@ -1935,6 +1952,7 @@
 	break;
     }
     s3AllocPattern (pGC->pScreen,
+		    s3GCMap(pGC),
 		    pPixmap,
 		    pGC->patOrg.x + pGC->lastWinOrg.x,
 		    pGC->patOrg.y + pGC->lastWinOrg.y,
@@ -2005,27 +2023,33 @@
  * Place pattern image on screen; done with S3 locked
  */
 void
-_s3PutPattern (ScreenPtr pScreen, s3PatternPtr pPattern)
+_s3PutPattern (ScreenPtr pScreen, int ma, s3PatternPtr pPattern)
 {
     SetupS3(pScreen);
+    s3ScreenInfo(pScreenPriv);
     int		    x, y;
     CARD8	    *dstLine, *dst8;
     CARD16	    *dst16;
     CARD32	    *dst32;
     S3PatternCache  *cache = pPattern->cache;
+#ifdef S3_TRIO
+    int		    fb = 0;
+#else
+    int		    fb = s3s->fbmap[ma];
+#endif
     
     DRAW_DEBUG ((DEBUG_PATTERN, "_s3PutPattern 0x%x id %d to %d %d",
 		pPattern, pPattern->id, cache->x, cache->y));
     
-    dstLine = (pScreenPriv->screen->frameBuffer + 
-	       cache->y * pScreenPriv->screen->byteStride + 
-	       cache->x * pScreenPriv->bytesPerPixel);
+    dstLine = (pScreenPriv->screen->fb[fb].frameBuffer + 
+	       cache->y * pScreenPriv->screen->fb[fb].byteStride + 
+	       cache->x * pScreenPriv->bytesPerPixel[fb]);
     
     CheckSyncS3 (pScreen);
     
     for (y = 0; y < S3_TILE_SIZE; y++)
     {
-	switch (pScreenPriv->screen->bitsPerPixel) {
+	switch (pScreenPriv->screen->fb[fb].bitsPerPixel) {
 	case 8:
 	    dst8 = dstLine;
 	    for (x = 0; x < S3_TILE_SIZE; x++)
@@ -2051,7 +2075,7 @@
 		*dst32++ = s3FetchPatternPixel (pPattern, x, y);
 	    break;
 	}
-	dstLine += pScreenPriv->screen->byteStride;
+	dstLine += pScreenPriv->screen->fb[fb].byteStride;
     }
 }
 
@@ -2059,7 +2083,7 @@
  * Load a stipple to off-screen memory; done with S3 locked
  */
 void
-_s3LoadPattern (ScreenPtr pScreen, s3PatternPtr pPattern)
+_s3LoadPattern (ScreenPtr pScreen, int ma, s3PatternPtr pPattern)
 {
     SetupS3(pScreen);
     s3ScreenInfo(pScreenPriv);
@@ -2078,13 +2102,13 @@
     /*
      * Lame replacement strategy; assume we'll have plenty of room.
      */
-    cache = &s3s->patterns.cache[s3s->patterns.last_used];
-    if (++s3s->patterns.last_used == s3s->patterns.ncache)
-	s3s->patterns.last_used = 0;
-    cache->id = ++s3s->patterns.last_id;
+    cache = &s3s->fb[ma].patterns.cache[s3s->fb[ma].patterns.last_used];
+    if (++s3s->fb[ma].patterns.last_used == s3s->fb[ma].patterns.ncache)
+	s3s->fb[ma].patterns.last_used = 0;
+    cache->id = ++s3s->fb[ma].patterns.last_id;
     pPattern->id = cache->id;
     pPattern->cache = cache;
-    _s3PutPattern (pScreen, pPattern);
+    _s3PutPattern (pScreen, ma, pPattern);
 }
 
 void
@@ -2110,6 +2134,8 @@
 int
 s3CreateGC (GCPtr pGC)
 {
+    KdScreenPriv(pGC->pScreen);
+    s3ScreenInfo(pScreenPriv);
     s3PrivGCPtr  s3Priv;
     
     if (!fbCreateGC (pGC))
@@ -2121,17 +2147,30 @@
     s3Priv = s3GetGCPrivate(pGC);
     s3Priv->type = DRAWABLE_PIXMAP;
     s3Priv->pPattern = 0;
-    
+#ifndef S3_TRIO
+    if (pGC->depth == s3s->primary_depth)
+	s3Priv->ma = 0;
+    else
+	s3Priv->ma = 1;
+#endif
     return TRUE;
 }
 
 Bool
 s3CreateWindow (WindowPtr pWin)
 {
+    KdScreenPriv(pWin->drawable.pScreen);
+    s3ScreenInfo(pScreenPriv);
+    
     if (!KdCreateWindow (pWin))
 	return FALSE;
     pWin->devPrivates[s3WindowPrivateIndex].ptr = 0;
-    return TRUE;
+#ifndef S3_TRIO
+    if (pWin->drawable.depth != s3s->primary_depth)
+	return fbOverlayCreateWindow (pWin);
+    else
+#endif
+	return fbCreateWindow (pWin);
 }
 
 Bool
@@ -2146,6 +2185,7 @@
 Bool
 s3ChangeWindowAttributes (WindowPtr pWin, Mask mask)
 {
+    KdScreenPriv(pWin->drawable.pScreen);
     Bool	    ret;
     s3PatternPtr    pPattern;
     PixmapPtr	    pPixmap;
@@ -2165,7 +2205,9 @@
 	    fillStyle = FillSolid;
 	}
 	pPattern = s3GetWindowPrivate(pWin);
-	s3AllocPattern (pWin->drawable.pScreen, pPixmap, 
+	s3AllocPattern (pWin->drawable.pScreen,
+			s3DrawMap (&pWin->drawable),
+			pPixmap, 
 			pWin->drawable.x, pWin->drawable.y,
 			fillStyle, 0, 0, &pPattern);
 	DRAW_DEBUG ((DEBUG_PAINT_WINDOW, "Background pattern 0x%x pixmap 0x%x style %d",
@@ -2175,6 +2217,30 @@
     return ret;
 }
 
+#ifndef S3_TRIO
+void
+s3PaintChromaKey (WindowPtr pWin, RegionPtr pRegion)
+{
+    SetupS3 (pWin->drawable.pScreen);
+    s3ScreenInfo (pScreenPriv);
+    
+    if (pWin->drawable.depth != s3s->primary_depth)
+    {
+	int	    nBox = REGION_NUM_RECTS(pRegion);
+	BoxPtr	    pBox = REGION_RECTS(pRegion);
+	
+	s3SetGlobalBitmap (pWin->drawable.pScreen, 0);
+	_s3SetSolidFill(s3,0xffffffff,GXcopy,0xffffffff);
+	while (nBox--) 
+	{
+	    _s3SolidRect(s3,pBox->x1,pBox->y1,pBox->x2-pBox->x1,pBox->y2-pBox->y1);
+	    pBox++;
+	}
+	MarkSyncS3 (pWin->drawable.pScreen);
+    }
+}
+#endif
+
 void
 s3PaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
 {
@@ -2188,6 +2254,9 @@
 		 REGION_NUM_RECTS(pRegion)));
     if (!REGION_NUM_RECTS(pRegion)) 
 	return;
+#ifndef S3_TRIO
+    s3PaintChromaKey (pWin, pRegion);
+#endif
     switch (what) {
     case PW_BACKGROUND:
 	switch (pWin->backgroundState) {
@@ -2234,11 +2303,24 @@
 }
 
 void
+s3RestoreAreas(PixmapPtr    pPixmap,
+	       RegionPtr    prgnRestore,
+	       int	    xorg,
+	       int	    yorg,
+	       WindowPtr    pWin)
+{
+#ifndef S3_TRIO
+    s3PaintChromaKey (pWin, prgnRestore);
+#endif
+    KdCheckRestoreAreas (pPixmap, prgnRestore, xorg, yorg, pWin);
+}
+    
+void
 s3CopyWindowProc (DrawablePtr pSrcDrawable,
 		  DrawablePtr pDstDrawable,
 		  GCPtr       pGC,
-		  BoxPtr      pbox,
-		  int         nbox,
+		  BoxPtr      pboxOrig,
+		  int         nboxOrig,
 		  int         dx,
 		  int         dy,
 		  Bool        reverse,
@@ -2247,42 +2329,67 @@
 		  void        *closure)
 {
     SetupS3(pDstDrawable->pScreen);
+    s3ScreenInfo(pScreenPriv);
     int	    srcX, srcY, dstX, dstY;
+    int	    x1, x2;
     int	    w, h;
     int	    flags;
-    
-    _s3SetBlt(s3,GXcopy,~0);
-    while (nbox--)
+    int	    ma;
+    BoxPtr  pbox;
+    int     nbox;
+    
+    if (pSrcDrawable->bitsPerPixel == 24)
+	dx *= 3;
+#ifdef S3_TRIO
+    ma = 0;
+#else
+    for (ma = 0; s3s->fbmap[ma] >= 0; ma++)
+#endif
     {
-	w = pbox->x2 - pbox->x1;
-	h = pbox->y2 - pbox->y1;
-	flags = 0;
-	if (reverse)
-	{
-	    dstX = pbox->x2 - 1;
-	}
-	else
-	{
-	    dstX = pbox->x1;
-	    flags |= INC_X;
-	}
-	srcX = dstX + dx;
-	
-	if (upsidedown)
-	{
-	    dstY = pbox->y2 - 1;
-	}
-	else
-	{
-	    dstY = pbox->y1;
-	    flags |= INC_Y;
+	nbox = nboxOrig;
+	pbox = pboxOrig;
+	s3SetGlobalBitmap (pDstDrawable->pScreen, ma);
+	_s3SetBlt(s3,GXcopy,~0);
+	while (nbox--)
+	{
+	    x1 = pbox->x1;
+	    x2 = pbox->x2;
+	    if (pSrcDrawable->bitsPerPixel == 24)
+	    {
+		x1 *= 3;
+		x2 *= 3;
+	    }
+	    
+	    w = x2 - x1;
+	    h = pbox->y2 - pbox->y1;
+	    flags = 0;
+	    if (reverse)
+	    {
+		dstX = x2 - 1;
+	    }
+	    else
+	    {
+		dstX = x1;
+		flags |= INC_X;
+	    }
+	    srcX = dstX + dx;
+	    
+	    if (upsidedown)
+	    {
+		dstY = pbox->y2 - 1;
+	    }
+	    else
+	    {
+		dstY = pbox->y1;
+		flags |= INC_Y;
+	    }
+	    srcY = dstY + dy;
+	    
+	    _s3Blt (s3, srcX, srcY, dstX, dstY, w, h, flags);
+	    pbox++;
 	}
-	srcY = dstY + dy;
-	
-	_s3Blt (s3, srcX, srcY, dstX, dstY, w, h, flags);
-	pbox++;
+	MarkSyncS3 (pDstDrawable->pScreen);
     }
-    MarkSyncS3 (pDstDrawable->pScreen);
 }
 
 void 
@@ -2311,115 +2418,797 @@
     REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
 }
 
-Bool
-s3DrawInit (ScreenPtr pScreen)
+void
+s3_24FillBoxSolid (DrawablePtr pDrawable, int nBox, BoxPtr pBox, 
+		  unsigned long pixel, int alu, unsigned long planemask)
 {
-    KdScreenPriv(pScreen);
-    s3ScreenInfo(pScreenPriv);
-    int		    ncache_w, ncache_h, ncache;
-    int		    px, py;
-    S3PatternCache  *cache;
+    SetupS3(pDrawable->pScreen);
+    register int	r;
+    int			x1, x2;
 
-    switch (pScreenPriv->screen->bitsPerPixel) {
-    case 8:
-    case 16:
-    case 32:
-	break;
-    default:
-	return FALSE;
+    s3SetGlobalBitmap (pDrawable->pScreen, s3DrawMap (pDrawable));
+    _s3SetSolidFill(s3,pixel,alu,planemask);
+    
+    while (nBox--) {
+	x1 = pBox->x1 * 3;
+	x2 = pBox->x2 * 3;
+	_s3SolidRect(s3,x1,pBox->y1,x2-x1,pBox->y2-pBox->y1);
+	pBox++;
     }
-    if (serverGeneration != s3Generation)
+    MarkSyncS3 (pDrawable->pScreen);
+}
+
+#define ok24(p)	(((p) & 0xffffff) == ((((p) & 0xff) << 16) | (((p) >> 8) & 0xffff)))
+
+void
+s3_24FillSpans (DrawablePtr pDrawable, GCPtr pGC, int n, 
+		 DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+    SetupS3(pDrawable->pScreen);
+    int		    x, y, x1, y1, x2, y2;
+    int		    width;
+				/* next three parameters are post-clip */
+    int		    nTmp;
+    int		    *pwidthFree;/* copies of the pointers to free */
+    DDXPointPtr	    pptFree;
+    FbGCPrivPtr	    fbPriv = fbGetGCPrivate(pGC);
+    BoxPtr	    extents;
+    RegionPtr	    pClip = fbGetCompositeClip (pGC);
+
+    if (pGC->fillStyle != FillSolid || !ok24 (pGC->fgPixel) || !ok24(pGC->planemask))
     {
-	s3GCPrivateIndex = AllocateGCPrivateIndex ();
-	s3WindowPrivateIndex = AllocateWindowPrivateIndex ();
-	s3Generation = serverGeneration;
+	KdCheckFillSpans (pDrawable,  pGC, n, ppt, pwidth, fSorted);
+	return;
     }
-    if (!AllocateWindowPrivate(pScreen, s3WindowPrivateIndex, 0))
-	return FALSE;
-    if (!AllocateGCPrivate(pScreen, s3GCPrivateIndex, sizeof (s3PrivGCRec)))
-	return FALSE;
-    /*
-     * Hook up asynchronous drawing
-     */
-    RegisterSync (pScreen);
-    /*
-     * Replace various fb screen functions
-     */
-    pScreen->CreateGC = s3CreateGC;
-    pScreen->CreateWindow = s3CreateWindow;
-    pScreen->ChangeWindowAttributes = s3ChangeWindowAttributes;
-    pScreen->DestroyWindow = s3DestroyWindow;
-    pScreen->PaintWindowBackground = s3PaintWindow;
-    pScreen->PaintWindowBorder = s3PaintWindow;
-    pScreen->CopyWindow = s3CopyWindow;
     
-    /*
-     * Initialize patterns
-     */
-    ncache_w = s3s->offscreen_width / S3_TILE_SIZE;
-    ncache_h = s3s->offscreen_height / S3_TILE_SIZE;
-    ncache = ncache_w * ncache_h;
-    DRAW_DEBUG ((DEBUG_S3INIT, "ncache_w %d ncache_h %d ncache %d",
-		 ncache_w, ncache_h, ncache));
-    s3s->patterns.cache = (S3PatternCache *) xalloc (ncache * sizeof (S3PatternCache));
-    if (s3s->patterns.cache)
-    {
-	DRAW_DEBUG ((DEBUG_S3INIT, "Have pattern cache"));
-	s3s->patterns.ncache = ncache;
-	s3s->patterns.last_used = 0;
-	s3s->patterns.last_id = 0;
-	cache = s3s->patterns.cache;
-	for (py = 0; py < ncache_h; py++)
-	    for (px = 0; px < ncache_w; px++)
-	    {
-		cache->id = 0;
-		cache->x = s3s->offscreen_x + px * S3_TILE_SIZE;
-		cache->y = s3s->offscreen_y + py * S3_TILE_SIZE;
-		cache++;
+    s3SetGlobalBitmap (pDrawable->pScreen, s3GCMap (pGC));
+    if (REGION_NUM_RECTS(pClip) == 1)
+    {
+	extents = REGION_RECTS(pClip);
+	x1 = extents->x1;
+	x2 = extents->x2;
+	y1 = extents->y1;
+	y2 = extents->y2;
+	_s3SetSolidFill(s3,pGC->fgPixel,pGC->alu,pGC->planemask);
+	while (n--)
+	{
+	    y = ppt->y;
+	    if (y1 <= y && y < y2)
+	    {
+		x = ppt->x;
+		width = *pwidth;
+		if (x < x1)
+		{
+		    width -= (x1 - x);
+		    x = x1;
+		}
+		if (x2 < x + width)
+		    width = x2 - x;
+		if (width > 0)
+		{
+		    _s3SolidRect(s3,x*3,y,width*3,1);
+		}
 	    }
+	    ppt++;
+	    pwidth++;
+	}
     }
-    return TRUE;
+    else
+    {
+	nTmp = n * miFindMaxBand(pClip);
+	pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
+	pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
+	if(!pptFree || !pwidthFree)
+	{
+	    if (pptFree) DEALLOCATE_LOCAL(pptFree);
+	    if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
+	    return;
+	}
+	n = miClipSpans(fbGetCompositeClip(pGC),
+			ppt, pwidth, n,
+			pptFree, pwidthFree, fSorted);
+	pwidth = pwidthFree;
+	ppt = pptFree;
+	_s3SetSolidFill(s3,pGC->fgPixel,pGC->alu,pGC->planemask);
+	while (n--)
+	{
+	    x = ppt->x;
+	    y = ppt->y;
+	    ppt++;
+	    width = *pwidth++;
+	    if (width)
+	    {
+		_s3SolidRect(s3,x*3,y,width*3,1);
+	    }
+	}
+	DEALLOCATE_LOCAL(pptFree);
+	DEALLOCATE_LOCAL(pwidthFree);
+    }
+    MarkSyncS3 (pDrawable->pScreen);
 }
 
 void
-s3DrawEnable (ScreenPtr pScreen)
+s3_24CopyNtoN (DrawablePtr  pSrcDrawable,
+	       DrawablePtr  pDstDrawable,
+	       GCPtr	    pGC,
+	       BoxPtr	    pbox,
+	       int	    nbox,
+	       int	    dx,
+	       int	    dy,
+	       Bool	    reverse,
+	       Bool	    upsidedown,
+	       Pixel	    bitplane,
+	       void	    *closure)
 {
-    SetupS3(pScreen);
-    s3ScreenInfo(pScreenPriv);
-    int	    c;
+    SetupS3(pDstDrawable->pScreen);
+    int	    srcX, srcY, dstX, dstY;
+    int	    w, h;
+    int	    flags;
+    int	    x1, x2;
     
-    /*
-     * Flush pattern cache
-     */
-    for (c = 0; c < s3s->patterns.ncache; c++)
-	s3s->patterns.cache[c].id = 0;
+    if (sourceInvarient (pGC->alu))
+    {
+	s3_24FillBoxSolid (pDstDrawable, nbox, pbox, 0, pGC->alu, pGC->planemask);
+	return;
+    }
     
-    _s3WaitIdleEmpty (s3);
-    _s3SetScissorsTl(s3, 0, 0);
-    _s3SetScissorsBr(s3, pScreenPriv->screen->width - 1, pScreenPriv->screen->height - 1);
-    _s3SetSolidFill(s3, pScreen->blackPixel, GXcopy, ~0);
-    _s3SolidRect (s3, 0, 0, pScreenPriv->screen->width, pScreenPriv->screen->height);
-    MarkSyncS3 (pScreen);
+    s3SetGlobalBitmap (pDstDrawable->pScreen, s3GCMap (pGC));
+    _s3SetBlt(s3,pGC->alu,pGC->planemask);
+    DRAW_DEBUG ((DEBUG_RENDER, "s3CopyNtoN alu %d planemask 0x%x",
+		 pGC->alu, pGC->planemask));
+    dx *= 3;
+    while (nbox--)
+    {
+	x1 = pbox->x1 * 3;
+	x2 = pbox->x2 * 3;
+	w = x2 - x1;
+	h = pbox->y2 - pbox->y1;
+	flags = 0;
+	if (reverse)
+	{
+	    dstX = x2 - 1;
+	}
+	else
+	{
+	    dstX = x1;
+	    flags |= INC_X;
+	}
+	srcX = dstX + dx;
+	
+	if (upsidedown)
+	{
+	    dstY = pbox->y2 - 1;
+	}
+	else
+	{
+	    dstY = pbox->y1;
+	    flags |= INC_Y;
+	}
+	srcY = dstY + dy;
+	
+	_s3Blt (s3, srcX, srcY, dstX, dstY, w, h, flags);
+	pbox++;
+    }
+    MarkSyncS3 (pSrcDrawable->pScreen);
 }
 
-void
-s3DrawDisable (ScreenPtr pScreen)
+RegionPtr
+s3_24CopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
+	   int srcx, int srcy, int width, int height, int dstx, int dsty)
 {
-    SetupS3 (pScreen);
-    _s3WaitIdleEmpty (s3);
+    SetupS3(pDstDrawable->pScreen);
+    
+    if (pSrcDrawable->type == DRAWABLE_WINDOW &&
+	pDstDrawable->type == DRAWABLE_WINDOW &&
+	ok24(pGC->planemask))
+    {
+	return fbDoCopy (pSrcDrawable, pDstDrawable, pGC, 
+			 srcx, srcy, width, height, 
+			 dstx, dsty, s3_24CopyNtoN, 0, 0);
+    }
+    return KdCheckCopyArea (pSrcDrawable, pDstDrawable, pGC, 
+			    srcx, srcy, width, height, dstx, dsty);
 }
 
+
+#define NUM_STACK_RECTS	1024
+
 void
-s3DrawFini (ScreenPtr pScreen)
+s3_24PolyFillRect (DrawablePtr pDrawable, GCPtr pGC, 
+		   int nrectFill, xRectangle *prectInit)
 {
-    SetupS3(pScreen);
-    s3ScreenInfo(pScreenPriv);
-    
-    if (s3s->patterns.cache)
-    {
-	xfree (s3s->patterns.cache);
-	s3s->patterns.cache = 0;
-	s3s->patterns.ncache = 0;
+    s3GCPrivate(pGC);
+    xRectangle	    *prect;
+    RegionPtr	    prgnClip;
+    register BoxPtr pbox;
+    register BoxPtr pboxClipped;
+    BoxPtr	    pboxClippedBase;
+    BoxPtr	    pextent;
+    BoxRec	    stackRects[NUM_STACK_RECTS];
+    FbGCPrivPtr	    fbPriv = fbGetGCPrivate (pGC);
+    int		    numRects;
+    int		    n;
+    int		    xorg, yorg;
+    int		    x, y;
+
+    if (pGC->fillStyle != FillSolid || !ok24 (pGC->fgPixel) || !ok24(pGC->planemask))
+    {
+	KdCheckPolyFillRect (pDrawable, pGC, nrectFill, prectInit);
+	return;
+    }
+    
+    prgnClip = fbGetCompositeClip(pGC);
+    xorg = pDrawable->x;
+    yorg = pDrawable->y;
+    
+    if (xorg || yorg)
+    {
+	prect = prectInit;
+	n = nrectFill;
+	while(n--)
+	{
+	    prect->x += xorg;
+	    prect->y += yorg;
+	    prect++;
+	}
+    }
+    
+    prect = prectInit;
+
+    numRects = REGION_NUM_RECTS(prgnClip) * nrectFill;
+    if (numRects > NUM_STACK_RECTS)
+    {
+	pboxClippedBase = (BoxPtr)ALLOCATE_LOCAL(numRects * sizeof(BoxRec));
+	if (!pboxClippedBase)
+	    return;
+    }
+    else
+	pboxClippedBase = stackRects;
+
+    pboxClipped = pboxClippedBase;
+	
+    if (REGION_NUM_RECTS(prgnClip) == 1)
+    {
+	int x1, y1, x2, y2, bx2, by2;
+
+	pextent = REGION_RECTS(prgnClip);
+	x1 = pextent->x1;
+	y1 = pextent->y1;
+	x2 = pextent->x2;
+	y2 = pextent->y2;
+    	while (nrectFill--)
+    	{
+	    if ((pboxClipped->x1 = prect->x) < x1)
+		pboxClipped->x1 = x1;
+    
+	    if ((pboxClipped->y1 = prect->y) < y1)
+		pboxClipped->y1 = y1;
+    
+	    bx2 = (int) prect->x + (int) prect->width;
+	    if (bx2 > x2)
+		bx2 = x2;
+	    pboxClipped->x2 = bx2;
+    
+	    by2 = (int) prect->y + (int) prect->height;
+	    if (by2 > y2)
+		by2 = y2;
+	    pboxClipped->y2 = by2;
+
+	    prect++;
+	    if ((pboxClipped->x1 < pboxClipped->x2) &&
+		(pboxClipped->y1 < pboxClipped->y2))
+	    {
+		pboxClipped++;
+	    }
+    	}
+    }
+    else
+    {
+	int x1, y1, x2, y2, bx2, by2;
+
+	pextent = REGION_EXTENTS(pGC->pScreen, prgnClip);
+	x1 = pextent->x1;
+	y1 = pextent->y1;
+	x2 = pextent->x2;
+	y2 = pextent->y2;
+    	while (nrectFill--)
+    	{
+	    BoxRec box;
+    
+	    if ((box.x1 = prect->x) < x1)
+		box.x1 = x1;
+    
+	    if ((box.y1 = prect->y) < y1)
+		box.y1 = y1;
+    
+	    bx2 = (int) prect->x + (int) prect->width;
+	    if (bx2 > x2)
+		bx2 = x2;
+	    box.x2 = bx2;
+    
+	    by2 = (int) prect->y + (int) prect->height;
+	    if (by2 > y2)
+		by2 = y2;
+	    box.y2 = by2;
+    
+	    prect++;
+    
+	    if ((box.x1 >= box.x2) || (box.y1 >= box.y2))
+	    	continue;
+    
+	    n = REGION_NUM_RECTS (prgnClip);
+	    pbox = REGION_RECTS(prgnClip);
+    
+	    /* clip the rectangle to each box in the clip region
+	       this is logically equivalent to calling Intersect()
+	    */
+	    while(n--)
+	    {
+		pboxClipped->x1 = max(box.x1, pbox->x1);
+		pboxClipped->y1 = max(box.y1, pbox->y1);
+		pboxClipped->x2 = min(box.x2, pbox->x2);
+		pboxClipped->y2 = min(box.y2, pbox->y2);
+		pbox++;
+
+		/* see if clipping left anything */
+		if(pboxClipped->x1 < pboxClipped->x2 && 
+		   pboxClipped->y1 < pboxClipped->y2)
+		{
+		    pboxClipped++;
+		}
+	    }
+    	}
+    }
+    if (pboxClipped != pboxClippedBase)
+    {
+	s3_24FillBoxSolid(pDrawable,
+			  pboxClipped-pboxClippedBase, pboxClippedBase,
+			  pGC->fgPixel, pGC->alu, pGC->planemask);
+    }
+    if (pboxClippedBase != stackRects)
+    	DEALLOCATE_LOCAL(pboxClippedBase);
+}
+
+void
+s3_24SolidBoxClipped (DrawablePtr	pDrawable,
+		      RegionPtr		pClip,
+		      int		x1,
+		      int		y1,
+		      int		x2,
+		      int		y2,
+		      FbBits		fg)
+{
+    SetupS3 (pDrawable->pScreen);
+    BoxPtr	pbox;
+    int		nbox;
+    int		partX1, partX2, partY1, partY2;
+    
+    s3SetGlobalBitmap (pDrawable->pScreen, s3DrawMap (pDrawable));
+    _s3SetSolidFill(s3,fg,GXcopy,~0);
+    
+    for (nbox = REGION_NUM_RECTS(pClip), pbox = REGION_RECTS(pClip); 
+	 nbox--; 
+	 pbox++)
+    {
+	partX1 = pbox->x1;
+	if (partX1 < x1)
+	    partX1 = x1;
+	
+	partX2 = pbox->x2;
+	if (partX2 > x2)
+	    partX2 = x2;
+	
+	if (partX2 <= partX1)
+	    continue;
+	
+	partY1 = pbox->y1;
+	if (partY1 < y1)
+	    partY1 = y1;
+	
+	partY2 = pbox->y2;
+	if (partY2 > y2)
+	    partY2 = y2;
+	
+	if (partY2 <= partY1)
+	    continue;
+	
+	partX1 *= 3;
+	partX2 *= 3;
+	_s3SolidRect(s3,partX1, partY1, partX2-partX1, partY2-partY1);
+    }
+    MarkSyncS3(pDrawable->pScreen);
+}
+
+void
+s3_24ImageGlyphBlt (DrawablePtr	pDrawable,
+		    GCPtr		pGC,
+		    int		x, 
+		    int		y,
+		    unsigned int	nglyph,
+		    CharInfoPtr	*ppciInit,
+		    pointer	pglyphBase)
+{
+    FbGCPrivPtr	    pPriv = fbGetGCPrivate(pGC);
+    CharInfoPtr	    *ppci;
+    CharInfoPtr	    pci;
+    unsigned char   *pglyph;		/* pointer bits in glyph */
+    int		    gWidth, gHeight;	/* width and height of glyph */
+    FbStride	    gStride;		/* stride of glyph */
+    Bool	    opaque;
+    int		    n;
+    int		    gx, gy;
+    FbBits	    *dst;
+    FbStride	    dstStride;
+    int		    dstBpp;
+    FbBits	    depthMask;
+    int		    xBack, widthBack;
+    int		    yBack, heightBack;
+    
+    depthMask = FbFullMask(pDrawable->depth);
+    if (!ok24 (pGC->fgPixel) || 
+	!ok24(pGC->bgPixel) || 
+	!ok24(pGC->planemask))
+    {
+	KdCheckImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppciInit, pglyphBase);
+	return;
+    }
+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp);
+    
+    x += pDrawable->x;
+    y += pDrawable->y;
+
+    ppci = ppciInit;
+    n = nglyph;
+    widthBack = 0;
+    while (n--)
+	widthBack += (*ppci++)->metrics.characterWidth;
+    
+    xBack = x;
+    if (widthBack < 0)
+    {
+	xBack += widthBack;
+	widthBack = -widthBack;
+    }
+    yBack = y - FONTASCENT(pGC->font);
+    heightBack = FONTASCENT(pGC->font) + FONTDESCENT(pGC->font);
+    s3_24SolidBoxClipped (pDrawable,
+			  fbGetCompositeClip(pGC),
+			  xBack,
+			  yBack,
+			  xBack + widthBack,
+			  yBack + heightBack,
+			  pPriv->bg);
+
+    KdCheckSync (pDrawable->pScreen);
+    
+    ppci = ppciInit;
+    while (nglyph--)
+    {
+	pci = *ppci++;
+	pglyph = FONTGLYPHBITS(pglyphBase, pci);
+	gWidth = GLYPHWIDTHPIXELS(pci);
+	gHeight = GLYPHHEIGHTPIXELS(pci);
+	if (gWidth && gHeight)
+	{
+	    gx = x + pci->metrics.leftSideBearing;
+	    gy = y - pci->metrics.ascent; 
+	    if (gWidth <= sizeof (FbStip) * 8 &&
+		fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight))
+	    {
+		fbGlyph24 (dst + gy * dstStride,
+			  dstStride,
+			  dstBpp,
+			  (FbStip *) pglyph,
+			  pPriv->fg,
+			  gx,
+			  gHeight);
+	    }
+	    else
+	    {
+		gStride = GLYPHWIDTHBYTESPADDED(pci) / sizeof (FbStip);
+		fbPutXYImage (pDrawable,
+			      fbGetCompositeClip(pGC),
+			      pPriv->fg,
+			      pPriv->bg,
+			      pPriv->pm,
+			      GXcopy,
+			      FALSE,
+    
+			      gx,
+			      gy,
+			      gWidth, gHeight,
+    
+			      (FbStip *) pglyph,
+			      gStride,
+			      0);
+	    }
+	}
+	x += pci->metrics.characterWidth;
+    }
+}
+
+static const GCOps	s3_24GCOps = {
+    s3_24FillSpans,
+    KdCheckSetSpans,
+    KdCheckPutImage,
+    KdCheckCopyArea,
+    KdCheckCopyPlane,
+    KdCheckPolyPoint,
+    KdCheckPolylines,
+    KdCheckPolySegment,
+    KdCheckPolyRectangle,
+    KdCheckPolyArc,
+    KdCheckFillPolygon,
+    s3_24PolyFillRect,
+    KdCheckPolyFillArc,
+    miPolyText8,
+    miPolyText16,
+    miImageText8,
+    miImageText16,
+    s3_24ImageGlyphBlt,
+    KdCheckPolyGlyphBlt,
+    KdCheckPushPixels,
+#ifdef NEED_LINEHELPER
+    ,NULL
+#endif
+};
+
+void
+s3_24ValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
+{
+    if (pDrawable->type != DRAWABLE_WINDOW)
+	pGC->ops = (GCOps *) &kdAsyncPixmapGCOps;
+    else
+	pGC->ops = (GCOps *) &s3_24GCOps;
+    fbValidateGC (pGC, changes, pDrawable);
+}
+
+GCFuncs	s3_24GCFuncs = {
+    s3_24ValidateGC,
+    miChangeGC,
+    miCopyGC,
+    miDestroyGC,
+    miChangeClip,
+    miDestroyClip,
+    miCopyClip
+};
+
+Bool
+s3_24CreateGC (GCPtr pGC)
+{
+    if (!fbCreateGC (pGC))
+	return FALSE;
+
+    if (pGC->depth != 1)
+	pGC->funcs = &s3_24GCFuncs;
+    
+    return TRUE;
+}
+
+Bool
+s3_24CreateWindow(WindowPtr pWin)
+{
+    return fbCreateWindow (pWin);
+}
+
+void
+s3_24PaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
+{
+    SetupS3(pWin->drawable.pScreen);
+    s3PatternPtr    pPattern;
+
+    DRAW_DEBUG ((DEBUG_PAINT_WINDOW, "s3PaintWindow 0x%x extents %d %d %d %d n %d",
+		 pWin->drawable.id,
+		 pRegion->extents.x1, pRegion->extents.y1,
+		 pRegion->extents.x2, pRegion->extents.y2,
+		 REGION_NUM_RECTS(pRegion)));
+    if (!REGION_NUM_RECTS(pRegion)) 
+	return;
+    switch (what) {
+    case PW_BACKGROUND:
+	switch (pWin->backgroundState) {
+	case None:
+	    return;
+	case ParentRelative:
+	    do {
+		pWin = pWin->parent;
+	    } while (pWin->backgroundState == ParentRelative);
+	    (*pWin->drawable.pScreen->PaintWindowBackground)(pWin, pRegion,
+							     what);
+	    return;
+	case BackgroundPixel:
+	    if (ok24(pWin->background.pixel))
+	    {
+		s3_24FillBoxSolid((DrawablePtr)pWin,
+				  (int)REGION_NUM_RECTS(pRegion),
+				  REGION_RECTS(pRegion),
+				  pWin->background.pixel, GXcopy, ~0);
+		return;
+	    }
+    	}
+    	break;
+    case PW_BORDER:
+	if (pWin->borderIsPixel && ok24(pWin->border.pixel))
+	{
+	    s3_24FillBoxSolid((DrawablePtr)pWin,
+			      (int)REGION_NUM_RECTS(pRegion),
+			      REGION_RECTS(pRegion),
+			      pWin->border.pixel, GXcopy, ~0);
+	    return;
+	}
+	break;
+    }
+    KdCheckPaintWindow (pWin, pRegion, what);
+}
+
+Bool
+s3DrawInit (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    s3ScreenInfo(pScreenPriv);
+    int		    ncache_w, ncache_h, ncache;
+    int		    px, py;
+    S3PatternCache  *cache;
+    Bool	    dumb = FALSE;
+    int		    ma;
+
+    switch (pScreenPriv->screen->fb[0].bitsPerPixel) {
+    case 8:
+    case 16:
+    case 32:
+	break;
+    case 24:
+	dumb = TRUE;
+	break;
+    default:
+	return FALSE;
+    }
+    /*
+     * Hook up asynchronous drawing
+     */
+    RegisterSync (pScreen);
+    /*
+     * Replace various fb screen functions
+     */
+    if (dumb)
+    {
+	pScreen->CreateGC = s3_24CreateGC;
+	pScreen->CreateWindow = s3_24CreateWindow;
+	pScreen->PaintWindowBackground = s3_24PaintWindow;
+	pScreen->PaintWindowBorder = s3_24PaintWindow;
+	pScreen->CopyWindow = s3CopyWindow;
+    }
+    else
+    {
+	if (serverGeneration != s3Generation)
+	{
+	    s3GCPrivateIndex = AllocateGCPrivateIndex ();
+	    s3WindowPrivateIndex = AllocateWindowPrivateIndex ();
+	    s3Generation = serverGeneration;
+	}
+	if (!AllocateWindowPrivate(pScreen, s3WindowPrivateIndex, 0))
+	    return FALSE;
+	if (!AllocateGCPrivate(pScreen, s3GCPrivateIndex, sizeof (s3PrivGCRec)))
+	    return FALSE;
+	pScreen->CreateGC = s3CreateGC;
+	pScreen->CreateWindow = s3CreateWindow;
+	pScreen->ChangeWindowAttributes = s3ChangeWindowAttributes;
+	pScreen->DestroyWindow = s3DestroyWindow;
+	pScreen->PaintWindowBackground = s3PaintWindow;
+	pScreen->PaintWindowBorder = s3PaintWindow;
+	pScreen->CopyWindow = s3CopyWindow;
+	pScreen->BackingStoreFuncs.RestoreAreas = s3RestoreAreas;
+#if 0	
+	pScreen->PaintWindowBackground = s3DumbPaintWindow;
+	pScreen->PaintWindowBorder = s3DumbPaintWindow;
+	pScreen->CopyWindow = s3DumbCopyWindow;
+#endif
+	
+	/*
+	 * Initialize patterns
+	 */
+#ifdef S3_TRIO
+	ma = 0;
+#else
+	for (ma = 0; s3s->fbmap[ma] >= 0; ma++)
+#endif
+	{
+	    ncache_w = s3s->fb[ma].offscreen_width / S3_TILE_SIZE;
+	    ncache_h = s3s->fb[ma].offscreen_height / S3_TILE_SIZE;
+	    ncache = ncache_w * ncache_h;
+	    if (ncache > 64)
+		ncache = 64;
+	    DRAW_DEBUG ((DEBUG_S3INIT, "ncache_w %d ncache_h %d ncache %d",
+			 ncache_w, ncache_h, ncache));
+	    s3s->fb[ma].patterns.cache = (S3PatternCache *) xalloc (ncache * sizeof (S3PatternCache));
+	    if (s3s->fb[ma].patterns.cache)
+	    {
+		DRAW_DEBUG ((DEBUG_S3INIT, "Have pattern cache"));
+		s3s->fb[ma].patterns.ncache = ncache;
+		s3s->fb[ma].patterns.last_used = 0;
+		s3s->fb[ma].patterns.last_id = 0;
+		cache = s3s->fb[ma].patterns.cache;
+		for (py = 0; py < ncache_h && ncache; py++)
+		    for (px = 0; px < ncache_w && ncache; px++)
+		    {
+			cache->id = 0;
+			cache->x = s3s->fb[ma].offscreen_x + px * S3_TILE_SIZE;
+			cache->y = s3s->fb[ma].offscreen_y + py * S3_TILE_SIZE;
+			cache++;
+			ncache--;
+		    }
+	    }
+	}
+    }
+    return TRUE;
+}
+
+void
+s3DrawEnable (ScreenPtr pScreen)
+{
+    SetupS3(pScreen);
+    s3ScreenInfo(pScreenPriv);
+    int	    c;
+    int	    ma;
+    
+    s3SetGlobalBitmap (pScreen, 0);
+    _s3WaitIdleEmpty (s3);
+    if (pScreenPriv->screen->fb[0].bitsPerPixel == 24)
+    {
+	_s3SetScissorsTl(s3, 0, 0);
+	_s3SetScissorsBr(s3, pScreenPriv->screen->width*3 - 1, pScreenPriv->screen->height - 1);
+	_s3SetSolidFill(s3, pScreen->whitePixel, GXcopy, ~0);
+	_s3SolidRect (s3, 0, 0, pScreenPriv->screen->width*3, pScreenPriv->screen->height);
+    }
+    else
+    {
+	/*
+	 * Flush pattern cache
+	 */
+#ifdef S3_TRIO
+	ma = 0;
+#else
+	for (ma = 0; s3s->fbmap[ma] >= 0; ma++)
+#endif
+	{
+	    for (c = 0; c < s3s->fb[ma].patterns.ncache; c++)
+		s3s->fb[ma].patterns.cache[c].id = 0;
+	}
+
+	_s3SetScissorsTl(s3, 0, 0);
+	_s3SetScissorsBr(s3, pScreenPriv->screen->width - 1, pScreenPriv->screen->height - 1);
+	_s3SetSolidFill(s3, pScreen->blackPixel, GXcopy, ~0);
+	_s3SolidRect (s3, 0, 0, pScreenPriv->screen->width, pScreenPriv->screen->height);
+    }
+    MarkSyncS3 (pScreen);
+}
+
+void
+s3DrawDisable (ScreenPtr pScreen)
+{
+    SetupS3 (pScreen);
+    _s3WaitIdleEmpty (s3);
+}
+
+void
+s3DrawFini (ScreenPtr pScreen)
+{
+    SetupS3(pScreen);
+    s3ScreenInfo(pScreenPriv);
+    int	    ma;
+    
+#ifdef S3_TRIO
+    ma = 0;
+#else
+    for (ma = 0; s3s->fbmap[ma] >= 0; ma++)
+#endif
+    {
+	if (s3s->fb[ma].patterns.cache)
+	{
+	    xfree (s3s->fb[ma].patterns.cache);
+	    s3s->fb[ma].patterns.cache = 0;
+	    s3s->fb[ma].patterns.ncache = 0;
+	}
     }
 }
 
Index: xc/programs/Xserver/hw/kdrive/savage/s3draw.h
diff -u xc/programs/Xserver/hw/kdrive/savage/s3draw.h:1.3 xc/programs/Xserver/hw/kdrive/savage/s3draw.h:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3draw.h:1.3	Wed Feb 23 12:30:04 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3draw.h	Sat May  6 15:17:47 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3draw.h,v 1.3 2000/02/23 20:30:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3draw.h,v 1.4 2000/05/06 22:17:47 keithp Exp $ */
 
 #ifndef _S3DRAW_H_
 #define _S3DRAW_H_
@@ -41,6 +41,7 @@
 
 typedef struct _s3PrivGC {
     int    	    type;	    /* type of drawable validated against */
+    int		    ma;		    /* stream descriptor */
     s3PatternPtr    pPattern;	    /* pattern */
 } s3PrivGCRec, *s3PrivGCPtr;
 
@@ -55,9 +56,8 @@
 #define s3SetWindowPrivate(w,p) (\
 	    (w)->devPrivates[s3WindowPrivateIndex].ptr = (pointer) p)
 
+void	_s3LoadPattern (ScreenPtr pScreen, int fb, s3PatternPtr pPattern);
 
-void	_s3LoadPattern (ScreenPtr pScreen, s3PatternPtr pPattern);
-
 #define SetupS3(s)  KdScreenPriv(s); \
 		    s3CardInfo(pScreenPriv); \
 		    S3Ptr s3 = s3c->s3
@@ -82,6 +82,18 @@
 #define WIDEN(x)    ((unsigned long) (x))
 #define MERGE(a,b)  ((WIDEN(a) << 16) | WIDEN(b))
 
+#define s3BitmapDescriptor(_stream) ((_stream) + 1)
+
+#ifdef S3_TRIO
+#define s3DrawMap(pDraw)    0
+#define s3SetGlobalBitmap(s,d)
+#else
+#define s3DrawMap(pDraw)    ((pDraw)->depth == \
+			     getS3ScreenInfo(pScreenPriv)->primary_depth ? 0 : 1)
+#endif
+
+#define s3GCMap(pGC)	    (s3GetGCPrivate(pGC)->ma)
+			     
 /*
  * Ok, so the S3 is broken -- it expects bitmaps to come MSB bit order,
  * but it's willing to take them in LSB byte order.  These macros
Index: xc/programs/Xserver/hw/kdrive/savage/s3reg.c
diff -u xc/programs/Xserver/hw/kdrive/savage/s3reg.c:1.3 xc/programs/Xserver/hw/kdrive/savage/s3reg.c:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3reg.c:1.3	Wed Feb 23 12:30:04 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3reg.c	Sat May  6 15:17:47 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.3 2000/02/23 20:30:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.4 2000/05/06 22:17:47 keithp Exp $ */
 
 #include "s3reg.h"
 
@@ -403,6 +403,11 @@
     VGA_REG_END
 };
 
+VgaReg s3_delay_primary_load[] = {
+    CR21, 1, 1,
+    VGA_REG_END
+};
+
 VgaReg s3_device_id[] = {
     CR2E, 0, 8,
     CR2D, 0, 8,
@@ -654,16 +659,36 @@
     VGA_REG_END
 };
 
+VgaReg s3_primary_load_control[] = {
+    CR66, 4, 1,
+    VGA_REG_END
+};
+
+VgaReg s3_secondary_load_control[] = {
+    CR66, 5, 1,
+    VGA_REG_END
+};
+
 VgaReg s3_pci_retry_enable[] = {
     CR66, 7, 1,
     VGA_REG_END
 };
 
+VgaReg s3_streams_mode[] = {
+    CR67, 2, 2,
+    VGA_REG_END
+};
+
 VgaReg s3_color_mode[] = {
     CR67, 4, 4,
     VGA_REG_END
 };
 
+VgaReg s3_primary_stream_definition[] = {
+    CR69, 7, 1,
+    VGA_REG_END
+};
+
 VgaReg s3_primary_stream_timeout[] = {
     CR71, 0, 8,
     VGA_REG_END
@@ -714,6 +739,26 @@
     VGA_REG_END
 };
 
+VgaReg s3_flat_panel_output_control_1[] = {
+    CR90, 3, 1,
+    VGA_REG_END
+};
+
+VgaReg s3_streams_fifo_delay[] = {
+    CR90, 4, 2,
+    VGA_REG_END
+};
+
+VgaReg s3_flat_panel_output_control_2[] = {
+    CR90, 6, 1,
+    VGA_REG_END
+};
+
+VgaReg s3_enable_l1_parameter[] = {
+    CR90, 7, 1,
+    VGA_REG_END
+};
+
 VgaReg s3_primary_stream_l1[] = {
     CR91, 0, 8,
     CR90, 0, 3,
@@ -972,6 +1017,21 @@
 
 VgaReg s3_dclk_control[] = {
     SR1B, 7, 1,
+    VGA_REG_END
+};
+
+VgaReg s3_eclk_n[] = {
+    SR32, 0, 5,
+    VGA_REG_END
+};
+
+VgaReg s3_eclk_r[] = {
+    SR32, 5, 2,
+    VGA_REG_END
+};
+
+VgaReg s3_eclk_m[] = {
+    SR32, 0, 5,
     VGA_REG_END
 };
 
Index: xc/programs/Xserver/hw/kdrive/savage/s3reg.h
diff -u xc/programs/Xserver/hw/kdrive/savage/s3reg.h:1.3 xc/programs/Xserver/hw/kdrive/savage/s3reg.h:1.4
--- xc/programs/Xserver/hw/kdrive/savage/s3reg.h:1.3	Wed Feb 23 12:30:05 2000
+++ xc/programs/Xserver/hw/kdrive/savage/s3reg.h	Sat May  6 15:17:48 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3reg.h,v 1.3 2000/02/23 20:30:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3reg.h,v 1.4 2000/05/06 22:17:48 keithp Exp $ */
 
 #ifndef _S3REG_H_
 #define _S3REG_H_
@@ -74,6 +74,7 @@
 extern VgaReg s3_byte_mode[];
 extern VgaReg s3_hardware_reset[];
 extern VgaReg s3_line_compare[];
+extern VgaReg s3_delay_primary_load[];
 extern VgaReg s3_device_id[];
 extern VgaReg s3_revision[];
 extern VgaReg s3_enable_vga_16bit[];
@@ -123,8 +124,12 @@
 extern VgaReg s3_delay_h_enable[];
 extern VgaReg s3_enable_2d_3d[];
 extern VgaReg s3_pci_disconnect_enable[];
+extern VgaReg s3_primary_load_control[];
+extern VgaReg s3_secondary_load_control[];
 extern VgaReg s3_pci_retry_enable[];
+extern VgaReg s3_streams_mode[];
 extern VgaReg s3_color_mode[];
+extern VgaReg s3_primary_stream_definition[];
 extern VgaReg s3_primary_stream_timeout[];
 extern VgaReg s3_master_control_unit_timeout[];
 extern VgaReg s3_command_buffer_timeout[];
@@ -135,6 +140,10 @@
 extern VgaReg s3_fifo_fetch_timing[];
 extern VgaReg s3_dac_power_up_time[];
 extern VgaReg s3_dac_power_saving_disable[];
+extern VgaReg s3_flat_panel_output_control_1[];
+extern VgaReg s3_streams_fifo_delay[];
+extern VgaReg s3_flat_panel_output_control_2[];
+extern VgaReg s3_enable_l1_parameter[];
 extern VgaReg s3_primary_stream_l1[];
 
 extern VgaReg s3_dot_clock_8[];
@@ -165,6 +174,9 @@
 extern VgaReg s3_enable_gamma_correction[];
 extern VgaReg s3_enable_8_bit_luts[];
 extern VgaReg s3_dclk_control[];
+extern VgaReg s3_eclk_n[];
+extern VgaReg s3_eclk_r[];
+extern VgaReg s3_eclk_m[];
 extern VgaReg s3_vga_dclk_n[];
 extern VgaReg s3_vga_dclk_r[];
 extern VgaReg s3_vga_dclk_m1[];
Index: xc/programs/Xserver/hw/kdrive/sis530/sis.c
diff -u xc/programs/Xserver/hw/kdrive/sis530/sis.c:1.3 xc/programs/Xserver/hw/kdrive/sis530/sis.c:1.4
--- xc/programs/Xserver/hw/kdrive/sis530/sis.c:1.3	Wed Feb 23 12:30:06 2000
+++ xc/programs/Xserver/hw/kdrive/sis530/sis.c	Sat May  6 15:17:49 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/sis.c,v 1.3 2000/02/23 20:30:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/sis.c,v 1.4 2000/05/06 22:17:49 keithp Exp $ */
 
 #include "sis.h"
 
@@ -253,30 +253,30 @@
 	screen->height = 600;
 	screen->rate = 72;
     }
-    if (!screen->depth)
-	screen->depth = 8;
+    if (!screen->fb[0].depth)
+	screen->fb[0].depth = 8;
     
     for (;;)
     {
-	if (screen->depth >= 24)
+	if (screen->fb[0].depth >= 24)
 	{
-	    screen->depth = 24;
-	    screen->bitsPerPixel = 24;
+	    screen->fb[0].depth = 24;
+	    screen->fb[0].bitsPerPixel = 24;
 	}
-	else if (screen->depth >= 16)
+	else if (screen->fb[0].depth >= 16)
 	{
-	    screen->depth = 16;
-	    screen->bitsPerPixel = 16;
+	    screen->fb[0].depth = 16;
+	    screen->fb[0].bitsPerPixel = 16;
 	}
-	else if (screen->depth >= 15)
+	else if (screen->fb[0].depth >= 15)
 	{
-	    screen->depth = 15;
-	    screen->bitsPerPixel = 16;
+	    screen->fb[0].depth = 15;
+	    screen->fb[0].bitsPerPixel = 16;
 	}
 	else
 	{
-	    screen->depth = 8;
-	    screen->bitsPerPixel = 8;
+	    screen->fb[0].depth = 8;
+	    screen->fb[0].bitsPerPixel = 8;
 	}
 
 	/* Normalize width to supported values */
@@ -294,10 +294,10 @@
 	else
 	    screen->width = 640;
 	
-	byte_width = screen->width * (screen->bitsPerPixel >> 3);
+	byte_width = screen->width * (screen->fb[0].bitsPerPixel >> 3);
 	pixel_width = screen->width;
-	screen->pixelStride = pixel_width;
-	screen->byteStride = byte_width;
+	screen->fb[0].pixelStride = pixel_width;
+	screen->fb[0].byteStride = byte_width;
 
 	screen_size = byte_width * screen->height;
 	
@@ -307,10 +307,10 @@
 	/*
 	 * Fix requested depth and geometry until it works
 	 */
-	if (screen->depth > 16)
-	    screen->depth = 16;
-	else if (screen->depth > 8)
-	    screen->depth = 8;
+	if (screen->fb[0].depth > 16)
+	    screen->fb[0].depth = 16;
+	else if (screen->fb[0].depth > 8)
+	    screen->fb[0].depth = 8;
 	else if (screen->width > 1152)
 	{
 	    screen->width = 1152;
@@ -346,30 +346,30 @@
     /*
      * Take requested geometry and adjust to fit possible geometries
      */
-    switch (screen->depth) {
+    switch (screen->fb[0].depth) {
     case 4:
-	screen->bitsPerPixel = 4;
+	screen->fb[0].bitsPerPixel = 4;
 	break;
     case 8:
-	screen->bitsPerPixel = 8;
+	screen->fb[0].bitsPerPixel = 8;
 	break;
     case 15:
     case 16:
-	screen->bitsPerPixel = 16;
+	screen->fb[0].bitsPerPixel = 16;
 	break;
     case 24:
     case 32:
-	screen->bitsPerPixel = 24;
+	screen->fb[0].bitsPerPixel = 24;
 	screen->dumb = TRUE;
 	break;
     }
 
-    screen->byteStride = screen->width * (screen->bitsPerPixel >> 3);
-    screen->pixelStride = screen->width;
+    screen->fb[0].byteStride = screen->width * (screen->fb[0].bitsPerPixel >> 3);
+    screen->fb[0].pixelStride = screen->width;
 
     memory = sisc->memory - screen_size;
     
-    screen->frameBuffer = sisc->frameBuffer;
+    screen->fb[0].frameBuffer = sisc->frameBuffer;
     
     /*
      * Cursor lives in the last 16k of memory
@@ -389,7 +389,7 @@
 
     if (memory > 8192)
     {
-	siss->expand = screen->frameBuffer + screen_size;
+	siss->expand = screen->fb[0].frameBuffer + screen_size;
 	siss->expand_off = siss->expand - sisc->frameBuffer;
 	siss->expand_len = memory;
 	memory = 0;
@@ -400,35 +400,35 @@
 	siss->expand_len = 0;
     }
     
-    switch (screen->depth) {
+    switch (screen->fb[0].depth) {
     case 8:
-	screen->visuals = ((1 << StaticGray) |
+	screen->fb[0].visuals = ((1 << StaticGray) |
 			   (1 << GrayScale) |
 			   (1 << StaticColor) |
 			   (1 << PseudoColor) |
 			   (1 << TrueColor) |
 			   (1 << DirectColor));
-	screen->blueMask  = 0x00;
-	screen->greenMask = 0x00;
-	screen->redMask   = 0x00;
+	screen->fb[0].blueMask  = 0x00;
+	screen->fb[0].greenMask = 0x00;
+	screen->fb[0].redMask   = 0x00;
 	break;
     case 15:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x001f;
-	screen->greenMask = 0x03e0;
-	screen->redMask   = 0x7c00;
+	screen->fb[0].visuals = (1 << TrueColor);
+	screen->fb[0].blueMask  = 0x001f;
+	screen->fb[0].greenMask = 0x03e0;
+	screen->fb[0].redMask   = 0x7c00;
 	break;
     case 16:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x001f;
-	screen->greenMask = 0x07e0;
-	screen->redMask   = 0xf800;
+	screen->fb[0].visuals = (1 << TrueColor);
+	screen->fb[0].blueMask  = 0x001f;
+	screen->fb[0].greenMask = 0x07e0;
+	screen->fb[0].redMask   = 0xf800;
 	break;
     case 24:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x0000ff;
-	screen->greenMask = 0x00ff00;
-	screen->redMask   = 0xff0000;
+	screen->fb[0].visuals = (1 << TrueColor);
+	screen->fb[0].blueMask  = 0x0000ff;
+	screen->fb[0].greenMask = 0x00ff00;
+	screen->fb[0].redMask   = 0xff0000;
 	break;
     }
     
@@ -752,7 +752,7 @@
     
     pixel = (hactive + hblank) * (vactive + vblank) * t->rate;
     
-    switch (screen->bitsPerPixel) {
+    switch (screen->fb[0].bitsPerPixel) {
     case 8:
 	hactive /= 8;
 	hblank /= 8;
@@ -775,7 +775,7 @@
 	
 	crtc.color_mode_256 = 0;
 	
-	if (screen->depth == 15)
+	if (screen->fb[0].depth == 15)
 	    crtc.graphics_mode_32k = 1;
 	else
 	    crtc.graphics_mode_64k = 1;
@@ -826,7 +826,7 @@
     
     crtc.high_speed_dac_0 = crtc.high_speed_dac_1 = pixel > 135000000;
     
-    sisEngThresh (&crtc, pixel, screen->bitsPerPixel);
+    sisEngThresh (&crtc, pixel, screen->fb[0].bitsPerPixel);
     
     /*
      * Compute horizontal register values from timings
Index: xc/programs/Xserver/hw/kdrive/sis530/sis.h
diff -u xc/programs/Xserver/hw/kdrive/sis530/sis.h:1.3 xc/programs/Xserver/hw/kdrive/sis530/sis.h:1.4
--- xc/programs/Xserver/hw/kdrive/sis530/sis.h:1.3	Wed Feb 23 12:30:07 2000
+++ xc/programs/Xserver/hw/kdrive/sis530/sis.h	Sat May  6 15:17:49 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/sis.h,v 1.3 2000/02/23 20:30:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/sis.h,v 1.4 2000/05/06 22:17:49 keithp Exp $ */
 
 #ifndef _SIS_H_
 #define _SIS_H_
@@ -1102,8 +1102,8 @@
 void	sisDrawDisable (ScreenPtr pScreen);
 void	sisDrawFini (ScreenPtr pScreen);
 
-void	sisGetColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs);
-void	sisPutColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs);
+void	sisGetColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs);
+void	sisPutColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs);
 
 void	SISInitCard (KdCardAttr *attr);
 
Index: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c
diff -u xc/programs/Xserver/hw/kdrive/sis530/siscmap.c:1.2 xc/programs/Xserver/hw/kdrive/sis530/siscmap.c:1.3
--- xc/programs/Xserver/hw/kdrive/sis530/siscmap.c:1.2	Wed Feb 23 12:30:07 2000
+++ xc/programs/Xserver/hw/kdrive/sis530/siscmap.c	Sat May  6 15:17:50 2000
@@ -21,12 +21,12 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c,v 1.2 2000/02/23 20:30:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c,v 1.3 2000/05/06 22:17:50 keithp Exp $ */
 
 #include "sis.h"
 
 void
-sisGetColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs)
+sisGetColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs)
 {
     KdScreenPriv(pScreen);
     sisCardInfo(pScreenPriv);
@@ -44,7 +44,7 @@
 }
 
 void
-sisPutColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs)
+sisPutColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs)
 {
     KdScreenPriv(pScreen);
     sisCardInfo(pScreenPriv);
Index: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c
diff -u xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c:1.3 xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c:1.4
--- xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c:1.3	Wed Feb 23 12:30:08 2000
+++ xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c	Sat May  6 15:17:50 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c,v 1.3 2000/02/23 20:30:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c,v 1.4 2000/05/06 22:17:50 keithp Exp $ */
 
 #include "sis.h"
 #include "sisdraw.h"
@@ -1636,8 +1636,8 @@
     CARD32  base;
     CARD16  stride;
     
-    base = pScreenPriv->screen->frameBuffer - sisc->frameBuffer;
-    stride = pScreenPriv->screen->byteStride;
+    base = pScreenPriv->screen->fb[0].frameBuffer - sisc->frameBuffer;
+    stride = pScreenPriv->screen->fb[0].byteStride;
     sis->u.general.dst_base = base;
     sis->u.general.dst_pitch = stride;
     sis->u.general.dst_height = pScreenPriv->screen->height;
Index: xc/programs/Xserver/hw/kdrive/trident/trident.c
diff -u xc/programs/Xserver/hw/kdrive/trident/trident.c:1.4 xc/programs/Xserver/hw/kdrive/trident/trident.c:1.5
--- xc/programs/Xserver/hw/kdrive/trident/trident.c:1.4	Wed Feb 23 12:30:10 2000
+++ xc/programs/Xserver/hw/kdrive/trident/trident.c	Sat May  6 15:17:51 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.4 2000/02/23 20:30:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.5 2000/05/06 22:17:51 keithp Exp $ */
 
 #include "trident.h"
 #define extern
@@ -74,7 +74,7 @@
     }
     if (!tridentc->cop)
 	screen->dumb = TRUE;
-    screen_size = screen->byteStride * screen->height;
+    screen_size = screen->fb[0].byteStride * screen->height;
     memory = (2048 + 512) * 1024;
     if (memory >= screen_size + 2048)
     {
Index: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c
diff -u xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c:1.3 xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c:1.4
--- xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c:1.3	Wed Feb 23 12:30:10 2000
+++ xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c	Sat May  6 15:17:51 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.3 2000/02/23 20:30:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.4 2000/05/06 22:17:51 keithp Exp $ */
 
 #include "trident.h"
 #include "cursorstr.h"
@@ -88,9 +88,9 @@
     SetupCursor (pScreen);
     CursorPtr	    pCursor = pCurPriv->pCursor;
     
-    KdAllocateCursorPixels (pScreen, pCursor, 
+    KdAllocateCursorPixels (pScreen, 0, pCursor, 
 			    &pCurPriv->source, &pCurPriv->mask);
-    switch (pScreenPriv->screen->bitsPerPixel) {
+    switch (pScreenPriv->screen->fb[0].bitsPerPixel) {
     case 4:
 	pCurPriv->source |= pCurPriv->source << 4;
 	pCurPriv->mask |= pCurPriv->mask << 4;
Index: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c
diff -u xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c:1.3 xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c:1.4
--- xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c:1.3	Wed Feb 23 12:30:11 2000
+++ xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c	Sat May  6 15:17:51 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.3 2000/02/23 20:30:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.4 2000/05/06 22:17:51 keithp Exp $ */
 
 #include "trident.h"
 #include "tridentdraw.h"
@@ -812,8 +812,8 @@
     CARD32  alpha;
     int	    tries;
     
-    stride = pScreenPriv->screen->pixelStride;
-    switch (pScreenPriv->screen->bitsPerPixel) {
+    stride = pScreenPriv->screen->fb[0].pixelStride;
+    switch (pScreenPriv->screen->fb[0].bitsPerPixel) {
     case 8:
 	format = COP_DEPTH_8;
 	break;
Index: xc/programs/Xserver/hw/kdrive/trio/s3.c
diff -u xc/programs/Xserver/hw/kdrive/trio/s3.c:1.3 xc/programs/Xserver/hw/kdrive/trio/s3.c:1.4
--- xc/programs/Xserver/hw/kdrive/trio/s3.c:1.3	Wed Feb 23 12:30:12 2000
+++ xc/programs/Xserver/hw/kdrive/trio/s3.c	Sat May  6 15:17:52 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.3 2000/02/23 20:30:12 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */
 
 #include "s3.h"
 
@@ -445,31 +445,31 @@
     int		    pixel_width;
     int		    byte_width;
     
-    if (screen->depth >= 24)
+    if (screen->fb[0].depth >= 24)
     {
-	screen->depth = 24;
-	screen->bitsPerPixel = 32;
+	screen->fb[0].depth = 24;
+	screen->fb[0].bitsPerPixel = 32;
     }
-    else if (screen->depth >= 16)
+    else if (screen->fb[0].depth >= 16)
     {
-	screen->depth = 16;
-	screen->bitsPerPixel = 16;
+	screen->fb[0].depth = 16;
+	screen->fb[0].bitsPerPixel = 16;
     }
-    else if (screen->depth >= 15)
+    else if (screen->fb[0].depth >= 15)
     {
-	screen->depth = 15;
-	screen->bitsPerPixel = 16;
+	screen->fb[0].depth = 15;
+	screen->fb[0].bitsPerPixel = 16;
     }
     else
     {
-	screen->depth = 8;
-	screen->bitsPerPixel = 8;
+	screen->fb[0].depth = 8;
+	screen->fb[0].bitsPerPixel = 8;
     }
 
-    byte_width = screen->width * (screen->bitsPerPixel >> 3);
+    byte_width = screen->width * (screen->fb[0].bitsPerPixel >> 3);
     pixel_width = screen->width;
-    screen->pixelStride = pixel_width;
-    screen->byteStride = byte_width;
+    screen->fb[0].pixelStride = pixel_width;
+    screen->fb[0].byteStride = byte_width;
 
     screen_size = byte_width * screen->height;
 
@@ -505,8 +505,8 @@
 	screen->height = 600;
 	screen->rate = 72;
     }
-    if (!screen->depth)
-	screen->depth = 8;
+    if (!screen->fb[0].depth)
+	screen->fb[0].depth = 8;
     
     DRAW_DEBUG ((DEBUG_S3INIT, "Requested parameters %dx%dx%d",
 		 screen->width, screen->height, screen->rate));
@@ -524,8 +524,8 @@
     /*
      * Can only operate in pixel-doubled mode at 8 bits per pixel
      */
-    if (screen->depth > 8 && S3_CLOCK(m,n,r) > S3_MAX_CLOCK)
-	screen->depth = 8;
+    if (screen->fb[0].depth > 8 && S3_CLOCK(m,n,r) > S3_MAX_CLOCK)
+	screen->fb[0].depth = 8;
     
     if (!KdTuneMode (screen, s3ModeUsable, s3ModeSupported))
     {
@@ -538,7 +538,7 @@
     /*
      * Stick frame buffer at start of memory
      */
-    screen->frameBuffer = s3c->frameBuffer;
+    screen->fb[0].frameBuffer = s3c->frameBuffer;
     
     /*
      * Stick cursor at end of memory
@@ -557,25 +557,25 @@
      */
     if (memory >= byte_width * S3_TILE_SIZE)
     {
-	s3s->offscreen = s3c->frameBuffer + screen_size;
-	s3s->offscreen_x = 0;
-	s3s->offscreen_y = screen_size / byte_width;
-	s3s->offscreen_width = pixel_width;
-	s3s->offscreen_height = memory / byte_width;
-	memory -= s3s->offscreen_height * byte_width;
+	s3s->fb[0].offscreen = s3c->frameBuffer + screen_size;
+	s3s->fb[0].offscreen_x = 0;
+	s3s->fb[0].offscreen_y = screen_size / byte_width;
+	s3s->fb[0].offscreen_width = pixel_width;
+	s3s->fb[0].offscreen_height = memory / byte_width;
+	memory -= s3s->fb[0].offscreen_height * byte_width;
     }
     else if (pixel_width - screen->width >= S3_TILE_SIZE)
     {
-	s3s->offscreen = s3c->frameBuffer + screen->width;
-	s3s->offscreen_x = screen->width;
-	s3s->offscreen_y = 0;
-	s3s->offscreen_width = pixel_width - screen->width;
-	s3s->offscreen_height = screen->height;
+	s3s->fb[0].offscreen = s3c->frameBuffer + screen->width;
+	s3s->fb[0].offscreen_x = screen->width;
+	s3s->fb[0].offscreen_y = 0;
+	s3s->fb[0].offscreen_width = pixel_width - screen->width;
+	s3s->fb[0].offscreen_height = screen->height;
     }
     else
-	s3s->offscreen = 0;
+	s3s->fb[0].offscreen = 0;
     
-    DRAW_DEBUG ((DEBUG_S3INIT, "depth %d bits %d", screen->depth, screen->bitsPerPixel));
+    DRAW_DEBUG ((DEBUG_S3INIT, "depth %d bits %d", screen->fb[0].depth, screen->fb[0].bitsPerPixel));
     
     DRAW_DEBUG ((DEBUG_S3INIT, "Screen size %dx%d memory %d",
 		screen->width, screen->height, s3c->memory));
@@ -585,35 +585,35 @@
 		s3s->offscreen_width, s3s->offscreen_height, 
 		s3s->offscreen_x, s3s->offscreen_y));
     
-    switch (screen->depth) {
+    switch (screen->fb[0].depth) {
     case 8:
-	screen->visuals = ((1 << StaticGray) |
+	screen->fb[0].visuals = ((1 << StaticGray) |
 			   (1 << GrayScale) |
 			   (1 << StaticColor) |
 			   (1 << PseudoColor) |
 			   (1 << TrueColor) |
 			   (1 << DirectColor));
-	screen->blueMask  = 0x00;
-	screen->greenMask = 0x00;
-	screen->redMask   = 0x00;
+	screen->fb[0].blueMask  = 0x00;
+	screen->fb[0].greenMask = 0x00;
+	screen->fb[0].redMask   = 0x00;
 	break;
     case 15:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x001f;
-	screen->greenMask = 0x03e0;
-	screen->redMask   = 0x7c00;
+	screen->fb[0].visuals = (1 << TrueColor);
+	screen->fb[0].blueMask  = 0x001f;
+	screen->fb[0].greenMask = 0x03e0;
+	screen->fb[0].redMask   = 0x7c00;
 	break;
     case 16:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x001f;
-	screen->greenMask = 0x07e0;
-	screen->redMask   = 0xf800;
+	screen->fb[0].visuals = (1 << TrueColor);
+	screen->fb[0].blueMask  = 0x001f;
+	screen->fb[0].greenMask = 0x07e0;
+	screen->fb[0].redMask   = 0xf800;
 	break;
     case 24:
-	screen->visuals = (1 << TrueColor);
-	screen->blueMask  = 0x0000ff;
-	screen->greenMask = 0x00ff00;
-	screen->redMask   = 0xff0000;
+	screen->fb[0].visuals = (1 << TrueColor);
+	screen->fb[0].blueMask  = 0x0000ff;
+	screen->fb[0].greenMask = 0x00ff00;
+	screen->fb[0].redMask   = 0xff0000;
 	break;
     }
     
@@ -712,7 +712,7 @@
     /*
      * Compute character lengths for horizontal timing values
      */
-    switch (screen->bitsPerPixel) {
+    switch (screen->fb[0].bitsPerPixel) {
     case 8:
 	hactive = screen->width / 8;
 	hblank /= 8;
@@ -830,7 +830,7 @@
      */
     if (!screen->softCursor)
     {
-	cursor_address = (s3s->cursor_base - screen->frameBuffer) / 1024;
+	cursor_address = (s3s->cursor_base - screen->fb[0].frameBuffer) / 1024;
 
 	crtc->cursor_address_0_7 = cursor_address;
 	crtc->cursor_address_8_15 = cursor_address >> 8;
@@ -855,8 +855,8 @@
     /*
      * Set depth values
      */
-    crtc->bits_per_pixel = screen->bitsPerPixel;
-    crtc->depth = screen->depth;
+    crtc->bits_per_pixel = screen->fb[0].bitsPerPixel;
+    crtc->depth = screen->fb[0].depth;
 
     crtc->l_parm_0_7 = screen->width / 4;	/* Undocumented. */
 
Index: xc/programs/Xserver/hw/kdrive/trio/s3.h
diff -u xc/programs/Xserver/hw/kdrive/trio/s3.h:1.3 xc/programs/Xserver/hw/kdrive/trio/s3.h:1.4
--- xc/programs/Xserver/hw/kdrive/trio/s3.h:1.3	Wed Feb 23 12:30:12 2000
+++ xc/programs/Xserver/hw/kdrive/trio/s3.h	Sat May  6 15:17:53 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3.h,v 1.3 2000/02/23 20:30:12 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3.h,v 1.4 2000/05/06 22:17:53 keithp Exp $ */
 
 #ifndef _S3_H_
 #define _S3_H_
@@ -1097,15 +1097,22 @@
     Bool	need_sync;
 } S3CardInfo;
 
-typedef struct _s3ScreenInfo {
-    CARD8	*cursor_base;	    /* pointer to cursor area */
+typedef struct _s3FbInfo {
     CARD8	*offscreen;	    /* pointer to offscreen area */
     int		offscreen_y;	    /* top y coordinate of offscreen area */
     int		offscreen_x;	    /* top x coordinate of offscreen area */
     int		offscreen_width;    /* width of offscreen area */
     int		offscreen_height;   /* height of offscreen area */
-    S3Cursor	cursor;
     S3Patterns	patterns;
+    CARD32	bitmap_offset;
+    int		accel_stride;
+    int		accel_bpp;
+} S3FBInfo;
+    
+typedef struct _s3ScreenInfo {
+    CARD8	*cursor_base;	    /* pointer to cursor area */
+    S3Cursor	cursor;
+    S3FBInfo	fb[1];
 } S3ScreenInfo;
 
 #define LockS3(s3c)
@@ -1135,8 +1142,8 @@
 void	s3DrawDisable (ScreenPtr pScreen);
 void	s3DrawFini (ScreenPtr pScreen);
 
-void	s3GetColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs);
-void	s3PutColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs);
+void	s3GetColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs);
+void	s3PutColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs);
 
 void	S3InitCard (KdCardAttr *attr);
 
Index: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c
diff -u xc/programs/Xserver/hw/kdrive/trio/s3cmap.c:1.2 xc/programs/Xserver/hw/kdrive/trio/s3cmap.c:1.3
--- xc/programs/Xserver/hw/kdrive/trio/s3cmap.c:1.2	Wed Feb 23 12:30:13 2000
+++ xc/programs/Xserver/hw/kdrive/trio/s3cmap.c	Sat May  6 15:17:53 2000
@@ -21,12 +21,12 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.2 2000/02/23 20:30:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.3 2000/05/06 22:17:53 keithp Exp $ */
 
 #include "s3.h"
 
 void
-s3GetColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs)
+s3GetColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs)
 {
     KdScreenPriv(pScreen);
     s3CardInfo(pScreenPriv);
@@ -47,7 +47,7 @@
 }
 
 void
-s3PutColors (ScreenPtr pScreen, int ndef, xColorItem *pdefs)
+s3PutColors (ScreenPtr pScreen, int fb, int ndef, xColorItem *pdefs)
 {
     KdScreenPriv(pScreen);
     s3CardInfo(pScreenPriv);
Index: xc/programs/Xserver/hw/kdrive/trio/s3curs.c
diff -u xc/programs/Xserver/hw/kdrive/trio/s3curs.c:1.3 xc/programs/Xserver/hw/kdrive/trio/s3curs.c:1.4
--- xc/programs/Xserver/hw/kdrive/trio/s3curs.c:1.3	Wed Feb 23 12:30:13 2000
+++ xc/programs/Xserver/hw/kdrive/trio/s3curs.c	Sat May  6 15:17:53 2000
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.4 2000/05/06 22:17:53 keithp Exp $ */
 
 #include "s3.h"
 #include "s3draw.h"
@@ -95,9 +95,9 @@
     CursorPtr	    pCursor = pCurPriv->pCursor;
     xColorItem	    sourceColor, maskColor;
     
-    KdAllocateCursorPixels (pScreen, pCursor,
+    KdAllocateCursorPixels (pScreen, 0, pCursor,
 			    &pCurPriv->source, &pCurPriv->mask);
-    switch (pScreenPriv->screen->bitsPerPixel) {
+    switch (pScreenPriv->screen->fb[0].bitsPerPixel) {
     case 4:
 	pCurPriv->source |= pCurPriv->source << 4;
 	pCurPriv->mask |= pCurPriv->mask << 4;
Index: xc/programs/Xserver/hw/sun/Imakefile
diff -u xc/programs/Xserver/hw/sun/Imakefile:1.1.1.5 xc/programs/Xserver/hw/sun/Imakefile:1.4
--- xc/programs/Xserver/hw/sun/Imakefile:1.1.1.5	Sun Sep 27 01:05:46 1998
+++ xc/programs/Xserver/hw/sun/Imakefile	Sat Jun 17 11:23:23 2000
@@ -1,4 +1,6 @@
 XCOMM $TOG: Imakefile /main/48 1997/11/13 15:48:43 msr $
+XCOMM $XFree86: xc/programs/Xserver/hw/sun/Imakefile,v 1.4 2000/06/17 18:23:23 dawes Exp $
+
 #include <Server.tmpl>
 
 SRCS1 =	sunInit.c \
@@ -45,7 +47,7 @@
 OBJS = $(OBJS1) $(OBJS2)
 
    INCLUDES = -I. -I../.. -I../../mi -I../../mfb -I../../cfb -I../../cfb32 \
-	      -I../../include -I$(XINCLUDESRC) -I$(FONTINCSRC)
+	      -I../../include -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC)
    LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \
 	      ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln ../cfb/llib-lcfb.ln
 
@@ -60,7 +62,7 @@
 
 #ifndef i386Architecture
 sunInExMono.o: $(ICONFIGFILES)
-ObjectFromSpecialSource(sunInExMono,../../mi/miinitext,$(EXT_DEFINES) -UPEXEXT)
+ObjectFromSpecialSource(sunInExMono,../../mi/miinitext,-I$(EXTINCSRC) $(EXT_DEFINES) -UPEXEXT -UGLXEXT)
 ObjectFromSpecialSource(sunInitMono,sunInit,-DSUNMAXDEPTH=1)
 ObjectFromSpecialSource(sunInitMulti,sunInit,-DSUNMAXDEPTH=32)
 #endif
Index: xc/programs/Xserver/hw/sun/kbd_mode.c
diff -u xc/programs/Xserver/hw/sun/kbd_mode.c:3.6 xc/programs/Xserver/hw/sun/kbd_mode.c:3.7
--- xc/programs/Xserver/hw/sun/kbd_mode.c:3.6	Sun Oct  4 02:38:33 1998
+++ xc/programs/Xserver/hw/sun/kbd_mode.c	Wed May 17 12:52:21 2000
@@ -27,7 +27,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.6 1998/10/04 09:38:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.7 2000/05/17 19:52:21 dawes Exp $ */
 
 #ifndef lint
 static  char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13";
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#if defined(SVR4) || defined(__bsdi_)
+#if defined(SVR4) || defined(__bsdi__)
 #include <fcntl.h>
 #ifndef __bsdi__
 #include <sys/kbio.h>
Index: xc/programs/Xserver/hw/sun/sun.h
diff -u xc/programs/Xserver/hw/sun/sun.h:3.7 xc/programs/Xserver/hw/sun/sun.h:3.9
--- xc/programs/Xserver/hw/sun/sun.h:3.7	Sat Jun 27 05:53:52 1998
+++ xc/programs/Xserver/hw/sun/sun.h	Wed May 17 12:52:21 2000
@@ -13,7 +13,7 @@
  * express or implied warranty.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/sun/sun.h,v 3.7 1998/06/27 12:53:52 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/sun/sun.h,v 3.9 2000/05/17 19:52:21 dawes Exp $ */
 
 #ifndef _SUN_H_ 
 #define _SUN_H_
@@ -53,7 +53,7 @@
 
 #include <fcntl.h>
 
-#ifndef __bsdi_
+#ifndef __bsdi__
 # ifndef CSRG_BASED
 #  ifndef i386
 #   include <poll.h>
@@ -67,6 +67,7 @@
 
 #include <errno.h>
 #include <memory.h>
+#include <signal.h>
 
 #ifdef X_NOT_STDC_ENV
 extern int errno;
Index: xc/programs/Xserver/hw/xfree86/CHANGELOG
diff -u xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1079 xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1230
--- xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1079	Wed Mar  8 11:27:44 2000
+++ xc/programs/Xserver/hw/xfree86/CHANGELOG	Sat Jul  1 19:35:25 2000
@@ -1,3 +1,784 @@
+XFree86 4.0.1 (1 July 2000)
+ 417. Update OpenBSD and NetBSD docs (#4053, Matthieu Herrb).
+ 416. Fix segfault when destroying a GLX context (Kevin Martin).
+ 415. Doc updates (Georgina Economou).
+ 414. Fix some palette and fbdev problems, and add a missing break to the
+      video memory type detection code for the r128 (#4043, Benjamin
+      Herrenschmidt). 
+
+XFree86 4.0Z (30 June 2000)
+ 413. README updates (Georgina Economou).
+ 412. Add some SiS DRI code, but currently disabled because the X server
+      driver level support hasn't been integrated yet (Can-Ru Yeou, SiS).
+ 411. Remove the PPC-specific assembly for load/stores from the r128 driver,
+      and use the versions now provided in compiler.h, which are faster (#4051,
+      Ani Joshi).
+ 410. Fix the UTF-8 converters so that cut&paste works better in UTF-8 locales
+      (#4049, Bruno Haible).
+ 409. Complete the move of glx.h to xc/include/GL, and don't include
+      Xmd.h in glx.h (#4048, Brian Paul).
+ 408. Apm driver updates, including fixing 24/32 access, fixing an
+      initialization bug, and some code cleanups (#4047, Loic Grenie).
+ 407. Sparc/sbus updates: put sparcProm* in the correct header file, add
+      xf86SbusSetOsHwCursorCmap sbus layer interface, and export symbols for
+      this new interface and the sparcProm* interfaces in the loader (#4046,
+      Jakub Jelinek).
+ 406. Add cg3/cg14/tcx/bw2 drivers (sparc), and fix a few bugs in leo and
+      cg6 drivers.  Build these driver, plus the ati and glint drivers
+      on Linux/sparc (#4046, Jakub Jelinek).
+ 405. Fix Elite3D detection (#4045, David S. Miller).
+ 404. Treat SBUS like ISA when assigning access control records, so now
+      multi-head, Xinerama, etc works with SBUS drivers (#4045,
+      David S. Miller).
+ 403. SDK install updates (#4044, David Bateman).
+ 402. Work around an odd problem with waitpid() in the code for auto-loading
+      DRM kernel modules on Linux (#4042, Brian Paul).
+ 401. Change the imake parameter for BSD/OS from BSD386Architecture to
+      BSDOSArchitecture (#4041, Kurt Lidl).
+ 400. Make the neomagic driver recognise the NM2380 chip, and treat it
+      exactly like a NM2360 (#4041, Kurt Lidl).
+ 399. Updates for compiling cleanly on BSD/OS 4.0.1, and to make the
+      BSD/OS support less i386-centric (#4041, Kurt Lidl).
+ 398. Disable SilkenMouse for the s3virge GX2 to avoid some lockup problems
+      (#4039, Kevin Brosius).
+ 397. Some mga DRI updates to improve stability (Jeff Hartmann).
+ 396. Fix some DRI offscreen memory calculations in the Matrox driver 
+      (Mark Vojkovich).
+ 395. IA64 workarounds - should compile and run right out of the box now 
+      (Mark Vojkovich).
+ 394. LBX, X-TrueType and Xnest warning fixes (Marc La France).
+ 393. Remove unused xf86MapDisplay() and xf86UnMapDisplay() os-support entry
+      points (Marc La France).
+
+XFree86 4.0g (26 June 2000)
+ 392. Fix a missing -I in sunffb/Imakefile (#4038, David S. Miller).
+ 391. Some -misc-fixed-* BDF font updates, primarily expanding the 7x13
+      set to include the same 8-bit variants as the 6x13 set, including
+      a new oblique/italic version (#4037, Markus Kuhn).
+ 390. Fix an endless loop in the UTF-8 converters (#4036, Bruno Haible).
+ 389. Straighten out xfindproxy exit codes to match success/failer status;
+      also change one instance where error message was printed to stdout
+      (#4035, Huver).
+ 388. With LBX enabled, the X server wasn't checking the proxy connection,
+      and so fails the connection request without calling InvalidHost()
+      (#4033, Huver).
+ 387. xfwp doProcessWritables() closes connection, but then proceeds
+      to reset client fd via FD_SET() (#4031, Huver).
+ 386. Don't build a non-DRI libOSMesa (#4029, Takaaki Nomura).
+ 385. Add generic DGA support to SiS driver (Alan Hourihane).
+ 384. Add more support structure for Alpha/DRI (not enabled yet though)
+      (Alan Hourihane).
+ 383. Fix glXDestroyContext bug that caused Q3A to use old clip rect info
+      when opening a new window (Kevin Martin).
+ 382. Fix R128 3D driver clear problem which caused R128Pro cards to lock
+      up, and fix dword count on ring-based vertex buffer code for PCI
+      R128 cards (Gareth Hughes).
+ 381. Possible fix for a problem introduced with item 332 that resulted
+      in the first screen's config file data being used for all screens
+      (Mark Vojkovich, David Dawes).
+ 380. Add an imake parameter NothingOutsideProjectRoot that turns off
+      installing links and config files, etc, outside of ProjectRoot
+      (David Dawes).
+ 379. Possible fix a problem with 'make install' on Linux when there is
+      already a /usr/include/GL directory (David Dawes).
+ 378. Fix a DGA-related crash when using multiple input devices with the
+      DGA extension disabled (Matthieu Herrb).
+
+XFree86 4.0f (23 June 2000)
+ 377. Suppress the use of a temporary directory to build man pages on
+      OpenBSD, which fixes problems with some external programs (#4028,
+      Matthieu Herrb).
+ 376. Allow some linux/mips settings in linux.cf to be overriden (#4026,
+      Guido Guenther).
+ 375. Synchronize the pointer state before checking it in xf86CheckButton()
+      (Paulo Cesar Pereira de Andrade).
+ 374. s3virge driver fixes for noise and console corruptionn on the GX2 and
+      MX (but they're commented out for the MX because it hasn't been tested
+      yet) (#4027, Kevin Brosius).
+ 373. Fixes for lib/GL Imakefiles (Marc La France).
+ 372. Update DRI drivers sunffb,mga,i810,glint,r128,tdfx to check for 
+      DRIQueryVersion, overcomes an older libdri issue (Alan Hourihane).
+ 371. Change tdfx driver to use fb instead of cfb (Alan Hourihane).
+ 370. Make using libpthread optional for OpenBSD 2.7.
+ 369. Fix a problem when calling XF86VidModeSwitchMode() when the switched
+      screen is different from the one that has the pointer (#4024,
+      Paulo Cesar Pereira de Andrade).
+ 368. Bindist files for Linux/mips (#4023, Guido Guenther).
+ 367. Allow XFree86 to compile on NetBSD-current and 1.5_ALPHA, which
+      no longer use the pcvt console, but have a compatibility mode for it
+      in wscons (#4021, Bernd Ernesti).
+ 366. Add support for the iso8859-13 charset to Xlib (#4020, Bruno Haible).
+ 365. Add ISO-8859-13 support to the UTF-8 converters, which is needed for
+      Lithuanian UTF-8 locales (#4019, Bruno Haible).
+ 364. Fix three bugs in the UTF-8 converters:
+       - In an UTF-8 locale, keyboard input coming in as UTF-8 would not be
+         accepted.
+       - Incorrect handling of the "end of string" and "invalid byte sequence"
+         situations.
+       - A bug on platforms with sizeof(wchar_t) != sizeof(int).
+      (#4018, Bruno Haible).
+ 363. Enable building DRI support for FreeBSD 4.1 and higher.
+ 362. Don't try to use kldload() on FreeBSD versions prior to 3.0 (#4016,
+      Takaaki Nomura).
+ 361. Some sunffb cleanups (#4015, David S. Miller).
+ 360. Add DRI drawable index callback (#4015, David S. Miller).
+ 359. Fix -configure option to print out fatal message and abort gracefully
+      when pci data isn't entered into xf86PciInfo.h (Alan Hourihane).
+ 358. Add generic DGA support to NeoMagic (not tested) (Alan Hourihane).
+ 357. Add generic DGA support to i810 (not tested) (Alan Hourihane).
+ 356. Fix GCC 2.96 complaints in big font extension and imstt driver
+      (Steven King).
+ 355. Fix remaining DRI III compile glitches (Marc La France).
+ 354. Fix long standing bug with 3Dfx driver when DRI module isn't loaded.
+      It complained about unresolved symbol called after 'Textures memory'
+      output (Alan Hourihane).
+
+XFree86 4.0e (20 June 2000)
+ 353. Fix a couple of acceleration problems in glint driver (Alan Hourihane).
+ 352. Don't attempt to build the Sparc DRI drivers on ix86, and vice versa
+      (David Dawes).
+ 351. Fix a lib/GL build problem when the DRI isn't enabled (#4014,
+      Nicholas J Brealey).
+ 350. Fix location of dri module links in the xc/exports directory of the
+      build tree.
+ 349. Replace LoaderSymbol() with xf86LoaderCheckSymbol() in drivers.
+ 348. Disable SmartScheduler on LynxOS 3.1 (#4013, Thomas Mueller).
+ 347. Update Japanese PC98 docs (#4012, Isao Ohishi, Takaaki Nomura).
+ 346. Add some S3/Diamond PCI IDs (#4011, Werner Leeb).
+ 345. Update sbus support for recent bus infrastructure changes
+      (David S. Miller)
+ 344. Check for NULL pointers from item 332 (Alan Hourihane).
+ 343. Xf86cfg updates (#4010, Paulo Cesar Pereira de Andrade).
+ 342. Fix threads support in OpenBSD 2.7 and above (#4006, 4009,
+      Carlos A M dos Santos).
+ 341. UCS misc BDF fonts updates, including new oblique/italic versions
+      (6x13O, 8x13O), Korean font covering all Hangul symbols (18x18ko)
+      and many additional autogenerated ISO 8859 fonts to cover with
+      6x13 and 8x13 all the locale encodings suggested by the Li18nux
+      specification (#4007, Markus Kuhn).
+ 340. Add Linux/Sparc support for the DRI, and a DRI driver for Sun
+      Creator3D hardware (#4004).
+ 339. Fix DRI BusIDString length usage (#4003, David S. Miller).
+ 338. Xterm patch #139 (#4002, Thomas Dickey).
+ 337. Make the use of GlxDefines for libGL independent of BuildXF86DRI (#4001,
+      David S. Miller).
+ 336. Fix i810 build warnings (#4000, Jarno Paananen).
+ 335. Fix an i810 build problem (Keith Whitwell, #4000, Jarno Paananen).
+ 334. Fix a multihead problem with the mga driver (Mark Vojkovich).
+ 333. Add support to the i810 driver for the i815 (Keith Whitwell).
+ 332. Add infrastructure support for cards with multiple CRTCs (screens)
+      per accelerator (PCI entity) (Jeff Hartmann and David Dawes).
+ 331. Fix some Mesa problems (Brian Paul).
+ 330. Rework patch for mapping drmAddMap on Alpha platforms
+      (Bruce Stockwell/Compaq, Alan Hourihane).
+ 329. Don't build Debuggable Library on Linux for the release (Alan Hourihane).
+ 328. Don't build lib/GL/mesa/src/X86 on Alpha systems (Alan Hourihane).
+ 327. xdm warning fix (Marc La France).
+ 326. Make x11perf die gracefully when display cannot be opened
+      (Marc La France).
+ 325. Fix rendition driver compile glitch (Marc La France).
+ 324. #ifdef out glitch in glint driver (Marc La France).
+ 323. Preliminary DGA support in ATI driver (Marc La France).
+ 322. Minor update to DESIGN and Status documents (Marc La France).
+ 321. Fix DGA's reporting of vertical refresh rates to clients
+      (Marc La France).
+ 320. Make driver-provided Sync(), SetViewport() and GetViewport() DGA
+      callbacks optional (Marc La France).
+ 319. Fix XKB compile glitch (Marc La France).
+ 318. Make imstt driver compile (Marc La France).
+
+XFree86 4.0d (16 June 2000)
+ 317. Fix a typo in the xfree86 xkb keycodes file (#3999, Matthieu Herrb).
+ 316. Fix some build problems when the DRI is not enabled (#3998,
+      Matthieu Herrb).
+ 315. Add missing Linux/mips config changes (#3997, Guido Guenther).
+ 314. Fix for libICE DOS (Keith Packard).
+ 313. FontInfo.c (lib/X11) needs to be built with the bigfont defines (#3996,
+      Paulo Cesar Pereira de Andrade).
+ 312. Disable the smart scheduler for SVR4.0 (based on #3916, Takaaki Nomura).
+ 311. Add a check for PS/2 mice on Linux for the X server's -configure
+      option (#3991, Paulo Cesar Pereira de Andrade).
+ 310. Fix a problem mouse driver button flush was causing with Xaw menus
+      (#3991, Paulo Cesar Pereira de Andrade, David Dawes).
+ 309. Modify scanpci to print out card/subsys information, and add a few
+      more entries to the pci data (David Dawes).
+ 308. Fix r128_cursor.c build problem for big-endian machines (#3989,
+      Thomas Mueller, #3994, Ani Joshi).
+ 307. Update LynxOS docs (#3989, Thomas Mueller).
+ 306. Add a few PPC compiler internal symbols to the loader's export list
+      (#3989, Thomas Mueller).
+ 305. Add crypt support to xdm for LynxOS (#3989, Thomas Mueller).
+ 304. Add preliminary build support for LynxOS 3.1.0 (#3989, Thomas Mueller).
+ 303. Add keysyms to complete the set for the Compaq SK2850 keyboard and
+      the Microsoft Natural Keyboard Pro (David Dawes).
+ 302. Add new keysyms for PDAs (#3985, 3987, 3988, Jim Gettys).
+ 301. Xterm patch #138 (#3986, Thomas Dickey).
+ 300. DRI megapatch III.  This includes DRI enhancements, 3dfx fixes and
+      updates, updates Mesa to the latest version, adds Intel i810, Matrox
+      G200/G400, ATI Rage 128 and 3dfx Voodoo5 3D support, adds ATI Rage
+      Mobility 2D support (disabled by default).  (Precision Insight and
+      VA Linux Systems).
+ 299. Add a function to the X server that performs the same checks on
+      command line arguments and environment variables as the Xwrapper
+      from 3.3.x.  This function is called very early from main()
+      (David Dawes).
+ 298. Fix for some Xlib problems that can show up when connecting to
+      a rogue server (Keith Packard, with analysis by Chris Evans).
+ 297. Increase MAXVISUALSPERDEPTH to 64 for Xnest so that it can handle
+      GLX's visuals.
+ 296. Add a Macedonian xkb symbols file (#A.96, Zlatko Trajceski).
+ 295. Fix a buffer overflow with the -xkbmap X server flag (#A.91,
+      Trevor Johnson).
+ 294. Fix a rectangle fill problem that shows up with an AGP SiS 6326
+      (A.81, A.83, Milivoj Savin).
+ 293. Fix a problem in xcalc when the current locale uses a character
+      other than "." for the decimal point (#A.63, Stanislav Brabec).
+ 292. Allow some more parameters in linux.cf and lnxLib.rules to be
+      redefined (#A.60, Stanislav Brabec).
+ 291. Fix a typo in lib/Xss/Imakefile (#A.59, Stanislav Brabec).
+ 290. Fix an xfs crash that shows up when many clients connect (#A.48,
+      Remy Card).
+ 289. Fix some man page build problems (#A.43, Ian Collier).
+ 288. Fix xedit core dump (in Xaw) on Solaris, related to the bsearch()
+      usage (#A.42, Ian Collier).
+ 287. Add xkb mappings for the keycodes generated by the SysRq and Break
+      keys, which are different from the keycodes generated when used as
+      PrtScn and Pause (#A.29, Eric W. Biederman).
+ 286. Fix problems when building on Solaris 2.6/sparc and Irix 6.5.5
+      (#A.21, A.28, Sullivan N. Beck).
+ 285. Fix a core dump in fstobdf when using 16 bit fonts (#A.25,
+      Morten Storgaard Nielsen).
+ 284. Clean up some of the messages printed by the neomagic driver
+      (David Dawes).
+ 283. Add support for the 2360 (256ZX) to the neomagic driver, and enable
+      acceleration at depth 24 for this chip (#A.23, Gregory M Pomerantz).
+ 282. Adjust the bigfont extension to not use SHM segments for fonts with
+      a small glyph metric size, and fix a build problem on systems without
+      shared memory (#3984, Bruno Haible).
+ 281. Status doc updates (#A.9, Chris Smith, A.80, Ferenc Acs).
+ 280. Fix memleak warning when doing realloc(NULL, size) (#A.7,
+      Charles G Waldman).
+ 279. xf86cfg fixes (#3983, Paulo Cesar Pereira de Andrade).
+ 278. Add SilkenMouse support to the s3virge driver (#3982, Kevin Brosius).
+ 277. Update Xv support in the glint driver and add the XvPutImage function
+      for the Permedia 2 (#3926, Michael Schimek).
+
+XFree86 4.0c (13 June 2000)
+ 276. Xterm patch #137 (#3976, Thomas Dickey).
+ 275. Doc update for the chips driver (#3981, David Bateman).
+ 274. Fix some problems building with the SDK (#3981, David Bateman).
+ 273. Fix comments for the address matching algorithm in
+      XauGetAuthByAddr() and XauGetBestAuthByAddr() (Keith Packard, based on
+      #3939, Peter Runestig).
+ 272. Handle setting SharedLibXdmGreet in the OS imake config files rather
+      than having a complicated expression in the xdm Imakefile (#3980,
+      Matthieu Herrb).
+ 271. xdm updates from the OpenBSD team, including:
+       - support for Kerberos IV authentication [enabled only in OpenBSD.cf,
+         but could be enabled for other systems by setting HasdKrbIV]
+       - use the arc4random(4) random number generator on OpenBSD
+       - add a new resource "allowRootLogin", which can be used to disable
+         root logins through xdm
+       - log failed logins to syslogd [OpenBSD only, but could be enabled on
+         other systems]
+       - verify that the shell is valid using /etc/shells [OpenBSD only]
+       - verify that the account hasn't expired [OpenBSD only, but could be
+         enabled on other system that use the same passwd aging structure]
+      (#3948, 3980, OpenBSD team, Matthieu Herrb).
+ 270. Big/little endian MMIO_XX macros for ppc, and also PIO macros check
+      that IOBase is mmapped before doing any accesses (#3979,
+      Kostas Gewrgiou).
+ 269. Preliminary driver for Integrated Micro Solutions TwinTurbo128
+      (imstt) (#3978, Ani Joshi).
+ 268. Fix broken czsk keymaps, and let the user directly select either
+      Czech or Slovak keyboard in xf86config (#3975, Kamil Toman).
+ 267. Implement DGA2 support with depth switching for ATI Rage 128 cards
+      (#3974, Ove Kaaven).
+ 266. Recent versions of FreeBSD have the xpg4 library folded into libc.
+ 265. xf86cfg updates (#3973, Paulo Cesar Pereira de Andrade).
+ 264. Xaw bug fixes (#3973, Paulo Cesar Pereira de Andrade).
+ 263. Fix M-d and M-h key bindings in the Xaw Text widget (#A.87,
+      Jonathan Kamens).
+ 262. Fix some Xaw memory errors (#A.79, Jonathan Kamens).
+ 261. Xman fixes/updates, including:
+       - Fix a core dump in fclose()
+       - Append the default search path when MANPATH ends in a ':'
+       - Understand man pages that have a single line with a .so directive
+      (#3969, 3973, Paulo Cesar Pereira de Andrade).
+ 260. Resync nls Compose file with 3.3.6 (#3964, 3973,
+      Paulo Cesar Pereira de Andrade).
+ 259. Fix moving the pointer between screens when using MouseKeys, and fix
+      some bugs in the xkbfile code (#3963, 3973,
+      Paulo Cesar Pereira de Andrade).
+ 258. Fix XC-SECURITY security bug (#3954, 3973,
+      Paulo Cesar Pereira de Andrade).
+ 257. Bigfont bug fix, which stops cvsup crashing (#3954, 3973,
+      Paulo Cesar Pereira de Andrade).
+ 256. Replace some bitswapping assembler code in XAA with faster C code
+      (Mark Vojkovich).
+ 255. Rendition driver updates, including:
+       - add DirectColor support
+       - add SilkenMouse support
+       - documentation updates
+       - some code cleanups
+      (#3972, Dejan Ilic).
+ 254. For v4l: don't advertise the XV_VOLUME attr if we're only going to
+      return BadMatch on use (#3968, David Woodhouse).
+ 253. Modify the I2C delay routine to use xf86getsecs (gettimeofday) instead
+      of an uncalibrated loop (#3967, Andrew Aitchison).
+ 252. Add some PCI ids to xf86PciInfo.h, and include some instructions
+      about how to add new PCI data (#3966, Kevin Brosius).
+ 251. Update documentation for Japanese PC98 (#3965, Satoshi Kimura,
+      Akio Morita, Takaaki Nomura).
+ 250. XIM patch (imInt.c) (#3962, Fuminori Hirayama).
+ 249. Xterm patch #136 (#3960, Thomas Dickey).
+ 248. Fix Imake.rules for building on Solaris 7 with gcc-2.95.2 (#3958,
+      Nicholas Brealey).
+ 247. Add basic support for the Linux/mips and mipsel architecture (#3957,
+      3970, Guido Guenther).
+ 246. Disable reading the BIOS in the int10 code for Japanese PC98 (#3959,
+      Isao Ohishi).
+ 245. Add a "NoPciBurst" option to the Trident drive for Japanese PC98
+      cards with the TGUi968x chip (#3955, Akio Morita).
+ 244. Xterm patch #135 (#3951, Thomas Dickey).
+ 243. Fbdev driver fix (#3953, Ani Joshi).
+ 242. Xterm patch #134 (#3949, Thomas Dickey).
+ 241. Import the mktemp() usage fixes for imake from the 3.3.x branch
+      (#3947, Matthieu Herrb).
+ 240. Rman updates, including:
+       - minor reformating (make { and } match)
+       - fix logic for parsing comments in man pages, which allows the
+         copyrights to appear in the output html
+       - a few changes based on weblint and tidy
+      (#3946, Thomas Dickey).
+ 239. Fix incorrect type for vgaIOBase in the neomagic driver (#3944,
+      Ani Joshi).
+ 238. Fix an Xlib build problem when the big-font extension is disabled
+      (#3945, Mutsumi Ishikawa).
+ 237. Xv v4l attribute handling bug fix (#3928, Gerd Knorr).
+ 236. Fix some problems with the locale-dependent input processing in Xlib
+      by:
+       - removing unneeded to/from CTEXT conversion for characters coming
+         from keyboard input
+       - move "locale_code" and "keyboard charset" searching to the
+         initialization step (XIM creation)
+       - Fix some inconsistencies between memory allocation and freeing
+         in XIM objects (imLcIm.c imThaiIm.c)
+      (#3927, Ivan Pascal).
+ 235. Update support for Appian J2000 board with dual PM3 chips, and
+      add partial acceleration (#3977, Sven Luther).
+ 234. Only claim other devices on the same card when gamma chip is used
+      in the glint driver (Alan Hourihane).
+ 233. Separate offscreen memory manager API from implementation to facilitate
+      driver replacement of the default manager (Mark Vojkovich).
+ 232. Add Option "TexturedVideo" to have the Matrox driver optionally use
+      YUV textures instead of the video overlay for XvImage support 
+      (Mark Vojkovich).
+ 232. Add Xv functions for allocating/freeing XvVideoAdaptorRecs to shield
+      drivers from structure size changes (Mark Vojkovich).
+ 231. Have XDGAQueryModes return no modes as being available instead of an
+      error when DGA is not supported on the particular screen (Mark Vojkovich).
+ 230. Fix xdm when PAM is not available (Marc La France).
+ 229. Fix int10 bug on non-PC platforms (Marc La France).
+ 228. Finish prototyping of DPS libraries.  Fix argument promotions in
+      pswrap.  Fix yytext portability problem.  Fix non-standard format
+      in pswrap (#3941, #3942, Nomura Takaaki, Thomas Dickey).
+ 227. Fixed FP chipset handling in Trident driver. LCD-CRT switching
+      should work now (Egbert Eich).
+ 226. Modified device detection on PCI bus to handle Host-to-PCI bridges
+      better (Egbert Eich).
+ 225. Fix i810 driver so it advertises 32bpp pixmaps in depth 24 like the
+      rest of the drivers do (Mark Vojkovich).
+ 224. Added a call ioperm() to to allow vm86 to execute in/out calls
+      directly to avoid problems with certain notebook bioses (Egbert Eich).
+ 223. Fixed mouse driver to flush pending button press events on
+      protocol change (Egbert Eich).
+ 222. Fixed DDC support and sync flags handling in trident driver 
+      (Egbert Eich).
+ 221. Added PAM support to xdm, ANSIfied prototypes (Werner Fink).
+ 220. Added ServerFlag to force the use of OS PCI config space
+      support (Egbert Eich).
+ 219. Fix Xv DDX stop overlaid stills/images when XvStopVideo() is called
+      (Mark Vojkovich).
+ 218. Have the Xv DDX send clients exposure events when windows containing
+      overlaid data, which isn't actually in the framebuffer, are moved
+      (Mark Vojkovich).
+ 217. Fix ordering of calling DDC probe in VBE to respect NoDDC options
+      (Alan Hourihane).
+ 216. Fix VBE initialization in trident driver for DDC (Alan Hourihane).
+ 215. Fix a typo in the glint driver (#3943, Michael Schimek).
+ 214. Fix multithread bug in Xlib big font support (Mark Vojkovich).
+ 213. Fix a window class initialization problem in Xinerama (Mark Vojkovich).
+ 212. Fix some multithreading related problems in the Xv client library 
+      (Mark Vojkovich).
+
+XFree86 4.0b (23 May 2000)
+ 211. Add support to the sunffb driver for multiple visuals on the same screen,
+      overlays, double buffering and some other niceties (#3938,
+      David S. Miller, Jakub Jelinek).
+ 210. Make the modifier setting on Sun keyboards match what XFree86 expects
+      (#3937, Jakub Jelinek).
+ 209. Add unaccelerated support for the Sun CG6 (#3935, Jakub Jelinek).
+ 208. Make the -configure option work with SBUS/UPA drivers, fix some
+      bugs in the sbus layer, add support for ioctl based colormap setting,
+      and fix leds on Sun keyboards (#3934, Jakub Jelinek).
+ 207. Fix a parallel build problem in lib/dps (#3932, H. J. Lu).
+ 206. Fix some build problems that show up  with LynxOS x86 and PowerPC (#3929,
+      Thomas Mueller).
+ 205. Fix documentation files for the mutouch and elographics drivers,
+      and build these drivers by default (#3935, Patrick Lecoanet).
+ 204. Make the dga2 library use the device name provide by the driver rather
+      than always using the default (3924, David S. Miller).
+ 203. Fix a problem with the internal xalloc that shows up on Sparc (#3923,
+      David S. Miller).
+ 202. Fix a GLX visual problem that causes a crash at server shutdown
+      (#3922, David S. Miller).
+ 201. 8+32 framebuffer for hardware that uses window IDs (David S. Miller).
+ 200. Fix a memory allocation in lbxproxy that can cause it to crash at
+      startup (#3921, Peter Runestig, #A.46, Rob Clark).
+ 199. Fix a problem with imake's handling of DefaultGccIncludeDir (#3920,
+      Peter Runestig, #A.64, Stanislav Brabec).
+ 198. lib/X11/imInt.c fix from the OpenMotif release notes (#3919).
+ 197. Prototype and fix almost all compiler warnings fot he dps library
+      and the related pswrap program (#3912, Thomas Dickey).
+ 196. Fix for x-tt font cache corruption (#3911, H. J. Lu).
+ 195. Ansi prototypes for the lbxusilt library and Xserver/lbx directory
+      (#3908, Matthieu Herrb).
+ 194. Fix some bugs in the cirrus lg driver (#3900, Itai Nahshon).
+ 193. Accelerated driver for Sun Leo/ZX cards (#3899, 3936, Jakub Jelinek).
+ 192. Fully accelerated driver for Sun FFB and AFB chips (#3898,
+      Jakub Jelinek).
+ 191. Generic SBUS and UPA support for XFree86 (#3897, Jakub Jelinek).
+ 190. Fix building xf86cfg on systems where libxpm isn't linked in
+      implicitly (#3903, Matthieu Herrb).
+ 189. Update the fbdevhw stubs for an interface change (#3902, Matthieu Herrb,
+      #3910, Bernd Ernesti).
+ 188. Simplify the platform defines in servermd.h to make them more hardware
+      dependent than OS dependent (#3913, Kurt Lidl).
+ 187. Fix a bug in the search/replace dialog in the Xaw text widget (#3896,
+      Paulo Cesar Pereira de Andrade).
+ 186. Xterm patch #133 (#3894, Thomas Dickey).
+ 185. Fixes for the Xaw TipWidget (#3893, Paulo Cesar Pereira de Andrade).
+ 184. Change CTEXT from/to converters to allow processing of "C1" codes
+      (0x80-0x9f) as ordinary characters for "non-standard" encodings
+      (such as UTF-8) (#3891, Ivan Pascal).
+ 183. Add "software" per-key auto-repeat disabling (#3889, Ivan Pascal).
+ 182. Refix fog.c build problem on Alpha (#3888, Dave Gilbert).
+ 181. Add some new things for the VidMode interface in xf86cfg (#3877,
+      Paulo Cesar Pereira de Andrade).
+ 180. Rework most of the look and feel of xf86cfg, and fix some bugs (#3877,
+      3886, 3892, Paulo Cesar Pereira de Andrade).
+ 179. Add a ProjectRoot to Xaw rather than hard-coding it, so that the
+      pixmap code can find pixmaps and bitmaps on non-standard installations
+      (#3877, Paulo Cesar Pereira de Andrade).
+ 178. Fix a bug in the DRI section parsing (David Dawes).
+ 177. Add support for building shared libraries on BSD/OS (#3876, Kurt Lidl).
+ 176. Add imake support for automatically determining the version for BSD/OS,
+      and update bsdi.cf for the features relevant to the different versions
+      (#3876, 3940, Kurt Lidl).
+ 175. Xterm patch #132 (#3874, Thomas Dickey).
+ 174. Fix rman-related build problems when building external applications
+      (#3869, Matthieu Herrb, #3890, H. J. Lu).
+ 173. Fix a typo in OpenBSD.cf (#3867, Matthieu Herrb).
+ 172. Fix some build warnings (#3864, Ani Joshi).
+ 171. Fix some BSDI typos in hw/sun (#3862, Kurt Lidl).
+ 170. Fix r128 palette save/restore when VT switching (#3861, Ani Joshi).
+ 169. Disable the X server's internal malloc by default (#3860, Keith Packard).
+ 168. Make xdpyinfo and xf86dga fail gracefully when DGA is not enabled
+      in the driver, but the extension is enabled (#3870, Andrew Aitchison).
+ 167. Fix too many xfree calls in lbxproxy (#3907, Matthieu Herrb).
+ 166. Fix uninitialized fd_set mask in lbxproxy (#3906, Matthieu Herrb).
+ 165. Fix typo when printing HSync frequency when not a range
+      (#3895, Andrew Aitchison).
+ 164. Fix a window unmapping bug in the mioverlay code (Mark Vojkovich).
+ 163. Attempt to improve memory detection reliability in the Matrox driver
+      (Mark Vojkovich). 
+ 162. Fix possible SEGV in generic int10 module (Marc La France).
+ 161. Fix *BSD aperture driver to allow for int10 (Bernd Ernesti,
+      Marc La France).
+ 160. Fix vesafb restore problem in ATI driver (Marc La France).
+ 159. Fix a few more compilation glitches (Marc La France).
+ 158. Fix DRM for gamma for single and dual MX chips (Alan Hourihane).
+ 157. Fix Mesa for single and dual MX chips (Alan Hourihane).
+ 156. Fix Mesa for multiple screen widths (Alan Hourihane).
+ 155. Add DGA support to the glint driver.
+      - Fix initialization of DRI when using single or dual MX's.
+      - Fix register resources.
+      - Turn on more acceleration for DualMX boards.
+      - Fix DualMX boards displaywidth problems at >640 widths.
+      - Fix depth15/16 for PM2v and PM3 chipsets (Alan Hourihane).
+ 154. Use MMIO_xx macros in glint driver (#3904, Michel Danzer).
+ 153. Fix lib/GL/mesa/src/X86/Imakefile for m4 (Alan Hourihane).
+ 152. Fix m4 rules in Imake.tmpl (Alan Hourihane).
+ 151. ATI documentation update (Marc La France).
+ 150. Disable debugging messages from XF86-Misc extension (Marc La France).
+ 149. Ensure XAA always respects user options that disable subsets of its
+      primitives (Marc La France).
+ 148. Bug fix in XAA's CPU-to-screen colour expansion (Marc La France).
+ 147. Finish off XAA's CPU-to-screen colour expansion for 24bpp
+      (Marc La France).
+ 146. When matching adapters to XF86Config sections, the ATI driver will now
+      look at the primary adapter before any other non-primary PCI adapters
+      (Marc La France).
+ 145. Ensure Mach64 acceleration is disabled when using the VGA CRTC
+      (Marc La France).
+ 144. Set a Mach64's scaler/overlay clock divider in preparation for a GATOS
+      merge (Marc La France).
+ 143. Make VBE use its own option instead of DDC's (a consequence of
+      re-entrancy) (Marc La France).
+ 142. Make option processing re-entrant in DDC, int10, VBE and XAA modules, and
+      in the common layer (Marc La France).
+ 141. Add Permedia3 support to the glint driver (Sven Luther).
+ 140. Fix XvPutImage in the client libs so that it can use the BIG-REQUESTS
+      extension (Mark Vojkovich).
+ 139. Fixed xf4bpp for devPrivates in PixmapRec. (Egbert Eich).
+ 138. Fixed laguna driver to map FB after the video RAM size is known
+      (Egbert Eich).
+ 137. Fixed xdm to give up to respawn Xservers if the server crashes
+      more than once within 60 seconds (Egbert Eich).
+ 136. Added VGA default clock option to generic driver (Egbert Eich).
+ 135. Fixed CyberShadow option in Trident driver (Egbert Eich).
+ 134. Fix bug where the cursor is not put back after a failed DGA mode
+      initialization attempt (Mark Vojkovich).
+ 133. Add a missing symbol "AllocateColormapPrivateIndex" (Mark Vojkovich). 
+ 132. Remove Intel 440BX-specific resources from os-support layer
+      (Marc La France).
+ 131. Change ATI driver to mark VGA resources as unused in operating state when
+      appropriate (Marc La France).
+ 130. Fix bug in the generation of default screen layout (Marc La France).
+ 129. Include all resource attributes when printing them (Marc La France).
+ 128. Fix compiled-in input driver list (Marc La France).
+ 127. Allow driver access to resource manipulation functions (Marc La France).
+ 126. Fix a DGA 2.0 crash that happened when bogus mode numbers were sent
+      by the client (Lionel Ulmer).
+ 125. Make a recent shm pixmap fix Xinerama aware (Mark Vojkovich).
+ 124. Fix mode setting bug in ATI driver (Marc La France).
+ 123. Add int10, DDC & VBE support to ATI driver
+      (Andrew C Aitchison, Marc La France).
+ 122. Allow driver to supply DDC module to VBE (Marc La France).
+ 121. Attempt to fix cyrix driver (untested). (Egbert Eich)
+ 120. Added support for 'inactive' devices. (Egbert Eich)
+ 119. Fixed xf86misc extensions. (Egbert Eich)
+ 118. Fixed design of xf86SetAccessFuncs(). Now all old access funcs
+      are returned if the driver asks for them not only the one
+      that is used in OPERATING state. (Egbert Eich)
+ 117. Added a function LoadDrvSubModule() to allow drivers to load
+      sub modules before a screen is allocated. (Egbert Eich)
+ 116. Fixed lndir to handle trailing '/' on path correctly. (Egbert Eich)
+ 115. Undefined i486/i586/i686 in Imake.cf. cpp might predefine
+      them which might cause undesirable results. (Egbert Eich)
+ 114. Updated x86emu. (Egbert Eich)
+ 113. Fixed problems with xf86RegisterResources() if preregistered
+      resources are not marked ResBios. Identical ranges are not considered
+      to conflict with each other. (Egbert Eich)
+ 112. Improved DDC information printout. (Egbert Eich)
+ 111. Added NODDC options to vbe. (Egbert Eich)
+ 110. Added fixes for Lynx OS. (Egbert Eich)
+      Changed int10 code to always map/allocate entire 1Meg. (Egbert Eich)
+ 109. Let int10 code try harder to locate a video bios to work
+      around some system bios bugs. (Holger Veit, Egbert Eich)
+ 108. Modified fbdevProbe() to return the name string representing 
+      the chipset. (Egbert Eich)
+ 107. Minor fixes to i810 driver (Egbert Eich)
+ 106. Fixed format of float numbers in C&T driver. (Jens Taprogge)
+ 105. Added support for the NeoMagic 2360. (Gregory Pomerantz)
+ 104. Add an xf86UnloadSubModule() entry (temporarily disabled)
+      (Marc La France).
+ 103. Fix missing symbol "ServerGrabCallback" (Mark Vojkovich).
+ 102. Fix XAA problems with CPU-to-screen colour expansion (Marc La France).
+ 101. For panel support in the ATI driver, add an entry to the monitor
+      section's mode list for the panel's native resolution (Marc La France).
+ 100. Fix depth24 acceleration problems with 300SX (Alan Hourihane).
+  99. Update glint driver for fb24_32 and ensure memset used in fb is
+      xf86memset when using loader (Alan Hourihane).
+  98. By default, limit ATI 3DRage LTPro's to 200 MHz, instead of 230 MHz
+      (Marc La France).
+  97. Remove some leftover INTERNAL_VS_EXTERNAL_PADDING stuff from the
+      extensions (Mark Vojkovich).
+  96. Fix a NonTE text bug in XAA where zero-height primitives could be passed
+      to the driver (Mark Vojkovich).
+  95. Add CPU-to-screen colour expansion acceleration for Mach64's
+      (Kevin Martin, Marc La France).
+
+XFree86 4.0a (6 April 2000)
+  94. Major OS/2 resync (#3859, Holger Veit).
+  93. Fix some 'XFree86 -configure' problems when multiple cards (#3850,
+      Paulo Cesar Pereira de Andrade).
+  92. New graphical config tool (xf86cfg) (#3850,
+      Paulo Cesar Pereira de Andrade).
+  91. Fix a typo in Xinstall.sh that prevents moving config files to
+      /etc/X11 from being optional (#3858, Richard Gooch).
+  90. Add lt_LT.ISO_8859-4 to locale.alias, and update the lt symbols for
+      xkb (#3857, Ricardas Cepas).
+  89. Fix the return values of some "xkb action" filters (SetControls and
+      RedirectKey) (#3854, Ivan Pascal).
+  88. Fix problems with using "radio group" number one in XKB keyboard
+      descriptions (#3853, Ivan Pascal).
+  87. Fix MIT-SHM crash caused by incorrect reference tracking (#3851,
+      Keith Packard).
+  86. Updates to allow a build on sparc-linux to succeed (#3849,
+      Jakub Jelinek).
+  85. Fix GetImage in XY format in fb at 32bpp (#3848, Keith Packard).
+  84. Add support for 24/32 fb/pixmap format conversion to fb (#3847,
+      Keith Packard).
+  83. Update the r128 driver to use fb and fb24_32, and disable
+      transparency at 24bpp (#3846, Keith Packard).
+  82. Let the server continue when a font path element in the default path
+      is found to be invalid (#3843, Keith Packard).
+  81. Fix parsing of the Group keyword in the DRI section of the config file
+      (#3842, Stefan Dirsch, David Dawes).
+  80. Add support for YUV422, YV12, RGB15 and RGB16 XvImages to the C&T driver
+      (#3840, David Bateman).
+  79. Change the config file Xkb* option priority.  Now, if XkbKeymap is
+      set it will be tried first.  If a component is present it will override
+      components computed from ruls/module/layout/etc (#3839, Ivan Pascal).
+  78. Fix an infinite loop problem that can show up in makedepend (#3838, A.10,
+      Jeremy Buhler).
+  77. Fix Overlay support in the TI ramdac module (Alan Hourihane).
+  76. Fix mixup between TVP3026/3030 ramdacs in the ramdac module 
+      (Alan Hourihane).
+  75. Increase usage of ReadPixmap within XAA (Mark Vojkovich).
+  74. Allow the v4l driver to use offscreen YUV surfaces exported by the
+      chipset drivers (Gerd Knorr).
+  73. Change xf86LoadModules() so that it doesn't quit at the first module
+      that fails to load (David Dawes).
+  72. SIGIO doesn't work on Linux pipes, so diasble it for input devices
+      which are pipes (#3835, Keith Packard).
+  71. Bring the SDK support up to date (#3834, David Bateman).
+  70. Fix an Xlib problem that causes an application crash when inputting
+      cyrillic symbols with the koi8-r locale (and other locales with
+      long esc-sequences) (#3833, Ivan Pascal, #A.15, Serguei Poliakov, #A.34,
+      Stanislav Meduna, #A.40, Rimantas Plaipa, #A.74, Sergei Laskavy).
+  69. Fixes for S3 Trio3D/2X:
+       - flickering for some cards (bad FIFO setting from bios).
+       - workaround for 8MB ram (ramdac can access only 4MB).
+       - adjust clock limits which have been too low.
+      (#3832, Harald Koenig).
+  68. Fix v4l problem with a function being called after the module is
+      unloaded (#3831, gbritton@light-brigade.mit.edu).
+  67. Fixes for the PPC icache flushing code (#3830, Kostas Gewrgiou).
+  66. Fix for /tmp race installing man pages on OpenBSD (#3829,
+      Matthieu Herrb).
+  65. Fix problems building the Xsun and XsunMono servers on
+      NetBSD-current/sparc (#3828, Matthieu Herrb).
+  64. Add a comment to site.def about how to move the /etc/X11 contents to
+      a directory under ProjectRoot (#3827, R Horn).
+  63. Fix an Xaw bug that shows up when usingn c-mode with xedit on Linux
+      (#3824, Paulo Cesar Pereira de Andrade).
+  62. Enable devfs support for the v4l driver (based on #3823,
+      Christopher Sekiya).
+  61. Update for README.FreeBSD (#3822, Kazutaka Yokota).
+  60. Bump the video driver ABI minor version because of interface changes
+      (now 0.2).
+  59. Disable SilkenMouse when IO/MEM resource sharing means that it cannot
+      be reliably used (#382o, Keith Packard and Egbert Eich).
+  58. Fix DGA 1.0 compatibility for mouse events and SetViewport behaviour
+      (#3820, Keith Packard).
+  57. Fix the Linux APM code so that the X server doesn't hang the machine
+      on suspend (#3820, Keith Packard and Egbert Eich).
+  56. Fix problems that break Overlay support in the glint driver (#3818,
+      Michel Dänzer).
+  55. Possible fix for AvailableOptions function and submodule loading
+      for the cirrus driver (David Dawes).
+  54. Add an entry for the GeForce to the Cards file (#A.6, Oliver Lau).
+  53. Fix pswrap build problem when cross compiling (#3815, Jim Gettys).
+  52. Fix a typo in itsy.cf (#3814, Jim Gettys).
+  51. SiS driver fixes:
+       - 630/540/300 display abnormal for all modes.
+       - 630/540/300 cannot enter true color modes.
+       - 530/620 1600x1200x8bpp display abnormal.
+      (#3807, Can-Ru Yeou, SiS).
+  50. Fix a -configure crash in the nv driver (#3805, Jarno Paananen).
+  49. Rendition driver updates:
+       - rename most v_ to verite_ to avoid potential namespace clashes.
+       - add support for VBE DDC and "XFree86 -configure".
+       - fix PROBE_DETECT issues.
+       - Replace a number of ErrorF's with xf86DrvMsg to reduce noise
+         when not requested. A number of debugging messages #ifdef'ed also.
+       - Option "MTRR" reenabled. Was disabled when acceleration was debugged.
+      (#3785, 3808, Dejan Ilic).
+  48. S3virge driver updates:
+       - Revert WAITIDLE to cleanly abort a segfaulting imagewrite.
+       - Start of GX2 fixes.
+       - Add DDC monitor X -configure code.
+       - Update copyrights
+      (#3783, Kevin Brosius).
+  47. Update XSetWMProperties() to set the WM_LOCALE_NAME property (#3780,
+      Peter Novodvorsky).
+  46. Xterm patch #131 (#3777, Thomas Dickey).
+  45. Add some xtest tests to cover some accelerated cases implemented by
+      XAA, and fix some Linux/glibc build problems (#3767, Rik Faith).
+  44. Xineramification of XvImage support (Mark Vojkovich).
+  43. By default, cache writes to selected Mach64 MMIO registers and allow this
+      cache to be disabled (Marc La France).
+  42. Add detection of Rage128 Mobility to ATI driver (Marc La France).
+  41. Fix a Xinerama GetImage bug that showed up in 24+32 (Mark Vojkovich).
+  40. Fix XAA transparent blits.  They are broken in 4.0 (Mark Vojkovich).
+  39. Fix typo in mioverlay that broke resize gravity (Mark Vojkovich).
+  38. Fix PCI/AGP bridge I/O and memory window detection (Marc La France).
+  37. Add Mach64 solid zero-width line acceleration, except for 24bpp
+      (Kevin Martin, Marc La France).
+  36. Add Mach64 mono 8x8 pattern fill acceleration (Kevin Martin,
+      Marc La France).
+  35. Fix DDC bug (John McCorquodale).
+  34. Fix minClock and maxClock determination in ATI driver (Marc La France).
+  33. A first step at allowing -configure to deal with more than one device per
+      driver (Marc La France).
+  32. ATI driver changes:  Implement Mach64 engine restriction on virtual
+      resolution;  Add DPMS support;  More DSP calculation fixes;  Fix text
+      mode restoration bug;  Fix Mach64 screen blanking;  Don't probe for
+      previously claimed VGA compatibles;  Fix device section matching for
+      Mach64 controllers made by UMC foundry;  Miscellaneous cleanups
+      (Marc La France).
+  31. Add GLINT 300SX support to the glint driver (Alan Hourihane).
+  30. Remove the unused GLINT Delta code (for now) to re-implement as
+      a chipset (like the gamma) from the glint driver (Alan Hourihane).
+  29. Add support for the TVP3026 ramdac to the ramdac module (Alan Hourihane).
+  28. Add support for building and installing HTML versions of the man
+      pages (David Dawes).
+  27. Fix some limitation in rman so that it will handle our man pages
+      correctly (David Dawes).
+  26. Import rman-3.0.8, for generating HTML versions of the man pages
+      (David Dawes).
+  25. ATI fixes to Cards database (Marc La France).
+  24. Fix some man page formatting problems that show up on some platforms
+      (David Dawes).
+  23. Fix an 8+24 bug that occured when shared memory pixmaps were used as
+      tiles (Mark Vojkovich). 
+  22. Support for the Trident CyberBlade/DSTN/i1 (Alan Hourihane).
+  21. Fix Xinerama problems that occured when screen zero was not at (0,0)
+      (Mark Vojkovich).
+  20. Add untested support for Matrox SDRAM G400s (Mark Vojkovich).
+  19. Improve memory probing reliability in the Matrox driver (Mark Vojkovich).
+  18. Fix DESIGN doc and XF86Config man page information about the Screen
+      entry format in the ServerLayout sections (David Dawes).
+  17. Add missing file permission flags to xf86shmget (Mark Vojkovich).
+  16. Workaround in 8+32 for applications that assume changes to window
+      background pixmaps go into effect immediately (Mark Vojkovich).
+  15. Change loader search order to look in more specific subdirectories first,
+      thereby avoiding loading 3.3.* module versions (Marc La France).
+  14. Remove the var-* bindist files for platforms that don't use Xvar.tgz
+      (David Dawes).
+  13. No Xset.tgz, so remove the set-list bindist files (David Dawes).
+  12. Fix Xinstall's symlink testing for Solaris (/bin/sh's builtin doesn't
+      recognise '-L') (David Dawes).
+  11. Update Xinstall.sh to handle the xkb/compiled directory properly in all
+      cases, including when there is no Xvar.tgz tarball (David Dawes).
+  10. Add missing cs_CZ.ISO_8859-2 entries to locale.alias (#A.20,
+      Cejka Rudolf).
+   9. Updates to Linux-ix86 bindist host.def file.
+   8. Fix installation of iso8859-{1,2,3} Compose files, and fix the czech
+      entry in locale.alias (Charles Lopes, #A.62, Stanislav Brabec).
+   7. Fix some problems with layers forgetting that SwitchMode is an
+      optional function (Mark Vojkovich).
+   6. Parser bug fix for hexadecimal numbers (Marc La France).
+   5. Fix scanpci (Marc La France).
+   4. DPMS #include fix (Marc La France).
+   3. Fix an event ordering problem in Xinerama (Mark Vojkovich).
+   2. Fix some clipping bugs in the Xv DDX (Mark Vojkovich).
+   1. Remove 24bpp shadowfb support from the NV driver since the hardware
+      is not capable of 24bpp (Mark Vojkovich).
+
 XFree86 4.0 (8 March 2000)
 3972. Possible fix for a cirrus driver crash when using -configure
       (David Dawes).
@@ -94,7 +875,7 @@
       Thomas Mueller).
 3920. Update the wacom input driver to suppor the PL400 model and the
       stroking pen on the Intuos model (#3778, Frederic Lepied).
-3919. Xterm patch #131 (#3777, Thomas Dickey).
+3919. -
 3918. -
 3917. Add prototypes for xman, and eliminate most of the compiler warnings
       (#3772, Thomas Dickey).
@@ -103,7 +884,8 @@
       when hardware clipping is not available (Mark Vojkovich).
 3914. Update the mga man page (Mark Vojkovich).
 3913. A Q&D fix for GLX segment violation in loader server (Marc La France).
-3912. Add Mach64 screen-to-screen copy acceleration (Marc La France).
+3912. Add Mach64 screen-to-screen copy acceleration (Kevin Martin,
+      Marc La France).
 3911. IA-64 fixes (Mark Vojkovich).
 3910. Add skeleton man pages for the video and input drivers that don't
       already have one (David Dawes).
@@ -164,7 +946,7 @@
 3883. Update Xinstall.sh for NetBSD-current-ELF (#3754, Matthieu Herrb).
 3882. Update NetBSD and OpenBSD bindist files (#3753, Matthieu Herrb).
 3881. Apm driver update, including extending the Rush extension to allow
-      initialisation of the Rush chip in a legal way (#3751, Loic Grenie).
+      initialisation of the Rush chip in a legal way (#3752, Loic Grenie).
 3880. Xterm patch #129 (#3751, Thomas Dickey).
 3879. Add DDC support to the tdfx driver via the vbe interface (#3750,
       Jarno Paananen).
@@ -10035,4 +10817,4 @@
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1079 2000/03/08 19:27:44 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1230 2000/07/02 02:35:25 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/DebuggingHints
diff -u /dev/null xc/programs/Xserver/hw/xfree86/DebuggingHints:1.1
--- /dev/null	Sat Jul  1 20:42:22 2000
+++ xc/programs/Xserver/hw/xfree86/DebuggingHints	Fri Apr 28 11:22:01 2000
@@ -0,0 +1,192 @@
+
+                        Xserver Debugging
+                        =================
+
+This file is  intended to collect helpful hints  on Xserver debugging.
+I merely outline my experiences  here. Somebody else might have better
+methods on  doing it. This person  is therefore invited  to share this
+experience with the rest of the world by adding it here.
+
+Paul Flinders has made some patches to gdb to add support for loadable
+modules.  This version  of gdb  is currently  available as  binary for
+Linux/x86 on Paul's web site:
+
+         www.dawa.demon.co.uk/xfree-gdb
+
+This web-site also contains the patches to gdb 4.18 so you may port it
+to other platforms.
+
+It  loads  the module  symbols  and  supports  all gdb  features  like
+breakpointing, disassembling  and single  stepping. It also  shows the
+exact location of a signal 11. Paul  has fixed the code so that all of
+this is  working even  if using modules  compiled without -g.  You can
+find his latest version on his web site.
+
+If no module aware gdb is available the following hints might help:
+
+1. Use remote  login. This  can be done  thru a network  connection or
+   simply by  connecting a serial  console. This enables you  to watch
+   the  Xservers output while  running set  breakpoints with  gdb etc.
+   Don't even try  to run the Xserver from  a system console. Whenever
+   something  happens gdb  waits for  input. However  the  Xserver has
+   locked the system console  including the keyboard, therefore you'll
+   never  be able  to send  any  input to  gdb. Even  if your  process
+   doesn't crash or you haven't set any breakpoints a vt switch can be
+   hazardous: When doing vt switching a signal is sent; unless you did
+         
+   gdb> handle SIGUSR1 nostop
+
+   gdb waits  for you to continue  the program which  cannot happen as
+   you don't have access to gdb's console.
+
+2. You can  compile any source  file with debugging symbols  to obtain
+   more information  about where an  error occurred. Simply go  to the
+   directory which holds the corresponding object file and do:
+            
+   # rm <file>.o
+   # xc/config/util/makeg.sh <file>.o
+
+   After  relinking the server  or module  gdb is  able to  obtain the
+   necessary debugging information and will show the exact line in the
+   source  where the error ccurred. See also:
+   xc/config/util/makeg.man.
+
+3. In some cases it might be  useful to have the assembler output of a
+   compiled source file. This can be obtained by doing:
+    
+   # make <file>.s
+   
+   or 
+ 
+   # xc/config/util/makeg.sh <file>.s
+
+   Make will use exactly the same rules it uses for building *.o files.
+
+4. In some cases it might be useful to set breakpoints in modules.  If
+   no module  aware gdb is available you  should add a call  to one of
+   the three dummy breakpoint functions
+
+   xf86Break1(), xf86Break2() and xf86Break3()
+
+   to the source  file and recompile the module. You  now just have to
+   set  a  breakpoint  onto  the appropriate  dummy  functions.  These
+   functions are located in the  core part of the server and therefore
+   will be available any time.
+
+5. Without module support gdb is  not able to print the function where
+   an error occurred in a module.
+
+     If you get a line like:
+
+   (gdb) bt
+   #0  0x823b4f5 in ?? ()
+   ....
+
+   You may obtain the function the address belongs to by calling 
+   LoaderPrintSymbol():
+
+   (gdb) call LoaderPrintSymbol(0x823b4f5)
+
+   The symbol  returned might not always  be the name  of the function
+   which contains the address. In  case of static functions the symbol
+   is not known to  the loader. However LoaderPrintSymbol() will print
+   the nearest known  function and the offset from  its start. You may
+   easily find the exact location of the address if you do:
+
+   # objdump --disassemble <file>.o
+
+   <file>.o is the name of the object file containing the symbol printed.
+
+6. Locating static  symbols in modules is  simpler if the  module is a
+   single object  file instead  of a library.  Such a object  file can
+   easily  be build  from  a  library: #  mkdir  tmp #  cd  tmp; ar  x
+   module-path/<libname>.a # ld -r *.o -o module-path/<name>.o
+   
+   When calling  LoaderPrintSymbol() the closes public  symbol will be
+   printed together with  the offset from the symbol's  address.  If a
+   static symbol comes before the  first public symbol in a module The
+   following trick may help:
+
+   create a file 1-<name>.c in tmp/
+   containing:
+   void Dummy-<name>() {}
+    
+   Compile it:
+
+   # gcc -c 1-<name>.c
+
+   and do the link step above.
+
+   This way  Dummy-<name>() will be  the first public function  in the
+   module.   All  addresses in  static  function  can  now be  printed
+   relatively to this address if no other public function comes before
+   this static one.
+
+7. In some situations it is  quite helpful to add debugging symbols to
+   the binary.  This can  be done per  object file. Simply  remove the
+   object file and do
+
+   # makeg
+
+   When looking  for a bug  in a module  these debugging infos  can be
+   very helpful:  Calling LoaderPrintSymbol() as  described above will
+   return a  function and an offset  giving the exact  location of the
+   address  with   respect  to   this  function  entry   point.   When
+   disassembling an  object file with debugging symbols:  # objdump -d
+   -l <file>.o one will  receive a disassembled output containing line
+   number  information. Thus  one can  locate the  exact line  of code
+   where the error occurred.
+
+8. To quickly trace the value of a variable declared in a module three
+   dummy variables have been added to the core part:
+
+   CARD32 xf86DummyVar1;
+   CARD32 xf86DummyVar2;
+   CARD32 xf86DummyVar3;
+
+   The variable can  be assigned to one of them. One  can then use gdb
+   to return the value of this variable:
+
+   gdb> p /x xf86DummyVar1
+
+9. Sometimes it might be useful to check how the preprocessor replaced
+   symbols. One can  obtain a preprocessed version of  the source file
+   by doing:
+
+   make <filename>.i
+
+   This will generate a preprocessed source in <filename>.i.
+
+10. xfree() can catch  if one tries to free a  memory range twice. You
+    will get the message:
+
+       Xalloc error: range already freed in Xrealloc() :-(
+
+  To  find  the  location  from  which  xfree()  was  called  one  can
+  breakpoint on XfreeTrap(). The backtrace should show the origin of the
+  call this call. 
+
+11. To access mapped physical  memory the following functions might be
+    useful.  
+
+    These may be used to  access physical memory that was mapped using
+    the flags VIDMEM_FRAMEBUFFER or VIDMEM_MMIO32:
+
+      CARD8  xf86PeekFb8(CARD8  *p);
+      CARD16 xf86PeekFb16(CARD16 *p);
+      CARD32 xf86PeekFb32(CARD32 *p);
+      void xf86PokeFb8(CARD8  *p, CARD8  v);
+      void xf86PokeFb16(CARD16 *p, CARD16 v);
+      void xf86PokeFb32(CARD16 *p, CARD32 v);
+
+    Physical memory which was  mapped by setting VIDMEM_MMIO should be
+    accessed using the following.  Here  the base address to which the
+    memory is mapped and the offset are required separately.
+
+      CARD8  xf86PeekMmio8(pointer Base, unsigned long Offset);
+      CARD16 xf86PeekMmio16(pointer Base, unsigned long Offset);
+      CARD32 xf86PeekMmio32(pointer Base, unsigned long Offset);
+      void xf86PokeMmio8(pointer Base, unsigned long Offset, CARD8  v);
+      void xf86PokeMmio16(pointer Base, unsigned long Offset, CARD16 v);
+      void xf86PokeMmio32(pointer Base, unsigned long Offset, CARD32 v);
+
Index: xc/programs/Xserver/hw/xfree86/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/Imakefile:3.64 xc/programs/Xserver/hw/xfree86/Imakefile:3.68
--- xc/programs/Xserver/hw/xfree86/Imakefile:3.64	Tue Mar  7 21:38:30 2000
+++ xc/programs/Xserver/hw/xfree86/Imakefile	Mon Jun 12 19:28:30 2000
@@ -3,7 +3,7 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.64 2000/03/08 05:38:30 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.68 2000/06/13 02:28:30 dawes Exp $
 
 #include <Server.tmpl>
 #define IHaveSubdirs
@@ -27,6 +27,10 @@
 # endif
 #endif
 
+#if XF8_32Wid
+XF8_32WIDDIR = xf8_32wid
+#endif
+
 #if XF8_32Bpp
 XF8_32BPPDIR = xf8_32bpp
 #endif
@@ -65,7 +69,7 @@
 
 #if !defined(OsfArchitecture) && !defined(AmoebaArchitecture) && \
     !defined(ArcArchitecture) && !defined(Arm32Architecture) && \
-    !defined(PpcArchitecture)
+    !defined(PpcArchitecture) && !defined(MipsArchitecture)
 SUPERPROBE = SuperProbe
 #endif
 
@@ -85,12 +89,16 @@
 DRIVERSDK = sdk
 #endif
 
+#if !BuildServersOnly
+XF86CFGDIR = xf86cfg
+#endif
+
 SUBDIRS = os-support common $(XAADIR) $(XF1BPPDIR) $(XF4BPPDIR) \
           $(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \
 	  drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \
 	  $(RACDIR) $(I2CDIR) $(DDCDIR) $(INPUTDIR) $(INT10DIR) parser \
-          scanpci doc xf86config $(XF86SETUPDIR) dummylib etc \
-          $(SUPERPROBE) $(DRIVERSDK)
+          scanpci doc xf86config $(XF86CFGDIR) $(XF86SETUPDIR) dummylib etc \
+          $(SUPERPROBE) $(DRIVERSDK) $(XF8_32WIDDIR)
 
 #ifndef OS2Architecture
 XF86CONFIG = XF86Config
Index: xc/programs/Xserver/hw/xfree86/RAC.Notes
diff -u xc/programs/Xserver/hw/xfree86/RAC.Notes:1.3 xc/programs/Xserver/hw/xfree86/RAC.Notes:1.4
--- xc/programs/Xserver/hw/xfree86/RAC.Notes:1.3	Fri Dec  3 11:17:20 1999
+++ xc/programs/Xserver/hw/xfree86/RAC.Notes	Mon Apr 17 09:29:50 2000
@@ -488,11 +488,18 @@
 The driver  may replace  the generic access  control functions  for an
 entity by it's own ones.
 
-  void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86AccessPtr p_io,
-			xf86AccessPtr p_mem, xf86AccessPtr p_io_mem,
-			xf86AccessPtr *ppAccessOld);
+  void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs,
+			xf86SetAccessFuncPtr oldFuncs);
 
-Is used  for that. The  driver can pass  three functions: one  for I/O
+  with:
+
+  typedef struct {
+      xf86AccessPtr mem;
+      xf86AccessPtr io;
+      xf86AccessPtr io_mem;
+   } xf86SetAccessFuncRec, *xf86SetAccessFuncPtr;
+
+is used  for that. The  driver can pass  three functions: one  for I/O
 access,  one for memory  access and  one for  combined memory  and I/O
 access.   If  the memory  access  and  combined  access functions  are
 identical the  common level assumes  that the memory access  cannot be
@@ -500,8 +507,8 @@
 the combined access functions are the  same it is assumed that I/O can
 not  be  controlled independently.   If  memory  and  I/O have  to  be
 controlled together  all three  values should be  the same.  If  a non
-NULL value is passed as fifth argument it is interpreted as an address
-where to store  the old access record.  If the  fifth argument is NULL
+NULL value is passed as third argument it is interpreted as an address
+where to store  the old access records. If the  third argument is NULL
 it will  be assumed that the  generic access should  be enabled before
 replacing the  access functions.  Otherwise  it will be  disabled. The
 driver may enable them itself  using the returned values. It should do
Index: xc/programs/Xserver/hw/xfree86/XF86Config.cpp
diff -u xc/programs/Xserver/hw/xfree86/XF86Config.cpp:1.3 xc/programs/Xserver/hw/xfree86/XF86Config.cpp:1.10
--- xc/programs/Xserver/hw/xfree86/XF86Config.cpp:1.3	Wed Mar  8 11:12:44 2000
+++ xc/programs/Xserver/hw/xfree86/XF86Config.cpp	Mon Jun 19 22:08:42 2000
@@ -1,5 +1,7 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Config.cpp,v 1.3 2000/03/08 19:12:44 dawes Exp $
-.TH XF86Config __filemansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86Config.cpp,v 1.10 2000/06/20 05:08:42 dawes Exp $
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH XF86Config __filemansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 XF86Config - Configuration File for XFree86
 .SH DESCRIPTION
@@ -84,8 +86,10 @@
 .PP
 .RS 4
 .nf
-.BI "Section """ SectionName """"
-.I  "    SectionEntry"
+.\" Some man macros don't handle quotes in .BI, etc very well
+.\" \fBSection "\fP\fISectionName\fP\fB"\fP
+.BI "Section  \*q" SectionName \*q
+.RI "    " SectionEntry
     ...
 .B EndSection
 .fi
@@ -162,10 +166,13 @@
 .nf
 .BR "Integer     " "an integer number in decimal, hex or octal"
 .BR "Real        " "a floating point number"
-.BR "String      " "a string enclosed in double quote marks ("")"
+.BR "String      " "a string enclosed in double quote marks (\*q)"
 .fi
 .RE
 .PP
+Note: hex integer values must be prefixed with "0x", and octal values
+with "0".
+.PP
 A special keyword called
 .B Option
 may be used to provide free-form data to various components of the server.
@@ -214,18 +221,18 @@
 .RE
 .PP
 If an option name is prefixed with
-.RB """" No """",
+.RB \*q No \*q,
 then the option value is negated.
 .PP
 Example: the following option entries are equivalent:
 .PP
 .RS 4
 .nf
-.B "Option ""Accel""   ""Off"""
-.B "Option ""NoAccel"""
-.B "Option ""NoAccel"" ""On"""
-.B "Option ""Accel""   ""false"""
-.B "Option ""Accel""   ""no"""
+.B "Option \*qAccel\*q   \*qOff\*q"
+.B "Option \*qNoAccel\*q"
+.B "Option \*qNoAccel\*q \*qOn\*q"
+.B "Option \*qAccel\*q   \*qfalse\*q"
+.B "Option \*qAccel\*q   \*qno\*q"
 .fi
 .RE
 .PP
@@ -256,14 +263,14 @@
 file.
 The entries that can appear in this section are:
 .TP 7
-.BI "FontPath """ path """"
+.BI "FontPath \*q" path \*q
 sets the search path for fonts.  This path is a comma separated
 list of font path elements which the X server searches for font databases.
 Multiple
 .B FontPath
 entries may be specified, and they will be
 concatenated to build up the fontpath used by the server.
-Font path elements may be either absolute directory paths, or the
+Font path elements may be either absolute directory paths, or
 a font server identifier.  Font server identifiers have the form:
 .PP
 .RS 11
@@ -318,7 +325,7 @@
 font path when the server starts up.
 .RE
 .TP 7
-.BI "RGBPath """ path """"
+.BI "RGBPath \*q" path \*q
 sets the path name for the RGB color database.
 When this entry is not specified in the config file, the server falls back
 to the compiled-in default RGB path, which is:
@@ -327,7 +334,7 @@
 __projectroot__/lib/X11/rgb
 .RE
 .TP 7
-.BI "ModulePath """ path """"
+.BI "ModulePath \*q" path \*q
 sets the search path for loadable X server modules.  This path is a
 comma separated list of directories which the X server searches for
 loadable modules loading in the order specified.  Multiple
@@ -337,7 +344,7 @@
 .\" The LogFile keyword is not currently implemented
 .ig
 .TP 7
-.BI "LogFile """ path """"
+.BI "LogFile \*q" path \*q
 sets the name of the X server log file.  The default log file name is
 .PP
 .RS 11
@@ -368,7 +375,7 @@
 command line equivalent is used.  The options recognised by this section
 are:
 .TP 7
-.BI "Option ""NoTrapSignals""  """ boolean """"
+.BI "Option \*qNoTrapSignals\*q  \*q" boolean \*q
 This prevents the X server from trapping a range of unexpected
 fatal signals and exiting cleanly.  Instead, the X server will die
 and drop core where the fault occurred.  The default behaviour is
@@ -376,14 +383,14 @@
 general you never want to use this option unless you are debugging
 an X server problem and know how to deal with the consequences.
 .TP 7
-.BI "Option ""DontZap""  """ boolean """"
+.BI "Option \*qDontZap\*q  \*q" boolean \*q
 This disallows the use of the
 .B Ctrl+Alt+Backspace
 sequence.  That sequence is normally used to terminate the X server.
 When this option is enabled, that key sequence has no special meaning
 and is passed to clients.  Default: off.
 .TP 7
-.BI "Option ""DontZoom""  """ boolean """"
+.BI "Option \*qDontZoom\*q  \*q" boolean \*q
 This disallows the use of the
 .B Ctrl+Alt+Keypad-Plus
 and
@@ -392,29 +399,29 @@
 When this option is enabled, those key sequences have no special meaning
 and are passed to clients.  Default: off.
 .TP 7
-.BI "Option ""DisableVidModeExtension""  """ boolean """"
+.BI "Option \*qDisableVidModeExtension\*q  \*q" boolean \*q
 This disables the parts of the VidMode extension used by the xvidtune client
 that can be used to change the video modes.  Default: the VidMode extension
 is enabled.
 .TP 7
-.BI "Option ""AllowNonLocalXvidtune""  """ boolean """"
+.BI "Option \*qAllowNonLocalXvidtune\*q  \*q" boolean \*q
 This allows the xvidtune client (and other clients that use the VidMode
 extension) to connect from another host.  Default: off.
 .TP 7
-.BI "Option ""DisableModInDev""  """ boolean """"
+.BI "Option \*qDisableModInDev\*q  \*q" boolean \*q
 This disables the parts of the XFree86-Misc extension that can be used to
 modify the input device settings dynamically.  Default: that functionality
 is enabled.
 .TP 7
-.BI "Option ""AllowNonLocalModInDev""  """ boolean """"
+.BI "Option \*qAllowNonLocalModInDev\*q  \*q" boolean \*q
 This allows a client to connect from another host and change keyboard
 and mouse settings in the running server.  Default: off.
 .TP 7
-.BI "Option ""AllowMouseOpenFail""  """ boolean """"
+.BI "Option \*qAllowMouseOpenFail\*q  \*q" boolean \*q
 This allows the server to start up even if the mouse device can't be
 opened/initialised.  Default: false.
 .TP 7
-.BI "Option ""VTInit""  """ command """"
+.BI "Option \*qVTInit\*q  \*q" command \*q
 Runs
 .I command
 after the VT used by the server has been opened.
@@ -423,7 +430,7 @@
 of this option is to allow system dependent VT initialisation
 commands to be run.  This option should rarely be needed.  Default: not set.
 .TP 7
-.BI "Option ""VTSysReq""  """ boolean """"
+.BI "Option \*qVTSysReq\*q  \*q" boolean \*q
 enables the SYSV-style VT switch sequence for non-SYSV systems
 which support VT switching.  This sequence is
 .B Alt-SysRq
@@ -436,26 +443,26 @@
 .\" The following four options are "undocumented".
 .ig
 .TP 7
-.BI "Option ""PciProbe1"""
+.BI "Option \*qPciProbe1\*q"
 Use PCI probe method 1.  Default: set.
 .TP 7
-.BI "Option ""PciProbe2"""
+.BI "Option \*qPciProbe2\*q"
 Use PCI probe method 2.  Default: not set.
 .TP 7
-.BI "Option ""PciForceConfig1"""
+.BI "Option \*qPciForceConfig1\*q"
 Force the use PCI config type 1.  Default: not set.
 .TP 7
-.BI "Option ""PciForceConfig2"""
+.BI "Option \*qPciForceConfig2\*q"
 Force the use PCI config type 2.  Default: not set.
 ..
 .TP 7
-.BI "Option ""BlankTime""  """ time """"
+.BI "Option \*qBlankTime\*q  \*q" time \*q
 sets the inactivity timeout for the blanking phase of the screensaver.
 .I time
 is in minutes.  This is equivalent to the Xserver's `-s' flag, and the
 value can be changed at run-time with \fIxset(1)\fP.  Default: 10 minutes.
 .TP 7
-.BI "Option ""StandbyTime""  """ time """"
+.BI "Option \*qStandbyTime\*q  \*q" time \*q
 sets the inactivity timeout for the "standby" phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run-time with \fIxset(1)\fP.
@@ -463,10 +470,10 @@
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.  It is only enabled for screens that
 have the
-.B """DPMS"""
-option set. 
+.B \*qDPMS\*q
+option set (see the MONITOR section below). 
 .TP 7
-.BI "Option ""SuspendTime""  """ time """"
+.BI "Option \*qSuspendTime\*q  \*q" time \*q
 sets the inactivity timeout for the "suspend" phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run-time with \fIxset(1)\fP.
@@ -474,10 +481,10 @@
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.  It is only enabled for screens that
 have the
-.B """DPMS"""
-option set. 
+.B \*qDPMS\*q
+option set (see the MONITOR section below). 
 .TP 7
-.BI "Option ""OffTime""  """ time """"
+.BI "Option \*qOffTime\*q  \*q" time \*q
 sets the inactivity timeout for the "off" phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run-time with \fIxset(1)\fP.
@@ -485,28 +492,28 @@
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.  It is only enabled for screens that
 have the
-.B """DPMS"""
-option set. 
+.B \*qDPMS\*q
+option set (see the MONITOR section below). 
 .TP 7
-.BI "Option ""Pixmap""  """ bpp """"
+.BI "Option \*qPixmap\*q  \*q" bpp \*q
 This sets the pixmap format to use for depth 24.  Allowed values for
 .I bpp
 are 24 and 32.  Default: 32 unless driver constraints don't allow this
 (which is rare).  Note: some clients don't behave well when
 this value is set to 24.
 .TP 7
-.BI "Option ""PC98""  """ boolean """"
+.BI "Option \*qPC98\*q  \*q" boolean \*q
 Specify that the machine is a Japanese PC-98 machine.  This should not
 be enabled for anything other than the Japanese-specific PC-98
 architecture.  Default: auto-detected.
 .\" Doubt this should be documented.
 .ig
 .TP 7
-.BI "Option ""EstimateSizesAggressively""  """ value """"
+.BI "Option \*qEstimateSizesAggressively\*q  \*q" value \*q
 This option affects the way that bus resource sizes are estimated.  Default: 0.
 ..
 .TP 7
-.BI "Option ""NoPM""  """ boolean """"
+.BI "Option \*qNoPM\*q  \*q" boolean \*q
 Disables something to do with power management events.  Default: PM enabled
 on platforms that support it.
 .SH MODULE SECTION
@@ -523,7 +530,7 @@
 .B Load
 keyword, as described here:
 .TP 7
-.BI "Load  """ modulename """"
+.BI "Load  \*q" modulename \*q
 This instructs the server to load the module called
 .IR modulename .
 The module name given should be the module's standard name, not the
@@ -534,7 +541,7 @@
 Example: the Type 1 font rasteriser can be loaded with the following entry:
 .PP
 .RS 4
-.B "Load ""type1"""
+.B "Load \*qtype1\*q"
 .RE
 .RE
 .PP
@@ -552,8 +559,8 @@
 .PP
 .RS 4
 .nf
-.B "SubSection ""extmod"""
-.B "   Option  ""omit XFree86-DGA"""
+.B "SubSection \*qextmod\*q"
+.B "   Option  \*qomit XFree86-DGA\*q"
 .B EndSubSection
 .fi
 .RE
@@ -590,9 +597,9 @@
 .PP
 .RS 4
 .nf
-.B  "Section ""InputDevice"""
-.BI "    Identifier """ name """"
-.BI "    Driver     """ inputdriver """"
+.B  "Section \*qInputDevice\*q"
+.BI "    Identifier \*q" name \*q
+.BI "    Driver     \*q" inputdriver \*q
 .I  "    options"
 .I  "    ..."
 .B  "EndSection"
@@ -605,7 +612,7 @@
 .B Driver
 entry specifies the name of the driver to use for this input device.
 When using the loadable server, the input driver module
-.RI """ inputdriver """
+.RI \*q inputdriver \*q
 will be loaded for each active
 .B InputDevice
 section.  An
@@ -625,7 +632,7 @@
 which are described here.  See the individual input driver manual pages
 for a description of the device-specific options.
 .TP 7
-.BI "Option ""CorePointer"""
+.BI "Option \*qCorePointer\*q"
 When this is set, the input device is installed as the core (primary)
 pointer device.  There must be exactly one core pointer.  If this option
 is not set here, or in the
@@ -638,7 +645,7 @@
 .B Pointer
 section is used.
 .TP 7
-.BI "Option ""CoreKeyboard"""
+.BI "Option \*qCoreKeyboard\*q"
 When this is set, the input device is to be installed as the core
 (primary) keyboard device.  There must be exactly one core keyboard.  If
 this option is not set here, in the
@@ -651,18 +658,18 @@
 .B Keyboard
 section is used.
 .TP 7
-.BI "Option ""AlwaysCore""  """ boolean """"
+.BI "Option \*qAlwaysCore\*q  \*q" boolean \*q
 .TP 7
-.BI "Option ""SendCoreEvents""  """ boolean """"
+.BI "Option \*qSendCoreEvents\*q  \*q" boolean \*q
 Both of these options are equivalent, and when enabled cause the
 input device to always report core events.  This can be used, for
 example, to allow an additional pointer device to generate core
 pointer events (like moving the cursor, etc).
 .TP 4
-.BI "Option ""HistorySize""  """ number """"
+.BI "Option \*qHistorySize\*q  \*q" number \*q
 Sets the motion history size.  Default: 0.
 .TP 7
-.BI "Option ""SendDragEvents""  """ boolean """"
+.BI "Option \*qSendDragEvents\*q  \*q" boolean \*q
 ???
 .SH DEVICE SECTION
 The config file may have multiple
@@ -674,9 +681,9 @@
 .PP
 .RS 4
 .nf
-.B  "Section ""Device"""
-.BI "    Identifier """ name """"
-.BI "    Driver     """ driver """"
+.B  "Section \*qDevice\*q"
+.BI "    Identifier \*q" name \*q
+.BI "    Driver     \*q" driver \*q
 .I  "    entries"
 .I  "    ..."
 .B  "EndSection"
@@ -689,7 +696,7 @@
 .B Driver
 entry specifies the name of the driver to use for this graphics device.
 When using the loadable server, the driver module
-.RI """ driver """
+.RI \*q driver \*q
 will be loaded for each active
 .B Device
 section.  A
@@ -714,7 +721,7 @@
 .B Device
 section.
 .TP 7
-.BI "BusID  """ bus-id """"
+.BI "BusID  \*q" bus-id \*q
 This specifies the bus location of the graphics card.  For PCI/AGP cards,
 the
 .I bus-id
@@ -729,15 +736,28 @@
 can usually be found by running the X server with the
 .B \-scanpci
 command line option.
+.TP 7
+.BI "Screen  " number
+This option is mandatory for cards where a single PCI entity can drive more
+than one display (i.e., multiple CRTCs sharing a single graphics accelerator
+and video memory).  One
+.B Device
+section is required for each head, and this
+parameter determines which head each of the
+.B Device
+sections applies to.  The legal values of
+.I number
+range from 0 to one less than the total number of heads per entity.
+Most drivers require that the primary screen (0) be present.
 .TP 7
-.BI "Chipset  """ chipset """"
+.BI "Chipset  \*q" chipset \*q
 This usually optional entry specifies the chipset used on the graphics
 board.  In most cases this entry is not required because the drivers
 will probe the hardware to determine the chipset type.  Don't
 specify it unless the driver-specific documentation recommends that you
 do.
 .TP 7
-.BI "Ramdac  """ ramdac-type """"
+.BI "Ramdac  \*q" ramdac-type \*q
 This optional entry specifies the type of RAMDAC used on the graphics
 board.  This is only used by a few of the drivers, and in most cases it
 is not required because the drivers will probe the hardware to determine
@@ -769,7 +789,7 @@
 boards with non-programmable clocks.  Don't specify this entry unless
 the driver-specific documentation explicitly recommends that you do.
 .TP
-.BI "ClockChip  """ clockchip-type """"
+.BI "ClockChip  \*q" clockchip-type \*q
 This optional entry is used to specify the clock chip type on
 graphics boards which have a programmable clock generator.  Only
 a few X servers support programmable clock chips.  For details,
@@ -840,8 +860,8 @@
 .PP
 .RS 4
 .nf
-.B  "Section ""Monitor"""
-.BI "    Identifier """ name """"
+.B  "Section \*qMonitor\*q"
+.BI "    Identifier \*q" name \*q
 .I  "    entries"
 .I  "    ..."
 .B  "EndSection"
@@ -871,10 +891,10 @@
 .B Monitor
 sections are described below.
 .TP 7
-.BI "VendorName  """ vendor """"
+.BI "VendorName  \*q" vendor \*q
 This optional entry specifies the monitor's manufacturer.
 .TP 7
-.BI "ModelName  """ model """"
+.BI "ModelName  \*q" model \*q
 This optional entry specifies the monitor's model.
 .TP 7
 .BI "HorizSync  " "horizsync-range"
@@ -916,7 +936,7 @@
 0.1 to 10.0, and the default is 1.0.  Not all drivers are capable
 of using this information.
 .TP 7
-.BI "UseModes  """ modesection-id """"
+.BI "UseModes  \*q" modesection-id \*q
 Include the set of modes listed in the
 .B Modes
 section called
@@ -945,27 +965,27 @@
 .BI "VTimings  " "vdisp vsyncstart vsyncend vtotal"
 specifies the vertical timings for the mode.
 .TP 4
-.BI "Flags  """ flag """" " ..."
+.BI "Flags  \*q" flag \*q " ..."
 specifies an optional set of mode flags, each of which is a separate
 string in double quotes.
-.B """Interlace"""
+.B \*qInterlace\*q
 indicates that the mode is interlaced.
-.B """DoubleScan"""
+.B \*qDoubleScan\*q
 indicates a mode where each scanline is doubled.
-.B """+HSync"""
+.B \*q+HSync\*q
 and
-.B """\-HSync"""
+.B \*q\-HSync\*q
 can be used to select the polarity of the HSync signal.
-.B """+VSync"""
+.B \*q+VSync\*q
 and
-.B """\-VSync"""
+.B \*q\-VSync\*q
 can be used to select the polarity of the VSync signal.
-.B """Composite"""
+.B \*qComposite\*q
 can be used to specify composite sync on hardware where this is supported.
 Additionally, on some hardware,
-.B """+CSync"""
+.B \*q+CSync\*q
 and
-.B """\-CSync"""
+.B \*q\-CSync\*q
 may be used to select the composite sync polarity.
 .TP 4
 .BI "HSkew  " hskew
@@ -981,12 +1001,12 @@
 specifies the number of times each scanline is painted on the screen.
 Not all drivers use this information.  Values less than 1 are treated
 as 1, which is the default.  Generally, the
-.B """DoubleScan"""
+.B \*qDoubleScan\*q
 .B Flag
 mentioned above doubles this value.
 .RE
 .TP 7
-.BI "ModeLine  """ name """" " mode-description"
+.BI "ModeLine  \*q" name \*q " mode-description"
 This entry is a more compact version of the
 .B Mode
 entry, and it also can be used to specify video modes for the monitor.
@@ -1048,9 +1068,9 @@
 flags that may be useful to include in
 .B Monitor
 sections (when needed) include
-.BR """DPMS""" ,
+.BR \*qDPMS\*q ,
 and
-.BR """SyncOnGreen""" .
+.BR \*qSyncOnGreen\*q .
 
 .SH MODES SECTION
 The config file may have multiple
@@ -1073,8 +1093,8 @@
 .PP
 .RS 4
 .nf
-.B  "Section ""Modes"""
-.BI "    Identifier """ name """"
+.B  "Section \*qModes\*q"
+.BI "    Identifier \*q" name \*q
 .I  "    entries"
 .I  "    ..."
 .B  "EndSection"
@@ -1116,13 +1136,13 @@
 .PP
 .RS 4
 .nf
-.B  "Section ""Screen"""
-.BI "    Identifier """ name """"
-.BI "    Device     """ devid """"
-.BI "    Monitor    """ monid """"
+.B  "Section \*qScreen\*q"
+.BI "    Identifier \*q" name \*q
+.BI "    Device     \*q" devid \*q
+.BI "    Monitor    \*q" monid \*q
 .I  "    entries"
 .I  "    ..."
-.BI "    SubSection ""Display"""
+.BI "    SubSection \*qDisplay\*q"
 .I  "       entries"
 .I  "       ...
 .B  "    EndSubSection"
@@ -1144,7 +1164,7 @@
 The entries available
 for this section are:
 .TP 7
-.BI "Device  """ device-id """"
+.BI "Device  \*q" device-id \*q
 This specifies the
 .B Device
 section to be used for this screen.  This is what ties a specific
@@ -1156,10 +1176,10 @@
 .B Device
 section in the config file.
 .TP 7
-.BI "Monitor  """ monitor-id """"
+.BI "Monitor  \*q" monitor-id \*q
 specifies which monitor description is to be used for this screen.
 .TP 7
-.BI "VideoAdaptor  """ xv-id """"
+.BI "VideoAdaptor  \*q" xv-id \*q
 specifies an optional Xv video adaptor description to be used with this
 screen.
 .TP 7
@@ -1213,7 +1233,7 @@
 .PP
 .RS 4
 .nf
-.B  "    SubSection ""Display"""
+.B  "    SubSection \*qDisplay\*q"
 .BI "        Depth  " depth
 .I  "        entries"
 .I  "        ..."
@@ -1277,7 +1297,7 @@
 given, then the initial display will be centered in the virtual display
 area.
 .TP 7
-.BI "Modes  """ mode-name """" " ..."
+.BI "Modes  \*q" mode-name \*q " ..."
 This entry is highly desirable for most drivers, and it specifies the list
 of video modes to use.  Each
 .I mode-name
@@ -1297,7 +1317,7 @@
 .B Monitor
 section will be used.
 .TP 7
-.BI "Visual  """ visual-name """"
+.BI "Visual  \*q" visual-name \*q
 This optional entry sets the default root visual type.  This may also
 be specified from the command line (see the
 .I Xserver(1)
@@ -1387,11 +1407,11 @@
 .PP
 .RS 4
 .nf
-.B  "Section ""ServerLayout"""
-.BI "    Identifier   """ name """"
-.BI "    Screen       """ screen-id """"
+.B  "Section \*qServerLayout\*q"
+.BI "    Identifier   \*q" name \*q
+.BI "    Screen       \*q" screen-id \*q
 .I  "    ..."
-.BI "    InputDevice  """ idev-id """"
+.BI "    InputDevice  \*q" idev-id \*q
 .I  "    ..."
 .I  "    options"
 .I  "    ..."
@@ -1415,7 +1435,7 @@
 .PP
 The entries that may be used in this section are described here.
 .TP 7
-.BI "Screen  """ screen-id """" " screen-num  position-information"
+.BI "Screen  " "screen-num" " \*qscreen-id\*q " "position-information"
 One of these entries must be given for each screen being used in
 a session.  The
 .I screen-id
@@ -1438,19 +1458,19 @@
 If the coordinates are omitted or if no positioning information
 is given, (0,0) is assumed.
 .TP 4
-.BI "RightOf   """ screen-id """"
+.BI "RightOf   \*q" screen-id \*q
 .TP 4
-.BI "LeftOf    """ screen-id """"
+.BI "LeftOf    \*q" screen-id \*q
 .TP 4
-.BI "Above     """ screen-id """"
+.BI "Above     \*q" screen-id \*q
 .TP 4
-.BI "Below     """ screen-id """"
+.BI "Below     \*q" screen-id \*q
 .TP 4
-.BI "Relative  """ screen-id """" " x y"
+.BI "Relative  \*q" screen-id \*q " x y"
 These give the screen's location relative to another screen.
 .RE
 .TP 7
-.BI "InputDevice  """ idev-id """ """ option """" " ..."
+.BI "InputDevice  \*q" idev-id "\*q \*q" option \*q " ..."
 One of these entries must be given for each input device being used in
 a session.  Normally at least two are required, one each for the core
 pointer and keyboard devices.  The
@@ -1467,9 +1487,9 @@
 .PP
 .RS 11
 .nf
-.B """CorePointer"""
-.B """CoreKeyboard"""
-.B """SendCoreEvents"""
+.B \*qCorePointer\*q
+.B \*qCoreKeyboard\*q
+.B \*qSendCoreEvents\*q
 .fi
 .RE
 .PP
@@ -1492,14 +1512,14 @@
 .PP
 .RS 4
 .nf
-.B "Section ""ServerLayout"""
-.B "    Identifier  ""Layout 1"""
-.B "    Screen      ""MGA 1"""
-.B "    Screen      ""MGA 2"" RightOf ""MGA 1"""
-.B "    InputDevice ""Keyboard 1"" ""CoreKeyboard"""
-.B "    InputDevice ""Mouse 1""    ""CorePointer"""
-.B "    InputDevice ""Mouse 2""    ""SendCoreEvents"""
-.B "    Option      ""BlankTime""  ""5"""
+.B "Section \*qServerLayout\*q"
+.B "    Identifier  \*qLayout 1\*q"
+.B "    Screen      \*qMGA 1\*q"
+.B "    Screen      \*qMGA 2\*q RightOf \*qMGA 1\*q"
+.B "    InputDevice \*qKeyboard 1\*q \*qCoreKeyboard\*q"
+.B "    InputDevice \*qMouse 1\*q    \*qCorePointer\*q"
+.B "    InputDevice \*qMouse 2\*q    \*qSendCoreEvents\*q"
+.B "    Option      \*qBlankTime\*q  \*q5\*q"
 .B "EndSection"
 .fi
 .RE
@@ -1526,7 +1546,7 @@
 __projectroot__/lib/X11/XF86Config.eg.
 .fi
 .SH "SEE ALSO"
-X(1), Xserver(1), XFree86(1),
+X(__miscmansuffix__), Xserver(1), XFree86(1),
 apm(__drivermansuffix__),
 ati(__drivermansuffix__),
 chips(__drivermansuffix__),
@@ -1550,12 +1570,24 @@
 tseng(__drivermansuffix__),
 v4l(__drivermansuffix__),
 vga(__drivermansuffix__),
-.IR README ,
-.IR RELNOTES ,
-.IR README.mouse ,
-.IR README.DRI ,
-.IR Status ,
-.IR Install .
+.br
+README
+.IR <http://www.xfree86.org/current/README.html> ,
+.br
+RELNOTES
+.IR <http://www.xfree86.org/current/RELNOTES.html> ,
+.br
+README.mouse
+.IR <http://www.xfree86.org/current/mouse.html> ,
+.br
+README.DRI
+.IR <http://www.xfree86.org/current/DRI.html> ,
+.br
+Status
+.IR <http://www.xfree86.org/current/Status.html> ,
+.br
+Install
+.IR <http://www.xfree86.org/current/Install.html> .
 .SH AUTHORS
 This manual page was largely rewritten for XFree86 4.0 by David Dawes
 .IR <dawes@xfree86.org> .
Index: xc/programs/Xserver/hw/xfree86/XF98Conf.cpp
diff -u xc/programs/Xserver/hw/xfree86/XF98Conf.cpp:1.1 xc/programs/Xserver/hw/xfree86/XF98Conf.cpp:1.2
--- xc/programs/Xserver/hw/xfree86/XF98Conf.cpp:1.1	Mon Jul 19 06:36:11 1999
+++ xc/programs/Xserver/hw/xfree86/XF98Conf.cpp	Mon Jun 12 19:28:30 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/XF98Conf.cpp,v 1.1 1999/07/19 13:36:11 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/XF98Conf.cpp,v 1.2 2000/06/13 02:28:30 dawes Exp $
 XCOMM
 XCOMM Copyright (c) 1994-1998 by The XFree86 Project, Inc.
 XCOMM
@@ -473,6 +473,20 @@
     Driver	"mga"
 XCOMM    BusID	"PCI:0:10:0"
 EndSection
+
+Section "Device"
+    Identifier "NECTrident"
+    VendorName "NEC"
+    BoardName  "NEC Trident"
+    Driver     "trident"
+XCOMM    BusID	"PCI:0:8:0"
+XCOMM    Option	"NoPciBurst"
+XCOMM    Option	"XaaNoScreenToScreenCopy"
+XCOMM    Option	"XaaNoCPUToScreenColorExpandFill"
+XCOMM    Option	"XaaNoScanlineCPUToScreenColorExpandFill"
+XCOMM    Option	"XaaNoScreenToScreenColorExpandFill"
+XCOMM    VideoRam	2048
+Endsection
 
 XCOMM **********************************************************************
 XCOMM Screen sections.
Index: xc/programs/Xserver/hw/xfree86/XFree86.cpp
diff -u xc/programs/Xserver/hw/xfree86/XFree86.cpp:1.1 xc/programs/Xserver/hw/xfree86/XFree86.cpp:1.2
--- xc/programs/Xserver/hw/xfree86/XFree86.cpp:1.1	Mon Mar  6 17:37:42 2000
+++ xc/programs/Xserver/hw/xfree86/XFree86.cpp	Thu Jun 15 13:50:02 2000
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.cpp,v 1.1 2000/03/07 01:37:42 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.cpp,v 1.2 2000/06/15 20:50:02 dawes Exp $ 
 .TH XFree86 1 "Version 4.0"  "XFree86"
 .SH NAME
 XFree86 - X11R6 X server
@@ -559,13 +559,13 @@
 Guenther Kelleter, \fIguenther@Pool.Informatik.RWTH-Aachen.de\fP
 Linux/m68k Frame Buffer Device driver
 .TP 8
-Frederic Lepied,   \fLepied@XFree86.Org\fP
+Frederic Lepied,   \fILepied@XFree86.Org\fP
 XInput extension integration. Wacom, joystick and extended mouse drivers.
 .TP 8
-Patrick Lecoanet,   \flecoanet@cena.dgac.fr\fP
+Patrick Lecoanet,   \fIlecoanet@cena.dgac.fr\fP
 Elographics touchscreen driver.
 .TP 8
-Steven Lang,        \ftiger@tyger.org\fP
+Steven Lang,        \fItiger@tyger.org\fP
 SummaSketch tablet driver.
 .PP
  ... and many more people out there on the net who helped with beta-testing
Index: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c
diff -u xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:3.16 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:3.17
--- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c:3.16	Sun Aug  1 00:57:06 1999
+++ xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c	Fri Jun 23 15:42:02 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c,v 3.16 1999/08/01 07:57:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c,v 3.17 2000/06/23 22:42:02 dawes Exp $ */
 /*
  * (c) Copyright 1993,1994 by David Dawes <dawes@xfree86.org>
  *
@@ -74,7 +74,12 @@
 #   include <machine/ioctl_pc.h>
 #  endif
 #  if defined(PCVT_SUPPORT) && !defined(SYSCONS_SUPPORT)
-#   include <machine/pcvt_ioctl.h>
+#   if defined(__NetBSD__) && defined(WSCONS_SUPPORT)
+     /* NetBSD's wscons has a PCVT compatibility module. */
+#    include <dev/wscons/wsdisplay_usl_io.h>
+#   else
+#    include <machine/pcvt_ioctl.h>
+#   endif
 #  endif
 #  ifdef SYSCONS_SUPPORT
     /* both, Free and NetBSD have syscons */
Index: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_LynxOS.c
diff -u xc/programs/Xserver/hw/xfree86/SuperProbe/OS_LynxOS.c:3.7 xc/programs/Xserver/hw/xfree86/SuperProbe/OS_LynxOS.c:3.8
--- xc/programs/Xserver/hw/xfree86/SuperProbe/OS_LynxOS.c:3.7	Thu Jul 10 01:17:19 1997
+++ xc/programs/Xserver/hw/xfree86/SuperProbe/OS_LynxOS.c	Fri Jun 16 17:27:31 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_LynxOS.c,v 3.7 1997/07/10 08:17:19 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_LynxOS.c,v 3.8 2000/06/17 00:27:31 dawes Exp $ */
 /*
  * Copyright 1993 by Thomas Mueller
  *
@@ -30,9 +30,8 @@
 #include <kd.h>
 #include <vt.h>
 #include <smem.h>
+#include <info.h>
 
-#include <kernel.h>		/* for PHYSBASE */
-
 #ifdef __powerpc__
 unsigned char *ioBase = NULL;
 static int IOEnabled;
@@ -141,9 +140,15 @@
 int Len;
 #endif
 {
+	unsigned long physbase;
 	Word tmp;
 	Byte *Base = Bios_Base + Offset;
 
+	physbase = info(_I_PHYSBASE);
+	if (physbase == -1) {
+		fprintf(stderr, "%s: can't inquire PHYSBASE\n", MyName);
+		return(-1);
+	}
 	if (BIOS_fd == -1)
 	{
 		if ((BIOS_fd = open("/dev/mem", O_RDONLY, 0)) < 0)
@@ -157,7 +162,7 @@
 		/*
 	 	 * Sanity check...
 	 	 */
-		(void)lseek(BIOS_fd, (off_t)PHYSBASE + ((off_t)Base & 0xF8000), SEEK_SET);
+		(void)lseek(BIOS_fd, (off_t)physbase + ((off_t)Base & 0xF8000), SEEK_SET);
 		(void)read(BIOS_fd, &tmp, 2);
 		if (tmp != (Word)0xAA55)
 		{
@@ -170,8 +175,8 @@
 			return(-1);
 		}
 	}
-	/* check carefully against -1 because of PHYSBASE offset..	*/
-	if (lseek(BIOS_fd, (off_t)(PHYSBASE + Base), SEEK_SET) == -1)
+	/* check carefully against -1 because of physbase offset..	*/
+	if (lseek(BIOS_fd, (off_t)(physbase + Base), SEEK_SET) == -1)
 	{
 		fprintf(stderr, "%s: BIOS seek failed\n", MyName);
 		return(-1);
Index: xc/programs/Xserver/hw/xfree86/common/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/common/Imakefile:3.114 xc/programs/Xserver/hw/xfree86/common/Imakefile:3.117
--- xc/programs/Xserver/hw/xfree86/common/Imakefile:3.114	Wed Feb 23 21:36:48 2000
+++ xc/programs/Xserver/hw/xfree86/common/Imakefile	Fri Jun 30 10:15:10 2000
@@ -4,7 +4,7 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.114 2000/02/24 05:36:48 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.117 2000/06/30 17:15:10 dawes Exp $
 
 
 
@@ -32,6 +32,11 @@
 # endif
 #endif
 
+#ifdef SparcArchitecture
+	SBUSSRC = xf86sbusBus.c
+	SBUSOBJ = xf86sbusBus.o
+#endif
+
 #if BuildXKB
      XKBDDXSRC = xf86XKB.c
      XKBDDXOBJ = xf86XKB.o
@@ -101,6 +106,7 @@
 	xf86cmap.c\
 	xf86PM.c \
 	$(KBD).c \
+	$(SBUSSRC) \
 	$(XF86_XINPUT_SRC) \
 	$(XINPUT_DEV_SRCS) \
 	$(XKBDDXSRC) \
@@ -131,6 +137,7 @@
 	xf86xv.o \
 	xf86cmap.o\
 	xf86PM.o \
+	$(SBUSOBJ) \
 	$(XF86_XINPUT_OBJ) \
 	$(XKBDDXOBJ) \
 	$(BETAOBJ) \
@@ -158,7 +165,7 @@
 EXP_DEFINES = -DEXPIRY_TIME=XF86ServerExpiry $(EXP_FORCE_DEFINES)
 PROJECTROOT = ProjectRoot
     DRIVERS = XF86CardDrivers
-   IDRIVERS = mouse XInputDrivers
+   IDRIVERS = XInputDrivers
 XCONFIGDEFINES = -DPROJECTROOT='"$(PROJECTROOT)"' \
 		 -DDRIVERS='"$(DRIVERS)"' \
 		 -DIDRIVERS='"$(IDRIVERS)"'
@@ -189,12 +196,16 @@
 LinkFile(xf86IniExt.c,$(SERVERSRC)/mi/miinitext.c)
 LinkSourceFile(xf86Version.h,..)
 LinkSourceFile(xf86Pci.h,$(XF86OSSRC)/bus)
+#ifdef SparcArchitecture
+LinkSourceFile(xf86Sbus.h,$(XF86OSSRC)/bus)
+#endif
 
 #ifndef OS2Architecture
 DependTarget()
 #endif
 
 InstallDriverSDKNonExecFile(compiler.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(fourcc.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xf86.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xf86Module.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xf86Opt.h,$(DRIVERSDKINCLUDEDIR))
Index: xc/programs/Xserver/hw/xfree86/common/NOTES.Mice
diff -u xc/programs/Xserver/hw/xfree86/common/NOTES.Mice:1.1 xc/programs/Xserver/hw/xfree86/common/NOTES.Mice:removed
--- xc/programs/Xserver/hw/xfree86/common/NOTES.Mice:1.1	Sat Feb  7 01:10:38 1998
+++ xc/programs/Xserver/hw/xfree86/common/NOTES.Mice	Sat Jul  1 20:42:36 2000
@@ -1,470 +0,0 @@
-Enhancing Mouse Support in the X server
-
-22 January 1998.
-Kazutaka YOKOTA
-yokota@zodiac.mech.utsunomiya-u.ac.jp,  yokota@freebsd.org
-
-0. Introduction -------------------------------------------------------
-
-Since Microsoft introduced IntelliMouse to the market, manufacturers
-have added new features, such as a wheel/roller and additional
-buttons, to their mouse products.  However, these mice often need
-specific initialization procedure and may use new data format which
-XFree86 servers have not known.
-
-This tar file contains two sets of patches to enhance mouse support in
-the XFree86 servers: one set for 3.3.1 (331.diff) and the other for
-3.9Ac (39Ac.diff).
-
-The diff files modify the following files:
-
-xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
-xc/programs/Xserver/hw/xfree86/common/xf86.h
-xc/programs/Xserver/hw/xfree86/common/xf86_Config.h
-xc/programs/Xserver/hw/xfree86/common/xf86Config.c
-xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
-xc/programs/Xserver/hw/xfree86/common/xf86_PnPMouse.c (NEW FILE)
-xc/programs/Xserver/hw/xfree86/common/xf86Events.c
-xc/programs/Xserver/hw/xfree86/common/xf86Io.c
-xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c
-
-Choose an appropriate diff file and apply it in
-xc/programs/Xserver/hw/xfree86.
-
-%cd xc/programs/Xserver/hw/xfree86
-%patch -p0 < _diff_file_
-
-1. Modifications  -----------------------------------------------------
-
-1.1. Support more mice
-
-The patch adds the support for the following mice:
-
-Kensington ThinkingMouse (serial, PS/2¡¤4 buttons)
-ALPS GlidePoint (PS/2¡¤3 buttons)*1
-Genius NetScroll (PS/2¡¤4 buttons, wheel)
-Genius NetMouse (serial, PS/2, 2 buttons + magic button)
-Genius NetMouse Pro (serial, PS/2, 3 buttons + magic button)
-ASCII MieMouse (serial, PS/2, 3 buttons, knob)
-Logitech MouseMan+ (serial, PS/2, 4 buttons, wheel)
-Logitech FirstMouse+ (serial, PS/2, 3 buttons, wheel)
-
-*1 The serial version of GlidePoint has been supported by XFree86
-since 3.2(?).
-
-To support wheel/roller and additional buttons of the above mice, the
-following enhancements were added:
-
-a) Add support for up to 12 buttons.  XFree86 3.3.1 and 3.9Ac assumed
-the maximum number of buttons for the mouse is 5.
-
-b) Recognize the wheel/roller/magic_button movement as the Z (third)
-axis movement.  I am very aware that the IntelliMouse support in
-XFree86 3.3.1 and 3.9 betas interpret the wheel movement as the button
-4 and 5.  However, some mice have more than three buttons AND a wheel
-as you can see in the above list.  It is overly restrictive to always
-have the wheel movement treated as the button 4 and 5.  Instead, the
-wheel is regarded as the Z axis in this patch.
-
-Ideally, the wheel movement should be handled in the XInput extension
-as the third valuator. I hope this patch will provide the basis for
-such support in the future.
-
-Currently the Z axis movement is NOT reported back to the upper
-routines by xf86MouseProtocol().  In order to let the user to utilize
-this Z axis (wheel) movement, a new option, `ZAxisMapping', is added
-in XF86Config so that the user can choose any pair of buttons or
-another axis (X or Y) to which the Z axis (wheel) movement is
-assigned.
-
-For example, to make the IntelliMouse behave in the same way as
-before, add the following option to XF86Config.
-
-    ZAxisMapping 4 5
-
-c) PS/2 mouse initialization
-The above PS/2 mice need specialized initialization procedure to
-enable their features, otherwise they behave like the standard two
-button (or three button) PS/2 mouse. To initialize these mice, the
-host system must send a sequence of commands which is specific to each
-model.
-
-The PS/2 IntelliMouse support code in XFree86 3.9Ac beta already does
-this.  The same technique is used to initialize the other PS/2 mice in
-this patch.  However, the current implementation works only if the
-PS/2 mouse device allows `write' operation to the device and pass the
-written data as is to the PS/2 mouse.  I don't know how many OS
-platforms support this, but suspect Linux is OK.
-
-If the initialization code does not work on the user's OS, s/he has 
-to use the mouse as the standard PS/2 mouse by specifying "PS/2" as
-the mouse protocol.
-
-FreeBSD 2.2.5 or earlier certainly can NOT support PS/2 mouse
-initialization this way and the user is forced to use these mice as
-the standard PS/2 mouse ;-< FreeBSD 2.2.6 or later has better mouse
-support code and all these initialization chores are handled in the
-device driver in the kernel and the X server does not need to bother
-about them.
-
-1.2. Automatic protocol detection
-
-1.2.1 Serial mouse detection
-
-The user may specify "Auto" as the Protocol of his/her SERIAL mouse.
-Then, xf86SetupMouse() in xf86_Mouse.c will invoke the PnP COM device
-enumeration procedure (xf86GetPnPMouseProtocol() in xf86_PnPMouse.c)
-and select the appropriate protocol automatically based on the PnP ID
-string.
-
-If the user purchased a serial mouse in the last two, three years,
-there is a good chance that s/he can just write
-
-    Protocol "Auto"
-    Device "/dev/xxxx" (where xxxx is a serial device)
-
-in XF86Config and the X server is able to detect the right protocol.
-
-This PnP capability is OS-independent and the code should on any
-platforms running XFree86.
-
-1.2.2 Automatic detection in FreeBSD
-
-In FreeBSD 3.0-CURRENT and forthcoming 2.2.6, the user may specify
-"Auto" to the bus mouse, PS/2 mouse and system mouse (sysmouse)
-devices too, as the X server queries the mouse protocol used by these
-drivers via ioctls provided by the drivers.
-
-(FreeBSD 2.2.6 has not been released. But, a snapshot is available
-as ftp://releng22.FreeBSD.ORG/pub/FreeBSD.)
-
-This is made possible because these new versions of FreeBSD have
-improved mouse support.  The bus and PS/2 mouse drivers and the mouse
-daemon can handle wide variety of mouse models and offer new services
-in the following area.  The drivers can now be instructed to send
-mouse data in the standardized format, the SysMouse format. (The first
-5 bytes of this format are exactly the same as the MouseSystems
-format.)
-
-To maintain compatibility with previous versions of the drivers, the
-concept of operation level is introduced.  The drivers are at the
-basic level (level 0) when opened and send data in the previous,
-proprietary format.  They will switch to the standard SysMouse format
-after the user program sends an ioctl call to change the level to the
-extended level (level 1).
-
-A set of new ioctl functions is supported by the drivers. The user
-program can obtain various information about the driver and the
-pointing device.  These ioctls are useful because even if the user
-failed to specify the correct protocol type in XF86Config, the X
-server can override it with the information obtained from the driver.
-
-To take advantage of the new services, xf86SetupMouse() does the
-followings:
-
-Step 1. Call the ioctl function to set the operation level 1.
-
-Step 2. Call ioctl functions obtain driver and device information. 
-Inspect the protocol type the driver uses. If Step 1 was successful,
-we should see the driver is using the SysMouse protocol. If the
-protocol type specified in XF86Config and the one reported by the
-driver do not agree, the latter should be taken as the correct type
-hereafter.
-
-Step 3. If the ioctl functions in Step 2 failed, we must be dealing
-with either a serial mouse or a mouse driver which is incapable of
-serving new functions. If the user specified "Auto" in XF86Config,
-invoke the PnP COM device enumeration procedure to detect the mouse.
-Otherwise use the protocol specified by the user.
-
-Step 4. Complete initialization according to the detected protocol
-type.
-
-FreeBSD-specific code is marked by #if defined(__FreeBSD__) in the
-patch.
-
-1.3. New options in XF86Config
-
-a) New keywords for mouse protocol
-The following strings are accepted in the Protocol statement:
-    "ThinkingMouse"	(Kensington ThinkingMouse, serial version)
-    "ThinkingMousePS/2"	(Kensington ThinkingMouse, PS/2 version)
-    "GlidePointPS/2"	(ALPS GlidePoint, PS/2 version)
-    "MouseManPlusPS/2"	(Logitech MouseMan+, FistMouse+, PS/2 version)
-    "NetMousePS/2"	(Genius NetMouse, NetMouse Pro, PS/2 version,
-			 ASCII MieMouse, PS/2 version)
-    "NetScrollPS/2"	(Genius NetScroll, PS/2 version)
-    "SysMouse"		(FreeBSD sysmouse)
-    "Auto"		(for automatic protocol detection)
-
-(The serial version of MouseMan+, FirstMouse+, NetMouse and MieMouse
-are compatible with MS IntelliMouse: specify "IntelliMouse" in the
-Protocol statement, or "Auto" to invoke the PnP enumeration
-procedure.)
-
-"ThinkingMousePS/2", "GlidePointPS/2", "MouseManPlusPS/2",
-"NetMousePS/2" and "NetScrollPS/2" are NOT supported by FreeBSD 2.2.5
-or earlier, because the OS does not support `write' operation to the
-PS/2 mouse driver, thus, these PS/2 mice cannot be initialized in the
-manner described in 1.1 (c).  The user should specify "PS/2" for these
-mice and the X server will use the mice as the standard PS/2 mouse.
-
-These keywords are NOT supported by FreeBSD 2.2.6 or later too,
-because these mice are supported by the PS/2 mouse driver in the
-kernel and the X server does not need to initialize the mice or
-interpret new data format; it should simply read the data in the
-standardized "SysMouse" format passed by the PS/2 mouse driver.  The
-user should specify "PS/2", "SysMouse" or "Auto" as the protocol for
-these mice.
-
-b) ZAxisMappping
-The option to map the Z axis (wheel) motion to a pair of buttons or to
-another axis.
-
-	ZAxisMapping X
-	ZAxisMapping Y
-	ZAxisMapping N M
-
-The first example will map the Z axis motion to the X axis motion.
-Whenever the user moves the wheel/roller, its movement is reported as
-the X axis motion.  When the wheel/roller stays still, the real X axis
-motion is reported as is.  The last example will map negative Z axis
-motion to the button N and positive Z axis motion to the button M.  If
-this option is used and the buttons N or M actually exists in the
-mouse, their actions cannot be detected by the X server.
-
-c) Resolution
-The following option will set the mouse device resolution to N, if
-possible:
-
-	Resolution N
-
-Not all mice can support this.  The PS/2 mouse device driver in
-FreeBSD 3.0-CURRENT and 2.2.6 can support it.  I wrote generic code in
-xf86_Mouse.c for other platforms, but have no idea if it works.
-
-2. Some notes on mice  ------------------------------------------------
-
-2.1 MS IntelliMouse  (serial, PS/2): 
-
-This mouse has been supported since XFree86 3.3.  However, my patch
-will slightly change its behavior.  The wheel movement is recognized
-as the Z axis motion.  This behavior is not compatible with XFree86
-3.3, but is more consistent with the support for other mice with
-wheels or rollers.  If you want to make the wheel behave like before,
-you can use the new option `ZAxisMapping'. 
-
-IntelliMouse supports the PnP COM device specification.
-
-To use this mouse as a serial device:
-	Protocol "Auto" or "IntelliMouse"
-	Device   "/dev/xxxx" (where xxxx is a serial port)
-To use this mouse as the PS/2 device:
-	Protocol "IMPS/2"
-	Device   "/dev/xxxx"  (where xxxx is the PS/2 mouse device)
-As the PS/2 device in FreeBSD 2.2.5 or earlier:
-	Protocol "PS/2"
-	Device   "/dev/psm0"
-As the PS/2 device in FreeBSD 2.2.6 or later:
-	Protocol "Auto", "SysMouse" or "PS/2"
-	Device   "/dev/psm0"
-
-2.2 Kensington Thinking Mouse (serial, PS/2):
-
-This mouse has four buttons.
-
-ThinkingMouse supports the PnP COM device specification.
-
-To use this mouse as a serial device:
-	Protocol "Auto" or "ThinkingMouse"
-	Device   "/dev/xxxx" (where xxxx is a serial port)
-To use this mouse as a PS/2 device;
-	Protocol "ThinkingMousePS/2"
-	Device   "/dev/xxxx"  (where xxxx is the PS/2 mouse device)
-As the PS/2 device in FreeBSD 2.2.5 or earlier:
-	Protocol "PS/2"
-	Device   "/dev/psm0"
-As the PS/2 device in FreeBSD 2.2.6 or later:
-	Protocol "Auto", "SysMouse" or "PS/2"
-	Device   "/dev/psm0"
-
-2.3 Genius NetScroll (PS/2):
-
-This mouse has four buttons and a roller.  The roller movement is
-recognized as the Z axis motion.  
-
-To use this mouse as a PS/2 device;
-	Protocol "NetScrollPS/2"
-	Device   "/dev/xxxx"  (where xxxx is the PS/2 mouse device)
-As the PS/2 device in FreeBSD 2.2.5 or earlier:
-	Protocol "PS/2"
-	Device   "/dev/psm0"
-As the PS/2 device in FreeBSD 2.2.6 or later:
-	Protocol "Auto", "SysMouse" or "PS/2"
-	Device   "/dev/psm0"
-
-2.4 Genius NetMouse and NetMouse Pro (serial, PS/2):
-
-These mice have a "magic button" which is used like a wheel or a
-roller.  The "magic button" action is recognized as the Z axis motion.
-NetMouse Pro is identical to NetMouse except that it has the third
-button on the left hand side.
-
-NetMouse and NetMouse Pro support the PnP COM device specification.
-When used as a serial mouse, they are compatible with MS IntelliMouse.
-
-To use these mice as a serial device:
-	Protocol "Auto" or "IntelliMouse"
-	Device   "/dev/xxxx" (where xxxx is a serial port)
-To use these mice as the PS/2 device:
-	Protocol "NetMousePS/2"
-	Device   "/dev/xxxx"  (where xxxx is the PS/2 mouse device)
-As the PS/2 device in FreeBSD 2.2.5 or earlier:
-	Protocol "PS/2"
-	Device   "/dev/psm0"
-As the PS/2 device in FreeBSD 2.2.6 or later:
-	Protocol "Auto", "SysMouse" or "PS/2"
-	Device   "/dev/psm0"
-
-2.5 ALPS GlidePoint (serial, PS/2): 
-
-The serial version of this mouse(pad) has been supported since XFree86
-3.2.  `Tapping' action is interpreted as the fourth button press.
-(IMHO, the fourth button of GlidePoint should be mapped to the first
-button in order to make this pad behave like the other pad products.)
-
-To use this pad as a serial device:
-	Protocol "GlidePoint"
-	Device   "/dev/xxxx" (where xxxx is a serial port)
-To use this mouse as the PS/2 device:
-	Protocol "GlidePointPS/2"
-	Device   "/dev/xxxx"  (where xxxx is the PS/2 mouse device)
-As the PS/2 device in FreeBSD 2.2.5 or earlier:
-	Protocol "PS/2"
-	Device   "/dev/psm0"
-As the PS/2 device in FreeBSD 2.2.6 or later:
-	Protocol "Auto", "SysMouse" or "PS/2"
-	Device   "/dev/psm0"
-
-2.6 ASCII MieMouse (serial, PS/2):
-
-This mouse appears to be OEMed from Genius.  Although its shape is
-quite different, it works like Genius NetMouse Pro.  This mouse has a
-"knob" which is used like a wheel or a roller.  The "knob" action is
-recognized as the Z axis motion.
-
-MieMouse supports the PnP COM device specification.  When used as a
-serial mouse, it is compatible with MS IntelliMouse.
-
-To use this mouse as a serial device:
-	Protocol "Auto" or "IntelliMouse"
-	Device   "/dev/xxxx" (where xxxx is a serial port)
-To use this mouse as the PS/2 device:
-	Protocol "NetMousePS/2"
-	Device   "/dev/xxxx"  (where xxxx is the PS/2 mouse device)
-As the PS/2 device in FreeBSD 2.2.5 or earlier:
-	Protocol "PS/2"
-	Device   "/dev/psm0"
-As the PS/2 device in FreeBSD 2.2.6 or later:
-	Protocol "Auto", "SysMouse" or "PS/2"
-	Device   "/dev/psm0"
-
-2.7 Logitech MouseMan+ and FirstMouse+ (serial, PS/2):
-
-MouseMan+ has two buttons on top, one side button and a roller.
-FirstMouse+ has two buttons and a roller.  The roller movement is
-recognized as the Z axis motion.  The roller also acts as the third
-button.  The side button is recognized as the fourth button.  
-
-MouseMan+ and FirstMouse+ support the PnP COM device specification.
-They have MS IntelliMouse compatible mode when used as a serial mouse.
-
-To use these mice as a serial device:
-	Protocol "Auto" or "IntelliMouse"
-	Device   "/dev/xxxx" (where xxxx is a serial port)
-To use these mice as the PS/2 device:
-	Protocol "MouseManPlusPS/2"
-	Device   "/dev/xxxx"  (where xxxx is the PS/2 mouse device)
-As the PS/2 device in FreeBSD 2.2.5 or earlier:
-	Protocol "PS/2"
-	Device   "/dev/psm0"
-As the PS/2 device in FreeBSD 2.2.6 or later:
-	Protocol "Auto", "SysMouse" or "PS/2"
-	Device   "/dev/psm0"
-
-3. TODO ---------------------------------------------------------------
-
-a) xf86 Misc Extention
-ProcXF86MiscGetMouseSettings() and ProcXF86MiscSetMouseSettings()
-should handle newly added protocol types.  Expand the struct
-XF86MiscGetMouseSettings to accomodate the device resolution value and
-ZAxisMapping settings?
-
-b) Integration with XInput
-Wheel/roller movement should be processed as the third valuator.
-Currently the core pointer and the extended mouse device code in
-XInput always assume there are only two valuators.
-  
-c) XF86Setup, xmseconfig
-Update lib/X11/XF86Setup/mouse.tcl, lib/X11/XF86Setup/scripts/mseconfig.tcl.
-
-4. Comments on the patch  ---------------------------------------------
-
-xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
-
-- Include `machine/mouse.h' for FreeBSD.
-
-xc/programs/Xserver/hw/xfree86/common/xf86.h
-
-- Added `mseModel', `negativeZ', `positiveZ' and `resolution' to
-  MouseDevRec.
-- Added prototype for xf86GetPnPMouseProtocol().
-
-xc/programs/Xserver/hw/xfree86/common/xf86_Config.h
-
-- Defined constants and strings for new options and newly supported mice.
-
-xc/programs/Xserver/hw/xfree86/common/xf86Config.c
-
-- Initialize `mseModel', `negativeZ', `positiveZ' and `resolution' 
-  at the start of configPointerSection().
-- Recognize new keywords.
-
-xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
-
-- Added support for the following PS/2 type mice:
-      ALPS GlidePoint, MS IntelliMouse, Kensington ThinkingMouse, 
-      Genius NetScroll, Genius NetMouse, NetMouse Pro, ASCII
-      Mie Mouse, Logitech MouseMan+, FirstMouse+
-- Added support for the following SERIAL mice:
-      Kensington ThinkingMouse
-  (Genius NetMouse, NetMouse Pro, ASCII MieMouse, Logitech MouseMan+
-  and FirstMouse+ are compatible with MS IntelliMouse, when connected
-  to a serial port, thus requires no explicit support)
-- MS IntelliMouse support code is modified so that the wheel 
-  movement is recognized as the Z axis motion.  
-- Added support for `Auto' to invoke PnP COM device detection code.
-- Added support for `SysMouse' protocol for FreeBSD.
-- Optionally map the Z axis movement to another axis or button events
-  based on `negativeZ' and `positiveZ' settings.
-- Reorganized xf86SetupMouse().
-
-xc/programs/Xserver/hw/xfree86/common/xf86_PnPMouse.c
-
-- PnP COM device support. The bulk of the code is taken from the mouse
-  daemon code in FreeBSD.
-
-xc/programs/Xserver/hw/xfree86/common/xf86Events.c
-
-- Support up to 12 buttons.
-
-xc/programs/Xserver/hw/xfree86/common/xf86Io.c
-
-- Make xf86MseProcAux() support up to 12 buttons.
-
-xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c
-
-- Make xf86CheckButton() recognize up to 12 buttons.
-
-
------------------------------------------------------------ end of file
Index: xc/programs/Xserver/hw/xfree86/common/compiler.h
diff -u xc/programs/Xserver/hw/xfree86/common/compiler.h:3.58 xc/programs/Xserver/hw/xfree86/common/compiler.h:3.62
--- xc/programs/Xserver/hw/xfree86/common/compiler.h:3.58	Sun Mar  5 08:59:10 2000
+++ xc/programs/Xserver/hw/xfree86/common/compiler.h	Sun Jun 25 05:35:53 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.58 2000/03/05 16:59:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.62 2000/06/25 12:35:53 alanh Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
@@ -436,45 +436,92 @@
 
 #endif	/* !Lynx */
 
-#include <string.h>
+/*
+ * EGCS 1.1 knows about arbitrary unaligned loads.  Define some
+ * packed structures to talk about such things with.
+ */
 
+#if defined(__arch64__) || defined(__sparcv9)
+struct __una_u64 { unsigned long  x __attribute__((packed)); };
+#endif
+struct __una_u32 { unsigned int   x __attribute__((packed)); };
+struct __una_u16 { unsigned short x __attribute__((packed)); };
+
 static __inline__ unsigned long ldq_u(unsigned long *p)
 {
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
+#if defined(__arch64__) || defined(__sparcv9)
+	const struct __una_u64 *ptr = (const struct __una_u64 *) p;
+#else
+	const struct __una_u32 *ptr = (const struct __una_u32 *) p;
+#endif
+	return ptr->x;
+#else
 	unsigned long ret;
 	memmove(&ret, p, sizeof(*p));
 	return ret;
+#endif
 }
 
 static __inline__ unsigned long ldl_u(unsigned int *p)
 {
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
+	const struct __una_u32 *ptr = (const struct __una_u32 *) p;
+	return ptr->x;
+#else
 	unsigned int ret;
 	memmove(&ret, p, sizeof(*p));
 	return ret;
+#endif
 }
 
 static __inline__ unsigned long ldw_u(unsigned short *p)
 {
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
+	const struct __una_u16 *ptr = (const struct __una_u16 *) p;
+	return ptr->x;
+#else
 	unsigned short ret;
 	memmove(&ret, p, sizeof(*p));
 	return ret;
+#endif
 }
 
 static __inline__ void stq_u(unsigned long val, unsigned long *p)
 {
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
+#if defined(__arch64__) || defined(__sparcv9)
+	struct __una_u64 *ptr = (struct __una_u64 *) p;
+#else
+	struct __una_u32 *ptr = (struct __una_u32 *) p;
+#endif
+	ptr->x = val;
+#else
 	unsigned long tmp = val;
 	memmove(p, &tmp, sizeof(*p));
+#endif
 }
 
 static __inline__ void stl_u(unsigned long val, unsigned int *p)
 {
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
+	struct __una_u32 *ptr = (struct __una_u32 *) p;
+	ptr->x = val;
+#else
 	unsigned int tmp = val;
 	memmove(p, &tmp, sizeof(*p));
+#endif
 }
 
 static __inline__ void stw_u(unsigned long val, unsigned short *p)
 {
+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 91
+	struct __una_u16 *ptr = (struct __una_u16 *) p;
+	ptr->x = val;
+#else
 	unsigned short tmp = val;
 	memmove(p, &tmp, sizeof(*p));
+#endif
 }
 
 #define mem_barrier()         /* XXX: nop for now */
@@ -583,74 +630,210 @@
 
 #elif (defined(Lynx) || defined(linux)) && defined(__powerpc__)
 
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
 extern volatile unsigned char *ioBase;
 
 #define eieio()		__asm__ __volatile__ ("eieio")
 
+static __inline__ unsigned char
+xf86ReadMmio8(void *base, const unsigned long offset)
+{
+        register unsigned char val;
+        __asm__ __volatile__(
+                        "lbzx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*(volatile unsigned char *)(base+offset)));
+        return(val);
+}
+
+static __inline__ unsigned short
+xf86ReadMmio16Be(void *base, const unsigned long offset)
+{
+        register unsigned short val;
+        __asm__ __volatile__(
+                        "lhzx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*(volatile unsigned char *)(base+offset)));
+        return(val);
+}
+
+static __inline__ unsigned short
+xf86ReadMmio16Le(void *base, const unsigned long offset)
+{
+        register unsigned short val;
+        __asm__ __volatile__(
+                        "lhbrx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*(volatile unsigned char *)(base+offset)));
+        return(val);
+}
+
+static __inline__ unsigned int
+xf86ReadMmio32Be(void *base, const unsigned long offset)
+{
+        register unsigned int val;
+        __asm__ __volatile__(
+                        "lwzx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*(volatile unsigned char *)(base+offset)));
+        return(val);
+}
+
+static __inline__ unsigned int
+xf86ReadMmio32Le(void *base, const unsigned long offset)
+{
+        register unsigned int val;
+        __asm__ __volatile__(
+                        "lwbrx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*(volatile unsigned char *)(base+offset)));
+        return(val);
+}
+
+static __inline__ void
+xf86WriteMmioNB8(void *base, const unsigned long offset,
+               const unsigned int val)
+{
+        __asm__ __volatile__(
+                        "stbx %1,%2,%3\n\t"
+                        : "=m" (*(volatile unsigned char *)(base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmioNB16Le(void *base, const unsigned long offset,
+                  const unsigned int val)
+{
+        __asm__ __volatile__(
+                        "sthbrx %1,%2,%3\n\t"
+                        : "=m" (*(volatile unsigned char *)(base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmioNB16Be(void *base, const unsigned long offset,
+                  const unsigned int val)
+{
+        __asm__ __volatile__(
+                        "sthx %1,%2,%3\n\t"
+                        : "=m" (*(volatile unsigned char *)(base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmioNB32Le(void *base, const unsigned long offset,
+                  const unsigned long val)
+{
+        __asm__ __volatile__(
+                        "stwbrx %1,%2,%3\n\t"
+                        : "=m" (*(volatile unsigned char *)(base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmioNB32Be(void *base, const unsigned long offset,
+                  const unsigned long val)
+{
+        __asm__ __volatile__(
+                        "stwx %1,%2,%3\n\t"
+                        : "=m" (*(volatile unsigned char *)(base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
 static __inline__ void
+xf86WriteMmio8(void *base, const unsigned long offset,
+               const unsigned int val)
+{
+        xf86WriteMmioNB8(base,offset,val);
+        eieio();
+}
+
+static __inline__ void
+xf86WriteMmio16Le(void *base, const unsigned long offset,
+                  const unsigned int val)
+{
+        xf86WriteMmioNB16Le(base,offset,val);
+        eieio();
+}
+
+static __inline__ void
+xf86WriteMmio16Be(void *base, const unsigned long offset,
+                  const unsigned int val)
+{
+        xf86WriteMmioNB16Be(base,offset,val);
+        eieio();
+}
+
+static __inline__ void
+xf86WriteMmio32Le(void *base, const unsigned long offset,
+                  const unsigned long val)
+{
+        xf86WriteMmioNB32Le(base,offset,val);
+        eieio();
+}
+
+static __inline__ void
+xf86WriteMmio32Be(void *base, const unsigned long offset,
+                  const unsigned long val)
+{
+        xf86WriteMmioNB32Be(base,offset,val);
+        eieio();
+}
+
+
+static __inline__ void
 outb(unsigned short port, unsigned char value)
 {
-	*((volatile unsigned char *)(ioBase + port)) = value; eieio();
+        if(ioBase == MAP_FAILED) return;
+        xf86WriteMmio8((void *)ioBase,port,value);
 }
 
 static __inline__ void
 outw(unsigned short port, unsigned short value)
 {
-	__asm__ __volatile__ (
-		"sthbrx %0,%1,%2\n\t"
-		"eieio"
-                  : 
-		  : "r" (value), "b" (ioBase), "r" (port) 
-		  : "memory"
-        );
+        if(ioBase == MAP_FAILED) return;
+        xf86WriteMmio16Le((void *)ioBase,port,value);
 }
 
 static __inline__ void
 outl(unsigned short port, unsigned int value)
 {
-	__asm__ __volatile__ (
-		"stwbrx %0,%1,%2\n\t"
-		"eieio"
-                  : 
-		  : "r" (value), "b" (ioBase), "r" (port) 
-		  : "memory"
-        );
+        if(ioBase == MAP_FAILED) return;
+        xf86WriteMmio32Le((void *)ioBase,port,value);
 }
 
 static __inline__ unsigned int
 inb(unsigned short port)
 {
-	unsigned char val;
-
-	val = *((volatile unsigned char *)(ioBase + port));
-	eieio();
-	return(val);
+        if(ioBase == MAP_FAILED) return(0);
+        return(xf86ReadMmio8((void *)ioBase, port));
 }
 
 static __inline__ unsigned int
 inw(unsigned short port)
 {
-	register unsigned short val;
-
-        __asm__ ("lhbrx %0,%1,%2\n\t"
-        	 "eieio"
-                  : "=r" (val) 
-                  : "b" (ioBase), "r" (port)
-        );
-	return(val);
+        if(ioBase == MAP_FAILED) return(0);
+        return(xf86ReadMmio16Le((void *)ioBase, port));
 }
 
 static __inline__ unsigned int
 inl(unsigned short port)
 {
-	register unsigned long val;
-
-        __asm__ ("lwbrx %0,%1,%2\n\t"
-        	 "eieio"
-                  : "=r" (val) 
-                  : "b" (ioBase), "r" (port)
-        );
-	return(val);
+        if(ioBase == MAP_FAILED) return(0);
+        return(xf86ReadMmio32Le((void *)ioBase, port));
 }
 
 #define ldq_u(p)	ldl_u(p)
@@ -1625,16 +1808,6 @@
 
 /* Some macros to hide the system dependencies for MMIO accesses */
 #ifdef __alpha__
-extern void (*xf86WriteMmio8)(int Value, void *Base, unsigned long Offset);
-extern void (*xf86WriteMmio16)(int Value, void *Base, unsigned long Offset);
-extern void (*xf86WriteMmio32)(int Value, void *Base, unsigned long Offset);
-extern void (*xf86WriteMmioNB8)(int Value, void *Base, unsigned long Offset);
-extern void (*xf86WriteMmioNB16)(int Value, void *Base, unsigned long Offset);
-extern void (*xf86WriteMmioNB32)(int Value, void *Base, unsigned long Offset);
-extern int  (*xf86ReadMmio8)(void *Base, unsigned long Offset);
-extern int  (*xf86ReadMmio16)(void *Base, unsigned long Offset);
-extern int  (*xf86ReadMmio32)(void *Base, unsigned long Offset);
-
 #define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
 #define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
 # if defined (JENSEN_SUPPORT)
@@ -1655,7 +1828,31 @@
 #define MMIO_OUT16(base, offset, val) (*xf86WriteMmio16)(val, base, offset)
 #define MMIO_ONB8(base, offset, val) (*xf86WriteMmioNB8)(val, base, offset)
 #define MMIO_ONB16(base, offset, val) (*xf86WriteMmioNB16)(val, base, offset)
-#else /* !__alpha__ */
+#elif defined(__powerpc__)  
+ /* 
+  * we provide byteswapping and no byteswapping functions here
+  * with byteswapping as default, 
+  * drivers that don't need byteswapping should define PPC_MMIO_IS_BE 
+  */
+ #define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
+ #define MMIO_OUT8(base, offset, val) xf86WriteMmio8(base, offset, val)
+ #define MMIO_ONB8(base, offset, val) xf86WriteMmioNB8(base, offset, val)
+ #if defined(PPC_MMIO_IS_BE) /* No byteswapping */
+  #define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
+  #define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
+  #define MMIO_OUT16(base, offset, val) xf86WriteMmio16Be(base, offset, val)
+  #define MMIO_OUT32(base, offset, val) xf86WriteMmio32Be(base, offset, val)
+  #define MMIO_ONB16(base, offset, val) xf86WriteMmioNB16Be(base, offset, val)
+  #define MMIO_ONB32(base, offset, val) xf86WriteMmioNB32Be(base, offset, val)
+ #else /* byteswapping is the default */
+  #define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
+  #define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
+  #define MMIO_OUT16(base, offset, val) xf86WriteMmio16Le(base, offset, val)
+  #define MMIO_OUT32(base, offset, val) xf86WriteMmio32Le(base, offset, val)
+  #define MMIO_ONB16(base, offset, val) xf86WriteMmioNB16Le(base, offset, val)
+  #define MMIO_ONB32(base, offset, val) xf86WriteMmioNB32Le(base, offset, val)
+ #endif
+#else /* !__alpha__ && !__powerpc__ */
 #define MMIO_IN8(base, offset) *(volatile CARD8 *)(((CARD8*)(base)) + (offset))
 #define MMIO_IN16(base, offset) *(volatile CARD16 *)(((CARD8*)(base)) + (offset))
 #define MMIO_IN32(base, offset) *(volatile CARD32 *)(((CARD8*)(base)) + (offset))
Index: xc/programs/Xserver/hw/xfree86/common/fourcc.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/common/fourcc.h:1.2
--- /dev/null	Sat Jul  1 20:42:37 2000
+++ xc/programs/Xserver/hw/xfree86/common/fourcc.h	Wed Jun 14 11:20:33 2000
@@ -0,0 +1,89 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/fourcc.h,v 1.2 2000/06/14 18:20:33 dawes Exp $ */
+
+/*
+   This header file contains listings of STANDARD guids for video formats.
+   Please do not place non-registered, or incomplete entries in this file.
+   A list of some popular fourcc's are at: http://www.webartz.com/fourcc/
+   For an explanation of fourcc <-> guid mappings see RFC2361.
+*/
+
+#define FOURCC_YUY2 0x32595559
+#define XVIMAGE_YUY2 \
+   { \
+	FOURCC_YUY2, \
+        XvYUV, \
+	LSBFirst, \
+	{'Y','U','Y','2', \
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+	16, \
+	XvPacked, \
+	1, \
+	0, 0, 0, 0, \
+	8, 8, 8, \
+	1, 2, 2, \
+	1, 1, 1, \
+	{'Y','U','Y','V', \
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+	XvTopToBottom \
+   }
+
+#define FOURCC_YV12 0x32315659
+#define XVIMAGE_YV12 \
+   { \
+	FOURCC_YV12, \
+        XvYUV, \
+	LSBFirst, \
+	{'Y','V','1','2', \
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+	12, \
+	XvPlanar, \
+	3, \
+	0, 0, 0, 0, \
+	8, 8, 8, \
+	1, 2, 2, \
+	1, 2, 2, \
+	{'Y','V','U', \
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+	XvTopToBottom \
+   }
+
+#define FOURCC_I420 0x30323449
+#define XVIMAGE_I420 \
+   { \
+	FOURCC_I420, \
+        XvYUV, \
+	LSBFirst, \
+	{'I','4','2','0', \
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+	12, \
+	XvPlanar, \
+	3, \
+	0, 0, 0, 0, \
+	8, 8, 8, \
+	1, 2, 2, \
+	1, 2, 2, \
+	{'Y','U','V', \
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+	XvTopToBottom \
+   }
+
+
+#define FOURCC_UYVY 0x59565955
+#define XVIMAGE_UYVY \
+   { \
+	FOURCC_UYVY, \
+        XvYUV, \
+	LSBFirst, \
+	{'U','Y','V','Y', \
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+	16, \
+	XvPacked, \
+	1, \
+	0, 0, 0, 0, \
+	8, 8, 8, \
+	1, 2, 2, \
+	1, 1, 1, \
+	{'U','Y','V','Y', \
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+	XvTopToBottom \
+   }
Index: xc/programs/Xserver/hw/xfree86/common/xf86.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86.h:3.131 xc/programs/Xserver/hw/xfree86/common/xf86.h:3.140
--- xc/programs/Xserver/hw/xfree86/common/xf86.h:3.131	Thu Mar  2 15:15:03 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86.h	Mon Jun 19 22:08:43 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.131 2000/03/02 23:15:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.140 2000/06/20 05:08:43 dawes Exp $ */
 
 /*
  * Copyright (c) 1997 by The XFree86 Project, Inc.
@@ -17,7 +17,11 @@
 #include "xf86str.h"
 #include "xf86Opt.h"
 #include <X11/Xfuncproto.h>
+#ifndef IN_MODULE
 #include <stdarg.h>
+#else
+#include "xf86_ansic.h"
+#endif
 
 #include "propertyst.h"
 
@@ -80,20 +84,28 @@
 Bool xf86IsPrimaryIsa(void);
 int xf86CheckPciGAType(pciVideoPtr pPci);
 /* new RAC */
+resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex);
+resPtr xf86JoinResLists(resPtr rlist1, resPtr rlist2);
+resPtr xf86DupResList(const resPtr rlist);
+void xf86FreeResList(resPtr rlist);
 void xf86ClaimFixedResources(resList list, int entityIndex);
+Bool xf86DriverHasEntities(DriverPtr drvp);
 void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex);
+void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex,
+				    int instance);
+int xf86GetNumEntityInstances(int entityIndex);
+GDevPtr xf86GetDevFromEntity(int entityIndex, int instance);
 void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex);
 EntityInfoPtr xf86GetEntityInfo(int entityIndex);
 pciVideoPtr xf86GetPciInfoForEntity(int entityIndex);
-int xf86GetEntityForPciInfo(pciVideoPtr pvp);
+int xf86GetPciEntity(int bus, int dev, int func);
 Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,
 			EntityProc enter, EntityProc leave, pointer);
 void xf86DeallocateResourcesForEntity(int entityIndex, long type);
-resPtr xf86RegisterResources(int entityIndex, resList list, int access);
+resPtr xf86RegisterResources(int entityIndex, resList list, int Access);
 Bool xf86CheckPciMemBase(pciVideoPtr pPci, memType base);
-void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86AccessPtr p_io,
-			xf86AccessPtr p_mem, xf86AccessPtr p_io_mem,
-			xf86AccessPtr *ppAccessOld);
+void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs,
+			xf86SetAccessFuncPtr oldFuncs);
 Bool xf86IsEntityPrimary(int entityIndex);
 Bool xf86FixPciResource(int entityIndex, int prt, memType alignment,
 			 long type);
@@ -109,7 +121,7 @@
 memType xf86ChkConflict(resRange *rgp, int entityIndex);
 Bool xf86IsPciDevPresent(int bus, int dev, int func);
 ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
-Bool xf86NoSharedMem(int screenIndex);
+Bool xf86NoSharedResources(int screenIndex, resType res);
 resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2);
 pciVideoPtr xf86FindPciDeviceVendor(CARD16 vendorID, CARD16 deviceID,
 				    char n, pciVideoPtr pvp_exclude);
@@ -120,8 +132,22 @@
 #ifdef async
 Bool xf86QueueAsyncEvent(void (*func)(pointer),pointer arg);
 #endif
- 
+
+int xf86GetLastScrnFlag(int entityIndex);
+void xf86SetLastScrnFlag(int entityIndex, int scrnIndex);
+Bool xf86IsEntityShared(int entityIndex);
+void xf86SetEntityShared(int entityIndex);
+Bool xf86IsEntitySharable(int entityIndex);
+void xf86SetEntitySharable(int entityIndex);
+Bool xf86IsPrimInitDone(int entityIndex);
+void xf86SetPrimInitDone(int entityIndex);
+void xf86ClearPrimInitDone(int entityIndex);
+int xf86AllocateEntityPrivateIndex(void);
+DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex);
+
 /* xf86Configure.c */
+GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus,
+				    void *busData, int chipset);
 GDevPtr xf86AddDeviceToConfigure(const char *driver, pciVideoPtr pVideo,
 				 int chipset);
  
@@ -165,7 +191,7 @@
 void xf86PrintDepthBpp(ScrnInfoPtr scrp);
 Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask);
 Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual);
-Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma);
+Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma);
 void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y);
 void xf86SetBlackWhitePixels(ScreenPtr pScreen);
 void xf86EnableDisableFBAccess(int scrnIndex, Bool enable);
@@ -216,7 +242,9 @@
 Bool xf86GetModInDevEnabled(void);
 Bool xf86GetAllowMouseOpenFail(void);
 Bool xf86IsPc98(void);
+pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name);
 pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
+void xf86UnloadSubModule(pointer mod);
 Bool xf86LoaderCheckSymbol(const char *name);
 void xf86LoaderReqSymLists(const char **, ...);
 void xf86LoaderReqSymbols(const char *, ...);
@@ -243,14 +271,28 @@
 pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,
 			  char **adaptor_name, pointer *adaptor_options);
 void xf86GetOS(const char **name, int *major, int *minor, int *teeny);
-Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
-			       PciChipsets *p_chip, resList res,
-			       EntityProc init, EntityProc enter,
-			       EntityProc leave, pointer private);
-Bool xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn, int entityIndex,
-			       IsaChipsets *i_chip, resList res,
-			       EntityProc init, EntityProc enter,
-			       EntityProc leave, pointer private); 
+ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag,
+				int entityIndex,PciChipsets *p_chip,
+				resList res, EntityProc init,
+				EntityProc enter, EntityProc leave,
+				pointer private);
+ScrnInfoPtr xf86ConfigIsaEntity(ScrnInfoPtr pScrn, int scrnFlag,
+				int entityIndex, IsaChipsets *i_chip,
+				resList res, EntityProc init,
+				EntityProc enter, EntityProc leave,
+				pointer private); 
+/* Obsolete! don't use */
+Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
+				int entityIndex,PciChipsets *p_chip,
+				resList res, EntityProc init,
+				EntityProc enter, EntityProc leave,
+				pointer private);
+/* Obsolete! don't use */
+Bool xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn,
+				int entityIndex, IsaChipsets *i_chip,
+				resList res, EntityProc init,
+				EntityProc enter, EntityProc leave,
+				pointer private); 
 void xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip,
 				 resList res, EntityProc init,
 				 EntityProc enter, EntityProc leave,
Index: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Bus.c:1.44 xc/programs/Xserver/hw/xfree86/common/xf86Bus.c:1.52
--- xc/programs/Xserver/hw/xfree86/common/xf86Bus.c:1.44	Sun Mar  5 15:47:44 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Bus.c	Fri Jun 30 10:15:10 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.44 2000/03/05 23:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.52 2000/06/30 17:15:10 dawes Exp $ */
 /*
  * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
  */
@@ -29,6 +29,7 @@
 /* Entity data */
 EntityPtr *xf86Entities = NULL;	/* Bus slots claimed by drivers */
 int xf86NumEntities = 0;
+static int xf86EntityPrivateCount = 0;
 BusAccPtr xf86BusAccInfo = NULL;
 
 xf86AccessRec AccessNULL = {NULL,NULL,NULL};
@@ -76,13 +77,16 @@
 /*
  * Call the bus probes relevant to the architecture.
  *
- * The only one available so far is for PCI
+ * The only one available so far is for PCI and SBUS.
  */
 
 void
 xf86BusProbe(void)
 {
     xf86PciProbe();
+#ifdef __sparc__
+    xf86SbusProbe();
+#endif
 }
 
 /*
@@ -113,6 +117,8 @@
 	ret = BUS_PCI; 
     if (!xf86NameCmp(p, "isa"))
 	ret = BUS_ISA;
+    if (!xf86NameCmp(p, "sbus"))
+	ret = BUS_SBUS;
     if (ret != BUS_NONE)
 	if (retID)
 	    *retID = busID + strlen(p) + 1;
@@ -164,6 +170,8 @@
     xf86Entities = xnfrealloc(xf86Entities,
 			      sizeof(EntityPtr) * xf86NumEntities);
     xf86Entities[xf86NumEntities - 1] = xnfcalloc(1,sizeof(EntityRec));
+    xf86Entities[xf86NumEntities - 1]->entityPrivates =
+               xnfcalloc(sizeof(DevUnion) * xf86EntityPrivateCount, 1);
     return (xf86NumEntities - 1);
 }
 
@@ -240,12 +248,24 @@
     return TRUE;
 }
 
+Bool
+xf86DriverHasEntities(DriverPtr drvp)
+{
+    int i;
+    for (i = 0; i < xf86NumEntities; i++) {
+	if (xf86Entities[i]->driver == drvp) 
+	    return TRUE;
+    }
+    return FALSE;
+}
+
 void
 xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)
 {
     if (entityIndex == -1)
 	return;
-    if (xf86Entities[entityIndex]->inUse)
+    if (xf86Entities[entityIndex]->inUse &&
+	!(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL))
 	FatalError("Requested Entity already in use!\n");
 
     pScrn->numEntities++;
@@ -255,8 +275,31 @@
     xf86Entities[entityIndex]->access->next = pScrn->access;
     pScrn->access = xf86Entities[entityIndex]->access;
     xf86Entities[entityIndex]->inUse = TRUE;
+    pScrn->entityInstanceList = xnfrealloc(pScrn->entityInstanceList,
+				    pScrn->numEntities * sizeof(int));
+    pScrn->entityInstanceList[pScrn->numEntities - 1] = 0;
+}
+
+void
+xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance)
+{
+    int i;
+
+    if (entityIndex == -1 || entityIndex >= xf86NumEntities)
+	return;
+
+    for (i = 0; i < pScrn->numEntities; i++) {
+	if (pScrn->entityList[i] == entityIndex) {
+	    pScrn->entityInstanceList[i] = instance;
+	    break;
+	}
+    }
 }
 
+/*
+ * XXX  This needs to be updated for the case where a single entity may have
+ * instances associated with more than one screen.
+ */
 ScrnInfoPtr
 xf86FindScreenForEntity(int entityIndex)
 {
@@ -328,6 +371,8 @@
 	xf86DeallocateResourcesForEntity(i, ResShared);
     }
     xfree(xf86Screens[scrnIndex]->entityList);
+    if (xf86Screens[scrnIndex]->entityInstanceList)
+       xfree(xf86Screens[scrnIndex]->entityInstanceList);
     if (xf86Screens[scrnIndex]->CurrentAccess->pIoAccess
 	== (EntityAccessPtr) xf86Screens[scrnIndex]->access)
 	xf86Screens[scrnIndex]->CurrentAccess->pIoAccess = NULL;
@@ -335,6 +380,7 @@
 	== (EntityAccessPtr) xf86Screens[scrnIndex]->access)
 	xf86Screens[scrnIndex]->CurrentAccess->pMemAccess = NULL;
     xf86Screens[scrnIndex]->entityList = NULL;
+    xf86Screens[scrnIndex]->entityInstanceList = NULL;
 }
 
 void
@@ -356,6 +402,25 @@
 }
 
 /*
+ * Add an extra device section (GDevPtr) to an entity.
+ */
+
+void
+xf86AddDevToEntity(int entityIndex, GDevPtr dev)
+{
+    EntityPtr pEnt;
+    
+    if (entityIndex >= xf86NumEntities)
+	return;
+    
+    pEnt = xf86Entities[entityIndex];
+    pEnt->numInstances++;
+    pEnt->devices = xnfrealloc(pEnt->devices,
+				pEnt->numInstances * sizeof(GDevPtr));
+    pEnt->devices[pEnt->numInstances - 1] = dev;
+}
+
+/*
  * xf86GetEntityInfo() -- This function hands information from the
  * EntityRec struct to the drivers. The EntityRec structure itself
  * remains invisible to the driver.
@@ -364,6 +429,7 @@
 xf86GetEntityInfo(int entityIndex)
 {
     EntityInfoPtr pEnt;
+    int i;
     
     if (entityIndex >= xf86NumEntities)
 	return NULL;
@@ -374,11 +440,46 @@
     pEnt->active = xf86Entities[entityIndex]->active;
     pEnt->chipset = xf86Entities[entityIndex]->chipset;
     pEnt->resources = xf86Entities[entityIndex]->resources;
-    pEnt->device = xf86Entities[entityIndex]->device;
+    pEnt->driver = xf86Entities[entityIndex]->driver;
+    if (xf86Entities[entityIndex]->devices[0]) {
+	for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)
+	    if (xf86Entities[entityIndex]->devices[i]->screen == 0)
+	        break;
+	pEnt->device = xf86Entities[entityIndex]->devices[i];
+    } else
+	pEnt->device = NULL;
     
     return pEnt;
 }
 
+int
+xf86GetNumEntityInstances(int entityIndex)
+{
+    if (entityIndex >= xf86NumEntities)
+	return -1;
+    
+    return xf86Entities[entityIndex]->numInstances;
+}
+
+GDevPtr
+xf86GetDevFromEntity(int entityIndex, int instance)
+{
+    int i;
+  
+    /* We might not use AddDevtoEntity */
+    if (!xf86Entities[entityIndex]->devices[0])
+	return NULL;
+
+    if (entityIndex >= xf86NumEntities ||
+	instance >= xf86Entities[entityIndex]->numInstances)
+	return NULL;
+    
+    for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)
+	if (xf86Entities[entityIndex]->devices[i]->screen == instance)
+	    break;
+    return xf86Entities[entityIndex]->devices[i];
+}
+
 /*
  * general generic disable function.
  */
@@ -723,8 +824,8 @@
 }
 
 void
-xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86AccessPtr p_io, xf86AccessPtr p_mem,
-		   xf86AccessPtr p_io_mem, xf86AccessPtr *ppAccessOld)
+xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs,
+		   xf86SetAccessFuncPtr oldFuncs)
 {
     AccessFuncPtr rac;
 
@@ -733,16 +834,16 @@
 
     rac = xf86Entities[pEnt->index]->rac;
 
-    if (p_mem == p_io_mem && p_mem && p_io)
+    if (funcs->mem == funcs->io_mem && funcs->mem && funcs->io)
 	xf86Entities[pEnt->index]->entityProp |= NO_SEPARATE_MEM_FROM_IO;
-    if (p_io == p_io_mem && p_mem && p_io)
+    if (funcs->io == funcs->io_mem && funcs->mem && funcs->io)
 	xf86Entities[pEnt->index]->entityProp |= NO_SEPARATE_IO_FROM_MEM;
     
-    rac->mem_new = p_mem;
-    rac->io_new = p_io;
-    rac->io_mem_new = p_io_mem;
+    rac->mem_new = funcs->mem;
+    rac->io_new = funcs->io;
+    rac->io_mem_new = funcs->io_mem;
     
-    rac->old = ppAccessOld;
+    rac->old = oldFuncs;
 }
 
 /*
@@ -971,7 +1072,8 @@
  * function call.
  */
 static memType
-checkConflict(resRange *rgp, resPtr pRes, int entityIndex, xf86State state)
+checkConflict(resRange *rgp, resPtr pRes, int entityIndex,
+	      xf86State state, Bool ignoreIdentical)
 {
     memType ret;
     
@@ -987,18 +1089,24 @@
 			rgp->rEnd,rgp->rBegin);
 		return 0;
 	    }
-	    if ((ret = checkConflictBlock(rgp, pRes)))
-		return ret;
-	    break;
+	    if ((ret = checkConflictBlock(rgp, pRes))) {
+		if (!ignoreIdentical || (rgp->rBegin != pRes->block_begin)
+		    || (rgp->rEnd != pRes->block_end))
+		    return ret;
+	    }
+    break;
 	case ResSparse:
 	    if ((rgp->rBase & rgp->rMask) != rgp->rBase) {
 		xf86Msg(X_ERROR,"sparse io range (base: 0x%lx  mask: 0x%lx)"
 			"doesn't satisfy (base & mask = mask)\n",
 			rgp->rBase, rgp->rMask);
 		return 0;
+	    }
+	    if ((ret = checkConflictSparse(rgp, pRes))) {
+		if (!ignoreIdentical || (rgp->rBase != pRes->sparse_base)
+		    || (rgp->rMask != pRes->sparse_mask))
+		    return ret;
 	    }
-	    if ((ret = checkConflictSparse(rgp, pRes)))
-		return ret;
 	    break;
 	}
 	pRes = pRes->next;
@@ -1012,7 +1120,7 @@
 memType
 ChkConflict(resRange *rgp, resPtr res, xf86State state)
 {
-    return checkConflict(rgp, res, -2, state);
+    return checkConflict(rgp, res, -2, state,FALSE);
 }
 
 /*
@@ -1023,7 +1131,7 @@
 memType
 xf86ChkConflict(resRange *rgp, int entityIndex)
 {
-    return checkConflict(rgp, Acc, entityIndex, SETUP);
+    return checkConflict(rgp, Acc, entityIndex, SETUP,FALSE);
 }
 
 /*
@@ -1184,6 +1292,22 @@
 		    xf86ErrorFVerb(verb, "t");
 		if (list->res_type & ResBios)
 		    xf86ErrorFVerb(verb, "(B)");
+		if (list->res_type & ResBus)
+		    xf86ErrorFVerb(verb, "(b)");
+		if (list->res_type & ResOprMask) {
+		    switch (list->res_type & ResOprMask) {
+		    case ResUnusedOpr:
+			s = "(OprU)";
+			break;
+		    case ResDisableOpr:
+			s = "(OprD)";
+			break;
+		    default:
+			s = "(Opr?)";
+			break;
+		    }
+		    xf86ErrorFVerb(verb, "%s", s);
+		}
 		xf86ErrorFVerb(verb, "\n");
 		i++;
 	    }
@@ -1517,6 +1641,7 @@
     switch (xf86Entities[entityIndex]->bus.type) {
     case BUS_ISA:
     case BUS_NONE:
+    case BUS_SBUS:
 	return NULL;
     case BUS_PCI:
 	return GetImplicitPciResources(entityIndex);
@@ -1548,6 +1673,7 @@
  * If list is NULL it tries to obtain resources implicitly. Function
  * returns a resPtr listing all resources not successfully registered.
  */
+
 resPtr
 xf86RegisterResources(int entityIndex, resList list, int access)
 {
@@ -1570,7 +1696,7 @@
 	    range.type = (range.type & ~ResAccMask) | (access & ResAccMask);
 	}
  	range.type &= ~ResEstimated;	/* Not allowed for drivers */
-	if(xf86ChkConflict(&range,entityIndex)) 
+	if (checkConflict(&range, Acc, entityIndex, SETUP,TRUE)) 
 	    res = xf86AddResToList(res,&range,entityIndex);
 	else {
 	    Acc = xf86AddResToList(Acc,&range,entityIndex);
@@ -1755,6 +1881,7 @@
     
     switch (pEnt->bus.type) {
     case BUS_ISA:
+    case BUS_SBUS:
 	    *acc_mem = *acc_io = *acc_mem_io = &AccessNULL;
 	    break;
 	break;
@@ -1830,50 +1957,49 @@
     switch(pEnt->access->rt) {
     case IO:
 	pEnt->access->pAccess = acc_io;
-	if (org_io) {
-	    /* does the driver want the old access func? */
-	    if (pEnt->rac->old) {
-		/* give it to the driver, leave state disabled */
-		(*pEnt->rac->old) = org_io;
-	    } else if (org_io->AccessEnable) {
-		/* driver doesn't want it - enable generic access */
-		org_io->AccessEnable(org_io->arg);
-	    }
-	}
 	break;
     case MEM:
 	pEnt->access->pAccess = acc_mem;
-	if (org_mem) {
-	    /* does the driver want the old access func? */
-	    if (pEnt->rac->old) {
-		/* give it to the driver, leave state disabled */
-		(*pEnt->rac->old) = org_mem;
-	    } else if (org_mem->AccessEnable) {
-		/* driver doesn't want it - enable generic access */
-		org_mem->AccessEnable(org_mem->arg);
-	    }
-	}
 	break;
     case MEM_IO:
 	pEnt->access->pAccess = acc_mem_io;
-	if (org_mem_io) {
-	    /* does the driver want the old access func? */
-	    if (pEnt->rac->old) {
-		/* give it to the driver, leave state disabled */
-		(*pEnt->rac->old) = org_mem_io;
-	    } else if (org_mem_io->AccessEnable) {
-		/* driver doesn't want it - enable generic access */
-		org_mem_io->AccessEnable(org_mem_io->arg);
-	    }
-	}
 	break;
     default: /* no conflicts at all */
 	pEnt->access->pAccess =  NULL; /* remove from RAC */
-	if (pEnt->rac && pEnt->rac->old)
-	    (*pEnt->rac->old) = NULL;
 	break;
     }
 
+    if (org_io) {
+	/* does the driver want the old access func? */
+	if (pEnt->rac->old) {
+	    /* give it to the driver, leave state disabled */
+	    pEnt->rac->old->io = org_io;
+	} else if (org_io->AccessEnable) {
+	    /* driver doesn't want it - enable generic access */
+	    org_io->AccessEnable(org_io->arg);
+	}
+    }
+    if (org_mem_io) {
+	/* does the driver want the old access func? */
+	if (pEnt->rac->old) {
+	    /* give it to the driver, leave state disabled */
+	    pEnt->rac->old->io_mem = org_mem_io;
+	} else if (org_mem_io->AccessEnable) {
+	    /* driver doesn't want it - enable generic access */
+	    org_mem_io->AccessEnable(org_mem_io->arg);
+	}
+    }
+    if (org_mem) {
+	/* does the driver want the old access func? */
+	if (pEnt->rac->old) {
+	    /* give it to the driver, leave state disabled */
+	    pEnt->rac->old->mem = org_mem;
+	} else if (org_mem->AccessEnable) {
+	    /* driver doesn't want it - enable generic access */
+	    org_mem->AccessEnable(org_mem->arg);
+	}
+    }
+
     if (!(prop & NEED_MEM_SHARED)){
 	if (prop & NEED_MEM) {
 	    if (acc_mem->AccessEnable)
@@ -2115,7 +2241,8 @@
 	    } else {
  		range.type |= ResEstimated;
  		if (!xf86ChkConflict(&range, entityIndex) &&
- 		    !checkConflict(&range, AccReducers, entityIndex, SETUP)) {
+ 		    !checkConflict(&range, AccReducers, entityIndex,
+				   SETUP, FALSE)) {
  		    range.type &= ~(ResEstimated | ResBios);
  		    AccReducers =
  			xf86AddResToList(AccReducers, &range, entityIndex);
@@ -2192,7 +2319,7 @@
 	    while (pAcc) {
 		if (pAcc->entityIndex == entityIndex)
 		    if (checkConflict(&pAcc->val,pResVGA,
-				      entityIndex,state)) {
+				      entityIndex,state,FALSE)) {
 			if (vga && vga != pEnt->busAcc) {
 			    xf86Msg(X_ERROR, "Screen %i needs vga routed to"
 				    "different buses - deleting\n",i);
@@ -2241,7 +2368,7 @@
 	xf86Entities[i]->resources = NULL;
 	resp_x = NULL;
 	while (resp) {
-	    if (! (val = checkConflict(&resp->val,acc,i,SETUP)))  {
+	    if (! (val = checkConflict(&resp->val,acc,i,SETUP,FALSE)))  {
  	        resp->res_type &= ~(ResBios); /* just used for chkConflict() */
 		tmp = resp_x;
 		resp_x = resp;
@@ -2250,7 +2377,7 @@
 #ifdef REDUCER
 	    } else {
 		resp->res_type |= ResEstimated;
- 		if (!checkConflict(&resp->val, acc, i, SETUP)) {
+ 		if (!checkConflict(&resp->val, acc, i, SETUP, FALSE)) {
  		    resp->res_type &= ~(ResEstimated | ResBios);
  		    tmp = AccReducers;
  		    AccReducers = resp;
@@ -2303,7 +2430,7 @@
 	    range = pAcc->val;
 	    /*  ResAny to find conflicts with anything. */
 	    range.type = (range.type & ~ResAccMask) | ResAny | ResBios;
-	    if (checkConflict(&range,Acc,entityIndex,OPERATING))
+	    if (checkConflict(&range,Acc,entityIndex,OPERATING,FALSE))
 		switch (pAcc->res_type & ResPhysMask) {
 		case ResMem:
 		    pEnt->entityProp |= NEED_MEM_SHARED;
@@ -2434,15 +2561,11 @@
 	    flags = 0;
 	    if (needRACforMem) {
 		flags |= xf86Screens[i]->racMemFlags;
-#ifdef DEBUG
-		ErrorF("Screen %d is using RAC for mem\n", i);
-#endif
+		xf86ErrorFVerb(3, "Screen %d is using RAC for mem\n", i);
 	    }
 	    if (needRACforIo) {
 		flags |= xf86Screens[i]->racIoFlags;
-#ifdef DEBUG
-		ErrorF("Screen %d is using RAC for io\n", i);
-#endif
+		xf86ErrorFVerb(3, "Screen %d is using RAC for io\n", i);
 	    }
 	    
 #ifdef XFree86LOADER
@@ -2802,7 +2925,7 @@
 static void
 CheckGenericGA()
 {
-#if !defined(__sparc__) && !defined(__powerpc__) /* FIXME ?? */
+#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) /* FIXME ?? */
     CARD16 GenericIOBase = VGAHW_GET_IOBASE();
     CARD8 CurrentValue, TestValue;
 
@@ -2824,7 +2947,7 @@
 }
 
 Bool
-xf86NoSharedMem(int screenIndex)
+xf86NoSharedResources(int screenIndex,resType res)
 {
     int j;
     
@@ -2832,9 +2955,25 @@
 	return TRUE;
 
     for (j = 0; j < xf86Screens[screenIndex]->numEntities; j++) {
+      switch (res) {
+      case IO:
 	if ( xf86Entities[xf86Screens[screenIndex]->entityList[j]]->entityProp
+	     & NEED_IO_SHARED)
+	  return FALSE;
+	break;
+      case MEM:
+	if ( xf86Entities[xf86Screens[screenIndex]->entityList[j]]->entityProp
 	     & NEED_MEM_SHARED)
-	    return FALSE;
+	  return FALSE;
+	break;
+      case MEM_IO:
+	if ( xf86Entities[xf86Screens[screenIndex]->entityList[j]]->entityProp
+	     & NEED_SHARED)
+	  return FALSE;
+	break;
+      case NONE:
+	break;
+      }
     }
     return TRUE;
 }
@@ -2904,3 +3043,122 @@
     return TRUE;
 }
 #endif
+
+/* Multihead accel sharing accessor functions and entity Private handling */
+
+int
+xf86GetLastScrnFlag(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        return(xf86Entities[entityIndex]->lastScrnFlag);
+    } else {
+        return -1;
+    }
+}
+
+void
+xf86SetLastScrnFlag(int entityIndex, int scrnIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->lastScrnFlag = scrnIndex;
+    }
+}
+
+Bool
+xf86IsEntityShared(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        if(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL) {
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
+void
+xf86SetEntityShared(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->entityProp |= IS_SHARED_ACCEL;
+    }
+}
+
+Bool
+xf86IsEntitySharable(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        if(xf86Entities[entityIndex]->entityProp & ACCEL_IS_SHARABLE) {
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
+void
+xf86SetEntitySharable(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->entityProp |= ACCEL_IS_SHARABLE;
+    }
+}
+
+Bool
+xf86IsPrimInitDone(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        if(xf86Entities[entityIndex]->entityProp & SA_PRIM_INIT_DONE) {
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
+void
+xf86SetPrimInitDone(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->entityProp |= SA_PRIM_INIT_DONE;
+    }
+}
+
+void
+xf86ClearPrimInitDone(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->entityProp &= ~SA_PRIM_INIT_DONE;
+    }
+}
+
+
+/*
+ * Allocate a private in the entities.
+ */
+
+int
+xf86AllocateEntityPrivateIndex(void)
+{
+    int idx, i;
+    EntityPtr pEnt;
+    DevUnion *nprivs;
+
+    idx = xf86EntityPrivateCount++;
+    for (i = 0; i < xf86NumEntities; i++) {
+	pEnt = xf86Entities[i];
+	nprivs = xnfrealloc(pEnt->entityPrivates,
+			    xf86EntityPrivateCount * sizeof(DevUnion));
+	/* Zero the new private */
+	bzero(&nprivs[idx], sizeof(DevUnion));
+	pEnt->entityPrivates = nprivs;
+    }
+    return idx;
+}
+
+DevUnion *
+xf86GetEntityPrivate(int entityIndex, int privIndex)
+{
+    if (entityIndex >= xf86NumEntities || privIndex >= xf86EntityPrivateCount)
+	return NULL;
+
+    return &(xf86Entities[entityIndex]->entityPrivates[privIndex]);
+}
+
Index: xc/programs/Xserver/hw/xfree86/common/xf86Bus.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Bus.h:1.13 xc/programs/Xserver/hw/xfree86/common/xf86Bus.h:1.16
--- xc/programs/Xserver/hw/xfree86/common/xf86Bus.h:1.13	Sun Mar  5 09:04:10 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Bus.h	Mon Jun 19 22:08:43 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.h,v 1.13 2000/03/05 17:04:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.h,v 1.16 2000/06/20 05:08:43 dawes Exp $ */
 /*
  * Copyright (c) 1997 by The XFree86 Project, Inc.
  */
@@ -13,12 +13,15 @@
 #define _XF86_BUS_H
 
 #include "xf86pciBus.h"
+#ifdef __sparc__
+#include "xf86sbusBus.h"
+#endif
 
 typedef struct racInfo {
     xf86AccessPtr mem_new;
     xf86AccessPtr io_new;
     xf86AccessPtr io_mem_new;
-    xf86AccessPtr *old;
+    xf86SetAccessFuncPtr old;
 } AccessFuncRec, *AccessFuncPtr;
 
 
@@ -30,7 +33,6 @@
     EntityProc                  entityEnter;
     EntityProc                  entityLeave;
     pointer                     private;
-    GDevPtr                     device;
     resPtr                      resources;
     Bool                        active;
     Bool                        inUse;
@@ -38,6 +40,10 @@
     EntityAccessPtr             access;
     AccessFuncPtr               rac;
     pointer                     busAcc;
+    int                         lastScrnFlag;
+    DevUnion *                  entityPrivates;
+    int                         numInstances;
+    GDevPtr *                   devices;   
 } EntityRec, *EntityPtr;
 
 /* asynchronous event handling */
@@ -57,12 +63,16 @@
 #define NEED_IO  0x0020
 #define NEED_MEM_SHARED 0x0040
 #define NEED_IO_SHARED 0x0080
+#define ACCEL_IS_SHARABLE 0x0100
+#define IS_SHARED_ACCEL 0x0200
+#define SA_PRIM_INIT_DONE 0x0400
 
 #define NEED_SHARED (NEED_MEM_SHARED | NEED_IO_SHARED)
 
 #define busType bus.type
 #define pciBusId bus.id.pci
 #define isaBusId bus.id.isa
+#define sbusBusId bus.id.sbus
 
 struct x_BusAccRec;
 typedef void (*BusAccProcPtr)(struct x_BusAccRec *ptr);
Index: xc/programs/Xserver/hw/xfree86/common/xf86Config.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Config.c:3.214 xc/programs/Xserver/hw/xfree86/common/xf86Config.c:3.226
--- xc/programs/Xserver/hw/xfree86/common/xf86Config.c:3.214	Tue Mar  7 21:38:36 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c	Mon Jun 19 22:08:43 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.214 2000/03/08 05:38:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.226 2000/06/20 05:08:43 dawes Exp $ */
 
 
 /*
@@ -14,6 +14,11 @@
  * Author: Dirk Hohndel <hohndel@XFree86.Org>
  */
 
+#ifdef XF86DRI
+#include <sys/types.h>
+#include <grp.h>
+#endif
+
 #include "xf86.h"
 #include "xf86Parser.h"
 #include "xf86tokens.h"
@@ -40,6 +45,16 @@
 #define SUPPORT_PC98
 #endif
 
+#ifdef __EMX__
+#define ROOT_CONFIGPATH	"%A," "%R," \
+			"%E," \
+			"%D/%X," \
+			"%&/XFree86/lib/X11/%X-%M," "%&/XFree86/lib/X11/%X," "%&XFree86/lib/X11/%X," \
+			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
+			"%P/etc/X11/%X,"
+#define USER_CONFIGPATH ROOT_CONFIGPATH
+#endif
+
 /*
  * These paths define the way the config file search is done.  The escape
  * sequences are documented in parser/scan.c.
@@ -256,6 +271,7 @@
 xf86DriverlistFromConfig()
 {
     int count = 0;
+    int j;
     char **modulearray;
     screenLayoutPtr slp;
     
@@ -273,8 +289,6 @@
      * Walk the list of driver lines in active "Device" sections to
      * determine now many implicitly loaded modules there are.
      *
-     * XXX The set of inactive "Device" sections needs to be handled too,
-     * when the rest of the supporting code is done.
      */
     if (xf86ConfigLayout.screens) {
         slp = xf86ConfigLayout.screens;
@@ -283,6 +297,13 @@
         }
     }
 
+    /*
+     * Handle the set of inactive "Device" sections.
+     */
+    j = 0;
+    while (xf86ConfigLayout.inactives[j++].identifier)
+	count++;
+
     if (count == 0)
 	return NULL;
 
@@ -297,6 +318,12 @@
 	count++;
 	slp++;
     }
+
+    j = 0;
+
+    while (xf86ConfigLayout.inactives[j].identifier) 
+	modulearray[count++] = xf86ConfigLayout.inactives[j++].driver;
+
     modulearray[count] = NULL;
 
     /* Remove duplicates */
@@ -466,10 +493,9 @@
             }
         }
 
-        driverlist[count++] = NULL;
+        driverlist[count] = NULL;
         xfree(clist);
         xfree(dlist);
-        driverlist = xnfrealloc(driverlist, count * sizeof(char *));
     }
 #endif /* XFree86LOADER */
 
@@ -658,6 +684,7 @@
     FLAG_PCIPROBE2,
     FLAG_PCIFORCECONFIG1,
     FLAG_PCIFORCECONFIG2,
+    FLAG_PCIOSCONFIG,
     FLAG_SAVER_BLANKTIME,
     FLAG_DPMS_STANDBYTIME,
     FLAG_DPMS_SUSPENDTIME,
@@ -697,6 +724,8 @@
 	{0}, FALSE },
   { FLAG_PCIFORCECONFIG2,	"PciForceConfig2",		OPTV_BOOLEAN,
 	{0}, FALSE },
+  { FLAG_PCIOSCONFIG,	        "PciOsConfig",   		OPTV_BOOLEAN,
+	{0}, FALSE },
   { FLAG_SAVER_BLANKTIME,	"BlankTime"		,	OPTV_INTEGER,
 	{0}, FALSE },
   { FLAG_DPMS_STANDBYTIME,	"StandbyTime",			OPTV_INTEGER,
@@ -807,6 +836,8 @@
 	xf86Info.pciFlags = PCIForceConfig1;
     if (xf86IsOptionSet(FlagOptions, FLAG_PCIFORCECONFIG2))
 	xf86Info.pciFlags = PCIForceConfig2;
+    if (xf86IsOptionSet(FlagOptions, FLAG_PCIOSCONFIG))
+	xf86Info.pciFlags = PCIOsConfig;
     /*
      * XXX This should be handled like a proper boolean option -- see further
      * above for examples.
@@ -1470,7 +1501,7 @@
 	return FALSE;
     servlayoutp->id = "(implicit)";
     servlayoutp->screens = slp;
-    servlayoutp->inactives = NULL;
+    servlayoutp->inactives = xnfcalloc(1, sizeof(GDevRec));
     servlayoutp->options = NULL;
     /* Set up an empty input device list, then look for some core devices. */
     indp = xnfalloc(sizeof(IDevRec));
@@ -1819,6 +1850,7 @@
     devicep->chipRev = conf_device->dev_chiprev;
     devicep->options = conf_device->dev_option_lst;
     devicep->irq = conf_device->dev_irq;
+    devicep->screen = conf_device->dev_screen;
 
     for (i = 0; i < MAXDACSPEEDS; i++) {
 	if (i < CONF_MAXDACSPEEDS)
@@ -1844,13 +1876,22 @@
     int                count = 0;
     XF86ConfBuffersPtr bufs;
     int                i;
+    struct group       *grp;
 
-    xf86ConfigDRI.group      = drip ? drip->dri_group : NULL;
-    xf86ConfigDRI.mode       = drip ? drip->dri_mode  : NULL;
+    xf86ConfigDRI.group      = -1;
+    xf86ConfigDRI.mode       = 0;
     xf86ConfigDRI.bufs_count = 0;
     xf86ConfigDRI.bufs       = NULL;
 
     if (drip) {
+	if (drip->dri_group_name) {
+	    if ((grp = getgrnam(drip->dri_group_name)))
+		xf86ConfigDRI.group = grp->gr_gid;
+	} else {
+	    if (drip->dri_group >= 0)
+		xf86ConfigDRI.group = drip->dri_group;
+	}
+	xf86ConfigDRI.mode = drip->dri_mode;
 	for (bufs = drip->dri_buffers_lst; bufs; bufs = bufs->list.next)
 	    ++count;
 	
Index: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Configure.c:3.27 xc/programs/Xserver/hw/xfree86/common/xf86Configure.c:3.39
--- xc/programs/Xserver/hw/xfree86/common/xf86Configure.c:3.27	Fri Mar  3 19:58:05 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Configure.c	Fri Jun 23 04:01:51 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.27 2000/03/04 03:58:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.39 2000/06/23 11:01:51 alanh Exp $ */
 /*
  * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales.
  *
@@ -41,10 +41,18 @@
 #include "Configint.h"
 #include "vbe.h"
 #include "xf86DDC.h"
+#ifdef __sparc__
+#include "xf86Bus.h"
+#include "xf86Sbus.h"
+#endif
+#include "globals.h"
 
 typedef struct _DevToConfig {
     GDevRec GDev;
     pciVideoPtr pVideo;
+#ifdef __sparc__
+    sbusDevicePtr sVideo;
+#endif
     int iDriver;
 } DevToConfigRec, *DevToConfigPtr;
 
@@ -55,10 +63,22 @@
 Bool xf86DoConfigurePass1 = TRUE;
 Bool foundMouse = FALSE;
 
+#ifndef __EMX__
+static char *DFLT_MOUSE_DEV = "/dev/mouse";
+static char *DFLT_MOUSE_PROTO = "auto";
+#else
+#define DFLT_MOUSE_DEV "mouse$"
+#define DFLT_MOUSE_PROTO "OS2Mouse"
+#endif
+
 static void
 GetPciCard(int vendor, int chipType, int *vendor1, int *vendor2, int *card)
 {
     int k, j;
+   
+    *vendor1 = 0;
+    *vendor2 = 0;
+    *card = 0;
 
     k = 0;
     while (xf86PCIVendorNameInfo[k].token) {
@@ -92,21 +112,26 @@
  * the caller fill in the rest and/or change it as it sees fit.
  */
 GDevPtr
-xf86AddDeviceToConfigure(const char *driver, pciVideoPtr pVideo, int chipset)
+xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset)
 {
-    int busType, i, j;
+    int i, j;
+    pciVideoPtr pVideo = NULL;
 
     if (xf86DoProbe || !xf86DoConfigure || !xf86DoConfigurePass1)
 	return NULL;
 
     /* Check for duplicates */
-    if (pVideo) {
+    switch (bus) {
+    case BUS_PCI:
+	pVideo = (pciVideoPtr) busData;
 	for (i = 0;  i < nDevToConfig;  i++)
-	    if ((DevToConfig[i].pVideo->bus == pVideo->bus) &&
+	    if (DevToConfig[i].pVideo &&
+		(DevToConfig[i].pVideo->bus == pVideo->bus) &&
 		(DevToConfig[i].pVideo->device == pVideo->device) &&
 		(DevToConfig[i].pVideo->func == pVideo->func))
 		return NULL;
-    } else {
+	break;
+    case BUS_ISA:
 	/*
 	 * This needs to be revisited as it doesn't allow for non-PCI
 	 * multihead.
@@ -116,6 +141,17 @@
 	for (i = 0;  i < nDevToConfig;  i++)
 	    if (!DevToConfig[i].pVideo)
 		return NULL;
+	break;
+#ifdef __sparc__
+    case BUS_SBUS:
+	for (i = 0;  i < nDevToConfig;  i++)
+	    if (DevToConfig[i].sVideo &&
+		DevToConfig[i].sVideo->fbNum == ((sbusDevicePtr) busData)->fbNum)
+		return NULL;
+	break;
+#endif
+    default:
+	return NULL;
     }
 
     /* Allocate new structure occurrence */
@@ -129,18 +165,23 @@
     NewDevice.GDev.chipID = NewDevice.GDev.chipRev = NewDevice.GDev.irq = -1;
 
     NewDevice.iDriver = CurrentDriver;
-    NewDevice.pVideo = pVideo;
 
     /* Fill in what we know, converting the driver name to lower case */
     NewDevice.GDev.driver = xnfalloc(strlen(driver) + 1);
     for (j = 0;  (NewDevice.GDev.driver[j] = tolower(driver[j]));  j++);
 
-    if (pVideo) {
+    switch (bus) {
+    case BUS_PCI: {
 	int vendor1, vendor2, card;
 
+	NewDevice.pVideo = pVideo;
 	GetPciCard(pVideo->vendor, pVideo->chipType,
 	    &vendor1, &vendor2, &card);
 
+	if (vendor1 == 0 || (vendor2 == 0 && card == 0)) {
+   	    FatalError("\nXFree86 has found a valid card configuration.\nUnfortunately the appropriate data has not been added to xf86PciInfo.h.\nPlease forward 'scanpci -v' output to XFree86 support team.");
+	}
+
 #	define VendorName xf86PCIVendorNameInfo[vendor1].name
 #	define CardName   xf86PCIVendorInfo[vendor2].Device[card].DeviceName
 
@@ -161,26 +202,59 @@
 #	undef VendorName
 #	undef CardName
 
-	busType = BUS_PCI;
 	if (chipset < 0)
 	    chipset = (pVideo->vendor << 16) || pVideo->chipType;
-    } else {
+	}
+	break;
+    case BUS_ISA:
 	NewDevice.GDev.identifier = "ISA Adapter";
 	NewDevice.GDev.busID = "ISA";
-	busType = BUS_ISA;
+	break;
+#ifdef __sparc__
+    case BUS_SBUS: {
+	char *promPath = NULL;
+	NewDevice.sVideo = (sbusDevicePtr) busData;
+	NewDevice.GDev.identifier = NewDevice.sVideo->descr;
+	if (sparcPromInit() >= 0) {
+	    promPath = sparcPromNode2Pathname(&NewDevice.sVideo->node);
+	    sparcPromClose();
+	}
+	if (promPath) {
+	    NewDevice.GDev.busID = xnfalloc(strlen(promPath) + 6);
+	    sprintf(NewDevice.GDev.busID, "SBUS:%s", promPath);
+	    xfree(promPath);
+	} else {
+	    NewDevice.GDev.busID = xnfalloc(12);
+	    sprintf(NewDevice.GDev.busID, "SBUS:fb%d", NewDevice.sVideo->fbNum);
+	}
+	}
+	break;
+#endif
+    default:
+	break;
     }
 
     /* Get driver's available options */
     if (xf86DriverList[CurrentDriver]->AvailableOptions)
 	NewDevice.GDev.options =
 	    (*xf86DriverList[CurrentDriver]->AvailableOptions)(chipset,
-							       busType);
+							       bus);
 
     return &NewDevice.GDev;
 
 #   undef NewDevice
 }
 
+/*
+ * Backwards compatibility
+ */
+GDevPtr
+xf86AddDeviceToConfigure(const char *driver, pciVideoPtr pVideo, int chipset)
+{
+    return xf86AddBusDeviceToConfigure(driver, pVideo ? BUS_PCI : BUS_ISA,
+				       pVideo, chipset);
+}
+
 static XF86ConfInputPtr
 configureInputSection (void)
 {
@@ -194,8 +268,18 @@
     /* Crude mechanism to auto-detect mouse (os dependent) */
     { 
 	int fd;
+#ifdef linux
+	int len;
+	char path[32];
+
+	if ((len = readlink(DFLT_MOUSE_DEV, path, sizeof(path) - 1)) > 0) {
+	    path[len] = '\0';
+	    if (strstr(path, "psaux") != NULL)
+		DFLT_MOUSE_PROTO = "PS/2";
+	}
+#endif
 
-	fd = open("/dev/mouse", 0);
+	fd = open(DFLT_MOUSE_DEV, 0);
 	if (fd != -1) {
 	    foundMouse = TRUE;
 	    close(fd);
@@ -207,11 +291,10 @@
     mouse->inp_identifier = "Mouse0";
     mouse->inp_driver = "mouse";
     mouse->inp_option_lst = 
-			addNewOption(mouse->inp_option_lst, "Protocol", "auto");
+		addNewOption(mouse->inp_option_lst, "Protocol", DFLT_MOUSE_PROTO);
     mouse->inp_option_lst = 
-		addNewOption(mouse->inp_option_lst, "Device", "/dev/mouse");
+		addNewOption(mouse->inp_option_lst, "Device", DFLT_MOUSE_DEV);
     ptr = (XF86ConfInputPtr)addListItem((glp)ptr, (glp)mouse);
-
     return ptr;
 }
 
@@ -245,7 +328,8 @@
     sprintf(ptr->scrn_identifier, "Screen%d", screennum);
     ptr->scrn_monitor_str = xf86confmalloc(19);
     sprintf(ptr->scrn_monitor_str, "Monitor%d", screennum);
-    ptr->scrn_device_str = strdup(DevToConfig[screennum].GDev.identifier);
+    ptr->scrn_device_str = xf86confmalloc(16);
+    sprintf(ptr->scrn_device_str, "Card%d", screennum);
 
     for (i=0; i<6; i++)
     {
@@ -264,13 +348,16 @@
 static XF86ConfDevicePtr
 configureDeviceSection (int screennum)
 {
+    char identifier[16];
     OptionInfoPtr p;
     int i = 0;
     Bool foundFBDEV = FALSE;
     parsePrologue (XF86ConfDevicePtr, XF86ConfDeviceRec)
 
     /* Move device info to parser structure */
-    ptr->dev_identifier = DevToConfig[screennum].GDev.identifier;
+    sprintf(identifier, "Card%d", screennum);
+    ptr->dev_identifier = strdup(identifier);
+/*    ptr->dev_identifier = DevToConfig[screennum].GDev.identifier;*/
     ptr->dev_vendor = DevToConfig[screennum].GDev.vendor;
     ptr->dev_board = DevToConfig[screennum].GDev.board;
     ptr->dev_chipset = DevToConfig[screennum].GDev.chipset;
@@ -377,11 +464,18 @@
 	aptr->list.next = NULL;
 	aptr->adj_x = 0;
 	aptr->adj_y = 0;
-	aptr->adj_refscreen = 0;
-	aptr->adj_scrnum = 0;
+	aptr->adj_scrnum = scrnum;
 	aptr->adj_screen_str = xnfalloc(18);
 	sprintf(aptr->adj_screen_str, "Screen%d", scrnum);
-	aptr->adj_where = CONF_ADJ_ABSOLUTE;
+	if (scrnum == 0) {
+	    aptr->adj_where = CONF_ADJ_ABSOLUTE;
+	    aptr->adj_refscreen = NULL;
+	}
+	else {
+	    aptr->adj_where = CONF_ADJ_RIGHTOF;
+	    aptr->adj_refscreen = xnfalloc(18);
+	    sprintf(aptr->adj_refscreen, "Screen%d", scrnum - 1);
+	}
     	ptr->lay_adjacency_lst =
 	    (XF86ConfAdjacencyPtr)addListItem((glp)ptr->lay_adjacency_lst,
 					      (glp)aptr);
@@ -454,6 +548,15 @@
 {
     parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec)
 
+#ifdef XFree86LOADER
+   if (xf86ModulePath && xf86ModPathFrom == X_CMDLINE)
+       ptr->file_modulepath = strdup(xf86ModulePath);
+#endif
+   if (xf86fpFlag && defaultFontPath)
+       ptr->file_fontpath = strdup(defaultFontPath);
+   if (xf86coFlag && rgbPath)
+       ptr->file_rgbpath = strdup(rgbPath);
+   
     return ptr;
 }
 
@@ -587,13 +690,16 @@
     xf86config->conf_videoadaptor_lst = configureVideoAdaptorSection();
     xf86config->conf_modes_lst = configureModesSection();
     xf86config->conf_vendor_lst = configureVendorSection();
-    xf86config->conf_dri = configureDRISection();
+/*    xf86config->conf_dri = configureDRISection();*/
     xf86config->conf_input_lst = configureInputSection();
     xf86config->conf_layout_lst = configureLayoutSection();
 
     if (!(home = getenv("HOME")))
     	home = "/";
     {
+#ifdef __EMX__
+#define PATH_MAX 2048
+#endif
     	char homebuf[PATH_MAX];
     	/* getenv might return R/O memory, as with OS/2 */
     	strncpy(homebuf,home,PATH_MAX-1);
@@ -620,7 +726,10 @@
 
     xf86DoConfigurePass1 = FALSE;
 
+    i = -1;
     for (screennum = 0;  screennum < nDevToConfig;  screennum++) {
+        if (i == DevToConfig[screennum].iDriver) continue;
+
 	i = DevToConfig[screennum].iDriver;
 
 	(*xf86DriverList[i]->Probe)(xf86DriverList[i], 0);
@@ -628,6 +737,12 @@
 	xf86SetPciVideo(NULL,NONE);
     }
 
+    if (nDevToConfig != xf86NumScreens) {
+	ErrorF("Number of created screens does not match number of detected"
+	       " devices.\n  Configuration failed.\n");
+	goto bail;
+    }
+
     xf86PostProbe();
     xf86EntityInit();
 
@@ -667,10 +782,12 @@
 	ErrorF("\nXFree86 is not able to detect your mouse.\n"
 		"Edit the file and correct the Device.\n");
     } else {
-	ErrorF("\nXFree86 detected your mouse at device /dev/mouse.\n"
+#ifndef __EMX__ /* OS/2 definitely has a mouse */
+	ErrorF("\nXFree86 detected your mouse at device %s.\n"
 		"Please check your config if the mouse is still not\n"
 		"operational, as by default XFree86 tries to autodetect\n"
-		"the protocol.\n");
+		"the protocol.\n",DFLT_MOUSE_DEV);
+#endif
     }
 
     if (xf86NumScreens > 1) {
Index: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c:3.26 xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c:3.28
--- xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c:3.26	Sun Feb 13 18:54:03 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c	Fri Jun 23 17:33:54 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.26 2000/02/14 02:54:03 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.28 2000/06/24 00:33:54 dawes Exp $ */
 /* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */
 
 #define NEED_EVENTS
@@ -233,8 +233,10 @@
   if (pScr->AdjustFrame != NULL)
     (pScr->AdjustFrame)(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
 
-  miPointerPosition(&px, &py);
-  xf86WarpCursor(pScreen, px, py);
+  if (pScreen == miPointerCurrentScreen()) {
+    miPointerPosition(&px, &py);
+    xf86WarpCursor(pScreen, px, py);
+  }
 }
 
 
Index: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86DGA.c:1.32 xc/programs/Xserver/hw/xfree86/common/xf86DGA.c:1.37
--- xc/programs/Xserver/hw/xfree86/common/xf86DGA.c:1.32	Thu Jan 20 17:12:11 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86DGA.c	Fri Jun 30 12:06:56 2000
@@ -3,7 +3,7 @@
 
    Written by Mark Vojkovich
 */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.32 2000/01/21 01:12:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.37 2000/06/30 19:06:56 keithp Exp $ */
 
 #include "xf86.h"
 #include "xf86str.h"
@@ -74,6 +74,8 @@
    FakedVisualList	*fakedVisuals;
    ColormapPtr 		dgaColormap;
    ColormapPtr		savedColormap;
+   Bool			grabMouse;
+   Bool			grabKeyboard;
 } DGAScreenRec, *DGAScreenPtr;
 
 
@@ -88,11 +90,10 @@
     DGAScreenPtr pScreenPriv;
     int i;
 
-    if(!funcs->Sync || !funcs->SetMode || !funcs->SetViewport ||
-	!funcs->GetViewport || !funcs->OpenFramebuffer)
+    if(!funcs->SetMode || !funcs->OpenFramebuffer)
 	return FALSE;
 
-    if(!modes || !num)
+    if(!modes || num <= 0)
 	return FALSE;
 
     if(DGAGeneration != serverGeneration) {
@@ -107,13 +108,16 @@
     pScreenPriv->pScrn = pScrn;
     pScreenPriv->numModes = num;
     pScreenPriv->modes = modes;
-    pScreenPriv->current = NULL;
+    pScreenPriv->current = NULL;    
+    
     pScreenPriv->funcs = funcs;
     pScreenPriv->input = 0;
     pScreenPriv->client = NULL;
     pScreenPriv->fakedVisuals = NULL;
     pScreenPriv->dgaColormap = NULL;
     pScreenPriv->savedColormap = NULL;
+    pScreenPriv->grabMouse = FALSE;
+    pScreenPriv->grabKeyboard = FALSE;
     
     for(i = 0; i < num; i++)
 	modes[i].num = i + 1;
@@ -271,6 +275,10 @@
 
 	    FreeMarkedVisuals(pScreen);
 	}
+      
+        pScreenPriv->grabMouse = FALSE;
+        pScreenPriv->grabKeyboard = FALSE;
+
 	return Success;
    }
 
@@ -333,13 +341,28 @@
    devRet->pPix = device->pPix = pPix;
    pScreenPriv->current = device;
    pScreenPriv->pixmapMode = FALSE;
-
+   pScreenPriv->grabMouse = TRUE;
+   pScreenPriv->grabKeyboard = TRUE;
+   
    return Success;
 }
 
 
+
 /*********** exported ones ***************/
 
+void
+DGASetInputMode(int index, Bool keyboard, Bool mouse)
+{
+   ScreenPtr pScreen = screenInfo.screens[index];
+   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+   if (pScreenPriv)
+   {
+      pScreenPriv->grabMouse = mouse;
+      pScreenPriv->grabKeyboard = keyboard;
+   }
+}
 
 Bool
 DGAChangePixmapMode(int index, int *x, int *y, int mode)
@@ -402,8 +425,8 @@
    if(DGAScreenIndex < 0)
 	return FALSE;
    
-   if (!xf86NoSharedMem(((ScrnInfoPtr)screenInfo.screens[index]->
-			 devPrivates[xf86ScreenIndex].ptr)->scrnIndex))
+   if (!xf86NoSharedResources(((ScrnInfoPtr)screenInfo.screens[index]->
+			 devPrivates[xf86ScreenIndex].ptr)->scrnIndex,MEM))
        return FALSE;
    
    if(DGA_GET_SCREEN_PRIV(screenInfo.screens[index]))
@@ -507,8 +530,11 @@
    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
    /* We rely on the extension to check that DGA is active */ 
+
+   if (!pScreenPriv->funcs->GetViewport)
+      return 0;
 
-   return((*pScreenPriv->funcs->GetViewport)(pScreenPriv->pScrn));
+   return (*pScreenPriv->funcs->GetViewport)(pScreenPriv->pScrn);
 }
 
 int
@@ -519,7 +545,8 @@
 ){
    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   (*pScreenPriv->funcs->SetViewport)(pScreenPriv->pScrn, x, y, mode);
+   if (pScreenPriv->funcs->SetViewport)
+      (*pScreenPriv->funcs->SetViewport)(pScreenPriv->pScrn, x, y, mode);
    return Success;
 }
 
@@ -629,7 +656,8 @@
    
    /* We rely on the extension to check that DGA is active */
 
-   (*pScreenPriv->funcs->Sync)(pScreenPriv->pScrn);
+   if (pScreenPriv->funcs->Sync)
+      (*pScreenPriv->funcs->Sync)(pScreenPriv->pScrn);
 
    return Success;
 }
@@ -734,8 +762,8 @@
 
    xmode->num = mode->num;
    xmode->name = dmode->name;
-   xmode->VSync_num = dmode->Clock * 1000.0; 
-   xmode->VSync_den = dmode->HTotal * dmode->VTotal;
+   xmode->VSync_num = (int)(dmode->VRefresh * 1000.0); 
+   xmode->VSync_den = 1000;
    xmode->flags = mode->flags;
    xmode->imageWidth = mode->imageWidth;
    xmode->imageHeight = mode->imageHeight;
@@ -801,7 +829,7 @@
 
    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   if(!pScreenPriv || !pScreenPriv->current) /* no direct mode */
+   if(!pScreenPriv || !pScreenPriv->grabKeyboard) /* no direct mode */
 	return FALSE;
 
     de.u.u.type = e->u.u.type + *XDGAEventBase;
@@ -811,6 +839,7 @@
    return TRUE;
 }
 
+static int  DGAMouseX, DGAMouseY;
 
 Bool
 DGAStealMouseEvent(int index, xEvent *e, int dx, int dy)
@@ -823,17 +852,26 @@
 
    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
 
-   if(!pScreenPriv || !pScreenPriv->current) /* no direct mode */
+   if(!pScreenPriv || !pScreenPriv->grabMouse) /* no direct mode */
 	return FALSE;
     
-    if (!dx && !dy)
-	de.u.u.type = e->u.u.type + *XDGAEventBase;
-    else
-	de.u.u.type = MotionNotify + *XDGAEventBase;
+    DGAMouseX += dx;
+    if (DGAMouseX < 0)
+	DGAMouseX = 0;
+    else if (DGAMouseX > screenInfo.screens[index]->width)
+	DGAMouseX = screenInfo.screens[index]->width;
+    DGAMouseY += dy;
+    if (DGAMouseY < 0)
+	DGAMouseY = 0;
+    else if (DGAMouseY > screenInfo.screens[index]->height)
+	DGAMouseY = screenInfo.screens[index]->height;
+    de.u.u.type = e->u.u.type + *XDGAEventBase;
     de.u.u.detail = e->u.u.detail;
     de.u.event.time = e->u.keyButtonPointer.time;
     de.u.event.dx = dx;
     de.u.event.dy = dy;
+    de.u.event.pad1 = DGAMouseX;
+    de.u.event.pad2 = DGAMouseY;
     xf86eqEnqueue ((xEvent *) &de);
     return TRUE;
 }
@@ -842,7 +880,7 @@
 DGAIsDgaEvent (xEvent *e)
 {
     int	    coreEquiv;
-    if (DGAScreenIndex < 0)
+    if (DGAScreenIndex < 0 || XDGAEventBase == 0)
 	return FALSE;
     coreEquiv = e->u.u.type - *XDGAEventBase;
     if (KeyPress <= coreEquiv && coreEquiv <= MotionNotify)
@@ -1039,7 +1077,7 @@
     int		    coreEquiv;
 
     /* no DGA */
-    if (DGAScreenIndex < 0)
+    if (DGAScreenIndex < 0 || XDGAEventBase == 0)
 	return FALSE;
     pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
     
Index: xc/programs/Xserver/hw/xfree86/common/xf86Events.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Events.c:3.92 xc/programs/Xserver/hw/xfree86/common/xf86Events.c:3.94
--- xc/programs/Xserver/hw/xfree86/common/xf86Events.c:3.92	Sat Feb 12 19:36:03 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c	Thu May 18 16:21:33 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.92 2000/02/13 03:36:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.94 2000/05/18 23:21:33 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
@@ -329,7 +329,8 @@
 
 #if defined (__sparc__)
   if (kbdSun == -1) {
-    if (xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
+    if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
+	|| (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
       kbdSun = 1;
     else
       kbdSun = 0;
@@ -872,9 +873,14 @@
   /*
    * check for an autorepeat-event
    */
-  if ((down && KeyPressed(keycode)) &&
-      (xf86Info.autoRepeat != AutoRepeatModeOn || keyc->modifierMap[keycode]))
-    return;
+  if (down && KeyPressed(keycode)) {
+      KbdFeedbackClassRec *kbdfeed = ((DeviceIntPtr)xf86Info.pKeyboard)->kbdfeed;
+      if ((xf86Info.autoRepeat != AutoRepeatModeOn) ||
+          keyc->modifierMap[keycode] ||
+          (kbdfeed && !(kbdfeed->ctrl.autoRepeats[keycode>>3] & ( 1<<(keycode&7) ))))
+          return;
+  }
+
 
   xf86Info.lastEventTime = kevent.u.keyButtonPointer.time = GetTimeInMillis();
   /*
Index: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Helper.c:1.83 xc/programs/Xserver/hw/xfree86/common/xf86Helper.c:1.94
--- xc/programs/Xserver/hw/xfree86/common/xf86Helper.c:1.83	Mon Mar  6 11:07:15 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Helper.c	Mon Jun 19 22:08:44 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.83 2000/03/06 19:07:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.94 2000/06/20 05:08:44 dawes Exp $ */
 
 /*
  * Copyright (c) 1997-1998 by The XFree86 Project, Inc.
@@ -27,6 +27,8 @@
 #include "xf86Xinput.h"
 #include "xf86InPriv.h"
 #include "mivalidate.h"
+#include "xf86RAC.h"
+#include "xf86Bus.h"
 
 /* For xf86GetClocks */
 #if defined(CSRG_BASED) || defined(MACH386)
@@ -62,12 +64,14 @@
 void
 xf86DeleteDriver(int drvIndex)
 {
-    if (xf86DriverList[drvIndex] && xf86DriverList[drvIndex]->module)
-	UnloadModule(xf86DriverList[drvIndex]->module);
-    xf86DriverList[drvIndex] = NULL;
+    if (xf86DriverList[drvIndex]
+	&& (!xf86DriverHasEntities(xf86DriverList[drvIndex]))) {
+	if (xf86DriverList[drvIndex]->module)
+	    UnloadModule(xf86DriverList[drvIndex]->module);
+	xf86DriverList[drvIndex] = NULL;
+    }
 }
 
-
 /* Add a pointer to a new InputDriverRec to xf86InputDriverList */
 
 void
@@ -1448,6 +1452,7 @@
     static char *     drivernames[MAXDRIVERS];
     static GDevPtr *  devices[MAXDRIVERS];
     static int	      count[MAXDRIVERS];
+    GDevPtr           gdp;
     confScreenPtr screensecptr;
     int i,j;
 
@@ -1522,6 +1527,22 @@
             devices[i][count[i]++] = screensecptr->device;
         }
     }
+
+    /* Then handle the inactive devices */
+    j = 0;
+    while (xf86ConfigLayout.inactives[j].identifier) {
+	gdp = &xf86ConfigLayout.inactives[j];
+	if (gdp->driver && !gdp->claimed &&
+	    !xf86NameCmp(gdp->driver,drivername)) {
+	    /* we have a matching driver that wasn't claimed yet */
+	    gdp->claimed = TRUE;
+	    devices[i] =
+		xnfrealloc(devices[i], (count[i] + 2) * sizeof(GDevPtr));
+	    devices[i][count[i]++] = gdp;
+	}
+	j++;
+    }
+    
 #if 0
     /*
      * XXX The parser won't let devices with no Driver name through, so
@@ -1565,7 +1586,8 @@
     GDevPtr		dev;
     Bool		foundHW;  /* PCIid in list of supported chipsets */
     Bool		claimed;  /* BusID matches with a device section */
-    int             chip;
+    int 		chip;
+    int 		screen;
 };
 
 int
@@ -1583,6 +1605,7 @@
 	Bool		foundHW;  /* PCIid in list of supported chipsets */
 	Bool		claimed;  /* BusID matches with a device section */
         int             chip;
+        int		screen;
     } *instances = NULL;
     int numClaimedInstances = 0;
     int allocatedInstances = 0;
@@ -1608,6 +1631,7 @@
 	            instances[allocatedInstances - 1].claimed = FALSE;
 	            instances[allocatedInstances - 1].foundHW = TRUE;
 		    instances[allocatedInstances - 1].chip = id->numChipset;
+		    instances[allocatedInstances - 1].screen = 0;
 		    numFound++;
 	        }
 	    }
@@ -1624,6 +1648,7 @@
 		    instances[allocatedInstances - 1].claimed = FALSE;
 		    instances[allocatedInstances - 1].foundHW = TRUE;
 		    instances[allocatedInstances - 1].chip = id->numChipset;
+		    instances[allocatedInstances - 1].screen = 0;
 		    numFound++;
 		}
 	    }
@@ -1639,6 +1664,7 @@
 		instances[allocatedInstances - 1].dev = NULL;
 		instances[allocatedInstances - 1].claimed = FALSE;
 		instances[allocatedInstances - 1].foundHW = FALSE;
+	        instances[allocatedInstances - 1].screen = 0;
 
 		/* Check if the chip type is listed in the chipsets table */
 		for (id = PCIchipsets; id->PCIid != -1; id++) {
@@ -1693,6 +1719,36 @@
     ErrorF("%s instances found: %d\n", driverName, allocatedInstances);
 #endif
 
+   /*
+    * Check for devices that need duplicated instances.  This is required
+    * when there is more than one screen per entity.
+    *
+    * XXX This currently doesn't work for cases where the BusID isn't
+    * specified explicitly in the config file.
+    */
+
+    for (j = 0; j < numDevs; j++) {
+        if (devList[j]->screen > 0 && devList[j]->busID 
+	    && *devList[j]->busID) {
+	    for (i = 0; i < allocatedInstances; i++) {
+	        pPci = instances[i].pci;
+	        if (xf86ComparePciBusString(devList[j]->busID, pPci->bus,
+					    pPci->device,
+					    pPci->func)) {
+		    allocatedInstances++;
+		    instances = xnfrealloc(instances,
+					   allocatedInstances * 
+					   sizeof(struct Inst));
+		    instances[allocatedInstances - 1] = instances[i];
+		    instances[allocatedInstances - 1].screen =
+		      				devList[j]->screen;
+		    numFound++;
+		    break;
+		}
+	    }
+	}
+    }
+
     for (i = 0; i < allocatedInstances; i++) {
 	pPci = instances[i].pci;
 	devBus = NULL;
@@ -1701,13 +1757,15 @@
 	    if (devList[j]->busID && *devList[j]->busID) {
 		if (xf86ComparePciBusString(devList[j]->busID, pPci->bus,
 					   pPci->device,
-					   pPci->func)) {
+					   pPci->func) &&
+		    devList[j]->screen == instances[i].screen) {
+		   
 		    if (devBus)
-			xf86MsgVerb(X_WARNING,0,
+                        xf86MsgVerb(X_WARNING,0,
 			    "%s: More than one matching Device section for "
-			    "instance (BusID: %s) found: %s\n",
-			    driverName,devList[j]->identifier,
-			    devList[j]->busID);
+			    "instances\n\t(BusID: %s) found: %s\n",
+			    driverName, devList[j]->busID,
+			    devList[j]->identifier);
 		    else
 			devBus = devList[j];
 		} 
@@ -1831,7 +1889,18 @@
 	if (!instances[i].claimed)
 	    continue;
 	pPci = instances[i].pci;
-	if (!xf86CheckPciSlot(pPci->bus, pPci->device, pPci->func))
+
+
+        /*
+	 * Allow the same entity to be used more than once for devices with
+	 * multiple screens per entity.  This assumes implicitly that there
+	 * will be a screen == 0 instance.
+	 *
+	 * XXX Need to make sure that two different drivers don't claim
+	 * the same screen > 0 instance.
+	 */
+        if (instances[i].screen == 0 &&
+	    !xf86CheckPciSlot(pPci->bus, pPci->device, pPci->func))
 	    continue;
 
 #ifdef DEBUG
@@ -1847,6 +1916,20 @@
 			       pPci->func,drvp,	instances[i].chip,
 			       instances[i].dev,instances[i].dev->active ?
 			       TRUE : FALSE);
+        if (retEntities[numFound - 1] == -1 && instances[i].screen > 0) {
+	    for (j = 0; j < xf86NumEntities; j++) {
+	        EntityPtr pEnt = xf86Entities[j];
+	        if (pEnt->busType != BUS_PCI)
+		    continue;
+	        if (pEnt->pciBusId.bus == pPci->bus &&
+		    pEnt->pciBusId.device == pPci->device &&
+		    pEnt->pciBusId.func == pPci->func) {
+		    retEntities[numFound - 1] = j;
+		    xf86AddDevToEntity(j, instances[i].dev);
+		    break;
+		}
+	    }
+	}
     }
     xfree(instances);
     if (numFound > 0) {
@@ -2208,6 +2291,22 @@
 #endif
 }
 
+pointer
+xf86LoadDrvSubModule(DriverPtr drv, const char *name)
+{
+#ifdef XFree86LOADER
+    pointer ret;
+    int errmaj = 0, errmin = 0;
+
+    ret = LoadSubModule(drv->module, name, NULL, NULL, NULL, NULL,
+			&errmaj, &errmin);
+    if (!ret)
+	LoaderErrorMsg(NULL, name, errmaj, errmin);
+    return ret;
+#else
+    return (pointer)1;
+#endif
+}
 
 pointer
 xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
@@ -2226,6 +2325,18 @@
 #endif
 }
 
+void
+xf86UnloadSubModule(pointer mod)
+{
+    /*
+     * This is disabled for now.  The loader isn't smart enough yet to undo
+     * relocations.
+     */
+#if defined(XFree86LOADER) && 0
+    UnloadSubModule(mod);
+#endif
+}
+
 Bool
 xf86LoaderCheckSymbol(const char *name)
 {
@@ -2323,14 +2434,18 @@
    { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }
 };
 
+#define nBSOptions (sizeof(BSOptions) / sizeof(BSOptions[0]))
+
 void 
 xf86SetBackingStore(ScreenPtr pScreen)
 {
     Bool useBS = FALSE;
     MessageType from = X_DEFAULT;
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    OptionInfoRec options[nBSOptions];
 
-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, BSOptions);
+    (void)memcpy(options, BSOptions, sizeof(BSOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
     /* check for commandline option here */
     if (xf86bsEnableFlag) {
@@ -2340,7 +2455,7 @@
 	from = X_CMDLINE;
 	useBS = FALSE;
     } else {
-	if (xf86GetOptValBool(BSOptions, OPTION_BACKING_STORE, &useBS))
+	if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS))
 	    from = X_CONFIG;
     }
     pScreen->backingStoreSupport = useBS ? Always : NotUseful;
@@ -2359,21 +2474,32 @@
    { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }
 };
 
+#define nSMOptions (sizeof(SMOptions) / sizeof(SMOptions[0]))
+
 void 
 xf86SetSilkenMouse (ScreenPtr pScreen)
 {
     Bool useSM = TRUE;
     MessageType from = X_DEFAULT;
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-
-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, SMOptions);
+    OptionInfoRec options[nSMOptions];
 
+    (void)memcpy(options, SMOptions, sizeof(SMOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
+    
     /* check for commandline option here */
-    if (xf86silkenMouseDisableFlag) {
-	from = X_CMDLINE;
+    /* disable if screen shares resources */
+    if (((pScrn->racMemFlags & RAC_CURSOR) && 
+	 !xf86NoSharedResources(pScrn->scrnIndex,MEM)) ||
+	((pScrn->racIoFlags & RAC_CURSOR) && 
+	 !xf86NoSharedResources(pScrn->scrnIndex,IO))) {
 	useSM = FALSE;
+	from = X_PROBED;
+    } else if (xf86silkenMouseDisableFlag) {
+        from = X_CMDLINE;
+	useSM = FALSE;
     } else {
-	if (xf86GetOptValBool(SMOptions, OPTION_SILKEN_MOUSE, &useSM))
+	if (xf86GetOptValBool(options, OPTION_SILKEN_MOUSE, &useSM))
 	    from = X_CONFIG;
     }
     /*
@@ -2420,24 +2546,32 @@
 
 /* new RAC */
 /*
- * xf86ConfigActiveIsa/PciEntity() -- These helper functions assign an
+ * xf86ConfigIsa/PciEntity() -- These helper functions assign an
  * active entity to a screen, registers its fixed resources, assign
  * special enter/leave functions and their private scratch area to
  * this entity, take the dog for a walk...
  */
-Bool
-xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn, int entityIndex,
+ScrnInfoPtr
+xf86ConfigIsaEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
 			  IsaChipsets *i_chip, resList res, EntityProc init,
 			  EntityProc enter, EntityProc leave, pointer private)
 {
     IsaChipsets *i_id;
     EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
     
-    if (!pEnt->active || !(pEnt->location.type == BUS_ISA)) {
+    if (!(pEnt->location.type == BUS_ISA)) {
 	xfree(pEnt);
-	return FALSE;
+	return pScrn;
     }
-    
+
+    if (!pEnt->active) {
+	xf86ConfigIsaEntityInactive(pEnt, i_chip, res, init,  enter,
+				    leave,  private);
+	return pScrn;
+    }
+
+    if (!pScrn)
+	pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag); 
     xf86AddEntityToScreen(pScrn,entityIndex);
 
     if (i_chip) {
@@ -2448,26 +2582,38 @@
     }
     xfree(pEnt);
     xf86ClaimFixedResources(res,entityIndex);
-    if (!xf86SetEntityFuncs(entityIndex,init,enter,leave,private)) 
-	return FALSE;
+    xf86SetEntityFuncs(entityIndex,init,enter,leave,private);
 
-    return TRUE;
+    return pScrn;
 }
 
-Bool
-xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
+ScrnInfoPtr
+xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
 			  PciChipsets *p_chip, resList res, EntityProc init,
 			  EntityProc enter, EntityProc leave, pointer private)
 {
     PciChipsets *p_id;
     EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
 
-    if (!pEnt->active || !(pEnt->location.type == BUS_PCI)) {
+    if (!(pEnt->location.type == BUS_PCI)) {
 	xfree(pEnt);
-	return FALSE;
+	return pScrn;
+    }
+    if (!pEnt->active) {
+	xf86ConfigPciEntityInactive(pEnt, p_chip, res, init,  enter,
+				    leave,  private);
+	return pScrn;
+    }
+
+    if (!pScrn)
+	pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag);
+    if (xf86IsEntitySharable(entityIndex)) {
+        xf86SetEntityShared(entityIndex);
     }
     xf86AddEntityToScreen(pScrn,entityIndex);
-    
+    if (xf86IsEntityShared(entityIndex)) {
+        return pScrn;
+    }
     if (p_chip) {
 	for (p_id = p_chip; p_id->numChipset != -1; p_id++) {
 	    if (pEnt->chipset == p_id->numChipset) break;
@@ -2477,9 +2623,72 @@
     xfree(pEnt);
 
     xf86ClaimFixedResources(res,entityIndex);
-    if (!xf86SetEntityFuncs(entityIndex,init,enter,leave,private))
-	return FALSE;
+    xf86SetEntityFuncs(entityIndex,init,enter,leave,private);
 
+    return pScrn;
+}
+
+/*
+ *
+ *  OBSOLETE ! xf86ConfigActiveIsaEntity() and xf86ConfigActivePciEntity()
+ *             are obsolete functions. They the are likely to be removed
+ *             Don't use!
+ */
+Bool
+xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn, int entityIndex,
+                          IsaChipsets *i_chip, resList res, EntityProc init,
+                          EntityProc enter, EntityProc leave, pointer private)
+{
+    IsaChipsets *i_id;
+    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
+ 
+    if (!pEnt->active || !(pEnt->location.type == BUS_ISA)) {
+        xfree(pEnt);
+        return FALSE;
+    }
+ 
+    xf86AddEntityToScreen(pScrn,entityIndex);
+ 
+    if (i_chip) {
+        for (i_id = i_chip; i_id->numChipset != -1; i_id++) {
+            if (pEnt->chipset == i_id->numChipset) break;
+        }
+        xf86ClaimFixedResources(i_id->resList,entityIndex);
+    }
+    xfree(pEnt);
+    xf86ClaimFixedResources(res,entityIndex);
+    if (!xf86SetEntityFuncs(entityIndex,init,enter,leave,private))
+        return FALSE;
+ 
+    return TRUE;
+}
+ 
+Bool
+xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
+                          PciChipsets *p_chip, resList res, EntityProc init,
+                          EntityProc enter, EntityProc leave, pointer private)
+{
+    PciChipsets *p_id;
+    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
+ 
+    if (!pEnt->active || !(pEnt->location.type == BUS_PCI)) {
+        xfree(pEnt);
+        return FALSE;
+    }
+    xf86AddEntityToScreen(pScrn,entityIndex);
+ 
+    if (p_chip) {
+        for (p_id = p_chip; p_id->numChipset != -1; p_id++) {
+            if (pEnt->chipset == p_id->numChipset) break;
+        }
+        xf86ClaimFixedResources(p_id->resList,entityIndex);
+    }
+    xfree(pEnt);
+ 
+    xf86ClaimFixedResources(res,entityIndex);
+    if (!xf86SetEntityFuncs(entityIndex,init,enter,leave,private))
+        return FALSE;
+ 
     return TRUE;
 }
 
Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Init.c:3.157 xc/programs/Xserver/hw/xfree86/common/xf86Init.c:3.162
--- xc/programs/Xserver/hw/xfree86/common/xf86Init.c:3.157	Sun Mar  5 15:47:46 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c	Sun Jun 25 13:17:32 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.157 2000/03/05 23:47:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.162 2000/06/25 20:17:32 dawes Exp $ */
 
 /*
  * Copyright 1991-1999 by The XFree86 Project, Inc.
@@ -459,16 +459,17 @@
 	   layout++) {
 	  Bool found = FALSE;
 	  for (j = 0; j < xf86Screens[i]->numEntities; j++) {
-	      EntityInfoPtr pEnt =
-		  xf86GetEntityInfo(xf86Screens[i]->entityList[j]);
-	      if (pEnt->device == layout->screen->device) {
+	
+	      GDevPtr dev =
+		xf86GetDevFromEntity(xf86Screens[i]->entityList[j],
+				     xf86Screens[i]->entityInstanceList[j]);
+
+	      if (dev == layout->screen->device) {
 		  /* A match has been found */
 		  xf86Screens[i]->confScreen = layout->screen;
 		  found = TRUE;
-		  xfree(pEnt);
 		  break;
 	      }
-	      xfree(pEnt);
 	  }
 	  if (found) break;
       }
@@ -1587,6 +1588,7 @@
     pointer opt;
     int i;
     char *name;
+    Bool failed = FALSE;
 
     if (!list)
 	return TRUE;
@@ -1611,16 +1613,15 @@
 
         if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) {
 	    LoaderErrorMsg(NULL, name, errmaj, errmin);
-	    xfree(name);
-            return FALSE;
+	    failed = TRUE;
 	}
 	xfree(name);
     }
-    return TRUE;
+    return !failed;
 }
 
 /*
- * xf86LoadModules iterates over a list that is being passed in.
+ * xf86LoadOneModule loads a single module.
  */             
 pointer
 xf86LoadOneModule(char *name, pointer opt)
Index: xc/programs/Xserver/hw/xfree86/common/xf86Io.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Io.c:3.38 xc/programs/Xserver/hw/xfree86/common/xf86Io.c:3.39
--- xc/programs/Xserver/hw/xfree86/common/xf86Io.c:3.38	Sun Dec 26 16:39:43 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86Io.c	Mon Jun 12 19:28:31 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 3.38 1999/12/27 00:39:43 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 3.39 2000/06/13 02:28:31 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
@@ -396,7 +396,7 @@
   return (Success);
 }
 
-#if !defined(AMOEBA) && !(defined (sun) && defined(i386) && defined (SVR4)) && !defined(MINIX) && !defined(__mips__) && !defined(QNX4)
+#if !defined(AMOEBA) && !(defined (sun) && defined(i386) && defined (SVR4)) && !defined(MINIX) && !(defined(__mips__) && !defined(linux)) && !defined(QNX4)
 /*
  * These are getting tossed in here until I can think of where
  * they really belong
Index: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c:3.12 xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c:3.13
--- xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c:3.12	Wed Apr 28 22:12:57 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c	Fri Jun 23 15:42:02 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c,v 3.12 1999/04/29 05:12:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c,v 3.13 2000/06/23 22:42:02 dawes Exp $ */
 /*
  * Derived from xf86Kbd.c by S_ren Schmidt (sos@login.dkuug.dk)
  * which is Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
@@ -447,7 +447,10 @@
   break;
 #endif
 
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+/*
+ * XXX wscons has no GIO_KEYMAP
+ */
+#if (defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)) && defined(GIO_KEYMAP)
   case SYSCONS:
   case PCVT:
     {
Index: xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c:1.4 xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c:1.5
--- xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c:1.4	Sun Mar  5 09:04:15 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c	Mon Apr 17 09:29:53 2000
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1999 by The XFree86 Project, Inc.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c,v 1.4 2000/03/05 17:04:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c,v 1.5 2000/04/17 16:29:53 eich Exp $ */
 
 /*
  * This file contains the Pointer/Keyboard functions needed by the 
@@ -34,8 +34,7 @@
 
 #include "xf86OSmouse.h"
 #include "../input/mouse/mouse.h"
-const char * xf86ProtocolIDToName(ProtocolID id);
-
+#define DEBUG
 #ifdef DEBUG
 # define DEBUG_P(x) ErrorF(x"\n");
 #else
@@ -83,17 +82,18 @@
 	MTYPE_LOGITECH,		MTYPE_LOGIMAN,		MTYPE_MMHIT,
 	MTYPE_GLIDEPOINT,	MTYPE_IMSERIAL,		MTYPE_THINKING,
 	MTYPE_ACECAD,		MTYPE_PS_2,		MTYPE_IMPS2,
-	MTYPE_THINKINGPS2,	MTYPE_MMANPLUSPS2,	MTYPE_GLIDEPOINTPS2,
-	MTYPE_NETPS2,		MTYPE_NETSCROLLPS2,	MTYPE_BUSMOUSE,
-	MTYPE_AUTOMOUSE,	MTYPE_SYSMOUSE
+	MTYPE_EXPPS2,           MTYPE_THINKINGPS2,	MTYPE_MMANPLUSPS2,
+	MTYPE_GLIDEPOINTPS2,	MTYPE_NETPS2,		MTYPE_NETSCROLLPS2,
+	MTYPE_BUSMOUSE, 	MTYPE_AUTOMOUSE,	MTYPE_SYSMOUSE
     };
 
-    static ProtocolID MapProto_FromMisc[] = {
+    static MouseProtocolID MapProto_FromMisc[] = {
 	PROT_MS,	PROT_MSC,	PROT_MM,	PROT_LOGI,
 	PROT_BM,	PROT_LOGIMAN,	PROT_PS2,	PROT_MMHIT,
 	PROT_GLIDE,	PROT_IMSERIAL,	PROT_THINKING,	PROT_IMPS2,
 	PROT_THINKPS2,	PROT_MMPS2,	PROT_GLIDEPS2,	PROT_NETPS2,
-	PROT_NETSCPS2,	PROT_SYSMOUSE,	PROT_AUTO,	PROT_ACECAD
+	PROT_NETSCPS2,	PROT_SYSMOUSE,	PROT_AUTO,	PROT_ACECAD,
+	PROT_EXPPS2
     };
 #define PROT_DEFAULT  -2 /* PROT_UNKNOWN */
 
@@ -116,23 +116,14 @@
 
     DEBUG_P("MiscExtGetMouseSettings");
 
-    mseptr = MiscExtCreateStruct(MISC_KEYBOARD);
+    mseptr = MiscExtCreateStruct(MISC_POINTER);
     if (!mseptr)
 	return FALSE;
 
     {
-	InputInfoPtr pInfo;
+	InputInfoPtr pInfo = mseptr->private;
 	MouseDevPtr pMse;
 
-	pInfo = xf86InputDevs;
-	while (pInfo) {
-	    if (xf86IsCorePointer(pInfo->dev))
-		break;
-	    pInfo = pInfo->next;
-	}
-	if (!pInfo)
-	    return FALSE;
-
 	*devname = xf86FindOptionValue(pInfo->options, "Device");
 	pMse = pInfo->private;
 
@@ -145,7 +136,6 @@
 	mseptr->em3timeout =	pMse->emulate3Timeout;
 	mseptr->chordmiddle =	pMse->chordMiddle;
 	mseptr->flags =		pMse->mouseFlags;
-	mseptr->private =	pInfo;
     }
     *mouse = mseptr;
     return TRUE;
@@ -181,7 +171,7 @@
 
     switch (valtype) {
 	case MISC_MSE_PROTO:
-		mse->type = value;
+	    mse->type = value;
 		return TRUE;
 	case MISC_MSE_BAUDRATE:
 		mse->baudrate = value;
@@ -269,12 +259,28 @@
 MiscExtCreateStruct(MiscExtStructType mse_or_kbd)
 {
     DEBUG_P("MiscExtCreateStruct");
-
+    
     switch (mse_or_kbd) {
-	case MISC_POINTER:
-		return xcalloc(sizeof(mseParamsRec),1);
-	case MISC_KEYBOARD:
-		return xcalloc(sizeof(kbdParamsRec),1);
+    case MISC_POINTER:
+    {
+	mseParamsPtr mseptr;
+	InputInfoPtr pInfo = xf86InputDevs;
+	
+	while (pInfo) {
+	    if (xf86IsCorePointer(pInfo->dev))
+		break;
+	    pInfo = pInfo->next;
+	}
+	if (!pInfo)
+	    return NULL;
+	
+	mseptr = xcalloc(sizeof(mseParamsRec),1);
+	if (mseptr)
+	    mseptr->private = pInfo;
+	return mseptr;
+    }
+    case MISC_KEYBOARD:
+	return xcalloc(sizeof(kbdParamsRec),1);
     }
     return 0;
 }
@@ -301,9 +307,12 @@
 	mseParamsPtr mse = structure;
 	InputInfoPtr pInfo;
 	MouseDevPtr pMse;
-	MouseProtocolPtr protocol;
-	char tmpbuf[128];
-
+#ifdef XFree86LOADER
+	pointer xf86MouseProtocolIDToName
+	    = LoaderSymbol("xf86MouseProtocolIDToName");
+	if (!xf86MouseProtocolIDToName)
+	    return MISC_RET_NOMODULE;
+#endif
 	if (mse->type < MTYPE_MICROSOFT
 		|| ( mse->type > MTYPE_ACECAD
 		    && (mse->type!=MTYPE_OSMOUSE && mse->type!=MTYPE_XQUEUE)))
@@ -393,7 +402,12 @@
 	pMse->chordMiddle     = mse->chordmiddle;
 	pMse->mouseFlags      = mse->flags;
 
-	pMse->protocol = xf86ProtocolIDToName(pMse->protocolID);
+#ifdef XFree86LOADER
+	pMse->protocol = ((const char *(*)(MouseProtocolID))
+			  xf86MouseProtocolIDToName)(pMse->protocolID);
+#else
+	pMse->protocol = xf86MouseProtocolIDToName(pMse->protocolID);
+#endif
 	if (reopen)
 	    (pMse->device->deviceProc)(pMse->device, DEVICE_ON);
 	/* Set pInfo->options too */
Index: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Mode.c:1.27 xc/programs/Xserver/hw/xfree86/common/xf86Mode.c:1.32
--- xc/programs/Xserver/hw/xfree86/common/xf86Mode.c:1.27	Sun Mar  5 15:47:47 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Mode.c	Mon Jun 19 22:08:44 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.27 2000/03/05 23:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.32 2000/06/20 05:08:44 dawes Exp $ */
 
 /*
  * Copyright (c) 1997,1998 by The XFree86 Project, Inc.
@@ -125,6 +125,12 @@
 	return "exceeds panel dimensions";
     case MODE_INTERLACE_WIDTH:
 	return "width too large for interlaced mode";
+    case MODE_ONE_WIDTH:
+        return "all modes must have the same width";
+    case MODE_ONE_HEIGHT:
+        return "all modes must have the same height";
+    case MODE_ONE_SIZE:
+        return "all modes must have the same resolution";
     case MODE_BAD:
 	return "unknown reason";
     case MODE_ERROR:
@@ -151,8 +157,24 @@
 	DivFactor = max(1, cp->ClockDivFactor);
 	MulFactor = max(1, cp->ClockMulFactor);
 	if (scrp->progClock) {
-	    xf86DrvMsg(scrp->scrnIndex, X_INFO, "clock range: %6.2f to %6.2f MHz\n",
-		(double)cp->minClock / 1000.0, (double)cp->maxClock / 1000);
+	    if (cp->minClock) {
+		if (cp->maxClock) {
+		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+			"Clock range: %6.2f to %6.2f MHz\n",
+			(double)cp->minClock / 1000.0,
+			(double)cp->maxClock / 1000.0);
+		} else {
+		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+			"Minimum clock: %6.2f MHz\n",
+			(double)cp->minClock / 1000.0);
+		}
+	    } else {
+		if (cp->maxClock) {
+		    xf86DrvMsg(scrp->scrnIndex, X_INFO,
+			"Maximum clock: %6.2f MHz\n",
+			(double)cp->maxClock / 1000.0);
+		}
+	    }
 	} else if (DivFactor > 1 || MulFactor > 1) {
 	    j = 0;
 	    for (i = 0; i < scrp->numClocks; i++) {
@@ -370,7 +392,6 @@
 	    if (p->type & M_T_BUILTIN) 
 		return xf86HandleBuiltinMode(scrp, p,modep, clockRanges,
 					     allowDiv2);
-
 	    /* Skip over previously rejected modes */
 	    if (p->status != MODE_OK) {
 		if (!found)
@@ -1112,6 +1133,19 @@
 	    scrp->monitor->hsync[0].lo = 28;
 	    scrp->monitor->hsync[0].hi = 33;
 	    scrp->monitor->nHsync = 1;
+	} else {
+	  for (i = 0; i < scrp->monitor->nHsync; i++)
+	    if (scrp->monitor->hsync[i].lo == scrp->monitor->hsync[i].hi)
+	      xf86DrvMsg(scrp->scrnIndex, X_INFO,
+			 "%s: Using hsync value of %6.2f kHz\n",
+			 scrp->monitor->id,
+			 scrp->monitor->hsync[i].lo);
+	    else
+	      xf86DrvMsg(scrp->scrnIndex, X_INFO,
+			 "%s: Using hsync range of %6.2f-%6.2f kHz\n",
+			 scrp->monitor->id,
+			 scrp->monitor->hsync[i].lo,
+			 scrp->monitor->hsync[i].hi);
 	}
 	if (scrp->monitor->nVrefresh <= 0) {
 	    xf86DrvMsg(scrp->scrnIndex, X_WARNING,
@@ -1120,6 +1154,19 @@
 	    scrp->monitor->vrefresh[0].lo = 43;
 	    scrp->monitor->vrefresh[0].hi = 72;
 	    scrp->monitor->nVrefresh = 1;
+	} else {
+	  for (i = 0; i < scrp->monitor->nVrefresh; i++)
+	    if (scrp->monitor->vrefresh[i].lo == scrp->monitor->vrefresh[i].hi)
+	      xf86DrvMsg(scrp->scrnIndex, X_INFO,
+			 "%s: Using vrefresh value of %6.2f Hz\n",
+			 scrp->monitor->id,
+			 scrp->monitor->vrefresh[i].lo);
+	    else
+	      xf86DrvMsg(scrp->scrnIndex, X_INFO,
+			 "%s: Using vrefresh range of %6.2f-%6.2f Hz\n",
+			 scrp->monitor->id,
+			 scrp->monitor->vrefresh[i].lo,
+			 scrp->monitor->vrefresh[i].hi);
 	}
     }
 
@@ -1299,7 +1346,6 @@
 	    endp = &new->next;
 	}
     }
-
     /* Lookup each mode */
     for (p = scrp->modes; ; p = p->next) {
 	/*
@@ -1307,6 +1353,7 @@
 	 * unconsidered modePool members until one survives validation.  This
 	 * is done in decreasing order by mode pixel area.
 	 */
+
 	if (p == NULL) {
 	    if (numModes > 0)
 		break;
@@ -1346,8 +1393,10 @@
 	    *endp = last = p;
 	    endp = &p->next;
 	}
+
     lookupNext:
 	status = xf86LookupMode(scrp, p, clockRanges, strategy);
+
 	if (status == MODE_ERROR) {
 	    ErrorF("xf86ValidateModes: "
 		   "unexpected result from xf86LookupMode()\n");
@@ -1425,8 +1474,18 @@
 	    scrp->displayWidth = newLinePitch;
 	    p->status = (scrp->ValidMode)(scrp->scrnIndex, p, FALSE,
 					  MODECHECK_FINAL);
-	    if (p->status != MODE_OK)
-		goto lookupNext;
+
+	   if (p->status != MODE_OK) {
+	        if (p->type & M_T_BUILTIN)
+		    xf86DrvMsg(scrp->scrnIndex, X_WARNING,
+			       "Built-in mode \"%s\" deleted (%s)\n", p->name,
+			       xf86ModeStatusToString(p->status));
+	        else
+		    xf86DrvMsg(scrp->scrnIndex, X_WARNING,
+			       "Mode \"%s\" deleted (%s)\n", p->name,
+			       xf86ModeStatusToString(p->status));
+	        goto lookupNext;
+	    }
 	}
 
 	/* Mode has passed all the tests */
Index: xc/programs/Xserver/hw/xfree86/common/xf86Module.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Module.h:1.21 xc/programs/Xserver/hw/xfree86/common/xf86Module.h:1.24
--- xc/programs/Xserver/hw/xfree86/common/xf86Module.h:1.21	Wed Mar  1 15:54:33 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Module.h	Wed Apr  5 11:13:45 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Module.h,v 1.21 2000/03/01 23:54:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Module.h,v 1.24 2000/04/05 18:13:45 dawes Exp $ */
 
 /*
  * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
@@ -62,7 +62,7 @@
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 1)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(0, 1)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(0, 2)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(0, 1)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(0, 1)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 1)
@@ -71,7 +71,11 @@
 #define MODINFOSTRING2	0x10dc023a
 
 #ifndef MODULEVENDORSTRING
+#ifndef __OS2ELF__
 #define MODULEVENDORSTRING	"The XFree86 Project"
+#else
+#define MODULEVENDORSTRING	"The XFree86 Project - XFree86/OS2"
+#endif
 #endif
 
 /* Error return codes for errmaj.  New codes must only be added at the end. */
Index: xc/programs/Xserver/hw/xfree86/common/xf86Option.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Option.c:1.14 xc/programs/Xserver/hw/xfree86/common/xf86Option.c:1.15
--- xc/programs/Xserver/hw/xfree86/common/xf86Option.c:1.14	Sat Jun 12 00:18:43 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86Option.c	Mon Jun 19 22:08:45 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Option.c,v 1.14 1999/06/12 07:18:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Option.c,v 1.15 2000/06/20 05:08:45 dawes Exp $ */
 
 /*
  * Copyright (c) 1998 by The XFree86 Project, Inc.
@@ -42,22 +42,22 @@
 {
     XF86OptionPtr tmp;
     XF86OptionPtr extras = (XF86OptionPtr)extraOpts;
-    EntityInfoPtr pEnt;
+    GDevPtr device;
     
     int i;
 
     pScrn->options = NULL;
 
     for (i=pScrn->numEntities - 1; i >= 0; i--) {
-	pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
-	if (pEnt->device && pEnt->device->options) {
-	    tmp = OptionListDup(pEnt->device->options);
+	device = xf86GetDevFromEntity(pScrn->entityList[i],
+					pScrn->entityInstanceList[i]);
+	if (device && device->options) {
+	    tmp = OptionListDup(device->options);
 	    if (pScrn->options)
 		OptionListMerge(pScrn->options,tmp);
 	    else
 		pScrn->options = tmp;
 	}
-	xfree(pEnt);
     }
     if (pScrn->monitor->options) {
 	tmp = OptionListDup(pScrn->monitor->options);
Index: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h:1.51 xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h:1.65
--- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h:1.51	Thu Feb 24 12:39:14 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h	Fri Jun 30 10:15:11 2000
@@ -1,11 +1,38 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.51 2000/02/24 20:39:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.65 2000/06/30 17:15:11 dawes Exp $ */
 /*
  * PCI Probe
  *
- * Copyright 1995-1999 by The XFree86 Project, Inc.
+ * Copyright 1995-2000 by The XFree86 Project, Inc.
  *
  * A lot of this comes from Robin Cutshaw's scanpci
  *
+ * Notes -- Jun 6, 2000 -- Kevin Brosius
+ * Tips on adding Entries:
+ *   scanpci output can contain up to 4 numeric entries, 2 for chip and 2 for card
+ *   some generic cards don't have any valid info in the card field,
+ *   here's what you do;
+ *   - Add a vendor entry for your device if it doesn't already exist.  The
+ *     first number of the pair is generally vendor id.  Search for it below
+ *     and add a #define for it if it doesn't exist.
+ *       ie. 5333 is the vendor id for S3
+ *   - Go to xf86PCIVendorNameInfoData[] and add a text name for your vendor id.
+ *       ie. PCI_VENDOR_S3 is "S3"
+ *   - Add an entry to xf86PCIVendorInfoData[], using the PCI_VENDOR define
+ *     you added, and a text description of the chipset.
+ *   - If your device has 0000 in the card field,
+ *     you've probably got a non-video or generic device.  Stop here.
+ *   
+ *   - If you have info in the card field, and it's just a duplicate of the chip
+ *     info, then either stop, or add a 'generic' entry to xf86PCICardInfoData[].
+ *   - If you have different info in the card field, check the first entry,
+ *     does the vendor match and/or already exist?  If not, add it.  Then
+ *     add an entry describing the card to xf86PCICardInfoData[]
+ *   - If you are adding a video card, add a PCI_CHIP #define matching the second
+ *     entry in your chip field.  This gets used in your card driver as the PCI id.
+ *       ie. under the S3 comment, one entry is: PCI_CHIP_VIRGE 0x5631
+ *       
+ * Several people recommended http://www.yourvote.com/pci for pci device/vendor info.
+ * 
  */
 
 #ifndef _XF86_PCIINFO_H
@@ -25,6 +52,7 @@
 #define PCI_VENDOR_NS		0x100B
 #define PCI_VENDOR_TSENG	0x100C
 #define PCI_VENDOR_WEITEK	0x100E
+#define PCI_VENDOR_VIDEOLOGIC	0x1010
 #define PCI_VENDOR_DIGITAL	0x1011
 #define PCI_VENDOR_CIRRUS	0x1013
 #define PCI_VENDOR_IBM		0x1014
@@ -47,6 +75,7 @@
 #define PCI_VENDOR_SGS		0x104A
 #define PCI_VENDOR_BUSLOGIC	0x104B
 #define PCI_VENDOR_TI		0x104C
+#define PCI_VENDOR_SONY		0x104D
 #define PCI_VENDOR_OAK		0x104E
 #define PCI_VENDOR_WINBOND	0x1050
 #define PCI_VENDOR_MOTOROLA	0x1057
@@ -93,6 +122,7 @@
 #define PCI_VENDOR_TRUEVISION	0x10FA
 #define PCI_VENDOR_INITIO	0x1101
 #define PCI_VENDOR_CREATIVE_2	0x1102
+#define PCI_VENDOR_SIGMADESIGNS_2	0x1105
 #define PCI_VENDOR_VIA		0x1106
 #define PCI_VENDOR_VORTEX	0x1119
 #define PCI_VENDOR_EF		0x111A
@@ -105,16 +135,20 @@
 #define PCI_VENDOR_MUTECH	0x1159
 #define PCI_VENDOR_RENDITION	0x1163
 #define PCI_VENDOR_TOSHIBA	0x1179
+#define PCI_VENDOR_RICOH	0x1180
 #define PCI_VENDOR_ZEINET	0x1193
+#define PCI_VENDOR_LITEON	0x11AD
 #define PCI_VENDOR_SPECIALIX	0x11CB
 #define PCI_VENDOR_CONTROL	0x11FE
 #define PCI_VENDOR_CYCLADES	0x120E
 #define PCI_VENDOR_3DFX		0x121A
 #define PCI_VENDOR_SIGMADESIGNS	0x1236
 #define PCI_VENDOR_ENSONIQ	0x1274
+#define PCI_VENDOR_ROCKWELL	0x127A
 #define PCI_VENDOR_YOKOGAWA	0x1281
 #define PCI_VENDOR_TRITECH	0x1292
 #define PCI_VENDOR_NVIDIA_SGS	0x12d2
+#define PCI_VENDOR_NETGEAR	0x1385
 #define PCI_VENDOR_SYMPHONY	0x1C1C
 #define PCI_VENDOR_TEKRAM_2	0x1DE1
 #define PCI_VENDOR_3DLABS	0x3D3D
@@ -185,6 +219,8 @@
 #define PCI_CHIP_MACH64GZ	0x475A
 #define PCI_CHIP_MACH64LB	0x4C42
 #define PCI_CHIP_MACH64LD	0x4C44
+#define PCI_CHIP_RAGE128LE	0x4C45
+#define PCI_CHIP_RAGE128LF	0x4C46
 #define PCI_CHIP_MACH64LG	0x4C47
 #define PCI_CHIP_MACH64LI	0x4C49
 #define PCI_CHIP_MACH64LM	0x4C4D
@@ -192,11 +228,12 @@
 #define PCI_CHIP_MACH64LP	0x4C50
 #define PCI_CHIP_MACH64LR	0x4C52
 #define PCI_CHIP_MACH64LS	0x4C53
+#define PCI_CHIP_RAGE128PF	0x5046
+#define PCI_CHIP_RAGE128PR	0x5052
 #define PCI_CHIP_RAGE128RE	0x5245
 #define PCI_CHIP_RAGE128RF	0x5246
 #define PCI_CHIP_RAGE128RK	0x524B
 #define PCI_CHIP_RAGE128RL	0x524C
-#define PCI_CHIP_RAGE128PF      0x5046
 #define PCI_CHIP_MACH64VT	0x5654
 #define PCI_CHIP_MACH64VU	0x5655
 #define PCI_CHIP_MACH64VV	0x5656
@@ -277,6 +314,7 @@
 #define PCI_CHIP_8400		0x8400
 #define PCI_CHIP_8420		0x8420
 #define PCI_CHIP_8500		0x8500
+#define PCI_CHIP_8520		0x8520
 #define PCI_CHIP_9320		0x9320
 #define PCI_CHIP_9388		0x9388
 #define PCI_CHIP_9397		0x9397
@@ -443,6 +481,7 @@
 #define PCI_CHIP_VOODOO2	0x0002
 #define PCI_CHIP_BANSHEE	0x0003
 #define PCI_CHIP_VOODOO3	0x0005
+#define PCI_CHIP_VOODOO5	0x0009
 
 /* Rendition */
 #define PCI_CHIP_V1000		0x0001
@@ -457,6 +496,7 @@
 #define PCI_CHIP_PERMEDIA2	0x0007
 #define PCI_CHIP_GAMMA		0x0008
 #define PCI_CHIP_PERMEDIA2V	0x0009
+#define PCI_CHIP_PERMEDIA3	0x000A
 
 /* S3 */
 #define PCI_CHIP_PLATO		0x0551
@@ -502,9 +542,19 @@
 #define PCI_CHIP_NM2097	        0x0083
 #define PCI_CHIP_NM2160		0x0004
 #define PCI_CHIP_NM2200		0x0005
+#define PCI_CHIP_NM2360		0x0006
+#define PCI_CHIP_NM2380		0x0016
 
 /* Intel */
-#define PCI_CHIP_I740_AGP	0x7800
+#define PCI_CHIP_I815_BRIDGE		0x1130
+#define PCI_CHIP_I815			0x1132
+#define PCI_CHIP_I810_BRIDGE		0x7120
+#define PCI_CHIP_I810			0x7121
+#define PCI_CHIP_I810_DC100_BRIDGE	0x7122
+#define PCI_CHIP_I810_DC100		0x7123
+#define PCI_CHIP_I810_E_BRIDGE		0x7124
+#define PCI_CHIP_I810_E			0x7125
+#define PCI_CHIP_I740_AGP		0x7800
 
 /*
  * first the VendorId - VendorName mapping
@@ -522,6 +572,7 @@
     {PCI_VENDOR_NS, "NS"},
     {PCI_VENDOR_TSENG,	"Tseng Labs"},
     {PCI_VENDOR_WEITEK,	"Weitek"},
+    {PCI_VENDOR_VIDEOLOGIC,	"Video Logic"},
     {PCI_VENDOR_DIGITAL, "Digital"},
     {PCI_VENDOR_CIRRUS,	"Cirrus Logic"},
     {PCI_VENDOR_IBM, "IBM"},
@@ -542,6 +593,7 @@
     {PCI_VENDOR_SGS,	"SGS-Thomson"},
     {PCI_VENDOR_BUSLOGIC, "BusLogic"},
     {PCI_VENDOR_TI,	"Texas Instruments"},
+    {PCI_VENDOR_SONY, "Sony"},
     {PCI_VENDOR_OAK,	"Oak"},
     {PCI_VENDOR_WINBOND,"Winbond"},
     {PCI_VENDOR_MOTOROLA, "Motorola"},
@@ -560,6 +612,7 @@
     {PCI_VENDOR_FOREX, "FOREX"},
     {PCI_VENDOR_OLICOM, "Olicom"},
     {PCI_VENDOR_SUN, "Sun"},
+    {PCI_VENDOR_DIAMOND, "Diamond"},
     {PCI_VENDOR_CMD, "CMD"},
     {PCI_VENDOR_VISION, "Vision"},
     {PCI_VENDOR_BROOKTREE,	"BrookTree"},
@@ -585,6 +638,7 @@
     {PCI_VENDOR_TRUEVISION, "Truevision"},
     {PCI_VENDOR_INITIO, "Initio Corp"},
     {PCI_VENDOR_CREATIVE_2, "Creative Labs"},
+    {PCI_VENDOR_SIGMADESIGNS_2, "Sigma Designs"},
     {PCI_VENDOR_VIA, "VIA"},
     {PCI_VENDOR_VORTEX, "Vortex"},
     {PCI_VENDOR_EF, "EF"},
@@ -592,17 +646,22 @@
     {PCI_VENDOR_IMAGTEC, "Imaging Technology"},
     {PCI_VENDOR_PLX, "PLX"},
     {PCI_VENDOR_NVIDIA_SGS,	"NVidia/SGS-Thomson"},
+    {PCI_VENDOR_NETGEAR,	"Netgear"},
     {PCI_VENDOR_ALLIANCE, "Alliance Semiconductor"},
     {PCI_VENDOR_VMIC, "VMIC"},
     {PCI_VENDOR_DIGI, "DIGI*"},
     {PCI_VENDOR_MUTECH, "Mutech"},
     {PCI_VENDOR_RENDITION, "Rendition"},
+    {PCI_VENDOR_TOSHIBA, "Toshiba"},
+    {PCI_VENDOR_RICOH,	"Ricoh"},
+    {PCI_VENDOR_ZEINET,	"Zeinet"},
+    {PCI_VENDOR_LITEON,	"Lite-On"},
     {PCI_VENDOR_3DFX,	"3Dfx Interactive"},
     {PCI_VENDOR_SIGMADESIGNS, "Sigma Designs"},
     {PCI_VENDOR_ENSONIQ, "Ensoniq"},
+    {PCI_VENDOR_ROCKWELL, "Rockwell"},
     {PCI_VENDOR_YOKOGAWA, "YOKOGAWA"},
     {PCI_VENDOR_TRITECH,	"Tritech Microelectronics"},
-    {PCI_VENDOR_NVIDIA_SGS, "NVidia/SGS-Thomson"},
     {PCI_VENDOR_SYMPHONY, "Symphony"},
     {PCI_VENDOR_TEKRAM_2, "Tekram"},
     {PCI_VENDOR_3DLABS, "3Dlabs"},
@@ -690,6 +749,8 @@
 				{PCI_CHIP_MACH64GZ,	"Mach64 GZ",0},
 				{PCI_CHIP_MACH64LB,	"Mach64 LB",0},
 				{PCI_CHIP_MACH64LD,	"Mach64 LD",0},
+				{PCI_CHIP_RAGE128LE,    "Rage 128 Mobility LE",0},
+				{PCI_CHIP_RAGE128LF,    "Rage 128 Mobility LF",0},
 				{PCI_CHIP_MACH64LG,	"Mach64 LG",0},
 				{PCI_CHIP_MACH64LI,	"Mach64 LI",0},
 				{PCI_CHIP_MACH64LM,	"Mach64 LM",0},
@@ -697,11 +758,12 @@
 				{PCI_CHIP_MACH64LP,	"Mach64 LP",0},
 				{PCI_CHIP_MACH64LR,	"Mach64 LR",0},
 				{PCI_CHIP_MACH64LS,	"Mach64 LS",0},
+				{PCI_CHIP_RAGE128PF,    "Rage 128 Pro PF",0},
+				{PCI_CHIP_RAGE128PR,    "Rage 128 Pro PR",0},
 				{PCI_CHIP_RAGE128RE,	"Rage 128 RE",0},
 				{PCI_CHIP_RAGE128RF,	"Rage 128 RF",0},
 				{PCI_CHIP_RAGE128RK,	"Rage 128 RK",0},
 				{PCI_CHIP_RAGE128RL,	"Rage 128 RL",0},
-				{PCI_CHIP_RAGE128PF,    "Rage 128 Pro PF",0},
 				{PCI_CHIP_MACH64VT,	"Mach64 VT",0},
 				{PCI_CHIP_MACH64VU,	"Mach64 VU",0},
 				{PCI_CHIP_MACH64VV,	"Mach64 VV",0},
@@ -771,14 +833,14 @@
 				{0x6001,		"CS4236B/CS4611 Audio" ,0},
 #endif
 				{0x0000,		NULL,0}}},
-#ifdef VENDOR_INCLUDE_NONVIDEO
     {PCI_VENDOR_IBM, {
 				{0x000A,		"Fire Coral",0 },
 				{0x0018,		"Token Ring",0 },
 				{0x001D,		"82G2675",0 },
 				{0x0022,		"82351 pci-pci bridge",0 },
+				{0x00B7,		"256-bit Graphics Rasterizer",0 },
+				{0x0170,		"RC1000 / GT 1000",0},
 				{0x0000,		NULL,0}}},
-#endif
 #ifdef INCLUDE_EMPTY_LISTS
     {PCI_VENDOR_NCR_2,	{
 				{0x0000,		NULL,0}}},
@@ -809,6 +871,7 @@
 				{PCI_CHIP_8400,		"CyberBlade/i7",0},
 				{PCI_CHIP_8420,		"CyberBlade/DSTN/i7",0},
 				{PCI_CHIP_8500,		"CyberBlade/i1",0},
+				{PCI_CHIP_8520,		"CyberBlade/DSTN/i1",0},
 				{0x0000,		NULL,0}}},
 #ifdef VENDOR_INCLUDE_NONVIDEO
      {PCI_VENDOR_ALI, {
@@ -891,6 +954,11 @@
 				{PCI_CHIP_PCI_1130,	"PCI 1130",0},
 				{PCI_CHIP_PCI_1131,	"PCI 1131",0},
 				{0x0000,		NULL,0}}},
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{PCI_VENDOR_SONY, {
+				{0x8009,		"CXD1947A IEEE1394/Firewire",0},
+				{0x0000,		NULL,0}}},
+#endif
     {PCI_VENDOR_OAK, {
 				{PCI_CHIP_OTI107,	"OTI107",0},
 				{0x0000,		NULL,0}}},
@@ -1059,6 +1127,11 @@
 				{PCI_CHIP_NM2093,	"NM2093",0},
 				{PCI_CHIP_NM2160,	"NM2160",0},
 				{PCI_CHIP_NM2200,	"NM2200",0},
+				{PCI_CHIP_NM2360,	"NM2360",0},
+				{PCI_CHIP_NM2380,	"NM2380",0},
+#ifdef VENDOR_INCLUDE_NONVIDEO
+				{0x8005,			"NM2360 MagicMedia 256ZX Audio",0},
+#endif
 				{0x0000,		NULL,0}}},
 #ifdef VENDOR_INCLUDE_NONVIDEO
     {PCI_VENDOR_ASP, {
@@ -1107,7 +1180,7 @@
     {PCI_VENDOR_REALTEC, {
                                 {0x8029, "8029",0 },
                                 {0x8129, "8129",0 },
-                                {0x8139, "RTL8139 Ethernet Controller",0 },
+                                {0x8139, "RTL8139 10/100 Ethernet",0 },
 				{0x0000,		NULL,0}}},
     {PCI_VENDOR_TRUEVISION, {
                                 {0x000C, "Targa 1000",0 },
@@ -1115,6 +1188,9 @@
     {PCI_VENDOR_INITIO, {
                                 {0x9100, "320 P",0 },
 				{0x0000,		NULL,0}}},
+	{PCI_VENDOR_SIGMADESIGNS_2, {
+	            {0x8300, "EM8300 MPEG2 decoder", 0 },
+	            {0x0000, NULL,0}}},
     {PCI_VENDOR_VIA, {
 				{0x0501, "VT 8501 MVP4 Host Bridge",0 },
                                 {0x0505, "VT 82C505",0 },
@@ -1173,9 +1249,16 @@
 #ifdef VENDOR_INCLUDE_NONVIDEO
     {PCI_VENDOR_TOSHIBA, {
 				{0x0000,		NULL,0}}},
+	{ PCI_VENDOR_RICOH, {
+				{ 0x0475, 	"RL5C475 PCI-CardBus bridge/PCMCIA",0 },
+                { 0x0000,		NULL,0}}},						
     {PCI_VENDOR_ZEINET, {
                                 {0x0001, "1221",0 },
 				{0x0000,		NULL,0}}},
+    {PCI_VENDOR_LITEON, {
+                                {0x0002, "82C168/9 PNIC 10/100BaseTX",0 },
+                                {0xC115, "LC82C115 PNIC II 10/100BaseTX",0 },
+				{0x0000,		NULL,0}}},
 #ifdef INCLUDE_EMPTY_LISTS
     {PCI_VENDOR_SPECIALIX, {
 				{0x0000,		NULL,0}}},
@@ -1190,6 +1273,7 @@
 				{PCI_CHIP_VOODOO2, 	"Voodoo2",0},
 				{PCI_CHIP_BANSHEE, 	"Banshee",0},
 				{PCI_CHIP_VOODOO3, 	"Voodoo3",0},
+				{PCI_CHIP_VOODOO5, 	"Voodoo5",0},
 				{0x0000,		NULL,0}}},
     {PCI_VENDOR_SIGMADESIGNS, {
                                 {0x6401, "REALmagic64/GX (SD 6425)",0 },
@@ -1199,6 +1283,9 @@
                                 {0x1371, "es1371",0 },
 				{0x0000,		NULL,0}}},
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{PCI_VENDOR_ROCKWELL, {
+				{0x2005,	"RS56/SP-PCI11P1 56K V90 modem/spkrphone",0 },
+				{0x0000,		NULL,0}}},
 #ifdef INCLUDE_EMPTY_LISTS
     {PCI_VENDOR_YOKOGAWA, {
 				{0x0000,		NULL,0}}},
@@ -1227,6 +1314,7 @@
 				{PCI_CHIP_PERMEDIA2,	"GLINT Permedia 2",0},
 				{PCI_CHIP_GAMMA,	"GLINT Gamma",0},
 				{PCI_CHIP_PERMEDIA2V,	"GLINT Permedia 2v",0},
+				{PCI_CHIP_PERMEDIA3,	"GLINT Permedia 3",0},
 				{0x0000,		NULL,0}}},
     {PCI_VENDOR_AVANCE_2, {
 				{0x0000,		NULL,0}}},
@@ -1299,6 +1387,14 @@
 				{0x84C4, "P6",0},
 				{0x84C5, "82450GX20",0},
 				{PCI_CHIP_I740_AGP,	"i740 (AGP)",0},
+				{PCI_CHIP_I815_BRIDGE,	"i815 Bridge",0},
+				{PCI_CHIP_I815,		"i815",0},
+				{PCI_CHIP_I810_BRIDGE,	"i810 Bridge",0},
+				{PCI_CHIP_I810,		"i810",0},
+				{PCI_CHIP_I810_DC100_BRIDGE,	"i810-dc100 Bridge",0},
+				{PCI_CHIP_I810_DC100,	"i810-dc100",0},
+				{PCI_CHIP_I810_E_BRIDGE,"i810e Bridge",0},
+				{PCI_CHIP_I810_E,	"i810e",0},
 				{0x0000,		NULL,0}}},
     {PCI_VENDOR_ADAPTEC, {
 				{0x0010, "2940U2",0 },
@@ -1376,18 +1472,15 @@
 #endif
 	/* ATI card info deleted;  unmaintainable */
 #ifdef VENDOR_INCLUDE_NONVIDEO
-#ifdef INCLUDE_EMPTY_LISTS
 	{ PCI_VENDOR_COMPAQ, {
+                        { 0xC001, "NC3121",0, NF },
                         { 0x0000, (char *)NULL,0, NF } } },
-#endif
-#ifdef VENDOR_INCLUDE_NONVIDEO
 	{ PCI_VENDOR_NCR_1, {
 	                { 0x1000, "SCSI HBA",0, NF },
                         { 0x0000, (char *)NULL,0, NF } } },
     { PCI_VENDOR_REALTEC, {
                         { 0x8139, "Generic",0, NF },
                         { 0x0000, (char *)NULL,0, NF } } },
-#endif
 	{ PCI_VENDOR_CREATIVE_2, {
 			{ 0x1017, "3D Blaster Banshee",0, NF },
                         { 0x0000, (char *)NULL,0, NF } } },
@@ -1395,18 +1488,32 @@
 			{ 0x500A, "EtherWORKS 10/100",0, NF},
                         { 0x0000, (char *)NULL,0, NF } } },
 #endif
+	{ PCI_VENDOR_SONY, {
+						{ 0x8051, "Vaio Video",0,NF },
+#ifdef VENDOR_INCLUDE_NONVIDEO
+						{ 0x8052, "Vaio Audio",0,NF },
+						{ 0x8054, "Vaio Firewire",0,NF },
+						{ 0x8056, "Vaio Modem",0,NF },
+						{ 0x8057, "Vaio Ethernet",0,NF },
+#endif
+						{ 0x0000, (char *)NULL,0, NF } } },
 	{ PCI_VENDOR_DIAMOND, {
-                        { 0x8000, "C&T 69000",0, NF },
-                        { 0x1103, "Fire GL 1000",0, NF },
-                        { 0x0154, "Fire GL 1000 PRO",0, NF },
                         { 0x0003, "Monster Fusion",0, NF },
-                        { 0x8a10, "Stealth 3D 4000",0, NF },
+			{ 0x00b8, "Fire GL1",0, NF },
                         { 0x0100, "Stealth II G460",0, NF },
-                        { 0x2000, "Stealth II S220",0, NF },
-                        { 0x1092, "Viper 330",0, NF },
+                        { 0x0154, "Fire GL 1000 PRO",0, NF },
+			{ 0x0172, "Fire GL2",0, NF },
+			{ 0x0173, "Fire GL2",0, NF },
                         { 0x0550, "Viper 550",0, NF },
-			{ 0x8760, "Fireport 40 Dual",0, NF },
+                        { 0x1092, "Viper 330",0, NF },
+                        { 0x1103, "Fire GL 1000",0, NF },
+                        { 0x2000, "Stealth II S220",0, NF },
 			{ 0x2110, "Sonic Impact S70",0, NF },
+                        { 0x4803, "Monster Fusion",0, NF },
+                        { 0x6820, "Viper 770",0, NF },
+                        { 0x8000, "C&T 69000",0, NF },
+			{ 0x8760, "Fireport 40 Dual",0, NF },
+                        { 0x8a10, "Stealth 3D 4000",0, NF },
                         { 0x0000, (char *)NULL,0, NF } } },
 	{ PCI_VENDOR_ELSA, {
                         { 0x0914, "Winner 1000",0, NF },
@@ -1509,7 +1616,7 @@
 #endif
 	{ PCI_VENDOR_S3, {
                         { 0x8904, "Trio3D",0, NF },
-                        { 0x8a10, "ViRGE/GX2",0, NF },
+                        { 0x8a10, "Generic",0, NF },
                         { 0x0000, (char *)NULL,0, NF } } },
 	{ PCI_VENDOR_NUMNINE, {
                         { 0x8a10, "Reality 334",0, NF },
@@ -1518,8 +1625,14 @@
                         { 0x0001, "4010CDT CT65555",0, NF },
                         { 0x0000, (char *)NULL,0, NF } } },
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{ PCI_VENDOR_LITEON, {
+			{ 0xc001, "LNE100TX Version 2.0",0, NF },
+                        { 0x0000, (char *)NULL,0, NF } } },
 	{ PCI_VENDOR_BUSLOGIC, {
 	                { 0x1040,	"BT958",0, NF },
+                        { 0x0000, (char *)NULL,0, NF } } },
+	{ PCI_VENDOR_NETGEAR, {
+			{ 0xf004, "FA310-TX Rev. D2",0, NF },
                         { 0x0000, (char *)NULL,0, NF } } },
 #endif
 	{0x0000, {
Index: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Priv.h:3.65 xc/programs/Xserver/hw/xfree86/common/xf86Priv.h:3.67
--- xc/programs/Xserver/hw/xfree86/common/xf86Priv.h:3.65	Tue Mar  7 21:38:37 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Priv.h	Mon Jun 19 22:08:45 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.65 2000/03/08 05:38:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.67 2000/06/20 05:08:45 dawes Exp $ */
 
 /*
  * Copyright (c) 1997 by The XFree86 Project, Inc.
@@ -120,13 +120,10 @@
 
 void xf86FindPrimaryDevice(void);
 /* new RAC */
-resPtr xf86AddResToList(resPtr rlist, resRange *range, int entityIndex);
-resPtr xf86JoinResLists(resPtr rlist1, resPtr rlist2);
-resPtr xf86DupResList(const resPtr rlist);
-void xf86FreeResList(resPtr rlist);
 void xf86ResourceBrokerInit(void);
 void xf86PostProbe(void);
 void xf86ClearEntityListForScreen(int scrnIndex);
+void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
 extern void xf86PostPreInit(void);
 extern void xf86PostScreenInit(void);
 extern memType getValidBIOSBase(PCITAG tag, int num);
Index: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h:1.18 xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h:1.19
--- xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h:1.18	Tue Feb  8 05:13:06 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h	Wed May 31 00:15:00 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.18 2000/02/08 13:13:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.19 2000/05/31 07:15:00 eich Exp $ */
 
 /*
  * Copyright (c) 1997,1998 by The XFree86 Project, Inc.
@@ -23,7 +23,8 @@
     PCIProbe1		= 0,
     PCIProbe2,
     PCIForceConfig1,
-    PCIForceConfig2
+    PCIForceConfig2,
+    PCIOsConfig
 } PciProbeType;
 
 /*
Index: xc/programs/Xserver/hw/xfree86/common/xf86Resources.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Resources.h:1.8 xc/programs/Xserver/hw/xfree86/common/xf86Resources.h:1.9
--- xc/programs/Xserver/hw/xfree86/common/xf86Resources.h:1.8	Tue Feb  8 05:13:06 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86Resources.h	Sun Apr 23 12:26:57 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Resources.h,v 1.8 2000/02/08 13:13:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Resources.h,v 1.9 2000/04/23 19:26:57 tsi Exp $ */
 
 #ifndef _XF86_RESOURCES_H
 
@@ -23,9 +23,9 @@
 		{ResShrIoBlock  | ResBios | ResBus,     0x03C0,     0x03DF}
 
 #define _VGA_SHARED_MEM \
-                {ResShrMemBlock | ResBios | ResBus,     0xA0000,    0xAFFFF},\
-		{ResShrMemBlock | ResBios | ResBus,     0xB0000,    0xB7FFF},\
- 		{ResShrMemBlock | ResBios | ResBus,     0xB8000,    0xBFFFF}
+		{ResShrMemBlock | ResBios | ResBus, 0x000A0000, 0x000AFFFF},\
+		{ResShrMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
+ 		{ResShrMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF}
 
 #define _VGA_SHARED_IO \
 		{ResShrIoBlock  | ResBios | ResBus,     0x03B0,     0x03BB},\
@@ -40,7 +40,7 @@
 	{ResExcUusdMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
 	{ResExcUusdMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF},\
 	{ResExcUusdIoBlock  | ResBios | ResBus,     0x03B0,     0x03BB},\
-	{ResExcUusdIoBlock  | ResBios | ResBus,      0x3C0,      0x3DF}
+	{ResExcUusdIoBlock  | ResBios | ResBus,     0x03C0,     0x03DF}
 
 /*
  * Shared unused VGA:  resources unneeded but cannot be disabled
@@ -90,6 +90,10 @@
 extern resRange resVgaSparseShared[];
 extern resRange res8514Exclusive[];
 extern resRange res8514Shared[];
+
+/* Less misleading aliases for xf86SetOpratingState() */
+#define resVgaMem resVgaMemShared
+#define resVgaIo  resVgaIoShared
 
 /* old style names */
 #define RES_EXCLUSIVE_VGA   resVgaExclusive
Index: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86XKB.c:3.8 xc/programs/Xserver/hw/xfree86/common/xf86XKB.c:3.9
--- xc/programs/Xserver/hw/xfree86/common/xf86XKB.c:3.8	Sun Mar 28 07:32:29 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86XKB.c	Mon May 22 21:47:41 2000
@@ -24,7 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.8 1999/03/28 15:32:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.9 2000/05/23 04:47:41 dawes Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
@@ -70,7 +70,8 @@
     static int kbdSun = -1;
     
     if (kbdSun == -1) {
-	if (xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
+	if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
+	    || (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
 	    kbdSun = 1;
 	else
 	    kbdSun = 0;
Index: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c:3.54 xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c:3.60
--- xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c:3.54	Mon Dec 13 15:38:11 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c	Fri Jun 30 12:06:56 2000
@@ -22,7 +22,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 3.54 1999/12/13 23:38:11 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 3.60 2000/06/30 19:06:56 keithp Exp $ */
 
 #include "Xfuncproto.h"
 #include "Xmd.h"
@@ -164,6 +164,8 @@
     }
 }
 
+static int xf86CoreButtonState;
+
 /***********************************************************************
  *
  * xf86CheckButton --
@@ -177,13 +179,21 @@
 xf86CheckButton(int	button,
 		int	down)
 {
-    int	state = (inputInfo.pointer->button->state & 0x1f00) >> 8;
-    int	check = (state & (1 << (button - 1)));
+    int	check;
+    int bit = (1 << (button - 1));
+
+    check = xf86CoreButtonState & bit;
     
-    if ((check && down) && (!check && !down)) {
+    DBG(5, ErrorF("xf86CheckButton "
+		  "button=%d down=%d state=%d check=%d returns ",
+		   button, down, state, check));
+    if ((check && down) || (!check && !down)) {
+	DBG(5, ErrorF("FALSE\n"));
 	return FALSE;
     }
+    xf86CoreButtonState ^= bit;
 
+    DBG(5, ErrorF("TRUE\n"));
     return TRUE;
 }
 
@@ -898,7 +908,7 @@
     int				dx, dy;
     float			mult;
 #ifdef XFreeXDGA
-    int				xdelta = 0, ydelta = 0;
+    int				rawx = 0, rawy = 0;
 #endif
     
     DBG(5, ErrorF("xf86PostMotionEvent BEGIN 0x%x(%s) switch=0x%x is_core=%s is_shared=%s is_absolute=%s\n",
@@ -942,6 +952,18 @@
 
 	    DBG(5, ErrorF("xf86PostMotionEvent v0=%d v1=%d\n", xv->valuator0, xv->valuator1));
 	    
+#ifdef XFreeXDGA
+	    /*
+	     * DGA wants raw dx/dy (or at least, I think it does -keithp)
+	     */
+	    rawx = xv->valuator0;
+	    rawy = xv->valuator1;
+	    if (is_absolute)
+	    {
+		rawx -= local->old_x;
+		rawy -= local->old_y;
+	    }
+#endif
 	    if (loop == 1 && !is_absolute && device->ptrfeed && device->ptrfeed->ctrl.num) {
 		/* modeled from xf86Events.c */
 		if (device->ptrfeed->ctrl.threshold) {
@@ -996,15 +1018,6 @@
 		    DBG(5, ErrorF("xf86PostMotionEvent(mr) x1=%d y1=%d\n", x1,y1));
 		}
             }
-#ifdef XFreeXDGA
-            /* We need to save this for DGA so we can undo it 
-               to get relative motion again */
-            if(!is_absolute) {
-		xdelta = axisvals[loop+first_valuator-1];
-		ydelta = axisvals[loop+first_valuator];
-	    } else 
-		xdelta = ydelta = 0;
-#endif
 	    RELATIVE_CHECK(xv->valuator0, loop+first_valuator-1);
 	    RELATIVE_CHECK(xv->valuator1, loop+first_valuator);
 	    break;
@@ -1081,7 +1094,8 @@
 		 */
 
 #ifdef XFreeXDGA
-		if (!DGAStealMouseEvent(xf86EventQueue.pEnqueueScreen->myNum, xE, x - xdelta, y - ydelta )) {
+		xev->type = MotionNotify;
+		if (!DGAStealMouseEvent(xf86EventQueue.pEnqueueScreen->myNum, xE, rawx, rawy )) {
 #endif
 		    miPointerAbsoluteCursor(x, y, xf86Info.lastEventTime); 
 
@@ -1262,7 +1276,9 @@
     /* Check the core pointer button state not to send an inconsistent
      * event. This can happen with the AlwaysCore feature.
      */
-    if ((is_core || is_shared) && !xf86CheckButton(button, is_down)) {
+    if ((is_core || is_shared) && 
+	!xf86CheckButton(device->button->map[button], is_down)) 
+    {
 	return;
     }
     
Index: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86cmap.c:1.18 xc/programs/Xserver/hw/xfree86/common/xf86cmap.c:1.19
--- xc/programs/Xserver/hw/xfree86/common/xf86cmap.c:1.18	Thu Nov 11 18:11:13 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86cmap.c	Fri Mar 17 12:43:34 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.18 1999/11/12 02:11:13 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.19 2000/03/17 20:43:34 mvojkovi Exp $ */
 
 #ifdef _XOPEN_SOURCE
 #include <math.h>
@@ -172,7 +172,7 @@
 
     if (!(flags & CMAP_LOAD_EVEN_IF_OFFSCREEN)) {
 	pScrn->EnterVT = CMapEnterVT;
-	if (flags & CMAP_RELOAD_ON_MODE_SWITCH) 
+	if ((flags & CMAP_RELOAD_ON_MODE_SWITCH) && pScrn->SwitchMode) 
 	    pScrn->SwitchMode = CMapSwitchMode;
     }
 #ifdef XFreeXDGA
Index: xc/programs/Xserver/hw/xfree86/common/xf86cmap.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86cmap.h:1.5 xc/programs/Xserver/hw/xfree86/common/xf86cmap.h:1.6
--- xc/programs/Xserver/hw/xfree86/common/xf86cmap.h:1.5	Sat Jul 17 20:26:49 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86cmap.h	Thu May 11 11:14:28 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.h,v 1.5 1999/07/18 03:26:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.h,v 1.6 2000/05/11 18:14:28 tsi Exp $ */
 
 #ifndef _XF86CMAP_H
 #define _XF86CMAP_H
@@ -35,7 +35,7 @@
 int
 xf86ChangeGamma(
    ScreenPtr pScreen,
-   Gamma gamma
+   Gamma newGamma
 );
 
 #endif /* _XF86CMAP_H */
Index: xc/programs/Xserver/hw/xfree86/common/xf86fbman.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86fbman.c:1.13 xc/programs/Xserver/hw/xfree86/common/xf86fbman.c:1.15
--- xc/programs/Xserver/hw/xfree86/common/xf86fbman.c:1.13	Sun Nov 28 12:29:37 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86fbman.c	Sat Jun 10 11:10:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.c,v 1.13 1999/11/28 20:29:37 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.c,v 1.15 2000/06/10 18:10:59 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -8,106 +8,157 @@
 #include "regionstr.h"
 #include "xf86fbman.h"
 
+static int xf86FBMangerIndex = -1;
+static unsigned long xf86ManagerGeneration = 0;
 
-static Bool xf86FBCloseScreen(int, ScreenPtr);
-static unsigned long xf86FBGeneration = 0;
-static int xf86FBScreenIndex = -1;
-static void SendCallFreeBoxCallbacks(FBManagerPtr);
-static FBAreaPtr AllocateArea(
-   FBManagerPtr offman,
-   int w, int h,
-   int granularity,
-   MoveAreaCallbackProcPtr moveCB,
-   RemoveAreaCallbackProcPtr removeCB,
-   pointer privData
-);
+
+Bool xf86RegisterOffscreenManager(
+    ScreenPtr pScreen, 
+    FBManagerFuncsPtr funcs
+){
+
+   if(xf86ManagerGeneration != serverGeneration) {
+	if((xf86FBMangerIndex = AllocateScreenPrivateIndex()) < 0)
+		return FALSE;
+	xf86ManagerGeneration = serverGeneration;
+   }
+
+   pScreen->devPrivates[xf86FBMangerIndex].ptr = (pointer)funcs;
+
+   return TRUE;
+}
 
 
 Bool
 xf86FBManagerRunning(ScreenPtr pScreen)
 {
-    if(xf86FBScreenIndex < 0) 
+    if(xf86FBMangerIndex < 0) 
 	return FALSE;
-    if(!pScreen->devPrivates[xf86FBScreenIndex].ptr) 
+    if(!pScreen->devPrivates[xf86FBMangerIndex].ptr) 
 	return FALSE;
 
     return TRUE;
 }
 
 Bool
-xf86InitFBManager(
+xf86RegisterFreeBoxCallback(
     ScreenPtr pScreen,  
-    BoxPtr FullBox
+    FreeBoxCallbackProcPtr FreeBoxCallback,
+    pointer devPriv
 ){
-   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   RegionRec ScreenRegion;
-   RegionRec FullRegion;
-   BoxRec ScreenBox;
-   Bool ret;
+   FBManagerFuncsPtr funcs;
 
-   ScreenBox.x1 = 0;
-   ScreenBox.y1 = 0;
-   ScreenBox.x2 = pScrn->virtualX;
-   ScreenBox.y2 = pScrn->virtualY;
+   if(xf86FBMangerIndex < 0) 
+	return FALSE;
+   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+	return FALSE;
 
-   if((FullBox->x1 >  ScreenBox.x1) || (FullBox->y1 >  ScreenBox.y1) ||
-      (FullBox->x2 <  ScreenBox.x2) || (FullBox->y2 <  ScreenBox.y2)) {
-	return FALSE;   
-   }
+   return (*funcs->RegisterFreeBoxCallback)(pScreen, FreeBoxCallback, devPriv);
+}
 
-   REGION_INIT(pScreen, &ScreenRegion, &ScreenBox, 1); 
-   REGION_INIT(pScreen, &FullRegion, FullBox, 1); 
 
-   REGION_SUBTRACT(pScreen, &FullRegion, &FullRegion, &ScreenRegion);
+FBAreaPtr
+xf86AllocateOffscreenArea(
+   ScreenPtr pScreen, 
+   int w, int h,
+   int gran,
+   MoveAreaCallbackProcPtr moveCB,
+   RemoveAreaCallbackProcPtr removeCB,
+   pointer privData
+){
+   FBManagerFuncsPtr funcs;
 
-   ret = xf86InitFBManagerRegion(pScreen, &FullRegion);
+   if(xf86FBMangerIndex < 0) 
+	return NULL;
+   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+	return NULL;
 
-   REGION_UNINIT(pScreen, &ScreenRegion);
-   REGION_UNINIT(pScreen, &FullRegion);
-    
-   return ret;
+   return (*funcs->AllocateOffscreenArea)(
+		pScreen, w, h, gran, moveCB, removeCB, privData);
+}
+
+
+void
+xf86FreeOffscreenArea(FBAreaPtr area)
+{
+   FBManagerFuncsPtr funcs;
+
+   if(!area) return;
+
+   if(xf86FBMangerIndex < 0) 
+	return;
+   if(!(funcs = 
+	(FBManagerFuncsPtr)area->pScreen->devPrivates[xf86FBMangerIndex].ptr))
+	return;
+
+   (*funcs->FreeOffscreenArea)(area);
+
+   return;
 }
 
+
 Bool
-xf86InitFBManagerRegion(
-    ScreenPtr pScreen,  
-    RegionPtr FullRegion
+xf86ResizeOffscreenArea(
+   FBAreaPtr resize,
+   int w, int h
 ){
-   FBManagerPtr offman;
+   FBManagerFuncsPtr funcs;
 
-   if(REGION_NIL(FullRegion))
+   if(!resize) return FALSE;
+
+   if(xf86FBMangerIndex < 0) 
+	return FALSE;
+   if(!(funcs = 
+	(FBManagerFuncsPtr)resize->pScreen->devPrivates[xf86FBMangerIndex].ptr))
 	return FALSE;
 
-   if(xf86FBGeneration != serverGeneration) {
-	if((xf86FBScreenIndex = AllocateScreenPrivateIndex()) < 0)
-		return FALSE;
-	xf86FBGeneration = serverGeneration;
-   }
+   return (*funcs->ResizeOffscreenArea)(resize, w, h);
+}
 
-   offman = xalloc(sizeof(FBManager));
-   if(!offman) return FALSE;
 
-   pScreen->devPrivates[xf86FBScreenIndex].ptr = (pointer)offman;
+Bool
+xf86QueryLargestOffscreenArea(
+    ScreenPtr pScreen,
+    int *w, int *h,
+    int gran,
+    int preferences,
+    int severity
+){
+   FBManagerFuncsPtr funcs;
 
-   offman->CloseScreen = pScreen->CloseScreen;
-   pScreen->CloseScreen = xf86FBCloseScreen;
+   if(xf86FBMangerIndex < 0) 
+	return FALSE;
+   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+	return FALSE;
 
-   offman->InitialBoxes = REGION_CREATE(pScreen, NULL, 1);
-   offman->FreeBoxes = REGION_CREATE(pScreen, NULL, 1);
+   return (*funcs->QueryLargestOffscreenArea)(
+		pScreen, w, h, gran, preferences, severity);
+}
 
-   REGION_COPY(pScreen, offman->InitialBoxes, FullRegion);
-   REGION_COPY(pScreen, offman->FreeBoxes, FullRegion);
 
-   offman->pScreen = pScreen;
-   offman->UsedAreas = NULL;
-   offman->NumUsedAreas = 0;  
-   offman->NumCallbacks = 0;
-   offman->FreeBoxesUpdateCallback = NULL;
-   offman->devPrivates = NULL;
+Bool
+xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
+{
+   FBManagerFuncsPtr funcs;
 
-   return TRUE;
-} 
+   if(xf86FBMangerIndex < 0) 
+	return FALSE;
+   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+	return FALSE;
+
+   return (*funcs->PurgeOffscreenAreas)(pScreen);
+}
 
+/************************************************************\ 
+
+   Below is a specific implementation of an offscreen manager.
+
+\************************************************************/ 
+
+static unsigned long xf86FBGeneration = 0;
+static int xf86FBScreenIndex = -1;
+
+
 static void
 SendCallFreeBoxCallbacks(FBManagerPtr offman)
 {
@@ -119,8 +170,8 @@
    }
 }
 
-Bool
-xf86RegisterFreeBoxCallback(
+static Bool
+localRegisterFreeBoxCallback(
     ScreenPtr pScreen,  
     FreeBoxCallbackProcPtr FreeBoxCallback,
     pointer devPriv
@@ -129,9 +180,6 @@
    FreeBoxCallbackProcPtr *newCallbacks;
    DevUnion *newPrivates; 
 
-   if(!xf86FBManagerRunning(pScreen)) 
-	return FALSE;
-
    offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
 
    newCallbacks = xrealloc( offman->FreeBoxesUpdateCallback, 
@@ -253,8 +301,8 @@
    return area;
 }
 
-FBAreaPtr
-xf86AllocateOffscreenArea(
+static FBAreaPtr
+localAllocateOffscreenArea(
    ScreenPtr pScreen, 
    int w, int h,
    int gran,
@@ -265,8 +313,6 @@
    FBManagerPtr offman;
    FBAreaPtr area = NULL;
 
-   if(!xf86FBManagerRunning(pScreen)) return NULL;
-
    offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
 
    if((area = AllocateArea(offman, w, h, gran, moveCB, removeCB, privData)))
@@ -275,87 +321,15 @@
    return area;
 }
 
-FBAreaPtr
-xf86AllocateLinearOffscreenArea(
-    ScreenPtr pScreen, 
-    int length,
-    int gran,
-    MoveAreaCallbackProcPtr moveCB,
-    RemoveAreaCallbackProcPtr removeCB,
-    pointer privData
-){
-    FBManagerPtr offman;
-    FBLinkPtr link = NULL;
-    FBAreaPtr area = NULL;
-    RegionRec NewReg;
-    BoxPtr boxp, box1p = NULL;
-    int i, num, w, h;
-
-    if (!xf86FBManagerRunning(pScreen)) return NULL;
-
-    offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
-    if (offman->InitialBoxes->extents.x1 != 0 ||
-	length <= 0) return NULL;
-
-    w = offman->InitialBoxes->extents.x2 -
-	offman->InitialBoxes->extents.x1;
-    h = (length + w - 1) / w;
-
-    /* look through the free boxes,
-       bottom up to reduce fragmentation troubles */
-
-    boxp = REGION_RECTS(offman->FreeBoxes);
-    num = REGION_NUM_RECTS(offman->FreeBoxes);
-
-    for (i = 0; i < num; i++, boxp++) {
-	if (((boxp->y2 - boxp->y1) < h) ||
-	    ((boxp->x2 - boxp->x1) < w) ||
-	    (box1p && box1p->y1 > boxp->y1))
-	    continue;
-
-        box1p = boxp;
-    }
-
-    if (!box1p) return NULL;
-    link = xalloc(sizeof(FBLink));
-    if (!link) return NULL;
-    area = &(link->area);
-
-    area->pScreen = pScreen;
-    area->granularity = gran;
-    area->box.x1 = box1p->x1; /* Presumed zero */
-    area->box.x2 = box1p->x1 + w;
-    area->box.y1 = box1p->y2 - h;
-    area->box.y2 = box1p->y2;
-    area->MoveAreaCallback = moveCB;
-    area->RemoveAreaCallback = removeCB;
-    area->devPrivate.ptr = privData;
 
-    REGION_INIT(pScreen, &NewReg, &(area->box), 1);
-    REGION_SUBTRACT(pScreen, offman->FreeBoxes, offman->FreeBoxes, &NewReg);
-    REGION_UNINIT(pScreen, &NewReg);
-
-    link->next = offman->UsedAreas;
-    offman->UsedAreas = link;
-    offman->NumUsedAreas++;
-
-    SendCallFreeBoxCallbacks(offman);
-
-    return area;
-}
-
-void
-xf86FreeOffscreenArea(FBAreaPtr area)
+static void
+localFreeOffscreenArea(FBAreaPtr area)
 {
    FBManagerPtr offman;
    FBLinkPtr pLink, pLinkPrev = NULL;
    RegionRec FreedRegion;
    ScreenPtr pScreen;
 
-   if(!area || !xf86FBManagerRunning(area->pScreen)) 
-	return;
-
    pScreen = area->pScreen;
    offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
        
@@ -385,8 +359,8 @@
    
 
 
-Bool
-xf86ResizeOffscreenArea(
+static Bool
+localResizeOffscreenArea(
    FBAreaPtr resize,
    int w, int h
 ){
@@ -397,9 +371,6 @@
    FBAreaPtr area = NULL;
    FBLinkPtr pLink, newLink, pLinkPrev = NULL;
 
-   if(!resize || !xf86FBManagerRunning(resize->pScreen)) 
-	return FALSE;
-
    pScreen = resize->pScreen;
    offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
 
@@ -499,86 +470,9 @@
 
    return TRUE;
 }
-
-
-
-Bool
-xf86FBCloseScreen (int i, ScreenPtr pScreen)
-{
-   FBLinkPtr pLink, tmp;
-   FBManagerPtr offman = 
-	(FBManagerPtr) pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
-   
-   pScreen->CloseScreen = offman->CloseScreen;
-
-   pLink = offman->UsedAreas;
-
-   while(pLink) {
-	tmp = pLink;
-	pLink = pLink->next;
-	xfree(tmp);
-   }
-
-   REGION_DESTROY(pScreen, offman->InitialBoxes);
-   REGION_DESTROY(pScreen, offman->FreeBoxes);
-
-   xfree(offman);
-
-   return (*pScreen->CloseScreen) (i, pScreen);
-}
-
-
-Bool
-xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
-{
-   FBManagerPtr offman;
-   FBLinkPtr pLink, tmp, pPrev = NULL;
-   RegionRec FreedRegion;
-   Bool anyUsed = FALSE;
-
-   if(!xf86FBManagerRunning(pScreen)) 
-	return FALSE;
-
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-       
-   pLink = offman->UsedAreas;
-   if(!pLink) return TRUE;  
- 
-   while(pLink) {
-	if(pLink->area.RemoveAreaCallback) {
-	    (*pLink->area.RemoveAreaCallback)(&pLink->area);
-
-	    REGION_INIT(pScreen, &FreedRegion, &(pLink->area.box), 1); 
-	    REGION_APPEND(pScreen, offman->FreeBoxes, &FreedRegion);
-	    REGION_UNINIT(pScreen, &FreedRegion); 
-
-	    if(pPrev)
-	      pPrev->next = pLink->next;
-	    else offman->UsedAreas = pLink->next;
-
-	    tmp = pLink;
-	    pLink = pLink->next;
-  	    xfree(tmp); 
-	    offman->NumUsedAreas--;
-	    anyUsed = TRUE;
-	} else {
-	    pPrev = pLink;
-	    pLink = pLink->next;
-	}
-   }
-
-   if(anyUsed) {
-	REGION_VALIDATE(pScreen, offman->FreeBoxes, &anyUsed);
-	SendCallFreeBoxCallbacks(offman);
-   }
-
-   return TRUE;
-}
 
-
-Bool
-xf86QueryLargestOffscreenArea(
+static Bool
+localQueryLargestOffscreenArea(
     ScreenPtr pScreen,
     int *width, int *height,
     int granularity,
@@ -593,9 +487,6 @@
 
     *width = *height = oldArea = 0;
 
-    if(!xf86FBManagerRunning(pScreen)) 
-	return FALSE;
-
     if(granularity <= 1) granularity = 0;
 
     if((preferences < 0) || (preferences > 3))
@@ -700,3 +591,241 @@
 
     return TRUE;
 }
+
+static Bool
+localPurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
+{
+   FBManagerPtr offman;
+   FBLinkPtr pLink, tmp, pPrev = NULL;
+   RegionRec FreedRegion;
+   Bool anyUsed = FALSE;
+
+   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
+       
+   pLink = offman->UsedAreas;
+   if(!pLink) return TRUE;  
+ 
+   while(pLink) {
+	if(pLink->area.RemoveAreaCallback) {
+	    (*pLink->area.RemoveAreaCallback)(&pLink->area);
+
+	    REGION_INIT(pScreen, &FreedRegion, &(pLink->area.box), 1); 
+	    REGION_APPEND(pScreen, offman->FreeBoxes, &FreedRegion);
+	    REGION_UNINIT(pScreen, &FreedRegion); 
+
+	    if(pPrev)
+	      pPrev->next = pLink->next;
+	    else offman->UsedAreas = pLink->next;
+
+	    tmp = pLink;
+	    pLink = pLink->next;
+  	    xfree(tmp); 
+	    offman->NumUsedAreas--;
+	    anyUsed = TRUE;
+	} else {
+	    pPrev = pLink;
+	    pLink = pLink->next;
+	}
+   }
+
+   if(anyUsed) {
+	REGION_VALIDATE(pScreen, offman->FreeBoxes, &anyUsed);
+	SendCallFreeBoxCallbacks(offman);
+   }
+
+   return TRUE;
+}
+
+
+static FBManagerFuncs xf86FBManFuncs = {
+   localAllocateOffscreenArea,
+   localFreeOffscreenArea,
+   localResizeOffscreenArea,
+   localQueryLargestOffscreenArea,
+   localRegisterFreeBoxCallback,
+   localPurgeUnlockedOffscreenAreas
+ };
+
+
+static Bool
+xf86FBCloseScreen (int i, ScreenPtr pScreen)
+{
+   FBLinkPtr pLink, tmp;
+   FBManagerPtr offman = 
+	(FBManagerPtr) pScreen->devPrivates[xf86FBScreenIndex].ptr;
+
+   
+   pScreen->CloseScreen = offman->CloseScreen;
+
+   pLink = offman->UsedAreas;
+
+   while(pLink) {
+	tmp = pLink;
+	pLink = pLink->next;
+	xfree(tmp);
+   }
+
+   REGION_DESTROY(pScreen, offman->InitialBoxes);
+   REGION_DESTROY(pScreen, offman->FreeBoxes);
+
+   xfree(offman);
+
+   return (*pScreen->CloseScreen) (i, pScreen);
+}
+
+Bool
+xf86InitFBManager(
+    ScreenPtr pScreen,  
+    BoxPtr FullBox
+){
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   RegionRec ScreenRegion;
+   RegionRec FullRegion;
+   BoxRec ScreenBox;
+   Bool ret;
+
+   ScreenBox.x1 = 0;
+   ScreenBox.y1 = 0;
+   ScreenBox.x2 = pScrn->virtualX;
+   ScreenBox.y2 = pScrn->virtualY;
+
+   if((FullBox->x1 >  ScreenBox.x1) || (FullBox->y1 >  ScreenBox.y1) ||
+      (FullBox->x2 <  ScreenBox.x2) || (FullBox->y2 <  ScreenBox.y2)) {
+	return FALSE;   
+   }
+
+   REGION_INIT(pScreen, &ScreenRegion, &ScreenBox, 1); 
+   REGION_INIT(pScreen, &FullRegion, FullBox, 1); 
+
+   REGION_SUBTRACT(pScreen, &FullRegion, &FullRegion, &ScreenRegion);
+
+   ret = xf86InitFBManagerRegion(pScreen, &FullRegion);
+
+   REGION_UNINIT(pScreen, &ScreenRegion);
+   REGION_UNINIT(pScreen, &FullRegion);
+    
+   return ret;
+}
+
+Bool
+xf86InitFBManagerRegion(
+    ScreenPtr pScreen,  
+    RegionPtr FullRegion
+){
+   FBManagerPtr offman;
+
+   if(REGION_NIL(FullRegion))
+	return FALSE;
+
+   if(xf86FBGeneration != serverGeneration) {
+	if((xf86FBScreenIndex = AllocateScreenPrivateIndex()) < 0)
+		return FALSE;
+	xf86FBGeneration = serverGeneration;
+   }
+
+   if(!xf86RegisterOffscreenManager(pScreen, &xf86FBManFuncs))
+	return FALSE;
+
+   offman = xalloc(sizeof(FBManager));
+   if(!offman) return FALSE;
+
+   pScreen->devPrivates[xf86FBScreenIndex].ptr = (pointer)offman;
+
+   offman->CloseScreen = pScreen->CloseScreen;
+   pScreen->CloseScreen = xf86FBCloseScreen;
+
+   offman->InitialBoxes = REGION_CREATE(pScreen, NULL, 1);
+   offman->FreeBoxes = REGION_CREATE(pScreen, NULL, 1);
+
+   REGION_COPY(pScreen, offman->InitialBoxes, FullRegion);
+   REGION_COPY(pScreen, offman->FreeBoxes, FullRegion);
+
+   offman->pScreen = pScreen;
+   offman->UsedAreas = NULL;
+   offman->NumUsedAreas = 0;  
+   offman->NumCallbacks = 0;
+   offman->FreeBoxesUpdateCallback = NULL;
+   offman->devPrivates = NULL;
+
+   return TRUE;
+} 
+
+/*************************************************************\
+
+   These functions are specific to this implementation and
+   may only be called by the driver that initialized this 
+   implementation.
+
+\*************************************************************/
+
+FBAreaPtr
+xf86AllocateLinearOffscreenArea(
+    ScreenPtr pScreen, 
+    int length,
+    int gran,
+    MoveAreaCallbackProcPtr moveCB,
+    RemoveAreaCallbackProcPtr removeCB,
+    pointer privData
+){
+    FBManagerPtr offman;
+    FBLinkPtr link = NULL;
+    FBAreaPtr area = NULL;
+    RegionRec NewReg;
+    BoxPtr boxp, box1p = NULL;
+    int i, num, w, h;
+
+    if(xf86FBScreenIndex < 0) 
+	return NULL;
+    if(!(offman = pScreen->devPrivates[xf86FBScreenIndex].ptr)) 
+	return NULL;
+
+    if (offman->InitialBoxes->extents.x1 != 0 ||
+	length <= 0) return NULL;
+
+    w = offman->InitialBoxes->extents.x2 -
+	offman->InitialBoxes->extents.x1;
+    h = (length + w - 1) / w;
+
+    /* look through the free boxes,
+       bottom up to reduce fragmentation troubles */
+
+    boxp = REGION_RECTS(offman->FreeBoxes);
+    num = REGION_NUM_RECTS(offman->FreeBoxes);
+
+    for (i = 0; i < num; i++, boxp++) {
+	if (((boxp->y2 - boxp->y1) < h) ||
+	    ((boxp->x2 - boxp->x1) < w) ||
+	    (box1p && box1p->y1 > boxp->y1))
+	    continue;
+
+        box1p = boxp;
+    }
+
+    if (!box1p) return NULL;
+    link = xalloc(sizeof(FBLink));
+    if (!link) return NULL;
+    area = &(link->area);
+
+    area->pScreen = pScreen;
+    area->granularity = gran;
+    area->box.x1 = box1p->x1; /* Presumed zero */
+    area->box.x2 = box1p->x1 + w;
+    area->box.y1 = box1p->y2 - h;
+    area->box.y2 = box1p->y2;
+    area->MoveAreaCallback = moveCB;
+    area->RemoveAreaCallback = removeCB;
+    area->devPrivate.ptr = privData;
+
+    REGION_INIT(pScreen, &NewReg, &(area->box), 1);
+    REGION_SUBTRACT(pScreen, offman->FreeBoxes, offman->FreeBoxes, &NewReg);
+    REGION_UNINIT(pScreen, &NewReg);
+
+    link->next = offman->UsedAreas;
+    offman->UsedAreas = link;
+    offman->NumUsedAreas++;
+
+    SendCallFreeBoxCallbacks(offman);
+
+    return area;
+}
+
Index: xc/programs/Xserver/hw/xfree86/common/xf86fbman.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86fbman.h:1.8 xc/programs/Xserver/hw/xfree86/common/xf86fbman.h:1.10
--- xc/programs/Xserver/hw/xfree86/common/xf86fbman.h:1.8	Sun Jun 27 07:07:57 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86fbman.h	Sat Jun 10 11:10:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.h,v 1.8 1999/06/27 14:07:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.h,v 1.10 2000/06/10 18:10:59 mvojkovi Exp $ */
 
 #ifndef _XF86FBMAN_H
 #define _XF86FBMAN_H
@@ -48,7 +48,34 @@
    DevUnion			*devPrivates;
 } FBManager, *FBManagerPtr;
 
-
+typedef struct {
+    FBAreaPtr (*AllocateOffscreenArea)(
+		ScreenPtr pScreen, 
+		int w, int h,
+		int granularity,
+		MoveAreaCallbackProcPtr moveCB,
+		RemoveAreaCallbackProcPtr removeCB,
+		pointer privData);
+    void      (*FreeOffscreenArea)(FBAreaPtr area);
+    Bool      (*ResizeOffscreenArea)(FBAreaPtr area, int w, int h);
+    Bool      (*QueryLargestOffscreenArea)(
+		ScreenPtr pScreen,
+		int *width, int *height,
+		int granularity,
+		int preferences,
+		int priority);
+    Bool      (*RegisterFreeBoxCallback)( 
+		ScreenPtr pScreen,  
+		FreeBoxCallbackProcPtr FreeBoxCallback,
+		pointer devPriv);
+    Bool      (*PurgeOffscreenAreas) (ScreenPtr);
+} FBManagerFuncs, *FBManagerFuncsPtr;
+
+
+Bool xf86RegisterOffscreenManager(
+    ScreenPtr pScreen, 
+    FBManagerFuncsPtr funcs
+);
 
 Bool
 xf86InitFBManagerRegion(
Index: xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c:3.3 xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c:3.4
--- xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c:3.3	Tue Feb  8 05:13:06 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c	Mon Jun 19 22:08:45 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c,v 3.3 2000/02/08 13:13:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c,v 3.4 2000/06/20 05:08:45 dawes Exp $ */
 
 /*
  * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
@@ -43,9 +43,9 @@
     p->driver = drvp;
     p->chipset = chipset;
     p->busType = BUS_ISA;
-    p->device = dev;
     p->active = active;
     p->inUse = FALSE;
+    xf86AddDevToEntity(num, dev);
     p->access = xnfcalloc(1,sizeof(EntityAccessRec));
     p->access->fallback = &AccessNULL;
     p->access->pAccess = &AccessNULL;
Index: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c:3.13 xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c:3.18
--- xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c:3.13	Sun Mar  5 15:47:48 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c	Mon Jun 19 22:08:45 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.13 2000/03/05 23:47:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.18 2000/06/20 05:08:45 dawes Exp $ */
 
 /*
  * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
@@ -37,6 +37,8 @@
 pciVideoPtr *xf86PciVideoInfo = NULL;		/* PCI probe for video hw */
 pciAccPtr * xf86PciAccInfo = NULL;              /* PCI access related */
 
+static resPtr pciAvoidRes = NULL;
+
 /* PCI buses */
 static PciBusPtr xf86PciBus = NULL;
 /* Bus-specific probe/sorting functions */
@@ -470,10 +472,6 @@
     ErrorF("pciIoAccessEnable: 0x%05lx\n", *(PCITAG *)arg);
 #endif
     ((pciArg*)arg)->ctrl |= SETBITS;
-#ifdef notanymore
-    ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
-			 SETBITS, SETBITS);
-#endif
     ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
 			 ((pciArg*)arg)->ctrl);
 }
@@ -485,9 +483,6 @@
     ErrorF("pciIoAccessDisable: 0x%05lx\n", *(PCITAG *)arg);
 #endif
     ((pciArg*)arg)->ctrl &= ~SETBITS;
-#ifdef notanymore
-    ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG, SETBITS, 0);
-#endif
     ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
 			 ((pciArg*)arg)->ctrl);
 }
@@ -501,11 +496,7 @@
     ErrorF("pciIo_MemAccessEnable: 0x%05lx\n", *(PCITAG *)arg);
 #endif
     ((pciArg*)arg)->ctrl |= SETBITS;
-#ifdef notanymore
     ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
-			 SETBITS, SETBITS);
-#endif
-    ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
 			 ((pciArg*)arg)->ctrl);
 }
 
@@ -516,9 +507,6 @@
     ErrorF("pciIo_MemAccessDisable: 0x%05lx\n", *(PCITAG *)arg);
 #endif
     ((pciArg*)arg)->ctrl &= ~SETBITS;
-#ifdef notanymore
-    ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG, SETBITS, 0);
-#endif
     ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
 			 ((pciArg*)arg)->ctrl);
 }
@@ -532,10 +520,6 @@
     ErrorF("pciMemAccessEnable: 0x%05lx\n", *(PCITAG *)arg);
 #endif
     ((pciArg*)arg)->ctrl |= SETBITS;
-#ifdef notanymore
-    ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
-			 SETBITS, SETBITS);
-#endif
     ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
 			 ((pciArg*)arg)->ctrl);
 }
@@ -547,9 +531,6 @@
     ErrorF("pciMemAccessDisable: 0x%05lx\n", *(PCITAG *)arg);
 #endif
     ((pciArg*)arg)->ctrl &= ~SETBITS;
-#ifdef notanymore
-    ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,SETBITS, 0);
-#endif
     ((pciArg*)arg)->func(((pciArg*)arg)->tag, PCI_CMD_STAT_REG,
 			 ((pciArg*)arg)->ctrl);
 }
@@ -599,17 +580,19 @@
     }
 }
 
+/* move to OS layer */
 static void
 savePciState(PCITAG tag, pciSavePtr ptr)
 {
     int i;
-    
+     
     ptr->command = pciReadLong(tag,PCI_CMD_STAT_REG);
     for (i=0; i < 6; i++) 
         ptr->base[i] = pciReadLong(tag,PCI_CMD_BASE_REG + i*4 );
     ptr->biosBase = pciReadLong(tag,PCI_CMD_BIOS_REG);
 }
 
+/* move to OS layer */
 static void
 restorePciState(PCITAG tag, pciSavePtr ptr)
 {
@@ -624,6 +607,7 @@
     pciWriteLong(tag,PCI_CMD_STAT_REG,ptr->command);
 }
 
+/* move to OS layer */
 static void
 savePciBusState(BusAccPtr ptr)
 {
@@ -637,6 +621,7 @@
 		pciReadByte(ptr->busdep.pci.acc,PCI_PCI_BRIDGE_CONTROL_REG);
 }
 
+/* move to OS layer */
 static void
 restorePciBusState(BusAccPtr ptr)
 {
@@ -657,6 +642,7 @@
     pciSetBitsLong(tag, PCI_CMD_BIOS_REG, PCI_CMD_BIOS_ENABLE, 0);
 }
 
+/* ????? */
 static void
 correctPciSize(memType base, int oldsize, int newsize, long type)
 {
@@ -717,6 +703,7 @@
 	}
 }
 
+/* ????? */
 static void
 removeOverlapsWithBridges(int busIndex, resPtr target)
 {
@@ -747,6 +734,7 @@
     xf86FreeResList(bridgeRes);
 }
     
+/* ????? */
 static void
 xf86GetPciRes(resPtr *activeRes, resPtr *inactiveRes)
 {
@@ -949,7 +937,7 @@
      * Adjust OS-reported resource ranges based on the assumption that there
      * are no overlaps with the PCI base allocations.  This should be a good
      * assumption because writes to PCI address space won't be routed directly
-     * host memory.
+     * to host memory.
      */
 
     for (tmp = *osRes; tmp; tmp = tmp->next) 
@@ -959,6 +947,12 @@
 		" overlaps with PCI:\n");
     xf86PrintResList(3, *osRes);
 
+    pciAvoidRes = xf86AddRangesToList(pciAvoidRes,PciAvoid,-1);
+    for (tmp = pciAvoidRes; tmp; tmp = tmp->next) 
+	RemoveOverlaps(tmp, activeRes, FALSE);
+    tmp = xf86DupResList(*osRes);
+    pciAvoidRes = xf86JoinResLists(pciAvoidRes,tmp);
+    
     return (xf86JoinResLists(activeRes,inactiveRes));
 }
 
@@ -1022,7 +1016,7 @@
     type |= ResBlock;
     
     /* setup avoid: PciAvoid is bus range: convert later */
-    avoid = xf86AddRangesToList(avoid,PciAvoid,-1);
+    avoid = xf86DupResList(pciAvoidRes);
 
     while (pbp) {
 	if (pbp->secondary == pvp->bus) {
@@ -1064,7 +1058,8 @@
     }
     
     /* convert bus based entries in avoid list to host base */
-    xf86ConvertListToHost(xf86GetEntityForPciInfo(pvp),avoid);
+    xf86ConvertListToHost(
+	xf86GetPciEntity(pvp->bus,pvp->device,pvp->func), avoid);
     
     if (!w)
 	w = xf86DupResList(ResRange);
@@ -1323,7 +1318,7 @@
     alignment = (1 << biosSize) - 1;
     if (biosSize > 24)
 	biosSize = 24;
-    avoid = NULL;
+    avoid = xf86DupResList(pciAvoidRes);
 
     pbp = pbp1 = xf86PciBus;
     while (pbp) {
@@ -1349,6 +1344,8 @@
 	}	
 	pbp = pbp->next;
     }	
+    xf86ConvertListToHost(
+	xf86GetPciEntity(pvp->bus,pvp->device,pvp->func), avoid);
 
     if (pvp->biosBase) { /* try biosBase first */
 	P_M_RANGE(range, TAG(pvp),pvp->biosBase,biosSize,ResExcMemBlock);
@@ -1426,6 +1423,7 @@
     PciBusPtr *pnPciBus = &PciBusBase;
     int MaxBus = 0;
     int i;
+    memType base, limit;
     
     if (pciInfo == NULL) return NULL;
     
@@ -1457,38 +1455,50 @@
 		PciBus->brfunc = pcrp->funcnum;
 		PciBus->subclass = sub_class;
 		PciBus->brcontrol = pcrp->pci_bridge_control;
-		if (pcrp->pci_io_base <= pcrp->pci_io_limit
-		    && (pcrp->pci_command & PCI_CMD_IO_ENABLE)) {
-		    PCI_I_RANGE(range,pcrp->tag,pcrp->pci_io_base << 8 
-				| (pcrp->pci_upper_io_base << 16),
-				(pcrp->pci_io_limit << 8) 
-				| (pcrp->pci_upper_io_limit << 16) | 0xfff,
+		if (pcrp->pci_command & PCI_CMD_IO_ENABLE) {
+		    base = (pcrp->pci_upper_io_base << 16) |
+			((pcrp->pci_io_base & 0xf0u) << 8);
+		    limit = (pcrp->pci_upper_io_limit << 16) |
+			((pcrp->pci_io_limit & 0xf0u) << 8) | 0x0fff;
+		    /*
+		     * Deal with bridge ISA mode (256 wide ranges spaced 1K
+		     * apart, but only in the first 64K).
+		     */
+		    if (pcrp->pci_bridge_control & PCI_PCI_BRIDGE_ISA_EN) {
+			while ((base <= (CARD16)(-1)) && (base <= limit)) {
+			    PCI_I_RANGE(range, pcrp->tag,
+				base, base + (CARD8)(-1),
 				ResIo | ResBlock | ResExclusive);
-		    PciBus->io = xf86AddResToList(NULL, &range, -1);
+			    PciBus->io = xf86AddResToList(PciBus->io,
+				&range, -1);
+			    base += 0x0400;
+			}
+		    }
+		    if (base <= limit) {
+			PCI_I_RANGE(range, pcrp->tag, base, limit,
+			    ResIo | ResBlock | ResExclusive);
+			PciBus->io = xf86AddResToList(PciBus->io, &range, -1);
+		    }
 		}
 		if  (pcrp->pci_command & PCI_CMD_MEM_ENABLE) {
-		    if (pcrp->pci_mem_base <= pcrp->pci_mem_limit) {
-			PCI_M_RANGE(range,pcrp->tag,pcrp->pci_mem_base << 16,
-				    (pcrp->pci_mem_limit << 16) | 0xfffff,
+                    base = pcrp->pci_mem_base & 0xfff0u;
+                    limit = pcrp->pci_mem_limit & 0xfff0u;
+		    if (base <= limit) {
+			PCI_M_RANGE(range, pcrp->tag,
+				    base << 16, (limit << 16) | 0x0fffff,
 				    ResMem | ResBlock | ResExclusive);
 			PciBus->mem = xf86AddResToList(NULL, &range, -1);
 		    }
-		    if (pcrp->pci_prefetch_mem_base
-			<= pcrp->pci_prefetch_mem_limit) {
-#if !defined(LONG64) && !defined(WORD64)		    
-			PCI_M_RANGE(range,pcrp->tag,
-				    pcrp->pci_prefetch_mem_base << 16, 
-				    (pcrp->pci_prefetch_mem_limit << 16)
-				    | 0xfffff,
-				    ResMem | ResBlock | ResExclusive);
-#else
+                    base = pcrp->pci_prefetch_mem_base & 0xfff0u;
+                    limit = pcrp->pci_prefetch_mem_limit & 0xfff0u;
+#if defined(LONG64) || defined(WORD64)
+		    base |= (memType)pcrp->pci_prefetch_upper_mem_base << 16;
+		    limit |= (memType)pcrp->pci_prefetch_upper_mem_limit << 16;
+#endif
+		    if (base <= limit) {
 			PCI_M_RANGE(range, pcrp->tag,
-				    pcrp->pci_prefetch_mem_base << 16 
-				    | ((memType)pcrp->pci_prefetch_upper_mem_base << 32),
-				    (pcrp->pci_prefetch_mem_limit << 16) | 0xfffff 
-				    | ((memType)pcrp->pci_prefetch_upper_mem_limit << 32),
+				    base << 16, (limit << 16) | 0xfffff,
 				    ResMem | ResBlock | ResExclusive);
-#endif
 			PciBus->pmem = xf86AddResToList(NULL, &range, -1);
 		    }
 		}
@@ -1712,8 +1722,9 @@
 	resPtr res_mp = NULL, res_m_io = NULL;
 	resPtr NonSys = NULL;
 	resPtr tmp, avoid = NULL;
-    
+
 	if (!pvp->validate) continue;
+	avoid = xf86DupResList(pciAvoidRes);    
 	NonSys = xf86DupResList(Sys);
 	m = n;
 	while ((pvp1 = xf86PciVideoInfo[m++])) {
@@ -1762,6 +1773,10 @@
 	}
 	if (res_m_io == NULL)
 	   res_m_io = xf86DupResList(ResRange);
+
+	xf86ConvertListToHost(
+	    xf86GetPciEntity(pvp->bus,pvp->device,pvp->func), avoid);
+
 #ifdef DEBUG
 	xf86MsgVerb(X_INFO, 3,"avoid:\n");
 	xf86PrintResList(3,avoid);
@@ -1904,9 +1919,6 @@
  	    pcaccp->funcnum = pvp->func;
  	    pcaccp->arg.tag = pciTag(pvp->bus, pvp->device, pvp->func);
  	    pcaccp->arg.func =
-#ifdef notanymore
-		(SetBitsProcPtr)pciLongFunc(pcaccp->arg.tag,SET_BITS);
-#endif
 	        (WriteProcPtr)pciLongFunc(pcaccp->arg.tag,WRITE);
   	    pcaccp->ioAccess.AccessDisable = pciIoAccessDisable;
   	    pcaccp->ioAccess.AccessEnable = pciIoAccessEnable;
@@ -2146,12 +2158,12 @@
 	p->driver = drvp;
 	p->chipset = chipset;
 	p->busType = BUS_PCI;
- 	p->device = dev;
 	p->pciBusId.bus = bus;
 	p->pciBusId.device = device;
 	p->pciBusId.func = func;
 	p->active = active;
 	p->inUse = FALSE;
+        xf86AddDevToEntity(num, dev);
 	/* Here we initialize the access structure */
 	p->access = xnfcalloc(1,sizeof(EntityAccessRec));
 	while (ppaccp && *ppaccp) {
@@ -2462,7 +2474,7 @@
 }
 
 int
-xf86GetEntityForPciInfo(pciVideoPtr pvp)
+xf86GetPciEntity(int bus, int dev, int func)
 {
     int i;
     
@@ -2470,9 +2482,9 @@
 	EntityPtr p = xf86Entities[i];
 	if (p->busType != BUS_PCI) continue;
 	
-	if (p->pciBusId.bus == pvp->bus &&
-	    p->pciBusId.device == pvp->device &&
-	    p->pciBusId.func == pvp->func) 
+	if (p->pciBusId.bus == bus &&
+	    p->pciBusId.device == dev &&
+	    p->pciBusId.func == func) 
 	    return i;
     }
     return -1;
@@ -2601,13 +2613,13 @@
 }
 
 /*
- * This attempts to detect a multi-device card and set up a list
+ * This attempts to detect a multi-device card and sets up a list
  * of pci tags of the devices of this card. On some of these
  * cards the BIOS is not visible from all chipsets. We therefore
- * need to us the bios from a chipset where it is visible.
+ * need to use the BIOS from a chipset where it is visible.
  * We do the following heuristics:
  * If we detect only identical pci devices on a bus we assume it's
- * a multi-device card. This assumption isn't true alwaus, however.
+ * a multi-device card. This assumption isn't true always, however.
  * One might just use identical cards on a bus. We therefore don't
  * detect this situation when we set up the PCI video info. Instead
  * we wait until an attempt to read the BIOS fails.
@@ -2641,23 +2653,23 @@
     }
 
     if (!pcrp) return 0;
+
     /* 
      * we check all functions here: since multifunc devices need
      * to implement func 0 we catch all devices on the bus when
      * i = 0
      */
-    if (pcrp->pci_header_type &0x80)
-      multifunc = TRUE;
-
-    ppcrp = xf86PciInfo;    
-
+    if (pcrp->pci_header_type &0x80) 
+	multifunc = TRUE;
+    
+    j = 0;
+    
     while (ppcrp[j]) {
       if (ppcrp[j]->busnum == bus && ppcrp[j]->funcnum == i
 	  && ppcrp[j]->devnum != pcrp->devnum) {
 	/* don't test subsys ID here. It might be set by POST 
-	   - however some cars might not have been POSTed */
+	   - however some cards might not have been POSTed */
 	if (ppcrp[j]->pci_device_vendor != pcrp->pci_device_vendor 
-	    || ppcrp[j]->pci_class_revision != pcrp->pci_class_revision 
 	    || ppcrp[j]->pci_header_type != pcrp->pci_header_type ) 
 	  return 0;
 	else
Index: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c:3.3
--- /dev/null	Sat Jul  1 20:42:39 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c	Tue Jun 20 09:01:20 2000
@@ -0,0 +1,725 @@
+/*
+ * SBUS bus-specific code.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.3 2000/06/20 16:01:20 dawes Exp $ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <unistd.h>
+#include "X.h"
+#include "os.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "xf86Resources.h"
+#include "xf86cmap.h"
+
+#include "xf86Bus.h"
+
+#include "xf86sbusBus.h"
+#include "xf86Sbus.h"
+
+#define FB_DEV_PATH "/dev/fb%d"
+
+sbusDevicePtr *xf86SbusInfo = NULL;
+static int xf86nSbusInfo;
+
+#ifndef FBTYPE_SUNGP3
+#define FBTYPE_SUNGP3 -1
+#endif
+#ifndef FBTYPE_MDICOLOR
+#define FBTYPE_MDICOLOR -1
+#endif
+#ifndef FBTYPE_SUNLEO
+#define FBTYPE_SUNLEO -1
+#endif
+#ifndef FBTYPE_TCXCOLOR
+#define FBTYPE_TCXCOLOR -1
+#endif
+#ifndef FBTYPE_CREATOR
+#define FBTYPE_CREATOR -1
+#endif
+
+struct sbus_devtable sbusDeviceTable[] = {
+    { SBUS_DEVICE_BW2, FBTYPE_SUN2BW, "bwtwo", "Sun Monochrome (bwtwo)" },
+    { SBUS_DEVICE_CG2, FBTYPE_SUN2COLOR, "cgtwo", "Sun Color2 (cgtwo)" },
+    { SBUS_DEVICE_CG3, FBTYPE_SUN3COLOR, "cgthree", "Sun Color3 (cgthree)" },
+    { SBUS_DEVICE_CG4, FBTYPE_SUN4COLOR, "cgfour", "Sun Color4 (cgfour)" },
+    { SBUS_DEVICE_CG6, FBTYPE_SUNFAST_COLOR, "cgsix", "Sun GX" },
+    { SBUS_DEVICE_CG8, FBTYPE_MEMCOLOR, "cgeight", "Sun CG8/RasterOps" },
+    { SBUS_DEVICE_CG12, FBTYPE_SUNGP3, "cgtwelve", "Sun GS (cgtwelve)" },
+    { SBUS_DEVICE_CG14, FBTYPE_MDICOLOR, "cgfourteen", "Sun SX" },
+    { SBUS_DEVICE_GT, FBTYPE_SUNGT, "gt", "Sun Graphics Tower" },
+    { SBUS_DEVICE_MGX, -1, "mgx", "Quantum 3D MGXplus" },
+    { SBUS_DEVICE_LEO, FBTYPE_SUNLEO, "leo", "Sun ZX or Turbo ZX" },
+    { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "Sun TCX" },
+    { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "Sun FFB" },
+    { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "Sun Elite3D" },
+    { 0, 0, NULL }
+};
+
+static void
+CheckSbusDevice(const char *device, int fbNum)
+{
+    int fd, i;
+    struct fbgattr fbattr;
+    sbusDevicePtr psdp;
+
+    fd = open(device, O_RDONLY, 0);
+    if (fd < 0)
+	return;
+    memset(&fbattr, 0, sizeof(fbattr));
+    if (ioctl(fd, FBIOGATTR, &fbattr) < 0) {
+	if (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0) {
+	    close(fd);
+	    return;
+	}
+    }
+    close(fd);
+    for (i = 0; sbusDeviceTable[i].devId; i++)
+	if (sbusDeviceTable[i].fbType == fbattr.fbtype.fb_type)
+	    break;
+    if (! sbusDeviceTable[i].devId)
+	return;
+    xf86SbusInfo = xnfrealloc(xf86SbusInfo, sizeof(psdp) * (++xf86nSbusInfo + 1));
+    xf86SbusInfo[xf86nSbusInfo] = NULL;
+    xf86SbusInfo[xf86nSbusInfo - 1] = psdp = xnfcalloc(sizeof (sbusDevice), 1);
+    psdp->devId = sbusDeviceTable[i].devId;
+    psdp->fbNum = fbNum;
+    psdp->device = xnfstrdup(device);
+    psdp->width = fbattr.fbtype.fb_width;
+    psdp->height = fbattr.fbtype.fb_height;
+    psdp->fd = -1;
+}
+
+void
+xf86SbusProbe(void)
+{
+    int i, useProm = 0;
+    char fbDevName[32];
+    sbusDevicePtr psdp, *psdpp;
+
+    xf86SbusInfo = xalloc(sizeof(psdp));
+    *xf86SbusInfo = NULL;
+    for (i = 0; i < 32; i++) {
+	sprintf(fbDevName, FB_DEV_PATH, i);
+	CheckSbusDevice(fbDevName, i);
+    }
+    if (sparcPromInit() >= 0) {
+	useProm = 1;
+	sparcPromAssignNodes();
+    }
+    for (psdpp = xf86SbusInfo, psdp = *psdpp; psdp; psdp = *++psdpp) {
+	for (i = 0; sbusDeviceTable[i].devId; i++)
+	    if (sbusDeviceTable[i].devId == psdp->devId)
+		psdp->descr = sbusDeviceTable[i].descr;
+	/* If we can use PROM information and found the PROM node for this device,
+	 * we can tell more about the card.  */
+	if (useProm && psdp->node.node) {
+	    char *prop;
+	    int len, chiprev, vmsize;
+
+	    switch (psdp->devId) {
+	    case SBUS_DEVICE_MGX:
+		prop = sparcPromGetProperty(&psdp->node, "fb_size", &len);
+		if (prop && len == 4 && *(int *)prop == 0x400000)
+		    psdp->descr = "Quantum 3D MGXplus with 4M VRAM";
+		break;
+	    case SBUS_DEVICE_CG6:
+		chiprev = 0;
+		vmsize = 0;
+		prop = sparcPromGetProperty(&psdp->node, "chiprev", &len);
+		if (prop && len == 4)
+		    chiprev = *(int *)prop;
+		prop = sparcPromGetProperty(&psdp->node, "vmsize", &len);
+		if (prop && len == 4)
+		    vmsize = *(int *)prop;
+		switch (chiprev) {
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		    psdp->descr = "Sun Double width GX"; break;
+		case 5:
+		case 6:
+		case 7:
+		case 8:
+		case 9:
+		    psdp->descr = "Sun Single width GX"; break;
+		case 11:
+		    switch (vmsize) {
+		    case 2: psdp->descr = "Sun Turbo GX with 1M VSIMM"; break;
+		    case 4: psdp->descr = "Sun Turbo GX Plus"; break;
+		    default: psdp->descr = "Sun Turbo GX"; break;
+		    }
+		}
+		break;
+	    case SBUS_DEVICE_CG14:
+		prop = sparcPromGetProperty(&psdp->node, "reg", &len);
+		vmsize = 0;
+		if (prop && !(len % 12) && len > 0)
+		    vmsize = *(int *)(prop + len - 4);
+		switch (vmsize) {
+		case 0x400000: psdp->descr = "Sun SX with 4M VSIMM"; break;
+		case 0x800000: psdp->descr = "Sun SX with 8M VSIMM"; break;
+		}
+		break;
+	    case SBUS_DEVICE_LEO:
+		prop = sparcPromGetProperty(&psdp->node, "model", &len);
+		if (prop && len > 0 && !strstr(prop, "501-2503"))
+		    psdp->descr = "Sun Turbo ZX";
+		break;
+	    case SBUS_DEVICE_TCX:
+		if (sparcPromGetBool(&psdp->node, "tcx-8-bit"))
+		    psdp->descr = "Sun TCX (8bit)";
+		else
+		    psdp->descr = "Sun TCX (S24)";
+		break;
+	    case SBUS_DEVICE_FFB:
+		prop = sparcPromGetProperty(&psdp->node, "name", &len);
+		chiprev = 0;
+		prop = sparcPromGetProperty(&psdp->node, "board_type", &len);
+		if (prop && len == 4)
+		    chiprev = *(int *)prop;
+		if (strstr (prop, "afb")) {
+		    if (chiprev == 3)
+			psdp->descr = "Sun|Elite3D-M6 Horizontal";
+		} else {
+		    switch (chiprev) {
+		    case 0x08: psdp->descr = "Sun FFB 67MHz Creator"; break;
+		    case 0x0b: psdp->descr = "Sun FFB 67MHz Creator 3D"; break;
+		    case 0x1b: psdp->descr = "Sun FFB 75MHz Creator 3D"; break;
+		    case 0x20:
+		    case 0x28: psdp->descr = "Sun FFB2 Vertical Creator"; break;
+		    case 0x23:
+		    case 0x2b: psdp->descr = "Sun FFB2 Vertical Creator 3D"; break;
+		    case 0x30: psdp->descr = "Sun FFB2+ Vertical Creator"; break;
+		    case 0x33: psdp->descr = "Sun FFB2+ Vertical Creator 3D"; break;
+		    case 0x40:
+		    case 0x48: psdp->descr = "Sun FFB2 Horizontal Creator"; break;
+		    case 0x43:
+		    case 0x4b: psdp->descr = "Sun FFB2 Horizontal Creator 3D"; break;
+		    }
+		}
+		break;
+	    }
+	}
+	if (useProm && psdp->node.node) {
+	    char *promPath;
+	    xf86Msg(X_PROBED, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr);
+	    promPath = sparcPromNode2Pathname (&psdp->node);
+	    if (promPath) {
+		xf86ErrorF(" at %s", promPath);
+		xfree(promPath);
+	    }
+	} else
+	    xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
+	xf86ErrorF("\n");
+    }
+    if (useProm)
+	sparcPromClose();
+}
+
+/*
+ * Parse a BUS ID string, and return the SBUS bus parameters if it was
+ * in the correct format for a SBUS bus id.
+ */
+
+Bool
+xf86ParseSbusBusString(const char *busID, int *fbNum)
+{
+    /*
+     * The format is assumed to be one of:
+     * "fbN", e.g. "fb1", which means the device corresponding to /dev/fbN
+     * "nameN", e.g. "cgsix0", which means Nth instance of card NAME
+     * "/prompath", e.g. "/sbus@0,10001000/cgsix@3,0" which is PROM pathname
+     * to the device.
+     */
+
+    const char *id;
+    int i, len;
+
+    if (StringToBusType(busID, &id) != BUS_SBUS)
+	return FALSE;
+
+    if (*id != '/') {
+	if (!strncmp (id, "fb", 2)) {
+	    if (!isdigit(id[2]))
+		return FALSE;
+	    *fbNum = atoi(id + 2);
+	    return TRUE;
+	} else {
+	    sbusDevicePtr *psdpp;
+	    int devId;
+
+	    for (i = 0, len = 0; sbusDeviceTable[i].devId; i++) {
+		len = strlen(sbusDeviceTable[i].promName);
+		if (!strncmp (sbusDeviceTable[i].promName, id, len)
+		    && isdigit(id + len))
+		    break;
+	    }
+	    devId = sbusDeviceTable[i].devId;
+	    if (!devId) return FALSE;
+	    i = atoi(id + len);
+	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
+		if ((*psdpp)->devId != devId)
+		    continue;
+		if (!i) {
+		    *fbNum = (*psdpp)->fbNum;
+		    return TRUE;
+		}
+		i--;
+	    }
+	}
+	return FALSE;
+    }
+
+    if (sparcPromInit() >= 0) {
+	i = sparcPromPathname2Node(id);
+	sparcPromClose();
+	if (i) {
+	    sbusDevicePtr *psdpp;
+	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
+		if ((*psdpp)->node.node == i) {
+		    *fbNum = (*psdpp)->fbNum;
+		    return TRUE;
+		}
+	    }
+	}
+    }
+    return FALSE;
+}
+
+/*
+ * Compare a BUS ID string with a SBUS bus id.  Return TRUE if they match.
+ */
+
+Bool
+xf86CompareSbusBusString(const char *busID, int fbNum)
+{
+    int iFbNum;
+
+    if (xf86ParseSbusBusString(busID, &iFbNum)) {
+	return fbNum == iFbNum;
+    } else {
+	return FALSE;
+    }
+}
+
+/*
+ * Check if the slot requested is free.  If it is already in use, return FALSE.
+ */
+
+Bool
+xf86CheckSbusSlot(int fbNum)
+{
+    int i;
+    EntityPtr p;
+
+    for (i = 0; i < xf86NumEntities; i++) {
+	p = xf86Entities[i];
+	/* Check if this SBUS slot is taken */
+	if (p->busType == BUS_SBUS && p->sbusBusId.fbNum == fbNum)
+	    return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * If the slot requested is already in use, return -1.
+ * Otherwise, claim the slot for the screen requesting it.
+ */
+
+int
+xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp,
+		  GDevPtr dev, Bool active)
+{
+    EntityPtr p = NULL;
+
+    int num;
+
+    if (xf86CheckSbusSlot(psdp->fbNum)) {
+        num = xf86AllocateEntity();
+        p = xf86Entities[num];
+        p->driver = drvp;
+        p->chipset = -1;
+        p->busType = BUS_SBUS;
+        xf86AddDevToEntity(num, dev);
+        p->sbusBusId.fbNum = psdp->fbNum;
+        p->active = active;
+        p->inUse = FALSE;
+        /* Here we initialize the access structure */
+        p->access = xnfcalloc(1,sizeof(EntityAccessRec));
+	p->access->fallback = &AccessNULL;
+        p->access->pAccess = &AccessNULL;
+	return num;
+    } else
+	return -1;
+}
+
+int
+xf86MatchSbusInstances(const char *driverName, int sbusDevId, 
+		       GDevPtr *devList, int numDevs, DriverPtr drvp,
+		       int **foundEntities)
+{
+    int i,j;
+    sbusDevicePtr psdp, *psdpp;
+    int numClaimedInstances = 0;
+    int allocatedInstances = 0;
+    int numFound = 0;
+    GDevPtr devBus = NULL;
+    GDevPtr dev = NULL;
+    int *retEntities = NULL;
+    int useProm = 0;
+
+    struct Inst {
+	sbusDevicePtr	sbus;
+	GDevPtr		dev;
+	Bool		claimed;  /* BusID matches with a device section */
+    } *instances = NULL;
+
+    *foundEntities = NULL;
+    for (psdpp = xf86SbusInfo, psdp = *psdpp; psdp; psdp = *++psdpp) {
+	if (psdp->devId != sbusDevId)
+	    continue;
+	if (psdp->fd == -2)
+	    continue;
+	++allocatedInstances;
+	instances = xnfrealloc(instances,
+			       allocatedInstances * sizeof(struct Inst));
+	instances[allocatedInstances - 1].sbus = psdp;
+	instances[allocatedInstances - 1].dev = NULL;
+	instances[allocatedInstances - 1].claimed = FALSE;
+	numFound++;
+    }
+
+    /*
+     * This may be debatable, but if no SBUS devices with a matching vendor
+     * type is found, return zero now.  It is probably not desirable to
+     * allow the config file to override this.
+     */
+    if (allocatedInstances <= 0) {
+	xfree(instances);
+	return 0;
+    }
+
+    if (xf86DoProbe) {
+	xfree(instances);
+	return numFound;
+    }
+
+    if (sparcPromInit() >= 0)
+	useProm = 1;
+
+    if (xf86DoConfigure && xf86DoConfigurePass1) {
+	GDevPtr pGDev;
+	int actualcards = 0;
+	for (i = 0; i < allocatedInstances; i++) {
+	    actualcards++;
+	    pGDev = xf86AddBusDeviceToConfigure(driverName, BUS_SBUS,
+						instances[i].sbus, -1);
+	    if (pGDev) {
+		/*
+		 * XF86Match???Instances() treat chipID and chipRev as
+		 * overrides, so clobber them here.
+		 */
+		pGDev->chipID = pGDev->chipRev = -1;
+	    }
+	}
+	xfree(instances);
+	if (useProm)
+	    sparcPromClose();
+	return actualcards;
+    }
+
+#ifdef DEBUG
+    ErrorF("%s instances found: %d\n", driverName, allocatedInstances);
+#endif
+
+    for (i = 0; i < allocatedInstances; i++) {
+	char *promPath = NULL;
+
+	psdp = instances[i].sbus;
+	devBus = NULL;
+	dev = NULL;
+	if (useProm && psdp->node.node)
+	    promPath = sparcPromNode2Pathname(&psdp->node);
+
+	for (j = 0; j < numDevs; j++) {
+	    if (devList[j]->busID && *devList[j]->busID) {
+		if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
+		    if (devBus)
+			xf86MsgVerb(X_WARNING,0,
+			    "%s: More than one matching Device section for "
+			    "instance (BusID: %s) found: %s\n",
+			    driverName,devList[j]->identifier,
+			    devList[j]->busID);
+		    else
+			devBus = devList[j];
+		} 
+	    } else {
+		if (!dev && !devBus) {
+		    if (promPath)
+			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:%s\n",
+				promPath);
+		    else
+			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:fb%d\n",
+				psdp->fbNum);
+		    dev = devList[j];
+		} else
+		    xf86MsgVerb(X_WARNING, 0,
+			    "%s: More than one matching Device section "
+			    "found: %s\n", driverName, devList[j]->identifier);
+	    }
+	}
+	if (devBus) dev = devBus;  /* busID preferred */ 
+	if (!dev && psdp->fd != -2) {
+	    if (promPath) {
+		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+			    "for instance (BusID SBUS:%s) found\n",
+			    driverName, promPath);
+	    } else
+		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+			    "for instance (BusID SBUS:fb%d) found\n",
+			    driverName, psdp->fbNum);
+	} else if (dev) {
+	    numClaimedInstances++;
+	    instances[i].claimed = TRUE;
+	    instances[i].dev = dev;
+	}
+	if (promPath)
+	    xfree(promPath);
+    }
+
+#ifdef DEBUG
+    ErrorF("%s instances found: %d\n", driverName, numClaimedInstances);
+#endif
+
+    /*
+     * Of the claimed instances, check that another driver hasn't already
+     * claimed its slot.
+     */
+    numFound = 0;
+    for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {
+	if (!instances[i].claimed)
+	    continue;
+	psdp = instances[i].sbus;
+	if (!xf86CheckSbusSlot(psdp->fbNum))
+	    continue;
+
+#ifdef DEBUG
+	ErrorF("%s: card at fb%d %08x is claimed by a Device section\n",
+	       driverName, psdp->fbNum, psdp->node.node);
+#endif
+	
+	/* Allocate an entry in the lists to be returned */
+	numFound++;
+	retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
+	retEntities[numFound - 1]
+	    = xf86ClaimSbusSlot(psdp, drvp, instances[i].dev,instances[i].dev->active ?
+				TRUE : FALSE);
+    }
+    xfree(instances);
+    if (numFound > 0) {
+	*foundEntities = retEntities;
+    }
+
+    if (useProm)
+	sparcPromClose();
+
+    return numFound;
+}
+
+/*
+ * xf86GetSbusInfoForEntity() -- Get the sbusDevicePtr of entity.
+ */
+sbusDevicePtr
+xf86GetSbusInfoForEntity(int entityIndex)
+{
+    sbusDevicePtr *psdpp;
+    EntityPtr p = xf86Entities[entityIndex];
+
+    if (entityIndex >= xf86NumEntities
+	|| p->busType != BUS_SBUS) return NULL;
+
+    for (psdpp = xf86SbusInfo; *psdpp != NULL; psdpp++) {
+	if (p->sbusBusId.fbNum == (*psdpp)->fbNum)
+	    return (*psdpp);
+    }
+    return NULL;
+}
+
+int
+xf86GetEntityForSbusInfo(sbusDevicePtr psdp)
+{
+    int i;
+
+    for (i = 0; i < xf86NumEntities; i++) {
+	EntityPtr p = xf86Entities[i];
+	if (p->busType != BUS_SBUS) continue;
+
+	if (p->sbusBusId.fbNum == psdp->fbNum)
+	    return i;
+    }
+    return -1;
+}
+
+void
+xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp)
+{
+    DisplayModePtr mode;
+
+    mode = xnfcalloc(sizeof(DisplayModeRec), 1);
+    mode->name = "current";
+    mode->next = mode;
+    mode->prev = mode;
+    mode->type = M_T_BUILTIN;
+    mode->Clock = 100000000;
+    mode->HDisplay = psdp->width;
+    mode->HSyncStart = psdp->width;
+    mode->HSyncEnd = psdp->width;
+    mode->HTotal = psdp->width;
+    mode->VDisplay = psdp->height;
+    mode->VSyncStart = psdp->height;
+    mode->VSyncEnd = psdp->height;
+    mode->VTotal = psdp->height;
+    mode->SynthClock = mode->Clock;
+    mode->CrtcHDisplay = mode->HDisplay;
+    mode->CrtcHSyncStart = mode->HSyncStart;
+    mode->CrtcHSyncEnd = mode->HSyncEnd;
+    mode->CrtcHTotal = mode->HTotal;
+    mode->CrtcVDisplay = mode->VDisplay;
+    mode->CrtcVSyncStart = mode->VSyncStart;
+    mode->CrtcVSyncEnd = mode->VSyncEnd;
+    mode->CrtcVTotal = mode->VTotal;
+    mode->CrtcHAdjusted = FALSE;
+    mode->CrtcVAdjusted = FALSE;
+    pScrn->modes = mode;
+    pScrn->virtualX = psdp->width;
+    pScrn->virtualY = psdp->height;
+}
+
+static int sbusPaletteIndex = -1;
+static unsigned long sbusPaletteGeneration = 0;
+typedef struct _sbusCmap {
+    sbusDevicePtr psdp;
+    CloseScreenProcPtr CloseScreen;
+    Bool origCmapValid;
+    unsigned char origRed[16];
+    unsigned char origGreen[16];
+    unsigned char origBlue[16];
+} sbusCmapRec, *sbusCmapPtr;
+
+#define SBUSCMAPPTR(pScreen) ((sbusCmapPtr)((pScreen)->devPrivates[sbusPaletteIndex].ptr))
+
+static void
+xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+			LOCO *colors, VisualPtr pVisual)
+{
+    int i, index;
+    sbusCmapPtr cmap;
+    struct fbcmap fbcmap;
+    unsigned char *data = ALLOCATE_LOCAL(numColors*3);
+                             
+    cmap = SBUSCMAPPTR(pScrn->pScreen);
+    if (!cmap) return;
+    fbcmap.count = 0;
+    fbcmap.index = indices[0];
+    fbcmap.red = data;
+    fbcmap.green = data + numColors;
+    fbcmap.blue = fbcmap.green + numColors;
+    for (i = 0; i < numColors; i++) {
+	index = indices[i];
+	if (fbcmap.count && index != fbcmap.index + fbcmap.count) {
+	    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+	    fbcmap.count = 0;
+	    fbcmap.index = index;
+	}
+	fbcmap.red[fbcmap.count] = colors[index].red;
+	fbcmap.green[fbcmap.count] = colors[index].green;
+	fbcmap.blue[fbcmap.count++] = colors[index].blue;
+    }
+    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+    DEALLOCATE_LOCAL(data);
+}
+
+static Bool
+xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen)
+{
+    sbusCmapPtr cmap;
+    struct fbcmap fbcmap;
+                         
+    cmap = SBUSCMAPPTR(pScreen);
+    if (cmap->origCmapValid) {
+	fbcmap.index = 0;
+	fbcmap.count = 16;
+	fbcmap.red = cmap->origRed;
+	fbcmap.green = cmap->origGreen;
+	fbcmap.blue = cmap->origBlue;
+	ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+    }
+    pScreen->CloseScreen = cmap->CloseScreen;
+    xfree (cmap);
+    return (*pScreen->CloseScreen) (i, pScreen);
+}    
+
+Bool
+xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
+{
+    sbusCmapPtr cmap;
+    struct fbcmap fbcmap;
+    unsigned char data[2];
+
+    if(sbusPaletteGeneration != serverGeneration) {
+	if((sbusPaletteIndex = AllocateScreenPrivateIndex()) < 0)
+	    return FALSE;
+	sbusPaletteGeneration = serverGeneration;
+    }
+    cmap = xnfcalloc(1, sizeof(sbusCmapRec));
+    pScreen->devPrivates[sbusPaletteIndex].ptr = cmap;
+    cmap->psdp = psdp;
+    fbcmap.index = 0;
+    fbcmap.count = 16;
+    fbcmap.red = cmap->origRed;
+    fbcmap.green = cmap->origGreen;
+    fbcmap.blue = cmap->origBlue;
+    if (ioctl (psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)
+	cmap->origCmapValid = TRUE;
+    fbcmap.index = 0;
+    fbcmap.count = 2;
+    fbcmap.red = data;
+    fbcmap.green = data;
+    fbcmap.blue = data;
+    if (pScreen->whitePixel == 0) {
+	data[0] = 255;
+	data[1] = 0;
+    } else {
+	data[0] = 0;
+	data[1] = 255;
+    }
+    ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);
+    cmap->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = xf86SbusCmapCloseScreen;
+    return xf86HandleColormaps(pScreen, 256, 8,
+			       xf86SbusCmapLoadPalette, NULL, 0);
+}
Index: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h:3.3
--- /dev/null	Sat Jul  1 20:42:39 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h	Fri Jun 30 10:15:11 2000
@@ -0,0 +1,88 @@
+/*
+ * SBUS bus-specific declarations
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.3 2000/06/30 17:15:11 dawes Exp $ */
+
+#ifndef _XF86_SBUSBUS_H
+#define _XF86_SBUSBUS_H
+
+#define SBUS_DEVICE_BW2		0x0001
+#define SBUS_DEVICE_CG2		0x0002
+#define SBUS_DEVICE_CG3		0x0003
+#define SBUS_DEVICE_CG4		0x0004
+#define SBUS_DEVICE_CG6		0x0005
+#define SBUS_DEVICE_CG8		0x0006
+#define SBUS_DEVICE_CG12	0x0007
+#define SBUS_DEVICE_CG14	0x0008
+#define SBUS_DEVICE_LEO		0x0009
+#define SBUS_DEVICE_TCX		0x000a
+#define SBUS_DEVICE_FFB		0x000b
+#define SBUS_DEVICE_GT		0x000c
+#define SBUS_DEVICE_MGX		0x000d
+
+typedef struct sbus_prom_node {
+    int			node;
+    /* Because of misdesigned openpromio */
+    int			cookie[2];
+} sbusPromNode, *sbusPromNodePtr;
+
+typedef struct sbus_device {
+    int			devId;
+    int			fbNum;
+    int			fd;
+    int			width, height;
+    sbusPromNode	node;
+    char		*descr;
+    char		*device;
+} sbusDevice, *sbusDevicePtr;
+
+extern struct sbus_devtable {
+    int devId;
+    int fbType;
+    char *promName;
+    char *descr;
+} sbusDeviceTable[];
+
+void xf86SbusProbe(void);
+extern sbusDevicePtr *xf86SbusInfo;
+
+int xf86MatchSbusInstances(const char *driverName, int sbusDevId, 
+			   GDevPtr *devList, int numDevs, DriverPtr drvp,
+			   int **foundEntities);
+sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex);
+int xf86GetEntityForSbusInfo(sbusDevicePtr psdp);
+void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp);
+pointer xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset,
+		       unsigned long size);
+void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size);
+void xf86SbusHideOsHwCursor(sbusDevicePtr psdp);
+void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg);
+Bool xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp);
+int sparcPromInit(void);
+void sparcPromClose(void);
+char * sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp);
+int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop);
+void sparcPromAssignNodes(void);
+char * sparcPromNode2Pathname(sbusPromNodePtr pnode);
+int sparcPromPathname2Node(const char *pathName);
+
+#endif /* _XF86_SBUSBUS_H */
Index: xc/programs/Xserver/hw/xfree86/common/xf86str.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86str.h:1.67 xc/programs/Xserver/hw/xfree86/common/xf86str.h:1.71
--- xc/programs/Xserver/hw/xfree86/common/xf86str.h:1.67	Wed Mar  1 08:00:54 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86str.h	Mon Jun 19 22:08:45 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.67 2000/03/01 16:00:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.71 2000/06/20 05:08:45 dawes Exp $ */
 
 /*
  * Copyright (c) 1997-2000 by The XFree86 Project, Inc.
@@ -86,6 +86,9 @@
     MODE_VBLANK_WIDE,	/* vertical blanking too wide */
     MODE_PANEL,         /* exceeds panel dimensions */
     MODE_INTERLACE_WIDTH, /* width too large for interlaced mode */
+    MODE_ONE_WIDTH,    /* only one width is supported */
+    MODE_ONE_HEIGHT,   /* only one height is supported */
+    MODE_ONE_SIZE,     /* only one resolution is supported */
     MODE_BAD = -2,	/* unspecified reason */
     MODE_ERROR	= -1	/* error condition */
 } ModeStatus;
@@ -228,7 +231,8 @@
 typedef enum {
     BUS_NONE,
     BUS_ISA,
-    BUS_PCI
+    BUS_PCI,
+    BUS_SBUS
 } BusType;
 
 typedef struct {
@@ -241,11 +245,16 @@
     unsigned int dummy;
 } IsaBusId;
 
+typedef struct {
+    int		fbNum;
+} SbusBusId;
+
 typedef struct _bus {
     BusType type;
     union {
 	IsaBusId isa;
 	PciBusId pci;
+	SbusBusId sbus;
     } id;
 } BusRec, *BusPtr;
 
@@ -283,6 +292,7 @@
    int				chipRev;
    pointer			options;
    int                          irq;
+   int                          screen;         /* For multi-CRTC cards */
 } GDevRec, *GDevPtr;
 
 typedef int (*FindIsaDevProc)(GDevPtr dev);
@@ -412,7 +422,7 @@
     
 /* These values should be adjusted when new fields are added to ScrnInfoRec */
 #define NUM_RESERVED_INTS		16
-#define NUM_RESERVED_POINTERS		16
+#define NUM_RESERVED_POINTERS		15
 #define NUM_RESERVED_FUNCS		16
 
 typedef pointer (*funcPointer)(void);
@@ -474,6 +484,12 @@
     void *arg;
 } xf86AccessRec, *xf86AccessPtr;
 
+typedef struct {
+    xf86AccessPtr mem;
+    xf86AccessPtr io;
+    xf86AccessPtr io_mem;
+} xf86SetAccessFuncRec, *xf86SetAccessFuncPtr;
+
 /*  bus-access-related types */
 typedef enum {
     NONE,
@@ -608,6 +624,7 @@
     Bool active;
     resPtr resources;
     GDevPtr device;
+    DriverPtr driver;
 } EntityInfoRec, *EntityInfoPtr;
 
 /* server states */
@@ -798,6 +815,8 @@
      * structure size and alignment unchanged.
      */
     int			reservedInt[NUM_RESERVED_INTS];
+
+    int *              entityInstanceList;
     pointer		reservedPtr[NUM_RESERVED_POINTERS];
 
     /*
@@ -820,7 +839,7 @@
     void		(*EnableDisableFBAccess)(int scrnIndex, Bool enable);
     int			(*SetDGAMode)(int scrnIndex, int num, 
 					DGADevicePtr devRet);
-    int			(*ChangeGamma)(int scrnIndex, Gamma gamma);
+    int			(*ChangeGamma)(int scrnIndex, Gamma newGamma);
     void		(*PointerMoved)(int scrnIndex, int x, int y);
     Bool                (*PMEvent)(int scrnIndex, pmEvent event);
     
Index: xc/programs/Xserver/hw/xfree86/common/xf86xv.c
diff -u xc/programs/Xserver/hw/xfree86/common/xf86xv.c:1.19 xc/programs/Xserver/hw/xfree86/common/xf86xv.c:1.26
--- xc/programs/Xserver/hw/xfree86/common/xf86xv.c:1.19	Mon Feb 21 17:58:06 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86xv.c	Fri Jun  9 15:41:06 2000
@@ -6,7 +6,7 @@
 
 */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.19 2000/02/22 01:58:06 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.26 2000/06/09 22:41:06 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -18,6 +18,7 @@
 #include "regionstr.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
+#include "mivalidate.h"
 #include "validate.h"
 #include "resource.h"
 #include "gcstruct.h"
@@ -73,6 +74,7 @@
 
 static Bool xf86XVCreateWindow(WindowPtr pWin);
 static Bool xf86XVDestroyWindow(WindowPtr pWin);
+static void xf86XVWindowExposures(WindowPtr pWin, RegionPtr r1, RegionPtr r2);
 static void xf86XVClipNotify(WindowPtr pWin, int dx, int dy);
 
 /* ScrnInfoRec functions */
@@ -102,6 +104,15 @@
 #endif
 
 
+#define GET_XV_SCREEN(pScreen) \
+	((XvScreenPtr)((pScreen)->devPrivates[XF86XvScreenIndex].ptr))
+
+#define GET_XF86XV_SCREEN(pScreen) \
+  	((XF86XVScreenPtr)(GET_XV_SCREEN(pScreen)->devPriv.ptr))
+
+#define GET_XF86XV_WINDOW(pWin) \
+	((XF86XVWindowPtr)((pWin)->devPrivates[XF86XVWindowIndex].ptr))
+
 static xf86XVInitGenericAdaptorPtr *GenDrivers = NULL;
 static int NumGenDrivers = 0;
 
@@ -146,6 +157,19 @@
     return num;
 }
 
+XF86VideoAdaptorPtr
+xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn)
+{
+    return xcalloc(1, sizeof(XF86VideoAdaptorRec));
+}
+
+void
+xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr)
+{
+    xfree(ptr);
+}
+
+
 Bool
 xf86XVScreenInit(
    ScreenPtr pScreen, 
@@ -173,7 +197,7 @@
   XF86XvScreenIndex = (*XvGetScreenIndexProc)();
   PortResource = (*XvGetRTPortProc)();
 
-  pxvs = (XvScreenPtr)pScreen->devPrivates[XF86XvScreenIndex].ptr;
+  pxvs = GET_XV_SCREEN(pScreen);
 
 
   /* Anyone initializing the Xv layer must provide these two.
@@ -193,20 +217,23 @@
   if(!ScreenPriv) return FALSE;
 
 
-  ScreenPriv->ClipNotify = pScreen->ClipNotify;
   ScreenPriv->CreateWindow = pScreen->CreateWindow;
   ScreenPriv->DestroyWindow = pScreen->DestroyWindow;
+  ScreenPriv->WindowExposures = pScreen->WindowExposures;
+  ScreenPriv->ClipNotify = pScreen->ClipNotify;
   ScreenPriv->EnterVT = pScrn->EnterVT;
   ScreenPriv->LeaveVT = pScrn->LeaveVT;
   ScreenPriv->AdjustFrame = pScrn->AdjustFrame;
 
 
-  pScreen->ClipNotify = xf86XVClipNotify;
   pScreen->CreateWindow = xf86XVCreateWindow;
   pScreen->DestroyWindow = xf86XVDestroyWindow;
+  pScreen->WindowExposures = xf86XVWindowExposures;
+  pScreen->ClipNotify = xf86XVClipNotify;
   pScrn->EnterVT = xf86XVEnterVT;
   pScrn->LeaveVT = xf86XVLeaveVT;
-  pScrn->AdjustFrame = xf86XVAdjustFrame;
+  if(pScrn->AdjustFrame)
+     pScrn->AdjustFrame = xf86XVAdjustFrame;
 
   if(!xf86XVInitAdaptors(pScreen, adaptors, num))
 	return FALSE;
@@ -274,7 +301,7 @@
    XF86VideoAdaptorPtr *infoPtr,
    int number
 ) {
-  XvScreenPtr pxvs = (XvScreenPtr)(pScreen->devPrivates[XF86XvScreenIndex].ptr);
+  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
   XF86VideoAdaptorPtr adaptorPtr;
   XvAdaptorPtr pAdaptor, pa;
@@ -863,8 +890,7 @@
 static int
 xf86XVReputAllVideo(WindowPtr pWin, pointer data)
 {
-    XF86XVWindowPtr WinPriv = 
-	(XF86XVWindowPtr)pWin->devPrivates[XF86XVWindowIndex].ptr;
+    XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
 
     while(WinPriv) {
 	if(WinPriv->PortRec->type == XvInputMask)
@@ -882,8 +908,7 @@
 {
    XF86XVWindowPtr winPriv, PrivRoot;    
 
-   winPriv = PrivRoot = 
-		(XF86XVWindowPtr)(pWin->devPrivates[XF86XVWindowIndex].ptr);
+   winPriv = PrivRoot = GET_XF86XV_WINDOW(pWin);
 
   /* Enlist our port in the window private */
    while(winPriv) {
@@ -908,7 +933,7 @@
 {
      XF86XVWindowPtr winPriv, prevPriv = NULL;
 
-     winPriv = (XF86XVWindowPtr)(pWin->devPrivates[XF86XVWindowIndex].ptr);
+     winPriv = GET_XF86XV_WINDOW(pWin);
 
      while(winPriv) {
 	if(winPriv->PortRec == portPriv) {
@@ -933,8 +958,7 @@
 xf86XVCreateWindow(WindowPtr pWin)
 {
   ScreenPtr pScreen = pWin->drawable.pScreen;
-  XvScreenPtr pxvs = (XvScreenPtr)pScreen->devPrivates[XF86XvScreenIndex].ptr;
-  XF86XVScreenPtr ScreenPriv = (XF86XVScreenPtr)pxvs->devPriv.ptr;
+  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
   int ret;
 
   pScreen->CreateWindow = ScreenPriv->CreateWindow;
@@ -951,13 +975,10 @@
 xf86XVDestroyWindow(WindowPtr pWin)
 {
   ScreenPtr pScreen = pWin->drawable.pScreen;
-  XvScreenPtr pxvs = (XvScreenPtr)pScreen->devPrivates[XF86XvScreenIndex].ptr;
-  XF86XVScreenPtr ScreenPriv = (XF86XVScreenPtr)pxvs->devPriv.ptr;
-  XF86XVWindowPtr tmp, WinPriv = 
-	(XF86XVWindowPtr)pWin->devPrivates[XF86XVWindowIndex].ptr;
+  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
+  XF86XVWindowPtr tmp, WinPriv = GET_XF86XV_WINDOW(pWin);
   int ret;
 
-  /* The DI layer only stops and removes video not transient stills/images */
   while(WinPriv) {
      XvPortRecPrivatePtr pPriv = WinPriv->PortRec;
 
@@ -983,41 +1004,101 @@
 }
 
 
-
 static void
+xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
+{
+  ScreenPtr pScreen = pWin->drawable.pScreen;
+  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
+  XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
+  XF86XVWindowPtr pPrev;
+  XvPortRecPrivatePtr pPriv;
+  Bool AreasExposed;
+
+  AreasExposed = (WinPriv && reg1 && REGION_NOTEMPTY(pScreen, reg1));
+
+  pScreen->WindowExposures = ScreenPriv->WindowExposures;
+  (*pScreen->WindowExposures)(pWin, reg1, reg2);
+  pScreen->WindowExposures = xf86XVWindowExposures;
+
+  /* filter out XClearWindow/Area */
+  if (!pWin->valdata) return;
+   
+  pPrev = NULL;
+
+  while(WinPriv) {
+     pPriv = WinPriv->PortRec;
+
+     /* Reput anyone with a reput function */
+
+     switch(pPriv->type) {
+     case XvInputMask:
+	xf86XVReputVideo(pPriv);
+	break;	     
+     case XvOutputMask:
+	xf86XVRegetVideo(pPriv);	
+	break;     
+     default:  /* overlaid still/image*/
+	if (pPriv->AdaptorRec->ReputImage)
+	   xf86XVReputImage(pPriv);
+	else if(AreasExposed) {
+	    XF86XVWindowPtr tmp;
+
+	    (*pPriv->AdaptorRec->StopVideo)(
+			pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);
+	    pPriv->isOn = FALSE;
+	    pPriv->pDraw = NULL;
+
+	    if(!pPrev) 
+	       pWin->devPrivates[XF86XVWindowIndex].ptr = 		
+						(pointer)(WinPriv->next);
+	    else
+	       pPrev->next = WinPriv->next;
+	    tmp = WinPriv;
+	    WinPriv = WinPriv->next;
+	    xfree(tmp);
+	    continue;
+	}
+	break;
+     }
+     pPrev = WinPriv;
+     WinPriv = WinPriv->next;
+  }
+}
+
+
+static void 
 xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
 {
   ScreenPtr pScreen = pWin->drawable.pScreen;
-  XvScreenPtr pxvs = (XvScreenPtr)pScreen->devPrivates[XF86XvScreenIndex].ptr;
-  XF86XVScreenPtr ScreenPriv = (XF86XVScreenPtr)pxvs->devPriv.ptr;
-  XF86XVWindowPtr WinPriv = 
-		(XF86XVWindowPtr)pWin->devPrivates[XF86XVWindowIndex].ptr;
+  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
+  XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
   XF86XVWindowPtr tmp, pPrev = NULL;
-   
+  XvPortRecPrivatePtr pPriv;
+  Bool visible = (pWin->visibility == VisibilityUnobscured) ||
+		 (pWin->visibility == VisibilityPartiallyObscured);
+
   while(WinPriv) {
-     XvPortRecPrivatePtr pPriv = WinPriv->PortRec;
+     pPriv = WinPriv->PortRec;
 
      if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)
 	REGION_DESTROY(pScreen, pPriv->pCompositeClip);
 
      pPriv->pCompositeClip = NULL;
 
-     if(!pPriv->type) { /* overlaid still/image */
-	if ((pPriv->AdaptorRec->ReputImage) &&
-	   ((pWin->visibility == VisibilityUnobscured) ||
-	    (pWin->visibility == VisibilityPartiallyObscured)))    
-	{
-	    xf86XVReputImage(pPriv);
-	}
-	else {
-	    (*pPriv->AdaptorRec->StopVideo)(
-			    pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);
+     /* Stop everything except images, but stop them too if the 
+	window isn't visible.  But we only remove the images. */
 
-	    pPriv->isOn = FALSE;
+     if(pPriv->type || !visible) {
+	(*pPriv->AdaptorRec->StopVideo)(
+			pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);
+	pPriv->isOn = FALSE;
+
+	if(!pPriv->type) {  /* overlaid still/image */
 	    pPriv->pDraw = NULL;
+
 	    if(!pPrev) 
-	       pWin->devPrivates[XF86XVWindowIndex].ptr = 
-					(pointer)(WinPriv->next);
+	       pWin->devPrivates[XF86XVWindowIndex].ptr = 		
+						(pointer)(WinPriv->next);
 	    else
 	       pPrev->next = WinPriv->next;
 	    tmp = WinPriv;
@@ -1025,20 +1106,16 @@
 	    xfree(tmp);
 	    continue;
 	}
-     } else {
-	if(pPriv->type == XvInputMask)
-	   xf86XVReputVideo(pPriv);	     
-	else
-	   xf86XVRegetVideo(pPriv);	     
      }
+
      pPrev = WinPriv;
      WinPriv = WinPriv->next;
   }
- 
+
   if(ScreenPriv->ClipNotify) {
-	pScreen->ClipNotify = ScreenPriv->ClipNotify;
-	(*pScreen->ClipNotify)(pWin, dx, dy);
-	pScreen->ClipNotify = xf86XVClipNotify;
+      pScreen->ClipNotify = ScreenPriv->ClipNotify;
+      (*pScreen->ClipNotify)(pWin, dx, dy);
+      pScreen->ClipNotify = xf86XVClipNotify;
   }
 }
 
@@ -1050,8 +1127,8 @@
 xf86XVCloseScreen(int i, ScreenPtr pScreen)
 {
   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  XvScreenPtr pxvs = (XvScreenPtr) pScreen->devPrivates[XF86XvScreenIndex].ptr;
-  XF86XVScreenPtr ScreenPriv = (XF86XVScreenPtr)pxvs->devPriv.ptr;
+  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
   XvAdaptorPtr pa;
   int c;
 
@@ -1059,6 +1136,7 @@
 
   pScreen->CreateWindow = ScreenPriv->CreateWindow;
   pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
+  pScreen->WindowExposures = ScreenPriv->WindowExposures;
   pScreen->ClipNotify = ScreenPriv->ClipNotify;
 
   pScrn->EnterVT = ScreenPriv->EnterVT; 
@@ -1085,7 +1163,7 @@
    XvAdaptorPtr *p_pAdaptors,
    int *p_nAdaptors
 ){
-  XvScreenPtr pxvs = (XvScreenPtr) pScreen->devPrivates[XF86XvScreenIndex].ptr;
+  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
 
   *p_nAdaptors = pxvs->nAdaptors;
   *p_pAdaptors = pxvs->pAdaptors;
@@ -1100,9 +1178,7 @@
 xf86XVEnterVT(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    XvScreenPtr pxvs = 
-	(XvScreenPtr) pScreen->devPrivates[XF86XvScreenIndex].ptr;
-    XF86XVScreenPtr ScreenPriv = (XF86XVScreenPtr)pxvs->devPriv.ptr;
+    XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
     Bool ret;
 
     ret = (*ScreenPriv->EnterVT)(index, flags);
@@ -1116,9 +1192,8 @@
 xf86XVLeaveVT(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    XvScreenPtr pxvs = 
-	(XvScreenPtr) pScreen->devPrivates[XF86XvScreenIndex].ptr;
-    XF86XVScreenPtr ScreenPriv = (XF86XVScreenPtr)pxvs->devPriv.ptr;
+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+    XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
     XvAdaptorPtr pAdaptor;
     XvPortPtr pPort;
     XvPortRecPrivatePtr pPriv;
@@ -1154,8 +1229,8 @@
 {
   ScrnInfoPtr pScrn = xf86Screens[index];
   ScreenPtr pScreen = pScrn->pScreen;
-  XvScreenPtr pxvs = (XvScreenPtr)pScreen->devPrivates[XF86XvScreenIndex].ptr;
-  XF86XVScreenPtr ScreenPriv = (XF86XVScreenPtr)pxvs->devPriv.ptr;
+  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
+  XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
   WindowPtr pWin;
   XvAdaptorPtr pa;
   int c, i;
@@ -1355,6 +1430,7 @@
      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
      portPriv->type = 0;  /* no mask means it's transient and should
 			     not be reput once it's removed */
+     pPort->pDraw = pDraw;  /* make sure we can get stop requests */
   }
 
 PUT_STILL_BAILOUT:
@@ -1603,8 +1679,8 @@
 
      VPBox.x1 = portPriv->pScrn->frameX0;	
      VPBox.y1 = portPriv->pScrn->frameY0;
-     VPBox.x2 = portPriv->pScrn->frameX1;	
-     VPBox.y2 = portPriv->pScrn->frameY1;
+     VPBox.x2 = portPriv->pScrn->frameX1 + 1;	
+     VPBox.y2 = portPriv->pScrn->frameY1 + 1;
 
      REGION_INIT(pScreen, &VPReg, &VPBox, 1);
      REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); 
@@ -1650,6 +1726,7 @@
      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
      portPriv->type = 0;  /* no mask means it's transient and should
 			     not be reput once it's removed */
+     pPort->pDraw = pDraw;  /* make sure we can get stop requests */
   }
 
 PUT_IMAGE_BAILOUT:
Index: xc/programs/Xserver/hw/xfree86/common/xf86xv.h
diff -u xc/programs/Xserver/hw/xfree86/common/xf86xv.h:1.13 xc/programs/Xserver/hw/xfree86/common/xf86xv.h:1.17
--- xc/programs/Xserver/hw/xfree86/common/xf86xv.h:1.13	Tue Mar  7 17:14:00 2000
+++ xc/programs/Xserver/hw/xfree86/common/xf86xv.h	Fri Jun  9 15:41:06 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.h,v 1.13 2000/03/08 01:14:00 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.h,v 1.17 2000/06/09 22:41:06 mvojkovi Exp $ */
 
 #ifndef _XVDIX_H_
 #define _XVDIX_H_
@@ -151,8 +151,8 @@
 		  short drw_w, short drw_h,
 		  RegionPtr clipBoxes);
   int (*stop)    (XF86SurfacePtr surface);
-  int (*getAttribute) (XF86SurfacePtr surface, Atom attr, INT32 *value);
-  int (*setAttribute) (XF86SurfacePtr surface, Atom attr, INT32 value);
+  int (*getAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 *value);
+  int (*setAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 value);
   int max_width;
   int max_height;
   int num_attributes;
@@ -193,7 +193,10 @@
    int *num
 );
    
+XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn);
 
+void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr);
+
 /*** These are DDX layer privates ***/
 
 
@@ -201,6 +204,7 @@
    CreateWindowProcPtr		CreateWindow;
    DestroyWindowProcPtr		DestroyWindow;
    ClipNotifyProcPtr		ClipNotify;
+   WindowExposuresProcPtr	WindowExposures;
    void                         (*AdjustFrame)(int, int, int, int);
    Bool                         (*EnterVT)(int, int);
    void                         (*LeaveVT)(int, int);
@@ -232,6 +236,7 @@
    Bool FreeCompositeClip;
    XvAdaptorRecPrivatePtr AdaptorRec;
    Bool isOn;
+   Bool moved;
    int vid_x, vid_y, vid_w, vid_h;
    int drw_x, drw_y, drw_w, drw_h;
    DevUnion DevPriv;
@@ -239,7 +244,7 @@
 
 typedef struct _XF86XVWindowRec{
    XvPortRecPrivatePtr PortRec;
-   struct _XF86XVWindowRec *next; 
+   struct _XF86XVWindowRec *next;
 } XF86XVWindowRec, *XF86XVWindowPtr;
 
 #endif  /* _XVDIX_H_ */
Index: xc/programs/Xserver/hw/xfree86/ddc/edid.h
diff -u xc/programs/Xserver/hw/xfree86/ddc/edid.h:1.4 xc/programs/Xserver/hw/xfree86/ddc/edid.h:1.7
--- xc/programs/Xserver/hw/xfree86/ddc/edid.h:1.4	Fri Nov 19 05:54:24 1999
+++ xc/programs/Xserver/hw/xfree86/ddc/edid.h	Thu Apr 20 14:28:26 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.4 1999/11/19 13:54:24 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.7 2000/04/20 21:28:26 tsi Exp $ */
 
 /* edid.h: defines to parse an EDID block 
  *
@@ -9,6 +9,10 @@
  *
  * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
  */
+
+#ifndef _EDID_H_
+#define _EDID_H_ 1
+
 #include "vdif.h"
 
 /* read complete EDID record */
@@ -403,6 +407,7 @@
 };
 
 typedef struct {
+  int scrnIndex;
   struct vendor vendor;
   struct edid_version ver;
   struct disp_features features;
@@ -413,6 +418,7 @@
   int no_sections;
   Uchar *rawData;
 } xf86Monitor, *xf86MonPtr;
-
 
+extern xf86MonPtr ConfiguredMonitor;
 
+#endif /* _EDID_H_ */
Index: xc/programs/Xserver/hw/xfree86/ddc/edid2.h
diff -u xc/programs/Xserver/hw/xfree86/ddc/edid2.h:1.2 xc/programs/Xserver/hw/xfree86/ddc/edid2.h:removed
--- xc/programs/Xserver/hw/xfree86/ddc/edid2.h:1.2	Sat Aug 21 06:48:26 1999
+++ xc/programs/Xserver/hw/xfree86/ddc/edid2.h	Sat Jul  1 20:42:41 2000
@@ -1,59 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid2.h,v 1.2 1999/08/21 13:48:26 dawes Exp $ */
-
-#ifdef _PARSE_EDID_
-
-#define EDID2_len 256
-
-#define VERSION_SECTION 0
-#define VERSION_LEN 1
-#define VENDOR_SECTION (VERSION_SECTION + VERSION_LEN)
-#define V_MANUFACURER VENDOR_SECTION
-#define V_PROD_ID (V_MANUFACURER + 2)
-#define V_WEEK (V_PROD_ID + 2)
-#define V_YEAR (V_WEEK + 1)
-#define VENDOR_LEN 7
-#define MANUFACTURER_SECTION (VENDOR_SECTION + VENDOR_LEN)
-#define MANUFACTURER_LEN 32
-#define SERIAL_NO_SECTION (MANUFACTURER_SECTION + MANUFACTURER_LEN)
-#define SERIAL_NO_LEN 16
-#define UNUSED (SERIAL_NO_SECTION + SERIAL_NO_LEN)
-#define UNUSED_LEN 8
-#define DISPLAY_INTERFACE (UNUSED + UNUSED_LEN)
-#define PHYS_INTERFACE DISPLAY_INTERFACE
-#define VIDEO_INTERFACE (PHYS_INTERFACE + 1)
-#define INTERFACE_DATA_FORMAT (VIDEO_INTERFACE + 1)
-#define INTERFACE_COLOR_ENCODING (INTERFACE_DATA_FORMAT + 8)
-#define DISPLAY_INTERFACE_LEN 15
-#define DISPLAY_DEVICE (DISPLAY_INTERFACE + DISPLAY_INTERFACE_LEN)
-#define DISPLAY_TECHNOLOGY DISPLAY_DEVICE
-#define DISPLAY_CHARACTER (DISPLAY_TECHNOLOGY + 1)
-#define FEATURE_SUPPORT (DISPLAY_CHARACTER + 1) 
-#define DISPLAY_DEVICE_LEN 5
-#define DISPLAY_RESPONSE_TIME (DISPLAY_INTERFACE + DISPLAY_INTERFACE_LEN)
-#define DISPLAY_RESPONSE_TIME_LEN 2
-#define COLOR_DESCRIPTION (DISPLAY_RESPONSE_TIME + DISPLAY_RESONSE_TIME_LEN)
-#define GAMMA COLOR_DESCRIPTION
-#define MAX_LUM (GAMMA + 4)
-#define WHITE_POINT (MAX_LUM + 4)
-#define COLOR_DESCRIPTION_LEN 28
-#define DISPLAY_DIMENSION (COLOR_DESCRIPTION + COLOR_DESCRIPTION_LEN)
-#define DISPLAY_SIZE DISPLAY_DIMENSION
-#define DISPLAY_ADDRESSABILITY (DISPLAY_SIZE + 4)
-#define DISPLAY_PITCH (DISPLAY_ADDRESSABILITY + 4)
-#define DISPLAY_DIMENION_LEN 10
-#define UNUSED1 (DISPLAY_DIMENSION + DISPLAY_DIMENSION_LEN)
-#define UNUSED1_LEN
-#define GFT_SUPPORT (UNUSED1 + UNUSED1_LEN)
-#define GFT_SUPPORT_LEN
-#define TIMING_INFO_MAP (GFT_SUPPORT + GFT_SUPPORT_LEN)
-#define TIMING_INFO_LEN 2
-#define LUM_TAB_TIMING (TIMING_INFO_MAP + TIMING_INFO_LEN)
-#define LUM_TAB_TIMING_LEN 127
-#define CHECKSUM (LUM_TAB_TIMING + LUM_TAB_TIMING_LEN)
-
-
-#define GET(y) *(CARD8 *)(y)
-/* Version / Revision */
-#define VERSION (GET(VERSION_SECTION) >> 4)
-#define REVISION (GET(VERSION_SECTION) & 0xf)
-/* Vendor / Product ID */
Index: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c
diff -u xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c:1.6 xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c:1.7
--- xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c:1.6	Thu Jan 20 18:30:00 2000
+++ xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c	Mon Apr 17 09:29:55 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.7 2000/04/17 16:29:55 eich Exp $ */
 
 /* interpret_edid.c: interpret a primary EDID block
  * 
@@ -25,12 +25,13 @@
 static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);
 
 xf86MonPtr
-xf86InterpretEDID(Uchar *block)
+xf86InterpretEDID(int scrnIndex, Uchar *block)
 {
     xf86MonPtr m;
 
     if (!block) return NULL;
     if (! (m = xnfcalloc(sizeof(xf86Monitor),1))) return NULL;
+    m->scrnIndex = scrnIndex;
     m->rawData = block;
     get_vendor_section(SECTION(VENDOR_SECTION,block),&m->vendor);
     get_version_section(SECTION(VERSION_SECTION,block),&m->ver);
Index: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c
diff -u xc/programs/Xserver/hw/xfree86/ddc/print_edid.c:1.5 xc/programs/Xserver/hw/xfree86/ddc/print_edid.c:1.12
--- xc/programs/Xserver/hw/xfree86/ddc/print_edid.c:1.5	Sat Sep 25 07:37:16 1999
+++ xc/programs/Xserver/hw/xfree86/ddc/print_edid.c	Wed Jun  7 15:03:08 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.5 1999/09/25 14:37:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.12 2000/06/07 22:03:08 tsi Exp $ */
 
 /* print_edid.c: print out all information retrieved from display device 
  * 
@@ -9,253 +9,277 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "xf86DDC.h"
-
-static void print_vendor(struct vendor *);
-static void print_version(struct edid_version *);
-static void print_display(struct disp_features *);
-static void print_established_timings(struct established_timings *);
-static void print_std_timings(struct std_timings *);
-static void print_detailed_monitor_section(struct detailed_monitor_section *);
-static void print_detailed_timings(struct detailed_timings *);
-
-static void print_input_features(struct disp_features *);
-static void print_dpms_features(struct disp_features *);
-static void print_whitepoint(struct disp_features *);
-
+  
+static void print_vendor(int scrnIndex, struct vendor *);
+static void print_version(int scrnIndex, struct edid_version *);
+static void print_display(int scrnIndex, struct disp_features *);
+static void print_established_timings(int scrnIndex,
+				      struct established_timings *);
+static void print_std_timings(int scrnIndex, struct std_timings *);
+static void print_detailed_monitor_section(int scrnIndex,
+					   struct detailed_monitor_section *);
+static void print_detailed_timings(int scrnIndex, struct detailed_timings *);
+
+static void print_input_features(int scrnIndex, struct disp_features *);
+static void print_dpms_features(int scrnIndex, struct disp_features *);
+static void print_whitepoint(int scrnIndex, struct disp_features *);
+  
 xf86MonPtr
 xf86PrintEDID(xf86MonPtr m)
 {
     if (!(m)) return NULL;
-    print_vendor(&m->vendor);
-    print_version(&m->ver);
-    print_display(&m->features);
-    print_established_timings(&m->timings1);
-    print_std_timings(m->timings2);
-    print_detailed_monitor_section(m->det_mon);
+    print_vendor(m->scrnIndex,&m->vendor);
+    print_version(m->scrnIndex,&m->ver);
+    print_display(m->scrnIndex,&m->features);
+    print_established_timings(m->scrnIndex,&m->timings1);
+    print_std_timings(m->scrnIndex,m->timings2);
+    print_detailed_monitor_section(m->scrnIndex,m->det_mon);
     return m;
 }
-
+  
 static void
-print_vendor(struct vendor *c)
+print_vendor(int scrnIndex, struct vendor *c)
 {
-    ErrorF("Manufacturer: %s  ",&c->name);
-    ErrorF("Model: %x ",c->prod_id);
-    ErrorF("Serial#: %u  ",c->serial);
-    ErrorF("Year: %u ",c->year);
-    ErrorF("Week: %u\n",c->week);
+    xf86DrvMsg(scrnIndex, X_INFO, "Manufacturer: %s  Model: %x  Serial#: %u\n",
+	&c->name, c->prod_id, c->serial);
+    xf86DrvMsg(scrnIndex, X_INFO, "Year: %u  Week: %u\n", c->year, c->week);
 }
-
+  
 static void
-print_version(struct edid_version *c)
+print_version(int scrnIndex, struct edid_version *c)
 {
-    ErrorF("EDID Version: %u.%u\n",c->version,c->revision);  
+    xf86DrvMsg(scrnIndex,X_INFO,"EDID Version: %u.%u\n",c->version,
+	       c->revision);  
 }
-
+  
 static void
-print_display(struct disp_features *disp)
+print_display(int scrnIndex, struct disp_features *disp)
 {
-    print_input_features(disp);
-    ErrorF("Max H-Image Size [cm]: ");
+    print_input_features(scrnIndex,disp);
+    xf86DrvMsg(scrnIndex,X_INFO,"Max H-Image Size [cm]: ");
     if (disp->hsize)
-	ErrorF("horiz.: %i  ",disp->hsize);
+	xf86ErrorF("horiz.: %i  ",disp->hsize);
     else
-	ErrorF("H-Size may change,  ");
+	xf86ErrorF("H-Size may change,  ");
     if (disp->vsize)
-	ErrorF("vert.: %i\n",disp->vsize);
-    else
-	ErrorF("V-Size may change\n");
-    ErrorF("Gamma: %.2f\n", disp->gamma);
-    print_dpms_features(disp);
-    print_whitepoint(disp);
+	xf86ErrorF("vert.: %i\n",disp->vsize);
+      else
+	xf86ErrorF("V-Size may change\n");
+    xf86DrvMsg(scrnIndex,X_INFO,"Gamma: %.2f\n", disp->gamma);
+    print_dpms_features(scrnIndex,disp);
+    print_whitepoint(scrnIndex,disp);
 }
-
+  
 static void 
-print_input_features(struct disp_features *c)
+print_input_features(int scrnIndex, struct disp_features *c)
 {
     if (DIGITAL(c->input_type))
-	ErrorF("Digital Display Input, ");
+	xf86DrvMsg(scrnIndex,X_INFO,"Digital Display Input\n");
     else {
-	ErrorF("Analog Display Input,  ");
-	ErrorF("Input Voltage Level: ");
+	xf86DrvMsg(scrnIndex,X_INFO,"Analog Display Input,  ");
+	xf86ErrorF("Input Voltage Level: ");
 	switch (c->input_voltage){
 	case V070:
-	    ErrorF("0.700/0.300 V\n");
+	    xf86ErrorF("0.700/0.300 V\n");
 	    break;
 	case V071:
-	    ErrorF("0.714/0.286 V\n");
+	    xf86ErrorF("0.714/0.286 V\n");
 	    break;
 	case V100:
-	    ErrorF("1.000/0.400 V\n");
+	    xf86ErrorF("1.000/0.400 V\n");
 	    break;
 	case V007:
-            ErrorF("0.700/0.700 V\n");
+            xf86ErrorF("0.700/0.700 V\n");
 	    break;
 	default:
-	    ErrorF("undefined\n");
+	    xf86ErrorF("undefined\n");
 	}
-	if (SIG_SETUP(c->input_setup)) ErrorF("Signal levels configurable\n");
-	ErrorF("Sync:   ");
-	if (SEP_SYNC(c->input_sync)) ErrorF("Separate   ");
-	if (COMP_SYNC(c->input_sync)) ErrorF("Composite   ");
-	if (SYNC_O_GREEN(c->input_sync)) ErrorF("SyncOnGreen   ");
+	if (SIG_SETUP(c->input_setup))
+	    xf86DrvMsg(scrnIndex,X_INFO,"Signal levels configurable\n");
+	xf86DrvMsg(scrnIndex,X_INFO,"Sync:   ");
+	if (SEP_SYNC(c->input_sync))
+	    xf86ErrorF("Separate   ");
+	if (COMP_SYNC(c->input_sync))
+	    xf86ErrorF("Composite   ");
+	if (SYNC_O_GREEN(c->input_sync))
+	    xf86ErrorF("SyncOnGreen   ");
 	if (SYNC_SERR(c->input_sync)) 
-	    ErrorF("\nSerration on V.Sync Pulse req. if CompSync or SyncOnGreen\n");
-	else ErrorF("\n");
+	    xf86ErrorF("\n           Serration on"
+		       "V.Sync Pulse req. if CompSync or SyncOnGreen\n");
+	else xf86ErrorF("\n");
     }
 }
-
+  
 static void 
-print_dpms_features(struct disp_features *c)
+print_dpms_features(int scrnIndex, struct disp_features *c)
 {
-    ErrorF("DPMS capabilities:  ");
-    if (DPMS_STANDBY(c->dpms)) ErrorF("StandBy ");
-    if (DPMS_SUSPEND(c->dpms)) ErrorF("Suspend ");
-    if (DPMS_OFF(c->dpms)) ErrorF("Off ");
+     if (c->dpms) {
+	 xf86DrvMsg(scrnIndex,X_INFO,"DPMS capabilities:");
+	 if (DPMS_STANDBY(c->dpms)) xf86ErrorF(" StandBy");
+	 if (DPMS_SUSPEND(c->dpms)) xf86ErrorF(" Suspend");
+	 if (DPMS_OFF(c->dpms)) xf86ErrorF(" Off");
+     } else 
+	 xf86DrvMsg(scrnIndex,X_INFO,"No DPMS capabilities specified");
     switch (c->display_type){
     case DISP_MONO:
-	ErrorF(";   Monochorome/GrayScale Display\n");
+	xf86ErrorF("; Monochorome/GrayScale Display\n");
 	break;
     case DISP_RGB:
-	ErrorF(";   RGB/Color Display\n");
+	xf86ErrorF("; RGB/Color Display\n");
 	break;
     case DISP_MULTCOLOR:
-	ErrorF(";   Non RGB Multicolor Display\n");
+	xf86ErrorF("; Non RGB Multicolor Display\n");
 	break;
     default:
 	break;
     }
     if (STD_COLOR_SPACE(c->msc))
-      ErrorF("Default color space is primary color space\n"); 
+	xf86DrvMsg(scrnIndex,X_INFO,
+		   "Default color space is primary color space\n"); 
     if (PREFERRED_TIMING_MODE(c->msc))
-      ErrorF("First detailed timing is preferred mode\n"); 
+	xf86DrvMsg(scrnIndex,X_INFO,
+		   "First detailed timing is preferred mode\n"); 
     if (GFT_SUPPORTED(c->msc))
-      ErrorF("GTF timings supported\n"); 
+	xf86DrvMsg(scrnIndex,X_INFO,
+		   "GTF timings supported\n"); 
 }
-
+  
 static void 
-print_whitepoint(struct disp_features *disp)
+print_whitepoint(int scrnIndex, struct disp_features *disp)
 {
-  ErrorF("redX: %.3f redY: %.3f   ",
-	 disp->redx,disp->redy);
-  ErrorF("greenX: %.3f greenY: %.3f\n",
-	 disp->greenx,disp->greeny);
-  ErrorF("blueX: %.3f blueY: %.3f   ",
-	 disp->bluex,disp->bluey);
-  ErrorF("whiteX: %.3f whiteY: %.3f\n",
-	 disp->whitex,disp->whitey);
+    xf86DrvMsg(scrnIndex,X_INFO,"redX: %.3f redY: %.3f   ",
+	       disp->redx,disp->redy);
+    xf86ErrorF("greenX: %.3f greenY: %.3f\n",
+	       disp->greenx,disp->greeny);
+    xf86DrvMsg(scrnIndex,X_INFO,"blueX: %.3f blueY: %.3f   ",
+	       disp->bluex,disp->bluey);
+    xf86ErrorF("whiteX: %.3f whiteY: %.3f\n",
+	       disp->whitex,disp->whitey);
 }
-
+  
 static void 
-print_established_timings(struct established_timings *t)
+print_established_timings(int scrnIndex, struct established_timings *t)
 {
     unsigned char c;
 
-    ErrorF("Supported VESA Video Modes:\n");
+    if (t->t1 || t->t2 || t->t_manu)
+	xf86DrvMsg(scrnIndex,X_INFO,"Supported VESA Video Modes:\n");
     c=t->t1;
-    if (c&0x80) ErrorF("720x400@70Hz\n");
-    if (c&0x40) ErrorF("720x400@88Hz\n");
-    if (c&0x20) ErrorF("640x480@60Hz\n");
-    if (c&0x10) ErrorF("640x480@67Hz\n");
-    if (c&0x08) ErrorF("640x480@72Hz\n");
-    if (c&0x04) ErrorF("640x480@75Hz\n");
-    if (c&0x02) ErrorF("800x600@56Hz\n");
-    if (c&0x01) ErrorF("800x600@60Hz\n");
+    if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"720x400@70Hz\n");
+    if (c&0x40) xf86DrvMsg(scrnIndex,X_INFO,"720x400@88Hz\n");
+    if (c&0x20) xf86DrvMsg(scrnIndex,X_INFO,"640x480@60Hz\n");
+    if (c&0x10) xf86DrvMsg(scrnIndex,X_INFO,"640x480@67Hz\n");
+    if (c&0x08) xf86DrvMsg(scrnIndex,X_INFO,"640x480@72Hz\n");
+    if (c&0x04) xf86DrvMsg(scrnIndex,X_INFO,"640x480@75Hz\n");
+    if (c&0x02) xf86DrvMsg(scrnIndex,X_INFO,"800x600@56Hz\n");
+    if (c&0x01) xf86DrvMsg(scrnIndex,X_INFO,"800x600@60Hz\n");
     c=t->t2;
-    if (c&0x80) ErrorF("800x600@72Hz\n");
-    if (c&0x40) ErrorF("800x600@75Hz\n");
-    if (c&0x20) ErrorF("832x624@75Hz\n");
-    if (c&0x10) ErrorF("1024x768@87Hz (interlaced)\n");
-    if (c&0x08) ErrorF("1024x768@60Hz\n");
-    if (c&0x04) ErrorF("1024x768@70Hz\n");
-    if (c&0x02) ErrorF("1024x768@75Hz\n");
-    if (c&0x01) ErrorF("1280x1024@75Hz\n");
+    if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"800x600@72Hz\n");
+    if (c&0x40) xf86DrvMsg(scrnIndex,X_INFO,"800x600@75Hz\n");
+    if (c&0x20) xf86DrvMsg(scrnIndex,X_INFO,"832x624@75Hz\n");
+    if (c&0x10) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@87Hz (interlaced)\n");
+    if (c&0x08) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@60Hz\n");
+    if (c&0x04) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@70Hz\n");
+    if (c&0x02) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@75Hz\n");
+    if (c&0x01) xf86DrvMsg(scrnIndex,X_INFO,"1280x1024@75Hz\n");
     c=t->t_manu;
-    if (c&0x80) ErrorF("1152x870@75Hz\n");
-    ErrorF("Manufacturer's mask: %X\n",c&0x7F);
+    if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"1152x870@75Hz\n");
+    xf86DrvMsg(scrnIndex,X_INFO,"Manufacturer's mask: %X\n",c&0x7F);
 }
-
+  
 static void
-print_std_timings(struct std_timings *t)
+print_std_timings(int scrnIndex, struct std_timings *t)
 {
     int i;
-    ErrorF("Supported Future Video Modes:\n");
+    char done = 0;
     for (i=0;i<STD_TIMINGS;i++) {
 	if (t[i].hsize > 256) {  /* sanity check */
-	    ErrorF("#%i: hsize: %i  vsize %i  refresh: %i  vid: %i\n",
-		   i, t[i].hsize, t[i].vsize, t[i].refresh, t[i].id);
+	    if (!done) {
+		xf86DrvMsg(scrnIndex,X_INFO,"Supported Future Video Modes:\n");
+		done = 1;
+	    }
+	    xf86DrvMsg(scrnIndex,X_INFO,
+		       "#%i: hsize: %i  vsize %i  refresh: %i  vid: %i\n",
+		       i, t[i].hsize, t[i].vsize, t[i].refresh, t[i].id);
 	}
     }
 }
-
+  
 static void
-print_detailed_monitor_section(struct detailed_monitor_section *m)
+print_detailed_monitor_section(int scrnIndex,
+			       struct detailed_monitor_section *m)
 {
-  int i,j;
-
-  for (i=0;i<DET_TIMINGS;i++) {
-    switch (m[i].type) {
-    case DT:
-      print_detailed_timings(&m[i].section.d_timings);
-      break;
-    case DS_SERIAL:
-      ErrorF("Serial No: %s\n",m[i].section.serial);
-      break;
-    case DS_ASCII_STR:
-      ErrorF(" %s\n",m[i].section.ascii_data);
-      break;
-    case DS_NAME:
-      ErrorF("Monitor name: %s\n",m[i].section.name);
-      break;
-    case DS_RANGES:
-      ErrorF("Ranges: V min: %i  V max: %i Hz, H min: %i  H max: %i kHz,",
-	     m[i].section.ranges.min_v, m[i].section.ranges.max_v, 
-	     m[i].section.ranges.min_h, m[i].section.ranges.max_h);
-      if (m[i].section.ranges.max_clock != 0)
-	ErrorF(" PixClock max %i MHz\n",m[i].section.ranges.max_clock);
-      else
-	ErrorF("\n");
-      break;
-    case DS_STD_TIMINGS:
-      for (j = 0; j<5; i++) 
-	ErrorF("#%i: hsize: %i  vsize %i  refresh: %i  "
-	       "vid: %i\n",i,m[i].section.std_t[i].hsize,
-	       m[i].section.std_t[j].vsize,m[i].section.std_t[j].refresh,
-	       m[i].section.std_t[j].id);
-      break;
-    case DS_WHITE_P:
-      for (j = 0; j<2; i++)
-	if (m[i].section.wp[j].index != 0)
-	  ErrorF("White point %i: whiteX: %f, whiteY: %f; gamma: %f\n",
-		 m[i].section.wp[j].index,m[i].section.wp[j].white_x,
-		 m[i].section.wp[j].white_y, m[i].section.wp[j].white_gamma);
-      break;
+    int i,j;
+  
+    for (i=0;i<DET_TIMINGS;i++) {
+	switch (m[i].type) {
+	case DT:
+	    print_detailed_timings(scrnIndex,&m[i].section.d_timings);
+	    break;
+	case DS_SERIAL:
+	    xf86DrvMsg(scrnIndex,X_INFO,"Serial No: %s",m[i].section.serial);
+	    break;
+	case DS_ASCII_STR:
+	    xf86DrvMsg(scrnIndex,X_INFO," %s",m[i].section.ascii_data);
+	    break;
+	case DS_NAME:
+	    xf86DrvMsg(scrnIndex,X_INFO,"Monitor name: %s",m[i].section.name);
+	    break;
+	case DS_RANGES:
+	    xf86DrvMsg(scrnIndex,X_INFO,
+		       "Ranges: V min: %i  V max: %i Hz, H min: %i  H max: %i kHz,",
+		       m[i].section.ranges.min_v, m[i].section.ranges.max_v, 
+		       m[i].section.ranges.min_h, m[i].section.ranges.max_h);
+	    if (m[i].section.ranges.max_clock != 0)
+		xf86ErrorF(" PixClock max %i MHz\n",m[i].section.ranges.max_clock);
+	    else
+		xf86DrvMsg(scrnIndex,X_INFO,"\n");
+	    break;
+	case DS_STD_TIMINGS:
+	    for (j = 0; j<5; j++) 
+		xf86DrvMsg(scrnIndex,X_INFO,"#%i: hsize: %i  vsize %i  refresh: %i  "
+			   "vid: %i\n",i,m[i].section.std_t[i].hsize,
+			   m[i].section.std_t[j].vsize,m[i].section.std_t[j].refresh,
+			   m[i].section.std_t[j].id);
+	    break;
+	case DS_WHITE_P:
+	    for (j = 0; j<2; j++)
+		if (m[i].section.wp[j].index != 0)
+		    xf86DrvMsg(scrnIndex,X_INFO,
+			       "White point %i: whiteX: %f, whiteY: %f; gamma: %f\n",
+			       m[i].section.wp[j].index,m[i].section.wp[j].white_x,
+			       m[i].section.wp[j].white_y,
+			       m[i].section.wp[j].white_gamma);
+	    break;
+	}
     }
-  }
 }
-
+  
 static void
-print_detailed_timings(struct detailed_timings *t)
+print_detailed_timings(int scrnIndex, struct detailed_timings *t)
 {
 
-  if (t->clock > 15000000) {  /* sanity check */
-    ErrorF("Supported additional Video Mode:\n");
-    ErrorF("clock: %.1f MHz   ",t->clock/1000000.0);
-    ErrorF("Image Size:  %i x %i mm\n",t->h_size,t->v_size); 
-    ErrorF("h_active: %i  h_sync: %i  h_sync_end %i h_blank_end %i ",
-	   t->h_active, t->h_sync_off + t->h_active,
-	   t->h_sync_off + t->h_sync_width + t->h_active,
-	   t->h_active + t->h_blanking);
-    ErrorF("h_border: %i\n",t->h_border);
-    ErrorF("v_active: %i  v_sync: %i  v_sync_end %i v_blanking: %i ",
-	   t->v_active, t->v_sync_off + t->v_active,
-	   t->v_sync_off + t->v_sync_width + t->v_active,
-	   t->v_active + t->v_blanking);
-    ErrorF("v_border: %i\n",t->v_border);
-    if (IS_STEREO(t->stereo)) {
-      ErrorF("Stereo: ");
-      if (IS_RIGHT_ON_SYNC(t->stereo)) 
-	ErrorF("right channel on sync\n");
-      else ErrorF("right channel on sync\n");
+    if (t->clock > 15000000) {  /* sanity check */
+	xf86DrvMsg(scrnIndex,X_INFO,"Supported additional Video Mode:\n");
+	xf86DrvMsg(scrnIndex,X_INFO,"clock: %.1f MHz   ",t->clock/1000000.0);
+	xf86ErrorF("Image Size:  %i x %i mm\n",t->h_size,t->v_size); 
+	xf86DrvMsg(scrnIndex,X_INFO,
+		   "h_active: %i  h_sync: %i  h_sync_end %i h_blank_end %i ",
+		   t->h_active, t->h_sync_off + t->h_active,
+		   t->h_sync_off + t->h_sync_width + t->h_active,
+		   t->h_active + t->h_blanking);
+	xf86ErrorF("h_border: %i\n",t->h_border);
+	xf86DrvMsg(scrnIndex,X_INFO,
+		   "v_active: %i  v_sync: %i  v_sync_end %i v_blanking: %i ",
+		   t->v_active, t->v_sync_off + t->v_active,
+		   t->v_sync_off + t->v_sync_width + t->v_active,
+		   t->v_active + t->v_blanking);
+	xf86ErrorF("v_border: %i\n",t->v_border);
+	if (IS_STEREO(t->stereo)) {
+	    xf86DrvMsg(scrnIndex,X_INFO,"Stereo: ");
+	    if (IS_RIGHT_ON_SYNC(t->stereo)) 
+		xf86ErrorF("right channel on sync\n");
+	    else xf86ErrorF("right channel on sync\n");
+	}
     }
-  }
 }
Index: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c
diff -u xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c:1.1 xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c:1.2
--- xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c:1.1	Sat Nov 28 02:43:05 1998
+++ xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c	Fri Apr 14 05:16:04 2000
@@ -1,6 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.1 1998/11/28 10:43:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.2 2000/04/14 12:16:04 tsi Exp $ */
 
 #include "vdif.h"
+#include "misc.h"
+
 static void print_vdif(xf86VdifPtr l, char *s);
 static void print_timings(xf86VdifTimingPtr *pt);
 static void print_limits(xf86VdifLimitsPtr *pl);
Index: xc/programs/Xserver/hw/xfree86/ddc/vdif.h
diff -u xc/programs/Xserver/hw/xfree86/ddc/vdif.h:1.2 xc/programs/Xserver/hw/xfree86/ddc/vdif.h:1.3
--- xc/programs/Xserver/hw/xfree86/ddc/vdif.h:1.2	Fri Dec  3 11:17:26 1999
+++ xc/programs/Xserver/hw/xfree86/ddc/vdif.h	Fri Apr 14 05:16:04 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.2 1999/12/03 19:17:26 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.3 2000/04/14 12:16:04 tsi Exp $ */
 
 #ifndef _VDIF_H
 #define _VDIF_H
@@ -21,7 +21,8 @@
 #define VDIF_SCAN_OTHER 2
 #define VDIF_POLARITY_NEGATIVE 0
 #define VDIF_POLARITY_POSITIVE 1
-#include "xf86.h"
+
+#include "Xmd.h"
 
 #pragma pack(1)
 
Index: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c
diff -u xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c:1.13 xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c:1.17
--- xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c:1.13	Mon Mar  6 11:07:16 2000
+++ xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c	Wed Jun  7 15:03:09 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.13 2000/03/06 19:07:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.17 2000/06/07 22:03:09 tsi Exp $ */
 
 /* xf86DDC.c 
  * 
@@ -118,7 +118,8 @@
     { DDCOPT_NODDC,	"NoDDC",	OPTV_BOOLEAN,	{0},	FALSE },
     { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
 };
-    
+
+#define nDDCOptions (sizeof(DDCOptions) / sizeof(DDCOptions[0]))
 
 xf86MonPtr 
 xf86DoEDID_DDC1(
@@ -131,11 +132,13 @@
     xf86MonPtr tmp = NULL;
     /* Default DDC and DDC1 to enabled. */
     Bool noddc = FALSE, noddc1 = FALSE;
+    OptionInfoRec options[nDDCOptions];
 
-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, DDCOptions);
+    (void)memcpy(options, DDCOptions, sizeof(DDCOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
-    xf86GetOptValBool(DDCOptions, DDCOPT_NODDC, &noddc);
-    xf86GetOptValBool(DDCOptions, DDCOPT_NODDC1, &noddc1);
+    xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);
+    xf86GetOptValBool(options, DDCOPT_NODDC1, &noddc1);
     
     if (noddc || noddc1)
 	return NULL;
@@ -143,7 +146,7 @@
     EDID_block = EDIDRead_DDC1(pScrn,DDC1SetSpeed,DDC1Read);
 
     if (EDID_block){
-	tmp = xf86InterpretEDID(EDID_block);
+	tmp = xf86InterpretEDID(scrnIndex,EDID_block);
     }
 #ifdef DEBUG
 	else ErrorF("No EDID block returned\n");
@@ -162,11 +165,13 @@
     xf86MonPtr tmp = NULL;
     /* Default DDC and DDC2 to enabled. */
     Bool noddc = FALSE, noddc2 = FALSE;
+    OptionInfoRec options[nDDCOptions];
 
-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, DDCOptions);
+    (void)memcpy(options, DDCOptions, sizeof(DDCOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
-    xf86GetOptValBool(DDCOptions, DDCOPT_NODDC, &noddc);
-    xf86GetOptValBool(DDCOptions, DDCOPT_NODDC2, &noddc2);
+    xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);
+    xf86GetOptValBool(options, DDCOPT_NODDC2, &noddc2);
     
     if (noddc || noddc2)
 	return NULL;
@@ -174,7 +179,7 @@
     EDID_block = EDID1Read_DDC2(scrnIndex,pBus);
 
     if (EDID_block){
-	tmp = xf86InterpretEDID(EDID_block);
+	tmp = xf86InterpretEDID(scrnIndex,EDID_block);
     } else {
 #ifdef DEBUG
 	ErrorF("No EDID block returned\n");
Index: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h
diff -u xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h:1.5 xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h:1.10
--- xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h:1.5	Fri Dec  3 11:17:26 1999
+++ xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h	Wed Jun  7 15:03:09 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.5 1999/12/03 19:17:26 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.10 2000/06/07 22:03:09 tsi Exp $ */
 
 /* xf86DDC.h
  *
@@ -16,6 +16,7 @@
 
 #include "edid.h"
 #include "xf86i2c.h"
+#include "xf86str.h"
 
 /* speed up / slow down */
 typedef enum {
@@ -35,11 +36,11 @@
 );
 
 extern xf86MonPtr xf86PrintEDID(
-    xf86MonPtr 
+    xf86MonPtr monPtr
 );
 
 extern xf86MonPtr xf86InterpretEDID(
-    Uchar *block
+    int screenIndex, Uchar *block
 );
 
 extern xf86vdifPtr xf86InterpretVdif(
Index: xc/programs/Xserver/hw/xfree86/doc/DESIGN
diff -u xc/programs/Xserver/hw/xfree86/doc/DESIGN:1.21 xc/programs/Xserver/hw/xfree86/doc/DESIGN:1.26
--- xc/programs/Xserver/hw/xfree86/doc/DESIGN:1.21	Tue Feb 29 17:47:59 2000
+++ xc/programs/Xserver/hw/xfree86/doc/DESIGN	Mon Jun 19 08:12:26 2000
@@ -2,7 +2,7 @@
 
                           The XFree86 Project, Inc
 
-                       Last modified 15 February 2000
+                          Last modified 1 May 2000
 
 NOTE: This is a DRAFT document, and the interfaces described here are subject
 to change without notice.
@@ -133,8 +133,8 @@
 
            Section "ServerLayout"
              Identifier "Main Layout"
-             Screen     "Screen 1" 0 ""  ""  ""  "Screen 2"
-             Screen     "Screen 2" 1
+             Screen     0 "Screen 1" ""  ""  ""  "Screen 2"
+             Screen     1 "Screen 2"
              Screen     "Screen 3"
            EndSection
 
@@ -147,8 +147,8 @@
 
            Section "ServerLayout"
              Identifier "Main Layout"
-             Screen     "Screen 1" 0 Absolute 0 0
-             Screen     "Screen 2" 1 Absolute 1024 0
+             Screen     0 "Screen 1" Absolute 0 0
+             Screen     1 "Screen 2" Absolute 1024 0
              Screen     "Screen 3" Absolute 2048 0
            EndSection
 
@@ -171,8 +171,8 @@
 
            Section "ServerLayout"
              Identifier "Main Layout"
-             Screen     "Screen 1" 0
-             Screen     "Screen 2" 1 RightOf "Screen 1"
+             Screen     0 "Screen 1"
+             Screen     1 "Screen 2" RightOf "Screen 1"
              Screen     "Screen 3" Relative "Screen 1" 2048 0
            EndSection
 
@@ -496,14 +496,14 @@
           The probe must register all non-relocatable resources at
           this stage.  If a resource conflict is found between
           exclusive resources the driver will fail immediately.
-          This is usually best done with the xf86ConfigActivePciEn-
-          tity() helper function for PCI and xf86ConfigActiveIsaEn-
-          tity() for ISA (see the RAC (section 9., page 1) sec-
-          tion).  It is possible to register some entity specific
-          functions with those helpers.  When not using the
-          helpers, the xf86AddEntityToScreen() xf86ClaimFixe-
-          dResources() and xf86SetEntityFuncs() should be used
-          instead (see the RAC (section 9., page 1) section).
+          This is usually best done with the xf86ConfigPciEntity()
+          helper function for PCI and xf86ConfigIsaEntity() for ISA
+          (see the RAC (section 9., page 1) section).  It is possi-
+          ble to register some entity specific functions with those
+          helpers.  When not using the helpers, the xf86AddEntity-
+          ToScreen() xf86ClaimFixedResources() and xf86SetEntity-
+          Funcs() should be used instead (see the RAC (section 9.,
+          page 1) section).
 
           If a chipset is specified in an active device section
           which the driver considers relevant (ie it has no driver
@@ -514,12 +514,16 @@
           If there are no active device sections that the driver
           considers relevant, it must return FALSE.
 
-          Allocate a ScrnInfoRec for each instance of the hardware
-          found, and fill in the basic information, including the
-          other driver entry points.  The xf86AllocateScreen()
-          function must be used to allocate the ScrnInfoRec, and it
-          takes care of initialising fields to defined ``unused''
-          values.
+          Allocate a ScrnInfoRec for each active instance of the
+          hardware found, and fill in the basic information,
+          including the other driver entry points.   This is best
+          done with the xf86ConfigIsaEntity() helper function for
+          ISA instances or xf86ConfigPciEntity() for PCI instances.
+          These functions allocate a ScrnInfoRec for active enti-
+          ties. Optionally xf86AllocateScreen() function may also
+          be used to allocate the ScrnInfoRec.  Any of these func-
+          tions take care of initialising fields to defined
+          ``unused'' values.
 
           Claim the entities for each instance of the hardware
           found.  This prevents other drivers from claiming the
@@ -697,14 +701,16 @@
 
           Modules may be loaded at any point in this function, and
           all modules that the driver will need must be loaded
-          before the end of this function.  The xf86LoadSubModule()
-          function should be used to load modules.  A driver may
-          unload a module within this function if it was only
-          needed temporarily, and the UnloadSubModule() function
-          should be used to do that.  Otherwise there is no need to
-          explicitly unload modules because the loader takes care
-          of module dependencies and will unload submodules auto-
-          matically if/when the driver module is unloaded.
+          before the end of this function.  Either the
+          xf86LoadSubModule() or the xf86LoadDrvSubModule() func-
+          tion should be used to load modules depending on whether
+          a ScrnInfoRec has been set up. A driver may unload a mod-
+          ule within this function if it was only needed temporar-
+          ily, and the xf86UnloadSubModule() function should be
+          used to do that.  Otherwise there is no need to explic-
+          itly unload modules because the loader takes care of mod-
+          ule dependencies and will unload submodules automatically
+          if/when the driver module is unloaded.
 
           The bulk of the ScrnInfoRec fields should be filled out
           in this function.
@@ -768,7 +774,8 @@
                     chipID
                     chipRev
 
-     pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name):
+     pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name): and
+     pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name):
 
           Load a module that a driver depends on.  This function
           loads the module name as a sub module of the driver.  The
@@ -776,12 +783,13 @@
           the load fails, the return value will be NULL.  If a
           driver needs to explicitly unload a module it has loaded
           in this way, the return value must be saved and passed to
-          UnloadSubModule() when unloading.
+          xf86UnloadSubModule() when unloading.
 
-     void UnloadSubModule(pointer module)
+     void xf86UnloadSubModule(pointer module)
 
           Unloads the module referenced by module.  module should
-          be a pointer returned previously by xf86LoadSubModule().
+          be a pointer returned previously by xf86LoadSubModule()
+          or xf86LoadDrvSubModule() .
 
 5.13  Cleaning up Unused Drivers
 
@@ -1640,31 +1648,30 @@
           (non-PCI) device, and FALSE otherwise.
 
 Two helper functions are provided to aid configuring entities:
-
-     Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
-
-               PciChipsets *p_chip, resList res,
-
-               EntityProc init, EntityProc enter,
-
-               EntityProc leave, pointer private)
-
-     Bool xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn, int entityIndex,
 
-               IsaChipsets *i_chip, resList res,
+     ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn,
+               int scrnFlag, int entityIndex,
+               PciChipsets *p_chip,
+               resList res, EntityProc init,
+               EntityProc enter, EntityProc leave,
+               pointer private)
+     ScrnInfoPtr xf86ConfigIsaEntity(ScrnInfoPtr pScrn,
+               int scrnFlag, int entityIndex,
+               IsaChipsets *i_chip,
+
+               resList res, EntityProc init,
+               EntityProc enter, EntityProc leave,
+               pointer private)
 
-               EntityProc init, EntityProc enter,
-
-               EntityProc leave, pointer private)
-
           These functions are used to register the non-relocatable
           resources for an entity, and the optional entity-specific
           Init, Enter and Leave functions.  Usually the list of
           fixed resources is obtained from the Isa/PciChipsets
           lists.  However an additional list of resources may be
-          passed.  Generally this is not required.  The return
-          value is TRUE when successful.  The init, enter, leave
-          functions are defined as follows:
+          passed.  Generally this is not required.  For active
+          entities a ScrnInfoRec is allocated if the pScrn argument
+          is NULL.  The return value is TRUE when successful.  The
+          init, enter, leave functions are defined as follows:
 
                typedef void (*EntityProc)(int entityIndex,
 
@@ -1672,8 +1679,8 @@
 
           They are passed the entity index and a pointer to a pri-
           vate scratch area.  This are can be set up during Probe()
-          and its address can be passed to xf86ConfigActiveIsaEn-
-          tity() xf86ConfigActivePciEntity() as the last argument.
+          and its address can be passed to xf86ConfigIsaEntity()
+          xf86ConfigPciEntity() as the last argument.
 
 These two helper functions make use of several core functions that are avail-
 able at the driver level:
@@ -1833,11 +1840,16 @@
 The driver may replace the generic access control functions for an entity by
 it's own ones.  This is done with the xf86SetAccessFuncs():
 
-     void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86AccessPtr p_io,
+     void xf86SetAccessFuncs(EntityInfoPtr pEnt,
+               xf86SetAccessFuncPtr funcs,
 
-               xf86AccessPtr p_mem, xf86AccessPtr p_io_mem,
+               xf86SetAccessFuncPtr oldFuncs) with:
 
-               xf86AccessPtr *ppAccessOld)
+                typedef struct {
+                    xf86AccessPtr mem;
+                    xf86AccessPtr io;
+                    xf86AccessPtr io_mem;
+                } xf86SetAccessFuncRec, *xf86SetAccessFuncPtr;
 
           The driver can pass three functions: one for I/O access,
           one for memory access and one for combined memory and I/O
@@ -2013,6 +2025,12 @@
           number is known (e.g., from the ChipProbe() function) a
           scrnIndex value of -1 should be used.
 
+          NOTE 2: Given that this function stores into the Option-
+          InfoRecs pointed to by optinfo, the caller should ensure
+          the OptionInfoRecs are (re-)initialised before the call,
+          especially if the caller expects to use the predefined
+          option values as defaults.
+
           The OptionInfoRec is defined as follows:
 
                        typedef struct {
@@ -2061,14 +2079,13 @@
           specified, freq.units is set to 0, and freq.freq is
           unscaled.
 
-          Typical usage is to setup a static array of OptionIn-
-          foRecs with the token, name, and type fields initialised.
-          The value and found fields get set by xf86ProcessOp-
-          tions().  For cases where the value parsing is more com-
-          plex, the driver should specify OPTV_STRING, and parse
-          the string itself.  An example of using this option han-
-          dling is included in the Sample Driver (section 20., page
-          1) section.
+          Typical usage is to setup an array of OptionInfoRecs with
+          all fields initialised.  The value and found fields get
+          set by xf86ProcessOptions().  For cases where the value
+          parsing is more complex, the driver should specify
+          OPTV_STRING, and parse the string itself.  An example of
+          using this option handling is included in the Sample
+          Driver (section 20., page 1) section.
 
      void xf86ShowUnusedOptions(int scrnIndex, pointer options)
 
@@ -2196,6 +2213,8 @@
 
           "compiler.h"
 
+     Note: in drivers, this must be included after "xf86_ansic.h".
+
      Drivers that need to access PCI vendor/device definitions need
      this:
 
@@ -2704,6 +2723,12 @@
                The offset into the linear framebuffer that
                corresponds to pixel (0,0) for this mode.
 
+          address
+
+               The virtual address of the framebuffer as
+               mapped by the driver.  This is needed when
+               DGA_PIXMAP_AVAILABLE is set.
+
                /** The DGAFunctionRec **/
 
                typedef struct {
@@ -2719,7 +2744,7 @@
                  Bool (*SetMode)(ScrnInfoPtr pScrn, DGAModePtr pMode);
                  void (*SetViewport)(ScrnInfoPtr pScrn, int x, int y, int flags);
                  int  (*GetViewport)(ScrnInfoPtr pScrn);
-                 void (*Flush)(ScrnInfoPtr);
+                 void (*Sync)(ScrnInfoPtr);
                  void (*FillRect)(
                       ScrnInfoPtr pScrn,
                       int x, int y, int w, int h,
@@ -2817,7 +2842,7 @@
           the last SetViewport request is still pending, bit one if
           the one before that is still pending, etc.
 
-     void Flush (pScrn)
+     void Sync (pScrn)
 
           This function should ensure that any graphics accelerator
           operations have finished.  This function should not
@@ -3117,7 +3142,7 @@
      typedef void (* StopVideoFuncPtr)(ScrnInfoPtr pScrn,
                pointer data, Bool cleanup)
 
-          This indicates the the driver should stop displaying the
+          This indicates the driver should stop displaying the
           video.  This is used to stop both input and output video.
           The cleanup field indicates that the video is being
           stopped because the client requested it to stop or
@@ -3488,8 +3513,8 @@
                in other situations.
 
                When loading ``external'' modules (modules that
-               don't have the the standard entry point, for
-               example a special shared library) the options
+               don't have the standard entry point, for exam-
+               ple a special shared library) the options
                parameter can be set to EXTERN_MODULE to tell
                the loader not to reject the module when it
                doesn't find the standard entry point.
@@ -3762,11 +3787,11 @@
           if it calls other loader functions that require a refer-
           ence to it.   The remaining arguments are those that were
           passed to the LoadModule() (or LoadSubModule()), and are
-          described above.  When the SetupProc is successful it
-          must return a non-NULL value.  The loader checks this,
-          and if it is NULL it unloads the module and reports the
-          failure to the caller of LoadModule().  If the SetupProc
-          does things that need to be undone when the module is
+          described above. When the SetupProc is successful it must
+          return a non-NULL value.  The loader checks this, and if
+          it is NULL it unloads the module and reports the failure
+          to the caller of LoadModule().  If the SetupProc does
+          things that need to be undone when the module is
           unloaded, it should define a TearDownProc, and return a
           pointer that the TearDownProc can use to undo what has
           been done.
@@ -5246,6 +5271,8 @@
 
      "compiler.h"
 
+Note: in drivers, this must be included after "xf86_ansic.h".
+
 Drivers that need to access PCI vendor/device definitions need this:
 
      "xf86PciInfo.h"
@@ -5425,6 +5452,8 @@
             { -1,               NULL,        OPTV_NONE,    {0}, FALSE }
           };
 
+          #define nZZZOptions (sizeof(ZZZOptions) / sizeof(ZZZOptions[0]))
+
 20.3  Functions
 
 20.3.1  SetupProc
@@ -5570,10 +5599,44 @@
                                  numDevSections, drv, &usedChips);
 
              for (i = 0; i < numUsed; i++) {
-                 ScrnInfoPtr pScrn;
+                 ScrnInfoPtr pScrn = NULL;
+                 if ((pScrn = xf86ConfigPciEntity(pScrn, flags, usedChips[i],
+                                                  ZZZPciChipsets, NULL, NULL,
+                                                  NULL, NULL, NULL))) {
+                    /* Allocate a ScrnInfoRec */
+                    pScrn->driverVersion = VERSION;
+                    pScrn->driverName    = ZZZ_DRIVER_NAME;
+                    pScrn->name          = ZZZ_NAME;
+                    pScrn->Probe         = ZZZProbe;
+                    pScrn->PreInit       = ZZZPreInit;
+                    pScrn->ScreenInit    = ZZZScreenInit;
+                    pScrn->SwitchMode    = ZZZSwitchMode;
+                    pScrn->AdjustFrame   = ZZZAdjustFrame;
+                    pScrn->EnterVT       = ZZZEnterVT;
+                    pScrn->LeaveVT       = ZZZLeaveVT;
+                    pScrn->FreeScreen    = ZZZFreeScreen;
+                    pScrn->ValidMode     = ZZZValidMode;
+                    foundScreen = TRUE;
+                    /* add screen to entity */
+                }
+             }
+             if (numUsed > 0)
+                 xfree(usedChips);
+         }
 
-                 /* Allocate a ScrnInfoRec */
-                 pScrn = xf86AllocateScreen(drv, 0);
+     #ifdef HAS_ISA_DEVS
+         /*
+          * If the driver supports ISA hardware, the following block
+          * can be included too.
+          */
+         numUsed = xf86MatchIsaInstances(ZZZ_NAME, ZZZChipsets,
+                                  ZZZIsaChipsets, drv, ZZZFindIsaDevice,
+                                  devSections, numDevSections, &usedChips);
+         for (i = 0; i < numUsed; i++) {
+             ScrnInfoPtr pScrn = NULL;
+          if ((pScrn = xf86ConfigIsaEntity(pScrn, flags, usedChips[i],
+                               ZZZIsaChipsets, NULL, NULL, NULL,
+                               NULL, NULL))) {
                  pScrn->driverVersion = VERSION;
                  pScrn->driverName    = ZZZ_DRIVER_NAME;
                  pScrn->name          = ZZZ_NAME;
@@ -5587,42 +5650,8 @@
                  pScrn->FreeScreen    = ZZZFreeScreen;
                  pScrn->ValidMode     = ZZZValidMode;
                  foundScreen = TRUE;
-                 /* add screen to entity */
-                 xf86ConfigActivePciEntity(pScrn, usedChips[i],
-                             ZZZPciChipsets, NULL, NULL, NULL, NULL, NULL);
-
              }
-             if (numUsed > 0)
-                 xfree(usedChips);
          }
-
-     #ifdef HAS_ISA_DEVS
-         /*
-          * If the driver supports ISA hardware, the following block
-          * can be included too.
-          */
-         numUsed = xf86MatchIsaInstances(ZZZ_NAME, ZZZChipsets,
-                                  ZZZIsaChipsets, drv, ZZZFindIsaDevice,
-                                  devSections, numDevSections, &usedChips);
-         for (i = 0; i < numUsed; i++) {
-             ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
-
-             pScrn->driverVersion = VERSION;
-             pScrn->driverName    = ZZZ_DRIVER_NAME;
-             pScrn->name          = ZZZ_NAME;
-             pScrn->Probe         = ZZZProbe;
-             pScrn->PreInit       = ZZZPreInit;
-             pScrn->ScreenInit    = ZZZScreenInit;
-             pScrn->SwitchMode    = ZZZSwitchMode;
-             pScrn->AdjustFrame   = ZZZAdjustFrame;
-             pScrn->EnterVT       = ZZZEnterVT;
-             pScrn->LeaveVT       = ZZZLeaveVT;
-             pScrn->FreeScreen    = ZZZFreeScreen;
-             pScrn->ValidMode     = ZZZValidMode;
-             foundScreen = TRUE;
-             xf86ConfigActiveIsaEntity(pScrn, usedChips[i], ZZZIsaChipsets,
-                                       NULL, NULL, NULL, NULL, NULL);
-         }
          if (numUsed > 0)
              xfree(usedChips);
      #endif /* HAS_ISA_DEVS */
@@ -5669,6 +5698,8 @@
      static Bool
      ZZZPreInit(ScrnInfoPtr pScrn, int flags)
      {
+         OptionInfoRec options[nZZZOptions];
+
          /* Fill in the monitor field */
          pScrn->monitor = pScrn->confScreen->monitor;
 
@@ -5747,9 +5778,10 @@
 
          /*
           * Process the options based on the information in ZZZOptions.
-          * The results are written to ZZZOptions.
+          * The results are written to options.
           */
-         xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, ZZZOptions);
+         (void)memcpy(options, ZZZOptions, sizeof(ZZZOptions));
+         xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
          /*
           * Set various fields of ScrnInfoRec and/or ZZZRec based on
@@ -5757,25 +5789,25 @@
           */
          from = X_DEFAULT;
          pZzz->hwCursor = FALSE;
-         if (xf86IsOptionSet(ZZZOptions, OPTION_HW_CURSOR)) {
+         if (xf86IsOptionSet(options, OPTION_HW_CURSOR)) {
              from = X_CONFIG;
              pZzz->hwCursor = TRUE;
          }
          xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
                     pZzz->hwCursor ? "HW" : "SW");
-         if (xf86IsOptionSet(ZZZOptions, OPTION_NOACCEL)) {
+         if (xf86IsOptionSet(options, OPTION_NOACCEL)) {
              pZzz->noAccel = TRUE;
              xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
                         "Acceleration disabled\n");
          } else {
              pZzz->noAccel = FALSE;
          }
-         if (xf86IsOptionSet(ZZZOptions, OPTION_PCI_RETRY)) {
+         if (xf86IsOptionSet(options, OPTION_PCI_RETRY)) {
              pZzz->UsePCIRetry = TRUE;
              xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "PCI retry enabled\n");
          }
          pZzz->fooHack = 0;
-         if (xf86GetOptValInteger(ZZZOptions, OPTION_FOO_HACK,
+         if (xf86GetOptValInteger(options, OPTION_FOO_HACK,
                                   &pZzz->fooHack)) {
              xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Foo Hack set to %d\n",
                         pZzz->fooHack);
@@ -6253,7 +6285,7 @@
          ZZZFreeRec(xf86Screens[scrnIndex]);
      }
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.23 2000/02/15 18:00:57 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.30 2000/06/19 15:00:52 tsi Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/DESIGN,v 1.21 2000/03/01 01:47:59 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/DESIGN,v 1.26 2000/06/19 15:12:26 tsi Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/doc/Imakefile:3.67 xc/programs/Xserver/hw/xfree86/doc/Imakefile:3.68
--- xc/programs/Xserver/hw/xfree86/doc/Imakefile:3.67	Tue Mar  7 21:38:40 2000
+++ xc/programs/Xserver/hw/xfree86/doc/Imakefile	Sat Jun 17 10:44:20 2000
@@ -4,7 +4,7 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Imakefile,v 3.67 2000/03/08 05:38:40 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Imakefile,v 3.68 2000/06/17 17:44:20 dawes Exp $
 
 #include <Server.tmpl>
 #include <lnxdoc.rules>
@@ -78,7 +78,8 @@
 	   Install Status DESIGN
 
 OTHERDOCS = /*VideoModes.doc*/ /*QuickStart.doc*/ /*xinput*/ \
-	    ReadmeFile(fonts) ReadmeFile(mouse) ReadmeFile(DRI)
+	    ReadmeFile(fonts) ReadmeFile(mouse) ReadmeFile(DRI) \
+	    ReadmeFile(DRIcomp)
 #endif
 
 MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) ReadmeFile(DGA) \
Index: xc/programs/Xserver/hw/xfree86/doc/Install
diff -u xc/programs/Xserver/hw/xfree86/doc/Install:1.3 xc/programs/Xserver/hw/xfree86/doc/Install:1.5
--- xc/programs/Xserver/hw/xfree86/doc/Install:1.3	Tue Feb 29 17:48:01 2000
+++ xc/programs/Xserver/hw/xfree86/doc/Install	Sat Jul  1 19:46:26 2000
@@ -1,126 +1,126 @@
-                  Installation Details for XFree86[tm] 4.0
+                 Installation Details for XFree86[tm] 4.0.1
 
                           The XFree86 Project, Inc
 
-                              29 February 2000
+                                30 June 2000
 
                                   Abstract
 
-     This document contains information about installing XFree86 4.0.
+     How to install XFree86.
 
 1.  Introduction
 
-This document contains information about installing XFree86 4.0 binary dis-
-tributions as provided by The XFree86 Project.  The installation procedures
-for binary distributions provided by others may be different.
-
-The XFree86 binary distributions that we provide for UNIX-like OSs are pack-
-aged in the platform-independent gzipped tar format (referred to as "tar-
-balls").  Our tarballs can be identified by the ".tgz" suffix.  We do not
-provide binaries in RPM format or any other platform specific package format.
-If you need them in such a format, you should contact your OS vendor.
-Together with the binary distributions, we provide a customised version of
-GNU tar called "extract", and an installation script.  We recommend that
-these be used to install the binary distributions.
-
-2.  How to get the XFree86 4.0 binary distributions
-
-We, The XFree86 Project, provide XFree86 4.0 binaries for a range of operat-
-ing systems at our ftp site <URL:ftp://ftp.xfree86.org/pub/XFree86/4.0/bina-
-ries/>.  Our ftp site is also mirrored by many sites around the world.  There
-is a sub-directory for each OS/platform that we have binaries for.  The first
-thing you need to do is to decide which of these suits you.  In most cases,
-the choice is straightforward.  In some cases (e.g., Linux) there may be a
-number of choices depending on what architecture or libc version you are
-using.  We recommend that you first download the Xinstall.sh script, and run
-it as follows to find out which binary distribution you should download.
+This document contains information about installing the XFree86 binaries as
+provided by The XFree86 Project.
 
+The XFree86 binaries that we provide for UNIX-like OS's (Linux, the BSDs and
+Solaris) are packaged in a platform-independent gzipped format (aka "tar-
+balls" identified by the .tgz suffix).  Along with the binaries we provide a
+customized version of the GNU tar utility called "extract" and an installa-
+tion script.  We recommend that these be used to install the binaries.
+
+2.  Downloading the XFree86 4.0.1 binaries
+
+We, The XFree86 Project, provide XFree86 4.0.1 binaries for a range of oper-
+ating systems at our ftp site
+<URL:ftp://ftp.xfree86.org/pub/XFree86/4.0.1/binaries/>.  Often during
+releases, our ftp site is heavily loaded.  Instead of downloading directly
+from us we recommend that instead you use one of our mirror sites.  Another
+advantage of using our mirror sites is that some of them support http access
+(ours does not).
+
+Our binaries are organized by sub-directories which correspond to each of the
+OS/platforms for which we provide binaries.  First go to the sub-directory
+that represents your OS Platform. In some cases (e.g., Linux) there may be a
+number of choices depending on the architecture or libc version your platform
+uses.  In all case we recommend that you first download the Xinstall.sh
+script, and run it as in the following example  to find out which binary dis-
+tribution you should download.
+
      sh Xinstall.sh -check
 
-This should tell you which binary distribution is the correct one for your
-system.  Getting this right may save from wasting time downloading the wrong
-distribution.
-
-The next step is to download the necessary files.  The mandatory files for
-all installations are listed below.  All of them must be downloaded to do the
-installation.  The installer script will complain if they are not all pre-
-sent.
-
-          Xinstall.sh      The installer script
-          extract          The utility for extracting tarballs
-          Xbin.tgz         X clients/utilities and run-time libraries
-          Xlib.tgz         Some data files required at run-time
-          Xman.tgz         Manual pages
-          Xdoc.tgz         XFree86 documentation
-          Xfnts.tgz        Base set of fonts
-          Xfenc.tgz        Base set of font encoding data
-          Xetc.tgz         Run-time configuration files
-          Xvar.tgz         Run-time data
-          Xxserv.tgz       XFree86 X server
-          Xmod.tgz         XFree86 X server modules
+The output of this utility tells you which is the correct set of  binaries
+for you to download.   If you are careful with this step you  will save your-
+self a lot  time and trouble  from NOT downloading an incompatible distribu-
+tion.
+
+Once that is done download the necessary files.  The twelve  (12) mandatory
+files for all installations are listed below.  If you have not downloaded all
+of the files, the installer script will complain.
+
+          1.   Xinstall.sh      The installer script
+          2.   extract          The utility for extracting tarballs
+          3.   Xbin.tgz         X clients/utilities and run-time libraries
+          4.   Xlib.tgz         Some data files required at run-time
+          5.   Xman.tgz         Manual pages
+          6.   Xdoc.tgz         XFree86 documentation
+          7.   Xfnts.tgz        Base set of fonts
+          8.   Xfenc.tgz        Base set of font encoding data
+          9.   Xetc.tgz         Run-time configuration files
+          10.  Xvar.tgz         Run-time data
+          11.  Xxserv.tgz       XFree86 X server
+          12.  Xmod.tgz         XFree86 X server modules
 
 NOTES:
 
    o Some web browsers have a problem downloading the extract utility cor-
      rectly.  If you encounter this problem, download the version called
-     extract.exe instead.  The ".exe" suffix is only there to make the trou-
-     blesome web browsers do the right thing.  It is not a DOS/Windows exe-
-     cutable.
+     extract.exe instead.  This should fix the problem.  (This is not a
+     DOS/Windows executable.)
 
    o A few distributions don't have or require the Xvar.tgz tarball.  If it
      is present in the binaries sub-directory for your platform, then it is
      required.
+
+   o Some distributions may have additional mandatory tarballs.  While rare,
+     the installer script will tell you if any are missing.
 
-   o Some distributions may have additional mandatory tarballs.  This is
-     rare.  In these cases, the installer script will tell you if any are
-     missing.
-
-The following tarballs are optional.  You should download the ones you want
-to install.
-
-          Xfsrv.tgz        Font server
-          Xnest.tgz        Nested X server
-          Xprog.tgz        X header files, config files and compile-time libs
-          Xprt.tgz         X Print server
-          Xvfb.tgz         Virtual framebuffer X server
-          Xf100.tgz        100dpi fonts
-          Xfcyr.tgz        Cyrillic fonts
-          Xflat2.tgz       Latin-2 fonts
-          Xfnon.tgz        Some large bitmap fonts
-          Xfscl.tgz        Scalable fonts (Speedo and Type1)
-          Xhtml.tgz        HTML version of the documentation
-          Xps.tgz          PostScript version of the documentation
-          Xjdoc.tgz        Documentation in Japanese
+The following thirteen (13) tarballs are optional.  You should download the
+ones you want to install.
 
+          1.   Xfsrv.tgz        Font server
+          2.   Xnest.tgz        Nested X server
+          3.   Xprog.tgz        X header files, config files and compile-time libs
+          4.   Xprt.tgz         X Print server
+          5.   Xvfb.tgz         Virtual framebuffer X server
+          6.   Xf100.tgz        100dpi fonts
+          7.   Xfcyr.tgz        Cyrillic fonts
+          8.   Xflat2.tgz       Latin-2 fonts
+          9.   Xfnon.tgz        Some large bitmap fonts
+          10.  Xfscl.tgz        Scalable fonts (Speedo and Type1)
+          11.  Xhtml.tgz        HTML version of the documentation
+          12.  Xps.tgz          PostScript version of the documentation
+          13.  Xjdoc.tgz        Documentation in Japanese
+
 NOTES:
 
    o Some distributions may have some additional optional tarballs.
 
-If you miss some and want to install them later, you can do so by following
-the appropriate part of the section that describes manual installation.
+If you miss some and want to install them later, go to the Manual Installa-
+tion (section 4., page 1) section.
 
-3.  Installing XFree86 4.0 using the Xinstall.sh script
+3.  Installing XFree86 4.0.1 using the Xinstall.sh script
 
-We strongly recommend that our XFree86 4.0 binary distributions be installed
-using the Xinstall.sh script that we provide.  The main reason that we make
-this recommendation is that there are a lot of steps in the manual installa-
-tion process, and those steps can vary according to the situation.  There is,
-however, a description of the manual installation process for the most common
-cases below for those who might need it.
+We strongly recommend that our XFree86 4.0.1 binaries be installed using the
+Xinstall.sh script that we provide.  There are a lot of steps in the manual
+installation process, and those steps can vary according to the platform and
+hardware setup.  There is a description of the manual installation process
+for the most common cases below (section 4., page 1).
+
+You must login as the super user (root) to run the installer script.  Place
+all of the downloaded files into a single directory (choose a temporary loca-
+tion with enough space).  Use the cd command to change to that directory and
+then run the installer script as follows:
 
-Put all of the downloaded files into a single directory (choose some tempo-
-rary location with enough space).  Become the super user (root), cd to that
-directory, then run the installer script as follows:
-
      sh Xinstall.sh
 
-Answer the prompts that come up.  If you are missing something that is
-required to run this version of XFree86, the installer may tell you to
-install it before trying again.  If you don't have all of the mandatory files
-listed above, then the installer will tell you which ones are missing and ask
-you to download them before trying again.
+Answer the prompts as they come up.  If you are missing something that is
+required, the installer may tell you to install it before trying again.  If
+the problem is that you did not download all of mandatory files aforemen-
+tioned, then the installer will tell you which ones are missing and ask you
+to download them before proceeding.
 
-3.1  Answering the questions that the installer may ask
+3.1  Questions the installer may ask
 
 The installer asks some questions that may not have obvious answers.  The
 information here should help you answer them.  In most cases, apart from the
@@ -158,12 +158,14 @@
 create the necessary symbolic links.  If you don't want to have these config-
 uration files under /etc/X11, then you should answer "no" when asked about
 it.  Answering "no" here also means that the new configuration files will be
-installed in the old /usr/X11R6/lib/X11 location.  Note: for the rare systems
-that don't have symbolic links, this question will not be asked.  The default
-answer is "yes" because that is best for most situations.  It is our new
-default.  It makes it easier to share the /usr/X11R6 directory between multi-
-ple hosts, and allows it to be mounted read-only.  If you don't need these
-features, then you can safely answer "no" if you don't want them moved.
+installed in the old /usr/X11R6/lib/X11 location.
+
+Note: for the rare systems that don't have symbolic links, this question will
+not be asked.  The default answer is "yes" because that is best for most sit-
+uations.  It is our new default.  It makes it easier to share the /usr/X11R6
+directory between multiple hosts, and allows it to be mounted read-only.  If
+you don't need these features, then you can safely answer "no" if you don't
+want them moved.
 
 When installing over an existing version, you will be prompted before each
 set of configuration files is installed.  If you haven't made any customisa-
@@ -172,8 +174,8 @@
 "no".  If you run into problems later, you may need to manually merge your
 customisations into the the new version of the configuration files.  The con-
 figuration files can all be found in the Xetc.tgz tarball.  See the section
-below about manual installation for information about extracting them sepa-
-rately.
+below (section 4., page 1) about manual installation for information about
+extracting them separately.
 
 After the configuration files have been dealt with, the other mandatory com-
 ponents of the binary distribution will be installed.  This should proceed
@@ -190,12 +192,22 @@
 shared libraries are accessible.  Then the fonts.dir files in some directo-
 ries are updated so that the fonts can be accessed correctly.  Next, the
 installer checks to see if your system has a termcap file or terminfo files.
-If it finds the former, it tells you how my may update the entries in that
+If it finds the former, it tells you how you may update the entries in that
 file.  If it finds the latter, it asks you if you want it to update them for
 you.
 
+You may be asked if you want to create links for the GL libraries and header
+files.  The OpenGL standard on some platforms (Linux in particular) says that
+these should be installed in the standard system locations (/usr/lib and
+/usr/include), so the installer offers to create the appropriate links.  If
+you're running Linux, you should probably answer yes.  For other platforms it
+is your choice.  If you already have another version of libGL in /usr/lib,
+answering "yes" will remove it and replace it with a link to the version we
+supply.  The installer will show you a listing of any existing versions
+before asking if they should be replaced.
+
 Finally, the installer asks you if you want a link created for the rstart
-utility.  On most modern systems, the link isn't essential, so the default
+utility.  On most modern systems the link isn't essential, so the default
 answer is "no".  Answer "yes" if you know that you need it.  If you find
 later that you need it, you can create it easily by running:
 
@@ -206,7 +218,7 @@
 
 The next step is to configure the X server.  That is covered in detail in an
 as-yet unwritten document :-(.  In the meantime, there are two ways to create
-a basic X server configuration file for XFree86 4.0.  One is to run the
+a basic X server configuration file for XFree86 4.0.1.  One is to run the
 xf86config utility.  Another is to use the new -configure X server option:
 
      XFree86 -configure
@@ -220,11 +232,11 @@
 After the X server configuration is done, it may be advisable to reboot,
 especially if you run xdm (or equivalent) or the font server (xfs).
 
-4.  Installing XFree86 4.0 manually
+4.  Installing XFree86 4.0.1 manually
 
-This section describes how to manually install the XFree86 4.0 binary distri-
-butions.  You should only use this method if you know what you're doing.  The
-information here covers some common cases, but not every possible case.
+This section describes how to manually install the XFree86 4.0.1 binary dis-
+tributions.  You should only use this method if you know what you're doing.
+The information here covers some common cases, but not every possible case.
 
 Put all of the downloaded files into a single directory (choose some tempo-
 rary location with enough space).  Become the super user (root).  All of the
@@ -323,7 +335,7 @@
      /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
      /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.4 2000/02/29 18:01:17 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.6 2000/07/02 02:35:27 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/Install,v 1.3 2000/03/01 01:48:01 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/Install,v 1.5 2000/07/02 02:46:26 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/LICENSE
diff -u xc/programs/Xserver/hw/xfree86/doc/LICENSE:1.9 xc/programs/Xserver/hw/xfree86/doc/LICENSE:1.10
--- xc/programs/Xserver/hw/xfree86/doc/LICENSE:1.9	Tue Mar  7 06:55:04 2000
+++ xc/programs/Xserver/hw/xfree86/doc/LICENSE	Sat Jun 17 10:44:20 2000
@@ -595,4 +595,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.7 2000/03/06 22:59:23 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/LICENSE,v 1.9 2000/03/07 14:55:04 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/LICENSE,v 1.10 2000/06/17 17:44:20 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/OS2.Notes
diff -u xc/programs/Xserver/hw/xfree86/doc/OS2.Notes:3.14 xc/programs/Xserver/hw/xfree86/doc/OS2.Notes:3.16
--- xc/programs/Xserver/hw/xfree86/doc/OS2.Notes:3.14	Tue Feb 29 17:48:02 2000
+++ xc/programs/Xserver/hw/xfree86/doc/OS2.Notes	Sat Jun 17 10:44:20 2000
@@ -2,7 +2,7 @@
 
                                  Holger Veit
 
-                       Last modified August 1st, 1999
+                        Last modified March 8th, 2000
 
 1.  Preface
 
@@ -16,17 +16,17 @@
 Please also read README.OS2 for end-user information, and set at least the
 environment variables described there.
 
-At the current time, the most recent version available is XFree86-3.3.5.
-This is a full and unrestricted version which comes with complete source
-code. 3.3.5 is not only a bugfix release, but also supports new hardware,
-some of which might not even supported by OS/2 itself. See the RELEASE NOTES
-document for details.
+At the current time, the most recent version available is XFree86-4.0.  This
+is a full and unrestricted version which comes with complete source code. 4.0
+is a highly experimental release, so many features that might have worked in
+earlier versions, may now no longer work, or work differently.  Be aware that
+for OS/2, XFree86-4.0 is considered to be alpha software.
 
 If you want to join the XFree86 developer team, e.g. to add support for cer-
 tain hardware, please send a request to BOD@XFree86.org. Please think about
 such a step carefully before, though, since much work is involved. Please use
-the XFree86-3.3.5 source code as a test example how to compile the system.
-The ability to manage that is a basic requirement for becoming a developer.
+the XFree86-4.0 source code as a test example how to compile the system. The
+ability to manage that is a basic requirement for becoming a developer.
 
 2.  Tools required
 
@@ -66,6 +66,8 @@
 
    o bison     GNU bison
 
+   o m4   GNU m4
+
    o find GNU find    (attention: incompatible tool with the same name in
      OS/2)
 
@@ -75,7 +77,7 @@
 
 Furthermore, you need the XFree86 sources. These are available from the com-
 mon XFree86 repositories. Look into a directory which is often named
-/pub/XFree86/3.3.5/source.
+/pub/XFree86/4.0/source.
 
 3.  Compiling and Installing
 
@@ -219,9 +221,9 @@
 
 Well, you see, this was quite easy :-)
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml,v 3.6 1999/08/23 06:38:50 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml,v 3.7 2000/04/05 18:13:46 dawes Exp $
 
      $XConsortium: OS2note.sgml /main/1 1996/02/24 10:08:59 kaleb $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/OS2.Notes,v 3.14 2000/03/01 01:48:02 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/OS2.Notes,v 3.16 2000/06/17 17:44:20 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README
diff -u xc/programs/Xserver/hw/xfree86/doc/README:3.102 xc/programs/Xserver/hw/xfree86/doc/README:3.105
--- xc/programs/Xserver/hw/xfree86/doc/README:3.102	Wed Mar  8 12:39:21 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README	Sat Jul  1 19:46:26 2000
@@ -1,97 +1,163 @@
-                         README for XFree86[tm] 4.0
+                        README for XFree86[tm] 4.0.1
 
                           The XFree86 Project, Inc
 
-                              26 February 2000
+                                30 June 2000
 
                                   Abstract
 
-     XFree86 is a port of X11R6.4 that supports several UNIX(R) and
-     UNIX-like operating systems on Intel and other platforms.
+     XFree86 is the Open Source port of X.Org's X11R6.4 release that
+     supports several UNIX(R) and UNIX-like (such as Linux, the BSDs and
+     Solaris x86) operating systems on Intel and other platforms.
+
+1.  What is XFree86 4.0.1?
+
+XFree86 4.0.1 is a the upgrade to the first full release in the new XFree86 4
+series.  Release 4 is a major re-design of the basic architectural underpin-
+nings of XFree86's implementation of the original X Consortium's X Server.
+This re-design allows for a modular interaction between the hardware drivers
+and the XFree86 core X server.  With 4.0, upgrades to the X server with new
+and unsupported hardware can be easily done and installed without undergoing
+the previous process of rebuilding a X server.  All that is required is
+installing the new driver module and updating the configuration file.
+
+The road to XFree86 Release 4 began as an architectural concept in mid 1997,
+with the serious framework being implemented in code the beginning of 1998.
+There were several snapshots on the road to 4.0 which are now part of the 4.0
+base release.  The 4.0.1 version is an upgrade to 4.0, which include more
+hardware ports, code enhancements and bug fixes.
+
+Release 4 also included the long-awaited integration of the DRI (Direct Ren-
+dering Infrastructure).  This upgrade into the code base  gives XFree86 the
+abilities of direct 3-D graphics rendering, used widely in games and other
+visualization programs.
+
+Many drivers used in the old 3.3.x series have not be converted over to the
+4.0 design and so check first whether your hardware is supported before
+upgrading to the 4.0 series in the Driver Status document.
+
+Specific release enhancements can be viewed in the Release Notes.
+
+Information about binary distributions and the attendant installation
+instructions can be found in the Installation Document.
+
+Copyright and Licensing information for this release and all XFree86 releases
+can be found in the License Document.
+
+2.  Joining The Team
+
+2.1  Development
+
+If you would like to work on the development of XFree86 4, either by helping
+with the conversion of our older drivers to the new 4.0 design, or assisting
+in the addition of new drivers or platforms to the code base then send a
+request to to join the XFree86 development team
+<URL:http://www.xfree86.org:/developer.html>.  This will give you direct
+access to the latest XFree86 related development topics and discussions.
+Include in your note, your name, email address, reason for joining (what you
+will work on) and, level of expertise (coder, DRI, core, specific driver) and
+area of interest.
+
+2.2  Documentation
+
+If instead your interests are on the Documentation side of the Project, or
+you want to contribute and are not ready for plunging into the code, you can
+join the Documentation Team (those hardy souls responsible for the content
+you are reading :-).  Amongst the Doc Team's activities are converting our
+SGML based documentation into an XML based one and updating and creating
+technical documentation used by staff and public.  If this sounds interesting
+then please send a request to join the XFree86 documentation team
+<URL:mailto:signup@xfree86.org>.  Include in your note, you name, email
+address, reason for joining (what you will work on) and level of expertise
+and whether you are interested in the tools or content side of the group.
+
+3.  The Public Mailing Lists
+
+3.1  Newbie
+
+For those who are new to XFree86  and want to learn more about our Project we
+recommend that you join our Newbie list, located at Public Mailing Lists
+<URL:http://www.xfree86.org/mailman/listinfo>, where this and other discus-
+sions occur with our senior all-volunteer staff.  This is great forum to get
+introduced to XFree86 and ask for help on how to set up the XServer or
+whether your hardware is supported, and why not?,  and make suggestions for
+future releases of XFree86.  This list is supported by our volunteer staff
+who needs to know how you are using and interacting with XFree86 and what is
+wrong and could be better.  Tell them, they want to know!
+
+3.2  Announce
+
+For those who just want to know  the release schedule this is a good list  to
+join.
+
+3.3  CVS Commit
+
+For those who want to see what has been committed recently to our CVS reposi-
+tory this is the list that will show you those updates.  This list is updated
+dynamically every time the repository is updated after the the commit hap-
+pens.
+
+A followup to the commit list is the soon to be public, patch archives.  This
+archive will be available on our web-site and will show what patches have
+been submitted and will soon be committed.  This is helpful for people who
+are interested in a specific area and want to know what work is happening
+there.  When this goes public we will announce it on our web site and our
+Announce mailing list, so keep watching.
+
+3.4  Xpert
+
+If instead you are the lone developer who is improving XFree86 on an ad hoc
+basis for your particular environment (I want to get my mouse or video card
+to work), and need a specific question asked then you should go over to our
+Xpert list where such questions are raised and answered by our technical
+development staff.  Remember you do not have to be a member to write fixes to
+our code base and if your changes are discrete and self-contained the volume
+of developer mail may just be too noisy.
+
+Once your work is finished (coded, debugged and documented) please send your
+fix to <fixes@XFree86.org>.  This will ensure that they are included in
+future releases. And thanks!  You make this truly an Open group.
+
+4.  How to get XFree86 4.0.1
+
+XFree86 4.0.1 can be found at the XFree86 ftp server
+<URL:ftp://ftp.xfree86.org/pub/XFree86/4.0.1/>, and at mirrors of this
+server.  Information about obtaining and installing binary distributions of
+this release can be found in the Installation Document.  Information about
+obtaining the release in source form is given below.
 
-1.  What is XFree86 4.0?
-
-XFree86 4.0 is the first
- full release of the new XFree86 4 series.  The road to XFree86 4 began in
-mid 1997, with serious work starting in early 1998.  The first pre-4.0 snap-
-shot was released in mid 1999, and 4.0 was released in early 2000.  A lot has
-been completed in that time, and even more has been started since the "4.0"
-design was drafted.  The result is that this release contains a lot of new
-features, some new drivers, and some significant performance improvements.
-This release contains components in various stages of development, ranging
-from stable and well tested to new and not-so-well tested.  One the other
-side, there are drivers from the 3.3.x series that have not yet been ported
-to XFree86 4.  Most of these are for old hardware.  To find more information
-about which hardware is supported, see the Driver Status document.
-
-XFree86 4 uses a very modular design.  We had hoped to finalise and fully
-document the driver module API/ABI in time for the 4.0 release, but instead
-we are planning to have this done for a subsequent release.  We will try
-where possible to retain backward compatibility with the module interfaces in
-4.0 in future releases, but we can't make guarantees about that until the
-interfaces have been fully documented.
-
-Information on this release's features and their status can be found in the
-Release Notes.
-
-Information about obtaining and installing binary distributions of this
-release can be found in the Installation Document.
-
-Copyright and Licensing information for this release can be found in the
-License Document.
-
-2.  Developers
-
-If you would like to work on the development of XFree86 4, then it is recom-
-mended that you join the XFree86 development team
-<URL:http://www.xfree86.org:/developer.html>.  That way you will have access
-to the latest source and to other developers.
-
-3.  How to get XFree86 4.0
-
-XFree86 4.0 can be found at the XFree86 ftp server
-<URL:ftp://ftp.xfree86.org/pub/XFree86/4.0/>, and at mirrors of this server.
-Information about obtaining and installing binary distributions of this
-release can be found in the Installation Document.  Information about obtain-
-ing the release in source form is given below.
-
-The source for version 4.0 is split into three tarballs: X400src-1.tgz,
-X400src-2.tgz, X400src-3.tgz.  The first contains everything except the fonts
+The source for version 4.0.1 is split into three tarballs: X401src-1.tgz,
+X401src-2.tgz, X401src-3.tgz.  The first contains everything except the fonts
 and general X11 documentation.  It is sufficient for building XFree86 is you
 already have a set of fonts.  The second contains the fonts and the source
 for the general X11 documentation.  The third contains the general X11 docu-
 mentation in hardcopy format.
 
-A source patch relative to version 3.9.18 is also available.  Because of its
-size, it is split into two parts.  The patch files are 3.9.18-4.0.diff1.gz
-and 3.9.18-4.0.diff2.gz.  These patches should be applied to a clean 3.9.18
-source tree, working from the directory containing the xc/ directory.  The
-patches should be applied by running:
+A source patch relative to version 4.0 is also available.  Because of its
+size, it is split into two parts.  The patch files are 4.0-4.0.1.diff1.gz and
+4.0-4.0.1.diff2.gz.  These patches should be applied to a clean 4.0 source
+tree, working from the directory containing the xc/ directory.  The patches
+should be applied by running:
 
-     gunzip < 3.9.18-4.0.diff1.gz | patch -p0 -E
-     gunzip < 3.9.18-4.0.diff2.gz | patch -p0 -E
+     gunzip < 4.0-4.0.1.diff1.gz | patch -p0 -E
+     gunzip < 4.0-4.0.1.diff2.gz | patch -p0 -E
 
-The contrib part of the distribution has now been folded into the main source
+The contrib part of the distribution has been folded into the main source
 tree, so a separate contrib tarball is no longer required.
 
-To format the XFree86 documentation, the latest version of our doctools pack-
-age.  That is available as doctools-1.1.2.tgz.
+To format the XFree86 documentation use the latest version of our doctools
+package available as doctools-1.1.3.tgz.
 
-4.  Reporting Bugs
+5.  Reporting Bugs
 
 Bugs should be reported to <XFree86@XFree86.org>.  Before reporting bugs,
 please check the X server log file, which can be found at
 /var/log/XFree86.0.log on most platforms.  If you can't resolve the problem
-yourself, send the entire log file with your bug report.  Please don't edit
-out what you think might not be important.  The information contained in the
-log file is there to make it easier for the developers to determine what is
-going wrong when there are problems.
-
-If you have patches (bug fixes or enhancements, etc) that you'd like to sub-
-mit for inclusion in a future version of XFree86, please send them to
-<fixes@XFree86.org>.
+yourself, send the entire log file with your bug report but not the operating
+system core dump.  Do not edit  the log file as our developers use it to
+reproduce and debug your problem.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.103 2000/03/08 20:36:43 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.106 2000/07/02 02:35:27 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README,v 3.102 2000/03/08 20:39:21 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README,v 3.105 2000/07/02 02:46:26 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.DECtga
diff -u xc/programs/Xserver/hw/xfree86/doc/README.DECtga:3.15 xc/programs/Xserver/hw/xfree86/doc/README.DECtga:3.16
--- xc/programs/Xserver/hw/xfree86/doc/README.DECtga:3.15	Tue Mar  7 06:55:05 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.DECtga	Sat Jun 17 10:44:20 2000
@@ -6,8 +6,8 @@
 
 1.  DEC 21030
 
-   o The DEC 21030 is supported by XFree86 4.0.  The driver is now partially
-     accelerated.  The built-in graphics on the Multia is supported in
+   o The DEC 21030 is supported by XFree86 4.0.1.  The driver is now par-
+     tially accelerated.  The built-in graphics on the Multia is supported in
      8-plane mode, and PCI cards with 8 or 16 MB framebuffers are supported
      in 24-plane mode.  TGA2 (aka PowerStorm 3D30/4D20) cards are not cur-
      rently supported.
@@ -65,4 +65,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.9 2000/03/06 22:59:23 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DECtga,v 3.15 2000/03/07 14:55:05 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DECtga,v 3.16 2000/06/17 17:44:20 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.DRI
diff -u xc/programs/Xserver/hw/xfree86/doc/README.DRI:1.4 xc/programs/Xserver/hw/xfree86/doc/README.DRI:1.6
--- xc/programs/Xserver/hw/xfree86/doc/README.DRI:1.4	Wed Mar  8 12:39:22 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.DRI	Sat Jun 17 10:44:20 2000
@@ -1,8 +1,8 @@
-                               DRI Users Guide
+                               DRI User Guide
 
                            Precision Insight, Inc.
 
-                                6 March 2000
+                                 18 May 2000
 
 1.  Preamble
 
@@ -24,8 +24,9 @@
 Intel is a registered trademark of Intel Corporation.  3Dlabs, GLINT, and
 Oxygen are either registered trademarks or trademarks of 3Dlabs Inc. Ltd.
 3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of 3dfx Inter-
-active, Incorporated.  All other trademarks mentioned are the property of
-their respective owners.
+active, Incorporated.  Matrox is a registered trademark of Matrox Electronic
+Systems Ltd.  ATI Rage is a registered trademark of ATI Technologies, Inc.
+All other trademarks mentioned are the property of their respective owners.
 
 2.  Introduction
 
@@ -39,9 +40,11 @@
 OpenGL.  See the resources section at the end for more documentation and
 software downloads.
 
-This document does not cover compilation or installation of XFree86 4.0; it
+This document does not cover compilation or installation of XFree86 4.0.  It
 is assumed that you've already installed a Linux distribution which includes
-XFree86 4.0.
+XFree86 4.0 or that you're an experienced Linux developer who has compiled
+the DRI for himself.  DRI download, compilation and installation instructions
+can be found at http://dri.sourceforge.net/DRIcompile.html
 
 3.  Supported Hardware
 
@@ -49,7 +52,8 @@
 CPUs.  Support for Alpha, and perhaps other CPUs, should be available in the
 future.
 
-XFree86 4.0 includes 3D acceleration for the following graphics hardware:
+XFree86 4.0 (or later versions) includes 3D acceleration for the following
+graphics hardware:
 
    o 3dfx:
 
@@ -70,24 +74,54 @@
      There are many configurations of 3dfx cards on the market.  Not all have
      been tested.
 
-   o 3Dlabs Oxygen GMX 2000 (MX/Gamma based)
+   o Matrox:
 
-Support for the following hardware is underway:
+        o Matrox G200
+
+        o Matrox G400
 
    o Intel i810
+
+        o i810
+
+        o i810-dc100
 
-   o Matrox G400
+        o i810e
 
    o ATI Rage 128
 
+        o Rage Fury AGP
+
+        o Rage Magnum AGP
+
+        o XPERT 2000 AGP
+
+        o XPERT 128 AGP
+
+        o XPERT 99 AGP
+
+        o All-in-Wonder 128 AGP
+
+     The PCI versions of these cards also have minimal support.  Note that
+     there are also Rage 128 Pro based boards on the market, and these are
+     not yet supported.
+
+   o 3Dlabs Oxygen GMX 2000 (MX/Gamma based)
+
+Support for the following hardware is underway:
+
    o 3dfx Voodoo4 and Voodoo5 series
 
 4.  Prerequisite Software
 
    o XFree86 4.0
+
+   o For the 3dfx Voodoo3 driver, Linux kernel 2.2.x (later kernels will be
+     supported in the near future, and may be required for some chipsets)
+
+   o For the Matrox G200/G400, Linux kernel 2.3.51, with AGP support
 
-   o Linux kernel 2.2.x (later kernels will be supported in the near future,
-     and may be required for some chipsets)
+   o For the Intel i810, Linux kernel 2.3.99-pre6, with AGP support
 
 Mesa 3.3 (beta) is included with XFree86 4.0; there is no need to download
 the stand-alone Mesa distribution.
@@ -99,19 +133,17 @@
 
 5.1  Kernel module
 
-Before starting the X server you must install the correct kernel module for
-your hardware.
+XFree86 4.0.1 added automatic kernel module loading to the X server.  On
+Linux, the X server uses modprobe to load kernel modules.  The DRM kernel
+modules should be in /lib/modules/KERNEL-VERSION/misc/ for automatic loading
+to work.
 
-This can be done by executing the following as root:
+Optionally, DRM kernel modules can be loaded manually with insmod prior to
+starting the X server.
 
-             insmod XXX/drivername.o
+You can verify that the kernel module was installed with lsmod, checking the
+X server startup log, and checking that /proc/dri/0 exists.
 
-For example, on 3dfx hardware, the kernel module is called tdfx.o so you you
-would type insmod XXX/tdfx.o
-
-Verify that the kernel module was installed by checking that /proc/dri/0
-exists.
-
 5.2  XF86Config file
 
 First, the XF86Config file must load the GLX and DRI modules:
@@ -163,7 +195,9 @@
 /dev/dri command.]
 
 Next, the Device section of the XF86Config file must describe your particular
-hardware.  For example, here's the Device section for a 3dfx Voodoo3 card:
+hardware.
+
+For example, here's the Device section for a 3dfx Voodoo3 card:
 
              Section "Device"
                  Identifier  "Voodoo3"
@@ -171,6 +205,32 @@
                  Driver      "tdfx"
              EndSection
 
+Here's the Device section for a Matrox G400 card:
+
+          Section "Device"
+              Identifier  "G400"
+              VendorName  "Matrox"
+              Driver      "mga"
+              VideoRam    32768
+          EndSection
+
+Here's the Device section for an ATI Rage 128 card:
+
+          Section "Device"
+              Identifier  "Rage128"
+              VendorName  "ATI"
+              Driver      "r128"
+          EndSection
+
+Here's the Device section for an Intel i810 motherboard:
+
+          Section "Device"
+              Identifier  "i810"
+              VendorName  "Intel"
+              Driver      "i810"
+              VideoRam    10000
+          EndSection
+
 Finally, the Screen section of the XF86Config file may have to be specially
 configured as well.  For example, Voodoo3 hardware acceleration is only
 available in 16bpp mode.
@@ -187,6 +247,10 @@
               EndSubsection
              EndSection
 
+Replace Voodoo3 with G400 for Matrox G400.
+
+Replace Voodoo3 with Rage128 for ATI Rage 128.
+
 If there are errors in the XF86Config file, the X server will log errors to
 the file /var/log/XFree86.0.log
 
@@ -250,9 +314,24 @@
 
 if means that the libGL.so.1 file is not the right location.  Proceed to the
 trouble shooting section.
+
+6.4  libOSMesa.so
+
+OSMesa (Off-Screen Mesa) is an interface and driver for rendering 3D images
+into a user-allocated block of memory rather than an on-screen window.
+
+libOSMesa.so implements the OSMesa interface and must be linked with your
+application if you want to use the OSMesa functions.  You must also link with
+libGL.so.  For example:
+
+             gcc osdemo.c -L/usr/X11R6/lib -lOSMesa -lGLU -lGL -o osdemo
 
-6.4  glxinfo
+In stand-alone Mesa this interface was compiled into the monolithic libGL.so
+(formerly libMesaGL.so) library.  In XFree86 4.0.1 and later this interface
+is implemented in a separate library.
 
+6.5  glxinfo
+
 glxinfo is a useful program for checking which version of libGL you're using
 as well as which DRI-based driver.  Simply type glxinfo and examine the
 OpenGL vendor, renderer, and version lines.  Among the output you should see
@@ -279,7 +358,7 @@
 determine which visuals may have depth buffers, stencil buffers, accumulation
 buffers, etc.
 
-6.5  Environment Variables
+6.6  Environment Variables
 
 The libGL.so library recognizes three environment variables.  Normally, none
 of them need to be defined.  If you're using the csh or tcsh shells, type
@@ -287,17 +366,20 @@
 bash, type export VARNAME=value.
 
   1.  LIBGL_DEBUG, if defined will cause libGL.so to print error and diagnos-
-      tic messages.  This can help to solve problems.
+      tic messages.  This can help to solve problems.  Setting LIBGL_DEBUG to
+      verbose may provide additional information.
 
   2.  LIBGL_ALWAYS_INDIRECT, if defined this will force libGL.so to always
       use indirect rendering instead of hardware acceleration.  This can be
       useful to isolate rendering errors.
 
-  3.  LIBGL_DRIVERS_DIR can be used to override the default directory which
-      is searched for 3D drivers.  In a typical XFree86 installation, the 3D
-      drivers should be in /usr/X11R6/lib/modules/dri/.  This environment
-      variable can be used to specify a different directory.  Note that this
-      feature is disabled for set-uid programs.
+  3.  LIBGL_DRIVERS_PATH can be used to override the default directories
+      which are searched for 3D drivers.  The value is one or more paths sep-
+      arated by colons.  In a typical XFree86 installation, the 3D drivers
+      should be in /usr/X11R6/lib/modules/dri/ and LIBGL_DRIVERS_PATH need
+      not be defined.  Note that this feature is disabled for set-uid pro-
+      grams.  This variable replaces the LIBGL_DRIVERS_DIR env var used in
+      XFree86 4.0.
 
 Mesa-based drivers (this includes most of the drivers listed above) also
 observe many of the existing Mesa environment variables.  These include the
@@ -431,14 +513,48 @@
 bleshooting.
 
 8.1  3dfx Voodoo3
+
+8.1.1  Configuration
+
+Your XF86Config file's device section must specify the tdfx device:
+
+             Section "Device"
+                 Identifier  "Voodoo3"
+                 VendorName  "3dfx"
+                 Driver      "tdfx"
+             EndSection
 
-8.1.1  Troubleshooting
+The Screen section should then reference the Voodoo3 device:
 
+          Section "Screen"
+              Identifier  "Screen 1"
+              Device      "Voodoo3"
+              Monitor     "High Res Monitor"
+              DefaultDepth 16
+              Subsection "Display"
+               Depth       16
+               Modes       "1280x1024" "1024x768" "800x600" "640x480"
+               ViewPort    0 0
+              EndSubsection
+             EndSection
+
+The kernel module for the Voodoo3 is named tdfx.o and should be installed in
+/lib/modules/KERNEL-VERSION/misc/.  It will be automatically loaded by the
+Xserver if needed.
+
+The DRI 3D driver for the Voodoo3 should be in /usr/X11R6/lib/mod-
+ules/dri/tdfx_dri.so.  This will be automatically loaded by libGL.so.
+
+8.1.2  Troubleshooting
+
    o 3D acceleration for Voodoo3 is only supported in the 16 bit/pixel screen
      mode.  Use xdpyinfo to verify that all your visuals are depth 16.  Edit
      your XF86Config file if needed.
+
+   o The /dev/3dfx device is not used for DRI; it's only for Glide on older
+     3dfx hardware.
 
-8.1.2  Performance
+8.1.3  Performance
 
    o Normally, buffer swapping in double-buffered applications is synchro-
      nized to your monitor's refresh rate.  This may be overridden by setting
@@ -452,17 +568,163 @@
      Performer Town demo, may become sluggish when falling back to software
      rendering to render in that mode.
 
-8.1.3  Known Problems
+8.1.4  Known Problems
 
+   o Glide cannot be used directly; only OpenGL-based programs are supported
+     on the Voodoo3.
+
    o SSystem has problems because of poorly set near and far clipping planes.
      The office.unc Performer model also suffers from this problem.
 
 8.2  Intel i810
+
+8.2.1  Configuration
 
-8.3  Matrox G400
+Your XF86Config file's device section must specify the i810 device, and spec-
+ify a usable amount of video ram to reserve.
 
+             Section "Device"
+                 Identifier  "i810"
+                 VendorName  "Intel"
+                 Driver      "i810"
+              VideoRam    10000
+             EndSection
+
+The Screen section should then reference the i810 device:
+
+          Section "Screen"
+              Identifier  "Screen 1"
+              Device      "i810"
+              Monitor     "High Res Monitor"
+              DefaultDepth 16
+              Subsection "Display"
+               Depth       16
+               Modes       "1280x1024" "1024x768" "800x600" "640x480"
+               ViewPort    0 0
+              EndSubsection
+             EndSection
+
+The kernel module for the i810 is named i810.o and should be installed in
+/lib/modules/KERNEL-VERSION/misc/.  It will be automatically loaded by the
+Xserver if needed.
+
+The DRI 3D driver for the i810 should be in /usr/X11R6/lib/mod-
+ules/dri/i810_dri.so.  This will be automatically loaded by libGL.so.
+
+8.2.2  Troubleshooting
+
+   o 3D acceleration for the i810 is only available in the 16 bit/pixel
+     screen mode at this time.  32bpp acceleration is not supported by this
+     hardware.  Use xdpyinfo to verify that all your visuals are depth 16.
+     Edit your XF86Config file if needed.
+
+   o The i810 uses system ram for video and 3d graphics.  The X server will
+     ordinarily reserve 4mb of ram for graphics, which is too little for an
+     effective 3d setup.  To tell the driver to use a larger amount, specify
+     a VideoRam option in the Device section of your XF86Config file.  A num-
+     ber between 10000 and 16384 seems adequate for most requirements.  If
+     too little memory is available for DMA buffers, back and depth buffers
+     and textures, direct rendering will be disabled.
+
+8.3  Matrox G200 and G400
+
+8.3.1  Configuration
+
+Your XF86Config file's device section must specify the mga device:
+
+             Section "Device"
+                 Identifier  "MGA"
+                 VendorName  "Matrox"
+                 Driver      "mga"
+             EndSection
+
+The Screen section should then reference the MGA device:
+
+          Section "Screen"
+              Identifier  "Screen 1"
+              Device      "MGA"
+              Monitor     "High Res Monitor"
+              DefaultDepth 16
+              Subsection "Display"
+               Depth       16
+               Modes       "1280x1024" "1024x768" "800x600" "640x480"
+               ViewPort    0 0
+              EndSubsection
+             EndSection
+
+The kernel module for the G200/G400 is named mga.o and should be installed in
+/lib/modules/KERNEL-VERSION/misc/.  It will be automatically loaded by the
+Xserver if needed.
+
+The DRI 3D driver for the G200/G400 should be in /usr/X11R6/lib/mod-
+ules/dri/mga_dri.so.  This will be automatically loaded by libGL.so.
+
+8.3.2  Troubleshooting
+
+   o 3D acceleration for the G200 and G400 is only supported in the 16
+     bit/pixel screen mode at this time.  32bpp will be supported in the
+     future.  Use xdpyinfo to verify that all your visuals are depth 16.
+     Edit your XF86Config file if needed.
+
+8.3.3  Performance
+
+No data at this time.
+
+8.3.4  Known Problems
+
+   o Multitexture is currently disabled on the G400 to work around a hardware
+     lockup bug.  This should be restored in a subsequent release.
+
 8.4  ATI Rage 128
 
+8.4.1  Configuration
+
+Your XF86Config file's device section must specify the r128 device:
+
+             Section "Device"
+                 Identifier  "Rage128"
+                 VendorName  "ATI"
+                 Driver      "r128"
+             EndSection
+
+The Screen section should then reference the Rage 128 device:
+
+          Section "Screen"
+              Identifier  "Screen 1"
+              Device      "Rage128"
+              Monitor     "High Res Monitor"
+              DefaultDepth 16
+              Subsection "Display"
+               Depth       16
+               Modes       "1280x1024" "1024x768" "800x600" "640x480"
+               ViewPort    0 0
+              EndSubsection
+              Subsection "Display"
+               Depth       32
+               Modes       "1280x1024" "1024x768" "800x600" "640x480"
+               ViewPort    0 0
+              EndSubsection
+             EndSection
+
+The kernel module for the Rage 128 is named r128.o and should be installed in
+/lib/modules/KERNEL-VERSION/misc/.  It will be automatically loaded by the
+Xserver if needed.
+
+The DRI 3D driver for the Rage 128 should be in /usr/X11R6/lib/mod-
+ules/dri/r128_dri.so.  This will be automatically loaded by libGL.so.
+
+You may also set your screen depth to 32 for 32bpp mode.
+
+8.4.2  Performance
+
+While PCI Rage 128 based cards are supported, they do not yet support PCI
+GART, so they will not perform as well as their AGP counterparts.
+
+8.4.3  Known Problems
+
+DGA is not yet supported in the ATI Rage 128 X server.  This feature will be
+added in a future release.
+
 8.5  3DLabs Oxygen GMX 2000
 
 The driver for this hardware was experimental and is no longer being devel-
@@ -501,8 +763,41 @@
 ing.  This is due to an interaction problem with the Linux scheduler which
 will be addressed in the future.
 
-9.5  Bug Database
+9.5  libGL.so and dlopen()
 
+A number of popular OpenGL applications on Linux (such as Quake3, HereticII,
+Heavy Gear 2, etc) dynamically open the libGL.so library at runtime with
+dlopen(), rather than linking with -lGL at compile/link time.
+
+If dynamic loading of libGL.so is not implemented carefully, there can be a
+number of serious problems.  Here are the things to be careful of in your
+application:
+
+   o Specify the RTLD_GLOBAL flag to dlopen().  If you don't do this then
+     you'll likely see a runtime error message complaining that _glapi_Con-
+     text is undefined when libGL.so tries to open a hardware-specific
+     driver.  Without this flag, nested opening of dynamic libraries does not
+     work.
+
+   o Do not close the library with dlclose() until after XCloseDisplay() has
+     been called.  When libGL.so initializes itself it registers several
+     callbacks functions with Xlib.  When XCloseDisplay() is called those
+     callback functions are called.  If libGL.so has already been unloaded
+     with dlclose() this will cause a segmentation fault.
+
+   o Your application should link with -lpthread.  On Linux, libGL.so uses
+     the pthreads library in order to provide thread safety.  There is appar-
+     ently a bug in the dlopen()/dlclose() code which causes crashes if the
+     library uses pthreads but the parent application doesn't.  The only
+     known work-around is to link the application with -lpthread.
+
+Some applications don't yet incorporate these procedures and may fail.  For
+example, changing the graphics settings in some video games will expose this
+problem.  The DRI developers are working with game vendors to prevent this
+problem in the future.
+
+9.6  Bug Database
+
 The DRI bug database which includes bugs related to specific drivers is at
 the SourceForge DRI Bug Database
 
@@ -529,16 +824,18 @@
    o Visit the DRI project on SourceForge.net for the latest development news
      about the DRI and 3D drivers.
 
+   o The DRI Compilation Guide explains how to download, compile and install
+     the DRI for yourself.
+
 10.3  Support
 
    o The DRI-users mailing list at SourceForge is a forum for people to dis-
      cuss DRI problems.
-
-   o XXX IHV support?
 
-   o XXX Linux distro support?
+   o In the future there may be IHV and Linux vendor support resources for
+     the DRI.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.3 2000/03/08 05:38:41 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.5 2000/06/17 00:03:17 martin Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.4 2000/03/08 20:39:22 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.6 2000/06/17 17:44:20 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp:3.1
--- /dev/null	Sat Jul  1 20:42:41 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp	Sat Jun 17 10:44:20 2000
@@ -0,0 +1,417 @@
+                            DRI Compilation Guide
+
+                           Precision Insight, Inc.
+
+                                 18 May 2000
+
+1.  Preamble
+
+1.1  Copyright
+
+Copyright © 2000 by Precision Insight, Inc., Cedar Park, Texas.  All Rights
+Reserved.
+
+Permission is granted to make and distribute verbatim copies of this document
+provided the copyright notice and this permission notice are preserved on all
+copies.
+
+1.2  Trademarks
+
+OpenGL is a registered trademark and SGI is a trademark of Silicon Graphics,
+Inc.  Unix is a registered trademark of The Open Group.  The `X' device and X
+Window System are trademarks of The Open Group.  XFree86 is a trademark of
+The XFree86 Project.  Linux is a registered trademark of Linus Torvalds.
+Intel is a registered trademark of Intel Corporation.  3Dlabs, GLINT, and
+Oxygen are either registered trademarks or trademarks of 3Dlabs Inc. Ltd.
+3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of 3dfx Inter-
+active, Incorporated.  Matrox is a registered trademark of Matrox Electronic
+Systems Ltd.  ATI Rage is a registered trademark of ATI Technologies, Inc.
+All other trademarks mentioned are the property of their respective owners.
+
+2.  Introduction
+
+This document describes how to download, compile and install the DRI project.
+This information is intended for experienced Linux developers.  Beginners are
+probably better off installing precompiled packages.
+
+Edits, corrections and updates to this document may be mailed to brian@preci-
+sioninsight.com.
+
+3.  Prerequisites
+
+You'll need the following:
+
+   o At least 400MB of free disk space.  More is needed if you want to build
+     with debugging information or keep several build trees.
+
+   o A fast system.  Using a PIII-550 it takes about 1/2 hour to build every-
+     thing.
+
+   o GCC compiler and related tools.
+
+   o ssh (secure shell) for registered developer downloading of the DRI
+     source tree
+
+For 3dfx Voodoo3 hardware, you'll also need:
+
+   o Glide3x headers and runtime library if you want to use the 3dfx driver.
+     These can be obtained from linux.3dfx.com.
+
+   o Linux kernel 2.2.x.  The DRI developers have been using stock RedHat 6.1
+     systems (kernel 2.2.12-20).  Later kernel versions will be supported in
+     the future.
+
+For Matrox G200/G400 hardware, you'll also need:
+
+   o Linux kernel 2.3.51.  Older kernel versions will not work.
+
+For Intel i810 hardware, you'll also need:
+
+   o Linux kernel 2.3.99-pre6.  Older kernel versions will not work.
+
+For ATI Rage hardware, you'll also need:
+
+   o Linux kernel 2.3.51.  Other kernel versions may work but this one is
+     known to work.
+
+4.  Kernel preparation
+
+You may have to upgrade your Linux kernel in order to use the DRI.  This is
+because you need a kernel version which supports AGP.  Building a new Linux
+kernel can be difficult for beginners but there are resources on the Internet
+to help.  This document assumes experience with configuring, building and
+installing Linux kernels.
+
+Linux kernels can be downloaded from www.kernel.org
+
+Download the needed kernel and put it in /usr/src.  Create a directory for
+the source and unpack it.  For example:
+
+                 cd /usr/src
+              rm -f linux
+                 mkdir linux-2.3.51
+                 ln -s linux-2.3.51 linux
+                 bzcat linux-2.3.51.tar.bz2 | tar xf -
+
+Now configure your kernel.  You might, for example, use make menuconfig and
+do the following:
+
+   o Go to Code maturity level options
+
+   o Enable Prompt for development and/or incomplete code/drivers
+
+   o hit ESC
+
+   o Go to Character devices
+
+   o Disable Direct Rendering Manager (XFree86 DRI support) since we'll use
+     the DRI module from the XFree86/DRI tree.
+
+   o Go to /dev/agpgart (AGP Support) (EXPERIMENTAL) (NEW)
+
+   o Hit SPACE twice
+
+   o Enable all chipsets' support for AGP
+
+It's recommended that you turn on MTRRs under Processor type and Features,
+but not required.
+
+Configure the rest of the kernel as required for your system (i.e. Ethernet,
+SCSI, etc)
+
+Exit, saving your kernel configuration.
+
+Edit your /etc/lilo.conf file.  Make sure you have an image entry as follows
+(or similar):
+
+                 image=/boot/vmlinuz
+                       label=linux.2.3.51
+                       read-only
+                       root=/dev/hda1
+
+The important part is that you have /boot/vmlinuz without a trailing version
+number.  If this is the first entry in your /etc/lilo.conf AND you haven't
+set a default, then this will be your default kernel.
+
+Now compile the new kernel:
+
+                 cd /usr/src/linux-2.3.51
+                 make dep ; make bzImage
+                 make modules ; make modules_install
+                 make install
+
+Note that the final part, make install, will automatically run lilo for you.
+
+Now reboot to use this new kernel.
+
+5.  Downloading the XFree86/DRI CVS Sources
+
+The DRI project is hosted by VA Linux Systems' SourceForge.  The DRI source
+code, which is a subset of the XFree86 source tree, is kept in a CVS reposi-
+tory there.
+
+The DRI CVS sources may be accessed either anonymously or as a registered
+SourceForge user.  It's recommended that you become a registered SourceForge
+user so that you may submit non-anonymous bug reports and can participate in
+the mailing lists.
+
+5.1  Anonymous CVS download:
+
+  1.  Create a directory to store the CVS files:
+
+                       cd ~
+                       mkdir DRI-CVS
+
+      You could put your CVS directory in a different place but we'll use
+      ~/DRI-CVS/ here.
+
+  2.  Check out the CVS sources:
+
+                       cd ~/DRI-CVS
+                       cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login
+                         (hit ENTER when prompted for a password)
+                       cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc
+
+      The -z3 flag causes compression to be used in order to reduce the down-
+      load time.
+
+5.2  Registered CVS download:
+
+  1.  Create a directory to store the CVS files:
+
+                       cd ~
+                       mkdir DRI-CVS
+
+      You could put your CVS directory in a different place but we'll use
+      ~/DRI-CVS/ here.
+
+  2.  Set the CVS_RSH environment variable:
+
+                       setenv CVS_RSH ssh      // if using csh or tcsh
+                       export CVS_RSH=ssh      // if using sh or bash
+
+  3.  Check out the CVS sources:
+
+                       cd ~/DRI-CVS
+                       cvs -z3 -dYOURID@cvs.dri.sourceforge.net:/cvsroot/dri co xc
+
+      Replace YOURID with your CVS login name.  You'll be prompted to enter
+      your sourceforge password.
+
+      The -z3 flag causes compression to be used in order to reduce the down-
+      load time.
+
+6.  Updating your CVS sources
+
+In the future you'll want to occasionally update your local copy of the DRI
+source code to get the latest changes.  This can be done with:
+
+                 cd ~/DRI-CVS
+                 cvs -z3 update -dA xc
+
+The -d flag causes any new subdirectories to be created and -A causes most
+recent trunk sources to be fetched, not branch sources.
+
+7.  Compiling the XFree86/DRI tree
+
+7.1  Make a build tree
+
+Rather than placing object files and library files right in the source tree,
+they're instead put into a parallel build tree.  The build tree is made with
+the lndir command:
+
+                 cd ~/DRI-CVS
+                 ln -s xc XFree40
+                 mkdir build
+                 cd build
+                 lndir -silent -ignorelinks ../XFree40
+
+The build tree will be populated with symbolic links which point back into
+the CVS source tree.
+
+Advanced users may have several build trees for compiling and testing with
+different options.
+
+7.2  Edit the host.def file
+
+The ~/DRI-CVS/build/xc/config/cf/host.def file is used to configure the
+XFree86 build process.  You can change it to customize your build options or
+make adjustments for your particular system configuration
+
+The default host.def file will look something like this:
+
+                 #define DefaultCCOptions -Wall
+                 #define DefaultGcc2i386Opt -O2
+                 #define LibraryCDebugFlags -O2
+                 #define BuildServersOnly YES
+                 #define XF86CardDrivers vga tdfx mga r128 i810
+                 #define LinuxDistribution LinuxRedHat
+                 #define DefaultCCOptions -ansi GccWarningOptions -pipe
+                 #define BuildXF86DRI YES
+                 #define HasGlide3 YES
+                 /* Optionally turn these on for debugging */
+                 /* #define GlxBuiltInTdfx YES */
+                 /* #define GlxBuiltInMga YES */
+                 /* #define GlxBuiltInR128 YES */
+                 /* #define DoLoadableServer NO */
+                 #define SharedLibFont NO
+
+The ProjectRoot variable specifies where the XFree86 files will be installed.
+You probably don't want to use /usr/X11R6/ because that would overwrite your
+default X files.  The following is recommended:
+
+                 #define ProjectRoot /usr/XF86-main
+
+Especially note the XF86CardDrivers line to be sure your driver is listed.
+
+If you have 3dfx hardware be sure that the Glide 3x headers are installed in
+/usr/include/glide3/ and that the Glide 3x library is installed at
+/usr/lib/libglide3x.so.
+
+If you do not have 3dfx hardware comment out the HasGlide3 line in host.def.
+
+7.3  Compile
+
+To compile the complete DRI tree:
+
+                 cd ~/DRI-CVS/build/xc/
+                 make World >& World.LOG
+
+Or if you want to watch the compilation progress:
+
+                 cd ~/DRI-CVS/build/xc/
+                 make World >& World.LOG &
+                 tail -f World.LOG
+
+With the default compilation flags it's normal to get a lot of warnings dur-
+ing compilation.
+
+Building will take some time so you may want to go check your email or visit
+slashdot.
+
+7.4  Check for compilation errors
+
+Using your text editor, examine World.LOG for errors by searching for the
+pattern ***.
+
+Verify that the DRI kernel module(s) for your system were built:
+
+               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
+               ls
+
+For the 3dfx Voodoo, you should see tdfx.o.  For the Matrox G200/G400, you
+should see mga.o.  For the ATI Rage 128, you should see r128.o.  For the
+Intel i810, you should see i810.o.
+
+If the DRI kernel module(s) failed to build you should verify that you're
+using the right version of the Linux kernel.  The most recent kernels are not
+always supported.
+
+If your build machine is running a different version of the kernel than your
+target machine (i.e. 2.2.12-20 vs. 2.3.99-pre6), make will select the wrong
+kernel headers. This can be fixed by explicitly setting the value of TREE.
+If the path to your kernel source is /bigdisk/linux-2.3.99-pre6,
+
+               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
+               make TREE=/bigdisk/linux-2.3.99-pre6
+
+or alternatively, edit Makefile to include this change.
+
+After fixing the errors, do make World again.  Later, you might just compile
+parts of the source tree but it's important that the whole tree will build
+first.
+
+8.  Installing
+
+After the DRI tree has been compiled you can install the XFree86 headers,
+libraries, programs, etc for testing.
+
+8.1  X Installation
+
+As mentioned above, the install directory is specified by the ProjectRoot
+variable in the host.def file.  Create that directory now if it doesn't
+already exist:
+
+                mkdir /usr/XF86-main
+
+You'll have to change to root since the install process puts several files in
+/etc/X11/ and sets the setuid flag on the X server executable.
+
+                cd ~/DRI-CVS/build/xc
+                su
+                make install
+
+Edit your /etc/ld.so.conf file and put /usr/XF86-main/lib as the first line.
+Continue with:
+
+                ldconfig
+                exit
+
+Look in /usr/XF86-main to be sure the files installed there.
+
+Strictly speaking, installing the DRI tree isn't required.  It's possible to
+run and test the X server directly from the build directory but it's a bit
+error prone.
+
+8.2  Update Locale Information
+
+To update your X locale information do the following:
+
+                  cd ~/DRI-CVS/build/xc/nls
+                  xmkmf -a
+                  make
+                  make install
+
+This will prevent a locale error message from being printed when you run Xlib
+programs.
+
+9.  X Server Configuration
+
+If your X server is currently running you'll have to stop it and return to a
+virtual terminal.
+
+First, setup your XF86Config file.  It should load the GLX and DRI modules
+and specify the driver to use for your hardware.  See the DRI User Guide for
+detailed information.
+
+You may want to make a backup copy of your existing /etc/X11/XF86Config file
+first.
+
+It's very important that you set the ModulePath option to point to your
+installation directory:
+
+                 ModulePath "/usr/XF86-main/lib/modules"
+
+Double check with this:
+
+                 grep ModulePath /etc/X11/XF86Config
+
+Next, your ~/.xinitrc file controls which clients will be launched when your
+X server starts.  You might put the following in yours:
+
+                 xset b off
+                 xsetroot -solid "#004070"
+                 xmodmap -e "clear mod4"
+                 xrdb -merge ~/.Xdefaults
+                 xterm -geometry +0+0 &
+                 xterm -geometry +512+0 &
+                 fvwm
+
+10.  X Server Start-up
+
+The X server can be started with:
+
+                 xinit -- /usr/XF86-main/bin/XFree86
+
+Automatic loading of DRM kernel modules was added to the X server in XFree86
+4.0.1.  This feature, and manual loading of kernel modules, is documented in
+the DRI user guide.
+
+At this point your X server should be up and running with hardware-acceler-
+ated direct rendering.  Please read the DRI User Guide for trouble shooting
+information.
+
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.3 2000/06/17 02:16:49 dawes Exp $
+
+
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.1 2000/06/17 17:44:20 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.LynxOS
diff -u xc/programs/Xserver/hw/xfree86/doc/README.LynxOS:3.26 xc/programs/Xserver/hw/xfree86/doc/README.LynxOS:3.27
--- xc/programs/Xserver/hw/xfree86/doc/README.LynxOS:3.26	Fri Mar  3 16:51:29 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.LynxOS	Sat Jun 17 10:44:20 2000
@@ -1,4 +1,4 @@
-                      README for XFree86 4.0 on LynxOS
+                     README for XFree86 4.0.1 on LynxOS
 
                                Thomas Mueller
 
@@ -13,29 +13,34 @@
 
 See the Copyright Notice.
 
-The sources for XFree86 4.0 are available by anonymous ftp from:
+The sources for XFree86 4.0.1 are available by anonymous ftp from:
 
-ftp://ftp.XFree86.org/pub/XFree86/4.0
+ftp://ftp.XFree86.org/pub/XFree86/4.0.1
 
 Binaries of XFree86 for LynxOS x86 are available from:
 
-ftp://ftp.XFree86.org/pub/XFree86/4.0/binaries/LynxOS
+ftp://ftp.XFree86.org/pub/XFree86/4.0.1/binaries/LynxOS
 
 A list of mirror sites is provided by ftp://ftp.XFree86.org/pub/XFree86/MIR-
 RORS
 
 The binaries on the FTP site were built on the latest released LynxOS version
-at the time XFree86 4.0 was released. In this case it is `LynxOS x86 3.0.1'.
-Because of changes made to the object format they don't run on LynxOS ver-
-sions earlier than 3.0.0.
+at the time XFree86 4.0.1 was released. In this case it is `LynxOS x86
+3.0.1'. Because of changes made to the object format they don't run on LynxOS
+versions earlier than 3.0.0.
 
 Building of this XFree86 version has never been tested on LynxOS versions
 earlier than 2.5.1.
 
-XFree86 4.0 supports LynxOS on the x86 and on the PowerPC platform. X servers
-are currently available only on the x86 platform. The X server may work with
-some PowerPC platforms supported by LynxOS though this has not (yet) been
-thoroughly tested.
+This release contains preliminary build support for `LynxOS 3.1.0'.  Since
+this OS release was not available long enough for serious testing `LynxOS
+3.1.0' support has to be considered to be in `alpha state'.  Initial tests
+were performed on LynxOS x86 only!
+
+XFree86 4.0.1 supports LynxOS on the x86 and on the PowerPC platform. X
+servers are currently available only on the x86 platform. The X server may
+work with some PowerPC platforms supported by LynxOS though this has not
+(yet) been thoroughly tested.
 
 If you need binaries for other platforms than the one on the XFree86 FTP
 server or if you have comments or suggestions about this document contact me
@@ -158,8 +163,8 @@
 3.5  X Server debug diagnostics output and other VT peculiarities
 
 Output made by the XFree86 X on its stdout or stderr will be lost after the
-server switches to graphics mode. The XFree86 4.0 server stores its output in
-/usr/adm/XFree86.n.log (where n is the screen number).
+server switches to graphics mode. The XFree86 4.0.1 server stores its output
+in /usr/adm/XFree86.n.log (where n is the screen number).
 
 When the X server is running output made to other consoles will be lost.
 After server shutdown the screen contents of other consoles may be inconsis-
@@ -258,7 +263,7 @@
           sort /usr/X11R6/man/whatis | uniq > /tmp/tmpfile
           mv /tmp/tmpfile /usr/X11R6/man/whatis
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.19 2000/03/03 21:28:08 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.20 2000/06/17 00:27:32 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.LynxOS,v 3.26 2000/03/04 00:51:29 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.LynxOS,v 3.27 2000/06/17 17:44:20 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.NetBSD
diff -u xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:3.68 xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:3.70
--- xc/programs/Xserver/hw/xfree86/doc/README.NetBSD:3.68	Fri Mar  3 16:51:30 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.NetBSD	Sat Jul  1 19:46:27 2000
@@ -1,8 +1,8 @@
-                      README for XFree86 4.0 on NetBSD
+                     README for XFree86 4.0.1 on NetBSD
 
 Rich  Murphey, David Dawes, Marc  Wandschneider, Mark  Weaver, Matthieu Herrb
 
-                     Last modified on: 20 February 2000
+                        Last modified on: 1 July 2000
 
 1.  What and Where is XFree86?
 
@@ -15,10 +15,10 @@
 
 The sources for XFree86 are available by anonymous ftp from:
 
-ftp://ftp.XFree86.org/pub/XFree86/4.0
+ftp://ftp.XFree86.org/pub/XFree86/4.0.1
 
 Binaries for NetBSD 1.3 and later are available from:
-ftp://ftp.XFree86.org/pub/XFree86/4.0/binaries/NetBSD
+ftp://ftp.XFree86.org/pub/XFree86/4.0.1/binaries/NetBSD
 
 A list of mirror sites is provided by ftp://ftp.XFree86.org/pub/XFree86/MIR-
 RORS
@@ -35,18 +35,24 @@
 
 3.  New OS dependent features
 
-See the Release Notes for non-OS dependent new features in XFree86 4.0.
+See the Release Notes for non-OS dependent new features in XFree86 4.0.1.
 
-3.1  New OS dependent features in 4.0
+3.1  New OS dependent features in 4.0.1
 
+   o Support for NetBSD 1.5_ALPHA
+
+   o The Xsun server can be built on NetBSD/sparc
+
+3.2  New OS dependent features in 4.0
+
    o Preliminary APM support.
 
-3.2  New OS dependent features in 3.9.18
+3.3  New OS dependent features in 3.9.18
 
    o Soft-booting secondary cards through the int10 BIOS interface is now
      possible using the x86emu real mode emulator.
 
-3.3  New OS dependent features in 3.9.17
+3.4  New OS dependent features in 3.9.17
 
    o Support for silken mouse with the wsmouse protocol has been added.
 
@@ -87,10 +93,10 @@
 send more than three bytes at a time (especially Intellimouse, or MouseMan+
 with a ``3D'' roller) are not supported yet.
 
-XFree86 4.0 also has support for the mouse driver included in the new wscons
-console driver introduced by NetBSD 1.4. Specify ``wsmouse'' as the protocol
-and ``/dev/wsmouse0'' as the device in /etc/XF86Config if you're using NetBSD
-1.4 with wscons.
+XFree86 4.0.1 also has support for the mouse driver included in the new
+wscons console driver introduced by NetBSD 1.4. Specify ``wsmouse'' as the
+protocol and ``/dev/wsmouse0'' as the device in /etc/XF86Config if you're
+using NetBSD 1.4 with wscons.
 
 See README.mouse  for general instruction on mouse configuration in XFree86.
 
@@ -194,14 +200,14 @@
 access to the /dev/mem device when in multi-users mode. But XFree86 servers
 can take advantage (or require) linear access to the display memory.
 
-Most XFree86 4.0 card drivers require linear memory access.  There are two
+Most XFree86 4.0.1 card drivers require linear memory access.  There are two
 ways to allow XFree86 to access linear memory:
 
 The first way is to disable the kernel security feature by adding ``option
 INSECURE'' in the kernel configuration file and build a new kernel.
 
 The second way is to install the aperture driver, included in source form in
-xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar in the XFree86 4.0 source
+xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar in the XFree86 4.0.1 source
 distribution. Unpack it in a new directory of your choice by running:
 
        sh apNetBSD.shar
@@ -318,7 +324,7 @@
 particular, David Dawes, Pace Willison, Amancio Hasty, Christoph Robitschko,
 Nate Williams, Rod Grimes, Jack Velte and Michael Smith.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.55 2000/03/03 21:28:09 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.56 2000/07/02 02:35:27 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.NetBSD,v 3.68 2000/03/04 00:51:30 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.NetBSD,v 3.70 2000/07/02 02:46:27 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD
diff -u xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD:1.11 xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD:1.13
--- xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD:1.11	Fri Mar  3 16:51:31 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD	Sat Jul  1 19:46:27 2000
@@ -1,8 +1,8 @@
-                      README for XFree86 4.0 on OpenBSD
+                     README for XFree86 4.0.1 on OpenBSD
 
                                Matthieu Herrb
 
-                     Last modified on: 20 February 2000
+                        Last modified on: 1 July 2000
 
 1.  What and Where is XFree86?
 
@@ -13,13 +13,13 @@
 
 See the Copyright Notice.
 
-The sources for XFree86 4.0 are available by anonymous ftp from:
+The sources for XFree86 4.0.1 are available by anonymous ftp from:
 
-ftp://ftp.XFree86.org/pub/XFree86/4.0
+ftp://ftp.XFree86.org/pub/XFree86/4.0.1
 
 Binaries for OpenBSD/i386 2.6 and later are available from:
 
-ftp://ftp.XFree86.org/pub/XFree86/4.0/binaries/OpenBSD
+ftp://ftp.XFree86.org/pub/XFree86/4.0.1/binaries/OpenBSD
 
 A list of mirror sites is provided by ftp://ftp.XFree86.org/pub/XFree86/MIR-
 RORS
@@ -34,23 +34,42 @@
 
 3.  New OS dependent features
 
-See the Release Notes for non-OS dependent new features in XFree86 4.0.
+See the Release Notes for non-OS dependent new features in XFree86 4.0.1.
 
-3.1  New OS dependent features in 4.0
+3.1  New OS dependent features in 4.0.1
 
+   o Several features from the OpenBSD X11 tree were merged into xdm:
+
+        o  support for Kerberos IV authentication
+
+        o use the arc4random(4) random number generator
+
+        o add a new resource "allowRootLogin", which can be used to disable
+          root logins through xdm
+
+        o log failed logins to syslogd
+
+        o verify that the shell is valid using /etc/shell
+
+        o verify that the account hasn't expired
+
+   o The Xsun server can be built again on OpenBSD/sparc.
+
+3.2  New OS dependent features in 4.0
+
    o Multi-thread safe libraries are built by default on OpenBSD 2.6 and
      later,
 
    o Preliminary APM support.
 
-3.2  New OS dependent features in 3.9.18
+3.3  New OS dependent features in 3.9.18
 
    o Support for USB mices has been added on OpenBSD.
 
    o Soft-booting secondary cards through the int10 BIOS interface is now
      possible using the x86emu real mode emulator.
 
-3.3  New OS dependent features in 3.9.17
+3.4  New OS dependent features in 3.9.17
 
    o Silken mouse is supported for serial mices, and, under post 2.6 OpenBSD-
      current for PS/2 mices.
@@ -229,7 +248,7 @@
 particular, David Dawes, Pace Willison, Amancio Hasty, Christoph Robitschko,
 Nate Williams, Rod Grimes, Jack Velte and Michael Smith.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.10 2000/03/03 21:28:10 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.11 2000/07/02 02:35:27 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD,v 1.11 2000/03/04 00:51:31 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.OpenBSD,v 1.13 2000/07/02 02:46:27 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.SiS
diff -u xc/programs/Xserver/hw/xfree86/doc/README.SiS:3.14 xc/programs/Xserver/hw/xfree86/doc/README.SiS:3.15
--- xc/programs/Xserver/hw/xfree86/doc/README.SiS:3.14	Tue Mar  7 06:55:06 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.SiS	Sat Jun 17 10:44:21 2000
@@ -113,4 +113,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.7 2000/03/06 22:59:24 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SiS,v 3.14 2000/03/07 14:55:06 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.SiS,v 3.15 2000/06/17 17:44:21 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.apm
diff -u xc/programs/Xserver/hw/xfree86/doc/README.apm:1.6 xc/programs/Xserver/hw/xfree86/doc/README.apm:1.7
--- xc/programs/Xserver/hw/xfree86/doc/README.apm:1.6	Wed Mar  8 12:39:22 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.apm	Sat Jun 17 10:44:21 2000
@@ -111,4 +111,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/apm.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.apm,v 1.6 2000/03/08 20:39:22 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.apm,v 1.7 2000/06/17 17:44:21 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.ati
diff -u xc/programs/Xserver/hw/xfree86/doc/README.ati:3.46 xc/programs/Xserver/hw/xfree86/doc/README.ati:3.49
--- xc/programs/Xserver/hw/xfree86/doc/README.ati:3.46	Tue Feb 29 17:48:20 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.ati	Mon Jun 19 08:12:28 2000
@@ -2,7 +2,7 @@
 
                             Marc Aurele La France
 
-                               1999 October 25
+                                2000 June 15
 
                                   Abstract
 
@@ -31,9 +31,9 @@
    o generic VGA support if a non-ATI VGA-capable adapter is detected and the
      user has requested such support.
 
-Thus, the support provided not only depends on what the driver detects in the
-system, but also, on what the user specifies in the XF86Config file.  See the
-``XF86Config specifications'' section below for details.
+Thus, the level of support provided not only depends on what the driver
+detects in the system, but also, on what the user specifies in the XF86Config
+file.  See the ``XF86Config specifications'' section below for details.
 
 If none of the above conditions are met, the ATI driver will essentially dis-
 able itself to allow other drivers to examine the system.
@@ -75,13 +75,14 @@
                         264CT, 264ET, 264VT, 264GT (3D Rage), 264VT-B, 264VT3,
                         264VT4, 264GT-B (3D Rage II), 3D Rage IIc, 3D Rage Pro,
                         3D Rage LT, 3D Rage LT Pro, 3D Rage XL, 3D Rage XC,
-                        3D Rage Mobility
+                        3D Rage Mobility (including the -M and -P variants)
 
 The driver also supports 32K, 64K and 16M-colour modes on the 264xT and 3D
 Rage series of adapters using the accelerator CRTC (but not the VGA CRTC).
-This support is as yet unaccelerated.
 
-The newer Rage 128 chips are not yet supported.
+The newer Rage 128 chips are not yet supported by this driver.  Rage 128's
+are, however, supported by a separate driver, and Rage 128 owners should read
+the r128 driver's documentation for details.
 
 Adapters based on the above chips have been marketed under a rather large
 number of names over the years.  Among them are:
@@ -105,6 +106,9 @@
                         XPERT@Play 98, XPERT@Work, XPERT 98, XPERT LCD,
                         XPERT XL
 
+Also, a number of mainboards, laptops and notebooks harbour a Mach32 or
+Mach64 controller.
+
 VGAWonder, Mach8 and Mach32 ISA adapters are available with or without a
 mouse.
 
@@ -112,13 +116,14 @@
 The 264xT and 3D Rage series of chips are integrated controllers, meaning
 that they include a programmable clock generator and a RAMDAC.
 
-This driver still does not provide support for accelerated drawing to the
-screen.  This means that all drawing is done by the CPU, rather than by any
-accelerator present in the system.  This can make opaque moves, for example,
-quite ``jerky''.  Also, given that IBM 8514/A and ATI Mach8 do not allow CPU
-access to their frame buffer, the driver will currently ignore these acceler-
-ators.  Most Mach32 adapters provide both accelerated function and VGA func-
-tionality, but the driver currently only uses the VGA.
+For all but Mach64 adapters, this driver still does not provide support for
+accelerated drawing to the screen.  This means that all drawing is done by
+the CPU, rather than by any accelerator present in the system.  This can make
+opaque moves, for example, quite ``jerky''.  Also, given that IBM 8514/A and
+ATI Mach8 do not allow CPU access to their frame buffer, the driver will cur-
+rently ignore these accelerators.  Most Mach32 adapters provide both acceler-
+ated function and SuperVGA functionality, but the driver currently only uses
+the VGA.
 
 The driver does however support the accelerator CRTC present in all ATI
 Mach64 adapters.  For 256-colour, and higher depth modes, this support will
@@ -126,9 +131,13 @@
 SuperVGA CRTC instead.  A linear video memory aperture is also available in
 256-colour and higher depth modes and enabled by default if a 264xT or 3D
 Rage controller is detected or, on 88800 controllers, if the accelerator CRTC
-is used.  An XF86Config option is available to disable this aperture, or (on
+is used.  XF86Config options are available to disable this aperture, or (for
 non-PCI adapters) enable it or move it to some other address.
 
+By default, the driver provides some acceleration for Mach64 if the accelera-
+tor CRTC is used.  This support is as yet incomplete and can be disabled
+entirely with an XF86Config option.
+
 4.  Current implementation of generic VGA support for non-ATI adapters
 
 Support for generic VGA with non-ATI adapters is also implemented, but has
@@ -155,9 +164,11 @@
 
    o Interlaced modes are not available.
 
+   o Colour depths higher than 8 are not available.
+
 5.  XF86Config specifications
 
-The driver recognizes a number of XF86Config options.  In general, all such
+The driver recognises a number of XF86Config options.  In general, all such
 options should be specified in a ``Device'' section, and affect only that
 ``Device'' section.
 
@@ -175,7 +186,7 @@
 5.1  Driver ``ati''
 
 The use of this specification is highly recommended if the ``Device'' section
-is to be recognized by the driver.  In fact, it is almost (but not quite)
+is to be recognised by the driver.  In fact, it is almost (but not quite)
 mandatory, particularly when using the loader server as it indicates what
 driver is to be loaded and associated with the ``Device'' section.
 
@@ -188,7 +199,8 @@
 SuperVGA CRTC.
 
 If ``ativga'' is specified instead, the driver will ignore any ATI accelera-
-tor it detects, but otherwise operate as if ``ati'' had been specified.
+tor it detects, but otherwise operate as if ``ati'' had been specified.  This
+specification ensures the VGA CRTC is used.
 
 A ChipSet name of ``ibmvga'' causes any VGA-capable adapter in the system to
 be associated with the ``Device'' section.  It enables the driver's generic
@@ -215,21 +227,24 @@
 
 These specifications will cause the driver to associate the ``Device'' sec-
 tion only with an adapter having the same attributes, or an adapter whose PCI
-device ID the driver does not recognize.  In the second case, these options
+device ID the driver does not recognise.  In the second case, these options
 cause the driver to treat the adapter as if it was one with the specified PCI
 device ID or revision.  ChipID can only be used with Mach32 or Mach64
-adapters.  ChipRev is meaningful only with Mach64 adapters.
+adapters, and, thus, specifically excludes any other adapter from matching
+the ``Device'' section.  ChipRev is meaningful only with Mach64 adapters, and
+then only if ChipID is also specified in the same ``Device'' section.
 
 5.4  IOBase
 
 This option limits the adapters that can be associated with the ``Device''
-section to those with the specified I/O base.  This option only applies to
-Mach64 adapters.
+section to the one with the specified I/O base.  This option only applies to
+Mach64 adapters and specifically excludes other adapters.
 
 5.5  BusID
 
 This option limits the adapters that can be associated with the ``Device''
-section to those with the specified PCI Bus ID.
+section to the one with the specified PCI Bus ID.  This specification
+excludes non-PCI adapters.
 
 5.6  Clocks
 
@@ -254,7 +269,7 @@
 
 5.6.1  Clocks for supported programmable clock generators
 
-At bootup, video BIOS initialization programmes an initial set of frequen-
+At bootup, video BIOS initialisation programmes an initial set of frequen-
 cies.  Two of these are reserved to allow the setting of modes that do not
 use a frequency from this initial set.  One of these reserved slots is used
 by the BIOS mode set routine, the other by the particular driver used (e.g.
@@ -273,7 +288,7 @@
 
 In this situation, the driver will probe the adapter for clock frequencies
 unless XF86Config clocks are already specified.  In either case, the driver
-will then attempt to normalize the clocks to one of the following specifica-
+will then attempt to normalise the clocks to one of the following specifica-
 tions:
 
      BIOS setting 1:
@@ -374,26 +389,35 @@
 5.6.4  Clocks for non-ATI adapters
 
 If no clocks are specified in the XF86Config, the driver will probe for four
-clocks, the second of which will be assumed to be 28.322MHz.  You can include
-up to four clock frequencies in your XF86Config to specify the actual values
-used by the adapter.  Any more will be ignored.
+clocks, the second of which will be assumed to be 28.322 MHz.  The first
+clock will typically be 25.175 MHz, but there are exceptions.  You can
+include up to four clock frequencies in your XF86Config to specify the actual
+values used by the adapter.  Any more will be ignored.
 
 5.7  Option ``crt_screen''
 
 This specification is only effective when the driver detects that the
-adapter's BIOS has initialized both the digital flat panel and CRT inter-
+adapter's BIOS has initialised both the digital flat panel and CRT inter-
 faces.  In such a situation, the driver will normally drive the panel and
 disable the CRT.  This specification causes the driver to disable the digital
-flat panel and display the screen image on the CRT instead.
+flat panel and display the screen image on the CRT instead.  This specifica-
+tion will be reworked in the near future.
+
+5.8  Option ``noaccel''
 
-5.8  Option ``nolinear''
+By default, the driver will accelerate draw operations if a Mach64 CRTC is
+used to drive the display.  As implemented in this driver, acceleration does
+not require a linear video memory aperture.  This option disables this accel-
+eration.
 
+5.9  Option ``nolinear''
+
 By default, the driver will enable a linear video memory aperture for
 256-colour and higher depth modes if it is also using a Mach64 accelerator
 CRTC or an integrated Mach64 graphics chip.  This option disables this linear
 aperture.
 
-5.9  Option ``shadowfb''
+5.10  Option ``shadowfb''
 
 If this option is enabled, the driver will cause the CPU to do each drawing
 operation first into a shadow frame buffer in system virtual memory and then
@@ -406,12 +430,23 @@
 option.
 
 Note that, due to various limitations, this option is forcibly disabled when
-a linear video memory aperture is not enabled, or when the frame buffer depth
-is less than 8.  The use of video acceleration, when implemented in a future
-driver release, will also disable frame buffer shadowing.
+a linear video memory aperture is not enabled, when the frame buffer depth is
+less than 8, or when acceleration is used.
+
+5.11  Option ``dpms''
+
+This option enables the driver's support for VESA's Display Power Management
+Specification.
 
-5.10  MemBase address
+5.12  Option ``backingstore''
 
+This is not specifically a driver option.  It is used to enable the server's
+support for backing store, a mechanism by which pixel data for occluded win-
+dow regions is remembered by the server thereby alleviating the need to send
+expose events to X clients when the data needs to be redisplayed.
+
+5.13  MemBase address
+
 This specification is only effective for non-PCI Mach64 adapters, and is used
 to override the CPU address at which the adapter will map its video memory.
 Normally, for non-PCI adapters, this address is set by a DOS install utility
@@ -419,12 +454,36 @@
 linear aperture in those cases where ATI's utility was not, or can not be,
 used.
 
-For PCI adapters, this address is determined at system bootup according to
-the PCI Plug'n'Play specification which arbitrates the resource requirements
-of most devices in the system.  This means the driver can not easily change
-the linear aperture address.
+For PCI and AGP adapters, this address is determined at system bootup accord-
+ing to the PCI Plug'n'Play specification which arbitrates the resource
+requirements of most devices in the system.  This means the driver can not
+easily change the linear aperture address.
+
+6.  Video modes
+
+Mode timings can be derived from the information in XFree86's doc subdirec-
+tory.  However, it is no longer required to specify such timings in an
+XF86Config's ``Monitor'' section(s), if only standard mode timings are to be
+used.  The server automatically inserts VESA standard mode timings in every
+``Monitor'' section, and these modes will be checked first for mode con-
+straints (monitor sync tolerances, video memory size, etc.).
+
+Furthermore, it is also no longer required to specify mode names in ``Dis-
+play'' subsections.  Should no mode names be specified (or those specified do
+not yield a usable mode), the server will automatically select as a default
+resolution the largest usable mode, whether or not the chosen mode is speci-
+fied in the corresponding ``Monitor'' section.
+
+For a CRT monitor, you should still specify horizontal sync and vertical
+refresh rates in the corresponding ``Monitor'' section.  Otherwise, the
+server will default these to those of a VGA monitor, which will limit resolu-
+tions to not much more than 640x480 at 72 Hz.  For a digital flat panel, any
+sync tolerances should be removed from the corresponding ``Monitor'' section.
+The driver will automatically calculate these from the mode that is active on
+server entry.  The driver also inserts timings for a mode called "Native
+panel mode" that represents the panel's native resolution.
 
-6.  Known problems and limitations
+7.  Known problems and limitations
 
 There are several known problems or limitations related to the XFree86 ATI
 driver.  They include:
@@ -432,15 +491,15 @@
    o A number of system lockups and blank screens have been reported when
      using PCI Mach64 adapters.  The great majority of these problems have
      been found to be due to system aspects that are unrelated to this
-     driver.  As of this writing, these problems can be divided into three
-     general areas:
+     driver.  As of this writing, these problems can be divided into two gen-
+     eral areas:
 
      Improper mouse protocol specification with some recent mice.  Try dif-
      ferent protocol specifications or another mouse.
 
      A system conflict with APM.  This problem is Linux-specific.  There is a
      bug in kernels 2.0.31 or earlier that prevents proper APM operation.
-     Upgrade to a more recent kernel or disable APM support.
+     Upgrade to a more recent kernel or disable APM support in the kernel.
 
    o When using a Mach64's accelerator CRTC, the virtual resolution must be
      less than 8192 pixels wide.  The VGA CRTC further limits the virtual
@@ -495,21 +554,30 @@
 
 Support for the following will be added in a future release:
 
-   o Mach32 accelerator's CRTC.  This support is the first step towards
+   o Mach32's accelerator CRTC.  This support is the first step towards
      accelerated support for Mach32's, Mach8's, 8514/A's and other clones.
 
-   o Colour depth greater than 8, where permitted by the hardware.
+   o Colour depth greater than 8 on non-integrated controllers, where permit-
+     ted by the hardware.
 
-   o Mach64, Mach32, Mach8 and 8514/A Draw Engines.
+   o Mach32, Mach8 and 8514/A Draw Engines.
 
    o Hardware cursors.
+
+   o TVOut, i.e. the ability to use a television screen as a monitor.
 
-7.  Reporting problems
+   o Motion Video, i.e. displaying an asynchronous data stream (TV signal,
+     DVD, etc.) in a window or full-screen.
 
+   o 3D operations.
+
+8.  Reporting problems
+
 If you are experiencing problems that are not already recorded in this docu-
 ment, first ensure that you have the latest current release of this driver
-and XFree86.  Check the server's stderr output and
-ftp://ftp.xfree86.org/pub/XFree86 if you are uncertain.
+and XFree86.  Check the server's log (usually found in
+/var/log/XFree86.0.log) and ftp://ftp.xfree86.org/pub/XFree86 if you are
+uncertain.
 
 Secondly, please check XFree86's doc directory for additional information.
 
@@ -519,12 +587,12 @@
 groups using your favourite archiving service can also prove useful in
 resolving problems.
 
-If you are still experiencing problems, you can send me e-mail at <tsi@ual-
-berta.ca>.  Please be as specific as possible when describing the problem(s),
-and include an unedited copy of the server's stderr and the XF86Config file
-used.
+If you are still experiencing problems, you can send me non-HTMLised e-mail
+at <tsi@ualberta.ca>.  Please be as specific as possible when describing the
+problem(s), and include an unedited copy of the server's log and the XF86Con-
+fig file used.
 
-8.  Driver history
+9.  Driver history
 
 The complete history of the driver is rather cloudy.  The following is more
 than likely to be incomplete and inaccurate.
@@ -538,24 +606,24 @@
 trying in the process to make the driver work with all other ATI adapters
 available at the time.
 
-Rik Faith (faith@cs.unc.edu) obtained the X11R4 driver from Doug Evans in the
-summer of 1992 and ported the code to the X386 part of X11R5.  This subse-
-quently became part of XFree86.
+Rik Faith (faith@precisioninsight.com) obtained the X11R4 driver from Doug
+Evans in the summer of 1992 and ported the code to the X386 part of X11R5.
+This subsequently became part of XFree86.
 
 I (Marc Aurele La France) took over development and maintenance of the driver
 in the fall of 1993 after Rik got rid of his VGA Wonder adapter.
 
-9.  Driver versions
+10.  Driver versions
 
 Due to the introduction of loadable drivers in XFree86 4.0, it has become
-necessary to track driver versions separately.  With this release of the
-driver, I am introducing the following version numbering scheme.
+necessary to track driver versions separately.  Driver releases use the fol-
+lowing version numbering scheme.
 
 Version 1 of this driver is the one I inherited from Rik Faith.  This is the
 version found in XFree86 2.0 and 2.1.
 
 Version 2 is my first rewrite of this code which only ended up being a par-
-tially unsuccessful attempt at generalizing the driver for all VGA Wonder,
+tially unsuccessful attempt at generalising the driver for all VGA Wonder,
 Mach32, and early Mach64 adapters.  Various releases of this version of the
 driver can be found in XFree86 2.1.1, 3.1, 3.1.1 and 3.1.2.
 
@@ -565,15 +633,13 @@
 found in XFree86 3.2, 3.3 and 3.3.1.
 
 Version 4 is a rather major restructuring of version 3, which became larger
-than I could comfortably handle in one source file.  This version will make
-it quite a bit easier to introduce new function such as acceleration, addi-
-tional colour depths, and so on.  This is the version found in XFree86 3.3.2,
-3.3.3, 3.3.3.1, 3.3.3.2 and 3.3.4.
+than I could comfortably handle in one source file.  This is the version
+found in XFree86 3.3.2, 3.3.3, 3.3.3.1, 3.3.3.2, 3.3.4, 3.3.5 and 3.3.6.
 
-Version 5 is an almost complete restructuring of version 4 to fit in the new
-driver API of XFree86 4.0.
+Version 5 is an almost complete restructuring of version 4 to fit in the
+newer driver API of XFree86 4.0 and later.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.29 2000/02/18 12:19:08 tsi Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.31 2000/06/19 15:00:54 tsi Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.ati,v 3.46 2000/03/01 01:48:20 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.ati,v 3.49 2000/06/19 15:12:28 tsi Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.chips
diff -u xc/programs/Xserver/hw/xfree86/doc/README.chips:3.30 xc/programs/Xserver/hw/xfree86/doc/README.chips:3.32
--- xc/programs/Xserver/hw/xfree86/doc/README.chips:3.30	Tue Mar  7 06:55:07 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.chips	Sat Jun 17 10:44:21 2000
@@ -3,11 +3,11 @@
                 David Bateman (<dbateman@club-internet.fr>),
                            Egbert Eich (<eich@xfree86.org>)
 
-                                19th July 1999
+                                14th June 2000
 
 1.  Introduction
 
-With the release of XFree86 version 4.0, the Chips and Technologies driver
+With the release of XFree86 version 4.0.1, the Chips and Technologies driver
 has been extensively rewritten and contains many new features.  This driver
 must be considered work in progress, and those users wanting stability are
 encouraged to use the older XFree86 3.3.x versions. However this version of
@@ -25,6 +25,8 @@
 
    o Supports PsuedoColor overlays on 16bpp TrueColor screens for HiQV.
 
+   o Supports YUV colour space conversion with the XVideo extension.
+
    o 32bpp pixmaps while using a framebuffer in 24bpp packed pixel mode.
 
    o Heaps more acceleration.
@@ -112,10 +114,10 @@
 
       ct65550
             This chip includes many new features, including improved BitBLT
-            support (24bpp color expansion, wider maximum pitch, etc), Multi-
-            media unit (video capture, zoom video port, etc) and 24bpp uncom-
-            pressed true color (i.e 32bpp mode). Also memory mapped I/O is
-            possible on all bus configurations.  (Max Ram: 2Mb, Max Dclk:
+            support (24bpp colour expansion, wider maximum pitch, etc), Mul-
+            timedia unit (video capture, zoom video port, etc) and 24bpp
+            uncompressed true colour (i.e 32bpp mode). Also memory mapped I/O
+            is possible on all bus configurations.  (Max Ram: 2Mb, Max Dclk:
             80MHz@3.3V,100MHz@5V)
 
       ct65554
@@ -381,15 +383,24 @@
             engine to its limit, and some manufacturers have set a default
             memory clock that will cause pixel errors with this option.  If
             you get pixel error with this option try using the "SetMClk"
-            option to slow the memory clock.
+            option to slow the memory clock. It should also be noted that the
+            XVideo extension uses the same capabilities of the HiQV chipsets
+            as the Overlays. So using this option disables the XVideo exten-
+            sion.
 
       Option "ColorKey" "255"
-            Normally the color transparency key for the overlay is the 8bpp
+            Normally the colour transparency key for the overlay is the 8bpp
             lookup table entry 255. This might cause troubles with some
-            applications, and so this option allows the color transparency
+            applications, and so this option allows the colour transparency
             key to be set to some other value. Legal values are 2 to 255
             inclusive.
 
+      Option "VideoKey" "255"
+            This sets the default pixel value for the YUV video overlay key.
+            Legal values for this key are depth dependent. That is from 0 to
+            255 for 8bit depth, 0 to 32,767 for 15bit depth, etc. This option
+            might be used if the default video overlay key causes problems.
+
       Option "XaaNoScreenToScreenCopy",
             Option "XaaNoSolidFillRect", Option "XaaNoSolidHorVertLine",
             Option "XaaNoMono8x8PatternFillRect", Option "XaaNoColor8x8Pat-
@@ -458,6 +469,12 @@
             width, so that the maximum dotclock will be similar to a 24bpp
             mode.
 
+      * XVideo extension*
+            Like the overlays, the Xvideo extension uses a part of the video
+            memory for a second framebuffer. In this case enough memory needs
+            to be left for the largest unscaled video window that will be
+            displayed.
+
       * VESA like modes
             We recommend that you try and pick a mode that is similar to a
             standard VESA mode. If you don't a suspend/resume or LCD/CRT
@@ -772,6 +789,12 @@
             option. So with the "Overlay" option, using the "SetMClk" option
             to reduce the speed of the memory clock is recommended.
 
+      The mpeg video playing with the XVideo extension has corrupted colours
+            The XVideo extension has only recently been added to the chips
+            driver.  Some YUV to RGB colour have been noted at 15 and 16 bit
+            colour depths.  However, 8 and 24 bit colour depths seem to work
+            fine.
+
       I can't start X-windows with 16, 24 or 32bpp
             Firstly, is your machine capable of 16/24/32bpp with the mode
             specified. Many LCD displays are incapable of using a 24bpp mode.
@@ -788,7 +811,7 @@
 
                         startx -- -depth 24 -fbbpp 32   8-8-8 RGB truecolor
 
-            however as XFree86 version 4.0 allows 32bpp pixmaps to be used
+            however as XFree86 version 4.0.1 allows 32bpp pixmaps to be used
             with framebuffers operating in 24bpp, this mode of operating will
             cost performance for no gain in functionality.
 
@@ -858,7 +881,7 @@
 We also thank the many people on the net who have contributed by reporting
 bugs and extensively testing this server.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.30 2000/03/05 16:59:11 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.31 2000/06/14 01:43:49 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.chips,v 3.30 2000/03/07 14:55:07 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.chips,v 3.32 2000/06/17 17:44:21 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.cyrix
diff -u xc/programs/Xserver/hw/xfree86/doc/README.cyrix:1.6 xc/programs/Xserver/hw/xfree86/doc/README.cyrix:1.7
--- xc/programs/Xserver/hw/xfree86/doc/README.cyrix:1.6	Wed Mar  8 12:39:23 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.cyrix	Sat Jun 17 10:44:22 2000
@@ -50,4 +50,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.cyrix,v 1.6 2000/03/08 20:39:23 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.cyrix,v 1.7 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.fonts
diff -u xc/programs/Xserver/hw/xfree86/doc/README.fonts:1.9 xc/programs/Xserver/hw/xfree86/doc/README.fonts:1.10
--- xc/programs/Xserver/hw/xfree86/doc/README.fonts:1.9	Tue Mar  7 06:55:08 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.fonts	Sat Jun 17 10:44:22 2000
@@ -772,4 +772,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.7 2000/03/06 22:59:25 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.9 2000/03/07 14:55:08 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.10 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.i740
diff -u xc/programs/Xserver/hw/xfree86/doc/README.i740:1.6 xc/programs/Xserver/hw/xfree86/doc/README.i740:1.7
--- xc/programs/Xserver/hw/xfree86/doc/README.i740:1.6	Fri Mar  3 16:51:32 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.i740	Sat Jun 17 10:44:22 2000
@@ -178,4 +178,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.3 2000/03/04 00:26:30 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.i740,v 1.6 2000/03/04 00:51:32 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.i740,v 1.7 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.i810
diff -u xc/programs/Xserver/hw/xfree86/doc/README.i810:1.3 xc/programs/Xserver/hw/xfree86/doc/README.i810:1.4
--- xc/programs/Xserver/hw/xfree86/doc/README.i810:1.3	Fri Mar  3 16:51:32 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.i810	Sat Jun 17 10:44:22 2000
@@ -107,4 +107,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i810.sgml,v 1.2 2000/03/04 00:00:30 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.i810,v 1.3 2000/03/04 00:51:32 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.i810,v 1.4 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.isc
diff -u xc/programs/Xserver/hw/xfree86/doc/README.isc:3.37 xc/programs/Xserver/hw/xfree86/doc/README.isc:3.38
--- xc/programs/Xserver/hw/xfree86/doc/README.isc:3.37	Tue Mar  7 06:55:09 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.isc	Sat Jun 17 10:44:22 2000
@@ -489,4 +489,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml,v 3.24 2000/03/06 22:59:25 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.isc,v 3.37 2000/03/07 14:55:09 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.isc,v 3.38 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.mouse
diff -u xc/programs/Xserver/hw/xfree86/doc/README.mouse:1.9 xc/programs/Xserver/hw/xfree86/doc/README.mouse:1.10
--- xc/programs/Xserver/hw/xfree86/doc/README.mouse:1.9	Tue Feb 29 17:48:26 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.mouse	Sat Jun 17 10:44:22 2000
@@ -6,7 +6,7 @@
 
 1.  Introduction
 
-This document describes mouse support in XFree86 4.0.
+This document describes mouse support in XFree86 4.0.1.
 
 Mouse configuration has often been mysterious task for novice users.  How-
 ever, once you learn several basics, it is straightforward to write the mouse
@@ -928,4 +928,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.11 2000/03/01 00:25:23 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.mouse,v 1.9 2000/03/01 01:48:26 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.mouse,v 1.10 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.r128
diff -u xc/programs/Xserver/hw/xfree86/doc/README.r128:1.10 xc/programs/Xserver/hw/xfree86/doc/README.r128:1.12
--- xc/programs/Xserver/hw/xfree86/doc/README.r128:1.10	Wed Mar  8 12:39:23 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.r128	Sat Jun 17 10:44:22 2000
@@ -2,7 +2,7 @@
 
                      Precision Insight, Inc., SuSE GmbH
 
-                              12 November 1999
+                                13 June 2000
 
 1.  Supported Hardware
 
@@ -74,7 +74,7 @@
 
 7.  Known Limitations
 
-   o DGA is not supported yet
+   o None
 
 8.  Authors
 
@@ -116,7 +116,7 @@
 
 http://www.suse.com
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v 1.7 2000/03/08 15:14:48 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v 1.8 2000/06/14 00:16:09 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.r128,v 1.10 2000/03/08 20:39:23 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.r128,v 1.12 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.rendition
diff -u xc/programs/Xserver/hw/xfree86/doc/README.rendition:1.9 xc/programs/Xserver/hw/xfree86/doc/README.rendition:1.11
--- xc/programs/Xserver/hw/xfree86/doc/README.rendition:1.9	Fri Mar  3 16:51:33 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.rendition	Sat Jun 17 10:44:22 2000
@@ -1,8 +1,8 @@
-                       Information for Rendition Users
+               Information for Rendition (Micron) Verité Users
 
                           The XFree86 Project Inc.
 
-                              12 December 1999
+         9 June 2000, last update by Dejan Ilic <dejan.ilic@home.se>
 
 1.  Supported hardware
 
@@ -35,6 +35,11 @@
 If you have problems with hardware cursor use the "sw_cursor" option to
 revert back to software cursor.
 
+This is essentially a port of XFree86 3.3.x driver to the new XFree86 4.0
+API, and thus we have put most of effort in making a working driver with the
+most basic features. Support for multi-head support and acceleration are next
+on the list of features to be included.
+
 4.  Features
 
    o Hardware acceleration
@@ -54,10 +59,10 @@
 
 5.  XF86Config Option
 
-      Option "sw_cursor"
+      Option "SW_Cursor"
             Disables use of the hardware cursor.
 
-      Option "overclock_mem"
+      Option "Overclock_Mem"
             Run the memory at a higher clock. Useful on some cards with dis-
             play glitches at higher resolutions. But adds the risk to damage
             the hardware. Use with caution.
@@ -70,8 +75,8 @@
 
       Option "FramebufferWC"
             If writecombine is disabled in BIOS, and you add this option in
-            in configuration file, then the driver will try to request write-
-            combined access to the framebuffer. This can drastically increase
+            configuration file, then the driver will try to request writecom-
+            bined access to the framebuffer. This can drastically increase
             the performance on unaccelerated server. Requires that
             "MTRR"-support is compiled into the OS-kernel.
 
@@ -101,19 +106,19 @@
             "ShadowFB" and automatically enable it. It also disables the
             acceleration.  The option is not activated by default.
 
-6.  News in this release
+6.  News in this release (XFree86 4.1)
 
-   o Acceleration! Disabled for the moment.
+   o DirectColor support
 
-7.  Major changes in this release
+   o SilkenMouse support
 
-   o ShadowFB support added
+7.  Major changes in this release
 
-   o To be determined before final release.
+   o Gamma works now for >8bpp
 
 8.  Bugfixes
 
-   o 8bpp finally works correctly again
+   o Only some code cleanup done. No real bugfixes.
 
 9.  Known problems in current driver
 
@@ -129,13 +134,15 @@
      around. V2x00 does not exhibit this problem. Probably a bug in the
      driver rather than a limitation of the chip.
 
+   o Depth 15 & 16 has problems with colors when DirectColor is used.
+
 10.  Work in progress (not finished in time for release)
 
    o Acceleration is disabled for the moment. If you want to play with it
      enable the "USE_ACCEL" define in rendition.c file! Beware as it has sev-
      eral bugs left to clear out before if is stable for general use.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.8 2000/03/01 23:54:34 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.12 2000/06/17 02:30:33 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rendition,v 1.9 2000/03/04 00:51:33 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rendition,v 1.11 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/README.s3virge
diff -u xc/programs/Xserver/hw/xfree86/doc/README.s3virge:1.4 xc/programs/Xserver/hw/xfree86/doc/README.s3virge:1.5
--- xc/programs/Xserver/hw/xfree86/doc/README.s3virge:1.4	Tue Feb 29 17:48:27 2000
+++ xc/programs/Xserver/hw/xfree86/doc/README.s3virge	Sat Jun 17 10:44:22 2000
@@ -6,7 +6,7 @@
 
 1.  Supported hardware
 
-The s3virge driver in XFree86 4.0 supports the S3 ViRGE, ViRGE DX, GX, MX,
+The s3virge driver in XFree86 4.0.1 supports the S3 ViRGE, ViRGE DX, GX, MX,
 MX+, and VX chipsets.  A majority of testing is done on ViRGE DX chips, mak-
 ing them the most stable to date.  This release has improved support for 24
 bit color depths and resolves all the known issues with Netscape and other
@@ -62,4 +62,4 @@
      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.2 1999/07/10 12:17:25 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.s3virge,v 1.4 2000/03/01 01:48:27 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.s3virge,v 1.5 2000/06/17 17:44:22 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/RELNOTES
diff -u xc/programs/Xserver/hw/xfree86/doc/RELNOTES:3.82 xc/programs/Xserver/hw/xfree86/doc/RELNOTES:3.84
--- xc/programs/Xserver/hw/xfree86/doc/RELNOTES:3.82	Wed Mar  8 12:39:24 2000
+++ xc/programs/Xserver/hw/xfree86/doc/RELNOTES	Sat Jul  1 19:46:27 2000
@@ -1,79 +1,196 @@
-                      Release Notes for XFree86[tm] 4.0
+                     Release Notes for XFree86[tm] 4.0.1
 
                           The XFree86 Project, Inc
 
-                                7 March 2000
+                                30 June 2000
 
                                   Abstract
 
      This document contains some information about the features present
-     in XFree86 4.0 and their status.
+     in XFree86 4.0.1 and their status.
 
-1.  Introduction
+1.  Introduction to the 4.x Release Series
 
-XFree86 4.0 is the first official release of the new XFree86 4.  XFree86 4
-represents a significant redesign of the XFree86 X server.  It is very impor-
-tant to keep in mind that XFree86 4 is still very much in development, and it
-contains a lot of new work.  That means two things: there is a lot of new
-exciting stuff to try, but being new code, it hasn't had nearly as much of a
-workout as the stable 3.3.x releases.  If you're looking for a well-tested,
-stable release, and can't afford the inconveniences that new software can
-sometimes cause, then you are probably better off sticking with the 3.3.x
-releases for now.  If you have the resources to try out the new version and
-investigate its features, or if you just like being on the bleeding edge,
-then please try 4.0!
-
-This release isn't quite as complete as we would have liked.  The main miss-
-ing pieces are a nice configuration tool and support for some of the hardware
-that 3.3.x supports.  The first point means that configuring the server might
-be more painful than usual.  The second means that your hardware might not be
-supported by 4.0, or it might be supported at a lesser level (conversely,
-some hardware is better supported in 4.0).  We've attempted to provide some
-information about the second point in our Driver Status document.  Please
-check there first before trying 4.0.  Unfortunately that document is still
-fairly basic, but it should at least give you an idea of whether you're
-likely to be able to use 4.0 at all or not.
+XFree86 4.0 was the first official release of the new XFree86 4.  XFree86 4
+represents a significant redesign of the XFree86 X server.  Not all of the
+hardware drivers from 3.3.x have been ported to 4.x yet.
+
+1.1  Differences Between the 4.x series and the 3.3 series
+
+The 4.x release series is also missing a nice configuration tool.  This means
+that configuring the Xserver might be trickier than usual.  The second point
+is that is that your hardware might not be supported by 4.0.1, or it might be
+supported at a lesser level (conversely, some hardware is better supported in
+4.0.1).  We've attempted to provide some information about the second point
+in our Driver Status document.  Please check there first before downloading
+4.0.1.
 
 On the subject of configuration, we have updated the basic text-based tool
-"xf86config" to generate config files in the format required by 4.0 (3.3.x
-config files won't really work with 4.0).  We're also working on some other
+"xf86config" to generate config files in the format required by 4.0.1 (3.3.x
+config files won't really work with 4.0.1).  We're also working on some other
 configuration tools, including one that is built-in to the X server.  An
 early version of this is included in the release, and it works well for some
 hardware.  To try it out, just run (as root) "XFree86 -configure".  Both of
-these configuration options will at worst give you a reasonable starting
-point for a suitable configuration file.  We've put some effort into docu-
-menting the 4.0 config file format, and you can find that information in the
-XF86Config manual page.  Please check that and the driver manual pages and
-related documentation for further information about that.
+these configuration options will give you a reasonable starting point for a
+suitable configuration file.  We've put some effort into documenting the
+4.0.1 config file format, and you can find that information in the XF86Config
+manual page. Check that,  the driver manual pages and the related documenta-
+tion for further information.
 
 Oh, another thing you might notice is that our documentation is rather
 patchy.  Most of what is present should be in reasonable shape, but there are
 gaps.  We thought it better to leave out docs that were very out of date
-rather than providing inaccurate and misleading information.
+rather than providing inaccurate and misleading information.  We are looking
+for people to also help fill those gaps in <hint hint :->.
 
 Finally, before you download and install the binary distributions for this
 release, please have a quick read through the Installation Document.  It may
 save you some time.
 
-If those cautionary notes haven't turned you away (and we certainly hope
-not), please read on...  The sections below describe some of the new features
-and changes between 3.3.x and 4.0.  There is a lot of new stuff, and we defi-
-nitely don't have enough space to cover it all here.
+The next section describes what is new in the latest version (4.0.1).  The
+other sections below describe some of the new features and changes between
+3.3.x and 4.0.  There is a lot of new features, and we definitely don't have
+enough space to cover it all here.
 
-2.  X server
+2.  Summary of new features in 4.0.1.
 
+2.1  X server
+
+   o New DRI drivers for Intel i810, Matrox G400 and G200 (AGP only) and the
+     ATI Rage 128, and updates to the 3Dfx DRI driver, including Voodoo5 sup-
+     port.
+
+   o The X server now runs on Linux/Sparc including drivers for many video
+     cards used on SUN hardware.
+
+   o DRI support for the Linux/Sparc implementation that allows 3D direct
+     rendering with Creator3D cards.
+
+   o Fixed recently publicized security issues.
+
+   o Update Mesa to the latest version.
+
+   o Xinerama updates and fixes.
+
+   o Xv updates and fixes.
+
+   o Mouse support in DGA 1.0 compatibility mode should now work correctly
+     for most games that make use of it.
+
+   o Some bugs with 8+24 overlay support have been fixed.
+
+   o Some XKEYBOARD extension problems have been fixed, including improve-
+     ments to the MouseKeys support.
+
+   o Add generic DGA support to the sis, neomagic and i810 drivers.
+
+   o xf86cfg, a new graphical configuration tool.
+
+2.2  X libraries and clients.
+
+   o Thread safety issues have been resolved in a few places in the
+     libraries.  Upgrading to the latest libraries is essential for multi-
+     threaded X applications.
+
+   o Some fatal bugs in the big font support have been fixed.  Upgrading to
+     the latest libraries will fix this too.
+
+   o Fixed recently publicized security issues in some of the X libraries.
+
+   o Updates and bug fixes for some clients, including xedit, xman, xcalc,
+     fstobdf, xdm.
+
+   o Fix some xfs problems.
+
+   o XTerm updates.  These include:
+
+        o Improve logfile security.
+
+        o Workaround for fixed fonts which are generated from Unicode fonts:
+          they omit glyphs for some xterm's less-used line-drawing charac-
+          ters, which caused xterm to set a flag telling it to use only its
+          internal line-drawing characters.
+
+        o Limit numeric parameters of control sequences to 65535 to simplify
+          checks for numeric overflow.
+
+        o Change index into UDK list to unsigned to guard against numeric
+          overflow making the index negative.
+
+        o Add limit checks to ClearInLine(), ScrnInsertChar(), Scrn-
+          DeleteChar() to correct potential out-of-bounds indexing.
+
+        o Add a resource (limitResize) limiting resizing via the CSI 4 t and
+          CSI 8 t sequences.
+
+        o Ignore out-of-bounds resize requests, i.e., where sign-extension or
+          truncation of the parameters would occur.
+
+        o Change Sun function-keys resource name to sunFunctionKeys to work
+          around redefinition of the token sun by xrdb on Solaris.  Simi-
+          larly, renamed resource sun keyboard to sunKeyboard.  Change simi-
+          lar resource names for HP and SCO to avoid potential conflict with
+          xrdb symbols on other systems, as well as for consistency.
+
+        o Change line speed from 9600bd to 38400bd to accommodate users who
+          mistakenly use $TERM set to vt100, to reduce the effect of padding
+          associated with this terminal type.
+
+        o Fix a problem that caused the right scrollbar to be positioned
+          incorrectly when re-enabling it.
+
+        o Fix a problem with color support that showed up on some platforms.
+
+        o Modify logic for deleteIsDEL resource so it has internally 3
+          states:  unspecified, true and false.  If unspecified, the keyboard
+          type determines whether the Delete key transmits <esc>[3~ or \177,
+          and the popup menu entry reflects the internal state.  Otherwise,
+          the popup menu entry overrides the keyboard type.
+
+        o Portability fixes for os390, AIX 4.2, Digital Unix 4.0 and IRIX
+          6.5.
+
+2.3  Fonts and Internationalisation
+
+   o Many of the "misc" bdf fonts have been updated and extended, and a wider
+     range of ISO-8859 subsets have been added.  Oblique/italic versions of
+     some of them have also been added.
+
+   o The converters in Xlib have been improved and reworked.  UTF-8 support
+     has been added.
+
+   o Support for ISO-8859-13 has been added to Xlib and to the UTF-8 convert-
+     ers.
+
+   o XKB keyboard definitions have been added and updated for some countries.
+
+   o Locale support for Celtic languages has been updated, and a Compose file
+     for ISO-8859-14 added.
+
+2.4  Miscellaneous
+
+   o Preliminary support for Linux/mips (no X servers yet).
+
+   o Update support for BSD/OS.
+
+   o Update Linux/IA64 support.
+
+   o Support for LynxOS 3.1.0.
+
+3.  The new X server
+
 Unlike XFree86 3.3.x where there are multiple X server binaries, each of
-which drive different hardware, XFree86 4.0 has a single X server binary
+which drive different hardware, XFree86 4.0.1 has a single X server binary
 called XFree86.  This binary can either have one or more video drivers linked
 in statically, or, more usually, dynamically load the video drivers and other
 modules that are needed.
 
-XFree86 4.0 has X server support for most UNIX(R) and UNIX-like operating
-systems on Intel/x86 platforms, plus support for Linux on Alpha and PowerPC
-platforms.  Work on support for additional architectures and operating sys-
-tems is in progress, and is planned for future releases.
+XFree86 4.0.1 has X server support for most UNIX(R) and UNIX-like operating
+systems on Intel/x86 platforms, plus support for Linux on Alpha, PowerPC and
+Sparc platforms.  Work on support for additional architectures and operating
+systems is in progress, and is planned for future releases.
 
-2.1  Loader and Modules
+3.1  Loader and Modules
 
 The XFree86 X server has a built-in run-time loader, donated by Metro Link
 <URL:http://www.metrolink.com>.  This loader can load normal object files and
@@ -81,39 +198,37 @@
 rely on an operating system's native dynamic loader support, it works on
 platforms that don't provide this feature, and makes it possible for the mod-
 ules to be operating system independent (although not, of course, independent
-of CPU architecture).  This means that, for example, a module compiled on
-Linux/x86 can be loaded by an X server running on Solaris/x86, or FreeBSD, or
-even OS/2.  One of the main benefits of this is that when modules are
-updated, they don't need to be recompiled for each different operating sys-
-tem.  We're planning to take advantage of this to provide more frequent
-driver module updates in between major releases.
-
-The loader in version 4.0 has support for Intel (x86), Alpha and PowerPC
-platforms.  It also has preliminary support for Sparc platforms but this
-isn't used yet.
+of CPU architecture).  This means that a module compiled on Linux/x86 can be
+loaded by an X server running on Solaris/x86, or FreeBSD, or even OS/2.
 
+One of the main benefits of this loader is that when modules are updated,
+they do not need to be recompiled for every different operating system.  In
+the future we plan to take advantage of this to provide more frequent driver
+module updates in between major releases.
+
+The loader in version 4.0.1 has support for Intel (x86), Alpha and PowerPC
+platforms.  It also has preliminary support for Sparc platforms.
+
 The X server makes use of modules for video drivers, X server extensions,
 font rasterisers, input device drivers, framebuffer layers (like mfb, cfb,
 etc), and internal components used by some drivers (like XAA),
 
 The module interfaces (API and ABI) used in this release is still subject to
-change without notice.  While we'll attempt to provide backward compatibility
-for the module interfaces as of the 4.0 release (meaning that 4.0 modules
-will work with future core X server binaries), we can't guarantee that this
-will be the case.  We are planning to fully document and stabilise the module
-interfaces in a future release, and at that point backward compatibility will
-be easier to achieve.
+change without notice.  While we will attempt to provide backward compatibil-
+ity for the module interfaces as of the 4.0 release (meaning that 4.0 modules
+will work with future core X server binaries), we cannot guarantee this.
 
 Note about module security
 
-     The XFree86 X server runs with root privileges, which means that
-     the X server loadable modules also run with these privileges.  For
-     this reason we recommend that all users be careful to only use
-     loadable modules from reliable sources.  We hope to have a mecha-
-     nism for signing/verifying the modules that we provide available in
-     a future release.
+     The XFree86 X server runs with root privileges, i.e.  the X server
+     loadable modules also run with these privileges.  For this reason
+     we recommend that all users be careful to only use loadable modules
+     from reliable sources,  otherwise the introduction of viruses and
+     contaminated code can occur and wreak havoc on your system.  We
+     hope to have a mechanism for signing/verifying the modules that we
+     provide available in a future release.
 
-2.2  Configuration File
+3.2  Configuration File
 
 The X server configuration file format has been extended to handle some of
 the new functionality.  The xf86config utility can be used to generate a
@@ -198,11 +313,12 @@
 
    o The Keyboard, Pointer and XInput sections have been replaced by a more
      general InputDevice section.  The old Keyboard and Pointer sections are
-     still recognised for compatibility purposes, but they are deprecated and
-     support for them may be dropped in future releases.  The old XInput sec-
-     tions are no longer recognised.  The keywords from the old sections are
-     expressed as Options in the InputDevice sections.  The following example
-     shows typical InputDevice sections for the core mouse and keyboard.
+     still recognised for compatibility purposes, but they are discommended
+     and support for them may be dropped in future releases.  The old XInput
+     sections are no longer recognised.  The keywords from the old sections
+     are expressed as Options in the InputDevice sections.  The following
+     example shows typical InputDevice sections for the core mouse and key-
+     board.
 
                Section "InputDevice"
                    Identifier  "Keyboard 1"
@@ -273,7 +389,7 @@
 and /usr/X11R6/etc/X11 being added.  The full search path details are docu-
 mented in the XF86Config manual page.
 
-2.3  Command Line Options
+3.3  Command Line Options
 
 The following new X server command line options have been added:
 
@@ -384,13 +500,13 @@
           This makes it possible for users to choose from multiple
           config files that the the sysadmin has provided.
 
-2.4  XAA
+3.4  XAA
 
 The XFree86 Acceleration Architecture (XAA) has been completely rewritten
 from scratch.  Most drivers implement acceleration by making use of the XAA
 module.
 
-2.5  Multi-head
+3.5  Multi-head
 
 Some multi-head configurations are supported in this release, primarily with
 multiple PCI/AGP cards.  However, this is an area that is still being worked
@@ -406,7 +522,7 @@
 which card is the primary card (either by using a different PCI slot, or by
 changing the system BIOS's preference for the primary card).
 
-2.6  Xinerama
+3.6  Xinerama
 
 Xinerama is an X server extension that allows multiple physical screens to
 behave as a single screen.  With traditional multi-head in X11, windows can-
@@ -428,19 +544,19 @@
      way.  This is an issue that needs to be dealt with in the individual
      window managers, and isn't specifically an XFree86 problem.
 
-2.7  XVideo extension
+3.7  XVideo extension
 
 The XVideo extension is included in this release, but nobody seems interested
 in writing up some information about it.
 
-2.8  DGA version 2
+3.8  DGA version 2
 
 DGA 2.0 is nearly completed but still not implemented by all drivers.  Pre-
 liminary documentation for the client libraries can be found in the xc/pro-
 grams/Xserver/hw/xfree86/DGA document.  Some degree of backwards compatibil-
 ity with version 1.0 is provided.  This information is out of date.
 
-2.9  DDC
+3.9  DDC
 
 The VESA(R) Display Data Channel (DDC[tm]) standard allows the monitor to
 tell the video card (or on some cases the computer directly) about itself;
@@ -462,7 +578,7 @@
 the X server, or by specifying appropriate screen dimensions with the "Dis-
 playSize" keyword in the "Monitor" section of the config file.
 
-2.10  GLX and the Direct Rendering Infrastructure (DRI)
+3.10  GLX and the Direct Rendering Infrastructure (DRI)
 
 Precision Insight <URL:http://www.precisioninsight.com> has been provided
 with funding and support from Red Hat <URL:http://www.redhat.com>, SGI
@@ -483,7 +599,7 @@
 DRI Project <URL:http://dri.sourceforge.net> on SourceForge
 <URL:http://www.sourceforge.net>.
 
-2.11  X-Video Extension (Xv)
+3.11  X-Video Extension (Xv)
 
 An XvQueryPortAttributes function has been added as well as support for XvIm-
 ages.  XvImages are XImages in alternate color spaces such as YUV and can be
@@ -491,7 +607,7 @@
 display YUV data with high quality hardware scaling and filtering.   XvImages
 are only supported by the Matrox G200/G400 cards at the moment.
 
-2.12  Other extensions
+3.12  Other extensions
 
 The XFree86-Misc extension has not been fully ported to the new server archi-
 tecture yet.  This should be completed in a future release.
@@ -504,41 +620,50 @@
 3.3.x version of the extension is provided.  The missing parts of this exten-
 sion and some new features should be completed in a future release.
 
-2.13  Drivers
+3.13  Drivers
 
-XFree86 4.0 includes the following drivers:
+XFree86 4.0.1 includes the following drivers:
 
-                    +------------+----------------------+
-                    |Driver Name | Description          |
-                    +------------+----------------------+
-                    |apm         | Alliance Pro Motion  |
-                    |ati         | ATI                  |
-                    |chips       | Chips & Technologies |
-                    |cirrus      | Cirrus Logic         |
-                    |cyrix (*)   | Cyrix MediaGX        |
-                    |fbdev       | Linux fbdev          |
-                    |glide       | Glide2x (3Dfx)       |
-                    |glint       | 3Dlabs, TI           |
-                    |i740        | Intel i740           |
-                    |i810        | Intel i810           |
-                    |mga         | Matrox               |
-                    |neomagic    | NeoMagic             |
-                    |nv          | NVIDIA               |
-                    |r128        | ATI Rage 128         |
-                    |rendition   | Rendition            |
-                    |s3virge     | S3 ViRGE             |
-                    |sis         | SiS                  |
-                    |tdfx        | 3Dfx                 |
-                    |tga         | DEC TGA              |
-                    |trident     | Trident              |
-                    |tseng       | Tseng Labs           |
-                    |vga         | Generic VGA          |
-                    +------------+----------------------+
+             +------------+-------------------------------------+
+             |Driver Name | Description                         |
+             +------------+-------------------------------------+
+             |apm         | Alliance Pro Motion                 |
+             |ati         | ATI                                 |
+             |chips       | Chips & Technologies                |
+             |cirrus      | Cirrus Logic                        |
+             |cyrix (*)   | Cyrix MediaGX                       |
+             |fbdev       | Linux fbdev                         |
+             |glide       | Glide2x (3Dfx)                      |
+             |glint       | 3Dlabs, TI                          |
+             |i740        | Intel i740                          |
+             |i810        | Intel i810                          |
+             |mga         | Matrox                              |
+             |neomagic    | NeoMagic                            |
+             |nv          | NVIDIA                              |
+             |r128        | ATI Rage 128                        |
+             |rendition   | Rendition                           |
+             |s3virge     | S3 ViRGE                            |
+             |sis         | SiS                                 |
+             |sunbw2 (+)  | Sun bw2                             |
+             |suncg14 (+) | Sun cg14                            |
+             |suncg3 (+)  | Sun cg3                             |
+             |suncg6 (+)  | Sun GX and Turbo GX                 |
+             |sunffb (+)  | Sun Creator, Creator3D and Elite 3D |
+             |sunleo (+)  | Sun Leo (ZX)                        |
+             |suntcx (+)  | Sun TCX                             |
+             |tdfx        | 3Dfx                                |
+             |tga         | DEC TGA                             |
+             |trident     | Trident                             |
+             |tseng       | Tseng Labs                          |
+             |vga         | Generic VGA                         |
+             +------------+-------------------------------------+
 
 Drivers marked with (*) are present in a preliminary form in this release,
 but are not complete and/or stable yet.
+
+Drivers marked with (+) are for Linux/Sparc only.
 
-2.13.1  APM
+3.13.1  APM
 
 This is the driver for Alliance AT3D/AT25 and AT24 chips. There is a rather
 complete support for the functions with acceleration at 8,15,16,24 and 32
@@ -548,11 +673,11 @@
 tions, including overlay of the result. DGA and DGA2 have been tested ok.
 Further information can be found in README.apm.
 
-2.13.2  Chips & Technologies
+3.13.2  Chips & Technologies
 
 Information about the C&T driver can be found in README.chips.
 
-2.13.3  s3virge
+3.13.3  s3virge
 
 The s3virge driver is a port of the 3.3.x SVGA S3 ViRGE driver.  As such it
 should be as stable and functional as previous XFree86 releases.  There are a
@@ -580,13 +705,13 @@
 
 Further information can be found in README.s3virge.
 
-2.13.4  TGA
+3.13.4  TGA
 
 The TGA driver is now accelerated and supports both 8 and 32 plane frame-
 buffers.  It is known to work under Linux/Alpha.  Please see the
 README.DECtga file for further information.
 
-2.13.5  Matrox
+3.13.5  Matrox
 
 The MGA driver supports the same range or hardware as XFree86 3.3.4, but has
 a number of enhancements including multi-head support and support for (non-
@@ -605,20 +730,20 @@
 
 Further information can be found in the mga man page.
 
-2.13.6  ATI
+3.13.6  ATI
 
 Information about the ATI driver can be found in README.ati <URL:ati.html>.
 The current version is not accelerated.  Acceleration support is planned for
 a future release.
 
-2.13.7  NVIDIA
+3.13.7  NVIDIA
 
 The "nv" driver supports all Riva TNT accelerators as well as the new GeForce
 and Quadro accelerators.  DGA 2.0 support is included.
 
 Further information can be found in the nv man page.
 
-2.13.8  Glide
+3.13.8  Glide
 
 This driver is for Voodoo 1 and Voodoo 2 boards. It runs X on top of the 3DFX
 Glide API (where this is available, like for Linux). You need to have Glide
@@ -639,7 +764,7 @@
 For Voodoo Banshee and Voodoo 3 boards or later: Please use the tdfx driver
 which talks directly to the hardware and is much faster.
 
-2.13.9  GLINT
+3.13.9  GLINT
 
 The "glint" driver supports most 3Dlabs/Texas Instruments GLINT/Permedia
 chips. There is a rather complete support (better than in 3.3.x) for acceler-
@@ -649,9 +774,9 @@
 Further information about this driver can be found in the 'glint' driver man
 page.
 
-3.  X libraries and clients
+4.  X libraries and clients
 
-3.1  Xaw
+4.1  Xaw
 
 Two versions of the Xaw library are provided in this release. A version with
 bug fixes and a few binary compatible improvements and a new version with
@@ -710,11 +835,11 @@
    o Several bugs were fixed in the text code, while some code was rewritten
      from scratch.
 
-3.2  Xpm
+4.2  Xpm
 
 Version 3.4k of the Xpm (X pixmap) library is now integrated into XFree86.
 
-3.3  xterm
+4.3  xterm
 
 New Features:
 
@@ -891,7 +1016,7 @@
 
    o Various improvements to configure script, e.g., tests for utmp.
 
-3.4  xedit
+4.4  xedit
 
 Xedit have been changed to use most of the new features added to the new ver-
 sion of the Xaw library, and some xedit only features were added. Emacs users
@@ -930,18 +1055,18 @@
 
         o C-mode: this mode is expected to be stable, and fully usable.
 
-4.  Fonts and Internationalisation
+5.  Fonts and Internationalisation
 
 Details about the font support in this version of XFree86 can be found in the
 README.fonts document.
 
-4.1  TrueType support
+5.1  TrueType support
 
 This version of XFree86 comes with two TrueType backends, known as `xfsft'
 (the "freetype" module) and `X-TrueType' (the "xtt" module).  Both of these
 backends are based on the FreeType library.
 
-4.2  CID font support
+5.2  CID font support
 
 Support for CID-keyed fonts is included in this version of XFree86.  The CID-
 keyed font format was designed by Adobe Systems <URL:http://www.adobe.com>
@@ -949,7 +1074,7 @@
 was donated by SGI <URL:http://www.sgi.com>.  See the LICENSE document for a
 copy of the CID Font Code Public License.
 
-4.3  Internationalisation of the scalable font backends
+5.3  Internationalisation of the scalable font backends
 
 A new ``fontenc'' layer has been added to allow the scalable font backends to
 use a common method of font re-encoding.  This re-encoding makes it possible
@@ -958,14 +1083,14 @@
 TrueType backend.  The `X-TrueType' version of the TrueType backend uses a
 different re-encoding method based on loadable encoding modules.
 
-4.4  Large font optimisation
+5.4  Large font optimisation
 
 The glyph metrics array, which all the X clients using a particular font have
 access to, is now placed in shared memory, so as to reduce redundant memory
 consumption.  For non-local clients, the glyph metrics array is transmitted
 in a compressed format.
 
-4.5  Unicode/ISO 10646 support
+5.5  Unicode/ISO 10646 support
 
 What is included:
 
@@ -1015,7 +1140,7 @@
      and 18x18ja) is not yet supported by xterm (will be needed for CJK
      scripts).
 
-4.6  Lucidux fonts from Bigelow and Holmes
+5.6  Lucidux fonts from Bigelow and Holmes
 
 XFree86 now includes the ``Lucidux'' family of professionally hinted Type 1
 fonts.  This family consists of the fonts ``Lucidux Serif'', ``Lucidux Sans''
@@ -1028,9 +1153,9 @@
 <design@bigelowandholmes.com> or <sales@yandy.com>, or consult Y&Y's web site
 <URL:http://www.yandy.com>.
 
-5.  Miscellaneous
+6.  Miscellaneous
 
-5.1  Directory rearrangements
+6.1  Directory rearrangements
 
 Some changes to the installed XFree86 directory structure have been imple-
 mented for 4.0.  One important change is a modified search path for the X
@@ -1041,7 +1166,7 @@
 located under the appropriate subdirectories of /var, again with the relevant
 symbolic links in the old location.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.37 2000/03/08 20:11:55 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.41 2000/07/02 02:35:27 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/RELNOTES,v 3.82 2000/03/08 20:39:24 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/RELNOTES,v 3.84 2000/07/02 02:46:27 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/Status
diff -u xc/programs/Xserver/hw/xfree86/doc/Status:1.11 xc/programs/Xserver/hw/xfree86/doc/Status:1.13
--- xc/programs/Xserver/hw/xfree86/doc/Status:1.11	Fri Mar  3 16:51:35 2000
+++ xc/programs/Xserver/hw/xfree86/doc/Status	Mon Jun 19 08:12:27 2000
@@ -1,4 +1,4 @@
-                      Driver Status for XFree86[tm] 4.0
+                     Driver Status for XFree86[tm] 4.0.1
 
                           The XFree86 Project, Inc
 
@@ -7,17 +7,17 @@
                                   Abstract
 
      This document provides information about the status of the driver
-     and hardware support in XFree86 4.0 compared with that in XFree86
+     and hardware support in XFree86 4.0.1 compared with that in XFree86
      3.3.6.  Please send updates for this document to
      <fixes@xfree86.org>
 
 1.  Introduction
 
 This document contains one section per vendor (organised alphabetically) for
-each chipset family that is supported in XFree86 3.3.6 or XFree86 4.0.  It
+each chipset family that is supported in XFree86 3.3.6 or XFree86 4.0.1.  It
 includes information about the status of the drivers and the hardware they
 support, including a comparison of the level of support between versions
-3.3.6 and 4.0.
+3.3.6 and 4.0.1.
 
 NOTE: Status information needs to be checked carefully and expanded where
 possible.  E.g., include information about acceleration, multi-head, known
@@ -31,7 +31,7 @@
             Support is provided by the XF86_SVGA server with the tdfx
             driver).
 
-      4.0:
+      4.0.1:
             Support for Voodoo 1 and Voodoo 2 via glide on platforms where
             glide is available (Linux and FreeBSD(?)).  Support is provided
             by the "glide" driver (requires Glide 2x).
@@ -40,7 +40,7 @@
             Support is provided by the "tdfx" driver.
 
       Summary:
-            All hardware supported in 3.3.6 is also supported in 4.0.
+            All hardware supported in 3.3.6 is also supported in 4.0.1.
 
 3.  3Dlabs
 
@@ -50,13 +50,13 @@
             ramdacs), Permedia with IBM RGB526 ramdac, Permedia 2, 2a, 2v.
             Support is provided by the XF86_3DLabs server.
 
-      4.0:
+      4.0.1:
             Support (including acceleration) for Permedia, Permedia 2, 2v
             (and 2a??) GLINT 500TX, GLINT MX, GLINT Gamma, and Glint Delta
             coproc.  Support is provided by the "glint" driver.
 
       Summary:
-            All hardware supported in 3.3.6 is also supported in 4.0.
+            All hardware supported in 3.3.6 is also supported in 4.0.1.
 
 4.  Alliance
 
@@ -64,14 +64,14 @@
             Support (including acceleration) for the AT24, AP6422, AT3D.
             Support is provided by the XF86_SVGA server with the apm driver.
 
-      4.0:
+      4.0.1:
             Support (including acceleration?) for the AT24, AT25 and AT3D.
             This support is provided by the "apm" driver.  This driver cur-
             rently has only incomplete support for the AP6422.
 
       Summary:
-            The AP6422 is supported in 3.3.6 but not fully in 4.0.  The AT25
-            is supported in 4.0 but not in 3.3.6.
+            The AP6422 is supported in 3.3.6 but not fully in 4.0.1.  The
+            AT25 is supported in 4.0.1 but not in 3.3.6.
 
 5.  ARK Logic
 
@@ -80,12 +80,12 @@
             and ARK2000MT.  Support is provided by the XF86_SVGA server with
             the ark driver.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old driver has
             not been ported.
 
       Summary:
-            No ARK Logic chips are supported in 4.0.
+            No ARK Logic chips are supported in 4.0.1.
 
 6.  ATI
 
@@ -103,16 +103,18 @@
             driver.  Accelerated support is provided for the Rage 128 chips
             by the XF86_SVGA server with the r128 driver.
 
-      4.0:
+      4.0.1:
             Accelerated support is provided for the Rage 128 chips by the
-            "r128" driver.  Unaccelerated support is provided for all of the
-            others except the Mach8 and some early Mach32 chips by the "ati"
-            driver.
+            "r128" driver.  Accelerated support is provided for the Mach64
+            Rage variants by the "ati" driver.  Unaccelerated support is pro-
+            vided for all of the others except the Mach8 and some early
+            Mach32 chips by the "ati" driver.
 
       Summary:
-            All chips supported in 3.3.6 are supported in 4.0 except for
-            Mach8 and some old Mach32 chips.  The support in 4.0 is, however,
-            unaccelerated for all chips except the Rage 128.
+            All chips supported in 3.3.6 are supported in 4.0.1 except for
+            Mach8 and some old Mach32 chips.  The support in 4.0.1 is, how-
+            ever, unaccelerated for all chips except the Mach64, Rage and
+            Rage 128 variants.
 
 7.  Avance Logic
 
@@ -124,12 +126,12 @@
             don't have any recent test reports, and these drivers have no
             maintainer.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old drivers
             have not been ported.
 
       Summary:
-            No Avance Logic chips are supported in 4.0.
+            No Avance Logic chips are supported in 4.0.1.
 
 8.  Chips and Technologies
 
@@ -139,13 +141,13 @@
             64300.  This support is provided by the XF86_SVGA server with the
             chips driver.
 
-      4.0:
+      4.0.1:
             Support (accelerated) for the 65520, 65525, 65530, 65535, 65540,
             65545, 65546, 65548, 65550, 65554, 65555, 68554, 69000, 64200 and
             64300.  This support is provided by the "chips" driver.
 
       Summary:
-            All chips supported in 3.3.6 are also supported in 4.0.
+            All chips supported in 3.3.6 are also supported in 4.0.1.
 
 9.  Cirrus Logic
 
@@ -157,15 +159,15 @@
             7541, 7542, 7543, 7548, 7555 and 7556 is provided by the
             XF86_SVGA server with the cirrus driver.
 
-      4.0:
+      4.0.1:
             Support (accelerated) for the Alpine (5430, 5434, 5436, 5446,
             5480), and Laguna (5462, 5464, 5465) chips is provided by the
             "cirrus" driver.
 
       Summary:
-            The following chips are supported in 3.3.6 but not in 4.0: 6410,
-            6412, 6420, 6440, 5420, 5422, 5424, 5426, 5428, 5429, 6205, 6215,
-            6225, 6235, 7541, 7542, 7543, 7548, 7555 and 7556.
+            The following chips are supported in 3.3.6 but not in 4.0.1:
+            6410, 6412, 6420, 6440, 5420, 5422, 5424, 5426, 5428, 5429, 6205,
+            6215, 6225, 6235, 7541, 7542, 7543, 7548, 7555 and 7556.
 
 10.  Compaq/Digital
 
@@ -179,7 +181,7 @@
             24 plane 3D chips (on Alpha platforms) is provided by the
             XF86_TGA server.
 
-      4.0:
+      4.0.1:
             No support for the Compaq AVGA (driver hasn't been ported).
 
             Support (accelerated) for the DEC 21030 TGA 8 plane, 24 plane and
@@ -187,8 +189,8 @@
             the "tga" driver.
 
       Summary:
-            No Compaq AVGA support in 4.0.  DEC TGA support is equivalent in
-            both versions.
+            No Compaq AVGA support in 4.0.1.  DEC TGA support is equivalent
+            in both versions.
 
 11.  Cyrix
 
@@ -196,12 +198,12 @@
             Support (accelerated) for the Cyrix MediaGX is provided by the
             XF86_SVGA server with the cyrix driver.
 
-      4.0:
+      4.0.1:
             A preliminary port of the driver is available, but it isn't ready
             for widespread use.
 
       Summary:
-            No Cyrix chips are well-supported in 4.0.
+            No Cyrix chips are well-supported in 4.0.1.
 
 12.  Epson
 
@@ -209,12 +211,12 @@
             Support (accelerated) for the Epson SPC8110 is provided by the
             XF86_SVGA server with the spc8100 driver.
 
-      4.0:
+      4.0.1:
             No native support for this chipset, because the old driver has
             not been ported.
 
       Summary:
-            No Epson chips are supported in 4.0.
+            No Epson chips are supported in 4.0.1.
 
 13.  Genoa
 
@@ -224,12 +226,12 @@
             because we don't have any recent test reports, and this driver
             has no maintainer.
 
-      4.0:
+      4.0.1:
             No native support for this chipset, because the old driver has
             not been ported.
 
       Summary:
-            No Genoa chips are supported in 4.0.
+            No Genoa chips are supported in 4.0.1.
 
 14.  IBM
 
@@ -244,7 +246,7 @@
             Support for the IBM XGA-2 chip is provided by the XF86_AGX
             server.
 
-      4.0:
+      4.0.1:
             Support for the standard IBM VGA chip (and compatibles) is pro-
             vided by the "vga" driver.
 
@@ -253,7 +255,7 @@
 
       Summary:
             The standard VGA core is supported in both versions, but there is
-            no support for the 8514/A or XGA-2 in 4.0.
+            no support for the 8514/A or XGA-2 in 4.0.1.
 
 15.  IIT
 
@@ -261,12 +263,12 @@
             Support (accelerated) for the AGX-016, AGX-015 and AGX-014 is
             provided by the XF86_AGX server..
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old driver has
             not been ported.
 
       Summary:
-            No IIT chips are supported in 4.0.
+            No IIT chips are supported in 4.0.1.
 
 16.  Intel
 
@@ -277,7 +279,7 @@
             Linux, and requires the agpgart.o kernel module in order to use
             modes that require more than 1MB of video memory.
 
-      4.0:
+      4.0.1:
             Support (accelerated) for the Intel i740 is provided by the
             "i740" driver, and support for the Intel i810 is provided by the
             "i810" driver.  The "i810" driver is currently Linux-only, and
@@ -294,13 +296,13 @@
             (Mystique), MGA2164W (Millennium II) (PCI and AGP), G100, G200
             and G400 is provided by the XF86_SVGA server with the mga driver.
 
-      4.0:
+      4.0.1:
             Support (accelerated) for the MGA2064W (Millennium I), MGA1064SG
             (Mystique), MGA2164W (Millennium II) (PCI and AGP), G100, G200
             and G400 is provided by the "mga" driver.
 
       Summary:
-            All chips supported in 3.3.6 are also supported in 4.0.
+            All chips supported in 3.3.6 are also supported in 4.0.1.
 
 18.  MX (???)
 
@@ -310,12 +312,12 @@
             is unknown because we don't have any recent test reports, and
             this driver has no maintainer.
 
-      4.0:
+      4.0.1:
             No native support for this chipset, because the old driver has
             not been ported.
 
       Summary:
-            No MX (???) chips are supported in 4.0.
+            No MX (???) chips are supported in 4.0.1.
 
 19.  NCR
 
@@ -324,12 +326,12 @@
             XF86_SVGA server and the ncr77c22 driver.  The status of this
             support is unknown because we don't have any recent test reports.
 
-      4.0:
+      4.0.1:
             No native support for this chipset, because the old driver has
             not been ported.
 
       Summary:
-            No NCR chips are supported in 4.0.
+            No NCR chips are supported in 4.0.1.
 
 20.  NeoMagic
 
@@ -338,29 +340,29 @@
             NM2097, NM2160 and NM2200 chipsets is provided by the XF86_SVGA
             server with the neo driver.
 
-      4.0:
+      4.0.1:
             Support (accelerated) for the NeoMagic NM2070, NM2090, NM2093,
             NM2097, NM2160 and NM2200 chipsets is provided by the "neomagic"
             driver.
 
       Summary:
-            All chips supported in 3.3.6 are also supported in 4.0.
+            All chips supported in 3.3.6 are also supported in 4.0.1.
 
 21.  NVIDIA
 
       3.3.6:
             Support (accelerated) for the NV1, Riva 128, 128ZX, TNT, TNT2
-            (Ultra, Vanta, M64), GeForce (DDR) and Quadro is provided by the
-            XF86_SVGA server and the nv driver.
+            (Ultra, Vanta, M64), GeForce (DDR, 256) and Quadro is provided by
+            the XF86_SVGA server and the nv driver.
 
-      4.0:
+      4.0.1:
             Support (accelerated) for the Riva 128, 128ZX, TNT, TNT2 (Ultra,
-            Vanta, M64), GeForce (DDR) and Quadro is provided by the
-            XF86_SVGA server and the nv driver.
+            Vanta, M64), GeForce (DDR, 256) and Quadro is provided by the nv
+            driver.
 
       Summary:
             All chipsets supported in 3.3.6 except the NV1 are also supported
-            in 4.0.
+            in 4.0.1.
 
 22.  Number Nine
 
@@ -368,12 +370,12 @@
             Support (accelerated) for the Imagine 128, Ticket 2 Ride, Revolu-
             tion 3D and Revolution IV is provided by the XF86_I128 server.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old driver has
             not been ported.
 
       Summary:
-            No Number Nine chips are supported in 4.0.
+            No Number Nine chips are supported in 4.0.1.
 
 23.  Oak Technologies Inc
 
@@ -382,12 +384,12 @@
             acceleration) is provided by the XF86_SVGA server and the oak
             driver.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old driver has
             not been ported.
 
       Summary:
-            No Oak chips are supported in 4.0.
+            No Oak chips are supported in 4.0.1.
 
 24.  Paradise/Western Digital
 
@@ -398,12 +400,12 @@
             port for some of these chipsets is uncertain because we don't
             have any recent test reports, and this driver has no maintainer.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old driver has
             not been ported.
 
       Summary:
-            No Paradise/Western Digital chips are supported in 4.0.
+            No Paradise/Western Digital chips are supported in 4.0.1.
 
 25.  RealTek
 
@@ -413,12 +415,12 @@
             unknown because we don't have any recent test reports, and this
             driver has no maintainer.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old driver has
             not been ported.
 
       Summary:
-            No RealTek chips are supported in 4.0.
+            No RealTek chips are supported in 4.0.1.
 
 26.  Rendition/Micron
 
@@ -426,12 +428,12 @@
             Support for the Verite 1000, 2100 and 2200 is provided by the
             XF86_SVGA server with the rendition driver.
 
-      4.0:
+      4.0.1:
             Support for the Verite 1000, 2100 and 2200 is provided by the
             "rendition" driver.
 
       Summary:
-            All chips supported in 3.3.6 are also supported in 4.0.
+            All chips supported in 3.3.6 are also supported in 4.0.1.
 
 27.  S3
 
@@ -449,15 +451,15 @@
             by the XF86_SVGA server with the s3_savage driver (CHECK: is this
             support Linux-only?).
 
-      4.0:
+      4.0.1:
             Support (accelerated) for the ViRGE, ViRGE/VX, ViRGE/DX,
             ViRGE/GX, ViRGE/GX2, ViRGE/MX, ViRGE/MX+, Trio3D and Trio3D/2X is
             provided by the "s3virge" driver.  Support for the other S3
             chipsets has not yet been ported.
 
       Summary:
-            Only the ViRGE and Trio3D chipsets are supported in 4.0.  All of
-            the other chipsets are only supported in 3.3.6.
+            Only the ViRGE and Trio3D chipsets are supported in 4.0.1.  All
+            of the other chipsets are only supported in 3.3.6.
 
 28.  Silicon Integrated Systems (SiS)
 
@@ -466,7 +468,7 @@
             86C225, 5597, 5598, 6326, 530, 620, 300, 630 and 540 is provided
             by the XF86_SVGA server with the sis driver.
 
-      4.0:
+      4.0.1:
             Support (accelerated) for the SiS
              530, 620, 6326 is provided by the "sis" driver.  The 630, 300,
             and 540 are also supported, but this code is new and there are
@@ -483,12 +485,13 @@
             LynxEM+ and Lynx3DM chips is provided by the XF86_SVGA server
             with the smi driver.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the driver has not
             been ported.
 
       Summary:
-            No SMI chips are supported in 4.0.
+            No SMI chips are supported in 4.0.1, but the fbdev driver is
+            reported to work on Linux.
 
 30.  Trident Microsystems
 
@@ -503,7 +506,7 @@
             CyberBlade/DSTN/i7 and CyberBlade/i1 is provided by the XF86_SVGA
             server with the tvga8900 driver.
 
-      4.0:
+      4.0.1:
             Support (accelerated where the chip supports it) for the
             TVGA8900D, TGUI9420DGi, TGUI9440AGi, TGUI9660, TGUI9680, ProVidia
             9682, ProVidia 9685, Cyber9320, Cyber9382, Cyber9385, Cyber9388,
@@ -513,7 +516,7 @@
 
       Summary:
             The following (older) chipsets that are supported in 3.3.6 are
-            not supported in 4.0: TVGA8200LX, TVGA8800CS, TVGA8900B,
+            not supported in 4.0.1: TVGA8200LX, TVGA8800CS, TVGA8900B,
             TVGA8900C, TVGA8900CL, TVGA9000, TVGA9000i, TVGA9100B,
             TVGA9200CXr, TGUI9400CXi, TGUI9420, TGUI9430DGi.
 
@@ -527,14 +530,14 @@
             driver.  Support (accelerated) for the ET4000/W32 series and the
             ET6000 is also provided by the deprecated XF86_W32 server.
 
-      4.0:
+      4.0.1:
             Support for the ET4000AX, and accelerated support for the
             ET4000/W32, ET4000/W32i, ET4000/W32p, ET6000 and ET6100 is pro-
             vided by the "tseng" driver.
 
       Summary:
-            All cards supported by 3.3.6 are also supported by 4.0 except for
-            the old ET3000.
+            All cards supported by 3.3.6 are also supported by 4.0.1 except
+            for the old ET3000.
 
 32.  Video 7
 
@@ -544,12 +547,12 @@
             unknown because we don't have any recent test reports, and this
             driver has no maintainer.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old driver has
             not been ported.
 
       Summary:
-            No Video 7 chips are supported in 4.0.
+            No Video 7 chips are supported in 4.0.1.
 
 33.  Weitek
 
@@ -558,14 +561,14 @@
             server and accelerated support for the P9100 is provided by the
             XF86_SVGA server with the p9x00 driver.
 
-      4.0:
+      4.0.1:
             No native support for these chipsets, because the old drivers
             have not been ported.
 
       Summary:
-            No Weitek chips are supported in 4.0.
+            No Weitek chips are supported in 4.0.1.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.15 2000/03/03 21:28:10 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.17 2000/06/19 15:00:54 tsi Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/Status,v 1.11 2000/03/04 00:51:35 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/Status,v 1.13 2000/06/19 15:12:27 tsi Exp $
Index: xc/programs/Xserver/hw/xfree86/doc/VideoBoard98
diff -u xc/programs/Xserver/hw/xfree86/doc/VideoBoard98:1.3 xc/programs/Xserver/hw/xfree86/doc/VideoBoard98:1.5
--- xc/programs/Xserver/hw/xfree86/doc/VideoBoard98:1.3	Mon Feb 21 10:05:46 2000
+++ xc/programs/Xserver/hw/xfree86/doc/VideoBoard98	Tue Jun 20 13:07:58 2000
@@ -1,4 +1,4 @@
-DATE:000220
+DATE:000616
                        XFree86 PC98 Server
                         Video System List
 
@@ -57,18 +57,18 @@
 |PC9821St15              |MGA2064W       |Ti3026 |Ti3026  |4|  o?   |O|
 |PC9821St20              |MGA2064W       |Ti3026 |Ti3026  |4|  o?   |O|
 |PC9821Xa                |MGA II         |Ti3020 |Ti3020  |2|   X   | |
-|PC9821Xa7/C,K           |TGUI9680       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa9/C,K           |TGUI9680       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa10/C,K          |TGUI9680       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa12/C,K          |TGUI9680       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa13/C,K          |TGUI9680       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa13/W            |TGUI9682       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa16/R            |TGUI9680       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa16/W            |TGUI9682       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa20/D,W          |TGUI9682       | B/I   |  B/I   |2|   X   |O|
-|PC9821Xa200/D,W         |TGUI9682       | B/I   |  B/I   |2|   X   |O|
+|PC9821Xa7/C,K           |TGUI9680       | B/I   |  B/I   |2|   o   |O|
+|PC9821Xa9/C,K           |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Xa10/C,K          |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Xa12/C,K          |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Xa13/C,K          |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Xa13/W            |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Xa16/R            |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Xa16/W            |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Xa20/D,W          |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Xa200/D,W         |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
 |PC9821Xb10              |CLGD5440       | B/I   |  B/I   |1|   X   |X|
-|PC9821Xc13/M,S          |TGUI9680       | B/I   |  B/I   |2|   X   |O|
+|PC9821Xc13/M,S          |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
 |PC9821Xc13/S5           |CLGD5446       | B/I   |  B/I   |1|   X   |X|
 |PC9821Xc16/M,S          |CLGD5446       | B/I   |  B/I   |2|   X   |X|
 |PC9821Xc200/M,S         |CLGD5446       | B/I   |  B/I   |2|   X   |X|
@@ -79,7 +79,7 @@
 |PC9821Xs                |S3-864         |S3-SDAC|S3-SDAC |2|   X   |O|
 |PC9821Xe                |CLGD5430       | B/I   |  B/I   |1|   X   |X|
 |PC9821Xe10              |CLGD5430       | B/I   |  B/I   |1|   X   |X|
-|PC9821Xv13/R            |TGUI9680       | B/I   |  B/I   |2|   X   |O|
+|PC9821Xv13/R            |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
 |PC9821Xv13/W            |MGA2064W       |Ti3026 |Ti3026  |2|  o?   |O|
 |PC9821Xv20/W            |MGA2064W       |Ti3026 |Ti3026  |4|  o?   |O|
 +------------------------+---------------+-------+--------+-+-------+-+
@@ -90,9 +90,9 @@
 |PC9821V16/S             |CLGD5440       | B/I   |  B/I   |1|   X   |X|
 |PC9821V16/S5V,P         |CLGD5446       | B/I   |  B/I   |2|   X   |X|
 |PC9821V20/S7            |CLGD5440       | B/I   |  B/I   |1|   X   |X|
-|PC9821V13/M7            |TGUI9680       | B/I   |  B/I   |2|   X   |O|
-|PC9821V16/M7            |TGUI9680       | B/I   |  B/I   |2|   X   |O|
-|PC9821V20/M7            |TGUI9680       | B/I   |  B/I   |2|   X   |O|
+|PC9821V13/M7            |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
+|PC9821V16/M7            |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
+|PC9821V20/M7            |TGUI9680       | B/I   |  B/I   |2|  o?   |O|
 |PC9821V166/S            |MGA1064SG      | B/I   |  B/I   |2|  o?   |O|
 |PC9821V200/S            |MGA1064SG      | B/I   |  B/I   |2|  o?   |O|
 |PC9821V200/M7           |MGA1064SG      | B/I   |  B/I   |4|   o   |O|
@@ -120,16 +120,16 @@
 |PC9821Cu16/H            |ProVidia9685   | B/I   |  B/I   |2|   X   |X|
 |PC9821Ct20/A            |ProVidia9685   | B/I   |  B/I   |2|   X   |X|
 +------------------------+---------------+-------+--------+-+-------+-+
-|PC9821Ra18/N            |TGUI9682       | B/I   |  B/I   |2|   X   |O|
-|PC9821Ra20/N            |TGUI9682       | B/I   |  B/I   |2|   X   |O|
-|PC9821Ra266/D,N,W       |TGUI9682       | B/I   |  B/I   |2|   X   |O|
+|PC9821Ra18/N            |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
+|PC9821Ra20/N            |TGUI9682       | B/I   |  B/I   |2|   o   |O|
+|PC9821Ra266/D,N,W       |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
 |PC9821Rv20/N20          |MGA2064W       |Ti3026 |Ti3026  |4|   o   |O|
 +------------------------+---------------+-------+--------+-+-------+-+
-|PC9821RaII23/N,W        |TGUI9682       | B/I   |  B/I   |2|   X   |O|
+|PC9821RaII23/N,W        |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
 |PC9821RvII26/N20        |MGA2064W       |Ti3026 |Ti3026  |4|   o   |O|
 +------------------------+---------------+-------+--------+-+-------+-+
-|PC9821Rs20/B20          |TGUI9682       | B/I   |  B/I   |2|   X   |O|
-|PC9821RsII26/B40        |TGUI9682       | B/I   |  B/I   |2|   X   |O|
+|PC9821Rs20/B20          |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
+|PC9821RsII26/B40        |TGUI9682       | B/I   |  B/I   |2|  o?   |O|
 +------------------------+---------------+-------+--------+-+-------+-+
 |PC9821C166/C            |3Dimage975     |       |        |4|   X   | |
 |PC9821C166/D            |ProVidia9685   | B/I   |  B/I   |2|   X   | |
@@ -262,7 +262,7 @@
 |Power WindowDX          |S3-ViRGE/DX    | B/I   |  B/I   |4|   X   | |
 |Power WindowDX/4MC      |S3-ViRGE/DX    | B/I   |  B/I   |4|   X   | |
 |Power WindowGX/4VC      |S3-ViRGE/GX    | B/I   |  B/I   |4|   X   | |
-|Power WindowGMX         |GLINT MX       |RGB526 |        |8|   X   | |
+|Power WindowGMX         |GLINT MX       |RGB526 |        |8|   ?   | |
 +------------------------+---------------+-------+--------+-+-------+-+
 
 							    
@@ -311,14 +311,14 @@
 |GA-98NB IV              |CLGD5434       | B/I   |  B/I   |4|   X   |X|
 |GA-DR2/98               |TGUI9660       | B/I   |  B/I   |2|   X   |X|
 |GA-DR4/98               |TGUI9660       | B/I   |  B/I   |4|   X   |X|
-|GA-DR2/PCI              |TGUI9660       | B/I   |  B/I   |2|   X   | |
-|GA-DR4/PCI              |TGUI9660       | B/I   |  B/I   |4|   X   | |
+|GA-DR2/PCI              |TGUI9660       | B/I   |  B/I   |2|   ?   | |
+|GA-DR4/PCI              |TGUI9660       | B/I   |  B/I   |4|   ?   | |
 |GA-DRV2/98              |TGUI9680       | B/I   |  B/I   |2|   X   |X|
 |GA-DRV4/98              |TGUI9680       | B/I   |  B/I   |4|   X   |X|
-|GA-DRV2/PCI             |TGUI9680       | B/I   |  B/I   |2|   X   | |
-|GA-DRV4/PCI             |TGUI9680       | B/I   |  B/I   |4|   X   | |
-|GA-DRTV2/98PCI          |TGUI9682       | B/I   |  B/I   |2|   X   | |
-|GA-DRTV4/98PCI          |TGUI9682       | B/I   |  B/I   |4|   X   | |
+|GA-DRV2/PCI             |TGUI9680       | B/I   |  B/I   |2|   ?   | |
+|GA-DRV4/PCI             |TGUI9680       | B/I   |  B/I   |4|   ?   | |
+|GA-DRTV2/98PCI          |TGUI9682       | B/I   |  B/I   |2|   ?   | |
+|GA-DRTV4/98PCI          |TGUI9682       | B/I   |  B/I   |4|   ?   | |
 |GA-968V2/98PCI          |S3-968         |RGB524 | RGB524 |2|   X   |O|
 |GA-968V4/98PCI          |S3-968         |RGB524 | RGB524 |4|   X   |O|
 |GA-PGDX2/98PCI          |S3-ViRGE/DX    | B/I   |  B/I   |2|   X   | |
@@ -327,10 +327,10 @@
 |GA-PG3D4/98PCI          |S3-ViRGE       | B/I   |  B/I   |4|   X   | |
 |GA-PG3DVX4/98PCI        |S3-ViRGE/VX    | B/I   |  B/I   |4|   X   | |
 |GA-PG3DVX8/98PCI        |S3-ViRGE/VX    | B/I   |  B/I   |8|   X   | |
-|GA-PII8/PCI             |PERMEDIA2      |       |        |8|   o?  |O|
-|GA-PIIH8/PCI            |PERMEDIA2      |       |        |8|   o?  |O|
-|GA-RUSH6/PCI            |Promotion AT25 |       |        |4|   o   | |
-|                        |Voodoo RUSH    |       |        |2|       | |
+|GA-PII8/PCI             |PERMEDIA2      |       |        |8|   O?  |O|
+|GA-PIIH8/PCI            |PERMEDIA2      |       |        |8|   O?  |O|
+|GA-RUSH6/PCI            |Promotion AT25 |       |        |4|   o   |o|
+|                        |Voodoo RUSH    |       |        |2|   -   | |
 +------------------------+---------------+-------+--------+-+-------+-+
 
 
@@ -384,4 +384,4 @@
 |WinFrame928             |S3-928         |       |        |2|   X   | |
 +------------------------+---------------+-------+--------+-+-------+-+
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/doc/VideoBoard98,v 1.3 2000/02/21 18:05:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/doc/VideoBoard98,v 1.5 2000/06/20 20:07:58 dawes Exp $ */
Index: xc/programs/Xserver/hw/xfree86/doc/Japanese/README98
diff -u xc/programs/Xserver/hw/xfree86/doc/Japanese/README98:1.2 xc/programs/Xserver/hw/xfree86/doc/Japanese/README98:1.4
--- xc/programs/Xserver/hw/xfree86/doc/Japanese/README98:1.2	Mon Jul 19 06:36:18 1999
+++ xc/programs/Xserver/hw/xfree86/doc/Japanese/README98	Tue Jun 20 13:07:58 2000
@@ -1,6 +1,6 @@
   XFree86 PC98 Dependent Information
   The XFree86 Project Inc. and X98 CORE TEAM Ãø
-  1999 ǯ 7 ·î 19 Æü
+  2000 ǯ 6 ·î 20 Æü
 
   ¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¡¢PC98 ¸ÇÍ­¤Î»ö¹à¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£PC/AT ¸ß´¹µ¡
   ¤È¶¦Ä̤λö¹à¤Ë¤Ä¤¤¤Æ¤Ï¡¢¶¦Ä̤Υɥ­¥å¥á¥ó¥È¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£
@@ -10,11 +10,12 @@
   ËÜ¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢PC98 ÍÑ X ¥µ¡¼¥Ð¤Ï PC/AT ¸ß´¹µ¡ÍÑ X ¥µ¡¼¥Ð¤ÈÅý¹ç (¥Õ¥¡
   ¥¤¥ë̾: XFree86) ¤µ¤ì¤Æ¤ª¤ê¡¢½¾Íè¤Î¥Ü¡¼¥É / ¥Á¥Ã¥×¥»¥Ã¥ÈËè¤Î¥µ¡¼¥Ð¤â¤Ê
   ¤¯¤Ê¤ê¤Þ¤·¤¿¡£¤Þ¤¿¡¢³Æ¥É¥é¥¤¥Ð¤Ï¤¹¤Ù¤Æ SVGA ¥Ù¡¼¥¹¤Ç¡¢XF86_S3 ¥Ù¡¼¥¹¤Î
-  ¥É¥é¥¤¥Ð¤Ï¤¢¤ê¤Þ¤»¤ó¡£¸½ºß¤Î¤È¤³¤í¡¢PC98 ¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤Î¤Ï¡¢mga ¥É¥é
-  ¥¤¥Ð¤Î¤ß¤Ç¤¹¡£Millennium¡¢Mystique ¤Î¥Ü¡¼¥É¤ò¤ª»ý¤Á¤ÎÊý°Ê³°¤Ï¡¢3.3 ¥Ù¡¼
-  ¥¹ (ex. 3.3.3.1, 3.3.4) ¤Î´Ä¶­¤ò¸æÍøÍѲ¼¤µ¤¤¡£EGC ¤ä PEGC ¤¹¤éÍøÍѤÇ
-  ¤­¤Þ¤»¤ó¡£³«È¯¥á¥ó¥Ð¤¬Èó¾ï¤Ë¾¯¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¢³«È¯¤Ë¶½Ì£¤¬¤ª¤¢¤ê¤Î
-  Êý¤Ï X98 Core Team ¤Þ¤Ç¡¢¸æÏ¢Íí²¼¤µ¤¤¡£
+  ¥É¥é¥¤¥Ð¤Ï¤¢¤ê¤Þ¤»¤ó¡£¸½ºß¤Î¤È¤³¤í¡¢PC98 ¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤Î¤Ï¡¢mga¡¢
+  apm¡¢glint¡¢trident ¥É¥é¥¤¥Ð¤Î¤ß¤Ç¤¹¡£Millennium¡¢Mystique¡¢
+  VoodooRUSH¡¢Permedia2¡¢TGUI968x(¤¤¤º¤ì¤â PCI) ¤Î¥Ü¡¼¥É¤ò¤ª»ý¤Á¤ÎÊý°Ê³°
+  ¤Ï¡¢3.3 ¥Ù¡¼¥¹ (ex. 3.3.6) ¤Î´Ä¶­¤ò¸æÍøÍѲ¼¤µ¤¤¡£¸½¾õ 4.0 ¤Ç¤Ï EGC ¤ä
+  PEGC ¤¹¤éÍøÍѤǤ­¤Þ¤»¤ó¡£³«È¯¥á¥ó¥Ð¤¬Èó¾ï¤Ë¾¯¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¢³«È¯
+  ¤Ë¶½Ì£¤¬¤ª¤¢¤ê¤ÎÊý¤Ï X98 Core Team ¤Þ¤Ç¡¢¸æÏ¢Íí²¼¤µ¤¤¡£
 
   XF86Config ¤äµ¯Æ°»þ¤Î¥ª¥×¥·¥ç¥óÅù¤ÎÊѹ¹¤Ë¤Ä¤¤¤Æ¤Ï¡¢RELNOTES ¤Ë¾Ü¤·¤¯½ñ
   ¤¤¤Æ¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢»²¾È¤·¤Æ²¼¤µ¤¤¡£/usr/X11R6/lib/X11/XF86Config.98
@@ -32,12 +33,16 @@
     ------------- ----------------------------------------------- -------
     NEC           ¥Õ¥ë¥«¥é¡¼¥¦¥£¥ó¥É¥¦¥¢¥¯¥»¥é¥ì¡¼¥¿¥Ü¡¼¥É X2     XFree86
     Matrox        MGA Millennium(PC/AT ¸ß´¹µ¡ÍÑ)                  XFree86
+    IO-DATA       GA-RUSH6/PCI                                    XFree86
+    Melco         WHP-PS8, WHP-PS4                                XFree86
+    (IO-DATA      GA-PII8, GA-PIIH8                               XFree86)
 
   2.2.  ¥µ¥Ý¡¼¥ÈÆ⢥ӥǥª¥·¥¹¥Æ¥à°ìÍ÷
 
     ¥Ù¥ó¥À¡¼      ¥Á¥Ã¥×¥»¥Ã¥È                                    ¥µ¡¼¥Ð
     ------------- ----------------------------------------------- -------
     NEC           MGA Millennium/Mystique                         XFree86
+    NEC           Trident TGUI968x(X-Mate,ValueStar Åù)           XFree86
 
   3.  ¶¦ÄÌ»ö¹à
 
@@ -57,9 +62,10 @@
         ¤Î»ØÄê¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£¤³¤ì¤Ç PC98 ¤Èǧ¼±¤µ¤ì¡¢¥í¥°¤Ë
 
         (**) Japanese PC98 architecture
+
         ¤È½ÐÎϤµ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
 
-     xf86config
+     xf86config¡¢xf86cfg
         PC98 ÍѤ˰ܿ¢¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£/usr/X11R6/lib/X11/XF86Config.98 ¤ò
         XF86Config ¤È¥ê¥Í¡¼¥à¤·¤Æ»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
 
@@ -99,25 +105,21 @@
                 XkbModel        "pc98"
                 XkbLayout       "nec/jp"
 
-        ¤Î»ØÄê¤ò¤·¤Æ²¼¤µ¤¤¡£
+     ¤Î»ØÄê¤ò¤·¤Æ²¼¤µ¤¤¡£
 
      BusID
         XF86Config ¤Î Section "Device" ¤Ç¡¢É¬¤º
 
                 BusID   "0:10:0"
 
-        ¤Î¤è¤¦¤Ê»ØÄê¤ò¤·¤Æ²¼¤µ¤¤¡£¥í¥°¤Ë
+     ¤Î¤è¤¦¤Ê»ØÄê¤ò¤·¤Æ²¼¤µ¤¤¡£¥í¥°¤Ë
 
              (--) PCI: (0:7:0) NEC unknown chipset (0x0009) rev 2
              (--) PCI: (0:12:0) S3 968 rev 0, Mem @ 0x24000000/25
              (--) PCI: (0:14:0) Matrox MGA 2064W rev 1, Mem @ 0x20004000/14, 0x21000000/23
-
-        ¤Î¤è¤¦¤Ë½Ð¤Æ¤¤¤Æ¡¢Millennium ¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢"0:14:0" ¤ò»ØÄꤷ¤Þ
-        ¤¹¡£S3 968 ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£Ç°¤Î°Ù¡£
 
-     VT switch
-        FreeBSD(98) ¤Ç¤Ï¤Ç¤­¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë¤è¤¦¤Ç¤¹¡£PANIX for 98 ¤Ç¤â¤Ç
-        ¤­¤Þ¤»¤ó¡£
+     ¤Î¤è¤¦¤Ë½Ð¤Æ¤¤¤Æ¡¢Millennium ¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢"0:14:0" ¤ò»ØÄꤷ¤Þ
+     ¤¹¡£S3 968 ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£Ç°¤Î°Ù¡£
 
      CTRL,GRPH,+/- ¤Ë¤è¤ë²òÁüÅÙÀÚÂؤ¨
         ¤Ç¤­¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë¤è¤¦¤Ç¤¹¡£
@@ -139,13 +141,7 @@
   o  Millennium ¤Ç¤Ï¡¢Modeline ¤ÎÀßÄê¤Ë¤è¤Ã¤Æ¤Ï 24bpp ¤Ç½Ä¤ËÀþ¤¢¤ë¤¤¤Ï¼Ê
      ÌÏÍͤΥΥ¤¥º¤¬½Ð¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
 
-  o  Millennium ¤Ç¤Ï¡¢½é´ü²½¤¬ÉÔ´°Á´¤Ê¤¿¤á¡¢»ÈÍÑÁ°¤Ë 3.3 ¥Ù¡¼¥¹¤Î¥µ¡¼¥Ð
-     ¤òµ¯Æ°¤·¤Æ¤ª¤«¤Ê¤¤¤È¥Ï¥ó¥°¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£°ìöµ¯Æ°¤¹¤ì¤Ð
-     ÅŸ»¤ò OFF ¤Ë¤¹¤ë¤Þ¤Ç¤ÏÀµ¾ï¤ËÆ°ºî¤·¤Þ¤¹¡£
-
-  o  Linux/98 ¤Ç¤Ï¡¢beta 14 °Ê¹ß¤Î¥«¡¼¥Í¥ë¤Ç¤Ê¤¤¤È»ÈÍÑÃæ¤Ë¥Ï¥ó¥°¥¢¥Ã¥×¤¹
-     ¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤òÈò¤±¤ë¤Ë¤Ï¡¢root ¸¢¸Â¤Ë¤Æ dmesg -n 1 ¤ò¼Â¹Ô
-     ¤¹¤ë¤È¤¤¤¤¤è¤¦¤Ç¤¹¡£
+  o  Mystique ¤Ç¤Ï¡¢VideoRam ¤ÎÌÀ¼¨Åª¤Ê»ØÄ꤬ɬ¿Ü¤È¤Ê¤ê¤Þ¤¹¡£
 
   4.1.3.  ¤½¤Î¾
 
@@ -167,27 +163,135 @@
 
   4.2.  apm ¥É¥é¥¤¥Ð
 
-  (¾­ÍèŪ¤Ë¤Ï)IO-DATA ¤Î GA-RUSH6/PCI ¤Ç¤âÆ°ºî¤¹¤ë (ͽÄê¤Î) ¥É¥é¥¤¥Ð¤Ç
-  ¤¹¡£
+  IO-DATA ¤Î GA-RUSH6/PCI ¤ÇÆ°ºî¤¹¤ë¥É¥é¥¤¥Ð¤Ç¤¹¡£
 
   4.2.1.  XF86Config ¤ÎÀßÄê
 
-  README.MGA Æâ¤Ë²òÀ⤵¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£Ä̾ï¤ÏÆä˲¿¤â
+  README.apm Æâ¤Ë²òÀ⤵¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£Ä̾ï¤ÏÆä˲¿¤â
   »ØÄꤹ¤ëɬÍ×̵¤¤È¦¤Ç¤¹¡£
 
   4.2.2.  Êó¹ð¤µ¤ì¤Æ¤¤¤ëÌäÂê
 
-  o  8bpp °Ê³°¤Ç¤Ï¤Þ¤Ã¤¿¤¯Æ±´ü¤¬¼è¤ì¤Þ¤»¤ó¡£8bpp ¤Î¾ì¹ç¤Ç¤âƱ´ü¤¬¤ª¤«¤·
-     ¤¯¤ÆƱ¤¸Êª¤¬ 3 ¤Äɽ¼¨¤µ¤ì¤¿¤ê¤·¤Þ¤¹¡£
+  o  ¸½»þÅÀ¤Ç¼ÂÍÑŪ¤Ë»ÈÍѤǤ­¤ë»ö¤¬³Îǧ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ï 1024x768 256 ¿§¤Î
+     ¤ß¤Ç¤¹¡£16bpp ¤ä 1280x1024 Åù¤Îɽ¼¨¤Ç¤ÏƱ´ü¤¬¼è¤ì¤Ê¤«¤Ã¤¿¤ê¡¢¥´¥ß¤Ê
+     ¤É¤¬É½¼¨¤µ¤ì¤¿¤ê¤·¤Þ¤¹¡£
 
-  o  XF86Config ¤Ç¤Î¥ª¥×¥·¥ç¥ó»ØÄê¤Ë¤è¤Ã¤Æ¤Ï¥Ï¥ó¥°¥¢¥Ã¥×¤·¤¿¤ê¤¹¤ë¤³¤È¤â
-     ¤¢¤ê¤Þ¤¹¡£
+  o  ¡ÖVideoRam 4096¡×¤Î»ØÄ꤬ɬ¿Ü¤Ç¤¹¡£
 
   4.2.3.  ¤½¤Î¾
+
+  o  ¼ÂÍÑÀ­¤ò¹Íθ¤¹¤ë¤Ê¤é 1024x768 256 ¿§¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
 
-  o  ¤Þ¤À PC-98 Âбþºî¶È¤¬ËؤɽÐÍè¤Æ¤¤¤Þ¤»¤ó¡£¼ÂÍѤˤÏÂѤ¨¤Ê¤¤¤Ç¤·¤ç¤¦¡£
+  o  Ëܥӥǥª¥«¡¼¥É¤Ë´Ø¤·¤Æ¤Ï XFree86 4.0 °Ê¹ß¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
 
+  o  ¤Þ¤À½½Ê¬¤Ê¥Æ¥¹¥È¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤Î¤ÇÆ°ºî¥ì¥Ý¡¼¥È¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
+
   4.2.4.  ´ØÏ¢
 
   XF86_SVGA man page
+
+  4.3.  glint ¥É¥é¥¤¥Ð
+
+  Melco ¤Î WHP-PS8,WHP-PS4 Åù Permedia2 ÅëºÜ¤Î¥Ó¥Ç¥ª¥«¡¼¥É¤ÇÆ°ºî¤¹¤ë¥É¥é
+  ¥¤¥Ð¤Ç¤¹¡£IO-DATA ¤Î GA-PII8 ¤ä GA-PIIH8 Åù¤Ç¤âÆ°ºî¤¹¤ë¤«¤â¤·¤ì¤Þ¤»
+  ¤ó¡£
+
+  4.3.1.  XF86Config ¤ÎÀßÄê
+
+  README.3Dlabs Æâ¤Ë²òÀ⤵¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£Ä̾ï¤ÏÆä˲¿
+  ¤â»ØÄꤹ¤ëɬÍ×̵¤¤È¦¤Ç¤¹¡£
+
+  4.3.2.  Êó¹ð¤µ¤ì¤Æ¤¤¤ëÌäÂê
+
+  o  PC-98 ¤Ç¤ÎÆ°ºî¤µ¤»¤ë¤Ù¤¯Âбþ¥³¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢Æ°ºî³Îǧ¤¬ËØ
+     ¤É¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
+
+  4.3.3.  ¤½¤Î¾
+
+  o  ¤Þ¤ÀËؤɥƥ¹¥È¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤Î¤ÇÆ°ºî¥ì¥Ý¡¼¥È¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
+
+  o  Ëܥӥǥª¥«¡¼¥É¤Ë´Ø¤·¤Æ¤Ï XFree86 4.0 °Ê¹ß¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
+
+  4.3.4.  ´ØÏ¢
+
+  XF86_SVGA man page
+
+  4.4.  trident ¥É¥é¥¤¥Ð
+
+  NEC ¤ÎÆ⢥¢¥¯¥»¥é¥ì¡¼¥¿ (Trident TGUI9680/9682) ¤ÇÆ°ºî¤¹¤ë¥É¥é¥¤¥Ð¤Ç
+  ¤¹¡£Accel ¤Ç¤ª»È¤¤²¼¤µ¤¤¡£
+
+  4.4.1.  XF86Config ¤ÎÀßÄê
+
+     VideoRam 2048(¤Þ¤¿¤Ï 1024)
+        VideoRam ¤¬Àµ¤·¤¯¸¡½Ð¤Ç¤­¤Ê¤¤¾ì¹ç¤ËÀßÄꤷ¤Æ²¼¤µ¤¤¡£
+
+  °Ê²¼¤Î Option(XaaNoScreenToScreenCopy ¤ò½ü¤¯) ¤Ï TGUI9680 ¤Ç¤ÏÀßÄꤷ¤Ê
+  ¤¯¤Æ¤âÆ°ºî¤¹¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢TGUI9682 ¤Ç¤ÏÉԲķç¤Ç¤¹¡£ÀßÄê
+  ¤·¤Ê¤¤¾ì¹ç¤Î¾ÉÎã¤â´Þ¤á¤Æ²òÀ⤷¤Þ¤¹¤¬¡¢¤³¤ì¤é¤ÎÌäÂ꤬À¸¤¸¤º¡¢¥í¥°¤Ë
+
+     Trident : BitBLT engine time-out.
+
+  ¤¬¸½¤ì¤Ê¤¤¤Î¤Ç¤¢¤ì¤ÐÀßÄêÉÔÍפǤ¹¡£¡Ê¤³¤ì¤é¤ÏÀßÄꤷ¤Ê¤¤Êý¤¬Æ°ºî¤¬Â®¤¤¤³
+  ¤È¤òǰƬ¤Ë¤ª¤¤¤Æ²¼¤µ¤¤¡£¡Ë
+
+     Option ``NoPciBurst''
+        ¥Þ¥¦¥¹¡¦¥«¡¼¥½¥ë¤¬¥Þ¥¦¥¹¤ÎÆ°¤­¤ËÄɽ¾¤»¤º¡¢¤Þ¤¿¥Þ¥¦¥¹¡¦¥«¡¼¥½¥ë¤Î
+        Æ°¤¤¤¿Àפˤ½¤Î¡Ö­Àספ¬»Ä¤ë¾ì¹ç¤äÉÁ²è¤µ¤ì¤ëʸ»ú¤Î¥É¥Ã¥ÈÍî¤Á¤¬¿Ó
+        ¤À¤·¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç¤¹¡£
+
+     Option ``XaaNoScreenToScreenCopy''
+        ²òÁüÅÙ¤¬ 1024x768 °Ê²¼¤Ç¤ÏÀßÄêÉÔÍפǤ¹¡£¤½¤ì¤ò±Û¤¨¤ë²òÁüÅ٤ˤª¤¤
+        ¤Æ¥Þ¥¦¥¹¡¦¥«¡¼¥½¥ë¤¬¥Þ¥¦¥¹¤ÎÆ°¤­¤Ë¶Ëü¤ËÄɽ¾¤·¤Ê¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç
+        ¤¹¡£
+
+     Option ``XaaNoCPUToScreenColorExpandFill''
+        ʸ»ú¤ÎÉÁ²è¤¬¶Ëü¤ËÃÙ¤¤¤«¤Þ¤¿¤ÏÉÁ²è¤·¤Ê¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç¤¹¡£
+
+     Option ``XaaNoScanlineCPUToScreenColorExpandFill''
+        ʸ»ú¤ÎÉÁ²è¤¬¶Ëü¤ËÃÙ¤¤¤«¤Þ¤¿¤ÏÉÁ²è¤·¤Ê¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç¤¹¡£
+
+     Option ``XaaNoScreenToScreenColorExpandFill''
+        ʸ»ú¤ÎÉÁ²è¤¬¶Ëü¤ËÃÙ¤¤¤«¤Þ¤¿¤ÏÉÁ²è¤·¤Ê¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç¤¹¡£
+
+  4.4.2.  Êó¹ð¤µ¤ì¤Æ¤¤¤ëÌäÂê
+
+  ¤¤¤º¤ì¤â TGUI9682 ÆÃÍ­¤Îɽ¼¨¾å¤ÎÌäÂêÅÀ¤Ç¤¹¡£
+
+  o  ¥Þ¥¦¥¹¤òÆ°¤«¤¹¤È¡¢¥«¡¼¥½¥ë¤Îµ°Àפ¬¾¯¤·±ø¤ì¤Þ¤¹¡£
+
+  o  kterm ¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò²¡¤·¤Ê¤¬¤é¥É¥é¥Ã¥°¤¹¤ë¤È¡¢Ê¸»ú¤¬È¿Å¾¤¹
+     ¤ë¤È¤³¤í¤Ë²£Àþ¾õ¤Î¥Î¥¤¥º¤¬½Ð¤Þ¤¹¡£
+
+  o  kterm ¤Ëɽ¼¨¤µ¤ì¤ëʸ»ú¤Î¥É¥Ã¥È¤¬¾¯¤·Íî¤Á¤Þ¤¹¡£
+
+  4.4.3.  ¤½¤Î¾
+
+  o  ¤Þ¤À½½Ê¬¤Ê¥Æ¥¹¥È¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤Î¤ÇÆ°ºî¥ì¥Ý¡¼¥È¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
+
+  4.4.4.  ´ØÏ¢
+
+  README.trident ¤Ï¸½»þÅÀ (4.0) ¤Ç¤Ï 3.3.6 ÍѤÎÆâÍƤǤ¢¤ê¡¢¤³¤ì¤Ëµ­ºÜ¤µ
+  ¤ì¤Æ¤¤¤ë Option ¤Î¿¤¯¤Ï»ÈÍѤǤ­¤Ê¤¤¤Î¤ÇÃí°Õ¤·¤Æ²¼¤µ¤¤¡£
+
+  5.  ³Æ OS Ëè¤ÎÃí°Õ»ö¹à
+
+  5.1.  FreeBSD(98) ¤Ç¤ÎÃí°Õ»ö¹à
+
+  o  VT switch ¤¬¤Ç¤­¤Þ¤»¤ó¡£
+
+  5.2.  NetBSD/pc98 ¤Ç¤ÎÃí°Õ»ö¹à
+
+  o  ¸½¾õ¤Ç¤Ï NetBSD/pc98 1.4.x ¤ÇÍøÍѤǤ­¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Âкö½àÈ÷Ãæ¤Ç
+     ¤¹¤Î¤Ç¡¢»Ã¤¯¤ªÂÔ¤Á²¼¤µ¤¤¡£¤Ê¤ª¡¢NetBSD/i386 ¤Ç¤ÏÌäÂê¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+
+  5.3.  PANIX for 98 ¤Ç¤ÎÃí°Õ»ö¹à
+
+  o  VT switch ¤¬¤Ç¤­¤Þ¤»¤ó¡£
+
+  5.4.  Linux/98 ¤Ç¤ÎÃí°Õ»ö¹à
+
+  o  2.1.57 ¤Î¥«¡¼¥Í¥ë¤Ç¤Ï¡¢beta 14 °Ê¹ß¤Ç¤Ê¤¤¤È¥µ¡¼¥Ð¤¬¥Ï¥ó¥°¥¢¥Ã¥×¤¹¤ë
+     ¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤òÈò¤±¤ë¤Ë¤Ï¡¢root ¸¢¸Â¤Ë¤Æ dmesg -n 1 ¤ò¼Â¹Ô¤¹
+     ¤ë¤È¤¤¤¤¤è¤¦¤Ç¤¹¡£
 
Index: xc/programs/Xserver/hw/xfree86/doc/Japanese/sgml/read98.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/Japanese/sgml/read98.sgml:1.2 xc/programs/Xserver/hw/xfree86/doc/Japanese/sgml/read98.sgml:1.4
--- xc/programs/Xserver/hw/xfree86/doc/Japanese/sgml/read98.sgml:1.2	Mon Jul 19 06:36:19 1999
+++ xc/programs/Xserver/hw/xfree86/doc/Japanese/sgml/read98.sgml	Tue Jun 20 13:07:58 2000
@@ -5,7 +5,7 @@
 <!-- Title information -->
 <title> XFree86 PC98 Dependent Information
 <author> The XFree86 Project Inc. and X98 CORE TEAM
-<date> 1999ǯ 7·î 19Æü
+<date> 2000ǯ 6·î20Æü
 <abstract>
 ¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¡¢PC98¸ÇÍ­¤Î»ö¹à¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£
 PC/AT¸ß´¹µ¡¤È¶¦Ä̤λö¹à¤Ë¤Ä¤¤¤Æ¤Ï¡¢¶¦Ä̤Υɥ­¥å¥á¥ó¥È¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£
@@ -15,10 +15,11 @@
 <p>ËÜ¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢PC98ÍÑX¥µ¡¼¥Ð¤ÏPC/AT¸ß´¹µ¡ÍÑX¥µ¡¼¥Ð¤ÈÅý¹ç(¥Õ¥¡¥¤¥ë̾:
 XFree86)¤µ¤ì¤Æ¤ª¤ê¡¢½¾Íè¤Î¥Ü¡¼¥É/¥Á¥Ã¥×¥»¥Ã¥ÈËè¤Î¥µ¡¼¥Ð¤â¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£
 ¤Þ¤¿¡¢³Æ¥É¥é¥¤¥Ð¤Ï¤¹¤Ù¤ÆSVGA¥Ù¡¼¥¹¤Ç¡¢XF86_S3¥Ù¡¼¥¹¤Î¥É¥é¥¤¥Ð¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-¸½ºß¤Î¤È¤³¤í¡¢PC98¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤Î¤Ï¡¢mga¥É¥é¥¤¥Ð¤Î¤ß¤Ç¤¹¡£Millennium¡¢
-Mystique¤Î¥Ü¡¼¥É¤ò¤ª»ý¤Á¤ÎÊý°Ê³°¤Ï¡¢3.3¥Ù¡¼¥¹(ex. 3.3.3.1, 3.3.4)¤Î´Ä¶­¤ò
-¸æÍøÍѲ¼¤µ¤¤¡£EGC¤äPEGC¤¹¤éÍøÍѤǤ­¤Þ¤»¤ó¡£³«È¯¥á¥ó¥Ð¤¬Èó¾ï¤Ë¾¯¤Ê¤¯¤Ê¤Ã¤Æ
-¤¤¤ë¤Î¤Ç¡¢³«È¯¤Ë¶½Ì£¤¬¤ª¤¢¤ê¤ÎÊý¤ÏX98 Core Team¤Þ¤Ç¡¢¸æÏ¢Íí²¼¤µ¤¤¡£</p>
+¸½ºß¤Î¤È¤³¤í¡¢PC98¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤Î¤Ï¡¢mga¡¢apm¡¢glint¡¢trident¥É¥é¥¤¥Ð¤Î¤ß
+¤Ç¤¹¡£Millennium¡¢Mystique¡¢VoodooRUSH¡¢Permedia2¡¢TGUI968x(¤¤¤º¤ì¤âPCI)¤Î
+¥Ü¡¼¥É¤ò¤ª»ý¤Á¤ÎÊý°Ê³°¤Ï¡¢3.3¥Ù¡¼¥¹(ex. 3.3.6)¤Î´Ä¶­¤ò¸æÍøÍѲ¼¤µ¤¤¡£
+¸½¾õ4.0¤Ç¤ÏEGC¤äPEGC¤¹¤éÍøÍѤǤ­¤Þ¤»¤ó¡£³«È¯¥á¥ó¥Ð¤¬Èó¾ï¤Ë¾¯¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë
+¤Î¤Ç¡¢³«È¯¤Ë¶½Ì£¤¬¤ª¤¢¤ê¤ÎÊý¤ÏX98 Core Team¤Þ¤Ç¡¢¸æÏ¢Íí²¼¤µ¤¤¡£</p>
 
 <p>XF86Config¤äµ¯Æ°»þ¤Î¥ª¥×¥·¥ç¥óÅù¤ÎÊѹ¹¤Ë¤Ä¤¤¤Æ¤Ï¡¢RELNOTES¤Ë¾Ü¤·¤¯½ñ¤¤¤Æ
 ¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢»²¾È¤·¤Æ²¼¤µ¤¤¡£/usr/X11R6/lib/X11/XF86Config.98¤¬¡¢PC98ÍÑ
@@ -35,6 +36,9 @@
   ------------- ----------------------------------------------- -------
   NEC		¥Õ¥ë¥«¥é¡¼¥¦¥£¥ó¥É¥¦¥¢¥¯¥»¥é¥ì¡¼¥¿¥Ü¡¼¥É X2	XFree86
   Matrox	MGA Millennium(PC/AT ¸ß´¹µ¡ÍÑ)			XFree86
+  IO-DATA	GA-RUSH6/PCI					XFree86
+  Melco		WHP-PS8, WHP-PS4				XFree86
+  (IO-DATA	GA-PII8, GA-PIIH8				XFree86)
 </verb></p></sect1>
 
 <sect1>¥µ¥Ý¡¼¥ÈÆ⢥ӥǥª¥·¥¹¥Æ¥à°ìÍ÷<p>
@@ -42,6 +46,7 @@
   ¥Ù¥ó¥À¡¼	¥Á¥Ã¥×¥»¥Ã¥È					¥µ¡¼¥Ð
   ------------- ----------------------------------------------- -------
   NEC		MGA Millennium/Mystique				XFree86
+  NEC		Trident TGUI968x(X-Mate,ValueStarÅù)		XFree86
 </verb></p>
 
 <sect>¶¦ÄÌ»ö¹à<p>
@@ -63,7 +68,7 @@
 	(**) Japanese PC98 architecture
 
 	¤È½ÐÎϤµ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-<tag>xf86config</tag>
+<tag>xf86config¡¢xf86cfg</tag>
 	PC98ÍѤ˰ܿ¢¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£/usr/X11R6/lib/X11/XF86Config.98¤ò
 	XF86Config¤È¥ê¥Í¡¼¥à¤·¤Æ»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
 <tag>xvidtune</tag>
@@ -109,8 +114,6 @@
 </verb>
 	¤Î¤è¤¦¤Ë½Ð¤Æ¤¤¤Æ¡¢Millennium¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢"0:14:0"¤ò»ØÄꤷ¤Þ¤¹¡£
 	S3 968¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£Ç°¤Î°Ù¡£
-<tag>VT switch</tag>
-	FreeBSD(98)¤Ç¤Ï¤Ç¤­¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë¤è¤¦¤Ç¤¹¡£PANIX for 98¤Ç¤â¤Ç¤­¤Þ¤»¤ó¡£
 <tag>CTRL,GRPH,+/- ¤Ë¤è¤ë²òÁüÅÙÀÚÂؤ¨</tag>
 	¤Ç¤­¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë¤è¤¦¤Ç¤¹¡£
 </descrip>
@@ -126,12 +129,7 @@
 <itemize>
 	<ITEM>Millennium¤Ç¤Ï¡¢Modeline¤ÎÀßÄê¤Ë¤è¤Ã¤Æ¤Ï24bpp¤Ç½Ä¤ËÀþ
 	¤¢¤ë¤¤¤Ï¼ÊÌÏÍͤΥΥ¤¥º¤¬½Ð¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-	<ITEM>Millennium¤Ç¤Ï¡¢½é´ü²½¤¬ÉÔ´°Á´¤Ê¤¿¤á¡¢»ÈÍÑÁ°¤Ë3.3¥Ù¡¼¥¹¤Î
-	¥µ¡¼¥Ð¤òµ¯Æ°¤·¤Æ¤ª¤«¤Ê¤¤¤È¥Ï¥ó¥°¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£°ìöµ¯Æ°
-	¤¹¤ì¤ÐÅŸ»¤òOFF¤Ë¤¹¤ë¤Þ¤Ç¤ÏÀµ¾ï¤ËÆ°ºî¤·¤Þ¤¹¡£
-	<ITEM>Linux/98¤Ç¤Ï¡¢beta 14°Ê¹ß¤Î¥«¡¼¥Í¥ë¤Ç¤Ê¤¤¤È»ÈÍÑÃæ¤Ë¥Ï¥ó¥°
-	¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤òÈò¤±¤ë¤Ë¤Ï¡¢root¸¢¸Â¤Ë¤Ædmesg
-	-n 1 ¤ò¼Â¹Ô¤¹¤ë¤È¤¤¤¤¤è¤¦¤Ç¤¹¡£
+	<ITEM>Mystique¤Ç¤Ï¡¢VideoRam¤ÎÌÀ¼¨Åª¤Ê»ØÄ꤬ɬ¿Ü¤È¤Ê¤ê¤Þ¤¹¡£
 </itemize>
 <sect2>¤½¤Î¾<p>
 <itemize>
@@ -149,21 +147,119 @@
 	README.MGA¡¢XF86_SVGA man page</p>
 
 <sect1>apm¥É¥é¥¤¥Ð<p>
-	(¾­ÍèŪ¤Ë¤Ï)IO-DATA¤ÎGA-RUSH6/PCI¤Ç¤âÆ°ºî¤¹¤ë(ͽÄê¤Î)¥É¥é¥¤¥Ð¤Ç¤¹¡£</p>
+	IO-DATA¤ÎGA-RUSH6/PCI¤ÇÆ°ºî¤¹¤ë¥É¥é¥¤¥Ð¤Ç¤¹¡£</p>
 <sect2>XF86Config¤ÎÀßÄê<p>
-	README.MGAÆâ¤Ë²òÀ⤵¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£Ä̾ï¤ÏÆäË
+	README.apmÆâ¤Ë²òÀ⤵¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£Ä̾ï¤ÏÆäË
 	²¿¤â»ØÄꤹ¤ëɬÍ×̵¤¤È¦¤Ç¤¹¡£
 <sect2>Êó¹ð¤µ¤ì¤Æ¤¤¤ëÌäÂê<p>
 <itemize>
-	<ITEM>8bpp°Ê³°¤Ç¤Ï¤Þ¤Ã¤¿¤¯Æ±´ü¤¬¼è¤ì¤Þ¤»¤ó¡£8bpp¤Î¾ì¹ç¤Ç¤âƱ´ü¤¬
-	¤ª¤«¤·¤¯¤ÆƱ¤¸Êª¤¬3¤Äɽ¼¨¤µ¤ì¤¿¤ê¤·¤Þ¤¹¡£
-	<ITEM>XF86Config¤Ç¤Î¥ª¥×¥·¥ç¥ó»ØÄê¤Ë¤è¤Ã¤Æ¤Ï¥Ï¥ó¥°¥¢¥Ã¥×¤·¤¿¤ê¤¹¤ë
-	¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
+	<ITEM>¸½»þÅÀ¤Ç¼ÂÍÑŪ¤Ë»ÈÍѤǤ­¤ë»ö¤¬³Îǧ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ï1024x768 256¿§
+	¤Î¤ß¤Ç¤¹¡£16bpp¤ä1280x1024Åù¤Îɽ¼¨¤Ç¤ÏƱ´ü¤¬¼è¤ì¤Ê¤«¤Ã¤¿¤ê¡¢¥´¥ß¤Ê¤É
+	¤¬É½¼¨¤µ¤ì¤¿¤ê¤·¤Þ¤¹¡£
+	<ITEM>¡ÖVideoRam 4096¡×¤Î»ØÄ꤬ɬ¿Ü¤Ç¤¹¡£
 </itemize>
 <sect2>¤½¤Î¾<p>
 <itemize>
-	<ITEM>¤Þ¤ÀPC-98Âбþºî¶È¤¬ËؤɽÐÍè¤Æ¤¤¤Þ¤»¤ó¡£¼ÂÍѤˤÏÂѤ¨¤Ê¤¤¤Ç¤·¤ç¤¦¡£
+	<ITEM>¼ÂÍÑÀ­¤ò¹Íθ¤¹¤ë¤Ê¤é1024x768 256¿§¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
+	<ITEM>Ëܥӥǥª¥«¡¼¥É¤Ë´Ø¤·¤Æ¤ÏXFree86 4.0°Ê¹ß¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
+	<ITEM>¤Þ¤À½½Ê¬¤Ê¥Æ¥¹¥È¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤Î¤ÇÆ°ºî¥ì¥Ý¡¼¥È¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
 </itemize>
 <sect2>´ØÏ¢<p>
 	XF86_SVGA man page</p>
+
+<sect1>glint¥É¥é¥¤¥Ð<p>
+	Melco¤ÎWHP-PS8,WHP-PS4ÅùPermedia2ÅëºÜ¤Î¥Ó¥Ç¥ª¥«¡¼¥É¤ÇÆ°ºî¤¹¤ë¥É¥é¥¤¥Ð
+	¤Ç¤¹¡£IO-DATA¤ÎGA-PII8¤äGA-PIIH8Åù¤Ç¤âÆ°ºî¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
+<sect2>XF86Config¤ÎÀßÄê<p>
+	README.3DlabsÆâ¤Ë²òÀ⤵¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£Ä̾ï¤ÏÆäË
+	²¿¤â»ØÄꤹ¤ëɬÍ×̵¤¤È¦¤Ç¤¹¡£
+<sect2>Êó¹ð¤µ¤ì¤Æ¤¤¤ëÌäÂê<p>
+<itemize>
+	<ITEM>PC-98¤Ç¤ÎÆ°ºî¤µ¤»¤ë¤Ù¤¯Âбþ¥³¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢Æ°ºî³Îǧ¤¬
+	Ëؤɤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
+</itemize>
+<sect2>¤½¤Î¾<p>
+<itemize>
+	<ITEM>¤Þ¤ÀËؤɥƥ¹¥È¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤Î¤ÇÆ°ºî¥ì¥Ý¡¼¥È¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
+	<ITEM>Ëܥӥǥª¥«¡¼¥É¤Ë´Ø¤·¤Æ¤ÏXFree86 4.0°Ê¹ß¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
+</itemize>
+<sect2>´ØÏ¢<p>
+	XF86_SVGA man page</p>
+
+<sect1>trident¥É¥é¥¤¥Ð<p>
+	NEC ¤ÎÆ⢥¢¥¯¥»¥é¥ì¡¼¥¿(Trident TGUI9680/9682)¤ÇÆ°ºî¤¹¤ë¥É¥é¥¤¥Ð¤Ç¤¹¡£
+	Accel¤Ç¤ª»È¤¤²¼¤µ¤¤¡£
+<sect2>XF86Config ¤ÎÀßÄê<p>
+<descrip>
+<tag>VideoRam 2048(¤Þ¤¿¤Ï 1024)</tag>
+VideoRam¤¬Àµ¤·¤¯¸¡½Ð¤Ç¤­¤Ê¤¤¾ì¹ç¤ËÀßÄꤷ¤Æ²¼¤µ¤¤¡£
+</descrip>
+
+°Ê²¼¤ÎOption(XaaNoScreenToScreenCopy¤ò½ü¤¯)¤ÏTGUI9680¤Ç¤ÏÀßÄꤷ¤Ê¤¯¤Æ¤â
+Æ°ºî¤¹¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢TGUI9682¤Ç¤ÏÉԲķç¤Ç¤¹¡£
+ÀßÄꤷ¤Ê¤¤¾ì¹ç¤Î¾ÉÎã¤â´Þ¤á¤Æ²òÀ⤷¤Þ¤¹¤¬¡¢¤³¤ì¤é¤ÎÌäÂ꤬À¸¤¸¤º¡¢¥í¥°¤Ë
+<verb>
+   Trident : BitBLT engine time-out.
+</verb>
+¤¬¸½¤ì¤Ê¤¤¤Î¤Ç¤¢¤ì¤ÐÀßÄêÉÔÍפǤ¹¡£
+¡Ê¤³¤ì¤é¤ÏÀßÄꤷ¤Ê¤¤Êý¤¬Æ°ºî¤¬Â®¤¤¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ²¼¤µ¤¤¡£¡Ë
+
+<descrip>
+<tag>Option ``NoPciBurst''</tag>
+¥Þ¥¦¥¹¡¦¥«¡¼¥½¥ë¤¬¥Þ¥¦¥¹¤ÎÆ°¤­¤ËÄɽ¾¤»¤º¡¢¤Þ¤¿¥Þ¥¦¥¹¡¦¥«¡¼¥½¥ë¤ÎÆ°¤¤¤¿À×
+¤Ë¤½¤Î¡Ö­Àספ¬»Ä¤ë¾ì¹ç¤äÉÁ²è¤µ¤ì¤ëʸ»ú¤Î¥É¥Ã¥ÈÍî¤Á¤¬¿Ó¤À¤·¤¤¾ì¹ç¤ËÍ×Àß
+Äê¤Ç¤¹¡£
+<tag>Option ``XaaNoScreenToScreenCopy''</tag>
+²òÁüÅÙ¤¬1024x768°Ê²¼¤Ç¤ÏÀßÄêÉÔÍפǤ¹¡£¤½¤ì¤ò±Û¤¨¤ë²òÁüÅ٤ˤª¤¤¤Æ¥Þ¥¦¥¹¡¦
+¥«¡¼¥½¥ë¤¬¥Þ¥¦¥¹¤ÎÆ°¤­¤Ë¶Ëü¤ËÄɽ¾¤·¤Ê¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç¤¹¡£
+<tag>Option ``XaaNoCPUToScreenColorExpandFill''</tag>
+ʸ»ú¤ÎÉÁ²è¤¬¶Ëü¤ËÃÙ¤¤¤«¤Þ¤¿¤ÏÉÁ²è¤·¤Ê¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç¤¹¡£
+<tag>Option ``XaaNoScanlineCPUToScreenColorExpandFill''</tag>
+ʸ»ú¤ÎÉÁ²è¤¬¶Ëü¤ËÃÙ¤¤¤«¤Þ¤¿¤ÏÉÁ²è¤·¤Ê¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç¤¹¡£
+<tag>Option ``XaaNoScreenToScreenColorExpandFill''</tag>
+ʸ»ú¤ÎÉÁ²è¤¬¶Ëü¤ËÃÙ¤¤¤«¤Þ¤¿¤ÏÉÁ²è¤·¤Ê¤¤¾ì¹ç¤ËÍ×ÀßÄê¤Ç¤¹¡£
+</descrip>
+
+<sect2>Êó¹ð¤µ¤ì¤Æ¤¤¤ëÌäÂê<p>
+¤¤¤º¤ì¤âTGUI9682ÆÃÍ­¤Îɽ¼¨¾å¤ÎÌäÂêÅÀ¤Ç¤¹¡£
+<itemize>
+	<ITEM>¥Þ¥¦¥¹¤òÆ°¤«¤¹¤È¡¢¥«¡¼¥½¥ë¤Îµ°Àפ¬¾¯¤·±ø¤ì¤Þ¤¹¡£
+	<ITEM>kterm¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò²¡¤·¤Ê¤¬¤é¥É¥é¥Ã¥°¤¹¤ë¤È¡¢Ê¸»ú¤¬
+	ȿž¤¹¤ë¤È¤³¤í¤Ë²£Àþ¾õ¤Î¥Î¥¤¥º¤¬½Ð¤Þ¤¹¡£
+	<ITEM>kterm¤Ëɽ¼¨¤µ¤ì¤ëʸ»ú¤Î¥É¥Ã¥È¤¬¾¯¤·Íî¤Á¤Þ¤¹¡£
+</itemize>
+
+<sect2>¤½¤Î¾<p>
+<itemize>
+¤Þ¤À½½Ê¬¤Ê¥Æ¥¹¥È¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤Î¤ÇÆ°ºî¥ì¥Ý¡¼¥È¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
+</itemize>
+
+<sect2>´ØÏ¢<p>
+README.trident¤Ï¸½»þÅÀ(4.0)¤Ç¤Ï3.3.6ÍѤÎÆâÍƤǤ¢¤ê¡¢¤³¤ì¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë
+Option¤Î¿¤¯¤Ï»ÈÍѤǤ­¤Ê¤¤¤Î¤ÇÃí°Õ¤·¤Æ²¼¤µ¤¤¡£
+
+<sect>³ÆOSËè¤ÎÃí°Õ»ö¹à<p>
+<sect1>FreeBSD(98)¤Ç¤ÎÃí°Õ»ö¹à<p>
+<itemize>
+	<ITEM>VT switch¤¬¤Ç¤­¤Þ¤»¤ó¡£
+</itemize>
+
+<sect1>NetBSD/pc98¤Ç¤ÎÃí°Õ»ö¹à<p>
+<itemize>
+	<ITEM>¸½¾õ¤Ç¤ÏNetBSD/pc98 1.4.x¤ÇÍøÍѤǤ­¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Âкö
+	½àÈ÷Ãæ¤Ç¤¹¤Î¤Ç¡¢»Ã¤¯¤ªÂÔ¤Á²¼¤µ¤¤¡£¤Ê¤ª¡¢NetBSD/i386¤Ç¤ÏÌäÂê¤Ï¤¢
+	¤ê¤Þ¤»¤ó¡£
+</itemize>
+
+<sect1>PANIX for 98¤Ç¤ÎÃí°Õ»ö¹à<p>
+<itemize>
+	<ITEM>VT switch¤¬¤Ç¤­¤Þ¤»¤ó¡£
+</itemize>
+
+<sect1>Linux/98¤Ç¤ÎÃí°Õ»ö¹à<p>
+<itemize>
+	<ITEM>2.1.57¤Î¥«¡¼¥Í¥ë¤Ç¤Ï¡¢beta 14°Ê¹ß¤Ç¤Ê¤¤¤È¥µ¡¼¥Ð¤¬¥Ï¥ó¥°
+	¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤òÈò¤±¤ë¤Ë¤Ï¡¢root¸¢¸Â¤Ë¤Ædmesg
+	-n 1¤ò¼Â¹Ô¤¹¤ë¤È¤¤¤¤¤è¤¦¤Ç¤¹¡£
+</itemize>
 </article>
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml:1.23 xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml:1.30
--- xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml:1.23	Tue Feb 15 10:00:57 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml	Mon Jun 19 08:00:52 2000
@@ -27,7 +27,7 @@
 
 <title>XFree86 X server ``New Design'' (DRAFT)
 <author>The XFree86 Project, Inc
-<date>Last modified 15 February 2000
+<date>Last modified 1 May 2000
 
 
 
@@ -36,7 +36,7 @@
 
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.23 2000/02/15 18:00:57 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.30 2000/06/19 15:00:52 tsi Exp $
 </ident>
 
 
@@ -181,8 +181,8 @@
     <code>
       Section "ServerLayout"
         Identifier "Main Layout"
-        Screen     "Screen 1" 0 ""  ""  ""  "Screen 2"
-        Screen     "Screen 2" 1
+        Screen     0 "Screen 1" ""  ""  ""  "Screen 2"
+        Screen     1 "Screen 2"
         Screen     "Screen 3"
       EndSection
     </code>
@@ -199,8 +199,8 @@
     <code>
       Section "ServerLayout"
         Identifier "Main Layout"
-        Screen     "Screen 1" 0 Absolute 0 0
-        Screen     "Screen 2" 1 Absolute 1024 0
+        Screen     0 "Screen 1" Absolute 0 0
+        Screen     1 "Screen 2" Absolute 1024 0
         Screen     "Screen 3" Absolute 2048 0
       EndSection
     </code>
@@ -224,8 +224,8 @@
     <code>
       Section "ServerLayout"
         Identifier "Main Layout"
-        Screen     "Screen 1" 0
-        Screen     "Screen 2" 1 RightOf "Screen 1"
+        Screen     0 "Screen 1"
+        Screen     1 "Screen 2" RightOf "Screen 1"
         Screen     "Screen 3" Relative "Screen 1" 2048 0
       EndSection
     </code>
@@ -620,8 +620,8 @@
       The probe must register all non-relocatable resources at this
       stage.  If a resource conflict is found between exclusive resources
       the driver will fail immediately.  This is usually best done with
-      the &s.code;xf86ConfigActivePciEntity()&e.code; helper function
-      for PCI and &s.code;xf86ConfigActiveIsaEntity()&e.code; for ISA
+      the &s.code;xf86ConfigPciEntity()&e.code; helper function
+      for PCI and &s.code;xf86ConfigIsaEntity()&e.code; for ISA
       (see the <ref id="rac" name="RAC"> section).  It is possible to
       register some entity specific functions with those helpers.  When
       not using the helpers, the &s.code;xf86AddEntityToScreen()&e.code;
@@ -638,12 +638,16 @@
       If there are no active device sections that the driver considers
       relevant, it must return &s.code;FALSE&e.code;.
 
-      Allocate a &s.code;ScrnInfoRec&e.code; for each instance of the
+      Allocate a &s.code;ScrnInfoRec&e.code; for each active instance of the
       hardware found, and fill in the basic information, including the
-      other driver entry points.  The &s.code;xf86AllocateScreen()&e.code;
-      function must be used to allocate the &s.code;ScrnInfoRec&e.code;,
-      and it takes care of initialising fields to defined ``unused''
-      values.
+      other driver entry points.   This is best done with the 
+      &s.code;xf86ConfigIsaEntity()&e.code; helper function for ISA 
+      instances or &s.code;xf86ConfigPciEntity()&e.code; for PCI instances. 
+      These functions allocate a &s.code;ScrnInfoRec&e.code; for active
+      entities. Optionally &s.code;xf86AllocateScreen()&e.code;
+      function may also be used to allocate the &s.code;ScrnInfoRec&e.code;.
+      Any of these functions take care of initialising fields to defined 
+      ``unused'' values.
 
       Claim the entities for each instance of the hardware found.  This
       prevents other drivers from claiming the same hardware.
@@ -842,11 +846,13 @@
 
       Modules may be loaded at any point in this function, and all
       modules that the driver will need must be loaded before the end
-      of this function.  The &s.code;xf86LoadSubModule()&e.code; function
-      should be used to load modules.  A driver may unload a module
-      within this function if it was only needed temporarily, and the
-      &s.code;UnloadSubModule()&e.code; function should be used to do
-      that.  Otherwise there is no need to explicitly unload modules
+      of this function.  Either the  &s.code;xf86LoadSubModule()&e.code; 
+      or the &s.code;xf86LoadDrvSubModule()&e.code; function should be 
+      used to load modules depending on whether a 
+      &s.code;ScrnInfoRec&e.code; has been set up. A driver may unload 
+      a module within this function if it was only needed temporarily, 
+      and the &s.code;xf86UnloadSubModule()&e.code; function should be used 
+      to do that.  Otherwise there is no need to explicitly unload modules
       because the loader takes care of module dependencies and will
       unload submodules automatically if/when the driver module is
       unloaded.
@@ -922,6 +928,8 @@
 
     <quote><p>
     &s.code;pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)&e.code:
+      and
+    &s.code;pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name)&e.code:
     <quote><p>
       Load a module that a driver depends on.  This function loads the
       module &s.code;name&e.code; as a sub module of the driver.  The
@@ -929,15 +937,16 @@
       fails, the return value will be &s.code;NULL&e.code;.  If a driver
       needs to explicitly unload a module it has loaded in this way,
       the return value must be saved and passed to
-      &s.code;UnloadSubModule()&e.code; when unloading.
+      &s.code;xf86UnloadSubModule()&e.code; when unloading.
 
     </quote>
 
-    &s.code;void UnloadSubModule(pointer module)&e.code;
+    &s.code;void xf86UnloadSubModule(pointer module)&e.code;
     <quote><p>
       Unloads the module referenced by &s.code;module&e.code;.
       &s.code;module&e.code; should be a pointer returned previously
-      by &s.code;xf86LoadSubModule()&e.code;.
+      by &s.code;xf86LoadSubModule()&e.code; or 
+      &s.code;xf86LoadDrvSubModule()&e.code; .
 
     </quote>
     </quote>
@@ -2021,21 +2030,28 @@
 
 Two helper functions are provided to aid configuring entities:
     <quote><p>
-    &s.code;Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
-			&f.indent;PciChipsets *p_chip, resList res,
-			&f.indent;EntityProc init, EntityProc enter,
-			&f.indent;EntityProc leave, pointer private)&e.code;
+    &s.code;ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, 
+                                 &f.indent;int scrnFlag, int entityIndex, 
+                                 &f.indent;PciChipsets *p_chip, 
+                                 &f.indent;resList res, EntityProc init, 
+                                 &f.indent;EntityProc enter, EntityProc leave, 
+                                 &f.indent;pointer private)&e.code;
     <p>
-    &s.code;Bool xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn, int entityIndex,
-			&f.indent;IsaChipsets *i_chip, resList res,
-			&f.indent;EntityProc init, EntityProc enter,
-			&f.indent;EntityProc leave, pointer private)&e.code;
+    &s.code;ScrnInfoPtr xf86ConfigIsaEntity(ScrnInfoPtr pScrn, 
+                                 &f.indent;int scrnFlag, int entityIndex, 
+                                 &f.indent;IsaChipsets *i_chip,
+                                 &f.indent;resList res, EntityProc init, 
+                                 &f.indent;EntityProc enter, EntityProc leave, 
+                                 &f.indent;pointer private)&e.code;
     <quote><p>
       These functions are used to register the non-relocatable resources
       for an entity, and the optional entity-specific &s.code;Init&e.code;, &s.code;Enter&e.code; and
       &s.code;Leave&e.code; functions.  Usually the list of fixed resources is obtained
       from the Isa/PciChipsets lists.  However an additional list of
-      resources may be passed.  Generally this is not required.  The
+      resources may be passed.  Generally this is not required.  
+      For active entities a &s.code;ScrnInfoRec&e.code; is allocated 
+      if the &s.code;pScrn&e.code; argument is &s.code;NULL&e.code;.
+The
       return value is &s.code;TRUE&e.code; when successful.  The init, enter, leave
       functions are defined as follows:
 
@@ -2047,8 +2063,8 @@
       They are passed the entity index and a pointer to a private scratch
       area.  This are can be set up during &s.code;Probe()&e.code; and
       its address can be passed to
-      &s.code;xf86ConfigActiveIsaEntity()&e.code;
-      &s.code;xf86ConfigActivePciEntity()&e.code; as the last argument.
+      &s.code;xf86ConfigIsaEntity()&e.code;
+      &s.code;xf86ConfigPciEntity()&e.code; as the last argument.
 
     </quote>
     </quote>
@@ -2241,9 +2257,19 @@
 The driver may replace the generic access control functions for an entity
 by it's own ones.  This is done with the &s.code;xf86SetAccessFuncs()&e.code;:
     <quote><p>
-    &s.code;void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86AccessPtr p_io,
-			&f.indent;xf86AccessPtr p_mem, xf86AccessPtr p_io_mem,
-			&f.indent;xf86AccessPtr *ppAccessOld)&e.code;
+    &s.code;void xf86SetAccessFuncs(EntityInfoPtr pEnt, 
+                        &f.indent;xf86SetAccessFuncPtr funcs,
+			&f.indent;xf86SetAccessFuncPtr oldFuncs)&e.code;
+     with:
+
+    <verb>
+      typedef struct {
+          xf86AccessPtr mem;
+          xf86AccessPtr io;
+          xf86AccessPtr io_mem;
+      } xf86SetAccessFuncRec, *xf86SetAccessFuncPtr;
+    </verb>
+
     <quote><p>
       The driver can pass three functions: one for I/O access, one for
       memory access and one for combined memory and I/O access.  If the
@@ -2453,6 +2479,12 @@
       &s.code;scrnIndex&e.code; value of &s.code;-1&e.code; should be
       used.
 
+      NOTE 2: Given that this function stores into the
+      &s.code;OptionInfoRecs&e.code; pointed to by &s.code;optinfo&e.code,
+      the caller should ensure the &s.code;OptionInfoRecs&e.code; are
+      (re-)initialised before the call, especially if the caller expects
+      to use the predefined option values as defaults.
+
       The &s.code;OptionInfoRec&e.code; is defined as follows:
 
         <verb>
@@ -2503,9 +2535,8 @@
       &s.code;freq.units&e.code; is set to &s.code;0&e.code;, and
       &s.code;freq.freq&e.code; is unscaled.
 
-      Typical usage is to setup a static array of
-      &s.code;OptionInfoRecs&e.code; with the &s.code;token&e.code;,
-      &s.code;name&e.code;, and &s.code;type&e.code; fields initialised.
+      Typical usage is to setup an array of
+      &s.code;OptionInfoRecs&e.code; with all fields initialised.
       The &s.code;value&e.code; and &s.code;found&e.code; fields get
       set by &s.code;xf86ProcessOptions()&e.code;.  For cases where the
       value parsing is more complex, the driver should specify
@@ -2664,6 +2695,7 @@
   <quote>
     &s.code;"compiler.h"&e.code;
   </quote>
+  Note: in drivers, this must be included after &s.code;"xf86_ansic.h"&e.code;.
    
   Drivers that need to access PCI vendor/device definitions need this:
   <quote>
@@ -3263,6 +3295,13 @@
 
 	</quote>
 
+      &s.code;address&e.code;
+        <quote><p>
+                The virtual address of the framebuffer as mapped by the driver.
+                This is needed when DGA_PIXMAP_AVAILABLE is set.
+
+        </quote>
+
       <verb>
 /** The DGAFunctionRec **/
 
@@ -3279,7 +3318,7 @@
   Bool (*SetMode)(ScrnInfoPtr pScrn, DGAModePtr pMode);
   void (*SetViewport)(ScrnInfoPtr pScrn, int x, int y, int flags);
   int  (*GetViewport)(ScrnInfoPtr pScrn);
-  void (*Flush)(ScrnInfoPtr);
+  void (*Sync)(ScrnInfoPtr);
   void (*FillRect)(
        ScrnInfoPtr pScrn, 
        int x, int y, int w, int h, 
@@ -3395,7 +3434,7 @@
 
     </quote>
 
-    &s.code;void Flush (pScrn)&e.code;
+    &s.code;void Sync (pScrn)&e.code;
     <quote><p>
       This function should ensure that any graphics accelerator operations
       have finished.  This function should not return until the graphics
@@ -3746,7 +3785,7 @@
 	&s.code;typedef void (* StopVideoFuncPtr)(ScrnInfoPtr pScrn, 
 			&f.indent;pointer data, Bool cleanup)&e.code;
     <quote><p>
-	  This indicates the the driver should stop displaying the video.
+	  This indicates the driver should stop displaying the video.
 	  This is used to stop both input and output video.  The
 	  &s.code;cleanup&e.code; field indicates that the video is
 	  being stopped because the client requested it to stop or
@@ -4172,7 +4211,7 @@
 		  parameter passing in other situations.
 
 		  When loading ``external'' modules (modules that don't
-		  have the the standard entry point, for example a
+		  have the standard entry point, for example a
 		  special shared library) the options parameter can be
 		  set to &s.code;EXTERN_MODULE&e.code; to tell the
 		  loader not to reject the module when it doesn't find
@@ -4494,15 +4533,16 @@
     and maybe used by the &s.code;SetupProc&e.code; if it calls other
     loader functions that require a reference to it.   The remaining
     arguments are those that were passed to the
-    &s.code;LoadModule()&e.code; (or &s.code;LoadSubModule()&e.code;),
-    and are described above.  When the &s.code;SetupProc&e.code; is
-    successful it must return a non-&s.code;NULL&e.code; value.  The
-    loader checks this, and if it is &s.code;NULL&e.code; it unloads
-    the module and reports the failure to the caller of
-    &s.code;LoadModule()&e.code;.  If the &s.code;SetupProc&e.code; does
-    things that need to be undone when the module is unloaded, it should
-    define a &s.code;TearDownProc&e.code;, and return a pointer that
-    the &s.code;TearDownProc&e.code; can use to undo what has been done.
+    &s.code;LoadModule()&e.code; (or &s.code;LoadSubModule()&e.code;), 
+    and are described above. When the &s.code;SetupProc&e.code; is 
+    successful it must return a non-&s.code;NULL&e.code; value.  The 
+    loader checks this, and if it is &s.code;NULL&e.code; it unloads 
+    the module and reports the failure to the caller of 
+    &s.code;LoadModule()&e.code;.  If the &s.code;SetupProc&e.code; 
+    does things that need to be undone when the module is unloaded, 
+    it should define a &s.code;TearDownProc&e.code;, and return a 
+    pointer that the &s.code;TearDownProc&e.code; can use to undo what 
+    has been done.
 
     When a module is loaded multiple times, the &s.code;SetupProc&e.code;
     is called once for each time it is loaded.
@@ -6183,6 +6223,7 @@
   <quote>
     &s.code;"compiler.h"&e.code;
   </quote>
+  Note: in drivers, this must be included after &s.code;"xf86_ansic.h"&e.code;.
    
   Drivers that need to access PCI vendor/device definitions need this:
   <quote>
@@ -6386,6 +6427,8 @@
   { OPTION_NOACCEL,   "NoAccel",   OPTV_BOOLEAN, {0}, FALSE },
   { -1,               NULL,        OPTV_NONE,    {0}, FALSE }
 };
+
+#define nZZZOptions (sizeof(ZZZOptions) / sizeof(ZZZOptions[0]))
     </code>
 <p>
 </itemize>
@@ -6558,27 +6601,26 @@
                             numDevSections, drv, &amp;usedChips);
 
         for (i = 0; i < numUsed; i++) {
-            ScrnInfoPtr pScrn;
-
-            /* Allocate a ScrnInfoRec */
-            pScrn = xf86AllocateScreen(drv, 0);
-            pScrn->driverVersion = VERSION;
-            pScrn->driverName    = ZZZ_DRIVER_NAME;
-            pScrn->name          = ZZZ_NAME;
-            pScrn->Probe         = ZZZProbe;
-            pScrn->PreInit       = ZZZPreInit;
-            pScrn->ScreenInit    = ZZZScreenInit;
-            pScrn->SwitchMode    = ZZZSwitchMode;
-            pScrn->AdjustFrame   = ZZZAdjustFrame;
-            pScrn->EnterVT       = ZZZEnterVT;
-            pScrn->LeaveVT       = ZZZLeaveVT;
-            pScrn->FreeScreen    = ZZZFreeScreen;
-            pScrn->ValidMode     = ZZZValidMode;
-            foundScreen = TRUE;
-            /* add screen to entity */
-            xf86ConfigActivePciEntity(pScrn, usedChips[i],
-                        ZZZPciChipsets, NULL, NULL, NULL, NULL, NULL);
-
+            ScrnInfoPtr pScrn = NULL;
+            if ((pScrn = xf86ConfigPciEntity(pScrn, flags, usedChips[i],
+                                             ZZZPciChipsets, NULL, NULL, 
+                                             NULL, NULL, NULL))) {
+               /* Allocate a ScrnInfoRec */
+               pScrn->driverVersion = VERSION;
+               pScrn->driverName    = ZZZ_DRIVER_NAME;
+               pScrn->name          = ZZZ_NAME;
+               pScrn->Probe         = ZZZProbe;
+               pScrn->PreInit       = ZZZPreInit;
+               pScrn->ScreenInit    = ZZZScreenInit;
+               pScrn->SwitchMode    = ZZZSwitchMode;
+               pScrn->AdjustFrame   = ZZZAdjustFrame;
+               pScrn->EnterVT       = ZZZEnterVT;
+               pScrn->LeaveVT       = ZZZLeaveVT;
+               pScrn->FreeScreen    = ZZZFreeScreen;
+               pScrn->ValidMode     = ZZZValidMode;
+               foundScreen = TRUE;
+               /* add screen to entity */
+           }
         }
         if (numUsed > 0)
             xfree(usedChips);
@@ -6593,23 +6635,24 @@
                              ZZZIsaChipsets, drv, ZZZFindIsaDevice,
                              devSections, numDevSections, &amp;usedChips);
     for (i = 0; i < numUsed; i++) {
-        ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
-
-        pScrn->driverVersion = VERSION;
-        pScrn->driverName    = ZZZ_DRIVER_NAME;
-        pScrn->name          = ZZZ_NAME;
-        pScrn->Probe         = ZZZProbe;
-        pScrn->PreInit       = ZZZPreInit;
-        pScrn->ScreenInit    = ZZZScreenInit;
-        pScrn->SwitchMode    = ZZZSwitchMode;
-        pScrn->AdjustFrame   = ZZZAdjustFrame;
-        pScrn->EnterVT       = ZZZEnterVT;
-        pScrn->LeaveVT       = ZZZLeaveVT;
-        pScrn->FreeScreen    = ZZZFreeScreen;
-        pScrn->ValidMode     = ZZZValidMode;
-        foundScreen = TRUE;
-        xf86ConfigActiveIsaEntity(pScrn, usedChips[i], ZZZIsaChipsets,
-                                  NULL, NULL, NULL, NULL, NULL);
+        ScrnInfoPtr pScrn = NULL;
+	if ((pScrn = xf86ConfigIsaEntity(pScrn, flags, usedChips[i], 
+					 ZZZIsaChipsets, NULL, NULL, NULL, 
+					 NULL, NULL))) {
+            pScrn->driverVersion = VERSION;		
+            pScrn->driverName    = ZZZ_DRIVER_NAME;
+            pScrn->name          = ZZZ_NAME;
+            pScrn->Probe         = ZZZProbe;
+            pScrn->PreInit       = ZZZPreInit;
+            pScrn->ScreenInit    = ZZZScreenInit;
+            pScrn->SwitchMode    = ZZZSwitchMode;
+            pScrn->AdjustFrame   = ZZZAdjustFrame;
+            pScrn->EnterVT       = ZZZEnterVT;
+            pScrn->LeaveVT       = ZZZLeaveVT;
+            pScrn->FreeScreen    = ZZZFreeScreen;
+            pScrn->ValidMode     = ZZZValidMode;
+            foundScreen = TRUE;
+        }
     }
     if (numUsed > 0)
         xfree(usedChips);
@@ -6668,6 +6711,8 @@
 static Bool
 ZZZPreInit(ScrnInfoPtr pScrn, int flags)
 {
+    OptionInfoRec options[nZZZOptions];
+
     /* Fill in the monitor field */
     pScrn->monitor = pScrn->confScreen->monitor;
 
@@ -6746,9 +6791,10 @@
 
     /*
      * Process the options based on the information in ZZZOptions.
-     * The results are written to ZZZOptions.
+     * The results are written to options.
      */
-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, ZZZOptions);
+    (void)memcpy(options, ZZZOptions, sizeof(ZZZOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
     /*
      * Set various fields of ScrnInfoRec and/or ZZZRec based on
@@ -6756,25 +6802,25 @@
      */
     from = X_DEFAULT;
     pZzz->hwCursor = FALSE;
-    if (xf86IsOptionSet(ZZZOptions, OPTION_HW_CURSOR)) {
+    if (xf86IsOptionSet(options, OPTION_HW_CURSOR)) {
         from = X_CONFIG;
         pZzz->hwCursor = TRUE;
     }
     xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
                pZzz->hwCursor ? "HW" : "SW");
-    if (xf86IsOptionSet(ZZZOptions, OPTION_NOACCEL)) {
+    if (xf86IsOptionSet(options, OPTION_NOACCEL)) {
         pZzz->noAccel = TRUE;
         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
                    "Acceleration disabled\n");
     } else {
         pZzz->noAccel = FALSE;
     }
-    if (xf86IsOptionSet(ZZZOptions, OPTION_PCI_RETRY)) {
+    if (xf86IsOptionSet(options, OPTION_PCI_RETRY)) {
         pZzz->UsePCIRetry = TRUE;
         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "PCI retry enabled\n");
     }
     pZzz->fooHack = 0;
-    if (xf86GetOptValInteger(ZZZOptions, OPTION_FOO_HACK,
+    if (xf86GetOptValInteger(options, OPTION_FOO_HACK,
                              &amp;pZzz->fooHack)) {
         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Foo Hack set to %d\n",
                    pZzz->fooHack);
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml:1.3 xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml:1.5
--- xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml:1.3	Tue Mar  7 21:38:41 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml	Fri Jun 16 17:03:17 2000
@@ -3,17 +3,17 @@
 ]>
 
 <!-- Created: Mon Feb 28 13:00:00 2000 by brian@precisioninsight.com -->
-<!-- Revised: Mon Mar  6 20:10:02 2000 by kevin@precisioninsight.com -->
+<!-- Revised: Fri May 19 09:41:48 2000 by martin@valinux.com -->
 
   <article>
 
-      <title>DRI Users Guide
+      <title>DRI User Guide
       <author><htmlurl url="http://www.precisioninsight.com/"
                        name="Precision Insight, Inc.">
-      <date>6 March 2000
+      <date>18 May 2000
 
     <ident>
-    $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.3 2000/03/08 05:38:41 dawes Exp $
+    $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.5 2000/06/17 00:03:17 martin Exp $
     </ident>
 
     <toc>
@@ -25,7 +25,7 @@
           <bf>Copyright &copy; 2000 by Precision Insight, Inc.,
           Cedar Park, Texas.
           All Rights Reserved.</bf>
-        <p>
+<p>
           <bf>Permission is granted to make and distribute verbatim copies 
           of this document provided the copyright notice and this permission
           notice are preserved on all copies.</bf>
@@ -43,6 +43,8 @@
           trademarks of 3Dlabs Inc. Ltd.
           3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of
           3dfx Interactive, Incorporated.
+	  Matrox is a registered trademark of Matrox Electronic Systems Ltd.
+	  ATI Rage is a registered trademark of ATI Technologies, Inc.
           All other trademarks mentioned are the property of their
           respective owners.
 
@@ -60,9 +62,13 @@
 	software downloads.
       <p>
         This document does not cover compilation or installation of
-        XFree86 4.0;
-        it is assumed that you've already installed a Linux distribution which
-        includes XFree86 4.0.  
+        XFree86 4.0.
+        It is assumed that you've already installed a Linux distribution which
+        includes XFree86 4.0 or that you're an experienced Linux developer
+        who has compiled the DRI for himself.
+        DRI download, compilation and installation instructions can be found
+        at <htmlurl url="http://dri.sourceforge.net/DRIcompile.html"
+           name="http://dri.sourceforge.net/DRIcompile.html">
 
     <sect>Supported Hardware
 <p>
@@ -71,8 +77,8 @@
         Support for Alpha, and perhaps other CPUs, should be available in the
         future.
       <p>
-        XFree86 4.0 includes 3D acceleration for the following
-        graphics hardware:
+        XFree86 4.0 (or later versions) includes 3D acceleration for the
+        following graphics hardware:
 
         <itemize>
           <item>3dfx:
@@ -87,15 +93,35 @@
             </itemize>
             There are many configurations of 3dfx cards on the market.
             Not all have been tested.
+          <item>Matrox:
+            <itemize>
+	      <item>Matrox G200
+	      <item>Matrox G400
+            </itemize>
+          <item>Intel i810
+            <itemize>
+              <item>i810
+              <item>i810-dc100
+              <item>i810e
+            </itemize>
+	  <item>ATI Rage 128
+            <itemize>
+              <item>Rage Fury AGP
+              <item>Rage Magnum AGP
+              <item>XPERT 2000 AGP
+              <item>XPERT 128 AGP
+	      <item>XPERT 99 AGP
+	      <item>All-in-Wonder 128 AGP
+            </itemize>
+	    The PCI versions of these cards also have minimal support.
+	    Note that there are also Rage 128 Pro based boards on the
+	    market, and these are not yet supported.
           <item>3Dlabs Oxygen GMX 2000 (MX/Gamma based)
         </itemize>
 
       <p>
         Support for the following hardware is underway:
 	<itemize>
-          <item>Intel i810
-	  <item>Matrox G400
-	  <item>ATI Rage 128
 	  <item>3dfx Voodoo4 and Voodoo5 series
 	</itemize>
 
@@ -104,8 +130,11 @@
 <p>
         <itemize>
           <item>XFree86 4.0
-          <item>Linux kernel 2.2.x (later kernels will be supported in
+          <item>For the 3dfx Voodoo3 driver, Linux kernel 2.2.x (later
+                kernels will be supported in
                 the near future, and may be required for some chipsets)
+          <item>For the Matrox G200/G400, Linux kernel 2.3.51, with AGP support
+          <item>For the Intel i810, Linux kernel 2.3.99-pre6, with AGP support
         </itemize>
       <p>
         Mesa 3.3 (beta) is included with XFree86 4.0; there is no need to
@@ -119,20 +148,17 @@
 
       <sect1>Kernel module
 <p>
-          Before starting the X server you must install the correct kernel
-          module for your hardware.
-        <p>
-          This can be done by executing the following as root:
-        <verb>
-        insmod XXX/drivername.o
-        </verb>
-        <p>
-          For example, on 3dfx hardware, the kernel module is called tdfx.o
-          so you you would type insmod XXX/tdfx.o
-
-        <p>
-          Verify that the kernel module was installed by checking that
-          /proc/dri/0 exists. 
+          XFree86 4.0.1 added automatic kernel module loading to the X server.
+          On Linux, the X server uses modprobe to load kernel modules.
+          The DRM kernel modules should be in /lib/modules/KERNEL-VERSION/misc/
+          for automatic loading to work.
+<p>
+          Optionally, DRM kernel modules can be loaded manually with insmod
+          prior to starting the X server.
+<p>
+          You can verify that the kernel module was installed with lsmod,
+          checking the X server startup log, and checking that /proc/dri/0
+          exists. 
 
       <sect1>XF86Config file
 <p>
@@ -199,6 +225,7 @@
         <p>
           Next, the Device section of the XF86Config file must describe your
           particular hardware.
+        <p>
           For example, here's the Device section for a 3dfx Voodoo3 card:
 
         <verb>
@@ -210,6 +237,37 @@
         </verb>
 
         <p>
+          Here's the Device section for a Matrox G400 card:
+        <verb>
+	Section "Device"
+	    Identifier  "G400"
+	    VendorName  "Matrox"
+	    Driver      "mga"
+	    VideoRam    32768
+	EndSection
+        </verb>
+
+        <p>
+          Here's the Device section for an ATI Rage 128 card:
+        <verb>
+	Section "Device"
+	    Identifier  "Rage128"
+	    VendorName  "ATI"
+	    Driver      "r128"
+	EndSection
+        </verb>
+
+          Here's the Device section for an Intel i810 motherboard:
+        <verb>
+	Section "Device"
+	    Identifier  "i810"
+	    VendorName  "Intel"
+	    Driver      "i810"
+	    VideoRam    10000
+	EndSection
+        </verb>
+
+        <p>
           Finally, the Screen section of the XF86Config file may have to be
           specially configured as well.
           For example, Voodoo3 hardware acceleration is only available
@@ -227,8 +285,11 @@
 	    EndSubsection
         EndSection
         </verb>
-
         <p>
+          Replace <em>Voodoo3</em> with <em>G400</em> for Matrox G400.
+        <p>
+          Replace <em>Voodoo3</em> with <em>Rage128</em> for ATI Rage 128.
+        <p>
           If there are errors in the XF86Config file, the X server will
           log errors to the file /var/log/XFree86.0.log
 
@@ -301,6 +362,25 @@
           if means that the libGL.so.1 file is not the right location.
           Proceed to the trouble shooting section.          
 
+      <sect1>libOSMesa.so
+<p>
+          OSMesa (Off-Screen Mesa) is an interface and driver for rendering
+          3D images into a user-allocated block of memory rather than an
+          on-screen window.
+<p>
+          libOSMesa.so implements the OSMesa interface and must be linked
+          with your application if you want to use the OSMesa functions.
+          You must also link with libGL.so.  For example:
+        <verb>
+        gcc osdemo.c -L/usr/X11R6/lib -lOSMesa -lGLU -lGL -o osdemo
+        </verb>
+<p>
+          In stand-alone Mesa this interface was compiled into the monolithic
+          libGL.so (formerly libMesaGL.so) library.
+          In XFree86 4.0.1 and later this interface is implemented in a
+          separate library.
+<p>
+
       <sect1>glxinfo
 <p>
           glxinfo is a useful program for checking which version of
@@ -346,20 +426,25 @@
           <enum>
             <item>
               <tt/LIBGL_DEBUG/, if defined will cause libGL.so to print error
-              and diagnostic messages.  This can help to solve problems.
+              and diagnostic messages.
+              This can help to solve problems.
+              Setting <tt/LIBGL_DEBUG/ to <tt/verbose/ may provide additional
+              information.
 	    <item>
 	      <tt/LIBGL_ALWAYS_INDIRECT/, if defined this will force libGL.so
 	      to always use indirect rendering instead of hardware
-               acceleration.
+              acceleration.
 	      This can be useful to isolate rendering errors.
 	    <item>
-	      <tt/LIBGL_DRIVERS_DIR/ can be used to override the default
-	      directory which is searched for 3D drivers.
+	      <tt/LIBGL_DRIVERS_PATH/ can be used to override the default
+	      directories which are searched for 3D drivers.
+              The value is one or more paths separated by colons.
 	      In a typical XFree86 installation, the 3D drivers should be in
-	      /usr/X11R6/lib/modules/dri/.
-	      This environment variable can be used to specify a different
-	      directory.
+	      /usr/X11R6/lib/modules/dri/ and <tt/LIBGL_DRIVERS_PATH/ need
+              not be defined.
 	      Note that this feature is disabled for set-uid programs.
+              This variable replaces the <tt/LIBGL_DRIVERS_DIR/ env var used
+              in XFree86 4.0.
 	  </enum>
         <p>
           Mesa-based drivers (this includes most of the drivers listed
@@ -531,6 +616,40 @@
 
       <sect1>3dfx Voodoo3
 <p>
+        <sect2>Configuration
+<p>
+            Your XF86Config file's device section must specify the
+            <tt>tdfx</tt> device:
+            <verb>
+        Section "Device"
+            Identifier  "Voodoo3"
+            VendorName  "3dfx"
+            Driver      "tdfx"
+        EndSection
+            </verb>
+            The Screen section should then reference the Voodoo3 device:
+            <verb>
+	Section "Screen"
+	    Identifier  "Screen 1"
+	    Device      "Voodoo3"
+	    Monitor     "High Res Monitor"
+	    DefaultDepth 16
+	    Subsection "Display"
+		Depth       16
+		Modes       "1280x1024" "1024x768" "800x600" "640x480"
+		ViewPort    0 0
+	    EndSubsection
+        EndSection
+            </verb>
+          <p>
+            The kernel module for the Voodoo3 is named <tt>tdfx.o</tt> and
+	    should be installed in /lib/modules/KERNEL-VERSION/misc/.
+            It will be automatically loaded by the Xserver if needed.
+          <p>
+	    The DRI 3D driver for the Voodoo3 should be in
+	    <tt>/usr/X11R6/lib/modules/dri/tdfx_dri.so</tt>.
+            This will be automatically loaded by libGL.so.
+
         <sect2>Troubleshooting
 <p>
           <itemize>
@@ -539,6 +658,9 @@
               bit/pixel screen mode.
               Use <tt/xdpyinfo/ to verify that all your visuals are depth 16.
               Edit your XF86Config file if needed.
+           <item>
+              The <tt>/dev/3dfx</tt> device is not used for DRI; it's only for
+              Glide on older 3dfx hardware.
           </itemize>
 
         <sect2>Performance
@@ -565,6 +687,9 @@
 <p>
           <itemize>
             <item>
+              Glide cannot be used directly; only OpenGL-based programs are
+              supported on the Voodoo3.
+            <item>
               SSystem has problems because of poorly set near and far
               clipping planes.
               The office.unc Performer model also suffers from this problem.
@@ -572,11 +697,183 @@
 
 
       <sect1>Intel i810
+<p>
+        <sect2>Configuration
 <p>
-      <sect1>Matrox G400
+            Your XF86Config file's device section must specify the
+            <tt>i810</tt> device, and specify a usable amount of video
+            ram to reserve.
+            <verb>
+        Section "Device"
+            Identifier  "i810"
+            VendorName  "Intel"
+            Driver      "i810"
+	    VideoRam    10000
+        EndSection
+            </verb>
+            The Screen section should then reference the i810 device:
+            <verb>
+	Section "Screen"
+	    Identifier  "Screen 1"
+	    Device      "i810"
+	    Monitor     "High Res Monitor"
+	    DefaultDepth 16
+	    Subsection "Display"
+		Depth       16
+		Modes       "1280x1024" "1024x768" "800x600" "640x480"
+		ViewPort    0 0
+	    EndSubsection
+        EndSection
+            </verb>
+          <p>
+            The kernel module for the i810 is named <tt>i810.o</tt> and
+	    should be installed in /lib/modules/KERNEL-VERSION/misc/.
+            It will be automatically loaded by the Xserver if needed.
+          <p>
+	    The DRI 3D driver for the i810 should be in
+	    <tt>/usr/X11R6/lib/modules/dri/i810_dri.so</tt>.
+            This will be automatically loaded by libGL.so.
+
+        <sect2>Troubleshooting
 <p>
+          <itemize>
+            <item>
+              3D acceleration for the i810 is only available in the 16
+              bit/pixel screen mode at this time.  32bpp acceleration is
+	      not supported by this hardware.
+              Use <tt/xdpyinfo/ to verify that all your visuals are depth 16.
+              Edit your XF86Config file if needed.
+            <item>
+	      The i810 uses system ram for video and 3d graphics.  The X
+	      server will ordinarily reserve 4mb of ram for graphics,
+	      which is too little for an effective 3d setup.  To tell
+	      the driver to use a larger amount, specify a VideoRam
+	      option in the Device section of your XF86Config file.  A
+	      number between 10000 and 16384 seems adequate for most
+	      requirements.  If too little memory is available for DMA
+	      buffers, back and depth buffers and textures, direct
+	      rendering will be disabled.
+          </itemize>
+
+<p>
+
+      <sect1>Matrox G200 and G400
+<p>
+        <sect2>Configuration
+<p>
+            Your XF86Config file's device section must specify the
+            <tt>mga</tt> device:  
+            <verb>
+        Section "Device"
+            Identifier  "MGA"
+            VendorName  "Matrox"
+            Driver      "mga"
+        EndSection
+            </verb>
+            The Screen section should then reference the MGA device:
+            <verb>
+	Section "Screen"
+	    Identifier  "Screen 1"
+	    Device      "MGA"
+	    Monitor     "High Res Monitor"
+	    DefaultDepth 16
+	    Subsection "Display"
+		Depth       16
+		Modes       "1280x1024" "1024x768" "800x600" "640x480"
+		ViewPort    0 0
+	    EndSubsection
+        EndSection
+            </verb>
+          <p>
+            The kernel module for the G200/G400 is named <tt>mga.o</tt> and
+	    should be installed in /lib/modules/KERNEL-VERSION/misc/.
+            It will be automatically loaded by the Xserver if needed.
+          <p>
+	    The DRI 3D driver for the G200/G400 should be in
+	    <tt>/usr/X11R6/lib/modules/dri/mga_dri.so</tt>.
+            This will be automatically loaded by libGL.so.
+
+        <sect2>Troubleshooting
+<p>
+          <itemize>
+            <item>
+              3D acceleration for the G200 and G400 is only supported in the 16
+              bit/pixel screen mode at this time.  32bpp will be supported
+              in the future.
+              Use <tt/xdpyinfo/ to verify that all your visuals are depth 16.
+              Edit your XF86Config file if needed.
+          </itemize>
+
+        <sect2>Performance
+<p>
+          No data at this time.
+
+        <sect2>Known Problems
+<p>
+          <itemize>
+            <item>
+	      Multitexture is currently disabled on the G400 to work
+	      around a hardware lockup bug.  This should be restored in
+	      a subsequent release.
+          </itemize>
+
+
       <sect1>ATI Rage 128
 <p>
+        <sect2>Configuration
+<p>
+            Your XF86Config file's device section must specify the
+            <tt>r128</tt> device:
+            <verb>
+        Section "Device"
+            Identifier  "Rage128"
+            VendorName  "ATI"
+            Driver      "r128"
+        EndSection
+            </verb>
+            The Screen section should then reference the Rage 128 device:
+            <verb>
+	Section "Screen"
+	    Identifier  "Screen 1"
+	    Device      "Rage128"
+	    Monitor     "High Res Monitor"
+	    DefaultDepth 16
+	    Subsection "Display"
+		Depth       16
+		Modes       "1280x1024" "1024x768" "800x600" "640x480"
+		ViewPort    0 0
+	    EndSubsection
+	    Subsection "Display"
+		Depth       32
+		Modes       "1280x1024" "1024x768" "800x600" "640x480"
+		ViewPort    0 0
+	    EndSubsection
+        EndSection
+            </verb>
+          <p>
+            The kernel module for the Rage 128 is named <tt>r128.o</tt> and
+	    should be installed in /lib/modules/KERNEL-VERSION/misc/.
+            It will be automatically loaded by the Xserver if needed.
+          <p>
+	    The DRI 3D driver for the Rage 128 should be in
+	    <tt>/usr/X11R6/lib/modules/dri/r128_dri.so</tt>.
+            This will be automatically loaded by libGL.so.
+          <p>
+            You may also set your screen depth to 32 for 32bpp mode.
+          <p>
+
+        <sect2>Performance
+<p>
+          While PCI Rage 128 based cards are supported, they do not yet
+          support PCI GART, so they will not perform as well as their
+          AGP counterparts.
+
+        <sect2>Known Problems
+<p>
+          DGA is not yet supported in the ATI Rage 128 X server.  This
+          feature will be added in a future release.
+
+
       <sect1>3DLabs Oxygen GMX 2000
 <p>
           The driver for this hardware was experimental and is no longer being
@@ -621,6 +918,50 @@
           which will be addressed in the future.
 
 
+      <sect1>libGL.so and dlopen()
+<p>
+          A number of popular OpenGL applications on Linux (such as Quake3,
+          HereticII, Heavy Gear 2, etc) dynamically open the libGL.so
+          library at runtime with dlopen(), rather than linking with -lGL
+          at compile/link time.
+<p>
+          If dynamic loading of libGL.so is not implemented carefully, there
+          can be a number of serious problems.
+          Here are the things to be careful of in your application:
+          <itemize>
+          <item>Specify the RTLD_GLOBAL flag to dlopen().
+            If you don't do this then you'll likely see a runtime error message
+            complaining that _glapi_Context is undefined when libGL.so
+            tries to open a hardware-specific driver.
+            Without this flag, <em>nested</em> opening of dynamic libraries
+            does not work.
+          <item>Do not close the library with dlclose() until after
+            XCloseDisplay() has been called.
+            When libGL.so initializes itself it registers several callbacks
+            functions with Xlib.
+            When XCloseDisplay() is called those callback functions are
+            called.
+            If libGL.so has already been unloaded with dlclose() this will
+            cause a segmentation fault.
+          <item>
+            Your application should link with -lpthread.
+            On Linux, libGL.so uses the pthreads library in order to provide
+            thread safety.
+            There is apparently a bug in the dlopen()/dlclose() code which
+            causes crashes if the library uses pthreads but the parent
+            application doesn't.
+            The only known work-around is to link the application with
+            -lpthread.
+          </itemize>
+
+          Some applications don't yet incorporate these procedures and
+          may fail.
+          For example, changing the graphics settings in some video games
+          will expose this problem.
+          The DRI developers are working with game vendors to prevent this
+          problem in the future.
+
+
       <sect1>Bug Database
 <p>
           The DRI bug database which includes bugs related to specific
@@ -654,6 +995,9 @@
           <item>Visit the <htmlurl url="http://dri.sourceforge.net"
             name="DRI project on SourceForge.net"> for the latest development
             news about the DRI and 3D drivers.
+          <item>The <htmlurl url="http://dri.sourceforge.net/DRIcompile.html"
+            name="DRI Compilation Guide"> explains how to download, compile
+            and install the DRI for yourself.
         </itemize>
 
       <sect1>Support
@@ -664,53 +1008,12 @@
             <htmlurl url="http://sourceforge.net/mail/?group_id=387"
             name="SourceForge"> is a forum for people to discuss DRI problems.
           <item>
-            XXX IHV support?
-          <item>
-            XXX Linux distro support?
+            In the future there may be IHV and Linux vendor support resources
+            for the DRI.
         </itemize>
 
   </article>
 
-
-<!--
-1. Introduction
-2. Supported Hardware
-3. Prerequisite Software
-4. Start-Up
-5. Using 3D Acceleration
-   5.1 libGL.so
-   5.2 glxinfo
-   5.3 Environment variables
-6. General Trouble Shooting
-7. Hardware-Specific Information
-   7.1 3dfx
-   7.2 Intel i810
-   7.3 Matrox G400
-   7.4 ATI Rage 128
-   7.5 3DLabs Gamma
-8. Limitation and Known Bugs
-   8.1 OpenGL
-   8.2 GLX
-   8.3 Signal Handling
-   8.4 Scheduling
-   8.5 Bug Database
-9. Resources
-   9.1 Software Resources
-       GLU
-       GLUT
-       Glide3
-       Utilities and demos
-       Sample XF86Config files
-   9.2 Documentation
-       www.XFree86.org
-       www.opengl.org
-       www.linux.com
-       www.precisioninsight.com
-       sourceforge.net
-   9.3 Support
-       IHVs
-       RedHat
- -->
 
   <!-- Local Variables: -->
   <!-- fill-column: 72  -->
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
diff -u /dev/null xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml:1.3
--- /dev/null	Sat Jul  1 20:42:45 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml	Fri Jun 16 19:16:49 2000
@@ -0,0 +1,490 @@
+<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
+
+<!-- Created: Sun Mar 12 13:00:00 2000 by brian@precisioninsight.com -->
+<!-- Revised: Fri May 19 09:36:02 2000 by martin@valinux.com -->
+
+  <article>
+
+      <title>DRI Compilation Guide
+      <author>
+          <htmlurl url="http://www.precisioninsight.com/"
+            name="Precision Insight, Inc.">
+      <date>18 May 2000
+        
+    <ident>
+    $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.3 2000/06/17 02:16:49 dawes Exp $
+    </ident>
+
+    <toc>
+
+    <sect>Preamble <p>
+      <sect1>Copyright <p>
+          <bf>Copyright &copy; 2000 by Precision Insight, Inc.,
+          Cedar Park, Texas.
+          All Rights Reserved.</bf>
+        <p>
+          <bf>Permission is granted to make and distribute verbatim copies 
+          of this document provided the copyright notice and this permission
+          notice are preserved on all copies.</bf>
+          
+      <sect1>Trademarks <p>
+          OpenGL is a registered trademark and SGI is a trademark of
+          Silicon Graphics, Inc.
+          Unix is a registered trademark of The Open Group.
+          The `X' device and X Window System are trademarks of The Open Group.
+          XFree86 is a trademark of The XFree86 Project.
+          Linux is a registered trademark of Linus Torvalds.
+          Intel is a registered trademark of Intel Corporation.
+          3Dlabs, GLINT, and Oxygen are either registered trademarks or
+          trademarks of 3Dlabs Inc. Ltd.
+          3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of
+          3dfx Interactive, Incorporated.
+	  Matrox is a registered trademark of Matrox Electronic Systems Ltd.
+	  ATI Rage is a registered trademark of ATI Technologies, Inc.
+          All other trademarks mentioned are the property of their
+          respective owners.
+
+
+    <sect>Introduction <p>
+        This document describes how to download, compile and install the
+        DRI project.
+        This information is intended for experienced Linux developers.
+        Beginners are probably better off installing precompiled packages.
+      <p>
+        Edits, corrections and updates to this document may be mailed
+        to brian@precisioninsight.com.
+
+
+    <sect>Prerequisites <p>
+        You'll need the following:
+        <itemize>
+          <item>At least 400MB of free disk space.  More is needed if you want
+            to build with debugging information or keep several build trees.
+          <item>A fast system.  Using a PIII-550 it takes about 1/2 hour to
+            build everything.
+          <item>GCC compiler and related tools.
+          <item>ssh (secure shell) for registered developer downloading of the
+            DRI source tree
+        </itemize>
+
+      <p>
+        For 3dfx Voodoo3 hardware, you'll also need:
+        <itemize>
+          <item>Glide3x headers and runtime library if you want to use the
+            3dfx driver.
+            These can be obtained from
+            <htmlurl url="http://linux.3dfx.com/open_source/glide_kit.htm"
+            name="linux.3dfx.com">.
+          <item>Linux kernel 2.2.x.
+            The DRI developers have been using stock RedHat 6.1 systems
+            (kernel 2.2.12-20).
+            Later kernel versions will be supported in the future.
+        </itemize>
+
+      <p>
+        For Matrox G200/G400 hardware, you'll also need:
+        <itemize>
+          <item>Linux kernel 2.3.51.  Older kernel versions will not work.
+        </itemize>
+
+      <p>
+        For Intel i810 hardware, you'll also need:
+        <itemize>
+          <item>Linux kernel 2.3.99-pre6.  Older kernel versions will not work.
+        </itemize>
+
+      <p>
+        For ATI Rage hardware, you'll also need:
+        <itemize>
+          <item>Linux kernel 2.3.51.  Other kernel versions may work but
+            this one is known to work.
+        </itemize>
+
+
+    <sect>Kernel preparation <p>
+        You may have to upgrade your Linux kernel in order to use the DRI.
+        This is because you need a kernel version which supports AGP.
+        Building a new Linux kernel can be difficult for beginners but
+        there are resources on the Internet to help.
+        This document assumes experience with configuring, building and
+        installing Linux kernels.
+      <p>
+        Linux kernels can be downloaded from
+        <htmlurl url="http://www.kernel.org/pub/linux/kernel/"
+        name="www.kernel.org">
+      <p>
+        Download the needed kernel and put it in /usr/src.
+        Create a directory for the source and unpack it.
+        For example:
+            <verb>
+            cd /usr/src
+	    rm -f linux
+            mkdir linux-2.3.51
+            ln -s linux-2.3.51 linux
+            bzcat linux-2.3.51.tar.bz2 | tar xf -
+            </verb>
+      <p>
+        Now configure your kernel.
+        You might, for example, use <tt>make menuconfig</tt> and do the
+        following:
+
+        <itemize>
+        <item>Go to <em>Code maturity level options</em>
+	<item>Enable <em>Prompt for development and/or incomplete
+          code/drivers</em>
+	<item>hit ESC
+	<item>Go to <em>Character devices</em>
+	<item>Disable <em>Direct Rendering Manager (XFree86 DRI support)</em>
+          since we'll use the DRI module from the XFree86/DRI tree.
+        <item>Go to <em>/dev/agpgart (AGP Support) (EXPERIMENTAL) (NEW)</em>
+        <item>Hit SPACE twice
+	<item>Enable all chipsets' support for AGP
+	</itemize>
+
+      <p>It's recommended that you turn on MTRRs under <em>Processor type
+        and Features</em>, but not required.
+
+      <p>
+        Configure the rest of the kernel as required for your system
+        (i.e. Ethernet, SCSI, etc)
+      <p>
+        Exit, saving your kernel configuration.
+      <p>
+        Edit your /etc/lilo.conf file.
+	Make sure you have an image entry as follows (or similar):
+            <verb>
+            image=/boot/vmlinuz
+                  label=linux.2.3.51
+                  read-only
+                  root=/dev/hda1
+            </verb>
+      <p>
+	The important part is that you have /boot/vmlinuz without a
+	trailing version number.
+	If this is the first entry in your /etc/lilo.conf AND you
+	haven't set a default, then this will be your default kernel.
+
+      <p>
+        Now compile the new kernel:
+
+            <verb>
+            cd /usr/src/linux-2.3.51
+            make dep ; make bzImage
+            make modules ; make modules_install
+            make install
+            </verb>
+	Note that the final part, make install, will automatically run
+	lilo for you.
+      <p>
+        Now reboot to use this new kernel.
+
+
+    <sect>Downloading the XFree86/DRI CVS Sources <p>
+        The DRI project is hosted by VA Linux Systems'
+        <htmlurl url="http://sourceforge.net/project/?group_id=387"
+        name="SourceForge">.
+        The DRI source code, which is a subset of the XFree86 source tree,
+        is kept in a CVS repository there.
+      <p>
+        The DRI CVS sources may be accessed either anonymously or as a
+        registered SourceForge user.
+        It's recommended that you become a registered SourceForge user so
+        that you may submit non-anonymous bug reports and can participate
+        in the mailing lists.
+
+      <sect1>Anonymous CVS download: <p>
+        <enum>
+          <item>Create a directory to store the CVS files:
+            <p>
+            <verb>
+            cd ~
+            mkdir DRI-CVS
+            </verb>
+            You could put your CVS directory in a different place but we'll
+            use <tt>~/DRI-CVS/</tt> here.
+            <p>
+          <item>Check out the CVS sources:
+            <p>
+            <verb>
+            cd ~/DRI-CVS
+            cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login
+              (hit ENTER when prompted for a password)
+            cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc
+            </verb>
+            <p>
+            The -z3 flag causes compression to be used in order to reduce
+            the download time.
+        </enum>
+
+
+      <sect1>Registered CVS download: <p>
+        <enum>
+          <item>Create a directory to store the CVS files:
+            <p>
+            <verb>
+            cd ~
+            mkdir DRI-CVS
+            </verb>
+            You could put your CVS directory in a different place but we'll
+            use <tt>~/DRI-CVS/</tt> here.
+            <p>
+          <item>Set the CVS_RSH environment variable:
+            <p>
+            <verb>
+            setenv CVS_RSH ssh      // if using csh or tcsh
+            export CVS_RSH=ssh      // if using sh or bash
+            </verb>
+          <item>Check out the CVS sources:
+            <p>
+            <verb>
+            cd ~/DRI-CVS
+            cvs -z3 -dYOURID@cvs.dri.sourceforge.net:/cvsroot/dri co xc
+            </verb>
+            Replace <tt>YOURID</tt> with your CVS login name.
+            You'll be prompted to enter your sourceforge password.
+            <p>
+            The -z3 flag causes compression to be used in order to reduce
+            the download time.
+        </enum>
+
+
+    <sect>Updating your CVS sources <p>
+        In the future you'll want to occasionally update your local copy of
+        the DRI source code to get the latest changes.
+        This can be done with:
+        <verb>
+            cd ~/DRI-CVS
+            cvs -z3 update -dA xc
+        </verb>
+        The -d flag causes any new subdirectories to be created and -A causes
+        most recent trunk sources to be fetched, not branch sources.
+
+
+    <sect>Compiling the XFree86/DRI tree <p>
+      <sect1>Make a build tree <p>
+          Rather than placing object files and library files right in the
+          source tree, they're instead put into a parallel <em>build</em> tree.
+          The build tree is made with the <tt>lndir</tt> command:
+          <verb>
+            cd ~/DRI-CVS
+            ln -s xc XFree40
+            mkdir build
+            cd build
+            lndir -silent -ignorelinks ../XFree40
+          </verb>
+        <p>
+          The build tree will be populated with symbolic links which point
+          back into the CVS source tree.
+        <p>
+          Advanced users may have several build trees for compiling and
+          testing with different options.
+
+      <sect1>Edit the host.def file <p>
+          The <tt>~/DRI-CVS/build/xc/config/cf/host.def</tt> file is used
+          to configure the XFree86 build process.
+          You can change it to customize your build options or make adjustments
+          for your particular system configuration
+        <p>
+          The default <tt>host.def</tt> file will look something like this:
+          <verb>
+            #define DefaultCCOptions -Wall
+            #define DefaultGcc2i386Opt -O2
+            #define LibraryCDebugFlags -O2
+            #define BuildServersOnly YES
+            #define XF86CardDrivers vga tdfx mga r128 i810
+            #define LinuxDistribution LinuxRedHat
+            #define DefaultCCOptions -ansi GccWarningOptions -pipe
+            #define BuildXF86DRI YES
+            #define HasGlide3 YES  
+            /* Optionally turn these on for debugging */
+            /* #define GlxBuiltInTdfx YES */
+            /* #define GlxBuiltInMga YES */
+            /* #define GlxBuiltInR128 YES */
+            /* #define DoLoadableServer NO */
+            #define SharedLibFont NO
+          </verb>
+          The <tt>ProjectRoot</tt> variable specifies where the XFree86 files
+          will be installed.
+          You probably don't want to use <tt>/usr/X11R6/</tt> because that
+          would overwrite your default X files.
+          The following is recommended:
+          <verb>
+            #define ProjectRoot /usr/XF86-main
+          </verb>
+        <p>
+          Especially note the <em>XF86CardDrivers</em> line to be sure your
+          driver is listed.
+        <p>
+          If you have 3dfx hardware be sure that the Glide 3x headers are
+          installed in <tt>/usr/include/glide3/</tt> and that the Glide 3x
+          library is installed at <tt>/usr/lib/libglide3x.so</tt>.
+        <p>
+          If you do not have 3dfx hardware comment out the <tt>HasGlide3</tt>
+          line in <tt>host.def</tt>.
+        <p>
+
+      <sect1>Compile <p>
+          To compile the complete DRI tree:
+          <verb>
+            cd ~/DRI-CVS/build/xc/
+            make World >& World.LOG
+          </verb>
+          Or if you want to watch the compilation progress:
+          <verb>
+            cd ~/DRI-CVS/build/xc/
+            make World >& World.LOG &
+            tail -f World.LOG
+          </verb>
+          With the default compilation flags it's normal to get a lot of
+          warnings during compilation.
+        <p>
+          Building will take some time so you may want to go check your
+          email or visit slashdot.
+
+      <sect1>Check for compilation errors <p>
+          Using your text editor, examine <tt>World.LOG</tt> for errors
+          by searching for the pattern <tt>***</tt>.
+        <p>
+          Verify that the DRI kernel module(s) for your system were built:
+          <verb>
+          cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
+          ls
+          </verb>
+        <p>
+          For the 3dfx Voodoo, you should see <em>tdfx.o</em>.
+          For the Matrox G200/G400, you should see <em>mga.o</em>.
+          For the ATI Rage 128, you should see <em>r128.o</em>.
+          For the Intel i810, you should see <em>i810.o</em>.
+        <p>
+          If the DRI kernel module(s) failed to build you should verify
+          that you're using the right version of the Linux kernel.
+          The most recent kernels are not always supported.
+        <p>
+          If your build machine is running a different version of the kernel
+          than your target machine (i.e. 2.2.12-20 vs. 2.3.99-pre6), make will
+          select the wrong kernel headers. This can be fixed by explicitly
+          setting the value of <tt>TREE</tt>.
+          If the path to your kernel source is 
+          <tt>/bigdisk/linux-2.3.99-pre6</tt>,
+          <verb>
+          cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
+          make TREE=/bigdisk/linux-2.3.99-pre6
+          </verb>
+          or alternatively, edit Makefile to include this change.
+        <p>
+          After fixing the errors, do <tt>make World</tt> again.
+          Later, you might just compile parts of the source tree but it's
+          important that the whole tree will build first.
+
+
+    <sect>Installing <p>
+        After the DRI tree has been compiled you can install the XFree86
+        headers, libraries, programs, etc for testing.
+
+      <sect1>X Installation <p>
+	  As mentioned above, the install directory is specified by the
+	  <tt>ProjectRoot</tt> variable in the <tt>host.def</tt> file.
+	  Create that directory now if it doesn't already exist:
+	  <verb>
+	      mkdir /usr/XF86-main
+	  </verb>
+	<p>
+	  You'll have to change to root since the install process puts
+	  several files in <tt>/etc/X11/</tt> and sets the setuid flag on
+	  the X server executable.
+	  <verb>
+	      cd ~/DRI-CVS/build/xc
+	      su
+	      make install
+	  </verb>
+	  Edit your <tt>/etc/ld.so.conf</tt> file and put
+	  <tt>/usr/XF86-main/lib</tt> as the first line.
+	  Continue with:
+	  <verb>
+	      ldconfig
+	      exit
+	  </verb>
+	<p>
+	  Look in <tt>/usr/XF86-main</tt> to be sure the files installed
+          there.
+	<P>
+	  Strictly speaking, installing the DRI tree isn't required.
+	  It's possible to run and test the X server directly from the
+	  build directory but it's a bit error prone.
+
+      <sect1>Update Locale Information <p>
+          To update your X locale information do the following:
+          <verb>
+             cd ~/DRI-CVS/build/xc/nls
+             xmkmf -a
+             make
+             make install
+          </verb>
+          This will prevent a locale error message from being printed
+          when you run Xlib programs.
+
+    <sect>X Server Configuration <p>
+        If your X server is currently running you'll have to stop it
+        and return to a virtual terminal.
+      <p>
+        First, setup your XF86Config file.
+        It should load the GLX and DRI modules and specify the driver to
+        use for your hardware.
+        See the <htmlurl url="http://dri.sourceforge.net/DRIuserguide.html"
+        name="DRI User Guide"> for detailed information.
+      <p>
+        You may want to make a backup copy of your existing
+        <tt>/etc/X11/XF86Config</tt> file first.
+      <p>
+        It's very important that you set the <tt>ModulePath</tt> option to
+        point to your installation directory:
+        <verb>
+            ModulePath "/usr/XF86-main/lib/modules"
+        </verb>
+      <p>
+        Double check with this:
+        <verb>
+            grep ModulePath /etc/X11/XF86Config
+        </verb>
+      <p>
+        Next, your <tt>~/.xinitrc</tt> file controls which clients will be
+        launched when your X server starts.
+        You might put the following in yours:
+        <verb>
+            xset b off
+            xsetroot -solid "#004070"
+            xmodmap -e "clear mod4"
+            xrdb -merge ~/.Xdefaults
+            xterm -geometry +0+0 &
+            xterm -geometry +512+0 &
+            fvwm
+        </verb>
+      <p>
+
+    <sect>X Server Start-up <p>
+        The X server can be started with:
+      <p>
+        <verb>
+            xinit -- /usr/XF86-main/bin/XFree86
+        </verb>
+      <p>
+        Automatic loading of DRM kernel modules was added to the X server
+        in XFree86 4.0.1.
+        This feature, and manual loading of kernel modules, is documented
+        in the DRI user guide.
+      <p>
+        At this point your X server should be up and running with
+        hardware-accelerated direct rendering.
+        Please read the
+        <htmlurl url="http://dri.sourceforge.net/DRIuserguide.html"
+        name="DRI User Guide"> for trouble shooting information.
+
+
+  </article>
+
+
+  <!-- Local Variables: -->
+  <!-- fill-column: 72  -->
+  <!-- End:             -->
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml:3.30 xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml:3.31
--- xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml:3.30	Thu Feb 10 14:33:36 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml	Fri Mar 31 14:55:36 2000
@@ -237,6 +237,13 @@
 it should have a line like this in <tt>/usr/src/sys/i386/conf/GENERIC</tt>:
 
 <tscreen><verb>
+ device		sc0	at isa? tty
+</verb></tscreen>
+
+The above example is for FreeBSD version 3.1 or later.  If you are running
+earlier versions, use the following line instead.
+
+<tscreen><verb>
  device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 </verb></tscreen>
 
@@ -272,6 +279,13 @@
 may be included but disabled in your kernel.  If you intend to use
 these mice, verify the following lines in the kernel configuration file:
 
+<tscreen><verb>
+ device		mse0	at isa? port 0x23c tty irq 5
+ device		psm0	at isa? tty irq 12
+</verb></tscreen>
+
+The above example is for FreeBSD version 3.1 or later.  If you are running
+earlier versions, use the following lines instead.
 
 <tscreen><verb>
  device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
@@ -352,7 +366,7 @@
 </itemize>
 
 <verb>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml,v 3.30 2000/02/10 22:33:36 dawes Exp $ 
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml,v 3.31 2000/03/31 22:55:36 dawes Exp $ 
 
 
 
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:3.61 xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:3.64
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile:3.61	Tue Mar  7 21:38:42 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile	Fri Jun 16 19:16:49 2000
@@ -3,16 +3,17 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.61 2000/03/08 05:38:42 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.64 2000/06/17 02:16:49 dawes Exp $
 
 #include <Server.tmpl>
 #include <lnxdoc.rules>
 
 SGMLDEPENDS = defs.ent
+MANSGMLDEPENDS = mdefs.ent
   INDEXLIST = README.sgml RELNOTES.sgml Status.sgml LICENSE.sgml Install.sgml \
 	      DESIGN.sgml \
-	      mouse.sgml fonts.sgml DRI.sgml \
-	      isc.sgml LynxOS.sgml NetBSD.sgml OpenBSD.sgml \
+	      mouse.sgml fonts.sgml DRI.sgml DRIcomp.sgml \
+	      isc.sgml LynxOS.sgml NetBSD.sgml OpenBSD.sgml OS2note.sgml \
               apm.sgml ati.sgml chips.sgml cyrix.sgml DECtga.sgml \
 	      i740.sgml i810.sgml \
 	      r128.sgml rendition.sgml s3virge.sgml SiS.sgml
@@ -33,7 +34,9 @@
 LinuxDocReadmeTarget(OpenBSD)
 #ifdef OUTOFDATE
 LinuxDocReadmeTarget(OS2)
+#endif
 LinuxDocTargetLong(OS2note.sgml,OS2.Notes,OS2Notes)
+#ifdef OUTOFDATE
 LinuxDocReadmeTarget(SCO)
 LinuxDocReadmeTarget(SOLX86)
 LinuxDocReadmeTarget(SVR4)
@@ -108,9 +111,21 @@
 LinuxDocTarget(xinput)
 #endif
 LinuxDocReadmeTarget(DRI)
+LinuxDocReadmeTarget(DRIcomp)
+
+SGMLMANDEFS=-D__drivermansuffix__='"$(DRIVERMANSUFFIX)"' \
+	    -D__filemansuffix__='"$(FILEMANSUFFIX)"' \
+	    -D__miscmansuffix__='"$(MISCMANSUFFIX)"'
+
+#if BuildHtmlManPages
+HTMLMANDEFS=-DHTML_MANPAGES
+#endif
+
+AllTarget(mdefs.ent)
+CppRawFileTarget(mdefs.ent,mdefs.cpp,$(SGMLMANDEFS) $(HTMLMANDEFS),NullParameter)
 
 /* Generate the documentation index */
-index.sgml: $(INDEXLIST) index.pre index.post add.sh Imakefile $(SGMLDEPENDS)
+index.sgml: $(INDEXLIST) index.pre index.post add.sh Imakefile $(SGMLDEPENDS) $(MANSGMLDEPENDS)
 	RemoveFile(index.sgml)
 	cat index.pre > index.sgml
 	echo "<!-- This file is auto-generated.  Do not edit! -->" >> index.sgml
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml:1.4 xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml:1.6
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml:1.4	Tue Feb 29 10:01:17 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml	Sat Jul  1 19:35:27 2000
@@ -6,16 +6,15 @@
 
 <title>Installation Details for XFree86&trade; &relvers;
 <author>The XFree86 Project, Inc
-<date>29 February 2000
+<date>30 June 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.4 2000/02/29 18:01:17 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.6 2000/07/02 02:35:27 dawes Exp $
 </ident>
 
 <abstract>
 
-This document contains information about installing
-XFree86 &relvers;.
+How to install XFree86.
 
 </abstract>
 
@@ -23,22 +22,20 @@
 
 <sect>Introduction
 <p>
-This document contains information about installing XFree86 &relvers;
-binary distributions as provided by The XFree86 Project.  The installation
-procedures for binary distributions provided by others may be different.
-
-The XFree86 binary distributions that we provide for UNIX-like OSs are
-packaged in the platform-independent gzipped tar format (referred to as
-"tarballs").  Our tarballs can be identified by the "<tt>.tgz</tt>"
-suffix.  We do not provide binaries in RPM format or any other platform
-specific package format.  If you need them in such a format, you should
-contact your OS vendor.  Together with the binary distributions, we
-provide a customised version of GNU tar called "extract", and an
-installation script.  We recommend that these be used to install the
-binary distributions.
+This document contains information about installing the XFree86 binaries
+as provided by The XFree86 Project.
 
-<sect>How to get the XFree86 &relvers; binary distributions
 <p>
+The XFree86 binaries that we provide for UNIX-like OS's (Linux, the BSDs
+and Solaris) are packaged in a platform-independent gzipped format (aka
+"tarballs" identified by the <tt>.tgz</tt> suffix).  Along with the
+binaries we provide a customized version of the GNU tar utility called
+"extract" and an installation script.  We recommend that these be
+used to install the binaries.
+
+
+<sect>Downloading the XFree86 &relvers; binaries
+<p>
 We, The XFree86 Project, provide XFree86 &relvers; binaries for a range
 of operating systems at our
 <![ %snapshot; [
@@ -49,78 +46,82 @@
 <url name="ftp site"
 url="ftp://ftp.xfree86.org/pub/XFree86/&relvers/binaries/">.
 ]]>
-Our ftp site is also mirrored by many sites around the world.  There is
-a sub-directory for each OS/platform that we have binaries for.  The
-first thing you need to do is to decide which of these suits you.  In
-most cases, the choice is straightforward.  In some cases (e.g., Linux)
-there may be a number of choices depending on what architecture or libc
-version you are using.  We recommend that you first download the
-<tt>Xinstall.sh</tt> script, and run it as follows to find out which
-binary distribution you should download.
+Often during releases, our ftp site is heavily loaded.  Instead of
+downloading directly from us we recommend that instead you use one of
+our mirror sites.  Another advantage of using our mirror sites is that
+some of them support http access (ours does not).
 
+<p>
+Our binaries are organized by sub-directories which correspond to each
+of the OS/platforms for which we provide binaries.  First go to the
+sub-directory  that represents your OS Platform. In some cases (e.g.,
+Linux) there may be a number of choices depending on the architecture
+or libc version your platform uses.  In all case we recommend that you
+first download the <tt>Xinstall.sh</tt> script, and run it as in the
+following example  to find out which binary distribution you should
+download.
+
 <tscreen><verb>
 sh Xinstall.sh -check
 </verb></tscreen>
 
-This should tell you which binary distribution is the correct one for
-your system.  Getting this right may save from wasting time downloading
-the wrong distribution.
-
-The next step is to download the necessary files.  The mandatory files
-for all installations are listed below.  All of them must be downloaded
-to do the installation.  The installer script will complain if they are not
-all present.
+The output of this utility tells you which is the correct set of  binaries
+for you to download.   If you are careful with this step you  will save
+yourself a lot  time and trouble  from NOT downloading an incompatible
+distribution.
+
+Once that is done download the necessary files.  The twelve  (12)
+mandatory files for all installations are listed below.  If you have
+not downloaded all of the files, the installer script will complain.
 
 <quote><verb>
-Xinstall.sh      The installer script
-extract          The utility for extracting tarballs
-Xbin.tgz         X clients/utilities and run-time libraries
-Xlib.tgz         Some data files required at run-time
-Xman.tgz         Manual pages
-Xdoc.tgz         XFree86 documentation
-Xfnts.tgz        Base set of fonts
-Xfenc.tgz        Base set of font encoding data
-Xetc.tgz         Run-time configuration files
-Xvar.tgz         Run-time data
-Xxserv.tgz       XFree86 X server
-Xmod.tgz         XFree86 X server modules
+1.   Xinstall.sh      The installer script
+2.   extract          The utility for extracting tarballs
+3.   Xbin.tgz         X clients/utilities and run-time libraries
+4.   Xlib.tgz         Some data files required at run-time
+5.   Xman.tgz         Manual pages
+6.   Xdoc.tgz         XFree86 documentation
+7.   Xfnts.tgz        Base set of fonts
+8.   Xfenc.tgz        Base set of font encoding data
+9.   Xetc.tgz         Run-time configuration files
+10.  Xvar.tgz         Run-time data
+11.  Xxserv.tgz       XFree86 X server
+12.  Xmod.tgz         XFree86 X server modules
 </verb></quote>
 
 NOTES:
 <itemize>
   <item>Some web browsers have a problem downloading the <tt>extract</tt>
 	utility correctly.  If you encounter this problem, download the
-	version called <tt>extract.exe</tt> instead.  The "<tt>.exe</tt>"
-	suffix is only there to make the troublesome web browsers do
-	the right thing.  It is not a DOS/Windows executable.
+	version called <tt>extract.exe</tt> instead.  This should fix the
+	problem.  (This is not a DOS/Windows executable.)
 
   <item>A few distributions don't have or require the <tt>Xvar.tgz</tt>
 	tarball.  If it is present in the <tt>binaries</tt> sub-directory
 	for your platform, then it is required.
 
-  <item>Some distributions may have additional mandatory tarballs.  This
-	is rare.  In these cases, the installer script will tell you
-	if any are missing.
+  <item>Some distributions may have additional mandatory tarballs.
+	While rare, the installer script will tell you if any are missing.
 
 </itemize>
 
-The following tarballs are optional.  You should download the ones you
-want to install.
+The following thirteen (13) tarballs are optional.  You should download
+the ones you want to install.
 
 <quote><verb>
-Xfsrv.tgz        Font server
-Xnest.tgz        Nested X server
-Xprog.tgz        X header files, config files and compile-time libs
-Xprt.tgz         X Print server
-Xvfb.tgz         Virtual framebuffer X server
-Xf100.tgz        100dpi fonts
-Xfcyr.tgz        Cyrillic fonts
-Xflat2.tgz       Latin-2 fonts
-Xfnon.tgz        Some large bitmap fonts
-Xfscl.tgz        Scalable fonts (Speedo and Type1)
-Xhtml.tgz        HTML version of the documentation
-Xps.tgz          PostScript version of the documentation
-Xjdoc.tgz        Documentation in Japanese
+1.   Xfsrv.tgz        Font server
+2.   Xnest.tgz        Nested X server
+3.   Xprog.tgz        X header files, config files and compile-time libs
+4.   Xprt.tgz         X Print server
+5.   Xvfb.tgz         Virtual framebuffer X server
+6.   Xf100.tgz        100dpi fonts
+7.   Xfcyr.tgz        Cyrillic fonts
+8.   Xflat2.tgz       Latin-2 fonts
+9.   Xfnon.tgz        Some large bitmap fonts
+10.  Xfscl.tgz        Scalable fonts (Speedo and Type1)
+11.  Xhtml.tgz        HTML version of the documentation
+12.  Xps.tgz          PostScript version of the documentation
+13.  Xjdoc.tgz        Documentation in Japanese
 </verb></quote>
 
 NOTES:
@@ -129,34 +130,34 @@
 
 </itemize>
 
-If you miss some and want to install them later, you can do so by following
-the appropriate part of the section that describes manual installation.
+If you miss some and want to install them later, go to the
+<ref id="manual-install" name="Manual Installation"> section.
 
 <sect>Installing XFree86 &relvers; using the <tt>Xinstall.sh</tt> script
 <p>
-We strongly recommend that our XFree86 &relvers; binary distributions
-be installed using the <tt>Xinstall.sh</tt> script that we provide.
-The main reason that we make this recommendation is that there are a lot
-of steps in the manual installation process, and those steps can vary
-according to the situation.  There is, however, a description of the
-manual installation process for the most common cases below for those who
-might need it.
-
-Put all of the downloaded files into a single directory (choose some
-temporary location with enough space).  Become the super user (root),
-cd to that directory, then run the installer script as follows:
+We strongly recommend that our XFree86 &relvers; binaries be installed
+using the <tt>Xinstall.sh</tt> script that we provide.  There are a lot of
+steps in the manual installation process, and those steps can vary
+according to the platform and hardware setup.  There is a description of
+the manual installation process for the most common cases <ref
+id="manual-install" name="below">.
+
+You must login as the super user (root) to run the installer script.
+Place all of the downloaded files into a single directory (choose a
+temporary location with enough space).  Use the cd command to change to
+that directory and then run the installer script as follows:
 
 <tscreen><verb>
 sh Xinstall.sh
 </verb></tscreen>
 
-Answer the prompts that come up.  If you are missing something that is
-required to run this version of XFree86, the installer may tell you to
-install it before trying again.  If you don't have all of the mandatory
-files listed above, then the installer will tell you which ones are
-missing and ask you to download them before trying again.
+Answer the prompts as they come up.  If you are missing something that
+is required, the installer may tell you to install it before trying
+again.  If the problem is that you did not download all of mandatory
+files aforementioned, then the installer will tell you which ones are
+missing and ask you to download them before proceeding.
 
-<sect1>Answering the questions that the installer may ask
+<sect1>Questions the installer may ask
 <p>
 The installer asks some questions that may not have obvious answers.  The
 information here should help you answer them.  In most cases, apart from
@@ -196,13 +197,14 @@
 you don't want to have these configuration files under <tt>/etc/X11</tt>,
 then you should answer "no" when asked about it.  Answering "no" here
 also means that the new configuration files will be installed in the
-old <tt>/usr/X11R6/lib/X11</tt> location.  Note: for the rare systems
-that don't have symbolic links, this question will not be asked.
-The default answer is "yes" because that is best for most situations.
-It is our new default.  It makes it easier to share the <tt>/usr/X11R6</tt>
-directory between multiple hosts, and allows it to be mounted read-only.
-If you don't need these features, then you can safely answer "no" if you
-don't want them moved.
+old <tt>/usr/X11R6/lib/X11</tt> location.
+
+Note: for the rare systems that don't have symbolic links, this question
+will not be asked.  The default answer is "yes" because that is best
+for most situations.  It is our new default.  It makes it easier to
+share the <tt>/usr/X11R6</tt> directory between multiple hosts, and
+allows it to be mounted read-only.  If you don't need these features,
+then you can safely answer "no" if you don't want them moved.
 
 When installing over an existing version, you will be prompted before
 each set of configuration files is installed.  If you haven't made any
@@ -210,9 +212,10 @@
 answer "yes" for each of these.  If you have made customisations, you
 can try answering "no".  If you run into problems later, you may need
 to manually merge your customisations into the the new version of the
-configuration files.  The configuration files can all be found in
-the <tt>Xetc.tgz</tt> tarball.  See the section below about manual
-installation for information about extracting them separately.
+configuration files.  The configuration files can all be found in the
+<tt>Xetc.tgz</tt> tarball.  See the <ref id="manual-install" name="section
+below"> about manual installation for information about extracting them
+separately.
 
 After the configuration files have been dealt with, the other mandatory
 components of the binary distribution will be installed.  This should
@@ -230,12 +233,23 @@
 the <tt>fonts.dir</tt> files in some directories are updated so that
 the fonts can be accessed correctly.  Next, the installer checks to
 see if your system has a termcap file or terminfo files.  If it finds
-the former, it tells you how my may update the entries in that file.
+the former, it tells you how you may update the entries in that file.
 If it finds the latter, it asks you if you want it to update them
 for you.
 
+You may be asked if you want to create links for the GL libraries and
+header files.  The OpenGL standard on some platforms (Linux in particular)
+says that these should be installed in the standard system locations
+(<tt>/usr/lib</tt> and <tt>/usr/include</tt>), so the installer offers
+to create the appropriate links.  If you're running Linux, you should
+probably answer yes.  For other platforms it is your choice.  If you
+already have another version of libGL in /usr/lib, answering "yes" will
+remove it and replace it with a link to the version we supply.  The
+installer will show you a listing of any existing versions before asking
+if they should be replaced.
+
 Finally, the installer asks you if you want a link created for the
-<tt>rstart</tt> utility.  On most modern systems, the link isn't essential,
+<tt>rstart</tt> utility.  On most modern systems the link isn't essential,
 so the default answer is "no".  Answer "yes" if you know that you need
 it.  If you find later that you need it, you can create it easily by
 running:
@@ -268,7 +282,7 @@
 After the X server configuration is done, it may be advisable to reboot,
 especially if you run xdm (or equivalent) or the font server (xfs).
 
-<sect>Installing XFree86 &relvers; manually
+<sect>Installing XFree86 &relvers; manually<label id="manual-install">
 <p>
 This section describes how to manually install the XFree86 &relvers; binary
 distributions.  You should only use this method if you know what you're
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml:3.19 xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml:3.20
--- xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml:3.19	Fri Mar  3 13:28:08 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml	Fri Jun 16 17:27:32 2000
@@ -8,7 +8,7 @@
 <date>25 February 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.19 2000/03/03 21:28:08 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.20 2000/06/17 00:27:32 dawes Exp $
 </ident>
 
 <toc>
@@ -43,6 +43,11 @@
 
 Building of this XFree86 version has never been tested on LynxOS versions
 earlier than 2.5.1.
+
+This release contains preliminary build support for `LynxOS 3.1.0'.
+Since this OS release was not available long enough for serious testing
+`LynxOS 3.1.0' support has to be considered to be in `alpha state'.
+Initial tests were performed on LynxOS x86 only!
 
 XFree86 &relvers; supports LynxOS on the x86 and on
 the PowerPC platform. X servers are currently available only on the
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:3.55 xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:3.56
--- xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml:3.55	Fri Mar  3 13:28:09 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml	Sat Jul  1 19:35:27 2000
@@ -9,10 +9,10 @@
 Marc  Wandschneider,
 Mark  Weaver,
 Matthieu Herrb
-<Date>Last modified on: 20 February 2000
+<Date>Last modified on: 1 July 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.55 2000/03/03 21:28:09 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.56 2000/07/02 02:35:27 dawes Exp $
 </ident>
 <toc>
 
@@ -59,6 +59,13 @@
 <p>
 See the <htmlurl url="RELNOTES.html" name="Release Notes"> for
 non-OS dependent new features in XFree86 &relvers;.
+
+<sect1>New OS dependent features in 4.0.1
+<p>
+<itemize>
+<item>Support for NetBSD 1.5_ALPHA
+<item>The Xsun server can be built on NetBSD/sparc
+</itemize>
 
 <sect1>New OS dependent features in 4.0
 <p>
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml:3.6 xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml:3.7
--- xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml:3.6	Sun Aug 22 23:38:50 1999
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml	Wed Apr  5 11:13:46 2000
@@ -3,7 +3,7 @@
 
 <title>Notes on Rebuilding XFree86/OS2 from Scratch
 <author>Holger Veit
-<date>Last modified August 1st, 1999
+<date>Last modified March 8th, 2000
 
 <toc>
 
@@ -20,16 +20,16 @@
 Please also read <htmlurl name=README.OS2 url=OS2.html> for end-user
 information, and set at least the environment variables described there.
 <p>
-At the current time, the most recent version available is XFree86-3.3.5.
+At the current time, the most recent version available is XFree86-4.0.
 This is a full and unrestricted version which comes with complete source 
-code. 3.3.5 is not only a bugfix release, but also supports new hardware,
-some of which might not even supported by OS/2 itself. See the RELEASE NOTES
-document for details.
+code. 4.0 is a highly experimental release, so many features that might
+have worked in earlier versions, may now no longer work, or work differently.
+Be aware that for OS/2, XFree86-4.0 is considered to be alpha software.
 
 If you want to join the XFree86 developer team, e.g. to add support for
 certain hardware, please send a request to BOD@XFree86.org. Please
 think about such a step carefully before, though, since much work is 
-involved. Please use the XFree86-3.3.5 source code as a test example how
+involved. Please use the XFree86-4.0 source code as a test example how
 to compile the system. The ability to manage that is a basic requirement
 for becoming a developer.
 
@@ -59,6 +59,7 @@
 <item>make	GNU make 3.71/3.72 (use the one from Xprog.zip!)
 <item>flex	GNU flex
 <item>bison	GNU bison
+<item>m4	GNU m4
 <item>find	GNU find    (attention: incompatible tool with the same name in OS/2)
 </itemize>
 
@@ -68,7 +69,7 @@
 
 Furthermore, you need the XFree86 sources. These are available from 
 the common XFree86 repositories. Look into a directory which is 
-often named /pub/XFree86/3.3.5/source.
+often named /pub/XFree86/4.0/source.
 
 <sect>Compiling and Installing
 <p>
@@ -201,7 +202,7 @@
 
 
 <verb>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml,v 3.6 1999/08/23 06:38:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2note.sgml,v 3.7 2000/04/05 18:13:46 dawes Exp $
 
 
 
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml:1.10 xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml:1.11
--- xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml:1.10	Fri Mar  3 13:28:10 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml	Sat Jul  1 19:35:27 2000
@@ -6,10 +6,10 @@
 <title>README for XFree86 &relvers; on OpenBSD
 <author>
 Matthieu Herrb
-<Date>Last modified on: 20 February 2000
+<Date>Last modified on: 1 July 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.10 2000/03/03 21:28:10 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.11 2000/07/02 02:35:27 dawes Exp $
 </ident>
 
 <toc>
@@ -56,6 +56,22 @@
 <p>
 See the <htmlurl url="RELNOTES.html" name="Release Notes"> for
 non-OS dependent new features in XFree86 &relvers;.
+
+<sect1>New OS dependent features in 4.0.1
+<p>
+<itemize>
+<item>Several features from the OpenBSD X11 tree were merged into xdm:
+<itemize>
+<item> support for Kerberos IV authentication 
+<item>use the arc4random(4) random number generator
+<item>add a new resource "allowRootLogin", which can be used to disable
+         root logins through xdm
+<item>log failed logins to syslogd
+<item>verify that the shell is valid using /etc/shell
+<item>verify that the account hasn't expired
+</itemize>
+<item>The Xsun server can be built again on OpenBSD/sparc.
+</itemize>
 
 <sect1>New OS dependent features in 4.0
 <p>
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml:3.103 xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml:3.106
--- xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml:3.103	Wed Mar  8 12:36:43 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml	Sat Jul  1 19:35:27 2000
@@ -10,15 +10,16 @@
 
 <title>README for XFree86&tm; &relvers;
 <author>The XFree86 Project, Inc
-<date>26 February 2000
+<date>30 June 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.103 2000/03/08 20:36:43 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.106 2000/07/02 02:35:27 dawes Exp $
 </ident>
 
 <abstract>
 
-XFree86 is a port of X11R6.4 that supports several UNIX(R) and UNIX-like
+XFree86 is the Open Source port of X.Org's X11R6.4 release that supports
+several UNIX(R) and UNIX-like (such as Linux, the BSDs and Solaris x86)
 operating systems on Intel and other platforms.
 
 </abstract>
@@ -53,38 +54,45 @@
 
 <![ %release [
 XFree86 &relvers; is <![ %firstrel; [the first]]>
-<![ %laterrel; [a]]> full release of the <![ %earlyrel; [new]]> XFree86 4
-series.
-The road to XFree86 4 began in mid 1997, with serious work starting in
-early 1998.  The first pre-4.0 snapshot was released in mid 1999, and
-4.0 was released in early 2000.  A lot has been completed in that time,
-and even more has been started since the "4.0" design was drafted.  The
-result is that this release contains a lot of new features, some new
-drivers, and some significant performance improvements.  This release
-contains components in various stages of development, ranging from stable
-and well tested to new and not-so-well tested.  One the other side,
-there are drivers from the 3.3.x series that have not yet been ported
-to XFree86 4.  Most of these are for old hardware.  To find more
-information about which hardware is supported, see the <htmlurl
-name="Driver Status document" url="Status.html">.
-
-XFree86 4 uses a very modular design.  We had hoped to finalise and fully
-document the driver module API/ABI in time for the 4.0 release, but instead
-we are planning to have this done for a subsequent release.  We will try
-where possible to retain backward compatibility with the module interfaces
-in 4.0 in future releases, but we can't make guarantees about that until
-the interfaces have been fully documented.
+<![ %laterrel; [a]]> the upgrade to the first full release in the <![ %earlyrel; [new]]> XFree86 4
+series.  Release 4 is a major re-design of the basic architectural
+underpinnings of XFree86's implementation of the original X Consortium's
+X Server.  This re-design allows for a modular interaction between the
+hardware drivers and the XFree86 core X server.  With 4.0, upgrades to
+the X server with new and unsupported hardware can be easily done and
+installed without undergoing the previous process of rebuilding a X
+server.  All that is required is installing the new driver module and
+updating the configuration file.
+
+The road to XFree86 Release 4 began as an architectural concept in mid
+1997, with the serious framework being implemented in code the beginning
+of 1998.  There were several snapshots on the road to 4.0 which are now
+part of the 4.0 base release.  The &relvers; version is an upgrade to
+&prevrelvers;, which include more hardware ports, code enhancements and
+bug fixes.
+
+Release 4 also included the long-awaited integration of the DRI (Direct
+Rendering Infrastructure).  This upgrade into the code base  gives XFree86
+the abilities of direct 3-D graphics rendering, used widely in games
+and other visualization programs.
+
+Many drivers used in the old 3.3.x series have not be converted over to
+the 4.0 design and so check first whether your hardware is supported
+before upgrading to the 4.0 series in the <htmlurl name="Driver Status
+document" url="Status.html">.
+
 ]]>
 
-Information on this release's features and their status can be found in
-the <htmlurl name="Release Notes" url="RELNOTES.html">.
+Specific release enhancements can be viewed in the
+<htmlurl name="Release Notes" url="RELNOTES.html">.
 
-Information about obtaining and installing binary distributions of this
-release can be found in the <htmlurl name="Installation Document"
+Information about binary distributions and the attendant installation
+instructions can be found in the <htmlurl name="Installation Document"
 url="Install.html">.
 
-Copyright and Licensing information for this release can be found in
-the <htmlurl name="License Document" url="LICENSE.html">.
+Copyright and Licensing information for this release and all XFree86
+releases can be found in the <htmlurl name="License Document"
+url="LICENSE.html">.
 
 <![ %snapshot [
 <sect>Redistribution of the Snapshots
@@ -97,17 +105,98 @@
 and not XFree86.
 ]]>
 
-<sect>Developers
+<sect>Joining The Team
+<sect1> Development
 <p>
 
-If you would like to work on the development of XFree86 4, then it is
-recommended that you <url name="join the XFree86 development team"
-url="http://www.xfree86.org:/developer.html">.  That way you will have
-access to the latest source and to other developers.
+If you would like to work on the development of XFree86 4, either by
+helping with the conversion of our older drivers to the new 4.0 design,
+or assisting in the addition of new drivers or platforms to the code base
+then send a request to to <url name="join the XFree86 development team"
+url="http://www.xfree86.org:/developer.html">.  This will give you direct
+access to the latest XFree86 related development topics and discussions.
+Include in your note, your name, email address, reason for joining (what
+you will work on) and, level of expertise (coder, DRI, core, specific
+driver) and area of interest.
 
-<sect>How to get XFree86 &relvers;
+</sect1>
+
+
+<sect1> Documentation
+<p>
+If instead your interests are on the Documentation side of the Project,
+or you want to contribute and are not ready for plunging into the code,
+you can join the Documentation Team (those hardy souls responsible for
+the content you are reading :-).  Amongst the Doc Team's activities are
+converting our SGML based documentation into an XML based one and updating
+and creating technical documentation used by staff and public.  If this
+sounds interesting then please send a request to <url name="join the
+XFree86 documentation team" url="mailto:signup@xfree86.org">.
+Include in your note, you name, email address, reason for joining (what
+you will work on) and level of expertise and whether you are interested
+in the tools or content side of the group.
+
+</sect1>
+</sect> 
+
+<sect> The Public Mailing Lists
+<sect1>  Newbie
+<p> 
+For those who are new to XFree86  and want to learn more about our
+Project we recommend that you join our Newbie list, located at <url name
+= "Public Mailing Lists" url = "http://www.xfree86.org/mailman/listinfo">,
+where this and other discussions occur with our senior all-volunteer
+staff.  This is great forum to get introduced to XFree86 and ask for
+help on how to set up the XServer or whether your hardware is supported,
+and why not?,  and make suggestions for future releases of XFree86.
+This list is supported by our volunteer staff who needs to know how you
+are using and interacting with XFree86 and what is wrong and could be
+better.  Tell them, they want to know!
+
+</sect1>
+
+<sect1> Announce
 <p>
+For those who just want to know  the release schedule 
+this is a good list  to join.
 
+<sect1> CVS Commit
+<p>
+For those who want to see what has been committed recently to our CVS
+repository this is the list that will show you those updates.  This list
+is updated dynamically every time the repository is updated after the
+the commit happens.
+
+<p>
+A followup to the commit list is the soon to be public, patch archives.
+This archive will be available on our web-site and will show what patches
+have been submitted and will soon be committed.  This is helpful for
+people who are interested in a specific area and want to know what work
+is happening there.  When this goes public we will announce it
+on our web site and our Announce mailing list, so keep watching.
+
+
+<sect1>  Xpert
+<p>
+If instead you are the lone developer who is improving XFree86 on an
+ad hoc basis for your particular environment (I want to get my mouse or
+video card to work), and need a specific question asked then you should
+go over to our Xpert list where such questions are raised and answered
+by our technical development staff.  Remember you do not have to be a
+member to write fixes to our code base and if your changes are discrete
+and self-contained the volume of developer mail may just be too noisy.
+
+
+Once your work is finished (coded, debugged and documented) please send
+your fix to <email>fixes@XFree86.org</email>.  This will ensure that
+they are included in future releases. And thanks!  You make this truly
+an Open group.
+
+</sect1>
+</sect>
+
+<sect>How to get XFree86 &relvers;
+<p>
 <![ %snapshot; [
 XFree86 &relvers; can be found at the <url name="XFree86 ftp server"
 url="ftp://ftp.xfree86.org/pub/XFree86/snapshots/&relvers;/">, and at
@@ -135,10 +224,10 @@
 
 <![ %onediff; [
 A source patch relative to version &prevrelvers; is also available.
-The patch file is <tt>&prevrelvers;-&relvers;.diff.gz</tt>.  This patch should
-be applied to a clean &prevrelvers; source tree, working from the directory
-containing the <tt>xc/</tt> directory.  The patch should be applied by
-running:
+The patch file is <tt>&prevrelvers;-&relvers;.diff.gz</tt>.  This patch
+should be applied to a clean &prevrelvers; source tree, working from
+the directory containing the <tt>xc/</tt> directory.  The patch should
+be applied by running:
 
 <tscreen><verb>
 gunzip &lt; &prevrelvers;-&relvers;.diff.gz | patch -p0 -E
@@ -177,26 +266,21 @@
 </verb></tscreen>
 ]]>
 
-The contrib part of the distribution has now been folded into the main
+The contrib part of the distribution has been folded into the main
 source tree, so a separate contrib tarball is no longer required.
 
-To format the XFree86 documentation, the latest version of our doctools
-package.  That is available as <tt>doctools-1.1.2.tgz</tt>.
+To format the XFree86 documentation use the latest version of our doctools
+package available as <tt>doctools-1.1.3.tgz</tt>.
 
 <sect>Reporting Bugs
 <p>
 
 Bugs should be reported to <email>XFree86@XFree86.org</email>.  Before
 reporting bugs, please check the X server log file, which can be found
-at <tt>/var/log/XFree86.0.log</tt> on most platforms.  If you can't resolve
-the problem yourself, send the entire log file with your bug report.  Please
-don't edit out what you think might not be important.  The information
-contained in the log file is there to make it easier for the developers
-to determine what is going wrong when there are problems.
-
-If you have patches (bug fixes or enhancements, etc) that you'd like to
-submit for inclusion in a future version of XFree86, please send them
-to <email>fixes@XFree86.org</email>.
+at <tt>/var/log/XFree86.0.log</tt> on most platforms.  If you can't
+resolve the problem yourself, send the entire log file with your bug
+report but not the operating system core dump.  Do not edit  the log
+file as our developers use it to reproduce and debug your problem.
 
 
 
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml:1.37 xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml:1.41
--- xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml:1.37	Wed Mar  8 12:11:55 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml	Sat Jul  1 19:35:27 2000
@@ -6,10 +6,10 @@
 
 <title>Release Notes for XFree86&trade; &relvers;
 <author>The XFree86 Project, Inc
-<date>7 March 2000
+<date>30 June 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.37 2000/03/08 20:11:55 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.41 2000/07/02 02:35:27 dawes Exp $
 </ident>
 
 <abstract>
@@ -21,32 +21,23 @@
 
 <toc>
 
-<sect>Introduction
+<sect>Introduction to the 4.x Release Series
 <p>
-XFree86 4.0 is the first official release of the new XFree86 4.  XFree86
-4 represents a significant redesign of the XFree86 X server.  It is very
-important to keep in mind that XFree86 4 is still very much in development,
-and it contains a lot of new work.  That means two things: there is a
-lot of new exciting stuff to try, but being new code, it hasn't had
-nearly as much of a workout as the stable 3.3.x releases.  If you're
-looking for a well-tested, stable release, and can't afford the
-inconveniences that new software can sometimes cause, then you are
-probably better off sticking with the 3.3.x releases for now.  If you
-have the resources to try out the new version and investigate its
-features, or if you just like being on the bleeding edge, then please
-try &relvers;!
-
-This release isn't quite as complete as we would have liked.  The main
-missing pieces are a nice configuration tool and support for some of
-the hardware that 3.3.x supports.  The first point means that configuring
-the server might be more painful than usual.  The second means that your
-hardware might not be supported by &relvers;, or it might be supported at a
-lesser level (conversely, some hardware is better supported in &relvers;).
-We've attempted to provide some information about the second point in
-our <htmlurl name="Driver Status document" url="Status.html">.  Please
-check there first before trying &relvers;.  Unfortunately that document is
-still fairly basic, but it should at least give you an idea of whether
-you're likely to be able to use &relvers; at all or not.
+XFree86 4.0 was the first official release of the new XFree86 4.  XFree86
+4 represents a significant redesign of the XFree86 X server.
+Not all of the hardware drivers from 3.3.x have been ported to 4.x yet.
+
+<sect1>Differences Between the 4.x series and the 3.3 series
+<p>
+The 4.x release series is also missing
+a nice configuration tool.
+This means that configuring the Xserver might be trickier than usual.
+The second point is that is that your hardware might not 
+be supported by &relvers;, or it
+might be supported at a lesser level (conversely, some hardware is better
+supported in &relvers;).  We've attempted to provide some information
+about the second point in our <htmlurl name="Driver Status document"
+url="Status.html">.  Please check there first before downloading  &relvers;.
 
 On the subject of configuration, we have updated the basic text-based
 tool "<tt>xf86config</tt>" to generate config files in the format required
@@ -55,150 +46,197 @@
 to the X server.  An early version of this is included in the release,
 and it works well for some hardware.  To try it out, just run (as root)
 "<tt>XFree86 -configure</tt>".  Both of these configuration options will
-at worst give you a reasonable starting point for a suitable configuration
+give you a reasonable starting point for a suitable configuration
 file.  We've put some effort into documenting the &relvers; config file format,
-and you can find that information in the XF86Config manual page.  Please
-check that and the driver manual pages and related documentation for
-further information about that.
+and you can find that information in the XF86Config manual page. Check
+that,  the driver manual pages and the related documentation for
+further information. 
 
 Oh, another thing you might notice is that our documentation is rather
 patchy.  Most of what is present should be in reasonable shape, but
-there are gaps.  We thought it better to leave out docs that were
-very out of date rather than providing inaccurate and misleading
-information.
+there are gaps.  We thought it better to leave out docs that were very
+out of date rather than providing inaccurate and misleading information.
+We are looking for people to also help fill those gaps in &lt;hint hint
+:-&gt;.
 
 Finally, before you download and install the binary distributions for
 this release, please have a quick read through the <htmlurl
 name="Installation Document" url="Install.html">.  It may save you some
 time.
 
-If those cautionary notes haven't turned you away (and we certainly hope
-not), please read on...  The sections below describe some of the new
-features and changes between 3.3.x and &relvers;.  There is a lot of new
-stuff, and we definitely don't have enough space to cover it all here.
+The next section describes what is new in the latest version (&relvers;).
+The other sections below describe some of the new features and changes
+between 3.3.x and 4.0.  There is a lot of new features, and we definitely
+don't have enough space to cover it all here.
 
-<!--
-<sect>Summary of new features in &relvers; compared with &prevrelvers;.
-<p>
--->
+</sect>
 
-<!--
-<sect>Summary of new features in 3.9.18 compared with 3.9.17.
+<sect>Summary of new features in &relvers;.
 <p>
-This section contains a brief summary of what has changed since the
-previous snapshot.  Unfortunately, only a small number of changes are
-listed here.  For detailed information, refer to the <tt>CHANGELOG</tt>
-file in the <tt>xc/programs/Xserver/hw/xfree86</tt> directory in the
-source tree.  The sections that follow this one have details of features
-that are new to the pre-4.0 snapshot series.
-
+<sect1>X server
+<p>
 <itemize>
-  <item>The NVIDIA (nv) driver now uses MMIO for VGA port access and has
-	DDC support.
+  <item>New DRI drivers for Intel i810, Matrox G400 and G200 (AGP only) and 
+	the ATI Rage 128, and updates to the 3Dfx DRI driver, including
+	Voodoo5 support.
+
+  <item>The X server now runs on Linux/Sparc including drivers for many
+	video cards used on SUN hardware.
+
+  <item>DRI support for the Linux/Sparc implementation that allows 3D direct
+	rendering with Creator3D cards.
+
+  <item>Fixed recently publicized security issues.
 
-  <item>The 8+24 support used by the Matrox (mga) and 3Dlabs (glint)
-	drivers is now a non-destructive overlay.
+  <item>Update Mesa to the latest version.
 
-  <item>The Xinerama extension has been completely rewritten for improved
-	performance and correctness.
+  <item>Xinerama updates and fixes.
 
-  <item>The server can now load/initialise extension modules that it
-	doesn't have built-in knowledge of.
-
-  <item>More PS/2 mice (Microsoft IntelliMouse Explorer, Genius NetScroll
-	Mouse Optical, IBM ScrollPoint) and serial PnP mice (A4 Tech 4D/4D+,
-	MouseSystems SmartScroll, Logitech Cordless MouseMan Wheel, 8D 
-	Scroll mouse) are recognized and supported.  USB mice support is
-	also available in FreeBSD and OpenBSD.
-
-  <item>A DPS extension for XFree86 is currently under development.  The DPS
-	client library is now part of the XFree86 source tree; the extension
-	code itself, however, cannot be integrated for licensing reasons and
-	is distributed separately.  For more information, please consult
-	the
-	<url name="DPS site at SourceForge" url="http://dps.sourceforge.net">.
-
-  <item>The "apm" driver (Alliance Pro Motion) has been updated.  Support
-	for the AT24 has been added in this release, and acceleration has
-	been improved.  Further details can be found in the
-	<ref id="apm" name="APM section"> below.
+  <item>Xv updates and fixes.
 
-  <item>Preliminary support has been added to the X server for the extended
-	keys on some "Internet" keyboards.
+  <item>Mouse support in DGA 1.0 compatibility mode should now work correctly
+	for most games that make use of it.
 
-  <item>A new X server extension has been added for optimising access to
-	metric data for large fonts.
+  <item>Some bugs with 8+24 overlay support have been fixed.
 
+  <item>Some XKEYBOARD extension problems have been fixed, including
+	improvements to the MouseKeys support.
+
+  <item>Add generic DGA support to the sis, neomagic and i810 drivers.
+
+  <item><tt>xf86cfg</tt>, a new graphical configuration tool.
+
 </itemize>
+</sect1>
 
-<sect>Summary of new features in 3.9.17 compared with 3.9.16.
+<sect1>X libraries and clients.
 <p>
-
 <itemize>
-  <item>The 3dfx driver is now supported by the DRI.
-  <item>Tiny-X for the Itsy has been added.
-  <item>Significant font and font server enhancements.
-  <item>New driver for ATI Rage 128.  The driver is called "r128".
-  <item>Xterm enhancements and fixes.
-  <item>DPS support hooks have been added.
-       Display Postscript support is being maintained outside of the
-       server tree due to licensing issues.  A web page for DPS resources
-       under XFree86 will be available shortly.
-  <item>DRI enhancements including Mesa update to version 3.2, full support
-     and fifo code for 3dfx hardware, and device driver updates for
-     Linux 2.3 kernels.
-  <item>Significant enhancements to Xv including support for XvImages
-	(YUV XImages).
-  <item>Add initial VESA VBE support including initialization and DDC.
-  <item>Several PCI enhancements.
-  <item>"SilkenMouse" (asynchronous pointer handling) for smoother mouse movement.
-  <item>Add GeForce/Quadro support to the NVIDIA driver.
-  <item>Int10 "soft-booting" support for Linux.
-  <item>Resource allocation infrastructure added.
-  <item>Syntax of the layout section has changed to make multi-head configuration easier.
-  <item>Some Xinerama bug fixes.
-  <item>The DGA 2.0 interface is mostly finalized and includes some preliminary documentation.
-  <item>ViRGE MX Melco BIOS support has been added.
-  <item>Keyboard AutoRepeat now works correctly on Linux.  This means
-     that the AutoRepeat keyword in XF86Config is now obeyed; you may be
-     more comfortable using "250 30" rather than the default setting of
-     "500 5".
+  <item>Thread safety issues have been resolved in a few places in the
+	libraries.  Upgrading to the latest libraries is essential for
+	multi-threaded X applications.
+
+  <item>Some fatal bugs in the big font support have been fixed.  Upgrading
+	to the latest libraries will fix this too.
+
+  <item>Fixed recently publicized security issues in some of the X libraries.
+
+  <item>Updates and bug fixes for some clients, including xedit, xman,
+	xcalc, fstobdf, xdm.
+
+  <item>Fix some xfs problems.
+
+  <item>XTerm updates.  These include:
+	<itemize>
+	  <item>Improve logfile security.
+
+	  <item>Workaround for fixed fonts which are generated from
+		Unicode fonts:  they omit glyphs for some xterm's
+		less-used line-drawing characters, which caused xterm
+		to set a flag telling it to use only its internal
+		line-drawing characters.
+
+	  <item>Limit numeric parameters of control sequences to 65535
+		to simplify checks for numeric overflow.
+
+	  <item>Change index into UDK list to unsigned to guard against
+		numeric overflow making the index negative.
+
+	  <item>Add limit checks to ClearInLine(), ScrnInsertChar(),
+		ScrnDeleteChar() to correct potential out-of-bounds
+		indexing.
+
+	  <item>Add a resource (limitResize) limiting resizing via the
+		<tt>CSI 4 t</tt> and <tt>CSI 8 t</tt> sequences.
+
+	  <item>Ignore out-of-bounds resize requests, i.e., where
+		sign-extension or truncation of the parameters would
+		occur.
+
+	  <item>Change Sun function-keys resource name to sunFunctionKeys
+		to work around redefinition of the token sun by xrdb on
+		Solaris.  Similarly, renamed resource sun keyboard to
+		sunKeyboard.  Change similar resource names for HP and
+		SCO to avoid potential conflict with xrdb symbols on
+		other systems, as well as for consistency.
+
+	  <item>Change line speed from 9600bd to 38400bd to accommodate
+		users who mistakenly use $TERM set to vt100, to reduce
+		the effect of padding associated with this terminal
+		type.
+
+	  <item>Fix a problem that caused the right scrollbar to be
+		positioned incorrectly when re-enabling it.
+
+	  <item>Fix a problem with color support that showed up on some
+		platforms.
+
+	  <item>Modify logic for deleteIsDEL resource so it has internally
+		3 states:  unspecified, true and false.  If unspecified,
+		the keyboard type determines whether the Delete key
+		transmits <tt>&lt;esc&gt;[3~</tt> or <tt>\177</tt>, and
+		the popup menu entry reflects the internal state.
+		Otherwise, the popup menu entry overrides the keyboard
+		type.
+	
+	  <item>Portability fixes for os390, AIX 4.2, Digital Unix 4.0
+		and IRIX 6.5.
 
+	</itemize>
 
 </itemize>
 
-<sect>Summary of new features in 3.9.16 compared with 3.9.15.
+<sect1>Fonts and Internationalisation
 <p>
+<itemize>
+  <item>Many of the "misc" bdf fonts have been updated and extended, and
+	a wider range of ISO-8859 subsets have been added.  Oblique/italic
+	versions of some of them have also been added.
+
+  <item>The converters in Xlib have been improved and reworked.  UTF-8
+	support has been added.
+
+  <item>Support for ISO-8859-13 has been added to Xlib and to the UTF-8
+	converters.
 
+  <item>XKB keyboard definitions have been added and updated for some
+	countries.
+
+  <item>Locale support for Celtic languages has been updated, and a Compose
+	file for ISO-8859-14 added.
+
+</itemize>
+</sect1>
+
+<sect1>Miscellaneous
+<p>
 <itemize>
-  <item>The "apm" driver has been updated.
-	See the <ref id="apm" name="APM section"> below.
-  <item>A driver for NVIDIA chipsets is now included.  The driver is called
-	"nv".  Some very basic information can be found in the nv(4) man
-	page.
-  <item>The default xdm config file now has a line to disable listening for
-	XDMCP requests.  This is fine when xdm is only managing a local
-	X server.  The line must be commented out when xdm is used to manage
-	external X servers (e.g., X terminals).
-  <item>New driver for Intel i740.  The driver is called "i740".
-  <item>New driver for 3Dfx Banshee and Voodoo 3.  The driver is called "tdfx".
-  <item>Some work on adding WYSIWYG capabilities to the Xaw text widget.
-  <item>Some preliminary support for programming modes has been added to xedit.
+  <item>Preliminary support for Linux/mips (no X servers yet).
+
+  <item>Update support for BSD/OS.
+
+  <item>Update Linux/IA64 support.
+
+  <item>Support for LynxOS 3.1.0.
+
 </itemize>
--->
+</sect1>
+
+</sect>
 
-<sect>X server
+<sect>The new X server
 <p>
 Unlike XFree86 3.3.x where there are multiple X server binaries, each
-of which drive different hardware, XFree86 &relvers; has a single X server
-binary called <tt>XFree86</tt>.  This binary can either have one or
-more video drivers linked in statically, or, more usually, dynamically
+of which drive different hardware, XFree86 &relvers; has a single X
+server binary called <tt>XFree86</tt>.  This binary can either have one
+or more video drivers linked in statically, or, more usually, dynamically
 load the video drivers and other modules that are needed.
 
 XFree86 &relvers; has X server support for most UNIX(R) and UNIX-like
 operating systems on Intel/x86 platforms, plus support for Linux on
-Alpha and PowerPC platforms.  Work on support for additional architectures
-and operating systems is in progress, and is planned for future releases.
+Alpha, PowerPC and Sparc platforms.  Work on support for additional
+architectures and operating systems is in progress, and is planned for
+future releases.
 
 <sect1>Loader and Modules
 <p>
@@ -209,35 +247,36 @@
 loader support, it works on platforms that don't provide this feature,
 and makes it possible for the modules to be operating system independent
 (although not, of course, independent of CPU architecture).  This means
-that, for example, a module compiled on Linux/x86 can be loaded by an
-X server running on Solaris/x86, or FreeBSD, or even OS/2.  One of the
-main benefits of this is that when modules are updated, they don't need
-to be recompiled for each different operating system.  We're planning to
-take advantage of this to provide more frequent driver module updates in
-between major releases.
+that a module compiled on Linux/x86 can be loaded by an
+X server running on Solaris/x86, or FreeBSD, or even OS/2.  
+<p>
+One of the
+main benefits of this loader is that when modules are updated, they do not need
+to be recompiled for every different operating system.  In the future
+we plan to take advantage of this to provide more frequent driver module 
+updates in between major releases.
 
 The loader in version &relvers; has support for Intel (x86), Alpha and
-PowerPC platforms.  It also has preliminary support for Sparc platforms
-but this isn't used yet.
+PowerPC platforms.  It also has preliminary support for Sparc platforms.
 
 The X server makes use of modules for video drivers, X server extensions,
 font rasterisers, input device drivers, framebuffer layers (like mfb,
 cfb, etc), and internal components used by some drivers (like XAA),
 
 The module interfaces (API and ABI) used in this release is still subject
-to change without notice.  While we'll attempt to provide backward
+to change without notice.  While we will attempt to provide backward
 compatibility for the module interfaces as of the 4.0 release (meaning
-that 4.0 modules will work with future core X server binaries), we can't
-guarantee that this will be the case.  We are planning to fully document
-and stabilise the module interfaces in a future release, and at that
-point backward compatibility will be easier to achieve.
+that 4.0 modules will work with future core X server binaries), we cannot
+guarantee this. 
 
 <bf>Note about module security</bf>
 <quote><p>
-	The XFree86 X server runs with root privileges, which means that
+	The XFree86 X server runs with root privileges, i.e. 
 	the X server loadable modules also run with these privileges.
 	For this reason we recommend that all users be careful to only
-	use loadable modules from reliable sources.  We hope to have a
+	use loadable modules from reliable sources,  otherwise the
+        introduction of viruses and contaminated code can occur and wreak
+         havoc on your system.  We hope to have a
 	mechanism for signing/verifying the modules that we provide
 	available in a future release.
 
@@ -346,7 +385,7 @@
   <item>The Keyboard, Pointer and XInput sections have been replaced by a
 	more general InputDevice section.  The old Keyboard and Pointer
 	sections are still recognised for compatibility purposes, but
-	they are deprecated and support for them may be dropped in future
+	they are discommended and support for them may be dropped in future
 	releases.  The old XInput sections are no longer recognised.
 	The keywords from the old sections are expressed as Options in
 	the InputDevice sections.  The following example shows typical
@@ -753,6 +792,13 @@
    <tabrow><tt>rendition</tt><colsep>Rendition</tabrow>
    <tabrow><tt>s3virge</tt><colsep>S3 ViRGE</tabrow>
    <tabrow><tt>sis</tt><colsep>SiS</tabrow>
+   <tabrow><tt>sunbw2</tt> (+)<colsep>Sun bw2</tabrow>
+   <tabrow><tt>suncg14</tt> (+)<colsep>Sun cg14</tabrow>
+   <tabrow><tt>suncg3</tt> (+)<colsep>Sun cg3</tabrow>
+   <tabrow><tt>suncg6</tt> (+)<colsep>Sun GX and Turbo GX</tabrow>
+   <tabrow><tt>sunffb</tt> (+)<colsep>Sun Creator, Creator3D and Elite 3D</tabrow>
+   <tabrow><tt>sunleo</tt> (+)<colsep>Sun Leo (ZX)</tabrow>
+   <tabrow><tt>suntcx</tt> (+)<colsep>Sun TCX</tabrow>
    <tabrow><tt>tdfx</tt><colsep>3Dfx</tabrow>
    <tabrow><tt>tga</tt><colsep>DEC TGA</tabrow>
    <tabrow><tt>trident</tt><colsep>Trident</tabrow>
@@ -763,6 +809,9 @@
 
 Drivers marked with (*) are present in a preliminary form in this release,
 but are not complete and/or stable yet.
+<p>
+
+Drivers marked with (+) are for Linux/Sparc only.
 
 <sect2>APM <label id="apm">
 <p>
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml:1.15 xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml:1.17
--- xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml:1.15	Fri Mar  3 13:28:10 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml	Mon Jun 19 08:00:54 2000
@@ -9,7 +9,7 @@
 <date>3 March 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.15 2000/03/03 21:28:10 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.17 2000/06/19 15:00:54 tsi Exp $
 </ident>
 
 <abstract>
@@ -133,15 +133,16 @@
 	
 <tag>&relvers;:</tag>
 	Accelerated support is provided for the Rage 128 chips by the
-	"r128" driver.  Unaccelerated support is provided for all of the
-	others except the Mach8 and some early Mach32 chips by the "ati"
-	driver.
+	"r128" driver.  Accelerated support is provided for the Mach64
+	Rage variants by the "ati" driver.  Unaccelerated support is
+	provided for all of the others except the Mach8 and some early
+	Mach32 chips by the "ati" driver.
 
 <tag>Summary:</tag>
 	All chips supported in &legacyvers; are supported in &relvers;
 	except for Mach8 and some old Mach32 chips.  The support in
 	&relvers; is, however, unaccelerated for all chips except the
-	Rage 128.
+	Mach64, Rage and Rage 128 variants.
 
 </descrip>
 
@@ -428,13 +429,13 @@
 <descrip>
 <tag>&legacyvers;:</tag>
 	Support (accelerated) for the NV1, Riva 128, 128ZX, TNT, TNT2
-	(Ultra, Vanta, M64), GeForce (DDR) and Quadro is provided by
+	(Ultra, Vanta, M64), GeForce (DDR, 256) and Quadro is provided by
 	the XF86_SVGA server and the nv driver.
 
 <tag>&relvers;:</tag>
 	Support (accelerated) for the Riva 128, 128ZX, TNT, TNT2 (Ultra,
-	Vanta, M64), GeForce (DDR) and Quadro is provided by the XF86_SVGA
-	server and the nv driver.
+	Vanta, M64), GeForce (DDR, 256) and Quadro is provided by
+	the nv driver.
 
 <tag>Summary:</tag>
 	All chipsets supported in &legacyvers; except the NV1 are also
@@ -592,7 +593,8 @@
 	has not been ported.
 
 <tag>Summary:</tag>
-	No SMI chips are supported in &relvers;.
+	No SMI chips are supported in &relvers;, but the fbdev driver is
+	reported to work on Linux.
 
 </descrip>
 
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml:3.29 xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml:3.31
--- xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml:3.29	Fri Feb 18 04:19:08 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml	Mon Jun 19 08:00:54 2000
@@ -8,10 +8,10 @@
 
 <title>ATI Adapters README file
 <author>Marc Aurele La France
-<date>1999 October 25
+<date>2000 June 15
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.29 2000/02/18 12:19:08 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.31 2000/06/19 15:00:54 tsi Exp $
 </ident>
 
 <abstract>
@@ -41,8 +41,8 @@
 <item>generic VGA support if a non-ATI VGA-capable adapter is detected
 <it>and</it> the user has requested such support.
 </itemize>
-Thus, the support provided not only depends on what the driver detects in the
-system, but also, on what the user specifies in the XF86Config file.
+Thus, the level of support provided not only depends on what the driver detects
+in the system, but also, on what the user specifies in the XF86Config file.
 See the <bf>``XF86Config specifications''</bf> section below for details.<p>
 If none of the above conditions are met, the ATI driver will essentially
 disable itself to allow other drivers to examine the system.<p>
@@ -80,11 +80,12 @@
                    264CT, 264ET, 264VT, 264GT (3D Rage), 264VT-B, 264VT3,
                    264VT4, 264GT-B (3D Rage II), 3D Rage IIc, 3D Rage Pro,
                    3D Rage LT, 3D Rage LT Pro, 3D Rage XL, 3D Rage XC,
-                   3D Rage Mobility</verb>
+                   3D Rage Mobility (including the -M and -P variants)</verb>
 The driver also supports 32K, 64K and 16M-colour modes on the 264xT and 3D Rage
-series of adapters using the accelerator CRTC (but not the VGA CRTC).
-This support is as yet unaccelerated.<p>
-The newer Rage 128 chips are not yet supported.<p>
+series of adapters using the accelerator CRTC (but not the VGA CRTC).<p>
+The newer Rage 128 chips are not yet supported by this driver.
+Rage 128's are, however, supported by a separate driver, and Rage 128 owners
+should read the r128 driver's documentation for details.<p>
 Adapters based on the above chips have been marketed under a rather large
 number of names over the years.
 Among them are:
@@ -107,20 +108,22 @@
                    All-In-Wonder PRO, 3D Pro Turbo, XPERT@Play,
                    XPERT@Play 98, XPERT@Work, XPERT 98, XPERT LCD,
                    XPERT XL</verb>
+Also, a number of mainboards, laptops and notebooks harbour a Mach32 or Mach64
+controller.<p>
 VGAWonder, Mach8 and Mach32 ISA adapters are available with or without a
 mouse.<p>
 These adapters are available with a variety of clock generators and RAMDACs.
 The 264xT and 3D Rage series of chips are integrated controllers, meaning that
 they include a programmable clock generator and a RAMDAC.<p>
-This driver still does not provide support for accelerated drawing to the
-screen.
+For all but Mach64 adapters, this driver still does not provide support for
+accelerated drawing to the screen.
 This means that all drawing is done by the CPU, rather than by any accelerator
 present in the system.
 This can make opaque moves, for example, quite ``jerky''.
 Also, given that IBM 8514/A and ATI Mach8 do not allow CPU access to their
 frame buffer, the driver will currently ignore these accelerators.
-Most Mach32 adapters provide both accelerated function and VGA functionality,
-but the driver currently only uses the VGA.<p>
+Most Mach32 adapters provide both accelerated function and SuperVGA
+functionality, but the driver currently only uses the VGA.<p>
 The driver <it>does</it> however support the accelerator CRTC present in all
 ATI Mach64 adapters.
 For 256-colour, and higher depth modes, this support will be used by default,
@@ -129,8 +132,12 @@
 A linear video memory aperture is also available in 256-colour and higher depth
 modes and enabled by default if a 264xT or 3D Rage controller is detected or,
 on 88800 controllers, if the accelerator CRTC is used.
-An XF86Config option is available to disable this aperture, or (on non-PCI
+XF86Config options are available to disable this aperture, or (for non-PCI
 adapters) enable it or move it to some other address.<p>
+By default, the driver provides some acceleration for Mach64 if the accelerator
+CRTC is used.
+This support is as yet incomplete and can be disabled entirely with an
+XF86Config option.<p>
 <sect>Current implementation of generic VGA support for non-ATI adapters<p>
 Support for generic VGA with non-ATI adapters is also implemented, but has
 undergone only limited testing.
@@ -151,9 +158,10 @@
 <item>Video memory is limited to 256kB in monochrome and 16-colour modes.
 <item>Video memory is limited to 64kB in 256-colour modes.
 <item>Interlaced modes are not available.
+<item>Colour depths higher than 8 are not available.
 </itemize>
 <sect>XF86Config specifications<p>
-The driver recognizes a number of XF86Config options.
+The driver recognises a number of XF86Config options.
 In general, all such options should be specified in a ``Device'' section, and
 affect only that ``Device'' section.<p>
 Those options that affect how the driver associates adapters with ``Device''
@@ -168,7 +176,7 @@
 to the ``Device'' section which contains them.<p>
 <sect1>Driver ``ati''<p>
 The use of this specification is highly recommended if the ``Device'' section
-is to be recognized by the driver.
+is to be recognised by the driver.
 In fact, it is almost (but not quite) mandatory, particularly when using the
 loader server as it indicates what driver is to be loaded and associated with
 the ``Device'' section.<p>
@@ -180,7 +188,8 @@
 Otherwise, the driver will programme the adapter's SuperVGA CRTC.<p>
 If ``<it>ativga</it>'' is specified instead, the driver will ignore any ATI
 accelerator it detects, but otherwise operate as if ``<it>ati</it>'' had been
-specified.<p>
+specified.
+This specification ensures the VGA CRTC is used.<p>
 A ChipSet name of ``<it>ibmvga</it>'' causes any VGA-capable adapter in the
 system to be associated with the ``Device'' section.
 It enables the driver's generic VGA support, but only for non-ATI adapters.
@@ -206,18 +215,22 @@
 <sect1>ChipID & ChipRev specifications<p>
 These specifications will cause the driver to associate the ``Device'' section
 only with an adapter having the same attributes, or an adapter whose PCI device
-ID the driver does not recognize.
+ID the driver does not recognise.
 In the second case, these options cause the driver to treat the adapter as if
 it was one with the specified PCI device ID or revision.
-ChipID can only be used with Mach32 or Mach64 adapters.
-ChipRev is meaningful only with Mach64 adapters.<p>
+ChipID can only be used with Mach32 or Mach64 adapters, and, thus, specifically
+excludes any other adapter from matching the ``Device'' section.
+ChipRev is meaningful only with Mach64 adapters, and then only if ChipID is
+also specified in the same ``Device'' section.<p>
 <sect1>IOBase<p>
 This option limits the adapters that can be associated with the ``Device''
-section to those with the specified I/O base.
-This option only applies to Mach64 adapters.<p>
+section to the one with the specified I/O base.
+This option only applies to Mach64 adapters and specifically excludes other
+adapters.<p>
 <sect1>BusID<p>
 This option limits the adapters that can be associated with the ``Device''
-section to those with the specified PCI Bus ID.<p>
+section to the one with the specified PCI Bus ID.
+This specification excludes non-PCI adapters.<p>
 <sect1>Clocks<p>
 For the purpose of specifying a clock line in your XF86Config, one of four
 different situations can occur, as follows.<p>
@@ -236,7 +249,7 @@
 If you are uncertain which situation applies to your adapter, you can run a
 clock probe with the command ``<tt>X -probeonly</tt>''.<p>
 <sect2>Clocks for supported programmable clock generators<p>
-At bootup, video BIOS initialization programmes an initial set of frequencies.
+At bootup, video BIOS initialisation programmes an initial set of frequencies.
 Two of these are reserved to allow the setting of modes that do not use a
 frequency from this initial set.
 One of these reserved slots is used by the BIOS mode set routine, the other by
@@ -253,7 +266,7 @@
 completeness.<p>
 In this situation, the driver will probe the adapter for clock frequencies
 unless XF86Config clocks are already specified.
-In either case, the driver will then attempt to normalize the clocks to one of
+In either case, the driver will then attempt to normalise the clocks to one of
 the following specifications:
 <verb>
 BIOS setting 1:
@@ -345,17 +358,25 @@
 they would use for previous XFree86 accelerated servers.<p>
 <sect2>Clocks for non-ATI adapters<p>
 If no clocks are specified in the XF86Config, the driver will probe for four
-clocks, the second of which will be assumed to be 28.322MHz.
+clocks, the second of which will be assumed to be 28.322 MHz.
+The first clock will typically be 25.175 MHz, but there are exceptions.
 You can include up to four clock frequencies in your XF86Config to specify the
 actual values used by the adapter.
 Any more will be ignored.<p>
 <sect1>Option <it>``crt_screen''</it><p>
 This specification is only effective when the driver detects that the adapter's
-BIOS has initialized both the digital flat panel and CRT interfaces.
+BIOS has initialised both the digital flat panel and CRT interfaces.
 In such a situation, the driver will normally drive the panel and disable the
 CRT.
 This specification causes the driver to disable the digital flat panel and
-display the screen image on the CRT instead.<p>
+display the screen image on the CRT instead.
+This specification will be reworked in the near future.<p>
+<sect1>Option <it>``noaccel''</it><p>
+By default, the driver will accelerate draw operations if a Mach64 CRTC is used
+to drive the display.
+As implemented in this driver, acceleration does not require a linear video
+memory aperture.
+This option disables this acceleration.<p>
 <sect1>Option <it>``nolinear''</it><p>
 By default, the driver will enable a linear video memory aperture for
 256-colour and higher depth modes if it is also using a Mach64 accelerator CRTC
@@ -373,10 +394,17 @@
 enabled by default.
 For other bus types, the default behaviour is to disable this option.<p>
 Note that, due to various limitations, this option is forcibly disabled when a
-linear video memory aperture is not enabled, or when the frame buffer depth is
-less than 8.
-The use of video acceleration, when implemented in a future driver release,
-will also disable frame buffer shadowing.<p>
+linear video memory aperture is not enabled, when the frame buffer depth is
+less than 8, or when acceleration is used.<p>
+<sect1>Option <it>``dpms''</it><p>
+This option enables the driver's support for VESA's Display Power Management
+Specification.<p>
+<sect1>Option <it>``backingstore''</it><p>
+This is not specifically a driver option.
+It is used to enable the server's support for backing store, a mechanism by
+which pixel data for occluded window regions is remembered by the server
+thereby alleviating the need to send expose events to X clients when the data
+needs to be redisplayed.<p>
 <sect1>MemBase <it>address</it><p>
 This specification is only effective for non-PCI Mach64 adapters, and is used
 to override the CPU address at which the adapter will map its video memory.
@@ -384,10 +412,33 @@
 provided with the adapter.
 The MemBase option can also be used to enable the linear aperture in those
 cases where ATI's utility was not, or can not be, used.<p>
-For PCI adapters, this address is determined at system bootup according to the
-PCI Plug'n'Play specification which arbitrates the resource requirements of
-most devices in the system.
+For PCI and AGP adapters, this address is determined at system bootup according
+to the PCI Plug'n'Play specification which arbitrates the resource requirements
+of most devices in the system.
 This means the driver can not easily change the linear aperture address.<p>
+<sect>Video modes<p>
+Mode timings can be derived from the information in XFree86's doc subdirectory.
+However, it is no longer required to specify such timings in an XF86Config's
+``Monitor'' section(s), if only standard mode timings are to be used.
+The server automatically inserts VESA standard mode timings in every
+``Monitor'' section, and these modes will be checked first for mode constraints
+(monitor sync tolerances, video memory size, etc.).<p>
+Furthermore, it is also no longer required to specify mode names in ``Display''
+subsections.
+Should no mode names be specified (or those specified do not yield a usable
+mode), the server will automatically select as a default resolution the largest
+usable mode, whether or not the chosen mode is specified in the corresponding
+``Monitor'' section.<p>
+For a CRT monitor, you should still specify horizontal sync and vertical
+refresh rates in the corresponding ``Monitor'' section.
+Otherwise, the server will default these to those of a VGA monitor, which will
+limit resolutions to not much more than 640x480 at 72 Hz.
+For a digital flat panel, any sync tolerances should be removed from the
+corresponding ``Monitor'' section.
+The driver will automatically calculate these from the mode that is active on
+server entry.
+The driver also inserts timings for a mode called <it>"Native panel mode"</it>
+that represents the panel's native resolution.<p>
 <sect>Known problems and limitations<p>
 There are several known problems or limitations related to the XFree86 ATI
 driver.
@@ -397,13 +448,13 @@
 using PCI Mach64 adapters.
 The great majority of these problems have been found to be due to system
 aspects that are unrelated to this driver.
-As of this writing, these problems can be divided into three general areas:<p>
+As of this writing, these problems can be divided into two general areas:<p>
 Improper mouse protocol specification with some recent mice.
 Try different protocol specifications or another mouse.<p>
 A system conflict with APM.
 This problem is Linux-specific.
 There is a bug in kernels 2.0.31 or earlier that prevents proper APM operation.
-Upgrade to a more recent kernel or disable APM support.<p>
+Upgrade to a more recent kernel or disable APM support in the kernel.<p>
 <item>When using a Mach64's accelerator CRTC, the virtual resolution must be
 less than 8192 pixels wide.
 The VGA CRTC further limits the virtual resolution width to less than 4096
@@ -453,18 +504,23 @@
 </itemize>
 Support for the following will be added in a future release:
 <itemize>
-<item>Mach32 accelerator's CRTC.
+<item>Mach32's accelerator CRTC.
 This support is the first step towards accelerated support for Mach32's,
 Mach8's, 8514/A's and other clones.
-<item>Colour depth greater than 8, where permitted by the hardware.
-<item>Mach64, Mach32, Mach8 and 8514/A Draw Engines.
+<item>Colour depth greater than 8 on non-integrated controllers, where
+permitted by the hardware.
+<item>Mach32, Mach8 and 8514/A Draw Engines.
 <item>Hardware cursors.
+<item>TVOut, i.e. the ability to use a television screen as a monitor.
+<item>Motion Video, i.e. displaying an asynchronous data stream (TV signal,
+DVD, etc.) in a window or full-screen.
+<item>3D operations.
 </itemize>
 <sect>Reporting problems<p>
 If you are experiencing problems that are not already recorded in this
 document, first ensure that you have the latest current release of this driver
 and XFree86.
-Check the server's stderr output and <htmlurl
+Check the server's log (usually found in /var/log/XFree86.0.log) and <htmlurl
 name="ftp://ftp.xfree86.org/pub/XFree86"
 url="ftp://ftp.xfree86.org/pub/XFree86"> if you are uncertain.<p>
 Secondly, please check XFree86's doc directory for additional information.<p>
@@ -473,10 +529,10 @@
 Fourth, a scan through the comp.windows.x.i386unix and comp.os.linux.x
 newsgroups using your favourite archiving service can also prove useful in
 resolving problems.<p>
-If you are still experiencing problems, you can send me e-mail at
-<email>tsi@ualberta.ca</email>.
+If you are still experiencing problems, you can send me <it>non-HTMLised</it>
+e-mail at <email>tsi@ualberta.ca</email>.
 Please be as specific as possible when describing the problem(s), and include
-an unedited copy of the server's stderr and the XF86Config file used.<p>
+an <it>unedited</it> copy of the server's log and the XF86Config file used.<p>
 <sect>Driver history<p>
 The complete history of the driver is rather cloudy.
 The following is more than likely to be incomplete and inaccurate.<p>
@@ -487,20 +543,19 @@
 Then Doug Evans (<it>dje@cygnus.com</it>) added support for the ATI VGA Wonder
 XL, trying in the process to make the driver work with all other ATI adapters
 available at the time.<p>
-Rik Faith (<it>faith@cs.unc.edu</it>) obtained the X11R4 driver from Doug Evans
-in the summer of 1992 and ported the code to the X386 part of X11R5.
+Rik Faith (<it>faith@precisioninsight.com</it>) obtained the X11R4 driver from
+Doug Evans in the summer of 1992 and ported the code to the X386 part of X11R5.
 This subsequently became part of XFree86.<p>
 I (Marc Aurele La France) took over development and maintenance of the driver
 in the fall of 1993 after Rik got rid of his VGA Wonder adapter.<p>
 <sect>Driver versions<p>
 Due to the introduction of loadable drivers in XFree86 4.0, it has become
 necessary to track driver versions separately.
-With this release of the driver, I am introducing the following version
-numbering scheme.<p>
+Driver releases use the following version numbering scheme.<p>
 Version 1 of this driver is the one I inherited from Rik Faith.
 This is the version found in XFree86 2.0 and 2.1.<p>
 Version 2 is my first rewrite of this code which only ended up being a
-partially unsuccessful attempt at generalizing the driver for all VGA Wonder,
+partially unsuccessful attempt at generalising the driver for all VGA Wonder,
 Mach32, and early Mach64 adapters.
 Various releases of this version of the driver can be found in XFree86 2.1.1,
 3.1, 3.1.1 and 3.1.2.<p>
@@ -511,10 +566,8 @@
 This is the version found in XFree86 3.2, 3.3 and 3.3.1.<p>
 Version 4 is a rather major restructuring of version 3, which became larger
 than I could comfortably handle in one source file.
-This version will make it quite a bit easier to introduce new function such as
-acceleration, additional colour depths, and so on.
-This is the version found in XFree86 3.3.2, 3.3.3, 3.3.3.1, 3.3.3.2 and
-3.3.4.<p>
-Version 5 is an almost complete restructuring of version 4 to fit in the new
-driver API of XFree86 4.0.<p>
+This is the version found in XFree86 3.3.2, 3.3.3, 3.3.3.1, 3.3.3.2, 3.3.4,
+3.3.5 and 3.3.6.<p>
+Version 5 is an almost complete restructuring of version 4 to fit in the newer
+driver API of XFree86 4.0 and later.<p>
 </article>
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml:3.30 xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml:3.31
--- xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml:3.30	Sun Mar  5 08:59:11 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml	Tue Jun 13 18:43:49 2000
@@ -8,10 +8,10 @@
 <title> Information for Chips and Technologies Users
 <author> David Bateman (<email>dbateman@club-internet.fr</email>),
          Egbert Eich (<email>eich@xfree86.org</email>)
-<date> 19th July 1999
+<date> 14th June 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.30 2000/03/05 16:59:11 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.31 2000/06/14 01:43:49 dawes Exp $
 </ident>
 
 <!-- Table of contents -->
@@ -35,6 +35,7 @@
 <item>Gamma correction at all depths and DirectColor visuals for depths of
 	15 or greater with the HiQV series of chipsets.
 <item>Supports PsuedoColor overlays on 16bpp TrueColor screens for HiQV.
+<item>Supports YUV colour space conversion with the XVideo extension.
 <item>32bpp pixmaps while using a framebuffer in 24bpp packed pixel mode.
 <item>Heaps more acceleration.
 <item>1/4bpp support.
@@ -115,9 +116,9 @@
 <descrip>
 <tag>ct65550</tag>
 	This chip includes many new features, including improved BitBLT
-	support (24bpp color expansion, wider maximum pitch, etc), Multimedia
+	support (24bpp colour expansion, wider maximum pitch, etc), Multimedia
 	unit (video capture, zoom video port, etc) and 24bpp uncompressed true
-	color (i.e 32bpp mode). Also memory mapped I/O is possible on all bus
+	colour (i.e 32bpp mode). Also memory mapped I/O is possible on all bus
 	configurations. 
 	(Max Ram: 2Mb, Max Dclk: 80MHz@3.3V,100MHz@5V)
 <tag>ct65554</tag>
@@ -414,15 +415,25 @@
 	multimedia engine to its limit, and some manufacturers have set a
 	default memory clock that will cause pixel errors with this option.
 	If you get pixel error with this option try using the
-	"<tt>SetMClk</tt>" option to slow the memory clock.
+	"<tt>SetMClk</tt>" option to slow the memory clock. It should also
+	be noted that the XVideo extension uses the same capabilities of the
+	HiQV chipsets as the Overlays. So using this option disables the
+	XVideo extension.
 <tag>
 Option "ColorKey" "255" 
 </tag>
-	Normally the color transparency key for the overlay is the 8bpp lookup
+	Normally the colour transparency key for the overlay is the 8bpp lookup
 	table entry 255. This might cause troubles with some applications, and
-	so this option allows the color transparency key to be set to some
+	so this option allows the colour transparency key to be set to some
 	other value. Legal values are 2 to 255 inclusive.
 <tag>
+Option "VideoKey" "255" 
+</tag>
+	This sets the default pixel value for the YUV video overlay key. Legal
+	values for this key are depth dependent. That is from 0 to 255 for
+	8bit depth, 0 to 32,767 for 15bit depth, etc. This option might be used
+	if the default video overlay key causes problems.
+<tag>
 Option "XaaNoScreenToScreenCopy",
 Option "XaaNoSolidFillRect",
 Option "XaaNoSolidHorVertLine",
@@ -494,6 +505,11 @@
 	is therefore similar to a 24bpp mode. The overlay consumes memory
 	bandwidth, so that the maximum dotclock will be similar to a 24bpp
 	mode.
+<tag> * XVideo extension* </tag>
+		Like the overlays, the Xvideo extension uses a part of the
+	video memory for a second framebuffer. In this case enough memory
+	needs to be left for the largest unscaled video window that will be 
+	displayed.
 <tag> * VESA like modes </tag>
 		We recommend that you try and pick a mode that is similar
 	to a standard VESA mode. If you don't a suspend/resume or LCD/CRT
@@ -811,6 +827,10 @@
 	that is too high for use with the "<tt>Overlay</tt>" option. So with 
 	the "<tt>Overlay</tt>" option, using the "<tt>SetMClk</tt>" option to
 	reduce the speed of the memory clock is recommended.
+<tag> The mpeg video playing with the XVideo extension has corrupted colours </tag>
+	The XVideo extension has only recently been added to the chips driver.
+	Some YUV to RGB colour have been noted at 15 and 16 bit colour depths.
+	However, 8 and 24 bit colour depths seem to work fine.
 <tag> I can't start X-windows with 16, 24 or 32bpp</tag>
 	Firstly, is your machine capable of 16/24/32bpp with the mode
 	specified. Many LCD displays are incapable of using a 24bpp 
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent:1.11 xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent:1.13
--- xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent:1.11	Wed Mar  8 10:04:15 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent	Fri Jun 30 09:54:28 2000
@@ -1,12 +1,12 @@
-<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.11 2000/03/08 18:04:15 dawes Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.13 2000/06/30 16:54:28 dawes Exp $ -->
 
 <!-- shared entity definitions for the XFree86 documentation -->
 
 <!-- XFree86 version string -->
-<!ENTITY relvers CDATA "4.0">
-<!ENTITY prevrelvers CDATA "3.9.18">
-<!ENTITY srcvers CDATA "400">
-<!ENTITY prevsrcvers CDATA "3918">
+<!ENTITY relvers CDATA "4.0.1">
+<!ENTITY prevrelvers CDATA "4.0">
+<!ENTITY srcvers CDATA "401">
+<!ENTITY prevsrcvers CDATA "400">
 <!-- Version of the most recent 3.3.x release -->
 <!ENTITY legacyvers CDATA "3.3.6">
 
@@ -19,7 +19,7 @@
 <!ENTITY % latersnap 'INCLUDE'>
 <!ENTITY % snapshot 'IGNORE'>
 <!ENTITY % release 'INCLUDE'>
-<!ENTITY % firstrel 'INCLUDE'>
+<!ENTITY % firstrel 'IGNORE'>
 <!ENTITY % earlyrel 'INCLUDE'>
-<!ENTITY % laterrel 'IGNORE'>
+<!ENTITY % laterrel 'INCLUDE'>
 
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/index.post:1.1 xc/programs/Xserver/hw/xfree86/doc/sgml/index.post:1.2
--- xc/programs/Xserver/hw/xfree86/doc/sgml/index.post:1.1	Tue Aug 24 04:24:09 1999
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/index.post	Tue Mar 21 11:57:10 2000
@@ -1,8 +1,22 @@
 
 </itemize>
 
+<![ %manpages; [
+<p>
+Manual pages:
+<itemize>
+<item><htmlurl name="Section 1" url="manindex1.html">: Commands
+<item><htmlurl name="Section 3" url="manindex3.html">: Library Functions
+<item><htmlurl name="Section &drvsuffix;" url="manindex&drvsuffix;.html">: Drivers
+<item><htmlurl name="Section &filesuffix;" url="manindex&filesuffix;.html">: Files and file formats
+<item><htmlurl name="Section &miscsuffix;" url="manindex&miscsuffix;.html">: Miscellaneous
+</itemize>
+<p>
+]]>
+
+
 </article>
 
 <!--
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v 1.1 1999/08/24 11:24:09 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.post,v 1.2 2000/03/21 19:57:10 dawes Exp $
 -->
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre:1.6 xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre:1.8
--- xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre:1.6	Tue Mar  7 21:38:44 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre	Fri Jun 30 15:09:37 2000
@@ -1,5 +1,6 @@
 <!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
+<!ENTITY % mdefs SYSTEM "mdefs.ent"> %mdefs;
 ]>
  
 <article>
@@ -7,10 +8,10 @@
 <!-- Title information -->
 <title>Documentation for XFree86&trade; version &relvers;
 <author>The XFree86 Project, Inc
-<date>8 March 2000
+<date>30 June 2000
 
 <!--
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.6 2000/03/08 05:38:44 dawes Exp $ 
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.8 2000/06/30 22:09:37 dawes Exp $ 
 -->
 
 <p>
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp:1.1
--- /dev/null	Sat Jul  1 20:42:46 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp	Tue Mar 21 11:57:11 2000
@@ -0,0 +1,14 @@
+<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mdefs.cpp,v 1.1 2000/03/21 19:57:11 dawes Exp $ -->
+
+<!-- entity definitions for man pages -->
+
+#ifdef HTML_MANPAGES
+<!ENTITY % manpages 'INCLUDE'>
+#else
+<!ENTITY % manpages 'IGNORE'>
+#endif
+
+<!ENTITY drvsuffix CDATA __drivermansuffix__ >
+<!ENTITY filesuffix CDATA __filemansuffix__ >
+<!ENTITY miscsuffix CDATA __miscmansuffix__ >
+
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml:1.7 xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml:1.8
--- xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml:1.7	Wed Mar  8 07:14:48 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml	Tue Jun 13 17:16:09 2000
@@ -5,10 +5,10 @@
 <article>
 <title>Information for ATI Rage 128 Users
 <author>Precision Insight, Inc., SuSE GmbH
-<date>12 November 1999
+<date>13 June 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v 1.7 2000/03/08 15:14:48 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v 1.8 2000/06/14 00:16:09 dawes Exp $
 </ident>
 
 <toc>
@@ -86,7 +86,7 @@
 <sect>Known Limitations
 <p>
 <itemize>
-  <item>DGA is not supported yet
+  <item>None
 </itemize>
 
 
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml:1.8 xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml:1.12
--- xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml:1.8	Wed Mar  1 15:54:34 2000
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml	Fri Jun 16 19:30:33 2000
@@ -3,12 +3,12 @@
 ]>
 
 <article>
-<title>Information for Rendition Users
+<title>Information for Rendition (Micron) Verité Users
 <author>The XFree86 Project Inc.
-<date>12 December 1999
+<date>9 June 2000, last update by Dejan Ilic <email>dejan.ilic@home.se</email>
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.8 2000/03/01 23:54:34 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.12 2000/06/17 02:30:33 dawes Exp $
 </ident>
 
 <toc>
@@ -29,6 +29,11 @@
 
 If you have problems with hardware cursor use the "sw_cursor" option to revert back to software cursor.<p>
 
+This is essentially a port of XFree86 3.3.x driver to the new XFree86
+4.0 API, and thus we have put most of effort in making a working driver
+with the most basic features. Support for multi-head support and
+acceleration are next on the list of features to be included.<p>
+
 <sect>Features <p>
 <itemize>
 <item>Hardware acceleration
@@ -44,16 +49,16 @@
 
 <sect>XF86Config Option <p>
 <descrip>
-<tag>Option "sw_cursor"</tag>
+<tag>Option "SW_Cursor"</tag>
 Disables use of the hardware cursor.
-<tag>Option "overclock_mem"</tag>
+<tag>Option "Overclock_Mem"</tag>
 Run the memory at a higher clock. Useful on some cards with display glitches
 at higher resolutions. But adds the risk to damage the hardware. Use with
 caution.
 <tag>DacSpeed "MHz"</tag>
 Set custom ramdac limit. We have currently no way of knowing if the v2x00 chip is a v2100 (170MHz) or v2200 (203MHz and 230MHz) so we assume the lowest. Use this option to manually override the value.
 <tag>Option "FramebufferWC"</tag>
-If writecombine is disabled in BIOS, and you add this option in in configuration file, then the driver will try to request writecombined access to the framebuffer. This can drastically increase the performance on unaccelerated server. Requires that "MTRR"-support is compiled into the OS-kernel.
+If writecombine is disabled in BIOS, and you add this option in configuration file, then the driver will try to request writecombined access to the framebuffer. This can drastically increase the performance on unaccelerated server. Requires that "MTRR"-support is compiled into the OS-kernel.
 <tag>Option "NoDDC"</tag>
 Disable probing of DDC-information from your monitor. This information is not used yet and is only there for informational purposes. This might change before final XFree86 4.0 release. Safe to disable if you experience problems during startup of X-server.
 <tag>Option "ShadowFB"</tag>
@@ -72,20 +77,20 @@
 The option is not activated by default.
 </descrip>
 
-<sect>News in this release <p>
+<sect>News in this release (XFree86 4.1)<p>
 <itemize>
-<item>Acceleration! Disabled for the moment.
+<item>DirectColor support
+<item>SilkenMouse support
 </itemize>
 
 <sect>Major changes in this release <p>
 <itemize>
-<item>ShadowFB support added
-<item>To be determined before final release.
+<item>Gamma works now for >8bpp
 </itemize>
 
 <sect>Bugfixes<p>
 <itemize>
-<item>8bpp finally works correctly again
+<item>Only some code cleanup done. No real bugfixes.
 </itemize>
 
 <sect>Known problems in current driver<p>
@@ -94,6 +99,7 @@
 <item>DDC-probing does not work correctly yet. No DDC information is found.
 <item>Switching from display to VC and back to display can lock up V2x00 cards.
 <item>When scrolling the virtual display on a V1000 card parts of the screen will become distorted. Problem disappears when you continue moving around. V2x00 does not exhibit this problem. Probably a bug in the driver rather than a limitation of the chip.
+<item>Depth 15 & 16 has problems with colors when DirectColor is used.
 </itemize>
 
 <sect>Work in progress (not finished in time for release) <p>
Index: xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml
diff -u xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml:3.24 xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml:3.25
--- xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml:3.24	Sun Aug 22 23:38:54 1999
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml	Sun Mar 19 08:43:51 2000
@@ -3,20 +3,17 @@
 
 <title> Information for Trident Chipset Users
 <author> The XFree86 Project, Inc.
-<date> June 25 1999
+<date> March 7th 2000
 <toc>
 
 <sect> Supported chipsets <p>
-The Trident driver has undergone some slight work for XFree86 3.3.3.
-Because of this work, all of the Trident SVGA chipsets, except
-the very first one, are supported by both the color and monochrome servers.
+The Trident driver has the following list of chipsets supported for &relvers;
+
 <quote><bf>
-8800CS 8200LX
-8900B 8900C 8900CL/D 9000 9000i 9100B
-9200CXr 9320LCD 9400CXi 9420 9420DGi 9430DGi 9440AGi 9660XGi 9680
-ProVidia9682 ProVidia9685 Cyber9382 Cyber9385 Cyber9385-1 Cyber9388
-Cyber9397 Cyber9520 Cyber9525 3DImage975(PCI) 3DImage975(AGP) 
-3DImage985(AGP) Blade3D CyberBlade
+8900CL/D 9440AGi 9660XGi 9680 ProVidia9682 Pro-Vidia9685
+Cyber9382 Cyber9385 Cyber9385-1 Cyber9388 Cyber9397
+Cyber9520 Cyber9525 Cyber9540 3DImage975(PCI) 3DImage975(AGP)
+3DImage985(AGP) Blade3D CyberBlade/i7 CyberBlade/i1 CyberBlade/e4/128
 </bf></quote>
 It must be noted that the 9000i chipset is treated as a 9000 by the server.
 Additionally the 9100B is treated 
@@ -157,7 +154,7 @@
 be worth checking wait states etc. on the card and in the BIOS setup.
 
 <verb>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml,v 3.24 1999/08/23 06:38:54 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml,v 3.25 2000/03/19 16:43:51 dawes Exp $
 
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile:1.17 xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile:1.19
--- xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile:1.17	Thu Mar  2 17:05:33 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile	Fri Jun 30 11:27:02 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile,v 1.17 2000/03/03 01:05:33 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile,v 1.19 2000/06/30 18:27:02 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -20,12 +20,14 @@
            -I$(SERVERSRC)/mfb  -I$(SERVERSRC)/mi \
            -I$(SERVERSRC)/cfb  -I$(XF86SRC)/xaa \
            -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \
+	   -I$(XF86SRC)/xf24_32bpp \
            -I$(XF86SRC)/vgahw  -I$(XF86SRC)/ramdac \
 	   -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \
 	   -I$(XF86SRC)/shadowfb \
 	   -I$(XF86SRC)/i2c -I$(XF86SRC)/ddc \
            -I$(SERVERSRC)/Xext -I$(EXTINCSRC) \
-           -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC)
+           -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(XF86OSSRC)/vbe -I$(FONTINCSRC)
 #endif
 
 #if MakeHasPosixVariableSubstitutions
@@ -54,6 +56,7 @@
 InstallDriverSDKNonExecFile(apm_driver.c,$(DRIVERSDKDIR)/drivers/apm)
 InstallDriverSDKNonExecFile(apm_i2c.c,$(DRIVERSDKDIR)/drivers/apm)
 InstallDriverSDKNonExecFile(apm_funcs.c,$(DRIVERSDKDIR)/drivers/apm)
+InstallDriverSDKNonExecFile(apm_video.c,$(DRIVERSDKDIR)/drivers/apm)
 #if BuildXF86RushExt
 InstallDriverSDKNonExecFile(apm_rush.c,$(DRIVERSDKDIR)/drivers/apm)
 #endif
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/apm.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/apm/apm.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/apm/apm.cpp:1.1	Thu Mar  2 17:05:33 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm.cpp	Tue Jun 13 19:13:07 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.cpp,v 1.1 2000/03/03 01:05:33 dawes Exp $ 
-.TH APM __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.cpp,v 1.4 2000/06/14 02:13:07 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH APM __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 apm \- Alliance ProMotion video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""apm"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qapm\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B apm 
 is an XFree86 driver for Alliance ProMotion video cards.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h:1.13 xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h:1.15
--- xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h:1.13	Mon Feb 28 19:09:17 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h	Fri Jun 30 11:27:02 2000
@@ -1,9 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.13 2000/02/29 03:09:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.15 2000/06/30 18:27:02 dawes Exp $ */
 
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -11,6 +8,9 @@
 /* All drivers need this */
 #include "xf86_ansic.h"
 
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
+
 /* This is used for module versioning */
 #include "xf86Version.h"
 
@@ -44,6 +44,7 @@
 #include "cfb16.h"
 #include "cfb24.h"
 #include "cfb32.h"
+#include "cfb24_32.h"
 
 /* Drivers using the XAA interface ... */
 #include "xaa.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c:1.13 xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c:1.14
--- xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c:1.13	Mon Feb 14 11:20:45 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c	Fri Jun 30 11:27:02 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.13 2000/02/14 19:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */
 
 
 #include "apm.h"
@@ -203,6 +203,23 @@
 					dstx, dsty);
 }
 
+void ApmAccelReserveSpace(ApmPtr pApm)
+{
+    memType	mem, ScratchMemOffset;
+
+    mem			= xf86Screens[pApm->pScreen->myNum]->videoRam << 10;
+    /*
+     * Reserve at least four lines for mono to color expansion
+     */
+    ScratchMemOffset	= ((mem - pApm->OffscreenReserved) /
+			pApm->CurrentLayout.bytesPerScanline - 4) *
+			pApm->CurrentLayout.bytesPerScanline;
+    pApm->ScratchMemSize= mem - ScratchMemOffset - pApm->OffscreenReserved;
+    pApm->ScratchMemPtr	= pApm->ScratchMemOffset
+			= (memType)pApm->FbBase + ScratchMemOffset;
+    pApm->ScratchMemEnd	= (memType)pApm->FbBase + mem - pApm->OffscreenReserved;
+}
+
 /*********************************************************************************************/
 
 int
@@ -212,23 +229,15 @@
     APMDECL(pScrn);
     XAAInfoRecPtr	pXAAinfo;
     BoxRec		AvailFBArea;
-    int			mem, ScratchMemOffset, i, stat;
+    memType		mem, ScratchMemOffset;
+    int			i, stat;
 
     pApm->AccelInfoRec	= pXAAinfo = XAACreateInfoRec();
     if (!pXAAinfo)
 	return FALSE;
 
     mem			= pScrn->videoRam << 10;
-    /*
-     * Reserve at least four lines for mono to color expansion
-     */
-    ScratchMemOffset	= ((mem - pApm->OffscreenReserved) /
-			pApm->CurrentLayout.bytesPerScanline - 4) *
-			pApm->CurrentLayout.bytesPerScanline;
-    pApm->ScratchMemSize= mem - ScratchMemOffset - pApm->OffscreenReserved;
-    pApm->ScratchMemPtr	= pApm->ScratchMemOffset
-			= (memType)pApm->FbBase + ScratchMemOffset;
-    pApm->ScratchMemEnd	= (memType)pApm->FbBase + mem - pApm->OffscreenReserved;
+    ScratchMemOffset	= pApm->ScratchMemOffset - (memType)pApm->FbBase;
     switch (pApm->CurrentLayout.bitsPerPixel) {
     case 8:
     case 24:
@@ -457,14 +466,14 @@
 	    pXAAinfo->WritePixmapFlags = LEFT_EDGE_CLIPPING | NO_PLANEMASK |
 			    LEFT_EDGE_CLIPPING_NEGATIVE_X;
 	    XAA(WritePixmap);
-	    pXAAinfo->WriteBitmapFlags = LEFT_EDGE_CLIPPING | NO_PLANEMASK |
-			    LEFT_EDGE_CLIPPING_NEGATIVE_X |
-			    BIT_ORDER_IN_BYTE_LSBFIRST;
-	    XAA(WriteBitmap);
 	    pXAAinfo->FillImageWriteRectsFlags	=
 			    LEFT_EDGE_CLIPPING | NO_PLANEMASK |
 			    LEFT_EDGE_CLIPPING_NEGATIVE_X;
 	    XAA(FillImageWriteRects);
+	    pXAAinfo->WriteBitmapFlags = LEFT_EDGE_CLIPPING | NO_PLANEMASK |
+			    LEFT_EDGE_CLIPPING_NEGATIVE_X |
+			    BIT_ORDER_IN_BYTE_LSBFIRST;
+	    XAA(WriteBitmap);
 	    pXAAinfo->TEGlyphRendererFlags = LEFT_EDGE_CLIPPING | NO_PLANEMASK |
 			    LEFT_EDGE_CLIPPING_NEGATIVE_X;
 	    XAA(TEGlyphRenderer);
@@ -545,14 +554,14 @@
 	    pXAAinfo->WritePixmapFlags = LEFT_EDGE_CLIPPING | NO_PLANEMASK |
 			    LEFT_EDGE_CLIPPING_NEGATIVE_X;
 	    XAA(WritePixmap);
-	    pXAAinfo->WriteBitmapFlags = LEFT_EDGE_CLIPPING | NO_PLANEMASK |
-			    LEFT_EDGE_CLIPPING_NEGATIVE_X |
-			    BIT_ORDER_IN_BYTE_LSBFIRST;
-	    XAA(WriteBitmap);
 	    pXAAinfo->FillImageWriteRectsFlags	=
 			    LEFT_EDGE_CLIPPING | NO_PLANEMASK |
 			    LEFT_EDGE_CLIPPING_NEGATIVE_X;
 	    XAA(FillImageWriteRects);
+	    pXAAinfo->WriteBitmapFlags = LEFT_EDGE_CLIPPING | NO_PLANEMASK |
+			    LEFT_EDGE_CLIPPING_NEGATIVE_X |
+			    BIT_ORDER_IN_BYTE_LSBFIRST;
+	    XAA(WriteBitmap);
 	    pXAAinfo->TEGlyphRendererFlags = LEFT_EDGE_CLIPPING | NO_PLANEMASK |
 			    LEFT_EDGE_CLIPPING_NEGATIVE_X;
 	    XAA(TEGlyphRenderer);
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c:1.12 xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c:1.14
--- xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c:1.12	Mon Feb 14 11:20:45 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c	Fri Jun 30 11:27:02 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.12 2000/02/14 19:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */
 
 
 #include "X.h"
@@ -11,11 +11,7 @@
 #include "servermd.h"
 #include "windowstr.h"
 #include "mfb.h"
-#include "compiler.h"
-#include "xf86.h"
 #include "mipointer.h"
-#include "xf86Priv.h"
-#include "xf86_ansic.h"
 
 #include "apm.h"
 
@@ -55,7 +51,15 @@
   }
 }
 
+void ApmHWCursorReserveSpace(ApmPtr pApm)
+{
+  pApm->OffscreenReserved	+= 2 * CURSORALIGN;
+  pApm->DisplayedCursorAddress	= pApm->BaseCursorAddress =
+  pApm->CursorAddress	= 1024 * xf86Screens[pApm->pScreen->myNum]->videoRam -
+					pApm->OffscreenReserved;
+}
 
+
 int ApmHWCursorInit(ScreenPtr pScreen)
 {
   ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
@@ -68,9 +72,6 @@
       return FALSE;
 
   pApm->CursorInfoRec		= infoPtr;
-  pApm->OffscreenReserved	+= 2 * CURSORALIGN;
-  pApm->DisplayedCursorAddress	= pApm->BaseCursorAddress =
-  pApm->CursorAddress	= 1024 * pScrn->videoRam - pApm->OffscreenReserved;
 
   infoPtr->MaxWidth	= CURSORWIDTH;
   infoPtr->MaxHeight	= CURSORHEIGHT;
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c:1.38 xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c:1.44
--- xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c:1.38	Wed Mar  8 11:25:09 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c	Fri Jun 30 11:34:18 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.38 2000/03/08 19:25:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.44 2000/06/30 18:34:18 dawes Exp $ */
 
 
 #include "apm.h"
@@ -7,9 +7,8 @@
 #include "xf86Resources.h"
 #include "xf86int10.h"
 #include "xf86RAC.h"
+#include "vbe.h"
 
-#include "compiler.h"
-
 #ifdef DPMSExtension
 #include "opaque.h"
 #include "extensions/dpms.h"
@@ -53,10 +52,12 @@
 					     int PowerManagementMode,
 					     int flags);
 #endif
+static void	ApmProbeDDC(ScrnInfoPtr pScrn, int index);
 
 
 int ApmPixmapIndex = -1;
 static int ApmGeneration = -1;
+static int pix24bpp = 0;
 
 DriverRec APM = {
 	VERSION,
@@ -199,6 +200,7 @@
     "cfb16ScreenInit",
     "cfb24ScreenInit",
     "cfb32ScreenInit",
+    "cfb24_32ScreenInit",
     NULL
 };
 
@@ -372,7 +374,6 @@
     int			numDevSections, numUsed, i;
     GDevPtr		*DevSections = NULL;
     int			*usedChips;
-    EntityInfoPtr	pEnt;
     int			foundScreen = FALSE;
 
     /*
@@ -399,25 +400,22 @@
 	if (flags & PROBE_DETECT)
 	    foundScreen = TRUE;
 	else for (i = 0; i < numUsed; i++) {
-	    pEnt = xf86GetEntityInfo(usedChips[i]);
-
-	    if (pEnt && pEnt->active) {
-		ScrnInfoPtr	pScrn;
-
-		/*
-		 * Allocate a ScrnInfoRec and claim the slot
-		 */
-		pScrn = xf86AllocateScreen(drv, 0);
-
+	    ScrnInfoPtr	pScrn;
+	    
+	    /*
+	     * Allocate a ScrnInfoRec and claim the slot
+	     */
+	    pScrn = NULL;
+	    if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
+						   ApmPciChipsets, NULL,
+						   NULL,NULL,NULL,NULL))){
+		
 		/*
 		 * Fill in what we can of the ScrnInfoRec
 		 */
 		ApmAssignFPtr(pScrn);
-		xf86ConfigActivePciEntity(pScrn, usedChips[i], ApmPciChipsets,
-					  NULL, NULL, NULL, NULL, NULL);
 		foundScreen = TRUE;
 	    }
-	    xfree(pEnt);
 	}
     }
 
@@ -429,21 +427,20 @@
 	if (flags & PROBE_DETECT)
 	    foundScreen = TRUE;
 	else for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
-
+	    ScrnInfoPtr pScrn = NULL;
+	    if ((pScrn = xf86ConfigIsaEntity(pScrn, 0, usedChips[i],
+					     ApmIsaChipsets, NULL, NULL, NULL,
+					     NULL, NULL))) {
 	    /*
 	     * Fill in what we can of the ScrnInfoRec
 	     */
 	    ApmAssignFPtr(pScrn);
 	    foundScreen = TRUE;
-	    xf86ConfigActiveIsaEntity(pScrn, usedChips[i], ApmIsaChipsets,
-				      NULL, NULL, NULL, NULL, NULL);
+	    }
 	}
     }
-#if 0	/* This causes problems with -configure? */
     if (DevSections)
 	xfree(DevSections);
-#endif
     return foundScreen;
 }
 
@@ -471,7 +468,7 @@
 ddc1Read(ScrnInfoPtr pScrn)
 {
     APMDECL(pScrn);
-    unsigned char tmp;
+    unsigned char	tmp;
 
     tmp = RDXB_IOP(0xD0);
     WRXB_IOP(0xD0, tmp & 0x07);
@@ -480,6 +477,19 @@
     return (STATUS_IOP() & STATUS_SDA) != 0;
 }
 
+extern xf86MonPtr ConfiguredMonitor;
+
+static void
+ApmProbeDDC(ScrnInfoPtr pScrn, int index)
+{
+    vbeInfoPtr pVbe;
+
+    if (xf86LoadSubModule(pScrn, "vbe")) {
+        pVbe = VBEInit(NULL, index);
+        ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
+    }
+}
+
 static Bool
 ApmPreInit(ScrnInfoPtr pScrn, int flags)
 {
@@ -492,8 +502,6 @@
     xf86MonPtr		MonInfo = NULL;
     double		real;
 
-    if (flags & PROBE_DETECT) return FALSE;
-
     /*
      * Note: This function is only called once at server startup, and
      * not at the start of each server generation.  This means that
@@ -507,6 +515,33 @@
      * AllocateScreenPrivateIndex() from the ScreenInit() function.
      */
 
+    /* Check the number of entities, and fail if it isn't one. */
+    if (pScrn->numEntities != 1)
+	return FALSE;
+
+    /* Allocate the ApmRec driverPrivate */
+    if (!ApmGetRec(pScrn)) {
+	return FALSE;
+    }
+    pApm = APMPTR(pScrn);
+
+    /* Get the entity */
+    pEnt = pApm->pEnt	= xf86GetEntityInfo(pScrn->entityList[0]);
+    if (pEnt->location.type == BUS_PCI) {
+	pApm->PciInfo	= xf86GetPciInfoForEntity(pEnt->index);
+	pApm->PciTag	= pciTag(pApm->PciInfo->bus, pApm->PciInfo->device,
+				 pApm->PciInfo->func);
+    }
+    else {
+	pApm->PciInfo	= NULL;
+	pApm->PciTag	= 0;
+    }
+
+    if (flags & PROBE_DETECT) {
+        ApmProbeDDC(pScrn, pEnt->index);
+        return TRUE;
+    }
+
     /* The vgahw module should be allocated here when needed */
     if (!xf86LoadSubModule(pScrn, "vgahw"))
 	return FALSE;
@@ -577,24 +612,6 @@
     /* We use a programamble clock */
     pScrn->progClock = TRUE;
 
-    /* Allocate the ApmRec driverPrivate */
-    if (!ApmGetRec(pScrn)) {
-	return FALSE;
-    }
-    pApm = APMPTR(pScrn);
-
-    /* Get the entity */
-    pEnt = pApm->pEnt	= xf86GetEntityInfo(pScrn->entityList[0]);
-    if (pEnt->location.type == BUS_PCI) {
-	pApm->PciInfo	= xf86GetPciInfoForEntity(pEnt->index);
-	pApm->PciTag	= pciTag(pApm->PciInfo->bus, pApm->PciInfo->device,
-				 pApm->PciInfo->func);
-    }
-    else {
-	pApm->PciInfo	= NULL;
-	pApm->PciTag	= 0;
-    }
-
     /* Collect all of the relevant option flags (fill in pScrn->options) */
     xf86CollectOptions(pScrn, NULL);
 
@@ -927,6 +944,23 @@
 		      return FALSE;
 	       }
 	       break;
+	  case AP6422:
+	       switch(pScrn->bitsPerPixel)
+	       {
+		 case 4:
+		 case 8:
+		      pApm->MaxClock = 135000;
+		      break;
+		 case 16:
+		      pApm->MaxClock = 75000;
+		      break;
+		 case 32:
+		      pApm->MaxClock = 60000;
+		      break;
+		 default:
+		      return FALSE;
+	       }
+	       break;
 	  default:
 	       pApm->MaxClock = 135000;
 	       break;
@@ -939,7 +973,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = (ClockRangePtr)xnfalloc(sizeof(ClockRange));
+    clockRanges = (ClockRangePtr)xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->minClock = pApm->MinClock;
     clockRanges->maxClock = pApm->MaxClock;
@@ -1019,8 +1053,13 @@
 	req = "cfb16ScreenInit";
 	break;
     case 24:
-	mod = "cfb24";
-	req = "cfb24ScreenInit";
+	if (pix24bpp == 24) {
+	    mod = "cfb24";
+	    req = "cfb24ScreenInit";
+	} else {
+	    mod = "xf24_32bpp";
+	    req = "cfb24_32ScreenInit";
+	}
 	break;
     case 32:
 	mod = "cfb32";
@@ -1062,8 +1101,8 @@
 	xf86LoaderReqSymLists(shadowSymbols, NULL);
     }
 
-    pApm->CurrentLayout.displayWidth	= pScrn->display->virtualX;
-    pApm->CurrentLayout.displayHeight	= pScrn->display->virtualY;
+    pApm->CurrentLayout.displayWidth	= pScrn->virtualX;
+    pApm->CurrentLayout.displayHeight	= pScrn->virtualY;
     pApm->CurrentLayout.bitsPerPixel	= pScrn->bitsPerPixel;
     pApm->CurrentLayout.bytesPerScanline= (pApm->CurrentLayout.displayWidth * pApm->CurrentLayout.bitsPerPixel) >> 3;
     pApm->CurrentLayout.depth		= pScrn->depth;
@@ -1817,6 +1856,10 @@
 	FbBase = pApm->FbBase;
     }
 
+    /* Reserve memory */
+    ApmHWCursorReserveSpace(pApm);
+    ApmAccelReserveSpace(pApm);
+
     switch (pScrn->bitsPerPixel) {
     case 1:
 	ret = xf1bppScreenInit(pScreen, FbBase,
@@ -1841,9 +1884,16 @@
 	    pScrn->displayWidth);
 	break;
     case 24:
-	ret = cfb24ScreenInit(pScreen, FbBase, pScrn->virtualX,
-	    pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
-	    pScrn->displayWidth);
+	if (pix24bpp == 24)
+	    ret = cfb24ScreenInit(pScreen, FbBase,
+			pScrn->virtualX, pScrn->virtualY,
+			pScrn->xDpi, pScrn->yDpi,
+			pScrn->displayWidth);
+	else
+	    ret = cfb24_32ScreenInit(pScreen, FbBase,
+			pScrn->virtualX, pScrn->virtualY,
+			pScrn->xDpi, pScrn->yDpi,
+			pScrn->displayWidth);
 	break;
     case 32:
 	ret = cfb32ScreenInit(pScreen, FbBase, pScrn->virtualX,
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c:1.12 xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c:1.13
--- xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c:1.12	Sat Feb 12 10:26:47 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c	Fri Jun 30 11:27:02 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.12 2000/02/12 18:26:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.13 2000/06/30 18:27:02 dawes Exp $ */
 
 #define FASTER
 #ifndef PSZ
@@ -1187,7 +1187,7 @@
        while (!(STATUS() & STATUS_HOSTBLTBUSY))
 	   ;
     }
-    while (again--);	/* See remarc in Sync6422 */
+    while (again--);	/* See remark in Sync6422 */
 }
 static void
 A(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c:1.4 xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c:1.4	Fri Feb 11 18:54:41 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c	Tue Apr  4 12:25:04 2000
@@ -1,10 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.4 2000/02/12 02:54:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.5 2000/04/04 19:25:04 dawes Exp $ */
 
-
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
-#include "compiler.h"
 
 #include "apm.h"
 #include "apm_regs.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c:1.7
--- xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c:1.6	Mon Feb 28 19:09:18 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c	Fri Jun 30 11:27:02 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.6 2000/02/29 03:09:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.7 2000/06/30 18:27:02 dawes Exp $ */
 
 #if PSZ != 24
 #include "dixstruct.h"
@@ -382,8 +382,8 @@
     if (dst->y2 - dst->y1 < *y2 - *y1)
 	dst->y2 = dst->y1 + *y2 - *y1;
 
-    *x1 <<= 16; *x2 <<= 16;
-    *y1 <<= 16; *y2 <<= 16;
+    *x1 <<= 12; *x2 <<= 16;
+    *y1 <<= 12; *y2 <<= 16;
 
     hscale = (*x2 - *x1) / (dst->x2 - dst->x1);
     vscale = (*y2 - *y1) / (dst->y2 - dst->y1);
@@ -412,11 +412,11 @@
     if (*x2 - *x1 == 0x10000 * (dst->x2 - dst->x1))	/* Shrinking */
 	*scalex = 0;
     else
-	*scalex = ((*x2 - *x1 - 0x1000) / (dst->x2 - dst->x1 - 1)) >> 4;
+	*scalex = ((*x2 - *x1) / (dst->x2 - dst->x1)) >> 4;
     if (*y2 - *y1 == 0x10000 * (dst->y2 - dst->y1))	/* Shrinking */
 	*scaley = 0;
     else
-	*scaley = ((*y2 - *y1 - 0x1000) / (dst->y2 - dst->y1 - 1)) >> 4;
+	*scaley = ((*y2 - *y1) / (dst->y2 - dst->y1)) >> 4;
 }
 #endif
 
@@ -570,8 +570,8 @@
     pPriv->drw_x = drw_x;
     pPriv->drw_y = drw_y;
     A(WaitForFifo)(pApm, 2);
-    WRXW(pPriv->reg + 0x06, 0xFFF - (((pPriv->scalex * pPriv->x10) & 0xFFF000) >> 12));
-    WRXW(pPriv->reg + 0x0A, 0xFFF - (((pPriv->scaley * pPriv->y1) & 0xFFF000) >> 12));
+    WRXW(pPriv->reg + 0x06, 0xFFF - ((pPriv->scalex * pPriv->x10) & 0xFFF));
+    WRXW(pPriv->reg + 0x0A, 0xFFF - ((pPriv->scaley * pPriv->y1) & 0xFFF));
     pPriv0 = (ApmPortPrivPtr)pApm->adaptor->pPortPrivates[0].ptr;
     pPriv1 = (ApmPortPrivPtr)pApm->adaptor->pPortPrivates[1].ptr;
     reg0 = &pPriv0->clip;
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile:1.13 xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile:1.15
--- xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile:1.13	Thu Mar  2 17:05:34 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile	Mon Jun 19 08:00:55 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v 1.13 2000/03/03 01:05:34 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v 1.15 2000/06/19 15:00:55 tsi Exp $
 XCOMM
 XCOMM Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
 XCOMM
@@ -34,14 +34,14 @@
 #endif
 
 SRCS = ati.c atiadapter.c atiadjust.c atibank.c atibios.c atibus.c atichip.c \
-       aticlock.c aticonsole.c atidac.c atidsp.c atiident.c atiio.c atilock.c \
-       atimach64.c $(ATIMODSRC) atioption.c atipreinit.c atiprint.c \
+       aticlock.c aticonsole.c atidac.c atidga.c atidsp.c atiident.c atiio.c \
+       atilock.c atimach64.c $(ATIMODSRC) atioption.c atipreinit.c atiprint.c \
        atiprobe.c atiscreen.c atiutil.c ativalid.c ativga.c atividmem.c \
        atiwonder.c
 
 OBJS = ati.o atiadapter.o atiadjust.o atibank.o atibios.o atibus.o atichip.o \
-       aticlock.o aticonsole.o atidac.o atidsp.o atiident.o atiio.o atilock.o \
-       atimach64.o $(ATIMODOBJ) atioption.o atipreinit.o atiprint.o \
+       aticlock.o aticonsole.o atidac.o atidga.o atidsp.o atiident.o atiio.o \
+       atilock.o atimach64.o $(ATIMODOBJ) atioption.o atipreinit.o atiprint.o \
        atiprobe.o atiscreen.o atiutil.o ativalid.o ativga.o atividmem.o \
        atiwonder.o
 
@@ -49,11 +49,13 @@
 INCLUDES = -I. -I../../include
 #else
 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86SRC) \
-           -I$(XF86SRC)/rac -I$(XF86SRC)/shadowfb -I$(XF86SRC)/xaa \
+           -I$(XF86OSSRC)/vbe -I$(XF86SRC)/int10 \
+           -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(XF86SRC)/rac \
+           -I$(XF86SRC)/shadowfb -I$(XF86SRC)/xaa \
            -I$(XF86SRC)/xf4bpp -I$(XF86SRC)/xf1bpp \
            -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb \
            -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \
-           -I$(XINCLUDESRC) -I$(FONTINCSRC)
+           -I$(SERVERSRC)/Xext -I$(XINCLUDESRC) -I$(FONTINCSRC)
 #endif
 
 #if MakeHasPosixVariableSubstitutions
@@ -95,6 +97,8 @@
 InstallDriverSDKNonExecFile(aticrtc.h,$(DRIVERSDKDIR)/drivers/ati)
 InstallDriverSDKNonExecFile(atidac.c,$(DRIVERSDKDIR)/drivers/ati)
 InstallDriverSDKNonExecFile(atidac.h,$(DRIVERSDKDIR)/drivers/ati)
+InstallDriverSDKNonExecFile(atidga.c,$(DRIVERSDKDIR)/drivers/ati)
+InstallDriverSDKNonExecFile(atidga.h,$(DRIVERSDKDIR)/drivers/ati)
 InstallDriverSDKNonExecFile(atidsp.c,$(DRIVERSDKDIR)/drivers/ati)
 InstallDriverSDKNonExecFile(atidsp.h,$(DRIVERSDKDIR)/drivers/ati)
 InstallDriverSDKNonExecFile(atiident.c,$(DRIVERSDKDIR)/drivers/ati)
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c:1.9 xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c:1.9	Fri Feb 18 04:19:10 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c	Thu May 11 11:14:29 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c,v 1.9 2000/02/18 12:19:10 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c,v 1.12 2000/05/11 18:14:29 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -35,7 +35,7 @@
  * Thomas Roell, roell@informatik.tu-muenchen.de
  * Per Lindqvist, pgd@compuram.bbt.se
  * Doug Evans, dje@cygnus.com
- * Rik Faith, faith@cs.unc.edu
+ * Rik Faith, faith@precisioninsight.com
  * Arthur Tateishi, ruhtra@turing.toronto.edu
  * Alain Hebert, aal@broue.rot.qc.ca
  * Ton van Rosmalen, ton@stack.urc.tue.nl
@@ -54,10 +54,12 @@
  * James Fast Kane, jfk2@engr.uark.edu
  * Randall Hopper, rhh@ct.picker.com
  * W. Marcus Miller, marcus@llnl.gov
- * Henrik Harmsen, ervhch@erv.ericsson.se (ShadowFB support)
- * Christian Lupien <lupien@physics.utoronto.ca>
+ * Henrik Harmsen, ervhch@erv.ericsson.se
+ * Christian Lupien, lupien@physics.utoronto.ca
  * Precision Insight Incorporated
  * Mark Vojkovich, mvojkovich@valinux.com
+ * Huw D M Davies, h.davies1@physics.ox.ac.uk
+ * Andrew C Aitchison, A.C.Aitchison@dpmms.cam.ac.uk
  *
  * ... and, many, many others from around the world.
  *
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/ati.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/ati/ati.cpp:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/ati/ati.cpp:1.1	Thu Mar  2 17:05:34 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/ati.cpp	Mon Jun 19 08:00:55 2000
@@ -1,19 +1,19 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.cpp,v 1.1 2000/03/03 01:05:34 dawes Exp $ 
-.TH ATI __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.cpp,v 1.5 2000/06/19 15:00:55 tsi Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH ATI __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 ati \- ATI video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""ati"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qati\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
-.B ati 
+.B ati
 is an XFree86 driver for ATI video cards.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c:1.5 xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c:1.5	Fri Feb 18 04:19:11 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c	Mon Jun 19 08:00:55 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c,v 1.5 2000/02/18 12:19:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c,v 1.12 2000/06/19 15:00:55 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -75,7 +75,7 @@
     for (iBank = 0;  iBank < pATIHW->nBank;  iBank++)
     {
         (*pATIHW->SetBank)(pATI, iBank);
-        (void) memcpy(*to, *from, 0x00010000U);
+        (void)memcpy(*to, *from, 0x00010000U);
         *saveptr = (char *)(*saveptr) + 0x00010000U;
     }
 }
@@ -260,27 +260,36 @@
 )
 {
     CARD32 lcd_index;
+    int HDisplay, VDisplay;
 
     if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
     {
         /* Fill in VGA data */
-        ATIVGAPreInit(pScreenInfo, pATI, pATIHW);
+        ATIVGAPreInit(pATI, pATIHW);
 
         /* Fill in VGA Wonder data */
         if (pATI->CPIO_VGAWonder)
-            ATIVGAWonderPreInit(pScreenInfo, pATI, pATIHW);
+            ATIVGAWonderPreInit(pATI, pATIHW);
     }
 
     /* Fill in Mach64 data */
     if (pATI->Chip >= ATI_CHIP_88800GXC)
         ATIMach64PreInit(pScreenInfo, pATI, pATIHW);
 
-    /* Ensure proper VCLK source */
     if (pATI->Chip >= ATI_CHIP_264CT)
     {
+        /* Ensure proper VCLK source */
         pATIHW->pll_vclk_cntl = ATIGetMach64PLLReg(PLL_VCLK_CNTL) |
             (PLL_VCLK_SRC_SEL | PLL_VCLK_RESET);
 
+        /* Set provisional values for other PLL registers */
+        pATIHW->pll_vclk_post_div = ATIGetMach64PLLReg(PLL_VCLK_POST_DIV);
+        pATIHW->pll_vclk0_fb_div = ATIGetMach64PLLReg(PLL_VCLK0_FB_DIV);
+        pATIHW->pll_vclk1_fb_div = ATIGetMach64PLLReg(PLL_VCLK1_FB_DIV);
+        pATIHW->pll_vclk2_fb_div = ATIGetMach64PLLReg(PLL_VCLK2_FB_DIV);
+        pATIHW->pll_vclk3_fb_div = ATIGetMach64PLLReg(PLL_VCLK3_FB_DIV);
+        pATIHW->pll_xclk_cntl = ATIGetMach64PLLReg(PLL_XCLK_CNTL);
+
         /* For now disable extended reference and feedback dividers */
         if (pATI->Chip >= ATI_CHIP_264LT)
             pATIHW->pll_ext_vpll_cntl = ATIGetMach64PLLReg(PLL_EXT_VPLL_CNTL) &
@@ -313,9 +322,9 @@
         }
 
         pATIHW->lcd_gen_ctrl &=
-            ~(CRT_ON | LCD_ON | HORZ_DIVBY2_EN | DISABLE_PCLK_RESET |
-              DIS_HOR_CRT_DIVBY2 | VCLK_DAC_PM_EN | XTALIN_PM_EN |
-              CRTC_RW_SELECT | USE_SHADOWED_VEND | USE_SHADOWED_ROWCUR |
+            ~(HORZ_DIVBY2_EN | DISABLE_PCLK_RESET | DIS_HOR_CRT_DIVBY2 |
+              VCLK_DAC_PM_EN | XTALIN_PM_EN | CRTC_RW_SELECT |
+              USE_SHADOWED_VEND | USE_SHADOWED_ROWCUR |
               SHADOW_EN | SHADOW_RW_EN);
         pATIHW->lcd_gen_ctrl |= DONT_SHADOW_VPAR | LOCK_8DOT;
 
@@ -324,132 +333,114 @@
             /*
              * Use primary CRTC to drive the CRT.  Turn off panel interface.
              */
+            pATIHW->lcd_gen_ctrl &= ~LCD_ON;
             pATIHW->lcd_gen_ctrl |= CRT_ON;
         }
         else
         {
-            /*
-             * Use primary CRTC to drive the panel.  Turn off CRT interface.
-             */
+            /* Use primary CRTC to drive the panel */
             pATIHW->lcd_gen_ctrl |= LCD_ON;
 
-            if (!pATI->OptionSync)
+            /*
+             * Determine porch data.  The following is inaccurate (but still
+             * good enough) when BIOS initialisation has set things up so that
+             * the registers read here are not the ones actually in use by the
+             * panel.
+             */
+            if (inl(pATI->CPIO_CRTC_GEN_CNTL) & CRTC_EXT_DISP_EN)
             {
-                int HDisplay, VDisplay;
-
-                /*
-                 * XXX
-                 *
-                 * Determine porch data.  This is ugly and will be removed when
-                 * a more panel-friendly mode validation scheme is finalised.
-                 * The intent here is to produce stretched modes that
-                 * approximate the horizontal sync and vertical refresh rates
-                 * of the mode on server entry (which, BTW, hasn't been saved
-                 * yet).  The following is inaccurate (but still good enough)
-                 * when BIOS initialisation has set things up so that the
-                 * registers read here are not the ones actually in use by the
-                 * panel.
-                 */
-                if (inl(pATI->CPIO_CRTC_GEN_CNTL) & CRTC_EXT_DISP_EN)
-                {
-                    pATIHW->crtc_h_total_disp =
-                        inl(pATI->CPIO_CRTC_H_TOTAL_DISP);
-                    pATIHW->crtc_h_sync_strt_wid =
-                        inl(pATI->CPIO_CRTC_H_SYNC_STRT_WID);
-                    pATIHW->crtc_v_total_disp =
-                        inl(pATI->CPIO_CRTC_V_TOTAL_DISP);
-                    pATIHW->crtc_v_sync_strt_wid =
-                        inl(pATI->CPIO_CRTC_V_SYNC_STRT_WID);
-
-                    HDisplay = GetBits(pATIHW->crtc_h_total_disp, CRTC_H_DISP);
-                    VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP);
-
-                    pATI->LCDHSyncStart =
-                        (GetBits(pATIHW->crtc_h_sync_strt_wid,
-                                 CRTC_H_SYNC_STRT_HI) *
-                         (MaxBits(CRTC_H_SYNC_STRT) + 1)) +
-                        GetBits(pATIHW->crtc_h_sync_strt_wid,
-                         CRTC_H_SYNC_STRT) -
-                        HDisplay;
-                    pATI->LCDHSyncWidth =
-                        GetBits(pATIHW->crtc_h_sync_strt_wid, CRTC_H_SYNC_WID);
-                    pATI->LCDHBlankWidth =
-                        GetBits(pATIHW->crtc_h_total_disp, CRTC_H_TOTAL) -
-                        HDisplay;
-                    pATI->LCDVSyncStart =
-                        GetBits(pATIHW->crtc_v_sync_strt_wid,
-                         CRTC_V_SYNC_STRT) -
-                        VDisplay;
-                    pATI->LCDVSyncWidth =
-                        GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID);
-                    pATI->LCDVBlankWidth =
-                        GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL) -
-                        VDisplay;
-                }
-                else
-                {
-                    pATIHW->crt[0] = GetReg(CRTX(pATI->CPIO_VGABase), 0x00U);
-                    pATIHW->crt[1] = GetReg(CRTX(pATI->CPIO_VGABase), 0x01U);
-                    pATIHW->crt[4] = GetReg(CRTX(pATI->CPIO_VGABase), 0x04U);
-                    pATIHW->crt[5] = GetReg(CRTX(pATI->CPIO_VGABase), 0x05U);
-                    pATIHW->crt[6] = GetReg(CRTX(pATI->CPIO_VGABase), 0x06U);
-                    pATIHW->crt[7] = GetReg(CRTX(pATI->CPIO_VGABase), 0x07U);
-                    pATIHW->crt[16] = GetReg(CRTX(pATI->CPIO_VGABase), 0x10U);
-                    pATIHW->crt[17] = GetReg(CRTX(pATI->CPIO_VGABase), 0x11U);
-                    pATIHW->crt[18] = GetReg(CRTX(pATI->CPIO_VGABase), 0x12U);
-
-                    HDisplay = pATIHW->crt[1] + 1;
-                    VDisplay = (((pATIHW->crt[7] << 3) & 0x0200U) |
-                                ((pATIHW->crt[7] << 7) & 0x0100U) |
-                                pATIHW->crt[18]) + 1;
-
-                    pATI->LCDHSyncStart = pATIHW->crt[4] - HDisplay;
-                    pATI->LCDHSyncWidth =
-                        (pATIHW->crt[5] - pATIHW->crt[4]) & 0x1FU;
-                    pATI->LCDHBlankWidth = pATIHW->crt[0] + 5 - HDisplay;
-                    pATI->LCDVSyncStart = (((pATIHW->crt[7] << 2) & 0x0200U) |
-                                           ((pATIHW->crt[7] << 6) & 0x0100U) |
-                                           pATIHW->crt[16]) - VDisplay;
-                    pATI->LCDVSyncWidth =
-                        (pATIHW->crt[17] - pATIHW->crt[16]) & 0x0FU;
-                    pATI->LCDVBlankWidth = (((pATIHW->crt[7] << 4) & 0x0200U) |
-                                            ((pATIHW->crt[7] << 8) & 0x0100U) |
-                                            pATIHW->crt[6]) + 2 - VDisplay;
-                }
+                pATIHW->crtc_h_total_disp =
+                    inl(pATI->CPIO_CRTC_H_TOTAL_DISP);
+                pATIHW->crtc_h_sync_strt_wid =
+                    inl(pATI->CPIO_CRTC_H_SYNC_STRT_WID);
+                pATIHW->crtc_v_total_disp =
+                    inl(pATI->CPIO_CRTC_V_TOTAL_DISP);
+                pATIHW->crtc_v_sync_strt_wid =
+                    inl(pATI->CPIO_CRTC_V_SYNC_STRT_WID);
+
+                HDisplay = GetBits(pATIHW->crtc_h_total_disp, CRTC_H_DISP);
+                VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP);
+
+                pATI->LCDHSyncStart =
+                    (GetBits(pATIHW->crtc_h_sync_strt_wid,
+                             CRTC_H_SYNC_STRT_HI) *
+                     (MaxBits(CRTC_H_SYNC_STRT) + 1)) +
+                    GetBits(pATIHW->crtc_h_sync_strt_wid, CRTC_H_SYNC_STRT) -
+                    HDisplay;
+                pATI->LCDHSyncWidth =
+                    GetBits(pATIHW->crtc_h_sync_strt_wid, CRTC_H_SYNC_WID);
+                pATI->LCDHBlankWidth =
+                    GetBits(pATIHW->crtc_h_total_disp, CRTC_H_TOTAL) - HDisplay;
+                pATI->LCDVSyncStart =
+                    GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT) -
+                    VDisplay;
+                pATI->LCDVSyncWidth =
+                    GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID);
+                pATI->LCDVBlankWidth =
+                    GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL) - VDisplay;
+            }
+            else
+            {
+                pATIHW->crt[0] = GetReg(CRTX(pATI->CPIO_VGABase), 0x00U);
+                pATIHW->crt[1] = GetReg(CRTX(pATI->CPIO_VGABase), 0x01U);
+                pATIHW->crt[4] = GetReg(CRTX(pATI->CPIO_VGABase), 0x04U);
+                pATIHW->crt[5] = GetReg(CRTX(pATI->CPIO_VGABase), 0x05U);
+                pATIHW->crt[6] = GetReg(CRTX(pATI->CPIO_VGABase), 0x06U);
+                pATIHW->crt[7] = GetReg(CRTX(pATI->CPIO_VGABase), 0x07U);
+                pATIHW->crt[16] = GetReg(CRTX(pATI->CPIO_VGABase), 0x10U);
+                pATIHW->crt[17] = GetReg(CRTX(pATI->CPIO_VGABase), 0x11U);
+                pATIHW->crt[18] = GetReg(CRTX(pATI->CPIO_VGABase), 0x12U);
+
+                HDisplay = pATIHW->crt[1] + 1;
+                VDisplay = (((pATIHW->crt[7] << 3) & 0x0200U) |
+                            ((pATIHW->crt[7] << 7) & 0x0100U) |
+                            pATIHW->crt[18]) + 1;
+
+                pATI->LCDHSyncStart = pATIHW->crt[4] - HDisplay;
+                pATI->LCDHSyncWidth = (pATIHW->crt[5] - pATIHW->crt[4]) & 0x1FU;
+                pATI->LCDHBlankWidth = pATIHW->crt[0] + 5 - HDisplay;
+                pATI->LCDVSyncStart = (((pATIHW->crt[7] << 2) & 0x0200U) |
+                                       ((pATIHW->crt[7] << 6) & 0x0100U) |
+                                       pATIHW->crt[16]) - VDisplay;
+                pATI->LCDVSyncWidth =
+                    (pATIHW->crt[17] - pATIHW->crt[16]) & 0x0FU;
+                pATI->LCDVBlankWidth = (((pATIHW->crt[7] << 4) & 0x0200U) |
+                                        ((pATIHW->crt[7] << 8) & 0x0100U) |
+                                        pATIHW->crt[6]) + 2 - VDisplay;
+            }
 
-                HDisplay <<= 3;
-                pATI->LCDHSyncStart <<= 3;
-                pATI->LCDHSyncWidth <<= 3;
-                pATI->LCDHBlankWidth <<= 3;
-
-                /* If the mode on entry wasn't stretched, adjust timings */
-                if (!(pATIHW->horz_stretching & HORZ_STRETCH_EN) &&
-                    ((HDisplay = pATI->LCDHorizontal - HDisplay) > 0))
-                {
-                    if ((pATI->LCDHSyncStart -= HDisplay) < 0)
-                        pATI->LCDHSyncStart = 0;
-                    pATI->LCDHBlankWidth -= HDisplay;
-                    HDisplay = pATI->LCDHSyncStart + pATI->LCDHSyncWidth;
-                    if (pATI->LCDHBlankWidth < HDisplay)
-                        pATI->LCDHBlankWidth = HDisplay;
-                }
+            HDisplay <<= 3;
+            pATI->LCDHSyncStart <<= 3;
+            pATI->LCDHSyncWidth <<= 3;
+            pATI->LCDHBlankWidth <<= 3;
+
+            /* If the mode on entry wasn't stretched, adjust timings */
+            if (!(pATIHW->horz_stretching & HORZ_STRETCH_EN) &&
+                ((HDisplay = pATI->LCDHorizontal - HDisplay) > 0))
+            {
+                if ((pATI->LCDHSyncStart -= HDisplay) < 0)
+                    pATI->LCDHSyncStart = 0;
+                pATI->LCDHBlankWidth -= HDisplay;
+                HDisplay = pATI->LCDHSyncStart + pATI->LCDHSyncWidth;
+                if (pATI->LCDHBlankWidth < HDisplay)
+                    pATI->LCDHBlankWidth = HDisplay;
+            }
 
-                if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) &&
-                    ((VDisplay = pATI->LCDVertical - VDisplay) > 0))
-                {
-                    if ((pATI->LCDVSyncStart -= VDisplay) < 0)
-                        pATI->LCDVSyncStart = 0;
-                    pATI->LCDVBlankWidth -= VDisplay;
-                    VDisplay = pATI->LCDVSyncStart + pATI->LCDVSyncWidth;
-                    if (pATI->LCDVBlankWidth < VDisplay)
-                        pATI->LCDVBlankWidth = VDisplay;
-                }
+            if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) &&
+                ((VDisplay = pATI->LCDVertical - VDisplay) > 0))
+            {
+                if ((pATI->LCDVSyncStart -= VDisplay) < 0)
+                    pATI->LCDVSyncStart = 0;
+                pATI->LCDVBlankWidth -= VDisplay;
+                VDisplay = pATI->LCDVSyncStart + pATI->LCDVSyncWidth;
+                if (pATI->LCDVBlankWidth < VDisplay)
+                    pATI->LCDVBlankWidth = VDisplay;
             }
         }
     }
 
     /* Set RAMDAC data */
-    ATIDACPreInit(pScreenInfo, pATIHW);
+    ATIDACPreInit(pScreenInfo, pATI, pATIHW);
 }
 
 /*
@@ -477,6 +468,12 @@
     {
         pATIHW->pll_vclk_cntl = ATIGetMach64PLLReg(PLL_VCLK_CNTL) |
             PLL_VCLK_RESET;
+        pATIHW->pll_vclk_post_div = ATIGetMach64PLLReg(PLL_VCLK_POST_DIV);
+        pATIHW->pll_vclk0_fb_div = ATIGetMach64PLLReg(PLL_VCLK0_FB_DIV);
+        pATIHW->pll_vclk1_fb_div = ATIGetMach64PLLReg(PLL_VCLK1_FB_DIV);
+        pATIHW->pll_vclk2_fb_div = ATIGetMach64PLLReg(PLL_VCLK2_FB_DIV);
+        pATIHW->pll_vclk3_fb_div = ATIGetMach64PLLReg(PLL_VCLK3_FB_DIV);
+        pATIHW->pll_xclk_cntl = ATIGetMach64PLLReg(PLL_XCLK_CNTL);
         if (pATI->Chip >= ATI_CHIP_264LT)
             pATIHW->pll_ext_vpll_cntl = ATIGetMach64PLLReg(PLL_EXT_VPLL_CNTL);
     }
@@ -616,14 +613,16 @@
 )
 {
     CARD32 lcd_index;
-    int Index;
+    int Index, ECPClock;
 
     /* Clobber mode timings */
-    if ((pATI->LCDPanelID >= 0) && !pATI->OptionCRT && !pATI->OptionSync &&
-        !pMode->CrtcHAdjusted && !pMode->CrtcVAdjusted)
+    if ((pATI->LCDPanelID >= 0) && !pATI->OptionCRT &&
+        !pMode->CrtcHAdjusted && !pMode->CrtcVAdjusted &&
+        (!pATI->OptionSync || (pMode->type & M_T_BUILTIN)))
     {
         int VScan;
 
+        pMode->Clock = pATI->LCDClock;
         pMode->Flags &= ~(V_DBLSCAN | V_INTERLACE | V_CLKDIV2);
 
         /*
@@ -671,7 +670,7 @@
 
             /* Fill in VGA Wonder data */
             if (pATI->CPIO_VGAWonder)
-                ATIVGAWonderCalculate(pScreenInfo, pATI, pATIHW, pMode);
+                ATIVGAWonderCalculate(pATI, pATIHW, pMode);
 
             if (pATI->Chip >= ATI_CHIP_88800GXC)
             {
@@ -721,7 +720,7 @@
                     pATIHW->crtc_gen_cntl |= CRTC_INTERLACE_EN;
                 if ((pMode->Flags & (V_CSYNC | V_PCSYNC)) || pATI->OptionCSync)
                     pATIHW->crtc_gen_cntl |= CRTC_CSYNC_EN;
-                if (pScreenInfo->depth <= 4)
+                if (pATI->depth <= 4)
                     pATIHW->crtc_gen_cntl |= CRTC_EN | CRTC_CNT_EN;
                 else
                     pATIHW->crtc_gen_cntl |=
@@ -731,7 +730,7 @@
 
         case ATI_CRTC_MACH64:
             /* Fill in Mach64 data */
-            ATIMach64Calculate(pScreenInfo, pATI, pATIHW, pMode);
+            ATIMach64Calculate(pATI, pATIHW, pMode);
             break;
 
         default:
@@ -806,7 +805,21 @@
     }
 
     /* Fill in clock data */
-    return ATIClockCalculate(pScreenInfo, pATI, pATIHW, pMode);
+    if (!ATIClockCalculate(pScreenInfo, pATI, pATIHW, pMode))
+        return FALSE;
+
+    /* Setup ECP clock divider */
+    if (pATI->Chip >= ATI_CHIP_264VT)
+    {
+        pATIHW->pll_vclk_cntl &= ~PLL_ECP_DIV;
+        /* XXX Don't do this for TVOut! */
+        ECPClock = pMode->SynthClock;
+        for (Index = 0;  (ECPClock > 125000) && (Index < 2);  Index++)
+            ECPClock >>= 1;
+        pATIHW->pll_vclk_cntl |= SetBits(Index, PLL_ECP_DIV);
+    }
+
+    return TRUE;
 }
 
 /*
@@ -831,10 +844,16 @@
     if (pATI->Chip >= ATI_CHIP_264CT)
     {
         ATIPutMach64PLLReg(PLL_VCLK_CNTL, pATIHW->pll_vclk_cntl);
-        ATIPutMach64PLLReg(PLL_VCLK_CNTL,
-            pATIHW->pll_vclk_cntl & ~PLL_VCLK_RESET);
+        ATIPutMach64PLLReg(PLL_VCLK_POST_DIV, pATIHW->pll_vclk_post_div);
+        ATIPutMach64PLLReg(PLL_VCLK0_FB_DIV, pATIHW->pll_vclk0_fb_div);
+        ATIPutMach64PLLReg(PLL_VCLK1_FB_DIV, pATIHW->pll_vclk1_fb_div);
+        ATIPutMach64PLLReg(PLL_VCLK2_FB_DIV, pATIHW->pll_vclk2_fb_div);
+        ATIPutMach64PLLReg(PLL_VCLK3_FB_DIV, pATIHW->pll_vclk3_fb_div);
+        ATIPutMach64PLLReg(PLL_XCLK_CNTL, pATIHW->pll_xclk_cntl);
         if (pATI->Chip >= ATI_CHIP_264LT)
             ATIPutMach64PLLReg(PLL_EXT_VPLL_CNTL, pATIHW->pll_ext_vpll_cntl);
+        ATIPutMach64PLLReg(PLL_VCLK_CNTL,
+            pATIHW->pll_vclk_cntl & ~PLL_VCLK_RESET);
     }
 
     /* Load LCD registers */
@@ -1059,7 +1078,7 @@
     switch (pATI->Adapter)
     {
         case ATI_ADAPTER_MACH64:
-            if (ATIMach64AccelInit(pScreenInfo, pScreen, pATI, pATI->pXAAInfo))
+            if (ATIMach64AccelInit(pATI, pATI->pXAAInfo))
                 break;
 
         default:
@@ -1069,9 +1088,11 @@
     }
 
     ScreenArea.x1 = ScreenArea.y1 = 0;
-    ScreenArea.x2 = pScreenInfo->displayWidth;
-    ScreenArea.y2 = pScreenInfo->videoRam * 1024 * 8 /
-        pScreenInfo->displayWidth / pScreenInfo->bitsPerPixel;
+    ScreenArea.x2 = pATI->displayWidth;
+    ScreenArea.y2 = pScreenInfo->videoRam * 1024 * 8 / pATI->displayWidth /
+        pATI->bitsPerPixel;
+    if ((unsigned)ScreenArea.y2 > ATIMach64MaxY)
+        ScreenArea.y2 = ATIMach64MaxY;
     xf86InitFBManager(pScreen, &ScreenArea);
 
     if (XAAInit(pScreen, pATI->pXAAInfo))
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c:1.5 xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c:1.5	Fri Feb 18 04:19:12 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c	Mon Jun 19 08:00:55 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c,v 1.5 2000/02/18 12:19:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c,v 1.6 2000/06/19 15:00:55 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -45,26 +45,23 @@
 void
 ATIAdjustPreInit
 (
-    ScrnInfoPtr pScreenInfo,
     ATIPtr      pATI
 )
 {
-    DisplayModePtr pMode;
-    unsigned long  MaxBase = 0;
-    int            MinX, MinY;
+    unsigned long MaxBase;
 
     if ((pATI->CPIO_VGAWonder) &&
         (pATI->Chip <= ATI_CHIP_18800_1) &&
         (pATI->VideoRAM == 256) &&
-        (pScreenInfo->depth >= 8))
+        (pATI->depth >= 8))
     {
         /* Strange, to say the least ... */
-        pATI->AdjustDepth = (pScreenInfo->bitsPerPixel + 3) >> 2;
+        pATI->AdjustDepth = (pATI->bitsPerPixel + 3) >> 2;
         pATI->AdjustMask = (unsigned long)(-32);
     }
     else
     {
-        pATI->AdjustDepth = (pScreenInfo->bitsPerPixel + 7) >> 3;
+        pATI->AdjustDepth = (pATI->bitsPerPixel + 7) >> 3;
 
         pATI->AdjustMask = 64;
         while (pATI->AdjustMask % (unsigned long)(pATI->AdjustDepth))
@@ -79,49 +76,32 @@
         case ATI_CRTC_VGA:
             if (pATI->Chip >= ATI_CHIP_264CT)
             {
-                MaxBase = MaxBits(CRTC_OFFSET_VGA) << 2;
-                if (pScreenInfo->depth <= 4)
-                    MaxBase <<= 1;
+                pATI->AdjustMaxBase = MaxBits(CRTC_OFFSET_VGA) << 2;
+                if (pATI->depth <= 4)
+                    pATI->AdjustMaxBase <<= 1;
             }
             else if (!pATI->CPIO_VGAWonder)
-                MaxBase = 0xFFFFU << 3;
+                pATI->AdjustMaxBase = 0xFFFFU << 3;
             else if (pATI->Chip <= ATI_CHIP_28800_6)
-                MaxBase = 0x03FFFFU << 3;
+                pATI->AdjustMaxBase = 0x03FFFFU << 3;
             else /* Mach32 & Mach64 */
-                MaxBase = 0x0FFFFFU << 3;
+                pATI->AdjustMaxBase = 0x0FFFFFU << 3;
             break;
 
         case ATI_CRTC_MACH64:
-            MaxBase = MaxBits(CRTC_OFFSET) << 3;
+            pATI->AdjustMaxBase = MaxBits(CRTC_OFFSET) << 3;
             break;
-    }
 
-    MaxBase = (MaxBase / (unsigned long)pATI->AdjustDepth) | ~pATI->AdjustMask;
+        default:
+            pATI->AdjustMaxBase = 0;
+            break;
+    }
 
-    pATI->AdjustMaxX = MaxBase % pScreenInfo->displayWidth;
-    pATI->AdjustMaxY = MaxBase / pScreenInfo->displayWidth;
+    MaxBase = (pATI->AdjustMaxBase / (unsigned long)pATI->AdjustDepth) |
+        ~pATI->AdjustMask;
 
-    /*
-     * Warn about modes that are too small, or not aligned, to scroll to the
-     * bottom right corner of the virtual screen.
-     */
-    MinX = pScreenInfo->virtualX - pATI->AdjustMaxX;
-    MinY = pScreenInfo->virtualY - pATI->AdjustMaxY;
-
-    pMode = pScreenInfo->modes;
-    do
-    {
-        if ((pMode->VDisplay <= MinY) &&
-            ((pMode->VDisplay < MinY) || (pMode->HDisplay < MinX)))
-            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-                "Mode \"%s\" too small to scroll to bottom right corner of"
-                " virtual resolution.\n", pMode->name);
-        else if ((pMode->HDisplay & ~pATI->AdjustMask) / pScreenInfo->xInc)
-            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-                "Mode \"%s\" cannot scroll to bottom right corner of virtual"
-                " resolution.\n Horizontal dimension not a multiple of %d.\n",
-                pMode->name, ~pATI->AdjustMask + 1);
-    } while ((pMode = pMode->next) != pScreenInfo->modes);
+    pATI->AdjustMaxX = MaxBase % pATI->displayWidth;
+    pATI->AdjustMaxY = MaxBase / pATI->displayWidth;
 }
 
 /*
@@ -155,7 +135,7 @@
             y--;
     }
 
-    Base = ((((y * pScreenInfo->displayWidth) + x) & pATI->AdjustMask) *
+    Base = ((((y * pATI->displayWidth) + x) & pATI->AdjustMask) *
             pATI->AdjustDepth) >> 3;
 
     /* Unlock registers */
@@ -193,10 +173,10 @@
          * setting the CRTC's offset register to more than 256k needs to be
          * done through the accelerator port.
          */
-        if (pScreenInfo->depth <= 4)
+        if (pATI->depth <= 4)
         {
             outl(pATI->CPIO_CRTC_OFF_PITCH,
-                SetBits(pScreenInfo->displayWidth >> 4, CRTC_PITCH) |
+                SetBits(pATI->displayWidth >> 4, CRTC_PITCH) |
                     SetBits(Base, CRTC_OFFSET));
         }
         else
@@ -204,7 +184,7 @@
             if (pATI->NewHW.crtc == ATI_CRTC_VGA)
                 Base <<= 1;                     /* LSBit must be zero */
             outl(pATI->CPIO_CRTC_OFF_PITCH,
-                SetBits(pScreenInfo->displayWidth >> 3, CRTC_PITCH) |
+                SetBits(pATI->displayWidth >> 3, CRTC_PITCH) |
                     SetBits(Base, CRTC_OFFSET));
         }
     }
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.h:1.4 xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.h:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.h:1.4	Fri Feb 18 04:19:12 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.h	Mon Jun 19 08:00:55 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.h,v 1.4 2000/02/18 12:19:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.h,v 1.5 2000/06/19 15:00:55 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -26,9 +26,8 @@
 
 #include "atipriv.h"
 #include "atiproto.h"
-#include "xf86str.h"
 
-extern void ATIAdjustPreInit FunctionPrototype((ScrnInfoPtr, ATIPtr));
+extern void ATIAdjustPreInit FunctionPrototype((ATIPtr));
 extern void ATIAdjustFrame   FunctionPrototype((int, int, int, int));
 
 #endif /* ___ATIADJUST_H___ */
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.c:1.5 xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.c:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.c:1.5	Fri Feb 18 04:19:13 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.c	Tue Mar 21 19:08:09 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.c,v 1.5 2000/02/18 12:19:13 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.c,v 1.6 2000/03/22 03:08:09 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -197,7 +197,7 @@
     unsigned int iBank
 )
 {
-    (void) ATIV4V5SetRead(pScreen, iBank);
+    (void)ATIV4V5SetRead(pScreen, iBank);
     ATIModifyExtReg(ATIPTR(XF86SCRNINFO(pScreen)), 0xAEU, -1, (CARD8)(~0x0CU),
         SetBits(GetBits(iBank, 0x30U), 0x0CU));
     return 0;
@@ -215,7 +215,7 @@
     unsigned int iBank
 )
 {
-    (void) ATIV4V5SetWrite(pScreen, iBank);
+    (void)ATIV4V5SetWrite(pScreen, iBank);
     ATIModifyExtReg(ATIPTR(XF86SCRNINFO(pScreen)), 0xAEU, -1, (CARD8)(~0x03U),
         SetBits(GetBits(iBank, 0x30U), 0x03U));
     return 0;
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.c:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.c:1.6	Fri Feb 18 04:19:14 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.c	Tue May  2 17:44:03 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.c,v 1.6 2000/02/18 12:19:14 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.c,v 1.8 2000/05/03 00:44:03 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -21,13 +21,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "ati.h"
 #include "atiadapter.h"
 #include "atibus.h"
 #include "atichip.h"
 #include "atiio.h"
 #include "ativersion.h"
-#include "xf86Resources.h"
-#include "xf86.h"
 
 /*
  * Definitions related to an adapter's system bus interface.
@@ -93,6 +92,9 @@
                 Resources[0].rMask = 0xF3FEU;
 
             xf86ClaimFixedResources(Resources, pATI->iEntity);
+
+            (void)memcpy(pATI->VGAWonderResources,
+                Resources, SizeOf(Resources));
         }
     }
 
@@ -131,6 +133,7 @@
                     ATI_NAME ":  Unable to register the following resources"
                     " for inactive adapter:\n");
                 xf86PrintResList(1, pResources);
+                xf86FreeResList(pResources);
             }
         }
     }
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c:1.9 xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c:1.11
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c:1.9	Fri Feb 18 04:19:15 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c	Thu Apr 20 14:28:28 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c,v 1.9 2000/02/18 12:19:15 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c,v 1.11 2000/04/20 21:28:28 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -72,6 +72,7 @@
     "ATI unknown Mach64",
     "ATI Rage 128 GL",
     "ATI Rage 128 Pro",
+    "ATI Rage 128 Mobility",
     "ATI unknown Rage 128"
 };
 
@@ -399,8 +400,24 @@
             return ATI_CHIP_68800AX;
 
         case OldChipID('G', 'X'):  case NewChipID('G', 'X'):
-            return ATI_CHIP_88800GX;
+            switch (ChipRev)
+            {
+                case 0x00U:
+                    return ATI_CHIP_88800GXC;
+
+                case 0x01U:
+                    return ATI_CHIP_88800GXD;
+
+                case 0x02U:
+                    return ATI_CHIP_88800GXE;
 
+                case 0x03U:
+                    return ATI_CHIP_88800GXF;
+
+                default:
+                    return ATI_CHIP_88800GX;
+            }
+
         case OldChipID('C', 'X'):  case NewChipID('C', 'X'):
             return ATI_CHIP_88800CX;
 
@@ -502,6 +519,10 @@
         case OldChipID('S', 'L'):  case NewChipID('S', 'L'):
         case OldChipID('S', 'M'):  case NewChipID('S', 'M'):
             return ATI_CHIP_RAGE128PRO;
+
+        case OldChipID('L', 'E'):  case NewChipID('L', 'E'):
+        case OldChipID('L', 'F'):  case NewChipID('L', 'F'):
+            return ATI_CHIP_RAGE128MOBILITY;
 
         default:
             /*
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h:1.9 xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h:1.9	Fri Feb 18 04:19:16 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h	Thu Mar 30 07:41:17 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h,v 1.9 2000/02/18 12:19:16 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h,v 1.10 2000/03/30 15:41:17 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -34,46 +34,47 @@
 typedef enum
 {
     ATI_CHIP_NONE = 0,
-    ATI_CHIP_VGA,       /* Generic VGA */
+    ATI_CHIP_VGA,               /* Generic VGA */
     ATI_CHIP_18800,
     ATI_CHIP_18800_1,
     ATI_CHIP_28800_2,
     ATI_CHIP_28800_4,
     ATI_CHIP_28800_5,
     ATI_CHIP_28800_6,
-    ATI_CHIP_8514A,     /* 8514/A */
-    ATI_CHIP_CT480,     /* 8514/A clone */
-    ATI_CHIP_38800_1,   /* Mach8 */
-    ATI_CHIP_68800,     /* Mach32 */
-    ATI_CHIP_68800_3,   /* Mach32 */
-    ATI_CHIP_68800_6,   /* Mach32 */
-    ATI_CHIP_68800LX,   /* Mach32 */
-    ATI_CHIP_68800AX,   /* Mach32 */
-    ATI_CHIP_88800GXC,  /* Mach64 */
-    ATI_CHIP_88800GXD,  /* Mach64 */
-    ATI_CHIP_88800GXE,  /* Mach64 */
-    ATI_CHIP_88800GXF,  /* Mach64 */
-    ATI_CHIP_88800GX,   /* Mach64 */
-    ATI_CHIP_88800CX,   /* Mach64 */
-    ATI_CHIP_264CT,     /* Mach64 */
-    ATI_CHIP_264ET,     /* Mach64 */
-    ATI_CHIP_264VT,     /* Mach64 */
-    ATI_CHIP_264GT,     /* Mach64 */
-    ATI_CHIP_264VTB,    /* Mach64 */
-    ATI_CHIP_264GTB,    /* Mach64 */
-    ATI_CHIP_264VT3,    /* Mach64 */
-    ATI_CHIP_264GTDVD,  /* Mach64 */
-    ATI_CHIP_264LT,     /* Mach64 */
-    ATI_CHIP_264VT4,    /* Mach64 */
-    ATI_CHIP_264GT2C,   /* Mach64 */
-    ATI_CHIP_264GTPRO,  /* Mach64 */
-    ATI_CHIP_264LTPRO,  /* Mach64 */
-    ATI_CHIP_264XL,     /* Mach64 */
-    ATI_CHIP_MOBILITY,  /* Mach64 */
-    ATI_CHIP_Mach64,    /* Mach64 */
-    ATI_CHIP_RAGE128GL, /* Rage128 */
-    ATI_CHIP_RAGE128PRO,/* Rage128 */
-    ATI_CHIP_Rage128    /* Rage128 */
+    ATI_CHIP_8514A,             /* 8514/A */
+    ATI_CHIP_CT480,             /* 8514/A clone */
+    ATI_CHIP_38800_1,           /* Mach8 */
+    ATI_CHIP_68800,             /* Mach32 */
+    ATI_CHIP_68800_3,           /* Mach32 */
+    ATI_CHIP_68800_6,           /* Mach32 */
+    ATI_CHIP_68800LX,           /* Mach32 */
+    ATI_CHIP_68800AX,           /* Mach32 */
+    ATI_CHIP_88800GXC,          /* Mach64 */
+    ATI_CHIP_88800GXD,          /* Mach64 */
+    ATI_CHIP_88800GXE,          /* Mach64 */
+    ATI_CHIP_88800GXF,          /* Mach64 */
+    ATI_CHIP_88800GX,           /* Mach64 */
+    ATI_CHIP_88800CX,           /* Mach64 */
+    ATI_CHIP_264CT,             /* Mach64 */
+    ATI_CHIP_264ET,             /* Mach64 */
+    ATI_CHIP_264VT,             /* Mach64 */
+    ATI_CHIP_264GT,             /* Mach64 */
+    ATI_CHIP_264VTB,            /* Mach64 */
+    ATI_CHIP_264GTB,            /* Mach64 */
+    ATI_CHIP_264VT3,            /* Mach64 */
+    ATI_CHIP_264GTDVD,          /* Mach64 */
+    ATI_CHIP_264LT,             /* Mach64 */
+    ATI_CHIP_264VT4,            /* Mach64 */
+    ATI_CHIP_264GT2C,           /* Mach64 */
+    ATI_CHIP_264GTPRO,          /* Mach64 */
+    ATI_CHIP_264LTPRO,          /* Mach64 */
+    ATI_CHIP_264XL,             /* Mach64 */
+    ATI_CHIP_MOBILITY,          /* Mach64 */
+    ATI_CHIP_Mach64,            /* Mach64 */
+    ATI_CHIP_RAGE128GL,         /* Rage128 */
+    ATI_CHIP_RAGE128PRO,        /* Rage128 */
+    ATI_CHIP_RAGE128MOBILITY,   /* Rage128 */
+    ATI_CHIP_Rage128            /* Rage128 */
 } ATIChipType;
 
 extern const char *ATIChipNames[];
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c:1.9 xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c:1.9	Fri Feb 18 04:19:16 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c	Mon Jun 19 08:00:55 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c,v 1.9 2000/02/18 12:19:16 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.c,v 1.10 2000/06/19 15:00:55 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -197,7 +197,6 @@
 #include "atichip.h"
 #include "atidac.h"
 #include "atidsp.h"
-#include "atividmem.h"
 
 /*
  * Definitions related to non-programmable clock generators.
@@ -816,7 +815,6 @@
              * cannot reliably be prevented from enabling frequencies that are
              * greater than what the adapter can handle.
              */
-            ATIMapApertures(pScreenInfo, pATI);
             ATIAdapterSave(pScreenInfo, pATI, &pATI->OldHW);
         }
 
@@ -844,7 +842,6 @@
         {
             /* Restore video state */
             ATIAdapterSet(pScreenInfo, pATI, &pATI->OldHW);
-            ATIUnmapApertures(pScreenInfo, pATI);
             xfree(pATI->OldHW.frame_buffer);
             pATI->OldHW.frame_buffer = NULL;
         }
@@ -1182,7 +1179,7 @@
 
         if ((pATI->Chip >= ATI_CHIP_264VTB) &&
             (pATI->CPIODecoding == BLOCK_IO))
-            ATIDSPCalculate(pScreenInfo, pATI, pATIHW, pMode);
+            ATIDSPCalculate(pATI, pATIHW, pMode);
     }
 
     /* Set clock select bits, after remapping them */
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c:1.10 xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c:1.10	Fri Feb 18 04:19:19 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c	Mon Jun 19 08:00:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c,v 1.10 2000/02/18 12:19:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c,v 1.12 2000/06/19 15:00:56 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -75,6 +75,44 @@
 }
 
 /*
+ * ATISetDPMSMode --
+ *
+ * This function sets the adapter's VESA Display Power Management Signaling
+ * mode.
+ */
+void
+ATISetDPMSMode
+(
+    ScrnInfoPtr pScreenInfo,
+    int         DPMSMode,
+    int         flags
+)
+{
+    ATIPtr pATI;
+
+    if (!pScreenInfo || !pScreenInfo->vtSema)
+        return;
+
+    pATI = ATIPTR(pScreenInfo);
+
+    switch (pATI->Adapter)
+    {
+        case ATI_ADAPTER_MACH64:
+            ATIMach64SetDPMSMode(pATI, DPMSMode);
+            break;
+
+        case ATI_ADAPTER_NONE:
+        case ATI_ADAPTER_8514A:
+        case ATI_ADAPTER_MACH8:
+            break;
+
+        default:        /* Assume EGA/VGA */
+            ATIVGASetDPMSMode(pATI, DPMSMode);
+            break;
+    }
+}
+
+/*
  * ATIEnterGraphics --
  *
  * This function sets the hardware to a graphics video state.
@@ -149,7 +187,8 @@
     ATILock(pATI);
 
     /* Unmap apertures */
-    ATIUnmapApertures(pScreenInfo, pATI);
+    if (!pATI->Closeable || !pATI->nDGAMode)
+        ATIUnmapApertures(pScreenInfo, pATI);
 
     SetTimeSinceLastInputEvent();
 }
@@ -176,7 +215,10 @@
 
     /* Set new hardware state */
     if (pScreenInfo->vtSema)
+    {
+        pScreenInfo->currentMode = pMode;
         ATIAdapterSet(pScreenInfo, pATI, &pATI->NewHW);
+    }
 
     SetTimeSinceLastInputEvent();
 
@@ -274,6 +316,8 @@
     xfree(pATI->NewHW.frame_buffer);
 
     xfree(pATI->pShadow);
+
+    xfree(pATI->pDGAMode);
 
     xfree(pATI);
     pScreenInfo->driverPrivate = NULL;
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h:1.4 xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h:1.4	Fri Feb 18 04:19:20 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h	Tue Mar 21 19:08:11 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h,v 1.4 2000/02/18 12:19:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h,v 1.5 2000/03/22 03:08:11 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -29,6 +29,7 @@
 #include "xf86str.h"
 
 extern Bool ATISaveScreen    FunctionPrototype((ScreenPtr, int));
+extern void ATISetDPMSMode   FunctionPrototype((ScrnInfoPtr, int, int));
 
 extern Bool ATIEnterGraphics FunctionPrototype((ScreenPtr, ScrnInfoPtr,
                                                 ATIPtr));
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c:1.6	Fri Feb 18 04:19:20 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c	Mon Jun 19 08:00:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c,v 1.6 2000/02/18 12:19:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.c,v 1.8 2000/06/19 15:00:56 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -106,10 +106,10 @@
     ATIPtr pATI
 )
 {
-    (void) inb(pATI->CPIO_DAC_WRITE);   /* Reset to PEL mode */
-    (void) inb(pATI->CPIO_DAC_MASK);
-    (void) inb(pATI->CPIO_DAC_MASK);
-    (void) inb(pATI->CPIO_DAC_MASK);
+    (void)inb(pATI->CPIO_DAC_WRITE);    /* Reset to PEL mode */
+    (void)inb(pATI->CPIO_DAC_MASK);
+    (void)inb(pATI->CPIO_DAC_MASK);
+    (void)inb(pATI->CPIO_DAC_MASK);
     return inb(pATI->CPIO_DAC_MASK);
 }
 
@@ -122,6 +122,7 @@
 ATIDACPreInit
 (
     ScrnInfoPtr pScreenInfo,
+    ATIPtr      pATI,
     ATIHWPtr    pATIHW
 )
 {
@@ -134,7 +135,7 @@
     /*
      * Set colour lookup table.  The first entry has already been zeroed out.
      */
-    if (pScreenInfo->depth > 8)
+    if (pATI->depth > 8)
         for (Index = 1;  Index < (NumberOf(pATIHW->lut) / 3);  Index++)
         {
             Index2 = Index * 3;
@@ -158,7 +159,7 @@
             pATIHW->lut[Index2 + 2] = maxColour;
         }
 
-        if (pScreenInfo->depth == 1)
+        if (pATI->depth == 1)
         {
             rgb blackColour = pScreenInfo->display->whiteColour,
                 whiteColour = pScreenInfo->display->whiteColour;
@@ -291,9 +292,9 @@
         int greens = pVisual->greenMask >> pVisual->offsetGreen;
         int blues = pVisual->blueMask >> pVisual->offsetBlue;
 
-        int redShift = 8 - pScreenInfo->weight.red;
-        int greenShift = 8 - pScreenInfo->weight.green;
-        int blueShift = 8 - pScreenInfo->weight.blue;
+        int redShift = 8 - pATI->weight.red;
+        int greenShift = 8 - pATI->weight.green;
+        int blueShift = 8 - pATI->weight.blue;
 
         int redMult = 3 << redShift;
         int greenMult = 3 << greenShift;
@@ -323,7 +324,7 @@
                     Colours[Index].blue << minShift;
         }
 
-        if (pScreenInfo->vtSema)
+        if (pScreenInfo->vtSema || pATI->currentMode)
         {
             /* Rewrite LUT entries that could have been changed */
             i = 1 << minShift;
@@ -357,7 +358,7 @@
             LUTEntry[1] = Colours[Index].green;
             LUTEntry[2] = Colours[Index].blue;
 
-            if (pScreenInfo->vtSema)
+            if (pScreenInfo->vtSema || pATI->currentMode)
             {
                 outb(pATI->CPIO_DAC_WRITE, Index);
                 DACDelay;
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.h:1.5 xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.h:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.h:1.5	Fri Feb 18 04:19:21 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.h	Mon Jun 19 08:00:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.h,v 1.5 2000/02/18 12:19:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.h,v 1.6 2000/06/19 15:00:56 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -78,7 +78,7 @@
 extern void  ATISetDACIOPorts FunctionPrototype((ATIPtr, ATICRTCType));
 extern CARD8 ATIGetDACCmdReg  FunctionPrototype((ATIPtr));
 
-extern void  ATIDACPreInit FunctionPrototype((ScrnInfoPtr, ATIHWPtr));
+extern void  ATIDACPreInit FunctionPrototype((ScrnInfoPtr, ATIPtr, ATIHWPtr));
 extern void  ATIDACSave    FunctionPrototype((ATIPtr, ATIHWPtr));
 extern void  ATIDACSet     FunctionPrototype((ATIPtr, ATIHWPtr));
 
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.c:1.1
--- /dev/null	Sat Jul  1 20:42:47 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.c	Mon Jun 19 08:02:24 2000
@@ -0,0 +1,342 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.c,v 1.1 2000/06/19 15:02:24 tsi Exp $ */
+/*
+ * Copyright 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of Marc Aurele La France not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Marc Aurele La France makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as-is" without express or implied warranty.
+ *
+ * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
+ * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "ati.h"
+#include "atiadapter.h"
+#include "atiadjust.h"
+#include "atidac.h"
+#include "atidga.h"
+#include "dgaproc.h"
+
+/*
+ * ATIDGAOpenFramebuffer --
+ *
+ * This function returns various framebuffer attributes to a DGA client.
+ */
+static Bool
+ATIDGAOpenFramebuffer
+(
+    ScrnInfoPtr   pScreenInfo,
+    char          **DeviceName,
+    unsigned char **ApertureBase,
+    int           *ApertureSize,
+    int           *ApertureOffset,
+    int           *flags
+)
+{
+    ATIPtr pATI = ATIPTR(pScreenInfo);
+
+    *DeviceName = NULL;         /* No special device */
+    *ApertureBase = (unsigned char *)(pATI->LinearBase);
+    *ApertureSize = pScreenInfo->videoRam * 1024;
+    *ApertureOffset = 0;        /* Always */
+    *flags = 0;                 /* Root premissions OS-dependent */
+
+    return TRUE;
+}
+
+static int
+BitsSet
+(
+    unsigned long data
+)
+{
+    unsigned long mask = 1;
+    int           set  = 0;
+
+    for (;  mask;  mask <<= 1)
+        if (data & mask)
+            set++;
+
+    return set;
+}
+
+/*
+ * ATIDGASetMode --
+ *
+ * This function sets a graphics mode for a DGA client.
+ */
+static Bool
+ATIDGASetMode
+(
+    ScrnInfoPtr pScreenInfo,
+    DGAModePtr  pDGAMode
+)
+{
+    ATIPtr         pATI      = ATIPTR(pScreenInfo);
+    DisplayModePtr pMode;
+    int            scrnIndex = pScreenInfo->pScreen->myNum;
+    int            frameX0, frameY0;
+
+    if (pDGAMode)
+    {
+        pMode = pDGAMode->mode;
+        pATI->depth = pDGAMode->depth;
+        pATI->bitsPerPixel = pDGAMode->bitsPerPixel;
+        pATI->displayWidth =
+            pDGAMode->bytesPerScanline * 8 / pATI->bitsPerPixel;
+        pATI->weight.red = BitsSet(pDGAMode->red_mask);
+        pATI->weight.green = BitsSet(pDGAMode->green_mask);
+        pATI->weight.blue = BitsSet(pDGAMode->blue_mask);
+        frameX0 = frameY0 = 0;
+        if (!pATI->currentMode)
+            pATI->currentMode = pScreenInfo->currentMode;
+    }
+    else
+    {
+        if (!(pMode = pATI->currentMode))
+            return TRUE;
+
+        pATI->depth = pScreenInfo->depth;
+        pATI->bitsPerPixel = pScreenInfo->bitsPerPixel;
+        pATI->displayWidth = pScreenInfo->displayWidth;
+        pATI->weight = pScreenInfo->weight;
+        frameX0 = pScreenInfo->frameX0;
+        frameY0 = pScreenInfo->frameY0;
+    }
+
+    pATI->XModifier = pATI->bitsPerPixel / UnitOf(pATI->bitsPerPixel);
+    ATIAdjustPreInit(pATI);
+    ATIAdapterPreInit(pScreenInfo, pATI, &pATI->NewHW);
+
+    if (!(*pScreenInfo->SwitchMode)(scrnIndex, pMode, 0))
+        return FALSE;
+    if (!pDGAMode)
+        pATI->currentMode = NULL;
+    (*pScreenInfo->AdjustFrame)(scrnIndex, frameX0, frameY0, 0);
+
+    return TRUE;
+}
+
+/*
+ * ATIDGASetViewport --
+ *
+ * This function sets the display start address for a DGA client.
+ */
+static void
+ATIDGASetViewport
+(
+    ScrnInfoPtr pScreenInfo,
+    int         x,
+    int         y,
+    int         flags
+)
+{
+    (*pScreenInfo->AdjustFrame)(pScreenInfo->pScreen->myNum, x, y, flags);
+}
+
+/*
+ * ATIDGAGetViewport --
+ *
+ * This function returns the current status of prior DGA requests to set the
+ * adapter's display start address.
+ */
+static int
+ATIDGAGetViewport
+(
+    ScrnInfoPtr pScreenInfo
+)
+{
+    return 0;   /* There are never any pending requests */
+}
+
+static DGAFunctionRec ATIDGAFunctions =
+{
+    ATIDGAOpenFramebuffer,
+    NULL,       /* CloseFramebuffer */
+    ATIDGASetMode,
+    ATIDGASetViewport,
+    ATIDGAGetViewport,
+    NULL,       /* Sync */
+    NULL,       /* FillRect */
+    NULL,       /* BlitRect */
+    NULL,       /* BlitTransRect */
+};
+
+/*
+ * ATIDGAAddModes --
+ *
+ * This function translates DisplayModeRec's into DGAModeRec's.
+ */
+static void
+ATIDGAAddModes
+(
+    ScrnInfoPtr pScreenInfo,
+    ATIPtr      pATI,
+    int         depth,
+    int         bitsPerPixel,
+    int         redMask,
+    int         greenMask,
+    int         blueMask,
+    int         visualClass
+)
+{
+    DisplayModePtr pMode         = pScreenInfo->modes;
+    DGAModePtr     pDGAMode;
+    int            displayWidth  = pScreenInfo->displayWidth;
+    int            videoBits     = pScreenInfo->videoRam * 1024 * 8;
+    int            xViewportStep = 64 / UnitOf(bitsPerPixel);
+    int            modePitch, bitsPerScanline, maxViewportY;
+
+    if (bitsPerPixel != pScreenInfo->bitsPerPixel)
+        displayWidth = 0;
+
+    while (1)
+    {
+        /* Weed out multiscanned modes */
+        if ((pMode->VScan <= 1) ||
+            ((pMode->VScan == 2) && !(pMode->Flags & V_DBLSCAN)))
+        {
+            /*
+             * For code simplicity, ensure DGA mode pitch is a multiple of 64
+             * bytes.
+             */
+            if (!(modePitch = displayWidth))
+            {
+                modePitch = ((64 * 8) / UnitOf(bitsPerPixel)) - 1;
+                modePitch = (pMode->HDisplay + modePitch) & ~modePitch;
+            }
+
+            /* Ensure the mode fits in video memory */
+            if ((modePitch * bitsPerPixel * pMode->VDisplay) <= videoBits)
+            {
+                /* Stop generating modes on out-of-memory conditions */
+                pDGAMode = xrealloc(pATI->pDGAMode,
+                    (pATI->nDGAMode + 1) * SizeOf(DGAModeRec));
+                if (!pDGAMode)
+                    break;
+
+                pATI->pDGAMode = pDGAMode;
+                pDGAMode += pATI->nDGAMode;
+                pATI->nDGAMode++;
+                (void)memset(pDGAMode, 0, SizeOf(DGAModeRec));
+
+                /* Fill in the mode structure */
+                pDGAMode->mode = pMode;
+                if (bitsPerPixel == pScreenInfo->bitsPerPixel)
+                {
+                    pDGAMode->flags |= DGA_PIXMAP_AVAILABLE;
+                    pDGAMode->address = pATI->pMemory;
+                }
+                if ((pMode->Flags & V_DBLSCAN) || (pMode->VScan > 1))
+                    pDGAMode->flags |= DGA_DOUBLESCAN;
+                if (pMode->Flags & V_INTERLACE)
+                    pDGAMode->flags |= DGA_INTERLACED;
+
+                pDGAMode->byteOrder = pScreenInfo->imageByteOrder;
+                pDGAMode->depth = depth;
+                pDGAMode->bitsPerPixel = bitsPerPixel;
+                pDGAMode->red_mask = redMask;
+                pDGAMode->green_mask = greenMask;
+                pDGAMode->blue_mask = blueMask;
+                pDGAMode->visualClass = visualClass;
+
+                pDGAMode->viewportWidth = pMode->HDisplay;
+                pDGAMode->viewportHeight = pMode->VDisplay;
+                pDGAMode->xViewportStep = xViewportStep;
+                pDGAMode->yViewportStep = 1;
+
+                bitsPerScanline = modePitch * bitsPerPixel;
+                pDGAMode->bytesPerScanline = bitsPerScanline / 8;
+                pDGAMode->imageWidth = pDGAMode->pixmapWidth = modePitch;
+                pDGAMode->imageHeight = pDGAMode->pixmapHeight =
+                    videoBits / bitsPerScanline;
+
+                pDGAMode->maxViewportX =
+                    pDGAMode->imageWidth - pDGAMode->viewportWidth;
+                pDGAMode->maxViewportY =
+                    pDGAMode->imageHeight - pDGAMode->viewportHeight;
+                maxViewportY =
+                    ((((pATI->AdjustMaxBase * 8) / bitsPerPixel) +
+                      xViewportStep) / modePitch) - 1;
+                if (maxViewportY < pDGAMode->maxViewportY)
+                    pDGAMode->maxViewportY = maxViewportY;
+            }
+        }
+
+        if ((pMode = pMode->next) == pScreenInfo->modes)
+        {
+            if (!displayWidth)
+                break;
+
+            displayWidth = 0;
+        }
+    }
+}
+
+/*
+ * ATIDGAInit --
+ *
+ * This function initialises the driver's support for the DGA extension.
+ */
+Bool
+ATIDGAInit
+(
+    ScrnInfoPtr pScreenInfo,
+    ScreenPtr   pScreen,
+    ATIPtr      pATI
+)
+{
+    if (!pATI->nDGAMode)
+    {
+        /*
+         * Contrary to previous extension versions, DGA 2 does not support
+         * banked framebuffers.  Also, disable DGA when non-DGA server modes
+         * are planar.
+         */
+        if (pATI->BankInfo.BankSize || (pScreenInfo->depth <= 4))
+            return FALSE;
+
+        ATIDGAAddModes(pScreenInfo, pATI,
+            8, 8, 0, 0, 0, PseudoColor);
+
+        ATIDGAAddModes(pScreenInfo, pATI,
+            15, 16, 0x7C00U, 0x03E0U, 0x001FU, TrueColor);
+
+        ATIDGAAddModes(pScreenInfo, pATI,
+            16, 16, 0xF800U, 0x07E0U, 0x001FU, TrueColor);
+
+        ATIDGAAddModes(pScreenInfo, pATI,
+            24, 24, 0x00FF0000U, 0x0000FF00U, 0x000000FFU, TrueColor);
+
+        ATIDGAAddModes(pScreenInfo, pATI,
+            24, 32, 0x00FF0000U, 0x0000FF00U, 0x000000FFU, TrueColor);
+
+        if (pATI->DAC != ATI_DAC_INTERNAL)      /* Not first revision */
+        {
+            ATIDGAAddModes(pScreenInfo, pATI,
+                15, 16, 0x7C00U, 0x03E0U, 0x001FU, DirectColor);
+
+            ATIDGAAddModes(pScreenInfo, pATI,
+                16, 16, 0xF800U, 0x07E0U, 0x001FU, DirectColor);
+
+            ATIDGAAddModes(pScreenInfo, pATI,
+                24, 24, 0x00FF0000U, 0x0000FF00U, 0x000000FFU, DirectColor);
+
+            ATIDGAAddModes(pScreenInfo, pATI,
+                24, 32, 0x00FF0000U, 0x0000FF00U, 0x000000FFU, DirectColor);
+        }
+    }
+
+    return DGAInit(pScreen, &ATIDGAFunctions, pATI->pDGAMode, pATI->nDGAMode);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.h:1.1
--- /dev/null	Sat Jul  1 20:42:47 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.h	Mon Jun 19 08:02:24 2000
@@ -0,0 +1,33 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.h,v 1.1 2000/06/19 15:02:24 tsi Exp $ */
+/*
+ * Copyright 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of Marc Aurele La France not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Marc Aurele La France makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as-is" without express or implied warranty.
+ *
+ * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
+ * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef ___ATIDGA_H___
+#define ___ATIDGA_H___ 1
+
+#include "atipriv.h"
+#include "atiproto.h"
+#include "xf86str.h"
+
+extern Bool ATIDGAInit FunctionPrototype((ScrnInfoPtr, ScreenPtr, ATIPtr));
+
+#endif /* ___ATIDGA_H___ */
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c:1.8 xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c:1.8	Fri Feb 18 04:19:21 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c	Mon Jun 19 08:00:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c,v 1.8 2000/02/18 12:19:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c,v 1.10 2000/06/19 15:00:56 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -42,14 +42,11 @@
 )
 {
     CARD32 IOValue, dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off;
-    CARD16 CPIO_VGA_DSP_CONFIG, CPIO_VGA_DSP_ON_OFF;
     int trp;
 
     /* Set DSP register port numbers */
     pATI->CPIO_DSP_CONFIG = ATIIOPort(DSP_CONFIG);
     pATI->CPIO_DSP_ON_OFF = ATIIOPort(DSP_ON_OFF);
-    CPIO_VGA_DSP_CONFIG = ATIIOPort(VGA_DSP_CONFIG);
-    CPIO_VGA_DSP_ON_OFF = ATIIOPort(VGA_DSP_ON_OFF);
 
     /*
      * VT-B's and later have additional post-dividers that are not powers of
@@ -145,14 +142,15 @@
     /* Allow BIOS to override */
     dsp_config = inl(pATI->CPIO_DSP_CONFIG);
     dsp_on_off = inl(pATI->CPIO_DSP_ON_OFF);
-    vga_dsp_config = inl(CPIO_VGA_DSP_CONFIG);
-    vga_dsp_on_off = inl(CPIO_VGA_DSP_ON_OFF);
+    vga_dsp_config = inl(ATIIOPort(VGA_DSP_CONFIG));
+    vga_dsp_on_off = inl(ATIIOPort(VGA_DSP_ON_OFF));
 
     if (dsp_config)
         pATI->DisplayLoopLatency = GetBits(dsp_config, DSP_LOOP_LATENCY);
 
-    if ((dsp_on_off == vga_dsp_on_off) &&
-        (!dsp_config || !((dsp_config ^ vga_dsp_config) & DSP_XCLKS_PER_QW)))
+    if (!dsp_on_off ||
+        ((dsp_on_off == vga_dsp_on_off) &&
+         (!dsp_config || !((dsp_config ^ vga_dsp_config) & DSP_XCLKS_PER_QW))))
     {
         if (ATIDivide(GetBits(vga_dsp_on_off, VGA_DSP_OFF),
                       GetBits(vga_dsp_config, VGA_DSP_XCLKS_PER_QW), 5, 1) > 23)
@@ -195,7 +193,6 @@
 void
 ATIDSPCalculate
 (
-    ScrnInfoPtr    pScreenInfo,
     ATIPtr         pATI,
     ATIHWPtr       pATIHW,
     DisplayModePtr pMode
@@ -212,8 +209,8 @@
     Multiplier = pATI->XCLKFeedbackDivider *
         pATI->ClockDescriptor.PostDividers[pATIHW->PostDivider];
     Divider = pATIHW->FeedbackDivider * pATI->XCLKReferenceDivider;
-    if (pScreenInfo->depth >= 8)
-        Divider *= pScreenInfo->bitsPerPixel / 4;
+    if (pATI->depth >= 8)
+        Divider *= pATI->bitsPerPixel / 4;
     /* Start by assuming a display FIFO width of 32 bits */
     vshift = (5 - 2) - pATI->XCLKPostDivider;
     if (pATIHW->crtc != ATI_CRTC_VGA)
@@ -230,7 +227,7 @@
     }
 
     /* Determine dsp_precision first */
-    tmp = ATIDivide(Multiplier * pATI->DisplayFIFODepth, Divider, vshift, 1);
+    tmp = ATIDivide(Multiplier * pATI->DisplayFIFODepth, Divider, vshift, -1);
     for (dsp_precision = -5;  tmp;  dsp_precision++)
         tmp >>= 1;
     if (dsp_precision < 0)
@@ -263,6 +260,9 @@
         dsp_on += (tmp * 2) +
             ATIDivide(pATI->XCLKPageFaultDelay, 1, xshift, 1);
     }
+
+    if (dsp_on >= dsp_off)
+        dsp_on = dsp_off - ATIDivide(Multiplier, Divider, vshift, -1);
 
     /* Last but not least:  dsp_xclks */
     dsp_xclks = ATIDivide(Multiplier, Divider, vshift + 5, 1);
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.h:1.5 xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.h:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.h:1.5	Fri Feb 18 04:19:22 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.h	Mon Jun 19 08:00:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.h,v 1.5 2000/02/18 12:19:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.h,v 1.6 2000/06/19 15:00:56 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -30,7 +30,7 @@
 
 extern Bool ATIDSPPreInit   FunctionPrototype((ScrnInfoPtr, ATIPtr));
 extern void ATIDSPSave      FunctionPrototype((ATIPtr, ATIHWPtr));
-extern void ATIDSPCalculate FunctionPrototype((ScrnInfoPtr, ATIPtr, ATIHWPtr,
+extern void ATIDSPCalculate FunctionPrototype((ATIPtr, ATIHWPtr,
                                                DisplayModePtr));
 extern void ATIDSPSet       FunctionPrototype((ATIPtr, ATIHWPtr));
 
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h:1.6 xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h:1.7
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h:1.6	Wed Mar  1 08:00:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h	Thu Mar 30 07:41:17 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h,v 1.6 2000/03/01 16:00:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h,v 1.7 2000/03/30 15:41:17 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -28,7 +28,6 @@
 #define NO_COMPILER_H_EXTRAS
 #endif
 
-#include "atiregs.h"
 #include "atistruct.h"
 #include "compiler.h"
 
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c:1.5 xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c:1.5	Tue Mar  7 08:13:34 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c	Tue Mar 21 19:08:13 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c,v 1.5 2000/03/07 16:13:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c,v 1.6 2000/03/22 03:08:13 tsi Exp $ */
 /*
  * Copyright 1999 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -111,9 +111,8 @@
         outl(pATI->CPIO_GEN_TEST_CNTL, tmp | GEN_GUI_EN);
         outl(pATI->CPIO_GEN_TEST_CNTL, tmp);
         outl(pATI->CPIO_GEN_TEST_CNTL, tmp | GEN_GUI_EN);
-        pATI->LockData.crtc_gen_cntl = inl(pATI->CPIO_CRTC_GEN_CNTL) &
+        tmp = pATI->LockData.crtc_gen_cntl = inl(pATI->CPIO_CRTC_GEN_CNTL) &
             ~(CRTC_EN | CRTC_LOCK_REGS);
-        tmp = pATI->LockData.crtc_gen_cntl & ~CRTC_EN;
         if (pATI->Chip >= ATI_CHIP_264XL)
             tmp = (tmp & ~CRTC_INT_ENS_X) | CRTC_INT_ACKS_X;
         outl(pATI->CPIO_CRTC_GEN_CNTL, tmp | CRTC_EN);
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c:1.12 xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c:1.21
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c:1.12	Thu Mar  2 20:47:13 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c	Mon Jun 19 08:00:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c,v 1.12 2000/03/03 04:47:13 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c,v 1.21 2000/06/19 15:00:56 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -44,17 +44,22 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "ati.h"
 #include "atibus.h"
 #include "atichip.h"
 #include "atiio.h"
 #include "atimach64.h"
+#include "miline.h"
 
+#define DPMS_SERVER
+#include "extensions/dpms.h"
+
 /*
- * Only 32-bit MMIO is needed here.
+ * Note:  Only 32-bit MMIO is needed here.
  */
 
-#define inm(_Register)                                         \
-    MMIO_IN32(pATI->pBlock[GetBits(_Register, BLOCK_SELECT)],  \
+#define inm(_Register)                                        \
+    MMIO_IN32(pATI->pBlock[GetBits(_Register, BLOCK_SELECT)], \
               (_Register) & MM_IO_SELECT)
 
 /*
@@ -108,24 +113,47 @@
         pATI->nAvailableFIFOEntries = Count;
 }
 
+/*
+ * MMIO cache definitions.
+ */
+#define CacheByte(___Register) pATI->MMIOCached[CacheSlotOf(___Register) >> 3]
+#define CacheBit(___Register)  (0x80U >> (CacheSlotOf(___Register) & 0x07U))
 
-#define outm(_Register, _Value)                                    \
-    do                                                             \
-    {                                                              \
-        while (!pATI->nAvailableFIFOEntries--)                     \
-            ATIMach64PollEngineStatus(pATI);                       \
-        MMIO_OUT32(pATI->pBlock[GetBits(_Register, BLOCK_SELECT)], \
-                   (_Register) & MM_IO_SELECT, _Value);            \
-        pATI->EngineIsBusy = TRUE;                                 \
+#define RegisterIsCached(__Register) \
+    (CacheByte(__Register) & CacheBit(__Register))
+#define CacheRegister(__Register) \
+    CacheByte(__Register) |= CacheBit(__Register)
+#define UncacheRegister(__Register) \
+    CacheByte(__Register) &= ~CacheBit(__Register)
+
+#define CacheSlot(__Register)  pATI->MMIOCache[CacheSlotOf(__Register)]
+
+/* This would be quite a bit slower as a function */
+#define outm(_Register, _Value)                                        \
+    do                                                                 \
+    {                                                                  \
+        CARD32 _IOValue = (_Value);                                    \
+                                                                       \
+        if (!RegisterIsCached(_Register) ||                            \
+            (_IOValue != CacheSlot(_Register)))                        \
+        {                                                              \
+            while (!pATI->nAvailableFIFOEntries--)                     \
+                ATIMach64PollEngineStatus(pATI);                       \
+            MMIO_OUT32(pATI->pBlock[GetBits(_Register, BLOCK_SELECT)], \
+                (_Register) & MM_IO_SELECT, _IOValue);                 \
+            CacheSlot(_Register) = _IOValue;                           \
+            pATI->EngineIsBusy = TRUE;                                 \
+        }                                                              \
     } while (0)
 
+/* This is no longer as critical, especially for _n == 1 */
 #define ATIMach64WaitForFIFO(_n)                               \
     while ((pATI->nAvailableFIFOEntries < (_n)) &&             \
            (pATI->nAvailableFIFOEntries < pATI->nFIFOEntries)) \
         ATIMach64PollEngineStatus(pATI)
 
-#define ATIMach64WaitForIdle()                 \
-    while (pATI->EngineIsBusy)                 \
+#define ATIMach64WaitForIdle()          \
+    while (pATI->EngineIsBusy)          \
         ATIMach64PollEngineStatus(pATI)
 
 /*
@@ -165,15 +193,16 @@
     ATIHWPtr    pATIHW
 )
 {
-    if (pScreenInfo->depth <= 4)
-        pATIHW->crtc_off_pitch =
-            SetBits(pScreenInfo->displayWidth >> 4, CRTC_PITCH);
+    CARD32 bus_cntl, config_cntl;
+    int    tmp;
+
+    if (pATI->depth <= 4)
+        pATIHW->crtc_off_pitch = SetBits(pATI->displayWidth >> 4, CRTC_PITCH);
     else
-        pATIHW->crtc_off_pitch =
-            SetBits(pScreenInfo->displayWidth >> 3, CRTC_PITCH);
+        pATIHW->crtc_off_pitch = SetBits(pATI->displayWidth >> 3, CRTC_PITCH);
 
-    pATIHW->bus_cntl = (inl(pATI->CPIO_BUS_CNTL) & ~BUS_HOST_ERR_INT_EN) |
-        BUS_HOST_ERR_INT;
+    bus_cntl = inl(pATI->CPIO_BUS_CNTL);
+    pATIHW->bus_cntl = (bus_cntl & ~BUS_HOST_ERR_INT_EN) | BUS_HOST_ERR_INT;
     if (pATI->Chip < ATI_CHIP_264VTB)
     {
         pATIHW->bus_cntl &= ~(BUS_FIFO_ERR_INT_EN | BUS_ROM_DIS);
@@ -192,13 +221,11 @@
         SetBits(pATIHW->nPlane, MEM_VGA_RPS1);
 
     pATIHW->dac_cntl = inl(pATI->CPIO_DAC_CNTL) &
-        ~(DAC1_CLK_SEL | DAC_PALETTE_ACCESS_CNTL);
-    if ((pScreenInfo->depth > 8) || (pScreenInfo->rgbBits == 8))
+        ~(DAC1_CLK_SEL | DAC_PALETTE_ACCESS_CNTL | DAC_8BIT_EN);
+    if ((pATI->depth > 8) || (pScreenInfo->rgbBits == 8))
         pATIHW->dac_cntl |= DAC_8BIT_EN;
-    else
-        pATIHW->dac_cntl &= ~DAC_8BIT_EN;
 
-    pATIHW->config_cntl = inl(pATI->CPIO_CONFIG_CNTL);
+    pATIHW->config_cntl = config_cntl = inl(pATI->CPIO_CONFIG_CNTL);
     if (pATI->UseSmallApertures)
         pATIHW->config_cntl |= CFG_MEM_VGA_AP_EN;
     else
@@ -219,9 +246,9 @@
     /* Draw engine setup */
     if (pATI->OptionAccel)
     {
-        /* Don't treat 24bpp as a special case */
-        pATI->PitchModifier =
-            pScreenInfo->bitsPerPixel / UnitOf(pScreenInfo->bitsPerPixel);
+        /* Ensure apertures are enabled */
+        outl(pATI->CPIO_BUS_CNTL, pATIHW->bus_cntl);
+        outl(pATI->CPIO_CONFIG_CNTL, pATIHW->config_cntl);
 
         /*
          * When possible, max out command FIFO size.
@@ -231,8 +258,7 @@
 
         /* Initialise destination registers */
         pATIHW->dst_off_pitch =
-            SetBits((pScreenInfo->displayWidth * pATI->PitchModifier) >> 3,
-                DST_PITCH);
+            SetBits((pATI->displayWidth * pATI->XModifier) >> 3, DST_PITCH);
         pATIHW->dst_cntl = DST_X_DIR | DST_Y_DIR | DST_LAST_PEL;
 
         /* Initialise source registers */
@@ -242,24 +268,25 @@
         pATIHW->src_cntl = SRC_LINE_X_DIR;
 
         /* Initialise scissor, allowing for offscreen areas */
-        pATIHW->sc_right =
-            (pScreenInfo->displayWidth * pATI->PitchModifier) - 1;
-        pATIHW->sc_bottom =
-            (pScreenInfo->videoRam * 1024 * 8 / pScreenInfo->displayWidth /
-             pScreenInfo->bitsPerPixel) - 1;
+        pATIHW->sc_right = (pATI->displayWidth * pATI->XModifier) - 1;
+        tmp = (pScreenInfo->videoRam * (1024 * 8) /
+            pATI->displayWidth / pATI->bitsPerPixel) - 1;
+        if (tmp > ATIMach64MaxY)
+            tmp = ATIMach64MaxY;
+        pATIHW->sc_bottom = tmp;
 
         /* Initialise data path */
         pATIHW->dp_frgd_clr = (CARD32)(-1);
         pATIHW->dp_write_mask = (CARD32)(-1);
 
-        switch (pScreenInfo->depth)
+        switch (pATI->depth)
         {
             case 8:
                 pATIHW->dp_chain_mask = DP_CHAIN_8BPP;
                 pATIHW->dp_pix_width = /* DP_BYTE_PIX_ORDER | */
                     SetBits(PIX_WIDTH_8BPP, DP_DST_PIX_WIDTH) |
                     SetBits(PIX_WIDTH_8BPP, DP_SRC_PIX_WIDTH) |
-                    SetBits(PIX_WIDTH_8BPP, DP_HOST_PIX_WIDTH);
+                    SetBits(PIX_WIDTH_1BPP, DP_HOST_PIX_WIDTH);
                 break;
 
             case 15:
@@ -267,7 +294,7 @@
                 pATIHW->dp_pix_width = /* DP_BYTE_PIX_ORDER | */
                     SetBits(PIX_WIDTH_15BPP, DP_DST_PIX_WIDTH) |
                     SetBits(PIX_WIDTH_15BPP, DP_SRC_PIX_WIDTH) |
-                    SetBits(PIX_WIDTH_15BPP, DP_HOST_PIX_WIDTH);
+                    SetBits(PIX_WIDTH_1BPP, DP_HOST_PIX_WIDTH);
                 break;
 
             case 16:
@@ -275,17 +302,17 @@
                 pATIHW->dp_pix_width = /* DP_BYTE_PIX_ORDER | */
                     SetBits(PIX_WIDTH_16BPP, DP_DST_PIX_WIDTH) |
                     SetBits(PIX_WIDTH_16BPP, DP_SRC_PIX_WIDTH) |
-                    SetBits(PIX_WIDTH_16BPP, DP_HOST_PIX_WIDTH);
+                    SetBits(PIX_WIDTH_1BPP, DP_HOST_PIX_WIDTH);
                 break;
 
             case 24:
-                if (pScreenInfo->bitsPerPixel == 24)
+                if (pATI->bitsPerPixel == 24)
                 {
                     pATIHW->dp_chain_mask = DP_CHAIN_24BPP_888;
                     pATIHW->dp_pix_width = /* DP_BYTE_PIX_ORDER | */
                         SetBits(PIX_WIDTH_8BPP, DP_DST_PIX_WIDTH) |
                         SetBits(PIX_WIDTH_8BPP, DP_SRC_PIX_WIDTH) |
-                        SetBits(PIX_WIDTH_8BPP, DP_HOST_PIX_WIDTH);
+                        SetBits(PIX_WIDTH_1BPP, DP_HOST_PIX_WIDTH);
                 }
                 else
                 {
@@ -293,7 +320,7 @@
                     pATIHW->dp_pix_width = /* DP_BYTE_PIX_ORDER | */
                         SetBits(PIX_WIDTH_32BPP, DP_DST_PIX_WIDTH) |
                         SetBits(PIX_WIDTH_32BPP, DP_SRC_PIX_WIDTH) |
-                        SetBits(PIX_WIDTH_32BPP, DP_HOST_PIX_WIDTH);
+                        SetBits(PIX_WIDTH_1BPP, DP_HOST_PIX_WIDTH);
                 }
                 break;
 
@@ -303,12 +330,15 @@
 
         pATIHW->dp_mix = SetBits(MIX_SRC, DP_FRGD_MIX) |
             SetBits(MIX_DST, DP_BKGD_MIX);
-        pATIHW->dp_src = SetBits(DP_MONO_SRC_ALLONES, DP_MONO_SRC) |
-            SetBits(SRC_FRGD, DP_FRGD_SRC) |
-            SetBits(SRC_BKGD, DP_BKGD_SRC);
+        pATIHW->dp_src = DP_MONO_SRC_ALLONES |
+            SetBits(SRC_FRGD, DP_FRGD_SRC) | SetBits(SRC_BKGD, DP_BKGD_SRC);
 
         /* Initialise colour compare */
         pATIHW->clr_cmp_msk = (CARD32)(-1);
+
+        /* Restore aperture enablement */
+        outl(pATI->CPIO_BUS_CNTL, bus_cntl);
+        outl(pATI->CPIO_CONFIG_CNTL, config_cntl);
     }
 }
 
@@ -352,11 +382,15 @@
     /* Save draw engine state */
     if (pATI->OptionAccel && (pATIHW == &pATI->OldHW))
     {
+        /* Ensure apertures are enabled */
+        outl(pATI->CPIO_BUS_CNTL, pATI->NewHW.bus_cntl);
+        outl(pATI->CPIO_CONFIG_CNTL, pATI->NewHW.config_cntl);
+
         ATIMach64WaitForIdle();
 
         /* Save FIFO size */
         if (pATI->Chip >= ATI_CHIP_264VT4)
-            pATIHW->gui_cntl = inm(GUI_STAT);
+            pATIHW->gui_cntl = inm(GUI_CNTL);
 
         /* Save destination registers */
         pATIHW->dst_off_pitch = inm(DST_OFF_PITCH);
@@ -410,6 +444,10 @@
 
         /* Save context */
         pATIHW->context_mask = inm(CONTEXT_MASK);
+
+        /* Restore aperture enablement */
+        outl(pATI->CPIO_BUS_CNTL, pATIHW->bus_cntl);
+        outl(pATI->CPIO_CONFIG_CNTL, pATIHW->config_cntl);
     }
 }
 
@@ -421,7 +459,6 @@
 void
 ATIMach64Calculate
 (
-    ScrnInfoPtr    pScreenInfo,
     ATIPtr         pATI,
     ATIHWPtr       pATIHW,
     DisplayModePtr pMode
@@ -539,7 +576,7 @@
           CRTC_VGA_TEXT_132 | CRTC_CUR_B_TEST);
     pATIHW->crtc_gen_cntl |=
         CRTC_EXT_DISP_EN | CRTC_EN | CRTC_VGA_LINEAR | CRTC_CNT_EN;
-    switch (pScreenInfo->depth)
+    switch (pATI->depth)
     {
         case 1:
             pATIHW->crtc_gen_cntl |= SetBits(PIX_WIDTH_1BPP, CRTC_PIX_WIDTH);
@@ -557,13 +594,13 @@
             pATIHW->crtc_gen_cntl |= SetBits(PIX_WIDTH_16BPP, CRTC_PIX_WIDTH);
             break;
         case 24:
-            if (pScreenInfo->bitsPerPixel == 24)
+            if (pATI->bitsPerPixel == 24)
             {
                 pATIHW->crtc_gen_cntl |=
                     SetBits(PIX_WIDTH_24BPP, CRTC_PIX_WIDTH);
                 break;
             }
-            if (pScreenInfo->bitsPerPixel != 32)
+            if (pATI->bitsPerPixel != 32)
                 break;
             /* Fall through */
         case 32:
@@ -586,7 +623,7 @@
 /*
  * ATIMach64Set --
  *
- * This function is called to load a Mach64's accelerator CRTC.
+ * This function is called to load a Mach64's accelerator CRTC and draw engine.
  */
 void
 ATIMach64Set
@@ -621,19 +658,16 @@
     /* Finalise CRTC setup and turn on the screen */
     outl(pATI->CPIO_CRTC_GEN_CNTL, pATIHW->crtc_gen_cntl);
 
-    /* Aperture setup */
-    outl(pATI->CPIO_BUS_CNTL, pATIHW->bus_cntl);
-
-    outl(pATI->CPIO_MEM_VGA_WP_SEL, pATIHW->mem_vga_wp_sel);
-    outl(pATI->CPIO_MEM_VGA_RP_SEL, pATIHW->mem_vga_rp_sel);
-
-    outl(pATI->CPIO_DAC_CNTL, pATIHW->dac_cntl);
-
-    outl(pATI->CPIO_CONFIG_CNTL, pATIHW->config_cntl);
-
     /* Load draw engine */
     if (pATI->OptionAccel)
     {
+        /* Clobber MMIO cache */
+        (void)memset(pATI->MMIOCached, 0, SizeOf(pATI->MMIOCached));
+
+        /* Ensure apertures are enabled */
+        outl(pATI->CPIO_BUS_CNTL, pATI->NewHW.bus_cntl);
+        outl(pATI->CPIO_CONFIG_CNTL, pATI->NewHW.config_cntl);
+
         pATI->EngineIsBusy = TRUE;      /* Force engine poll */
         ATIMach64WaitForIdle();
 
@@ -645,6 +679,9 @@
             ATIMach64PollEngineStatus(pATI);
         }
 
+        /* Set FIFO depth */
+        pATI->nFIFOEntries = pATI->nAvailableFIFOEntries;
+
         /* Load destination registers */
         ATIMach64WaitForFIFO(7);
         outm(DST_OFF_PITCH, pATIHW->dst_off_pitch);
@@ -705,7 +742,46 @@
         outm(CONTEXT_MASK, pATIHW->context_mask);
 
         ATIMach64WaitForIdle();
+
+        if (pATI->OptionMMIOCache)
+        {
+            /*
+             * Enable write caching for selected MMIO registers.  This can only
+             * be done for those registers whose value does not change without
+             * driver intervention.
+             */
+
+            CacheRegister(SRC_CNTL);
+
+            CacheRegister(HOST_CNTL);
+
+            CacheRegister(PAT_REG0);
+            CacheRegister(PAT_REG1);
+            CacheRegister(PAT_CNTL);
+
+            CacheRegister(SC_LEFT_RIGHT);
+            CacheRegister(SC_TOP_BOTTOM);
+
+            CacheRegister(DP_BKGD_CLR);
+            CacheRegister(DP_FRGD_CLR);
+            CacheRegister(DP_WRITE_MASK);
+            CacheRegister(DP_MIX);
+
+            CacheRegister(CLR_CMP_CLR);
+            CacheRegister(CLR_CMP_MSK);
+            CacheRegister(CLR_CMP_CNTL);
+        }
     }
+
+    /* Aperture setup */
+    outl(pATI->CPIO_BUS_CNTL, pATIHW->bus_cntl);
+
+    outl(pATI->CPIO_MEM_VGA_WP_SEL, pATIHW->mem_vga_wp_sel);
+    outl(pATI->CPIO_MEM_VGA_RP_SEL, pATIHW->mem_vga_rp_sel);
+
+    outl(pATI->CPIO_DAC_CNTL, pATIHW->dac_cntl);
+
+    outl(pATI->CPIO_CONFIG_CNTL, pATIHW->config_cntl);
 }
 
 /*
@@ -726,12 +802,12 @@
     {
         case SCREEN_SAVER_OFF:
         case SCREEN_SAVER_FORCER:
-            outl(pATI->CPIO_CRTC_GEN_CNTL, crtc_gen_cntl | CRTC_EN);
+            outl(pATI->CPIO_CRTC_GEN_CNTL, crtc_gen_cntl & ~CRTC_DISPLAY_DIS);
             break;
 
         case SCREEN_SAVER_ON:
         case SCREEN_SAVER_CYCLE:
-            outl(pATI->CPIO_CRTC_GEN_CNTL, crtc_gen_cntl & ~CRTC_EN);
+            outl(pATI->CPIO_CRTC_GEN_CNTL, crtc_gen_cntl | CRTC_DISPLAY_DIS);
             break;
 
         default:
@@ -740,6 +816,93 @@
 }
 
 /*
+ * ATIMach64SetDPMSMode --
+ *
+ * This function sets a Mach64's VESA Display Power Management Signaling mode.
+ */
+void
+ATIMach64SetDPMSMode
+(
+    ATIPtr pATI,
+    int    DPMSMode
+)
+{
+    CARD32 crtc_gen_cntl =
+        inl(pATI->CPIO_CRTC_GEN_CNTL) & ~(CRTC_HSYNC_DIS | CRTC_VSYNC_DIS);
+
+    switch (DPMSMode)
+    {
+        case DPMSModeOn:        /* HSync on, VSync on */
+            break;
+
+        case DPMSModeStandby:   /* HSync off, VSync on */
+            crtc_gen_cntl |= CRTC_HSYNC_DIS;
+            break;
+
+        case DPMSModeSuspend:   /* HSync on, VSync off */
+            crtc_gen_cntl |= CRTC_VSYNC_DIS;
+            break;
+
+        case DPMSModeOff:       /* HSync off, VSync off */
+            crtc_gen_cntl |= CRTC_HSYNC_DIS | CRTC_VSYNC_DIS;
+            break;
+
+        default:                /* Muffle compiler */
+            return;
+    }
+
+    outl(pATI->CPIO_CRTC_GEN_CNTL, crtc_gen_cntl);
+
+    if ((pATI->LCDPanelID >= 0) && !pATI->OptionCRT)
+    {
+        CARD32 lcd_index = 0, power_management;
+
+        if (pATI->Chip == ATI_CHIP_264LT)
+            power_management = inl(pATI->CPIO_POWER_MANAGEMENT);
+        else /* if ((pATI->Chip == ATI_CHIP_264LTPRO) ||
+                    (pATI->Chip == ATI_CHIP_264XL) ||
+                    (pATI->Chip == ATI_CHIP_MOBILITY)) */
+        {
+            lcd_index = inl(pATI->CPIO_LCD_INDEX);
+            power_management = ATIGetLTProLCDReg(LCD_POWER_MANAGEMENT);
+        }
+
+        power_management &= ~(STANDBY_NOW | SUSPEND_NOW);
+
+        switch (DPMSMode)
+        {
+            case DPMSModeOn:
+                break;
+
+            case DPMSModeStandby:
+                power_management |= STANDBY_NOW;
+                break;
+
+            case DPMSModeSuspend:
+                power_management |= SUSPEND_NOW;
+                break;
+
+            case DPMSModeOff:
+                power_management |= STANDBY_NOW | SUSPEND_NOW;  /* ? */
+                break;
+
+            default:            /* Muffle compiler */
+                return;
+        }
+
+        if (pATI->Chip == ATI_CHIP_264LT)
+            outl(POWER_MANAGEMENT, power_management);
+        else /* if ((pATI->Chip == ATI_CHIP_264LTPRO) ||
+                    (pATI->Chip == ATI_CHIP_264XL) ||
+                    (pATI->Chip == ATI_CHIP_MOBILITY)) */
+        {
+            ATIPutLTProLCDReg(LCD_POWER_MANAGEMENT, power_management);
+            outl(pATI->CPIO_LCD_INDEX, lcd_index);
+        }
+    }
+}
+
+/*
  * ATIMach64Sync --
  *
  * This is called to wait for the draw engine to become idle.
@@ -754,6 +917,128 @@
 
     ATIMach64WaitForIdle();
 
+    if (pATI->OptionMMIOCache)
+    {
+        /*
+         * For debugging purposes, attempt to verify that each cached register
+         * should actually be cached.
+         */
+        if (RegisterIsCached(SRC_CNTL) &&
+            (CacheSlot(SRC_CNTL) != inm(SRC_CNTL)))
+        {
+            UncacheRegister(SRC_CNTL);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "SRC_CNTL write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(HOST_CNTL) &&
+            (CacheSlot(HOST_CNTL) != inm(HOST_CNTL)))
+        {
+            UncacheRegister(HOST_CNTL);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "HOST_CNTL write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(PAT_REG0) &&
+            (CacheSlot(PAT_REG0) != inm(PAT_REG0)))
+        {
+            UncacheRegister(PAT_REG0);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "PAT_REG0 write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(PAT_REG1) &&
+            (CacheSlot(PAT_REG1) != inm(PAT_REG1)))
+        {
+            UncacheRegister(PAT_REG1);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "PAT_REG1 write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(PAT_CNTL) &&
+            (CacheSlot(PAT_CNTL) != inm(PAT_CNTL)))
+        {
+            UncacheRegister(PAT_CNTL);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "PAT_CNTL write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(SC_LEFT_RIGHT) &&
+            (CacheSlot(SC_LEFT_RIGHT) !=
+             (SetWord(inm(SC_RIGHT), 1) | SetWord(inm(SC_LEFT), 0))))
+        {
+            UncacheRegister(SC_LEFT_RIGHT);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "SC_LEFT_RIGHT write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(SC_TOP_BOTTOM) &&
+            (CacheSlot(SC_TOP_BOTTOM) !=
+             (SetWord(inm(SC_BOTTOM), 1) | SetWord(inm(SC_TOP), 0))))
+        {
+            UncacheRegister(SC_TOP_BOTTOM);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "SC_TOP_BOTTOM write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(DP_BKGD_CLR) &&
+            (CacheSlot(DP_BKGD_CLR) != inm(DP_BKGD_CLR)))
+        {
+            UncacheRegister(DP_BKGD_CLR);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "DP_BKGD_CLR write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(DP_FRGD_CLR) &&
+            (CacheSlot(DP_FRGD_CLR) != inm(DP_FRGD_CLR)))
+        {
+            UncacheRegister(DP_FRGD_CLR);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "DP_FRGD_CLR write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(DP_WRITE_MASK) &&
+            (CacheSlot(DP_WRITE_MASK) != inm(DP_WRITE_MASK)))
+        {
+            UncacheRegister(DP_WRITE_MASK);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "DP_WRITE_MASK write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(DP_MIX) &&
+            (CacheSlot(DP_MIX) != inm(DP_MIX)))
+        {
+            UncacheRegister(DP_MIX);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "DP_MIX write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(CLR_CMP_CLR) &&
+            (CacheSlot(CLR_CMP_CLR) != inm(CLR_CMP_CLR)))
+        {
+            UncacheRegister(CLR_CMP_CLR);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "CLR_CMP_CLR write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(CLR_CMP_MSK) &&
+            (CacheSlot(CLR_CMP_MSK) != inm(CLR_CMP_MSK)))
+        {
+            UncacheRegister(CLR_CMP_MSK);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "CLR_CMP_MSK write cache disabled!\n");
+        }
+
+        if (RegisterIsCached(CLR_CMP_CNTL) &&
+            (CacheSlot(CLR_CMP_CNTL) != inm(CLR_CMP_CNTL)))
+        {
+            UncacheRegister(CLR_CMP_CNTL);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "CLR_CMP_CNTL write cache disabled!\n");
+        }
+
+    }
+
     /*
      * For VTB's and later, the first CPU read of the framebuffer will return
      * zeroes, so do it here.  This appears to be due to some kind of engine
@@ -789,20 +1074,15 @@
     if (xdir > 0)
         pATI->dst_cntl |= DST_X_DIR;
 
-    if (pATI->PitchModifier == 1)
-    {
-        ATIMach64WaitForFIFO(4);
+    if (pATI->XModifier == 1)
         outm(DST_CNTL, pATI->dst_cntl);
-    }
     else
-    {
-        ATIMach64WaitForFIFO(3);
         pATI->dst_cntl |= DST_24_ROT_EN;
-    }
 
+    ATIMach64WaitForFIFO(3);
     outm(DP_MIX, SetBits(ATIMach64ALU[rop], DP_FRGD_MIX));
     outm(DP_WRITE_MASK, planemask);
-    outm(DP_SRC, SetBits(DP_MONO_SRC_ALLONES, DP_MONO_SRC) |
+    outm(DP_SRC, DP_MONO_SRC_ALLONES |
         SetBits(SRC_BLIT, DP_FRGD_SRC) | SetBits(SRC_BKGD, DP_BKGD_SRC));
 }
 
@@ -825,9 +1105,19 @@
 {
     ATIPtr pATI = ATIPTR(pScreenInfo);
 
-    xSrc *= pATI->PitchModifier;
-    xDst *= pATI->PitchModifier;
-    w    *= pATI->PitchModifier;
+    xSrc *= pATI->XModifier;
+    xDst *= pATI->XModifier;
+    w    *= pATI->XModifier;
+
+    /* Disable clipping if it gets in the way */
+    if ((xDst < (int)GetWord(CacheSlot(SC_LEFT_RIGHT), 0)) ||
+        ((xDst + w - 1) > (int)GetWord(CacheSlot(SC_LEFT_RIGHT), 1)))
+        outm(SC_LEFT_RIGHT, SetWord(pATI->NewHW.sc_right, 1) |
+            SetWord(pATI->NewHW.sc_left, 0));
+    if ((yDst < (int)GetWord(CacheSlot(SC_TOP_BOTTOM), 0)) ||
+        ((yDst + h - 1) > (int)GetWord(CacheSlot(SC_TOP_BOTTOM), 1)))
+        outm(SC_TOP_BOTTOM, SetWord(pATI->NewHW.sc_bottom, 1) |
+            SetWord(pATI->NewHW.sc_top, 0));
 
     if (!(pATI->dst_cntl & DST_X_DIR))
     {
@@ -841,14 +1131,10 @@
         yDst += h - 1;
     }
 
-    if (pATI->PitchModifier == 1)
-        ATIMach64WaitForFIFO(4);
-    else
-    {
-        ATIMach64WaitForFIFO(5);
+    if (pATI->XModifier != 1)
         outm(DST_CNTL, pATI->dst_cntl | SetBits((xDst / 4) % 6, DST_24_ROT));
-    }
 
+    ATIMach64WaitForFIFO(4);
     outm(SRC_Y_X, SetWord(xSrc, 1) | SetWord(ySrc, 0));
     outm(SRC_WIDTH1, w);
     outm(DST_Y_X, SetWord(xDst, 1) | SetWord(yDst, 0));
@@ -871,17 +1157,13 @@
 {
     ATIPtr pATI = ATIPTR(pScreenInfo);
 
-    if (pATI->PitchModifier != 1)
-        ATIMach64WaitForFIFO(4);
-    else
-    {
-        ATIMach64WaitForFIFO(5);
-        outm(DST_CNTL, pATI->NewHW.dst_cntl);
-    }
+    if (pATI->XModifier == 1)
+        outm(DST_CNTL, DST_X_DIR | DST_Y_DIR);
 
+    ATIMach64WaitForFIFO(4);
     outm(DP_MIX, SetBits(ATIMach64ALU[rop], DP_FRGD_MIX));
     outm(DP_WRITE_MASK, planemask);
-    outm(DP_SRC, SetBits(DP_MONO_SRC_ALLONES, DP_MONO_SRC) |
+    outm(DP_SRC, DP_MONO_SRC_ALLONES |
         SetBits(SRC_FRGD, DP_FRGD_SRC) | SetBits(SRC_BKGD, DP_BKGD_SRC));
     outm(DP_FRGD_CLR, colour);
 }
@@ -903,64 +1185,319 @@
 {
     ATIPtr pATI = ATIPTR(pScreenInfo);
 
-    if (pATI->PitchModifier == 1)
-       ATIMach64WaitForFIFO(2);
-    else
+    if (pATI->XModifier != 1)
     {
-        x *= pATI->PitchModifier;
-        w *= pATI->PitchModifier;
+        x *= pATI->XModifier;
+        w *= pATI->XModifier;
 
-        ATIMach64WaitForFIFO(3);
-        outm(DST_CNTL, pATI->NewHW.dst_cntl | DST_24_ROT_EN |
-            SetBits((x / 4) % 6, DST_24_ROT));
+        outm(DST_CNTL, SetBits((x / 4) % 6, DST_24_ROT) |
+            (DST_X_DIR | DST_Y_DIR | DST_24_ROT_EN));
     }
 
+    /* Disable clipping if it gets in the way */
+    if ((x < (int)GetWord(CacheSlot(SC_LEFT_RIGHT), 0)) ||
+        ((x + w - 1) > (int)GetWord(CacheSlot(SC_LEFT_RIGHT), 1)))
+        outm(SC_LEFT_RIGHT, SetWord(pATI->NewHW.sc_right, 1) |
+            SetWord(pATI->NewHW.sc_left, 0));
+    if ((y < (int)GetWord(CacheSlot(SC_TOP_BOTTOM), 0)) ||
+        ((y + h - 1) > (int)GetWord(CacheSlot(SC_TOP_BOTTOM), 1)))
+        outm(SC_TOP_BOTTOM, SetWord(pATI->NewHW.sc_bottom, 1) |
+            SetWord(pATI->NewHW.sc_top, 0));
+
+    ATIMach64WaitForFIFO(2);
     outm(DST_Y_X, SetWord(x, 1) | SetWord(y, 0));
     outm(DST_HEIGHT_WIDTH, SetWord(w, 1) | SetWord(h, 0));
 }
 
+/*
+ * ATIMach64SetupForSolidLine --
+ *
+ * This function sets up the draw engine for a series of solid lines.  It is
+ * not used for 24bpp because the engine doesn't support it.
+ */
+static void
+ATIMach64SetupForSolidLine
+(
+    ScrnInfoPtr  pScreenInfo,
+    int          colour,
+    int          rop,
+    unsigned int planemask
+)
+{
+    ATIPtr pATI = ATIPTR(pScreenInfo);
+
+    ATIMach64WaitForFIFO(6);
+    outm(DP_MIX, SetBits(ATIMach64ALU[rop], DP_FRGD_MIX));
+    outm(DP_WRITE_MASK, planemask);
+    outm(DP_SRC, DP_MONO_SRC_ALLONES |
+        SetBits(SRC_FRGD, DP_FRGD_SRC) | SetBits(SRC_BKGD, DP_BKGD_SRC));
+    outm(DP_FRGD_CLR, colour);
+
+    outm(SC_LEFT_RIGHT,
+        SetWord(pATI->NewHW.sc_right, 1) | SetWord(pATI->NewHW.sc_left, 0));
+    outm(SC_TOP_BOTTOM,
+        SetWord(pATI->NewHW.sc_bottom, 1) | SetWord(pATI->NewHW.sc_top, 0));
+}
+
 /*
- * ATIMach64SetClippingRectangle --
+ * ATIMach64SubsequentSolidHorVertLine --
  *
- * This function sets the draw engine's clipping rectangle.
+ * This is called to draw a solid horizontal or vertical line.  This does a
+ * one-pixel wide solid fill.
  */
 static void
-ATIMach64SetClippingRectangle
+ATIMach64SubsequentSolidHorVertLine
 (
     ScrnInfoPtr pScreenInfo,
-    int         left,
-    int         top,
-    int         right,
-    int         bottom
+    int         x,
+    int         y,
+    int         len,
+    int         dir
 )
 {
     ATIPtr pATI = ATIPTR(pScreenInfo);
 
-    ATIMach64WaitForFIFO(2);
-    outm(SC_LEFT_RIGHT, SetWord(((right + 1) * pATI->PitchModifier) - 1, 1) |
-        SetWord(left * pATI->PitchModifier, 0));
-    outm(SC_TOP_BOTTOM, SetWord(bottom, 1) | SetWord(top, 0));
+    ATIMach64WaitForFIFO(3);
+    outm(DST_CNTL, DST_X_DIR | DST_Y_DIR);
+    outm(DST_Y_X, SetWord(x, 1) | SetWord(y, 0));
+
+    if (dir == DEGREES_0)
+        outm(DST_HEIGHT_WIDTH, SetWord(len, 1) | SetWord(1, 0));
+    else /* if (dir == DEGREES_270) */
+        outm(DST_HEIGHT_WIDTH, SetWord(1, 1) | SetWord(len, 0));
 }
 
 /*
- * ATIMach64DisableClipping --
+ * ATIMach64SubsequentSolidBresenhamLine --
  *
- * This function resets the draw engine's clipping rectangle to include the
- * entire virtual resolution.
+ * This function draws a line using the Bresenham line engine.
  */
 static void
-ATIMach64DisableClipping
+ATIMach64SubsequentSolidBresenhamLine
 (
-    ScrnInfoPtr pScreenInfo
+    ScrnInfoPtr pScreenInfo,
+    int         x,
+    int         y,
+    int         major,
+    int         minor,
+    int         err,
+    int         len,
+    int         octant
 )
 {
     ATIPtr pATI = ATIPTR(pScreenInfo);
+    CARD32 dst_cntl = DST_LAST_PEL;
+
+    if (octant & YMAJOR)
+        dst_cntl |= DST_Y_MAJOR;
+
+    if (!(octant & XDECREASING))
+        dst_cntl |= DST_X_DIR;
 
+    if (!(octant & YDECREASING))
+        dst_cntl |= DST_Y_DIR;
+
+    ATIMach64WaitForFIFO(6);
+    outm(DST_CNTL, dst_cntl);
+    outm(DST_Y_X, SetWord(x, 1) | SetWord(y, 0));
+    outm(DST_BRES_ERR, minor + err);
+    outm(DST_BRES_INC, minor);
+    outm(DST_BRES_DEC, minor - major);
+    outm(DST_BRES_LNTH, len);
+}
+
+/*
+ * ATIMach64SetupForMono8x8PatternFill --
+ *
+ * This function sets up the draw engine for a series of 8x8 1bpp pattern
+ * fills.
+ */
+static void
+ATIMach64SetupForMono8x8PatternFill
+(
+    ScrnInfoPtr  pScreenInfo,
+    int          patx,
+    int          paty,
+    int          fg,
+    int          bg,
+    int          rop,
+    unsigned int planemask
+)
+{
+    ATIPtr pATI = ATIPTR(pScreenInfo);
+
+    if (pATI->XModifier == 1)
+        outm(DST_CNTL, DST_X_DIR | DST_Y_DIR);
+
+    if (bg == -1)
+        outm(DP_MIX, SetBits(ATIMach64ALU[rop], DP_FRGD_MIX) |
+            SetBits(MIX_DST, DP_BKGD_MIX));
+    else
+    {
+        ATIMach64WaitForFIFO(2);
+        outm(DP_MIX, SetBits(ATIMach64ALU[rop], DP_FRGD_MIX) |
+            SetBits(ATIMach64ALU[rop], DP_BKGD_MIX));
+        outm(DP_BKGD_CLR, bg);
+    }
+
+    ATIMach64WaitForFIFO(6);
+    outm(DP_WRITE_MASK, planemask);
+    outm(DP_SRC, DP_MONO_SRC_PATTERN |
+        SetBits(SRC_FRGD, DP_FRGD_SRC) | SetBits(SRC_BKGD, DP_BKGD_SRC));
+    outm(DP_FRGD_CLR, fg);
+
+    outm(PAT_REG0, patx);
+    outm(PAT_REG1, paty);
+    outm(PAT_CNTL, PAT_MONO_EN);
+}
+
+/*
+ * ATIMach64SubsequentMono8x8PatternFillRect --
+ *
+ * This function performs an 8x8 1bpp pattern fill.
+ */
+static void
+ATIMach64SubsequentMono8x8PatternFillRect
+(
+    ScrnInfoPtr pScreenInfo,
+    int         patx,
+    int         paty,
+    int         x,
+    int         y,
+    int         w,
+    int         h
+)
+{
+    ATIPtr pATI = ATIPTR(pScreenInfo);
+
+    if (pATI->XModifier != 1)
+    {
+        x *= pATI->XModifier;
+        w *= pATI->XModifier;
+
+        outm(DST_CNTL, SetBits((x / 4) % 6, DST_24_ROT) |
+            (DST_X_DIR | DST_Y_DIR | DST_24_ROT_EN));
+    }
+
+    /* Disable clipping if it gets in the way */
+    if ((x < (int)GetWord(CacheSlot(SC_LEFT_RIGHT), 0)) ||
+        ((x + w - 1) > (int)GetWord(CacheSlot(SC_LEFT_RIGHT), 1)))
+        outm(SC_LEFT_RIGHT, SetWord(pATI->NewHW.sc_right, 1) |
+            SetWord(pATI->NewHW.sc_left, 0));
+    if ((y < (int)GetWord(CacheSlot(SC_TOP_BOTTOM), 0)) ||
+        ((y + h - 1) > (int)GetWord(CacheSlot(SC_TOP_BOTTOM), 1)))
+        outm(SC_TOP_BOTTOM, SetWord(pATI->NewHW.sc_bottom, 1) |
+            SetWord(pATI->NewHW.sc_top, 0));
+
     ATIMach64WaitForFIFO(2);
-    outm(SC_LEFT_RIGHT,
-        SetWord(pATI->NewHW.sc_right, 1) | SetWord(pATI->NewHW.sc_left, 0));
-    outm(SC_TOP_BOTTOM,
-        SetWord(pATI->NewHW.sc_bottom, 1) | SetWord(pATI->NewHW.sc_top, 0));
+    outm(DST_Y_X, SetWord(x, 1) | SetWord(y, 0));
+    outm(DST_HEIGHT_WIDTH, SetWord(w, 1) | SetWord(h, 0));
+}
+
+/*
+ * ATIMach64SetupForScanlineCPUToScreenColorExpandFill --
+ *
+ * This function sets up the engine for a series of colour expansion fills.
+ */
+static void
+ATIMach64SetupForScanlineCPUToScreenColorExpandFill
+(
+    ScrnInfoPtr  pScreenInfo,
+    int          fg,
+    int          bg,
+    int          rop,
+    unsigned int planemask
+)
+{
+    ATIPtr pATI = ATIPTR(pScreenInfo);
+
+    if (pATI->XModifier == 1)
+        outm(DST_CNTL, DST_X_DIR | DST_Y_DIR);
+
+    if (bg == -1)
+        outm(DP_MIX, SetBits(ATIMach64ALU[rop], DP_FRGD_MIX) |
+            SetBits(MIX_DST, DP_BKGD_MIX));
+    else
+    {
+        ATIMach64WaitForFIFO(2);
+        outm(DP_MIX, SetBits(ATIMach64ALU[rop], DP_FRGD_MIX) |
+            SetBits(ATIMach64ALU[rop], DP_BKGD_MIX));
+        outm(DP_BKGD_CLR, bg);
+    }
+
+    ATIMach64WaitForFIFO(3);
+    outm(DP_WRITE_MASK, planemask);
+    outm(DP_SRC, DP_MONO_SRC_HOST |
+        SetBits(SRC_FRGD, DP_FRGD_SRC) | SetBits(SRC_BKGD, DP_BKGD_SRC));
+    outm(DP_FRGD_CLR, fg);
+}
+
+/*
+ * ATIMach64SubsequentScanlineCPUToScreenColorExpandFill --
+ *
+ * This function sets up the engine for a single colour expansion fill.
+ */
+static void
+ATIMach64SubsequentScanlineCPUToScreenColorExpandFill
+(
+    ScrnInfoPtr pScreenInfo,
+    int         x,
+    int         y,
+    int         w,
+    int         h,
+    int         skipleft
+)
+{
+    ATIPtr pATI = ATIPTR(pScreenInfo);
+
+    if (pATI->XModifier != 1)
+    {
+        x *= pATI->XModifier;
+        w *= pATI->XModifier;
+        skipleft *= pATI->XModifier;
+
+        outm(DST_CNTL, SetBits((x / 4) % 6, DST_24_ROT) |
+            (DST_X_DIR | DST_Y_DIR | DST_24_ROT_EN));
+    }
+
+    pATI->ExpansionBitmapWidth = (w + 31) / 32;
+
+    ATIMach64WaitForFIFO(3);
+    outm(SC_LEFT_RIGHT, SetWord(x + w - 1, 1) | SetWord(x + skipleft, 0));
+    outm(DST_Y_X, SetWord(x, 1) | SetWord(y, 0));
+    outm(DST_HEIGHT_WIDTH,
+        SetWord(pATI->ExpansionBitmapWidth * 32, 1) | SetWord(h, 0));
+}
+
+/*
+ * ATIMach64SubsequentColorExpandScanline --
+ *
+ * This function feeds a bitmap scanline to the engine for a colour expansion
+ * fill.
+ */
+static void
+ATIMach64SubsequentColorExpandScanline
+(
+    ScrnInfoPtr pScreenInfo,
+    int         iBuffer
+)
+{
+    ATIPtr pATI         = ATIPTR(pScreenInfo);
+    CARD32 *pBitmapData = pATI->ExpansionBitmapScanline;
+    int    w            = pATI->ExpansionBitmapWidth;
+    int    nFIFOEntries = pATI->nFIFOEntries;
+
+    pATI->nFIFOEntries >>= 1;
+
+    for (;  w > 0;  w--, pBitmapData++)
+    {
+        if (!pATI->nAvailableFIFOEntries && (w > 1))
+            ATIMach64WaitForFIFO(w);
+
+        outm(HOST_DATA_0, *pBitmapData);
+    }
+
+    pATI->nFIFOEntries = nFIFOEntries;
 }
 
 /*
@@ -972,14 +1509,12 @@
 Bool
 ATIMach64AccelInit
 (
-    ScrnInfoPtr   pScreenInfo,
-    ScreenPtr     pScreen,
     ATIPtr        pATI,
     XAAInfoRecPtr pXAAInfo
 )
 {
     /* This doesn't seem quite right... */
-    if (pATI->PitchModifier == 1)
+    if (pATI->XModifier == 1)
     {
         pXAAInfo->Flags = PIXMAP_CACHE | OFFSCREEN_PIXMAPS;
         if (!pATI->BankInfo.BankSize)
@@ -998,14 +1533,44 @@
     /* Solid fills */
     pXAAInfo->SetupForSolidFill = ATIMach64SetupForSolidFill;
     pXAAInfo->SubsequentSolidFillRect = ATIMach64SubsequentSolidFillRect;
+
+    /* 8x8 mono pattern fills */
+    pXAAInfo->Mono8x8PatternFillFlags = HARDWARE_PATTERN_PROGRAMMED_BITS |
+        HARDWARE_PATTERN_SCREEN_ORIGIN | BIT_ORDER_IN_BYTE_MSBFIRST;
+    pXAAInfo->SetupForMono8x8PatternFill = ATIMach64SetupForMono8x8PatternFill;
+    pXAAInfo->SubsequentMono8x8PatternFillRect =
+        ATIMach64SubsequentMono8x8PatternFillRect;
 
-    /* Clips */
-    pXAAInfo->ClippingFlags = HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND |
-        HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY | HARDWARE_CLIP_MONO_8x8_FILL |
-        HARDWARE_CLIP_COLOR_8x8_FILL | HARDWARE_CLIP_SOLID_FILL |
-        HARDWARE_CLIP_DASHED_LINE | HARDWARE_CLIP_SOLID_LINE;
-    pXAAInfo->SetClippingRectangle = ATIMach64SetClippingRectangle;
-    pXAAInfo->DisableClipping = ATIMach64DisableClipping;
+    /*
+     * Use scanline version of colour expansion, not only for the non-ix86
+     * case, but also to avoid PCI retries.
+     */
+    pXAAInfo->ScanlineCPUToScreenColorExpandFillFlags =
+        LEFT_EDGE_CLIPPING | LEFT_EDGE_CLIPPING_NEGATIVE_X |
+        BIT_ORDER_IN_BYTE_MSBFIRST | CPU_TRANSFER_PAD_DWORD |
+        SCANLINE_PAD_DWORD;
+    if (pATI->XModifier != 1)
+        pXAAInfo->ScanlineCPUToScreenColorExpandFillFlags |= TRIPLE_BITS_24BPP;
+    pXAAInfo->NumScanlineColorExpandBuffers = 1;
+    pATI->ExpansionBitmapScanlinePtr = pATI->ExpansionBitmapScanline;
+    pXAAInfo->ScanlineColorExpandBuffers =
+        (CARD8 **)&pATI->ExpansionBitmapScanlinePtr;
+    pXAAInfo->SetupForScanlineCPUToScreenColorExpandFill =
+        ATIMach64SetupForScanlineCPUToScreenColorExpandFill;
+    pXAAInfo->SubsequentScanlineCPUToScreenColorExpandFill =
+        ATIMach64SubsequentScanlineCPUToScreenColorExpandFill;
+    pXAAInfo->SubsequentColorExpandScanline =
+        ATIMach64SubsequentColorExpandScanline;
+
+    /* The engine does not support the following primitives for 24bpp */
+    if (pATI->XModifier != 1)
+        return TRUE;
+
+    /* Solid lines */
+    pXAAInfo->SetupForSolidLine = ATIMach64SetupForSolidLine;
+    pXAAInfo->SubsequentSolidHorVertLine = ATIMach64SubsequentSolidHorVertLine;
+    pXAAInfo->SubsequentSolidBresenhamLine =
+        ATIMach64SubsequentSolidBresenhamLine;
 
     return TRUE;
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.h:1.4 xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.h:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.h:1.4	Fri Feb 18 04:19:26 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.h	Mon Jun 19 08:00:57 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.h,v 1.4 2000/02/18 12:19:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.h,v 1.8 2000/06/19 15:00:57 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -28,16 +28,19 @@
 #include "atiproto.h"
 #include "xaa.h"
 
-extern void ATIMach64PreInit    FunctionPrototype((ScrnInfoPtr, ATIPtr,
-                                                   ATIHWPtr));
-extern void ATIMach64Save       FunctionPrototype((ATIPtr, ATIHWPtr));
-extern void ATIMach64Calculate  FunctionPrototype((ScrnInfoPtr, ATIPtr,
-                                                   ATIHWPtr, DisplayModePtr));
-extern void ATIMach64Set        FunctionPrototype((ATIPtr, ATIHWPtr));
+#define ATIMach64MaxX    8191
+#define ATIMach64MaxY   32767
 
-extern void ATIMach64SaveScreen FunctionPrototype((ATIPtr, int));
+extern void ATIMach64PreInit     FunctionPrototype((ScrnInfoPtr, ATIPtr,
+                                                    ATIHWPtr));
+extern void ATIMach64Save        FunctionPrototype((ATIPtr, ATIHWPtr));
+extern void ATIMach64Calculate   FunctionPrototype((ATIPtr, ATIHWPtr,
+                                                    DisplayModePtr));
+extern void ATIMach64Set         FunctionPrototype((ATIPtr, ATIHWPtr));
 
-extern Bool ATIMach64AccelInit  FunctionPrototype((ScrnInfoPtr, ScreenPtr,
-                                                   ATIPtr, XAAInfoRecPtr));
+extern void ATIMach64SaveScreen  FunctionPrototype((ATIPtr, int));
+extern void ATIMach64SetDPMSMode FunctionPrototype((ATIPtr, int));
+
+extern Bool ATIMach64AccelInit   FunctionPrototype((ATIPtr, XAAInfoRecPtr));
 
 #endif /* ___ATIMACH64_H___ */
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atimodule.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atimodule.c:1.5 xc/programs/Xserver/hw/xfree86/drivers/ati/atimodule.c:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atimodule.c:1.5	Fri Feb 18 04:19:26 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atimodule.c	Mon Jun 19 08:00:57 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimodule.c,v 1.5 2000/02/18 12:19:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimodule.c,v 1.6 2000/06/19 15:00:57 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -147,7 +147,7 @@
     }
 
     /* Load depth-specific entry points */
-    switch (pScreenInfo->bitsPerPixel)
+    switch (pATI->bitsPerPixel)
     {
         case 1:
             return ATILoadModule(pScreenInfo, "xf1bpp", "xf1bppScreenInit");
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c:1.6	Fri Feb 18 04:19:27 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c	Tue May  2 17:44:06 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c,v 1.6 2000/02/18 12:19:27 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c,v 1.8 2000/05/03 00:44:06 tsi Exp $ */
 /*
  * Copyright 1999 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -26,7 +26,6 @@
 #include "atibus.h"
 #include "atioption.h"
 #include "atistruct.h"
-#include "atiutil.h"
 
 /*
  * Recognised XF86Config options.
@@ -37,6 +36,7 @@
     ATI_OPTION_CRT,
     ATI_OPTION_CSYNC,
     ATI_OPTION_LINEAR,
+    ATI_OPTION_MMIO_CACHE,
     ATI_OPTION_PROBE_CLOCKS,
     ATI_OPTION_SHADOW_FB
 } ATIPublicOptionType;
@@ -53,6 +53,7 @@
     {ATI_OPTION_CRT,          "crt_screen",     OPTV_BOOLEAN, {0, }, FALSE},
     {ATI_OPTION_CSYNC,        "composite_sync", OPTV_BOOLEAN, {0, }, FALSE},
     {ATI_OPTION_LINEAR,       "linear",         OPTV_BOOLEAN, {0, }, FALSE},
+    {ATI_OPTION_MMIO_CACHE,   "mmio_cache",     OPTV_BOOLEAN, {0, }, FALSE},
     {ATI_OPTION_PROBE_CLOCKS, "probe_clocks",   OPTV_BOOLEAN, {0, }, FALSE},
     {ATI_OPTION_SHADOW_FB,    "shadow_fb",      OPTV_BOOLEAN, {0, }, FALSE},
     {-1,                      NULL,             OPTV_NONE   , {0, }, FALSE}
@@ -94,13 +95,14 @@
         {-1,                      NULL,             OPTV_NONE   , {0, }, FALSE}
     };
 
-    memcpy(PublicOption, ATIPublicOptions, SizeOf(ATIPublicOptions));
+    (void)memcpy(PublicOption, ATIPublicOptions, SizeOf(ATIPublicOptions));
 
 #   define Accel       PublicOption[ATI_OPTION_ACCEL].value.bool
 #   define CRTScreen   PublicOption[ATI_OPTION_CRT].value.bool
 #   define CSync       PublicOption[ATI_OPTION_CSYNC].value.bool
 #   define Devel       PrivateOption[ATI_OPTION_DEVEL].value.bool
 #   define Linear      PublicOption[ATI_OPTION_LINEAR].value.bool
+#   define CacheMMIO   PublicOption[ATI_OPTION_MMIO_CACHE].value.bool
 #   define ProbeClocks PublicOption[ATI_OPTION_PROBE_CLOCKS].value.bool
 #   define ShadowFB    PublicOption[ATI_OPTION_SHADOW_FB].value.bool
 #   define Sync        PrivateOption[ATI_OPTION_SYNC].value.bool
@@ -110,7 +112,7 @@
 
     /* Set non-zero defaults */
     if (pATI->Adapter >= ATI_ADAPTER_MACH64)
-        Accel = Linear = TRUE;
+        Accel = Linear = CacheMMIO = TRUE;
     if (pATI->BusType >= ATI_BUS_PCI)
         ShadowFB = TRUE;
     Sync = TRUE;
@@ -135,6 +137,7 @@
     pATI->OptionCSync = CSync;
     pATI->OptionDevel = Devel;
     pATI->OptionLinear = Linear;
+    pATI->OptionMMIOCache = CacheMMIO;
     pATI->OptionProbeClocks = ProbeClocks;
     pATI->OptionShadowFB = ShadowFB;
     pATI->OptionSync = Sync;
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c:1.16 xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c:1.26
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c:1.16	Tue Mar  7 08:31:53 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	Mon Jun 19 08:00:57 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.16 2000/03/07 16:31:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.26 2000/06/19 15:00:57 tsi Exp $ */
 /*
  * Copyright 1999 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -24,20 +24,20 @@
 #include "ati.h"
 #include "atiadapter.h"
 #include "atiadjust.h"
-#include "atibios.h"
 #include "atibus.h"
 #include "atichip.h"
 #include "atidac.h"
 #include "atidsp.h"
 #include "atiident.h"
 #include "atilock.h"
+#include "atimach64.h"
 #include "atimodule.h"
 #include "atioption.h"
 #include "atipreinit.h"
 #include "atiprint.h"
 #include "atividmem.h"
+#include "vbe.h"
 #include "xf86RAC.h"
-#include "xf86Resources.h"
 
 typedef CARD16 Colour;          /* The correct spelling should be OK :-) */
 
@@ -295,7 +295,7 @@
     Message = Buffer +
         snprintf(Buffer, SizeOf(Buffer), "%d kB of %s detected",
             pATI->VideoRAM, MemoryTypeName);
-    if (pScreenInfo->depth == 1)
+    if (pATI->depth == 1)
     {
         /* 1bpp only uses one plane of four */
         pScreenInfo->videoRam /= 4;
@@ -326,32 +326,35 @@
     int flags
 )
 {
-#   define          BIOS_SIZE        0x00010000U     /* 64kB */
-    CARD8           BIOS[BIOS_SIZE];
-#   define          BIOSByte(_n)     (*((CARD8  *)(BIOS + (_n))))
-#   define          BIOSWord(_n)     (*((CARD16 *)(BIOS + (_n))))
-#   define          BIOSLong(_n)     (*((CARD32 *)(BIOS + (_n))))
-    unsigned int    BIOSSize = BIOS_SIZE;
-    unsigned int    ROMTable = 0, ClockTable = 0, FrequencyTable = 0;
-    unsigned int    LCDTable = 0, LCDPanelInfo = 0;
-
-    char            Buffer[128], *Message;
-    ATIPtr          pATI;
-    GDevPtr         pGDev;
-    EntityInfoPtr   pEntity;
-    resPtr          pResources;
-    Bool            AllowCRT = TRUE;
-    CARD32          IOValue1, IOValue2;
-    int             i, j, AcceleratorVideoRAM = 0, VGAVideoRAM = 0;
-    int             Numerator, Denominator;
-    resRange        Resources[2] = {{0, 0, 0}, _END};
-    ClockRange      ATIClockRange = {NULL, 0, 80000, 0, TRUE, TRUE, 1, 1, 0};
-    int             minPitch, maxPitch = 0xFFU, pitchInc;
-    LookupModeFlags Strategy = LOOKUP_CLOSEST_CLOCK;
+#   define           BIOS_SIZE       0x00010000U     /* 64kB */
+    CARD8            BIOS[BIOS_SIZE], *pBIOS;
+#   define           BIOSByte(_n)    (*((CARD8  *)(BIOS + (_n))))
+#   define           BIOSWord(_n)    (*((CARD16 *)(BIOS + (_n))))
+#   define           BIOSLong(_n)    (*((CARD32 *)(BIOS + (_n))))
+    unsigned int     BIOSSize;
+    unsigned int     ROMTable = 0, ClockTable = 0, FrequencyTable = 0;
+    unsigned int     LCDTable = 0, LCDPanelInfo = 0;
+
+    char             Buffer[128], *Message;
+    ATIPtr           pATI;
+    GDevPtr          pGDev;
+    EntityInfoPtr    pEntity;
+    resPtr           pResources;
+    DisplayModePtr   pMode;
+    xf86Int10InfoPtr pInt10Info;
+    vbeInfoPtr       pVBE;
+    xf86MonPtr       pMonitor = NULL;
+    pointer          pInt10Module, pDDCModule, pVBEModule = NULL;
+    Bool             AllowCRT = TRUE;
+    CARD32           IOValue1, IOValue2 = 0;
+    int              i, j, AcceleratorVideoRAM = 0, VGAVideoRAM = 0;
+    int              Numerator, Denominator;
+    int              MinX, MinY;
+    resRange         Resources[2] = {{0, 0, 0}, _END};
+    ClockRange       ATIClockRange = {NULL, 0, 80000, 0, TRUE, TRUE, 1, 1, 0};
+    int              minPitch, maxPitch = 0xFFU, maxHeight = 0;
+    LookupModeFlags  Strategy = LOOKUP_CLOSEST_CLOCK;
 
-    if (flags & PROBE_DETECT)
-        return FALSE;
-
     if (pScreenInfo->numEntities != 1)
     {
         xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
@@ -368,6 +371,69 @@
         return FALSE;
     }
 
+    /*
+     * Get adapter BIOS, after ensuring its initialisation entry point has been
+     * executed.
+     */
+    if (!(pInt10Module = xf86LoadSubModule(pScreenInfo, "int10")))
+    {
+        xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+            "Unable to load int10 module.\n");
+        return FALSE;
+    }
+
+    if (!(pInt10Info = xf86InitInt10(pATI->iEntity)))
+    {
+        xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+             "Unable to initialise int10 interface.\n");
+        xf86UnloadSubModule(pInt10Module);
+        return FALSE;
+    }
+
+    if (!(pDDCModule = xf86LoadSubModule(pScreenInfo, "ddc")))
+        xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+            "Unable to load ddc module.\n");
+    else if (!(pVBEModule = xf86LoadSubModule(pScreenInfo, "vbe")))
+        xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+            "Unable to load vbe module.\n");
+    else
+    {
+        if ((pVBE = VBEInit(pInt10Info, pATI->iEntity)))
+            pMonitor = vbeDoEDID(pVBE, pDDCModule);
+        vbeFree(pVBE);
+        xf86UnloadSubModule(pVBEModule);
+    }
+
+    /*
+     * Validate, then make a private copy of, the initialised BIOS.  This
+     * allows de-activating int10 early.
+     */
+    pBIOS = xf86int10Addr(pInt10Info, pInt10Info->BIOSseg << 4);
+    if ((pBIOS[0] != 0x55U) || (pBIOS[1] != 0xAAU) || !pBIOS[2])
+    {
+        xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+            "Unable to correctly retrieve adapter BIOS.\n");
+        xf86FreeInt10(pInt10Info);
+        xf86UnloadSubModule(pInt10Module);
+        return FALSE;
+    }
+
+    BIOSSize = pBIOS[2] << 9;
+    (void)memcpy(BIOS, pBIOS, BIOSSize);
+    if (BIOSSize < SizeOf(BIOS))
+        (void)memset(BIOS + BIOSSize, 0, SizeOf(BIOS) - BIOSSize);
+
+    /* De-activate int10 */
+    xf86FreeInt10(pInt10Info);
+    xf86UnloadSubModule(pInt10Module);
+
+    if (flags & PROBE_DETECT)
+    {
+        ConfiguredMonitor = pMonitor;
+        xf86UnloadSubModule(pDDCModule);
+        return TRUE;
+    }
+
     /* Register resources */
     pEntity = xf86GetEntityInfo(pScreenInfo->entityList[0]);
     pGDev = pEntity->device;
@@ -381,6 +447,7 @@
         xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
             "Unable to register the following bus resources:\n");
         xf86PrintResList(0, pResources);
+        xf86FreeResList(pResources);
         return FALSE;
     }
 
@@ -390,6 +457,15 @@
     /* Set monitor */
     pScreenInfo->monitor = pScreenInfo->confScreen->monitor;
 
+    if (pMonitor)
+    {
+        xf86PrintEDID(pMonitor);
+        xf86SetDDCproperties(pScreenInfo, pMonitor);
+    }
+
+    /* DDC module is no longer needed at this point */
+    xf86UnloadSubModule(pDDCModule);
+
     /* Deal with ChipID & ChipRev overrides */
     if (pGDev->chipID >= 0)
     {
@@ -533,11 +609,9 @@
                     pATI->VideoRAM = (IOValue1 - 7) * 2048;
             }
 
-            IOValue1 = inl(pATI->CPIO_DAC_CNTL);
-            pATI->DAC = GetBits(IOValue1, DAC_TYPE);
+            pATI->DAC = GetBits(inl(pATI->CPIO_DAC_CNTL), DAC_TYPE);
 
             IOValue1 = inl(ATIIOPort(CONFIG_STATUS64_0));
-            IOValue2 = inl(ATIIOPort(SCRATCH_REG1));
             if (pATI->Chip >= ATI_CHIP_264CT)
             {
                 pATI->MemoryType = GetBits(IOValue1, CFG_MEM_TYPE_T);
@@ -550,6 +624,7 @@
                     pATI->CPIO_HORZ_STRETCHING = ATIIOPort(HORZ_STRETCHING);
                     pATI->CPIO_VERT_STRETCHING = ATIIOPort(VERT_STRETCHING);
                     pATI->CPIO_LCD_GEN_CTRL = ATIIOPort(LCD_GEN_CTRL);
+                    pATI->CPIO_POWER_MANAGEMENT = ATIIOPort(POWER_MANAGEMENT);
 
                     IOValue2 = inl(pATI->CPIO_LCD_GEN_CTRL);
                 }
@@ -600,7 +675,8 @@
 
                 /* Factor in what the BIOS says the DAC is */
                 pATI->DAC = ATI_DAC(pATI->DAC,
-                    GetBits(IOValue2, BIOS_INIT_DAC_SUBTYPE));
+                    GetBits(inl(ATIIOPort(SCRATCH_REG1)),
+                        BIOS_INIT_DAC_SUBTYPE));
             }
 
             /*
@@ -616,25 +692,6 @@
             break;
     }
 
-    /* Get PCI or legacy video BIOS, >all< of it */
-    i = ATIReadBIOS(pATI, BIOS, 0, SizeOf(BIOS));
-
-    /* Clear off what could not be read */
-    if (i < 0)
-        i = 0;
-    if (i < SizeOf(BIOS))
-        memset(BIOS + i, 0, SizeOf(BIOS) - i);
-    if ((BIOSByte(0) == 0x55U) && (BIOSByte(1) == 0xAAU) && BIOSByte(2))
-        BIOSSize = BIOSByte(2) << 9;
-    else
-        i = 0;
-    if ((unsigned int)i < BIOSSize)
-    {
-        xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
-            "Unable to correctly read adapter BIOS.\n");
-        return FALSE;
-    }
-
     /*
      * For Mach64 adapters, pick up, from the BIOS, the type of programmable
      * clock generator (if any), and various information about it.
@@ -810,6 +867,7 @@
                             i += j;
                             goto NextBIOSByte;
                         }
+
                     /* ... verify panel width ... */
                     if ((pATI->LCDHorizontal > 8) &&
                         (pATI->LCDHorizontal <=
@@ -845,7 +903,7 @@
 
             if (LCDPanelInfo > 0)
             {
-                CARD8 ClockMask, PostMask, xpDiv, maxpDiv, pDiv;
+                CARD8 ClockMask, PostMask;
 
                 pATI->LCDPanelID = BIOSByte(LCDPanelInfo);
                 pATI->LCDHorizontal = BIOSWord(LCDPanelInfo + 0x19U);
@@ -864,10 +922,9 @@
                  */
                 ClockMask = PLL_VCLK0_XDIV << i;
                 PostMask = PLL_VCLK0_POST_DIV << (i * 2);
-                xpDiv = GetBits(ATIGetMach64PLLReg(PLL_XCLK_CNTL), ClockMask);
-                maxpDiv = MaxBits(PLL_VCLK0_POST_DIV) + 1;
-                pDiv = GetBits(ATIGetMach64PLLReg(PLL_VCLK_POST_DIV), PostMask);
-                j = (xpDiv * maxpDiv) | pDiv;
+                j = GetBits(ATIGetMach64PLLReg(PLL_XCLK_CNTL), ClockMask);
+                j *= MaxBits(PLL_VCLK0_POST_DIV) + 1;
+                j |= GetBits(ATIGetMach64PLLReg(PLL_VCLK_POST_DIV), PostMask);
 
                 /* Calculate clock of mode on entry */
                 Numerator = ATIGetMach64PLLReg(PLL_VCLK0_FB_DIV + i) *
@@ -999,14 +1056,6 @@
             "Panel clock is %.3f MHz.\n", (double)(pATI->LCDClock) / 1000.0);
     }
 
-    /* Report BIOS address */
-    if (pATI->BIOSBase)
-        xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
-            "BIOS bus address:  0x%08X.\n", pATI->BIOSBase);
-    else
-        xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
-            "BIOS not mapped by BIOS initialisation.\n");
-
     /* Promote chipset specification */
     switch (pATI->Chipset)
     {
@@ -1084,6 +1133,7 @@
         pScreenInfo->rgbBits = 6;
     else
         pScreenInfo->rgbBits = 8;
+    pATI->rgbBits = pScreenInfo->rgbBits;
     if (!xf86SetWeight(pScreenInfo, defaultWeight, defaultWeight))
     {
         ATILock(pATI);
@@ -1138,17 +1188,61 @@
         return FALSE;
     }
 
+    pATI->depth = pScreenInfo->depth;
+    pATI->bitsPerPixel = pScreenInfo->bitsPerPixel;
+    pATI->weight = pScreenInfo->weight;
+    pATI->XModifier = pATI->bitsPerPixel / UnitOf(pATI->bitsPerPixel);
+
     /*
      * Determine which CRT controller to use for video modes.
      */
 
     if ((pATI->Chip >= ATI_CHIP_88800GXC) &&
-        (pScreenInfo->depth >= 8) &&
+        (pATI->depth >= 8) &&
         (pATI->Chipset == ATI_CHIPSET_ATI))
+    {
         pATI->NewHW.crtc = ATI_CRTC_MACH64;
+
+        xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
+            "Using Mach64 accelerator CRTC.\n");
+
+        if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+        {
+            /*
+             * No need for VGA I/O resources during operating state (but they
+             * are still decoded).
+             */
+            pResources =
+                xf86SetOperatingState(resVgaIo, pATI->iEntity, ResUnusedOpr);
+            if (pResources)
+            {
+                xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                    "Logic error setting operating state for VGA I/O.\n");
+                xf86FreeResList(pResources);
+            }
+
+            if (pATI->CPIO_VGAWonder)
+            {
+                pResources = xf86SetOperatingState(pATI->VGAWonderResources,
+                    pATI->iEntity, ResUnusedOpr);
+                if (pResources)
+                {
+                    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                        "Logic error setting operating state for"
+                        " VGAWonder I/O.\n");
+                    xf86FreeResList(pResources);
+                }
+            }
+        }
+    }
     else
+    {
         pATI->NewHW.crtc = ATI_CRTC_VGA;
 
+        xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
+            "Using VGA CRTC.\n");
+    }
+
     /* Complain if VGA is needed but not there */
     if ((pATI->NewHW.crtc == ATI_CRTC_VGA) || !pATI->OptionLinear)
     {
@@ -1183,7 +1277,7 @@
         {
             pATI->OptionCRT = FALSE;
             xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
-                "Using digital flat panel and disabling CRT interface.\n");
+                "Using digital flat panel interface.\n");
         }
     }
 
@@ -1194,7 +1288,7 @@
     AcceleratorVideoRAM = pScreenInfo->videoRam = pATI->VideoRAM;
     if (pATI->Chip == ATI_CHIP_VGA)
     {
-        if (pScreenInfo->depth <= 4)
+        if (pATI->depth <= 4)
             VGAVideoRAM = 256;
         else
             VGAVideoRAM = 64;
@@ -1239,7 +1333,7 @@
          * VGA Wonder V3's, V4's and V5's don't appear to support banking in
          * planar modes.
          */
-        if ((pScreenInfo->depth <= 4) &&
+        if ((pATI->depth <= 4) &&
             (pATI->Chip <= ATI_CHIP_18800_1) &&
             (VGAVideoRAM > 256))
         {
@@ -1248,7 +1342,7 @@
                 xf86DrvMsg(pScreenInfo->scrnIndex, X_NOTICE,
                     "Virtual resolutions requiring more than %s kB\n of video"
                     " memory might not function properly." ATI_README,
-                    (pScreenInfo->depth == 1) ? "64" : "256");
+                    (pATI->depth == 1) ? "64" : "256");
             }
             else
             {
@@ -1262,7 +1356,7 @@
     else if ((pATI->NewHW.crtc == ATI_CRTC_MACH64) ||
              (pATI->Chip >= ATI_CHIP_264CT))
     {
-        if (pScreenInfo->depth >= 8)
+        if (pATI->depth >= 8)
         {
             /* Set MMIO address from PCI configuration space, if available */
             if (pATI->PCIInfo &&
@@ -1276,9 +1370,23 @@
                 IOValue1 = inl(pATI->CPIO_CONFIG_CNTL);
                 pATI->LinearBase = GetBits(IOValue1, CFG_MEM_AP_LOC) << 22;
                 if ((IOValue1 & CFG_MEM_AP_SIZE) != CFG_MEM_AP_SIZE)
+                {
                     pATI->LinearSize =
                         GetBits(IOValue1, CFG_MEM_AP_SIZE) << 22;
 
+                    /*
+                     * Linear aperture could have been disabled (but still
+                     * assigned) by BIOS initialisation.
+                     */
+                    if (pATI->LinearBase && !pATI->LinearSize)
+                    {
+                        if (pATI->VideoRAM < 4096)
+                            pATI->LinearSize = 4 * 1024 * 1024;
+                        else
+                            pATI->LinearSize = 8 * 1024 * 1024;
+                    }
+                }
+
                 /* Except for PCI & AGP, allow for user override */
                 if ((pATI->BusType != ATI_BUS_PCI) &&
                     (pATI->BusType != ATI_BUS_AGP))
@@ -1403,7 +1511,7 @@
             pATI->CPIO_MEM_VGA_WP_SEL = ATIIOPort(MEM_VGA_WP_SEL);
 
             /* Set banking functions */
-            if (pScreenInfo->depth <= 4)
+            if (pATI->depth <= 4)
             {
                 pATI->NewHW.SetBank = ATIMach64SetBankPlanar;
                 pATI->BankInfo.SetSourceBank = ATIMach64SetReadPlanar;
@@ -1465,7 +1573,7 @@
     {
         if (pATI->OptionDevel)
         {
-            if (pScreenInfo->depth == 1)
+            if (pATI->depth == 1)
                 AcceleratorVideoRAM /= 4;
 
             xf86DrvMsg(pScreenInfo->scrnIndex, X_NOTICE,
@@ -1483,18 +1591,47 @@
         }
     }
 
-    if (pATI->OptionLinear && !pATI->LinearBase)
+    if (pATI->OptionLinear)
     {
-        xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-            "Linear aperture not supported in this configuration.\n");
-        pATI->OptionLinear = FALSE;
+        if (!pATI->LinearBase)
+        {
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "Linear aperture not supported in this configuration.\n");
+            pATI->OptionLinear = FALSE;
+        }
+        else
+        {
+            if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+            {
+                /*
+                 * Free VGA memory aperture during operating state (but it is
+                 * still decoded).
+                 */
+                pResources = xf86SetOperatingState(resVgaMem,
+                    pATI->iEntity, ResUnusedOpr);
+                if (pResources)
+                {
+                    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                        "Logic error setting operating state for VGA memory"
+                        " aperture.\n");
+                    xf86FreeResList(pResources);
+                }
+            }
+        }
     }
 
-    if (pATI->OptionAccel && !pATI->Block0Base)
+    if (pATI->OptionAccel)
     {
-        xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-            "Acceleration not supported in this configuration.\n");
-        pATI->OptionAccel = FALSE;
+        if (!pATI->Block0Base || (pATI->NewHW.crtc == ATI_CRTC_VGA))
+        {
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "Acceleration not supported in this configuration.\n");
+            pATI->OptionAccel = FALSE;
+        }
+        else
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
+                "MMIO write caching %sabled.\n",
+                pATI->OptionMMIOCache ? "en" : "dis");
     }
 
     if (pATI->Adapter >= ATI_ADAPTER_MACH32)
@@ -1538,14 +1675,14 @@
             (inl(pATI->CPIO_CRTC_GEN_CNTL) & CRTC_EXT_DISP_EN))
             pATI->OldHW.crtc = ATI_CRTC_MACH64;
 
-        if (pScreenInfo->depth <= 4)
+        if (pATI->depth <= 4)
         {
             pATI->BankInfo.nBankDepth = 1;
             pATI->NewHW.nPlane = 4;
         }
         else
         {
-            pATI->BankInfo.nBankDepth = pScreenInfo->depth;
+            pATI->BankInfo.nBankDepth = pATI->depth;
             pATI->NewHW.nPlane = 1;
         }
 
@@ -1568,7 +1705,8 @@
         }
         else if (!pATI->UseSmallApertures)
             pATI->OldHW.SetBank = pATI->NewHW.SetBank;
-        else if (!(inl(pATI->CPIO_CONFIG_CNTL) & CFG_MEM_VGA_AP_EN))
+        else if ((pATI->OldHW.crtc == ATI_CRTC_VGA) &&
+                 !(inl(pATI->CPIO_CONFIG_CNTL) & CFG_MEM_VGA_AP_EN))
         {
             pATI->OldHW.SetBank = (ATIBankProcPtr)NoopDDA;
             pATI->OldHW.nBank = 1;
@@ -1578,7 +1716,7 @@
         else
             pATI->OldHW.SetBank = ATIMach64SetBankPlanar;
 
-        if (((pATI->ApertureSize * pScreenInfo->depth) /
+        if (((pATI->ApertureSize * pATI->depth) /
              pATI->BankInfo.nBankDepth) >=
             (unsigned)(pScreenInfo->videoRam * 1024))
             pATI->BankInfo.BankSize = 0;        /* No banking */
@@ -1593,7 +1731,7 @@
                 "Cannot shadow a banked frame buffer.\n");
             pATI->OptionShadowFB = FALSE;
         }
-        else if (pScreenInfo->depth < 8)
+        else if (pATI->depth < 8)
         {
             xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
                 "Cannot shadow a planar frame buffer.\n");
@@ -1619,8 +1757,8 @@
     }
 
     /*
-     * Determine maxClock.  For adapters with supported programmable clock
-     * generators, start with an absolute maximum.
+     * Determine minClock and maxClock.  For adapters with supported
+     * programmable clock generators, start with an absolute maximum.
      */
     if (pATI->ClockDescriptor.MaxN > 0)
     {
@@ -1634,10 +1772,39 @@
          */
         if (pATI->ProgrammableClock == ATI_CLOCK_INTERNAL)
             Numerator <<= 1;
-        else if (pScreenInfo->depth > 8)
-            Denominator *= (pScreenInfo->bitsPerPixel / 8);
+        else if (pATI->depth > 8)
+            Denominator *= (pATI->bitsPerPixel / 8);
 
         ATIClockRange.maxClock = (Numerator / (Denominator * 1000)) * 1000;
+
+        Numerator = pATI->ClockDescriptor.MinN * pATI->ReferenceNumerator;
+        Denominator = pATI->ClockDescriptor.MaxM * pATI->ReferenceDenominator *
+            pATI->ClockDescriptor.PostDividers[pATI->ClockDescriptor.NumD - 1];
+
+        if (pATI->ProgrammableClock == ATI_CLOCK_INTERNAL)
+            Numerator <<= 1;
+
+        ATIClockRange.minClock = (Numerator / (Denominator * 1000)) * 1000;
+
+        if (pATI->XCLKFeedbackDivider)
+        {
+            /* Possibly reduce maxClock due to memory bandwidth */
+            Numerator = pATI->XCLKFeedbackDivider * 2 *
+                pATI->ReferenceNumerator;
+            Denominator = pATI->ClockDescriptor.MinM *
+                pATI->XCLKReferenceDivider * pATI->ReferenceDenominator;
+
+            if (pATI->depth >= 8)
+                Denominator *= pATI->bitsPerPixel / 4;
+
+            i = (5 - 2) - pATI->XCLKPostDivider;
+            if (pATI->NewHW.crtc != ATI_CRTC_VGA)
+               i++;
+
+            i = (ATIDivide(Numerator, Denominator, i, -1) / 1000) * 1000;
+            if (i < ATIClockRange.maxClock)
+                ATIClockRange.maxClock = i;
+        }
     }
 
     /*
@@ -1648,7 +1815,7 @@
     if ((pATI->DAC & ~0x0FU) == ATI_DAC_INTERNAL)
     {
         int DacSpeed;
-        switch (pScreenInfo->bitsPerPixel)
+        switch (pATI->bitsPerPixel)
         {
             case 15:
             case 16:
@@ -1673,13 +1840,14 @@
         {
             int DefaultmaxClock = 135000;
 
-            if (pScreenInfo->depth > 8)
+            if (pATI->depth > 8)
                 DefaultmaxClock = 80000;
 
             if ((pATI->Chip >= ATI_CHIP_264VTB) &&
                 (pATI->Chip != ATI_CHIP_Mach64))
             {
-                if (pATI->Chip >= ATI_CHIP_264VT4)
+                if ((pATI->Chip >= ATI_CHIP_264VT4) &&
+                    (pATI->Chip != ATI_CHIP_264LTPRO))
                     DefaultmaxClock = 230000;
                 else if (pATI->Chip >= ATI_CHIP_264VT3)
                     DefaultmaxClock = 200000;
@@ -1711,16 +1879,21 @@
                 ATIClockRange.maxClock = 40000;
             else if (pATI->CPIO_VGAWonder &&
                     (pATI->VideoRAM < 1024) &&
-                    (pScreenInfo->depth >= 8))
+                    (pATI->depth >= 8))
                 ATIClockRange.maxClock =
                     (GetBits(BIOSByte(0x44U), 0x04U) * 5000) + 40000;
             else
                 ATIClockRange.maxClock = 80000;
             break;
     }
-    xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
-        "Maximum pixel clock:  %.3f MHz.\n",
-        (double)ATIClockRange.maxClock / 1000.0);
+    if (pATI->ClockDescriptor.MaxN <= 0)
+        xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
+            "Maximum pixel clock:  %.3f MHz.\n",
+            (double)ATIClockRange.maxClock / 1000.0);
+
+    /* Map MMIO areas */
+    if (!ATIMapApertures(pScreenInfo, pATI))
+        return FALSE;
 
     /*
      * Determine available pixel clock frequencies.
@@ -1734,12 +1907,12 @@
      * Mode validation.
      */
 
-    if ((pScreenInfo->depth >= 8) && (pATI->Chip >= ATI_CHIP_264CT))
+    if ((pATI->depth >= 8) && (pATI->Chip >= ATI_CHIP_264CT))
         minPitch = 8;
     else if (pATI->CPIO_VGAWonder &&
              (pATI->Chip <= ATI_CHIP_18800_1) &&
              (pATI->VideoRAM == 256) &&
-             (pScreenInfo->depth >= 8))
+             (pATI->depth >= 8))
     {
         minPitch = 32;          /* Very strange, but true */
         maxPitch = 0x3FU;
@@ -1747,24 +1920,10 @@
     else
         minPitch = 16;
 
-    pitchInc = minPitch;
-    if (pScreenInfo->depth >= 8)
-        pitchInc *= pScreenInfo->bitsPerPixel;
+    pATI->pitchInc = minPitch;
+    if (pATI->depth >= 8)
+        pATI->pitchInc *= pATI->bitsPerPixel;
 
-    /*
-     * For SGRAM & WRAM adapters, the display engine limits the pitch to
-     * multiples of 64 bytes.
-     */
-    if (pATI->OptionAccel && (pATI->Chip >= ATI_CHIP_264CT) &&
-        ((pATI->Chip >= ATI_CHIP_264VTB) ||
-         (pATI->MemoryType >= MEM_264_SGRAM)))
-    {
-        if (pScreenInfo->bitsPerPixel == 24)
-            pitchInc = 64 * 24;
-        else
-            pitchInc = 64 * 8;
-    }
-
     switch (pATI->NewHW.crtc)
     {
         case ATI_CRTC_VGA:
@@ -1837,6 +1996,26 @@
 
     maxPitch *= minPitch;
 
+    if (pATI->OptionAccel)
+    {
+        /*
+         * Set engine restrictions on coordinate space.  Use maxPitch for the
+         * horizontal and maxHeight for the vertical.
+         */
+        if (maxPitch > (ATIMach64MaxX / pATI->XModifier))
+            maxPitch = ATIMach64MaxX / pATI->XModifier;
+        maxHeight = ATIMach64MaxY;
+
+        /*
+         * For SGRAM & WRAM adapters, the display engine limits the pitch to
+         * multiples of 64 bytes.
+         */
+        if ((pATI->Chip >= ATI_CHIP_264CT) &&
+            ((pATI->Chip >= ATI_CHIP_264VTB) ||
+             (pATI->MemoryType >= MEM_264_SGRAM)))
+            pATI->pitchInc = pATI->XModifier * (64 * 8);
+    }
+
     if (!pATI->OptionCRT && pATI->LCDPanelID >= 0)
     {
         /*
@@ -1845,23 +2024,67 @@
          * and/or vertical refresh tolerances.
          */
         Strategy |= LOOKUP_OPTIONAL_TOLERANCES;
+
+        /*
+         * Add a mode to the end of the monitor's list for the panel's native
+         * resolution.
+         */
+        pMode = (DisplayModePtr)xnfcalloc(1, SizeOf(DisplayModeRec));
+        pMode->name = "Native panel mode";
+        pMode->type = M_T_BUILTIN;
+        pMode->Clock = pATI->LCDClock;
+        pMode->HDisplay = pATI->LCDHorizontal;
+        pMode->VDisplay = pATI->LCDVertical;
+
+        /*
+         * These timings are bogus, but enough to survive sync tolerance
+         * checks.
+         */
+        pMode->HSyncStart = pMode->HDisplay;
+        pMode->HSyncEnd = pMode->HSyncStart + minPitch;
+        pMode->HTotal = pMode->HSyncEnd + minPitch;
+        pMode->VSyncStart = pMode->VDisplay;
+        pMode->VSyncEnd = pMode->VSyncStart + 1;
+        pMode->VTotal = pMode->VSyncEnd + 1;
+
+        pMode->CrtcHDisplay = pMode->HDisplay;
+        pMode->CrtcHBlankStart = pMode->HDisplay;
+        pMode->CrtcHSyncStart = pMode->HSyncStart;
+        pMode->CrtcHSyncEnd = pMode->HSyncEnd;
+        pMode->CrtcHBlankEnd = pMode->HTotal;
+        pMode->CrtcHTotal = pMode->HTotal;
+
+        pMode->CrtcVDisplay = pMode->VDisplay;
+        pMode->CrtcVBlankStart = pMode->VDisplay;
+        pMode->CrtcVSyncStart = pMode->VSyncStart;
+        pMode->CrtcVSyncEnd = pMode->VSyncEnd;
+        pMode->CrtcVBlankEnd = pMode->VTotal;
+        pMode->CrtcVTotal = pMode->VTotal;
+
+        if (!pScreenInfo->monitor->Modes)
+            pScreenInfo->monitor->Modes = pMode;
+        else
+        {
+            pScreenInfo->monitor->Last->next = pMode;
+            pMode->prev = pScreenInfo->monitor->Last;
+        }
+
+        pScreenInfo->monitor->Last = pMode;
     }
 
     i = xf86ValidateModes(pScreenInfo,
             pScreenInfo->monitor->Modes, pScreenInfo->display->modes,
-            &ATIClockRange, NULL, minPitch, maxPitch, pitchInc, 0, 0,
+            &ATIClockRange, NULL, minPitch, maxPitch,
+            pATI->pitchInc, 0, maxHeight,
             pScreenInfo->display->virtualX, pScreenInfo->display->virtualY,
             pATI->ApertureSize, Strategy);
     if (i <= 0)
     {
+        ATIUnmapApertures(pScreenInfo, pATI);
         ATILock(pATI);
         return FALSE;
     }
 
-    /* Map MMIO areas */
-    if (!ATIMapApertures(pScreenInfo, pATI))
-        return FALSE;
-
     /* Remove invalid modes */
     xf86PruneDriverModes(pScreenInfo);
 
@@ -1884,8 +2107,32 @@
     }
 #endif
 
+    pATI->displayWidth = pScreenInfo->displayWidth;
+
     /* Initialise for panning */
-    ATIAdjustPreInit(pScreenInfo, pATI);
+    ATIAdjustPreInit(pATI);
+
+    /*
+     * Warn about modes that are too small, or not aligned, to scroll to the
+     * bottom right corner of the virtual screen.
+     */
+    MinX = pScreenInfo->virtualX - pATI->AdjustMaxX;
+    MinY = pScreenInfo->virtualY - pATI->AdjustMaxY;
+
+    pMode = pScreenInfo->modes;
+    do
+    {
+        if ((pMode->VDisplay <= MinY) &&
+            ((pMode->VDisplay < MinY) || (pMode->HDisplay < MinX)))
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "Mode \"%s\" too small to scroll to bottom right corner of"
+                " virtual resolution.\n", pMode->name);
+        else if ((pMode->HDisplay & ~pATI->AdjustMask) / pScreenInfo->xInc)
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+                "Mode \"%s\" cannot scroll to bottom right corner of virtual"
+                " resolution.\n Horizontal dimension not a multiple of %d.\n",
+                pMode->name, ~pATI->AdjustMask + 1);
+    } while ((pMode = pMode->next) != pScreenInfo->modes);
 
     /* Initialise CRTC code */
     ATIAdapterPreInit(pScreenInfo, pATI, &pATI->NewHW);
@@ -1900,7 +2147,7 @@
     /* Generate noise if requested */
     if (xf86GetVerbosity() > 3)
     {
-        ATIPrintBIOS(pATI, BIOS, 0, BIOSSize);
+        ATIPrintBIOS(BIOS, 0, BIOSSize);
         xf86ErrorFVerb(4, "\n On server entry:\n");
         ATIPrintRegisters(pATI);
     }
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c:1.11 xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c:1.13
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c:1.11	Tue Mar  7 08:13:35 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c	Mon Jun 19 08:00:58 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c,v 1.11 2000/03/07 16:13:35 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.c,v 1.13 2000/06/19 15:00:58 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -35,7 +35,6 @@
 void
 ATIPrintBIOS
 (
-    ATIPtr             pATI,
     const CARD8        *BIOS,
     const unsigned int Start,
     const unsigned int End
@@ -48,9 +47,9 @@
     if (xf86GetVerbosity() <= 4)
         return;
 
-    memset(Printable, 0, SizeOf(Printable));
+    (void)memset(Printable, 0, SizeOf(Printable));
 
-    xf86ErrorFVerb(5, "\n BIOS data at 0x%08X:", Start + pATI->BIOSBase);
+    xf86ErrorFVerb(5, "\n BIOS data at offset 0x%08X:", Start);
 
     for (;  Index < ((End + (16U - 1U)) & ~(16U - 1U));  Index++)
     {
@@ -61,7 +60,7 @@
                 if (Printable[0])
                     xf86ErrorFVerb(5, "  |%s|", Printable);
                 Char = Printable;
-                xf86ErrorFVerb(5, "\n 0x%08X: ", Index + pATI->BIOSBase);
+                xf86ErrorFVerb(5, "\n 0x%08X: ", Index);
             }
             xf86ErrorFVerb(5, " ");
         }
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.h:1.4 xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.h:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.h:1.4	Fri Feb 18 04:19:31 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.h	Thu Apr 20 14:28:31 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.h,v 1.4 2000/02/18 12:19:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.h,v 1.5 2000/04/20 21:28:31 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -28,7 +28,7 @@
 #include "atiproto.h"
 #include "xf86str.h"
 
-extern void ATIPrintBIOS      FunctionPrototype((ATIPtr, const CARD8 *,
+extern void ATIPrintBIOS      FunctionPrototype((const CARD8 *,
                                                  const unsigned int,
                                                  const unsigned int));
 extern void ATIPrintRegisters FunctionPrototype((ATIPtr));
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c:1.19 xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c:1.22
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c:1.19	Tue Mar  7 08:13:36 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c	Mon Jun 19 08:00:58 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v 1.19 2000/03/07 16:13:36 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v 1.22 2000/06/19 15:00:58 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -216,15 +216,15 @@
      * need to unlock them.
      */
     ATISetVGAIOBase(pVGA, inb(R_GENMO));
-    (void) inb(GENS1(pVGA->CPIO_VGABase));
+    (void)inb(GENS1(pVGA->CPIO_VGABase));
     IOValue1 = inb(ATTRX);
-    (void) inb(GENS1(pVGA->CPIO_VGABase));
+    (void)inb(GENS1(pVGA->CPIO_VGABase));
     IOValue2 = GetReg(ATTRX, 0x14U | 0x20U);
     outb(ATTRX, IOValue2 ^ 0x0FU);
     IOValue3 = GetReg(ATTRX, 0x14U | 0x20U);
     outb(ATTRX, IOValue2);
     outb(ATTRX, IOValue1);
-    (void) inb(GENS1(pVGA->CPIO_VGABase));
+    (void)inb(GENS1(pVGA->CPIO_VGABase));
     if (IOValue3 == (IOValue2 ^ 0x0FU))
     {
         /* VGA device detected */
@@ -848,7 +848,7 @@
             return FALSE;
 
         ATIGDevs = (ATIGDevPtr)xnfcalloc(nGDev, SizeOf(ATIGDev));
-        memset(fChipsets, FALSE, SizeOf(fChipsets));
+        (void)memset(fChipsets, FALSE, SizeOf(fChipsets));
 
         for (i = 0, pATIGDev = ATIGDevs;  i < nGDev;  i++)
         {
@@ -965,7 +965,7 @@
                      PCI_CMD_IO_ENABLE) ? 0 : Allowed);
 
     /* Generate ProbeFlags array from list of registered PCI I/O bases */
-    memset(ProbeFlags, Allowed | DoProbe, SizeOf(ProbeFlags));
+    (void)memset(ProbeFlags, Allowed | DoProbe, SizeOf(ProbeFlags));
     for (i = 0;  i < nPCIPort;  i++)
     {
         CARD32 Base = PCIPorts[i].Base;
@@ -1089,23 +1089,22 @@
          * this is verbiage to deal with potential situations that are very
          * unlikely to occur in practice.
          *
-         * First, look for non-ATI shareable VGA's.  For now, these must have
-         * been previously initialised by their BIOS.
+         * First, look for non-ATI shareable VGA's.  For now, these must the
+         * primary device.
          */
         if (ATICheckSparseIOBases(ProbeFlags, ATTRX, 16, TRUE) == DoProbe)
         {
             for (i = 0;  (pVideo = xf86PciVideoInfo[i++]);  )
             {
                 if ((pVideo->vendor == PCI_VENDOR_ATI) ||
-                    !(((pciConfigPtr)(pVideo->thisCard))->pci_command &
-                      PCI_CMD_IO_ENABLE) ||
-                    (pVideo->interface != 0) ||
-                    (((pVideo->class != PCI_CLASS_PREHISTORIC) ||
-                      (pVideo->subclass != PCI_SUBCLASS_PREHISTORIC_VGA)) &&
-                     ((pVideo->class != PCI_CLASS_DISPLAY) ||
-                      (pVideo->subclass != PCI_SUBCLASS_DISPLAY_VGA))))
+                    !xf86IsPrimaryPci(pVideo))
                     continue;
 
+                if (!xf86CheckPciSlot(pVideo->bus,
+                                      pVideo->device,
+                                      pVideo->func))
+                    continue;
+
                 xf86SetPciVideo(pVideo, IO);
 
                 pATI = ATIVGAProbe(NULL);
@@ -1169,6 +1168,11 @@
                     break;
 
                 default:        /* Must be DoProbe */
+                    if (!xf86CheckPciSlot(pVideo->bus,
+                                          pVideo->device,
+                                          pVideo->func))
+                        continue;
+
                     xf86SetPciVideo(pVideo, IO);
 
                     if (!(pATI = ATI8514Probe(pVideo)))
@@ -1252,6 +1256,11 @@
                     break;
 
                 default:    /* Must be DoProbe */
+                    if (!xf86CheckPciSlot(pVideo->bus,
+                                          pVideo->device,
+                                          pVideo->func))
+                        continue;
+
                     xf86SetPciVideo(pVideo, IO);
 
                     pATI = ATIMach64Probe(Mach64SparseIOBases[j], SPARSE_IO,
@@ -1298,6 +1307,9 @@
                     goto SetPCIInfo;
             }
 
+            if (!xf86CheckPciSlot(pVideo->bus, pVideo->device, pVideo->func))
+                continue;
+
             /* Probe for it */
             xf86SetPciVideo(pVideo, IO);
 
@@ -1533,6 +1545,30 @@
     }
 
     /*
+     * Re-order list of detected devices so that the primary device is before
+     * any other PCI device.
+     */
+    for (i = 0;  i < nATIPtr;  i++)
+    {
+        if (!ATIPtrs[i]->PCIInfo)
+            continue;
+
+        for (j = i;  j < nATIPtr;  j++)
+        {
+            pATI = ATIPtrs[j];
+            if (!xf86IsPrimaryPci(pATI->PCIInfo))
+                continue;
+
+            for (;  j > i;  j--)
+                ATIPtrs[j] = ATIPtrs[j - 1];
+            ATIPtrs[j] = pATI;
+            break;
+        }
+
+        break;
+    }
+
+    /*
      * Assign detected devices to XF86Config Device sections.  This is done by
      * comparing certain Device section specifications against the
      * corresponding adapter information.  Begin with those specifications that
@@ -1623,10 +1659,36 @@
                 if ((pGDev->chipRev >= 0) && (pATI->ChipRev != pGDev->chipRev))
                 {
                     if (pATI->Adapter != ATI_ADAPTER_MACH64)
-                        continue;
-                    if ((pGDev->chipRev >= 0) &&
-                        (pATI->Chip != ATI_CHIP_Mach64))
                         continue;
+
+                    if (pATI->Chip != ATI_CHIP_Mach64)
+                    {
+                        if (pATI->ChipRev == pATI->ChipRevision)
+                            continue;
+
+                        /*
+                         * There are two foundry codes for UMC.  Some adapters
+                         * will advertise one in CONFIG_CHIP_ID and the other
+                         * in PCI configuration space.  For matching purposes,
+                         * make both codes compare equal.
+                         */
+#                       define UMC_IGNORE (ATI_FOUNDRY_UMC ^ ATI_FOUNDRY_UMCA)
+#                       define UMC_NOCARE \
+                            GetBits(SetBits(UMC_IGNORE, CFG_CHIP_FOUNDRY), \
+                                CFG_CHIP_REV)
+
+                        if ((pATI->ChipRev ^ pGDev->chipRev) & ~UMC_NOCARE)
+                            continue;
+
+                        if ((pATI->ChipFoundry != ATI_FOUNDRY_UMC) &&
+                            (pATI->ChipFoundry != ATI_FOUNDRY_UMCA))
+                            continue;
+
+                        k = GetBits(pGDev->chipRev,
+                            GetBits(CFG_CHIP_FOUNDRY, CFG_CHIP_REV));
+                        if ((k != ATI_FOUNDRY_UMC) && (k != ATI_FOUNDRY_UMCA))
+                            continue;
+                    }
                 }
             }
 
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h:1.8 xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h:1.8	Fri Feb 18 04:19:35 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h	Thu Mar 30 07:41:20 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.8 2000/02/18 12:19:35 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.10 2000/03/30 15:41:20 tsi Exp $ */
 /*
  * Copyright 1994 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -46,6 +46,7 @@
 
 #define MM_IO_SELECT		0x03fcu
 #define BLOCK_SELECT		0x0400u
+#define DWORD_SELECT		(BLOCK_SELECT | MM_IO_SELECT)
 
 #define IO_BYTE_SELECT		0x0003u
 
@@ -1246,15 +1247,9 @@
 #define DST_X			BlockIOTag(0x41u)
 #define DST_Y			BlockIOTag(0x42u)
 #define DST_Y_X			BlockIOTag(0x43u)
-#define DST_y				0x00007ffful
-#define DST_Y_LSB			0x00008000ul	/* GTPro */
-#define DST_x				0x7fff0000ul
-#define DST_Y_SECONDARY_LSB		0x80000000ul	/* GTPro */
 #define DST_WIDTH		BlockIOTag(0x44u)
 #define DST_HEIGHT		BlockIOTag(0x45u)
 #define DST_HEIGHT_WIDTH	BlockIOTag(0x46u)
-#define DST_height			0x0000fffful
-#define DST_width			0xffff0000ul
 #define DST_X_WIDTH		BlockIOTag(0x47u)
 #define DST_BRES_LNTH		BlockIOTag(0x48u)
 #define DST_BRES_ERR		BlockIOTag(0x49u)
@@ -1308,31 +1303,15 @@
 #define SRC_X			BlockIOTag(0x61u)
 #define SRC_Y			BlockIOTag(0x62u)
 #define SRC_Y_X			BlockIOTag(0x63u)
-#define SRC_y				0x00007ffful
-/*	?				0x00008000ul */
-#define SRC_x				0x3fff0000ul
-/*	?				0xc0000000ul */
 #define SRC_WIDTH1		BlockIOTag(0x64u)
 #define SRC_HEIGHT1		BlockIOTag(0x65u)
 #define SRC_HEIGHT1_WIDTH1	BlockIOTag(0x66u)
-#define SRC_height1			0x00007ffful
-/*	?				0x00008000ul */
-#define SRC_width1			0x3fff0000ul
-/*	?				0xc0000000ul */
 #define SRC_X_START		BlockIOTag(0x67u)
 #define SRC_Y_START		BlockIOTag(0x68u)
 #define SRC_Y_X_START		BlockIOTag(0x69u)
-#define SRC_y_start			0x00007ffful
-/*	?				0x00008000ul */
-#define SRC_x_start			0x3fff0000ul
-/*	?				0xc0000000ul */
 #define SRC_WIDTH2		BlockIOTag(0x6au)
 #define SRC_HEIGHT2		BlockIOTag(0x6bu)
 #define SRC_HEIGHT2_WIDTH2	BlockIOTag(0x6cu)
-#define SRC_height2			0x00007ffful
-/*	?				0x00008000ul */
-#define SRC_width2			0x3fff0000ul
-/*	?				0xc0000000ul */
 #define SRC_CNTL		BlockIOTag(0x6du)
 #define SRC_PATT_EN			0x00000001ul
 #define SRC_PATT_ROT_EN			0x00000002ul
@@ -1426,17 +1405,9 @@
 #define SC_LEFT			BlockIOTag(0xa8u)
 #define SC_RIGHT		BlockIOTag(0xa9u)
 #define SC_LEFT_RIGHT		BlockIOTag(0xaau)
-#define SC_left				0x00003ffful
-/*	?				0x0000c000ul */
-#define SC_right			0x3fff0000ul
-/*	?				0xc0000000ul */
 #define SC_TOP			BlockIOTag(0xabu)
 #define SC_BOTTOM		BlockIOTag(0xacu)
 #define SC_TOP_BOTTOM		BlockIOTag(0xadu)
-#define SC_top				0x00007ffful
-/*	?				0x00008000ul */
-#define SC_bottom			0x7fff0000ul
-/*	?				0x80000000ul */
 #define USR1_DST_OFF_PITCH	BlockIOTag(0xaeu)	/* LTPro */
 #define USR2_DST_OFF_PITCH	BlockIOTag(0xafu)	/* LTPro */
 #define DP_BKGD_CLR		BlockIOTag(0xb0u)
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c:1.6	Fri Feb 18 04:19:37 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c	Mon Jun 19 08:00:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c,v 1.6 2000/02/18 12:19:37 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c,v 1.9 2000/06/19 15:00:59 tsi Exp $ */
 /*
  * Copyright 1999 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -25,6 +25,7 @@
 #include "atiadapter.h"
 #include "aticonsole.h"
 #include "atidac.h"
+#include "atidga.h"
 #include "atiscreen.h"
 
 #include "shadowfb.h"
@@ -73,7 +74,7 @@
 
         while (h-- > 0)
         {
-            memcpy(pDst, pSrc, w);
+            (void)memcpy(pDst, pSrc, w);
             pSrc = (char *)pSrc + pATI->FBPitch;
             pDst = (char *)pDst + pATI->FBPitch;
         }
@@ -108,21 +109,20 @@
     /* Re-initialise mi's visual list */
     miClearVisualTypes();
 
-    if ((pScreenInfo->depth > 8) && (pATI->DAC == ATI_DAC_INTERNAL))
+    if ((pATI->depth > 8) && (pATI->DAC == ATI_DAC_INTERNAL))
         VisualMask = TrueColorMask;
     else
-        VisualMask = miGetDefaultVisualMask(pScreenInfo->depth);
+        VisualMask = miGetDefaultVisualMask(pATI->depth);
 
-    if (!miSetVisualTypes(pScreenInfo->depth, VisualMask,
-                          pScreenInfo->rgbBits, pScreenInfo->defaultVisual))
+    if (!miSetVisualTypes(pATI->depth, VisualMask, pScreenInfo->rgbBits,
+                          pScreenInfo->defaultVisual))
         return FALSE;
 
     pFB = pATI->pMemory;
     if (pATI->OptionShadowFB)
     {
-        pATI->FBBytesPerPixel = pScreenInfo->bitsPerPixel >> 3;
-        pATI->FBPitch =
-            PixmapBytePad(pScreenInfo->displayWidth, pScreenInfo->depth);
+        pATI->FBBytesPerPixel = pATI->bitsPerPixel >> 3;
+        pATI->FBPitch = PixmapBytePad(pATI->displayWidth, pATI->depth);
         if ((pATI->pShadow = xalloc(pATI->FBPitch * pScreenInfo->virtualY)))
             pFB = pATI->pShadow;
         else
@@ -134,48 +134,42 @@
     }
 
     /* Initialise framebuffer layer */
-    switch (pScreenInfo->bitsPerPixel)
+    switch (pATI->bitsPerPixel)
     {
         case 1:
             pATI->Closeable = xf1bppScreenInit(pScreen, pFB,
                 pScreenInfo->virtualX, pScreenInfo->virtualY,
-                pScreenInfo->xDpi, pScreenInfo->yDpi,
-                pScreenInfo->displayWidth);
+                pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth);
             break;
 
         case 4:
             pATI->Closeable = xf4bppScreenInit(pScreen, pFB,
                 pScreenInfo->virtualX, pScreenInfo->virtualY,
-                pScreenInfo->xDpi, pScreenInfo->yDpi,
-                pScreenInfo->displayWidth);
+                pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth);
             break;
 
         case 8:
             pATI->Closeable = cfbScreenInit(pScreen, pFB,
                 pScreenInfo->virtualX, pScreenInfo->virtualY,
-                pScreenInfo->xDpi, pScreenInfo->yDpi,
-                pScreenInfo->displayWidth);
+                pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth);
             break;
 
         case 16:
             pATI->Closeable = cfb16ScreenInit(pScreen, pFB,
                 pScreenInfo->virtualX, pScreenInfo->virtualY,
-                pScreenInfo->xDpi, pScreenInfo->yDpi,
-                pScreenInfo->displayWidth);
+                pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth);
             break;
 
         case 24:
             pATI->Closeable = cfb24ScreenInit(pScreen, pFB,
                 pScreenInfo->virtualX, pScreenInfo->virtualY,
-                pScreenInfo->xDpi, pScreenInfo->yDpi,
-                pScreenInfo->displayWidth);
+                pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth);
             break;
 
         case 32:
             pATI->Closeable = cfb32ScreenInit(pScreen, pFB,
                 pScreenInfo->virtualX, pScreenInfo->virtualY,
-                pScreenInfo->xDpi, pScreenInfo->yDpi,
-                pScreenInfo->displayWidth);
+                pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth);
             break;
 
         default:
@@ -186,7 +180,7 @@
         return FALSE;
 
     /* Fixup RGB ordering */
-    if (pScreenInfo->depth > 8)
+    if (pATI->depth > 8)
     {
         VisualPtr pVisual = pScreen->visuals + pScreen->numVisuals;
 
@@ -210,9 +204,12 @@
     /* Initialise banking if needed */
     if (!miInitializeBanking(pScreen,
                              pScreenInfo->virtualX, pScreenInfo->virtualY,
-                             pScreenInfo->displayWidth, &pATI->BankInfo))
+                             pATI->displayWidth, &pATI->BankInfo))
         return FALSE;
 
+    /* Initialise DGA support */
+    (void)ATIDGAInit(pScreenInfo, pScreen, pATI);
+
     /* Setup acceleration */
     if (!ATIAdapterAccelInit(pScreenInfo, pScreen, pATI))
         return FALSE;
@@ -228,8 +225,8 @@
     if (!miCreateDefColormap(pScreen))
         return FALSE;
 
-    if (pScreenInfo->depth > 1)
-        if (!xf86HandleColormaps(pScreen, (pScreenInfo->depth == 4) ? 16 : 256,
+    if (pATI->depth > 1)
+        if (!xf86HandleColormaps(pScreen, (pATI->depth == 4) ? 16 : 256,
                                  pScreenInfo->rgbBits, ATILoadPalette, NULL,
                                  CMAP_PALETTED_TRUECOLOR |
                                  CMAP_LOAD_EVEN_IF_OFFSCREEN))
@@ -239,6 +236,9 @@
     if (pATI->OptionShadowFB &&
         !ShadowFBInit(pScreen, ATIRefreshArea))
         return FALSE;
+
+    /* Initialise DPMS support */
+    (void)xf86DPMSInit(pScreen, ATISetDPMSMode, 0);
 
     /* Set pScreen->SaveScreen and wrap CloseScreen vector */
     pScreen->SaveScreen = ATISaveScreen;
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h:1.12 xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h:1.18
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h:1.12	Thu Mar  2 20:47:13 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h	Mon Jun 19 08:00:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h,v 1.12 2000/03/03 04:47:13 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atistruct.h,v 1.18 2000/06/19 15:00:59 tsi Exp $ */
 /*
  * Copyright 1999 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -26,8 +26,12 @@
 
 #include "atibank.h"
 #include "aticlock.h"
+#include "atiregs.h"
+#include "xf86Resources.h"
 #include "xaa.h"
 
+#define CacheSlotOf(____Register) ((____Register) / UnitOf(DWORD_SELECT))
+
 /*
  * This is probably as good a place as any to put this note, as it applies to
  * the entire driver, but especially here.  CARD8's are used rather than the
@@ -58,7 +62,10 @@
           b0, b1, b2, b3,     b5, b6,     b8, b9, ba,         bd, be, bf;
 
     /* Mach64 PLL registers */
-    CARD8 pll_vclk_cntl, pll_ext_vpll_cntl;
+    CARD8 pll_vclk_cntl, pll_vclk_post_div,
+          pll_vclk0_fb_div, pll_vclk1_fb_div,
+          pll_vclk2_fb_div, pll_vclk3_fb_div,
+          pll_xclk_cntl, pll_ext_vpll_cntl;
 
     /* Mach64 CPIO registers */
     CARD32 crtc_h_total_disp, crtc_h_sync_strt_wid,
@@ -129,8 +136,8 @@
      * Chip-related definitions.
      */
     CARD8 Chip, Coprocessor;
-    CARD16 ChipType, ChipClass, ChipRevision, ChipRev;
-    CARD16 ChipVersion, ChipFoundry;
+    CARD16 ChipType;
+    CARD8 ChipClass, ChipRevision, ChipRev, ChipVersion, ChipFoundry;
     CARD8 ChipHasSUBSYS_CNTL;
 
     /*
@@ -164,18 +171,21 @@
            CPIO_MEM_VGA_WP_SEL, CPIO_MEM_VGA_RP_SEL,
            CPIO_DAC_REGS, CPIO_DAC_CNTL,
            CPIO_HORZ_STRETCHING, CPIO_VERT_STRETCHING,
-           CPIO_GEN_TEST_CNTL, CPIO_LCD_GEN_CTRL, CPIO_CONFIG_CNTL;
+           CPIO_GEN_TEST_CNTL, CPIO_LCD_GEN_CTRL,
+           CPIO_POWER_MANAGEMENT, CPIO_CONFIG_CNTL;
 
     /*
      * DAC-related definitions.
      */
     CARD16 DAC;
     CARD16 CPIO_DAC_MASK, CPIO_DAC_DATA, CPIO_DAC_READ, CPIO_DAC_WRITE;
+    CARD8 rgbBits;
 
     /*
      * Definitions related to system bus interface.
      */
     pciVideoPtr PCIInfo;
+    resRange VGAWonderResources[2];
     CARD8 BusType;
     CARD8 SharedVGA, SharedAccelerator;
 
@@ -215,10 +225,19 @@
      */
     XAAInfoRecPtr pXAAInfo;
     int nAvailableFIFOEntries, nFIFOEntries;
-    CARD8 EngineIsBusy, EngineIsLocked, PitchModifier;
+    CARD8 EngineIsBusy, EngineIsLocked, XModifier;
     CARD32 dst_cntl;    /* For SetupFor/Subsequent communication */
+    CARD32 ExpansionBitmapScanline[256];
+    CARD32 *ExpansionBitmapScanlinePtr;
+    int ExpansionBitmapWidth;
 
     /*
+     * MMIO cache.
+     */
+    CARD32 MMIOCache[CacheSlotOf(DWORD_SELECT) + 1];
+    CARD8  MMIOCached[(CacheSlotOf(DWORD_SELECT) + 8) >> 3];
+
+    /*
      * Clock-related definitions.
      */
     int ClockNumberToProgramme, ReferenceNumerator, ReferenceDenominator;
@@ -245,7 +264,22 @@
      * Data used by ATIAdjustFrame().
      */
     int AdjustDepth, AdjustMaxX, AdjustMaxY;
-    unsigned long AdjustMask;
+    unsigned long AdjustMask, AdjustMaxBase;
+
+    /*
+     * DGA and non-DGA common data.
+     */
+    DisplayModePtr currentMode;
+    CARD8 depth, bitsPerPixel;
+    short int displayWidth;
+    int pitchInc;
+    rgb weight;
+
+    /*
+     * Video mode data for DGA.
+     */
+    DGAModePtr pDGAMode;
+    int nDGAMode;
 
     /*
      * Data saved by ATIUnlock() and restored by ATILock().
@@ -287,6 +321,7 @@
     CARD8 OptionCSync;          /* Use composite sync */
     CARD8 OptionDevel;          /* Intentionally undocumented */
     CARD8 OptionLinear;         /* Use linear fb aperture when available */
+    CARD8 OptionMMIOCache;      /* Cache MMIO writes */
     CARD8 OptionProbeClocks;    /* Force probe for fixed clocks */
     CARD8 OptionShadowFB;       /* Use shadow frame buffer */
     CARD8 OptionSync;           /* Temporary */
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c:1.9 xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c:1.9	Fri Feb 18 04:19:42 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c	Wed Apr 12 07:44:40 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c,v 1.9 2000/02/18 12:19:42 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c,v 1.10 2000/04/12 14:44:40 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -96,8 +96,14 @@
             (pMode->CrtcVDisplay > pATI->LCDVertical))
             return MODE_PANEL;
 
-        if (!pATI->OptionSync)
+        if (!pATI->OptionSync || (pMode->type & M_T_BUILTIN))
+        {
+            if ((pMode->HDisplay > pATI->LCDHorizontal) ||
+                (pMode->VDisplay > pATI->LCDVertical))
+                return MODE_PANEL;
+
             return MODE_OK;
+        }
 
         /*
          * Adjust effective timings for monitor checks.  Here the modeline
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h:1.13 xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h:1.16
--- xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h:1.13	Tue Mar  7 08:13:37 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h	Mon Jun 19 08:00:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h,v 1.13 2000/03/07 16:13:37 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativersion.h,v 1.16 2000/06/19 15:00:59 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -27,11 +27,11 @@
 #define ATI_NAME            "ATI"
 #define ATI_DRIVER_NAME     "ati"
 
-#define ATI_VERSION_NAME    "5.3.2"
+#define ATI_VERSION_NAME    "5.3.5"
 
 #define ATI_VERSION_MAJOR   5
 #define ATI_VERSION_MINOR   3
-#define ATI_VERSION_PATCH   2
+#define ATI_VERSION_PATCH   5
 
 #define ATI_VERSION_CURRENT \
     ((ATI_VERSION_MAJOR << 20) | (ATI_VERSION_MINOR << 10) | ATI_VERSION_PATCH)
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c:1.9 xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c:1.11
--- xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c:1.9	Fri Feb 18 04:19:43 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c	Mon Jun 19 08:00:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v 1.9 2000/02/18 12:19:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v 1.11 2000/06/19 15:00:59 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -21,6 +21,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"
 #include "atiio.h"
@@ -28,6 +29,9 @@
 #include "ativga.h"
 #include "xf86.h"
 
+#define DPMS_SERVER
+#include "extensions/dpms.h"
+
 /*
  * ATIVGAPreInit --
  *
@@ -37,7 +41,6 @@
 void
 ATIVGAPreInit
 (
-    ScrnInfoPtr pScreenInfo,
     ATIPtr      pATI,
     ATIHWPtr    pATIHW
 )
@@ -46,11 +49,11 @@
 
     /* Initialise sequencer register values */
     pATIHW->seq[0] = 0x03U;
-    if (pScreenInfo->depth == 1)
+    if (pATI->depth == 1)
         pATIHW->seq[2] = 0x01U << BIT_PLANE;
     else
         pATIHW->seq[2] = 0x0FU;
-    if (pScreenInfo->depth <= 4)
+    if (pATI->depth <= 4)
         pATIHW->seq[4] = 0x06U;
     else if (pATI->Adapter == ATI_ADAPTER_VGA)
         pATIHW->seq[4] = 0x0EU;
@@ -58,22 +61,22 @@
         pATIHW->seq[4] = 0x0AU;
 
     /* Initialise CRTC register values */
-    if ((pScreenInfo->depth >= 8) &&
+    if ((pATI->depth >= 8) &&
         ((pATI->Chip >= ATI_CHIP_264CT) ||
          (pATI->CPIO_VGAWonder &&
           (pATI->Chip <= ATI_CHIP_18800_1) &&
           (pATI->VideoRAM == 256))))
-        pATIHW->crt[19] = pScreenInfo->displayWidth >> 3;
+        pATIHW->crt[19] = pATI->displayWidth >> 3;
     else
-        pATIHW->crt[19] = pScreenInfo->displayWidth >> 4;
-    if ((pScreenInfo->depth >= 8) && (pATI->Adapter == ATI_ADAPTER_VGA))
+        pATIHW->crt[19] = pATI->displayWidth >> 4;
+    if ((pATI->depth >= 8) && (pATI->Adapter == ATI_ADAPTER_VGA))
         pATIHW->crt[23] = 0xC3U;
     else
         pATIHW->crt[23] = 0xE3U;
     pATIHW->crt[24] = 0xFFU;
 
     /* Initialise attribute controller register values */
-    if (pScreenInfo->depth == 1)
+    if (pATI->depth == 1)
     {
         Bool FlipPixels = xf86GetFlipPixels();
 
@@ -89,7 +92,7 @@
     {
         for (Index = 0;  Index < 16;  Index++)
             pATIHW->attr[Index] = Index;
-        if (pScreenInfo->depth <= 4)
+        if (pATI->depth <= 4)
             pATIHW->attr[16] = 0x81U;
         else if (pATI->Adapter == ATI_ADAPTER_VGA)
             pATIHW->attr[16] = 0x41U;
@@ -100,9 +103,9 @@
     pATIHW->attr[18] = 0x0FU;
 
     /* Initialise graphics controller register values */
-    if (pScreenInfo->depth == 1)
+    if (pATI->depth == 1)
         pATIHW->gra[4] = BIT_PLANE;
-    else if (pScreenInfo->depth <= 4)
+    else if (pATI->depth <= 4)
         pATIHW->gra[5] = 0x02U;
     else if (pATI->Chip >= ATI_CHIP_264CT)
         pATIHW->gra[5] = 0x40U;
@@ -443,4 +446,53 @@
         default:
             break;
     }
+}
+
+/*
+ * ATIVGASetDPMSMode --
+ *
+ * This function sets a VGA's VESA Display Power Management Signaling mode.
+ */
+void
+ATIVGASetDPMSMode
+(
+    ATIPtr pATI,
+    int    DPMSMode
+)
+{
+    CARD8 seq1, crt17;
+
+    switch (DPMSMode)
+    {
+        case DPMSModeOn:        /* HSync on, VSync on */
+            seq1 = 0x00U;
+            crt17 = 0x80U;
+            break;
+
+        case DPMSModeStandby:   /* HSync off, VSync on -- unsupported */
+            seq1 = 0x20U;
+            crt17 = 0x80U;
+            break;
+
+        case DPMSModeSuspend:   /* HSync on, VSync off -- unsupported */
+            seq1 = 0x20U;
+            crt17 = 0x80U;
+            break;
+
+        case DPMSModeOff:       /* HSync off, VSync off */
+            seq1 = 0x20U;
+            crt17 = 0x00U;
+            break;
+
+        default:                /* Muffle compiler */
+            return;
+    }
+
+    PutReg(SEQX, 0x00U, 0x01U); /* Start synchonous reset */
+    seq1 |= GetReg(SEQX, 0x01U) & ~0x20U;
+    PutReg(SEQX, 0x01U, seq1);
+    crt17 |= GetReg(CRTX(pATI->CPIO_VGABase), 0x17U) & ~0x80U;
+    usleep(10000);
+    PutReg(CRTX(pATI->CPIO_VGABase), 0x17U, crt17);
+    PutReg(SEQX, 0x01U, 0x03U); /* End synchonous reset */
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.h:1.4 xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.h:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.h:1.4	Fri Feb 18 04:19:44 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.h	Mon Jun 19 08:00:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.h,v 1.4 2000/02/18 12:19:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.h,v 1.6 2000/06/19 15:00:59 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -28,13 +28,13 @@
 #include "atiproto.h"
 #include "xf86str.h"
 
-extern void ATIVGAPreInit    FunctionPrototype((ScrnInfoPtr, ATIPtr,
-                                                ATIHWPtr));
-extern void ATIVGASave       FunctionPrototype((ATIPtr, ATIHWPtr));
-extern void ATIVGACalculate  FunctionPrototype((ATIPtr, ATIHWPtr,
-                                                DisplayModePtr));
-extern void ATIVGASet        FunctionPrototype((ATIPtr, ATIHWPtr));
+extern void ATIVGAPreInit     FunctionPrototype((ATIPtr, ATIHWPtr));
+extern void ATIVGASave        FunctionPrototype((ATIPtr, ATIHWPtr));
+extern void ATIVGACalculate   FunctionPrototype((ATIPtr, ATIHWPtr,
+                                                 DisplayModePtr));
+extern void ATIVGASet         FunctionPrototype((ATIPtr, ATIHWPtr));
 
-extern void ATIVGASaveScreen FunctionPrototype((ATIPtr, int));
+extern void ATIVGASaveScreen  FunctionPrototype((ATIPtr, int));
+extern void ATIVGASetDPMSMode FunctionPrototype((ATIPtr, int));
 
 #endif /* ___ATIVGA_H___ */
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.c:1.7 xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.c:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.c:1.7	Fri Feb 18 04:19:45 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.c	Mon Jun 19 08:00:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.c,v 1.7 2000/02/18 12:19:45 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.c,v 1.8 2000/06/19 15:00:59 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -63,13 +63,12 @@
 void
 ATIVGAWonderPreInit
 (
-    ScrnInfoPtr pScreenInfo,
     ATIPtr      pATI,
     ATIHWPtr    pATIHW
 )
 {
     pATIHW->b3 = ATIGetExtReg(0xB3U) & 0x20U;
-    if (pScreenInfo->depth <= 4)
+    if (pATI->depth <= 4)
         pATIHW->b6 = 0x40U;
     else
         pATIHW->b6 = 0x04U;
@@ -135,7 +134,6 @@
 void
 ATIVGAWonderCalculate
 (
-    ScrnInfoPtr    pScreenInfo,
     ATIPtr         pATI,
     ATIHWPtr       pATIHW,
     DisplayModePtr pMode
@@ -162,7 +160,7 @@
      * Fill in mode-specific VGA Wonder data.
      */
     pATIHW->b0 = 0x00U;
-    if (pScreenInfo->depth >= 8)
+    if (pATI->depth >= 8)
         pATIHW->b0 = 0x20U;
     if (pATI->Chip >= ATI_CHIP_28800_2)
     {
@@ -171,7 +169,7 @@
         else if (pATI->VideoRAM > 256)
             pATIHW->b0 |= 0x10U;
     }
-    else if (pScreenInfo->depth <= 4)
+    else if (pATI->depth <= 4)
     {
         if (pATI->VideoRAM > 256)
             pATIHW->b0 |= 0x08U;
@@ -191,7 +189,7 @@
      * adapter can then only be re-enabled with a powerdown.  The bit, when on,
      * blanks out the overscan.
      */
-    if ((pATI->Chip == ATI_CHIP_18800_1) && (pScreenInfo->depth >= 8))
+    if ((pATI->Chip == ATI_CHIP_18800_1) && (pATI->depth >= 8))
         pATIHW->b5 = 0x00U;
     else
         pATIHW->b5 = 0x01U;
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.h:1.4 xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.h:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.h:1.4	Fri Feb 18 04:19:46 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.h	Mon Jun 19 08:00:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.h,v 1.4 2000/02/18 12:19:46 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.h,v 1.5 2000/06/19 15:00:59 tsi Exp $ */
 /*
  * Copyright 1997 through 2000 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
  *
@@ -28,11 +28,9 @@
 #include "atiproto.h"
 #include "xf86str.h"
 
-extern void ATIVGAWonderPreInit   FunctionPrototype((ScrnInfoPtr, ATIPtr,
-                                                     ATIHWPtr));
+extern void ATIVGAWonderPreInit   FunctionPrototype((ATIPtr, ATIHWPtr));
 extern void ATIVGAWonderSave      FunctionPrototype((ATIPtr, ATIHWPtr));
-extern void ATIVGAWonderCalculate FunctionPrototype((ScrnInfoPtr, ATIPtr,
-                                                     ATIHWPtr,
+extern void ATIVGAWonderCalculate FunctionPrototype((ATIPtr, ATIHWPtr,
                                                      DisplayModePtr));
 extern void ATIVGAWonderSet       FunctionPrototype((ATIPtr, ATIHWPtr));
 
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile:1.22 xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile:1.24
--- xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile:1.22	Tue Feb  8 05:13:10 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile	Tue Apr  4 12:25:05 2000
@@ -4,23 +4,23 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile,v 1.22 2000/02/08 13:13:10 eich Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile,v 1.24 2000/04/04 19:25:05 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
 
 SRCS = ct_driver.c ct_bank.c ct_accel.c ct_accelmm.c ct_accelhi.c ct_cursor.c\
-	ct_ddc.c ct_regs.c ct_dga.c ct_shadow.c
+	ct_ddc.c ct_regs.c ct_dga.c ct_shadow.c ct_video.c
 
 OBJS = ct_driver.o ct_bank.o ct_accel.o ct_accelmm.o ct_accelhi.o ct_cursor.o\
-	ct_ddc.o ct_regs.o ct_dga.o ct_shadow.o
+	ct_ddc.o ct_regs.o ct_dga.o ct_shadow.o ct_video.o
 
 DEFINES = -DPSZ=8
 
 #if defined(XF86DriverSDK)
 INCLUDES = -I. -I../../include
 #else
-INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86SRC)/fbdevhw\
            -I$(XF86SRC)/vgafb -I$(XF86SRC)/vgahw -I$(SERVERSRC)/include \
 	   -I$(SERVERSRC)/mi -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb \
 	   -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/Xext \
@@ -28,7 +28,7 @@
 	   -I$(XF86SRC)/ramdac -I$(XF86SRC)/rac -I$(XF86SRC)/ddc \
 	   -I$(XF86SRC)/i2c -I$(XF86SRC)/xf24_32bpp -I$(XF86SRC)/shadowfb \
 	   -I$(XF86SRC)/xf8_16bpp -I$(XF86SRC)/int10 \
-	   -I$(XF86OSSRC)/vbe
+	   -I$(XF86OSSRC)/vbe -I$(EXTINCSRC)
 #endif
 
 #if MakeHasPosixVariableSubstitutions
@@ -65,5 +65,8 @@
 InstallDriverSDKNonExecFile(ct_driver.c,$(DRIVERSDKDIR)/drivers/chips)
 InstallDriverSDKNonExecFile(ct_driver.h,$(DRIVERSDKDIR)/drivers/chips)
 InstallDriverSDKNonExecFile(ct_regs.c,$(DRIVERSDKDIR)/drivers/chips)
+InstallDriverSDKNonExecFile(ct_shadow.c,$(DRIVERSDKDIR)/drivers/chips)
+InstallDriverSDKNonExecFile(ct_video.c,$(DRIVERSDKDIR)/drivers/chips)
 
 InstallDriverSDKObjectModule(chips,$(DRIVERSDKMODULEDIR),drivers)
+
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/chips.cpp:1.3 xc/programs/Xserver/hw/xfree86/drivers/chips/chips.cpp:1.7
--- xc/programs/Xserver/hw/xfree86/drivers/chips/chips.cpp:1.3	Thu Mar  2 17:05:34 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/chips.cpp	Tue Jun 13 19:13:08 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.cpp,v 1.3 2000/03/03 01:05:34 dawes Exp $
-.TH CHIPS __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.cpp,v 1.7 2000/06/14 02:13:08 dawes Exp $
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH CHIPS __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 chips \- Chips and Technologies video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""chips"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qchips\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B chips 
 is an XFree86 driver for Chips and Technologies video processors.  The majority
@@ -84,7 +84,7 @@
 The driver auto-detects the chipset type, but the following
 .B ChipSet
 names may optionally be specified in the config file
-.B """Device"""
+.B \*qDevice\*q
 section, and will override the auto-detection:
 .PP
 .RS 4
@@ -97,97 +97,101 @@
 chipsets.  But maybe overridden with the
 .B VideoRam
 entry in the config file
-.B """Device"""
+.B \*qDevice\*q
 section.
 .PP
 The following driver
 .B Options
 are supported, on one or more of the supported chipsets:
 .TP
-.BI "Option ""NoAccel"" """ boolean """
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
 .TP
-.BI "Option ""NoLinear"" """ boolean """
+.BI "Option \*qNoLinear\*q \*q" boolean \*q
 Disables linear addressing in cases where it is enabled by default.
 Default: off
 .TP
-.BI "Option ""Linear"" """ boolean """
+.BI "Option \*qLinear\*q \*q" boolean \*q
 Enables linear addressing in cases where it isdisabled by default.
 Default: off
 .TP
-.BI "Option ""HWCursor"" """ boolean """
+.BI "Option \*qHWCursor\*q \*q" boolean \*q
 Enable or disable the HW cursor.  Default: on.
 .TP
-.BI "Option ""SWCursor"" """ boolean """
+.BI "Option \*qSWCursor\*q \*q" boolean \*q
 Enable or disable the HW cursor.  Default: off.
 .TP
-.BI "Option ""STN"" """ boolean """
+.BI "Option \*qSTN\*q \*q" boolean \*q
 Force detection of STN screen type. Default: off.
 .TP
-.BI "Option ""UseModeline"" """ boolean """
+.BI "Option \*qUseModeline\*q \*q" boolean \*q
 Reprogram flat panel timings with values from the modeline. Default: off
 .TP
-.BI "Option ""FixPanelSize"" """ boolean """
+.BI "Option \*qFixPanelSize\*q \*q" boolean \*q
 Reprogram flat panel size with values from the modeline. Default: off
 .TP
-.BI "Option ""NoStretch"" """ boolean """
+.BI "Option \*qNoStretch\*q \*q" boolean \*q
 This option disables the stretching on a mode on a flat panel to fill the
 screen. Default: off
 .TP
-.BI "Option ""LcdCenter"" """ boolean """
+.BI "Option \*qLcdCenter\*q \*q" boolean \*q
 Center the mode displayed on the flat panel on the screen. Default: off
 .TP
-.BI "Option ""HWclocks"" """ boolean """
+.BI "Option \*qHWclocks\*q \*q" boolean \*q
 Force the use of fixed hardware clocks on chips that support both fixed
 and programmable clocks. Default: off
 .TP
-.BI "Option ""UseVclk1"" """ boolean """
+.BI "Option \*qUseVclk1\*q \*q" boolean \*q
 Use the Vclk1 programable clock on
 .B HiQV
 chipsets instead of Vclk2. Default: off
 .TP
-.BI "Option ""FPClock8"" """ float """
+.BI "Option \*qFPClock8\*q \*q" float \*q
 .TP
-.BI "Option ""FPClock16"" """ float """
+.BI "Option \*qFPClock16\*q \*q" float \*q
 .TP
-.BI "Option ""FPClock24"" """ float """
+.BI "Option \*qFPClock24\*q \*q" float \*q
 .TP
-.BI "Option ""FPClock32"" """ float """
+.BI "Option \*qFPClock32\*q \*q" float \*q
 Force the use of a particular video clock speed for use with the 
 flat panel at a specified depth
 .TP
-.BI "Option ""MMIO"" """ boolean """
+.BI "Option \*qMMIO\*q \*q" boolean \*q
 Force the use of memory mapped IO where it can be used. Default: off
 .TP
-.BI "Option ""SuspendHack"" """ boolean """
+.BI "Option \*qSuspendHack\*q \*q" boolean \*q
 Force driver to leave centering and stretching resgisters alone. This
 can fix some laptop suspend/resume problems. Default: off
 .TP
-.BI "Option ""Overlay""
+.BI "Option \*qOverlay\*q"
 Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
 .TP
-.BI "Option ""ColorKey"" """ integer """
+.BI "Option \*qColorKey\*q \*q" integer \*q
 Set the colormap index used for the transparency key for the depth 8 plane
 when operating in 8+16 overlay mode.  The value must be in the range
 2\-255.  Default: 255.
 .TP
-.BI "Option ""ShadowFB"" """ boolean """
+.BI "Option \*qVideoKey\*q \*q" integer \*q
+This sets the default pixel value for the YUV video overlay key.
+Default: undefined.
+.TP
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  See
 shadowfb(__drivermansuffix__) for further information.  Default: off.
 .TP
-.BI "Option ""SyncOnGreen"" """ boolean """
+.BI "Option \*qSyncOnGreen\*q \*q" boolean \*q
 Enable or disable combining the sync signals with the green signal.
 Default: off.
 .TP
-.BI "Option ""ShowCache"" """ boolean """
+.BI "Option \*qShowCache\*q \*q" boolean \*q
 Enable or disable viewing offscreen memory. Used for debugging only
 Default: off.
 .TP
-.BI "Option ""18bitBus"" """ boolean """
+.BI "Option \*q18bitBus\*q \*q" boolean \*q
 Force the driver to assume that the flat panel has an 18bit data bus.
 Default: off.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .PP
 You are also recommended to read the README.chips file that comes with all
 XFree86 distributions, which discusses the
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c:1.4 xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c:1.4	Sun Dec 20 03:57:42 1998
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c	Tue Apr  4 12:25:05 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c,v 1.4 1998/12/20 11:57:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c,v 1.5 2000/04/04 19:25:05 dawes Exp $ */
 
 /*
  * Copyright 1997
@@ -36,13 +36,13 @@
  */
 /* #define DIRECT_REGISTER_ACCESS */
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
+
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c:1.19 xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c:1.20
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c:1.19	Tue Feb  8 05:13:10 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c	Tue Apr  4 12:25:06 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c,v 1.19 2000/02/08 13:13:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c,v 1.20 2000/04/04 19:25:06 dawes Exp $ */
 
 /*
  * Copyright 1994  The XFree86 Project
@@ -26,13 +26,13 @@
  * Modified for Chips and Technologies by David Bateman <dbateman@eng.uts.edu.au>
  */
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"   
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h" 
+
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"   
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c:1.7
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c:1.6	Fri Dec  3 11:17:27 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c	Tue Apr  4 12:25:06 2000
@@ -1,12 +1,12 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c,v 1.6 1999/12/03 19:17:27 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c,v 1.7 2000/04/04 19:25:06 dawes Exp $ */
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
+
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c:1.84 xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c:1.91
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c:1.84	Mon Mar  6 15:54:08 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c	Wed Jun 21 10:28:04 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c,v 1.84 2000/03/06 23:54:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c,v 1.91 2000/06/21 17:28:04 dawes Exp $ */
 
 /*
  * Copyright 1993 by Jon Block <block@frc.com>
@@ -70,14 +70,14 @@
  *    advised of the possibility of such damage. 
  */
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
 
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
+
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
 
@@ -553,6 +553,7 @@
     OPTION_SHADOW_FB,
     OPTION_OVERLAY,
     OPTION_COLOR_KEY,
+    OPTION_VIDEO_KEY,
     OPTION_FP_CLOCK_8,
     OPTION_FP_CLOCK_16,
     OPTION_FP_CLOCK_24,
@@ -622,6 +623,7 @@
     { OPTION_ROTATE, 	        "Rotate",	OPTV_ANYSTR,	{0}, FALSE },
     { OPTION_OVERLAY,		"Overlay",	OPTV_ANYSTR,	{0}, FALSE },
     { OPTION_COLOR_KEY,		"ColorKey",	OPTV_INTEGER,	{0}, FALSE },
+    { OPTION_VIDEO_KEY,		"VideoKey",	OPTV_INTEGER,	{0}, FALSE },
     { OPTION_FP_CLOCK_8,	"FPClock8",	OPTV_FREQ,      {0}, FALSE },
     { OPTION_FP_CLOCK_16,	"FPClock16",	OPTV_FREQ,      {0}, FALSE },
     { OPTION_FP_CLOCK_24,	"FPClock24",	OPTV_FREQ,      {0}, FALSE },
@@ -846,7 +848,42 @@
 		foundScreen = TRUE;
 	    else for (i = 0; i < numUsed; i++) {
 		/* Allocate a ScrnInfoRec  */
-		ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
+		ScrnInfoPtr pScrn = NULL;
+		if ((pScrn = xf86ConfigPciEntity(pScrn,0,usedChips[i],
+						       CHIPSPCIchipsets,NULL,
+						       NULL,NULL,NULL,NULL))){
+		    pScrn->driverVersion = VERSION;
+		    pScrn->driverName    = CHIPS_DRIVER_NAME;
+		    pScrn->name          = CHIPS_NAME;
+		    pScrn->Probe         = CHIPSProbe;
+		    pScrn->PreInit       = CHIPSPreInit;
+		    pScrn->ScreenInit    = CHIPSScreenInit;
+		    pScrn->SwitchMode    = CHIPSSwitchMode;
+		    pScrn->AdjustFrame   = CHIPSAdjustFrame;
+		    pScrn->EnterVT       = CHIPSEnterVT;
+		    pScrn->LeaveVT       = CHIPSLeaveVT;
+		    pScrn->FreeScreen    = CHIPSFreeScreen;
+		    pScrn->ValidMode     = CHIPSValidMode;
+		    foundScreen = TRUE;
+		}
+	    }
+	    xfree(usedChips);
+	}
+    }
+    
+    /* Isa Bus */
+    numUsed = xf86MatchIsaInstances(CHIPS_NAME,CHIPSChipsets,CHIPSISAchipsets,
+				    drv,chipsFindIsaDevice,devSections,
+				    numDevSections,&usedChips);
+    if (numUsed > 0) {
+	if (flags & PROBE_DETECT)
+	    foundScreen = TRUE;
+	else for (i = 0; i < numUsed; i++) {
+	    ScrnInfoPtr pScrn = NULL;
+	    if ((pScrn = xf86ConfigIsaEntity(pScrn,0,
+						   usedChips[i],
+						   CHIPSISAchipsets,NULL,
+						   NULL,NULL,NULL,NULL))) {
 		pScrn->driverVersion = VERSION;
 		pScrn->driverName    = CHIPS_DRIVER_NAME;
 		pScrn->name          = CHIPS_NAME;
@@ -860,41 +897,11 @@
 		pScrn->FreeScreen    = CHIPSFreeScreen;
 		pScrn->ValidMode     = CHIPSValidMode;
 		foundScreen = TRUE;
-		xf86ConfigActivePciEntity(pScrn,usedChips[i],CHIPSPCIchipsets,
-					  NULL,NULL,NULL,NULL,NULL);
 	    }
 	    xfree(usedChips);
 	}
     }
     
-    /* Isa Bus */
-    numUsed = xf86MatchIsaInstances(CHIPS_NAME,CHIPSChipsets,CHIPSISAchipsets,
-				     drv,chipsFindIsaDevice,devSections,
-				     numDevSections,&usedChips);
-    if (numUsed > 0) {
-	if (flags & PROBE_DETECT)
-	    foundScreen = TRUE;
-	else for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
-	    
-	    pScrn->driverVersion = VERSION;
-	    pScrn->driverName    = CHIPS_DRIVER_NAME;
-	    pScrn->name          = CHIPS_NAME;
-	    pScrn->Probe         = CHIPSProbe;
-	    pScrn->PreInit       = CHIPSPreInit;
-	    pScrn->ScreenInit    = CHIPSScreenInit;
-	    pScrn->SwitchMode    = CHIPSSwitchMode;
-	    pScrn->AdjustFrame   = CHIPSAdjustFrame;
-	    pScrn->EnterVT       = CHIPSEnterVT;
-	    pScrn->LeaveVT       = CHIPSLeaveVT;
-	    pScrn->FreeScreen    = CHIPSFreeScreen;
-	    pScrn->ValidMode     = CHIPSValidMode;
-	    foundScreen = TRUE;
-	    xf86ConfigActiveIsaEntity(pScrn,usedChips[i],CHIPSISAchipsets,
-				      NULL,NULL,NULL,NULL,NULL);
-	}
-	xfree(usedChips);
-    }
     xfree(devSections);
     return foundScreen;
 }
@@ -1046,8 +1053,8 @@
 #endif
     }
 #endif
+
     if (xf86LoadSubModule(pScrn, "vbe")) {
-	
 	cPtr->pVbe =  VBEInit(NULL,cPtr->pEnt->index);
     }
     
@@ -1066,6 +1073,7 @@
     case CHIPS_CT65554:
     case CHIPS_CT65550:
 	cPtr->Flags |= ChipsGammaSupport;
+	cPtr->Flags |= ChipsVideoSupport;
 	/* Fall through */
     case CHIPS_CT65548:
     case CHIPS_CT65546:
@@ -1109,7 +1117,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = xnfalloc(sizeof(ClockRange));
+    clockRanges = xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->ClockMulFactor = cPtr->ClockMulFactor;
     clockRanges->minClock = cPtr->MinClock;
@@ -1562,6 +1570,19 @@
 	}
     }
 
+    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
+	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
+		&(cPtr->videoKey))) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
+		cPtr->videoKey);
+	} else {
+	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
+			(1 << pScrn->offset.green) |
+			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
+			<< pScrn->offset.blue); 
+	}
+    }
+
     if (cPtr->Flags & ChipsShadowFB) {
 	if (cPtr->Flags & ChipsAccelSupport) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
@@ -1676,9 +1697,6 @@
     cPtr->IOBase = (unsigned int)(cPtr->SuspendHack.vgaIOBaseFlag ?
 				  0x3D0 : 0x3B0);
 
-    /* monitor info */
-    cPtr->Monitor = chipsSetMonitor(pScrn);
-
     /*test STN / TFT */
     tmp = cPtr->readFR(cPtr, 0x10);
 
@@ -1712,9 +1730,11 @@
 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "LCD/CRT\n");
     else if (cPtr->PanelType & ChipsLCD)
         xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "LCD\n");
-    else if (cPtr->PanelType & ChipsCRT)
+    else if (cPtr->PanelType & ChipsCRT) {
         xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "CRT\n");
-
+	/* monitor info */
+	cPtr->Monitor = chipsSetMonitor(pScrn);
+    }
 
     /* screen size */
     /* 
@@ -1938,7 +1958,7 @@
 	    }
 	} else
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-		       "Memory clock of %7.3f MHz exceeds limit of %7.3 MHz\n",
+		       "Memory clock of %7.3f MHz exceeds limit of %7.3f MHz\n",
 		       (float)(mclk/1000.), 
 		       (float)(MemClk->Max/1000.));
     } else 
@@ -2017,11 +2037,11 @@
 	}
 
 	if (speed == 0)
-	    cPtr->MaxClock = cPtr->pEnt->device->dacSpeeds[0];
+	    speed = cPtr->pEnt->device->dacSpeeds[0];
 	from = X_CONFIG;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
 		   "User max pixel clock of %7.3f MHz overrides %7.3f MHz limit\n",
-		   (float)(cPtr->MaxClock / 1000.), (float)(speed / 1000.));
+		   (float)(speed / 1000.), (float)(cPtr->MaxClock / 1000.));
 	cPtr->MaxClock = speed;
     } else {
 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
@@ -2082,9 +2102,10 @@
 
 #ifdef XFree86LOADER
 	if (cPtr->pVbe) {
-	    if ((pMon = xf86PrintEDID(vbeDoEDID(cPtr->pVbe))) != NULL)
+	    if ((pMon = xf86PrintEDID(vbeDoEDID(cPtr->pVbe, NULL))) != NULL) {
 		ddc_done = TRUE;
-	    xf86SetDDCproperties(pScrn,pMon);
+		xf86SetDDCproperties(pScrn,pMon);
+	    }
 	}
 #endif
 
@@ -2396,12 +2417,12 @@
 	}
     }
 
-    /* monitor info */
-    cPtr->Monitor = chipsSetMonitor(pScrn);
-
     cPtr->PanelType |= ChipsCRT;
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "CRT\n");
 
+    /* monitor info */
+    cPtr->Monitor = chipsSetMonitor(pScrn);
+
     /* bus type */
     tmp = cPtr->readXR(cPtr, 0x01) & 3;
     switch (tmp) {
@@ -2576,7 +2597,7 @@
     if (xf86LoadSubModule(pScrn, "ddc")) {
 	xf86LoaderReqSymLists(ddcSymbols, NULL);
 	if (cPtr->pVbe)
-	    xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(cPtr->pVbe)));
+	    xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(cPtr->pVbe, NULL)));
     }
 #endif    
     return TRUE;
@@ -2898,9 +2919,6 @@
 	}
     }
 
-    /* monitor info */
-    cPtr->Monitor = chipsSetMonitor(pScrn);
-
     /*test STN / TFT */
     tmp = cPtr->readXR(cPtr, 0x51);
 
@@ -2934,9 +2952,11 @@
 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "LCD/CRT\n");
     else if (cPtr->PanelType & ChipsLCD)
         xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "LCD\n");
-    else if (cPtr->PanelType & ChipsCRT)
+    else if (cPtr->PanelType & ChipsCRT) {
         xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "CRT\n");
-
+	/* monitor info */
+	cPtr->Monitor = chipsSetMonitor(pScrn);
+    }
       
     /* screen size */
     /* 
@@ -3334,7 +3354,7 @@
 	    } else {
 		xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
 			   "Memory clock of %7.3f MHz exceeds limit of "
-			   "%7.3 MHz\n",(float)(mclk/1000.),
+			   "%7.3f MHz\n",(float)(mclk/1000.),
 			   (float)(cPtr->MemClock.Max/1000.));
 		cPtr->MemClock.Clk = cPtr->MemClock.Max * 0.9;
 	    }
@@ -3349,7 +3369,7 @@
     if (xf86LoadSubModule(pScrn, "ddc")) {
 	xf86LoaderReqSymLists(ddcSymbols, NULL);
 	if (cPtr->pVbe)
-	    xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(cPtr->pVbe)));
+	    xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(cPtr->pVbe, NULL)));
     }
 #endif
     return TRUE;
@@ -3742,9 +3762,6 @@
 	}
 	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
-#ifdef ENABLE_SILKEN_MOUSE
-	xf86SetSilkenMouse(pScreen);
-#endif
 
 	/* Initialise cursor functions */
 	miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
@@ -3933,6 +3950,14 @@
     racflag |= (RAC_FB | RAC_VIEWPORT);
     /* XXX Check if I/O and Mem flags need to be the same. */
     pScrn->racIoFlags = pScrn->racMemFlags = racflag;
+#ifdef ENABLE_SILKEN_MOUSE
+	xf86SetSilkenMouse(pScreen);
+#endif
+
+    if ((!(cPtr->Flags & ChipsOverlay8plus16)) &&
+		(cPtr->Flags & ChipsVideoSupport)) {
+	CHIPSInitVideo(pScreen);
+    }
     
     pScreen->SaveScreen = CHIPSSaveScreen;
 
@@ -4795,7 +4820,6 @@
     CHIPSRegPtr ChipsNew;
     vgaRegPtr ChipsStd;
     unsigned int tmp;
-    int OverlaySkewX, OverlaySkewY;
     
     ChipsNew = &cPtr->ModeReg;
     ChipsStd = &hwp->ModeReg;
@@ -4824,18 +4848,18 @@
    
     /* get C&T Specific Registers */
     for (i = 0; i < 0xFF; i++) {
-	ChipsNew->XR[i] = cPtr->readXR(cPtr, i);
+	/* Save SAR04 multimedia register correctly */
+	if (i == 0x4F) {
+	    cPtr->writeXR(cPtr, 0x4E, 0x04);
+	    ChipsNew->XR[i] = cPtr->readXR(cPtr, i);
+	} else
+	    ChipsNew->XR[i] = cPtr->readXR(cPtr, i);
     }
     for (i = 0; i < 0x80; i++) {
 	ChipsNew->FR[i] = cPtr->readFR(cPtr, i);
     }
     for (i = 0; i < 0x80; i++) {
-	/* Save SAR04 multimedia register correctly */
-	if (i == 0x4F) {
-	    cPtr->writeXR(cPtr, 0x4E, 0x04);
-	    ChipsNew->MR[i] = cPtr->readMR(cPtr, i);
-	} else
-	    ChipsNew->MR[i] = cPtr->readMR(cPtr, i);
+	ChipsNew->MR[i] = cPtr->readMR(cPtr, i);
     }
     for (i = 0x30; i < 0x80; i++) {    /* These are the CT extended CRT regs */
 	ChipsNew->CR[i] = hwp->readCrtc(hwp, i);
@@ -5117,7 +5141,46 @@
 	    ChipsNew->FR[0x12] |= 0x4;	/* rid of line in DSTN screens  */
     }
 
-    /* Setup the overlay */
+    /*
+     * The zero position of the overlay does not align with the zero
+     * position of the display. The skew is dependent on the depth,
+     * display type and refresh rate. Calculate the skew before setting
+     * the X and Y dimensions of the overlay. These values are needed
+     * both by the overlay and XvImages. So calculate and store them
+     */
+    if (cPtr->PanelType & ChipsLCD) {
+	cPtr->OverlaySkewX = (((ChipsNew->FR[0x23] & 0xFF) 
+			    - (ChipsNew->FR[0x20] & 0xFF) + 3) << 3) 
+			    - 1;
+	cPtr->OverlaySkewY = (ChipsNew->FR[0x33]
+			    + ((ChipsNew->FR[0x36] & 0xF) << 8)
+			    - (ChipsNew->FR[0x31] & 0xF0)
+			    - (ChipsNew->FR[0x32] & 0x0F)
+			    - ((ChipsNew->FR[0x35] & 0xF0) << 4));
+	if (cPtr->PanelSize.HDisplay > mode->CrtcHDisplay)
+	    cPtr->OverlaySkewX += (cPtr->PanelSize.HDisplay - 
+						mode->CrtcHDisplay) / 2;
+	if (cPtr->PanelSize.VDisplay > mode->CrtcVDisplay)
+	    cPtr->OverlaySkewY += (cPtr->PanelSize.VDisplay - 
+						mode->CrtcVDisplay) / 2;
+    } else {
+	cPtr->OverlaySkewX = mode->CrtcHTotal - mode->CrtcHBlankStart - 1;
+	cPtr->OverlaySkewY = mode->CrtcVTotal - mode->CrtcVSyncEnd;
+	    
+	if (mode->Flags & V_INTERLACE) {
+	    /*
+	     * This handles 1024 and 1280 interlaced modes only. Its 
+	     * pretty arbitrary, but its what C&T recommends
+	     */
+	    if (mode->CrtcHDisplay == 1024)
+		cPtr->OverlaySkewY += 5;
+	    if (mode->CrtcHDisplay == 1280)
+		cPtr->OverlaySkewY *= 2;
+	    
+	}
+    }
+    
+    /* Setup the video/overlay */
     if (cPtr->Flags & ChipsOverlay8plus16) {
 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
 	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
@@ -5140,58 +5203,23 @@
 	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
 	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
 
-	/*
-	 * The zero position of the overlay does not align with the zero
-         * position of the display. The skew is dependent on the depth,
-	 * display type and refresh rate. Calculate the skew before setting
-	 * the X and Y dimensions of the overlay
-         */
-	if (cPtr->PanelType & ChipsLCD) {
-	    OverlaySkewX = (((ChipsNew->FR[0x23] & 0xFF) 
-			    - (ChipsNew->FR[0x20] & 0xFF) + 3) << 3) 
-			    - 1;
-	    OverlaySkewY = (ChipsNew->FR[0x33]
-			    + ((ChipsNew->FR[0x36] & 0xF) << 8)
-			    - (ChipsNew->FR[0x31] & 0xF0)
-			    - (ChipsNew->FR[0x32] & 0x0F)
-			    - ((ChipsNew->FR[0x35] & 0xF0) << 4));
-	    if (cPtr->PanelSize.HDisplay > mode->CrtcHDisplay)
-		OverlaySkewX += (cPtr->PanelSize.HDisplay - mode->CrtcHDisplay)
-							/ 2;
-	    if (cPtr->PanelSize.VDisplay > mode->CrtcVDisplay)
-		OverlaySkewY += (cPtr->PanelSize.VDisplay - mode->CrtcVDisplay)
-							/ 2;
-	} else {
-	    OverlaySkewX = mode->CrtcHTotal - mode->CrtcHBlankStart - 1;
-	    OverlaySkewY = mode->CrtcVTotal - mode->CrtcVSyncEnd;
-	    
-	    if (mode->Flags & V_INTERLACE) {
-		/*
-		 * This handles 1024 and 1280 interlaced modes only. Its 
-		 * pretty arbitrary, but its what C&T recommends
-		 */
-		if (mode->CrtcHDisplay == 1024)
-		    OverlaySkewY += 5;
-		if (mode->CrtcHDisplay == 1280)
-		    OverlaySkewY *= 2;
-		
-	    }
-	}
-
 	/* Left Edge of Overlay */
-	ChipsNew->MR[0x2A] = OverlaySkewX;
+	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
 	ChipsNew->MR[0x2B] &= 0xF8;
 	/* Right Edge of Overlay */
-	ChipsNew->MR[0x2C] = (OverlaySkewX + pScrn->displayWidth - 1) & 0xFF;
+	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
+							1) & 0xFF;
 	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
-	ChipsNew->MR[0x2D] = ((OverlaySkewX + pScrn->displayWidth - 1) >> 8) & 0x07;
+	ChipsNew->MR[0x2D] = ((cPtr->OverlaySkewX + pScrn->displayWidth -
+							1) >> 8) & 0x07;
 	/* Top Edge of Overlay */
-	ChipsNew->MR[0x2E] = OverlaySkewY;
+	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
 	ChipsNew->MR[0x2F] &= 0xF8;
 	/* Bottom Edge of Overlay*/
-	ChipsNew->MR[0x30] = (OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
+	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
 	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
-	ChipsNew->MR[0x31] = ((OverlaySkewY + pScrn->virtualY - 1 ) >> 8) & 0x07;
+	ChipsNew->MR[0x31] = ((cPtr->OverlaySkewY + pScrn->virtualY - 
+							1 ) >> 8) & 0x07;
 
 	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
 	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
@@ -5201,6 +5229,17 @@
 	ChipsNew->MR[0x40] = 0xFF;
 	ChipsNew->MR[0x41] = 0xFF;
 	ChipsNew->MR[0x42] = 0x00;
+    } else if (cPtr->Flags & ChipsVideoSupport) {
+	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
+	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
+	ChipsNew->MR[0x3C] &= 0x18;	/* Ensure that the overlay is off */
+	cPtr->VideoZoomMax = 0x100;
+
+	if (cPtr->Chipset == CHIPS_CT65550) {
+	    tmp = cPtr->readXR(cPtr, 0x04);
+	    if (tmp < 0x02)				/* 65550 ES0 has */ 
+		cPtr->VideoZoomMax = 0x40;		/* 0x40 max zoom */
+	}
     }
 
     /* Program the registers */
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h:1.26 xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h:1.27
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h:1.26	Sun Mar  5 08:59:13 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h	Tue Apr  4 12:25:08 2000
@@ -22,7 +22,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h,v 1.26 2000/03/05 16:59:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h,v 1.27 2000/04/04 19:25:08 dawes Exp $ */
 
 
 #ifndef _CT_DRIVER_H_
@@ -34,6 +34,7 @@
 #include "xf86Cursor.h"
 #include "xf86i2c.h"
 #include "xf86DDC.h"
+#include "xf86xv.h"
 
 /* Supported chipsets */
 typedef enum {
@@ -103,15 +104,16 @@
 #define ChipsDPMSSupport	0x00000020
 #define ChipsTMEDSupport	0x00000040
 #define ChipsGammaSupport	0x00000080
+#define ChipsVideoSupport	0x00000100
 
 /* Options flags for the C&T chipsets */
-#define ChipsHWCursor		0x00000100
-#define ChipsShadowFB		0x00000200
-#define ChipsOverlay8plus16	0x00000400
+#define ChipsHWCursor		0x00001000
+#define ChipsShadowFB		0x00002000
+#define ChipsOverlay8plus16	0x00004000
 
 /* Architecture type flags */
-#define ChipsHiQV		0x00001000
-#define ChipsWingine		0x00002000
+#define ChipsHiQV		0x00010000
+#define ChipsWingine		0x00020000
 #define IS_Wingine(x)		((x->Flags) & ChipsWingine)
 #define IS_HiQV(x)		((x->Flags) & ChipsHiQV)
 
@@ -283,6 +285,13 @@
     Bool		DGAactive;
     int			DGAViewportStatus;
     CloseScreenProcPtr	CloseScreen;
+    ScreenBlockHandlerProcPtr BlockHandler;
+    int			videoKey;
+    XF86VideoAdaptorPtr	adaptor;
+    int			OverlaySkewX;
+    int			OverlaySkewY;
+    int			VideoZoomMax;
+
 #ifdef __arm32__
 #ifdef __NetBSD__
     int			TVMode;
@@ -317,6 +326,10 @@
 
 void CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags);
 Bool CHIPSSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+
+/* video */
+void CHIPSInitVideo(ScreenPtr pScreen);
+void CHIPSResetVideo(ScrnInfoPtr pScrn);
 
 /* banking */
 int CHIPSSetRead(ScreenPtr pScreen, int bank);
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c:1.2	Fri Dec  3 11:17:31 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c	Tue Apr  4 12:25:08 2000
@@ -19,7 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c,v 1.2 1999/12/03 19:17:31 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c,v 1.3 2000/04/04 19:25:08 dawes Exp $ */
 
 /*
  * The functions in this file are used to read/write the C&T extension register
@@ -48,13 +48,13 @@
  */
 
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
+
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c:1.2
--- /dev/null	Sat Jul  1 20:42:49 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c	Thu Apr  6 20:57:50 2000
@@ -0,0 +1,1121 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c,v 1.2 2000/04/07 03:57:50 tsi Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86Resources.h"
+#include "xf86_ansic.h"
+#include "compiler.h"
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+#include "xf86fbman.h"
+#include "regionstr.h"
+
+#include "ct_driver.h"
+#include "Xv.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "dixstruct.h"
+
+#define OFF_DELAY 	200  /* milliseconds */
+#define FREE_DELAY 	60000
+
+#define OFF_TIMER 	0x01
+#define FREE_TIMER	0x02
+#define CLIENT_VIDEO_ON	0x04
+
+#define TIMER_MASK      (OFF_TIMER | FREE_TIMER)
+
+#ifndef XvExtension
+void CHIPSInitVideo(ScreenPtr pScreen) {}
+void CHIPSResetVideo(ScrnInfoPtr pScrn) {}
+#else
+
+static XF86VideoAdaptorPtr CHIPSSetupImageVideo(ScreenPtr);
+static void CHIPSInitOffscreenImages(ScreenPtr);
+static void CHIPSStopVideo(ScrnInfoPtr, pointer, Bool);
+static int CHIPSSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
+static int CHIPSGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
+static void CHIPSQueryBestSize(ScrnInfoPtr, Bool,
+	short, short, short, short, unsigned int *, unsigned int *, pointer);
+static int CHIPSPutImage( ScrnInfoPtr, 
+	short, short, short, short, short, short, short, short,
+	int, unsigned char*, short, short, Bool, RegionPtr, pointer);
+static int CHIPSQueryImageAttributes(ScrnInfoPtr, 
+	int, unsigned short *, unsigned short *,  int *, int *);
+
+static void CHIPSBlockHandler(int, pointer, pointer, pointer);
+
+#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
+
+static Atom xvColorKey;
+
+void CHIPSInitVideo(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
+    XF86VideoAdaptorPtr newAdaptor = NULL;
+    CHIPSPtr cPtr = CHIPSPTR(pScrn);
+    int num_adaptors;
+	
+    if(!(cPtr->Flags & ChipsOverlay8plus16) &&
+       (cPtr->Flags & ChipsVideoSupport)) {
+	newAdaptor = CHIPSSetupImageVideo(pScreen);
+	CHIPSInitOffscreenImages(pScreen);
+    }
+
+    num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
+
+    if(newAdaptor) {
+	if(!num_adaptors) {
+	    num_adaptors = 1;
+	    adaptors = &newAdaptor;
+	} else {
+	    newAdaptors =  /* need to free this someplace */
+		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+	    if(newAdaptors) {
+		memcpy(newAdaptors, adaptors, num_adaptors * 
+					sizeof(XF86VideoAdaptorPtr));
+		newAdaptors[num_adaptors] = newAdaptor;
+		adaptors = newAdaptors;
+		num_adaptors++;
+	    }
+	}
+    }
+
+    if(num_adaptors)
+        xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+
+    if(newAdaptors)
+	xfree(newAdaptors);
+}
+
+/* client libraries expect an encoding */
+static XF86VideoEncodingRec DummyEncoding[1] =
+{
+ {
+   0,
+   "XV_IMAGE",
+   1024, 1024,
+   {1, 1}
+ }
+};
+
+#define NUM_FORMATS 4
+
+static XF86VideoFormatRec Formats[NUM_FORMATS] = 
+{
+  {8, PseudoColor},  {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+};
+
+#define NUM_ATTRIBUTES 1
+
+static XF86AttributeRec Attributes[NUM_ATTRIBUTES] =
+{
+   {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"}
+};
+
+#define NUM_IMAGES 4
+
+static XF86ImageRec Images[NUM_IMAGES] =
+{
+   {
+	0x35315652,
+        XvRGB,
+	LSBFirst,
+	{'R','V','1','5',
+	  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	16,
+	XvPacked,
+	1,
+	15, 0x001F, 0x03E0, 0x7C00,
+	0, 0, 0,
+	0, 0, 0,
+	0, 0, 0,
+	{'R','V','B',0,
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+	XvTopToBottom
+   },
+   {
+	0x36315652,
+        XvRGB,
+	LSBFirst,
+	{'R','V','1','6',
+	  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	16,
+	XvPacked,
+	1,
+	16, 0x001F, 0x07E0, 0xF800,
+	0, 0, 0,
+	0, 0, 0,
+	0, 0, 0,
+	{'R','V','B',0,
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+	XvTopToBottom
+   },
+   {
+	0x32315659,
+	XvYUV,
+	LSBFirst,
+	{'Y','V','1','2',
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71},
+	12,
+	XvPlanar,
+	3,
+	0, 0, 0, 0 ,
+	8, 8, 8, 
+	1, 2, 2,
+	1, 2, 2,
+	{'Y','V','U',
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+	XvTopToBottom
+   },
+   {
+	0x32595559,
+        XvYUV,
+	LSBFirst,
+	{'Y','U','Y','2',
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71},
+	16,
+	XvPacked,
+	1,
+	0, 0, 0, 0 ,
+	8, 8, 8, 
+	1, 2, 2,
+	1, 1, 1,
+	{'Y','U','Y','V',
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+	XvTopToBottom
+   }
+};
+
+typedef struct {
+   FBAreaPtr	area;
+   RegionRec	clip;
+   CARD32	colorKey;
+   CARD32	videoStatus;
+   Time		offTime;
+   Time		freeTime;
+} CHIPSPortPrivRec, *CHIPSPortPrivPtr;
+
+
+#define GET_PORT_PRIVATE(pScrn) \
+   (CHIPSPortPrivPtr)((CHIPSPTR(pScrn))->adaptor->pPortPrivates[0].ptr)
+
+void CHIPSResetVideo(ScrnInfoPtr pScrn) 
+{
+    CHIPSPtr cPtr = CHIPSPTR(pScrn);
+    CHIPSPortPrivPtr pPriv = cPtr->adaptor->pPortPrivates[0].ptr;
+    unsigned char mr3c;
+    int red, green, blue;
+    
+    CHIPSHiQVSync(pScrn);
+    mr3c = cPtr->readMR(cPtr, 0x3C);
+    cPtr->writeMR(cPtr, 0x3C, (mr3c | 0x6));
+
+    switch (pScrn->depth) {
+    case 8:
+	cPtr->writeMR(cPtr, 0x3D, 0x00);
+	cPtr->writeMR(cPtr, 0x3E, 0x00);
+	cPtr->writeMR(cPtr, 0x3F, (pPriv->colorKey & 0xFF));
+	cPtr->writeMR(cPtr, 0x40, 0xFF);
+	cPtr->writeMR(cPtr, 0x41, 0xFF);
+	cPtr->writeMR(cPtr, 0x42, 0x00);
+	break;
+    default:
+	red = (pPriv->colorKey & pScrn->mask.red) >> pScrn->offset.red;
+	green = (pPriv->colorKey & pScrn->mask.green) >> pScrn->offset.green;
+	blue = (pPriv->colorKey & pScrn->mask.blue) >> pScrn->offset.blue;
+	switch (pScrn->depth) {
+	case 15:
+	    cPtr->writeMR(cPtr, 0x3D, (red << 3));
+	    cPtr->writeMR(cPtr, 0x3E, (green << 3));
+	    cPtr->writeMR(cPtr, 0x3F, (blue << 3));
+	    cPtr->writeMR(cPtr, 0x40, 0x07);
+	    cPtr->writeMR(cPtr, 0x41, 0x07);
+	    cPtr->writeMR(cPtr, 0x42, 0x07);
+	    break;
+	case 16:
+	    cPtr->writeMR(cPtr, 0x3D, (red << 3));
+	    cPtr->writeMR(cPtr, 0x3E, (green << 2));
+	    cPtr->writeMR(cPtr, 0x3F, (blue << 3));
+	    cPtr->writeMR(cPtr, 0x40, 0x07);
+	    cPtr->writeMR(cPtr, 0x41, 0x03);
+	    cPtr->writeMR(cPtr, 0x42, 0x07);
+	    break;
+	case 24:
+	    cPtr->writeMR(cPtr, 0x3D, red);
+	    cPtr->writeMR(cPtr, 0x3E, green);
+	    cPtr->writeMR(cPtr, 0x3F, blue);
+	    cPtr->writeMR(cPtr, 0x40, 0x00);
+	    cPtr->writeMR(cPtr, 0x41, 0x00);
+	    cPtr->writeMR(cPtr, 0x42, 0x00);
+	    break;
+	}    
+    }    
+}
+
+
+static XF86VideoAdaptorPtr 
+CHIPSSetupImageVideo(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    CHIPSPtr cPtr = CHIPSPTR(pScrn);
+    XF86VideoAdaptorPtr adapt;
+    CHIPSPortPrivPtr pPriv;
+
+    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
+			    sizeof(CHIPSPortPrivRec) +
+			    sizeof(DevUnion))))
+	return NULL;
+
+    adapt->type = XvWindowMask | XvInputMask | XvImageMask;
+    adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
+    adapt->name = "Chips and Technologies Backend Scaler";
+    adapt->nEncodings = 1;
+    adapt->pEncodings = DummyEncoding;
+    adapt->nFormats = NUM_FORMATS;
+    adapt->pFormats = Formats;
+    adapt->nPorts = 1;
+    adapt->pPortPrivates = (DevUnion*)(&adapt[1]);
+    pPriv = (CHIPSPortPrivPtr)(&adapt->pPortPrivates[1]);
+    adapt->pPortPrivates[0].ptr = (pointer)(pPriv);
+    adapt->pAttributes = Attributes;
+    adapt->nImages = NUM_IMAGES;
+    adapt->nAttributes = NUM_ATTRIBUTES;
+    adapt->pImages = Images;
+    adapt->PutVideo = NULL;
+    adapt->PutStill = NULL;
+    adapt->GetVideo = NULL;
+    adapt->GetStill = NULL;
+    adapt->StopVideo = CHIPSStopVideo;
+    adapt->SetPortAttribute = CHIPSSetPortAttribute;
+    adapt->GetPortAttribute = CHIPSGetPortAttribute;
+    adapt->QueryBestSize = CHIPSQueryBestSize;
+    adapt->PutImage = CHIPSPutImage;
+    adapt->QueryImageAttributes = CHIPSQueryImageAttributes;
+
+    pPriv->colorKey = cPtr->videoKey;
+    pPriv->videoStatus = 0;
+    
+    /* gotta uninit this someplace */
+    REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); 
+
+    cPtr->adaptor = adapt;
+
+    cPtr->BlockHandler = pScreen->BlockHandler;
+    pScreen->BlockHandler = CHIPSBlockHandler;
+
+    xvColorKey   = MAKE_ATOM("XV_COLORKEY");
+
+    CHIPSResetVideo(pScrn);
+
+    return adapt;
+}
+
+
+static Bool
+RegionsEqual(RegionPtr A, RegionPtr B)
+{
+    int *dataA, *dataB;
+    int num;
+
+    num = REGION_NUM_RECTS(A);
+    if(num != REGION_NUM_RECTS(B))
+	return FALSE;
+
+    if((A->extents.x1 != B->extents.x1) ||
+       (A->extents.x2 != B->extents.x2) ||
+       (A->extents.y1 != B->extents.y1) ||
+       (A->extents.y2 != B->extents.y2))
+	return FALSE;
+
+    dataA = (int*)REGION_RECTS(A);
+    dataB = (int*)REGION_RECTS(B);
+
+    while(num--) {
+	if((dataA[0] != dataB[0]) || (dataA[1] != dataB[1]))
+	   return FALSE;
+	dataA += 2; 
+	dataB += 2;
+    }
+
+    return TRUE;
+}
+
+
+/* CHIPSClipVideo -  
+
+   Takes the dst box in standard X BoxRec form (top and left
+   edges inclusive, bottom and right exclusive).  The new dst
+   box is returned.  The source boundaries are given (x1, y1 
+   inclusive, x2, y2 exclusive) and returned are the new source 
+   boundaries in 16.16 fixed point.
+*/
+
+static void
+CHIPSClipVideo(
+  BoxPtr dst, 
+  INT32 *x1, 
+  INT32 *x2, 
+  INT32 *y1, 
+  INT32 *y2,
+  BoxPtr extents,            /* extents of the clip region */
+  INT32 width, 
+  INT32 height
+){
+    INT32 vscale, hscale, delta;
+    int diff;
+
+    hscale = ((*x2 - *x1) << 16) / (dst->x2 - dst->x1);
+    vscale = ((*y2 - *y1) << 16) / (dst->y2 - dst->y1);
+
+    *x1 <<= 16; *x2 <<= 16;
+    *y1 <<= 16; *y2 <<= 16;
+
+    diff = extents->x1 - dst->x1;
+    if(diff > 0) {
+	dst->x1 = extents->x1;
+	*x1 += diff * hscale;     
+    }
+    diff = dst->x2 - extents->x2;
+    if(diff > 0) {
+	dst->x2 = extents->x2;
+	*x2 -= diff * hscale;     
+    }
+    diff = extents->y1 - dst->y1;
+    if(diff > 0) {
+	dst->y1 = extents->y1;
+	*y1 += diff * vscale;     
+    }
+    diff = dst->y2 - extents->y2;
+    if(diff > 0) {
+	dst->y2 = extents->y2;
+	*y2 -= diff * vscale;     
+    }
+
+    if(*x1 < 0) {
+	diff =  (- *x1 + hscale - 1)/ hscale;
+	dst->x1 += diff;
+	*x1 += diff * hscale;
+    }
+    delta = *x2 - (width << 16);
+    if(delta > 0) {
+	diff = (delta + hscale - 1)/ hscale;
+	dst->x2 -= diff;
+	*x2 -= diff * hscale;
+    }
+    if(*y1 < 0) {
+	diff =  (- *y1 + vscale - 1)/ vscale;
+	dst->y1 += diff;
+	*y1 += diff * vscale;
+    }
+    delta = *y2 - (height << 16);
+    if(delta > 0) {
+	diff = (delta + vscale - 1)/ vscale;
+	dst->y2 -= diff;
+	*y2 -= diff * vscale;
+    }
+} 
+
+static void 
+CHIPSStopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit)
+{
+  CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
+  CHIPSPtr cPtr = CHIPSPTR(pScrn);
+  unsigned char mr3c;
+
+  REGION_EMPTY(pScrn->pScreen, &pPriv->clip);   
+
+  CHIPSHiQVSync(pScrn);
+  if(exit) {
+     if(pPriv->videoStatus & CLIENT_VIDEO_ON) {
+	mr3c = cPtr->readMR(cPtr, 0x3C);
+	cPtr->writeMR(cPtr, 0x3C, (mr3c & 0xFE));
+     }
+     if(pPriv->area) {
+	xf86FreeOffscreenArea(pPriv->area);
+	pPriv->area = NULL;
+     }
+     pPriv->videoStatus = 0;
+  } else {
+     if(pPriv->videoStatus & CLIENT_VIDEO_ON) {
+	pPriv->videoStatus |= OFF_TIMER;
+	pPriv->offTime = currentTime.milliseconds + OFF_DELAY; 
+     }
+  }
+}
+
+static int 
+CHIPSSetPortAttribute(
+  ScrnInfoPtr pScrn, 
+  Atom attribute,
+  INT32 value, 
+  pointer data
+){
+  CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
+  CHIPSPtr cPtr = CHIPSPTR(pScrn);
+
+  CHIPSHiQVSync(pScrn);
+  if(attribute == xvColorKey) {
+	int red, green, blue;
+	pPriv->colorKey = value;
+	switch (pScrn->depth) {
+	case 8:
+	    cPtr->writeMR(cPtr, 0x3D, 0x00);
+	    cPtr->writeMR(cPtr, 0x3E, 0x00);
+	    cPtr->writeMR(cPtr, 0x3F, (pPriv->colorKey & 0xFF));
+	    break;
+	default:
+	    red = (pPriv->colorKey & pScrn->mask.red) >> pScrn->offset.red;
+	    green = (pPriv->colorKey & pScrn->mask.green) >> pScrn->offset.green;
+	    blue = (pPriv->colorKey & pScrn->mask.blue) >> pScrn->offset.blue;
+	    switch (pScrn->depth) {
+	    case 15:
+		cPtr->writeMR(cPtr, 0x3D, (red << 3));
+		cPtr->writeMR(cPtr, 0x3E, (green << 3));
+		cPtr->writeMR(cPtr, 0x3F, (blue << 3));
+		break;
+	    case 16:
+		cPtr->writeMR(cPtr, 0x3D, (red << 3));
+		cPtr->writeMR(cPtr, 0x3E, (green << 2));
+		cPtr->writeMR(cPtr, 0x3F, (blue << 3));
+		break;
+	    case 24:
+		cPtr->writeMR(cPtr, 0x3D, red);
+		cPtr->writeMR(cPtr, 0x3E, green);
+		cPtr->writeMR(cPtr, 0x3F, blue);
+		break;
+	    }    
+	}    
+	REGION_EMPTY(pScrn->pScreen, &pPriv->clip);   
+  } else return BadMatch;
+
+  return Success;
+}
+
+static int 
+CHIPSGetPortAttribute(
+  ScrnInfoPtr pScrn, 
+  Atom attribute,
+  INT32 *value, 
+  pointer data
+){
+  CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
+
+  if(attribute == xvColorKey) {
+	*value = pPriv->colorKey;
+  } else return BadMatch;
+
+  return Success;
+}
+
+static void 
+CHIPSQueryBestSize(
+  ScrnInfoPtr pScrn, 
+  Bool motion,
+  short vid_w, short vid_h, 
+  short drw_w, short drw_h, 
+  unsigned int *p_w, unsigned int *p_h, 
+  pointer data
+){
+  *p_w = drw_w;
+  *p_h = drw_h; 
+
+  if(*p_w > 16384) *p_w = 16384;
+}
+
+
+static void
+CHIPSCopyData(
+  unsigned char *src,
+  unsigned char *dst,
+  int srcPitch,
+  int dstPitch,
+  int h,
+  int w
+){
+    w <<= 1;
+    while(h--) {
+	memcpy(dst, src, w);
+	src += srcPitch;
+	dst += dstPitch;
+    }
+}
+
+static void
+CHIPSCopyMungedData(
+   unsigned char *src1,
+   unsigned char *src2,
+   unsigned char *src3,
+   unsigned char *dst1,
+   int srcPitch,
+   int srcPitch2,
+   int dstPitch,
+   int h,
+   int w
+){
+   CARD32 *dst = (CARD32*)dst1;
+   int i, j;
+
+   dstPitch >>= 2;
+   w >>= 1;
+
+   for(j = 0; j < h; j++) {
+	for(i = 0; i < w; i++) {
+#if 1
+	    dst[i] = src1[i << 1] | (src1[(i << 1) + 1] << 16) |
+		     (src3[i] << 8) | (src2[i] << 24);
+#else
+	    dst[i] = (src1[i << 1] << 24) | (src1[(i << 1) + 1] << 8) |
+		     (src3[i] << 0) | (src2[i] << 16);
+#endif
+	}
+	dst += dstPitch;
+	src1 += srcPitch;
+	if(j & 1) {
+	    src2 += srcPitch2;
+	    src3 += srcPitch2;
+	}
+   }
+}
+
+static FBAreaPtr
+CHIPSAllocateMemory(
+   ScrnInfoPtr pScrn,
+   FBAreaPtr area,
+   int numlines
+){
+   ScreenPtr pScreen;
+   FBAreaPtr new_area;
+
+   if(area) {
+	if((area->box.y2 - area->box.y1) >= numlines) 
+	   return area;
+        
+        if(xf86ResizeOffscreenArea(area, pScrn->displayWidth, numlines))
+	   return area;
+
+	xf86FreeOffscreenArea(area);
+   }
+
+   pScreen = screenInfo.screens[pScrn->scrnIndex];
+
+   new_area = xf86AllocateOffscreenArea(pScreen, pScrn->displayWidth, 
+				numlines, 0, NULL, NULL, NULL);
+
+   if(!new_area) {
+	int max_w, max_h;
+
+	xf86QueryLargestOffscreenArea(pScreen, &max_w, &max_h, 0,
+			FAVOR_WIDTH_THEN_AREA, PRIORITY_EXTREME);
+	
+	if((max_w < pScrn->displayWidth) || (max_h < numlines))
+	   return NULL;
+
+	xf86PurgeUnlockedOffscreenAreas(pScreen);
+	new_area = xf86AllocateOffscreenArea(pScreen, pScrn->displayWidth, 
+				numlines, 0, NULL, NULL, NULL);
+   }
+
+   return new_area;
+}
+
+static void
+CHIPSDisplayVideo(
+    ScrnInfoPtr pScrn,
+    int id,
+    int offset,
+    short width, short height,
+    int pitch, 
+    int x1, int y1, int x2, int y2,
+    BoxPtr dstBox,
+    short src_w, short src_h,
+    short drw_w, short drw_h
+){
+    CHIPSPtr cPtr = CHIPSPTR(pScrn);
+    DisplayModePtr mode = pScrn->currentMode;
+    unsigned char tmp;
+
+    CHIPSHiQVSync(pScrn);
+
+    tmp = cPtr->readMR(cPtr, 0x1E);
+    tmp &= 0xE0;		/* Set Zoom and Direction */
+    if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE)) 
+	tmp |= 0x10;
+    cPtr->writeMR(cPtr, 0x1E, tmp);
+    tmp = cPtr->readMR(cPtr, 0x1F);
+    tmp = (tmp & 0x14); /* Mask reserved bits, unset interpolation */
+    switch(id) {
+    case 0x35315652:		/* RGB15 */
+	tmp |= 0x09;
+	break;
+    case 0x36315652:		/* RGB16 */
+	tmp |= 0x08;
+	break;
+    case 0x32315659:		/* YV12 */
+	tmp |= 0x00; 
+	break;
+    case 0x32595559:		/* YUY2 */
+    default:
+	tmp |= 0x00;		/* Do nothing here */
+	break;
+    }  
+
+    cPtr->writeMR(cPtr, 0x1F, tmp);
+    tmp = cPtr->readMR(cPtr, 0x20);
+    tmp &= 0xC3;
+    cPtr->writeMR(cPtr, 0x20, tmp);
+
+    /* Setup Pointer 1 */
+    cPtr->writeMR(cPtr, 0x22, (offset & 0xF8));
+    cPtr->writeMR(cPtr, 0x23, ((offset >> 8) & 0xFF));
+    cPtr->writeMR(cPtr, 0x24, ((offset >> 16) & 0xFF));
+    /* Setup Pointer 2 */
+    cPtr->writeMR(cPtr, 0x25, (offset & 0xF8));
+    cPtr->writeMR(cPtr, 0x26, ((offset >> 8) & 0xFF));
+    cPtr->writeMR(cPtr, 0x27, ((offset >> 16) & 0xFF));
+    cPtr->writeMR(cPtr, 0x28, ((width >> 2) - 1)); /* Width */ 
+    cPtr->writeMR(cPtr, 0x34, ((width >> 2) - 1));
+
+    /* Left Edge of Overlay */
+    cPtr->writeMR(cPtr, 0x2A, ((cPtr->OverlaySkewX + dstBox->x1) & 0xFF));
+    tmp = cPtr->readMR(cPtr, 0x2B);
+    tmp = (tmp & 0xF8) + (((cPtr->OverlaySkewX + dstBox->x1) >> 8) & 0x07);
+    cPtr->writeMR(cPtr, 0x2B, tmp);
+    /* Right Edge of Overlay */
+    cPtr->writeMR(cPtr, 0x2C, ((cPtr->OverlaySkewX + dstBox->x2 -1) 
+				& 0xFF));
+    tmp = cPtr->readMR(cPtr, 0x2D);
+    tmp = (tmp & 0xF8) + (((cPtr->OverlaySkewX + dstBox->x2 - 1) >> 8) & 0x07);
+    cPtr->writeMR(cPtr, 0x2D, tmp);
+    /* Top Edge of Overlay */
+    cPtr->writeMR(cPtr, 0x2E, ((cPtr->OverlaySkewY + dstBox->y1) & 0xFF));
+    tmp = cPtr->readMR(cPtr, 0x2F);
+    tmp = (tmp & 0xF8) + (((cPtr->OverlaySkewY + dstBox->y1) >> 8) & 0x07);
+    cPtr->writeMR(cPtr, 0x2F, tmp);
+    /* Bottom Edge of Overlay*/
+    cPtr->writeMR(cPtr, 0x30, ((cPtr->OverlaySkewY + dstBox->y2 - 1) & 0xFF));
+    tmp = cPtr->readMR(cPtr, 0x31);
+    tmp = (tmp & 0xF8) + (((cPtr->OverlaySkewY + dstBox->y2 - 1) >> 8) & 0x07);
+    cPtr->writeMR(cPtr, 0x31, tmp);
+
+    /* Horizontal Zoom */
+    if (drw_w > src_w) {
+	tmp = cPtr->readMR(cPtr, 0x1F);
+	cPtr->writeMR(cPtr, 0x1F, (tmp | 0x20)); /* set H-interpolation */
+	tmp = cPtr->readMR(cPtr, 0x1E);
+	cPtr->writeMR(cPtr, 0x1E, (tmp | 0x04));
+	tmp = cPtr->VideoZoomMax * src_w / drw_w;
+	cPtr->writeMR(cPtr, 0x32, tmp);
+    }
+
+    /* Vertical Zoom */
+    if (drw_h > src_h) {
+	tmp = cPtr->readMR(cPtr, 0x1F);
+	cPtr->writeMR(cPtr, 0x1F, (tmp | 0x80)); /* set V-interpolation */
+	tmp = cPtr->readMR(cPtr, 0x1E);
+	cPtr->writeMR(cPtr, 0x1E, (tmp | 0x08));
+	tmp = cPtr->VideoZoomMax * src_h / drw_h;
+	cPtr->writeMR(cPtr, 0x33, tmp);
+    }
+
+    tmp = cPtr->readMR(cPtr, 0x3C);
+    cPtr->writeMR(cPtr, 0x3C, (tmp | 0x7));
+}
+
+static int 
+CHIPSPutImage( 
+  ScrnInfoPtr pScrn, 
+  short src_x, short src_y, 
+  short drw_x, short drw_y,
+  short src_w, short src_h, 
+  short drw_w, short drw_h,
+  int id, unsigned char* buf, 
+  short width, short height, 
+  Bool sync,
+  RegionPtr clipBoxes, pointer data
+){
+   CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
+   CHIPSPtr cPtr = CHIPSPTR(pScrn);
+   INT32 x1, x2, y1, y2;
+   unsigned char *dst_start;
+   int pitch, new_h, offset, offset2, offset3;
+   int srcPitch, srcPitch2, dstPitch;
+   int top, left, npixels, nlines;
+   BoxRec dstBox;
+   CARD32 tmp;
+
+   if(drw_w > 16384) drw_w = 16384;
+
+   /* Clip */
+   x1 = src_x;
+   x2 = src_x + src_w;
+   y1 = src_y;
+   y2 = src_y + src_h;
+
+   dstBox.x1 = drw_x;
+   dstBox.x2 = drw_x + drw_w;
+   dstBox.y1 = drw_y;
+   dstBox.y2 = drw_y + drw_h;
+
+   CHIPSClipVideo(&dstBox, &x1, &x2, &y1, &y2, 
+		REGION_EXTENTS(pScreen, clipBoxes), width, height);
+
+   if((x1 >= x2) || (y1 >= y2))
+     return Success;
+
+   dstBox.x1 -= pScrn->frameX0;
+   dstBox.x2 -= pScrn->frameX0;
+   dstBox.y1 -= pScrn->frameY0;
+   dstBox.y2 -= pScrn->frameY0;
+
+   pitch = pScrn->bitsPerPixel * pScrn->displayWidth >> 3;
+
+   dstPitch = ((width << 1) + 15) & ~15;
+   new_h = ((dstPitch * height) + pitch - 1) / pitch;
+
+   switch(id) {
+   case 0x32315659:		/* YV12 */
+	srcPitch = (width + 3) & ~3;
+	offset2 = srcPitch * height;
+	srcPitch2 = ((width >> 1) + 3) & ~3;
+	offset3 = (srcPitch2 * (height >> 1)) + offset2;
+	break;
+   case 0x35315652:		/* RGB15 */
+   case 0x36315652:		/* RGB16 */
+   case 0x32595559:		/* YUY2 */
+   default:
+	srcPitch = (width << 1);
+	break;
+   }  
+
+   if(!(pPriv->area = CHIPSAllocateMemory(pScrn, pPriv->area, new_h)))
+	return BadAlloc;
+
+   /* copy data */
+   top = y1 >> 16;
+   left = (x1 >> 16) & ~1;
+   npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
+   left <<= 1;
+
+   offset = (pPriv->area->box.y1 * pitch) + (top * dstPitch);
+   dst_start = cPtr->FbBase + offset + left;
+
+   switch(id) {
+   case 0x32315659:		/* YV12 */
+	top &= ~1;
+	tmp = ((top >> 1) * srcPitch2) + (left >> 2);
+	offset2 += tmp;
+	offset3 += tmp; 
+	nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
+	CHIPSCopyMungedData(buf + (top * srcPitch) + (left >> 1), 
+			  buf + offset2, buf + offset3, dst_start,
+			  srcPitch, srcPitch2, dstPitch, nlines, npixels);
+	break;
+   case 0x35315652:		/* RGB15 */
+   case 0x36315652:		/* RGB16 */
+   case 0x32595559:		/* YUY2 */
+   default:
+	buf += (top * srcPitch) + left;
+	nlines = ((y2 + 0xffff) >> 16) - top;
+	CHIPSCopyData(buf, dst_start, srcPitch, dstPitch, nlines, npixels);
+	break;
+   }  
+
+   /* update cliplist */
+   if(!RegionsEqual(&pPriv->clip, clipBoxes)) {
+	REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
+	/* draw these */
+	XAAFillSolidRects(pScrn, pPriv->colorKey, GXcopy, ~0, 
+					REGION_NUM_RECTS(clipBoxes),
+					REGION_RECTS(clipBoxes));
+   }
+   
+   CHIPSDisplayVideo(pScrn, id, offset, width, height, dstPitch,
+	     x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);
+
+   pPriv->videoStatus = CLIENT_VIDEO_ON;
+
+   return Success;
+}
+
+static int 
+CHIPSQueryImageAttributes(
+  ScrnInfoPtr pScrn, 
+  int id, 
+  unsigned short *w, unsigned short *h, 
+  int *pitches, int *offsets
+){
+    int size, tmp;
+
+    if(*w > 1024) *w = 1024;
+    if(*h > 1024) *h = 1024;
+
+    *w = (*w + 1) & ~1;
+    if(offsets) offsets[0] = 0;
+
+    switch(id) {
+    case 0x32315659:		/* YV12 */
+	*h = (*h + 1) & ~1;
+	size = (*w + 3) & ~3;
+	if(pitches) pitches[0] = size;
+	size *= *h;
+	if(offsets) offsets[1] = size;
+	tmp = ((*w >> 1) + 3) & ~3;
+	if(pitches) pitches[1] = pitches[2] = tmp;
+	tmp *= (*h >> 1);
+	size += tmp;
+	if(offsets) offsets[2] = size;
+	size += tmp;
+	break;
+    case 0x35315652:		/* RGB15 */
+    case 0x36315652:		/* RGB16 */
+    case 0x32595559:		/* YUY2 */
+    default:
+	size = *w << 1;
+	if(pitches) pitches[0] = size;
+	size *= *h;
+	break;
+    }
+
+    return size;
+}
+
+static void
+CHIPSBlockHandler (
+    int i,
+    pointer     blockData,
+    pointer     pTimeout,
+    pointer     pReadmask
+){
+    ScreenPtr   pScreen = screenInfo.screens[i];
+    ScrnInfoPtr pScrn = xf86Screens[i];
+    CHIPSPtr    cPtr = CHIPSPTR(pScrn);
+    CHIPSPortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
+    unsigned char mr3c;
+    
+    pScreen->BlockHandler = cPtr->BlockHandler;
+    
+    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+
+    pScreen->BlockHandler = CHIPSBlockHandler;
+
+    CHIPSHiQVSync(pScrn);
+    if(pPriv->videoStatus & TIMER_MASK) {
+	UpdateCurrentTime();
+	if(pPriv->videoStatus & OFF_TIMER) {
+	    if(pPriv->offTime < currentTime.milliseconds) {
+		mr3c = cPtr->readMR(cPtr, 0x3C);
+		cPtr->writeMR(cPtr, 0x3C, (mr3c & 0xFE));
+		pPriv->videoStatus = FREE_TIMER;
+		pPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
+	    }
+	} else {  /* FREE_TIMER */
+	    if(pPriv->freeTime < currentTime.milliseconds) {
+		if(pPriv->area) {
+		   xf86FreeOffscreenArea(pPriv->area);
+		   pPriv->area = NULL;
+		}
+		pPriv->videoStatus = 0;
+	    }
+        }
+    }
+}
+
+
+/****************** Offscreen stuff ***************/
+
+typedef struct {
+  FBAreaPtr area;
+  Bool isOn;
+} OffscreenPrivRec, * OffscreenPrivPtr;
+
+static int 
+CHIPSAllocateSurface(
+    ScrnInfoPtr pScrn,
+    int id,
+    unsigned short w, 	
+    unsigned short h,
+    XF86SurfacePtr surface
+){
+    FBAreaPtr area;
+    int pitch, fbpitch, numlines;
+    OffscreenPrivPtr pPriv;
+
+    if((w > 1024) || (h > 1024))
+	return BadAlloc;
+
+    w = (w + 1) & ~1;
+    pitch = ((w << 1) + 15) & ~15;
+    fbpitch = pScrn->bitsPerPixel * pScrn->displayWidth >> 3;
+    numlines = ((pitch * h) + fbpitch - 1) / fbpitch;
+
+    if(!(area = CHIPSAllocateMemory(pScrn, NULL, numlines)))
+	return BadAlloc;
+
+    surface->width = w;
+    surface->height = h;
+
+    if(!(surface->pitches = xalloc(sizeof(int))))
+	return BadAlloc;
+    if(!(surface->offsets = xalloc(sizeof(int)))) {
+	xfree(surface->pitches);
+	return BadAlloc;
+    }
+    if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
+	xfree(surface->pitches);
+	xfree(surface->offsets);
+	return BadAlloc;
+    }
+
+    pPriv->area = area;
+    pPriv->isOn = FALSE;
+
+    surface->pScrn = pScrn;
+    surface->id = id;   
+    surface->pitches[0] = pitch;
+    surface->offsets[0] = area->box.y1 * fbpitch;
+    surface->devPrivate.ptr = (pointer)pPriv;
+
+    return Success;
+}
+
+static int 
+CHIPSStopSurface(
+    XF86SurfacePtr surface
+){
+    OffscreenPrivPtr pPriv = (OffscreenPrivPtr)surface->devPrivate.ptr;
+
+    if(pPriv->isOn) {
+	CHIPSPtr cPtr = CHIPSPTR(surface->pScrn);
+	unsigned char mr3c;
+	mr3c = cPtr->readMR(cPtr, 0x3C);
+	cPtr->writeMR(cPtr, 0x3C, (mr3c & 0xFE));
+	pPriv->isOn = FALSE;
+    }
+
+    return Success;
+}
+
+
+static int 
+CHIPSFreeSurface(
+    XF86SurfacePtr surface
+){
+    OffscreenPrivPtr pPriv = (OffscreenPrivPtr)surface->devPrivate.ptr;
+
+    if(pPriv->isOn)
+	CHIPSStopSurface(surface);
+    xf86FreeOffscreenArea(pPriv->area);
+    xfree(surface->pitches);
+    xfree(surface->offsets);
+    xfree(surface->devPrivate.ptr);
+
+    return Success;
+}
+
+static int
+CHIPSGetSurfaceAttribute(
+    ScrnInfoPtr pScrn,
+    Atom attribute,
+    INT32 *value
+){
+    return CHIPSGetPortAttribute(pScrn, attribute, value, 
+			(pointer)(GET_PORT_PRIVATE(pScrn)));
+}
+
+static int
+CHIPSSetSurfaceAttribute(
+    ScrnInfoPtr pScrn,
+    Atom attribute,
+    INT32 value
+){
+    return CHIPSSetPortAttribute(pScrn, attribute, value, 
+			(pointer)(GET_PORT_PRIVATE(pScrn)));
+}
+
+
+static int 
+CHIPSDisplaySurface(
+    XF86SurfacePtr surface,
+    short src_x, short src_y, 
+    short drw_x, short drw_y,
+    short src_w, short src_h, 
+    short drw_w, short drw_h,
+    RegionPtr clipBoxes
+){
+    OffscreenPrivPtr pPriv = (OffscreenPrivPtr)surface->devPrivate.ptr;
+    ScrnInfoPtr pScrn = surface->pScrn;
+    CHIPSPortPrivPtr portPriv = GET_PORT_PRIVATE(pScrn);
+    INT32 x1, y1, x2, y2;
+    BoxRec dstBox;
+
+    x1 = src_x;
+    x2 = src_x + src_w;
+    y1 = src_y;
+    y2 = src_y + src_h;
+
+    dstBox.x1 = drw_x;
+    dstBox.x2 = drw_x + drw_w;
+    dstBox.y1 = drw_y;
+    dstBox.y2 = drw_y + drw_h;
+
+    CHIPSClipVideo(&dstBox, &x1, &x2, &y1, &y2, 
+                	REGION_EXTENTS(pScreen, clipBoxes), 
+			surface->width, surface->height);
+
+    if((x1 >= x2) || (y1 >= y2))
+	return Success;
+
+    dstBox.x1 -= pScrn->frameX0;
+    dstBox.x2 -= pScrn->frameX0;
+    dstBox.y1 -= pScrn->frameY0;
+    dstBox.y2 -= pScrn->frameY0;
+
+    XAAFillSolidRects(pScrn, portPriv->colorKey, GXcopy, ~0, 
+                                        REGION_NUM_RECTS(clipBoxes),
+                                        REGION_RECTS(clipBoxes));
+
+    CHIPSDisplayVideo(pScrn, surface->id, surface->offsets[0], 
+	     surface->width, surface->height, surface->pitches[0],
+	     x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);
+
+    pPriv->isOn = TRUE;
+    if(portPriv->videoStatus & CLIENT_VIDEO_ON) {
+	REGION_EMPTY(pScrn->pScreen, &portPriv->clip);   
+	UpdateCurrentTime();
+	portPriv->videoStatus = FREE_TIMER;
+	portPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
+    }
+
+    return Success;
+}
+
+
+static void 
+CHIPSInitOffscreenImages(ScreenPtr pScreen)
+{
+    XF86OffscreenImagePtr offscreenImages;
+
+    /* need to free this someplace */
+    if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
+	return;
+
+    offscreenImages[0].image = &Images[0];
+    offscreenImages[0].flags = VIDEO_OVERLAID_IMAGES | 
+			       VIDEO_CLIP_TO_VIEWPORT;
+    offscreenImages[0].alloc_surface = CHIPSAllocateSurface;
+    offscreenImages[0].free_surface = CHIPSFreeSurface;
+    offscreenImages[0].display = CHIPSDisplaySurface;
+    offscreenImages[0].stop = CHIPSStopSurface;
+    offscreenImages[0].setAttribute = CHIPSSetSurfaceAttribute;
+    offscreenImages[0].getAttribute = CHIPSGetSurfaceAttribute;
+    offscreenImages[0].max_width = 1024;
+    offscreenImages[0].max_height = 1024;
+    offscreenImages[0].num_attributes = NUM_ATTRIBUTES;
+    offscreenImages[0].attributes = Attributes;
+    
+    xf86XVRegisterOffscreenImages(pScreen, offscreenImages, 1);
+}
+
+#endif  /* !XvExtension */
Index: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c:1.3 xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c:1.3	Sun Apr  4 00:46:14 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c	Fri Apr 28 11:19:23 2000
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.3 1999/04/04 08:46:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.4 2000/04/28 18:19:23 eich Exp $ */
 
 #ifdef __NetBSD__
 #  include <sys/types.h>
@@ -69,6 +69,7 @@
     char c, cport;
     char* str;
     unsigned int port;
+    int query = 0;
 
     if(argc < 2) {
 	printf("usage: %s Cvvxx [Cvvxx]\n",argv[0]);
@@ -79,7 +80,8 @@
         printf("             = M|m write vv to MRxx (6555x only)\n");
         printf("             = S|s write vv to SRxx\n");
         printf("             = X|x write vv to XRxx\n");
-        printf("     Both vv and xx are in hexadecimal\n");
+        printf("     xx is in hexadecimal\n");
+	printf("     vv is in hexadecimal or '?' for query\n");
     }    
 
     if(SET_IOPL())
@@ -131,6 +133,9 @@
 	}
 	index = inb(port);
 	while (c = *str++){
+	    if (c == '?') {
+	      query = 1;
+	    }
 	    if(c >= '0' && c <= '9')
 	    value = (value << 4) | (c - '0');  /*ASCII assumed*/
 	    else if(c >= 'A' && c < 'G')
@@ -139,10 +144,15 @@
 	    value = (value << 4) | (c - 'a'+10);  /*ASCII assumed*/
 	}		
 	outb(port,value&0xFF);
-        printf("%cR%X: 0x%X -> 0x%X\n", cport, value & 0xFF, 
-                           inb(port+1)&0xFF, (value&0xFF00)>>8);
-	outw(port, value);
-	outb(port, index &0xFF);
+	if (query) {
+	    printf("%cR%X: 0x%X\n", cport, value & 0xFF, 
+		   inb(port+1)&0xFF);
+	} else {
+	    printf("%cR%X: 0x%X -> 0x%X\n", cport, value & 0xFF, 
+		   inb(port+1)&0xFF, (value&0xFF00)>>8);
+	    outw(port, value);
+	    outb(port, index &0xFF);
+	}
     }
     RESET_IOPL();
     return 0;
Index: xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile:1.27 xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile:1.28
--- xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile:1.27	Thu Mar  2 17:05:35 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile	Fri Mar 31 14:55:39 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile,v 1.27 2000/03/03 01:05:35 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile,v 1.28 2000/03/31 22:55:39 dawes Exp $
 XCOMM
 XCOMM This is an Imakefile for the Cirrus Logic driver.  
 XCOMM
@@ -93,11 +93,10 @@
 
 DependTarget()
 
+InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/cirrus)
 InstallDriverSDKNonExecFile(CirrusClk.c,$(DRIVERSDKDIR)/drivers/cirrus)
 InstallDriverSDKNonExecFile(cir_driver.c,$(DRIVERSDKDIR)/drivers/cirrus)
-InstallDriverSDKNonExecFile(cir_dga.c,$(DRIVERSDKDIR)/drivers/cirrus)
 InstallDriverSDKNonExecFile(cir_shadow.c,$(DRIVERSDKDIR)/drivers/cirrus)
-InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/cirrus)
 InstallDriverSDKNonExecFile(cir.h,$(DRIVERSDKDIR)/drivers/cirrus)
 InstallDriverSDKNonExecFile(alp.h,$(DRIVERSDKDIR)/drivers/cirrus)
 InstallDriverSDKNonExecFile(alp_driver.c,$(DRIVERSDKDIR)/drivers/cirrus)
@@ -113,5 +112,5 @@
 InstallDriverSDKNonExecFile(lg_xaa.h,$(DRIVERSDKDIR)/drivers/cirrus)
 
 InstallDriverSDKObjectModule(cirrus,$(DRIVERSDKMODULEDIR),drivers)
-InstallDriverSDKObjectModule(cirrus_alpine,$(DRIVERSDKMODULEDIR),drivers)
-InstallDriverSDKObjectModule(cirrus_laguna,$(DRIVERSDKMODULEDIR),drivers)
+InstallDriverSDKObjectSubModule(cirrus_alpine,$(DRIVERSDKMODULEDIR),drivers)
+InstallDriverSDKObjectSubModule(cirrus_laguna,$(DRIVERSDKMODULEDIR),drivers)
Index: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c:1.8 xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c:1.11
--- xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c:1.8	Sat Feb 26 18:45:26 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c	Wed Jun 21 10:28:05 2000
@@ -9,11 +9,8 @@
  *    Guy DESBIEF
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.8 2000/02/27 02:45:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.11 2000/06/21 17:28:05 dawes Exp $ */
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -21,6 +18,9 @@
 /* All drivers need this */
 #include "xf86_ansic.h"
 
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
+
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
 
@@ -87,7 +87,7 @@
  * Forward definitions for the functions that make up the driver.
  */
 
-Bool AlpProbe(int entity, ScrnInfoPtr pScrn);
+ScrnInfoPtr AlpProbe(int entity);
 
 /* Mandatory functions */
 
@@ -288,9 +288,13 @@
     return CirOptions;
 }
 
-Bool
-AlpProbe(int entity, ScrnInfoPtr pScrn)
+ScrnInfoPtr
+AlpProbe(int entity)
 {
+    ScrnInfoPtr pScrn = NULL;
+    
+    if ((pScrn = xf86ConfigPciEntity(pScrn, 0, entity, CIRPciChipsets,
+					   NULL,NULL, NULL, NULL, NULL))) {
 	pScrn->PreInit		= AlpPreInit;
 	pScrn->ScreenInit	= AlpScreenInit;
 	pScrn->SwitchMode	= AlpSwitchMode;
@@ -299,11 +303,9 @@
 	pScrn->LeaveVT		= AlpLeaveVT;
 	pScrn->FreeScreen	= AlpFreeScreen;
 	pScrn->ValidMode	= AlpValidMode;
-
-	xf86ConfigActivePciEntity(pScrn, entity, CIRPciChipsets, NULL,
-								NULL, NULL, NULL, NULL);
+    }
 
-	return TRUE;
+    return pScrn;
 }
 
 
@@ -939,7 +941,7 @@
 	 * Setup the ClockRanges, which describe what clock ranges are available,
 	 * and what sort of modes they can be used for.
 	 */
-	clockRanges = xnfalloc(sizeof(ClockRange));
+	clockRanges = xnfcalloc(sizeof(ClockRange), 1);
 	clockRanges->next = NULL;
 	clockRanges->minClock = pCir->MinClock;
 	clockRanges->maxClock = pCir->MaxClock;
Index: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c:1.54 xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c:1.58
--- xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c:1.54	Wed Mar  8 13:21:29 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c	Thu Apr 27 09:26:47 2000
@@ -9,7 +9,7 @@
  *	Guy DESBIEF
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.54 2000/03/08 21:21:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.58 2000/04/27 16:26:47 eich Exp $ */
 
 /* All drivers should typically include these */
 #include "xf86.h"
@@ -40,9 +40,12 @@
 
 extern OptionInfoPtr	AlpAvailableOptions(int chipid);
 extern OptionInfoPtr	LgAvailableOptions(int chipid);
-extern Bool AlpProbe(int entity, ScrnInfoPtr pScrn);
-extern Bool LgProbe(int entity, ScrnInfoPtr pScrn);
+extern ScrnInfoPtr AlpProbe(int entity);
+extern ScrnInfoPtr LgProbe(int entity);
 
+static Bool lg_loaded = FALSE;
+static Bool alp_loaded = FALSE;
+
 #define VERSION 4000
 #define CIR_NAME "CIRRUS"
 #define CIR_DRIVER_NAME "cirrus"
@@ -177,142 +180,128 @@
 OptionInfoPtr
 CIRAvailableOptions(int chipid, int busid)
 {
-	int vendor = (chipid & 0xffff0000) >> 16;
 	int chip = chipid & 0xffff;
 
-#if 0
 	if (chip == PCI_CHIP_GD5462 ||
 	    chip == PCI_CHIP_GD5464 ||
 	    chip == PCI_CHIP_GD5464BD ||
-	    chip == PCI_CHIP_GD5465) 
-	    if (!lg_loaded) {
-	        if(!xf86LoadSubModule(pScrn, "cirrus_laguna")) {
-		    return NULL;
-		}
-		xf86LoaderReqSymLists(lgSymbols, NULL);
-		lg_loaded = TRUE;
-	    }
-	    return LgAvailableOptions(chipid);
+	    chip == PCI_CHIP_GD5465) {
+		if (lg_loaded)
+			return LgAvailableOptions(chipid);
+		else
+			return NULL;
 	} else {
-	    if (!alp_loaded) {
-	        if (!xf86LoadSubModule(pScrn, "cirrus_alpine")) {
-		    return NULL;
-		}
-		xf86LoaderReqSymLists(alpSymbols, NULL);
-		alp_loaded = TRUE;
-	    }
-	    return AlpAvailableOptions(chipid);
+		if (alp_loaded)
+			return AlpAvailableOptions(chipid);
+		else
+			return NULL;
 	}
-#else
-	return NULL;
-#endif
 }
 
-/* Mandatory */
 static Bool
 CIRProbe(DriverPtr drv, int flags)
 {
-	int i;
-	GDevPtr *devSections = NULL;
-	pciVideoPtr pPci;
-	int *usedChips;
-	int numDevSections;
-	int numUsed;
-	Bool foundScreen = FALSE;
-	Bool (*subProbe)(int entity, ScrnInfoPtr pScrn);
-	Bool lg_loaded = FALSE;
-	Bool alp_loaded = FALSE;
+    int i;
+    GDevPtr *devSections = NULL;
+    pciVideoPtr pPci;
+    int *usedChips;
+    int numDevSections;
+    int numUsed;
+    Bool foundScreen = FALSE;
+    ScrnInfoPtr (*subProbe)(int entity);
+    ScrnInfoPtr pScrn;
+
 #ifdef CIR_DEBUG
-	ErrorF("CirProbe\n");
+    ErrorF("CirProbe\n");
 #endif
-
-	if ((numDevSections = xf86MatchDevice(CIR_DRIVER_NAME,
-					  &devSections)) <= 0) {
-		return FALSE;
+  
+    /*
+     * For PROBE_DETECT, make sure both sub-modules are loaded before
+     * calling xf86MatchPciInstances(), because the AvailableOptions()
+     * functions may be called before xf86MatchPciInstances() returns.
+     */
+    
+    if (flags & PROBE_DETECT) {
+	if (!lg_loaded) {
+	    if (xf86LoadDrvSubModule(drv, "cirrus_laguna")) {
+		xf86LoaderReqSymLists(lgSymbols, NULL);
+		lg_loaded = TRUE;
+	    }
 	}
-
-	/*
-	 * While we're VGA-dependent, can really only have one such instance, but
-	 * we'll ignore that.
-	 */
-
-	/*
-	 * We need to probe the hardware first.  We then need to see how this
-	 * fits in with what is given in the config file, and allow the config
-	 * file info to override any contradictions.
-	 */
+	if (!alp_loaded) {
+	    if (xf86LoadDrvSubModule(drv, "cirrus_alpine")) {
+		xf86LoaderReqSymLists(alpSymbols, NULL);
+		alp_loaded = TRUE;
+	    }
+	}
+    }
 
+    if ((numDevSections = xf86MatchDevice(CIR_DRIVER_NAME,
+					  &devSections)) <= 0) {
+	return FALSE;
+    }
+    
+    if (xf86GetPciVideoInfo() == NULL) {
 	/*
-	 * All of the cards this driver supports are PCI, so the "probing" just
-	 * amounts to checking the PCI data that the server has already collected.
+	 * We won't let anything in the config file override finding no
+	 * PCI video cards at all.  This seems reasonable now, but we'll see.
 	 */
-	if (xf86GetPciVideoInfo() == NULL) {
-		/*
-		 * We won't let anything in the config file override finding no
-		 * PCI video cards at all.  This seems reasonable now, but we'll see.
-		 */
-		return FALSE;
-	}
-
-	numUsed = xf86MatchPciInstances(CIR_NAME, PCI_VENDOR_CIRRUS,
-									CIRChipsets, CIRPciChipsets, devSections,
-									numDevSections, drv, &usedChips);
-	/* Free it since we don't need that list after this */
-	if (devSections)
-		xfree(devSections);
-	devSections = NULL;
-	if (numUsed <= 0)
-		return FALSE;
-	if (flags & PROBE_DETECT)
-		foundScreen = TRUE;
-	else for (i = 0; i < numUsed; i++) {
-		ScrnInfoPtr pScrn;
-
-		/* Allocate a ScrnInfoRec and claim the slot */
-		pScrn = xf86AllocateScreen(drv, 0);
-
-		/* Fill in what we can of the ScrnInfoRec */
-		pScrn->driverVersion = VERSION;
-		pScrn->driverName	 = CIR_DRIVER_NAME;
-		pScrn->name		 = CIR_NAME;
-		pScrn->Probe	 = NULL;
-		/* The Laguna family of chips is so different from the Alpine
-		   family that we won't share even the highest-level of
-		   functions.  But, the Laguna chips /are/ Cirrus chips, so
-		   they should be handled in this driver (as opposed to their
-		   own driver). */
-		pPci = xf86GetPciInfoForEntity(usedChips[i]);
-		if (pPci->chipType == PCI_CHIP_GD5462 ||
-			pPci->chipType == PCI_CHIP_GD5464 ||
-			pPci->chipType == PCI_CHIP_GD5464BD ||
-			pPci->chipType == PCI_CHIP_GD5465) {
-
-		    if (!lg_loaded) {
-		        if(!xf86LoadSubModule(pScrn, "cirrus_laguna")) {
-			  xf86DeleteScreen(pScrn->scrnIndex, 0);
-			  continue;
-			}
-			xf86LoaderReqSymLists(lgSymbols, NULL);
-			lg_loaded = TRUE;
-		    }
-		    subProbe = LgProbe;
-		} else {
-		    if (!alp_loaded) {
-		        if (!xf86LoadSubModule(pScrn, "cirrus_alpine")) {
-			    xf86DeleteScreen(pScrn->scrnIndex, 0);
-			    continue;
-			}
-			xf86LoaderReqSymLists(alpSymbols, NULL);
-			alp_loaded = TRUE;
-		    }
-		    subProbe = AlpProbe;
-		}
-		if (subProbe(usedChips[i], pScrn))
-			foundScreen = TRUE;
-	}
-	xfree(usedChips);
-
-	return foundScreen;
+	return FALSE;
+    }
+  
+    numUsed = xf86MatchPciInstances(CIR_NAME, PCI_VENDOR_CIRRUS,
+				    CIRChipsets, CIRPciChipsets, devSections,
+ 				    numDevSections, drv, &usedChips);
+    /* Free it since we don't need that list after this */
+    if (devSections)
+ 	xfree(devSections);
+    devSections = NULL;
+    if (numUsed <= 0)
+ 	return FALSE;
+    if (flags & PROBE_DETECT)
+ 	foundScreen = TRUE;
+    else for (i = 0; i < numUsed; i++) {
+ 	/* The Laguna family of chips is so different from the Alpine
+ 	   family that we won't share even the highest-level of
+ 	   functions.  But, the Laguna chips /are/ Cirrus chips, so
+ 	   they should be handled in this driver (as opposed to their
+ 	   own driver). */
+	pPci = xf86GetPciInfoForEntity(usedChips[i]);
+ 	if (pPci->chipType == PCI_CHIP_GD5462 ||
+ 	    pPci->chipType == PCI_CHIP_GD5464 ||
+ 	    pPci->chipType == PCI_CHIP_GD5464BD ||
+ 	    pPci->chipType == PCI_CHIP_GD5465) {
+ 	    
+ 	    if (!lg_loaded) {
+ 		if (!xf86LoadDrvSubModule(drv, "cirrus_laguna")) 
+		    continue;
+ 		xf86LoaderReqSymLists(lgSymbols, NULL);
+ 		lg_loaded = TRUE;
+ 	    }
+ 	    subProbe = LgProbe;
+ 	} else {
+ 	    if (!alp_loaded) {
+ 		if (!xf86LoadDrvSubModule(drv, "cirrus_alpine")) 
+ 		    continue;
+ 		xf86LoaderReqSymLists(alpSymbols, NULL);
+ 		alp_loaded = TRUE;
+ 	    }
+ 	    subProbe = AlpProbe;
+ 	}
+ 	pScrn = NULL;
+ 	
+ 	if ((pScrn = subProbe(usedChips[i]))) {
+ 	    foundScreen = TRUE;
+ 	    /* Fill in what we can of the ScrnInfoRec */
+ 	    pScrn->driverVersion = VERSION;
+ 	    pScrn->driverName	 = CIR_DRIVER_NAME;
+ 	    pScrn->name		 = CIR_NAME;
+ 	    pScrn->Probe	 = NULL;
+ 	}
+    }
+    xfree(usedChips);
+     
+    return foundScreen;
 }
 
 /*
@@ -331,12 +320,15 @@
 	/*
 	 * Map the frame buffer.
 	 */
-
-	pCir->FbBase = xf86MapPciMem(scrnIndex, VIDMEM_FRAMEBUFFER, pCir->PciTag,
-									pCir->FbAddress, pCir->FbMapSize);
-	if (pCir->FbBase == NULL)
+	if (pCir->FbMapSize) {
+	    
+	    pCir->FbBase = xf86MapPciMem(scrnIndex, VIDMEM_FRAMEBUFFER,
+					 pCir->PciTag, pCir->FbAddress,
+					 pCir->FbMapSize);
+	    if (pCir->FbBase == NULL)
 		return FALSE;
-
+	}
+	
 #ifdef CIR_DEBUG
 	ErrorF("CirMapMem pCir->FbBase=0x%08x\n", pCir->FbBase);
 #endif
Index: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.cpp:1.1	Thu Mar  2 17:05:35 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.cpp	Tue Jun 13 19:13:08 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.cpp,v 1.1 2000/03/03 01:05:35 dawes Exp $ 
-.TH CIRRUS __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.cpp,v 1.4 2000/06/14 02:13:08 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH CIRRUS __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 cirrus \- Cirrus Logic video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""cirrus"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qcirrus\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B cirrus 
 is an XFree86 driver for Cirrus Logic video chips.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c:1.24 xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c:1.30
--- xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c:1.24	Sat Feb 26 18:45:26 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c	Wed Jun 21 10:28:05 2000
@@ -13,12 +13,10 @@
  *	David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
  *	Guy DESBIEF, Itai Nahshon.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.24 2000/02/27 02:45:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.30 2000/06/21 17:28:05 dawes Exp $ */
 
 #define EXPERIMENTAL
 
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -26,6 +24,8 @@
 /* All drivers need this */
 #include "xf86_ansic.h"
 
+#include "compiler.h"
+
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
 
@@ -80,7 +80,7 @@
  * Forward definitions for the functions that make up the driver.
  */
 
-Bool LgProbe(int entity, ScrnInfoPtr pScrn);
+ScrnInfoPtr LgProbe(int entity);
 
 /* Mandatory functions */
 Bool LgPreInit(ScrnInfoPtr pScrn, int flags);
@@ -285,8 +285,6 @@
 {
     static Bool setupDone = FALSE;
     
-    ErrorF("lgSetup\n");
-    
     if (!setupDone) {
 	setupDone = TRUE;
 	LoaderRefSymLists(vgahwSymbols, cfbSymbols, xaaSymbols,
@@ -304,22 +302,22 @@
     return LgOptions;
 }
 
-Bool
-LgProbe(int entity, ScrnInfoPtr pScrn)
+ScrnInfoPtr
+LgProbe(int entity)
 {
-    pScrn->PreInit		= LgPreInit;
-    pScrn->ScreenInit	= LgScreenInit;
-    pScrn->SwitchMode	= LgSwitchMode;
-    pScrn->AdjustFrame	= LgAdjustFrame;
-    pScrn->EnterVT		= LgEnterVT;
-    pScrn->LeaveVT		= LgLeaveVT;
-    pScrn->FreeScreen	= LgFreeScreen;
-    pScrn->ValidMode	= LgValidMode;
-    
-    xf86ConfigActivePciEntity(pScrn, entity, CIRPciChipsets, NULL,
-			      NULL, NULL, NULL, NULL);
-    
-    return TRUE;
+    ScrnInfoPtr pScrn = NULL;
+    if ((pScrn = xf86ConfigPciEntity(pScrn, 0, entity, CIRPciChipsets,
+					   NULL, NULL, NULL, NULL, NULL))) {
+	pScrn->PreInit		= LgPreInit;
+	pScrn->ScreenInit	= LgScreenInit;
+	pScrn->SwitchMode	= LgSwitchMode;
+	pScrn->AdjustFrame	= LgAdjustFrame;
+	pScrn->EnterVT		= LgEnterVT;
+	pScrn->LeaveVT		= LgLeaveVT;
+	pScrn->FreeScreen	= LgFreeScreen;
+	pScrn->ValidMode	= LgValidMode;
+    }
+    return pScrn;
 }
 
 
@@ -640,6 +638,34 @@
 	xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
 		(unsigned long)pCir->IOAddress);
 
+	/*
+	 * If the user has specified the amount of memory in the XF86Config
+	 * file, we respect that setting.
+	 */
+	if (pCir->pEnt->device->videoRam != 0) {
+		pScrn->videoRam = pCir->pEnt->device->videoRam;
+		from = X_CONFIG;
+	} else {
+		pScrn->videoRam = LgCountRam(pScrn);
+		from = X_PROBED;
+	}
+	if (2048 == pScrn->videoRam) {
+		/* Two-way interleaving */
+		pCir->chip.lg->memInterleave = 0x40;
+	} else if (4096 == pScrn->videoRam || 8192 == pScrn->videoRam) {
+		/* Four-way interleaving */
+		pCir->chip.lg->memInterleave = 0x80;
+	} else {
+		/* One-way interleaving */
+		pCir->chip.lg->memInterleave = 0x00;
+	}
+
+	xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n",
+				pScrn->videoRam);
+
+	pCir->FbMapSize = pScrn->videoRam * 1024;
+	pCir->IoMapSize = 0x4000;	/* 16K for moment,  will increase */
+
 	pScrn->racIoFlags =   RAC_COLORMAP 
 #ifndef EXPERIMENTAL
 	  | RAC_VIEWPORT
@@ -715,34 +741,6 @@
 	    pCir->HWCursor = FALSE;
 	}
 	
-	/*
-	 * If the user has specified the amount of memory in the XF86Config
-	 * file, we respect that setting.
-	 */
-	if (pCir->pEnt->device->videoRam != 0) {
-		pScrn->videoRam = pCir->pEnt->device->videoRam;
-		from = X_CONFIG;
-	} else {
-		pScrn->videoRam = LgCountRam(pScrn);
-		from = X_PROBED;
-	}
-	if (2048 == pScrn->videoRam) {
-		/* Two-way interleaving */
-		pCir->chip.lg->memInterleave = 0x40;
-	} else if (4096 == pScrn->videoRam || 8192 == pScrn->videoRam) {
-		/* Four-way interleaving */
-		pCir->chip.lg->memInterleave = 0x80;
-	} else {
-		/* One-way interleaving */
-		pCir->chip.lg->memInterleave = 0x00;
-	}
-
-	xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n",
-				pScrn->videoRam);
-
-	pCir->FbMapSize = pScrn->videoRam * 1024;
-	pCir->IoMapSize = 0x4000;	/* 16K for moment,  will increase */
-
 	/* We use a programamble clock */
 	pScrn->progClock = TRUE;
 
@@ -806,7 +804,7 @@
 	 * Setup the ClockRanges, which describe what clock ranges are available,
 	 * and what sort of modes they can be used for.
 	 */
-	clockRanges = xnfalloc(sizeof(ClockRange));
+	clockRanges = xnfcalloc(sizeof(ClockRange), 1);
 	clockRanges->next = NULL;
 	clockRanges->minClock = pCir->MinClock;
 	clockRanges->maxClock = pCir->MaxClock;
@@ -1369,10 +1367,6 @@
 #endif
 	vgaHWGetIOBase(hwp);
 
-	/* Map the CIR memory and MMIO areas */
-	if (!CirMapMem(pCir, pScrn->scrnIndex))
-		return FALSE;
-
 	/* Save the current state */
 	LgSave(pScrn);
 
@@ -1903,13 +1897,13 @@
 static void
 mmioWriteCrtc(vgaHWPtr hwp, CARD8 index, CARD8 value)
 {
-  moutb(index << 4, value);
+  moutb(index << 2, value);
 }
 
 static CARD8
 mmioReadCrtc(vgaHWPtr hwp, CARD8 index)
 {
-  return minb(index << 4);
+  return minb(index << 2);
 }
 
 static void
Index: xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile:1.2 xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile:1.2	Thu Mar  2 17:05:35 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile	Fri Mar 31 14:55:41 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile,v 1.2 2000/03/03 01:05:35 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile,v 1.3 2000/03/31 22:55:41 dawes Exp $
 XCOMM
 XCOMM This is an Imakefile for the CYRIX driver.  
 XCOMM
@@ -9,12 +9,16 @@
 SRCS = cyrix_driver.c cyrix_accel.c cyrix_bank.c cyrix_helper.c
 OBJS = cyrix_driver.o cyrix_accel.o cyrix_bank.o cyrix_helper.o
 
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \
            -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(XF86SRC)/i2c \
            -I$(XF86SRC)/xaa -I$(XF86SRC)/rac \
            -I$(XF86SRC)/vgahw -I$(XF86SRC)/ddc -I$(XF86SRC)/ramdac \
            -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
 	   -I$(XTOP)/include/extensions
+#endif
 
 #if MakeHasPosixVariableSubstitutions
 SubdirLibraryRule($(OBJS))
@@ -32,3 +36,13 @@
 #endif
 
 DependTarget()
+
+InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/cyrix)
+InstallDriverSDKNonExecFile(cyrix.h,$(DRIVERSDKDIR)/drivers/cyrix)
+InstallDriverSDKNonExecFile(cyrix_accel.c,$(DRIVERSDKDIR)/drivers/cyrix)
+InstallDriverSDKNonExecFile(cyrix_bank.c,$(DRIVERSDKDIR)/drivers/cyrix)
+InstallDriverSDKNonExecFile(cyrix_driver.c,$(DRIVERSDKDIR)/drivers/cyrix)
+InstallDriverSDKNonExecFile(cyrix_helper.c,$(DRIVERSDKDIR)/drivers/cyrix)
+
+InstallDriverSDKObjectModule(cyrix,$(DRIVERSDKMODULEDIR),drivers)
+
Index: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.cpp:1.1	Thu Mar  2 17:05:36 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.cpp	Tue Jun 13 19:13:08 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.cpp,v 1.1 2000/03/03 01:05:36 dawes Exp $ 
-.TH CYRIX __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.cpp,v 1.4 2000/06/14 02:13:08 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH CYRIX __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 cyrix \- Cyrix video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""cyrix"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qcyrix\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B cyrix 
 is an XFree86 driver for Cyrix video chips.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h:1.1 xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h:1.2
--- xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h:1.1	Sat Feb 12 16:56:09 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h	Wed Apr 19 09:57:43 2000
@@ -26,7 +26,7 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.1 2000/02/13 00:56:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */
 
 #ifndef _CYRIX_H_
 #define _CYRIX_H_
@@ -89,7 +89,12 @@
 	/* struct for the server */
 	CARD32 	 		IOAccelAddress;
 	CARD32 			FbAddress;
-	EntityInfoPtr       	pEnt;
+        char*                   GXregisters;
+        int                     CYRIXcursorAddress; /* relative to fb base */
+        int                     CYRIXbltBuf0Address;/*relative to GXregisters*/
+        int                     CYRIXbltBuf1Address;
+        int                     CYRIXbltBufSize;
+        EntityInfoPtr       	pEnt;
 	unsigned char *		FbBase;
 	pciVideoPtr		PciInfo;
 	XAAInfoRecPtr		AccelInfoRec;
@@ -111,6 +116,14 @@
 	Bool			IsCyber;
 	Bool			NewClockCode;
 	Bool			NoAccel;
+    /* accel stuff */
+        int bltBufWidth;
+        int blitMode;
+        int vectorMode;
+        int transMode;
+        int copyXdir;
+        int setBlitModeOnSync;
+
 } CYRIXPrivate, *CYRIXPrvPtr;
 
 typedef struct {
@@ -125,24 +138,13 @@
 extern void    	CyrixRestore(ScrnInfoPtr pScrn, CYRIXRegPtr cyrixReg);
 extern void *  	CyrixSave(ScrnInfoPtr pScrn, CYRIXRegPtr cyrixReg);
 
-/* externs in cyrix_driver.c */
-extern char* GXregisters;
-extern int CYRIXisOldChipRevision;
-
-extern int CYRIXcursorAddress;       /* relative to frame buffer base */
-extern int CYRIXoffscreenAddress;
-extern int CYRIXoffscreenSize;
-
-extern int CYRIXbltBuf0Address;      /* relative to GXregisters */
-extern int CYRIXbltBuf1Address;
-extern int CYRIXbltBufSize;
 
 /* externs in cyrix_asm.s */
 extern void CYRIXsetBlitBuffers(void);
 extern void CYRIXsetBlitBuffersOnOldChip(void);
 
 /* 32 bit access to GX registers */
-#define GX_REG(a) (*(volatile CARD32*)(GXregisters + (a)))
+#define GX_REG(a) (*(volatile CARD32*)(pCyrix->GXregisters + (a)))
 
 
 /* externs in cyrix_accel.c */
@@ -187,10 +189,10 @@
                      GX_REG(GP_RASTER_MODE)  = ((pm) | RM_CLIP_ENABLE | 0xC6);
 
 #define CYRIXsetBlitMode()                   \
-                     GX_REG(GP_BLIT_MODE)    = (blitMode)
+                     GX_REG(GP_BLIT_MODE)    = (pCyrix->blitMode)
 
 #define CYRIXsetVectorMode()                 \
-                     GX_REG(GP_VECTOR_MODE)  = (vectorMode)
+                     GX_REG(GP_VECTOR_MODE)  = (pCyrix->vectorMode)
 
 #define IfDest(rop, planemask, val)                                        \
                                  (( (((rop) & 0x5) ^ (((rop) & 0xA) >> 1)) \
Index: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c:1.2	Mon Feb 14 11:20:48 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c	Wed Apr 19 09:57:43 2000
@@ -26,7 +26,7 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.2 2000/02/14 19:20:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */
 
 #include "vgaHW.h"
 #include "xf86.h"
@@ -58,14 +58,8 @@
                                            0x26, 0xA6, 0x66, 0xE6,
                                            0x2E, 0xAE, 0x6E, 0xEE };
 
-static int bltBufWidth;
-
-static int blitMode;
-static int vectorMode;
-static int transMode;
-static int copyXdir;
-static int setBlitModeOnSync = 0;
-
+#if 0
+#endif
 
 /* Forward declaration of functions used in the driver */
 void CYRIXAccelSync(ScrnInfoPtr pScrn);
@@ -77,8 +71,9 @@
 		int rop, unsigned int planemask, int transparency_color);
 void CYRIXSubsequentScreenToScreenCopy(ScrnInfoPtr, int x1, int y1, int x2,
 					int y2, int w, int h);
-void CYRIXSubsequentBresenhamLine(int x1, int y1, int octant, int err,
-					int e1, int e2, int length);
+void CYRIXSubsequentBresenhamLine(ScrnInfoPtr pScrn,int x1, int y1,
+				  int e1, int e2, int err, int length,
+				  int octant);
 void CYRIXSetupForColor8x8PatternFillRect(ScrnInfoPtr pScrn, int patternx,
 	int patterny, int rop, unsigned int planemask, int transparency_color);
 void CYRIXSubsequentColor8x8PatternFillRect(ScrnInfoPtr pScrn, int patternx,
@@ -89,7 +84,6 @@
 			int y, int w, int h, int skipleft);
 void InitPixmapCache(ScreenPtr pScreen, RegionPtr areas, pointer data);
 /* Info Rec for all these routines to use */
-static XAAInfoRecPtr localRecPtr;
 
 /* Acceleration init function, sets up pointers to our accelerated functions */
 void 
@@ -98,6 +92,7 @@
 
 	CYRIXPrvPtr	pCyrix;
 	ScrnInfoPtr 	pScrn;
+	XAAInfoRecPtr localRecPtr;
 
 	pScrn = xf86Screens[pScreen->myNum];
 	pCyrix = CYRIXPTR(pScrn);
@@ -152,9 +147,9 @@
 	   bug if we don't give XAA enough room, but the only thing that
 	   seems to make it work properly) */
 	localRecPtr->ColorExpandBase =
-	    (unsigned char*)(GXregisters + CYRIXbltBuf0Address);
+	    (unsigned char*)(pCyrix->GXregisters + pCyrix->CYRIXbltBuf0Address);
 	localRecPtr->ColorExpandRange =
-	    CYRIXbltBufSize * 2;
+	    pCyrix->CYRIXbltBufSize * 2;
 
 	localRecPtr->SetupForCPUToScreenColorExpandFill =
 	    CYRIXSetupForCPUToScreenColorExpandFill;
@@ -162,14 +157,16 @@
 	    CYRIXSubsequentCPUToScreenColorExpandFill;
 
 	/* calculate the pixel width of a blit buffer for convenience */
-	bltBufWidth = CYRIXbltBufSize / (pScrn->bitsPerPixel / 8);
+	pCyrix->bltBufWidth = pCyrix->CYRIXbltBufSize / (pScrn->bitsPerPixel / 8);
 } 
 
 
 /* set colors - called through access macros in cyrix.h */
 static __inline__ void CYRIXsetColors01(ScrnInfoPtr pScrn, int reg,
-					int col0, int col1)
-{	if (pScrn->bitsPerPixel == 16)
+					int col0, int col1) {
+	CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+	
+    if (pScrn->bitsPerPixel == 16)
 		GX_REG(reg) = ((col1 & 0xFFFF) << 16) | (col0 & 0xFFFF);
 	else
 	{	col0 &= 0xFF;
@@ -183,8 +180,11 @@
    directly). */
 void
 CYRIXAccelSync(ScrnInfoPtr pScrn)
-{	if (setBlitModeOnSync)
-	{	setBlitModeOnSync = 0;
+{
+    CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+	
+    if (pCyrix->setBlitModeOnSync)
+	{	pCyrix->setBlitModeOnSync = 0;
 		CYRIXsetupSync();
 		CYRIXsetBlitMode();
 	}
@@ -211,9 +211,9 @@
 	CYRIXsetSourceColors01(pScrn, color, color);
 	CYRIXsetPatColors01(pScrn, planemask, 0);
 	CYRIXsetPatMode(rop, RM_PAT_DISABLE);
-	blitMode = BM_READ_SRC_NONE | BM_WRITE_FB | BM_SOURCE_EXPAND
-	         | IfDest(rop, planemask, BM_READ_DST_FB0);
-	vectorMode = IfDest(rop, planemask, VM_READ_DST_FB);
+	pCyrix->blitMode = BM_READ_SRC_NONE | BM_WRITE_FB | BM_SOURCE_EXPAND
+	    | IfDest(rop, planemask, BM_READ_DST_FB0);
+	pCyrix->vectorMode = IfDest(rop, planemask, VM_READ_DST_FB);
 }
     
     
@@ -221,12 +221,16 @@
 CYRIXSubsequentSolidFillRect(pScrn, x, y, w, h)
 ScrnInfoPtr pScrn;
 int x, y, w, h;
-{	/* divide the operation into columns if required; use twice the
+{
+    CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+
+    /* divide the operation into columns if required; use twice the
            blit buffer width because buffer 0 will overflow into buffer 1 */
-	while (w > 2 * bltBufWidth)
-	{	CYRIXSubsequentSolidFillRect(pScrn, x, y, 2 * bltBufWidth, h);
-		x += 2 * bltBufWidth;
-		w -= 2 * bltBufWidth;
+	while (w > 2 * pCyrix->bltBufWidth)
+	{	CYRIXSubsequentSolidFillRect(pScrn, x, y,
+					     2 * pCyrix->bltBufWidth, h);
+		x += 2 * pCyrix->bltBufWidth;
+		w -= 2 * pCyrix->bltBufWidth;
 	}
 	CYRIXsetupSync();
 	CYRIXsetDstXY(x, y);
@@ -260,11 +264,11 @@
 
 	if (transparency_color == -1)
 	{	CYRIXsetPatMode(rop, RM_PAT_DISABLE);
-		transMode = 0;
+		pCyrix->transMode = 0;
 	}
 	else
 	{	CYRIXsetPatModeTrans(RM_PAT_DISABLE);
-		transMode = 1;
+		pCyrix->transMode = 1;
 
 		if (pCyrix->AccelInfoRec->CopyAreaFlags &
 						TRANSPARENCY_GXCOPY_ONLY)
@@ -272,48 +276,50 @@
 
 		/* fill blit buffer 1 with the transparency color */
 		if (pScrn->bitsPerPixel == 16)
-		{	int              k   = CYRIXbltBufSize / 4;
+		{	int              k   = pCyrix->CYRIXbltBufSize / 4;
 			CARD32           val = (transparency_color << 16) |
 			                       transparency_color;
-			volatile CARD32* buf = &(GX_REG(CYRIXbltBuf1Address));
+			volatile CARD32* buf = &(GX_REG(pCyrix->CYRIXbltBuf1Address));
 
 			while (--k >= 0) buf[k] = val;
 		}
 		else
-			memset(GXregisters + CYRIXbltBuf1Address,
-			       transparency_color, CYRIXbltBufSize);
+			memset(pCyrix->GXregisters + pCyrix->CYRIXbltBuf1Address,
+			       transparency_color, pCyrix->CYRIXbltBufSize);
 	}
 
-	blitMode = BM_READ_SRC_FB | BM_WRITE_FB | BM_SOURCE_COLOR
-	         | (transMode ? BM_READ_DST_NONE : IfDest(rop, planemask, BM_READ_DST_FB1))
-	         | (ydir < 0 ? BM_REVERSE_Y : 0);
+	pCyrix->blitMode = BM_READ_SRC_FB | BM_WRITE_FB | BM_SOURCE_COLOR
+	    | (pCyrix->transMode ? BM_READ_DST_NONE : IfDest(rop, planemask, BM_READ_DST_FB1))
+	    | (ydir < 0 ? BM_REVERSE_Y : 0);
 
-	copyXdir = xdir;
+	pCyrix->copyXdir = xdir;
 }
 
 void 
 CYRIXSubsequentScreenToScreenCopy(pScrn, x1, y1, x2, y2, w, h)
 ScrnInfoPtr pScrn;
 int x1, y1, x2, y2, w, h;
-{	int up       = (blitMode & BM_REVERSE_Y);
+{
+    CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+    int up       = (pCyrix->blitMode & BM_REVERSE_Y);
 
 	/* divide the operation into columns when necessary */
-	if (copyXdir < 0)
-	{	int x_offset = w - bltBufWidth;
+	if (pCyrix->copyXdir < 0)
+	{	int x_offset = w - pCyrix->bltBufWidth;
 
 		while (x_offset > 0)
 		{	CYRIXSubsequentScreenToScreenCopy(pScrn, x1 + x_offset, y1,
 			                                  x2 + x_offset, y2,
-			                                  bltBufWidth, h);
-			x_offset -= bltBufWidth;
-			w -= bltBufWidth;
+			                                  pCyrix->bltBufWidth, h);
+			x_offset -= pCyrix->bltBufWidth;
+			w -= pCyrix->bltBufWidth;
 	}	}
-	else while (w > bltBufWidth)
+	else while (w > pCyrix->bltBufWidth)
 	{	CYRIXSubsequentScreenToScreenCopy(pScrn, x1, y1, x2, y2,
-		                                  bltBufWidth, h);
-		x1 += bltBufWidth;
-		x2 += bltBufWidth;
-		w -= bltBufWidth;
+		                                  pCyrix->bltBufWidth, h);
+		x1 += pCyrix->bltBufWidth;
+		x2 += pCyrix->bltBufWidth;
+		w -= pCyrix->bltBufWidth;
 	}
 
 	CYRIXsetupSync();
@@ -323,8 +329,8 @@
 	/* in transparent mode, one line reads the transparency color
 	   into a processor-internal register, and the remaining lines
 	   can be done in a single second pass */
-	if (transMode)
-	{	blitMode |= BM_READ_DST_BB1;
+	if (pCyrix->transMode)
+	{	pCyrix->blitMode |= BM_READ_DST_BB1;
 		CYRIXsetWH(w, 1);
 		CYRIXsetBlitMode();
 		h--;
@@ -332,7 +338,7 @@
 		if (up) { y1--; y2--; }
 		else { y1++; y2++; }
 		CYRIXsetupSync();
-		blitMode &= ~(BM_READ_DST_BB1);
+		pCyrix->blitMode &= ~(BM_READ_DST_BB1);
 	}
 	CYRIXsetWH(w, h);
 	CYRIXsetBlitMode();
@@ -341,24 +347,26 @@
 
 /* Bresenham lines */
 void
-CYRIXSubsequentBresenhamLine(x1, y1, octant, err, e1, e2, length)
-int x1, y1, octant, err, e1, e2, length;
-{	if (octant & YMAJOR)
-	{	vectorMode = (vectorMode & VM_READ_DST_FB) | VM_Y_MAJOR;
-		if (!(octant & XDECREASING)) vectorMode |= VM_MINOR_INC;
-		if (!(octant & YDECREASING)) vectorMode |= VM_MAJOR_INC;
-	}
-	else
-	{	vectorMode = (vectorMode & VM_READ_DST_FB) | VM_X_MAJOR;
-		if (!(octant & XDECREASING)) vectorMode |= VM_MAJOR_INC;
-		if (!(octant & YDECREASING)) vectorMode |= VM_MINOR_INC;
-	}
-
-	CYRIXsetupSync();
-	CYRIXsetDstXY(x1, y1);
-	CYRIXsetWH(length, (err & 0xFFFF));
-	CYRIXsetSrcXY((e1 & 0xFFFF), (e2 & 0xFFFF));
-	CYRIXsetVectorMode();
+CYRIXSubsequentBresenhamLine(pScrn, x1, y1, e1, e2, err, length, octant)
+ScrnInfoPtr pScrn; int x1, y1, octant, err, e1, e2, length;
+{
+    CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+    
+    if (octant & YMAJOR) {
+	pCyrix->vectorMode = (pCyrix->vectorMode & VM_READ_DST_FB) | VM_Y_MAJOR;
+	if (!(octant & XDECREASING)) pCyrix->vectorMode |= VM_MINOR_INC;
+	if (!(octant & YDECREASING)) pCyrix->vectorMode |= VM_MAJOR_INC;
+    } else {
+	pCyrix->vectorMode = (pCyrix->vectorMode & VM_READ_DST_FB) | VM_X_MAJOR;
+	if (!(octant & XDECREASING)) pCyrix->vectorMode |= VM_MAJOR_INC;
+	if (!(octant & YDECREASING)) pCyrix->vectorMode |= VM_MINOR_INC;
+    }
+    
+    CYRIXsetupSync();
+    CYRIXsetDstXY(x1, y1);
+    CYRIXsetWH(length, (err & 0xFFFF));
+    CYRIXsetSrcXY((e1 & 0xFFFF), (e2 & 0xFFFF));
+    CYRIXsetVectorMode();
 }
 
 
@@ -370,7 +378,9 @@
 int rop, transparency_color;
 unsigned int planemask;
 {
-
+    CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+    XAAInfoRecPtr localRecPtr = pCyrix->AccelInfoRec;
+    
 	if (localRecPtr->Color8x8PatternFillFlags & NO_PLANEMASK)
 		planemask = 0xFFFF;
 	if ((transparency_color == -1) && (localRecPtr->Color8x8PatternFillFlags &
@@ -384,7 +394,7 @@
 	CYRIXsetPatModeX(rop, RM_PAT_MONO | ((transparency_color == -1) ?
 						RM_PAT_TRANSPARENT : 0));
 
-	blitMode = BM_READ_SRC_NONE | BM_WRITE_FB | BM_SOURCE_EXPAND |
+	pCyrix->blitMode = BM_READ_SRC_NONE | BM_WRITE_FB | BM_SOURCE_EXPAND |
 	         ((transparency_color == -1) ?
 		 IfDest(rop, planemask, BM_READ_DST_FB0) : BM_READ_DST_NONE);
 }
@@ -402,8 +412,12 @@
 ScrnInfoPtr pScrn;
 int bg, fg, rop;
 unsigned int planemask;
-{	int trans = (bg == -1);
+{
+    CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+    XAAInfoRecPtr localRecPtr = pCyrix->AccelInfoRec;
 
+    int trans = (bg == -1);
+
 	if (trans && (localRecPtr->CPUToScreenColorExpandFillFlags &
 						TRANSPARENCY_GXCOPY_ONLY))
 		rop = GXcopy;
@@ -418,20 +432,22 @@
 	   for the text source bitmap, so READ_DST_FB1 should not be
 	   used.  So far, this problem has not manifested itself in
 	   practice. */
-	blitMode = BM_READ_SRC_BB0 | BM_WRITE_FB | BM_SOURCE_EXPAND
-	         | (trans ? IfDest(rop, planemask, BM_READ_DST_FB1) : BM_READ_DST_NONE);
+	pCyrix->blitMode = BM_READ_SRC_BB0 | BM_WRITE_FB | BM_SOURCE_EXPAND
+	    | (trans ? IfDest(rop, planemask, BM_READ_DST_FB1) : BM_READ_DST_NONE);
 }
 
 void CYRIXSubsequentCPUToScreenColorExpandFill(pScrn, x, y, w, h, skipleft)
 ScrnInfoPtr pScrn;
 int x, y, w, h;
 int skipleft;
-{	CYRIXsetupSync();
-	CYRIXsetSrcXY(0, 0);
-	CYRIXsetDstXY(x, y);
-	CYRIXsetWH(w, h);
-
-	CYRIXAccelSync(pScrn);
-	setBlitModeOnSync = 1;
+{
+    CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+    CYRIXsetupSync();
+    CYRIXsetSrcXY(0, 0);
+    CYRIXsetDstXY(x, y);
+    CYRIXsetWH(w, h);
+    
+    CYRIXAccelSync(pScrn);
+    pCyrix->setBlitModeOnSync = 1;
 }
 
Index: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c:1.6	Wed Mar  1 08:01:07 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c	Wed Jun 21 10:28:06 2000
@@ -26,7 +26,7 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.6 2000/03/01 16:01:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.9 2000/06/21 17:28:06 dawes Exp $ */
 
 #include "compiler.h"
 #include "fb.h"
@@ -78,7 +78,9 @@
 			     int flags);
 
 /* Internally used functions */
+#if 0
 static void     CYRIXEnterLeave(Bool enter);
+#endif
 static void	CYRIXSave(ScrnInfoPtr pScrn);
 static void	CYRIXRestore(ScrnInfoPtr pScrn);
 static Bool	CYRIXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
@@ -164,24 +166,8 @@
     NULL
 };
 
-unsigned long vgaIOBase;
-CARD32  physbase, padsize;
-
 /* access to the MediaGX video hardware registers */
 
-char* GXregisters;
-
-int CYRIXcbufferAddress;      /* relative to video base */
-int CYRIXoffscreenAddress;
-int CYRIXcursorAddress;
-int CYRIXcbLineDelta;         /* DWORDS */
-int CYRIXoffscreenSize;       /* bytes */
-
-int CYRIXbltBuf0Address;      /* relative to GXregisters */
-int CYRIXbltBuf1Address;
-int CYRIXbltBufSize;
-
-int CYRIXisOldChipRevision;
 
 /* DEBUG variables & flags */
 #define ENTER TRUE
@@ -313,9 +299,7 @@
 CYRIXProbe(DriverPtr drv, int flags)
 {
     int i, numDevSections, numUsed, *usedChips;
-    unsigned char gcr;
     GDevPtr *devSections;
-    int device_step, device_revision;
     ScrnInfoPtr pScrn;
 
     /*
@@ -348,101 +332,33 @@
     if (numUsed <= 0)
 	return FALSE;
 
-    /* use register probing to decide whether the chip is
-     * `suitable' for us.
-     */
-    vgaIOBase = VGAHW_GET_IOBASE();
-
-    /* the lock register should read 0xFF after we have
-      written 0x00 to lock */
-    outb(vgaIOBase + 4, CrtcExtendedRegisterLock);
-    outb(vgaIOBase + 5, 0x00);
-
-    if (inb(vgaIOBase + 5) != 0xFF) goto probeFailed;
-
-    /* the lock register should read 0x00 after we have
-	 writen the magic word 'WL' to unlock */
-    outb(vgaIOBase + 5, 0x57);
-    outb(vgaIOBase + 5, 0x4C);
-
-    /* GGI's idea to do two comparisons */
-    if (inb(vgaIOBase + 5) != 0x00) goto probeFailed;
-    if (inb(vgaIOBase + 5) != 0x00)
-    {   probeFailed:
-	CYRIXEnterLeave(LEAVE);
-	return (FALSE);
-    }
-    /* OK, it's most likely a MediaGX.  Now check the scratchpad
-     * size.  If it is zero, we're not using the MediaGX graphics
-     * facilities. 
-     */
-    outb(GX_IOPORT_INDEX, GX_IOIDX_DIR0); /* doesn't work w/o that */
-    outb(GX_IOPORT_INDEX, GX_IOIDX_GCR);
-    gcr = inb(GX_IOPORT_DATA);
-
-    physbase = (gcr & 3) << 30;
-    padsize = (gcr & 12) ? (((gcr & 12) >> 2) + 1) : 0;
-
-
-    /*      end GGI MediaGX driver based code */
-    if (padsize == 0) return (FALSE);
-
-    if (flags & PROBE_DETECT)
-	return TRUE;
-
-    xf86ErrorF("%s: GX_BASE: 0x%x\n",CYRIX_NAME, physbase);
-    xf86ErrorF("%s: Scratchpad size: %d kbytes\n",CYRIX_NAME, padsize);
-
-    /* Probe for the MediaGX processor version details.  Older versions
-     * use different op-codes for setting the organization of the
-     * blit buffers within the scratch padarea.  We currently
-     * also use this version ID to guess whether the chipset has
-     * an external DAC (in which case we treat the colour maps
-     * in a slightly different fashion) 
-     */
-    outb(0x22, 0xFF);
-    device_step = device_revision = inb(0x23);
-    device_step >>= 8;
-    device_revision &= 0xFF;
-    xf86ErrorF("%s: MediaGX processor ID %d revision %d\n", 
-		CYRIX_NAME, device_step, device_revision);
-
-    CYRIXisOldChipRevision = (device_step == 0 && device_revision < 40);
-
-    /* Some  MediaGX systems have different blit buffer offsets than
-     * is  indicated by the scratchpad size.  Make sure that we have
-     * the  right offsets by writing them into the corresponding CPU
-     * registers.  The op-codes to use depend on the processor
-     * revision.  The value `40' is a guess (awaiting details from Cyrix).
-     */
-    CYRIXbltBufSize = (padsize == 4) ? 1840 : (padsize == 3) ? 1328 : 816;
-    CYRIXbltBuf1Address = 0x0E60 - CYRIXbltBufSize;
-    CYRIXbltBuf0Address = CYRIXbltBuf1Address - CYRIXbltBufSize;
-
     /* Free it since we don't need that list after this */
     xfree(devSections);
 
-	for (i=0; i < numUsed; i++) {
+    for (i=0; i < numUsed; i++) {
 
 
     /* Fill in what we can of the ScrnInfoRec */
-	    pScrn = xf86AllocateScreen(drv,0);
-	    pScrn->driverVersion = VERSION;
-	    pScrn->ioBase	 = vgaIOBase;
-	    pScrn->driverName    = CYRIX_DRIVER_NAME;
-	    pScrn->name          = CYRIX_NAME;
-	    pScrn->Probe         = CYRIXProbe;
-	    pScrn->PreInit       = CYRIXPreInit;
-	    pScrn->ScreenInit    = CYRIXScreenInit;
-	    pScrn->SwitchMode    = CYRIXSwitchMode;
-	    pScrn->AdjustFrame   = CYRIXAdjustFrame;
-	    pScrn->LeaveVT       = CYRIXLeaveVT;
-	    pScrn->EnterVT       = CYRIXEnterVT;
-	    pScrn->FreeScreen    = CYRIXFreeScreen;
-	    pScrn->ValidMode     = CYRIXValidMode;
-	    xf86ConfigActiveIsaEntity(pScrn, usedChips[i], CYRIXISAChipsets,
-					NULL, NULL, NULL, NULL, NULL);
-	}
+	    pScrn = NULL;
+	    if ((pScrn = xf86ConfigIsaEntity(pScrn, 0, usedChips[i],
+						   CYRIXISAChipsets, NULL,
+						   NULL, NULL, NULL, NULL))){
+		pScrn->driverVersion = VERSION;
+		pScrn->driverName    = CYRIX_DRIVER_NAME;
+		pScrn->name          = CYRIX_NAME;
+		pScrn->Probe         = CYRIXProbe;
+		pScrn->PreInit       = CYRIXPreInit;
+		pScrn->ScreenInit    = CYRIXScreenInit;
+		pScrn->SwitchMode    = CYRIXSwitchMode;
+		pScrn->AdjustFrame   = CYRIXAdjustFrame;
+		pScrn->LeaveVT       = CYRIXLeaveVT;
+		pScrn->EnterVT       = CYRIXEnterVT;
+		pScrn->FreeScreen    = CYRIXFreeScreen;
+		pScrn->ValidMode     = CYRIXValidMode;
+		return (TRUE);
+	    }
+	    xfree(usedChips);
+    }
     return (TRUE);
 }
 
@@ -450,10 +366,16 @@
 CYRIXFindIsaDevice(GDevPtr dev)
 {
     CARD32 CurrentValue, TestValue;
+    unsigned char gcr;
 
     /* No need to unlock VGA CRTC registers here */
 
     /* VGA has one more read/write attribute register than EGA */
+    /* use register probing to decide whether the chip is
+     * `suitable' for us.
+     */
+    int vgaIOBase = VGAHW_GET_IOBASE();
+
     (void) inb(vgaIOBase + 0x0AU);  /* Reset flip-flop */
     outb(0x3C0, 0x14 | 0x20);
     CurrentValue = inb(0x3C1);
@@ -465,7 +387,44 @@
     /* Quit now if no VGA is present */
     if ((CurrentValue ^ 0x0F) != TestValue)
       return -1;
+
+    /* the lock register should read 0xFF after we have
+      written 0x00 to lock */
+    outb(vgaIOBase + 4, CrtcExtendedRegisterLock);
+    outb(vgaIOBase + 5, 0x00);
+
+    if (inb(vgaIOBase + 5) != 0xFF) return -1;
+
+    /* the lock register should read 0x00 after we have
+	 written the magic word 'WL' to unlock */
+    outb(vgaIOBase + 5, 0x57);
+    outb(vgaIOBase + 5, 0x4C);
+
+    /* GGI's idea to do two comparisons */
+    if (inb(vgaIOBase + 5) != 0x00) goto fail;
+    if (inb(vgaIOBase + 5) != 0x00) goto fail;
+
+    /* OK, it's most likely a MediaGX.  Now check the scratchpad
+     * size.  If it is zero, we're not using the MediaGX graphics
+     * facilities. 
+     */
+    outb(GX_IOPORT_INDEX, GX_IOIDX_DIR0); /* doesn't work w/o that */
+    outb(GX_IOPORT_INDEX, GX_IOIDX_GCR);
+    gcr = inb(GX_IOPORT_DATA);
+
+    /*      end GGI MediaGX driver based code */
+    if (!(gcr & 12)) goto fail;
+
+    /* Unprotect MediaGX extended registers */
+    outb(vgaIOBase + 4, CrtcExtendedRegisterLock);
+    outb(vgaIOBase + 5, 0x00);
     return (int)CHIP_CYRIXmediagx;
+
+ fail:
+    /* Protect MediaGX extended registers */
+    outb(vgaIOBase + 4, CrtcExtendedRegisterLock);
+    outb(vgaIOBase + 5, 0x00);
+    return -1;
 }
 	
 /* Mandatory */
@@ -478,7 +437,12 @@
     int i;
     ClockRangePtr clockRanges;
     char *mod = NULL;
-    const char *Sym;
+    const char *Sym = NULL;
+    CARD32 physbase, padsize;
+    int CYRIXisOldChipRevision;
+    int device_step, device_revision;
+    int vgaIOBase;
+    unsigned char gcr;
 
     if (flags & PROBE_DETECT) return FALSE;
 
@@ -511,17 +475,66 @@
 	return FALSE;
 
     VGAHWPTR(pScrn)->MapSize = 0x10000;		/* Standard 64k VGA window */
-
     if (!vgaHWMapMem(pScrn))
 	return FALSE;
+    
     vgaHWGetIOBase(VGAHWPTR(pScrn));
     vgaIOBase = VGAHWPTR(pScrn)->IOBase;
+    
+    
+    /* Unprotect MediaGX extended registers */
+    outb(vgaIOBase + 4, CrtcExtendedRegisterLock);
+    outb(vgaIOBase + 5, 0x57);
+    outb(vgaIOBase + 5, 0x4C);
+
+    outb(GX_IOPORT_INDEX, GX_IOIDX_DIR0); /* doesn't work w/o that */
+    outb(GX_IOPORT_INDEX, GX_IOIDX_GCR);
+    gcr = inb(GX_IOPORT_DATA);
+
+    physbase = (gcr & 3) << 30;
+    padsize = (gcr & 12) ? (((gcr & 12) >> 2) + 1) : 0;
 
+
+    /*      end GGI MediaGX driver based code */
+    if (padsize == 0) return (FALSE);
+
+    if (flags & PROBE_DETECT)
+	return TRUE;
+
+    xf86ErrorF("%s: GX_BASE: 0x%x\n",CYRIX_NAME, physbase);
+    xf86ErrorF("%s: Scratchpad size: %d kbytes\n",CYRIX_NAME, padsize);
+
+    /* Probe for the MediaGX processor version details.  Older versions
+     * use different op-codes for setting the organization of the
+     * blit buffers within the scratch padarea.  We currently
+     * also use this version ID to guess whether the chipset has
+     * an external DAC (in which case we treat the colour maps
+     * in a slightly different fashion) 
+     */
+    outb(0x22, 0xFF);
+    device_step = device_revision = inb(0x23);
+    device_step >>= 8;
+    device_revision &= 0xFF;
+    xf86ErrorF("%s: MediaGX processor ID %d revision %d\n", 
+		CYRIX_NAME, device_step, device_revision);
+
+    CYRIXisOldChipRevision = (device_step == 0 && device_revision < 40);
+
+    /* Some  MediaGX systems have different blit buffer offsets than
+     * is  indicated by the scratchpad size.  Make sure that we have
+     * the  right offsets by writing them into the corresponding CPU
+     * registers.  The op-codes to use depend on the processor
+     * revision.  The value `40' is a guess (awaiting details from Cyrix).
+     */
+    pCyrix->CYRIXbltBufSize = (padsize == 4) ? 1840 : (padsize == 3) ? 1328 : 816;
+    pCyrix->CYRIXbltBuf1Address = 0x0E60 - pCyrix->CYRIXbltBufSize;
+    pCyrix->CYRIXbltBuf0Address = pCyrix->CYRIXbltBuf1Address - pCyrix->CYRIXbltBufSize;
+
     /* map the entire area from GX_BASE (scratchpad area)
 	up to the end of the control registers */
-    GXregisters = (char*)xf86MapVidMem(pScrn->scrnIndex,
+    pCyrix->GXregisters = (char*)xf86MapVidMem(pScrn->scrnIndex,
 			VGA_REGION, (int )physbase, 0x9000);
-    if (!GXregisters) {
+    if (!pCyrix->GXregisters) {
 	ErrorF("%s: Cannot map hardware registers\n", CYRIX_NAME);
 	return FALSE;
     }
@@ -690,8 +703,8 @@
 	from = X_CONFIG;
     } else {
 	from = X_PROBED;
-	outb(pScrn->ioBase + 4, CrtcGraphicsMemorySize);
-	videoram = (inb(pScrn->ioBase + 5) * 64);
+	outb(vgaIOBase + 4, CrtcGraphicsMemorySize);
+	videoram = (inb(vgaIOBase + 5) * 64);
 	pScrn->videoRam = videoram & 0xFFFFFC00; /* mask out the part we want */
     }
 
@@ -713,7 +726,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = (ClockRangePtr)xnfalloc(sizeof(ClockRange));
+    clockRanges = (ClockRangePtr)xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->minClock = pCyrix->MinClock;
     clockRanges->maxClock = pCyrix->MaxClock;
@@ -1104,11 +1117,13 @@
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     vgaHWPtr hwp;
-    CYRIXPtr pCyrix;
+    CYRIXPrvPtr pCyrix;
     int base = y * pScrn->displayWidth + x;
     unsigned char temp;
-
+    int vgaIOBase;
+    
     hwp = VGAHWPTR(pScrn);
+    vgaIOBase = hwp->IOBase;
     pCyrix = CYRIXPTR(pScrn);
 
     switch (pScrn->bitsPerPixel) {
@@ -1124,6 +1139,7 @@
     }
 
     GX_REG(DC_UNLOCK) = DC_UNLOCK_VALUE;
+    
     /*GX_REG(DC_FB_ST_OFFSET) = base; */
     /* CRT bits 0-15 */
     outw(vgaIOBase + 4, (base & 0x00FF00) | 0x0C); 
@@ -1232,6 +1248,7 @@
     return vgaHWSaveScreen(pScreen, mode);
 }
 
+#if 0
 static void
 CYRIXEnterLeave(enter)
 Bool enter;
@@ -1263,3 +1280,4 @@
     	GX_REG(DC_UNLOCK) = 0;
     }
 }
+#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c:1.1 xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c:1.2
--- xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c:1.1	Sat Feb 12 16:56:10 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c	Wed Apr 19 09:57:43 2000
@@ -26,18 +26,23 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.2 2000/04/19 16:57:43 eich Exp $ */
 
 #include "cyrix.h"
 #include "compiler.h"
 #include "vgaHW.h"
 #include "xf86_ansic.h"
 
-static void CYRIXresetVGA(unsigned long vgaIOBase);
-static void CYRIXmarkLinesDirty(void);
-/* DEBUG STUFF */
-int CYRIXcbLineDelta = 800;
+#define CYRIXmarkLinesDirty { \
+                               int k = 0; \
+                               while (k < 1024) { \
+	                         GX_REG(MC_DR_ADD) = k++; \
+                                 GX_REG(MC_DR_ACC) = 0; \
+                               } \
+                            }
 
+static void CYRIXresetVGA(ScrnInfoPtr pScrn, unsigned long vgaIOBase);
+
 void 
 Cyrix1bppColorMap(ScrnInfoPtr pScrn)
 {	/* use dedicated color map routines on new chipsets in 8bpp */
@@ -63,7 +68,6 @@
 {	unsigned char temp;
 	CYRIXPrvPtr pCyrix;
 	vgaRegPtr vgaReg;
-	int flags;
 	unsigned long vgaIOBase;
 
 	vgaHWProtect(pScrn, TRUE);		/* Blank the screen */
@@ -78,9 +82,9 @@
 	   the font). Luckily things seem to work without it. */
 
 	/* restore standard VGA portion */
-	CYRIXresetVGA(vgaIOBase);
-	vgaHWRestore(pScrn, vgaReg, flags);
-	CYRIXmarkLinesDirty();
+	CYRIXresetVGA(pScrn,vgaIOBase);
+	vgaHWRestore(pScrn, vgaReg, VGA_SR_ALL);
+	CYRIXmarkLinesDirty;
 
 	/* restore miscellaneous output registers */
 	outb(0x3C2, vgaReg->MiscOutReg);
@@ -124,7 +128,7 @@
 	/* let SoftVGA programming settle before we access DC registers,
 	   but don't wait too long */
 	usleep(1000);
-	CYRIXmarkLinesDirty();
+	CYRIXmarkLinesDirty;
 
 	/* restore display controller hardware registers */
 #ifndef MONOVGA
@@ -222,7 +226,7 @@
 	pCyrix->PrevExt.RefreshRate = inb(vgaIOBase + 5);
 
 	/* save standard VGA portion */
-	CYRIXresetVGA(vgaIOBase);
+	CYRIXresetVGA(pScrn,vgaIOBase);
 
 	return((void *)vgaIOBase);
 }
@@ -283,10 +287,7 @@
 #ifndef MONOVGA
 	/* initialize masked contents of display controller
 	   hardware registers. */
-	pCyrix->PrevExt.DcCursStOffset =  CYRIXcursorAddress;
-/* DEBUG
-	pCyrix->PrevExt.DcCbStOffset  =  CYRIXcbufferAddress;
-*/
+	pCyrix->PrevExt.DcCursStOffset =  pCyrix->CYRIXcursorAddress;
 	pCyrix->PrevExt.DcLineDelta   =  0 << 12;
 	pCyrix->PrevExt.DcBufSize     =  0x41 << 9;
 	pCyrix->PrevExt.DcCursorX     =  0;
@@ -298,8 +299,7 @@
 	   screen.  If the line delta is not 1024 or 2048, entire frames
 	   will be flagged dirty as opposed to lines.  Problems with 16bpp
 	   and line-dirty flagging seem to have been solved now.  */
-	if (CYRIXcbLineDelta != 0 &&
-	    mode->CrtcVDisplay == pScrn->virtualY &&
+	if (mode->CrtcVDisplay == pScrn->virtualY &&
 	    mode->CrtcHDisplay == pScrn->virtualX)
 	{	pCyrix->PrevExt.DcGeneralCfg = DC_GCFG_DECE
 		                           | DC_GCFG_CMPE;
@@ -322,22 +322,16 @@
 }
 
 
-static void
-CYRIXmarkLinesDirty()
-{	int k = 0;
-	while (k < 1024)
-	{	GX_REG(MC_DR_ADD) = k++;
-		GX_REG(MC_DR_ACC) = 0;
-}	}
-
 static void
-CYRIXresetVGA(unsigned long vgaIOBase)
-{	unsigned char temp;
-	/* switch off compression and cursor the hard way */
-	GX_REG(DC_UNLOCK)  = DC_UNLOCK_VALUE;
+CYRIXresetVGA(ScrnInfoPtr pScrn, unsigned long vgaIOBase)
+{
+    CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
+    unsigned char temp;
+    /* switch off compression and cursor the hard way */
+    GX_REG(DC_UNLOCK)  = DC_UNLOCK_VALUE;
 	GX_REG(DC_GENERAL_CFG) &= ~(DC_GCFG_CMPE | DC_GCFG_DECE | DC_GCFG_FDTY | DC_GCFG_CURE);
 	GX_REG(DC_UNLOCK)  = 0;
-	CYRIXmarkLinesDirty();
+	CYRIXmarkLinesDirty;
 
 	/* reset SoftVGA extensions to standard VGA behaviour */
 	outb(vgaIOBase + 4, CrtcExtendedAddressControl);
Index: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c:1.20 xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c:1.22
--- xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c:1.20	Wed Mar  1 08:01:07 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c	Mon Jun 12 19:28:33 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.20 2000/03/01 16:01:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.22 2000/06/13 02:28:33 dawes Exp $ */
 
 /*
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
@@ -243,7 +243,7 @@
 FBDevProbe(DriverPtr drv, int flags)
 {
 	int i;
-	ScrnInfoPtr pScrn, pScrn0;
+	ScrnInfoPtr pScrn;
        	GDevPtr *devSections = NULL;
 	int numDevSections;
 	int bus,device,func;
@@ -256,71 +256,67 @@
 	if (flags & PROBE_DETECT)
 		return FALSE;
 
-	pScrn0 = xf86AllocateScreen(drv, 0);
-	if (!xf86LoadSubModule(pScrn0, "fbdevhw")) {
-		xf86DeleteScreen(pScrn0->scrnIndex,0);
-		return FALSE;
-	}
+	if ((numDevSections = xf86MatchDevice(FBDEV_DRIVER_NAME, &devSections)) <= 0) 
+	    return FALSE;
+	
+	if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
+	    return FALSE;
+	    
 	xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
-	if ((numDevSections = xf86MatchDevice(FBDEV_DRIVER_NAME, &devSections)) <= 0) {
-		xf86DeleteScreen(pScrn0->scrnIndex,0);
-		return FALSE;
-	}
-
+	
 	for (i = 0; i < numDevSections; i++) {
-		dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
+	    dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
+	    if (devSections[i]->busID) {
+		xf86ParsePciBusString(devSections[i]->busID,&bus,&device,&func);
+		if (!xf86CheckPciSlot(bus,device,func))
+		    continue;
+	    }
+	    if (fbdevHWProbe(NULL,dev,NULL)) {
+		pScrn = NULL;
 		if (devSections[i]->busID) {
-			xf86ParsePciBusString(devSections[i]->busID,&bus,&device,&func);
-			if (!xf86CheckPciSlot(bus,device,func))
-				continue;
+		    /* XXX what about when there's no busID set? */
+		    int entity;
+		    
+		    entity = xf86ClaimPciSlot(bus,device,func,drv,
+					      0,devSections[i],
+					      TRUE);
+		    pScrn = xf86ConfigPciEntity(pScrn,0,entity,
+						      NULL,RES_SHARED_VGA,
+						      NULL,NULL,NULL,NULL);
+		    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+			       "claimed PCI slot %d:%d:%d\n",bus,device,func);
+
+		} else {
+		    /* XXX This is a quick hack */
+		    int entity;
+		    
+		    entity = xf86ClaimIsaSlot(drv, 0,
+					      devSections[i], TRUE);
+		    pScrn = xf86ConfigIsaEntity(pScrn,0,entity,
+						      NULL,RES_SHARED_VGA,
+						      NULL,NULL,NULL,NULL);
 		}
-		if (fbdevHWProbe(NULL,dev)) {
-			foundScreen = TRUE;
-			pScrn = xf86AllocateScreen(drv, 0);
-			xf86LoadSubModule(pScrn, "fbdevhw");
-			xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
-			pScrn->driverVersion = VERSION;
-	                pScrn->driverName    = FBDEV_DRIVER_NAME;
-			pScrn->name          = FBDEV_NAME;
-			pScrn->Probe         = FBDevProbe;
-			pScrn->PreInit       = FBDevPreInit;
-			pScrn->ScreenInit    = FBDevScreenInit;
-			pScrn->SwitchMode    = fbdevHWSwitchMode;
-			pScrn->AdjustFrame   = fbdevHWAdjustFrame;
-			pScrn->EnterVT       = fbdevHWEnterVT;
-			pScrn->LeaveVT       = fbdevHWLeaveVT;
-			pScrn->ValidMode     = fbdevHWValidMode;
-
-			xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-				   "using %s\n", dev ? dev : "default device");
-			if (devSections[i]->busID) {
-				/* XXX what about when there's no busID set? */
-				int entity;
-
-				xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-					   "claimed PCI slot %d:%d:%d\n",bus,device,func);
-				entity = xf86ClaimPciSlot(bus,device,func,drv,
-							  0,devSections[i],
-							  TRUE);
-				xf86ConfigActivePciEntity(pScrn,entity,
-							  NULL,RES_SHARED_VGA,
-							  NULL,NULL,NULL,NULL);
-			} else {
-				/* XXX This is a quick hack */
-				int entity;
-
-				entity = xf86ClaimIsaSlot(drv, 0,
-							  devSections[i], TRUE);
-				xf86ConfigActiveIsaEntity(pScrn,entity,
-							  NULL,RES_SHARED_VGA,
-							  NULL,NULL,NULL,NULL);
-			}
+		if (pScrn) {
+		    foundScreen = TRUE;
+		    
+		    pScrn->driverVersion = VERSION;
+		    pScrn->driverName    = FBDEV_DRIVER_NAME;
+		    pScrn->name          = FBDEV_NAME;
+		    pScrn->Probe         = FBDevProbe;
+		    pScrn->PreInit       = FBDevPreInit;
+		    pScrn->ScreenInit    = FBDevScreenInit;
+		    pScrn->SwitchMode    = fbdevHWSwitchMode;
+		    pScrn->AdjustFrame   = fbdevHWAdjustFrame;
+		    pScrn->EnterVT       = fbdevHWEnterVT;
+		    pScrn->LeaveVT       = fbdevHWLeaveVT;
+		    pScrn->ValidMode     = fbdevHWValidMode;
+		    
+		    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+			       "using %s\n", dev ? dev : "default device");
 		}
+	    }
 	}
 	xfree(devSections);
-	xf86DeleteScreen(pScrn0->scrnIndex,0);
 	TRACE("probe done");
 	return foundScreen;
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.cpp:1.5 xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.cpp:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.cpp:1.5	Thu Mar  2 17:05:36 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.cpp	Tue Jun 13 19:13:09 2000
@@ -1,19 +1,18 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.cpp,v 1.5 2000/03/03 01:05:36 dawes Exp $ 
-.TH FBDEV __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.cpp,v 1.8 2000/06/14 02:13:09 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH FBDEV __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 fbdev \- video driver for framebuffer device
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""fbdev"""
-.br
-.BI "  BusID  ""pci:" bus : dev : func """
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qfbdev\*q"
+.BI "  BusID  \*qpci:" bus : dev : func \*q
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B fbdev
 is an XFree86 driver for framebuffer devices.  This is a non-accelerated
@@ -46,11 +45,11 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""ShadowFB"" """ boolean """
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  See
 shadowfb(__drivermansuffix__) for further information.  Default: on.
 .SH "SEE ALSO"
 XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1),
-X(1), fbdevhw(__drivermansuffix__)
+X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
 .SH AUTHORS
 Authors include: Gerd Knorr
Index: xc/programs/Xserver/hw/xfree86/drivers/glide/glide.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/glide/glide.cpp:1.7 xc/programs/Xserver/hw/xfree86/drivers/glide/glide.cpp:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/glide/glide.cpp:1.7	Thu Mar  2 17:05:37 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glide/glide.cpp	Tue Jun 13 19:13:09 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide.cpp,v 1.7 2000/03/03 01:05:37 dawes Exp $
-.TH GLIDE __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide.cpp,v 1.10 2000/06/14 02:13:09 dawes Exp $
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH GLIDE __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 glide \- Glide video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""glide"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qglide\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH READ THIS IF NOTHING ELSE
 This driver has a special requirement that needs to be fulfilled
 before it will work: You need Glide installed and you need to make a link for the libglide2x.so
@@ -101,7 +101,7 @@
 .br
    Option      "dpms" "on"
 .br
-   Option      "GlideDevice" "0" 
+   Option      "GlideDevice" "0"
 .br
 EndSection
 .PP
@@ -129,13 +129,13 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""OnAtExit"" """ boolean """
+.BI "Option \*qOnAtExit\*q \*q" boolean \*q
 If true, will leave the Voodoo board on when the server exits. Useful in a multihead setup when
 only the Voodoo board is connected to a second monitor and you don't want that monitor to lose
 signal when you quit the server. Put this option in the Device section.
 Default: off.
 .TP
-.BI "Option ""GlideDevice"" """ integer """
+.BI "Option \*qGlideDevice\*q \*q" integer \*q
 Selects which Voodoo board to use. (Or boards, in an SLI configuration).
 The value should be 0 for the first board, 1 for the second and so on.
 If it is not present, the first Voodoo board found will be selected.
@@ -293,6 +293,6 @@
 .PP
 $ xinit -- +xinerama
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Author: Henrik Harmsen.
Index: xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c:1.12 xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c:1.15
--- xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c:1.12	Wed Mar  1 08:01:08 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c	Wed Jun 21 10:28:06 2000
@@ -45,7 +45,7 @@
    * Support static loading.  
 */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c,v 1.12 2000/03/01 16:01:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c,v 1.15 2000/06/21 17:28:06 dawes Exp $ */
 
 #include "xaa.h"
 #include "xf86Cursor.h"
@@ -408,38 +408,40 @@
       {
         int entity;
         /* Match */
-        /* Allocate a ScrnInfoRec and claim the slot */
-        pScrn = xf86AllocateScreen(drv, 0);
-        
-        /* I'm not going to "claim" the glide device since no other driver than this can drive it */
-        /* (A glide device is not a PCI device) */
-        /* XXX Need to see how this fits in with the new RAC */
-
-        /* Fill in what we can of the ScrnInfoRec */
-        pScrn->driverVersion = VERSION;
-        pScrn->driverName    = GLIDE_DRIVER_NAME;
-        pScrn->name	     = GLIDE_NAME;
-        pScrn->Probe	     = GLIDEProbe;
-        pScrn->PreInit	     = GLIDEPreInit;
-        pScrn->ScreenInit    = GLIDEScreenInit;
-        pScrn->EnterVT	     = GLIDEEnterVT;
-        pScrn->LeaveVT	     = GLIDELeaveVT;
-        pScrn->FreeScreen    = GLIDEFreeScreen;
-        pScrn->driverPrivate = (void*)sst;
-        /*
-         * XXX This is a hack because don't have the PCI info.  Set it as
-         * an ISA entity with no resources.
-         */
         entity = xf86ClaimIsaSlot(drv, 0, dev, TRUE);
-        xf86ConfigActiveIsaEntity(pScrn, entity, NULL, NULL, NULL, NULL, NULL,
-                                  NULL);
-        foundScreen = TRUE;
+        pScrn = NULL;
+
+        /* Allocate a ScrnInfoRec and claim the slot */
+        if ((pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, NULL,
+					       NULL, NULL, NULL, NULL))) {
+	    
+	    /* I'm not going to "claim" the glide device since no other driver than this can drive it */
+	    /* (A glide device is not a PCI device) */
+	    /* XXX Need to see how this fits in with the new RAC */
+	    
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = VERSION;
+	    pScrn->driverName    = GLIDE_DRIVER_NAME;
+	    pScrn->name          = GLIDE_NAME;
+	    pScrn->Probe	 = GLIDEProbe;
+	    pScrn->PreInit	 = GLIDEPreInit;
+	    pScrn->ScreenInit    = GLIDEScreenInit;
+	    pScrn->EnterVT	 = GLIDEEnterVT;
+	    pScrn->LeaveVT	 = GLIDELeaveVT;
+	    pScrn->FreeScreen    = GLIDEFreeScreen;
+	    pScrn->driverPrivate = (void*)sst;
+	    /*
+	     * XXX This is a hack because don't have the PCI info.  Set it as
+	     * an ISA entity with no resources.
+	     */
+	    foundScreen = TRUE;
+	}
         break;
       }
     }
   }
 
-cleanup:
+ cleanup:
   if (devList) xfree(devList);
   return foundScreen;
 }
@@ -574,7 +576,7 @@
 
   /* Set up clock ranges so that the xf86ValidateModes() function will not fail a mode because of the clock
      requirement (because we don't use the clock value anyway) */
-  clockRanges = xnfalloc(sizeof(ClockRange));
+  clockRanges = xnfcalloc(sizeof(ClockRange), 1);
   clockRanges->next = NULL;
   clockRanges->minClock = 10000;
   clockRanges->maxClock = 300000;
@@ -1012,7 +1014,7 @@
 
 
 #define GLIDE_FIND_FUNC(x) \
-  p##x = (p##x##_t)LoaderSymbol(#x); \
+  p##x = (p##x##_t)xf86LoaderCheckSymbol(#x); \
   if (!p##x) \
   { \
     xf86Msg(X_ERROR, "Could not find " #x "() in libglide2x.so.\n"); \
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile:1.22 xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile:1.28
--- xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile:1.22	Thu Mar  2 17:05:37 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile	Mon Jun 12 03:11:37 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile,v 1.22 2000/03/03 01:05:37 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile,v 1.28 2000/06/12 10:11:37 alanh Exp $
 XCOMM
 XCOMM This is an Imakefile for the GLINT driver.  
 XCOMM
@@ -14,10 +14,12 @@
 
 SRCS = glint_driver.c pm2_dac.c pm2ramdac.c pm2_accel.c pm_dac.c IBMramdac.c \
        pm_accel.c tx_dac.c tx_accel.c pm2v_dac.c pm2vramdac.c pm2_video.c \
-       TIramdac.c dualmx_dac.c dualmx_accel.c glint_shadow.c $(DRISRC)
+       pm3_dac.c pm3_accel.c TIramdac.c dualmx_dac.c dualmx_accel.c \
+       glint_shadow.c $(DRISRC) sx_accel.c TIdualramdac.c glint_dga.c
 OBJS = glint_driver.o pm2_dac.o pm2ramdac.o pm2_accel.o pm_dac.o IBMramdac.o \
        pm_accel.o tx_dac.o tx_accel.o pm2v_dac.o pm2vramdac.o pm2_video.o \
-       TIramdac.o dualmx_dac.o dualmx_accel.o glint_shadow.o $(DRIOBJ)
+       pm3_dac.o pm3_accel.o TIramdac.o dualmx_dac.o dualmx_accel.o \
+       glint_shadow.o $(DRIOBJ) sx_accel.o TIdualramdac.o glint_dga.o
 
 #if defined(XF86DriverSDK)
 INCLUDES = -I. -I../../include
@@ -33,10 +35,10 @@
            -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
 	   -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(EXTINCSRC) $(DRIINCLUDES) \
 	   -I$(XF86SRC)/shadowfb -I$(XF86SRC)/fbdevhw \
-	   -I$(XTOP)/include
+	   -I$(XTOP)/include -I$(XF86OSSRC)/vbe
 #endif
 
-DEFINES = $(GLX_DEFINES)
+DEFINES = $(GLX_DEFINES) -DPPC_MMIO_IS_BE
 
 #if MakeHasPosixVariableSubstitutions
 SubdirLibraryRule($(OBJS))
@@ -58,6 +60,7 @@
 InstallDriverSDKNonExecFile(IBMramdac.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(TIramdac.c,$(DRIVERSDKDIR)/drivers/glint)
+InstallDriverSDKNonExecFile(TIdualramdac.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(dualmx_accel.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(dualmx_dac.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(glint.h,$(DRIVERSDKDIR)/drivers/glint)
@@ -65,6 +68,7 @@
 InstallDriverSDKNonExecFile(glint_dri.h,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(glint_dripriv.h,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(glint_driver.c,$(DRIVERSDKDIR)/drivers/glint)
+InstallDriverSDKNonExecFile(glint_dga.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(glint_regs.h,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(glint_shadow.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(pm2_accel.c,$(DRIVERSDKDIR)/drivers/glint)
@@ -73,9 +77,12 @@
 InstallDriverSDKNonExecFile(pm2ramdac.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(pm2v_dac.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(pm2vramdac.c,$(DRIVERSDKDIR)/drivers/glint)
+InstallDriverSDKNonExecFile(pm3_dac.c,$(DRIVERSDKDIR)/drivers/glint)
+InstallDriverSDKNonExecFile(pm3_accel.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(pm_accel.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(pm_dac.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(tx_accel.c,$(DRIVERSDKDIR)/drivers/glint)
 InstallDriverSDKNonExecFile(tx_dac.c,$(DRIVERSDKDIR)/drivers/glint)
+InstallDriverSDKNonExecFile(sx_accel.c,$(DRIVERSDKDIR)/drivers/glint)
 
 InstallDriverSDKObjectModule(glint,$(DRIVERSDKMODULEDIR),drivers)
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3:1.1
--- /dev/null	Sat Jul  1 20:42:50 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3	Tue Jun 13 16:34:38 2000
@@ -0,0 +1,55 @@
+STATUS as of Sat, 10 Jun 2000 13:43:50 +0200.
+
+Known problems :
+
+  * Dual head : worked with 4.0a, but got broken in 4.0b
+  * Depth 8 with 8bpp : Tested only upto 1280x1024 as my monitor don't support
+    higher modes.
+  * Depth 15, 16 with 16 bpp : Modes above 1024x768 show a partial overlap
+    of the screen on the right.
+  * Depth 24 with 32 bpp : left half of the screen is repeated on the
+    right half.
+  * 2D Accel : only clipping pseudo accel is working. 
+  * Video overlay : not supported by pm3 yet.
+
+Unaccelerated video modes :
+
+  * [OK] Depths 8 is working upto 1280x1024 (didn't test higher modes).
+  * [PROBLEM] Depth 15 and 16 are working up to 1024x768 modes. Higher modes
+    show a partial overlap of the screen on the right.
+  * [PROBLEM] Depth 24, 32 bpp : the screen is repeated in the second half 
+  * [NEED HELP] Dot clock is 300MHz. I see pm2 is lowering dotclock for
+    24 & 32 bpp. I did the same for now, but don't know if it is the right.
+
+Hardware features :
+
+  * [OK] HW cursor & ShadowFb works.
+
+Video Overlay : 
+
+  * [NOTHING DONE] Video Overlay is untested. nothing has been done here.
+
+2D Accels :
+
+  * [NEED MORE WORK] only clipping pseudo accel is enabled, it makes a
+    difference in some case, as for example the Gnome logout anim.
+    True accels need more work, especially accel engine setup need to be 
+    done with pm3 values.
+
+Dual head :
+
+  * [NEW PROBLEM] Dual head got broken in 4.0b. Culprit is the pci slot
+    claiming code in GLINTProbe, around line 700 of glint_driver.c
+  * [OK] Dual head did working fine, just, i didn't know how to make
+    enlightenment use both heads (:0.0 and :0.1). 3.3.6 twm has also
+    problems with this, should use 4.0 twm instead maybe.
+  * [SOLUTION] I need to make a XF86Config with orientation of various screens.
+
+  * [NEED TESTING ON NON J2000 BOARD] Second head of Jeronimo 2000 is not
+    initialized by the bios, So memory timings need to be set. I set them only
+    if subsysVendor & subsysCard are matching J2000. Need feedback of other
+    dual pm3 boards.
+
+
+
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.1 2000/06/13 23:34:38 dawes Exp $ */
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/TIdualramdac.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/glint/TIdualramdac.c:1.1
--- /dev/null	Sat Jul  1 20:42:50 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/TIdualramdac.c	Tue Mar 21 13:46:27 2000
@@ -0,0 +1,133 @@
+/*
+ * Copyright 1998 by Alan Hourihane, Wigan, England.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ *
+ * Modified from IBMramdac.c to support TI RAMDAC routines 
+ *   by Jens Owen, <jens@precisioninsight.com>.
+ *
+ * glintOutTIIndReg() and glintInTIIndReg() are used to access 
+ * the indirect TI RAMDAC registers only.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIdualramdac.c,v 1.1 2000/03/21 21:46:27 alanh Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+
+#include "TI.h"
+#include "glint_regs.h"
+#include "glint.h"
+
+#define TI_WRITE_ADDR            0x4000  
+#define TI_RAMDAC_DATA           0x4008 
+#define TI_PIXEL_MASK            0x4010 
+#define TI_READ_ADDR             0x4018  
+#define TI_CURS_COLOR_WRITE_ADDR 0x4020 
+#define TI_CURS_COLOR_DATA       0x4028 
+#define TI_CURS_COLOR_READ_ADDR  0x4038 
+#define TI_DIRECT_CURS_CTRL      0x4048 
+#define TI_INDEX_DATA            0x4050 
+#define TI_CURS_RAM_DATA         0x4058 
+#define TI_CURS_X_LOW            0x4060 
+#define TI_CURS_X_HIGH           0x4068 
+#define TI_CURS_Y_LOW            0x4070 
+#define TI_CURS_Y_HIGH           0x4078 
+
+void
+DUALglintOutTIIndReg(ScrnInfoPtr pScrn,
+		     CARD32 reg, unsigned char mask, unsigned char data)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    unsigned char tmp = 0x00;
+    int offset;
+
+    if ((reg & 0xf0) == 0xa0) { /* this is really a direct register write */
+	offset = TI_WRITE_ADDR + ((reg & 0xf) << 3);
+	if (mask != 0x00)
+	    tmp = GLINT_SECONDARY_READ_REG(offset) & mask;
+
+	GLINT_SECONDARY_SLOW_WRITE_REG(tmp | data, offset);
+    }
+    else { /* normal indirect access */
+	GLINT_SECONDARY_SLOW_WRITE_REG(reg & 0xFF, TI_WRITE_ADDR);
+
+	if (mask != 0x00)
+	    tmp = GLINT_SECONDARY_READ_REG(TI_INDEX_DATA) & mask;
+
+	GLINT_SECONDARY_SLOW_WRITE_REG(tmp | data, TI_INDEX_DATA);
+    }
+}
+
+unsigned char
+DUALglintInTIIndReg (ScrnInfoPtr pScrn, CARD32 reg)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    unsigned char ret;
+    int offset;
+
+    if ((reg & 0xf0) == 0xa0) { /* this is really a direct register write */
+	offset = TI_WRITE_ADDR + ((reg & 0xf) << 3);
+	ret = GLINT_SECONDARY_READ_REG(offset);
+    }
+    else { /* normal indirect access */
+	GLINT_SECONDARY_SLOW_WRITE_REG(reg & 0xFF, TI_WRITE_ADDR);
+	ret = GLINT_SECONDARY_READ_REG(TI_INDEX_DATA);
+    }
+
+    return (ret);
+}
+
+void
+DUALglintTIWriteAddress (ScrnInfoPtr pScrn, CARD32 index)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    
+    GLINT_SECONDARY_SLOW_WRITE_REG(index, TI_WRITE_ADDR);
+}
+
+void
+DUALglintTIWriteData (ScrnInfoPtr pScrn, unsigned char data)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    
+    GLINT_SECONDARY_SLOW_WRITE_REG(data, TI_RAMDAC_DATA);
+}
+
+void
+DUALglintTIReadAddress (ScrnInfoPtr pScrn, CARD32 index)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    
+    GLINT_SECONDARY_SLOW_WRITE_REG(0xFF, TI_PIXEL_MASK);
+    GLINT_SECONDARY_SLOW_WRITE_REG(index, TI_READ_ADDR);
+}
+
+unsigned char
+DUALglintTIReadData (ScrnInfoPtr pScrn)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    
+    return(GLINT_SECONDARY_READ_REG(TI_RAMDAC_DATA));
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c:1.2	Tue Feb 22 20:47:06 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c	Tue Mar 21 13:46:27 2000
@@ -27,7 +27,7 @@
  * glintOutTIIndReg() and glintInTIIndReg() are used to access 
  * the indirect TI RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c,v 1.2 2000/02/23 04:47:06 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c,v 1.3 2000/03/21 21:46:27 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -66,17 +66,17 @@
     if ((reg & 0xf0) == 0xa0) { /* this is really a direct register write */
 	offset = TI_WRITE_ADDR + ((reg & 0xf) << 3);
 	if (mask != 0x00)
-	    tmp = GLINT_SECONDARY_READ_REG(offset) & mask;
+	    tmp = GLINT_READ_REG(offset) & mask;
 
-	GLINT_SECONDARY_SLOW_WRITE_REG(tmp | data, offset);
+	GLINT_SLOW_WRITE_REG(tmp | data, offset);
     }
     else { /* normal indirect access */
-	GLINT_SECONDARY_SLOW_WRITE_REG(reg & 0xFF, TI_WRITE_ADDR);
+	GLINT_SLOW_WRITE_REG(reg & 0xFF, TI_WRITE_ADDR);
 
 	if (mask != 0x00)
-	    tmp = GLINT_SECONDARY_READ_REG(TI_INDEX_DATA) & mask;
+	    tmp = GLINT_READ_REG(TI_INDEX_DATA) & mask;
 
-	GLINT_SECONDARY_SLOW_WRITE_REG(tmp | data, TI_INDEX_DATA);
+	GLINT_SLOW_WRITE_REG(tmp | data, TI_INDEX_DATA);
     }
 }
 
@@ -89,11 +89,11 @@
 
     if ((reg & 0xf0) == 0xa0) { /* this is really a direct register write */
 	offset = TI_WRITE_ADDR + ((reg & 0xf) << 3);
-	ret = GLINT_SECONDARY_READ_REG(offset);
+	ret = GLINT_READ_REG(offset);
     }
     else { /* normal indirect access */
-	GLINT_SECONDARY_SLOW_WRITE_REG(reg & 0xFF, TI_WRITE_ADDR);
-	ret = GLINT_SECONDARY_READ_REG(TI_INDEX_DATA);
+	GLINT_SLOW_WRITE_REG(reg & 0xFF, TI_WRITE_ADDR);
+	ret = GLINT_READ_REG(TI_INDEX_DATA);
     }
 
     return (ret);
@@ -104,7 +104,7 @@
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
     
-    GLINT_SECONDARY_SLOW_WRITE_REG(index, TI_WRITE_ADDR);
+    GLINT_SLOW_WRITE_REG(index, TI_WRITE_ADDR);
 }
 
 void
@@ -112,7 +112,7 @@
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
     
-    GLINT_SECONDARY_SLOW_WRITE_REG(data, TI_RAMDAC_DATA);
+    GLINT_SLOW_WRITE_REG(data, TI_RAMDAC_DATA);
 }
 
 void
@@ -120,8 +120,8 @@
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
     
-    GLINT_SECONDARY_SLOW_WRITE_REG(0xFF, TI_PIXEL_MASK);
-    GLINT_SECONDARY_SLOW_WRITE_REG(index, TI_READ_ADDR);
+    GLINT_SLOW_WRITE_REG(0xFF, TI_PIXEL_MASK);
+    GLINT_SLOW_WRITE_REG(index, TI_READ_ADDR);
 }
 
 unsigned char
@@ -129,7 +129,7 @@
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
     
-    return(GLINT_SECONDARY_READ_REG(TI_RAMDAC_DATA));
+    return(GLINT_READ_REG(TI_RAMDAC_DATA));
 }
 
 Bool 
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_accel.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_accel.c:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_accel.c:1.6	Tue Feb 22 20:47:06 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_accel.c	Wed Jun 21 06:35:51 2000
@@ -28,7 +28,7 @@
  * Modified version of tx_accel.c to support dual MX chips by
  *   Jens Owen, <jens@precisioninsight.com>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_accel.c,v 1.6 2000/02/23 04:47:06 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_accel.c,v 1.9 2000/06/21 13:35:51 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -105,7 +105,6 @@
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
     pGlint->rasterizerMode = RMMultiGLINT;
-    pGlint->pprod |= FBRM_ScanlineInt2;
 
     /* Initialize the Accelerator Engine to defaults */
 
@@ -120,8 +119,10 @@
     /* Make sure the rest of the register writes go to both MX's */
     GLINT_SLOW_WRITE_REG(3, BroadcastMask);
 
+    GLINT_SLOW_WRITE_REG(pGlint->rasterizerMode, RasterizerMode);
     GLINT_SLOW_WRITE_REG(UNIT_DISABLE, ScissorMode);
-    GLINT_SLOW_WRITE_REG(pGlint->pprod,	LBReadMode);
+    GLINT_SLOW_WRITE_REG(pGlint->pprod | LBRM_ScanlineInt2,	LBReadMode);
+    pGlint->pprod |= FBRM_ScanlineInt2;
     GLINT_SLOW_WRITE_REG(pGlint->pprod,	FBReadMode);
     GLINT_SLOW_WRITE_REG(0, dXSub);
     GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LBWriteMode);
@@ -149,7 +150,6 @@
     GLINT_SLOW_WRITE_REG(0x400,		FilterMode);
     GLINT_SLOW_WRITE_REG(0xffffffff,	FBHardwareWriteMask);
     GLINT_SLOW_WRITE_REG(0xffffffff,	FBSoftwareWriteMask);
-    GLINT_SLOW_WRITE_REG(pGlint->rasterizerMode, RasterizerMode);
     GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	GLINTDepth);
     GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBSourceOffset);
     GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBPixelOffset);
@@ -172,6 +172,7 @@
 	    GLINT_SLOW_WRITE_REG(0x0,	PixelSize);
 	    break;
     }
+
     pGlint->ROP = 0xFF;
     pGlint->ClippingOn = FALSE;
     pGlint->startxsub = 0;
@@ -212,32 +213,34 @@
     infoPtr->SetClippingRectangle = DualMXSetClippingRectangle;
     infoPtr->DisableClipping = DualMXDisableClipping;
     infoPtr->ClippingFlags = HARDWARE_CLIP_MONO_8x8_FILL |
+#if 0
 			     HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY |
+#endif
 			     HARDWARE_CLIP_SOLID_FILL;
 
     infoPtr->SolidFillFlags = 0;
     infoPtr->SetupForSolidFill = DualMXSetupForFillRectSolid;
     infoPtr->SubsequentSolidFillRect = DualMXSubsequentFillRectSolid;
 
-    /*
-     * The following optimized routines are copied from tx_accel.c, 
-     * but haven't been ported to a dual MX board. 
-     */
-#ifdef NOT_DONE 
     infoPtr->SolidLineFlags = 0;
     infoPtr->PolySegmentThinSolidFlags = 0;
     infoPtr->PolylinesThinSolidFlags = 0;
     infoPtr->SetupForSolidLine = DualMXSetupForSolidLine;
     infoPtr->SubsequentSolidHorVertLine = DualMXSubsequentHorVertLine;
-    infoPtr->SubsequentSolidBresenhamLine = 
+    if (!(pScrn->overlayFlags & OVERLAY_8_32_PLANAR))
+    {
+        infoPtr->SubsequentSolidBresenhamLine = 
 					DualMXSubsequentSolidBresenhamLine;
+    }
     infoPtr->PolySegmentThinSolid = DualMXPolySegmentThinSolidWrapper;
     infoPtr->PolylinesThinSolid = DualMXPolylinesThinSolidWrapper;
 
+#if 0
     infoPtr->ScreenToScreenCopyFlags = NO_TRANSPARENCY |
 				       ONLY_LEFT_TO_RIGHT_BITBLT;
     infoPtr->SetupForScreenToScreenCopy = DualMXSetupForScreenToScreenCopy;
     infoPtr->SubsequentScreenToScreenCopy = DualMXSubsequentScreenToScreenCopy;
+#endif
 
     infoPtr->Mono8x8PatternFillFlags = HARDWARE_PATTERN_PROGRAMMED_ORIGIN |
 				       HARDWARE_PATTERN_SCREEN_ORIGIN |
@@ -246,6 +249,7 @@
     infoPtr->SubsequentMono8x8PatternFillRect = 
 				    DualMXSubsequentMono8x8PatternFillRect;
 
+#if 0
     if (!pGlint->UsePCIRetry) {
         infoPtr->ScanlineCPUToScreenColorExpandFillFlags = 
 					       TRANSPARENCY_ONLY |
@@ -285,6 +289,7 @@
         infoPtr->SubsequentCPUToScreenColorExpandFill = 
 				DualMXSubsequentCPUToScreenColorExpandFill;
     } 
+#endif
 
     infoPtr->ColorExpandRange = MAX_FIFO_ENTRIES;
 
@@ -299,7 +304,6 @@
 					  pScrn->bitsPerPixel / 8);
 
     xf86InitFBManager(pScreen, &AvailFBArea);
-#endif /* NOT_DONE */
 
     return (XAAInit(pScreen, infoPtr));
 }
@@ -312,11 +316,6 @@
 ){
     GLINTPtr pGlint = GLINTPTR(pScrn);
     
-    /*
-     * Optimization from tx_accel.c where these values are cached on the
-     * host doesn't appear to work.  We definitely need to reload at least
-     * the StartXDom value.  I'll play it safe and reload them all.
-     */
     GLINT_WRITE_REG(w<<16, StartXSub);
     GLINT_WRITE_REG(x<<16,StartXDom);
     GLINT_WRITE_REG(y<<16,StartY);
@@ -686,14 +685,15 @@
     if (pGlint->FrameBufferReadMode != -1) {
 	if (pGlint->ROP == GXcopy) {
 	  GLINT_WRITE_REG(pGlint->BackGroundColor, FBBlockColor);
-	  GLINT_WRITE_REG(PrimitiveTrapezoid | FastFillEnable,Render);
+	  span = 0;
 	} else {
   	  GLINT_WRITE_REG(pGlint->BackGroundColor, PatternRamData0);
-	  GLINT_WRITE_REG(2<<1|2<<4|patternx<<7|patterny<<12|ASM_InvertPattern |
+	  span = SpanOperation;
+	}
+	GLINT_WRITE_REG(2<<1|2<<4|patternx<<7|patterny<<12|ASM_InvertPattern |
 					UNIT_ENABLE, AreaStippleMode);
-	  GLINT_WRITE_REG(AreaStippleEnable | SpanOperation | FastFillEnable | 
+	GLINT_WRITE_REG(AreaStippleEnable | span | FastFillEnable | 
 						PrimitiveTrapezoid, Render);
-	}
     }
 
     if (pGlint->ROP == GXcopy) {
@@ -932,6 +932,7 @@
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
     GLINTPtr pGlint = GLINTPTR(infoRec->pScrn);
     pGlint->CurrentGC = pGC;
+    pGlint->CurrentDrawable = pDraw;
     if(infoRec->NeedToSync) (*infoRec->Sync)(infoRec->pScrn);
     XAAPolySegment(pDraw, pGC, nseg, pSeg);
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_dac.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_dac.c:1.3 xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_dac.c:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_dac.c:1.3	Tue Feb 22 20:47:07 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_dac.c	Wed May 10 11:55:28 2000
@@ -27,7 +27,7 @@
  * Modified version of tx_dac.c to support Dual MX rasterizers by 
  *   Jens Owen <jens@precisioninsight.com>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_dac.c,v 1.3 2000/02/23 04:47:07 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/dualmx_dac.c,v 1.4 2000/05/10 18:55:28 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -36,10 +36,12 @@
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 
+#include "IBM.h"
 #include "TI.h"
 #include "glint_regs.h"
 #include "glint.h"
 
+#define DEBUG
 #ifdef DEBUG
 #define DUMP(name,field) do {                                             \
     value = GLINT_READ_REG(field);                                        \
@@ -389,7 +391,11 @@
     GLINTPtr pGlint = GLINTPTR(pScrn);
     int logbytesperaccess;
 
-    logbytesperaccess = 4;
+    if ( (pGlint->RamDac->RamDacType == (IBM640_RAMDAC)) ||
+         (pGlint->RamDac->RamDacType == (TI3030_RAMDAC)) )
+    	logbytesperaccess = 4;
+    else
+    	logbytesperaccess = 3;
 	
     switch (pScrn->bitsPerPixel) {
     case 8:
@@ -431,11 +437,14 @@
     pReg->glintRegs[Aperture1 >> 3] = 0;
 
     if (pGlint->UsePCIRetry) {
-	pReg->glintRegs[DFIFODis >> 3] = 1;
-	pReg->glintRegs[FIFODis >> 3] = 3;
+	pReg->glintRegs[DFIFODis >> 3] = GLINT_READ_REG(DFIFODis) | 0x01;
+    	if (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)
+	    pReg->glintRegs[FIFODis >> 3] = GLINT_READ_REG(FIFODis) | 0x01;
+	else
+	    pReg->glintRegs[FIFODis >> 3] = GLINT_READ_REG(FIFODis) | 0x03;
     } else {
-	pReg->glintRegs[DFIFODis >> 3] = 0;
-	pReg->glintRegs[FIFODis >> 3] = 1;
+	pReg->glintRegs[DFIFODis >> 3] = GLINT_READ_REG(DFIFODis) & 0xFFFFFFFE;
+	pReg->glintRegs[FIFODis >> 3] = GLINT_READ_REG(FIFODis) | 0x01;
     }
 
     temp1 = mode->CrtcHSyncStart - mode->CrtcHDisplay;
@@ -454,21 +463,25 @@
     pReg->glintRegs[VTGVSyncStart >> 3] = temp2;
     pReg->glintRegs[VTGVBlankEnd >> 3] = mode->CrtcVTotal - mode->CrtcVDisplay;
 
+#if 1 /* We force them high */
+    pReg->glintRegs[VTGPolarity >> 3] = 0xBA;
+#else
     pReg->glintRegs[VTGPolarity >> 3] = (((mode->Flags & V_PHSYNC) ? 0:2)<<2) |
 			     ((mode->Flags & V_PVSYNC) ? 0 : 2) | (0xb0);
+#endif
 
-    pReg->glintRegs[VClkCtl >> 3] = 0; 
+    pReg->glintRegs[VClkCtl >> 3] = 0;
     pReg->glintRegs[VTGVGateStart >> 3] = pReg->glintRegs[VTGVBlankEnd>>3] - 1; 
     pReg->glintRegs[VTGVGateEnd >> 3] = pReg->glintRegs[VTGVBlankEnd>>3];
     /*
      * tell DAC to use the ICD chip clock 0 as ref clock 
-     * and set up some more video timining generator registers
+     * and set up some more video timing generator registers
      */
     pReg->glintRegs[VTGHGateStart >> 3] = pReg->glintRegs[VTGHBlankEnd>>3] - 1;
     pReg->glintRegs[VTGHGateEnd >> 3] = pReg->glintRegs[VTGHLimit>>3] - 1;
-    pReg->glintRegs[VTGSerialClk >> 3] = 0x0002; 
-    pReg->glintRegs[FBModeSel >> 3] = 0x0907;
-    pReg->glintRegs[VTGModeCtl >> 3] = 0x00;
+    pReg->glintRegs[VTGSerialClk >> 3] = 0x0002;
+    pReg->glintRegs[FBModeSel >> 3] = 0x907;
+    pReg->glintRegs[VTGModeCtl >> 3] = 0x04;
 
     /*
      * Setup memory control registers for FB and LB
@@ -498,9 +511,27 @@
 					  (0x20 << LBRefreshCountShift));
     pReg->glintRegs[GCSRAperture >> 3] = GCSRSecondaryGLINTMapEn;
 
+    /* 
+     * Setup HW 
+     * 
+     * Note: The order of discovery for the MX devices is dependent
+     * on which way the resource allocation code decides to scan the
+     * bus.  This setup assumes the first MX found owns the even
+     * scanlines.  Should the implementation change an scan the bus
+     * in the opposite direction, then simple invert the indices for
+     * MXPciInfo below.  If this is setup wrong, the bug will appear
+     * as incorrect scanline interleaving when software rendering.
+     */
+    pReg->glintRegs[GMultGLINTAperture >> 3] = pGlint->realMXWidth;
+    pReg->glintRegs[GMultGLINT1 >> 3] = 
+				pGlint->MXPciInfo[0]->memBase[2] & 0xFF800000;
+    pReg->glintRegs[GMultGLINT2 >> 3] = 
+				pGlint->MXPciInfo[1]->memBase[2] & 0xFF800000;
+
     /* Copy info to secondary regs */
     pReg->glintSecondRegs[Aperture0>>3]     = pReg->glintRegs[Aperture0>>3];
     pReg->glintSecondRegs[Aperture1>>3]     = pReg->glintRegs[Aperture1>>3];
+
     pReg->glintSecondRegs[DFIFODis>>3]      = pReg->glintRegs[DFIFODis>>3];
     pReg->glintSecondRegs[FIFODis>>3]       = pReg->glintRegs[FIFODis>>3];
     pReg->glintSecondRegs[VTGHLimit>>3]     = pReg->glintRegs[VTGHLimit>>3];
@@ -524,9 +555,14 @@
     pReg->glintSecondRegs[LBMemoryEDO>>3]   = pReg->glintRegs[LBMemoryEDO>>3];
     pReg->glintSecondRegs[LBMemoryCtl>>3]   = pReg->glintRegs[LBMemoryCtl>>3];
     pReg->glintSecondRegs[GCSRAperture>>3]  = pReg->glintRegs[GCSRAperture>>3];
+    pReg->glintSecondRegs[GMultGLINTAperture>>3] = 
+					pReg->glintRegs[GMultGLINTAperture>>3];
+    pReg->glintSecondRegs[GMultGLINT1>>3]   = pReg->glintRegs[GMultGLINT1>>3];
+    pReg->glintSecondRegs[GMultGLINT2>>3]   = pReg->glintRegs[GMultGLINT2>>3];
 
     switch (pGlint->RamDac->RamDacType) {
     case TI3030_RAMDAC:
+    case TI3026_RAMDAC:
 	{
 	    /* Get the programmable clock values */
 	    unsigned long m=0,n=0,p=0;
@@ -542,7 +578,10 @@
 	    ramdacReg->DacRegs[TIDAC_PIXEL_P] = ((p & 0x03) | 0xb0);
 	    ramdacReg->DacRegs[TIDAC_PIXEL_VALID] = TRUE;
 
-            n = 65 - ((128 << 2) / pScrn->bitsPerPixel);
+    	    if (pGlint->RamDac->RamDacType == (TI3026_RAMDAC))
+                n = 65 - ((64 << 2) / pScrn->bitsPerPixel);
+	    else
+                n = 65 - ((128 << 2) / pScrn->bitsPerPixel);
 	    m = 61;
 	    p = 0;
 	    for (q = 0; q < 8; q++) {
@@ -601,6 +640,10 @@
     glintReg->glintRegs[LBMemoryEDO >> 3] = GLINT_READ_REG(LBMemoryEDO);
     glintReg->glintRegs[LBMemoryCtl >> 3] = GLINT_READ_REG(LBMemoryCtl);
     glintReg->glintRegs[GCSRAperture >> 3] = GLINT_READ_REG(GCSRAperture);
+    glintReg->glintRegs[GMultGLINTAperture>>3] = 
+					GLINT_READ_REG(GMultGLINTAperture);
+    glintReg->glintRegs[GMultGLINT1>>3] = GLINT_READ_REG(GMultGLINT1);
+    glintReg->glintRegs[GMultGLINT2>>3] = GLINT_READ_REG(GMultGLINT2);
 
     glintReg->glintSecondRegs[Aperture0 >> 3] = 
 	GLINT_SECONDARY_READ_REG(Aperture0);
@@ -654,6 +697,12 @@
 	GLINT_SECONDARY_READ_REG(LBMemoryCtl);
     glintReg->glintSecondRegs[GCSRAperture >> 3] = 
 	GLINT_SECONDARY_READ_REG(GCSRAperture);
+    glintReg->glintSecondRegs[GMultGLINTAperture>>3] = 
+	GLINT_SECONDARY_READ_REG(GMultGLINTAperture);
+    glintReg->glintSecondRegs[GMultGLINT1>>3] = 
+	GLINT_SECONDARY_READ_REG(GMultGLINT1);
+    glintReg->glintSecondRegs[GMultGLINT2>>3] = 
+	GLINT_SECONDARY_READ_REG(GMultGLINT2);
 }
 
 void
@@ -694,6 +743,10 @@
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[LBMemoryEDO >> 3], LBMemoryEDO);
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[LBMemoryCtl >> 3], LBMemoryCtl);
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[GCSRAperture >> 3], GCSRAperture);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[GMultGLINTAperture >> 3], 
+							GMultGLINTAperture);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[GMultGLINT1 >> 3], GMultGLINT1);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[GMultGLINT2 >> 3], GMultGLINT2);
 
     GLINT_SECONDARY_SLOW_WRITE_REG(
 	glintReg->glintSecondRegs[Aperture0 >> 3], Aperture0);
@@ -743,6 +796,12 @@
 	glintReg->glintSecondRegs[LBMemoryEDO >> 3], LBMemoryEDO);
     GLINT_SECONDARY_SLOW_WRITE_REG(
 	glintReg->glintSecondRegs[LBMemoryCtl >> 3], LBMemoryCtl);
+    GLINT_SECONDARY_SLOW_WRITE_REG(
+    	glintReg->glintSecondRegs[GCSRAperture >> 3], GCSRAperture);
+    GLINT_SECONDARY_SLOW_WRITE_REG(
+	glintReg->glintSecondRegs[GMultGLINTAperture >>3], GMultGLINTAperture); 
+    GLINT_SECONDARY_SLOW_WRITE_REG(
+	glintReg->glintSecondRegs[GMultGLINT1 >> 3], GMultGLINT1);
     GLINT_SECONDARY_SLOW_WRITE_REG(
-    	glintReg->glintRegs[GCSRAperture >> 3], GCSRAperture);
+	glintReg->glintSecondRegs[GMultGLINT2 >> 3], GMultGLINT2);
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/glint.cpp:1.2 xc/programs/Xserver/hw/xfree86/drivers/glint/glint.cpp:1.7
--- xc/programs/Xserver/hw/xfree86/drivers/glint/glint.cpp:1.2	Mon Mar  6 17:37:46 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint.cpp	Tue Jun 13 19:13:09 2000
@@ -1,28 +1,32 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.cpp,v 1.2 2000/03/07 01:37:46 dawes Exp $ 
-.TH GLINT __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.cpp,v 1.7 2000/06/14 02:13:09 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH GLINT __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 glint \- GLINT/Permedia video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""glint"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qglint\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B glint 
 is an XFree86 driver for 3Dlabs & Texas Instruments GLINT/Permedia based video
 cards. The driver is rather fully accelerated, and provides support for the
 following framebuffer depths: 8, 15 (may give bad results with FBDev support),
 16, 24 (32 bpp recommended, 24 bpp has problems), 30, and an 8+24 overlay mode.
+.B Glint permedia 3
+only support depth 8 (tested upto 1280x1024) and 15/16
+(ok upto 1024x768, partial screen overlap on the right at 1280x1024) and acceleration is not yet fully supported.
 .SH SUPPORTED HARDWARE
 The
 .B glint
 driver supports 3Dlabs (GLINT MX, GLINT 500TX, GLINT GAMMA, Permedia,
-Permedia 2, Permedia 2v) and Texas Instruments (Permedia, Permedia 2) chips.
+Permedia 2, Permedia 2v, Permedia 3) and Texas Instruments (Permedia,
+Permedia 2) chips.
 .SH CONFIGURATION DETAILS
 Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
@@ -31,11 +35,11 @@
 The driver auto-detects the chipset type, but the following
 .B ChipSet
 names may optionally be specified in the config file
-.B """Device"""
+.B \*qDevice\*q
 section, and will override the auto-detection:
 .PP
 .RS 4
-"ti_pm2", "ti_pm", "pm2v", "pm2", "pm", "500tx", "mx", "gamma".
+"ti_pm2", "ti_pm", "pm3", "pm2v", "pm2", "pm", "500tx", "mx", "gamma".
 .RE
 .PP
 The driver will try to auto-detect the amount of video memory present for all
@@ -43,70 +47,81 @@
 be specified with a
 .B VideoRam
 entry in the config file
-.B """Device"""
+.B \*qDevice\*q
 section.
 .PP
 Additionally, you may need to specify the bus ID of your card with a
 .B BusID
 entry in the config file
-.B """Device"""
+.B \*qDevice\*q
 section, especially with FBDev support.
 .PP
 The following driver
 .B Options
 are supported:
 .TP
-.BI "Option ""HWCursor"" """ boolean """
+.BI "Option \*qHWCursor\*q \*q" boolean \*q
 Enable or disable the HW cursor.  Default: on.
 .TP
-.BI "Option ""SWCursor"" """ boolean """
+.BI "Option \*qSWCursor\*q \*q" boolean \*q
 Enable or disable the SW cursor.  Default: off.
 This option disables the
 .B HWCursor
 option and vice versa.
 .TP
-.BI "Option ""NoAccel"" """ boolean """
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
 .TP
-.BI "Option ""Overlay""
+.BI "Option \*qOverlay\*q"
 Enable 8+24 overlay mode.  Only appropriate for depth 24, 32 bpp.
 .RB ( Note:
 This hasn't been tested with FBDev support and probably won't work.) 
 Recognized values are: "8,24", "24,8". Default: off.
 .TP
-.BI "Option ""PciRetry"" """ boolean """
+.BI "Option \*qPciRetry\*q \*q" boolean \*q
 Enable or disable PCI retries.
 .RB ( Note:
 This doesn't work with Permedia2 based cards for Amigas.)  Default: off.
 .TP
-.BI "Option ""ShadowFB"" """ boolean """
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  See
 shadowfb(__drivermansuffix__) for further information.
 .RB ( Note:
 This disables hardware acceleration.)  Default: off.
 .TP
-.BI "Option ""UseFBDev"" """ boolean """
+.BI "Option \*qUseFBDev\*q \*q" boolean \*q
 Enable or disable use of an OS-specific fb interface (which is not supported
 on all OSs).  See fbdevhw(__drivermansuffix__) for further information.
 Default: off.
 .ig
 .TP
-.BI "Option ""RGBbits"" """ integer """
+.BI "Option \*qRGBbits\*q \*q" integer \*q
 Each gun of the RGB triple can have either 8 or 10 bits.  Default: 8
 ..
 .TP
-.BI "Option ""BlockWrite"" """ boolean """
+.BI "Option \*qBlockWrite\*q \*q" boolean \*q
 Enable or disable block writes for the various Permedia 2 chips. This improves
 acceleration in general, but disables it for some special cases.  Default: off.
 .TP
-.BI "Option ""FireGL3000"" """ boolean """
+.BI "Option \*qFireGL3000\*q \*q" boolean \*q
 If you have a card of the same name, turn this on.  Default: off.
 .TP
-.BI "Option ""SetMClk"" """ freq """
+.BI "Option \*qSetMClk\*q \*q" freq \*q
 The driver will try to auto-detect the memory clock for all chips.  If it's not
 detected correctly, the actual value (in MHz) should be specified with this
 option.
+.SH Known problems with the Glint Permedia 3 chip
+The
+.B Glint Permedia 3
+chip is newly supported since the 4.0.1 release but is still work in progress.
+The driver supports already unaccelerated modes at depth 8 (tested upto
+1280x1024) and depth 15 and 16 (ok upto 1024x768)
+Depth 24 and Depth 15 and 16 with modes higher than 1024x768 are showing a
+partial overlap of the right part of the screen.
+Acceleration only support clipping pseudo acceleration.
+Dual head for the Appian J2000 board was working but got broken since 4.0b,
+since now the driver claims all chip of the board.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Alan Hourihane, Dirk Hohndel, Stefan Dirsch, Michel Dänzer
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h:1.25 xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h:1.31
--- xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h:1.25	Fri Feb 25 19:33:43 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h	Sat Jun 17 09:32:50 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h,v 1.25 2000/02/26 03:33:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h,v 1.31 2000/06/17 16:32:50 alanh Exp $ */
 /*
  * Copyright 1997,1998 by Alan Hourihane <alanh@fairlite.demon.co.uk>
  *
@@ -48,6 +48,13 @@
 #define GLINT_MAX_MX_DEVICES 2
 #define GLINT_VGA_MMIO_OFF 0x6000
 
+#define VERSION 4000
+#define GLINT_NAME "GLINT"
+#define GLINT_DRIVER_NAME "glint"
+#define GLINT_MAJOR_VERSION 1
+#define GLINT_MINOR_VERSION 0
+#define GLINT_PATCHLEVEL 0
+
 typedef struct {
 	CARD32 glintRegs[0x2000];
 	CARD32 glintSecondRegs[0x2000];
@@ -59,14 +66,10 @@
 
 typedef struct {
     pciVideoPtr		PciInfo;
-    pciVideoPtr		PciInfoGeometry;
     pciVideoPtr		MXPciInfo[GLINT_MAX_MX_DEVICES];
     int			numMXDevices;
     PCITAG		PciTag;
-    PCITAG		PciTagGeometry;
     EntityInfoPtr	pEnt;
-    EntityInfoPtr	pEntGeometry;
-    EntityInfoPtr	pEntMX[GLINT_MAX_MX_DEVICES];
     RamDacHelperRecPtr	RamDac;
     int			MemClock;
     int			Chipset;
@@ -91,6 +94,7 @@
     int			cpuheight;
     int			cpucount;
     int			planemask;
+    int			realMXWidth;
     CARD32		IOAddress;
     CARD32		FbAddress;
     int                 irq;
@@ -98,6 +102,10 @@
     unsigned char *     IOBaseVGA;
     unsigned char *	FbBase;
     long		FbMapSize;
+    DGAModePtr		DGAModes;
+    int			numDGAModes;
+    Bool		DGAactive;
+    int			DGAViewportStatus;
     Bool		DoubleBuffer;
     Bool		NoAccel;
     Bool		FBDev;
@@ -112,12 +120,8 @@
     Bool		UseBlockWrite;
     Bool		UseFireGL3000;
     Bool		VGAcore;
-    int			MultiGLINTApSize;
     int			MXFbSize;
-    int			realMXWidth;
-    CARD32		SecondaryAddress;
     CARD32		rasterizerMode;
-    unsigned char *	SecondaryBase;
     int			MinClock;
     int			MaxClock;
     int			RefClock;
@@ -162,12 +166,18 @@
 			((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA2)
 #define PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V	\
 			((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA2V)
+#define PCI_VENDOR_3DLABS_CHIP_PERMEDIA3	\
+			((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA3)
+#define PCI_VENDOR_3DLABS_CHIP_300SX	\
+			((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_300SX)
 #define PCI_VENDOR_3DLABS_CHIP_500TX	\
 			((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_500TX)
 #define PCI_VENDOR_3DLABS_CHIP_MX	\
 			((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_MX)
 #define PCI_VENDOR_3DLABS_CHIP_GAMMA	\
 			((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_GAMMA)
+#define PCI_VENDOR_3DLABS_CHIP_DELTA	\
+			((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_DELTA)
 
 /* Prototypes */
 
@@ -189,20 +199,38 @@
 void PermediaSave(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
 Bool PermediaInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 Bool PermediaAccelInit(ScreenPtr pScreen);
+void PermediaInitializeEngine(ScrnInfoPtr pScrn);
 void Permedia2VRestore(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
 void Permedia2VSave(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
 Bool Permedia2VInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 Bool Permedia2vHWCursorInit(ScreenPtr pScreen);
 
+/* pm3_dac.c */
+void Permedia3PreInit(ScrnInfoPtr pScrn, GLINTPtr pGlint);
+int Permedia3MemorySizeDetect(ScrnInfoPtr pScrn);
+void Permedia3Restore(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
+void Permedia3Save(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
+Bool Permedia3Init(ScrnInfoPtr pScrn, DisplayModePtr mode);
+Bool Permedia3HWCursorInit(ScreenPtr pScreen);
+/* pm3_accel.c */
+Bool Permedia3AccelInit(ScreenPtr pScreen);
+void Permedia3Sync(ScrnInfoPtr pScrn);
+void Permedia3InitializeEngine(ScrnInfoPtr pScrn);
+/* End of pm3 stuff */
+
 void TXRestore(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
 void TXSave(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
 Bool TXInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 Bool TXAccelInit(ScreenPtr pScreen);
+void TXInitializeEngine(ScrnInfoPtr pScrn);
+
+Bool SXAccelInit(ScreenPtr pScreen);
 
 void DualMXRestore(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
 void DualMXSave(ScrnInfoPtr pScrn, GLINTRegPtr glintReg);
 Bool DualMXInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 Bool DualMXAccelInit(ScreenPtr pScreen);
+void DualMXInitializeEngine(ScrnInfoPtr pScrn);
 
 void glintOutIBMRGBIndReg(ScrnInfoPtr pScrn,
 		     CARD32 reg, unsigned char mask, unsigned char data);
@@ -218,10 +246,17 @@
 void glintOutTIIndReg(ScrnInfoPtr pScrn,
 		     CARD32 reg, unsigned char mask, unsigned char data);
 unsigned char glintInTIIndReg(ScrnInfoPtr pScrn, CARD32 reg);
+void DUALglintOutTIIndReg(ScrnInfoPtr pScrn,
+		     CARD32 reg, unsigned char mask, unsigned char data);
+unsigned char DUALglintInTIIndReg(ScrnInfoPtr pScrn, CARD32 reg);
 void glintTIWriteAddress(ScrnInfoPtr pScrn, CARD32 index);
 void glintTIReadAddress(ScrnInfoPtr pScrn, CARD32 index);
 void glintTIWriteData(ScrnInfoPtr pScrn, unsigned char data);
 unsigned char glintTIReadData(ScrnInfoPtr pScrn);
+void DUALglintTIWriteAddress(ScrnInfoPtr pScrn, CARD32 index);
+void DUALglintTIReadAddress(ScrnInfoPtr pScrn, CARD32 index);
+void DUALglintTIWriteData(ScrnInfoPtr pScrn, unsigned char data);
+unsigned char DUALglintTIReadData(ScrnInfoPtr pScrn);
 Bool glintTIHWCursorInit(ScreenPtr pScreen);
 
 void Permedia2OutIndReg(ScrnInfoPtr pScrn,
@@ -231,6 +266,8 @@
 void Permedia2ReadAddress(ScrnInfoPtr pScrn, CARD32 index);
 void Permedia2WriteData(ScrnInfoPtr pScrn, unsigned char data);
 unsigned char Permedia2ReadData(ScrnInfoPtr pScrn);
+void TIramdacLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+    			  LOCO *colors, VisualPtr pVisual);
 void Permedia2LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
     			  LOCO *colors, VisualPtr pVisual);
 void Permedia2LoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
@@ -239,13 +276,17 @@
 void Permedia2I2CPutBits(I2CBusPtr b, int scl, int sda);
 void Permedia2I2CGetBits(I2CBusPtr b, int *scl, int *sda);
 
-void Permedia2VideoUninit(ScrnInfoPtr pScrn);
-void Permedia2VideoReset(ScrnInfoPtr pScrn);
 void Permedia2VideoInit(ScreenPtr pScreen);
+void Permedia2VideoUninit(ScrnInfoPtr pScrn);
+void Permedia2VideoEnterVT(ScrnInfoPtr pScrn);
+void Permedia2VideoLeaveVT(ScrnInfoPtr pScrn);
 
 void Permedia2vOutIndReg(ScrnInfoPtr pScrn,
 		   CARD32, unsigned char mask, unsigned char data);
 unsigned char Permedia2vInIndReg(ScrnInfoPtr pScrn, CARD32);
+
+Bool GLINTSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+void GLINTAdjustFrame(int scrnIndex, int x, int y, int flags);
 
 extern int partprodPermedia[];
 
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c:1.1
--- /dev/null	Sat Jul  1 20:42:50 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c	Wed May 10 11:55:29 2000
@@ -0,0 +1,294 @@
+/*
+ * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c,v 1.1 2000/05/10 18:55:29 alanh Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Pci.h"
+#include "xf86PciInfo.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "glint.h"
+#include "glint_regs.h"
+#include "dgaproc.h"
+
+static Bool GLINT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+					int *, int *, int *);
+static Bool GLINT_SetMode(ScrnInfoPtr, DGAModePtr);
+static void GLINT_Sync(ScrnInfoPtr);
+static int  GLINT_GetViewport(ScrnInfoPtr);
+static void GLINT_SetViewport(ScrnInfoPtr, int, int, int);
+static void GLINT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+static void GLINT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+static void GLINT_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, 
+					unsigned long);
+
+static
+DGAFunctionRec GLINTDGAFuncs = {
+   GLINT_OpenFramebuffer,
+   NULL,
+   GLINT_SetMode,
+   GLINT_SetViewport,
+   GLINT_GetViewport,
+   GLINT_Sync,
+   GLINT_FillRect,
+   NULL,
+#if 0
+   GLINT_BlitRect,
+   GLINT_BlitTransRect
+#else
+   NULL
+#endif
+};
+
+Bool
+GLINTDGAInit(ScreenPtr pScreen)
+{   
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   GLINTPtr pGlint = GLINTPTR(pScrn);
+   DGAModePtr modes = NULL, newmodes = NULL, currentMode;
+   DisplayModePtr pMode, firstMode;
+   int Bpp = pScrn->bitsPerPixel >> 3;
+   int num = 0;
+   Bool oneMore;
+
+   pMode = firstMode = pScrn->modes;
+
+   while(pMode) {
+
+	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
+	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+	    oneMore = TRUE;
+	} else {
+	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+	    oneMore = FALSE;
+	}
+
+	if(!newmodes) {
+	   xfree(modes);
+	   return FALSE;
+	}
+	modes = newmodes;
+
+SECOND_PASS:
+
+	currentMode = modes + num;
+	num++;
+
+	currentMode->mode = pMode;
+	currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
+	if(!pGlint->NoAccel)
+	   currentMode->flags |= DGA_FILL_RECT /*| DGA_BLIT_RECT*/;
+	if(pMode->Flags & V_DBLSCAN)
+	   currentMode->flags |= DGA_DOUBLESCAN;
+	if(pMode->Flags & V_INTERLACE)
+	   currentMode->flags |= DGA_INTERLACED;
+	currentMode->byteOrder = pScrn->imageByteOrder;
+	currentMode->depth = pScrn->depth;
+	currentMode->bitsPerPixel = pScrn->bitsPerPixel;
+	currentMode->red_mask = pScrn->mask.red;
+	currentMode->green_mask = pScrn->mask.green;
+	currentMode->blue_mask = pScrn->mask.blue;
+	currentMode->visualClass = (Bpp == 1) ? PseudoColor : TrueColor;
+	currentMode->viewportWidth = pMode->HDisplay;
+	currentMode->viewportHeight = pMode->VDisplay;
+	currentMode->xViewportStep = 1;
+	currentMode->yViewportStep = 1;
+	currentMode->viewportFlags = DGA_FLIP_RETRACE;
+	currentMode->offset = 0;
+	currentMode->address = pGlint->FbBase;
+
+	if(oneMore) { /* first one is narrow width */
+	    currentMode->bytesPerScanline = ((pMode->HDisplay * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pMode->HDisplay;
+	    currentMode->imageHeight =  pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	    oneMore = FALSE;
+	    goto SECOND_PASS;
+	} else {
+	    currentMode->bytesPerScanline = 
+			((pScrn->displayWidth * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pScrn->displayWidth;
+	    currentMode->imageHeight =  pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	}	    
+
+	pMode = pMode->next;
+	if(pMode == firstMode)
+	   break;
+   }
+
+   pGlint->numDGAModes = num;
+   pGlint->DGAModes = modes;
+
+   return DGAInit(pScreen, &GLINTDGAFuncs, modes, num);  
+}
+
+
+static Bool
+GLINT_SetMode(
+   ScrnInfoPtr pScrn,
+   DGAModePtr pMode
+){
+   static int OldDisplayWidth[MAXSCREENS];
+   int index = pScrn->pScreen->myNum;
+   GLINTPtr pGlint = GLINTPTR(pScrn);
+
+   if(!pMode) { /* restore the original mode */
+	/* put the ScreenParameters back */
+	
+	pScrn->displayWidth = OldDisplayWidth[index];
+	
+        GLINTSwitchMode(index, pScrn->currentMode, 0);
+	pGlint->DGAactive = FALSE;
+   } else {
+	if(!pGlint->DGAactive) {  /* save the old parameters */
+	    OldDisplayWidth[index] = pScrn->displayWidth;
+
+	    pGlint->DGAactive = TRUE;
+	}
+
+	pScrn->displayWidth = pMode->bytesPerScanline / 
+			      (pMode->bitsPerPixel >> 3);
+
+        GLINTSwitchMode(index, pMode->mode, 0);
+   }
+   
+   return TRUE;
+}
+
+static int  
+GLINT_GetViewport(
+  ScrnInfoPtr pScrn
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    return pGlint->DGAViewportStatus;
+}
+
+static void 
+GLINT_SetViewport(
+   ScrnInfoPtr pScrn, 
+   int x, int y, 
+   int flags
+){
+   GLINTPtr pGlint = GLINTPTR(pScrn);
+
+   GLINTAdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+   pGlint->DGAViewportStatus = 0;  /* GLINTAdjustFrame loops until finished */
+}
+
+static void 
+GLINT_FillRect (
+   ScrnInfoPtr pScrn, 
+   int x, int y, int w, int h, 
+   unsigned long color
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    if(pGlint->AccelInfoRec) {
+	(*pGlint->AccelInfoRec->SetupForSolidFill)(pScrn, color, GXcopy, ~0);
+	(*pGlint->AccelInfoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
+	SET_SYNC_FLAG(pGlint->AccelInfoRec);
+    }
+}
+
+static void 
+GLINT_Sync(
+   ScrnInfoPtr pScrn
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    if(pGlint->AccelInfoRec) {
+	(*pGlint->AccelInfoRec->Sync)(pScrn);
+    }
+}
+
+static void 
+GLINT_BlitRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    if(pGlint->AccelInfoRec) {
+	int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
+	int ydir = (srcy < dsty) ? -1 : 1;
+
+	(*pGlint->AccelInfoRec->SetupForScreenToScreenCopy)(
+		pScrn, xdir, ydir, GXcopy, ~0, -1);
+	(*pGlint->AccelInfoRec->SubsequentScreenToScreenCopy)(
+		pScrn, srcx, srcy, dstx, dsty, w, h);
+	SET_SYNC_FLAG(pGlint->AccelInfoRec);
+    }
+}
+
+
+static void 
+GLINT_BlitTransRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty,
+   unsigned long color
+){
+  /* this one should be separate since the XAA function would
+     prohibit usage of ~0 as the key */
+}
+
+
+static Bool 
+GLINT_OpenFramebuffer(
+   ScrnInfoPtr pScrn, 
+   char **name,
+   unsigned char **mem,
+   int *size,
+   int *offset,
+   int *flags
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    *name = NULL; 		/* no special device */
+    *mem = (unsigned char*)pGlint->FbAddress;
+    *size = pGlint->FbMapSize;
+    *offset = 0;
+    *flags = DGA_NEED_ROOT;
+
+    return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c:1.12 xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c:1.18
--- xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c:1.12	Thu Mar  2 08:07:47 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c	Fri Jun 23 16:43:43 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v 1.12 2000/03/02 16:07:47 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v 1.18 2000/06/23 23:43:43 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -40,11 +40,7 @@
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
-#define PSZ 8
-#include "cfb.h"
-#undef PSZ
-#include "cfb16.h"
-#include "cfb32.h"
+#include "fb.h"
 
 #include "miline.h"
 
@@ -61,19 +57,8 @@
                                 DRIContextType contextStore);
 
 static int 
-GLINTDRIControlInitSingleMX(int drmSubFD, int irq)
+GLINTDRIControlInit(int drmSubFD, int irq)
 {
-    
-    int retcode;
-
-				/* Perhaps add flag to for single mx here? */
-    if ((retcode = drmCtlInstHandler(drmSubFD, irq))) return 1;
-    return 0;
-}
-
-static int 
-GLINTDRIControlInitDualMX(int drmSubFD, int irq)
-{
     int retcode;
 
     if ((retcode = drmCtlInstHandler(drmSubFD, irq))) return 1;
@@ -351,13 +336,28 @@
     GLINTDRIPtr pGlintDRI;
     int dmabufs = 0;
 
-#if XFree86LOADER
     /* Check that the GLX, DRI, and DRM modules have been loaded by testing
        for canonical symbols in each module. */
-    if (!LoaderSymbol("GlxSetVisualConfigs")) return FALSE;
-    if (!LoaderSymbol("DRIScreenInit"))       return FALSE;
-    if (!LoaderSymbol("drmAvailable"))        return FALSE;
-#endif
+    if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
+    if (!xf86LoaderCheckSymbol("DRIScreenInit"))       return FALSE;
+    if (!xf86LoaderCheckSymbol("drmAvailable"))        return FALSE;
+    if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "GLINTDRIScreenInit failed (libdri.a too old)\n");
+      return FALSE;
+    }
+
+    /* Check the DRI version */
+    {
+       int major, minor, patch;
+       DRIQueryVersion(&major, &minor, &patch);
+       if (major != 3 || minor != 0 || patch < 0) {
+          xf86DrvMsg(pScreen->myNum, X_ERROR,
+                     "GLINTDRIScreenInit failed (DRI version = %d.%d.%d, expected 3.0.x).  Disabling DRI.\n",
+                     major, minor, patch);
+          return FALSE;
+       }
+    }
 
     if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA) return FALSE;
 
@@ -377,9 +377,9 @@
 	    ((pciConfigPtr)pGlint->PciInfo->thisCard)->busnum,
 	    ((pciConfigPtr)pGlint->PciInfo->thisCard)->devnum,
 	    ((pciConfigPtr)pGlint->PciInfo->thisCard)->funcnum);
-    pDRIInfo->ddxDriverMajorVersion = 0;
-    pDRIInfo->ddxDriverMinorVersion = 1;
-    pDRIInfo->ddxDriverPatchVersion = 0;
+    pDRIInfo->ddxDriverMajorVersion = GLINT_MAJOR_VERSION;
+    pDRIInfo->ddxDriverMinorVersion = GLINT_MINOR_VERSION;
+    pDRIInfo->ddxDriverPatchVersion = GLINT_PATCHLEVEL;
     pDRIInfo->frameBufferPhysicalAddress = pGlint->FbAddress;
     pDRIInfo->frameBufferSize = pGlint->FbMapSize;
     pDRIInfo->frameBufferStride = 
@@ -412,6 +412,7 @@
 	DRIDestroyInfoRec(pGlint->pDRIInfo);
 	return FALSE;
     }
+
     pDRIInfo->devPrivate     = pGlintDRI;
     pDRIInfo->devPrivateSize = sizeof(GLINTDRIRec);
     pDRIInfo->contextSize    = sizeof(GLINTDRIContextRec);
@@ -430,6 +431,32 @@
 	return FALSE;
     }
 
+    /* Check the GLINT DRM version */
+    {
+        drmVersionPtr version = drmGetVersion(pGlint->drmSubFD);
+        if (version) {
+            if (version->version_major != 1 ||
+                version->version_minor != 0 ||
+                version->version_patchlevel < 0) {
+                /* incompatible drm version */
+                xf86DrvMsg(pScreen->myNum, X_ERROR,
+                           "GLINTDRIScreenInit failed (DRM version = %d.%d.%d, expected 1.0.x).  Disabling DRI.\n",
+                           version->version_major,
+                           version->version_minor,
+                           version->version_patchlevel);
+                GLINTDRICloseScreen(pScreen);
+                drmFreeVersion(version);
+                return FALSE;
+            }
+            drmFreeVersion(version);
+        }
+    }
+
+    /* Tell the client driver how many MX's we have */
+    pGlintDRI->numMXDevices = pGlint->numMXDevices;
+    /* Tell the client about our screen size setup */
+    pGlintDRI->pprod = pGlint->pprod;
+   
     /* setup device specific direct rendering memory maps */
 
     /* pci region 0: control regs, first 4k page, priveledged writes */
@@ -510,6 +537,7 @@
 	    if ((bufs = drmAddBufs(pGlint->drmSubFD,
 				   xf86ConfigDRI.bufs[i].count,
 				   xf86ConfigDRI.bufs[i].size,
+				   0,
 				   0 /* flags */)) <= 0) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
 			   "[drm] failure adding %d %d byte DMA buffers\n",
@@ -530,6 +558,7 @@
 	if ((bufs = drmAddBufs(pGlint->drmSubFD,
 			       GLINT_DRI_BUF_COUNT,
 			       GLINT_DRI_BUF_SIZE,
+			       0,
 			       0 /* flags */)) <= 0) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		       "[drm] failure adding %d %d byte DMA buffers\n",
@@ -567,26 +596,13 @@
 						->thisCard)->funcnum);
     }
     
-    if (pGlint->numMXDevices == 2) {
-    	if ( (pGlint->irq <= 0) || 
-	      GLINTDRIControlInitDualMX(pGlint->drmSubFD, pGlint->irq) ) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "[drm] cannot initialize dma with IRQ %d\n",
-		   pGlint->irq);
-	    DRICloseScreen(pScreen);
-	    return FALSE;
-	}
-    }
-
-    if (pGlint->numMXDevices == 1) {
-    	if ( (pGlint->irq <= 0) || 
-	      GLINTDRIControlInitSingleMX(pGlint->drmSubFD, pGlint->irq) ) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "[drm] cannot initialize dma with IRQ %d\n",
-		   pGlint->irq);
-	    DRICloseScreen(pScreen);
-	    return FALSE;
-	}
+   if ( (pGlint->irq <= 0) || 
+	      GLINTDRIControlInit(pGlint->drmSubFD, pGlint->irq) ) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	   "[drm] cannot initialize dma with IRQ %d\n",
+	   pGlint->irq);
+	DRICloseScreen(pScreen);
+	return FALSE;
     }
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -634,7 +650,8 @@
 GLINTCreateContext(ScreenPtr pScreen,
                    VisualPtr visual,
                    drmContext hwContext,
-                   void *pVisualConfigPriv)
+                   void *pVisualConfigPriv,
+		   DRIContextType contextStore)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     GLINTPtr pGlint = GLINTPTR(pScrn);
@@ -646,7 +663,7 @@
     if (!pGlintConfig) 
 	return TRUE; /* no GLX driver private support, yet */
 
-#if 1
+#if 0
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	       "[GLINTCreateContext] context priv index = %d\n",
 	       pGlintConfig->index);
@@ -730,9 +747,9 @@
     ScreenPtr pScreen,
     DRISyncType syncType,
     DRIContextType readContextType,
-    void** readContextStore,
+    void *readContextStore,
     DRIContextType writeContextType,
-    void** writeContextStore)
+    void *writeContextStore)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     GLINTPtr pGlint = GLINTPTR(pScrn);
@@ -1125,7 +1142,7 @@
 
 	    /* send gamma the context dump command */
 	    GLINT_WAIT(3);
-            if (pGlint->numMXDevices > 1)
+            if (pGlint->numMXDevices == 2)
 	    	GLINT_WRITE_REG(1, BroadcastMask);
 	    GLINT_WRITE_REG(3<<14, FilterMode);  /* context bits on gamma */
 	    GLINT_WRITE_REG(GLINT_GAMMA_CONTEXT_MASK, ContextDump);
@@ -1170,7 +1187,7 @@
 
 	    /* send context restore command */
 	    GLINT_WAIT(1);
-            if (pGlint->numMXDevices > 1)
+            if (pGlint->numMXDevices == 2)
 	    	GLINT_WRITE_REG(1, BroadcastMask);
 
 	    GLINT_WAIT(3);
@@ -1199,7 +1216,7 @@
 	    pGlint->AccelInfoRec->NeedToSync = TRUE;
 	    
 	    /* finally the MX portions */
-            if (pGlint->numMXDevices > 1)
+            if (pGlint->numMXDevices == 2)
 	    	GLINT_SLOW_WRITE_REG(1, BroadcastMask);
 	    GLINT_SLOW_WRITE_REG(pWC->MX1.CSStart,                  SStart);
 	    GLINT_SLOW_WRITE_REG(pWC->MX1.CdSdx,                    dSdx);
@@ -1452,7 +1469,7 @@
 	/* restore the 2D portion of the new context */
 
 	/* Restore MX1's registers */
-        if (pGlint->numMXDevices > 1)
+        if (pGlint->numMXDevices == 2)
 	    GLINT_SLOW_WRITE_REG(1, BroadcastMask);
 	GLINT_SLOW_WRITE_REG(pWC->MX1.CStartXDom,               StartXDom);
 	GLINT_SLOW_WRITE_REG(pWC->MX1.CdXDom,                   dXDom);
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h:1.3 xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h:1.3	Tue Feb 22 20:47:10 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h	Wed May 10 11:55:29 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.3 2000/02/23 04:47:10 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.4 2000/05/10 18:55:29 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -50,6 +50,8 @@
     drmMapFlags 	flagsControlRegs1;
     drmMapFlags 	flagsControlRegs2;
     drmMapFlags		flagsControlRegs3;
+    int			numMXDevices;
+    int			pprod;
 } GLINTDRIRec, *GLINTDRIPtr;
 
 #define GLINT_DRI_BUF_COUNT 20
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h:1.2 xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h:1.2	Tue Feb 22 20:47:10 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h	Sat Jun 17 03:00:13 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h,v 1.2 2000/02/23 04:47:10 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h,v 1.5 2000/06/17 10:00:13 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -42,14 +42,15 @@
 extern Bool GLINTCreateContext(ScreenPtr pScreen,
                                VisualPtr visual,
                                drmContext hwContext,
-                               void* pVisualConfigPriv);
+                               void* pVisualConfigPriv,
+			       DRIContextType contextStore);
 
 extern void GLINTDRISwapContext( ScreenPtr pScreen,
 				 DRISyncType syncType,
 				 DRIContextType readContextType,
-				 void** readContextStore,
+				 void* readContextStore,
 				 DRIContextType writeContextType,
-				 void** writeContextStore);
+				 void* writeContextStore);
 
 /* Macros to Setup Generic Kernel Device Driver to Handle DMA for gamma */
 
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c:1.71 xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c:1.89
--- xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c:1.71	Mon Mar  6 17:37:47 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c	Thu Jun 22 03:40:48 2000
@@ -23,22 +23,15 @@
  *           Dirk Hohndel, <hohndel@suse.de>
  *	     Stefan Dirsch, <sndirsch@suse.de>
  *	     Michel Dänzer, <michdaen@iiic.ethz.ch>
+ *	     Sven Luther, <luther@dpt-info.u-strasbg.fr>
  *
- * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
- * Siemens Nixdorf Informationssysteme
+ * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen, 
+ * Siemens Nixdorf Informationssysteme and Appian Graphics.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v 1.71 2000/03/07 01:37:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v 1.89 2000/06/22 10:40:48 alanh Exp $ */
 
-#define PSZ 8
-#include "cfb.h"
-#undef PSZ
-#include "cfb16.h"
-#include "cfb24.h"
-#include "cfb32.h"
-#include "cfb24_32.h"
+#include "fb.h"
 #include "cfb8_32.h"
-#include "xf1bpp.h"
-#include "xf4bpp.h"
 #include "micmap.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -53,6 +46,7 @@
 #include "xf86RAC.h"
 #include "xf86Resources.h"
 #include "xf86int10.h"
+#include "vbe.h"
 
 #include "compiler.h"
 #include "mipointer.h"
@@ -94,16 +88,10 @@
 static Bool	GLINTScreenInit(int Index, ScreenPtr pScreen, int argc,
 			      char **argv);
 static Bool	GLINTEnterVT(int scrnIndex, int flags);
-static Bool	GLINTEnterVTFBDev(int scrnIndex, int flags);
 static void	GLINTLeaveVT(int scrnIndex, int flags);
 static Bool	GLINTCloseScreen(int scrnIndex, ScreenPtr pScreen);
 static Bool	GLINTSaveScreen(ScreenPtr pScreen, int mode);
 
-/* Required if the driver supports mode switching */
-static Bool	GLINTSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-/* Required if the driver supports moving the viewport */
-static void	GLINTAdjustFrame(int scrnIndex, int x, int y, int flags);
-
 /* Optional functions */
 static void	GLINTFreeScreen(int scrnIndex, int flags);
 static int	GLINTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
@@ -123,13 +111,6 @@
 static int pix24bpp = 0;
 static Bool FBDevProbed = FALSE;
  
-#define VERSION 4000
-#define GLINT_NAME "GLINT"
-#define GLINT_DRIVER_NAME "glint"
-#define GLINT_MAJOR_VERSION 1
-#define GLINT_MINOR_VERSION 0
-#define GLINT_PATCHLEVEL 0
-
 /* 
  * This contains the functions needed by the server after loading the driver
  * module.  It must be supplied, and gets passed back by the SetupProc
@@ -152,26 +133,36 @@
 };
 
 static SymTabRec GLINTChipsets[] = {
+    { PCI_VENDOR_3DLABS_CHIP_GAMMA,		"gamma" },
     { PCI_VENDOR_TI_CHIP_PERMEDIA2,		"ti_pm2" },
     { PCI_VENDOR_TI_CHIP_PERMEDIA,		"ti_pm" },
+    { PCI_VENDOR_3DLABS_CHIP_PERMEDIA3,		"pm3" },
     { PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V,	"pm2v" },
     { PCI_VENDOR_3DLABS_CHIP_PERMEDIA2,		"pm2" },
     { PCI_VENDOR_3DLABS_CHIP_PERMEDIA,		"pm" },
+    { PCI_VENDOR_3DLABS_CHIP_300SX,		"300sx" },
     { PCI_VENDOR_3DLABS_CHIP_500TX,		"500tx" },
     { PCI_VENDOR_3DLABS_CHIP_MX,		"mx" },
-    { PCI_VENDOR_3DLABS_CHIP_GAMMA,		"gamma" },
+/*
+    { PCI_VENDOR_3DLABS_CHIP_DELTA,		"delta" },
+*/
     { -1,					NULL }
 };
 
 static PciChipsets GLINTPciChipsets[] = {
+    { PCI_VENDOR_3DLABS_CHIP_GAMMA,	 PCI_VENDOR_3DLABS_CHIP_GAMMA,	    NULL },
     { PCI_VENDOR_TI_CHIP_PERMEDIA2,	 PCI_VENDOR_TI_CHIP_PERMEDIA2,	    RES_SHARED_VGA },
     { PCI_VENDOR_TI_CHIP_PERMEDIA,	 PCI_VENDOR_TI_CHIP_PERMEDIA,	    NULL },
+    { PCI_VENDOR_3DLABS_CHIP_PERMEDIA3, PCI_VENDOR_3DLABS_CHIP_PERMEDIA3, RES_SHARED_VGA },
     { PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V, PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V, RES_SHARED_VGA },
     { PCI_VENDOR_3DLABS_CHIP_PERMEDIA2,	 PCI_VENDOR_3DLABS_CHIP_PERMEDIA2,  RES_SHARED_VGA },
     { PCI_VENDOR_3DLABS_CHIP_PERMEDIA,	 PCI_VENDOR_3DLABS_CHIP_PERMEDIA,   NULL },
+    { PCI_VENDOR_3DLABS_CHIP_300SX,	 PCI_VENDOR_3DLABS_CHIP_300SX,	    NULL },
     { PCI_VENDOR_3DLABS_CHIP_500TX,	 PCI_VENDOR_3DLABS_CHIP_500TX,	    NULL },
     { PCI_VENDOR_3DLABS_CHIP_MX,	 PCI_VENDOR_3DLABS_CHIP_MX,	    NULL },
-    { PCI_VENDOR_3DLABS_CHIP_GAMMA,	 PCI_VENDOR_3DLABS_CHIP_GAMMA,	    NULL },
+/*
+    { PCI_VENDOR_3DLABS_CHIP_DELTA,	 PCI_VENDOR_3DLABS_CHIP_DELTA,	    NULL },
+*/
     { -1,				 -1,				    RES_UNDEFINED }
 };
 
@@ -205,22 +196,17 @@
     { OPTION_FBDEV,		"UseFBDev",	OPTV_BOOLEAN,	{0}, FALSE },
     { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
 };
-
-static RamDacSupportedInfoRec PermediaRamdacs[] = {
-    { IBM526DB_RAMDAC },
-    { IBM526_RAMDAC },
-    { -1 }
-};
 
-static RamDacSupportedInfoRec TXMXRamdacs[] = {
+static RamDacSupportedInfoRec IBMRamdacs[] = {
     { IBM526DB_RAMDAC },
     { IBM526_RAMDAC },
     { IBM640_RAMDAC },
     { -1 }
 };
 
-static RamDacSupportedInfoRec GMX2000Ramdacs[] = {
+static RamDacSupportedInfoRec TIRamdacs[] = {
     { TI3030_RAMDAC },
+    { TI3026_RAMDAC },
     { -1 }
 };
 
@@ -262,20 +248,9 @@
 };
 
 static const char *fbSymbols[] = {
-    "xf1bppScreenInit",
-    "xf4bppScreenInit",
-    "cfbScreenInit",
-    "cfb16ScreenInit",
-    "cfb24ScreenInit",
-    "cfb24_32ScreenInit",
-    "cfb32ScreenInit",
     "cfb8_32ScreenInit",
-    "cfbGCPrivateIndex",
-    "cfb16GCPrivateIndex",
-    "cfb32GCPrivateIndex",
-    "cfbBresS",
-    "cfb16BresS",
-    "cfb32BresS",
+    "fbScreenInit",
+    "fbBres",
     NULL
 };
 
@@ -302,9 +277,17 @@
     NULL
 };
 
+static const char *vbeSymbols[] = {
+    "VBEInit",
+    "vbeDoEDID",
+    NULL
+};
+
 static const char *fbdevHWSymbols[] = {
 	"fbdevHWInit",
+	"fbdevHWFreeRec",
 	"fbdevHWProbe",
+	"fbdevHWFreeRec",
 	"fbdevHWGetName",
 	"fbdevHWUseBuildinMode",
 
@@ -347,6 +330,8 @@
     "drmMapBufs",
     "drmMarkBufs",
     "drmUnmapBufs",
+    "drmFreeVersion",
+    "drmGetVersion",
     NULL
 };
 
@@ -359,6 +344,7 @@
     "DRIScreenInit",
     "DRIDestroyInfoRec",
     "DRICreateInfoRec",
+    "DRIQueryVersion",
     "GlxSetVisualConfigs",
     NULL
 };
@@ -395,6 +381,7 @@
 	LoaderRefSymLists(vgahwSymbols, fbSymbols, ddcSymbols, i2cSymbols,
 			  xaaSymbols, xf8_32bppSymbols,
 			  shadowSymbols, fbdevHWSymbols, int10Symbols,
+			  vbeSymbols,
 #ifdef XF86DRI
 			  drmSymbols, driSymbols,
 #endif
@@ -454,7 +441,7 @@
 int partprodPermedia[] = {
 	-1,
 	PARTPROD(0,0,1), PARTPROD(0,1,1), PARTPROD(1,1,1), PARTPROD(1,1,2),
-	PARTPROD(1,2,2), PARTPROD(1,2,2), PARTPROD(1,2,3), PARTPROD(2,2,3),
+	PARTPROD(1,2,2), PARTPROD(2,2,2), PARTPROD(1,2,3), PARTPROD(2,2,3),
 	PARTPROD(1,3,3), PARTPROD(2,3,3), PARTPROD(1,2,4), PARTPROD(3,3,3),
 	PARTPROD(1,3,4), PARTPROD(2,3,4),              -1, PARTPROD(3,3,4), 
 	PARTPROD(1,4,4), PARTPROD(2,4,4),              -1, PARTPROD(3,4,4), 
@@ -496,6 +483,7 @@
     int videocontrol = 0, vtgpolarity = 0;
     
     if((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_500TX) ||
+       (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
        (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
        (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) {
 	vtgpolarity = GLINT_READ_REG(VTGPolarity) & 0xFFFFFFF0;
@@ -529,6 +517,7 @@
     }
 
     if((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_500TX) ||
+       (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
        (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
        (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) {
     	GLINT_SLOW_WRITE_REG(vtgpolarity, VTGPolarity);
@@ -583,144 +572,115 @@
     return GLINTOptions;
 }
 
+void
+GLINTProbeDDC(ScrnInfoPtr pScrn, int index)
+{
+    vbeInfoPtr pVbe;
+#ifdef XFree86LOADER
+    if (xf86LoadSubModule(pScrn, "vbe"))
+#endif
+    {
+	pVbe =  VBEInit(NULL,index);
+	vbeDoEDID(pVbe, NULL);
+    }
+}
+
 /* Mandatory */
 static Bool
 GLINTProbe(DriverPtr drv, int flags)
 {
     int i;
-    ScrnInfoPtr pScrn0;
     pciVideoPtr pPci, *checkusedPci;
-    PCITAG deltatag = 0, chiptag = 0;
     GDevPtr *devSections = NULL;
     int numDevSections;
     int numUsed,bus,device,func;
     char *dev;
     int *usedChips = NULL;
     Bool foundScreen = FALSE;
-    unsigned long glintbase = 0, glintbase3 = 0, deltabase = 0;
-    unsigned long *delta_pci_base = 0 ;
+    char *name;   
 
+    /* 
     TRACE_ENTER("GLINTProbe");
-
-    /*
-     * The aim here is to find all cards that this driver can handle,
-     * and for the ones not already claimed by another driver, claim the
-     * slot, and allocate a ScrnInfoRec.
-     *
-     * This should be a minimal probe, and it should under no circumstances
-     * change the state of the hardware.  Because a device is found, don't
-     * assume that it will be used.  Don't do any initialisations other than
-     * the required ScrnInfoRec initialisations.  Don't allocate any new
-     * data structures.
-     */
-
-    /*
-     * Next we check, if there has been a chipset override in the config file.
-     * For this we must find out if there is an active device section which
-     * is relevant, i.e., which has no driver specified or has THIS driver
-     * specified.
-     */
+    */
+    TRACE_EXIT("GLINTProbe (Enter)");
 
+  
     if ((numDevSections = xf86MatchDevice(GLINT_DRIVER_NAME,
-					  &devSections)) <= 0) {
-	/*
-	 * There's no matching device section in the config file, so quit
-	 * now.
-	 */
-	return FALSE;
+  					  &devSections)) <= 0) {
+  	return FALSE;
     }
-
-    /*
-     * We need to probe the hardware first.  We then need to see how this
-     * fits in with what is given in the config file, and allow the config
-     * file info to override any contradictions.
-     */
-
-    /*
-     * All of the cards this driver supports are PCI, so the "probing" just
-     * amounts to checking the PCI data that the server has already collected.
-     */
+  
     checkusedPci = xf86GetPciVideoInfo();
-
+     
     if (checkusedPci == NULL) {
-	/*
-	 * Changed the behaviour to try probing using the FBDev support when no PCI cards have
-	 * been found. This is for systems without (proper) PCI support. (Michel)
-	 */
-
-    	pScrn0 = xf86AllocateScreen(drv, 0);
-	
-    	pScrn0->name = GLINT_NAME;
-
-    	if (xf86LoadSubModule(pScrn0, "fbdevhw")) {
-	    xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
+  	/*
+ 	 * Changed the behaviour to try probing using the FBDev support
+ 	 * when no PCI cards have been found. This is for systems without
+ 	 * (proper) PCI support. (Michel)
+  	 */
+ 	if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
+	    return FALSE;
 	
-	    for (i = 0; i < numDevSections; i++) {
-		dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
-		if (devSections[i]->busID) {
-		    xf86ParsePciBusString(devSections[i]->busID,&bus,&device,&func);
-		    if (!xf86CheckPciSlot(bus,device,func))
-			continue;
-		}
-		if (fbdevHWProbe(NULL,dev)) {
-		    ScrnInfoPtr pScrn;
-		    fbdevHWInit(pScrn0, NULL, dev);
-			
-				/* Check for pm2fb */
-		    if (strcmp(fbdevHWGetName(pScrn0),"Permedia2")) continue;
-
-		    if (flags & PROBE_DETECT) {
-			xf86AddDeviceToConfigure(GLINT_NAME, NULL, -1);
-			return TRUE;
-		    }
-
-		    foundScreen = FBDevProbed = TRUE;
-		    pScrn = xf86AllocateScreen(drv, 0);
-		    xf86LoadSubModule(pScrn, "fbdevhw");
-		    xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
-		    xf86DrvMsg(pScrn0->scrnIndex, X_INFO,
-			       "%s successfully probed\n", dev ? dev : "default framebuffer device");
-		    if (devSections[i]->busID) {
-			/* XXX what about when there's no busID set? */
-			int entity;
-
-			xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-				   "claimed PCI slot %d:%d:%d\n",bus,device,func);
-			entity = xf86ClaimPciSlot(bus,device,func,drv,
-						  0,devSections[i],
-						  TRUE);
-			xf86ConfigActivePciEntity(pScrn,entity,
-						  NULL,RES_SHARED_VGA,
-						  NULL,NULL,NULL,NULL);
-		    } else {
-			/* XXX This is a quick hack */
-			int entity;
-
-			entity = xf86ClaimIsaSlot(drv, 0,
-						  devSections[i], TRUE);
-			xf86ConfigActiveIsaEntity(pScrn,entity,
-						  NULL,RES_SHARED_VGA,
-						  NULL,NULL,NULL,NULL);
-		    }
-		    /* Fill in what we can of the ScrnInfoRec */
-		    pScrn->driverVersion = VERSION;
-		    pScrn->driverName	 = GLINT_DRIVER_NAME;
+ 	xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
+  	
+ 	for (i = 0; i < numDevSections; i++) {
+ 	    dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
+ 	    if (devSections[i]->busID) {
+ 		xf86ParsePciBusString(devSections[i]->busID,&bus,&device,&func);
+ 		if (!xf86CheckPciSlot(bus,device,func))
+ 		    continue;
+ 	    }
+ 	    if (fbdevHWProbe(NULL,dev,&name)) {
+ 		ScrnInfoPtr pScrn;
+ 		
+  				/* Check for pm2fb */
+ 		if (strcmp(name,"Permedia2")) continue;
+ 		foundScreen = TRUE;
+ 		pScrn = NULL;
+ 		
+ 		if (devSections[i]->busID) {
+ 		    /* XXX what about when there's no busID set? */
+ 		    int entity;
+ 		    entity = xf86ClaimPciSlot(bus,device,func,drv,
+ 					      0,devSections[i],
+ 					      TRUE);
+ 		    pScrn = xf86ConfigPciEntity(pScrn,0,entity,
+ 						      NULL,RES_SHARED_VGA,
+ 						      NULL,NULL,NULL,NULL);
+ 		    if (pScrn)
+  			xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+  				   "claimed PCI slot %d:%d:%d\n",bus,device,func);
+ 		} else {
+ 		    /* XXX This is a quick hack */
+ 		    int entity;
+ 		    
+ 		    entity = xf86ClaimIsaSlot(drv, 0,
+ 					      devSections[i], TRUE);
+ 		    pScrn = xf86ConfigIsaEntity(pScrn,0,entity,
+ 					      NULL,RES_SHARED_VGA,
+ 					      NULL,NULL,NULL,NULL);
+ 		}
+ 		if (pScrn) {
+  		    /* Fill in what we can of the ScrnInfoRec */
+ 		    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 			       "%s successfully probed\n", dev ? dev : "default framebuffer device");
+  		    pScrn->driverVersion = VERSION;
+  		    pScrn->driverName	 = GLINT_DRIVER_NAME;
 		    pScrn->name		 = GLINT_NAME;
 		    pScrn->Probe	 = GLINTProbe;
 		    pScrn->PreInit	 = GLINTPreInit;
 		    pScrn->ScreenInit	 = GLINTScreenInit;
 		    pScrn->SwitchMode	 = GLINTSwitchMode;
 		    pScrn->FreeScreen	 = GLINTFreeScreen;
+		    pScrn->EnterVT	 = GLINTEnterVT;
 		}
 	    }
-    	}
+	}
 	
-    	xf86DeleteScreen(pScrn0->scrnIndex,0);
     	xfree(devSections);
 	
     } else {
-
+	
 	numUsed = xf86MatchPciInstances(GLINT_NAME, 0,
 					GLINTChipsets, GLINTPciChipsets, devSections,
 					numDevSections, drv, &usedChips);
@@ -732,168 +692,54 @@
 	foundScreen = TRUE;
 
 	if (!(flags & PROBE_DETECT))
-	for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn;
-	
-	    /* Allocate a ScrnInfoRec and claim the slot */
-	    pScrn = xf86AllocateScreen(drv, 0);
-	    ErrorF("used chips: %i\n",usedChips[i]);
-
-	    xf86ConfigActivePciEntity(pScrn, usedChips[i], GLINTPciChipsets, NULL,
-				      NULL, NULL, NULL, NULL);
-
-	    pPci = xf86GetPciInfoForEntity(usedChips[i]);
-	    glintbase = pPci->memBase[0];
-	    chiptag = pciTag(pPci->bus, pPci->device, pPci->func);
+	    for (i = 0; i < numUsed; i++) {
+		ScrnInfoPtr pScrn = NULL;
 	
-	    /* Need to claim Glint Delta for PERMEDIA & 500TX */
-	    /* and for the moment we claim all other chips on the same */
-	    /* bus/device number */
-	    if ( (pPci->chipType == PCI_CHIP_500TX) ||
-		 (pPci->chipType == PCI_CHIP_MX) ||
-		 (pPci->chipType == PCI_CHIP_GAMMA) ||
-		 (pPci->chipType == PCI_CHIP_PERMEDIA) ) {
-
-		while (*checkusedPci != NULL) {
-		    int gIndex;
-		    /* make sure we claim all but our source device */
-		    if ((pPci->bus == (*checkusedPci)->bus && 
-			 pPci->device == (*checkusedPci)->device) &&
-			pPci->func != (*checkusedPci)->func) {
+		/* Allocate a ScrnInfoRec and claim the slot */
+		if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
+					       GLINTPciChipsets, NULL,
+					       NULL, NULL, NULL, NULL))) {
+
+		    pPci = xf86GetPciInfoForEntity(usedChips[i]);
+
+		 
+		    /* Only claim other chips when GAMMA is used */
+		    if (pPci->chipType == PCI_CHIP_GAMMA) {
+		      while (*checkusedPci != NULL) {
+	    	        int eIndex;
+	    	    	/* make sure we claim all but our source device */
+	    	    	if ((pPci->bus ==    (*checkusedPci)->bus && 
+	          	     pPci->device == (*checkusedPci)->device) &&
+	         	     pPci->func !=   (*checkusedPci)->func) {
 		    
-			/* Find that Delta chip, and give us the tag value */
-			if ( (((*checkusedPci)->vendor == PCI_VENDOR_TI) || 
-			      ((*checkusedPci)->vendor == PCI_VENDOR_3DLABS)) &&
-			     (((*checkusedPci)->chipType == PCI_CHIP_DELTA) ||
-			      ((*checkusedPci)->chipType == PCI_CHIP_MX)) ) {
-			    if ((*checkusedPci)->chipType == PCI_CHIP_DELTA) {
-				deltabase = (*checkusedPci)->memBase[0];
-				delta_pci_base = &((*checkusedPci)->memBase[0]);
-				deltatag = pciTag((*checkusedPci)->bus, 
-						  (*checkusedPci)->device, 
-						  (*checkusedPci)->func);
-			    }
-
-			    gIndex = xf86ClaimPciSlot((*checkusedPci)->bus, 
-						      (*checkusedPci)->device, 
-						      (*checkusedPci)->func, drv,
-						      (*checkusedPci)->chipType,
-						      NULL, TRUE);
-
-			    if (gIndex == -1) {
-				/* This can't happen */
-				FatalError("someone claimed the free slot!\n");
-			    }
-			    xf86ConfigActivePciEntity(pScrn, gIndex,
-						      NULL, NULL, NULL, NULL,
-						      NULL, NULL);
-			} else {
-			    int eIndex;
-
 			    /* Claim other entities on the same card */
 			    eIndex = xf86ClaimPciSlot((*checkusedPci)->bus, 
-						      (*checkusedPci)->device, 
-						      (*checkusedPci)->func,
-						      drv, -1 /* XXX */,
-						      NULL, FALSE);
-
+						  (*checkusedPci)->device, 
+						  (*checkusedPci)->func,
+						  drv, -1 /* XXX */,
+						  NULL, FALSE);
 			    if (eIndex == -1) {
-				/* This can't happen */
-				FatalError("someone claimed the free slot!\n");
+		    	    	/* This can't happen */
+		    	    	FatalError("someone claimed the free slot!\n");
 			    }
-			}
+			    xf86AddEntityToScreen(pScrn,eIndex);
+	    	    	} 
+	    	    	checkusedPci++;
+		      }
 		    }
-		    checkusedPci++;
-		}
-	    }
-	    /* Fill in what we can of the ScrnInfoRec */
-	    pScrn->driverVersion = VERSION;
-	    pScrn->driverName	 = GLINT_DRIVER_NAME;
-	    pScrn->name		 = GLINT_NAME;
-	    pScrn->Probe	 = GLINTProbe;
-	    pScrn->PreInit	 = GLINTPreInit;
-	    pScrn->ScreenInit	 = GLINTScreenInit;
-	    pScrn->SwitchMode	 = GLINTSwitchMode;
-	    pScrn->FreeScreen	 = GLINTFreeScreen;
-
-/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
-/* NEED TO MOVE THIS OUT OF THE PROBE CODE */
-/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
-	  {
-	    int temp;
-	    int bugbase = 0;
-	    /*
-	     * due to a few bugs in the GLINT Delta we might have to
-	     * relocate the base address of config region of the Delta, if
-	     * bit 17 of the base addresses of config region of the Delta
-	     * and the 500TX or 300SX are different
-	     * We only handle config type 1 at this point
-	     */
-	    if (deltatag && chiptag) {
-		if ((deltabase & 0x20000) ^ (glintbase & 0x20000)) {
-		    /*
-		     * if the base addresses are different at bit 17,
-		     * we have to remap the base0 for the delta;
-		     * as wrong as this looks, we can use the base3 of the
-		     * 300SX/500TX for this. The delta is working as a bridge
-		     * here and gives its own addresses preference. And we
-		     * don't need to access base3, as this one is the bytw
-		     * swapped local buffer which we don't need.
-		     * Using base3 we know that the space is
-		     * a) large enough
-		     * b) free (well, almost)
-		     *
-		     * to be able to do that we need to enable IO
-		     */
-		    if (pPci->chipType == PCI_CHIP_PERMEDIA) {
-			glintbase3 = pciReadLong(chiptag, 0x20); /* base4 */
-		    } else {
-			glintbase3 = pciReadLong(chiptag, 0x1c); /* base3 */
-		    }
-		    if ((glintbase & 0x20000) ^ (glintbase3 & 0x20000)) {
-			/*
-			 * oops, still different; we know that base3 is at least
-			 * 16 MB, so we just take 128k offset into it
-			 */
-	    	    	glintbase3 += 0x20000;
-		    }
-		    /*
-		     * and now for the magic.
-		     * read old value
-		     * write fffffffff
-		     * read value
-		     * write new value
-		     */
-		    bugbase = pciReadLong(deltatag, 0x10);
-		    pciWriteLong(deltatag, 0x10, 0xffffffff);
-		    temp = pciReadLong(deltatag, 0x10);
-		    pciWriteLong(deltatag, 0x10, glintbase3);
-		    
-		    /* Update PCI tables */
-		    *delta_pci_base = glintbase3;
-		    
-		    /*
-		     * additionally, sometimes we see the baserom which might
-		     * confuse the chip, so let's make sure that is disabled
-		     */
-		    temp = pciReadLong(chiptag, 0x30);
-		    pciWriteLong(chiptag, 0x30, 0xffffffff);
-		    temp = pciReadLong(chiptag, 0x30);
-		    pciWriteLong(chiptag, 0x30, 0);
+
+		    /* Fill in what we can of the ScrnInfoRec */
+		    pScrn->driverVersion	= VERSION;
+		    pScrn->driverName		= GLINT_DRIVER_NAME;
+		    pScrn->name			= GLINT_NAME;
+		    pScrn->Probe	 	= GLINTProbe;
+		    pScrn->PreInit	 	= GLINTPreInit;
+		    pScrn->ScreenInit		= GLINTScreenInit;
+		    pScrn->SwitchMode		= GLINTSwitchMode;
+		    pScrn->FreeScreen		= GLINTFreeScreen;
+		    pScrn->EnterVT		= GLINTEnterVT;
 		}
 	    }
-	    if (bugbase)
-		xf86DrvMsg(-1, X_INFO, 
-			   "Glint Delta BUG, fixing.....old = 0x%x, new = 0x%x\n", 
-			   bugbase, glintbase3);
-	  }
-
-	  /*
-	   * ok, now let's forget about the Delta, in case we found one
-	   */
-	  deltatag = deltabase = 0;
-	}
-
     }
 
     if (usedChips) xfree(usedChips);
@@ -919,12 +765,14 @@
     switch (pGlint->Chipset) {
     case PCI_VENDOR_TI_CHIP_PERMEDIA2:
     case PCI_VENDOR_TI_CHIP_PERMEDIA:
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	linep = &partprodPermedia[0];
 	break;
     case PCI_VENDOR_3DLABS_CHIP_500TX:
+    case PCI_VENDOR_3DLABS_CHIP_300SX:
     case PCI_VENDOR_3DLABS_CHIP_MX:
     case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	linep = &partprod500TX[0];
@@ -948,6 +796,69 @@
     return linePitches;
 }
 
+static void
+GLINTProbeTIramdac(ScrnInfoPtr pScrn)
+{
+    GLINTPtr pGlint;
+    CARD32 temp = 0;
+    pGlint = GLINTPTR(pScrn);
+    if (pGlint->numMXDevices == 2) {
+	pGlint->RamDacRec = RamDacCreateInfoRec();
+	pGlint->RamDacRec->ReadDAC = DUALglintInTIIndReg;
+	pGlint->RamDacRec->WriteDAC = DUALglintOutTIIndReg;
+	pGlint->RamDacRec->ReadAddress = DUALglintTIReadAddress;
+	pGlint->RamDacRec->WriteAddress = DUALglintTIWriteAddress;
+	pGlint->RamDacRec->ReadData = DUALglintTIReadData;
+	pGlint->RamDacRec->WriteData = DUALglintTIWriteData;
+	pGlint->RamDacRec->LoadPalette = TIramdacLoadPalette;
+    } else {
+	pGlint->RamDacRec = RamDacCreateInfoRec();
+	pGlint->RamDacRec->ReadDAC = glintInTIIndReg;
+	pGlint->RamDacRec->WriteDAC = glintOutTIIndReg;
+	pGlint->RamDacRec->ReadAddress = glintTIReadAddress;
+	pGlint->RamDacRec->WriteAddress = glintTIWriteAddress;
+	pGlint->RamDacRec->ReadData = glintTIReadData;
+	pGlint->RamDacRec->WriteData = glintTIWriteData;
+	pGlint->RamDacRec->LoadPalette = TIramdacLoadPalette;
+    }
+    if(!RamDacInit(pScrn, pGlint->RamDacRec)) {
+	RamDacDestroyInfoRec(pGlint->RamDacRec);
+	return;
+    }
+    GLINTMapMem(pScrn);
+    if (pGlint->numMXDevices == 2) {
+    	temp = GLINT_READ_REG(GCSRAperture);
+    	GLINT_SLOW_WRITE_REG(GCSRSecondaryGLINTMapEn, GCSRAperture);
+    }
+    pGlint->RamDac = TIramdacProbe(pScrn, TIRamdacs);
+    if (pGlint->numMXDevices == 2) {
+    	GLINT_SLOW_WRITE_REG(temp, GCSRAperture);
+    }
+    GLINTUnmapMem(pScrn);
+}
+
+static void
+GLINTProbeIBMramdac(ScrnInfoPtr pScrn)
+{
+    GLINTPtr pGlint;
+    pGlint = GLINTPTR(pScrn);
+    pGlint->RamDacRec = RamDacCreateInfoRec();
+    pGlint->RamDacRec->ReadDAC = glintInIBMRGBIndReg;
+    pGlint->RamDacRec->WriteDAC = glintOutIBMRGBIndReg;
+    pGlint->RamDacRec->ReadAddress = glintIBMReadAddress;
+    pGlint->RamDacRec->WriteAddress = glintIBMWriteAddress;
+    pGlint->RamDacRec->ReadData = glintIBMReadData;
+    pGlint->RamDacRec->WriteData = glintIBMWriteData;
+    pGlint->RamDacRec->LoadPalette = NULL;
+    if(!RamDacInit(pScrn, pGlint->RamDacRec)) {
+	RamDacDestroyInfoRec(pGlint->RamDacRec);
+	return;
+    }
+    GLINTMapMem(pScrn);
+    pGlint->RamDac = IBMramdacProbe(pScrn, IBMRamdacs);
+    GLINTUnmapMem(pScrn);
+}
+
 /* Mandatory */
 static Bool
 GLINTPreInit(ScrnInfoPtr pScrn, int flags)
@@ -963,8 +874,6 @@
     char *mod = NULL;
     const char *s;
 
-    if (flags & PROBE_DETECT) return FALSE;
-
     TRACE_ENTER("GLINTPreInit");
 
     /*
@@ -984,13 +893,6 @@
     if (pScrn->numEntities < 1)
 	return FALSE;
 
-    /* The ramdac module should be loaded here when needed */
-    if (!xf86LoadSubModule(pScrn, "ramdac"))
-	return FALSE;
-
-    /* Set pScrn->monitor */
-    pScrn->monitor = pScrn->confScreen->monitor;
-
     /* Allocate the GLINTRec driverPrivate */
     if (!GLINTGetRec(pScrn)) {
 	return FALSE;
@@ -999,21 +901,26 @@
 
     /* Get the entities, and make sure they are PCI. */
     pGlint->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+
+    if (flags & PROBE_DETECT) {
+	GLINTProbeDDC(pScrn, pGlint->pEnt->index);
+	return TRUE;
+    }
+
     if (pGlint->pEnt->location.type == BUS_PCI)
     {
-    /* Initialize the card through int10 interface if needed */
-    if ( xf86LoadSubModule(pScrn, "int10")){
-        xf86Int10InfoPtr pInt;
-
-        xf86LoaderReqSymLists(int10Symbols, NULL);
-
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
-        pInt = xf86InitInt10(pGlint->pEnt->index);
-        xf86FreeInt10(pInt);
-    }
+    	/* Initialize the card through int10 interface if needed */
+    	if ( xf86LoadSubModule(pScrn, "int10")){
+            xf86Int10InfoPtr pInt;
+
+            xf86LoaderReqSymLists(int10Symbols, NULL);
+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
+            pInt = xf86InitInt10(pGlint->pEnt->index);
+            xf86FreeInt10(pInt);
+    	}
     
-    pGlint->PciInfo = xf86GetPciInfoForEntity(pGlint->pEnt->index);
-    pGlint->PciTag = pciTag(pGlint->PciInfo->bus, pGlint->PciInfo->device,
+        pGlint->PciInfo = xf86GetPciInfoForEntity(pGlint->pEnt->index);
+        pGlint->PciTag = pciTag(pGlint->PciInfo->bus, pGlint->PciInfo->device,
 			    pGlint->PciInfo->func);
     }
 
@@ -1024,20 +931,14 @@
 	for (i = 1; i < pScrn->numEntities; i++) {
 	    pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
 	    pPci = xf86GetPciInfoForEntity(pEnt->index);
-	    if (pPci->chipType == PCI_CHIP_DELTA
-	       ) {
-		pGlint->pEntGeometry = pEnt;
-		pGlint->PciInfoGeometry = pPci;
-    		pGlint->PciTagGeometry = pciTag(pPci->bus, pPci->device,
-						pPci->func);
-	    } else if (pPci->chipType == PCI_CHIP_MX) {
+	    if (pPci->chipType == PCI_CHIP_MX) {
 		if (pGlint->numMXDevices >= GLINT_MAX_MX_DEVICES) {
 		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			"%d MX chips supported, additional MX device ignored\n",
-			GLINT_MAX_MX_DEVICES);
+			"%d MX chips unsupported, aborting. (Max - 2)\n",
+			pGlint->numMXDevices);
+		    return FALSE;
 		} else {
 		    LinearFramebuffer = pPci->memBase[2];
-		    pGlint->pEntMX[pGlint->numMXDevices] = pEnt;
 		    pGlint->MXPciInfo[pGlint->numMXDevices] = pPci;
 		    pGlint->numMXDevices++;
 		}
@@ -1058,6 +959,8 @@
     pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
     pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
 
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
     /*
      * The first thing we should figure out is the depth, bpp, etc.
      * Our default depth is 8, so pass it to the helper function.
@@ -1081,8 +984,6 @@
     }
     /* Check that the returned depth is one we support */
     switch (pScrn->depth) {
-    case 1:
-    case 4:
     case 8:
     case 15:
     case 16:
@@ -1208,7 +1109,6 @@
         from = X_CONFIG;
 	
 	pScrn->AdjustFrame	= fbdevHWAdjustFrame;
-	pScrn->EnterVT		= GLINTEnterVTFBDev;
 	pScrn->LeaveVT		= fbdevHWLeaveVT;
 	pScrn->ValidMode	= fbdevHWValidMode;
 	
@@ -1218,7 +1118,6 @@
         from = X_PROBED;
 	
 	pScrn->AdjustFrame	= GLINTAdjustFrame;
-	pScrn->EnterVT		= GLINTEnterVT;
 	pScrn->LeaveVT		= GLINTLeaveVT;
 	pScrn->ValidMode	= GLINTValidMode;
 
@@ -1308,6 +1207,7 @@
     xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
 
     if ((pGlint->Chipset == PCI_VENDOR_TI_CHIP_PERMEDIA2) ||
+	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA3) ||
 	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V) ||
 	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2)) {
     	if (xf86ReturnOptValBool(GLINTOptions, OPTION_BLOCK_WRITE, FALSE)) {
@@ -1341,12 +1241,12 @@
 	       (unsigned long)pGlint->FbAddress);
 
     /* Trap GAMMA & DELTA specification, with no linear address */
-    /* Find the first TX/MX chip and use that address */
+    /* Find the first SX/TX/MX chip and use that address */
     if (pGlint->FbAddress == 0) {
 	if (LinearFramebuffer) {
 	    pGlint->FbAddress = LinearFramebuffer;
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
-			"FrameBuffer used from first TX/MX chip at 0x%x\n", 
+			"FrameBuffer used from first SX/TX/MX chip at 0x%x\n", 
 				LinearFramebuffer);
 	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 	
@@ -1363,10 +1263,7 @@
 	pGlint->IOAddress = pGlint->pEnt->device->IOBase;
 	from = X_CONFIG;
     } else {
-	if (pGlint->PciTagGeometry)
-	    pGlint->IOAddress = pGlint->PciInfoGeometry->memBase[0] &0xFFFFC000;
-	else
-	    pGlint->IOAddress = pGlint->PciInfo->memBase[0] & 0xFFFFC000;
+	pGlint->IOAddress = pGlint->PciInfo->memBase[0] & 0xFFFFC000;
     }
 #if X_BYTE_ORDER == X_BIG_ENDIAN
     pGlint->IOAddress += 0x10000;
@@ -1375,35 +1272,17 @@
     xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
 	       (unsigned long)pGlint->IOAddress);
 
-    if (pGlint->SecondaryAddress)
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
-	  "Secondary MMIO registers at 0x%lX\n", pGlint->SecondaryAddress);
-
     pGlint->irq = pGlint->pEnt->device->irq;
 
-    /* Register the PCI-assigned resources. */
-    if (pGlint->numMXDevices == 0) {
-        if (xf86RegisterResources(pGlint->pEnt->index, NULL, ResExclusive)) {
+    /* Register all entities */
+    for (i = 1; i < pScrn->numEntities; i++) {
+	EntityInfoPtr pEnt;
+	pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+        if (xf86RegisterResources(pEnt->index, NULL, ResExclusive)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		   "xf86RegisterResources() found resource conflicts\n");
 	    return FALSE;
         }
-    } else {
-        for (i = 0; i < pGlint->numMXDevices; i++) {
-	    if (xf86RegisterResources(pGlint->pEntMX[i]->index, NULL,
-				  ResExclusive)) {
-	        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "xf86RegisterResources() found resource conflicts\n");
-	        return FALSE;
-	    }
-        }
-    }
-    if (pGlint->pEntGeometry) {
-	if (xf86RegisterResources(pGlint->pEntGeometry->index, NULL, ResExclusive)) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "xf86RegisterResources() found resource conflicts\n");
-	    return FALSE;
-	}
     }
     }
 
@@ -1415,11 +1294,22 @@
     	if (pGlint->pEnt->device->videoRam != 0) {
 		pScrn->videoRam = pGlint->pEnt->device->videoRam;
 		from = X_CONFIG;
+        } else if (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA3) {
+		/* Need to initialize the memory timings of the second head
+		 * of the Appian Jeronimo 2000 board here.
+		 * Check this routine in pm3_dac.c if you have another board
+		 * than a J2000, as memory timings will surely change.
+		*/
+        	GLINTMapMem(pScrn);
+		Permedia3PreInit(pScrn, pGlint);
+        	GLINTUnmapMem(pScrn);
+		pScrn->videoRam = Permedia3MemorySizeDetect(pScrn);
     	} else {
 		pGlint->FbMapSize = 0; /* Need to set FbMapSize for MMIO access */
 		/* Need to access MMIO to determine videoRam */
         	GLINTMapMem(pScrn);
 		if( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_500TX) ||
+	    	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
 	    	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
 	    	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) )
 	    	pScrn->videoRam = 1024 * (1 << ((GLINT_READ_REG(FBMemoryCtl) & 
@@ -1433,11 +1323,21 @@
     	pScrn->videoRam = fbdevHWGetVidmem(pScrn)/1024;
     }
 
+    pGlint->FbMapSize = pScrn->videoRam * 1024;
+
+    /* We should move this out somewhere ! */
     if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
 	     (pGlint->numMXDevices == 2) ) {
-	unsigned int chipconfig;
+	CARD32 chipconfig;
+	CARD32 temp;
+
 	GLINTMapMem(pScrn);
 
+#if 0
+	/* We shouldn't really do this yet, we haven't saved the
+	 * state of the chip.
+	 * Best of all put a timer in to reset the engine if it
+	 * doesn't respond - but later */
 	/*
 	 * This is needed before the first GLINT_SLOW_WRITE_REG --
 	 * otherwise the server will hang if it was left in a bad state.
@@ -1446,9 +1346,12 @@
 	while (GLINT_READ_REG(ResetStatus) & 0x80000000) {
 	    xf86DrvMsg(pScrn->scrnIndex, from, "Resetting Core\n");
 	}
+#endif
 	    
+	temp = GLINT_READ_REG(GCSRAperture);
 	GLINT_SLOW_WRITE_REG(GCSRSecondaryGLINTMapEn, GCSRAperture);
 
+#if 0
 	xf86DrvMsg(pScrn->scrnIndex, from,
 		   "InFIFOSpace = %d, %d (after reset)\n",
 		   GLINT_READ_REG(InFIFOSpace),
@@ -1475,37 +1378,37 @@
 		   "OutFIFOSWords = %d, %d (after drain)\n",
 		   GLINT_READ_REG(OutFIFOWords),
 		   GLINT_SECONDARY_READ_REG(OutFIFOWords));
+#endif
 	
 	chipconfig = GLINT_READ_REG(GChipConfig);
+
+	GLINT_SLOW_WRITE_REG(GCSRSecondaryGLINTMapEn, GCSRAperture);
+
 	GLINTUnmapMem(pScrn);
 	
 	switch (chipconfig & GChipMultiGLINTApMask) {
 	case GChipMultiGLINTAp_0M:
-	    pGlint->MultiGLINTApSize = 0;
+	    pGlint->FbMapSize = 0;
 	    break;
 	case GChipMultiGLINTAp_16M:
-	    pGlint->MultiGLINTApSize = 16 * 1024 * 1024;
+	    pGlint->FbMapSize = 16 * 1024 * 1024;
 	    break;
 	case GChipMultiGLINTAp_32M:
-	    pGlint->MultiGLINTApSize = 32 * 1024 * 1024;
+	    pGlint->FbMapSize = 32 * 1024 * 1024;
 	    break;
 	case GChipMultiGLINTAp_64M:
-	    pGlint->MultiGLINTApSize = 64 * 1024 * 1024;
+	    pGlint->FbMapSize = 64 * 1024 * 1024;
 	    break;
 	}
-
-	pGlint->FbMapSize = pGlint->MultiGLINTApSize;
-	pGlint->MXFbSize = pScrn->videoRam * 1024;
-	/* we have twice the memory w/ two MX chips */
-	xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n",
-		   pScrn->videoRam * 2);
-    }
-    else {
-	pGlint->FbMapSize = pScrn->videoRam * 1024;
-	xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n",
-		   pScrn->videoRam);
     }
 
+    xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n",
+		   pGlint->FbMapSize / 1024);
+
+    /* The ramdac module should be loaded here when needed */
+    if (!xf86LoadSubModule(pScrn, "ramdac"))
+	return FALSE;
+
     /* Let's check what type of DAC we have and reject if necessary */
     switch (pGlint->Chipset) {
 	case PCI_VENDOR_TI_CHIP_PERMEDIA2:
@@ -1526,6 +1429,7 @@
 		return FALSE;
 	    }
 	    break;
+	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
 	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
 	    maxheight = 2048;
 	    maxwidth = 2048;
@@ -1547,115 +1451,58 @@
 	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	    maxheight = 1024;
 	    maxwidth = 1536;
-	    pGlint->RefClock = 14318;
 	    pGlint->VGAcore = TRUE; /* chip has a vga core */
-	    pGlint->RamDacRec = RamDacCreateInfoRec();
-	    pGlint->RamDacRec->ReadDAC = glintInIBMRGBIndReg;
-	    pGlint->RamDacRec->WriteDAC = glintOutIBMRGBIndReg;
-	    pGlint->RamDacRec->ReadAddress = glintIBMReadAddress;
-	    pGlint->RamDacRec->WriteAddress = glintIBMWriteAddress;
-	    pGlint->RamDacRec->ReadData = glintIBMReadData;
-	    pGlint->RamDacRec->WriteData = glintIBMWriteData;
-	    if(!RamDacInit(pScrn, pGlint->RamDacRec)) {
-		RamDacDestroyInfoRec(pGlint->RamDacRec);
+	    GLINTProbeIBMramdac(pScrn);
+	    if (pGlint->RamDac == NULL) return FALSE;
+	    if (pGlint->RamDac->RamDacType != (IBM526DB_RAMDAC) ||
+		pGlint->RamDac->RamDacType != (IBM526_RAMDAC))
 		return FALSE;
-	    }
-            GLINTMapMem(pScrn);
-	    pGlint->RamDac = IBMramdacProbe(pScrn, PermediaRamdacs);
-            GLINTUnmapMem(pScrn);
-	    if (pGlint->RamDac == NULL)
-		return FALSE;
+	    pGlint->RefClock = 14318;
 	    break;
 	case PCI_VENDOR_3DLABS_CHIP_500TX:
+	case PCI_VENDOR_3DLABS_CHIP_300SX:
 	case PCI_VENDOR_3DLABS_CHIP_MX:
-	    if (pScrn->bitsPerPixel == 24) {
+	case PCI_VENDOR_3DLABS_CHIP_GAMMA:
+    	    if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && 
+		 pGlint->UsePCIRetry) {
 		xf86DrvMsg(pScrn->scrnIndex, from, 
-			"-depth 24 -pixmap24 not supported by this chip.\n");
-		return FALSE;
-	    }
-	    maxheight = 4096;
-	    maxwidth = 4096;
-	    pGlint->RamDacRec = RamDacCreateInfoRec();
-	    pGlint->RamDacRec->ReadDAC = glintInIBMRGBIndReg;
-	    pGlint->RamDacRec->WriteDAC = glintOutIBMRGBIndReg;
-	    pGlint->RamDacRec->ReadAddress = glintIBMReadAddress;
-	    pGlint->RamDacRec->WriteAddress = glintIBMWriteAddress;
-	    pGlint->RamDacRec->ReadData = glintIBMReadData;
-	    pGlint->RamDacRec->WriteData = glintIBMWriteData;
-	    if(!RamDacInit(pScrn, pGlint->RamDacRec)) {
-		RamDacDestroyInfoRec(pGlint->RamDacRec);
-		return FALSE;
-	    }
-            GLINTMapMem(pScrn);
-	    pGlint->RamDac = IBMramdacProbe(pScrn, TXMXRamdacs);
-            GLINTUnmapMem(pScrn);
-	    if (pGlint->RamDac->RamDacType == (IBM640_RAMDAC))
-		pGlint->RefClock = 28322;
-	    else
-	    if (pGlint->RamDac->RamDacType == (IBM526DB_RAMDAC) ||
-		pGlint->RamDac->RamDacType == (IBM526_RAMDAC))
-		pGlint->RefClock = 40000;
-	    else {
-    		xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, "Undefined RefClock\n");
-		return FALSE;
+				"GAMMA in use - PCI retries disabled\n");
+		pGlint->UsePCIRetry = FALSE;
 	    }
-	    if (pGlint->RamDac == NULL)
-		return FALSE;
-	    break;
-	case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	    if (pScrn->bitsPerPixel == 24) {
 		xf86DrvMsg(pScrn->scrnIndex, from, 
 			"-depth 24 -pixmap24 not supported by this chip.\n");
 		return FALSE;
 	    }
-    	    if (pGlint->UsePCIRetry) {
-		xf86DrvMsg(pScrn->scrnIndex, from, 
-				"GAMMA in use - PCI retries disabled\n");
-		pGlint->UsePCIRetry = FALSE;
-	    }
 	    maxheight = 4096;
 	    maxwidth = 4096;
-	    pGlint->RefClock = 14318;
-	    pGlint->RamDacRec = RamDacCreateInfoRec();
-	    pGlint->RamDacRec->ReadDAC = glintInTIIndReg;
-	    pGlint->RamDacRec->WriteDAC = glintOutTIIndReg;
-	    pGlint->RamDacRec->ReadAddress = glintTIReadAddress;
-	    pGlint->RamDacRec->WriteAddress = glintTIWriteAddress;
-	    pGlint->RamDacRec->ReadData = glintTIReadData;
-	    pGlint->RamDacRec->WriteData = glintTIWriteData;
-	    if(!RamDacInit(pScrn, pGlint->RamDacRec)) {
-		RamDacDestroyInfoRec(pGlint->RamDacRec);
-		return FALSE;
+	    /* Test for an TI ramdac */
+	    if (!pGlint->RamDac) {
+	    	GLINTProbeTIramdac(pScrn);
+		if (pGlint->RamDac)
+	             if ( (pGlint->RamDac->RamDacType == (TI3026_RAMDAC)) ||
+	         	  (pGlint->RamDac->RamDacType == (TI3030_RAMDAC)) )
+		    	pGlint->RefClock = 14318;
 	    }
-	    GLINTMapMem(pScrn);
-	    pGlint->RamDac = TIramdacProbe(pScrn, GMX2000Ramdacs);
-	    GLINTUnmapMem(pScrn);
+	    /* Test for an IBM ramdac */
 	    if (!pGlint->RamDac) {
-	    pGlint->RamDacRec = RamDacCreateInfoRec();
-	    pGlint->RamDacRec->ReadDAC = glintInIBMRGBIndReg;
-	    pGlint->RamDacRec->WriteDAC = glintOutIBMRGBIndReg;
-	    pGlint->RamDacRec->ReadAddress = glintIBMReadAddress;
-	    pGlint->RamDacRec->WriteAddress = glintIBMWriteAddress;
-	    pGlint->RamDacRec->ReadData = glintIBMReadData;
-	    pGlint->RamDacRec->WriteData = glintIBMWriteData;
-	    if(!RamDacInit(pScrn, pGlint->RamDacRec)) {
-		RamDacDestroyInfoRec(pGlint->RamDacRec);
-		return FALSE;
+	    	GLINTProbeIBMramdac(pScrn);
+		if (pGlint->RamDac) {
+	    	    if (pGlint->RamDac->RamDacType == (IBM640_RAMDAC))
+		    	pGlint->RefClock = 28322;
+	    	    else
+	    	    if (pGlint->RamDac->RamDacType == (IBM526DB_RAMDAC) ||
+		    	pGlint->RamDac->RamDacType == (IBM526_RAMDAC))
+		    	pGlint->RefClock = 40000;
+	    	    else {
+    		    	xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, 
+							"Undefined RefClock\n");
+		        return FALSE;
+	    	    }
+		}
 	    }
-            GLINTMapMem(pScrn);
-	    pGlint->RamDac = IBMramdacProbe(pScrn, TXMXRamdacs);
-            GLINTUnmapMem(pScrn);
-	    if (pGlint->RamDac->RamDacType == (IBM640_RAMDAC))
-		pGlint->RefClock = 28322;
-	    else
-	    if (pGlint->RamDac->RamDacType == (IBM526DB_RAMDAC) ||
-		pGlint->RamDac->RamDacType == (IBM526_RAMDAC))
-		pGlint->RefClock = 40000;
-	    else {
-    		xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, "Undefined RefClock\n");
+	    if (!pGlint->RamDac)
 		return FALSE;
-	    }
-	    }
 	    break;
     }
 
@@ -1708,14 +1555,13 @@
 	from = X_CONFIG;
     } else {
 	if((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_500TX)||
+	   (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
 	   (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
 	   (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) )
 		pGlint->MaxClock = 220000;
 	if ( (pGlint->Chipset == PCI_VENDOR_TI_CHIP_PERMEDIA) ||
 	     (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA) ) {
 		switch (pScrn->bitsPerPixel) {
-		    case 1:
-		    case 4:
 		    case 8:
 			pGlint->MaxClock = 200000;
 			break;
@@ -1734,8 +1580,6 @@
 	     (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) ||
 	     (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V) ) {
 		switch (pScrn->bitsPerPixel) {
-		    case 1:
-		    case 4:
 		    case 8:
 			pGlint->MaxClock = 230000;
 			break;
@@ -1750,6 +1594,24 @@
 			break;
 		}
 	}
+	if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA3) ) {
+		switch (pScrn->bitsPerPixel) {
+		    case 8:
+			pGlint->MaxClock = 300000;
+			break;
+		    case 16:
+			pGlint->MaxClock = 300000;
+			break;
+		    case 24:
+			/* Not sure about the 24 & 32 bpp clocks, ... */
+			pGlint->MaxClock = 150000;
+			break;
+		    case 32:
+			/* Not sure about the 24 & 32 bpp clocks, ... */
+			pGlint->MaxClock = 150000;
+			break;
+		}
+	}
     }
     xf86DrvMsg(pScrn->scrnIndex, from, "Max pixel clock is %d MHz\n",
 	       pGlint->MaxClock / 1000);
@@ -1758,7 +1620,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = xnfalloc(sizeof(ClockRange));
+    clockRanges = xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->minClock = pGlint->MinClock;
     clockRanges->maxClock = pGlint->MaxClock;
@@ -1820,34 +1682,29 @@
 
     if (pGlint->FBDev) {
 	/* shift horizontal timings for 64bit VRAM's or 32bit SGRAMs */
-	int logbytesperaccess = 2;
-	
 	switch (pScrn->bitsPerPixel) {
 	case 8:
-		pGlint->BppShift = logbytesperaccess;
+		pGlint->BppShift = 2;
 		break;
 	case 16:
 		if (pGlint->DoubleBuffer) {
-	    		pGlint->BppShift = logbytesperaccess-2;
+	    		pGlint->BppShift = 0;
 		} else {
-	    		pGlint->BppShift = logbytesperaccess-1;
+	    		pGlint->BppShift = 1;
 		}
 		break;
 	case 24:
-		pGlint->BppShift = logbytesperaccess;
+		pGlint->BppShift = 2;
 		break;
 	case 32:
-		pGlint->BppShift = logbytesperaccess-2;
+		pGlint->BppShift = 0;
 		break;
 	}
 
 	pScrn->displayWidth = pScrn->virtualX;
 
-	
 	/* Ensure vsync and hsync are high when using HW cursor */
-	
 	if (pGlint->HWCursor) {
-
 		DisplayModePtr mode, first = mode = pScrn->modes;
 		
 		do {	/* We know there is at least the built-in mode */
@@ -1863,10 +1720,11 @@
 
     /* Only allow a single mode for MX and TX chipsets */
     if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_500TX) ||
+        (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) ||
         (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) ||
         (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
-	    "GLINT TX/MX chipsets only support one modeline, using first.\n");
+	    "GLINT SX/TX/MX chipsets only support one modeline, using first\n");
 	pScrn->modes->next = NULL;
 	pScrn->virtualX = pScrn->modes->HDisplay;
 	pScrn->virtualY = pScrn->modes->VDisplay;
@@ -1878,7 +1736,6 @@
 	        i = partprod500TX[pScrn->displayWidth >> 5];
 	    } while (i == -1);
 	}
-	pGlint->realMXWidth = pScrn->displayWidth;
     }
 
     switch (pGlint->Chipset)
@@ -1886,6 +1743,7 @@
     case PCI_VENDOR_TI_CHIP_PERMEDIA2:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
     case PCI_VENDOR_TI_CHIP_PERMEDIA:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	pGlint->pprod = partprodPermedia[pScrn->displayWidth >> 5];
@@ -1893,12 +1751,98 @@
 	break;
     case PCI_VENDOR_3DLABS_CHIP_500TX:
     case PCI_VENDOR_3DLABS_CHIP_MX:
+    case PCI_VENDOR_3DLABS_CHIP_300SX:
     case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	pGlint->pprod = partprod500TX[pScrn->displayWidth >> 5];
 	pGlint->bppalign = 0;
 	break;
     }
 
+    if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
+         (pGlint->numMXDevices == 2) ) {
+	int bytesPerPixel, realMXWidthBytes, inputXSpanBytes;
+	CARD32 postMultiply, productEnable, use16xProduct, inputXSpan;
+	CARD32 binaryEval, glintApSize;
+
+	/* setup multi glint framebuffer aperture */
+	bytesPerPixel = (pScrn->bitsPerPixel >> 3);
+	realMXWidthBytes = pScrn->displayWidth * bytesPerPixel;
+
+	/* compute Input X Span field */
+	binaryEval = ((realMXWidthBytes << 1) - 1);
+	if (binaryEval & (8 << 10)) {      /* 8K */
+	    inputXSpan = 3;
+	    inputXSpanBytes = 8 * 1024;
+	}
+	else if (binaryEval & (4 << 10)) { /* 4K */
+	    inputXSpan = 2;
+	    inputXSpanBytes = 4 * 1024;
+	}
+	else if (binaryEval & (2 << 10)) { /* 2K */
+	    inputXSpan = 1;
+	    inputXSpanBytes = 2 * 1024;
+	}
+	else {                             /* 1K */
+	    inputXSpan = 0;
+	    inputXSpanBytes = 1024;
+	}
+
+	/* compute post multiply */
+	binaryEval = realMXWidthBytes >> 3;
+	postMultiply = 0;
+	while ((postMultiply < 5) && !(binaryEval & 1)) {
+	    postMultiply++;
+	    binaryEval >>= 1;
+	}
+	postMultiply <<= 7;
+
+	/* compute product enable fields */
+	if (binaryEval & ~0x1f) {		/* too big */
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "GLINTModeInit: width (%d) too big\n",
+		       pScrn->displayWidth);
+	    return FALSE;
+	}
+	if ((binaryEval & 0x12) == 0x12) {	/* clash between x2 and x16 */
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "GLINTModeInit: width (%d) is mult 18, not supported\n",
+		       pScrn->displayWidth);
+	    return FALSE;
+	}
+	if (binaryEval & 0x10) {
+	    productEnable = (((binaryEval & 0xf) | 0x2) << 3);
+	    use16xProduct = (1 << 2);
+	}
+	else {
+	    productEnable = ((binaryEval & 0xf) << 3);
+	    use16xProduct = 0;
+	}
+
+	/* compute GLINT Aperture Size field */
+	binaryEval = ((pScrn->videoRam << 11) - 1);
+	if (binaryEval & (32 << 20)) {      /* 32M */
+	    glintApSize = 3 << 10;
+	}
+	else if (binaryEval & (16 << 20)) { /* 16M */
+	    glintApSize = 2 << 10;
+	}
+	else if (binaryEval & (8 << 20)) {  /*  8M */
+	    glintApSize = 1 << 10;
+	}
+	else {                              /*  4M */
+	    glintApSize = 0 << 10;
+	}
+
+	pGlint->realMXWidth = ( glintApSize      | 
+                  	  	postMultiply     | 
+                  		productEnable    | 
+                  		use16xProduct    | 
+                  		inputXSpan       );
+
+	/* set the MULTI width for software rendering */
+	pScrn->displayWidth = inputXSpanBytes / bytesPerPixel;
+    }
+
     /* Set the current mode to the first in the list */
     pScrn->currentMode = pScrn->modes;
 
@@ -1912,24 +1856,20 @@
 
     /* Load bpp-specific modules */
     switch (pScrn->bitsPerPixel) {
-    case 1:
-    case 4:
     case 8:
     case 16:
-	mod = "fb";
-	break;
     case 24:
-	if (pix24bpp == 24)
-	    mod = "fb";
-	else
-	    mod = "xf24_32bpp";
+	mod = "fb";
 	break;
     case 32:
 	if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
-	    mod = "xf8_32bpp";
-	} else {
+	    if (xf86LoadSubModule(pScrn, "xf8_32bpp") == NULL) {
+		GLINTFreeRec(pScrn);
+		return FALSE;
+	    } else
+		xf86LoaderReqSymLists(xf8_32bppSymbols,NULL);
+	} else
 	    mod = "fb";
-	}
 	break;
     }
     if (mod && xf86LoadSubModule(pScrn, mod) == NULL) {
@@ -1963,6 +1903,7 @@
     /* Load I2C if needed */
     if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) ||
 	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V) ||
+	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA3) ||
 	(pGlint->Chipset == PCI_VENDOR_TI_CHIP_PERMEDIA2)) {
 	if (xf86LoadSubModule(pScrn, "i2c")) {
 	    I2CBusPtr pBus;
@@ -2035,27 +1976,10 @@
      * Map IO registers to virtual address space
      * We always map VGA IO registers - even if we don't need them
      */ 
-    if (pGlint->PciTagGeometry) {
-	pGlint->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, 
-		pGlint->PciTagGeometry, pGlint->IOAddress, 0x20000);
-	pGlint->IOBaseVGA = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, 
-		pGlint->PciTagGeometry, pGlint->IOAddress + GLINT_VGA_MMIO_OFF,
-	        0x2000);
-    } else {
-	pGlint->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, 
+    pGlint->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, 
 	       pGlint->PciTag, pGlint->IOAddress, 0x20000);
-	pGlint->IOBaseVGA = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, 
+    pGlint->IOBaseVGA = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, 
 	       pGlint->PciTag, pGlint->IOAddress + GLINT_VGA_MMIO_OFF, 0x2000);
-    }
-    if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
-	     (pGlint->numMXDevices == 2) ) {
-	pGlint->SecondaryAddress = pGlint->IOAddress;
-	pGlint->SecondaryBase = pGlint->IOBase+0x10000;
-    }
-    else {
-	pGlint->SecondaryAddress = pGlint->IOAddress;
-	pGlint->SecondaryBase = pGlint->IOBase;
-    }
 
     if (pGlint->IOBase == NULL)
 	return FALSE;
@@ -2069,55 +1993,8 @@
 	    return FALSE;
     }
 
-  /* Due to bugs in the Glint Delta/Permedia/500TX chips we need to do this */
-  /* Bizarre, but it works. */
-  if ((pGlint->Chipset != PCI_VENDOR_TI_CHIP_PERMEDIA2) &&
-      (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) &&
-      (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V)) {
-   if (pGlint->PciTag) {
-    unsigned long temp, temp2;
-    
-    /*
-     * and now for the magic.
-     * read old value
-     * write fffffffff
-     * read value
-     * write old value
-     */
-    if (pGlint->PciTagGeometry) {
-	temp = pciReadLong(pGlint->PciTagGeometry, 0x10);
-	pciWriteLong(pGlint->PciTagGeometry, 0x10, 0xffffffff);
-	temp2 = pciReadLong(pGlint->PciTagGeometry, 0x10);
-	pciWriteLong(pGlint->PciTagGeometry, 0x10, temp & 0xfffffff0);
-    }
-    
-    temp = pciReadLong(pGlint->PciTag, 0x10);
-    pciWriteLong(pGlint->PciTag, 0x10, 0xffffffff);
-    temp2 = pciReadLong(pGlint->PciTag, 0x10);
-    pciWriteLong(pGlint->PciTag, 0x10, temp);
-    
-    temp = pciReadLong(pGlint->PciTag, 0x14);
-    pciWriteLong(pGlint->PciTag, 0x14, 0xffffffff);
-    temp2 = pciReadLong(pGlint->PciTag, 0x14);
-    pciWriteLong(pGlint->PciTag, 0x14, temp);
-    
-    temp = pciReadLong(pGlint->PciTag, 0x18);
-    pciWriteLong(pGlint->PciTag, 0x18, 0xffffffff);
-    temp2 = pciReadLong(pGlint->PciTag, 0x18);
-    pciWriteLong(pGlint->PciTag, 0x18, temp);
-    
-    temp = pciReadLong(pGlint->PciTag, 0x1c);
-    pciWriteLong(pGlint->PciTag, 0x1c, 0xffffffff);
-    temp2 = pciReadLong(pGlint->PciTag, 0x1c);
-    pciWriteLong(pGlint->PciTag, 0x1c, temp);
-   
-    temp = pciReadLong(pGlint->PciTag, 0x20);
-    pciWriteLong(pGlint->PciTag, 0x20, 0xffffffff);
-    temp2 = pciReadLong(pGlint->PciTag, 0x20);
-    pciWriteLong(pGlint->PciTag, 0x20, temp);
-   }
-  }
-  return TRUE;
+    TRACE_EXIT("GLINTMapMem");
+    return TRUE;
 }
 
 
@@ -2196,12 +2073,16 @@
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
 	Permedia2VSave(pScrn, glintReg);
 	break;
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
+	Permedia3Save(pScrn, glintReg);
+	break;
     case PCI_VENDOR_TI_CHIP_PERMEDIA:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	PermediaSave(pScrn, glintReg);
 	(*pGlint->RamDac->Save)(pScrn, pGlint->RamDacRec, RAMDACreg);
 	break;
     case PCI_VENDOR_3DLABS_CHIP_500TX:
+    case PCI_VENDOR_3DLABS_CHIP_300SX:
     case PCI_VENDOR_3DLABS_CHIP_MX:
     case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
@@ -2232,9 +2113,6 @@
     GLINTRegPtr glintReg;
     RamDacHWRecPtr pRAMDAC = RAMDACHWPTR(pScrn);
     RamDacRegRecPtr RAMDACreg;
-    int bytesPerPixel, realMXWidthBytes, inputXSpanBytes;
-    CARD32 glintApSize, postMultiply, productEnable, use16xProduct, inputXSpan;
-    CARD32 binaryEval, value;
 
     if (pGlint->VGAcore) {
     	vgaHWPtr hwp = VGAHWPTR(pScrn);
@@ -2255,11 +2133,15 @@
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
 	ret = Permedia2VInit(pScrn, mode);
 	break;
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
+	ret = Permedia3Init(pScrn, mode);
+	break;
     case PCI_VENDOR_TI_CHIP_PERMEDIA:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	ret = PermediaInit(pScrn, mode);
 	break;
     case PCI_VENDOR_3DLABS_CHIP_500TX:
+    case PCI_VENDOR_3DLABS_CHIP_300SX:
     case PCI_VENDOR_3DLABS_CHIP_MX:
     case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
@@ -2294,12 +2176,16 @@
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
 	Permedia2VRestore(pScrn, glintReg);
 	break;
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
+	Permedia3Restore(pScrn, glintReg);
+	break;
     case PCI_VENDOR_TI_CHIP_PERMEDIA:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	PermediaRestore(pScrn, glintReg);
 	(*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg);
 	break;
     case PCI_VENDOR_3DLABS_CHIP_500TX:
+    case PCI_VENDOR_3DLABS_CHIP_300SX:
     case PCI_VENDOR_3DLABS_CHIP_MX:
     case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
@@ -2313,105 +2199,6 @@
 	break;
     }
 
-    if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
-         (pGlint->numMXDevices == 2) ) {
-
-	/* setup multi glint framebuffer aperture */
-
-	bytesPerPixel = (pScrn->bitsPerPixel >> 3);
-	realMXWidthBytes = pGlint->realMXWidth * bytesPerPixel;
-
-	/* compute Input X Span field */
-	binaryEval = ((realMXWidthBytes << 1) - 1);
-	if (binaryEval & (8 << 10)) {      /* 8K */
-	    inputXSpan = 3;
-	    inputXSpanBytes = 8 * 1024;
-	}
-	else if (binaryEval & (4 << 10)) { /* 4K */
-	    inputXSpan = 2;
-	    inputXSpanBytes = 4 * 1024;
-	}
-	else if (binaryEval & (2 << 10)) { /* 2K */
-	    inputXSpan = 1;
-	    inputXSpanBytes = 2 * 1024;
-	}
-	else {                             /* 1K */
-	    inputXSpan = 0;
-	    inputXSpanBytes = 1024;
-	}
-
-	/* set the MULTI width for software rendering */
-	pScrn->displayWidth = inputXSpanBytes / bytesPerPixel;
-
-	/* compute post multiply */
-	binaryEval = (realMXWidthBytes >> 3);
-	postMultiply = 0;
-	while ((postMultiply < 5) && !(binaryEval & 1)) {
-	    postMultiply++;
-	    binaryEval >>= 1;
-	}
-	postMultiply <<= 7;
-
-	/* compute product enable fields */
-	if (binaryEval & ~0x1f) {		/* too big */
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "GLINTModeInit: width (%d) too big\n",
-		       pScrn->displayWidth);
-	    return FALSE;
-	}
-	if ((binaryEval & 0x12) == 0x12) {	/* clash between x2 and x16 */
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		       "GLINTModeInit: width (%d) is mult 18, not supported\n",
-		       pScrn->displayWidth);
-	    return FALSE;
-	}
-	if (binaryEval & 0x10) {
-	    productEnable = (((binaryEval & 0xf) | 0x2) << 3);
-	    use16xProduct = (1 << 2);
-	}
-	else {
-	    productEnable = ((binaryEval & 0xf) << 3);
-	    use16xProduct = 0;
-	}
-
-	/* compute GLINT Aperture Size field */
-	binaryEval = ((pGlint->MXFbSize << 1) - 1);
-	if (binaryEval & (32 << 20)) {      /* 32M */
-	    glintApSize = 3 << 10;
-	}
-	else if (binaryEval & (16 << 20)) { /* 16M */
-	    glintApSize = 2 << 10;
-	}
-	else if (binaryEval & (8 << 20)) {  /*  8M */
-	    glintApSize = 1 << 10;
-	}
-	else {                              /*  4M */
-	    glintApSize = 0 << 10;
-	}
-
-	/* 
-	 * Setup HW 
-	 * 
-	 * Note: The order of discovery for the MX devices is dependent
-         * on which way the resource allocation code decides to scan the
-         * bus.  This setup assumes the first MX found owns the even
-         * scanlines.  Should the implementation change an scan the bus
-	 * in the opposite direction, then simple invert the indices for
-	 * MXPciInfo below.  If this is setup wrong, the bug will appear
-	 * as incorrect scanline interleaving when software rendering.
-         */
-	value = ( glintApSize      | 
-                  postMultiply     | 
-                  productEnable    | 
-                  use16xProduct    | 
-                  inputXSpan       );
-	GLINT_SLOW_WRITE_REG(value, GMultGLINTAperture);
-	value = pGlint->MXPciInfo[0]->memBase[2] & 0xFF800000;
-	GLINT_SLOW_WRITE_REG(value, GMultGLINT1);
-	value = pGlint->MXPciInfo[1]->memBase[2] & 0xFF800000;
-	GLINT_SLOW_WRITE_REG(value, GMultGLINT2);
-    }
-
     if (pGlint->VGAcore) {
     	vgaHWProtect(pScrn, FALSE);
     }
@@ -2446,19 +2233,23 @@
     switch (pGlint->Chipset) {
     case PCI_VENDOR_TI_CHIP_PERMEDIA2:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
-	Permedia2VideoReset(pScrn);
+	Permedia2VideoLeaveVT(pScrn);
 	Permedia2Restore(pScrn, glintReg);
 	break;
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
-	Permedia2VideoReset(pScrn);
+	Permedia2VideoLeaveVT(pScrn);
 	Permedia2VRestore(pScrn, glintReg);
 	break;
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
+	Permedia3Restore(pScrn, glintReg);
+	break;
     case PCI_VENDOR_TI_CHIP_PERMEDIA:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	PermediaRestore(pScrn, glintReg);
 	(*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg);
 	break;
     case PCI_VENDOR_3DLABS_CHIP_500TX:
+    case PCI_VENDOR_3DLABS_CHIP_300SX:
     case PCI_VENDOR_3DLABS_CHIP_MX:
     case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 	if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
@@ -2513,7 +2304,10 @@
     	    if (!vgaHWMapMem(pScrn))
 	   	 return FALSE;
 	}
-    	vgaHWSetMmioFuncs(hwp, pGlint->IOBaseVGA, 0);
+	/* Timing problem with PM3 & PM2V chips dont like being blasted */
+        if ((pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_PERMEDIA3) && 
+            (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V))
+    	    vgaHWSetMmioFuncs(hwp, pGlint->IOBaseVGA, 0);
     	vgaHWGetIOBase(hwp);
     }
 
@@ -2592,8 +2386,8 @@
 
 #ifdef XF86DRI
     /*
-     * Setup DRI after visuals have been established, but before cfbScreenInit
-     * is called.   cfbScreenInit will eventually call into the drivers
+     * Setup DRI after visuals have been established, but before fbScreenInit
+     * is called. fbScreenInit will eventually call into the drivers
      * InitGLXVisuals call back.
      */
     if (!pGlint->NoAccel && pGlint->HWCursor) {
@@ -2620,26 +2414,13 @@
     }
 
     switch (pScrn->bitsPerPixel) {
-    case 1:
-    case 4:
     case 8:
     case 16:
-	ret = fbScreenInit(pScreen, FBStart,
-			pScrn->virtualX, pScrn->virtualY,
-			pScrn->xDpi, pScrn->yDpi,
-			displayWidth, pScrn->bitsPerPixel);
-	break;
     case 24:
-	if (pix24bpp == 24)
-	    ret = fbScreenInit(pScreen, FBStart,
+	ret = fbScreenInit(pScreen, FBStart,
 			pScrn->virtualX, pScrn->virtualY,
 			pScrn->xDpi, pScrn->yDpi,
 			displayWidth, pScrn->bitsPerPixel);
-	else
-	    ret = cfb24_32ScreenInit(pScreen, FBStart,
-			pScrn->virtualX, pScrn->virtualY,
-			pScrn->xDpi, pScrn->yDpi,
-			displayWidth);
 	break;
     case 32:
 	if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR)
@@ -2665,6 +2446,9 @@
 
     xf86SetBlackWhitePixels(pScreen);
 
+    if (!pGlint->ShadowFB)
+	GLINTDGAInit(pScreen);
+
     if (pScrn->bitsPerPixel > 8) {
         /* Fixup RGB ordering */
         visual = pScreen->visuals + pScreen->numVisuals;
@@ -2688,6 +2472,9 @@
         case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
 	    Permedia2AccelInit(pScreen);
 	    break;
+	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
+	    Permedia3AccelInit(pScreen);
+	    break;
 	case PCI_VENDOR_TI_CHIP_PERMEDIA:
 	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	    PermediaAccelInit(pScreen);
@@ -2703,6 +2490,9 @@
 		TXAccelInit(pScreen);
 	    }
 	    break;
+	case PCI_VENDOR_3DLABS_CHIP_300SX:
+	    SXAccelInit(pScreen);
+	    break;
         }
     }
 
@@ -2714,6 +2504,7 @@
 
     /* Initialise cursor functions */
     if (pGlint->HWCursor) {
+	/* Handle VGA chipsets first */
 	if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) || 
 	    (pGlint->Chipset == PCI_VENDOR_TI_CHIP_PERMEDIA2))
 	    Permedia2HWCursorInit(pScreen);
@@ -2721,15 +2512,17 @@
 	if (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V)
 	    Permedia2vHWCursorInit(pScreen);
 	else
-	if ( ((pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) &&
-	      (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V) &&
-	      (pGlint->Chipset != PCI_VENDOR_TI_CHIP_PERMEDIA2)) &&
-	     ((pGlint->RamDac->RamDacType == (IBM526DB_RAMDAC)) ||
+	if (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA3)
+	    Permedia3HWCursorInit(pScreen);
+	else
+	/* If we get here pGlint->Ramdac should have been set */
+	if ( ((pGlint->RamDac->RamDacType == (IBM526DB_RAMDAC)) ||
 	      (pGlint->RamDac->RamDacType == (IBM526_RAMDAC)) ||
 	      (pGlint->RamDac->RamDacType == (IBM640_RAMDAC))) )
 	    		glintIBMHWCursorInit(pScreen);
 	else
-	if (pGlint->RamDac->RamDacType == (TI3030_RAMDAC))
+	if ( (pGlint->RamDac->RamDacType == (TI3030_RAMDAC)) ||
+	     (pGlint->RamDac->RamDacType == (TI3026_RAMDAC)) )
 	    		glintTIHWCursorInit(pScreen);
     }
 
@@ -2738,6 +2531,7 @@
 	return FALSE;
 
     if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V) ||
+	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA3) || 
 	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) || 
 	(pGlint->Chipset == PCI_VENDOR_TI_CHIP_PERMEDIA2)) {
     	if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
@@ -2818,7 +2612,7 @@
 }
 
 /* Usually mandatory */
-static Bool
+Bool
 GLINTSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
     ScrnInfoPtr pScrn;
@@ -2831,27 +2625,31 @@
 	Bool ret = fbdevHWSwitchMode(scrnIndex, mode, flags);
 
 	if (!pGlint->NoAccel) {
-    		switch (pGlint->Chipset) {
-    			case PCI_VENDOR_TI_CHIP_PERMEDIA2:
-    			case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
-    			case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
-				Permedia2InitializeEngine(pScrn);
-				break;
-    			case PCI_VENDOR_TI_CHIP_PERMEDIA:
-    			case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
-				PermediaInitializeEngine(pScrn);
-				break;
-    			case PCI_VENDOR_3DLABS_CHIP_500TX:
-    			case PCI_VENDOR_3DLABS_CHIP_MX:
-    			case PCI_VENDOR_3DLABS_CHIP_GAMMA:
-				if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
-	     			(pGlint->numMXDevices == 2) ) {
-	    				DualMXInitializeEngine(pScrn);
-				} else {
-	    				TXInitializeEngine(pScrn);
-				}
-				break;
-    			}
+    	    switch (pGlint->Chipset) {
+    		case PCI_VENDOR_TI_CHIP_PERMEDIA2:
+    		case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
+    		case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
+			Permedia2InitializeEngine(pScrn);
+			break;
+    		case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
+			Permedia3InitializeEngine(pScrn);
+			break;
+    		case PCI_VENDOR_TI_CHIP_PERMEDIA:
+    		case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
+			PermediaInitializeEngine(pScrn);
+			break;
+    		case PCI_VENDOR_3DLABS_CHIP_500TX:
+    		case PCI_VENDOR_3DLABS_CHIP_300SX:
+    		case PCI_VENDOR_3DLABS_CHIP_MX:
+    		case PCI_VENDOR_3DLABS_CHIP_GAMMA:
+			if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
+	     		    (pGlint->numMXDevices == 2)) {
+	    			DualMXInitializeEngine(pScrn);
+			} else {
+	    			TXInitializeEngine(pScrn);
+			}
+			break;
+    	    }
 	}
 
 	return ret;
@@ -2866,7 +2664,7 @@
  * displayed location in the video memory.
  */
 /* Usually mandatory */
-static void 
+void 
 GLINTAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
     ScrnInfoPtr pScrn;
@@ -2896,6 +2694,7 @@
     case PCI_VENDOR_TI_CHIP_PERMEDIA2:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
 	GLINT_SLOW_WRITE_REG(base, PMScreenBase);
 	break;
     }
@@ -2914,22 +2713,23 @@
 GLINTEnterVT(int scrnIndex, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    GLINTPtr pGlint = GLINTPTR(pScrn);
 
-    /* Should we re-save the text mode on each VT enter? */
-    if (!GLINTModeInit(pScrn, pScrn->currentMode))
-	return FALSE;
+    TRACE_ENTER("GLINTEnterVT");
 
-    return TRUE;
-}
-
-static Bool
-GLINTEnterVTFBDev(int scrnIndex, int flags)
-{
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-    GLINTPtr pGlint = GLINTPTR(pScrn);
+    if (pGlint->FBDev)
+    	fbdevHWEnterVT(scrnIndex, flags);
+    else
+    	/* Should we re-save the text mode on each VT enter? */
+    	if (!GLINTModeInit(pScrn, pScrn->currentMode))
+		return FALSE;
 
-    TRACE_ENTER("GLINTEnterVTFBDev");
-    fbdevHWEnterVT(scrnIndex, flags);
+    switch (pGlint->Chipset) {
+    case PCI_VENDOR_TI_CHIP_PERMEDIA2:
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
+	Permedia2VideoEnterVT(pScrn);
+    }
 
     if (!pGlint->NoAccel) {
     	switch (pGlint->Chipset) {
@@ -2938,11 +2738,15 @@
     	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
 		Permedia2InitializeEngine(pScrn);
 		break;
+    	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
+		Permedia3InitializeEngine(pScrn);
+		break;
     	case PCI_VENDOR_TI_CHIP_PERMEDIA:
     	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 		PermediaInitializeEngine(pScrn);
 		break;
     	case PCI_VENDOR_3DLABS_CHIP_500TX:
+    	case PCI_VENDOR_3DLABS_CHIP_300SX:
     	case PCI_VENDOR_3DLABS_CHIP_MX:
     	case PCI_VENDOR_3DLABS_CHIP_GAMMA:
 		if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) &&
@@ -3009,7 +2813,7 @@
         case PCI_VENDOR_TI_CHIP_PERMEDIA2:
         case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
         case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
-	    Permedia2VideoUninit(xf86Screens[scrnIndex]);
+	    Permedia2VideoUninit(pScrn);
     }
 
     if (pScrn->vtSema) {
@@ -3030,6 +2834,8 @@
 	xf86DestroyCursorInfoRec(pGlint->CursorInfoRec);
     if (pGlint->ShadowPtr)
 	xfree(pGlint->ShadowPtr);
+    if (pGlint->DGAModes)
+	xfree(pGlint->DGAModes);
     pScrn->vtSema = FALSE;
     
     if (xf86IsPc98())
@@ -3051,7 +2857,7 @@
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
     TRACE_ENTER("GLINTFreeScreen");
-    if (pGlint->FBDev && xf86LoaderCheckSymbol("fbdevHWFreeRec"))
+    if ((pGlint->FBDev || FBDevProbed) && xf86LoaderCheckSymbol("fbdevHWFreeRec"))
 	fbdevHWFreeRec(xf86Screens[scrnIndex]);
     if (pGlint->VGAcore && xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
     	vgaHWFreeHWRec(xf86Screens[scrnIndex]);
@@ -3079,6 +2885,7 @@
 	 * side appears if not aligned properly */
         switch (pGlint->Chipset) {
         case PCI_VENDOR_TI_CHIP_PERMEDIA2:
+        case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
         case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
         case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
           if (mode->HDisplay % 8) {
@@ -3133,15 +2940,17 @@
     switch (pGlint->Chipset) {
     case PCI_VENDOR_TI_CHIP_PERMEDIA2:
     case PCI_VENDOR_TI_CHIP_PERMEDIA:
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA3:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
     case PCI_VENDOR_3DLABS_CHIP_PERMEDIA:
 	temp = GLINT_READ_REG(PMVideoControl);
 	if (unblank) temp |= 1;
 	else	     temp &= 0xFFFFFFFE;
-	GLINT_WRITE_REG(temp, PMVideoControl);
+	GLINT_SLOW_WRITE_REG(temp, PMVideoControl);
 	break;
     case PCI_VENDOR_3DLABS_CHIP_500TX:
+    case PCI_VENDOR_3DLABS_CHIP_300SX:
     case PCI_VENDOR_3DLABS_CHIP_MX:
 	break;
     }
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h:1.15 xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h:1.19
--- xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h:1.15	Mon Mar  6 17:37:47 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h	Wed May 10 13:01:31 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.15 2000/03/07 01:37:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.19 2000/05/10 20:01:31 alanh Exp $ */
 
 /*
  * glint register file 
@@ -35,6 +35,9 @@
 #define PCI_CHIP_3DLABS_PERMEDIA				0x04
 #define PCI_CHIP_3DLABS_MX					0x06
 #define PCI_CHIP_3DLABS_PERMEDIA2				0x07
+#define PCI_CHIP_3DLABS_GAMMA					0x08
+#define PCI_CHIP_3DLABS_PERMEDIA2V				0x09
+#define PCI_CHIP_3DLABS_PERMEDIA3				0x0A
 #define PCI_CHIP_TI_PERMEDIA 	  				0x3d04
 
 #define CFGRevisionId						0x08
@@ -90,6 +93,10 @@
 #define   SCLK_SEL_MCLK_HALF	(3 << 10)
 #define ByDMAControl							0x00D8
 
+/* GLINT R3 & Permedia3 Region 0 Bypass Controls */
+#define PM3ByAperture1Mode						0x0300
+#define PM3ByAperture2Mode						0x0328
+
 /* GLINT 500TX LocalBuffer Registers */
 #define LBMemoryCtl							0x1000
 #define   LBNumBanksMask	0x00000001
@@ -192,6 +199,17 @@
 #define PMFramebufferWriteMask					        0x1140
 #define PMCount								0x1180
 
+/* Permedia 3 & GLINT R3 Memory Control */
+#define PM3MemCounter							0x1000
+#define PM3MemBypassWriteMask						0x1008
+#define PM3MemScratch							0x1010
+#define PM3LocalMemCaps							0x1018
+#define PM3LocalMemTimings						0x1020
+#define PM3LocalMemControl						0x1028
+#define PM3LocalMemRefresh						0x1030
+#define PM3LocalMemPowerDown						0x1038
+#define PM3RemoteMemControl						0x1100
+
 /* Framebuffer Registers */
 #define FBMemoryCtl							0x1800
 #define FBModeSel							0x1808
@@ -1146,15 +1164,16 @@
 #define GLINT_READ_REG(r)					\
 	GLINT_VERB_READ_REG(pGlint,r,__FILE__,__LINE__)
 #else
-#define GLINT_WRITE_REG(v,r)					\
-do{								\
-	*(volatile CARD32 *)((char *)pGlint->IOBase+(r))=v;	\
-	mem_barrier();						\
-}while(0)
-#define GLINT_READ_REG(r)					\
-	(*(volatile CARD32 *)((char *)pGlint->IOBase+(r)))
-#endif                                        
 
+#define GLINT_WRITE_REG(v,r) MMIO_OUT32(pGlint->IOBase,(unsigned long)r, v)
+#define GLINT_READ_REG(r) MMIO_IN32(pGlint->IOBase,(unsigned long)r)
+#define GLINT_SECONDARY_WRITE_REG(v,r) \
+			MMIO_OUT32(pGlint->IOBase,(unsigned long)r+0x10000, v)
+#define GLINT_SECONDARY_READ_REG(r) \
+			MMIO_IN32(pGlint->IOBase,(unsigned long)r+0x10000)
+
+#endif /* DEBUG */
+
 #define GLINT_WAIT(n)						\
 do{								\
 	if(!pGlint->UsePCIRetry)				\
@@ -1179,23 +1198,12 @@
 	GLINTDACDelay(5);					\
 }while(0)
 
-#define GLINT_SECONDARY_WRITE_REG(v,r)                          	\
-do{									\
-	*(volatile CARD32 *)((char *)pGlint->SecondaryBase+(r))=v;	\
-}while(0)
-
-#define GLINT_SECONDARY_READ_REG(r)                             	\
-	(*(volatile CARD32 *)((char *)pGlint->SecondaryBase+(r)))
-
 #define GLINT_SECONDARY_SLOW_WRITE_REG(v,r)				\
 do{									\
 	while(GLINT_READ_REG(InFIFOSpace)<1);				\
         GLINT_SECONDARY_WRITE_REG(v,r);					\
 }while(0)
 
-#define GLINT_LOAD_PAR(v,r) \
-        *(unsigned long *)((char*)pGlint->IOBase+r) = *((unsigned long *) &v)
-
 #define REPLICATE(r)						\
 {								\
 	if (pScrn->bitsPerPixel == 16) {			\
@@ -1208,14 +1216,21 @@
 	}							\
 }
 
+#ifndef XF86DRI
 #define LOADROP(rop)						\
 {								\
-	if (pGlint->ROP != rop) {				\
+	if (pGlint->ROP != rop)	{				\
 		GLINT_WRITE_REG(rop<<1|UNIT_ENABLE, LogicalOpMode);	\
 		pGlint->ROP = rop;				\
 	}							\
 }
-
+#else
+#define LOADROP(rop) \
+	{				\
+		GLINT_WRITE_REG(rop<<1|UNIT_ENABLE, LogicalOpMode);	\
+		pGlint->ROP = rop;				\
+	}
+#endif
 	
 #define CHECKCLIPPING						\
 {								\
@@ -1226,6 +1241,7 @@
 	}							\
 }
 
+#ifndef XF86DRI
 #define DO_PLANEMASK(planemask)					\
 { 								\
 	if (planemask != pGlint->planemask) {			\
@@ -1234,4 +1250,12 @@
 		GLINT_WRITE_REG(planemask, FBHardwareWriteMask);\
 	}							\
 } 
+#else
+#define DO_PLANEMASK(planemask)					\
+	{							\
+		pGlint->planemask = planemask;			\
+		REPLICATE(planemask); 				\
+		GLINT_WRITE_REG(planemask, FBHardwareWriteMask);\
+	}
+#endif
 #endif
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c:1.23 xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c:1.24
--- xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c:1.23	Fri Feb 25 13:02:50 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c	Fri Mar 31 14:55:43 2000
@@ -30,7 +30,7 @@
  * 
  * Permedia 2 accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.23 2000/02/25 21:02:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.24 2000/03/31 22:55:43 dawes Exp $ */
 
 #include "Xarch.h"
 #include "xf86.h"
@@ -288,8 +288,11 @@
         infoPtr->PolylinesThinSolidFlags = 0;
         infoPtr->SetupForSolidLine = Permedia2SetupForSolidLine;
         infoPtr->SubsequentSolidHorVertLine = Permedia2SubsequentHorVertLine;
-	infoPtr->SubsequentSolidBresenhamLine = 
+        if (!(pScrn->overlayFlags & OVERLAY_8_32_PLANAR))
+        {
+        	infoPtr->SubsequentSolidBresenhamLine = 
 				Permedia2SubsequentSolidBresenhamLine;
+        }
 	infoPtr->PolySegmentThinSolid = Permedia2PolySegmentThinSolidWrapper;
 	infoPtr->PolylinesThinSolid = Permedia2PolylinesThinSolidWrapper;
     	infoPtr->SetupForSolidFill = Permedia2SetupForFillRectSolid;
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c:1.14 xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c:1.17
--- xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c:1.14	Sat Dec 11 12:03:15 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c	Mon Jun 19 08:01:01 2000
@@ -1,41 +1,28 @@
 /*
- * Permedia 2 Xv Driver for Elsa Winner Office/2000 and GLoria Synergy cards
+ *  Permedia 2 Xv Driver
  *
- * Copyright (C) 1998, 1999 Michael Schimek <m.schimek@netway.at>
+ *  Copyright (C) 1998-2000 Michael H. Schimek <m.schimek@netway.at>
  *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Michael Schimek not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Michael Schimek makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
  *
- * MICHAEL SCHIMEK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL MICHAEL SCHIMEK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
  *
- * Kernel backbone, docs and test/demo applications at
- * <http://millennium.diads.com/mschimek/pm2>.
- *
- * Implementation note: The kernel backbone uses VSA, VSB and DMA (FIFO)
- * interrupts. It launches Input and Output FIFO DMAs when entered in
- * xvipcHandshake(). These resources are assumed to be available any time,
- * the server code must not touch them. All DMA will be completed before
- * returning from the kernel, no need to test.
- *
- * This driver is meant for the on-board video hardware only, no V4L
- * support in this file.
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  */
+ 
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.17 2000/06/19 15:01:01 tsi Exp $ */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.14 1999/12/11 20:03:15 mvojkovi Exp $ */
-
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
@@ -50,125 +37,152 @@
 #include "glint_regs.h"
 #include "glint.h"
 
+#ifndef XvExtension
+
+void Permedia2VideoInit(ScreenPtr pScreen) {}
+void Permedia2VideoUninit(ScrnInfoPtr pScrn) {}
+void Permedia2VideoEnterVT(ScrnInfoPtr pScrn) {}
+void Permedia2VideoLeaveVT(ScrnInfoPtr pScrn) {}
+
+#else
+
+#undef MIN
+#undef ABS
+#undef CLAMP
+#undef ENTRIES
+
+#define MIN(a, b) (((a) < (b)) ? (a) : (b)) 
+#define ABS(n) (((n) < 0) ? -(n) : (n))
+#define CLAMP(v, min, max) (((v) < (min)) ? (min) : MIN(v, max))
+#define ENTRIES(array) (sizeof(array) / sizeof((array)[0]))
+
+#define ADAPTORS 3
+#define PORTS 6
+
+#define PCI_SUBSYSTEM_ID_WINNER_2000_P2C	0x0a311048
+#define PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2C	0x0a321048
+#define PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A	0x0a351048
+#define PCI_SUBSYSTEM_ID_WINNER_2000_P2A	0x0a441048
+
+/*
+ *  Proprietary kernel backbone interface
+ */
+
 #define XVIPC_MAGIC		0x6A5D70E6
 #define XVIPC_VERSION		1
 #define VIDIOC_PM2_XVIPC	0x00007F7F
 
 typedef enum {
-	OP_ATTR = 0,
-	OP_RESET = 8,		/* unused */
-	OP_START,
-	OP_STOP,
-	OP_PLUG,
-	OP_VIDEOSTD,
-	OP_WINDOW,		/* unused */
-	OP_CONNECT,
-	OP_EVENT,
-	OP_ALLOC,
-	OP_FREE,
-	OP_UPDATE,
-	OP_NOP			/* ignored */
+    OP_ATTR = 0,
+    OP_RESET = 8,	/* unused */
+    OP_START,
+    OP_STOP,
+    OP_PLUG,
+    OP_VIDEOSTD,
+    OP_WINDOW,		/* unused */
+    OP_CONNECT,
+    OP_EVENT,
+    OP_ALLOC,
+    OP_FREE,
+    OP_UPDATE,
+    OP_NOP,		/* ignored */
+    OP_ENTER,
+    OP_LEAVE,
+    OP_DISCONNECT
 } xvipc_op;
 
 typedef struct _pm2_xvipc {
-	int			magic;
-	void 			*pm2p, *pAPriv;
-	int			port, op, time, block;
-	int			a,b,c,d,e,f;
+    int			magic;
+    void 		*pm2p, *pAPriv;
+    int			port, op, time, block;
+    int			a, b, c, d, e, f;
 } pm2_xvipc;
 
 static pm2_xvipc xvipc;
 static int xvipc_fd = -1;
 
-typedef enum {
-    OPTION_DEVICE,
-    OPTION_FPS,
-    OPTION_BUFFERS,
-    OPTION_EXPOSE
-} OptToken;
-
-static OptionInfoRec AdaptorOptions[] = {
-    { OPTION_DEVICE,		"Device",	OPTV_STRING,	{0}, FALSE },
-    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
-};
-static OptionInfoRec InputOptions[] = {
-    { OPTION_BUFFERS,		"Buffers",	OPTV_INTEGER,	{0}, FALSE },
-    { OPTION_FPS,		"FramesPerSec", OPTV_INTEGER,	{0}, FALSE },
-    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
-};
-static OptionInfoRec OutputOptions[] = {
-    { OPTION_BUFFERS,		"Buffers",	OPTV_INTEGER,	{0}, FALSE },
-    { OPTION_EXPOSE,		"Expose",	OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_FPS,		"FramesPerSec", OPTV_INTEGER,	{0}, FALSE },
-    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
-};
-
-#define PCI_SUBSYSTEM_ID_WINNER_2000_P2C	0x0a311048
-#define PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2C	0x0a321048
-#define PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A	0x0a351048
-#define PCI_SUBSYSTEM_ID_WINNER_2000_P2A	0x0a441048
 
-#define SAA7111_SLAVE_ADDRESS 0x48
-#define SAA7125_SLAVE_ADDRESS 0x88
+#define MAX_BUFFERS 2
 
 typedef struct {
-    CARD32			xy, wh;			/* 16.0 16.0 dw */
-    INT32			s, t;			/* 12.20 fp */
+    CARD32			xy, wh;				/* 16.0 16.0 */
+    INT32			s, t;				/* 12.20 fp */
     short			y1, y2;
 } CookieRec, *CookiePtr;
 
 typedef struct _PortPrivRec {
     struct _AdaptorPrivRec *    pAdaptor;
     I2CDevRec                   I2CDev;
-    int                         Plug;
-    INT32			Attribute[8];		/* Brig, Con, Sat, Hue, Int, Filt */
-    FBAreaPtr			pFBArea[3];
-    int				Buffers;
-    CARD32			BufferBase[3];		/* x1 */
-    CARD32			BufferStride;		/* x1 */
-    CARD32			BufferPProd;		/* PProd(BufferStride / 2) */
-    INT32			vx, vy, vw, vh;		/* 12.10 fp; int */
+
+    INT32			Attribute[8];			/* Brig, Con, Sat, Hue, Int, Filt, BkgCol, Alpha */
+
+    int				BuffersRequested;
+    int				BuffersAllocated;
+    FBAreaPtr			pFBArea[MAX_BUFFERS];
+    CARD32			BufferBase[MAX_BUFFERS];	/* FB byte offset */
+    CARD32			BufferStride;			/* bytes */
+    CARD32			BufferPProd;			/* PProd(BufferStride in buffer pixels) */
+
+    INT32			vx, vy, vw, vh;			/* 12.10 fp */
     int				dx, dy, dw, dh;
     int				fw, fh;
+
     CookiePtr			pCookies;
     int				nCookies;
-    INT32			dS, dT;			/* 12.20 fp */
-    int				APO;
+    INT32			dS, dT;				/* 12.20 fp */
+
+    int				Id, Bpp;			/* Scaler */
+
+    int                         Plug;
+    int				BkgCol;				/* RGB 5:6:5; 5:6:5 */
+    Bool			StreamOn;			/* buffer <-> hardware */
+    int				VideoOn;			/* buffer <-> screen */
+    int				VideoStdReq;
+
+    int				StopDelay;
+    
     int				FramesPerSec, FrameAcc;
-    int				BkgCol;			/* RGB 5:6:5;5:6:5 */
-    int				VideoOn;		/* No, Once, Yes */
-    Bool			StreamOn;
+
 } PortPrivRec, *PortPrivPtr;
 
+enum { VIDEO_OFF, VIDEO_ONE_SHOT, VIDEO_ON };
+
 typedef struct _LFBAreaRec {
     struct _LFBAreaRec *	Next;
-    FBAreaPtr			pFBArea;
     int				Linear;
+    FBAreaPtr			pFBArea;
 } LFBAreaRec, *LFBAreaPtr;
 
 typedef struct _AdaptorPrivRec {
     struct _AdaptorPrivRec *	Next;
     ScrnInfoPtr			pScrn;
+
     void *			pm2p;
     LFBAreaPtr			LFBList;
-    CARD32			FifoControl;
+
+    CARD32			dFifoControl;
+    CARD32			dDitherMode;
+    CARD32			dAlphaBlendMode;
+    CARD32			dTextureDataFormat;
+
     OsTimerPtr			Timer;
-    int                         VideoStd;
+    int				TimerUsers;
+    int				Delay, Instant;
+
     int				FramesPerSec;
     int				FrameLines;
-    int				IntLine;		/* Frame */
-    int				LinePer;		/* nsec */
-    PortPrivRec                 Port[2];
-} AdaptorPrivRec, *AdaptorPrivPtr;
+    int				IntLine;			/* Frame, not field */
+    int				LinePer;			/* nsec */
 
-static AdaptorPrivPtr AdaptorPrivList = NULL;
+    Bool			VideoIO;
+    int                         VideoStd;
 
-#define PORTNUM(p) (((p) == &pAPriv->Port[0]) ? 0 : 1)
-#define BPPSHIFT(g) (2 - (g)->BppShift)			/* BytesPerPixel = 1 << BPPSHIFT(pGlint) */
+    PortPrivRec                 Port[PORTS];
 
-#undef COLORBARS /* Display them while output is unused, else just shut off */
-#define DEBUG(x) /* x */
+} AdaptorPrivRec, *AdaptorPrivPtr;
 
+static AdaptorPrivPtr AdaptorPrivList = NULL;
+
 #define FreeCookies(pPPriv)		\
 do {					\
     if ((pPPriv)->pCookies) {		\
@@ -177,25 +191,68 @@
     }					\
 } while (0)
 
-/* Forward */
-static CARD32 TimerCallback(OsTimerPtr pTim, CARD32 now, pointer p);
-static void DelayedStopVideo(PortPrivPtr pPPriv);
-static Bool xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block);
+#define PORTNUM(p) ((int)((p) - &pAPriv->Port[0]))
+#define BPPSHIFT(g) (2 - (g)->BppShift)	/* Bytes per pixel = 1 << BPPSHIFT(pGlint) */
+
+#define DEBUG(x)
+
+static const Bool ColorBars = FALSE;
+
+
+/*
+ *  XF86Config VideoAdaptor options
+ */
 
+typedef enum {
+    OPTION_DEVICE,
+    OPTION_FPS,
+    OPTION_BUFFERS,
+    OPTION_ENCODING,
+    OPTION_EXPOSE	/* obsolete, ignored */
+} OptToken;
+
+static OptionInfoRec AdaptorOptions[] = {
+    { OPTION_DEVICE,		"Device",	OPTV_STRING,	{0}, FALSE },
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+static OptionInfoRec InputOptions[] = {
+    { OPTION_BUFFERS,		"Buffers",	OPTV_INTEGER,	{0}, FALSE },
+    { OPTION_FPS,		"FramesPerSec", OPTV_INTEGER,	{0}, FALSE },
+    { OPTION_ENCODING,		"Encoding",	OPTV_STRING,	{0}, FALSE },
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+static OptionInfoRec OutputOptions[] = {
+    { OPTION_BUFFERS,		"Buffers",	OPTV_INTEGER,	{0}, FALSE },
+    { OPTION_EXPOSE,		"Expose",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_FPS,		"FramesPerSec", OPTV_INTEGER,	{0}, FALSE },
+    { OPTION_ENCODING,		"Encoding",	OPTV_STRING,	{0}, FALSE },
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+
+
+/*
+ *  Attributes
+ */
+ 
 #define XV_ENCODING	"XV_ENCODING"
-#define XV_BRIGHTNESS  	"XV_BRIGHTNESS"
+#define XV_BRIGHTNESS	"XV_BRIGHTNESS"
 #define XV_CONTRAST 	"XV_CONTRAST"
-#define XV_SATURATION  	"XV_SATURATION"
+#define XV_SATURATION	"XV_SATURATION"
 #define XV_HUE		"XV_HUE"
+
 /* Proprietary */
-#define XV_INTERLACE	"XV_INTERLACE"			/* Integer */
-#define XV_FILTER	"XV_FILTER"			/* Boolean */
-#define XV_BKGCOLOR	"XV_BKGCOLOR"			/* Integer */
+
+#define XV_INTERLACE	"XV_INTERLACE"	/* Interlaced (bool) */
+#define XV_FILTER	"XV_FILTER"	/* Bilinear filter (bool) */
+#define XV_BKGCOLOR	"XV_BKGCOLOR"	/* Output background (0x00RRGGBB) */
+#define XV_ALPHA	"XV_ALPHA"	/* Scaler alpha channel (bool) */
 
 #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
 
 static Atom xvEncoding, xvBrightness, xvContrast, xvSaturation, xvHue;
-static Atom xvInterlace, xvFilter, xvBkgColor;
+static Atom xvInterlace, xvFilter, xvBkgColor, xvAlpha;
+
+/* Input */
 
 static XF86VideoEncodingRec
 InputVideoEncodings[] =
@@ -211,6 +268,28 @@
     { 8, "secam-svideo",		704, 576, { 1, 50 }},
 };
 
+static XF86AttributeRec
+InputVideoAttributes[] =
+{
+    { XvSettable | XvGettable, -1000, +1000, XV_BRIGHTNESS },
+    { XvSettable | XvGettable, -3000, +1000, XV_CONTRAST },
+    { XvSettable | XvGettable, -3000, +1000, XV_SATURATION },
+    { XvSettable | XvGettable, -1000, +1000, XV_HUE },
+    { XvSettable | XvGettable, 0, 2, XV_INTERLACE },
+    { XvSettable | XvGettable, 0, 1, XV_FILTER },
+};
+
+static XF86VideoFormatRec
+InputVideoFormats[] =
+{
+    { 8,  TrueColor }, /* Dithered */
+    { 15, TrueColor },
+    { 16, TrueColor },
+    { 24, TrueColor },
+};
+
+/* Output */
+
 static XF86VideoEncodingRec
 OutputVideoEncodings[] =
 {
@@ -220,16 +299,17 @@
     { 3, "ntsc-svideo",			704, 480, { 1001, 60000 }},
 };
 
-static XF86VideoFormatRec
-InputVideoFormats[] = {
-    { 8,  TrueColor }, /* Dithered */
-    { 15, TrueColor },
-    { 16, TrueColor },
-    { 24, TrueColor },
+static XF86AttributeRec
+OutputVideoAttributes[] =
+{
+    { XvSettable | XvGettable, 0, 2, XV_INTERLACE },
+    { XvSettable | XvGettable, 0, 1, XV_FILTER },
+    { XvSettable | XvGettable, 0x000000, 0xFFFFFF, XV_BKGCOLOR },
 };
 
 static XF86VideoFormatRec
-OutputVideoFormats[] = {
+OutputVideoFormats[] =
+{
     { 8,  TrueColor },
     { 8,  PseudoColor }, /* Using .. */
     { 8,  StaticColor },
@@ -240,6 +320,129 @@
     { 24, TrueColor },
 };
 
+/* Scaler */
+
+static XF86VideoEncodingRec
+ScalerEncodings[] =
+{
+    { 0, "XV_IMAGE", 2047, 2047, { 1, 1 }},
+};
+
+static XF86AttributeRec
+ScalerAttributes[] =
+{
+    { XvSettable | XvGettable, 0, 1, XV_FILTER },
+    { XvSettable | XvGettable, 0, 1, XV_ALPHA },
+};
+
+#define ScalerVideoFormats InputVideoFormats
+
+/*
+ *  FOURCC from http://www.webartz.com/fourcc
+ *  Generic GUID for legacy FOURCC XXXXXXXX-0000-0010-8000-00AA00389B71
+ */
+#define LE4CC(a,b,c,d) (((CARD32)(a)&0xFF)|(((CARD32)(b)&0xFF)<<8)|(((CARD32)(c)&0xFF)<<16)|(((CARD32)(d)&0xFF)<<24))
+#define GUID4CC(a,b,c,d) { a,b,c,d,0,0,0,0x10,0x80,0,0,0xAA,0,0x38,0x9B,0x71 }
+
+#define NoOrder LSBFirst
+
+static XF86ImageRec
+ScalerImages[] =
+{
+    /* Planar YVU 4:2:0 (emulated) */
+    { LE4CC('Y','V','1','2'), XvYUV, NoOrder, GUID4CC('Y','V','1','2'),
+      12, XvPlanar, 3, 0, 0, 0, 0,
+      8, 8, 8,  1, 2, 2,  1, 2, 2, "YVU", XvTopToBottom },
+
+    /* Packed YUYV 4:2:2 */
+    { LE4CC('Y','U','Y','2'), XvYUV, NoOrder, GUID4CC('Y','U','Y','2'),
+      16, XvPacked, 1, 0, 0, 0, 0,
+      8, 8, 8,  1, 2, 2,  1, 1, 1, "YUYV", XvTopToBottom },
+
+    /* Packed UYVY 4:2:2 */
+    { LE4CC('U','Y','V','Y'), XvYUV, NoOrder, GUID4CC('U','Y','V','Y'),
+      16, XvPacked, 1, 0, 0, 0, 0,
+      8, 8, 8,  1, 2, 2,  1, 1, 1, "UYVY", XvTopToBottom },
+
+    /* Packed YUVA 4:4:4 */
+    { LE4CC('Y','U','V','A') /* XXX not registered */, XvYUV, LSBFirst, { 0 },
+      32, XvPacked, 1, 0, 0, 0, 0,
+      8, 8, 8,  1, 1, 1,  1, 1, 1, "YUVA", XvTopToBottom },
+
+    /* Packed VUYA 4:4:4 */
+    { LE4CC('V','U','Y','A') /* XXX not registered */, XvYUV, LSBFirst, { 0 },
+      32, XvPacked, 1, 0, 0, 0, 0,
+      8, 8, 8,  1, 1, 1,  1, 1, 1, "VUYA", XvTopToBottom },
+
+    /* RGBA 8:8:8:8 */
+    { 0x41, XvRGB, LSBFirst, { 0 },
+      32, XvPacked, 1, 24, 0x0000FF, 0x00FF00, 0xFF0000, 
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "RGBA", XvTopToBottom },
+
+    /* RGB 5:6:5 */
+    { 0x42, XvRGB, LSBFirst, { 0 },
+      16, XvPacked, 1, 16, 0x001F, 0x07E0, 0xF800, 
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "RGB", XvTopToBottom },
+
+    /* RGBA 5:5:5:1 */
+    { 0x43, XvRGB, LSBFirst, { 0 },
+      16, XvPacked, 1, 15, 0x001F, 0x03E0, 0x7C00, 
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "RGBA", XvTopToBottom },
+
+    /* RGBA 4:4:4:4 */
+    { 0x44, XvRGB, LSBFirst, { 0 },
+      16, XvPacked, 1, 12, 0x000F, 0x00F0, 0x0F00, 
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "RGBA", XvTopToBottom },
+
+    /* RGBA 2:3:2:1 */
+    { 0x45, XvRGB, NoOrder, { 0 },
+      8, XvPacked, 1, 7, 0x03, 0x1C, 0x60, 
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "RGBA", XvTopToBottom },
+
+    /* RGB 3:3:2 */
+    { 0x46, XvRGB, NoOrder, { 0 },
+      8, XvPacked, 1, 8, 0x07, 0x38, 0xC0, 
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "RGB", XvTopToBottom },
+
+    /* BGRA 8:8:8:8 */
+    { 0x47, XvRGB, LSBFirst, { 0 },
+      32, XvPacked, 1, 24, 0xFF0000, 0x00FF00, 0x0000FF,
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "BGRA", XvTopToBottom },
+
+    /* BGR 5:6:5 */
+    { 0x48, XvRGB, LSBFirst, { 0 },
+      16, XvPacked, 1, 16, 0xF800, 0x07E0, 0x001F,
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "BGR", XvTopToBottom },
+
+    /* BGRA 5:5:5:1 */
+    { 0x49, XvRGB, LSBFirst, { 0 },
+      16, XvPacked, 1, 15, 0x7C00, 0x03E0, 0x001F,
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "BGRA", XvTopToBottom },
+
+    /* BGRA 4:4:4:4 */
+    { 0x4A, XvRGB, LSBFirst, { 0 },
+      16, XvPacked, 1, 12, 0x0F00, 0x00F0, 0x000F,
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "BGRA", XvTopToBottom },
+
+    /* BGRA 2:3:2:1 */
+    { 0x4B, XvRGB, NoOrder, { 0 },
+      8, XvPacked, 1, 7, 0x60, 0x1C, 0x03,
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "BGRA", XvTopToBottom },
+
+    /* BGR 2:3:3 */
+    { 0x4C, XvRGB, NoOrder, { 0 },
+      8, XvPacked, 1, 8, 0xC0, 0x38, 0x07,
+      0, 0, 0,  0, 0, 0,  0, 0, 0, "BGR", XvTopToBottom },
+};
+
+
+/*
+ *  Video codec tables
+ */
+
+#define SAA7111_SLAVE_ADDRESS 0x48
+#define SAA7125_SLAVE_ADDRESS 0x88
+
 static I2CByte
 DecInitVec[] =
 {
@@ -273,7 +476,7 @@
 DecVS[3][8] =
 {
     { 0x06, 108, 0x07, 108, 0x08, 0x09, 0x0E, 0x01 },
-    { 0x06, 107, 0x07, 107, 0x08, 0x49, 0x0E, 0x31 },
+    { 0x06, 107, 0x07, 107, 0x08, 0x49, 0x0E, 0x01 },
     { 0x06, 108, 0x07, 108, 0x08, 0x01, 0x0E, 0x51 }
 };
 
@@ -296,77 +499,123 @@
       0x66, (I2CByte)(FSC(SUBCARRIER_FREQ_NTSC) >> 24) }
 };
 
-#undef MIN
-#define MIN(a, b) (((a) < (b)) ? (a) : (b)) 
+/* Forward */
+static void StopVideoStream(PortPrivPtr pPPriv, Bool exit);
+static void RestoreVideoStd(AdaptorPrivPtr pAPriv);
+static Bool xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block);
 
-#undef CLAMP
-#define CLAMP(v, min, max) (((v) < (min)) ? (min) : MIN(v, max))
 
-#undef ABS
-#define ABS(n) (((n) < 0) ? -(n) : (n))
+/*
+ *  Video codec controls
+ */
 
 static int
-SetAttr(PortPrivPtr pPPriv, int i, I2CByte s, I2CByte v)
+SetAttr(PortPrivPtr pPPriv, int i, int value)
 {
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    int v;
+
+    if (value < InputVideoAttributes[i].min_value)
+	value = InputVideoAttributes[i].min_value;
+    else
+    if (value > InputVideoAttributes[i].max_value)
+	value = InputVideoAttributes[i].max_value;
+
+    switch (i) {
+    case 0:
+        v = 128 + (MIN(value, 999) * 128) / 1000;
+        break;
+
+    case 1:
+    case 2:
+        v = 64 + (MIN(value, 999) * 64) / 1000;
+        break;
+
+    default:
+        v = (MIN(value, 999) * 128) / 1000;
+        break;
+    }
 
     if (pAPriv->pm2p) {
 	xvipc.a = v << 8;
-	return xvipcHandshake(pPPriv, OP_ATTR + i, TRUE) ?
-	    Success : XvBadAlloc;
-    }
 
-    return xf86I2CWriteByte(&pPPriv->I2CDev, s, v) ?
-	Success : XvBadAlloc;
+	if (!xvipcHandshake(pPPriv, OP_ATTR + i, TRUE))
+	    return XvBadAlloc;
+    } else
+	if (!xf86I2CWriteByte(&pPPriv->I2CDev, 0x0A + i, v))
+	    return XvBadAlloc;
+
+    pPPriv->Attribute[i] = value;
+    
+    return Success;
 }
 
-static Bool
-SetPlug(PortPrivPtr pPPriv)
+static int
+SetPlug(PortPrivPtr pPPriv, int Plug)
 {
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
 
     if (pAPriv->pm2p) {
-	xvipc.a = pPPriv->Plug - PORTNUM(pPPriv);
-	return xvipcHandshake(pPPriv, OP_PLUG, TRUE);
+	xvipc.a = Plug - (pPPriv == &pAPriv->Port[1]);
+
+	if (!xvipcHandshake(pPPriv, OP_PLUG, TRUE))
+	    return XvBadAlloc;
     } else {
 	if (pPPriv == &pAPriv->Port[0]) {
-	    xf86I2CWriteByte(&pPPriv->I2CDev, 0x02, Dec02[pPPriv->Plug]);
-	    xf86I2CWriteByte(&pPPriv->I2CDev, 0x09, Dec09[pPPriv->Plug]);
+	    if (!xf86I2CWriteByte(&pPPriv->I2CDev, 0x02, Dec02[Plug]) ||
+		!xf86I2CWriteByte(&pPPriv->I2CDev, 0x09, Dec09[Plug]))
+		return XvBadAlloc;
 	} else {
-	    if (pPPriv->StreamOn)
-		xf86I2CWriteByte(&pPPriv->I2CDev, 0x3A, Enc3A[pPPriv->Plug]);
-#ifdef COLORBARS
-	    else
-		xf86I2CWriteByte(&pPPriv->I2CDev, 0x3A, 0x83);
-#endif
+	    if (pPPriv->StreamOn) {
+		if (!xf86I2CWriteByte(&pPPriv->I2CDev, 0x3A, Enc3A[Plug]))
+		    return XvBadAlloc;
+	    } else
+		if (ColorBars)
+		    xf86I2CWriteByte(&pPPriv->I2CDev, 0x3A, 0x83);
 	}
     }
 
-    return TRUE;
+    pPPriv->Plug = Plug;
+
+    return Success;
 }
 
-static Bool
-SetVideoStd(AdaptorPrivPtr pAPriv)
+enum { PAL, NTSC, SECAM };
+
+static int
+SetVideoStd(PortPrivPtr pPPriv, int VideoStd)
 {
-    Bool r;
+    AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    int r = Success;
 
     if (pAPriv->pm2p) {
-	xvipc.a = pAPriv->VideoStd;
-	r = xvipcHandshake(&pAPriv->Port[0], OP_VIDEOSTD, TRUE);
-	pAPriv->VideoStd = xvipc.a; /* Actual */
+	xvipc.a = VideoStd;
+	
+	if (!xvipcHandshake(&pAPriv->Port[0], OP_VIDEOSTD, TRUE))
+	    return XvBadAlloc;
+	
+	VideoStd = xvipc.a; /* Actual */
     } else {
-	if (pAPriv->VideoStd >= 2)
+	if (VideoStd == SECAM)
 	    xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x61, 0xC2);
-
-	xf86I2CWriteVec(&pAPriv->Port[0].I2CDev, &DecVS[pAPriv->VideoStd][0], 4);
+	    /* Disable output, SECAM not supported */
 
-	if (pAPriv->VideoStd < 2)
-	    xf86I2CWriteVec(&pAPriv->Port[1].I2CDev, &EncVS[pAPriv->VideoStd][0], 7);
+	if (!xf86I2CWriteVec(&pAPriv->Port[0].I2CDev, &DecVS[VideoStd][0], 4)) {
+	    pAPriv->VideoStd = -1;
+	    return XvBadAlloc;
+	}
 
-	r = TRUE;
+	if (VideoStd != SECAM)
+	    if (!xf86I2CWriteVec(&pAPriv->Port[1].I2CDev, &EncVS[VideoStd][0], 7)) {
+		pAPriv->VideoStd = -1;
+		return XvBadAlloc;
+	    }
     }
 
-    if (pAPriv->VideoStd == 1) {
+    pAPriv->VideoStd = VideoStd;
+    pPPriv->VideoStdReq = VideoStd;
+
+    if (VideoStd == NTSC) {
 	pAPriv->FramesPerSec = 30;
 	pAPriv->FrameLines = 525;
 	pAPriv->IntLine = 513;
@@ -378,158 +627,161 @@
 	pAPriv->LinePer = 64000;
     }
 
-#if 0
+#if 0 /* XF86Config option */
+
     pAPriv->Port[0].FramesPerSec = pAPriv->FramesPerSec;
     pAPriv->Port[1].FramesPerSec = pAPriv->FramesPerSec;
+
 #endif
 
     return r;
 }
 
-/* **FIXME**: 2048 limit */
 
-static Bool
-AllocOffRec(PortPrivPtr pPPriv, int i)
+/*
+ *  Buffer management
+ */
+
+static void
+RemoveAreaCallback(FBAreaPtr pFBArea)
 {
+    PortPrivPtr pPPriv = (PortPrivPtr) pFBArea->devPrivate.ptr;
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
-    ScrnInfoPtr pScrn = pAPriv->pScrn;
-    GLINTPtr pGlint = GLINTPTR(pScrn);
-    int width, height;
-
-    height = (pAPriv->VideoStd == 1) ? 512 : 608;
-
-    if (!pPPriv->Attribute[4])
-	height >>= 1;
-
-    width = (704 << 4) / pScrn->bitsPerPixel;
-
-    pPPriv->BufferStride = pScrn->displayWidth << BPPSHIFT(pGlint);
+    DEBUG(ScrnInfoPtr pScrn = pAPriv->pScrn;)
+    int i;
 
-    if (pPPriv->pFBArea[i] != NULL) {
-	if (xf86ResizeOffscreenArea(pPPriv->pFBArea[i], width, height))
-	    return TRUE;
+    for (i = 0; i < MAX_BUFFERS && pPPriv->pFBArea[i] != pFBArea; i++);
 
-	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 2,
-	    "AOR couldn't resize buffer %d,%d-%d,%d to %dx%d\n",
-	    pPPriv->pFBArea[i]->box.x1, pPPriv->pFBArea[i]->box.y1,
-	    pPPriv->pFBArea[i]->box.x2, pPPriv->pFBArea[i]->box.y2,
-	    width, height));
+    if (i >= MAX_BUFFERS)
+	return;
 
-	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-	    "AOR free buffer 0x%08x\n", pPPriv->BufferBase[i]));
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+	"RemoveAreaCallback port #%d, buffer #%d, pFB=%p, off=0x%08x\n",
+	PORTNUM(pPPriv), i, pPPriv->pFBArea[i], pPPriv->BufferBase[i]));
 
-	xf86FreeOffscreenArea(pPPriv->pFBArea[i]);
-	pPPriv->pFBArea[i] = NULL;
+    if (pAPriv->VideoIO && PORTNUM(pPPriv) < 2) {
+        StopVideoStream(pPPriv, FALSE);
     }
 
-    pPPriv->pFBArea[i] = xf86AllocateOffscreenArea(pScrn->pScreen,
-        width, height, 2, NULL, NULL, NULL);
+    for (; i < MAX_BUFFERS - 1; i++)
+	pPPriv->pFBArea[i] = pPPriv->pFBArea[i + 1];
 
-    if (pPPriv->pFBArea[i] != NULL)
-        return TRUE;
+    pPPriv->pFBArea[MAX_BUFFERS - 1] = NULL;
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 2,
-        "AOR couldn't allocate buffer %dx%d\n",
-	width, height));
-
-    return FALSE;
+    pPPriv->BuffersAllocated--;
 }
 
-static Bool
-AllocOffLin(PortPrivPtr pPPriv, int i)
+static void
+RemoveableBuffers(PortPrivPtr pPPriv, Bool remove)
 {
-    AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
-    ScrnInfoPtr pScrn = pAPriv->pScrn;
-    GLINTPtr pGlint = GLINTPTR(pScrn);
-    int length;
-    
-    length = ((704 << 1) * ((pAPriv->VideoStd == 1) ? 512 : 608)) >> BPPSHIFT(pGlint);
+    int i;
 
-    if (!pPPriv->Attribute[4])
-	length >>= 1;
+    for (i = 0; i < MAX_BUFFERS; i++)
+	if (pPPriv->pFBArea[i])
+	    pPPriv->pFBArea[i]->RemoveAreaCallback =
+		remove ? RemoveAreaCallback : NULL;
+}
 
-    pPPriv->BufferStride = 704 << 1;
+static void
+FreeBuffers(PortPrivPtr pPPriv)
+{
+    DEBUG(AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;)
+    DEBUG(ScrnInfoPtr pScrn = pAPriv->pScrn;)
+    int i;
 
-    if (pPPriv->pFBArea[i] != NULL) {
-	xf86FreeOffscreenArea(pPPriv->pFBArea[i]);
-	pPPriv->pFBArea[i] = NULL;
-    }
+    RemoveableBuffers(pPPriv, FALSE);
 
-    pPPriv->pFBArea[i] = xf86AllocateLinearOffscreenArea(pScrn->pScreen,
-        length, 2, NULL, NULL, NULL);
+    for (i = MAX_BUFFERS - 1; i >= 0; i--)
+	if (pPPriv->pFBArea[i]) {
+	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+		"FreeBuffers port #%d, buffer #%d, pFB=%p, off=0x%08x\n",
+		PORTNUM(pPPriv), i, pPPriv->pFBArea[i], pPPriv->BufferBase[i]));
 
-    if (pPPriv->pFBArea[i] != NULL)
-	return TRUE;
+	    xf86FreeOffscreenArea(pPPriv->pFBArea[i]);
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 2,
-	"AOL couldn't allocate buffer %d\n",
-	length));
+	    pPPriv->pFBArea[i] = NULL;
+	}
 
-    return FALSE;
+    pPPriv->BuffersAllocated = 0;
 }
 
-static Bool
-ReallocateOffscreenBuffer(PortPrivPtr pPPriv, int num)
+enum { FORCE_LINEAR = 1, FORCE_RECT };
+
+static int
+AllocateBuffers(PortPrivPtr pPPriv,
+    int w, int h, int bytespp,
+    int num, int force)
 {
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
     ScrnInfoPtr pScrn = pAPriv->pScrn;
     GLINTPtr pGlint = GLINTPTR(pScrn);
-    int i;
+    Bool linear = (force != FORCE_RECT);
+    int i, j, retry = 0;
 
-    if (pAPriv->pm2p != NULL)
-	return FALSE;
+    FreeBuffers(pPPriv);
 
-    for (i = 2; i >= 0; i--)
-	if (pPPriv->pFBArea[i]) {
-	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-	        "ROB free buffer 0x%08x\n", pPPriv->BufferBase[i]));
+    for (i = 0; i < num; i++) {
+	if (linear) {
+	    for (j = (w + 31) >> 5; partprodPermedia[j] < 0; j++);
+
+	    pPPriv->BufferStride = j * bytespp * 32;
+	    pPPriv->BufferPProd = partprodPermedia[j];
+
+	    pPPriv->pFBArea[i] = xf86AllocateLinearOffscreenArea(pScrn->pScreen,
+    		(pPPriv->BufferStride * h + (1 << BPPSHIFT(pGlint)) - 1) >> BPPSHIFT(pGlint),
+		8 >> BPPSHIFT(pGlint), NULL, NULL, (pointer) pPPriv);
+
+	    if (pPPriv->pFBArea[i])
+		/* pPPriv->BufferBase[i] = pPPriv->pFBArea[i].linear; */
+		pPPriv->BufferBase[i] =
+		    ((pPPriv->pFBArea[i]->box.y1 * pScrn->displayWidth) +
+		     pPPriv->pFBArea[i]->box.x1) << BPPSHIFT(pGlint);
+
+	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+		"New linear buffer %dx%d, rec %dx%d -> pFB=%p, off=0x%08x\n",
+		w, h, pPPriv->BufferStride, h, pPPriv->pFBArea[i], pPPriv->BufferBase[i]));
+	} else {
+	    pPPriv->BufferStride = pScrn->displayWidth << BPPSHIFT(pGlint);
 
-	    xf86FreeOffscreenArea(pPPriv->pFBArea[i]);
-	    pPPriv->pFBArea[i] = NULL;
-	}
+	    j = pPPriv->BufferStride / bytespp;
 
-    if (num <= 0)
-	return FALSE;
+	    if (j <= w && j <= 2048 && (j & 31) == 0 &&
+		(pPPriv->BufferPProd = partprodPermedia[j >> 5]) >= 0)
+	    {
+		pPPriv->pFBArea[i] = xf86AllocateOffscreenArea(pScrn->pScreen,
+    		    w, h, 8 >> BPPSHIFT(pGlint), NULL, NULL, (pointer) pPPriv);
 
-    while (1) {
-	PortPrivPtr pPPrivN = &pAPriv->Port[1 - PORTNUM(pPPriv)];
+		if (pPPriv->pFBArea[i])
+		    pPPriv->BufferBase[i] =
+			((pPPriv->pFBArea[i]->box.y1 * pScrn->displayWidth) +
+		         pPPriv->pFBArea[i]->box.x1) << BPPSHIFT(pGlint);
+
+		DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+		    "New rect buffer %dx%d, stride %d, %d -> pFB=%p, off=0x%08x\n",
+		    w, h, pPPriv->BufferStride, j, pPPriv->pFBArea[i], pPPriv->BufferBase[i]));
+	    }
+	}
 
-	for (i = 0; i < num; i++)
-	    if (!AllocOffLin(pPPriv, i)) break;
-	if (i > 0) break;
-
-	for (i = 0; i < num; i++)
-	    if (!AllocOffRec(pPPriv, i)) break;
-	if (i > 0) break;
+	if (pPPriv->pFBArea[i])
+	    continue;
 
-	if (pPPrivN->VideoOn <= 0 && pPPrivN->APO >= 0)
-	    DelayedStopVideo(pPPrivN);
-	else
-	    return FALSE;
+	if (!force && i == 0 && retry++ < 1) {
+	    linear ^= TRUE;
+	    i = -1;
+	} else
+	    break;
     }
-
-    for (i = 0; i <= 2; i++)
-	if (pPPriv->pFBArea[i]) {
-	    pPPriv->BufferBase[i] =
-		((pPPriv->pFBArea[i]->box.y1 * pScrn->displayWidth) +
-	         pPPriv->pFBArea[i]->box.x1) << BPPSHIFT(pGlint);
-
-	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-		"ROB buffer #%d 0x%08x str %d\n",
-		i, pPPriv->BufferBase[i], pPPriv->BufferStride));
-	}
 
-    pPPriv->BufferPProd = partprodPermedia[(pPPriv->BufferStride / 2) >> 5];
+    return pPPriv->BuffersAllocated = i;
+}
 
-    pPPriv->fw = 704;
-    pPPriv->fh = InputVideoEncodings[pAPriv->VideoStd * 3].height >>
-	(!pPPriv->Attribute[4]);
 
-    return TRUE;
-}
+/*
+ *  Blitter
+ */
 
 static Bool
-PutCookies(PortPrivPtr pPPriv, RegionPtr pRegion)
+RemakePutCookies(PortPrivPtr pPPriv, RegionPtr pRegion)
 {
     BoxPtr pBox;
     CookiePtr pCookie;
@@ -571,80 +823,139 @@
     return TRUE;
 }
 
+#define FORMAT_YUYV ((0 << 5) + (1 << 4) + ((19 & 0x10) << 2) + ((19 & 0x0F) << 0))
+#define FORMAT_UYVY ((1 << 5) + (1 << 4) + ((19 & 0x10) << 2) + ((19 & 0x0F) << 0))
+#define FORMAT_YUVA ((0 << 5) + ((18 & 0x10) << 2) + ((18 & 0x0F) << 0))
+#define FORMAT_VUYA ((1 << 5) + ((18 & 0x10) << 2) + ((18 & 0x0F) << 0))
+
 static void
-PutYUV(PortPrivPtr pPPriv, int BufferBase)
+PutYUV(PortPrivPtr pPPriv, int BufferBase,
+    int format, int bptshift, int alpha)
 {
-    ScrnInfoPtr pScrn = pPPriv->pAdaptor->pScrn;
+    AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    ScrnInfoPtr pScrn = pAPriv->pScrn;
     GLINTPtr pGlint = GLINTPTR(pScrn);
     CookiePtr pCookie = pPPriv->pCookies;
     int nCookies = pPPriv->nCookies;
-
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4, "PutYUV %08x\n", BufferBase));
 
-    if (!nCookies)
-	return;
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 5, "PutYUV %08x %08x\n",
+	BufferBase, format));
 
-    /* Setup */
+    if (!nCookies || (!pGlint->UsePCIRetry && GLINT_READ_REG(InFIFOSpace) < 200))
+	return; /* Denial of service fix, N/A for scaler */
 
-    GLINT_WAIT(25);
     CHECKCLIPPING;
 
-    switch (pScrn->depth) {
-	case 8:
-	    GLINT_WRITE_REG((0 << 10) | 	/* BGR */
-			    (1 << 1) | 		/* Dither */
-			    ((5 & 0x10)<<12) |
-			    ((5 & 0x0F)<<2) | 	/* 3:3:2f */
-			    UNIT_ENABLE, DitherMode);
-	    break;
-	case 15:
-	    GLINT_WRITE_REG((1 << 10) | 	/* RGB */
-			    ((1 & 0x10)<<12)|
-			    ((1 & 0x0F)<<2) | 	/* 5:5:5:1f */
-			    UNIT_ENABLE, DitherMode);
-	    break;
-	case 16:
-	    GLINT_WRITE_REG((1 << 10) | 	/* RGB */
-			    ((16 & 0x10)<<12)|
-			    ((16 & 0x0F)<<2) | 	/* 5:6:5f */
-			    UNIT_ENABLE, DitherMode);
-	    break;
-	case 24:
-	    GLINT_WRITE_REG((1 << 10) |		/* RGB */
-			    ((0 & 0x10)<<12)|
-			    ((0 & 0x0F)<<2) | 	/* 8:8:8:8 */
-			    UNIT_ENABLE, DitherMode);
-	    break;
-	default:
-	    return; /* Oops */
-    }
-
     GLINT_WRITE_REG(1 << 16, dY);
     GLINT_WRITE_REG(0, RasterizerMode);
     GLINT_WRITE_REG(UNIT_DISABLE, AreaStippleMode);
-    GLINT_WRITE_REG(BufferBase >> 1 /* 16 */, PMTextureBaseAddress);
-    GLINT_WRITE_REG((1 << 19) /* 16 */ | pPPriv->BufferPProd,
-		    PMTextureMapFormat);
-    GLINT_WRITE_REG((1 << 4) /* No alpha */ |
-	            ((19 & 0x10) << 2) |
-		    ((19 & 0x0F) << 0) /* YUYV */,
-		    PMTextureDataFormat);
+    GLINT_WRITE_REG(UNIT_ENABLE, TextureAddressMode);
+    GLINT_WRITE_REG(pPPriv->dS, dSdx);
+    GLINT_WRITE_REG(0, dSdyDom);
+    GLINT_WRITE_REG(0, dTdx);
+    GLINT_WRITE_REG(pPPriv->dT, dTdyDom);
+    GLINT_WRITE_REG(BufferBase >> bptshift, PMTextureBaseAddress);
+    GLINT_WRITE_REG((bptshift << 19) | pPPriv->BufferPProd, PMTextureMapFormat);
+    GLINT_WRITE_REG(format, PMTextureDataFormat);
     GLINT_WRITE_REG((pPPriv->Attribute[5] << 17) | /* FilterMode */
 		    (11 << 13) | (11 << 9) | /* TextureSize log2 */ 
 		    UNIT_ENABLE, PMTextureReadMode);
     GLINT_WRITE_REG((0 << 4) /* RGB */ |
 		    (3 << 1) /* Copy */ |
 		    UNIT_ENABLE, TextureColorMode);
-    GLINT_WRITE_REG(UNIT_ENABLE, YUVMode);
-    GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    if (alpha)
+	GLINT_WRITE_REG(pAPriv->dAlphaBlendMode, AlphaBlendMode);
+    GLINT_WRITE_REG(pAPriv->dDitherMode, DitherMode);
     GLINT_WRITE_REG(UNIT_DISABLE, LogicalOpMode);
+    GLINT_WRITE_REG((alpha << 10) | /* ReadDestination */
+		    pGlint->pprod, FBReadMode);
+    GLINT_WRITE_REG(0xFFFFFFFF, FBHardwareWriteMask);
+    GLINT_WRITE_REG(UNIT_ENABLE, YUVMode);
+
+    for (; nCookies--; pCookie++) {
+	GLINT_WAIT(5);
+	GLINT_WRITE_REG(pCookie->xy, RectangleOrigin);
+	GLINT_WRITE_REG(pCookie->wh, RectangleSize);
+	GLINT_WRITE_REG(pCookie->s, SStart);
+	GLINT_WRITE_REG(pCookie->t, TStart);
+        GLINT_WRITE_REG(PrimitiveRectangle |
+			XPositive |
+			YPositive |
+			TextureEnable, Render);
+    }
+
+    pGlint->x = pGlint->y = -1; /* Force reload */
+    pGlint->w = pGlint->h = -1;
+    pGlint->ROP = 0xFF;
+    pGlint->planemask = 0xFFFFFFFF;
+
+    GLINT_WAIT(8);
+    GLINT_WRITE_REG(UNIT_DISABLE, TextureAddressMode);
+    GLINT_WRITE_REG(pGlint->TexMapFormat, PMTextureMapFormat);
+    GLINT_WRITE_REG(UNIT_DISABLE, PMTextureReadMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, TextureColorMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, DitherMode);
+    if (alpha) {
+	GLINT_WRITE_REG(UNIT_DISABLE, AlphaBlendMode);
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    }
+    GLINT_WRITE_REG(UNIT_DISABLE, YUVMode);
+}
+
+#define FORMAT_RGB8888 ((0 << 5) + (0 << 4) + ((0 & 0x10) << 2) + ((0 & 0x0F) << 0))
+#define FORMAT_RGB565  ((0 << 5) + (1 << 4) + ((16 & 0x10) << 2) + ((16 & 0x0F) << 0))
+#define FORMAT_RGB5551 ((0 << 5) + (0 << 4) + ((1 & 0x10) << 2) + ((1 & 0x0F) << 0))
+#define FORMAT_RGB4444 ((0 << 5) + (0 << 4) + ((2 & 0x10) << 2) + ((2 & 0x0F) << 0))
+#define FORMAT_RGB332  ((0 << 5) + (1 << 4) + ((5 & 0x10) << 2) + ((5 & 0x0F) << 0))
+#define FORMAT_RGB2321 ((0 << 5) + (0 << 4) + ((9 & 0x10) << 2) + ((9 & 0x0F) << 0))
+#define FORMAT_BGR8888 ((1 << 5) + (0 << 4) + ((0 & 0x10) << 2) + ((0 & 0x0F) << 0))
+#define FORMAT_BGR565  ((1 << 5) + (1 << 4) + ((16 & 0x10) << 2) + ((16 & 0x0F) << 0))
+#define FORMAT_BGR5551 ((1 << 5) + (0 << 4) + ((1 & 0x10) << 2) + ((1 & 0x0F) << 0))
+#define FORMAT_BGR4444 ((1 << 5) + (0 << 4) + ((2 & 0x10) << 2) + ((2 & 0x0F) << 0))
+#define FORMAT_BGR332  ((1 << 5) + (1 << 4) + ((5 & 0x10) << 2) + ((5 & 0x0F) << 0))
+#define FORMAT_BGR2321 ((1 << 5) + (0 << 4) + ((9 & 0x10) << 2) + ((9 & 0x0F) << 0))
+
+static void
+PutRGB(PortPrivPtr pPPriv, int BufferBase, int format, int bptshift, int alpha)
+{
+    AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    ScrnInfoPtr pScrn = pAPriv->pScrn;
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    CookiePtr pCookie = pPPriv->pCookies;
+    int nCookies = pPPriv->nCookies;
+
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 5, "PutRGB %08x %08x\n",
+	BufferBase, format));
+
+    if (!nCookies)
+	return;
+
+    CHECKCLIPPING;
+
+    GLINT_WRITE_REG(1 << 16, dY);
+    GLINT_WRITE_REG(0, RasterizerMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, AreaStippleMode);
     GLINT_WRITE_REG(UNIT_ENABLE, TextureAddressMode);
     GLINT_WRITE_REG(pPPriv->dS, dSdx);
     GLINT_WRITE_REG(0, dSdyDom);
     GLINT_WRITE_REG(0, dTdx);
     GLINT_WRITE_REG(pPPriv->dT, dTdyDom);
-
-    /* Subsequent */
+    GLINT_WRITE_REG(BufferBase >> bptshift, PMTextureBaseAddress);    
+    GLINT_WRITE_REG((bptshift << 19) | pPPriv->BufferPProd, PMTextureMapFormat);
+    GLINT_WRITE_REG(format, PMTextureDataFormat);
+    GLINT_WRITE_REG((pPPriv->Attribute[5] << 17) | /* FilterMode */
+		    (11 << 13) | (11 << 9) | /* TextureSize log2 */ 
+		    UNIT_ENABLE, PMTextureReadMode);
+    GLINT_WRITE_REG((0 << 4) /* RGB */ |
+		    (3 << 1) /* Copy */ |
+		    UNIT_ENABLE, TextureColorMode);
+    if (alpha)
+	GLINT_WRITE_REG(pAPriv->dAlphaBlendMode, AlphaBlendMode);
+    GLINT_WRITE_REG(pAPriv->dDitherMode, DitherMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, LogicalOpMode);
+    GLINT_WRITE_REG((alpha << 10) | /* ReadDestination */
+		    pGlint->pprod, FBReadMode);
+    GLINT_WRITE_REG(0xFFFFFFFF, FBHardwareWriteMask);
 
     for (; nCookies--; pCookie++) {
 	GLINT_WAIT(5);
@@ -658,18 +969,21 @@
 			TextureEnable, Render);
     }
 
-    /* Cleanup */
-
     pGlint->x = pGlint->y = -1; /* Force reload */
     pGlint->w = pGlint->h = -1;
     pGlint->ROP = 0xFF;
-    GLINT_WAIT(6);
-    GLINT_WRITE_REG(pGlint->TexMapFormat, PMTextureMapFormat);
-    GLINT_WRITE_REG(UNIT_DISABLE, DitherMode);
-    GLINT_WRITE_REG(UNIT_DISABLE, TextureColorMode);
+    pGlint->planemask = 0xFFFFFFFF;
+
+    GLINT_WAIT(7);
     GLINT_WRITE_REG(UNIT_DISABLE, TextureAddressMode);
+    GLINT_WRITE_REG(pGlint->TexMapFormat, PMTextureMapFormat);
     GLINT_WRITE_REG(UNIT_DISABLE, PMTextureReadMode);
-    GLINT_WRITE_REG(UNIT_DISABLE, YUVMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, TextureColorMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, DitherMode);
+    if (alpha) {
+	GLINT_WRITE_REG(UNIT_DISABLE, AlphaBlendMode);
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    }
 }
 
 static void
@@ -683,7 +997,7 @@
     BoxPtr pBox;
     int nBox;
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 5,
 	"BlackOut %d,%d,%d,%d -- %d,%d,%d,%d\n",
 	pPPriv->vx, pPPriv->vy, pPPriv->vw, pPPriv->vh,
 	pPPriv->dx, pPPriv->dy, pPPriv->dw, pPPriv->dh));
@@ -741,7 +1055,7 @@
 }
 
 static Bool
-GetCookies(PortPrivPtr pPPriv, RegionPtr pRegion)
+RemakeGetCookies(PortPrivPtr pPPriv, RegionPtr pRegion)
 {
     BoxPtr pBox;
     CookiePtr pCookie;
@@ -759,7 +1073,7 @@
 	if (!pPPriv->pCookies || pPPriv->nCookies < nBox) {
 	    if (!(pCookie = (CookiePtr) xrealloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
     		return FALSE;
-	
+
 	    pPPriv->pCookies = pCookie;
 	}
     }
@@ -772,8 +1086,11 @@
 
 	if (pRegion) {
 	    n1 = ((pBox->x1 - pPPriv->dx) * pPPriv->vw + dw1) / pPPriv->dw;
-                       	    n2 = ((pBox->x2 - pPPriv->dx) * pPPriv->vw - 1) / pPPriv->dw;
-	    if (n1 > n2) continue; /* Clip is subpixel */
+            n2 = ((pBox->x2 - pPPriv->dx) * pPPriv->vw - 1) / pPPriv->dw;
+	    
+	    if (n1 > n2)
+		continue; /* Clip is subpixel */
+
 	    pCookie->xy = n1 + pPPriv->vx;
 	    pCookie->wh = n2 - n1 + 1;
 	    pCookie->s = n1 * pPPriv->dS + (pPPriv->dx << 20);
@@ -798,159 +1115,258 @@
 static void
 GetYUV(PortPrivPtr pPPriv)
 {
-    ScrnInfoPtr pScrn = pPPriv->pAdaptor->pScrn;
+    AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    ScrnInfoPtr pScrn = pAPriv->pScrn;
     GLINTPtr pGlint = GLINTPTR(pScrn);
     CookiePtr pCookie = pPPriv->pCookies;
     int nCookies = pPPriv->nCookies;
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4, "GetYUV\n"));
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 5, "GetYUV\n"));
 
-    if (!nCookies)
+    if (!nCookies || (!pGlint->UsePCIRetry && GLINT_READ_REG(InFIFOSpace) < 200))
 	return;
-
-    /* FIXME? clip + filt d-1 */
-
-    /* Setup */
-
+    
     GLINT_WAIT(25);
     CHECKCLIPPING;
-
-    switch (pScrn->depth) {
-	case 8:
-	    GLINT_WRITE_REG(UNIT_ENABLE, TexelLUTMode);
-	    GLINT_WRITE_REG((1 << 4) | /* No alpha */
-	        	    ((14 & 0x10) << 2) |
-			    ((14 & 0x0F) << 0), /* CI8 */
-			    PMTextureDataFormat);
-	    break;
-
-	case 15:	
-	    GLINT_WRITE_REG((1 << 5) | /* RGB */
-			    (1 << 4) |
-			    ((1 & 0x10) << 2) |
-			    ((1 & 0x0F) << 0), 	/* 5:5:5:1f */
-			    PMTextureDataFormat);
-	    break;
-	case 16:
-	    GLINT_WRITE_REG((1 << 5) |
-			    (1 << 4) |
-			    ((16 & 0x10) << 2) |
-			    ((16 & 0x0F) << 0), /* 5:6:5f */
-			    PMTextureDataFormat);
-	    break;
-	case 24:
-	    GLINT_WRITE_REG((1 << 5) |
-			    (1 << 4) |
-			    ((0 & 0x10) << 2) |
-			    ((0 & 0x0F) << 0),	/* 8:8:8:8 */
-			    PMTextureDataFormat);
-	    break;
-	default:       
-	    return;
-    }
 
+    GLINT_WRITE_REG(1 << 16, dY);
+    GLINT_WRITE_REG(0, RasterizerMode);
     GLINT_WRITE_REG(UNIT_DISABLE, AreaStippleMode);
+    GLINT_WRITE_REG(UNIT_ENABLE, TextureAddressMode);
+    GLINT_WRITE_REG(pPPriv->dS, dSdx);
+    GLINT_WRITE_REG(0, dSdyDom);
+    GLINT_WRITE_REG(0, dTdx);
+    GLINT_WRITE_REG(pPPriv->dT, dTdyDom);
     GLINT_WRITE_REG(0, PMTextureBaseAddress);
-    GLINT_WRITE_REG((1 << 10) | /* RGB */
-		    ((16 & 0x10)<<12)|
-		    ((16 & 0x0F)<<2) | 	/* 5:6:5f */
-		    UNIT_ENABLE, DitherMode);
+    GLINT_WRITE_REG(pAPriv->dTextureDataFormat, PMTextureDataFormat);
     GLINT_WRITE_REG((pPPriv->Attribute[5] << 17) | /* FilterMode */
 		    (11 << 13) | (11 << 9) | /* TextureSize log2 */
 		    UNIT_ENABLE, PMTextureReadMode);
+    if (pScrn->depth == 8)
+	GLINT_WRITE_REG(UNIT_ENABLE, TexelLUTMode);
     GLINT_WRITE_REG((0 << 4) /* RGB */ |
 		    (3 << 1) /* Copy */ |
 		    UNIT_ENABLE, TextureColorMode);
-    GLINT_WRITE_REG(0x1, FBReadPixel); /* 16 */
-    GLINT_WRITE_REG(UNIT_DISABLE, YUVMode);
-    GLINT_WRITE_REG(pPPriv->BufferPProd, FBReadMode);
+    GLINT_WRITE_REG((1 << 10) |			/* RGB */
+		    ((16 & 0x10) << 12) |
+		    ((16 & 0x0F) << 2) |	/* 5:6:5f */
+		    UNIT_ENABLE, DitherMode);
     GLINT_WRITE_REG(UNIT_DISABLE, LogicalOpMode);
-    GLINT_WRITE_REG(UNIT_ENABLE, TextureAddressMode);
-    GLINT_WRITE_REG(pPPriv->dS, dSdx);
-    GLINT_WRITE_REG(0, dSdyDom);
-    GLINT_WRITE_REG(0, dTdx);
-    GLINT_WRITE_REG(pPPriv->dT, dTdyDom);
-    GLINT_WRITE_REG(1 << 16, dY);
-    GLINT_WRITE_REG(0, RasterizerMode);
+    GLINT_WRITE_REG(pPPriv->BufferPProd, FBReadMode);
     GLINT_WRITE_REG(pPPriv->BufferBase[0] >> 1 /* 16 */, FBWindowBase);
+    GLINT_WRITE_REG(0x1, FBReadPixel); /* 16 */
+    GLINT_WRITE_REG(UNIT_DISABLE, YUVMode);
+
+    for (; nCookies--; pCookie++)
+	if (pCookie->t >= 0) {
+	    GLINT_WAIT(5);
+	    GLINT_WRITE_REG(pCookie->xy, RectangleOrigin);
+	    GLINT_WRITE_REG(pCookie->wh, RectangleSize);
+	    GLINT_WRITE_REG(pCookie->s, SStart);
+	    GLINT_WRITE_REG(pCookie->t, TStart);
+    	    GLINT_WRITE_REG(PrimitiveRectangle |
+			    XPositive |
+			    YPositive |
+			    TextureEnable, Render);
+	}
+
+    pGlint->x = pGlint->y = -1; /* Force reload */
+    pGlint->w = pGlint->h = -1;
+    pGlint->ROP = 0xFF;
+
+    GLINT_WAIT(9);
+    GLINT_WRITE_REG(UNIT_DISABLE, TextureAddressMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, TextureColorMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, DitherMode);
+    if (pScrn->depth == 8)
+	GLINT_WRITE_REG(UNIT_DISABLE, TexelLUTMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, PMTextureReadMode);
+    GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    GLINT_WRITE_REG(0, FBWindowBase);
+    GLINT_WRITE_REG(pGlint->PixelWidth, FBReadPixel);
+    GLINT_WRITE_REG(UNIT_DISABLE, YUVMode);
+}
+
+static int
+SetBkgCol(PortPrivPtr pPPriv, int value)
+{
+    pPPriv->Attribute[6] = value;
+
+    pPPriv->BkgCol = ((value & 0xF80000) >> 8) |
+		     ((value & 0x00FC00) >> 5) |
+		     ((value & 0x0000F8) >> 3);
+
+    pPPriv->BkgCol += pPPriv->BkgCol << 16;
+
+    if (pPPriv->VideoOn) {
+	BlackOut(pPPriv, NULL);
+	GetYUV(pPPriv);
+    }
+
+    return Success;
+}
+
+/* os/WaitFor.c */
+
+static CARD32
+TimerCallback(OsTimerPtr pTim, CARD32 now, pointer p)
+{
+    AdaptorPrivPtr pAPriv = (AdaptorPrivPtr) p;
+    GLINTPtr pGlint = GLINTPTR(pAPriv->pScrn);
+    PortPrivPtr pPPriv;
+    int i, delay;
+
+    if (!pAPriv->pm2p) {
+	pPPriv = &pAPriv->Port[0];
+
+	if (pPPriv->VideoOn > VIDEO_OFF) {
+	    pPPriv->FrameAcc += pPPriv->FramesPerSec;
+
+	    if (pPPriv->FrameAcc >= pAPriv->FramesPerSec) {
+		pPPriv->FrameAcc -= pAPriv->FramesPerSec;
+
+		PutYUV(pPPriv, (!pPPriv->pFBArea[1]) ?
+		    pPPriv->BufferBase[0] : pPPriv->BufferBase[1 -
+			GLINT_READ_REG(VSABase + VSVideoAddressIndex)], FORMAT_YUYV, 1, 0);
+	    }
+	} else
+	    if (pPPriv->StopDelay >= 0 && !(pPPriv->StopDelay--)) {
+		StopVideoStream(pPPriv, TRUE);
+		RestoreVideoStd(pAPriv);
+	    }
 
-    /* Subsequent */
+	pPPriv = &pAPriv->Port[1];
 
-    for (; nCookies--; pCookie++)
-	if (pCookie->t >= 0) {
-	    GLINT_WAIT(5);
-	    GLINT_WRITE_REG(pCookie->xy, RectangleOrigin);
-	    GLINT_WRITE_REG(pCookie->wh, RectangleSize);
-	    GLINT_WRITE_REG(pCookie->s, SStart);
-	    GLINT_WRITE_REG(pCookie->t, TStart);
-    	    GLINT_WRITE_REG(PrimitiveRectangle |
-			    XPositive |
-			    YPositive |
-			    TextureEnable, Render);
+	if (pPPriv->VideoOn > VIDEO_OFF) {
+	    pPPriv->FrameAcc += pPPriv->FramesPerSec;
+
+	    if (pPPriv->FrameAcc >= pAPriv->FramesPerSec) {
+		pPPriv->FrameAcc -= pAPriv->FramesPerSec;
+
+		GetYUV(pPPriv);
+	    }
+	} else
+	    if (pPPriv->StopDelay >= 0 && !(pPPriv->StopDelay--)) {
+		StopVideoStream(pPPriv, TRUE);
+		RestoreVideoStd(pAPriv);
+	    }
+    }
+    
+    for (i = 2; i <= 5; i++) {
+	if (pAPriv->Port[i].StopDelay >= 0) {
+	    if (!(pAPriv->Port[i].StopDelay--)) {
+		FreeBuffers(&pAPriv->Port[i]);
+		FreeCookies(&pAPriv->Port[i]);
+		pAPriv->TimerUsers &= ~(1 << i);
+	    }
 	}
+    }
 
-    /* Cleanup */
+    if (!pAPriv->pm2p) {
+	if (pAPriv->Port[0].StreamOn) {
+	    delay = GLINT_READ_REG(VSABase + VSCurrentLine);
+	    
+	    if (!(GLINT_READ_REG(VSStatus) & VS_FieldOne0A))
+		delay += pAPriv->FrameLines >> 1;
+	    
+	    if (delay > (pAPriv->IntLine - 16))
+		delay -= pAPriv->FrameLines;
+	    
+	    return (((pAPriv->IntLine - delay) * pAPriv->LinePer) + 999999) / 1000000;
+	} else if (pAPriv->Port[1].StreamOn) {
+	    delay = GLINT_READ_REG(VSBBase + VSCurrentLine);
+	    
+	    if (!(GLINT_READ_REG(VSStatus) & VS_FieldOne0B))
+		delay += pAPriv->FrameLines >> 1;
+	    
+	    if (delay > (pAPriv->IntLine - 16))
+		delay -= pAPriv->FrameLines;
+	    
+	    return (((pAPriv->IntLine - delay) * pAPriv->LinePer) + 999999) / 1000000;
+	}
+    }
 
-    pGlint->x = pGlint->y = -1; /* Force reload */
-    pGlint->w = pGlint->h = -1;
-    pGlint->ROP = 0xFF;
-    GLINT_WAIT(10);
-    GLINT_WRITE_REG(0, FBWindowBase);
-    GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
-    GLINT_WRITE_REG(pGlint->PixelWidth, FBReadPixel);
-    GLINT_WRITE_REG(UNIT_DISABLE, DitherMode);
-    GLINT_WRITE_REG(UNIT_DISABLE, TextureColorMode);
-    GLINT_WRITE_REG(UNIT_DISABLE, TextureAddressMode);
-    GLINT_WRITE_REG(pGlint->TexMapFormat, PMTextureMapFormat);
-    GLINT_WRITE_REG(UNIT_DISABLE, TexelLUTMode);
-    GLINT_WRITE_REG(UNIT_DISABLE, PMTextureReadMode);
-    GLINT_WRITE_REG(UNIT_DISABLE, YUVMode);
+    if (pAPriv->TimerUsers)
+	return pAPriv->Instant;
+
+    return 0; /* Cancel */
 }
 
+
+/*
+ *  Video stream (bounce buffer <-> hardware)
+ */
+
 static void
-StopVideoStream(AdaptorPrivPtr pAPriv, int which)
+StopVideoStream(PortPrivPtr pPPriv, Bool exit)
 {
+    AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
     GLINTPtr pGlint = GLINTPTR(pAPriv->pScrn);
+    int VideoOn;
+
+    pPPriv->StopDelay = -1;
+
+    VideoOn = pPPriv->VideoOn;
+    pPPriv->VideoOn = VIDEO_OFF;
 
-    if (which & 1) pAPriv->Port[0].VideoOn = 0;
-    if (which & 2) pAPriv->Port[1].VideoOn = 0;
+    if (!pPPriv->StreamOn)
+	return;
 
     if (pAPriv->pm2p) {
-	/* Hard stop, frees buffers */
+	xvipcHandshake(pPPriv, OP_STOP, TRUE);
 
-	if (which & 2) {
-	    xvipcHandshake(&pAPriv->Port[1], OP_STOP, TRUE);
-	    pAPriv->Port[1].StreamOn = FALSE;
-	}
+	pPPriv->StreamOn = FALSE;
 
-	if (which & 1) {
-	    xvipcHandshake(&pAPriv->Port[0], OP_STOP, TRUE);
-	    pAPriv->Port[0].StreamOn = FALSE;
-	}
+	if (exit)
+	    FreeCookies(pPPriv);
+
+	if (VideoOn > VIDEO_OFF && pGlint->NoAccel)
+	    Permedia2Sync(pAPriv->pScrn);
 
 	return;
     }
 
-    if (which & 2) {
-    	xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x3A, 0x83);
-#ifndef COLORBARS
-	xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x61, 0xC2);
-#endif
-	GLINT_WRITE_REG(0, VSBBase + VSControl);
-	pAPriv->Port[1].StreamOn = FALSE;
-    }
+    if (pPPriv == &pAPriv->Port[0]) {
+	int line, eeek = 0;
 
-    if (which & 1) {
+	do {
+	    if (eeek++ > 1000000) break;
+	    line = GLINT_READ_REG(VSABase + VSCurrentLine);
+	} while (line > 15);
+	
 	GLINT_WRITE_REG(0, VSABase + VSControl);
+	
 	pAPriv->Port[0].StreamOn = FALSE;
+	
 	usleep(80000);
+    } else {
+    	xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x3A, 0x83);
+	if (!ColorBars)
+	    xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x61, 0xC2);
+	
+	GLINT_WRITE_REG(0, VSBBase + VSControl);
+	
+	pAPriv->Port[1].StreamOn = FALSE;
     }
 
-    if (!(pAPriv->Port[0].StreamOn || pAPriv->Port[1].StreamOn)) {
-	if (which & 4)
+    if (!pAPriv->Port[0].StreamOn && !pAPriv->Port[1].StreamOn) {
+	if (exit)
 	    xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x61, 0xC2);
 	xf86I2CWriteByte(&pAPriv->Port[0].I2CDev, 0x11, 0x00);
-	TimerCancel(pAPriv->Timer);
+    }
+
+    if (exit) {
+	FreeBuffers(pPPriv);
+	FreeCookies(pPPriv);
+	
+	if (pAPriv->TimerUsers) {
+	    pAPriv->TimerUsers &= ~PORTNUM(pPPriv);
+	    if (!pAPriv->TimerUsers)
+		TimerCancel(pAPriv->Timer);
+	}
+	
+	if (VideoOn > VIDEO_OFF && pGlint->NoAccel)
+	    Permedia2Sync(pAPriv->pScrn);
     }
 }
 
@@ -959,17 +1375,20 @@
 {
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
     GLINTPtr pGlint = GLINTPTR(pAPriv->pScrn);
+
+    if (pAPriv->VideoStd < 0)
+	return FALSE;
 
-    pPPriv->APO = -1;
+    pPPriv->StopDelay = -1;
 
     if (pAPriv->pm2p) {
 	if (pPPriv == &pAPriv->Port[0]) {
-	    if (!PutCookies(pPPriv, pRegion))
+	    if (!RemakePutCookies(pPPriv, pRegion))
 		return FALSE;
 	    if (pPPriv->StreamOn)
 		return TRUE;
 	} else {
-	    if (!GetCookies(pPPriv, pRegion))
+	    if (!RemakeGetCookies(pPPriv, pRegion))
 		return FALSE;
 	    if (pPPriv->StreamOn) {
 		BlackOut(pPPriv, pRegion);
@@ -977,7 +1396,7 @@
 	    }
 	}
 
-	xvipc.a = pPPriv->Buffers;
+	xvipc.a = pPPriv->BuffersRequested;
 	xvipc.b = !pPPriv->Attribute[4];
 	xvipc.c = 1 + (pPPriv->Attribute[4] & 2);
 
@@ -993,16 +1412,24 @@
     } else {
 	CARD32 Base = (pPPriv == &pAPriv->Port[0]) ? VSABase : VSBBase;
 
-        if (pPPriv->pFBArea[0] == NULL)
-    	    if (!ReallocateOffscreenBuffer(pPPriv, (pPPriv == &pAPriv->Port[0]) ? 2 : 1))
+        if (pPPriv->BuffersAllocated < pPPriv->BuffersRequested) {
+	    int height = ((pAPriv->VideoStd == NTSC) ? 512 : 608) >> (!pPPriv->Attribute[4]);
+
+    	    if (!AllocateBuffers(pPPriv, 704, height, 2, pPPriv->BuffersRequested, 0))
 		return FALSE;
 
+	    pPPriv->fw = 704;
+	    pPPriv->fh = InputVideoEncodings[pAPriv->VideoStd * 3].height >>
+			(!pPPriv->Attribute[4]);
+	}
+
 	if (pPPriv == &pAPriv->Port[0]) {
-	    if (!PutCookies(pPPriv, pRegion))
+	    if (!RemakePutCookies(pPPriv, pRegion))
 		return FALSE;
 	} else {
-	    if (!GetCookies(pPPriv, pRegion))
+	    if (!RemakeGetCookies(pPPriv, pRegion))
 		return FALSE;
+
 	    BlackOut(pPPriv, pRegion);
 	}
 
@@ -1018,14 +1445,12 @@
 
 	GLINT_WRITE_REG(0, Base + VSCurrentLine);
 
-	if (pAPriv->VideoStd == 1) {
-	    /* NTSC untested */
+	if (pAPriv->VideoStd == NTSC) {
 	    GLINT_WRITE_REG(16, Base + VSVideoStartLine);
 	    GLINT_WRITE_REG(16 + 240, Base + VSVideoEndLine);
 	    GLINT_WRITE_REG(288 + (8 & ~3) * 2, Base + VSVideoStartData);
 	    GLINT_WRITE_REG(288 + ((8 & ~3) + 704) * 2, Base + VSVideoEndData);
 	} else {
-	    /* PAL, SECAM (untested) */
 	    GLINT_WRITE_REG(16, Base + VSVideoStartLine);
 	    GLINT_WRITE_REG(16 + 288, Base + VSVideoEndLine);
 	    GLINT_WRITE_REG(288 + (8 & ~3) * 2, Base + VSVideoStartData);
@@ -1036,22 +1461,29 @@
 	GLINT_WRITE_REG(0, Base + VSVideoAddressIndex);
 
 	if (pPPriv == &pAPriv->Port[0]) {
+	    int line, eeek = 0;
+
 	    xf86I2CWriteByte(&pAPriv->Port[0].I2CDev, 0x11, 0x0D);
+
+	    do {
+		if (eeek++ > 1000000) break;
+		line = GLINT_READ_REG(VSABase + VSCurrentLine);
+	    } while (line > 15);
+
 	    GLINT_WRITE_REG(VSA_Video |
 			    (pPPriv->Attribute[4] ? 
 				VSA_CombineFields : VSA_Discard_FieldTwo),
 			    VSABase + VSControl);
-#ifdef COLORBARS
-	    if (!pAPriv->Port[1].StreamOn) {
-		xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x3A, 0x83);
-		xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x61, Enc61[pAPriv->VideoStd]);
-	    }
-#endif
+	    if (ColorBars)
+		if (!pAPriv->Port[1].StreamOn) {
+		    xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x3A, 0x83);
+		    xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x61, Enc61[pAPriv->VideoStd]);
+		}
 	} else {
 	    GLINT_WRITE_REG(VSB_Video |
 			    (pPPriv->Attribute[4] ? VSB_CombineFields : 0) |
 			  /* VSB_GammaCorrect | */
-			    (16 << 4) | /* 5:6:5 FIXME? */
+			    (16 << 4) | /* 5:6:5 */
 			    (1 << 9) | /* 16 */
 			    VSB_RGBOrder, VSBBase + VSControl);
 	    xf86I2CWriteByte(&pAPriv->Port[0].I2CDev, 0x11, 0x0D);
@@ -1059,6 +1491,7 @@
 	    xf86I2CWriteByte(&pAPriv->Port[1].I2CDev, 0x61, Enc61[pAPriv->VideoStd]);
 	}
 
+	pAPriv->TimerUsers |= 1 << PORTNUM(pPPriv);
 	TimerSet(pAPriv->Timer, 0, 80, TimerCallback, pAPriv);
 
 	return pPPriv->StreamOn = TRUE;
@@ -1067,66 +1500,10 @@
     return FALSE;
 }
 
-/* Pseudo interrupt - better than nothing
- * (not used in kernel backbone mode)
- */
-
-static CARD32
-TimerCallback(OsTimerPtr pTim, CARD32 now, pointer p)
-{
-    AdaptorPrivPtr pAPriv = (AdaptorPrivPtr) p;
-    GLINTPtr pGlint = GLINTPTR(pAPriv->pScrn);
-    PortPrivPtr pPPriv;
-    int delay;
-
-    pPPriv = &pAPriv->Port[0];
-
-    if (pPPriv->VideoOn >= 1) {
-	pPPriv->FrameAcc += pPPriv->FramesPerSec;
-	if (pPPriv->FrameAcc >= pAPriv->FramesPerSec) {
-	    pPPriv->FrameAcc -= pAPriv->FramesPerSec;
 
-	    PutYUV(pPPriv, (!pPPriv->pFBArea[1]) ?
-		   pPPriv->BufferBase[0] : pPPriv->BufferBase[1 -
-		   GLINT_READ_REG(VSABase + VSVideoAddressIndex)]);
-
-	    if (pPPriv->VideoOn == 1)
-		pPPriv->VideoOn = 0;
-	}
-    } else if (pPPriv->APO >= 0 && !(pPPriv->APO--))
-	DelayedStopVideo(pPPriv);
-
-    pPPriv = &pAPriv->Port[1];
-
-    if (pPPriv->VideoOn >= 1) {
-	pPPriv->FrameAcc += pPPriv->FramesPerSec;
-	if (pPPriv->FrameAcc >= pAPriv->FramesPerSec) {
-	    pPPriv->FrameAcc -= pAPriv->FramesPerSec;
-
-	    GetYUV(pPPriv);
-
-	    if (pPPriv->VideoOn == 1)
-		pPPriv->VideoOn = 0;
-	}
-    } else if (pPPriv->APO >= 0 && !(pPPriv->APO--))
-	DelayedStopVideo(pPPriv);
-
-    if (pAPriv->Port[0].StreamOn) {
-	delay = GLINT_READ_REG(VSABase + VSCurrentLine);
-	if (!(GLINT_READ_REG(VSStatus) & VS_FieldOne0A))
-	    delay += pAPriv->FrameLines >> 1;
-    } else if (pAPriv->Port[1].StreamOn) {
-	delay = GLINT_READ_REG(VSBBase + VSCurrentLine);
-	if (!(GLINT_READ_REG(VSStatus) & VS_FieldOne0B))
-	    delay += pAPriv->FrameLines >> 1;
-    } else
-	    delay = pAPriv->IntLine;
-
-    if (delay > (pAPriv->IntLine - 16))
-	delay -= pAPriv->FrameLines;
-
-    return (((pAPriv->IntLine - delay) * pAPriv->LinePer) + 999999) / 1000000;
-}
+/*
+ *  Xv interface
+ */
 
 static int
 Permedia2PutVideo(ScrnInfoPtr pScrn,
@@ -1136,42 +1513,39 @@
 {
     PortPrivPtr pPPriv = (PortPrivPtr) data;
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    int sw, sh;
 
     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
 	"PutVideo %d,%d,%d,%d -> %d,%d,%d,%d\n",
 	vid_x, vid_y, vid_w, vid_h, drw_x, drw_y, drw_w, drw_h));
-
-    if (pPPriv == &pAPriv->Port[0]) {
-	int sw = InputVideoEncodings[pAPriv->VideoStd * 3].width;
-	int sh = InputVideoEncodings[pAPriv->VideoStd * 3].height;
 
-	if ((vid_x + vid_w) > sw ||
-	    (vid_y + vid_h) > sh)
-	    return BadValue;
+    sw = InputVideoEncodings[pAPriv->VideoStd * 3].width;
+    sh = InputVideoEncodings[pAPriv->VideoStd * 3].height;
 
-	pPPriv->VideoOn = 0;
+    if ((vid_x + vid_w) > sw ||
+        (vid_y + vid_h) > sh)
+        return BadValue;
 
-        pPPriv->vx = ((vid_x << 10) * pPPriv->fw) / sw;
-	pPPriv->vy = ((vid_y << 10) * pPPriv->fh) / sh;
-        pPPriv->vw = ((vid_w << 10) * pPPriv->fw) / sw;
-	pPPriv->vh = ((vid_h << 10) * pPPriv->fh) / sh;
+    pPPriv->VideoOn = VIDEO_OFF;
 
-        pPPriv->dx = drw_x;
-	pPPriv->dy = drw_y;
-        pPPriv->dw = drw_w;
-	pPPriv->dh = drw_h;
+    pPPriv->vx = ((vid_x << 10) * pPPriv->fw) / sw;
+    pPPriv->vy = ((vid_y << 10) * pPPriv->fh) / sh;
+    pPPriv->vw = ((vid_w << 10) * pPPriv->fw) / sw;
+    pPPriv->vh = ((vid_h << 10) * pPPriv->fh) / sh;
 
-	pPPriv->FrameAcc = pAPriv->FramesPerSec;
+    pPPriv->dx = drw_x;
+    pPPriv->dy = drw_y;
+    pPPriv->dw = drw_w;
+    pPPriv->dh = drw_h;
 
-	if (!StartVideoStream(pPPriv, clipBoxes))
-	    return XvBadAlloc;
+    pPPriv->FrameAcc = pAPriv->FramesPerSec;
 
-	pPPriv->VideoOn = 2;
+    if (!StartVideoStream(pPPriv, clipBoxes))
+        return XvBadAlloc;
 
-	return Success;
-    }
+    pPPriv->VideoOn = VIDEO_ON;
 
-    return XvBadAlloc;
+    return Success;
 }
 
 static int
@@ -1183,63 +1557,56 @@
     PortPrivPtr pPPriv = (PortPrivPtr) data;  
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
     GLINTPtr pGlint = GLINTPTR(pScrn);
+    int sw, sh, r = Success;
 
     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
 	"PutStill %d,%d,%d,%d -> %d,%d,%d,%d\n",
 	vid_x, vid_y, vid_w, vid_h, drw_x, drw_y, drw_w, drw_h));
 
-    if (pPPriv == &pAPriv->Port[0]) {
-	int sw = InputVideoEncodings[pAPriv->VideoStd * 3].width;
-	int sh = InputVideoEncodings[pAPriv->VideoStd * 3].height;
+    sw = InputVideoEncodings[pAPriv->VideoStd * 3].width;
+    sh = InputVideoEncodings[pAPriv->VideoStd * 3].height;
 
-	if ((vid_x + vid_w) > sw ||
-	    (vid_y + vid_h) > sh)
-	    return BadValue;
-
-	pPPriv->VideoOn = 0;
-
-        pPPriv->vx = ((vid_x << 10) * pPPriv->fw) / sw;
-	pPPriv->vy = ((vid_y << 10) * pPPriv->fh) / sh;
-        pPPriv->vw = ((vid_w << 10) * pPPriv->fw) / sw;
-	pPPriv->vh = ((vid_h << 10) * pPPriv->fh) / sh;
-
-        pPPriv->dx = drw_x;
-	pPPriv->dy = drw_y;
-        pPPriv->dw = drw_w;
-	pPPriv->dh = drw_h;
+    if ((vid_x + vid_w) > sw ||
+        (vid_y + vid_h) > sh)
+        return BadValue;
 
-	{
-	    Bool r = TRUE;
+    pPPriv->VideoOn = VIDEO_OFF;
 
-	    pPPriv->FrameAcc = pAPriv->FramesPerSec;
+    pPPriv->vx = ((vid_x << 10) * pPPriv->fw) / sw;
+    pPPriv->vy = ((vid_y << 10) * pPPriv->fh) / sh;
+    pPPriv->vw = ((vid_w << 10) * pPPriv->fw) / sw;
+    pPPriv->vh = ((vid_h << 10) * pPPriv->fh) / sh;
 
-	    if (!StartVideoStream(pPPriv, clipBoxes))
-		return XvBadAlloc;
+    pPPriv->dx = drw_x;
+    pPPriv->dy = drw_y;
+    pPPriv->dw = drw_w;
+    pPPriv->dh = drw_h;
 
-	    if (pAPriv->pm2p) {
-		/* Sleep, not busy wait, until the very next frame is ready.
-		   Accept memory requests and other window's update events
-		   in the meantime. */
-		for (pPPriv->VideoOn = 1; pPPriv->VideoOn;)
-		    if (!xvipcHandshake(pPPriv, OP_UPDATE, TRUE)) {
-			r = FALSE;
-			break;
-		    }
-	    } else {
-		usleep(80000);
-		PutYUV(pPPriv, (!pPPriv->pFBArea[1]) ?
-		    pPPriv->BufferBase[0] : pPPriv->BufferBase[1 -
-		    GLINT_READ_REG(VSABase + VSVideoAddressIndex)]);
-	    }
+    pPPriv->FrameAcc = pAPriv->FramesPerSec;
 
-	    pPPriv->APO = 125; /* Delayed stop: consider PutStill staccato */
+    if (!StartVideoStream(pPPriv, clipBoxes))
+        return XvBadAlloc;
 
-	    if (r)
-		return Success;
-	}
+    if (pAPriv->pm2p) {
+	/* Sleep, not busy wait, until the very next frame is ready.
+	   Accept memory requests and other window's update events
+	   in the meantime. */
+	for (pPPriv->VideoOn = VIDEO_ONE_SHOT; pPPriv->VideoOn;)
+	    if (!xvipcHandshake(pPPriv, OP_UPDATE, TRUE)) {
+		r = FALSE;
+		break;
+	    }
+    } else {
+        usleep(80000);
+
+        PutYUV(pPPriv, (!pPPriv->pFBArea[1]) ?
+            pPPriv->BufferBase[0] : pPPriv->BufferBase[1 -
+		GLINT_READ_REG(VSABase + VSVideoAddressIndex)], FORMAT_YUYV, 1, 0);
     }
+
+    pPPriv->StopDelay = 125;
 
-    return XvBadAlloc;
+    return r;
 }
 
 static int
@@ -1250,44 +1617,43 @@
 {
     PortPrivPtr pPPriv = (PortPrivPtr) data;
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    int sw, sh;
 
     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
 	"GetVideo %d,%d,%d,%d <- %d,%d,%d,%d\n",
 	vid_x, vid_y, vid_w, vid_h, drw_x, drw_y, drw_w, drw_h));
-
-    if (pPPriv == &pAPriv->Port[1]) {
-	int sw = InputVideoEncodings[pAPriv->VideoStd * 3].width;
-	int sh = InputVideoEncodings[pAPriv->VideoStd * 3].height;
 
-	if ((vid_x + vid_w) > sw ||
-	    (vid_y + vid_h) > sh)
-	    return BadValue;
+    sw = InputVideoEncodings[pAPriv->VideoStd * 3].width;
+    sh = InputVideoEncodings[pAPriv->VideoStd * 3].height;
 
-	pPPriv->VideoOn = 0;
+    if ((vid_x + vid_w) > sw ||
+        (vid_y + vid_h) > sh) {
+        return BadValue;
+    }
 
-        pPPriv->vx = (vid_x * pPPriv->fw) / sw;
-	pPPriv->vy = (vid_y * pPPriv->fh) / sh;
-        pPPriv->vw = (vid_w * pPPriv->fw) / sw;
-	pPPriv->vh = (vid_h * pPPriv->fh) / sh;
+    pPPriv->VideoOn = VIDEO_OFF;
 
-        pPPriv->dx = drw_x;
-	pPPriv->dy = drw_y;
-        pPPriv->dw = drw_w;
-	pPPriv->dh = drw_h;
+    pPPriv->vx = (vid_x * pPPriv->fw) / sw;
+    pPPriv->vy = (vid_y * pPPriv->fh) / sh;
+    pPPriv->vw = (vid_w * pPPriv->fw) / sw;
+    pPPriv->vh = (vid_h * pPPriv->fh) / sh;
 
-	pPPriv->FrameAcc = pAPriv->FramesPerSec;
+    pPPriv->dx = drw_x;
+    pPPriv->dy = drw_y;
+    pPPriv->dw = drw_w;
+    pPPriv->dh = drw_h;
 
-	if (!StartVideoStream(pPPriv, clipBoxes))
-	    return XvBadAlloc;
+    pPPriv->FrameAcc = pAPriv->FramesPerSec;
 
-	GetYUV(pPPriv);
+    if (!StartVideoStream(pPPriv, clipBoxes)) {
+        return XvBadAlloc;
+    }
 
-	pPPriv->VideoOn = 2;
+    GetYUV(pPPriv);
 
-	return Success;
-    }
+    pPPriv->VideoOn = VIDEO_ON;
 
-    return XvBadAlloc;
+    return Success;
 }
 
 static int
@@ -1298,96 +1664,377 @@
 {
     PortPrivPtr pPPriv = (PortPrivPtr) data;  
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    int sw, sh;
 
     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
 	"GetStill %d,%d,%d,%d <- %d,%d,%d,%d\n",
 	vid_x, vid_y, vid_w, vid_h, drw_x, drw_y, drw_w, drw_h));
 
-    if (pPPriv == &pAPriv->Port[1]) {
-	int sw = InputVideoEncodings[pAPriv->VideoStd * 3].width;
-	int sh = InputVideoEncodings[pAPriv->VideoStd * 3].height;
+    sw = InputVideoEncodings[pAPriv->VideoStd * 3].width;
+    sh = InputVideoEncodings[pAPriv->VideoStd * 3].height;
 
-	if ((vid_x + vid_w) > sw ||
-	    (vid_y + vid_h) > sh)
-	    return BadValue;
+    if ((vid_x + vid_w) > sw ||
+        (vid_y + vid_h) > sh)
+        return BadValue;
 
-	pPPriv->VideoOn = 0;
+    pPPriv->VideoOn = VIDEO_OFF;
 
-        pPPriv->vx = (vid_x * pPPriv->fw) / sw;
-	pPPriv->vy = (vid_y * pPPriv->fh) / sh;
-        pPPriv->vw = (vid_w * pPPriv->fw) / sw;
-	pPPriv->vh = (vid_h * pPPriv->fh) / sh;
+    pPPriv->vx = (vid_x * pPPriv->fw) / sw;
+    pPPriv->vy = (vid_y * pPPriv->fh) / sh;
+    pPPriv->vw = (vid_w * pPPriv->fw) / sw;
+    pPPriv->vh = (vid_h * pPPriv->fh) / sh;
 
-        pPPriv->dx = drw_x;
-	pPPriv->dy = drw_y;
-        pPPriv->dw = drw_w;
-	pPPriv->dh = drw_h;
+    pPPriv->dx = drw_x;
+    pPPriv->dy = drw_y;
+    pPPriv->dw = drw_w;
+    pPPriv->dh = drw_h;
 
-	pPPriv->FrameAcc = pAPriv->FramesPerSec;
+    pPPriv->FrameAcc = pAPriv->FramesPerSec;
 
-	if (!StartVideoStream(pPPriv, clipBoxes))
-	    return XvBadAlloc;
+    if (!StartVideoStream(pPPriv, clipBoxes))
+        return XvBadAlloc;
 
-	GetYUV(pPPriv);
+    GetYUV(pPPriv);
 
-	/* Remains active until the client (implicitly)
-	   calls StopVideo for this port, GetStill, or GetVideo */
+    return Success;
+}
 
-	return Success;
+static void
+CopyYV12LE(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
+{
+    int Y_size = width * height;
+    CARD8 *V = Y + Y_size;
+    CARD8 *U = V + (Y_size >> 2);
+    int pad = (pitch >> 2) - (width >> 1);
+    int x;
+
+    width >>= 1;
+
+    for (height >>= 1; height > 0; height--) {
+	for (x = 0; x < width; Y += 2, x++)
+	    *dst++ = Y[0] + (U[x] << 8) + (Y[1] << 16) + (V[x] << 24);
+	dst += pad;
+	for (x = 0; x < width; Y += 2, x++)
+	    *dst++ = Y[0] + (U[x] << 8) + (Y[1] << 16) + (V[x] << 24);
+	dst += pad;
+	U += width;
+	V += width;
     }
+}
+
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+
+static void
+CopyYV12BE(CARD8 *Y, CARD32 *dst, int width, int height, int pitch)
+{
+    int Y_size = width * height;
+    CARD8 *V = Y + Y_size;
+    CARD8 *U = V + (Y_size >> 2);
+    int pad = (pitch >> 2) - (width >> 1);
+    int x;
+
+    width >>= 1;
 
-    return XvBadAlloc;
+    for (height >>= 1; height > 0; height--) {
+	for (x = 0; x < width; Y += 2, x++)
+	    *dst++ = V[x] + (Y[1] << 8) + (U[x] << 16) + (Y[0] << 24);
+	dst += pad;
+	for (x = 0; x < width; Y += 2, x++)
+	    *dst++ = V[x] + (Y[1] << 8) + (U[x] << 16) + (Y[0] << 24);
+	dst += pad;
+	U += width;
+	V += width;
+    }
 }
 
+#endif /* X_BYTE_ORDER == X_BIG_ENDIAN */
+
 static void
-Permedia2StopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit)
+CopyFlat(CARD8 *src, CARD8 *dst, int width, int height, int pitch)
+{
+    if (width == pitch) {
+	memcpy(dst, src, width * height);
+	return;
+    }
+
+    while (height > 0) {
+	memcpy(dst, src, width);
+	dst += pitch;
+	src += width;
+	height--;
+    }
+}
+
+static int
+Permedia2PutImage(ScrnInfoPtr pScrn,
+    short src_x, short src_y, short drw_x, short drw_y,
+    short src_w, short src_h, short drw_w, short drw_h,
+    int id, unsigned char *buf, short width, short height,
+    Bool sync, RegionPtr clipBoxes, pointer data)
 {
     PortPrivPtr pPPriv = (PortPrivPtr) data;  
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
     GLINTPtr pGlint = GLINTPTR(pScrn);
+    int i;
 
     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
-	"StopVideo port=%d, exit=%d\n",
-	PORTNUM(pPPriv), exit));
+	"PutImage %d,%d,%d,%d -> %d,%d,%d,%d id=0x%08x buf=%p w=%d h=%d sync=%d\n",
+	src_x, src_y, src_w, src_h, drw_x, drw_y, drw_w, drw_h,
+	id, buf, width, height, sync));
+
+    if ((src_x + src_w) > width ||
+        (src_y + src_h) > height)
+        return BadValue;
+
+    pPPriv->vx = src_x << 10;
+    pPPriv->vy = src_y << 10;
+    pPPriv->vw = src_w << 10;
+    pPPriv->vh = src_h << 10;
+
+    pPPriv->dx = drw_x;
+    pPPriv->dy = drw_y;
+    pPPriv->dw = drw_w;
+    pPPriv->dh = drw_h;
+
+    if (!RemakePutCookies(pPPriv, clipBoxes))
+	return XvBadAlloc;
+
+    if (pPPriv->BuffersAllocated <= 0 ||
+	id != pPPriv->Id || /* same bpp */
+	width != pPPriv->fw ||
+	height != pPPriv->fh)
+    {
+	for (i = 0; i < ENTRIES(ScalerImages); i++)
+	    if (id == ScalerImages[i].id)
+		break;
+
+	if (i >= ENTRIES(ScalerImages))
+	    return XvBadAlloc;
+#if 0
+	if (pPPriv->BuffersAllocated <= 0 ||
+	    pPPriv->Bpp != ScalerImages[i].bits_per_pixel ||
+	    width > pPPriv->fw || height > pPPriv->fw ||
+	    pPPriv->fw * pPPriv->fh > width * height * 2)
+#else
+	if (1)
+#endif
+	{
+	    Permedia2Sync(pScrn);
 
-    pPPriv->VideoOn = 0;
+	    if (!AllocateBuffers(pPPriv, width, height,
+		(ScalerImages[i].bits_per_pixel + 7) >> 3, 1, 0)) {
+		pPPriv->Id = 0;
+		pPPriv->Bpp = 0;
+		pPPriv->fw = 0;
+		pPPriv->fh = 0;
 
-    if (exit) {
-    	StopVideoStream(pAPriv, 1 << PORTNUM(pPPriv));
-	ReallocateOffscreenBuffer(pPPriv, 0);
+		return XvBadAlloc;
+	    }
+
+	    pPPriv->Id = id;
+	    pPPriv->Bpp = ScalerImages[i].bits_per_pixel;
+	    pPPriv->fw = width;
+	    pPPriv->fh = height;
+
+	    RemoveableBuffers(pPPriv, TRUE);
+	} else
+	    Permedia2Sync(pScrn);
     } else
-	pPPriv->APO = 750; /* Delay, appx. 30 sec */
+	Permedia2Sync(pScrn);
+
+    switch (id) {
+    case LE4CC('Y','V','1','2'):
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
+	CopyYV12LE(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
+	    width, height, pPPriv->BufferStride);
+#else
+	if (pGlint->FBDev)
+	    CopyYV12LE(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
+		width, height, pPPriv->BufferStride);
+	else
+	    CopyYV12BE(buf, (CARD32 *)((CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0]),
+		width, height, pPPriv->BufferStride);
+#endif
+	PutYUV(pPPriv, pPPriv->BufferBase[0], FORMAT_YUYV, 1, 0);
+	break;
+
+    case LE4CC('Y','U','Y','2'):
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 1, height, pPPriv->BufferStride);
+	PutYUV(pPPriv, pPPriv->BufferBase[0], FORMAT_YUYV, 1, 0);
+	break;
+
+    case LE4CC('U','Y','V','Y'):
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 1, height, pPPriv->BufferStride);
+	PutYUV(pPPriv, pPPriv->BufferBase[0], FORMAT_UYVY, 1, 0);
+	break;
+
+    case LE4CC('Y','U','V','A'):
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 2, height, pPPriv->BufferStride);
+	PutYUV(pPPriv, pPPriv->BufferBase[0], FORMAT_YUVA, 2, pPPriv->Attribute[7]);
+	break;
+
+    case LE4CC('V','U','Y','A'):
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 2, height, pPPriv->BufferStride);
+	PutYUV(pPPriv, pPPriv->BufferBase[0], FORMAT_VUYA, 2, pPPriv->Attribute[7]);
+	break;
+
+    case 0x41: /* RGBA 8:8:8:8 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 2, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_RGB8888, 2, pPPriv->Attribute[7]);
+	break;
+
+    case 0x42: /* RGB 5:6:5 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 1, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_RGB565, 1, 0);
+	break;
+
+    case 0x43: /* RGB 1:5:5:5 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 1, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_RGB5551, 1, pPPriv->Attribute[7]);
+	break;
+
+    case 0x44: /* RGB 4:4:4:4 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 1, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_RGB4444, 1, pPPriv->Attribute[7]);
+	break;
+
+    case 0x45: /* RGB 1:2:3:2 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_RGB2321, 0, pPPriv->Attribute[7]);
+	break;
+
+    case 0x46: /* RGB 2:3:3 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_RGB332, 0, 0);
+	break;
+
+    case 0x47: /* BGRA 8:8:8:8 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 2, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_BGR8888, 2, pPPriv->Attribute[7]);
+	break;
+
+    case 0x48: /* BGR 5:6:5 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 1, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_BGR565, 1, 0);
+	break;
+
+    case 0x49: /* BGR 1:5:5:5 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 1, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_BGR5551, 1, pPPriv->Attribute[7]);
+	break;
+
+    case 0x4A: /* BGR 4:4:4:4 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 1, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_BGR4444, 1, pPPriv->Attribute[7]);
+	break;
+
+    case 0x4B: /* BGR 1:2:3:2 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 0, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_BGR2321, 0, pPPriv->Attribute[7]);
+	break;
+
+    case 0x4C: /* BGR 2:3:3 */
+	CopyFlat(buf, (CARD8 *) pGlint->FbBase + pPPriv->BufferBase[0],
+	    width << 0, height, pPPriv->BufferStride);
+	PutRGB(pPPriv, pPPriv->BufferBase[0], FORMAT_BGR332, 0, 0);
+	break;
+
+    default:
+	return XvBadAlloc;
+    }
 
-    if (pGlint->NoAccel)
+    pPPriv->StopDelay = pAPriv->Delay;
+
+    if (!pAPriv->TimerUsers) {
+	pAPriv->TimerUsers |= 1 << PORTNUM(pPPriv);
+	TimerSet(pAPriv->Timer, 0, 80, TimerCallback, pAPriv);
+    }
+
+    if (sync) /* sched_yield? */
 	Permedia2Sync(pScrn);
+
+    return Success;
 }
 
 static void
-DelayedStopVideo(PortPrivPtr pPPriv)
+Permedia2StopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit)
 {
+    PortPrivPtr pPPriv = (PortPrivPtr) data;  
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
-
-    DEBUG(xf86DrvMsgVerb(pAPriv->pScrn->scrnIndex, X_INFO, 3,
-	"DelayedStopVideo port=%d\n", PORTNUM(pPPriv)));
+    GLINTPtr pGlint = GLINTPTR(pScrn);
 
-    pPPriv->APO = -1;
-    Permedia2StopVideo(pAPriv->pScrn, (pointer) pPPriv, TRUE);
-}
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+	"StopVideo port=%d, exit=%d\n", PORTNUM(pPPriv), exit));
 
-/* Remind Port[0].v* are shifted 1 << 10 */
+    if (exit) {
+	if (PORTNUM(pPPriv) < 2) {
+	    StopVideoStream(pPPriv, TRUE);
+	    RestoreVideoStd(pAPriv);
+	} else {
+	    FreeBuffers(pPPriv);
+	    FreeCookies(pPPriv);
+	    if (pAPriv->TimerUsers) {
+		pAPriv->TimerUsers &= ~PORTNUM(pPPriv);
+		if (!pAPriv->TimerUsers)
+		    TimerCancel(pAPriv->Timer);
+	    }
+	}
+    } else {
+	pPPriv->VideoOn = VIDEO_OFF;
+	pPPriv->StopDelay = 750; /* appx. 30 sec */
 
-static void
-AdjustVideoW(PortPrivPtr pPPriv, int num, int denom)
-{
-    pPPriv->vx = (pPPriv->vx * num) / denom;
-    pPPriv->vw = (pPPriv->vw * num) / denom;
+	if (pGlint->NoAccel)
+	    Permedia2Sync(pScrn);
+    }
 }
 
 static void
-AdjustVideoH(PortPrivPtr pPPriv, int num, int denom)
+RestartVideo(PortPrivPtr pPPriv, int old_VideoOn)
 {
-    pPPriv->vy = (pPPriv->vy * num) / denom;
-    pPPriv->vh = (pPPriv->vh * num) / denom;
+    AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    int new_fh;
+
+    if (pPPriv->VideoOn > VIDEO_OFF ||
+	pAPriv->VideoStd < 0 /* invalid */)
+	return;
+
+    new_fh = InputVideoEncodings[pAPriv->VideoStd * 3].height >>
+	(1 - (pPPriv->Attribute[4] & 1));
+
+    if (new_fh != pPPriv->fh) {
+	pPPriv->vy = (pPPriv->vy * new_fh) / pPPriv->fh;
+	pPPriv->vh = (pPPriv->vh * new_fh) / pPPriv->fh;
+
+	pPPriv->fh = new_fh;
+    }
+
+    if (old_VideoOn) {
+	if (StartVideoStream(pPPriv, NULL)) {
+	    pPPriv->VideoOn = old_VideoOn;
+
+	    if (pPPriv == &pAPriv->Port[1])
+		GetYUV(pPPriv);
+	} else {
+	    DEBUG(xf86DrvMsgVerb(pAPriv->pScrn->scrnIndex, X_INFO, 4,
+		"RestartVideo port=%d suspend\n", PORTNUM(pPPriv)));
+	    pPPriv->VideoOn = -old_VideoOn; /* suspend (not off) */
+	}
+    }
 }
 
 static int
@@ -1396,142 +2043,162 @@
 {
     PortPrivPtr pPPriv = (PortPrivPtr) data;
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+    int old_VideoStd, old_Plug;
+    int VideoStd = -1, Plug = 0;
+    int r;
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "SPA attr=%d, val=%d, port=%d\n",
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+	"SPA attr=%d val=%d port=%d\n",
 	attribute, value, PORTNUM(pPPriv)));
 
     if (attribute == xvFilter) {
 	pPPriv->Attribute[5] = !!value;
 	return Success;
-    } else if (attribute == xvInterlace) {
-	value %= 3;
+    } else if (attribute == xvAlpha) {
+	pPPriv->Attribute[7] = !!value;
+	return Success;
+    }
 
-	if (value != pPPriv->Attribute[4]) {
-	    int VideoOn = ABS(pPPriv->VideoOn);
-	    int fh;
+    if (PORTNUM(pPPriv) >= 2)
+	return BadMatch;
 
-    	    StopVideoStream(pAPriv, 1 << PORTNUM(pPPriv));
+    if (attribute == xvInterlace) {
+	int old_value = pPPriv->Attribute[4];
 
-	    ReallocateOffscreenBuffer(pPPriv, 0);
+	value %= 3;
 
+	if (value != old_value) {
+	    int old_VideoOn = ABS(pPPriv->VideoOn);
+#if 0
+	    if (old_VideoOn)
+		return XvBadAlloc;
+#endif
+	    StopVideoStream(pPPriv, FALSE);
+	    FreeBuffers(pPPriv);
 	    pPPriv->Attribute[4] = value;
+	    RestartVideo(pPPriv, old_VideoOn);
 
-	    fh = InputVideoEncodings[pAPriv->VideoStd * 3].height >> (1 - (value & 1));
-	    AdjustVideoH(pPPriv, fh, pPPriv->fh);
-	    pPPriv->fh = fh;
-
-	    if (VideoOn) {
-		if (StartVideoStream(pPPriv, NULL)) {
-		    pPPriv->VideoOn = VideoOn;
-		    if (pPPriv == &pAPriv->Port[1])
-			GetYUV(pPPriv);
-		} else {
-		    pPPriv->VideoOn = -VideoOn;
-		    return XvBadAlloc;
-		}
+	    if (pPPriv->VideoOn < 0 /* suspended */) {
+		pPPriv->Attribute[4] = old_value;
+		RestartVideo(pPPriv, old_VideoOn);
+		return XvBadAlloc;
 	    }
 	}
 
 	return Success;
     }
 
-    if (PORTNUM(pPPriv) == 0) {
+    if (pPPriv == &pAPriv->Port[0]) {
+	/*
+	 *  Input
+	 */
 	if (attribute == xvEncoding) {
-	    if (value < 0 || value > 8) {
+	    if (value < 0 || value > ENTRIES(InputVideoEncodings))
 		return XvBadEncoding;
-	    }
+
+	    VideoStd = value / 3;
+	    Plug = value % 3;
+
 	    /* Fall through */
-	} else if (attribute == xvBrightness) {
-	    pPPriv->Attribute[0] = value = CLAMP(value, -1000, +1000);
-	    return SetAttr(&pAPriv->Port[0], 0, 0x0A, 128 + (MIN(value, +999) * 128) / 1000);
-	} else if (attribute == xvContrast) {
-	    pPPriv->Attribute[1] = value = CLAMP(value, -3000, +1000);
-	    return SetAttr(&pAPriv->Port[0], 1, 0x0B, 64 + (MIN(value, +999) * 64) / 1000);
-   	} else if (attribute == xvSaturation) {
-	    pPPriv->Attribute[2] = value = CLAMP(value, -3000, +1000);
-	    return SetAttr(&pAPriv->Port[0], 2, 0x0C, 64 + (MIN(value, +999) * 64) / 1000);
-	} else if (attribute == xvHue) {
-	    pPPriv->Attribute[3] = value = CLAMP(value, -1000, +1000);
-	    return SetAttr(&pAPriv->Port[0], 3, 0x0D, (MIN(value, +999) * 128) / 1000);
-	} else
-	    return BadMatch;
-    } else { /* Output */
+
+	} else if (attribute == xvBrightness)
+	    return SetAttr(&pAPriv->Port[0], 0, value);
+	else if (attribute == xvContrast)
+	    return SetAttr(&pAPriv->Port[0], 1, value);
+   	else if (attribute == xvSaturation)
+	    return SetAttr(&pAPriv->Port[0], 2, value);
+	else if (attribute == xvHue)
+	    return SetAttr(&pAPriv->Port[0], 3, value);
+    } else {
+	/*
+	 *  Output
+	 */
 	if (attribute == xvEncoding) {
-	    if (value < 0 || value > 3)
+	    if (value < 0 || value > ENTRIES(OutputVideoEncodings))
 		return XvBadEncoding;
-	    if (++value >= 3) value++;
-	} else if (attribute == xvBkgColor) {
-	    pPPriv->Attribute[6] = value;
-	    pPPriv->BkgCol = ((value & 0xF80000) >> 8) |
-			     ((value & 0x00FC00) >> 5) |
-			     ((value & 0x0000F8) >> 3);
-	    pPPriv->BkgCol |= pPPriv->BkgCol << 16;
-	    if (pPPriv->StreamOn) {
-		BlackOut(pPPriv, NULL);
-		GetYUV(pPPriv);
-	    }
+
+	    VideoStd = value / 2;
+	    Plug = (value % 2) + 1;
+
+	    /* Fall through */
+
+	} else if (attribute == xvBkgColor)
+	    return SetBkgCol(pPPriv, value);
+#if 1
+	else if (attribute == xvBrightness ||
+		 attribute == xvContrast ||
+		 attribute == xvSaturation ||
+		 attribute == xvHue)
 	    return Success;
-	} else
-    	    return Success;
+#endif
     }
 
-    if (attribute == xvEncoding) {
-	pPPriv->Plug = value % 3;
-
-	if (!SetPlug(pPPriv))
-	    return XvBadAlloc;
+    if (attribute != xvEncoding)
+	return BadMatch;
 
-	value /= 3;
+    old_VideoStd = pAPriv->VideoStd;
+    old_Plug = pPPriv->Plug;
 
-	if (value != pAPriv->VideoStd) {
-	    int VideoOn0 = ABS(pAPriv->Port[0].VideoOn);
-	    int	VideoOn1 = ABS(pAPriv->Port[1].VideoOn);
-	    int fh;
-
-	    StopVideoStream(pAPriv, 1 | 2);
-
-	    if (value == 1 || pAPriv->VideoStd == 1) {
-		ReallocateOffscreenBuffer(&pAPriv->Port[0], 0);
-		ReallocateOffscreenBuffer(&pAPriv->Port[1], 0);
-	    }
+#if 0
+    if (pAPriv->Port[0].VideoOn ||
+	pAPriv->Port[1].VideoOn)
+	return XvBadAlloc;
+#endif
 
-	    pAPriv->VideoStd = value;
+    if (Plug != old_Plug)
+	if ((r = SetPlug(pPPriv, Plug)) != Success)
+	    return r;
 
-	    SetVideoStd(pAPriv);
+    if (VideoStd != old_VideoStd) {
+	int old_VideoOn0 = ABS(pAPriv->Port[0].VideoOn);
+	int old_VideoOn1 = ABS(pAPriv->Port[1].VideoOn);
 
-	    fh = InputVideoEncodings[pAPriv->VideoStd * 3].height >> (!pAPriv->Port[0].Attribute[4]);
-	    AdjustVideoH(&pAPriv->Port[0], fh, pAPriv->Port[0].fh);
-	    pAPriv->Port[0].fh = fh;
+	StopVideoStream(&pAPriv->Port[0], FALSE);
+	StopVideoStream(&pAPriv->Port[1], FALSE);
 
-	    fh = InputVideoEncodings[pAPriv->VideoStd * 3].height >> (!pAPriv->Port[1].Attribute[4]);
-	    AdjustVideoH(&pAPriv->Port[1], fh, pAPriv->Port[1].fh);
-	    pAPriv->Port[1].fh = fh;
+	if (VideoStd == NTSC || pAPriv->VideoStd == NTSC) {
+	    FreeBuffers(&pAPriv->Port[0]);
+	    FreeBuffers(&pAPriv->Port[1]);
+	}
 
-	    if (VideoOn0)
-		pAPriv->Port[0].VideoOn = (StartVideoStream(&pAPriv->Port[0], NULL)) ?
-		    VideoOn0 : -VideoOn0;
+	if (SetVideoStd(pPPriv, VideoStd) == Success) {
+	    RestartVideo(&pAPriv->Port[0], old_VideoOn0);
+	    RestartVideo(&pAPriv->Port[1], old_VideoOn1);
+	}
 
-	    if (VideoOn1) {
-		if (StartVideoStream(&pAPriv->Port[1], NULL)) {
-		    pAPriv->Port[1].VideoOn = VideoOn1;
-		    GetYUV(pPPriv);
-		} else
-		    pAPriv->Port[1].VideoOn = -VideoOn1;
+	if (pAPriv->Port[0].VideoOn < 0 ||
+	    pAPriv->Port[1].VideoOn < 0 ||
+	    VideoStd != pAPriv->VideoStd) {
+	    if (SetVideoStd(pPPriv, old_VideoStd) == Success) {
+		RestartVideo(&pAPriv->Port[0], old_VideoOn0);
+		RestartVideo(&pAPriv->Port[1], old_VideoOn1);
 	    }
 
-	    if (pAPriv->Port[0].VideoOn < 0 ||
-		pAPriv->Port[1].VideoOn < 0 ||
-		pAPriv->VideoStd != value)
-		return XvBadAlloc;
+	    if (Plug != old_Plug)
+		SetPlug(pPPriv, old_Plug);
+
+	    return XvBadAlloc;
 	}
     }
 
     return Success;
 }
 
-/* Should update attrs via XVIPC too,
- * Xv has XvPortNotify but no DDX equivalent.
- */
+static void
+RestoreVideoStd(AdaptorPrivPtr pAPriv)
+{
+    if (pAPriv->Port[0].VideoOn && !pAPriv->Port[1].VideoOn &&
+	pAPriv->Port[0].VideoStdReq != pAPriv->VideoStd)
+	Permedia2SetPortAttribute(pAPriv->pScrn, xvEncoding,
+	    pAPriv->Port[0].VideoStdReq * 3 + pAPriv->Port[0].Plug, 
+	    (pointer) &pAPriv->Port[0]);
+    else
+    if (pAPriv->Port[1].VideoOn && !pAPriv->Port[0].VideoOn &&
+	pAPriv->Port[1].VideoStdReq != pAPriv->VideoStd)
+	Permedia2SetPortAttribute(pAPriv->pScrn, xvEncoding,
+	    pAPriv->Port[2].VideoStdReq * 2 + pAPriv->Port[1].Plug - 1, 
+	    (pointer) &pAPriv->Port[1]);
+}
 
 static int
 Permedia2GetPortAttribute(ScrnInfoPtr pScrn, 
@@ -1539,10 +2206,21 @@
 {
     PortPrivPtr pPPriv = (PortPrivPtr) data;
     AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
+
+    if (PORTNUM(pPPriv) >= 2 &&
+	attribute != xvFilter &&
+	attribute != xvAlpha)
+	return BadMatch;
 
-    if (attribute == xvEncoding)
-	*value = pAPriv->VideoStd * 3 + pPPriv->Plug;
-    else if (attribute == xvBrightness)
+    if (attribute == xvEncoding) {
+	if (pAPriv->VideoStd < 0)
+	    return XvBadAlloc;
+	else
+	    if (pPPriv == &pAPriv->Port[0])
+		*value = pAPriv->VideoStd * 3 + pPPriv->Plug;
+	    else
+		*value = pAPriv->VideoStd * 2 + pPPriv->Plug - 1;
+    } else if (attribute == xvBrightness)
 	*value = pPPriv->Attribute[0];
     else if (attribute == xvContrast)
 	*value = pPPriv->Attribute[1];
@@ -1556,10 +2234,13 @@
 	*value = pPPriv->Attribute[5];
     else if (attribute == xvBkgColor)
 	*value = pPPriv->Attribute[6];
+    else if (attribute == xvAlpha)
+	*value = pPPriv->Attribute[7];
     else
 	return BadMatch;
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "GPA attr=%d, val=%d, port=%d\n",
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+	"GPA attr=%d val=%d port=%d\n",
 	attribute, *value, PORTNUM(pPPriv)));
 
     return Success;
@@ -1574,6 +2255,132 @@
     *p_h = drw_h;
 }
 
+static int
+Permedia2QueryImageAttributes(ScrnInfoPtr pScrn,
+    int id, unsigned short *width, unsigned short *height,
+    int *pitches, int *offsets)
+{
+    int i, pitch;
+
+    *width = CLAMP(*width, 1, 2047);
+    *height = CLAMP(*height, 1, 2047);
+
+    if (offsets)
+	offsets[0] = 0;
+
+    switch (id) {
+    case LE4CC('Y','V','1','2'): /* Planar YVU 4:2:0 (emulated) */
+	*width = CLAMP((*width + 1) & ~1, 2, 2046);
+	*height = CLAMP((*height + 1) & ~1, 2, 2046);
+
+	pitch = *width; /* luma component */
+
+	if (offsets) {
+	    offsets[1] = pitch * *height;
+	    offsets[2] = offsets[1] + (offsets[1] >> 2);
+	}
+
+	if (pitches) {
+	    pitches[0] = pitch;
+	    pitches[1] = pitches[2] = pitch >> 1;
+	}
+
+	return pitch * *height * 3 / 2;
+
+    case LE4CC('Y','U','Y','2'): /* Packed YUYV 4:2:2 */
+    case LE4CC('U','Y','V','Y'): /* Packed UYVY 4:2:2 */
+	*width = CLAMP((*width + 1) & ~1, 2, 2046);
+
+	pitch = *width * 2;
+
+	if (pitches)
+	    pitches[0] = pitch;
+
+	return pitch * *height;
+
+    default:
+	for (i = 0; i < ENTRIES(ScalerImages); i++)
+	    if (ScalerImages[i].id == id)
+		break;
+
+	if (i >= ENTRIES(ScalerImages))
+	    break;
+
+	pitch = *width * (ScalerImages[i].bits_per_pixel >> 3);
+
+	if (pitches)
+	    pitches[0] = pitch;
+
+	return pitch * *height;
+    }
+
+    return 0;
+}
+
+static void
+RestoreVideo(AdaptorPrivPtr pAPriv)
+{
+    GLINTPtr pGlint = GLINTPTR(pAPriv->pScrn);
+
+    GLINT_WRITE_REG(pAPriv->dFifoControl, PMFifoControl);
+    GLINT_WRITE_REG(0, VSABase + VSControl);
+    GLINT_WRITE_REG(0, VSBBase + VSControl);
+    usleep(160000);
+    GLINT_MASK_WRITE_REG(VS_UnitMode_ROM, ~VS_UnitMode_Mask, VSConfiguration);
+}
+
+static void
+InitializeVideo(AdaptorPrivPtr pAPriv)
+{
+    GLINTPtr pGlint = GLINTPTR(pAPriv->pScrn);
+    int i;
+
+    GLINT_WRITE_REG(0, VSABase + VSControl);
+    GLINT_WRITE_REG(0, VSBBase + VSControl);
+
+#if 0
+    GLINT_MASK_WRITE_REG(0, ~(VSAIntFlag | VSBIntFlag), IntEnable);
+    GLINT_WRITE_REG(VSAIntFlag | VSBIntFlag, IntFlags); /* Reset */
+#endif
+
+    for (i = 0x0018; i <= 0x00B0; i += 8) {
+        GLINT_WRITE_REG(0, VSABase + i);
+        GLINT_WRITE_REG(0, VSBBase + i);
+    }
+
+    GLINT_WRITE_REG((0 << 8) | (132 << 0), VSABase + VSFifoControl);
+    GLINT_WRITE_REG((0 << 8) | (132 << 0), VSBBase + VSFifoControl);
+
+    GLINT_MASK_WRITE_REG(
+        VS_UnitMode_AB8 |
+        VS_GPBusMode_A |
+     /* VS_HRefPolarityA | */
+        VS_VRefPolarityA |
+        VS_VActivePolarityA |
+     /* VS_UseFieldA | */
+        VS_FieldPolarityA |
+     /* VS_FieldEdgeA | */
+     /* VS_VActiveVBIA | */
+	VS_InterlaceA |
+	VS_ReverseDataA |
+
+     /* VS_HRefPolarityB | */
+        VS_VRefPolarityB |
+        VS_VActivePolarityB |
+     /* VS_UseFieldB | */
+        VS_FieldPolarityB |
+     /* VS_FieldEdgeB | */
+     /* VS_VActiveVBIB | */
+        VS_InterlaceB |
+     /* VS_ColorSpaceB_RGB | */
+     /* VS_ReverseDataB | */
+     /* VS_DoubleEdgeB | */
+        0, ~0x1FFFFE0F, VSConfiguration);
+
+    pAPriv->dFifoControl = GLINT_READ_REG(PMFifoControl);
+    GLINT_WRITE_REG((12 << 8) | 8, PMFifoControl);
+}
+
 static Bool
 xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
 {
@@ -1582,8 +2389,7 @@
 
     xvipc.magic = XVIPC_MAGIC;
     xvipc.op = op;
-    xvipc.block = block; /* Wait (with timeout), else don't wait for events
-			   if none are pending. */
+    xvipc.block = block;
 
     if (pPPriv) {
 	AdaptorPrivPtr pAPriv = pPPriv->pAdaptor;
@@ -1597,8 +2403,9 @@
 	xvipc.port = -1;
     }
 
-    while (TRUE) {
-	if (brake-- <= 0) return FALSE; /* We have a bug. */
+    for (;;) {
+	if (brake-- <= 0)
+	    return FALSE; /* I brake for bugs. */
 
 	DEBUG(xf86MsgVerb(X_INFO, 4,
 	    "PM2 XVIPC send op=%d bl=%d po=%d a=%d b=%d c=%d\n",
@@ -1611,127 +2418,148 @@
 	    xvipc.op, xvipc.block, xvipc.port, xvipc.a, xvipc.b, xvipc.c, r, errno));
 
 	switch (xvipc.op) {
-	    case OP_ALLOC:
-	    {
-		AdaptorPrivPtr pAPriv = xvipc.pAPriv;
-		ScrnInfoPtr pScrn = pAPriv->pScrn;
-		GLINTPtr pGlint = GLINTPTR(pScrn);
-		FBAreaPtr pFBArea;
-		LFBAreaPtr pLFBArea = NULL;
-
-		xvipc.a = -1;
+	case OP_ALLOC:
+	{
+	    AdaptorPrivPtr pAPriv = xvipc.pAPriv;
+	    ScrnInfoPtr pScrn = pAPriv->pScrn;
+	    GLINTPtr pGlint = GLINTPTR(pScrn);
+	    FBAreaPtr pFBArea = NULL;
+	    LFBAreaPtr pLFBArea;
+
+	    xvipc.a = -1;
+
+	    pLFBArea = xalloc(sizeof(LFBAreaRec));
+
+	    if (pLFBArea) {
+		pLFBArea->pFBArea = pFBArea =
+		    xf86AllocateLinearOffscreenArea(pScrn->pScreen,
+		        xvipc.b >> BPPSHIFT(pGlint), 2, NULL, NULL, NULL);
+
+		if (pFBArea) {
+		    /* xvipc.a = pFBArea->linear; */
+		    pLFBArea->Linear = xvipc.a =
+			((pFBArea->box.y1 * pScrn->displayWidth) +
+			    pFBArea->box.x1) << BPPSHIFT(pGlint);
+		} else
+		    xfree(pLFBArea);
+	    }
 
-		if ((pFBArea = xf86AllocateLinearOffscreenArea(pScrn->pScreen,
-		    xvipc.b >> BPPSHIFT(pGlint), 2, NULL, NULL, NULL)))
-		    xvipc.a = ((pFBArea->box.y1 * pScrn->displayWidth) +
-			      pFBArea->box.x1) << BPPSHIFT(pGlint);
+	    /* Report results */
 
-		if (ioctl(xvipc_fd, VIDIOC_PM2_XVIPC, (void *) &xvipc) != 0) {
-		    if (pFBArea) xf86FreeOffscreenArea(pFBArea);
+	    if (ioctl(xvipc_fd, VIDIOC_PM2_XVIPC, (void *) &xvipc) != 0)
+		if (pFBArea) {
+		    xf86FreeOffscreenArea(pFBArea);
+		    xfree(pLFBArea);
 		    pFBArea = NULL;
 		}
-
-		if (pFBArea && (pLFBArea = xalloc(sizeof(LFBAreaRec)))) {
-		    pLFBArea->Next = pAPriv->LFBList;
-		    pLFBArea->pFBArea = pFBArea;
-		    pLFBArea->Linear = xvipc.a;
-		    pAPriv->LFBList = pLFBArea;
-		}
-
-		DEBUG(xf86MsgVerb(X_INFO, 3, "PM2 XVIPC alloc addr=%d=0x%08x pFB=%p pLFB=%p\n",
-		    xvipc.a, xvipc.a, pFBArea, pLFBArea));
 
-		goto event;
+	    if (pFBArea) {
+		pLFBArea->Next = pAPriv->LFBList;
+		pAPriv->LFBList = pLFBArea;
 	    }
 
-	    case OP_FREE:
-	    {
-		AdaptorPrivPtr pAPriv = xvipc.pAPriv;
-		LFBAreaPtr pLFBArea, *ppLFBArea;
+	    DEBUG(xf86MsgVerb(X_INFO, 3, "PM2 XVIPC alloc addr=%d=0x%08x pFB=%p\n",
+		xvipc.a, xvipc.a, pFBArea));
 
-		for (ppLFBArea = &pAPriv->LFBList; (pLFBArea = *ppLFBArea);
-		     ppLFBArea = &pLFBArea->Next)
-		    if (pLFBArea->Linear == xvipc.a)
-			break;
+	    goto event;
+	}
 
-		if (!pLFBArea)
-		    xvipc.a = -1;
+	case OP_FREE:
+	{
+	    AdaptorPrivPtr pAPriv = xvipc.pAPriv;
+	    LFBAreaPtr pLFBArea, *ppLFBArea;
 
-		DEBUG(xf86MsgVerb(X_INFO, 3, "PM2 XVIPC free addr=%d=0x%08x pLFB=%p\n",
-		    xvipc.a, xvipc.a, pLFBArea));
+	    for (ppLFBArea = &pAPriv->LFBList; (pLFBArea = *ppLFBArea);
+		ppLFBArea = &pLFBArea->Next)
+		if (pLFBArea->Linear == xvipc.a)
+		    break;
 
-		if (ioctl(xvipc_fd, VIDIOC_PM2_XVIPC, (void *) &xvipc) == 0) {
-		    xf86FreeOffscreenArea(pLFBArea->pFBArea);
-		    *ppLFBArea = pLFBArea->Next;
-		    xfree(pLFBArea);
-		    pLFBArea = NULL;
-		}
+	    if (!pLFBArea)
+		xvipc.a = -1;
 
-		goto event;
-	    }
+	    DEBUG(xf86MsgVerb(X_INFO, 3, "PM2 XVIPC free addr=%d=0x%08x pFB=%p\n",
+		xvipc.a, xvipc.a, pLFBArea ? pLFBArea->pFBArea : NULL));
 
-	    case OP_UPDATE:
-	    {
-		AdaptorPrivPtr pAPriv = xvipc.pAPriv;
-		PortPrivPtr pPPriv;
+	    if (ioctl(xvipc_fd, VIDIOC_PM2_XVIPC, (void *) &xvipc) == 0 && pLFBArea) {
+		xf86FreeOffscreenArea(pLFBArea->pFBArea);
+		*ppLFBArea = pLFBArea->Next;
+		xfree(pLFBArea);
+	    }
 
-		pPPriv = &pAPriv->Port[0];
+	    goto event;
+	}
 
-		if (pPPriv->VideoOn >= 1 && xvipc.a > 0) {
-		    pPPriv->FrameAcc += pPPriv->FramesPerSec;
-		    if (pPPriv->FrameAcc >= pAPriv->FramesPerSec) {
-			pPPriv->FrameAcc -= pAPriv->FramesPerSec;
+	case OP_UPDATE:
+	{
+	    AdaptorPrivPtr pAPriv = xvipc.pAPriv;
+	    PortPrivPtr pPPriv;
 
-			/* Asynchronous resizing caused by kernel app */
+	    pPPriv = &pAPriv->Port[0];
 
-			if (xvipc.c != pPPriv->fw ||
-			    xvipc.d != pPPriv->fh) {
-			    AdjustVideoW(pPPriv, xvipc.c, pPPriv->fw);
-			    AdjustVideoH(pPPriv, xvipc.d, pPPriv->fh);
-			    pPPriv->fw = xvipc.c;
-			    pPPriv->fh = xvipc.d;
-			    pPPriv->BufferPProd = xvipc.e;
+	    if (pPPriv->VideoOn > VIDEO_OFF && xvipc.a > 0) {
+	        pPPriv->FrameAcc += pPPriv->FramesPerSec;
+	        if (pPPriv->FrameAcc >= pAPriv->FramesPerSec) {
+		    pPPriv->FrameAcc -= pAPriv->FramesPerSec;
+
+		    /* Asynchronous resizing caused by kernel app */
+
+		    if (xvipc.c != pPPriv->fw ||
+		        xvipc.d != pPPriv->fh) {
+			pPPriv->vx = (pPPriv->vx * xvipc.c) / pPPriv->fw;
+			pPPriv->vw = (pPPriv->vw * xvipc.c) / pPPriv->fw;
+			pPPriv->vy = (pPPriv->vy * xvipc.d) / pPPriv->fh;
+			pPPriv->vh = (pPPriv->vh * xvipc.d) / pPPriv->fh;
+
+			pPPriv->fw = xvipc.c;
+			pPPriv->fh = xvipc.d;
+			pPPriv->BufferPProd = xvipc.e;
 
-			    PutCookies(pPPriv, NULL);
-			}
+			RemakePutCookies(pPPriv, NULL);
+		    }
 
-			PutYUV(pPPriv, xvipc.a);
+		    PutYUV(pPPriv, xvipc.a, FORMAT_YUYV, 1, 0);
 
-			if (pPPriv->VideoOn == 1)
-			    pPPriv->VideoOn = 0;
-		    }
-		} else if (pPPriv->APO >= 0 && !(pPPriv->APO--))
-		    DelayedStopVideo(pPPriv);
+		    if (pPPriv->VideoOn == VIDEO_ONE_SHOT)
+			pPPriv->VideoOn = VIDEO_OFF;
+		}
+	    } else
+		if (pPPriv->StopDelay >= 0 && !(pPPriv->StopDelay--)) {
+		    StopVideoStream(pPPriv, TRUE);
+		    RestoreVideoStd(pAPriv);
+		}
 
-		pPPriv = &pAPriv->Port[1];
+	    pPPriv = &pAPriv->Port[1];
 
-		if (pPPriv->VideoOn >= 1 && xvipc.b > 0) {
-		    pPPriv->FrameAcc += pPPriv->FramesPerSec;
-		    if (pPPriv->FrameAcc >= pAPriv->FramesPerSec) {
-			pPPriv->FrameAcc -= pAPriv->FramesPerSec;
+	    if (pPPriv->VideoOn > VIDEO_OFF && xvipc.b > 0) {
+	        pPPriv->FrameAcc += pPPriv->FramesPerSec;
+		if (pPPriv->FrameAcc >= pAPriv->FramesPerSec) {
+		    pPPriv->FrameAcc -= pAPriv->FramesPerSec;
 
-			pPPriv->BufferBase[0] = xvipc.b;
+		    pPPriv->BufferBase[0] = xvipc.b;
 
-			/* Output is always exclusive, no async resizing */
+		    /* Output is always exclusive, no async resizing */
 
-			GetYUV(pPPriv);
+		    GetYUV(pPPriv);
 
-			if (pPPriv->VideoOn == 1)
-			    pPPriv->VideoOn = 0;
-		    }
-		} else if (pPPriv->APO >= 0 && !(pPPriv->APO--))
-		    DelayedStopVideo(pPPriv);
+		    if (pPPriv->VideoOn == VIDEO_ONE_SHOT)
+			pPPriv->VideoOn = VIDEO_OFF;
+		}
+	    } else
+		if (pPPriv->StopDelay >= 0 && !(pPPriv->StopDelay--)) {
+		    StopVideoStream(pPPriv, TRUE);
+		    RestoreVideoStd(pAPriv);
+		}
 
-		/* Fall through */
-	    }
+	    /* Fall through */
+	}
 
-	    default:
-	    event:
-		if (xvipc.op == op)
-		    return r == 0;
+	default:
+	event:
+	    if (xvipc.op == op)
+		return r == 0;
 
-		xvipc.op = OP_EVENT;
-		xvipc.block = block;
+	    xvipc.op = OP_EVENT;
+	    xvipc.block = block;
 	}
     }
 
@@ -1744,29 +2572,6 @@
     xvipcHandshake(NULL, OP_EVENT, FALSE);
 }
 
-static void
-AdaptorPrivUninit(AdaptorPrivPtr pAPriv)
-{
-    GLINTPtr pGlint = GLINTPTR(pAPriv->pScrn);
-
-    if (!pAPriv->pm2p) {
-	TimerFree(pAPriv->Timer);
-	xf86DestroyI2CDevRec(&pAPriv->Port[0].I2CDev, FALSE);
-	xf86DestroyI2CDevRec(&pAPriv->Port[1].I2CDev, FALSE);
-	GLINT_MASK_WRITE_REG(VS_UnitMode_ROM, ~VS_UnitMode_Mask, VSConfiguration);
-	GLINT_WRITE_REG(pAPriv->FifoControl, PMFifoControl);
-    }
-
-    FreeCookies(&pAPriv->Port[0]);
-    FreeCookies(&pAPriv->Port[1]);
-
-    xfree(pAPriv);
-}
-
-/* Only a single file for all heads, the device ID is transmitted at initial
- * handshake and encoded in all subsequent xvipc headers.
- */
-
 static Bool
 xvipcOpen(char *name, ScrnInfoPtr pScrn)
 {
@@ -1780,8 +2585,9 @@
     if (!osname || strcmp(osname, "linux"))
 	return FALSE;
 
-    while (1) {
-	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "XVIPC probing device %s\n", name));
+    for (;;) {
+	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
+	    "XVIPC probing device %s\n", name));
 
     	if ((xvipc_fd = open(name, O_RDWR /* | O_TRUNC */, 0)) < 0)
 	    break;
@@ -1806,16 +2612,9 @@
 	    break;
 	}
 
-	/* Typical input devices should be closed when VT switched away, but
-	 * this is proprietary IPC between this driver and the kernel driver
-	 * only. Actually, it would be better to continue listening to kernel
-	 * events, at least keeping the file open, to avoid side effects of
-	 * repeated dis- and reconnection, shouldn't hurt.
-	 */
-
 	xf86AddInputHandler(xvipc_fd, Permedia2ReadInput, NULL);
 
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv driver connected to %s\n", name);
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv driver opened %s\n", name);
 
 	return TRUE;
     }
@@ -1825,48 +2624,142 @@
 
     xvipc_fd = -1;
 
-    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-	       "Cannot connect to Permedia 2 kernel driver. "
-	       "Note that using both drivers at the same time "
-	       "will cause problems.\n");
+    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Cannot find Permedia 2 kernel driver.\n");
+
     return FALSE;
 }
 
+static void
+DeleteAdaptorPriv(AdaptorPrivPtr pAPriv)
+{
+    int i;
+
+    if (pAPriv->VideoIO) {
+	StopVideoStream(&pAPriv->Port[0], TRUE);
+	StopVideoStream(&pAPriv->Port[1], TRUE);
+    }
+
+    for (i = 0; i < 6; i++) {
+        FreeBuffers(&pAPriv->Port[i]);
+	FreeCookies(&pAPriv->Port[i]);
+    }
+
+    TimerFree(pAPriv->Timer);
+
+    if (pAPriv->VideoIO) {
+	if (pAPriv->pm2p)
+	    xvipcHandshake(&pAPriv->Port[0], OP_DISCONNECT, TRUE);
+	else {
+	    xf86DestroyI2CDevRec(&pAPriv->Port[0].I2CDev, FALSE);
+	    xf86DestroyI2CDevRec(&pAPriv->Port[1].I2CDev, FALSE);
+
+	    RestoreVideo(pAPriv);
+	}
+    }
+
+    xfree(pAPriv);
+}
+
 static AdaptorPrivPtr
-AdaptorPrivInit(ScrnInfoPtr pScrn)
+NewAdaptorPriv(ScrnInfoPtr pScrn, Bool VideoIO)
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
     AdaptorPrivPtr pAPriv = (AdaptorPrivPtr) xcalloc(1, sizeof(AdaptorPrivRec));
     int i;
 
-    if (pAPriv) {
-	pAPriv->pScrn = pScrn;
-	pAPriv->Port[0].pAdaptor = pAPriv;
-	pAPriv->Port[1].pAdaptor = pAPriv;
-
-	pAPriv->Port[0].Attribute[0] = 0;	/* Brightness (-1000..+1000) */
-	pAPriv->Port[0].Attribute[1] = 0; 	/* Contrast (-3000..+1000) */
-	pAPriv->Port[0].Attribute[2] = 0; 	/* Color saturation (-3000..+1000) */
-	pAPriv->Port[0].Attribute[3] = 0;	/* Hue (-1000..+1000) */
-	pAPriv->Port[0].Attribute[4] = 1;	/* Interlaced (0 = not, 1 = yes, 2 = dscan) */
-	pAPriv->Port[0].Attribute[5] = 0;	/* Bilinear Filter (Bool) */
+    if (!pAPriv)
+	return NULL;
 
-	pAPriv->Port[1].Attribute[4] = 1;	/* Interlaced (Bool) */
-	pAPriv->Port[1].Attribute[5] = 0;	/* Bilinear Filter (Bool) */
-	pAPriv->Port[1].Attribute[6] = 0;	/* BkgColor 0x00RRGGBB */
-	pAPriv->Port[1].BkgCol = 0;
+    pAPriv->pScrn = pScrn;
+    
+    for (i = 0; i < PORTS; i++)
+	pAPriv->Port[i].pAdaptor = pAPriv;
 
-	pAPriv->Port[0].Buffers = 2;
-	pAPriv->Port[1].Buffers = 1;
+    switch (pScrn->depth) {
+    case 8:
+        pAPriv->dDitherMode =
+	    (0 << 10) |			/* BGR */
+	    (1 << 1) |			/* Dither */
+	    ((5 & 0x10) << 12) |
+	    ((5 & 0x0F) << 2) |		/* 3:3:2f */
+	    UNIT_ENABLE;
+        pAPriv->dAlphaBlendMode =
+	    (0 << 13) |
+	    ((5 & 0x10) << 12) |
+	    ((5 & 0x0F) << 8) |
+	    (84 << 1) |			/* Blend (decal) RGB */
+	    UNIT_ENABLE;
+	pAPriv->dTextureDataFormat =
+	    (1 << 4) |			/* No alpha */
+	    ((14 & 0x10) << 2) |
+	    ((14 & 0x0F) << 0);		/* CI8 */
+	break;
+
+    case 15:
+        pAPriv->dDitherMode =
+	    (1 << 10) |			/* RGB */
+	    ((1 & 0x10) << 12) |
+	    ((1 & 0x0F) << 2) |		/* 5:5:5:1f */
+	    UNIT_ENABLE;
+        pAPriv->dAlphaBlendMode =
+	    (1 << 13) |
+	    ((1 & 0x10) << 12) |
+	    ((1 & 0x0F) << 8) |
+	    (84 << 1) |
+	    UNIT_ENABLE;
+	pAPriv->dTextureDataFormat =
+    	    (1 << 5) |			/* RGB */
+	    (1 << 4) |
+	    ((1 & 0x10) << 2) |
+	    ((1 & 0x0F) << 0);
+	break;
+
+    case 16:
+        pAPriv->dDitherMode =
+	    (1 << 10) |			/* RGB */
+	    ((16 & 0x10) << 12) |
+	    ((16 & 0x0F) << 2) |	/* 5:6:5f */
+	    UNIT_ENABLE;
+        pAPriv->dAlphaBlendMode =
+	    (1 << 13) |
+	    ((16 & 0x10) << 12) |
+	    ((16 & 0x0F) << 8) |
+	    (84 << 1) |
+	    UNIT_ENABLE;
+	pAPriv->dTextureDataFormat =
+	    (1 << 5) |
+	    (1 << 4) |
+	    ((16 & 0x10) << 2) |
+	    ((16 & 0x0F) << 0);
+	break;
+
+    case 24:
+        pAPriv->dDitherMode =
+	    (1 << 10) |			/* RGB */
+	    ((0 & 0x10) << 12) |
+	    ((0 & 0x0F) << 2) |		/* 8:8:8:8 */
+	    UNIT_ENABLE;
+        pAPriv->dAlphaBlendMode =
+	    (1 << 13) |
+	    ((0 & 0x10) << 12) |
+	    ((0 & 0x0F) << 8) |
+	    (84 << 1) |
+	    UNIT_ENABLE;
+	pAPriv->dTextureDataFormat =
+	    (1 << 5) |
+	    (1 << 4) |
+	    ((0 & 0x10) << 2) |
+	    ((0 & 0x0F) << 0);
+	break;
+
+    default:
+	xfree(pAPriv);
+	return NULL;
+    }
 
-	for (i = 0; i <= 1; i++) {
-	    pAPriv->Port[i].fw = 704;
-	    pAPriv->Port[i].fh = 576;
-	    pAPriv->Port[i].FramesPerSec = 30;
-	    pAPriv->Port[i].APO = -1;
-	    pAPriv->Port[i].BufferPProd = partprodPermedia[704 >> 5];
-	}
+    pAPriv->VideoIO = VideoIO;
 
+    if (VideoIO) {
 	if (xvipc_fd >= 0) {
 	    /* Initial handshake, take over control of this head */
 
@@ -1889,138 +2782,183 @@
 			       "shared access please start the server first.\n");
 		else
 		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-			       "Initialization of Xv support with kernel backbone "
-			       "failed due to error %d: %s.\n", errno, strerror(errno));
+			       "Failed to initialize kernel backbone "
+			       "due to error %d: %s.\n", errno, strerror(errno));
 		goto failed;
 	    }
 
 	    pAPriv->pm2p = xvipc.pm2p;
-
-	    SetVideoStd(pAPriv);
 	} else {
-	    GLINT_WRITE_REG(0, VSABase + VSControl);
-	    GLINT_WRITE_REG(0, VSBBase + VSControl);
-#if 0
-	    GLINT_MASK_WRITE_REG(0, ~(VSAIntFlag | VSBIntFlag), IntEnable);
-	    GLINT_WRITE_REG(VSAIntFlag | VSBIntFlag, IntFlags); /* Reset */
-#endif
-    	    for (i = 0x0018; i <= 0x00B0; i += 8) {
-		GLINT_WRITE_REG(0, VSABase + i);
-		GLINT_WRITE_REG(0, VSBBase + i);
-	    }
+	    InitializeVideo(pAPriv);
 
-	    GLINT_WRITE_REG((0 << 8) | (132 << 0), VSABase + VSFifoControl);
-	    GLINT_WRITE_REG((0 << 8) | (132 << 0), VSBBase + VSFifoControl);
-
-	    GLINT_MASK_WRITE_REG(
-		VS_UnitMode_AB8 |
-		VS_GPBusMode_A |
-	     /* VS_HRefPolarityA | */
-		VS_VRefPolarityA |
-		VS_VActivePolarityA |
-	     /* VS_UseFieldA | */
-		VS_FieldPolarityA |
-	     /* VS_FieldEdgeA | */
-	     /* VS_VActiveVBIA | */
-        	VS_InterlaceA |
-		VS_ReverseDataA |
-
-	     /* VS_HRefPolarityB | */
-		VS_VRefPolarityB |
-		VS_VActivePolarityB |
-	     /* VS_UseFieldB | */
-		VS_FieldPolarityB |
-	     /* VS_FieldEdgeB | */
-	     /* VS_VActiveVBIB | */
-		VS_InterlaceB |
-	     /* VS_ColorSpaceB_RGB | */
-	     /* VS_ReverseDataB | */
-	     /* VS_DoubleEdgeB | */
-		0, ~0x1FFFFE0F, VSConfiguration);
-
-	    pAPriv->FifoControl = GLINT_READ_REG(PMFifoControl);
-	    GLINT_WRITE_REG((12 << 8) | 8, PMFifoControl); /* FIXME */
-
 	    if (!xf86I2CProbeAddress(pGlint->VSBus, SAA7111_SLAVE_ADDRESS))
-		goto failed;
+    		goto failed;
 
-	    pAPriv->Port[0].I2CDev.DevName = "Decoder";
-	    pAPriv->Port[0].I2CDev.SlaveAddr = SAA7111_SLAVE_ADDRESS;
+	    pAPriv->Port[0].I2CDev.DevName = "Decoder SAA 7111A";
+    	    pAPriv->Port[0].I2CDev.SlaveAddr = SAA7111_SLAVE_ADDRESS;
 	    pAPriv->Port[0].I2CDev.pI2CBus = pGlint->VSBus;
 
 	    if (!xf86I2CDevInit(&pAPriv->Port[0].I2CDev))
 		goto failed;
 
-	    if (!xf86I2CWriteVec(&pAPriv->Port[0].I2CDev, DecInitVec,
-		(sizeof(DecInitVec) / sizeof(I2CByte)) / 2))
+	    if (!xf86I2CWriteVec(&pAPriv->Port[0].I2CDev, DecInitVec, ENTRIES(DecInitVec) / 2))
 		goto failed;
 
 	    if (!xf86I2CProbeAddress(pGlint->VSBus, SAA7125_SLAVE_ADDRESS))
 		goto failed;
 
-	    pAPriv->Port[1].I2CDev.DevName = "Encoder";
+	    pAPriv->Port[1].I2CDev.DevName = "Encoder SAA 7125";
 	    pAPriv->Port[1].I2CDev.SlaveAddr = SAA7125_SLAVE_ADDRESS;
-	    pAPriv->Port[1].I2CDev.pI2CBus = pGlint->VSBus;
+    	    pAPriv->Port[1].I2CDev.pI2CBus = pGlint->VSBus;
 
 	    if (!xf86I2CDevInit(&pAPriv->Port[1].I2CDev))
 		goto failed;
 
-	    if (!xf86I2CWriteVec(&pAPriv->Port[1].I2CDev, EncInitVec,
-		(sizeof(EncInitVec) / sizeof(I2CByte)) / 2))
+	    if (!xf86I2CWriteVec(&pAPriv->Port[1].I2CDev, EncInitVec, ENTRIES(EncInitVec) / 2))
 		goto failed;
+	}
 
-	    SetVideoStd(pAPriv);
+	if (SetVideoStd(&pAPriv->Port[0], PAL) != Success ||
+	    SetPlug(&pAPriv->Port[0], 0) != Success ||  /* composite */
+	    SetPlug(&pAPriv->Port[1], 1) != Success)    /* composite-adaptor */
+	    goto failed;
+
+	pAPriv->Port[1].VideoStdReq = pAPriv->Port[0].VideoStdReq;
+
+	pAPriv->Port[0].BuffersRequested = 2;
+	pAPriv->Port[1].BuffersRequested = 1;
+
+	for (i = 0; i < 2; i++) {
+    	    pAPriv->Port[i].fw = 704;
+    	    pAPriv->Port[i].fh = 576;
+    	    pAPriv->Port[i].FramesPerSec = 30;
+    	    pAPriv->Port[i].BufferPProd = partprodPermedia[704 >> 5];
+	}
+
+	SetAttr(&pAPriv->Port[0], 0, 0);	/* Brightness (-1000..+1000) */
+	SetAttr(&pAPriv->Port[0], 1, 0);	/* Contrast (-3000..+1000) */
+	SetAttr(&pAPriv->Port[0], 2, 0);	/* Color saturation (-3000..+1000) */
+	SetAttr(&pAPriv->Port[0], 3, 0);	/* Hue (-1000..+1000) */
 
-     	    pAPriv->Timer = TimerSet(NULL, 0, 0, TimerCallback, pAPriv);
+	pAPriv->Port[0].Attribute[4] = 1;	/* Interlaced (0 = not, 1 = yes,
+						    2 = double scan 50/60 Hz) */
+	pAPriv->Port[0].Attribute[5] = 0;	/* Bilinear Filter (Bool) */
 
-	    if (!pAPriv->Timer)
-		goto failed;
+	pAPriv->Port[1].Attribute[4] = 1;	/* Interlaced (Bool) */
+	pAPriv->Port[1].Attribute[5] = 0;	/* Bilinear Filter (Bool) */
+
+	SetBkgCol(&pAPriv->Port[1], 0x000000);	/* BkgColor 0x00RRGGBB */
+    } /* VideoIO */
+
+    if (!(pAPriv->Timer = TimerSet(NULL, 0, 0, TimerCallback, pAPriv)))
+        goto failed;
+
+    for (i = 0; i < PORTS; i++)
+    	pAPriv->Port[i].StopDelay = -1;
+
+    /* Frontend scaler */    
+
+    for (i = 2; i < 6; i++) {
+	pAPriv->Port[i].fw = 0;
+	pAPriv->Port[i].fh = 0;
+	pAPriv->Port[i].BuffersRequested = 1;
+	pAPriv->Delay = 125;
+	pAPriv->Instant = 1000 / 25;
+
+	if (!VideoIO || pAPriv->pm2p) {
+	    pAPriv->Delay = 5;
+	    pAPriv->Instant = 1000;
 	}
+
+	pAPriv->Port[i].Attribute[5] = 0;	/* Bilinear Filter (Bool) */
+	pAPriv->Port[i].Attribute[7] = 0;	/* Alpha Enable (Bool) */
+    }
 
-	return pAPriv;
+    return pAPriv;
 
 failed:
-	AdaptorPrivUninit(pAPriv);
-    }
 
+    DeleteAdaptorPriv(pAPriv);
+
     return NULL;
 }
 
+
+/*
+ *  Glint interface
+ */
+
 void
-Permedia2VideoUninit(ScrnInfoPtr pScrn)
+Permedia2VideoEnterVT(ScrnInfoPtr pScrn)
 {
-    AdaptorPrivPtr pAPriv, *ppAPriv;
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    AdaptorPrivPtr pAPriv;
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 1, "Xv driver cleanup\n"));
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv enter VT\n"));
 
-    for (ppAPriv = &AdaptorPrivList; (pAPriv = *ppAPriv); ppAPriv = &(pAPriv->Next))
+    for (pAPriv = AdaptorPrivList; pAPriv != NULL; pAPriv = pAPriv->Next)
 	if (pAPriv->pScrn == pScrn) {
-	    *ppAPriv = pAPriv->Next;
-	    StopVideoStream(pAPriv, 1 | 2 | 4);
-	    AdaptorPrivUninit(pAPriv);
+	    if (pAPriv->VideoIO) {
+		if (pAPriv->pm2p)
+		    xvipcHandshake(&pAPriv->Port[0], OP_ENTER, TRUE);
+		else {
+		    InitializeVideo(pAPriv);
+
+		    xf86I2CWriteVec(&pAPriv->Port[1].I2CDev, EncInitVec, ENTRIES(EncInitVec) / 2);
+		}
+
+		SetVideoStd(&pAPriv->Port[0], pAPriv->VideoStd);
+		SetPlug(&pAPriv->Port[0], pAPriv->Port[0].Plug);
+		SetPlug(&pAPriv->Port[1], pAPriv->Port[1].Plug);
+	    }
+
+	    if (pGlint->NoAccel)
+		Permedia2InitializeEngine(pScrn);
+
 	    break;
 	}
-
-    if (xvipc_fd >= 0) {
-	close(xvipc_fd);
-	xvipc_fd = -1;
-    }
 }
 
-/* Required to retire delayed stop (VT switching away) */
-
 void
-Permedia2VideoReset(ScrnInfoPtr pScrn)
+Permedia2VideoLeaveVT(ScrnInfoPtr pScrn)
 {
     AdaptorPrivPtr pAPriv;
 
     for (pAPriv = AdaptorPrivList; pAPriv != NULL; pAPriv = pAPriv->Next)
+	if (pAPriv->pScrn == pScrn) {
+	    if (pAPriv->VideoIO) {
+		StopVideoStream(&pAPriv->Port[0], TRUE);
+		StopVideoStream(&pAPriv->Port[1], TRUE);
+
+		if (pAPriv->pm2p)
+		    xvipcHandshake(&pAPriv->Port[0], OP_LEAVE, TRUE);
+		else
+		    RestoreVideo(pAPriv);
+	    }
+	    break;
+	}
+
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Elvis left the building\n"));
+}
+
+void
+Permedia2VideoUninit(ScrnInfoPtr pScrn)
+{
+    AdaptorPrivPtr pAPriv, *ppAPriv;
+
+    for (ppAPriv = &AdaptorPrivList; (pAPriv = *ppAPriv); ppAPriv = &(pAPriv->Next))
 	if (pAPriv->pScrn == pScrn) {
-	    StopVideoStream(pAPriv, 1 | 2 | 4);
+	    *ppAPriv = pAPriv->Next;
+	    DeleteAdaptorPriv(pAPriv);
 	    break;
 	}
+
+    if (xvipc_fd >= 0) {
+	close(xvipc_fd);
+	xvipc_fd = -1;
+    }
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 1, "Xv driver halted\n"));
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv cleanup\n"));
 }
 
 void
@@ -2029,83 +2967,95 @@
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     GLINTPtr pGlint = GLINTPTR(pScrn);
     AdaptorPrivPtr pAPriv;
-    DevUnion Private[2];
-    XF86VideoAdaptorRec VAR[2];
-    XF86VideoAdaptorPtr VARPtrs[2];
     pointer options[3];
+    DevUnion Private[PORTS];
+    XF86VideoAdaptorRec VAR[ADAPTORS];
+    XF86VideoAdaptorPtr VARPtrs[ADAPTORS];
     Bool VideoIO = TRUE;
     int i;
+
+    switch (pGlint->Chipset) {
+    case PCI_VENDOR_TI_CHIP_PERMEDIA2:
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
+    case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
+        break;
+
+    default:
+        return;
+    }
 
-    options[0] = NULL;
-    options[1] = NULL;
-    options[2] = NULL;
+    options[0] = NULL;	/* VideoAdaptor "input" subsection options */
+    options[1] = NULL;	/* VideoAdaptor "output" subsection options */
+    options[2] = NULL;	/* VideoAdaptor options */
 
     for (i = 0;; i++) {
-	char *adaptor;
+	char *adaptor; /* receives VideoAdaptor section identifier */
 
 	if (!options[0])
-	    options[0] = xf86FindXvOptions(pScreen->myNum, i, "input", &adaptor, &options[2]);
+	    options[0] = xf86FindXvOptions(pScreen->myNum, i, "input", &adaptor, options[2] ? NULL : &options[2]);
+
 	if (!options[1])
-	    options[1] = xf86FindXvOptions(pScreen->myNum, i, "output", &adaptor, NULL);
+	    options[1] = xf86FindXvOptions(pScreen->myNum, i, "output", &adaptor, options[2] ? NULL : &options[2]);
+
 	if (!adaptor) {
-	    if (!i) VideoIO = FALSE;
+	    if (!i) /* VideoAdaptor reference enables Xv vio driver */
+		VideoIO = FALSE;
 	    break;
 	} else if (options[0] && options[1])
 	    break;
     }
 
-    if (!VideoIO) {
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 1, "Xv driver disabled\n");
-	return;
-    }
-
-    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 1, "Initializing Xv driver\n");
-
-    switch (pGlint->Chipset) {
-	case PCI_VENDOR_TI_CHIP_PERMEDIA2:
-	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2:
-	case PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V:
-	    break;
-	default:
-	    VideoIO = FALSE;
-    }
-
-    switch (pciReadLong(pGlint->PciTag, PCI_SUBSYSTEM_ID_REG)) {
+    if (VideoIO)
+	switch (pciReadLong(pGlint->PciTag, PCI_SUBSYSTEM_ID_REG)) {
 	case PCI_SUBSYSTEM_ID_WINNER_2000_P2A:
 	case PCI_SUBSYSTEM_ID_WINNER_2000_P2C:
 	case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A:
 	case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2C:
 	    break;
+
 	default:
+	    xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv vio support for this board\n");
 	    VideoIO = FALSE;
-    }
+	}
 
-    if (!VideoIO) {
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv support for this board\n");
+    if (pGlint->NoAccel && !VideoIO)
 	return;
-    }
 
-    for (i = 0; i <= 2; i++) {
-	xf86ProcessOptions(pScrn->scrnIndex, options[i],
-	    (i == 0) ? InputOptions : ((i == 1) ? OutputOptions : AdaptorOptions));
-	xf86ShowUnusedOptions(pScrn->scrnIndex, options[i]);
-    }
+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 1, "Initializing Xv driver rev. 4\n");
+
+    if (VideoIO) {
+	for (i = 0; i <= 2; i++) {
+	    xf86ProcessOptions(pScrn->scrnIndex, options[i],
+		(i == 0) ? InputOptions :
+		(i == 1) ? OutputOptions :
+			   AdaptorOptions);
 
-    if (xf86IsOptionSet(AdaptorOptions, OPTION_DEVICE))
-        xvipcOpen(xf86GetOptValString(AdaptorOptions, OPTION_DEVICE), pScrn);
+	    xf86ShowUnusedOptions(pScrn->scrnIndex, options[i]);
+	}
+
+	if (xf86IsOptionSet(AdaptorOptions, OPTION_DEVICE)) {
+    	    if (!xvipcOpen(xf86GetOptValString(AdaptorOptions, OPTION_DEVICE), pScrn))
+		VideoIO = FALSE;
+	}
+    }
 
-    if (!(pAPriv = AdaptorPrivInit(pScrn))) {
+    if (!(pAPriv = NewAdaptorPriv(pScrn, VideoIO))) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Xv driver initialization failed\n");
 	return;
     }
 
-    for (i = 0; i <= 1; i++) {
+    if (VideoIO) {
 	int n;
 
-	if (xf86GetOptValInteger(i ? OutputOptions : InputOptions, OPTION_BUFFERS, &n))
-	    pAPriv->Port[i].Buffers = CLAMP(n, 1, i ? 1 : 2); /* FIXME */
-	if (xf86GetOptValInteger(i ? OutputOptions : InputOptions, OPTION_FPS, &n))
-	    pAPriv->Port[i].FramesPerSec = CLAMP(n, 1, 30);
+	if (xf86GetOptValInteger(InputOptions, OPTION_BUFFERS, &n))
+	    pAPriv->Port[0].BuffersRequested = CLAMP(n, 1, 2);
+	if (xf86GetOptValInteger(InputOptions, OPTION_FPS, &n))
+	    pAPriv->Port[0].FramesPerSec = CLAMP(n, 1, 30);
+
+	if (xf86GetOptValInteger(OutputOptions, OPTION_BUFFERS, &n))
+	    pAPriv->Port[1].BuffersRequested = 1;
+	if (xf86GetOptValInteger(OutputOptions, OPTION_FPS, &n))
+	    pAPriv->Port[1].FramesPerSec = CLAMP(n, 1, 30);	
     }
 
     if (pGlint->NoAccel) {
@@ -2121,43 +3071,82 @@
 	AvailFBArea.y2 = pGlint->FbMapSize /
 	    (pScrn->displayWidth * pScrn->bitsPerPixel / 8);
 
-	/* if (AvailFBArea.y2 > 2047)
-	    AvailFBArea.y2 = 2047; */
-
 	xf86InitFBManager(pScreen, &AvailFBArea);
     }
 
+#if defined(XFree86LOADER) && 0
+    if (xf86LoaderCheckSymbol("xf86InitLinearFBManagerRegion")) {
+	int last = pGlint->FbMapSize / (pScrn->bitsPerPixel / 8) - 1;
+	BoxRec AvailFBArea;
+	RegionPtr Region;
+
+	AvailFBArea.x1 = 0;
+	AvailFBArea.y1 = pScrn->virtualY;
+	AvailFBArea.x2 = last % pScrn->displayWidth + 1;
+	AvailFBArea.y2 = last / pScrn->displayWidth + 1;
+
+	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
+	    "Using linear FB %d,%d-%d,%d pitch %d (%dk)\n",
+	    AvailFBArea.x1, AvailFBArea.y1, AvailFBArea.x2, AvailFBArea.y2,
+	    pScrn->displayWidth, (((AvailFBArea.y2 - AvailFBArea.y1)
+	    * pScrn->displayWidth) << BPPSHIFT(pGlint)) / 1024));
+
+	Region = xf86LinearFBRegion(pScreen, &AvailFBArea, pScrn->displayWidth);
+	xf86InitLinearFBManagerRegion(pScreen, Region);
+	REGION_DESTROY(pScreen, Region);
+    }
+#endif
+
     memset(VAR, 0, sizeof(VAR));
 
-    for (i = 0; i < 2; i++) {
+    for (i = 0; i < PORTS; i++)
 	Private[i].ptr = (pointer) &pAPriv->Port[i];
+
+    for (i = 0; i < ADAPTORS; i++) {
 	VARPtrs[i] = &VAR[i];
+	switch (i) {
+	case 0:
+	    VAR[i].name = "Permedia 2 Video Input";
+	    VAR[i].type = XvInputMask | XvWindowMask | XvVideoMask | XvStillMask;
+	    VAR[i].nPorts = 1;
+	    VAR[i].pPortPrivates = &Private[0];
+	    VAR[i].nAttributes	= ENTRIES(InputVideoAttributes);
+	    VAR[i].pAttributes	= InputVideoAttributes;
+	    VAR[i].nEncodings	= ENTRIES(InputVideoEncodings);
+	    VAR[i].pEncodings	= InputVideoEncodings;
+	    VAR[i].nFormats	= ENTRIES(InputVideoFormats);
+	    VAR[i].pFormats	= InputVideoFormats;
+	    break;
 
-	VAR[i].type = (i == 0) ? XvInputMask : XvOutputMask;
-	VAR[i].type |= XvWindowMask | XvVideoMask | XvStillMask;
-	VAR[i].name = "Permedia 2";
-
-	if (i == 0) {
-	    VAR[0].nEncodings = sizeof(InputVideoEncodings) / sizeof(InputVideoEncodings[0]);
-	    VAR[0].pEncodings = InputVideoEncodings;
-	    VAR[0].nFormats = sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
-	    VAR[0].pFormats = InputVideoFormats;
-	} else {
-	    Bool expose = FALSE;
+	case 1:
+	    VAR[i].name = "Permedia 2 Video Output";
+	    VAR[i].type = XvOutputMask | XvWindowMask | XvVideoMask | XvStillMask;
+	    VAR[i].nPorts = 1;
+	    VAR[i].pPortPrivates = &Private[1];
+	    VAR[i].nAttributes	= ENTRIES(OutputVideoAttributes);
+	    VAR[i].pAttributes	= OutputVideoAttributes;
+	    VAR[i].nEncodings	= ENTRIES(OutputVideoEncodings);
+	    VAR[i].pEncodings	= OutputVideoEncodings;
+	    VAR[i].nFormats	= ENTRIES(OutputVideoFormats);
+	    VAR[i].pFormats	= OutputVideoFormats;
+	    break;
 
-/*
-	    xf86GetOptValBool(OutputOptions, OPTION_EXPOSE, &expose);
-	    if (expose)	VAR[1].flags = VIDEO_EXPOSE;
-*/
-
-	    VAR[1].nEncodings = sizeof(OutputVideoEncodings) / sizeof(OutputVideoEncodings[0]);
-	    VAR[1].pEncodings = OutputVideoEncodings;
-	    VAR[1].nFormats = sizeof(OutputVideoFormats) / sizeof(OutputVideoFormats[0]);
-	    VAR[1].pFormats = OutputVideoFormats;
+	case 2:
+	    VAR[i].name = "Permedia 2 Frontend Scaler";
+	    VAR[i].type = XvInputMask | XvWindowMask | XvImageMask;
+	    VAR[i].nPorts = 3;
+	    VAR[i].pPortPrivates = &Private[2];
+	    VAR[i].nAttributes	= ENTRIES(ScalerAttributes);
+	    VAR[i].pAttributes	= ScalerAttributes;
+	    VAR[i].nEncodings	= ENTRIES(ScalerEncodings);
+	    VAR[i].pEncodings	= ScalerEncodings;
+	    VAR[i].nFormats	= ENTRIES(ScalerVideoFormats);
+	    VAR[i].pFormats	= ScalerVideoFormats;
+	    VAR[i].nImages	= ENTRIES(ScalerImages);
+	    VAR[i].pImages	= ScalerImages;
+	    break;
 	}
 
-	VAR[i].nPorts = 1;
-	VAR[i].pPortPrivates = &Private[i];
 	VAR[i].PutVideo = Permedia2PutVideo;
 	VAR[i].PutStill = Permedia2PutStill;
 	VAR[i].GetVideo = Permedia2GetVideo;
@@ -2166,25 +3155,51 @@
 	VAR[i].SetPortAttribute = Permedia2SetPortAttribute;
 	VAR[i].GetPortAttribute = Permedia2GetPortAttribute;
 	VAR[i].QueryBestSize = Permedia2QueryBestSize;
-    }
-
-    if (!xf86XVScreenInit(pScreen, VARPtrs, 2)) {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Xv initialization failed\n");
-	return;
+	VAR[i].PutImage = Permedia2PutImage;
+	VAR[i].QueryImageAttributes = Permedia2QueryImageAttributes;
     }
 
-    xvEncoding   = MAKE_ATOM(XV_ENCODING);
-    xvHue        = MAKE_ATOM(XV_HUE);
-    xvSaturation = MAKE_ATOM(XV_SATURATION);
-    xvBrightness = MAKE_ATOM(XV_BRIGHTNESS);
-    xvContrast   = MAKE_ATOM(XV_CONTRAST);
-    xvInterlace  = MAKE_ATOM(XV_INTERLACE);
-    xvFilter	 = MAKE_ATOM(XV_FILTER);
-    xvBkgColor	 = MAKE_ATOM(XV_BKGCOLOR);
+    if (VideoIO ? xf86XVScreenInit(pScreen, &VARPtrs[0], 3) :
+		  xf86XVScreenInit(pScreen, &VARPtrs[2], 1)) {
+	char *s;
+
+	xvEncoding	= MAKE_ATOM(XV_ENCODING);
+	xvHue		= MAKE_ATOM(XV_HUE);
+	xvSaturation	= MAKE_ATOM(XV_SATURATION);
+	xvBrightness	= MAKE_ATOM(XV_BRIGHTNESS);
+	xvContrast	= MAKE_ATOM(XV_CONTRAST);
+	xvInterlace	= MAKE_ATOM(XV_INTERLACE);
+	xvFilter	= MAKE_ATOM(XV_FILTER);
+	xvBkgColor	= MAKE_ATOM(XV_BKGCOLOR);
+	xvAlpha		= MAKE_ATOM(XV_ALPHA);
+
+	pAPriv->Next = AdaptorPrivList;
+	AdaptorPrivList = pAPriv;
+
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv frontend scaler enabled\n");
+
+	if (VideoIO) {
+	    if ((s = xf86GetOptValString(InputOptions, OPTION_ENCODING)))
+	        for (i = 0; i < ENTRIES(InputVideoEncodings); i++)
+		    if (!strncmp(s, InputVideoEncodings[i].name, strlen(s))) {
+			Permedia2SetPortAttribute(pScrn, xvEncoding, i, (pointer) &pAPriv->Port[0]);
+			break;
+		    }
 
-    pAPriv->Next = AdaptorPrivList;
-    AdaptorPrivList = pAPriv;
+	    if ((s = xf86GetOptValString(OutputOptions, OPTION_ENCODING)))
+		for (i = 0; i < ENTRIES(OutputVideoEncodings); i++)
+		    if (!strncmp(s, OutputVideoEncodings[i].name, strlen(s))) {
+			Permedia2SetPortAttribute(pScrn, xvEncoding, i, (pointer) &pAPriv->Port[1]);
+			break;
+		    }
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv driver %senabled\n",
-	       (xvipc_fd >= 0) ? "with kernel backbone " : "");
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv vio driver %senabled\n",
+		pAPriv->pm2p ? "with kernel backbone " : "");
+	}
+    } else {
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Xv initialization failed\n");
+	DeleteAdaptorPriv(pAPriv);
+    }
 }
+
+#endif /* XvExtension */
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c:1.12 xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c:1.13
--- xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c:1.12	Sat Jul  3 23:39:02 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c	Wed May 10 11:55:30 2000
@@ -27,7 +27,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.12 1999/07/04 06:39:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.13 2000/05/10 18:55:30 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -203,15 +203,13 @@
 	pReg->DacRegs[PM2VDACRDPixelSize] = 0x00;
 	pReg->DacRegs[PM2VDACRDColorFormat] = 0x2E;
     	break;
-    case 15:
-        pReg->DacRegs[PM2VDACRDMiscControl] |= 0x08; 
-	pReg->DacRegs[PM2VDACRDPixelSize] = 0x01;
-	pReg->DacRegs[PM2VDACRDColorFormat] = 0x61;
-    	break;
     case 16:
         pReg->DacRegs[PM2VDACRDMiscControl] |= 0x08; 
 	pReg->DacRegs[PM2VDACRDPixelSize] = 0x01;
-	pReg->DacRegs[PM2VDACRDColorFormat] = 0x70;
+	if (pScrn->depth == 15)
+	    pReg->DacRegs[PM2VDACRDColorFormat] = 0x61;
+	else
+	    pReg->DacRegs[PM2VDACRDColorFormat] = 0x70;
     	break;
     case 24:
         pReg->DacRegs[PM2VDACRDMiscControl] |= 0x08; 
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c:1.2
--- /dev/null	Sat Jul  1 20:42:51 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c	Wed Jun 14 11:20:34 2000
@@ -0,0 +1,1778 @@
+/*
+ * Copyright 1997,1998 by Alan Hourihane, Wigan, England.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ *           Dirk Hohndel, <hohndel@suse.de>
+ *           Stefan Dirsch, <sndirsch@suse.de>
+ *           Mark Vojkovich, <mvojkovi@ucsd.edu>
+ *           Michel Dänzer, <michdaen@iiic.ethz.ch>
+ *           Sven Luther, <luther@dpt-info.u-strasbg.fr>
+ *
+ * this work is sponsored by Appian Graphics.
+ * 
+ * Permedia 3 accelerated options.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c,v 1.2 2000/06/14 18:20:34 dawes Exp $ */
+
+#include "Xarch.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+
+#include "miline.h"
+
+#include "fb.h"
+
+#include "glint_regs.h"
+#include "glint.h"
+
+#include "xaalocal.h"		/* For replacements */
+
+#define DEBUG 0
+
+#if DEBUG
+# define TRACE_ENTER(str)       ErrorF("pm2_accel: " str " %d\n",pScrn->scrnIndex)
+# define TRACE_EXIT(str)        ErrorF("pm2_accel: " str " done\n")
+# define TRACE(str)             ErrorF("pm2_accel trace: " str "\n")
+#else
+# define TRACE_ENTER(str)
+# define TRACE_EXIT(str)
+# define TRACE(str)
+#endif
+
+static void Permedia3SetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
+				int rop, unsigned int planemask);
+static void Permedia3SubsequentFillRectSolid(ScrnInfoPtr pScrn, int x,
+				int y, int w, int h);
+static void Permedia3SetupForFillRectSolid24bpp(ScrnInfoPtr pScrn,int color,
+				int rop, unsigned int planemask);
+static void Permedia3SubsequentFillRectSolid24bpp(ScrnInfoPtr pScrn, int x,
+				int y, int w, int h);
+static void Permedia3SubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
+				int x1, int y1, int x2,
+				int y2, int w, int h);
+static void Permedia3SetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
+				int xdir, int ydir, int rop, 
+                                unsigned int planemask,
+				int transparency_color);
+static void Permedia3SubsequentScreenToScreenCopy2432bpp(ScrnInfoPtr pScrn,
+				int x1, int y1, int x2, int y2, int w, int h);
+static void Permedia3SetupForScreenToScreenCopy2432bpp(ScrnInfoPtr pScrn,
+				int xdir, int ydir, int rop,
+				unsigned int planemask,
+				int transparency_color);
+static void Permedia3SetClippingRectangle(ScrnInfoPtr pScrn, int x, int y,
+				int w, int h);
+static void Permedia3DisableClipping(ScrnInfoPtr pScrn);
+static void Permedia3SetupForSolidLine(ScrnInfoPtr pScrn, int color,
+				int rop, unsigned int planemask);
+static void Permedia3SubsequentHorVertLine(ScrnInfoPtr pScrn, int x, int y, 
+				int len, int dir);
+static void Permedia3SubsequentSolidBresenhamLine(ScrnInfoPtr pScrn,
+        			int x, int y, int dmaj, int dmin, int e, 
+				int len, int octant);
+static void Permedia3WriteBitmap(ScrnInfoPtr pScrn, int x, int y, int w, int h, 
+				unsigned char *src, int srcwidth, int skipleft, 
+				int fg, int bg, int rop,unsigned int planemask);
+static void Permedia3SetupForMono8x8PatternFill(ScrnInfoPtr pScrn, 
+				int patternx, int patterny, int fg, int bg, 
+				int rop, unsigned int planemask);
+static void Permedia3SubsequentMono8x8PatternFillRect(ScrnInfoPtr pScrn, 
+				int patternx, int patterny, int x, int y, 
+				int w, int h);
+static void Permedia3SetupForMono8x8PatternFill24bpp(ScrnInfoPtr pScrn, 
+				int patternx, int patterny, int fg, int bg, 
+				int rop, unsigned int planemask);
+static void Permedia3SubsequentMono8x8PatternFillRect24bpp(ScrnInfoPtr pScrn, 
+				int patternx, int patterny, int x, int y, 
+				int w, int h);
+static void Permedia3WritePixmap8bpp(ScrnInfoPtr pScrn, int x, int y, int w, 
+				int h, unsigned char *src, int srcwidth, 
+				int rop, unsigned int planemask, 
+				int transparency_color, int bpp, int depth);
+static void Permedia3WritePixmap16bpp(ScrnInfoPtr pScrn, int x, int y, int w, 
+				int h, unsigned char *src, int srcwidth, 
+				int rop, unsigned int planemask, 
+				int transparency_color, int bpp, int depth);
+#if 0
+static void Permedia3WritePixmap24bpp(ScrnInfoPtr pScrn, int x, int y, int w, 
+				int h, unsigned char *src, int srcwidth, 
+				int rop, unsigned int planemask, 
+				int transparency_color, int bpp, int depth);
+#endif
+static void Permedia3WritePixmap32bpp(ScrnInfoPtr pScrn, int x, int y, int w, 
+				int h, unsigned char *src, int srcwidth, 
+				int rop, unsigned int planemask, 
+				int transparency_color, int bpp, int depth);
+static void Permedia3SetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
+				int fg, int bg, int rop,unsigned int planemask);
+static void Permedia3SubsequentCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, 
+				int x, int y, int w, int h, int skipleft);
+static void Permedia3SetupForScanlineCPUToScreenColorExpandFill(
+				ScrnInfoPtr pScrn,
+				int fg, int bg, int rop, 
+				unsigned int planemask);
+static void Permedia3SubsequentScanlineCPUToScreenColorExpandFill(
+				ScrnInfoPtr pScrn, int x,
+				int y, int w, int h, int skipleft);
+static void Permedia3SubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno);
+static void Permedia3LoadCoord(ScrnInfoPtr pScrn, int x, int y, int w, int h);
+static void Permedia3PolylinesThinSolidWrapper(DrawablePtr pDraw, GCPtr pGC,
+   				int mode, int npt, DDXPointPtr pPts);
+static void Permedia3PolySegmentThinSolidWrapper(DrawablePtr pDraw, GCPtr pGC,
+ 				int nseg, xSegment *pSeg);
+
+#define MAX_FIFO_ENTRIES 256
+
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+# define STIPPLE_SWAP	1<<18		/* Mirror stipple pattern horizontally */
+#else
+# define STIPPLE_SWAP	0
+#endif
+
+void
+Permedia3InitializeEngine(ScrnInfoPtr pScrn)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    /* Initialize the Accelerator Engine to defaults */
+
+    TRACE_ENTER("Permedia3InitializeEngine");
+
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	ScissorMode);
+    GLINT_SLOW_WRITE_REG(UNIT_ENABLE,	FBWriteMode);
+    GLINT_SLOW_WRITE_REG(0, 		dXSub);
+    GLINT_SLOW_WRITE_REG(GWIN_DisableLBUpdate,   GLINTWindow);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	DitherMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AlphaBlendMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	ColorDDAMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	TextureColorMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	TextureAddressMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	PMTextureReadMode);
+    GLINT_SLOW_WRITE_REG(pGlint->pprod,	LBReadMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AlphaBlendMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	TexelLUTMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	YUVMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	DepthMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	RouterMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FogMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AntialiasMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AlphaTestMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	StencilMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AreaStippleMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LogicalOpMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	DepthMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	StatisticMode);
+    GLINT_SLOW_WRITE_REG(0xc00,		FilterMode);
+    GLINT_SLOW_WRITE_REG(0xffffffff,	FBHardwareWriteMask);
+    GLINT_SLOW_WRITE_REG(0xffffffff,	FBSoftwareWriteMask);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	RasterizerMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	GLINTDepth);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBSourceOffset);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBPixelOffset);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LBSourceOffset);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	WindowOrigin);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBWindowBase);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBSourceBase);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LBWindowBase);
+
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+    pGlint->RasterizerSwap = 1;
+#else
+    pGlint->RasterizerSwap = 0;
+#endif
+
+    switch (pScrn->bitsPerPixel) {
+	case 8:
+	    pGlint->PixelWidth = 0x0; /* 8 Bits */
+	    pGlint->TexMapFormat = pGlint->pprod;
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+	    pGlint->RasterizerSwap |= 3<<15;	/* Swap host data */
+#endif
+	    break;
+	case 16:
+	    pGlint->PixelWidth = 0x1; /* 16 Bits */
+	    pGlint->TexMapFormat = pGlint->pprod | 1<<19;
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+	    pGlint->RasterizerSwap |= 2<<15;	/* Swap host data */
+#endif
+	    break;
+	case 24:
+ 	    pGlint->PixelWidth = 0x4; /* 24 Bits */
+	    pGlint->TexMapFormat = pGlint->pprod | 2<<19;
+	    break;
+	case 32:
+	    pGlint->PixelWidth = 0x2; /* 32 Bits */
+	    pGlint->TexMapFormat = pGlint->pprod | 2<<19;
+  	    break;
+    }
+    pGlint->ClippingOn = FALSE;
+    pGlint->startxdom = 0;
+    pGlint->startxsub = 0;
+    pGlint->starty = 0;
+    pGlint->count = 0;
+    pGlint->dy = 1<<16;
+    pGlint->dxdom = 0;
+    pGlint->x = 0;
+    pGlint->y = 0;
+    pGlint->h = 0;
+    pGlint->w = 0;
+    pGlint->ROP = 0xFF;
+    GLINT_SLOW_WRITE_REG(pGlint->PixelWidth, FBReadPixel);
+    GLINT_SLOW_WRITE_REG(pGlint->TexMapFormat, PMTextureMapFormat);
+    GLINT_SLOW_WRITE_REG(0, RectangleSize);
+    GLINT_SLOW_WRITE_REG(0, RectangleOrigin);
+    GLINT_SLOW_WRITE_REG(0, dXDom);
+    GLINT_SLOW_WRITE_REG(1<<16, dY);
+    GLINT_SLOW_WRITE_REG(0, StartXDom);
+    GLINT_SLOW_WRITE_REG(0, StartXSub);
+    GLINT_SLOW_WRITE_REG(0, StartY);
+    GLINT_SLOW_WRITE_REG(0, GLINTCount);
+
+    TRACE_EXIT("Permedia3InitializeEngine");
+}
+
+Bool
+Permedia3AccelInit(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoPtr;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    BoxRec AvailFBArea;
+
+    pGlint->AccelInfoRec = infoPtr = XAACreateInfoRec();
+    if (!infoPtr) return FALSE;
+
+    Permedia3InitializeEngine(pScrn);
+
+    infoPtr->Flags = PIXMAP_CACHE |
+		     OFFSCREEN_PIXMAPS |
+		     LINEAR_FRAMEBUFFER;
+
+    infoPtr->Sync = Permedia3Sync;
+
+    infoPtr->SetClippingRectangle = Permedia3SetClippingRectangle;
+    infoPtr->DisableClipping = Permedia3DisableClipping;
+    infoPtr->ClippingFlags = HARDWARE_CLIP_MONO_8x8_FILL;
+
+    infoPtr->SolidFillFlags = 0;
+    infoPtr->ScreenToScreenCopyFlags = NO_TRANSPARENCY; 
+    infoPtr->WriteBitmapFlags = 0;
+    if (pScrn->bitsPerPixel == 24) {
+	/* SVEN : This should be bad also,
+	 * didn't tested it since 24bpp is broken....
+    	infoPtr->SetupForSolidFill = 
+				Permedia3SetupForFillRectSolid24bpp;
+    	infoPtr->SubsequentSolidFillRect = 	
+				Permedia3SubsequentFillRectSolid24bpp;
+	 */
+    } else {
+        infoPtr->SolidLineFlags = 0;
+        infoPtr->PolySegmentThinSolidFlags = 0;
+        infoPtr->PolylinesThinSolidFlags = 0;
+        infoPtr->SetupForSolidLine = Permedia3SetupForSolidLine;
+        infoPtr->SubsequentSolidHorVertLine = Permedia3SubsequentHorVertLine;
+        if (!(pScrn->overlayFlags & OVERLAY_8_32_PLANAR))
+        {
+        	infoPtr->SubsequentSolidBresenhamLine = 
+				Permedia3SubsequentSolidBresenhamLine;
+        }
+	infoPtr->PolySegmentThinSolid = Permedia3PolySegmentThinSolidWrapper;
+	infoPtr->PolylinesThinSolid = Permedia3PolylinesThinSolidWrapper;
+	/* SVEN : This evidently seems to be bad ...
+    	infoPtr->SetupForSolidFill = Permedia3SetupForFillRectSolid;
+    	infoPtr->SubsequentSolidFillRect = Permedia3SubsequentFillRectSolid;
+	 */
+    }
+    
+    if (pScrn->bitsPerPixel >= 24) {
+	/* SVEN : This should be bad also,
+	 * didn't tested it since 24bpp is broken....
+	infoPtr->SetupForScreenToScreenCopy = 	
+				Permedia3SetupForScreenToScreenCopy2432bpp;
+    	infoPtr->SubsequentScreenToScreenCopy = 		
+				Permedia3SubsequentScreenToScreenCopy2432bpp;
+	 */
+    } else {
+	/* SVEN : This evidently seems to be bad ...
+    	infoPtr->SetupForScreenToScreenCopy = 	
+				Permedia3SetupForScreenToScreenCopy;
+    	infoPtr->SubsequentScreenToScreenCopy = 		
+				Permedia3SubsequentScreenToScreenCopy;
+	 */
+    }
+
+    infoPtr->Mono8x8PatternFillFlags = 
+    				HARDWARE_PATTERN_PROGRAMMED_ORIGIN |
+    				HARDWARE_PATTERN_PROGRAMMED_BITS |
+    				HARDWARE_PATTERN_SCREEN_ORIGIN;
+
+    if (pScrn->bitsPerPixel == 24) {
+	/* SVEN : This should be bad also,
+	 * didn't tested it since 24bpp is broken....
+	infoPtr->SetupForMono8x8PatternFill =
+				Permedia3SetupForMono8x8PatternFill24bpp;
+	infoPtr->SubsequentMono8x8PatternFillRect = 
+				Permedia3SubsequentMono8x8PatternFillRect24bpp;
+	 */
+    } else {
+	/* SVEN : This evidently seems to be bad ...
+	infoPtr->SetupForMono8x8PatternFill =
+				Permedia3SetupForMono8x8PatternFill;
+	infoPtr->SubsequentMono8x8PatternFillRect = 
+				Permedia3SubsequentMono8x8PatternFillRect;
+	 */
+    }
+
+/* Didn't try, but anyway, pm3 uses PCIRetry, but i don't know if 
+ * it gets declared corectly by glint_driver.c. Need to check this.
+    if (pGlint->UsePCIRetry) {
+    	infoPtr->CPUToScreenColorExpandFillFlags = SYNC_AFTER_COLOR_EXPAND |
+      					       BIT_ORDER_IN_BYTE_LSBFIRST |
+      					       CPU_TRANSFER_PAD_DWORD;
+
+    	infoPtr->ColorExpandBase = pGlint->IOBase + OutputFIFO + 4;
+    	infoPtr->SetupForCPUToScreenColorExpandFill =
+				Permedia3SetupForCPUToScreenColorExpandFill;
+    	infoPtr->SubsequentCPUToScreenColorExpandFill = 
+				Permedia3SubsequentCPUToScreenColorExpandFill;
+    } else {
+        infoPtr->ScanlineCPUToScreenColorExpandFillFlags = 
+					       BIT_ORDER_IN_BYTE_LSBFIRST;
+
+        infoPtr->NumScanlineColorExpandBuffers = 1;
+        infoPtr->ScanlineColorExpandBuffers = 
+					pGlint->XAAScanlineColorExpandBuffers;
+        pGlint->XAAScanlineColorExpandBuffers[0] = 
+					pGlint->IOBase + OutputFIFO + 4;
+
+    	infoPtr->SetupForScanlineCPUToScreenColorExpandFill =
+			Permedia3SetupForScanlineCPUToScreenColorExpandFill;
+    	infoPtr->SubsequentScanlineCPUToScreenColorExpandFill = 
+			Permedia3SubsequentScanlineCPUToScreenColorExpandFill;
+    	infoPtr->SubsequentColorExpandScanline = 
+			Permedia3SubsequentColorExpandScanline;
+    }
+*/
+
+    infoPtr->ColorExpandRange = MAX_FIFO_ENTRIES;
+
+    /* Seems broken also, ...
+    infoPtr->WriteBitmap = Permedia3WriteBitmap;
+
+    if (pScrn->bitsPerPixel == 8)
+  	infoPtr->WritePixmap = Permedia3WritePixmap8bpp;
+    else
+    if (pScrn->bitsPerPixel == 16)
+  	infoPtr->WritePixmap = Permedia3WritePixmap16bpp;
+    else
+#if 0
+    if (pScrn->bitsPerPixel == 24) {
+  	infoPtr->WritePixmap = Permedia3WritePixmap24bpp;
+	infoPtr->WritePixmapFlags |= NO_PLANEMASK;
+    }
+    else
+#endif
+    if (pScrn->bitsPerPixel == 32)
+  	infoPtr->WritePixmap = Permedia3WritePixmap32bpp;
+    */
+
+    /* Now fixup if we are 24bpp */
+    if (pScrn->bitsPerPixel == 24) {
+	infoPtr->SolidFillFlags |= NO_PLANEMASK;
+	infoPtr->ScreenToScreenCopyFlags |= NO_PLANEMASK;
+        infoPtr->WriteBitmapFlags |= NO_PLANEMASK;
+        infoPtr->CPUToScreenColorExpandFillFlags |= NO_PLANEMASK;
+        infoPtr->ScanlineCPUToScreenColorExpandFillFlags |= NO_PLANEMASK;
+        infoPtr->Mono8x8PatternFillFlags |= NO_PLANEMASK;
+    }
+
+    AvailFBArea.x1 = 0;
+    AvailFBArea.y1 = 0;
+    AvailFBArea.x2 = pScrn->displayWidth;
+    AvailFBArea.y2 = pGlint->FbMapSize / (pScrn->displayWidth * 
+					  pScrn->bitsPerPixel / 8);
+
+    if (AvailFBArea.y2 > 2047) AvailFBArea.y2 = 2047;
+
+    xf86InitFBManager(pScreen, &AvailFBArea);
+
+    return(XAAInit(pScreen, infoPtr));
+}
+
+static void Permedia3LoadCoord(
+	ScrnInfoPtr pScrn,
+	int x, int y,
+	int w, int h
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    
+    if ((h != pGlint->h) || (w != pGlint->w)) {
+	pGlint->w = w;
+	pGlint->h = h;
+	GLINT_WRITE_REG(((h&0x0FFF)<<16)|(w&0x0FFF), RectangleSize);
+    }
+    if ((y != pGlint->y) || (x != pGlint->x)) {
+	pGlint->x = x;
+	pGlint->y = y;
+	GLINT_WRITE_REG(((y&0x0FFF)<<16)|(x&0x0FFF), RectangleOrigin);
+    }
+}
+
+
+void
+Permedia3Sync(ScrnInfoPtr pScrn)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    CHECKCLIPPING;
+
+    while (GLINT_READ_REG(DMACount) != 0);
+    GLINT_WAIT(1);
+    GLINT_WRITE_REG(0, GlintSync);
+    do {
+   	while(GLINT_READ_REG(OutFIFOWords) == 0);
+#define Sync_tag 0x188
+    } while (GLINT_READ_REG(OutputFIFO) != Sync_tag);
+}
+
+static void
+Permedia3SetClippingRectangle(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    GLINT_WAIT(3);
+    GLINT_WRITE_REG(((y1&0x0fff)<<16)|(x1&0x0fff), ScissorMinXY);
+    GLINT_WRITE_REG(((y2&0x0fff)<<16)|(x2&0x0fff), ScissorMaxXY);
+    GLINT_WRITE_REG(1, ScissorMode);
+    pGlint->ClippingOn = TRUE;
+}
+
+static void
+Permedia3DisableClipping(ScrnInfoPtr pScrn)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    CHECKCLIPPING;
+}
+
+static void
+Permedia3SetupForScreenToScreenCopy2432bpp(ScrnInfoPtr pScrn, 
+				 int xdir, int ydir, int rop,
+				 unsigned int planemask, int transparency_color)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    pGlint->BltScanDirection = 0;
+    if (xdir == 1) pGlint->BltScanDirection |= XPositive;
+    if (ydir == 1) pGlint->BltScanDirection |= YPositive;
+  
+    if (pScrn->bitsPerPixel == 24) {
+	GLINT_WAIT(4);
+    } else {
+        GLINT_WAIT(5);
+        DO_PLANEMASK(planemask);
+    }
+
+    GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+    if ((rop == GXset) || (rop == GXclear)) {
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+    	if ((rop == GXcopy) || (rop == GXcopyInverted)) {
+	    GLINT_WRITE_REG(pGlint->pprod|FBRM_SrcEnable, FBReadMode);
+        } else {
+	    GLINT_WRITE_REG(pGlint->pprod|FBRM_SrcEnable|FBRM_DstEnable, 
+								FBReadMode);
+        }
+    }
+    LOADROP(rop);
+}
+
+static void
+Permedia3SubsequentScreenToScreenCopy2432bpp(ScrnInfoPtr pScrn, int x1,
+					int y1, int x2, int y2, int w, int h)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    GLINT_WAIT(4);
+    Permedia3LoadCoord(pScrn, x2, y2, w, h);
+    GLINT_WRITE_REG(((y1-y2)&0x0FFF)<<16 | ((x1-x2)&0x0FFF), FBSourceDelta);
+    GLINT_WRITE_REG(PrimitiveRectangle | pGlint->BltScanDirection, Render);
+}
+
+static void
+Permedia3SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, 
+				int xdir, int ydir, int rop,
+				unsigned int planemask, int transparency_color)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    TRACE_ENTER("Permedia3SetupForScreenToScreenCopy");
+
+    pGlint->BltScanDirection = 0;
+    if (xdir == 1) pGlint->BltScanDirection |= XPositive;
+    if (ydir == 1) pGlint->BltScanDirection |= YPositive;
+  
+    GLINT_WAIT(4);
+    DO_PLANEMASK(planemask);
+
+    GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+    if ((rop == GXset) || (rop == GXclear)) {
+	pGlint->FrameBufferReadMode = pGlint->pprod;
+    } else
+    if ((rop == GXcopy) || (rop == GXcopyInverted)) {
+	pGlint->FrameBufferReadMode = pGlint->pprod |FBRM_SrcEnable;
+    } else {
+	pGlint->FrameBufferReadMode = pGlint->pprod | FBRM_SrcEnable |
+							FBRM_DstEnable;
+    }
+    LOADROP(rop);
+    TRACE_EXIT("Permedia3SetupForScreenToScreenCopy");
+}
+
+static void
+Permedia3SubsequentScreenToScreenCopy(ScrnInfoPtr pScrn, int x1, int y1,
+					int x2, int y2, int w, int h)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    char align;
+
+    TRACE_ENTER("Permedia3SubsequentScreenToScreenCopy");
+    /* We can only use GXcopy for Packed modes */
+    if (pGlint->ROP != GXcopy) {
+	GLINT_WAIT(5);
+	GLINT_WRITE_REG(pGlint->FrameBufferReadMode, FBReadMode);
+        Permedia3LoadCoord(pScrn, x2, y2, w, h);
+        GLINT_WRITE_REG(((y1-y2)&0x0FFF)<<16 | ((x1-x2)&0x0FFF), FBSourceDelta);
+    } else {
+  	align = (x2 & pGlint->bppalign) - (x1 & pGlint->bppalign);
+	GLINT_WAIT(6);
+	GLINT_WRITE_REG(pGlint->FrameBufferReadMode|FBRM_Packed, FBReadMode);
+        Permedia3LoadCoord(pScrn, x2>>pGlint->BppShift, y2, 
+						(w+7)>>pGlint->BppShift, h);
+  	GLINT_WRITE_REG(align<<29|x2<<16|(x2+w), PackedDataLimits);
+        GLINT_WRITE_REG(((y1-y2)&0x0FFF)<<16 | (((x1 & ~pGlint->bppalign)-(x2 & ~pGlint->bppalign))&0x0FFF), FBSourceDelta);
+    }
+
+    GLINT_WRITE_REG(PrimitiveRectangle | pGlint->BltScanDirection, Render);
+    TRACE_EXIT("Permedia3SubsequentScreenToScreenCopy");
+}
+
+
+
+static void 
+Permedia3PolylinesThinSolidWrapper(
+   DrawablePtr     pDraw,
+   GCPtr           pGC,
+   int             mode,
+   int             npt,
+   DDXPointPtr     pPts
+){
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    GLINTPtr pGlint = GLINTPTR(infoRec->pScrn);
+    pGlint->CurrentGC = pGC;
+    pGlint->CurrentDrawable = pDraw;
+    if(infoRec->NeedToSync) (*infoRec->Sync)(infoRec->pScrn);
+    XAAPolyLines(pDraw, pGC, mode, npt, pPts);
+}
+
+static void 
+Permedia3PolySegmentThinSolidWrapper(
+   DrawablePtr     pDraw,
+   GCPtr           pGC,
+   int             nseg,
+   xSegment        *pSeg
+){
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    GLINTPtr pGlint = GLINTPTR(infoRec->pScrn);
+    pGlint->CurrentGC = pGC;
+    pGlint->CurrentDrawable = pDraw;
+    if(infoRec->NeedToSync) (*infoRec->Sync)(infoRec->pScrn);
+    XAAPolySegment(pDraw, pGC, nseg, pSeg);
+}
+
+static void
+Permedia3SetupForSolidLine(ScrnInfoPtr pScrn, int color,
+					 int rop, unsigned int planemask)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    GLINT_WAIT(6);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+    GLINT_WRITE_REG(color, GLINTColor);
+    if (rop == GXcopy) {
+  	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+  	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+    LOADROP(rop);
+}
+
+static void
+Permedia3SubsequentHorVertLine(ScrnInfoPtr pScrn,int x,int y,int len,int dir)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+  
+    GLINT_WAIT(6);
+    GLINT_WRITE_REG(x<<16, StartXDom);
+    GLINT_WRITE_REG(y<<16, StartY);
+    if (dir == DEGREES_0) {
+	GLINT_WRITE_REG(1<<16, dXDom);
+	GLINT_WRITE_REG(0<<16, dY);
+    } else {
+	GLINT_WRITE_REG(0<<16, dXDom);
+	GLINT_WRITE_REG(1<<16, dY);
+    }
+
+    GLINT_WRITE_REG(len, GLINTCount);
+    GLINT_WRITE_REG(PrimitiveLine, Render);
+}
+
+static void 
+Permedia3SubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
+        int x, int y, int dmaj, int dmin, int e, int len, int octant)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    if(dmaj == dmin) {
+	GLINT_WAIT(6);
+	if(octant & YDECREASING) {
+	    GLINT_WRITE_REG(-1<<16, dY);
+	} else {
+	    GLINT_WRITE_REG(1<<16, dY);
+	}
+
+	if(octant & XDECREASING) {
+	    GLINT_WRITE_REG(-1<<16, dXDom);
+	} else {
+	    GLINT_WRITE_REG(1<<16, dXDom);
+	}
+
+	GLINT_WRITE_REG(x<<16, StartXDom);
+	GLINT_WRITE_REG(y<<16, StartY);
+	GLINT_WRITE_REG(len,GLINTCount);
+	GLINT_WRITE_REG(PrimitiveLine, Render);
+	return;
+    }
+
+    fbBres(pGlint->CurrentDrawable, pGlint->CurrentGC, 0,
+                (octant & XDECREASING) ? -1 : 1, 
+                (octant & YDECREASING) ? -1 : 1, 
+                (octant & YMAJOR) ? Y_AXIS : X_AXIS,
+                x, y, dmin + e, dmin, -dmaj, len);
+}
+
+static void
+Permedia3SetupForFillRectSolid24bpp(ScrnInfoPtr pScrn, int color,
+					 int rop, unsigned int planemask)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    pGlint->ForeGroundColor = color;
+
+    GLINT_WAIT(5);
+    GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+    GLINT_WRITE_REG(color, ConstantColor);
+    if (rop == GXcopy) {
+  	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+  	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+    LOADROP(rop);
+}
+
+static void
+Permedia3SetupForFillRectSolid(ScrnInfoPtr pScrn, int color, 
+				    int rop, unsigned int planemask)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    TRACE_ENTER("Permedia3SetupForFillRectSolid");
+
+    REPLICATE(color);
+
+    GLINT_WAIT(6);
+    DO_PLANEMASK(planemask);
+    if (rop == GXcopy) {
+	GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+	GLINT_WRITE_REG(color, FBBlockColor);
+    } else {
+	GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+      	GLINT_WRITE_REG(color, ConstantColor);
+	/* We can use Packed mode for filling solid non-GXcopy rasters */
+	GLINT_WRITE_REG(pGlint->pprod|FBRM_DstEnable|FBRM_Packed, FBReadMode);
+    }
+    LOADROP(rop);
+    TRACE_EXIT("Permedia3SetupForFillRectSolid");
+}
+
+static void
+Permedia3SubsequentFillRectSolid24bpp(ScrnInfoPtr pScrn, int x, int y, int w, int h)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    GLINT_WAIT(3);
+    Permedia3LoadCoord(pScrn, x, y, w, h);
+    GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive, Render);
+}
+
+static void
+Permedia3SubsequentFillRectSolid(ScrnInfoPtr pScrn, int x, int y, int w, int h)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int speed = 0;
+    TRACE_ENTER("Permedia3SubsequentFillRectSolid");
+
+    if (pGlint->ROP == GXcopy) {
+	GLINT_WAIT(3);
+        Permedia3LoadCoord(pScrn, x, y, w, h);
+  	speed = FastFillEnable;
+    } else {
+	GLINT_WAIT(4);
+        Permedia3LoadCoord(pScrn, x>>pGlint->BppShift, y, 
+						(w+7)>>pGlint->BppShift, h);
+  	GLINT_WRITE_REG(x<<16|(x+w), PackedDataLimits);
+  	speed = 0;
+    }
+    GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive | speed, Render);
+    TRACE_EXIT("Permedia3SubsequentFillRectSolid");
+}
+
+static void MoveBYTE(
+   register CARD32* dest,
+   register unsigned char* src,
+   register int dwords
+)
+{
+     while(dwords) {
+	*dest = *src;
+	src += 1;
+	dest += 1;
+	dwords -= 1;
+     }	
+}
+
+static void MoveWORDS(
+   register CARD32* dest,
+   register unsigned short* src,
+   register int dwords
+)
+{
+     while(dwords & ~0x01) {
+	*dest = *src;
+	*(dest + 1) = *(src + 1);
+	src += 2;
+	dest += 2;
+	dwords -= 2;
+     }	
+     switch(dwords) {
+	case 0:	return;
+	case 1: *dest = *src;
+		return;
+    }
+}
+
+static void MoveDWORDS(
+   register CARD32* dest,
+   register CARD32* src,
+   register int dwords )
+{
+     while(dwords & ~0x03) {
+	*dest = *src;
+	*(dest + 1) = *(src + 1);
+	*(dest + 2) = *(src + 2);
+	*(dest + 3) = *(src + 3);
+	src += 4;
+	dest += 4;
+	dwords -= 4;
+     }	
+     if (!dwords) return;
+     *dest = *src;
+     if (dwords == 1) return;
+     *(dest + 1) = *(src + 1);
+     if (dwords == 2) return;
+     *(dest + 2) = *(src + 2);
+}
+
+
+static void 
+Permedia3SetupForMono8x8PatternFill24bpp(ScrnInfoPtr pScrn, 
+					   int patternx, int patterny, 
+					   int fg, int bg, int rop,
+					   unsigned int planemask)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    if (bg == -1) pGlint->FrameBufferReadMode = -1;
+	else    pGlint->FrameBufferReadMode = 0;
+
+    pGlint->ForeGroundColor = fg;
+    pGlint->BackGroundColor = bg;
+    REPLICATE(pGlint->ForeGroundColor);
+    REPLICATE(pGlint->BackGroundColor);
+  
+    GLINT_WAIT(12);
+    GLINT_WRITE_REG((patternx & 0xFF), AreaStipplePattern0);
+    GLINT_WRITE_REG((patternx & 0xFF00) >> 8, AreaStipplePattern1);
+    GLINT_WRITE_REG((patternx & 0xFF0000) >> 16, AreaStipplePattern2);
+    GLINT_WRITE_REG((patternx & 0xFF000000) >> 24, AreaStipplePattern3);
+    GLINT_WRITE_REG((patterny & 0xFF), AreaStipplePattern4);
+    GLINT_WRITE_REG((patterny & 0xFF00) >> 8, AreaStipplePattern5);
+    GLINT_WRITE_REG((patterny & 0xFF0000) >> 16, AreaStipplePattern6);
+    GLINT_WRITE_REG((patterny & 0xFF000000) >> 24, AreaStipplePattern7);
+  
+    GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+    if (rop == GXcopy) {
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+    LOADROP(rop);
+}
+
+static void 
+Permedia3SetupForMono8x8PatternFill(ScrnInfoPtr pScrn, 
+					   int patternx, int patterny, 
+					   int fg, int bg, int rop,
+					   unsigned int planemask)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    TRACE_ENTER("Permedia3SetupForMono8x8PatternFill");
+
+    if (bg == -1) pGlint->FrameBufferReadMode = -1;
+	else    pGlint->FrameBufferReadMode = 0;
+
+    pGlint->ForeGroundColor = fg;
+    pGlint->BackGroundColor = bg;
+    REPLICATE(pGlint->ForeGroundColor);
+    REPLICATE(pGlint->BackGroundColor);
+  
+#if DEBUG
+    ErrorF("patternx: %x patterny: %x\n", patternx, patterny);
+#endif
+
+    GLINT_WAIT(13);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG((patternx & 0xFF), AreaStipplePattern0);
+    GLINT_WRITE_REG((patternx & 0xFF00) >> 8, AreaStipplePattern1);
+    GLINT_WRITE_REG((patternx & 0xFF0000) >> 16, AreaStipplePattern2);
+    GLINT_WRITE_REG((patternx & 0xFF000000) >> 24, AreaStipplePattern3);
+    GLINT_WRITE_REG((patterny & 0xFF), AreaStipplePattern4);
+    GLINT_WRITE_REG((patterny & 0xFF00) >> 8, AreaStipplePattern5);
+    GLINT_WRITE_REG((patterny & 0xFF0000) >> 16, AreaStipplePattern6);
+    GLINT_WRITE_REG((patterny & 0xFF000000) >> 24, AreaStipplePattern7);
+
+    if (rop == GXcopy) {
+        GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+        GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+    LOADROP(rop);
+    TRACE_EXIT("Permedia3SetupForMono8x8PatternFill");
+}
+
+static void 
+Permedia3SubsequentMono8x8PatternFillRect24bpp(ScrnInfoPtr pScrn, 	
+				   int patternx, int patterny,
+				   int x, int y,
+				   int w, int h)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+  
+    GLINT_WAIT(8);
+    Permedia3LoadCoord(pScrn, x, y, w, h);
+
+    if (pGlint->FrameBufferReadMode != -1) {
+	GLINT_WRITE_REG(pGlint->BackGroundColor, ConstantColor);
+	GLINT_WRITE_REG(patternx<<7|patterny<<12| ASM_InvertPattern |
+				STIPPLE_SWAP | UNIT_ENABLE, AreaStippleMode);
+	GLINT_WRITE_REG(AreaStippleEnable | XPositive | 
+					YPositive | PrimitiveRectangle, Render);
+    }
+
+    GLINT_WRITE_REG(pGlint->ForeGroundColor, ConstantColor);
+    GLINT_WRITE_REG(patternx<<7|patterny<<12|UNIT_ENABLE, AreaStippleMode);
+    GLINT_WRITE_REG(AreaStippleEnable | XPositive | YPositive |
+						PrimitiveRectangle, Render);
+}
+
+static void 
+Permedia3SubsequentMono8x8PatternFillRect(ScrnInfoPtr pScrn, 
+				   int patternx, int patterny,
+				   int x, int y,
+				   int w, int h)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+  
+    TRACE_ENTER("Permedia3SubsequentMono8x8PatternFillRect()");
+	
+    GLINT_WAIT(9);
+    Permedia3LoadCoord(pScrn, x, y, w, h);
+
+    if (pGlint->FrameBufferReadMode != -1) {
+	if (pGlint->ROP == GXcopy) {
+      	    GLINT_WRITE_REG(pGlint->BackGroundColor, FBBlockColor);
+    	    GLINT_WRITE_REG(ASM_InvertPattern|patternx<<7|patterny<<12|
+			STIPPLE_SWAP | UNIT_ENABLE, AreaStippleMode);
+    	    GLINT_WRITE_REG(AreaStippleEnable | FastFillEnable | 
+			XPositive | YPositive | PrimitiveRectangle, Render);
+	} else { 
+  	    GLINT_WRITE_REG(pGlint->ForeGroundColor, ConstantColor);
+      	    GLINT_WRITE_REG(pGlint->BackGroundColor, Texel0);
+	    GLINT_WRITE_REG(patternx<<7|patterny<<12| 
+			STIPPLE_SWAP | UNIT_ENABLE, AreaStippleMode);
+  	    GLINT_WRITE_REG(AreaStippleEnable | XPositive | TextureEnable |
+				YPositive | PrimitiveRectangle, Render);
+	    return;
+	}
+    }
+
+    if (pGlint->ROP == GXcopy) {
+	GLINT_WRITE_REG(pGlint->ForeGroundColor, FBBlockColor);
+	pGlint->FrameBufferReadMode = FastFillEnable;
+    } else {
+  	GLINT_WRITE_REG(pGlint->ForeGroundColor, ConstantColor);
+	pGlint->FrameBufferReadMode = 0;
+    }
+    GLINT_WRITE_REG(patternx<<7|patterny<<12|STIPPLE_SWAP|UNIT_ENABLE, AreaStippleMode);
+    GLINT_WRITE_REG(AreaStippleEnable | pGlint->FrameBufferReadMode | 
+			XPositive | YPositive | PrimitiveRectangle, Render);
+
+    TRACE_EXIT("Permedia3SubsequentMono8x8PatternFillRect()");
+}
+
+static void
+Permedia3SetupForCPUToScreenColorExpandFill(
+	ScrnInfoPtr pScrn,
+	int fg, int bg, 
+	int rop, 
+	unsigned int planemask
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int dobackground = 0;
+
+    TRACE_ENTER("Permedia3SetupForCPUToScreenColorExpandFill");
+    if (bg != -1) dobackground |= ForceBackgroundColor;
+
+    GLINT_WAIT(7);
+    DO_PLANEMASK(planemask);
+    if (rop == GXcopy) {
+        GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+        GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+
+    pGlint->ForeGroundColor = fg;
+    pGlint->BackGroundColor = bg;
+    REPLICATE(fg);
+    REPLICATE(bg);
+
+    if ((pScrn->bitsPerPixel != 24) && (rop == GXcopy)) {
+	GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+	if (dobackground) {
+            GLINT_WRITE_REG(bg, FBBlockColor);
+	} else {
+            GLINT_WRITE_REG(fg, FBBlockColor);
+	}
+	GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
+        pGlint->FrameBufferReadMode = FastFillEnable;
+    } else {
+	GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+	GLINT_WRITE_REG(BitMaskPackingEachScanline|dobackground|
+				pGlint->RasterizerSwap,RasterizerMode);
+        GLINT_WRITE_REG(fg, ConstantColor);
+	if (dobackground) {
+            pGlint->FrameBufferReadMode = TextureEnable;
+	    GLINT_WRITE_REG(bg, Texel0);
+	} else
+            pGlint->FrameBufferReadMode = 0;
+    }
+    LOADROP(rop);
+    TRACE_EXIT("Permedia3SetupForCPUToScreenColorExpandFill");
+}
+
+static void
+Permedia3SubsequentCPUToScreenColorExpandFill(
+	ScrnInfoPtr pScrn,
+	int x, int y, int w, int h,
+	int skipleft
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int dwords = ((w + 31) >> 5) * h;
+
+    TRACE_ENTER("Permedia3SubsequentCPUToScreenColorExpandFill");
+    GLINT_WAIT(8);
+    Permedia3LoadCoord(pScrn, x, y, w, h);
+
+    if ((pGlint->ROP == GXcopy) && (pGlint->BackGroundColor != -1)) {
+        GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive | FastFillEnable, Render);
+	REPLICATE(pGlint->ForeGroundColor)
+	GLINT_WRITE_REG(pGlint->ForeGroundColor, FBBlockColor);
+    }
+	
+    GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive | SyncOnBitMask |
+					pGlint->FrameBufferReadMode, Render);
+    GLINT_WRITE_REG((dwords - 1)<<16 | 0x0D, OutputFIFO);
+    GLINT_WAIT(dwords);
+    TRACE_EXIT("Permedia3SubsequentCPUToScreenColorExpandFill");
+}
+
+static void
+Permedia3SetupForScanlineCPUToScreenColorExpandFill(
+	ScrnInfoPtr pScrn,
+	int fg, int bg, 
+	int rop, 
+	unsigned int planemask
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int dobackground = 0;
+
+    TRACE_ENTER("Permedia3SetupForScanlineCPUToScreenColorExpandFill");
+    if (bg != -1) dobackground |= ForceBackgroundColor;
+    pGlint->BackGroundColor = bg;
+    pGlint->ForeGroundColor = fg;
+    REPLICATE(fg);
+    REPLICATE(bg);
+    GLINT_WAIT(7);
+    DO_PLANEMASK(planemask);
+    if (rop == GXcopy) {
+  	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+  	GLINT_WRITE_REG(pGlint->pprod|FBRM_DstEnable, FBReadMode);
+    }
+    if ((rop == GXcopy) && (pGlint->BackGroundColor == -1)) {
+	pGlint->FrameBufferReadMode = FastFillEnable;
+  	GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+        GLINT_WRITE_REG(fg, FBBlockColor);
+	GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
+    } else {
+        GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+        GLINT_WRITE_REG(fg, ConstantColor);
+	GLINT_WRITE_REG(BitMaskPackingEachScanline|dobackground|
+				pGlint->RasterizerSwap,RasterizerMode);
+	if (dobackground) {
+	    GLINT_WRITE_REG(bg, Texel0);
+	    pGlint->FrameBufferReadMode = TextureEnable;
+	} else {
+            pGlint->FrameBufferReadMode = 0;
+	}
+    }
+    LOADROP(rop);
+    TRACE_EXIT("Permedia3SetupForScanlineCPUToScreenColorExpandFill");
+}
+
+static void
+Permedia3SubsequentScanlineCPUToScreenColorExpandFill(
+	ScrnInfoPtr pScrn,
+	int x, int y, int w, int h,
+	int skipleft
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    TRACE_ENTER("Permedia3SubsequentScanlineCPUToScreenColorExpandFill");
+	
+    pGlint->dwords = ((w + 31) >> 5); /* dwords per scanline */
+ 
+    pGlint->cpucount = h;
+
+    GLINT_WAIT(6);
+    Permedia3LoadCoord(pScrn, x, y, w, h);
+    GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive | pGlint->FrameBufferReadMode | SyncOnBitMask, Render);
+    GLINT_WRITE_REG(((pGlint->dwords*h)-1)<<16 | 0x0D, OutputFIFO);
+    GLINT_WAIT(pGlint->dwords);
+    pGlint->cpucount--;
+    TRACE_EXIT("Permedia3SubsequentScanlineCPUToScreenColorExpandFill");
+}
+
+static void
+Permedia3SubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    if (pGlint->cpucount--)
+    	GLINT_WAIT(pGlint->dwords);
+}
+
+
+static void
+Permedia3WriteBitmap(ScrnInfoPtr pScrn,
+    int x, int y, int w, int h,
+    unsigned char *src,
+    int srcwidth,
+    int skipleft,
+    int fg, int bg,
+    int rop,
+    unsigned int planemask
+)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    unsigned char *srcpntr;
+    int dwords, height, mode;
+    Bool SecondPass = FALSE;
+
+    TRACE_ENTER("Permedia3WriteBitmap");
+
+    w += skipleft;
+    x -= skipleft;
+    dwords = (w + 31) >> 5;
+
+    Permedia3SetClippingRectangle(pScrn,x+skipleft,y,x+w,y+h);
+ 
+    if (pScrn->bitsPerPixel == 24) {
+	GLINT_WAIT(10);
+    } else {
+        GLINT_WAIT(11);
+        DO_PLANEMASK(planemask);
+    }
+    LOADROP(rop);
+    Permedia3LoadCoord(pScrn, x&0xFFFF, y, w, h);
+    if (rop == GXcopy) {
+    	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+    if ((pScrn->bitsPerPixel != 24) && (rop == GXcopy)) {
+	mode = FastFillEnable;
+	GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+    	GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
+    } else {
+	mode = 0;
+	GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+	GLINT_WRITE_REG(BitMaskPackingEachScanline|
+		pGlint->RasterizerSwap,RasterizerMode);
+    }
+
+    if(bg == -1) {
+	/* >>>>> set fg <<<<<<<< */
+	REPLICATE(fg);
+    if ((pScrn->bitsPerPixel != 24) && (rop == GXcopy)) {
+	    GLINT_WRITE_REG(fg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(fg, ConstantColor);
+	}
+    } else if(rop == GXcopy) {
+	/* >>>>> set bg <<<<<<< */
+ 	/* >>>>> draw rect (x,y,w,h) */
+	REPLICATE(bg);
+    if ((pScrn->bitsPerPixel != 24) && (rop == GXcopy)) {
+	    GLINT_WRITE_REG(bg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(bg, ConstantColor);
+	}
+	GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive |mode,Render);
+	/* >>>>>> set fg <<<<<< */
+	REPLICATE(fg);
+    if ((pScrn->bitsPerPixel != 24) && (rop == GXcopy)) {
+	    GLINT_WRITE_REG(fg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(fg, ConstantColor);
+	}
+    } else {
+	SecondPass = TRUE;
+	/* >>>>> set fg <<<<<<< */
+	REPLICATE(fg);
+    if ((pScrn->bitsPerPixel != 24) && (rop == GXcopy)) {
+	    GLINT_WRITE_REG(fg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(fg, ConstantColor);
+	}
+    }
+
+   /* >>>>>>>>> initiate transfer (x,y,w,h).  Skipleft pixels on the
+	left edge will be clipped <<<<<< */
+
+SECOND_PASS:
+    GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive | mode | SyncOnBitMask, Render);
+    
+    height = h;
+    srcpntr = src;
+    while(height--) {
+    	GLINT_WAIT(dwords);
+    	/* 0x0D is the TAG value for BitMaskPattern */
+    	GLINT_WRITE_REG(((dwords - 1) << 16) | 0x0D, OutputFIFO);
+   	MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+		(CARD32 *)srcpntr, dwords);
+	srcpntr += srcwidth;
+    }   
+
+    if(SecondPass) {
+	SecondPass = FALSE;
+	/* >>>>>> invert bitmask and set bg <<<<<<<< */
+	REPLICATE(bg);
+	GLINT_WAIT(3);
+    if ((pScrn->bitsPerPixel != 24) && (rop == GXcopy)) {
+   	    GLINT_WRITE_REG(InvertBitMask|pGlint->RasterizerSwap,RasterizerMode);
+	    GLINT_WRITE_REG(bg, FBBlockColor);
+	} else {
+    	    GLINT_WRITE_REG(InvertBitMask|BitMaskPackingEachScanline|
+    	    			pGlint->RasterizerSwap, RasterizerMode);
+	    GLINT_WRITE_REG(bg, ConstantColor);
+	}
+	goto SECOND_PASS;
+    }
+
+    GLINT_WAIT(1);
+    GLINT_WRITE_REG(pGlint->RasterizerSwap, RasterizerMode);
+    Permedia3DisableClipping(pScrn);
+    SET_SYNC_FLAG(infoRec);
+    TRACE_EXIT("Permedia3WriteBitmap");
+}
+
+
+static void
+Permedia3WritePixmap8bpp(
+    ScrnInfoPtr pScrn,
+    int x, int y, int w, int h,
+    unsigned char *src,
+    int srcwidth,
+    int rop,
+    unsigned int planemask,
+    int transparency_color,
+    int bpp, int depth
+)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int skipleft, dwords, count;
+    CARD32* srcp;
+    unsigned char *srcpbyte;
+    Bool FastTexLoad = FALSE;
+
+    GLINT_WAIT(3);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
+    if (rop == GXcopy) {      
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_Packed, FBReadMode);
+    } else {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+
+    dwords = (w + 3) >> 2;
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
+    if((!(x&3)) && (!(w&3))) FastTexLoad = TRUE;
+#endif	
+    if((rop != GXcopy) || (planemask != ~0))
+	FastTexLoad = FALSE;
+
+    if (rop == GXcopy) {
+	skipleft = 0;
+    } else {
+	if((skipleft = (long)src & 0x03)) {
+	    	skipleft /= (bpp>>3);
+
+	    x -= skipleft;	     
+	    w += skipleft;
+	
+	       src = (unsigned char*)((long)src & ~0x03); 
+	}
+    }
+	
+
+        if(FastTexLoad) {
+	  int address;
+
+	  GLINT_WAIT(1);
+	  GLINT_WRITE_REG(UNIT_DISABLE, FBWriteMode);
+	  Permedia3Sync(pScrn);	/* we are not using the rasterizer */
+	  while(h--) {
+	      count = dwords;
+	      address = ((y * pScrn->displayWidth) + x) >> 2;
+	      srcp = (CARD32*)src;
+	      GLINT_WRITE_REG(address, TextureDownloadOffset);
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x11 << 4) | 0x0D is the TAG for TextureData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x11 << 4) |
+						0x0D, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		address += MAX_FIFO_ENTRIES - 1;
+		srcp += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x11 << 4) | 0x0D is the TAG for TextureData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x11 << 4) | 0x0D,
+					 OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, count);
+	      }
+	      src += srcwidth;
+	      y++;
+	  }
+	  GLINT_WAIT(1);
+	  GLINT_WRITE_REG(UNIT_ENABLE, FBWriteMode);
+	} else {
+  	   char align = (x & pGlint->bppalign);
+		
+
+	   GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+	   if (rop == GXcopy) {
+	     GLINT_WAIT(6);
+             Permedia3LoadCoord(pScrn, x>>pGlint->BppShift, y, 
+				(w+pGlint->bppalign)>>pGlint->BppShift, h);
+  	     GLINT_WRITE_REG(align<<29|x<<16|(x+w), PackedDataLimits);
+	   } else {
+	     Permedia3SetClippingRectangle(pScrn,x+skipleft,y,x+w,y+h);
+	     GLINT_WAIT(5);
+             Permedia3LoadCoord(pScrn, x, y, w, h);
+	   }
+	   LOADROP(rop);
+  	   GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive |
+				SyncOnHostData, Render);
+
+	   if (rop == GXcopy) {
+	    while(h--) {
+	      count = dwords;
+	      srcp = (CARD32*)src;
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		srcp += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, count);
+	      }
+	      src += srcwidth;
+	    }  
+	   } else {
+	    while(h--) {
+	      count = w;
+	      srcpbyte = (unsigned char *)src;
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveBYTE((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(unsigned char *)srcpbyte, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		srcpbyte += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveBYTE((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(unsigned char *)srcpbyte, count);
+	      }
+	      src += srcwidth;
+	    }  
+	   }
+	}
+
+    Permedia3DisableClipping(pScrn);
+    SET_SYNC_FLAG(infoRec);
+}
+
+static void
+Permedia3WritePixmap16bpp(
+    ScrnInfoPtr pScrn,
+    int x, int y, int w, int h,
+    unsigned char *src,
+    int srcwidth,
+    int rop,
+    unsigned int planemask,
+    int transparency_color,
+    int bpp, int depth
+)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int skipleft, dwords, count;
+    CARD32* srcp;
+    unsigned short* srcpword;
+    Bool FastTexLoad;
+
+    TRACE_ENTER("Permedia3WritePixmap16bpp");
+    GLINT_WAIT(3);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
+    if (rop == GXcopy) {      
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_Packed, FBReadMode);
+    } else {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+
+	FastTexLoad = FALSE;
+	dwords = (w + 1) >> 1;
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
+	if((!(x&1)) && (!(w&1))) FastTexLoad = TRUE;
+#endif
+	if((rop != GXcopy) || (planemask != ~0))
+		FastTexLoad = FALSE;
+
+	if (rop == GXcopy) {
+	  skipleft = 0;
+	} else {
+	  if((skipleft = (long)src & 0x03L)) {
+	    		skipleft /= (bpp>>3);
+
+	    	x -= skipleft;	     
+	    	w += skipleft;
+	
+	    	   src = (unsigned char*)((long)src & ~0x03L); 
+	  }
+	}
+	
+        if(FastTexLoad) {
+	  int address;
+
+	  GLINT_WAIT(1);
+	  GLINT_WRITE_REG(UNIT_DISABLE, FBWriteMode);
+	  Permedia3Sync(pScrn);	/* we are not using the rasterizer */
+	  while(h--) {
+	      count = dwords;
+	      address = ((y * pScrn->displayWidth) + x) >> 1;
+	      srcp = (CARD32*)src;
+	      GLINT_WRITE_REG(address, TextureDownloadOffset);
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x11 << 4) | 0x0D is the TAG for TextureData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x11 << 4) |
+						0x0D, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		address += MAX_FIFO_ENTRIES - 1;
+		srcp += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x11 << 4) | 0x0D is the TAG for TextureData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x11 << 4) | 0x0D,
+					 OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, count);
+	      }
+	      src += srcwidth;
+	      y++;
+	  }
+	  GLINT_WAIT(1);
+	  GLINT_WRITE_REG(UNIT_ENABLE, FBWriteMode);
+	} else {
+  	   char align = (x & pGlint->bppalign);
+		
+
+	   GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+	   if (rop == GXcopy) {
+	     GLINT_WAIT(6);
+             Permedia3LoadCoord(pScrn, x>>pGlint->BppShift, y, 
+				(w+pGlint->bppalign)>>pGlint->BppShift, h);
+  	     GLINT_WRITE_REG(align<<29|x<<16|(x+w), PackedDataLimits);
+	   } else {
+	     Permedia3SetClippingRectangle(pScrn,x+skipleft,y,x+w,y+h);
+	     GLINT_WAIT(5);
+             Permedia3LoadCoord(pScrn, x, y, w, h);
+	   }
+	   LOADROP(rop);
+  	   GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive |
+				SyncOnHostData, Render);
+
+	   if (rop == GXcopy) {
+	    while(h--) {
+	      count = dwords;
+	      srcp = (CARD32*)src;
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		srcp += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, count);
+	      }
+	      src += srcwidth;
+	    }  
+	   } else {
+	    while(h--) {
+	      count = w;
+	      srcpword = (unsigned short *)src;
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(unsigned short *)srcpword, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		srcpword += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(unsigned short *)srcpword, count);
+	      }
+	      src += srcwidth;
+	    }  
+	   }
+	}
+
+    Permedia3DisableClipping(pScrn);
+    SET_SYNC_FLAG(infoRec);
+    TRACE_EXIT("Permedia3WritePixmap16bpp");
+}
+
+#if 0
+static void
+Permedia3WritePixmap24bpp(
+    ScrnInfoPtr pScrn,
+    int x, int y, int w, int h,
+    unsigned char *src,
+    int srcwidth,
+    int rop,
+    unsigned int planemask,
+    int transparency_color,
+    int bpp, int depth
+)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int skipleft = 0, dwords, count;
+    unsigned char* srcpbyte;
+    CARD32* srcp;
+
+    GLINT_WAIT(3);
+    GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
+    GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+    if (rop == GXcopy) {      
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+
+	dwords = ((w+1)*3)>>2;
+	  if((skipleft = (long)src & 0x03L)) {
+			skipleft = 4 - skipleft;
+
+	    	x -= skipleft;	     
+	    	w += skipleft;
+	
+	    	   src = (unsigned char*)(src - (3*skipleft));  
+	}
+	
+	{
+	   Permedia3SetClippingRectangle(pScrn,x+skipleft,y,x+w,y+h);
+
+	   GLINT_WAIT(4);
+           Permedia3LoadCoord(pScrn, x&0xFFFF, y, w, h);
+	   LOADROP(rop);
+  	   GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive |
+				SyncOnHostData, Render);
+
+#if 1
+	    while(h--) {
+	      count = w;
+	      srcpbyte = (unsigned char *)src;
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveBYTE((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(unsigned char *)srcpbyte, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		srcpbyte += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveBYTE((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(unsigned char *)srcpbyte, count);
+	      }
+	      src += srcwidth;
+#else
+	   while(h--) {
+	      count = dwords;
+	      srcp = (CARD32*)src;
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		srcp += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, count);
+	      }
+	      src += srcwidth;
+#endif
+	   }  
+	}
+
+    Permedia3DisableClipping(pScrn);
+    SET_SYNC_FLAG(infoRec);
+}
+#endif
+
+
+static void
+Permedia3WritePixmap32bpp(
+    ScrnInfoPtr pScrn,
+    int x, int y, int w, int h,
+    unsigned char *src,
+    int srcwidth,
+    int rop,
+    unsigned int planemask,
+    int transparency_color,
+    int bpp, int depth
+)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int skipleft, dwords, count;
+    CARD32* srcp;
+    Bool FastTexLoad;
+
+    GLINT_WAIT(3);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG(pGlint->RasterizerSwap,RasterizerMode);
+    if (rop == GXcopy) {      
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+
+	FastTexLoad = TRUE;
+	dwords = w;
+	if((rop != GXcopy) || (planemask != ~0))
+		FastTexLoad = FALSE;
+	
+	if (!FastTexLoad) {
+	  if((skipleft = (long)src & 0x03L)) {
+	    		skipleft /= (bpp>>3);
+
+	    	x -= skipleft;	     
+	    	w += skipleft;
+	
+	    	   src = (unsigned char*)((long)src & ~0x03L); 
+	  }
+	}
+	
+        if(FastTexLoad) {
+	  int address;
+
+	  GLINT_WAIT(1);
+	  GLINT_WRITE_REG(UNIT_DISABLE, FBWriteMode);
+	  Permedia3Sync(pScrn);	/* we are not using the rasterizer */
+	  while(h--) {
+	      count = dwords;
+	      address = (y * pScrn->displayWidth) + x;
+	      srcp = (CARD32*)src;
+	      GLINT_WRITE_REG(address, TextureDownloadOffset);
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x11 << 4) | 0x0D is the TAG for TextureData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x11 << 4) |
+						0x0D, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		address += MAX_FIFO_ENTRIES - 1;
+		srcp += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x11 << 4) | 0x0D is the TAG for TextureData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x11 << 4) | 0x0D,
+					 OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, count);
+	      }
+	      src += srcwidth;
+	      y++;
+	  }
+	  GLINT_WAIT(1);
+	  GLINT_WRITE_REG(UNIT_ENABLE, FBWriteMode);
+	} else {
+	   Permedia3SetClippingRectangle(pScrn,x+skipleft,y,x+w,y+h);
+
+	   GLINT_WAIT(6);
+           Permedia3LoadCoord(pScrn, x, y, w, h);
+	   GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+	   LOADROP(rop);
+  	   GLINT_WRITE_REG(PrimitiveRectangle | XPositive | YPositive |
+				SyncOnHostData, Render);
+
+	   while(h--) {
+	      count = dwords;
+	      srcp = (CARD32*)src;
+	      while(count >= MAX_FIFO_ENTRIES) {
+    	    	GLINT_WAIT(MAX_FIFO_ENTRIES);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((MAX_FIFO_ENTRIES - 2) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, MAX_FIFO_ENTRIES - 1);
+		count -= MAX_FIFO_ENTRIES - 1;
+		srcp += MAX_FIFO_ENTRIES - 1;
+	      }
+	      if(count) {
+    	    	GLINT_WAIT(count + 1);
+		/* (0x15 << 4) | 0x05 is the TAG for FBSourceData */
+        	GLINT_WRITE_REG(((count - 1) << 16) | (0x15 << 4) | 
+					0x05, OutputFIFO);
+		MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+	 		(CARD32*)srcp, count);
+	      }
+	      src += srcwidth;
+	   }  
+	}
+
+    Permedia3DisableClipping(pScrn);
+    SET_SYNC_FLAG(infoRec);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c:1.3
--- /dev/null	Sat Jul  1 20:42:51 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c	Mon Jun 12 03:11:38 2000
@@ -0,0 +1,596 @@
+/*
+ * Copyright 1997,1998 by Alan Hourihane <alanh@fairlite.demon.co.uk>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Sven Luther, <luther@dpt-info.u-strasbg.fr>
+ *
+ *
+ *
+ *
+ * this work is sponsored by Appian Graphics.
+ * 
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c,v 1.3 2000/06/12 10:11:38 alanh Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+
+#include "glint_regs.h"
+#include "glint.h"
+
+#define DEBUG 0
+
+#if DEBUG
+# define TRACE_ENTER(str)       ErrorF("glint: " str " %d\n",pScrn->scrnIndex)
+# define TRACE_EXIT(str)        ErrorF("glint: " str " done\n")
+# define TRACE(str)             ErrorF("glint trace: " str "\n")
+#else
+# define TRACE_ENTER(str)
+# define TRACE_EXIT(str)
+# define TRACE(str)
+#endif
+
+void
+Permedia3PreInit(ScrnInfoPtr pScrn, GLINTPtr pGlint)
+{
+    TRACE_ENTER("Permedia3PreInit");
+    if ((pGlint->PciInfo->subsysVendor == 0x1097) &&
+	(pGlint->PciInfo->subsysCard == 0x3d32)) {
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	    "Appian Jeronimo 2000 board detected and initialized.\n\t"
+	    "subsysVendor = 0x%04x, subsysCard = 0x%04x.\n",
+	    pGlint->PciInfo->subsysVendor, pGlint->PciInfo->subsysCard);
+	/* Memory timings for the Appian J2000 board.
+	 * This is needed for the second head which is left unitilialized
+	 * by the bios, thus freezing the machine.
+	 */
+	GLINT_SLOW_WRITE_REG(0xffffffff, PM3MemBypassWriteMask);
+	GLINT_SLOW_WRITE_REG(0x02e311B8, PM3LocalMemCaps);
+	GLINT_SLOW_WRITE_REG(0x07424905, PM3LocalMemTimings);
+	GLINT_SLOW_WRITE_REG(0x0c000003, PM3LocalMemControl);
+	GLINT_SLOW_WRITE_REG(0x00000069, PM3LocalMemRefresh);
+    }
+    else {
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	    "Unknown Glint Permedia3 board detected.\n\t"
+	    "subsysVendor = 0x%04x, subsysCard = 0x%04x.\n",
+	    pGlint->PciInfo->subsysVendor, pGlint->PciInfo->subsysCard);
+    }
+    TRACE_EXIT("Permedia3PreInit");
+}
+
+int
+PM3QuickFillMemory(ScrnInfoPtr pScrn,int size)
+{
+    GLINTPtr pGlint;
+    unsigned int * p;
+    unsigned int p_content;
+    unsigned int i, j;
+    long savemapsize;
+
+    pGlint = GLINTPTR (pScrn);
+    savemapsize = pGlint->FbMapSize;
+    pGlint->FbMapSize = size*1024*1024;
+
+    pGlint->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+	pGlint->PciTag, pGlint->FbAddress, pGlint->FbMapSize);
+    if (pGlint->FbBase == NULL) {
+	pGlint->FbMapSize = savemapsize;
+	return FALSE;
+    }
+
+    /* Set pointer to Aperture1 */
+    p = (unsigned int *) pGlint->FbBase;
+    /* Fill in megs number of megabytes */
+    for(i=0;i<size;i++)
+	for(j=0;j<1024*256;j+=1024)
+	    p[j+(i*1024*256)] = j + (i * 1024*256);
+
+    /* Set pointer to Aperture1 */
+    p = (unsigned int *) pGlint->FbBase;
+
+    /* If original ptr is 0x0 then no rollover occured */
+    p_content = p[0];
+    xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->FbBase,
+	pGlint->FbMapSize);
+    pGlint->FbBase = NULL;
+    pGlint->FbMapSize = savemapsize;
+    if (p_content == 0x0)
+	return TRUE;
+    else return FALSE;
+}
+int
+Permedia3MemorySizeDetect(ScrnInfoPtr pScrn)
+{
+    GLINTPtr pGlint;
+    int size = 1;
+    pGlint = GLINTPTR (pScrn);
+    /* Fill memory until get a rollover of dram to 0
+     * fill in powers of 2, 1,2,4,8,16,32
+     */
+    while(PM3QuickFillMemory(pScrn,size))
+    {
+	size = size*2;
+	if(size == 64) break;
+    }
+    /* Correct memory amount since fail */
+    size = size / 2;
+    /* Just to make sure */
+    if (PM3QuickFillMemory(pScrn,size))
+	return size*1024;
+    return 16*1024;
+}
+
+static int
+Shiftbpp(ScrnInfoPtr pScrn, int value)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    /* shift horizontal timings for 128bit SGRAMs or SDRAMs */
+    int logbytesperaccess = 4;
+	
+    switch (pScrn->bitsPerPixel) {
+    case 8:
+	value >>= logbytesperaccess;
+	pGlint->BppShift = logbytesperaccess;
+	break;
+    case 16:
+	if (pGlint->DoubleBuffer) {
+	    value >>= (logbytesperaccess-2);
+	    pGlint->BppShift = logbytesperaccess-2;
+	} else {
+	    value >>= (logbytesperaccess-1);
+	    pGlint->BppShift = logbytesperaccess-1;
+	}
+	break;
+    case 24:
+	value *= 3;
+	value >>= logbytesperaccess;
+	pGlint->BppShift = logbytesperaccess;
+	break;
+    case 32:
+	value >>= (logbytesperaccess-2);
+	pGlint->BppShift = logbytesperaccess-2;
+	break;
+    }
+    return (value);
+}
+
+static unsigned long
+PM3DAC_CalculateClock
+(
+ unsigned long reqclock,		/* In kHz units */
+ unsigned long refclock,		/* In kHz units */
+ unsigned char *prescale,		/* ClkPreScale */
+ unsigned char *feedback, 		/* ClkFeedBackScale */
+ unsigned char *postscale		/* ClkPostScale */
+ )
+{
+    int			f, pre, post;
+    unsigned long	freq;
+    long		freqerr = 1000;
+    unsigned long  	actualclock = 0;
+
+    for (f=1;f<256;f++) {
+	for (pre=1;pre<256;pre++) {
+	    for (post=0;post<5;post++) { 
+		/* P3Lib multiplies it by two here lets try it alsos
+		 * Didn't work at all, don't know why, ...
+		 */
+	    	freq = ((2*refclock * f) / (pre * (1 << post)));
+		if ((reqclock > freq - freqerr)&&(reqclock < freq + freqerr)){
+		    freqerr = (reqclock > freq) ? 
+					reqclock - freq : freq - reqclock;
+		    *feedback = f;
+		    *prescale = pre;
+		    *postscale = post;
+		    actualclock = freq;
+		}
+	    }
+	}
+    }
+    return(actualclock);
+}
+
+Bool
+Permedia3Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    GLINTRegPtr pReg = &pGlint->ModeReg;
+    CARD32 temp1, temp2, temp3, temp4;
+
+    /* Memory timings for the Appian J2000 board
+     * This is not ideal, since the work here is duplicated 
+     * in the Permedia3PreInit function :(((
+     */
+    if ((pGlint->PciInfo->subsysVendor == 0x1097) &&
+	(pGlint->PciInfo->subsysCard == 0x3d32)) {
+	pReg->glintRegs[PM3MemBypassWriteMask >> 3] = 0xffffffff;
+	pReg->glintRegs[PM3LocalMemCaps >> 3] = 0x02e311B8;
+	pReg->glintRegs[PM3LocalMemTimings >> 3] = 0x07424905;
+	pReg->glintRegs[PM3LocalMemControl >> 3] = 0x0c000003;
+	pReg->glintRegs[PM3LocalMemRefresh >> 3] = 0x00000069;
+	pReg->glintRegs[PM3LocalMemPowerDown >> 3] = 0x00000000;
+	pReg->glintRegs[PM3ByAperture1Mode >> 3] = 0x00000000;
+	pReg->glintRegs[PM3ByAperture2Mode >> 3] = 0x00000000;
+    }
+
+    pReg->glintRegs[Aperture0 >> 3] = 0;
+    pReg->glintRegs[Aperture1 >> 3] = 0;
+
+    if (pGlint->UsePCIRetry) {
+	pReg->glintRegs[DFIFODis >> 3] = 1;
+	pReg->glintRegs[FIFODis >> 3] = 3;
+    } else {
+	pReg->glintRegs[DFIFODis >> 3] = 0;
+	pReg->glintRegs[FIFODis >> 3] = 1;
+    }
+
+    temp1 = mode->CrtcHSyncStart - mode->CrtcHDisplay;
+    temp2 = mode->CrtcVSyncStart - mode->CrtcVDisplay;
+    temp3 = mode->CrtcHSyncEnd - mode->CrtcHSyncStart;
+    temp4 = mode->CrtcVSyncEnd - mode->CrtcVSyncStart;
+
+    pReg->glintRegs[PMHTotal >> 3] = Shiftbpp(pScrn,mode->CrtcHTotal);
+    pReg->glintRegs[PMHsEnd >> 3] = Shiftbpp(pScrn, temp1 + temp3);
+    pReg->glintRegs[PMHsStart >> 3] = Shiftbpp(pScrn, temp1);
+    pReg->glintRegs[PMHbEnd >> 3] = 
+		Shiftbpp(pScrn,mode->CrtcHTotal-mode->CrtcHDisplay);
+    pReg->glintRegs[PMHgEnd >> 3] = pReg->glintRegs[PMHbEnd >> 3];
+    pReg->glintRegs[PMScreenStride >> 3] = 
+		Shiftbpp(pScrn,pScrn->displayWidth);
+
+    pReg->glintRegs[PMVTotal >> 3] = mode->CrtcVTotal;
+    pReg->glintRegs[PMVsEnd >> 3] = temp2 + temp4;
+    pReg->glintRegs[PMVsStart >> 3] = temp2;
+    pReg->glintRegs[PMVbEnd >> 3] = mode->CrtcVTotal - mode->CrtcVDisplay;
+
+    pReg->glintRegs[PMHTotal >> 3] -= 1; 
+    pReg->glintRegs[PMVTotal >> 3] -= 1;
+    pReg->glintRegs[PMVsStart >> 3] -= 1;
+    pReg->glintRegs[PMVsEnd >> 3] -= 1;
+
+    /* The hw cursor needs /VSYNC to recognize vert retrace. We'll stick
+       both sync lines to active high (???) here and if needed invert them
+       using the RAMDAC's RDSyncControl below. */
+    pReg->glintRegs[PMVideoControl >> 3] =
+	(1 << 5) | (1 << 3) | 1;
+
+    pReg->glintRegs[VClkCtl >> 3] = (GLINT_READ_REG(VClkCtl) & 0xFFFFFFFC);
+    pReg->glintRegs[PMScreenBase >> 3] = 0; 
+
+    pReg->glintRegs[ChipConfig >> 3] = GLINT_READ_REG(ChipConfig) & 0xFFFFFFDD;
+    pReg->DacRegs[PM2VDACRDDACControl] = 0x00;
+  
+    {
+	/* Get the programmable clock values */
+    	unsigned char m,n,p;
+    	unsigned long clockused;
+	
+    	clockused = PM3DAC_CalculateClock(mode->Clock,pGlint->RefClock,
+								&m,&n,&p);
+	pReg->DacRegs[PM2VDACRDDClk0PreScale] = m;
+	pReg->DacRegs[PM2VDACRDDClk0FeedbackScale] = n;
+	pReg->DacRegs[PM2VDACRDDClk0PostScale] = p;
+    }
+
+    pReg->DacRegs[PM2VDACRDIndexControl] = 0x00;
+
+    if (pScrn->rgbBits == 8)
+        pReg->DacRegs[PM2VDACRDMiscControl] = 0x01; /* 8bit DAC */
+    else
+	pReg->DacRegs[PM2VDACRDMiscControl] = 0x00; /* 6bit DAC */
+
+    pReg->DacRegs[PM2VDACRDSyncControl] = 0x00;
+    if (!(mode->Flags & V_PHSYNC))
+        pReg->DacRegs[PM2VDACRDSyncControl] |= 0x01; /* invert hsync */
+    if (!(mode->Flags & V_PVSYNC))
+        pReg->DacRegs[PM2VDACRDSyncControl] |= 0x04; /* invert vsync */
+
+    switch (pScrn->bitsPerPixel)
+    {
+    case 8:
+	pReg->DacRegs[PM2VDACRDPixelSize] = 0x00;
+	pReg->DacRegs[PM2VDACRDColorFormat] = 0x2E;
+    	break;
+    case 16:
+        pReg->DacRegs[PM2VDACRDMiscControl] |= 0x08; 
+	pReg->DacRegs[PM2VDACRDPixelSize] = 0x01;
+	if (pScrn->depth == 15) 
+	    pReg->DacRegs[PM2VDACRDColorFormat] = 0x61;
+	else
+	    pReg->DacRegs[PM2VDACRDColorFormat] = 0x70;
+    	break;
+    case 24:
+        pReg->DacRegs[PM2VDACRDMiscControl] |= 0x08; 
+	pReg->DacRegs[PM2VDACRDPixelSize] = 0x04;
+	pReg->DacRegs[PM2VDACRDColorFormat] = 0x60;
+    	break;
+    case 32:
+        pReg->DacRegs[PM2VDACRDMiscControl] |= 0x08; 
+	pReg->DacRegs[PM2VDACRDPixelSize] = 0x02;
+	pReg->DacRegs[PM2VDACRDColorFormat] = 0x20;
+	if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
+	    pReg->DacRegs[PM2VDACRDMiscControl] |= 0x10;
+	    pReg->DacRegs[PM2VDACRDOverlayKey] = 0xFF;
+	}
+    	break;
+    }
+
+    return(TRUE);
+}
+
+void
+Permedia3Save(ScrnInfoPtr pScrn, GLINTRegPtr glintReg)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int i;
+
+    /* Permedia 3 memory Timings */
+    glintReg->glintRegs[PM3MemBypassWriteMask >> 3] =
+	    				GLINT_READ_REG(PM3MemBypassWriteMask);
+    glintReg->glintRegs[PM3LocalMemCaps >> 3] = 
+	    				GLINT_READ_REG(PM3LocalMemCaps);
+    glintReg->glintRegs[PM3LocalMemTimings >> 3] = 
+	    				GLINT_READ_REG(PM3LocalMemTimings);
+    glintReg->glintRegs[PM3LocalMemControl >> 3] = 
+	    				GLINT_READ_REG(PM3LocalMemControl);
+    glintReg->glintRegs[PM3LocalMemRefresh >> 3] = 
+	    				GLINT_READ_REG(PM3LocalMemRefresh);
+    glintReg->glintRegs[PM3LocalMemPowerDown >> 3] = 
+	    				GLINT_READ_REG(PM3LocalMemPowerDown);
+    glintReg->glintRegs[PM3ByAperture1Mode >> 3] = 
+	    				GLINT_READ_REG(PM3ByAperture1Mode);
+    glintReg->glintRegs[PM3ByAperture2Mode >> 3] = 
+	    				GLINT_READ_REG(PM3ByAperture2Mode);
+
+    glintReg->glintRegs[ChipConfig >> 3] = GLINT_READ_REG(ChipConfig);
+    glintReg->glintRegs[Aperture0 >> 3]  = GLINT_READ_REG(Aperture0);
+    glintReg->glintRegs[Aperture1 >> 3]  = GLINT_READ_REG(Aperture1);
+
+    glintReg->glintRegs[DFIFODis >> 3]  = GLINT_READ_REG(DFIFODis);
+    glintReg->glintRegs[FIFODis >> 3]  = GLINT_READ_REG(FIFODis);
+    glintReg->glintRegs[PMHTotal >> 3] = GLINT_READ_REG(PMHTotal);
+    glintReg->glintRegs[PMHbEnd >> 3] = GLINT_READ_REG(PMHbEnd);
+    glintReg->glintRegs[PMHbEnd >> 3] = GLINT_READ_REG(PMHgEnd);
+    glintReg->glintRegs[PMScreenStride >> 3] = GLINT_READ_REG(PMScreenStride);
+    glintReg->glintRegs[PMHsStart >> 3] = GLINT_READ_REG(PMHsStart);
+    glintReg->glintRegs[PMHsEnd >> 3] = GLINT_READ_REG(PMHsEnd);
+    glintReg->glintRegs[PMVTotal >> 3] = GLINT_READ_REG(PMVTotal);
+    glintReg->glintRegs[PMVbEnd >> 3] = GLINT_READ_REG(PMVbEnd);
+    glintReg->glintRegs[PMVsStart >> 3] = GLINT_READ_REG(PMVsStart);
+    glintReg->glintRegs[PMVsEnd >> 3] = GLINT_READ_REG(PMVsEnd);
+    glintReg->glintRegs[PMScreenBase >> 3] = GLINT_READ_REG(PMScreenBase);
+    glintReg->glintRegs[PMVideoControl >> 3] = GLINT_READ_REG(PMVideoControl);
+    glintReg->glintRegs[VClkCtl >> 3] = GLINT_READ_REG(VClkCtl);
+
+    for (i=0;i<768;i++) {
+    	Permedia2ReadAddress(pScrn, i);
+	glintReg->cmap[i] = Permedia2ReadData(pScrn);
+    }
+
+    glintReg->DacRegs[PM2VDACRDIndexControl] = 
+				Permedia2vInIndReg(pScrn, PM2VDACRDIndexControl);
+    glintReg->DacRegs[PM2VDACRDOverlayKey] = 
+				Permedia2vInIndReg(pScrn, PM2VDACRDOverlayKey);
+    glintReg->DacRegs[PM2VDACRDSyncControl] = 
+				Permedia2vInIndReg(pScrn, PM2VDACRDSyncControl);
+    glintReg->DacRegs[PM2VDACRDMiscControl] = 
+				Permedia2vInIndReg(pScrn, PM2VDACRDMiscControl);
+    glintReg->DacRegs[PM2VDACRDDACControl] = 
+				Permedia2vInIndReg(pScrn, PM2VDACRDDACControl);
+    glintReg->DacRegs[PM2VDACRDPixelSize] = 
+				Permedia2vInIndReg(pScrn, PM2VDACRDPixelSize);
+    glintReg->DacRegs[PM2VDACRDColorFormat] = 
+				Permedia2vInIndReg(pScrn, PM2VDACRDColorFormat);
+
+    glintReg->DacRegs[PM2VDACRDDClk0PreScale] = Permedia2vInIndReg(pScrn, PM2VDACRDDClk0PreScale);
+    glintReg->DacRegs[PM2VDACRDDClk0FeedbackScale] = Permedia2vInIndReg(pScrn, PM2VDACRDDClk0FeedbackScale);
+    glintReg->DacRegs[PM2VDACRDDClk0PostScale] = Permedia2vInIndReg(pScrn, PM2VDACRDDClk0PostScale);
+}
+
+void
+Permedia3Restore(ScrnInfoPtr pScrn, GLINTRegPtr glintReg)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    CARD32 temp;
+    int i;
+
+#if 0
+    GLINT_SLOW_WRITE_REG(0, ResetStatus);
+    while(GLINT_READ_REG(ResetStatus) != 0) {
+	xf86MsgVerb(X_INFO, 2, "Resetting Engine - Please Wait.\n");
+    };
+#endif
+
+    /* Permedia 3 memory Timings */
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PM3MemBypassWriteMask >> 3],
+		    					PM3MemBypassWriteMask);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PM3LocalMemCaps >> 3],
+	    						PM3LocalMemCaps);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PM3LocalMemTimings >> 3],
+	    						PM3LocalMemTimings);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PM3LocalMemControl >> 3],
+	    						PM3LocalMemControl);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PM3LocalMemRefresh >> 3],
+	    						PM3LocalMemRefresh);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PM3LocalMemPowerDown >> 3],
+	    						PM3LocalMemPowerDown);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PM3ByAperture1Mode >> 3],
+	    						PM3ByAperture1Mode);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PM3ByAperture2Mode >> 3],
+	    						PM3ByAperture2Mode);
+
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[ChipConfig >> 3], ChipConfig);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[Aperture0 >> 3], Aperture0);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[Aperture1 >> 3], Aperture1);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[DFIFODis >> 3], DFIFODis);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[FIFODis >> 3], FIFODis);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMVideoControl >> 3], 
+								PMVideoControl);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMHbEnd >> 3], PMHgEnd);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMScreenBase >> 3], PMScreenBase);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VClkCtl >> 3], VClkCtl);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMScreenStride >> 3], 
+								PMScreenStride);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMHTotal >> 3], PMHTotal);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMHbEnd >> 3], PMHbEnd);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMHsStart >> 3], PMHsStart);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMHsEnd >> 3], PMHsEnd);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMVTotal >> 3], PMVTotal);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMVbEnd >> 3], PMVbEnd);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMVsStart >> 3], PMVsStart);
+    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[PMVsEnd >> 3], PMVsEnd);
+
+    Permedia2vOutIndReg(pScrn, PM2VDACRDIndexControl, 0x00, 
+				glintReg->DacRegs[PM2VDACRDIndexControl]);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDOverlayKey, 0x00, 
+				glintReg->DacRegs[PM2VDACRDOverlayKey]);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDSyncControl, 0x00, 
+				glintReg->DacRegs[PM2VDACRDSyncControl]);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDMiscControl, 0x00, 
+				glintReg->DacRegs[PM2VDACRDMiscControl]);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDDACControl, 0x00, 
+				glintReg->DacRegs[PM2VDACRDDACControl]);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDPixelSize, 0x00, 
+				glintReg->DacRegs[PM2VDACRDPixelSize]);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDColorFormat, 0x00, 
+				glintReg->DacRegs[PM2VDACRDColorFormat]);
+
+    for (i=0;i<768;i++) {
+    	Permedia2WriteAddress(pScrn, i);
+	Permedia2WriteData(pScrn, glintReg->cmap[i]);
+    }
+
+    temp = Permedia2vInIndReg(pScrn, PM2VDACIndexClockControl) & 0xFC;
+    Permedia2vOutIndReg(pScrn, PM2VDACRDDClk0PreScale, 0x00, 
+				glintReg->DacRegs[PM2VDACRDDClk0PreScale]);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDDClk0FeedbackScale, 0x00, 
+				glintReg->DacRegs[PM2VDACRDDClk0FeedbackScale]);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDDClk0PostScale, 0x00, 
+				glintReg->DacRegs[PM2VDACRDDClk0PostScale]);
+    Permedia2vOutIndReg(pScrn, PM2VDACIndexClockControl, 0x00, temp|0x03);
+}
+
+static void 
+Permedia3ShowCursor(ScrnInfoPtr pScrn)
+{
+    /* Enable cursor - X11 mode */
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorMode, 0x00, 0x11);
+}
+
+static void
+Permedia3HideCursor(ScrnInfoPtr pScrn)
+{
+    /* Disable cursor - X11 mode */
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorMode, 0x00, 0x10);
+}
+
+static void
+Permedia3LoadCursorImage(
+    ScrnInfoPtr pScrn, 
+    unsigned char *src
+)
+{
+    int i;
+       
+    for (i=0; i<1024; i++) 
+    	Permedia2vOutIndReg(pScrn, PM2VDACRDCursorPattern+i, 0x00, *(src++));
+}
+
+static void
+Permedia3SetCursorPosition(
+   ScrnInfoPtr pScrn, 
+   int x, int y
+)
+{
+    x += 64;
+    y += 64;
+
+    /* Output position - "only" 11 bits of location documented */
+   
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorHotSpotX, 0x00, 0x3f);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorHotSpotY, 0x00, 0x3f);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorXLow, 0x00, x & 0xFF);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorXHigh, 0x00, (x>>8) & 0x0F);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorYLow, 0x00, y & 0xFF);
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorYHigh, 0x00, (y>>8) & 0x0F);
+    Permedia2vOutIndReg(pScrn, PM2DACCursorControl, 0x00, 0x00);
+}
+
+
+static void
+Permedia3SetCursorColor(
+   ScrnInfoPtr pScrn, 
+   int index,
+   int color
+)
+{
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorPalette+3*(14-index)+0,
+	0x00, 0xff & (color >>16));
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorPalette+3*(14-index)+1,
+	0x00, 0xff & (color >>8));
+    Permedia2vOutIndReg(pScrn, PM2VDACRDCursorPalette+3*(14-index)+2,
+	0x00, 0xff & color);
+}
+
+static void
+Permedia3SetCursorColors(
+   ScrnInfoPtr pScrn, 
+   int bg, int fg
+)
+{
+    Permedia3SetCursorColor (pScrn, 0, bg);
+    Permedia3SetCursorColor (pScrn, 1, fg);
+}
+
+static Bool 
+Permedia3UseHWCursor(ScreenPtr pScr, CursorPtr pCurs)
+{
+    return TRUE;
+}
+
+Bool 
+Permedia3HWCursorInit(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    xf86CursorInfoPtr infoPtr;
+
+    infoPtr = xf86CreateCursorInfoRec();
+    if(!infoPtr) return FALSE;
+    
+    pGlint->CursorInfoRec = infoPtr;
+
+    infoPtr->MaxWidth = 64;
+    infoPtr->MaxHeight = 64;
+    infoPtr->Flags = HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1;
+    infoPtr->SetCursorColors = Permedia3SetCursorColors;
+    infoPtr->SetCursorPosition = Permedia3SetCursorPosition;
+    infoPtr->LoadCursorImage = Permedia3LoadCursorImage;
+    infoPtr->HideCursor = Permedia3HideCursor;
+    infoPtr->ShowCursor = Permedia3ShowCursor;
+    infoPtr->UseHWCursor = Permedia3UseHWCursor;
+
+    return(xf86InitCursor(pScreen, infoPtr));
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c:1.17 xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c:1.19
--- xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c:1.17	Thu Jan 20 17:12:18 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c	Wed Jun 21 06:35:52 2000
@@ -28,7 +28,7 @@
  * 
  * Permedia accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.17 2000/01/21 01:12:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.19 2000/06/21 13:35:52 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -213,8 +213,11 @@
     infoPtr->PolylinesThinSolidFlags = 0;
     infoPtr->SetupForSolidLine = PermediaSetupForSolidLine;
     infoPtr->SubsequentSolidHorVertLine = PermediaSubsequentHorVertLine;
-    infoPtr->SubsequentSolidBresenhamLine = 
+    if (!(pScrn->overlayFlags & OVERLAY_8_32_PLANAR))
+    {
+        infoPtr->SubsequentSolidBresenhamLine = 
 				PermediaSubsequentSolidBresenhamLine;
+    }
     infoPtr->PolySegmentThinSolid = PermediaPolySegmentThinSolidWrapper;
     infoPtr->PolylinesThinSolid = PermediaPolylinesThinSolidWrapper;
   
@@ -1239,6 +1242,7 @@
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
     GLINTPtr pGlint = GLINTPTR(infoRec->pScrn);
     pGlint->CurrentGC = pGC;
+    pGlint->CurrentDrawable = pDraw;
     if(infoRec->NeedToSync) (*infoRec->Sync)(infoRec->pScrn);
     XAAPolySegment(pDraw, pGC, nseg, pSeg);
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c:1.3
--- /dev/null	Sat Jul  1 20:42:51 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c	Wed Apr 12 07:44:41 2000
@@ -0,0 +1,926 @@
+/*
+ * Copyright 1997,1998 by Alan Hourihane, Wigan, England.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ *           Dirk Hohndel, <hohndel@suse.de>
+ *           Stefan Dirsch, <sndirsch@suse.de>
+ *
+ * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
+ * Siemens Nixdorf Informationssysteme
+ * 
+ * GLINT 300SX accelerated options.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c,v 1.3 2000/04/12 14:44:41 tsi Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+
+#include "fb.h"
+
+#include "miline.h"
+
+#include "glint_regs.h"
+#include "glint.h"
+
+#include "xaalocal.h"	/* For replacements */
+
+static void SXSync(ScrnInfoPtr pScrn);
+static void SXSetupForFillRectSolid(ScrnInfoPtr pScrn, int color, int rop,
+						unsigned int planemask);
+static void SXSubsequentFillRectSolid(ScrnInfoPtr pScrn, int x, int y,
+						int w, int h);
+static void SXSetupForMono8x8PatternFill(ScrnInfoPtr pScrn, int patternx, 
+						int patterny, 
+					   	int fg, int bg, int rop,
+					   	unsigned int planemask);
+static void SXSubsequentMono8x8PatternFillRect(ScrnInfoPtr pScrn, int patternx,
+						int patterny, int x, int y,
+				   		int w, int h);
+static void SXSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir,
+						int rop, unsigned int planemask,
+				    		int transparency_color);
+static void SXSubsequentScreenToScreenCopy(ScrnInfoPtr pScrn, int x1, int y1,
+						int x2, int y2, int w, int h);
+static void SXWriteBitmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+    				unsigned char *src, int srcwidth,
+				int skipleft, int fg, int bg, int rop,
+    				unsigned int planemask);
+static void SXSetClippingRectangle(ScrnInfoPtr pScrn, int x1, int y1, 
+						int x2,int y2);
+static void SXDisableClipping(ScrnInfoPtr pScrn);
+static void SXWritePixmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+   				unsigned char *src, int srcwidth, int rop,
+   				unsigned int planemask, int trans,
+   				int bpp, int depth);
+static void SXSetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, int fg,
+				int bg, int rop, unsigned int planemask);
+static void SXSubsequentCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, int x,
+				int y, int w, int h, int skipleft);
+static void SXSetupForScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, int fg,
+				int bg, int rop, unsigned int planemask);
+static void SXSubsequentScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, int x,
+				int y, int w, int h, int skipleft);
+static void SXSubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno);
+static void SXLoadCoord(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+				int a, int d);
+static void SXSetupForSolidLine(ScrnInfoPtr pScrn, int color, int rop,
+				unsigned int planemask);
+static void SXSubsequentHorVertLine(ScrnInfoPtr pScrn, int x1, int y1,
+				int len, int dir);
+static void SXSubsequentSolidBresenhamLine(ScrnInfoPtr pScrn,
+        			int x, int y, int dmaj, int dmin, int e, 
+				int len, int octant);
+static void SXPolylinesThinSolidWrapper(DrawablePtr pDraw, GCPtr pGC,
+   				int mode, int npt, DDXPointPtr pPts);
+static void SXPolySegmentThinSolidWrapper(DrawablePtr pDraw, GCPtr pGC,
+ 				int nseg, xSegment *pSeg);
+
+#define MAX_FIFO_ENTRIES		15
+
+void
+SXInitializeEngine(ScrnInfoPtr pScrn)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    /* Initialize the Accelerator Engine to defaults */
+
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	DitherMode);
+    GLINT_SLOW_WRITE_REG(0x400,		FilterMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,  ScissorMode);
+    GLINT_SLOW_WRITE_REG(pGlint->pprod,	LBReadMode);
+    GLINT_SLOW_WRITE_REG(pGlint->pprod,	FBReadMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LBWriteMode);
+    GLINT_SLOW_WRITE_REG(UNIT_ENABLE,	FBWriteMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AlphaBlendMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	ColorDDAMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	TextureColorMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	TextureAddressMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,  TextureReadMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,  GLINTWindow);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,  AlphaBlendMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,  DepthMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,  RouterMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FogMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AntialiasMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AlphaTestMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	StencilMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	AreaStippleMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LineStippleMode);
+    GLINT_SLOW_WRITE_REG(0,		UpdateLineStippleCounters);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LogicalOpMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	DepthMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	StatisticMode);
+    GLINT_SLOW_WRITE_REG(0xffffffff,	FBHardwareWriteMask);
+    GLINT_SLOW_WRITE_REG(0xffffffff,	FBSoftwareWriteMask);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	RasterizerMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	GLINTDepth);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBSourceOffset);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBPixelOffset);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LBSourceOffset);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	WindowOrigin);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	FBWindowBase);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	LBWindowBase);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	TextureAddressMode);
+    GLINT_SLOW_WRITE_REG(UNIT_DISABLE,	RouterMode);
+
+    pGlint->ROP = 0xFF;
+    pGlint->ClippingOn = FALSE;
+    pGlint->startxsub = 0;
+    pGlint->startxdom = 0;
+    pGlint->starty = 0;
+    pGlint->count = 0;
+    pGlint->dxdom = 0;
+    pGlint->dy = 1;
+    pGlint->planemask = 0;
+    GLINT_SLOW_WRITE_REG(0, StartXSub);
+    GLINT_SLOW_WRITE_REG(0, StartXDom);
+    GLINT_SLOW_WRITE_REG(0, StartY);
+    GLINT_SLOW_WRITE_REG(0, GLINTCount);
+    GLINT_SLOW_WRITE_REG(0, dXDom);
+    GLINT_SLOW_WRITE_REG(0, dXSub);
+    GLINT_SLOW_WRITE_REG(1<<16, dY);
+}
+
+Bool
+SXAccelInit(ScreenPtr pScreen)
+{
+    XAAInfoRecPtr infoPtr;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    long memory = pGlint->FbMapSize;
+    BoxRec AvailFBArea;
+
+    pGlint->AccelInfoRec = infoPtr = XAACreateInfoRec();
+    if (!infoPtr) return FALSE;
+
+    SXInitializeEngine(pScrn);
+
+    infoPtr->Flags = PIXMAP_CACHE |
+		     LINEAR_FRAMEBUFFER |
+		     OFFSCREEN_PIXMAPS;
+ 
+    infoPtr->Sync = SXSync;
+
+    infoPtr->SetClippingRectangle = SXSetClippingRectangle;
+    infoPtr->DisableClipping = SXDisableClipping;
+    infoPtr->ClippingFlags = HARDWARE_CLIP_MONO_8x8_FILL |
+			     HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY |
+			     HARDWARE_CLIP_SOLID_FILL;
+
+    infoPtr->SolidFillFlags = 0;
+    infoPtr->SetupForSolidFill = SXSetupForFillRectSolid;
+    infoPtr->SubsequentSolidFillRect = SXSubsequentFillRectSolid;
+
+    infoPtr->SolidLineFlags = 0;
+    infoPtr->PolySegmentThinSolidFlags = 0;
+    infoPtr->PolylinesThinSolidFlags = 0;
+    infoPtr->SetupForSolidLine = SXSetupForSolidLine;
+    infoPtr->SubsequentSolidHorVertLine = SXSubsequentHorVertLine;
+    infoPtr->SubsequentSolidBresenhamLine = 
+					SXSubsequentSolidBresenhamLine;
+    infoPtr->PolySegmentThinSolid = SXPolySegmentThinSolidWrapper;
+    infoPtr->PolylinesThinSolid = SXPolylinesThinSolidWrapper;
+
+    infoPtr->ScreenToScreenCopyFlags = NO_TRANSPARENCY |
+				       ONLY_LEFT_TO_RIGHT_BITBLT;
+    infoPtr->SetupForScreenToScreenCopy = SXSetupForScreenToScreenCopy;
+    infoPtr->SubsequentScreenToScreenCopy = SXSubsequentScreenToScreenCopy;
+
+    infoPtr->Mono8x8PatternFillFlags = HARDWARE_PATTERN_PROGRAMMED_ORIGIN |
+				       HARDWARE_PATTERN_SCREEN_ORIGIN |
+				       HARDWARE_PATTERN_PROGRAMMED_BITS;
+    infoPtr->SetupForMono8x8PatternFill = SXSetupForMono8x8PatternFill;
+    infoPtr->SubsequentMono8x8PatternFillRect = 
+					SXSubsequentMono8x8PatternFillRect;
+
+#if 0
+    if (!pGlint->UsePCIRetry) {
+        infoPtr->ScanlineCPUToScreenColorExpandFillFlags = 
+					       TRANSPARENCY_ONLY |
+					       BIT_ORDER_IN_BYTE_LSBFIRST;
+
+        pGlint->XAAScanlineColorExpandBuffers[0] =
+	    xnfalloc(((pScrn->virtualX + 63)/32) *4* (pScrn->bitsPerPixel / 8));
+    	pGlint->XAAScanlineColorExpandBuffers[1] =
+	    xnfalloc(((pScrn->virtualX + 63)/32) *4* (pScrn->bitsPerPixel / 8));
+
+        infoPtr->NumScanlineColorExpandBuffers = 2;
+    	infoPtr->ScanlineColorExpandBuffers = 
+					pGlint->XAAScanlineColorExpandBuffers;
+
+    	infoPtr->SetupForScanlineCPUToScreenColorExpandFill =
+				SXSetupForScanlineCPUToScreenColorExpandFill;
+    	infoPtr->SubsequentScanlineCPUToScreenColorExpandFill = 
+				SXSubsequentScanlineCPUToScreenColorExpandFill;
+    	infoPtr->SubsequentColorExpandScanline = 
+				SXSubsequentColorExpandScanline;
+    } else {
+        infoPtr->CPUToScreenColorExpandFillFlags = TRANSPARENCY_ONLY |
+					       SYNC_AFTER_COLOR_EXPAND |
+      					       CPU_TRANSFER_PAD_DWORD |
+      					       BIT_ORDER_IN_BYTE_LSBFIRST;
+        infoPtr->ColorExpandBase = pGlint->IOBase + OutputFIFO + 4;
+        infoPtr->SetupForCPUToScreenColorExpandFill =
+				SXSetupForCPUToScreenColorExpandFill;
+        infoPtr->SubsequentCPUToScreenColorExpandFill = 
+				SXSubsequentCPUToScreenColorExpandFill;
+    } 
+    infoPtr->WriteBitmap = SXWriteBitmap;
+    infoPtr->ColorExpandRange = MAX_FIFO_ENTRIES;
+
+    infoPtr->WritePixmap = SXWritePixmap;
+#endif
+
+    AvailFBArea.x1 = 0;
+    AvailFBArea.y1 = 0;
+    AvailFBArea.x2 = pScrn->displayWidth;
+    if (memory > (16383*1024)) memory = 16383*1024;
+    AvailFBArea.y2 = memory / (pScrn->displayWidth * 
+					  pScrn->bitsPerPixel / 8);
+
+    xf86InitFBManager(pScreen, &AvailFBArea);
+
+    return (XAAInit(pScreen, infoPtr));
+}
+
+static void SXLoadCoord(
+	ScrnInfoPtr pScrn,
+	int x, int y,
+	int w, int h,
+	int a, int d
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    
+    if (w != pGlint->startxsub) {
+    	GLINT_WRITE_REG(w<<16, StartXSub);
+	pGlint->startxsub = w;
+    }
+    if (x != pGlint->startxdom) {
+    	GLINT_WRITE_REG(x<<16,StartXDom);
+	pGlint->startxdom = x;
+    }
+    if (y != pGlint->starty) {
+    	GLINT_WRITE_REG(y<<16,StartY);
+	pGlint->starty = y;
+    }
+    if (h != pGlint->count) {
+    	GLINT_WRITE_REG(h,GLINTCount);
+	pGlint->count = h;
+    }
+    if (a != pGlint->dxdom) {
+    	GLINT_WRITE_REG(a<<16,dXDom);
+	pGlint->dxdom = a;
+    }
+    if (d != pGlint->dy) {
+    	GLINT_WRITE_REG(d<<16,dY);
+	pGlint->dy = d;
+    }
+}
+
+static void MoveDWORDS(
+   register CARD32* dest,
+   register CARD32* src,
+   register int dwords )
+{
+     while(dwords & ~0x03) {
+	*dest = *src;
+	*(dest + 1) = *(src + 1);
+	*(dest + 2) = *(src + 2);
+	*(dest + 3) = *(src + 3);
+	src += 4;
+	dest += 4;
+	dwords -= 4;
+     }	
+     if (!dwords) return;
+     *dest = *src;
+     if (dwords == 1) return;
+     *(dest + 1) = *(src + 1);
+     if (dwords == 2) return;
+     *(dest + 2) = *(src + 2);
+}
+
+static void
+SXSync(
+	ScrnInfoPtr pScrn
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    CARD32 readValue;
+
+    CHECKCLIPPING;
+
+    while (GLINT_READ_REG(DMACount) != 0);
+    GLINT_WAIT(3);
+    GLINT_WRITE_REG(0x400, FilterMode);
+    GLINT_WRITE_REG(0, GlintSync);
+    do {
+   	while(GLINT_READ_REG(OutFIFOWords) == 0);
+#define Sync_tag 0x188
+	readValue = GLINT_READ_REG(OutputFIFO);
+    } while (readValue != Sync_tag);
+}
+
+static void
+SXSetupForFillRectSolid(
+	ScrnInfoPtr pScrn, 
+	int color, int rop, 
+	unsigned int planemask
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    pGlint->ForeGroundColor = color;
+	
+    GLINT_WAIT(6);
+    REPLICATE(color);
+    DO_PLANEMASK(planemask);
+    if (pScrn->bitsPerPixel >= 24) {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+	GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+	GLINT_WRITE_REG(color, ConstantColor);
+	pGlint->FrameBufferReadMode = 0;
+    } else
+    if (rop == GXcopy) {
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+	GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+	GLINT_WRITE_REG(color, FBBlockColor);
+	pGlint->FrameBufferReadMode = FastFillEnable;
+    } else {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+	GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+	GLINT_WRITE_REG(color, ConstantColor);
+	pGlint->FrameBufferReadMode = 0;
+    }
+    LOADROP(rop);
+}
+
+static void
+SXSubsequentFillRectSolid(
+	ScrnInfoPtr pScrn, 
+	int x, int y, 
+	int w, int h
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    GLINT_WAIT(8);
+    SXLoadCoord(pScrn, x, y, x+w, h, 0, 1);
+    GLINT_WRITE_REG(PrimitiveTrapezoid | pGlint->FrameBufferReadMode,Render);
+}
+
+static void
+SXSetClippingRectangle(
+	ScrnInfoPtr pScrn, 	
+	int x1, int y1, 
+	int x2, int y2
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    GLINT_WAIT(5);
+    GLINT_WRITE_REG((y1&0xFFFF)<<16|(x1&0xFFFF), ScissorMinXY);
+    GLINT_WRITE_REG((y2&0xFFFF)<<16|(x2&0xFFFF), ScissorMaxXY);
+    GLINT_WRITE_REG(1, ScissorMode); /* Enable Scissor Mode */
+    pGlint->ClippingOn = TRUE;
+}
+
+static void
+SXDisableClipping(
+	ScrnInfoPtr pScrn
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    CHECKCLIPPING;
+}
+
+static void
+SXSetupForScreenToScreenCopy(
+	ScrnInfoPtr pScrn,
+	int xdir, int  ydir, 	
+	int rop,
+	unsigned int planemask, 
+	int transparency_color
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    
+    pGlint->BltScanDirection = ydir;
+
+    GLINT_WAIT(6);
+    DO_PLANEMASK(planemask);
+
+    if (rop == GXcopy) {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_SrcEnable, FBReadMode);
+    } else {
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_SrcEnable | FBRM_DstEnable, FBReadMode);
+    }
+    LOADROP(rop);
+}
+
+static void
+SXSubsequentScreenToScreenCopy(
+	ScrnInfoPtr pScrn, 
+	int x1, int y1, 
+	int x2, int y2,
+	int w, int h
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int srcaddr, dstaddr;
+
+    GLINT_WAIT(10);
+
+    srcaddr = y1 * pScrn->displayWidth + x1;
+    dstaddr = y2 * pScrn->displayWidth + x2;
+    GLINT_WRITE_REG(srcaddr - dstaddr, FBSourceOffset);
+
+    if (pGlint->BltScanDirection != 1) {
+	y1 += h - 1;
+	y2 += h - 1;
+        SXLoadCoord(pScrn, x2, y2, x2+w, h, 0, -1);
+    } else {
+        SXLoadCoord(pScrn, x2, y2, x2+w, h, 0, 1);
+    }	
+
+    GLINT_WRITE_REG(PrimitiveTrapezoid, Render);
+}
+
+static void
+SXSetupForScanlineCPUToScreenColorExpandFill(
+	ScrnInfoPtr pScrn,
+	int fg, int bg, 
+	int rop, 
+	unsigned int planemask
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    REPLICATE(fg);
+    REPLICATE(bg);
+    GLINT_WAIT(6);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG(0, RasterizerMode);
+    if (rop == GXcopy) {
+        GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+        GLINT_WRITE_REG(UNIT_DISABLE, PatternRamMode);
+        pGlint->FrameBufferReadMode = FastFillEnable;
+	GLINT_WRITE_REG(fg, FBBlockColor);
+    } else {
+        GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+        GLINT_WRITE_REG(UNIT_ENABLE, PatternRamMode);
+        pGlint->FrameBufferReadMode = FastFillEnable | SpanOperation;
+	GLINT_WRITE_REG(fg, PatternRamData0);
+    }
+    LOADROP(rop);
+}
+
+static void
+SXSubsequentScanlineCPUToScreenColorExpandFill(
+	ScrnInfoPtr pScrn,
+	int x, int y, int w, int h,
+	int skipleft
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    pGlint->dwords = ((w + 31) >> 5); /* dwords per scanline */
+
+    pGlint->cpucount = y;
+    pGlint->cpuheight = h;
+    GLINT_WAIT(6);
+    SXLoadCoord(pScrn, x, pGlint->cpucount, x+w, 1, 0, 1);
+}
+
+static void
+SXSubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno)
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    CARD32 *src;
+    int dwords = pGlint->dwords;
+
+    GLINT_WAIT(7);
+    SXLoadCoord(pScrn, pGlint->startxdom, pGlint->cpucount, pGlint->startxsub, 1, 0, 1);
+
+    GLINT_WRITE_REG(PrimitiveTrapezoid | pGlint->FrameBufferReadMode | SyncOnBitMask,
+							Render);
+
+    src = (CARD32*)pGlint->XAAScanlineColorExpandBuffers[bufno];
+    while (dwords >= infoRec->ColorExpandRange) {
+    	GLINT_WAIT(infoRec->ColorExpandRange);
+    	GLINT_WRITE_REG((infoRec->ColorExpandRange - 2)<<16 | 0x0D, OutputFIFO);
+    	MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4), src,
+		infoRec->ColorExpandRange - 1);
+    	dwords -= (infoRec->ColorExpandRange - 1);
+	src += (infoRec->ColorExpandRange - 1);
+    }
+    if (dwords) {
+    	GLINT_WAIT(dwords);
+    	GLINT_WRITE_REG((dwords - 1)<<16 | 0x0D, OutputFIFO);
+    	MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4), src,dwords);
+    }
+    pGlint->cpucount += 1;
+}
+
+static void
+SXSetupForCPUToScreenColorExpandFill(
+	ScrnInfoPtr pScrn,
+	int fg, int bg, 
+	int rop, 
+	unsigned int planemask
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    REPLICATE(fg);
+
+    DO_PLANEMASK(planemask);
+    if (rop == GXcopy) {
+        GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+        GLINT_WRITE_REG(UNIT_DISABLE, PatternRamMode);
+        GLINT_WRITE_REG(fg, FBBlockColor);
+        pGlint->FrameBufferReadMode = FastFillEnable;
+    } else {
+        GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+        GLINT_WRITE_REG(UNIT_ENABLE, PatternRamMode);
+        GLINT_WRITE_REG(fg, PatternRamData0);
+        pGlint->FrameBufferReadMode = FastFillEnable | SpanOperation;
+    }
+    LOADROP(rop);
+}
+
+static void
+SXSubsequentCPUToScreenColorExpandFill(
+	ScrnInfoPtr pScrn,
+	int x, int y, int w, int h,
+	int skipleft
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int dwords = ((w + 31) >> 5) * h;
+
+    SXLoadCoord(pScrn, x, y, x+w, h, 0, 1);
+    GLINT_WRITE_REG(PrimitiveTrapezoid | pGlint->FrameBufferReadMode | 
+							SyncOnBitMask, Render);
+    GLINT_WRITE_REG((dwords - 1)<<16 | 0x0D, OutputFIFO);
+}
+
+void SXSetupForMono8x8PatternFill(
+	ScrnInfoPtr pScrn,
+	int patternx, int patterny, 
+	int fg, int bg, int rop,
+	unsigned int planemask
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    if (bg == -1) pGlint->FrameBufferReadMode = -1;
+	else    pGlint->FrameBufferReadMode = 0;
+    pGlint->ForeGroundColor = fg;
+    pGlint->BackGroundColor = bg;
+    REPLICATE(pGlint->ForeGroundColor);
+    REPLICATE(pGlint->BackGroundColor);
+
+    GLINT_WAIT(13);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG((patternx & 0x000000FF),       AreaStipplePattern0);
+    GLINT_WRITE_REG((patternx & 0x0000FF00) >> 8,  AreaStipplePattern1);
+    GLINT_WRITE_REG((patternx & 0x00FF0000) >> 16, AreaStipplePattern2);
+    GLINT_WRITE_REG((patternx & 0xFF000000) >> 24, AreaStipplePattern3);
+    GLINT_WRITE_REG((patterny & 0x000000FF),       AreaStipplePattern4);
+    GLINT_WRITE_REG((patterny & 0x0000FF00) >> 8,  AreaStipplePattern5);
+    GLINT_WRITE_REG((patterny & 0x00FF0000) >> 16, AreaStipplePattern6);
+    GLINT_WRITE_REG((patterny & 0xFF000000) >> 24, AreaStipplePattern7);
+  
+    GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+    if (rop == GXcopy) 
+    	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    else
+    	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    LOADROP(rop);
+}
+
+static void 
+SXSubsequentMono8x8PatternFillRect(
+	ScrnInfoPtr pScrn, 
+	int patternx, int patterny, 
+	int x, int y,
+	int w, int h
+){
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int span = 0;
+  
+    GLINT_WAIT(12);
+    SXLoadCoord(pScrn, x, y, x+w, h, 0, 1);
+
+    if (pGlint->FrameBufferReadMode != -1) {
+  	GLINT_WRITE_REG(pGlint->BackGroundColor, ConstantColor);
+	GLINT_WRITE_REG(2<<1|2<<4|patternx<<7|patterny<<12|ASM_InvertPattern |
+					UNIT_ENABLE, AreaStippleMode);
+	GLINT_WRITE_REG(AreaStippleEnable | PrimitiveTrapezoid, Render);
+    }
+
+    GLINT_WRITE_REG(pGlint->ForeGroundColor, ConstantColor);
+    GLINT_WRITE_REG(2<<1|2<<4|patternx<<7|patterny<<12|
+  						UNIT_ENABLE, AreaStippleMode);
+    GLINT_WRITE_REG(AreaStippleEnable | PrimitiveTrapezoid, Render);
+}
+
+static void 
+SXWriteBitmap(ScrnInfoPtr pScrn,
+    int x, int y, int w, int h,
+    unsigned char *src,
+    int srcwidth,
+    int skipleft,
+    int fg, int bg,
+    int rop,
+    unsigned int planemask
+){
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    unsigned char *srcpntr;
+    int dwords, height, mode;
+    Bool SecondPass = FALSE;
+    register int count;
+    register CARD32* pattern;
+
+    w += skipleft;
+    x -= skipleft;
+    dwords = (w + 31) >> 5;
+
+    SXSetClippingRectangle(pScrn,x+skipleft, y, x+w, y+h);
+
+    GLINT_WAIT(11);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG(0, RasterizerMode);
+    LOADROP(rop);
+    if (rop == GXcopy) {
+	mode = FastFillEnable;
+	GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+	mode = 0;
+	GLINT_WRITE_REG(UNIT_ENABLE, ColorDDAMode);
+	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+    SXLoadCoord(pScrn, x, y, x+w, h, 0, 1);
+
+    if(bg == -1) {
+	/* >>>>> set fg <<<<<<<< */
+	REPLICATE(fg);
+	GLINT_WAIT(3);
+	if (rop == GXcopy) {
+	    GLINT_WRITE_REG(fg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(fg, PatternRamData0);
+	}
+    } else if(rop == GXcopy) {
+	REPLICATE(bg);
+	GLINT_WAIT(5);
+	if (rop == GXcopy) {
+	    GLINT_WRITE_REG(bg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(bg, PatternRamData0);
+	}
+	GLINT_WRITE_REG(PrimitiveTrapezoid |mode|FastFillEnable,Render);
+	REPLICATE(fg);
+	if (rop == GXcopy) {
+	    GLINT_WRITE_REG(fg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(fg, PatternRamData0);
+	}
+    } else {
+	SecondPass = TRUE;
+	REPLICATE(fg);
+	GLINT_WAIT(3);
+	if (rop == GXcopy) {
+	    GLINT_WRITE_REG(fg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(fg, PatternRamData0);
+	}
+    }
+
+SECOND_PASS:
+    GLINT_WRITE_REG(PrimitiveTrapezoid | FastFillEnable | mode | SyncOnBitMask, Render);
+    
+    height = h;
+    srcpntr = src;
+    while(height--) {
+	count = dwords >> 3;
+	pattern = (CARD32*)srcpntr;
+	while(count--) {
+		GLINT_WAIT(8);
+		GLINT_WRITE_REG(*(pattern), BitMaskPattern);
+		GLINT_WRITE_REG(*(pattern+1), BitMaskPattern);
+		GLINT_WRITE_REG(*(pattern+2), BitMaskPattern);
+		GLINT_WRITE_REG(*(pattern+3), BitMaskPattern);
+		GLINT_WRITE_REG(*(pattern+4), BitMaskPattern);
+		GLINT_WRITE_REG(*(pattern+5), BitMaskPattern);
+		GLINT_WRITE_REG(*(pattern+6), BitMaskPattern);
+		GLINT_WRITE_REG(*(pattern+7), BitMaskPattern);
+		pattern+=8;
+	}
+	count = dwords & 0x07;
+	GLINT_WAIT(count);
+	while (count--)
+		GLINT_WRITE_REG(*(pattern++), BitMaskPattern);
+	srcpntr += srcwidth;
+    }    
+
+    if(SecondPass) {
+	SecondPass = FALSE;
+	REPLICATE(bg);
+	GLINT_WAIT(4);
+	GLINT_WRITE_REG(InvertBitMask, RasterizerMode);
+	if (rop == GXcopy) {
+	    GLINT_WRITE_REG(bg, FBBlockColor);
+	} else {
+	    GLINT_WRITE_REG(bg, PatternRamData0);
+	}
+	goto SECOND_PASS;
+    }
+
+    GLINT_WAIT(2);
+    GLINT_WRITE_REG(0, RasterizerMode);
+    CHECKCLIPPING;
+    SET_SYNC_FLAG(infoRec);
+}
+
+static void 
+SXWritePixmap(
+   ScrnInfoPtr pScrn,
+   int x, int y, int w, int h,
+   unsigned char *src,	
+   int srcwidth,	/* bytes */
+   int rop,
+   unsigned int planemask,
+   int trans,
+   int bpp, int depth
+){
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    CARD32 *srcp;
+    int count,dwords, skipleft, Bpp = bpp >> 3; 
+
+    if((skipleft = (long)src & 0x03L)) {
+	skipleft /= Bpp;
+
+	x -= skipleft;	     
+	w += skipleft;
+	
+	src = (unsigned char*)((long)src & ~0x03L);     
+    }
+
+    switch(Bpp) {
+    case 1:	dwords = (w + 3) >> 2;
+		break;
+    case 2:	dwords = (w + 1) >> 1;
+		break;
+    case 4:	dwords = w;
+		break;
+    default: return; 
+    }
+
+    SXSetClippingRectangle(pScrn,x+skipleft, y, x+w, y+h);
+
+    GLINT_WAIT(12);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+    if (rop == GXcopy) {
+        GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+        GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+    LOADROP(rop);
+    SXLoadCoord(pScrn, x, y, x+w, h, 0, 1);
+    GLINT_WRITE_REG(PrimitiveTrapezoid | SyncOnHostData, Render);
+
+    while(h--) {
+      count = dwords;
+      srcp = (CARD32*)src;
+      while(count >= infoRec->ColorExpandRange) {
+	GLINT_WAIT(infoRec->ColorExpandRange);
+	/* (0x0f << 4) | 0x0e is the TAG for GLINTColor */
+       	GLINT_WRITE_REG(((infoRec->ColorExpandRange - 2) << 16) | (0x0F << 4) | 
+				0x0E, OutputFIFO);
+	MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+ 		(CARD32*)srcp, infoRec->ColorExpandRange - 1);
+	count -= infoRec->ColorExpandRange - 1;
+	srcp += infoRec->ColorExpandRange - 1;
+      }
+      if(count) {
+	GLINT_WAIT(count);
+	/* (0x0F << 4) | 0x0E is the TAG for GLINTColor */
+       	GLINT_WRITE_REG(((count - 1) << 16) | (0x0f << 4) | 
+				0x0e, OutputFIFO);
+	MoveDWORDS((CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+ 		(CARD32*)srcp, count);
+      }
+      src += srcwidth;
+    }  
+    CHECKCLIPPING;
+    SET_SYNC_FLAG(infoRec);
+}
+
+static void 
+SXPolylinesThinSolidWrapper(
+   DrawablePtr     pDraw,
+   GCPtr           pGC,
+   int             mode,
+   int             npt,
+   DDXPointPtr     pPts
+){
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    GLINTPtr pGlint = GLINTPTR(infoRec->pScrn);
+    pGlint->CurrentGC = pGC;
+    pGlint->CurrentDrawable = pDraw;
+    if(infoRec->NeedToSync) (*infoRec->Sync)(infoRec->pScrn);
+    XAAPolyLines(pDraw, pGC, mode, npt, pPts);
+}
+
+static void 
+SXPolySegmentThinSolidWrapper(
+   DrawablePtr     pDraw,
+   GCPtr           pGC,
+   int             nseg,
+   xSegment        *pSeg
+){
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    GLINTPtr pGlint = GLINTPTR(infoRec->pScrn);
+    pGlint->CurrentGC = pGC;
+    pGlint->CurrentDrawable = pDraw;
+    if(infoRec->NeedToSync) (*infoRec->Sync)(infoRec->pScrn);
+    XAAPolySegment(pDraw, pGC, nseg, pSeg);
+}
+
+static void
+SXSetupForSolidLine(ScrnInfoPtr pScrn, int color,
+					 int rop, unsigned int planemask)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+
+    GLINT_WAIT(7);
+    DO_PLANEMASK(planemask);
+    GLINT_WRITE_REG(color, GLINTColor);
+    GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+    if (rop == GXcopy) {
+  	GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+    } else {
+  	GLINT_WRITE_REG(pGlint->pprod | FBRM_DstEnable, FBReadMode);
+    }
+    LOADROP(rop);
+}
+
+static void
+SXSubsequentHorVertLine(ScrnInfoPtr pScrn,int x,int y,int len,int dir)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+  
+    GLINT_WAIT(9);
+    if (dir == DEGREES_0) {
+        SXLoadCoord(pScrn, x, y, 0, len, 1, 0);
+    } else {
+        SXLoadCoord(pScrn, x, y, 0, len, 0, 1);
+    }
+
+    GLINT_WRITE_REG(PrimitiveLine, Render);
+}
+
+static void 
+SXSubsequentSolidBresenhamLine( ScrnInfoPtr pScrn,
+        int x, int y, int dmaj, int dmin, int e, int len, int octant)
+{
+    GLINTPtr pGlint = GLINTPTR(pScrn);
+    int dxdom, dy;
+
+    if(dmaj == dmin) {
+	GLINT_WAIT(9);
+	if(octant & YDECREASING) {
+	    dy = -1;
+	} else {
+	    dy = 1;
+	}
+
+	if(octant & XDECREASING) {
+	    dxdom = -1;
+	} else {
+	    dxdom = 1;
+	}
+
+        SXLoadCoord(pScrn, x, y, 0, len, dxdom, dy);
+	GLINT_WRITE_REG(PrimitiveLine, Render);
+	return;
+    }
+
+    fbBres(pGlint->CurrentDrawable, pGlint->CurrentGC, 0,
+                (octant & XDECREASING) ? -1 : 1, 
+                (octant & YDECREASING) ? -1 : 1, 
+                (octant & YMAJOR) ? Y_AXIS : X_AXIS,
+                x, y, dmin + e, dmin, -dmaj, len);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c:1.19 xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c:1.22
--- xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c:1.19	Thu Jan 20 17:12:18 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c	Wed May 10 13:01:32 2000
@@ -28,7 +28,7 @@
  * 
  * GLINT 500TX / MX accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.19 2000/01/21 01:12:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.22 2000/05/10 20:01:32 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -209,8 +209,11 @@
     infoPtr->PolylinesThinSolidFlags = 0;
     infoPtr->SetupForSolidLine = TXSetupForSolidLine;
     infoPtr->SubsequentSolidHorVertLine = TXSubsequentHorVertLine;
-    infoPtr->SubsequentSolidBresenhamLine = 
+    if (!(pScrn->overlayFlags & OVERLAY_8_32_PLANAR))
+    {
+        infoPtr->SubsequentSolidBresenhamLine = 
 					TXSubsequentSolidBresenhamLine;
+    }
     infoPtr->PolySegmentThinSolid = TXPolySegmentThinSolidWrapper;
     infoPtr->PolylinesThinSolid = TXPolylinesThinSolidWrapper;
 
@@ -282,6 +285,7 @@
 ){
     GLINTPtr pGlint = GLINTPTR(pScrn);
     
+#ifndef XF86DRI
     if (w != pGlint->startxsub) {
     	GLINT_WRITE_REG(w<<16, StartXSub);
 	pGlint->startxsub = w;
@@ -306,6 +310,20 @@
     	GLINT_WRITE_REG(d<<16,dY);
 	pGlint->dy = d;
     }
+#else
+    	GLINT_WRITE_REG(w<<16, StartXSub);
+	pGlint->startxsub = w;
+    	GLINT_WRITE_REG(x<<16,StartXDom);
+	pGlint->startxdom = x;
+    	GLINT_WRITE_REG(y<<16,StartY);
+	pGlint->starty = y;
+    	GLINT_WRITE_REG(h,GLINTCount);
+	pGlint->count = h;
+    	GLINT_WRITE_REG(a<<16,dXDom);
+	pGlint->dxdom = a;
+    	GLINT_WRITE_REG(d<<16,dY);
+	pGlint->dy = d;
+#endif
 }
 
 static void MoveDWORDS(
Index: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c:1.8 xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c:1.8	Sun Mar 28 07:32:39 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c	Wed May 10 11:55:30 2000
@@ -27,7 +27,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.8 1999/03/28 15:32:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.10 2000/05/10 18:55:30 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -37,6 +37,7 @@
 #include "xf86Pci.h"
 
 #include "IBM.h"
+#include "TI.h"
 #include "glint_regs.h"
 #include "glint.h"
 
@@ -46,7 +47,8 @@
     GLINTPtr pGlint = GLINTPTR(pScrn);
     int logbytesperaccess;
 
-    if (pGlint->RamDac->RamDacType == (IBM640_RAMDAC))
+    if ( (pGlint->RamDac->RamDacType == (IBM640_RAMDAC)) ||
+         (pGlint->RamDac->RamDacType == (TI3030_RAMDAC)) )
     	logbytesperaccess = 4;
     else
     	logbytesperaccess = 3;
@@ -91,11 +93,14 @@
     pReg->glintRegs[Aperture1 >> 3] = 0;
 
     if (pGlint->UsePCIRetry) {
-	pReg->glintRegs[DFIFODis >> 3] = 1;
-	pReg->glintRegs[FIFODis >> 3] = 3;
+	pReg->glintRegs[DFIFODis >> 3] = GLINT_READ_REG(DFIFODis) | 0x01;
+    	if (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)
+	    pReg->glintRegs[FIFODis >> 3] = GLINT_READ_REG(FIFODis) | 0x01;
+	else
+	    pReg->glintRegs[FIFODis >> 3] = GLINT_READ_REG(FIFODis) | 0x03;
     } else {
-	pReg->glintRegs[DFIFODis >> 3] = 0;
-	pReg->glintRegs[FIFODis >> 3] = 1;
+	pReg->glintRegs[DFIFODis >> 3] = GLINT_READ_REG(DFIFODis) & 0xFFFFFFFE;
+	pReg->glintRegs[FIFODis >> 3] = GLINT_READ_REG(FIFODis) | 0x01;
     }
 
     temp1 = mode->CrtcHSyncStart - mode->CrtcHDisplay;
@@ -124,7 +129,7 @@
      * tell DAC to use the ICD chip clock 0 as ref clock 
      * and set up some more video timining generator registers
      */
-    pReg->glintRegs[VTGSerialClk >> 3] = 0x05; 
+    pReg->glintRegs[VTGSerialClk >> 3] = 0x05;
 
     /* This is ugly */
     if (pGlint->UseFireGL3000) {
@@ -141,6 +146,21 @@
 	pReg->glintRegs[VTGModeCtl >> 3] = 0x44;
     }
 
+    /* Override FBModeSel for 300SX chip */
+    if (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) {
+	switch (pScrn->bitsPerPixel) {
+	    case 8:
+		pReg->glintRegs[FBModeSel >> 3] = 0x905;
+		break;
+	    case 16:
+		pReg->glintRegs[FBModeSel >> 3] = 0x903;
+		break;
+	    case 32:
+		pReg->glintRegs[FBModeSel >> 3] = 0x901;
+		break;
+	}
+    }
+
     switch (pGlint->RamDac->RamDacType) {
     case IBM526DB_RAMDAC:
     case IBM526_RAMDAC:
@@ -208,6 +228,49 @@
     ramdacReg->DacRegs[RGB640_VRAM_MASK2] = 0x0F; 
     
     pReg->glintRegs[VTGModeCtl >> 3] = 0x04;
+    break;
+
+    case TI3026_RAMDAC:
+    case TI3030_RAMDAC:
+    {
+	/* Get the programmable clock values */
+	unsigned long m=0,n=0,p=0;
+	unsigned long clock;
+	int count;
+	unsigned long q, status, VCO;
+
+	clock = TIramdacCalculateMNPForClock(pGlint->RefClock, 
+		mode->Clock, 1, pGlint->MinClock, pGlint->MaxClock, &m, &n, &p);
+
+	ramdacReg->DacRegs[TIDAC_PIXEL_N] = ((n & 0x3f) | 0xC0);
+	ramdacReg->DacRegs[TIDAC_PIXEL_M] =  (m & 0x3f)        ;
+	ramdacReg->DacRegs[TIDAC_PIXEL_P] = ((p & 0x03) | 0xbc);
+	ramdacReg->DacRegs[TIDAC_PIXEL_VALID] = TRUE;
+
+    	if (pGlint->RamDac->RamDacType == (TI3026_RAMDAC))
+            n = 65 - ((64 << 2) / pScrn->bitsPerPixel);
+	else
+            n = 65 - ((128 << 2) / pScrn->bitsPerPixel);
+	m = 61;
+	p = 0;
+	for (q = 0; q < 8; q++) {
+	    if (q > 0) p = 3;
+	    for ( ; p < 4; p++) {
+		VCO = ((clock * (q + 1) * (65 - m)) / (65 - n)) << (p + 1);
+		if (VCO >= 110000) { break; }
+	    }
+	    if (VCO >= 110000) { break; }
+	}
+	ramdacReg->DacRegs[TIDAC_clock_ctrl] = (q | 0x38);
+
+	ramdacReg->DacRegs[TIDAC_LOOP_N] = ((n & 0x3f) | 0xC0);
+	ramdacReg->DacRegs[TIDAC_LOOP_M] =  (m & 0x3f)        ;
+	ramdacReg->DacRegs[TIDAC_LOOP_P] = ((p & 0x03) | 0xF0);
+	ramdacReg->DacRegs[TIDAC_LOOP_VALID] = TRUE;
+    }
+    if (pGlint->RamDac->RamDacType == (TI3030_RAMDAC))
+    	pReg->glintRegs[VTGModeCtl >> 3] = 0x04;
+    break;
     }
 
     /* Now use helper routines to setup bpp for this driver */
@@ -224,8 +287,14 @@
     glintReg->glintRegs[Aperture0 >> 3]  = GLINT_READ_REG(Aperture0);
     glintReg->glintRegs[Aperture1 >> 3]  = GLINT_READ_REG(Aperture1);
 
-    glintReg->glintRegs[DFIFODis >> 3]  = GLINT_READ_REG(DFIFODis);
-    glintReg->glintRegs[FIFODis >> 3]  = GLINT_READ_REG(FIFODis);
+    if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) ||
+    	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA))
+    	glintReg->glintRegs[DFIFODis >> 3]  = GLINT_READ_REG(DFIFODis);
+
+    if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_300SX) {
+    	glintReg->glintRegs[FIFODis >> 3]  = GLINT_READ_REG(FIFODis);
+    	glintReg->glintRegs[VTGModeCtl >> 3] = GLINT_READ_REG(VTGModeCtl);
+    }
 
     glintReg->glintRegs[VClkCtl >> 3] = GLINT_READ_REG(VClkCtl);
     glintReg->glintRegs[VTGPolarity >> 3] = GLINT_READ_REG(VTGPolarity);
@@ -241,7 +310,6 @@
     glintReg->glintRegs[VTGVGateEnd >> 3] = GLINT_READ_REG(VTGVGateEnd);
     glintReg->glintRegs[VTGSerialClk >> 3] = GLINT_READ_REG(VTGSerialClk);
     glintReg->glintRegs[FBModeSel >> 3] = GLINT_READ_REG(FBModeSel);
-    glintReg->glintRegs[VTGModeCtl >> 3] = GLINT_READ_REG(VTGModeCtl);
     glintReg->glintRegs[VTGHGateStart >> 3] = GLINT_READ_REG(VTGHGateStart);
     glintReg->glintRegs[VTGHGateEnd >> 3] = GLINT_READ_REG(VTGHGateEnd);
 }
@@ -251,23 +319,21 @@
 {
     GLINTPtr pGlint = GLINTPTR(pScrn);
 
-#if 1
-    GLINT_SLOW_WRITE_REG(0, ResetStatus);
-    while(GLINT_READ_REG(ResetStatus) != 0) {
-	xf86MsgVerb(X_INFO, 2, "Resetting Engine - Please Wait.\n");
-    };
-#endif
-
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[Aperture0 >> 3], Aperture0);
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[Aperture1 >> 3], Aperture1);
 
-    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[DFIFODis >> 3], DFIFODis);
-    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[FIFODis >> 3], FIFODis);
+    if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) ||
+    	(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA))
+    	GLINT_SLOW_WRITE_REG(glintReg->glintRegs[DFIFODis >> 3], DFIFODis);
+
+    if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_300SX) {
+    	GLINT_SLOW_WRITE_REG(glintReg->glintRegs[FIFODis >> 3], FIFODis);
+    	GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VTGModeCtl >> 3], VTGModeCtl);
+    }
 
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VTGPolarity >> 3], VTGPolarity);
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VClkCtl >> 3], VClkCtl);
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VTGSerialClk >> 3], VTGSerialClk);
-    GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VTGModeCtl >> 3], VTGModeCtl);
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VTGHLimit >> 3], VTGHLimit);
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VTGHSyncStart >> 3],VTGHSyncStart);
     GLINT_SLOW_WRITE_REG(glintReg->glintRegs[VTGHSyncEnd >> 3], VTGHSyncEnd);
Index: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/i740/i740.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/i740/i740.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/i740/i740.cpp:1.1	Thu Mar  2 17:05:38 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i740/i740.cpp	Tue Jun 13 19:13:10 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.cpp,v 1.1 2000/03/03 01:05:38 dawes Exp $ 
-.TH I740 __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.cpp,v 1.4 2000/06/14 02:13:10 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH I740 __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 i740 \- Intel i740 video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""i740"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qi740\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B i740
 is an XFree86 driver for Intel i740 video cards.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c:1.3 xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c:1.3	Tue Feb 22 20:47:13 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c	Wed Apr  5 11:13:47 2000
@@ -25,7 +25,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c,v 1.3 2000/02/23 04:47:13 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c,v 1.4 2000/04/05 18:13:47 dawes Exp $ */
 
 /*
  * Authors:
@@ -33,7 +33,9 @@
  *
  */
 
+#if 0
 #include <math.h>
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c:1.18 xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c:1.21
--- xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c:1.18	Mon Mar  6 15:54:09 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c	Wed Jun 21 10:28:07 2000
@@ -25,7 +25,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c,v 1.18 2000/03/06 23:54:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c,v 1.21 2000/06/21 17:28:07 dawes Exp $ */
 
 /*
  * Authors:
@@ -361,7 +361,6 @@
   int i, numUsed, numDevSections, *usedChips;
   GDevPtr *devSections = NULL;
   Bool foundScreen = FALSE;
-  EntityInfoPtr pEnt;
 
   /*
    Find the config file Device sections that match this
@@ -384,37 +383,31 @@
 				  drv, &usedChips);
 
   if (numUsed > 0) {
-   if (flags & PROBE_DETECT)
-    foundScreen = TRUE;
-   else for (i=0; i<numUsed; i++) {
-    pEnt = xf86GetEntityInfo(usedChips[i]);
-
-    if (pEnt->active) {
-      ScrnInfoPtr pScrn;
-
-      /* Allocate new ScrnInfoRec and claim the slot */
-      pScrn = xf86AllocateScreen(drv, 0);
-
-      pScrn->driverVersion = VERSION;
-      pScrn->driverName = I740_DRIVER_NAME;
-      pScrn->name = I740_NAME;
-      pScrn->Probe = I740Probe;
-      pScrn->PreInit = I740PreInit;
-      pScrn->ScreenInit = I740ScreenInit;
-      pScrn->SwitchMode = I740SwitchMode;
-      pScrn->AdjustFrame = I740AdjustFrame;
-      pScrn->EnterVT = I740EnterVT;
-      pScrn->LeaveVT = I740LeaveVT;
-      pScrn->FreeScreen = I740FreeScreen;
-      pScrn->ValidMode = I740ValidMode;
-      foundScreen = TRUE;
-
-      xf86ConfigActivePciEntity(pScrn, usedChips[i], I740PciChipsets, 0, 0, 0, 0, 0);
-    }
-    xfree(pEnt);
-   }
-   xfree(usedChips);
+      if (flags & PROBE_DETECT)
+	  foundScreen = TRUE;
+      else for (i=0; i<numUsed; i++) {
+	  ScrnInfoPtr pScrn = NULL;
+	  /* Allocate new ScrnInfoRec and claim the slot */
+	  if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
+						 I740PciChipsets, 0, 0, 0, 0, 0))) {
+	      pScrn->driverVersion = VERSION;
+	      pScrn->driverName = I740_DRIVER_NAME;
+	      pScrn->name = I740_NAME;
+	      pScrn->Probe = I740Probe;
+	      pScrn->PreInit = I740PreInit;
+	      pScrn->ScreenInit = I740ScreenInit;
+	      pScrn->SwitchMode = I740SwitchMode;
+	      pScrn->AdjustFrame = I740AdjustFrame;
+	      pScrn->EnterVT = I740EnterVT;
+	      pScrn->LeaveVT = I740LeaveVT;
+	      pScrn->FreeScreen = I740FreeScreen;
+	      pScrn->ValidMode = I740ValidMode;
+	      foundScreen = TRUE;
+	      
+	  }
+      }
   }
+  
 
   /* Look for Real3D based chips */
   numUsed = xf86MatchPciInstances(I740_NAME, PCI_VENDOR_REAL3D,
@@ -423,53 +416,42 @@
 				  drv, &usedChips);
 
   if (numUsed > 0) {
-   if (flags & PROBE_DETECT)
-    foundScreen = TRUE;
-   else for (i=0; i<numUsed; i++) {
-    pEnt = xf86GetEntityInfo(usedChips[i]);
-
-    if (pEnt->active) {
-      ScrnInfoPtr pScrn;
-
-      /* Allocate new ScrnInfoRec and claim the slot */
-      pScrn = xf86AllocateScreen(drv, 0);
-	
-      pScrn->driverVersion = VERSION;
-      pScrn->driverName = I740_DRIVER_NAME;
-      pScrn->name = I740_NAME;
-      pScrn->Probe = I740Probe;
-      pScrn->PreInit = I740PreInit;
-      pScrn->ScreenInit = I740ScreenInit;
-      pScrn->SwitchMode = I740SwitchMode;
-      pScrn->AdjustFrame = I740AdjustFrame;
-      pScrn->EnterVT = I740EnterVT;
-      pScrn->LeaveVT = I740LeaveVT;
-      pScrn->FreeScreen = I740FreeScreen;
-      pScrn->ValidMode = I740ValidMode;
-      foundScreen = TRUE;
-	
-      xf86ConfigActivePciEntity(pScrn, usedChips[i], I740PciChipsets, 0, 0, 0, 0, 0);
-    }
-    xfree(pEnt);
-   }
-   xfree(usedChips);
+      if (flags & PROBE_DETECT)
+	  foundScreen = TRUE;
+      else for (i=0; i<numUsed; i++) {
+	  ScrnInfoPtr pScrn = NULL;
+	  if ((pScrn  = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
+						  I740PciChipsets, 0, 0, 0, 0, 0))) {
+	      pScrn->driverVersion = VERSION;
+	      pScrn->driverName = I740_DRIVER_NAME;
+	      pScrn->name = I740_NAME;
+	      pScrn->Probe = I740Probe;
+	      pScrn->PreInit = I740PreInit;
+	      pScrn->ScreenInit = I740ScreenInit;
+	      pScrn->SwitchMode = I740SwitchMode;
+	      pScrn->AdjustFrame = I740AdjustFrame;
+	      pScrn->EnterVT = I740EnterVT;
+	      pScrn->LeaveVT = I740LeaveVT;
+	      pScrn->FreeScreen = I740FreeScreen;
+	      pScrn->ValidMode = I740ValidMode;
+	      foundScreen = TRUE;
+	  }
+      }
   }
-
+  
   if (devSections)
-    xfree(devSections);
-
+      xfree(devSections);
+  
   return foundScreen;
 }
 
-extern xf86MonPtr ConfiguredMonitor;
-
 void
 I740ProbeDDC(ScrnInfoPtr pScrn, int index)
 {
     vbeInfoPtr pVbe;
     if (xf86LoadSubModule(pScrn, "vbe")) {
 	pVbe = VBEInit(NULL,index);
-	ConfiguredMonitor = vbeDoEDID(pVbe);
+	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
     }
 }
 
@@ -738,7 +720,7 @@
       pI740->MaxClock = 86000;
     }
   }
-  clockRanges = xnfalloc(sizeof(ClockRange));
+  clockRanges = xnfcalloc(sizeof(ClockRange), 1);
   clockRanges->next=NULL;
   clockRanges->minClock= 12000; /* !!! What's the min clock? !!! */
   clockRanges->maxClock=pI740->MaxClock;
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile:1.4 xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile:1.4	Thu Mar  2 17:05:38 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile	Fri Jun 30 10:15:11 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile,v 1.4 2000/03/03 01:05:38 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile,v 1.9 2000/06/30 17:15:11 dawes Exp $
 XCOMM
 XCOMM This is the Imakefile for the i810 driver.  
 XCOMM 
@@ -6,23 +6,19 @@
 #define IHaveModules
 #include <Server.tmpl>
 
-#
-# Uncomment these to build with DRI support when available
-#
-#undef BuildXF86DRI
 #if BuildXF86DRI
-DRISRCS = i810_dri.c i810_drm.c
-DRIOBJS = i810_dri.o i810_drm.o
+DRISRCS = i810_dri.c
+DRIOBJS = i810_dri.o
 DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri \
-	-I$(XF86OSSRC)/linux/drm/kernel
+	-I$(XF86OSSRC)/linux/drm/kernel -I$(TOP)/include
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 
 SRCS = 	i810_driver.c i810_cursor.c i810_accel.c i810_io.c	\
-	i810_memory.c i810_wmark.c $(DRISRCS)
+	i810_memory.c i810_wmark.c i810_dga.c $(DRISRCS)
 
 OBJS = 	i810_driver.o i810_cursor.o i810_accel.o i810_io.o	\
-	i810_memory.o i810_wmark.o $(DRIOBJS)
+	i810_memory.o i810_wmark.o i810_dga.o $(DRIOBJS)
 
 #if defined(XF86DriverSDK)
 INCLUDES = -I. -I../../include
@@ -32,7 +28,7 @@
 	   -I$(XF86SRC)/xaa -I$(XF86SRC)/rac				\
            -I$(SERVERSRC)/cfb -I$(XF86SRC)/xaa -I$(XF86SRC)/ramdac	\
 	   -I$(XF86SRC)/vgahw -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c		\
-	   -I$(SERVERSRC)/Xext						\
+	   -I$(SERVERSRC)/Xext -I$(XF86SRC)/xf24_32bpp			\
            -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC)	\
 	   -I$(EXTINCSRC)						\
 	   $(DRIINCLUDES)
@@ -61,13 +57,12 @@
 InstallDriverSDKNonExecFile(i810_accel.c,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i810_cursor.c,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i810_driver.c,$(DRIVERSDKDIR)/drivers/i810)
+InstallDriverSDKNonExecFile(i810_dga.c,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i810_dri.c,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i810_dri.h,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_dripriv.h,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i810_io.c,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i810_memory.c,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i810_wmark.c,$(DRIVERSDKDIR)/drivers/i810)
-InstallDriverSDKNonExecFile(i810_macros.h,$(DRIVERSDKDIR)/drivers/i810)
 InstallDriverSDKNonExecFile(i810_reg.h,$(DRIVERSDKDIR)/drivers/i810)
 
 InstallDriverSDKObjectModule(i810,$(DRIVERSDKMODULEDIR),drivers)
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/i810/i810.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810.cpp:1.1	Thu Mar  2 17:05:39 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810.cpp	Tue Jun 13 19:13:10 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.cpp,v 1.1 2000/03/03 01:05:39 dawes Exp $ 
-.TH I810 __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.cpp,v 1.4 2000/06/14 02:13:10 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH I810 __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 i810 \- Intel i810 video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""i810"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qi810\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B i810
 is an XFree86 driver for Intel i810 video cards.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h:1.4 xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h:1.4	Thu Mar  2 08:07:48 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h	Thu Jun 22 10:44:03 2000
@@ -25,7 +25,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.4 2000/03/02 16:07:48 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.9 2000/06/22 17:44:03 alanh Exp $ */
 
 /*
  * Authors:
@@ -36,16 +36,13 @@
 #ifndef _I810_H_
 #define _I810_H_
 
-
+#include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "i810_reg.h"
 #include "xaa.h"
 #include "xf86Cursor.h"
 
-#undef XF86DRI
-
-
 #ifdef XF86DRI
 #include "xf86drm.h"
 #include "sarea.h"
@@ -57,15 +54,22 @@
 #endif
 
 
+#define I810_VERSION 4000
+#define I810_NAME "I810"
+#define I810_DRIVER_NAME "i810"
+#define I810_MAJOR_VERSION 1
+#define I810_MINOR_VERSION 0
+#define I810_PATCHLEVEL 0
+
 /* Globals */
 
 typedef struct _I810Rec *I810Ptr;
 
-typedef void (*I810WriteIndexedByteFunc)(I810Ptr pI810, int addr, 
-					 char index, char value);
-typedef char (*I810ReadIndexedByteFunc)(I810Ptr pI810, int addr, char index);
-typedef void (*I810WriteByteFunc)(I810Ptr pI810, int addr, char value);
-typedef char (*I810ReadByteFunc)(I810Ptr pI810, int addr);
+typedef void  (*I810WriteIndexedByteFunc)(I810Ptr pI810, int addr, 
+					  CARD8 index, CARD8 value);
+typedef CARD8 (*I810ReadIndexedByteFunc)(I810Ptr pI810, int addr, CARD8 index);
+typedef void  (*I810WriteByteFunc)(I810Ptr pI810, int addr, CARD8 value);
+typedef CARD8 (*I810ReadByteFunc)(I810Ptr pI810, int addr);
 
 
 extern void I810SetTiledMemory(ScrnInfoPtr pScrn, 
@@ -86,7 +90,7 @@
 typedef struct {
    int tail_mask;
    I810MemRange mem;
-   char *virtual_start;
+   unsigned char *virtual_start;
    int head;
    int tail;
    int space;
@@ -147,6 +151,11 @@
    int CursorPhysical;
    int CursorStart;
 
+   DGAModePtr DGAModes;
+   int numDGAModes;
+   Bool DGAactive;
+   int DGAViewportStatus;
+
    int Chipset;
    int LinearAddr;
    int MMIOAddr;
@@ -211,8 +220,8 @@
 extern Bool I810DRIScreenInit(ScreenPtr pScreen);
 extern void I810DRICloseScreen(ScreenPtr pScreen);
 extern Bool I810DRIFinishScreenInit(ScreenPtr pScreen);
-extern Bool I810drmInitDma(ScrnInfoPtr pScrn);
-extern Bool I810drmCleanupDma(ScrnInfoPtr pScrn);
+extern Bool I810InitDma(ScrnInfoPtr pScrn);
+extern Bool I810CleanupDma(ScrnInfoPtr pScrn);
 
 #define I810PTR(p) ((I810Ptr)((p)->driverPrivate))
 #define I810REGPTR(p) (&(I810PTR(p)->ModeReg))
@@ -236,8 +245,9 @@
 
 extern int I810AllocateGARTMemory( ScrnInfoPtr pScrn );
 extern void I810FreeGARTMemory( ScrnInfoPtr pScrn );
-
 
+extern Bool I810SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+extern void I810AdjustFrame(int scrnIndex, int x, int y, int flags);
 
 extern void I810SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, 
 					   int ydir, int rop,
@@ -276,7 +286,7 @@
 
 #define BEGIN_LP_RING(n)						\
    unsigned int outring, ringmask;					\
-   volatile char *virt;							\
+   volatile unsigned char *virt;							\
    if (n>2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) I810Sync( pScrn );	\
    if (pI810->LpRing.space < n*4) I810WaitLpRing( pScrn, n*4, 0);	\
    pI810->LpRing.space -= n*4;						\
@@ -332,6 +342,25 @@
 /* Size of the mmio region.
  */
 #define I810_REG_SIZE 0x80000
+
+
+#ifndef PCI_CHIP_I810
+#define PCI_CHIP_I810              0x7121
+#define PCI_CHIP_I810_DC100        0x7123
+#define PCI_CHIP_I810_E            0x7125 
+#define PCI_CHIP_I815              0x1132 
+#define PCI_CHIP_I810_BRIDGE       0x7120
+#define PCI_CHIP_I810_DC100_BRIDGE 0x7122
+#define PCI_CHIP_I810_E_BRIDGE     0x7124
+#define PCI_CHIP_I815_BRIDGE       0x1130
+#endif
+
+
+#define IS_I810(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I810 ||	\
+			pI810->PciInfo->chipType == PCI_CHIP_I810_DC100 || \
+			pI810->PciInfo->chipType == PCI_CHIP_I810_E)
+#define IS_I815(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I815)
+
 
 #endif
   
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c:1.3 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c:1.3	Thu Mar  2 08:07:49 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c	Sat Jun 17 11:23:23 2000
@@ -25,6 +25,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v 1.5 2000/06/17 18:23:23 dawes Exp $ */
 
 /*
  * Authors:
@@ -271,6 +272,7 @@
 	    DRICloseScreen(screenInfo.screens[pScrn->scrnIndex]);
 	 }
 #endif
+ 	 pI810->AccelInfoRec = NULL; /* Stops recursive behavior */
 	 FatalError("lockup\n"); 
       }
 
@@ -301,13 +303,9 @@
 #ifdef XF86DRI
    /* VT switching tries to do this.  
     */
-   if (!pI810->LockHeld) {
+   if (!pI810->LockHeld && pI810->directRenderingEnabled) {
       return;   
    }
-
-
-/*     if (pI810->directRenderingEnabled)  */
-/*        DRIUnlockLockQueiscent( pScrn->pScreen ); */
 #endif
 
    /* Send a flush instruction and then wait till the ring is empty.
@@ -634,13 +632,14 @@
    pI810->AccelInfoRec->NeedToSync = TRUE;
 }
 
-
 
+/* Emit on gaining VT?
+ */
 void 
 I810EmitInvarientState(ScrnInfoPtr pScrn)
 {
    I810Ptr pI810 = I810PTR(pScrn);
-   BEGIN_LP_RING( 8 );
+   BEGIN_LP_RING( 10 );
 
    OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
    OUT_RING( GFX_CMD_CONTEXT_SEL | CS_UPDATE_USE | CS_USE_CTX0 );
@@ -657,6 +656,9 @@
              0);
    OUT_RING( 0 );
    OUT_RING( 0 );
+
+/*     OUT_RING( CMD_OP_Z_BUFFER_INFO ); */
+/*     OUT_RING( pI810->DepthBuffer.Start | pI810->auxPitchBits); */
 
    ADVANCE_LP_RING();      
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c:1.1
--- /dev/null	Sat Jul  1 20:42:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c	Thu Jun 22 10:44:03 2000
@@ -0,0 +1,292 @@
+/*
+ * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c,v 1.1 2000/06/22 17:44:03 alanh Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Pci.h"
+#include "xf86PciInfo.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "i810.h"
+#include "i810_reg.h"
+#include "dgaproc.h"
+
+static Bool I810_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+					int *, int *, int *);
+static Bool I810_SetMode(ScrnInfoPtr, DGAModePtr);
+static void I810_Sync(ScrnInfoPtr);
+static int  I810_GetViewport(ScrnInfoPtr);
+static void I810_SetViewport(ScrnInfoPtr, int, int, int);
+static void I810_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+static void I810_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+static void I810_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, 
+					unsigned long);
+
+static
+DGAFunctionRec I810DGAFuncs = {
+   I810_OpenFramebuffer,
+   NULL,
+   I810_SetMode,
+   I810_SetViewport,
+   I810_GetViewport,
+   I810_Sync,
+   I810_FillRect,
+   I810_BlitRect,
+#if 0
+   I810_BlitTransRect
+#else
+   NULL
+#endif
+};
+
+Bool
+I810DGAInit(ScreenPtr pScreen)
+{   
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   I810Ptr pI810 = I810PTR(pScrn);
+   DGAModePtr modes = NULL, newmodes = NULL, currentMode;
+   DisplayModePtr pMode, firstMode;
+   int Bpp = pScrn->bitsPerPixel >> 3;
+   int num = 0;
+   Bool oneMore;
+
+   pMode = firstMode = pScrn->modes;
+
+   while(pMode) {
+
+	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
+	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+	    oneMore = TRUE;
+	} else {
+	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+	    oneMore = FALSE;
+	}
+
+	if(!newmodes) {
+	   xfree(modes);
+	   return FALSE;
+	}
+	modes = newmodes;
+
+SECOND_PASS:
+
+	currentMode = modes + num;
+	num++;
+
+	currentMode->mode = pMode;
+	currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
+	currentMode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
+	if(pMode->Flags & V_DBLSCAN)
+	   currentMode->flags |= DGA_DOUBLESCAN;
+	if(pMode->Flags & V_INTERLACE)
+	   currentMode->flags |= DGA_INTERLACED;
+	currentMode->byteOrder = pScrn->imageByteOrder;
+	currentMode->depth = pScrn->depth;
+	currentMode->bitsPerPixel = pScrn->bitsPerPixel;
+	currentMode->red_mask = pScrn->mask.red;
+	currentMode->green_mask = pScrn->mask.green;
+	currentMode->blue_mask = pScrn->mask.blue;
+	currentMode->visualClass = (Bpp == 1) ? PseudoColor : TrueColor;
+	currentMode->viewportWidth = pMode->HDisplay;
+	currentMode->viewportHeight = pMode->VDisplay;
+	currentMode->xViewportStep = 1;
+	currentMode->yViewportStep = 1;
+	currentMode->viewportFlags = DGA_FLIP_RETRACE;
+	currentMode->offset = 0;
+	currentMode->address = pI810->FbBase;
+
+	if(oneMore) { /* first one is narrow width */
+	    currentMode->bytesPerScanline = ((pMode->HDisplay * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pMode->HDisplay;
+	    currentMode->imageHeight =  pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	    oneMore = FALSE;
+	    goto SECOND_PASS;
+	} else {
+	    currentMode->bytesPerScanline = 
+			((pScrn->displayWidth * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pScrn->displayWidth;
+	    currentMode->imageHeight =  pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	}	    
+
+	pMode = pMode->next;
+	if(pMode == firstMode)
+	   break;
+   }
+
+   pI810->numDGAModes = num;
+   pI810->DGAModes = modes;
+
+   return DGAInit(pScreen, &I810DGAFuncs, modes, num);  
+}
+
+
+static Bool
+I810_SetMode(
+   ScrnInfoPtr pScrn,
+   DGAModePtr pMode
+){
+   static int OldDisplayWidth[MAXSCREENS];
+   int index = pScrn->pScreen->myNum;
+   I810Ptr pI810 = I810PTR(pScrn);
+
+   if(!pMode) { /* restore the original mode */
+	/* put the ScreenParameters back */
+	
+	pScrn->displayWidth = OldDisplayWidth[index];
+	
+        I810SwitchMode(index, pScrn->currentMode, 0);
+	pI810->DGAactive = FALSE;
+   } else {
+	if(!pI810->DGAactive) {  /* save the old parameters */
+	    OldDisplayWidth[index] = pScrn->displayWidth;
+
+	    pI810->DGAactive = TRUE;
+	}
+
+	pScrn->displayWidth = pMode->bytesPerScanline / 
+			      (pMode->bitsPerPixel >> 3);
+
+        I810SwitchMode(index, pMode->mode, 0);
+   }
+   
+   return TRUE;
+}
+
+static int  
+I810_GetViewport(
+  ScrnInfoPtr pScrn
+){
+    I810Ptr pI810 = I810PTR(pScrn);
+
+    return pI810->DGAViewportStatus;
+}
+
+static void 
+I810_SetViewport(
+   ScrnInfoPtr pScrn, 
+   int x, int y, 
+   int flags
+){
+   I810Ptr pI810 = I810PTR(pScrn);
+
+   I810AdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+   pI810->DGAViewportStatus = 0;  /* I810AdjustFrame loops until finished */
+}
+
+static void 
+I810_FillRect (
+   ScrnInfoPtr pScrn, 
+   int x, int y, int w, int h, 
+   unsigned long color
+){
+    I810Ptr pI810 = I810PTR(pScrn);
+
+    if(pI810->AccelInfoRec) {
+	(*pI810->AccelInfoRec->SetupForSolidFill)(pScrn, color, GXcopy, ~0);
+	(*pI810->AccelInfoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
+	SET_SYNC_FLAG(pI810->AccelInfoRec);
+    }
+}
+
+static void 
+I810_Sync(
+   ScrnInfoPtr pScrn
+){
+    I810Ptr pI810 = I810PTR(pScrn);
+
+    if(pI810->AccelInfoRec) {
+	(*pI810->AccelInfoRec->Sync)(pScrn);
+    }
+}
+
+static void 
+I810_BlitRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty
+){
+    I810Ptr pI810 = I810PTR(pScrn);
+
+    if(pI810->AccelInfoRec) {
+	int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
+	int ydir = (srcy < dsty) ? -1 : 1;
+
+	(*pI810->AccelInfoRec->SetupForScreenToScreenCopy)(
+		pScrn, xdir, ydir, GXcopy, ~0, -1);
+	(*pI810->AccelInfoRec->SubsequentScreenToScreenCopy)(
+		pScrn, srcx, srcy, dstx, dsty, w, h);
+	SET_SYNC_FLAG(pI810->AccelInfoRec);
+    }
+}
+
+
+static void 
+I810_BlitTransRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty,
+   unsigned long color
+){
+  /* this one should be separate since the XAA function would
+     prohibit usage of ~0 as the key */
+}
+
+
+static Bool 
+I810_OpenFramebuffer(
+   ScrnInfoPtr pScrn, 
+   char **name,
+   unsigned char **mem,
+   int *size,
+   int *offset,
+   int *flags
+){
+    I810Ptr pI810 = I810PTR(pScrn);
+
+    *name = NULL; 		/* no special device */
+    *mem = (unsigned char*)pI810->LinearAddr;
+    *size = pI810->FbMapSize;
+    *offset = 0;
+    *flags = DGA_NEED_ROOT;
+
+    return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c:1.2	Thu Mar  2 08:07:49 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c	Fri Jun 23 16:43:44 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v 1.2 2000/03/02 16:07:49 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v 1.6 2000/06/23 23:43:44 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -20,10 +20,6 @@
 #include "i810.h"
 #include "i810_dri.h"
 
-#include "xf86drm.h"
-#include "dristruct.h"
-
-
 static char I810KernelDriverName[] = "i810";
 static char I810ClientDriverName[] = "i810";
 
@@ -62,6 +58,44 @@
     0
 };
 
+Bool I810CleanupDma(ScrnInfoPtr pScrn)
+{
+   I810Ptr pI810 = I810PTR(pScrn);
+   Bool ret_val;
+   
+   ret_val = drmI810CleanupDma(pI810->drmSubFD);
+   if (ret_val == FALSE)
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I810 Dma Cleanup Failed\n");
+   return ret_val;
+}
+
+Bool I810InitDma(ScrnInfoPtr pScrn)
+{
+   I810Ptr pI810 = I810PTR(pScrn);
+   I810RingBuffer *ring = &(pI810->LpRing);
+   drmI810Init info;
+   Bool ret_val;
+   
+   info.start = ring->mem.Start;
+   info.end = ring->mem.End; 
+   info.size = ring->mem.Size;
+   info.ring_map_idx = 6; 
+   info.buffer_map_idx = 5; 
+   info.sarea_off = sizeof(XF86DRISAREARec);
+
+   info.front_offset = 0;
+   info.back_offset = pI810->BackBuffer.Start;
+   info.depth_offset = pI810->DepthBuffer.Start;
+   info.w = pScrn->virtualX;
+   info.h = pScrn->virtualY;
+   info.pitch = pI810->auxPitch;
+   info.pitch_bits = pI810->auxPitchBits;
+
+   ret_val = drmI810InitDma(pI810->drmSubFD, &info);
+   if(ret_val == FALSE) ErrorF("I810 Dma Initialization Failed\n");
+   return ret_val;
+}
+
 static Bool
 I810InitVisualConfigs(ScreenPtr pScreen)
 {
@@ -71,6 +105,7 @@
    __GLXvisualConfig *pConfigs = 0;
    I810ConfigPrivPtr pI810Configs = 0;
    I810ConfigPrivPtr *pI810ConfigPtrs = 0;
+   int accum, stencil, db, depth;
    int i;
 
    switch (pScrn->bitsPerPixel) {
@@ -79,25 +114,20 @@
    case 32:
       break;
    case 16:
-      numConfigs = 4;
+      numConfigs = 8;
 
-      if (!(pConfigs = (__GLXvisualConfig*)xnfcalloc(sizeof(__GLXvisualConfig),
-						     numConfigs))) {
+      pConfigs = (__GLXvisualConfig *) xnfcalloc(sizeof(__GLXvisualConfig), numConfigs);
+      if (!pConfigs)
 	 return FALSE;
-      }
 
-      if (!(pI810Configs = 
-	    (I810ConfigPrivPtr)xnfcalloc(sizeof(I810ConfigPrivRec),
-					 numConfigs))) 
-      {
+      pI810Configs = (I810ConfigPrivPtr) xnfcalloc(sizeof(I810ConfigPrivRec), numConfigs);
+      if (!pI810Configs) {
 	 xfree(pConfigs);
 	 return FALSE;
       }
 
-      if (!(pI810ConfigPtrs = 
-	    (I810ConfigPrivPtr*)xnfcalloc(sizeof(I810ConfigPrivPtr),
-					  numConfigs))) 
-      {
+      pI810ConfigPtrs = (I810ConfigPrivPtr *) xnfcalloc(sizeof(I810ConfigPrivPtr), numConfigs);
+      if (!pI810ConfigPtrs) {
 	 xfree(pConfigs);
 	 xfree(pI810Configs);
 	 return FALSE;
@@ -106,126 +136,61 @@
       for (i=0; i<numConfigs; i++) 
 	 pI810ConfigPtrs[i] = &pI810Configs[i];
 
-      /* config 0: db=FALSE, depth=0
-	 config 1: db=FALSE, depth=16
-	 config 2: db=TRUE, depth=0;
-	 config 3: db=TRUE, depth=16
-      */
-      pConfigs[0].vid = -1;
-      pConfigs[0].class = -1;
-      pConfigs[0].rgba = TRUE;
-      pConfigs[0].redSize = 5;
-      pConfigs[0].greenSize = 6;
-      pConfigs[0].blueSize = 5;
-      pConfigs[0].redMask = 0x0000F800;
-      pConfigs[0].greenMask = 0x000007E0;
-      pConfigs[0].blueMask = 0x0000001F;
-      pConfigs[0].alphaMask = 0;
-      pConfigs[0].accumRedSize = 0;
-      pConfigs[0].accumGreenSize = 0;
-      pConfigs[0].accumBlueSize = 0;
-      pConfigs[0].accumAlphaSize = 0;
-      pConfigs[0].doubleBuffer = FALSE;
-      pConfigs[0].stereo = FALSE;
-      pConfigs[0].bufferSize = 16;
-      pConfigs[0].depthSize = 16;
-      pConfigs[0].stencilSize = 0;
-      pConfigs[0].auxBuffers = 0;
-      pConfigs[0].level = 0;
-      pConfigs[0].visualRating = 0;
-      pConfigs[0].transparentPixel = 0;
-      pConfigs[0].transparentRed = 0;
-      pConfigs[0].transparentGreen = 0;
-      pConfigs[0].transparentBlue = 0;
-      pConfigs[0].transparentAlpha = 0;
-      pConfigs[0].transparentIndex = 0;
-
-      pConfigs[1].vid = -1;
-      pConfigs[1].class = -1;
-      pConfigs[1].rgba = TRUE;
-      pConfigs[1].redSize = 5;
-      pConfigs[1].greenSize = 6;
-      pConfigs[1].blueSize = 5;
-      pConfigs[1].redMask = 0x0000F800;
-      pConfigs[1].greenMask = 0x000007E0;
-      pConfigs[1].blueMask = 0x0000001F;
-      pConfigs[1].alphaMask = 0;
-      pConfigs[1].accumRedSize = 0;
-      pConfigs[1].accumGreenSize = 0;
-      pConfigs[1].accumBlueSize = 0;
-      pConfigs[1].accumAlphaSize = 0;
-      pConfigs[1].doubleBuffer = FALSE;
-      pConfigs[1].stereo = FALSE;
-      pConfigs[1].bufferSize = 16;
-      pConfigs[1].depthSize = 16;
-      pConfigs[1].stencilSize = 0;
-      pConfigs[1].auxBuffers = 0;
-      pConfigs[1].level = 0;
-      pConfigs[1].visualRating = 0;
-      pConfigs[1].transparentPixel = 0;
-      pConfigs[1].transparentRed = 0;
-      pConfigs[1].transparentGreen = 0;
-      pConfigs[1].transparentBlue = 0;
-      pConfigs[1].transparentAlpha = 0;
-      pConfigs[1].transparentIndex = 0;
-
-      pConfigs[2].vid = -1;
-      pConfigs[2].class = -1;
-      pConfigs[2].rgba = TRUE;
-      pConfigs[2].redSize = 5;
-      pConfigs[2].greenSize = 6;
-      pConfigs[2].blueSize = 5;
-      pConfigs[2].redMask = 0x0000F800;
-      pConfigs[2].greenMask = 0x000007E0;
-      pConfigs[2].blueMask = 0x0000001F;
-      pConfigs[2].alphaMask = 0;
-      pConfigs[2].accumRedSize = 0;
-      pConfigs[2].accumGreenSize = 0;
-      pConfigs[2].accumBlueSize = 0;
-      pConfigs[2].accumAlphaSize = 0;
-      pConfigs[2].doubleBuffer = TRUE;
-      pConfigs[2].stereo = FALSE;
-      pConfigs[2].bufferSize = 16;
-      pConfigs[2].depthSize = 16;
-      pConfigs[2].stencilSize = 0;
-      pConfigs[2].auxBuffers = 0;
-      pConfigs[2].level = 0;
-      pConfigs[2].visualRating = 0;
-      pConfigs[2].transparentPixel = 0;
-      pConfigs[2].transparentRed = 0;
-      pConfigs[2].transparentGreen = 0;
-      pConfigs[2].transparentBlue = 0;
-      pConfigs[2].transparentAlpha = 0;
-      pConfigs[2].transparentIndex = 0;
-
-      pConfigs[3].vid = -1;
-      pConfigs[3].class = -1;
-      pConfigs[3].rgba = TRUE;
-      pConfigs[3].redSize = 5;
-      pConfigs[3].greenSize = 6;
-      pConfigs[3].blueSize = 5;
-      pConfigs[3].redMask = 0x0000F800;
-      pConfigs[3].greenMask = 0x000007E0;
-      pConfigs[3].blueMask = 0x0000001F;
-      pConfigs[3].alphaMask = 0;
-      pConfigs[3].accumRedSize = 0;
-      pConfigs[3].accumGreenSize = 0;
-      pConfigs[3].accumBlueSize = 0;
-      pConfigs[3].accumAlphaSize = 0;
-      pConfigs[3].doubleBuffer = TRUE;
-      pConfigs[3].stereo = FALSE;
-      pConfigs[3].bufferSize = 16;
-      pConfigs[3].depthSize = 16;
-      pConfigs[3].stencilSize = 0;
-      pConfigs[3].auxBuffers = 0;
-      pConfigs[3].level = 0;
-      pConfigs[3].visualRating = 0;
-      pConfigs[3].transparentPixel = 0;
-      pConfigs[3].transparentRed = 0;
-      pConfigs[3].transparentGreen = 0;
-      pConfigs[3].transparentBlue = 0;
-      pConfigs[3].transparentAlpha = 0;
-      pConfigs[3].transparentIndex = 0;
+      i = 0;
+      depth = 1;
+      for (accum = 0; accum <= 1; accum++) {
+         for (stencil = 0; stencil <= 1; stencil++) {
+            for (db = 0; db <= 1; db++) {
+               pConfigs[i].vid = -1;
+               pConfigs[i].class = -1;
+               pConfigs[i].rgba = TRUE;
+               pConfigs[i].redSize = 5;
+               pConfigs[i].greenSize = 6;
+               pConfigs[i].blueSize = 5;
+               pConfigs[i].redMask = 0x0000F800;
+               pConfigs[i].greenMask = 0x000007E0;
+               pConfigs[i].blueMask = 0x0000001F;
+               pConfigs[i].alphaMask = 0;
+               if (accum) {
+                  pConfigs[i].accumRedSize = 16;
+                  pConfigs[i].accumGreenSize = 16;
+                  pConfigs[i].accumBlueSize = 16;
+                  pConfigs[i].accumAlphaSize = 16;
+               }
+               else {
+                  pConfigs[i].accumRedSize = 0;
+                  pConfigs[i].accumGreenSize = 0;
+                  pConfigs[i].accumBlueSize = 0;
+                  pConfigs[i].accumAlphaSize = 0;
+               }
+               pConfigs[i].doubleBuffer = db ? TRUE : FALSE;
+               pConfigs[i].stereo = FALSE;
+               pConfigs[i].bufferSize = 16;
+               if (depth)
+                  pConfigs[i].depthSize = 16;
+               else
+                  pConfigs[i].depthSize = 0;
+               if (stencil)
+                  pConfigs[i].stencilSize = 8;
+               else 
+                  pConfigs[i].stencilSize = 0;
+               pConfigs[i].auxBuffers = 0;
+               pConfigs[i].level = 0;
+               if (stencil)
+                  pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+               else
+                  pConfigs[i].visualRating = GLX_NONE_EXT;
+               pConfigs[i].transparentPixel = 0;
+               pConfigs[i].transparentRed = 0;
+               pConfigs[i].transparentGreen = 0;
+               pConfigs[i].transparentBlue = 0;
+               pConfigs[i].transparentAlpha = 0;
+               pConfigs[i].transparentIndex = 0;
+               i++;
+            }
+         }
+      }
+      assert(i == numConfigs);
       break;
    }
    pI810->numVisualConfigs = numConfigs;
@@ -260,12 +225,36 @@
    int width = pScrn->displayWidth * pI810->cpp;
    int i;
    
-   /* ToDo : save agpHandles? */
+   /* Hardware 3D rendering only implemented for 16bpp */
+   if (pScrn->bitsPerPixel != 16)
+      return FALSE;
 
+   /* Check that the GLX, DRI, and DRM modules have been loaded by testing
+    * for known symbols in each module. */
+   if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
+   if (!xf86LoaderCheckSymbol("DRIScreenInit"))       return FALSE;
+   if (!xf86LoaderCheckSymbol("drmAvailable"))        return FALSE;
+   if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "TDFXDRIScreenInit failed (libdri.a too old)\n");
+      return FALSE;
+   }
    
+   /* Check the DRI version */
+   {
+      int major, minor, patch;
+      DRIQueryVersion(&major, &minor, &patch);
+      if (major != 3 || minor != 0 || patch < 0) {
+         xf86DrvMsg(pScreen->myNum, X_ERROR,
+                    "I810DRIScreenInit failed (DRI version = %d.%d.%d, expected 3.0.x).  Disabling DRI.\n",
+                    major, minor, patch);
+         return FALSE;
+      }
+   }
+
    pDRIInfo = DRICreateInfoRec();
    if (!pDRIInfo) {
-      ErrorF("DRICreateInfoRec failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "DRICreateInfoRec failed\n");
       return FALSE;
    }
 
@@ -279,13 +268,14 @@
    pDRIInfo->drmDriverName = I810KernelDriverName;
    pDRIInfo->clientDriverName = I810ClientDriverName;
    pDRIInfo->busIdString = xalloc(64);
+
    sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
 	   ((pciConfigPtr)pI810->PciInfo->thisCard)->busnum,
 	   ((pciConfigPtr)pI810->PciInfo->thisCard)->devnum,
 	   ((pciConfigPtr)pI810->PciInfo->thisCard)->funcnum);
-   pDRIInfo->ddxDriverMajorVersion = 0;
-   pDRIInfo->ddxDriverMinorVersion = 1;
-   pDRIInfo->ddxDriverPatchVersion = 0;
+   pDRIInfo->ddxDriverMajorVersion = I810_MAJOR_VERSION;
+   pDRIInfo->ddxDriverMinorVersion = I810_MINOR_VERSION;
+   pDRIInfo->ddxDriverPatchVersion = I810_PATCHLEVEL;
    pDRIInfo->frameBufferPhysicalAddress = pI810->LinearAddr;
    pDRIInfo->frameBufferSize = (((pScrn->displayWidth * 
 				  pScrn->virtualY * pI810->cpp) + 
@@ -302,8 +292,8 @@
    /* For now the mapping works by using a fixed size defined
     * in the SAREA header
     */
-   if (sizeof(XF86DRISAREARec)+sizeof(drm_i810_sarea_t)>SAREA_MAX) {
-      ErrorF("Data does not fit in SAREA\n");
+   if (sizeof(XF86DRISAREARec)+sizeof(I810SAREARec)>SAREA_MAX) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "Data does not fit in SAREA\n");
       return FALSE;
    }
    pDRIInfo->SAREASize = SAREA_MAX;
@@ -329,7 +319,7 @@
     * to allocate it.  Scary stuff, hold on...
     */
    if (!DRIScreenInit(pScreen, pDRIInfo, &pI810->drmSubFD)) {
-      ErrorF("DRIScreenInit failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "DRIScreenInit failed\n");
       xfree(pDRIInfo->devPrivate);
       pDRIInfo->devPrivate=0;
       DRIDestroyInfoRec(pI810->pDRIInfo);
@@ -337,10 +327,31 @@
       return FALSE;
    }
    
+   /* Check the i810 DRM version */
+   {
+      drmVersionPtr version = drmGetVersion(pI810->drmSubFD);
+      if (version) {
+         if (version->version_major != 1 ||
+             version->version_minor != 0 ||
+             version->version_patchlevel < 0) {
+            /* incompatible drm version */
+            xf86DrvMsg(pScreen->myNum, X_ERROR,
+                       "I810DRIScreenInit failed (DRM version = %d.%d.%d, expected 1.0.x).  Disabling DRI.\n",
+                       version->version_major,
+                       version->version_minor,
+                       version->version_patchlevel);
+            I810DRICloseScreen(pScreen);
+            drmFreeVersion(version);
+            return FALSE;
+         }
+         drmFreeVersion(version);
+      }
+   }
+
    pI810DRI->regsSize=I810_REG_SIZE;
    if (drmAddMap(pI810->drmSubFD, (drmHandle)pI810->MMIOAddr, 
 		 pI810DRI->regsSize, DRM_REGISTERS, 0, &pI810DRI->regs)<0) {
-      ErrorF("drmAddMap(regs) failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap(regs) failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
@@ -357,30 +368,30 @@
    /* Agp Support - Need this just to get the framebuffer.
     */
    if(drmAgpAcquire(pI810->drmSubFD) < 0) {
-      ErrorF("drmAgpAquire failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAgpAquire failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
    pI810->agpAcquired = TRUE;
    
    if (drmAgpEnable(pI810->drmSubFD, 0) < 0) {
-      ErrorF("drmAgpEnable failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAgpEnable failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
 
-   xf86memset (&pI810->DcacheMem, 0, sizeof(I810MemRange));
-   xf86memset (&pI810->BackBuffer, 0, sizeof(I810MemRange));
-   xf86memset (&pI810->DepthBuffer, 0, sizeof(I810MemRange));
+   memset (&pI810->DcacheMem, 0, sizeof(I810MemRange));
+   memset (&pI810->BackBuffer, 0, sizeof(I810MemRange));
+   memset (&pI810->DepthBuffer, 0, sizeof(I810MemRange));
    pI810->CursorPhysical = 0;
    
    /* Dcache - half the speed of normal ram, but has use as a Z buffer
     * under the DRI.  
     */
 
-   dcacheHandle = drmAgpAlloc(pI810->drmSubFD, 4096 * 1024, 1, NULL);
+   drmAgpAlloc(pI810->drmSubFD, 4096 * 1024, 1, NULL, &dcacheHandle);
    pI810->dcacheHandle = dcacheHandle;
-
+   xf86DrvMsg(pScreen->myNum, X_INFO, "dcacheHandle : %p\n", dcacheHandle);
    
 #define Elements(x) sizeof(x)/sizeof(*x)
    for (pitch_idx = 0 ; pitch_idx < Elements(i810_pitches) ; pitch_idx++) 
@@ -394,31 +405,37 @@
       return FALSE;
    }
    else {
-      back_size = i810_pitches[pitch_idx] * pScrn->virtualY;
+      back_size = i810_pitches[pitch_idx] * (pScrn->virtualY + 4);
       back_size = ((back_size + 4096 - 1) / 4096) * 4096;
    }
    
    sysmem_size = pScrn->videoRam * 1024;
-   if(dcacheHandle != 0) {
-      if(back_size > 4*1024*1024) {
-	 ErrorF("Backsize is larger then 4 meg\n");
+   if (dcacheHandle != 0) {
+      if (back_size > 4*1024*1024) {
+	 xf86DrvMsg(pScreen->myNum, X_INFO, "Backsize is larger then 4 meg\n");
 	 sysmem_size = sysmem_size - 2*back_size;
 	 drmAgpFree(pI810->drmSubFD, dcacheHandle);
 	 pI810->dcacheHandle = dcacheHandle = 0;
-      } else {
+      }
+      else {
 	 sysmem_size = sysmem_size - back_size;
       }
-   } else {
+   }
+   else {
       sysmem_size = sysmem_size - 2*back_size;
    }
-   
-   sysmem_size -= 4096;
-   if(sysmem_size > ((48*1024*1024) - 1) ) {
-      sysmem_size = (48*1024*1024) - (2*4096);
-      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "User requested more memory then fits in the agp aperture\n"
+
+   if(sysmem_size > 48*1024*1024) {
+      sysmem_size = 48*1024*1024;
+
+      xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
+		 "User requested more memory then fits in the agp aperture\n"
 		 "Truncating to %d bytes of memory\n",
 		 sysmem_size);
    }
+
+   sysmem_size -= 4096;		/* remove 4k for the hw cursor */
+
    pI810->SysMem.Start = 0;
    pI810->SysMem.Size = sysmem_size;
    pI810->SysMem.End = sysmem_size;
@@ -428,9 +445,8 @@
 
    if (dcacheHandle != 0) {
       /* The Z buffer is always aligned to the 48 mb mark in the aperture */
-
       if(drmAgpBind(pI810->drmSubFD, dcacheHandle, 48*1024*1024) == 0) {
-	 xf86memset (&pI810->DcacheMem, 0, sizeof(I810MemRange));
+	 memset (&pI810->DcacheMem, 0, sizeof(I810MemRange));
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
 		    "GART: Found 4096K Z buffer memory\n");
 	 pI810->DcacheMem.Start = 48*1024*1024;
@@ -454,10 +470,10 @@
       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "GART: no dcache memory found\n");
    }
 
-   agpHandle = drmAgpAlloc(pI810->drmSubFD, back_size, 0, NULL);
+   drmAgpAlloc(pI810->drmSubFD, back_size, 0, NULL, &agpHandle);
    pI810->backHandle = agpHandle;
    
-   if(agpHandle != 0) {
+   if (agpHandle != 0) {
       /* The backbuffer is always aligned to the 56 mb mark in the aperture */
       if(drmAgpBind(pI810->drmSubFD, agpHandle, 56*1024*1024) == 0) {
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -481,8 +497,8 @@
       
    if(dcacheHandle == 0) {
       /* The Z buffer is always aligned to the 48 mb mark in the aperture */
-      agpHandle = drmAgpAlloc(pI810->drmSubFD, back_size, 0,
-			      NULL);
+      drmAgpAlloc(pI810->drmSubFD, back_size, 0,
+		  NULL, &agpHandle);
       pI810->zHandle = agpHandle;
 
       if(agpHandle != 0) {
@@ -509,43 +525,43 @@
    /* Now allocate and bind the agp space.  This memory will include the
     * regular framebuffer as well as texture memory.
     */
-   
-   agpHandle = drmAgpAlloc(pI810->drmSubFD, sysmem_size, 0, NULL);
-   if(agpHandle == 0) {
-      ErrorF("drmAgpAlloc failed\n");
+   drmAgpAlloc(pI810->drmSubFD, sysmem_size, 0, NULL, &agpHandle);
+   if (agpHandle == 0) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAgpAlloc failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
    pI810->sysmemHandle = agpHandle;
 
-   if(drmAgpBind(pI810->drmSubFD, agpHandle, 0) != 0) {
-      ErrorF("drmAgpBind failed\n");
+   if (drmAgpBind(pI810->drmSubFD, agpHandle, 0) != 0) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAgpBind failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
    
-   agpHandle = drmAgpAlloc(pI810->drmSubFD, 4096, 2, 
-			   (unsigned long *)&pI810->CursorPhysical); 
+   drmAgpAlloc(pI810->drmSubFD, 4096, 2, 
+	       (unsigned long *)&pI810->CursorPhysical, &agpHandle); 
    pI810->cursorHandle = agpHandle;
 
    if (agpHandle != 0) {
       tom = sysmem_size;
 
-      if(drmAgpBind(pI810->drmSubFD, agpHandle, tom) == 0) { 
+      if (drmAgpBind(pI810->drmSubFD, agpHandle, tom) == 0) { 
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
 		    "GART: Allocated 4K for mouse cursor image\n");
 	 pI810->CursorStart = tom;	 
 	 tom += 4096;
-      } else {
+      }
+      else {
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO, "GART: cursor bind failed\n");
 	 pI810->CursorPhysical = 0;    
       } 
-   } else {
+   }
+   else {
       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "GART: cursor alloc failed\n");
       pI810->CursorPhysical = 0;
    }
 
-         
    I810SetTiledMemory(pScrn, 1,
 		      pI810->DepthBuffer.Start,
 		      i810_pitches[pitch_idx],
@@ -558,14 +574,13 @@
    
    pI810->auxPitch = i810_pitches[pitch_idx];
    pI810->auxPitchBits = i810_pitch_flags[pitch_idx];
-   
    pI810->SavedDcacheMem = pI810->DcacheMem;
-   
    pI810DRI->backbufferSize = pI810->BackBuffer.Size;
+
    if (drmAddMap(pI810->drmSubFD, (drmHandle)pI810->BackBuffer.Start,
 		 pI810->BackBuffer.Size, DRM_AGP, 0, 
 		 &pI810DRI->backbuffer) < 0) {
-      ErrorF("drmAddMap(backbuffer) failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap(backbuffer) failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
@@ -574,7 +589,7 @@
    if (drmAddMap(pI810->drmSubFD, (drmHandle)pI810->DepthBuffer.Start,
 		 pI810->DepthBuffer.Size, DRM_AGP, 0, 
 		 &pI810DRI->depthbuffer) < 0) {
-      ErrorF("drmAddMap(depthbuffer) failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap(depthbuffer) failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
@@ -585,11 +600,22 @@
    /* Allocate buffer memory */
    I810AllocHigh( &(pI810->BufferMem), &(pI810->SysMem), 
 		  I810_DMA_BUF_NR * I810_DMA_BUF_SZ);
+   
+   xf86DrvMsg(pScreen->myNum, X_INFO, "Buffer map : %lx\n",
+              pI810->BufferMem.Start);
    
-   if(drmAddMap(pI810->drmSubFD, (drmHandle)pI810->BufferMem.Start,
+   if (pI810->BufferMem.Start == 0 || 
+      pI810->BufferMem.End - pI810->BufferMem.Start > 
+      I810_DMA_BUF_NR * I810_DMA_BUF_SZ) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "Not enough memory for dma buffers\n");
+      DRICloseScreen(pScreen);
+      return FALSE;
+   }
+   if (drmAddMap(pI810->drmSubFD, (drmHandle)pI810->BufferMem.Start,
 		pI810->BufferMem.Size, DRM_AGP, 0,
 		&pI810->buffer_map) < 0) {
-      ErrorF("drmAddMap(buffer_map) failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap(buffer_map) failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
@@ -600,7 +626,7 @@
    if (drmAddMap(pI810->drmSubFD, (drmHandle)pI810->LpRing.mem.Start,
 		 pI810->LpRing.mem.Size, DRM_AGP, 0,
 		 &pI810->ring_map) < 0) {
-      ErrorF("drmAddMap(ring_map) failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap(ring_map) failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
@@ -608,7 +634,6 @@
    /* Use the rest of memory for textures. */
    pI810DRI->textureSize = pI810->SysMem.Size;
 
-
    i = mylog2(pI810DRI->textureSize / I810_NR_TEX_REGIONS);
 
    if (i < I810_LOG_MIN_TEX_REGION_SIZE)
@@ -617,20 +642,19 @@
    pI810DRI->logTextureGranularity = i;
    pI810DRI->textureSize = (pI810DRI->textureSize >> i) << i; /* truncate */
 
-
    if(pI810DRI->textureSize < 512*1024) {
       ErrorF("Less then 512k for textures\n");
       DRICloseScreen(pScreen);
+      return FALSE;
    }
    
    I810AllocLow( &(pI810->TexMem), &(pI810->SysMem),
 		 pI810DRI->textureSize);
-
    
    if (drmAddMap(pI810->drmSubFD, (drmHandle)pI810->TexMem.Start,
 		 pI810->TexMem.Size, DRM_AGP, 0,
 		 &pI810DRI->textures) < 0) {
-      ErrorF("drmAddMap(textures) failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap(textures) failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
@@ -650,7 +674,7 @@
    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] added %d %d byte DMA buffers\n",
 	      bufs, I810_DMA_BUF_SZ);
 
-   I810drmInitDma(pScrn);
+   I810InitDma(pScrn);
    
    /* Okay now initialize the dma engine */
 
@@ -701,7 +725,7 @@
    pI810DRI->auxPitchBits = pI810->auxPitchBits;
 
    if (!(I810InitVisualConfigs(pScreen))) {
-      ErrorF("I810InitVisualConfigs failed\n");
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "I810InitVisualConfigs failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
@@ -718,7 +742,7 @@
    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
    I810Ptr pI810 = I810PTR(pScrn);
 
-   I810drmCleanupDma(pScrn);
+   I810CleanupDma(pScrn);
 
    if(pI810->dcacheHandle) drmAgpFree(pI810->drmSubFD, pI810->dcacheHandle);
    if(pI810->backHandle) drmAgpFree(pI810->drmSubFD, pI810->backHandle);
@@ -768,8 +792,8 @@
 Bool
 I810DRIFinishScreenInit(ScreenPtr pScreen)
 {
-   drm_i810_sarea_t *sPriv = (drm_i810_sarea_t *)DRIGetSAREAPrivate(pScreen);
-   xf86memset( sPriv, 0, sizeof(sPriv) );
+   I810SAREARec *sPriv = (I810SAREARec *)DRIGetSAREAPrivate(pScreen);
+   memset( sPriv, 0, sizeof(sPriv) );
    return DRIFinishScreenInit(pScreen);
 }
 
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h:1.2 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h:1.2	Thu Mar  2 08:07:49 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h	Fri Jun 16 17:03:18 2000
@@ -1,10 +1,10 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h,v 1.2 2000/03/02 16:07:49 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h,v 1.3 2000/06/17 00:03:18 martin Exp $ */
 
 #ifndef _I810_DRI_
 #define _I810_DRI_
 
 #include <xf86drm.h>
-#include "i810_drm_public.h"
+#include <xf86drmI810.h>
 
 #define I810_MAX_DRAWABLES 256
 
@@ -52,6 +52,45 @@
    int irq;
 
 } I810DRIRec, *I810DRIPtr;
+
+/* WARNING: Do not change the SAREA structure without changing the kernel
+ * as well */
+
+typedef struct {
+   unsigned char next, prev; /* indices to form a circular LRU  */
+   unsigned char in_use;   /* owned by a client, or free? */
+   int age;                /* tracked by clients to update local LRU's */
+} I810TexRegionRec, *I810TexRegionPtr;
+
+typedef struct {
+   unsigned int nbox;
+   XF86DRIClipRectRec boxes[I810_NR_SAREA_CLIPRECTS];
+   
+   /* Maintain an LRU of contiguous regions of texture space.  If
+    * you think you own a region of texture memory, and it has an
+    * age different to the one you set, then you are mistaken and
+    * it has been stolen by another client.  If global texAge
+    * hasn't changed, there is no need to walk the list.
+    *
+    * These regions can be used as a proxy for the fine-grained
+    * texture information of other clients - by maintaining them
+    * in the same lru which is used to age their own textures,
+    * clients have an approximate lru for the whole of global
+    * texture space, and can make informed decisions as to which
+    * areas to kick out.  There is no need to choose whether to
+    * kick out your own texture or someone else's - simply eject
+    * them all in LRU order.  
+    */
+   I810TexRegionRec texList[I810_NR_TEX_REGIONS+1]; /* Last elt is sentinal */
+   
+   int texAge;             /* last time texture was uploaded */
+   
+   int last_enqueue;       /* last time a buffer was enqueued */
+   int last_dispatch;      /* age of the most recently dispatched buffer */
+   int last_quiescent;     /*  */
+   
+   int ctxOwner;           /* last context to upload state */
+} I810SAREARec, *I810SAREAPtr;
 
 typedef struct {
   /* Nothing here yet */
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dripriv.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dripriv.h:1.1 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dripriv.h:removed
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dripriv.h:1.1	Thu Mar  2 08:07:50 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dripriv.h	Sat Jul  1 20:42:52 2000
@@ -1,24 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dripriv.h,v 1.1 2000/03/02 16:07:50 martin Exp $ */
-
-#ifndef _I810_DRIPRIV_H_
-#define _I810_DRIPRIV_H_
-
-#define I810_MAX_DRAWABLES 256
-
-extern void GlxSetVisualConfigs(
-    int nconfigs,
-    __GLXvisualConfig *configs,
-    void **configprivs
-);
-
-typedef struct {
-  /* Nothing here yet */
-  int dummy;
-} I810ConfigPrivRec, *I810ConfigPrivPtr;
-
-typedef struct {
-  /* Nothing here yet */
-  int dummy;
-} I810DRIContextRec, *I810DRIContextPtr;
-
-#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c:1.7 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c:1.15
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c:1.7	Thu Mar  2 08:07:50 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	Thu Jun 22 10:44:04 2000
@@ -25,7 +25,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v 1.7 2000/03/02 16:07:50 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v 1.15 2000/06/22 17:44:04 alanh Exp $ */
 
 /*
  * Authors:
@@ -64,11 +64,13 @@
 #include "cfb16.h"
 #include "cfb24.h"
 #include "cfb32.h"
-#include "i810.h"
+#include "cfb24_32.h"
 #include "miscstruct.h"
 #include "xf86xv.h"
 #include "Xv.h"
 
+#include "i810.h"
+
 #ifdef XF86DRI
 #include "dri.h"
 #endif
@@ -83,8 +85,6 @@
 static void I810LeaveVT(int scrnIndex, int flags);
 static Bool I810CloseScreen(int scrnIndex, ScreenPtr pScreen);
 static Bool I810SaveScreen(ScreenPtr pScreen, Bool unblank);
-static Bool I810SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-static void I810AdjustFrame(int scrnIndex, int x, int y, int flags);
 static void I810FreeScreen(int scrnIndex, int flags);
 static int I810ValidMode(int scrnIndex, DisplayModePtr mode, Bool
 			 verbose, int flags);
@@ -95,15 +95,8 @@
 					  int flags);
 #endif
 
-#define VERSION 4000
-#define I810_NAME "I810"
-#define I810_DRIVER_NAME "i810"
-#define I810_MAJOR_VERSION 1
-#define I810_MINOR_VERSION 0
-#define I810_PATCHLEVEL 0
-
 DriverRec I810 = {
-   VERSION,
+   I810_VERSION,
    "Accelerated driver for Intel i810 cards",
    I810Identify,
    I810Probe,
@@ -111,20 +104,12 @@
    0
 };
 
-#ifndef PCI_CHIP_I810
-#define PCI_CHIP_I810              0x7121
-#define PCI_CHIP_I810_DC100        0x7123
-#define PCI_CHIP_I810_E            0x7125 
-#define PCI_CHIP_I810_BRIDGE       0x7120
-#define PCI_CHIP_I810_DC100_BRIDGE 0x7122
-#define PCI_CHIP_I810_E_BRIDGE     0x7124
-#endif
-
 /* Chipsets */
 static SymTabRec I810Chipsets[] = {
    { PCI_CHIP_I810,       "i810"},
    { PCI_CHIP_I810_DC100, "i810-dc100"},
    { PCI_CHIP_I810_E,     "i810e"},
+   { PCI_CHIP_I815,	  "i815"},
    { -1, NULL }
 };
 
@@ -132,6 +117,7 @@
    { PCI_CHIP_I810,       PCI_CHIP_I810,       RES_SHARED_VGA },
    { PCI_CHIP_I810_DC100, PCI_CHIP_I810_DC100, RES_SHARED_VGA },
    { PCI_CHIP_I810_E,     PCI_CHIP_I810_E,     RES_SHARED_VGA },
+   { PCI_CHIP_I815,	  PCI_CHIP_I815,       RES_SHARED_VGA },
    { -1, -1, RES_UNDEFINED }
 };
 
@@ -204,34 +190,29 @@
    NULL
 };
 
+/*
+ * This is intentionally screen-independent.  It indicates the binding
+ * choice made in the first PreInit.
+ */
+static int pix24bpp = 0;
 
 #ifdef XF86DRI
 static const char *drmSymbols[] = {
+   "drmAvailable",
    "drmAddBufs",
    "drmAddMap",
-   "drmAvailable",
-   "drmCtlAddCommand",
    "drmCtlInstHandler",
    "drmGetInterruptFromBusID",
-   "drmMapBufs",
-   "drmMarkBufs",
-   "drmUnmapBufs",
    "drmAgpAcquire",
    "drmAgpRelease",
    "drmAgpEnable",
    "drmAgpAlloc",
    "drmAgpFree",
    "drmAgpBind",
-   "drmAgpUnbind",
-   "drmAgpVersionMajor",
-   "drmAgpVersionMinor",
-   "drmAgpGetMode",
-   "drmAgpBase",
-   "drmAgpSize",
-   "drmAgpMemoryUsed",
-   "drmAgpMemoryAvail",
-   "drmAgpVendorId",
-   "drmAgpDeviceId",
+   "drmI810CleanupDma",
+   "drmI810InitDma",
+   "drmFreeVersion",
+   "drmGetVersion",
    NULL
 };
 
@@ -248,6 +229,7 @@
     "DRIUnlock",
     "DRIGetSAREAPrivate",
     "DRIGetContext",
+    "DRIQueryVersion",
     "GlxSetVisualConfigs",
     NULL
 };
@@ -388,7 +370,6 @@
    int i, numUsed, numDevSections, *usedChips;
    GDevPtr *devSections;
    Bool foundScreen = 0;
-   EntityInfoPtr pEnt;
     
    /*
      Find the config file Device sections that match this
@@ -411,32 +392,24 @@
 				   drv, &usedChips);
 
    for (i=0; i<numUsed; i++) {
-      pEnt = xf86GetEntityInfo(usedChips[i]);
-
-      if (pEnt->active) {
-	 ScrnInfoPtr pScrn;
-
-	 /* Allocate new ScrnInfoRec and claim the slot */
-	 pScrn = xf86AllocateScreen(drv, 0);
-
-	 pScrn->driverVersion = VERSION;
-	 pScrn->driverName = I810_DRIVER_NAME;
-	 pScrn->name = I810_NAME;
-	 pScrn->Probe = I810Probe;
-	 pScrn->PreInit = I810PreInit;
-	 pScrn->ScreenInit = I810ScreenInit;
-	 pScrn->SwitchMode = I810SwitchMode;
-	 pScrn->AdjustFrame = I810AdjustFrame;
-	 pScrn->EnterVT = I810EnterVT;
-	 pScrn->LeaveVT = I810LeaveVT;
-	 pScrn->FreeScreen = I810FreeScreen;
-	 pScrn->ValidMode = I810ValidMode;
-	 foundScreen = TRUE;
-
-	 xf86ConfigActivePciEntity(pScrn, usedChips[i], I810PciChipsets, 
-				   0, 0, 0, 0, 0);
+       ScrnInfoPtr pScrn = NULL;
+       /* Allocate new ScrnInfoRec and claim the slot */
+       if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
+					      I810PciChipsets, 0, 0, 0, 0, 0))){
+	   pScrn->driverVersion = I810_VERSION;
+	   pScrn->driverName = I810_DRIVER_NAME;
+	   pScrn->name = I810_NAME;
+	   pScrn->Probe = I810Probe;
+	   pScrn->PreInit = I810PreInit;
+	   pScrn->ScreenInit = I810ScreenInit;
+	   pScrn->SwitchMode = I810SwitchMode;
+	   pScrn->AdjustFrame = I810AdjustFrame;
+	   pScrn->EnterVT = I810EnterVT;
+	   pScrn->LeaveVT = I810LeaveVT;
+	   pScrn->FreeScreen = I810FreeScreen;
+	   pScrn->ValidMode = I810ValidMode;
+	   foundScreen = TRUE;
       }
-      xfree(pEnt);
    }
    if (numUsed) xfree(usedChips);
 
@@ -494,7 +467,7 @@
 
    /* No support for 32bpp.
     */
-   flags24=Support24bppFb | PreferConvert32to24;
+   flags24=Support24bppFb | PreferConvert32to24 | SupportConvert32to24;
    if (!xf86SetDepthBpp(pScrn, 8, 8, 8, flags24)) {
       return FALSE;
    } else {
@@ -512,6 +485,9 @@
    }
    xf86PrintDepthBpp(pScrn);
 
+   /* Get the depth24 pixmap format */
+   if (pScrn->depth == 24 && pix24bpp == 0)
+        pix24bpp = xf86GetBppFromDepth(pScrn, 24);
 
    pScrn->rgbBits=8;
    if (xf86ReturnOptValBool(I810Options, OPTION_DAC_6BIT, FALSE))
@@ -693,7 +669,7 @@
 	 pI810->MaxClock = 86000;
       }
    }
-   clockRanges = xnfalloc(sizeof(ClockRange));
+   clockRanges = xnfcalloc(sizeof(ClockRange), 1);
    clockRanges->next=NULL;
    clockRanges->minClock= 12000; /* !!! What's the min clock? !!! */
    clockRanges->maxClock=pI810->MaxClock;
@@ -743,8 +719,13 @@
       reqSym = "cfb16ScreenInit";
       break;
    case 24:
-      mod = "cfb24";
-      reqSym = "cfb24ScreenInit";
+      if (pix24bpp == 24) {
+	mod = "cfb24";
+	reqSym = "cfb24ScreenInit";
+      } else {
+	mod = "xf24_32bpp";
+	reqSym = "cfb24_32ScreenInit";
+      }
       break;
    case 32:
       mod = "cfb32";
@@ -1528,7 +1509,7 @@
    if(pI810->DoneFrontAlloc) 
       return TRUE;
       
-   xf86memset(&(pI810->FbMemBox), 0, sizeof(BoxRec));
+   memset(&(pI810->FbMemBox), 0, sizeof(BoxRec));
    /* Alloc FrontBuffer/Ring/Accel memory */
    pI810->FbMemBox.x1=0;
    pI810->FbMemBox.x2=pScrn->displayWidth;
@@ -1551,9 +1532,8 @@
 		   pI810->FbMemBox.y2 * 
 		   pI810->cpp) + 4095) & ~4095);
    
-   xf86memset( &(pI810->LpRing), 0, sizeof( I810RingBuffer ) );
+   memset( &(pI810->LpRing), 0, sizeof( I810RingBuffer ) );
    if(I810AllocLow( &(pI810->LpRing.mem), &(pI810->SysMem), 16*4096 )) {
-
 	 if (I810_DEBUG & DEBUG_VERBOSE_MEMORY)
 	    ErrorF( "ring buffer at local %lx\n", 
 		    pI810->LpRing.mem.Start);
@@ -1607,6 +1587,7 @@
    /* Have to init the DRM earlier than in other drivers to get agp
     * memory.  Wonder if this is going to be a problem...
     */
+
 #ifdef XF86DRI
    /*
     * Setup DRI after visuals have been established, but before cfbScreenInit
@@ -1657,11 +1638,19 @@
 	 return FALSE;
       break;
    case 24:
-      if (!cfb24ScreenInit(pScreen, pI810->FbBase + pScrn->fbOffset, 
-			   pScrn->virtualX, pScrn->virtualY,
-			   pScrn->xDpi, pScrn->yDpi,
-			   pScrn->displayWidth))
-	 return FALSE;
+      if (pix24bpp == 24) {
+            if (!cfb24ScreenInit(pScreen, pI810->FbBase + pScrn->fbOffset,
+                        pScrn->virtualX, pScrn->virtualY,
+                        pScrn->xDpi, pScrn->yDpi,
+                        pScrn->displayWidth))
+		return FALSE;
+      } else {
+            if (!cfb24_32ScreenInit(pScreen, pI810->FbBase + pScrn->fbOffset,
+                        pScrn->virtualX, pScrn->virtualY,
+                        pScrn->xDpi, pScrn->yDpi,
+                        pScrn->displayWidth))
+		return FALSE;
+      }
       break;
    case 32:
       if (!cfb32ScreenInit(pScreen, pI810->FbBase + pScrn->fbOffset, 
@@ -1679,6 +1668,8 @@
 
    xf86SetBlackWhitePixels(pScreen);
 
+   I810DGAInit(pScreen);
+
    if (pScrn->bitsPerPixel>8) {
       visual = pScreen->visuals + pScreen->numVisuals;
       while (--visual >= pScreen->visuals) {
@@ -1729,6 +1720,7 @@
       }
    }
 #endif
+
 #ifdef XF86DRI
    if (!pI810->directRenderingEnabled) {
       pI810->DoneFrontAlloc = FALSE;
@@ -1737,6 +1729,7 @@
       I810AllocateFront(pScrn);
    }
 #endif
+
    
    if (!xf86InitFBManager(pScreen, &(pI810->FbMemBox))) {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
@@ -1762,7 +1755,7 @@
       }
    }
 
-#if XF86DRI
+#ifdef XF86DRI
    if (pI810->LpRing.mem.Start == 0) {
       pI810->directRenderingEnabled = 0;
       I810DRICloseScreen(pScreen);
@@ -1798,7 +1791,7 @@
    return TRUE;
 }
 
-static Bool
+Bool
 I810SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) {
    ScrnInfoPtr pScrn =xf86Screens[scrnIndex];
 
@@ -1808,7 +1801,7 @@
    return I810ModeInit(pScrn, mode);
 }
 
-static void
+void
 I810AdjustFrame(int scrnIndex, int x, int y, int flags) {
    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
    I810Ptr pI810 = I810PTR(pScrn);
@@ -1852,11 +1845,12 @@
 static Bool
 I810EnterVT(int scrnIndex, int flags) {
    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+#ifdef XF86DRI
    I810Ptr pI810 = I810PTR(pScrn);
-
+#endif
 
    if (I810_DEBUG & DEBUG_VERBOSE_DRI)
-      ErrorF("\n\n\ENTER VT\n");
+      ErrorF("\n\nENTER VT\n");
 
 #ifdef XF86DRI
    if (pI810->directRenderingEnabled) {
@@ -1876,11 +1870,8 @@
 I810LeaveVT(int scrnIndex, int flags) {
    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
    vgaHWPtr hwp = VGAHWPTR(pScrn);
-#ifdef XF86DRI
    I810Ptr pI810 = I810PTR(pScrn);
-#endif
 
-
    if (I810_DEBUG & DEBUG_VERBOSE_DRI)
       ErrorF("\n\n\nLeave VT\n");
 
@@ -1893,8 +1884,10 @@
    }
 #endif
 
-   I810RefreshRing( pScrn );
-   I810Sync( pScrn );
+   if(pI810->AccelInfoRec != NULL) {
+      I810RefreshRing( pScrn );
+      I810Sync( pScrn );
+   }
    I810Restore(pScrn);
    vgaHWLock(hwp);
 }
@@ -1950,7 +1943,8 @@
 static void
 I810FreeScreen(int scrnIndex, int flags) {
    I810FreeRec(xf86Screens[scrnIndex]);
-   vgaHWFreeHWRec(xf86Screens[scrnIndex]);
+   if (vgaHWFreeHWRec)
+       vgaHWFreeHWRec(xf86Screens[scrnIndex]);
 }
 
 static int
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c:1.2	Tue Feb 22 20:47:16 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c	Thu May 11 11:14:34 2000
@@ -24,7 +24,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c,v 1.2 2000/02/23 04:47:16 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c,v 1.3 2000/05/11 18:14:34 tsi Exp $ */
 
 /*
  * Authors:
@@ -39,21 +39,25 @@
 
 #include "i810.h"
 
-static void I810WriteControlPIO(I810Ptr pI810, int addr, char index, char val) {
+static void
+I810WriteControlPIO(I810Ptr pI810, int addr, CARD8 index, CARD8 val) {
   outb(addr, index);
   outb(addr+1, val);
 }
 
-static char I810ReadControlPIO(I810Ptr pI810, int addr, char index) {
+static CARD8
+I810ReadControlPIO(I810Ptr pI810, int addr, CARD8 index) {
   outb(addr, index);
   return inb(addr+1);
 }
 
-static void I810WriteStandardPIO(I810Ptr pI810, int addr, char val) {
+static void
+I810WriteStandardPIO(I810Ptr pI810, int addr, CARD8 val) {
   outb(addr, val);
 }
 
-static char I810ReadStandardPIO(I810Ptr pI810, int addr) {
+static CARD8
+I810ReadStandardPIO(I810Ptr pI810, int addr) {
   return inb(addr);
 }
 
@@ -64,21 +68,25 @@
   pI810->readStandard=I810ReadStandardPIO;
 }
 
-static void I810WriteControlMMIO(I810Ptr pI810, int addr, char index, char val) {
+static void
+I810WriteControlMMIO(I810Ptr pI810, int addr, CARD8 index, CARD8 val) {
   moutb(addr, index);
   moutb(addr+1, val);
 }
 
-static char I810ReadControlMMIO(I810Ptr pI810, int addr, char index) {
+static CARD8
+I810ReadControlMMIO(I810Ptr pI810, int addr, CARD8 index) {
   moutb(addr, index);
   return minb(addr+1);
 }
 
-static void I810WriteStandardMMIO(I810Ptr pI810, int addr, char val) {
+static void
+I810WriteStandardMMIO(I810Ptr pI810, int addr, CARD8 val) {
   moutb(addr, val);
 }
 
-static char I810ReadStandardMMIO(I810Ptr pI810, int addr) {
+static CARD8
+I810ReadStandardMMIO(I810Ptr pI810, int addr) {
   return minb(addr);
 }
 
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c:1.3 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c:1.3	Thu Mar  2 08:07:51 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c	Mon Jun 19 22:08:46 2000
@@ -1,4 +1,4 @@
-
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v 1.9 2000/06/20 05:08:46 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -31,23 +31,25 @@
  *   Keith Whitwell <keithw@precisioninsight.com>
  *
  */
-
 
-#include "X.h"
-#include "input.h"
-#include "screenint.h"
-#include "compiler.h"
+#ifndef XFree86LOADER
 #include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
+#include "xf86_ansic.h"
+#endif
 
-/*  #include "xf86_ansic.h" */
+#ifdef linux
+#include <asm/ioctl.h>
+#include <linux/agpgart.h>
+#endif
+
+#ifdef XFree86LOADER
+#include "xf86.h"
+#include "xf86_ansic.h"
+#endif
 
 #include "i810.h"
 #include "i810_reg.h"
 
-#include <linux/agpgart.h>
-
 int I810AllocLow( I810MemRange *result, I810MemRange *pool, int size )
 {
    if (size > pool->Size) return 0;
@@ -72,17 +74,9 @@
 }
 
 
-#define XCONFIG_PROBED "()"
-#define NAME "i810"
-
-extern int xf86open(const char *path, int flags, ...);
-extern int xf86close(int fd );
-extern int xf86ioctl(int fd, unsigned long request, pointer argp);
-extern int xf86errno;
-
-
 int I810AllocateGARTMemory( ScrnInfoPtr pScrn ) 
 {
+#ifdef linux
    struct _agp_info agpinf;
    struct _agp_bind bind;
    struct _agp_allocate alloc;
@@ -91,16 +85,16 @@
    long tom = 0;
    int gartfd = -1;
 
-   gartfd = xf86open("/dev/agpgart", O_RDWR, 0);
+   gartfd = open("/dev/agpgart", O_RDWR, 0);
 
    if (gartfd == -1) {	
       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "unable to open /dev/agpgart\n");
       return FALSE;
    }
 
-   if (xf86ioctl(gartfd, AGPIOC_ACQUIRE, 0) != 0) {
+   if (ioctl(gartfd, AGPIOC_ACQUIRE, 0) != 0) {
       if(pI810->agpAcquired2d == TRUE) {
-	 xf86close(gartfd);
+	 close(gartfd);
 	 return TRUE;
       }
       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "AGPIOC_ACQUIRE failed\n"); 
@@ -111,9 +105,9 @@
    pI810->agpAcquired2d = TRUE;
    pI810->gartfd = gartfd;
    
-   if (xf86ioctl(pI810->gartfd, AGPIOC_INFO, &agpinf) != 0) {
+   if (ioctl(pI810->gartfd, AGPIOC_INFO, &agpinf) != 0) {
       xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
-		 "error doing xf86ioctl(AGPIOC_INFO)\n");
+		 "error doing ioctl(AGPIOC_INFO)\n");
       return FALSE;
    }
    
@@ -132,7 +126,7 @@
    alloc.pg_count = pages;
    alloc.type = 0;
 
-   if (xf86ioctl(pI810->gartfd, AGPIOC_ALLOCATE, &alloc) != 0) {
+   if (ioctl(pI810->gartfd, AGPIOC_ALLOCATE, &alloc) != 0) {
       xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
 		 "AGPGART: allocation of %d pages failed\n", pages);
       return FALSE;
@@ -141,7 +135,7 @@
    bind.pg_start = 0;
    bind.key = alloc.key;
 
-   if (xf86ioctl(pI810->gartfd, AGPIOC_BIND, &bind) != 0) {
+   if (ioctl(pI810->gartfd, AGPIOC_BIND, &bind) != 0) {
       xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
 		 "GART: allocation of %d pages failed\n", pages);
       return FALSE;
@@ -172,11 +166,11 @@
    tom += 0x7ffff;
    tom &= ~0x7ffff;
 
-   if (xf86ioctl(pI810->gartfd, AGPIOC_ALLOCATE, &alloc) == 0) {
+   if (ioctl(pI810->gartfd, AGPIOC_ALLOCATE, &alloc) == 0) {
       bind.pg_start = tom / 4096;
       bind.key = alloc.key;
 
-      if (xf86ioctl(pI810->gartfd, AGPIOC_BIND, &bind) != 0) {
+      if (ioctl(pI810->gartfd, AGPIOC_BIND, &bind) != 0) {
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
 		    "GART: allocation of %d DCACHE pages failed\n", 
 		    alloc.pg_count);
@@ -197,7 +191,7 @@
    alloc.type = 2;
 
 
-   if (xf86ioctl(pI810->gartfd, AGPIOC_ALLOCATE, &alloc) != 0) {
+   if (ioctl(pI810->gartfd, AGPIOC_ALLOCATE, &alloc) != 0) {
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
 		    "GART: No physical memory available for mouse\n", 
 		    alloc.pg_count);
@@ -205,7 +199,7 @@
       bind.pg_start = tom / 4096;
       bind.key = alloc.key;
 
-      if (xf86ioctl(pI810->gartfd, AGPIOC_BIND, &bind) != 0) {
+      if (ioctl(pI810->gartfd, AGPIOC_BIND, &bind) != 0) {
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
 		    "GART: allocation of %d physical pages failed\n", 
 		    alloc.pg_count);
@@ -220,18 +214,23 @@
 
 
    return TRUE;
+#else
+   return FALSE;
+#endif
 }
 
 
 
 void I810FreeGARTMemory( ScrnInfoPtr pScrn ) 
 {
+#ifdef linux
    I810Ptr pI810 = I810PTR(pScrn);
 
    if (pI810->gartfd != -1) {
-      xf86close( pI810->gartfd );
+      close( pI810->gartfd );
       pI810->gartfd = -1;
    }
+#endif
 }
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_sarea.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/i810/i810_sarea.h:1.2 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_sarea.h:removed
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_sarea.h:1.2	Thu Mar  2 08:07:51 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_sarea.h	Sat Jul  1 20:42:52 2000
@@ -1,6 +0,0 @@
-#ifndef I810_SAPRIV_H
-#define I810_SAPRIV_H
-
-#include "i810_drm_public.h"
-
-#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile:1.2
--- /dev/null	Sat Jul  1 20:42:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile	Tue Jun 13 18:56:08 2000
@@ -0,0 +1,52 @@
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile,v 1.2 2000/06/14 01:56:08 dawes Exp $
+/*
+ *
+ * Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
+ *
+ */
+
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = imstt_driver.c imstt_accel.c
+
+OBJS = imstt_driver.o imstt_accel.o
+
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+           -I$(SERVERSRC)/cfb -I$(XF86SRC)/xaa \
+           -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \
+           -I$(XF86SRC)/xf24_32bpp -I$(SERVERSRC)/Xext \
+           -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \
+	   -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \
+	   -I$(XF86SRC)/fbdevhw \
+           -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \
+           -I$(EXTINCSRC)
+#endif
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+NormalAsmObjectRule()
+
+ModuleObjectRule()
+ObjectModuleTarget(imstt, $(OBJS))
+
+InstallObjectModule(imstt,$(MODULEDIR),drivers)
+
+#if !defined(XF86DriverSDK)
+CppManTarget(imstt,)
+InstallModuleManPage(imstt)
+#endif
+
+DependTarget()
+
+InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/imstt)
+InstallDriverSDKNonExecFile(imstt.h,$(DRIVERSDKDIR)/drivers/imstt)
+InstallDriverSDKNonExecFile(imstt_reg.h,$(DRIVERSDKDIR)/drivers/imstt)
+InstallDriverSDKNonExecFile(imstt_driver.c,$(DRIVERSDKDIR)/drivers/imstt)
+InstallDriverSDKNonExecFile(imstt_accel.c,$(DRIVERSDKDIR)/drivers/imstt)
Index: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.cpp:1.2
--- /dev/null	Sat Jul  1 20:42:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.cpp	Tue Jun 13 19:13:11 2000
@@ -0,0 +1,30 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.cpp,v 1.2 2000/06/14 02:13:11 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH IMSTT __drivermansuffix__ "Version 4.0.1"  "XFree86"
+.SH NAME
+imstt \- Integrated Micro Solutions Twin Turbo 128 driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qimstt\*q"
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B imstt 
+is an XFree86 driver for Integrated Micro Solutions Twin Turbo 128 video chips.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+The
+.B imstt
+driver supports...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details.  This section only covers configuration details specific to this
+driver.
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+.SH AUTHORS
+Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h:1.1
--- /dev/null	Sat Jul  1 20:42:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h	Tue Jun 13 17:16:09 2000
@@ -0,0 +1,63 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.1 2000/06/14 00:16:09 dawes Exp $ */
+
+#ifndef _IMSTT_H
+#define _IMSTT_H
+
+#include "xf86.h"
+#include "xf86Pci.h"
+#include "xf86PciInfo.h"
+#include "xaa.h"
+#include "xf86_ansic.h"
+
+
+typedef struct _IMSTTRec {
+	pciVideoPtr		PciInfo;
+	PCITAG			PciTag;
+	EntityInfoPtr		pEnt;
+	CARD32			IOAddress;
+	CARD32			FBAddress;
+	unsigned char *		FBBase;
+	unsigned long *		MMIOBase;
+	unsigned char *		CMAPBase;
+	long			FBMapSize;
+	unsigned long		videoRam;
+	unsigned long		ramdac;
+	OptionInfoPtr		Options;
+	unsigned int		Flags;
+	CARD32			Bus;
+	XAAInfoRecPtr		AccelInfoRec;
+/*	xf86CursorInfoPtr	CursorInfoRec; */
+	Bool			NoAccel;
+	Bool			HWCursor;
+	Bool			InitDAC;
+	Bool			FBDev;
+	int			Chipset, ChipRev;
+	unsigned long		pitch;
+	unsigned long		ll;
+	unsigned long		bltctl;
+	unsigned short		hes;
+	unsigned short		heb;
+	unsigned short		hsb;
+	unsigned short		ht;
+	unsigned short		ves;
+	unsigned short		veb;
+	unsigned short		vsb;
+	unsigned short		vt;
+	unsigned short		vil;
+	unsigned char		pclk_m;
+	unsigned char		pclk_n;
+	unsigned char		pclk_p;
+	unsigned char		mlc[3];
+	unsigned char		lckl_p[3];
+} IMSTTRec, *IMSTTPtr;
+
+
+#define IMSTTPTR(p)	((IMSTTPtr)((p)->driverPrivate))
+
+#define	PCI_IMSTT128	0x9128	/* IMS,tt128mbA */
+#define PCI_IMSTT3D	0x9135	/* IMS,tt3d */
+
+#define RAMDAC_IBM	1
+#define RAMDAC_TVP	2
+
+#endif /* _IMSTT_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c:1.2
--- /dev/null	Sat Jul  1 20:42:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c	Tue Jun 13 19:36:07 2000
@@ -0,0 +1,143 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.2 2000/06/14 02:36:07 dawes Exp $ */
+
+/*
+ *	Copyright 2000	Ani Joshi <ajoshi@unixbox.com>
+ *
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation and
+ * that the name of Ani Joshi not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Ani Joshi makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as-is" without express or implied warranty.
+ *
+ * ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+
+#include "compiler.h"
+#include "Xarch.h"
+#include "xf86.h"
+#include "xf86_ansic.h"
+#include "xf86_OSproc.h"
+#include "xaa.h"
+#include "xf86PciInfo.h"
+
+#include "imstt.h"
+#include "imstt_reg.h"
+
+
+
+static void IMSTTSync(ScrnInfoPtr pScrn)
+{
+	IMSTTPtr iptr = IMSTTPTR(pScrn);
+	IMSTTMMIO_VARS();
+
+	while(INREG(IMSTT_SSTATUS) & 0x80);
+	while(INREG(IMSTT_SSTATUS) & 0x40);
+	return;
+}
+
+
+static void IMSTTSetupForSolidFill(ScrnInfoPtr pScrn, int color,
+				   int rop, unsigned int planemask)
+{
+	IMSTTPtr iptr = IMSTTPTR(pScrn);
+	IMSTTMMIO_VARS();
+
+	OUTREG(IMSTT_BI, 0xffffffff);
+	OUTREG(IMSTT_MBC, 0xffffffff);
+	OUTREG(IMSTT_CLR, color);
+	OUTREG(IMSTT_DP_OCTL, (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)));
+}
+
+
+static void IMSTTSubsequentSolidFillRect(ScrnInfoPtr pScrn,
+					 int x, int y, int w, int h)
+{
+	IMSTTPtr iptr = IMSTTPTR(pScrn);
+	IMSTTMMIO_VARS();
+
+	OUTREG(IMSTT_DSA, y + x);
+	OUTREG(IMSTT_CNT, (h << 16) | w);
+	OUTREG(IMSTT_BLTCTL, 0x840);
+}
+
+
+static void IMSTTSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir,
+					    int ydir, int rop, unsigned int planemask,
+					    int trans_color)
+{
+	IMSTTPtr iptr = IMSTTPTR(pScrn);
+	IMSTTMMIO_VARS();
+	unsigned long sp, dp, ll, cnt;
+
+	iptr->bltctl = 0x05;
+	ll = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
+	iptr->ll = ll;
+	sp = ll << 16;
+	cnt = pScrn->virtualY << 16;
+	if (xdir >= 0) {
+		dp = -(ll) & 0xffff;
+		sp |= dp;
+	}
+	if (ydir >= 0) {
+		iptr->bltctl |= 0x80;
+		cnt |= -(pScrn->displayWidth) & 0xffff;
+	} else {
+		cnt |= pScrn->displayWidth;
+	}
+
+	OUTREG(IMSTT_SP, sp);
+	OUTREG(IMSTT_CNT, cnt);
+	OUTREG(IMSTT_DP_OCTL, dp);
+}
+
+
+static void IMSTTSubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
+					      int x1, int y1,
+					      int x2, int y2,
+					      int w, int h)
+{
+	IMSTTPtr iptr = IMSTTPTR(pScrn);
+	IMSTTMMIO_VARS();
+
+	OUTREG(IMSTT_S1SA, x1 * iptr->ll * y1);
+	OUTREG(IMSTT_DSA, x2 * iptr->ll * y2);
+	OUTREG(IMSTT_BLTCTL, iptr->bltctl);
+}
+
+
+
+
+Bool IMSTTAccelInit(ScreenPtr pScreen)
+{
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	IMSTTPtr iptr = IMSTTPTR(pScrn);
+	XAAInfoRecPtr xaaptr;
+
+	if (!(xaaptr = iptr->AccelInfoRec = XAACreateInfoRec()))
+		return FALSE;
+
+	xaaptr->Flags = (PIXMAP_CACHE | OFFSCREEN_PIXMAPS | LINEAR_FRAMEBUFFER);
+
+	xaaptr->Sync = IMSTTSync;
+	xaaptr->SetupForSolidFill = IMSTTSetupForSolidFill;
+	xaaptr->SubsequentSolidFillRect = IMSTTSubsequentSolidFillRect;
+	xaaptr->ScreenToScreenCopyFlags = 0;
+	xaaptr->SetupForScreenToScreenCopy = IMSTTSetupForScreenToScreenCopy;
+	xaaptr->SubsequentScreenToScreenCopy = IMSTTSubsequentScreenToScreenCopy;
+
+	return XAAInit(pScreen, xaaptr);
+}
+
Index: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c:1.6
--- /dev/null	Sat Jul  1 20:42:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c	Thu Jun 22 09:59:28 2000
@@ -0,0 +1,1292 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v 1.6 2000/06/22 16:59:28 tsi Exp $ */
+
+/*
+ *	Copyright 2000	Ani Joshi <ajoshi@unixbox.com>
+ *
+ *	XFree86 4.0 driver for the Integrated Micro Solutions
+ *		Twin Turbo 128 chipset
+ *
+ *	Credits:
+ *		Sigurdur Asgeirsson, Jeffrey Kuskin, Ryan Nielsen
+ *		for their work on imsttfb
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation and
+ * that the name of Ani Joshi not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Ani Joshi makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as-is" without express or implied warranty.
+ *
+ * ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ *
+ */
+
+
+#include "compiler.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+#include "xf86Version.h"
+#include "xf86Resources.h"
+#include "xf86fbman.h"
+#include "xaa.h"
+#include "mipointer.h"
+#include "micmap.h"
+#include "mibstore.h"
+#include "fbdevhw.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb16.h"
+#include "cfb24.h"
+#include "cfb32.h"
+
+#include "xf86cmap.h"
+
+#include "imstt.h"
+#include "imstt_reg.h"
+
+
+/* To get it to build on non-PPC */
+#ifndef __powerpc__
+#define eieio()
+#endif
+
+/*
+ * prototypes
+ */
+static OptionInfoPtr IMSTTAvailableOptions(int chipid, int busid);
+static void IMSTTIdentify(int flags);
+static Bool IMSTTProbe(DriverPtr drv, int flags);
+static Bool IMSTTPreInit(ScrnInfoPtr pScrn, int flags);
+
+static Bool IMSTTEnterVT(int scrnIndex, int flags);
+static void IMSTTLeaveVT(int scrnIndex, int flags);
+static void IMSTTSave(ScrnInfoPtr pScrn);
+static Bool IMSTTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
+			    char **argv);
+static int IMSTTInternalScreenInit(int scrnIndex, ScreenPtr pScreen);
+static ModeStatus IMSTTValidMode(int index, DisplayModePtr mode,
+				 Bool verbose, int flags);
+
+static Bool IMSTTMapMem(ScrnInfoPtr pScrn);
+static void IMSTTUnmapMem(ScrnInfoPtr pScrn);
+static Bool IMSTTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
+static void IMSTTAdjustFrame(int scrnIndex, int x, int y, int flags);
+static Bool IMSTTCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool IMSTTSaveSCreen(ScreenPtr pScreen, int mode);
+static void IMSTTLoadPalette(ScrnInfoPtr pScrn, int numColors,
+			     int *indicies, LOCO *colors,
+			     VisualPtr pVisual);
+
+static void IMSTTGetVideoMemSize(ScrnInfoPtr pScrn);
+static void IMSTTSetClock(ScrnInfoPtr pScrn, unsigned long mhz);
+static void IMSTTWriteMode(ScrnInfoPtr pScrn);
+
+#define DRIVER_NAME	"imstt"
+#define DRIVER_VERSION	"1.0.0"
+#define VERSION_MAJOR	1
+#define VERSION_MINOR	0
+#define PATCHLEVEL	0
+#define IMSTT_VERSION	((VERSION_MAJOR << 24) | \
+			 (VERSION_MINOR << 16) | \
+			 PATCHLEVEL)
+
+
+DriverRec IMSTT =
+{
+	IMSTT_VERSION,
+	DRIVER_NAME,
+	IMSTTIdentify,
+	IMSTTProbe,
+	IMSTTAvailableOptions,
+	NULL,
+	0
+};
+
+
+/* supported chipsets */
+static SymTabRec IMSTTChipsets[] = {
+	{ PCI_IMSTT128,	"imstt128" },
+	{ PCI_IMSTT3D,	"imstt3d" },
+	{ -1,		NULL }
+};
+
+static PciChipsets IMSTTPciChipsets[] = {
+	{ PCI_IMSTT128,	PCI_IMSTT128,	RES_SHARED_VGA },
+	{ PCI_IMSTT3D,	PCI_IMSTT3D,	RES_SHARED_VGA },
+	{ -1,		-1,		RES_UNDEFINED }
+};
+
+typedef enum {
+	OPTION_NOACCEL,
+	OPTION_SWCURSOR,
+	OPTION_INITDAC,
+	OPTION_FBDEV
+} IMSTTOpts;
+
+static OptionInfoRec IMSTTOptions[] =
+{
+	{ OPTION_NOACCEL, "noaccel", OPTV_BOOLEAN, {0}, FALSE },
+	{ OPTION_SWCURSOR, "swcursor", OPTV_BOOLEAN, {0}, FALSE },
+	{ OPTION_INITDAC, "initdac", OPTV_BOOLEAN, {0}, FALSE },
+	{ OPTION_FBDEV,	"UseFBDev", OPTV_BOOLEAN, {0}, FALSE }
+};
+
+
+static const char *cfbSymbols[] = {
+	"cfbScreenInit",
+	"cfb16ScreenInit",
+	"cfb24ScreenInit",
+	"cfb32ScreenInit",
+	"cfb16BresS",
+	"cfb24BresS",
+	NULL
+};
+
+
+static const char *xaaSymbols[] = {
+	"XAADestroyInfoRec",
+	"XAACreateInfoRec",
+	"XAAInit",
+	"XAAScreenIndex",
+	NULL
+};
+
+
+static const char *fbdevHWSymbols[] = {
+	"fbdevHWInit",
+	"fbdevHWUseBuildinMode",
+	"fbdevHWGetDepth",
+	"fbdevHWGetVidmem",
+	"fbdevHWLoadPalette",
+	"fbdevHWSwitchMode",
+	"fbdevHWAdjustFrame",
+	"fbdevHWEnterVT",
+	"fbdevHWLeaveVT",
+	"fbdevHWValidMode",
+	"fbdevHWRestore",
+	"fbdevHWModeInit",
+	"fbdevHWUnmapMMIO",
+	"fbdevHWUnmapVidmem",
+	"fbdevHWMapMMIO",
+	"fbdevHWMapVidmem",
+	NULL
+};
+
+
+#ifdef XFree86LOADER
+static pointer IMSTTSetup(pointer module, pointer opts, int *errmaj,
+			  int *errmin);
+
+static XF86ModuleVersionInfo IMSTTVersRec = {
+	"imstt",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0, 0, 0, 0}
+};
+
+XF86ModuleData IMSTTModuleData = { &IMSTTVersRec, IMSTTSetup, NULL };
+
+static pointer IMSTTSetup(pointer module, pointer opts, int *errmaj,
+			  int *errmin)
+{
+	static Bool setupDone = FALSE;
+
+	if (!setupDone) {
+		setupDone = TRUE;
+		xf86AddDriver(&IMSTT, module, 0);
+		LoaderRefSymLists(0, cfbSymbols, xaaSymbols, 0, 9, fbdevHWSymbols, 0, 0, 0, NULL);
+		return (pointer) 1;
+	} else {
+		if (errmaj)
+			*errmaj = LDR_ONCEONLY;
+		return NULL;
+	}
+}
+
+
+#endif /* XFree86LOADER */
+
+
+static Bool IMSTTGetRec(ScrnInfoPtr pScrn)
+{
+	if (pScrn->driverPrivate)
+		return TRUE;
+
+	pScrn->driverPrivate = xnfcalloc(sizeof(IMSTTRec), 1);
+	return TRUE;
+}
+
+
+static void IMSTTFreeRec(ScrnInfoPtr pScrn)
+{
+	if (!pScrn->driverPrivate)
+		return;
+
+	xfree(pScrn->driverPrivate);
+	pScrn->driverPrivate = NULL;
+	IMSTTUnmapMem(pScrn);
+}
+
+
+static OptionInfoPtr IMSTTAvailableOptions(int chipid, int busid)
+{
+	return IMSTTOptions;
+}
+
+
+static void IMSTTIdentify(int flags)
+{
+	xf86PrintChipsets("imstt", "driver (version " DRIVER_VERSION " for IMS TwinTurbo chipsets ",
+			  IMSTTChipsets);
+}
+
+
+static Bool IMSTTProbe(DriverPtr drv, int flags)
+{
+	int i;
+	GDevPtr *devSections = NULL;
+	int *usedChips;
+	int numDevSections;
+	int numUsed;
+	Bool foundScreen = FALSE;
+
+	/* sanity checks */
+	if ((numDevSections = xf86MatchDevice("imstt", &devSections)) <= 0)
+		return FALSE;
+	if (xf86GetPciVideoInfo() == NULL)
+		return FALSE;
+
+	numUsed = xf86MatchPciInstances("imstt", PCI_VENDOR_IMS,
+					IMSTTChipsets, IMSTTPciChipsets,
+					devSections, numDevSections, drv,
+					&usedChips);
+
+	if (devSections)
+		xfree(devSections);
+	devSections = NULL;
+
+	if (numUsed <= 0)
+		return FALSE;
+
+	if (flags & PROBE_DETECT)
+		foundScreen = TRUE;
+	else for (i=0; i<numUsed; i++) {
+		ScrnInfoPtr pScrn = xf86AllocateScreen(drv, 0);
+
+		pScrn->driverVersion = VERSION_MAJOR;
+		pScrn->driverName = DRIVER_NAME;
+		pScrn->name = "imstt";
+		pScrn->Probe = IMSTTProbe;
+		pScrn->PreInit = IMSTTPreInit;
+		pScrn->ScreenInit = IMSTTScreenInit;
+/*		pScrn->SwitchMode = IMSTTSwitchMode; */
+		pScrn->AdjustFrame = IMSTTAdjustFrame;
+/*		pScrn->EnterVT = IMSTTEnterVT;
+		pScrn->LeaveVT = IMSTTLeaveVT; */
+		pScrn->FreeScreen = NULL;
+/*		pScrn->ValidMode = IMSTTValidMode; */
+		foundScreen = TRUE;
+		xf86ConfigActivePciEntity(pScrn, usedChips[i], IMSTTPciChipsets,
+					  NULL, NULL, NULL, NULL, NULL);
+	}
+
+	xfree(usedChips);
+	return foundScreen;
+}
+
+
+static Bool IMSTTPreInit(ScrnInfoPtr pScrn, int flags)
+{
+	EntityInfoPtr pEnt;
+	IMSTTPtr iptr;
+	MessageType from = X_DEFAULT;
+	int i;
+	ClockRangePtr clockRanges;
+	char *mod = NULL;
+	const char *reqSym = NULL;
+	rgb zeros = {0, 0, 0};
+	Gamma gzeros = {0.0, 0.0, 0.0};
+
+
+	if (flags & PROBE_DETECT)
+		return FALSE;
+
+	pScrn->monitor = pScrn->confScreen->monitor;
+
+	if (!xf86SetDepthBpp(pScrn, 8, 8, 8, Support24bppFb | Support32bppFb |
+			     SupportConvert32to24 | PreferConvert32to24))
+		return FALSE;
+	else {
+		switch (pScrn->depth) {
+		case 8:
+		case 15:
+		case 16:
+		case 24:
+		case 32:
+			/* OK */
+			break;
+		default:
+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				   "Given depth (%d) is not supported by this driver\n",
+				    pScrn->depth);
+			return FALSE;
+		}
+	}
+
+	xf86PrintDepthBpp(pScrn);
+
+	if (pScrn->depth > 8) {
+		if (!xf86SetWeight(pScrn, zeros, zeros))
+			return FALSE;
+	}
+
+	if (pScrn->depth == 8)
+		pScrn->rgbBits = 8;
+
+	pScrn->progClock = TRUE;
+
+	if (!IMSTTGetRec(pScrn))
+		return FALSE;
+	iptr = IMSTTPTR(pScrn);
+
+	xf86CollectOptions(pScrn, NULL);
+
+	xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, IMSTTOptions);
+
+	if (xf86ReturnOptValBool(IMSTTOptions, OPTION_NOACCEL, FALSE)) {
+		iptr->NoAccel = TRUE;
+		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: NoAccel - acceleration disabled\n");
+	} else
+		iptr->NoAccel = FALSE;
+#if 0
+	if (xf86ReturnOptValBool(IMSTTOptions, OPTION_SWCURSOR, FALSE))
+		iptr->HWCursor = FALSE;
+	else
+		iptr->HWCursor = TRUE;
+#else
+	/* HW cursor support not ready yet... */
+	iptr->HWCursor = FALSE;
+#endif
+
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using %s cursor\n",
+		   iptr->HWCursor ? "HW" : "SW");
+
+	if (xf86ReturnOptValBool(IMSTTOptions, OPTION_INITDAC, FALSE)) {
+		iptr->InitDAC = TRUE;
+		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: not initalizing DACn");
+	} else {
+		iptr->InitDAC = FALSE;
+	}
+
+	if (xf86ReturnOptValBool(IMSTTOptions, OPTION_FBDEV, FALSE)) {
+		iptr->FBDev = TRUE;
+		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+			   "Using framebuffer device\n");
+	} else {
+		iptr->FBDev = FALSE;
+	}
+
+	if (iptr->FBDev) {
+		if (!xf86LoadSubModule(pScrn, "fbdevhw"))
+			return FALSE;
+		xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
+		if (!fbdevHWInit(pScrn, iptr->PciInfo, NULL))
+			return FALSE;
+		pScrn->SwitchMode = fbdevHWSwitchMode;
+		pScrn->AdjustFrame = fbdevHWAdjustFrame;
+		pScrn->EnterVT = fbdevHWEnterVT;
+		pScrn->LeaveVT = fbdevHWLeaveVT;
+		pScrn->ValidMode = fbdevHWValidMode;
+	}
+
+	if (pScrn->numEntities > 1) {
+		IMSTTFreeRec(pScrn);
+		return FALSE;
+	}
+
+	pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+	if (pEnt->resources) {
+		xfree(pEnt);
+		IMSTTFreeRec(pScrn);
+		return FALSE;
+	}
+
+	iptr->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+	xf86RegisterResources(pEnt->index, NULL, ResNone);
+	xf86SetOperatingState(RES_SHARED_VGA, pEnt->index, ResUnusedOpr);
+	xf86SetOperatingState(resVgaMemShared, pEnt->index, ResDisableOpr);
+
+	if (pEnt->device->chipset && *pEnt->device->chipset) {
+		pScrn->chipset = pEnt->device->chipset;
+		iptr->Chipset = xf86StringToToken(IMSTTChipsets, pScrn->chipset);
+	} else if (pEnt->device->chipID >= 0) {
+		iptr->Chipset = pEnt->device->chipID;
+		pScrn->chipset = (char *)xf86TokenToString(IMSTTChipsets,
+							   iptr->Chipset);
+		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipID override: 0x%04X\n",
+			   iptr->Chipset);
+	} else {
+		iptr->Chipset = iptr->PciInfo->chipType;
+		pScrn->chipset = (char *)xf86TokenToString(IMSTTChipsets,
+							   iptr->Chipset);
+	}
+
+	if (pEnt->device->chipRev >= 0) {
+		iptr->ChipRev = pEnt->device->chipRev;
+		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
+			   iptr->ChipRev);
+	} else
+		iptr->ChipRev = iptr->PciInfo->chipRev;
+
+	xfree(pEnt);
+
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Chipset: \"%s\"\n", pScrn->chipset);
+
+	iptr->PciTag = pciTag(iptr->PciInfo->bus, iptr->PciInfo->device,
+			      iptr->PciInfo->func);
+
+	if (!xf86SetGamma(pScrn, gzeros))
+		return FALSE;
+
+	if (iptr->Chipset == PCI_IMSTT3D) {
+		iptr->ramdac = RAMDAC_TVP;
+		iptr->videoRam = 0x800000;
+	}
+
+	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "using %s ramdac\n", iptr->ramdac == RAMDAC_TVP ? "TVP" : "IBM");
+
+	if (!IMSTTMapMem(pScrn)) {
+		IMSTTFreeRec(pScrn);
+		return FALSE;
+	}
+
+	if (!pScrn->videoRam) {
+		xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+			   "probed videoram = %dk\n",
+			   (iptr->videoRam / 1024));
+		pScrn->videoRam = (iptr->videoRam / 1024);
+	} else {
+		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+			   "videoram = %dk\n",
+			   pScrn->videoRam);
+	}
+
+	/* XXX this is sorta a guess, got some info from the TVP3030 manual */
+	pScrn->numClocks = 2;
+	pScrn->clock[0] = 110000;
+	pScrn->clock[1] = 220000;
+
+	clockRanges = xnfcalloc(sizeof(ClockRange), 1);
+	clockRanges->next = NULL;
+	clockRanges->minClock = 20000;
+	clockRanges->maxClock = 120000;	/* i don't want to blow up anything */
+	clockRanges->clockIndex = -1;
+	clockRanges->interlaceAllowed = FALSE;	/* ? */
+	clockRanges->doubleScanAllowed = FALSE; /* ? */
+
+	i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
+			      pScrn->display->modes, clockRanges,
+			      NULL, 256, 2048, pScrn->bitsPerPixel,
+			      128, 2048, pScrn->virtualX,
+			      pScrn->display->virtualY,
+			      iptr->videoRam, LOOKUP_BEST_REFRESH);
+
+	if (i < 1 && iptr->FBDev) {
+		fbdevHWUseBuildinMode(pScrn);
+		pScrn->displayWidth = pScrn->virtualX;	/* XXX */
+		i = i;
+	}
+
+	if (i == -1) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "no valid modes left\n");
+		IMSTTFreeRec(pScrn);
+		return FALSE;
+	}
+
+	xf86PruneDriverModes(pScrn);
+
+	if (i == 0 || pScrn->modes == NULL) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes found\n");
+		IMSTTFreeRec(pScrn);
+		return FALSE;
+	}
+
+	xf86SetCrtcForModes(pScrn, 0);
+	pScrn->currentMode = pScrn->modes;
+	xf86PrintModes(pScrn);
+	xf86SetDpi(pScrn, 0, 0);
+
+	switch (pScrn->bitsPerPixel) {
+		case 8:
+			mod = "cfb";
+			reqSym = "cfbScreenInit";
+			break;
+		case 16:
+			mod = "cfb16";
+			reqSym = "cfb16ScreenInit";
+			break;
+		case 32:
+			mod = "cfb32";
+			reqSym = "cfb32ScreenInit";
+			break;
+	}
+	if (mod && xf86LoadSubModule(pScrn, mod) == NULL) {
+		IMSTTFreeRec(pScrn);
+		return FALSE;
+	}
+
+	xf86LoaderReqSymbols(reqSym, NULL);
+
+	if (!iptr->NoAccel) {
+		if (!xf86LoadSubModule(pScrn, "xaa"))
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+
+
+static Bool IMSTTMapMem(ScrnInfoPtr pScrn)
+{
+	IMSTTPtr iptr;
+
+	iptr = IMSTTPTR(pScrn);
+
+	if (iptr->FBDev) {
+		iptr->MMIOBase = fbdevHWMapMMIO(pScrn);
+	} else {
+		iptr->MMIOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, iptr->PciTag,
+					       iptr->PciInfo->memBase[0] + 0x800000,
+					       0x1000);
+	}
+	if (!iptr->MMIOBase) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Internal error: could not map MMIO\n");
+		return FALSE;
+	}
+
+	IMSTTGetVideoMemSize(pScrn);
+
+	if (iptr->FBDev) {
+		iptr->FBBase = fbdevHWMapVidmem(pScrn);
+	} else {
+		iptr->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, iptr->PciTag,
+					     iptr->PciInfo->memBase[0],
+					     iptr->videoRam);
+	}
+	if (!iptr->FBBase) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Internal error: could not map framebuffer\n");
+		return FALSE;
+	}
+
+	if (iptr->InitDAC) {
+		iptr->CMAPBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, iptr->PciTag,
+					       iptr->PciInfo->memBase[0] + 0x840000,
+					       0x1000);
+		if (!iptr->CMAPBase) {
+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				   "Internal error: could not map CMAP\n");
+			return FALSE;
+		}
+	}
+
+	pScrn->fbOffset = 0;
+
+	return TRUE;
+}
+
+
+static void IMSTTUnmapMem(ScrnInfoPtr pScrn)
+{
+	IMSTTPtr iptr;
+
+	iptr = IMSTTPTR(pScrn);
+
+	if (iptr->FBDev) {
+		fbdevHWUnmapMMIO(pScrn);
+	} else {
+		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)iptr->MMIOBase,
+				0x1000);
+	}
+
+	if (iptr->InitDAC) {
+		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)iptr->CMAPBase,
+				0x1000);
+	}
+
+	if (iptr->FBDev) {
+		fbdevHWUnmapVidmem(pScrn);
+	} else {
+		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)iptr->FBBase,
+				iptr->videoRam);
+	}
+
+	return;
+}
+
+
+
+static void IMSTTGetVideoMemSize(ScrnInfoPtr pScrn)
+{
+	IMSTTPtr iptr;
+	IMSTTMMIO_VARS();
+	unsigned long tmp;
+
+	tmp = INREG(IMSTT_PRC);
+	if (iptr->ramdac == RAMDAC_IBM)
+		iptr->videoRam = (tmp & 0x0004) ? 0x400000 : 0x200000;
+	else
+		iptr->videoRam = 0x800000;
+
+	return;
+}
+
+
+static Bool IMSTTScreenInit(int scrnIndex, ScreenPtr pScreen,
+			    int argc, char **argv)
+{
+	ScrnInfoPtr pScrn;
+	IMSTTPtr iptr;
+	IMSTTMMIO_VARS();
+	unsigned long tmp;
+	VisualPtr visual;
+	int r = TRUE;
+
+	pScrn = xf86Screens[pScreen->myNum];
+	iptr = IMSTTPTR(pScrn);
+
+	/* initialize the card */
+	tmp = INREG(IMSTT_STGCTL);
+	OUTREG(IMSTT_STGCTL, tmp & ~0x1);
+	OUTREG(IMSTT_SSR, 0);
+
+	if (iptr->InitDAC) {
+		/* set default values for DAC registers */
+		if (iptr->ramdac == RAMDAC_IBM) {
+			iptr->CMAPBase[IBM624_PPMASK] = 0xff;	eieio();
+			iptr->CMAPBase[IBM624_PIDXHI] = 0;	eieio();
+			OUTREGPI(IBM624_CLKCTL, 0x21);
+			OUTREGPI(IBM624_SYNCCTL, 0x00);
+			OUTREGPI(IBM624_HSYNCPOS, 0x00);
+			OUTREGPI(IBM624_PWRMNGMT, 0x00);
+			OUTREGPI(IBM624_DACOP, 0x02);
+			OUTREGPI(IBM624_PALETCTL, 0x00);
+			OUTREGPI(IBM624_SYSCLKCTL, 0x01);
+			OUTREGPI(IBM624_BPP8, 0x00);
+			OUTREGPI(IBM624_BPP16, 0x01);
+			OUTREGPI(IBM624_BPP24, 0x00);
+			OUTREGPI(IBM624_BPP32, 0x00);
+			OUTREGPI(IBM624_PIXCTL1, 0x05);
+			OUTREGPI(IBM624_PIXCTL2, 0x00);
+			OUTREGPI(IBM624_SYSCLKN, 0x08);
+			OUTREGPI(IBM624_SYSCLKM, 0x4f);
+			OUTREGPI(IBM624_SYSCLKP, 0x00);
+			OUTREGPI(IBM624_SYSCLKC, 0x00);
+			OUTREGPI(IBM624_CURSCTL, 0x00);
+			OUTREGPI(IBM624_CURSACCTL, 0x01);
+			OUTREGPI(IBM624_CURSACATTR, 0xa8);
+			OUTREGPI(IBM624_CURS1R, 0xff);
+			OUTREGPI(IBM624_CURS1G, 0xff);
+			OUTREGPI(IBM624_CURS1B, 0xff);
+			OUTREGPI(IBM624_CURS2R, 0xff);
+			OUTREGPI(IBM624_CURS2G, 0xff);
+			OUTREGPI(IBM624_CURS2B, 0xff);
+			OUTREGPI(IBM624_CURS3R, 0xff);
+			OUTREGPI(IBM624_CURS3G, 0xff);
+			OUTREGPI(IBM624_CURS3B, 0xff);
+			OUTREGPI(IBM624_BORDR, 0xff);
+			OUTREGPI(IBM624_BORDG, 0xff);
+			OUTREGPI(IBM624_BORDB, 0xff);
+			OUTREGPI(IBM624_MISCTL1, 0x01);
+			OUTREGPI(IBM624_MISCTL2, 0x45);
+			OUTREGPI(IBM624_MISCTL3, 0x00);
+			OUTREGPI(IBM624_KEYCTL, 0x00);
+		} else {
+			OUTREGPT(TVP_IRICC, 0x00);
+			OUTREGPT(TVP_IRBRC, 0xe4);
+			OUTREGPT(TVP_IRLAC, 0x06);
+			OUTREGPT(TVP_IRTCC, 0x80);
+			OUTREGPT(TVP_IRMXC, 0x4d);
+			OUTREGPT(TVP_IRCLS, 0x05);
+			OUTREGPT(TVP_IRPPG, 0x00);
+			OUTREGPT(TVP_IRGEC, 0x00);
+			OUTREGPT(TVP_IRMIC, 0x08);
+			OUTREGPT(TVP_IRCKL, 0xff);
+			OUTREGPT(TVP_IRCKH, 0xff);
+			OUTREGPT(TVP_IRCRL, 0xff);
+			OUTREGPT(TVP_IRCRH, 0xff);
+			OUTREGPT(TVP_IRCGL, 0xff);
+			OUTREGPT(TVP_IRCGH, 0xff);
+			OUTREGPT(TVP_IRCBL, 0xff);
+			OUTREGPT(TVP_IRCBH, 0xff);
+			OUTREGPT(TVP_IRCKC, 0x00);
+			OUTREGPT(TVP_IRPLA, 0x00);
+			OUTREGPT(TVP_IRPPD, 0xc0);
+			OUTREGPT(TVP_IRPPD, 0xd5);
+			OUTREGPT(TVP_IRPPD, 0xea);
+			OUTREGPT(TVP_IRPLA, 0x00);
+			OUTREGPT(TVP_IRMPD, 0xb9);
+			OUTREGPT(TVP_IRMPD, 0x3a);
+			OUTREGPT(TVP_IRMPD, 0xb1);
+			OUTREGPT(TVP_IRPLA, 0x00);
+			OUTREGPT(TVP_IRLPD, 0xc1);
+			OUTREGPT(TVP_IRLPD, 0x3d);
+			OUTREGPT(TVP_IRLPD, 0xf3);
+		}
+	}
+
+	if (iptr->FBDev) {
+		if (!fbdevHWModeInit(pScrn, pScrn->currentMode))
+			return FALSE;
+	} else {
+		if (!IMSTTModeInit(pScrn, pScrn->currentMode))
+			return FALSE;
+	}
+
+	pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);	
+
+	miClearVisualTypes();
+
+	if (pScrn->bitsPerPixel > 8) {
+		if (!miSetVisualTypes(pScrn->depth, TrueColorMask,
+				      pScrn->rgbBits, pScrn->defaultVisual))
+			return FALSE;
+	} else {
+		if (!miSetVisualTypes(pScrn->depth, miGetDefaultVisualMask(pScrn->depth),
+				      pScrn->rgbBits, pScrn->defaultVisual))
+			return FALSE;
+	}
+
+	switch (pScrn->bitsPerPixel) {
+		case 8:
+			r = cfbScreenInit(pScreen, iptr->FBBase, pScrn->virtualX,
+					  pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+					  pScrn->displayWidth);
+			break;
+		case 16:
+			r = cfb16ScreenInit(pScreen, iptr->FBBase, pScrn->virtualX,
+					  pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+					  pScrn->displayWidth);
+			break;
+		case 24:
+			r = cfb24ScreenInit(pScreen, iptr->FBBase, pScrn->virtualX,
+					  pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+					  pScrn->displayWidth);
+			break;
+		case 32:
+			r = cfb32ScreenInit(pScreen, iptr->FBBase, pScrn->virtualX,
+					  pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+					  pScrn->displayWidth);
+			break;
+		default:
+			r = FALSE;
+			break;
+	}
+
+	if (!r) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ScreenInit failed\n");
+		return FALSE;
+	}
+
+	xf86SetBlackWhitePixels(pScreen);
+
+	if (pScrn->bitsPerPixel > 8) {
+		visual = pScreen->visuals + pScreen->numVisuals;
+		while (--visual >= pScreen->visuals) {
+			if ((visual->class | DynamicClass) == DirectColor) {
+				visual->offsetRed = pScrn->offset.red;
+				visual->offsetGreen = pScrn->offset.green;
+				visual->offsetBlue = pScrn->offset.blue;
+				visual->redMask = pScrn->mask.red;
+				visual->greenMask = pScrn->mask.green;
+				visual->blueMask = pScrn->mask.blue;
+			}
+		}
+	}
+
+	miInitializeBackingStore(pScreen);
+	xf86SetBackingStore(pScreen);
+
+	if (!iptr->NoAccel) {
+		if (IMSTTAccelInit(pScreen)) {
+			xf86DrvMsg(scrnIndex, X_INFO, "Acceleration enabled\n");
+		} else {
+			xf86DrvMsg(scrnIndex, X_ERROR, "Acceleration initailizatino failed\n");
+			xf86DrvMsg(scrnIndex, X_INFO, "Acceleration disabled\n");
+		}
+	} else {
+		xf86DrvMsg(scrnIndex, X_INFO, "Acceleration disabled\n");
+	}
+
+	miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+
+	if (!miCreateDefColormap(pScreen))
+		return FALSE;
+
+	if (!xf86HandleColormaps(pScreen, 256, 8, (iptr->FBDev ? fbdevHWLoadPalette : NULL),
+				 NULL, CMAP_RELOAD_ON_MODE_SWITCH))
+		return FALSE;
+
+	if (serverGeneration == 1)
+		xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+
+	return TRUE;
+}
+
+
+
+
+static Bool IMSTTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) 
+{
+	IMSTTPtr iptr;
+	IMSTTMMIO_VARS();
+	unsigned long mhz;
+	unsigned short hes, heb, veb, htp, vtp;
+
+	iptr = IMSTTPTR(pScrn);
+
+	if (iptr->ramdac == RAMDAC_IBM) {
+		switch (pScrn->displayWidth) {
+			case 640:
+				hes = 0x0008;
+				heb = 0x0012;
+				veb = 0x002a;
+				htp = 10;
+				vtp = 2;
+				mhz = 30;
+				break;
+			case 832:
+				hes = 0x0005;
+				heb = 0x0020;
+				veb = 0x0028;
+				htp = 8;
+				vtp = 3;
+				mhz = 57;
+				break;
+			case 1024:
+				hes = 0x000a;
+				heb = 0x001c;
+				veb = 0x0020;
+				htp = 8;
+				vtp = 3;
+				mhz = 80;
+				break;
+			case 1152:
+				hes = 0x0012;
+				heb = 0x0022;
+				veb = 0x0031;
+				htp = 4;
+				vtp = 3;
+				mhz = 101;
+				break;
+			case 1280:
+				hes = 0x0012;
+				heb = 0x002f;
+				veb = 0x0029;
+				htp = 4;
+				vtp = 1;
+				mhz = 135;	/* XXX check for 1280x960 */
+				break;
+			case 1600:
+				hes = 0x0018;
+				heb = 0x0040;
+				veb = 0x002a;
+				htp = 4;
+				vtp = 3;
+				mhz = 200;
+				break;
+			default:
+				return FALSE;
+		}
+
+		IMSTTSetClock(pScrn, mhz);
+
+		iptr->hes = hes;
+		iptr->heb = heb;
+		iptr->hsb = heb + (pScrn->displayWidth >> 3);
+		iptr->ht = iptr->hsb + htp;
+		iptr->ves = 0x0003;
+		iptr->veb = veb;
+		iptr->vsb = veb + pScrn->virtualY;
+		iptr->vt = iptr->vsb + vtp;
+		iptr->vil = iptr->vsb;
+		iptr->pitch = pScrn->displayWidth;
+	} else {
+		iptr->pitch = pScrn->displayWidth;
+		switch (pScrn->displayWidth) {
+			case 640:
+				iptr->hes = 0x0004;
+				iptr->heb = 0x0009;
+				iptr->hsb = 0x0031;
+				iptr->ht = 0x0036;
+				iptr->ves = 0x0003;
+				iptr->veb = 0x002a;
+				iptr->vsb = 0x020a;
+				iptr->vt = 0x020d;
+				iptr->vil = 0x020a;
+				iptr->pclk_m = 0xef;
+				iptr->pclk_n = 0x2e;
+				iptr->pclk_p = 0xb2;
+				iptr->mlc[0] = 0x39;
+				iptr->mlc[1] = 0x39;
+				iptr->mlc[2] = 0x38;
+				iptr->lckl_p[0] = 0xf3;
+				iptr->lckl_p[1] = 0xf3;
+				iptr->lckl_p[2] = 0xf3;
+			case 800:
+				iptr->hes = 0x0005;
+				iptr->heb = 0x000e;
+				iptr->hsb = 0x0040;
+				iptr->ht = 0x0042;
+				iptr->ves = 0x0003;
+				iptr->veb = 0x0018;
+				iptr->vsb = 0x0270;
+				iptr->vt = 0x0271;
+				iptr->vil = 0x0270;
+				iptr->pclk_m = 0xf6;
+				iptr->pclk_n = 0x2e;
+				iptr->pclk_p = 0xf2;
+				iptr->mlc[0] = 0x3a;
+				iptr->mlc[1] = 0x39;
+				iptr->mlc[2] = 0x38;
+				iptr->lckl_p[0] = 0xf3;
+				iptr->lckl_p[1] = 0xf3;
+				iptr->lckl_p[2] = 0xf3;
+			case 832:
+				iptr->hes = 0x0004;
+				iptr->heb = 0x0011;
+				iptr->hsb = 0x0045;
+				iptr->ht = 0x0048;
+				iptr->ves = 0x0003;
+				iptr->veb = 0x002a;
+				iptr->vsb = 0x029a;
+				iptr->vt = 0x029b;
+				iptr->vil = 0x0000;
+				iptr->pclk_m = 0xfe;
+				iptr->pclk_n = 0x3e;
+				iptr->pclk_p = 0xf1;
+				iptr->mlc[0] = 0x39;
+				iptr->mlc[1] = 0x38;
+				iptr->mlc[2] = 0x38;
+				iptr->lckl_p[0] = 0xf3;
+				iptr->lckl_p[1] = 0xf3;
+				iptr->lckl_p[2] = 0xf2;
+			case 1024:
+				iptr->hes = 0x0006;
+				iptr->heb = 0x0210;
+				iptr->hsb = 0x0250;
+				iptr->ht = 0x0053;
+				iptr->ves = 0x1003;
+				iptr->veb = 0x0021;
+				iptr->vsb = 0x0321;
+				iptr->vt = 0x0324;
+				iptr->vil = 0x0000;
+				iptr->pclk_m = 0xfc;
+				iptr->pclk_n = 0x3a;
+				iptr->pclk_p = 0xf1;
+				iptr->mlc[0] = 0x39;
+				iptr->mlc[1] = 0x38;
+				iptr->mlc[2] = 0x38;
+				iptr->lckl_p[0] = 0xf3;
+				iptr->lckl_p[1] = 0xf3;
+				iptr->lckl_p[2] = 0xf2;
+			case 1152:
+				iptr->hes = 0x0009;
+				iptr->heb = 0x0011;
+				iptr->hsb = 0x0059;
+				iptr->ht = 0x005b;
+				iptr->ves = 0x0003;
+				iptr->veb = 0x0031;
+				iptr->vsb = 0x0397;
+				iptr->vt = 0x039a;
+				iptr->vil = 0x0000;
+				iptr->pclk_m = 0xfd;
+				iptr->pclk_n = 0x3a;
+				iptr->pclk_p = 0xf1;
+				iptr->mlc[0] = 0x39;
+				iptr->mlc[1] = 0x38;
+				iptr->mlc[2] = 0x38;
+				iptr->lckl_p[0] = 0xf3;
+				iptr->lckl_p[1] = 0xf3;
+				iptr->lckl_p[2] = 0xf2;
+			case 1280:
+				iptr->hes = 0x0009;
+				iptr->heb = 0x0018;
+				iptr->hsb = 0x0068;
+				iptr->ht = 0x006a;
+				iptr->ves = 0x0003;
+				iptr->veb = 0x0029;
+				iptr->vsb = 0x0429;
+				iptr->vt = 0x042a;
+				iptr->vil = 0x0000;
+				iptr->pclk_m = 0xf0;
+				iptr->pclk_n = 0x2d;
+				iptr->pclk_p = 0xf0;
+				iptr->mlc[0] = 0x38;
+				iptr->mlc[1] = 0x38;
+				iptr->mlc[2] = 0x38;
+				iptr->lckl_p[0] = 0xf3;
+				iptr->lckl_p[1] = 0xf2;
+				iptr->lckl_p[2] = 0xf1;
+			default:
+				return FALSE;
+		}
+	}
+
+	/* do it! */
+	IMSTTWriteMode(pScrn);
+	IMSTTAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+
+	return TRUE;
+}
+
+
+
+
+static void IMSTTSetClock(ScrnInfoPtr pScrn, unsigned long mhz)
+{
+	IMSTTPtr iptr;
+	unsigned long clk_m, clk_n, clk_p, x, stage, spilled;
+
+	iptr = IMSTTPTR(pScrn);
+	clk_m = clk_n = clk_p = 0;
+	stage = spilled = 0;
+
+	for (;;) {
+		switch (stage) {
+			case 0:
+				clk_m++;
+				break;
+			case 1:
+				clk_n++;
+				break;
+		}
+		x = 20 * (clk_m + 1) / ((clk_n + 1) * (clk_p ? 2 * clk_p : 1));
+		if (x == mhz)
+			break;
+		if (x > mhz) {
+			spilled = 1;
+			stage = 1;
+		} else if (spilled && x < mhz) {
+			stage = 0;
+		}
+	}
+
+	iptr->pclk_m = clk_m;
+	iptr->pclk_n = clk_n;
+	iptr->pclk_p = clk_p;
+}
+
+
+static void IMSTTWriteMode(ScrnInfoPtr pScrn)
+{
+	IMSTTPtr iptr;
+	unsigned char pixformat;
+	unsigned long ctl, pitch, byteswap, scr;
+	unsigned char tcc, mxc, lckl_n, mic, mlc, lckl_p;
+	IMSTTMMIO_VARS();
+
+	iptr = IMSTTPTR(pScrn);
+
+	pixformat = (pScrn->bitsPerPixel >> 3) + 2;
+
+	if (iptr->InitDAC && (pScrn->bitsPerPixel == 16)) {
+		if (iptr->ramdac == RAMDAC_IBM) {
+			iptr->CMAPBase[IBM624_PIDXHI] = 0;		eieio();
+			iptr->CMAPBase[IBM624_PIDXLO] = IBM624_BPP16;	eieio();
+			iptr->CMAPBase[IBM624_PIDXDATA] = 0x03;		eieio();
+		} else {
+			iptr->CMAPBase[TVP_ADDRW] = TVP_IRTCC;		eieio();
+			iptr->CMAPBase[TVP_IDATA] = 0x45;		eieio();
+		}
+	}
+
+	/* XXX do for 15bpp */
+
+	if ((iptr->ramdac == RAMDAC_IBM) && (iptr->InitDAC)) {
+		iptr->CMAPBase[IBM624_PIDXHI] = 0;			eieio();
+		iptr->CMAPBase[IBM624_PIDXLO] = IBM624_PIXM0;		eieio();
+		iptr->CMAPBase[IBM624_PIDXDATA] = iptr->pclk_m;		eieio();
+		iptr->CMAPBase[IBM624_PIDXLO] = IBM624_PIXN0;		eieio();
+		iptr->CMAPBase[IBM624_PIDXDATA] = iptr->pclk_n;		eieio();
+		iptr->CMAPBase[IBM624_PIDXLO] = IBM624_PIXP0;		eieio();
+		iptr->CMAPBase[IBM624_PIDXDATA] = iptr->pclk_p;		eieio();
+		iptr->CMAPBase[IBM624_PIDXLO] = IBM624_PIXC0;		eieio();
+		iptr->CMAPBase[IBM624_PIDXDATA] = 0x02;			eieio();
+		iptr->CMAPBase[IBM624_PIDXLO] = IBM624_PIXFMT;		eieio();
+		iptr->CMAPBase[IBM624_PIDXDATA] = pixformat;		eieio();
+	}
+
+	if ((iptr->ramdac == RAMDAC_TVP) && (iptr->InitDAC)) {
+		switch (pScrn->bitsPerPixel) {
+			case 8:
+				tcc = 0x80;
+				mxc = 0x4d;
+				lckl_n = 0xc1;
+				mlc = iptr->mlc[0];
+				lckl_p = iptr->lckl_p[0];
+				break;
+			case 16:
+				tcc = 0x44;
+				mxc = 0x55;
+				lckl_n = 0xe1;
+				mlc = iptr->mlc[1];
+				lckl_p = iptr->lckl_p[1];
+				break;
+			case 24:
+				tcc = 0x5e;
+				mxc = 0x5d;
+				lckl_n = 0xf1;
+				mlc = iptr->mlc[2];
+				lckl_p = iptr->lckl_p[2];
+				break;
+			case 32:
+				tcc = 0x46;
+				mxc = 0x5d;
+				lckl_n = 0xf1;
+				mlc = iptr->mlc[2];
+				lckl_p = iptr->lckl_p[2];
+				break;
+		}
+
+		mic = 0x08;
+
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRPLA;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = 0x00;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRPPD;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = iptr->pclk_m;		eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRPPD;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = iptr->pclk_n;		eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRPPD;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = iptr->pclk_p;		eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRTCC;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = tcc;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRMXC;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = mxc;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRMIC;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = mic;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRPLA;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = 0x00;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRLPD;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = lckl_n;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRPLA;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = 0x15;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRMLC;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = mlc;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRPLA;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = 0x2a;			eieio();
+		iptr->CMAPBase[TVP_ADDRW] = TVP_IRLPD;			eieio();
+		iptr->CMAPBase[TVP_IDATA] = lckl_p;			eieio();
+	}
+
+	switch (pScrn->bitsPerPixel) {
+		case 8:
+			ctl = 0x17b1;
+			pitch = iptr->pitch >> 2;
+			byteswap = 0x000;
+			break;
+		case 16:
+			ctl = 0x17b3;
+			pitch = iptr->pitch >> 1;
+			byteswap = 0x100;
+			break;
+		case 24:
+			ctl = 0x17b9;
+			pitch = iptr->pitch - (iptr->pitch >> 2);
+			byteswap = 0x200;
+			break;
+		case 32:
+			ctl = 0x17b5;
+			pitch = iptr->pitch;
+			byteswap = 0x300;
+			break;
+	}
+
+	if (iptr->ramdac == RAMDAC_TVP)
+		ctl -= 0x30;
+
+	OUTREG(IMSTT_HES, iptr->hes);
+	OUTREG(IMSTT_HEB, iptr->heb);
+	OUTREG(IMSTT_HSB, iptr->hsb);
+	OUTREG(IMSTT_HT, iptr->ht);
+	OUTREG(IMSTT_VES, iptr->ves);
+	OUTREG(IMSTT_VEB, iptr->veb);
+	OUTREG(IMSTT_VSB, iptr->vsb);
+	OUTREG(IMSTT_VT, iptr->vt);
+	OUTREG(IMSTT_VIL, iptr->vil);
+	OUTREG(IMSTT_HCIV, 1);
+	OUTREG(IMSTT_VCIV, 1);
+	OUTREG(IMSTT_TCDR, 4);
+	OUTREG(IMSTT_RRCIV, 1);
+	OUTREG(IMSTT_RRSC, 0x980);
+	OUTREG(IMSTT_RRCR, 0x11);
+
+	if (iptr->ramdac == RAMDAC_IBM) {
+		OUTREG(IMSTT_HRIR, 0x0100);
+		OUTREG(IMSTT_CMR, 0x00ff);
+		OUTREG(IMSTT_SRGCTL, 0x0073);
+	} else {
+		OUTREG(IMSTT_HRIR, 0x0200);
+		OUTREG(IMSTT_CMR, 0x01ff);
+		OUTREG(IMSTT_SRGCTL, 0x0003);
+	}
+
+	switch (iptr->videoRam) {
+		case 0x200000:
+			scr = 0x059d | byteswap;
+			break;
+		default:
+			/* 0x400000 and 0x800000 */
+			pitch >>= 1;
+			scr = 0x150dd | byteswap;
+			break;
+	}
+
+	OUTREG(IMSTT_SCR, scr);
+	OUTREG(IMSTT_SPR, pitch);
+	OUTREG(IMSTT_STGCTL, ctl);
+
+	return;
+}
+
+
+
+static void IMSTTAdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+	IMSTTPtr iptr;
+	IMSTTMMIO_VARS();
+	unsigned long offset;
+
+	iptr = IMSTTPTR(pScrn);
+
+	offset = y * pScrn->displayWidth + x;
+	offset &= ~7;
+
+	OUTREG(IMSTT_SSR, offset);
+
+	return;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h:1.2
--- /dev/null	Sat Jul  1 20:42:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h	Mon Jun 19 08:01:02 2000
@@ -0,0 +1,215 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.2 2000/06/19 15:01:02 tsi Exp $ */
+
+#ifndef _IMSTT_REG_H
+#define _IMSTT_REG_H
+
+
+
+#if defined(__powerpc__)
+
+static inline void regw(unsigned long base_addr, unsigned long regindex, unsigned long regdata)
+{
+	asm volatile ("stwbrx %1,%2,%3; eieio"
+		      : "=m" (*(volatile unsigned *)(base_addr+regindex))
+		      : "r" (regdata), "b" (regindex), "r" (base_addr));
+}
+
+
+static inline unsigned long regr(unsigned long base_addr, unsigned long regindex)
+{
+	register unsigned long val;
+
+	asm volatile ("lwbrx %0,%1,%2; eieio"
+		      : "=r" (val)
+		      : "b" (regindex), "r" (base_addr),
+		      "m" (*(volatile unsigned *)(base_addr+regindex)));
+
+	return (val);
+}
+
+
+#define INREG(addr)		regr(((unsigned long)IMSTTMMIO), (addr))
+#define OUTREG(addr, val)	regw(((unsigned long)IMSTTMMIO), (addr), (val))
+
+#else
+
+#define INREG(addr)		MMIO_IN32(IMSTTMMIO, addr)
+#define OUTREG(addr, val)	MMIO_OUT32(IMSTTMMIO, addr, val)
+
+#endif
+
+#define OUTREGPI(addr, val)	iptr->CMAPBase[IBM624_PIDXLO] = addr;	eieio(); \
+				iptr->CMAPBase[IBM624_PIDXDATA] = val;	eieio()
+#define OUTREGPT(addr, val)	iptr->CMAPBase[TVP_ADDRW] = addr;	eieio(); \
+				iptr->CMAPBase[TVP_IDATA] = val;	eieio()
+
+#define IMSTTMMIO_VARS()	\
+	unsigned long *IMSTTMMIO = IMSTTPTR(pScrn)->MMIOBase
+
+
+/* TwinTurbo (Cosmo) registers */
+
+#define	IMSTT_S1SA	0x00
+#define IMSTT_S2SA	0x04
+#define IMSTT_SP	0x08
+#define IMSTT_DSA	0x0c
+#define IMSTT_CNT	0x10
+#define IMSTT_DP_OCTL	0x14
+#define	IMSTT_CLR	0x18
+#define	IMSTT_BI	0x20
+#define	IMSTT_MBC	0x24
+#define	IMSTT_BLTCTL	0x28
+
+/* scan timing generator registers */
+
+#define	IMSTT_HES	0x30
+#define	IMSTT_HEB	0x34
+#define	IMSTT_HSB	0x38
+#define	IMSTT_HT	0x3c
+#define	IMSTT_VES	0x40
+#define	IMSTT_VEB	0x44
+#define	IMSTT_VSB	0x48
+#define	IMSTT_VT	0x4c
+#define	IMSTT_HCIV	0x50
+#define	IMSTT_VCIV	0x54
+#define	IMSTT_TCDR	0x58
+#define	IMSTT_VIL	0x5c
+#define	IMSTT_STGCTL	0x60
+
+/* screen refresh generator registers */
+
+#define	IMSTT_SSR	0x64
+#define	IMSTT_HRIR	0x68
+#define	IMSTT_SPR	0x6c
+#define	IMSTT_CMR	0x70
+#define	IMSTT_SRGCTL	0x74
+
+/* RAM refresh generator registers */
+
+#define	IMSTT_RRCIV	0x78
+#define	IMSTT_RRSC	0x7c
+#define	IMSTT_RRCR	0x88
+
+/* system registers */
+
+#define	IMSTT_GIOE	0x80
+#define	IMSTT_GIO	0x84
+#define	IMSTT_SCR	0x8c
+#define	IMSTT_SSTATUS	0x90
+#define	IMSTT_PRC	0x94
+
+
+/* IBM 624 RAMDAC direct registers */
+
+#define	IBM624_PADDRW	0x00
+#define	IBM624_PDATA	0x04
+#define	IBM624_PPMASK	0x08
+#define	IBM624_PADDRR	0x0c
+#define	IBM624_PIDXLO	0x10
+#define	IBM624_PIDXHI	0x14
+#define	IBM624_PIDXDATA	0x18
+#define	IBM624_PIDXCTL	0x1c
+
+/* IBM 624 RAMDAC indirect registers */
+
+#define IBM624_CLKCTL	0x02	/* Misc Clock Control */
+#define IBM624_SYNCCTL	0x03	/* Sync Control */
+#define IBM624_HSYNCPOS	0x04	/* Horiz Sync Position */
+#define IBM624_PWRMNGMT	0x05	/* Power Management */
+#define IBM624_DACOP	0x06	/* DAC Operation */
+#define IBM624_PALETCTL	0x07	/* Palette Control */
+#define IBM624_SYSCLKCTL 0x08	/* System Clock Control */
+#define IBM624_PIXFMT	0x0a	/* Pixel Format [bpp >> 3 + 2] */
+#define IBM624_BPP8	0x0b	/* 8bpp */
+#define IBM624_BPP16	0x0c	/* 16bpp */
+#define IBM624_BPP24	0x0d	/* 24bpp */
+#define IBM624_BPP32	0x0e	/* 32bpp */
+#define IBM624_PIXCTL1	0x10	/* Pixel PLL Control 1 */
+#define IBM624_PIXCTL2	0x11	/* Pixel PLL Control 2 */
+#define IBM624_SYSCLKN	0x15	/* System Clock N */
+#define IBM624_SYSCLKM	0x16	/* System Clock M */
+#define IBM624_SYSCLKP	0x17	/* System Clock P */
+#define IBM624_SYSCLKC	0x18	/* System Clock C */
+#define IBM624_PIXM0	0x20	/* Pixel M 0 */
+#define IBM624_PIXN0	0x21	/* Pixel N 0 */
+#define IBM624_PIXP0	0x22	/* Pixel P 0 */
+#define IBM624_PIXC0	0x23	/* Pixel C 0 */
+#define IBM624_CURSCTL	0x30	/* Cursor Control */
+#define IBM624_CURSXLO	0x31	/* Cursor X position, low 8 bits */
+#define IBM624_CURSXHI	0x32	/* Cursor X position, high 8 bits */
+#define IBM624_CURSYLO	0x33	/* Cursor Y position, low 8 bits */
+#define IBM624_CURSYHI	0x34	/* Cursor Y postition, high 8 bits */
+#define IBM624_CURSHOTX	0x35	/* Cursor Hot Spot X */
+#define IBM624_CURSHOTY	0x36	/* Cursor Hot Spot Y */
+#define IBM624_CURSACCTL 0x37	/* Advanced Cursor Control Enable */
+#define IBM624_CURSACATTR 0x38	/* Advanced Cursor Attribute */
+#define IBM624_CURS1R	0x40	/* Cursor 1 red */
+#define IBM624_CURS1G	0x41	/* Cursor 1 green */
+#define IBM624_CURS1B	0x42	/* Cursor 1 blue */
+#define IBM624_CURS2R	0x43	/* Cursor 2 red */
+#define IBM624_CURS2G	0x44	/* Cursor 2 green */
+#define IBM624_CURS2B	0x45	/* Cursor 2 blue */
+#define IBM624_CURS3R	0x46	/* Cursor 3 red */
+#define IBM624_CURS3G	0x47	/* Cursor 3 green */
+#define IBM624_CURS3B	0x48	/* Cursor 3 blue */
+#define IBM624_BORDR	0x60	/* Border color red */
+#define IBM624_BORDG	0x61	/* Border color green */
+#define IBM624_BORDB	0x62	/* Border color blue */
+#define IBM624_MISCTL1	0x70	/* Misc control 1 */
+#define IBM624_MISCTL2	0x71	/* Misc control 2 */
+#define IBM624_MISCTL3	0x72	/* Misc control 3 */
+#define IBM624_KEYCTL	0x78	/* Key Control/DB operation */
+
+/* TI TVP 3030 RAMDAC direct registers */
+
+#define	TVP_ADDRW	0x00
+#define	TVP_PDATA	0x04
+#define	TVP_PMASK	0x08
+#define	TVP_PADRR	0x0c
+#define	TVP_CADRW	0x10
+#define	TVP_CDATA	0x14
+#define	TVP_CADRR	0x1c
+#define	TVP_DCCTL	0x24
+#define	TVP_IDATA	0x28
+#define	TVP_CRDAT	0x2c
+#define	TVP_CXPOL	0x30
+#define	TVP_CXPOH	0x34
+#define	TVP_CYPOL	0x38
+#define	TVP_CYPOH	0x3c
+
+/* TI TVP 3030 RAMDAC indirect registers */
+
+
+#define	TVP_IRREV	0x01
+#define	TVP_IRICC	0x06
+#define	TVP_IRBRC	0x07
+#define	TVP_IRLAC	0x0f
+#define	TVP_IRTCC	0x18
+#define	TVP_IRMXC	0x19
+#define	TVP_IRCLS	0x1a
+#define	TVP_IRPPG	0x1c
+#define	TVP_IRGEC	0x1d
+#define	TVP_IRMIC	0x1e
+#define	TVP_IRPLA	0x2c
+#define	TVP_IRPPD	0x2d
+#define	TVP_IRMPD	0x2e
+#define	TVP_IRLPD	0x2f
+#define	TVP_IRCKL	0x30
+#define	TVP_IRCKH	0x31
+#define	TVP_IRCRL	0x32
+#define	TVP_IRCRH	0x33
+#define	TVP_IRCGL	0x34
+#define	TVP_IRCGH	0x35
+#define	TVP_IRCBL	0x36
+#define	TVP_IRCBH	0x37
+#define	TVP_IRCKC	0x38
+#define	TVP_IRMLC	0x39
+#define	TVP_IRSEN	0x3a
+#define	TVP_IRTMD	0x3b
+#define	TVP_IRRML	0x3c
+#define	TVP_IRRMM	0x3d
+#define	TVP_IRRMS	0x3e
+#define	TVP_IRDID	0x3f
+#define	TVP_IRRES	0xff
+
+#endif /* _IMSTT_REG_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile:1.32 xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile:1.33
--- xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile:1.32	Mon Feb 28 11:53:12 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile	Fri Jun 16 17:03:19 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile,v 1.32 2000/02/28 19:53:12 alanh Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile,v 1.33 2000/06/17 00:03:19 martin Exp $
 XCOMM
 XCOMM This is an Imakefile for the MGA driver.  
 XCOMM
@@ -6,14 +6,12 @@
 #define IHaveModules
 #include <Server.tmpl>
 
-#if 0
 #if BuildXF86DRI
-DRISRCS = mga_dri.c mga_warp.c mga_drm.c
-DRIOBJS = mga_dri.o mga_warp.o mga_drm.o
+DRISRCS = mga_dri.c mga_warp.c mga_wrap.c
+DRIOBJS = mga_dri.o mga_warp.o mga_wrap.o
 DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri \
-	-I$(XF86OSSRC)/linux/drm/kernel
+	-I$(XF86OSSRC)/linux/drm/kernel -I$(TOP)/include
 DRIDEFINES = $(GLX_DEFINES)
-#endif
 #endif
 
 SRCS = mga_driver.c mga_hwcurs.c /* mga_cmap.c */ mga_dac3026.c mga_dacG.c \
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga.cpp:1.13 xc/programs/Xserver/hw/xfree86/drivers/mga/mga.cpp:1.17
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga.cpp:1.13	Mon Mar  6 17:37:49 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga.cpp	Tue Jun 13 19:13:11 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.cpp,v 1.13 2000/03/07 01:37:49 dawes Exp $ 
-.TH MGA __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.cpp,v 1.17 2000/06/14 02:13:11 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH MGA __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 mga \- Matrox video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""mga"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qmga\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B mga 
 is an XFree86 driver for Matrox video cards.  The driver is fully
@@ -49,7 +49,7 @@
 The driver auto-detects the chipset type, but the following
 .B ChipSet
 names may optionally be specified in the config file
-.B """Device"""
+.B \*qDevice\*q
 section, and will override the auto-detection:
 .PP
 .RS 4
@@ -63,68 +63,74 @@
 memory should be specified with a
 .B VideoRam
 entry in the config file
-.B """Device"""
+.B \*qDevice\*q
 section.
 .PP
 The following driver
 .B Options
 are supported:
 .TP
-.BI "Option ""ColorKey"" """ integer """
+.BI "Option \*qColorKey\*q \*q" integer \*q
 Set the colormap index used for the transparency key for the depth 8 plane
 when operating in 8+24 overlay mode.  The value must be in the range
 2\-255.  Default: 255.
 .TP
-.BI "Option ""HWCursor"" """ boolean """
+.BI "Option \*qHWCursor\*q \*q" boolean \*q
 Enable or disable the HW cursor.  Default: on.
 .TP
-.BI "Option ""MGASDRAM"" """ boolean """
+.BI "Option \*qMGASDRAM\*q \*q" boolean \*q
 Specify whether G100 and G200 cards have SDRAM.  The driver attempts to
 auto-detect this based on the card's PCI subsystem ID.  This option may
 be used to override that auto-detection.  The mga driver is not able to 
 auto-detect the prescence SDRAM on secondary heads in multihead configurations.
 Default: auto-detected.
 .TP
-.BI "Option ""NoAccel"" """ boolean """
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
 .TP
-.BI "Option ""OverclockMem""
+.BI "Option \*qOverclockMem\*q"
 Set clocks to values used by some commercial X-Servers (G100, G200 and G400
 only).  Default: off.
 .TP
-.BI "Option ""Overlay""
+.BI "Option \*qOverlay\*q"
 Enable 8+24 overlay mode.  Only appropriate for depth 24.
 .RB ( Note: 
 the G100 is unaccelerated in the 8+24 overlay mode due to a missing 
 hardware feature) Default: off.
 .TP
-.BI "Option ""PciRetry"" """ boolean """
+.BI "Option \*qPciRetry\*q \*q" boolean \*q
 Enable or disable PCI retries.  Default: off.
 .TP
-.BI "Option ""Rotate"" ""CW""
+.BI "Option \*qRotate\*q \*qCW\*q"
 .TP
-.BI "Option ""Rotate"" ""CCW""
+.BI "Option \*qRotate\*q \*qCCW\*q"
 Rotate the display clockwise or counterclockwise.  This mode is unaccelerated.
 Default: no rotation.
 .TP
-.BI "Option ""ShadowFB"" """ boolean """
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  See
 shadowfb(__drivermansuffix__) for further information.  Default: off.
 .TP
-.BI "Option ""SyncOnGreen"" """ boolean """
+.BI "Option \*qSyncOnGreen\*q \*q" boolean \*q
 Enable or disable combining the sync signals with the green signal.
 Default: off.
 .TP
-.BI "Option ""UseFBDev"" """ boolean """
+.BI "Option \*qUseFBDev\*q \*q" boolean \*q
 Enable or disable use of on OS-specific fb interface (and is not supported
 on all OSs).  See fbdevhw(__drivermansuffix__) for further information.
 Default: off.
 .TP
-.BI "Option ""VideoKey"" """ integer """
+.BI "Option \*qVideoKey\*q \*q" integer \*q
 This sets the default pixel value for the YUV video overlay key.
 Default: undefined.
+.TP
+.BI "Option \*qTexturedVideo\*q \*q" boolean \*q
+This has XvImage support use the texture engine rather than the video overlay.
+This option is only supported by the G200 and G400, and only in 16 and 32 
+bits per pixel.
+Default: off.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Radoslaw Kapitan, Mark Vojkovich, and also David Dawes, Guy
 Desbief, Dirk Hohndel, Doug Merritt, Andrew E. Mileski, Andrew van der Stock,
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h:1.57 xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h:1.59
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h:1.57	Sat Feb 26 18:50:47 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h	Fri Jun 16 17:03:19 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.57 2000/02/27 02:50:47 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.59 2000/06/17 00:03:19 martin Exp $ */
 /*
  * MGA Millennium (MGA2064W) functions
  *
@@ -14,9 +14,6 @@
 #ifndef MGA_H
 #define MGA_H
 
-/* Temporarily turn off building in DRI support */
-#undef XF86DRI
-
 #include "compiler.h"
 #include "xaa.h"
 #include "xf86Cursor.h"
@@ -33,7 +30,6 @@
 #include "dri.h"
 #include "GL/glxint.h"
 #include "mga_dri.h"
-#include "mga_dripriv.h"
 #endif
 
 #if !defined(EXTRADEBUG)
@@ -60,6 +56,13 @@
 
 #define PORT_OFFSET 	(0x1F00 - 0x300)
 
+#define MGA_VERSION 4000
+#define MGA_NAME "MGA"
+#define MGA_DRIVER_NAME "mga"
+#define MGA_MAJOR_VERSION 1
+#define MGA_MINOR_VERSION 0
+#define MGA_PATCHLEVEL 0
+
 typedef struct {
     unsigned char	ExtVga[6];
     unsigned char 	DacClk[6];
@@ -70,6 +73,18 @@
 } MGARegRec, *MGARegPtr;
 
 typedef struct {
+   unsigned char brightness;
+   unsigned char contrast;
+   FBAreaPtr	area;
+   RegionRec	clip;
+   CARD32	colorKey;
+   CARD32	videoStatus;
+   Time		offTime;
+   Time		freeTime;
+   int		lastPort;
+} MGAPortPrivRec, *MGAPortPrivPtr;
+
+typedef struct {
     Bool	isHwCursor;
     int		CursorMaxWidth;
     int 	CursorMaxHeight;
@@ -103,7 +118,6 @@
     DisplayModePtr mode;
 } MGAFBLayout;
 
-
 /* Card-specific driver information */
 
 #define MGAPTR(p) ((MGAPtr)((p)->driverPrivate))
@@ -206,21 +220,29 @@
     MGAFBLayout		CurrentLayout;
     Bool		DrawTransparent;
     int			MaxBlitDWORDS;
-
+    Bool		TexturedVideo;
+    MGAPortPrivPtr	portPrivate;
+    int 		numXAALines;
 #ifdef XF86DRI
-   Bool directRenderingEnabled;
-   DRIInfoPtr pDRIInfo;
-   int drmSubFD;
-   int numVisualConfigs;
-   __GLXvisualConfig* pVisualConfigs;
-   MGAConfigPrivPtr pVisualConfigsPriv;
-   MGARegRec DRContextRegs;
-   MGADRIServerPrivatePtr  DRIServerInfo;
+    Bool		have_quiescense;
+    Bool 		directRenderingEnabled;
+    DRIInfoPtr 		pDRIInfo;
+    int 		drmSubFD;
+    int 		numVisualConfigs;
+    __GLXvisualConfig*	pVisualConfigs;
+    MGAConfigPrivPtr 	pVisualConfigsPriv;
+    MGARegRec		DRContextRegs;
+    MGADRIServerPrivatePtr  DRIServerInfo;
 #endif
-
     XF86VideoAdaptorPtr adaptor;
 } MGARec, *MGAPtr;
 
+#ifdef XF86DRI
+extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
+				void **configprivs);
+#endif
+
+
 extern CARD32 MGAAtype[16];
 extern CARD32 MGAAtypeNoBLK[16];
 
@@ -240,9 +262,9 @@
 #define TRANSPARENCY_KEY	255
 #define KEY_COLOR		0
 
-#define MGA_FRONT	0
-#define MGA_BACK	1
-#define MGA_DEPTH	2
+#define MGA_FRONT	0x1
+#define MGA_BACK	0x2
+#define MGA_DEPTH	0x4
 
 
 /* Prototypes */
@@ -271,14 +293,15 @@
 void MGADRICloseScreen(ScreenPtr pScreen);
 Bool MGADRIFinishScreenInit(ScreenPtr pScreen);
 void MGASwapContext(ScreenPtr pScreen);
-void MGALostContext(ScreenPtr pScreen);
-void MGASelectBuffer(MGAPtr pMGA, int which);
 Bool mgaConfigureWarp(ScrnInfoPtr pScrn);
 unsigned int mgaInstallMicrocode(ScreenPtr pScreen, int agp_offset);
 unsigned int mgaGetMicrocodeSize(ScreenPtr pScreen);
-Bool mgadrmCleanupDma(ScrnInfoPtr pScrn);
-Bool mgadrmInitDma(ScrnInfoPtr pScrn, int prim_size);
-
+void MGASelectBuffer(ScrnInfoPtr pScrn, int which);
+Bool MgaCleanupDma(ScrnInfoPtr pScrn);
+Bool MgaInitDma(ScrnInfoPtr pScrn, int prim_size);
+#ifdef XF86DRI
+Bool MgaLockUpdate(ScrnInfoPtr pScrn, drmLockFlags flags);
+#endif
 void MGARefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 void MGARefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 void MGARefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c:1.7 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c:1.7	Sat Aug 21 22:57:33 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c	Sun Jun 25 05:46:00 2000
@@ -19,7 +19,7 @@
 in this Software without prior written authorization from The Open Group.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.7 1999/08/22 05:57:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.9 2000/06/25 12:46:00 alanh Exp $ */
 
 
 #include "X.h"
@@ -34,6 +34,8 @@
 #include "scrnintstr.h"
 #include "xaa.h"
 #include "xaalocal.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
 #include "xf86_ansic.h"
 
 #include "xf86Pci.h"
@@ -68,6 +70,8 @@
     miZeroArcRec info;
     Bool do360;
     DDXPointRec org, orgo;
+
+    CHECK_DMA_QUIESCENT( pMga, infoRec->pScrn );
 
     (*infoRec->SetupForSolidFill)(infoRec->pScrn, pGC->fgPixel, 
 		pGC->alu, pGC->planemask);
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c:1.33 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c:1.36
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c:1.33	Thu Dec  2 20:03:52 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c	Fri Jun 16 17:03:19 2000
@@ -2,7 +2,7 @@
  * MGA-1064, MGA-G100, MGA-G200, MGA-G400 RAMDAC driver
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c,v 1.33 1999/12/03 04:03:52 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c,v 1.36 2000/06/17 00:03:19 martin Exp $ */
 
 /*
  * This is a first cut at a non-accelerated version to work with the
@@ -24,6 +24,7 @@
 
 #include "mga_bios.h"
 #include "mga_reg.h"
+#include "mga_macros.h"
 #include "mga.h"
 
 #include "xf86DDC.h"
@@ -46,6 +47,8 @@
 #define OPTION2_MASK	0xFFFFFFFF
 #define OPTION3_MASK	0xFFFFFFFF
 
+#define OPTION1_MASK_PRIMARY	0xFFFC0FF
+
 /*
  * Read/write to the DAC via MMIO 
  */
@@ -363,6 +366,8 @@
 			pReg->Option = 0x50044120;
 		   } 
 		}
+		if(pMga->HasSDRAM)
+		   pReg->Option &= ~(1 << 14);
 		pReg->Option2 = 0x01003000;
 		break;
 	case PCI_CHIP_MGAG200:
@@ -473,12 +478,6 @@
 	else
 		pReg->ExtVga[3]	= ((1 << BppShift) - 1) | 0x80;
 
-#if 0
-	/* Set viddelay (CRTCEXT3 Bits 3-4). */
-	pReg->ExtVga[3] |= (pScrn->videoRam == 8192 ? 0x10
-			     : pScrn->videoRam == 2048 ? 0x08 : 0x00);
-#endif
-
 	pReg->ExtVga[4]	= 0;
 		
 	pVga->CRTC[0]	= ht - 4;
@@ -592,8 +591,10 @@
 	       Bool restoreFonts)
 {
 	int i;
+	CARD32 optionMask;
 	MGAPtr pMga = MGAPTR(pScrn);
 
+	CHECK_DMA_QUIESCENT( pMga, pScrn );
 	/*
 	 * Code is needed to get things back to bank zero.
 	 */
@@ -614,8 +615,12 @@
 	    outMGAdac(i, mgaReg->DacRegs[i]);
 	}
 
+	/* Do not set the memory config for primary cards as it
+	   should be correct already */
+	optionMask = (pMga->Primary) ? OPTION1_MASK_PRIMARY : OPTION1_MASK; 
+
 	/* restore pci_option register */
-	pciSetBitsLong(pMga->PciTag, PCI_OPTION_REG, OPTION1_MASK,
+	pciSetBitsLong(pMga->PciTag, PCI_OPTION_REG, optionMask,
 		       mgaReg->Option);
 	if (pMga->Chipset != PCI_CHIP_MGA1064)
 		pciSetBitsLong(pMga->PciTag, PCI_MGA_OPTION2, OPTION2_MASK,
@@ -670,7 +675,9 @@
 {
 	int i;
 	MGAPtr pMga = MGAPTR(pScrn);
-	
+
+	CHECK_DMA_QUIESCENT( pMga, pScrn );
+
 	/* Allocate the DacRegs space if not done already */
 	if (mgaReg->DacRegs == NULL) {
 		mgaReg->DacRegs = xnfcalloc(DACREGSIZE, 1);
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c:1.1 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c:1.1	Fri Feb 11 09:25:55 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c	Fri Jun 23 16:43:44 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v 1.1 2000/02/11 17:25:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v 1.5 2000/06/23 23:43:44 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -22,7 +22,7 @@
 #include "mga.h"
 #include "mga_macros.h"
 #include "mga_dri.h"
-#include "mga_dripriv.h"
+#include "mga_wrap.h"
 
 static char MGAKernelDriverName[] = "mga";
 static char MGAClientDriverName[] = "mga";
@@ -51,250 +51,310 @@
 extern void Mga32DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, 
 			       RegionPtr prgnSrc, CARD32 index);
 
+Bool MgaCleanupDma(ScrnInfoPtr pScrn)
+{
+   MGAPtr pMGA = MGAPTR(pScrn);
+   Bool ret_val;
+
+   ret_val = drmMgaCleanupDma(pMGA->drmSubFD);
+   if (ret_val == FALSE)
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Mga Dma Cleanup Failed\n");
+
+   return ret_val;
+}
+
+Bool MgaLockUpdate(ScrnInfoPtr pScrn, drmLockFlags flags)
+{
+   MGAPtr pMGA = MGAPTR(pScrn);
+   Bool ret_val;
+
+   ret_val = drmMgaLockUpdate(pMGA->drmSubFD, flags);
+   if (ret_val == FALSE)
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "LockUpdate failed\n");
+
+   return ret_val;
+}
+
+Bool MgaInitDma(ScrnInfoPtr pScrn, int prim_size)
+{
+   MGAPtr pMGA = MGAPTR(pScrn);
+   MGADRIPtr pMGADRI = (MGADRIPtr)pMGA->pDRIInfo->devPrivate;
+   MGADRIServerPrivatePtr pMGADRIServer = pMGA->DRIServerInfo;
+   drmMgaInit init;
+   Bool ret_val;
+   
+   memset(&init, 0, sizeof(drmMgaInit));
+   init.reserved_map_agpstart = 0;
+   init.reserved_map_idx = 3;
+   init.buffer_map_idx = 4;
+   init.sarea_priv_offset = sizeof(XF86DRISAREARec);
+   init.primary_size = prim_size;
+   init.warp_ucode_size = pMGADRIServer->warp_ucode_size;
+
+   switch(pMGA->Chipset) {
+   case PCI_CHIP_MGAG400:
+      init.chipset = MGA_CARD_TYPE_G400;
+      break;
+   case PCI_CHIP_MGAG200:
+      init.chipset = MGA_CARD_TYPE_G200;
+      break;
+   case PCI_CHIP_MGAG200_PCI:
+   default:
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                 "[drm] Direct rendering not supported on this card/chipset\n");
+      return FALSE;
+   }
+
+   init.frontOffset = pMGADRI->frontOffset;
+   init.backOffset = pMGADRI->backOffset;
+   init.depthOffset = pMGADRI->depthOffset;
+   init.textureOffset = pMGADRI->textureOffset;
+   init.textureSize = pMGADRI->textureSize;
+   init.agpTextureSize = pMGADRI->agpTextureSize;
+   init.cpp = pMGADRI->cpp;
+   init.stride = pMGADRI->frontPitch;
+   init.mAccess = pMGA->MAccess;
+   init.sgram = !pMGA->HasSDRAM;
+   
+   memcpy(&init.WarpIndex, &pMGADRIServer->WarpIndex, 
+	  sizeof(drmMgaWarpIndex) * MGA_MAX_WARP_PIPES);
+
+   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] Mga Dma Initialization start\n");
+
+   ret_val = drmMgaInitDma(pMGA->drmSubFD, &init);
+   if (ret_val == FALSE)
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[drm] Mga Dma Initialization Failed\n");
+   else
+      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] Mga Dma Initialization done\n");
+   return ret_val;
+}
+
 static Bool
 MGAInitVisualConfigs(ScreenPtr pScreen)
 {
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  MGAPtr pMGA = MGAPTR(pScrn);
-  int numConfigs = 0;
-  __GLXvisualConfig *pConfigs = 0;
-  MGAConfigPrivPtr pMGAConfigs = 0;
-  MGAConfigPrivPtr *pMGAConfigPtrs = 0;
-  int i;
-
-  switch (pScrn->bitsPerPixel) {
-  case 8:
-  case 24:
-  case 32:
-    break;
-  case 16:
-    numConfigs = 4;
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   MGAPtr pMGA = MGAPTR(pScrn);
+   int numConfigs = 0;
+   __GLXvisualConfig *pConfigs = 0;
+   MGAConfigPrivPtr pMGAConfigs = 0;
+   MGAConfigPrivPtr *pMGAConfigPtrs = 0;
+   int i, db, depth, stencil, accum;
 
-    if (!(pConfigs = (__GLXvisualConfig*)xnfcalloc(sizeof(__GLXvisualConfig),
-						   numConfigs))) {
-      return FALSE;
-    }
-    if (!(pMGAConfigs = (MGAConfigPrivPtr)xnfcalloc(sizeof(MGAConfigPrivRec),
+   switch (pScrn->bitsPerPixel) {
+   case 8:
+   case 24:
+   case 32:
+      break;
+   case 16:
+      numConfigs = 4;
+
+      if (!(pConfigs = (__GLXvisualConfig*)xnfcalloc(sizeof(__GLXvisualConfig),
 						     numConfigs))) {
-      xfree(pConfigs);
-      return FALSE;
-    }
-    if (!(pMGAConfigPtrs = (MGAConfigPrivPtr*)xnfcalloc(sizeof(MGAConfigPrivPtr),
-							 numConfigs))) {
-      xfree(pConfigs);
-      xfree(pMGAConfigs);
-      return FALSE;
-    }
-    for (i=0; i<numConfigs; i++) 
-      pMGAConfigPtrs[i] = &pMGAConfigs[i];
+	 return FALSE;
+      }
+      if (!(pMGAConfigs = (MGAConfigPrivPtr)xnfcalloc(sizeof(MGAConfigPrivRec),
+						      numConfigs))) {
+	 xfree(pConfigs);
+	 return FALSE;
+      }
+      if (!(pMGAConfigPtrs = (MGAConfigPrivPtr*)xnfcalloc(sizeof(MGAConfigPrivPtr),
+							  numConfigs))) {
+	 xfree(pConfigs);
+	 xfree(pMGAConfigs);
+	 return FALSE;
+      }
+      for (i=0; i<numConfigs; i++) 
+	 pMGAConfigPtrs[i] = &pMGAConfigs[i];
+
+      i = 0;
+      depth = 1;
+      for (accum = 0; accum <= 1; accum++) {
+         for (stencil = 0; stencil <= 0; stencil++) { /* no stencil for now */
+            for (db=0; db<=1; db++) {
+               pConfigs[i].vid = -1;
+               pConfigs[i].class = -1;
+               pConfigs[i].rgba = TRUE;
+               pConfigs[i].redSize = 5;
+               pConfigs[i].greenSize = 6;
+               pConfigs[i].blueSize = 5;
+               pConfigs[i].redMask = 0x0000F800;
+               pConfigs[i].greenMask = 0x000007E0;
+               pConfigs[i].blueMask = 0x0000001F;
+               pConfigs[i].alphaMask = 0;
+               if (accum) {
+                  pConfigs[i].accumRedSize = 16;
+                  pConfigs[i].accumGreenSize = 16;
+                  pConfigs[i].accumBlueSize = 16;
+                  pConfigs[i].accumAlphaSize = 0;
+               } else {
+                  pConfigs[i].accumRedSize = 0;
+                  pConfigs[i].accumGreenSize = 0;
+                  pConfigs[i].accumBlueSize = 0;
+                  pConfigs[i].accumAlphaSize = 0;
+               }
+               if (db)
+                  pConfigs[i].doubleBuffer = TRUE;
+               else
+                  pConfigs[i].doubleBuffer = FALSE;
+               pConfigs[i].stereo = FALSE;
+               pConfigs[i].bufferSize = 16;
+               if (depth)
+                  pConfigs[i].depthSize = 16;
+               else 
+                  pConfigs[i].depthSize = 0;
+               if (stencil)
+                  pConfigs[i].stencilSize = 8;
+               else
+                  pConfigs[i].stencilSize = 0;
+               pConfigs[i].auxBuffers = 0;
+               pConfigs[i].level = 0;
+               if (stencil)
+                  pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+               else
+                  pConfigs[i].visualRating = GLX_NONE_EXT;
+               pConfigs[i].transparentPixel = 0;
+               pConfigs[i].transparentRed = 0;
+               pConfigs[i].transparentGreen = 0;
+               pConfigs[i].transparentBlue = 0;
+               pConfigs[i].transparentAlpha = 0;
+               pConfigs[i].transparentIndex = 0;
+               i++;
+            }
+         }
+      }
+      if (i != numConfigs) {
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                    "[drm] Incorrect initialization of visuals\n");
+         return FALSE;
+      }
+      break;
+   default:
+      ;  /* unexpected bits/pixelx */
+   }
+   pMGA->numVisualConfigs = numConfigs;
+   pMGA->pVisualConfigs = pConfigs;
+   pMGA->pVisualConfigsPriv = pMGAConfigs;
+   GlxSetVisualConfigs(numConfigs, pConfigs, (void**)pMGAConfigPtrs);
+   return TRUE;
+}
 
-    /* config 0: db=FALSE, depth=0
-       config 1: db=FALSE, depth=16
-       config 2: db=TRUE, depth=0;
-       config 3: db=TRUE, depth=16
-    */
-    pConfigs[0].vid = -1;
-    pConfigs[0].class = -1;
-    pConfigs[0].rgba = TRUE;
-    pConfigs[0].redSize = 8;
-    pConfigs[0].greenSize = 8;
-    pConfigs[0].blueSize = 8;
-    pConfigs[0].redMask =   0x00FF0000;
-    pConfigs[0].greenMask = 0x0000FF00;
-    pConfigs[0].blueMask =  0x000000FF;
-    pConfigs[0].alphaMask = 0;
-    pConfigs[0].accumRedSize = 0;
-    pConfigs[0].accumGreenSize = 0;
-    pConfigs[0].accumBlueSize = 0;
-    pConfigs[0].accumAlphaSize = 0;
-    pConfigs[0].doubleBuffer = FALSE;
-    pConfigs[0].stereo = FALSE;
-    pConfigs[0].bufferSize = 16;
-    pConfigs[0].depthSize = 0;
-    pConfigs[0].stencilSize = 0;
-    pConfigs[0].auxBuffers = 0;
-    pConfigs[0].level = 0;
-    pConfigs[0].visualRating = 0;
-    pConfigs[0].transparentPixel = 0;
-    pConfigs[0].transparentRed = 0;
-    pConfigs[0].transparentGreen = 0;
-    pConfigs[0].transparentBlue = 0;
-    pConfigs[0].transparentAlpha = 0;
-    pConfigs[0].transparentIndex = 0;
-
-    pConfigs[1].vid = -1;
-    pConfigs[1].class = -1;
-    pConfigs[1].rgba = TRUE;
-    pConfigs[1].redSize = 8;
-    pConfigs[1].greenSize = 8;
-    pConfigs[1].blueSize = 8;
-    pConfigs[1].redMask = 0x00FF0000;
-    pConfigs[1].greenMask = 0x0000FF00;
-    pConfigs[1].blueMask = 0x000000FF;
-    pConfigs[1].alphaMask = 0;
-    pConfigs[1].accumRedSize = 0;
-    pConfigs[1].accumGreenSize = 0;
-    pConfigs[1].accumBlueSize = 0;
-    pConfigs[1].accumAlphaSize = 0;
-    pConfigs[1].doubleBuffer = FALSE;
-    pConfigs[1].stereo = FALSE;
-    pConfigs[1].bufferSize = 16;
-    pConfigs[1].depthSize = 16;
-    pConfigs[1].stencilSize = 0;
-    pConfigs[1].auxBuffers = 0;
-    pConfigs[1].level = 0;
-    pConfigs[1].visualRating = 0;
-    pConfigs[1].transparentPixel = 0;
-    pConfigs[1].transparentRed = 0;
-    pConfigs[1].transparentGreen = 0;
-    pConfigs[1].transparentBlue = 0;
-    pConfigs[1].transparentAlpha = 0;
-    pConfigs[1].transparentIndex = 0;
-
-    pConfigs[2].vid = -1;
-    pConfigs[2].class = -1;
-    pConfigs[2].rgba = TRUE;
-    pConfigs[2].redSize = 8;
-    pConfigs[2].greenSize = 8;
-    pConfigs[2].blueSize = 8;
-    pConfigs[2].redMask = 0x00FF0000;
-    pConfigs[2].greenMask = 0x0000FF00;
-    pConfigs[2].blueMask = 0x000000FF;
-    pConfigs[2].alphaMask = 0;
-    pConfigs[2].accumRedSize = 0;
-    pConfigs[2].accumGreenSize = 0;
-    pConfigs[2].accumBlueSize = 0;
-    pConfigs[2].accumAlphaSize = 0;
-    pConfigs[2].doubleBuffer = TRUE;
-    pConfigs[2].stereo = FALSE;
-    pConfigs[2].bufferSize = 16;
-    pConfigs[2].depthSize = 0;
-    pConfigs[2].stencilSize = 0;
-    pConfigs[2].auxBuffers = 0;
-    pConfigs[2].level = 0;
-    pConfigs[2].visualRating = 0;
-    pConfigs[2].transparentPixel = 0;
-    pConfigs[2].transparentRed = 0;
-    pConfigs[2].transparentGreen = 0;
-    pConfigs[2].transparentBlue = 0;
-    pConfigs[2].transparentAlpha = 0;
-    pConfigs[2].transparentIndex = 0;
-
-    pConfigs[3].vid = -1;
-    pConfigs[3].class = -1;
-    pConfigs[3].rgba = TRUE;
-    pConfigs[3].redSize = 8;
-    pConfigs[3].greenSize = 8;
-    pConfigs[3].blueSize = 8;
-    pConfigs[3].redMask = 0x00FF0000;
-    pConfigs[3].greenMask = 0x0000FF00;
-    pConfigs[3].blueMask = 0x000000FF;
-    pConfigs[3].alphaMask = 0;
-    pConfigs[3].accumRedSize = 0;
-    pConfigs[3].accumGreenSize = 0;
-    pConfigs[3].accumBlueSize = 0;
-    pConfigs[3].accumAlphaSize = 0;
-    pConfigs[3].doubleBuffer = TRUE;
-    pConfigs[3].stereo = FALSE;
-    pConfigs[3].bufferSize = 16;
-    pConfigs[3].depthSize = 16;
-    pConfigs[3].stencilSize = 0;
-    pConfigs[3].auxBuffers = 0;
-    pConfigs[3].level = 0;
-    pConfigs[3].visualRating = 0;
-    pConfigs[3].transparentPixel = 0;
-    pConfigs[3].transparentRed = 0;
-    pConfigs[3].transparentGreen = 0;
-    pConfigs[3].transparentBlue = 0;
-    pConfigs[3].transparentAlpha = 0;
-    pConfigs[3].transparentIndex = 0;
-    break;
-  }
-  pMGA->numVisualConfigs = numConfigs;
-  pMGA->pVisualConfigs = pConfigs;
-  pMGA->pVisualConfigsPriv = pMGAConfigs;
-  GlxSetVisualConfigs(numConfigs, pConfigs, (void**)pMGAConfigPtrs);
-  return TRUE;
+static unsigned int mylog2(unsigned int n)
+{
+   unsigned int log2 = 1;
+   while (n>1) n >>= 1, log2++;
+   return log2;
 }
 
+
 Bool MGADRIScreenInit(ScreenPtr pScreen)
 {
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  MGAPtr pMGA = MGAPTR(pScrn);
-  DRIInfoPtr pDRIInfo;
-  MGADRIPtr pMGADRI;
-  MGADRIServerPrivatePtr pMGADRIServer;
-  int bufs;
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   MGAPtr pMGA = MGAPTR(pScrn);
+   DRIInfoPtr pDRIInfo;
+   MGADRIPtr pMGADRI;
+   MGADRIServerPrivatePtr pMGADRIServer;
+   int bufs, size;
    int prim_size;
    int init_offset;
+   int i;
 
-  pDRIInfo = DRICreateInfoRec();
-  if (!pDRIInfo) return FALSE;
-  pMGA->pDRIInfo = pDRIInfo;
-
-  pDRIInfo->drmDriverName = MGAKernelDriverName;
-  pDRIInfo->clientDriverName = MGAClientDriverName;
-  pDRIInfo->busIdString = xalloc(64);
-  sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
-	  ((pciConfigPtr)pMGA->PciInfo->thisCard)->busnum,
-	  ((pciConfigPtr)pMGA->PciInfo->thisCard)->devnum,
-	  ((pciConfigPtr)pMGA->PciInfo->thisCard)->funcnum);
-  pDRIInfo->ddxDriverMajorVersion = 0;
-  pDRIInfo->ddxDriverMinorVersion = 1;
-  pDRIInfo->ddxDriverPatchVersion = 0;
-  pDRIInfo->frameBufferPhysicalAddress = pMGA->FbAddress;
-  pDRIInfo->frameBufferSize = pMGA->FbMapSize;
-  pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8);
-  pDRIInfo->ddxDrawableTableEntry = MGA_MAX_DRAWABLES;
-
-  if (SAREA_MAX_DRAWABLES < MGA_MAX_DRAWABLES)
-    pDRIInfo->maxDrawableTableEntry = SAREA_MAX_DRAWABLES;
-  else
-    pDRIInfo->maxDrawableTableEntry = MGA_MAX_DRAWABLES;
-
-#ifdef NOT_DONE
-  /* FIXME need to extend DRI protocol to pass this size back to client 
-   * for SAREA mapping that includes a device private record
-   */
-  pDRIInfo->SAREASize = 
-    ((sizeof(XF86DRISAREARec) + 0xfff) & 0x1000); /* round to page */
-  /* + shared memory device private rec */
-#else
-  /* For now the mapping works by using a fixed size defined
-   * in the SAREA header
-   */
-  if (sizeof(XF86DRISAREARec)+sizeof(drm_mga_sarea_t)>SAREA_MAX) {
-    ErrorF("Data does not fit in SAREA\n");
-    return FALSE;
-  }
-  pDRIInfo->SAREASize = SAREA_MAX;
-#endif
+   /* Check that the GLX, DRI, and DRM modules have been loaded by testing
+    * for canonical symbols in each module. */
+   if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
+   if (!xf86LoaderCheckSymbol("DRIScreenInit"))       return FALSE;
+   if (!xf86LoaderCheckSymbol("drmAvailable"))        return FALSE;
+   if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "TDFXDRIScreenInit failed (libdri.a too old)\n");
+      return FALSE;
+   }
+     
+   /* Check the DRI version */
+   {
+      int major, minor, patch;
+      DRIQueryVersion(&major, &minor, &patch);
+      if (major != 3 || minor != 0 || patch < 0) {
+         xf86DrvMsg(pScreen->myNum, X_ERROR,
+                    "[drm] MGADRIScreenInit failed (DRI version = %d.%d.%d, expected 3.0.x).  Disabling DRI.\n",
+                    major, minor, patch);
+         return FALSE;
+      }
+   }
 
-  if (!(pMGADRI = (MGADRIPtr)xnfcalloc(sizeof(MGADRIRec),1))) {
-    DRIDestroyInfoRec(pMGA->pDRIInfo);
-    pMGA->pDRIInfo=0;
-    ErrorF("Failed to allocate memory for private record \n");
-    return FALSE;
-  }
+   if ((pScrn->bitsPerPixel / 8) != 2) {
+      xf86DrvMsg(pScreen->myNum, X_INFO,
+                 "[drm] Direct Rendering only supported in 16 bpp mode\n");
+      return FALSE;
+   }
+   
+   pDRIInfo = DRICreateInfoRec();
+   if (!pDRIInfo)
+      return FALSE;
+   pMGA->pDRIInfo = pDRIInfo;
+
+   pDRIInfo->drmDriverName = MGAKernelDriverName;
+   pDRIInfo->clientDriverName = MGAClientDriverName;
+   pDRIInfo->busIdString = xalloc(64);
+   sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
+           ((pciConfigPtr)pMGA->PciInfo->thisCard)->busnum,
+           ((pciConfigPtr)pMGA->PciInfo->thisCard)->devnum,
+           ((pciConfigPtr)pMGA->PciInfo->thisCard)->funcnum);
+   pDRIInfo->ddxDriverMajorVersion = MGA_MAJOR_VERSION;
+   pDRIInfo->ddxDriverMinorVersion = MGA_MINOR_VERSION;
+   pDRIInfo->ddxDriverPatchVersion = MGA_PATCHLEVEL;
+   pDRIInfo->frameBufferPhysicalAddress = pMGA->FbAddress;
+   pDRIInfo->frameBufferSize = pMGA->FbMapSize;
+   pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8);
+   pDRIInfo->ddxDrawableTableEntry = MGA_MAX_DRAWABLES;
+
+   MGADRIWrapFunctions( pScreen, pDRIInfo );
+
+   if (SAREA_MAX_DRAWABLES < MGA_MAX_DRAWABLES)
+      pDRIInfo->maxDrawableTableEntry = SAREA_MAX_DRAWABLES;
+   else
+      pDRIInfo->maxDrawableTableEntry = MGA_MAX_DRAWABLES;
+
+   /* For now the mapping works by using a fixed size defined
+    * in the SAREA header
+    */
+   if (sizeof(XF86DRISAREARec)+sizeof(MGASAREARec)>SAREA_MAX) {
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[drm] Data does not fit in SAREA\n");
+      return FALSE;
+   }
+  
+   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] Sarea %d+%d: %d\n",
+              sizeof(XF86DRISAREARec), sizeof(MGASAREARec),
+              sizeof(XF86DRISAREARec) + sizeof(MGASAREARec));
+
+   pDRIInfo->SAREASize = SAREA_MAX;
+
+   if (!(pMGADRI = (MGADRIPtr)xnfcalloc(sizeof(MGADRIRec),1))) {
+      DRIDestroyInfoRec(pMGA->pDRIInfo);
+      pMGA->pDRIInfo=0;
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                 "[drm] Failed to allocate memory for private record\n");
+      return FALSE;
+   }
    if (!(pMGADRIServer = (MGADRIServerPrivatePtr)
-	 xnfcalloc(sizeof(MGADRIServerPrivate),1))) {
-    xfree(pMGADRI);
-    DRIDestroyInfoRec(pMGA->pDRIInfo);
-    pMGA->pDRIInfo=0;
-    ErrorF("Failed to allocate memory for private record \n");
-    return FALSE;
-  }
+	 xnfcalloc(sizeof(MGADRIServerPrivateRec),1))) {
+      xfree(pMGADRI);
+      DRIDestroyInfoRec(pMGA->pDRIInfo);
+      pMGA->pDRIInfo=0;
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                 "[drm] Failed to allocate memory for private record\n");
+      return FALSE;
+   }
 
-  pDRIInfo->devPrivate = pMGADRI;
-  pMGA->DRIServerInfo = pMGADRIServer;
-  pDRIInfo->devPrivateSize = sizeof(MGADRIRec);
-  pDRIInfo->contextSize = sizeof(MGADRIContextRec);
-
-  pDRIInfo->CreateContext = MGACreateContext;
-  pDRIInfo->DestroyContext = MGADestroyContext;
-  pDRIInfo->SwapContext = MGADRISwapContext;
+   pDRIInfo->devPrivate = pMGADRI;
+   pMGA->DRIServerInfo = pMGADRIServer;
+   pDRIInfo->devPrivateSize = sizeof(MGADRIRec);
+   pDRIInfo->contextSize = sizeof(MGADRIContextRec);
+
+   pDRIInfo->CreateContext = MGACreateContext;
+   pDRIInfo->DestroyContext = MGADestroyContext;
+   pDRIInfo->SwapContext = MGADRISwapContext;
   
-  switch( pScrn->bitsPerPixel ) {
+   switch( pScrn->bitsPerPixel ) {
    case 8:
        pDRIInfo->InitBuffers = Mga8DRIInitBuffers;
        pDRIInfo->MoveBuffers = Mga8DRIMoveBuffers;
@@ -307,172 +367,271 @@
    case 32:
        pDRIInfo->InitBuffers = Mga32DRIInitBuffers;
        pDRIInfo->MoveBuffers = Mga32DRIMoveBuffers;
-  }
+   }
    
-  pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
+   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
 
-  if (!DRIScreenInit(pScreen, pDRIInfo, &pMGA->drmSubFD)) {
-    xfree(pMGADRIServer);
-    pMGA->DRIServerInfo = 0;
-    xfree(pDRIInfo->devPrivate);
-    pDRIInfo->devPrivate = 0;
-    DRIDestroyInfoRec(pMGA->pDRIInfo);
-    pMGA->pDRIInfo = 0;
-    ErrorF("DRIScreenInit Failed\n");
-    return FALSE;
-  }
+   if (!DRIScreenInit(pScreen, pDRIInfo, &pMGA->drmSubFD)) {
+      xfree(pMGADRIServer);
+      pMGA->DRIServerInfo = 0;
+      xfree(pDRIInfo->devPrivate);
+      pDRIInfo->devPrivate = 0;
+      DRIDestroyInfoRec(pMGA->pDRIInfo);
+      pMGA->pDRIInfo = 0;
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] DRIScreenInit Failed\n");
+      return FALSE;
+   }
 
-  pMGADRIServer->regsSize = MGAIOMAPSIZE;
-  if (drmAddMap(pMGA->drmSubFD, (drmHandle)pMGA->IOAddress, 
-		pMGADRIServer->regsSize, DRM_REGISTERS, 0, 
-		&pMGADRIServer->regs)<0) {
-    DRICloseScreen(pScreen);
-    ErrorF("drmAddMap failed Register MMIO region\n");
-    return FALSE;
-  }
-  xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08lx\n",
-	     pMGADRIServer->regs);
+   /* Check the MGA DRM version */
+   {
+      drmVersionPtr version = drmGetVersion(pMGA->drmSubFD);
+      if (version) {
+         if (version->version_major != 1 ||
+             version->version_minor != 0 ||
+             version->version_patchlevel < 0) {
+            /* incompatible drm version */
+            xf86DrvMsg(pScreen->myNum, X_ERROR,
+                       "[drm] MGADRIScreenInit failed (DRM version = %d.%d.%d, expected 1.0.x).  Disabling DRI.\n",
+                       version->version_major,
+                       version->version_minor,
+                       version->version_patchlevel);
+            MGADRICloseScreen(pScreen);
+            drmFreeVersion(version);
+            return FALSE;
+         }
+         drmFreeVersion(version);
+      }
+   }
+
+   pMGADRIServer->regsSize = MGAIOMAPSIZE;
+   if (drmAddMap(pMGA->drmSubFD, (drmHandle)pMGA->IOAddress, 
+                 pMGADRIServer->regsSize, DRM_REGISTERS, 0, 
+                 &pMGADRIServer->regs)<0) {
+      DRICloseScreen(pScreen);
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "[drm] drmAddMap failed Register MMIO region\n");
+      return FALSE;
+   }
+   xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08lx\n",
+              pMGADRIServer->regs);
    
-  /* Agp Support */
-  if(drmAgpAcquire(pMGA->drmSubFD) < 0) {
-     DRICloseScreen(pScreen);
-     ErrorF("drmAgpAcquire failed\n");
-     return FALSE;
-  }
-  pMGADRIServer->warp_ucode_size = mgaGetMicrocodeSize(pScreen);
-   if(pMGADRIServer->warp_ucode_size == 0) {
-      ErrorF("microcodeSize is zero\n");
+   /* Agp Support */
+   pMGADRIServer->agpAcquired = FALSE;
+   pMGADRIServer->agpHandle = 0;
+   pMGADRIServer->agpSizep = 0;
+   pMGADRIServer->agp_map = 0;
+   
+   if (drmAgpAcquire(pMGA->drmSubFD) < 0) {
+      DRICloseScreen(pScreen);
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAgpAcquire failed\n");
+      return FALSE;
+   }
+   pMGADRIServer->agpAcquired = TRUE;
+
+   pMGADRIServer->warp_ucode_size = mgaGetMicrocodeSize(pScreen);
+   if (pMGADRIServer->warp_ucode_size == 0) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] microcodeSize is zero\n");
+      DRICloseScreen(pScreen);
+      return FALSE;
+   }
+   
+   pMGADRIServer->agpMode = drmAgpGetMode(pMGA->drmSubFD);
+   /* Default to 1X agp mode */
+   pMGADRIServer->agpMode &= ~0x00000002;
+   if (drmAgpEnable(pMGA->drmSubFD, pMGADRIServer->agpMode) < 0) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAgpEnable failed\n");
       DRICloseScreen(pScreen);
       return FALSE;
    }
+   ErrorF("[drm] drmAgpEnabled succeeded\n");
 
-  prim_size = 65536;
-  init_offset = ((prim_size + pMGADRIServer->warp_ucode_size + 
+   prim_size = 65536;
+   init_offset = ((prim_size + pMGADRIServer->warp_ucode_size + 
 		  4096 - 1) / 4096) * 4096;
    
-  pMGADRIServer->agpSizep = drmAgpSize(pMGA->drmSubFD);
-  pMGADRIServer->agpBase = drmAgpBase(pMGA->drmSubFD);
-  if (drmAddMap(pMGA->drmSubFD, (drmHandle)pMGADRIServer->agpBase,
-		init_offset, DRM_AGP, 0, 
-		&pMGADRIServer->agp_private) < 0) {
-    DRICloseScreen(pScreen);
-    ErrorF("drmAddMap failed on AGP aperture\n");
-    return FALSE;
-  }
+   pMGADRIServer->agpSizep = init_offset;
+   pMGADRI->agpSize = (drmAgpSize(pMGA->drmSubFD)) - init_offset;
+
+   pMGADRIServer->agpBase = (drmAddress) drmAgpBase(pMGA->drmSubFD);
+   if (drmAddMap(pMGA->drmSubFD, 0,
+                 init_offset, DRM_AGP, 0, 
+                 &pMGADRIServer->agp_private) < 0) {
+      DRICloseScreen(pScreen);
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "[drm] drmAddMap failed on AGP aperture\n");
+      return FALSE;
+   }
    
-  if (drmMap(pMGA->drmSubFD, (drmHandle)pMGADRIServer->agp_private,
-	     init_offset, 
-	     (drmAddressPtr)&pMGADRIServer->agp_map) < -1) {
-    DRICloseScreen(pScreen);
-    ErrorF("drmMap failed on AGP aperture\n");
-    return FALSE;
-  }
+   if (drmMap(pMGA->drmSubFD, (drmHandle)pMGADRIServer->agp_private,
+              init_offset, 
+              (drmAddressPtr)&pMGADRIServer->agp_map) < -1) {
+      DRICloseScreen(pScreen);
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "[drm] drmMap failed on AGP aperture\n");
+      return FALSE;
+   }
    
-  /* Now allocate and bind a default of 8 megs */
+   /* Now allocate and bind a default of 8 megs */
+   drmAgpAlloc(pMGA->drmSubFD, 0x00800000, 0, 0,
+               &pMGADRIServer->agpHandle);
+   
+   if (pMGADRIServer->agpHandle == 0) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "[drm] drmAgpAlloc failed\n");
+      DRICloseScreen(pScreen);
+      return FALSE;
+   }
+   
+   if (drmAgpBind(pMGA->drmSubFD, pMGADRIServer->agpHandle, 0) < 0) {
+      DRICloseScreen(pScreen);
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "[drm] drmAgpBind failed\n");
+      return FALSE;
+   }
 
-  pMGADRIServer->agpHandle = drmAgpAlloc(pMGA->drmSubFD, 0x00800000, 0, 0);
-  if(pMGADRIServer->agpHandle == 0) {
-    ErrorF("drmAgpAlloc failed\n");
-    DRICloseScreen(pScreen);
-    return FALSE;
-  }
-  if(drmAgpBind(pMGA->drmSubFD, pMGADRIServer->agpHandle, 0) < 0) {
-    DRICloseScreen(pScreen);
-    ErrorF("drmAgpBind failed\n");
-    return FALSE;
-  }
+   mgaInstallMicrocode(pScreen, prim_size);
 
-  mgaInstallMicrocode(pScreen, prim_size);
+   if (drmAddMap(pMGA->drmSubFD, (drmHandle)init_offset,
+                 pMGADRI->agpSize, DRM_AGP, 0, 
+                 &pMGADRI->agp) < 0) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "[drm] Failed to map public agp area\n");
+      DRICloseScreen(pScreen);
+      return FALSE;
+   }
 
-   ErrorF("init_offset: %x\n", init_offset);
-  pMGADRI->agpSize = pMGADRIServer->agpSizep - init_offset;
-   ErrorF("pMGADRI->agpSize: %x\n", pMGADRI->agpSize);
-	  
-  if(drmAddMap(pMGA->drmSubFD, (drmHandle)pMGADRIServer->agpBase + init_offset,
-	       pMGADRI->agpSize, DRM_AGP, 0, 
-	       &pMGADRI->agp) < 0) {
-     ErrorF("Failed to map public agp area\n");
-     DRICloseScreen(pScreen);
-     return FALSE;
-  }
-   ErrorF("Mapped public agp area\n");
-  /* Here is where we need to do initialization of the dma engine */
-   
-  pMGADRIServer->agpMode = drmAgpGetMode(pMGA->drmSubFD);
-  /* Default to 1X agp mode */
-  pMGADRIServer->agpMode &= ~0x00000002;
-  if (drmAgpEnable(pMGA->drmSubFD, pMGADRIServer->agpMode) < 0) {
-    ErrorF("drmAgpEnable failed\n");
-    DRICloseScreen(pScreen);
-    return FALSE;
-  }
-   ErrorF("drmAgpEnabled succeeded\n");
-     if((bufs = drmAddBufs(pMGA->drmSubFD,
-			/*63*/ 15,
-			/* 65536 */ 524288,
-			DRM_AGP_BUFFER,
-			init_offset)) <= 0) {
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "[drm] failure adding %d %d byte DMA buffers\n",
-	       /* 63 */ 15,
-	       /* 65536 */ 524288);
-    DRICloseScreen(pScreen);
-    return FALSE;
-  }
+   switch(pMGA->Chipset) {
+   case PCI_CHIP_MGAG400:
+      pMGADRI->chipset = MGA_CARD_TYPE_G400;
+      break;
+   case PCI_CHIP_MGAG200:
+      pMGADRI->chipset = MGA_CARD_TYPE_G200;
+      break;
+   case PCI_CHIP_MGAG200_PCI:
+   default:
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                "[drm] Direct rendering not supported on this card/chipset\n");
+      return FALSE;
+   }
    
-  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	     "[drm] added %d %d byte DMA buffers\n",
-	     bufs, /* 65536 */ 524288);
+   pMGADRI->width = pScrn->virtualX;
+   pMGADRI->height = pScrn->virtualY;
+   pMGADRI->mem = pScrn->videoRam * 1024;
+   pMGADRI->cpp = pScrn->bitsPerPixel / 8;
+   pMGADRI->frontPitch = pScrn->displayWidth * (pScrn->bitsPerPixel / 8);
 
 
-  if((mgadrmInitDma(pScrn, prim_size)) != TRUE) {
-    ErrorF("Failed to initialize dma engine\n");
-    DRICloseScreen(pScreen);
-    return FALSE;
-  }
-   
-  ErrorF("Initialized Dma Engine\n");
+   pMGADRI->frontOffset = 0; /* pMGA->YDstOrg * (pScrn->bitsPerPixel / 8) */
+   pMGADRI->backOffset = ((pScrn->virtualY + pMGA->numXAALines + 1) * 
+			  pScrn->displayWidth *
+                          (pScrn->bitsPerPixel / 8) + 4095) & ~0xFFF;
 
-   
-  if(drmMarkBufs(pMGA->drmSubFD, 0.133333, 0.266666) != 0) {
+
+   xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] calced backoffset: 0x%x\n",
+              pMGADRI->backOffset);
+
+
+#if 0
+   size = 2 * pScrn->virtualX * pScrn->virtualY;
+   pMGADRI->depthOffset = (pMGADRI->backOffset + size + 4095) & ~0xFFF;
+   pMGADRI->textureOffset = pMGADRI->depthOffset + size;
+   pMGADRI->textureSize = pMGA->FbUsableSize - pMGADRI->textureOffset;
+#else
+   size = 2 * pScrn->virtualX * pScrn->virtualY;
+   size += 4095;
+   size &= ~4095;
+   pMGADRI->depthOffset = pMGA->FbUsableSize - size;
+   pMGADRI->depthOffset &= ~4095;  
+   pMGADRI->textureOffset = pMGADRI->backOffset + size;
+   pMGADRI->textureSize = pMGADRI->depthOffset - pMGADRI->textureOffset;
+
+   if (pMGADRI->depthOffset < pMGADRI->textureOffset + 512*1024) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "[drm] Insufficient memory for direct rendering\n");
+      DRICloseScreen(pScreen);
+      return FALSE;
+   }
+#endif
+
+   pMGADRI->mAccess = pMGA->MAccess;
+
+   i = mylog2(pMGADRI->textureSize / MGA_NR_TEX_REGIONS);
+   if (i < MGA_LOG_MIN_TEX_REGION_SIZE)
+      i = MGA_LOG_MIN_TEX_REGION_SIZE;
+  
+   pMGADRI->logTextureGranularity = i;
+   pMGADRI->textureSize = (pMGADRI->textureSize >> i) << i; /* truncate */
+
+
+   /* Here is where we need to do initialization of the dma engine */
+   if((bufs = drmAddBufs(pMGA->drmSubFD,
+                         MGA_DMA_BUF_NR,
+                         MGA_DMA_BUF_SZ,
+                         DRM_AGP_BUFFER,
+                         init_offset)) <= 0) {
      xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"[drm] failure marking DMA buffers\n");
+                "[drm] failure adding %d %d byte DMA buffers\n",
+                MGA_DMA_BUF_NR,
+                MGA_DMA_BUF_SZ);
      DRICloseScreen(pScreen);
      return FALSE;
-  }
-  if (!(pMGADRIServer->drmBufs = drmMapBufs(pMGA->drmSubFD))) { 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "[drm] failure mapping DMA buffers\n");
-    DRICloseScreen(pScreen);
-    return FALSE;
-  }
-  xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] buffers mapped with %p\n",
-	     pMGADRIServer->drmBufs);
-  xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] %d DMA buffers mapped\n",
-	     pMGADRIServer->drmBufs->count);
-  if (!pMGADRIServer->irq) {
-    pMGADRIServer->irq = drmGetInterruptFromBusID(pMGA->drmSubFD,
-					    ((pciConfigPtr)pMGA->PciInfo
+   }
+
+   pMGADRI->agpBufferOffset = init_offset + pMGADRIServer->agp_private;
+
+   /* Calculate texture constants for AGP texture space
+    */
+   {
+      CARD32 agpTextureOffset = MGA_DMA_BUF_SZ * MGA_DMA_BUF_NR;
+      CARD32 agpTextureSize = pMGADRI->agpSize - agpTextureOffset;
+
+      i = mylog2(agpTextureSize / MGA_NR_TEX_REGIONS);
+      if (i < MGA_LOG_MIN_TEX_REGION_SIZE)
+         i = MGA_LOG_MIN_TEX_REGION_SIZE;
+
+      pMGADRI->logAgpTextureGranularity = i;
+      pMGADRI->agpTextureSize = (agpTextureSize >> i) << i; 
+      pMGADRI->agpTextureOffset = agpTextureOffset;
+   }
+
+   
+   xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+              "[drm] added %d %d byte DMA buffers\n",
+              bufs, MGA_DMA_BUF_SZ);
+
+
+   if ((MgaInitDma(pScrn, prim_size)) != TRUE) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "[drm] Failed to initialize dma engine\n");
+      DRICloseScreen(pScreen);
+      return FALSE;
+   }
+
+   xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Initialized Dma Engine\n");
+   
+   if (!pMGADRIServer->irq) {
+      pMGADRIServer->irq = drmGetInterruptFromBusID(pMGA->drmSubFD,
+                                            ((pciConfigPtr)pMGA->PciInfo
 					     ->thisCard)->busnum,
 					    ((pciConfigPtr)pMGA->PciInfo
 					     ->thisCard)->devnum,
 					    ((pciConfigPtr)pMGA->PciInfo
 					     ->thisCard)->funcnum);
-     drmCtlInstHandler(pMGA->drmSubFD, pMGADRIServer->irq);
-  }
+      drmCtlInstHandler(pMGA->drmSubFD, pMGADRIServer->irq);
+   }
 
-  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	     "[drm] dma control initialized, using IRQ %d\n",
-	     pMGADRIServer->irq);
-   
-   
-  if (!(MGAInitVisualConfigs(pScreen))) {
-    DRICloseScreen(pScreen);
-    return FALSE;
-  }
-  xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configs initialized\n" );
+   xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+              "[drm] dma control initialized, using IRQ %d\n",
+              pMGADRIServer->irq);
 
-  return TRUE;
+
+   if (!(MGAInitVisualConfigs(pScreen))) {
+      DRICloseScreen(pScreen);
+      return FALSE;
+   }
+   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configs initialized\n" );
+
+   return TRUE;
 }
 
 void
@@ -481,16 +640,26 @@
   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
   MGAPtr pMGA = MGAPTR(pScrn);
   MGADRIServerPrivatePtr pMGADRIServer = pMGA->DRIServerInfo;
-   
-  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	     "[drm] unmapping %d buffers\n",
-	     pMGADRIServer->drmBufs->count);
-  if (drmUnmapBufs(pMGADRIServer->drmBufs)) {
-     xf86DrvMsg(pScreen->myNum, X_INFO,
-		"[drm] unable to unmap DMA buffers\n");
+
+  MgaCleanupDma(pScrn);
+
+  if(pMGADRIServer->agp_map) {  
+     ErrorF("Unmapped agp region\n");
+     drmUnmap(pMGADRIServer->agp_map, pMGADRIServer->agpSizep);
+     pMGADRIServer->agp_map = 0;
+  }
+  if(pMGADRIServer->agpHandle) {
+     ErrorF("Freeing agp memory\n");
+     drmAgpFree(pMGA->drmSubFD, pMGADRIServer->agpHandle);
+     pMGADRIServer->agpHandle = 0;
+     pMGADRIServer->agpSizep = 0;
+  }
+  if(pMGADRIServer->agpAcquired == TRUE) {
+     ErrorF("releasing agp module\n");
+     drmAgpRelease(pMGA->drmSubFD);
+     pMGADRIServer->agpAcquired = FALSE;
   }
-  mgadrmCleanupDma(pScrn);
-   
+
   DRICloseScreen(pScreen);
 
   if (pMGA->pDRIInfo) {
@@ -518,9 +687,6 @@
 		  drmContext hwContext, void *pVisualConfigPriv,
 		  DRIContextType contextStore)
 {
-  MGADRIContextPtr ctx;
-
-  ctx = (MGADRIContextPtr)contextStore;
   return TRUE;
 }
 
@@ -528,106 +694,121 @@
 MGADestroyContext(ScreenPtr pScreen, drmContext hwContext, 
 		   DRIContextType contextStore)
 {
-  MGADRIContextPtr ctx;
-  ctx = (MGADRIContextPtr)contextStore;
 }
 
 Bool
 MGADRIFinishScreenInit(ScreenPtr pScreen)
 {
   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+  MGASAREAPtr sPriv;
   MGAPtr pMGA = MGAPTR(pScrn);
-  MGADRIPtr pMGADRI;
-  int size;
 
+  if (!pMGA->pDRIInfo) return FALSE;
+
+  sPriv = (MGASAREAPtr)DRIGetSAREAPrivate(pScreen);
   pMGA->pDRIInfo->driverSwapMethod = DRI_HIDE_X_CONTEXT;
-  /* pMGA->pDRIInfo->driverSwapMethod = DRI_SERVER_SWAP; */
 
-  pMGADRI = (MGADRIPtr)pMGA->pDRIInfo->devPrivate;
-  pMGADRI->deviceID = pMGA->PciInfo->chipType;
-  pMGADRI->width = pScrn->virtualX;
-  pMGADRI->height = pScrn->virtualY;
-  pMGADRI->mem = pScrn->videoRam * 1024;
-  pMGADRI->cpp = pScrn->bitsPerPixel / 8;
-  pMGADRI->stride = pScrn->displayWidth * (pScrn->bitsPerPixel / 8);
-  pMGADRI->backOffset = ((pScrn->virtualY+129) * pScrn->displayWidth *
-			 (pScrn->bitsPerPixel / 8) + 4095) & ~0xFFF;
-  size = 2 * pScrn->virtualX * pScrn->virtualY;
-  pMGADRI->depthOffset = (pMGADRI->backOffset + size + 4095) & ~0xFFF;
-  pMGADRI->textureOffset = pMGADRI->depthOffset + size;
-  /*
-   * The rest of the framebuffer is for textures except for the
-   * memory for the hardware cursor. 
-   */
-  pMGADRI->textureSize = pMGA->FbUsableSize - pMGADRI->textureOffset;
-  pMGADRI->fbOffset = pMGA->YDstOrg * (pScrn->bitsPerPixel / 8);
+  xf86memset( sPriv, 0, sizeof(MGASAREARec) );
 
   return DRIFinishScreenInit(pScreen);
 }
 
-void MGASwapContext(ScreenPtr pScreen)
+
+void mgaGetQuiescence( ScrnInfoPtr pScrn )
 {
-#if 0
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  MGAPtr pMga = MGAPTR(pScrn);
-  MGAFBLayout *pLayout = &pMga->CurrentLayout;
+   MGAPtr pMga = MGAPTR(pScrn);
 
-  usleep(500);
-  ErrorF("Syncing : swap\n");
-  MGABUSYWAIT();
-  ErrorF("Sync : swap 1\n");
-  MGAStormSync(pScrn);
-  ErrorF("Syncing done\n");
-  pMga->AccelInfoRec->NeedToSync = TRUE;
-   
-  WAITFIFO(12);
-  OUTREG(MGAREG_MACCESS, pMga->MAccess);
-  OUTREG(MGAREG_PITCH, pLayout->displayWidth);
-  OUTREG(MGAREG_YDSTORG, pMga->YDstOrg);
-  OUTREG(MGAREG_PLNWT, pMga->PlaneMask);
-  OUTREG(MGAREG_BCOL, pMga->BgColor);
-  OUTREG(MGAREG_FCOL, pMga->FgColor);
-  OUTREG(MGAREG_SRCORG, pMga->SrcOrg);
-  OUTREG(MGAREG_DSTORG, pMga->DstOrg);
-  OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT);
-  OUTREG(MGAREG_CXBNDRY, 0xFFFF0000); /* (maxX << 16) | minX */
-  OUTREG(MGAREG_YTOP, 0x00000000);    /* minPixelPointer */
-  OUTREG(MGAREG_YBOT, 0x007FFFFF);    /* maxPixelPointer */ 
-  pMga->AccelFlags &= ~CLIPPER_ON;
-#endif
+   pMga->have_quiescense = 1;					
+
+   if (pMga->directRenderingEnabled) {
+      MGAFBLayout *pLayout = &pMga->CurrentLayout;
+
+      MgaLockUpdate(pScrn, (DRM_LOCK_QUIESCENT | DRM_LOCK_FLUSH));	
+
+      WAITFIFO(12);
+      OUTREG(MGAREG_MACCESS, pMga->MAccess);
+      OUTREG(MGAREG_PITCH, pLayout->displayWidth);
+      OUTREG(MGAREG_YDSTORG, pMga->YDstOrg);
+      OUTREG(MGAREG_PLNWT, pMga->PlaneMask);
+      OUTREG(MGAREG_BCOL, pMga->BgColor);
+      OUTREG(MGAREG_FCOL, pMga->FgColor);
+      pMga->SrcOrg = 0;
+      OUTREG(MGAREG_SRCORG, 0);
+      OUTREG(MGAREG_DSTORG, pMga->DstOrg);
+      OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT);
+      OUTREG(MGAREG_CXBNDRY, 0xFFFF0000); /* (maxX << 16) | minX */
+      OUTREG(MGAREG_YTOP, 0x00000000);    /* minPixelPointer */
+      OUTREG(MGAREG_YBOT, 0x007FFFFF);    /* maxPixelPointer */ 
+      pMga->AccelFlags &= ~CLIPPER_ON;
+   }
 }
 
-void MGALostContext(ScreenPtr pScreen)
+
+
+void MGASwapContext(ScreenPtr pScreen)
 {
-#if 0
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  MGAPtr pMga = MGAPTR(pScrn);
-  MGAFBLayout *pLayout = &pMga->CurrentLayout;
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   MGAPtr pMga = MGAPTR(pScrn);
 
-  ErrorF("Syncing : lost\n");
-  MGAStormSync(pScrn);
-  ErrorF("Sync : lost 1\n");
-  MGABUSYWAIT();
-  ErrorF("Syncing done\n");
-#endif
+   /* Arrange for dma_quiescence and xaa sync to be called as
+    * appropriate.
+    */
+   pMga->have_quiescense = 0;
+   pMga->AccelInfoRec->NeedToSync = TRUE;
 }
 
+
+
+/* This is really only called from validate/postvalidate as we
+ * override the dri lock/unlock.  Want to remove validate/postvalidate
+ * processing, but need to remove all client-side use of drawable lock
+ * first (otherwise there is noone recover when a client dies holding
+ * the drawable lock).
+ *
+ * What does this mean? 
+ *
+ *   - The above code gets executed every time a
+ *     window changes shape or the focus changes, which isn't really
+ *     optimal.  
+ *   - The X server therefore believes it needs to do an XAA sync
+ *     *and* a dma quiescense ioctl each time that happens.
+ *
+ * We don't wrap wakeuphandler any longer, so at least we can say that
+ * this doesn't happen *every time the mouse moves*...
+ */
 static void
 MGADRISwapContext(ScreenPtr pScreen, DRISyncType syncType, 
 		   DRIContextType oldContextType, void *oldContext,
 		   DRIContextType newContextType, void *newContext)
 {
-  if ((syncType == DRI_3D_SYNC) && (oldContextType == DRI_2D_CONTEXT) &&
-      (newContextType == DRI_2D_CONTEXT)) { /* Entering from Wakeup */
-    MGASwapContext(pScreen);
-  }
-  if ((syncType == DRI_2D_SYNC) && (oldContextType == DRI_NO_CONTEXT) &&
-      (newContextType == DRI_2D_CONTEXT)) { /* Exiting from Block Handler */
-    MGALostContext(pScreen);
-  }
+   if (syncType == DRI_3D_SYNC && 
+       oldContextType == DRI_2D_CONTEXT &&
+       newContextType == DRI_2D_CONTEXT)
+   {
+      MGASwapContext(pScreen);
+   }
 }
 
-/* Needs to be written */
-void MGASelectBuffer(MGAPtr pMGA, int which)
+
+void 
+MGASelectBuffer(ScrnInfoPtr pScrn, int which)
 {
+   MGAPtr pMga = MGAPTR(pScrn);
+   MGADRIPtr pMGADRI = (MGADRIPtr)pMga->pDRIInfo->devPrivate;
+
+   switch (which) {
+   case MGA_BACK:
+      OUTREG(MGAREG_DSTORG, pMGADRI->backOffset);
+      OUTREG(MGAREG_SRCORG, pMGADRI->backOffset);
+      break;
+   case MGA_DEPTH:
+      OUTREG(MGAREG_DSTORG, pMGADRI->depthOffset);
+      OUTREG(MGAREG_SRCORG, pMGADRI->depthOffset);
+      break;
+   default:
+   case MGA_FRONT:
+      OUTREG(MGAREG_DSTORG, pMGADRI->frontOffset);
+      OUTREG(MGAREG_SRCORG, pMGADRI->frontOffset);
+      break;
+   }
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h:1.1 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h:1.1	Fri Feb 11 09:25:55 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h	Wed Jun 21 20:58:25 2000
@@ -1,12 +1,14 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.1 2000/02/11 17:25:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.3 2000/06/22 03:58:25 tsi Exp $ */
 
 #ifndef _MGA_DRI_
 #define _MGA_DRI_
 
 #include <xf86drm.h>
-#include "mga_drm_public.h"
+#include <xf86drmMga.h>
 
-typedef struct _mga_dri_server_private {
+#define MGA_MAX_DRAWABLES 256
+
+typedef struct {
    int reserved_map_agpstart;
    int reserved_map_idx;
    int buffer_map_idx;
@@ -17,6 +19,7 @@
    int sgram;
    unsigned long agpMode;
    unsigned long agpHandle;
+   Bool agpAcquired;
    drmHandle agp_private;
    drmSize agpSizep;
    drmAddress agpBase;
@@ -24,27 +27,115 @@
    drmHandle regs;
    drmSize regsSize;
    drmAddress regsMap;
-   mgaWarpIndex WarpIndex[MGA_MAX_WARP_PIPES];
+   drmMgaWarpIndex WarpIndex[MGA_MAX_WARP_PIPES];
    drmBufMapPtr drmBufs;
    CARD8 *agp_map;
-} MGADRIServerPrivate, *MGADRIServerPrivatePtr;
+} MGADRIServerPrivateRec, *MGADRIServerPrivatePtr;
 
 typedef struct {
-  int deviceID;
-  int width;
-  int height;
-  int mem;
-  int cpp;
-  int stride;
-  int fbOffset;
-  int backOffset;
-  int depthOffset;
-  int textureOffset;
-  int textureSize;
-  drmHandle agp;
-  drmSize agpSize;
+   int chipset;
+   int width;
+   int height;
+   int mem;
+   int cpp;
+   unsigned int frontOffset;
+   unsigned int frontPitch;
+
+   unsigned int backOffset;
+   unsigned int backPitch;
+
+   unsigned int depthOffset;
+   unsigned int depthPitch;
+
+   unsigned int textureOffset;
+   unsigned int textureSize;
+   int logTextureGranularity;
+
+   /* Allow calculation of setup dma addresses.
+    */
+   unsigned int agpBufferOffset;
+
+   unsigned int agpTextureOffset;
+   unsigned int agpTextureSize;
+   int logAgpTextureGranularity;
+
+   /* Redundant?
+    */
+   unsigned int frontOrg;
+   unsigned int backOrg;
+   unsigned int depthOrg;
+
+   unsigned int mAccess;
+
+   drmHandle agp;
+   drmSize agpSize;
 } MGADRIRec, *MGADRIPtr;
 
 
+/* WARNING: Do not change the SAREA structure without changing the kernel
+ * as well */
+typedef struct {
+   unsigned char next, prev;
+   unsigned char in_use;
+   unsigned int age;
+} MGATexRegionRec, *MGATexRegionPtr;
+
+typedef struct {
+   /* The channel for communication of state information to the kernel
+    * on firing a vertex dma buffer.
+    */
+   unsigned int ContextState[MGA_CTX_SETUP_SIZE];
+   unsigned int ServerState[MGA_2D_SETUP_SIZE];
+   unsigned int TexState[2][MGA_TEX_SETUP_SIZE];
+   unsigned int WarpPipe;
+   unsigned int dirty;
+   
+   unsigned int nbox;
+   XF86DRIClipRectRec boxes[MGA_NR_SAREA_CLIPRECTS];
+   
+   /* Information about the most recently used 3d drawable.  The
+    * client fills in the req_* fields, the server fills in the 
+    * exported_ fields and puts the cliprects into boxes, above.
+    *
+    * The client clears the exported_drawable field before
+    * clobbering the boxes data.
+    */
+   unsigned int req_drawable;       /* the X drawable id */
+   unsigned int req_draw_buffer;    /* MGA_FRONT or MGA_BACK */
+   
+   unsigned int exported_drawable;
+   unsigned int exported_index;
+   unsigned int exported_stamp;
+   unsigned int exported_buffers;
+   int exported_nfront;
+   int exported_nback;
+   int exported_back_x, exported_front_x, exported_w;
+   int exported_back_y, exported_front_y, exported_h;
+   XF86DRIClipRectRec exported_boxes[MGA_NR_SAREA_CLIPRECTS];
+   
+   /* Counters for aging textures and for client-side throttling.
+    */
+   unsigned int last_enqueue;       /* last time a buffer was enqueued */
+   unsigned int last_dispatch;      /* age of the most recently dispatched buffer */
+   unsigned int last_quiescent;     /*  */
+   
+   /* LRU lists for texture memory in agp space and on the card */
+   
+   MGATexRegionRec texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS+1];
+   unsigned int texAge[MGA_NR_TEX_HEAPS];
+   /* Mechanism to validate card state.
+    */
+   int ctxOwner;
+} MGASAREARec, *MGASAREAPtr;
+
+typedef struct {
+  /* Nothing here yet */
+  int dummy;
+} MGAConfigPrivRec, *MGAConfigPrivPtr;
+
+typedef struct {
+  /* Nothing here yet */
+  int dummy;
+} MGADRIContextRec, *MGADRIContextPtr;
 
 #endif
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h:1.1 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h:removed
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h:1.1	Fri Feb 11 09:25:55 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h	Sat Jul  1 20:42:53 2000
@@ -1,24 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h,v 1.1 2000/02/11 17:25:55 dawes Exp $ */
-
-#ifndef _MGA_DRIPRIV_H_
-#define _MGA_DRIPRIV_H_
-
-#define MGA_MAX_DRAWABLES 256
-
-extern void GlxSetVisualConfigs(
-    int nconfigs,
-    __GLXvisualConfig *configs,
-    void **configprivs
-);
-
-typedef struct {
-  /* Nothing here yet */
-  int dummy;
-} MGAConfigPrivRec, *MGAConfigPrivPtr;
-
-typedef struct {
-  /* Nothing here yet */
-  int dummy;
-} MGADRIContextRec, *MGADRIContextPtr;
-
-#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c:1.149 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c:1.163
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c:1.149	Mon Mar  6 17:37:49 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c	Thu Jun 29 14:03:11 2000
@@ -43,7 +43,7 @@
  *		Fixed 32bpp hires 8MB horizontal line glitch at middle right
  */
  
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v 1.149 2000/03/07 01:37:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v 1.163 2000/06/29 21:03:11 mvojkovi Exp $ */
 
 /*
  * This is a first cut at a non-accelerated version to work with the
@@ -148,12 +148,6 @@
 static void	MGARestore(ScrnInfoPtr pScrn);
 static Bool	MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 
-#define VERSION 4000
-#define MGA_NAME "MGA"
-#define MGA_DRIVER_NAME "mga"
-#define MGA_MAJOR_VERSION 1
-#define MGA_MINOR_VERSION 0
-#define MGA_PATCHLEVEL 0
 
 /* 
  * This contains the functions needed by the server after loading the
@@ -164,7 +158,7 @@
  */
 
 DriverRec MGA = {
-    VERSION,
+    MGA_VERSION,
     MGA_DRIVER_NAME,
 #if 0
     "accelerated driver for Matrox Millennium and Mystique cards",
@@ -216,7 +210,9 @@
     OPTION_SET_MCLK,
     OPTION_OVERCLOCK_MEM,
     OPTION_VIDEO_KEY,
-    OPTION_ROTATE
+    OPTION_ROTATE,
+    OPTION_TEXTURED_VIDEO,
+    OPTION_XAALINES
 } MGAOpts;
 
 static OptionInfoRec MGAOptions[] = {
@@ -235,6 +231,8 @@
     { OPTION_OVERCLOCK_MEM,	"OverclockMem",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_VIDEO_KEY,		"VideoKey",	OPTV_INTEGER,	{0}, FALSE },
     { OPTION_ROTATE,		"Rotate",	OPTV_ANYSTR,	{0}, FALSE },
+    { OPTION_TEXTURED_VIDEO,	"TexturedVideo",OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_XAALINES,		"XAALines",	OPTV_INTEGER,	{0}, FALSE },
     { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
 };
 
@@ -298,31 +296,25 @@
 
 #ifdef XF86DRI 
 static const char *drmSymbols[] = {
+    "drmAvailable",
     "drmAddBufs",
     "drmAddMap",
-    "drmAvailable",
-    "drmCtlAddCommand",
     "drmCtlInstHandler",
     "drmGetInterruptFromBusID",
-    "drmMapBufs",
-    "drmMarkBufs",
-    "drmUnmapBufs",
     "drmAgpAcquire",
     "drmAgpRelease",
     "drmAgpEnable",
     "drmAgpAlloc",
     "drmAgpFree",
     "drmAgpBind",
-    "drmAgpUnbind",
-    "drmAgpVersionMajor",
-    "drmAgpVersionMinor",
     "drmAgpGetMode",
     "drmAgpBase",
     "drmAgpSize",
-    "drmAgpMemoryUsed",
-    "drmAgpMemoryAvail",
-    "drmAgpVendorId",
-    "drmAgpDeviceId",
+    "drmMgaCleanupDma",
+    "drmMgaLockUpdate",
+    "drmMgaInitDma",
+    "drmFreeVersion",
+    "drmGetVersion",
     NULL
 };
 
@@ -339,6 +331,7 @@
     "DRIUnlock",
     "DRIGetSAREAPrivate",
     "DRIGetContext",
+    "DRIQueryVersion",
     "GlxSetVisualConfigs",
     NULL
 };
@@ -528,7 +521,7 @@
 {
     int i;
     GDevPtr *devSections = NULL;
-    int *usedChips;
+    int *usedChips = NULL;
     int numDevSections;
     int numUsed;
     Bool foundScreen = FALSE;
@@ -598,34 +591,40 @@
 #endif
 	
 	/* Allocate a ScrnInfoRec and claim the slot */
-	pScrn = xf86AllocateScreen(drv, 0);
+	pScrn = NULL;
 	
-	/* Fill in what we can of the ScrnInfoRec */
-	pScrn->driverVersion	= VERSION;
-	pScrn->driverName	= MGA_DRIVER_NAME;
-	pScrn->name		= MGA_NAME;
-	pScrn->Probe		= MGAProbe;
-	pScrn->PreInit		= MGAPreInit;
-	pScrn->ScreenInit	= MGAScreenInit;
-	pScrn->SwitchMode	= MGASwitchMode;
-	pScrn->AdjustFrame	= MGAAdjustFrame;
-	pScrn->EnterVT		= MGAEnterVT;
-	pScrn->LeaveVT		= MGALeaveVT;
-	pScrn->FreeScreen	= MGAFreeScreen;
-	pScrn->ValidMode	= MGAValidMode;
-	foundScreen = TRUE;
 #ifndef DISABLE_VGA_IO
-	xf86ConfigActivePciEntity(pScrn, usedChips[i], MGAPciChipsets, NULL,
-				      NULL, NULL, NULL, NULL);
+	if ((pScrn = xf86ConfigPciEntity(pScrn, 0,usedChips[i],
+					       MGAPciChipsets, NULL, NULL,
+					       NULL, NULL, NULL))) 
 #else
-	smga = xnfalloc(sizeof(MgaSave));
-	smga->pvp = xf86GetPciInfoForEntity(usedChips[i]);
-	xf86ConfigActivePciEntity(pScrn, usedChips[i], MGAPciChipsets, NULL,
-				  VgaIOSave, VgaIOSave, VgaIORestore,
-				  smga);
+	    smga = xnfalloc(sizeof(MgaSave));
+	    smga->pvp = xf86GetPciInfoForEntity(usedChips[i]);
+	    if ((pScrn = xf86ConfigPciEntity(pScrn, 0,usedChips[i],
+					       MGAPciChipsets, NULL,VgaIOSave,
+					       VgaIOSave, VgaIORestore,smga)))
 #endif
+	    {
+		
+	/* Fill in what we can of the ScrnInfoRec */
+		pScrn->driverVersion	= MGA_VERSION;
+		pScrn->driverName	= MGA_DRIVER_NAME;
+		pScrn->name		= MGA_NAME;
+		pScrn->Probe		= MGAProbe;
+		pScrn->PreInit		= MGAPreInit;
+		pScrn->ScreenInit	= MGAScreenInit;
+		pScrn->SwitchMode	= MGASwitchMode;
+		pScrn->AdjustFrame	= MGAAdjustFrame;
+		pScrn->EnterVT		= MGAEnterVT;
+		pScrn->LeaveVT		= MGALeaveVT;
+		pScrn->FreeScreen	= MGAFreeScreen;
+		pScrn->ValidMode	= MGAValidMode;
+		foundScreen = TRUE;
+	    }
     }
-    xfree(usedChips);
+    if (usedChips)
+	xfree(usedChips);
+    
     return foundScreen;
 }
 
@@ -794,7 +793,6 @@
 MGASoftReset(ScrnInfoPtr pScrn)
 {
 	MGAPtr pMga = MGAPTR(pScrn);
-	int i;
 
 	pMga->FbMapSize = 8192 * 1024;
 	MGAMapMem(pScrn);
@@ -902,26 +900,27 @@
 	pMga->FbMapSize = ProbeSize * 1024;
 	MGAMapMem(pScrn);
 	base = pMga->FbBase;
-
+	
 	/* turn MGA mode on - enable linear frame buffer (CRTCEXT3) */
 	OUTREG8(0x1FDE, 3);
 	tmp = INREG8(0x1FDF);
 	OUTREG8(0x1FDF, tmp | 0x80);
-	
+
 	/* write, read and compare method */
 	for(i = ProbeSize; i > 2048; i -= 2048) {
 	    base[(i * 1024) - 1] = 0xAA;
 	    OUTREG8(MGAREG_CRTC_INDEX, 0);  /* flush the cache */
+	    usleep(1);  /* twart write combination */
 	    if(base[(i * 1024) - 1] == 0xAA) {
 		SizeFound = i;
 		break;
 	    }
 	}
-	
+		
 	/* restore CRTCEXT3 state */
 	OUTREG8(0x1FDE, 3);
 	OUTREG8(0x1FDF, tmp);
-	
+
 	MGAUnmapMem(pScrn);
    }
    return SizeFound;
@@ -1063,15 +1062,13 @@
 }
 #endif /* DISABLE_VGA_IO */
 
-extern xf86MonPtr ConfiguredMonitor;
-
 void
 MGAProbeDDC(ScrnInfoPtr pScrn, int index)
 {
     vbeInfoPtr pVbe;
     if (xf86LoadSubModule(pScrn, "vbe")) {
 	pVbe = VBEInit(NULL,index);
-	ConfiguredMonitor = vbeDoEDID(pVbe);
+	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
     }
 }
 
@@ -1307,6 +1304,27 @@
     xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
 
 
+    if(xf86GetOptValInteger(MGAOptions, OPTION_XAALINES, 
+			    &(pMga->numXAALines))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Will Use %d lines for "
+		   "offscreen memory if the DRI is enabled.\n",
+		   pMga->numXAALines);
+    } else {
+        /* The default is to use 512 lines on a G400, 128 on a G200 */
+        switch (pMga->Chipset) {
+	  case PCI_CHIP_MGAG200:
+	  case PCI_CHIP_MGAG200_PCI:
+	    pMga->numXAALines = 128;
+            break;
+	  default:
+	    pMga->numXAALines = 512;
+            break;
+	}
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Offscreen memory usage "
+                   "will be limited to %d lines if the DRI is enabled.\n",
+		   pMga->numXAALines);
+    }
+
     from = X_DEFAULT;
     pMga->HWCursor = TRUE;
     /*
@@ -1389,6 +1407,9 @@
 	pMga->OverclockMem = TRUE;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Overclocking memory\n");
     }
+    if (xf86ReturnOptValBool(MGAOptions, OPTION_TEXTURED_VIDEO, FALSE)) {
+	pMga->TexturedVideo = TRUE;
+    }
     if (pMga->FBDev) {
 	/* check for linux framebuffer device */
 	if (!xf86LoadSubModule(pScrn, "fbdevhw"))
@@ -1702,14 +1723,16 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = xnfalloc(sizeof(ClockRange));
+    clockRanges = xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->minClock = pMga->MinClock;
     clockRanges->maxClock = pMga->MaxClock;
     clockRanges->clockIndex = -1;		/* programmable */
     clockRanges->interlaceAllowed = TRUE;
     clockRanges->doubleScanAllowed = TRUE;
-
+    clockRanges->ClockMulFactor = 1;
+    clockRanges->ClockDivFactor = 1;
+    
     /* Only set MemClk if appropriate for the ramdac */
     if (pMga->Dac.SetMemClk) {
 	if (pMga->MemClk == 0) {
@@ -2142,13 +2165,13 @@
 
 #ifdef XF86DRI
    if (pMga->directRenderingEnabled) {
-       DRILock(screenInfo.screens[pScrn->scrnIndex]);
-       MGASwapContext(screenInfo.screens[pScrn->scrnIndex]);
+       DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
    }
 #endif
      
     (*pMga->Restore)(pScrn, vgaReg, mgaReg, FALSE);
 
+    MGAStormSync(pScrn);
     MGAStormEngineInit(pScrn);
     vgaHWProtect(pScrn, FALSE);
 
@@ -2180,7 +2203,8 @@
     MGAPtr pMga = MGAPTR(pScrn);
     MGARegPtr mgaReg = &pMga->SavedReg;
 
-    MGAStormSync(pScrn);
+   if (pScrn->pScreen != NULL)
+      MGAStormSync(pScrn);
 
     /* Only restore text mode fonts/text for the primary card */
     vgaHWProtect(pScrn, TRUE);
@@ -2321,11 +2345,13 @@
       * Setup DRI after visuals have been established, but before cfbScreenInit
       * is called.   cfbScreenInit will eventually call into the drivers
       * InitGLXVisuals call back.
+      * The DRI does not work when textured video is enabled at this time.
       */
 
-   pMga->directRenderingEnabled = MGADRIScreenInit(pScreen);
-   /* Force the initialization of the context */
-   MGALostContext(pScreen);
+    if (!pMga->NoAccel && pMga->TexturedVideo != TRUE)
+       pMga->directRenderingEnabled = MGADRIScreenInit(pScreen);
+    else
+       pMga->directRenderingEnabled = FALSE;
 #endif
      
    
@@ -2458,20 +2484,20 @@
    
 #ifdef XF86DRI
     /* Initialize the Warp engine */
-   if (pMga->directRenderingEnabled) {
-    pMga->directRenderingEnabled = mgaConfigureWarp(pScrn);
-   }
-   if (pMga->directRenderingEnabled) {
-      /* Now that mi, cfb, drm and others have done their thing, 
-       * complete the DRI setup.
-       */
-       pMga->directRenderingEnabled = MGADRIFinishScreenInit(pScreen);
-   }
-   if (pMga->directRenderingEnabled) {
-       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering enabled\n");
-   } else {
-       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering disabled\n");
-   }
+    if (pMga->directRenderingEnabled) {
+        pMga->directRenderingEnabled = mgaConfigureWarp(pScrn);
+    }
+    if (pMga->directRenderingEnabled) {
+       /* Now that mi, cfb, drm and others have done their thing, 
+	* complete the DRI setup.
+	*/
+        pMga->directRenderingEnabled = MGADRIFinishScreenInit(pScreen);
+    }
+    if (pMga->directRenderingEnabled) {
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering enabled\n");
+    } else {
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering disabled\n");
+    }
 #endif
      
     pScrn->memPhysBase = pMga->FbAddress;
@@ -2625,7 +2651,7 @@
     pMGA = MGAPTR(pScrn);
     if (pMGA->directRenderingEnabled) {
         pScreen = screenInfo.screens[scrnIndex];
-        DRILock(pScreen);
+        DRILock(pScreen, 0);
     }
 #endif
      
@@ -2675,6 +2701,8 @@
 	xfree(pMga->DGAModes);
     if (pMga->adaptor)
 	xfree(pMga->adaptor);
+    if (pMga->portPrivate)
+	xfree(pMga->portPrivate);
 
     pScrn->vtSema = FALSE;
 
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_drm.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_drm.c:1.1 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_drm.c:removed
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_drm.c:1.1	Fri Feb 11 09:25:56 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_drm.c	Sat Jul  1 20:42:53 2000
@@ -1,100 +0,0 @@
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86_ansic.h"
-#include "compiler.h"
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-#include "xf86Priv.h"
-#include "mga_bios.h"
-#include "mga_reg.h"
-#include "mga.h"
-#include "mga_macros.h"
-#include "mga_dri.h"
-
-#ifndef XFree86LOADER
-#include <sys/stat.h>
-#include <sys/mman.h>
-#endif
-
-#include "xf86drm.h"
-#include "drm.h"
-#include "mga_drm_public.h"
-
-Bool mgadrmCleanupDma(ScrnInfoPtr pScrn)
-{
-   MGAPtr pMGA = MGAPTR(pScrn);
-   drm_mga_init_t init;
-   
-   memset(&init, 0, sizeof(drm_mga_init_t));
-   init.func = MGA_CLEANUP_DMA;
-   
-   if(ioctl(pMGA->drmSubFD, DRM_IOCTL_MGA_INIT, &init)) {
-      ErrorF("Mga Dma Cleanup Failed\n");
-      return FALSE;
-   }
-   
-   return TRUE;
-}
-
-int mgadrmInitDma(ScrnInfoPtr pScrn, int prim_size)
-{
-   MGAPtr pMGA = MGAPTR(pScrn);
-   MGADRIPtr pMGADRI = (MGADRIPtr)pMGA->pDRIInfo->devPrivate;
-   MGADRIServerPrivatePtr pMGADRIServer = pMGA->DRIServerInfo;
-   drm_mga_init_t init;
-   
-   memset(&init, 0, sizeof(drm_mga_init_t));
-   init.func = MGA_INIT_DMA;
-   init.reserved_map_agpstart = 0;
-   init.reserved_map_idx = 3;
-   init.buffer_map_idx = 4;
-   init.sarea_priv_offset = sizeof(XF86DRISAREARec);
-   init.primary_size = prim_size;
-   init.warp_ucode_size = pMGADRIServer->warp_ucode_size;
-
-   switch(pMGA->Chipset) {
-   case PCI_CHIP_MGAG400:
-      init.chipset = MGA_CARD_TYPE_G400;
-      break;
-   case PCI_CHIP_MGAG200:
-      init.chipset = MGA_CARD_TYPE_G200;
-      break;
-   case PCI_CHIP_MGAG200_PCI:
-   default:
-      ErrorF("Direct rendering not supported on this card/chipset\n");
-      return FALSE;
-   }
-
-   init.fbOffset = pMGADRI->fbOffset;
-   init.backOffset = pMGADRI->backOffset;
-   init.depthOffset = pMGADRI->depthOffset;
-   init.textureOffset = pMGADRI->textureOffset;
-   init.textureSize = pMGADRI->textureSize;
-   init.cpp = pMGADRI->cpp;
-   init.stride = pMGADRI->stride;
-
-   init.frontOrg = pMGA->DstOrg;
-   init.backOrg = pMGADRI->backOffset; /*  */
-   init.depthOrg = pMGADRI->textureOffset;
-   init.mAccess = pMGA->MAccess;
-
-   if (pMGA->HasSDRAM) 
-      init.sgram = 0;
-   else 
-      init.sgram = 1;
-
-   memcpy(&init.WarpIndex, &pMGADRIServer->WarpIndex, 
-	  sizeof(mgaWarpIndex) * MGA_MAX_WARP_PIPES);
-
-
-
-   ErrorF("Mga Dma Initialization start\n");
-
-   if(ioctl(pMGA->drmSubFD, DRM_IOCTL_MGA_INIT, &init)) {
-      ErrorF("Mga Dma Initialization Failed\n");
-      return FALSE;
-   }
-   ErrorF("Mga Dma Initialization done\n");
-   return TRUE;
-}
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h:1.12 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h:1.14
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h:1.12	Fri Feb 11 09:25:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h	Fri Jun 16 17:03:20 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.12 2000/02/11 17:25:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.14 2000/06/17 00:03:20 martin Exp $ */
 
 #ifndef _MGA_MACROS_H_
 #define _MGA_MACROS_H_
@@ -20,7 +20,6 @@
 #define RGBEQUAL(c) (!((((c) >> 8) ^ (c)) & 0xffff)) 
 
 #ifdef XF86DRI
-#define MGAREG_DWGSYNC		      0x2c4c
 #define MGA_SYNC_XTAG                 0x275f4200
 
 #define MGABUSYWAIT() do { \
@@ -83,5 +82,18 @@
 	pMga->AccelFlags &= ~CLIPPER_ON; \
 	WAITFIFO(1); \
 	OUTREG(MGAREG_CXBNDRY, 0xFFFF0000); }
+
+#ifdef XF86DRI
+extern void mgaGetQuiescence( ScrnInfoPtr pScrn );
+
+#define CHECK_DMA_QUIESCENT(pMGA, pScrn) {	\
+   if (!pMGA->have_quiescense) {		\
+      mgaGetQuiescence( pScrn );		\
+   }						\
+}
+#else
+#define CHECK_DMA_QUIESCENT(pMGA, pScrn)
+#endif
+
 
 #endif /* _MGA_MACROS_H_ */
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h:1.11 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h:1.11	Fri Feb 11 09:25:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h	Fri Jun  9 15:43:38 2000
@@ -2,7 +2,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h,v 1.11 2000/02/11 17:25:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h,v 1.12 2000/06/09 22:43:38 mvojkovi Exp $ */
 
 
 
@@ -405,6 +405,30 @@
 #define MGAREG_BESV1WGHT	0x3d48
 #define MGAREG_BESVCOORD	0x3d2c
 #define MGAREG_BESVISCAL	0x3d34
+
+/* texture engine registers */
+
+#define MGAREG_TMR0		0x2c00
+#define MGAREG_TMR1		0x2c04
+#define MGAREG_TMR2		0x2c08
+#define MGAREG_TMR3		0x2c0c
+#define MGAREG_TMR4		0x2c10
+#define MGAREG_TMR5		0x2c14
+#define MGAREG_TMR6		0x2c18
+#define MGAREG_TMR7		0x2c1c
+#define MGAREG_TMR8		0x2c20
+#define MGAREG_TEXORG		0x2c24
+#define MGAREG_TEXWIDTH		0x2c28
+#define MGAREG_TEXHEIGHT	0x2c2c
+#define MGAREG_TEXCTL		0x2c30
+#define MGAREG_TEXCTL2		0x2c3c
+#define MGAREG_TEXTRANS		0x2c34
+#define MGAREG_TEXTRANSHIGH	0x2c38
+#define MGAREG_TEXFILTER	0x2c58
+#define MGAREG_ALPHACTRL	0x2c7c
+
+#define MGAREG_DWGSYNC		0x2c4c
+
 
 #endif
 
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c:1.64 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c:1.69
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c:1.64	Sat Feb 12 12:45:24 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c	Thu Jun 29 13:56:59 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.64 2000/02/12 20:45:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.69 2000/06/29 20:56:59 mvojkovi Exp $ */
 
 
 /* All drivers should typically include these */
@@ -35,7 +35,6 @@
 
 #ifdef XF86DRI
 #include "mga_dri.h"
-#include "mga_dripriv.h"
 #endif
 
 static void MGANAME(SubsequentScreenToScreenCopy)(ScrnInfoPtr pScrn,
@@ -141,11 +140,8 @@
     XAAInfoRecPtr infoPtr;
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     MGAPtr pMga = MGAPTR(pScrn);
-    int maxFastBlitMem;
+    int maxFastBlitMem, maxlines;
     BoxRec AvailFBArea;
-#ifdef XF86DRI
-    RegionRec MemRegion;
-#endif
 
     pMga->AccelInfoRec = infoPtr = XAACreateInfoRec();
     if(!infoPtr) return FALSE;
@@ -381,25 +377,31 @@
 	pMga->MaxFastBlitY = maxFastBlitMem / (pScrn->displayWidth * PSZ / 8);
     }
 
+    maxlines = (min(pMga->FbUsableSize, 16*1024*1024)) / 
+	               (pScrn->displayWidth * PSZ / 8);
 
+#ifdef XF86DRI
+    if (pMga->directRenderingEnabled) {
+	if(maxlines > (pMga->numXAALines + pScrn->virtualY)) 
+	     maxlines = pMga->numXAALines + pScrn->virtualY;
+   	 
+	if(maxlines < (pMga->numXAALines + pScrn->virtualY)) 
+	     pMga->numXAALines = maxlines - pScrn->virtualY;
+	
+	/* not like the 3D will even work when there's not
+           even enough memory for a tiny pixmap cache */
+    }
+   
+#endif
+
     AvailFBArea.x1 = 0;
     AvailFBArea.x2 = pScrn->displayWidth;
-
-#ifndef XF86DRI
     AvailFBArea.y1 = 0;
-    AvailFBArea.y2 = (min(pMga->FbUsableSize, 16*1024*1024)) / 
-			(pScrn->displayWidth * PSZ / 8);
-   
+    AvailFBArea.y2 = maxlines;
     xf86InitFBManager(pScreen, &AvailFBArea); 
-#else
-    AvailFBArea.y1 = pScrn->virtualY;
-    AvailFBArea.y2 = pScrn->virtualY+128;
-   
-    REGION_INIT(pScreen, &MemRegion, &AvailFBArea, 1);
-    xf86InitFBManagerRegion(pScreen, &MemRegion);
-    REGION_UNINIT(pScreen, &MemRegion);
-#endif
-   
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using %d lines for offscreen "
+		   "memory.\n",
+		   maxlines - pScrn->virtualY);
 
     return(XAAInit(pScreen, infoPtr));
 }
@@ -455,7 +457,9 @@
 MGAStormSync(ScrnInfoPtr pScrn) 
 {
     MGAPtr pMga = MGAPTR(pScrn);
-    
+
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+   
     while(MGAISBUSY());
     /* flush cache before a read (mga-1064g 5.1.6) */
     OUTREG8(MGAREG_CRTC_INDEX, 0); 
@@ -471,6 +475,8 @@
     MGAPtr pMga = MGAPTR(pScrn);
     MGAFBLayout *pLayout = &pMga->CurrentLayout;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     if (pMga->Chipset == PCI_CHIP_MGAG100)
     	maccess = 1 << 14;
     
@@ -479,8 +485,9 @@
     case 8:
         break;
     case 16:
-	/* set 16 bpp, turn off dithering, turn on 5:5:5 pixels */
-        maccess |= 1 + (1 << 30) + (1 << 31);
+        maccess |= 1;
+	if(pLayout->depth == 15)
+	   maccess |= (1 << 31);
         break;
     case 24:
         maccess |= 3;
@@ -539,6 +546,8 @@
 ){
     MGAPtr pMga = MGAPTR(pScrn);
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     WAITFIFO(3);
     OUTREG(MGAREG_CXBNDRY,(x2 << 16) | x1);      
     OUTREG(MGAREG_YTOP, (y1 * pScrn->displayWidth) + pMga->YDstOrg); 
@@ -550,6 +559,8 @@
 {
     MGAPtr pMga = MGAPTR(pScrn);
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     WAITFIFO(3);
     OUTREG(MGAREG_CXBNDRY, 0xFFFF0000);     /* (maxX << 16) | minX */ 
     OUTREG(MGAREG_YTOP, 0x00000000);        /* minPixelPointer */ 
@@ -580,6 +591,8 @@
     CARD32 dwgctl = pMga->AtypeNoBLK[rop] | MGADWG_SHIFTZERO | 
 			MGADWG_BITBLT | MGADWG_BFCOL;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     pMga->AccelInfoRec->SubsequentScreenToScreenCopy = 
 		MGANAME(SubsequentScreenToScreenCopy);
 
@@ -767,6 +780,8 @@
 {
     MGAPtr pMga = MGAPTR(pScrn);
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
 #if PSZ == 24
     if(!RGBEQUAL(color))
     pMga->FilledRectCMD = MGADWG_TRAP | MGADWG_SOLID | MGADWG_ARZERO | 
@@ -812,7 +827,7 @@
     int ar2 = sdxl? dxL : -dxL;
     int sdxr = (dxR < 0);
     int ar5 = sdxr? dxR : -dxR;
-    
+
     WAITFIFO(11);
     OUTREG(MGAREG_DWGCTL, 
 		pMga->FilledRectCMD & ~(MGADWG_ARZERO | MGADWG_SGNZERO));
@@ -892,6 +907,8 @@
     MGAPtr pMga = MGAPTR(pScrn);
     XAAInfoRecPtr infoRec = pMga->AccelInfoRec;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     pMga->PatternRectCMD = MGADWG_TRAP | MGADWG_ARZERO | MGADWG_SGNZERO | 
 						MGADWG_BMONOLEF;
 
@@ -936,7 +953,7 @@
     int x, int y, int w, int h )
 {
     MGAPtr pMga = MGAPTR(pScrn);
-    
+
     WAITFIFO(3);
     OUTREG(MGAREG_SHIFT, (paty << 4) | patx);
     OUTREG(MGAREG_FXBNDRY, ((x + w) << 16) | (x & 0xffff));
@@ -952,6 +969,7 @@
     int x, int y, int w, int h )
 {
     MGAPtr pMga = MGAPTR(pScrn);
+
     WAITFIFO(2);
     OUTREG(MGAREG_FXBNDRY, ((x + w) << 16) | (x & 0xffff));
     OUTREG(MGAREG_YDSTLEN + MGAREG_EXEC, (y << 16) | h);
@@ -1002,10 +1020,11 @@
 	unsigned int planemask )
 {
     MGAPtr pMga = MGAPTR(pScrn);
-
     CARD32 mgaCMD = MGADWG_ILOAD | MGADWG_LINEAR | MGADWG_SGNZERO | 
 			MGADWG_SHIFTZERO | MGADWG_BMONOLEF;
-        
+
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     if(bg == -1) {
 #if PSZ == 24
     	if(!RGBEQUAL(fg))
@@ -1066,6 +1085,8 @@
 ){
     MGAPtr pMga = MGAPTR(pScrn);
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     WAITFIFO(3);
     OUTREG(MGAREG_AR5, 0);
     SET_PLANEMASK(planemask);
@@ -1110,6 +1131,8 @@
     CARD32 NiceDashPattern = DashPattern[0];
     int dwords = (length + 31) >> 5;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     pMga->DashCMD = MGADWG_BFCOL | pMga->AtypeNoBLK[rop];
     pMga->StyleLen = length - 1;
 
@@ -1216,7 +1239,9 @@
     MGAPtr pMga = MGAPTR(pScrn);
     CARD32 mgaCMD = pMga->AtypeNoBLK[rop] | MGADWG_BITBLT | 
 				MGADWG_SGNZERO | MGADWG_BPLAN;
-        
+
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     if(bg == -1) {
 	mgaCMD |= MGADWG_TRANSC;
 	WAITFIFO(4);
@@ -1267,7 +1292,9 @@
 ){
     MGAPtr pMga = MGAPTR(pScrn);
     CARD32 mgaCMD = MGADWG_BITBLT | MGADWG_SGNZERO | MGADWG_SHIFTZERO;
-        
+
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     if(bg == -1) {
 #if PSZ == 24
     	if(!RGBEQUAL(fg))
@@ -1427,6 +1454,8 @@
     CARD32* maxptr;
     int dwords, maxlines, count;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     (*infoRec->SetupForCPUToScreenColorExpandFill)(
 				pScrn, fg, bg, rop, planemask);
 
@@ -1570,6 +1599,8 @@
     XAAInfoRecPtr infoRec = pMga->AccelInfoRec;
     CARD32 *base = (CARD32*)pMga->ILOADBase;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     SET_SYNC_FLAG(infoRec);
     (*infoRec->SetupForSolidFill)(pScrn, fg, rop, planemask);
 
@@ -1610,6 +1641,7 @@
     XAAInfoRecPtr infoRec = pMga->AccelInfoRec;
     CARD32 *base = (CARD32*)pMga->ILOADBase;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
     SET_SYNC_FLAG(infoRec);
     
     if(infoRec->ClipBox) {
@@ -1670,6 +1702,8 @@
     int	nBox, SecondPassColor;
     BoxPtr pBox;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     if((rop == GXcopy) && (bg != -1)) {
 	SecondPassColor = bg;
 	bg = -1;
@@ -1718,6 +1752,7 @@
     int x1, x2, y1, y2, i, h, skiptop, dwords, maxlines;
     unsigned char *src;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
     (*infoRec->SetupForCPUToScreenColorExpandFill)(
 					pScrn, fg, -1, rop, planemask);
     WAITFIFO(1);
@@ -1888,6 +1923,8 @@
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     int x, y, phaseY, phaseX, skipleft, height, width, w, blit_w, blit_h, start;
 
+    CHECK_DMA_QUIESCENT(MGAPTR(pScrn), pScrn);
+
     (*infoRec->SetupForScreenToScreenCopy)(pScrn, 1, 1, rop, planemask,
 		pCache->trans_color);
 
@@ -1980,7 +2017,9 @@
     CARD32* base;
     int dwords;
 
-    (*infoRec->SetupForCPUToScreenColorExpandFill)(
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
+   (*infoRec->SetupForCPUToScreenColorExpandFill)(
 				pScrn, fg, bg, rop, planemask);
 
     w += skipleft;
@@ -2013,29 +2052,27 @@
 void
 MGANAME(DRIInitBuffers)(WindowPtr pWin, RegionPtr prgn, CARD32 index)
 {
-  ScreenPtr pScreen = pWin->drawable.pScreen;
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  MGAPtr pMGA = MGAPTR(pScrn);
-  BoxPtr pbox;
-  int nbox;
-
-  /* It looks nicer if these start out black */
-  pbox = REGION_RECTS(prgn);
-  nbox = REGION_NUM_RECTS(prgn);
-
-  MGANAME(SetupForSolidFill)(pScrn, 0, GXcopy, -1);
-  while (nbox--) {
-    MGASelectBuffer(pMGA, MGA_BACK);
-    MGANAME(SubsequentSolidFillRect)(pScrn, pbox->x1, pbox->y1,
-				     pbox->x2-pbox->x1, pbox->y2-pbox->y1);
-    MGASelectBuffer(pMGA, MGA_DEPTH);
-    MGANAME(SubsequentSolidFillRect)(pScrn, pbox->x1, pbox->y1,
-				     pbox->x2-pbox->x1, pbox->y2-pbox->y1);
-    pbox++;
-  }
-  MGASelectBuffer(pMGA, MGA_FRONT);
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    MGAPtr pMGA = MGAPTR(pScrn);
+    BoxPtr pbox = REGION_RECTS(prgn);
+    int nbox  = REGION_NUM_RECTS(prgn);
+
+    CHECK_DMA_QUIESCENT(MGAPTR(pScrn), pScrn);
+
+    MGANAME(SetupForSolidFill)(pScrn, 0, GXcopy, -1);
+    while (nbox--) {
+        MGASelectBuffer(pScrn, MGA_BACK);
+        MGANAME(SubsequentSolidFillRect)(pScrn, pbox->x1, pbox->y1,
+					 pbox->x2-pbox->x1, pbox->y2-pbox->y1);
+        MGASelectBuffer(pScrn, MGA_DEPTH);
+        MGANAME(SubsequentSolidFillRect)(pScrn, pbox->x1, pbox->y1,
+					 pbox->x2-pbox->x1, pbox->y2-pbox->y1);
+        pbox++;
+    }
+    MGASelectBuffer(pScrn, MGA_FRONT);
 
-  pMGA->AccelInfoRec->NeedToSync = TRUE;
+    pMGA->AccelInfoRec->NeedToSync = TRUE;
 }
 
 /*
@@ -2049,127 +2086,142 @@
 MGANAME(DRIMoveBuffers)(WindowPtr pParent, DDXPointRec ptOldOrg, 
 		   RegionPtr prgnSrc, CARD32 index)
 {
-#if 0
-  ScreenPtr pScreen = pParent->drawable.pScreen;
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  MGAPtr pMGA = MGAPTR(pScrn);
-  int nbox;
-  BoxPtr pbox, pboxTmp, pboxNext, pboxBase, pboxNew1, pboxNew2;
-  DDXPointPtr pptTmp, pptNew1, pptNew2;
-  int xdir, ydir;
-  int dx, dy, w, h;
-  DDXPointPtr pptSrc;
-
-  pbox = REGION_RECTS(prgnSrc);
-  nbox = REGION_NUM_RECTS(prgnSrc);
-  pboxNew1 = 0;
-  pptNew1 = 0;
-  pboxNew2 = 0;
-  pboxNew2 = 0;
-  pptSrc = &ptOldOrg;
-
-  dx = pParent->drawable.x - ptOldOrg.x;
-  dy = pParent->drawable.y - ptOldOrg.y;
-
-  /* If the copy will overlap in Y, reverse the order */
-  if (dy>0) {
-    ydir = -1;
-
-    if (nbox>1) {
-      /* Keep ordering in each band, reverse order of bands */
-      pboxNew1 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
-      if (!pboxNew1) return;
-      pptNew1 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
-      if (!pptNew1) {
-	DEALLOCATE_LOCAL(pboxNew1);
-	return;
-      }
-      pboxBase = pboxNext = pbox+nbox-1;
-      while (pboxBase >= pbox) {
-	while ((pboxNext >= pbox) && (pboxBase->y1 == pboxNext->y1))
-	  pboxNext--;
-	pboxTmp = pboxNext+1;
-	pptTmp = pptSrc + (pboxTmp - pbox);
-	while (pboxTmp <= pboxBase) {
-	  *pboxNew1++ = *pboxTmp++;
-	  *pptNew1++ = *pptTmp++;
-	}
-	pboxBase = pboxNext;
-      }
-      pboxNew1 -= nbox;
-      pbox = pboxNew1;
-      pptNew1 -= nbox;
-      pptSrc = pptNew1;
-    }
-  } else {
-    /* No changes required */
-    ydir = 1;
-  }
-
-  /* If the regions will overlap in X, reverse the order */
-  if (dx>0) {
-    xdir = -1;
-
-    if (nbox > 1) {
-      /*reverse orderof rects in each band */
-      pboxNew2 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
-      pptNew2 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
-      if (!pboxNew2 || !pptNew2) {
-	if (pptNew2) DEALLOCATE_LOCAL(pptNew2);
-	if (pboxNew2) DEALLOCATE_LOCAL(pboxNew2);
-	if (pboxNew1) {
-	  DEALLOCATE_LOCAL(pptNew1);
-	  DEALLOCATE_LOCAL(pboxNew1);
+    ScreenPtr pScreen = pParent->drawable.pScreen;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    MGAPtr pMGA = MGAPTR(pScrn);
+    int nbox;
+    BoxPtr pbox, pboxTmp, pboxNext, pboxBase, pboxNew1, pboxNew2;
+    DDXPointPtr pptTmp, pptNew1, pptNew2;
+    int xdir, ydir;
+    int dx, dy;
+    DDXPointPtr pptSrc;
+    int screenwidth = pScrn->virtualX;
+    int screenheight = pScrn->virtualY;
+
+    CHECK_DMA_QUIESCENT(MGAPTR(pScrn), pScrn);
+
+    pbox = REGION_RECTS(prgnSrc);
+    nbox = REGION_NUM_RECTS(prgnSrc);
+    pboxNew1 = 0;
+    pptNew1 = 0;
+    pboxNew2 = 0;
+    pboxNew2 = 0;
+    pptSrc = &ptOldOrg;
+
+    dx = pParent->drawable.x - ptOldOrg.x;
+    dy = pParent->drawable.y - ptOldOrg.y;
+
+    /* If the copy will overlap in Y, reverse the order */
+    if (dy>0) {
+        ydir = -1;
+
+        if (nbox>1) {
+	    /* Keep ordering in each band, reverse order of bands */
+	    pboxNew1 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
+	    if (!pboxNew1) return;
+	    pptNew1 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
+	    if (!pptNew1) {
+	        DEALLOCATE_LOCAL(pboxNew1);
+	        return;
+	    }
+	    pboxBase = pboxNext = pbox+nbox-1;
+	    while (pboxBase >= pbox) {
+	        while ((pboxNext >= pbox) && (pboxBase->y1 == pboxNext->y1))
+		  pboxNext--;
+	        pboxTmp = pboxNext+1;
+	        pptTmp = pptSrc + (pboxTmp - pbox);
+	        while (pboxTmp <= pboxBase) {
+		    *pboxNew1++ = *pboxTmp++;
+		    *pptNew1++ = *pptTmp++;
+		}
+	        pboxBase = pboxNext;
+	    }
+	    pboxNew1 -= nbox;
+	    pbox = pboxNew1;
+	    pptNew1 -= nbox;
+	    pptSrc = pptNew1;
 	}
-	return;
-      }
-      pboxBase = pboxNext = pbox;
-      while (pboxBase < pbox+nbox) {
-	while ((pboxNext < pbox+nbox) && (pboxNext->y1 == pboxBase->y1))
-	  pboxNext++;
-	pboxTmp = pboxNext;
-	pptTmp = pptSrc + (pboxTmp - pbox);
-	while (pboxTmp != pboxBase) {
-	  *pboxNew2++ = *--pboxTmp;
-	  *pptNew2++ = *--pptTmp;
+    } else {
+        /* No changes required */
+        ydir = 1;
+    }
+
+    /* If the regions will overlap in X, reverse the order */
+    if (dx>0) {
+        xdir = -1;
+
+        if (nbox > 1) {
+	    /*reverse orderof rects in each band */
+	    pboxNew2 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
+	    pptNew2 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
+	    if (!pboxNew2 || !pptNew2) {
+	        if (pptNew2) DEALLOCATE_LOCAL(pptNew2);
+	        if (pboxNew2) DEALLOCATE_LOCAL(pboxNew2);
+	        if (pboxNew1) {
+		    DEALLOCATE_LOCAL(pptNew1);
+		    DEALLOCATE_LOCAL(pboxNew1);
+		}
+	       return;
+	    }
+	    pboxBase = pboxNext = pbox;
+	    while (pboxBase < pbox+nbox) {
+	        while ((pboxNext < pbox+nbox) && 
+		       (pboxNext->y1 == pboxBase->y1))
+		  pboxNext++;
+	        pboxTmp = pboxNext;
+	        pptTmp = pptSrc + (pboxTmp - pbox);
+	        while (pboxTmp != pboxBase) {
+		    *pboxNew2++ = *--pboxTmp;
+		    *pptNew2++ = *--pptTmp;
+		}
+	        pboxBase = pboxNext;
+	    }
+	    pboxNew2 -= nbox;
+	    pbox = pboxNew2;
+	    pptNew2 -= nbox;
+	    pptSrc = pptNew2;
 	}
-	pboxBase = pboxNext;
-      }
-      pboxNew2 -= nbox;
-      pbox = pboxNew2;
-      pptNew2 -= nbox;
-      pptSrc = pptNew2;
-    }
-  } else {
-    /* No changes are needed */
-    xdir = 1;
-  }
+    } else {
+        /* No changes are needed */
+        xdir = 1;
+    }
   
-  MGANAME(SetupForScreenToScreenCopy)(pScrn, xdir, ydir, GXcopy, -1, -1);
-  while (nbox--) {
-    w=pbox->x2-pbox->x1+1;
-    h=pbox->y2-pbox->y1+1;
-    MGASelectBuffer(pMGA, MGA_BACK);
-    MGANAME(SubsequentScreenToScreenCopy)(pScrn, pbox->x1, pbox->y1, 
-				     pbox->x1+dx, pbox->y1+dy, w, h);
-    MGASelectBuffer(pMGA, MGA_DEPTH);
-    MGANAME(SubsequentScreenToScreenCopy)(pScrn, pbox->x1, pbox->y1, 
-				     pbox->x1+dx, pbox->y1+dy, w, h);
-    pbox++;
-  }
-  MGASelectBuffer(pMGA, MGA_FRONT);
-
-  if (pboxNew2) {
-    DEALLOCATE_LOCAL(pptNew2);
-    DEALLOCATE_LOCAL(pboxNew2);
-  }
-  if (pboxNew1) {
-    DEALLOCATE_LOCAL(pptNew1);
-    DEALLOCATE_LOCAL(pboxNew1);
-  }
+    MGANAME(SetupForScreenToScreenCopy)(pScrn, xdir, ydir, GXcopy, -1, -1);
+    for ( ; nbox-- ; pbox++) 
+     {
+	 int x1 = pbox->x1;
+	 int y1 = pbox->y1;
+	 int destx = x1 + dx;
+	 int desty = y1 + dy;
+	 int w = pbox->x2 - x1 + 1;
+	 int h = pbox->y2 - y1 + 1;
+
+	 if ( destx < 0 ) x1 -= destx, w += destx, destx = 0; 
+	 if ( desty < 0 ) y1 -= desty, h += desty, desty = 0;
+	 if ( destx + w > screenwidth ) w = screenwidth - destx;
+	 if ( desty + h > screenheight ) h = screenheight - desty;
+	 if ( w <= 0 ) continue;
+	 if ( h <= 0 ) continue;
+
+	 MGASelectBuffer(pScrn, MGA_BACK);
+	 MGANAME(SubsequentScreenToScreenCopy)(pScrn, x1, y1, 
+					       destx,desty, w, h);
+	 MGASelectBuffer(pScrn, MGA_DEPTH);
+	 MGANAME(SubsequentScreenToScreenCopy)(pScrn, x1,y1, 
+					       destx,desty, w, h);
+     }
+    MGASelectBuffer(pScrn, MGA_FRONT);
+
+    if (pboxNew2) {
+        DEALLOCATE_LOCAL(pptNew2);
+        DEALLOCATE_LOCAL(pboxNew2);
+    }
+    if (pboxNew1) {
+        DEALLOCATE_LOCAL(pptNew1);
+        DEALLOCATE_LOCAL(pboxNew1);
+    }
 
-  pMGA->AccelInfoRec->NeedToSync = TRUE;
-#endif
+    pMGA->AccelInfoRec->NeedToSync = TRUE;
 }
 	   
 #endif /* XF86DRI */
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c:1.12 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c:1.15
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c:1.12	Tue Mar  7 17:14:27 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c	Fri Jun 16 17:03:20 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c,v 1.12 2000/03/08 01:14:27 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c,v 1.15 2000/06/17 00:03:20 martin Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -19,9 +19,10 @@
 #include "xaa.h"
 #include "xaalocal.h"
 #include "dixstruct.h"
+#include "fourcc.h"
 
-#define OFF_DELAY 	200  /* milliseconds */
-#define FREE_DELAY 	60000
+#define OFF_DELAY 	250  /* milliseconds */
+#define FREE_DELAY 	15000
 
 #define OFF_TIMER 	0x01
 #define FREE_TIMER	0x02
@@ -29,26 +30,36 @@
 
 #define TIMER_MASK      (OFF_TIMER | FREE_TIMER)
 
+#define MGA_MAX_PORTS	16
+
 #ifndef XvExtension
 void MGAInitVideo(ScreenPtr pScreen) {}
-void MGAResetVideo(ScrnInfoPtr pScrn) {}
 #else
 
-static XF86VideoAdaptorPtr MGASetupImageVideoG(ScreenPtr);
 static void MGAInitOffscreenImages(ScreenPtr);
-static void MGAStopVideoG(ScrnInfoPtr, pointer, Bool);
-static int MGASetPortAttributeG(ScrnInfoPtr, Atom, INT32, pointer);
-static int MGAGetPortAttributeG(ScrnInfoPtr, Atom ,INT32 *, pointer);
-static void MGAQueryBestSizeG(ScrnInfoPtr, Bool,
-	short, short, short, short, unsigned int *, unsigned int *, pointer);
-static int MGAPutImageG( ScrnInfoPtr, 
-	short, short, short, short, short, short, short, short,
-	int, unsigned char*, short, short, Bool, RegionPtr, pointer);
-static int MGAQueryImageAttributesG(ScrnInfoPtr, 
-	int, unsigned short *, unsigned short *,  int *, int *);
+
+static XF86VideoAdaptorPtr MGASetupImageVideoOverlay(ScreenPtr);
+static int  MGASetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, pointer);
+static int  MGAGetPortAttributeOverlay(ScrnInfoPtr, Atom ,INT32 *, pointer);
+
+static XF86VideoAdaptorPtr MGASetupImageVideoTexture(ScreenPtr);
+static int  MGASetPortAttributeTexture(ScrnInfoPtr, Atom, INT32, pointer);
+static int  MGAGetPortAttributeTexture(ScrnInfoPtr, Atom ,INT32 *, pointer);
+
+static void MGAStopVideo(ScrnInfoPtr, pointer, Bool);
+static void MGAQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, 
+			unsigned int *, unsigned int *, pointer);
+static int  MGAPutImage(ScrnInfoPtr, short, short, short, short, short, 
+			short, short, short, int, unsigned char*, short, 
+			short, Bool, RegionPtr, pointer);
+static int  MGAQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, 
+			unsigned short *,  int *, int *);
 
 static void MGABlockHandler(int, pointer, pointer, pointer);
 
+static void MGAResetVideoOverlay(ScrnInfoPtr);
+
+
 #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
 
 static Atom xvBrightness, xvContrast, xvColorKey;
@@ -60,15 +71,32 @@
     XF86VideoAdaptorPtr newAdaptor = NULL;
     MGAPtr pMga = MGAPTR(pScrn);
     int num_adaptors;
-	
-    if((pScrn->bitsPerPixel != 8) && !pMga->Overlay8Plus24 &&
+
+    if((pScrn->bitsPerPixel != 8) && !pMga->NoAccel &&
        ((pMga->Chipset == PCI_CHIP_MGAG200) ||
         (pMga->Chipset == PCI_CHIP_MGAG200_PCI) ||
         (pMga->Chipset == PCI_CHIP_MGAG400))) 
     {
-	newAdaptor = MGASetupImageVideoG(pScreen);
-	MGAInitOffscreenImages(pScreen);
+
+	if((pMga->Overlay8Plus24 /* || dualhead */ || pMga->TexturedVideo) &&
+	   (pScrn->bitsPerPixel != 24))
+        {
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using texture video\n");
+	    newAdaptor = MGASetupImageVideoTexture(pScreen);
+	    pMga->TexturedVideo = TRUE;
+	} else {
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using overlay video\n");
+	    newAdaptor = MGASetupImageVideoOverlay(pScreen);
+	    pMga->TexturedVideo = FALSE;
+	}
+
+	if(!pMga->Overlay8Plus24 /* && !dualhead */)
+	    MGAInitOffscreenImages(pScreen);
+
+	pMga->BlockHandler = pScreen->BlockHandler;
+	pScreen->BlockHandler = MGABlockHandler;
     }
+    
 
     num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
 
@@ -97,113 +125,62 @@
 }
 
 /* client libraries expect an encoding */
-static XF86VideoEncodingRec DummyEncoding[1] =
+static XF86VideoEncodingRec DummyEncoding[2] =
 {
- {
+ {   /* overlay limit */
    0,
    "XV_IMAGE",
    1024, 1024,
    {1, 1}
+ },
+ {  /* texture limit */
+   0,
+   "XV_IMAGE",
+   2046, 2046,
+   {1, 1}
  }
 };
 
-#define NUM_FORMATS_G 3
+#define NUM_FORMATS_OVERLAY 3
+#define NUM_FORMATS_TEXTURE 6
 
-static XF86VideoFormatRec FormatsG[NUM_FORMATS_G] = 
+static XF86VideoFormatRec Formats[NUM_FORMATS_TEXTURE] = 
 {
-   {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+   {15, TrueColor}, {16, TrueColor}, {24, TrueColor},
+   {15, DirectColor}, {16, DirectColor}, {24, DirectColor}
 };
 
-#define NUM_ATTRIBUTES_G 3
+#define NUM_ATTRIBUTES_OVERLAY 3
 
-static XF86AttributeRec AttributesG[NUM_ATTRIBUTES_G] =
+static XF86AttributeRec Attributes[NUM_ATTRIBUTES_OVERLAY] =
 {
    {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
    {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
    {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"}
 };
 
-#define NUM_IMAGES_G 3
+#define NUM_IMAGES 4
 
-static XF86ImageRec ImagesG[NUM_IMAGES_G] =
+static XF86ImageRec Images[NUM_IMAGES] =
 {
-   {
-	0x32595559,
-        XvYUV,
-	LSBFirst,
-	{'Y','U','Y','2',
-	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71},
-	16,
-	XvPacked,
-	1,
-	0, 0, 0, 0 ,
-	8, 8, 8, 
-	1, 2, 2,
-	1, 1, 1,
-	{'Y','U','Y','V',
-	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-	XvTopToBottom
-   },
-   {
-	0x32315659,
-        XvYUV,
-	LSBFirst,
-	{'Y','V','1','2',
-	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71},
-	12,
-	XvPlanar,
-	3,
-	0, 0, 0, 0 ,
-	8, 8, 8, 
-	1, 2, 2,
-	1, 2, 2,
-	{'Y','V','U',
-	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-	XvTopToBottom
-   },
-   {
-	0x59565955,
-        XvYUV,
-	LSBFirst,
-	{'U','Y','V','Y',
-	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71},
-	16,
-	XvPacked,
-	1,
-	0, 0, 0, 0 ,
-	8, 8, 8, 
-	1, 2, 2,
-	1, 1, 1,
-	{'U','Y','V','Y',
-	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-	XvTopToBottom
-   }
+	XVIMAGE_YUY2,
+	XVIMAGE_YV12,
+	XVIMAGE_I420,
+	XVIMAGE_UYVY
 };
 
-typedef struct {
-   unsigned char brightness;
-   unsigned char contrast;
-   FBAreaPtr	area;
-   RegionRec	clip;
-   CARD32	colorKey;
-   CARD32	videoStatus;
-   Time		offTime;
-   Time		freeTime;
-} MGAPortPrivRec, *MGAPortPrivPtr;
-
-
-#define GET_PORT_PRIVATE(pScrn) \
-   (MGAPortPrivPtr)((MGAPTR(pScrn))->adaptor->pPortPrivates[0].ptr)
-
 #define outMGAdreg(reg, val) OUTREG8(RAMDAC_OFFSET + (reg), val)
 #define outMGAdac(reg, val) \
         (outMGAdreg(MGA1064_INDEX, reg), outMGAdreg(MGA1064_DATA, val))
 
-void MGAResetVideo(ScrnInfoPtr pScrn) 
+static void 
+MGAResetVideoOverlay(ScrnInfoPtr pScrn) 
 {
     MGAPtr pMga = MGAPTR(pScrn);
-    MGAPortPrivPtr pPriv = pMga->adaptor->pPortPrivates[0].ptr;
+    MGAPortPrivPtr pPriv = pMga->portPrivate;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+   
     outMGAdac(0x51, 0x01); /* keying on */
     outMGAdac(0x52, 0xff); /* full mask */
     outMGAdac(0x53, 0xff);
@@ -216,79 +193,136 @@
     outMGAdac(0x57, (pPriv->colorKey & pScrn->mask.blue) >> 
 		    pScrn->offset.blue);
 
-
     OUTREG(MGAREG_BESLUMACTL, ((pPriv->brightness & 0xff) << 16) |
 			       (pPriv->contrast & 0xff));
 }
 
 
+static XF86VideoAdaptorPtr
+MGAAllocAdaptor(ScrnInfoPtr pScrn)
+{
+    XF86VideoAdaptorPtr adapt;
+    MGAPtr pMga = MGAPTR(pScrn);
+    MGAPortPrivPtr pPriv;
+    int i;
+
+    if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
+	return NULL;
+
+    if(!(pPriv = xcalloc(1, sizeof(MGAPortPrivRec) + 
+			(sizeof(DevUnion) * MGA_MAX_PORTS)))) 
+    {
+	xfree(adapt);
+	return NULL;
+    }
+
+    adapt->pPortPrivates = (DevUnion*)(&pPriv[1]);
+
+    for(i = 0; i < MGA_MAX_PORTS; i++)
+	adapt->pPortPrivates[i].val = i;
+
+    xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
+    xvContrast   = MAKE_ATOM("XV_CONTRAST");
+    xvColorKey   = MAKE_ATOM("XV_COLORKEY");
+
+    pPriv->colorKey = pMga->videoKey;
+    pPriv->videoStatus = 0;
+    pPriv->brightness = 0;
+    pPriv->contrast = 128;
+    pPriv->lastPort = -1;
+
+    pMga->adaptor = adapt;
+    pMga->portPrivate = pPriv;
+
+    return adapt;
+}
+
 static XF86VideoAdaptorPtr 
-MGASetupImageVideoG(ScreenPtr pScreen)
+MGASetupImageVideoOverlay(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     MGAPtr pMga = MGAPTR(pScrn);
     XF86VideoAdaptorPtr adapt;
-    MGAPortPrivPtr pPriv;
 
-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-			    sizeof(MGAPortPrivRec) +
-			    sizeof(DevUnion))))
-	return NULL;
+    adapt = MGAAllocAdaptor(pScrn);
 
     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
     adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
     adapt->name = "Matrox G-Series Backend Scaler";
     adapt->nEncodings = 1;
-    adapt->pEncodings = DummyEncoding;
-    adapt->nFormats = NUM_FORMATS_G;
-    adapt->pFormats = FormatsG;
+    adapt->pEncodings = &DummyEncoding[0];
+    adapt->nFormats = NUM_FORMATS_OVERLAY;
+    adapt->pFormats = Formats;
     adapt->nPorts = 1;
-    adapt->pPortPrivates = (DevUnion*)(&adapt[1]);
-    pPriv = (MGAPortPrivPtr)(&adapt->pPortPrivates[1]);
-    adapt->pPortPrivates[0].ptr = (pointer)(pPriv);
-    adapt->pAttributes = AttributesG;
+    adapt->pAttributes = Attributes;
     if (pMga->Chipset == PCI_CHIP_MGAG400) {
-	adapt->nImages = 3;
+	adapt->nImages = 4;
 	adapt->nAttributes = 3;
     } else {
-	adapt->nImages = 2;
+	adapt->nImages = 3;
 	adapt->nAttributes = 1;
     }
-    adapt->pImages = ImagesG;
+    adapt->pImages = Images;
     adapt->PutVideo = NULL;
     adapt->PutStill = NULL;
     adapt->GetVideo = NULL;
     adapt->GetStill = NULL;
-    adapt->StopVideo = MGAStopVideoG;
-    adapt->SetPortAttribute = MGASetPortAttributeG;
-    adapt->GetPortAttribute = MGAGetPortAttributeG;
-    adapt->QueryBestSize = MGAQueryBestSizeG;
-    adapt->PutImage = MGAPutImageG;
-    adapt->QueryImageAttributes = MGAQueryImageAttributesG;
+    adapt->StopVideo = MGAStopVideo;
+    adapt->SetPortAttribute = MGASetPortAttributeOverlay;
+    adapt->GetPortAttribute = MGAGetPortAttributeOverlay;
+    adapt->QueryBestSize = MGAQueryBestSize;
+    adapt->PutImage = MGAPutImage;
+    adapt->QueryImageAttributes = MGAQueryImageAttributes;
 
-    pPriv->colorKey = pMga->videoKey;
-    pPriv->videoStatus = 0;
-    pPriv->brightness = 0;
-    pPriv->contrast = 128;
-    
     /* gotta uninit this someplace */
-    REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); 
+    REGION_INIT(pScreen, &(pMga->portPrivate->clip), NullBox, 0); 
 
-    pMga->adaptor = adapt;
+    MGAResetVideoOverlay(pScrn);
 
-    pMga->BlockHandler = pScreen->BlockHandler;
-    pScreen->BlockHandler = MGABlockHandler;
+    return adapt;
+}
 
-    xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
-    xvContrast   = MAKE_ATOM("XV_CONTRAST");
-    xvColorKey   = MAKE_ATOM("XV_COLORKEY");
 
-    MGAResetVideo(pScrn);
+static XF86VideoAdaptorPtr 
+MGASetupImageVideoTexture(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    XF86VideoAdaptorPtr adapt;
+    MGAPtr pMga = MGAPTR(pScrn);
+
+    adapt = MGAAllocAdaptor(pScrn);
 
+    adapt->type = XvWindowMask | XvInputMask | XvImageMask;
+    adapt->flags = 0;
+    adapt->name = "Matrox G-Series Texture Engine";
+    adapt->nEncodings = 1;
+    adapt->pEncodings = &DummyEncoding[1];
+    adapt->nFormats = NUM_FORMATS_TEXTURE;
+    adapt->pFormats = Formats;
+    adapt->nPorts = MGA_MAX_PORTS;
+    adapt->pAttributes = NULL;
+    adapt->nAttributes = 0;
+    adapt->pImages = Images;
+    if (pMga->Chipset == PCI_CHIP_MGAG400)
+	adapt->nImages = 4;
+    else
+	adapt->nImages = 3;
+    adapt->PutVideo = NULL;
+    adapt->PutStill = NULL;
+    adapt->GetVideo = NULL;
+    adapt->GetStill = NULL;
+    adapt->StopVideo = MGAStopVideo;
+    adapt->SetPortAttribute = MGASetPortAttributeTexture;
+    adapt->GetPortAttribute = MGAGetPortAttributeTexture;
+    adapt->QueryBestSize = MGAQueryBestSize;
+    adapt->PutImage = MGAPutImage;
+    adapt->QueryImageAttributes = MGAQueryImageAttributes;
+
     return adapt;
 }
 
 
+
 static Bool
 RegionsEqual(RegionPtr A, RegionPtr B)
 {
@@ -328,18 +362,21 @@
    boundaries in 16.16 fixed point. 
 */
 
-static void
+#define DummyScreen screenInfo.screens[0]
+
+static Bool
 MGAClipVideo(
   BoxPtr dst, 
   INT32 *x1, 
   INT32 *x2, 
   INT32 *y1, 
   INT32 *y2,
-  BoxPtr extents,            /* extents of the clip region */
+  RegionPtr reg,
   INT32 width, 
   INT32 height
 ){
     INT32 vscale, hscale, delta;
+    BoxPtr extents = REGION_EXTENTS(DummyScreen, reg);
     int diff;
 
     hscale = ((*x2 - *x1) << 16) / (dst->x2 - dst->x1);
@@ -380,6 +417,8 @@
 	dst->x2 -= diff;
 	*x2 -= diff * hscale;
     }
+    if(*x1 >= *x2) return FALSE;
+
     if(*y1 < 0) {
 	diff =  (- *y1 + vscale - 1)/ vscale;
 	dst->y1 += diff;
@@ -391,13 +430,26 @@
 	dst->y2 -= diff;
 	*y2 -= diff * vscale;
     }
+    if(*y1 >= *y2) return FALSE;
+
+    if((dst->x1 != extents->x1) || (dst->x2 != extents->x2) ||
+       (dst->y1 != extents->y1) || (dst->y2 != extents->y2))
+    {
+	RegionRec clipReg;
+	REGION_INIT(DummyScreen, &clipReg, dst, 1);
+	REGION_INTERSECT(DummyScreen, reg, reg, &clipReg);
+	REGION_UNINIT(DummyScreen, &clipReg);
+    }
+    return TRUE;
 } 
 
 static void 
-MGAStopVideoG(ScrnInfoPtr pScrn, pointer data, Bool exit)
+MGAStopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit)
 {
-  MGAPortPrivPtr pPriv = (MGAPortPrivPtr)data;
   MGAPtr pMga = MGAPTR(pScrn);
+  MGAPortPrivPtr pPriv = pMga->portPrivate;
+
+  if(pMga->TexturedVideo) return;
 
   REGION_EMPTY(pScrn->pScreen, &pPriv->clip);   
 
@@ -418,15 +470,17 @@
 }
 
 static int 
-MGASetPortAttributeG(
+MGASetPortAttributeOverlay(
   ScrnInfoPtr pScrn, 
   Atom attribute,
   INT32 value, 
   pointer data
 ){
-  MGAPortPrivPtr pPriv = (MGAPortPrivPtr)data;
   MGAPtr pMga = MGAPTR(pScrn);
+  MGAPortPrivPtr pPriv = pMga->portPrivate;
 
+  CHECK_DMA_QUIESCENT(pMga, pScrn);
+
   if(attribute == xvBrightness) {
 	if((value < -128) || (value > 127))
 	   return BadValue;
@@ -456,13 +510,14 @@
 }
 
 static int 
-MGAGetPortAttributeG(
+MGAGetPortAttributeOverlay(
   ScrnInfoPtr pScrn, 
   Atom attribute,
   INT32 *value, 
   pointer data
 ){
-  MGAPortPrivPtr pPriv = (MGAPortPrivPtr)data;
+  MGAPtr pMga = MGAPTR(pScrn);
+  MGAPortPrivPtr pPriv = pMga->portPrivate;
 
   if(attribute == xvBrightness) {
 	*value = pPriv->brightness;
@@ -477,8 +532,30 @@
   return Success;
 }
 
+
+static int 
+MGASetPortAttributeTexture(
+  ScrnInfoPtr pScrn, 
+  Atom attribute,
+  INT32 value, 
+  pointer data
+) {
+  return BadMatch;
+}
+
+
+static int 
+MGAGetPortAttributeTexture(
+  ScrnInfoPtr pScrn, 
+  Atom attribute,
+  INT32 *value, 
+  pointer data
+){
+  return BadMatch;
+}
+
 static void 
-MGAQueryBestSizeG(
+MGAQueryBestSize(
   ScrnInfoPtr pScrn, 
   Bool motion,
   short vid_w, short vid_h, 
@@ -488,8 +565,6 @@
 ){
   *p_w = drw_w;
   *p_h = drw_h; 
-
-  if(*p_w > 16384) *p_w = 16384;
 }
 
 
@@ -585,7 +660,7 @@
 }
 
 static void
-MGADisplayVideo(
+MGADisplayVideoOverlay(
     ScrnInfoPtr pScrn,
     int id,
     int offset,
@@ -599,16 +674,18 @@
     MGAPtr pMga = MGAPTR(pScrn);
     int tmp;
 
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
     /* got 64 scanlines to do it in */
     tmp = INREG(MGAREG_VCOUNT) + 64;
     if(tmp > pScrn->currentMode->VDisplay)
 	tmp -= pScrn->currentMode->VDisplay;
 
     switch(id) {
-    case 0x59565955:
+    case FOURCC_UYVY:
 	OUTREG(MGAREG_BESGLOBCTL, 0x000000c3 | (tmp << 16));
 	break;
-    case 0x32595559:
+    case FOURCC_YUY2:
     default:
 	OUTREG(MGAREG_BESGLOBCTL, 0x00000083 | (tmp << 16));
 	break;
@@ -645,8 +722,95 @@
 
 }
 
+static void
+MGADisplayVideoTexture(
+    ScrnInfoPtr pScrn,
+    int id, int offset,
+    int nbox, BoxPtr pbox,
+    int width, int height, int pitch,
+    short src_x, short src_y,
+    short src_w, short src_h,
+    short drw_x, short drw_y,
+    short drw_w, short drw_h
+){
+    MGAPtr pMga = MGAPTR(pScrn);
+    int log2w, log2h, i, incx, incy, padw, padh;
+    
+    pitch >>= 1;
+
+    i = 12;
+    while(--i) {
+	if(width & (1 << i)) {
+	    log2w = i;
+	    if(width & ((1 << i) - 1)) 
+		log2w++;
+	    break;		
+	}
+    }
+
+    i = 12;
+    while(--i) {
+	if(height & (1 << i)) {
+	    log2h = i;
+	    if(height & ((1 << i) - 1)) 
+		log2h++;		
+	    break;		
+	}
+    }
+
+    padw = 1 << log2w;
+    padh = 1 << log2h;
+    incx = (src_w << 20)/(drw_w * padw);
+    incy = (src_h << 20)/(drw_h * padh);
+   
+    CHECK_DMA_QUIESCENT(pMga, pScrn);
+
+    if(pMga->Overlay8Plus24) {
+	i = 0x00ffffff;
+	WAITFIFO(1);
+	SET_PLANEMASK(i);
+    }
+
+    WAITFIFO(15);
+    OUTREG(MGAREG_TMR0, incx);  /* sx inc */
+    OUTREG(MGAREG_TMR1, 0);  /* sy inc */
+    OUTREG(MGAREG_TMR2, 0);  /* tx inc */
+    OUTREG(MGAREG_TMR3, incy);  /* ty inc */
+    OUTREG(MGAREG_TMR4, 0x00000000); 
+    OUTREG(MGAREG_TMR5, 0x00000000);
+    OUTREG(MGAREG_TMR8, 0x00010000);
+    OUTREG(MGAREG_TEXORG, offset);
+    OUTREG(MGAREG_TEXWIDTH,  log2w | (((8 - log2w) & 63) << 9) | 
+				((width - 1) << 18));
+    OUTREG(MGAREG_TEXHEIGHT, log2h | (((8 - log2h) & 63) << 9) | 
+				((height - 1) << 18));
+    if(id == FOURCC_UYVY)
+	OUTREG(MGAREG_TEXCTL, 0x1A00010b | ((pitch & 0x07FF) << 9));
+    else
+	OUTREG(MGAREG_TEXCTL, 0x1A00010a | ((pitch & 0x07FF) << 9));
+    OUTREG(MGAREG_TEXCTL2, 0x00000014);
+    OUTREG(MGAREG_DWGCTL, 0x000c7076);   
+    OUTREG(MGAREG_TEXFILTER, 0x01e00020);
+    OUTREG(MGAREG_ALPHACTRL, 0x00000001);
+
+    padw = (src_x << 20)/padw;
+    padh = (src_y << 20)/padh;
+
+    while(nbox--) {
+	WAITFIFO(4);
+	OUTREG(MGAREG_TMR6, (incx * (pbox->x1 - drw_x)) + padw);
+	OUTREG(MGAREG_TMR7, (incy * (pbox->y1 - drw_y)) + padh);
+	OUTREG(MGAREG_FXBNDRY, (pbox->x2 << 16) | (pbox->x1 & 0xffff));
+	OUTREG(MGAREG_YDSTLEN + MGAREG_EXEC, 
+				(pbox->y1 << 16) | (pbox->y2 - pbox->y1));
+	pbox++;
+    }
+
+    pMga->AccelInfoRec->NeedToSync = TRUE;
+}
+
 static int 
-MGAPutImageG( 
+MGAPutImage( 
   ScrnInfoPtr pScrn, 
   short src_x, short src_y, 
   short drw_x, short drw_y,
@@ -657,8 +821,8 @@
   Bool sync,
   RegionPtr clipBoxes, pointer data
 ){
-   MGAPortPrivPtr pPriv = (MGAPortPrivPtr)data;
    MGAPtr pMga = MGAPTR(pScrn);
+   MGAPortPrivPtr pPriv = pMga->portPrivate;
    INT32 x1, x2, y1, y2;
    unsigned char *dst_start;
    int pitch, new_h, offset, offset2, offset3;
@@ -667,8 +831,6 @@
    BoxRec dstBox;
    CARD32 tmp;
 
-   if(drw_w > 16384) drw_w = 16384;
-
    /* Clip */
    x1 = src_x;
    x2 = src_x + src_w;
@@ -679,17 +841,16 @@
    dstBox.x2 = drw_x + drw_w;
    dstBox.y1 = drw_y;
    dstBox.y2 = drw_y + drw_h;
-
-   MGAClipVideo(&dstBox, &x1, &x2, &y1, &y2, 
-		REGION_EXTENTS(pScreen, clipBoxes), width, height);
 
-   if((x1 >= x2) || (y1 >= y2))
-     return Success;
+   if(!MGAClipVideo(&dstBox, &x1, &x2, &y1, &y2, clipBoxes, width, height))
+	return Success;
 
-   dstBox.x1 -= pScrn->frameX0;
-   dstBox.x2 -= pScrn->frameX0;
-   dstBox.y1 -= pScrn->frameY0;
-   dstBox.y2 -= pScrn->frameY0;
+   if(!pMga->TexturedVideo) {
+	dstBox.x1 -= pScrn->frameX0;
+	dstBox.x2 -= pScrn->frameX0;
+	dstBox.y1 -= pScrn->frameY0;
+	dstBox.y2 -= pScrn->frameY0;
+   }
 
    pitch = pScrn->bitsPerPixel * pScrn->displayWidth >> 3;
 
@@ -697,20 +858,20 @@
    new_h = ((dstPitch * height) + pitch - 1) / pitch;
 
    switch(id) {
-   case 0x32315659:
+   case FOURCC_YV12:
+   case FOURCC_I420:
 	srcPitch = (width + 3) & ~3;
 	offset2 = srcPitch * height;
 	srcPitch2 = ((width >> 1) + 3) & ~3;
 	offset3 = (srcPitch2 * (height >> 1)) + offset2;
 	break;
-   case 0x59565955:
-   case 0x32595559:
+   case FOURCC_UYVY:
+   case FOURCC_YUY2:
    default:
 	srcPitch = (width << 1);
 	break;
    }  
 
-
    if(!(pPriv->area = MGAAllocateMemory(pScrn, pPriv->area, new_h)))
 	return BadAlloc;
 
@@ -720,22 +881,35 @@
     npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
     left <<= 1;
 
-    offset = (pPriv->area->box.y1 * pitch) + (top * dstPitch);
-    dst_start = pMga->FbStart + offset + left;
+    offset = pPriv->area->box.y1 * pitch;
+    dst_start = pMga->FbStart + offset + left + (top * dstPitch);
 
+    if(pMga->TexturedVideo && pMga->AccelInfoRec->NeedToSync &&
+	((long)data != pPriv->lastPort)) 
+    {
+	MGAStormSync(pScrn);
+	pMga->AccelInfoRec->NeedToSync = FALSE;
+    }
+
     switch(id) {
-    case 0x32315659:
+    case FOURCC_YV12:
+    case FOURCC_I420:
 	top &= ~1;
 	tmp = ((top >> 1) * srcPitch2) + (left >> 2);
 	offset2 += tmp;
-	offset3 += tmp; 
+	offset3 += tmp;
+	if(id == FOURCC_I420) {
+	   tmp = offset2;
+	   offset2 = offset3;
+	   offset3 = tmp;
+	}
 	nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
 	MGACopyMungedData(buf + (top * srcPitch) + (left >> 1), 
 			  buf + offset2, buf + offset3, dst_start,
 			  srcPitch, srcPitch2, dstPitch, nlines, npixels);
 	break;
-    case 0x59565955:
-    case 0x32595559:
+    case FOURCC_UYVY:
+    case FOURCC_YUY2:
     default:
 	buf += (top * srcPitch) + left;
 	nlines = ((y2 + 0xffff) >> 16) - top;
@@ -743,42 +917,59 @@
         break;
     }
 
+    if(pMga->TexturedVideo) {
+	pPriv->lastPort = (long)data;
+	MGADisplayVideoTexture(pScrn, id, offset, 
+		REGION_NUM_RECTS(clipBoxes), REGION_RECTS(clipBoxes),
+		width, height, dstPitch, src_x, src_y, src_w, src_h,
+		drw_x, drw_y, drw_w, drw_h);
+	pPriv->videoStatus = FREE_TIMER;
+	pPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
+    } else {
     /* update cliplist */
-    if(!RegionsEqual(&pPriv->clip, clipBoxes)) {
-	REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
-	/* draw these */
-	XAAFillSolidRects(pScrn, pPriv->colorKey, GXcopy, ~0, 
+	if(!RegionsEqual(&pPriv->clip, clipBoxes)) {
+	    REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
+	    /* draw these */
+	    XAAFillSolidRects(pScrn, pPriv->colorKey, GXcopy, ~0, 
 					REGION_NUM_RECTS(clipBoxes),
 					REGION_RECTS(clipBoxes));
-    }
-
+	}
 
-    MGADisplayVideo(pScrn, id, offset, width, height, dstPitch,
+	offset += top * dstPitch;
+	MGADisplayVideoOverlay(pScrn, id, offset, width, height, dstPitch,
 	     x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);
 
-    pPriv->videoStatus = CLIENT_VIDEO_ON;
+	pPriv->videoStatus = CLIENT_VIDEO_ON;
+    } 
 
     return Success;
 }
 
 
 static int 
-MGAQueryImageAttributesG(
-  ScrnInfoPtr pScrn, 
-  int id, 
-  unsigned short *w, unsigned short *h, 
-  int *pitches, int *offsets
+MGAQueryImageAttributes(
+    ScrnInfoPtr pScrn, 
+    int id, 
+    unsigned short *w, unsigned short *h, 
+    int *pitches, int *offsets
 ){
+    MGAPtr pMga = MGAPTR(pScrn);
     int size, tmp;
 
-    if(*w > 1024) *w = 1024;
-    if(*h > 1024) *h = 1024;
+    if(pMga->TexturedVideo) {
+	if(*w > 2046) *w = 2046;
+	if(*h > 2046) *h = 2046;
+    } else {
+	if(*w > 1024) *w = 1024;
+	if(*h > 1024) *h = 1024;
+    }
 
     *w = (*w + 1) & ~1;
     if(offsets) offsets[0] = 0;
 
     switch(id) {
-    case 0x32315659:
+    case FOURCC_YV12:
+    case FOURCC_I420:
 	*h = (*h + 1) & ~1;
 	size = (*w + 3) & ~3;
 	if(pitches) pitches[0] = size;
@@ -791,8 +982,8 @@
 	if(offsets) offsets[2] = size;
 	size += tmp;
 	break;
-    case 0x59565955:
-    case 0x32595559:
+    case FOURCC_UYVY:
+    case FOURCC_YUY2:
     default:
 	size = *w << 1;
 	if(pitches) pitches[0] = size;
@@ -810,10 +1001,10 @@
     pointer     pTimeout,
     pointer     pReadmask
 ){
-    ScreenPtr   pScreen = screenInfo.screens[i];
-    ScrnInfoPtr pScrn = xf86Screens[i];
-    MGAPtr      pMga = MGAPTR(pScrn);
-    MGAPortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
+    ScreenPtr      pScreen = screenInfo.screens[i];
+    ScrnInfoPtr    pScrn = xf86Screens[i];
+    MGAPtr         pMga = MGAPTR(pScrn);
+    MGAPortPrivPtr pPriv = pMga->portPrivate;
 
     pScreen->BlockHandler = pMga->BlockHandler;
     
@@ -875,15 +1066,19 @@
     surface->width = w;
     surface->height = h;
 
-    if(!(surface->pitches = xalloc(sizeof(int))))
+    if(!(surface->pitches = xalloc(sizeof(int)))) {
+	xf86FreeOffscreenArea(area);
 	return BadAlloc;
+    }
     if(!(surface->offsets = xalloc(sizeof(int)))) {
 	xfree(surface->pitches);
+	xf86FreeOffscreenArea(area);
 	return BadAlloc;
     }
     if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
 	xfree(surface->pitches);
 	xfree(surface->offsets);
+	xf86FreeOffscreenArea(area);
 	return BadAlloc;
     }
 
@@ -933,22 +1128,20 @@
 
 static int
 MGAGetSurfaceAttribute(
-    XF86SurfacePtr surface,
+    ScrnInfoPtr pScrn,
     Atom attribute,
     INT32 *value
 ){
-    return MGAGetPortAttributeG(surface->pScrn, attribute, value, 
-			(pointer)(GET_PORT_PRIVATE(surface->pScrn)));
+    return MGAGetPortAttributeOverlay(pScrn, attribute, value, 0);
 }
 
 static int
 MGASetSurfaceAttribute(
-    XF86SurfacePtr surface,
+    ScrnInfoPtr pScrn,
     Atom attribute,
     INT32 value
 ){
-    return MGASetPortAttributeG(surface->pScrn, attribute, value, 
-			(pointer)(GET_PORT_PRIVATE(surface->pScrn)));
+    return MGASetPortAttributeOverlay(pScrn, attribute, value, 0);
 }
 
 
@@ -963,7 +1156,8 @@
 ){
     OffscreenPrivPtr pPriv = (OffscreenPrivPtr)surface->devPrivate.ptr;
     ScrnInfoPtr pScrn = surface->pScrn;
-    MGAPortPrivPtr portPriv = GET_PORT_PRIVATE(pScrn);
+    MGAPtr pMga = MGAPTR(pScrn);
+    MGAPortPrivPtr portPriv = pMga->portPrivate;
     INT32 x1, y1, x2, y2;
     BoxRec dstBox;
 
@@ -977,27 +1171,29 @@
     dstBox.y1 = drw_y;
     dstBox.y2 = drw_y + drw_h;
 
-    MGAClipVideo(&dstBox, &x1, &x2, &y1, &y2, 
-                	REGION_EXTENTS(pScreen, clipBoxes), 
-			surface->width, surface->height);
-
-    if((x1 >= x2) || (y1 >= y2))
+    if(!MGAClipVideo(&dstBox, &x1, &x2, &y1, &y2, clipBoxes, 
+			surface->width, surface->height))
+    {
 	return Success;
+    }
 
     dstBox.x1 -= pScrn->frameX0;
     dstBox.x2 -= pScrn->frameX0;
     dstBox.y1 -= pScrn->frameY0;
     dstBox.y2 -= pScrn->frameY0;
 
-    XAAFillSolidRects(pScrn, portPriv->colorKey, GXcopy, ~0, 
-                                        REGION_NUM_RECTS(clipBoxes),
-                                        REGION_RECTS(clipBoxes));
+    MGAResetVideoOverlay(pScrn);
 
-    MGADisplayVideo(pScrn, surface->id, surface->offsets[0], 
+    MGADisplayVideoOverlay(pScrn, surface->id, surface->offsets[0], 
 	     surface->width, surface->height, surface->pitches[0],
 	     x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);
 
+    XAAFillSolidRects(pScrn, portPriv->colorKey, GXcopy, ~0, 
+                                        REGION_NUM_RECTS(clipBoxes),
+                                        REGION_RECTS(clipBoxes));
+
     pPriv->isOn = TRUE;
+    /* we've prempted the XvImage stream so set its free timer */
     if(portPriv->videoStatus & CLIENT_VIDEO_ON) {
 	REGION_EMPTY(pScrn->pScreen, &portPriv->clip);   
 	UpdateCurrentTime();
@@ -1021,7 +1217,7 @@
     if(!(offscreenImages = xalloc(num * sizeof(XF86OffscreenImageRec))))
 	return;
 
-    offscreenImages[0].image = &ImagesG[0];
+    offscreenImages[0].image = &Images[0];
     offscreenImages[0].flags = VIDEO_OVERLAID_IMAGES | 
 			       VIDEO_CLIP_TO_VIEWPORT;
     offscreenImages[0].alloc_surface = MGAAllocateSurface;
@@ -1033,10 +1229,10 @@
     offscreenImages[0].max_width = 1024;
     offscreenImages[0].max_height = 1024;
     offscreenImages[0].num_attributes = (num == 1) ? 1 : 3;
-    offscreenImages[0].attributes = AttributesG;
+    offscreenImages[0].attributes = Attributes;
 
     if(num == 2) {
-	offscreenImages[1].image = &ImagesG[2];
+	offscreenImages[1].image = &Images[3];
 	offscreenImages[1].flags = VIDEO_OVERLAID_IMAGES | 
 				   VIDEO_CLIP_TO_VIEWPORT;
 	offscreenImages[1].alloc_surface = MGAAllocateSurface;
@@ -1048,7 +1244,7 @@
 	offscreenImages[1].max_width = 1024;
 	offscreenImages[1].max_height = 1024;
 	offscreenImages[1].num_attributes = 3;
-	offscreenImages[1].attributes = AttributesG;
+	offscreenImages[1].attributes = Attributes;
     }
 
     xf86XVRegisterOffscreenImages(pScreen, offscreenImages, num);
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_warp.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/mga/mga_warp.c:1.1 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_warp.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_warp.c:1.1	Fri Feb 11 09:25:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_warp.c	Sat Jun 17 11:23:23 2000
@@ -1,3 +1,5 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_warp.c,v 1.3 2000/06/17 18:23:23 dawes Exp $ */
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
@@ -18,6 +20,8 @@
    MGAPtr pMga = MGAPTR(pScrn);
    int wmisc;
    
+   CHECK_DMA_QUIESCENT( pMga, pScrn );
+
    WAITFIFO(3);
    
    switch(pMga->Chipset) {
@@ -108,7 +112,7 @@
    unsigned int microcode_size = 0;
 
    memset(pMGADRIServer->WarpIndex, 0, 
-	  sizeof(mgaWarpIndex) * MGA_MAX_WARP_PIPES);
+	  sizeof(drmMgaWarpIndex) * MGA_MAX_WARP_PIPES);
    microcode_size = mgaG400GetMicrocodeSize(pMGA);
 
    mgaWarpInstallCode(tgz,     MGA_WARP_TGZ);
@@ -150,7 +154,7 @@
    unsigned int microcode_size = 0;
 
    memset(pMGADRIServer->WarpIndex, 0, 
-	  sizeof(mgaWarpIndex) * MGA_MAX_WARP_PIPES);
+	  sizeof(drmMgaWarpIndex) * MGA_MAX_WARP_PIPES);
 
    microcode_size = mgaG400GetMicrocodeSize(pMGA);   
    mgaWarpInstallCode(tgz,    MGA_WARP_TGZ);
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.c:1.1
--- /dev/null	Sat Jul  1 20:42:53 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.c	Fri Jun 16 17:03:20 2000
@@ -0,0 +1,198 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.c,v 1.1 2000/06/17 00:03:20 martin Exp $ */
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Keith Whitwell <keithw@precisioninsight.com>
+ *
+ */
+
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Priv.h"
+
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb16.h"
+#include "cfb32.h"
+
+#include "miline.h"
+
+#include "GL/glxtokens.h"
+
+#include "mga_bios.h"
+#include "mga_reg.h"
+#include "mga.h"
+#include "mga_macros.h"
+#include "mga_dri.h"
+#include "mga_wrap.h"
+
+
+
+static void MGAWakeupHandler(int screenNum,
+			     pointer wakeupData,
+			     unsigned long result,
+			     pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[screenNum];
+    /*DRIWrappedFuncsRec *pDRIWrap = DRIGetWrappedFuncs(pScreen);*/
+
+    if (0) ErrorF("MGAWakeupHandler (in)\n");
+
+    /* Disabled: Check contention like the 3d clients do before trying
+     *   to restore state.  
+     */
+    DRILock(pScreen, 0);
+    MGASwapContext( pScreen );
+
+}
+
+static void MGABlockHandler(int screenNum,
+			    pointer blockData,
+			    pointer pTimeout,
+			    pointer pReadmask)
+
+{
+   ScreenPtr pScreen = screenInfo.screens[screenNum];
+   /*DRIWrappedFuncsRec *pDRIWrap = DRIGetWrappedFuncs(pScreen);*/
+   MGASAREAPtr sa = (MGASAREAPtr)DRIGetSAREAPrivate( pScreen );
+
+   if (0) ErrorF("MGABlockHandler (out)\n");
+
+
+   /* Examine the cliprects for the most recently used 3d drawable.
+    * If they've changed, attempt to push the updated values into the
+    * sarea.
+    *
+    * This avoids the protocol round trip in all single-client
+    * frontbuffer rendering cases providing the cliprects fit into the
+    * sarea, and in all single-client backbuffer rendering with arbitary
+    * numbers of cliprects, for all operations except swapbuffers.
+    *
+    * Thus the number of round trips in the cases where comparison is
+    * possible is reduced to no more (and usually fewer) than the number
+    * Utah requires.  
+    */
+
+   if (sa->req_drawable != sa->exported_drawable ||
+       sa->exported_stamp != DRIGetDrawableStamp( pScreen, sa->exported_index ))
+   {
+      int i;
+      XF86DRIClipRectPtr frontboxes, backboxes;
+      XF86DRIClipRectPtr boxes = (XF86DRIClipRectPtr)sa->exported_boxes;
+      WindowPtr window = LookupIDByType( sa->req_drawable, RT_WINDOW );
+
+      if (0)
+	 ErrorF("Trying to update req_drawable: %d (exp %d), stamp %d/%d\n", 
+		sa->req_drawable, sa->exported_drawable);
+
+      sa->exported_drawable = 0;
+
+      if (!window) {
+	 if (0)
+	    ErrorF("Couldn't retreive window\n");
+	 sa->req_drawable = 0;
+	 goto finished;
+      }
+
+      if (!DRIGetDrawableInfo( pScreen, &(window->drawable), 
+			       &sa->exported_index, 
+			       &sa->exported_stamp, 
+			       &sa->exported_front_x, 
+			       &sa->exported_front_y, 
+			       &sa->exported_w, 
+			       &sa->exported_h,
+			       &sa->exported_nfront, 
+			       &frontboxes,
+			       &sa->exported_back_x, 
+			       &sa->exported_back_y,
+			       &sa->exported_nback, 
+			       &backboxes ))
+      {
+	 if (0)
+	    ErrorF("Couldn't get DRI info\n");
+	 sa->req_drawable = 0;
+	 goto finished;
+      }
+
+      /* If we can't fit both sets of cliprects into the sarea, try to
+       * fit the current draw buffer.  Otherwise return.
+       */
+      
+      sa->exported_buffers = MGA_FRONT | MGA_BACK;
+
+      if (sa->exported_nback + sa->exported_nfront >= MGA_NR_SAREA_CLIPRECTS) {
+	 if (sa->req_draw_buffer == MGA_FRONT) {
+	    sa->exported_buffers = MGA_FRONT;
+	    if (sa->exported_nfront >= MGA_NR_SAREA_CLIPRECTS)
+	       goto finished;
+	 } else {
+	    sa->exported_buffers = MGA_BACK;
+	    if (sa->exported_nback >= MGA_NR_SAREA_CLIPRECTS)
+	       goto finished;
+	 }
+      }
+
+      if (sa->exported_buffers & MGA_BACK) {
+	 for (i = 0 ; i < sa->exported_nback ; i++) 
+	    *boxes++ = backboxes[i];	 
+      }
+
+      if (sa->exported_buffers & MGA_FRONT) {
+	 for (i = 0 ; i < sa->exported_nfront ; i++) 
+	    *boxes++ = frontboxes[i];	 
+      }
+
+      sa->exported_drawable = sa->req_drawable;
+   } 
+
+ finished:
+   DRIUnlock(pScreen);
+}
+
+
+
+
+/* Just wrap validate tree for now to remove the quiescense hack.
+ * This is more of a win for the i810 than the mga, but should be useful
+ * here too.
+ */
+void MGADRIWrapFunctions(ScreenPtr pScreen, DRIInfoPtr pDRIInfo)
+{
+   pDRIInfo->wrap.BlockHandler = MGABlockHandler;   
+   pDRIInfo->wrap.WakeupHandler = MGAWakeupHandler;    
+/*     pDRIInfo->wrap.ValidateTree = NULL; */
+/*     pDRIInfo->wrap.PostValidateTree = NULL; */
+}
+
+
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.h:1.2
--- /dev/null	Sat Jul  1 20:42:53 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.h	Sat Jun 17 11:23:23 2000
@@ -0,0 +1,8 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_wrap.h,v 1.2 2000/06/17 18:23:23 dawes Exp $ */
+
+#ifndef MGA_WRAP_H
+#define MGA_WRAP_H
+
+void MGADRIWrapFunctions(ScreenPtr pScreen, DRIInfoPtr pDRIInfo);
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile:1.4 xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile:1.7
--- xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile:1.4	Thu Mar  2 17:05:39 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile	Fri Jun 30 10:15:12 2000
@@ -1,13 +1,13 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile,v 1.4 2000/03/03 01:05:39 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile,v 1.7 2000/06/30 17:15:12 dawes Exp $
 #define IHaveModules
 #include <Server.tmpl>
 
 
 SRCS = neo_driver.c neo_bank.c neo_cursor.c neo_2097.c neo_2070.c \
-	neo_2090.c neo_2200.c neo_i2c.c neo_shadow.c
+	neo_2090.c neo_2200.c neo_i2c.c neo_shadow.c neo_dga.c
 
 OBJS = neo_driver.o neo_bank.o neo_cursor.o neo_2097.o neo_2070.o \
-	neo_2090.o neo_2200.o neo_i2c.o neo_shadow.o
+	neo_2090.o neo_2200.o neo_i2c.o neo_shadow.o neo_dga.o
 
 DEFINES = -DPSZ=8
 
@@ -19,7 +19,9 @@
 	   -I$(SERVERSRC)/mi -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb \
 	   -I$(XINCLUDESRC) -I$(XF86SRC)/xaa -I$(FONTINCSRC) \
 	   -I$(XF86SRC)/ramdac -I$(XF86SRC)/rac	-I$(XF86SRC)/ddc \
-           -I$(XF86SRC)/i2c -I$(XF86SRC)/shadowfb -I$(XF86SRC)/xf24_32bpp
+           -I$(XF86SRC)/i2c -I$(XF86SRC)/shadowfb -I$(XF86SRC)/xf24_32bpp \
+	   -I$(SERVERSRC)/Xext  \
+	   -I$(XF86SRC)/int10 -I$(XF86OSSRC)/vbe
 #endif
 
 #if MakeHasPosixVariableSubstitutions
@@ -48,6 +50,7 @@
 InstallDriverSDKNonExecFile(neo_2200.c,$(DRIVERSDKDIR)/drivers/neomagic)
 InstallDriverSDKNonExecFile(neo_bank.c,$(DRIVERSDKDIR)/drivers/neomagic)
 InstallDriverSDKNonExecFile(neo_cursor.c,$(DRIVERSDKDIR)/drivers/neomagic)
+InstallDriverSDKNonExecFile(neo_dga.c,$(DRIVERSDKDIR)/drivers/neomagic)
 InstallDriverSDKNonExecFile(neo_driver.c,$(DRIVERSDKDIR)/drivers/neomagic)
 InstallDriverSDKNonExecFile(neo_i2c.c,$(DRIVERSDKDIR)/drivers/neomagic)
 InstallDriverSDKNonExecFile(neo_shadow.c,$(DRIVERSDKDIR)/drivers/neomagic)
Index: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h:1.6 xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h:1.11
--- xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h:1.6	Tue Feb  8 05:13:18 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h	Fri Jun 30 10:15:12 2000
@@ -22,7 +22,7 @@
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h,v 1.6 2000/02/08 13:13:18 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h,v 1.11 2000/06/30 17:15:12 dawes Exp $ */
 
 /*
  * The original Precision Insight driver for
@@ -36,18 +36,20 @@
  *   1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE)
  */
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
 
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
+
 #include "xaa.h"
 #include "xaalocal.h"		/* XAA internals as we replace some of XAA */
 #include "xf86Cursor.h"
 
+#include "vbe.h"
+
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
@@ -66,11 +68,16 @@
     NM2093,
     NM2097,
     NM2160,
-    NM2200
+    NM2200,
+    NM2360,
+    NM2380
 } NEOType;
 
 /* function prototypes */
 
+extern Bool NEOSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+extern void NEOAdjustFrame(int scrnIndex, int x, int y, int flags);
+
 /* in neo_2070.c */
 extern Bool Neo2070AccelInit(ScreenPtr pScreen);
 
@@ -178,6 +185,10 @@
     unsigned char* NeoFbBase;
     long NeoFbMapSize;
     unsigned int vgaIOBase;
+    DGAModePtr		DGAModes;
+    int			numDGAModes;
+    Bool		DGAactive;
+    int			DGAViewportStatus;
     /* ??? */
     int NeoFifoCount;
     /* cursor */
@@ -214,6 +225,7 @@
     /* proc pointer */
     CloseScreenProcPtr CloseScreen;
     I2CBusPtr I2C;
+    vbeInfoPtr          pVbe;
     unsigned char * ShadowPtr;
     int ShadowPitch;
     void	(*PointerMoved)(int index, int x, int y);
Index: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c:1.4 xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c:1.4	Fri Dec  3 11:17:34 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c	Thu Jun 15 18:50:21 2000
@@ -22,7 +22,7 @@
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c,v 1.4 1999/12/03 19:17:34 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c,v 1.6 2000/06/16 01:50:21 dawes Exp $ */
 
 /*
  * The original Precision Insight driver for
@@ -180,7 +180,7 @@
      * Setup some global variables
      */
 
-    /* Initialize for 8bpp or 15/16bpp support accellerated */
+    /* Initialize for 8bpp or 15/16bpp support accelerated */
     switch (pScrn->bitsPerPixel) {
     case 8:
 	nAcl->BltModeFlags = NEO_MODE1_DEPTH8;
@@ -192,6 +192,12 @@
         nAcl->PixelWidth = 2;
 	break;
     case 24:
+	if (nPtr->NeoChipset == NM2360) {
+	    nAcl->BltModeFlags = NEO_MODE1_DEPTH24;
+            nAcl->PixelWidth = 3;
+	} else
+	    return FALSE;
+	break;
     default:
 	return FALSE;
     }
Index: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c:1.1 xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c:1.2
--- xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c:1.1	Sat Apr 17 00:06:22 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c	Tue Apr  4 12:25:12 2000
@@ -22,7 +22,7 @@
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c,v 1.1 1999/04/17 07:06:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c,v 1.2 2000/04/04 19:25:12 dawes Exp $ */
 
 /*
  * The original Precision Insight driver for
@@ -38,13 +38,13 @@
 
 #define PSZ 8
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
+
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
 
 /* Driver specific headers */
 #include "neo.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c:1.1
--- /dev/null	Sat Jul  1 20:42:53 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c	Thu Jun 22 11:09:37 2000
@@ -0,0 +1,292 @@
+/*
+ * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c,v 1.1 2000/06/22 18:09:37 alanh Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Pci.h"
+#include "xf86PciInfo.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "neo.h"
+#include "neo_reg.h"
+#include "dgaproc.h"
+
+static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+					int *, int *, int *);
+static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr);
+static void NEO_Sync(ScrnInfoPtr);
+static int  NEO_GetViewport(ScrnInfoPtr);
+static void NEO_SetViewport(ScrnInfoPtr, int, int, int);
+static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+static void NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+static void NEO_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, 
+					unsigned long);
+
+static
+DGAFunctionRec NEODGAFuncs = {
+   NEO_OpenFramebuffer,
+   NULL,
+   NEO_SetMode,
+   NEO_SetViewport,
+   NEO_GetViewport,
+   NEO_Sync,
+   NEO_FillRect,
+   NEO_BlitRect,
+#if 0
+   NEO_BlitTransRect
+#else
+   NULL
+#endif
+};
+
+Bool
+NEODGAInit(ScreenPtr pScreen)
+{   
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   NEOPtr pNEO = NEOPTR(pScrn);
+   DGAModePtr modes = NULL, newmodes = NULL, currentMode;
+   DisplayModePtr pMode, firstMode;
+   int Bpp = pScrn->bitsPerPixel >> 3;
+   int num = 0;
+   Bool oneMore;
+
+   pMode = firstMode = pScrn->modes;
+
+   while(pMode) {
+
+	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
+	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+	    oneMore = TRUE;
+	} else {
+	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+	    oneMore = FALSE;
+	}
+
+	if(!newmodes) {
+	   xfree(modes);
+	   return FALSE;
+	}
+	modes = newmodes;
+
+SECOND_PASS:
+
+	currentMode = modes + num;
+	num++;
+
+	currentMode->mode = pMode;
+	currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
+	currentMode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
+	if(pMode->Flags & V_DBLSCAN)
+	   currentMode->flags |= DGA_DOUBLESCAN;
+	if(pMode->Flags & V_INTERLACE)
+	   currentMode->flags |= DGA_INTERLACED;
+	currentMode->byteOrder = pScrn->imageByteOrder;
+	currentMode->depth = pScrn->depth;
+	currentMode->bitsPerPixel = pScrn->bitsPerPixel;
+	currentMode->red_mask = pScrn->mask.red;
+	currentMode->green_mask = pScrn->mask.green;
+	currentMode->blue_mask = pScrn->mask.blue;
+	currentMode->visualClass = (Bpp == 1) ? PseudoColor : TrueColor;
+	currentMode->viewportWidth = pMode->HDisplay;
+	currentMode->viewportHeight = pMode->VDisplay;
+	currentMode->xViewportStep = 1;
+	currentMode->yViewportStep = 1;
+	currentMode->viewportFlags = DGA_FLIP_RETRACE;
+	currentMode->offset = 0;
+	currentMode->address = pNEO->NeoFbBase;
+
+	if(oneMore) { /* first one is narrow width */
+	    currentMode->bytesPerScanline = ((pMode->HDisplay * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pMode->HDisplay;
+	    currentMode->imageHeight =  pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	    oneMore = FALSE;
+	    goto SECOND_PASS;
+	} else {
+	    currentMode->bytesPerScanline = 
+			((pScrn->displayWidth * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pScrn->displayWidth;
+	    currentMode->imageHeight =  pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	}	    
+
+	pMode = pMode->next;
+	if(pMode == firstMode)
+	   break;
+   }
+
+   pNEO->numDGAModes = num;
+   pNEO->DGAModes = modes;
+
+   return DGAInit(pScreen, &NEODGAFuncs, modes, num);  
+}
+
+
+static Bool
+NEO_SetMode(
+   ScrnInfoPtr pScrn,
+   DGAModePtr pMode
+){
+   static int OldDisplayWidth[MAXSCREENS];
+   int index = pScrn->pScreen->myNum;
+   NEOPtr pNEO = NEOPTR(pScrn);
+
+   if(!pMode) { /* restore the original mode */
+	/* put the ScreenParameters back */
+	
+	pScrn->displayWidth = OldDisplayWidth[index];
+	
+        NEOSwitchMode(index, pScrn->currentMode, 0);
+	pNEO->DGAactive = FALSE;
+   } else {
+	if(!pNEO->DGAactive) {  /* save the old parameters */
+	    OldDisplayWidth[index] = pScrn->displayWidth;
+
+	    pNEO->DGAactive = TRUE;
+	}
+
+	pScrn->displayWidth = pMode->bytesPerScanline / 
+			      (pMode->bitsPerPixel >> 3);
+
+        NEOSwitchMode(index, pMode->mode, 0);
+   }
+   
+   return TRUE;
+}
+
+static int  
+NEO_GetViewport(
+  ScrnInfoPtr pScrn
+){
+    NEOPtr pNEO = NEOPTR(pScrn);
+
+    return pNEO->DGAViewportStatus;
+}
+
+static void 
+NEO_SetViewport(
+   ScrnInfoPtr pScrn, 
+   int x, int y, 
+   int flags
+){
+   NEOPtr pNEO = NEOPTR(pScrn);
+
+   NEOAdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+   pNEO->DGAViewportStatus = 0;  /* NEOAdjustFrame loops until finished */
+}
+
+static void 
+NEO_FillRect (
+   ScrnInfoPtr pScrn, 
+   int x, int y, int w, int h, 
+   unsigned long color
+){
+    NEOPtr pNEO = NEOPTR(pScrn);
+
+    if(pNEO->AccelInfoRec) {
+	(*pNEO->AccelInfoRec->SetupForSolidFill)(pScrn, color, GXcopy, ~0);
+	(*pNEO->AccelInfoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
+	SET_SYNC_FLAG(pNEO->AccelInfoRec);
+    }
+}
+
+static void 
+NEO_Sync(
+   ScrnInfoPtr pScrn
+){
+    NEOPtr pNEO = NEOPTR(pScrn);
+
+    if(pNEO->AccelInfoRec) {
+	(*pNEO->AccelInfoRec->Sync)(pScrn);
+    }
+}
+
+static void 
+NEO_BlitRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty
+){
+    NEOPtr pNEO = NEOPTR(pScrn);
+
+    if(pNEO->AccelInfoRec) {
+	int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
+	int ydir = (srcy < dsty) ? -1 : 1;
+
+	(*pNEO->AccelInfoRec->SetupForScreenToScreenCopy)(
+		pScrn, xdir, ydir, GXcopy, ~0, -1);
+	(*pNEO->AccelInfoRec->SubsequentScreenToScreenCopy)(
+		pScrn, srcx, srcy, dstx, dsty, w, h);
+	SET_SYNC_FLAG(pNEO->AccelInfoRec);
+    }
+}
+
+
+static void 
+NEO_BlitTransRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty,
+   unsigned long color
+){
+  /* this one should be separate since the XAA function would
+     prohibit usage of ~0 as the key */
+}
+
+
+static Bool 
+NEO_OpenFramebuffer(
+   ScrnInfoPtr pScrn, 
+   char **name,
+   unsigned char **mem,
+   int *size,
+   int *offset,
+   int *flags
+){
+    NEOPtr pNEO = NEOPTR(pScrn);
+
+    *name = NULL; 		/* no special device */
+    *mem = (unsigned char*)pNEO->NeoLinearAddr;
+    *size = pNEO->NeoFbMapSize;
+    *offset = 0;
+    *flags = DGA_NEED_ROOT;
+
+    return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c:1.18 xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c:1.29
--- xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c:1.18	Mon Mar  6 15:54:11 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c	Fri Jun 30 10:15:12 2000
@@ -22,7 +22,7 @@
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 **********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v 1.18 2000/03/06 23:54:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v 1.29 2000/06/30 17:15:12 dawes Exp $ */
 
 /*
  * The original Precision Insight driver for
@@ -36,14 +36,14 @@
  *   1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE)
  */
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
 
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
+
 #include "xf86Resources.h"
 
 /* Drivers for PCI hardware need this */
@@ -85,6 +85,10 @@
 /* Needed by the Shadow Framebuffer */
 #include "shadowfb.h"
 
+/* int10 */
+#include "xf86int10.h"
+#include "vbe.h"
+
 /* Needed for Device Data Channel (DDC) support */
 #include "xf86DDC.h"
 
@@ -114,9 +118,6 @@
 static Bool     NEOPreInit(ScrnInfoPtr pScrn, int flags);
 static Bool     NEOScreenInit(int Index, ScreenPtr pScreen, int argc,
                                   char **argv);
-static Bool     NEOSwitchMode(int scrnIndex, DisplayModePtr mode,
-                                  int flags);
-static void     NEOAdjustFrame(int scrnIndex, int x, int y, int flags);
 static Bool     NEOEnterVT(int scrnIndex, int flags);
 static void     NEOLeaveVT(int scrnIndex, int flags);
 static Bool     NEOCloseScreen(int scrnIndex, ScreenPtr pScreen);
@@ -183,6 +184,8 @@
     { NM2097,   "neo2097" },
     { NM2160,   "neo2160" },
     { NM2200,   "neo2200" },
+    { NM2360,   "neo2360" },
+    { NM2380,   "neo2380" },
     { -1,		 NULL }
 };
 
@@ -194,6 +197,8 @@
     { NM2097,  PCI_CHIP_NM2097,  RES_SHARED_VGA },
     { NM2160,  PCI_CHIP_NM2160,  RES_SHARED_VGA },
     { NM2200,  PCI_CHIP_NM2200,  RES_SHARED_VGA },
+    { NM2360,  PCI_CHIP_NM2360,  RES_SHARED_VGA },
+    { NM2380,  PCI_CHIP_NM2380,  RES_SHARED_VGA },
     { -1,	     -1,	     RES_UNDEFINED}
 };
 
@@ -322,6 +327,11 @@
     NULL
 };
 
+static const char *vbeSymbols[] = {
+    "VBEInit",
+    NULL
+};
+
 static const char *i2cSymbols[] = {
     "xf86CreateI2CBusRec",
     "xf86I2CBusInit",
@@ -372,7 +382,7 @@
 	 */
 	LoaderRefSymLists(vgahwSymbols, cfbSymbols, xaaSymbols,
 			  ramdacSymbols, shadowSymbols,
-			  ddcSymbols, i2cSymbols, NULL);
+			  ddcSymbols, vbeSymbols, i2cSymbols, NULL);
 	/*
 	 * The return value must be non-NULL on success even though there
 	 * is no TearDownProc.
@@ -461,12 +471,46 @@
 					drv, &usedChips);
 
 	if (numUsed > 0) {
-	  if (flags & PROBE_DETECT)
-	    foundScreen = TRUE;
-	  else for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn;
-	    /* Allocate a ScrnInfoRec and claim the slot */
-	    pScrn = xf86AllocateScreen(drv,0);
+	    if (flags & PROBE_DETECT)
+		foundScreen = TRUE;
+	    else for (i = 0; i < numUsed; i++) {
+		ScrnInfoPtr pScrn = NULL;
+		/* Allocate a ScrnInfoRec and claim the slot */
+		if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
+						       NEOPCIchipsets,NULL, NULL,
+						       NULL, NULL, NULL))) {
+		    pScrn->driverVersion = VERSION;
+		    pScrn->driverName    = NEO_DRIVER_NAME;
+		    pScrn->name          = NEO_NAME;
+		    pScrn->Probe         = NEOProbe;
+		    pScrn->PreInit       = NEOPreInit;
+		    pScrn->ScreenInit    = NEOScreenInit;
+		    pScrn->SwitchMode    = NEOSwitchMode;
+		    pScrn->AdjustFrame   = NEOAdjustFrame;
+		    pScrn->EnterVT       = NEOEnterVT;
+		    pScrn->LeaveVT       = NEOLeaveVT;
+		    pScrn->FreeScreen    = NEOFreeScreen;
+		    pScrn->ValidMode     = NEOValidMode;
+		    foundScreen = TRUE;
+		}
+	    }
+	    xfree(usedChips);
+	}
+    }
+    
+    /* Isa Bus */
+
+    numUsed = xf86MatchIsaInstances(NEO_NAME,NEOChipsets,NEOISAchipsets,
+				     drv,neoFindIsaDevice,devSections,
+				     numDevSections,&usedChips);
+    if (numUsed > 0) {
+      if (flags & PROBE_DETECT)
+	foundScreen = TRUE;
+      else for (i = 0; i < numUsed; i++) {
+	ScrnInfoPtr pScrn = NULL;
+	if ((pScrn = xf86ConfigIsaEntity(pScrn, 0, usedChips[i],
+					 NEOISAchipsets, NULL, NULL,
+					 NULL, NULL, NULL))) {
 	    pScrn->driverVersion = VERSION;
 	    pScrn->driverName    = NEO_DRIVER_NAME;
 	    pScrn->name          = NEO_NAME;
@@ -480,39 +524,7 @@
 	    pScrn->FreeScreen    = NEOFreeScreen;
 	    pScrn->ValidMode     = NEOValidMode;
 	    foundScreen = TRUE;
-	    xf86ConfigActivePciEntity(pScrn, usedChips[i], NEOPCIchipsets,
-				      NULL, NULL, NULL, NULL, NULL);
-	  }
-	  xfree(usedChips);
 	}
-    }
-    /* Isa Bus */
-
-    numUsed = xf86MatchIsaInstances(NEO_NAME,NEOChipsets,NEOISAchipsets,
-				     drv,neoFindIsaDevice,devSections,
-				     numDevSections,&usedChips);
-    if (numUsed > 0) {
-      if (flags & PROBE_DETECT)
-	foundScreen = TRUE;
-      else for (i = 0; i < numUsed; i++) {
-	ScrnInfoPtr pScrn;
-
-	pScrn = xf86AllocateScreen(drv,0);
-	pScrn->driverVersion = VERSION;
-	pScrn->driverName    = NEO_DRIVER_NAME;
-	pScrn->name          = NEO_NAME;
-	pScrn->Probe         = NEOProbe;
-	pScrn->PreInit       = NEOPreInit;
-	pScrn->ScreenInit    = NEOScreenInit;
-	pScrn->SwitchMode    = NEOSwitchMode;
-	pScrn->AdjustFrame   = NEOAdjustFrame;
-	pScrn->EnterVT       = NEOEnterVT;
-	pScrn->LeaveVT       = NEOLeaveVT;
-	pScrn->FreeScreen    = NEOFreeScreen;
-	pScrn->ValidMode     = NEOValidMode;
-	foundScreen = TRUE;
-	xf86ConfigActiveIsaEntity(pScrn, usedChips[i], NEOISAchipsets,
-				  NULL, NULL, NULL, NULL, NULL);
       }
       xfree(usedChips);
     }
@@ -524,7 +536,7 @@
 static int
 neoFindIsaDevice(GDevPtr dev)
 {
-    unsigned char vgaIOBase;
+    unsigned int vgaIOBase;
     unsigned char id;
     
     vgaIOBase = (inb(0x3CC) & 0x01) ? 0x3D0 : 0x3B0;
@@ -570,7 +582,8 @@
     int w;
     int apertureSize;
     char *s;
-
+    Bool ddc_done = FALSE;
+    
     if (flags & PROBE_DETECT) return FALSE;
     
     /* The vgahw module should be loaded here when needed */
@@ -622,25 +635,35 @@
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Chipset is a ");
     switch(nPtr->NeoChipset){
     case NM2070:
-	ErrorF("MagicGraph 128 (NM2070)");
+	xf86ErrorF("MagicGraph 128 (NM2070)");
 	break;
     case NM2090 :
-	ErrorF("MagicGraph 128V (NM2090)");
+	xf86ErrorF("MagicGraph 128V (NM2090)");
 	break;
     case NM2093 :
-	ErrorF("MagicGraph 128ZV (NM2093)");
+	xf86ErrorF("MagicGraph 128ZV (NM2093)");
 	break;
     case NM2097 :
-	ErrorF("MagicGraph 128ZV+ (NM2097)");
+	xf86ErrorF("MagicGraph 128ZV+ (NM2097)");
 	break;
     case NM2160 :
-	ErrorF("MagicGraph 128XD (NM2160)");
+	xf86ErrorF("MagicGraph 128XD (NM2160)");
 	break;
     case NM2200 :
-        ErrorF("MagicMedia 256AV (NM2200)");
+        xf86ErrorF("MagicMedia 256AV (NM2200)");
+	break;
+    case NM2360 :
+        xf86ErrorF("MagicMedia 256ZX (NM2360)");
 	break;
+    case NM2380 :
+        xf86ErrorF("MagicMedia 256XL+ (NM2380)");
+	break;
+    }
+    xf86ErrorF("\n");
+
+    if (xf86LoadSubModule(pScrn, "vbe")) {
+	nPtr->pVbe =  VBEInit(NULL,nPtr->pEnt->index);
     }
-    ErrorF("\n");
     
     vgaHWGetIOBase(hwp);
     nPtr->vgaIOBase = hwp->IOBase;
@@ -674,7 +697,8 @@
 	nPtr->NeoPanelHeight = 1024;
 	break;
 #else
-	ErrorF("\nOnly 640x480,\n"
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		     "Only 640x480,\n"
                      "     800x600,\n"
                      " and 1024x768 panels are currently supported\n");
 	return FALSE;
@@ -741,6 +765,26 @@
 	linearSize = 4096;
 	maxWidth   = 1280;
 	break;
+    case NM2360:
+	bppSupport = Support24bppFb | Support32bppFb |
+	    SupportConvert32to24 | PreferConvert32to24;
+	videoRam   = 4096;
+	maxClock   = 110000;
+	CursorMem  = 1024;
+	CursorOff  = 0x1000;
+	linearSize = 4096;
+	maxWidth   = 1280;
+	break;
+    case NM2380:
+	bppSupport = Support24bppFb | Support32bppFb |
+	    SupportConvert32to24 | PreferConvert32to24;
+	videoRam   = 6144;
+	maxClock   = 110000;
+	CursorMem  = 1024;
+	CursorOff  = 0x1000;
+	linearSize = 4096;
+	maxWidth   = 1280;
+	break;
     }
 
     pScrn->monitor = pScrn->confScreen->monitor;
@@ -760,8 +804,18 @@
 	return FALSE;
 
     VGAwGR(0x09,0x26);
-    xf86SetDDCproperties(
-	pScrn,xf86PrintEDID(xf86DoEDID_DDC2(pScrn->scrnIndex,nPtr->I2C)));
+
+    if (nPtr->pVbe) {
+	xf86MonPtr pMon;
+	if ((pMon = xf86PrintEDID(vbeDoEDID(nPtr->pVbe,NULL))) != NULL)
+	    ddc_done = TRUE;
+	xf86SetDDCproperties(pScrn,pMon);
+    }
+
+    if (ddc_done)
+	xf86SetDDCproperties(
+	    pScrn,xf86PrintEDID(xf86DoEDID_DDC2(pScrn->scrnIndex,nPtr->I2C)));
+    
     VGAwGR(0x09,0x00);
 
     if (!xf86SetDepthBpp(pScrn, 8, 8, 8, bppSupport ))
@@ -875,11 +929,6 @@
       }
     }
 
-    if (nPtr->shadowFB)
-	ErrorF("shadow\n");
-    else
-	ErrorF("no shadow\n");
-    
     if (nPtr->internDisp && nPtr->externDisp)
 	xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
 		   "Simultaneous LCD/CRT display mode\n");
@@ -981,6 +1030,8 @@
 	    case NM2160:
 	    case NM2097:
 	    case NM2200:
+	    case NM2360:
+	    case NM2380:
 		nPtr->NeoMMIOAddr = nPtr->PciInfo->memBase[1];
 		break;
 	    }
@@ -1034,7 +1085,7 @@
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Max Clock: %d kHz\n",
 		   maxClock);
     } else {
-	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Max Clock: %d kByte\n",
+	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Max Clock: %d kHz\n",
 		   maxClock);
     }
 
@@ -1043,7 +1094,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = (ClockRangePtr)xnfalloc(sizeof(ClockRange));
+    clockRanges = (ClockRangePtr)xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->ClockMulFactor = 1;
     clockRanges->minClock = 11000;   /* guessed §§§ */
@@ -1361,6 +1412,9 @@
     }
     
     xf86SetBlackWhitePixels(pScreen);
+
+    if (!nPtr->shadowFB)
+	NEODGAInit(pScreen);
     
     nPtr->NeoHWCursorShown = FALSE;
     nPtr->NeoHWCursorInitialized = FALSE;
@@ -1451,6 +1505,8 @@
 		Neo2097AccelInit(pScreen);
 		break;
 	    case NM2200 :
+	    case NM2360 :
+	    case NM2380 :
 	        Neo2200AccelInit(pScreen);
 		break;
 	    }
@@ -1531,14 +1587,14 @@
 }
 
 /* Mandatory */
-static Bool
+Bool
 NEOSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
     return neoModeInit(xf86Screens[scrnIndex], mode);
 }
 
 /* Mandatory */
-static void
+void
 NEOAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
     ScrnInfoPtr pScrn;
@@ -1818,21 +1874,24 @@
     if (nPtr->NeoChipset == NM2160) {
         save->PanelHorizCenterReg4 = VGArGR(0x36);
     }
-    if (nPtr->NeoChipset == NM2200) {
+    if (nPtr->NeoChipset == NM2200 || nPtr->NeoChipset == NM2360
+	|| nPtr->NeoChipset == NM2380) {
 	save->PanelHorizCenterReg4 = VGArGR(0x36);
 	save->PanelVertCenterReg5  = VGArGR(0x37);
 	save->PanelHorizCenterReg5 = VGArGR(0x38);
     }
     save->ExtColorModeSelect = VGArGR(0x90);
     save->VCLK3NumeratorLow = VGArGR(0x9B);
-    if (nPtr->NeoChipset == NM2200)
+    if (nPtr->NeoChipset == NM2200 || nPtr->NeoChipset == NM2360
+	|| nPtr->NeoChipset == NM2380)
 	save->VCLK3NumeratorHigh = VGArGR(0x8F);
     save->VCLK3Denominator = VGArGR(0x9F);
 
     if (save->reg == NULL)
         save->reg = (regSavePtr)xnfcalloc(sizeof(regSaveRec), 1);
     else
-        ErrorF("WARNING: Non-NULL reg in NeoSave: reg=0x%08X\n", save->reg);
+        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "Non-NULL reg in NeoSave: reg=0x%08X\n", save->reg);
 
     save->reg->CR[0x25] = VGArCR(0x25);
     save->reg->CR[0x2F] = VGArCR(0x2F);
@@ -1890,6 +1949,8 @@
     case NM2097:
     case NM2160:
     case NM2200:
+    case NM2360:
+    case NM2380:
     default:
 	/* Don't program the shadow regs by default */
 	noProgramShadowRegs = TRUE;
@@ -2055,6 +2116,8 @@
     case NM2097 :
     case NM2160 :
     case NM2200 :
+    case NM2360 :
+    case NM2380 :
 	temp &= 0x70; /* Save bits 6:4 */
 	temp |= (restore->ExtColorModeSelect & ~0x70);
 	break;
@@ -2104,6 +2167,8 @@
 	temp |= (restore->PanelDispCntlReg1 & ~0xDC);
 	break;
     case NM2200 :
+    case NM2360 :
+    case NM2380 :
 	temp &= 0x98; /* Save bits 7,4:3 */
 	temp |= (restore->PanelDispCntlReg1 & ~0x98);
 	break;
@@ -2136,7 +2201,8 @@
 	VGAwGR(0x36, restore->PanelHorizCenterReg4);
     }
 
-    if (nPtr->NeoChipset == NM2200) {
+    if (nPtr->NeoChipset == NM2200 || nPtr->NeoChipset == NM2360
+	|| nPtr->NeoChipset == NM2380) {
         VGAwGR(0x36, restore->PanelHorizCenterReg4);
         VGAwGR(0x37, restore->PanelVertCenterReg5);
         VGAwGR(0x38, restore->PanelHorizCenterReg5);
@@ -2145,7 +2211,8 @@
     /* Program VCLK3 if needed. */
     if (restore->ProgramVCLK) {
 	VGAwGR(0x9B, restore->VCLK3NumeratorLow);
-	if (nPtr->NeoChipset == NM2200) {
+	if (nPtr->NeoChipset == NM2200 || nPtr->NeoChipset == NM2360
+	    || nPtr->NeoChipset == NM2380) {
 	    temp = VGArGR(0x8F);
 	    temp &= 0x0F; /* Save bits 3:0 */
 	    temp |= (restore->VCLK3NumeratorHigh & ~0x0F);
@@ -2177,7 +2244,8 @@
 	restore->reg = NULL;
     }
     /* Program vertical extension register */
-    if (nPtr->NeoChipset == NM2200) {
+    if (nPtr->NeoChipset == NM2200 || nPtr->NeoChipset == NM2360
+	|| nPtr->NeoChipset == NM2380) {
 	VGAwCR(0x70, restore->VerticalExt);
     }
 
@@ -2444,7 +2512,8 @@
      * case it isn't, warn us and clear it anyway.
      */
     if (NeoNew->reg) {
-	ErrorF("WARNING: Non-NULL reg in NeoInit: reg=0x%08X\n", NeoNew->reg);
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "Non-NULL reg in NeoInit: reg=0x%08X\n", NeoNew->reg);
 	xfree(NeoNew->reg);
 	NeoNew->reg = NULL;
     }
@@ -2498,7 +2567,8 @@
 		}
 	    }
 
-    if (nPtr->NeoChipset == NM2200) {
+    if (nPtr->NeoChipset == NM2200 || nPtr->NeoChipset == NM2360
+	|| nPtr->NeoChipset == NM2380) {
         /* NOT_DONE:  We are trying the full range of the 2200 clock.
            We should be able to try n up to 2047 */
 	nPtr->NeoModeReg.VCLK3NumeratorLow  = n_best;
Index: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.cpp:1.1	Thu Mar  2 17:05:40 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.cpp	Tue Jun 13 19:13:12 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.cpp,v 1.1 2000/03/03 01:05:40 dawes Exp $ 
-.TH NEOMAGIC __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.cpp,v 1.4 2000/06/14 02:13:12 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH NEOMAGIC __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 neomagic \- NeoMagic video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""neomagic"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qneomagic\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B neomagic 
 is an XFree86 driver for NeoMagic video chips.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile:1.11 xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile:1.11	Fri Feb 25 13:02:54 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile	Fri Mar 31 14:55:46 2000
@@ -1,10 +1,10 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile,v 1.11 2000/02/25 21:02:54 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile,v 1.12 2000/03/31 22:55:46 dawes Exp $
 XCOMM
 XCOMM This is an Imakefile for the NVIDIA driver.  
 XCOMM
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile,v 1.11 2000/02/25 21:02:54 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile,v 1.12 2000/03/31 22:55:46 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -54,6 +54,7 @@
 InstallDriverSDKNonExecFile(nv_dga.c,$(DRIVERSDKDIR)/drivers/nv)
 InstallDriverSDKNonExecFile(nv_driver.c,$(DRIVERSDKDIR)/drivers/nv)
 InstallDriverSDKNonExecFile(nv_include.h,$(DRIVERSDKDIR)/drivers/nv)
+InstallDriverSDKNonExecFile(nv_local.h,$(DRIVERSDKDIR)/drivers/nv)
 InstallDriverSDKNonExecFile(nv_proto.h,$(DRIVERSDKDIR)/drivers/nv)
 InstallDriverSDKNonExecFile(nv_setup.c,$(DRIVERSDKDIR)/drivers/nv)
 InstallDriverSDKNonExecFile(nv_shadow.c,$(DRIVERSDKDIR)/drivers/nv)
Index: xc/programs/Xserver/hw/xfree86/drivers/nv/nv.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/nv/nv.cpp:1.6 xc/programs/Xserver/hw/xfree86/drivers/nv/nv.cpp:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv.cpp:1.6	Thu Mar  2 17:05:40 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv.cpp	Tue Jun 13 19:13:12 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv.cpp,v 1.6 2000/03/03 01:05:40 dawes Exp $ 
-.TH NV __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv.cpp,v 1.10 2000/06/14 02:13:12 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH NV __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
-nv \-NVIDIA video driver
+nv \- NVIDIA video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""nv"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qnv\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B nv 
 is an XFree86 driver for NVIDIA video cards.  The driver is fully
@@ -48,28 +48,28 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""HWCursor"" """ boolean """
+.BI "Option \*qHWCursor\*q \*q" boolean \*q
 Enable or disable the HW cursor.  Default: on.
 .TP
-.BI "Option ""NoAccel"" """ boolean """
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
 .TP
-.BI "Option ""UseFBDev"" """ boolean """
+.BI "Option \*qUseFBDev\*q \*q" boolean \*q
 Enable or disable use of on OS-specific fb interface (and is not supported
 on all OSs).  See fbdevhw(__drivermansuffix__) for further information.
 Default: off.
 .TP
-.BI "Option ""Rotate"" ""CW""
+.BI "Option \*qRotate\*q \*qCW\*q"
 .TP
-.BI "Option ""Rotate"" ""CCW""
+.BI "Option \*qRotate\*q \*qCCW\*q"
 Rotate the display clockwise or counterclockwise.  This mode is unaccelerated.
 Default: no rotation.
 .TP
-.BI "Option ""ShadowFB"" """ boolean """
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  See
-shadowfb(4) for further information.  Default: off.
+shadowfb(__drivermansuffix__) for further information.  Default: off.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: David McKay, Jarno Paananen, Chas Inman, Dave Schmenk, 
 Mark Vojkovich
Index: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c:1.40 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c:1.44
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c:1.40	Sun Mar  5 15:47:51 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c	Wed Jun 21 10:28:12 2000
@@ -24,7 +24,7 @@
 /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen
    <jpaana@s2.org> */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.40 2000/03/05 23:47:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.44 2000/06/21 17:28:12 dawes Exp $ */
 
 #include "nv_include.h"
 
@@ -457,27 +457,28 @@
     if (flags & PROBE_DETECT)
 	foundScreen = TRUE;
     else for (i = 0; i < numUsed; i++) {
-        ScrnInfoPtr pScrn;
+        ScrnInfoPtr pScrn = NULL;
         
         /* Allocate a ScrnInfoRec and claim the slot */
-        pScrn = xf86AllocateScreen(drv, 0);
+        if ((pScrn = xf86ConfigPciEntity(pScrn, 0,usedChips[i],
+					       NVPciChipsets, NULL, NULL, NULL,
+					       NULL, NULL))) {
         
-        /* Fill in what we can of the ScrnInfoRec */
-        pScrn->driverVersion    = VERSION;
-        pScrn->driverName       = NV_DRIVER_NAME;
-        pScrn->name             = NV_NAME;
-        pScrn->Probe            = NVProbe;
-        pScrn->PreInit          = NVPreInit;
-        pScrn->ScreenInit       = NVScreenInit;
-        pScrn->SwitchMode       = NVSwitchMode;
-        pScrn->AdjustFrame      = NVAdjustFrame;
-        pScrn->EnterVT          = NVEnterVT;
-        pScrn->LeaveVT          = NVLeaveVT;
-        pScrn->FreeScreen       = NVFreeScreen;
-        pScrn->ValidMode        = NVValidMode;
-        foundScreen = TRUE;
-        xf86ConfigActivePciEntity(pScrn, usedChips[i], NVPciChipsets, NULL,
-                                  NULL, NULL, NULL, NULL);
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion    = VERSION;
+	    pScrn->driverName       = NV_DRIVER_NAME;
+	    pScrn->name             = NV_NAME;
+	    pScrn->Probe            = NVProbe;
+	    pScrn->PreInit          = NVPreInit;
+	    pScrn->ScreenInit       = NVScreenInit;
+	    pScrn->SwitchMode       = NVSwitchMode;
+	    pScrn->AdjustFrame      = NVAdjustFrame;
+	    pScrn->EnterVT          = NVEnterVT;
+	    pScrn->LeaveVT          = NVLeaveVT;
+	    pScrn->FreeScreen       = NVFreeScreen;
+	    pScrn->ValidMode        = NVValidMode;
+	    foundScreen = TRUE;
+	}    
     }
     xfree(usedChips);
     return foundScreen;
@@ -729,18 +730,6 @@
     if (pScrn->numEntities != 1)
 	return FALSE;
 
-    /* The vgahw module should be loaded here when needed */
-    if (!xf86LoadSubModule(pScrn, "vgahw"))
-	return FALSE;
-
-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
-    /*
-     * Allocate a vgaHWRec
-     */
-    if (!vgaHWGetHWRec(pScrn))
-	return FALSE;
-
     /* Allocate the NVRec driverPrivate */
     if (!NVGetRec(pScrn)) {
 	return FALSE;
@@ -892,6 +881,18 @@
 
     bytesPerPixel = pScrn->bitsPerPixel / 8;
 
+    /* The vgahw module should be loaded here when needed */
+    if (!xf86LoadSubModule(pScrn, "vgahw"))
+	return FALSE;
+
+    xf86LoaderReqSymLists(vgahwSymbols, NULL);
+
+    /*
+     * Allocate a vgaHWRec
+     */
+    if (!vgaHWGetHWRec(pScrn))
+	return FALSE;
+
     /* We use a programamble clock */
     pScrn->progClock = TRUE;
 
@@ -1150,7 +1151,7 @@
     pNv->MinClock = 12000;
     pNv->MaxClock = pNv->riva.MaxVClockFreqKHz;
 
-    clockRanges = xnfalloc(sizeof(ClockRange));
+    clockRanges = xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->minClock = pNv->MinClock;
     clockRanges->maxClock = pNv->MaxClock;
@@ -1659,7 +1660,6 @@
 	   switch(pScrn->bitsPerPixel) {
                case 8:	refreshArea = NVRefreshArea8;	break;
                case 16:	refreshArea = NVRefreshArea16;	break;
-               case 24:	refreshArea = NVRefreshArea24;	break;
                case 32:	refreshArea = NVRefreshArea32;	break;
 	   }
 	}
Index: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h:1.7 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h:1.7	Fri Feb 25 13:02:56 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h	Tue Apr  4 12:25:13 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.7 2000/02/25 21:02:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.8 2000/04/04 19:25:13 dawes Exp $ */
 
 #ifndef __NV_INCLUDE_H__
 #define __NV_INCLUDE_H__
@@ -7,8 +7,8 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "compiler.h"
 #include "xf86_ansic.h"
+#include "compiler.h"
 
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c:1.4 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c:1.4	Tue Feb  8 09:19:10 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c	Mon Mar 13 10:49:29 2000
@@ -2,7 +2,7 @@
    Copyright (c) 1999,  The XFree86 Project Inc. 
    Written by Mark Vojkovich <markv@valinux.com>
 */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c,v 1.4 2000/02/08 17:19:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c,v 1.5 2000/03/13 18:49:29 mvojkovi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -153,58 +153,6 @@
     }
 }
 
-
-/* this one could be faster */
-void
-NVRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
-{
-    NVPtr pNv = NVPTR(pScrn);
-    int count, width, height, y1, y2, dstPitch, srcPitch;
-    CARD8 *dstPtr, *srcPtr, *src;
-    CARD32 *dst;
-
-    dstPitch = BitmapBytePad(pScrn->displayWidth * 24);
-    srcPitch = -pNv->Rotate * pNv->ShadowPitch;
-
-    while(num--) {
-        width = pbox->x2 - pbox->x1;
-        y1 = pbox->y1 & ~3;
-        y2 = (pbox->y2 + 3) & ~3;
-        height = (y2 - y1) >> 2;  /* blocks of 3 dwords */
-
-	if(pNv->Rotate == 1) {
-	    dstPtr = pNv->FbStart + 
-			(pbox->x1 * dstPitch) + ((pScrn->virtualX - y2) * 3);
-	    srcPtr = pNv->ShadowPtr + ((1 - y2) * srcPitch) + (pbox->x1 * 3);
-	} else {
-	    dstPtr = pNv->FbStart + 
-			((pScrn->virtualY - pbox->x2) * dstPitch) + (y1 * 3);
-	    srcPtr = pNv->ShadowPtr + (y1 * srcPitch) + (pbox->x2 * 3) - 3;
-	}
-
-	while(width--) {
-	    src = srcPtr;
-	    dst = (CARD32*)dstPtr;
-	    count = height;
-	    while(count--) {
-		dst[0] = src[0] | (src[1] << 8) | (src[2] << 16) |
-				(src[srcPitch] << 24);		
-		dst[1] = src[srcPitch + 1] | (src[srcPitch + 2] << 8) |
-				(src[srcPitch * 2] << 16) |
-				(src[(srcPitch * 2) + 1] << 24);		
-		dst[2] = src[(srcPitch * 2) + 2] | (src[srcPitch * 3] << 8) |
-				(src[(srcPitch * 3) + 1] << 16) |
-				(src[(srcPitch * 3) + 2] << 24);	
-		dst += 3;
-		src += srcPitch * 4;
-	    }
-	    srcPtr += pNv->Rotate * 3;
-	    dstPtr += dstPitch; 
-	}
-
-	pbox++;
-    }
-}
 
 void
 NVRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
Index: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h:1.11 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h:1.11	Fri Feb 25 13:02:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h	Mon Mar 13 10:49:29 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.11 2000/02/25 21:02:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.12 2000/03/13 18:49:29 mvojkovi Exp $ */
 
 #ifndef __NV_STRUCT_H__
 #define __NV_STRUCT_H__
@@ -118,7 +118,6 @@
 void NVRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 void NVRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 void NVRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
-void NVRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 void NVRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 void NVPointerMoved(int index, int x, int y);
 
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/r128/Imakefile:1.6 xc/programs/Xserver/hw/xfree86/drivers/r128/Imakefile:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/r128/Imakefile:1.6	Thu Mar  2 17:05:40 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/Imakefile	Fri Jun 16 17:03:21 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/Imakefile,v 1.6 2000/03/03 01:05:40 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/Imakefile,v 1.8 2000/06/17 00:03:21 martin Exp $
 XCOMM
 XCOMM This is the Imakefile for the ATI Rage 128 (r128) driver.  
 XCOMM 
@@ -6,9 +6,16 @@
 #define IHaveModules
 #include <Server.tmpl>
 
-SRCS = r128_driver.c r128_cursor.c r128_accel.c # r128_i2c.c
+#if BuildXF86DRI
+DRISRCS     = r128_dri.c
+DRIOBJS     = r128_dri.o
+DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include
+DRIDEFINES  = $(GLX_DEFINES)
+#endif
+
+SRCS = r128_driver.c r128_cursor.c r128_accel.c r128_dga.c $(DRISRCS) # r128_i2c.c
 
-OBJS = r128_driver.o r128_cursor.o r128_accel.o # r128_i2c.o
+OBJS = r128_driver.o r128_cursor.o r128_accel.o r128_dga.o $(DRIOBJS) # r128_i2c.o
 
 #if defined(XF86DriverSDK)
 INCLUDES = -I. -I../../include
@@ -22,9 +29,12 @@
 	   -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(XF86OSSRC)/vbe \
 	   -I$(XF86SRC)/int10 -I$(SERVERSRC)/Xext \
            -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-	   -I$(EXTINCSRC) -I$(XF86SRC)/xf24_32bpp
+	   -I$(EXTINCSRC) -I$(XF86SRC)/xf24_32bpp \
+	   $(DRIINCLUDES)
 #endif
 
+DEFINES = $(DRIDEFINES)
+
 #if MakeHasPosixVariableSubstitutions
 SubdirLibraryRule($(OBJS))
 #endif
@@ -47,7 +57,13 @@
 InstallDriverSDKNonExecFile(r128_accel.c,$(DRIVERSDKDIR)/drivers/r128)
 InstallDriverSDKNonExecFile(r128_cursor.c,$(DRIVERSDKDIR)/drivers/r128)
 InstallDriverSDKNonExecFile(r128_driver.c,$(DRIVERSDKDIR)/drivers/r128)
+InstallDriverSDKNonExecFile(r128_dga.c,$(DRIVERSDKDIR)/drivers/r128)
 InstallDriverSDKNonExecFile(r128_reg.h,$(DRIVERSDKDIR)/drivers/r128)
+
+InstallDriverSDKNonExecFile(r128_dri.c,$(DRIVERSDKDIR)/drivers/r128)
+InstallDriverSDKNonExecFile(r128_dri.h,$(DRIVERSDKDIR)/drivers/r128)
+InstallDriverSDKNonExecFile(r128_dripriv.h,$(DRIVERSDKDIR)/drivers/r128)
+InstallDriverSDKNonExecFile(r128_sarea.h,$(DRIVERSDKDIR)/drivers/r128)
 
 InstallDriverSDKObjectModule(r128,$(DRIVERSDKMODULEDIR),drivers)
 
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/README
diff -u xc/programs/Xserver/hw/xfree86/drivers/r128/README:1.3 xc/programs/Xserver/hw/xfree86/drivers/r128/README:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/r128/README:1.3	Wed Mar  8 07:14:50 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/README	Tue Jun 13 17:16:11 2000
@@ -69,7 +69,7 @@
 
 7. Known Limitations
 
-    * DGA is not supported yet
+    * None
 
 
 8. Authors
@@ -111,4 +111,4 @@
         http://www.suse.com
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/README,v 1.3 2000/03/08 15:14:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/README,v 1.4 2000/06/14 00:16:11 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/r128/r128.cpp:1.3 xc/programs/Xserver/hw/xfree86/drivers/r128/r128.cpp:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/r128/r128.cpp:1.3	Mon Mar  6 14:59:26 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128.cpp	Tue Jun 13 19:13:13 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128.cpp,v 1.3 2000/03/06 22:59:26 dawes Exp $ 
-.TH R128 __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128.cpp,v 1.6 2000/06/14 02:13:13 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH R128 __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 r128 \- ATI Rage 128 video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""r128"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qr128\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B r128
 is an XFree86 driver for ATI Rage 128 based video cards.  It contains
@@ -48,22 +48,22 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""SWcursor"" """ boolean """
+.BI "Option \*qSWcursor\*q \*q" boolean \*q
 Selects software cursor.  The default is
 .B off.
 .TP
-.BI "Option ""NoAccel"" """ boolean """
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
 Enables or disables all hardware acceleration.  The default is to
 .B enable
 hardware acceleration.
 .TP
-.BI "Option ""Dac6Bit"" """ boolean """
+.BI "Option \*qDac6Bit\*q \*q" boolean \*q
 Enables or disables the use of 6 bits per color component when in 8 bpp
 mode (emulates VGA mode).  By default, all 8 bits per color component
 are used.  The default is
 .B off.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 .nf
 Rickard E. (Rik) Faith   \fIfaith@precisioninsight.com\fP
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h:1.8 xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h:1.8	Tue Feb 22 20:47:18 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h	Fri Jun 16 17:03:22 2000
@@ -1,8 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h,v 1.8 2000/02/23 04:47:18 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h,v 1.10 2000/06/17 00:03:22 martin Exp $ */
 /**************************************************************************
 
-Copyright 1999 ATI Technologies Inc. and Precision Insight, Inc.,
-                                         Cedar Park, Texas. 
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -40,10 +40,13 @@
 #define R128_TIMEOUT  2000000	/* Fall out of wait loops after this count */
 #define R128_MMIOSIZE 0x80000
 
+				/* R128_NAME is used for the server-side
+                                   ddx driver, the client-side DRI driver,
+                                   and the kernel-level DRM driver. */
 #define R128_NAME "r128"
 #define R128_VERSION_MAJOR 3
-#define R128_VERSION_MINOR 0
-#define R128_VERSION_PATCH 0
+#define R128_VERSION_MINOR 1
+#define R128_VERSION_PATCH 1
 #define R128_VERSION ((R128_VERSION_MAJOR << 16)  \
 		      | (R128_VERSION_MINOR << 8) \
 		      | R128_VERSION_PATCH)
@@ -100,7 +103,7 @@
     CARD32     amcgpio_en_reg;
     CARD32     amcgpio_mask;
 
-				/* Crtc registers */
+				/* CRTC registers */
     CARD32     crtc_gen_cntl;
     CARD32     crtc_ext_cntl;
     CARD32     dac_cntl;
@@ -112,6 +115,21 @@
     CARD32     crtc_offset_cntl;
     CARD32     crtc_pitch;
 
+				/* CRTC2 registers */
+    CARD32     crtc2_gen_cntl;
+
+				/* Flat panel registers */
+    CARD32     fp_crtc_h_total_disp;
+    CARD32     fp_crtc_v_total_disp;
+    CARD32     fp_gen_cntl;
+    CARD32     fp_h_sync_strt_wid;
+    CARD32     fp_horz_stretch;
+    CARD32     fp_panel_cntl;
+    CARD32     fp_v_sync_strt_wid;
+    CARD32     fp_vert_stretch;
+    CARD32     lvds_gen_cntl;
+    CARD32     tmds_crc;
+
 				/* Computed values for PLL */
     int        dot_clock_freq;
     int        pll_output_freq;
@@ -141,6 +159,15 @@
 } R128PLLRec, *R128PLLPtr;
 
 typedef struct {
+    int                bitsPerPixel;
+    int                depth;
+    int                displayWidth;
+    int                pixel_code;
+    int                pixel_bytes;
+    DisplayModePtr     mode;
+} R128FBLayout;
+
+typedef struct {
     EntityInfoPtr     pEnt;
     pciVideoPtr       PciInfo;
     PCITAG            PciTag;
@@ -157,10 +184,24 @@
     unsigned char     *FB;	  /* Map of frame buffer                     */
 
     CARD32            MemCntl;
-    CARD32	      BusCntl;
+    CARD32            BusCntl;
     unsigned long     FbMapSize;  /* Size of frame buffer, in bytes          */
     int               Flags;	  /* Saved copy of mode flags                */
     
+    Bool              EnableFP;     /* Enable use of FP registers            */
+    Bool              CRTOnly;      /* Only use External CRT instead of FP   */
+    Bool              HasPanelRegs; /* Current chip can connect to a FP      */
+
+				/* Computed values for FPs */
+    int               PanelXRes;
+    int               PanelYRes;
+    int               PanelHNonVis;
+    int               PanelHOverPlus;
+    int               PanelHSyncWidth;
+    int               PanelVNonVis;
+    int               PanelVOverPlus;
+    int               PanelVSyncWidth;
+
     R128PLLRec        pll;
     R128RAMPtr        ram;
 
@@ -168,6 +209,8 @@
     R128SaveRec       ModeReg;	  /* Current mode                            */
     Bool              (*CloseScreen)(int, ScreenPtr);
 
+    Bool              PaletteSavedOnVT; /* Palette saved on last VT switch   */
+
     I2CBusPtr         i2c;
     XAAInfoRecPtr     accel;
     xf86CursorInfoPtr cursor;
@@ -176,8 +219,6 @@
 
     int               fifo_slots; /* Free slots in the FIFO (64 max)         */
     int               pix24bpp;	  /* Depth of pixmap for 24bpp framebuffer   */
-    int               pixel_code; /* Unified depth/fbbpp value               */
-    int               pixel_bytes;/* Bytes per framebuffer pixel             */
     Bool              dac6bits;	  /* Use 6 bit DAC?                          */
 
 				/* Computed values for Rage 128 */
@@ -199,13 +240,124 @@
     int               scanline_words;
     int               scanline_direct;
     int               scanline_bpp; /* Only used for ImageWrite */
+
+    DGAModePtr        DGAModes;
+    int               numDGAModes;
+    Bool              DGAactive;
+    int               DGAViewportStatus;
+
+    R128FBLayout      CurrentLayout;
+#ifdef XF86DRI
+    Bool              directRenderingEnabled;
+    DRIInfoPtr        pDRIInfo;
+    int               drmFD;
+    int               numVisualConfigs;
+    __GLXvisualConfig *pVisualConfigs;
+    R128ConfigPrivPtr pVisualConfigsPriv;
+
+    drmHandle         fbHandle;
+
+    drmSize           registerSize;
+    drmHandle         registerHandle;
+    
+    Bool              IsPCI;		/* Current card is a PCI card */
+    
+    drmSize           agpSize;
+    drmHandle         agpMemHandle;     /* Handle from drmAgpAlloc */
+    unsigned long     agpOffset;
+    unsigned char     *AGP;	        /* Map */
+    int               agpMode;
+
+    Bool              CCEInUse;		/* CCE is currently active */
+    int               CCEMode;		/* CCE mode that server/clients use */
+    int               CCEFifoSize;	/* Size of the CCE command FIFO */
+    Bool              CCESecure;	/* CCE security enabled */
+    int               CCEusecTimeout;	/* CCE timeout in usecs */
+    Bool              CCE2D;            /* CCE is used for X server 2D prims */
+
+				/* CCE ring buffer data */
+    unsigned long     ringStart;	/* Offset into AGP space */
+    drmHandle         ringHandle;	/* Handle from drmAddMap */
+    drmSize           ringMapSize;	/* Size of map */
+    int               ringSize;		/* Size of ring (in MB) */
+    unsigned char     *ring;		/* Map */
+    int               ringSizeLog2QW;
+
+    unsigned long     ringReadOffset;	/* Offset into AGP space */
+    drmHandle         ringReadPtrHandle; /* Handle from drmAddMap */
+    drmSize           ringReadMapSize;	/* Size of map */
+    unsigned char     *ringReadPtr;	/* Map */
+
+				/* CCE vertex buffer data */
+    unsigned long     vbStart;		/* Offset into AGP space */
+    drmHandle         vbHandle;		/* Handle from drmAddMap */
+    drmSize           vbMapSize;	/* Size of map */
+    int               vbSize;		/* Size of vert bufs (in MB) */
+    unsigned char     *vb;		/* Map */
+    int               vbBufSize;	/* Size of individual vert buf */
+    int               vbNumBufs;	/* Number of vert bufs */
+    drmBufMapPtr      vbBufs;		/* Buffer map */
+
+				/* CCE indirect buffer data */
+    unsigned long     indStart;		/* Offset into AGP space */
+    drmHandle         indHandle;	/* Handle from drmAddMap */
+    drmSize           indMapSize;	/* Size of map */
+    int               indSize;		/* Size of indirect bufs (in MB) */
+    unsigned char     *ind;		/* Map */
+
+				/* CCE AGP Texture data */
+    unsigned long     agpTexStart;	/* Offset into AGP space */
+    drmHandle         agpTexHandle;	/* Handle from drmAddMap */
+    drmSize           agpTexMapSize;	/* Size of map */
+    int               agpTexSize;	/* Size of AGP tex space (in MB) */
+    unsigned char     *agpTex;		/* Map */
+    int               log2AGPTexGran;
+
+				/* DRI screen private data */
+    int               fbX;
+    int               fbY;
+    int               backX;
+    int               backY;
+    int               depthX;
+    int               depthY;
+    int               textureX;
+    int               textureY;
+    int               textureSize;
+    int               log2TexGran;
+#endif
 } R128InfoRec, *R128InfoPtr;
 
+#define R128WaitForFifo(pScrn, entries)                                      \
+do {                                                                         \
+    if (info->fifo_slots < entries) R128WaitForFifoFunction(pScrn, entries); \
+    info->fifo_slots -= entries;                                             \
+} while (0)
+
+extern void        R128WaitForFifoFunction(ScrnInfoPtr pScrn, int entries);
+extern void        R128WaitForIdle(ScrnInfoPtr pScrn);
+extern void        R128EngineReset(ScrnInfoPtr pScrn);
+extern void        R128EngineFlush(ScrnInfoPtr pScrn);
+
 extern int         INPLL(ScrnInfoPtr pScrn, int addr);
 extern void        R128WaitForVerticalSync(ScrnInfoPtr pScrn);
+extern void        R128AdjustFrame(int scrnIndex, int x, int y, int flags);
+extern Bool        R128SwitchMode(int ScrnIndex, DisplayModePtr mode, int flags);
 
 extern Bool        R128AccelInit(ScreenPtr pScreen);
 extern void        R128EngineInit(ScrnInfoPtr pScrn);
 extern Bool        R128CursorInit(ScreenPtr pScreen);
+extern Bool        R128DGAInit(ScreenPtr pScreen);
+
+extern int         R128MinBits(int val);
+
+#ifdef XF86DRI
+extern Bool        R128DRIScreenInit(ScreenPtr pScreen);
+extern void        R128DRICloseScreen(ScreenPtr pScreen);
+extern Bool        R128DRIFinishScreenInit(ScreenPtr pScreen);
+extern void        R128CCEStart(ScrnInfoPtr pScrn);
+extern void        R128CCEStop(ScrnInfoPtr pScrn);
+extern void        R128CCEResetRing(ScrnInfoPtr pScrn);
+extern void        R128CCEWaitForIdle(ScrnInfoPtr pScrn);
+#endif
 
 #endif
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c:1.7 xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c:1.13
--- xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c:1.7	Tue Feb 22 20:47:18 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c	Sun Jun 25 22:41:32 2000
@@ -1,8 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c,v 1.7 2000/02/23 04:47:18 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_accel.c,v 1.13 2000/06/26 05:41:32 martin Exp $ */
 /**************************************************************************
 
-Copyright 1999 ATI Technologies Inc. and Precision Insight, Inc.,
-                                         Cedar Park, Texas. 
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -95,6 +95,19 @@
 				/* DDC support */
 #include "xf86DDC.h"
 
+				/* DRI support */
+#ifdef XF86DRI
+#include "GL/glxint.h"
+#include "xf86drm.h"
+#include "sarea.h"
+#define _XF86DRI_SERVER_
+#include "xf86dri.h"
+#include "dri.h"
+#include "r128_dri.h"
+#include "r128_dripriv.h"
+#include "r128_sarea.h"
+#endif
+
 				/* Driver data structures */
 #include "r128.h"
 #include "r128_reg.h"
@@ -122,7 +135,7 @@
 };
 
 /* Flush all dirty data in the Pixel Cache to memory. */
-static void R128EngineFlush(ScrnInfoPtr pScrn)
+void R128EngineFlush(ScrnInfoPtr pScrn)
 {
     int i;
     R128MMIO_VARS();
@@ -134,11 +147,12 @@
 }
 
 /* Reset graphics card to known state. */
-static void R128EngineReset(ScrnInfoPtr pScrn)
+void R128EngineReset(ScrnInfoPtr pScrn)
 {
-    CARD32 clock_cntl_index;
-    CARD32 mclk_cntl;
-    CARD32 gen_reset_cntl;
+    R128InfoPtr info = R128PTR(pScrn);
+    CARD32      clock_cntl_index;
+    CARD32      mclk_cntl;
+    CARD32      gen_reset_cntl;
     R128MMIO_VARS();
 	
     R128EngineFlush(pScrn);
@@ -146,7 +160,7 @@
     clock_cntl_index = INREG(R128_CLOCK_CNTL_INDEX);
     mclk_cntl        = INPLL(pScrn, R128_MCLK_CNTL);
 
-    OUTPLL(R128_MCLK_CNTL, mclk_cntl | R128_FORCE_GCP | R128_FORCE_PIPE3D_CPP);
+    OUTPLL(R128_MCLK_CNTL, mclk_cntl | R128_FORCE_GCP | R128_FORCE_PIPE3D_CP);
 
     gen_reset_cntl   = INREG(R128_GEN_RESET_CNTL);
 
@@ -158,17 +172,15 @@
     OUTPLL(R128_MCLK_CNTL,        mclk_cntl);
     OUTREG(R128_CLOCK_CNTL_INDEX, clock_cntl_index);
     OUTREG(R128_GEN_RESET_CNTL,   gen_reset_cntl);
-}
 
-#define R128WaitForFifo(pScrn, entries)                                      \
-do {                                                                         \
-    if (info->fifo_slots < entries) R128WaitForFifoFunction(pScrn, entries); \
-    info->fifo_slots -= entries;                                             \
-} while (0)
+#ifdef XF86DRI
+    if (R128CCE_USE_RING_BUFFER(info->CCEMode)) R128CCEResetRing(pScrn);
+#endif
+}
 
 /* The FIFO has 64 slots.  This routines waits until at least `entries' of
    these slots are empty. */
-static void R128WaitForFifoFunction(ScrnInfoPtr pScrn, int entries)
+void R128WaitForFifoFunction(ScrnInfoPtr pScrn, int entries)
 {
     R128InfoPtr info = R128PTR(pScrn);
     int         i;
@@ -186,15 +198,19 @@
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		   "FIFO timed out, resetting engine...\n");
 	R128EngineReset(pScrn);
+#ifdef XF86DRI
+	if (info->CCE2D) R128CCEStart(pScrn);
+#endif
     }
 }
 
 /* Wait for the graphics engine to be completely idle: the FIFO has
    drained, the Pixel Cache is flushed, and the engine is idle.  This is a
    standard "sync" function that will make the hardware "quiescent". */
-static void R128WaitForIdle(ScrnInfoPtr pScrn)
+void R128WaitForIdle(ScrnInfoPtr pScrn)
 {
-    int i;
+    R128InfoPtr info = R128PTR(pScrn);
+    int         i;
     R128MMIO_VARS();
 
     R128WaitForFifoFunction(pScrn, 64);
@@ -213,6 +229,9 @@
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		   "Idle timed out, resetting engine...\n");
 	R128EngineReset(pScrn);
+#ifdef XF86DRI
+	if (info->CCE2D) R128CCEStart(pScrn);
+#endif
     }
 }
 
@@ -916,12 +935,12 @@
     R128InfoPtr info = R128PTR(pScrn);
     R128MMIO_VARS();
 
-    R128TRACE(("EngineInit (%d/%d)\n", info->pixel_code, pScrn->bitsPerPixel));
+    R128TRACE(("EngineInit (%d/%d)\n", info->CurrentLayout.pixel_code, info->CurrentLayout.bitsPerPixel));
 
     OUTREG(R128_SCALE_3D_CNTL, 0);
     R128EngineReset(pScrn);
 
-    switch (info->pixel_code) {
+    switch (info->CurrentLayout.pixel_code) {
     case 8:  info->datatype = 2; break;
     case 15: info->datatype = 3; break;
     case 16: info->datatype = 4; break;
@@ -929,9 +948,10 @@
     case 32: info->datatype = 6; break;
     default:
 	R128TRACE(("Unknown depth/bpp = %d/%d (code = %d)\n",
-		   pScrn->depth, pScrn->bitsPerPixel, info->pixel_code));
+		   info->CurrentLayout.depth, info->CurrentLayout.bitsPerPixel,
+		   info->CurrentLayout.pixel_code));
     }
-    info->pitch = (pScrn->displayWidth / 8) * (info->pixel_bytes == 3 ? 3 : 1);
+    info->pitch = (info->CurrentLayout.displayWidth / 8) * (info->CurrentLayout.pixel_bytes == 3 ? 3 : 1);
 
     R128TRACE(("Pitch for acceleration = %d\n", info->pitch));
 
@@ -949,7 +969,7 @@
 
     info->dp_gui_master_cntl = ((info->datatype << R128_GMC_DST_DATATYPE_SHIFT)
 				| R128_GMC_CLR_CMP_CNTL_DIS
-				| R128_AUX_CLIP_DIS
+				| R128_GMC_AUX_CLIP_DIS
 				| R128_GMC_DST_CLIPPING);
     R128WaitForFifo(pScrn, 1);
     OUTREG(R128_DP_GUI_MASTER_CNTL, (info->dp_gui_master_cntl
@@ -966,19 +986,33 @@
     OUTREG(R128_DP_SRC_BKGD_CLR,   0x00000000);
     OUTREG(R128_DP_WRITE_MASK,     0xffffffff);
 
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+    OUTREGP(R128_DP_DATATYPE,
+	    R128_HOST_BIG_ENDIAN_EN, ~R128_HOST_BIG_ENDIAN_EN);
+#else
+    OUTREGP(R128_DP_DATATYPE, 0, ~R128_HOST_BIG_ENDIAN_EN);
+#endif
+
     R128WaitForIdle(pScrn);
 }
 
-/* Initialize XAA for supported acceleration and also initialize the
-   graphics hardware for acceleration. */
-Bool R128AccelInit(ScreenPtr pScreen)
+#ifdef XF86DRI
+    /* FIXME: When direct rendering is enabled, we should use the CCE to
+       draw 2D commands */
+static void R128CCEAccelInit(ScrnInfoPtr pScrn, XAAInfoRecPtr a)
 {
-    ScrnInfoPtr   pScrn = xf86Screens[pScreen->myNum];
-    R128InfoPtr   info  = R128PTR(pScrn);
-    XAAInfoRecPtr a;
+    a->Flags                            = 0;
 
-    if (!(a = info->accel = XAACreateInfoRec())) return FALSE;
-    
+				/* Sync */
+    a->Sync                             = R128CCEWaitForIdle;
+
+}
+#endif
+
+static void R128MMIOAccelInit(ScrnInfoPtr pScrn, XAAInfoRecPtr a)
+{
+    R128InfoPtr info = R128PTR(pScrn);
+
     a->Flags                            = (PIXMAP_CACHE
 					   | OFFSCREEN_PIXMAPS
 					   | LINEAR_FRAMEBUFFER);
@@ -992,7 +1026,15 @@
     a->SubsequentSolidFillRect          = R128SubsequentSolidFillRect;
 
 				/* Screen-to-screen Copy */
-    a->ScreenToScreenCopyFlags          = 0;
+				/* Transparency uses the wrong colors for
+                                   24 bpp mode -- the transparent part is
+                                   correct, but the opaque color is wrong.
+                                   This can be seen with netscape's I-bar
+                                   cursor when editing in the URL location
+                                   box. */
+    a->ScreenToScreenCopyFlags          = ((pScrn->bitsPerPixel == 24)
+					   ? NO_TRANSPARENCY
+					   : 0);
     a->SetupForScreenToScreenCopy       = R128SetupForScreenToScreenCopy;
     a->SubsequentScreenToScreenCopy     = R128SubsequentScreenToScreenCopy;
 
@@ -1039,7 +1081,7 @@
 					  | LINE_PATTERN_POWER_OF_2_ONLY);
 #if R128_CLIPPING
 				/* Clipping. */
-    if (pScrn->depth != 8 && info->pixel_code != 24) {
+    if (info->CurrentLayout.depth != 8 && info->CurrentLayout.pixel_code != 24) {
 				/* There is one xtest error in 8bpp and
                                    many xtest errors in 24/24 that do not
                                    appear at other depths. */
@@ -1065,7 +1107,26 @@
 					  | SCANLINE_PAD_DWORD
 					  | SYNC_AFTER_IMAGE_WRITE);
 #endif
-    
+}
+
+/* Initialize XAA for supported acceleration and also initialize the
+   graphics hardware for acceleration. */
+Bool R128AccelInit(ScreenPtr pScreen)
+{
+    ScrnInfoPtr   pScrn = xf86Screens[pScreen->myNum];
+    R128InfoPtr   info  = R128PTR(pScrn);
+    XAAInfoRecPtr a;
+
+    if (!(a = info->accel = XAACreateInfoRec())) return FALSE;
+
+#ifdef XF86DRI
+    /* FIXME: When direct rendering is enabled, we should use the CCE to
+       draw 2D commands */
+    if (info->CCE2D) R128CCEAccelInit(pScrn, a);
+    else
+#endif
+	R128MMIOAccelInit(pScrn, a);
+
     R128EngineInit(pScrn);
     return XAAInit(pScreen, a);
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_cursor.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/r128/r128_cursor.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/r128/r128_cursor.c:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/r128/r128_cursor.c:1.6	Mon Mar  6 14:59:26 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_cursor.c	Fri Jun 16 17:27:32 2000
@@ -1,8 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_cursor.c,v 1.6 2000/03/06 22:59:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_cursor.c,v 1.9 2000/06/17 00:27:32 dawes Exp $ */
 /**************************************************************************
 
-Copyright 1999 ATI Technologies Inc. and Precision Insight, Inc.,
-                                         Cedar Park, Texas. 
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -60,6 +60,19 @@
 				/* DDC support */
 #include "xf86DDC.h"
 
+				/* DRI support */
+#ifdef XF86DRI
+#include "GL/glxint.h"
+#include "xf86drm.h"
+#include "sarea.h"
+#define _XF86DRI_SERVER_
+#include "xf86dri.h"
+#include "dri.h"
+#include "r128_dri.h"
+#include "r128_dripriv.h"
+#include "r128_sarea.h"
+#endif
+
 				/* Driver data structures */
 #include "r128.h"
 #include "r128_reg.h"
@@ -92,16 +105,19 @@
    (xorigin,yorigin). */
 static void R128SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
 {
-    R128InfoPtr   info    = R128PTR(pScrn);
-    int           xorigin = 0;
-    int           yorigin = 0;
-    int           total_y = pScrn->frameY1 - pScrn->frameY0;
+    R128InfoPtr           info    = R128PTR(pScrn);
+    xf86CursorInfoPtr     cursor  = info->cursor;
+    int                   xorigin = 0;
+    int                   yorigin = 0;
+    int                   total_y = pScrn->frameY1 - pScrn->frameY0;
     R128MMIO_VARS();
     
-    if (x < 0)                   xorigin = -x;
-    if (y < 0)                   yorigin = -y;
-    if (y > total_y)             y       = total_y;
-    if (info->Flags & V_DBLSCAN) y       *= 2;
+    if (x < 0)                        xorigin = -x;
+    if (y < 0)                        yorigin = -y;
+    if (y > total_y)                  y       = total_y;
+    if (info->Flags & V_DBLSCAN)      y       *= 2;
+    if (xorigin >= cursor->MaxWidth)  xorigin = cursor->MaxWidth - 1;
+    if (yorigin >= cursor->MaxHeight) yorigin = cursor->MaxHeight - 1;
 
     OUTREG(R128_CUR_HORZ_VERT_OFF,  R128_CUR_LOCK | (xorigin << 16) | yorigin);
     OUTREG(R128_CUR_HORZ_VERT_POSN, (R128_CUR_LOCK
@@ -125,48 +141,59 @@
     OUTREG(R128_CRTC_GEN_CNTL, save & ~R128_CRTC_CUR_EN);
  
 #if X_BYTE_ORDER == X_BIG_ENDIAN
-    switch(info->pixel_bytes) {
-       case 4:
-       case 3:
-          for (y = 0; y < 64; y++) {
-             P_SWAP32(d,s);
-             d++; s++;
-             P_SWAP32(d,s);
-             d++; s++;
-             P_SWAP32(d,s);
-             d++; s++;
-             P_SWAP32(d,s);
-             d++; s++;
-          }
-          break;
-       case 2:
-          for (y = 0; y < 64; y++) {
-             P_SWAP16(d,s);
-             d++; s++;
-             P_SWAP16(d,s);
-             d++; s++;
-             P_SWAP16(d,s);
-             d++; s++;
-             P_SWAP16(d,s);
-             d++; s++;
-          }
-          break;
-      default:
-         for (y = 0; y < 64; y++) {
+    switch(info->CurrentLayout.pixel_bytes) {
+    case 4:
+    case 3:
+	for (y = 0; y < 64; y++) {
+	    P_SWAP32(d,s);
+	    d++; s++;
+	    P_SWAP32(d,s);
+	    d++; s++;
+	    P_SWAP32(d,s);
+	    d++; s++;
+	    P_SWAP32(d,s);
+	    d++; s++;
+	}
+	break;
+    case 2:
+	for (y = 0; y < 64; y++) {
+	    P_SWAP16(d,s);
+	    d++; s++;
+	    P_SWAP16(d,s);
+	    d++; s++;
+	    P_SWAP16(d,s);
+	    d++; s++;
+	    P_SWAP16(d,s);
+	    d++; s++;
+	}
+	break;
+    default:
+	for (y = 0; y < 64; y++) {
             *d++ = *s++;
             *d++ = *s++;
             *d++ = *s++;
             *d++ = *s++;
-         }
+	}
     }
 #else
-   for (y = 0; y < 64; y++) {
+    for (y = 0; y < 64; y++) {
 	*d++ = *s++;
 	*d++ = *s++;
 	*d++ = *s++;
 	*d++ = *s++;
     }
 #endif
+
+    /* Set the area after the cursor to be all transparent so that we
+       won't display corrupted cursors on the screen */
+    for (y = 0; y < 64; y++) {
+	*d++ = 0xffffffff; /* The AND bits */
+	*d++ = 0xffffffff;
+	*d++ = 0x00000000; /* The XOR bits */
+	*d++ = 0x00000000;
+    }
+
+   
     OUTREG(R128_CRTC_GEN_CNTL, save);
 }
 
@@ -204,6 +231,7 @@
     FBAreaPtr             fbarea;
     int                   width;
     int                   height;
+    int                   size;
 
 
     if (!(cursor = info->cursor = xf86CreateCursorInfoRec())) return FALSE;
@@ -227,8 +255,9 @@
     cursor->ShowCursor        = R128ShowCursor;
     cursor->UseHWCursor       = R128UseHWCursor;
 
+    size                      = (cursor->MaxWidth/4) * cursor->MaxHeight;
     width                     = pScrn->displayWidth;
-    height                    = (1024 + 1023) / pScrn->displayWidth;
+    height                    = (size*2 + 1023) / pScrn->displayWidth;
     fbarea                    = xf86AllocateOffscreenArea(pScreen,
 							  width,
 							  height,
@@ -245,8 +274,8 @@
     } else {
 	info->cursor_start    = R128_ALIGN((fbarea->box.x1
 					    + width * fbarea->box.y1)
-					   * info->pixel_bytes, 16);
-	info->cursor_end      = info->cursor_start + 1024;
+					   * info->CurrentLayout.pixel_bytes, 16);
+	info->cursor_end      = info->cursor_start + size;
     }
 
     R128TRACE(("R128CursorInit (0x%08x-0x%08x)\n",
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dga.c:1.2
--- /dev/null	Sat Jul  1 20:42:54 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dga.c	Fri Jun 16 17:03:22 2000
@@ -0,0 +1,378 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dga.c,v 1.2 2000/06/17 00:03:22 martin Exp $ */
+/*
+ * Authors:
+ *   Ove Kåven <ovek@transgaming.com>,
+ *    borrowing some code from the Chips and MGA drivers.
+ */
+
+				/* X and server generic header files */
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+				/* PCI support */
+#include "xf86Pci.h"
+#include "xf86PciInfo.h"
+
+				/* DDC support */
+#include "xf86DDC.h"
+
+				/* XAA and Cursor Support */
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xf86Cursor.h"
+
+				/* DRI support */
+#ifdef XF86DRI
+#include "GL/glxint.h"
+#include "xf86drm.h"
+#include "sarea.h"
+#define _XF86DRI_SERVER_
+#include "xf86dri.h"
+#include "dri.h"
+#include "r128_dri.h"
+#include "r128_dripriv.h"
+#include "r128_sarea.h"
+#endif
+
+				/* Driver data structures */
+#include "r128.h"
+
+				/* DGA support */
+#include "dgaproc.h"
+
+
+static Bool R128_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+					int *, int *, int *);
+static Bool R128_SetMode(ScrnInfoPtr, DGAModePtr);
+static int  R128_GetViewport(ScrnInfoPtr);
+static void R128_SetViewport(ScrnInfoPtr, int, int, int);
+static void R128_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+static void R128_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+static void R128_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, 
+					unsigned long);
+
+static
+DGAFunctionRec R128_DGAFuncs = {
+   R128_OpenFramebuffer,
+   NULL,
+   R128_SetMode,
+   R128_SetViewport,
+   R128_GetViewport,
+   R128WaitForIdle,
+   R128_FillRect,
+   R128_BlitRect,
+#if 0
+   R128_BlitTransRect
+#else
+   NULL
+#endif
+};
+
+
+static DGAModePtr
+R128SetupDGAMode(
+   ScrnInfoPtr pScrn,
+   DGAModePtr modes,
+   int *num,
+   int bitsPerPixel,
+   int depth,
+   Bool pixmap,
+   int secondPitch,
+   unsigned long red,
+   unsigned long green,
+   unsigned long blue,
+   short visualClass
+){ 
+   R128InfoPtr info = R128PTR(pScrn);
+   DGAModePtr newmodes = NULL, currentMode;
+   DisplayModePtr pMode, firstMode;
+   int otherPitch, Bpp = bitsPerPixel >> 3;
+   Bool oneMore;
+
+   pMode = firstMode = pScrn->modes;
+
+   while(pMode) {
+
+	otherPitch = secondPitch ? secondPitch : pMode->HDisplay;
+
+	if(pMode->HDisplay != otherPitch) {
+	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
+	    oneMore = TRUE;
+	} else {
+	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
+	    oneMore = FALSE;
+	}
+
+	if(!newmodes) {
+	   xfree(modes);
+	   return NULL;
+	}
+	modes = newmodes;
+
+SECOND_PASS:
+
+	currentMode = modes + *num;
+	(*num)++;
+
+	currentMode->mode = pMode;
+	/* FIXME: is concurrent access really possible? */
+	currentMode->flags = DGA_CONCURRENT_ACCESS;
+	if(pixmap)
+	   currentMode->flags |= DGA_PIXMAP_AVAILABLE;
+	if(info->accel)
+	   currentMode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
+	if(pMode->Flags & V_DBLSCAN)
+	   currentMode->flags |= DGA_DOUBLESCAN;
+	if(pMode->Flags & V_INTERLACE)
+	   currentMode->flags |= DGA_INTERLACED;
+	currentMode->byteOrder = pScrn->imageByteOrder;
+	currentMode->depth = depth;
+	currentMode->bitsPerPixel = bitsPerPixel;
+	currentMode->red_mask = red;
+	currentMode->green_mask = green;
+	currentMode->blue_mask = blue;
+	currentMode->visualClass = visualClass;
+	currentMode->viewportWidth = pMode->HDisplay;
+	currentMode->viewportHeight = pMode->VDisplay;
+	currentMode->xViewportStep = 8;
+	currentMode->yViewportStep = 1;
+	currentMode->viewportFlags = DGA_FLIP_RETRACE;
+	currentMode->offset = 0;
+	currentMode->address = (unsigned char*)info->LinearAddr;
+
+	if(oneMore) { /* first one is narrow width */
+	    currentMode->bytesPerScanline = ((pMode->HDisplay * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pMode->HDisplay;
+	    currentMode->imageHeight = pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	    oneMore = FALSE;
+	    goto SECOND_PASS;
+	} else {
+	    currentMode->bytesPerScanline = ((otherPitch * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = otherPitch;
+	    currentMode->imageHeight = pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	}	    
+
+	pMode = pMode->next;
+	if(pMode == firstMode)
+	   break;
+   }
+
+   return modes;
+}
+
+
+Bool
+R128DGAInit(ScreenPtr pScreen)
+{   
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   R128InfoPtr info = R128PTR(pScrn);
+   DGAModePtr modes = NULL;
+   int num = 0;
+
+   /* 8 */
+   modes = R128SetupDGAMode (pScrn, modes, &num, 8, 8,
+		(pScrn->bitsPerPixel == 8),
+		(pScrn->bitsPerPixel != 8) ? 0 : pScrn->displayWidth,
+		0, 0, 0, PseudoColor);
+
+   /* 15 */
+   modes = R128SetupDGAMode (pScrn, modes, &num, 16, 15,
+		(pScrn->bitsPerPixel == 16),
+		(pScrn->depth != 15) ? 0 : pScrn->displayWidth,
+		0x7c00, 0x03e0, 0x001f, TrueColor);
+
+   modes = R128SetupDGAMode (pScrn, modes, &num, 16, 15,
+		(pScrn->bitsPerPixel == 16),
+		(pScrn->depth != 15) ? 0 : pScrn->displayWidth,
+		0x7c00, 0x03e0, 0x001f, DirectColor);
+
+   /* 16 */
+   modes = R128SetupDGAMode (pScrn, modes, &num, 16, 16,
+		(pScrn->bitsPerPixel == 16),
+		(pScrn->depth != 16) ? 0 : pScrn->displayWidth,
+		0xf800, 0x07e0, 0x001f, TrueColor);
+
+   modes = R128SetupDGAMode (pScrn, modes, &num, 16, 16,
+		(pScrn->bitsPerPixel == 16),
+		(pScrn->depth != 16) ? 0 : pScrn->displayWidth,
+		0xf800, 0x07e0, 0x001f, DirectColor);
+
+   /* 24 */
+   modes = R128SetupDGAMode (pScrn, modes, &num, 24, 24,
+		(pScrn->bitsPerPixel == 24),
+		(pScrn->bitsPerPixel != 24) ? 0 : pScrn->displayWidth,
+		0xff0000, 0x00ff00, 0x0000ff, TrueColor);
+
+   modes = R128SetupDGAMode (pScrn, modes, &num, 24, 24,
+		(pScrn->bitsPerPixel == 24),
+		(pScrn->bitsPerPixel != 24) ? 0 : pScrn->displayWidth,
+		0xff0000, 0x00ff00, 0x0000ff, DirectColor);
+
+   /* 32 */
+   modes = R128SetupDGAMode (pScrn, modes, &num, 32, 24,
+		(pScrn->bitsPerPixel == 32),
+		(pScrn->bitsPerPixel != 32) ? 0 : pScrn->displayWidth,
+		0xff0000, 0x00ff00, 0x0000ff, TrueColor);
+
+   modes = R128SetupDGAMode (pScrn, modes, &num, 32, 24,
+		(pScrn->bitsPerPixel == 32),
+		(pScrn->bitsPerPixel != 32) ? 0 : pScrn->displayWidth,
+		0xff0000, 0x00ff00, 0x0000ff, DirectColor);
+
+   info->numDGAModes = num;
+   info->DGAModes = modes;
+
+   return DGAInit(pScreen, &R128_DGAFuncs, modes, num);
+}
+
+
+static Bool
+R128_SetMode(
+   ScrnInfoPtr pScrn,
+   DGAModePtr pMode
+){
+   static R128FBLayout SavedLayouts[MAXSCREENS];
+   int index = pScrn->pScreen->myNum;
+   R128InfoPtr info = R128PTR(pScrn);
+
+   if(!pMode) { /* restore the original mode */
+	/* put the ScreenParameters back */
+	if(info->DGAactive)
+	    memcpy(&info->CurrentLayout, &SavedLayouts[index], sizeof(R128FBLayout));
+
+	pScrn->currentMode = info->CurrentLayout.mode;
+
+        R128SwitchMode(index, pScrn->currentMode, 0);
+	R128AdjustFrame(index, 0, 0, 0);
+	info->DGAactive = FALSE;
+   } else {
+	if(!info->DGAactive) {  /* save the old parameters */
+	    memcpy(&SavedLayouts[index], &info->CurrentLayout, sizeof(R128FBLayout));
+	    info->DGAactive = TRUE;
+	}
+                                                              
+	info->CurrentLayout.bitsPerPixel = pMode->bitsPerPixel;
+	info->CurrentLayout.depth = pMode->depth;
+	info->CurrentLayout.displayWidth = pMode->bytesPerScanline / 
+					    (pMode->bitsPerPixel >> 3);
+	info->CurrentLayout.pixel_bytes = pMode->bitsPerPixel / 8;
+	info->CurrentLayout.pixel_code  = (pMode->bitsPerPixel != 16
+					  ? pMode->bitsPerPixel
+					  : pMode->depth);
+	/* R128ModeInit() will set the mode field */
+
+        R128SwitchMode(index, pMode->mode, 0);
+   }
+   
+   return TRUE;
+}
+
+
+
+static int  
+R128_GetViewport(
+  ScrnInfoPtr pScrn
+){
+    R128InfoPtr info = R128PTR(pScrn);
+
+    return info->DGAViewportStatus;
+}
+
+
+static void 
+R128_SetViewport(
+   ScrnInfoPtr pScrn, 
+   int x, int y, 
+   int flags
+){
+   R128InfoPtr info = R128PTR(pScrn);
+
+   R128AdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+   info->DGAViewportStatus = 0;  /* FIXME */
+}
+
+
+static void 
+R128_FillRect (
+   ScrnInfoPtr pScrn, 
+   int x, int y, int w, int h, 
+   unsigned long color
+){
+    R128InfoPtr info = R128PTR(pScrn);
+
+    if(info->accel) {
+	(*info->accel->SetupForSolidFill)(pScrn, color, GXcopy, ~0);
+	(*info->accel->SubsequentSolidFillRect)(pScrn, x, y, w, h);
+	SET_SYNC_FLAG(info->accel);
+    }
+}
+
+static void 
+R128_BlitRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty
+){
+    R128InfoPtr info = R128PTR(pScrn);
+
+    if(info->accel) {
+	int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
+	int ydir = (srcy < dsty) ? -1 : 1;
+
+	(*info->accel->SetupForScreenToScreenCopy)(
+		pScrn, xdir, ydir, GXcopy, ~0, -1);
+	(*info->accel->SubsequentScreenToScreenCopy)(
+		pScrn, srcx, srcy, dstx, dsty, w, h);
+	SET_SYNC_FLAG(info->accel);
+    }
+}
+
+
+static void 
+R128_BlitTransRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty,
+   unsigned long color
+){
+  /* this one should be separate since the XAA function would
+     prohibit usage of ~0 as the key */
+}
+
+
+static Bool 
+R128_OpenFramebuffer(
+   ScrnInfoPtr pScrn, 
+   char **name,
+   unsigned char **mem,
+   int *size,
+   int *offset,
+   int *flags
+){
+    R128InfoPtr info = R128PTR(pScrn);
+
+    *name = NULL; 		/* no special device */
+    *mem = (unsigned char*)info->LinearAddr;
+    *size = info->FbMapSize;
+    *offset = 0;
+    *flags = /* DGA_NEED_ROOT */ 0; /* don't need root, just /dev/mem access */
+
+    return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.c:1.4
--- /dev/null	Sat Jul  1 20:42:54 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.c	Sun Jun 25 22:41:32 2000
@@ -0,0 +1,1289 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.c,v 1.4 2000/06/26 05:41:32 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Rickard E. Faith <faith@precisioninsight.com>
+ *   Daryll Strauss <daryll@precisioninsight.com>
+ *
+ */
+
+
+				/* X and server generic header files */
+#include "xf86.h"
+#include "xf86_ansic.h"
+#include "xf86_OSproc.h"
+#include "xf86Resources.h"
+#include "xf86RAC.h"
+#include "xf86cmap.h"
+#include "xf86fbman.h"
+
+				/* Backing store, software cursor, and
+                                   colormap initialization */
+#include "mibstore.h"
+#include "mipointer.h"
+#include "micmap.h"
+
+				/* CFB support */
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb16.h"
+#include "cfb24.h"
+#include "cfb32.h"
+#include "cfb24_32.h"
+
+				/* XAA and Cursor Support */
+#include "xaa.h"
+#include "xf86Cursor.h"
+
+				/* PCI support */
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+
+				/* DDC support */
+#include "xf86DDC.h"
+
+				/* DRI support */
+#include "GL/glxint.h"
+#include "GL/glxtokens.h"
+#include "xf86drm.h"
+#include "xf86drmR128.h"
+#include "sarea.h"
+#define _XF86DRI_SERVER_
+#include "xf86dri.h"
+#include "dri.h"
+#include "r128_dri.h"
+#include "r128_sarea.h"
+#include "r128_dripriv.h"
+
+				/* Driver data structures */
+#include "r128.h"
+#include "r128_reg.h"
+
+#define R128_WATERMARK_L      16
+#define R128_WATERMARK_M       8
+#define R128_WATERMARK_N       8
+#define R128_WATERMARK_K     128
+
+static int CCEFifoSlots = 0;
+
+#define R128CCEWaitForFifo(pScrn, entries)                                   \
+do {                                                                         \
+    if (CCEFifoSlots < entries) R128WaitForFifoFunction(pScrn, entries);     \
+    CCEFifoSlots -= entries;                                                 \
+} while (0)
+
+/* Wait for at least `entries' slots are free.  The actual number of
+   slots available is stored in info->CCEFifoSize. */
+static void R128CCEWaitForFifoFunction(ScrnInfoPtr pScrn, int entries)
+{
+    R128InfoPtr    info     = R128PTR(pScrn);
+    unsigned char *R128MMIO = info->MMIO;
+    int            i;
+
+    for (;;) {
+	for (i = 0; i < R128_TIMEOUT; i++) {
+	    CCEFifoSlots = INREG(R128_PM4_STAT) & R128_PM4_FIFOCNT_MASK;
+	    if (CCEFifoSlots >= entries) return;
+	}
+	R128EngineReset(pScrn);
+	if (info->CCE2D) R128CCEStart(pScrn);
+    }
+}
+
+/* Wait until the CCE is completely idle: the FIFO has drained and the
+   CCE is idle. */
+void R128CCEWaitForIdle(ScrnInfoPtr pScrn)
+{
+    R128InfoPtr    info     = R128PTR(pScrn);
+    unsigned char *R128MMIO = info->MMIO;
+    int            i;
+
+    if (!info->CCEInUse || info->CCEMode == R128_PM4_NONPM4) return;
+
+    if (R128CCE_USE_RING_BUFFER(info->CCEMode)) {
+	volatile CARD32 *r128RingReadPtr =
+	    (volatile CARD32 *)(info->ringReadPtr);
+	R128SAREAPrivPtr pSAREAPriv;
+
+	OUTREGP(R128_PM4_BUFFER_DL_WPTR,
+		R128_PM4_BUFFER_DL_DONE, ~R128_PM4_BUFFER_DL_DONE);
+
+	pSAREAPriv = (R128SAREAPrivPtr)DRIGetSAREAPrivate(pScrn->pScreen);
+
+	for (;;) {
+	    for (i = 0; i < R128_TIMEOUT; i++) {
+		if (*r128RingReadPtr == pSAREAPriv->ringWrite) {
+		    int pm4stat = INREG(R128_PM4_STAT);
+		    if ((pm4stat & R128_PM4_FIFOCNT_MASK) >= info->CCEFifoSize
+			&& !(pm4stat & (R128_PM4_BUSY|R128_PM4_GUI_ACTIVE))) {
+			R128EngineFlush(pScrn);
+			return;
+		    }
+		}
+	    }
+	    R128EngineReset(pScrn);
+	    if (info->CCE2D) R128CCEStart(pScrn);
+	}
+    } else {
+	R128CCEWaitForFifoFunction(pScrn, info->CCEFifoSize);
+
+	for (;;) {
+	    for (i = 0; i < R128_TIMEOUT; i++) {
+		if (!(INREG(R128_PM4_STAT)
+		      & (R128_PM4_BUSY | R128_PM4_GUI_ACTIVE))) {
+		    R128EngineFlush(pScrn);
+		    return;
+		}
+	    }
+	    R128EngineReset(pScrn);
+	    if (info->CCE2D) R128CCEStart(pScrn);
+	}
+    }
+}
+
+/* Reset the ring buffer status, if the engine was reset */
+void R128CCEResetRing(ScrnInfoPtr pScrn)
+{
+    R128InfoPtr       info            = R128PTR(pScrn);
+    unsigned char    *R128MMIO        = info->MMIO;
+    R128SAREAPrivPtr  pSAREAPriv;
+    volatile CARD32  *r128RingReadPtr;
+
+    if (!info->CCEInUse || info->CCEMode == R128_PM4_NONPM4) return;
+
+    r128RingReadPtr = (volatile CARD32 *)(info->ringReadPtr);
+    pSAREAPriv      = (R128SAREAPrivPtr)DRIGetSAREAPrivate(pScrn->pScreen);
+
+    OUTREG(R128_PM4_BUFFER_DL_WPTR, 0);
+    OUTREG(R128_PM4_BUFFER_DL_RPTR, 0);
+    pSAREAPriv->ringWrite = 0;
+    *r128RingReadPtr = 0;
+
+    /* Resetting the ring turns off the CCE */
+    info->CCEInUse = FALSE;
+}
+
+/* Start the CCE, but only if it is not already in use and the requested
+   mode is a CCE mode.  The mode is stored in info->CCEMode. */
+void R128CCEStart(ScrnInfoPtr pScrn)
+{
+    R128InfoPtr    info     = R128PTR(pScrn);
+    unsigned char *R128MMIO = info->MMIO;
+
+    if (info->CCEInUse || info->CCEMode == R128_PM4_NONPM4) return;
+
+    R128WaitForIdle(pScrn);
+    OUTREG(R128_PM4_BUFFER_CNTL, info->CCEMode | info->ringSizeLog2QW);
+    (void)INREG(R128_PM4_BUFFER_ADDR); /* as per the sample code */
+    OUTREG(R128_PM4_MICRO_CNTL, R128_PM4_MICRO_FREERUN);
+    info->CCEInUse = TRUE;
+}
+
+/* Stop the CCE, but only if it is in use and the requested mode is not
+   the non-CCE mode.  This function also flushes any outstanding
+   requests before switching modes.*/
+void R128CCEStop(ScrnInfoPtr pScrn)
+{
+    R128InfoPtr    info     = R128PTR(pScrn);
+    unsigned char *R128MMIO = info->MMIO;
+
+    if (!info->CCEInUse || info->CCEMode == R128_PM4_NONPM4) return;
+
+    R128CCEWaitForIdle(pScrn);
+    OUTREG(R128_PM4_MICRO_CNTL, 0);
+    OUTREG(R128_PM4_BUFFER_CNTL, R128_PM4_NONPM4);
+    R128EngineReset(pScrn);
+    info->CCEInUse = FALSE;
+}
+
+/* Initialize the visual configs that are supported by the hardware.
+   These are combined with the visual configs that the indirect
+   rendering core supports, and the intersection is exported to the
+   client. */
+static Bool R128InitVisualConfigs(ScreenPtr pScreen)
+{
+    ScrnInfoPtr       pScrn            = xf86Screens[pScreen->myNum];
+    R128InfoPtr       pR128            = R128PTR(pScrn);
+    int               numConfigs       = 0;
+    __GLXvisualConfig *pConfigs        = 0;
+    R128ConfigPrivPtr pR128Configs     = 0;
+    R128ConfigPrivPtr *pR128ConfigPtrs = 0;
+    int               i, accum, stencil;
+    
+    switch (pR128->CurrentLayout.pixel_code) {
+    case 8:  /* 8bpp mode is not support */
+    case 15: /* FIXME?? */
+    case 24: /* FIXME?? */
+	return FALSE;
+
+#define R128_USE_ACCUM   1
+#define R128_USE_STENCIL 1
+
+    case 16:
+	numConfigs = 1;
+	if (R128_USE_ACCUM)   numConfigs *= 2;
+	if (R128_USE_STENCIL) numConfigs *= 2;
+	
+	if (!(pConfigs
+	      = (__GLXvisualConfig*)xnfcalloc(sizeof(__GLXvisualConfig),
+					      numConfigs))) {
+	    return FALSE;
+	}
+	if (!(pR128Configs
+	      = (R128ConfigPrivPtr)xnfcalloc(sizeof(R128ConfigPrivRec),
+					     numConfigs))) {
+	    xfree(pConfigs);
+	    return FALSE;
+	}
+	if (!(pR128ConfigPtrs
+	      = (R128ConfigPrivPtr*)xnfcalloc(sizeof(R128ConfigPrivPtr),
+					      numConfigs))) {
+	    xfree(pConfigs);
+	    xfree(pR128Configs);
+	    return FALSE;
+	}
+	
+	i = 0;
+	for (accum = 0; accum <= R128_USE_ACCUM; accum++) {
+	    for (stencil = 0; stencil <= R128_USE_STENCIL; stencil++) {
+		pR128ConfigPtrs[i] = &pR128Configs[i];
+
+		pConfigs[i].vid                = -1;
+		pConfigs[i].class              = -1;
+		pConfigs[i].rgba               = TRUE;
+		pConfigs[i].redSize            = 5;
+		pConfigs[i].greenSize          = 6;
+		pConfigs[i].blueSize           = 5;
+		pConfigs[i].alphaSize          = 0;
+		pConfigs[i].redMask            = 0x0000F800;
+		pConfigs[i].greenMask          = 0x000007E0;
+		pConfigs[i].blueMask           = 0x0000001F;
+		pConfigs[i].alphaMask          = 0x00000000;
+		if (accum) { /* Simulated in software */
+		    pConfigs[i].accumRedSize   = 16;
+		    pConfigs[i].accumGreenSize = 16;
+		    pConfigs[i].accumBlueSize  = 16;
+		    pConfigs[i].accumAlphaSize = 0;
+		} else {
+		    pConfigs[i].accumRedSize   = 0;
+		    pConfigs[i].accumGreenSize = 0;
+		    pConfigs[i].accumBlueSize  = 0;
+		    pConfigs[i].accumAlphaSize = 0;
+		}
+		pConfigs[i].doubleBuffer       = TRUE;
+		pConfigs[i].stereo             = FALSE;
+		pConfigs[i].bufferSize         = 16;
+		pConfigs[i].depthSize          = 16;
+		if (stencil)
+		    pConfigs[i].stencilSize    = 8; /* Simulated in software */
+		else
+		    pConfigs[i].stencilSize    = 0;
+		pConfigs[i].auxBuffers         = 0;
+		pConfigs[i].level              = 0;
+		pConfigs[i].visualRating       = GLX_NONE_EXT;
+		pConfigs[i].transparentPixel   = GLX_NONE;
+		pConfigs[i].transparentRed     = 0;
+		pConfigs[i].transparentGreen   = 0;
+		pConfigs[i].transparentBlue    = 0;
+		pConfigs[i].transparentAlpha   = 0;
+		pConfigs[i].transparentIndex   = 0;
+		i++;
+	    }
+	}
+	break;
+    case 32:
+	numConfigs = 1;
+	if (R128_USE_ACCUM)   numConfigs *= 2;
+	if (R128_USE_STENCIL) numConfigs *= 2;
+	
+	if (!(pConfigs
+	      = (__GLXvisualConfig*)xnfcalloc(sizeof(__GLXvisualConfig),
+					      numConfigs))) {
+	    return FALSE;
+	}
+	if (!(pR128Configs
+	      = (R128ConfigPrivPtr)xnfcalloc(sizeof(R128ConfigPrivRec),
+					     numConfigs))) {
+	    xfree(pConfigs);
+	    return FALSE;
+	}
+	if (!(pR128ConfigPtrs
+	      = (R128ConfigPrivPtr*)xnfcalloc(sizeof(R128ConfigPrivPtr),
+					      numConfigs))) {
+	    xfree(pConfigs);
+	    xfree(pR128Configs);
+	    return FALSE;
+	}
+	
+	i = 0;
+	for (accum = 0; accum <= R128_USE_ACCUM; accum++) {
+	    for (stencil = 0; stencil <= R128_USE_STENCIL; stencil++) {
+		pR128ConfigPtrs[i] = &pR128Configs[i];
+
+		pConfigs[i].vid                = -1;
+		pConfigs[i].class              = -1;
+		pConfigs[i].rgba               = TRUE;
+		pConfigs[i].redSize            = 8;
+		pConfigs[i].greenSize          = 8;
+		pConfigs[i].blueSize           = 8;
+		pConfigs[i].alphaSize          = 8;
+		pConfigs[i].redMask            = 0x00FF0000;
+		pConfigs[i].greenMask          = 0x0000FF00;
+		pConfigs[i].blueMask           = 0x000000FF;
+		pConfigs[i].alphaMask          = 0xFF000000;
+		if (accum) { /* Simulated in software */
+		    pConfigs[i].accumRedSize   = 16;
+		    pConfigs[i].accumGreenSize = 16;
+		    pConfigs[i].accumBlueSize  = 16;
+		    pConfigs[i].accumAlphaSize = 16;
+		} else {
+		    pConfigs[i].accumRedSize   = 0;
+		    pConfigs[i].accumGreenSize = 0;
+		    pConfigs[i].accumBlueSize  = 0;
+		    pConfigs[i].accumAlphaSize = 0;
+		}
+		pConfigs[i].doubleBuffer       = TRUE;
+		pConfigs[i].stereo             = FALSE;
+		pConfigs[i].bufferSize         = 24;
+		if (stencil) {
+		    pConfigs[i].depthSize      = 24;
+		    pConfigs[i].stencilSize    = 8;
+		} else {
+		    pConfigs[i].depthSize      = 32;
+		    pConfigs[i].stencilSize    = 0;
+		}
+		pConfigs[i].auxBuffers         = 0;
+		pConfigs[i].level              = 0;
+		pConfigs[i].visualRating       = GLX_NONE_EXT;
+		pConfigs[i].transparentPixel   = GLX_NONE;
+		pConfigs[i].transparentRed     = 0;
+		pConfigs[i].transparentGreen   = 0;
+		pConfigs[i].transparentBlue    = 0;
+		pConfigs[i].transparentAlpha   = 0;
+		pConfigs[i].transparentIndex   = 0;
+		i++;
+	    }
+	}
+	break;
+    }
+    
+    pR128->numVisualConfigs   = numConfigs;
+    pR128->pVisualConfigs     = pConfigs;
+    pR128->pVisualConfigsPriv = pR128Configs;
+    GlxSetVisualConfigs(numConfigs, pConfigs, (void**)pR128ConfigPtrs);
+    return TRUE;
+}
+
+/* Create the Rage 128-specific context information */
+static Bool R128CreateContext(ScreenPtr pScreen, VisualPtr visual, 
+			      drmContext hwContext, void *pVisualConfigPriv,
+			      DRIContextType contextStore)
+{
+    /* Nothing yet */
+    return TRUE;
+}
+
+/* Destroy the Rage 128-specific context information */
+static void R128DestroyContext(ScreenPtr pScreen, drmContext hwContext, 
+			       DRIContextType contextStore)
+{
+    /* Nothing yet */
+}
+
+/* Called when the X server is woken up to allow the last client's
+   context to be saved and the X server's context to be loaded.  This is
+   not necessary for the Rage 128 since the client detects when it's
+   context is not currently loaded and then load's it itself.  Since the
+   registers to start and stop the CCE are privileged, only the X server
+   can start/stop the engine. */
+static void R128EnterServer(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    R128InfoPtr pR128 = R128PTR(pScrn);
+
+    if (pR128->accel) pR128->accel->NeedToSync = TRUE;
+
+#if 1
+    if (!pR128->CCE2D) R128CCEStop(pScrn);
+#else
+    if (pR128->CCE2D) R128CCEWaitForIdle(pScrn);
+    else              R128CCEStop(pScrn);
+#endif
+}
+
+/* Called when the X server goes to sleep to allow the X server's
+   context to be saved and the last client's context to be loaded.  This
+   is not necessary for the Rage 128 since the client detects when it's
+   context is not currently loaded and then load's it itself.  Since the
+   registers to start and stop the CCE are privileged, only the X server
+   can start/stop the engine. */
+static void R128LeaveServer(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    R128InfoPtr pR128 = R128PTR(pScrn);
+
+#if 1
+    if (!pR128->CCE2D) R128CCEStart(pScrn);
+#else
+    if (pR128->CCE2D) R128CCEWaitForIdle(pScrn);
+    else              R128CCEStart(pScrn);
+#endif
+}
+
+/* Contexts can be swapped by the X server if necessary.  This callback
+   is currently only used to perform any functions necessary when
+   entering or leaving the X server, and in the future might not be
+   necessary. */
+static void R128DRISwapContext(ScreenPtr pScreen, DRISyncType syncType, 
+			       DRIContextType oldContextType, void *oldContext,
+			       DRIContextType newContextType, void *newContext)
+{
+    if ((syncType==DRI_3D_SYNC) && (oldContextType==DRI_2D_CONTEXT) &&
+	(newContextType==DRI_2D_CONTEXT)) { /* Entering from Wakeup */
+	R128EnterServer(pScreen);
+    }
+    if ((syncType==DRI_2D_SYNC) && (oldContextType==DRI_NO_CONTEXT) &&
+	(newContextType==DRI_2D_CONTEXT)) { /* Exiting from Block Handler */
+	R128LeaveServer(pScreen);
+    }
+}
+
+/* Initialize the state of the back and depth buffers. */
+static void R128DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index)
+{
+    /* FIXME: This routine needs to have acceleration turned on */
+    ScreenPtr   pScreen = pWin->drawable.pScreen;
+    ScrnInfoPtr pScrn   = xf86Screens[pScreen->myNum];
+    R128InfoPtr pR128   = R128PTR(pScrn);
+    BoxPtr      pbox;
+    int         nbox;
+    int         depth;
+
+    /* FIXME: Use accel when CCE 2D code is written */
+    if (pR128->CCE2D) return;
+
+    /* FIXME: This should be based on the __GLXvisualConfig info */
+    switch (pScrn->bitsPerPixel) {
+    case  8: depth = 0x000000ff; break;
+    case 16: depth = 0x0000ffff; break;
+    case 24: depth = 0x00ffffff; break;
+    case 32: depth = 0xffffffff; break;
+    default: depth = 0x00000000; break;
+    }
+
+    /* FIXME: Copy XAAPaintWindow() and use REGION_TRANSLATE() */
+    /* FIXME: Only initialize the back and depth buffers for contexts
+       that request them */
+
+    pbox = REGION_RECTS(prgn);
+    nbox = REGION_NUM_RECTS(prgn);
+
+    (*pR128->accel->SetupForSolidFill)(pScrn, 0, GXcopy, -1);
+    for (; nbox; nbox--, pbox++) {
+	(*pR128->accel->SubsequentSolidFillRect)(pScrn,
+						 pbox->x1 + pR128->fbX,
+						 pbox->y1 + pR128->fbY,
+						 pbox->x2 - pbox->x1,
+						 pbox->y2 - pbox->y1);
+	(*pR128->accel->SubsequentSolidFillRect)(pScrn,
+						 pbox->x1 + pR128->backX,
+						 pbox->y1 + pR128->backY,
+						 pbox->x2 - pbox->x1,
+						 pbox->y2 - pbox->y1);
+    }
+
+    (*pR128->accel->SetupForSolidFill)(pScrn, depth, GXcopy, -1);
+    for (; nbox; nbox--, pbox++)
+	(*pR128->accel->SubsequentSolidFillRect)(pScrn,
+						 pbox->x1 + pR128->depthX,
+						 pbox->y1 + pR128->depthY,
+						 pbox->x2 - pbox->x1,
+						 pbox->y2 - pbox->y1);
+
+    pR128->accel->NeedToSync = TRUE;
+}
+
+/* Copy the back and depth buffers when the X server moves a window. */
+static void R128DRIMoveBuffers(WindowPtr pWin, DDXPointRec ptOldOrg, 
+			       RegionPtr prgnSrc, CARD32 index)
+{
+    ScreenPtr   pScreen = pWin->drawable.pScreen;
+    ScrnInfoPtr pScrn   = xf86Screens[pScreen->myNum];
+    R128InfoPtr pR128   = R128PTR(pScrn);
+
+    /* FIXME: This routine needs to have acceleration turned on */
+    /* FIXME: Copy XAACopyWindow() and use REGION_TRANSLATE() */
+    /* FIXME: Only initialize the back and depth buffers for contexts
+       that request them */
+
+    /* FIXME: Use accel when CCE 2D code is written */
+    if (pR128->CCE2D) return;
+}
+
+/* Initialize the AGP state.  Request memory for use in AGP space, and
+   initialize the Rage 128 registers to point to that memory. */
+static Bool R128DRIAgpInit(R128InfoPtr pR128, ScreenPtr pScreen)
+{
+    unsigned char *R128MMIO = pR128->MMIO;
+    unsigned long mode;
+    unsigned int  vendor, device;
+    int           ret;
+    unsigned long cntl;
+    int           s, l;
+    int           flags;
+    
+    if (drmAgpAcquire(pR128->drmFD) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] AGP not available\n");
+	return FALSE;
+    }
+
+				/* Modify the mode if the default mode is
+                                   not appropriate for this particular
+                                   combination of graphics card and AGP
+                                   chipset. */
+
+    mode   = drmAgpGetMode(pR128->drmFD);	/* Default mode */
+    vendor = drmAgpVendorId(pR128->drmFD);
+    device = drmAgpDeviceId(pR128->drmFD);
+
+    mode &= ~R128_AGP_MODE_MASK;
+    switch (pR128->agpMode) {
+    case 2:          mode |= R128_AGP_2X_MODE;
+    case 1: default: mode |= R128_AGP_1X_MODE;
+    }
+
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x]\n",
+	       mode, vendor, device,
+	       pR128->PciInfo->vendor,
+	       pR128->PciInfo->chipType);
+
+    if (drmAgpEnable(pR128->drmFD, mode) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] AGP not enabled\n");
+	drmAgpRelease(pR128->drmFD);
+	return FALSE;
+    }
+
+    pR128->agpOffset = 0;
+
+    if ((ret = drmAgpAlloc(pR128->drmFD, pR128->agpSize*1024*1024, 0, NULL,
+			   &pR128->agpMemHandle)) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Out of memory (%d)\n", ret);
+	drmAgpRelease(pR128->drmFD);
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] %d kB allocated with handle 0x%08x\n",
+	       pR128->agpSize*1024, pR128->agpMemHandle);
+
+    if (drmAgpBind(pR128->drmFD, pR128->agpMemHandle, pR128->agpOffset) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not bind\n");
+	drmAgpFree(pR128->drmFD, pR128->agpMemHandle);
+	drmAgpRelease(pR128->drmFD);
+	return FALSE;
+    }
+
+				/* Initialize the CCE ring buffer data */
+    pR128->ringStart       = pR128->agpOffset;
+    pR128->ringMapSize     = pR128->ringSize*1024*1024 + 4096;
+    pR128->ringSizeLog2QW  = R128MinBits(pR128->ringSize*1024*1024/8) - 1;
+
+    pR128->ringReadOffset  = pR128->ringStart + pR128->ringMapSize;
+    pR128->ringReadMapSize = 4096;
+
+				/* Reserve space for the vertex buffer */
+    pR128->vbStart         = pR128->ringReadOffset + pR128->ringReadMapSize;
+    pR128->vbMapSize       = pR128->vbSize*1024*1024;
+
+				/* Reserve space for the indirect buffer */
+    pR128->indStart        = pR128->vbStart + pR128->vbMapSize;
+    pR128->indMapSize      = pR128->indSize*1024*1024;
+
+				/* Reserve the rest for AGP textures */
+    pR128->agpTexStart     = pR128->indStart + pR128->indMapSize;
+    s = (pR128->agpSize*1024*1024 - pR128->agpTexStart);
+    l = R128MinBits((s-1) / R128_NR_TEX_REGIONS);
+    if (l < R128_LOG_TEX_GRANULARITY) l = R128_LOG_TEX_GRANULARITY;
+    pR128->agpTexMapSize   = (s >> l) << l;
+    pR128->log2AGPTexGran  = l;
+
+    if (pR128->CCESecure) flags = DRM_READ_ONLY;
+    else                  flags = 0;
+
+    if (drmAddMap(pR128->drmFD, pR128->ringStart, pR128->ringMapSize,
+		  DRM_AGP, flags, &pR128->ringHandle) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not add ring mapping\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] ring handle = 0x%08lx\n", pR128->ringHandle);
+
+    if (drmMap(pR128->drmFD, pR128->ringHandle, pR128->ringMapSize,
+	       (drmAddressPtr)&pR128->ring) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not map ring\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] Ring mapped at 0x%08lx\n",
+	       (unsigned long)pR128->ring);
+
+    if (drmAddMap(pR128->drmFD, pR128->ringReadOffset, pR128->ringReadMapSize,
+		  DRM_AGP, flags, &pR128->ringReadPtrHandle) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not add ring read ptr mapping\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] ring read ptr handle = 0x%08lx\n",
+	       pR128->ringReadPtrHandle);
+
+    if (drmMap(pR128->drmFD, pR128->ringReadPtrHandle, pR128->ringReadMapSize,
+	       (drmAddressPtr)&pR128->ringReadPtr) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not map ring read ptr\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] Ring read ptr mapped at 0x%08lx\n",
+	       (unsigned long)pR128->ringReadPtr);
+    
+    if (drmAddMap(pR128->drmFD, pR128->vbStart, pR128->vbMapSize,
+		  DRM_AGP, 0, &pR128->vbHandle) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not add vertex buffers mapping\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] vertex buffers handle = 0x%08lx\n", pR128->vbHandle);
+
+    if (drmMap(pR128->drmFD, pR128->vbHandle, pR128->vbMapSize,
+	       (drmAddressPtr)&pR128->vb) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not map vertex buffers\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] Vertex buffers mapped at 0x%08lx\n",
+	       (unsigned long)pR128->vb);
+    
+    if (drmAddMap(pR128->drmFD, pR128->indStart, pR128->indMapSize,
+		  DRM_AGP, flags, &pR128->indHandle) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not add indirect buffers mapping\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] indirect buffers handle = 0x%08lx\n", pR128->indHandle);
+
+    if (drmMap(pR128->drmFD, pR128->indHandle, pR128->indMapSize,
+	       (drmAddressPtr)&pR128->ind) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not map indirect buffers\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] Indirect buffers mapped at 0x%08lx\n",
+	       (unsigned long)pR128->ind);
+    
+    if (drmAddMap(pR128->drmFD, pR128->agpTexStart, pR128->agpTexMapSize,
+		  DRM_AGP, 0, &pR128->agpTexHandle) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not add AGP texture map mapping\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] AGP texture map handle = 0x%08lx\n",
+	       pR128->agpTexHandle);
+
+    if (drmMap(pR128->drmFD, pR128->agpTexHandle, pR128->agpTexMapSize,
+	       (drmAddressPtr)&pR128->agpTex) < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Could not map AGP texture map\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[agp] AGP Texture map mapped at 0x%08lx\n",
+	       (unsigned long)pR128->agpTex);
+
+				/* Initialize Rage 128's AGP registers */
+    cntl  = INREG(R128_AGP_CNTL);
+    cntl &= ~R128_AGP_APER_SIZE_MASK;
+    switch (pR128->agpSize) {
+    case 256: cntl |= R128_AGP_APER_SIZE_256MB; break;
+    case 128: cntl |= R128_AGP_APER_SIZE_128MB; break;
+    case  64: cntl |= R128_AGP_APER_SIZE_64MB;  break;
+    case  32: cntl |= R128_AGP_APER_SIZE_32MB;  break;
+    case  16: cntl |= R128_AGP_APER_SIZE_16MB;  break;
+    case   8: cntl |= R128_AGP_APER_SIZE_8MB;   break;
+    case   4: cntl |= R128_AGP_APER_SIZE_4MB;   break;
+    default:
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[agp] Illegal aperture size %d kB\n",
+		   pR128->agpSize*1024);
+	return FALSE;
+    }
+    OUTREG(R128_AGP_BASE, pR128->ringHandle); /* Ring buf is at AGP offset 0 */
+    OUTREG(R128_AGP_CNTL, cntl);
+
+    return TRUE;
+}
+
+/* Add a map for the MMIO registers that will be accessed by any
+   DRI-based clients. */
+static Bool R128DRIMapInit(R128InfoPtr pR128, ScreenPtr pScreen)
+{
+    int flags;
+
+    if (pR128->CCESecure) flags = DRM_READ_ONLY;
+    else                  flags = 0;
+
+				/* Map registers */
+    pR128->registerSize = R128_MMIOSIZE;
+    if (drmAddMap(pR128->drmFD, pR128->MMIOAddr, pR128->registerSize,
+		  DRM_REGISTERS, flags, &pR128->registerHandle) < 0) {
+	return FALSE;	
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[drm] register handle = 0x%08lx\n", pR128->registerHandle);
+    
+    return TRUE;
+}
+
+/* Initialize the ring buffer state for use in the X server and any
+   DRI-based clients. */
+static void R128DRICCEInitRingBuffer(ScrnInfoPtr pScrn)
+{
+    R128InfoPtr    info     = R128PTR(pScrn);
+    unsigned char *R128MMIO = info->MMIO;
+    unsigned long  addr;
+
+    /* FIXME: When we use the CCE for the X server, we should move this
+       function (and the support functions above) to r128_accel.c */
+
+				/* The manual (p. 2) says this address is
+                                   in "VM space".  This means it's an
+                                   offset from the start of AGP space. */
+    OUTREG(R128_PM4_BUFFER_OFFSET, info->ringStart | 0x02000000);
+
+    OUTREG(R128_PM4_BUFFER_DL_WPTR, 0);
+    OUTREG(R128_PM4_BUFFER_DL_RPTR, 0);
+
+				/* DL_RPTR_ADDR is a physical address.
+                                   This should be in the SAREA. */
+    *(volatile long unsigned *)(info->ringReadPtr) = 0;
+    OUTREG(R128_PM4_BUFFER_DL_RPTR_ADDR, (info->ringReadPtrHandle));
+
+				/* Set watermark control */
+    OUTREG(R128_PM4_BUFFER_WM_CNTL,
+	   ((R128_WATERMARK_L/4) << R128_WMA_SHIFT)
+	   | ((R128_WATERMARK_M/4) << R128_WMB_SHIFT)
+	   | ((R128_WATERMARK_N/4) << R128_WMC_SHIFT)
+	   | ((R128_WATERMARK_K/64) << R128_WB_WM_SHIFT));
+
+    addr = INREG(R128_PM4_BUFFER_ADDR);	/* Force read.  Why?  Because it's
+                                           in the examples... */
+    
+#if 0
+    R128CCEWaitForIdle(pScrn);
+#endif
+
+				/* Turn on bus mastering */
+    info->BusCntl &= ~R128_BUS_MASTER_DIS;
+    OUTREGP(R128_BUS_CNTL, 0, ~R128_BUS_MASTER_DIS);
+}
+
+/* Initialize the kernel data structures. */
+static int R128DRIKernelInit(R128InfoPtr pR128, ScreenPtr pScreen)
+{
+    drmR128Init      drmInfo;
+
+    drmInfo.sarea_priv_offset   = sizeof(XF86DRISAREARec);
+    drmInfo.is_pci              = pR128->IsPCI;
+    drmInfo.cce_mode            = pR128->CCEMode;
+    drmInfo.cce_fifo_size       = pR128->CCEFifoSize;
+    drmInfo.cce_secure          = pR128->CCESecure;
+    drmInfo.ring_size           = pR128->ringSize*1024*1024;
+    drmInfo.usec_timeout        = pR128->CCEusecTimeout;
+
+    drmInfo.fb_offset           = pR128->LinearAddr;
+    drmInfo.agp_ring_offset     = pR128->ringHandle;
+    drmInfo.agp_read_ptr_offset = pR128->ringReadPtrHandle;
+    drmInfo.agp_vertbufs_offset = pR128->vbHandle;
+    drmInfo.agp_indbufs_offset  = pR128->indHandle;
+    drmInfo.agp_textures_offset = pR128->agpTexHandle;
+    drmInfo.mmio_offset         = pR128->registerHandle;
+
+    if (drmR128InitCCE(pR128->drmFD, &drmInfo) < 0) return FALSE;
+
+    return TRUE;
+}
+
+/* Add a map for the vertex buffers that will be accessed by any
+   DRI-based clients. */
+static Bool R128DRIBufInit(R128InfoPtr pR128, ScreenPtr pScreen)
+{
+				/* Initialize vertex buffers */
+    if ((pR128->vbNumBufs = drmAddBufs(pR128->drmFD,
+				       pR128->vbMapSize / pR128->vbBufSize,
+				       pR128->vbBufSize,
+				       DRM_AGP_BUFFER,
+				       pR128->vbStart)) <= 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[drm] Could not create vertex buffers list\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[drm] Added %d %d byte vertex buffers\n",
+	       pR128->vbNumBufs, pR128->vbBufSize);
+
+    if (drmMarkBufs(pR128->drmFD, 0.133333, 0.266666)) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[drm] Failed to mark vertex buffers list\n");
+	return FALSE;
+    }
+
+    if (!(pR128->vbBufs = drmMapBufs(pR128->drmFD))) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[drm] Failed to map vertex buffers list\n");
+	return FALSE;
+    }
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[drm] Mapped %d vertex buffers\n",
+	       pR128->vbBufs->count);
+
+    return TRUE;
+}
+
+/* Load the microcode for the CCE */
+static void R128DRILoadMicrocode(ScrnInfoPtr pScrn)
+{
+    unsigned char *R128MMIO = R128PTR(pScrn)->MMIO;
+    int            i;
+    unsigned long  R128Microcode[] = {
+	/* CCE microcode (from ATI) */
+    0, 276838400, 0, 268449792, 2, 142, 2, 145, 0, 1076765731, 0, 1617039951,
+    0, 774592877, 0, 1987540286, 0, 2307490946U, 0, 599558925, 0, 589505315, 0,
+    596487092, 0, 589505315, 1, 11544576, 1, 206848, 1, 311296, 1, 198656, 2,
+    912273422, 11, 262144, 0, 0, 1, 33559837, 1, 7438, 1, 14809, 1, 6615, 12,
+    28, 1, 6614, 12, 28, 2, 23, 11, 18874368, 0, 16790922, 1, 409600, 9, 30, 1,
+    147854772, 16, 420483072, 3, 8192, 0, 10240, 1, 198656, 1, 15630, 1, 51200,
+    10, 34858, 9, 42, 1, 33559823, 2, 10276, 1, 15717, 1, 15718, 2, 43, 1,
+    15936948, 1, 570480831, 1, 14715071, 12, 322123831, 1, 33953125, 12, 55, 1,
+    33559908, 1, 15718, 2, 46, 4, 2099258, 1, 526336, 1, 442623, 4, 4194365, 1,
+    509952, 1, 459007, 3, 0, 12, 92, 2, 46, 12, 176, 1, 15734, 1, 206848, 1,
+    18432, 1, 133120, 1, 100670734, 1, 149504, 1, 165888, 1, 15975928, 1,
+    1048576, 6, 3145806, 1, 15715, 16, 2150645232U, 2, 268449859, 2, 10307, 12,
+    176, 1, 15734, 1, 15735, 1, 15630, 1, 15631, 1, 5253120, 6, 3145810, 16,
+    2150645232U, 1, 15864, 2, 82, 1, 343310, 1, 1064207, 2, 3145813, 1, 15728,
+    1, 7817, 1, 15729, 3, 15730, 12, 92, 2, 98, 1, 16168, 1, 16167, 1, 16002,
+    1, 16008, 1, 15974, 1, 15975, 1, 15990, 1, 15976, 1, 15977, 1, 15980, 0,
+    15981, 1, 10240, 1, 5253120, 1, 15720, 1, 198656, 6, 110, 1, 180224, 1,
+    103824738, 2, 112, 2, 3145839, 0, 536885440, 1, 114880, 14, 125, 12,
+    206975, 1, 33559995, 12, 198784, 0, 33570236, 1, 15803, 0, 15804, 3,
+    294912, 1, 294912, 3, 442370, 1, 11544576, 0, 811612160, 1, 12593152, 1,
+    11536384, 1, 14024704, 7, 310382726, 0, 10240, 1, 14796, 1, 14797, 1,
+    14793, 1, 14794, 0, 14795, 1, 268679168, 1, 9437184, 1, 268449792, 1,
+    198656, 1, 9452827, 1, 1075854602, 1, 1075854603, 1, 557056, 1, 114880, 14,
+    159, 12, 198784, 1, 1109409213, 12, 198783, 1, 1107312059, 12, 198784, 1,
+    1109409212, 2, 162, 1, 1075854781, 1, 1073757627, 1, 1075854780, 1, 540672,
+    1, 10485760, 6, 3145894, 16, 274741248, 9, 168, 3, 4194304, 3, 4209949, 0,
+    0, 0, 256, 14, 174, 1, 114857, 1, 33560007, 12, 176, 0, 10240, 1, 114858,
+    1, 33560018, 1, 114857, 3, 33560007, 1, 16008, 1, 114874, 1, 33560360, 1,
+    114875, 1, 33560154, 0, 15963, 0, 256, 0, 4096, 1, 409611, 9, 188, 0,
+    10240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0
+    };
+
+    R128WaitForIdle(pScrn);
+
+    OUTREG(R128_PM4_MICROCODE_ADDR, 0);
+    for (i = 0; i < 256; i += 1) {
+        OUTREG(R128_PM4_MICROCODE_DATAH, R128Microcode[i*2]);
+        OUTREG(R128_PM4_MICROCODE_DATAL, R128Microcode[i*2 + 1]);
+    }
+}
+
+/* Initialize the CCE state, and start the CCE (if used by the X server) */
+static void R128DRICCEInit(ScrnInfoPtr pScrn)
+{
+    R128InfoPtr    info     = R128PTR(pScrn);
+    unsigned char *R128MMIO = info->MMIO;
+
+				/* CCEMode is initialized in r128_driver.c */
+    switch (info->CCEMode) {
+    case R128_PM4_NONPM4:                 info->CCEFifoSize = 0;   break;
+    case R128_PM4_192PIO:                 info->CCEFifoSize = 192; break;
+    case R128_PM4_192BM:                  info->CCEFifoSize = 192; break;
+    case R128_PM4_128PIO_64INDBM:         info->CCEFifoSize = 128; break;
+    case R128_PM4_128BM_64INDBM:          info->CCEFifoSize = 128; break;
+    case R128_PM4_64PIO_128INDBM:         info->CCEFifoSize = 64;  break;
+    case R128_PM4_64BM_128INDBM:          info->CCEFifoSize = 64;  break;
+    case R128_PM4_64PIO_64VCBM_64INDBM:   info->CCEFifoSize = 64;  break;
+    case R128_PM4_64BM_64VCBM_64INDBM:    info->CCEFifoSize = 64;  break;
+    case R128_PM4_64PIO_64VCPIO_64INDPIO: info->CCEFifoSize = 64;  break;
+    }
+
+    if (info->CCE2D) {
+				/* Make sure the CCE is on for the X server */
+	R128CCEStart(pScrn);
+    } else {
+				/* Make sure the CCE is off for the X server */
+	OUTREG(R128_PM4_MICRO_CNTL, 0);
+	OUTREG(R128_PM4_BUFFER_CNTL, R128_PM4_NONPM4);
+    }
+}
+
+/* Initialize the screen-specific data structures for the DRI and the
+   Rage 128.  This is the main entry point to the device-specific
+   initialization code.  It calls device-independent DRI functions to
+   create the DRI data structures and initialize the DRI state. */
+Bool R128DRIScreenInit(ScreenPtr pScreen)
+{
+    ScrnInfoPtr   pScrn = xf86Screens[pScreen->myNum];
+    R128InfoPtr   pR128 = R128PTR(pScrn);
+    DRIInfoPtr    pDRIInfo;
+    R128DRIPtr    pR128DRI;
+    int           major, minor, patch;
+    drmVersionPtr version;
+    
+    /* Check that the GLX, DRI, and DRM modules have been loaded by testing
+     * for known symbols in each module. */
+    if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
+    if (!xf86LoaderCheckSymbol("DRIScreenInit"))       return FALSE;
+    if (!xf86LoaderCheckSymbol("drmAvailable"))        return FALSE;
+    if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "R128DRIScreenInit failed (libdri.a too old)\n");
+      return FALSE;
+    }
+   
+    /* Check the DRI version */
+    DRIQueryVersion(&major, &minor, &patch);
+    if (major != 3 || minor != 0 || patch < 0) {
+	xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "R128DRIScreenInit failed "
+		   "(DRI version = %d.%d.%d, expected 3.0.x).  "
+		   "Disabling DRI.\n",
+		   major, minor, patch);
+	return FALSE;
+    }
+
+    switch (pR128->CurrentLayout.pixel_code) {
+    case 8:
+	/* These modes are not supported (yet). */
+    case 15:
+    case 24:
+	return FALSE;
+
+	/* Only 16 and 32 color depths are supports currently. */
+    case 16:
+    case 32:
+	break;
+    }
+
+    /* Create the DRI data structure, and fill it in before calling the
+       DRIScreenInit(). */
+    if (!(pDRIInfo = DRICreateInfoRec())) return FALSE;
+
+    pR128->pDRIInfo                      = pDRIInfo;
+    pDRIInfo->drmDriverName              = R128_NAME;
+    pDRIInfo->clientDriverName           = R128_NAME;
+    pDRIInfo->busIdString                = xalloc(64);
+    sprintf(pDRIInfo->busIdString,
+	    "PCI:%d:%d:%d",
+	    pR128->PciInfo->bus,
+	    pR128->PciInfo->device,
+	    pR128->PciInfo->func);
+    pDRIInfo->ddxDriverMajorVersion      = R128_VERSION_MAJOR;
+    pDRIInfo->ddxDriverMinorVersion      = R128_VERSION_MINOR;
+    pDRIInfo->ddxDriverPatchVersion      = R128_VERSION_PATCH;
+    pDRIInfo->frameBufferPhysicalAddress = pR128->LinearAddr;
+    pDRIInfo->frameBufferSize            = pR128->FbMapSize;
+    pDRIInfo->frameBufferStride          = (pScrn->displayWidth *
+					    pR128->CurrentLayout.pixel_bytes);
+    pDRIInfo->ddxDrawableTableEntry      = R128_MAX_DRAWABLES;
+    pDRIInfo->maxDrawableTableEntry      = (SAREA_MAX_DRAWABLES
+					    < R128_MAX_DRAWABLES
+					    ? SAREA_MAX_DRAWABLES
+					    : R128_MAX_DRAWABLES);
+    
+#ifdef NOT_DONE
+    /* FIXME: Need to extend DRI protocol to pass this size back to
+     * client for SAREA mapping that includes a device private record
+     */
+    pDRIInfo->SAREASize = 
+	((sizeof(XF86DRISAREARec) + 0xfff) & 0x1000); /* round to page */
+    /* + shared memory device private rec */
+#else
+    /* For now the mapping works by using a fixed size defined
+     * in the SAREA header
+     */
+    if (sizeof(XF86DRISAREARec)+sizeof(R128SAREAPriv)>SAREA_MAX) {
+	ErrorF("Data does not fit in SAREA\n");
+	return FALSE;
+    }
+    pDRIInfo->SAREASize = SAREA_MAX;
+#endif
+    
+    if (!(pR128DRI = (R128DRIPtr)xnfcalloc(sizeof(R128DRIRec),1))) {
+	DRIDestroyInfoRec(pR128->pDRIInfo);
+	pR128->pDRIInfo = NULL;
+	return FALSE;
+    }
+    pDRIInfo->devPrivate     = pR128DRI;
+    pDRIInfo->devPrivateSize = sizeof(R128DRIRec);
+    pDRIInfo->contextSize    = sizeof(R128DRIContextRec);
+    
+    pDRIInfo->CreateContext  = R128CreateContext;
+    pDRIInfo->DestroyContext = R128DestroyContext;
+    pDRIInfo->SwapContext    = R128DRISwapContext;
+    pDRIInfo->InitBuffers    = R128DRIInitBuffers;
+    pDRIInfo->MoveBuffers    = R128DRIMoveBuffers;
+    pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
+
+    if (!DRIScreenInit(pScreen, pDRIInfo, &pR128->drmFD)) {
+	xfree(pDRIInfo->devPrivate);
+	pDRIInfo->devPrivate = NULL;
+	DRIDestroyInfoRec(pDRIInfo);
+	pDRIInfo = NULL;
+	return FALSE;
+    }
+
+    /* Check the r128 DRM version */
+    version = drmGetVersion(pR128->drmFD);
+    if (version) {
+	if (version->version_major != 1 ||
+	    version->version_minor != 0 ||
+	    version->version_patchlevel < 0) {
+            /* incompatible drm version */
+            xf86DrvMsg(pScreen->myNum, X_ERROR,
+                       "R128DRIScreenInit failed "
+		       "(DRM version = %d.%d.%d, expected 1.0.x).  "
+		       "Disabling DRI.\n",
+                       version->version_major,
+                       version->version_minor,
+                       version->version_patchlevel);
+            drmFreeVersion(version);
+            R128DRICloseScreen(pScreen);
+            return FALSE;
+	}
+	drmFreeVersion(version);
+    }
+
+				/* Initialize AGP */
+    if (!pR128->IsPCI && !R128DRIAgpInit(pR128, pScreen)) {
+	R128DRICloseScreen(pScreen);
+	return FALSE;
+    }
+
+				/* DRIScreenInit doesn't add all the
+                                   common mappings.  Add additional
+                                   mappings here. */
+    if (!R128DRIMapInit(pR128, pScreen)) {
+	R128DRICloseScreen(pScreen);
+	return FALSE;
+    }
+
+				/* Initialize the ring buffer */
+    if (!pR128->IsPCI) R128DRICCEInitRingBuffer(pScrn);
+
+				/* Initialize the kernel data structures */
+    if (!R128DRIKernelInit(pR128, pScreen)) {
+	R128DRICloseScreen(pScreen);
+	return FALSE;
+    }
+
+				/* Initialize vertex buffers list */
+    if (!pR128->IsPCI && !R128DRIBufInit(pR128, pScreen)) {
+	R128DRICloseScreen(pScreen);
+	return FALSE;
+    }
+
+				/* FIXME: When are these mappings unmapped? */
+
+    if (!R128InitVisualConfigs(pScreen)) {
+	R128DRICloseScreen(pScreen);
+	return FALSE;
+    }
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Visual configs initialized\n");
+
+				/* Load the CCE Microcode */
+    R128DRILoadMicrocode(pScrn);
+
+				/* Reset the Graphics Engine */
+    R128EngineReset(pScrn);
+
+    return TRUE;
+}
+
+/* Finish initializing the device-dependent DRI state, and call
+   DRIFinishScreenInit() to complete the device-independent DRI
+   initialization. */
+Bool R128DRIFinishScreenInit(ScreenPtr pScreen)
+{
+    ScrnInfoPtr      pScrn      = xf86Screens[pScreen->myNum];
+    R128InfoPtr      pR128      = R128PTR(pScrn);
+    R128SAREAPrivPtr pSAREAPriv;
+    R128DRIPtr       pR128DRI;
+    
+    /* Init and start the CCE */
+    R128DRICCEInit(pScrn);
+
+    pSAREAPriv = (R128SAREAPrivPtr)DRIGetSAREAPrivate(pScreen);
+    memset(pSAREAPriv, 0, sizeof(*pSAREAPriv));
+
+    pR128->pDRIInfo->driverSwapMethod = DRI_HIDE_X_CONTEXT;
+    /* pR128->pDRIInfo->driverSwapMethod = DRI_SERVER_SWAP; */
+    
+    pR128DRI                 = (R128DRIPtr)pR128->pDRIInfo->devPrivate;
+    pR128DRI->registerHandle = pR128->registerHandle;
+    pR128DRI->registerSize   = pR128->registerSize;
+
+    pR128DRI->ringHandle     = pR128->ringHandle;
+    pR128DRI->ringMapSize    = pR128->ringMapSize;
+    pR128DRI->ringSize       = pR128->ringSize*1024*1024;
+
+    pR128DRI->ringReadPtrHandle = pR128->ringReadPtrHandle;
+    pR128DRI->ringReadMapSize   = pR128->ringReadMapSize;
+
+    pR128DRI->vbHandle       = pR128->vbHandle;
+    pR128DRI->vbMapSize      = pR128->vbMapSize;
+    pR128DRI->vbOffset       = pR128->vbStart;
+    pR128DRI->vbBufSize      = pR128->vbBufSize;
+
+    pR128DRI->indHandle      = pR128->indHandle;
+    pR128DRI->indMapSize     = pR128->indMapSize;
+
+    pR128DRI->agpTexHandle   = pR128->agpTexHandle;
+    pR128DRI->agpTexMapSize  = pR128->agpTexMapSize;
+    pR128DRI->log2AGPTexGran = pR128->log2AGPTexGran;
+    pR128DRI->agpTexOffset   = pR128->agpTexStart;
+
+    pR128DRI->deviceID       = pR128->Chipset;
+    pR128DRI->width          = pScrn->virtualX;
+    pR128DRI->height         = pScrn->virtualY;
+    pR128DRI->depth          = pScrn->depth;
+    pR128DRI->bpp            = pScrn->bitsPerPixel;
+
+    pR128DRI->fbX            = pR128->fbX;
+    pR128DRI->fbY            = pR128->fbY;
+    pR128DRI->backX          = pR128->backX;
+    pR128DRI->backY          = pR128->backY;
+    pR128DRI->depthX         = pR128->depthX;
+    pR128DRI->depthY         = pR128->depthY;
+    pR128DRI->textureX       = pR128->textureX;
+    pR128DRI->textureY       = pR128->textureY;
+    pR128DRI->textureSize    = pR128->textureSize;
+    pR128DRI->log2TexGran    = pR128->log2TexGran;
+
+    pR128DRI->IsPCI          = pR128->IsPCI;
+
+    pR128DRI->CCEMode        = pR128->CCEMode;
+    pR128DRI->CCEFifoSize    = pR128->CCEFifoSize;
+
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "0x%08lx %d\n",
+	       pR128DRI->registerHandle, pR128DRI->registerSize);
+    return DRIFinishScreenInit(pScreen);
+}
+
+/* The screen is being closed, so clean up any state and free any
+   resources used by the DRI. */
+void R128DRICloseScreen(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    R128InfoPtr pR128 = R128PTR(pScrn);
+
+				/* Stop the CCE if it is still in use */
+    if (pR128->CCE2D) R128CCEStop(pScrn);
+
+				/* De-allocate vertex buffers */
+    if (pR128->vbBufs) {
+	drmUnmapBufs(pR128->vbBufs);
+	pR128->vbBufs = NULL;
+    }
+
+				/* De-allocate all kernel resources */
+    drmR128CleanupCCE(pR128->drmFD);
+
+				/* De-allocate all AGP resources */
+    if (pR128->agpTex) {
+	drmUnmap(pR128->agpTex, pR128->agpTexMapSize);
+	pR128->agpTex = NULL;
+    }
+    if (pR128->ind) {
+	drmUnmap(pR128->ind, pR128->indMapSize);
+	pR128->ind = NULL;
+    }
+    if (pR128->vb) {
+	drmUnmap(pR128->vb, pR128->vbMapSize);
+	pR128->vb = NULL;
+    }
+    if (pR128->ringReadPtr) {
+	drmUnmap(pR128->ringReadPtr, pR128->ringReadMapSize);
+	pR128->ringReadPtr = NULL;
+    }
+    if (pR128->ring) {
+	drmUnmap(pR128->ring, pR128->ringMapSize);
+	pR128->ring = NULL;
+    }
+    if (pR128->agpMemHandle) {
+	drmAgpUnbind(pR128->drmFD, pR128->agpMemHandle);
+	drmAgpFree(pR128->drmFD, pR128->agpMemHandle);
+	pR128->agpMemHandle = 0;
+	drmAgpRelease(pR128->drmFD);
+    }
+    
+				/* De-allocate all DRI resources */
+    DRICloseScreen(pScreen);
+    
+				/* De-allocate all DRI data structures */
+    if (pR128->pDRIInfo) {
+	if (pR128->pDRIInfo->devPrivate) {
+	    xfree(pR128->pDRIInfo->devPrivate);
+	    pR128->pDRIInfo->devPrivate = NULL;
+	}
+	DRIDestroyInfoRec(pR128->pDRIInfo);
+	pR128->pDRIInfo = NULL;
+    }
+    if (pR128->pVisualConfigs) {
+	xfree(pR128->pVisualConfigs);
+	pR128->pVisualConfigs = NULL;
+    }
+    if (pR128->pVisualConfigsPriv) {
+	xfree(pR128->pVisualConfigsPriv);
+	pR128->pVisualConfigsPriv = NULL;
+    }
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h:1.1
--- /dev/null	Sat Jul  1 20:42:55 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h	Fri Jun 16 17:03:22 2000
@@ -0,0 +1,116 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h,v 1.1 2000/06/17 00:03:22 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Rickard E. Faith <faith@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_DRI_
+#define _R128_DRI_
+
+#include <xf86drm.h>
+
+/* DRI Driver defaults */
+#define R128_DEFAULT_CCE_PIO_MODE R128_PM4_64PIO_64VCBM_64INDBM
+#define R128_DEFAULT_CCE_BM_MODE  R128_PM4_64BM_64VCBM_64INDBM
+#define R128_DEFAULT_AGP_MODE     2
+#define R128_DEFAULT_AGP_SIZE     8 /* MB (must be a power of 2 and > 4MB) */
+#define R128_DEFAULT_RING_SIZE    1 /* MB (must be page aligned) */
+#define R128_DEFAULT_VB_SIZE      1 /* MB (must be page aligned) */
+#define R128_DEFAULT_IND_SIZE     1 /* MB (must be page aligned) */
+#define R128_DEFAULT_AGP_TEX_SIZE 1 /* MB (must be page aligned) */
+
+#define R128_DEFAULT_VB_BUF_SIZE  16384  /* bytes */
+#define R128_DEFAULT_CCE_TIMEOUT  10000  /* usecs */
+
+#define R128_AGP_MAX_MODE         2
+
+#define R128CCE_USE_RING_BUFFER(m)                                        \
+(((m) == R128_PM4_192BM) ||                                               \
+ ((m) == R128_PM4_128BM_64INDBM) ||                                       \
+ ((m) == R128_PM4_64BM_128INDBM) ||                                       \
+ ((m) == R128_PM4_64BM_64VCBM_64INDBM))
+
+typedef struct {
+    /* MMIO register data */
+    drmHandle     registerHandle;
+    drmSize       registerSize;
+
+    /* CCE ring buffer data */
+    drmHandle     ringHandle;
+    drmSize       ringMapSize;
+    int           ringSize;
+
+    /* CCE ring read pointer data */
+    drmHandle     ringReadPtrHandle;
+    drmSize       ringReadMapSize;
+
+    /* CCE vertex buffer data */
+    drmHandle     vbHandle;
+    drmSize       vbMapSize;
+    int           vbOffset;
+    int           vbBufSize;
+
+    /* CCE indirect buffer data */
+    drmHandle     indHandle;
+    drmSize       indMapSize;
+
+    /* CCE AGP Texture data */
+    drmHandle     agpTexHandle;
+    drmSize       agpTexMapSize;
+    int           log2AGPTexGran;
+    int           agpTexOffset;
+
+    /* DRI screen private data */
+    int           deviceID;	/* PCI device ID */
+    int           width;	/* Width in pixels of display */
+    int           height;	/* Height in scanlines of display */
+    int           depth;	/* Depth of display (8, 15, 16, 24) */
+    int           bpp;		/* Bit depth of display (8, 16, 24, 32) */
+
+    int           fbX;		/* Start of frame buffer */
+    int           fbY;
+    int           backX;	/* Start of shared back buffer */
+    int           backY;
+    int           depthX;	/* Start of shared depth buffer */
+    int           depthY;
+    int           textureX;	/* Start of texture data in frame buffer */
+    int           textureY;
+    int           textureSize;
+    int           log2TexGran;
+
+    int           IsPCI;	/* Current card is a PCI card */
+
+    int           CCEMode;	/* CCE mode that server/clients use */
+    int           CCEFifoSize;	/* Size of the CCE command FIFO */
+} R128DRIRec, *R128DRIPtr;
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dripriv.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dripriv.h:1.1
--- /dev/null	Sat Jul  1 20:42:55 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dripriv.h	Fri Jun 16 17:03:22 2000
@@ -0,0 +1,54 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dripriv.h,v 1.1 2000/06/17 00:03:22 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Rickard E. Faith <faith@precisioninsight.com>
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_DRIPRIV_H_
+#define _R128_DRIPRIV_H_
+
+#define R128_MAX_DRAWABLES 256
+
+extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
+				void **configprivs);
+
+typedef struct {
+    /* Nothing here yet */
+    int dummy;
+} R128ConfigPrivRec, *R128ConfigPrivPtr;
+
+typedef struct {
+    /* Nothing here yet */
+    int dummy;
+} R128DRIContextRec, *R128DRIContextPtr;
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c:1.26 xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c:1.38
--- xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c:1.26	Mon Mar  6 15:17:44 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c	Fri Jun 30 18:40:45 2000
@@ -1,8 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c,v 1.26 2000/03/06 23:17:44 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c,v 1.38 2000/07/01 01:40:45 martin Exp $ */
 /**************************************************************************
 
-Copyright 1999 ATI Technologies Inc. and Precision Insight, Inc.,
-                                         Cedar Park, Texas. 
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -70,7 +70,7 @@
 #include "mipointer.h"
 #include "micmap.h"
 
-#undef USE_FB			/* not until overlays and 24->32 code added */
+#define USE_FB			/* not until overlays and 24->32 code added */
 #ifdef USE_FB
 #include "fb.h"
 #else
@@ -107,6 +107,19 @@
 				/* VESA support */
 #include "vbe.h"
 
+				/* DRI support */
+#ifdef XF86DRI
+#include "GL/glxint.h"
+#include "xf86drm.h"
+#include "sarea.h"
+#define _XF86DRI_SERVER_
+#include "xf86dri.h"
+#include "dri.h"
+#include "r128_dri.h"
+#include "r128_dripriv.h"
+#include "r128_sarea.h"
+#endif
+
 				/* Driver data structures */
 #include "r128.h"
 #include "r128_reg.h"
@@ -126,7 +139,6 @@
 
 static int  R128ValidMode(int scrnIndex, DisplayModePtr mode,
 			  Bool verbose, int flag);
-static void R128AdjustFrame(int scrnIndex, int x, int y, int flags);
 static Bool R128EnterVT(int scrnIndex, int flags);
 static void R128LeaveVT(int scrnIndex, int flags);
 static Bool R128CloseScreen(int scrnIndex, ScreenPtr pScreen);
@@ -135,7 +147,6 @@
 static void R128Save(ScrnInfoPtr pScrn);
 static void R128Restore(ScrnInfoPtr pScrn);
 static Bool R128ModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static Bool R128SwitchMode(int ScrnIndex, DisplayModePtr mode, int flags);
 static void R128DisplayPowerManagementSet(ScrnInfoPtr pScrn,
 					  int PowerManagementMode, int flags);
 static Bool R128EnterVTFBDev(int scrnIndex, int flags);
@@ -158,6 +169,8 @@
     { PCI_CHIP_RAGE128RK, "ATI Rage 128 RK (PCI)" },
     { PCI_CHIP_RAGE128RL, "ATI Rage 128 RL (AGP)" },
     { PCI_CHIP_RAGE128PF, "ATI Rage 128 Pro PF (AGP)" },
+    { PCI_CHIP_RAGE128LE, "ATI Rage 128 Mobility LE (PCI)" },
+    { PCI_CHIP_RAGE128LF, "ATI Rage 128 Mobility LF (AGP)" },
     { -1,                 NULL }
 };
 
@@ -167,6 +180,8 @@
     { PCI_CHIP_RAGE128RK, PCI_CHIP_RAGE128RK, RES_SHARED_VGA },
     { PCI_CHIP_RAGE128RL, PCI_CHIP_RAGE128RL, RES_SHARED_VGA },
     { PCI_CHIP_RAGE128PF, PCI_CHIP_RAGE128PF, RES_SHARED_VGA },
+    { PCI_CHIP_RAGE128LE, PCI_CHIP_RAGE128LE, RES_SHARED_VGA },
+    { PCI_CHIP_RAGE128LF, PCI_CHIP_RAGE128LF, RES_SHARED_VGA },
     { -1,                 -1,                 RES_UNDEFINED }
 };
 
@@ -176,17 +191,45 @@
   OPTION_HW_CURSOR,
   OPTION_DAC_6BIT,
   OPTION_DAC_8BIT,
+#ifdef XF86DRI
+  OPTION_IS_PCI,
+  OPTION_CCE_PIO,
+  OPTION_NO_SECURITY,
+  OPTION_USEC_TIMEOUT,
+  OPTION_AGP_MODE,
+  OPTION_AGP_SIZE,
+  OPTION_RING_SIZE,
+  OPTION_VERT_SIZE,
+  OPTION_VBUF_SIZE,
+  OPTION_USE_CCE_2D,
+#endif
+  OPTION_ENABLE_FP,
+  OPTION_CRT,
   OPTION_FBDEV
 } R128Opts;
 
 static OptionInfoRec R128Options[] = {
-  { OPTION_NOACCEL,   "NoAccel",  OPTV_BOOLEAN, {0}, FALSE },
-  { OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE },
-  { OPTION_HW_CURSOR, "HWcursor", OPTV_BOOLEAN, {0}, TRUE  },
-  { OPTION_DAC_6BIT,  "Dac6Bit",  OPTV_BOOLEAN, {0}, FALSE },
-  { OPTION_DAC_8BIT,  "Dac8Bit",  OPTV_BOOLEAN, {0}, TRUE  },
-  { OPTION_FBDEV,     "UseFBDev", OPTV_BOOLEAN, {0}, FALSE },
-  { -1,               NULL,       OPTV_NONE,    {0}, FALSE }
+  { OPTION_NOACCEL,      "NoAccel",          OPTV_BOOLEAN, {0}, FALSE },
+  { OPTION_SW_CURSOR,    "SWcursor",         OPTV_BOOLEAN, {0}, FALSE },
+  { OPTION_HW_CURSOR,    "HWcursor",         OPTV_BOOLEAN, {0}, TRUE  },
+  { OPTION_DAC_6BIT,     "Dac6Bit",          OPTV_BOOLEAN, {0}, FALSE },
+  { OPTION_DAC_8BIT,     "Dac8Bit",          OPTV_BOOLEAN, {0}, TRUE  },
+#ifdef XF86DRI
+  { OPTION_IS_PCI,       "ForcePCIMode",     OPTV_BOOLEAN, {0}, FALSE },
+  { OPTION_CCE_PIO,      "CCEPIOMode",       OPTV_BOOLEAN, {0}, FALSE },
+  { OPTION_NO_SECURITY,  "CCENoSecurity",    OPTV_BOOLEAN, {0}, FALSE },
+  { OPTION_USEC_TIMEOUT, "CCEusecTimeout",   OPTV_INTEGER, {0}, FALSE },
+  { OPTION_AGP_MODE,     "AGPMode",          OPTV_INTEGER, {0}, FALSE },
+  { OPTION_AGP_SIZE,     "AGPSize",          OPTV_INTEGER, {0}, FALSE },
+  { OPTION_RING_SIZE,    "RingSize",         OPTV_INTEGER, {0}, FALSE },
+  { OPTION_VERT_SIZE,    "VBListSize",       OPTV_INTEGER, {0}, FALSE },
+  { OPTION_VBUF_SIZE,    "VBSize",           OPTV_INTEGER, {0}, FALSE },
+  { OPTION_USE_CCE_2D,   "UseCCEfor2D",      OPTV_BOOLEAN, {0}, FALSE },
+#endif
+  { OPTION_ENABLE_FP,    "EnableFP",         OPTV_BOOLEAN, {0}, FALSE },
+  { OPTION_CRT,          "CRTOnly",          OPTV_BOOLEAN, {0}, FALSE },
+  { OPTION_FBDEV,        "UseFBDev",         OPTV_BOOLEAN, {0}, FALSE },
+  { -1,                  NULL,               OPTV_NONE,    {0}, FALSE }
 };
 
 R128RAMRec R128RAM[] = {	/* Memory Specifications
@@ -299,6 +342,41 @@
     NULL
 };
 
+#ifdef XF86DRI
+static const char *drmSymbols[] = {
+    "drmAddBufs",
+    "drmAddMap",
+    "drmAvailable",
+    "drmCtlAddCommand",
+    "drmCtlInstHandler",
+    "drmGetInterruptFromBusID",
+    "drmMapBufs",
+    "drmMarkBufs",
+    "drmUnmapBufs",
+    "drmFreeVersion",
+    "drmGetVersion",
+    NULL
+};
+
+static const char *driSymbols[] = {
+    "DRIGetDrawableIndex",
+    "DRIFinishScreenInit",
+    "DRIDestroyInfoRec",
+    "DRICloseScreen",
+    "DRIDestroyInfoRec",
+    "DRIScreenInit",
+    "DRIDestroyInfoRec",
+    "DRICreateInfoRec",
+    "DRILock",
+    "DRIUnlock",
+    "DRIGetSAREAPrivate",
+    "DRIGetContext",
+    "DRIQueryVersion",
+    "GlxSetVisualConfigs",
+    NULL
+};
+#endif
+
 static MODULESETUPPROTO(R128Setup);
 
 static XF86ModuleVersionInfo R128VersRec =
@@ -347,6 +425,10 @@
 			  xaaSymbols, 
                           xf8_32bppSymbols,
 			  ramdacSymbols,
+#ifdef XF86DRI
+			  drmSymbols,
+			  driSymbols,
+#endif
 			  fbdevHWSymbols,
 			  vbeSymbols,
                           0 /* ddcsymbols */,
@@ -518,7 +600,7 @@
 }
 
 /* Compute log base 2 of val. */
-static int R128MinBits(int val)
+int R128MinBits(int val)
 {
     int bits;
 
@@ -714,16 +796,18 @@
 
     info->fifo_slots  = 0;
     info->pix24bpp    = xf86GetBppFromDepth(pScrn, pScrn->depth);
-    info->pixel_bytes = pScrn->bitsPerPixel / 8;
-    info->pixel_code  = (pScrn->bitsPerPixel != 16
-			 ? pScrn->bitsPerPixel
-			 : pScrn->depth);
+    info->CurrentLayout.bitsPerPixel = pScrn->bitsPerPixel;
+    info->CurrentLayout.depth        = pScrn->depth;
+    info->CurrentLayout.pixel_bytes  = pScrn->bitsPerPixel / 8;
+    info->CurrentLayout.pixel_code   = (pScrn->bitsPerPixel != 16
+				       ? pScrn->bitsPerPixel
+				       : pScrn->depth);
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	       "Pixel depth = %d bits stored in %d byte%s (%d bpp pixmaps)\n",
 	       pScrn->depth,
-	       info->pixel_bytes,
-	       info->pixel_bytes > 1 ? "s" : "",
+	       info->CurrentLayout.pixel_bytes,
+	       info->CurrentLayout.pixel_bytes > 1 ? "s" : "",
 	       info->pix24bpp);
 
 
@@ -779,6 +863,10 @@
     int           offset = 0;	/* RAM Type */
     MessageType   from;
     unsigned char *R128MMIO;
+    CARD32        fp_horz_stretch      = 0, fp_vert_stretch      = 0;
+    CARD32        crtc_h_total_disp    = 0, crtc_v_total_disp    = 0;
+    CARD32        crtc_h_sync_strt_wid = 0, crtc_v_sync_strt_wid = 0;
+
 				/* Chipset */
     from = X_PROBED;
     if (dev->chipset && *dev->chipset) {
@@ -861,27 +949,53 @@
 		   "BIOS at 0x%08lx\n", info->BIOSAddr);
     }
 
-				/* RAM */
-    from             = X_PROBED;
+				/* Flat panel (part 1) */
+    /* FIXME: Make this an option */
+    switch (info->Chipset) {
+    case PCI_CHIP_RAGE128LE:
+    case PCI_CHIP_RAGE128LF: info->HasPanelRegs = TRUE;  break;
+    case PCI_CHIP_RAGE128RE:
+    case PCI_CHIP_RAGE128RF:
+    case PCI_CHIP_RAGE128RK:
+    case PCI_CHIP_RAGE128RL:
+    case PCI_CHIP_RAGE128PF:
+    default:                 info->HasPanelRegs = FALSE; break;
+    }
+
+				/* Read registers used to determine options */
+    from                     = X_PROBED;
     R128MapMMIO(pScrn);
-    R128MMIO         = info->MMIO;
+    R128MMIO                 = info->MMIO;
     if (info->FBDev)
-	pScrn->videoRam = fbdevHWGetVidmem(pScrn) / 1024;
+	pScrn->videoRam      = fbdevHWGetVidmem(pScrn) / 1024;
     else
-	pScrn->videoRam = INREG(R128_CONFIG_MEMSIZE) / 1024;
-    info->MemCntl    = INREG(R128_MEM_CNTL);
-    info->BusCntl    = INREG(R128_BUS_CNTL);
-    R128MMIO         = NULL;
+	pScrn->videoRam      = INREG(R128_CONFIG_MEMSIZE) / 1024;
+    info->MemCntl            = INREG(R128_MEM_CNTL);
+    info->BusCntl            = INREG(R128_BUS_CNTL);
+    if (info->HasPanelRegs) {
+	fp_horz_stretch      = INREG(R128_FP_HORZ_STRETCH);
+	fp_vert_stretch      = INREG(R128_FP_VERT_STRETCH);
+	crtc_h_total_disp    = INREG(R128_CRTC_H_TOTAL_DISP);
+	crtc_v_total_disp    = INREG(R128_CRTC_V_TOTAL_DISP);
+	crtc_h_sync_strt_wid = INREG(R128_CRTC_H_SYNC_STRT_WID);
+	crtc_v_sync_strt_wid = INREG(R128_CRTC_V_SYNC_STRT_WID);
+    }
+    R128MMIO                 = NULL;
     R128UnmapMMIO(pScrn);
+
+				/* RAM */
     switch (info->MemCntl & 0x3) {
     case 0:			/* SDR SGRAM 1:1 */
 	switch (info->Chipset) {
-	case PCI_CHIP_RAGE128RE: 
+	case PCI_CHIP_RAGE128LE:
+	case PCI_CHIP_RAGE128LF:
+	case PCI_CHIP_RAGE128RE:
 	case PCI_CHIP_RAGE128RF: offset = 0; break; /* 128-bit SDR SGRAM 1:1 */
 	case PCI_CHIP_RAGE128RK:
 	case PCI_CHIP_RAGE128RL:
 	default:                 offset = 1; break; /*  64-bit SDR SGRAM 1:1 */
 	}
+	break;
     case 1:                      offset = 2; break; /*  64-bit SDR SGRAM 2:1 */
     case 2:                      offset = 3; break; /*  64-bit DDR SGRAM     */
     default:                     offset = 1; break; /*  64-bit SDR SGRAM 1:1 */
@@ -895,12 +1009,98 @@
 		   pScrn->videoRam);
 	from             = X_CONFIG;
 	pScrn->videoRam  = dev->videoRam;
-    } 
+    }
     pScrn->videoRam  &= ~1023;
     info->FbMapSize  = pScrn->videoRam * 1024;
     xf86DrvMsg(pScrn->scrnIndex, from,
 	       "VideoRAM: %d kByte (%s)\n", pScrn->videoRam, info->ram->name);
 
+				/* Flat panel (part 2) */
+    if ((info->EnableFP = xf86ReturnOptValBool(R128Options,
+					       OPTION_ENABLE_FP, FALSE))) {
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		   "Enabling use of flat panel registers\n");
+	if ((info->CRTOnly = xf86ReturnOptValBool(R128Options,
+						  OPTION_CRT, FALSE))) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		       "Using external CRT instead of "
+		       "flat panel for display\n");
+	} else {
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		       "Using flat panel for display\n");
+	}
+    }
+
+    if (info->HasPanelRegs) {
+	int tmp;
+
+	info->PanelXRes  =
+	    (fp_horz_stretch & R128_HORZ_PANEL_SIZE) >> R128_HORZ_PANEL_SHIFT;
+	info->PanelXRes  = (info->PanelXRes + 1) * 8;
+	info->PanelYRes  =
+	    (fp_vert_stretch & R128_VERT_PANEL_SIZE) >> R128_VERT_PANEL_SHIFT;
+	info->PanelYRes += 1;
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel dimensions: %dx%d\n",
+		   info->PanelXRes, info->PanelYRes);
+
+	info->PanelHNonVis     =
+	    (crtc_h_total_disp & R128_CRTC_H_TOTAL) >> R128_CRTC_H_TOTAL_SHIFT;
+	info->PanelHNonVis    += 4; /* Add 4 since we are in VGA mode */
+	tmp                    =
+	    (crtc_h_total_disp & R128_CRTC_H_DISP) >> R128_CRTC_H_DISP_SHIFT;
+	info->PanelHNonVis    -= tmp;
+	info->PanelHOverPlus   =
+	    (crtc_h_sync_strt_wid & R128_CRTC_H_SYNC_STRT_CHAR)
+		>> R128_CRTC_H_SYNC_STRT_CHAR_SHIFT;
+	info->PanelHOverPlus  -= tmp;
+	switch (info->CurrentLayout.pixel_code) {
+	    /* Adjustments are from ATI */
+	case 8:  info->PanelHOverPlus += 2; break;
+	case 15:
+	case 16: info->PanelHOverPlus += 1; break;
+	case 24:
+	case 32: info->PanelHOverPlus += 0; break;
+	}
+	info->PanelHSyncWidth  =
+	    (crtc_h_sync_strt_wid & R128_CRTC_H_SYNC_WID)
+		>> R128_CRTC_H_SYNC_WID_SHIFT;
+	info->PanelHSyncWidth += 14; /* ??? */
+
+	info->PanelVNonVis     =
+	    (crtc_v_total_disp & R128_CRTC_V_TOTAL) >> R128_CRTC_V_TOTAL_SHIFT;
+	info->PanelVNonVis    += 1; /* Add 1 since we are in VGA mode */
+	tmp                    =
+	    (crtc_v_total_disp & R128_CRTC_V_DISP) >> R128_CRTC_V_DISP_SHIFT;
+	info->PanelVNonVis    -= tmp;
+	info->PanelVOverPlus   =
+	    (crtc_v_sync_strt_wid & R128_CRTC_V_SYNC_STRT)
+		>> R128_CRTC_V_SYNC_STRT_SHIFT;
+	info->PanelVOverPlus  -= tmp + 1;
+	info->PanelVSyncWidth  =
+	    (crtc_v_sync_strt_wid & R128_CRTC_V_SYNC_WID)
+		>> R128_CRTC_V_SYNC_WID_SHIFT;
+	info->PanelVSyncWidth -= 2; /* ??? */
+    }
+
+#ifdef XF86DRI
+				/* AGP/PCI */
+    if (xf86ReturnOptValBool(R128Options, OPTION_IS_PCI, FALSE)) {
+	info->IsPCI = TRUE;
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Forced into PCI-only mode\n");
+    } else {
+	switch (info->Chipset) {
+	case PCI_CHIP_RAGE128LE:
+	case PCI_CHIP_RAGE128RE:
+	case PCI_CHIP_RAGE128RK: info->IsPCI = TRUE;  break;
+	case PCI_CHIP_RAGE128LF:
+	case PCI_CHIP_RAGE128RF:
+	case PCI_CHIP_RAGE128RL:
+	case PCI_CHIP_RAGE128PF:
+	default:                 info->IsPCI = FALSE; break;
+	}
+    }
+#endif
+
     return TRUE;
 }
 
@@ -956,7 +1156,7 @@
 
 				/* Get mode information */
     pScrn->progClock               = TRUE;
-    clockRanges                    = xnfalloc(sizeof(*clockRanges));
+    clockRanges                    = xnfcalloc(sizeof(*clockRanges), 1);
     clockRanges->next              = NULL;
     clockRanges->minClock          = info->pll.min_pll_freq;
     clockRanges->maxClock          = info->pll.max_pll_freq * 10;
@@ -1000,7 +1200,8 @@
 
 				/* Get ScreenInit function */
 #ifdef USE_FB
-    mod = "fb"; Sym = "fbScreenInit";
+    mod = "fb";
+    Sym = "fbScreenInit";
 #else
     switch (pScrn->bitsPerPixel) {
     case  8: mod = "cfb";   Sym = "cfbScreenInit";   break;
@@ -1017,6 +1218,9 @@
 #endif
     if (mod && !xf86LoadSubModule(pScrn, mod)) return FALSE;
     xf86LoaderReqSymbols(Sym, NULL);
+
+    info->CurrentLayout.displayWidth = pScrn->displayWidth;
+    info->CurrentLayout.mode = pScrn->currentMode;
     
     return TRUE;
 }
@@ -1052,16 +1256,151 @@
 #endif
     return TRUE;
 }
+
+#ifdef XF86DRI
+static Bool R128PreInitDRI(ScrnInfoPtr pScrn)
+{
+    R128InfoPtr   info = R128PTR(pScrn);    
+
+    if (info->IsPCI) {
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "CCE in PIO mode\n");
+	info->CCEMode = R128_DEFAULT_CCE_PIO_MODE;
+    } else if (xf86ReturnOptValBool(R128Options, OPTION_CCE_PIO, FALSE)) {
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "CCE in PIO mode\n");
+	info->CCEMode = R128_DEFAULT_CCE_PIO_MODE;
+    } else {
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "CCE in BM mode\n");
+	info->CCEMode = R128_DEFAULT_CCE_BM_MODE;
+    }
+
+    if (xf86ReturnOptValBool(R128Options, OPTION_USE_CCE_2D, FALSE)) {
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using CCE for 2D\n");
+	info->CCE2D = TRUE;
+    } else {
+	info->CCE2D = FALSE;
+    }
+
+    if (xf86ReturnOptValBool(R128Options, OPTION_NO_SECURITY, FALSE)) {
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		   "WARNING!!!  CCE Security checks disabled!!! **********\n");
+	info->CCESecure = FALSE;
+    } else {
+	info->CCESecure = TRUE;
+    }
+
+    info->agpMode        = R128_DEFAULT_AGP_MODE;
+    info->agpSize        = R128_DEFAULT_AGP_SIZE;
+    info->ringSize       = R128_DEFAULT_RING_SIZE;
+    info->vbSize         = R128_DEFAULT_VB_SIZE;
+    info->indSize        = R128_DEFAULT_IND_SIZE;
+    info->agpTexSize     = R128_DEFAULT_AGP_TEX_SIZE;
+
+    info->vbBufSize      = R128_DEFAULT_VB_BUF_SIZE;
+
+    info->CCEusecTimeout = R128_DEFAULT_CCE_TIMEOUT;
+
+    if (!info->IsPCI) {
+	if (xf86GetOptValInteger(R128Options,
+				 OPTION_AGP_MODE, &(info->agpMode))) {
+	    if (info->agpMode < 1 || info->agpMode > R128_AGP_MAX_MODE) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Illegal AGP Mode: %d\n", info->agpMode);
+		return FALSE;
+	    }
+	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		       "Using AGP %dx mode\n", info->agpMode);
+	}
+
+	if (xf86GetOptValInteger(R128Options,
+				 OPTION_AGP_SIZE, (int *)&(info->agpSize))) {
+	    switch (info->agpSize) {
+	    case 4:
+	    case 8:
+	    case 16:
+	    case 32:
+	    case 64:
+	    case 128:
+	    case 256:
+		break;
+	    default:
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Illegal AGP size: %d MB\n", info->agpSize);
+		return FALSE;
+	    }
+	}
 
-extern xf86MonPtr ConfiguredMonitor;
+	if (xf86GetOptValInteger(R128Options,
+				 OPTION_RING_SIZE, &(info->ringSize))) {
+	    if (info->ringSize < 1 || info->ringSize >= info->agpSize) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Illegal ring buffer size: %d MB\n",
+			   info->ringSize);
+		return FALSE;
+	    }
+	}
 
+	if (xf86GetOptValInteger(R128Options,
+				 OPTION_VERT_SIZE, &(info->vbSize))) {
+	    if (info->vbSize < 1 || info->vbSize >= info->agpSize) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Illegal vertex buffers list size: %d MB\n",
+			   info->vbSize);
+		return FALSE;
+	    }
+	}
+
+	if (xf86GetOptValInteger(R128Options,
+				 OPTION_VBUF_SIZE, &(info->vbBufSize))) {
+	    int numBufs = info->vbSize*1024*1024/info->vbBufSize;
+	    if (numBufs < 2 || numBufs > 512) { /* FIXME: 512 is arbitrary */
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Illegal individual vertex buffer size: %d bytes\n",
+			   info->vbBufSize);
+		return FALSE;
+	    }
+	}
+
+	if (info->ringSize + info->vbSize + info->indSize + info->agpTexSize >
+	    info->agpSize) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "Buffers are too big for requested AGP space\n");
+	    return FALSE;
+	}
+
+	info->agpTexSize = info->agpSize - (info->ringSize +
+					    info->vbSize +
+					    info->indSize);
+
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		   "Using %d MB AGP aperture\n", info->agpSize);
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		   "Using %d MB for the ring buffer\n", info->ringSize);
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		   "Using %d MB for vertex buffers\n", info->vbSize);
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		   "Using %d MB for indirect buffers\n", info->indSize);
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		   "Using %d MB for AGP textures\n", info->agpTexSize);
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		   "Using %d byte vertex buffers\n", info->vbBufSize);
+    }
+
+    if (xf86GetOptValInteger(R128Options, OPTION_USEC_TIMEOUT,
+			     &(info->CCEusecTimeout))) {
+	/* This option checked by the R128 DRM kernel module */
+    }
+
+    return TRUE;
+}
+#endif
+
 static void
 R128ProbeDDC(ScrnInfoPtr pScrn, int index)
 {
     vbeInfoPtr pVbe;
     if (xf86LoadSubModule(pScrn, "vbe")) {
 	pVbe = VBEInit(NULL,index);
-	ConfiguredMonitor = vbeDoEDID(pVbe);
+	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
     }
 }
 
@@ -1152,6 +1491,10 @@
     
     if (!R128PreInitAccel(pScrn))     goto fail;
 
+#ifdef XF86DRI
+    if (!R128PreInitDRI(pScrn))       goto fail;
+#endif
+
     return TRUE;
 
   fail:
@@ -1161,62 +1504,53 @@
     return FALSE;
 }
 
-/* Load a palette for 15bpp mode.  This sends 32 values. */
-static void R128LoadPalette15(ScrnInfoPtr pScrn, int numColors,
-			      int *indices, LOCO *colors, VisualPtr pVisual)
+/* Load a palette. */
+static void R128LoadPalette(ScrnInfoPtr pScrn, int numColors,
+			    int *indices, LOCO *colors, VisualPtr pVisual)
 {
+    R128InfoPtr   info = R128PTR(pScrn);
     int           i;
     int           idx;
     unsigned char r, g, b;
     R128MMIO_VARS();
 
-    for (i = 0; i < numColors; i++) {
-	idx = indices[i];
-	r   = colors[idx].red;
-	g   = colors[idx].green;
-	b   = colors[idx].blue;
-	OUTPAL(idx * 8, r, g, b);
-    }
-}
-
-/* Load a palette for 16bpp mode.  This sends 64 values. */
-static void R128LoadPalette16(ScrnInfoPtr pScrn, int numColors,
-			      int *indices, LOCO *colors, VisualPtr pVisual)
-{
-    int           i;
-    int           idx;
-    unsigned char r, g, b;
-    R128MMIO_VARS();
+    /* Select palette 0 (main CRTC) if using FP-enabled chip */
+    if (info->HasPanelRegs) PAL_SELECT(0);
 
+    if (info->CurrentLayout.depth == 15) {
+	/* 15bpp mode.  This sends 32 values. */
+	for (i = 0; i < numColors; i++) {
+	    idx = indices[i];
+	    r   = colors[idx].red;
+	    g   = colors[idx].green;
+	    b   = colors[idx].blue;
+	    OUTPAL(idx * 8, r, g, b);
+	}
+    }
+    else if (info->CurrentLayout.depth == 16) {
+	/* 16bpp mode.  This sends 64 values. */
 				/* There are twice as many green values as
                                    there are values for red and blue.  So,
                                    we take each red and blue pair, and
                                    combine it with each of the two green
                                    values. */
-    for (i = 0; i < numColors; i++) {
-	idx = indices[i];
-	r   = colors[idx / 2].red;
-	g   = colors[idx].green;
-	b   = colors[idx / 2].blue;
-	OUTPAL(idx * 4, r, g, b);
+	for (i = 0; i < numColors; i++) {
+	    idx = indices[i];
+	    r   = colors[idx / 2].red;
+	    g   = colors[idx].green;
+	    b   = colors[idx / 2].blue;
+	    OUTPAL(idx * 4, r, g, b);
+	}
     }
-}
-
-/* Load a palette for 8bpp mode.  This sends 256 values. */
-static void R128LoadPalette(ScrnInfoPtr pScrn, int numColors,
-			    int *indices, LOCO *colors, VisualPtr pVisual)
-{
-    int           i;
-    int           idx;
-    unsigned char r, g, b;
-    R128MMIO_VARS();
-
-    for (i = 0; i < numColors; i++) {
-	idx = indices[i];
-	r   = colors[idx].red;
-	b   = colors[idx].blue;
-	g   = colors[idx].green;
-	OUTPAL(idx, r, g, b);
+    else {
+	/* 8bpp mode.  This sends 256 values. */
+	for (i = 0; i < numColors; i++) {
+	    idx = indices[i];
+	    r   = colors[idx].red;
+	    b   = colors[idx].blue;
+	    g   = colors[idx].green;
+	    OUTPAL(idx, r, g, b);
+	}
     }
 }
 
@@ -1231,9 +1565,20 @@
 
     R128TRACE(("R128ScreenInit %x %d\n", pScrn->memPhysBase, pScrn->fbOffset));
     
+#ifdef XF86DRI
+				/* Turn off the CCE for now. */
+    info->CCEInUse     = FALSE;
+#endif
+
     if (!R128MapMem(pScrn)) return FALSE;
     pScrn->fbOffset    = 0;
-    
+#ifdef XF86DRI
+    info->fbX          = 0;
+    info->fbY          = 0;
+#endif
+
+    info->PaletteSavedOnVT = FALSE;
+
     R128Save(pScrn);
     if (info->FBDev) {
 	if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) return FALSE;
@@ -1251,6 +1596,18 @@
 			  pScrn->rgbBits,
 			  pScrn->defaultVisual)) return FALSE;
 
+#ifdef XF86DRI
+				/* Setup DRI after visuals have been
+                                   established, but before cfbScreenInit is
+                                   called.  cfbScreenInit will eventually
+                                   call the driver's InitGLXVisuals call
+                                   back. */
+    if (!xf86ReturnOptValBool(R128Options, OPTION_NOACCEL, FALSE))
+	info->directRenderingEnabled = R128DRIScreenInit(pScreen);
+    else
+	info->directRenderingEnabled = FALSE;
+#endif
+
 #ifdef USE_FB
     if (!fbScreenInit (pScreen, info->FB,
 		       pScrn->virtualX, pScrn->virtualY,
@@ -1317,11 +1674,13 @@
 	}
     }
 
+    R128DGAInit(pScreen);
+
 				/* Memory manager setup */
     MemBox.x1 = 0;
     MemBox.y1 = 0;
     MemBox.x2 = pScrn->displayWidth;
-    y2        = info->FbMapSize / (pScrn->displayWidth * info->pixel_bytes);
+    y2        = info->FbMapSize / (pScrn->displayWidth * info->CurrentLayout.pixel_bytes);
     if (y2 >= 32768) y2 = 32767; /* because MemBox.y2 is signed short */
     MemBox.y2 = y2;
 
@@ -1358,6 +1717,103 @@
 	}
     }
 
+#ifdef XF86DRI
+				/* Allocate frame buffer space for the
+                                   shared back and depth buffers as well
+                                   as for local textures. */
+    if (info->directRenderingEnabled) {
+	FBAreaPtr fbarea;
+	int       width_bytes = (pScrn->displayWidth *
+				 info->CurrentLayout.pixel_bytes);
+	int       maxy        = info->FbMapSize / width_bytes;
+	int       l;
+	
+				/* Allocate the shared back buffer */
+	if ((fbarea = xf86AllocateOffscreenArea(pScreen,
+						pScrn->virtualX,
+						pScrn->virtualY,
+						32, NULL, NULL, NULL))) {
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		       "Reserved back buffer from (%d,%d) to (%d,%d)\n",
+		       fbarea->box.x1, fbarea->box.y1,
+		       fbarea->box.x2, fbarea->box.y2);
+
+	    info->backX = fbarea->box.x1;
+	    info->backY = fbarea->box.y1;
+	} else {
+	    xf86DrvMsg(scrnIndex, X_ERROR, "Unable to reserve back buffer\n");
+	    info->backX = -1;
+	    info->backY = -1;
+	}
+
+				/* Allocate the shared depth buffer */
+	if ((fbarea = xf86AllocateOffscreenArea(pScreen,
+						pScrn->virtualX,
+						pScrn->virtualY,
+						32, NULL, NULL, NULL))) {
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		       "Reserved depth buffer from (%d,%d) to (%d,%d)\n",
+		       fbarea->box.x1, fbarea->box.y1,
+		       fbarea->box.x2, fbarea->box.y2);
+
+	    info->depthX = fbarea->box.x1;
+	    info->depthY = fbarea->box.y1;
+	} else {
+	    xf86DrvMsg(scrnIndex, X_ERROR, "Unable to reserve depth buffer\n");
+	    info->depthX = -1;
+	    info->depthY = -1;
+	}
+
+				/* Allocate local texture space */
+	if (((maxy - MemBox.y2 - 1) * width_bytes) >
+	    (pScrn->virtualX * pScrn->virtualY * 2 *
+	     info->CurrentLayout.pixel_bytes)) {
+	    info->textureX = 0;
+	    info->textureY = MemBox.y2 + 1;
+	    info->textureSize = (maxy - MemBox.y2 - 1) * width_bytes;
+
+	    l = R128MinBits((info->textureSize-1) / R128_NR_TEX_REGIONS);
+	    if (l < R128_LOG_TEX_GRANULARITY) l = R128_LOG_TEX_GRANULARITY;
+
+	    info->log2TexGran = l;
+	    info->textureSize = (info->textureSize >> l) << l;
+
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		       "Reserved %d kb for textures: (%d,%d)-(%d,%d)\n",
+		       info->textureSize/1024,
+		       info->textureX,      info->textureY,
+		       pScrn->displayWidth, maxy);
+	} else if ((fbarea = xf86AllocateOffscreenArea(pScreen,
+						       pScrn->virtualX,
+						       pScrn->virtualY * 2,
+						       32,
+						       NULL, NULL, NULL))) {
+	    info->textureX = fbarea->box.x1;
+	    info->textureY = fbarea->box.y1;
+	    info->textureSize = ((fbarea->box.y2 - fbarea->box.y1) *
+				 (fbarea->box.x2 - fbarea->box.x1) *
+				 info->CurrentLayout.pixel_bytes);
+
+	    l = R128MinBits((info->textureSize-1) / R128_NR_TEX_REGIONS);
+	    if (l < R128_LOG_TEX_GRANULARITY) l = R128_LOG_TEX_GRANULARITY;
+
+	    info->log2TexGran = l;
+	    info->textureSize = (info->textureSize >> l) << l;
+
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		       "Reserved %d kb for textures: (%d,%d)-(%d,%d)\n",
+		       info->textureSize/1024,
+		       fbarea->box.x1, fbarea->box.y1,
+		       fbarea->box.x2, fbarea->box.y2);
+	} else {
+	    xf86DrvMsg(scrnIndex, X_ERROR,
+		       "Unable to reserve texture space in frame buffer\n");
+	    info->textureX = -1;
+	    info->textureY = -1;
+	}
+    }
+#endif
+
 				/* Backing store setup */
     miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
@@ -1403,28 +1859,12 @@
 
 				/* Colormap setup */
     if (!miCreateDefColormap(pScreen)) return FALSE;
-    if (pScrn->depth == 15) {
-	if (!xf86HandleColormaps(pScreen, 256, info->dac6bits ? 6 : 8,
-				 (info->FBDev ? fbdevHWLoadPalette :
-				 R128LoadPalette15), NULL,
-				 CMAP_PALETTED_TRUECOLOR
-				 | CMAP_RELOAD_ON_MODE_SWITCH
-				 | CMAP_LOAD_EVEN_IF_OFFSCREEN)) return FALSE;
-    } else if (pScrn->depth == 16) {
-	if (!xf86HandleColormaps(pScreen, 256, info->dac6bits ? 6 : 8,
-				 (info->FBDev ? fbdevHWLoadPalette :
-				 R128LoadPalette16), NULL,
-				 CMAP_PALETTED_TRUECOLOR
-				 | CMAP_RELOAD_ON_MODE_SWITCH
-				 | CMAP_LOAD_EVEN_IF_OFFSCREEN)) return FALSE;
-    } else {
-	if (!xf86HandleColormaps(pScreen, 256, info->dac6bits ? 6 : 8,
-				 (info->FBDev ? fbdevHWLoadPalette :
-				 R128LoadPalette), NULL,
-				 CMAP_PALETTED_TRUECOLOR
-				 | CMAP_RELOAD_ON_MODE_SWITCH
-				 | CMAP_LOAD_EVEN_IF_OFFSCREEN)) return FALSE;
-    }
+    if (!xf86HandleColormaps(pScreen, 256, info->dac6bits ? 6 : 8,
+			     (info->FBDev ? fbdevHWLoadPalette :
+			     R128LoadPalette), NULL,
+			     CMAP_PALETTED_TRUECOLOR
+			     | CMAP_RELOAD_ON_MODE_SWITCH
+			     | CMAP_LOAD_EVEN_IF_OFFSCREEN)) return FALSE;
 
 				/* DPMS setup */
 #ifdef DPMSExtension
@@ -1453,6 +1893,21 @@
     if (serverGeneration == 1)
 	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
 
+#ifdef XF86DRI
+				/* DRI finalization */
+    if (info->directRenderingEnabled) {
+				/* Now that mi, cfb, drm and others have
+                                   done their thing, complete the DRI
+                                   setup. */
+        info->directRenderingEnabled = R128DRIFinishScreenInit(pScreen);
+    }
+    if (info->directRenderingEnabled) {
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
+    } else {
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering disabled\n");
+    }
+#endif
+
     return TRUE;
 }
 
@@ -1473,7 +1928,7 @@
     OUTREG(R128_GEN_INT_CNTL,         restore->gen_int_cntl);
     OUTREG(R128_CAP0_TRIG_CNTL,       restore->cap0_trig_cntl);
     OUTREG(R128_CAP1_TRIG_CNTL,       restore->cap1_trig_cntl);
-    OUTREG(R128_BUS_CNTL,	      restore->bus_cntl);
+    OUTREG(R128_BUS_CNTL,             restore->bus_cntl);
 }
 
 /* Write CRTC registers. */
@@ -1498,6 +1953,24 @@
     OUTREG(R128_CRTC_PITCH,           restore->crtc_pitch);
 }
 
+/* Write flat panel registers */
+static void R128RestoreFPRegisters(ScrnInfoPtr pScrn, R128SavePtr restore)
+{
+    R128MMIO_VARS();
+
+    OUTREG(R128_CRTC2_GEN_CNTL,       restore->crtc2_gen_cntl);
+    OUTREG(R128_FP_CRTC_H_TOTAL_DISP, restore->fp_crtc_h_total_disp);
+    OUTREG(R128_FP_CRTC_V_TOTAL_DISP, restore->fp_crtc_v_total_disp);
+    OUTREG(R128_FP_GEN_CNTL,          restore->fp_gen_cntl);
+    OUTREG(R128_FP_H_SYNC_STRT_WID,   restore->fp_h_sync_strt_wid);
+    OUTREG(R128_FP_HORZ_STRETCH,      restore->fp_horz_stretch);
+    OUTREG(R128_FP_PANEL_CNTL,        restore->fp_panel_cntl);
+    OUTREG(R128_FP_V_SYNC_STRT_WID,   restore->fp_v_sync_strt_wid);
+    OUTREG(R128_FP_VERT_STRETCH,      restore->fp_vert_stretch);
+    OUTREG(R128_LVDS_GEN_CNTL,        restore->lvds_gen_cntl);
+    OUTREG(R128_TMDS_CRC,             restore->tmds_crc);
+}
+
 static void R128PLLWaitForReadUpdateComplete(ScrnInfoPtr pScrn)
 {
     while (INPLL(pScrn, R128_PPLL_REF_DIV) & R128_PPLL_ATOMIC_UPDATE_R);
@@ -1566,11 +2039,15 @@
 /* Write palette data. */
 static void R128RestorePalette(ScrnInfoPtr pScrn, R128SavePtr restore)
 {
-    int i;
+    R128InfoPtr info = R128PTR(pScrn);
+    int         i;
     R128MMIO_VARS();
 
     if (!restore->palette_valid) return;
 
+    /* Select palette 0 (main CRTC) if using FP-enabled chip */
+    if (info->HasPanelRegs) PAL_SELECT(0);
+
     OUTPAL_START(0);
     for (i = 0; i < 256; i++) OUTPAL_NEXT_CARD32(restore->palette[i]);
 }
@@ -1581,6 +2058,8 @@
     R128TRACE(("R128RestoreMode(%p)\n", restore));
     R128RestoreCommonRegisters(pScrn, restore);
     R128RestoreCrtcRegisters(pScrn, restore);
+    if (R128PTR(pScrn)->HasPanelRegs && R128PTR(pScrn)->EnableFP)
+	R128RestoreFPRegisters(pScrn, restore);
     R128RestorePLLRegisters(pScrn, restore);
     R128RestoreDDARegisters(pScrn, restore);
     R128RestorePalette(pScrn, restore);
@@ -1603,7 +2082,7 @@
     save->gen_int_cntl       = INREG(R128_GEN_INT_CNTL);
     save->cap0_trig_cntl     = INREG(R128_CAP0_TRIG_CNTL);
     save->cap1_trig_cntl     = INREG(R128_CAP1_TRIG_CNTL);
-    save->bus_cntl	     = INREG(R128_BUS_CNTL);
+    save->bus_cntl           = INREG(R128_BUS_CNTL);
 }
 
 /* Read CRTC registers. */
@@ -1623,6 +2102,24 @@
     save->crtc_pitch           = INREG(R128_CRTC_PITCH);
 }
 
+/* Read flat panel registers */
+static void R128SaveFPRegisters(ScrnInfoPtr pScrn, R128SavePtr save)
+{
+    R128MMIO_VARS();
+
+    save->crtc2_gen_cntl       = INREG(R128_CRTC2_GEN_CNTL);
+    save->fp_crtc_h_total_disp = INREG(R128_FP_CRTC_H_TOTAL_DISP);
+    save->fp_crtc_v_total_disp = INREG(R128_FP_CRTC_V_TOTAL_DISP);
+    save->fp_gen_cntl          = INREG(R128_FP_GEN_CNTL);
+    save->fp_h_sync_strt_wid   = INREG(R128_FP_H_SYNC_STRT_WID);
+    save->fp_horz_stretch      = INREG(R128_FP_HORZ_STRETCH);
+    save->fp_panel_cntl        = INREG(R128_FP_PANEL_CNTL);
+    save->fp_v_sync_strt_wid   = INREG(R128_FP_V_SYNC_STRT_WID);
+    save->fp_vert_stretch      = INREG(R128_FP_VERT_STRETCH);
+    save->lvds_gen_cntl        = INREG(R128_LVDS_GEN_CNTL);
+    save->tmds_crc             = INREG(R128_TMDS_CRC);
+}
+
 /* Read PLL registers. */
 static void R128SavePLLRegisters(ScrnInfoPtr pScrn, R128SavePtr save)
 {
@@ -1652,9 +2149,13 @@
 /* Read palette data. */
 static void R128SavePalette(ScrnInfoPtr pScrn, R128SavePtr save)
 {
-    int i;
+    R128InfoPtr info = R128PTR(pScrn);
+    int         i;
     R128MMIO_VARS();
     
+    /* Select palette 0 (main CRTC) if using FP-enabled chip */
+    if (info->HasPanelRegs) PAL_SELECT(0);
+
     INPAL_START(0);
     for (i = 0; i < 256; i++) save->palette[i] = INPAL_NEXT();
     save->palette_valid = TRUE;
@@ -1667,6 +2168,8 @@
 
     R128SaveCommonRegisters(pScrn, save);
     R128SaveCrtcRegisters(pScrn, save);
+    if (R128PTR(pScrn)->HasPanelRegs && R128PTR(pScrn)->EnableFP)
+	R128SaveFPRegisters(pScrn, save);
     R128SavePLLRegisters(pScrn, save);
     R128SaveDDARegisters(pScrn, save);
     R128SavePalette(pScrn, save);
@@ -1765,7 +2268,7 @@
     int    vsync_wid;
     int    bytpp;
     
-    switch (info->pixel_code) {
+    switch (info->CurrentLayout.pixel_code) {
     case 4:  format = 1; bytpp = 0; hsync_fudge =  0; break;
     case 8:  format = 2; bytpp = 1; hsync_fudge = 18; break;
     case 15: format = 3; bytpp = 2; hsync_fudge =  9; break;	/*  555 */
@@ -1774,7 +2277,7 @@
     case 32: format = 6; bytpp = 4; hsync_fudge =  5; break;	/* xRGB */
     default:
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "Unsupported pixel depth (%d)\n", pScrn->bitsPerPixel);
+		   "Unsupported pixel depth (%d)\n", info->CurrentLayout.bitsPerPixel);
 	return FALSE;
     }
     R128TRACE(("Format = %d (%d bytes per pixel)\n", format, bytpp));
@@ -1834,13 +2337,135 @@
 				    : 0));
     save->crtc_offset      = 0;
     save->crtc_offset_cntl = 0;
-    save->crtc_pitch       = pScrn->displayWidth / 8;
+    save->crtc_pitch       = info->CurrentLayout.displayWidth / 8;
 
     R128TRACE(("Pitch = %d bytes (virtualX = %d, displayWidth = %d)\n",
-	       save->crtc_pitch, pScrn->virtualX, pScrn->displayWidth));
+	       save->crtc_pitch, pScrn->virtualX, info->CurrentLayout.displayWidth));
     return TRUE;
 }
 
+/* Define CRTC registers for requested video mode. */
+static void R128InitFPRegisters(ScrnInfoPtr pScrn, R128SavePtr orig,
+				R128SavePtr save, DisplayModePtr mode,
+				R128InfoPtr info)
+{
+    int   xres = mode->CrtcHDisplay;
+    int   yres = mode->CrtcVDisplay;
+    float Hratio, Vratio;
+    int   disp_end;
+
+    if (info->CRTOnly) {
+	save->crtc_ext_cntl  |= R128_CRTC_CRT_ON;
+	save->crtc2_gen_cntl  = 0;
+	save->fp_gen_cntl     = orig->fp_gen_cntl;
+	save->fp_gen_cntl    &= ~(R128_FP_FPON |
+				  R128_FP_CRTC_USE_SHADOW_VEND |
+				  R128_FP_CRTC_HORZ_DIV2_EN |
+				  R128_FP_CRTC_HOR_CRT_DIV2_DIS |
+				  R128_FP_USE_SHADOW_EN);
+	save->fp_gen_cntl    |= (R128_FP_SEL_CRTC2 |
+				 R128_FP_CRTC_DONT_SHADOW_VPAR);
+	save->fp_panel_cntl   = orig->fp_panel_cntl & ~R128_FP_DIGON;
+	save->lvds_gen_cntl   = orig->lvds_gen_cntl & ~R128_LVDS_ON;
+	return;
+    }
+
+    if (xres > info->PanelXRes) xres = info->PanelXRes;
+    if (yres > info->PanelYRes) yres = info->PanelYRes;
+
+    Hratio = (float)xres/(float)info->PanelXRes;
+    Vratio = (float)yres/(float)info->PanelYRes;
+
+    save->fp_horz_stretch =
+	(((((int)(Hratio * R128_HORZ_STRETCH_RATIO_MAX))
+	   & R128_HORZ_STRETCH_RATIO_MASK) << R128_HORZ_STRETCH_RATIO_SHIFT) |
+	 (orig->fp_horz_stretch & (R128_HORZ_PANEL_SIZE |
+				   R128_HORZ_FP_LOOP_STRETCH |
+				   R128_HORZ_STRETCH_RESERVED)));
+    if (Hratio != 1.0) save->fp_horz_stretch |= (R128_HORZ_STRETCH_BLEND |
+						 R128_HORZ_STRETCH_ENABLE);
+
+    save->fp_vert_stretch =
+	(((((int)(Vratio * R128_VERT_STRETCH_RATIO_MAX))
+	   & R128_VERT_STRETCH_RATIO_MASK) << R128_VERT_STRETCH_RATIO_SHIFT) |
+	 (orig->fp_vert_stretch & (R128_VERT_PANEL_SIZE |
+				   R128_VERT_STRETCH_RESERVED |
+				   R128_VERT_STRETCH_BLEND)));
+    if (Vratio == 1.0) save->fp_vert_stretch &= ~R128_VERT_STRETCH_ENABLE;
+    else               save->fp_vert_stretch |=  R128_VERT_STRETCH_ENABLE;
+
+    save->fp_gen_cntl = ((orig->fp_gen_cntl & ~(R128_FP_SEL_CRTC2 |
+						R128_FP_CRTC_USE_SHADOW_VEND |
+						R128_FP_CRTC_HORZ_DIV2_EN |
+						R128_FP_CRTC_HOR_CRT_DIV2_DIS |
+						R128_FP_USE_SHADOW_EN)) |
+			 R128_FP_CRTC_DONT_SHADOW_VPAR |
+			 R128_FP_TDMS_EN);
+    save->fp_panel_cntl        = orig->fp_panel_cntl;
+    save->fp_crtc_h_total_disp = orig->fp_crtc_h_total_disp;
+    save->fp_crtc_v_total_disp = orig->fp_crtc_v_total_disp;
+    save->fp_h_sync_strt_wid   = orig->fp_h_sync_strt_wid;
+    save->fp_v_sync_strt_wid   = orig->fp_v_sync_strt_wid;
+    save->lvds_gen_cntl        = orig->lvds_gen_cntl;
+
+    save->tmds_crc             = orig->tmds_crc;
+
+    /* Disable CRT output by disabling CRT output and setting the CRT
+       DAC to use CRTC2, which we set to 0's.  In the future, we will
+       want to use the dual CRTC capabilities of the R128 to allow both
+       the flat panel and external CRT to either simultaneously display
+       the same image or display two different images. */
+    save->crtc_ext_cntl  &= ~R128_CRTC_CRT_ON;
+    save->dac_cntl       |= R128_DAC_CRT_SEL_CRTC2;
+    save->crtc2_gen_cntl  = 0;
+
+    save->fp_panel_cntl  |= (R128_FP_DIGON | R128_FP_BLON);
+    save->fp_gen_cntl    |= (R128_FP_FPON);
+
+    save->crtc_gen_cntl  &= ~(R128_CRTC_DBL_SCAN_EN |
+			      R128_CRTC_INTERLACE_EN |
+			      R128_CRTC_CSYNC_EN |
+			      R128_CRTC_CUR_EN |
+			      R128_CRTC_CUR_MODE_MASK |
+			      R128_CRTC_ICON_EN |
+			      R128_CRTC_EXT_DISP_EN |
+			      R128_CRTC_EN |
+			      R128_CRTC_DISP_REQ_EN_B);
+    save->crtc_gen_cntl  |= R128_CRTC_EXT_DISP_EN | R128_CRTC_EN;
+
+    disp_end = xres/8 - 1;
+    save->crtc_h_total_disp = ((disp_end << R128_CRTC_H_DISP_SHIFT) |
+			       (disp_end + info->PanelHNonVis));
+
+    save->crtc_h_sync_strt_wid &= ~(R128_CRTC_H_SYNC_STRT_PIX |
+				    R128_CRTC_H_SYNC_STRT_CHAR |
+				    R128_CRTC_H_SYNC_WID);
+    save->crtc_h_sync_strt_wid |=
+	(disp_end + info->PanelHOverPlus) << R128_CRTC_H_SYNC_STRT_CHAR_SHIFT;
+    switch (info->CurrentLayout.pixel_code) {
+	/* Adjustments are from ATI */
+    case 8:  save->crtc_h_sync_strt_wid |= 2; break;
+    case 15:
+    case 16: save->crtc_h_sync_strt_wid |= 1; break;
+    case 24: save->crtc_h_sync_strt_wid |= 6; break;
+    case 32: save->crtc_h_sync_strt_wid |= 5; break;
+    }
+    save->crtc_h_sync_strt_wid |=
+	info->PanelHSyncWidth << R128_CRTC_H_SYNC_WID_SHIFT;
+    save->crtc_h_sync_strt_wid |= R128_CRTC_H_SYNC_POL;
+
+    disp_end = yres - 1;
+    save->crtc_v_total_disp = ((disp_end << R128_CRTC_V_DISP_SHIFT) |
+			       (disp_end + info->PanelVNonVis));
+
+    save->crtc_v_sync_strt_wid &= ~(R128_CRTC_V_SYNC_STRT |
+				    R128_CRTC_V_SYNC_WID);
+    save->crtc_v_sync_strt_wid |= (disp_end + info->PanelVOverPlus);
+    save->crtc_v_sync_strt_wid |=
+	info->PanelVSyncWidth << R128_CRTC_V_SYNC_WID_SHIFT;
+    save->crtc_v_sync_strt_wid |= R128_CRTC_V_SYNC_POL;
+}
+
 /* Define PLL registers for requested video mode. */
 static void R128InitPLLRegisters(ScrnInfoPtr pScrn, R128SavePtr save,
 				 DisplayModePtr mode, R128PLLPtr pll,
@@ -1914,13 +2539,13 @@
 		       pll->reference_div * save->post_div);
 		
     XclksPerTransfer = R128Div(XclkFreq * DisplayFifoWidth,
-			       VclkFreq * (info->pixel_bytes * 8));
+			       VclkFreq * (info->CurrentLayout.pixel_bytes * 8));
     
     UseablePrecision = R128MinBits(XclksPerTransfer) + 1;
     
     XclksPerTransferPrecise = R128Div((XclkFreq * DisplayFifoWidth)
 				      << (11 - UseablePrecision),
-				      VclkFreq * (info->pixel_bytes * 8));
+				      VclkFreq * (info->CurrentLayout.pixel_bytes * 8));
     
     Roff  = XclksPerTransferPrecise * (DisplayFifoDepth - 4);
     
@@ -2022,11 +2647,13 @@
     
     R128InitCommonRegisters(save, mode, info);
     if (!R128InitCrtcRegisters(pScrn, save, mode, info)) return FALSE;
+    if (info->HasPanelRegs && info->EnableFP)
+	R128InitFPRegisters(pScrn, &info->SavedReg, save, mode, info);
     R128InitPLLRegisters(pScrn, save, mode, &info->pll, dot_clock);
     if (!R128InitDDARegisters(pScrn, save, mode, &info->pll, info))
 	return FALSE;
-    R128InitPalette(save, info);
-    
+    if (!info->PaletteSavedOnVT) R128InitPalette(save, info);
+
     R128TRACE(("R128Init returns %p\n", save));
     return TRUE;
 }
@@ -2037,9 +2664,13 @@
     R128InfoPtr info      = R128PTR(pScrn);
     
     if (!R128Init(pScrn, mode, &info->ModeReg)) return FALSE;
+				/* FIXME?  DRILock/DRIUnlock here? */
     R128Blank(pScrn);
     R128RestoreMode(pScrn, &info->ModeReg);
     R128Unblank(pScrn);
+
+    info->CurrentLayout.mode = mode;
+
     return TRUE;
 }
 
@@ -2054,7 +2685,7 @@
     return TRUE;
 }
 
-static Bool R128SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+Bool R128SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
     return R128ModeInit(xf86Screens[scrnIndex], mode);
 }
@@ -2068,16 +2699,16 @@
 
 /* Adjust viewport into virtual desktop such that (0,0) in viewport space
    is (x,y) in virtual space. */
-static void R128AdjustFrame(int scrnIndex, int x, int y, int flags)
+void R128AdjustFrame(int scrnIndex, int x, int y, int flags)
 {
     ScrnInfoPtr   pScrn = xf86Screens[scrnIndex];
     R128InfoPtr   info  = R128PTR(pScrn);
     int           Base;
     R128MMIO_VARS();
 
-    Base = y * pScrn->displayWidth + x;
+    Base = y * info->CurrentLayout.displayWidth + x;
 
-    switch (info->pixel_code) {
+    switch (info->CurrentLayout.pixel_code) {
     case 15:
     case 16: Base *= 2; break;
     case 24: Base *= 3; break;
@@ -2086,7 +2717,7 @@
 
     Base &= ~7;			/* 3 lower bits are always 0 */
 
-    if (info->pixel_code == 24)
+    if (info->CurrentLayout.pixel_code == 24)
 	Base += 8 * (Base % 3); /* Must be multiple of 8 and 3 */
 
     OUTREG(R128_CRTC_OFFSET, Base);
@@ -2096,14 +2727,43 @@
    mode. */
 static Bool R128EnterVT(int scrnIndex, int flags)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    ScrnInfoPtr pScrn   = xf86Screens[scrnIndex];
+    R128InfoPtr info  = R128PTR(pScrn);
 
     R128TRACE(("R128EnterVT\n"));
+#ifdef XF86DRI
+    if (R128PTR(pScrn)->directRenderingEnabled) {
+	R128CCEStart(pScrn);
+	DRIUnlock(pScrn->pScreen);
+    }
+#endif
     if (!R128ModeInit(pScrn, pScrn->currentMode)) return FALSE;
+    info->PaletteSavedOnVT = FALSE;
     R128AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+
     return TRUE;
 }
 
+/* Called when VT switching away from the X server.  Restore the original
+   text mode. */
+static void R128LeaveVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    R128InfoPtr info  = R128PTR(pScrn);
+    R128SavePtr save  = &info->ModeReg;
+
+    R128TRACE(("R128LeaveVT\n"));
+#ifdef XF86DRI
+    if (R128PTR(pScrn)->directRenderingEnabled) {
+	DRILock(pScrn->pScreen, 0);
+	R128CCEStop(pScrn);
+    }
+#endif
+    R128SavePalette(pScrn, save);
+    info->PaletteSavedOnVT = TRUE;
+    R128Restore(pScrn);
+}
+
 static Bool
 R128EnterVTFBDev(int scrnIndex, int flags)
 {
@@ -2116,8 +2776,6 @@
     return TRUE;
 }
 
-/* Called when VT switching away from the X server.  Restore the original
-   text mode. */
 static void R128LeaveVTFBDev(int scrnIndex, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@@ -2127,14 +2785,6 @@
     fbdevHWLeaveVT(scrnIndex,flags);
 }
 
-static void R128LeaveVT(int scrnIndex, int flags)
-{
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
-    R128TRACE(("R128LeaveVT\n"));
-    R128Restore(pScrn);
-}
-
 /* Called at the end of each server generation.  Restore the original text
    mode, unmap video memory, and unwrap and call the saved CloseScreen
    function.  */
@@ -2144,6 +2794,15 @@
     R128InfoPtr info  = R128PTR(pScrn);
 
     R128TRACE(("R128CloseScreen\n"));
+
+#ifdef XF86DRI
+				/* Disable direct rendering */
+    if (info->directRenderingEnabled) {
+	R128DRICloseScreen(pScreen);
+	info->directRenderingEnabled = FALSE;
+    }
+#endif
+    
     if (pScrn->vtSema) {
 	R128Restore(pScrn);
 	R128UnmapMem(pScrn);
@@ -2157,6 +2816,9 @@
     
     if (info->cursor)            xf86DestroyCursorInfoRec(info->cursor);
     info->cursor                 = NULL;
+
+    if (info->DGAModes)          xfree(info->DGAModes);
+    info->DGAModes               = NULL;
     
     pScrn->vtSema = FALSE;
 
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_reg.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/r128/r128_reg.h:1.6 xc/programs/Xserver/hw/xfree86/drivers/r128/r128_reg.h:1.11
--- xc/programs/Xserver/hw/xfree86/drivers/r128/r128_reg.h:1.6	Tue Feb 22 20:47:19 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_reg.h	Fri Jun 30 18:40:46 2000
@@ -1,8 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_reg.h,v 1.6 2000/02/23 04:47:19 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_reg.h,v 1.11 2000/07/01 01:40:46 martin Exp $ */
 /**************************************************************************
 
-Copyright 1999 ATI Technologies Inc. and Precision Insight, Inc.,
-                                         Cedar Park, Texas. 
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -46,51 +46,7 @@
 #define _R128_REG_H_
 #include <compiler.h>
 
-#if defined(__powerpc__)
-
-static inline void regw(volatile unsigned long base_addr, unsigned long regindex, unsigned long regdata)
-{
- asm volatile ("stwbrx %1,%2,%3; eieio"
-          : "=m" (*(volatile unsigned *)(base_addr+regindex))
-          : "r" (regdata), "b" (regindex), "r" (base_addr));
-}
-
-static inline void regw16(volatile unsigned long base_addr, unsigned long regindex, unsigned short regdata)
-{
-  asm volatile ("sthbrx %0,%1,%2; eieio": : "r"(regdata), "b"(regindex), "r"(base_addr));
-}
-
-static inline unsigned long regr(volatile unsigned long base_addr, unsigned long regindex)
-{
-  register unsigned long val;
-  asm volatile ("lwbrx %0,%1,%2; eieio"
-           : "=r"(val)
-           : "b"(regindex), "r"(base_addr),
-             "m" (*(volatile unsigned *)(base_addr+regindex)));
-  return(val);
-}
-
-static inline unsigned short regr16(volatile unsigned long base_addr, unsigned long regindex)
-{
-  register unsigned short val;
-  asm volatile ("lhbrx %0,%1,%2; eieio": "=r"(val):"b"(regindex), "r"(base_addr));
-  return(val);
-}
-
 				/* Memory mapped register access macros */
-#define INREG(addr)         regr(((unsigned long)R128MMIO),(addr))
-#define INREG8(addr)        *(volatile CARD8  *)(R128MMIO + (addr))
-#define INREG16(addr)       regr16(((unsigned long)R128MMIO), (addr))
-#define OUTREG(addr, val)   regw(((unsigned long)R128MMIO), (addr), (val))
-#define OUTREG8(addr, val)  *(volatile CARD8  *)(R128MMIO + (addr)) = (val)
-#define OUTREG16(addr, val) regw16(((unsigned long)R128MMIO), (addr), (val))
-#define ADDRREG(addr)       ((volatile CARD32 *)(R128MMIO + (addr)))
-
-#define R128MMIO_VARS()                                                     \
-    unsigned char *R128MMIO   = R128PTR(pScrn)->MMIO
-
-#else
-				/* Memory mapped register access macros */
 #define INREG8(addr)        MMIO_IN8(R128MMIO, addr)
 #define INREG16(addr)       MMIO_IN16(R128MMIO, addr)
 #define INREG(addr)         MMIO_IN32(R128MMIO, addr)
@@ -103,7 +59,6 @@
 #define R128MMIO_VARS()                                                     \
     unsigned char *R128MMIO   = R128PTR(pScrn)->MMIO
 
-#endif
 
 #define OUTREGP(addr, val, mask)   \
     do {                           \
@@ -155,13 +110,37 @@
 
 #define INPAL_NEXT() INREG(R128_PALETTE_DATA)
 
+#define PAL_SELECT(idx)                                                   \
+    do {                                                                  \
+        if (idx) {                                                        \
+            OUTREG(R128_DAC_CNTL, INREG(R128_DAC_CNTL) |                  \
+                   R128_DAC_PALETTE_ACC_CTL);                             \
+        } else {                                                          \
+            OUTREG(R128_DAC_CNTL, INREG(R128_DAC_CNTL) &                  \
+                   ~R128_DAC_PALETTE_ACC_CTL);                            \
+        }                                                                 \
+    } while (0)
+
 #define R128_ADAPTER_ID                   0x0f2c /* PCI */
 #define R128_AGP_APER_OFFSET              0x0178
 #define R128_AGP_BASE                     0x0170
 #define R128_AGP_CNTL                     0x0174
+#       define R128_AGP_APER_SIZE_256MB   (0x00 << 0)
+#       define R128_AGP_APER_SIZE_128MB   (0x20 << 0)
+#       define R128_AGP_APER_SIZE_64MB    (0x30 << 0)
+#       define R128_AGP_APER_SIZE_32MB    (0x38 << 0)
+#       define R128_AGP_APER_SIZE_16MB    (0x3c << 0)
+#       define R128_AGP_APER_SIZE_8MB     (0x3e << 0)
+#       define R128_AGP_APER_SIZE_4MB     (0x3f << 0)
+#       define R128_AGP_APER_SIZE_MASK    (0x3f << 0)
+#define R128_AGP_CNTL_B                   0x0b44
 #define R128_AGP_COMMAND                  0x0f58 /* PCI */
 #define R128_AGP_PLL_CNTL                 0x0010 /* PLL */
 #define R128_AGP_STATUS                   0x0f54 /* PCI */
+#       define R128_AGP_1X_MODE           0x01
+#       define R128_AGP_2X_MODE           0x02
+#       define R128_AGP_4X_MODE           0x04
+#       define R128_AGP_MODE_MASK         0x07
 #define R128_AMCGPIO_A_REG                0x01a0
 #define R128_AMCGPIO_EN_REG               0x01a8
 #define R128_AMCGPIO_MASK                 0x0194
@@ -169,6 +148,15 @@
 #define R128_ATTRDR                       0x03c1 /* VGA */
 #define R128_ATTRDW                       0x03c0 /* VGA */
 #define R128_ATTRX                        0x03c0 /* VGA */
+#       define R128_AUX1_SC_EN            (1 << 0)
+#       define R128_AUX1_SC_MODE_OR       (0 << 1)
+#       define R128_AUX1_SC_MODE_NAND     (1 << 1)
+#       define R128_AUX2_SC_EN            (1 << 2)
+#       define R128_AUX2_SC_MODE_OR       (0 << 3)
+#       define R128_AUX2_SC_MODE_NAND     (1 << 3)
+#       define R128_AUX3_SC_EN            (1 << 4)
+#       define R128_AUX3_SC_MODE_OR       (0 << 5)
+#       define R128_AUX3_SC_MODE_NAND     (1 << 5)
 #define R128_AUX_SC_CNTL                  0x1660
 #define R128_AUX1_SC_BOTTOM               0x1670
 #define R128_AUX1_SC_LEFT                 0x1664
@@ -182,6 +170,8 @@
 #define R128_AUX3_SC_LEFT                 0x1684
 #define R128_AUX3_SC_RIGHT                0x1688
 #define R128_AUX3_SC_TOP                  0x168c
+#define R128_AUX_WINDOW_HORZ_CNTL         0x02d8
+#define R128_AUX_WINDOW_VERT_CNTL         0x02dc
 
 #define R128_BASE_CODE                    0x0f0b
 #define R128_BIOS_0_SCRATCH               0x0010
@@ -257,12 +247,14 @@
 #define R128_BRUSH_SCALE                  0x1470
 #define R128_BRUSH_Y_X                    0x1474
 #define R128_BUS_CNTL                     0x0030
-#	define R128_BUS_RD_DISCARD_EN	  (1 << 24)
-#	define R128_BUS_RD_ABORT_EN	  (1 << 25)
-#	define R128_BUS_MSTR_DISCONNECT_EN (1 << 28)
-#	define R128_BUS_WRT_BURST         (1 << 29)
-#	define R128_BUS_READ_BURST	  (1 << 30)
+#       define R128_BUS_MASTER_DIS         (1 << 6)
+#       define R128_BUS_RD_DISCARD_EN      (1 << 24)
+#       define R128_BUS_RD_ABORT_EN        (1 << 25)
+#       define R128_BUS_MSTR_DISCONNECT_EN (1 << 28)
+#       define R128_BUS_WRT_BURST          (1 << 29)
+#       define R128_BUS_READ_BURST         (1 << 30)
 #define R128_BUS_CNTL1                    0x0034
+#	define R128_BUS_WAIT_ON_LOCK_EN    (1 << 4)
 
 #define R128_CACHE_CNTL                   0x1724
 #define R128_CACHE_LINE                   0x0f0c /* PCI */
@@ -297,6 +289,9 @@
 #define R128_CONFIG_REG_APER_SIZE         0x0110
 #define R128_CONFIG_XSTRAP                0x00e4
 #define R128_CONSTANT_COLOR_C             0x1d34
+#       define R128_CONSTANT_COLOR_MASK   0x00ffffff
+#       define R128_CONSTANT_COLOR_ONE    0x00ffffff
+#       define R128_CONSTANT_COLOR_ZERO   0x00000000
 #define R128_CRC_CMDFIFO_ADDR             0x0740
 #define R128_CRC_CMDFIFO_DOUT             0x0744
 #define R128_CRTC_CRNT_FRAME              0x0214
@@ -308,6 +303,7 @@
 #       define R128_CRTC_HSYNC_DIS        (1 <<  8)
 #       define R128_CRTC_VSYNC_DIS        (1 <<  9)
 #       define R128_CRTC_DISPLAY_DIS      (1 << 10)
+#       define R128_CRTC_CRT_ON           (1 << 15)
 #define R128_CRTC_EXT_CNTL_DPMS_BYTE      0x0055
 #       define R128_CRTC_HSYNC_DIS_BYTE   (1 <<  0)
 #       define R128_CRTC_VSYNC_DIS_BYTE   (1 <<  1)
@@ -315,24 +311,57 @@
 #define R128_CRTC_GEN_CNTL                0x0050
 #       define R128_CRTC_DBL_SCAN_EN      (1 <<  0)
 #       define R128_CRTC_INTERLACE_EN     (1 <<  1)
+#       define R128_CRTC_CSYNC_EN         (1 <<  4)
 #       define R128_CRTC_CUR_EN           (1 << 16)
 #       define R128_CRTC_CUR_MODE_MASK    (7 << 17)
+#       define R128_CRTC_ICON_EN          (1 << 20)
 #       define R128_CRTC_EXT_DISP_EN      (1 << 24)
 #       define R128_CRTC_EN               (1 << 25)
+#       define R128_CRTC_DISP_REQ_EN_B    (1 << 26)
 #define R128_CRTC_GUI_TRIG_VLINE          0x0218
 #define R128_CRTC_H_SYNC_STRT_WID         0x0204
-#       define R128_CRTC_H_SYNC_POL       (1 << 23)
+#       define R128_CRTC_H_SYNC_STRT_PIX        (0x07  <<  0)
+#       define R128_CRTC_H_SYNC_STRT_CHAR       (0x1ff <<  3)
+#       define R128_CRTC_H_SYNC_STRT_CHAR_SHIFT 3
+#       define R128_CRTC_H_SYNC_WID             (0x3f  << 16)
+#       define R128_CRTC_H_SYNC_WID_SHIFT       16
+#       define R128_CRTC_H_SYNC_POL             (1     << 23)
 #define R128_CRTC_H_TOTAL_DISP            0x0200
+#       define R128_CRTC_H_TOTAL          (0x01ff << 0)
+#       define R128_CRTC_H_TOTAL_SHIFT    0
+#       define R128_CRTC_H_DISP           (0x00ff << 16)
+#       define R128_CRTC_H_DISP_SHIFT     16
 #define R128_CRTC_OFFSET                  0x0224
 #define R128_CRTC_OFFSET_CNTL             0x0228
 #define R128_CRTC_PITCH                   0x022c
 #define R128_CRTC_STATUS                  0x005c
 #       define R128_CRTC_VBLANK_SAVE      (1 <<  1)
 #define R128_CRTC_V_SYNC_STRT_WID         0x020c
-#       define R128_CRTC_V_SYNC_POL       (1 << 23)
+#       define R128_CRTC_V_SYNC_STRT       (0x7ff <<  0)
+#       define R128_CRTC_V_SYNC_STRT_SHIFT 0
+#       define R128_CRTC_V_SYNC_WID        (0x1f  << 16)
+#       define R128_CRTC_V_SYNC_WID_SHIFT  16
+#       define R128_CRTC_V_SYNC_POL        (1     << 23)
 #define R128_CRTC_V_TOTAL_DISP            0x0208
+#       define R128_CRTC_V_TOTAL          (0x07ff << 0)
+#       define R128_CRTC_V_TOTAL_SHIFT    0
+#       define R128_CRTC_V_DISP           (0x07ff << 16)
+#       define R128_CRTC_V_DISP_SHIFT     16
 #define R128_CRTC_VLINE_CRNT_VLINE        0x0210
 #       define R128_CRTC_CRNT_VLINE_MASK  (0x7ff << 16)
+#define R128_CRTC2_CRNT_FRAME             0x0314
+#define R128_CRTC2_DEBUG                  0x031c
+#define R128_CRTC2_GEN_CNTL               0x03f8
+#define R128_CRTC2_GUI_TRIG_VLINE         0x0318
+#define R128_CRTC2_H_SYNC_STRT_WID        0x0304
+#define R128_CRTC2_H_TOTAL_DISP           0x0300
+#define R128_CRTC2_OFFSET                 0x0324
+#define R128_CRTC2_OFFSET_CNTL            0x0328
+#define R128_CRTC2_PITCH                  0x032c
+#define R128_CRTC2_STATUS                 0x03fc
+#define R128_CRTC2_V_SYNC_STRT_WID        0x030c
+#define R128_CRTC2_V_TOTAL_DISP           0x0308
+#define R128_CRTC2_VLINE_CRNT_VLINE       0x0310
 #define R128_CRTC8_DATA                   0x03d5 /* VGA, 0x3b5 */
 #define R128_CRTC8_IDX                    0x03d4 /* VGA, 0x3b4 */
 #define R128_CUR_CLR0                     0x026c
@@ -345,6 +374,8 @@
 #define R128_DAC_CNTL                     0x0058
 #       define R128_DAC_RANGE_CNTL        (3 <<  0)
 #       define R128_DAC_BLANKING          (1 <<  2)
+#       define R128_DAC_CRT_SEL_CRTC2     (1 <<  4)
+#       define R128_DAC_PALETTE_ACC_CTL   (1 <<  5)
 #       define R128_DAC_8BIT_EN           (1 <<  8)
 #       define R128_DAC_VGA_ADR_EN        (1 << 13)
 #       define R128_DAC_MASK_ALL          (0xff << 24)
@@ -360,8 +391,8 @@
 #define R128_DEFAULT_SC_BOTTOM_RIGHT      0x16e8
 #       define R128_DEFAULT_SC_RIGHT_MAX  (0x1fff <<  0)
 #       define R128_DEFAULT_SC_BOTTOM_MAX (0x1fff << 16)
-#define R128_DESTINATION_3D_CLR_CMP_MSK   0x1824
 #define R128_DESTINATION_3D_CLR_CMP_VAL   0x1820
+#define R128_DESTINATION_3D_CLR_CMP_MSK   0x1824
 #define R128_DEVICE_ID                    0x0f02 /* PCI */
 #define R128_DP_BRUSH_BKGD_CLR            0x1478
 #define R128_DP_BRUSH_FRGD_CLR            0x147c
@@ -373,6 +404,7 @@
 #       define R128_DST_Y_DIR_TOP_TO_BOTTOM (1 << 15)
 #       define R128_DST_X_DIR_LEFT_TO_RIGHT (1 << 31)
 #define R128_DP_DATATYPE                  0x16c4
+#       define R128_HOST_BIG_ENDIAN_EN    (1 << 29)
 #define R128_DP_GUI_MASTER_CNTL           0x146c
 #       define R128_GMC_SRC_PITCH_OFFSET_CNTL (1    <<  0)
 #       define R128_GMC_DST_PITCH_OFFSET_CNTL (1    <<  1)
@@ -388,6 +420,19 @@
 #       define R128_GMC_BRUSH_8x8_COLOR       (10   <<  4)
 #       define R128_GMC_BRUSH_1X8_COLOR       (12   <<  4)
 #       define R128_GMC_BRUSH_SOLID_COLOR     (13   <<  4)
+#       define R128_GMC_BRUSH_NONE            (15   <<  4)
+#       define R128_GMC_DST_8BPP_CI           (2    <<  8)
+#       define R128_GMC_DST_15BPP             (3    <<  8)
+#       define R128_GMC_DST_16BPP             (4    <<  8)
+#       define R128_GMC_DST_24BPP             (5    <<  8)
+#       define R128_GMC_DST_32BPP             (6    <<  8)
+#       define R128_GMC_DST_8BPP_RGB          (7    <<  8)
+#       define R128_GMC_DST_Y8                (8    <<  8)
+#       define R128_GMC_DST_RGB8              (9    <<  8)
+#       define R128_GMC_DST_VYUY              (11   <<  8)
+#       define R128_GMC_DST_YVYU              (12   <<  8)
+#       define R128_GMC_DST_AYUV444           (14   <<  8)
+#       define R128_GMC_DST_ARGB4444          (15   <<  8)
 #       define R128_GMC_DST_DATATYPE_MASK     (0x0f <<  8)
 #       define R128_GMC_DST_DATATYPE_SHIFT    8
 #       define R128_GMC_SRC_DATATYPE_MASK       (3    << 12)
@@ -395,16 +440,19 @@
 #       define R128_GMC_SRC_DATATYPE_MONO_FG_LA (1    << 12)
 #       define R128_GMC_SRC_DATATYPE_COLOR      (3    << 12)
 #       define R128_GMC_BYTE_PIX_ORDER        (1    << 14)
+#       define R128_GMC_BYTE_MSB_TO_LSB       (0    << 14)
 #       define R128_GMC_BYTE_LSB_TO_MSB       (1    << 14)
 #       define R128_GMC_CONVERSION_TEMP       (1    << 15)
+#       define R128_GMC_CONVERSION_TEMP_6500  (0    << 15)
+#       define R128_GMC_CONVERSION_TEMP_9300  (1    << 15)
 #       define R128_GMC_ROP3_MASK             (0xff << 16)
 #       define R128_DP_SRC_SOURCE_MASK        (7    << 24)
 #       define R128_DP_SRC_SOURCE_MEMORY      (2    << 24)
 #       define R128_DP_SRC_SOURCE_HOST_DATA   (3    << 24)
 #       define R128_GMC_3D_FCN_EN             (1    << 27)
 #       define R128_GMC_CLR_CMP_CNTL_DIS      (1    << 28)
-#       define R128_AUX_CLIP_DIS              (1    << 29)
-#       define R128_GMC_WR_MSK_DS             (1    << 30)
+#       define R128_GMC_AUX_CLIP_DIS          (1    << 29)
+#       define R128_GMC_WR_MSK_DIS            (1    << 30)
 #       define R128_GMC_LD_BRUSH_Y_X          (1    << 31)
 #       define R128_ROP3_ZERO             0x00000000
 #       define R128_ROP3_DSa              0x00880000
@@ -456,6 +504,7 @@
 #define R128_DST_PITCH                    0x1408
 #define R128_DST_PITCH_OFFSET             0x142c
 #define R128_DST_PITCH_OFFSET_C           0x1c80
+#       define R128_PITCH_SHIFT               21
 #define R128_DST_WIDTH                    0x140c
 #define R128_DST_WIDTH_HEIGHT             0x1598
 #define R128_DST_WIDTH_X                  0x1588
@@ -477,13 +526,60 @@
 #define R128_FLUSH_5                      0x1714
 #define R128_FLUSH_6                      0x1718
 #define R128_FLUSH_7                      0x171c
+#define R128_FOG_3D_TABLE_START           0x1810
+#define R128_FOG_3D_TABLE_END             0x1814
+#define R128_FOG_3D_TABLE_DENSITY         0x181c
+#define R128_FOG_TABLE_INDEX              0x1a14
+#define R128_FOG_TABLE_DATA               0x1a18
+#define R128_FP_CRTC_H_TOTAL_DISP         0x0250
+#define R128_FP_CRTC_V_TOTAL_DISP         0x0254
+#define R128_FP_GEN_CNTL                  0x0284
+#       define R128_FP_FPON                  (1 << 0)
+#       define R128_FP_TDMS_EN               (1 <<  2)
+#       define R128_FP_SEL_CRTC2             (1 << 13)
+#       define R128_FP_CRTC_DONT_SHADOW_VPAR (1 << 16)
+#       define R128_FP_CRTC_USE_SHADOW_VEND  (1 << 18)
+#       define R128_FP_CRTC_HORZ_DIV2_EN     (1 << 20)
+#       define R128_FP_CRTC_HOR_CRT_DIV2_DIS (1 << 21)
+#       define R128_FP_USE_SHADOW_EN         (1 << 24)
+#define R128_FP_H_SYNC_STRT_WID           0x02c4
+#define R128_FP_HORZ_STRETCH              0x028c
+#       define R128_HORZ_STRETCH_RATIO_MASK  0xffff
+#       define R128_HORZ_STRETCH_RATIO_SHIFT 0
+#       define R128_HORZ_STRETCH_RATIO_MAX   4096
+#       define R128_HORZ_PANEL_SIZE          (0xff   << 16)
+#       define R128_HORZ_PANEL_SHIFT         16
+#       define R128_HORZ_STRETCH_PIXREP      (0      << 25)
+#       define R128_HORZ_STRETCH_BLEND       (1      << 25)
+#       define R128_HORZ_STRETCH_ENABLE      (1      << 26)
+#       define R128_HORZ_FP_LOOP_STRETCH     (0x7    << 27)
+#       define R128_HORZ_STRETCH_RESERVED    0xc0000000
+
+#define R128_FP_PANEL_CNTL                0x0288
+#       define R128_FP_DIGON              (1 << 0)
+#       define R128_FP_BLON               (1 << 1)
+#define R128_FP_V_SYNC_STRT_WID           0x02c8
+#define R128_FP_VERT_STRETCH              0x0290
+#       define R128_VERT_PANEL_SIZE          (0x7ff <<  0)
+#       define R128_VERT_PANEL_SHIFT         0
+#       define R128_VERT_STRETCH_RATIO_MASK  0x3ff
+#       define R128_VERT_STRETCH_RATIO_SHIFT 11
+#       define R128_VERT_STRETCH_RATIO_MAX   1024
+#       define R128_VERT_STRETCH_ENABLE      (1     << 24)
+#       define R128_VERT_STRETCH_LINEREP     (0     << 25)
+#       define R128_VERT_STRETCH_BLEND       (1     << 25)
+#       define R128_VERT_STRETCH_RESERVED    0xf8e00000
 
 #define R128_GEN_INT_CNTL                 0x0040
 #define R128_GEN_INT_STATUS               0x0044
 #       define R128_VSYNC_INT_AK          (1 <<  2)
 #       define R128_VSYNC_INT             (1 <<  2)
 #define R128_GEN_RESET_CNTL               0x00f0
-#       define R128_SOFT_RESET_GUI        (1 <<  0)
+#       define R128_SOFT_RESET_GUI          (1 <<  0)
+#       define R128_SOFT_RESET_VCLK         (1 <<  8)
+#       define R128_SOFT_RESET_PCLK         (1 <<  9)
+#       define R128_SOFT_RESET_DISPENG_XCLK (1 << 11)
+#       define R128_SOFT_RESET_MEMCTLR_XCLK (1 << 12)
 #define R128_GENENB                       0x03c3 /* VGA */
 #define R128_GENFC_RD                     0x03ca /* VGA */
 #define R128_GENFC_WT                     0x03da /* VGA, 0x03ba */
@@ -542,6 +638,7 @@
 #define R128_HOST_PATH_CNTL               0x0130
 #define R128_HTOTAL_CNTL                  0x0009 /* PLL */
 #define R128_HW_DEBUG                     0x0128
+#define R128_HW_DEBUG2                    0x011c
 
 #define R128_I2C_CNTL_1                   0x0094 /* ? */
 #define R128_INTERRUPT_LINE               0x0f3c /* PCI */
@@ -554,11 +651,15 @@
 #define R128_LEAD_BRES_INC                0x1604
 #define R128_LEAD_BRES_LNTH               0x161c
 #define R128_LEAD_BRES_LNTH_SUB           0x1624
+#define R128_LVDS_GEN_CNTL                0x02d0
+#       define R128_LVDS_ON               (1 <<  0)
+#       define R128_LVDS_SEL_CRTC2        (1 << 23)
 
 #define R128_MAX_LATENCY                  0x0f3f /* PCI */
 #define R128_MCLK_CNTL                    0x000f /* PLL */
 #       define R128_FORCE_GCP             (1 << 16)
-#       define R128_FORCE_PIPE3D_CPP      (1 << 17)
+#       define R128_FORCE_PIPE3D_CP       (1 << 17)
+#       define R128_FORCE_RCP             (1 << 18)
 #define R128_MDGPIO_A_REG                 0x01ac
 #define R128_MDGPIO_EN_REG                0x01b0
 #define R128_MDGPIO_MASK                  0x0198
@@ -573,7 +674,6 @@
 #define R128_MEM_VGA_RP_SEL               0x003c
 #define R128_MEM_VGA_WP_SEL               0x0038
 #define R128_MIN_GRANT                    0x0f3e /* PCI */
-#define R128_MISC_3D_STATE_CNTL_REG       0x1CA0
 #define R128_MM_DATA                      0x0004
 #define R128_MM_INDEX                     0x0000
 #define R128_MPLL_CNTL                    0x000e /* PLL */
@@ -592,7 +692,11 @@
 #define R128_PC_DEBUG_MODE                0x1760
 #define R128_PC_GUI_CTLSTAT               0x1748
 #define R128_PC_GUI_MODE                  0x1744
+#       define R128_PC_IGNORE_UNIFY       (1 << 5)
+#define R128_PC_MISC_CNTL                 0x0188
 #define R128_PC_NGUI_CTLSTAT              0x0184
+#       define R128_PC_FLUSH_GUI          (3 << 0)
+#       define R128_PC_RI_GUI             (1 << 2)
 #       define R128_PC_FLUSH_ALL          0x00ff
 #       define R128_PC_BUSY               (1 << 31)
 #define R128_PC_NGUI_MODE                 0x0180
@@ -669,11 +773,13 @@
 #define R128_TEST_DEBUG_CNTL              0x0120
 #define R128_TEST_DEBUG_MUX               0x0124
 #define R128_TEST_DEBUG_OUT               0x012c
+#define R128_TMDS_CRC                     0x02a0
 #define R128_TRAIL_BRES_DEC               0x1614
 #define R128_TRAIL_BRES_ERR               0x160c
 #define R128_TRAIL_BRES_INC               0x1610
 #define R128_TRAIL_X                      0x1618
 #define R128_TRAIL_X_SUB                  0x1620
+
 #define R128_VCLK_ECP_CNTL                0x0008 /* PLL */
 #define R128_VENDOR_ID                    0x0f00 /* PCI */
 #define R128_VGA_DDA_CONFIG               0x02e8
@@ -689,6 +795,547 @@
 #define R128_XDLL_CNTL                    0x000c /* PLL */
 #define R128_XPLL_CNTL                    0x000b /* PLL */
 
+				/* Registers for CCE and Microcode Engine */
+#define R128_PM4_MICROCODE_ADDR           0x07d4
+#define R128_PM4_MICROCODE_RADDR          0x07d8
+#define R128_PM4_MICROCODE_DATAH          0x07dc
+#define R128_PM4_MICROCODE_DATAL          0x07e0
+
+#define R128_PM4_BUFFER_OFFSET            0x0700
+#define R128_PM4_BUFFER_CNTL              0x0704
+#       define R128_PM4_NONPM4                 (0  << 28)
+#       define R128_PM4_192PIO                 (1  << 28)
+#       define R128_PM4_192BM                  (2  << 28)
+#       define R128_PM4_128PIO_64INDBM         (3  << 28)
+#       define R128_PM4_128BM_64INDBM          (4  << 28)
+#       define R128_PM4_64PIO_128INDBM         (5  << 28)
+#       define R128_PM4_64BM_128INDBM          (6  << 28)
+#       define R128_PM4_64PIO_64VCBM_64INDBM   (7  << 28)
+#       define R128_PM4_64BM_64VCBM_64INDBM    (8  << 28)
+#       define R128_PM4_64PIO_64VCPIO_64INDPIO (15 << 28)
+#define R128_PM4_BUFFER_WM_CNTL           0x0708
+#       define R128_WMA_SHIFT                  0
+#       define R128_WMB_SHIFT                  8
+#       define R128_WMC_SHIFT                 16
+#       define R128_WB_WM_SHIFT               24
+#define R128_PM4_BUFFER_DL_RPTR_ADDR      0x070c
+#define R128_PM4_BUFFER_DL_RPTR           0x0710
+#define R128_PM4_BUFFER_DL_WPTR           0x0714
+#       define R128_PM4_BUFFER_DL_DONE    (1 << 31)
+#define R128_PM4_BUFFER_DL_WPTR_DELAY     0x0718
+#	define R128_PRE_WRITE_TIMER_SHIFT      0
+#	define R128_PRE_WRITE_LIMIT_SHIFT     23
+#define R128_PM4_VC_FPU_SETUP             0x071c
+#       define R128_FRONT_DIR_CW          (0 <<  0)
+#       define R128_FRONT_DIR_CCW         (1 <<  0)
+#       define R128_FRONT_DIR_MASK        (1 <<  0)
+#       define R128_BACKFACE_CULL         (0 <<  1)
+#       define R128_BACKFACE_POINTS       (1 <<  1)
+#       define R128_BACKFACE_LINES        (2 <<  1)
+#       define R128_BACKFACE_SOLID        (3 <<  1)
+#       define R128_BACKFACE_MASK         (3 <<  1)
+#       define R128_FRONTFACE_CULL        (0 <<  3)
+#       define R128_FRONTFACE_POINTS      (1 <<  3)
+#       define R128_FRONTFACE_LINES       (2 <<  3)
+#       define R128_FRONTFACE_SOLID       (3 <<  3)
+#       define R128_FRONTFACE_MASK        (3 <<  3)
+#       define R128_FPU_COLOR_SOLID       (0 <<  5)
+#       define R128_FPU_COLOR_FLAT        (1 <<  5)
+#       define R128_FPU_COLOR_GOURAUD     (2 <<  5)
+#       define R128_FPU_COLOR_GOURAUD2    (3 <<  5)
+#       define R128_FPU_SUB_PIX_2BITS     (0 <<  7)
+#       define R128_FPU_SUB_PIX_4BITS     (1 <<  7)
+#       define R128_FPU_MODE_2D           (0 <<  8)
+#       define R128_FPU_MODE_3D           (1 <<  8)
+#       define R128_TRAP_BITS_DISABLE     (1 <<  9)
+#       define R128_EDGE_ANTIALIAS        (1 << 10)
+#       define R128_SUPERSAMPLE           (1 << 11)
+#       define R128_XFACTOR_2             (0 << 12)
+#       define R128_XFACTOR_4             (1 << 12)
+#       define R128_YFACTOR_2             (0 << 13)
+#       define R128_YFACTOR_4             (1 << 13)
+#       define R128_FLAT_SHADE_VERTEX_D3D (0 << 14)
+#       define R128_FLAT_SHADE_VERTEX_OGL (1 << 14)
+#       define R128_FPU_ROUND_TRUNCATE    (0 << 15)
+#       define R128_FPU_ROUND_NEAREST     (1 << 15)
+#       define R128_WM_SEL_8DW            (0 << 16)
+#       define R128_WM_SEL_16DW           (1 << 16)
+#       define R128_WM_SEL_32DW           (2 << 16)
+#define R128_PM4_VC_DEBUG_CONFIG          0x07a4
+#define R128_PM4_VC_STAT                  0x07a8
+#define R128_PM4_VC_TIMESTAMP0            0x07b0
+#define R128_PM4_VC_TIMESTAMP1            0x07b4
+#define R128_PM4_STAT                     0x07b8
+#       define R128_PM4_FIFOCNT_MASK      0x0fff
+#       define R128_PM4_BUSY              (1 << 16)
+#       define R128_PM4_GUI_ACTIVE        (1 << 31)
+#define R128_PM4_BUFFER_ADDR              0x07f0
+#define R128_PM4_MICRO_CNTL               0x07fc
+#       define R128_PM4_MICRO_FREERUN     (1 << 30)
+#define R128_PM4_FIFO_DATA_EVEN           0x1000
+#define R128_PM4_FIFO_DATA_ODD            0x1004
+
 #define R128_SCALE_3D_CNTL                0x1a00
+#       define R128_SCALE_DITHER_ERR_DIFF         (0  <<  1)
+#       define R128_SCALE_DITHER_TABLE            (1  <<  1)
+#       define R128_TEX_CACHE_SIZE_FULL           (0  <<  2)
+#       define R128_TEX_CACHE_SIZE_HALF           (1  <<  2)
+#       define R128_DITHER_INIT_CURR              (0  <<  3)
+#       define R128_DITHER_INIT_RESET             (1  <<  3)
+#       define R128_ROUND_24BIT                   (1  <<  4)
+#       define R128_TEX_CACHE_DISABLE             (1  <<  5)
+#       define R128_SCALE_3D_NOOP                 (0  <<  6)
+#       define R128_SCALE_3D_SCALE                (1  <<  6)
+#       define R128_SCALE_3D_TEXMAP_SHADE         (2  <<  6)
+#       define R128_SCALE_PIX_BLEND               (0  <<  8)
+#       define R128_SCALE_PIX_REPLICATE           (1  <<  8)
+#       define R128_TEX_CACHE_SPLIT               (1  <<  9)
+#       define R128_APPLE_YUV_MODE                (1  << 10)
+#       define R128_TEX_CACHE_PALLETE_MODE        (1  << 11)
+#       define R128_ALPHA_COMB_ADD_CLAMP          (0  << 12)
+#       define R128_ALPHA_COMB_ADD_NCLAMP         (1  << 12)
+#       define R128_ALPHA_COMB_SUB_DST_SRC_CLAMP  (2  << 12)
+#       define R128_ALPHA_COMB_SUB_DST_SRC_NCLAMP (3  << 12)
+#       define R128_FOG_TABLE                     (1  << 14)
+#       define R128_SIGNED_DST_CLAMP              (1  << 15)
+#       define R128_ALPHA_BLEND_SRC_ZERO          (0  << 16)
+#       define R128_ALPHA_BLEND_SRC_ONE           (1  << 16)
+#       define R128_ALPHA_BLEND_SRC_SRCCOLOR      (2  << 16)
+#       define R128_ALPHA_BLEND_SRC_INVSRCCOLOR   (3  << 16)
+#       define R128_ALPHA_BLEND_SRC_SRCALPHA      (4  << 16)
+#       define R128_ALPHA_BLEND_SRC_INVSRCALPHA   (5  << 16)
+#       define R128_ALPHA_BLEND_SRC_DSTALPHA      (6  << 16)
+#       define R128_ALPHA_BLEND_SRC_INVDSTALPHA   (7  << 16)
+#       define R128_ALPHA_BLEND_SRC_DSTCOLOR      (8  << 16)
+#       define R128_ALPHA_BLEND_SRC_INVDSTCOLOR   (9  << 16)
+#       define R128_ALPHA_BLEND_SRC_SAT           (10 << 16)
+#       define R128_ALPHA_BLEND_SRC_BLEND         (11 << 16)
+#       define R128_ALPHA_BLEND_SRC_INVBLEND      (12 << 16)
+#       define R128_ALPHA_BLEND_DST_ZERO          (0  << 20)
+#       define R128_ALPHA_BLEND_DST_ONE           (1  << 20)
+#       define R128_ALPHA_BLEND_DST_SRCCOLOR      (2  << 20)
+#       define R128_ALPHA_BLEND_DST_INVSRCCOLOR   (3  << 20)
+#       define R128_ALPHA_BLEND_DST_SRCALPHA      (4  << 20)
+#       define R128_ALPHA_BLEND_DST_INVSRCALPHA   (5  << 20)
+#       define R128_ALPHA_BLEND_DST_DSTALPHA      (6  << 20)
+#       define R128_ALPHA_BLEND_DST_INVDSTALPHA   (7  << 20)
+#       define R128_ALPHA_BLEND_DST_DSTCOLOR      (8  << 20)
+#       define R128_ALPHA_BLEND_DST_INVDSTCOLOR   (9  << 20)
+#       define R128_ALPHA_TEST_NEVER              (0  << 24)
+#       define R128_ALPHA_TEST_LESS               (1  << 24)
+#       define R128_ALPHA_TEST_LESSEQUAL          (2  << 24)
+#       define R128_ALPHA_TEST_EQUAL              (3  << 24)
+#       define R128_ALPHA_TEST_GREATEREQUAL       (4  << 24)
+#       define R128_ALPHA_TEST_GREATER            (5  << 24)
+#       define R128_ALPHA_TEST_NEQUAL             (6  << 24)
+#       define R128_ALPHA_TEST_ALWAYS             (7  << 24)
+#       define R128_COMPOSITE_SHADOW_CMP_EQUAL    (0  << 28)
+#       define R128_COMPOSITE_SHADOW_CMP_NEQUAL   (1  << 28)
+#       define R128_COMPOSITE_SHADOW              (1  << 29)
+#       define R128_TEX_MAP_ALPHA_IN_TEXTURE      (1  << 30)
+#       define R128_TEX_CACHE_LINE_SIZE_8QW       (0  << 31)
+#       define R128_TEX_CACHE_LINE_SIZE_4QW       (1  << 31)
+#define R128_SCALE_3D_DATATYPE            0x1a20
+
+#define R128_SETUP_CNTL                   0x1bc4
+#       define R128_DONT_START_TRIANGLE   (1 <<  0)
+#       define R128_Z_BIAS                (0 <<  1)
+#       define R128_DONT_START_ANY_ON     (1 <<  2)
+#       define R128_COLOR_SOLID_COLOR     (0 <<  3)
+#       define R128_COLOR_FLAT_VERT_1     (1 <<  3)
+#       define R128_COLOR_FLAT_VERT_2     (2 <<  3)
+#       define R128_COLOR_FLAT_VERT_3     (3 <<  3)
+#       define R128_COLOR_GOURAUD         (4 <<  3)
+#       define R128_PRIM_TYPE_TRI         (0 <<  7)
+#       define R128_PRIM_TYPE_LINE        (1 <<  7)
+#       define R128_PRIM_TYPE_POINT       (2 <<  7)
+#       define R128_PRIM_TYPE_POLY_EDGE   (3 <<  7)
+#       define R128_TEXTURE_ST_MULT_W     (0 <<  9)
+#       define R128_TEXTURE_ST_DIRECT     (1 <<  9)
+#       define R128_STARTING_VERTEX_1     (1 << 14)
+#       define R128_STARTING_VERTEX_2     (2 << 14)
+#       define R128_STARTING_VERTEX_3     (3 << 14)
+#       define R128_ENDING_VERTEX_1       (1 << 16)
+#       define R128_ENDING_VERTEX_2       (2 << 16)
+#       define R128_ENDING_VERTEX_3       (3 << 16)
+#       define R128_SU_POLY_LINE_LAST     (0 << 18)
+#       define R128_SU_POLY_LINE_NOT_LAST (1 << 18)
+#       define R128_SUB_PIX_2BITS         (0 << 19)
+#       define R128_SUB_PIX_4BITS         (1 << 19)
+#       define R128_SET_UP_CONTINUE       (1 << 31)
+
+#define R128_WINDOW_XY_OFFSET             0x1bcc
+#       define R128_WINDOW_Y_SHIFT        4
+#       define R128_WINDOW_X_SHIFT        20
+
+#define R128_Z_OFFSET_C                   0x1c90
+#define R128_Z_PITCH_C                    0x1c94
+#define R128_Z_STEN_CNTL_C                0x1c98
+#       define R128_Z_PIX_WIDTH_16            (0 <<  1)
+#       define R128_Z_PIX_WIDTH_24            (1 <<  1)
+#       define R128_Z_PIX_WIDTH_32            (2 <<  1)
+#       define R128_Z_PIX_WIDTH_MASK          (3 <<  1)
+#       define R128_Z_TEST_NEVER              (0 <<  4)
+#       define R128_Z_TEST_LESS               (1 <<  4)
+#       define R128_Z_TEST_LESSEQUAL          (2 <<  4)
+#       define R128_Z_TEST_EQUAL              (3 <<  4)
+#       define R128_Z_TEST_GREATEREQUAL       (4 <<  4)
+#       define R128_Z_TEST_GREATER            (5 <<  4)
+#       define R128_Z_TEST_NEQUAL             (6 <<  4)
+#       define R128_Z_TEST_ALWAYS             (7 <<  4)
+#       define R128_Z_TEST_MASK               (7 <<  4)
+#       define R128_STENCIL_TEST_NEVER        (0 << 12)
+#       define R128_STENCIL_TEST_LESS         (1 << 12)
+#       define R128_STENCIL_TEST_LESSEQUAL    (2 << 12)
+#       define R128_STENCIL_TEST_EQUAL        (3 << 12)
+#       define R128_STENCIL_TEST_GREATEREQUAL (4 << 12)
+#       define R128_STENCIL_TEST_GREATER      (5 << 12)
+#       define R128_STENCIL_TEST_NEQUAL       (6 << 12)
+#       define R128_STENCIL_TEST_ALWAYS       (7 << 12)
+#       define R128_STENCIL_S_FAIL_KEEP       (0 << 16)
+#       define R128_STENCIL_S_FAIL_ZERO       (1 << 16)
+#       define R128_STENCIL_S_FAIL_REPLACE    (2 << 16)
+#       define R128_STENCIL_S_FAIL_INC        (3 << 16)
+#       define R128_STENCIL_S_FAIL_DEC        (4 << 16)
+#       define R128_STENCIL_S_FAIL_INV        (5 << 16)
+#       define R128_STENCIL_ZPASS_KEEP        (0 << 20)
+#       define R128_STENCIL_ZPASS_ZERO        (1 << 20)
+#       define R128_STENCIL_ZPASS_REPLACE     (2 << 20)
+#       define R128_STENCIL_ZPASS_INC         (3 << 20)
+#       define R128_STENCIL_ZPASS_DEC         (4 << 20)
+#       define R128_STENCIL_ZPASS_INV         (5 << 20)
+#       define R128_STENCIL_ZFAIL_KEEP        (0 << 24)
+#       define R128_STENCIL_ZFAIL_ZERO        (1 << 24)
+#       define R128_STENCIL_ZFAIL_REPLACE     (2 << 24)
+#       define R128_STENCIL_ZFAIL_INC         (3 << 24)
+#       define R128_STENCIL_ZFAIL_DEC         (4 << 24)
+#       define R128_STENCIL_ZFAIL_INV         (5 << 24)
+#define R128_TEX_CNTL_C                   0x1c9c
+#       define R128_Z_ENABLE                   (1 <<  0)
+#       define R128_Z_WRITE_ENABLE             (1 <<  1)
+#       define R128_STENCIL_ENABLE             (1 <<  3)
+#       define R128_SHADE_ENABLE               (0 <<  4)
+#       define R128_TEXMAP_ENABLE              (1 <<  4)
+#       define R128_SEC_TEXMAP_ENABLE          (1 <<  5)
+#       define R128_FOG_ENABLE                 (1 <<  7)
+#       define R128_DITHER_ENABLE              (1 <<  8)
+#       define R128_ALPHA_ENABLE               (1 <<  9)
+#       define R128_ALPHA_TEST_ENABLE          (1 << 10)
+#       define R128_SPEC_LIGHT_ENABLE          (1 << 11)
+#       define R128_TEX_CHROMA_KEY_ENABLE      (1 << 12)
+#       define R128_ALPHA_IN_TEX_COMPLETE_A    (0 << 13)
+#       define R128_ALPHA_IN_TEX_LSB_A         (1 << 13)
+#       define R128_LIGHT_DIS                  (0 << 14)
+#       define R128_LIGHT_COPY                 (1 << 14)
+#       define R128_LIGHT_MODULATE             (2 << 14)
+#       define R128_LIGHT_ADD                  (3 << 14)
+#       define R128_LIGHT_BLEND_CONSTANT       (4 << 14)
+#       define R128_LIGHT_BLEND_TEXTURE        (5 << 14)
+#       define R128_LIGHT_BLEND_VERTEX         (6 << 14)
+#       define R128_LIGHT_BLEND_CONST_COLOR    (7 << 14)
+#       define R128_ALPHA_LIGHT_DIS            (0 << 18)
+#       define R128_ALPHA_LIGHT_COPY           (1 << 18)
+#       define R128_ALPHA_LIGHT_MODULATE       (2 << 18)
+#       define R128_ALPHA_LIGHT_ADD            (3 << 18)
+#       define R128_ANTI_ALIAS                 (1 << 21)
+#       define R128_TEX_CACHE_FLUSH            (1 << 23)
+#       define R128_LOD_BIAS_SHIFT             24
+#define R128_MISC_3D_STATE_CNTL_REG       0x1ca0
+#       define R128_REF_ALPHA_MASK                  0xff
+#       define R128_MISC_SCALE_3D_NOOP              (0  <<  8)
+#       define R128_MISC_SCALE_3D_SCALE             (1  <<  8)
+#       define R128_MISC_SCALE_3D_TEXMAP_SHADE      (2  <<  8)
+#       define R128_MISC_SCALE_PIX_BLEND            (0  << 10)
+#       define R128_MISC_SCALE_PIX_REPLICATE        (1  << 10)
+#       define R128_ALPHA_COMB_ADD_CLAMP            (0  << 12)
+#       define R128_ALPHA_COMB_ADD_NO_CLAMP         (1  << 12)
+#       define R128_ALPHA_COMB_SUB_SRC_DST_CLAMP    (2  << 12)
+#       define R128_ALPHA_COMB_SUB_SRC_DST_NO_CLAMP (3  << 12)
+#       define R128_FOG_VERTEX                      (0  << 14)
+#       define R128_FOG_TABLE                       (1  << 14)
+#       define R128_ALPHA_BLEND_SRC_ZERO            (0  << 16)
+#       define R128_ALPHA_BLEND_SRC_ONE             (1  << 16)
+#       define R128_ALPHA_BLEND_SRC_SRCCOLOR        (2  << 16)
+#       define R128_ALPHA_BLEND_SRC_INVSRCCOLOR     (3  << 16)
+#       define R128_ALPHA_BLEND_SRC_SRCALPHA        (4  << 16)
+#       define R128_ALPHA_BLEND_SRC_INVSRCALPHA     (5  << 16)
+#       define R128_ALPHA_BLEND_SRC_DESTALPHA       (6  << 16)
+#       define R128_ALPHA_BLEND_SRC_INVDESTALPHA    (7  << 16)
+#       define R128_ALPHA_BLEND_SRC_DESTCOLOR       (8  << 16)
+#       define R128_ALPHA_BLEND_SRC_INVDESTCOLOR    (9  << 16)
+#       define R128_ALPHA_BLEND_SRC_SRCALPHASAT     (10 << 16)
+#       define R128_ALPHA_BLEND_SRC_BOTHSRCALPHA    (11 << 16)
+#       define R128_ALPHA_BLEND_SRC_BOTHINVSRCALPHA (12 << 16)
+#       define R128_ALPHA_BLEND_SRC_MASK            (15 << 16)
+#       define R128_ALPHA_BLEND_DST_ZERO            (0  << 20)
+#       define R128_ALPHA_BLEND_DST_ONE             (1  << 20)
+#       define R128_ALPHA_BLEND_DST_SRCCOLOR        (2  << 20)
+#       define R128_ALPHA_BLEND_DST_INVSRCCOLOR     (3  << 20)
+#       define R128_ALPHA_BLEND_DST_SRCALPHA        (4  << 20)
+#       define R128_ALPHA_BLEND_DST_INVSRCALPHA     (5  << 20)
+#       define R128_ALPHA_BLEND_DST_DESTALPHA       (6  << 20)
+#       define R128_ALPHA_BLEND_DST_INVDESTALPHA    (7  << 20)
+#       define R128_ALPHA_BLEND_DST_DESTCOLOR       (8  << 20)
+#       define R128_ALPHA_BLEND_DST_INVDESTCOLOR    (9  << 20)
+#       define R128_ALPHA_BLEND_DST_SRCALPHASAT     (10 << 20)
+#       define R128_ALPHA_BLEND_DST_MASK            (15 << 20)
+#       define R128_ALPHA_TEST_NEVER                (0  << 24)
+#       define R128_ALPHA_TEST_LESS                 (1  << 24)
+#       define R128_ALPHA_TEST_LESSEQUAL            (2  << 24)
+#       define R128_ALPHA_TEST_EQUAL                (3  << 24)
+#       define R128_ALPHA_TEST_GREATEREQUAL         (4  << 24)
+#       define R128_ALPHA_TEST_GREATER              (5  << 24)
+#       define R128_ALPHA_TEST_NEQUAL               (6  << 24)
+#       define R128_ALPHA_TEST_ALWAYS               (7  << 24)
+#       define R128_ALPHA_TEST_MASK                 (7  << 24)
+#define R128_TEXTURE_CLR_CMP_CLR_C        0x1ca4
+#define R128_TEXTURE_CLR_CMP_MSK_C        0x1ca8
+#define R128_FOG_COLOR_C                  0x1cac
+#       define R128_FOG_BLUE_SHIFT             0
+#       define R128_FOG_GREEN_SHIFT            8
+#       define R128_FOG_RED_SHIFT             16
+#define R128_PRIM_TEX_CNTL_C              0x1cb0
+#       define R128_MIN_BLEND_NEAREST          (0  <<  1)
+#       define R128_MIN_BLEND_LINEAR           (1  <<  1)
+#       define R128_MIN_BLEND_MIPNEAREST       (2  <<  1)
+#       define R128_MIN_BLEND_MIPLINEAR        (3  <<  1)
+#       define R128_MIN_BLEND_LINEARMIPNEAREST (4  <<  1)
+#       define R128_MIN_BLEND_LINEARMIPLINEAR  (5  <<  1)
+#       define R128_MIN_BLEND_MASK             (7  <<  1)
+#       define R128_MAG_BLEND_NEAREST          (0  <<  4)
+#       define R128_MAG_BLEND_LINEAR           (1  <<  4)
+#       define R128_MAG_BLEND_MASK             (7  <<  4)
+#       define R128_MIP_MAP_DISABLE            (1  <<  7)
+#       define R128_TEX_CLAMP_S_WRAP           (0  <<  8)
+#       define R128_TEX_CLAMP_S_MIRROR         (1  <<  8)
+#       define R128_TEX_CLAMP_S_CLAMP          (2  <<  8)
+#       define R128_TEX_CLAMP_S_BORDER_COLOR   (3  <<  8)
+#       define R128_TEX_CLAMP_S_MASK           (3  <<  8)
+#       define R128_TEX_WRAP_S                 (1  << 10)
+#       define R128_TEX_CLAMP_T_WRAP           (0  << 11)
+#       define R128_TEX_CLAMP_T_MIRROR         (1  << 11)
+#       define R128_TEX_CLAMP_T_CLAMP          (2  << 11)
+#       define R128_TEX_CLAMP_T_BORDER_COLOR   (3  << 11)
+#       define R128_TEX_CLAMP_T_MASK           (3  << 11)
+#       define R128_TEX_WRAP_T                 (1  << 13)
+#       define R128_TEX_PERSPECTIVE_DISABLE    (1  << 14)
+#       define R128_DATATYPE_VQ                (0  << 16)
+#       define R128_DATATYPE_CI4               (1  << 16)
+#       define R128_DATATYPE_CI8               (2  << 16)
+#       define R128_DATATYPE_ARGB1555          (3  << 16)
+#       define R128_DATATYPE_RGB565            (4  << 16)
+#       define R128_DATATYPE_RGB888            (5  << 16)
+#       define R128_DATATYPE_ARGB8888          (6  << 16)
+#       define R128_DATATYPE_RGB332            (7  << 16)
+#       define R128_DATATYPE_Y8                (8  << 16)
+#       define R128_DATATYPE_RGB8              (9  << 16)
+#       define R128_DATATYPE_CI16              (10 << 16)
+#       define R128_DATATYPE_YUV422            (11 << 16)
+#       define R128_DATATYPE_YUV422_2          (12 << 16)
+#       define R128_DATATYPE_AYUV444           (14 << 16)
+#       define R128_DATATYPE_ARGB4444          (15 << 16)
+#       define R128_PALLETE_EITHER             (0  << 20)
+#       define R128_PALLETE_1                  (1  << 20)
+#       define R128_PALLETE_2                  (2  << 20)
+#       define R128_PSEUDOCOLOR_DT_RGB565      (0  << 24)
+#       define R128_PSEUDOCOLOR_DT_ARGB1555    (1  << 24)
+#       define R128_PSEUDOCOLOR_DT_ARGB4444    (2  << 24)
+#define R128_PRIM_TEXTURE_COMBINE_CNTL_C  0x1cb4
+#       define R128_COMB_DIS                 (0  <<  0)
+#       define R128_COMB_COPY                (1  <<  0)
+#       define R128_COMB_COPY_INP            (2  <<  0)
+#       define R128_COMB_MODULATE            (3  <<  0)
+#       define R128_COMB_MODULATE2X          (4  <<  0)
+#       define R128_COMB_MODULATE4X          (5  <<  0)
+#       define R128_COMB_ADD                 (6  <<  0)
+#       define R128_COMB_ADD_SIGNED          (7  <<  0)
+#       define R128_COMB_BLEND_VERTEX        (8  <<  0)
+#       define R128_COMB_BLEND_TEXTURE       (9  <<  0)
+#       define R128_COMB_BLEND_CONST         (10 <<  0)
+#       define R128_COMB_BLEND_PREMULT       (11 <<  0)
+#       define R128_COMB_BLEND_PREV          (12 <<  0)
+#       define R128_COMB_BLEND_PREMULT_INV   (13 <<  0)
+#       define R128_COMB_ADD_SIGNED2X        (14 <<  0)
+#       define R128_COMB_BLEND_CONST_COLOR   (15 <<  0)
+#       define R128_COMB_MASK                (15 <<  0)
+#       define R128_COLOR_FACTOR_TEX         (4  <<  4)
+#       define R128_COLOR_FACTOR_NTEX        (5  <<  4)
+#       define R128_COLOR_FACTOR_ALPHA       (6  <<  4)
+#       define R128_COLOR_FACTOR_NALPHA      (7  <<  4)
+#       define R128_COLOR_FACTOR_MASK        (15 <<  4)
+#       define R128_INPUT_FACTOR_CONST_COLOR (2  << 10)
+#       define R128_INPUT_FACTOR_CONST_ALPHA (3  << 10)
+#       define R128_INPUT_FACTOR_INT_COLOR   (4  << 10)
+#       define R128_INPUT_FACTOR_INT_ALPHA   (5  << 10)
+#       define R128_INPUT_FACTOR_MASK        (15 << 10)
+#       define R128_COMB_ALPHA_DIS           (0  << 14)
+#       define R128_COMB_ALPHA_COPY          (1  << 14)
+#       define R128_COMB_ALPHA_COPY_INP      (2  << 14)
+#       define R128_COMB_ALPHA_MODULATE      (3  << 14)
+#       define R128_COMB_ALPHA_MODULATE2X    (4  << 14)
+#       define R128_COMB_ALPHA_MODULATE4X    (5  << 14)
+#       define R128_COMB_ALPHA_ADD           (6  << 14)
+#       define R128_COMB_ALPHA_ADD_SIGNED    (7  << 14)
+#       define R128_COMB_ALPHA_ADD_SIGNED2X  (14 << 14)
+#       define R128_COMB_ALPHA_MASK          (15 << 14)
+#       define R128_ALPHA_FACTOR_TEX_ALPHA   (6  << 18)
+#       define R128_ALPHA_FACTOR_NTEX_ALPHA  (7  << 18)
+#       define R128_ALPHA_FACTOR_MASK        (15 << 18)
+#       define R128_INP_FACTOR_A_CONST_ALPHA (1  << 25)
+#       define R128_INP_FACTOR_A_INT_ALPHA   (2  << 25)
+#       define R128_INP_FACTOR_A_MASK        (7  << 25)
+#define R128_TEX_SIZE_PITCH_C             0x1cb8
+#       define R128_TEX_PITCH_SHIFT           0
+#       define R128_TEX_SIZE_SHIFT            4
+#       define R128_TEX_HEIGHT_SHIFT          8
+#       define R128_TEX_MIN_SIZE_SHIFT       12
+#       define R128_SEC_TEX_PITCH_SHIFT      16
+#       define R128_SEC_TEX_SIZE_SHIFT       20
+#       define R128_SEC_TEX_HEIGHT_SHIFT     24
+#       define R128_SEC_TEX_MIN_SIZE_SHIFT   28
+#       define R128_TEX_PITCH_MASK           (0x0f <<  0)
+#       define R128_TEX_SIZE_MASK            (0x0f <<  4)
+#       define R128_TEX_HEIGHT_MASK          (0x0f <<  8)
+#       define R128_TEX_MIN_SIZE_MASK        (0x0f << 12)
+#       define R128_SEC_TEX_PITCH_MASK       (0x0f << 16)
+#       define R128_SEC_TEX_SIZE_MASK        (0x0f << 20)
+#       define R128_SEC_TEX_HEIGHT_MASK      (0x0f << 24)
+#       define R128_SEC_TEX_MIN_SIZE_MASK    (0x0f << 28)
+#       define R128_TEX_SIZE_PITCH_SHIFT      0
+#       define R128_SEC_TEX_SIZE_PITCH_SHIFT 16
+#       define R128_TEX_SIZE_PITCH_MASK      (0xffff <<  0)
+#       define R128_SEC_TEX_SIZE_PITCH_MASK  (0xffff << 16)
+#define R128_PRIM_TEX_0_OFFSET_C          0x1cbc
+#define R128_PRIM_TEX_1_OFFSET_C          0x1cc0
+#define R128_PRIM_TEX_2_OFFSET_C          0x1cc4
+#define R128_PRIM_TEX_3_OFFSET_C          0x1cc8
+#define R128_PRIM_TEX_4_OFFSET_C          0x1ccc
+#define R128_PRIM_TEX_5_OFFSET_C          0x1cd0
+#define R128_PRIM_TEX_6_OFFSET_C          0x1cd4
+#define R128_PRIM_TEX_7_OFFSET_C          0x1cd8
+#define R128_PRIM_TEX_8_OFFSET_C          0x1cdc
+#define R128_PRIM_TEX_9_OFFSET_C          0x1ce0
+#define R128_PRIM_TEX_10_OFFSET_C         0x1ce4
+#       define R128_TEX_NO_TILE           (0 << 30)
+#       define R128_TEX_TILED_BY_HOST     (1 << 30)
+#       define R128_TEX_TILED_BY_STORAGE  (2 << 30)
+#       define R128_TEX_TILED_BY_STORAGE2 (3 << 30)
+
+#define R128_SEC_TEX_CNTL_C               0x1d00
+#       define R128_SEC_SELECT_PRIM_ST    (0  <<  0)
+#       define R128_SEC_SELECT_SEC_ST     (1  <<  0)
+#define R128_SEC_TEX_COMBINE_CNTL_C       0x1d04
+#       define R128_INPUT_FACTOR_PREV_COLOR (8  << 10)
+#       define R128_INPUT_FACTOR_PREV_ALPHA (9  << 10)
+#       define R128_INP_FACTOR_A_PREV_ALPHA (4  << 25)
+#define R128_SEC_TEX_0_OFFSET_C           0x1d08
+#define R128_SEC_TEX_1_OFFSET_C           0x1d0c
+#define R128_SEC_TEX_2_OFFSET_C           0x1d10
+#define R128_SEC_TEX_3_OFFSET_C           0x1d14
+#define R128_SEC_TEX_4_OFFSET_C           0x1d18
+#define R128_SEC_TEX_5_OFFSET_C           0x1d1c
+#define R128_SEC_TEX_6_OFFSET_C           0x1d20
+#define R128_SEC_TEX_7_OFFSET_C           0x1d24
+#define R128_SEC_TEX_8_OFFSET_C           0x1d28
+#define R128_SEC_TEX_9_OFFSET_C           0x1d2c
+#define R128_SEC_TEX_10_OFFSET_C          0x1d30
+#define R128_CONSTANT_COLOR_C             0x1d34
+#       define R128_CONSTANT_BLUE_SHIFT        0
+#       define R128_CONSTANT_GREEN_SHIFT       8
+#       define R128_CONSTANT_RED_SHIFT        16
+#       define R128_CONSTANT_ALPHA_SHIFT      24
+#define R128_PRIM_TEXTURE_BORDER_COLOR_C  0x1d38
+#       define R128_PRIM_TEX_BORDER_BLUE_SHIFT   0
+#       define R128_PRIM_TEX_BORDER_GREEN_SHIFT  8
+#       define R128_PRIM_TEX_BORDER_RED_SHIFT   16
+#       define R128_PRIM_TEX_BORDER_ALPHA_SHIFT 24
+#define R128_SEC_TEXTURE_BORDER_COLOR_C   0x1d3c
+#       define R128_SEC_TEX_BORDER_BLUE_SHIFT   0
+#       define R128_SEC_TEX_BORDER_GREEN_SHIFT  8
+#       define R128_SEC_TEX_BORDER_RED_SHIFT   16
+#       define R128_SEC_TEX_BORDER_ALPHA_SHIFT 24
+#define R128_STEN_REF_MASK_C              0x1d40
+#       define R128_STEN_REFERENCE_SHIFT       0
+#       define R128_STEN_MASK_SHIFT           16
+#       define R128_STEN_WRITE_MASK_SHIFT     24
+#define R128_PLANE_3D_MASK_C              0x1d44
+#define R128_TEX_CACHE_STAT_COUNT         0x1974
+
+
+				/* Constants */
+#define R128_AGP_TEX_OFFSET               0x02000000
+
+#define R128_VB_AGE_REG                   R128_GUI_SCRATCH_REG0
+#define R128_SWAP_AGE_REG                 R128_GUI_SCRATCH_REG1
+
+				/* CCE packet types */
+#define R128_CCE_PACKET0                         0x00000000
+#define R128_CCE_PACKET0_ONE_REG_WR              0x00008000
+#define R128_CCE_PACKET1                         0x40000000
+#define R128_CCE_PACKET2                         0x80000000
+#define R128_CCE_PACKET3_NOP                     0xC0001000
+#define R128_CCE_PACKET3_PAINT                   0xC0001100
+#define R128_CCE_PACKET3_BITBLT                  0xC0001200
+#define R128_CCE_PACKET3_SMALLTEXT               0xC0001300
+#define R128_CCE_PACKET3_HOSTDATA_BLT            0xC0001400
+#define R128_CCE_PACKET3_POLYLINE                0xC0001500
+#define R128_CCE_PACKET3_SCALING                 0xC0001600
+#define R128_CCE_PACKET3_TRANS_SCALING           0xC0001700
+#define R128_CCE_PACKET3_POLYSCANLINES           0xC0001800
+#define R128_CCE_PACKET3_NEXT_CHAR               0xC0001900
+#define R128_CCE_PACKET3_PAINT_MULTI             0xC0001A00
+#define R128_CCE_PACKET3_BITBLT_MULTI            0xC0001B00
+#define R128_CCE_PACKET3_PLY_NEXTSCAN            0xC0001D00
+#define R128_CCE_PACKET3_SET_SCISSORS            0xC0001E00
+#define R128_CCE_PACKET3_SET_MODE24BPP           0xC0001F00
+#define R128_CCE_PACKET3_CNTL_PAINT              0xC0009100
+#define R128_CCE_PACKET3_CNTL_BITBLT             0xC0009200
+#define R128_CCE_PACKET3_CNTL_SMALLTEXT          0xC0009300
+#define R128_CCE_PACKET3_CNTL_HOSTDATA_BLT       0xC0009400
+#define R128_CCE_PACKET3_CNTL_POLYLINE           0xC0009500
+#define R128_CCE_PACKET3_CNTL_SCALING            0xC0009600
+#define R128_CCE_PACKET3_CNTL_TRANS_SCALING      0xC0009700
+#define R128_CCE_PACKET3_CNTL_POLYSCANLINES      0xC0009800
+#define R128_CCE_PACKET3_CNTL_NEXT_CHAR          0xC0009900
+#define R128_CCE_PACKET3_CNTL_PAINT_MULTI        0xC0009A00
+#define R128_CCE_PACKET3_CNTL_BITBLT_MULTI       0xC0009B00
+#define R128_CCE_PACKET3_CNTL_TRANS_BITBLT       0xC0009C00
+#define R128_CCE_PACKET3_3D_SAVE_CONTEXT         0xC0002000
+#define R128_CCE_PACKET3_3D_PLAY_CONTEXT         0xC0002100
+#define R128_CCE_PACKET3_3D_RNDR_GEN_INDX_PRIM   0xC0002300
+#define R128_CCE_PACKET3_3D_RNDR_GEN_PRIM        0xC0002500
+#define R128_CCE_PACKET3_LOAD_PALETTE            0xC0002C00
+#define R128_CCE_PACKET3_PURGE                   0xC0002D00
+#define R128_CCE_PACKET3_NEXT_VERTEX_BUNDLE      0xC0002E00
+#       define R128_CCE_PACKET_MASK              0xC0000000
+#       define R128_CCE_PACKET_COUNT_MASK        0x3fff0000
+#	define R128_CCE_PACKET_MAX_DWORDS        (1 << 14)
+#       define R128_CCE_PACKET0_REG_MASK         0x000007ff
+#       define R128_CCE_PACKET1_REG0_MASK        0x000007ff
+#       define R128_CCE_PACKET1_REG1_MASK        0x003ff800
+
+#define R128_CCE_VC_FRMT_RHW                     0x00000001
+#define R128_CCE_VC_FRMT_DIFFUSE_BGR             0x00000002
+#define R128_CCE_VC_FRMT_DIFFUSE_A               0x00000004
+#define R128_CCE_VC_FRMT_DIFFUSE_ARGB            0x00000008
+#define R128_CCE_VC_FRMT_SPEC_BGR                0x00000010
+#define R128_CCE_VC_FRMT_SPEC_F                  0x00000020
+#define R128_CCE_VC_FRMT_SPEC_FRGB               0x00000040
+#define R128_CCE_VC_FRMT_S_T                     0x00000080
+#define R128_CCE_VC_FRMT_S2_T2                   0x00000100
+#define R128_CCE_VC_FRMT_RHW2                    0x00000200
+
+#define R128_CCE_VC_CNTL_PRIM_TYPE_NONE          0x00000000
+#define R128_CCE_VC_CNTL_PRIM_TYPE_POINT         0x00000001
+#define R128_CCE_VC_CNTL_PRIM_TYPE_LINE          0x00000002
+#define R128_CCE_VC_CNTL_PRIM_TYPE_POLY_LINE     0x00000003
+#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_LIST      0x00000004
+#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_FAN       0x00000005
+#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_STRIP     0x00000006
+#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_TYPE2     0x00000007
+#define R128_CCE_VC_CNTL_PRIM_WALK_IND           0x00000010
+#define R128_CCE_VC_CNTL_PRIM_WALK_LIST          0x00000020
+#define R128_CCE_VC_CNTL_PRIM_WALK_RING          0x00000030
+#define R128_CCE_VC_CNTL_NUM_SHIFT               16
 
 #endif
Index: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_sarea.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/r128/r128_sarea.h:1.1
--- /dev/null	Sat Jul  1 20:42:55 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/r128/r128_sarea.h	Fri Jun 16 17:03:23 2000
@@ -0,0 +1,77 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128_sarea.h,v 1.1 2000/06/17 00:03:23 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_SAREA_H_
+#define _R128_SAREA_H_
+
+/* There are 2 heaps (local/AGP).  Each region within a heap is a
+   minimum of 64k, and there are at most 64 of them per heap. */
+#define R128_LOCAL_TEX_HEAP       0
+#define R128_AGP_TEX_HEAP         1
+#define R128_NR_TEX_HEAPS         2
+#define R128_NR_TEX_REGIONS      64
+#define R128_LOG_TEX_GRANULARITY 16
+
+typedef struct {
+    unsigned char next, prev; /* indices to form a circular LRU  */
+    unsigned char in_use;     /* owned by a client, or free? */
+    int           age;        /* tracked by clients to update local LRU's */
+} R128TexRegion;
+
+typedef struct {
+    /* Maintain an LRU of contiguous regions of texture space.  If you
+     * think you own a region of texture memory, and it has an age
+     * different to the one you set, then you are mistaken and it has
+     * been stolen by another client.  If global texAge hasn't changed,
+     * there is no need to walk the list.
+     *
+     * These regions can be used as a proxy for the fine-grained texture
+     * information of other clients - by maintaining them in the same
+     * lru which is used to age their own textures, clients have an
+     * approximate lru for the whole of global texture space, and can
+     * make informed decisions as to which areas to kick out.  There is
+     * no need to choose whether to kick out your own texture or someone
+     * else's - simply eject them all in LRU order.
+     */
+				/* Last elt is sentinal */
+    R128TexRegion texList[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1];
+				/* last time texture was uploaded */
+    int           texAge[R128_NR_TEX_HEAPS];
+
+    int           ctxOwner;     /* last context to upload state */
+
+    int           ringWrite;    /* current ring buffer write index */
+} R128SAREAPriv, *R128SAREAPrivPtr;
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile:1.15 xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile:1.16
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile:1.15	Thu Mar  2 17:05:41 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile	Fri Mar 31 12:13:24 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile,v 1.15 2000/03/03 01:05:41 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile,v 1.16 2000/03/31 20:13:24 dawes Exp $
 
 XCOMM
 XCOMM This is an Imakefile for the Rendition driver.
@@ -20,7 +20,7 @@
 	   -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb \
 	   -I$(SERVERSRC)/mi -I$(SERVERSRC)/cfb\
 	   -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(XF86SRC)/vgahw \
-	   -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \
+	   -I$(XF86SRC)/rac -I$(XF86SRC)/int10 -I$(XF86OSSRC)/vbe \
 	   -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(FONTINCSRC) -I$(XINCLUDESRC) \
 	   -I$(SERVERSRC)/include  -I$(XF86SRC)/xaa \
 	   -I$(XF86SRC)/xf24_32bpp -I$(XF86SRC)/xf8_32bpp \
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c:1.6	Fri Feb 25 13:02:59 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c	Mon Jun 12 19:28:33 2000
@@ -3,7 +3,7 @@
  *
  * accelerator functions for X
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c,v 1.6 2000/02/25 21:02:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c,v 1.8 2000/06/13 02:28:33 dawes Exp $ */
 
 
 
@@ -29,24 +29,19 @@
 /*
  * defines
  */
-#if 1
-/* Global imported during compile-time */
-char MICROCODE_DIR [PATH_MAX] = MODULEDIR;
-#endif
-
 
 #define waitfifo(size)  do { int c=0; \
-                          while ((c++<0xfffff)&&((v_in8(iob+FIFOINFREE)&0x1f)<size)) /* if(!(c%0xffff))ErrorF("#1# !0x%x! -- ",v_in8(iob+FIFOINFREE)) */; \
+                          while ((c++<0xfffff)&&((verite_in8(iob+FIFOINFREE)&0x1f)<size)) /* if(!(c%0xffff))ErrorF("#1# !0x%x! -- ",verite_in8(iob+FIFOINFREE)) */; \
                           if (c >= 0xfffff) { \
-                              ErrorF("RENDITION: Input fifo full (1) FIFO in == %d\n",v_in8(iob+FIFOINFREE)&0x1f); \
+                              ErrorF("RENDITION: Input fifo full (1) FIFO in == %d\n",verite_in8(iob+FIFOINFREE)&0x1f); \
                               return; \
                           } \
                         } while (0)
 
 #define waitfifo2(size, rv) do { int c=0; \
-                          while ((c++<0xfffff)&&((v_in8(iob+FIFOINFREE)&0x1f)<size)) /* if(!(c%0xffff))ErrorF("#2# !0x%x! -- ",v_in8(iob+FIFOINFREE)) */; \
+                          while ((c++<0xfffff)&&((verite_in8(iob+FIFOINFREE)&0x1f)<size)) /* if(!(c%0xffff))ErrorF("#2# !0x%x! -- ",verite_in8(iob+FIFOINFREE)) */; \
                           if (c >= 0xfffff) { \
-                              ErrorF("RENDITION: Input fifo full (2) FIFO in ==%d\n",v_in8(iob+FIFOINFREE)&0x1f); \
+                              ErrorF("RENDITION: Input fifo full (2) FIFO in ==%d\n",verite_in8(iob+FIFOINFREE)&0x1f); \
                               RENDITIONAccelNone(pScreenInfo); \
                               pRendition->board.accel=0; \
                               return rv; \
@@ -124,38 +119,13 @@
     sleep(1);
 #endif
 
-#ifdef DEBUG
-    v1k_stop(pScreenInfo);
-    memset (pRendition->board.vmem_base,0,MC_SIZE);
-#endif
-
-#if 0
     if (RENDITIONLoadUcode(pScreenInfo)){
       ErrorF ("RENDITION: AccelPreInit - Warning. Loading of microcode failed!!\n");
     }
-#endif
-
-#if 1 /* Test */
-    if (V1000_DEVICE == pRendition->board.chip){
-      c=v_load_ucfile(pScreenInfo, strcat ((char *)MICROCODE_DIR,"v10002d.uc"));
-    }
-    else {
-      /* V2x00 chip */
-      c=v_load_ucfile(pScreenInfo, strcat ((char *)MICROCODE_DIR,"v20002d.uc"));
-    }
-
-    if (c == -1) {
-      ErrorF( "RENDITION: Microcode loading failed !!!\n");
-      return;
-    }
-
-    pRendition->board.ucode_entry=c;
 
-    ErrorF("UCode_Entry == 0x%x\n",pRendition->board.ucode_entry);
-#endif
+    pRendition->board.fbOffset += MC_SIZE;
 
 #ifdef DEBUG
-    pRendition->board.fbOffset += MC_SIZE;
     ErrorF("RENDITION: Offset is now %d\n",pRendition->board.fbOffset);
     sleep(2);
 #endif
@@ -180,7 +150,8 @@
     pRendition->AccelInfoRec = pXAAinfo = XAACreateInfoRec();
 
     if(!pXAAinfo){
-      ErrorF("RENDITION; Failed to set up XAA structure!\n");
+      xf86DrvMsg(pScreenInfo->scrnIndex,X_ERROR,
+		 ("Failed to set up XAA structure!\n"));
       return;
     }
 
@@ -216,28 +187,14 @@
         RENDITIONSubsequentTwoPointLine;
 #endif /* #if 0 */
 
-    if (RENDITIONLoadUcode(pScreenInfo)) return;
+    verite_check_csucode(pScreenInfo);
 
-#if 1 /* Testingcode */
-    if (V1000_DEVICE == pRendition->board.chip){
-      c=v_load_ucfile(pScreenInfo, MICROCODE_DIR);
-    }
-    else {
-      /* V2x00 chip */
-      c=v_load_ucfile(pScreenInfo, MICROCODE_DIR);
-    }
-
-    if (c == -1) {
-      ErrorF( "RENDITION: Microcode loading failed !!!\n");
-      return;
-    }
-
-    pRendition->board.ucode_entry=c;
-#endif
+    if (RENDITIONLoadUcode(pScreenInfo)) return;
     if (RENDITIONInitUcode(pScreenInfo)) return;
 
-    v_check_csucode(pScreenInfo);
-    /* the remaining code was copied from s3v_accel.c.
+    verite_check_csucode(pScreenInfo);
+
+    /* the remaining code was copied from s3verite_accel.c.
      * we need to check it if it is suitable <ml> */
 
     /* make sure offscreen pixmaps aren't bigger than our address space */
@@ -313,7 +270,7 @@
 
     /* load or restore ucode */
     if (!ucode_loaded) {
-      if (0 != v_initboard(pScreenInfo)) {
+      if (0 != verite_initboard(pScreenInfo)) {
             RENDITIONAccelNone(pScreenInfo);
             pRendition->board.accel=0;
             return 1;
@@ -323,8 +280,8 @@
     else
         RENDITIONRestoreUcode(pScreenInfo);
 
-    ErrorF("RENDITION: Ucode successfully %s\n", 
-        (ucode_loaded ? "restored" : "loaded"));
+    ErrorF ("Rendition: Ucode successfully %s\n", 
+		(ucode_loaded ? "restored" : "loaded"));
 
     ucode_loaded=1;
     return 0;
@@ -337,25 +294,28 @@
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
     vu16 iob = pRendition->board.io_base;
 
-    if (0 == v_getstride(pScreenInfo, NULL,
+    if (0 == verite_getstride(pScreenInfo, NULL,
 			 &pRendition->board.mode.stride0, 
                          &pRendition->board.mode.stride1)) {
-        ErrorF("RENDITION: Acceleration for this resolution not available\n");
+      xf86DrvMsg(pScreenInfo->scrnIndex,X_ERROR,
+		   ("Acceleration for this resolution not available\n"));
         RENDITIONAccelNone(pScreenInfo);
         pRendition->board.accel=0;
         return 1;
     }
     else
-        ErrorF("RENDITION: Stride 0: %d, stride 1: %d\n",
-	       pRendition->board.mode.stride0, 
-	       pRendition->board.mode.stride1);
+      ErrorF ("Rendition: Stride 0: %d, stride 1: %d\n",
+	      pRendition->board.mode.stride0, 
+	      pRendition->board.mode.stride1);
 
     /* NOTE: for 1152x864 only! 
     stride0=6;
     stride1=1;
     */
 
-    ErrorF("#InitUcode(1)# FIFOIN_FREE 0x%x -- \n",v_in8(iob+FIFOINFREE));
+#ifdef DEBUG
+    ErrorF("#InitUcode(1)# FIFOIN_FREE 0x%x -- \n",verite_in8(iob+FIFOINFREE));
+#endif
 
     /* init the ucode */
 
@@ -363,36 +323,44 @@
     v1k_flushicache(pScreenInfo);
     v1k_start(pScreenInfo, pRendition->board.csucode_base);
 
-    ErrorF("#InitUcode(2)# FIFOIN_FREE 0x%x -- \n",v_in8(iob+FIFOINFREE));
+#ifdef DEBUG
+    ErrorF("#InitUcode(2)# FIFOIN_FREE 0x%x -- \n",verite_in8(iob+FIFOINFREE));
+#endif
 
-    v_out32(iob, 0);     /* a0 - ucode init command */
-    v_out32(iob, 0);     /* a1 - 1024 byte context store area */
-    v_out32(iob, 0);     /* a2 */
-    v_out32(iob, pRendition->board.ucode_entry);
+    verite_out32(iob, 0);     /* a0 - ucode init command */
+    verite_out32(iob, 0);     /* a1 - 1024 byte context store area */
+    verite_out32(iob, 0);     /* a2 */
+    verite_out32(iob, pRendition->board.ucode_entry);
 
-    ErrorF("#InitUcode(3)# FIFOIN_FREE 0x%x -- \n",v_in8(iob+FIFOINFREE));
+#ifdef DEBUG
+    ErrorF("#InitUcode(3)# FIFOIN_FREE 0x%x -- \n",verite_in8(iob+FIFOINFREE));
+#endif
 
     waitfifo2(6, 1);
 
-    ErrorF("#InitUcode(4)# FIFOIN_FREE 0x%x -- \n",v_in8(iob+FIFOINFREE));
+#ifdef DEBUG
+    ErrorF("#InitUcode(4)# FIFOIN_FREE 0x%x -- \n",verite_in8(iob+FIFOINFREE));
+#endif
 
-    v_out32(iob, CMD_SETUP);
-    v_out32(iob, P2(pRendition->board.mode.virtualwidth,
+    verite_out32(iob, CMD_SETUP);
+    verite_out32(iob, P2(pRendition->board.mode.virtualwidth,
 		    pRendition->board.mode.virtualheight));
-    v_out32(iob, P2(pRendition->board.mode.bitsperpixel,
+    verite_out32(iob, P2(pRendition->board.mode.bitsperpixel,
 		    pRendition->board.mode.pixelformat));
-    v_out32(iob, MC_SIZE);
+    verite_out32(iob, MC_SIZE);
 
-    v_out32(iob, (pRendition->board.mode.virtualwidth)*
+    verite_out32(iob, (pRendition->board.mode.virtualwidth)*
 	    (pRendition->board.mode.bitsperpixel>>3));
-    v_out32(iob, (pRendition->board.mode.stride1<<12)|
+    verite_out32(iob, (pRendition->board.mode.stride1<<12)|
 	    (pRendition->board.mode.stride0<<8)); 
 
-    ErrorF("#InitUcode(5)# FIFOIN_FREE 0x%x -- \n",v_in8(iob+FIFOINFREE));
+#ifdef DEBUG
+    ErrorF("#InitUcode(5)# FIFOIN_FREE 0x%x -- \n",verite_in8(iob+FIFOINFREE));
+#endif
 
 #if 0
-    v_out32(iob+0x60, 129);
-    ErrorF("RENDITION: PC at %x\n", v_in32(iob+0x64));
+    verite_out32(iob+0x60, 129);
+    ErrorF("RENDITION: PC at %x\n", verite_in32(iob+0x64));
 #endif
 
     return 0;
@@ -416,26 +384,26 @@
 #endif
 
     v1k_stop(pScreenInfo);
-    memend=v_in8(iob+MEMENDIAN);
-    v_out8(iob+MEMENDIAN, MEMENDIAN_NO);
+    memend=verite_in8(iob+MEMENDIAN);
+    verite_out8(iob+MEMENDIAN, MEMENDIAN_NO);
 #if 1
     memcpy(pRendition->board.vmem_base, pRendition->board.ucode_buffer, MC_SIZE);
 #else
     /* SlowBcopy has inverted src and dst */
     xf86SlowBcopy(pRendition->board.ucode_buffer,pRendition->board.vmem_base,MC_SIZE);
 #endif
-    v_out8(iob+MEMENDIAN, memend);
+    verite_out8(iob+MEMENDIAN, memend);
 
     v1k_flushicache(pScreenInfo);
     v1k_start(pScreenInfo, pRendition->board.csucode_base);
-    v_out32(iob, 0);     /* a0 - ucode init command */
-    v_out32(iob, 0);     /* a1 - 1024 byte context store area */
-    v_out32(iob, 0);     /* a2 */
-    v_out32(iob, pRendition->board.ucode_entry);
+    verite_out32(iob, 0);     /* a0 - ucode init command */
+    verite_out32(iob, 0);     /* a1 - 1024 byte context store area */
+    verite_out32(iob, 0);     /* a2 */
+    verite_out32(iob, pRendition->board.ucode_entry);
 
 #if 0
-    v_out32(iob+0x60, 129);
-    ErrorF("RENDITION: PC at %x\n", v_in32(iob+0x64));
+    verite_out32(iob+0x60, 129);
+    ErrorF("RENDITION: PC at %x\n", verite_in32(iob+0x64));
 #endif
 }
 
@@ -454,8 +422,8 @@
 #endif
 
     v1k_stop(pScreenInfo);
-    memend=v_in8(iob+MEMENDIAN);
-    v_out8(iob+MEMENDIAN, MEMENDIAN_NO);
+    memend=verite_in8(iob+MEMENDIAN);
+    verite_out8(iob+MEMENDIAN, MEMENDIAN_NO);
 
 #if 1
     memcpy(pRendition->board.ucode_buffer, pRendition->board.vmem_base, MC_SIZE);
@@ -463,7 +431,7 @@
     /* SlowBcopy has inverted src and dst */
     xf86SlowBcopy(pRendition->board.vmem_base,pRendition->board.ucode_buffer,MC_SIZE);
 #endif
-    v_out8(iob+MEMENDIAN, memend);
+    verite_out8(iob+MEMENDIAN, memend);
     v1k_continue(pScreenInfo);
 }
 
@@ -486,80 +454,79 @@
 
 #ifdef DEBUG
     ErrorF("RENDITION: RENDITIONSyncV1000 called\n");
-#endif
-#ifdef DEBUG
-    ErrorF("#Sync (1)# FIFO_INFREE 0x%x -- \n",v_in8(iob+FIFOINFREE));
-    ErrorF("#Sync (1)# FIFO_OUTVALID 0x%x -- \n",v_in8(iob+FIFOOUTVALID));
+
+    ErrorF("#Sync (1)# FIFO_INFREE 0x%x -- \n",verite_in8(iob+FIFOINFREE));
+    ErrorF("#Sync (1)# FIFO_OUTVALID 0x%x -- \n",verite_in8(iob+FIFOOUTVALID));
 #endif
 
     c=0;
     /* empty output fifo,
        i.e. if there is any valid data in the output fifo then read it */
 
-    while ((c++<0xfffff) && ((v_in8(iob+FIFOOUTVALID)&0x7)>0))
-      (void)v_in32(iob);
+    while ((c++<0xfffff) && ((verite_in8(iob+FIFOOUTVALID)&0x7)>0))
+      (void)verite_in32(iob);
 
-/*       if(!(c%0xffff))ErrorF("#F1# !0x%x! -- ",v_in8(iob+FIFOOUTVALID)); */
+/*       if(!(c%0xffff))ErrorF("#F1# !0x%x! -- ",verite_in8(iob+FIFOOUTVALID)); */
 
     if (c >= 0xfffff) { 
         ErrorF("RENDITION: RISC synchronization failed (1) FIFO out == %d!\n",
-	       v_in8(iob+FIFOOUTVALID)&0x1f);
+	       verite_in8(iob+FIFOOUTVALID)&0x1f);
         return; 
     }
 
     /* sync RISC */
     waitfifo(2);
-    v_out32(iob, CMD_GET_PIXEL);
-    v_out32(iob, 0);
+    verite_out32(iob, CMD_GET_PIXEL);
+    verite_out32(iob, 0);
 
     c=0;
-    while ((c++<0xfffff) && ((v_in8(iob+FIFOOUTVALID)&0x7)>0))
-      (void)v_in32(iob);
+    while ((c++<0xfffff) && ((verite_in8(iob+FIFOOUTVALID)&0x7)>0))
+      (void)verite_in32(iob);
 
-/*       if(!(c%0xffff))ErrorF("#F2# !0x%x! -- ",v_in8(iob+FIFOOUTVALID)); */
+/*       if(!(c%0xffff))ErrorF("#F2# !0x%x! -- ",verite_in8(iob+FIFOOUTVALID)); */
 
 
     if (c >= 0xfffff) { 
-        ErrorF("RENDITION: RISC synchronization failed (2) FIFO out == %d!\n",
-	       v_in8(iob+FIFOOUTVALID)&0x1f);
+      ErrorF ("Rendition: RISC synchronization failed (2) FIFO out == %d!\n",
+	      verite_in8(iob+FIFOOUTVALID)&0x1f);
         return; 
     }
 
     /* sync pixel engine using csucode -- I suppose this is quite slow <ml> */
     v1k_stop(pScreenInfo);
     v1k_start(pScreenInfo, pRendition->board.csucode_base);
-    v_out32(iob, 2);     /* a0 - sync command */
+    verite_out32(iob, 2);     /* a0 - sync command */
 
     c=0;
-    while ((c++<0xfffff) && ((v_in8(iob+FIFOOUTVALID)&0x7)>0))
-      (void)v_in32(iob);
+    while ((c++<0xfffff) && ((verite_in8(iob+FIFOOUTVALID)&0x7)>0))
+      (void)verite_in32(iob);
 
-/*      if(!(c%0xffff))ErrorF("#F3# !0x%x! -- ",v_in8(iob+FIFOOUTVALID)); */
+/*      if(!(c%0xffff))ErrorF("#F3# !0x%x! -- ",verite_in8(iob+FIFOOUTVALID)); */
 
     if (c == 0xfffff) { 
-        ErrorF("RENDITION: Pixel engine synchronization failed FIFO out == %d!\n",
-	       v_in8(iob+FIFOOUTVALID)&0x1f);
-        return; 
+        ErrorF ("Rendition: Pixel engine synchronization failed FIFO out == %d!\n",
+		verite_in8(iob+FIFOOUTVALID)&0x1f);
+        return;
     }
 
     /* restart the ucode */
-    v_out32(iob, 0);     /* a0 - ucode init command */
-    v_out32(iob, 0);     /* a1 - 1024 byte context store area */
-    v_out32(iob, 0);     /* a2 */
-    v_out32(iob, pRendition->board.ucode_entry);
+    verite_out32(iob, 0);     /* a0 - ucode init command */
+    verite_out32(iob, 0);     /* a1 - 1024 byte context store area */
+    verite_out32(iob, 0);     /* a2 */
+    verite_out32(iob, pRendition->board.ucode_entry);
 
     /* init the ucode */
     waitfifo(6);
-    v_out32(iob, CMD_SETUP);
-    v_out32(iob, P2(pRendition->board.mode.virtualwidth,
+    verite_out32(iob, CMD_SETUP);
+    verite_out32(iob, P2(pRendition->board.mode.virtualwidth,
 		    pRendition->board.mode.virtualheight));
-    v_out32(iob, P2(pRendition->board.mode.bitsperpixel,
+    verite_out32(iob, P2(pRendition->board.mode.bitsperpixel,
 		    pRendition->board.mode.pixelformat));
-    v_out32(iob, MC_SIZE);
+    verite_out32(iob, MC_SIZE);
 
-    v_out32(iob, pRendition->board.mode.virtualwidth  *
+    verite_out32(iob, pRendition->board.mode.virtualwidth  *
 	    (pRendition->board.mode.bitsperpixel>>3));
-    v_out32(iob, (pRendition->board.mode.stride1<<12) |
+    verite_out32(iob, (pRendition->board.mode.stride1<<12) |
 	    (pRendition->board.mode.stride0<<8)); 
 }
 
@@ -601,16 +568,16 @@
 
 
 #if 1 /* def DEBUG */
-    ErrorF("#ScreentoScreen# FIFO_INFREE 0x%x -- \n",v_in8(iob+FIFOINFREE));
-    ErrorF("#ScreentoScreen# FIFO_OUTVALID 0x%x -- \n",v_in8(iob+FIFOOUTVALID));
+    ErrorF("#ScreentoScreen# FIFO_INFREE 0x%x -- \n",verite_in8(iob+FIFOINFREE));
+    ErrorF("#ScreentoScreen# FIFO_OUTVALID 0x%x -- \n",verite_in8(iob+FIFOOUTVALID));
 #endif
 
     waitfifo(5);
-    v_out32(iob, CMD_SCREEN_BLT);
-    v_out32(iob, pRendition->board.Rop); 
-    v_out32(iob, P2(srcX, srcY));
-    v_out32(iob, P2(w, h));
-    v_out32(iob, P2(dstX, dstY));
+    verite_out32(iob, CMD_SCREEN_BLT);
+    verite_out32(iob, pRendition->board.Rop); 
+    verite_out32(iob, P2(srcX, srcY));
+    verite_out32(iob, P2(w, h));
+    verite_out32(iob, P2(dstX, dstY));
 }
 
 
@@ -652,14 +619,14 @@
 
     waitfifo(4);
 #ifdef DEBUG
-    ErrorF("#SubsequentSolidFill# FIFO_INFREE 0x%x -- \n",v_in8(iob+FIFOINFREE));
-    ErrorF("#SubsequentSolidFill# FIFO_OUTVALID 0x%x -- \n",v_in8(iob+FIFOOUTVALID));
+    ErrorF("#SubsequentSolidFill# FIFO_INFREE 0x%x -- \n",verite_in8(iob+FIFOINFREE));
+    ErrorF("#SubsequentSolidFill# FIFO_OUTVALID 0x%x -- \n",verite_in8(iob+FIFOOUTVALID));
     sleep(1);
 #endif
-    v_out32(iob, P2(pRendition->board.Rop, CMD_RECT_SOLID_ROP));
-    v_out32(iob, pRendition->board.Color);
-    v_out32(iob, P2(x, y));
-    v_out32(iob, P2(w, h));
+    verite_out32(iob, P2(pRendition->board.Rop, CMD_RECT_SOLID_ROP));
+    verite_out32(iob, pRendition->board.Color);
+    verite_out32(iob, P2(x, y));
+    verite_out32(iob, P2(w, h));
 }
 
 
@@ -684,11 +651,11 @@
 #endif
 
     waitfifo(5);
-    v_out32(iob, P2(1, CMD_LINE_SOLID));
-    v_out32(iob, pRendition->board.Rop);
-    v_out32(iob, pRendition->board.Color);
-    v_out32(iob, P2(x1, y1));
-    v_out32(iob, P2(x2, y2));
+    verite_out32(iob, P2(1, CMD_LINE_SOLID));
+    verite_out32(iob, pRendition->board.Rop);
+    verite_out32(iob, pRendition->board.Color);
+    verite_out32(iob, P2(x1, y1));
+    verite_out32(iob, P2(x2, y2));
 }
 
 /*
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c:1.7
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c:1.6	Fri Feb 25 13:03:00 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c	Fri Mar 31 12:13:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c,v 1.6 2000/02/25 21:03:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c,v 1.7 2000/03/31 20:13:25 dawes Exp $ */
 /*
  * includes
  */
@@ -138,11 +138,11 @@
 #endif
 
     /* enable cursor - X11 mode */
-    v_enablecursor(pScreenInfo, V_3COLORS,
+    verite_enablecursor(pScreenInfo, VERITE_3COLORS,
 #ifdef BIGCURSOR
-        V_CURSOR64
+        VERITE_CURSOR64
 #else 
-        V_CURSOR32
+        VERITE_CURSOR32
 #endif
         );
 }
@@ -157,7 +157,7 @@
 #endif
 
     /* Disable cursor */
-    v_enablecursor(pScreenInfo, V_NOCURSOR, 0);
+    verite_enablecursor(pScreenInfo, VERITE_NOCURSOR, 0);
 }
 
 
@@ -169,7 +169,7 @@
     ErrorF( "RENDITION: SetCursorPosition(%d, %d) called\n", x, y);
 #endif
 
-    v_movecursor(pScreenInfo, x, y, 1 /* xorigin */, 1 /* yorigin */);
+    verite_movecursor(pScreenInfo, x, y, 1 /* xorigin */, 1 /* yorigin */);
 }
 
 
@@ -181,7 +181,7 @@
     ErrorF( "RENDITION: SetCursorColors(%x, %x) called\n", fg, bg);
 #endif
 
-    v_setcursorcolor(pScreenInfo, bg, fg);
+    verite_setcursorcolor(pScreenInfo, bg, fg);
 }
 
 
@@ -192,11 +192,11 @@
 #ifdef DEBUG
     ErrorF( "RENDITION: loadcursor called\n");
 #endif
-    v_loadcursor(pScreenInfo,
+    verite_loadcursor(pScreenInfo,
 #ifdef BIGCURSOR
-        V_CURSOR64, 
+        VERITE_CURSOR64, 
 #else
-        V_CURSOR32, 
+        VERITE_CURSOR32, 
 #endif
         (vu8 *)src);
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c:1.30 xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c:1.34
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c:1.30	Mon Mar  6 15:54:12 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c	Mon Jun 12 19:28:33 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c,v 1.30 2000/03/06 23:54:12 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c,v 1.34 2000/06/13 02:28:33 dawes Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -61,6 +61,7 @@
 #include "accel.h"
 #include "vramdac.h"
 #include "rendition_shadow.h"
+#include "vbe.h"
 
 /*
  * defines
@@ -98,9 +99,11 @@
 
 static xf86MonPtr renditionDDC(ScrnInfoPtr pScreenInfo);
 static unsigned int renditionDDC1Read (ScrnInfoPtr pScreenInfo);
+static void renditionProbeDDC(ScrnInfoPtr pScrn, int index);
 
 static void renditionLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
 
+
 /* 
  * global data
  */
@@ -195,6 +198,12 @@
     NULL
 };
 
+static const char *vbeSymbols[] = {
+    "VBEInit",
+    "vbeDoEDID",
+    NULL
+};
+
 
 
 #ifdef XFree86LOADER
@@ -230,7 +239,7 @@
         xf86AddDriver(&RENDITION, Module, 0);
         LoaderRefSymLists(vgahwSymbols, ramdacSymbols, fbSymbols, 
 			  xaaSymbols, ddcSymbols, int10Symbols,
-			  shadowfbSymbols, NULL);
+			  shadowfbSymbols, vbeSymbols, NULL);
         return (pointer)TRUE;
     }
 
@@ -316,22 +325,25 @@
         else for (c=0; c<numUsed; c++) {
             ScrnInfoPtr pScrn;
             /* Allocate a ScrnInfoRec and claim the slot */
-            pScrn=xf86AllocateScreen(drv, 0);
-            pScrn->driverVersion=RENDITION_VERSION_CURRENT;
-            pScrn->driverName   =RENDITION_DRIVER_NAME;
-            pScrn->name         =RENDITION_NAME;
-            pScrn->Probe        =renditionProbe;
-            pScrn->PreInit      =renditionPreInit;
-            pScrn->ScreenInit   =renditionScreenInit;
-            pScrn->SwitchMode   =renditionSwitchMode;
-            pScrn->AdjustFrame  =renditionAdjustFrame;
-            pScrn->EnterVT      =renditionEnterVT;
-            pScrn->LeaveVT      =renditionLeaveVT;
-            pScrn->FreeScreen   =renditionFreeScreen;
-            pScrn->ValidMode    =renditionValidMode;
-            foundScreen=TRUE;
-            xf86ConfigActivePciEntity(pScrn, usedChips[c],
-                    renditionPCIchipsets, NULL, NULL, NULL, NULL, NULL);
+            pScrn=NULL;
+            if ((pScrn = xf86ConfigPciEntity(pScrn, 0,usedChips[c],
+						   renditionPCIchipsets, NULL,
+						   NULL, NULL, NULL, NULL))) {
+						       
+		pScrn->driverVersion=RENDITION_VERSION_CURRENT;
+		pScrn->driverName   =RENDITION_DRIVER_NAME;
+		pScrn->name         =RENDITION_NAME;
+		pScrn->Probe        =renditionProbe;
+		pScrn->PreInit      =renditionPreInit;
+		pScrn->ScreenInit   =renditionScreenInit;
+		pScrn->SwitchMode   =renditionSwitchMode;
+		pScrn->AdjustFrame  =renditionAdjustFrame;
+		pScrn->EnterVT      =renditionEnterVT;
+		pScrn->LeaveVT      =renditionLeaveVT;
+		pScrn->FreeScreen   =renditionFreeScreen;
+		pScrn->ValidMode    =renditionValidMode;
+		foundScreen=TRUE;
+	    }
         }
     }
     xfree(usedChips);
@@ -391,7 +403,6 @@
     ErrorF("FreeRec...!!!!\n");
     sleep(1);
 #endif
-
     if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
 	vgaHWFreeHWRec(pScreenInfo);
     xfree(pScreenInfo->driverPrivate);
@@ -464,8 +475,6 @@
     renditionPtr      pRendition;
     char             *in_string;
     
-    if (flags & PROBE_DETECT) return FALSE;
-
 #ifdef DEBUG
     ErrorF("Rendition: renditionPreInit() called\n");
 #endif
@@ -474,12 +483,10 @@
     if (pScreenInfo->numEntities != 1)
 	return FALSE;
 
-    /* set the monitor */
-    pScreenInfo->monitor=pScreenInfo->confScreen->monitor;
-
     /* allocate driver private structure */
     if (!renditionGetRec(pScreenInfo))
         return FALSE;
+
     pRendition=RENDITIONPTR(pScreenInfo);
 
     /* Get the entity, and make sure it is PCI. */
@@ -487,6 +494,14 @@
     if (pRendition->pEnt->location.type != BUS_PCI)
 	return FALSE;
 
+    if (flags & PROBE_DETECT) {
+        renditionProbeDDC(pScreenInfo, pRendition->pEnt->index);
+        return TRUE;
+    }
+
+    /* set the monitor */
+    pScreenInfo->monitor=pScreenInfo->confScreen->monitor;
+
     /* Initialize the card through int10 interface if needed */
     if (xf86LoadSubModule(pScreenInfo, "int10")){
         xf86Int10InfoPtr pInt=NULL;
@@ -580,7 +595,7 @@
 
     /* determine default visual */
     if (!xf86SetDefaultVisual(pScreenInfo, -1))
-        return FALSE;
+      return FALSE;
 
     /* the gamma fields must be initialised when using the new cmap code */
     if (pScreenInfo->depth > 1) {
@@ -624,20 +639,21 @@
 
     /* I do not get the IO base addres <ml> */
     /* XXX Is this still true?  If so, the wrong base is being checked */
-    ErrorF("Rendition %s @ %x/%x\n",renditionChipsets[
-      pRendition->board.chip==V1000_DEVICE ? 0:1].name,
-        pRendition->board.io_base,
-        pRendition->board.mem_base);
+    xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED,
+	       "Rendition %s @ %x/%x\n",
+	       renditionChipsets[pRendition->board.chip==V1000_DEVICE ? 0:1].name,
+	       pRendition->board.io_base,
+	       pRendition->board.mem_base);
 
     /* First of all get a "clean" starting state */
-    v_resetboard(pScreenInfo);
+    verite_resetboard(pScreenInfo);
 
     /* determine video ram -- to do so, we assume a full size memory of 16M,
-     * then map it and use v_getmemorysize() to determine the real amount of
+     * then map it and use verite_getmemorysize() to determine the real amount of
      * memory */
     pScreenInfo->videoRam=pRendition->board.mem_size=16<<20;
     renditionMapMem(pScreenInfo);
-    videoRam=v_getmemorysize(pScreenInfo)>>10;
+    videoRam=verite_getmemorysize(pScreenInfo)>>10;
 
     /* Unmaping delayed until after micrcode loading */
       /****************************************/
@@ -647,9 +663,12 @@
     if (!xf86ReturnOptValBool(renditionOptions, OPTION_NOACCEL,0)) {
       RENDITIONAccelPreInit (pScreenInfo);
     }
-    else ErrorF("RENDITION: Skipping acceleration on users request\n");
+    else
+      xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+		 ("Skipping acceleration on users request\n"));
 #else
-    ErrorF("RENDITION: Skipping acceleration\n");
+    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+	       ("Skipping acceleration\n"));
 #endif
 
     xf86MarkOptionUsedByName(renditionOptions,"NoAccel");
@@ -667,7 +686,6 @@
     }
     xf86LoaderReqSymLists(vgahwSymbols, NULL);
 
-
     pRendition->board.shadowfb=TRUE;
 
     if ((in_string = xf86GetOptValString(renditionOptions, OPTION_ROTATE))) {
@@ -733,10 +751,12 @@
     }
 #endif
 
+#if 0
     /* Load DDC module if needed */
     if (!xf86ReturnOptValBool(renditionOptions, OPTION_NO_DDC,0)){
       if (!xf86LoadSubModule(pScreenInfo, "ddc")) {
-	ErrorF ("RENDITION: Loading of DDC library failed, skipping DDC-probe\n");
+	xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+		   ("Loading of DDC library failed, skipping DDC-probe\n"));
       }
       else {
 	xf86LoaderReqSymLists(ddcSymbols, NULL);
@@ -744,8 +764,26 @@
       }
     }
     else {
-      ErrorF ("RENDITION: Skipping DDC probe on users request\n");
+      xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+		 ("Skipping DDC probe on users request\n"));
     }
+#else
+    /* Load DDC module if needed */
+    if (!xf86ReturnOptValBool(renditionOptions, OPTION_NO_DDC,0)){
+      if (!xf86LoadSubModule(pScreenInfo, "vbe")) {
+	xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+		   ("Loading of DDC library failed, skipping DDC-probe\n"));
+      }
+      else {
+	xf86LoaderReqSymLists(vbeSymbols, NULL);
+        renditionProbeDDC(pScreenInfo, pRendition->pEnt->index);
+      }
+    }
+    else {
+      xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+		 ("Skipping DDC probe on users request\n"));
+    }
+#endif
 
     /***********************************************/
     /* ensure vgahw private structure is allocated */
@@ -878,7 +916,7 @@
     vgaHWRestore(pScreenInfo, &VGAHWPTR(pScreenInfo)->SavedReg, VGA_SR_ALL);
     vgaHWProtect(pScreenInfo, FALSE);
 
-    v_setmode(pScreenInfo, &RENDITIONPTR(pScreenInfo)->mode);
+    verite_setmode(pScreenInfo, &RENDITIONPTR(pScreenInfo)->mode);
 #ifdef DEBUG
     ErrorF("Restore OK...!!!!\n");
     sleep(1);
@@ -890,7 +928,7 @@
 static Bool
 renditionSetMode(ScrnInfoPtr pScreenInfo, DisplayModePtr pMode)
 {
-    struct v_modeinfo_t *modeinfo=&RENDITIONPTR(pScreenInfo)->mode;
+    struct verite_modeinfo_t *modeinfo=&RENDITIONPTR(pScreenInfo)->mode;
     vgaHWPtr pvgaHW;
 
 #ifdef DEBUG
@@ -900,7 +938,7 @@
 #endif
 
     pvgaHW = VGAHWPTR(pScreenInfo);
-    /* construct a modeinfo for the v_setmode function */
+    /* construct a modeinfo for the verite_setmode function */
     modeinfo->clock=pMode->SynthClock;
     modeinfo->hdisplay=pMode->HDisplay;
     modeinfo->hsyncstart=pMode->HSyncStart;
@@ -955,12 +993,10 @@
             break;
         case 16:
             modeinfo->bitsperpixel=16;
-#if 0
-            if (vga256InfoRec.weight.green == 5)
+            if (pScreenInfo->weight.green == 5)
                 /* on a V1000, this looks too 'red/magenta' <ml> */
                 modeinfo->pixelformat=V_PIXFMT_1555;
             else
-#endif
                 modeinfo->pixelformat=V_PIXFMT_565;
             break;
         case 32:
@@ -971,7 +1007,7 @@
     modeinfo->fifosize=128;
     modeinfo->flags=pMode->Flags;
 
-    v_setmode(pScreenInfo,&RENDITIONPTR(pScreenInfo)->mode);
+    verite_setmode(pScreenInfo,&RENDITIONPTR(pScreenInfo)->mode);
 
 #ifdef DEBUG
     ErrorF("Setmode OK...!!!!\n");
@@ -1033,7 +1069,7 @@
     renditionRestore(pScreenInfo);
     vgaHWLock(VGAHWPTR(pScreenInfo));
 
-    v_textmode(&RENDITIONPTR(pScreenInfo)->board);
+    verite_textmode(&RENDITIONPTR(pScreenInfo)->board);
 #ifdef DEBUG
     ErrorF("Leavegraphics OK...!!!!\n");
     sleep(1);
@@ -1180,42 +1216,63 @@
     if (!Inited)
         return FALSE;
 
-    miInitializeBackingStore(pScreen);
 
     if (pScreenInfo->bitsPerPixel > 8) {
         /* Fixup RGB ordering */
         visual=pScreen->visuals+pScreen->numVisuals;
         while (--visual >= pScreen->visuals) {
-	        if (0 && (visual->class | DynamicClass) == DirectColor) {
-		        visual->offsetRed = pScreenInfo->offset.red;
-		        visual->offsetGreen = pScreenInfo->offset.green;
-		        visual->offsetBlue = pScreenInfo->offset.blue;
-		        visual->redMask = pScreenInfo->mask.red;
-		        visual->greenMask = pScreenInfo->mask.green;
-		        visual->blueMask = pScreenInfo->mask.blue;
-	        }
-            else {
-                ErrorF("Changing masks!!!\n");
-                if (pScreenInfo->bitsPerPixel == 32) {
-		        visual->offsetRed=16;
-		        visual->offsetGreen=8;
-		        visual->offsetBlue=0;
-		        visual->redMask=0xff0000;
-		        visual->greenMask=0xff00;
-		        visual->blueMask=0xff;
-		} else {
-		        visual->offsetRed=11;
-		        visual->offsetGreen=5;
-		        visual->offsetBlue=0;
-		        visual->redMask=0xf800;
-		        visual->greenMask=0x7e0;
-		        visual->blueMask=0x1f;
+	  if ((visual->class | DynamicClass) == DirectColor){
+	    visual->offsetRed = pScreenInfo->offset.red;
+	    visual->offsetGreen = pScreenInfo->offset.green;
+	    visual->offsetBlue = pScreenInfo->offset.blue;
+	    visual->redMask = pScreenInfo->mask.red;
+	    visual->greenMask = pScreenInfo->mask.green;
+	    visual->blueMask = pScreenInfo->mask.blue;
+	  }
+
+#if 0   /* This code is never called ? <DI> */
+	  else {
+	    switch (pScreenInfo->bitsPerPixel)
+	      {
+	      case 16:
+		if (pScreenInfo->weight.green == 5){
+		  /* weight 555 mode */
+		  ErrorF("RENDITION: 15bit mode\n");
+		  visual->offsetRed=10;
+		  visual->offsetGreen=5;
+		  visual->offsetBlue=0;
+		  visual->redMask=0x7c00;
+		  visual->greenMask=0x3e0;
+		  visual->blueMask=0x1f;
+		}
+		else{
+		  ErrorF("RENDITION: 16bit mode\n");
+		  visual->offsetRed=11;
+		  visual->offsetGreen=5;
+		  visual->offsetBlue=0;
+		  visual->redMask=0xf800;
+		  visual->greenMask=0x7e0;
+		  visual->blueMask=0x1f;
 		}
+		break;
+		
+	      case 32:
+		ErrorF("RENDITION: 32bit mode\n");
+		visual->offsetRed=16;
+		visual->offsetGreen=8;
+		visual->offsetBlue=0;
+		visual->redMask=0xff0000;
+		visual->greenMask=0xff00;
+		visual->blueMask=0xff;
+		break;
+	      }
             }
+#endif  /* Never used fixup code */
 	}
     }
 
     xf86SetBlackWhitePixels(pScreen);
+    miInitializeBackingStore(pScreen);
    
     /*********************************************************/
     /* The actual setup of the driver-specific code          */
@@ -1227,6 +1284,7 @@
 #endif
 
     /* Initialise cursor functions */
+    xf86SetSilkenMouse(pScreen);
     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
 
     if(!xf86ReturnOptValBool(renditionOptions, OPTION_SW_CURSOR,0)&&
@@ -1332,7 +1390,7 @@
 #ifdef DEBUG
     ErrorF ("MOVING SCREEN %d bytes!!\n",offset);
 #endif
-    v_setframebase(pScreenInfo, offset);
+    verite_setframebase(pScreenInfo, offset);
 }
 
 
@@ -1385,7 +1443,7 @@
      RENDITIONPTR(pScreenInfo)->board.mem_base, pScreenInfo->videoRam);
 #endif
 
-  if (1 /* RENDITIONPTR(pScreenInfo)->board.chip==V1000_DEVICE */){
+  if (RENDITIONPTR(pScreenInfo)->board.chip==V1000_DEVICE){
     /* Some V1000 boards are known to have problems with Write-Combining */
     /* V2x00 also found to have similar problems with memcpy & WC ! */
     WriteCombine = 0;
@@ -1397,11 +1455,13 @@
   /* Override on users request */
   WriteCombine=xf86ReturnOptValBool(renditionOptions, OPTION_FBWC, WriteCombine);
   if (WriteCombine){
-    ErrorF("RENDITION: Requesting write-combined memory access\n");
+    xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+	       ("Requesting Write-Combined memory access\n"));
     mapOption = VIDMEM_FRAMEBUFFER;
   }
   else {
-    ErrorF("RENDITION: Requesting MMIO-style memory access\n");
+    xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+	       ("Requesting MMIO-style memory access\n"));
     mapOption = VIDMEM_MMIO;
   }
 
@@ -1438,7 +1498,7 @@
 		     int *indices, LOCO *colors,
 		     VisualPtr pVisual)
 {
-  v_setpalette(pScreenInfo, numColors, indices, colors, pVisual);
+  verite_setpalette(pScreenInfo, numColors, indices, colors, pVisual);
 }
 
 
@@ -1450,10 +1510,10 @@
   vu32 temp;
 
   xf86MonPtr MonInfo = NULL;
-  temp = v_in32(iob+CRTCCTL); /* Remember original value */
+  temp = verite_in32(iob+CRTCCTL); /* Remember original value */
 
   /* Enable DDC1 */
-  v_out32(iob+CRTCCTL,(temp|
+  verite_out32(iob+CRTCCTL,(temp|
 		       CRTCCTL_ENABLEDDC|
 		       CRTCCTL_VSYNCENABLE|
 		       CRTCCTL_VIDEOENABLE));
@@ -1462,7 +1522,7 @@
 			    vgaHWddc1SetSpeed,
 			    renditionDDC1Read );
 
-  v_out32(iob+CRTCCTL,temp); /* return the original values */
+  verite_out32(iob+CRTCCTL,temp); /* return the original values */
 
   xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
 	     "DDC Monitor info: %p\n", MonInfo);
@@ -1483,10 +1543,22 @@
   vu32 value = 0;
 
   /* wait for Vsync */
-  while (!(v_in32(iob+CRTCSTATUS) & CRTCSTATUS_VERT_SYNC));
-  while (v_in32(iob+CRTCSTATUS) & CRTCSTATUS_VERT_SYNC);
+  while (!(verite_in32(iob+CRTCSTATUS) & CRTCSTATUS_VERT_SYNC));
+  while (verite_in32(iob+CRTCSTATUS) & CRTCSTATUS_VERT_SYNC);
 
   /* Read the value */
-  value = v_in32(iob+CRTCCTL) & CRTCCTL_DDCDATA;
+  value = verite_in32(iob+CRTCCTL) & CRTCCTL_DDCDATA;
   return value;
+}
+
+void
+renditionProbeDDC(ScrnInfoPtr pScreenInfo, int index)
+{
+  vbeInfoPtr pVbe;
+  if (xf86LoadSubModule(pScreenInfo, "vbe")) {
+    xf86LoaderReqSymLists(vbeSymbols, NULL);
+
+    pVbe = VBEInit(NULL,index);
+    ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
+  }
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.cpp:1.2 xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.cpp:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.cpp:1.2	Sun Mar  5 08:59:14 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.cpp	Tue Jun 13 19:13:13 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.cpp,v 1.2 2000/03/05 16:59:14 dawes Exp $ 
-.TH RENDITION __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.cpp,v 1.5 2000/06/14 02:13:13 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH RENDITION __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 rendition \- Rendition video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""rendition"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qrendition\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B rendition 
 is an XFree86 driver for Rendition/Micron based video cards.  The driver
@@ -39,7 +39,7 @@
 The driver auto-detects the chipset type, but the following
 .B ChipSet
 names may optionally be specified in the config file
-.B """Device"""
+.B \*qDevice\*q
 section, and will override the auto-detection:
 .PP
 .RS 4
@@ -51,40 +51,40 @@
 of video memory should be specified with a
 .B VideoRam
 entry in the config file
-.B """Device"""
+.B \*qDevice\*q
 section.
 .PP
 The following driver
 .B Options
 are supported:
 .TP
-.BI "Option ""SWCursor"" """ boolean """
+.BI "Option \*qSWCursor\*q \*q" boolean \*q
 Disables use of the hardware cursor. Default: use HW-cursor.
 .TP
-.BI "Option ""OverclockMem"" """ boolean """
+.BI "Option \*qOverclockMem\*q \*q" boolean \*q
 Increases the Mem/Sys clock to 125MHz/60MHz from standard 110MHz/50MHz.
 Default: Not overclocked.
 .TP
-.BI "Option ""DacSpeed"" """ MHz """
+.BI "Option \*qDacSpeed\*q \*q" MHz \*q
 Run the memory at a higher clock. Useful on some cards with display glitches
 at higher resolutions. But adds the risk to damage the hardware. Use with 
 caution.
 .TP
-.BI "Option ""FramebufferWC"" """ boolean """
+.BI "Option \*qFramebufferWC\*q \*q" boolean \*q
 If writecombine is disabled in BIOS, and you add this option in configuration
 file, then the driver will try to request writecombined access to the 
 framebuffer. This can drastically increase the performance on unaccelerated
 server. Requires that "MTRR"-support is compiled into the OS-kernel.
 Default: Disabled for V1000, enabled for V2100/V2200.
 .TP
-.BI "Option ""NoDDC"" """ boolean """
+.BI "Option \*qNoDDC\*q \*q" boolean \*q
 Disable probing of DDC-information from your monitor. This information is not
 used yet and is only there for informational purposes. This might change
 before final XFree86 4.0 release. Safe to disable if you experience problems
 during startup of X-server.
 Default: Probe DDC.
 .TP
-.BI "Option ""ShadowFB"" """ boolean """
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
 If this option is enabled, the driver will cause the CPU to do each drawing
 operation first into a shadow frame buffer in system virtual memory and then
 copy the result into video memory. If this option is not active, the CPU will
@@ -95,18 +95,18 @@
 default unless acceleration is enabled.
 Default: Enabled unless acceleration is used.
 .TP
-.BI "Option ""Rotate"" ""CW""
+.BI "Option \*qRotate\*q \*qCW\*q"
 .TP
-.BI "Option ""Rotate"" ""CCW""
+.BI "Option \*qRotate\*q \*qCCW\*q"
 Rotate the display clockwise or counterclockwise.  This mode is unaccelerated.
 Default: no rotation.
 .TP
 .SH "Notes"
 For the moment the driver defaults to not request write-combine for any chipset
 as there has been indications of problems with it. Use
-.B "Option ""MTRR"""
+.B "Option \*qMTRR\*q"
 to let the driver request write-combining of memory access on the videoboard.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Marc Langenbach, Dejan Ilic
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h:1.5 xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h:1.5	Fri Feb 25 13:03:02 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h	Tue Apr  4 12:25:15 2000
@@ -1,17 +1,17 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.5 2000/02/25 21:03:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.6 2000/04/04 19:25:15 dawes Exp $ */
 
 #ifndef __RENDITION_H__
 #define __RENDITION_H__
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
 /* All drivers need this */
 #include "xf86_ansic.h"
+
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
 
 /* This is used for module versioning */
 #include "xf86Version.h"
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c:1.5 xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c:1.5	Fri Feb 25 13:03:03 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c	Fri Mar 31 12:13:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c,v 1.5 2000/02/25 21:03:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c,v 1.6 2000/03/31 20:13:25 dawes Exp $ */
 /*
  *
  */
@@ -72,7 +72,7 @@
 #define WRITE_SHORT	1
 #define WRITE_WORD	2
 
-#define V_MAX_POLLS	100
+#define VERITE_MAX_POLLS	100
 
 
 
@@ -80,8 +80,8 @@
  * local function prototypes
  */
 
-static void v_iopoll(vu16 port, vu32 data, vu32 mask);
-static void v_iopoll8(vu16 port, vu8 data, vu8 mask);
+static void verite_iopoll(vu16 port, vu32 data, vu32 mask);
+static void verite_iopoll8(vu16 port, vu8 data, vu8 mask);
 
 static vu32 readRF(vu16 io_base, vu8 index);
 static void writeRF(vu16 io_base, vu8 index, vu32 data);
@@ -151,39 +151,41 @@
   vu16 STATUS = 0x4A;   /* v2x00 io register offset */
   int c;
 
-  debugreg=v_in8(io_base+DEBUGREG);
+  debugreg=verite_in8(io_base+DEBUGREG);
 
   if (pRendition->board.chip == V2000_DEVICE){
     c=0;
     do {
-/*      if(!(c%10000))ErrorF("#S1# !0x%x! -- ",v_in8((vu16)(io_base+STATUS))); */
-      statusreg = v_in8((vu16)(io_base+STATUS));
+/*      if(!(c%10000))ErrorF("#S1# !0x%x! -- ",verite_in8((vu16)(io_base+STATUS))); */
+      statusreg = verite_in8((vu16)(io_base+STATUS));
       if ((statusreg & 0x8C) == 0x8C)
 	break;
     } while (c++<0xfffff);
     if (c >= 0xfffff)
-      ErrorF ("RENDITION: Status timeout (1)\n");
+      xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+		 ("Status timeout (1)\n"));
 
-    v_out8(io_base+DEBUGREG, debugreg|HOLDRISC);
+    verite_out8(io_base+DEBUGREG, debugreg|HOLDRISC);
 
     if (pRendition->board.chip == V2000_DEVICE){
       c=0;
       do {
-/*	if(!(c%10000))ErrorF("#S2# !0x%x! -- ",v_in8((vu16)(io_base+STATUS))); */
-	statusreg = v_in8((vu16)(io_base+STATUS));
+/*	if(!(c%10000))ErrorF("#S2# !0x%x! -- ",verite_in8((vu16)(io_base+STATUS))); */
+	statusreg = verite_in8((vu16)(io_base+STATUS));
 	if (statusreg & HOLDRISC) break;
       } while (c++<0xfffff);
       if (c >= 0xfffff)
-	ErrorF ("RENDITION: Status timeout (2)\n");
+	xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+		   ("Status timeout (2)\n"));
     }
   }   
   else {
     /* V1000 stop */
-    v_out8(io_base+DEBUGREG, debugreg|HOLDRISC);
+    verite_out8(io_base+DEBUGREG, debugreg|HOLDRISC);
 
-    v_iopoll(io_base+STATEDATA, 0, 0); /* short pause */
-    v_iopoll(io_base+STATEDATA, 0, 0); /* short pause */
-    v_iopoll(io_base+STATEDATA, 0, 0); /* short pause */
+    verite_iopoll(io_base+STATEDATA, 0, 0); /* short pause */
+    verite_iopoll(io_base+STATEDATA, 0, 0); /* short pause */
+    verite_iopoll(io_base+STATEDATA, 0, 0); /* short pause */
   }
 }
 
@@ -250,32 +252,32 @@
   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
   vu16 io_base=pRendition->board.io_base;
 
-  v_out8(io_base+DEBUGREG, SOFTRESET|HOLDRISC);
-  v_out8(io_base+STATEINDEX, STATEINDEX_PC);
-  v_iopoll(io_base+STATEDATA, 0, 0xffffffff);
-  v_iopoll(io_base+STATEDATA, 0, 0xffffffff);
-  v_iopoll(io_base+STATEDATA, 0, 0xffffffff);
-
-  v_out8(io_base+DEBUGREG, HOLDRISC);
-  v_iopoll(io_base+STATEDATA, 0, 0);
-  v_iopoll(io_base+STATEDATA, 0, 0);
-  v_iopoll(io_base+STATEDATA, 0, 0);
+  verite_out8(io_base+DEBUGREG, SOFTRESET|HOLDRISC);
+  verite_out8(io_base+STATEINDEX, STATEINDEX_PC);
+  verite_iopoll(io_base+STATEDATA, 0, 0xffffffff);
+  verite_iopoll(io_base+STATEDATA, 0, 0xffffffff);
+  verite_iopoll(io_base+STATEDATA, 0, 0xffffffff);
+
+  verite_out8(io_base+DEBUGREG, HOLDRISC);
+  verite_iopoll(io_base+STATEDATA, 0, 0);
+  verite_iopoll(io_base+STATEDATA, 0, 0);
+  verite_iopoll(io_base+STATEDATA, 0, 0);
 
   /* turn icache on */
   risc_forcestep(io_base, LI_INSTR(LI_OP, RISC_RA, ICACHE_ONOFF_MASK&0xffff));
   risc_forcestep(io_base, INT_INSTR(ADDIFI_OP, RISC_FLAG, RISC_RA, 
                                     ICACHE_ONOFF_MASK>>16));
   /* clear any interrupts */
-  v_out8(io_base+INTR, 0xff);
+  verite_out8(io_base+INTR, 0xff);
   /* byte swap mode=word */
-  v_out8(io_base+MEMENDIAN, MEMENDIAN_NO);	
+  verite_out8(io_base+MEMENDIAN, MEMENDIAN_NO);	
 }
 
 
 
 /*
 void
-v1k_getriscprocs(v_board_desc *boardDesc)
+v1k_getriscprocs(verite_board_desc *boardDesc)
 {
     boardDesc->risc_procs.risc_softreset = v1krisc_softreset;
     boardDesc->risc_procs.risc_flushicache = v1krisc_flushicache;
@@ -293,32 +295,32 @@
  */
 
 /* 
- * static void v_iopoll(vu16 port, vu32 data, vu32 mask)
+ * static void verite_iopoll(vu16 port, vu32 data, vu32 mask)
  *
- * Loop on IO read until expected data is read or V_MAX_POLLS is reached.
+ * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached.
  */
 static void
-v_iopoll(vu16 port, vu32 data, vu32 mask)
+verite_iopoll(vu16 port, vu32 data, vu32 mask)
 {
   vu32 c, d;
 
   c=0;
   do {
     c++;
-    if (((d=v_in32(port))&mask) == (data&mask))
+    if (((d=verite_in32(port))&mask) == (data&mask))
       break;
-  } while (c <= V_MAX_POLLS);
+  } while (c <= VERITE_MAX_POLLS);
 }
 
 
 
 /* 
- * static void v_iopoll8(vu16 port, vu8 data, vu8 mask)
+ * static void verite_iopoll8(vu16 port, vu8 data, vu8 mask)
  *
- * Loop on IO read until expected data is read or V_MAX_POLLS is reached.
+ * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached.
  */
 static void
-v_iopoll8(vu16 port, vu8 data, vu8 mask)
+verite_iopoll8(vu16 port, vu8 data, vu8 mask)
 {
   vu32 c;
   vu8 d;
@@ -326,9 +328,9 @@
   c=0;
   do {
 	c++;
-	if (((d=v_in8(port))&mask) == (data&mask))
+	if (((d=verite_in8(port))&mask) == (data&mask))
 	  break;
-  } while (c <= V_MAX_POLLS);
+  } while (c <= VERITE_MAX_POLLS);
 }
 
 
@@ -344,27 +346,27 @@
   vu32 data, instr;
   vu8 debug, stateindex;
     
-  debug=v_in8(io_base+DEBUGREG);
-  stateindex=v_in8(io_base+STATEINDEX);
+  debug=verite_in8(io_base+DEBUGREG);
+  stateindex=verite_in8(io_base+STATEINDEX);
 
   /* force RISC instruction: add zero,zero,index
    * S1 reg address = reg index to read
    * write to the DEC_IR, but no need to step it! */
-  v_out8(io_base+DEBUGREG, debug|HOLDRISC);
+  verite_out8(io_base+DEBUGREG, debug|HOLDRISC);
 
   instr=INT_INSTR(ADD_OP, 0, 0, index);
-  v_out32(io_base+STATEDATA, instr);
+  verite_out32(io_base+STATEDATA, instr);
 
   /* wait for instruction to get to RISC IR. */
-  v_out8(io_base+STATEINDEX, STATEINDEX_IR);  /* point at DEC_IR */
-  v_iopoll(io_base+STATEDATA, instr, 0xffffffff);
+  verite_out8(io_base+STATEINDEX, STATEINDEX_IR);  /* point at DEC_IR */
+  verite_iopoll(io_base+STATEDATA, instr, 0xffffffff);
 
-  v_out8(io_base+STATEINDEX, STATEINDEX_S1);  /* point at RISCS1 */
-  v_iopoll(io_base+STATEINDEX, 0, 0);         /* short pause */
-  data=v_in32(io_base+STATEDATA);             /* read RF */
+  verite_out8(io_base+STATEINDEX, STATEINDEX_S1);  /* point at RISCS1 */
+  verite_iopoll(io_base+STATEINDEX, 0, 0);         /* short pause */
+  data=verite_in32(io_base+STATEDATA);             /* read RF */
     
-  v_out8(io_base+STATEINDEX, stateindex);     /* restore state_index */
-  v_out8(io_base+DEBUGREG, debug);            /* restore debug */
+  verite_out8(io_base+STATEINDEX, stateindex);     /* restore state_index */
+  verite_out8(io_base+DEBUGREG, debug);            /* restore debug */
     
   return data;
 }
@@ -472,11 +474,11 @@
   /* RISC is already held; just single step it */
     
   for (c=0; c<count; c++) {
-    debugreg=v_in8(io_base+DEBUGREG);
-    v_out8(io_base+DEBUGREG, debugreg|STEPRISC); 
+    debugreg=verite_in8(io_base+DEBUGREG);
+    verite_out8(io_base+DEBUGREG, debugreg|STEPRISC); 
     
     for (d=0; d<1000; d++)
-      if(0 == (v_in8(io_base+DEBUGREG)&STEPRISC))
+      if(0 == (verite_in8(io_base+DEBUGREG)&STEPRISC))
 		break;
 
     if (1000 == d)
@@ -498,21 +500,21 @@
   vu8 debugreg, stateindex;
     
     
-  debugreg=v_in8(io_base+DEBUGREG);
-  stateindex=v_in8(io_base+STATEINDEX);
-  v_out8(io_base+STATEINDEX, STATEINDEX_IR);
-  v_iopoll8(io_base+STATEINDEX, STATEINDEX_IR, 0xff);    /* wait */
-  v_out32(io_base+STATEDATA, instruction);               /* load instruction */
-  v_iopoll(io_base+STATEDATA, instruction, 0xffffffff);  /* wait */
-  v_out8(io_base+DEBUGREG, debugreg|HOLDRISC|STEPRISC);  /* step */
-  v_iopoll(io_base+STATEDATA, 0, 0);                     /* short pause */
+  debugreg=verite_in8(io_base+DEBUGREG);
+  stateindex=verite_in8(io_base+STATEINDEX);
+  verite_out8(io_base+STATEINDEX, STATEINDEX_IR);
+  verite_iopoll8(io_base+STATEINDEX, STATEINDEX_IR, 0xff);    /* wait */
+  verite_out32(io_base+STATEDATA, instruction);               /* load instruction */
+  verite_iopoll(io_base+STATEDATA, instruction, 0xffffffff);  /* wait */
+  verite_out8(io_base+DEBUGREG, debugreg|HOLDRISC|STEPRISC);  /* step */
+  verite_iopoll(io_base+STATEDATA, 0, 0);                     /* short pause */
     
-  for (c=0; c<V_MAX_POLLS; c++)
-    if (HOLDRISC == (v_in8(io_base+DEBUGREG) & (HOLDRISC|STEPRISC)))
+  for (c=0; c<VERITE_MAX_POLLS; c++)
+    if (HOLDRISC == (verite_in8(io_base+DEBUGREG) & (HOLDRISC|STEPRISC)))
       break;
 
   /* restore */
-  v_out8(io_base+STATEINDEX, stateindex);
+  verite_out8(io_base+STATEINDEX, stateindex);
 }
 
 
@@ -527,9 +529,9 @@
 {
   vu8 debugreg;
 
-  debugreg=v_in8(io_base+DEBUGREG);
-  v_out8(io_base+DEBUGREG, debugreg&(~HOLDRISC));
-  v_iopoll(io_base+STATEDATA, 0, 0);    /* short pause */
+  debugreg=verite_in8(io_base+DEBUGREG);
+  verite_out8(io_base+DEBUGREG, debugreg&(~HOLDRISC));
+  verite_iopoll(io_base+STATEDATA, 0, 0);    /* short pause */
 }
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c:1.9 xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c:1.9	Fri Feb 25 13:03:03 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c	Mon Jun 19 08:01:02 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.9 2000/02/25 21:03:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.12 2000/06/19 15:01:02 tsi Exp $ */
 /*
  * includes
  */
@@ -17,11 +17,8 @@
 
 #include "cscode.h"
 
-#if 0
 /* Global imported during compile-time */
 char MICROCODE_DIR [PATH_MAX] = MODULEDIR;
-#endif
-
 
 /*
  * local function prototypes
@@ -32,7 +29,7 @@
  * functions
  */
 int
-v_initboard(ScrnInfoPtr pScreenInfo)
+verite_initboard(ScrnInfoPtr pScreenInfo)
 {
   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
 
@@ -45,8 +42,8 @@
   /* write "monitor" program to memory */
   v1k_stop(pScreenInfo);
   pRendition->board.csucode_base=0x800;
-  memendian=v_in8(iob+MEMENDIAN);
-  v_out8(iob+MEMENDIAN, MEMENDIAN_NO);
+  memendian=verite_in8(iob+MEMENDIAN);
+  verite_out8(iob+MEMENDIAN, MEMENDIAN_NO);
 
   /* Note that CS ucode must wait on address in csucode_base
    * when initialized for later context switch code to work. */
@@ -55,63 +52,67 @@
   vmb=pRendition->board.vmem_base;
   offset=pRendition->board.csucode_base;
   for (c=0; c<sizeof(csrisc)/sizeof(vu32); c++, offset+=sizeof(vu32))
-    v_write_memory32(vmb, offset, csrisc[c]);
+    verite_write_memory32(vmb, offset, csrisc[c]);
 
   /* Initialize the CS flip semaphore */
-  v_write_memory32(vmb, 0x7f8, 0);
-  v_write_memory32(vmb, 0x7fc, 0);
+  verite_write_memory32(vmb, 0x7f8, 0);
+  verite_write_memory32(vmb, 0x7fc, 0);
 
   /* Run the code we just transfered to the boards memory */
   /* ... and start accelerator */
   v1k_flushicache(pScreenInfo);
 
-  v_out8(iob + STATEINDEX, STATEINDEX_PC);
-  pc = v_in32(iob + STATEDATA);
+  verite_out8(iob + STATEINDEX, STATEINDEX_PC);
+  pc = verite_in32(iob + STATEDATA);
   v1k_start(pScreenInfo, pRendition->board.csucode_base);
 
   /* Get on loading the ucode */
-  v_out8(iob + STATEINDEX, STATEINDEX_PC);
+  verite_out8(iob + STATEINDEX, STATEINDEX_PC);
 
   for (c = 0; c < 0xffffffL; c++){
     v1k_stop(pScreenInfo);
-    pc = v_in32(iob + STATEDATA);
+    pc = verite_in32(iob + STATEDATA);
     v1k_continue(pScreenInfo);
     if (pc == pRendition->board.csucode_base)
       break;
   }
   if (pc != pRendition->board.csucode_base){
-    ErrorF ("RENDITION: V_INITBOARD -- PC != CSUCODEBASE\n");
-    ErrorF ("RENDITION: PC == 0x%x   --  CSU == 0x%x\n",pc,pRendition->board.csucode_base);
+    xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+	       ("VERITE_INITBOARD -- PC != CSUCODEBASE\n"));
+    ErrorF ("RENDITION: PC == 0x%x   --  CSU == 0x%x\n",
+	    pc,pRendition->board.csucode_base);
   }
 
   /* reset memory endian */
-  v_out8(iob+MEMENDIAN, memendian);
+  verite_out8(iob+MEMENDIAN, memendian);
 
-#if 0
   if (V1000_DEVICE == pRendition->board.chip){
-    c=v_load_ucfile(pScreenInfo, xf86strcat ((char *)MICROCODE_DIR,"v10002d.uc"));
+    c=verite_load_ucfile(pScreenInfo, strcat ((char *)MICROCODE_DIR,"v10002d.uc"));
   }
   else {
     /* V2x00 chip */
-    c=v_load_ucfile(pScreenInfo, xf86strcat ((char *)MICROCODE_DIR,"v20002d.uc"));
+    c=verite_load_ucfile(pScreenInfo, strcat ((char *)MICROCODE_DIR,"v20002d.uc"));
   }
 
   if (c == -1) {
-    ErrorF( "RENDITION: Microcode loading failed !!!\n");
+    xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+	       ("Microcode loading failed !!!\n"));
     return 1;
   }
 
   pRendition->board.ucode_entry=c;
 
-  ErrorF("UCode_Entry == 0x%x\n",pRendition->board.ucode_entry);
+#ifdef DEBUG
+  ErrorF("UCode_Entry == 0x%x\n",pRendition->board.ucode_entry); */
 #endif
+
   /* Everything's OK */
   return 0;
 }
 
 
 int
-v_resetboard(ScrnInfoPtr pScreenInfo)
+verite_resetboard(ScrnInfoPtr pScreenInfo)
 {
   /*
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
@@ -123,7 +124,7 @@
 
 
 int
-v_getmemorysize(ScrnInfoPtr pScreenInfo)
+verite_getmemorysize(ScrnInfoPtr pScreenInfo)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
 
@@ -137,23 +138,23 @@
 #ifdef XSERVER
     vu8 modereg;
 
-    modereg=v_in8(pRendition->board.io_base+MODEREG);
-    v_out8(pRendition->board.io_base+MODEREG, NATIVE_MODE);
+    modereg=verite_in8(pRendition->board.io_base+MODEREG);
+    verite_out8(pRendition->board.io_base+MODEREG, NATIVE_MODE);
 #endif
 
     /* no byte swapping */
-    memendian=v_in8(pRendition->board.io_base+MEMENDIAN);
-    v_out8(pRendition->board.io_base+MEMENDIAN, MEMENDIAN_NO);
+    memendian=verite_in8(pRendition->board.io_base+MEMENDIAN);
+    verite_out8(pRendition->board.io_base+MEMENDIAN, MEMENDIAN_NO);
 
     /* it looks like the v1000 wraps the memory; but for I'm not sure,
      * let's test also for non-writable offsets */
-    start=v_read_memory32(pRendition->board.vmem_base, 0);
-    v_write_memory32(pRendition->board.vmem_base, 0, START);
+    start=verite_read_memory32(pRendition->board.vmem_base, 0);
+    verite_write_memory32(pRendition->board.vmem_base, 0, START);
     for (offset=ONEMEG; offset<16*ONEMEG; offset+=ONEMEG) {
 #ifdef DEBUG
         ErrorF( "Testing %d MB: ", offset/ONEMEG);
 #endif
-        pattern=v_read_memory32(pRendition->board.vmem_base, offset);
+        pattern=verite_read_memory32(pRendition->board.vmem_base, offset);
         if (START == pattern) {
 #ifdef DEBUG
             ErrorF( "Back at the beginning\n");
@@ -162,20 +163,20 @@
         }
         
         pattern^=PATTERN;
-        v_write_memory32(pRendition->board.vmem_base, offset, pattern);
+        verite_write_memory32(pRendition->board.vmem_base, offset, pattern);
         
 #ifdef DEBUG
         ErrorF( "%x <-> %x\n", (int)pattern, 
-                    (int)v_read_memory32(pRendition->board.vmem_base, offset));
+                    (int)verite_read_memory32(pRendition->board.vmem_base, offset));
 #endif
 
-        if (pattern != v_read_memory32(pRendition->board.vmem_base, offset)) {
+        if (pattern != verite_read_memory32(pRendition->board.vmem_base, offset)) {
             offset-=ONEMEG;
             break;    
         }
-        v_write_memory32(pRendition->board.vmem_base, offset, pattern^PATTERN);
+        verite_write_memory32(pRendition->board.vmem_base, offset, pattern^PATTERN);
     }
-    v_write_memory32(pRendition->board.vmem_base, 0, start);
+    verite_write_memory32(pRendition->board.vmem_base, 0, start);
 
     if (16*ONEMEG <= offset)
         pRendition->board.mem_size=4*ONEMEG;
@@ -183,10 +184,10 @@
 	    pRendition->board.mem_size=offset;
 
     /* restore default byte swapping */
-    v_out8(pRendition->board.io_base+MEMENDIAN, MEMENDIAN_NO);
+    verite_out8(pRendition->board.io_base+MEMENDIAN, MEMENDIAN_NO);
 
 #ifdef XSERVER
-    v_out8(pRendition->board.io_base+MODEREG, modereg);
+    verite_out8(pRendition->board.io_base+MODEREG, modereg);
 #endif
 
     return pRendition->board.mem_size;
@@ -195,7 +196,7 @@
 }
 
 void
-v_check_csucode(ScrnInfoPtr pScreenInfo)
+verite_check_csucode(ScrnInfoPtr pScreenInfo)
 {
   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
   vu16 iob=pRendition->board.io_base;
@@ -205,32 +206,36 @@
   int memend;
   int mismatches=0;
 
-  memend=v_in8(iob+MEMENDIAN);
-  v_out8(iob+MEMENDIAN, MEMENDIAN_NO);
+  memend=verite_in8(iob+MEMENDIAN);
+  verite_out8(iob+MEMENDIAN, MEMENDIAN_NO);
 
+#ifdef DEBUG
   ErrorF("Checking presence of csucode @ 0x%x + 0x800\n",
 	 pRendition->board.vmem_base);
 
   if (0x800 != pRendition->board.csucode_base)
     ErrorF("pRendition->board.csucode_base == 0x%x\n",
 	   pRendition->board.csucode_base);
+#endif
 
   /* compare word by word */
   vmb=pRendition->board.vmem_base;
   offset=pRendition->board.csucode_base;
   for (c=0; c<sizeof(csrisc)/sizeof(vu32); c++, offset+=sizeof(vu32))
-    if (csrisc[c] != v_read_memory32(vmb, offset)) {
+    if (csrisc[c] != verite_read_memory32(vmb, offset)) {
       ErrorF("csucode mismatch in word %02d: 0x%08x should be 0x%08x\n",
 	     c,
-	     v_read_memory32(vmb, offset),
+	     verite_read_memory32(vmb, offset),
 	     csrisc[c]);
       mismatches++;
     }
+#ifdef DEBUG
   ErrorF("Encountered %d out of %d possible mismatches\n",
 	 mismatches,
 	 sizeof(csrisc)/sizeof(vu32));
+#endif
 
-  v_out8(iob+MEMENDIAN, memend);
+  verite_out8(iob+MEMENDIAN, memend);
 }
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h:1.5 xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h:1.5	Fri Feb 25 13:03:04 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h	Fri Mar 31 12:13:26 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h,v 1.5 2000/02/25 21:03:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h,v 1.6 2000/03/31 20:13:26 dawes Exp $ */
 
 /*
  * vboard.h
@@ -21,11 +21,11 @@
  * function prototypes
  */
 
-int v_initboard(ScrnInfoPtr pScreenInfo);
-int v_resetboard(ScrnInfoPtr pScreenInfo);
-int v_getmemorysize(ScrnInfoPtr pScreenInfo);
+int verite_initboard(ScrnInfoPtr pScreenInfo);
+int verite_resetboard(ScrnInfoPtr pScreenInfo);
+int verite_getmemorysize(ScrnInfoPtr pScreenInfo);
 
-void v_check_csucode(ScrnInfoPtr pScreenInfo);
+void verite_check_csucode(ScrnInfoPtr pScreenInfo);
 
 
 #endif /* __VBOARD_H__ */
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c:1.10 xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c:1.10	Fri Feb 25 13:03:04 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c	Thu Apr  6 20:57:51 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.10 2000/02/25 21:03:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.12 2000/04/07 03:57:51 tsi Exp $ */
 /*
  * includes
  */
@@ -45,7 +45,7 @@
  */
 
 /* 
- * int v_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
+ * int verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
  *
  * Loads verite elf file microcode file in |name| onto the board.
  * NOTE: Assumes the ucode loader is already running on the board!
@@ -53,7 +53,7 @@
  * Returns the program's entry point, on error -1;
  */
 int
-v_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
+verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
 {
   /* renditionPtr pRendition = RENDITIONPTR(pScreenInfo); */
 
@@ -64,7 +64,7 @@
   Elf32_Shdr *pshdr, *orig_pshdr=NULL;
   Elf32_Ehdr ehdr ;
 
-#if 1 /* DEBUG */
+#ifdef DEBUG
   ErrorF("RENDITION: Loading microcode %s\n", file_name); 
 #endif
 
@@ -188,7 +188,7 @@
   }
 
   if (read(fd, data, size) != size){
-	ErrorF("RENDITION: v_readfile Failure, couldn't read %x bytes ", size);
+	ErrorF("RENDITION: verite_readfile Failure, couldn't read %x bytes ", size);
 	return;
   }
 
@@ -223,8 +223,8 @@
   vu8 *vmb=pRendition->board.vmem_base;
 
   /* swap bytes 3<>0, 2<>1 */
-  memend=v_in8(pRendition->board.io_base+MEMENDIAN);
-  v_out8(pRendition->board.io_base+MEMENDIAN, MEMENDIAN_END);
+  memend=verite_in8(pRendition->board.io_base+MEMENDIAN);
+  verite_out8(pRendition->board.io_base+MEMENDIAN, MEMENDIAN_END);
 
   dataout=(vu32 *)data;
 
@@ -232,13 +232,13 @@
   v1k_stop(pScreenInfo);
 
   while (size > 0) {
-    v_write_memory32(vmb, phys_addr, *dataout);
+    verite_write_memory32(vmb, phys_addr, *dataout);
         phys_addr+=4;
         dataout++;
 	size-=4;
   }
 
-  v_out8(pRendition->board.io_base+MEMENDIAN, memend);
+  verite_out8(pRendition->board.io_base+MEMENDIAN, memend);
 }
 
 /*
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h:1.3 xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h:1.3	Tue Oct 12 21:21:23 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h	Fri Mar 31 12:13:27 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
 
 /*
  * file vloaduc.h
@@ -30,7 +30,7 @@
  * function prototypes
  */
 
-int v_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name);
+int verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name);
 
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c:1.3 xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c:1.3	Fri Feb 25 13:03:05 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c	Fri Mar 31 12:13:27 2000
@@ -1,5 +1,5 @@
 /* Misc routines used elsewhere in driver */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c,v 1.3 2000/02/25 21:03:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
 
 #include "rendition.h"
 #include "vtypes.h"
@@ -10,26 +10,26 @@
 
 /* block copy from and to the card */
 void
-v_bustomem_cpy(vu8 *dst, vu8 *src, vu32 num)
+verite_bustomem_cpy(vu8 *dst, vu8 *src, vu32 num)
 {
     int i;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: DEBUG v_bustomem_cpy called\n");
+    ErrorF ("Rendition: DEBUG verite_bustomem_cpy called\n");
 #endif  
     for (i=0; i<num; i++)
-        dst[i] = v_read_memory8(src, i);
+        dst[i] = verite_read_memory8(src, i);
 }
 
 void
-v_memtobus_cpy(vu8 *dst, vu8 *src, vu32 num)
+verite_memtobus_cpy(vu8 *dst, vu8 *src, vu32 num)
 {
     int i;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: DEBUG v_memtobus_cpy called\n");
+    ErrorF ("Rendition: DEBUG verite_memtobus_cpy called\n");
 #endif  
 
     for (i=0; i<num; i++)
-        v_write_memory8(dst, i, src[i]);
+        verite_write_memory8(dst, i, src[i]);
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h:1.2 xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h:1.2	Fri Nov 19 06:59:18 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h	Fri Mar 31 12:13:27 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h,v 1.2 1999/11/19 14:59:18 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h,v 1.3 2000/03/31 20:13:27 dawes Exp $ */
 
 #ifndef __VMISC_H__
 #define __VMISC_H__
@@ -7,7 +7,7 @@
 #include "vtypes.h"
 #include "vos.h"
 
-void v_bustomem_cpy (vu8 *, vu8 *, vu32);
-void v_memtobus_cpy (vu8 *, vu8 *, vu32);
+void verite_bustomem_cpy (vu8 *, vu8 *, vu32);
+void verite_memtobus_cpy (vu8 *, vu8 *, vu32);
 
 #endif /* __VMISC_H__ */
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c:1.7 xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c:1.7	Fri Feb 25 13:03:05 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c	Fri Mar 31 12:13:27 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c,v 1.7 2000/02/25 21:03:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c,v 1.8 2000/03/31 20:13:27 dawes Exp $ */
 /*
  * file vmodes.c
  *
@@ -205,7 +205,7 @@
  */
 
 int
-v_setmodefixed(ScrnInfoPtr pScreenInfo)
+verite_setmodefixed(ScrnInfoPtr pScreenInfo)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
 
@@ -213,40 +213,40 @@
     int tmp;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_setmodefixed called\n");
+    ErrorF ("Rendition: Debug verite_setmodefixed called\n");
 #endif
 
 #ifdef SAVEVGA
-    v_savetextmode(pRendition->board);
+    verite_savetextmode(pRendition->board);
 #endif
 
     v1k_softreset(pScreenInfo);
 
     /* switching to native mode */
-    v_out8(iob+MODEREG, NATIVE_MODE);
+    verite_out8(iob+MODEREG, NATIVE_MODE);
 
     /* flipping some bytes */
-    v_out8(iob+MEMENDIAN, MEMENDIAN_HW);
+    verite_out8(iob+MEMENDIAN, MEMENDIAN_HW);
 
     /* try programming 1024x768@70 in highcolor */
-    tmp=v_in32(iob+DRAMCTL)&0xdfff;              /* reset bit 13 */
-    v_out32(iob+DRAMCTL, tmp|DEFAULT_WREFRESH);
+    tmp=verite_in32(iob+DRAMCTL)&0xdfff;              /* reset bit 13 */
+    verite_out32(iob+DRAMCTL, tmp|DEFAULT_WREFRESH);
 
     /* program pixel clock */
     if (pRendition->board.chip == V1000_DEVICE) {
         set_PLL(iob, combineNMP(21, 55, 0));
     } 
     else {
-	tmp = (~0x1800) & v_in32(iob+DRAMCTL);
-        v_out32(iob+DRAMCTL, tmp);
-        v_out32(iob+PCLKPLL, v2kcombineNMP(2, 21, 2));
+	tmp = (~0x1800) & verite_in32(iob+DRAMCTL);
+        verite_out32(iob+DRAMCTL, tmp);
+        verite_out32(iob+PCLKPLL, v2kcombineNMP(2, 21, 2));
     }
     usleep(500);
   
-    v_initdac(pScreenInfo, 16, 0);
+    verite_initdac(pScreenInfo, 16, 0);
   
-    v_out32(iob+CRTCHORZ, HORZ(24, 136, 144, 1024));
-    v_out32(iob+CRTCVERT, VERT(3, 6, 29, 768));
+    verite_out32(iob+CRTCHORZ, HORZ(24, 136, 144, 1024));
+    verite_out32(iob+CRTCVERT, VERT(3, 6, 29, 768));
 
     pRendition->board.mode.screenwidth=1024;
     pRendition->board.mode.virtualwidth=1024;
@@ -257,7 +257,7 @@
     (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex,
         pScreenInfo->frameX0, pScreenInfo->frameY0, 0);
 
-    v_out32(iob+CRTCCTL, CTL(0, 0, 0)
+    verite_out32(iob+CRTCCTL, CTL(0, 0, 0)
                          |V_PIXFMT_565 
                          |CRTCCTL_VIDEOFIFOSIZE128
                          |CRTCCTL_HSYNCENABLE
@@ -270,7 +270,7 @@
 
 
 int
-v_setmode(ScrnInfoPtr pScreenInfo, struct v_modeinfo_t *mode)
+verite_setmode(ScrnInfoPtr pScreenInfo, struct verite_modeinfo_t *mode)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
 
@@ -280,43 +280,44 @@
     int iob=pRendition->board.io_base;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_setmode called\n");
+    ErrorF ("Rendition: Debug verite_setmode called\n");
 #endif
  
     /* switching to native mode */
-    v_out8(iob+MODEREG, NATIVE_MODE|VESA_MODE);
+    verite_out8(iob+MODEREG, NATIVE_MODE|VESA_MODE);
 
     /* flipping some bytes */
     /* Must be something better to do than this -- FIX */
     switch (mode->bitsperpixel) {
     case 32:
-      v_out8(iob+MEMENDIAN, MEMENDIAN_NO);
+      verite_out8(iob+MEMENDIAN, MEMENDIAN_NO);
       break;
     case 16:
-      v_out8(iob+MEMENDIAN, MEMENDIAN_HW);
+      verite_out8(iob+MEMENDIAN, MEMENDIAN_HW);
       break;
     case 8:
-      v_out8(iob+MEMENDIAN, MEMENDIAN_END);
+      verite_out8(iob+MEMENDIAN, MEMENDIAN_END);
       break;
     }
 
     if (pRendition->board.chip != V1000_DEVICE) {
       if(!pRendition->board.overclock_mem){
-	v_out32(iob+SCLKPLL, 0xa484d);  /* mclk=110 sclk=50 */
+	verite_out32(iob+SCLKPLL, 0xa484d);  /* mclk=110 sclk=50 */
                                         /* M/N/P/P = 77/5/2/4 */
       }
       else{
-	ErrorF ("RENDITION: *** OVERCLOCKING MEM/CLK mclk=125 sclk=60 ***\n");
+	xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+		   (" *** OVERCLOCKING MEM/CLK mclk=125 sclk=60 ***\n"));
 	/* increase Mem/Sys clock on request */
-	v_out32(iob+SCLKPLL, 0xa4854);  /* mclk=125 sclk=60 */
+	verite_out32(iob+SCLKPLL, 0xa4854);  /* mclk=125 sclk=60 */
                                         /* M/N/P/P = 84/5/2/4 */
       }
       usleep(500);
     }
 
     /* this has something to do with memory */
-    tmp=v_in32(iob+DRAMCTL)&0xdfff;              /* reset bit 13 */
-    v_out32(iob+DRAMCTL, tmp|0x330000);
+    tmp=verite_in32(iob+DRAMCTL)&0xdfff;              /* reset bit 13 */
+    verite_out32(iob+DRAMCTL, tmp|0x330000);
  
     /* program pixel clock */
     if (pRendition->board.chip == V1000_DEVICE) {
@@ -327,27 +328,27 @@
         set_PLL(iob, combineNMP(N, M, P));
     } 
     else {
-	tmp = (~0x1800) & v_in32(iob+DRAMCTL);
-        v_out32(iob+DRAMCTL, tmp);
+	tmp = (~0x1800) & verite_in32(iob+DRAMCTL);
+        verite_out32(iob+DRAMCTL, tmp);
         V2200CalcClock(mode->clock/1000.0, &M, &N, &P);
-        v_out32(iob+PCLKPLL, v2kcombineNMP(N, M, P));
+        verite_out32(iob+PCLKPLL, v2kcombineNMP(N, M, P));
     }
     usleep(500);
 
     /* init the ramdac */
-    v_initdac(pScreenInfo, mode->bitsperpixel, doubleclock);
+    verite_initdac(pScreenInfo, mode->bitsperpixel, doubleclock);
 
-    v_out32(iob+CRTCHORZ, HORZ(mode->hsyncstart-mode->hdisplay, 
+    verite_out32(iob+CRTCHORZ, HORZ(mode->hsyncstart-mode->hdisplay, 
                                mode->hsyncend-mode->hsyncstart,
                                mode->htotal-mode->hsyncend,
                                mode->hdisplay));
-    v_out32(iob+CRTCVERT, VERT(mode->vsyncstart-mode->vdisplay, 
+    verite_out32(iob+CRTCVERT, VERT(mode->vsyncstart-mode->vdisplay, 
                                mode->vsyncend-mode->vsyncstart,
                                mode->vtotal-mode->vsyncend,
                                mode->vdisplay));
 
     /* fill in the mode parameters */
-    memcpy(&(pRendition->board.mode), mode, sizeof(struct v_modeinfo_t));
+    memcpy(&(pRendition->board.mode), mode, sizeof(struct verite_modeinfo_t));
     pRendition->board.mode.fifosize=128;
     pRendition->board.mode.pll_m=M;
     pRendition->board.mode.pll_n=N;
@@ -363,7 +364,7 @@
     /* Need to fix up syncs */
 
     /* enable the display */
-    v_out32(iob+CRTCCTL, CTL(0, mode->hsynchi, mode->vsynchi)
+    verite_out32(iob+CRTCCTL, CTL(0, mode->hsynchi, mode->vsynchi)
                         |mode->pixelformat
                         |CRTCCTL_VIDEOFIFOSIZE128
                         |CRTCCTL_HSYNCENABLE
@@ -381,7 +382,7 @@
 
 
 void
-v_setframebase(ScrnInfoPtr pScreenInfo, vu32 framebase)
+verite_setframebase(ScrnInfoPtr pScreenInfo, vu32 framebase)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
 
@@ -394,7 +395,7 @@
     int fifo_size=pRendition->board.mode.fifosize;
 
 #ifdef DEBUG
-    ErrorF( "Rendition: Debug v_setframebase w=%d v=%d b=%d f=%d\n", 
+    ErrorF( "Rendition: Debug verite_setframebase w=%d v=%d b=%d f=%d\n", 
         swidth, vwidth, bytespp, fifo_size);
 #endif
 
@@ -411,9 +412,9 @@
     /* wait for vertical retrace */
 #ifndef DEBUG
     if (!pRendition->board.init) {
-        while ((v_in32(iob+CRTCSTATUS) & CRTCSTATUS_VERT_MASK) !=
+        while ((verite_in32(iob+CRTCSTATUS) & CRTCSTATUS_VERT_MASK) !=
                CRTCSTATUS_VERT_ACTIVE) ;
-        while ((v_in32(iob+CRTCSTATUS) & CRTCSTATUS_VERT_MASK) ==
+        while ((verite_in32(iob+CRTCSTATUS) & CRTCSTATUS_VERT_MASK) ==
                CRTCSTATUS_VERT_ACTIVE) ;
     }
     else
@@ -421,17 +422,17 @@
 #endif
 
     /* framebase */
-    v_out32(iob+FRAMEBASEA, framebase);
+    verite_out32(iob+FRAMEBASEA, framebase);
 
     /* crtc offset */
-    v_out32(iob+CRTCOFFSET, offset&0xffff);
+    verite_out32(iob+CRTCOFFSET, offset&0xffff);
 
 }
 
 
 
 int
-v_getstride(ScrnInfoPtr pScreenInfo, int *width, vu16 *stride0, vu16 *stride1)
+verite_getstride(ScrnInfoPtr pScreenInfo, int *width, vu16 *stride0, vu16 *stride1)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
     int bytesperline;
@@ -477,12 +478,12 @@
     /* shift out the 20 serial bits */
     for (b=19; b>=0; b--) {
         ulD=(value>>b)&1;
-        v_out8(iob+PLLDEV, (vu8)ulD);
+        verite_out8(iob+PLLDEV, (vu8)ulD);
     }
   
     /* read PLL device so the latch is filled with the previously 
      * written value */
-    (void)v_in8(iob+PLLDEV);
+    (void)verite_in8(iob+PLLDEV);
 }
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h:1.3 xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h:1.3	Tue Oct 12 21:21:24 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h	Fri Mar 31 12:13:27 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h,v 1.3 1999/10/13 04:21:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
 /*
  * file vmodes.h
  *
@@ -22,10 +22,10 @@
  * function prototypes
  */
 
-int v_setmodefixed(ScrnInfoPtr pScreenInfo);
-int v_setmode(ScrnInfoPtr pScreenInfo, struct v_modeinfo_t *mode);
-void v_setframebase(ScrnInfoPtr pScreenInfo, vu32 framebase);
-int v_getstride(ScrnInfoPtr pScreenInfo, int *width, vu16 *stride0, vu16 *stride1);
+int verite_setmodefixed(ScrnInfoPtr pScreenInfo);
+int verite_setmode(ScrnInfoPtr pScreenInfo, struct verite_modeinfo_t *mode);
+void verite_setframebase(ScrnInfoPtr pScreenInfo, vu32 framebase);
+int verite_getstride(ScrnInfoPtr pScreenInfo, int *width, vu16 *stride0, vu16 *stride1);
 
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h:1.7 xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h:1.8
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h:1.7	Fri Feb 25 13:03:06 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h	Fri Mar 31 12:13:28 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h,v 1.7 2000/02/25 21:03:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h,v 1.8 2000/03/31 20:13:28 dawes Exp $ */
 /*
  * file vos.h
  *
@@ -24,32 +24,32 @@
 /*
  * function prototypes
  */
-#define /*void*/ v_out8(/*vu16*/ port, /*vu8*/ data) \
+#define /*void*/ verite_out8(/*vu16*/ port, /*vu8*/ data) \
                    outb(port, data)
 
-#define /*void*/ v_out16(/*vu16*/ port, /*vu16*/ data) \
+#define /*void*/ verite_out16(/*vu16*/ port, /*vu16*/ data) \
                    outw(port, data)
 
-#define /*void*/ v_out32(/*vu16*/ port, /*vu32*/ data) \
+#define /*void*/ verite_out32(/*vu16*/ port, /*vu32*/ data) \
                    outl(port, data)
 
-#define /*vu8*/  v_in8(/*vu16*/ io_base)  ((vu8)inb(io_base))
-#define /*vu16*/ v_in16(/*vu16*/ io_base) ((vu16)inw(io_base))
-#define /*vu32*/ v_in32(/*vu16*/ io_base) ((vu32)inl(io_base))
+#define /*vu8*/  verite_in8(/*vu16*/ io_base)  ((vu8)inb(io_base))
+#define /*vu16*/ verite_in16(/*vu16*/ io_base) ((vu16)inw(io_base))
+#define /*vu32*/ verite_in32(/*vu16*/ io_base) ((vu32)inl(io_base))
 
 /* memory accesses */
-#define v_read_memory32(base, offset) MMIO_IN32(base, offset)
-#define v_read_memory16(base, offset) MMIO_IN16(base, offset)
-#define v_read_memory8(base, offset)  MMIO_IN8(base, offset)
-#define v_write_memory32(base, offset, data) MMIO_OUT32(base, offset, data)
-#define v_write_memory16(base, offset, data) MMIO_OUT16(base, offset, data)
-#define v_write_memory8(base, offset, data)  MMIO_OUT8(base, offset, data)
+#define verite_read_memory32(base, offset) MMIO_IN32(base, offset)
+#define verite_read_memory16(base, offset) MMIO_IN16(base, offset)
+#define verite_read_memory8(base, offset)  MMIO_IN8(base, offset)
+#define verite_write_memory32(base, offset, data) MMIO_OUT32(base, offset, data)
+#define verite_write_memory16(base, offset, data) MMIO_OUT16(base, offset, data)
+#define verite_write_memory8(base, offset, data)  MMIO_OUT8(base, offset, data)
 
 /* the rest of it */
-void v_enableio(void);
-void v_disableio(void);
-vu8 *v_mapmemory(vu8 *membase, vu32 size);
-void v_unmapmemory(vu8 *vmembase, vu32 size);
+void verite_enableio(void);
+void verite_disableio(void);
+vu8 *verite_mapmemory(vu8 *membase, vu32 size);
+void verite_unmapmemory(vu8 *vmembase, vu32 size);
 
 #endif /* #ifndef _VOS_H_ */
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c:1.9 xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c:1.11
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c:1.9	Fri Feb 25 13:03:06 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c	Mon Jun 12 19:28:33 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c,v 1.9 2000/02/25 21:03:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c,v 1.11 2000/06/13 02:28:33 dawes Exp $ */
 /*
  * includes
  */
@@ -110,22 +110,23 @@
  */
 
 /*
- * int v_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
+ * int verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
  *
  * Used to initialize the ramdac. Palette-bypass is dis-/enabled with respect
  * to the color depth, the cursor is disabled by default. If needed (i.e. if
- * the corresponding field in the v_board_t struct is set), the clock doubling
+ * the corresponding field in the verite_board_t struct is set), the clock doubling
  * is turned on.
  */
 int
-v_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
+verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
     vu16 iob=pRendition->board.io_base+RAMDACBASEADDR;
+    vu8 cmd0,cmd1,cmd2;
     vu8 cmd3_data=0;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_initdac called\n");
+    ErrorF ("Rendition: Debug verite_initdac called\n");
 #endif
 
     if (doubleclock)
@@ -139,46 +140,60 @@
 			return -1;
 
         case 8:
-            v_out8(iob+BT485_COMMAND_REG_0, BT485_CR0_EXTENDED_REG_ACCESS |
-             	                            BT485_CR0_8_BIT_DAC);
-            v_out8(iob+BT485_COMMAND_REG_1, BT485_CR1_8BPP |
-                                            BT485_CR1_PIXEL_PORT_AB);
-            v_out8(iob+BT485_COMMAND_REG_2, BT485_PIXEL_INPUT_GATE |
-                                            BT485_DISABLE_CURSOR);
-            break;
+	    cmd0 = BT485_CR0_EXTENDED_REG_ACCESS |
+	           BT485_CR0_8_BIT_DAC;
+
+	    cmd1 = BT485_CR1_8BPP |
+	           BT485_CR1_PIXEL_PORT_AB;
 
-        case 15:
-            v_out8(iob+BT485_COMMAND_REG_0, BT485_CR0_EXTENDED_REG_ACCESS |
-                                            BT485_CR0_8_BIT_DAC);
-            v_out8(iob+BT485_COMMAND_REG_1, BT485_CR1_16BPP |
-                                            BT485_CR1_BYPASS_CLUT |
-                                            BT485_CR1_555_16BPP |
-                                            BT485_CR1_2_TO_1_16BPP |
-                                            BT485_CR1_PIXEL_PORT_AB);
-            v_out8(iob+BT485_COMMAND_REG_2, BT485_PIXEL_INPUT_GATE |
-                                            BT485_DISABLE_CURSOR);
+	    cmd2 = BT485_PIXEL_INPUT_GATE |
+	           BT485_DISABLE_CURSOR;
+
+            verite_out8(iob+BT485_COMMAND_REG_0, cmd0);
+            verite_out8(iob+BT485_COMMAND_REG_1, cmd1);
+            verite_out8(iob+BT485_COMMAND_REG_2, cmd2);
             break;
 
         case 16:
-            v_out8(iob+BT485_COMMAND_REG_0, BT485_CR0_EXTENDED_REG_ACCESS |
-                                            BT485_CR0_8_BIT_DAC);
-            v_out8(iob+BT485_COMMAND_REG_1, BT485_CR1_16BPP |
-                                            BT485_CR1_BYPASS_CLUT |
-                                            BT485_CR1_565_16BPP |
-                                            BT485_CR1_2_TO_1_16BPP |
-                                            BT485_CR1_PIXEL_PORT_AB);
-            v_out8(iob+BT485_COMMAND_REG_2, BT485_PIXEL_INPUT_GATE |
-                                            BT485_DISABLE_CURSOR);
+	    cmd0 = BT485_CR0_EXTENDED_REG_ACCESS |
+	           BT485_CR0_8_BIT_DAC;
+
+	    cmd1 = BT485_CR1_16BPP |
+	           BT485_CR1_2_TO_1_16BPP |
+	           BT485_CR1_PIXEL_PORT_AB;
+
+	    cmd2 = BT485_PIXEL_INPUT_GATE |
+	           BT485_DISABLE_CURSOR;
+
+	    if (pScreenInfo->defaultVisual == TrueColor)
+	      cmd1 |= BT485_CR1_BYPASS_CLUT;
+
+            if (pScreenInfo->weight.green == 5)
+	      cmd1 |= BT485_CR1_555_16BPP;
+	    else
+	      cmd1 |= BT485_CR1_565_16BPP;
+
+            verite_out8(iob+BT485_COMMAND_REG_0,cmd0);
+            verite_out8(iob+BT485_COMMAND_REG_1,cmd1);
+            verite_out8(iob+BT485_COMMAND_REG_2,cmd2);
             break;
 
         case 32:
-            v_out8(iob+BT485_COMMAND_REG_0, BT485_CR0_EXTENDED_REG_ACCESS |
-                                            BT485_CR0_8_BIT_DAC);
-            v_out8(iob+BT485_COMMAND_REG_1, BT485_CR1_24BPP |
-                                            BT485_CR1_BYPASS_CLUT |
-                                            BT485_CR1_PIXEL_PORT_AB);
-            v_out8(iob+BT485_COMMAND_REG_2, BT485_PIXEL_INPUT_GATE |
-                                            BT485_DISABLE_CURSOR);
+	    cmd0 = BT485_CR0_EXTENDED_REG_ACCESS |
+	           BT485_CR0_8_BIT_DAC;
+
+	    cmd1 = BT485_CR1_24BPP |
+	           BT485_CR1_PIXEL_PORT_AB;
+
+	    cmd2 = BT485_PIXEL_INPUT_GATE |
+	           BT485_DISABLE_CURSOR;
+
+	    if (pScreenInfo->defaultVisual == TrueColor)
+	      cmd1 |= BT485_CR1_BYPASS_CLUT;
+
+            verite_out8(iob+BT485_COMMAND_REG_0,cmd0);
+            verite_out8(iob+BT485_COMMAND_REG_1,cmd1);
+            verite_out8(iob+BT485_COMMAND_REG_2,cmd2);
             break;
 
         default:
@@ -188,12 +203,12 @@
             break;
     }
 
-    v_out8(iob+BT485_WRITE_ADDR, BT485_COMMAND_REG_3);
-    v_out8(iob+BT485_STATUS_REG, cmd3_data);
+    verite_out8(iob+BT485_WRITE_ADDR, BT485_COMMAND_REG_3);
+    verite_out8(iob+BT485_STATUS_REG, cmd3_data);
 /*
     Bt485_write_masked(iob, BT485_COMMAND_REG_0, 0x7f, 0x00);
 */
-    v_out8(iob+BT485_PIXEL_MASK, 0xff);
+    verite_out8(iob+BT485_PIXEL_MASK, 0xff);
 
     return 0;
 }
@@ -201,7 +216,7 @@
 
 
 /*
- * void v_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size)
+ * void verite_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size)
  *
  * Used to enable the hardware cursor. Size indicates, whether to use no cursor
  * at all, a 32x32 or a 64x64 cursor. The type selects a two-color, three-color
@@ -209,7 +224,7 @@
  *
  */
 void
-v_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size)
+verite_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
 
@@ -220,7 +235,7 @@
     vu16 iob=pRendition->board.io_base+RAMDACBASEADDR;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_enablecursor called type=0x%x\n",type);
+    ErrorF ("Rendition: Debug verite_enablecursor called type=0x%x\n",type);
 #endif
 
 #if 0
@@ -239,7 +254,7 @@
       Cursor_size=(size ? 64 : 32);
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_enablecursor Exit\n");
+    ErrorF ("Rendition: Debug verite_enablecursor Exit\n");
 #endif
 
 }
@@ -248,14 +263,14 @@
 
 
 /*
- * void v_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo)
+ * void verite_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo)
  *
  * Moves the cursor to the specified location. To hide the cursor, call
  * this routine with x=0x0 and y=0x0.
  *
  */
 void
-v_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo)
+verite_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
     vu16 iob=pRendition->board.io_base+RAMDACBASEADDR;
@@ -263,52 +278,52 @@
     x+=Cursor_size-xo;
     y+=Cursor_size-yo;
 
-    v_out8(iob+BT485_CURS_X_LOW, x&0xff);
-    v_out8(iob+BT485_CURS_X_HIGH, (x>>8)&0x0f);
-    v_out8(iob+BT485_CURS_Y_LOW, y&0xff);
-    v_out8(iob+BT485_CURS_Y_HIGH, (y>>8)&0x0f);
+    verite_out8(iob+BT485_CURS_X_LOW, x&0xff);
+    verite_out8(iob+BT485_CURS_X_HIGH, (x>>8)&0x0f);
+    verite_out8(iob+BT485_CURS_Y_LOW, y&0xff);
+    verite_out8(iob+BT485_CURS_Y_HIGH, (y>>8)&0x0f);
 }
 
 
 
 /*
- * void v_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 bg, vu32 fg)
+ * void verite_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 bg, vu32 fg)
  *
  * Sets the color of the cursor -- should be revised for use with 3 colors!
  *
  */
 void
-v_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 fg, vu32 bg)
+verite_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 fg, vu32 bg)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
     vu16 iob=pRendition->board.io_base+RAMDACBASEADDR;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_setcursorcolor called FG=0x%x BG=0x%x\n",
+    ErrorF ("Rendition: Debug verite_setcursorcolor called FG=0x%x BG=0x%x\n",
 	    fg,bg);
 #endif
 
-    v_out8(iob+BT485_CURS_WR_ADDR, 0x00);
+    verite_out8(iob+BT485_CURS_WR_ADDR, 0x00);
 
     /* load the cursor color 0 */
-    v_out8(iob+BT485_CURS_DATA, 0x00);
-    v_out8(iob+BT485_CURS_DATA, 0x00);
-    v_out8(iob+BT485_CURS_DATA, 0x00);
+    verite_out8(iob+BT485_CURS_DATA, 0x00);
+    verite_out8(iob+BT485_CURS_DATA, 0x00);
+    verite_out8(iob+BT485_CURS_DATA, 0x00);
 
     /* load the cursor color 1 */
-    v_out8(iob+BT485_CURS_DATA, (fg>>16)&0xff);
-    v_out8(iob+BT485_CURS_DATA, (fg>>8)&0xff);
-    v_out8(iob+BT485_CURS_DATA, fg&0xff);
+    verite_out8(iob+BT485_CURS_DATA, (fg>>16)&0xff);
+    verite_out8(iob+BT485_CURS_DATA, (fg>>8)&0xff);
+    verite_out8(iob+BT485_CURS_DATA, fg&0xff);
 
     /* load the cursor color 2 */
-    v_out8(iob+BT485_CURS_DATA, 0x00);
-    v_out8(iob+BT485_CURS_DATA, 0x00);
-    v_out8(iob+BT485_CURS_DATA, 0x00);
+    verite_out8(iob+BT485_CURS_DATA, 0x00);
+    verite_out8(iob+BT485_CURS_DATA, 0x00);
+    verite_out8(iob+BT485_CURS_DATA, 0x00);
 
     /* load the cursor color 3 */
-    v_out8(iob+BT485_CURS_DATA, (bg>>16)&0xff);
-    v_out8(iob+BT485_CURS_DATA, (bg>>8)&0xff);
-    v_out8(iob+BT485_CURS_DATA, bg&0xff);
+    verite_out8(iob+BT485_CURS_DATA, (bg>>16)&0xff);
+    verite_out8(iob+BT485_CURS_DATA, (bg>>8)&0xff);
+    verite_out8(iob+BT485_CURS_DATA, bg&0xff);
 }
 
 
@@ -319,7 +334,7 @@
  *
  */
 void
-v_loadcursor(ScrnInfoPtr pScreenInfo, vu8 size, vu8 *cursorimage)
+verite_loadcursor(ScrnInfoPtr pScreenInfo, vu8 size, vu8 *cursorimage)
 {
     int c, bytes, row;
     vu8 *src = cursorimage;
@@ -329,15 +344,15 @@
     vu8 memend; /* Added for byte-swap fix */
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_loadcursor called\n");
+    ErrorF ("Rendition: Debug verite_loadcursor called\n");
 #endif
 
     if (NULL == cursorimage) 
         return;
 
     /* Following two lines added for the byte-swap fix */
-    memend = v_in8(pRendition->board.io_base + MEMENDIAN);
-    v_out8(pRendition->board.io_base + MEMENDIAN, MEMENDIAN_HW);
+    memend = verite_in8(pRendition->board.io_base + MEMENDIAN);
+    verite_out8(pRendition->board.io_base + MEMENDIAN, MEMENDIAN_HW);
 
     size&=1;
     if (size)
@@ -349,50 +364,50 @@
     if (pRendition->board.chip == V1000_DEVICE) {
       /* now load the cursor data into the cursor ram */
 
-      tmp=v_in8(iob+BT485_COMMAND_REG_0)&0x7f;
-      v_out8(iob+BT485_COMMAND_REG_0, tmp|0x80);
+      tmp=verite_in8(iob+BT485_COMMAND_REG_0)&0x7f;
+      verite_out8(iob+BT485_COMMAND_REG_0, tmp|0x80);
 
-      v_out8(iob+BT485_WRITE_ADDR, BT485_COMMAND_REG_3);
+      verite_out8(iob+BT485_WRITE_ADDR, BT485_COMMAND_REG_3);
 
-      tmp=v_in8(iob+BT485_STATUS_REG)&0xf8;
-      v_out8(iob+BT485_STATUS_REG, tmp|(size<<2));
-      v_out8(iob+BT485_WRITE_ADDR, 0x00);
+      tmp=verite_in8(iob+BT485_STATUS_REG)&0xf8;
+      verite_out8(iob+BT485_STATUS_REG, tmp|(size<<2));
+      verite_out8(iob+BT485_WRITE_ADDR, 0x00);
 
       /* output cursor image */
       src=cursorimage;
       
       /* First plane data */
       for (c=0; c<bytes; c++)  {
-        v_out8(iob+BT485_CURS_RAM_DATA, *src);
+        verite_out8(iob+BT485_CURS_RAM_DATA, *src);
         src+=2;
       }
 
       /* Second plane data */
       src=cursorimage+1;
       for (c=0; c<bytes; c++)  {
-        v_out8(iob+BT485_CURS_RAM_DATA, *src);
+        verite_out8(iob+BT485_CURS_RAM_DATA, *src);
         src+=2;
       }
     }
     else {
       /* V2x00 HW-Cursor, supports only 64x64x2 size */
 
-      v_out32(iob+CURSORBASE, pRendition->board.hwcursor_membase);
+      verite_out32(iob+CURSORBASE, pRendition->board.hwcursor_membase);
 
       /* First plane data */
       for (row=0; row<64; row++)
 	for (c=0, src=cursorimage+1+16*row; c<8; c++, src+=2)
-	  v_write_memory8(pRendition->board.vmem_base, 16*(63-row)+c,
+	  verite_write_memory8(pRendition->board.vmem_base, 16*(63-row)+c,
      			  (c&1)?(*(src-2)):(*(src+2)));
       /* Second plane data */
       for (row=0; row<64; row++)
 	for (c=0, src=cursorimage+16*row; c<8; c++, src+=2)
-	  v_write_memory8(pRendition->board.vmem_base, 8+16*(63-row)+c,
+	  verite_write_memory8(pRendition->board.vmem_base, 8+16*(63-row)+c,
 			  (c&1)?(*(src-2)):(*(src+2)));
 
     }
     /* Following line added for the byte-swap fix */
-    v_out8(pRendition->board.io_base + MEMENDIAN, memend);
+    verite_out8(pRendition->board.io_base + MEMENDIAN, memend);
 }
 
 
@@ -400,7 +415,7 @@
 /* NOTE: count is the actual number of colors decremented by 1 */
 
 void
-v_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
+verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
 		LOCO *colors, VisualPtr pVisual)
 {
     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
@@ -410,11 +425,11 @@
     int c;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_setpalette called\n");
+    ErrorF ("Rendition: Debug verite_setpalette called\n");
 #endif
 
     while (1) {
-        crtc_status=v_in32(iob+CRTCSTATUS);
+        crtc_status=verite_in32(iob+CRTCSTATUS);
         if (crtc_status & CRTCSTATUS_VERT_SYNC) 
             break;
     };
@@ -423,11 +438,11 @@
 
     for (i = 0; i < numColors; i++) {
         index = indices[i];
-	v_out8(iob+BT485_WRITE_ADDR, index);
+	verite_out8(iob+BT485_WRITE_ADDR, index);
 
-        v_out8(iob+BT485_RAMDAC_DATA, colors[index].red);
-        v_out8(iob+BT485_RAMDAC_DATA, colors[index].green);
-        v_out8(iob+BT485_RAMDAC_DATA, colors[index].blue);
+        verite_out8(iob+BT485_RAMDAC_DATA, colors[index].red);
+        verite_out8(iob+BT485_RAMDAC_DATA, colors[index].green);
+        verite_out8(iob+BT485_RAMDAC_DATA, colors[index].blue);
     }
 
 
@@ -451,8 +466,8 @@
 {
     vu8 tmp;
 
-    tmp=v_in8(port+reg)&mask;
-    v_out8(port+reg, tmp|data);
+    tmp=verite_in8(port+reg)&mask;
+    verite_out8(port+reg, tmp|data);
 }
 
 
@@ -468,7 +483,7 @@
 /*
     Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x80);
 */
-    v_out8(port+BT485_WRITE_ADDR, BT485_COMMAND_REG_3);
+    verite_out8(port+BT485_WRITE_ADDR, BT485_COMMAND_REG_3);
     Bt485_write_masked(port, BT485_STATUS_REG, mask, data);
 /*
     Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x00);
@@ -485,7 +500,7 @@
 static vu8
 Bt485_read_masked(vu16 port, vu8 reg, vu8 mask)
 {
-    return v_in8(port+reg)&mask;
+    return verite_in8(port+reg)&mask;
 }
 
 
@@ -501,7 +516,7 @@
     vu8 value;
 
     Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x80);
-    v_out8(port+BT485_WRITE_ADDR, BT485_COMMAND_REG_3);
+    verite_out8(port+BT485_WRITE_ADDR, BT485_COMMAND_REG_3);
     value=Bt485_read_masked(port, BT485_STATUS_REG, mask);
     Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x00);
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h:1.4 xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h:1.4	Fri Feb 25 13:03:07 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h	Fri Mar 31 12:13:28 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h,v 1.4 2000/02/25 21:03:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h,v 1.5 2000/03/31 20:13:28 dawes Exp $ */
 /*
  * file vramdac.h
  *
@@ -22,13 +22,13 @@
  * defines
  */
 
-#define V_NOCURSOR  0
-#define V_2COLORS   1
-#define V_3COLORS   2
-#define V_XCURSOR   3
+#define VERITE_NOCURSOR  0
+#define VERITE_2COLORS   1
+#define VERITE_3COLORS   2
+#define VERITE_XCURSOR   3
 
-#define V_CURSOR32  0
-#define V_CURSOR64  1
+#define VERITE_CURSOR32  0
+#define VERITE_CURSOR64  1
 
 
 
@@ -36,12 +36,12 @@
  * function prototypes
  */
 
-int v_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock);
-void v_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size);
-void v_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo);
-void v_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 bg, vu32 fg);
-void v_loadcursor(ScrnInfoPtr pScreenInfo, vu8 type, vu8 *cursorimage);
-void v_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
+int verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock);
+void verite_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size);
+void verite_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo);
+void verite_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 bg, vu32 fg);
+void verite_loadcursor(ScrnInfoPtr pScreenInfo, vu8 type, vu8 *cursorimage);
+void verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
 		  LOCO *colors, VisualPtr pVisual);
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h:1.5 xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h:1.5	Tue Feb 29 16:25:25 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h	Fri Mar 31 12:13:28 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h,v 1.5 2000/03/01 00:25:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h,v 1.6 2000/03/31 20:13:28 dawes Exp $ */
 #ifndef _VTYPES_H_
 #define _VTYPES_H_
 
@@ -66,7 +66,7 @@
  * structs
  */
 
-struct v_modeinfo_t {
+struct verite_modeinfo_t {
     int clock;              /* pixel clock */
     int hdisplay;           /* horizontal timing */
     int hsyncstart;
@@ -99,7 +99,7 @@
 
 
 /* structure describing the Verite board and its functionality */
-struct v_board_t {
+struct verite_board_t {
     /* type of chip */
     vu16  chip;
 
@@ -125,7 +125,7 @@
     int Color;
 
     /* mode information */
-    struct v_modeinfo_t mode;
+    struct verite_modeinfo_t mode;
     
     /* saved text mode settings */
     vu8 cursor_hi;
@@ -158,8 +158,8 @@
  */
 typedef struct _renditionRec
 {
-    struct v_board_t board;             /* information on the board */
-    struct v_modeinfo_t mode;           /* information on the mode */
+    struct verite_board_t board;             /* information on the board */
+    struct verite_modeinfo_t mode;           /* information on the mode */
     int pcitag;                         /* tag for the PCI config space */
     pciVideoPtr PciInfo;                /* PCI config data */
     EntityInfoPtr pEnt;                 /* entity information */
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.c:1.8 xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.c:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.c:1.8	Fri Feb 25 13:03:07 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.c	Fri Mar 31 12:13:29 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.c,v 1.8 2000/02/25 21:03:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.c,v 1.9 2000/03/31 20:13:29 dawes Exp $ */
 /*
  * file vvga.c
  *
@@ -46,7 +46,7 @@
  */
 
 void
-v_resetvga(void)
+verite_resetvga(void)
 {
     static struct VIDEO_REGS {
         vu8 seq[8];     /* sequencer regs */
@@ -74,7 +74,7 @@
     int c;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_resetvga called\n");
+    ErrorF ("Rendition: Debug verite_resetvga called\n");
 #endif
 
     /* set attribute controller */
@@ -98,7 +98,7 @@
 
 
 void
-v_loadvgafont(void)
+verite_loadvgafont(void)
 {
     int c;
     vu8 b;
@@ -108,12 +108,12 @@
     int fbFlags;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_loadvgafont called\n");
+    ErrorF ("Rendition: Debug verite_loadvgafont called\n");
 #endif
 
     /* Assert synchroneous reset while setting the clock mode */
     setvgareg(0x3c4, 0, 1);               /* assert synchronous reset */
-    v_out8(0x3c2, 0x67);                  /* select clock */
+    verite_out8(0x3c2, 0x67);                  /* select clock */
     setvgareg(0x3c4, 0, 3);               /* de-assert synchronous reset */
 
     /* load 8x16 font into plane 2 */
@@ -140,81 +140,81 @@
     vbase = xf86MapVidMem(0, fbFlags, 0xa0000, 64*1024);
     vidmem=vbase;
     for (c=0; c<=255; c++) {
-        v_memtobus_cpy(vbase+(32*c), address, 16);
+        verite_memtobus_cpy(vbase+(32*c), address, 16);
 	    address+=16;
     }
 
     xf86UnMapVidMem(0, vbase, 64*1024);
 
     /* restore the standard vga register values */
-    v_resetvga();
+    verite_resetvga();
 }
 
 
 
 void
-v_textmode(struct v_board_t *board) 
+verite_textmode(struct verite_board_t *board) 
 {
     vu16 iob=board->io_base;
     int tmp;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_textmode called\n");
+    ErrorF ("Rendition: Debug verite_textmode called\n");
 #endif
 
     /* dac */
-    v_out8(iob+DACCOMMAND0, 0x80);     /* 6 bit op, enable extended */
-    v_out8(iob+DACCOMMAND1, 0x68);     /* disable palette bypass */
-    v_out8(iob+DACCOMMAND2, 0x00);     /* disable cursor & pixel packing */
+    verite_out8(iob+DACCOMMAND0, 0x80);     /* 6 bit op, enable extended */
+    verite_out8(iob+DACCOMMAND1, 0x68);     /* disable palette bypass */
+    verite_out8(iob+DACCOMMAND2, 0x00);     /* disable cursor & pixel packing */
     if (V1000_DEVICE == board->chip) {
-        v_out8(iob+DACRAMWRITEADR, 0x01);  /* select COMMAND3 register */
-        v_out8(iob+DACCOMMAND3, 0x00);     /* no clock doubling */
+        verite_out8(iob+DACRAMWRITEADR, 0x01);  /* select COMMAND3 register */
+        verite_out8(iob+DACCOMMAND3, 0x00);     /* no clock doubling */
     }
-    v_out8(iob+DACCOMMAND0, 0x00);     /* 6 bit op */
+    verite_out8(iob+DACCOMMAND0, 0x00);     /* 6 bit op */
 
     if (V1000_DEVICE == board->chip) {
-        v_out32(iob+DRAMCTL, 0x140000);
+        verite_out32(iob+DRAMCTL, 0x140000);
         set_PLL(iob, 0x40000);
         usleep(500);
      }
     else {
         /* memctl */
-	tmp = 0x1800|v_in32(iob+DRAMCTL);
-        v_out32(iob+DRAMCTL, tmp);    /* linear mode */
+	tmp = 0x1800|verite_in32(iob+DRAMCTL);
+        verite_out32(iob+DRAMCTL, tmp);    /* linear mode */
 
         /* pixel clock */
-        v_out32(iob+PCLKPLL, 0x300000);
+        verite_out32(iob+PCLKPLL, 0x300000);
         /* system and memory clock */
-        v_out32(iob+SCLKPLL, 0x2480C);     /* mclk=86 sclk=43 */
+        verite_out32(iob+SCLKPLL, 0x2480C);     /* mclk=86 sclk=43 */
 
         /* Need to wait 200uS for PLL to stabilize --
          * let's play it safe with 500 */
         usleep(500);
 
         /* wait until VBLANK */
-        while ((v_in32(iob+CRTCSTATUS)&CRTCSTATUS_VERT_MASK) !=
+        while ((verite_in32(iob+CRTCSTATUS)&CRTCSTATUS_VERT_MASK) !=
                CRTCSTATUS_VERT_ACTIVE);
-        while ((v_in32(iob+CRTCSTATUS)&CRTCSTATUS_VERT_MASK) ==
+        while ((verite_in32(iob+CRTCSTATUS)&CRTCSTATUS_VERT_MASK) ==
                CRTCSTATUS_VERT_ACTIVE);
     }
 
     /* vga mode */
-    v_out8(iob+MODEREG, VGA_MODE);
+    verite_out8(iob+MODEREG, VGA_MODE);
 
     /* crtc */
-    v_out32(iob+CRTCCTL, 0x44cc2);
-    v_out32(iob+CRTCHORZ, 0x2b0a4f);
-    v_out32(iob+CRTCVERT, 0x9301df);
-    v_out32(iob+CRTCOFFSET, 0x40);
+    verite_out32(iob+CRTCCTL, 0x44cc2);
+    verite_out32(iob+CRTCHORZ, 0x2b0a4f);
+    verite_out32(iob+CRTCVERT, 0x9301df);
+    verite_out32(iob+CRTCOFFSET, 0x40);
 
 #ifdef SAVEVGA
-    v_loadvgafont();
-    v_restoretextmode(board);
-    v_restorepalette();
+    verite_loadvgafont();
+    verite_restoretextmode(board);
+    verite_restorepalette();
 #else
 #ifdef XSERVER
-    v_loadvgafont();
-    v_restorepalette();
+    verite_loadvgafont();
+    verite_restorepalette();
 #endif
 #endif
 
@@ -223,13 +223,13 @@
 
 
 void
-v_savetextmode(struct v_board_t *board) 
+verite_savetextmode(struct verite_board_t *board) 
 {
     vu8 *vbase;
     int fbFlags;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_savetextmode called\n");
+    ErrorF ("Rendition: Debug verite_savetextmode called\n");
 #endif
 
     /* save the cursor position */
@@ -245,20 +245,20 @@
     fbFlags = VIDMEM_MMIO; /* VIDMEM_SPARSE is implied on Alpha */
 
     vbase = xf86MapVidMem(0, fbFlags, 0xb8000, 0x8000);
-    v_bustomem_cpy(board->scr_contents, vbase, 0x8000);
+    verite_bustomem_cpy(board->scr_contents, vbase, 0x8000);
     xf86UnMapVidMem(0, vbase, 0x8000);
 }
 
 
 
 void
-v_restoretextmode(struct v_board_t *board) 
+verite_restoretextmode(struct verite_board_t *board) 
 {
     vu8 *vbase;
     int fbFlags;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_restoretextmode called\n");
+    ErrorF ("Rendition: Debug verite_restoretextmode called\n");
 #endif
 
     /* restore the cursor position */
@@ -273,7 +273,7 @@
     fbFlags = VIDMEM_MMIO; /* VIDMEM_SPARSE is implied on Alpha */
 
     vbase = xf86MapVidMem(0, fbFlags, 0xb8000, 0x8000);
-    v_memtobus_cpy(vbase, board->scr_contents, 0x8000);
+    verite_memtobus_cpy(vbase, board->scr_contents, 0x8000);
     xf86UnMapVidMem(0, vbase, 0x8000);
     xfree(board->scr_contents);
 }
@@ -281,18 +281,18 @@
 
 
 void
-v_restorepalette(void)
+verite_restorepalette(void)
 {
     int c;
     vu8 *pal=vga_pal;
 
 #ifdef DEBUG
-    ErrorF ("Rendition: Debug v_restorepalette called\n");
+    ErrorF ("Rendition: Debug verite_restorepalette called\n");
 #endif
 
-    v_out8(0x3c8, 0);
+    verite_out8(0x3c8, 0);
     for (c=0; c<768; c++)
-        v_out8(0x3c9, *pal++);
+        verite_out8(0x3c9, *pal++);
 }
 
 
@@ -309,8 +309,8 @@
 static vu8
 getvgareg(vu16 port, vu8 index)
 {
-    v_out8(port, index);
-    return v_in8(port+1);
+    verite_out8(port, index);
+    return verite_in8(port+1);
 }
 
 
@@ -323,8 +323,8 @@
 static void
 setvgareg(vu16 port, vu8 index, vu8 value)
 {
-    v_out8(port, index);
-    v_out8(port+1, value);
+    verite_out8(port, index);
+    verite_out8(port+1, value);
 }
 
 
@@ -337,11 +337,11 @@
 static void
 updattr(vu8 index, vu8 value)
 {
-    v_in8(0x3da);           /* points to index register for color adapter */
-    v_in8(0x3ba);           /* points to index register for mono */
-    v_out8(0x3c0, index);
-    v_out8(0x3c0, value);
-    v_out8(0x3c0, index|0x20);
+    verite_in8(0x3da);           /* points to index register for color adapter */
+    verite_in8(0x3ba);           /* points to index register for mono */
+    verite_out8(0x3c0, index);
+    verite_out8(0x3c0, value);
+    verite_out8(0x3c0, index|0x20);
 }
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.h:1.3 xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.h:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.h:1.3	Tue Oct 12 21:21:25 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.h	Fri Mar 31 12:13:29 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.h,v 1.3 1999/10/13 04:21:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vvga.h,v 1.4 2000/03/31 20:13:29 dawes Exp $ */
 /*
  * file vvga.h
  *
@@ -22,12 +22,12 @@
  * function prototypes
  */
 
-void v_resetvga(void);
-void v_loadvgafont(void);
-void v_textmode(struct v_board_t *board);
-void v_savetextmode(struct v_board_t *board);
-void v_restoretextmode(struct v_board_t *board);
-void v_restorepalette(void);
+void verite_resetvga(void);
+void verite_loadvgafont(void);
+void verite_textmode(struct verite_board_t *board);
+void verite_savetextmode(struct verite_board_t *board);
+void verite_restoretextmode(struct verite_board_t *board);
+void verite_restorepalette(void);
 
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile:1.16 xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile:1.17
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile:1.16	Tue Feb  8 05:13:20 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile	Fri Mar 31 14:55:46 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile,v 1.16 2000/02/08 13:13:20 eich Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile,v 1.17 2000/03/31 22:55:46 dawes Exp $
 /*
  *
  * Copyright 1995-1998 The XFree86 Project, Inc.
@@ -61,5 +61,6 @@
 InstallDriverSDKNonExecFile(s3v_i2c.c,$(DRIVERSDKDIR)/drivers/s3virge)
 InstallDriverSDKNonExecFile(s3v_macros.h,$(DRIVERSDKDIR)/drivers/s3virge)
 InstallDriverSDKNonExecFile(s3v_rop.h,$(DRIVERSDKDIR)/drivers/s3virge)
+InstallDriverSDKNonExecFile(s3v_shadow.c,$(DRIVERSDKDIR)/drivers/s3virge)
 
 InstallDriverSDKObjectModule(s3virge,$(DRIVERSDKMODULEDIR),drivers)
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/README
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/README:1.8 xc/programs/Xserver/hw/xfree86/drivers/s3virge/README:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/README:1.8	Sun Mar  5 08:59:15 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/README	Wed Jun 14 14:57:54 2000
@@ -2,6 +2,8 @@
 What works: 
 - Supports 8bpp, 15/16bpp, 24bpp and 32bpp. Heavy testing on ViRGE DX.
 - There is some known instability in ViRGE GX2, please report problems.
+- Silken Mouse is enabled by default, use the generic server option of
+  -nosilk to disable it.
 
 XCONFIG options:
 
@@ -82,4 +84,4 @@
     development debug option.  Default: off.
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/README,v 1.8 2000/03/05 16:59:15 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/README,v 1.9 2000/06/14 21:57:54 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES:1.11 xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES:1.15
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES:1.11	Sat Feb 12 12:45:30 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES	Fri Jun 30 10:15:12 2000
@@ -1,7 +1,7 @@
 S3 ViRGE 4.0 devel notes
 
 rev: 
-26 Jun 1999 KJB
+26 Jun 2000 KJB
 
 
 Function		Implemented
@@ -23,6 +23,28 @@
 
 Status
 ------
+6/26/00 KJB
+GX2 seems to have an accel bug.  I see the entire screen go solid color or
+a wide stripe pattern for about 1 second.  The S3VGEReset gets called twice,
+and then everything is okay.  Unless SilkenMouse is enabled...  That seems to
+get you a server lock instead.  Short term is to disable SilkenMouse for GX2
+only.  SilkenMouse isn't really the problem of course, it just happens that if
+we move the mouse during the 1 second engine lockup we appear more likely to
+never recover.
+
+6/23/00 KJB
+Ver 1.2.0 - Fix console corruption on GX2 caused by reserved bit use in CR3A.
+Fix GX2 noise on screen in hi-res depth 24 by increasing FIFO fill threshold. 
+
+6/12/00 KJB
+Ver 1.1.0 - Add Init for SilkenMouse, add xf86SetBackingStore call, move
+int10Symbols[] to remove warnings.
+
+3/3/00 KJB
+Ver 1.0.0 - S3VProbeDDC code for X -configure option added, add timeout to
+WAITIDLE macro in s3v_macros.h, change ImageWriteFlags adding NO_GXCOPY.
+Start of GX2 fixes, use CR regs for FIFO settings.  Update copyrights.
+
 2/11/00 KJB
 Ver 0.11.0 - Add cfb16/24BresS to module symbols to remove warnings.
 Fix viewport restore problem after EnterVT in 24 bpp.
@@ -186,4 +208,4 @@
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.11 2000/02/12 20:45:30 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.15 2000/06/30 17:15:12 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v.h:1.20 xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v.h:1.22
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v.h:1.20	Tue Feb  8 09:19:14 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v.h	Tue Apr  4 12:25:15 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v.h,v 1.20 2000/02/08 17:19:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v.h,v 1.22 2000/04/04 19:25:15 dawes Exp $ */
 
 /*
 Copyright (C) 1994-1999 The XFree86 Project, Inc.  All Rights Reserved.
@@ -28,9 +28,6 @@
 #ifndef _S3V_H
 #define _S3V_H
 
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -38,6 +35,9 @@
 /* All drivers need this */
 #include "xf86_ansic.h"
 
+/* Everything using inb/outb, etc needs "compiler.h" */
+#include "compiler.h"
+
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"
 
@@ -131,7 +131,7 @@
    unsigned char CR40, CR41, CR42, CR43, CR45;
    unsigned char CR51, CR53, CR54, CR55, CR58, CR5D, CR5E;
    unsigned char CR63, CR65, CR66, CR67, CR68, CR69, CR6D; /* Video attrib. */
-   unsigned char CR86;
+   unsigned char CR85, CR86;
    unsigned char CR90, CR91;
    unsigned char ColorStack[8]; /* S3 hw cursor color stack CR4A/CR4B */
    unsigned int  STREAMS[22];   /* Streams regs */
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dga.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dga.c:1.5 xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dga.c:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dga.c:1.5	Mon Mar  6 14:59:27 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dga.c	Fri Mar 31 12:13:31 2000
@@ -1,4 +1,29 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dga.c,v 1.5 2000/03/06 22:59:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dga.c,v 1.6 2000/03/31 20:13:31 dawes Exp $ */
+
+/*
+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.
+*/
 
 /*
 Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c:1.54 xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c:1.62
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c:1.54	Mon Mar  6 14:59:29 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c	Fri Jun 30 10:15:12 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v 1.54 2000/03/06 22:59:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v 1.62 2000/06/30 17:15:12 dawes Exp $ */
 
 /*
 Copyright (C) 1994-1999 The XFree86 Project, Inc.  All Rights Reserved.
@@ -111,6 +111,7 @@
 #endif
 static Bool S3Vddc1(int scrnIndex);
 static unsigned int S3Vddc1Read(ScrnInfoPtr pScrn);
+static void S3VProbeDDC(ScrnInfoPtr pScrn, int index);
 
 /*
  * This is intentionally screen-independent.  It indicates the binding
@@ -118,12 +119,11 @@
  */
 static int pix24bpp = 0;
  
-
 #define S3VIRGE_NAME "S3VIRGE"
 #define S3VIRGE_DRIVER_NAME "s3virge"
-#define S3VIRGE_VERSION_NAME "1.0.0"
+#define S3VIRGE_VERSION_NAME "1.2.0"
 #define S3VIRGE_VERSION_MAJOR   1
-#define S3VIRGE_VERSION_MINOR   0
+#define S3VIRGE_VERSION_MINOR   2
 #define S3VIRGE_PATCHLEVEL      0
 #define S3VIRGE_DRIVER_VERSION ((S3VIRGE_VERSION_MAJOR << 24) | \
 				(S3VIRGE_VERSION_MINOR << 16) | \
@@ -141,9 +141,6 @@
 {
     S3VIRGE_DRIVER_VERSION,
     S3VIRGE_DRIVER_NAME,
-#if 0
-    "driver for S3 ViRGE based cards, including DX, GX, GX2, VX, MX & MX+",
-#endif
     S3VIdentify,
     S3VProbe,
     S3VAvailableOptions,
@@ -315,12 +312,6 @@
     NULL
 };
 
-static const char *int10Symbols[] = {
-    "xf86InitInt10",
-    "xf86FreeInt10",
-    NULL
-};
-
 static const char *vbeSymbols[] = {
     "VBEInit",
     "vbeDoEDID",
@@ -330,6 +321,12 @@
 
 #ifdef XFree86LOADER
 
+static const char *int10Symbols[] = {
+    "xf86InitInt10",
+    "xf86FreeInt10",
+    NULL
+};
+
 static const char *cfbSymbols[] = {
 #if 1
     "cfbScreenInit",
@@ -528,25 +525,25 @@
 	foundScreen = TRUE;
     else for (i = 0; i < numUsed; i++) {
 	/* Allocate a ScrnInfoRec and claim the slot */
-	ScrnInfoPtr pScrn = xf86AllocateScreen(drv, 0);
-	
-	/* Fill in what we can of the ScrnInfoRec */
-	pScrn->driverVersion = S3VIRGE_DRIVER_VERSION;
-	pScrn->driverName	 = S3VIRGE_DRIVER_NAME;
-	pScrn->name		 = S3VIRGE_NAME;
-	pScrn->Probe	 = S3VProbe;
-	pScrn->PreInit	 = S3VPreInit;
-	pScrn->ScreenInit	 = S3VScreenInit;
-	pScrn->SwitchMode	 = S3VSwitchMode;
-	pScrn->AdjustFrame	 = S3VAdjustFrame;
-	pScrn->EnterVT	 = S3VEnterVT;
-	pScrn->LeaveVT	 = S3VLeaveVT;
-	pScrn->FreeScreen	 = NULL; /*S3VFreeScreen;*/
-	pScrn->ValidMode	 = S3VValidMode;
-	foundScreen = TRUE;
-	xf86ConfigActivePciEntity(pScrn,usedChips[i],S3VPciChipsets,
-				  NULL,NULL, NULL,NULL,NULL);
-
+	ScrnInfoPtr pScrn = NULL;
+	if ((pScrn = xf86ConfigPciEntity(pScrn,0,usedChips[i],
+					       S3VPciChipsets,NULL,NULL, NULL,
+					       NULL,NULL))) {
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = S3VIRGE_DRIVER_VERSION;
+	    pScrn->driverName	 = S3VIRGE_DRIVER_NAME;
+	    pScrn->name		 = S3VIRGE_NAME;
+	    pScrn->Probe	 = S3VProbe;
+	    pScrn->PreInit	 = S3VPreInit;
+	    pScrn->ScreenInit	 = S3VScreenInit;
+	    pScrn->SwitchMode	 = S3VSwitchMode;
+	    pScrn->AdjustFrame	 = S3VAdjustFrame;
+	    pScrn->EnterVT	 = S3VEnterVT;
+	    pScrn->LeaveVT	 = S3VLeaveVT;
+	    pScrn->FreeScreen	 = NULL; /*S3VFreeScreen;*/
+	    pScrn->ValidMode	 = S3VValidMode;
+	    foundScreen = TRUE;
+	}
     }
     xfree(usedChips);
     PVERB5("	S3VProbe end\n");
@@ -573,10 +570,13 @@
     
     vgaHWPtr hwp;
     int vgaCRIndex, vgaCRReg, vgaIOBase;
-
-    if (flags & PROBE_DETECT) return FALSE;
-    
+   
     PVERB5("	S3VPreInit 1\n");
+
+    if (flags & PROBE_DETECT) {
+	  S3VProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index );
+      return TRUE;
+      }
     	      
     /*
      * Note: This function is only called once at server startup, and
@@ -971,7 +971,7 @@
        
        xf86LoaderReqSymLists(ddcSymbols, NULL);
        if ((ps3v->pVbe) 
-	   && ((pMon = xf86PrintEDID(vbeDoEDID(ps3v->pVbe))) != NULL))
+	   && ((pMon = xf86PrintEDID(vbeDoEDID(ps3v->pVbe, NULL))) != NULL))
 	   xf86SetDDCproperties(pScrn,pMon);
        else if (!S3Vddc1(pScrn->scrnIndex)) {
 	   if ( xf86LoadSubModule(pScrn, "i2c") ) {
@@ -1034,8 +1034,9 @@
       }
       else if (S3_TRIO_3D_2X_SERIES(ps3v->Chipset)) {
          switch((config1 & 0xE0) >> 5) {
-         case 0:
-            ps3v->videoRamKbytes = 8 * 1024;
+         case 0:  /* 8MB -- only 4MB usable for display/cursor */
+            ps3v->videoRamKbytes = 4 * 1024;
+            ps3v->MemOffScreen   = 4 * 1024;
             break;
          case 1:    /* 32 bit interface -- yuck */
 	   xf86ErrorFVerb(VERBLEV, 
@@ -1143,6 +1144,12 @@
       if (pScrn->clock[2] <= 0) pScrn->clock[2] = 135000;
       if (pScrn->clock[3] <= 0) pScrn->clock[3] = 135000;
    }
+   else if (S3_TRIO_3D_2X_SERIES(ps3v->Chipset)) {
+      if (pScrn->clock[0] <= 0) pScrn->clock[0] = 230000;
+      if (pScrn->clock[1] <= 0) pScrn->clock[1] = 230000;
+      if (pScrn->clock[2] <= 0) pScrn->clock[2] = 135000;
+      if (pScrn->clock[3] <= 0) pScrn->clock[3] = 135000;
+   }
    else if (ps3v->Chipset == S3_ViRGE_DXGX || S3_ViRGE_GX2_SERIES(ps3v->Chipset)) {
       if (pScrn->clock[0] <= 0) pScrn->clock[0] = 170000;
       if (pScrn->clock[1] <= 0) pScrn->clock[1] = 170000;
@@ -1337,7 +1344,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = xnfalloc(sizeof(ClockRange));
+    clockRanges = xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->minClock = ps3v->minClock;
     clockRanges->maxClock = ps3v->maxClock;
@@ -1663,6 +1670,12 @@
 
    VGAOUT8(vgaCRIndex, 0x33);             
    save->CR33 = VGAIN8(vgaCRReg);
+   if (S3_TRIO_3D_2X_SERIES(ps3v->Chipset) || S3_ViRGE_GX2_SERIES(ps3v->Chipset) 
+      /* MXTESTME || S3_ViRGE_MX_SERIES(ps3v->Chipset) */ ) 
+   {
+      VGAOUT8(vgaCRIndex, 0x85);
+      save->CR85 = VGAIN8(vgaCRReg);
+   }
    if (ps3v->Chipset == S3_ViRGE_DXGX) {
       VGAOUT8(vgaCRIndex, 0x86);
       save->CR86 = VGAIN8(vgaCRReg);
@@ -1707,6 +1720,7 @@
    if (S3_ViRGE_GX2_SERIES(ps3v->Chipset) || S3_ViRGE_MX_SERIES(ps3v->Chipset)) {
      VGAOUT8(0x3c4, 0x29);
      save->SR29 = VGAIN8(0x3c5);
+        /* SR 54,55,56,57 undocumented for MX & GX2.  Was this supposed to be CR? */
      VGAOUT8(0x3c4, 0x54);
      save->SR54 = VGAIN8(0x3c5);
      VGAOUT8(0x3c4, 0x55);
@@ -1742,10 +1756,18 @@
       }
 
    /* Now save Memory Interface Unit registers */
-   save->MMPR0 = INREG(FIFO_CONTROL_REG);
-   save->MMPR1 = INREG(MIU_CONTROL_REG);
-   save->MMPR2 = INREG(STREAMS_TIMEOUT_REG);
-   save->MMPR3 = INREG(MISC_TIMEOUT_REG);
+   if( S3_ViRGE_GX2_SERIES(ps3v->Chipset) 
+      /* MXTESTME || S3_ViRGE_MX_SERIES(ps3v->Chipset) */ )
+     {
+     /* No MMPR regs on MX & GX2 */
+     }
+   else
+     {
+     save->MMPR0 = INREG(FIFO_CONTROL_REG);
+     save->MMPR1 = INREG(MIU_CONTROL_REG);
+     save->MMPR2 = INREG(STREAMS_TIMEOUT_REG);
+     save->MMPR3 = INREG(MISC_TIMEOUT_REG);
+     }
 
    if (xf86GetVerbosity() > 1) {
       /* Debug */
@@ -1930,6 +1952,12 @@
 
    VGAOUT8(vgaCRIndex, 0x33);
    VGAOUT8(vgaCRReg, restore->CR33);
+   if (S3_TRIO_3D_2X_SERIES(ps3v->Chipset) || S3_ViRGE_GX2_SERIES(ps3v->Chipset)
+      /* MXTESTME || S3_ViRGE_MX_SERIES(ps3v->Chipset) */ ) 
+   {
+      VGAOUT8(vgaCRIndex, 0x85);
+      VGAOUT8(vgaCRReg, restore->CR85);
+   }
    if (ps3v->Chipset == S3_ViRGE_DXGX) {
       VGAOUT8(vgaCRIndex, 0x86);
       VGAOUT8(vgaCRReg, restore->CR86);
@@ -2040,14 +2068,27 @@
 #endif
 
    VerticalRetraceWait();
-   OUTREG(FIFO_CONTROL_REG, restore->MMPR0);
-   WaitIdle();                  /* Don't ask... */
-   OUTREG(MIU_CONTROL_REG, restore->MMPR1);
-   WaitIdle();                  
-   OUTREG(STREAMS_TIMEOUT_REG, restore->MMPR2);
-   WaitIdle();
-   OUTREG(MISC_TIMEOUT_REG, restore->MMPR3);
-
+   if (S3_ViRGE_GX2_SERIES(ps3v->Chipset) 
+       /* MXTESTME || S3_ViRGE_MX_SERIES(ps3v->Chipset) */ )
+     {
+      VGAOUT8(vgaCRIndex, 0x85);    
+      /* primary stream threshold */
+      VGAOUT8(vgaCRReg, 0x1f ); 
+     }
+   else
+     {
+       OUTREG(FIFO_CONTROL_REG, restore->MMPR0);
+     }
+   if( !( S3_ViRGE_GX2_SERIES(ps3v->Chipset) 
+         /* MXTESTME || S3_ViRGE_MX_SERIES(ps3v->Chipset) */ ))
+   {
+     WaitIdle();                  /* Don't ask... */
+     OUTREG(MIU_CONTROL_REG, restore->MMPR1);
+     WaitIdle();                  
+     OUTREG(STREAMS_TIMEOUT_REG, restore->MMPR2);
+     WaitIdle();
+     OUTREG(MISC_TIMEOUT_REG, restore->MMPR3);
+   }
  
    /* Restore the standard VGA registers */
    /* False indicates no fontinfo restore. */
@@ -2380,6 +2421,15 @@
   }
 	
   miInitializeBackingStore(pScreen);
+  xf86SetBackingStore(pScreen);
+  /* Problem with accel appears to crash GX2 on mouse moves */
+  /* re-enable this when fixed. */
+  if( S3_ViRGE_GX2_SERIES(ps3v->Chipset) )
+  {}
+  else
+    {
+    xf86SetSilkenMouse(pScreen);
+    }
   						/* hardware cursor needs to wrap this layer */
   S3VDGAInit(pScreen);
 
@@ -2623,10 +2673,22 @@
 
    VGAOUT8(vgaCRIndex, 0x3a);
    tmp = VGAIN8(vgaCRReg);
-   if(ps3v->pci_burst)
-      new->CR3A = (tmp & 0x7f) | 0x15; /* ENH 256, PCI burst */
-   else 
-      new->CR3A = tmp | 0x95;      /* ENH 256, no PCI burst! */
+   if( S3_ViRGE_GX2_SERIES(ps3v->Chipset) 
+       /* MXTESTME || S3_ViRGE_MX_SERIES(ps3v->Chipset) */ )
+     {
+     if(ps3v->pci_burst)
+        new->CR3A = (tmp & 0x78) | 0x10; /* ENH 256, PCI burst */
+     else 
+        new->CR3A = tmp | 0x90;      /* ENH 256, no PCI burst! */
+     }
+   else
+     {
+     if(ps3v->pci_burst)
+        new->CR3A = (tmp & 0x7f) | 0x15; /* ENH 256, PCI burst */
+     else 
+        new->CR3A = tmp | 0x95;      /* ENH 256, no PCI burst! */
+     }
+  
 
    VGAOUT8(vgaCRIndex, 0x55);
    new->CR55 = VGAIN8(vgaCRReg);
@@ -2719,7 +2781,6 @@
      }
    }
    
-    /*cep*/  
     xf86ErrorFVerb(VERBLEV, "	S3VModeInit dclk=%i \n", 
    	dclk
 	);
@@ -2810,7 +2871,9 @@
 	  					/* Flag STREAMS proc. required */
           ps3v->NeedSTREAMS = TRUE;
           S3VInitSTREAMS(pScrn, new->STREAMS, mode);
-          new->MMPR0 = 0xc098;            /* Adjust FIFO slots */
+          /* MXTESTME - remove the next 2 lines completely */
+          if( S3_ViRGE_MX_SERIES(ps3v->Chipset) )
+            new->MMPR0 = 0xc098;            /* Adjust FIFO slots */
           }
        else if (pScrn->bitsPerPixel == 32) {
           new->CR67 = 0xd0;              /* 32bpp */
@@ -3018,6 +3081,13 @@
 
 
    new->CR33 = 0x20;
+   if (S3_TRIO_3D_2X_SERIES(ps3v->Chipset) || S3_ViRGE_GX2_SERIES(ps3v->Chipset) 
+       /* MXTESTME || S3_ViRGE_MX_SERIES(ps3v->Chipset) */ ) 
+   {
+      new->CR85 = 0x1f;  /* avoid sreen flickering */
+      /* by increasing FIFO filling, larger # fills FIFO from memory earlier */
+      /* on GX2 this affects all depths, not just those running STREAMS. */
+   }
    if (ps3v->Chipset == S3_ViRGE_DXGX || S3_TRIO_3D_SERIES(ps3v->Chipset)) {
       new->CR86 = 0x80;  /* disable DAC power saving to avoid bright left edge */
    }
@@ -3612,6 +3682,18 @@
     OUTREG(DDC_REG,(tmp));
     return success;
 }
+
+
+static void
+S3VProbeDDC(ScrnInfoPtr pScrn, int index)
+{
+    vbeInfoPtr pVbe;
+    if (xf86LoadSubModule(pScrn, "vbe")) {
+        pVbe = VBEInit(NULL,index);
+        ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
+    }
+}
+
 /*EOF*/
 
 
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_i2c.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_i2c.c:1.3 xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_i2c.c:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_i2c.c:1.3	Mon Mar  6 14:59:29 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_i2c.c	Fri Mar 31 12:13:32 2000
@@ -1,4 +1,29 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_i2c.c,v 1.3 2000/03/06 22:59:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_i2c.c,v 1.4 2000/03/31 20:13:32 dawes Exp $ */
+
+/*
+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.
+*/
 
 /*
 Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_macros.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_macros.h:1.8 xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_macros.h:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_macros.h:1.8	Sat Aug 21 06:48:40 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_macros.h	Fri Mar 31 12:13:33 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_macros.h,v 1.8 1999/08/21 13:48:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_macros.h,v 1.9 2000/03/31 20:13:33 dawes Exp $ */
 
 /*
 Copyright (C) 1994-1999 The XFree86 Project, Inc.  All Rights Reserved.
@@ -93,11 +93,17 @@
 #define MONO_TRANS_BUG	0x00000002
 
 
+#define MAXLOOP 0x0fffff /* timeout value for engine waits, 0.5 secs */
 
+
 #define WAITFIFO(n) if(ps3v->NoPCIRetry) \
 	 while(((INREG(SUBSYS_STAT_REG) >> 8) & 0x1f) < n){}
 
-#define WAITIDLE()  while((INREG(SUBSYS_STAT_REG) & 0x3f00) < 0x3000){}
+#define WAITIDLE()\
+  do { int loop=0; mem_barrier(); \
+         while(((INREG(SUBSYS_STAT_REG) & 0x3f00) < 0x3000) && (loop++<MAXLOOP)) \
+         if (loop >= MAXLOOP) S3VGEReset(pScrn,1,__LINE__,__FILE__); \
+  } while (0)
 
 #define CHECK_DEST_BASE(y,h)\
     if((y < ps3v->DestBaseY) || ((y + h) > (ps3v->DestBaseY + 2048))) {\
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c:1.2	Mon Mar  6 14:59:30 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c	Fri Mar 31 12:13:33 2000
@@ -1,4 +1,29 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.2 2000/03/06 22:59:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */
+
+/*
+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.
+*/
 
 /*
 Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.cpp:1.6 xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.cpp:1.9
--- xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.cpp:1.6	Sun Mar  5 08:59:16 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.cpp	Tue Jun 13 19:13:13 2000
@@ -1,13 +1,15 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.cpp,v 1.6 2000/03/05 16:59:16 dawes Exp $
-.TH s3virge __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.cpp,v 1.9 2000/06/14 02:13:13 dawes Exp $
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH s3virge __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 s3virge \- S3 ViRGE video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
+.B "Section \*qDevice\*q"
 .br
-.BI "  Identifier """  devname """"
+.BI "  Identifier \*q"  devname \*q
 .br
-.B  "  Driver ""s3virge"""
+.B  "  Driver \*qs3virge\*q"
 .br
 \ \ ...
 .br
@@ -63,7 +65,7 @@
 The driver auto-detects the chipset type, but the following
 .B ChipSet
 names may optionally be specified in the config file
-.B """Device"""
+.B \*q"Device\*q"
 section, and will override the auto-detection:
 .PP
 .RS 4
@@ -78,10 +80,10 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""HWCursor"" [""" boolean """]
+.BI "Option \*qHWCursor\*q [\*q" boolean \*q]
 Enable or disable the HW cursor.  Default: on.
 .TP
-.BI "Option ""SWCursor"" [""" boolean """]
+.BI "Option \*qSWCursor\*q [\*q" boolean \*q]
 Inverse of "HWCursor".  Default: off.
 
 .PP
@@ -89,10 +91,10 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""ShadowFB"" [""" boolean """]
+.BI "Option \*qShadowFB\*q [\*q" boolean \*q]
 Use shadow framebuffer.  Disables HW acceleration.  Default: off.
 .TP
-.BR "Option ""Rotate"" """ cw " | " ccw """
+.BR "Option \*qRotate\*q \*q" cw " | " ccw \*q
 Rotate the screen CW - clockwise or CCW - counter clockwise.
 Disables HW Acceleration and HW Cursor, uses ShadowFB.
 Default: no rotation.
@@ -102,23 +104,23 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""slow_edodram"""
+.BI "Option \*qslow_edodram\*q"
 Switch the standard ViRGE to 2-cycle edo mode. Try this
 if you encounter pixel corruption on the ViRGE. Using this option will
 cause a large decrease in performance.  Default: off.
 .TP
-.BI "Option ""fpm_vram"""
+.BI "Option \*qfpm_vram\*q"
 Switch the ViRGE/VX to fast page mode vram mode.  Default: off.
 .TP
-.BR "Option ""slow_dram " | " fast_dram"""
+.BR "Option \*qslow_dram " | " fast_dram\*q"
 Change Trio 3D and 3D/2X memory options.  Default: Use BIOS defaults.
 .TP
-.BR "Option ""early_ras_precharge " | " late_ras_precharge"""
+.BR "Option \*qearly_ras_precharge " | " late_ras_precharge\*q"
 adjust memory parameters.  One
 of these will us the same settings as your video card defaults, and
 using neither in the config file does the same.  Default: none.
 .TP
-.BI "Option ""set_mclk"" """ integer """
+.BI "Option \*qset_mclk\*q \*q" integer \*q
 sets the memory clock, where
 .I integer
 is in kHz, and
@@ -126,7 +128,7 @@
 <= 100000.  Default: probe the memory clock value,
 and use it at server start.
 .TP
-.BI "Option ""set_refclk"" """ integer """
+.BI "Option \*qset_refclk\*q \*q" integer \*q
 sets the ref clock for ViRGE MX, where
 .I integer
 is in kHz.  Default: probe the memory clock value,
@@ -138,7 +140,7 @@
 .B Options
 are supported:
 .TP
-.B "Option ""NoAccel""
+.B "Option \*qNoAccel\*q"
 Disable acceleration.  Very useful for determining if the
 driver has problems with drawing and acceleration routines.  This is the first
 option to try if your server runs but you see graphic corruption on the screen.
@@ -146,7 +148,7 @@
 operations the video driver can accelerate with hardware.
 Default: acceleration is enabled.
 .TP
-.BR "Option ""fifo_aggressive " | " fifo_moderate " | " fifo_conservative"""
+.BR "Option \*qfifo_aggressive " | " fifo_moderate " | " fifo_conservative\*q"
 alter the settings
 for the threshold at which the pixel FIFO takes over the internal 
 memory bus to refill itself. The smaller this threshold, the better
@@ -167,11 +169,11 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""pci_burst"" [""" boolean """]
+.BI "Option \*qpci_burst\*q [\*q" boolean \*q]
 will enable PCI burst mode. This should work on all but a
 few broken PCI chipsets, and will increase performance.  Default: off.
 .TP
-.BI "Option ""pci_retry"" [""" boolean """]
+.BI "Option \*qpci_retry\*q [\*q" boolean \*q]
 will allow the driver to rely on PCI Retry to program the 
 ViRGE registers. 
 .B "pci_burst"
@@ -185,9 +187,9 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""lcd_center""
+.BI "Option \*qlcd_center\*q"
 .TP
-.BI "Option ""set_lcdclk"" """ integer """
+.BI "Option \*qset_lcdclk\*q \*q" integer \*q
 allows setting the clock for a ViRGE MX LCD display. 
 .I integer
 is in Hz.  Default: use probed value.
@@ -197,12 +199,12 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""ShowCache"" [""" boolean """]
+.BI "Option \*qShowCache\*q [\*q" boolean \*q]
 Enable or disable viewing offscreen cache memory.  A
 development debug option.  Default: off.
 
 .SH SEE ALSO
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 
 .SH SUPPORT
 For assistance with this driver, or XFree86 in general, check the XFree86 web
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile:1.11 xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile:1.16
--- xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile:1.11	Thu Mar  2 17:05:42 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile	Fri Jun 30 10:15:13 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile,v 1.11 2000/03/03 01:05:42 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile,v 1.16 2000/06/30 17:15:13 dawes Exp $
 XCOMM
 XCOMM This is an Imakefile for the SIS driver.  
 XCOMM
@@ -7,12 +7,15 @@
 #include <Server.tmpl>
 
 SRCS = sis_driver.c sis_dac.c sis_cursor.c sis_accel.c sis_setup.c\
-       sis530_accel.c sis300_accel.c sis_vga.c sis_lcd.c sis_tv.c\
-       sis_opt.c sis_bios.c
+       sis530_accel.c sis300_accel.c sis_vga.c sis_tv.c sis_lcd.c\
+       sis_opt.c sis_bios.c sis_dga.c
 OBJS = sis_driver.o sis_dac.o sis_cursor.o sis_accel.o sis_setup.o\
-       sis530_accel.o sis300_accel.o sis_vga.o sis_lcd.o sis_tv.o\
-       sis_opt.o sis_bios.o
+       sis530_accel.o sis300_accel.o sis_vga.o sis_tv.o sis_lcd.o\
+       sis_opt.o sis_bios.o sis_dga.o
 
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \
            -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
            -I$(SERVERSRC)/cfb -I$(XF86SRC)/xaa \
@@ -23,6 +26,7 @@
 	   -I$(XF86SRC)/rac \
            -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
 	   -I$(XTOP)/include/extensions
+#endif
 
 #if MakeHasPosixVariableSubstitutions
 SubdirLibraryRule($(OBJS))
@@ -41,3 +45,29 @@
 
 DependTarget()
 
+
+InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis300_accel.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis300_accel.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis530_accel.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_accel.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_bios.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_bios.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_cursor.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_cursor.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_dac.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_dga.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_driver.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_driver.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_lcd.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_lcd.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_opt.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_regs.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_regs2.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_setup.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_tv.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_tv.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_vga.c,$(DRIVERSDKDIR)/drivers/sis)
+
+InstallDriverSDKObjectModule(sis,$(DRIVERSDKMODULEDIR),drivers)
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/sis/sis.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis.cpp:1.1	Thu Mar  2 17:05:42 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis.cpp	Tue Jun 13 19:13:13 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.cpp,v 1.1 2000/03/03 01:05:42 dawes Exp $ 
-.TH SIS __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.cpp,v 1.4 2000/06/14 02:13:13 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH SIS __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 sis \- SiS video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""sis"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qsis\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B sis 
 is an XFree86 driver for SiS video cards.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h:1.11 xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h:1.14
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h:1.11	Sat Feb 12 15:07:55 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h	Mon Jun 26 15:27:45 2000
@@ -25,7 +25,7 @@
  *           Mitani Hiroshi <hmitani@drl.mei.co.jp> 
  *           David Thomas <davtom@dream.org.uk>. 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h,v 1.11 2000/02/12 23:07:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h,v 1.14 2000/06/26 22:27:45 tsi Exp $ */
 
 #ifndef _SIS_H
 #define _SIS_H_
@@ -35,6 +35,7 @@
 #include "xf86Cursor.h"
 #include "compiler.h"
 #include "xaa.h"
+#include "vgaHW.h"
 
 #define SIS_NAME		"SIS"
 #define SIS_DRIVER_NAME		"sis"
@@ -52,10 +53,32 @@
 #define	BIOS_BASE		0xC0000
 #define	BIOS_SIZE		0x10000
 
-#define	CRT2_LCD		0x00000001
-#define	CRT2_TV			0x00000002
-#define	CRT2_VGA		0x00000004
+#define	CRT2_LCD		0x00000010
+#define	CRT2_TV			0x00000020
+#define	CRT2_VGA		0x00000040
+#define	CRT2_ENABLE		0x00000070
+#define	LCD_800x600		0x00000100
+#define	LCD_1024x768		0x00000200
+#define	LCD_1280x1024		0x00000400
+#define	LCD_TYPE		0x00000700
+#define	TV_NTSC			0x00001000
+#define	TV_PAL			0x00002000
+#define	TV_HIVISION		0x00004000
+#define	TV_TYPE			0x00007000
+#define	TV_AVIDEO		0x00010000
+#define	TV_SVIDEO		0x00020000
+#define	TV_SCART		0x00040000
+#define	TV_INTERFACE		0x00070000
+#define	SIS301			0x00100000
+#define	SIS302			0x00200000
+#define	LVDS			0x01000000
+#define	CHRONTEL_TV		0x02000000
+#define	SINGLE_MODE		0x00000000
+#define	SIMU_MODE		0x10000000
+#define	MM_MODE			0x20000000
+#define	DISPLAY_MODE		0x30000000
 
+
 #ifdef	DEBUG
 #define	PDEBUG(p)	p
 #else
@@ -63,14 +86,13 @@
 #endif
 
 typedef struct {
-	unsigned char sisRegs3x4[0x100];
-	unsigned char sisRegs3C4[0x100];
-	unsigned char sisRegs3C2[0x100];
+	unsigned char sisRegs3C4[0x50];
+	unsigned char sisRegs3D4[0x40];
+	unsigned char sisRegs3C2;
 	unsigned char VBPart1[0x29];
 	unsigned char VBPart2[0x46];
 	unsigned char VBPart3[0x3F];
 	unsigned char VBPart4[0x1C];
-	unsigned char VBPart5[0x100];
 } SISRegRec, *SISRegPtr;
 
 #define SISPTR(p)	((SISPtr)((p)->driverPrivate))
@@ -98,6 +120,10 @@
     int			MaxClock;
     int			Flags;			/* HW config flags */
     long		FbMapSize;
+    DGAModePtr		DGAModes;
+    int			numDGAModes;
+    Bool		DGAactive;
+    int			DGAViewportStatus;
     Bool		NoAccel;
     Bool		HWCursor;
     Bool		UsePCIRetry;
@@ -129,33 +155,37 @@
     XAAInfoRecPtr	AccelInfoPtr;
     CloseScreenProcPtr	CloseScreen;
     unsigned int	(*ddc1Read)(ScrnInfoPtr);
-    Bool		(*FindThreshold)(ScrnInfoPtr pScrn, int mclk, int vclk,
-					int bpp, int buswidth, int flags,
-					int *ThresaholdLow, int *ThresholdHigh);
     Bool		(*ModeInit)(ScrnInfoPtr pScrn, DisplayModePtr mode);
     Bool		(*ModeInit2)(ScrnInfoPtr pScrn, DisplayModePtr mode);
     void		(*SiSSave)(ScrnInfoPtr pScrn, SISRegPtr sisreg);
-    void		(*SiSSave1)(ScrnInfoPtr pScrn, SISRegPtr sisreg);
+    void		(*SiSSave2)(ScrnInfoPtr pScrn, SISRegPtr sisreg);
     void		(*SiSRestore)(ScrnInfoPtr pScrn, SISRegPtr sisreg);
-    void		(*SiSRestore1)(ScrnInfoPtr pScrn, SISRegPtr sisreg);
+    void		(*SiSRestore2)(ScrnInfoPtr pScrn, SISRegPtr sisreg);
+    void		(*SetThreshold)(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High);
+    void		(*SetThreshold2)(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High);
+    void		(*LoadCRT2Palette)(ScrnInfoPtr pScrn, int numColors,
+				int *indicies, LOCO *colors, VisualPtr pVisual);
 } SISRec, *SISPtr;
 
 /* Prototypes */
 
-void	SiSOptions(ScrnInfoPtr pScrn);
-void	SiSVGASetup(ScrnInfoPtr pScrn);
-void	SiSLCDPreInit(ScrnInfoPtr pScrn);
-void	SiSTVPreInit(ScrnInfoPtr pScrn);
+void    SiSOptions(ScrnInfoPtr pScrn);
+void	SISVGAPreInit(ScrnInfoPtr pScrn);
+void	SISLCDPreInit(ScrnInfoPtr pScrn);
+void	SISTVPreInit(ScrnInfoPtr pScrn);
 OptionInfoPtr SISAvailableOptions(int chipid, int busid);
 
+void	SISDACPreInit(ScrnInfoPtr pScrn);
+void	SISLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
+					LOCO *colors, VisualPtr pVisual);
 
 int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div,
 					int *out_sbit, int *out_scale);
 void SiSCalcClock(ScrnInfoPtr pScrn, int clock, int max_VLD,
 					unsigned int *vclk);
 unsigned int SiSddc1Read(ScrnInfoPtr pScrn);
-void SiSRestore(ScrnInfoPtr pScrn, SISRegPtr sisReg);
-void SiSSave(ScrnInfoPtr pScrn, SISRegPtr sisReg);
 Bool SiSAccelInit(ScreenPtr pScreen);
 Bool SiS530AccelInit(ScreenPtr pScreen);
 Bool SiS300AccelInit(ScreenPtr pScreen);
@@ -166,5 +196,8 @@
 void SiSIODump(ScrnInfoPtr pScreen);
 void SiSInitializeAccelerator(ScrnInfoPtr pScrn);
 void SiSSetup(ScrnInfoPtr pScrn);
+
+extern Bool	SISSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+extern void	SISAdjustFrame(int scrnIndex, int x, int y, int flags);
 
 #endif
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c:1.2	Sat Feb 12 15:07:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c	Fri Mar 31 12:13:35 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c,v 1.2 2000/02/12 23:07:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c,v 1.3 2000/03/31 20:13:35 dawes Exp $ */
 
 /*
  *
@@ -21,6 +21,8 @@
 #include <xf86PciInfo.h>
 #include <xf86Pci.h>
 
+#include <compiler.h>
+
 #include <miline.h>
 
 #include <xaa.h>
@@ -89,7 +91,6 @@
 {
 	SISPtr	pSiS = SISPTR(pScrn);
 
-	SiSSetupDSTColorDepth(SISPTR(pScrn)->DstColor);
 	pSiS->DoColorExpand = FALSE;
 }
 
@@ -109,40 +110,38 @@
 
 	infoPtr->Flags = LINEAR_FRAMEBUFFER |
 			OFFSCREEN_PIXMAPS |
-			PIXMAP_CACHE |
-			NO_PLANEMASK;
+			PIXMAP_CACHE;
 
 	/* sync */
 	infoPtr->Sync = SiSSync;
 
+	if ((pScrn->bitsPerPixel != 8) && (pScrn->bitsPerPixel != 16) &&
+	    (pScrn->bitsPerPixel != 32))	 return FALSE;
+
 	/* BitBlt */
 	infoPtr->SetupForScreenToScreenCopy = SiSSetupForScreenToScreenCopy;
 	infoPtr->SubsequentScreenToScreenCopy = SiSSubsequentScreenToScreenCopy;
 	infoPtr->ScreenToScreenCopyFlags = NO_PLANEMASK | NO_TRANSPARENCY;
 
-
 	/* solid fills */
 	infoPtr->SetupForSolidFill = SiSSetupForSolidFill;
 	infoPtr->SubsequentSolidFillRect = SiSSubsequentSolidFillRect;
 	infoPtr->SolidFillFlags = NO_PLANEMASK;
 
-
 	/* solid line */
 	infoPtr->SetupForSolidLine = SiSSetupForSolidLine;
 	infoPtr->SubsequentSolidTwoPointLine = SiSSubsequentSolidTwoPointLine;
 	infoPtr->SubsequentSolidHorVertLine = SiSSubsequentSolidHorzVertLine;
 	infoPtr->SolidFillFlags = NO_PLANEMASK;
 
-
 	/* dashed line */
 	infoPtr->SetupForDashedLine = SiSSetupForDashedLine;
 	infoPtr->SubsequentDashedTwoPointLine = SiSSubsequentDashedTwoPointLine;
 	infoPtr->DashPatternMaxLength = 64;
 	infoPtr->DashedLineFlags = NO_PLANEMASK | 
 			LINE_PATTERN_MSBFIRST_LSBJUSTIFIED;
-
 
-	/* 8x8 mono pattern fill */
+	/* 8x8 mono pattern fill 
 	infoPtr->SetupForMono8x8PatternFill = SiSSetupForMonoPatternFill;
 	infoPtr->SubsequentMono8x8PatternFillRect =
 				SiSSubsequentMonoPatternFill;
@@ -151,7 +150,7 @@
 				HARDWARE_PATTERN_PROGRAMMED_BITS |
 				NO_TRANSPARENCY |
 				BIT_ORDER_IN_BYTE_MSBFIRST ;
-
+*/
 
 	/* 8x8 color pattern fill 
 	infoPtr->SetupForColor8x8PatternFill =
@@ -162,9 +161,8 @@
 				HARDWARE_PATTERN_SCREEN_ORIGIN |
 				HARDWARE_PATTERN_PROGRAMMED_BITS ;
 */
-
 
-	/* CPU To Screen Color Expand */
+	/* CPU To Screen Color Expand
 	infoPtr->SetupForCPUToScreenColorExpandFill =
 				SiSSetupForCPUToScreenColorExpand;
 	infoPtr->SubsequentCPUToScreenColorExpandFill =
@@ -179,8 +177,7 @@
 				SYNC_AFTER_COLOR_EXPAND |
 				HARDWARE_PATTERN_SCREEN_ORIGIN |
 				HARDWARE_PATTERN_PROGRAMMED_BITS ;
-
-
+*/
 
 	/* Screen To Screen Color Expand 
 	infoPtr->SetupForScreenToScreenColorExpandFill =
@@ -198,6 +195,7 @@
 	reservedFbSize = 0;
 	if (pSiS->TurboQueue) reservedFbSize += 1024*512;
 	if (pSiS->HWCursor)  reservedFbSize += 4096;
+	reservedFbSize = 4096*1024;
 	UsableFbSize = pSiS->FbMapSize - reservedFbSize;
 	Avail.x1 = 0;
 	Avail.y1 = 0;
@@ -206,7 +204,7 @@
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 				"Frame Buffer From (%d,%d) To (%d,%d)\n",
 				Avail.x1, Avail.y1, Avail.x2, Avail.y2);
-	xf86InitFBManager(pScreen, &Avail);
+/*	xf86InitFBManager(pScreen, &Avail); */
 
 
 	return(XAAInit(pScreen, infoPtr));
@@ -271,7 +269,7 @@
 				unsigned int planemask, int trans_color)
 {
 	SISPtr	pSiS = SISPTR(pScrn);
-	XAAInfoRecPtr	pXAA = XAAPTR(pScrn);
+/*	XAAInfoRecPtr	pXAA = XAAPTR(pScrn);*/
 
 	PDEBUG(ErrorF("Setup ScreenCopy(%d, %d, 0x%x, 0x%x, 0x%x)\n",
 			xdir, ydir, rop, planemask, trans_color));
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c:1.15 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c:1.17
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c:1.15	Fri Feb 18 04:19:59 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c	Thu Jun 15 13:50:03 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c,v 1.15 2000/02/18 12:19:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c,v 1.17 2000/06/15 20:50:03 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -61,7 +61,7 @@
         int x, int y, int len, int dir);
 
 
-Bool
+Bool 
 SiSAccelInit(ScreenPtr pScreen)
 {
     XAAInfoRecPtr infoPtr;
@@ -164,6 +164,7 @@
     SISPtr pSiS = SISPTR(pScrn);
 
     sisSETFGCOLOR(color);
+    sisSETBGCOLOR(color);
     sisSETROP(XAACopyROP[rop]);
     sisSETPITCH(pScrn->displayWidth * pScrn->bitsPerPixel / 8, 
 		pScrn->displayWidth * pScrn->bitsPerPixel / 8);
@@ -182,7 +183,7 @@
     int destaddr, op;
 
     destaddr = y * pScrn->displayWidth + x;
-    op = sisCMDBLT | sisSRCFG | sisTOP2BOTTOM | sisLEFT2RIGHT;
+    op = sisCMDBLT | sisSRCBG | sisTOP2BOTTOM | sisLEFT2RIGHT;
     if (pSiS->ClipEnabled) op |= sisCLIPINTRN | sisCLIPENABL;
     destaddr *= (pScrn->bitsPerPixel / 8);
 
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_bios.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_bios.c:1.3 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_bios.c:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_bios.c:1.3	Fri Feb 18 04:20:00 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_bios.c	Thu Apr  6 20:57:52 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_bios.c,v 1.3 2000/02/18 12:20:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_bios.c,v 1.5 2000/04/07 03:57:52 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86PciInfo.h"
@@ -443,9 +443,6 @@
 	SetGroup2(BaseAddr,ROMAddr);     
 	SetGroup3(BaseAddr);
 	SetGroup4(BaseAddr,ROMAddr,ModeNo);
-#if 0
-	SetGroup5(BaseAddr,ROMAddr);
-#endif
 
 	LockCRT2(BaseAddr);
 	if (SetFlag & TV_SIMU_MODE)  {
@@ -572,22 +569,22 @@
 	unsigned short	part2_base = BaseAddr+0x10;
 
 	andSISIDXREG(part2_base, 0, 0xDF);
+	LongWait(BaseAddr+0x5A);
 	orSISIDXREG(BaseAddr+SROFFSET, 1, 0x20);	/* DisplayOff */
 	andSISIDXREG(BaseAddr+SROFFSET, 0x32, 0xDF);
 	andSISIDXREG(BaseAddr+SROFFSET, 0x1E, 0xDF);
 }
 
 void
-LongWait(CARD16 BaseAddr)
+LongWait(CARD16 p3da)
 {
 	unsigned short	i;
-	unsigned short	p3da = BaseAddr + 0x5A;
 
 	for (i=0; i<0xFFFF; i++) {
 		if (!(inSISREG(p3da) & 0x08))	break;
 	}
 	for (i=0; i<0xFFFF; i++) {
-		if (inSISREG(p3da) & 0x08)	break;
+		if (inSISREG(p3da) & 0x09 == 9)	break;
 	}
 }
 
@@ -665,40 +662,28 @@
 			temp1 = 0x20;
 		}
 	}
-#if 0
 	LongWait(BaseAddr+0x5A);
-	VBLongWait(BaseAddr);
-#endif
 	setSISIDXREG(BaseAddr+SROFFSET, 0x32, ~0x20, temp1);
 
-#if 0
 	LongWait(BaseAddr+0x5A);
-	VBLongWait(BaseAddr);
-#endif
 	orSISIDXREG(BaseAddr+SROFFSET, 0x1E, 0x20);
 
 	LongWait(BaseAddr+0x5A);
-	LongWait(BaseAddr+0x5A);
-	LongWait(BaseAddr+0x5A);
-#if 0
-	VBLongWait(BaseAddr);
-#endif
 	setSISIDXREG(part2_base, 0, ~0xE0, 0x20);
 
 	LongWait(BaseAddr+0x5A);
-	LongWait(BaseAddr+0x5A);
-	LongWait(BaseAddr+0x5A);
-#if 0
-	VBLongWait(BaseAddr);
-#endif
 	andSISIDXREG(BaseAddr+SROFFSET, 1, ~0x20);	/* DisplayOn */
 
 	LongWait(BaseAddr+0x5A);
+	andSISIDXREG(part2_base, 0, ~0xE0);
+	LongWait(BaseAddr+0x5A);
+	setSISIDXREG(part2_base, 0, ~0xE0, 0x20);
+
+/*
 	LongWait(BaseAddr+0x5A);
 	LongWait(BaseAddr+0x5A);
-#if 0
 	VBLongWait(BaseAddr);
-#endif
+*/
 }
 
 void
@@ -1446,22 +1431,4 @@
 	}
 	VCLKTableBase = *(CARD16 *)(ROMAddr+0x208);
 	return (ROMAddr + VCLKTableBase + index*4);
-}
-
-void
-SetGroup5(CARD16 BaseAddr, CARD8 *ROMAddr)
-{
-	ErrorF("Enter Group5()\n");
-	if (ModeType != MODE_VGA)
-		return;
-	if (VBInfo & (SET_IN_SLAVE_MODE | DISABLE_LOAD_CRT2DAC))
-		return;
-
-	ErrorF("Group5 begin to write DAC\n");
-	EnableCRT2(BaseAddr);
-	ErrorF("Group5 end to write DAC\n");
-#if 0
-	LoadDAC();
-#endif
-	ErrorF("Leave SetGroup5()\n");
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c:1.2	Mon Feb 14 11:20:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c	Fri Mar 31 12:13:36 2000
@@ -25,7 +25,7 @@
  *	     Mitani Hiroshi <hmitani@drl.mei.co.jp>
  *	     David Thomas <davtom@dream.org.uk>.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c,v 1.2 2000/02/14 19:20:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c,v 1.3 2000/03/31 20:13:36 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86PciInfo.h"
@@ -39,12 +39,12 @@
 static void
 SiSShowCursor(ScrnInfoPtr pScrn)
 {
-	unsigned char temp;
+        unsigned char temp;
 
-	outw(VGA_SEQ_INDEX, 0x8605);	/* Unlock Registers */
-	outb(VGA_SEQ_INDEX, 0x06);
-	temp = inb(VGA_SEQ_DATA) | 0x40;
-	outb(VGA_SEQ_DATA, temp);
+        outw(VGA_SEQ_INDEX, 0x8605);    /* Unlock Registers */
+        outb(VGA_SEQ_INDEX, 0x06);
+        temp = inb(VGA_SEQ_DATA) | 0x40;
+        outb(VGA_SEQ_DATA, temp);
 }
 
 static void
@@ -53,7 +53,7 @@
 	SISPtr	pSiS = SISPTR(pScrn);
 
 	sis300EnableHWCursor()
-	if (pSiS->VBFlags)  {
+	if (pSiS->VBFlags & CRT2_ENABLE)  {
 		sis301EnableHWCursor();
 	}
 }
@@ -61,12 +61,12 @@
 static void
 SiSHideCursor(ScrnInfoPtr pScrn)
 {
-	unsigned char temp;
+        unsigned char temp;
 
-	outw(VGA_SEQ_INDEX, 0x8605);	/* Unlock Registers */
-	outb(VGA_SEQ_INDEX, 0x06);
-	temp = inb(VGA_SEQ_DATA) & 0xBF;
-	outb(VGA_SEQ_DATA, temp);
+        outw(VGA_SEQ_INDEX, 0x8605);    /* Unlock Registers */
+        outb(VGA_SEQ_INDEX, 0x06);
+        temp = inb(VGA_SEQ_DATA) & 0xBF;
+        outb(VGA_SEQ_DATA, temp);
 }
 
 static void
@@ -75,7 +75,7 @@
 	SISPtr	pSiS = SISPTR(pScrn);
 
 	sis300DisableHWCursor()
-	if (pSiS->VBFlags)  {
+	if (pSiS->VBFlags & CRT2_ENABLE)  {
 		sis301DisableHWCursor()
 	}
 }
@@ -125,8 +125,8 @@
 	}
 	sis300SetCursorPositionX(x, x_preset)
 	sis300SetCursorPositionY(y, y_preset)
-	if (pSiS->VBFlags)  {
-		sis301SetCursorPositionX(x, x_preset)
+	if (pSiS->VBFlags & CRT2_ENABLE)  {
+		sis301SetCursorPositionX(x+13, x_preset)
 		sis301SetCursorPositionY(y, y_preset)
 	}
 }
@@ -161,7 +161,7 @@
 
 	sis300SetCursorBGColor(bg)
 	sis300SetCursorFGColor(fg)
-	if (pSiS->VBFlags)  {
+	if (pSiS->VBFlags & CRT2_ENABLE)  {
 		sis301SetCursorBGColor(bg)
 		sis301SetCursorFGColor(fg)
 	}
@@ -187,19 +187,19 @@
 	/* if set, store the bit [22] to SR3E */
 	if (cursor_addr & 0x1000) {
 		outb(VGA_SEQ_INDEX, 0x3E);
-		temp = inb(VGA_SEQ_DATA) | 0x04;
-		outb(VGA_SEQ_DATA, temp);
+                temp = inb(VGA_SEQ_DATA) | 0x04;
+                outb(VGA_SEQ_DATA, temp);
 	}
 
 	/* set HW cursor pattern, use pattern 0xF */
 	outb(VGA_SEQ_INDEX, 0x1E);
-	temp = inb(VGA_SEQ_DATA) | 0xF0;
-	outb(VGA_SEQ_DATA, temp);
+        temp = inb(VGA_SEQ_DATA) | 0xF0;
+        outb(VGA_SEQ_DATA, temp);
 
 	/* disable the hardware cursor side pattern */
 	outb(VGA_SEQ_INDEX, 0x1E);
-	temp = inb(VGA_SEQ_DATA) & 0xF7;
-	outb(VGA_SEQ_DATA, temp);
+        temp = inb(VGA_SEQ_DATA) & 0xF7;
+        outb(VGA_SEQ_DATA, temp);
 }
 
 static void
@@ -216,7 +216,7 @@
 	memcpy((unsigned char *)pSiS->FbBase + cursor_addr * 1024, src, 1024);
 	sis300SetCursorAddress(cursor_addr)
 	sis300SetCursorPatternSelect(0)
-	if (pSiS->VBFlags)  {
+	if (pSiS->VBFlags & CRT2_ENABLE)  {
 		sis301SetCursorAddress(cursor_addr)
 		sis301SetCursorPatternSelect(0)
 	}
@@ -232,13 +232,17 @@
 SiS300UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	SISPtr pSiS = SISPTR(pScrn);
+	DisplayModePtr 	mode = pScrn->currentMode;
+	SISPtr	pSiS = SISPTR(pScrn);
 
-	if ( (pSiS->Chipset==PCI_CHIP_SIS540) ||
-		!(pScrn->currentMode->Flags & V_INTERLACE) )
-		return TRUE;
-	else
-		return FALSE;
+	switch (pSiS->Chipset)  {
+	case PCI_CHIP_SIS300:
+	case PCI_CHIP_SIS630:
+		if (mode->Flags & V_INTERLACE)
+			return FALSE;
+		break;
+	}
+	return TRUE;
 }
 
 #ifdef	IMP_REALIZE_CURSOR
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c:1.13 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c:1.14
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c:1.13	Sat Feb 12 12:45:35 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c	Fri Mar 31 12:13:36 2000
@@ -25,7 +25,7 @@
  *           Mitani Hiroshi <hmitani@drl.mei.co.jp> 
  *           David Thomas <davtom@dream.org.uk>. 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c,v 1.13 2000/02/12 20:45:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c,v 1.14 2000/03/31 20:13:36 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -40,7 +40,30 @@
 #include "sis_regs.h"
 #include "sis_bios.h"
 
+static	void	SiSSave(ScrnInfoPtr pScrn, SISRegPtr sisReg);
+static	void	SiSRestore(ScrnInfoPtr pScrn, SISRegPtr sisReg);
 
+static	void	SiS300Save(ScrnInfoPtr pScrn, SISRegPtr sisReg);
+static	void	SiS301Save(ScrnInfoPtr pScrn, SISRegPtr sisReg);
+static	void	SiS300Restore(ScrnInfoPtr pScrn, SISRegPtr sisReg);
+static	void	SiS301Restore(ScrnInfoPtr pScrn, SISRegPtr sisReg);
+
+static	void	SiS301LoadPalette(ScrnInfoPtr pScrn, int numColors,
+			int *indicies, LOCO *colors, VisualPtr pVisual);
+
+static	void	SiS300Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High);
+static	void	SiS301Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High);
+static	void	SiS630Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High);
+static	void	SiS530Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High);
+static	void	SiSThreshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High);
+
+static	unsigned int	GetClock(int Num, int DeNum, int PostScale, int Div);
+
 int
 compute_vclk(
         int Clock,
@@ -322,16 +345,53 @@
 }
 
 
-void
-SiSRestore(ScrnInfoPtr pScrn, SISRegPtr sisReg)
+static void
+SiSSave(ScrnInfoPtr pScrn, SISRegPtr sisReg)
 {
     SISPtr pSiS = SISPTR(pScrn);
     int vgaIOBase;
     int i,max;
 
 	PDEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
-			"SiSRestore(ScrnInfoPtr pScrn, SISRegPtr sisReg)\n"));
+			"SiSSave(ScrnInfoPtr pScrn, SISRegPtr sisReg)\n"));
+
+    vgaHWGetIOBase(VGAHWPTR(pScrn));
+    vgaIOBase = VGAHWPTR(pScrn)->IOBase;
+
+    outw(VGA_SEQ_INDEX, 0x8605);
+
+    switch (pSiS->Chipset) {
+	case PCI_CHIP_SIS5597:
+           max=0x39;
+           break;
+	case PCI_CHIP_SIS6326:
+	case PCI_CHIP_SIS530:
+           max=0x3F;
+           break;
+	default:
+           max=0x37;
+           break;
+	}
+
+    for (i = 0x06; i <= max; i++) {
+        outb(VGA_SEQ_INDEX, i);
+	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+    		    "XR%02X Contents - %02X \n", i, inb(VGA_SEQ_DATA));
+	sisReg->sisRegs3C4[i] = inb(VGA_SEQ_DATA);
+    }
+
+    sisReg->sisRegs3C2 = inb(0x3CC);
+}
 
+static void
+SiSRestore(ScrnInfoPtr pScrn, SISRegPtr sisReg)
+{
+    SISPtr pSiS = SISPTR(pScrn);
+    int vgaIOBase;
+    int i,max;
+
+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+		"SiSRestore(ScrnInfoPtr pScrn, SISRegPtr sisReg)\n");
 
     vgaHWGetIOBase(VGAHWPTR(pScrn));
     vgaIOBase = VGAHWPTR(pScrn)->IOBase;
@@ -348,91 +408,127 @@
         case PCI_CHIP_SIS530:
 	   max=0x3F;
            break;
-        case PCI_CHIP_SIS300:
-        case PCI_CHIP_SIS630:
-        case PCI_CHIP_SIS540:
-           max=0x3D;
-           break;
 	default:
            max=0x37;
            break;
     }
 
-    if ((pSiS->Chipset == PCI_CHIP_SIS630) && (sisReg->sisRegs3C4[0x1e] & 0x40))
-	outw(VGA_SEQ_INDEX, sisReg->sisRegs3C4[0x20] << 8 | 0x20);
-
     for (i = 0x06; i <= max; i++) {
-	if (i== 0x1E || i==0x32) continue;
 	outb(VGA_SEQ_INDEX,i);
 	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO,4,
     		    "XR%X Contents - %02X ", i, inb(VGA_SEQ_DATA));
+
 	outb(VGA_SEQ_DATA,sisReg->sisRegs3C4[i]);
 
 	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO,4,
 			"Restore to - %02X Read after - %02X\n",
 			sisReg->sisRegs3C4[i], inb(VGA_SEQ_DATA));
     }
-    if ((pSiS->Chipset == PCI_CHIP_SIS300 || pSiS->Chipset == PCI_CHIP_SIS630 ||
-	pSiS->Chipset == PCI_CHIP_SIS540) && (sisReg->sisRegs3C4[0x1e] & 0x40))
-	SiSInitializeAccelerator(pScrn);
 
+    outb(0x3C2, sisReg->sisRegs3C2);
 
-    outw(vgaIOBase + 4, (sisReg->sisRegs3x4[Offset] << 8) | Offset);
-
-    outb(0x3C2, sisReg->sisRegs3C2[0x00]);
-
-
     /* MemClock needs this to take effect */
-     
-	outw(VGA_SEQ_INDEX, 0x0100);	/* Synchronous Reset */
-	outw(VGA_SEQ_INDEX, 0x0300);	/* End Reset */
+
+    outw(VGA_SEQ_INDEX, 0x0100);	/* Synchronous Reset */
+    outw(VGA_SEQ_INDEX, 0x0300);	/* End Reset */
 
 }
 
-void
-SiSSave(ScrnInfoPtr pScrn, SISRegPtr sisReg)
+static void
+SiS300Save(ScrnInfoPtr pScrn, SISRegPtr sisReg)
 {
     SISPtr pSiS = SISPTR(pScrn);
     int vgaIOBase;
     int i,max;
-    unsigned char temp;
 
 	PDEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
-			"SiSSave(ScrnInfoPtr pScrn, SISRegPtr sisReg)\n"));
+			"SiS300Save(ScrnInfoPtr pScrn, SISRegPtr sisReg)\n"));
 
     vgaHWGetIOBase(VGAHWPTR(pScrn));
     vgaIOBase = VGAHWPTR(pScrn)->IOBase;
 
-    outb(VGA_SEQ_INDEX, 0x05); /* Unlock Registers */
-    temp = inb(VGA_SEQ_DATA);
     outw(VGA_SEQ_INDEX, 0x8605);
 
-    switch (pSiS->Chipset) {
-	case PCI_CHIP_SIS5597:
-           max=0x39;
-           break;
-	case PCI_CHIP_SIS6326:
-	case PCI_CHIP_SIS530:
-           max=0x3F;
-           break;
-	case PCI_CHIP_SIS300:
-	case PCI_CHIP_SIS630:
-	case PCI_CHIP_SIS540:
-           max=0x3D;
-           break;
-	default:
-           max=0x37;
-           break;
-	}
+    max=0x3D;
 
     for (i = 0x06; i <= max; i++) {
         outb(VGA_SEQ_INDEX, i);
 	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
     		    "XR%02X Contents - %02X \n", i, inb(VGA_SEQ_DATA));
 	sisReg->sisRegs3C4[i] = inb(VGA_SEQ_DATA);
+    }
+
+    for (i=0x19; i<0x40; i++)  {
+	inSISIDXREG(pSiS->RelIO+CROFFSET, i, sisReg->sisRegs3D4[i]);
+    }
+
+    sisReg->sisRegs3C2 = inb(0x3CC);
+
+    if (pSiS->VBFlags & CRT2_ENABLE)
+	(*pSiS->SiSSave2)(pScrn, sisReg);
+}
+
+static void
+SiS300Restore(ScrnInfoPtr pScrn, SISRegPtr sisReg)
+{
+    SISPtr pSiS = SISPTR(pScrn);
+    int vgaIOBase;
+    int i,max, temp;
+
+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+		"SiS300Restore(ScrnInfoPtr pScrn, SISRegPtr sisReg)\n");
+
+    vgaHWGetIOBase(VGAHWPTR(pScrn));
+    vgaIOBase = VGAHWPTR(pScrn)->IOBase;
+
+    outw(VGA_SEQ_INDEX, 0x8605);
+    inSISIDXREG(VGA_SEQ_INDEX, 0x1E, temp);
+    if (temp & 0x42)  {
+	while ( (MMIO_IN16(pSiS->IOBase, 0x8242) & 0xE000) != 0xE000){};
+    }
+
+    max=0x3D;
+    for (i = 0x19; i < 0x40; i++)  {
+	outSISIDXREG(pSiS->RelIO+CROFFSET, i, sisReg->sisRegs3D4[i]);
+    }
+    if (pSiS->Chipset != PCI_CHIP_SIS300)  {
+	   outSISIDXREG(pSiS->RelIO+CROFFSET, 0x1A, sisReg->sisRegs3D4[0x19]);
+	   outSISIDXREG(pSiS->RelIO+CROFFSET, 0x19, sisReg->sisRegs3D4[0x1A]);
+    }
+
+    if ((pSiS->Chipset == PCI_CHIP_SIS630) && (sisReg->sisRegs3C4[0x1e] & 0x40))
+	outw(VGA_SEQ_INDEX, sisReg->sisRegs3C4[0x20] << 8 | 0x20);
+
+    for (i = 0x06; i <= max; i++) {
+	outb(VGA_SEQ_INDEX,i);
+	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO,4,
+    		    "XR%X Contents - %02X ", i, inb(VGA_SEQ_DATA));
+
+	outb(VGA_SEQ_DATA,sisReg->sisRegs3C4[i]);
 
+	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO,4,
+			"Restore to - %02X Read after - %02X\n",
+			sisReg->sisRegs3C4[i], inb(VGA_SEQ_DATA));
     }
-	/* for SiS301 */
+    if (pSiS->VBFlags & CRT2_ENABLE)  {	/* For SiS301 */
+	(*pSiS->SiSRestore2)(pScrn, sisReg);
+    }
+
+    outb(0x3C2, sisReg->sisRegs3C2);
+
+    /* MemClock needs this to take effect */
+     
+    outw(VGA_SEQ_INDEX, 0x0100);	/* Synchronous Reset */
+    outw(VGA_SEQ_INDEX, 0x0300);	/* End Reset */
+}
+
+static void
+SiS301Save(ScrnInfoPtr pScrn, SISRegPtr sisReg)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+	int	i;
+
+	/* for SiS301 only */
 	for (i=0; i<0x29; i++)  {
 		inSISIDXREG(pSiS->RelIO+4, i, sisReg->VBPart1[i]);
 	}
@@ -445,13 +541,46 @@
 	for (i=0; i<0x1C; i++)  {
 		inSISIDXREG(pSiS->RelIO+0x14, i, sisReg->VBPart4[i]);
 	}
+	sisReg->VBPart2[0] &= ~0x20;	/* Disable VB Processor */
+	sisReg->sisRegs3C4[0x32] &= ~0x20;	/* Disable Lock Mode */
+}
+
+static void
+SiS301Restore(ScrnInfoPtr pScrn, SISRegPtr sisReg)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+
+	DisableBridge(pSiS->RelIO);
+	UnLockCRT2(pSiS->RelIO);
 
-    outb(vgaIOBase + 4, Offset);
-    sisReg->sisRegs3x4[Offset] = inb(VGA_SEQ_DATA);
-    
-    sisReg->sisRegs3C2[0x00] = inb(0x3CC);
+	/* SetCRT2ModeRegs() */
+	outSISIDXREG(pSiS->RelIO+0x04, 4, 0);
+	outSISIDXREG(pSiS->RelIO+0x04, 5, 0);
+	outSISIDXREG(pSiS->RelIO+0x04, 6, 0);
+	outSISIDXREG(pSiS->RelIO+0x04, 0, sisReg->VBPart1[0]);
+	outSISIDXREG(pSiS->RelIO+0x04, 1, sisReg->VBPart1[1]);
+	outSISIDXREG(pSiS->RelIO+0x14, 0x0D, sisReg->VBPart4[0x0D]);
+	outSISIDXREG(pSiS->RelIO+0x14, 0x0C, sisReg->VBPart4[0x0C]);
+
+	if (!(sisReg->sisRegs3D4[0x30] & 0x03) &&
+	     (sisReg->sisRegs3D4[0x31] & 0x20))  {	/* disable CRT2 */
+		LockCRT2(pSiS->RelIO);
+		return;
+	}
+	SetBlock(pSiS->RelIO+0x04, 0x02, 0x23, &(sisReg->VBPart1[0x02]));
+	SetBlock(pSiS->RelIO+0x10, 0x00, 0x45, &(sisReg->VBPart2[0x00]));
+	SetBlock(pSiS->RelIO+0x12, 0x00, 0x3E, &(sisReg->VBPart3[0x00]));
+	SetBlock(pSiS->RelIO+0x14, 0x0E, 0x11, &(sisReg->VBPart4[0x0E]));
+	SetBlock(pSiS->RelIO+0x14, 0x13, 0x1B, &(sisReg->VBPart4[0x13]));
+
+	outSISIDXREG(pSiS->RelIO+0x14, 0x0A, 1);
+	outSISIDXREG(pSiS->RelIO+0x14, 0x0B, sisReg->VBPart4[0x0B]);
+	outSISIDXREG(pSiS->RelIO+0x14, 0x0A, sisReg->VBPart4[0x0A]);
+	outSISIDXREG(pSiS->RelIO+0x14, 0x12, 0);
+	outSISIDXREG(pSiS->RelIO+0x14, 0x12, sisReg->VBPart4[0x12]);
 
-    outw(VGA_SEQ_INDEX, (temp << 8) | 0x05); /* Relock Registers */
+	EnableBridge(pSiS->RelIO);
+	LockCRT2(pSiS->RelIO);
 }
 
 unsigned int
@@ -576,18 +705,328 @@
 int sis300MemBandWidth(ScrnInfoPtr pScrn)
 {
 	SISPtr		pSiS = SISPTR(pScrn);
-	int		bus = 64;
+	int		bus = pSiS->BusWidth;
 	int		mclk = pSiS->MemClock;
 	int		bpp = pScrn->bitsPerPixel;
-	float		magic;
+	float		magic, total;
 
 	if (pSiS->Chipset==PCI_CHIP_SIS300)
 		magic = magic300[bus/64];
 	else
 		magic = magic630[bus/64];
+
+	PDEBUG(ErrorF("mclk: %d, bus: %d, magic: %g, bpp: %d\n",
+			mclk, bus, magic, bpp));
+
+	total = mclk*bus/bpp;
+	ErrorF("Total Adapter Bandwidth is %gM\n", total/1000);
+	if (pSiS->VBFlags & CRT2_ENABLE)  {
+		if (total/2 > 540000)
+			total = total - 540000;
+		else
+			total = total/2;
+		ErrorF("CRT1 Used Bandwidth is %gM\n", total/1000);
+	}
+
+	return  (int)(total/magic);
+}
+
+void
+SISLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies, LOCO *colors,
+		VisualPtr pVisual)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+	int	i, index;
+
+	PDEBUG(ErrorF("SISLoadPalette(%d)\n", numColors));
+	for (i=0; i<numColors; i++)  {
+		index = indicies[i];
+		outSISREG(0x3c8, index);
+		outSISREG(0x3c9, colors[index].red >> 2);
+		outSISREG(0x3c9, colors[index].green >> 2);
+		outSISREG(0x3c9, colors[index].blue >> 2);
+	}
+	if (pSiS->VBFlags & CRT2_ENABLE)  {
+		(*pSiS->LoadCRT2Palette)(pScrn, numColors, indicies,
+						colors, pVisual);
+	}
+}
+static	void
+SiS301LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
+					LOCO *colors, VisualPtr pVisual)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+	int	i, index;
+
+	PDEBUG(ErrorF("SiS301LoadPalette(%d)\n", numColors));
+	for (i=0; i<numColors; i++)  {
+		index = indicies[i];
+		outSISREG(pSiS->RelIO+0x16, index);
+		outSISREG(pSiS->RelIO+0x17, colors[index].red);
+		outSISREG(pSiS->RelIO+0x17, colors[index].green);
+		outSISREG(pSiS->RelIO+0x17, colors[index].blue);
+	}
+}
 
-ErrorF("mclk: %d, bus: %d, magic: %g, bpp: %d\n", mclk, bus, magic, bpp);
-	return  (int)(mclk*bus/magic/bpp);
+
+struct QConfig  {
+	int	GT;
+	int	QC;
+};
+
+static	struct	QConfig qconfig[20] = {
+	{1, 0x0}, {1, 0x2}, {1, 0x4}, {1, 0x6}, {1, 0x8},
+	{1, 0x3}, {1, 0x5}, {1, 0x7}, {1, 0x9}, {1, 0xb},
+	{0, 0x0}, {0, 0x2}, {0, 0x4}, {0, 0x6}, {0, 0x8},
+	{0, 0x3}, {0, 0x5}, {0, 0x7}, {0, 0x9}, {0, 0xb}};
+
+static	int cycleA[20][2] = {
+	{88,88}, {80,80}, {78,78}, {72,72}, {70,70},
+	{79,72}, {77,70}, {71,64}, {69,62}, {49,44},
+	{73,78}, {65,70}, {63,68}, {57,62}, {55,60},
+	{64,62}, {62,60}, {56,54}, {54,52}, {34,34}};
+
+static	void
+SiS630Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High)
+{
+	SISPtr		pSiS = SISPTR(pScrn);
+	int		mclk = pSiS->MemClock;
+	int		vclk = mode->Clock;
+	int		bpp = pScrn->bitsPerPixel/8;
+	int		buswidth = pSiS->BusWidth;
+	CARD32		temp;
+	PCITAG		NBridge;
+	int		cyclea;
+	int		low, lowa;
+
+	int		i, j;
+
+
+	if (!bpp)	bpp = 1;
+
+	i = 0;
+	j = buswidth/128;
+
+	while (1)  {
+#ifdef	DEBUG
+		ErrorF("Config %d GT = %d, QC = %x, CycleA = %d\n",
+			i, qconfig[i].GT, qconfig[i].QC, cycleA[i][j]);
+#endif
+		cyclea = cycleA[i][j];
+		lowa = cyclea * vclk * bpp;
+		lowa = (lowa + (mclk-1)) / mclk;
+		lowa = (lowa + 15) / 16;
+		low = lowa + 1;
+		if (low <= 0x13)
+			break;
+		else
+			if (i < 19)
+				i++;
+			else  {
+				low = 0x13;
+				PDEBUG(ErrorF("This mode may has threshold "
+					"problem and had better removed\n"));
+				break;
+			}
+	}
+	PDEBUG(ErrorF("Using Config %d with CycleA = %d\n", i, cyclea));
+	*Low = low;
+	if (lowa+4 > 15)
+		*High = 0x0F;
+	else
+		*High = lowa+4;
+
+	/* write PCI configuration space */
+	NBridge = pciTag(0, 0, 0);
+	temp = pciReadLong(NBridge, 0x50);
+	temp &= 0xF0FFFFFF;
+	temp |= qconfig[i].QC << 24;
+	pciWriteLong(NBridge, 0x50, temp);
+
+	temp = pciReadLong(NBridge, 0xA0);
+	temp &= 0xF0FFFFFF;
+	temp |= qconfig[i].GT << 24;
+	pciWriteLong(NBridge, 0xA0, temp);
+
+
+}
+
+struct funcargc {
+	char	base;
+	char	inc;
+};
+
+static	struct funcargc funca[12] = {
+	{61, 3}, {52, 5}, {68, 7}, {100, 11},
+	{43, 3}, {42, 5}, {54, 7}, {78, 11},
+	{34, 3}, {37, 5}, {47, 7}, {67, 11}};
+static	struct funcargc funcb[12] = {
+	{81, 4}, {72, 6}, {88, 8}, {120, 12},
+	{55, 4}, {54, 6}, {66, 8}, {90, 12},
+	{42, 4}, {45, 6}, {55, 8}, {75, 12}};
+static	char timing[8] = {1, 2, 2, 3, 0, 1, 1, 2};
+
+static	void
+SiS300Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High)
+{
+	SISPtr		pSiS = SISPTR(pScrn);
+	SISRegPtr	pReg = &pSiS->ModeReg;
+	int		mclk = pSiS->MemClock;
+	int		vclk = mode->Clock;
+	int		bpp = pScrn->bitsPerPixel/8;
+	int		lowa, lowb, low;
+	struct funcargc	*p;
+	unsigned int	i, j;
+
+	pReg->sisRegs3C4[0x16] = pSiS->SavedReg.sisRegs3C4[0x16];
+
+	if (!bpp)	bpp = 1;
+
+	do {
+		i = GETBITSTR(pReg->sisRegs3C4[0x18], 6:5, 2:1) |
+		      GETBITS(pReg->sisRegs3C4[0x18], 1:1);
+		j = GETBITSTR(pReg->sisRegs3C4[0x14], 7:6, 3:2) |
+		      GETBITS(pReg->sisRegs3C4[0x16], 7:6);
+		p = &funca[j];
+
+		lowa = (p->base + p->inc*timing[i])*vclk*bpp;
+		lowa = (lowa + (mclk-1)) / mclk;
+		lowa = (lowa + 15)/16;
+
+		p = &funcb[j];
+		lowb = (p->base + p->inc*timing[i])*vclk*bpp;
+		lowb = (lowb + (mclk-1)) / mclk;
+		lowb = (lowb + 15)/16;
+
+		if (lowb < 4)
+			lowb = 0;
+		else
+			lowb -= 4;
+
+		low = (lowa > lowb)? lowa: lowb;
+
+		low++;
+
+		if (low <= 0x13) {
+			break;
+		} else {
+			i = GETBITS(pReg->sisRegs3C4[0x16], 7:6);
+			if (!i) {
+				low = 0x13;
+				break;
+			} else {
+				i--;
+				pReg->sisRegs3C4[0x16] &= 0x3C;
+				pReg->sisRegs3C4[0x16] |= (i << 6);
+			}
+		}
+	} while (1);
+
+	*Low = low;
+	if (low+3 > 15)
+		*High = 0x0F;
+	else
+		*High = low+3;
+}
+
+static	void
+SiS301Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+	SISRegPtr	sisReg = &pSiS->ModeReg;
+	unsigned int	delay;
+	unsigned int	mclk = pSiS->MemClock/1000;
+	unsigned int	dclk = mode->Clock/1000;
+	unsigned int	buswidth = pSiS->BusWidth/8;
+	unsigned int	bpp = (pScrn->bitsPerPixel+7)/8;
+	unsigned int	tclk;
+	int	i, GT, QC, idx, timing_idx, CRT1RP;
+	int	Num, DeNum, PostScale, Div; 		/* for clock gen */
+	PCITAG	NBridge;
+
+	/* Get Delay */
+	if (pSiS->Chipset == PCI_CHIP_SIS300)  {
+		idx = GETBITS(sisReg->sisRegs3C4[0x16], 7:6) |
+			GETBITSTR(sisReg->sisRegs3C4[0x14], 7:6, 3:2);
+		timing_idx = GETBITS(sisReg->sisRegs3C4[0x18], 0:0) |
+				GETBITSTR(sisReg->sisRegs3C4[0x18], 6:5, 2:1);
+		delay = funcb[idx].base + funcb[idx].inc * timing[timing_idx];
+	} else {
+		NBridge = pciTag(0,0,0);
+		QC = GETBITS(pciReadLong(NBridge, 0x50), 27:24);
+		GT = GETBITS(pciReadLong(NBridge, 0xA0), 27:24);
+		for (i=0; i<20; i++)  {
+			if ((qconfig[i].QC == QC) && (qconfig[i].GT==GT))
+				break;
+		}
+		if (buswidth == 8)	/* 64-bits */
+			delay = cycleA[i][0]+20;
+		else
+			delay = cycleA[i][1]+15;
+	}
+	/* Get TCLK */
+	Num = GETBITS(sisReg->VBPart4[0x0A], 6:0);
+	DeNum = GETBITS(sisReg->VBPart4[0x0B], 4:0);
+	PostScale = GETBITS(sisReg->VBPart4[0x0B], 7:5);
+	Div = GETBITS(sisReg->VBPart4[0x0A], 7:7);
+	tclk = GetClock(Num, DeNum, PostScale, Div);
+
+	CRT1RP = delay +
+		(int)(28*16/(buswidth - 1.0*dclk*bpp/mclk) + 0.9999);
+	*Low = 1.0*CRT1RP*tclk*bpp/(16*mclk) + 0.9999;	/* Roundup */
+
+	if (*Low < 6)		*Low = 6;
+	if (*Low > 0x14)	*Low = 0x14;
+	
+	*High = 0x16;
+	if (pSiS->Chipset == PCI_CHIP_SIS300)  {
+		if (*Low <= 0x0F)
+			*High = 0x13;
+	}
+}
+
+static	void
+SiS530Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+	unsigned int	factor, z;
+	unsigned int	vclk = mode->Clock,
+			bpp = pScrn->bitsPerPixel,
+			mclk = pSiS->MemClock,
+			buswidth = pSiS->BusWidth;
+	
+	if (pSiS->Flags & UMA)
+		factor = 0x60;
+	else
+		factor = 0x30;
+	z = factor * vclk * bpp;
+	z = z / mclk / buswidth;
+	*Low = (z+1)/2 + 4;
+	if (*Low > 0x1F)
+		*Low = 0x1F;
+
+	*High = 0x1F;
+}
+
+static	void
+SiSThreshold(ScrnInfoPtr pScrn, DisplayModePtr mode,
+				unsigned short *Low, unsigned short *High)
+{
+
+}
+
+static unsigned int
+GetClock(int Num, int DeNum, int PostScale, int Div)
+{
+	Num++;
+	DeNum++;
+	Div++;
+	PostScale = (GETBITS(PostScale, 1:0)+1) * (GETBITS(PostScale, 2:2)+1);
+	return 14318.18*Num*Div/(DeNum*PostScale);
 }
 
 void SiSIODump(ScrnInfoPtr pScrn)
@@ -673,3 +1112,49 @@
     outw(0x3c4, SR5State << 8 | 0x05);
 }
 
+void
+SISDACPreInit(ScrnInfoPtr pScrn)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+
+	switch (pSiS->Chipset)  {
+	case PCI_CHIP_SIS630:
+	case PCI_CHIP_SIS540:
+		pSiS->MaxClock = sis300MemBandWidth(pScrn);
+		pSiS->SiSSave		= SiS300Save;
+		pSiS->SiSSave2		= SiS301Save;
+		pSiS->SiSRestore	= SiS300Restore;
+		pSiS->SiSRestore2	= SiS301Restore;
+		pSiS->LoadCRT2Palette	= SiS301LoadPalette;
+		pSiS->SetThreshold	= SiS630Threshold;
+		pSiS->SetThreshold2	= SiS301Threshold;
+		break;
+	case PCI_CHIP_SIS300:
+		pSiS->MaxClock = sis300MemBandWidth(pScrn);
+		pSiS->SiSSave		= SiS300Save;
+		pSiS->SiSSave2		= SiS301Save;
+		pSiS->SiSRestore	= SiS300Restore;
+		pSiS->SiSRestore2	= SiS301Restore;
+		pSiS->LoadCRT2Palette	= SiS301LoadPalette;
+		pSiS->SetThreshold	= SiS300Threshold;
+		pSiS->SetThreshold2	= SiS301Threshold;
+		break;
+	case PCI_CHIP_SIS530:
+		pSiS->MaxClock = 230000;	/* Guest */
+		pSiS->SiSRestore	= SiSRestore;
+		pSiS->SiSSave		= SiSSave;
+		pSiS->SetThreshold	= SiS530Threshold;
+		break;
+	case PCI_CHIP_SIS6326:
+		pSiS->MaxClock = 175000;	/* Guest */
+		pSiS->SiSRestore	= SiSRestore;
+		pSiS->SiSSave		= SiSSave;
+		pSiS->SetThreshold	= SiSThreshold;
+		break;
+	default:
+		pSiS->MaxClock = 135000;	/* Guest */
+		pSiS->SiSRestore	= SiSRestore;
+		pSiS->SiSSave		= SiSSave;
+		pSiS->SetThreshold	= SiSThreshold;
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dga.c:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dga.c	Mon Jun 26 03:26:15 2000
@@ -0,0 +1,292 @@
+/*
+ * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dga.c,v 1.1 2000/06/26 10:26:15 alanh Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Pci.h"
+#include "xf86PciInfo.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "sis.h"
+#include "sis_regs.h"
+#include "dgaproc.h"
+
+static Bool SIS_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+					int *, int *, int *);
+static Bool SIS_SetMode(ScrnInfoPtr, DGAModePtr);
+static void SIS_Sync(ScrnInfoPtr);
+static int  SIS_GetViewport(ScrnInfoPtr);
+static void SIS_SetViewport(ScrnInfoPtr, int, int, int);
+static void SIS_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+static void SIS_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+static void SIS_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, 
+					unsigned long);
+
+static
+DGAFunctionRec SISDGAFuncs = {
+   SIS_OpenFramebuffer,
+   NULL,
+   SIS_SetMode,
+   SIS_SetViewport,
+   SIS_GetViewport,
+   SIS_Sync,
+   SIS_FillRect,
+   SIS_BlitRect,
+#if 0
+   SIS_BlitTransRect
+#else
+   NULL
+#endif
+};
+
+Bool
+SISDGAInit(ScreenPtr pScreen)
+{   
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   SISPtr pSIS = SISPTR(pScrn);
+   DGAModePtr modes = NULL, newmodes = NULL, currentMode;
+   DisplayModePtr pMode, firstMode;
+   int Bpp = pScrn->bitsPerPixel >> 3;
+   int num = 0;
+   Bool oneMore;
+
+   pMode = firstMode = pScrn->modes;
+
+   while(pMode) {
+
+	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
+	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+	    oneMore = TRUE;
+	} else {
+	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+	    oneMore = FALSE;
+	}
+
+	if(!newmodes) {
+	   xfree(modes);
+	   return FALSE;
+	}
+	modes = newmodes;
+
+SECOND_PASS:
+
+	currentMode = modes + num;
+	num++;
+
+	currentMode->mode = pMode;
+	currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
+	currentMode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
+	if(pMode->Flags & V_DBLSCAN)
+	   currentMode->flags |= DGA_DOUBLESCAN;
+	if(pMode->Flags & V_INTERLACE)
+	   currentMode->flags |= DGA_INTERLACED;
+	currentMode->byteOrder = pScrn->imageByteOrder;
+	currentMode->depth = pScrn->depth;
+	currentMode->bitsPerPixel = pScrn->bitsPerPixel;
+	currentMode->red_mask = pScrn->mask.red;
+	currentMode->green_mask = pScrn->mask.green;
+	currentMode->blue_mask = pScrn->mask.blue;
+	currentMode->visualClass = (Bpp == 1) ? PseudoColor : TrueColor;
+	currentMode->viewportWidth = pMode->HDisplay;
+	currentMode->viewportHeight = pMode->VDisplay;
+	currentMode->xViewportStep = 1;
+	currentMode->yViewportStep = 1;
+	currentMode->viewportFlags = DGA_FLIP_RETRACE;
+	currentMode->offset = 0;
+	currentMode->address = pSIS->FbBase;
+
+	if(oneMore) { /* first one is narrow width */
+	    currentMode->bytesPerScanline = ((pMode->HDisplay * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pMode->HDisplay;
+	    currentMode->imageHeight =  pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	    oneMore = FALSE;
+	    goto SECOND_PASS;
+	} else {
+	    currentMode->bytesPerScanline = 
+			((pScrn->displayWidth * Bpp) + 3) & ~3L;
+	    currentMode->imageWidth = pScrn->displayWidth;
+	    currentMode->imageHeight =  pMode->VDisplay;
+	    currentMode->pixmapWidth = currentMode->imageWidth;
+	    currentMode->pixmapHeight = currentMode->imageHeight;
+	    currentMode->maxViewportX = currentMode->imageWidth - 
+					currentMode->viewportWidth;
+	    /* this might need to get clamped to some maximum */
+	    currentMode->maxViewportY = currentMode->imageHeight -
+					currentMode->viewportHeight;
+	}	    
+
+	pMode = pMode->next;
+	if(pMode == firstMode)
+	   break;
+   }
+
+   pSIS->numDGAModes = num;
+   pSIS->DGAModes = modes;
+
+   return DGAInit(pScreen, &SISDGAFuncs, modes, num);  
+}
+
+
+static Bool
+SIS_SetMode(
+   ScrnInfoPtr pScrn,
+   DGAModePtr pMode
+){
+   static int OldDisplayWidth[MAXSCREENS];
+   int index = pScrn->pScreen->myNum;
+   SISPtr pSIS = SISPTR(pScrn);
+
+   if(!pMode) { /* restore the original mode */
+	/* put the ScreenParameters back */
+	
+	pScrn->displayWidth = OldDisplayWidth[index];
+	
+        SISSwitchMode(index, pScrn->currentMode, 0);
+	pSIS->DGAactive = FALSE;
+   } else {
+	if(!pSIS->DGAactive) {  /* save the old parameters */
+	    OldDisplayWidth[index] = pScrn->displayWidth;
+
+	    pSIS->DGAactive = TRUE;
+	}
+
+	pScrn->displayWidth = pMode->bytesPerScanline / 
+			      (pMode->bitsPerPixel >> 3);
+
+        SISSwitchMode(index, pMode->mode, 0);
+   }
+   
+   return TRUE;
+}
+
+static int  
+SIS_GetViewport(
+  ScrnInfoPtr pScrn
+){
+    SISPtr pSIS = SISPTR(pScrn);
+
+    return pSIS->DGAViewportStatus;
+}
+
+static void 
+SIS_SetViewport(
+   ScrnInfoPtr pScrn, 
+   int x, int y, 
+   int flags
+){
+   SISPtr pSIS = SISPTR(pScrn);
+
+   SISAdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+   pSIS->DGAViewportStatus = 0;  /* SISAdjustFrame loops until finished */
+}
+
+static void 
+SIS_FillRect (
+   ScrnInfoPtr pScrn, 
+   int x, int y, int w, int h, 
+   unsigned long color
+){
+    SISPtr pSIS = SISPTR(pScrn);
+
+    if(pSIS->AccelInfoPtr) {
+	(*pSIS->AccelInfoPtr->SetupForSolidFill)(pScrn, color, GXcopy, ~0);
+	(*pSIS->AccelInfoPtr->SubsequentSolidFillRect)(pScrn, x, y, w, h);
+	SET_SYNC_FLAG(pSIS->AccelInfoPtr);
+    }
+}
+
+static void 
+SIS_Sync(
+   ScrnInfoPtr pScrn
+){
+    SISPtr pSIS = SISPTR(pScrn);
+
+    if(pSIS->AccelInfoPtr) {
+	(*pSIS->AccelInfoPtr->Sync)(pScrn);
+    }
+}
+
+static void 
+SIS_BlitRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty
+){
+    SISPtr pSIS = SISPTR(pScrn);
+
+    if(pSIS->AccelInfoPtr) {
+	int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
+	int ydir = (srcy < dsty) ? -1 : 1;
+
+	(*pSIS->AccelInfoPtr->SetupForScreenToScreenCopy)(
+		pScrn, xdir, ydir, GXcopy, ~0, -1);
+	(*pSIS->AccelInfoPtr->SubsequentScreenToScreenCopy)(
+		pScrn, srcx, srcy, dstx, dsty, w, h);
+	SET_SYNC_FLAG(pSIS->AccelInfoPtr);
+    }
+}
+
+
+static void 
+SIS_BlitTransRect(
+   ScrnInfoPtr pScrn, 
+   int srcx, int srcy, 
+   int w, int h, 
+   int dstx, int dsty,
+   unsigned long color
+){
+  /* this one should be separate since the XAA function would
+     prohibit usage of ~0 as the key */
+}
+
+
+static Bool 
+SIS_OpenFramebuffer(
+   ScrnInfoPtr pScrn, 
+   char **name,
+   unsigned char **mem,
+   int *size,
+   int *offset,
+   int *flags
+){
+    SISPtr pSIS = SISPTR(pScrn);
+
+    *name = NULL; 		/* no special device */
+    *mem = (unsigned char*)pSIS->FbAddress;
+    *size = pSIS->FbMapSize;
+    *offset = 0;
+    *flags = DGA_NEED_ROOT;
+
+    return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c:1.43 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c:1.47
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c:1.43	Fri Mar  3 13:26:18 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c	Mon Jun 26 03:26:16 2000
@@ -25,7 +25,7 @@
  *           Mitani Hiroshi <hmitani@drl.mei.co.jp> 
  *           David Thomas <davtom@dream.org.uk>. 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v 1.43 2000/03/03 21:26:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v 1.47 2000/06/26 10:26:16 alanh Exp $ */
 
 
 #define PSZ 8
@@ -79,11 +79,6 @@
 static Bool	SISCloseScreen(int scrnIndex, ScreenPtr pScreen);
 static Bool	SISSaveScreen(ScreenPtr pScreen, int mode);
 
-/* Required if the driver supports mode switching */
-static Bool	SISSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-/* Required if the driver supports moving the viewport */
-static void	SISAdjustFrame(int scrnIndex, int x, int y, int flags);
-
 /* Optional functions */
 static void	SISFreeScreen(int scrnIndex, int flags);
 static int	SISValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
@@ -94,6 +89,8 @@
 static Bool	SISUnmapMem(ScrnInfoPtr pScrn);
 static void	SISSave(ScrnInfoPtr pScrn);
 static void	SISRestore(ScrnInfoPtr pScrn);
+static Bool	SISModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
+static void	SISModifyModeInfo(DisplayModePtr mode);
 
 #ifdef	DEBUG
 static void	SiSDumpModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode);
@@ -126,7 +123,7 @@
 };
 
 static SymTabRec SISChipsets[] = {
-#if 0
+#if 0 
     { PCI_CHIP_SG86C201,	"SIS86c201" },
     { PCI_CHIP_SG86C202,	"SIS86c202" },
     { PCI_CHIP_SG86C205,	"SIS86c205" },
@@ -426,35 +423,37 @@
 
     /* Free it since we don't need that list after this */
     if (devSections)
-	xfree(devSections);
+        xfree(devSections);
     devSections = NULL;
     if (numUsed <= 0)
 	return FALSE;
 
     if (flags & PROBE_DETECT)
-	foundScreen = TRUE;
+        foundScreen = TRUE;
     else for (i = 0; i < numUsed; i++) {
 	ScrnInfoPtr pScrn;
 
 	/* Allocate a ScrnInfoRec and claim the slot */
-	pScrn = xf86AllocateScreen(drv, 0);
+	pScrn = NULL;
 
-	/* Fill in what we can of the ScrnInfoRec */
-	pScrn->driverVersion	= SIS_CURRENT_VERSION;
-	pScrn->driverName	= SIS_DRIVER_NAME;
-	pScrn->name		= SIS_NAME;
-	pScrn->Probe		= SISProbe;
-	pScrn->PreInit		= SISPreInit;
-	pScrn->ScreenInit	= SISScreenInit;
-	pScrn->SwitchMode	= SISSwitchMode;
-	pScrn->AdjustFrame	= SISAdjustFrame;
-	pScrn->EnterVT		= SISEnterVT;
-	pScrn->LeaveVT		= SISLeaveVT;
-	pScrn->FreeScreen	= SISFreeScreen;
-	pScrn->ValidMode	= SISValidMode;
-	foundScreen = TRUE;
-	xf86ConfigActivePciEntity(pScrn, usedChips[i], SISPciChipsets,
-				  NULL, NULL, NULL, NULL, NULL);
+	if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
+					       SISPciChipsets, NULL, NULL,
+					       NULL, NULL, NULL))) {
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion	= SIS_CURRENT_VERSION;
+	    pScrn->driverName	= SIS_DRIVER_NAME;
+	    pScrn->name		= SIS_NAME;
+	    pScrn->Probe		= SISProbe;
+	    pScrn->PreInit		= SISPreInit;
+	    pScrn->ScreenInit	= SISScreenInit;
+	    pScrn->SwitchMode	= SISSwitchMode;
+	    pScrn->AdjustFrame	= SISAdjustFrame;
+	    pScrn->EnterVT		= SISEnterVT;
+	    pScrn->LeaveVT		= SISLeaveVT;
+	    pScrn->FreeScreen	= SISFreeScreen;
+	    pScrn->ValidMode	= SISValidMode;
+	    foundScreen = TRUE;
+	}
     }
     xfree(usedChips);
     return foundScreen;
@@ -582,6 +581,7 @@
 	/* Check that the returned depth is one we support */
 	switch (pScrn->depth) {
 	case 8:
+	case 15:
 	case 16:
 	case 24:
 	    /* OK */
@@ -765,11 +765,10 @@
 
     pSiS->FbMapSize = pScrn->videoRam * 1024;
 
-    SiSVGASetup(pScrn);
-#if 0
-    SiSLCDPreInit(pScrn);
-    SiSTVPreInit(pScrn);
-#endif
+    SISVGAPreInit(pScrn);
+    SISLCDPreInit(pScrn);
+    SISTVPreInit(pScrn);
+    SISDACPreInit(pScrn);
 
     outw(VGA_SEQ_INDEX, (unlock << 8) | 0x05);
 
@@ -813,7 +812,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = xnfalloc(sizeof(ClockRange));
+    clockRanges = xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->minClock = pSiS->MinClock;
     clockRanges->maxClock = pSiS->MaxClock;
@@ -1037,8 +1036,67 @@
     sisReg = &pSiS->SavedReg;
 
     vgaHWSave(pScrn, vgaReg, VGA_SR_ALL);
+
+    (*pSiS->SiSSave)(pScrn, sisReg);
+}
+
+/*
+ * Initialise a new mode.  This is currently still using the old
+ * "initialise struct, restore/write struct to HW" model.  That could
+ * be changed.
+ */
+
+static Bool
+SISModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
+{
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    vgaRegPtr vgaReg;
+    SISPtr pSiS = SISPTR(pScrn);
+    SISRegPtr sisReg;
+
+    vgaHWUnlock(hwp);
+
+    SISModifyModeInfo(mode);
+
+    /* Initialise the ModeReg values */
+    if (!vgaHWInit(pScrn, mode))
+	return FALSE;
+    pScrn->vtSema = TRUE;
+
+    if (!(*pSiS->ModeInit)(pScrn, mode))
+	return FALSE;
+
+    if (pSiS->VBFlags & CRT2_ENABLE)
+	if (!(*pSiS->ModeInit2)(pScrn, mode))  {	/* Disable VB */
+		pSiS->ModeReg.sisRegs3D4[0x31] |= 0x60;
+		pSiS->ModeReg.sisRegs3D4[0x30] &= 0xFC;
+	}
+
+    PDEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		"HDisplay: %d, VDisplay: %d  \n",
+		mode->HDisplay, mode->VDisplay));
+
+    /* Program the registers */
+    vgaHWProtect(pScrn, TRUE);
+    vgaReg = &hwp->ModeReg;
+    sisReg = &pSiS->ModeReg;
+
+    vgaReg->Attribute[0x10] = 0x01;
+    if (pScrn->bitsPerPixel > 8) 
+    	vgaReg->Graphics[0x05] = 0x00;
 
-    SiSSave(pScrn, sisReg);
+    vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
+
+    (*pSiS->SiSRestore)(pScrn, sisReg);
+
+    vgaHWProtect(pScrn, FALSE);
+
+/* Reserved for debug
+ *
+    SiSDumpModeInfo(pScrn, mode);
+ *
+ */
+    return TRUE;
 }
 
 
@@ -1052,7 +1110,6 @@
     vgaRegPtr vgaReg;
     SISPtr pSiS;
     SISRegPtr sisReg;
-	unsigned char	temp;
 
     hwp = VGAHWPTR(pScrn);
     pSiS = SISPTR(pScrn);
@@ -1061,58 +1118,8 @@
 
     vgaHWProtect(pScrn, TRUE);
 
-    if (pSiS->VBFlags)  {
-	setSISIDXREG(pSiS->RelIO+CROFFSET, 0x30, 0xFC, SET_SIMU_SCAN_MODE);
+    (*pSiS->SiSRestore)(pScrn, sisReg);
 
-	inSISIDXREG(pSiS->RelIO+CROFFSET, 0x31, temp);
-	temp &= ~((DRIVER_MODE | DISABLE_CRT2_DISPLAY ) >> 8);
-	temp |= (SET_IN_SLAVE_MODE >> 8);
-	outSISIDXREG(pSiS->RelIO+CROFFSET, 0x31, temp);
-    }
-
-    SiSRestore(pScrn, sisReg);
-
-    if (pSiS->VBFlags)  {
-	/* for SiS301 */
-	DisableBridge(pSiS->RelIO);
-	UnLockCRT2(pSiS->RelIO);
-
-	/* SetCRT2ModeRegs() */
-	outSISIDXREG(pSiS->RelIO+4, 4, 0);
-	outSISIDXREG(pSiS->RelIO+4, 5, 0);
-	outSISIDXREG(pSiS->RelIO+4, 6, 0);
-	outSISIDXREG(pSiS->RelIO+4, 0, sisReg->VBPart1[0]);
-	outSISIDXREG(pSiS->RelIO+4, 1, sisReg->VBPart1[1]);
-	outSISIDXREG(pSiS->RelIO+0x14, 0x0D, sisReg->VBPart4[0x0D]);
-	outSISIDXREG(pSiS->RelIO+0x14, 0x0C, sisReg->VBPart4[0x0C]);
-
-	SetBlock(pSiS->RelIO+0x04, 2, 0x23, &(sisReg->VBPart1[2]));
-
-	SetBlock(pSiS->RelIO+0x10, 0, 0x45, &(sisReg->VBPart2[0]));
-
-	SetBlock(pSiS->RelIO+0x12, 0, 0x3E, &(sisReg->VBPart3[0]));
-
-	outSISIDXREG(pSiS->RelIO+0x14, 0x0A, 1);
-	outSISIDXREG(pSiS->RelIO+0x14, 0x0B, sisReg->VBPart4[0x0B]);
-	outSISIDXREG(pSiS->RelIO+0x14, 0x0A, sisReg->VBPart4[0x0A]);
-	outSISIDXREG(pSiS->RelIO+0x14, 0x12, 0);
-	outSISIDXREG(pSiS->RelIO+0x14, 0x12, sisReg->VBPart4[0x12]);
-	SetBlock(pSiS->RelIO+0x14, 0x0E, 0x11, &(sisReg->VBPart4[0x0E]));
-	SetBlock(pSiS->RelIO+0x14, 0x13, 0x1B, &(sisReg->VBPart4[0x13]));
-
-	/* SetLockRegs() 
-	LongWait(pSiS->RelIO+0x5A);
-	outSISIDXREG(pSiS->RelIO+SROFFSET, 0x32, sisReg->sisRegs3C4[0x32]);
-*/
-	EnableBridge(pSiS->RelIO);
-
-	/* EnableCRT2() 
-	outSISIDXREG(pSiS->RelIO+SROFFSET, 0x1E, sisReg->sisRegs3C4[0x1E]);
-*/
-	LockCRT2(pSiS->RelIO);
-	
-    }
-
     vgaHWRestore(pScrn, vgaReg, VGA_SR_ALL);
 
     vgaHWProtect(pScrn, FALSE);
@@ -1160,7 +1167,7 @@
     SISSaveScreen(pScreen, SCREEN_SAVER_ON);
 
     /* Initialise the first mode */
-    if (!(*pSiS->ModeInit)(pScrn, pScrn->currentMode))
+    if (!SISModeInit(pScrn, pScrn->currentMode))
 	return FALSE;
 
     /* Darken the screen for aesthetic reasons and set the viewport */
@@ -1251,10 +1258,15 @@
 	break;
     }
     if (!ret)
+    {
+	ErrorF ("SetMode Error@!\n");
 	return FALSE;
+    }
 
     xf86SetBlackWhitePixels(pScreen);
 
+    SISDGAInit(pScreen);
+
     if (pScrn->bitsPerPixel > 8) {
         /* Fixup RGB ordering */
         visual = pScreen->visuals + pScreen->numVisuals;
@@ -1294,8 +1306,14 @@
     /* Initialise default colourmap */
     if (!miCreateDefColormap(pScreen))
 	return FALSE;
+
+/*  marked by archer for adding VB palette 
+     if (!vgaHWHandleColormaps(pScreen))
+	return FALSE;
+*/
 
-    if (!vgaHWHandleColormaps(pScreen))
+     if (!xf86HandleColormaps(pScreen, 256, 8, SISLoadPalette, NULL,
+			CMAP_RELOAD_ON_MODE_SWITCH))
 	return FALSE;
 
 #ifdef DPMSExtension
@@ -1319,12 +1337,10 @@
 
 
 /* Usually mandatory */
-static Bool
+Bool
 SISSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
-	ScrnInfoPtr	pScrn = xf86Screens[scrnIndex];
-
-	return (*SISPTR(pScrn)->ModeInit)(pScrn, mode);
+    return SISModeInit(xf86Screens[scrnIndex], mode);
 }
 
 
@@ -1333,7 +1349,7 @@
  * displayed location in the video memory.
  */
 /* Usually mandatory */
-static void 
+void 
 SISAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@@ -1383,6 +1399,13 @@
 	    PDEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
 			"3C5/0Dh set to hex %2X, base 0x%x\n", temp, base));
 	    outb(VGA_SEQ_DATA, temp);
+	    if (pSiS->VBFlags)  {
+		UnLockCRT2(pSiS->RelIO);
+		outSISIDXREG(pSiS->RelIO+4, 6, GETVAR8(base));
+		outSISIDXREG(pSiS->RelIO+4, 5, GETBITS(base, 15:8));
+		outSISIDXREG(pSiS->RelIO+4, 4, GETBITS(base, 23:16));
+		LockCRT2(pSiS->RelIO);
+	    }
 	    break;
 	default:
 	    outb(VGA_SEQ_INDEX, 0x27);
@@ -1410,7 +1433,7 @@
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 
     /* Should we re-save the text mode on each VT enter? */
-    if (!(*SISPTR(pScrn)->ModeInit)(pScrn, pScrn->currentMode))
+    if (!SISModeInit(pScrn, pScrn->currentMode))
 	return FALSE;
 
     SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
@@ -1450,8 +1473,10 @@
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     SISPtr pSiS = SISPTR(pScrn);
+    xf86CursorInfoPtr	pCursorInfo = pSiS->CursorInfoPtr;
 
-    pSiS->CursorInfoPtr->HideCursor(pScrn);
+    if (pCursorInfo)
+    	pCursorInfo->HideCursor(pScrn);
 
     if (pScrn->vtSema) {
     	SISRestore(pScrn);
@@ -1460,8 +1485,8 @@
     }
     if(pSiS->AccelInfoPtr)
 	XAADestroyInfoRec(pSiS->AccelInfoPtr);
-    if(pSiS->CursorInfoPtr)
-	xf86DestroyCursorInfoRec(pSiS->CursorInfoPtr);
+    if(pCursorInfo)
+	xf86DestroyCursorInfoRec(pCursorInfo);
     pScrn->vtSema = FALSE;
     
     pScreen->CloseScreen = pSiS->CloseScreen;
@@ -1476,7 +1501,7 @@
 SISFreeScreen(int scrnIndex, int flags)
 {
     if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
-	vgaHWFreeHWRec(xf86Screens[scrnIndex]);
+        vgaHWFreeHWRec(xf86Screens[scrnIndex]);
     SISFreeRec(xf86Screens[scrnIndex]);
 }
 
@@ -1536,3 +1561,32 @@
 }
 #endif
 
+/* local used for debug */
+static void
+SISModifyModeInfo(DisplayModePtr mode)
+{
+/*
+	mode->Clock = 31500;
+	mode->CrtcHTotal	= 832;
+	mode->CrtcHDisplay	= 640;
+	mode->CrtcHBlankStart	= 648;
+	mode->CrtcHSyncStart	= 664;
+	mode->CrtcHSyncEnd	= 704;
+	mode->CrtcHBlankEnd	= 824;
+
+	mode->CrtcVTotal	= 520;
+	mode->CrtcVDisplay	= 480;
+	mode->CrtcVBlankStart	= 488;
+	mode->CrtcVSyncStart	= 489;
+	mode->CrtcVSyncEnd	= 492;
+	mode->CrtcVBlankEnd	= 512;
+*/
+	if (mode->CrtcHBlankStart == mode->CrtcHDisplay)
+		mode->CrtcHBlankStart++;
+	if (mode->CrtcHBlankEnd == mode->CrtcHTotal)
+		mode->CrtcHBlankEnd--;
+	if (mode->CrtcVBlankStart == mode->CrtcVDisplay)
+		mode->CrtcVBlankStart++;
+	if (mode->CrtcVBlankEnd == mode->CrtcVTotal)
+		mode->CrtcVBlankEnd--;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.c:1.1 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.c:1.1	Sat Feb 12 12:45:35 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.c	Tue Apr  4 12:25:16 2000
@@ -1,60 +1,176 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.c,v 1.3 2000/04/04 19:25:16 dawes Exp $ */
+
 #include "xf86.h"
+#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 
 #include "sis.h"
 #include "sis_regs.h"
+#include "sis_lcd.h"
+
+
 
-#define	LCD_DISABLE		0x00000000
-#define	LCD_ENABLE		0x00000001
-#define	PANEL_LINK		0x00000002
-#define	LCD_SCALED		0x00000004
-#define	SIS_VB_301		0x00010000
-#define	SIS_VB_LVDS		0x00020000
-
-
-static Bool	SiS530LCDModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static void	SiS530LCDSave(void);
-static void	SiS530LCDRestore(void);
-static Bool	SiS301LCDModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static void	SiS301LCDSave(void);
-static void	SiS301LCDRestore(void);
-static Bool	SiSLVDSModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static void	SiSLVDSSave(void);
-static void	SiSLVDSRestore(void);
+static	Bool	SIS301LCDInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 
 
+static	int	XYToRes(int x, int y);
+static	int	BppToColor(int bpp);
+
 static Bool
-SiS301LCDModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
+SIS301LCDInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
-	SISPtr	pSiS = SISPTR(pScrn);
+	SISPtr pSiS = SISPTR(pScrn);
+	SISRegPtr	sisReg = &pSiS->ModeReg;
+	int	res, color;
+	unsigned short	offset, Threshold_Low, Threshold_High;
+
+	if (mode->Flags & V_INTERLACE)
+		res = XYToRes(mode->CrtcHDisplay, mode->CrtcVDisplay*2);
+	else
+		res = XYToRes(mode->CrtcHDisplay, mode->CrtcVDisplay);
+	color = BppToColor(pScrn->bitsPerPixel);
+	if ((res == -1) || (color == -1))
+		return FALSE;
+
+	switch (pSiS->VBFlags & LCD_TYPE)  {
+	case LCD_1024x768:
+		if (mode->CrtcHDisplay > 1024)
+			return FALSE;
+		memcpy(sisReg->VBPart1, sis301_PANEL_1024[res].VBPart1, 0x29);
+		memcpy(sisReg->VBPart2, sis301_PANEL_1024[res].VBPart2, 0x46);
+		memcpy(sisReg->VBPart3, sis301_PANEL_1024[res].VBPart3, 0x3F);
+		memcpy(sisReg->VBPart4, sis301_PANEL_1024[res].VBPart4, 0x1C);
+		break;
+	case LCD_1280x1024:
+		if (mode->CrtcHDisplay > 1280)
+			return FALSE;
+/*
+		memcpy(sisReg->VBPart1, sis301_PANEL_1024[res].VBPart1, 0x29);
+		memcpy(sisReg->VBPart2, sis301_PANEL_1024[res].VBPart2, 0x46);
+		memcpy(sisReg->VBPart3, sis301_PANEL_1024[res].VBPart3, 0x3F);
+		memcpy(sisReg->VBPart4, sis301_PANEL_1024[res].VBPart4, 0x1C);
+*/
+		break;
+	case LCD_800x600:
+	default:
+		if (mode->CrtcHDisplay > 800)
+			return FALSE;
+/*
+		memcpy(sisReg->VBPart1, sis301_VESA[res].VBPart1, 0x29);
+		memcpy(sisReg->VBPart2, sis301_VESA[res].VBPart2, 0x46);
+		memcpy(sisReg->VBPart3, sis301_VESA[res].VBPart3, 0x3F);
+		memcpy(sisReg->VBPart4, sis301_VESA[res].VBPart4, 0x1C);
+*/
+	}
+	sisReg->VBPart2[0x00] &= ~0x20;	/* Temp Disable VB Processor */
+
+	sisReg->VBPart1[0x00] &= ~GENMASK(4:0);
+	sisReg->VBPart4[0x0d] &= ~GENMASK(4:3);
+	switch (pScrn->bitsPerPixel)  {
+	case 8:
+		sisReg->VBPart4[0x0d] |=0x10;
+		sisReg->VBPart1[0] |= 0x10;
+		break;
+	case 16:
+		if (pScrn->depth==15)
+			sisReg->VBPart1[0] |= 0x08;
+		else
+			sisReg->VBPart1[0] |= 0x04;
+		break;
+	case 24:
+		sisReg->VBPart1[0] |= 0x02;
+		break;
+	case 32:
+		sisReg->VBPart1[0] |= 0x01;
+		break;
+	default:
+		return FALSE;
+	}
+	offset = pSiS->scrnOffset >> 3;		/* Scrn Offset */
+	sisReg->VBPart1[0x07] = GETVAR8(offset);	
+	sisReg->VBPart1[0x09] &= 0xF0;
+	sisReg->VBPart1[0x09] |= GETBITS(offset, 11:8);
+
+	sisReg->VBPart1[3] = (offset >> 3)+1;	/* CRT2 FIFO Stop */
+
+	(*pSiS->SetThreshold2)(pScrn, mode, &Threshold_Low, &Threshold_High);
+	sisReg->VBPart1[1] &= ~GENMASK(4:0);
+	sisReg->VBPart1[1] |= GETBITS(Threshold_High, 4:0);
+	sisReg->VBPart1[2] &= ~GENMASK(4:0);
+	sisReg->VBPart1[2] |= GETBITS(Threshold_Low, 4:0);
+
+	sisReg->sisRegs3D4[0x30] |= 0x01;	/* Set Needed Scratch Regs */
+	sisReg->sisRegs3D4[0x31] &= ~0x02;
+	sisReg->sisRegs3D4[0x31] |= 0x40;
 
-	return TRUE;
+	return	TRUE;
 }
 
+static int
+BppToColor(int bpp)
+{
+	if (bpp == 8)	return 0;
+	if (bpp == 15)	return 1;
+	if (bpp == 16)	return 2;
+	if (bpp == 24)	return 3;
+	if (bpp == 32)	return 4;
+	return -1;
+}
+
+static int
+XYToRes(int x, int y)
+{
+	if (x==640 && y==480)  {
+		return 0;
+	}
+	if (x==800 && y==600)  {
+		return 1;
+	}
+	if (x==1024 && y==768)  {
+		return 2;
+	}
+	if (x==1280 && y==1024)  {
+		return 3;
+	}
+	return -1;
+}
 
-void SiSLCDPreInit(ScrnInfoPtr pScrn)
+static void
+SIS300_LCDPreInit(ScrnInfoPtr pScrn)
 {
 	SISPtr	pSiS = SISPTR(pScrn);
 	int	temp;
 
-	pSiS->LCDFlags = LCD_DISABLE;
 
-	switch(pSiS->Chipset)  {
-	case PCI_CHIP_SIS530:
-		break;
+	inSISIDXREG(pSiS->RelIO+SROFFSET, 0x38, temp);
+	if (!(temp & 0x20))
+		return;
+
+	inSISIDXREG(pSiS->RelIO+CROFFSET, 0x30, temp);
+	if (!(temp & 0x20))
+		return;
+
+	inSISIDXREG(pSiS->RelIO+CROFFSET, 0x36, temp);
+	if (temp == 1)
+		pSiS->VBFlags = CRT2_LCD | LCD_800x600;
+	if (temp == 2)
+		pSiS->VBFlags = CRT2_LCD | LCD_1024x768;
+	if (temp == 3)
+		pSiS->VBFlags = CRT2_LCD | LCD_1280x1024;
+	pSiS->ModeInit2 = SIS301LCDInit;
+}
+
+void
+SISLCDPreInit(ScrnInfoPtr pScrn)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+
+	switch (pSiS->Chipset) {
 	case PCI_CHIP_SIS300:
 	case PCI_CHIP_SIS630:
 	case PCI_CHIP_SIS540:
-		inSISIDXREG(pSiS->RelIO+SROFFSET, 0x38, temp);
-		if (!(temp & 0x20))
-			break;
-		inSISIDXREG(pSiS->RelIO+CROFFSET, 0x32, temp);
-		if (!(temp & 0x08))
-			break;
-		pSiS->LCDFlags = LCD_ENABLE;
-		
-		pSiS->ModeInit2 = SiS301LCDModeInit;
+		SIS300_LCDPreInit(pScrn);
 		break;
 	}
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.h:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_lcd.h	Fri Mar 31 14:57:41 2000
@@ -0,0 +1,121 @@
+/* LCD PANEL 1024x768 1024x768x32bpp regs is not correct */
+/* No LCD PANEL 800x600 & 1280x1024 */
+
+
+
+
+static	unsigned char Reg301_1_640_480_P1[] = {
+		0x90, 0xD6, 0x47, 0x0B, 0x00, 0x00, 0x00, 0x50,
+		0x7F, 0x30, 0x8C, 0xCC, 0x22, 0x4C, 0xF3, 0xDF,
+		0xEA, 0x1C, 0x09, 0x20, 0x00, 0x00, 0x00, 0x01,
+		0x03, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x4A, 0xBD,
+		0x82};
+static	unsigned char Reg301_1_640_480_P2[] = {
+		0x3C, 0x36, 0x13, 0xFF, 0x13, 0x25, 0xFF, 0x0C,
+		0x0C, 0x90, 0x40, 0x01, 0x0A, 0x06, 0x0D, 0x04,
+		0x0A, 0x06, 0x14, 0x0D, 0x04, 0x0A, 0x00, 0x81,
+		0x1B, 0x25, 0x60, 0x3F, 0x57, 0x45, 0xEC, 0x07,
+		0x07, 0xA7, 0x70, 0x07, 0xEB, 0x24, 0xE2, 0x82,
+		0x52, 0x33, 0xAA, 0x35, 0xFF, 0x58, 0x27, 0xFE,
+		0xB4, 0x21, 0xED, 0x8A, 0x08, 0x00, 0x00, 0x00,
+		0x00, 0x92, 0x8F, 0x40, 0x60, 0x80, 0x14, 0x90,
+		0x8C, 0x60, 0x14, 0x50, 0x00, 0x54};
+static	unsigned char Reg301_1_640_480_P3[] = {
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+		0x40, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+		0x00, 0x01, 0x80, 0xF6, 0xBF, 0x20, 0x00, 0x40,
+		0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+		0x00, 0x00, 0x00, 0x24, 0x00, 0x01, 0x00, 0x00,
+		0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+		0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x10, 0x22, 0x02, 0x00, 0x00};
+static	unsigned char Reg301_1_640_480_P4[] = {
+		0x01, 0x01, 0x01, 0x31, 0x00, 0x00, 0x00, 0xFF,
+		0x7F, 0x55, 0x5A, 0x64, 0x00, 0x1E, 0x0A, 0x0F,
+		0x80, 0x00, 0x08, 0x05, 0x0C, 0x19, 0x7F, 0xEE,
+		0x32, 0x20, 0x80, 0x00};
+
+
+static	unsigned char Reg301_1_800_600_P1[] = {
+		0x90, 0xD6, 0x47, 0x0D, 0x00, 0x00, 0x00, 0x64,
+		0xFF, 0x30, 0x2C, 0x64, 0x33, 0xD4, 0x70, 0x57,
+		0x64, 0x26, 0x12, 0x20, 0x00, 0x00, 0x00, 0x01,
+		0x03, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x5E, 0x7F,
+		0x91};
+static	unsigned char Reg301_1_800_600_P2[] = {
+		0x3C, 0x36, 0x13, 0xFF, 0x13, 0x25, 0xFF, 0x0C,
+		0x0C, 0x90, 0x40, 0x01, 0x0A, 0x06, 0x0D, 0x04,
+		0x0A, 0x06, 0x14, 0x0D, 0x04, 0x0A, 0x00, 0x81,
+		0x1B, 0x25, 0x60, 0x3F, 0x57, 0x45, 0xEC, 0x07,
+		0x07, 0xA7, 0x70, 0x07, 0xEB, 0x24, 0xE2, 0x82,
+		0x52, 0x33, 0xAA, 0x35, 0xFF, 0x58, 0xBF, 0xFE,
+		0xB4, 0x21, 0xED, 0x8A, 0x08, 0x00, 0x00, 0x00,
+		0x00, 0x92, 0x8F, 0x40, 0x60, 0x80, 0x14, 0x90,
+		0x8C, 0x60, 0x14, 0x50, 0x00, 0x59};
+static	unsigned char Reg301_1_800_600_P3[] = {
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+		0x40, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+		0x00, 0x01, 0x80, 0xF6, 0xBF, 0x20, 0x00, 0x40,
+		0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+		0x00, 0x00, 0x00, 0x24, 0x00, 0x01, 0x00, 0x00,
+		0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+		0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x10, 0x22, 0x02, 0x00, 0x00};
+static	unsigned char Reg301_1_800_600_P4[] = {
+		0x01, 0x01, 0x01, 0x31, 0x00, 0x00, 0x00, 0xFF,
+		0x7F, 0x55, 0x5A, 0x64, 0x00, 0x1E, 0x0A, 0x0F,
+		0x80, 0x00, 0x08, 0x19, 0x2A, 0x1A, 0xFF, 0x6B,
+		0x32, 0x30, 0x20, 0x00};
+
+
+static	unsigned char Reg301_1_1024_768_P1[] = {
+		0x90, 0xD6, 0x47, 0x11, 0x00, 0x00, 0x00, 0x80,
+		0x3F, 0x50, 0x0C, 0x5C, 0x44, 0xFC, 0x25, 0xFF,
+		0x13, 0x36, 0x13, 0x20, 0x00, 0x00, 0x00, 0x01,
+		0x03, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0xC7, 0x8F,
+		0x81};
+static	unsigned char Reg301_1_1024_768_P2[] = {
+		0x3C, 0x36, 0x13, 0xFF, 0x13, 0x25, 0xFF, 0x0C,
+		0x0C, 0x90, 0x40, 0x01, 0x0A, 0x06, 0x0D, 0x04,
+		0x0A, 0x06, 0x14, 0x0D, 0x04, 0x0A, 0x00, 0x81,
+		0x1B, 0x25, 0x60, 0x3F, 0x57, 0x45, 0xEC, 0x07,
+		0x07, 0xA7, 0x70, 0x07, 0xEB, 0x24, 0xE2, 0x82,
+		0x52, 0x33, 0xAA, 0x35, 0xFF, 0x58, 0x3F, 0xFE,
+		0xB5, 0x21, 0xED, 0x8A, 0x08, 0x00, 0x00, 0x00,
+		0x00, 0x92, 0x8F, 0x40, 0x60, 0x80, 0x14, 0x90,
+		0x8C, 0x60, 0x14, 0x50, 0x00, 0x60};
+static	unsigned char Reg301_1_1024_768_P3[] = {
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+		0x40, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+		0x00, 0x01, 0x80, 0xF6, 0xBF, 0x20, 0x00, 0x40,
+		0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+		0x00, 0x00, 0x00, 0x24, 0x00, 0x01, 0x00, 0x00,
+		0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+		0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x10, 0x22, 0x02, 0x00, 0x00};
+static	unsigned char Reg301_1_1024_768_P4[] = {
+		0x01, 0x01, 0x01, 0x31, 0x00, 0x00, 0x00, 0xFF,
+		0x7F, 0x55, 0x5A, 0x64, 0x00, 0x1E, 0x6A, 0x0F,
+		0x80, 0x00, 0x08, 0x01, 0x01, 0x2B, 0x3F, 0x20,
+		0x32, 0x40, 0x00, 0x00};
+
+
+
+
+typedef	struct	_SiS301Reg  {
+	CARD8	*VBPart1;
+	CARD8	*VBPart2;
+	CARD8	*VBPart3;
+	CARD8	*VBPart4;
+} SiS301RegRec, SiS301RegPtr;
+
+SiS301RegRec	sis301_PANEL_1024[] = {
+		 {Reg301_1_640_480_P1, Reg301_1_640_480_P2,
+		  Reg301_1_640_480_P3, Reg301_1_640_480_P4},
+		 {Reg301_1_800_600_P1, Reg301_1_800_600_P2,
+		  Reg301_1_800_600_P3, Reg301_1_800_600_P4},
+		 {Reg301_1_1024_768_P1, Reg301_1_1024_768_P2,
+		  Reg301_1_1024_768_P3, Reg301_1_1024_768_P4}};
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c:1.1 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c:1.2
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c:1.1	Sat Feb 12 12:45:37 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c	Fri Mar 31 12:13:37 2000
@@ -25,7 +25,7 @@
  *           Mitani Hiroshi <hmitani@drl.mei.co.jp> 
  *           David Thomas <davtom@dream.org.uk>. 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c,v 1.1 2000/02/12 20:45:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_setup.c,v 1.2 2000/03/31 20:13:37 dawes Exp $ */
 
 
 #define PSZ 8
@@ -85,7 +85,6 @@
 {
 	int	ramsize[4] = {1024, 2048, 4096, 1024};
 
-	SISPTR(pScrn)->MaxClock = 135000;
 	SISPTR(pScrn)->TurboQueue = FALSE;
 
 	outb(VGA_SEQ_INDEX, RAMSize);
@@ -102,7 +101,6 @@
 	int		temp;
 
 	if (pSiS->Chipset == PCI_CHIP_SIS5597)  {
-		pSiS->MaxClock = 135000;
 		outb(VGA_SEQ_INDEX, FBSize);
 		pScrn->videoRam = ((inb(VGA_SEQ_DATA) & 7) + 1)*256;
 		outb(VGA_SEQ_INDEX, Mode64);
@@ -110,10 +108,6 @@
 			pScrn->videoRam *= 2;
 	}
 	else  {
-		if (pSiS->Chipset == PCI_CHIP_SIS6326)
-			pSiS->MaxClock = 175000;
-		if (pSiS->Chipset == PCI_CHIP_SIS530)
-			pSiS->MaxClock = 230000;
 		outb(VGA_SEQ_INDEX, RAMSize);
 		temp = inb(VGA_SEQ_DATA);
 		config = ((temp & 0x10) >> 2 ) | ((temp & 6) >> 1);
@@ -148,7 +142,6 @@
 	config = inb(VGA_SEQ_DATA);
 	pScrn->videoRam = ((config & 0x3F) + 1) * 1024;
 	pSiS->BusWidth =bus[config >> 6];
-	pSiS->MaxClock = sis300MemBandWidth(pScrn);
 
 	outb(VGA_SEQ_INDEX, 0x3A);
 	config = inb(VGA_SEQ_DATA) & 3;
@@ -160,9 +153,6 @@
 			pSiS->MemClock/1000.0);
 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
                         "Detected VRAM bus width is %d\n", pSiS->BusWidth);
-	inSISIDXREG(0x3D4, 0x32, config);
-	if (config & 0x5F)
-		pSiS->VBFlags = 1;
 }
 
 void
@@ -187,4 +177,3 @@
 		break;
 	}
 }
-
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.c:1.1 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.c:1.1	Sat Feb 12 12:45:37 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.c	Tue Apr  4 12:25:16 2000
@@ -1,52 +1,190 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.c,v 1.3 2000/04/04 19:25:16 dawes Exp $ */
+
 #include "xf86.h"
+#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 
 #include "sis.h"
 #include "sis_regs.h"
+#include "sis_tv.h"
+
+
+
+static	Bool	SIS301TVInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 
-#define	TV_DISABLE		0
-#define	SVIDEO			0x00000001
-#define	COMPOSITE		0x00000002
-#define	SCART			0x00000004
-#define	HIVISION		0x00000008
-
-#define	NTSC			0x00000001
-#define	PAL			0x00000002
-
-
-static Bool	SiS530TVModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static void	SiS530TVSave(void);
-static void	SiS530TVRestore(void);
-static Bool	SiS301TVModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static void	SiS301TVSave(void);
-static void	SiS301TVRestore(void);
+static	int	XYToRes(int x, int y);
+static	int	BppToColor(int bpp);
 
 
 static Bool
-SiS530TVModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
+SIS301TVInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
-	SISPtr	pSiS = SISPTR(pScrn);
+	SISPtr pSiS = SISPTR(pScrn);
+	SISRegPtr	sisReg = &pSiS->ModeReg;
+	int	res, color;
+	unsigned short	offset, Threshold_Low, Threshold_High;
+
+	if (mode->Flags & V_INTERLACE)
+		res = XYToRes(mode->CrtcHDisplay, mode->CrtcVDisplay*2);
+	else
+		res = XYToRes(mode->CrtcHDisplay, mode->CrtcVDisplay);
+	color = BppToColor(pScrn->bitsPerPixel);
+	if ((res == -1) || (color == -1))
+		return FALSE;
+
+	switch (pSiS->VBFlags & TV_TYPE)  {
+	case TV_PAL:
+		if (mode->CrtcHDisplay > 800)
+			return FALSE;
+		memcpy(sisReg->VBPart1, sis301_PAL[res].VBPart1, 0x29);
+		memcpy(sisReg->VBPart2, sis301_PAL[res].VBPart2, 0x46);
+		memcpy(sisReg->VBPart3, sis301_PAL[res].VBPart3, 0x3F);
+		memcpy(sisReg->VBPart4, sis301_PAL[res].VBPart4, 0x1C);
+		break;
+	case TV_HIVISION:
+		if (mode->CrtcHDisplay > 1280)
+			return FALSE;
+/*
+		memcpy(sisReg->VBPart1, sis301_2[res].VBPart1, 0x29);
+		memcpy(sisReg->VBPart2, sis301_2[res].VBPart2, 0x46);
+		memcpy(sisReg->VBPart3, sis301_2[res].VBPart3, 0x3F);
+		memcpy(sisReg->VBPart4, sis301_2[res].VBPart4, 0x1C);
+*/
+		break;
+	case TV_NTSC:
+	default:
+		if (mode->CrtcHDisplay > 800)
+			return FALSE;
+		memcpy(sisReg->VBPart1, sis301_NTSC[res].VBPart1, 0x29);
+		memcpy(sisReg->VBPart2, sis301_NTSC[res].VBPart2, 0x46);
+		memcpy(sisReg->VBPart3, sis301_NTSC[res].VBPart3, 0x3F);
+		memcpy(sisReg->VBPart4, sis301_NTSC[res].VBPart4, 0x1C);
+		break;
+	}
+	sisReg->VBPart1[0x00] &= ~GENMASK(4:0);
+	sisReg->VBPart4[0x0d] &= ~GENMASK(4:3);
+	switch (pScrn->bitsPerPixel)  {
+	case 8:
+		sisReg->VBPart4[0x0d] |=0x10;
+		sisReg->VBPart1[0] |= 0x10;
+		break;
+	case 16:
+		if (pScrn->depth==15)
+			sisReg->VBPart1[0] |= 0x08;
+		else
+			sisReg->VBPart1[0] |= 0x04;
+		break;
+	case 24:
+		sisReg->VBPart1[0] |= 0x02;
+		break;
+	case 32:
+		sisReg->VBPart1[0] |= 0x01;
+		break;
+	default:
+		return FALSE;
+	}
+	/* Set TV Interface */
+	sisReg->VBPart2[0] &= GENMASK(4:4) | GENMASK(0:0);
+	switch (pSiS->VBFlags & TV_INTERFACE)  {
+	case TV_SVIDEO:
+		sisReg->VBPart2[0] |= 0x08;
+		break;
+	case TV_SCART:
+		sisReg->VBPart2[0] |= 0x02;
+		break;
+	case TV_AVIDEO:	/* Composite */
+	default:
+		sisReg->VBPart2[0] |= 0x04;
+	}
 
+	offset = pSiS->scrnOffset >> 3;		/* Scrn Offset */
+	sisReg->VBPart1[0x07] = GETVAR8(offset);	
+	sisReg->VBPart1[0x09] &= 0xF0;
+	sisReg->VBPart1[0x09] |= GETBITS(offset, 11:8);
+
+	sisReg->VBPart1[3] = (offset >> 3)+1;	/* CRT2 FIFO Stop */
+
+	(*pSiS->SetThreshold2)(pScrn, mode, &Threshold_Low, &Threshold_High);
+	sisReg->VBPart1[1] &= ~GENMASK(4:0);
+	sisReg->VBPart1[1] |= GETBITS(Threshold_High, 4:0);
+	sisReg->VBPart1[2] &= ~GENMASK(4:0);
+	sisReg->VBPart1[2] |= GETBITS(Threshold_Low, 4:0);
+
+	sisReg->sisRegs3D4[0x30] |= 0x01;	/* Set Needed Scratch Regs */
+	sisReg->sisRegs3D4[0x31] &= ~0x02;
+	sisReg->sisRegs3D4[0x31] |= 0x40;
+
 	return TRUE;
 }
 
+static int
+BppToColor(int bpp)
+{
+	if (bpp == 8)	return 0;
+	if (bpp == 15)	return 1;
+	if (bpp == 16)	return 2;
+	if (bpp == 24)	return 3;
+	if (bpp == 32)	return 4;
+	return -1;
+}
+
+static int
+XYToRes(int x, int y)
+{
+	if (x==640 && y==480)  {
+		return 0;
+	}
+	if (x==800 && y==600)  {
+		return 1;
+	}
+	if (x==1024 && y==768)  {
+		return 2;
+	}
+	if (x==1280 && y==1024)  {
+		return 3;
+	}
+	return -1;
+}
 
-void SiSTVPreInit(ScrnInfoPtr pScrn)
+static void
+SIS300_TVPreInit(ScrnInfoPtr pScrn)
 {
 	SISPtr	pSiS = SISPTR(pScrn);
 	int	temp;
 
-	switch(pSiS->Chipset)  {
-	case PCI_CHIP_SIS530:
-		inSISIDXREG(pSiS->RelIO+SROFFSET, 0x36, temp);
-		break;
+	inSISIDXREG(pSiS->RelIO+SROFFSET, 0x38, temp);
+	if (!(temp & 0x20))
+		return;
+
+	inSISIDXREG(pSiS->RelIO+CROFFSET, 0x30, temp);
+	if (temp & 0x10)
+		pSiS->VBFlags = CRT2_TV | TV_SCART;
+	else if (temp & 0x08)
+		pSiS->VBFlags = CRT2_TV | TV_SVIDEO;
+	else if (temp & 0x04)
+		pSiS->VBFlags = CRT2_TV | TV_AVIDEO;
+	else
+		return;
+
+	inSISIDXREG(pSiS->RelIO+CROFFSET, 0x31, temp);
+	if (temp & 0x01)
+		pSiS->VBFlags |= TV_PAL;
+	else
+		pSiS->VBFlags |= TV_NTSC;
+	pSiS->ModeInit2 = SIS301TVInit;
+}
+
+void
+SISTVPreInit(ScrnInfoPtr pScrn)
+{
+	SISPtr	pSiS = SISPTR(pScrn);
+
+	switch (pSiS->Chipset)  {
 	case PCI_CHIP_SIS300:
 	case PCI_CHIP_SIS630:
 	case PCI_CHIP_SIS540:
-	
+		SIS300_TVPreInit(pScrn);
 		break;
-	default:
-		pSiS->TVFlags = TV_DISABLE;
 	}
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.h:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_tv.h	Fri Mar 31 14:57:41 2000
@@ -0,0 +1,158 @@
+/* No AVIDEO interface Regs */
+/* No SCART interface Regs */
+/* No Hi-Vision TV Regs */
+
+typedef	struct	_SiS301Reg  {
+	CARD8	*VBPart1;
+	CARD8	*VBPart2;
+	CARD8	*VBPart3;
+	CARD8	*VBPart4;
+} SiS301RegRec, SiS301RegPtr;
+
+/* NTSC 640x480 */
+static	unsigned char Reg301_0_640_480_P1[] = {
+		0x90, 0xF6, 0x49, 0x0B, 0x00, 0x00, 0x00, 0x50,
+		0x43, 0x30, 0x8C, 0xBD, 0x22, 0x1F, 0x0A, 0xDF,
+		0xF5, 0x18, 0x0A, 0x08, 0x00, 0x00, 0x00, 0x21,
+		0x03, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x61, 0x61,
+		0x12};
+static	unsigned char Reg301_0_640_480_P2[] = {
+		0x38, 0x17, 0x1D, 0x03, 0x09, 0x05, 0x06, 0x0C,
+		0x0C, 0x94, 0x49, 0x01, 0x0A, 0x06, 0x0D, 0x04,
+		0x0A, 0x06, 0x14, 0x0D, 0x04, 0x0A, 0x00, 0x85,
+		0x1B, 0x0C, 0x50, 0xB3, 0x99, 0x06, 0xEC, 0x4A,
+		0x17, 0x88, 0x10, 0x4B, 0xA5, 0x30, 0xE2, 0x3C,
+		0x62, 0xD3, 0x4A, 0x65, 0x9D, 0xF8, 0x14, 0xDA,
+		0x13, 0x21, 0xED, 0x8A, 0x08, 0xF1, 0x05, 0x1F,
+		0x16, 0x92, 0x8F, 0x40, 0x60, 0x80, 0x14, 0x90,
+		0x8C, 0x60, 0x14, 0x50, 0x21, 0x50};
+static	unsigned char Reg301_0_640_480_P3[] = {
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x10, 0xF6, 0xBF, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static	unsigned char Reg301_0_640_480_P4[] = {
+		0x01, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0xFF,
+		0x7F, 0x55, 0x52, 0x2A, 0x40, 0x1F, 0x8A, 0x0F,
+		0x80, 0x00, 0x08, 0x4C, 0x8F, 0x1A, 0x43, 0x0A,
+		0xE0, 0x40, 0x5D, 0x18};
+
+
+/* NTSC 800x600 */
+static	unsigned char Reg301_0_800_600_P1[] = {
+		0x90, 0xF6, 0x49, 0x0D, 0x00, 0x00, 0x00, 0x64,
+		0x1F, 0x40, 0x2C, 0x6C, 0x33, 0xEC, 0x82, 0x57,
+		0x6D, 0x20, 0x12, 0x08, 0x00, 0x00, 0x00, 0x21,
+		0x03, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0xB5, 0x65,
+		0x92};
+static	unsigned char Reg301_0_800_600_P2[] = {
+		0x38, 0x17, 0x1D, 0x03, 0x09, 0x05, 0x06, 0x0C,
+		0x0C, 0x94, 0xC9, 0x01, 0x0A, 0x06, 0x0D, 0x04,
+		0x0A, 0x06, 0x14, 0x0D, 0x04, 0x0A, 0x00, 0x85,
+		0x1B, 0x0C, 0x50, 0xB3, 0x99, 0x06, 0xEC, 0x4A,
+		0x17, 0x88, 0x10, 0x4B, 0xA5, 0x30, 0xE2, 0x3C,
+		0x62, 0xD3, 0x4A, 0x65, 0x9D, 0xF8, 0x14, 0xDA,
+		0x13, 0x21, 0xED, 0x8A, 0x08, 0xF4, 0x10, 0x1C,
+		0x00, 0x92, 0x8F, 0x40, 0x60, 0x80, 0x14, 0x90,
+		0x8C, 0x60, 0x14, 0x50, 0x29, 0x54};
+static	unsigned char Reg301_0_800_600_P3[] = {
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x10, 0xF6, 0xBF, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static	unsigned char Reg301_0_800_600_P4[] = {
+		0x01, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0xFF,
+		0x7F, 0x55, 0x52, 0x2A, 0x40, 0x1F, 0x8A, 0x0F,
+		0x80, 0x00, 0x08, 0x78, 0x8F, 0x22, 0x1F, 0x82,
+		0x20, 0x52, 0x74, 0x5E};
+
+
+/* PAL 640x480 */
+static	unsigned char Reg301_1_640_480_P1[] = {
+		0x90, 0xF6, 0x49, 0x0B, 0x00, 0x00, 0x00, 0x50,
+		0x4F, 0x30, 0x8C, 0xC0, 0x22, 0x28, 0x0F, 0xDF,
+		0xF8, 0x1C, 0x0A, 0x08, 0x00, 0x00, 0x00, 0x21,
+		0x03, 0xF0, 0x00, 0x00, 0x20, 0x00, 0x02, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x33, 0x2D,
+		0x91};
+static	unsigned char Reg301_1_640_480_P2[] = {
+		0x28, 0x19, 0x52, 0x35, 0x6E, 0x04, 0x38, 0x3D,
+		0x70, 0x94, 0x49, 0x01, 0x12, 0x06, 0x3E, 0x35,
+		0x6D, 0x06, 0x14, 0x3E, 0x35, 0x6D, 0x00, 0x45,
+		0x2B, 0x70, 0x50, 0xBF, 0x97, 0x06, 0xD7, 0x5D,
+		0x17, 0x88, 0x70, 0x45, 0xA5, 0x30, 0xE8, 0x48,
+		0x62, 0xDD, 0x00, 0x68, 0xB0, 0x8B, 0x2D, 0x07,
+		0x53, 0x2A, 0x05, 0xD3, 0x00, 0xF5, 0xFB, 0x1B,
+		0x2A, 0x92, 0x8F, 0x40, 0x60, 0x80, 0x14, 0x90,
+		0x8C, 0x60, 0x14, 0x63, 0x21, 0x50};
+static	unsigned char Reg301_1_640_480_P3[] = {
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0xFA, 0xC8, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00};
+static	unsigned char Reg301_1_640_480_P4[] = {
+		0x01, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0xFF,
+		0x7F, 0x55, 0x52, 0x2A, 0x40, 0x1F, 0x8A, 0x0F,
+		0x80, 0x00, 0x08, 0x04, 0x09, 0x1A, 0x4F, 0x0F,
+		0x32, 0x30, 0x9F, 0x66};
+
+
+/* PAL 800x600 */
+static	unsigned char Reg301_1_800_600_P1[] = {
+		0x90, 0xF6, 0x49, 0x0D, 0x00, 0x00, 0x00, 0x64,
+		0x23, 0x40, 0x2C, 0x6D, 0x33, 0xEF, 0x87, 0x57,
+		0x70, 0x24, 0x12, 0x08, 0x00, 0x00, 0x00, 0x21,
+		0x03, 0x30, 0x00, 0x00, 0x20, 0x00, 0x02, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x27, 0x75,
+		0x82};
+static	unsigned char Reg301_1_800_600_P2[] = {
+		0x28, 0x19, 0x52, 0x35, 0x6E, 0x04, 0x38, 0x3D,
+		0x70, 0x94, 0x49, 0x01, 0x12, 0x06, 0x3E, 0x35,
+		0x6D, 0x06, 0x14, 0x3E, 0x35, 0x6D, 0x00, 0x45,
+		0x2B, 0x70, 0x50, 0xBF, 0x97, 0x06, 0xD7, 0x5D,
+		0x17, 0x88, 0x70, 0x45, 0xA5, 0x30, 0xE8, 0x48,
+		0x62, 0xDD, 0x00, 0x68, 0xB0, 0x8B, 0x2D, 0x07,
+		0x53, 0x2A, 0x05, 0xD3, 0x00, 0xEB, 0x05, 0x25,
+		0x16, 0x92, 0x8F, 0x40, 0x60, 0x80, 0x14, 0x90,
+		0x8C, 0x60, 0x14, 0x63, 0x29, 0x54};
+static	unsigned char Reg301_1_800_600_P3[] = {
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0xFA, 0xC8, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00};
+static	unsigned char Reg301_1_800_600_P4[] = {
+		0x01, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0xFF,
+		0x7F, 0x55, 0x52, 0x2A, 0x40, 0x1F, 0x8A, 0x0F,
+		0x80, 0x00, 0x08, 0x19, 0x24, 0x22, 0x23, 0x87,
+		0xD6, 0x41, 0x87, 0x3F};
+
+
+SiS301RegRec	sis301_NTSC[] = {
+		{Reg301_0_640_480_P1, Reg301_0_640_480_P2,
+		 Reg301_0_640_480_P3, Reg301_0_640_480_P4},
+		{Reg301_0_800_600_P1, Reg301_0_800_600_P2,
+		 Reg301_0_800_600_P3, Reg301_0_800_600_P4}};
+
+SiS301RegRec	sis301_PAL[] = {
+		{Reg301_1_640_480_P1, Reg301_1_640_480_P2,
+		 Reg301_1_640_480_P3, Reg301_1_640_480_P4},
+		{Reg301_1_800_600_P1, Reg301_1_800_600_P2,
+		 Reg301_1_800_600_P3, Reg301_1_800_600_P4}};
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c:1.2	Fri Feb 18 04:20:01 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c	Fri Mar 31 12:13:38 2000
@@ -25,7 +25,7 @@
  *           Mitani Hiroshi <hmitani@drl.mei.co.jp> 
  *           David Thomas <davtom@dream.org.uk>. 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c,v 1.2 2000/02/18 12:20:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_vga.c,v 1.3 2000/03/31 20:13:38 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -56,259 +56,39 @@
 #define TOLERANCE 0.01	/* search smallest M and N in this tolerance */
 
 
+static	Bool	SISInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
+static	Bool	SIS300Init(ScrnInfoPtr pScrn, DisplayModePtr mode);
 
 
-/* local used for debug */
-static void
-SiSModifyModeInfo(DisplayModePtr mode)
-{
-/*
-	mode->Clock = 31500;
-	mode->CrtcHTotal	= 832;
-	mode->CrtcHDisplay	= 640;
-	mode->CrtcHBlankStart	= 648;
-	mode->CrtcHSyncStart	= 664;
-	mode->CrtcHSyncEnd	= 704;
-	mode->CrtcHBlankEnd	= 824;
-
-	mode->CrtcVTotal	= 520;
-	mode->CrtcVDisplay	= 480;
-	mode->CrtcVBlankStart	= 488;
-	mode->CrtcVSyncStart	= 489;
-	mode->CrtcVSyncEnd	= 492;
-	mode->CrtcVBlankEnd	= 512;
-*/
-	if (mode->CrtcHBlankStart == mode->CrtcHDisplay)
-		mode->CrtcHBlankStart++;
-	if (mode->CrtcHBlankEnd == mode->CrtcHTotal)
-		mode->CrtcHBlankEnd--;
-	if (mode->CrtcVBlankStart == mode->CrtcVDisplay)
-		mode->CrtcVBlankStart++;
-	if (mode->CrtcVBlankEnd == mode->CrtcVTotal)
-		mode->CrtcVBlankEnd--;
-}
-
-static void
-Find530Threshold(ScrnInfoPtr pScrn, int mclk, int vclk, int bpp,
-			int buswidth, int flags, int *low, int *high)
-{
-	int	factor, z;
-
-	*high = 0x1F;
-	if (flags & UMA)
-		factor = 0x60;
-	else
-		factor = 0x30;
-	z = factor * vclk * bpp;
-	z = z / mclk / buswidth;
-	*low = (z+1)/2 + 4;
-	if (*low > 0x1F)
-		*low = 0x1F;
-}
-
-struct funcargc {
-	char	base;
-	char	inc;
-};
-
-struct funcargc funca[12] = {
-	{61, 3}, {52, 5}, {68, 7}, {100, 11},
-	{43, 3}, {42, 5}, {54, 7}, {78, 11},
-	{34, 3}, {37, 5}, {47, 7}, {67, 11}};
-
-struct funcargc funcb[12] = {
-	{81, 4}, {72, 6}, {88, 8}, {120, 12},
-	{55, 4}, {54, 6}, {66, 8}, {90, 12},
-	{42, 4}, {45, 6}, {55, 8}, {75, 12}};
-
-char timing[8] = {1, 2, 2, 3, 0, 1, 1, 2};
-
-static void
-Find300_Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{
-	SISPtr		pSiS = SISPTR(pScrn);
-	SISRegPtr	pReg = &pSiS->ModeReg;
-	int		mclk = pSiS->MemClock;
-	int		vclk = mode->Clock;
-	int		bpp = pScrn->bitsPerPixel/8;
-	int		lowa, lowb, low;
-	struct funcargc	*p;
-	unsigned int	i, j;
-
-	pReg->sisRegs3C4[0x16] = pSiS->SavedReg.sisRegs3C4[0x16];
-
-	if (!bpp)	bpp = 1;
-
-	do {
-		i = ((pReg->sisRegs3C4[0x18] & 0x60) >> 4) |
-		    ((pReg->sisRegs3C4[0x18] & 0x02) >> 1);
-		j = ((pReg->sisRegs3C4[0x14] & 0xC0) >> 4) |
-		    (pReg->sisRegs3C4[0x16] >> 6);
-		p = &funca[j];
-
-		lowa = (p->base + p->inc*timing[i])*vclk*bpp;
-		lowa = (lowa + (mclk-1)) / mclk;
-		lowa = (lowa + 15)/16;
-
-		p = &funcb[j];
-		lowb = (p->base + p->inc*timing[i])*vclk*bpp;
-		lowb = (lowb + (mclk-1)) / mclk;
-		lowb = (lowb + 15)/16;
-
-		if (lowb < 4)
-			lowb = 0;
-		else
-			lowb -= 4;
-
-		low = (lowa > lowb)? lowa: lowb;
-
-		low++;
-
-		if (low <= 0x13) {
-			break;
-		} else {
-			i = (pReg->sisRegs3C4[0x16] >> 6) & 3;
-			if (!i) {
-				low = 0x13;
-				break;
-			} else {
-				i--;
-				pReg->sisRegs3C4[0x16] &= 0x3C;
-				pReg->sisRegs3C4[0x16] |= (i << 6);
-			}
-		}
-	} while (1);
-
-	pReg->sisRegs3C4[0x08] = ((low & 0xF) << 4) | 0xF;
-	pReg->sisRegs3C4[0x0F] = (low & 0x10) << 1;
-	pReg->sisRegs3C4[0x09] &= 0xF0;
-	if (low+3 > 15)
-		pReg->sisRegs3C4[0x09] |= 0x0F;
-	else
-		pReg->sisRegs3C4[0x09] |= low + 3;
-}
-
-struct QConfig  {
-	int	GT;
-	int	QC;
-};
-
-struct	QConfig qconfig[20] = {
-	{1, 0x0}, {1, 0x2}, {1, 0x4}, {1, 0x6}, {1, 0x8},
-	{1, 0x3}, {1, 0x5}, {1, 0x7}, {1, 0x9}, {1, 0xb},
-	{0, 0x0}, {0, 0x2}, {0, 0x4}, {0, 0x6}, {0, 0x8},
-	{0, 0x3}, {0, 0x5}, {0, 0x7}, {0, 0x9}, {0, 0xb}};
-
-int cycleA[20][2] = {
-	{88,88}, {80,80}, {78,78}, {72,72}, {70,70},
-	{79,72}, {77,70}, {71,64}, {69,62}, {49,44},
-	{73,78}, {65,70}, {63,68}, {57,62}, {55,60},
-	{64,62}, {62,60}, {56,54}, {54,52}, {34,34}};
-
-static void
-Find630_Threshold(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{
-	SISPtr		pSiS = SISPTR(pScrn);
-	SISRegPtr	pReg = &pSiS->ModeReg;
-	int		mclk = pSiS->MemClock;
-	int		vclk = mode->Clock;
-	int		bpp = pScrn->bitsPerPixel/8;
-	CARD32		temp;
-	PCITAG		NBridge;
-	int		low, lowa, cyclea;
-	int		i, j;
-
-	if (!bpp)	bpp = 1;
-
-	i = 0;
-	j = (pReg->sisRegs3C4[0x14] >> 6) - 1;
-
-	while (1)  {
-#ifdef	DEBUG
-		ErrorF("Config %d GT = %d, QC = %x, CycleA = %d\n",
-			i, qconfig[i].GT, qconfig[i].QC, cycleA[i][j]);
-#endif
-		cyclea = cycleA[i][j];
-		lowa = cyclea * vclk * bpp;
-		lowa = (lowa + (mclk-1)) / mclk;
-		lowa = (lowa + 15) / 16;
-		low = lowa + 1;
-		if (low <= 0x13)
-			break;
-		else
-			if (i < 19)
-				i++;
-			else  {
-				low = 0x13;
-#ifdef	DEBUG
-	ErrorF("This mode may has threshold problem and had better removed\n");
-#endif
-				break;
-			}
-	}
-#ifdef	DEBUG
-	ErrorF("Using Config %d with CycleA = %d\n", i, cyclea);
-#endif
-	pReg->sisRegs3C4[0x08] = ((low & 0xF) << 4) | 0xF;
-	pReg->sisRegs3C4[0x0F] &= 0xDF;
-	pReg->sisRegs3C4[0x0F] |= (low & 0x10) << 1;
-	pReg->sisRegs3C4[0x09] &= 0xF0;
-	if (lowa+4 > 15)
-		pReg->sisRegs3C4[0x09] |= 0x0F;
-	else
-		pReg->sisRegs3C4[0x09] |= (lowa+4);
-
-	/* write PCI configuration space */
-	NBridge = pciTag(0, 0, 0);
-	temp = pciReadLong(NBridge, 0x50);
-	temp &= 0xF0FFFFFF;
-	temp |= qconfig[i].QC << 24;
-	pciWriteLong(NBridge, 0x50, temp);
-
-	temp = pciReadLong(NBridge, 0xA0);
-	temp &= 0xF0FFFFFF;
-	temp |= qconfig[i].GT << 24;
-	pciWriteLong(NBridge, 0xA0, temp);
-
-#ifdef	DEBUG
-	temp = pciReadLong(NBridge, 0x50);
-	ErrorF("QueueConfig: 0x80000050 = %x\n", temp);
-	temp = pciReadLong(NBridge, 0xA0);
-	ErrorF("QueueConfig: 0x800000A0 = %x\n", temp);
-#endif
-
-}
-
 static Bool
-SiSInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
+SISInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     SISPtr pSiS = SISPTR(pScrn);
     SISRegPtr pReg = &pSiS->ModeReg;
+    vgaRegPtr	vgaReg = &VGAHWPTR(pScrn)->ModeReg;
     int gap, safetymargin, MemBand;
     int vgaIOBase;
-    unsigned char temp, SR5State;
-    unsigned short temp1;
+    unsigned char temp;
     int Base,mclk;
     int offset;
     int clock = mode->Clock;
     unsigned int vclk[5];
-    int CRT_CPUthresholdLow ;
-    int CRT_CPUthresholdHigh ;
-    unsigned int CRT_ENGthreshold ;
+    unsigned short CRT_CPUthresholdLow ;
+    unsigned short CRT_CPUthresholdHigh ;
+    unsigned short CRT_ENGthreshold ;
 
     int num, denum, div, sbit, scale;
 
-    PDEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "SiSInit()\n"));
+    PDEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "SISInit()\n"));
     vgaHWGetIOBase(VGAHWPTR(pScrn));
     vgaIOBase = VGAHWPTR(pScrn)->IOBase;
 
-    SiSSave(pScrn, pReg);
+    (*pSiS->SiSSave)(pScrn, pReg);
 
-    outb(VGA_SEQ_INDEX, 0x05); /* Unlock Registers */
-    SR5State = inb(VGA_SEQ_DATA);
     outw(VGA_SEQ_INDEX, 0x8605);
 
     pSiS->scrnOffset = pScrn->displayWidth * pScrn->bitsPerPixel / 8;
+
     if ((mode->Flags & V_INTERLACE)==0)  {
 	offset = pScrn->displayWidth >> 3;
 	pReg->sisRegs3C4[0x06] &= 0xDF;
@@ -326,58 +106,33 @@
 	pReg->sisRegs3C4[0x0C] |= 0xA0;
 	pReg->sisRegs3C4[0x0B] |= 0x60;
 	break;
-    case PCI_CHIP_SIS300:
-    case PCI_CHIP_SIS630:
-    case PCI_CHIP_SIS540:
-	pReg->sisRegs3C4[0x20] |= 0x81;
-	pReg->sisRegs3C4[0x06] |= 0x02;
-	break;
     default:
 	pReg->sisRegs3C4[BankReg] |= 0x82;
     }
 
     switch (pScrn->bitsPerPixel) {
 	case 8:
-	    pSiS->DstColor = 0x0000;
 	    break;
 	case 15:
-	    pSiS->DstColor = 0x4000;
 	    offset <<= 1;
 	    pReg->sisRegs3C4[BankReg] |= 0x04;
 	    break;
 	case 16:
-	    pSiS->DstColor = (short)0x8000;
 	    offset <<= 1;
 	    pReg->sisRegs3C4[BankReg] |= 0x08;
 	    break;
 	case 24:
 	    offset += (offset << 1);
-	    switch (pSiS->Chipset)  {
-		case PCI_CHIP_SIS300:
-		case PCI_CHIP_SIS630:
-		case PCI_CHIP_SIS540:
-		    pReg->sisRegs3C4[0x06] |= 0x0C;
-		    break;
-		default:
-		    pReg->sisRegs3C4[BankReg] |= 0x10;
-		    pReg->sisRegs3C4[MMIOEnable] |= 0x90;
-	    }
+	    pReg->sisRegs3C4[BankReg] |= 0x10;
+	    pReg->sisRegs3C4[MMIOEnable] |= 0x90;
 	    break;
 	case 32:
-	    pSiS->DstColor = (short)0xC000;
 	    offset <<= 2;
-	    switch (pSiS->Chipset)  {
-		case PCI_CHIP_SIS300:
-		case PCI_CHIP_SIS630:
-		case PCI_CHIP_SIS540:
-		    pReg->sisRegs3C4[0x06] &= 0xE3;
-		    pReg->sisRegs3C4[0x06] |= 0x10;
-		    break;
-		case PCI_CHIP_SIS530:
+	    if (pSiS->Chipset == PCI_CHIP_SIS530)  {
 		    pReg->sisRegs3C4[BankReg] |= 0x10;
 		    pReg->sisRegs3C4[MMIOEnable] |= 0x90;
 		    pReg->sisRegs3C4[0x09] |= 0x80;
-		default:
+	    } else  {
 		    return FALSE;
 	    }
 	    break;
@@ -416,81 +171,37 @@
 	    break;
     }
 
-    switch (pSiS->Chipset)  {
-	case PCI_CHIP_SIS5597:
-	case PCI_CHIP_SIS6326:
-	case PCI_CHIP_SIS530:
-	    /* Screen Offset */
-	    pReg->sisRegs3x4[Offset] = offset & 0xFF;
-	    pReg->sisRegs3C4[CRTCOff] = ((offset & 0xF00) >> 4) | 
+	/* Screen Offset */
+	vgaReg->CRTC[0x13] = offset & 0xFF;
+	pReg->sisRegs3C4[CRTCOff] = ((offset & 0xF00) >> 4) | 
 				(((mode->CrtcVTotal-2)     & 0x400) >> 10 ) |
 				(((mode->CrtcVDisplay-1)   & 0x400) >> 9 ) |
 				(((mode->CrtcVSyncStart-1) & 0x400) >> 8 ) |
 				(((mode->CrtcVSyncStart)   & 0x400) >> 7 ) ;
 
-	    /* Extended Horizontal Overflow Register */
-	    pReg->sisRegs3C4[0x12] &= 0xE0;
-	    pReg->sisRegs3C4[0x12] |= (
+	/* Extended Horizontal Overflow Register */
+	pReg->sisRegs3C4[0x12] &= 0xE0;
+	pReg->sisRegs3C4[0x12] |= (
 		(((mode->CrtcHTotal >> 3) - 5)     & 0x100) >> 8 |
 		(((mode->CrtcHDisplay >> 3) - 1)   & 0x100) >> 7 |
 		(((mode->CrtcHSyncStart >> 3) - 1) & 0x100) >> 6 |
 		((mode->CrtcHSyncStart >> 3)       & 0x100) >> 5 |
-		((mode->CrtcHSyncEnd >> 3)         & 0x40)  >> 2);
+		(((mode->CrtcHBlankEnd >> 3) -1)   & 0x40)  >> 2);
+/*		((mode->CrtcHSyncEnd >> 3)         & 0x40)  >> 2); */
 
-	    if (mode->CrtcVDisplay > 1024)
+	if (mode->CrtcVDisplay > 1024)
 		/* disable line compare */
 		pReg->sisRegs3C4[0x38] |= 0x04;
-	    else
+	else
 		pReg->sisRegs3C4[0x38] &= 0xFB;
 
-	    if (( pScrn->depth == 24) || (pScrn->depth == 32) ||
+	if (( pScrn->depth == 24) || (pScrn->depth == 32) ||
 					(mode->CrtcHDisplay >= 1280))
 		/* Enable high speed DCLK */
 		pReg->sisRegs3C4[0x3E] |= 1;
-	    else
+	else
 		pReg->sisRegs3C4[0x3E] &= 0xFE;
-	    break;
-
-	case PCI_CHIP_SIS300:
-	case PCI_CHIP_SIS630:
-	case PCI_CHIP_SIS540:
-	    /* Screen Offset */
-	    pReg->sisRegs3x4[Offset] = offset & 0xFF;
-	    pReg->sisRegs3C4[0x0E] &= 0xF0;
-	    pReg->sisRegs3C4[0x0E] |= ((offset & 0xF00) >> 8);
-
-	    pReg->sisRegs3C4[0x10] = 
-			((mode->CrtcHDisplay *(pScrn->bitsPerPixel >>3) + 63) >> 6) +1;
-	    pReg->sisRegs3C4[0x06] |= 0x01;
-
-	    /* Extended Vertical Overflow */
-	    pReg->sisRegs3C4[0x0A] = 
-				(((mode->CrtcVTotal     -2) & 0x400) >> 10) |
-				(((mode->CrtcVDisplay   -1) & 0x400) >> 9 ) |
-				(((mode->CrtcVBlankStart  ) & 0x400) >> 8 ) |
-				(((mode->CrtcVSyncStart   ) & 0x400) >> 7 ) |
-				(((mode->CrtcVBlankEnd    ) & 0x100) >> 4 ) |
-				(((mode->CrtcVSyncEnd     ) & 0x010) << 1 );
-
-	    /* Extended Horizontal Overflow */
-	    pReg->sisRegs3C4[0x0B] = 
-			(((mode->CrtcHTotal      >> 3) - 5) & 0x300) >> 8 |
-			(((mode->CrtcHDisplay    >> 3) - 1) & 0x300) >> 6 |
-			((mode->CrtcHBlankStart >> 3)       & 0x300) >> 4 |
-			((mode->CrtcHSyncStart  >> 3)       & 0x300) >> 2 ;
-	    pReg->sisRegs3C4[0x0C] &= 0xF8;
-	    pReg->sisRegs3C4[0x0C] |= 
-			((mode->CrtcHBlankEnd >> 3) & 0x0C0) >> 6 |
-			((mode->CrtcHSyncEnd  >> 3) & 0x020) >> 3;
 
-	    /* line compare */
-	    if (mode->CrtcHDisplay > 0)
-		pReg->sisRegs3C4[0x0F] |= 0x08;
-	    else
-		pReg->sisRegs3C4[0x0F] &= 0xF7;
-	    break;
-    }
-
 
     /* Set vclk */	
     if (compute_vclk(clock, &num, &denum, &div, &sbit, &scale)) {
@@ -509,18 +220,6 @@
 		    pReg->sisRegs3C4[ClockBase] &= 0xBF;
             
 		break;
-	    case PCI_CHIP_SIS300:
-	    case PCI_CHIP_SIS630:
-	    case PCI_CHIP_SIS540:
-		pReg->sisRegs3C4[0x2B] = (num -1) & 0x7f;
-		if (div == 2)
-		    pReg->sisRegs3C4[0x2B] |= 0x80;
-		pReg->sisRegs3C4[0x2C] = ((denum -1) & 0x1f);
-		pReg->sisRegs3C4[0x2C] |= (((scale-1)&3) << 5);
-		if (sbit)
-		    pReg->sisRegs3C4[0x2C] |= 0x80;
-		pReg->sisRegs3C4[0x2D] = 0x80;
-		break;
 	}
     }
     else  {
@@ -547,58 +246,13 @@
 		}
 		pReg->sisRegs3C4[XR2B] |= 0x80 ;   /* gain for high frequency */
 		break;
-
-	    case PCI_CHIP_SIS300:
-	    case PCI_CHIP_SIS630:
-	    case PCI_CHIP_SIS540:
-		pReg->sisRegs3C4[0x2B] = (vclk[Midx] - 1) & 0x7f ;
-		pReg->sisRegs3C4[0x2B] |= ((vclk[VLDidx] == 2 ) ? 1 : 0 ) << 7 ;
-
-		/* bits [4:0] contain denumerator -MC */
-		pReg->sisRegs3C4[0x2C] = (vclk[Nidx] -1) & 0x1f ;
-
-		if (vclk[Pidx] <= 4)  {
-		/* postscale 1,2,3,4 */
-		    pReg->sisRegs3C4[0x2C] |= (vclk[Pidx] -1 ) << 5 ;
-		    pReg->sisRegs3C4[0x2C] &= 0x7F;
-		} else  {
-		/* postscale 6,8 */
-		    pReg->sisRegs3C4[0x2C] |= ((vclk[Pidx] / 2) -1 ) << 5 ;
-		    pReg->sisRegs3C4[0x2C] |= 0x80;
-		}
-		pReg->sisRegs3C4[0x2D] = 0x80;
-		break;
 	}
     } /* end of set vclk */
 
-    switch (pSiS->Chipset)  {
-	case PCI_CHIP_SIS5597:
-	case PCI_CHIP_SIS6326:
-	case PCI_CHIP_SIS530:
-	    if (clock > 135000) pReg->sisRegs3C4[ClockReg] |= 0x02;
-	    break;
-	case PCI_CHIP_SIS300:
-	case PCI_CHIP_SIS630:
-	case PCI_CHIP_SIS540:
-	    if (clock > 150000)  {	/* enable two-pixel mode */
-		pReg->sisRegs3C4[0x07] |= 0x80;
-		pReg->sisRegs3C4[0x32] |= 0x08;
-	    } else  {
-		pReg->sisRegs3C4[0x07] &= 0x7F;
-		pReg->sisRegs3C4[0x32] &= 0xF7;
-	    }
+	if (clock > 135000)
+		pReg->sisRegs3C4[ClockReg] |= 0x02;
 
-	    pReg->sisRegs3C4[0x07] |= 0x10;
-	    pReg->sisRegs3C4[0x07] &= 0xFC;
-	    if (clock < 100000)
-		pReg->sisRegs3C4[0x07] |= 0x03;
-	    else if (clock < 200000)
-		pReg->sisRegs3C4[0x07] |= 0x02;
-	    else if (clock < 250000)
-		pReg->sisRegs3C4[0x07] |= 0x01;
-	    break;
-    }
-    pReg->sisRegs3C2[0x00] = inb(0x3CC) | 0x0C; /* Programmable Clock */
+    pReg->sisRegs3C2 = inb(0x3CC) | 0x0C; /* Programmable Clock */
 
     if (pSiS->FastVram && ((pSiS->Chipset == PCI_CHIP_SIS530) ||
 	(pSiS->Chipset == PCI_CHIP_SIS6326) ||
@@ -659,16 +313,6 @@
 		pReg->sisRegs3C4[MMIOEnable] |= 0x60; /* At PCI base */
 		pReg->sisRegs3C4[Mode64] |= 0x80;
 		break;
-	    case PCI_CHIP_SIS300:
-	    case PCI_CHIP_SIS630:
-	    case PCI_CHIP_SIS540:
-		pReg->sisRegs3C4[0x1E] |= 0x40;
-		if (pSiS->TurboQueue)  {	/* set Turbo Queue as 512k */
-		    temp1 = ((pScrn->videoRam/64)-4);
-		    pReg->sisRegs3C4[0x26] = temp1 & 0xFF;
-		    pReg->sisRegs3C4[0x27] = ((temp1 >> 8) & 3) || 0xF0;
-		}
-		break;
 	}
     }
 
@@ -731,9 +375,8 @@
 
 	break;
     case PCI_CHIP_SIS530:
-	Find530Threshold(pScrn, pSiS->MemClock, mode->Clock,
-			pScrn->bitsPerPixel, pSiS->BusWidth, pSiS->Flags,
-			&CRT_CPUthresholdLow, &CRT_CPUthresholdHigh);
+	(*pSiS->SetThreshold)(pScrn, mode, &CRT_CPUthresholdLow,
+					&CRT_CPUthresholdHigh);
 	pReg->sisRegs3C4[8] = (CRT_CPUthresholdLow & 0xf) << 4 | 0xF;
 	pReg->sisRegs3C4[9] &= 0xF0;
 	pReg->sisRegs3C4[9] |= (CRT_CPUthresholdHigh & 0xF);
@@ -742,90 +385,205 @@
 					(CRT_CPUthresholdLow & 0x10) >> 2 |
 					0x08;
 	break;
-    case PCI_CHIP_SIS300:
-	Find300_Threshold(pScrn, mode);
-	break;
-    case PCI_CHIP_SIS630:
-    case PCI_CHIP_SIS540: /* temperary settings */
-	Find630_Threshold(pScrn, mode);
-	break;
     }
-    outw(VGA_SEQ_INDEX, (SR5State << 8) | 0x05); /* Relock Registers */
+
     return(TRUE);
 }
 
-/*
- * Initialise a new mode.  This is currently still using the old
- * "initialise struct, restore/write struct to HW" model.  That could
- * be changed.
- */
-
-static Bool
-SiSModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
+Bool
+SIS300Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-    vgaRegPtr vgaReg;
-    SISPtr pSiS = SISPTR(pScrn);
-    SISRegPtr sisReg;
-	unsigned char	temp;
+	SISPtr	pSiS = SISPTR(pScrn);
+	SISRegPtr	pReg = &pSiS->ModeReg;
+	vgaRegPtr	vgaReg = &VGAHWPTR(pScrn)->ModeReg;
+	int	vgaIOBase;
+	unsigned short	temp;
+	int	offset;
+	int	clock = mode->Clock;
+	unsigned int	vclk[5];
+
+	int num, denum, div, sbit, scale;
+	unsigned short	Threshold_Low, Threshold_High;
+
+	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4, "SIS300Init()\n");
+	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 4,
+		"virtualX = %d depth = %d Logical width = %d\n",
+		pScrn->virtualX, pScrn->bitsPerPixel,
+		pScrn->virtualX * pScrn->bitsPerPixel/8);
+
+	vgaHWGetIOBase(VGAHWPTR(pScrn));
+	vgaIOBase = VGAHWPTR(pScrn)->IOBase;
 
-    vgaHWUnlock(hwp);
+	(*pSiS->SiSSave)(pScrn, pReg);
 
-    SiSModifyModeInfo(mode);
+	outw(VGA_SEQ_INDEX, 0x8605);
 
-    /* Initialise the ModeReg values */
-    if (!vgaHWInit(pScrn, mode))
-	return FALSE;
-    pScrn->vtSema = TRUE;
+	pReg->sisRegs3C4[6] &= ~GENMASK(4:2);
 
-	setSISIDXREG(pSiS->RelIO+CROFFSET, 0x30, 0xFC, SWITCH_TO_CRT2);
+	switch (pScrn->bitsPerPixel) {
+	case 8:
+		pSiS->DstColor = 0x0000;
+		pReg->sisRegs3C4[6] |= 0x03;
+		break;
+	case 16:
+		if (pScrn->depth==15)  {
+			pSiS->DstColor = 0x4000;
+			pReg->sisRegs3C4[6] |= ((1 << 2) | 0x03);
+		} else {
+			pSiS->DstColor = (short) 0x8000;
+			pReg->sisRegs3C4[6] |= ((2 << 2) | 0x03);
+		}
+		break;
+	case 24:
+		pReg->sisRegs3C4[6] |= ((3 << 2) | 0x03);
+		break;
+	case 32:
+		pSiS->DstColor = (short) 0xC000;
+		pReg->sisRegs3C4[6] |= ((4 << 2) | 0x03);
+		break;
+	}
+
+	pSiS->scrnOffset = pScrn->displayWidth * ((pScrn->bitsPerPixel+7)/8);
+
+	pReg->sisRegs3D4[0x19] = 0;
+	pReg->sisRegs3D4[0x1A] &= 0xFC;
+
+	if (mode->Flags & V_INTERLACE)  {
+		offset = pSiS->scrnOffset >> 2;
+		pReg->sisRegs3C4[0x06] |= 0x20;
+		if (pSiS->Chipset != PCI_CHIP_SIS300)  {
+			temp = (mode->CrtcHSyncStart >> 3) -
+				(mode->CrtcHTotal >> 3)/2;
+			pReg->sisRegs3D4[0x19] = GETVAR8(temp);
+			pReg->sisRegs3D4[0x1A] |= GETBITS(temp, 9:8);
+		}
+	} else  {
+		offset = pSiS->scrnOffset >> 3;
+		pReg->sisRegs3C4[0x06] &= ~0x20;
+	}
+
+	pReg->sisRegs3C4[0x07] |= 0x10;		/* enable High Speed DAC */
+	pReg->sisRegs3C4[0x07] &= 0xFC;
+	if (clock < 100000)
+		pReg->sisRegs3C4[0x07] |= 0x03;
+	else if (clock < 200000)
+		pReg->sisRegs3C4[0x07] |= 0x02;
+	else if (clock < 250000)
+		pReg->sisRegs3C4[0x07] |= 0x01;
+
+	/* Extended Vertical Overflow */
+	pReg->sisRegs3C4[0x0A] = 
+			GETBITSTR(mode->CrtcVTotal     -2, 10:10, 0:0) |
+			GETBITSTR(mode->CrtcVDisplay   -1, 10:10, 1:1) |
+			GETBITSTR(mode->CrtcVBlankStart  , 10:10, 2:2) |
+			GETBITSTR(mode->CrtcVSyncStart   , 10:10, 3:3) |
+			GETBITSTR(mode->CrtcVBlankEnd    ,   8:8, 4:4) |
+			GETBITSTR(mode->CrtcVSyncEnd     ,   4:4, 5:5) ;
+
+	/* Extended Horizontal Overflow */
+	pReg->sisRegs3C4[0x0B] = 
+			GETBITSTR((mode->CrtcHTotal      >> 3) - 5, 9:8, 1:0) |
+			GETBITSTR((mode->CrtcHDisplay    >> 3) - 1, 9:8, 3:2) |
+			GETBITSTR((mode->CrtcHBlankStart >> 3)    , 9:8, 5:4) |
+			GETBITSTR((mode->CrtcHSyncStart  >> 3)    , 9:8, 7:6) ;
+
+	pReg->sisRegs3C4[0x0C] &= 0xF8;
+	pReg->sisRegs3C4[0x0C] |= 
+			GETBITSTR(mode->CrtcHBlankEnd >> 3, 7:6, 1:0) |
+			GETBITSTR(mode->CrtcHSyncEnd  >> 3, 5:5, 2:2) ;
+
+	/* Screen Offset */
+	vgaReg->CRTC[0x13] = GETVAR8(offset);
+	pReg->sisRegs3C4[0x0E] &= 0xF0;
+	pReg->sisRegs3C4[0x0E] |= GETBITS(offset, 11:8);
+
+	/* line compare */
+	if (mode->CrtcHDisplay > 0)
+		pReg->sisRegs3C4[0x0F] |= 0x08;
+	else
+		pReg->sisRegs3C4[0x0F] &= 0xF7;
 
-	inSISIDXREG(pSiS->RelIO+CROFFSET, 0x31, temp);
-	temp &= 0xDD;
-	temp |= (DRIVER_MODE |DISABLE_CRT2_DISPLAY) >> 8;
-	outSISIDXREG(pSiS->RelIO+CROFFSET, 0x31, temp);
+	pReg->sisRegs3C4[0x10] = 
+		((mode->CrtcHDisplay *((pScrn->bitsPerPixel+7)/8) + 63) >> 6)+1;
 
-    if (!SiSInit(pScrn, mode))
-	return FALSE;
+	/* Enable Linear */
+	pReg->sisRegs3C4[0x20] |= 0x81;
 
-    PDEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"HDisplay: %d, VDisplay: %d  \n",
-		mode->HDisplay, mode->VDisplay));
-    /* Program the registers */
-    vgaHWProtect(pScrn, TRUE);
-    vgaReg = &hwp->ModeReg;
-    sisReg = &pSiS->ModeReg;
 
-    vgaReg->Attribute[0x10] = 0x01;
-    if (pScrn->bitsPerPixel > 8) 
-    	vgaReg->Graphics[0x05] = 0x00;
+    /* Set vclk */	
+    if (compute_vclk(clock, &num, &denum, &div, &sbit, &scale)) {
+		pReg->sisRegs3C4[0x2B] = (num -1) & 0x7f;
+		if (div == 2)
+		    pReg->sisRegs3C4[0x2B] |= 0x80;
+		pReg->sisRegs3C4[0x2C] = ((denum -1) & 0x1f);
+		pReg->sisRegs3C4[0x2C] |= (((scale-1)&3) << 5);
+		if (sbit)
+		    pReg->sisRegs3C4[0x2C] |= 0x80;
+		pReg->sisRegs3C4[0x2D] = 0x80;
+    }
+    else  {
+    /* if compute_vclk cannot handle the request clock try sisCalcClock! */
+    	SiSCalcClock(pScrn, clock, 2, vclk);
+		pReg->sisRegs3C4[0x2B] = (vclk[Midx] - 1) & 0x7f ;
+		pReg->sisRegs3C4[0x2B] |= ((vclk[VLDidx] == 2 ) ? 1 : 0 ) << 7 ;
 
-    vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
+		/* bits [4:0] contain denumerator -MC */
+		pReg->sisRegs3C4[0x2C] = (vclk[Nidx] -1) & 0x1f ;
 
-    SiSRestore(pScrn, sisReg);
+		if (vclk[Pidx] <= 4)  {
+		/* postscale 1,2,3,4 */
+		    pReg->sisRegs3C4[0x2C] |= (vclk[Pidx] -1 ) << 5 ;
+		    pReg->sisRegs3C4[0x2C] &= 0x7F;
+		} else  {
+		/* postscale 6,8 */
+		    pReg->sisRegs3C4[0x2C] |= ((vclk[Pidx] / 2) -1 ) << 5 ;
+		    pReg->sisRegs3C4[0x2C] |= 0x80;
+		}
+		pReg->sisRegs3C4[0x2D] = 0x80;
+    } /* end of set vclk */
 
-	if (pSiS->VBFlags)  {
-		SiSSetMode(pScrn, 0x44);
-		outSISIDXREG(pSiS->RelIO+CROFFSET, 0x32,
-						sisReg->sisRegs3C4[0x32]);
+	if (clock > 150000)  {	/* enable two-pixel mode */
+		pReg->sisRegs3C4[0x07] |= 0x80;
+		pReg->sisRegs3C4[0x32] |= 0x08;
+	} else  {
+		pReg->sisRegs3C4[0x07] &= 0x7F;
+		pReg->sisRegs3C4[0x32] &= 0xF7;
 	}
+
 
-    vgaHWProtect(pScrn, FALSE);
+	pReg->sisRegs3C2 = inb(0x3CC) | 0x0C; /* Programmable Clock */
 
-    if (pSiS->MemClock)
-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-		"Memory clock is set to %3.3fMHz\n", pSiS->MemClock/1.0);
+	if (!pSiS->NoAccel) {
+		pReg->sisRegs3C4[0x1E] |= 0x42;
+		if (pSiS->TurboQueue)  {	/* set Turbo Queue as 512k */
+			temp = ((pScrn->videoRam/64)-4);
+			pReg->sisRegs3C4[0x26] = temp & 0xFF;
+			pReg->sisRegs3C4[0x27] = ((temp >> 8) & 3) || 0xF0;
+		}
+	}
 
-/* Reserved for debug
- *
-    SiSIODump(pScrn);
-    SiSDumpModeInfo(pScrn, mode);
- *
- */
-    return TRUE;
+	/* set threshold value */
+	(*pSiS->SetThreshold)(pScrn, mode, &Threshold_Low, &Threshold_High);
+	pReg->sisRegs3C4[0x08] = GETBITSTR(Threshold_Low, 3:0, 7:4) | 0xF;
+	pReg->sisRegs3C4[0x0F] &= ~GENMASK(5:5);
+	pReg->sisRegs3C4[0x0F] |= GETBITSTR(Threshold_Low, 4:4, 5:5);
+	pReg->sisRegs3C4[0x09] &= ~GENMASK(3:0);
+	pReg->sisRegs3C4[0x09] |= GETBITS(Threshold_High, 3:0);
+
+	return(TRUE);
 }
 
-void SiSVGASetup(ScrnInfoPtr pScrn)
+void SISVGAPreInit(ScrnInfoPtr pScrn)
 {
-	SISPTR(pScrn)->ModeInit = SiSModeInit;
+	SISPtr	pSiS = SISPTR(pScrn);
+
+	switch (pSiS->Chipset)  {
+	case PCI_CHIP_SIS300:
+	case PCI_CHIP_SIS630:
+	case PCI_CHIP_SIS540:
+		pSiS->ModeInit = SIS300Init;
+		break;
+	default:
+		pSiS->ModeInit = SISInit;
+	}
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile	Fri Jun 30 10:15:13 2000
@@ -0,0 +1,38 @@
+XCOMM
+XCOMM This is an Imakefile for the bw2 driver.
+XCOMM
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile,v 1.1 2000/06/30 17:15:13 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = bw2_driver.c
+OBJS = bw2_driver.o
+
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+           -I$(SERVERSRC)/Xext -I$(XF86SRC)/xf1bpp \
+	   -I$(XF86SRC)/ramdac \
+           -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(EXTINCSRC)
+#endif
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+ModuleObjectRule()
+
+ObjectModuleTarget(sunbw2,$(OBJS))
+
+InstallObjectModule(sunbw2,$(MODULEDIR),drivers)
+
+#if !defined(XF86DriverSDK)
+CppManTarget(sunbw2,)
+InstallModuleManPage(sunbw2)
+#endif
+
+DependTarget()
Index: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2.h:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2.h	Fri Jun 30 10:15:13 2000
@@ -0,0 +1,50 @@
+/*
+ * BW2 framebuffer - defines.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2.h,v 1.1 2000/06/30 17:15:13 dawes Exp $ */
+
+#ifndef BW2_H
+#define BW2_H
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86RamDac.h"
+#include "Xmd.h"
+#include "gcstruct.h"
+#include "xf86sbusBus.h"
+
+/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
+#define BW2_RAM_VOFF	0
+
+typedef struct {
+	unsigned char	*fb;
+	int		width;
+	int		height;
+
+	sbusDevicePtr	psdp;
+	CloseScreenProcPtr CloseScreen;
+} Bw2Rec, *Bw2Ptr;
+
+#define GET_BW2_FROM_SCRN(p)    ((Bw2Ptr)((p)->driverPrivate))
+
+#endif /* BW2_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c	Fri Jun 30 10:15:14 2000
@@ -0,0 +1,588 @@
+/*
+ * BW2 framebuffer driver.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.1 2000/06/30 17:15:14 dawes Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Version.h"
+#include "mipointer.h"
+#include "mibstore.h"
+#include "micmap.h"
+
+#include "xf1bpp.h"
+#include "xf86cmap.h"
+#include "bw2.h"
+
+static OptionInfoPtr BW2AvailableOptions(int chipid, int busid);
+static void	BW2Identify(int flags);
+static Bool	BW2Probe(DriverPtr drv, int flags);
+static Bool	BW2PreInit(ScrnInfoPtr pScrn, int flags);
+static Bool	BW2ScreenInit(int Index, ScreenPtr pScreen, int argc,
+			      char **argv);
+static Bool	BW2EnterVT(int scrnIndex, int flags);
+static void	BW2LeaveVT(int scrnIndex, int flags);
+static Bool	BW2CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	BW2SaveScreen(ScreenPtr pScreen, int mode);
+
+/* Required if the driver supports mode switching */
+static Bool	BW2SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+/* Required if the driver supports moving the viewport */
+static void	BW2AdjustFrame(int scrnIndex, int x, int y, int flags);
+
+/* Optional functions */
+static void	BW2FreeScreen(int scrnIndex, int flags);
+static int	BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
+
+void BW2Sync(ScrnInfoPtr pScrn);
+
+#define VERSION 4000
+#define BW2_NAME "SUNBW2"
+#define BW2_DRIVER_NAME "sunbw2"
+#define BW2_MAJOR_VERSION 1
+#define BW2_MINOR_VERSION 0
+#define BW2_PATCHLEVEL 0
+
+/* 
+ * This contains the functions needed by the server after loading the driver
+ * module.  It must be supplied, and gets passed back by the SetupProc
+ * function in the dynamic case.  In the static case, a reference to this
+ * is compiled in, and this requires that the name of this DriverRec be
+ * an upper-case version of the driver name.
+ */
+
+DriverRec SUNBW2 = {
+    VERSION,
+    BW2_DRIVER_NAME,
+    BW2Identify,
+    BW2Probe,
+    BW2AvailableOptions,
+    NULL,
+    0
+};
+
+static OptionInfoRec BW2Options[] = {
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+
+#ifdef XFree86LOADER
+
+static MODULESETUPPROTO(bw2Setup);
+
+static XF86ModuleVersionInfo sunbw2VersRec =
+{
+	"sunbw2",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	BW2_MAJOR_VERSION, BW2_MINOR_VERSION, BW2_PATCHLEVEL,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0,0,0,0}
+};
+
+XF86ModuleData sunbw2ModuleData = { &sunbw2VersRec, bw2Setup, NULL };
+
+pointer
+bw2Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    static Bool setupDone = FALSE;
+
+    if (!setupDone) {
+	setupDone = TRUE;
+	xf86AddDriver(&SUNBW2, module, 0);
+
+	/*
+	 * Modules that this driver always requires can be loaded here
+	 * by calling LoadSubModule().
+	 */
+
+	/*
+	 * The return value must be non-NULL on success even though there
+	 * is no TearDownProc.
+	 */
+	return (pointer)TRUE;
+    } else {
+	if (errmaj) *errmaj = LDR_ONCEONLY;
+	return NULL;
+    }
+}
+
+#endif /* XFree86LOADER */
+
+static Bool
+BW2GetRec(ScrnInfoPtr pScrn)
+{
+    /*
+     * Allocate an Bw2Rec, and hook it into pScrn->driverPrivate.
+     * pScrn->driverPrivate is initialised to NULL, so we can check if
+     * the allocation has already been done.
+     */
+    if (pScrn->driverPrivate != NULL)
+	return TRUE;
+
+    pScrn->driverPrivate = xnfcalloc(sizeof(Bw2Rec), 1);
+    return TRUE;
+}
+
+static void
+BW2FreeRec(ScrnInfoPtr pScrn)
+{
+    Bw2Ptr pBw2;
+
+    if (pScrn->driverPrivate == NULL)
+	return;
+
+    pBw2 = GET_BW2_FROM_SCRN(pScrn);
+
+    xfree(pScrn->driverPrivate);
+    pScrn->driverPrivate = NULL;
+
+    return;
+}
+
+static 
+OptionInfoPtr
+BW2AvailableOptions(int chipid, int busid)
+{
+    return BW2Options;
+}
+
+/* Mandatory */
+static void
+BW2Identify(int flags)
+{
+    xf86Msg(X_INFO, "%s: driver for BWtwo\n", BW2_NAME);
+}
+
+
+/* Mandatory */
+static Bool
+BW2Probe(DriverPtr drv, int flags)
+{
+    int i;
+    GDevPtr *devSections = NULL;
+    int *usedChips;
+    int numDevSections;
+    int numUsed;
+    Bool foundScreen = FALSE;
+    EntityInfoPtr pEnt;
+
+    /*
+     * The aim here is to find all cards that this driver can handle,
+     * and for the ones not already claimed by another driver, claim the
+     * slot, and allocate a ScrnInfoRec.
+     *
+     * This should be a minimal probe, and it should under no circumstances
+     * change the state of the hardware.  Because a device is found, don't
+     * assume that it will be used.  Don't do any initialisations other than
+     * the required ScrnInfoRec initialisations.  Don't allocate any new
+     * data structures.
+     */
+
+    /*
+     * Next we check, if there has been a chipset override in the config file.
+     * For this we must find out if there is an active device section which
+     * is relevant, i.e., which has no driver specified or has THIS driver
+     * specified.
+     */
+
+    if ((numDevSections = xf86MatchDevice(BW2_DRIVER_NAME,
+					  &devSections)) <= 0) {
+	/*
+	 * There's no matching device section in the config file, so quit
+	 * now.
+	 */
+	return FALSE;
+    }
+
+    /*
+     * We need to probe the hardware first.  We then need to see how this
+     * fits in with what is given in the config file, and allow the config
+     * file info to override any contradictions.
+     */
+
+    numUsed = xf86MatchSbusInstances(BW2_NAME, SBUS_DEVICE_BW2,
+		   devSections, numDevSections,
+		   drv, &usedChips);
+				    
+    if (devSections)
+	xfree(devSections);
+    devSections = NULL;
+    if (numUsed <= 0)
+	return FALSE;
+
+    if (flags & PROBE_DETECT)
+	foundScreen = TRUE;
+    else for (i = 0; i < numUsed; i++) {
+	pEnt = xf86GetEntityInfo(usedChips[i]);
+
+	/*
+	 * Check that nothing else has claimed the slots.
+	 */
+	if(pEnt->active) {
+	    ScrnInfoPtr pScrn;
+	    
+	    /* Allocate a ScrnInfoRec and claim the slot */
+	    pScrn = xf86AllocateScreen(drv, 0);
+
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = VERSION;
+	    pScrn->driverName	 = BW2_DRIVER_NAME;
+	    pScrn->name		 = BW2_NAME;
+	    pScrn->Probe	 = BW2Probe;
+	    pScrn->PreInit	 = BW2PreInit;
+	    pScrn->ScreenInit	 = BW2ScreenInit;
+  	    pScrn->SwitchMode	 = BW2SwitchMode;
+  	    pScrn->AdjustFrame	 = BW2AdjustFrame;
+	    pScrn->EnterVT	 = BW2EnterVT;
+	    pScrn->LeaveVT	 = BW2LeaveVT;
+	    pScrn->FreeScreen	 = BW2FreeScreen;
+	    pScrn->ValidMode	 = BW2ValidMode;
+	    xf86AddEntityToScreen(pScrn, pEnt->index);
+	    foundScreen = TRUE;
+	}
+	xfree(pEnt);
+    }
+    return foundScreen;
+}
+
+/* Mandatory */
+static Bool
+BW2PreInit(ScrnInfoPtr pScrn, int flags)
+{
+    Bw2Ptr pBw2;
+    sbusDevicePtr psdp;
+    MessageType from;
+    int i;
+
+    if (flags & PROBE_DETECT) return FALSE;
+
+    /*
+     * Note: This function is only called once at server startup, and
+     * not at the start of each server generation.  This means that
+     * only things that are persistent across server generations can
+     * be initialised here.  xf86Screens[] is (pScrn is a pointer to one
+     * of these).  Privates allocated using xf86AllocateScrnInfoPrivateIndex()  
+     * are too, and should be used for data that must persist across
+     * server generations.
+     *
+     * Per-generation data should be allocated with
+     * AllocateScreenPrivateIndex() from the ScreenInit() function.
+     */
+
+    /* Allocate the Bw2Rec driverPrivate */
+    if (!BW2GetRec(pScrn)) {
+	return FALSE;
+    }
+    pBw2 = GET_BW2_FROM_SCRN(pScrn);
+    
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
+
+    /* This driver doesn't expect more than one entity per screen */
+    if (pScrn->numEntities > 1)
+	return FALSE;
+    /* This is the general case */
+    for (i = 0; i < pScrn->numEntities; i++) {
+	EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+
+	/* BW2 is purely SBUS */
+	if (pEnt->location.type == BUS_SBUS) {
+	    psdp = xf86GetSbusInfoForEntity(pEnt->index);
+	    pBw2->psdp = psdp;
+	} else
+	    return FALSE;
+    }
+
+    /*********************
+    deal with depth
+    *********************/
+    
+    if (!xf86SetDepthBpp(pScrn, 0, 0, 0, NoDepth24Support)) {
+	return FALSE;
+    } else {
+	/* Check that the returned depth is one we support */
+	switch (pScrn->depth) {
+	case 1:
+	    /* OK */
+	    break;
+	default:
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "Given depth (%d) is not supported by this driver\n",
+		       pScrn->depth);
+	    return FALSE;
+	}
+    }
+
+    if (!xf86SetDefaultVisual(pScrn, -1))
+	return FALSE;
+
+    /*
+     * The new cmap code requires this to be initialised.
+     */
+
+    {
+	Gamma zeros = {0.0, 0.0, 0.0};
+
+	if (!xf86SetGamma(pScrn, zeros)) {
+	    return FALSE;
+	}
+    }
+
+    /* Set the bits per RGB for 8bpp mode */
+    from = X_DEFAULT;
+
+    if (xf86LoadSubModule(pScrn, "xf1bpp") == NULL) {
+	BW2FreeRec(pScrn);
+	return FALSE;
+    }
+
+    /*********************
+    set up clock and mode stuff
+    *********************/
+    
+    pScrn->progClock = TRUE;
+
+    if(pScrn->display->virtualX || pScrn->display->virtualY) {
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "BW2 does not support a virtual desktop\n");
+	pScrn->display->virtualX = 0;
+	pScrn->display->virtualY = 0;
+    }
+
+    xf86SbusUseBuiltinMode(pScrn, pBw2->psdp);
+    pScrn->currentMode = pScrn->modes;
+    pScrn->displayWidth = pScrn->virtualX;
+
+    /* Set display resolution */
+    xf86SetDpi(pScrn, 0, 0);
+
+    return TRUE;
+}
+
+/* Mandatory */
+
+/* This gets called at the start of each server generation */
+
+static Bool
+BW2ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+{
+    ScrnInfoPtr pScrn;
+    Bw2Ptr pBw2;
+    int ret;
+
+    /* 
+     * First get the ScrnInfoRec
+     */
+    pScrn = xf86Screens[pScreen->myNum];
+
+    pBw2 = GET_BW2_FROM_SCRN(pScrn);
+
+    /* Map the BW2 memory */
+    pBw2->fb =
+	xf86MapSbusMem (pBw2->psdp, BW2_RAM_VOFF,
+			(pBw2->psdp->width * pBw2->psdp->height / 8));
+
+    if (! pBw2->fb)
+	return FALSE;
+
+    /* Darken the screen for aesthetic reasons and set the viewport */
+    BW2SaveScreen(pScreen, SCREEN_SAVER_ON);
+
+    /*
+     * The next step is to setup the screen's visuals, and initialise the
+     * framebuffer code.  In cases where the framebuffer's default
+     * choices for things like visual layouts and bits per RGB are OK,
+     * this may be as simple as calling the framebuffer's ScreenInit()
+     * function.  If not, the visuals will need to be setup before calling
+     * a fb ScreenInit() function and fixed up after.
+     */
+
+    /*
+     * Reset visual list.
+     */
+    miClearVisualTypes();
+
+    /* Set the bits per RGB for 8bpp mode */
+    pScrn->rgbBits = 8;
+
+    /* Setup the visuals we support. */
+
+    if (!miSetVisualTypes(pScrn->depth, miGetDefaultVisualMask(pScrn->depth),
+			  pScrn->rgbBits, pScrn->defaultVisual))
+	return FALSE;
+
+    /*
+     * Call the framebuffer layer's ScreenInit function, and fill in other
+     * pScreen fields.
+     */
+
+    ret = xf1bppScreenInit(pScreen, pBw2->fb, pScrn->virtualX,
+			   pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+			   pScrn->virtualX);
+    if (!ret)
+	return FALSE;
+
+    miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+
+    xf86SetBlackWhitePixels(pScreen);
+
+    /* Initialise cursor functions */
+    miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
+
+    /* Initialise default colourmap */
+    if (!miCreateDefColormap(pScreen))
+	return FALSE;
+
+    pBw2->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = BW2CloseScreen;
+    pScreen->SaveScreen = BW2SaveScreen;
+
+    /* Report any unused options (only for the first generation) */
+    if (serverGeneration == 1) {
+	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+    }
+
+    /* unblank the screen */
+    BW2SaveScreen(pScreen, SCREEN_SAVER_OFF);
+
+    /* Done */
+    return TRUE;
+}
+
+
+/* Usually mandatory */
+static Bool
+BW2SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This function is used to initialize the Start Address - the first
+ * displayed location in the video memory.
+ */
+/* Usually mandatory */
+static void 
+BW2AdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+    /* we don't support virtual desktops */
+    return;
+}
+
+/*
+ * This is called when VT switching back to the X server.  Its job is
+ * to reinitialise the video mode.
+ */
+
+/* Mandatory */
+static Bool
+BW2EnterVT(int scrnIndex, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This is called when VT switching away from the X server.
+ */
+
+/* Mandatory */
+static void
+BW2LeaveVT(int scrnIndex, int flags)
+{
+    return;
+}
+
+
+/*
+ * This is called at the end of each server generation.  It restores the
+ * original (text) mode.  It should really also unmap the video memory too.
+ */
+
+/* Mandatory */
+static Bool
+BW2CloseScreen(int scrnIndex, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    Bw2Ptr pBw2 = GET_BW2_FROM_SCRN(pScrn);
+
+    pScrn->vtSema = FALSE;
+    xf86UnmapSbusMem(pBw2->psdp, pBw2->fb,
+		     (pBw2->psdp->width * pBw2->psdp->height / 8));
+    
+    pScreen->CloseScreen = pBw2->CloseScreen;
+    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+    return FALSE;
+}
+
+
+/* Free up any per-generation data structures */
+
+/* Optional */
+static void
+BW2FreeScreen(int scrnIndex, int flags)
+{
+    BW2FreeRec(xf86Screens[scrnIndex]);
+}
+
+
+/* Checks if a mode is suitable for the selected chipset. */
+
+/* Optional */
+static int
+BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+{
+    if (mode->Flags & V_INTERLACE)
+	return(MODE_BAD);
+
+    return(MODE_OK);
+}
+
+/* Do screen blanking */
+
+/* Mandatory */
+static Bool
+BW2SaveScreen(ScreenPtr pScreen, int mode)
+    /* this function should blank the screen when unblank is FALSE and
+       unblank it when unblank is TRUE -- it doesn't actually seem to be
+       used for much though */
+{
+    return TRUE;
+}
+
+/*
+ * This is the implementation of the Sync() function.
+ */
+void
+BW2Sync(ScrnInfoPtr pScrn)
+{
+    return;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.cpp:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.cpp	Fri Jun 30 10:15:14 2000
@@ -0,0 +1,30 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.cpp,v 1.1 2000/06/30 17:15:14 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH SUNBW2 __drivermansuffix__ "Version 4.0"  "XFree86"
+.SH NAME
+sunbw2 \- BW2 video driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qsunbw2\*q"
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B sunbw2
+is an XFree86 driver for Sun BW2 video cards.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+The
+.B sunbw2
+driver supports...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details.  This section only covers configuration details specific to this
+driver.
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+.SH AUTHORS
+Authors include: Jakub Jelinek <jakub@redhat.com>
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile	Fri Jun 30 10:15:14 2000
@@ -0,0 +1,38 @@
+XCOMM
+XCOMM This is an Imakefile for the cg14 driver.
+XCOMM
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile,v 1.1 2000/06/30 17:15:14 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = cg14_driver.c
+OBJS = cg14_driver.o
+
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+           -I$(SERVERSRC)/Xext -I$(SERVERSRC)/cfb \
+	   -I$(XF86SRC)/ramdac \
+           -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(EXTINCSRC)
+#endif
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+ModuleObjectRule()
+
+ObjectModuleTarget(suncg14,$(OBJS))
+
+InstallObjectModule(suncg14,$(MODULEDIR),drivers)
+
+#if !defined(XF86DriverSDK)
+CppManTarget(suncg14,)
+InstallModuleManPage(suncg14)
+#endif
+
+DependTarget()
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14.h:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14.h	Fri Jun 30 10:15:14 2000
@@ -0,0 +1,71 @@
+/*
+ * CG14 framebuffer - defines.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14.h,v 1.1 2000/06/30 17:15:14 dawes Exp $ */
+
+#ifndef CG14_H
+#define CG14_H
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86RamDac.h"
+#include "Xmd.h"
+#include "gcstruct.h"
+#include "xf86sbusBus.h"
+
+/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
+#define CG14_REGS_VOFF		0x00000000	/* registers */
+#define CG14_XLUT_VOFF		0x00003000	/* X Look Up Table */
+#define CG14_CLUT1_VOFF		0x00004000	/* Color Look Up Table */
+#define CG14_CLUT2_VOFF		0x00005000	/* Color Look Up Table */
+#define CG14_CLUT3_VOFF		0x00006000	/* Color Look Up Table */
+#define CG14_DIRECT_VOFF	0x10000000
+#define CG14_CTLREG_VOFF	0x20000000
+#define CG14_CURSOR_VOFF	0x30000000
+#define CG14_SHDW_VRT_VOFF	0x40000000
+#define CG14_XBGR_VOFF		0x50000000
+#define CG14_BGR_VOFF		0x60000000
+#define CG14_X16_VOFF		0x70000000
+#define CG14_C16_VOFF		0x80000000
+#define CG14_X32_VOFF		0x90000000
+#define CG14_B32_VOFF		0xa0000000
+#define CG14_G32_VOFF		0xb0000000
+#define CG14_R32_VOFF		0xc0000000
+
+typedef struct {
+	unsigned int	*fb;
+	unsigned char	*x32;
+	unsigned char	*xlut;
+	int		width;
+	int		height;
+	sbusDevicePtr	psdp;
+	CloseScreenProcPtr CloseScreen;
+} Cg14Rec, *Cg14Ptr;
+
+#define GET_CG14_FROM_SCRN(p)    ((Cg14Ptr)((p)->driverPrivate))
+
+#ifdef linux
+#define CG14_SET_PIXELMODE	(('M' << 8) | 3)
+#endif
+
+#endif /* CG14_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14_driver.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14_driver.c:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14_driver.c	Fri Jun 30 10:15:14 2000
@@ -0,0 +1,673 @@
+/*
+ * CG14 framebuffer driver.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14_driver.c,v 1.1 2000/06/30 17:15:14 dawes Exp $ */
+
+#define PSZ 8
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Version.h"
+#include "mipointer.h"
+#include "mibstore.h"
+#include "micmap.h"
+
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+#include "xf86cmap.h"
+#include "cg14.h"
+
+static OptionInfoPtr CG14AvailableOptions(int chipid, int busid);
+static void	CG14Identify(int flags);
+static Bool	CG14Probe(DriverPtr drv, int flags);
+static Bool	CG14PreInit(ScrnInfoPtr pScrn, int flags);
+static Bool	CG14ScreenInit(int Index, ScreenPtr pScreen, int argc,
+			      char **argv);
+static Bool	CG14EnterVT(int scrnIndex, int flags);
+static void	CG14LeaveVT(int scrnIndex, int flags);
+static Bool	CG14CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	CG14SaveScreen(ScreenPtr pScreen, int mode);
+static void	CG14InitCplane24(ScrnInfoPtr pScrn);
+static void	CG14ExitCplane24(ScrnInfoPtr pScrn);
+
+/* Required if the driver supports mode switching */
+static Bool	CG14SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+/* Required if the driver supports moving the viewport */
+static void	CG14AdjustFrame(int scrnIndex, int x, int y, int flags);
+
+/* Optional functions */
+static void	CG14FreeScreen(int scrnIndex, int flags);
+static int	CG14ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
+
+void CG14Sync(ScrnInfoPtr pScrn);
+
+#define VERSION 4000
+#define CG14_NAME "SUNCG14"
+#define CG14_DRIVER_NAME "suncg14"
+#define CG14_MAJOR_VERSION 1
+#define CG14_MINOR_VERSION 0
+#define CG14_PATCHLEVEL 0
+
+/* 
+ * This contains the functions needed by the server after loading the driver
+ * module.  It must be supplied, and gets passed back by the SetupProc
+ * function in the dynamic case.  In the static case, a reference to this
+ * is compiled in, and this requires that the name of this DriverRec be
+ * an upper-case version of the driver name.
+ */
+
+DriverRec SUNCG14 = {
+    VERSION,
+    CG14_DRIVER_NAME,
+    CG14Identify,
+    CG14Probe,
+    CG14AvailableOptions,
+    NULL,
+    0
+};
+
+static OptionInfoRec CG14Options[] = {
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+
+#ifdef XFree86LOADER
+
+static MODULESETUPPROTO(cg14Setup);
+
+static XF86ModuleVersionInfo suncg14VersRec =
+{
+	"suncg14",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	CG14_MAJOR_VERSION, CG14_MINOR_VERSION, CG14_PATCHLEVEL,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0,0,0,0}
+};
+
+XF86ModuleData suncg14ModuleData = { &suncg14VersRec, cg14Setup, NULL };
+
+pointer
+cg14Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    static Bool setupDone = FALSE;
+
+    if (!setupDone) {
+	setupDone = TRUE;
+	xf86AddDriver(&SUNCG14, module, 0);
+
+	/*
+	 * Modules that this driver always requires can be loaded here
+	 * by calling LoadSubModule().
+	 */
+
+	/*
+	 * The return value must be non-NULL on success even though there
+	 * is no TearDownProc.
+	 */
+	return (pointer)TRUE;
+    } else {
+	if (errmaj) *errmaj = LDR_ONCEONLY;
+	return NULL;
+    }
+}
+
+#endif /* XFree86LOADER */
+
+static Bool
+CG14GetRec(ScrnInfoPtr pScrn)
+{
+    /*
+     * Allocate an Cg14Rec, and hook it into pScrn->driverPrivate.
+     * pScrn->driverPrivate is initialised to NULL, so we can check if
+     * the allocation has already been done.
+     */
+    if (pScrn->driverPrivate != NULL)
+	return TRUE;
+
+    pScrn->driverPrivate = xnfcalloc(sizeof(Cg14Rec), 1);
+    return TRUE;
+}
+
+static void
+CG14FreeRec(ScrnInfoPtr pScrn)
+{
+    Cg14Ptr pCg14;
+
+    if (pScrn->driverPrivate == NULL)
+	return;
+
+    pCg14 = GET_CG14_FROM_SCRN(pScrn);
+
+    xfree(pScrn->driverPrivate);
+    pScrn->driverPrivate = NULL;
+
+    return;
+}
+
+static 
+OptionInfoPtr
+CG14AvailableOptions(int chipid, int busid)
+{
+    return CG14Options;
+}
+
+/* Mandatory */
+static void
+CG14Identify(int flags)
+{
+    xf86Msg(X_INFO, "%s: driver for CG14\n", CG14_NAME);
+}
+
+
+/* Mandatory */
+static Bool
+CG14Probe(DriverPtr drv, int flags)
+{
+    int i;
+    GDevPtr *devSections = NULL;
+    int *usedChips;
+    int numDevSections;
+    int numUsed;
+    Bool foundScreen = FALSE;
+    EntityInfoPtr pEnt;
+
+    /*
+     * The aim here is to find all cards that this driver can handle,
+     * and for the ones not already claimed by another driver, claim the
+     * slot, and allocate a ScrnInfoRec.
+     *
+     * This should be a minimal probe, and it should under no circumstances
+     * change the state of the hardware.  Because a device is found, don't
+     * assume that it will be used.  Don't do any initialisations other than
+     * the required ScrnInfoRec initialisations.  Don't allocate any new
+     * data structures.
+     */
+
+    /*
+     * Next we check, if there has been a chipset override in the config file.
+     * For this we must find out if there is an active device section which
+     * is relevant, i.e., which has no driver specified or has THIS driver
+     * specified.
+     */
+
+    if ((numDevSections = xf86MatchDevice(CG14_DRIVER_NAME,
+					  &devSections)) <= 0) {
+	/*
+	 * There's no matching device section in the config file, so quit
+	 * now.
+	 */
+	return FALSE;
+    }
+
+    /*
+     * We need to probe the hardware first.  We then need to see how this
+     * fits in with what is given in the config file, and allow the config
+     * file info to override any contradictions.
+     */
+
+    numUsed = xf86MatchSbusInstances(CG14_NAME, SBUS_DEVICE_CG14,
+		   devSections, numDevSections,
+		   drv, &usedChips);
+				    
+    if (devSections)
+	xfree(devSections);
+    devSections = NULL;
+    if (numUsed <= 0)
+	return FALSE;
+
+    if (flags & PROBE_DETECT)
+	foundScreen = TRUE;
+    else for (i = 0; i < numUsed; i++) {
+	pEnt = xf86GetEntityInfo(usedChips[i]);
+
+	/*
+	 * Check that nothing else has claimed the slots.
+	 */
+	if(pEnt->active) {
+	    ScrnInfoPtr pScrn;
+	    
+	    /* Allocate a ScrnInfoRec and claim the slot */
+	    pScrn = xf86AllocateScreen(drv, 0);
+
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = VERSION;
+	    pScrn->driverName	 = CG14_DRIVER_NAME;
+	    pScrn->name		 = CG14_NAME;
+	    pScrn->Probe	 = CG14Probe;
+	    pScrn->PreInit	 = CG14PreInit;
+	    pScrn->ScreenInit	 = CG14ScreenInit;
+  	    pScrn->SwitchMode	 = CG14SwitchMode;
+  	    pScrn->AdjustFrame	 = CG14AdjustFrame;
+	    pScrn->EnterVT	 = CG14EnterVT;
+	    pScrn->LeaveVT	 = CG14LeaveVT;
+	    pScrn->FreeScreen	 = CG14FreeScreen;
+	    pScrn->ValidMode	 = CG14ValidMode;
+	    xf86AddEntityToScreen(pScrn, pEnt->index);
+	    foundScreen = TRUE;
+	}
+	xfree(pEnt);
+    }
+    return foundScreen;
+}
+
+/* Mandatory */
+static Bool
+CG14PreInit(ScrnInfoPtr pScrn, int flags)
+{
+    Cg14Ptr pCg14;
+    sbusDevicePtr psdp = NULL;
+    int i;
+
+    if (flags & PROBE_DETECT) return FALSE;
+
+    /*
+     * Note: This function is only called once at server startup, and
+     * not at the start of each server generation.  This means that
+     * only things that are persistent across server generations can
+     * be initialised here.  xf86Screens[] is (pScrn is a pointer to one
+     * of these).  Privates allocated using xf86AllocateScrnInfoPrivateIndex()  
+     * are too, and should be used for data that must persist across
+     * server generations.
+     *
+     * Per-generation data should be allocated with
+     * AllocateScreenPrivateIndex() from the ScreenInit() function.
+     */
+
+    /* Allocate the Cg14Rec driverPrivate */
+    if (!CG14GetRec(pScrn)) {
+	return FALSE;
+    }
+    pCg14 = GET_CG14_FROM_SCRN(pScrn);
+    
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
+
+    /* This driver doesn't expect more than one entity per screen */
+    if (pScrn->numEntities > 1)
+	return FALSE;
+    /* This is the general case */
+    for (i = 0; i < pScrn->numEntities; i++) {
+	EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+
+	/* CG14 is purely AFX, but we handle it like SBUS */
+	if (pEnt->location.type == BUS_SBUS) {
+	    psdp = xf86GetSbusInfoForEntity(pEnt->index);
+	    pCg14->psdp = psdp;
+	} else
+	    return FALSE;
+    }
+    if (psdp == NULL)
+	return FALSE;
+
+    /*********************
+    deal with depth
+    *********************/
+    
+    if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support32bppFb)) {
+	return FALSE;
+    } else {
+	/* Check that the returned depth is one we support */
+	switch (pScrn->depth) {
+	case 32:
+	    /* OK */
+	    break;
+	default:
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "Given depth (%d) is not supported by this driver\n",
+		       pScrn->depth);
+	    return FALSE;
+	}
+    }
+
+    /* Collect all of the relevant option flags (fill in pScrn->options) */
+    xf86CollectOptions(pScrn, NULL);
+    /* Process the options */
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, CG14Options);
+
+    /*
+     * This must happen after pScrn->display has been set because
+     * xf86SetWeight references it.
+     */
+    if (pScrn->depth > 8) {
+	rgb weight = {10, 11, 11};
+	rgb mask = {0xff, 0xff00, 0xff0000};
+                                       
+	if (!xf86SetWeight(pScrn, weight, mask)) {
+	    return FALSE;
+	}
+    }
+                                                                           
+    if (!xf86SetDefaultVisual(pScrn, -1))
+	return FALSE;
+    else if (pScrn->depth > 8) {
+	/* We don't currently support DirectColor */
+	if (pScrn->defaultVisual != TrueColor) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Given default visual"
+		       " (%s) is not supported\n",
+		       xf86GetVisualName(pScrn->defaultVisual));
+	    return FALSE;
+	}
+    }                                                                                                  
+
+    /*
+     * The new cmap code requires this to be initialised.
+     */
+
+    {
+	Gamma zeros = {0.0, 0.0, 0.0};
+
+	if (!xf86SetGamma(pScrn, zeros)) {
+	    return FALSE;
+	}
+    }
+
+    if (xf86LoadSubModule(pScrn, "cfb32") == NULL) {
+	CG14FreeRec(pScrn);
+	return FALSE;
+    }
+
+    /*********************
+    set up clock and mode stuff
+    *********************/
+    
+    pScrn->progClock = TRUE;
+
+    if(pScrn->display->virtualX || pScrn->display->virtualY) {
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "CG14 does not support a virtual desktop\n");
+	pScrn->display->virtualX = 0;
+	pScrn->display->virtualY = 0;
+    }
+
+    xf86SbusUseBuiltinMode(pScrn, pCg14->psdp);
+    pScrn->currentMode = pScrn->modes;
+    pScrn->displayWidth = pScrn->virtualX;
+
+    /* Set display resolution */
+    xf86SetDpi(pScrn, 0, 0);
+
+    return TRUE;
+}
+
+/* Mandatory */
+
+/* This gets called at the start of each server generation */
+
+static Bool
+CG14ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+{
+    ScrnInfoPtr pScrn;
+    Cg14Ptr pCg14;
+    VisualPtr visual;
+    int ret;
+
+    /* 
+     * First get the ScrnInfoRec
+     */
+    pScrn = xf86Screens[pScreen->myNum];
+
+    pCg14 = GET_CG14_FROM_SCRN(pScrn);
+
+    /* Map the CG14 memory */
+    pCg14->fb = xf86MapSbusMem (pCg14->psdp, CG14_BGR_VOFF, 4 *
+				(pCg14->psdp->width * pCg14->psdp->height));
+    pCg14->x32 = xf86MapSbusMem (pCg14->psdp, CG14_X32_VOFF,
+				 (pCg14->psdp->width * pCg14->psdp->height));
+    pCg14->xlut = xf86MapSbusMem (pCg14->psdp, CG14_XLUT_VOFF, 4096);
+
+    if (! pCg14->fb || !pCg14->x32 || !pCg14->xlut)
+	return FALSE;
+
+    /* Darken the screen for aesthetic reasons and set the viewport */
+    CG14SaveScreen(pScreen, SCREEN_SAVER_ON);
+
+    /*
+     * The next step is to setup the screen's visuals, and initialise the
+     * framebuffer code.  In cases where the framebuffer's default
+     * choices for things like visual layouts and bits per RGB are OK,
+     * this may be as simple as calling the framebuffer's ScreenInit()
+     * function.  If not, the visuals will need to be setup before calling
+     * a fb ScreenInit() function and fixed up after.
+     */
+
+    /*
+     * Reset visual list.
+     */
+    miClearVisualTypes();
+
+    /* Setup the visuals we support. */
+
+    if (!miSetVisualTypes(pScrn->depth, TrueColorMask,
+			  pScrn->rgbBits, pScrn->defaultVisual))
+	return FALSE;
+
+    /*
+     * Call the framebuffer layer's ScreenInit function, and fill in other
+     * pScreen fields.
+     */
+
+    CG14InitCplane24(pScrn);
+    ret = cfb32ScreenInit(pScreen, pCg14->fb, pScrn->virtualX,
+			  pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+			  pScrn->virtualX);
+
+    if (!ret)
+	return FALSE;
+
+    miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+
+    xf86SetBlackWhitePixels(pScreen);
+
+    if (pScrn->bitsPerPixel > 8) {
+	/* Fixup RGB ordering */
+	visual = pScreen->visuals + pScreen->numVisuals;
+	while (--visual >= pScreen->visuals) {
+	    if ((visual->class | DynamicClass) == DirectColor) {
+		visual->offsetRed = pScrn->offset.red;
+		visual->offsetGreen = pScrn->offset.green;
+		visual->offsetBlue = pScrn->offset.blue;
+		visual->redMask = pScrn->mask.red;
+		visual->greenMask = pScrn->mask.green;
+		visual->blueMask = pScrn->mask.blue;
+	    }
+	}
+    }
+
+    /* Initialise cursor functions */
+    miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
+
+    /* Initialise default colourmap */
+    if (!miCreateDefColormap(pScreen))
+	return FALSE;
+
+    pCg14->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = CG14CloseScreen;
+    pScreen->SaveScreen = CG14SaveScreen;
+
+    /* Report any unused options (only for the first generation) */
+    if (serverGeneration == 1) {
+	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+    }
+
+    /* unblank the screen */
+    CG14SaveScreen(pScreen, SCREEN_SAVER_OFF);
+
+    /* Done */
+    return TRUE;
+}
+
+
+/* Usually mandatory */
+static Bool
+CG14SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This function is used to initialize the Start Address - the first
+ * displayed location in the video memory.
+ */
+/* Usually mandatory */
+static void 
+CG14AdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+    /* we don't support virtual desktops */
+    return;
+}
+
+/*
+ * This is called when VT switching back to the X server.  Its job is
+ * to reinitialise the video mode.
+ */
+
+/* Mandatory */
+static Bool
+CG14EnterVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+
+    CG14InitCplane24 (pScrn);
+    return TRUE;
+}
+
+
+/*
+ * This is called when VT switching away from the X server.
+ */
+
+/* Mandatory */
+static void
+CG14LeaveVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+
+    CG14ExitCplane24 (pScrn);
+    return;
+}
+
+
+/*
+ * This is called at the end of each server generation.  It restores the
+ * original (text) mode.  It should really also unmap the video memory too.
+ */
+
+/* Mandatory */
+static Bool
+CG14CloseScreen(int scrnIndex, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    Cg14Ptr pCg14 = GET_CG14_FROM_SCRN(pScrn);
+
+    pScrn->vtSema = FALSE;
+    xf86UnmapSbusMem(pCg14->psdp, pCg14->fb,
+		     (pCg14->psdp->width * pCg14->psdp->height * 4));
+    xf86UnmapSbusMem(pCg14->psdp, pCg14->x32,
+		     (pCg14->psdp->width * pCg14->psdp->height));
+    xf86UnmapSbusMem(pCg14->psdp, pCg14->xlut, 4096);
+    
+    pScreen->CloseScreen = pCg14->CloseScreen;
+    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+    return FALSE;
+}
+
+
+/* Free up any per-generation data structures */
+
+/* Optional */
+static void
+CG14FreeScreen(int scrnIndex, int flags)
+{
+    CG14FreeRec(xf86Screens[scrnIndex]);
+}
+
+
+/* Checks if a mode is suitable for the selected chipset. */
+
+/* Optional */
+static int
+CG14ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+{
+    if (mode->Flags & V_INTERLACE)
+	return(MODE_BAD);
+
+    return(MODE_OK);
+}
+
+/* Do screen blanking */
+
+/* Mandatory */
+static Bool
+CG14SaveScreen(ScreenPtr pScreen, int mode)
+    /* this function should blank the screen when unblank is FALSE and
+       unblank it when unblank is TRUE -- it doesn't actually seem to be
+       used for much though */
+{
+    return TRUE;
+}
+
+/*
+ * This is the implementation of the Sync() function.
+ */
+void
+CG14Sync(ScrnInfoPtr pScrn)
+{
+    return;
+}
+
+/*
+ * This initializes the card for 24 bit mode.
+ */
+static void
+CG14InitCplane24(ScrnInfoPtr pScrn)
+{
+  Cg14Ptr pCg14 = GET_CG14_FROM_SCRN(pScrn);
+  int size, bpp;
+              
+  size = pScrn->virtualX * pScrn->virtualY;
+  bpp = 32;
+  ioctl (pCg14->psdp->fd, CG14_SET_PIXELMODE, &bpp);
+  memset (pCg14->fb, 0, size * 4);
+  memset (pCg14->x32, 0, size);
+  memset (pCg14->xlut, 0, 0x200);
+}                                                  
+
+/*
+ * This initializes the card for 8 bit mode.
+ */
+static void
+CG14ExitCplane24(ScrnInfoPtr pScrn)
+{
+  Cg14Ptr pCg14 = GET_CG14_FROM_SCRN(pScrn);
+  int bpp = 8;
+              
+  ioctl (pCg14->psdp->fd, CG14_SET_PIXELMODE, &bpp);
+}                                                  
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg14/suncg14.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg14/suncg14.cpp:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg14/suncg14.cpp	Fri Jun 30 10:15:14 2000
@@ -0,0 +1,30 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/suncg14.cpp,v 1.1 2000/06/30 17:15:14 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH SUNCG14 __drivermansuffix__ "Version 4.0"  "XFree86"
+.SH NAME
+suncg14 \- CG14 video driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qsuncg14\*q"
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B suncg14
+is an XFree86 driver for Sun CG14 video cards.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+The
+.B suncg14
+driver supports...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details.  This section only covers configuration details specific to this
+driver.
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+.SH AUTHORS
+Authors include: Jakub Jelinek <jakub@redhat.com>
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile	Fri Jun 30 10:15:15 2000
@@ -0,0 +1,38 @@
+XCOMM
+XCOMM This is an Imakefile for the cg3 driver.
+XCOMM
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile,v 1.1 2000/06/30 17:15:15 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = cg3_driver.c
+OBJS = cg3_driver.o
+
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+           -I$(SERVERSRC)/Xext -I$(SERVERSRC)/cfb \
+	   -I$(XF86SRC)/ramdac \
+           -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(EXTINCSRC)
+#endif
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+ModuleObjectRule()
+
+ObjectModuleTarget(suncg3,$(OBJS))
+
+InstallObjectModule(suncg3,$(MODULEDIR),drivers)
+
+#if !defined(XF86DriverSDK)
+CppManTarget(suncg3,)
+InstallModuleManPage(suncg3)
+#endif
+
+DependTarget()
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3.h:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3.h	Fri Jun 30 10:15:15 2000
@@ -0,0 +1,50 @@
+/*
+ * Cg3 framebuffer - defines.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
+
+#ifndef CG3_H
+#define CG3_H
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86RamDac.h"
+#include "Xmd.h"
+#include "gcstruct.h"
+#include "xf86sbusBus.h"
+
+/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
+#define CG3_RAM_VOFF	0x4000000
+
+typedef struct {
+	unsigned char	*fb;
+	int		width;
+	int		height;
+
+	sbusDevicePtr	psdp;
+	CloseScreenProcPtr CloseScreen;
+} Cg3Rec, *Cg3Ptr;
+
+#define GET_CG3_FROM_SCRN(p)    ((Cg3Ptr)((p)->driverPrivate))
+
+#endif /* CG3_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c	Fri Jun 30 10:15:15 2000
@@ -0,0 +1,592 @@
+/*
+ * Cg3 framebuffer driver.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
+
+#define PSZ 8
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Version.h"
+#include "mipointer.h"
+#include "mibstore.h"
+#include "micmap.h"
+
+#include "cfb.h"
+#include "xf86cmap.h"
+#include "cg3.h"
+
+static OptionInfoPtr CG3AvailableOptions(int chipid, int busid);
+static void	CG3Identify(int flags);
+static Bool	CG3Probe(DriverPtr drv, int flags);
+static Bool	CG3PreInit(ScrnInfoPtr pScrn, int flags);
+static Bool	CG3ScreenInit(int Index, ScreenPtr pScreen, int argc,
+			      char **argv);
+static Bool	CG3EnterVT(int scrnIndex, int flags);
+static void	CG3LeaveVT(int scrnIndex, int flags);
+static Bool	CG3CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	CG3SaveScreen(ScreenPtr pScreen, int mode);
+
+/* Required if the driver supports mode switching */
+static Bool	CG3SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+/* Required if the driver supports moving the viewport */
+static void	CG3AdjustFrame(int scrnIndex, int x, int y, int flags);
+
+/* Optional functions */
+static void	CG3FreeScreen(int scrnIndex, int flags);
+static int	CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
+
+void CG3Sync(ScrnInfoPtr pScrn);
+
+#define VERSION 4000
+#define CG3_NAME "SUNCG3"
+#define CG3_DRIVER_NAME "suncg3"
+#define CG3_MAJOR_VERSION 1
+#define CG3_MINOR_VERSION 0
+#define CG3_PATCHLEVEL 0
+
+/* 
+ * This contains the functions needed by the server after loading the driver
+ * module.  It must be supplied, and gets passed back by the SetupProc
+ * function in the dynamic case.  In the static case, a reference to this
+ * is compiled in, and this requires that the name of this DriverRec be
+ * an upper-case version of the driver name.
+ */
+
+DriverRec SUNCG3 = {
+    VERSION,
+    CG3_DRIVER_NAME,
+    CG3Identify,
+    CG3Probe,
+    CG3AvailableOptions,
+    NULL,
+    0
+};
+
+static OptionInfoRec CG3Options[] = {
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+
+#ifdef XFree86LOADER
+
+static MODULESETUPPROTO(cg3Setup);
+
+static XF86ModuleVersionInfo suncg3VersRec =
+{
+	"suncg3",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	CG3_MAJOR_VERSION, CG3_MINOR_VERSION, CG3_PATCHLEVEL,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0,0,0,0}
+};
+
+XF86ModuleData suncg3ModuleData = { &suncg3VersRec, cg3Setup, NULL };
+
+pointer
+cg3Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    static Bool setupDone = FALSE;
+
+    if (!setupDone) {
+	setupDone = TRUE;
+	xf86AddDriver(&SUNCG3, module, 0);
+
+	/*
+	 * Modules that this driver always requires can be loaded here
+	 * by calling LoadSubModule().
+	 */
+
+	/*
+	 * The return value must be non-NULL on success even though there
+	 * is no TearDownProc.
+	 */
+	return (pointer)TRUE;
+    } else {
+	if (errmaj) *errmaj = LDR_ONCEONLY;
+	return NULL;
+    }
+}
+
+#endif /* XFree86LOADER */
+
+static Bool
+CG3GetRec(ScrnInfoPtr pScrn)
+{
+    /*
+     * Allocate an Cg3Rec, and hook it into pScrn->driverPrivate.
+     * pScrn->driverPrivate is initialised to NULL, so we can check if
+     * the allocation has already been done.
+     */
+    if (pScrn->driverPrivate != NULL)
+	return TRUE;
+
+    pScrn->driverPrivate = xnfcalloc(sizeof(Cg3Rec), 1);
+    return TRUE;
+}
+
+static void
+CG3FreeRec(ScrnInfoPtr pScrn)
+{
+    Cg3Ptr pCg3;
+
+    if (pScrn->driverPrivate == NULL)
+	return;
+
+    pCg3 = GET_CG3_FROM_SCRN(pScrn);
+
+    xfree(pScrn->driverPrivate);
+    pScrn->driverPrivate = NULL;
+
+    return;
+}
+
+static 
+OptionInfoPtr
+CG3AvailableOptions(int chipid, int busid)
+{
+    return CG3Options;
+}
+
+/* Mandatory */
+static void
+CG3Identify(int flags)
+{
+    xf86Msg(X_INFO, "%s: driver for CGthree\n", CG3_NAME);
+}
+
+
+/* Mandatory */
+static Bool
+CG3Probe(DriverPtr drv, int flags)
+{
+    int i;
+    GDevPtr *devSections = NULL;
+    int *usedChips;
+    int numDevSections;
+    int numUsed;
+    Bool foundScreen = FALSE;
+    EntityInfoPtr pEnt;
+
+    /*
+     * The aim here is to find all cards that this driver can handle,
+     * and for the ones not already claimed by another driver, claim the
+     * slot, and allocate a ScrnInfoRec.
+     *
+     * This should be a minimal probe, and it should under no circumstances
+     * change the state of the hardware.  Because a device is found, don't
+     * assume that it will be used.  Don't do any initialisations other than
+     * the required ScrnInfoRec initialisations.  Don't allocate any new
+     * data structures.
+     */
+
+    /*
+     * Next we check, if there has been a chipset override in the config file.
+     * For this we must find out if there is an active device section which
+     * is relevant, i.e., which has no driver specified or has THIS driver
+     * specified.
+     */
+
+    if ((numDevSections = xf86MatchDevice(CG3_DRIVER_NAME,
+					  &devSections)) <= 0) {
+	/*
+	 * There's no matching device section in the config file, so quit
+	 * now.
+	 */
+	return FALSE;
+    }
+
+    /*
+     * We need to probe the hardware first.  We then need to see how this
+     * fits in with what is given in the config file, and allow the config
+     * file info to override any contradictions.
+     */
+
+    numUsed = xf86MatchSbusInstances(CG3_NAME, SBUS_DEVICE_CG3,
+		   devSections, numDevSections,
+		   drv, &usedChips);
+				    
+    if (devSections)
+	xfree(devSections);
+    devSections = NULL;
+    if (numUsed <= 0)
+	return FALSE;
+
+    if (flags & PROBE_DETECT)
+	foundScreen = TRUE;
+    else for (i = 0; i < numUsed; i++) {
+	pEnt = xf86GetEntityInfo(usedChips[i]);
+
+	/*
+	 * Check that nothing else has claimed the slots.
+	 */
+	if(pEnt->active) {
+	    ScrnInfoPtr pScrn;
+	    
+	    /* Allocate a ScrnInfoRec and claim the slot */
+	    pScrn = xf86AllocateScreen(drv, 0);
+
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = VERSION;
+	    pScrn->driverName	 = CG3_DRIVER_NAME;
+	    pScrn->name		 = CG3_NAME;
+	    pScrn->Probe	 = CG3Probe;
+	    pScrn->PreInit	 = CG3PreInit;
+	    pScrn->ScreenInit	 = CG3ScreenInit;
+  	    pScrn->SwitchMode	 = CG3SwitchMode;
+  	    pScrn->AdjustFrame	 = CG3AdjustFrame;
+	    pScrn->EnterVT	 = CG3EnterVT;
+	    pScrn->LeaveVT	 = CG3LeaveVT;
+	    pScrn->FreeScreen	 = CG3FreeScreen;
+	    pScrn->ValidMode	 = CG3ValidMode;
+	    xf86AddEntityToScreen(pScrn, pEnt->index);
+	    foundScreen = TRUE;
+	}
+	xfree(pEnt);
+    }
+    return foundScreen;
+}
+
+/* Mandatory */
+static Bool
+CG3PreInit(ScrnInfoPtr pScrn, int flags)
+{
+    Cg3Ptr pCg3;
+    sbusDevicePtr psdp;
+    MessageType from;
+    int i;
+
+    if (flags & PROBE_DETECT) return FALSE;
+
+    /*
+     * Note: This function is only called once at server startup, and
+     * not at the start of each server generation.  This means that
+     * only things that are persistent across server generations can
+     * be initialised here.  xf86Screens[] is (pScrn is a pointer to one
+     * of these).  Privates allocated using xf86AllocateScrnInfoPrivateIndex()  
+     * are too, and should be used for data that must persist across
+     * server generations.
+     *
+     * Per-generation data should be allocated with
+     * AllocateScreenPrivateIndex() from the ScreenInit() function.
+     */
+
+    /* Allocate the Cg3Rec driverPrivate */
+    if (!CG3GetRec(pScrn)) {
+	return FALSE;
+    }
+    pCg3 = GET_CG3_FROM_SCRN(pScrn);
+    
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
+
+    /* This driver doesn't expect more than one entity per screen */
+    if (pScrn->numEntities > 1)
+	return FALSE;
+    /* This is the general case */
+    for (i = 0; i < pScrn->numEntities; i++) {
+	EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+
+	/* CG3 is purely SBUS */
+	if (pEnt->location.type == BUS_SBUS) {
+	    psdp = xf86GetSbusInfoForEntity(pEnt->index);
+	    pCg3->psdp = psdp;
+	} else
+	    return FALSE;
+    }
+
+    /*********************
+    deal with depth
+    *********************/
+    
+    if (!xf86SetDepthBpp(pScrn, 0, 0, 0, NoDepth24Support)) {
+	return FALSE;
+    } else {
+	/* Check that the returned depth is one we support */
+	switch (pScrn->depth) {
+	case 8:
+	    /* OK */
+	    break;
+	default:
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "Given depth (%d) is not supported by this driver\n",
+		       pScrn->depth);
+	    return FALSE;
+	}
+    }
+
+    if (!xf86SetDefaultVisual(pScrn, -1))
+	return FALSE;
+
+    /*
+     * The new cmap code requires this to be initialised.
+     */
+
+    {
+	Gamma zeros = {0.0, 0.0, 0.0};
+
+	if (!xf86SetGamma(pScrn, zeros)) {
+	    return FALSE;
+	}
+    }
+
+    /* Set the bits per RGB for 8bpp mode */
+    from = X_DEFAULT;
+
+    if (xf86LoadSubModule(pScrn, "cfb") == NULL) {
+	CG3FreeRec(pScrn);
+	return FALSE;
+    }
+
+    /*********************
+    set up clock and mode stuff
+    *********************/
+    
+    pScrn->progClock = TRUE;
+
+    if(pScrn->display->virtualX || pScrn->display->virtualY) {
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "CG3 does not support a virtual desktop\n");
+	pScrn->display->virtualX = 0;
+	pScrn->display->virtualY = 0;
+    }
+
+    xf86SbusUseBuiltinMode(pScrn, pCg3->psdp);
+    pScrn->currentMode = pScrn->modes;
+    pScrn->displayWidth = pScrn->virtualX;
+
+    /* Set display resolution */
+    xf86SetDpi(pScrn, 0, 0);
+
+    return TRUE;
+}
+
+/* Mandatory */
+
+/* This gets called at the start of each server generation */
+
+static Bool
+CG3ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+{
+    ScrnInfoPtr pScrn;
+    Cg3Ptr pCg3;
+    int ret;
+
+    /* 
+     * First get the ScrnInfoRec
+     */
+    pScrn = xf86Screens[pScreen->myNum];
+
+    pCg3 = GET_CG3_FROM_SCRN(pScrn);
+
+    /* Map the CG3 memory */
+    pCg3->fb =
+	xf86MapSbusMem (pCg3->psdp, CG3_RAM_VOFF,
+			(pCg3->psdp->width * pCg3->psdp->height));
+
+    if (! pCg3->fb)
+	return FALSE;
+
+    /* Darken the screen for aesthetic reasons and set the viewport */
+    CG3SaveScreen(pScreen, SCREEN_SAVER_ON);
+
+    /*
+     * The next step is to setup the screen's visuals, and initialise the
+     * framebuffer code.  In cases where the framebuffer's default
+     * choices for things like visual layouts and bits per RGB are OK,
+     * this may be as simple as calling the framebuffer's ScreenInit()
+     * function.  If not, the visuals will need to be setup before calling
+     * a fb ScreenInit() function and fixed up after.
+     */
+
+    /*
+     * Reset visual list.
+     */
+    miClearVisualTypes();
+
+    /* Set the bits per RGB for 8bpp mode */
+    pScrn->rgbBits = 8;
+
+    /* Setup the visuals we support. */
+
+    if (!miSetVisualTypes(pScrn->depth, miGetDefaultVisualMask(pScrn->depth),
+			  pScrn->rgbBits, pScrn->defaultVisual))
+	return FALSE;
+
+    /*
+     * Call the framebuffer layer's ScreenInit function, and fill in other
+     * pScreen fields.
+     */
+
+    ret = cfbScreenInit(pScreen, pCg3->fb, pScrn->virtualX,
+			pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+			pScrn->virtualX);
+    if (!ret)
+	return FALSE;
+
+    miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+
+    xf86SetBlackWhitePixels(pScreen);
+
+    /* Initialise cursor functions */
+    miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
+
+    /* Initialise default colourmap */
+    if (!miCreateDefColormap(pScreen))
+	return FALSE;
+
+    if(!xf86SbusHandleColormaps(pScreen, pCg3->psdp))
+	return FALSE;
+
+    pCg3->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = CG3CloseScreen;
+    pScreen->SaveScreen = CG3SaveScreen;
+
+    /* Report any unused options (only for the first generation) */
+    if (serverGeneration == 1) {
+	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+    }
+
+    /* unblank the screen */
+    CG3SaveScreen(pScreen, SCREEN_SAVER_OFF);
+
+    /* Done */
+    return TRUE;
+}
+
+
+/* Usually mandatory */
+static Bool
+CG3SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This function is used to initialize the Start Address - the first
+ * displayed location in the video memory.
+ */
+/* Usually mandatory */
+static void 
+CG3AdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+    /* we don't support virtual desktops */
+    return;
+}
+
+/*
+ * This is called when VT switching back to the X server.  Its job is
+ * to reinitialise the video mode.
+ */
+
+/* Mandatory */
+static Bool
+CG3EnterVT(int scrnIndex, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This is called when VT switching away from the X server.
+ */
+
+/* Mandatory */
+static void
+CG3LeaveVT(int scrnIndex, int flags)
+{
+    return;
+}
+
+
+/*
+ * This is called at the end of each server generation.  It restores the
+ * original (text) mode.  It should really also unmap the video memory too.
+ */
+
+/* Mandatory */
+static Bool
+CG3CloseScreen(int scrnIndex, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    Cg3Ptr pCg3 = GET_CG3_FROM_SCRN(pScrn);
+
+    pScrn->vtSema = FALSE;
+    xf86UnmapSbusMem(pCg3->psdp, pCg3->fb,
+		     (pCg3->psdp->width * pCg3->psdp->height));
+    
+    pScreen->CloseScreen = pCg3->CloseScreen;
+    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+    return FALSE;
+}
+
+
+/* Free up any per-generation data structures */
+
+/* Optional */
+static void
+CG3FreeScreen(int scrnIndex, int flags)
+{
+    CG3FreeRec(xf86Screens[scrnIndex]);
+}
+
+
+/* Checks if a mode is suitable for the selected chipset. */
+
+/* Optional */
+static int
+CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+{
+    if (mode->Flags & V_INTERLACE)
+	return(MODE_BAD);
+
+    return(MODE_OK);
+}
+
+/* Do screen blanking */
+
+/* Mandatory */
+static Bool
+CG3SaveScreen(ScreenPtr pScreen, int mode)
+    /* this function should blank the screen when unblank is FALSE and
+       unblank it when unblank is TRUE -- it doesn't actually seem to be
+       used for much though */
+{
+    return TRUE;
+}
+
+/*
+ * This is the implementation of the Sync() function.
+ */
+void
+CG3Sync(ScrnInfoPtr pScrn)
+{
+    return;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.cpp:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.cpp	Fri Jun 30 10:15:15 2000
@@ -0,0 +1,30 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.cpp,v 1.1 2000/06/30 17:15:15 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH SUNCG3 __drivermansuffix__ "Version 4.0"  "XFree86"
+.SH NAME
+suncg3 \- CG3 video driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qsuncg3\*q"
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B suncg3
+is an XFree86 driver for Sun CG3 video cards.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+The
+.B suncg3
+driver supports...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details.  This section only covers configuration details specific to this
+driver.
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+.SH AUTHORS
+Authors include: Jakub Jelinek <jakub@redhat.com>
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile:1.2
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile	Fri Jun 30 10:15:15 2000
@@ -0,0 +1,38 @@
+XCOMM
+XCOMM This is an Imakefile for the cg6 driver.
+XCOMM
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile,v 1.2 2000/06/30 17:15:15 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = cg6_driver.c cg6_cursor.c
+OBJS = cg6_driver.o cg6_cursor.o
+
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+           -I$(SERVERSRC)/Xext -I$(SERVERSRC)/cfb \
+	   -I$(XF86SRC)/ramdac \
+           -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(EXTINCSRC)
+#endif
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+ModuleObjectRule()
+
+ObjectModuleTarget(suncg6,$(OBJS))
+
+InstallObjectModule(suncg6,$(MODULEDIR),drivers)
+
+#if !defined(XF86DriverSDK)
+CppManTarget(suncg6,)
+InstallModuleManPage(suncg6)
+#endif
+
+DependTarget()
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h:1.2
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h	Fri Jun 30 10:15:15 2000
@@ -0,0 +1,97 @@
+/*
+ * GX and Turbo GX framebuffer - defines.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.2 2000/06/30 17:15:15 dawes Exp $ */
+
+#ifndef CG6_H
+#define CG6_H
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86RamDac.h"
+#include "Xmd.h"
+#include "gcstruct.h"
+#include "cg6_regs.h"
+#include "xf86sbusBus.h"
+
+/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
+#define CG6_FBC_VOFF	0x70000000
+#define CG6_TEC_VOFF	0x70001000
+#define CG6_BTREGS_VOFF	0x70002000
+#define CG6_FHC_VOFF	0x70004000
+#define CG6_THC_VOFF	0x70005000
+#define CG6_ROM_VOFF	0x70006000
+#define CG6_RAM_VOFF	0x70016000
+#define CG6_DHC_VOFF	0x80000000
+
+typedef struct {
+	unsigned int fg, bg;			/* FG/BG colors for stipple */
+	unsigned int patalign;                  /* X/Y alignment of bits */
+        unsigned int alu;			/* Transparent/Opaque + rop */
+        unsigned int bits[32];                  /* The stipple bits themselves */
+} Cg6StippleRec, *Cg6StipplePtr;
+
+typedef struct {
+	int type;
+	Cg6StipplePtr stipple;
+} Cg6PrivGCRec, *Cg6PrivGCPtr;
+
+typedef struct {
+	unsigned char	*fb;
+	Cg6FbcPtr	fbc;
+	Cg6ThcPtr	thc;
+	int		vclipmax;
+	int		width;
+	int		height;
+
+	sbusDevicePtr	psdp;
+	Bool		HWCursor;
+	Bool		NoAccel;
+	CloseScreenProcPtr CloseScreen;
+	xf86CursorInfoPtr CursorInfoRec;
+	unsigned int	CursorXY;
+	int		CursorBg, CursorFg;
+	Bool		CursorEnabled;
+} Cg6Rec, *Cg6Ptr;
+
+extern int  Cg6ScreenPrivateIndex;
+extern int  Cg6GCPrivateIndex;
+extern int  Cg6WindowPrivateIndex;
+
+#define GET_CG6_FROM_SCRN(p)    ((Cg6Ptr)((p)->driverPrivate))
+
+#define Cg6GetScreenPrivate(s)						\
+((Cg6Ptr) (s)->devPrivates[Cg6ScreenPrivateIndex].ptr)
+
+#define Cg6GetGCPrivate(g)						\
+((Cg6PrivGCPtr) (g)->devPrivates [Cg6GCPrivateIndex].ptr)
+
+#define Cg6GetWindowPrivate(w)						\
+((Cg6StipplePtr) (w)->devPrivates[Cg6WindowPrivateIndex].ptr)
+                            
+#define Cg6SetWindowPrivate(w,p) 					\
+((w)->devPrivates[Cg6WindowPrivateIndex].ptr = (pointer) p)
+
+extern int cg6RopTable[];
+
+#endif /* CG6_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c	Fri Jun 30 12:30:46 2000
@@ -0,0 +1,121 @@
+/*
+ * Hardware cursor support for GX or Turbo GX
+ *
+ * Copyright 2000 by Jakub Jelinek <jakub@redhat.com>.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Jakub
+ * Jelinek not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission.  Jakub Jelinek makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * JAKUB JELINEK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL JAKUB JELINEK BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
+
+#include "cg6.h"
+
+static void CG6LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
+static void CG6ShowCursor(ScrnInfoPtr pScrn);
+static void CG6HideCursor(ScrnInfoPtr pScrn);
+static void CG6SetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
+static void CG6SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
+
+static void
+CG6LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
+{
+    Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
+    int i;
+    unsigned int *data = (unsigned int *)src;
+
+    for (i = 0; i < 32; i++)
+	pCg6->thc->thc_cursmask[i] = *data++;
+    for (i = 0; i < 32; i++)
+	pCg6->thc->thc_cursbits[i] = *data++;
+}
+
+static void 
+CG6ShowCursor(ScrnInfoPtr pScrn)
+{
+    Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
+
+    pCg6->thc->thc_cursxy = pCg6->CursorXY;
+    pCg6->CursorEnabled = TRUE;
+}
+
+static void
+CG6HideCursor(ScrnInfoPtr pScrn)
+{
+    Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
+
+    pCg6->thc->thc_cursxy = ((65536 - 32) << 16) | (65536 - 32);
+    pCg6->CursorEnabled = FALSE;
+}
+
+static void
+CG6SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+{
+    Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
+
+    pCg6->CursorXY = ((x & 0xffff) << 16) | (y & 0xffff);
+    if (pCg6->CursorEnabled)
+	pCg6->thc->thc_cursxy = pCg6->CursorXY;
+}
+
+static void
+CG6SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+{
+    Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
+
+    if (bg != pCg6->CursorBg || fg != pCg6->CursorFg) {
+	xf86SbusSetOsHwCursorCmap(pCg6->psdp, bg, fg);
+	pCg6->CursorBg = bg;
+	pCg6->CursorFg = fg;
+    }
+}
+
+Bool 
+CG6HWCursorInit(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    Cg6Ptr pCg6;
+    xf86CursorInfoPtr infoPtr;
+
+    pCg6 = GET_CG6_FROM_SCRN(pScrn);
+    pCg6->CursorXY = 0;
+    pCg6->CursorBg = pCg6->CursorFg = 0;
+    pCg6->CursorEnabled = FALSE;
+
+    infoPtr = xf86CreateCursorInfoRec();
+    if(!infoPtr) return FALSE;
+    
+    pCg6->CursorInfoRec = infoPtr;
+
+    infoPtr->MaxWidth = 32;
+    infoPtr->MaxHeight = 32;
+    infoPtr->Flags = HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
+	HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK |
+	HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED |
+	HARDWARE_CURSOR_TRUECOLOR_AT_8BPP;
+
+    infoPtr->SetCursorColors = CG6SetCursorColors;
+    infoPtr->SetCursorPosition = CG6SetCursorPosition;
+    infoPtr->LoadCursorImage = CG6LoadCursorImage;
+    infoPtr->HideCursor = CG6HideCursor;
+    infoPtr->ShowCursor = CG6ShowCursor;
+    infoPtr->UseHWCursor = NULL;
+
+    return xf86InitCursor(pScreen, infoPtr);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c:1.2
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c	Fri Jun 30 10:15:15 2000
@@ -0,0 +1,665 @@
+/*
+ * GX and Turbo GX framebuffer driver.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.2 2000/06/30 17:15:15 dawes Exp $ */
+
+#define PSZ 8
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Version.h"
+#include "mipointer.h"
+#include "mibstore.h"
+#include "micmap.h"
+
+#include "cfb.h"
+#include "xf86cmap.h"
+#include "cg6.h"
+
+static OptionInfoPtr CG6AvailableOptions(int chipid, int busid);
+static void	CG6Identify(int flags);
+static Bool	CG6Probe(DriverPtr drv, int flags);
+static Bool	CG6PreInit(ScrnInfoPtr pScrn, int flags);
+static Bool	CG6ScreenInit(int Index, ScreenPtr pScreen, int argc,
+			      char **argv);
+static Bool	CG6EnterVT(int scrnIndex, int flags);
+static void	CG6LeaveVT(int scrnIndex, int flags);
+static Bool	CG6CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	CG6SaveScreen(ScreenPtr pScreen, int mode);
+
+/* Required if the driver supports mode switching */
+static Bool	CG6SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+/* Required if the driver supports moving the viewport */
+static void	CG6AdjustFrame(int scrnIndex, int x, int y, int flags);
+
+/* Optional functions */
+static void	CG6FreeScreen(int scrnIndex, int flags);
+static int	CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
+
+void CG6Sync(ScrnInfoPtr pScrn);
+
+#define VERSION 4000
+#define CG6_NAME "SUNCG6"
+#define CG6_DRIVER_NAME "suncg6"
+#define CG6_MAJOR_VERSION 1
+#define CG6_MINOR_VERSION 0
+#define CG6_PATCHLEVEL 0
+
+/* 
+ * This contains the functions needed by the server after loading the driver
+ * module.  It must be supplied, and gets passed back by the SetupProc
+ * function in the dynamic case.  In the static case, a reference to this
+ * is compiled in, and this requires that the name of this DriverRec be
+ * an upper-case version of the driver name.
+ */
+
+DriverRec SUNCG6 = {
+    VERSION,
+    CG6_DRIVER_NAME,
+    CG6Identify,
+    CG6Probe,
+    CG6AvailableOptions,
+    NULL,
+    0
+};
+
+typedef enum {
+    OPTION_SW_CURSOR,
+    OPTION_HW_CURSOR,
+    OPTION_NOACCEL
+} CG6Opts;
+
+static OptionInfoRec CG6Options[] = {
+    { OPTION_SW_CURSOR,		"SWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_HW_CURSOR,		"HWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_NOACCEL,		"NoAccel",	OPTV_BOOLEAN,	{0}, FALSE },
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+
+#ifdef XFree86LOADER
+
+static MODULESETUPPROTO(cg6Setup);
+
+static XF86ModuleVersionInfo suncg6VersRec =
+{
+	"suncg6",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	CG6_MAJOR_VERSION, CG6_MINOR_VERSION, CG6_PATCHLEVEL,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0,0,0,0}
+};
+
+XF86ModuleData suncg6ModuleData = { &suncg6VersRec, cg6Setup, NULL };
+
+pointer
+cg6Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    static Bool setupDone = FALSE;
+
+    if (!setupDone) {
+	setupDone = TRUE;
+	xf86AddDriver(&SUNCG6, module, 0);
+
+	/*
+	 * Modules that this driver always requires can be loaded here
+	 * by calling LoadSubModule().
+	 */
+
+	/*
+	 * The return value must be non-NULL on success even though there
+	 * is no TearDownProc.
+	 */
+	return (pointer)TRUE;
+    } else {
+	if (errmaj) *errmaj = LDR_ONCEONLY;
+	return NULL;
+    }
+}
+
+#endif /* XFree86LOADER */
+
+static Bool
+CG6GetRec(ScrnInfoPtr pScrn)
+{
+    /*
+     * Allocate an Cg6Rec, and hook it into pScrn->driverPrivate.
+     * pScrn->driverPrivate is initialised to NULL, so we can check if
+     * the allocation has already been done.
+     */
+    if (pScrn->driverPrivate != NULL)
+	return TRUE;
+
+    pScrn->driverPrivate = xnfcalloc(sizeof(Cg6Rec), 1);
+    return TRUE;
+}
+
+static void
+CG6FreeRec(ScrnInfoPtr pScrn)
+{
+    Cg6Ptr pCg6;
+
+    if (pScrn->driverPrivate == NULL)
+	return;
+
+    pCg6 = GET_CG6_FROM_SCRN(pScrn);
+
+    xfree(pScrn->driverPrivate);
+    pScrn->driverPrivate = NULL;
+
+    return;
+}
+
+static 
+OptionInfoPtr
+CG6AvailableOptions(int chipid, int busid)
+{
+    return CG6Options;
+}
+
+/* Mandatory */
+static void
+CG6Identify(int flags)
+{
+    xf86Msg(X_INFO, "%s: driver for CGsix (GX and Turbo GX)\n", CG6_NAME);
+}
+
+
+/* Mandatory */
+static Bool
+CG6Probe(DriverPtr drv, int flags)
+{
+    int i;
+    GDevPtr *devSections = NULL;
+    int *usedChips;
+    int numDevSections;
+    int numUsed;
+    Bool foundScreen = FALSE;
+    EntityInfoPtr pEnt;
+
+    /*
+     * The aim here is to find all cards that this driver can handle,
+     * and for the ones not already claimed by another driver, claim the
+     * slot, and allocate a ScrnInfoRec.
+     *
+     * This should be a minimal probe, and it should under no circumstances
+     * change the state of the hardware.  Because a device is found, don't
+     * assume that it will be used.  Don't do any initialisations other than
+     * the required ScrnInfoRec initialisations.  Don't allocate any new
+     * data structures.
+     */
+
+    /*
+     * Next we check, if there has been a chipset override in the config file.
+     * For this we must find out if there is an active device section which
+     * is relevant, i.e., which has no driver specified or has THIS driver
+     * specified.
+     */
+
+    if ((numDevSections = xf86MatchDevice(CG6_DRIVER_NAME,
+					  &devSections)) <= 0) {
+	/*
+	 * There's no matching device section in the config file, so quit
+	 * now.
+	 */
+	return FALSE;
+    }
+
+    /*
+     * We need to probe the hardware first.  We then need to see how this
+     * fits in with what is given in the config file, and allow the config
+     * file info to override any contradictions.
+     */
+
+    numUsed = xf86MatchSbusInstances(CG6_NAME, SBUS_DEVICE_CG6,
+		   devSections, numDevSections,
+		   drv, &usedChips);
+				    
+    if (devSections)
+	xfree(devSections);
+    devSections = NULL;
+    if (numUsed <= 0)
+	return FALSE;
+
+    if (flags & PROBE_DETECT)
+	foundScreen = TRUE;
+    else for (i = 0; i < numUsed; i++) {
+	pEnt = xf86GetEntityInfo(usedChips[i]);
+
+	/*
+	 * Check that nothing else has claimed the slots.
+	 */
+	if(pEnt->active) {
+	    ScrnInfoPtr pScrn;
+	    
+	    /* Allocate a ScrnInfoRec and claim the slot */
+	    pScrn = xf86AllocateScreen(drv, 0);
+
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = VERSION;
+	    pScrn->driverName	 = CG6_DRIVER_NAME;
+	    pScrn->name		 = CG6_NAME;
+	    pScrn->Probe	 = CG6Probe;
+	    pScrn->PreInit	 = CG6PreInit;
+	    pScrn->ScreenInit	 = CG6ScreenInit;
+  	    pScrn->SwitchMode	 = CG6SwitchMode;
+  	    pScrn->AdjustFrame	 = CG6AdjustFrame;
+	    pScrn->EnterVT	 = CG6EnterVT;
+	    pScrn->LeaveVT	 = CG6LeaveVT;
+	    pScrn->FreeScreen	 = CG6FreeScreen;
+	    pScrn->ValidMode	 = CG6ValidMode;
+	    xf86AddEntityToScreen(pScrn, pEnt->index);
+	    foundScreen = TRUE;
+	}
+	xfree(pEnt);
+    }
+    return foundScreen;
+}
+
+/* Mandatory */
+static Bool
+CG6PreInit(ScrnInfoPtr pScrn, int flags)
+{
+    Cg6Ptr pCg6;
+    sbusDevicePtr psdp;
+    MessageType from;
+    int i;
+
+    if (flags & PROBE_DETECT) return FALSE;
+
+    /*
+     * Note: This function is only called once at server startup, and
+     * not at the start of each server generation.  This means that
+     * only things that are persistent across server generations can
+     * be initialised here.  xf86Screens[] is (pScrn is a pointer to one
+     * of these).  Privates allocated using xf86AllocateScrnInfoPrivateIndex()  
+     * are too, and should be used for data that must persist across
+     * server generations.
+     *
+     * Per-generation data should be allocated with
+     * AllocateScreenPrivateIndex() from the ScreenInit() function.
+     */
+
+    /* Allocate the Cg6Rec driverPrivate */
+    if (!CG6GetRec(pScrn)) {
+	return FALSE;
+    }
+    pCg6 = GET_CG6_FROM_SCRN(pScrn);
+    
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
+
+    /* This driver doesn't expect more than one entity per screen */
+    if (pScrn->numEntities > 1)
+	return FALSE;
+    /* This is the general case */
+    for (i = 0; i < pScrn->numEntities; i++) {
+	EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+
+	/* CG6 is purely SBUS */
+	if (pEnt->location.type == BUS_SBUS) {
+	    psdp = xf86GetSbusInfoForEntity(pEnt->index);
+	    pCg6->psdp = psdp;
+	} else
+	    return FALSE;
+    }
+
+    /*********************
+    deal with depth
+    *********************/
+    
+    if (!xf86SetDepthBpp(pScrn, 0, 0, 0, NoDepth24Support)) {
+	return FALSE;
+    } else {
+	/* Check that the returned depth is one we support */
+	switch (pScrn->depth) {
+	case 8:
+	    /* OK */
+	    break;
+	default:
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "Given depth (%d) is not supported by this driver\n",
+		       pScrn->depth);
+	    return FALSE;
+	}
+    }
+
+    /* Collect all of the relevant option flags (fill in pScrn->options) */
+    xf86CollectOptions(pScrn, NULL);
+    /* Process the options */
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, CG6Options);
+    
+    if (!xf86SetDefaultVisual(pScrn, -1))
+	return FALSE;
+
+    /*
+     * The new cmap code requires this to be initialised.
+     */
+
+    {
+	Gamma zeros = {0.0, 0.0, 0.0};
+
+	if (!xf86SetGamma(pScrn, zeros)) {
+	    return FALSE;
+	}
+    }
+
+    /* Set the bits per RGB for 8bpp mode */
+    from = X_DEFAULT;
+
+    /* determine whether we use hardware or software cursor */
+    
+    pCg6->HWCursor = TRUE;
+    if (xf86GetOptValBool(CG6Options, OPTION_HW_CURSOR, &pCg6->HWCursor))
+	from = X_CONFIG;
+    if (xf86ReturnOptValBool(CG6Options, OPTION_SW_CURSOR, FALSE)) {
+	from = X_CONFIG;
+	pCg6->HWCursor = FALSE;
+    }
+    
+    xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
+		pCg6->HWCursor ? "HW" : "SW");
+
+    if (xf86ReturnOptValBool(CG6Options, OPTION_NOACCEL, FALSE)) {
+	pCg6->NoAccel = TRUE;
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
+    }
+        
+    if (xf86LoadSubModule(pScrn, "cfb") == NULL) {
+	CG6FreeRec(pScrn);
+	return FALSE;
+    }
+
+    if (pCg6->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
+	CG6FreeRec(pScrn);
+	return FALSE;
+    }
+
+    /*********************
+    set up clock and mode stuff
+    *********************/
+    
+    pScrn->progClock = TRUE;
+
+    if(pScrn->display->virtualX || pScrn->display->virtualY) {
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "CG6 does not support a virtual desktop\n");
+	pScrn->display->virtualX = 0;
+	pScrn->display->virtualY = 0;
+    }
+
+    xf86SbusUseBuiltinMode(pScrn, pCg6->psdp);
+    pScrn->currentMode = pScrn->modes;
+    pScrn->displayWidth = pScrn->virtualX;
+
+    /* Set display resolution */
+    xf86SetDpi(pScrn, 0, 0);
+
+    return TRUE;
+}
+
+/* Mandatory */
+
+/* This gets called at the start of each server generation */
+
+static Bool
+CG6ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+{
+    ScrnInfoPtr pScrn;
+    Cg6Ptr pCg6;
+    int ret;
+
+    /* 
+     * First get the ScrnInfoRec
+     */
+    pScrn = xf86Screens[pScreen->myNum];
+
+    pCg6 = GET_CG6_FROM_SCRN(pScrn);
+
+    /* Map the CG6 memory */
+    pCg6->fbc =
+	xf86MapSbusMem (pCg6->psdp, CG6_FBC_VOFF,
+			CG6_RAM_VOFF - CG6_FBC_VOFF +
+			(pCg6->psdp->width * pCg6->psdp->height));
+
+    if (! pCg6->fbc)
+	return FALSE;
+
+    pCg6->fb = (unsigned char *)pCg6->fbc + CG6_RAM_VOFF - CG6_FBC_VOFF;
+    pCg6->thc = (Cg6ThcPtr)((char *)pCg6->fbc + CG6_THC_VOFF - CG6_FBC_VOFF);
+
+    /* Darken the screen for aesthetic reasons and set the viewport */
+    CG6SaveScreen(pScreen, SCREEN_SAVER_ON);
+
+    /*
+     * The next step is to setup the screen's visuals, and initialise the
+     * framebuffer code.  In cases where the framebuffer's default
+     * choices for things like visual layouts and bits per RGB are OK,
+     * this may be as simple as calling the framebuffer's ScreenInit()
+     * function.  If not, the visuals will need to be setup before calling
+     * a fb ScreenInit() function and fixed up after.
+     */
+
+    /*
+     * Reset visual list.
+     */
+    miClearVisualTypes();
+
+    /* Set the bits per RGB for 8bpp mode */
+    pScrn->rgbBits = 8;
+
+    /* Setup the visuals we support. */
+
+    if (!miSetVisualTypes(pScrn->depth, miGetDefaultVisualMask(pScrn->depth),
+			  pScrn->rgbBits, pScrn->defaultVisual))
+	return FALSE;
+
+    /*
+     * Call the framebuffer layer's ScreenInit function, and fill in other
+     * pScreen fields.
+     */
+
+    ret = cfbScreenInit(pScreen, pCg6->fb, pScrn->virtualX,
+			pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+			pScrn->virtualX);
+    if (!ret)
+	return FALSE;
+
+    miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+
+    xf86SetBlackWhitePixels(pScreen);
+
+#if 0
+    if (!pCg6->NoAccel) {
+	extern Bool CG6AccelInit(ScreenPtr pScreen, Cg6Ptr pCg6);
+
+	if (!CG6AccelInit(pScreen, pCg6))
+	    return FALSE;
+	xf86Msg(X_INFO, "%s: Using acceleration\n", pCg6->psdp->device);
+    }
+#endif
+
+    /* Initialise cursor functions */
+    miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
+
+    /* Initialize HW cursor layer. 
+       Must follow software cursor initialization*/
+    if (pCg6->HWCursor) { 
+	extern Bool CG6HWCursorInit(ScreenPtr pScreen);
+
+	if(!CG6HWCursorInit(pScreen)) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
+		       "Hardware cursor initialization failed\n");
+	    return(FALSE);
+	}
+	xf86SbusHideOsHwCursor(pCg6->psdp);
+    }
+
+    /* Initialise default colourmap */
+    if (!miCreateDefColormap(pScreen))
+	return FALSE;
+
+    if(!xf86SbusHandleColormaps(pScreen, pCg6->psdp))
+	return FALSE;
+
+    pCg6->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = CG6CloseScreen;
+    pScreen->SaveScreen = CG6SaveScreen;
+
+    /* Report any unused options (only for the first generation) */
+    if (serverGeneration == 1) {
+	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+    }
+
+    /* unblank the screen */
+    CG6SaveScreen(pScreen, SCREEN_SAVER_OFF);
+
+    /* Done */
+    return TRUE;
+}
+
+
+/* Usually mandatory */
+static Bool
+CG6SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This function is used to initialize the Start Address - the first
+ * displayed location in the video memory.
+ */
+/* Usually mandatory */
+static void 
+CG6AdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+    /* we don't support virtual desktops */
+    return;
+}
+
+/*
+ * This is called when VT switching back to the X server.  Its job is
+ * to reinitialise the video mode.
+ */
+
+/* Mandatory */
+static Bool
+CG6EnterVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
+
+    if (pCg6->HWCursor) {
+	xf86SbusHideOsHwCursor (pCg6->psdp);
+	pCg6->CursorFg = 0;
+	pCg6->CursorBg = 0;
+    }
+    return TRUE;
+}
+
+
+/*
+ * This is called when VT switching away from the X server.
+ */
+
+/* Mandatory */
+static void
+CG6LeaveVT(int scrnIndex, int flags)
+{
+    return;
+}
+
+
+/*
+ * This is called at the end of each server generation.  It restores the
+ * original (text) mode.  It should really also unmap the video memory too.
+ */
+
+/* Mandatory */
+static Bool
+CG6CloseScreen(int scrnIndex, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
+
+    pScrn->vtSema = FALSE;
+    xf86UnmapSbusMem(pCg6->psdp, pCg6->fbc,
+		     CG6_RAM_VOFF - CG6_FBC_VOFF +
+		     (pCg6->psdp->width * pCg6->psdp->height));
+    
+    pScreen->CloseScreen = pCg6->CloseScreen;
+    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+    return FALSE;
+}
+
+
+/* Free up any per-generation data structures */
+
+/* Optional */
+static void
+CG6FreeScreen(int scrnIndex, int flags)
+{
+    CG6FreeRec(xf86Screens[scrnIndex]);
+}
+
+
+/* Checks if a mode is suitable for the selected chipset. */
+
+/* Optional */
+static int
+CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+{
+    if (mode->Flags & V_INTERLACE)
+	return(MODE_BAD);
+
+    return(MODE_OK);
+}
+
+/* Do screen blanking */
+
+/* Mandatory */
+static Bool
+CG6SaveScreen(ScreenPtr pScreen, int mode)
+    /* this function should blank the screen when unblank is FALSE and
+       unblank it when unblank is TRUE -- it doesn't actually seem to be
+       used for much though */
+{
+    return TRUE;
+}
+
+/*
+ * This is the implementation of the Sync() function.
+ */
+void
+CG6Sync(ScrnInfoPtr pScrn)
+{
+    return;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h:1.1
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h	Mon May 22 21:47:43 2000
@@ -0,0 +1,194 @@
+/*
+ * GX and Turbo GX framebuffer - hardware registers.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h,v 1.1 2000/05/23 04:47:43 dawes Exp $ */
+
+#ifndef CG6_REGS_H
+#define CG6_REGS_H
+
+/* FHC definitions */
+#define CG6_FHC_FBID_SHIFT           24
+#define CG6_FHC_FBID_MASK            255
+#define CG6_FHC_REV_SHIFT            20
+#define CG6_FHC_REV_MASK             15
+#define CG6_FHC_FROP_DISABLE         (1 << 19)
+#define CG6_FHC_ROW_DISABLE          (1 << 18)
+#define CG6_FHC_SRC_DISABLE          (1 << 17)
+#define CG6_FHC_DST_DISABLE          (1 << 16)
+#define CG6_FHC_RESET                (1 << 15)
+#define CG6_FHC_LITTLE_ENDIAN        (1 << 13)
+#define CG6_FHC_RES_MASK             (3 << 11)
+#define CG6_FHC_1024                 (0 << 11)
+#define CG6_FHC_1152                 (1 << 11)
+#define CG6_FHC_1280                 (2 << 11)
+#define CG6_FHC_1600                 (3 << 11)
+#define CG6_FHC_CPU_MASK             (3 << 9)
+#define CG6_FHC_CPU_SPARC            (0 << 9)
+#define CG6_FHC_CPU_68020            (1 << 9)
+#define CG6_FHC_CPU_386              (2 << 9)
+#define CG6_FHC_TEST		     (1 << 8)
+#define CG6_FHC_TEST_X_SHIFT	     4
+#define CG6_FHC_TEST_X_MASK	     15
+#define CG6_FHC_TEST_Y_SHIFT	     0
+#define CG6_FHC_TEST_Y_MASK	     15
+
+/* FBC mode definitions */
+#define CG6_FBC_BLIT_IGNORE		0x00000000
+#define CG6_FBC_BLIT_NOSRC		0x00100000
+#define CG6_FBC_BLIT_SRC		0x00200000
+#define CG6_FBC_BLIT_ILLEGAL		0x00300000
+#define CG6_FBC_BLIT_MASK		0x00300000
+
+#define CG6_FBC_VBLANK			0x00080000
+
+#define CG6_FBC_MODE_IGNORE		0x00000000
+#define CG6_FBC_MODE_COLOR8		0x00020000
+#define CG6_FBC_MODE_COLOR1		0x00040000
+#define CG6_FBC_MODE_HRMONO		0x00060000
+#define CG6_FBC_MODE_MASK		0x00060000
+
+#define CG6_FBC_DRAW_IGNORE		0x00000000
+#define CG6_FBC_DRAW_RENDER		0x00008000
+#define CG6_FBC_DRAW_PICK		0x00010000
+#define CG6_FBC_DRAW_ILLEGAL		0x00018000
+#define CG6_FBC_DRAW_MASK		0x00018000
+
+#define CG6_FBC_BWRITE0_IGNORE		0x00000000
+#define CG6_FBC_BWRITE0_ENABLE		0x00002000
+#define CG6_FBC_BWRITE0_DISABLE		0x00004000
+#define CG6_FBC_BWRITE0_ILLEGAL		0x00006000
+#define CG6_FBC_BWRITE0_MASK		0x00006000
+
+#define CG6_FBC_BWRITE1_IGNORE		0x00000000
+#define CG6_FBC_BWRITE1_ENABLE		0x00000800
+#define CG6_FBC_BWRITE1_DISABLE		0x00001000
+#define CG6_FBC_BWRITE1_ILLEGAL		0x00001800
+#define CG6_FBC_BWRITE1_MASK		0x00001800
+
+#define CG6_FBC_BREAD_IGNORE		0x00000000
+#define CG6_FBC_BREAD_0			0x00000200
+#define CG6_FBC_BREAD_1			0x00000400
+#define CG6_FBC_BREAD_ILLEGAL		0x00000600
+#define CG6_FBC_BREAD_MASK		0x00000600
+
+#define CG6_FBC_BDISP_IGNORE		0x00000000
+#define CG6_FBC_BDISP_0			0x00000080
+#define CG6_FBC_BDISP_1			0x00000100
+#define CG6_FBC_BDISP_ILLEGAL		0x00000180
+#define CG6_FBC_BDISP_MASK		0x00000180
+
+#define CG6_FBC_INDEX_MOD		0x00000040
+#define CG6_FBC_INDEX_MASK		0x00000030
+
+/* THC definitions */
+#define CG6_THC_MISC_REV_SHIFT       16
+#define CG6_THC_MISC_REV_MASK        15
+#define CG6_THC_MISC_RESET           (1 << 12)
+#define CG6_THC_MISC_VIDEO           (1 << 10)
+#define CG6_THC_MISC_SYNC            (1 << 9)
+#define CG6_THC_MISC_VSYNC           (1 << 8)
+#define CG6_THC_MISC_SYNC_ENAB       (1 << 7)
+#define CG6_THC_MISC_CURS_RES        (1 << 6)
+#define CG6_THC_MISC_INT_ENAB        (1 << 5)
+#define CG6_THC_MISC_INT             (1 << 4)
+#define CG6_THC_MISC_INIT            0x9f
+
+typedef struct cg6_tec {
+	volatile unsigned int	tec_matrix;
+	volatile unsigned int	tec_clip;
+	volatile unsigned int	tec_vdc;
+} Cg6Tec, *Cg6TecPtr;
+
+typedef struct cg6_thc {
+        unsigned int		thc_pad0[512];
+	volatile unsigned int	thc_hs;		/* hsync timing */
+	volatile unsigned int	thc_hsdvs;
+	volatile unsigned int	thc_hd;
+	volatile unsigned int	thc_vs;		/* vsync timing */
+	volatile unsigned int	thc_vd;
+	volatile unsigned int	thc_refresh;
+	volatile unsigned int	thc_misc;
+	unsigned int		thc_pad1[56];
+	volatile unsigned int	thc_cursxy;	/* cursor x,y position (16 bits each) */
+	volatile unsigned int	thc_cursmask[32];/* cursor mask bits */
+	volatile unsigned int	thc_cursbits[32];/* what to show where mask enabled */
+} Cg6Thc, *Cg6ThcPtr;
+
+typedef struct cg6_fbc {
+	unsigned int		xxx0[1];
+	volatile unsigned int	mode;
+	volatile unsigned int	clip;
+	unsigned int		xxx1[1];	    
+	volatile unsigned int	s;
+	volatile unsigned int	draw;
+	volatile unsigned int	blit;
+	volatile unsigned int	font;
+	unsigned int		xxx2[24];
+	volatile unsigned int	x0, y0, z0, color0;
+	volatile unsigned int	x1, y1, z1, color1;
+	volatile unsigned int	x2, y2, z2, color2;
+	volatile unsigned int	x3, y3, z3, color3;
+	volatile unsigned int	offx, offy;
+	unsigned int		xxx3[2];
+	volatile unsigned int	incx, incy;
+	unsigned int		xxx4[2];
+	volatile unsigned int	clipminx, clipminy;
+	unsigned int		xxx5[2];
+	volatile unsigned int	clipmaxx, clipmaxy;
+	unsigned int		xxx6[2];
+	volatile unsigned int	fg;
+	volatile unsigned int	bg;
+	volatile unsigned int	alu;
+	volatile unsigned int	pm;
+	volatile unsigned int	pixelm;
+	unsigned int		xxx7[2];
+	volatile unsigned int	patalign;
+	volatile unsigned int	pattern[8];
+	unsigned int		xxx8[432];
+	volatile unsigned int	apointx, apointy, apointz;
+	unsigned int		xxx9[1];
+	volatile unsigned int	rpointx, rpointy, rpointz;
+	unsigned int		xxx10[5];
+	volatile unsigned int	pointr, pointg, pointb, pointa;
+	volatile unsigned int	alinex, aliney, alinez;
+	unsigned int		xxx11[1];
+	volatile unsigned int	rlinex, rliney, rlinez;
+	unsigned int		xxx12[5];
+	volatile unsigned int	liner, lineg, lineb, linea;
+	volatile unsigned int	atrix, atriy, atriz;
+	unsigned int		xxx13[1];
+	volatile unsigned int	rtrix, rtriy, rtriz;
+	unsigned int		xxx14[5];
+	volatile unsigned int	trir, trig, trib, tria;
+	volatile unsigned int	aquadx, aquady, aquadz;
+	unsigned int		xxx15[1];
+	volatile unsigned int	rquadx, rquady, rquadz;
+	unsigned int		xxx16[5];
+	volatile unsigned int	quadr, quadg, quadb, quada;
+	volatile unsigned int	arectx, arecty, arectz;
+	unsigned int		xxx17[1];
+	volatile unsigned int	rrectx, rrecty, rrectz;
+	unsigned int		xxx18[5];
+	volatile unsigned int	rectr, rectg, rectb, recta;
+} Cg6Fbc, *Cg6FbcPtr;
+
+#endif /* CG6_REGS_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.cpp:1.2
--- /dev/null	Sat Jul  1 20:42:57 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.cpp	Tue Jun 13 19:13:14 2000
@@ -0,0 +1,30 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.cpp,v 1.2 2000/06/14 02:13:14 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH SUNCG6 __drivermansuffix__ "Version 4.0.1"  "XFree86"
+.SH NAME
+suncg6 \- GX/Turbo GX video driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qsuncg6\*q"
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B suncg6
+is an XFree86 driver for Sun GX and Turbo GX (also known as cgsix) video cards.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+The
+.B suncg6
+driver supports...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details.  This section only covers configuration details specific to this
+driver.
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+.SH AUTHORS
+Authors include: Jakub Jelinek <jakub@redhat.com>
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile:1.4
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile	Mon Jun 26 16:46:13 2000
@@ -0,0 +1,126 @@
+XCOMM
+XCOMM This is an Imakefile for the ffb driver.  
+XCOMM
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile,v 1.4 2000/06/26 23:46:13 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+#if BuildXF86DRI
+DRISRCS = ffb_dri.c
+DRIOBJS = ffb_dri.o
+DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include
+DRIDEFINES = $(GLX_DEFINES)
+#endif
+
+#if defined(AsVISOption) && defined(UseElfFormat)
+VISOBJS = VISmoveImage.o ffb_asm.o
+VISOPTIONS = -DUSE_VIS
+ASVISOPTION = AsVISOption
+GCCVISOPTION = -Wa,$(ASVISOPTION)
+#if AsOutputArchSize == 32
+#define FFBCObjectRule(name)										@@\
+name.o: name.c												@@\
+	ObjectCompile(-mv8 -mtune=ultrasparc $(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))				@@\
+	dd if=/dev/zero bs=1 count=3 | dd of=$@ bs=1 count=3 seek=36 conv=notrunc			@@\
+	echo -e '\002' | dd of=$@ bs=1 count=1 seek=19 conv=notrunc					@@\
+													@@\
+name.i: name.c												@@\
+	CPPOnlyCompile(name.c,-mv8 $(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))					@@\
+													@@\
+CenterLoadTarget(debug_src,name.c,NullParameter,$(ALLDEFINES) -mv8 $(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))
+#define FFBsObjectRule(name)										@@\
+name.o: name.s												@@\
+	$(RM) $@											@@\
+	$(CPP) $*.s | $(AS) $(ASVISOPTION) -o $@ -							@@\
+	dd if=/dev/zero bs=1 count=3 | dd of=$@ bs=1 count=3 seek=36 conv=notrunc			@@\
+	echo -e '\002' | dd of=$@ bs=1 count=1 seek=19 conv=notrunc
+#else
+#define FFBCObjectRule(name) SpecialCObjectRule(name,,$(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))
+#define FFBsObjectRule(name)										@@\
+name.o: name.s												@@\
+	$(RM) $@											@@\
+	$(CPP) $*.s | $(AS) $(ASVISOPTION) -o $@ -
+#endif
+#else
+VISOBJS =
+VISOPTIONS =
+ASVISOPTION =
+#define FFBCObjectRule(name)
+#define FFBsObjectRule(name)
+#endif
+
+SRCS = ffb_driver.c ffb_accel.c ffb_attr.c ffb_stip.c ffb_bcopy.c ffb_cplane.c \
+	ffb_fspans.c ffb_point.c ffb_seg.c ffb_plygon.c ffb_line.c ffb_glyph.c \
+	ffb_frect.c ffb_circle.c ffb_checks.c ffb_stubs.c ffb_gc.c \
+	ffb_gspans.c ffb_sspans.c ffb_zeroarc.c ffb_cursor.c ffb_dga.c ffb_dac.c \
+	ffb_wid.c ffb_dbe.c $(DRISRCS)
+OBJS = ffb_driver.o ffb_accel.o ffb_attr.o ffb_stip.o ffb_bcopy.o ffb_cplane.o \
+	ffb_fspans.o ffb_point.o ffb_seg.o ffb_plygon.o ffb_line.o ffb_glyph.o \
+	ffb_frect.o ffb_circle.o ffb_checks.o ffb_stubs.o ffb_gc.o \
+	ffb_gspans.o ffb_sspans.o ffb_zeroarc.o ffb_cursor.o ffb_dga.o ffb_dac.o \
+	ffb_wid.o ffb_dbe.o $(VISOBJS) $(DRIOBJS)
+
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+           -I$(SERVERSRC)/Xext -I$(SERVERSRC)/cfb \
+	   -I$(SERVERSRC)/dbe \
+	   -I$(XF86SRC)/xf8_32wid \
+	   -I$(XF86SRC)/ramdac \
+	   -I$(XF86SRC)/ddc \
+	   -I$(XF86SRC)/i2c \
+           -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(EXTINCSRC) \
+	   $(DRIINCLUDES)
+#endif
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+ModuleObjectRule()
+
+ObjectModuleTarget(sunffb,$(OBJS))
+
+InstallObjectModule(sunffb,$(MODULEDIR),drivers)
+
+#if !defined(XF86DriverSDK)
+CppManTarget(sunffb,)
+InstallModuleManPage(sunffb)
+#endif
+
+FFBCObjectRule(ffb_accel)
+FFBCObjectRule(ffb_driver)
+FFBCObjectRule(ffb_attr)
+FFBCObjectRule(ffb_stip)
+FFBCObjectRule(ffb_bcopy)
+FFBCObjectRule(ffb_cplane)
+FFBCObjectRule(ffb_fspans)
+FFBCObjectRule(ffb_point)
+FFBCObjectRule(ffb_seg)
+FFBCObjectRule(ffb_plygon)
+FFBCObjectRule(ffb_line)
+FFBCObjectRule(ffb_glyph)
+FFBCObjectRule(ffb_frect)
+FFBCObjectRule(ffb_circle)
+FFBCObjectRule(ffb_checks)
+FFBCObjectRule(ffb_stubs)
+FFBCObjectRule(ffb_gc)
+FFBCObjectRule(ffb_gspans)
+FFBCObjectRule(ffb_sspans)
+FFBCObjectRule(ffb_zeroarc)
+FFBCObjectRule(ffb_cursor)
+FFBCObjectRule(ffb_dga)
+FFBCObjectRule(ffb_dac)
+FFBCObjectRule(ffb_wid)
+FFBCObjectRule(ffb_dbe)
+FFBsObjectRule(VISmoveImage)
+FFBsObjectRule(ffb_asm)
+#if BuildXF86DRI
+FFBCObjectRule(ffb_dri)
+#endif
+
+DependTarget()
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/VISmoveImage.s
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/VISmoveImage.s:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/VISmoveImage.s	Mon May 22 21:47:43 2000
@@ -0,0 +1,2710 @@
+/*
+ * VISmoveImage.S: High speed moveImage operations utilizing the UltraSPARC
+ *                 Visual Instruction Set.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/VISmoveImage.s,v 1.2 2000/05/23 04:47:43 dawes Exp $ */
+
+
+/* NOTE NOTE NOTE: All loads in these routines _MUST_ be 64-byte block
+ *                 loads.  If any non-block loads are done to the frame-
+ *                 buffer when prefetching is enabled (which we use, when
+ *		   available) this will cause lockups on FFB2 due to a
+ *		   hardware bug. -DaveM
+ */
+
+/* 
+   void
+   VISmoveImageLR(unsigned char *src, unsigned char *dst, long w, long h, long skind, long dkind)
+   {
+     int i;
+
+     // Handles copying non-overlapping images and for overlapping images
+     // copying where dstx <= srcx.
+     // To copy overlapping images where dsty > srcy, set src and dst
+     // to start of the last scanline and negate both skind and dkind arguments.
+
+     assert(abs(skind) >= w && abs(dkind) >= w);
+
+     while (h--) {
+       for (i = 0; i < w; i++)
+         *d++ = *s++;
+       s += skind - w;
+       d += dkind - w;
+     }
+   }
+
+   void
+   VISmoveImageRL(unsigned char *src, unsigned char *dst, long w, long h, long skind, long dkind)
+   {
+     int i;
+
+     // Handles copying non-overlapping images and for overlapping images
+     // copying where dstx >= srcx.
+     // To copy overlapping images where dsty > srcy, set src and dst
+     // to start of the last scanline and negate both skind and dkind arguments.
+
+     assert(abs(skind) >= w && abs(dkind) >= w);
+
+     s += w;
+     d += w;
+     while (h--) {
+       for (i = 0; i < w; i++)
+         *--d = *--s;
+       s += skind + w;
+       d += dkind + w;
+     }
+   }
+
+ */
+
+#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+#define SMUL			mulx
+#define ICC			xcc
+#else
+#define SMUL			smul
+#define ICC			icc
+#endif
+
+#define ASI_PST8_P		0xc0
+#define ASI_BLK_P		0xf0
+#define SYNC			0x40
+
+/* Register usage:								*/
+/*   integer registers:								*/
+#define src			i0
+#define dst			i1
+#define w			i2
+#define h			i3
+#define skind			i4
+#define dkind			i5
+#define branchbase		l0
+#define tmp1			l1
+#define tmp4			l2
+#define tmp5			l3
+#define leftw			l4
+#define rightw			l5
+#define srcstart		l6
+#define mode			l7
+#define fregset			o0		/* Must be [og]? for v8plusa */
+#define srcend			o1
+#define srcn			o2
+#define srcnext			o3
+#define rightw2			o4
+#define tmp2			o5		/* Must be [og]? for v8plusa */
+#define narrow			o7
+#define prepw			g1		/* Must be [og]? for v8plusa */
+#define srcstop			g2
+#define srcnotdone		g3
+#define curw			g4		/* Must be [og]? for v8plusa */
+#define leftw2			rightw2
+#define tmp3			g5		/* Must be [og]? for v8plusa */
+/*   floating point registers:							*/
+#define ftmp1			f0
+#define ftmp2			f2
+#define ftmp3			f4
+#define ftmp4			f6
+#define ftmp5			f8
+#define ftmp6			f10
+#define ftmp7			f12
+#define ftmp8			f14
+#define store_regs		f16-f31
+#define load_bank1		f32-f46
+#define load_bank2		f48-f62
+#define fnop			fmovd	%ftmp2, %ftmp2
+
+#define LOAD(f32,f46,tgt,tgtr)							\
+	subcc			%curw, 64, %curw;				\
+	bleu,pn			%ICC, tgt;					\
+	 fmovd			%f46, %ftmp1;					\
+	ldda			[%src] ASI_BLK_P, %f32;				\
+	add			%src, 64, %src;					\
+tgtr:
+
+#define PREPLOAD(f32,f46,tgt,tgtr)						\
+	brlez,pn		%prepw, tgt;					\
+	 fmovd			%f46, %ftmp1;					\
+	ldda			[%src] ASI_BLK_P, %f32;				\
+	add			%src, 64, %src;					\
+tgtr:
+
+#define STORE									\
+	stda			%f16, [%dst] ASI_BLK_P;
+
+#define FREG_FROB(f0,A0,F2,f2,A1,F4,f4,A2,F6,f6,A3,F8,f8,A4,F10,f10,A5,F12,f12,A6,F14,f14,A7,F16) 	\
+	A0									\
+	faligndata		%f0,%F2,%f16;					\
+	A1									\
+	faligndata		%f2,%F4,%f18;					\
+	A2									\
+	faligndata		%f4,%F6,%f20;					\
+	A3									\
+	faligndata		%f6,%F8,%f22;					\
+	A4									\
+	faligndata		%f8,%F10,%f24;					\
+	A5									\
+	faligndata		%f10,%F12,%f26;					\
+	A6									\
+	faligndata		%f12,%F14,%f28;					\
+	A7									\
+	faligndata		%f14,%F16,%f30;
+
+	.section		".rodata"
+	.asciz			"VISmoveImage (C) 1998,1999 Jakub Jelinek"
+
+/* The code might not be self-explanatory, but it was written to be processed
+ * by machines, not humans.  Comments are deliberately left as an exercise
+ * to the occasional reader.  */
+
+	.text
+	.globl			VISmoveImageLR
+	.align			32
+VISmoveImageLR:
+	save			%sp, -160, %sp				! Group 0
+0:	rd			%pc, %tmp3				! Group 1
+	sub			%src, %dst, %mode			! Group 7
+	brz,pn			%h, return
+	 neg			%dst, %leftw				! Group 8
+	mov			%src, %srcstart
+	andn			%src, 63, %src				! Group 9
+	cmp			%w, 128
+	blu,pn			%ICC, prepare_narrow
+	 and			%mode, 63, %mode			! Group 10
+	add			%dst, %w, %rightw
+	ldda			[%src] ASI_BLK_P, %f32			! Group 11
+	add			%src, 64, %src				! Group 12
+	clr			%narrow
+	ldda			[%src] ASI_BLK_P, %f48			! Group 13
+	and			%leftw, 63, %leftw			! Group 14
+	sub			%rightw, 1, %rightw
+	andn			%dst, 63, %dst				! Group 15
+	and			%rightw, 63, %rightw
+	alignaddr		%mode, %g0, %g0				! Group 16
+	add			%rightw, 1, %rightw			! Group 17
+	clr			%fregset
+	add			%src, 64, %src				! Group 18
+	add			%tmp3, (BranchBase - 0b), %branchbase
+	mov			64, %prepw				! Group 19
+	ba,pt			%xcc, roll_wide
+	 sub			%h, 1, %srcnotdone
+prepare_narrow:
+#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+	brlez,pn		%w, return
+#else
+	tst			%w
+	ble,pn			%icc, return
+#endif
+	 add			%dst, %w, %rightw			! Group 11
+	and			%leftw, 63, %leftw
+	ldda			[%src] ASI_BLK_P, %f32			! Group 12
+	sub			%rightw, 1, %rightw			! Group 13
+	andn			%dst, 63, %dst
+	and			%rightw, 63, %rightw			! Group 14
+	sub			%w, %leftw, %tmp2
+	add			%rightw, 1, %rightw			! Group 15
+	clr			%fregset
+	subcc			%tmp2, %rightw, %curw			! Group 16
+	and			%srcstart, 63, %tmp1
+	mov			%curw, %prepw				! Group 17
+	add			%tmp1, %w, %tmp1
+	bg,pt			%ICC, 1f
+	 add			%src, 64, %src				! Group 18
+	cmp			%tmp1, 128
+	movg			%icc, 64, %prepw			! Group 19
+1:	add			%srcstart, %w, %srcend
+	sub			%h, 1, %srcnotdone			! Group 20
+	add			%srcstart, %skind, %srcnext
+	add			%srcend, 63, %tmp4			! Group 21
+	andn			%srcnext, 63, %srcnext
+	add			%w, 64, %tmp2				! Group 22
+	cmp			%skind, 0
+	bl,pn			%ICC, 1f
+	 clr			%srcstop				! Group 23
+	cmp			%skind, %tmp2
+	bgeu,pt			%ICC, 2f
+	 andn			%tmp4, 63, %tmp2			! Group 24
+	SMUL			%skind, %srcnotdone, %srcstop
+	ba,pt			%xcc, 2f
+	 add			%tmp4, %srcstop, %srcstop
+1:	addcc			%tmp2, %skind, %g0
+	ble,pt			%ICC, 2f
+	 sub			%srcnext, 64, %tmp2
+	SMUL			%skind, %srcnotdone, %srcstop
+	sub			%srcstart, 64, %narrow
+	add			%srcstop, %narrow, %srcstop
+2:	add			%srcnext, 64, %narrow
+	andn			%tmp4, 63, %srcend			! Group 25
+	mov			%srcnext, %srcn
+	cmp			%narrow, %srcend			! Group 26
+	andn			%srcstop, 63, %srcstop
+	move			%ICC, %tmp2, %srcnext			! Group 27
+	alignaddr		%mode, %g0, %g0				! Group 28
+	add			%tmp3, (BranchBase - 0b), %branchbase
+	mov			1, %narrow				! Group 29
+	cmp			%srcnext, %srcstop
+	move			%ICC, 0, %srcnotdone			! Group 30
+	cmp			%tmp1, 64
+	bleu,pn			%ICC, 1f
+	 dec			%h					! Group 31
+	ldda			[%src] ASI_BLK_P, %f48			! Group 32
+	ba,pt			%xcc, roll_narrow			! Group 33
+	 addcc			%src, 64, %src
+1:	brz,a,pn		%srcnotdone, roll_narrow
+	 membar			#Sync
+	ldda			[%srcnext] ASI_BLK_P, %f48
+	ba,pt			%xcc, roll_narrow
+	 addcc			%srcnext, 64, %src
+
+	.align			32
+prepr0:	faligndata		%f32, %f34, %f16
+	faligndata		%f34, %f36, %f18
+	faligndata		%f36, %f38, %f20
+	faligndata		%f38, %f40, %f22
+	faligndata		%f40, %f42, %f24
+	faligndata		%f42, %f44, %f26
+	ba,pt			%xcc, 4f
+	 faligndata		%f44, %f46, %f28
+	.align			32
+prepr1:	faligndata		%f48, %f50, %f16
+	faligndata		%f50, %f52, %f18
+	faligndata		%f52, %f54, %f20
+	faligndata		%f54, %f56, %f22
+	faligndata		%f56, %f58, %f24
+	faligndata		%f58, %f60, %f26
+	ba,pt			%xcc, 5f
+	 faligndata		%f60, %f62, %f28
+	.align			32
+prepr2:	faligndata		%f34, %f36, %f16
+	faligndata		%f36, %f38, %f18
+	faligndata		%f38, %f40, %f20
+	faligndata		%f40, %f42, %f22
+	faligndata		%f42, %f44, %f24
+	faligndata		%f44, %f46, %f26
+	ba,pt			%xcc, narrowst
+	 faligndata		%f46, %f0, %f28
+	.align			32
+prepr3:	faligndata		%f50, %f52, %f16
+	faligndata		%f52, %f54, %f18
+	faligndata		%f54, %f56, %f20
+	faligndata		%f56, %f58, %f22
+	faligndata		%f58, %f60, %f24
+	faligndata		%f60, %f62, %f26
+	ba,pt			%xcc, narrowst
+	 faligndata		%f62, %f0, %f28
+	.align			32
+prepr4:	faligndata		%f36, %f38, %f16
+	faligndata		%f38, %f40, %f18
+	faligndata		%f40, %f42, %f20
+	faligndata		%f42, %f44, %f22
+	faligndata		%f44, %f46, %f24
+	ba,pt			%xcc, narrowst
+	 faligndata		%f46, %f0, %f26
+	.align			32
+prepr5:	faligndata		%f52, %f54, %f16
+	faligndata		%f54, %f56, %f18
+	faligndata		%f56, %f58, %f20
+	faligndata		%f58, %f60, %f22
+	faligndata		%f60, %f62, %f24
+	ba,pt			%xcc, narrowst
+	 faligndata		%f62, %f0, %f26
+	.align			32
+prepr6:	faligndata		%f38, %f40, %f16
+	faligndata		%f40, %f42, %f18
+	faligndata		%f42, %f44, %f20
+	faligndata		%f44, %f46, %f22
+	ba,pt			%xcc, narrowst
+	 faligndata		%f46, %f0, %f24
+	.align			32
+prepr7:	faligndata		%f54, %f56, %f16
+	faligndata		%f56, %f58, %f18
+	faligndata		%f58, %f60, %f20
+	faligndata		%f60, %f62, %f22
+	ba,pt			%xcc, narrowst
+	 faligndata		%f62, %f0, %f24
+	.align			32
+prepr8:	faligndata		%f40, %f42, %f16
+	faligndata		%f42, %f44, %f18
+	faligndata		%f44, %f46, %f20
+	ba,pt			%xcc, narrowst
+	 faligndata		%f46, %f0, %f22
+	.align			32
+prepr9:	faligndata		%f56, %f58, %f16
+	faligndata		%f58, %f60, %f18
+	faligndata		%f60, %f62, %f20
+	ba,pt			%xcc, narrowst
+	 faligndata		%f62, %f0, %f22
+	.align			32
+prepr10:faligndata		%f42, %f44, %f16
+	faligndata		%f44, %f46, %f18
+	ba,pt			%xcc, narrowst
+	 faligndata		%f46, %f0, %f20
+	.align			32
+prepr11:faligndata		%f58, %f60, %f16
+	faligndata		%f60, %f62, %f18
+	ba,pt			%xcc, narrowst
+	 faligndata		%f62, %f0, %f20
+	.align			32
+prepr12:faligndata		%f44, %f46, %f16
+	ba,pt			%xcc, narrowst
+	 faligndata		%f46, %f0, %f18
+	.align			32
+prepr13:faligndata		%f60, %f62, %f16
+	ba,pt			%xcc, narrowst
+	 faligndata		%f62, %f0, %f18
+	.align			32
+prepr14:ba,pt			%xcc, narrowst
+	 faligndata		%f46, %f0, %f16
+	nop
+	nop
+4:	ba,pt			%xcc, narrowst
+	 faligndata		%f46, %f0, %f30
+	.align			32
+prepr15:ba,pt			%xcc, narrowst
+	 faligndata		%f62, %f0, %f16
+	nop
+	nop
+5:	ba,pt			%xcc, narrowst
+	 faligndata		%f62, %f0, %f30
+
+	.align			32
+prepn0:	faligndata		%ftmp1, %f32, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis0 - BranchBase), %tmp3
+	nop
+1:	ba,pt			%xcc, leftst
+	 mov			(vis12 - BranchBase), %tmp3
+	.align			32
+prepn1:	faligndata		%ftmp1, %f48, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis1 - BranchBase), %tmp3
+	nop
+2:	ba,pt			%xcc, leftst
+	 mov			(vis13 - BranchBase), %tmp3
+	.align			32
+prepn2: faligndata		%ftmp1, %f32, %f28
+	faligndata		%f32, %f34, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis2 - BranchBase), %tmp3
+3:	faligndata		%f44, %f46, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis14 - BranchBase), %tmp3
+	.align			32
+prepn3: faligndata		%ftmp1, %f48, %f28
+	faligndata		%f48, %f50, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis3 - BranchBase), %tmp3
+	.align			32
+prepn4: faligndata		%ftmp1, %f32, %f26
+	faligndata		%f32, %f34, %f28
+	faligndata		%f34, %f36, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis4 - BranchBase), %tmp3
+	.align			32
+prepn5:	faligndata		%ftmp1, %f48, %f26
+	faligndata		%f48, %f50, %f28
+	faligndata		%f50, %f52, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis5 - BranchBase), %tmp3
+	.align			32
+prepn6: faligndata		%ftmp1, %f32, %f24
+	faligndata		%f32, %f34, %f26
+	faligndata		%f34, %f36, %f28
+	faligndata		%f36, %f38, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis6 - BranchBase), %tmp3
+	.align			32
+prepn7:	faligndata		%ftmp1, %f48, %f24
+	faligndata		%f48, %f50, %f26
+	faligndata		%f50, %f52, %f28
+	faligndata		%f52, %f54, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis7 - BranchBase), %tmp3
+	.align			32
+prepn8:	faligndata		%ftmp1, %f32, %f22
+	faligndata		%f32, %f34, %f24
+	faligndata		%f34, %f36, %f26
+	faligndata		%f36, %f38, %f28
+	faligndata		%f38, %f40, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis8 - BranchBase), %tmp3
+	.align			32
+prepn9:	faligndata		%ftmp1, %f48, %f22
+	faligndata		%f48, %f50, %f24
+	faligndata		%f50, %f52, %f26
+	faligndata		%f52, %f54, %f28
+	faligndata		%f54, %f56, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis9 - BranchBase), %tmp3
+	.align			32
+prepn10:faligndata		%ftmp1, %f32, %f20
+	faligndata		%f32, %f34, %f22
+	faligndata		%f34, %f36, %f24
+	faligndata		%f36, %f38, %f26
+	faligndata		%f38, %f40, %f28
+	faligndata		%f40, %f42, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis10 - BranchBase), %tmp3
+	.align			32
+prepn11:faligndata		%ftmp1, %f48, %f20
+	faligndata		%f48, %f50, %f22
+	faligndata		%f50, %f52, %f24
+	faligndata		%f52, %f54, %f26
+	faligndata		%f54, %f56, %f28
+	faligndata		%f56, %f58, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis11 - BranchBase), %tmp3
+	.align			32
+prepn12:faligndata		%ftmp1, %f32, %f18
+	faligndata		%f32, %f34, %f20
+	faligndata		%f34, %f36, %f22
+	faligndata		%f36, %f38, %f24
+	faligndata		%f38, %f40, %f26
+	faligndata		%f40, %f42, %f28
+	ba,pt			%xcc, 1b
+	 faligndata		%f42, %f44, %f30
+	.align			32
+prepn13:faligndata		%ftmp1, %f48, %f18
+	faligndata		%f48, %f50, %f20
+	faligndata		%f50, %f52, %f22
+	faligndata		%f52, %f54, %f24
+	faligndata		%f54, %f56, %f26
+	faligndata		%f56, %f58, %f28
+	ba,pt			%xcc, 2b
+	 faligndata		%f58, %f60, %f30
+	.align			32
+prepn14:faligndata		%ftmp1, %f32, %f16
+	faligndata		%f32, %f34, %f18
+	faligndata		%f34, %f36, %f20
+	faligndata		%f36, %f38, %f22
+	faligndata		%f38, %f40, %f24
+	faligndata		%f40, %f42, %f26
+	ba,pt			%xcc, 3b
+	 faligndata		%f42, %f44, %f28
+	.align			32
+prepn15:faligndata		%ftmp1, %f48, %f16
+	faligndata		%f48, %f50, %f18
+	faligndata		%f50, %f52, %f20
+	faligndata		%f52, %f54, %f22
+	faligndata		%f54, %f56, %f24
+	faligndata		%f56, %f58, %f26
+	faligndata		%f58, %f60, %f28
+	faligndata		%f60, %f62, %f30
+	ba,pt			%xcc, leftst
+	 mov			(vis15 - BranchBase), %tmp3
+
+	.align			64
+BranchBase:
+prepl0:	FREG_FROB(f32,,f34,f34,,f36,f36,,f38,f38,,f40,f40,,f42,f42,,f44,f44,,f46,ftmp1,PREPLOAD(f32,f46,prep0e,prep0r),f48)
+	ba,pt			%xcc, leftst
+	 mov			(vis1 - BranchBase), %tmp3
+	.align			64
+prepl1:	FREG_FROB(f48,,f50,f50,,f52,f52,,f54,f54,,f56,f56,,f58,f58,,f60,f60,,f62,ftmp1,PREPLOAD(f48,f62,prep1e,prep1r),f32)
+	ba,pt			%xcc, leftst
+	 mov			(vis0 - BranchBase), %tmp3
+	.align			64
+prepl2:	FREG_FROB(f34,,f36,f36,,f38,f38,,f40,f40,,f42,f42,,f44,f44,,f46,ftmp1,PREPLOAD(f32,f46,prep2e,prep2r),f48,f48,,f50)
+	ba,pt			%xcc, leftst
+	 mov			(vis3 - BranchBase), %tmp3
+	.align			64
+prepl3:	FREG_FROB(f50,,f52,f52,,f54,f54,,f56,f56,,f58,f58,,f60,f60,,f62,ftmp1,PREPLOAD(f48,f62,prep3e,prep3r),f32,f32,,f34)
+	ba,pt			%xcc, leftst
+	 mov			(vis2 - BranchBase), %tmp3
+	.align			64
+prepl4:	FREG_FROB(f36,,f38,f38,,f40,f40,,f42,f42,,f44,f44,,f46,ftmp1,PREPLOAD(f32,f46,prep4e,prep4r),f48,f48,,f50,f50,,f52)
+	ba,pt			%xcc, leftst
+	 mov			(vis5 - BranchBase), %tmp3
+	.align			64
+prepl5:	FREG_FROB(f52,,f54,f54,,f56,f56,,f58,f58,,f60,f60,,f62,ftmp1,PREPLOAD(f48,f62,prep5e,prep5r),f32,f32,,f34,f34,,f36)
+	ba,pt			%xcc, leftst
+	 mov			(vis4 - BranchBase), %tmp3
+	.align			64
+prepl6:	FREG_FROB(f38,,f40,f40,,f42,f42,,f44,f44,,f46,ftmp1,PREPLOAD(f32,f46,prep6e,prep6r),f48,f48,,f50,f50,,f52,f52,,f54)
+	ba,pt			%xcc, leftst
+	 mov			(vis7 - BranchBase), %tmp3
+	.align			64
+prepl7:	FREG_FROB(f54,,f56,f56,,f58,f58,,f60,f60,,f62,ftmp1,PREPLOAD(f48,f62,prep7e,prep7r),f32,f32,,f34,f34,,f36,f36,,f38)
+	ba,pt			%xcc, leftst
+	 mov			(vis6 - BranchBase), %tmp3
+	.align			64
+prepl8:	FREG_FROB(f40,,f42,f42,,f44,f44,,f46,ftmp1,PREPLOAD(f32,f46,prep8e,prep8r),f48,f48,,f50,f50,,f52,f52,,f54,f54,,f56)
+	ba,pt			%xcc, leftst
+	 mov			(vis9 - BranchBase), %tmp3
+	.align			64
+prepl9:	FREG_FROB(f56,,f58,f58,,f60,f60,,f62,ftmp1,PREPLOAD(f48,f62,prep9e,prep9r),f32,f32,,f34,f34,,f36,f36,,f38,f38,,f40)
+	ba,pt			%xcc, leftst
+	 mov			(vis8 - BranchBase), %tmp3
+	.align			64
+prepl10:FREG_FROB(f42,,f44,f44,,f46,ftmp1,PREPLOAD(f32,f46,prep10e,prep10r),f48,f48,,f50,f50,,f52,f52,,f54,f54,,f56,f56,,f58)
+	ba,pt			%xcc, leftst
+	 mov			(vis11 - BranchBase), %tmp3
+	.align			64
+prepl11:FREG_FROB(f58,,f60,f60,,f62,ftmp1,PREPLOAD(f48,f62,prep11e,prep11r),f32,f32,,f34,f34,,f36,f36,,f38,f38,,f40,f40,,f42)
+	ba,pt			%xcc, leftst
+	 mov			(vis10 - BranchBase), %tmp3
+	.align			64
+prepl12:FREG_FROB(f44,,f46,ftmp1,PREPLOAD(f32,f46,prep12e,prep12r),f48,f48,,f50,f50,,f52,f52,,f54,f54,,f56,f56,,f58,f58,,f60)
+	ba,pt			%xcc, leftst
+	 mov			(vis13 - BranchBase), %tmp3
+	.align			64
+prepl13:FREG_FROB(f60,,f62,ftmp1,PREPLOAD(f48,f62,prep13e,prep13r),f32,f32,,f34,f34,,f36,f36,,f38,f38,,f40,f40,,f42,f42,,f44)
+	ba,pt			%xcc, leftst
+	 mov			(vis12 - BranchBase), %tmp3
+	.align			64
+prepl14:FREG_FROB(ftmp1,PREPLOAD(f32,f46,prep14e,prep14r),f48,f48,,f50,f50,,f52,f52,,f54,f54,,f56,f56,,f58,f58,,f60,f60,,f62)
+	ba,pt			%xcc, leftst
+	 mov			(vis15 - BranchBase), %tmp3
+	.align			64
+prepl15:FREG_FROB(ftmp1,PREPLOAD(f48,f62,prep15e,prep15r),f32,f32,,f34,f34,,f36,f36,,f38,f38,,f40,f40,,f42,f42,,f44,f44,,f46)
+	ba,pt			%xcc, leftst
+	 mov			(vis14 - BranchBase), %tmp3
+
+	.align			128
+vis0:	FREG_FROB(f32,,f34,f34,,f36,f36,,f38,f38,,f40,f40,,f42,f42,,f44,f44,,f46,ftmp1,LOAD(f32,f46,vis0e,vis0r),f48)
+	STORE
+	add			%dst, 64, %dst
+vis1:	FREG_FROB(f48,,f50,f50,,f52,f52,,f54,f54,,f56,f56,,f58,f58,,f60,f60,,f62,ftmp1,LOAD(f48,f62,vis1e,vis1r),f32)
+	STORE
+	ba,pt			%xcc, vis0
+	 add			%dst, 64, %dst
+	.align			128
+vis2:	FREG_FROB(f34,,f36,f36,,f38,f38,,f40,f40,,f42,f42,,f44,f44,,f46,ftmp1,LOAD(f32,f46,vis2e,vis2r),f48,f48,,f50)
+	STORE
+	add			%dst, 64, %dst
+vis3:	FREG_FROB(f50,,f52,f52,,f54,f54,,f56,f56,,f58,f58,,f60,f60,,f62,ftmp1,LOAD(f48,f62,vis3e,vis3r),f32,f32,,f34)
+	STORE
+	ba,pt			%xcc, vis2
+	 add			%dst, 64, %dst
+	.align			128
+vis4:	FREG_FROB(f36,,f38,f38,,f40,f40,,f42,f42,,f44,f44,,f46,ftmp1,LOAD(f32,f46,vis4e,vis4r),f48,f48,,f50,f50,,f52)
+	STORE
+	add			%dst, 64, %dst
+vis5:	FREG_FROB(f52,,f54,f54,,f56,f56,,f58,f58,,f60,f60,,f62,ftmp1,LOAD(f48,f62,vis5e,vis5r),f32,f32,,f34,f34,,f36)
+	STORE
+	ba,pt			%xcc, vis4
+	 add			%dst, 64, %dst
+	.align			128
+vis6:	FREG_FROB(f38,,f40,f40,,f42,f42,,f44,f44,,f46,ftmp1,LOAD(f32,f46,vis6e,vis6r),f48,f48,,f50,f50,,f52,f52,,f54)
+	STORE
+	add			%dst, 64, %dst
+vis7:	FREG_FROB(f54,,f56,f56,,f58,f58,,f60,f60,,f62,ftmp1,LOAD(f48,f62,vis7e,vis7r),f32,f32,,f34,f34,,f36,f36,,f38)
+	STORE
+	ba,pt			%xcc, vis6
+	 add			%dst, 64, %dst
+	.align			128
+vis8:	FREG_FROB(f40,,f42,f42,,f44,f44,,f46,ftmp1,LOAD(f32,f46,vis8e,vis8r),f48,f48,,f50,f50,,f52,f52,,f54,f54,,f56)
+	STORE
+	add			%dst, 64, %dst
+vis9:	FREG_FROB(f56,,f58,f58,,f60,f60,,f62,ftmp1,LOAD(f48,f62,vis9e,vis9r),f32,f32,,f34,f34,,f36,f36,,f38,f38,,f40)
+	STORE
+	ba,pt			%xcc, vis8
+	 add			%dst, 64, %dst
+	.align			128
+vis10:	FREG_FROB(f42,,f44,f44,,f46,ftmp1,LOAD(f32,f46,vis10e,vis10r),f48,f48,,f50,f50,,f52,f52,,f54,f54,,f56,f56,,f58)
+	STORE
+	add			%dst, 64, %dst
+vis11:	FREG_FROB(f58,,f60,f60,,f62,ftmp1,LOAD(f48,f62,vis11e,vis11r),f32,f32,,f34,f34,,f36,f36,,f38,f38,,f40,f40,,f42)
+	STORE
+	ba,pt			%xcc, vis10
+	 add			%dst, 64, %dst
+	.align			128
+vis12:	FREG_FROB(f44,,f46,ftmp1,LOAD(f32,f46,vis12e,vis12r),f48,f48,,f50,f50,,f52,f52,,f54,f54,,f56,f56,,f58,f58,,f60)
+	STORE
+	add			%dst, 64, %dst
+vis13:	FREG_FROB(f60,,f62,ftmp1,LOAD(f48,f62,vis13e,vis13r),f32,f32,,f34,f34,,f36,f36,,f38,f38,,f40,f40,,f42,f42,,f44)
+	STORE
+	ba,pt			%xcc, vis12
+	 add			%dst, 64, %dst
+	.align			128
+vis14:	FREG_FROB(ftmp1,LOAD(f32,f46,vis14e,vis14r),f48,f48,,f50,f50,,f52,f52,,f54,f54,,f56,f56,,f58,f58,,f60,f60,,f62)
+	STORE
+	add			%dst, 64, %dst
+vis15:	FREG_FROB(ftmp1,LOAD(f48,f62,vis15e,vis15r),f32,f32,,f34,f34,,f36,f36,,f38,f38,,f40,f40,,f42,f42,,f44,f44,,f46)
+	STORE
+	ba,pt			%xcc, vis14
+	 add			%dst, 64, %dst
+
+leftst:	brlz,pn			%curw, narrowst + 4
+	 and			%leftw, 0x38, %tmp1
+	andcc			%leftw, 7, %g0
+	be,pn			%icc, 1f
+	 neg			%tmp1
+	sub			%dst, %leftw, %tmp4
+	add			%branchbase, (2f - BranchBase - 8), %tmp2
+	edge8			%tmp4, %g0, %tmp5
+	jmpl			%tmp2 + %tmp1, %g0
+	 andn			%tmp4, 7, %tmp4
+1:	addcc			%branchbase, (3f - BranchBase), %tmp2
+	sra			%tmp1, 1, %tmp1
+	jmpl			%tmp2 + %tmp1, %g0
+	 nop
+	ba,pt			%xcc, 2f+0x00
+	 stda			%f16, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x04
+	 stda			%f18, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x08
+	 stda			%f20, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x0c
+	 stda			%f22, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x10
+	 stda			%f24, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x14
+	 stda			%f26, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x18
+	 stda			%f28, [%tmp4 + %tmp5] ASI_PST8_P
+	jmpl			%branchbase + %tmp3, %g0
+	 stda			%f30, [%tmp4 + %tmp5] ASI_PST8_P
+2:	std			%f18, [%dst - 0x38]
+	std			%f20, [%dst - 0x30]
+	std			%f22, [%dst - 0x28]
+	std			%f24, [%dst - 0x20]
+	std			%f26, [%dst - 0x18]
+	std			%f28, [%dst - 0x10]
+	std			%f30, [%dst - 0x08]
+3:	jmpl			%branchbase + %tmp3, %g0
+	 nop
+
+rightst:cmp			%rightw, 64
+	be,pn			%icc, 2f
+	 and			%rightw, 0x38, %tmp1
+	andcc			%rightw, 7, %g0
+	be,pn			%icc, 1f
+	 neg			%tmp1
+	sub			%g0, %rightw, %tmp5
+	add			%branchbase, (3f - BranchBase - 8), %tmp2
+	edge8l			%tmp5, %g0, %tmp5
+	add			%mode, %skind, %mode
+	jmpl			%tmp1 + %tmp2, %g0
+	 sub			%dst, %tmp1, %tmp4
+1:	addcc			%branchbase, (4f - BranchBase), %tmp2
+	sra			%tmp1, 1, %tmp1
+	jmpl			%tmp1 + %tmp2, %g0
+2:	 add			%mode, %skind, %mode
+	ba,pt			%xcc, 4f
+	 stda			%f16, [%dst] ASI_BLK_P
+	ba,pt			%xcc, 3f+0x00
+	 stda			%f30, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x04
+	 stda			%f28, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x08
+	 stda			%f26, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x0c
+	 stda			%f24, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x10
+	 stda			%f22, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x14
+	 stda			%f20, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x18
+	 stda			%f18, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x1c
+	 stda			%f16, [%tmp4 + %tmp5] ASI_PST8_P
+3:	std			%f28, [%dst + 0x30]
+	std			%f26, [%dst + 0x28]
+	std			%f24, [%dst + 0x20]
+	std			%f22, [%dst + 0x18]
+	std			%f20, [%dst + 0x10]
+	std			%f18, [%dst + 0x08]
+	std			%f16, [%dst + 0x00]
+4:	brnz,pn			%narrow, narrow_cont
+	 deccc			%srcnotdone
+	blu,pn			%ICC, return
+	 sub			%mode, %dkind, %mode
+	alignaddr		%mode, %g0, %g0
+	and			%mode, 63, %mode
+	cmp			%srcnext, %srcn
+	bne,a,pn		%ICC, 6f
+	 xor			%fregset, 64, %fregset
+	brnz,a,pn		%fregset, 5f
+	 ldda			[%src] ASI_BLK_P, %f32
+	ldda			[%src] ASI_BLK_P, %f48
+5:	add			%src, 64, %src
+6:	add			%dst, %dkind, %dst
+	sub			%w, %rightw, %tmp1
+	add			%srcstart, %skind, %srcstart
+	sub			%dst, %tmp1, %dst
+	add			%rightw, %dkind, %rightw
+	andn			%dst, 63, %dst
+	sub			%rightw, 1, %rightw
+	sub			%leftw, %dkind, %leftw
+	and			%rightw, 63, %rightw
+	and			%leftw, 63, %leftw
+	add			%rightw, 1, %rightw
+roll_wide:
+	add			%srcstart, %w, %srcend
+	add			%srcstart, %skind, %srcnext
+	fnop
+	add			%srcend, 63, %srcend
+	andncc			%srcnext, 63, %srcnext
+	fnop
+	sll			%mode, 4, %tmp1
+	andn			%srcend, 63, %srcend
+	fnop
+	mov			%srcnext, %srcn
+	and			%mode, 7, %rightw2
+	fnop
+	andn			%tmp1, 127, %tmp1
+	add			%rightw2, %rightw, %rightw2
+	fnop
+	add			%tmp1, %fregset, %tmp1
+	subcc			%w, %leftw, %tmp3
+	fnop
+	srl			%tmp1, 1, %tmp2
+	add			%srcnext, 64, %tmp4
+	fnop
+	add			%tmp2, (prepn0 - BranchBase), %tmp2
+	cmp			%mode, %leftw
+	movgeu			%icc, %tmp2, %tmp1
+	cmp			%tmp4, %srcend
+	add			%dst, 64, %tmp4
+	move			%ICC, %srcend, %srcnext
+	movrnz			%leftw, %tmp4, %dst
+	jmpl			%branchbase + %tmp1, %g0
+	 sub			%tmp3, %rightw, %curw
+
+return: return			%i7+8
+	 wr			%g0, 0, %fprs
+
+narrowst:
+	and			%leftw, 0x38, %tmp1
+	sub			%dst, %leftw, %tmp5
+	sub			%w, 1, %fregset
+	andcc			%leftw, 7, %tmp4
+	add			%fregset, %tmp5, %fregset
+	neg			%tmp1
+	and			%fregset, 7, %srcend
+	be,pn			%icc, 1f
+	 edge8			%g0, %srcend, %srcend
+	add			%tmp1, (2f - BranchBase - 8), %tmp1
+	edge8			%tmp5, %fregset, %tmp2
+	andn			%tmp5, 7, %tmp5
+	andn			%fregset, 7, %fregset
+	jmpl			%branchbase + %tmp1, %g0
+	 sub			%w, %tmp4, %tmp4
+1:	addcc			%branchbase, (3f - BranchBase - 8), %tmp2
+	sll			%tmp1, 1, %tmp1
+	andn			%fregset, 7, %fregset
+	jmpl			%tmp2 + %tmp1, %g0
+	 mov			%w, %tmp4
+	ba,pt			%xcc, 2f+0x00
+	 stda			%f16, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x10
+	 stda			%f18, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x20
+	 stda			%f20, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x30
+	 stda			%f22, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x40
+	 stda			%f24, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x50
+	 stda			%f26, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 2f+0x60
+	 stda			%f28, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 4f
+	 stda			%f30, [%tmp5 + %tmp2] ASI_PST8_P
+2:	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 3f+0x00
+	 fnop
+	std			%f18, [%dst - 0x38]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 3f+0x10
+	 fnop
+	std			%f20, [%dst - 0x30]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 3f+0x20
+	 fnop
+	std			%f22, [%dst - 0x28]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 3f+0x30
+	 fnop
+	std			%f24, [%dst - 0x20]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 3f+0x40
+	 fnop
+	std			%f26, [%dst - 0x18]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 3f+0x50
+	 fnop
+	std			%f28, [%dst - 0x10]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 3f+0x60
+	 fnop
+	std			%f30, [%dst - 0x08]
+	ba,pt			%xcc, 4f
+	 nop
+3:	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 4f
+	 stda			%f18, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 4f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 4f
+	 stda			%f20, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 4f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 4f
+	 stda			%f22, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 4f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 4f
+	 stda			%f24, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 4f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 4f
+	 stda			%f26, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 4f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 4f
+	 stda			%f28, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 4f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 4f
+	 stda			%f30, [%fregset + %srcend] ASI_PST8_P
+4:	and			%tmp3, 60, %tmp3
+	sub			%dst, 64, %dst
+	add			%tmp3, 96, %tmp3
+	add			%mode, %skind, %mode
+	brz,pn			%h, return
+	 and			%tmp3, 64, %fregset
+narrow_cont:
+	deccc			%h
+	blu,pn			%ICC, return
+	 sub			%mode, %dkind, %mode
+	alignaddr		%mode, %g0, %g0
+	and			%mode, 63, %mode
+	sub			%srcnext, %srcn, %tmp4
+	add			%dst, %dkind, %dst
+	sub			%w, %rightw, %tmp1
+	add			%srcstart, %skind, %srcstart
+	sub			%dst, %tmp1, %dst
+	add			%rightw, %dkind, %rightw
+	sub			%leftw, %dkind, %leftw
+	sub			%rightw, 1, %rightw
+	and			%leftw, 63, %leftw
+	and			%rightw, 63, %rightw
+	add			%srcstart, %w, %srcend
+	add			%rightw, 1, %rightw
+	add			%srcstart, %skind, %srcnext
+	add			%srcend, 63, %srcend
+	andn			%srcnext, 63, %srcnext
+	andn			%srcend, 63, %srcend
+	sub			%w, %leftw, %prepw
+	mov			%srcnext, %srcn
+	add			%srcnext, 64, %tmp2
+	sub			%srcnext, 64, %tmp3
+	and			%srcstart, 63, %tmp1
+	cmp			%skind, 0
+	movg			%ICC, %srcend, %tmp3
+	sub			%prepw, %rightw, %prepw
+	add			%tmp1, %w, %tmp1
+	cmp			%tmp2, %srcend
+	mov			%prepw, %curw
+	move			%ICC, %tmp3, %srcnext
+	mov			%h, %srcnotdone
+	cmp			%tmp1, 128
+	movg			%ICC, 64, %prepw
+	andn			%dst, 63, %dst
+	cmp			%srcnext, %srcstop
+	move			%ICC, 0, %srcnotdone
+	brnz,a,pn		%tmp4, roll_narrow
+	 xor			%fregset, 64, %fregset
+	cmp			%tmp1, 64
+	bg,pt			%ICC, 5f
+	 tst			%srcnotdone
+	be,a,pn			%ICC, roll_narrow
+	 membar			SYNC
+	mov			%srcnext, %src
+5:	brnz,a,pn		%fregset, 6f
+	 ldda			[%src] ASI_BLK_P, %f32
+	ldda			[%src] ASI_BLK_P, %f48
+6:	addcc			%src, 64, %src
+roll_narrow:
+	fnop
+	sll			%mode, 4, %tmp2
+	and			%mode, 7, %rightw2
+	fnop
+	andn			%tmp2, 127, %tmp2
+	add			%dst, 64, %tmp4
+	fnop
+	add			%tmp2, %fregset, %tmp2
+	addcc			%rightw2, %rightw, %rightw2
+	fnop
+	srl			%tmp2, 1, %tmp3
+	movrnz			%leftw, %tmp4, %dst
+	fnop
+	add			%tmp3, (prepr0 - BranchBase), %tmp4
+	cmp			%tmp1, 64
+	movleu			%icc, %tmp4, %tmp2
+	fnop
+	add			%tmp3, (prepn0 - BranchBase), %tmp4
+	cmp			%mode, %leftw
+	fnop
+	movgeu			%icc, %tmp4, %tmp2
+	jmpl			%branchbase + %tmp2, %g0
+	 and			%tmp3, 32, %tmp3
+
+#define VISEND(i,tgt,tgtr,fi,fset)				\
+tgt:								\
+	brnz,pt			%curw, 1f;			\
+	 cmp			%rightw2, (64 - (i&14)*4);	\
+	bgu,pn			%icc, tgtr - 8;			\
+	 tst			%srcnotdone;			\
+	be,a,pn			%ICC, tgtr;			\
+	 membar			SYNC;				\
+	ba,pt			%xcc, tgtr - 8;			\
+	 mov			%srcnext, %src;			\
+1:	mov			((i & 1) ^ 1) * 64, %fregset;	\
+	bleu,pn			%icc, rightst;			\
+	 faligndata		%ftmp1, %ftmp2, %fi;		\
+	brz,a,pn		%srcnotdone, 3f;		\
+	 membar			SYNC;				\
+	ldda			[%srcnext] ASI_BLK_P, %fset;	\
+	add			%srcnext, 64, %src;		\
+3:	mov			(i & 1) * 64, %fregset;
+
+VISEND(0,vis0e,vis0r,f30,f32)
+	ba,pt			%xcc, rightst
+	 faligndata		%ftmp1, %f48, %f30
+VISEND(1,vis1e,vis1r,f30,f48)
+	ba,pt			%xcc, rightst
+	 faligndata		%ftmp1, %f32, %f30
+VISEND(2,vis2e,vis2r,f28,f32)
+	faligndata		%ftmp1, %f48, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f48, %f50, %f30
+VISEND(3,vis3e,vis3r,f28,f48)
+	faligndata		%ftmp1, %f32, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f32, %f34, %f30
+VISEND(4,vis4e,vis4r,f26,f32)
+	faligndata		%ftmp1, %f48, %f26
+	faligndata		%f48, %f50, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f50, %f52, %f30
+VISEND(5,vis5e,vis5r,f26,f48)
+	faligndata		%ftmp1, %f32, %f26
+	faligndata		%f32, %f34, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f34, %f36, %f30
+VISEND(6,vis6e,vis6r,f24,f32)
+	faligndata		%ftmp1, %f48, %f24
+	faligndata		%f48, %f50, %f26
+	faligndata		%f50, %f52, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f52, %f54, %f30
+VISEND(7,vis7e,vis7r,f24,f48)
+	faligndata		%ftmp1, %f32, %f24
+	faligndata		%f32, %f34, %f26
+	faligndata		%f34, %f36, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f36, %f38, %f30
+VISEND(8,vis8e,vis8r,f22,f32)
+	faligndata		%ftmp1, %f48, %f22
+	faligndata		%f48, %f50, %f24
+	faligndata		%f50, %f52, %f26
+	faligndata		%f52, %f54, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f54, %f56, %f30
+VISEND(9,vis9e,vis9r,f22,f48)
+	faligndata		%ftmp1, %f32, %f22
+	faligndata		%f32, %f34, %f24
+	faligndata		%f34, %f36, %f26
+	faligndata		%f36, %f38, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f38, %f40, %f30
+VISEND(10,vis10e,vis10r,f20,f32)
+	faligndata		%ftmp1, %f48, %f20
+	faligndata		%f48, %f50, %f22
+	faligndata		%f50, %f52, %f24
+	faligndata		%f52, %f54, %f26
+	faligndata		%f54, %f56, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f56, %f58, %f30
+VISEND(11,vis11e,vis11r,f20,f48)
+	faligndata		%ftmp1, %f32, %f20
+	faligndata		%f32, %f34, %f22
+	faligndata		%f34, %f36, %f24
+	faligndata		%f36, %f38, %f26
+	faligndata		%f38, %f40, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f40, %f42, %f30
+VISEND(12,vis12e,vis12r,f18,f32)
+	faligndata		%ftmp1, %f48, %f18
+	faligndata		%f48, %f50, %f20
+	faligndata		%f50, %f52, %f22
+	faligndata		%f52, %f54, %f24
+	faligndata		%f54, %f56, %f26
+	faligndata		%f56, %f58, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f58, %f60, %f30
+VISEND(13,vis13e,vis13r,f18,f48)
+	faligndata		%ftmp1, %f32, %f18
+	faligndata		%f32, %f34, %f20
+	faligndata		%f34, %f36, %f22
+	faligndata		%f36, %f38, %f24
+	faligndata		%f38, %f40, %f26
+	faligndata		%f40, %f42, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f42, %f44, %f30
+VISEND(14,vis14e,vis14r,f16,f32)
+	faligndata		%ftmp1, %f48, %f16
+	faligndata		%f48, %f50, %f18
+	faligndata		%f50, %f52, %f20
+	faligndata		%f52, %f54, %f22
+	faligndata		%f54, %f56, %f24
+	faligndata		%f56, %f58, %f26
+	faligndata		%f58, %f60, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f60, %f62, %f30
+VISEND(15,vis15e,vis15r,f16,f48)
+	faligndata		%ftmp1, %f32, %f16
+	faligndata		%f32, %f34, %f18
+	faligndata		%f34, %f36, %f20
+	faligndata		%f36, %f38, %f22
+	faligndata		%f38, %f40, %f24
+	faligndata		%f40, %f42, %f26
+	faligndata		%f42, %f44, %f28
+	ba,pt			%xcc, rightst
+	 faligndata		%f44, %f46, %f30
+
+#define PREPEND(tgt,tgtr)					\
+tgt:								\
+	brnz,pt			%srcnotdone, tgtr - 8;		\
+	 mov			%srcnext, %src;			\
+	ba,pt			%xcc, tgtr;			\
+	 membar			SYNC;
+
+	.align			16
+PREPEND(prep0e,prep0r)
+PREPEND(prep1e,prep1r)
+PREPEND(prep2e,prep2r)
+PREPEND(prep3e,prep3r)
+PREPEND(prep4e,prep4r)
+PREPEND(prep5e,prep5r)
+PREPEND(prep6e,prep6r)
+PREPEND(prep7e,prep7r)
+PREPEND(prep8e,prep8r)
+PREPEND(prep9e,prep9r)
+PREPEND(prep10e,prep10r)
+PREPEND(prep11e,prep11r)
+PREPEND(prep12e,prep12r)
+PREPEND(prep13e,prep13r)
+PREPEND(prep14e,prep14r)
+PREPEND(prep15e,prep15r)
+
+/* The other way is even more complicated, as the hardware prefers
+ * going from lower addresses up.  */
+
+#define RLOAD(f32,tgt,tgtr)							\
+	subcc			%curw, 64, %curw;				\
+	bleu,pn			%ICC, tgt;					\
+	 fmovd			%f32, %ftmp1;					\
+	ldda			[%src] ASI_BLK_P, %f32;				\
+	sub			%src, 64, %src;					\
+tgtr:
+
+#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__) || !defined(SIGNAL_CLOBBERS_OG_REGS)
+
+#define RPREPLOAD(f32,tgt,tgtr)							\
+	brlez,pn		%prepw, tgt;					\
+	 fmovd			%f32, %ftmp1;					\
+	ldda			[%src] ASI_BLK_P, %f32;				\
+	sub			%src, 64, %src;					\
+tgtr:
+
+#else
+
+#define RPREPLOAD(f32,tgt,tgtr)							\
+	tst			%prepw;						\
+	ble,pn			%ICC, tgt;					\
+	 fmovd			%f32, %ftmp1;					\
+	ldda			[%src] ASI_BLK_P, %f32;				\
+	sub			%src, 64, %src;					\
+tgtr:
+
+#endif
+
+	.globl			VISmoveImageRL
+	.align			32
+VISmoveImageRL:
+	save			%sp, -160, %sp				! Group 0
+0:	rd			%pc, %tmp3				! Group 1
+	and			%dst, 63, %leftw			! Group 7
+	mov			64, %tmp1
+	add			%src, %w, %src				! Group 8
+	add			%dst, %w, %dst
+	sub			%src, %dst, %mode			! Group 9
+	brz,pn			%h, rreturn
+	 sub			%dst, 1, %rightw			! Group 10
+	mov			%src, %srcstart
+	dec			%src					! Group 11
+	cmp			%w, 128
+	blu,pn			%ICC, rprepare_narrow
+	 and			%mode, 63, %mode			! Group 12
+	andn			%src, 63, %src
+	ldda			[%src] ASI_BLK_P, %f32			! Group 13
+	sub			%src, 64, %src				! Group 14
+	clr			%narrow
+	ldda			[%src] ASI_BLK_P, %f48			! Group 15
+	sub			%tmp1, %leftw, %leftw			! Group 16
+	and			%rightw, 63, %rightw
+	dec			%dst					! Group 17
+	add			%rightw, 1, %rightw
+	alignaddr		%mode, %g0, %g0				! Group 18
+	andn			%dst, 63, %dst				! Group 19
+	clr			%fregset
+	sub			%src, 64, %src				! Group 20
+	add			%tmp3, (BranchBaseR - 0b), %branchbase
+	mov			64, %prepw				! Group 21
+	ba,pt			%xcc, rroll_wide
+	 sub			%h, 1, %srcnotdone
+rprepare_narrow:
+#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+	brlez,pn		%w, rreturn
+#else
+	tst			%w
+	ble,pn			%icc, rreturn
+#endif
+	 andn			%src, 63, %src				! Group 12
+	sub			%tmp1, %leftw, %leftw
+	ldda			[%src] ASI_BLK_P, %f32			! Group 13
+	and			%rightw, 63, %rightw			! Group 14
+	dec			%dst
+	add			%rightw, 1, %rightw			! Group 15
+	andn			%dst, 63, %dst
+	sub			%w, %leftw, %tmp2			! Group 16
+	sub			%srcstart, 1, %tmp1
+	subcc			%tmp2, %rightw, %curw			! Group 17
+	and			%tmp1, 63, %tmp1
+	mov			%curw, %prepw				! Group 18
+	sub			%tmp1, %w, %tmp1
+	bg,pt			%ICC, 1f
+	 sub			%src, 64, %src				! Group 19
+	cmp			%tmp1, -65
+	movl			%ICC, 64, %prepw			! Group 20
+1:	add			%srcstart, %skind, %srcnext
+	sub			%h, 1, %srcnotdone			! Group 21
+	sub			%srcstart, %w, %tmp4
+	sub			%srcnext, 1, %srcnext			! Group 22
+	andn			%tmp4, 63, %srcend
+	andn			%srcnext, 63, %srcnext			! Group 23
+	cmp			%skind, 0
+	add			%w, 64, %tmp2				! Group 24
+	mov			%srcnext, %srcn
+	bl,pn			%ICC, 1f
+	 clr			%srcstop				! Group 25
+	cmp			%skind, %tmp2
+	bgeu,pt			%ICC, 3f
+	 add			%srcnext, 64, %fregset
+	SMUL			%skind, %srcnotdone, %srcstop
+	ba,pt			%xcc, 2f
+	 add			%srcstart, 63, %tmp4
+1:	addcc			%tmp2, %skind, %g0
+	ble,pt			%ICC, 3f
+	 sub			%srcnext, 64, %fregset
+	SMUL			%skind, %srcnotdone, %srcstop
+	sub			%tmp4, 64, %tmp4
+2:	add			%srcstop, %tmp4, %srcstop
+3:	cmp			%srcnext, %srcend
+	andn			%srcstop, 63, %srcstop
+	move			%ICC, %fregset, %srcnext
+	cmp			%srcnext, %srcstop
+	clr			%fregset
+	move			%ICC, 0, %srcnotdone
+	alignaddr		%mode, %g0, %g0
+	add			%tmp3, (BranchBaseR - 0b), %branchbase
+	mov			1, %narrow
+	cmp			%tmp1, -1
+	bge,pn			%ICC, 1f
+	 dec			%h
+	ldda			[%src] ASI_BLK_P, %f48
+	ba,pt			%xcc, rroll_narrow
+	 subcc			%src, 64, %src
+1:	brz,a,pn		%srcnotdone, rroll_narrow
+	 membar			#Sync
+	ldda			[%srcnext] ASI_BLK_P, %f48
+	ba,pt			%xcc, rroll_narrow
+	 subcc			%srcnext, 64, %src
+
+	.align			32
+rrepr0:	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f32, %f30
+	nop
+	nop
+1:	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f32, %f16
+	.align			32
+rrepr1:	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f48, %f30
+	nop
+	nop
+2:	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f48, %f16
+	.align			32
+rrepr2:	faligndata		%f32, %f34, %f30
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f32, %f28
+	.align			32
+rrepr3:	faligndata		%f48, %f50, %f30
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f48, %f28
+	.align			32
+rrepr4:	faligndata		%f34, %f36, %f30
+	faligndata		%f32, %f34, %f28
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f32, %f26
+	.align			32
+rrepr5: faligndata		%f50, %f52, %f30
+	faligndata		%f48, %f50, %f28
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f48, %f26
+	.align			32
+rrepr6:	faligndata		%f36, %f38, %f30
+	faligndata		%f34, %f36, %f28
+	faligndata		%f32, %f34, %f26
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f32, %f24
+	.align			32
+rrepr7: faligndata		%f52, %f54, %f30
+	faligndata		%f50, %f52, %f28
+	faligndata		%f48, %f50, %f26
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f48, %f24
+	.align			32
+rrepr8:	faligndata		%f38, %f40, %f30
+	faligndata		%f36, %f38, %f28
+	faligndata		%f34, %f36, %f26
+	faligndata		%f32, %f34, %f24
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f32, %f22
+	.align			32
+rrepr9: faligndata		%f54, %f56, %f30
+	faligndata		%f52, %f54, %f28
+	faligndata		%f50, %f52, %f26
+	faligndata		%f48, %f50, %f24
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f48, %f22
+	.align			32
+rrepr10:faligndata		%f40, %f42, %f30
+	faligndata		%f38, %f40, %f28
+	faligndata		%f36, %f38, %f26
+	faligndata		%f34, %f36, %f24
+	faligndata		%f32, %f34, %f22
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f32, %f20
+	.align			32
+rrepr11:faligndata		%f56, %f58, %f30
+	faligndata		%f54, %f56, %f28
+	faligndata		%f52, %f54, %f26
+	faligndata		%f50, %f52, %f24
+	faligndata		%f48, %f50, %f22
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f48, %f20
+	.align			32
+rrepr12:faligndata		%f42, %f44, %f30
+	faligndata		%f40, %f42, %f28
+	faligndata		%f38, %f40, %f26
+	faligndata		%f36, %f38, %f24
+	faligndata		%f34, %f36, %f22
+	faligndata		%f32, %f34, %f20
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f32, %f18
+	.align			32
+rrepr13:faligndata		%f58, %f60, %f30
+	faligndata		%f56, %f58, %f28
+	faligndata		%f54, %f56, %f26
+	faligndata		%f52, %f54, %f24
+	faligndata		%f50, %f52, %f22
+	faligndata		%f48, %f50, %f20
+	ba,pt			%xcc, narrowstr
+	 faligndata		%ftmp1, %f48, %f18
+	.align			32
+rrepr14:faligndata		%f44, %f46, %f30
+	faligndata		%f42, %f44, %f28
+	faligndata		%f40, %f42, %f26
+	faligndata		%f38, %f40, %f24
+	faligndata		%f36, %f38, %f22
+	faligndata		%f34, %f36, %f20
+	ba,pt			%xcc, 1b
+	 faligndata		%f32, %f34, %f18
+	.align			32
+rrepr15:faligndata		%f60, %f62, %f30
+	faligndata		%f58, %f60, %f28
+	faligndata		%f56, %f58, %f26
+	faligndata		%f54, %f56, %f24
+	faligndata		%f52, %f54, %f22
+	faligndata		%f50, %f52, %f20
+	ba,pt			%xcc, 2b
+	 faligndata		%f48, %f50, %f18
+
+	.align			32
+rrepn0:	faligndata		%f46, %ftmp1, %f30
+	faligndata		%f44, %f46, %f28
+	faligndata		%f42, %f44, %f26
+	faligndata		%f40, %f42, %f24
+	faligndata		%f38, %f40, %f22
+	faligndata		%f36, %f38, %f20
+	ba,pt			%xcc, 1f
+	 faligndata		%f34, %f36, %f18
+	.align			32
+rrepn1:	faligndata		%f62, %ftmp1, %f30
+	faligndata		%f60, %f62, %f28
+	faligndata		%f58, %f60, %f26
+	faligndata		%f56, %f58, %f24
+	faligndata		%f54, %f56, %f22
+	faligndata		%f52, %f54, %f20
+	ba,pt			%xcc, 2f
+	 faligndata		%f50, %f52, %f18
+	.align			32
+rrepn2:	faligndata		%f46, %ftmp1, %f28
+	faligndata		%f44, %f46, %f26
+	faligndata		%f42, %f44, %f24
+	faligndata		%f40, %f42, %f22
+	faligndata		%f38, %f40, %f20
+	faligndata		%f36, %f38, %f18
+	ba,pt			%xcc, 3f
+	 faligndata		%f34, %f36, %f16
+	.align			32
+rrepn3:	faligndata		%f62, %ftmp1, %f28
+	faligndata		%f60, %f62, %f26
+	faligndata		%f58, %f60, %f24
+	faligndata		%f56, %f58, %f22
+	faligndata		%f54, %f56, %f20
+	faligndata		%f52, %f54, %f18
+	ba,pt			%xcc, 4f
+	 faligndata		%f50, %f52, %f16
+	.align			32
+rrepn4:	faligndata		%f46, %ftmp1, %f26
+	faligndata		%f44, %f46, %f24
+	faligndata		%f42, %f44, %f22
+	faligndata		%f40, %f42, %f20
+	faligndata		%f38, %f40, %f18
+	faligndata		%f36, %f38, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis4 - BranchBaseR), %tmp3
+	.align			32
+rrepn5:	faligndata		%f62, %ftmp1, %f26
+	faligndata		%f60, %f62, %f24
+	faligndata		%f58, %f60, %f22
+	faligndata		%f56, %f58, %f20
+	faligndata		%f54, %f56, %f18
+	faligndata		%f52, %f54, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis5 - BranchBaseR), %tmp3
+	.align			32
+rrepn6:	faligndata		%f46, %ftmp1, %f24
+	faligndata		%f44, %f46, %f22
+	faligndata		%f42, %f44, %f20
+	faligndata		%f40, %f42, %f18
+	faligndata		%f38, %f40, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis6 - BranchBaseR), %tmp3
+	.align			32
+rrepn7:	faligndata		%f62, %ftmp1, %f24
+	faligndata		%f60, %f62, %f22
+	faligndata		%f58, %f60, %f20
+	faligndata		%f56, %f58, %f18
+	faligndata		%f54, %f56, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis7 - BranchBaseR), %tmp3
+	.align			32
+rrepn8:	faligndata		%f46, %ftmp1, %f22
+	faligndata		%f44, %f46, %f20
+	faligndata		%f42, %f44, %f18
+	faligndata		%f40, %f42, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis8 - BranchBaseR), %tmp3
+	.align			32
+rrepn9:	faligndata		%f62, %ftmp1, %f22
+	faligndata		%f60, %f62, %f20
+	faligndata		%f58, %f60, %f18
+	faligndata		%f56, %f58, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis9 - BranchBaseR), %tmp3
+	.align			32
+rrepn10:faligndata		%f46, %ftmp1, %f20
+	faligndata		%f44, %f46, %f18
+	faligndata		%f42, %f44, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis10 - BranchBaseR), %tmp3
+	.align			32
+rrepn11:faligndata		%f62, %ftmp1, %f20
+	faligndata		%f60, %f62, %f18
+	faligndata		%f58, %f60, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis11 - BranchBaseR), %tmp3
+	.align			32
+rrepn12:faligndata		%f46, %ftmp1, %f18
+	faligndata		%f44, %f46, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis12 - BranchBaseR), %tmp3
+	nop
+	nop
+3:	ba,pt			%xcc, rightstr
+	 mov			(rvis2 - BranchBaseR), %tmp3
+	.align			32
+rrepn13:faligndata		%f62, %ftmp1, %f18
+	faligndata		%f60, %f62, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis13 - BranchBaseR), %tmp3
+	nop
+	nop
+4:	ba,pt			%xcc, rightstr
+	 mov			(rvis3 - BranchBaseR), %tmp3
+	.align			32
+rrepn14:faligndata		%f46, %ftmp1, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis14 - BranchBaseR), %tmp3
+	nop
+1:	faligndata		%f32, %f34, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis0 - BranchBaseR), %tmp3
+	.align			32
+rrepn15:faligndata		%f62, %ftmp1, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis15 - BranchBaseR), %tmp3
+	nop
+2:	faligndata		%f48, %f50, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis1 - BranchBaseR), %tmp3
+
+	.align			64
+BranchBaseR:
+rrepl0:	RPREPLOAD(f32,rrep0e,rrep0r)
+	fnop
+	faligndata		%f48, %f50, %f16
+	faligndata		%f50, %f52, %f18
+	faligndata		%f52, %f54, %f20
+	faligndata		%f54, %f56, %f22
+	faligndata		%f56, %f58, %f24
+	faligndata		%f58, %f60, %f26
+	faligndata		%f60, %f62, %f28
+	faligndata		%f62, %ftmp1, %f30
+	ba,pt			%xcc, rightstr
+	 mov			(rvis1 - BranchBaseR), %tmp3
+	nop
+	nop
+	.align			32
+rrepl1:	RPREPLOAD(f48,rrep1e,rrep1r)
+	fnop
+	faligndata		%f32, %f34, %f16
+	faligndata		%f34, %f36, %f18
+	faligndata		%f36, %f38, %f20
+	faligndata		%f38, %f40, %f22
+	faligndata		%f40, %f42, %f24
+	faligndata		%f42, %f44, %f26
+	faligndata		%f44, %f46, %f28
+	faligndata		%f46, %ftmp1, %f30
+	ba,pt			%xcc, rightstr
+	 mov			(rvis0 - BranchBaseR), %tmp3
+	nop
+	nop
+	.align			32
+rrepl2:	faligndata		%f32, %f34, %f30
+	RPREPLOAD(f32,rrep2e,rrep2r)
+	fnop
+	fnop
+	faligndata		%f50, %f52, %f16
+	faligndata		%f52, %f54, %f18
+	faligndata		%f54, %f56, %f20
+	faligndata		%f56, %f58, %f22
+	faligndata		%f58, %f60, %f24
+	faligndata		%f60, %f62, %f26
+	faligndata		%f62, %ftmp1, %f28
+	ba,pt			%xcc, rightstr
+	 mov			(rvis3 - BranchBaseR), %tmp3
+	nop
+	.align			32
+rrepl3:	faligndata		%f48, %f50, %f30
+	RPREPLOAD(f48,rrep3e,rrep3r)
+	fnop
+	fnop
+	faligndata		%f34, %f36, %f16
+	faligndata		%f36, %f38, %f18
+	faligndata		%f38, %f40, %f20
+	faligndata		%f40, %f42, %f22
+	faligndata		%f42, %f44, %f24
+	faligndata		%f44, %f46, %f26
+	faligndata		%f46, %ftmp1, %f28
+	ba,pt			%xcc, rightstr
+	 mov			(rvis2 - BranchBaseR), %tmp3
+	nop
+	.align			32
+rrepl4:	faligndata		%f32, %f34, %f28
+	faligndata		%f34, %f36, %f30
+	RPREPLOAD(f32,rrep4e,rrep4r)
+	fnop
+	fnop
+	fnop
+	faligndata		%f52, %f54, %f16
+	faligndata		%f54, %f56, %f18
+	faligndata		%f56, %f58, %f20
+	faligndata		%f58, %f60, %f22
+	faligndata		%f60, %f62, %f24
+	faligndata		%f62, %ftmp1, %f26
+	ba,pt			%xcc, rightstr
+	 mov			(rvis5 - BranchBaseR), %tmp3
+	.align			32
+rrepl5:	faligndata		%f48, %f50, %f28
+	faligndata		%f50, %f52, %f30
+	RPREPLOAD(f48,rrep5e,rrep5r)
+	fnop
+	fnop
+	fnop
+	faligndata		%f36, %f38, %f16
+	faligndata		%f38, %f40, %f18
+	faligndata		%f40, %f42, %f20
+	faligndata		%f42, %f44, %f22
+	faligndata		%f44, %f46, %f24
+	faligndata		%f46, %ftmp1, %f26
+	ba,pt			%xcc, rightstr
+	 mov			(rvis4 - BranchBaseR), %tmp3
+	.align			32
+rrepl6:	faligndata		%f32, %f34, %f26
+	faligndata		%f34, %f36, %f28
+	faligndata		%f36, %f38, %f30
+	RPREPLOAD(f32,rrep6e,rrep6r)
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f54, %f56, %f16
+	faligndata		%f56, %f58, %f18
+	faligndata		%f58, %f60, %f20
+	faligndata		%f60, %f62, %f22
+	faligndata		%f62, %ftmp1, %f24
+	ba,pt			%xcc, rightstr
+	 mov			(rvis7 - BranchBaseR), %tmp3
+	.align			32
+rrepl7:	faligndata		%f48, %f50, %f26
+	faligndata		%f50, %f52, %f28
+	faligndata		%f52, %f54, %f30
+	RPREPLOAD(f48,rrep7e,rrep7r)
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f38, %f40, %f16
+	faligndata		%f40, %f42, %f18
+	faligndata		%f42, %f44, %f20
+	faligndata		%f44, %f46, %f22
+	faligndata		%f46, %ftmp1, %f24
+	ba,pt			%xcc, rightstr
+	 mov			(rvis6 - BranchBaseR), %tmp3
+	.align			32
+rrepl8:	faligndata		%f32, %f34, %f24
+	faligndata		%f34, %f36, %f26
+	faligndata		%f36, %f38, %f28
+	faligndata		%f38, %f40, %f30
+	RPREPLOAD(f32,rrep8e,rrep8r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f56, %f58, %f16
+	faligndata		%f58, %f60, %f18
+	faligndata		%f60, %f62, %f20
+	faligndata		%f62, %ftmp1, %f22
+	ba,pt			%xcc, rightstr
+	 mov			(rvis9 - BranchBaseR), %tmp3
+	.align			32
+rrepl9:	faligndata		%f48, %f50, %f24
+	faligndata		%f50, %f52, %f26
+	faligndata		%f52, %f54, %f28
+	faligndata		%f54, %f56, %f30
+	RPREPLOAD(f48,rrep9e,rrep9r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f40, %f42, %f16
+	faligndata		%f42, %f44, %f18
+	faligndata		%f44, %f46, %f20
+	faligndata		%f46, %ftmp1, %f22
+	ba,pt			%xcc, rightstr
+	 mov			(rvis8 - BranchBaseR), %tmp3
+	.align			32
+rrepl10:faligndata		%f32, %f34, %f22
+	faligndata		%f34, %f36, %f24
+	faligndata		%f36, %f38, %f26
+	faligndata		%f38, %f40, %f28
+	faligndata		%f40, %f42, %f30
+	RPREPLOAD(f32,rrep10e,rrep10r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f58, %f60, %f16
+	faligndata		%f60, %f62, %f18
+	faligndata		%f62, %ftmp1, %f20
+	ba,pt			%xcc, rightstr
+	 mov			(rvis11 - BranchBaseR), %tmp3
+	.align			32
+rrepl11:faligndata		%f48, %f50, %f22
+	faligndata		%f50, %f52, %f24
+	faligndata		%f52, %f54, %f26
+	faligndata		%f54, %f56, %f28
+	faligndata		%f56, %f58, %f30
+	RPREPLOAD(f48,rrep11e,rrep11r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f42, %f44, %f16
+	faligndata		%f44, %f46, %f18
+	faligndata		%f46, %ftmp1, %f20
+	ba,pt			%xcc, rightstr
+	 mov			(rvis10 - BranchBaseR), %tmp3
+	.align			32
+rrepl12:faligndata		%f32, %f34, %f20
+	faligndata		%f34, %f36, %f22
+	faligndata		%f36, %f38, %f24
+	faligndata		%f38, %f40, %f26
+	faligndata		%f40, %f42, %f28
+	faligndata		%f42, %f44, %f30
+	RPREPLOAD(f32,rrep12e,rrep12r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f60, %f62, %f16
+	faligndata		%f62, %ftmp1, %f18
+	ba,pt			%xcc, rightstr
+	 mov			(rvis13 - BranchBaseR), %tmp3
+	.align			32
+rrepl13:faligndata		%f48, %f50, %f20
+	faligndata		%f50, %f52, %f22
+	faligndata		%f52, %f54, %f24
+	faligndata		%f54, %f56, %f26
+	faligndata		%f56, %f58, %f28
+	faligndata		%f58, %f60, %f30
+	RPREPLOAD(f48,rrep13e,rrep13r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f44, %f46, %f16
+	faligndata		%f46, %ftmp1, %f18
+	ba,pt			%xcc, rightstr
+	 mov			(rvis12 - BranchBaseR), %tmp3
+	.align			32
+rrepl14:faligndata		%f32, %f34, %f18
+	faligndata		%f34, %f36, %f20
+	faligndata		%f36, %f38, %f22
+	faligndata		%f38, %f40, %f24
+	faligndata		%f40, %f42, %f26
+	faligndata		%f42, %f44, %f28
+	faligndata		%f44, %f46, %f30
+	RPREPLOAD(f32,rrep14e,rrep14r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f62, %ftmp1, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis15 - BranchBaseR), %tmp3
+	.align			32
+rrepl15:faligndata		%f48, %f50, %f18
+	faligndata		%f50, %f52, %f20
+	faligndata		%f52, %f54, %f22
+	faligndata		%f54, %f56, %f24
+	faligndata		%f56, %f58, %f26
+	faligndata		%f58, %f60, %f28
+	faligndata		%f60, %f62, %f30
+	RPREPLOAD(f48,rrep15e,rrep15r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f46, %ftmp1, %f16
+	ba,pt			%xcc, rightstr
+	 mov			(rvis14 - BranchBaseR), %tmp3
+
+	.align			64
+rvis0:	nop
+	RLOAD(f32,rvis0e,rvis0r)
+	fnop
+	faligndata		%f48, %f50, %f16
+	faligndata		%f50, %f52, %f18
+	faligndata		%f52, %f54, %f20
+	faligndata		%f54, %f56, %f22
+	faligndata		%f56, %f58, %f24
+	faligndata		%f58, %f60, %f26
+	faligndata		%f60, %f62, %f28
+	faligndata		%f62, %ftmp1, %f30
+	STORE
+	sub			%dst, 64, %dst
+rvis1:	RLOAD(f48,rvis1e,rvis1r)
+	fnop
+	faligndata		%f32, %f34, %f16
+	faligndata		%f34, %f36, %f18
+	faligndata		%f36, %f38, %f20
+	faligndata		%f38, %f40, %f22
+	faligndata		%f40, %f42, %f24
+	faligndata		%f42, %f44, %f26
+	faligndata		%f44, %f46, %f28
+	faligndata		%f46, %ftmp1, %f30
+	STORE
+	ba,pt			%xcc, rvis0+0x04
+	 sub			%dst, 64, %dst
+	.align			64
+rvis2:	faligndata		%f32, %f34, %ftmp8
+	RLOAD(f32,rvis2e,rvis2r)
+	fnop
+	fnop
+	faligndata		%f50, %f52, %f16
+	faligndata		%f52, %f54, %f18
+	faligndata		%f54, %f56, %f20
+	faligndata		%f56, %f58, %f22
+	faligndata		%f58, %f60, %f24
+	faligndata		%f60, %f62, %f26
+	faligndata		%f62, %ftmp1, %f28
+	fmovd			%ftmp8, %f30
+	STORE
+	sub			%dst, 64, %dst
+rvis3:	faligndata		%f48, %f50, %ftmp8
+	RLOAD(f48,rvis3e,rvis3r)
+	fnop
+	fnop
+	faligndata		%f34, %f36, %f16
+	faligndata		%f36, %f38, %f18
+	faligndata		%f38, %f40, %f20
+	faligndata		%f40, %f42, %f22
+	faligndata		%f42, %f44, %f24
+	faligndata		%f44, %f46, %f26
+	faligndata		%f46, %ftmp1, %f28
+	fmovd			%ftmp8, %f30
+	STORE
+	ba,pt			%xcc, rvis2
+	 sub			%dst, 64, %dst
+	.align			64
+rvis4:	faligndata		%f32, %f34, %ftmp7
+	faligndata		%f34, %f36, %ftmp8
+	RLOAD(f32,rvis4e,rvis4r)
+	fnop
+	fnop
+	fnop
+	faligndata		%f52, %f54, %f16
+	faligndata		%f54, %f56, %f18
+	faligndata		%f56, %f58, %f20
+	faligndata		%f58, %f60, %f22
+	faligndata		%f60, %f62, %f24
+	faligndata		%f62, %ftmp1, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	STORE
+	sub			%dst, 64, %dst
+rvis5:	faligndata		%f48, %f50, %ftmp7
+	faligndata		%f50, %f52, %ftmp8
+	RLOAD(f48,rvis5e,rvis5r)
+	fnop
+	fnop
+	fnop
+	faligndata		%f36, %f38, %f16
+	faligndata		%f38, %f40, %f18
+	faligndata		%f40, %f42, %f20
+	faligndata		%f42, %f44, %f22
+	faligndata		%f44, %f46, %f24
+	faligndata		%f46, %ftmp1, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	STORE
+	ba,pt			%xcc, rvis4
+	 sub			%dst, 64, %dst
+	.align			64
+rvis6:	faligndata		%f32, %f34, %ftmp6
+	faligndata		%f34, %f36, %ftmp7
+	faligndata		%f36, %f38, %ftmp8
+	RLOAD(f32,rvis6e,rvis6r)
+	fnop
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	faligndata		%f54, %f56, %f16
+	faligndata		%f56, %f58, %f18
+	faligndata		%f58, %f60, %f20
+	faligndata		%f60, %f62, %f22
+	faligndata		%f62, %ftmp1, %f24
+	STORE
+	sub			%dst, 64, %dst
+rvis7:	faligndata		%f48, %f50, %ftmp6
+	faligndata		%f50, %f52, %ftmp7
+	faligndata		%f52, %f54, %ftmp8
+	RLOAD(f48,rvis7e,rvis7r)
+	fnop
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	faligndata		%f38, %f40, %f16
+	faligndata		%f40, %f42, %f18
+	faligndata		%f42, %f44, %f20
+	faligndata		%f44, %f46, %f22
+	faligndata		%f46, %ftmp1, %f24
+	STORE
+	ba,pt			%xcc, rvis6
+	 sub			%dst, 64, %dst
+	.align			64
+rvis8:	faligndata		%f32, %f34, %ftmp5
+	faligndata		%f34, %f36, %ftmp6
+	faligndata		%f36, %f38, %ftmp7
+	faligndata		%f38, %f40, %ftmp8
+	RLOAD(f32,rvis8e,rvis8r)
+	fnop
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	faligndata		%f56, %f58, %f16
+	faligndata		%f58, %f60, %f18
+	faligndata		%f60, %f62, %f20
+	faligndata		%f62, %ftmp1, %f22
+	STORE
+	sub			%dst, 64, %dst
+rvis9:	faligndata		%f48, %f50, %ftmp5
+	faligndata		%f50, %f52, %ftmp6
+	faligndata		%f52, %f54, %ftmp7
+	faligndata		%f54, %f56, %ftmp8
+	RLOAD(f48,rvis9e,rvis9r)
+	fnop
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	faligndata		%f40, %f42, %f16
+	faligndata		%f42, %f44, %f18
+	faligndata		%f44, %f46, %f20
+	faligndata		%f46, %ftmp1, %f22
+	STORE
+	ba,pt			%xcc, rvis8
+	 sub			%dst, 64, %dst
+	.align			64
+rvis10:	faligndata		%f32, %f34, %ftmp4
+	faligndata		%f34, %f36, %ftmp5
+	faligndata		%f36, %f38, %ftmp6
+	faligndata		%f38, %f40, %ftmp7
+	faligndata		%f40, %f42, %ftmp8
+	RLOAD(f32,rvis10e,rvis10r)
+	fnop
+	fmovd			%ftmp4, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	faligndata		%f58, %f60, %f16
+	faligndata		%f60, %f62, %f18
+	faligndata		%f62, %ftmp1, %f20
+	STORE
+	sub			%dst, 64, %dst
+rvis11:	faligndata		%f48, %f50, %ftmp4
+	faligndata		%f50, %f52, %ftmp5
+	faligndata		%f52, %f54, %ftmp6
+	faligndata		%f54, %f56, %ftmp7
+	faligndata		%f56, %f58, %ftmp8
+	RLOAD(f48,rvis11e,rvis11r)
+	fnop
+	fmovd			%ftmp4, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	faligndata		%f42, %f44, %f16
+	faligndata		%f44, %f46, %f18
+	faligndata		%f46, %ftmp1, %f20
+	STORE
+	ba,pt			%xcc, rvis10
+	 sub			%dst, 64, %dst
+	.align			64
+rvis12:	faligndata		%f32, %f34, %ftmp3
+	faligndata		%f34, %f36, %ftmp4
+	faligndata		%f36, %f38, %ftmp5
+	faligndata		%f38, %f40, %ftmp6
+	faligndata		%f40, %f42, %ftmp7
+	faligndata		%f42, %f44, %ftmp8
+	RLOAD(f32,rvis12e,rvis12r)
+	fnop
+	fmovd			%ftmp3, %f20
+	fmovd			%ftmp4, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	faligndata		%f60, %f62, %f16
+	faligndata		%f62, %ftmp1, %f18
+	STORE
+	sub			%dst, 64, %dst
+rvis13:	faligndata		%f48, %f50, %ftmp3
+	faligndata		%f50, %f52, %ftmp4
+	faligndata		%f52, %f54, %ftmp5
+	faligndata		%f54, %f56, %ftmp6
+	faligndata		%f56, %f58, %ftmp7
+	faligndata		%f58, %f60, %ftmp8
+	RLOAD(f48,rvis13e,rvis13r)
+	fnop
+	fmovd			%ftmp3, %f20
+	fmovd			%ftmp4, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	fmovd			%ftmp8, %f30
+	faligndata		%f44, %f46, %f16
+	faligndata		%f46, %ftmp1, %f18
+	STORE
+	ba,pt			%xcc, rvis12
+	 sub			%dst, 64, %dst
+	.align			64
+rvis14:	fnop
+	faligndata		%f32, %f34, %f18
+	faligndata		%f34, %f36, %f20
+	faligndata		%f36, %f38, %f22
+	faligndata		%f38, %f40, %f24
+	faligndata		%f40, %f42, %f26
+	faligndata		%f42, %f44, %f28
+	faligndata		%f44, %f46, %f30
+	RLOAD(f32,rvis14e,rvis14r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f62, %ftmp1, %f16
+	STORE
+	sub			%dst, 64, %dst
+rvis15:	fnop
+	faligndata		%f48, %f50, %f18
+	faligndata		%f50, %f52, %f20
+	faligndata		%f52, %f54, %f22
+	faligndata		%f54, %f56, %f24
+	faligndata		%f56, %f58, %f26
+	faligndata		%f58, %f60, %f28
+	faligndata		%f60, %f62, %f30
+	RLOAD(f48,rvis15e,rvis15r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f46, %ftmp1, %f16
+	STORE
+	ba,pt			%xcc, rvis14
+	 sub			%dst, 64, %dst
+
+rightstr:
+	brlz,pn			%curw, narrowstr + 4
+	 cmp			%rightw, 64
+	be,pn			%icc, 2f
+	 and			%rightw, 0x38, %tmp1
+	andcc			%rightw, 7, %g0
+	be,pn			%icc, 1f
+	 neg			%tmp1
+	sub			%g0, %rightw, %tmp5
+	add			%branchbase, (3f - BranchBaseR - 8), %tmp2
+	edge8l			%tmp5, %g0, %tmp5
+	sub			%dst, %tmp1, %tmp4
+	jmpl			%tmp1 + %tmp2, %g0
+	 add			%tmp4, 0x40, %tmp4
+1:	addcc			%branchbase, (4f - BranchBaseR), %tmp2
+	sra			%tmp1, 1, %tmp1
+	jmpl			%tmp1 + %tmp2, %g0
+2:	 add			%dst, 0x40, %tmp1
+	jmpl			%branchbase + %tmp3, %g0
+	 stda			%f16, [%tmp1] ASI_BLK_P
+	ba,pt			%xcc, 3f+0x00
+	 stda			%f30, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x04
+	 stda			%f28, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x08
+	 stda			%f26, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x0c
+	 stda			%f24, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x10
+	 stda			%f22, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x14
+	 stda			%f20, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x18
+	 stda			%f18, [%tmp4 + %tmp5] ASI_PST8_P
+	jmpl			%branchbase + %tmp3, %g0
+	 stda			%f16, [%tmp4 + %tmp5] ASI_PST8_P
+3:	std			%f28, [%dst + 0x70]
+	std			%f26, [%dst + 0x68]
+	std			%f24, [%dst + 0x60]
+	std			%f22, [%dst + 0x58]
+	std			%f20, [%dst + 0x50]
+	std			%f18, [%dst + 0x48]
+	std			%f16, [%dst + 0x40]
+4:	jmpl			%branchbase + %tmp3, %g0
+	 nop
+
+leftstr:cmp			%leftw, 64
+	be,pn			%icc, 2f
+	 and			%leftw, 0x38, %tmp1
+	andcc			%leftw, 7, %g0
+	be,pn			%icc, 1f
+	 neg			%tmp1
+	sub			%dst, %leftw, %tmp4
+	add			%branchbase, (3f - BranchBaseR - 8), %tmp2
+	edge8			%tmp4, %g0, %tmp5
+	andn			%tmp4, 7, %tmp4
+	add			%mode, %skind, %mode
+	jmpl			%tmp2 + %tmp1, %g0
+	 add			%tmp4, 0x40, %tmp4
+1:	add			%branchbase, (4f - BranchBaseR), %tmp2
+	sra			%tmp1, 1, %tmp1
+	jmpl			%tmp2 + %tmp1, %g0
+2:	 add			%mode, %skind, %mode
+	ba,pt			%xcc, 4f
+	 stda			%f16, [%dst] ASI_BLK_P
+	ba,pt			%xcc, 3f+0x00
+	 stda			%f16, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x04
+	 stda			%f18, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x08
+	 stda			%f20, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x0c
+	 stda			%f22, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x10
+	 stda			%f24, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x14
+	 stda			%f26, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x18
+	 stda			%f28, [%tmp4 + %tmp5] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x1c
+	 stda			%f30, [%tmp4 + %tmp5] ASI_PST8_P
+3:	std			%f18, [%dst + 0x08]
+	std			%f20, [%dst + 0x10]
+	std			%f22, [%dst + 0x18]
+	std			%f24, [%dst + 0x20]
+	std			%f26, [%dst + 0x28]
+	std			%f28, [%dst + 0x30]
+	std			%f30, [%dst + 0x38]
+4:	brnz,pn			%narrow, rnarrow_cont
+	 deccc			%srcnotdone
+	blu,pn			%ICC, rreturn
+	 sub			%mode, %dkind, %mode
+	alignaddr		%mode, %g0, %g0
+	and			%mode, 63, %mode
+	cmp			%srcnext, %srcn
+	bne,a,pn		%ICC, 6f
+	 xor			%fregset, 64, %fregset
+	brnz,a,pn		%fregset, 5f
+	 ldda			[%src] ASI_BLK_P, %f32
+	ldda			[%src] ASI_BLK_P, %f48
+5:	sub			%src, 64, %src
+6:	add			%dst, %dkind, %dst
+	sub			%w, %leftw, %tmp1
+	add			%srcstart, %skind, %srcstart
+	add			%dst, %tmp1, %dst
+	add			%rightw, %dkind, %rightw
+	add			%dst, 63, %dst
+	sub			%rightw, 1, %rightw
+	sub			%dkind, %leftw, %leftw
+	and			%rightw, 63, %rightw
+	and			%leftw, 63, %leftw
+	add			%rightw, 1, %rightw
+	mov			64, %tmp1
+	andn			%dst, 63, %dst
+	sub			%tmp1, %leftw, %leftw
+rroll_wide:
+	add			%srcstart, %skind, %srcnext
+	sub			%srcstart, %w, %srcend
+	fnop
+	deccc			%srcnext
+	sll			%mode, 4, %tmp4
+	fnop
+	andn			%srcnext, 63, %srcnext
+	andn			%srcend, 63, %srcend
+	fnop
+	mov			%srcnext, %srcn
+	and			%mode, 7, %leftw2
+	fnop
+	andn			%tmp4, 127, %tmp4
+	sub			%leftw, %leftw2, %leftw2
+	fnop
+	add			%tmp4, %fregset, %tmp4
+	subcc			%w, %leftw, %curw
+	fnop
+	srl			%tmp4, 1, %tmp3
+	sub			%tmp1, %mode, %tmp1
+	fnop
+	add			%tmp3, (rrepn0 - BranchBaseR), %tmp2
+	cmp			%tmp1, %rightw
+	add			%tmp4, %tmp3, %tmp4
+	sub			%srcnext, 64, %tmp1
+	movgeu			%icc, %tmp2, %tmp4
+	cmp			%srcnext, %srcend
+	sub			%dst, 64, %dst
+	move			%ICC, %tmp1, %srcnext
+	jmpl			%branchbase + %tmp4, %g0
+	 sub			%curw, %rightw, %curw
+
+rreturn:return			%i7+8
+	 wr			%g0, 0, %fprs
+
+narrowstr:
+	cmp			%rightw, 64
+	add			%dst, 0x80, %fregset
+	and			%rightw, 0x38, %tmp1
+	sub			%fregset, %leftw, %tmp2
+	mov			%w, %tmp4
+	andn			%tmp2, 7, %fregset
+	be,pn			%icc, 2f
+	 edge8			%tmp2, %g0, %srcend
+	andcc			%rightw, 7, %g0
+	be,pn			%icc, 1f
+	 neg			%tmp1
+	sub			%g0, %rightw, %tmp4
+	add			%tmp1, (2f - BranchBaseR - 8), %tmp1
+	add			%dst, 0x40, %tmp5
+	sub			%leftw, 0x41, %tmp2
+	add			%tmp5, %rightw, %tmp5
+	edge8l			%tmp4, %tmp2, %tmp2
+	and			%rightw, 7, %tmp4
+	andn			%tmp5, 7, %tmp5
+	jmpl			%branchbase + %tmp1, %g0
+	 sub			%w, %tmp4, %tmp4
+1:	addcc			%branchbase, (4f - BranchBaseR - 8), %tmp2
+	sll			%tmp1, 1, %tmp1
+	jmpl			%tmp2 + %tmp1, %g0
+	 nop
+	ba,pt			%xcc, 3f+0x00
+	 stda			%f30, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x10
+	 stda			%f28, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x20
+	 stda			%f26, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x30
+	 stda			%f24, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x40
+	 stda			%f22, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x50
+	 stda			%f20, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x60
+	 stda			%f18, [%tmp5 + %tmp2] ASI_PST8_P
+	ba,pt			%xcc, 3f+0x70
+	 stda			%f16, [%tmp5 + %tmp2] ASI_PST8_P
+2:	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 4f+0x00
+	 fnop
+	std			%f30, [%dst + 0x78]
+3:	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 4f+0x10
+	 fnop
+	std			%f28, [%dst + 0x70]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 4f+0x20
+	 fnop
+	std			%f26, [%dst + 0x68]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 4f+0x30
+	 fnop
+	std			%f24, [%dst + 0x60]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 4f+0x40
+	 fnop
+	std			%f22, [%dst + 0x58]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 4f+0x50
+	 fnop
+	std			%f20, [%dst + 0x50]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 4f+0x60
+	 fnop
+	std			%f18, [%dst + 0x48]
+	subcc			%tmp4, 8, %tmp4
+	bl,pn			%icc, 4f+0x70
+	 fnop
+	std			%f16, [%dst + 0x40]
+	ba,pt			%xcc, 5f
+	 nop
+4:	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 5f
+	 stda			%f30, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 5f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 5f
+	 stda			%f28, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 5f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 5f
+	 stda			%f26, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 5f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 5f
+	 stda			%f24, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 5f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 5f
+	 stda			%f22, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 5f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 5f
+	 stda			%f20, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 5f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 5f
+	 stda			%f18, [%fregset + %srcend] ASI_PST8_P
+	ba,a,pt			%xcc, 5f
+	cmp			%tmp4, -8
+	bg,a,pn			%ICC, 5f
+	 stda			%f16, [%fregset + %srcend] ASI_PST8_P
+5:	and			%tmp3, 60, %tmp3
+	add			%dst, 64, %dst
+	xor			%tmp3, 60, %tmp3
+	add			%mode, %skind, %mode
+	add			%tmp3, 4, %tmp3
+	brz,pn			%h, rreturn
+	 and			%tmp3, 64, %fregset
+rnarrow_cont:
+	deccc			%h
+	blu,pn			%ICC, rreturn
+	 sub			%mode, %dkind, %mode
+	alignaddr		%mode, %g0, %g0
+	and			%mode, 63, %mode
+	sub			%srcnext, %srcn, %tmp4
+	add			%dst, %dkind, %dst
+	sub			%w, %leftw, %tmp1
+	add			%srcstart, %skind, %srcstart
+	add			%dst, %tmp1, %dst
+	add			%rightw, %dkind, %rightw
+	sub			%dkind, %leftw, %leftw
+	sub			%rightw, 1, %rightw
+	and			%leftw, 63, %leftw
+	add			%dst, 63, %dst
+	mov			64, %tmp1
+	and			%rightw, 63, %rightw
+	sub			%tmp1, %leftw, %leftw
+	add			%srcstart, %skind, %srcnext
+	add			%rightw, 1, %rightw
+	sub			%srcstart, %w, %srcend
+	dec			%srcnext
+	andn			%srcend, 63, %srcend
+	andn			%srcnext, 63, %srcnext
+	sub			%w, %leftw, %prepw
+	mov			%srcnext, %srcn
+	sub			%srcnext, 64, %tmp3
+	add			%srcnext, 64, %tmp2
+	cmp			%skind, 0
+	movg			%ICC, %tmp2, %tmp3
+	mov			%h, %srcnotdone
+	sub			%prepw, %rightw, %prepw
+	sub			%srcstart, 1, %tmp1
+	cmp			%srcnext, %srcend
+	move			%ICC, %tmp3, %srcnext
+	and			%tmp1, 63, %tmp1
+	sub			%srcnext, 64, %tmp3
+	sub			%tmp1, %w, %tmp1
+	cmp			%srcnext, %srcend
+	move			%ICC, %tmp3, %srcnext
+	mov			%prepw, %curw
+	cmp			%tmp1, -65
+	movl			%ICC, 64, %prepw
+	andn			%dst, 63, %dst
+	cmp			%srcnext, %srcstop
+	move			%ICC, 0, %srcnotdone
+	brnz,a,pn		%tmp4, rroll_narrow
+	 xor			%fregset, 64, %fregset
+	cmp			%tmp1, -1
+	bl,pt			%ICC, 6f
+	 tst			%srcnotdone
+	be,a,pn			%ICC, rroll_narrow
+	 membar			SYNC
+	mov			%srcnext, %src
+6:	brnz,a,pn		%fregset, 7f
+	 ldda			[%src] ASI_BLK_P, %f32
+	ldda			[%src] ASI_BLK_P, %f48
+7:	subcc			%src, 64, %src
+rroll_narrow:
+	fnop
+	sll			%mode, 4, %tmp2
+	and			%mode, 7, %leftw2
+	fnop
+	andn			%tmp2, 127, %tmp2
+	sub			%dst, 64, %dst
+	fnop
+	add			%tmp2, %fregset, %tmp2
+	subcc			%leftw, %leftw2, %leftw2
+	fnop
+	srl			%tmp2, 1, %tmp3
+	add			%tmp3, (rrepr0 - BranchBaseR), %tmp4
+	fnop
+	add			%tmp2, %tmp3, %tmp2
+	cmp			%tmp1, -1
+	fnop
+	mov			64, %tmp1
+	movge			%icc, %tmp4, %tmp2
+	sub			%tmp1, %mode, %tmp1
+	add			%tmp3, (rrepn0 - BranchBaseR), %tmp4
+	fnop
+	cmp			%tmp1, %rightw
+	movgeu			%icc, %tmp4, %tmp2
+	jmpl			%branchbase + %tmp2, %g0
+	 and			%tmp3, 32, %tmp3
+
+#define RVISEND1(i,tgt,tgtr)					\
+tgt:								\
+	brnz,pt			%curw, 1f;			\
+	 cmp			%leftw2, ((i&14)*4);		\
+	bg,pn			%icc, tgtr - 8;			\
+	 tst			%srcnotdone;			\
+	be,a,pn			%ICC, tgtr;			\
+	 membar			SYNC;				\
+	ba,pt			%xcc, tgtr - 8;			\
+	 mov			%srcnext, %src;			\
+1:	mov			((i & 1) ^ 1) * 64, %fregset;
+
+#define RVISEND2(i,fset)					\
+	brz,a,pn		%srcnotdone, 3f;		\
+	 membar			SYNC;				\
+	ldda			[%srcnext] ASI_BLK_P, %fset;	\
+	sub			%srcnext, 64, %src;		\
+3:	mov			(i & 1) * 64, %fregset;
+
+RVISEND1(0,rvis0e,rvis0r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	ble,pn			%icc, leftstr
+	 faligndata		%ftmp2, %ftmp1, %f30
+RVISEND2(0,f32)
+	fnop
+	faligndata		%f48, %f50, %f16
+	faligndata		%f50, %f52, %f18
+	faligndata		%f52, %f54, %f20
+	faligndata		%f54, %f56, %f22
+	faligndata		%f56, %f58, %f24
+	faligndata		%f58, %f60, %f26
+	faligndata		%f60, %f62, %f28
+	ba,pt			%xcc, leftstr
+	 faligndata		%f62, %ftmp1, %f30
+RVISEND1(1,rvis1e,rvis1r)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	ble,pn			%icc, leftstr
+	 faligndata		%ftmp2, %ftmp1, %f30
+RVISEND2(1,f48)
+	fnop
+	faligndata		%f32, %f34, %f16
+	faligndata		%f34, %f36, %f18
+	faligndata		%f36, %f38, %f20
+	faligndata		%f38, %f40, %f22
+	faligndata		%f40, %f42, %f24
+	faligndata		%f42, %f44, %f26
+	faligndata		%f44, %f46, %f28
+	ba,pt			%xcc, leftstr
+	 faligndata		%f46, %ftmp1, %f30
+RVISEND1(2,rvis2e,rvis2r)
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%ftmp2, %ftmp1, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(2,f32)
+	fnop
+	fnop
+	faligndata		%f50, %f52, %f16
+	faligndata		%f52, %f54, %f18
+	faligndata		%f54, %f56, %f20
+	faligndata		%f56, %f58, %f22
+	faligndata		%f58, %f60, %f24
+	faligndata		%f60, %f62, %f26
+	ba,pt			%xcc, leftstr
+	 faligndata		%f62, %ftmp1, %f28
+RVISEND1(3,rvis3e,rvis3r)
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%ftmp2, %ftmp1, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(3,f48)
+	fnop
+	fnop
+	faligndata		%f34, %f36, %f16
+	faligndata		%f36, %f38, %f18
+	faligndata		%f38, %f40, %f20
+	faligndata		%f40, %f42, %f22
+	faligndata		%f42, %f44, %f24
+	faligndata		%f44, %f46, %f26
+	ba,pt			%xcc, leftstr
+	 faligndata		%f46, %ftmp1, %f28
+RVISEND1(4,rvis4e,rvis4r)
+	fnop
+	fnop
+	faligndata		%ftmp2, %ftmp1, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(4,f32)
+	fnop
+	fnop
+	fnop
+	faligndata		%f52, %f54, %f16
+	faligndata		%f54, %f56, %f18
+	faligndata		%f56, %f58, %f20
+	faligndata		%f58, %f60, %f22
+	faligndata		%f60, %f62, %f24
+	ba,pt			%xcc, leftstr
+	 faligndata		%f62, %ftmp1, %f26
+RVISEND1(5,rvis5e,rvis5r)
+	fnop
+	fnop
+	faligndata		%ftmp2, %ftmp1, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(5,f48)
+	fnop
+	fnop
+	fnop
+	faligndata		%f36, %f38, %f16
+	faligndata		%f38, %f40, %f18
+	faligndata		%f40, %f42, %f20
+	faligndata		%f42, %f44, %f22
+	faligndata		%f44, %f46, %f24
+	ba,pt			%xcc, leftstr
+	 faligndata		%f46, %ftmp1, %f26
+RVISEND1(6,rvis6e,rvis6r)
+	faligndata		%ftmp2, %ftmp1, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(6,f32)
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f54, %f56, %f16
+	faligndata		%f56, %f58, %f18
+	faligndata		%f58, %f60, %f20
+	faligndata		%f60, %f62, %f22
+	ba,pt			%xcc, leftstr
+	 faligndata		%f62, %ftmp1, %f24
+RVISEND1(7,rvis7e,rvis7r)
+	faligndata		%ftmp2, %ftmp1, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(7,f48)
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f38, %f40, %f16
+	faligndata		%f40, %f42, %f18
+	faligndata		%f42, %f44, %f20
+	faligndata		%f44, %f46, %f22
+	ba,pt			%xcc, leftstr
+	 faligndata		%f46, %ftmp1, %f24
+RVISEND1(8,rvis8e,rvis8r)
+	faligndata		%ftmp2, %ftmp1, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(8,f32)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f56, %f58, %f16
+	faligndata		%f58, %f60, %f18
+	faligndata		%f60, %f62, %f20
+	ba,pt			%xcc, leftstr
+	 faligndata		%f62, %ftmp1, %f22
+RVISEND1(9,rvis9e,rvis9r)
+	faligndata		%ftmp2, %ftmp1, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(9,f48)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f40, %f42, %f16
+	faligndata		%f42, %f44, %f18
+	faligndata		%f44, %f46, %f20
+	ba,pt			%xcc, leftstr
+	 faligndata		%f46, %ftmp1, %f22
+RVISEND1(10,rvis10e,rvis10r)
+	faligndata		%ftmp2, %ftmp1, %f20
+	fmovd			%ftmp4, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(10,f32)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f58, %f60, %f16
+	faligndata		%f60, %f62, %f18
+	ba,pt			%xcc, leftstr
+	 faligndata		%f62, %ftmp1, %f20
+RVISEND1(11,rvis11e,rvis11r)
+	faligndata		%ftmp2, %ftmp1, %f20
+	fmovd			%ftmp4, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(11,f48)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f42, %f44, %f16
+	faligndata		%f44, %f46, %f18
+	ba,pt			%xcc, leftstr
+	 faligndata		%f46, %ftmp1, %f20
+RVISEND1(12,rvis12e,rvis12r)
+	faligndata		%ftmp2, %ftmp1, %f18
+	fmovd			%ftmp3, %f20
+	fmovd			%ftmp4, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(12,f32)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f60, %f62, %f16
+	ba,pt			%xcc, leftstr
+	 faligndata		%f62, %ftmp1, %f18
+RVISEND1(13,rvis13e,rvis13r)
+	faligndata		%ftmp2, %ftmp1, %f18
+	fmovd			%ftmp3, %f20
+	fmovd			%ftmp4, %f22
+	fmovd			%ftmp5, %f24
+	fmovd			%ftmp6, %f26
+	fmovd			%ftmp7, %f28
+	ble,pn			%icc, leftstr
+	 fmovd			%ftmp8, %f30
+RVISEND2(13,f48)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	faligndata		%f44, %f46, %f16
+	ba,pt			%xcc, leftstr
+	 faligndata		%f46, %ftmp1, %f18
+RVISEND1(14,rvis14e,rvis14r)
+	ble,pn			%icc, leftstr
+	 faligndata		%ftmp2, %ftmp1, %f16
+RVISEND2(14,f32)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	ba,pt			%xcc, leftstr
+	 faligndata		%f62, %ftmp1, %f16
+RVISEND1(15,rvis15e,rvis15r)
+	ble,pn			%icc, leftstr
+	 faligndata		%ftmp2, %ftmp1, %f16
+RVISEND2(15,f48)
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	fnop
+	ba,pt			%xcc, leftstr
+	 faligndata		%f46, %ftmp1, %f16
+
+#define RREPEND(tgt,tgtr)					\
+tgt:								\
+	brnz,pt			%srcnotdone, tgtr - 8;		\
+	 mov			%srcnext, %src;			\
+	ba,pt			%xcc, tgtr;			\
+	 membar			SYNC;
+
+	.align			16
+RREPEND(rrep0e,rrep0r)
+RREPEND(rrep1e,rrep1r)
+RREPEND(rrep2e,rrep2r)
+RREPEND(rrep3e,rrep3r)
+RREPEND(rrep4e,rrep4r)
+RREPEND(rrep5e,rrep5r)
+RREPEND(rrep6e,rrep6r)
+RREPEND(rrep7e,rrep7r)
+RREPEND(rrep8e,rrep8r)
+RREPEND(rrep9e,rrep9r)
+RREPEND(rrep10e,rrep10r)
+RREPEND(rrep11e,rrep11r)
+RREPEND(rrep12e,rrep12r)
+RREPEND(rrep13e,rrep13r)
+RREPEND(rrep14e,rrep14r)
+RREPEND(rrep15e,rrep15r)
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h:1.4
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h	Fri Jun 23 12:29:45 2000
@@ -0,0 +1,317 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - defines.
+ *
+ * Copyright (C) 1998,1999,2000 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1998 Michal Rehacek (majkl@iname.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK, MICHAL REHACEK, OR DAVID MILLER BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h,v 1.4 2000/06/23 19:29:45 dawes Exp $ */
+
+#ifndef FFB_H
+#define FFB_H
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86RamDac.h"
+#include "Xmd.h"
+#include "gcstruct.h"
+#include "windowstr.h"
+#include "ffb_regs.h"
+#include "xf86sbusBus.h"
+#include "ffb_dac.h"
+#ifdef XF86DRI
+#include "xf86drm.h"
+#include "ffb_drishare.h"
+#endif
+
+/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
+/* Note: do not mmap FFB_DFB8R_VOFF and following mappings using one mmap together
+   with any previous SFB mapping, otherwise the OS won't be able to use 4M pages
+   for the DFB mappings. -jj */
+#define	FFB_SFB8R_VOFF		0x00000000
+#define	FFB_SFB8G_VOFF		0x00400000
+#define	FFB_SFB8B_VOFF		0x00800000
+#define	FFB_SFB8X_VOFF		0x00c00000
+#define	FFB_SFB32_VOFF		0x01000000
+#define	FFB_SFB64_VOFF		0x02000000
+#define	FFB_FBC_REGS_VOFF	0x04000000
+#define	FFB_BM_FBC_REGS_VOFF	0x04002000
+#define	FFB_DFB8R_VOFF		0x04004000
+#define	FFB_DFB8G_VOFF		0x04404000
+#define	FFB_DFB8B_VOFF		0x04804000
+#define	FFB_DFB8X_VOFF		0x04c04000
+#define	FFB_DFB24_VOFF		0x05004000
+#define	FFB_DFB32_VOFF		0x06004000
+#define	FFB_DFB422A_VOFF	0x07004000	/* DFB 422 mode write to A */
+#define	FFB_DFB422AD_VOFF	0x07804000	/* DFB 422 mode with line doubling */
+#define	FFB_DFB24B_VOFF		0x08004000	/* DFB 24bit mode write to B */
+#define	FFB_DFB422B_VOFF	0x09004000	/* DFB 422 mode write to B */
+#define	FFB_DFB422BD_VOFF	0x09804000	/* DFB 422 mode with line doubling */
+#define	FFB_SFB16Z_VOFF		0x0a004000	/* 16bit mode Z planes */
+#define	FFB_SFB8Z_VOFF		0x0a404000	/* 8bit mode Z planes */
+#define	FFB_SFB422_VOFF		0x0ac04000	/* SFB 422 mode write to A/B */
+#define	FFB_SFB422D_VOFF	0x0b404000	/* SFB 422 mode with line doubling */
+#define	FFB_FBC_KREGS_VOFF	0x0bc04000
+#define	FFB_DAC_VOFF		0x0bc06000
+#define	FFB_PROM_VOFF		0x0bc08000
+#define	FFB_EXP_VOFF		0x0bc18000
+ 
+#if defined(__GNUC__) && defined(USE_VIS)
+#define FFB_ALIGN64	__attribute__((aligned(8)))
+#else
+#define FFB_ALIGN64
+#endif
+
+typedef struct {
+	unsigned int fg FFB_ALIGN64, bg;	/* FG/BG colors for stipple	*/
+	unsigned int patalign;			/* X/Y alignment of bits	*/
+	unsigned char alu;			/* ALU operation		*/
+	unsigned char inhw;			/* Cached in FFB		*/
+	unsigned char pagable;			/* Can be used in a pagefill	*/
+	unsigned char ph;			/* Page buffer height		*/
+	unsigned int bits[32];			/* The stipple bits themselves	*/
+} CreatorStippleRec, *CreatorStipplePtr;
+
+typedef struct {
+	int type;
+	unsigned int linepat;
+	CreatorStipplePtr stipple;
+	void (*PolySegment)(DrawablePtr, GCPtr, int, xSegment *);
+	void (*Polylines)(DrawablePtr, GCPtr, int, int, DDXPointPtr);
+} CreatorPrivGCRec, *CreatorPrivGCPtr;
+
+/* WID and framebuffer controls are a property of the
+ * window.
+ */
+typedef struct {
+	CreatorStipplePtr	Stipple;
+	unsigned int		fbc_base;
+	unsigned int		wid;
+} CreatorPrivWinRec, *CreatorPrivWinPtr;
+
+enum ffb_resolution {
+	ffb_res_standard = 0,	/* 1280 x 1024 */
+	ffb_res_high,		/* 1920 x 1360 */
+	ffb_res_stereo,		/* 960  x 580 */
+	ffb_res_portrait	/* 1280 x 2048 */
+};
+
+enum ffb_chip_type {
+	ffb1_prototype = 0,	/* Early pre-FCS FFB */
+	ffb1_standard,		/* First FCS FFB, 100Mhz UPA, 66MHz gclk */
+	ffb1_speedsort,		/* Second FCS FFB, 100Mhz UPA, 75MHz gclk */
+	ffb2_prototype,		/* Early pre-FCS vertical FFB2 */
+	ffb2_vertical,		/* First FCS FFB2/vertical, 100Mhz UPA, 100MHZ gclk,
+				   75(SingleBuffer)/83(DoubleBuffer) MHz fclk */
+	ffb2_vertical_plus,	/* Second FCS FFB2/vertical, same timings */
+	ffb2_horizontal,	/* First FCS FFB2/horizontal, same timings as FFB2/vert */
+	ffb2_horizontal_plus,	/* Second FCS FFB2/horizontal, same timings */
+	afb_m3,			/* FCS Elite3D, 3 float chips */
+	afb_m6			/* FCS Elite3D, 6 float chips */
+};
+
+#ifdef XF86DRI
+typedef struct {
+	int	index;
+} FFBConfigPrivRec, *FFBConfigPrivPtr;
+#endif
+
+typedef struct {
+	unsigned short fifo_cache;
+	unsigned short rp_active;
+	ffb_fbcPtr regs;
+	unsigned int ppc_cache;
+	unsigned int pmask_cache;
+	unsigned int rop_cache;
+	unsigned int drawop_cache;
+	unsigned int fg_cache;
+	unsigned int bg_cache;
+	unsigned int fontw_cache;
+	unsigned int fontinc_cache;
+	unsigned int fbc_cache;
+	unsigned int wid_cache;
+	enum ffb_chip_type ffb_type;
+	CreatorStipplePtr laststipple;
+	unsigned *fb;
+	unsigned *sfb32;
+	unsigned *sfb8r;
+	unsigned *sfb8x;
+	unsigned *dfb24;
+	unsigned *dfb8r;
+	unsigned *dfb8x;
+
+	/* Slot offset 0x0200000, used to probe board type. */
+	volatile unsigned int *strapping_bits;
+
+	/* Needed for some 3DRAM revisions and ffb1 in hires */
+	unsigned char disable_pagefill;
+
+	/* Needed for FFB2/AFB when in stereo or hires */
+	unsigned char disable_fastfill_ap;
+
+	/* Needed for FFB1 in highres mode */
+	unsigned char disable_vscroll;
+
+	/* Needed on all FFB1 boards. */
+	unsigned char has_brline_bug;
+
+	/* Available on FFB2 and AFB */
+	unsigned char use_blkread_prefetch;
+
+	/* Framebuffer configuration */
+	unsigned char has_double_res;
+	unsigned char has_z_buffer;
+	unsigned char has_double_buffer;
+
+	enum ffb_resolution ffb_res;
+	BoxRec ClippedBoxBuf[64];
+	xRectangle Pf_Fixups[4];
+	short Pf_AlignTab[0x800];
+
+	ffb_dacPtr dac;
+	sbusDevicePtr psdp;
+	Bool HWCursor;
+	Bool NoAccel;
+	CloseScreenProcPtr CloseScreen;
+	xf86CursorInfoPtr CursorInfoRec;
+	unsigned char CursorShiftX, CursorShiftY;
+	unsigned char *CursorData;
+
+	PixmapPtr pix32, pix8;
+
+	void *I2C;
+	struct ffb_dac_info dac_info;
+
+#ifdef XF86DRI
+	void *pDRIInfo;
+	int numVisualConfigs;
+	void *pVisualConfigs;
+	FFBConfigPrivPtr pVisualConfigsPriv;
+	int drmSubFD;
+	Bool dri_enabled;
+	ffb_dri_state_t *pFfbSarea;
+#endif
+} FFBRec, *FFBPtr;
+
+/* Acceleration */
+extern Bool FFBAccelInit(ScreenPtr, FFBPtr);
+extern void CreatorVtChange (ScreenPtr pScreen, int enter);
+
+/* HW cursor support */
+extern Bool FFBHWCursorInit(ScreenPtr);
+
+/* Exported DAC layer routines. */
+extern void FFBDacLoadCursorPos(FFBPtr, int, int);
+extern void FFBDacLoadCursorColor(FFBPtr, int, int);
+extern void FFBDacCursorEnableDisable(FFBPtr, int);
+extern void FFBDacCursorLoadBitmap(FFBPtr, int, int, unsigned int *);
+extern void FFBDacLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
+extern Bool FFBDacInit(FFBPtr);
+extern void FFBDacFini(FFBPtr);
+extern void FFBDacEnterVT(FFBPtr);
+extern void FFBDacLeaveVT(FFBPtr);
+
+/* Exported WID layer routines. */
+extern void FFBWidPoolInit(FFBPtr);
+extern unsigned int FFBWidAlloc(FFBPtr, int, int, Bool);
+extern void FFBWidFree(FFBPtr, unsigned int);
+extern unsigned int FFBWidUnshare(FFBPtr, unsigned int);
+extern unsigned int FFBWidReshare(FFBPtr, unsigned int);
+extern void FFBWidChangeBuffer(FFBPtr, unsigned int, int);
+extern Bool FFBWidIsShared(FFBPtr pFfb, unsigned int wid);
+
+/* Accelerated double-buffering. */
+extern Bool FFBDbePreInit(ScreenPtr);
+
+#ifdef XF86DRI
+/* DRI support */
+extern Bool FFBDRIScreenInit(ScreenPtr);
+extern Bool FFBDRIFinishScreenInit(ScreenPtr);
+extern void FFBDRICloseScreen(ScreenPtr);
+#endif
+
+/* The fastfill and pagefill buffer sizes change based upon
+ * the resolution.
+ */
+struct fastfill_parms {
+	int	fastfill_small_area;
+	int	pagefill_small_area;
+
+	int	fastfill_height;
+	int	fastfill_width;
+	int	pagefill_height;
+	int	pagefill_width;
+};
+
+extern struct fastfill_parms ffb_fastfill_parms[];
+
+#define FFB_FFPARMS(__fpriv)	(ffb_fastfill_parms[(__fpriv)->ffb_res])
+
+extern int  CreatorScreenPrivateIndex;
+extern int  CreatorGCPrivateIndex;
+extern int  CreatorWindowPrivateIndex;
+
+#define GET_FFB_FROM_SCRN(p)	((FFBPtr)((p)->driverPrivate))
+
+#define GET_FFB_FROM_SCREEN(s)						\
+((FFBPtr)(s)->devPrivates[CreatorScreenPrivateIndex].ptr)
+
+#define CreatorGetGCPrivate(g)						\
+((CreatorPrivGCPtr) (g)->devPrivates [CreatorGCPrivateIndex].ptr)
+
+#define CreatorGetWindowPrivate(w)					\
+((CreatorPrivWinPtr) (w)->devPrivates[CreatorWindowPrivateIndex].ptr)
+                            
+#define CreatorSetWindowPrivate(w,p) 					\
+((w)->devPrivates[CreatorWindowPrivateIndex].ptr = (pointer) p)
+
+#undef DEBUG_FFB
+
+#ifdef DEBUG_FFB
+
+#include <stdio.h>
+
+extern FILE *FDEBUG_FD;
+
+static __inline__ void FFB_DEBUG_init(void)
+{
+	FDEBUG_FD = fopen("/tmp/FFB.DEBUG", "a");
+}
+#define FDEBUG(__x)				\
+do {	fprintf __x; 				\
+	fflush(FDEBUG_FD); 			\
+} while(0)
+#else
+#define FFB_DEBUG_init()	do { } while(0)
+#define FDEBUG(__x)		do { } while(0)
+#endif
+
+/* Enable this to get very verbose tracing of the driver onto stderr. */
+#undef TRACE_FFB
+#ifdef TRACE_FFB
+#define FFBLOG(__x)		ErrorF __x
+#else
+#define FFBLOG(__x)		do { } while(0)
+#endif
+
+#endif /* FFB_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c:1.3
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c	Fri Jun 23 12:29:45 2000
@@ -0,0 +1,951 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer.
+ *
+ * Copyright (C) 1998,1999,2000 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1998 Michal Rehacek (majkl@iname.com)
+ * Copyright (C) 1999,2000 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK, MICHAL REHACEK, OR DAVID MILLER BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.3 2000/06/23 19:29:45 dawes Exp $ */
+
+#include	<asm/types.h>
+#include	<math.h>
+
+#include	"scrnintstr.h"
+#include	"pixmapstr.h"
+#include	"regionstr.h"
+#include	"mistruct.h"
+#include	"fontstruct.h"
+#include	"dixfontstr.h"
+#define PSZ 8
+#include	"cfb.h"
+#undef PSZ
+#include	"cfb32.h"
+#include	"mibstore.h"
+#include	"mifillarc.h"
+#include	"miwideline.h"
+#include	"miline.h"
+#include	"fastblt.h"
+#include	"mergerop.h"
+#include	"migc.h"
+#include	"mi.h"
+
+#include	"cfb8_32wid.h"
+
+#include	"ffb.h"
+#include	"ffb_fifo.h"
+#include	"ffb_rcache.h"
+#include	"ffb_loops.h"
+#include	"ffb_regs.h"
+#include	"ffb_stip.h"
+#include 	"ffb_gc.h"
+
+int	CreatorScreenPrivateIndex;
+int	CreatorGCPrivateIndex;
+int	CreatorWindowPrivateIndex;
+int	CreatorGeneration;
+
+/* Indexed by ffb resolution enum. */
+struct fastfill_parms ffb_fastfill_parms[] = {
+	/* fsmall, psmall,  ffh,  ffw,  pfh,  pfw */
+	{  0x00c0, 0x1400, 0x04, 0x08, 0x10, 0x50 },	/* Standard: 1280 x 1024 */
+	{  0x0140, 0x2800, 0x04, 0x10, 0x10, 0xa0 },	/* High:     1920 x 1360 */
+	{  0x0080, 0x0a00, 0x02, 0x08, 0x08, 0x50 },	/* Stereo:   960  x 580  */
+/*XXX*/	{  0x00c0, 0x0a00, 0x04, 0x08, 0x08, 0x50 },	/* Portrait: 1280 x 2048 XXX */
+};
+
+static Bool
+CreatorCreateWindow (WindowPtr pWin)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pScreen);
+	CreatorPrivWinPtr pFfbPrivWin;
+	unsigned int fbc;
+	int depth = (pWin->drawable.depth == 8) ? 8 : 24;
+	int i, visual, visclass;
+
+	if (depth == 8) {
+		if (!cfbCreateWindow (pWin))
+			return FALSE;
+	} else {
+		if (!cfb32CreateWindow (pWin))
+			return FALSE;
+	}
+
+	pFfbPrivWin = xalloc(sizeof(CreatorPrivWinRec));
+	if (!pFfbPrivWin)
+		return FALSE;
+
+	fbc  = FFB_FBC_WB_A | FFB_FBC_WM_COMBINED | FFB_FBC_RB_A;
+	fbc |= FFB_FBC_WE_FORCEON;
+	fbc |= FFB_FBC_SB_BOTH;
+	fbc |= FFB_FBC_ZE_OFF | FFB_FBC_YE_OFF;
+	if (depth == 8)
+		fbc |= (FFB_FBC_RE_MASK | FFB_FBC_GE_OFF | FFB_FBC_BE_OFF);
+	else
+		fbc |= FFB_FBC_RGBE_MASK;
+	fbc |= FFB_FBC_XE_ON;
+	pFfbPrivWin->fbc_base = fbc;
+
+	visual = wVisual(pWin);
+	visclass = 0;
+	for (i = 0; i < pScreen->numVisuals; i++) {
+		if (pScreen->visuals[i].vid == visual) {
+			visclass = pScreen->visuals[i].class;
+			break;
+		}
+	}
+
+	pFfbPrivWin->wid = FFBWidAlloc(pFfb, visclass, wColormap(pWin), TRUE);
+	if (pFfbPrivWin->wid == (unsigned int) -1) {
+		xfree(pFfbPrivWin);
+		return FALSE;
+	}
+	FFBLOG(("CreatorCreateWindow: pWin %p depth %d wid %x fbc_base %x\n",
+		pWin, depth, pFfbPrivWin->wid, pFfbPrivWin->fbc_base));
+
+	pFfbPrivWin->Stipple = NULL;
+	CreatorSetWindowPrivate(pWin, pFfbPrivWin);
+
+	return TRUE;
+}
+
+static Bool
+CreatorDestroyWindow (WindowPtr pWin)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pWin->drawable.pScreen);
+	CreatorPrivWinPtr pFfbPrivWin;
+	int depth = (pWin->drawable.depth == 8) ? 8 : 24;
+
+	FFBLOG(("CreatorDestroyWindow: pWin %p depth %d\n", pWin, depth));
+	pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+	if (pFfbPrivWin->Stipple)
+		xfree(pFfbPrivWin->Stipple);
+	FFBWidFree(pFfb, pFfbPrivWin->wid);
+	xfree(pFfbPrivWin);
+
+	if (depth == 8)
+		return cfbDestroyWindow (pWin);
+	else
+		return cfb32DestroyWindow (pWin);
+}
+
+extern CreatorStipplePtr FFB_tmpStipple;
+
+static int
+CreatorChangeWindowAttributes (WindowPtr pWin, Mask mask)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pWin->drawable.pScreen);
+	CreatorPrivWinPtr pFfbPrivWin;
+	CreatorStipplePtr stipple;
+	Mask index;
+	WindowPtr pBgWin;
+	register cfbPrivWin *pPrivWin;
+	int width, depth;
+
+	FFBLOG(("CreatorChangeWindowAttributes: WIN(%p) mask(%08x)\n", pWin, mask));
+	pPrivWin = (cfbPrivWin *)(pWin->devPrivates[cfbWindowPrivateIndex].ptr);
+	pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+	depth = pWin->drawable.depth;
+
+	/*
+	 * When background state changes from ParentRelative and
+	 * we had previously rotated the fast border pixmap to match
+	 * the parent relative origin, rerotate to match window
+	 */
+	if (mask & (CWBackPixmap | CWBackPixel) &&
+	    pWin->backgroundState != ParentRelative &&
+	    pPrivWin->fastBorder &&
+	    (pPrivWin->oldRotate.x != pWin->drawable.x ||
+	     pPrivWin->oldRotate.y != pWin->drawable.y)) {
+		if (depth == 8) {
+			cfbXRotatePixmap(pPrivWin->pRotatedBorder,
+					 pWin->drawable.x - pPrivWin->oldRotate.x);
+			cfbYRotatePixmap(pPrivWin->pRotatedBorder,
+					 pWin->drawable.y - pPrivWin->oldRotate.y);
+		} else {
+			cfb32XRotatePixmap(pPrivWin->pRotatedBorder,
+					   pWin->drawable.x - pPrivWin->oldRotate.x);
+			cfb32YRotatePixmap(pPrivWin->pRotatedBorder,
+					   pWin->drawable.y - pPrivWin->oldRotate.y);
+		}
+		pPrivWin->oldRotate.x = pWin->drawable.x;
+		pPrivWin->oldRotate.y = pWin->drawable.y;
+	}
+	while (mask) {
+		index = lowbit(mask);
+		mask &= ~index;
+		switch (index) {
+		case CWBackPixmap:
+			stipple = pFfbPrivWin->Stipple;
+			if (pWin->backgroundState == None ||
+			    pWin->backgroundState == ParentRelative) {
+				pPrivWin->fastBackground = FALSE;
+				if (stipple) {
+					xfree (stipple);
+					pFfbPrivWin->Stipple = NULL;
+				}
+				/* Rotate border to match parent origin */
+				if (pWin->backgroundState == ParentRelative &&
+				    pPrivWin->pRotatedBorder)  {
+					for (pBgWin = pWin->parent;
+					     pBgWin->backgroundState == ParentRelative;
+					     pBgWin = pBgWin->parent);
+					if (depth == 8) {
+						cfbXRotatePixmap(pPrivWin->pRotatedBorder,
+								 pBgWin->drawable.x - pPrivWin->oldRotate.x);
+						cfbYRotatePixmap(pPrivWin->pRotatedBorder,
+								 pBgWin->drawable.y - pPrivWin->oldRotate.y);
+					} else {
+						cfb32XRotatePixmap(pPrivWin->pRotatedBorder,
+								   pBgWin->drawable.x - pPrivWin->oldRotate.x);
+						cfb32YRotatePixmap(pPrivWin->pRotatedBorder,
+								   pBgWin->drawable.y - pPrivWin->oldRotate.y);
+					}
+					pPrivWin->oldRotate.x = pBgWin->drawable.x;
+					pPrivWin->oldRotate.y = pBgWin->drawable.y;
+				}
+				break;
+			}
+			if (!stipple) {
+				if (!FFB_tmpStipple)
+					FFB_tmpStipple = (CreatorStipplePtr)
+						xalloc (sizeof *FFB_tmpStipple);
+				stipple = FFB_tmpStipple;
+			}
+			if (stipple) {
+				int ph = FFB_FFPARMS(pFfb).pagefill_height;
+
+				if (CreatorCheckTile (pWin->background.pixmap, stipple,
+						      ((DrawablePtr)pWin)->x & 31,
+						      ((DrawablePtr)pWin)->y & 31, ph)) {
+					stipple->alu = GXcopy;
+					pPrivWin->fastBackground = FALSE;
+					if (stipple == FFB_tmpStipple) {
+						pFfbPrivWin->Stipple = stipple;
+						FFB_tmpStipple = 0;
+					}
+					break;
+				}
+			}
+			if ((stipple = pFfbPrivWin->Stipple) != NULL) {
+				xfree (stipple);
+				pFfbPrivWin->Stipple = NULL;
+			}
+			if (((width = (pWin->background.pixmap->drawable.width *
+				       pWin->background.pixmap->drawable.bitsPerPixel)) <= 32) &&
+			    !(width & (width - 1))) {
+				if (depth == 8) {
+					cfbCopyRotatePixmap(pWin->background.pixmap,
+							    &pPrivWin->pRotatedBackground,
+							    pWin->drawable.x,
+							    pWin->drawable.y);
+				} else {
+					cfb32CopyRotatePixmap(pWin->background.pixmap,
+							      &pPrivWin->pRotatedBackground,
+							      pWin->drawable.x,
+							      pWin->drawable.y);
+				}
+				if (pPrivWin->pRotatedBackground) {
+					pPrivWin->fastBackground = TRUE;
+					pPrivWin->oldRotate.x = pWin->drawable.x;
+					pPrivWin->oldRotate.y = pWin->drawable.y;
+				} else
+					pPrivWin->fastBackground = FALSE;
+				break;
+			}
+			pPrivWin->fastBackground = FALSE;
+			break;
+
+		case CWBackPixel:
+			pPrivWin->fastBackground = FALSE;
+			break;
+
+		case CWBorderPixmap:
+			/* don't bother with accelerator for border tiles (just lazy) */
+			if (((width = (pWin->border.pixmap->drawable.width *
+				       pWin->border.pixmap->drawable.bitsPerPixel)) <= 32) &&
+			    !(width & (width - 1))) {
+				for (pBgWin = pWin;
+				     pBgWin->backgroundState == ParentRelative;
+				     pBgWin = pBgWin->parent)
+					;
+				if (depth == 8) {
+					cfbCopyRotatePixmap(pWin->border.pixmap,
+							    &pPrivWin->pRotatedBorder,
+							    pBgWin->drawable.x,
+							    pBgWin->drawable.y);
+				} else {
+					cfb32CopyRotatePixmap(pWin->border.pixmap,
+							      &pPrivWin->pRotatedBorder,
+							      pBgWin->drawable.x,
+							      pBgWin->drawable.y);
+				}
+				if (pPrivWin->pRotatedBorder) {
+					pPrivWin->fastBorder = TRUE;
+					pPrivWin->oldRotate.x = pBgWin->drawable.x;
+					pPrivWin->oldRotate.y = pBgWin->drawable.y;
+				} else
+					pPrivWin->fastBorder = FALSE;
+			} else
+				pPrivWin->fastBorder = FALSE;
+			break;
+			
+		case CWBorderPixel:
+			pPrivWin->fastBorder = FALSE;
+			break;
+		}
+	}
+	return (TRUE);
+}
+
+static void
+CreatorPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pWin->drawable.pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	register cfbPrivWin *pPrivWin;
+	CreatorPrivWinPtr pFfbPrivWin;
+	CreatorStipplePtr stipple;
+	WindowPtr pBgWin;
+	int depth = pWin->drawable.depth;
+
+	FFBLOG(("CreatorPaintWindow: WIN(%p) what(%d)\n", pWin, what));
+	pPrivWin = cfbGetWindowPrivate(pWin);
+	pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+	switch (what) {
+	case PW_BACKGROUND:
+		stipple = pFfbPrivWin->Stipple;
+		switch (pWin->backgroundState) {
+		case None:
+			return;
+		case ParentRelative:
+			do {
+				pWin = pWin->parent;
+			} while (pWin->backgroundState == ParentRelative);
+			(*pWin->drawable.pScreen->PaintWindowBackground)(pWin, pRegion, what);
+			return;
+		case BackgroundPixmap:
+			if (stipple) {
+				CreatorFillBoxStipple ((DrawablePtr)pWin, 
+						       (int)REGION_NUM_RECTS(pRegion),
+						       REGION_RECTS(pRegion),
+						       stipple);
+				return;
+			}
+			FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin);
+			FFBWait(pFfb, ffb);
+			if (pPrivWin->fastBackground) {
+				if (depth == 8) {
+					cfbFillBoxTile32 ((DrawablePtr)pWin,
+							  (int)REGION_NUM_RECTS(pRegion),
+							  REGION_RECTS(pRegion),
+							  pPrivWin->pRotatedBackground);
+				} else {
+					cfb32FillBoxTile32 ((DrawablePtr)pWin,
+							    (int)REGION_NUM_RECTS(pRegion),
+							    REGION_RECTS(pRegion),
+							    pPrivWin->pRotatedBackground);
+				}
+			} else {
+				if (depth == 8) {
+					cfbFillBoxTileOdd ((DrawablePtr)pWin,
+							   (int)REGION_NUM_RECTS(pRegion),
+							   REGION_RECTS(pRegion),
+							   pWin->background.pixmap,
+							   (int) pWin->drawable.x,
+							   (int) pWin->drawable.y);
+				} else {
+					cfb32FillBoxTileOdd ((DrawablePtr)pWin,
+							     (int)REGION_NUM_RECTS(pRegion),
+							     REGION_RECTS(pRegion),
+							     pWin->background.pixmap,
+							     (int) pWin->drawable.x,
+							     (int) pWin->drawable.y);
+				}
+			}
+			return;
+		case BackgroundPixel:
+			CreatorFillBoxSolid ((DrawablePtr)pWin,
+					     (int)REGION_NUM_RECTS(pRegion),
+					     REGION_RECTS(pRegion),
+					     pWin->background.pixel);
+			return;
+		}
+		break;
+	case PW_BORDER:
+		if (pWin->borderIsPixel) {
+			CreatorFillBoxSolid ((DrawablePtr)pWin,
+					     (int)REGION_NUM_RECTS(pRegion),
+					     REGION_RECTS(pRegion),
+					     pWin->border.pixel);
+			return;
+		}
+		FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin);
+		FFBWait(pFfb, ffb);
+		if (pPrivWin->fastBorder) {
+			if (depth == 8) {
+				cfbFillBoxTile32 ((DrawablePtr)pWin,
+						  (int)REGION_NUM_RECTS(pRegion),
+						  REGION_RECTS(pRegion),
+						  pPrivWin->pRotatedBorder);
+			} else {
+				cfb32FillBoxTile32 ((DrawablePtr)pWin,
+						    (int)REGION_NUM_RECTS(pRegion),
+						    REGION_RECTS(pRegion),
+						    pPrivWin->pRotatedBorder);
+			}
+		} else {
+			for (pBgWin = pWin;
+			     pBgWin->backgroundState == ParentRelative;
+			     pBgWin = pBgWin->parent)
+				;
+
+			if (depth == 8) {
+				cfbFillBoxTileOdd ((DrawablePtr)pWin,
+						   (int)REGION_NUM_RECTS(pRegion),
+						   REGION_RECTS(pRegion),
+						   pWin->border.pixmap,
+						   (int) pBgWin->drawable.x,
+						   (int) pBgWin->drawable.y);
+			} else {
+				cfb32FillBoxTileOdd ((DrawablePtr)pWin,
+						     (int)REGION_NUM_RECTS(pRegion),
+						     REGION_RECTS(pRegion),
+						     pWin->border.pixmap,
+						     (int) pBgWin->drawable.x,
+						     (int) pBgWin->drawable.y);
+			}
+		}
+		return;
+	}
+}
+
+static void 
+CreatorCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pScreen);
+	DDXPointPtr pptSrc;
+	DDXPointPtr ppt;
+	RegionRec rgnDst;
+	BoxPtr pbox;
+	int dx, dy;
+	int i, nbox;
+	WindowPtr pwinRoot;
+
+	FFBLOG(("CreatorCopyWindow: WIN(%p)\n", pWin));
+
+	REGION_INIT(pScreen, &rgnDst, NullBox, 0);
+
+	dx = ptOldOrg.x - pWin->drawable.x;
+	dy = ptOldOrg.y - pWin->drawable.y;
+	REGION_TRANSLATE(pScreen, prgnSrc, -dx, -dy);
+	REGION_INTERSECT(pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
+
+	pbox = REGION_RECTS(&rgnDst);
+	nbox = REGION_NUM_RECTS(&rgnDst);
+	if(!(pptSrc = (DDXPointPtr )ALLOCATE_LOCAL(nbox * sizeof(DDXPointRec))))
+		return;
+
+	ppt = pptSrc;
+	for (i = nbox; --i >= 0; ppt++, pbox++) {
+		ppt->x = pbox->x1 + dx;
+		ppt->y = pbox->y1 + dy;
+	}
+
+	/* XXX Optimize this later to only gcopy/vcopy the 8bpp+WID plane
+	 * XXX when possible.  -DaveM
+	 */
+
+	pwinRoot = WindowTable[pScreen->myNum];
+
+	if (!pFfb->disable_vscroll && (!dx && dy)) {
+		FFBPtr pFfb = GET_FFB_FROM_SCREEN(pScreen);
+
+		FFB_ATTR_VSCROLL_WINCOPY(pFfb);
+		CreatorDoVertBitblt ((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,
+				     GXcopy, &rgnDst, pptSrc, ~0L);
+	} else {
+		FFBPtr pFfb = GET_FFB_FROM_SCREEN(pScreen);
+		ffb_fbcPtr ffb = pFfb->regs;
+
+		FFB_ATTR_SFB_VAR_WINCOPY(pFfb);
+		FFBWait(pFfb, ffb);
+		CreatorDoBitblt ((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,
+				 GXcopy, &rgnDst, pptSrc, ~0L);
+	}
+	DEALLOCATE_LOCAL(pptSrc);
+	REGION_UNINIT(pScreen, &rgnDst);
+}
+
+static void
+CreatorSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, WindowPtr pWin)
+{
+	ScreenPtr pScreen = pPixmap->drawable.pScreen;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pScreen);
+	cfb8_32WidScreenPtr pScreenPriv =
+		CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	register DDXPointPtr pPt;
+	DDXPointPtr pPtsInit;
+	register BoxPtr pBox;
+	register int i;
+	PixmapPtr pScrPix;
+    
+	FFBLOG(("CreatorSaveAreas: WIN(%p)\n", pWin));
+	i = REGION_NUM_RECTS(prgnSave);
+	pPtsInit = (DDXPointPtr)ALLOCATE_LOCAL(i * sizeof(DDXPointRec));
+	if (!pPtsInit)
+		return;
+    
+	pBox = REGION_RECTS(prgnSave);
+	pPt = pPtsInit;
+	while (--i >= 0) {
+		pPt->x = pBox->x1 + xorg;
+		pPt->y = pBox->y1 + yorg;
+		pPt++;
+		pBox++;
+	}
+
+	if (pWin->drawable.bitsPerPixel == 8)
+		pScrPix = (PixmapPtr) pScreenPriv->pix8;
+	else
+		pScrPix = (PixmapPtr) pScreenPriv->pix32;
+
+	/* SRC is the framebuffer, DST is a pixmap.  The SFB_VAR attributes may
+	 * seem silly, but they are needed even in this case to handle
+	 * double-buffered windows properly.
+	 */
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	CreatorDoBitblt((DrawablePtr) pScrPix, (DrawablePtr)pPixmap,
+			GXcopy, prgnSave, pPtsInit, ~0L);
+
+	DEALLOCATE_LOCAL (pPtsInit);
+}
+
+static void
+CreatorRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, int yorg, WindowPtr pWin)
+{
+	FFBPtr pFfb;
+	ffb_fbcPtr ffb;
+	register DDXPointPtr pPt;
+	DDXPointPtr pPtsInit;
+	register BoxPtr pBox;
+	register int i;
+	ScreenPtr pScreen = pPixmap->drawable.pScreen;
+	cfb8_32WidScreenPtr pScreenPriv =
+		CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+	PixmapPtr pScrPix;
+    
+	FFBLOG(("CreatorRestoreAreas: WIN(%p)\n", pWin));
+	i = REGION_NUM_RECTS(prgnRestore);
+	pPtsInit = (DDXPointPtr)ALLOCATE_LOCAL(i*sizeof(DDXPointRec));
+	if (!pPtsInit)
+		return;
+    
+	pBox = REGION_RECTS(prgnRestore);
+	pPt = pPtsInit;
+	while (--i >= 0) {
+		pPt->x = pBox->x1 - xorg;
+		pPt->y = pBox->y1 - yorg;
+		pPt++;
+		pBox++;
+	}
+
+	if (pWin->drawable.bitsPerPixel == 8)
+		pScrPix = (PixmapPtr) pScreenPriv->pix8;
+	else
+		pScrPix = (PixmapPtr) pScreenPriv->pix32;
+
+	pFfb = GET_FFB_FROM_SCREEN(pScreen);
+	ffb = pFfb->regs;
+
+	/* SRC is a pixmap, DST is the framebuffer */
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	CreatorDoBitblt((DrawablePtr)pPixmap, (DrawablePtr) pScrPix,
+			GXcopy, prgnRestore, pPtsInit, ~0L);
+
+	DEALLOCATE_LOCAL (pPtsInit);
+}
+
+static void
+CreatorGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planeMask, char* pdstLine)
+{
+	BoxRec box;
+	DDXPointRec ptSrc;
+	RegionRec rgnDst;
+	ScreenPtr pScreen;
+	PixmapPtr pPixmap;
+
+	FFBLOG(("CreatorGetImage: s[%08x:%08x] wh[%08x:%08x]\n", sx, sy, w, h));
+	if ((w == 0) || (h == 0))
+		return;
+	if (pDrawable->bitsPerPixel == 1) {
+		mfbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine);
+		return;
+	}
+	pScreen = pDrawable->pScreen;
+	/*
+	 * XFree86 DDX empties the root borderClip when the VT is
+	 * switched away; this checks for that case
+	 */
+	if (!cfbDrawableEnabled (pDrawable))
+		return;
+	if(format == ZPixmap) {
+		FFBPtr pFfb = GET_FFB_FROM_SCREEN (pScreen);
+		ffb_fbcPtr ffb = pFfb->regs;
+
+		/* We have to have the full planemask. */
+		if (pDrawable->type == DRAWABLE_WINDOW) {
+			WindowPtr pWin = (WindowPtr) pDrawable;
+
+			FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin);
+			FFBWait(pFfb, ffb);
+		}
+
+		if (pDrawable->bitsPerPixel == 8) {
+			if((planeMask & 0x000000ff) != 0x000000ff) {
+				cfbGetImage(pDrawable, sx, sy, w, h,
+					    format, planeMask, pdstLine);
+				return;
+			}
+		} else {
+			if((planeMask & 0x00ffffff) != 0x00ffffff) {
+				cfb32GetImage(pDrawable, sx, sy, w, h,
+					      format, planeMask, pdstLine);
+				return;
+			}
+		}
+
+		/* SRC is the framebuffer, DST is a pixmap */
+		if (pDrawable->type == DRAWABLE_WINDOW && w == 1 && h == 1) {
+			/* Benchmarks do this make sure the acceleration hardware
+			 * has completed all of it's operations, therefore I feel
+			 * it is not cheating to special case this because if
+			 * anything it gives the benchmarks more accurate results.
+			 */
+			if (pDrawable->bitsPerPixel == 32) {
+				unsigned char *sfb = (unsigned char *)pFfb->sfb32;
+				unsigned int *dstPixel = (unsigned int *)pdstLine;
+				unsigned int tmp;
+
+				tmp = *((unsigned int *)(sfb +
+							 ((sy + pDrawable->y) << 13) +
+							 ((sx + pDrawable->x) << 2)));
+				*dstPixel = (tmp & 0x00ffffff);
+			} else {
+				unsigned char *sfb = (unsigned char *)pFfb->sfb8r;
+				unsigned char *dstPixel = (unsigned char *)pdstLine;
+
+				*dstPixel = *((unsigned char *)(sfb +
+								((sy + pDrawable->y) << 11) +
+								((sx + pDrawable->x) << 0)));
+			}
+			return;
+		}
+		pPixmap = GetScratchPixmapHeader(pScreen, w, h, 
+						 pDrawable->depth, pDrawable->bitsPerPixel,
+						 PixmapBytePad(w,pDrawable->depth), (pointer)pdstLine);
+		if (!pPixmap)
+			return;
+		ptSrc.x = sx + pDrawable->x;
+		ptSrc.y = sy + pDrawable->y;
+		box.x1 = 0;
+		box.y1 = 0;
+		box.x2 = w;
+		box.y2 = h;
+		REGION_INIT(pScreen, &rgnDst, &box, 1);
+		CreatorDoBitblt(pDrawable, (DrawablePtr)pPixmap, GXcopy, &rgnDst,
+				&ptSrc, planeMask);
+		REGION_UNINIT(pScreen, &rgnDst);
+		FreeScratchPixmapHeader(pPixmap);
+	} else
+		miGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine);
+}
+
+extern void
+CreatorGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
+		int *pwidth, int nspans, char *pchardstStart);
+
+void
+CreatorVtChange (ScreenPtr pScreen, int enter)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	pFfb->rp_active = 1;
+	FFBWait(pFfb, ffb);	
+	pFfb->fifo_cache = -1;
+	pFfb->fbc_cache = (FFB_FBC_WB_A | FFB_FBC_WM_COMBINED |
+			   FFB_FBC_RB_A | FFB_FBC_SB_BOTH| FFB_FBC_XE_OFF |
+			   FFB_FBC_ZE_OFF | FFB_FBC_YE_OFF | FFB_FBC_RGBE_MASK);
+	pFfb->ppc_cache = (FFB_PPC_FW_DISABLE |
+			   FFB_PPC_VCE_DISABLE | FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST |
+			   FFB_PPC_XS_CONST | FFB_PPC_YS_CONST | FFB_PPC_ZS_CONST|
+			   FFB_PPC_DCE_DISABLE | FFB_PPC_ABE_DISABLE | FFB_PPC_TBE_OPAQUE);
+
+	pFfb->pmask_cache = ~0;
+	pFfb->rop_cache = FFB_ROP_EDIT_BIT;
+	pFfb->drawop_cache = FFB_DRAWOP_RECTANGLE;
+	pFfb->fg_cache = pFfb->bg_cache = 0;
+	pFfb->fontw_cache = 32;
+	pFfb->fontinc_cache = (1 << 16) | 0;
+	pFfb->laststipple = NULL;
+	FFBFifo(pFfb, 9);
+	ffb->fbc = pFfb->fbc_cache;
+	ffb->ppc = pFfb->ppc_cache;
+	ffb->pmask = pFfb->pmask_cache;
+	ffb->rop = pFfb->rop_cache;
+	ffb->drawop = pFfb->drawop_cache;
+	ffb->fg = pFfb->fg_cache;
+	ffb->bg = pFfb->bg_cache;
+	ffb->fontw = pFfb->fontw_cache;
+	ffb->fontinc = pFfb->fontinc_cache;
+	pFfb->rp_active = 1;
+	FFBWait(pFfb, ffb);
+
+	/* Fixup the FBC/PPC caches to deal with actually using
+	 * a WID for every ROP.
+	 */
+	pFfb->fbc_cache = (FFB_FBC_WB_A | FFB_FBC_WM_COMBINED |
+			   FFB_FBC_RB_A | FFB_FBC_SB_BOTH | FFB_FBC_XE_ON |
+			   FFB_FBC_ZE_OFF | FFB_FBC_YE_OFF | FFB_FBC_RGBE_ON);
+	pFfb->ppc_cache &= ~FFB_PPC_XS_MASK;
+	pFfb->ppc_cache |= FFB_PPC_XS_WID;
+	pFfb->wid_cache = 0xff;
+	FFBFifo(pFfb, 8);
+	ffb->fbc = pFfb->fbc_cache;
+	ffb->ppc = FFB_PPC_XS_WID;
+	ffb->wid = pFfb->wid_cache;
+	ffb->xpmask = 0xff;
+	ffb->xclip = FFB_XCLIP_TEST_ALWAYS;
+	ffb->cmp = 0x80808080;
+	ffb->matchab = 0x80808080;
+	ffb->magnab = 0x80808080;
+	FFBWait(pFfb, ffb);
+}
+
+/* Multiplies and divides suck... */
+static void CreatorAlignTabInit(FFBPtr pFfb)
+{
+	struct fastfill_parms *ffp = &FFB_FFPARMS(pFfb);
+	short *tab = pFfb->Pf_AlignTab;
+	int i;
+
+	for(i = 0; i < 0x800; i++) {
+		int alignval;
+
+		alignval = (i / ffp->pagefill_width) * ffp->pagefill_width;
+		*tab++ = alignval;
+	}
+}
+
+static Bool
+CreatorPositionWindow(WindowPtr pWin, int x, int y)
+{
+	if (pWin->drawable.bitsPerPixel == 8)
+		return cfbPositionWindow(pWin, x, y);
+	else
+		return cfb32PositionWindow(pWin, x, y);
+}
+
+extern Bool CreatorCreateGC (GCPtr pGC);
+
+#ifdef DEBUG_FFB
+FILE *FDEBUG_FD = NULL;
+#endif
+
+BSFuncRec CreatorBSFuncRec = {
+    CreatorSaveAreas,
+    CreatorRestoreAreas,
+    (BackingStoreSetClipmaskRgnProcPtr) 0,
+    (BackingStoreGetImagePixmapProcPtr) 0,
+    (BackingStoreGetSpansPixmapProcPtr) 0,
+};
+
+Bool FFBAccelInit (ScreenPtr pScreen, FFBPtr pFfb)
+{
+	ffb_fbcPtr ffb;
+
+	if (serverGeneration != CreatorGeneration) {
+		CreatorScreenPrivateIndex = AllocateScreenPrivateIndex ();
+		if (CreatorScreenPrivateIndex == -1) return FALSE;
+		CreatorGCPrivateIndex = AllocateGCPrivateIndex ();
+		CreatorWindowPrivateIndex = AllocateWindowPrivateIndex ();
+		CreatorGeneration = serverGeneration;
+	}
+	
+	if (!AllocateGCPrivate(pScreen, CreatorGCPrivateIndex, sizeof(CreatorPrivGCRec)))
+		return FALSE;
+	if (!AllocateWindowPrivate(pScreen, CreatorWindowPrivateIndex, 0))
+		return FALSE;
+	pScreen->devPrivates[CreatorScreenPrivateIndex].ptr = pFfb;
+
+	pFfb->fifo_cache = 0;
+	ffb = pFfb->regs;
+
+	/* Replace various screen functions. */
+	pScreen->CreateGC = CreatorCreateGC;
+	pScreen->CreateWindow = CreatorCreateWindow;
+	pScreen->DestroyWindow = CreatorDestroyWindow;
+	pScreen->PositionWindow = CreatorPositionWindow;
+	pScreen->ChangeWindowAttributes = CreatorChangeWindowAttributes;
+	pScreen->PaintWindowBackground = CreatorPaintWindow;
+	pScreen->PaintWindowBorder = CreatorPaintWindow;
+	pScreen->GetSpans = CreatorGetSpans;
+	pScreen->CopyWindow = CreatorCopyWindow;
+	pScreen->GetImage = CreatorGetImage;
+	pScreen->BackingStoreFuncs = CreatorBSFuncRec;
+
+	/* cfb8_32wid took over this to init the WID plane,
+	 * and with how our code works that is not necessary.
+	 */
+	pScreen->WindowExposures = miWindowExposures;
+
+	/* Set FFB line-bias for clipping. */
+	miSetZeroLineBias(pScreen, OCTANT3 | OCTANT4 | OCTANT6 | OCTANT1);
+
+	FFB_DEBUG_init();
+	FDEBUG((FDEBUG_FD,
+		"FFB: cfg0(%08x) cfg1(%08x) cfg2(%08x) cfg3(%08x) ppcfg(%08x)\n",
+		ffb->fbcfg0, ffb->fbcfg1, ffb->fbcfg2, ffb->fbcfg3, ffb->ppcfg));
+
+	/* Determine the current screen resolution type.  This is
+	 * needed to figure out the fastfill/pagefill parameters.
+	 */
+	switch(ffb->fbcfg0 & FFB_FBCFG0_RES_MASK) {
+	default:
+	case FFB_FBCFG0_RES_STD:
+		pFfb->ffb_res = ffb_res_standard;
+		break;
+	case FFB_FBCFG0_RES_HIGH:
+		pFfb->ffb_res = ffb_res_high;
+		break;
+	case FFB_FBCFG0_RES_STEREO:
+		pFfb->ffb_res = ffb_res_stereo;
+		break;
+	case FFB_FBCFG0_RES_PRTRAIT:
+		pFfb->ffb_res = ffb_res_portrait;
+		break;
+	};
+	CreatorAlignTabInit(pFfb);
+
+	/* Next, determine the hwbug workarounds and feature enables
+	 * we should be using on this board.
+	 */
+	pFfb->disable_pagefill = 0;
+	pFfb->disable_vscroll = 0;
+	pFfb->has_brline_bug = 0;
+	pFfb->use_blkread_prefetch = 0;
+	if (pFfb->ffb_type == ffb1_prototype ||
+	    pFfb->ffb_type == ffb1_standard ||
+	    pFfb->ffb_type == ffb1_speedsort) {
+		pFfb->has_brline_bug = 1;
+		if (pFfb->ffb_res == ffb_res_high)
+			pFfb->disable_vscroll = 1;
+		if (pFfb->ffb_res == ffb_res_high ||
+		    pFfb->ffb_res == ffb_res_stereo)
+			pFfb->disable_pagefill = 1;
+
+	} else {
+		/* FFB2 has blkread prefetch.  AFB supposedly does too
+		 * but the chip locks up on me when I try to use it. -DaveM
+		 */
+#define AFB_PREFETCH_IS_BUGGY	1
+		if (!AFB_PREFETCH_IS_BUGGY ||
+		    (pFfb->ffb_type != afb_m3 &&
+		     pFfb->ffb_type != afb_m6)) {
+			pFfb->use_blkread_prefetch = 1;
+		}
+		/* XXX I still cannot get page/block fast fills
+		 * XXX to work reliably on any of my AFB boards. -DaveM
+		 */
+#define AFB_FASTFILL_IS_BUGGY	1
+		if (AFB_FASTFILL_IS_BUGGY &&
+		    (pFfb->ffb_type == afb_m3 ||
+		     pFfb->ffb_type == afb_m6))
+			pFfb->disable_pagefill = 1;
+	}
+	pFfb->disable_fastfill_ap = 0;
+	if (pFfb->ffb_res == ffb_res_stereo ||
+	    pFfb->ffb_res == ffb_res_high)
+		pFfb->disable_fastfill_ap = 1;
+
+	pFfb->ppc_cache = (FFB_PPC_FW_DISABLE |
+			   FFB_PPC_VCE_DISABLE | FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST |
+			   FFB_PPC_XS_CONST | FFB_PPC_YS_CONST | FFB_PPC_ZS_CONST |
+			   FFB_PPC_DCE_DISABLE | FFB_PPC_ABE_DISABLE | FFB_PPC_TBE_OPAQUE);
+
+	pFfb->pmask_cache = ~0;
+	pFfb->rop_cache = (FFB_ROP_ZERO | (FFB_ROP_NEW << 8));
+	pFfb->drawop_cache = FFB_DRAWOP_RECTANGLE;
+	pFfb->fg_cache = pFfb->bg_cache = 0;
+	pFfb->fontw_cache = 32;
+	pFfb->fontinc_cache = (1 << 16) | 0;
+	pFfb->fbc_cache = (FFB_FBC_WB_A | FFB_FBC_WM_COMBINED |
+			   FFB_FBC_RB_A | FFB_FBC_SB_BOTH | FFB_FBC_XE_OFF |
+			   FFB_FBC_ZE_OFF | FFB_FBC_YE_OFF | FFB_FBC_RGBE_MASK);
+	pFfb->laststipple = NULL;
+
+	/* We will now clear the screen: we'll draw a rectangle covering all the
+	 * viewscreen, using a 'blackness' ROP.
+	 */
+	FFBFifo(pFfb, 13);
+	ffb->fbc = pFfb->fbc_cache;
+	ffb->ppc = pFfb->ppc_cache;
+	ffb->pmask = pFfb->pmask_cache;
+	ffb->rop = pFfb->rop_cache;
+	ffb->drawop = pFfb->drawop_cache;
+	ffb->fg = pFfb->fg_cache;
+	ffb->bg = pFfb->bg_cache;
+	ffb->fontw = pFfb->fontw_cache;
+	ffb->fontinc = pFfb->fontinc_cache;
+	FFB_WRITE64(&ffb->by, 0, 0);
+	FFB_WRITE64_2(&ffb->bh, pFfb->psdp->height, pFfb->psdp->width);
+	pFfb->rp_active = 1;
+	FFBWait(pFfb, ffb);
+	
+	/* Fixup the FBC/PPC caches to deal with actually using
+	 * a WID for every ROP.
+	 */
+	pFfb->fbc_cache = (FFB_FBC_WB_A | FFB_FBC_WM_COMBINED |
+			   FFB_FBC_RB_A | FFB_FBC_SB_BOTH | FFB_FBC_XE_ON |
+			   FFB_FBC_ZE_OFF | FFB_FBC_YE_OFF | FFB_FBC_RGBE_ON);
+	pFfb->ppc_cache &= ~FFB_PPC_XS_MASK;
+	pFfb->ppc_cache |= FFB_PPC_XS_WID;
+	pFfb->wid_cache = 0xff;
+	FFBFifo(pFfb, 8);
+	ffb->fbc = pFfb->fbc_cache;
+	ffb->ppc = FFB_PPC_XS_WID;
+	ffb->wid = pFfb->wid_cache;
+	ffb->xpmask = 0xff;
+	ffb->xclip = FFB_XCLIP_TEST_ALWAYS;
+	ffb->cmp = 0x80808080;
+	ffb->matchab = 0x80808080;
+	ffb->magnab = 0x80808080;
+	FFBWait(pFfb, ffb);
+
+	/* Success */
+	return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_asm.s
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_asm.s:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_asm.s	Thu May 18 16:21:35 2000
@@ -0,0 +1,349 @@
+/*
+ * ffb_asm.s: Fast Creator raster op inner loops.
+ *
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_asm.s,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
+
+/* Hardware register offsets */
+#define FFB_BY		0x0060
+#define FFB_DY		0x0068
+#define FFB_BH		0x0070
+#define FFB_PPC		0x0200
+#define FFB_DRAWOP	0x0300
+#define FFB_UCSR	0x0900
+
+#define FFB_DRAWOP_VSCROLL	0x0b
+
+#define FIFO_CACHE	0x00
+
+#define BOX_X1		0x00
+#define BOX_Y1		0x02
+#define BOX_X2		0x04
+#define BOX_Y2		0x06
+
+#define POINT_X		0x00
+#define POINT_Y		0x02
+
+#define RECT_X		0x00
+#define RECT_Y		0x02
+#define RECT_W		0x04
+#define RECT_H		0x06
+
+#define SEG_X1		0x00
+#define SEG_Y1		0x02
+#define SEG_X2		0x04
+#define SEG_Y2		0x06
+
+	.text
+
+	.align	32
+	.globl	FFB_STIPPLE_LOAD
+	/* %o0 = &ffbregs->pattern[0]
+	 * %o1 = &stipple->bits[0]
+	 */
+FFB_STIPPLE_LOAD:
+	cmp	%g0, 0
+1:	ldx	[%o1 + 0x00], %g1
+	ldx	[%o1 + 0x08], %g2
+	ldx	[%o1 + 0x10], %g3
+
+	ldx	[%o1 + 0x18], %g4
+	add	%o0, 0x40, %o0
+	ldx	[%o1 + 0x20], %g5
+	ldx	[%o1 + 0x28], %o2
+
+	ldx	[%o1 + 0x30], %o3
+	ldx	[%o1 + 0x38], %o4
+	stx	%g1, [%o0 - 0x40]
+	stx	%g2, [%o0 - 0x38]
+
+	stx	%g3, [%o0 - 0x30]
+	stx	%g4, [%o0 - 0x28]
+	add	%o1, 0x40, %o1
+	stx	%g5, [%o0 - 0x20]
+
+	stx	%o2, [%o0 - 0x18]
+	stx	%o3, [%o0 - 0x10]
+	stx	%o4, [%o0 - 0x08]
+	be,pt	%icc, 1b
+
+	 cmp	%g0, 1
+	retl
+	 nop
+
+#define	FIFO_WAIT(ffbregs, goal, this_label, done_label) \
+this_label: \
+	lduw	[ffbregs + FFB_UCSR], %g1; \
+	and	%g1, 0xfff, %g1; \
+	subcc	%g1, (4 + goal), %g1; \
+	bge,pt	%icc, done_label; \
+	 nop; \
+	ba,a,pt	%xcc, this_label
+
+	.align	32
+	.globl	FFB_PPT_BOX_LOOP
+	/* This is only used (currently) by vscroll, so we put
+	 * the creator hwbug workaround in here (writing
+	 * the drawop each iteration).
+	 *
+	 * %o0 = ffbpriv, %o1 = ffbregs,
+	 * %o2 = pbox, %o3 = pbox_last, %o4 = ppt
+	 */
+FFB_PPT_BOX_LOOP:
+	lduh	[%o0 + FIFO_CACHE], %g1	/* Load		Group		*/
+	sethi	%hi(FFB_DRAWOP), %g2	/* IEU0				*/
+	cmp	%o2, %o3		/* IEU1				*/
+	bgu,pn	%icc, 2f		/* CTI				*/
+
+	 or	%g2,%lo(FFB_DRAWOP),%g2	/* IEU0		Group		*/
+1:	lduh	[%o4 + POINT_X], %g3	/* Load		Group		*/
+	lduh	[%o4 + POINT_Y], %g4	/* Load		Group		*/
+	lduh	[%o2 + BOX_Y2], %g5	/* Load		Group		*/
+
+	lduh	[%o2 + BOX_Y1], %o5	/* Load		Group		*/
+	sllx	%g4, 32, %g4		/* IEU0				*/
+	or	%g3, %g4, %g3		/* IEU0		Group		*/
+	sub	%g5, %o5, %g5		/* IEU1				*/
+
+	sllx	%o5, 32, %g4		/* IEU0		Group		*/
+	sllx	%g5, 32, %g5		/* IEU0		Group		*/
+	lduh	[%o2 + BOX_X2], %o5	/* Load				*/
+	add	%o4, 0x4, %o4		/* IEU1				*/
+
+	lduh	[%o2 + BOX_X1], %g7	/* Load		Group		*/
+	add	%o2, 0x8, %o2		/* IEU0				*/
+	sub	%o5, %g7, %o5		/* IEU0		Group		*/
+	or	%g4, %g7, %g4		/* IEU1				*/
+
+	or	%g5, %o5, %g5		/* IEU0		Group		*/
+	subcc	%g1, 7, %g1		/* IEU1				*/
+	bl,pn	%icc, FFB_PPT_BOX_WAIT	/* CTI				*/
+9:	 cmp	%o2, %o3		/* IEU1		Group		*/
+
+	/* This works around BUG ID 1189858 -DaveM */
+	mov	FFB_DRAWOP_VSCROLL, %o5	/* IEU0				*/
+	stw	%o5, [%o1 + %g2]	/* STORE			*/
+	stx	%g3, [%o1 + FFB_BY]	/* STORE	Group		*/
+	stx	%g4, [%o1 + FFB_DY]	/* STORE	Group		*/
+
+	bleu,pt	%icc, 1b		/* CTI				*/
+	 stx	%g5, [%o1 + FFB_BH]	/* STORE	Group		*/
+2:	retl				/* CTI		Group		*/
+	 sth	%g1, [%o0 + FIFO_CACHE]	/* STORE			*/
+
+	FIFO_WAIT(%o1, 7, FFB_PPT_BOX_WAIT, 9b)
+
+	.align	32
+	.globl	FFB_BOX_LOOP
+	/* %o0 = ffbpriv, %o1 = ffbregs,
+	 * %o2 = pbox, %o3 = pbox_last
+	 */
+FFB_BOX_LOOP:
+	lduh	[%o0 + FIFO_CACHE], %g1	/* Load		Group		*/
+	cmp	%o2, %o3		/* IEU0				*/
+	bgu,pn	%icc, 2f		/* CTI				*/
+	 nop				/* IEU0		Group		*/
+
+1:	lduw	[%o2 + BOX_X1], %g4	/* Load		Group		*/
+	lduw	[%o2 + BOX_X2], %g3	/* Load		Group		*/
+	sllx	%g4, 32, %o5		/* IEU0				*/
+	srl	%g4, 16, %g7		/* IEU0		Group		*/
+
+	add	%o2, 8, %o2		/* IEU1				*/
+	sllx	%g3, 32, %g5		/* IEU0		Group		*/
+	subcc	%g1, 4, %g1		/* IEU1				*/
+	srl	%g3, 16, %o4		/* IEU0		Group		*/
+
+	or	%o5, %g7, %o5		/* IEU1				*/
+	or	%g5, %o4, %g5		/* IEU0		Group		*/
+	bl,pn	%icc, FFB_BOX_WAIT	/* CTI				*/
+	 sub	%g5, %o5, %g5		/* IEU0		Group		*/
+
+9:	cmp	%o2, %o3		/* IEU1				*/
+	stx	%o5, [%o1 + FFB_BY]	/* Store			*/
+	bleu,pt	%icc, 1b		/* CTI		Group		*/
+	 stx	%g5, [%o1 + FFB_BH]	/* Store			*/
+2:	retl				/* CTI		Group		*/
+	 sth	%g1, [%o0 + FIFO_CACHE]	/* Store			*/
+
+	FIFO_WAIT(%o1, 4, FFB_BOX_WAIT, 9b)
+
+	.align	32
+	.globl	FFB_RECT_LOOP
+	/* %o0 = ffbpriv, %o1 = ffbregs,
+	 * %o2 = prect, %o3 = prect_last,
+	 * %o4 = xOrg, %o5 = yOrg
+	 */
+FFB_RECT_LOOP:
+	lduh	[%o0 + FIFO_CACHE], %g1	/* Load		Group		*/
+	sllx	%o5, 32, %o5		/* IEU0				*/
+	cmp	%o2, %o3		/* IEU1				*/
+	bgu,pn	%icc, 2f		/* CTI				*/
+
+	 or	%o4, %o5, %o4		/* IEU0		Group		*/
+1:	lduh	[%o2 + RECT_X], %g4	/* Load		Group		*/
+	lduh	[%o2 + RECT_Y], %o5	/* Load		Group		*/
+	lduh	[%o2 + RECT_W], %g3	/* Load		Group		*/
+
+	lduh	[%o2 + RECT_H], %g2	/* Load		Group		*/
+	sllx	%o5, 32, %g7		/* IEU0				*/
+	add	%o2, 8, %o2		/* IEU1				*/
+	orcc	%g7, %g4, %g7		/* IEU1		Group		*/
+
+	sllx	%g2, 32, %g5		/* IEU0				*/
+	or	%g5, %g3, %g5		/* IEU0		Group		*/
+	add	%g7, %o4, %g7		/* IEU1				*/
+	subcc	%g1, 4, %g1		/* IEU1		Group		*/
+
+	bl,pn	%icc, FFB_RECT_WAIT	/* CTI				*/
+9:	 cmp	%o2, %o3		/* IEU1		Group		*/
+	stx	%g7, [%o1 + FFB_BY]	/* Store			*/
+	bleu,pt	%icc, 1b		/* CTI				*/
+
+	 stx	%g5, [%o1 + FFB_BH]	/* Store	Group		*/
+2:	retl				/* CTI		Group		*/
+	 sth	%g1, [%o0 + FIFO_CACHE]	/* Store			*/
+
+	FIFO_WAIT(%o1, 4, FFB_RECT_WAIT, 9b)
+
+	.align	32
+	.globl	FFB_PPT_WIDTH_LOOP
+	/* %o0 = ffbpriv, %o1 = ffbregs,
+	 * %o2 = ppt, %o3 = ppt_last,
+	 * %o4 = pwidth
+	 */
+FFB_PPT_WIDTH_LOOP:
+	lduh	[%o0 + FIFO_CACHE], %g1	/* Load		Group		*/
+	cmp	%o2, %o3		/* IEU1				*/
+	bgu,pn	%icc, 2f		/* CTI				*/
+	 nop
+
+8:	lduw	[%o2 + POINT_X], %g4	/* Load		Group		*/
+	lduw	[%o4], %g2		/* Load		Group		*/
+	sllx	%g4, 32, %g7
+1:	srl	%g4, 16, %g5		/* IEU0		Group		*/
+
+	add	%o2, 4, %o2		/* IEU1				*/
+	brz,pn	%g2, 8b			/* CTI+IEU1	Group		*/
+	 add	%o4, 4, %o4		/* IEU0				*/
+	or	%g5, %g7, %g7		/* IEU0		Group		*/
+
+	subcc	%g1, 5, %g1		/* IEU1				*/
+	bl,pn	%icc, FFB_PPT_WIDTH_WAIT/* CTI				*/
+	 add	%g7, %g2, %o5		/* IEU0		Group		*/
+9:	stw	%g0, [%o1 + FFB_PPC]	/* Store	Group		*/
+
+	cmp	%o2, %o3		/* IEU1				*/
+	stx	%g7, [%o1 + FFB_BY]	/* Store	Group		*/
+	bleu,pt	%icc, 8b		/* CTI				*/
+	 stx	%o5, [%o1 + FFB_BH]	/* Store	Group		*/
+
+2:	retl				/* CTI		Group		*/
+	 sth	%g1, [%o0 + FIFO_CACHE]	/* Store			*/
+
+	FIFO_WAIT(%o1, 5, FFB_PPT_WIDTH_WAIT, 9b)
+
+	.align	32
+	.globl	FFB_LINE_LOOP1
+	/* %o0 = ffbpriv, %o1 = ffbregs,
+	 * %o2 = ppt, %o3 = ppt_last,
+	 * %o4 = xOrg, %o5 = yOrg
+	 *
+	 * We return ppt_last + 1.
+	 */
+FFB_LINE_LOOP1:
+	lduh	[%o0 + FIFO_CACHE], %g1
+	sllx	%o5, 32, %o5
+	and	%o4, 0x7ff, %o4
+	cmp	%o2, %o3
+
+	bgu,pn	%icc, 2f
+	 or	%o4, %o5, %o4
+1:	lduw	[%o2 + POINT_X], %g4
+	sllx	%g4, 32, %g7
+
+	srl	%g4, 16, %g3
+	add	%o2, 4, %o2
+	or	%g7, %g3, %g7
+	subcc	%g1, 3, %g1
+ 
+	bl,pn	%icc, FFB_LINE1_WAIT
+	 add	%g7, %o4, %g7
+9:	cmp	%o2, %o3
+	stw	%g0, [%o1 + FFB_PPC]
+
+	bleu,pt	%icc, 1b
+	 stx	%g7, [%o1 + FFB_BH]
+2:	nop
+	sth	%g1, [%o0 + FIFO_CACHE]
+
+	retl
+	 mov	%o2, %o0
+
+	FIFO_WAIT(%o1, 3, FFB_LINE1_WAIT, 9b)
+
+	.align	32
+	.globl	FFB_LINE_LOOP2
+	/* %o0 = ffbpriv, %o1 = ffbregs,
+	 * %o2 = ppt, %o3 = ppt_last,
+	 * %o4 = &xOrg, %o5 = &yOrg
+	 *
+	 * We return ppt_last + 1.
+	 * The only difference between the previous routine
+	 * is that here we accumulate the origin values.
+	 */
+FFB_LINE_LOOP2:
+	lduw	[%o5], %g5
+	lduw	[%o4], %g2
+	lduh	[%o0 + FIFO_CACHE], %g1
+	sllx	%g5, 32, %g5
+
+	and	%g2, 0x7ff, %g2
+	cmp	%o2, %o3
+	bgu,pn	%icc, 2f
+	 or	%g5, %g2, %g5
+
+1:	lduw	[%o2 + POINT_X], %g4
+	sllx	%g4, 32, %g7
+	srl	%g4, 16, %g3
+	add	%o2, 4, %o2
+ 
+	or	%g7, %g3, %g7
+	subcc	%g1, 3, %g1
+	bl,pn	%icc, FFB_LINE2_WAIT
+	 add	%g7, %g5, %g5
+
+9:	cmp	%o2, %o3
+	stw	%g0, [%o1 + FFB_PPC]
+	bleu,pt	%icc, 1b
+	 stx	%g5, [%o1 + FFB_BH]
+
+2:	sth	%g1, [%o0 + FIFO_CACHE]
+	srlx	%g5, 32, %g4
+	stw	%g5, [%o4]
+	stw	%g4, [%o5]
+
+	retl
+	 mov	%o2, %o0
+
+	FIFO_WAIT(%o1, 3, FFB_LINE2_WAIT, 9b)
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_attr.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_attr.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_attr.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,256 @@
+/*
+ * Attribute setting for the Creator and Creator3D framebuffer.
+ *
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_attr.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_fifo.h"
+#include "ffb_rcache.h"
+
+/* If we're going to write any attributes, write them all. */
+void __FFB_Attr_Raw(FFBPtr pFfb, unsigned int ppc, unsigned int ppc_mask,
+		    unsigned int pmask, unsigned int rop,
+		    int drawop, int fg, unsigned int fbc, unsigned int wid)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	FFBLOG(("WRATTRS_RAW: PPC[%08x:%08x] PMSK[%08x] ROP[%08x] DOP[%08x] FG[%08x] FBC[%08x] WID[%02x]\n",
+		ppc, ppc_mask, pmask, rop, drawop, fg, fbc, wid));
+	pFfb->ppc_cache &= ~ppc_mask;
+	pFfb->ppc_cache |= ppc;
+	pFfb->fg_cache = fg;
+	pFfb->fbc_cache = fbc;
+	pFfb->wid_cache = wid;
+	pFfb->rop_cache = rop;
+	pFfb->pmask_cache = pmask;
+	pFfb->drawop_cache = drawop;
+	pFfb->rp_active = 1;
+	FFBFifo(pFfb, 7);
+	ffb->ppc = ppc;
+	ffb->fg = fg;
+	ffb->fbc = fbc;
+	ffb->wid = wid;
+	ffb->rop = rop;
+	ffb->pmask = pmask;
+	ffb->drawop = drawop;
+}
+
+void __FFB_Attr_SFB_VAR(FFBPtr pFfb, unsigned int ppc, unsigned int ppc_mask, unsigned int fbc,
+			unsigned int wid, unsigned int rop, unsigned int pmask)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	FFBLOG(("WRATTRS_SFBVAR: PPC[%08x:%08x] PMSK[%08x] ROP[%08x] FBC[%08x] WID[%02x]\n",
+		ppc, ppc_mask, pmask, rop, fbc, wid));
+	pFfb->ppc_cache &= ~ppc_mask;
+	pFfb->ppc_cache |= ppc;
+	pFfb->fbc_cache = fbc;
+	pFfb->wid_cache = wid;
+	pFfb->rop_cache = rop;
+	pFfb->pmask_cache = pmask;
+	pFfb->rp_active = 1;
+	FFBFifo(pFfb, 5);
+	ffb->ppc = ppc;
+	ffb->fbc = fbc;
+	ffb->wid = wid;
+	ffb->rop = rop;
+	ffb->pmask = pmask;
+}
+
+#define NEED_PPC	0x00000001
+#define NEED_PMASK	0x00000002
+#define NEED_ROP	0x00000004
+#define NEED_DRAWOP	0x00000008
+#define NEED_FG		0x00000010
+#define NEED_BG		0x00000020
+#define NEED_FBC	0x00000040
+#define NEED_WID	0x00000080
+
+void __FFB_Attr_GC(FFBPtr pFfb, GCPtr pGC, WindowPtr pWin, unsigned int ppc, int drawop)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+	unsigned int rop, need_mask, need_count;
+
+	need_mask = need_count = 0;
+	if ((pFfb->ppc_cache & FFB_PPC_GCMASK) != ppc) {
+		unsigned int newppc = pFfb->ppc_cache & ~FFB_PPC_GCMASK;
+
+		newppc |= (ppc & FFB_PPC_GCMASK);
+		pFfb->ppc_cache = newppc;
+		need_mask |= NEED_PPC;
+		need_count++;
+	}
+
+	if (pFfb->pmask_cache != pGC->planemask) {
+		pFfb->pmask_cache = pGC->planemask;
+		need_mask |= NEED_PMASK;
+		need_count++;
+	}
+
+	rop = (pGC->alu | FFB_ROP_EDIT_BIT)|(FFB_ROP_NEW<<8);
+	if (pFfb->rop_cache != rop) {
+		pFfb->rop_cache = rop;
+		need_mask |= NEED_ROP;
+		need_count++;
+	}
+
+	if (pFfb->drawop_cache != drawop) {
+		pFfb->drawop_cache = drawop;
+		need_mask |= NEED_DRAWOP;
+		need_count++;
+	}
+
+	if (pFfb->fg_cache != pGC->fgPixel) {
+		pFfb->fg_cache = pGC->fgPixel;
+		need_mask |= NEED_FG;
+		need_count++;
+	}
+
+	{
+		CreatorPrivWinPtr WinPriv = CreatorGetWindowPrivate(pWin);
+		unsigned int fbc = WinPriv->fbc_base;
+
+		fbc &= ~FFB_FBC_XE_MASK;
+		fbc |= FFB_FBC_XE_OFF;
+
+		if (pFfb->fbc_cache != fbc) {
+			pFfb->fbc_cache = fbc;
+			need_mask |= NEED_FBC;
+			need_count++;
+		}
+
+	}
+	pFfb->rp_active = 1;
+
+	FFBLOG(("WRATTRS_GC: PPC[%08x:%08x] PMSK[%08x] ROP[%08x] "
+		"DOP[%08x] FG[%08x] FBC[%08x]\n",
+		pFfb->ppc_cache & FFB_PPC_GCMASK, FFB_PPC_GCMASK,
+		pFfb->pmask_cache, pFfb->rop_cache,
+		pFfb->drawop_cache, pFfb->fg_cache, pFfb->fbc_cache));
+
+	FFBFifo(pFfb, need_count);
+	if (need_mask & NEED_PPC)
+		ffb->ppc = (pFfb->ppc_cache & FFB_PPC_GCMASK);
+	if (need_mask & NEED_PMASK)
+		ffb->pmask = pFfb->pmask_cache;
+	if (need_mask & NEED_ROP)
+		ffb->rop = pFfb->rop_cache;
+	if (need_mask & NEED_DRAWOP)
+		ffb->drawop = pFfb->drawop_cache;
+	if (need_mask & NEED_FG)
+		ffb->fg = pFfb->fg_cache;
+	if (need_mask & NEED_FBC)
+		ffb->fbc = pFfb->fbc_cache;
+}
+
+void __FFB_Attr_FastfillWin(FFBPtr pFfb, WindowPtr pWin,
+			    unsigned int ppc, unsigned int pixel)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+	unsigned int rop, need_mask, need_count;
+
+	need_mask = need_count = 0;
+	if ((pFfb->ppc_cache & FFB_PPC_WINMASK) != ppc) {
+		unsigned int newppc = pFfb->ppc_cache & ~FFB_PPC_WINMASK;
+
+		newppc |= (ppc & FFB_PPC_WINMASK);
+		pFfb->ppc_cache = newppc;
+		need_mask |= NEED_PPC;
+		need_count++;
+	}
+
+	if (pFfb->pmask_cache != 0x00ffffff) {
+		pFfb->pmask_cache = 0x00ffffff;
+		need_mask |= NEED_PMASK;
+		need_count++;
+	}
+
+	rop = FFB_ROP_NEW | (FFB_ROP_NEW<<8);
+	if (pFfb->rop_cache != rop) {
+		pFfb->rop_cache = rop;
+		need_mask |= NEED_ROP;
+		need_count++;
+	}
+
+	if (pFfb->drawop_cache != FFB_DRAWOP_FASTFILL) {
+		pFfb->drawop_cache = FFB_DRAWOP_FASTFILL;
+		need_mask |= NEED_DRAWOP;
+		need_count++;
+	}
+
+	if (pFfb->fg_cache != pixel) {
+		pFfb->fg_cache = pixel;
+		need_mask |= NEED_FG;
+		need_count++;
+	}
+
+	{
+		CreatorPrivWinPtr pWinPriv = CreatorGetWindowPrivate(pWin);
+		unsigned int fbc = pWinPriv->fbc_base;
+
+		if (pFfb->has_double_buffer) {
+			fbc &= ~FFB_FBC_WB_MASK;
+			fbc |= FFB_FBC_WB_AB;
+		}
+		fbc &= ~(FFB_FBC_XE_MASK | FFB_FBC_RGBE_MASK);
+		fbc |= FFB_FBC_XE_ON | FFB_FBC_RGBE_ON;
+		if (pFfb->ffb_res == ffb_res_high)
+			fbc |= FFB_FBC_WB_B;
+
+		if (pFfb->fbc_cache != fbc) {
+			pFfb->fbc_cache = fbc;
+			need_mask |= NEED_FBC;
+			need_count++;
+		}
+
+		if (pFfb->wid_cache != pWinPriv->wid) {
+			pFfb->wid_cache = pWinPriv->wid;
+			need_mask |= NEED_WID;
+			need_count++;
+		}
+	}
+
+	pFfb->rp_active = 1;
+
+	FFBLOG(("WRATTRS_GC: PPC[%08x:%08x] PMSK[%08x] ROP[%08x] DOP[%08x] FG[%08x] FBC[%08x] WID[%02x]\n",
+		pFfb->ppc_cache & FFB_PPC_WINMASK, FFB_PPC_WINMASK,
+		pFfb->pmask_cache, pFfb->rop_cache,
+		pFfb->drawop_cache, pFfb->fg_cache, pFfb->fbc_cache, pFfb->wid_cache));
+
+	FFBFifo(pFfb, need_count);
+	if (need_mask & NEED_PPC)
+		ffb->ppc = (pFfb->ppc_cache & FFB_PPC_WINMASK);
+	if (need_mask & NEED_PMASK)
+		ffb->pmask = pFfb->pmask_cache;
+	if (need_mask & NEED_ROP)
+		ffb->rop = pFfb->rop_cache;
+	if (need_mask & NEED_DRAWOP)
+		ffb->drawop = pFfb->drawop_cache;
+	if (need_mask & NEED_FG)
+		ffb->fg = pFfb->fg_cache;
+	if (need_mask & NEED_FBC)
+		ffb->fbc = pFfb->fbc_cache;
+	if (need_mask & NEED_WID)
+		ffb->wid = pFfb->wid_cache;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_bcopy.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_bcopy.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_bcopy.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,561 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Bit-blit copies.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_bcopy.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_loops.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+#include "cfb8_32wid.h"
+
+#ifdef FFB_BLOCKCOPY_IMPLEMENTED
+/* Due to VIS based copyarea and ffb rop vertscroll being significantly faster
+ * than the blockcopy rop, blockcopy was not implemented at all in the final
+ * FFB hardware design.  This code is left here for hack value.  -DaveM
+ */
+#error To use it, we would need to fix this to use WIDs in FFB attributes -DaveM
+void
+CreatorDoHWBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst,
+		  DDXPointPtr pptSrc, unsigned long planemask)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pSrc->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	BoxPtr pboxTmp;
+	DDXPointPtr pptTmp;
+	int nbox;
+	BoxPtr pboxNext, pboxBase, pbox;
+
+	nbox = REGION_NUM_RECTS(prgnDst);
+	pbox = REGION_RECTS(prgnDst);
+
+	FFB_WRITE_ATTRIBUTES(pFfb,
+			     FFB_PPC_ACE_DISABLE|FFB_PPC_APE_DISABLE|FFB_PPC_CS_CONST,
+			     FFB_PPC_ACE_MASK|FFB_PPC_APE_MASK|FFB_PPC_CS_MASK,
+			     planemask,
+			     FFB_ROP_NEW,
+			     FFB_DRAWOP_BCOPY, pFfb->fg_cache,
+			     FFB_FBC_DEFAULT);
+	
+	/* need to blit rectangles in different orders, depending on the direction of copy
+           so that an area isnt overwritten before it is blitted */
+	if (pptSrc->y < pbox->y1 && nbox > 1) {
+		if (pptSrc->x < pbox->x1) {
+			pboxTmp = pbox + nbox;
+			pptTmp = pptSrc + nbox;
+			while(nbox--) {
+				pboxTmp--;
+				pptTmp--;
+				FFBFifo(pFfb, 6);
+				FFB_WRITE64(&ffb->by, pptTmp->y, pptTmp->x);
+				FFB_WRITE64_2(&ffb->dy, pboxTmp->y1, pboxTmp->x1);
+				FFB_WRITE64_3(&ffb->bh,
+					      (pboxTmp->y2 - pboxTmp->y1),
+					      (pboxTmp->x2 - pboxTmp->x1));
+			}
+		} else {
+			/* keep ordering in each band, reverse order of bands */
+			pboxBase = pboxNext = pbox+nbox-1;
+			
+			while (pboxBase >= pbox) { /* for each band */
+				/* find first box in band */
+				while (pboxNext >= pbox && pboxBase->y1 == pboxNext->y1)
+					pboxNext--;
+		
+				pboxTmp = pboxNext + 1;			/* first box in band */
+				pptTmp = pptSrc + (pboxTmp - pbox);	/* first point in band */
+		
+				while (pboxTmp <= pboxBase) { /* for each box in band */
+					FFBFifo(pFfb, 6);
+					FFB_WRITE64(&ffb->by, pptTmp->y, pptTmp->x);
+					FFB_WRITE64_2(&ffb->dy, pboxTmp->y1, pboxTmp->x1);
+					FFB_WRITE64_3(&ffb->bh,
+						      (pboxTmp->y2 - pboxTmp->y1),
+						      (pboxTmp->x2 - pboxTmp->x1));
+					++pboxTmp;
+					++pptTmp;	
+				}
+				pboxBase = pboxNext;
+			}
+		}
+	} else {
+		if((pptSrc->x < pbox->x1) && (nbox > 1)) {
+			pboxBase = pboxNext = pbox;
+			while(pboxBase < pbox+nbox) {
+				while((pboxNext<pbox+nbox) &&
+				      (pboxNext->y1 == pboxBase->y1))
+					pboxNext++;
+				pboxTmp = pboxNext;
+				pptTmp = pptSrc + (pboxTmp - pbox);
+				while(pboxTmp != pboxBase) {
+					--pboxTmp;
+					--pptTmp;
+					FFBFifo(pFfb, 6);
+					FFB_WRITE64(&ffb->by, pptTmp->y, pptTmp->x);
+					FFB_WRITE64_2(&ffb->dy, pboxTmp->y1, pboxTmp->x1);
+					FFB_WRITE64_3(&ffb->bh,
+						      (pboxTmp->y2 - pboxTmp->y1),
+						      (pboxTmp->x2 - pboxTmp->x1));
+				}
+				pboxBase = pboxNext;
+			}
+		} else {
+			/* dont need to change order of anything */
+			pptTmp = pptSrc;
+			pboxTmp = pbox;
+	    
+			while (nbox--) {
+				FFBFifo(pFfb, 6);
+				FFB_WRITE64(&ffb->by, pptTmp->y, pptTmp->x);
+				FFB_WRITE64_2(&ffb->dy, pboxTmp->y1, pboxTmp->x1);
+				FFB_WRITE64_3(&ffb->bh,
+					      (pboxTmp->y2 - pboxTmp->y1),
+					      (pboxTmp->x2 - pboxTmp->x1));
+				pboxTmp++;
+				pptTmp++;
+			}
+		}
+	}
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+#endif /* FFB_BLOCKCOPY_IMPLEMENTED */
+
+/* We know here that only y is changing and that the hw attributes
+ * have been set higher up in the call chain.
+ */
+void
+CreatorDoVertBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst,
+		    DDXPointPtr pptSrc, unsigned long planemask)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pSrc->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	BoxPtr pbox;
+	int nbox;
+
+	pbox = REGION_RECTS(prgnDst);
+	nbox = REGION_NUM_RECTS(prgnDst);
+
+	/* No garbage please. */
+	if(nbox <= 0)
+		return;
+
+	FFBLOG(("VSCROLL(%d): ", nbox));
+
+	/* Need to blit rectangles in different orders, depending
+	 * on the direction of copy so that an area isnt overwritten
+	 * before it is blitted.
+	 */
+	if (nbox > 1 && pptSrc->y < pbox->y1) {
+		BoxPtr pboxBase = pbox + nbox - 1;
+		BoxPtr pboxNext = pboxBase;
+
+		/* Keep ordering in each band, reverse order of bands. */
+		while (pboxBase >= pbox) { /* for each band */
+			BoxPtr pboxTmp;
+			DDXPointPtr pptTmp;
+
+			/* find first box in band */
+			while (pboxNext >= pbox && pboxBase->y1 == pboxNext->y1)
+				pboxNext--;
+		
+			pboxTmp = pboxNext + 1;			/* first box in band */
+			pptTmp = pptSrc + (pboxTmp - pbox);	/* first point in band */
+			while (pboxTmp <= pboxBase) {
+				FFBLOG(("1[%08x:%08x:%08x:%08x:%08x:%08x] ",
+					pptTmp->x, pptTmp->y, pboxTmp->x1, pboxTmp->y1,
+					pboxTmp->x2, pboxTmp->y2));
+				FFBFifo(pFfb, 7);
+				ffb->drawop = FFB_DRAWOP_VSCROLL;
+				FFB_WRITE64(&ffb->by, pptTmp->y, pptTmp->x);
+				FFB_WRITE64_2(&ffb->dy, pboxTmp->y1, pboxTmp->x1);
+				FFB_WRITE64_3(&ffb->bh, (pboxTmp->y2 - pboxTmp->y1),
+					      (pboxTmp->x2 - pboxTmp->x1));
+				pboxTmp++;
+				pptTmp++;
+			}
+			pboxBase = pboxNext;
+		}
+	} else {
+		/* Dont need to change order of anything. */
+		while (nbox--) {
+			FFBLOG(("2[%08x:%08x:%08x:%08x:%08x:%08x] ",
+				pptSrc->x, pptSrc->y, pbox->x1, pbox->y1,
+				pbox->x2, pbox->y2));
+			FFBFifo(pFfb, 7);
+			ffb->drawop = FFB_DRAWOP_VSCROLL;
+			FFB_WRITE64(&ffb->by, pptSrc->y, pptSrc->x);
+			FFB_WRITE64_2(&ffb->dy, pbox->y1, pbox->x1);
+			FFB_WRITE64_3(&ffb->bh, (pbox->y2 - pbox->y1),
+				      (pbox->x2 - pbox->x1));
+			pbox++;
+			pptSrc++;
+		}
+	}
+	pFfb->rp_active = 1;
+	FFBLOG(("done\n"));
+	FFBSync(pFfb, ffb);
+}
+
+extern void VISmoveImageLR(unsigned char *, unsigned char *, long, long, long, long);
+extern void VISmoveImageRL(unsigned char *, unsigned char *, long, long, long, long);
+
+/* The hw attributes have been set by someone higher up in the call
+ * chain.
+ */
+void
+CreatorDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst,
+		DDXPointPtr pptSrc, unsigned long planemask)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDst->pScreen);
+	BoxPtr pboxTmp, pboxNext, pboxBase, pbox;
+	DDXPointPtr pptTmp;
+	unsigned char *psrcBase, *pdstBase;
+	int nbox, widthSrc, widthDst, careful, use_prefetch;
+	int psz_shift;
+
+	cfbGetByteWidthAndPointer (pSrc, widthSrc, psrcBase)
+	cfbGetByteWidthAndPointer (pDst, widthDst, pdstBase)
+	
+	careful = ((pSrc == pDst) ||
+		  ((pSrc->type == DRAWABLE_WINDOW) &&
+		   (pDst->type == DRAWABLE_WINDOW)));
+	use_prefetch = (pFfb->use_blkread_prefetch &&
+			(psrcBase == (unsigned char *)pFfb->sfb32 ||
+			 psrcBase == (unsigned char *)pFfb->sfb8r));
+
+	pbox = REGION_RECTS(prgnDst);
+	nbox = REGION_NUM_RECTS(prgnDst);
+
+	pptTmp = pptSrc;
+	pboxTmp = pbox;
+
+	FFBLOG(("GCOPY(%d): ", nbox));
+
+	if (pSrc->bitsPerPixel == 8)
+		psz_shift = 0;
+	else
+		psz_shift = 2;
+
+	if (careful && pptSrc->y < pbox->y1) {
+		if (pptSrc->x < pbox->x1) {
+			/* reverse order of bands and rects in each band */
+			pboxTmp=pbox+nbox;
+                        pptTmp=pptSrc+nbox;
+
+			while (nbox--){
+				pboxTmp--;
+				pptTmp--;
+				FFBLOG(("[%08x:%08x:%08x:%08x:%08x:%08x] ",
+					pptTmp->x, pptTmp->y, pboxTmp->x1, pboxTmp->y1,
+					pboxTmp->x2, pboxTmp->y2));
+				if (pptTmp->x < pbox->x2) {
+					if (use_prefetch) {
+						FFBFifo(pFfb, 1);
+						pFfb->regs->mer = FFB_MER_EDRA;
+						pFfb->rp_active = 1;
+						FFBWait(pFfb, pFfb->regs);
+					}
+					VISmoveImageRL ((psrcBase +
+							 ((pptTmp->y + pboxTmp->y2 - pboxTmp->y1 - 1) *
+							  widthSrc) +
+							 (pptTmp->x << psz_shift)),
+				        	        (pdstBase +
+							 ((pboxTmp->y2 - 1) * widthDst) +
+							 (pboxTmp->x1 << psz_shift)),
+					                (pboxTmp->x2 - pboxTmp->x1) << psz_shift,
+				        	        (pboxTmp->y2 - pboxTmp->y1),
+					                -widthSrc, -widthDst);
+				} else {
+					if (use_prefetch) {
+						FFBFifo(pFfb, 1);
+						pFfb->regs->mer = FFB_MER_EIRA;
+						pFfb->rp_active = 1;
+						FFBWait(pFfb, pFfb->regs);
+					}
+					VISmoveImageLR ((psrcBase +
+							 ((pptTmp->y + pboxTmp->y2 - pboxTmp->y1 - 1) *
+							  widthSrc) +
+							 (pptTmp->x << psz_shift)),
+				        	        (pdstBase +
+							 ((pboxTmp->y2 - 1) * widthDst) +
+							 (pboxTmp->x1 << psz_shift)),
+					                (pboxTmp->x2 - pboxTmp->x1) << psz_shift,
+				        	        (pboxTmp->y2 - pboxTmp->y1),
+					                -widthSrc, -widthDst);
+				}
+			}
+		} else {
+			/* keep ordering in each band, reverse order of bands */
+			pboxBase = pboxNext = pbox+nbox-1;
+
+			while (pboxBase >= pbox) {			/* for each band */
+
+				/* find first box in band */
+				while (pboxNext >= pbox &&
+				       pboxBase->y1 == pboxNext->y1)
+					pboxNext--;
+		
+				pboxTmp = pboxNext+1;			/* first box in band */
+				pptTmp = pptSrc + (pboxTmp - pbox);	/* first point in band */
+		
+				FFBLOG(("[%08x:%08x:%08x:%08x:%08x:%08x] ",
+					pptTmp->x, pptTmp->y, pboxTmp->x1, pboxTmp->y1,
+					pboxTmp->x2, pboxTmp->y2));
+				while (pboxTmp <= pboxBase) {		/* for each box in band */
+					if (use_prefetch) {
+						FFBFifo(pFfb, 1);
+						pFfb->regs->mer = FFB_MER_EIRA;
+						pFfb->rp_active = 1;
+						FFBWait(pFfb, pFfb->regs);
+					}
+					VISmoveImageLR ((psrcBase +
+							 ((pptTmp->y + pboxTmp->y2 - pboxTmp->y1 - 1) *
+							  widthSrc) +
+							 (pptTmp->x << psz_shift)),
+				        	        (pdstBase +
+							 ((pboxTmp->y2 - 1) * widthDst) +
+							 (pboxTmp->x1 << psz_shift)),
+					                (pboxTmp->x2 - pboxTmp->x1) << psz_shift,
+				        	        (pboxTmp->y2 - pboxTmp->y1),
+					                -widthSrc, -widthDst);
+					++pboxTmp;
+					++pptTmp;	
+				}
+				pboxBase = pboxNext;
+			
+			}
+		}
+	} else {
+		if (careful && pptSrc->x < pbox->x1) {
+			/* reverse order of rects in each band */
+
+			pboxBase = pboxNext = pbox;
+
+			while (pboxBase < pbox+nbox) { /* for each band */
+
+				/* find last box in band */
+				while (pboxNext < pbox+nbox &&
+				       pboxNext->y1 == pboxBase->y1)
+					pboxNext++;
+
+				pboxTmp = pboxNext;			/* last box in band */
+				pptTmp = pptSrc + (pboxTmp - pbox);	/* last point in band */
+
+				while (pboxTmp != pboxBase) {		/* for each box in band */
+					--pboxTmp;
+					--pptTmp;
+					FFBLOG(("[%08x:%08x:%08x:%08x:%08x:%08x] ",
+						pptTmp->x, pptTmp->y, pboxTmp->x1, pboxTmp->y1,
+						pboxTmp->x2, pboxTmp->y2));
+					if (pptTmp->x < pbox->x2) {
+						if (use_prefetch) {
+							FFBFifo(pFfb, 1);
+							pFfb->regs->mer = FFB_MER_EDRA;
+							pFfb->regs->mer = FFB_MER_EIRA;
+							pFfb->rp_active = 1;
+						}
+						VISmoveImageRL ((psrcBase +
+								 (pptTmp->y * widthSrc) +
+								 (pptTmp->x << psz_shift)),
+						                (pdstBase +
+								 (pboxTmp->y1 * widthDst) +
+								 (pboxTmp->x1 << psz_shift)),
+						                (pboxTmp->x2 - pboxTmp->x1) << psz_shift,
+			        	        		(pboxTmp->y2 - pboxTmp->y1),
+						                widthSrc, widthDst);
+					} else {
+						if (use_prefetch) {
+							FFBFifo(pFfb, 1);
+							pFfb->regs->mer = FFB_MER_EIRA;
+							pFfb->rp_active = 1;
+							FFBWait(pFfb, pFfb->regs);
+						}
+						VISmoveImageLR ((psrcBase +
+								 (pptTmp->y * widthSrc) +
+								 (pptTmp->x << psz_shift)),
+						                (pdstBase +
+								 (pboxTmp->y1 * widthDst) +
+								 (pboxTmp->x1 << psz_shift)),
+				                		(pboxTmp->x2 - pboxTmp->x1) << psz_shift,
+					        	        (pboxTmp->y2 - pboxTmp->y1),
+						                widthSrc, widthDst);
+					}
+				}
+				pboxBase = pboxNext;
+			}
+		} else {
+			while (nbox--) {
+				FFBLOG(("[%08x:%08x:%08x:%08x:%08x:%08x] ",
+					pptTmp->x, pptTmp->y, pboxTmp->x1, pboxTmp->y1,
+					pboxTmp->x2, pboxTmp->y2));
+				if (use_prefetch) {
+					FFBFifo(pFfb, 1);
+					pFfb->regs->mer = FFB_MER_EIRA;
+					pFfb->rp_active = 1;
+					FFBWait(pFfb, pFfb->regs);
+				}
+				VISmoveImageLR ((psrcBase +
+						 (pptTmp->y * widthSrc) +
+						 (pptTmp->x << psz_shift)),
+				                (pdstBase +
+						 (pboxTmp->y1 * widthDst) +
+						 (pboxTmp->x1 << psz_shift)),
+				                (pboxTmp->x2 - pboxTmp->x1) << psz_shift,
+			        	        (pboxTmp->y2 - pboxTmp->y1),
+				                widthSrc, widthDst);
+				pboxTmp++;
+				pptTmp++;
+			}
+		}
+	}
+	if (use_prefetch) {
+		FFBFifo(pFfb, 1);
+		pFfb->regs->mer = FFB_MER_DRA;
+		pFfb->rp_active = 1;
+		FFBWait(pFfb, pFfb->regs);
+	}
+	FFBLOG(("done\n"));
+}
+
+RegionPtr
+CreatorCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+		GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDstDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	RegionPtr ret;
+	unsigned char *dptr, *sptr, *sfb;
+	int garbage, all_planes;
+	
+	cfbGetByteWidthAndPointer (pDstDrawable, garbage, dptr);
+	cfbGetByteWidthAndPointer (pSrcDrawable, garbage, sptr);
+	if (pSrcDrawable->bitsPerPixel == 8) {
+		sfb = (unsigned char *) pFfb->sfb8r;
+		all_planes = 0xff;
+	} else {
+		sfb = (unsigned char *) pFfb->sfb32;
+		all_planes = 0xffffff;
+	}
+
+	FFBLOG(("CreatorCopyArea: SFB(%p) s(%p) d(%p) alu(%x) pmsk(%08x) "
+		"src(%08x:%08x) dst(%08x:%08x)\n",
+		sfb, sptr, dptr, pGC->alu, pGC->planemask,
+		srcx, srcy, dstx, dsty));
+	if (((pGC->planemask & all_planes) != all_planes || pGC->alu != GXcopy) &&
+	    dptr != sfb) {
+		if(sptr == sfb) {
+			WindowPtr pWin = (WindowPtr) pSrcDrawable;
+
+			FFB_ATTR_SFB_VAR_WIN(pFfb, pGC->planemask, pGC->alu, pWin);
+			FFBWait(pFfb, ffb);
+		}
+		if (pSrcDrawable->bitsPerPixel == 8)
+			return cfbCopyArea (pSrcDrawable, pDstDrawable,
+					    pGC, srcx, srcy, width, height, dstx, dsty);
+		else
+			return cfb32CopyArea (pSrcDrawable, pDstDrawable,
+					      pGC, srcx, srcy, width, height, dstx, dsty);
+	}
+
+	/* Try to use hw VSCROLL if possible */
+	if (!pFfb->disable_vscroll &&	/* must not be ffb1 in hires */
+	    pGC->alu == GXcopy &&	/* it must be a copy */
+	    dstx == srcx &&		/* X must be unchanging */
+	    dsty != srcy &&		/* Y must be changing */
+	    sptr == dptr &&		/* src and dst must be the framebuffer */
+	    dptr == sfb) {
+		WindowPtr pWin = (WindowPtr) pSrcDrawable;
+		CreatorPrivWinPtr pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+		unsigned int fbc = pFfbPrivWin->fbc_base;
+		int same_buffer;
+
+		/* One last check, the read buffer and the write buffer
+		 * must be the same.  VSCROLL only allows to move pixels
+		 * within the same buffer.
+		 */
+		if (!pFfb->has_double_buffer) {
+			same_buffer = 1;
+		} else {
+			same_buffer = 0;
+			if ((((fbc & FFB_FBC_WB_MASK) == FFB_FBC_WB_A) &&
+			     ((fbc & FFB_FBC_RB_MASK) == FFB_FBC_RB_A)) ||
+			    (((fbc & FFB_FBC_WB_MASK) == FFB_FBC_WB_B) &&
+			     ((fbc & FFB_FBC_RB_MASK) == FFB_FBC_RB_B)))
+				same_buffer = 1;
+		}
+
+		if (same_buffer != 0) {
+			FFB_ATTR_VSCROLL_WIN(pFfb, pGC->planemask, pWin);
+			if (pSrcDrawable->bitsPerPixel == 8)
+				ret = cfbBitBlt (pSrcDrawable, pDstDrawable,
+						 pGC, srcx, srcy, width, height,
+						 dstx, dsty,
+						 (void (*)())CreatorDoVertBitblt, 0);
+			else
+				ret = cfb32BitBlt (pSrcDrawable, pDstDrawable,
+						   pGC, srcx, srcy, width, height,
+						   dstx, dsty,
+						   (void (*)())CreatorDoVertBitblt, 0);
+			FFBLOG(("CreatorCopyArea: Done, returning %p\n", ret));
+			return ret;
+		}
+	}
+
+	/* OK, we have to use GCOPY. */
+
+	/* Even when we are only reading from the framebuffer, we must
+	 * set the SFB_VAR attributes to handle double-buffering correctly.
+	 */
+	if(dptr == sfb || sptr == sfb) {
+		WindowPtr pWin;
+
+		if (dptr == sfb)
+			pWin = (WindowPtr) pDstDrawable;
+		else
+			pWin = (WindowPtr) pSrcDrawable;
+		FFB_ATTR_SFB_VAR_WIN(pFfb, pGC->planemask, pGC->alu, pWin);
+		FFBWait(pFfb, ffb);
+	}
+	if (pSrcDrawable->bitsPerPixel == 8)
+		ret = cfbBitBlt (pSrcDrawable, pDstDrawable,
+				 pGC, srcx, srcy, width, height,
+				 dstx, dsty, (void (*)())CreatorDoBitblt, 0);
+	else
+		ret = cfb32BitBlt (pSrcDrawable, pDstDrawable,
+				   pGC, srcx, srcy, width, height,
+				   dstx, dsty, (void (*)())CreatorDoBitblt, 0);
+
+	FFBLOG(("CreatorCopyArea: Done, returning %p\n", ret));
+	return ret;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_checks.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_checks.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_checks.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,288 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - stipple/tile/line-pattern
+ * verification.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_checks.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+int
+CreatorCheckTile (PixmapPtr pPixmap, CreatorStipplePtr stipple, int ox, int oy, int ph)
+{
+	unsigned int *sbits;
+	unsigned int fg = 0, bg = 0;
+	int fgset = 0, bgset = 0;
+	unsigned int *tilebitsLine, *tilebits, tilebit;
+	unsigned int sbit, mask;
+	int nbwidth;
+	int h, w;
+	int x, y;
+	int s_y, s_x;
+
+	h = pPixmap->drawable.height;
+	if (h > 32 || (h & (h - 1)))
+		return FALSE;
+
+	w = pPixmap->drawable.width;
+	if (w > 32 || (w & (w - 1)))
+		return FALSE;
+
+	stipple->patalign = (oy << 16) | ox;
+	sbits = stipple->bits;
+	tilebitsLine = (unsigned int *) pPixmap->devPrivate.ptr;
+	nbwidth = pPixmap->devKind / sizeof(unsigned int);
+
+	for (y = 0; y < h; y++) {
+		tilebits = tilebitsLine;
+		tilebitsLine += nbwidth;
+		sbit = 0;
+		mask = 1 << 31;
+		for (x = 0; x < w; x++) {
+			tilebit = *tilebits++;
+			if (fgset && tilebit == fg)
+				sbit |=  mask;
+			else if (!bgset || tilebit != bg) {
+				if (!fgset) {
+					fgset = 1;
+					fg = tilebit;
+					sbit |= mask;
+				} else if (!bgset) {
+					bgset = 1;
+					bg = tilebit;
+				} else {
+					return FALSE;
+				}
+			}
+			mask >>= 1;
+		}
+		for (s_x = w; s_x < 32; s_x <<= 1)
+			sbit = sbit | (sbit >> s_x);
+		sbit = (sbit >> ox) | (sbit << (32 - ox));
+		for (s_y = y; s_y < 32; s_y += h)
+			sbits[(s_y + oy) & 31] = sbit;
+	}
+	stipple->pagable = 1;
+	for(y = 0; y < (32 - ph); y++) {
+		if(sbits[y] != sbits[(y+ph) & (32 - 1)]) {
+			stipple->pagable = 0;
+			break;
+		}
+	}
+	stipple->fg = fg;
+	stipple->bg = bg;
+	stipple->inhw = 0;
+	return TRUE;
+}
+
+int
+CreatorCheckStipple (PixmapPtr pPixmap, CreatorStipplePtr stipple, int ox, int oy, int ph)
+{
+	unsigned int *sbits;
+	unsigned int *stippleBits;
+	unsigned int sbit, mask, nbwidth;
+	int h, w;
+	int y;
+	int s_y, s_x;
+
+	h = pPixmap->drawable.height;
+	if (h > 32 || (h & (h - 1)))
+		return FALSE;
+
+	w = pPixmap->drawable.width;
+	if (w > 32 || (w & (w - 1)))
+		return FALSE;
+
+	stipple->patalign = (oy << 16) | ox;
+	sbits = stipple->bits;
+	stippleBits = (unsigned int *) pPixmap->devPrivate.ptr;
+	nbwidth = pPixmap->devKind / sizeof(unsigned int);
+	mask = ~0 << (32 - w);
+	for (y = 0; y < h; y++) {
+		sbit = (*stippleBits) & mask;
+		stippleBits += nbwidth;
+		for (s_x = w; s_x < 32; s_x <<= 1)
+			sbit = sbit | (sbit >> s_x);
+		sbit = (sbit >> ox) | (sbit << (32 - ox));
+		for (s_y = y; s_y < 32; s_y += h)
+			sbits[(s_y + oy) & 31] = sbit;
+	}
+	stipple->pagable = 1;
+	for(y = 0; y < (32 - ph); y++) {
+		if(sbits[y] != sbits[(y+ph) & (32 - 1)]) {
+			stipple->pagable = 0;
+			break;
+		}
+	}
+	stipple->inhw = 0;
+	return TRUE;
+}
+
+int
+CreatorCheckLinePattern(GCPtr pGC, CreatorPrivGCPtr gcPriv)
+{
+	unsigned int linepat = 0;
+	unsigned char *dashp = (unsigned char *)pGC->dash;
+	int ndash = pGC->numInDashList;
+	int doff = (int) pGC->dashOffset;
+	int smallest_dashlen;
+	int i, nbits = 0;
+
+	for(i = 0; i < ndash; i++)
+		nbits += dashp[i];
+	if(nbits <= 16) {
+		/* We can do it simply, so don't try to use all of
+		 * the hair below.
+		 */
+		nbits = 0;
+		for(i = 0; i < ndash; i++) {
+			int this_bits = dashp[i];
+			if((i & 1) == 0) {
+				int x;
+
+				for(x = 0; x < this_bits; x++)
+					linepat |= (1<<(nbits + x));
+			}
+			nbits += this_bits;
+		}
+		smallest_dashlen = 1;
+	} else {
+		/* Iteratively find a usable line pattern bitmap and
+		 * assosciated scale.  This is slow, but it works.
+		 * Feel free to come up with something more efficient. -DaveM
+		 */
+		smallest_dashlen = 0;
+		while(smallest_dashlen++ < 16) {
+			int bits_so_far = 0;
+
+			for(i = 0; i < ndash; i++) {
+				if((dashp[i] % smallest_dashlen) != 0)
+					break;
+				bits_so_far += dashp[i] / smallest_dashlen;
+				if(bits_so_far >= 16)
+					return FALSE;
+			}
+			if(i == ndash)
+				break;
+		}
+		if(smallest_dashlen == 16)
+			return FALSE;
+
+		/* Compute the final scaled line pattern. */
+		nbits = 0;
+		for(i = 0; i < ndash; i++) {
+			int this_bits = dashp[i] / smallest_dashlen;
+
+			nbits += this_bits;
+			if((i & 1) != 0)
+				continue;
+			while(this_bits--)
+				linepat |= (1<<(nbits - this_bits - 1));
+		}
+	}
+
+	/* We're golden... */
+	linepat = ((linepat << FFB_LPAT_PATTERN_SHIFT)					|
+		   (smallest_dashlen << FFB_LPAT_SCALEVAL_SHIFT)			|
+		   ((nbits & 0xf) << FFB_LPAT_PATLEN_SHIFT)				|
+		   (((doff / smallest_dashlen) & 0xf) << FFB_LPAT_PATPTR_SHIFT)	|
+		   (((doff % smallest_dashlen) & 0xf) << FFB_LPAT_SCALEPTR_SHIFT));
+	gcPriv->linepat = linepat;
+	return TRUE;
+}
+
+/* cache one stipple; figuring out if we can use the stipple is as hard as
+ * computing it, so we just use this one and leave it here if it
+ * can't be used this time
+ */
+
+CreatorStipplePtr FFB_tmpStipple;
+
+int
+CreatorCheckFill (GCPtr pGC, DrawablePtr pDrawable)
+{
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	CreatorStipplePtr stipple;
+	unsigned int alu;
+	int xrot, yrot, ph = FFB_FFPARMS(pFfb).pagefill_height;
+
+	if (pGC->fillStyle == FillSolid) {
+		if (gcPriv->stipple) {
+			xfree (gcPriv->stipple);
+			gcPriv->stipple = 0;
+		}
+		return TRUE;
+	}
+	if (!(stipple = gcPriv->stipple)) {
+		if (!FFB_tmpStipple) {
+			FFB_tmpStipple = (CreatorStipplePtr) xalloc (sizeof *FFB_tmpStipple);
+			if (!FFB_tmpStipple)
+				return FALSE;
+		}
+		stipple = FFB_tmpStipple;
+	}
+	xrot = (pGC->patOrg.x + pDrawable->x) & 31;
+	yrot = (pGC->patOrg.y + pDrawable->y) & 31;
+	alu = pGC->alu;
+	switch (pGC->fillStyle) {
+	case FillTiled:
+		if (!CreatorCheckTile (pGC->tile.pixmap, stipple, xrot, yrot, ph)) {
+			if (gcPriv->stipple) {
+				xfree (gcPriv->stipple);
+				gcPriv->stipple = 0;
+			}
+			return FALSE;
+		}
+		break;
+	case FillStippled:
+		alu |= FFB_ROP_EDIT_BIT;
+	case FillOpaqueStippled:
+		if (!CreatorCheckStipple (pGC->stipple, stipple, xrot, yrot, ph)) {
+			if (gcPriv->stipple) {
+				xfree (gcPriv->stipple);
+				gcPriv->stipple = 0;
+			}
+			return FALSE;
+		}
+		stipple->fg = pGC->fgPixel;
+		stipple->bg = pGC->bgPixel;
+		break;
+	}
+	stipple->alu = alu;
+	gcPriv->stipple = stipple;
+	if (stipple == FFB_tmpStipple)
+		FFB_tmpStipple = 0;
+	return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_circle.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_circle.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_circle.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,210 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Circle rops.
+ *
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_circle.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_stip.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+#include "cfb8_32wid.h"
+
+#include "mi.h"
+#include "mifillarc.h"
+
+/* Wheee, circles... */
+static void
+CreatorFillEllipseSolid(DrawablePtr pDrawable, GCPtr pGC, xArc *arc)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+	ffb_fbcPtr ffb = pFfb->regs;
+	miFillArcRec info;
+	int x, y, e, yk, xk, ym, xm, dx, dy, xorg, yorg, slw;
+
+	/* Get the RP ready. */
+	if(gcPriv->stipple == NULL) {
+		FFB_ATTR_GC(pFfb, pGC, pWin,
+			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+			    FFB_DRAWOP_RECTANGLE);
+	} else {
+		unsigned int fbc;
+
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+		fbc = FFB_FBC_WIN(pWin);
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+		FFB_WRITE_FBC(pFfb, ffb, fbc);
+	}
+
+	/* Start computing the rects. */
+	miFillArcSetup(arc, &info);
+	MIFILLARCSETUP();
+	if(pGC->miTranslate) {
+		xorg += pDrawable->x;
+		yorg += pDrawable->y;
+	}
+	while(y > 0) {
+		MIFILLARCSTEP(slw);
+		if(slw > 0) {
+			/* Render. */
+			FFBFifo(pFfb, 4);
+			FFB_WRITE64(&ffb->by, yorg - y, xorg - x);
+			FFB_WRITE64_2(&ffb->bh, 1, slw);
+			if(miFillArcLower(slw)) {
+				FFBFifo(pFfb, 4);
+				FFB_WRITE64(&ffb->by, yorg + y + dy, xorg - x);
+				FFB_WRITE64_2(&ffb->bh, 1, slw);
+			}
+		}
+	}
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+
+#define ADDSPAN(l,r) \
+    if (r >= l) { \
+	FFBFifo(pFfb, 4); \
+	FFB_WRITE64(&ffb->by, ya, l); \
+	FFB_WRITE64_2(&ffb->bh, 1, r - l + 1); \
+    }
+
+#define ADDSLICESPANS(flip) \
+    if (!flip) \
+    { \
+	ADDSPAN(xl, xr); \
+    } \
+    else \
+    { \
+	xc = xorg - x; \
+	ADDSPAN(xc, xr); \
+	xc += slw - 1; \
+	ADDSPAN(xl, xc); \
+    }
+
+static void
+CreatorFillArcSliceSolid(DrawablePtr pDrawable, GCPtr pGC, xArc *arc)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+	ffb_fbcPtr ffb = pFfb->regs;
+	miFillArcRec info;
+	miArcSliceRec slice;
+	int x, y, e, yk, xk, ym, xm, dx, dy, xorg, yorg, slw;
+	int ya, xl, xr, xc;
+
+	/* Get the RP ready. */
+	if(gcPriv->stipple == NULL) {
+		FFB_ATTR_GC(pFfb, pGC, pWin,
+			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+			    FFB_DRAWOP_RECTANGLE);
+	} else {
+		unsigned int fbc;
+
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+		fbc = FFB_FBC_WIN(pWin);
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+		FFB_WRITE_FBC(pFfb, ffb, fbc);
+		FFB_WRITE_FBC(pFfb, ffb, FFB_FBC_WIN(pWin));
+	}
+	miFillArcSetup(arc, &info);
+	miFillArcSliceSetup(arc, &slice, pGC);
+	MIFILLARCSETUP();
+	slw = arc->height;
+	if (slice.flip_top || slice.flip_bot)
+		slw += (arc->height >> 1) + 1;
+	if (pGC->miTranslate) {
+		xorg += pDrawable->x;
+		yorg += pDrawable->y;
+		slice.edge1.x += pDrawable->x;
+		slice.edge2.x += pDrawable->x;
+	}
+	while (y > 0) {
+		MIFILLARCSTEP(slw);
+		MIARCSLICESTEP(slice.edge1);
+		MIARCSLICESTEP(slice.edge2);
+		if (miFillSliceUpper(slice)) {
+			ya = yorg - y;
+			MIARCSLICEUPPER(xl, xr, slice, slw);
+			ADDSLICESPANS(slice.flip_top);
+		}
+		if (miFillSliceLower(slice)) {
+			ya = yorg + y + dy;
+			MIARCSLICELOWER(xl, xr, slice, slw);
+			ADDSLICESPANS(slice.flip_bot);
+		}
+	}
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+
+void
+CreatorPolyFillArcSolid (DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
+{
+	RegionPtr cclip;
+	xArc *arc;
+	BoxRec box;
+	int i, x2, y2;
+
+	FFBLOG(("CreatorPolyFillArcSolid: narcs(%d)\n", narcs));
+	cclip = cfbGetCompositeClip(pGC);
+	for(arc = parcs, i = narcs; --i >= 0; arc++) {
+		if(miFillArcEmpty(arc))
+			continue;
+		if(miCanFillArc(arc)) {
+			box.x1 = arc->x + pDrawable->x;
+			box.y1 = arc->y + pDrawable->y;
+			box.x2 = x2 = box.x1 + (int)arc->width + 1;
+			box.y2 = y2 = box.y1 + (int)arc->height + 1;
+			if((x2 & ~0x7ff) == 0 &&
+			   (y2 & ~0x7ff) == 0 &&
+			   (RECT_IN_REGION(pDrawable->pScreen, cclip, &box) == rgnIN)) {
+				if(arc->angle2 >= FULLCIRCLE ||
+				   arc->angle2 <= -FULLCIRCLE)
+					CreatorFillEllipseSolid(pDrawable, pGC, arc);
+				else
+					CreatorFillArcSliceSolid(pDrawable, pGC, arc);
+				continue;
+			}
+		}
+		/* Use slow mi code if we can't handle it simply. */
+		miPolyFillArc(pDrawable, pGC, 1, arc);
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.c	Thu May 18 16:21:36 2000
@@ -0,0 +1,103 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - clip setting.
+ *
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_clip.h"
+
+unsigned int
+FFBSetClip(FFBPtr pFfb, ffb_fbcPtr ffb, RegionPtr pClip, int numRects)
+{
+	unsigned int xy1, xy2;
+		
+	if (numRects == 1) {
+		xy1 = (pClip->extents.y1 << 16) | pClip->extents.x1;
+		xy2 = ((pClip->extents.y2 - 1) << 16) | (pClip->extents.x2 - 1);
+		if (pFfb->clips[0] == xy1 && pFfb->clips[1] == xy2)
+			return FFB_PPC_VCE_2D|FFB_PPC_ACE_DISABLE;
+		FFBFifo(pFfb, 2);
+		FFB_WRITE64(&ffb->vclipmin, xy1, xy2);
+		pFfb->clips[0] = xy1;
+		pFfb->clips[1] = xy2;
+		return FFB_PPC_VCE_2D|FFB_PPC_ACE_DISABLE;
+	} else if (numRects <= 5) {
+		ffb_auxclipPtr auxclip;
+		BoxPtr pBox = REGION_RECTS(pClip);
+		int i, j;
+		unsigned int xy3, xy4;
+
+		xy1 = (pBox->y1 << 16) | pBox->x1;
+		xy2 = ((pBox->y2 - 1) << 16) | (pBox->x2 - 1);
+		if (pFfb->clips[0] == xy1 && pFfb->clips[1] == xy2) {
+			j = 0;
+			for (i = 1; i < numRects; i++) {
+				xy3 = (pBox[i].y1 << 16) | pBox[i].x1;
+				xy4 = ((pBox[i].y2 - 1) << 16) | (pBox[i].x2 - 1);
+				if (j || xy3 != pFfb->clips[2*i] || xy4 != pFfb->clips[2*i+1]) {
+					j = 1;
+					pFfb->clips[2*i] = xy3;
+					pFfb->clips[2*i+1] = xy4;
+				}
+			}
+			for (; i < 5; i++) {
+				if (j || pFfb->clips[2*i] != 1 || pFfb->clips[2*i+1]) {
+					j = 1;
+					pFfb->clips[2*i] = 1;
+					pFfb->clips[2*i+1] = 0;
+				}
+			}
+			if (!j)
+				return FFB_PPC_VCE_2D|FFB_PPC_ACE_AUX_ADD;
+			FFBFifo(pFfb, 8);
+			auxclip = ffb->auxclip;
+			for (i = 1; i < 5; i++, auxclip++)
+				FFB_WRITE64P(&auxclip->min, &pFfb->clips[2*i]);
+			return FFB_PPC_VCE_2D|FFB_PPC_ACE_AUX_ADD;
+		}
+		FFBFifo(pFfb, 10);
+		FFB_WRITE64(&ffb->vclipmin, xy1, xy2);
+		pFfb->clips[0] = xy1;
+		pFfb->clips[1] = xy2;
+		auxclip = ffb->auxclip;
+		pBox++;
+		for (i = 1; i < numRects; i++, auxclip++, pBox++) {
+			xy3 = (pBox->y1 << 16) | pBox->x1;
+			xy4 = ((pBox->y2 - 1) << 16) | (pBox->x2 - 1);
+			FFB_WRITE64(&auxclip->min, xy3, xy4);
+			pFfb->clips[2*i] = xy3;
+			pFfb->clips[2*i+1] = xy4;
+		}
+		for (; i < 5; i++, auxclip++) {
+			FFB_WRITE64(&auxclip->min, 1, 0);
+			pFfb->clips[2*i] = 1;
+			pFfb->clips[2*i+1] = 0;
+		}
+		return FFB_PPC_VCE_2D|FFB_PPC_ACE_AUX_ADD;
+	}
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.h	Thu May 18 16:21:36 2000
@@ -0,0 +1,49 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - clipping defines.
+ *
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.h,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
+
+#ifndef FFBCLIP_H
+#define FFBCLIP_H
+
+extern unsigned int FFBSetClip(FFBPtr pFfb,
+			       ffb_fbcPtr ffb,
+			       RegionPtr pClip,
+			       int numRects);
+static __inline__ void
+FFBSet1Clip(FFBPtr pFfb, ffb_fbcPtr ffb, BoxPtr extents)
+{
+	unsigned int xy1, xy2;
+	
+	xy1 = (extents->y1 << 16) | extents->x1;
+	xy2 = ((extents->y2 - 1) << 16) | (extents->x2 - 1);
+	if (pFfb->clips[0] == xy1 && pFfb->clips[1] == xy2)
+		return;
+	FFBFifo(pFfb, 2);
+	FFB_WRITE64(&ffb->vclipmin, xy1, xy2);
+	pFfb->clips[0] = xy1;
+	pFfb->clips[1] = xy2;
+}
+
+#endif /* FFBCLIP_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,393 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Plane copies.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+#include "cfbmskbits.h"
+#include "mi.h"
+
+/* Blatantly stolen from mach64 driver. */
+#define mfbmaskbits(x, w, startmask, endmask, nlw) \
+	startmask = starttab[(x)&0x1f]; \
+	endmask = endtab[((x)+(w)) & 0x1f]; \
+	if (startmask) \
+		nlw = (((w) - (32 - ((x)&0x1f))) >> 5); \
+	else \
+		nlw = (w) >> 5;
+
+#define mfbmaskpartialbits(x, w, mask) \
+	mask = partmasks[(x)&0x1f][(w)&0x1f];
+
+#define LeftMost    0
+#define StepBit(bit, inc)  ((bit) += (inc))
+
+
+#define GetBits(psrc, nBits, curBit, bitPos, bits) {\
+	bits = 0; \
+	while (nBits--) { \
+		bits |= ((*psrc++ >> bitPos) & 1) << curBit; \
+		StepBit (curBit, 1); \
+	} \
+}
+
+static void
+CreatorCopyPlane32to1 (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, int rop, RegionPtr prgnDst, 
+		       DDXPointPtr pptSrc, unsigned long planemask, unsigned long bitPlane)
+{
+	int			srcx, srcy, dstx, dsty, width, height;
+	unsigned long		*psrcBase;
+	unsigned long		*pdstBase;
+	int			widthSrc, widthDst;
+	unsigned int		*psrcLine;
+	unsigned int		*pdstLine;
+	register unsigned int   *psrc;
+	register int		i;
+	register int		curBit;
+	register int		bitPos;
+	register unsigned int   bits;
+	register unsigned int   *pdst;
+	unsigned int		startmask, endmask;
+	int			niStart = 0, niEnd = 0;
+	int			bitStart = 0, bitEnd = 0;
+	int			nl, nlMiddle;
+	int			nbox;
+	BoxPtr			pbox;
+	int result;
+
+	extern int starttab[32], endtab[32];
+	extern unsigned int partmasks[32][32];
+
+	if (!(planemask & 1))
+		return;
+
+	/* must explicitly ask for "int" widths, as code below expects it */
+	/* on some machines (Sparc64), "long" and "int" are not the same size */
+	cfbGetTypedWidthAndPointer (pSrcDrawable, widthSrc, psrcBase, int, unsigned long)
+	cfbGetTypedWidthAndPointer (pDstDrawable, widthDst, pdstBase, int, unsigned long)
+
+	bitPos = ffs (bitPlane) - 1;
+
+	nbox = REGION_NUM_RECTS(prgnDst);
+	pbox = REGION_RECTS(prgnDst);
+	while (nbox--) {
+		dstx = pbox->x1;
+		dsty = pbox->y1;
+		srcx = pptSrc->x;
+		srcy = pptSrc->y;
+		width = pbox->x2 - pbox->x1;
+		height = pbox->y2 - pbox->y1;
+		pbox++;
+		pptSrc++;
+		psrcLine = (unsigned int *)psrcBase + srcy * widthSrc + srcx;
+		pdstLine = (unsigned int *)pdstBase + dsty * widthDst + (dstx >> 5);
+		if (dstx + width <= 32) {
+			mfbmaskpartialbits(dstx, width, startmask);
+			nlMiddle = 0;
+			endmask = 0;
+		} else {
+			mfbmaskbits (dstx, width, startmask, endmask, nlMiddle);
+		}
+		if (startmask) {
+			niStart = 32 - (dstx & 0x1f);
+			bitStart = LeftMost;
+			StepBit (bitStart, (dstx & 0x1f));
+		}
+		if (endmask) {
+			niEnd = (dstx + width) & 0x1f;
+			bitEnd = LeftMost;
+		}
+		if (rop == GXcopy) {
+			while (height--) {
+				psrc = psrcLine;
+				pdst = pdstLine;
+				psrcLine += widthSrc;
+				pdstLine += widthDst;
+				if (startmask) {
+					i = niStart;
+					curBit = bitStart;
+					GetBits (psrc, i, curBit, bitPos, bits);
+				
+					*pdst = (*pdst & ~startmask) | bits;
+					pdst++;
+				}
+				nl = nlMiddle;
+				
+				while (nl--) {
+					i = 32;
+					curBit = LeftMost;
+					GetBits (psrc, i, curBit, bitPos, bits);
+					*pdst++ = bits;
+				}
+				if (endmask) {
+					i = niEnd;
+					curBit = bitEnd;
+					GetBits (psrc, i, curBit, bitPos, bits);
+
+					*pdst = (*pdst & ~endmask) | bits;
+				}
+			}
+		} else {
+			while (height--) {
+				psrc = psrcLine;
+				pdst = pdstLine;
+				psrcLine += widthSrc;
+				pdstLine += widthDst;
+				if (startmask) {
+					i = niStart;
+					curBit = bitStart;
+					GetBits (psrc, i, curBit, bitPos, bits);
+					DoRop (result, rop, bits, *pdst);
+				
+					*pdst = (*pdst & ~startmask) | (result & startmask);
+					pdst++;
+				}
+				nl = nlMiddle;
+				while (nl--) {
+					i = 32;
+					curBit = LeftMost;
+					GetBits (psrc, i, curBit, bitPos, bits);
+					DoRop (result, rop, bits, *pdst);
+					*pdst = result;
+					++pdst;
+				}
+				if (endmask) {
+					i = niEnd;
+					curBit = bitEnd;
+					GetBits (psrc, i, curBit, bitPos, bits);
+					DoRop (result, rop, bits, *pdst);
+				
+					*pdst = (*pdst & ~endmask) | (result & endmask);
+				}
+			}
+		}
+	}
+}
+
+static unsigned int copyPlaneFG, copyPlaneBG;
+
+static void
+CreatorCopyPlane1toFbBpp (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, int alu, RegionPtr prgnDst, DDXPointPtr pptSrc, unsigned long planemask, unsigned long bitPlane)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDstDrawable->pScreen);
+	WindowPtr pWin = (WindowPtr) pDstDrawable;
+	ffb_fbcPtr ffb = pFfb->regs;
+	int srcx, srcy, dstx, dsty, width, height;
+	int xoffSrc, widthSrc;
+	unsigned int *psrcBase, *psrc, *psrcStart;
+	unsigned int w, tmp, i;
+	int nbox;
+	BoxPtr pbox;
+
+	{
+		unsigned int ppc = (FFB_PPC_APE_DISABLE | FFB_PPC_TBE_OPAQUE |
+				    FFB_PPC_CS_CONST);
+		unsigned int ppc_mask = (FFB_PPC_APE_MASK | FFB_PPC_TBE_MASK |
+					 FFB_PPC_CS_MASK);
+		unsigned int rop = (FFB_ROP_EDIT_BIT | alu) | (FFB_ROP_NEW << 8);
+		unsigned int fbc = FFB_FBC_WIN(pWin);
+
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+
+		if((pFfb->ppc_cache & ppc_mask) != ppc ||
+		   pFfb->fg_cache != copyPlaneFG ||
+		   pFfb->fbc_cache != fbc ||
+		   pFfb->rop_cache != rop ||
+		   pFfb->pmask_cache != planemask ||
+		   pFfb->bg_cache != copyPlaneBG) {
+			pFfb->ppc_cache &= ~ppc_mask;
+			pFfb->ppc_cache |= ppc;
+			pFfb->fg_cache = copyPlaneFG;
+			pFfb->fbc_cache = fbc;
+			pFfb->rop_cache = rop;
+			pFfb->pmask_cache = planemask;
+			pFfb->bg_cache = copyPlaneBG;
+			pFfb->rp_active = 1;
+			FFBFifo(pFfb, 6);
+			ffb->ppc = ppc;
+			ffb->fg = copyPlaneFG;
+			ffb->fbc = fbc;
+			ffb->rop = rop;
+			ffb->pmask = planemask;
+			ffb->bg = copyPlaneBG;
+		}
+	}
+
+	cfbGetTypedWidthAndPointer (pSrcDrawable, widthSrc, psrcBase, unsigned int, unsigned int)
+
+	nbox = REGION_NUM_RECTS(prgnDst);
+	pbox = REGION_RECTS(prgnDst);
+	while (nbox--) {
+		dstx = pbox->x1;
+		dsty = pbox->y1;
+		srcx = pptSrc->x;
+		srcy = pptSrc->y;
+		width = pbox->x2 - dstx;
+		height = pbox->y2 - dsty;
+		pbox++;
+		pptSrc++;
+		if (!width)
+			continue;
+		psrc = psrcBase + srcy * widthSrc + (srcx >> 5);
+		for (xoffSrc = srcx & 0x1f; height--; psrc = psrcStart + widthSrc) {
+			w = width;
+			psrcStart = psrc;
+			FFBFifo(pFfb, (1 + (xoffSrc != 0)));
+			ffb->fontxy = ((dsty++ << 16) | (dstx & 0xffff));
+			if (xoffSrc) {
+				tmp = 32 - xoffSrc;
+				if (tmp > w)
+					tmp = w;
+				FFB_WRITE_FONTW(pFfb, ffb, tmp);
+				FFB_WRITE_FONTINC(pFfb, ffb, tmp);
+				ffb->font = *psrc++ << xoffSrc;
+				w -= tmp;
+			}
+			if (!w)
+				continue;
+			FFB_WRITE_FONTW(pFfb, ffb, 32);
+			FFB_WRITE_FONTINC(pFfb, ffb, 32);
+			while (w >= 256) {
+				FFBFifo(pFfb, 8);
+				for (i = 0; i < 8; i++)
+					ffb->font = *psrc++;
+				w -= 256;
+			}
+			while (w >= 32) {
+				FFBFifo(pFfb, 1);
+				ffb->font = *psrc++;
+				w -= 32;
+			}
+			if (w) {
+				FFB_WRITE_FONTW(pFfb, ffb, w);
+				FFBFifo(pFfb, 1);
+				ffb->font = *psrc++;
+			}
+		}
+	}
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+
+RegionPtr CreatorCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+			   GCPtr pGC, int srcx, int srcy, int width, int height,
+			   int dstx, int dsty, unsigned long bitPlane)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pSrcDrawable->pScreen);
+	WindowPtr pWin = (WindowPtr) pDstDrawable;
+	ffb_fbcPtr ffb = pFfb->regs;
+	RegionPtr ret;
+
+	FFBLOG(("CreatorCopyPlane: sbpp(%d) dbpp(%d) src[%08x:%08x] dst[%08x:%08x] bplane(%08x)\n",
+		pSrcDrawable->bitsPerPixel, pDstDrawable->bitsPerPixel,
+		srcx, srcy, dstx, dsty, bitPlane));
+	if (pSrcDrawable->bitsPerPixel == 1 &&
+	    (pDstDrawable->bitsPerPixel == 32 || pDstDrawable->bitsPerPixel == 8)) {
+		if (bitPlane == 1) {
+			copyPlaneFG = pGC->fgPixel;
+			copyPlaneBG = pGC->bgPixel;
+			ret = cfbBitBlt (pSrcDrawable, pDstDrawable,
+					 pGC, srcx, srcy, width, height,
+					 dstx, dsty, CreatorCopyPlane1toFbBpp, bitPlane);
+		} else
+			ret = miHandleExposures (pSrcDrawable, pDstDrawable,
+						 pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);
+	} else if ((pSrcDrawable->bitsPerPixel == 32 || pSrcDrawable->bitsPerPixel == 8)
+		   && pDstDrawable->bitsPerPixel == 1) {
+		extern int InverseAlu[16];
+		int oldalu;
+
+		oldalu = pGC->alu;
+		if ((pGC->fgPixel & 1) == 0 && (pGC->bgPixel&1) == 1)
+			pGC->alu = InverseAlu[pGC->alu];
+		else if ((pGC->fgPixel & 1) == (pGC->bgPixel & 1))
+			pGC->alu = mfbReduceRop(pGC->alu, pGC->fgPixel);
+		FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin);
+		FFBWait(pFfb, ffb);
+		if (pSrcDrawable->bitsPerPixel == 32) {
+			ret = cfbBitBlt (pSrcDrawable, pDstDrawable,
+					 pGC, srcx, srcy, width, height, dstx, dsty,
+					 CreatorCopyPlane32to1, bitPlane);
+		} else {
+			ret = cfbBitBlt (pSrcDrawable, pDstDrawable,
+					 pGC, srcx, srcy, width, height, dstx, dsty,
+					 cfbCopyPlane8to1, bitPlane);
+		}
+		pGC->alu = oldalu;
+	} else {
+		PixmapPtr pBitmap;
+		ScreenPtr pScreen = pSrcDrawable->pScreen;
+		GCPtr pGC1;
+
+		pBitmap = (*pScreen->CreatePixmap) (pScreen, width, height, 1);
+		if (!pBitmap)
+			return NULL;
+		pGC1 = GetScratchGC (1, pScreen);
+		if (!pGC1) {
+			(*pScreen->DestroyPixmap) (pBitmap);
+			return NULL;
+		}
+		/*
+		 * don't need to set pGC->fgPixel,bgPixel as copyPlane{8,32}to1
+		 * ignores pixel values, expecting the rop to "do the
+		 * right thing", which GXcopy will.
+		 */
+		ValidateGC ((DrawablePtr) pBitmap, pGC1);
+		/* no exposures here, scratch GC's don't get graphics expose */
+		FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin);
+		FFBWait(pFfb, ffb);
+		if (pSrcDrawable->bitsPerPixel == 32) {
+			cfbBitBlt (pSrcDrawable, (DrawablePtr) pBitmap,
+				   pGC1, srcx, srcy, width, height, 0, 0,
+				   CreatorCopyPlane32to1, bitPlane);
+		} else {
+			cfbBitBlt (pSrcDrawable, (DrawablePtr) pBitmap,
+				   pGC1, srcx, srcy, width, height, 0, 0,
+				   cfbCopyPlane8to1, bitPlane);
+		}
+		copyPlaneFG = pGC->fgPixel;
+		copyPlaneBG = pGC->bgPixel;
+		cfbBitBlt ((DrawablePtr) pBitmap, pDstDrawable, pGC,
+			   0, 0, width, height, dstx, dsty, CreatorCopyPlane1toFbBpp, 1);
+		FreeScratchGC (pGC1);
+		(*pScreen->DestroyPixmap) (pBitmap);
+		/* compute resultant exposures */
+		ret = miHandleExposures (pSrcDrawable, pDstDrawable, pGC,
+					 srcx, srcy, width, height,
+					 dstx, dsty, bitPlane);
+	}
+	return ret;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cursor.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cursor.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cursor.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,139 @@
+/*
+ * Hardware cursor support for Creator, Creator 3D and Elite 3D
+ *
+ * Copyright 2000 by Jakub Jelinek <jakub@redhat.com>.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Jakub
+ * Jelinek not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission.  Jakub Jelinek makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * JAKUB JELINEK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL JAKUB JELINEK BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cursor.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+
+/* This file just performs cursor software state management.  The
+ * actual programming is done by calls into the DAC layer.
+ */
+
+static void FFBLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
+static void FFBShowCursor(ScrnInfoPtr pScrn);
+static void FFBHideCursor(ScrnInfoPtr pScrn);
+static void FFBSetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
+static void FFBSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
+
+static void
+FFBLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
+{
+    FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+    unsigned int *data = (unsigned int *)src;
+    int x, y;
+
+    pFfb->CursorData = src;
+    x = pFfb->CursorShiftX;
+    y = pFfb->CursorShiftY;
+    if (x >= 64 || y >= 64)
+	y = 64;
+    FFBDacCursorLoadBitmap(pFfb, x, y, data);
+}
+
+static void 
+FFBShowCursor(ScrnInfoPtr pScrn)
+{
+    FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+    FFBDacCursorEnableDisable(pFfb, 1);
+}
+
+static void
+FFBHideCursor(ScrnInfoPtr pScrn)
+{
+    FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+    FFBDacCursorEnableDisable(pFfb, 0);
+    pFfb->CursorData = NULL;
+}
+
+static void
+FFBSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+{
+    FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+    int CursorShiftX = 0, CursorShiftY = 0;
+
+    if (x < 0) {
+	CursorShiftX = -x;
+	x = 0;
+	if (CursorShiftX > 64)
+	    CursorShiftX = 64;
+    }
+    if (y < 0) {
+	CursorShiftY = -y;
+	y = 0;
+	if (CursorShiftY > 64)
+	    CursorShiftY = 64;
+    }
+    if ((CursorShiftX != pFfb->CursorShiftX ||
+	 CursorShiftY != pFfb->CursorShiftY) &&
+	pFfb->CursorData != NULL) {
+	pFfb->CursorShiftX = CursorShiftX;
+	pFfb->CursorShiftY = CursorShiftY;
+	FFBLoadCursorImage(pScrn, pFfb->CursorData);
+    }
+	
+    FFBDacLoadCursorPos(pFfb, x, y);
+}
+
+static void
+FFBSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+{
+    FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+    FFBDacLoadCursorColor(pFfb, fg, bg);
+}
+
+Bool 
+FFBHWCursorInit(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    FFBPtr pFfb;
+    xf86CursorInfoPtr infoPtr;
+
+    pFfb = GET_FFB_FROM_SCRN(pScrn);
+    pFfb->CursorShiftX = 0;
+    pFfb->CursorShiftY = 0;
+    pFfb->CursorData = NULL;
+
+    infoPtr = xf86CreateCursorInfoRec();
+    if(!infoPtr) return FALSE;
+    
+    pFfb->CursorInfoRec = infoPtr;
+
+    infoPtr->MaxWidth = 64;
+    infoPtr->MaxHeight = 64;
+    infoPtr->Flags =  HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
+	HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED;
+
+    infoPtr->SetCursorColors = FFBSetCursorColors;
+    infoPtr->SetCursorPosition = FFBSetCursorPosition;
+    infoPtr->LoadCursorImage = FFBLoadCursorImage;
+    infoPtr->HideCursor = FFBHideCursor;
+    infoPtr->ShowCursor = FFBShowCursor;
+    infoPtr->UseHWCursor = NULL;
+
+    return xf86InitCursor(pScreen, infoPtr);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.c	Fri Jun 30 10:15:16 2000
@@ -0,0 +1,491 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - DAC programming.
+ *
+ * Copyright (C) 2000 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.c,v 1.2 2000/06/30 17:15:16 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+#include "xf86DDC.h"
+
+/* Cursor programming */
+
+void
+FFBDacLoadCursorPos(FFBPtr pFfb, int x, int y)
+{
+	ffb_dacPtr dac = pFfb->dac;
+	int posval;
+
+	posval = ((y & 0xffff) << 16) | (x & 0xffff);
+	posval &= (FFBDAC_CUR_POS_Y_SIGN |
+		   FFBDAC_CUR_POS_Y |
+		   FFBDAC_CUR_POS_X_SIGN |
+		   FFBDAC_CUR_POS_X);
+
+	DACCUR_WRITE(dac, FFBDAC_CUR_POS, posval);
+}
+
+void
+FFBDacLoadCursorColor(FFBPtr pFfb, int fg, int bg)
+{
+	ffb_dacPtr dac = pFfb->dac;
+
+	dac->cur = FFBDAC_CUR_COLOR1;
+	dac->curdata = bg;
+	dac->curdata = fg;
+}
+
+void
+FFBDacCursorEnableDisable(FFBPtr pFfb, int enable)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_dacPtr dac = pFfb->dac;
+	int val;
+
+	val = 0;
+	if (!enable)
+		val = (FFBDAC_CUR_CTRL_P0 | FFBDAC_CUR_CTRL_P1);
+
+	/* PAC1 ramdacs with manufacturing revision less than
+	 * '3' invert these control bits, wheee...
+	 */
+	if (p->flags & FFB_DAC_ICURCTL)
+		val ^= (FFBDAC_CUR_CTRL_P0 | FFBDAC_CUR_CTRL_P1);
+
+	DACCUR_WRITE(dac, FFBDAC_CUR_CTRL, val);
+}
+
+void
+FFBDacCursorLoadBitmap(FFBPtr pFfb, int xshift, int yshift, unsigned int *bitmap)
+{
+	ffb_dacPtr dac = pFfb->dac;
+	int i, j;
+
+	dac->cur = FFBDAC_CUR_BITMAP_P0;
+	for (j = 0; j < 2; j++) {
+		bitmap += yshift * 2;
+		if (!xshift) {
+			for (i = yshift * 2; i < 128; i++)
+				dac->curdata = *bitmap++;
+		} else if (xshift < 32) {
+			for (i = yshift; i < 64; i++, bitmap += 2) {
+				dac->curdata = (bitmap[0] << xshift) |
+					(bitmap[1] >> (32 - xshift));
+				dac->curdata = bitmap[1] << xshift;
+			}
+		} else {
+			for (i = yshift; i < 64; i++, bitmap += 2) {
+				dac->curdata = bitmap[1] << (xshift - 32);
+				dac->curdata = 0;
+			}
+		}
+
+		for (i = 0; i < yshift * 2; i++)
+			dac->curdata = 0;
+	}
+}
+
+/* Config space programming */
+
+/* XF86 LoadPalette callback. */
+
+void
+FFBDacLoadPalette(ScrnInfoPtr pScrn, int ncolors, int *indices, LOCO *colors, VisualPtr pVisual)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_dacPtr dac = pFfb->dac;
+	unsigned int *cluts;
+	int i, index, palette;
+
+	if ((pVisual->nplanes != 8 && pVisual->class != DirectColor) ||
+	    (pVisual->nplanes == 8 && pVisual->class == StaticGray))
+		return;
+
+	palette = 0;
+	if (p->flags & FFB_DAC_PAC2) {
+		if (pVisual->class == PseudoColor)
+			palette = 0;
+		if (pVisual->class == GrayScale)
+			palette = 1;
+		if (pVisual->class == DirectColor)
+			palette = 2;
+	}
+
+	cluts = &p->x_dac_state.clut[256 * palette];
+	for (i = 0; i < ncolors; i++) {
+		unsigned int regval;
+
+		index = indices[i];
+		if (pVisual->class == GrayScale) {
+			regval = cluts[index] =
+				((colors[index].red << FFBDAC_COLOR_RED_SHFT) |
+				 (colors[index].red << FFBDAC_COLOR_GREEN_SHFT) |
+				 (colors[index].red << FFBDAC_COLOR_BLUE_SHFT));
+		} else {
+			regval = cluts[index] =
+				((colors[index].red   << FFBDAC_COLOR_RED_SHFT) |
+				 (colors[index].green << FFBDAC_COLOR_GREEN_SHFT) |
+				 (colors[index].blue  << FFBDAC_COLOR_BLUE_SHFT));
+		}
+
+		FFBLOG(("FFBDacLoadPalette: visclass(%d) index(%d) val[%08x]\n",
+			pVisual->class, index, regval));
+
+		/* Now update the hardware copy. */
+		dac->cfg = FFBDAC_CFG_CLUP(palette) + index;
+		dac->cfgdata = regval;
+	}
+}
+
+/* WARNING: Very dangerous function, use with extreme care. */
+static void
+dac_stop(FFBPtr pFfb)
+{
+	ffb_dacPtr dac = pFfb->dac;
+	unsigned int tgctrl;
+
+	tgctrl = DACCFG_READ(dac, FFBDAC_CFG_TGEN);
+	if (tgctrl & FFBDAC_CFG_TGEN_TGE) {
+		long limit = 1000000;
+
+		/* We try to shut off the timing generation
+		 * precisely at the beginning of a vertical
+		 * retrace.  This is really just to make it
+		 * look nice, it's not a functional necessity.
+		 *
+		 * The limit is so that malfunctioning hardware
+		 * does not end up hanging the server.
+		 */
+		while (limit--) {
+			unsigned int vctr = DACCFG_READ(dac, FFBDAC_CFG_TGVC);
+
+			if (vctr == 0)
+				break;
+		}		
+
+		DACCFG_WRITE(dac, FFBDAC_CFG_TGEN, 0);
+	}
+}
+
+/* This is made slightly complex because the ordering matters
+ * between several operations.  We have to stop the DAC while
+ * restoring the timing registers so that some intermediate
+ * state does not emit wild retrace signals to the monitor.
+ *
+ * Another further complication is that we need to mess with
+ * some portions of the FFB framebuffer config registers to
+ * do this all properly.
+ */
+static void
+dac_state_restore(FFBPtr pFfb, ffb_dac_hwstate_t *state)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_dacPtr dac = pFfb->dac;
+	ffb_fbcPtr ffb = pFfb->regs;
+	int i, nluts;
+
+	/* Step 1: Shut off all pixel timing generation. */
+	dac_stop(pFfb);
+	ffb->fbcfg0 = 0;
+
+	/* Step 2: Restore timing settings. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_VBNP, state->vbnp);
+	DACCFG_WRITE(dac, FFBDAC_CFG_VBAP, state->vbap);
+	DACCFG_WRITE(dac, FFBDAC_CFG_VSNP, state->vsnp);
+	DACCFG_WRITE(dac, FFBDAC_CFG_VSAP, state->vsap);
+	DACCFG_WRITE(dac, FFBDAC_CFG_HSNP, state->hsnp);
+	DACCFG_WRITE(dac, FFBDAC_CFG_HBNP, state->hbnp);
+	DACCFG_WRITE(dac, FFBDAC_CFG_HBAP, state->hbap);
+	DACCFG_WRITE(dac, FFBDAC_CFG_HSYNCNP, state->hsyncnp);
+	DACCFG_WRITE(dac, FFBDAC_CFG_HSYNCAP, state->hsyncap);
+	DACCFG_WRITE(dac, FFBDAC_CFG_HSCENNP, state->hscennp);
+	DACCFG_WRITE(dac, FFBDAC_CFG_HSCENAP, state->hscenap);
+	DACCFG_WRITE(dac, FFBDAC_CFG_EPNP, state->epnp);
+	DACCFG_WRITE(dac, FFBDAC_CFG_EINP, state->einp);
+	DACCFG_WRITE(dac, FFBDAC_CFG_EIAP, state->eiap);
+
+	/* Step 3: Restore rest of DAC hw state. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_PPLLCTRL, state->ppllctrl);
+	DACCFG_WRITE(dac, FFBDAC_CFG_GPLLCTRL, state->gpllctrl);
+	DACCFG_WRITE(dac, FFBDAC_CFG_PFCTRL, state->pfctrl);
+	DACCFG_WRITE(dac, FFBDAC_CFG_UCTRL, state->uctrl);
+
+	nluts = (p->flags & FFB_DAC_PAC1) ? 256 : (4 * 256);
+	dac->cfg = FFBDAC_CFG_CLUP_BASE;
+	for (i = 0; i < nluts; i++)
+		dac->cfgdata = state->clut[i];
+
+	if (p->flags & FFB_DAC_PAC2) {
+		dac->cfg = FFBDAC_PAC2_AOVWLUT0;
+		for (i = 0; i < 4; i++)
+			dac->cfgdata = state->ovluts[i];
+	}
+
+	DACCFG_WRITE(dac, FFBDAC_CFG_WTCTRL, state->wtctrl);
+	DACCFG_WRITE(dac, FFBDAC_CFG_TMCTRL, state->tmctrl);
+	DACCFG_WRITE(dac, FFBDAC_CFG_TCOLORKEY, state->tcolorkey);
+	if (p->flags & FFB_DAC_PAC2)
+		DACCFG_WRITE(dac, FFBDAC_CFG_WAMASK, state->wamask);
+
+	if (p->flags & FFB_DAC_PAC1) {
+		dac->cfg = FFBDAC_PAC1_APWLUT_BASE;
+		for (i = 0; i < 32; i++)
+			dac->cfgdata = state->pwluts[i];
+	} else {
+		dac->cfg = FFBDAC_PAC2_APWLUT_BASE;
+		for (i = 0; i < 64; i++)
+			dac->cfgdata = state->pwluts[i];
+	}
+
+	DACCFG_WRITE(dac, FFBDAC_CFG_DACCTRL, state->dacctrl);
+
+	/* Step 4: Restore FFB framebuffer config state. */
+	if (pFfb->ffb_type == ffb2_vertical_plus ||
+	    pFfb->ffb_type == ffb2_horizontal_plus ||
+	    pFfb->ffb_type == afb_m3 ||
+	    pFfb->ffb_type == afb_m6)
+		ffb->passin = p->ffb_passin_ctrl;
+	ffb->fbcfg0 = p->ffbcfg0;
+	ffb->fbcfg2 = p->ffbcfg2;
+
+	/* Step 5: Restore the timing generator control reg. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_TGEN, state->tgen);
+
+	/* Step 6: Pause for a bit. */
+	for (i = 0; i < 100; i++)
+		(void) DACCFG_READ(dac, FFBDAC_CFG_TGVC);
+}
+
+static void
+dac_state_save(FFBPtr pFfb, ffb_dac_hwstate_t *state)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_dacPtr dac = pFfb->dac;
+	int i, nluts;
+
+	state->ppllctrl = DACCFG_READ(dac, FFBDAC_CFG_PPLLCTRL);
+	state->gpllctrl = DACCFG_READ(dac, FFBDAC_CFG_GPLLCTRL);
+	state->pfctrl   = DACCFG_READ(dac, FFBDAC_CFG_PFCTRL);
+	state->uctrl    = DACCFG_READ(dac, FFBDAC_CFG_UCTRL);
+
+	nluts = (p->flags & FFB_DAC_PAC1) ? 256 : (4 * 256);
+	dac->cfg = FFBDAC_CFG_CLUP_BASE;
+	for (i = 0; i < nluts; i++)
+		state->clut[i] = dac->cfgdata;
+
+	if (p->flags & FFB_DAC_PAC2) {
+		dac->cfg = FFBDAC_PAC2_AOVWLUT0;
+		for (i = 0; i < 4; i++)
+			state->ovluts[i] = dac->cfgdata;
+	}
+
+	state->wtctrl    = DACCFG_READ(dac, FFBDAC_CFG_WTCTRL);
+	state->tmctrl    = DACCFG_READ(dac, FFBDAC_CFG_TMCTRL);
+	state->tcolorkey = DACCFG_READ(dac, FFBDAC_CFG_TCOLORKEY);
+	if (p->flags & FFB_DAC_PAC2)
+		state->wamask = DACCFG_READ(dac, FFBDAC_CFG_WAMASK);
+
+	if (p->flags & FFB_DAC_PAC1) {
+		dac->cfg = FFBDAC_PAC1_APWLUT_BASE;
+		for (i = 0; i < 32; i++)
+			state->pwluts[i] = dac->cfgdata;
+	} else {
+		dac->cfg = FFBDAC_PAC2_APWLUT_BASE;
+		for (i = 0; i < 64; i++)
+			state->pwluts[i] = dac->cfgdata;
+	}
+
+	state->dacctrl = DACCFG_READ(dac, FFBDAC_CFG_DACCTRL);
+
+	state->tgen = DACCFG_READ(dac, FFBDAC_CFG_TGEN);
+	state->vbnp = DACCFG_READ(dac, FFBDAC_CFG_VBNP);
+	state->vbap = DACCFG_READ(dac, FFBDAC_CFG_VBAP);
+	state->vsnp = DACCFG_READ(dac, FFBDAC_CFG_VSNP);
+	state->vsap = DACCFG_READ(dac, FFBDAC_CFG_VSAP);
+	state->hsnp = DACCFG_READ(dac, FFBDAC_CFG_HSNP);
+	state->hbnp = DACCFG_READ(dac, FFBDAC_CFG_HBNP);
+	state->hbap = DACCFG_READ(dac, FFBDAC_CFG_HBAP);
+	state->hsyncnp = DACCFG_READ(dac, FFBDAC_CFG_HSYNCNP);
+	state->hsyncap = DACCFG_READ(dac, FFBDAC_CFG_HSYNCAP);
+	state->hscennp = DACCFG_READ(dac, FFBDAC_CFG_HSCENNP);
+	state->hscenap = DACCFG_READ(dac, FFBDAC_CFG_HSCENAP);
+	state->epnp = DACCFG_READ(dac, FFBDAC_CFG_EPNP);
+	state->einp = DACCFG_READ(dac, FFBDAC_CFG_EINP);
+	state->eiap = DACCFG_READ(dac, FFBDAC_CFG_EIAP);
+}
+
+static void
+init_dac_flags(FFBPtr pFfb)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_dacPtr dac = pFfb->dac;
+	unsigned int did, manuf_rev, partnum;
+	char *device;
+
+	/* For AFB, assume it is PAC2 which also implies not having
+	 * the inverted cursor control attribute.
+	 */
+	if (pFfb->ffb_type == afb_m3 || pFfb->ffb_type == afb_m6) {
+		p->flags = FFB_DAC_PAC2;
+		manuf_rev = 4;
+	} else {
+		p->flags = 0;
+
+		did = DACCFG_READ(dac, FFBDAC_CFG_DID);
+
+		manuf_rev = DACCFG_READ(dac, FFBDAC_CFG_UCTRL);
+		manuf_rev = (manuf_rev & FFBDAC_UCTRL_MANREV) >> 8;
+
+		partnum = ((did & FFBDAC_CFG_DID_PNUM) >> 12);
+		if (partnum == 0x236e)
+			p->flags |= FFB_DAC_PAC2;
+		else
+			p->flags |= FFB_DAC_PAC1;
+	}
+
+	device = pFfb->psdp->device;
+	if ((p->flags & FFB_DAC_PAC1) != 0) {
+		if (manuf_rev < 3) {
+			p->flags |= FFB_DAC_ICURCTL;
+			xf86Msg(X_INFO, "%s: BT9068 (PAC1) ramdac detected (with "
+				"inverted cursor control)\n", device);
+		} else {
+			xf86Msg(X_INFO, "%s: BT9068 (PAC1) ramdac detected (with "
+				"normal cursor control)\n", device);
+		}
+	} else {
+		xf86Msg(X_INFO, "%s: BT498 (PAC2) ramdac detected\n", device);
+	}
+}
+
+/* The registers of the chip must be mapped, and the FFB/AFB
+ * board type must be probed before this is invoked.
+ */
+Bool
+FFBDacInit(FFBPtr pFfb)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	init_dac_flags(pFfb);
+
+	p->ffbcfg0 = ffb->fbcfg0;
+	p->ffbcfg2 = ffb->fbcfg2;
+	if (pFfb->ffb_type == ffb2_vertical_plus ||
+	    pFfb->ffb_type == ffb2_horizontal_plus ||
+	    pFfb->ffb_type == afb_m3 ||
+	    pFfb->ffb_type == afb_m6)
+		p->ffb_passin_ctrl = ffb->passin;
+
+	/* Save the kernel DAC state.  We also save to the
+	 * X server state here as well even though we have
+	 * not modified anything yet.
+	 */
+	dac_state_save(pFfb, &p->kern_dac_state);
+	dac_state_save(pFfb, &p->x_dac_state);
+
+	/* Fire up the WID layer. */
+	FFBWidPoolInit(pFfb);
+
+	return TRUE;
+}
+
+/* We need to reset the A buffer X planes to the value 0xff
+ * when giving the hardware back to the kernel too, thus...
+ * Also need to do this for the B buffer X planes when double
+ * buffering is available.
+ */
+static void
+restore_kernel_xchannel(FFBPtr pFfb)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+	unsigned int fbc, ppc, ppc_mask, drawop;
+
+	if (pFfb->has_double_buffer)
+		fbc = FFB_FBC_WB_AB;
+	else
+		fbc = FFB_FBC_WB_A;
+
+	fbc |= (FFB_FBC_WM_COMBINED | FFB_FBC_RB_A | FFB_FBC_SB_BOTH |
+		FFB_FBC_ZE_OFF | FFB_FBC_YE_OFF |
+		FFB_FBC_XE_ON | FFB_FBC_RGBE_MASK);
+
+	ppc      = (FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST | FFB_PPC_XS_WID);
+	ppc_mask = (FFB_PPC_APE_MASK | FFB_PPC_CS_MASK | FFB_PPC_XS_MASK);
+
+	drawop = FFB_DRAWOP_RECTANGLE;
+
+	FFB_ATTR_RAW(pFfb, ppc, ppc_mask, ~0,
+		     (FFB_ROP_EDIT_BIT | GXcopy)|(FFB_ROP_NEW<<8),
+		     drawop, 0x0, fbc, 0xff);
+
+	FFBFifo(pFfb, 4);
+	FFB_WRITE64(&ffb->by, 0, 0);
+	FFB_WRITE64_2(&ffb->bh, pFfb->psdp->height, pFfb->psdp->width);
+	pFfb->rp_active = 1;
+	FFBWait(pFfb, ffb);
+}
+
+void
+FFBDacFini(FFBPtr pFfb)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+
+	/* Just restore the kernel ramdac/x-channel state. */
+	dac_state_restore(pFfb, &p->kern_dac_state);
+	restore_kernel_xchannel(pFfb);
+}
+
+
+/* Restore X server DAC state. */
+void
+FFBDacEnterVT(FFBPtr pFfb)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+
+	/* Save kernel DAC state. */
+	dac_state_save(pFfb, &p->kern_dac_state);
+
+	/* Restore X DAC state. */
+	dac_state_restore(pFfb, &p->x_dac_state);
+}
+
+/* Restore kernel DAC state. */
+void
+FFBDacLeaveVT(FFBPtr pFfb)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+
+	/* Save X DAC state. */
+	dac_state_save(pFfb, &p->x_dac_state);
+
+	/* Restore kernel DAC and x-channel state. */
+	dac_state_restore(pFfb, &p->kern_dac_state);
+	restore_kernel_xchannel(pFfb);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.h	Mon May 22 21:47:44 2000
@@ -0,0 +1,363 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - DAC register layout.
+ *
+ * Copyright (C) 2000 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.h,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
+
+#ifndef _FFB_DAC_H
+#define _FFB_DAC_H
+
+/* FFB utilizes two different ramdac chips:
+ *
+ *	1) BT9068 "Pacifica1", used in all FFB1 and
+ *	   FFB2 boards.
+ *
+ *	2) BT498(a) "Pacifica2", used in FFB2+ and
+ *	   AFB boards.
+ *
+ * They are mostly equivalent, except in a few key areas:
+ *
+ *	1) WID register layout
+ *	2) Number of CLUT tables
+ *	3) Presence of Window Address Mask register
+ *	4) Method of GAMMA correction support
+ */
+
+/* NOTE: All addresses described in this file are DAC
+ *       indirect addresses.
+ */
+
+/* DAC color values are in the following format. */
+#define FFBDAC_COLOR_BLUE	0x00ff0000
+#define FFBDAC_COLOR_BLUE_SHFT	16
+#define FFBDAC_COLOR_GREEN	0x0000ff00
+#define FFBDAC_COLOR_GREEN_SHFT	8
+#define FFBDAC_COLOR_RED	0x000000ff
+#define FFBDAC_COLOR_RED_SHFT	0
+
+/* Cursor DAC register addresses. */
+#define FFBDAC_CUR_BITMAP_P0	0x000 /* Plane 0 cursor bitmap	*/
+#define FFBDAC_CUR_BITMAP_P1	0x080 /* Plane 1 cursor bitmap	*/
+#define FFBDAC_CUR_CTRL		0x100 /* Cursor control		*/
+#define FFBDAC_CUR_COLOR0	0x101 /* Cursor Color 0		*/
+#define FFBDAC_CUR_COLOR1	0x102 /* Cursor Color 1 (bg)	*/
+#define FFBDAC_CUR_COLOR2	0x103 /* Cursor Color 2	(fg)	*/
+#define FFBDAC_CUR_POS		0x104 /* Active cursor position	*/
+
+/* Cursor control register.
+ * WARNING: Be careful, reverse logic on these bits.
+ */
+#define FFBDAC_CUR_CTRL_P0	0x00000001	/* Plane0 display disable	*/
+#define FFBDAC_CUR_CTRL_P1	0x00000002	/* Plane1 display disable	*/
+
+/* Active cursor position register */
+#define FFBDAC_CUR_POS_Y_SIGN	0x80000000	/* Sign of Y position		*/
+#define FFBDAC_CUR_POS_Y	0x0fff0000	/* Y position			*/
+#define FFBDAC_CUR_POS_X_SIGN	0x00008000	/* Sign of X position		*/
+#define FFBDAC_CUR_POS_X	0x00000fff	/* X position			*/
+
+/* Configuration and Palette DAC register addresses. */
+#define FFBDAC_CFG_PPLLCTRL	0x0000 /* Pixel PLL Control		*/
+#define FFBDAC_CFG_GPLLCTRL	0x0001 /* General Purpose PLL Control	*/
+#define FFBDAC_CFG_PFCTRL	0x1000 /* Pixel Format Control		*/
+#define FFBDAC_CFG_UCTRL	0x1001 /* User Control			*/
+#define FFBDAC_CFG_CLUP_BASE	0x2000 /* Color Lookup Palette		*/
+#define FFBDAC_CFG_CLUP(entry) (FFBDAC_CFG_CLUP_BASE + ((entry) * 0x100))
+#define FFBDAC_PAC2_SOVWLUT0	0x3100 /* Shadow Overlay Window Lookup 0*/
+#define FFBDAC_PAC2_SOVWLUT1	0x3101 /* Shadow Overlay Window Lookup 1*/
+#define FFBDAC_PAC2_SOVWLUT2	0x3102 /* Shadow Overlay Window Lookup 2*/
+#define FFBDAC_PAC2_SOVWLUT3	0x3103 /* Shadow Overlay Window Lookup 3*/
+#define FFBDAC_PAC2_AOVWLUT0	0x3210 /* Active Overlay Window Lookup 0*/
+#define FFBDAC_PAC2_AOVWLUT1	0x3211 /* Active Overlay Window Lookup 1*/
+#define FFBDAC_PAC2_AOVWLUT2	0x3212 /* Active Overlay Window Lookup 2*/
+#define FFBDAC_PAC2_AOVWLUT3	0x3213 /* Active Overlay Window Lookup 3*/
+#define FFBDAC_CFG_WTCTRL	0x3150 /* Window Transfer Control	*/
+#define FFBDAC_CFG_TMCTRL	0x3151 /* Transparent Mask Control	*/
+#define FFBDAC_CFG_TCOLORKEY	0x3152 /* Transparent Color Key		*/
+#define FFBDAC_CFG_WAMASK	0x3153 /* Window Address Mask (PAC2 only) */
+#define FFBDAC_PAC1_SPWLUT_BASE	0x3100 /* Shadow Primary Window Lookups	*/
+#define FFBDAC_PAC1_SPWLUT(entry) (FFBDAC_PAC1_SPWLUT_BASE + (entry))
+#define FFBDAC_PAC1_APWLUT_BASE	0x3120 /* Active Primary Window Lookups	*/
+#define FFBDAC_PAC1_APWLUT(entry) (FFBDAC_PAC1_APWLUT_BASE + (entry))
+#define FFBDAC_PAC2_SPWLUT_BASE	0x3200 /* Shadow Primary Window Lookups	*/
+#define FFBDAC_PAC2_SPWLUT(entry) (FFBDAC_PAC2_SPWLUT_BASE + (entry))
+#define FFBDAC_PAC2_APWLUT_BASE	0x3240 /* Active Primary Window Lookups	*/
+#define FFBDAC_PAC2_APWLUT(entry) (FFBDAC_PAC2_APWLUT_BASE + (entry))
+#define FFBDAC_CFG_SANAL	0x5000 /* Signature Analysis Control	*/
+#define FFBDAC_CFG_DACCTRL	0x5001 /* DAC Control			*/
+#define FFBDAC_CFG_TGEN		0x6000 /* Timing Generator Control	*/
+#define FFBDAC_CFG_VBNP		0x6001 /* Vertical Blank Negation Point	*/
+#define FFBDAC_CFG_VBAP		0x6002 /* Vertical Blank Assertion Point*/
+#define FFBDAC_CFG_VSNP		0x6003 /* Vertical Sync Negation Point	*/
+#define FFBDAC_CFG_VSAP		0x6004 /* Vertical Sync Assertion Point	*/
+#define FFBDAC_CFG_HSNP		0x6005 /* Horz Serration Negation Point */
+#define FFBDAC_CFG_HBNP		0x6006 /* Horz Blank Negation Point	*/
+#define FFBDAC_CFG_HBAP		0x6007 /* Horz Blank Assertion Point	*/
+#define FFBDAC_CFG_HSYNCNP	0x6008 /* Horz Sync Negation Point	*/
+#define FFBDAC_CFG_HSYNCAP	0x6009 /* Horz Sync Assertion Point	*/
+#define FFBDAC_CFG_HSCENNP	0x600A /* Horz SCEN Negation Point	*/
+#define FFBDAC_CFG_HSCENAP	0x600B /* Horz SCEN Assertion Point	*/
+#define FFBDAC_CFG_EPNP		0x600C /* Eql'zing Pulse Negation Point	*/
+#define FFBDAC_CFG_EINP		0x600D /* Eql'zing Intvl Negation Point	*/
+#define FFBDAC_CFG_EIAP		0x600E /* Eql'zing Intvl Assertion Point*/
+#define FFBDAC_CFG_TGVC		0x600F /* Timing Generator Vert Counter	*/
+#define FFBDAC_CFG_TGHC		0x6010 /* Timing Generator Horz Counter	*/
+#define FFBDAC_CFG_DID		0x8000 /* Device Identification		*/
+#define FFBDAC_CFG_MPDATA	0x8001 /* Monitor Port Data		*/
+#define FFBDAC_CFG_MPSENSE	0x8002 /* Monitor Port Sense		*/
+
+/* Pixel PLL Control Register */
+#define FFBDAC_CFG_PPLLCTRL_M	0x0000007f	/* PLL VCO Multiplicand		 */
+#define FFBDAC_CFG_PPLLCTRL_D	0x00000780	/* PLL VCO Divisor		 */
+#define FFBDAC_CFG_PPLLCTRL_PFD	0x00001800	/* Post VCO Frequency Divider	 */
+#define FFBDAC_CFG_PPLLCTRL_EN	0x00004000	/* Enable PLL as pixel clock src */
+
+/* General Purpose PLL Control Register */
+#define FFBDAC_CFG_GPLLCTRL_M	0x0000007f	/* PLL VCO Multiplicand		 */
+#define FFBDAC_CFG_GPLLCTRL_D	0x00000780	/* PLL VCO Divisor		 */
+#define FFBDAC_CFG_GPLLCTRL_PFD	0x00001800	/* Post VCO Frequency Divider	 */
+#define FFBDAC_CFG_GPLLCTRL_EN	0x00004000	/* Enable PLL as Gen. Purpose clk*/
+
+/* Pixel Format Control Register */
+#define FFBDAC_CFG_PFCTRL_2_1	0x00000000	/* 2:1 pixel interleave format	 */
+#define FFBDAC_CFG_PFCTRL_4_1	0x00000001	/* 4:1 pixel interleave format	 */
+#define FFBDAC_CFG_PFCTRL_42_1	0x00000002	/* 4/2:1 pixel interleave format */
+#define FFBDAC_CFG_PFCTRL_82_1	0x00000003	/* 8/2:1 pixel interleave format */
+
+/* User Control Register */
+#define FFBDAC_UCTRL_IPDISAB	0x00000001	/* Disable input pullup resistors*/
+#define FFBDAC_UCTRL_ABLANK	0x00000002	/* Asynchronous Blank		 */
+#define FFBDAC_UCTRL_DBENAB	0x00000004	/* Double-Buffer Enable		 */
+#define FFBDAC_UCTRL_OVENAB	0x00000008	/* Overlay Enable		 */
+#define FFBDAC_UCTRL_WMODE	0x00000030	/* Window Mode			 */
+#define FFBDAC_UCTRL_WM_COMB	0x00000000	/* Window Mode = Combined	 */
+#define FFBDAC_UCTRL_WM_S4	0x00000010	/* Window Mode = Seperate_4	 */
+#define FFBDAC_UCTRL_WM_S8	0x00000020	/* Window Mode = Seperate_8	 */
+#define FFBDAC_UCTRL_WM_RESV	0x00000030	/* Window Mode = reserved	 */
+#define FFBDAC_UCTRL_MANREV	0x00000f00	/* 4-bit Manufacturing Revision	 */
+
+/* Overlay Window Lookup Registers (PAC2 only) */
+#define FFBDAC_CFG_OVWLUT_PSEL	0x0000000f	/* Palette Section, Seperate_4	 */
+#define FFBDAC_CFG_OVWLUT_PTBL	0x00000030	/* Palette Table		 */
+#define FFBDAC_CFG_OVWLUT_LKUP	0x00000100	/* 1 = Use palette, 0 = Bypass	 */
+#define FFBDAC_CFG_OVWLUT_OTYP	0x00000c00	/* Overlay Type			 */
+#define FFBDAC_CFG_OVWLUT_O_N	0x00000000	/* Overlay Type - None		 */
+#define FFBDAC_CFG_OVWLUT_O_T	0x00000400	/* Overlay Type - Transparent	 */
+#define FFBDAC_CFG_OVWLUT_O_O	0x00000800	/* Overlay Type - Opaque	 */
+#define FFBDAC_CFG_OVWLUT_O_R	0x00000c00	/* Overlay Type - Reserved	 */
+#define FFBDAC_CFG_OVWLUT_PCS	0x00003000	/* Psuedocolor Src		 */
+#define FFBDAC_CFG_OVWLUT_P_XO	0x00000000	/* Psuedocolor Src - XO[7:0]	 */
+#define FFBDAC_CFG_OVWLUT_P_R	0x00001000	/* Psuedocolor Src - R[7:0]	 */
+#define FFBDAC_CFG_OVWLUT_P_G	0x00002000	/* Psuedocolor Src - G[7:0]	 */
+#define FFBDAC_CFG_OVWLUT_P_B	0x00003000	/* Psuedocolor Src - B[7:0]	 */
+
+/* Window Transfer Control Register */
+#define FFBDAC_CFG_WTCTRL_DS	0x00000001	/* Device Status, 1 = Busy	 */
+#define FFBDAC_CFG_WTCTRL_TCMD	0x00000002	/* Transfer Command
+						 * 1 = Transfer, 0 = No Action
+						 */
+#define FFBDAC_CFG_WTCTRL_TE	0x00000004	/* Transfer Event
+						 * 1 = Next Frame, 0 = Next Field
+						 */
+#define FFBDAC_CFG_WTCTRL_DRD	0x00000008	/* Drawing Data
+						 * 1 = Local Drawing Active
+						 * 0 = Local Drawing Idle
+						 */
+#define FFBDAC_CFG_WTCTRL_DRS	0x00000010	/* Drawing Status
+						 * 1 = Network Drawing Active
+						 * 0 = Network Drawing Idle
+						 */
+
+/* Transparent Mask Control Register */
+#define FFBDAC_CFG_TMCTRL_OMSK	0x000000ff	/* Overlay Mask			 */
+
+/* Transparent Color Key Register */
+#define FFBDAC_CFG_TCOLORKEY_K	0x000000ff	/* Overlay Color Key		 */
+
+/* Window Address Mask Register (PAC2 only) */
+#define FFBDAC_CFG_WAMASK_PMSK	0x0000003f	/* PWLUT select PMASK		 */
+#define FFBDAC_CFG_WAMASK_OMSK	0x00000300	/* OWLUT control OMASK		 */
+
+/* (non-Overlay) Window Lookup Table Registers, PAC1 format */
+#define FFBDAC_PAC1_WLUT_DB	0x00000020	/* 0 = Buffer A, 1 = Buffer B	 */
+#define FFBDAC_PAC1_WLUT_C	0x0000001c	/* C: Color Model Selection	 */
+#define FFBDAC_PAC1_WLUT_C_8P	0x00000000	/* C: 8bpp Pseudocolor		 */
+#define FFBDAC_PAC1_WLUT_C_8LG	0x00000004	/* C: 8bpp Linear Grey		 */
+#define FFBDAC_PAC1_WLUT_C_8NG	0x00000008	/* C: 8bpp Non-Linear Grey	 */
+#define FFBDAC_PAC1_WLUT_C_24D	0x00000010	/* C: 24bpp Directcolor		 */
+#define FFBDAC_PAC1_WLUT_C_24LT	0x00000014	/* C: 24bpp Linear Truecolor	 */
+#define FFBDAC_PAC1_WLUT_C_24NT	0x00000018	/* C: 24bpp Non-Linear Truecolor */
+#define FFBDAC_PAC1_WLUT_PCS	0x00000003	/* Pseudocolor Src		 */
+#define FFBDAC_PAC1_WLUT_P_XO	0x00000000	/* Pseudocolor Src - XO[7:0]	 */
+#define FFBDAC_PAC1_WLUT_P_R	0x00000001	/* Pseudocolor Src - R[7:0]	 */
+#define FFBDAC_PAC1_WLUT_P_G	0x00000002	/* Pseudocolor Src - G[7:0]	 */
+#define FFBDAC_PAC1_WLUT_P_B	0x00000003	/* Pseudocolor Src - B[7:0]	 */
+
+/* (non-Overlay) Window Lookup Table Registers, PAC2 format */
+#define FFBDAC_PAC2_WLUT_PTBL	0x00000030	/* Palette Table Entry		 */
+#define FFBDAC_PAC2_WLUT_LKUP	0x00000100	/* 1 = Use palette, 0 = Bypass	 */
+#define FFBDAC_PAC2_WLUT_PCS	0x00003000	/* Pseudocolor Src		 */
+#define FFBDAC_PAC2_WLUT_P_XO	0x00000000	/* Pseudocolor Src - XO[7:0]	 */
+#define FFBDAC_PAC2_WLUT_P_R	0x00001000	/* Pseudocolor Src - R[7:0]	 */
+#define FFBDAC_PAC2_WLUT_P_G	0x00002000	/* Pseudocolor Src - G[7:0]	 */
+#define FFBDAC_PAC2_WLUT_P_B	0x00003000	/* Pseudocolor Src - B[7:0]	 */
+#define FFBDAC_PAC2_WLUT_DEPTH	0x00004000	/* 0 = Pseudocolor, 1 = Truecolor*/
+#define FFBDAC_PAC2_WLUT_DB	0x00008000	/* 0 = Buffer A, 1 = Buffer B	 */
+
+/* Signature Analysis Control Register */
+#define FFBDAC_CFG_SANAL_SRR	0x000000ff	/* DAC Seed/Result for Red	 */
+#define FFBDAC_CFG_SANAL_SRG	0x0000ff00	/* DAC Seed/Result for Green	 */
+#define FFBDAC_CFG_SANAL_SRB	0x00ff0000	/* DAC Seed/Result for Blue	 */
+#define FFBDAC_CFG_SANAL_RQST	0x01000000	/* Signature Capture Request	 */
+#define FFBDAC_CFG_SANAL_BSY	0x02000000	/* Signature Analysis Busy	 */
+#define FFBDAC_CFG_SANAL_DSM	0x04000000	/* Data Strobe Mode
+						 * 0 = Signature Analysis Mode
+						 * 1 = Data Strobe Mode
+						 */
+
+/* DAC Control Register */
+#define FFBDAC_CFG_DACCTRL_O2	0x00000003	/* Operand 2 Select
+						 * 00 = Normal Operation
+						 * 01 = Select 145mv Reference
+						 * 10 = Select Blue DAC Output
+						 * 11 = Reserved
+						 */
+#define FFBDAC_CFG_DACCTRL_O1	0x0000000c	/* Operand 1 Select
+						 * 00 = Normal Operation
+						 * 01 = Select Green DAC Output
+						 * 10 = Select Red DAC Output
+						 * 11 = Reserved
+						 */
+#define FFBDAC_CFG_DACCTRL_CR	0x00000010	/* Comparator Result
+						 * 0 = operand1 < operand2
+						 * 1 = operand1 > operand2
+						 */
+#define FFBDAC_CFG_DACCTRL_SGE	0x00000020	/* Sync-on-Green Enable		 */
+#define FFBDAC_CFG_DACCTRL_PE	0x00000040	/* Pedestal Enable		 */
+#define FFBDAC_CFG_DACCTRL_VPD	0x00000080	/* VSYNC* Pin Disable		 */
+#define FFBDAC_CFG_DACCTRL_SPB	0x00000100	/* Sync Polarity Bit
+						 * 0 = VSYNC* and CSYNC* active low
+						 * 1 = VSYNC* and CSYNC* active high
+						 */
+
+/* Timing Generator Control Register */
+#define FFBDAC_CFG_TGEN_VIDE	0x00000001	/* Video Enable			 */
+#define FFBDAC_CFG_TGEN_TGE	0x00000002	/* Timing Generator Enable	 */
+#define FFBDAC_CFG_TGEN_HSD	0x00000004	/* HSYNC* Disabled		 */
+#define FFBDAC_CFG_TGEN_VSD	0x00000008	/* VSYNC* Disabled		 */
+#define FFBDAC_CFG_TGEN_EQD	0x00000010	/* Equalization Disabled	 */
+#define FFBDAC_CFG_TGEN_MM	0x00000020	/* 0 = Slave, 1 = Master	 */
+#define FFBDAC_CFG_TGEN_IM	0x00000040	/* 1 = Interlaced Mode		 */
+
+/* Device Identification Register, should be 0xA236E1AD for FFB bt497/bt498 */
+#define FFBDAC_CFG_DID_ONE	0x00000001	/* Always set			 */
+#define FFBDAC_CFG_DID_MANUF	0x00000ffe	/* Manufacturer ID		 */
+#define FFBDAC_CFG_DID_PNUM	0x0ffff000	/* Device Part Number		 */
+#define FFBDAC_CFG_DID_REV	0xf0000000	/* Device Revision		 */
+
+/* Monitor Port Data Register */
+#define FFBDAC_CFG_MPDATA_SCL	0x00000001	/* SCL Data			 */
+#define FFBDAC_CFG_MPDATA_SDA	0x00000002	/* SDA Data			 */
+
+/* Monitor Port Sense Register */
+#define FFBDAC_CFG_MPSENSE_SCL	0x00000001	/* SCL Sense			 */
+#define FFBDAC_CFG_MPSENSE_SDA	0x00000002	/* SDA Sense			 */
+
+/* DAC register access shorthands. */
+#define DACCUR_READ(DAC, ADDR)		((DAC)->cur = (ADDR), (DAC)->curdata)
+#define DACCUR_WRITE(DAC, ADDR, VAL)	((DAC)->cur = (ADDR), (DAC)->curdata = (VAL))
+#define DACCFG_READ(DAC, ADDR)		((DAC)->cfg = (ADDR), (DAC)->cfgdata)
+#define DACCFG_WRITE(DAC, ADDR, VAL)	((DAC)->cfg = (ADDR), (DAC)->cfgdata = (VAL))
+
+typedef struct ffb_dac_hwstate {
+	unsigned int ppllctrl;
+	unsigned int gpllctrl;
+	unsigned int pfctrl;
+	unsigned int uctrl;
+	unsigned int clut[256 * 4];	/* One 256 entry clut on PAC1, 4 on PAC2 */
+	unsigned int ovluts[4];		/* Overlay WLUTS, PAC2 only */
+	unsigned int wtctrl;
+	unsigned int tmctrl;
+	unsigned int tcolorkey;
+	unsigned int wamask;
+	unsigned int pwluts[64];
+	unsigned int dacctrl;
+	unsigned int tgen;
+	unsigned int vbnp;
+	unsigned int vbap;
+	unsigned int vsnp;
+	unsigned int vsap;
+	unsigned int hsnp;
+	unsigned int hbnp;
+	unsigned int hbap;
+	unsigned int hsyncnp;
+	unsigned int hsyncap;
+	unsigned int hscennp;
+	unsigned int hscenap;
+	unsigned int epnp;
+	unsigned int einp;
+	unsigned int eiap;
+} ffb_dac_hwstate_t;
+
+typedef struct {
+	Bool		InUse;
+
+	/* The following fields are undefined unless InUse is TRUE. */
+	int		refcount;
+	Bool		canshare;
+	unsigned int	wlut_regval;
+	int		buffer;		/* 0 = Buffer A, 1 = Buffer B	*/
+	int		depth;		/* 8 or 32 bpp			*/
+	int		greyscale;	/* 1 = greyscale, 0 = color	*/
+	int		linear;		/* 1 = linear, 0 = non-linear	*/
+	int		direct;		/* 1 = 24bpp directcolor	*/
+	int		channel;	/* 0 = X, 1 = R, 2 = G, 3 = B	*/
+	int		palette;	/* Only PAC2 has multiple CLUTs	*/
+} ffb_wid_info_t;
+
+#define FFB_MAX_PWIDS	64
+typedef struct {
+	int		num_wids;
+	int		wid_shift;	/* To get X channel value	*/
+	ffb_wid_info_t	wid_pool[FFB_MAX_PWIDS];
+} ffb_wid_pool_t;
+
+typedef struct ffb_dac_info {
+	unsigned int flags;
+#define FFB_DAC_PAC1	0x00000001	/* Pacifica1 DAC, BT9068	*/
+#define FFB_DAC_PAC2	0x00000002	/* Pacifica2 DAC, BT498		*/
+#define FFB_DAC_ICURCTL	0x00000004	/* Inverted CUR_CTRL bits	*/
+
+	/* These registers need to be modified when changing DAC
+	 * timing state, so at init time we capture their values.
+	 */
+	unsigned int ffbcfg0;
+	unsigned int ffbcfg2;
+	unsigned int ffb_passin_ctrl;	/* FFB2+/AFB only */
+
+	ffb_dac_hwstate_t	kern_dac_state;
+	ffb_dac_hwstate_t	x_dac_state;
+
+	ffb_wid_pool_t		wid_table;
+} ffb_dac_info_t;
+
+#endif /* _FFB_DAC_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,901 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Dbe Acceleration.
+ *
+ * Copyright (C) 2000 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
+
+#define NEED_REPLIES
+#define NEED_EVENTS
+#include "X.h"
+#include "Xproto.h"
+#include "misc.h"
+#include "os.h"
+#include "windowstr.h"
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "extnsionst.h"
+#include "dixstruct.h"
+#include "resource.h"
+#include "opaque.h"
+#include "dbestruct.h"
+#include "regionstr.h"
+#include "gcstruct.h"
+#include "inputstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+#include "xf86_ansic.h"
+#include "xf86.h"
+
+#include "ffb.h"
+#include "ffb_fifo.h"
+#include "ffb_rcache.h"
+
+static int	FFBDbePrivPrivGeneration  =  0;
+static int	FFBDbeWindowPrivPrivIndex = -1;
+static RESTYPE	dbeDrawableResType;
+static RESTYPE	dbeWindowPrivResType;
+static int	dbeScreenPrivIndex = -1;
+static int	dbeWindowPrivIndex = -1;
+
+#define FFB_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv) \
+    (((FFBDbeWindowPrivPrivIndex < 0) || (!pDbeWindowPriv)) ? \
+    NULL : \
+    ((FFBDbeWindowPrivPrivPtr) \
+     ((pDbeWindowPriv)->devPrivates[FFBDbeWindowPrivPrivIndex].ptr)))
+
+#define FFB_DBE_WINDOW_PRIV_PRIV_FROM_WINDOW(pWin) \
+    FFB_DBE_WINDOW_PRIV_PRIV(DBE_WINDOW_PRIV(pWin))
+
+typedef struct _FFBDbeWindowPrivPrivRec {
+	int HwAccelerated;
+	int HwCurrentBuf;	/* 0 = buffer A, 1 = buffer B */
+
+	/* We need also what midbe would use in case we must
+	 * revert to unaccelerated dbe.
+	 */
+	PixmapPtr		pBackBuffer;
+	PixmapPtr		pFrontBuffer;
+
+	/* Back pointer to generic DBE layer window private. */
+	DbeWindowPrivPtr	pDbeWindowPriv;
+} FFBDbeWindowPrivPrivRec, *FFBDbeWindowPrivPrivPtr;
+
+static Bool
+FFBDbeGetVisualInfo(ScreenPtr pScreen, XdbeScreenVisualInfo *pScrVisInfo)
+{
+	XdbeVisualInfo *visInfo;
+	DepthPtr pDepth;
+	int i, j, k, count;
+
+	/* XXX Should check for double-buffer presence.  But even if
+	 * XXX the double-buffer is not present we can still play
+	 * XXX tricks with GetWindowPixmap in 8bpp mode, ie. double
+	 * XXX buffer between the R and G planes of buffer A. -DaveM
+	 */
+
+	/* Determine number of visuals for this screen. */
+	for (i = 0, count = 0; i < pScreen->numDepths; i++)
+		count += pScreen->allowedDepths[i].numVids;
+
+	/* Allocate an array of XdbeVisualInfo items. */
+	if (!(visInfo = (XdbeVisualInfo *)xalloc(count * sizeof(XdbeVisualInfo))))
+		return FALSE;
+
+	for (i = 0, k = 0; i < pScreen->numDepths; i++) {
+		/* For each depth of this screen, get visual information. */
+		pDepth = &pScreen->allowedDepths[i];
+		for (j = 0; j < pDepth->numVids; j++) {
+			/* For each visual for this depth of this screen, get visual ID
+			 * and visual depth.  For now, we will always return
+			 * the same performance level for all visuals (0).  A higher
+			 * performance level value indicates higher performance.
+			 */
+			visInfo[k].visual    = pDepth->vids[j];
+			visInfo[k].depth     = pDepth->depth;
+
+			/* XXX We should set this appropriately... -DaveM */
+			visInfo[k].perflevel = 0;
+			k++;
+		}
+	}
+
+	/* Record the number of visuals and point visual_depth to
+	 * the array of visual info.
+	 */
+	pScrVisInfo->count   = count;
+	pScrVisInfo->visinfo = visInfo;
+
+	return TRUE;
+}
+
+static void
+FFBDbeUpdateWidPlane(WindowPtr pWin, GCPtr pGC)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pWin->drawable.pScreen);
+	CreatorPrivWinPtr pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+	RegionPtr prgnClip;
+	BoxPtr pboxClipped, pboxClippedBase;
+	unsigned int fbc;
+	int numRects;
+	int x, y, w, h;
+
+	x = pWin->drawable.x;
+	y = pWin->drawable.y;
+	w = pWin->drawable.width;
+	h = pWin->drawable.height;
+
+	fbc = pFfbPrivWin->fbc_base;
+	fbc = (fbc & ~FFB_FBC_WB_MASK) | FFB_FBC_WB_AB;
+	fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_ON;
+	fbc = (fbc & ~FFB_FBC_RGBE_MASK) | FFB_FBC_RGBE_OFF;
+
+	prgnClip = cfbGetCompositeClip(pGC);
+	numRects = REGION_NUM_RECTS (prgnClip);
+	pboxClippedBase = (BoxPtr) ALLOCATE_LOCAL(numRects * sizeof(BoxRec));
+	if (!pboxClippedBase)
+		return;
+
+	pboxClipped = pboxClippedBase;
+	{
+		int x1, y1, x2, y2, bx2, by2;
+		BoxRec box;
+		BoxPtr pextent;
+
+		pextent = REGION_EXTENTS(pGC->pScreen, prgnClip);
+		x1 = pextent->x1;
+		y1 = pextent->y1;
+		x2 = pextent->x2;
+		y2 = pextent->y2;
+
+		if ((box.x1 = x) < x1)
+			box.x1 = x1;
+
+		if ((box.y1 = y) < y1)
+			box.y1 = y1;
+
+		bx2 = (int) x + (int) w;
+		if (bx2 > x2)
+			bx2 = x2;
+		box.x2 = bx2;
+
+		by2 = (int) y + (int) h;
+		if (by2 > y2)
+			by2 = y2;
+		box.y2 = by2;
+
+		if ((box.x1 < box.x2) && (box.y1 < box.y2)) {
+			int n = REGION_NUM_RECTS (prgnClip);
+			BoxPtr pbox = REGION_RECTS(prgnClip);
+
+			/* Clip the rectangle to each box in the clip region
+			 * this is logically equivalent to calling Intersect()
+			 */
+			while(n--) {
+				pboxClipped->x1 = max(box.x1, pbox->x1);
+				pboxClipped->y1 = max(box.y1, pbox->y1);
+				pboxClipped->x2 = min(box.x2, pbox->x2);
+				pboxClipped->y2 = min(box.y2, pbox->y2);
+				pbox++;
+
+				/* see if clipping left anything */
+				if(pboxClipped->x1 < pboxClipped->x2 &&
+				   pboxClipped->y1 < pboxClipped->y2)
+					pboxClipped++;
+			}
+		}
+	}
+
+	if (pboxClipped != pboxClippedBase) {
+		ffb_fbcPtr ffb = pFfb->regs;
+		int num = (pboxClipped - pboxClippedBase);
+
+		FFB_ATTR_RAW(pFfb,
+			     FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST | FFB_PPC_XS_WID,
+			     FFB_PPC_APE_MASK | FFB_PPC_CS_MASK | FFB_PPC_XS_MASK,
+			     pGC->planemask,
+			     ((FFB_ROP_EDIT_BIT | pGC->alu) | (FFB_ROP_NEW << 8)),
+			     FFB_DRAWOP_RECTANGLE,
+			     pGC->fgPixel,
+			     fbc, pFfbPrivWin->wid);
+
+		pboxClipped = pboxClippedBase;
+		while (num--) {
+			int xx, yy, ww, hh;
+
+			xx = pboxClipped->x1;
+			yy = pboxClipped->y1;
+			ww = (pboxClipped->x2 - xx);
+			hh = (pboxClipped->y2 - yy);
+			FFBFifo(pFfb, 4);
+			FFB_WRITE64(&ffb->by, yy, xx);
+			FFB_WRITE64_2(&ffb->bh, hh, ww);
+		}
+	}
+
+	DEALLOCATE_LOCAL (pboxClippedBase);
+}
+
+static int
+FFBDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
+{
+	ScreenPtr pScreen;
+	FFBPtr pFfb;
+	DbeWindowPrivPtr pDbeWindowPriv;
+	FFBDbeWindowPrivPrivPtr pDbeWindowPrivPriv; 
+	DbeScreenPrivPtr pDbeScreenPriv;
+	GCPtr pGC;
+	xRectangle clearRect;
+
+	pScreen = pWin->drawable.pScreen;
+	pDbeWindowPriv = DBE_WINDOW_PRIV(pWin);
+	pFfb = GET_FFB_FROM_SCREEN(pScreen);
+
+	pDbeWindowPrivPriv = FFB_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv);
+	if (pDbeWindowPriv->nBufferIDs == 0) {
+		/* There is no buffer associated with the window.
+		 * We have to create the window priv priv.  Remember, the window
+		 * priv was created at the DIX level, so all we need to do is
+		 * create the priv priv and attach it to the priv.
+		 */
+		pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
+
+		/* Setup the window priv priv. */
+		pDbeWindowPrivPriv->pDbeWindowPriv = pDbeWindowPriv;
+
+		if (!pFfb->NoAccel && pFfb->has_double_buffer) {
+			CreatorPrivWinPtr pFfbPrivWin;
+			unsigned int wid, fbc;
+
+			/* We just render directly into the hardware, all
+			 * that is needed is to swap the rendering attributes
+			 * and the WID settings during a swap.
+			 */
+			if (!AddResource(bufId, dbeDrawableResType,
+					 (pointer)&pWin->drawable)) {
+				/* Free the buffer and the drawable resource. */
+				FreeResource(bufId, RT_NONE);
+				return BadAlloc;
+			}
+
+			pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+			wid = FFBWidUnshare(pFfb, pFfbPrivWin->wid);
+			if (wid == (unsigned int)-1)
+				return BadAlloc;
+
+			pFfbPrivWin->wid = wid;
+
+			/* Attach the priv priv to the priv. */
+			pDbeWindowPriv->devPrivates[FFBDbeWindowPrivPrivIndex].ptr =
+				(pointer)pDbeWindowPrivPriv;
+
+			/* Indicate we are doing hw acceleration. */
+			pDbeWindowPrivPriv->HwAccelerated = 1;
+
+			/* Start rendering into buffer B. */
+			pDbeWindowPrivPriv->HwCurrentBuf = 1;
+
+			/* No back/front temporary pixmaps. */
+			pDbeWindowPrivPriv->pFrontBuffer = NULL;
+			pDbeWindowPrivPriv->pBackBuffer = NULL;
+
+			/* Switch to writing into buffer B. */
+			fbc = pFfbPrivWin->fbc_base;
+			fbc &= ~(FFB_FBC_WB_MASK | FFB_FBC_RB_MASK);
+			fbc |= (FFB_FBC_WB_B | FFB_FBC_RB_B);
+			pFfbPrivWin->fbc_base = fbc;
+
+			pGC = GetScratchGC(pWin->drawable.depth, pWin->drawable.pScreen);
+
+			/* Fill X plane of front and back buffers. */
+			if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC)) {
+				ValidateGC(&pWin->drawable, pGC);
+				FFBDbeUpdateWidPlane(pWin, pGC);
+			}
+
+			/* Clear out buffer B. */
+			clearRect.x = clearRect.y = 0;
+			clearRect.width  = pWin->drawable.width;
+			clearRect.height = pWin->drawable.height;
+			if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC)) {
+				ValidateGC(&pWin->drawable, pGC);
+				(*pGC->ops->PolyFillRect)(&pWin->drawable, pGC, 1, &clearRect);
+			}
+
+			FreeScratchGC(pGC);
+		} else {
+			/* Get a front pixmap. */
+			if (!(pDbeWindowPrivPriv->pFrontBuffer =
+			      (*pScreen->CreatePixmap)(pScreen, pDbeWindowPriv->width,
+						       pDbeWindowPriv->height,
+						       pWin->drawable.depth)))
+				return BadAlloc;
+
+			/* Get a back pixmap. */
+			if (!(pDbeWindowPrivPriv->pBackBuffer =
+			      (*pScreen->CreatePixmap)(pScreen, pDbeWindowPriv->width,
+						       pDbeWindowPriv->height,
+						       pWin->drawable.depth))) {
+				(*pScreen->DestroyPixmap)(pDbeWindowPrivPriv->pFrontBuffer); 
+				return BadAlloc;
+			}
+
+
+			/* Make the back pixmap a DBE drawable resource. */
+			if (!AddResource(bufId, dbeDrawableResType,
+					 (pointer)pDbeWindowPrivPriv->pBackBuffer)) {
+				/* Free the buffer and the drawable resource. */
+				FreeResource(bufId, RT_NONE);
+				return(BadAlloc);
+			}
+
+			/* Attach the priv priv to the priv. */
+			pDbeWindowPriv->devPrivates[FFBDbeWindowPrivPrivIndex].ptr =
+				(pointer)pDbeWindowPrivPriv;
+
+			/* Indicate we are doing this non-accelerated. */
+			pDbeWindowPrivPriv->HwAccelerated = 0;
+
+			/* Clear the back buffer. */
+			pGC = GetScratchGC(pWin->drawable.depth, pWin->drawable.pScreen);
+			if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC)) {
+				ValidateGC((DrawablePtr)pDbeWindowPrivPriv->pBackBuffer, pGC);
+				clearRect.x = clearRect.y = 0;
+				clearRect.width  = pDbeWindowPrivPriv->pBackBuffer->drawable.width;
+				clearRect.height = pDbeWindowPrivPriv->pBackBuffer->drawable.height;
+				(*pGC->ops->PolyFillRect)(
+					(DrawablePtr)pDbeWindowPrivPriv->pBackBuffer, pGC, 1,
+					&clearRect);
+			}
+			FreeScratchGC(pGC);
+		}
+	} else {
+		pointer cookie;
+
+		/* A buffer is already associated with the window.
+		 * Place the new buffer ID information at the head of the ID list.
+		 */
+		if (pDbeWindowPrivPriv->HwAccelerated != 0)
+			cookie = (pointer)&pWin->drawable;
+		else
+			cookie = (pointer)pDbeWindowPrivPriv->pBackBuffer;
+
+		/* Associate the new ID with an existing pixmap. */
+		if (!AddResource(bufId, dbeDrawableResType, cookie))
+			return BadAlloc;
+	}
+
+	return Success;
+}
+
+static void
+FFBDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv)
+{
+	FFBDbeWindowPrivPrivPtr	pDbeWindowPrivPriv =
+		FFB_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv);
+	pointer cookie;
+	int i;
+
+	if (pDbeWindowPrivPriv->HwAccelerated != 0)
+		cookie = (pointer) &pDbeWindowPriv->pWindow->drawable;
+	else
+		cookie = (pointer) pDbeWindowPrivPriv->pBackBuffer;
+
+	for (i = 0; i < pDbeWindowPriv->nBufferIDs; i++)
+		ChangeResourceValue(pDbeWindowPriv->IDs[i], dbeDrawableResType, cookie);
+}
+
+static int
+FFBDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo)
+{
+	FFBDbeWindowPrivPrivPtr pDbeWindowPrivPriv; 
+	DbeScreenPrivPtr pDbeScreenPriv;
+	PixmapPtr pTmpBuffer;
+	xRectangle clearRect;
+	WindowPtr pWin;
+	GCPtr pGC;
+
+	pWin               = swapInfo[0].pWindow;
+	pDbeScreenPriv     = DBE_SCREEN_PRIV_FROM_WINDOW(pWin);
+	pDbeWindowPrivPriv = FFB_DBE_WINDOW_PRIV_PRIV_FROM_WINDOW(pWin);
+	pGC = GetScratchGC(pWin->drawable.depth, pWin->drawable.pScreen);
+
+	if (pDbeWindowPrivPriv->HwAccelerated != 0) {
+		FFBPtr pFfb = GET_FFB_FROM_SCREEN(pWin->drawable.pScreen);
+		CreatorPrivWinPtr pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+		unsigned int fbc;
+		int visible;
+
+		/* Unfortunately, this is necessary for correctness. */
+		FFBWait(pFfb, pFfb->regs);
+
+		/* Flip front/back in the WID. */
+		visible = 0;
+		if (pWin->viewable &&
+		    pWin->visibility != VisibilityFullyObscured)
+			visible = 1;
+		FFBWidChangeBuffer(pFfb, pFfbPrivWin->wid, visible);
+
+		/* Indicate where we are rendering now. */
+		pDbeWindowPrivPriv->HwCurrentBuf ^= 1;
+
+		/* Update framebuffer controls. */
+		fbc = pFfbPrivWin->fbc_base;
+		fbc &= ~(FFB_FBC_WB_MASK | FFB_FBC_RB_MASK);
+		if (pDbeWindowPrivPriv->HwCurrentBuf == 0)
+			fbc |= FFB_FBC_WB_A | FFB_FBC_RB_A;
+		else
+			fbc |= FFB_FBC_WB_B | FFB_FBC_RB_B;
+
+		/* For XdbeUndefined we do not have to do anything.
+		 * This is true for XdbeUntouched as well because we
+		 * do in fact retain the unobscured contents of the
+		 * front buffer while it is being displayed, thus now
+		 * when it has become the back buffer it is still holding
+		 * those contents.
+		 *
+		 * The XdbeUntouched case is important because most apps
+		 * using dbe use this type of swap.
+		 */
+
+		if (swapInfo[0].swapAction == XdbeCopied) {
+			unsigned int fbc_front_to_back;
+
+			/* Do a GCOPY, front to back. */
+			fbc_front_to_back = fbc & ~FFB_FBC_RB_MASK;
+			if (pDbeWindowPrivPriv->HwCurrentBuf == 0)
+				fbc_front_to_back |= FFB_FBC_RB_B;
+			else
+				fbc_front_to_back |= FFB_FBC_RB_A;
+
+			pFfbPrivWin->fbc_base = fbc_front_to_back;
+			ValidateGC(&pWin->drawable, pGC);
+			(*pGC->ops->CopyArea)(&pWin->drawable,
+					      &pWin->drawable,
+					      pGC,
+					      0, 0,
+					      pWin->drawable.width,
+					      pWin->drawable.height,
+					      0, 0);
+		} else if (swapInfo[0].swapAction == XdbeBackground) {
+			if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC)) {
+				ValidateGC(&pWin->drawable, pGC);
+				clearRect.x = 0;
+				clearRect.y = 0;
+				clearRect.width = pWin->drawable.width;
+				clearRect.height = pWin->drawable.height;
+				(*pGC->ops->PolyFillRect)(&pWin->drawable, pGC,
+							  1, &clearRect);
+			}
+		}
+
+		/* Ok, now render with these fb controls. */
+		pFfbPrivWin->fbc_base = fbc;
+	} else {
+		if (swapInfo[0].swapAction == XdbeUntouched) {
+			ValidateGC((DrawablePtr)pDbeWindowPrivPriv->pFrontBuffer, pGC);
+			(*pGC->ops->CopyArea)((DrawablePtr)pWin,
+					      (DrawablePtr)pDbeWindowPrivPriv->pFrontBuffer,
+					      pGC, 0, 0, pWin->drawable.width,
+					      pWin->drawable.height, 0, 0);
+		}
+
+		ValidateGC((DrawablePtr)pWin, pGC);
+		(*pGC->ops->CopyArea)((DrawablePtr)pDbeWindowPrivPriv->pBackBuffer,
+				      (DrawablePtr)pWin, pGC, 0, 0,
+				      pWin->drawable.width, pWin->drawable.height,
+				      0, 0);
+
+		if (swapInfo[0].swapAction == XdbeBackground) {
+			if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC)) {
+				ValidateGC((DrawablePtr)pDbeWindowPrivPriv->pBackBuffer,
+					   pGC);
+				clearRect.x = 0;
+				clearRect.y = 0;
+				clearRect.width =
+					pDbeWindowPrivPriv->pBackBuffer->drawable.width;
+				clearRect.height =
+					pDbeWindowPrivPriv->pBackBuffer->drawable.height;
+				(*pGC->ops->PolyFillRect)(
+					(DrawablePtr)pDbeWindowPrivPriv->pBackBuffer,
+					pGC, 1, &clearRect);
+			}
+		} else if (swapInfo[0].swapAction == XdbeUntouched) {
+			/* Swap pixmap pointers. */
+			pTmpBuffer = pDbeWindowPrivPriv->pBackBuffer;
+			pDbeWindowPrivPriv->pBackBuffer =
+				pDbeWindowPrivPriv->pFrontBuffer;
+			pDbeWindowPrivPriv->pFrontBuffer = pTmpBuffer;
+			FFBDbeAliasBuffers(pDbeWindowPrivPriv->pDbeWindowPriv);
+		}
+	}
+
+	/* Remove the swapped window from the swap information array and decrement
+	 * pNumWindows to indicate to the DIX level how many windows were actually
+	 * swapped.
+	 */
+	if (*pNumWindows > 1) {
+		/* We were told to swap more than one window, but we only swapped the
+		 * first one.  Remove the first window in the list by moving the last
+		 * window to the beginning.
+		 */
+		swapInfo[0].pWindow    = swapInfo[*pNumWindows - 1].pWindow;
+		swapInfo[0].swapAction = swapInfo[*pNumWindows - 1].swapAction;
+
+		/* Clear the last window information just to be safe. */
+		swapInfo[*pNumWindows - 1].pWindow    = (WindowPtr)NULL;
+		swapInfo[*pNumWindows - 1].swapAction = 0;
+	} else {
+		/* Clear the window information just to be safe. */
+		swapInfo[0].pWindow    = (WindowPtr)NULL;
+		swapInfo[0].swapAction = 0;
+	}
+
+	(*pNumWindows)--;
+
+	FreeScratchGC(pGC);
+
+	return Success;
+}
+
+static void
+FFBDbeWinPrivDelete(DbeWindowPrivPtr pDbeWindowPriv, XID bufId)
+{
+	WindowPtr pWin = pDbeWindowPriv->pWindow;
+	FFBDbeWindowPrivPrivPtr pDbeWindowPrivPriv;
+
+	if (pDbeWindowPriv->nBufferIDs != 0) {
+		/* We still have at least one more buffer ID associated with this
+		 * window.
+		 */
+		return;
+	}
+
+	/* We have no more buffer IDs associated with this window.  We need to
+	 * free some stuff.
+	 */
+	pDbeWindowPrivPriv = FFB_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv);
+
+	/* If we were accelerating we need to restore the framebuffer
+	 * attributes.  We need to also free up the Dbe WID and go
+	 * back to using the shared one.
+	 */
+	if (pDbeWindowPrivPriv->HwAccelerated != 0) {
+		FFBPtr pFfb = GET_FFB_FROM_SCREEN(pWin->drawable.pScreen);
+		CreatorPrivWinPtr pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+		xRectangle clearRect;
+		unsigned int fbc;
+		GCPtr pGC;
+
+		pFfbPrivWin->wid = FFBWidReshare(pFfb, pFfbPrivWin->wid);
+
+		/* Go back to using buffer A. */
+		fbc = pFfbPrivWin->fbc_base;
+		fbc &= ~(FFB_FBC_WB_MASK | FFB_FBC_RB_MASK);
+		fbc |= FFB_FBC_WB_A | FFB_FBC_RB_A;
+
+		/* Now fixup the WID channel. */
+		pFfbPrivWin->fbc_base =
+			(fbc & ~FFB_FBC_RGBE_MASK) | FFB_FBC_RGBE_OFF;
+
+		pGC = GetScratchGC(pWin->drawable.depth, pWin->drawable.pScreen);
+		clearRect.x = clearRect.y = 0;
+		clearRect.width  = pWin->drawable.width;
+		clearRect.height = pWin->drawable.height;
+		ValidateGC(&pWin->drawable, pGC);
+		FFBDbeUpdateWidPlane(pWin, pGC);
+		(*pGC->ops->PolyFillRect)(&pWin->drawable, pGC, 1, &clearRect);
+		FreeScratchGC(pGC);
+
+		pFfbPrivWin->fbc_base = fbc;
+	} else {
+		/* Destroy the front and back pixmaps. */
+		if (pDbeWindowPrivPriv->pFrontBuffer)
+			(*pDbeWindowPriv->pWindow->drawable.pScreen->DestroyPixmap)(
+				pDbeWindowPrivPriv->pFrontBuffer);
+		if (pDbeWindowPrivPriv->pBackBuffer)
+			(*pDbeWindowPriv->pWindow->drawable.pScreen->DestroyPixmap)(
+				pDbeWindowPrivPriv->pBackBuffer);
+	}
+}
+
+static Bool
+FFBDbePositionWindow(WindowPtr pWin, int x, int y)
+{
+	ScreenPtr		pScreen;
+	DbeScreenPrivPtr	pDbeScreenPriv;
+	DbeWindowPrivPtr	pDbeWindowPriv;
+	FFBDbeWindowPrivPrivPtr	pDbeWindowPrivPriv;
+	int			width, height;
+	int			dx, dy, dw, dh;
+	int			sourcex, sourcey;
+	int			destx, desty;
+	int			savewidth, saveheight;
+	PixmapPtr		pFrontBuffer;
+	PixmapPtr		pBackBuffer;
+	Bool			clear;
+	GCPtr			pGC;
+	xRectangle		clearRect;
+	Bool			ret;
+
+	/* 1. Unwrap the member routine. */
+	pScreen                 = pWin->drawable.pScreen;
+	pDbeScreenPriv          = DBE_SCREEN_PRIV(pScreen);
+	pScreen->PositionWindow = pDbeScreenPriv->PositionWindow;
+
+	/* 2. Do any work necessary before the member routine is called.
+	 *
+	 *    In this case we do not need to do anything.
+	 */
+     
+	/* 3. Call the member routine, saving its result if necessary. */
+	ret = (*pScreen->PositionWindow)(pWin, x, y);
+
+	/* 4. Rewrap the member routine, restoring the wrapper value first in case
+	 *    the wrapper (or something that it wrapped) change this value.
+	 */
+	pDbeScreenPriv->PositionWindow = pScreen->PositionWindow;
+	pScreen->PositionWindow = FFBDbePositionWindow;
+
+	/* 5. Do any work necessary after the member routine has been called. */
+	if (!(pDbeWindowPriv = DBE_WINDOW_PRIV(pWin)))
+		return ret;
+
+	if (pDbeWindowPriv->width  == pWin->drawable.width &&
+	    pDbeWindowPriv->height == pWin->drawable.height)
+		return ret;
+
+	width  = pWin->drawable.width;
+	height = pWin->drawable.height;
+
+	dx = pWin->drawable.x - pDbeWindowPriv->x;
+	dy = pWin->drawable.y - pDbeWindowPriv->y;
+	dw = width  - pDbeWindowPriv->width;
+	dh = height - pDbeWindowPriv->height;
+
+	GravityTranslate (0, 0, -dx, -dy, dw, dh, pWin->bitGravity, &destx, &desty);
+
+	clear = ((pDbeWindowPriv->width  < (unsigned short)width ) ||
+		 (pDbeWindowPriv->height < (unsigned short)height) ||
+		 (pWin->bitGravity == ForgetGravity));
+
+	sourcex = 0;
+	sourcey = 0;
+	savewidth  = pDbeWindowPriv->width;
+	saveheight = pDbeWindowPriv->height;
+
+	/* Clip rectangle to source and destination. */
+	if (destx < 0) {
+		savewidth += destx;
+		sourcex   -= destx;
+		destx      = 0;
+	}
+
+	if (destx + savewidth > width)
+		savewidth = width - destx;
+
+	if (desty < 0) {
+		saveheight += desty;
+		sourcey    -= desty;
+		desty       = 0;
+	}
+
+	if (desty + saveheight > height)
+		saveheight = height - desty;
+
+	pDbeWindowPriv->width  = width;
+	pDbeWindowPriv->height = height;
+	pDbeWindowPriv->x = pWin->drawable.x;
+	pDbeWindowPriv->y = pWin->drawable.y;
+
+	pGC = GetScratchGC (pWin->drawable.depth, pScreen);
+
+	if (clear) {
+		if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC)) {
+			clearRect.x = 0;
+			clearRect.y = 0;
+			clearRect.width  = width;
+			clearRect.height = height;
+		} else {
+			clear = FALSE;
+		}
+	}
+
+	pDbeWindowPrivPriv = FFB_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv);
+	if (pDbeWindowPrivPriv->HwAccelerated != 0) {
+		/* If we're hw accelerating, things are much easier. */
+		ValidateGC(&pWin->drawable, pGC);
+		FFBDbeUpdateWidPlane(pWin, pGC);
+		if (clear) {
+			CreatorPrivWinPtr pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+			unsigned int fbc, orig_fbc;
+
+			ValidateGC(&pWin->drawable, pGC);
+			(*pGC->ops->PolyFillRect)(&pWin->drawable, pGC,
+						  1, &clearRect);
+
+			orig_fbc = fbc = pFfbPrivWin->fbc_base;
+			fbc &= ~(FFB_FBC_WB_MASK);
+			if (pDbeWindowPrivPriv->HwCurrentBuf == 0)
+				fbc |= FFB_FBC_WB_B;
+			else
+				fbc |= FFB_FBC_WB_A;
+
+			pFfbPrivWin->fbc_base = fbc;
+
+			if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC)) {
+				ValidateGC(&pWin->drawable, pGC);
+				clearRect.x = 0;
+				clearRect.y = 0;
+				clearRect.width  = width;
+				clearRect.height = height;
+				(*pGC->ops->PolyFillRect)(&pWin->drawable, pGC,
+							  1, &clearRect);
+			}
+
+			pFfbPrivWin->fbc_base = orig_fbc;
+		}
+
+		FreeScratchGC(pGC);
+	} else {
+		/* Create DBE buffer pixmaps equal to size of resized window. */
+		pFrontBuffer = (*pScreen->CreatePixmap)(pScreen, width, height,
+							pWin->drawable.depth);
+
+		pBackBuffer = (*pScreen->CreatePixmap)(pScreen, width, height,
+						       pWin->drawable.depth);
+
+		if (!pFrontBuffer || !pBackBuffer) {
+			/* We failed at creating 1 or 2 of the pixmaps. */
+			if (pFrontBuffer)
+				(*pScreen->DestroyPixmap)(pFrontBuffer);
+			if (pBackBuffer)
+				(*pScreen->DestroyPixmap)(pBackBuffer);
+
+			/* Destroy all buffers for this window. */
+			while (pDbeWindowPriv) {
+				/* DbeWindowPrivDelete() will free the window private
+				 * if there no more buffer IDs associated with this
+				 * window.
+				 */
+				FreeResource(pDbeWindowPriv->IDs[0], RT_NONE);
+				pDbeWindowPriv = DBE_WINDOW_PRIV(pWin);
+			}
+			FreeScratchGC(pGC);
+			return FALSE;
+		} else {
+			/* Clear out the new DBE buffer pixmaps. */
+			ValidateGC((DrawablePtr)pFrontBuffer, pGC);
+
+			/* I suppose this could avoid quite a bit of work if
+			 * it computed the minimal area required.
+			 */
+			if (clear) {
+				(*pGC->ops->PolyFillRect)((DrawablePtr)pFrontBuffer, pGC, 1,
+							  &clearRect);
+				(*pGC->ops->PolyFillRect)((DrawablePtr)pBackBuffer , pGC, 1,
+							  &clearRect);
+			}
+
+			/* Copy the contents of the old DBE pixmaps to the new pixmaps. */
+			if (pWin->bitGravity != ForgetGravity) {
+				(*pGC->ops->CopyArea)((DrawablePtr)pDbeWindowPrivPriv->pFrontBuffer,
+						      (DrawablePtr)pFrontBuffer, pGC,
+						      sourcex, sourcey,
+						      savewidth, saveheight,
+						      destx, desty);
+				(*pGC->ops->CopyArea)((DrawablePtr)pDbeWindowPrivPriv->pBackBuffer,
+						      (DrawablePtr)pBackBuffer, pGC,
+						      sourcex, sourcey,
+						      savewidth, saveheight, destx, desty);
+			}
+
+			/* Destroy the old pixmaps, and point the DBE window priv to the new
+			 * pixmaps.
+			 */
+			(*pScreen->DestroyPixmap)(pDbeWindowPrivPriv->pFrontBuffer);
+			(*pScreen->DestroyPixmap)(pDbeWindowPrivPriv->pBackBuffer);
+
+			pDbeWindowPrivPriv->pFrontBuffer = pFrontBuffer;
+			pDbeWindowPrivPriv->pBackBuffer  = pBackBuffer;
+
+			/* Make sure all XID are associated with the new back pixmap. */
+			FFBDbeAliasBuffers(pDbeWindowPriv);
+
+			FreeScratchGC(pGC);
+		}
+	}
+
+	return ret;
+}
+
+static void
+FFBDbeResetProc(ScreenPtr pScreen)
+{
+	DbeScreenPrivPtr pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
+
+	/* Unwrap wrappers */
+	pScreen->PositionWindow = pDbeScreenPriv->PositionWindow;
+}
+
+static Bool
+FFBDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv)
+{
+	ScrnInfoPtr pScrn;
+	FFBPtr pFfb;
+
+	pScrn = xf86Screens[pScreen->myNum];
+	pFfb = GET_FFB_FROM_SCRN(pScrn);
+	xf86Msg(X_INFO, "%s: Setting up double-buffer acceleration.\n",
+		pFfb->psdp->device);
+
+	/* Copy resource types created by DIX */
+	dbeDrawableResType   = pDbeScreenPriv->dbeDrawableResType;
+	dbeWindowPrivResType = pDbeScreenPriv->dbeWindowPrivResType;
+
+	/* Copy private indices created by DIX */
+	dbeScreenPrivIndex = pDbeScreenPriv->dbeScreenPrivIndex;
+	dbeWindowPrivIndex = pDbeScreenPriv->dbeWindowPrivIndex;
+
+	/* Reset the window priv privs if generations do not match. */
+	if (FFBDbePrivPrivGeneration != serverGeneration) {
+		/* Allocate the window priv priv. */
+		FFBDbeWindowPrivPrivIndex = (*pDbeScreenPriv->AllocWinPrivPrivIndex)();
+
+		if (!(*pDbeScreenPriv->AllocWinPrivPriv)(pScreen,
+							 FFBDbeWindowPrivPrivIndex,
+							 sizeof(FFBDbeWindowPrivPrivRec)))
+			return FALSE;
+
+		/* Make sure we only do this code once. */
+		FFBDbePrivPrivGeneration = serverGeneration;
+	}
+
+	/* Wrap functions. */
+	pDbeScreenPriv->PositionWindow = pScreen->PositionWindow;
+	pScreen->PositionWindow        = FFBDbePositionWindow;
+
+	/* Initialize the per-screen DBE function pointers. */
+	pDbeScreenPriv->GetVisualInfo         = FFBDbeGetVisualInfo;
+	pDbeScreenPriv->AllocBackBufferName   = FFBDbeAllocBackBufferName;
+	pDbeScreenPriv->SwapBuffers           = FFBDbeSwapBuffers;
+	pDbeScreenPriv->BeginIdiom            = 0;
+	pDbeScreenPriv->EndIdiom              = 0;
+	pDbeScreenPriv->ResetProc             = FFBDbeResetProc;
+	pDbeScreenPriv->WinPrivDelete         = FFBDbeWinPrivDelete;
+
+	/* The FFB implementation doesn't need buffer validation. */
+	pDbeScreenPriv->ValidateBuffer	  = (void (*)())NoopDDA;
+
+	return TRUE;
+}
+
+extern Bool DbeRegisterFunction(ScreenPtr pScreen, Bool (*funct)(ScreenPtr, DbeScreenPrivPtr));
+
+Bool
+FFBDbePreInit(ScreenPtr pScreen)
+{
+	return DbeRegisterFunction(pScreen, FFBDbeInit);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_ddc.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_ddc.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_ddc.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,195 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - DDC support.
+ *
+ * Copyright (C) 2000 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_ddc.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+
+#include "ffb_dac.h"
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+#include "xf86DDC.h"
+
+/* XXX This needs a lot more work.  Only an attempt at the PAC2 version
+ * XXX is below, and that is untested.  The BT498 manual is unclear about
+ * XXX several details and I must figure them out by trial and error.
+ */
+
+/* Wait for the next VSYNC. */
+static void
+WaitForVSYNC(ffb_dacPtr dac)
+{
+	unsigned int vsap = DACCFG_READ(dac, FFBDAC_CFG_VSAP);
+	unsigned int vcnt;
+
+	vcnt = DACCFG_READ(dac, FFBDAC_CFG_TGVC);
+	while (vcnt > vsap)
+		vcnt = DACCFG_READ(dac, FFBDAC_CFG_TGVC);
+	while (vcnt <= vsap)
+		vcnt = DACCFG_READ(dac, FFBDAC_CFG_TGVC);
+
+}
+
+/* The manual seems to imply this is needed, but it's really clumsy
+ * so we can test if it really is a requirement with this.
+ */
+#define MDATA_NEEDS_BLANK
+
+/* DDC1/DDC2 support */
+static unsigned int
+FFBDacDdc1Read(ScrnInfoPtr pScrn)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	ffb_dacPtr dac = pFfb->dac;
+	unsigned int val;
+#ifdef MDATA_NEEDS_BLANK
+	unsigned int uctrl;
+#endif
+
+#ifdef MDATA_NEEDS_BLANK
+	/* Force a blank of the screen. */
+	uctrl = DACCFG_READ(dac, FFBDAC_CFG_UCTRL);
+	DACCFG_WRITE(dac, FFBDAC_CFG_UCTRL,
+			  (uctrl | FFBDAC_UCTRL_ABLANK));
+#endif
+
+	/* Tristate SCL pin. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_MPDATA,
+			  FFBDAC_CFG_MPDATA_SCL);
+
+	/* Pause until VSYNC is hit. */
+	WaitForVSYNC(dac);
+
+	/* Read the sense line to see what the monitor is driving
+	 * it at.
+	 */
+	val = DACCFG_READ(dac, FFBDAC_CFG_MPSENSE);
+	val = (val & FFBDAC_CFG_MPSENSE_SCL) ? 1 : 0;
+
+	/* Stop tristating the SCL pin. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_MPDATA, 0);
+
+#ifdef MDATA_NEEDS_BLANK
+	/* Restore UCTRL to unblank the screen. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_UCTRL, uctrl);
+#endif
+
+	/* Return the result and we're done. */
+	return val;
+}
+
+static void
+FFBI2CGetBits(I2CBusPtr b, int *clock, int *data)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(xf86Screens[b->scrnIndex]);
+	ffb_dacPtr dac = pFfb->dac;
+	unsigned int val;
+#ifdef MDATA_NEEDS_BLANK
+	unsigned int uctrl;
+#endif
+
+#ifdef MDATA_NEEDS_BLANK
+	/* Force a blank of the screen. */
+	uctrl = DACCFG_READ(dac, FFBDAC_CFG_UCTRL);
+	DACCFG_WRITE(dac, FFBDAC_CFG_UCTRL,
+			  (uctrl | FFBDAC_UCTRL_ABLANK));
+#endif
+
+	/* Tristate SCL+SDA pins. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_MPDATA,
+		     (FFBDAC_CFG_MPDATA_SCL | FFBDAC_CFG_MPDATA_SDA));
+
+	/* Read the sense line to see what the monitor is driving
+	 * them at.
+	 */
+	val = DACCFG_READ(dac, FFBDAC_CFG_MPSENSE);
+	*clock = (val & FFBDAC_CFG_MPSENSE_SCL) ? 1 : 0;
+	*data  = (val & FFBDAC_CFG_MPSENSE_SDA) ? 1 : 0;
+
+	/* Stop tristating the SCL pin. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_MPDATA, 0);
+
+#ifdef MDATA_NEEDS_BLANK
+	/* Restore UCTRL to unblank the screen. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_UCTRL, uctrl);
+#endif
+}
+
+static void
+FFBI2CPutBits(I2CBusPtr b, int clock, int data)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(xf86Screens[b->scrnIndex]);
+	ffb_dacPtr dac = pFfb->dac;
+	unsigned int val;
+#ifdef MDATA_NEEDS_BLANK
+	unsigned int uctrl;
+#endif
+
+	val = 0;
+	if (clock)
+		val |= FFBDAC_CFG_MPDATA_SCL;
+	if (data)
+		val |= FFBDAC_CFG_MPDATA_SDA;
+
+#ifdef MDATA_NEEDS_BLANK
+	/* Force a blank of the screen. */
+	uctrl = DACCFG_READ(dac, FFBDAC_CFG_UCTRL);
+	DACCFG_WRITE(dac, FFBDAC_CFG_UCTRL,
+			  (uctrl | FFBDAC_UCTRL_ABLANK));
+#endif
+
+	/* Tristate requested pins. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_MPDATA, val);
+
+#ifdef MDATA_NEEDS_BLANK
+	/* Restore UCTRL to unblank the screen. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_UCTRL, uctrl);
+#endif
+}
+
+Bool
+FFBi2cInit(ScrnInfoPtr pScrn)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	I2CBusPtr I2CPtr;
+
+	I2CPtr = xf86CreateI2CBusRec();
+	if (!I2CPtr)
+		return FALSE;
+
+	pFfb->I2C = I2CPtr;
+
+	I2CPtr->BusName		= "DDC";
+	I2CPtr->scrnIndex	= pScrn->scrnIndex;
+	I2CPtr->I2CPutBits	= FFBI2CPutBits;
+	I2CPtr->I2CGetBits	= FFBI2CGetBits;
+	I2CPtr->AcknTimeout	= 5;
+
+	if (!xf86I2CBusInit(I2CPtr))
+		return FALSE;
+
+	return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,280 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - DGA support.
+ *
+ * Copyright (C) 2000 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "dgaproc.h"
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_stip.h"
+#include "ffb_loops.h"
+
+static Bool FFB_OpenFramebuffer(ScrnInfoPtr pScrn, char **name, unsigned char **mem,
+				int *size, int *offset, int *extra);
+static void FFB_CloseFramebuffer(ScrnInfoPtr pScrn);
+static Bool FFB_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode);
+static void FFB_SetViewport(ScrnInfoPtr pScrn, int x, int y, int flags);
+static int FFB_GetViewport(ScrnInfoPtr pScrn);
+static void FFB_Flush(ScrnInfoPtr pScrn);
+
+/* Have to disable all this stuff for now until I figure out where
+ * we should get the WID values from... ho hum... -DaveM
+ */
+#if 0
+static void FFB_FillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned long color);
+
+#ifdef USE_VIS
+static void FFB_BlitRect(ScrnInfoPtr pScrn, int srcx, int srcy, int w, int h,
+			 int dstx, int dsty);
+#else
+#define FFB_BlitRect NULL
+#endif
+#else
+#define FFB_FillRect NULL
+#define FFB_BlitRect NULL
+#endif
+
+static DGAFunctionRec FFB_DGAFuncs = {
+	FFB_OpenFramebuffer,
+	FFB_CloseFramebuffer,
+	FFB_SetMode,
+	FFB_SetViewport,
+	FFB_GetViewport,
+	FFB_Flush,
+	FFB_FillRect,
+	FFB_BlitRect,
+	NULL
+};
+
+void FFB_InitDGA(ScreenPtr pScreen)
+{
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	FFBPtr pFfb;
+	DGAModePtr mode;
+	Bool result;
+
+	pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+	mode = xnfcalloc(sizeof(DGAModeRec), 1);
+	if (!mode) {
+		xf86Msg(X_WARNING, "%s: DGA init failed, cannot alloc DGAMode.\n",
+			pFfb->psdp->device);
+		return;
+	}
+
+	mode->num = 0;
+	mode->mode = pScrn->modes;
+
+	/* Hmmm, what does concurrent access really mean? -DaveM */
+	mode->flags = (DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE | DGA_FILL_RECT);
+
+#ifdef USE_VIS
+	mode->flags |= DGA_BLIT_RECT;
+#endif
+
+	mode->imageWidth = 2048;
+	mode->imageHeight = 2048;
+	mode->pixmapWidth = 2048;
+	mode->pixmapHeight = 2048;
+
+	/* XXX I would imagine that this value states how many bytes
+	 * XXX you add to advance exactly one full horizontal line in
+	 * XXX the framebuffer addressing, but the way we set the pScrn
+	 * XXX mode values do not match that definition.
+	 * XXX
+	 * XXX Ask Jakub what is going on here. -DaveM
+	 */
+#if 1
+	mode->bytesPerScanline = pScrn->modes->HDisplay * 4;
+#else
+	mode->bytesPerScanline = (2048 * 4);
+#endif
+
+	mode->byteOrder = pScrn->imageByteOrder;
+	mode->depth = 32;
+	mode->bitsPerPixel = 32;
+	mode->red_mask = 0xff;
+	mode->green_mask = 0xff00;
+	mode->blue_mask = 0xff0000;
+	mode->visualClass = TrueColor;
+	mode->viewportWidth = pScrn->modes->HDisplay;
+	mode->viewportHeight = pScrn->modes->VDisplay;
+
+	/* Do these values even matter if we do not support
+	 * viewports? -DaveM
+	 */
+	mode->xViewportStep = 0;
+	mode->yViewportStep = 0;
+	mode->maxViewportX = 0;
+	mode->maxViewportY = 0;
+
+	mode->viewportFlags = 0;
+	mode->offset = 0;
+
+	result = DGAInit(pScreen, &FFB_DGAFuncs, mode, 1);
+	if (result == FALSE) {
+		xf86Msg(X_WARNING,
+			"%s: DGA init failed, DGAInit returns FALSE.\n",
+			pFfb->psdp->device);
+	} else {
+		xf86Msg(X_INFO, "%s: DGA support initialized.\n",
+			pFfb->psdp->device);
+	}
+}
+
+static Bool FFB_OpenFramebuffer(ScrnInfoPtr pScrn, char **name, unsigned char **mem,
+				int *size, int *offset, int *extra)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+	*name = &pFfb->psdp->device;
+
+	/* We give the user the dumb frame buffer. */
+	*mem = (unsigned char *)FFB_DFB24_VOFF;
+	*size = 0x1000000;
+	*offset = 0;
+	*extra = 0;
+
+	return TRUE;
+}
+
+static void FFB_CloseFramebuffer(ScrnInfoPtr pScrn)
+{
+}
+
+static Bool FFB_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode)
+{
+	/* Nothing to do, we currently only support one mode
+	 * and we are always in it.
+	 */
+	return TRUE;
+}
+
+static void FFB_SetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
+{
+	/* We don't support viewports, so... */
+}
+
+static int FFB_GetViewport(ScrnInfoPtr pScrn)
+{
+	/* No viewports, none pending... */
+	return 0;
+}
+
+static void FFB_Flush(ScrnInfoPtr pScrn)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	FFBWait(pFfb, ffb);
+}
+
+#if 0
+
+extern void CreatorFillBoxSolid (DrawablePtr pDrawable, int nBox,
+				 BoxPtr pBox, unsigned long pixel);
+
+static void FFB_FillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned long color)
+{
+	DrawableRec draw;
+	BoxRec box;
+
+	draw.pScreen = pScrn->pScreen;
+	box.x1 = x;
+	box.y1 = y;
+	box.x2 = x + w;
+	box.y2 = y + h;
+
+	CreatorFillBoxSolid(&draw, 1, &box, color);
+}
+
+#ifdef USE_VIS
+extern void VISmoveImageLR(unsigned char *, unsigned char *, long, long, long, long);
+extern void VISmoveImageRL(unsigned char *, unsigned char *, long, long, long, long);
+
+static void FFB_BlitRect(ScrnInfoPtr pScrn, int srcx, int srcy,
+			 int w, int h, int dstx, int dsty)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	if (!pFfb->disable_vscroll &&
+	    dstx == srcx &&
+	    dsty != dsty) {
+		FFB_WRITE_ATTRIBUTES_VSCROLL(pFfb, 0x00ffffff);
+		FFBFifo(pFfb, 7);
+		ffb->drawop = FFB_DRAWOP_VSCROLL;
+		FFB_WRITE64(&ffb->by, srcy, srcx);
+		FFB_WRITE64_2(&ffb->dy, dsty, dstx);
+		FFB_WRITE64_3(&ffb->bh, h, w);
+		pFfb->rp_active = 1;
+	} else {
+		unsigned char *base = (unsigned char *)pFfb->fb;
+		int use_prefetch = pFfb->use_blkread_prefetch;
+
+		FFB_WRITE_ATTRIBUTES_SFB_VAR(pFfb, 0x00ffffff, GXcopy);
+		FFBWait(pFfb, ffb);
+		if (use_prefetch) {
+			FFBFifo(pFfb, 1);
+			ffb->mer = FFB_MER_EIRA;
+			pFfb->rp_active = 1;
+			FFBWait(pFfb, ffb);
+		}
+		if (srcx < dstx) {
+			VISmoveImageRL((base +
+					((srcy + h - 1) * (2048 * 4)) +
+					(srcx * (32 / 8))),
+				       (base +
+					((dsty + h - 1) * (2048 * 4)) +
+					(dstx * (32 / 8))),
+				       (w * (32 / 8)),
+				       h,
+				       -(2048 * 4), - (2048 * 4));
+		} else {
+			VISmoveImageLR((base +
+					((srcy + h - 1) * (2048 * 4)) +
+					(srcx * (32 / 8))),
+				       (base +
+					((dsty + h - 1) * (2048 * 4)) +
+					(dstx * (32 / 8))),
+				       (w * (32 / 8)),
+				       h,
+				       -(2048 * 4), - (2048 * 4));
+		}
+		if (use_prefetch) {
+			FFBFifo(pFfb, 1);
+			ffb->mer = FFB_MER_DRA;
+			pFfb->rp_active = 1;
+			FFBWait(pFfb, pFfb->regs);
+		}
+	}
+}
+#endif
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c:1.4
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c	Fri Jun 23 16:43:44 2000
@@ -0,0 +1,488 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.4 2000/06/23 23:43:44 alanh Exp $
+ * Acceleration for the Creator and Creator3D framebuffer - DRI/DRM support.
+ *
+ * Copyright (C) 2000 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Priv.h"
+
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb16.h"
+#include "cfb32.h"
+
+#include "miline.h"
+
+#include "GL/glxtokens.h"
+
+#include "xf86drm.h"
+#include "sarea.h"
+#define _XF86DRI_SERVER_
+#include "xf86dri.h"
+#include "dri.h"
+#include "dristruct.h"
+
+#include "GL/glxint.h"
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_fifo.h"
+#include "ffb_rcache.h"
+
+static char FFBKernelDriverName[] = "ffb";
+static char FFBClientDriverName[] = "ffb";
+
+/* Forward declarations. */
+static Bool FFBDRICreateContext(ScreenPtr, VisualPtr, drmContext,
+				void *, DRIContextType);
+static void FFBDRIDestroyContext(ScreenPtr, drmContext, DRIContextType);
+
+static void FFBDRIInitBuffers(WindowPtr, RegionPtr, CARD32);
+static void FFBDRIMoveBuffers(WindowPtr, DDXPointRec, RegionPtr, CARD32);
+
+static void FFBDRISetDrawableIndex(WindowPtr, CARD32);
+
+/* XXX Why isn't this in a header somewhere? XXX */
+extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
+				void **configprivs);
+
+static Bool
+FFBDRIInitVisualConfigs(ScreenPtr pScreen)
+{
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	__GLXvisualConfig *pConfigs;
+	FFBConfigPrivPtr pFfbConfigs;
+	FFBConfigPrivPtr *pFfbConfigPtrs;
+
+	pConfigs = (__GLXvisualConfig *)
+		xnfcalloc(sizeof(__GLXvisualConfig), 1);
+	if (!pConfigs)
+		return FALSE;
+
+	pFfbConfigs = (FFBConfigPrivPtr)
+		xnfcalloc(sizeof(FFBConfigPrivRec), 1);
+	if (!pFfbConfigs) {
+		xfree(pConfigs);
+		return FALSE;
+	}
+
+	pFfbConfigPtrs = (FFBConfigPrivPtr *)
+		xnfcalloc(sizeof(FFBConfigPrivPtr), 1);
+	if (!pFfbConfigPtrs) {
+		xfree(pConfigs);
+		xfree(pFfbConfigs);
+		return FALSE;
+	}
+
+	pFfbConfigPtrs[0] = &pFfbConfigs[0];
+
+	pConfigs->vid = -1;
+	pConfigs->class = -1;
+	pConfigs->rgba = TRUE;
+	pConfigs->redSize = 8;
+	pConfigs->greenSize = 8;
+	pConfigs->blueSize = 8;
+	pConfigs->alphaSize = 0;
+	pConfigs->redMask = 0x000000ff;
+	pConfigs->greenMask = 0x0000ff00;
+	pConfigs->blueMask = 0x00ff0000;
+	pConfigs->alphaMask = 0;
+	pConfigs->accumRedSize = 0;
+	pConfigs->accumGreenSize = 0;
+	pConfigs->accumBlueSize = 0;
+	pConfigs->accumAlphaSize = 0;
+	pConfigs->doubleBuffer = TRUE;
+	pConfigs->stereo = FALSE;
+	pConfigs->bufferSize = 32;
+	pConfigs->depthSize = 16;
+	pConfigs->stencilSize = 0;
+	pConfigs->auxBuffers = 0;
+	pConfigs->level = 0;
+	pConfigs->visualRating = 0;
+	pConfigs->transparentPixel = 0;
+	pConfigs->transparentRed = 0;
+	pConfigs->transparentGreen = 0;
+	pConfigs->transparentBlue = 0;
+	pConfigs->transparentAlpha = 0;
+	pConfigs->transparentIndex = 0;
+
+	pFfb->numVisualConfigs = 1;
+	pFfb->pVisualConfigs = pConfigs;
+	pFfb->pVisualConfigsPriv = pFfbConfigs;
+
+	GlxSetVisualConfigs(1, pConfigs, (void **)pFfbConfigPtrs);
+
+	return TRUE;
+}
+
+static void
+init_ffb_sarea(FFBPtr pFfb, ffb_dri_state_t *pFfbSarea)
+{
+	int i;
+
+	pFfbSarea->flags = 0;
+
+	switch (pFfb->ffb_type) {
+	case ffb2_prototype:
+	case ffb2_vertical:
+	case ffb2_vertical_plus:
+	case ffb2_horizontal:
+	case ffb2_horizontal_plus:
+		pFfbSarea->flags |= FFB_DRI_FFB2;
+		break;
+
+	default:
+		break;
+	};
+
+	if (pFfb->ffb_type == ffb2_vertical_plus ||
+	    pFfb->ffb_type == ffb2_horizontal_plus)
+		pFfbSarea->flags |= FFB_DRI_FFB2PLUS;
+
+	if (pFfb->dac_info.flags & FFB_DAC_PAC1)
+		pFfbSarea->flags |= FFB_DRI_PAC1;
+
+	if (pFfb->dac_info.flags & FFB_DAC_PAC2)
+		pFfbSarea->flags |= FFB_DRI_PAC2;
+
+	for (i = 0; i < FFB_DRI_NWIDS; i++)
+		pFfbSarea->wid_table[i] = 0;
+}
+
+#define	FFB_DFB24_POFF		0x02000000UL
+#define	FFB_DFB24_SIZE		0x01000000UL
+
+#define	FFB_FBC_REGS_POFF	0x00600000UL
+#define	FFB_FBC_REGS_SIZE	0x00002000UL
+
+#define	FFB_DAC_POFF		0x00400000UL
+#define	FFB_DAC_SIZE		0x00002000UL
+
+#define	FFB_SFB8R_POFF		0x04000000UL
+#define FFB_SFB8R_SIZE		0x00400000UL
+
+#define	FFB_SFB32_POFF		0x05000000UL
+#define FFB_SFB32_SIZE		0x01000000UL
+
+#define	FFB_SFB64_POFF		0x06000000UL
+#define FFB_SFB64_SIZE		0x02000000UL
+
+Bool
+FFBDRIScreenInit(ScreenPtr pScreen)
+{
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	DRIInfoPtr pDRIInfo;
+	FFBDRIPtr pFfbDRI;
+
+	/* Check that the GLX, DRI, and DRM modules have been loaded by testing
+	 * for canonical symbols in each module.
+	 */
+	if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs"))
+		return FALSE;
+	if (!xf86LoaderCheckSymbol("DRIScreenInit"))
+		return FALSE;
+	if (!xf86LoaderCheckSymbol("drmAvailable"))
+		return FALSE;
+        if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
+      		xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 	"FFBDRIScreenInit failed (libdri.a too old)\n");
+		return FALSE;
+        }
+
+	pDRIInfo = DRICreateInfoRec();
+	if (pDRIInfo == NULL)
+		return FALSE;
+
+	pFfb->pDRIInfo = pDRIInfo;
+
+	pDRIInfo->drmDriverName = FFBKernelDriverName;
+	pDRIInfo->clientDriverName = FFBClientDriverName;
+
+	pDRIInfo->ddxDriverMajorVersion = 0;
+	pDRIInfo->ddxDriverMinorVersion = 0;
+	pDRIInfo->ddxDriverPatchVersion = 1;
+
+	pDRIInfo->busIdString = xalloc(64); /* Freed in DRIDestroyInfoRec */
+	sprintf(pDRIInfo->busIdString, "SBUS:%s", pFfb->psdp->device);
+
+	/* Dumb rendering port for now... */
+	pDRIInfo->frameBufferPhysicalAddress = FFB_DFB24_POFF;
+	pDRIInfo->frameBufferSize = FFB_DFB24_SIZE;
+	pDRIInfo->frameBufferStride = (2048 * 4);
+
+	/* XXX */
+	pDRIInfo->ddxDrawableTableEntry = 15;
+	pDRIInfo->maxDrawableTableEntry = 15;
+	pDRIInfo->SAREASize = (SAREA_MAX + (0x2000 - 1)) & ~(0x2000 - 1);
+
+	pFfbDRI = (FFBDRIPtr) xnfcalloc(sizeof(FFBDRIRec), 1);
+	if (pFfbDRI == NULL) {
+		DRIDestroyInfoRec(pFfb->pDRIInfo);
+		return FALSE;
+	}
+
+	pDRIInfo->devPrivate		= pFfbDRI;
+	pDRIInfo->devPrivateSize	= sizeof(*pFfbDRI);
+	pDRIInfo->contextSize		= 0; /* kernel does ctx swaps */
+
+	pDRIInfo->CreateContext		= FFBDRICreateContext;
+	pDRIInfo->DestroyContext	= FFBDRIDestroyContext;
+	pDRIInfo->InitBuffers		= FFBDRIInitBuffers;
+	pDRIInfo->MoveBuffers		= FFBDRIMoveBuffers;
+	pDRIInfo->SetDrawableIndex	= FFBDRISetDrawableIndex;
+
+	/* Our InitBuffers depends heavily on this setting. */
+	pDRIInfo->bufferRequests	= DRI_3D_WINDOWS_ONLY;
+
+	if (!DRIScreenInit(pScreen, pDRIInfo, &(pFfb->drmSubFD))) {
+		DRIDestroyInfoRec(pFfb->pDRIInfo);
+		xfree(pFfbDRI);
+		return FALSE;
+	}
+
+	pFfb->pFfbSarea = DRIGetSAREAPrivate(pScreen);
+	init_ffb_sarea(pFfb, pFfb->pFfbSarea);
+
+	/* Setup device specific direct rendering memory maps. */
+	if (drmAddMap(pFfb->drmSubFD,
+		      FFB_FBC_REGS_POFF, FFB_FBC_REGS_SIZE,
+		      DRM_REGISTERS, 0, &pFfbDRI->hFbcRegs) < 0) {
+		DRICloseScreen(pScreen);
+		return FALSE;
+	}
+	pFfbDRI->sFbcRegs = FFB_FBC_REGS_SIZE;
+	pFfbDRI->mFbcRegs = 0;
+
+	xf86DrvMsg(pScreen->myNum, X_INFO,
+		   "[drm] FBC Register handle = 0x%08x\n",
+		   pFfbDRI->hFbcRegs);
+
+	if (drmAddMap(pFfb->drmSubFD,
+		      FFB_DAC_POFF, FFB_DAC_SIZE,
+		      DRM_REGISTERS, 0, &pFfbDRI->hDacRegs) < 0) {
+		DRICloseScreen(pScreen);
+		return FALSE;
+	}
+	pFfbDRI->sDacRegs = FFB_DAC_SIZE;
+	pFfbDRI->mDacRegs = 0;
+
+	xf86DrvMsg(pScreen->myNum, X_INFO,
+		   "[drm] DAC Register handle = 0x%08x\n",
+		   pFfbDRI->hDacRegs);
+
+	/* Now add maps for the "Smart" views of the framebuffer. */
+	if (drmAddMap(pFfb->drmSubFD,
+		      FFB_SFB8R_POFF, FFB_SFB8R_SIZE,
+		      DRM_REGISTERS, 0, &pFfbDRI->hSfb8r) < 0) {
+		DRICloseScreen(pScreen);
+		return FALSE;
+	}
+	pFfbDRI->sSfb8r = FFB_SFB8R_SIZE;
+	pFfbDRI->mSfb8r = 0;
+
+	xf86DrvMsg(pScreen->myNum, X_INFO,
+		   "[drm] SFB8R handle = 0x%08x\n",
+		   pFfbDRI->hSfb8r);
+
+	if (drmAddMap(pFfb->drmSubFD,
+		      FFB_SFB32_POFF, FFB_SFB32_SIZE,
+		      DRM_REGISTERS, 0, &pFfbDRI->hSfb32) < 0) {
+		DRICloseScreen(pScreen);
+		return FALSE;
+	}
+	pFfbDRI->sSfb32 = FFB_SFB32_SIZE;
+	pFfbDRI->mSfb32 = 0;
+
+	xf86DrvMsg(pScreen->myNum, X_INFO,
+		   "[drm] SFB32 handle = 0x%08x\n",
+		   pFfbDRI->hSfb32);
+
+	if (drmAddMap(pFfb->drmSubFD,
+		      FFB_SFB64_POFF, FFB_SFB64_SIZE,
+		      DRM_REGISTERS, 0, &pFfbDRI->hSfb64) < 0) {
+		DRICloseScreen(pScreen);
+		return FALSE;
+	}
+	pFfbDRI->sSfb64 = FFB_SFB64_SIZE;
+	pFfbDRI->mSfb64 = 0;
+
+	xf86DrvMsg(pScreen->myNum, X_INFO,
+		   "[drm] SFB64 handle = 0x%08x\n",
+		   pFfbDRI->hSfb64);
+
+	/* Setup visual configurations. */
+	if (!FFBDRIInitVisualConfigs(pScreen)) {
+		DRICloseScreen(pScreen);
+		return FALSE;
+	}
+
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "[drm] Visual configs initialized\n");
+
+	return TRUE;
+}
+
+void
+FFBDRICloseScreen(ScreenPtr pScreen)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pScreen);
+
+	DRICloseScreen(pScreen);
+
+	if (pFfb->pDRIInfo) {
+		DRIInfoPtr pDRIInfo = pFfb->pDRIInfo;
+
+		if (pDRIInfo->devPrivate)
+			xfree(pDRIInfo->devPrivate);
+		DRIDestroyInfoRec(pDRIInfo);
+		pFfb->pDRIInfo = NULL;
+	}
+
+	if (pFfb->pVisualConfigs) {
+		xfree(pFfb->pVisualConfigs);
+		pFfb->pVisualConfigs = NULL;
+	}
+	if (pFfb->pVisualConfigsPriv) {
+		xfree(pFfb->pVisualConfigsPriv);
+		pFfb->pVisualConfigsPriv = NULL;
+	}
+}
+
+static Bool
+FFBDRICreateContext(ScreenPtr pScreen, VisualPtr visual, drmContext hwContext,
+		 void *pVisualConfigPriv, DRIContextType context)
+{
+	/* Nothing to do... */
+	return TRUE;
+}
+
+static void
+FFBDRIDestroyContext(ScreenPtr pScreen, drmContext hwContext, DRIContextType context)
+{
+	/* Nothing to do... */
+}
+
+Bool
+FFBDRIFinishScreenInit(ScreenPtr pScreen)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pScreen);
+	DRIInfoPtr pDRIInfo = pFfb->pDRIInfo;
+	FFBDRIPtr pFfbDRI = (FFBDRIPtr) pDRIInfo->devPrivate;
+	int i;
+
+	/* This belongs in the kernel.  I'm sorry, the rest
+	 * of the current DRI switching mechanisms just suck.
+	 */
+	pDRIInfo->driverSwapMethod = DRI_KERNEL_SWAP;
+
+	/* Copy over the fast/page filling parameters now that
+	 * acceleration has been fully setup.
+	 */
+	pFfbDRI->disable_pagefill = pFfb->disable_pagefill;
+	pFfbDRI->fastfill_small_area = FFB_FFPARMS(pFfb).fastfill_small_area;
+	pFfbDRI->pagefill_small_area = FFB_FFPARMS(pFfb).pagefill_small_area;
+	pFfbDRI->fastfill_height = FFB_FFPARMS(pFfb).fastfill_height;
+	pFfbDRI->fastfill_width = FFB_FFPARMS(pFfb).fastfill_width;
+	pFfbDRI->pagefill_height = FFB_FFPARMS(pFfb).pagefill_height;
+	pFfbDRI->pagefill_width = FFB_FFPARMS(pFfb).pagefill_width;
+	for (i = 0; i < 0x800; i++)
+		pFfbDRI->Pf_AlignTab[i] = pFfb->Pf_AlignTab[i];
+
+	return DRIFinishScreenInit(pScreen);
+}
+
+static void
+FFBDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pScreen);
+	CreatorPrivWinPtr pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+	ffb_fbcPtr ffb = pFfb->regs;
+	unsigned int fbc;
+	BoxPtr pBox;
+	int nBox;
+
+	fbc = pFfbPrivWin->fbc_base;
+	fbc = (fbc & ~FFB_FBC_WB_MASK) | FFB_FBC_WB_AB;
+	fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_ON;
+	fbc = (fbc & ~FFB_FBC_RGBE_MASK) | FFB_FBC_RGBE_OFF;
+
+	pBox = REGION_RECTS(prgn);
+	nBox = (int) REGION_NUM_RECTS(prgn);
+	FFB_WRITE_ROP(pFfb, ffb, (FFB_ROP_NEW | (FFB_ROP_NEW << 8)));
+	FFB_WRITE_PPC(pFfb, ffb,
+		      (FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST | FFB_PPC_XS_WID),
+		      (FFB_PPC_APE_MASK | FFB_PPC_CS_MASK | FFB_PPC_XS_MASK));
+	FFB_WRITE_PMASK(pFfb, ffb, ~0);
+	FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+	FFB_WRITE_FBC(pFfb, ffb, fbc);
+	FFB_WRITE_WID(pFfb, ffb, FFB_WID_WIN(pWin));
+
+	while(nBox--) {
+		register int x, y, w, h;
+
+		x = pBox->x1;
+		y = pBox->y1;
+		w = (pBox->x2 - x);
+		h = (pBox->y2 - y);
+		FFBFifo(pFfb, 4);
+		FFB_WRITE64(&ffb->by, y, x);
+		FFB_WRITE64_2(&ffb->bh, h, w);
+		pBox++;
+	}
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+
+static void
+FFBDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
+		  RegionPtr prgnSrc, CARD32 index)
+{
+}
+
+static void
+FFBDRISetDrawableIndex(WindowPtr pWin, CARD32 index)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pScreen);
+	CreatorPrivWinPtr pFfbPrivWin = CreatorGetWindowPrivate(pWin);
+	unsigned int wid;
+
+	if (FFBWidIsShared(pFfb, pFfbPrivWin->wid)) {
+		wid = FFBWidUnshare(pFfb, pFfbPrivWin->wid);
+		if (wid == (unsigned int) -1)
+			return;
+
+		ErrorF("FFB: Allocated WID %x for DRI window.\n", wid);
+		pFfbPrivWin->wid = wid;
+
+		/* Now update the SAREA. */
+		pFfb->pFfbSarea->wid_table[index] = wid;
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h	Tue Jun 20 17:47:37 2000
@@ -0,0 +1,53 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h,v 1.2 2000/06/21 00:47:37 dawes Exp $ */
+
+#ifndef _FFB_DRISHARE_H
+#define _FFB_DRISHARE_H
+
+typedef struct ffb_dri_state {
+	int		flags;
+#define FFB_DRI_FFB2		0x00000001
+#define FFB_DRI_FFB2PLUS	0x00000002
+#define FFB_DRI_PAC1		0x00000004
+#define FFB_DRI_PAC2		0x00000008
+
+	/* Indexed by DRI drawable id. */
+#define FFB_DRI_NWIDS	64
+	unsigned int	wid_table[FFB_DRI_NWIDS];
+} ffb_dri_state_t;
+
+#define FFB_DRISHARE(SAREA)	\
+	((ffb_dri_state_t *) (((char *)(SAREA)) + sizeof(XF86DRISAREARec)))
+
+typedef struct {
+	drmHandle	hFbcRegs;
+	drmSize		sFbcRegs;
+	drmAddress	mFbcRegs;
+
+	drmHandle	hDacRegs;
+	drmSize		sDacRegs;
+	drmAddress	mDacRegs;
+
+	drmHandle	hSfb8r;
+	drmSize		sSfb8r;
+	drmAddress	mSfb8r;
+
+	drmHandle	hSfb32;
+	drmSize		sSfb32;
+	drmAddress	mSfb32;
+
+	drmHandle	hSfb64;
+	drmSize		sSfb64;
+	drmAddress	mSfb64;
+
+	/* Fastfill/Pagefill parameters. */
+	unsigned char	disable_pagefill;
+	int		fastfill_small_area;
+	int		pagefill_small_area;
+	int		fastfill_height;
+	int		fastfill_width;
+	int		pagefill_height;
+	int		pagefill_width;
+	short		Pf_AlignTab[0x800];
+} FFBDRIRec, *FFBDRIPtr;
+
+#endif /* !(_FFB_DRISHARE_H) */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c:1.5
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c	Fri Jun 30 10:15:16 2000
@@ -0,0 +1,1090 @@
+/*
+ * Creator, Creator3D and Elite3D framebuffer driver.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c,v 1.5 2000/06/30 17:15:16 dawes Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Version.h"
+#include "mipointer.h"
+#include "mibstore.h"
+#include "micmap.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+#include "cfb8_32wid.h"
+
+#include "xf86cmap.h"
+
+#include "ffb.h"
+
+static OptionInfoPtr FFBAvailableOptions(int chipid, int busid);
+static void	FFBIdentify(int flags);
+static Bool	FFBProbe(DriverPtr drv, int flags);
+static Bool	FFBPreInit(ScrnInfoPtr pScrn, int flags);
+static Bool	FFBScreenInit(int Index, ScreenPtr pScreen, int argc,
+			      char **argv);
+static Bool	FFBEnterVT(int scrnIndex, int flags);
+static void	FFBLeaveVT(int scrnIndex, int flags);
+static Bool	FFBCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	FFBSaveScreen(ScreenPtr pScreen, int mode);
+
+/* Required if the driver supports mode switching */
+static Bool	FFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+/* Required if the driver supports moving the viewport */
+static void	FFBAdjustFrame(int scrnIndex, int x, int y, int flags);
+
+/* Optional functions */
+static void	FFBFreeScreen(int scrnIndex, int flags);
+static int	FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
+
+/* ffb_dga.c */
+extern void FFB_InitDGA(ScreenPtr pScreen);
+
+void FFBSync(ScrnInfoPtr pScrn);
+
+#define VERSION 4000
+#define FFB_NAME "SUNFFB"
+#define FFB_DRIVER_NAME "sunffb"
+#define FFB_MAJOR_VERSION 1
+#define FFB_MINOR_VERSION 0
+#define FFB_PATCHLEVEL 0
+
+/* 
+ * This contains the functions needed by the server after loading the driver
+ * module.  It must be supplied, and gets passed back by the SetupProc
+ * function in the dynamic case.  In the static case, a reference to this
+ * is compiled in, and this requires that the name of this DriverRec be
+ * an upper-case version of the driver name.
+ */
+
+DriverRec SUNFFB = {
+    VERSION,
+    FFB_DRIVER_NAME,
+    FFBIdentify,
+    FFBProbe,
+    FFBAvailableOptions,
+    NULL,
+    0
+};
+
+typedef enum {
+    OPTION_SW_CURSOR,
+    OPTION_HW_CURSOR,
+    OPTION_NOACCEL
+} FFBOpts;
+
+static OptionInfoRec FFBOptions[] = {
+    { OPTION_SW_CURSOR,		"SWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_HW_CURSOR,		"HWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_NOACCEL,		"NoAccel",	OPTV_BOOLEAN,	{0}, FALSE },
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+
+#ifdef XFree86LOADER
+
+static MODULESETUPPROTO(ffbSetup);
+
+static XF86ModuleVersionInfo sunffbVersRec =
+{
+	"sunffb",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	FFB_MAJOR_VERSION, FFB_MINOR_VERSION, FFB_PATCHLEVEL,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0,0,0,0}
+};
+
+XF86ModuleData sunffbModuleData = { &sunffbVersRec, ffbSetup, NULL };
+
+pointer
+ffbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    static Bool setupDone = FALSE;
+
+    if (!setupDone) {
+	setupDone = TRUE;
+	xf86AddDriver(&SUNFFB, module, 0);
+
+	/*
+	 * Modules that this driver always requires can be loaded here
+	 * by calling LoadSubModule().
+	 */
+
+	/*
+	 * The return value must be non-NULL on success even though there
+	 * is no TearDownProc.
+	 */
+	return (pointer)TRUE;
+    } else {
+	if (errmaj) *errmaj = LDR_ONCEONLY;
+	return NULL;
+    }
+}
+
+#endif /* XFree86LOADER */
+
+static Bool
+FFBGetRec(ScrnInfoPtr pScrn)
+{
+    /*
+     * Allocate an FFBRec, and hook it into pScrn->driverPrivate.
+     * pScrn->driverPrivate is initialised to NULL, so we can check if
+     * the allocation has already been done.
+     */
+    if (pScrn->driverPrivate != NULL)
+	return TRUE;
+
+    pScrn->driverPrivate = xnfcalloc(sizeof(FFBRec), 1);
+    return TRUE;
+}
+
+static void
+FFBFreeRec(ScrnInfoPtr pScrn)
+{
+    FFBPtr pFfb;
+
+    if (pScrn->driverPrivate == NULL)
+	return;
+
+    pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+    xfree(pScrn->driverPrivate);
+    pScrn->driverPrivate = NULL;
+
+    return;
+}
+
+static 
+OptionInfoPtr
+FFBAvailableOptions(int chipid, int busid)
+{
+    return FFBOptions;
+}
+
+/* Mandatory */
+static void
+FFBIdentify(int flags)
+{
+    xf86Msg(X_INFO, "%s: driver for Creator, Creator 3D and Elite 3D\n", FFB_NAME);
+}
+
+
+/* Mandatory */
+static Bool
+FFBProbe(DriverPtr drv, int flags)
+{
+    int i;
+    GDevPtr *devSections = NULL;
+    int *usedChips;
+    int numDevSections;
+    int numUsed;
+    Bool foundScreen = FALSE;
+    EntityInfoPtr pEnt;
+
+    /*
+     * The aim here is to find all cards that this driver can handle,
+     * and for the ones not already claimed by another driver, claim the
+     * slot, and allocate a ScrnInfoRec.
+     *
+     * This should be a minimal probe, and it should under no circumstances
+     * change the state of the hardware.  Because a device is found, don't
+     * assume that it will be used.  Don't do any initialisations other than
+     * the required ScrnInfoRec initialisations.  Don't allocate any new
+     * data structures.
+     */
+
+    /*
+     * Next we check, if there has been a chipset override in the config file.
+     * For this we must find out if there is an active device section which
+     * is relevant, i.e., which has no driver specified or has THIS driver
+     * specified.
+     */
+
+    if ((numDevSections = xf86MatchDevice(FFB_DRIVER_NAME,
+					  &devSections)) <= 0) {
+	/*
+	 * There's no matching device section in the config file, so quit
+	 * now.
+	 */
+	return FALSE;
+    }
+
+    /*
+     * We need to probe the hardware first.  We then need to see how this
+     * fits in with what is given in the config file, and allow the config
+     * file info to override any contradictions.
+     */
+
+    numUsed = xf86MatchSbusInstances(FFB_NAME, SBUS_DEVICE_FFB,
+		   devSections, numDevSections,
+		   drv, &usedChips);
+				    
+    if (devSections)
+	xfree(devSections);
+    devSections = NULL;
+    if (numUsed <= 0)
+	return FALSE;
+
+    if (flags & PROBE_DETECT)
+	foundScreen = TRUE;
+    else for (i = 0; i < numUsed; i++) {
+	pEnt = xf86GetEntityInfo(usedChips[i]);
+
+	/*
+	 * Check that nothing else has claimed the slots.
+	 */
+	if(pEnt->active) {
+	    ScrnInfoPtr pScrn;
+	    
+	    /* Allocate a ScrnInfoRec and claim the slot */
+	    pScrn = xf86AllocateScreen(drv, 0);
+
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = VERSION;
+	    pScrn->driverName	 = FFB_DRIVER_NAME;
+	    pScrn->name		 = FFB_NAME;
+	    pScrn->Probe	 = FFBProbe;
+	    pScrn->PreInit	 = FFBPreInit;
+	    pScrn->ScreenInit	 = FFBScreenInit;
+  	    pScrn->SwitchMode	 = FFBSwitchMode;
+  	    pScrn->AdjustFrame	 = FFBAdjustFrame;
+	    pScrn->EnterVT	 = FFBEnterVT;
+	    pScrn->LeaveVT	 = FFBLeaveVT;
+	    pScrn->FreeScreen	 = FFBFreeScreen;
+	    pScrn->ValidMode	 = FFBValidMode;
+	    xf86AddEntityToScreen(pScrn, pEnt->index);
+	    foundScreen = TRUE;
+	}
+	xfree(pEnt);
+    }
+    return foundScreen;
+}
+
+/* Mandatory */
+static Bool
+FFBPreInit(ScrnInfoPtr pScrn, int flags)
+{
+    FFBPtr pFfb;
+    sbusDevicePtr psdp;
+    MessageType from;
+    int i;
+
+    if (flags & PROBE_DETECT) return FALSE;
+
+    /*
+     * Note: This function is only called once at server startup, and
+     * not at the start of each server generation.  This means that
+     * only things that are persistent across server generations can
+     * be initialised here.  xf86Screens[] is (pScrn is a pointer to one
+     * of these).  Privates allocated using xf86AllocateScrnInfoPrivateIndex()  
+     * are too, and should be used for data that must persist across
+     * server generations.
+     *
+     * Per-generation data should be allocated with
+     * AllocateScreenPrivateIndex() from the ScreenInit() function.
+     */
+
+    /* Allocate the FFBRec driverPrivate */
+    if (!FFBGetRec(pScrn))
+	return FALSE;
+
+    pFfb = GET_FFB_FROM_SCRN(pScrn);
+    
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
+
+    /* This driver doesn't expect more than one entity per screen */
+    if (pScrn->numEntities > 1)
+	return FALSE;
+    /* This is the general case */
+    for (i = 0; i < pScrn->numEntities; i++) {
+	EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+
+	/* FFB is purely UPA (but we handle it as SBUS) */
+	if (pEnt->location.type == BUS_SBUS) {
+	    psdp = xf86GetSbusInfoForEntity(pEnt->index);
+	    pFfb->psdp = psdp;
+	} else
+	    return FALSE;
+    }
+
+    /*********************
+    deal with depth
+    *********************/
+    
+    if (!xf86SetDepthBpp(pScrn, 24, 0, 32, Support32bppFb)) {
+	return FALSE;
+    } else {
+	/* Check that the returned depth is one we support */
+	switch (pScrn->depth) {
+	case 24:
+	    /* OK */
+	    break;
+	default:
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "Given depth (%d) is not supported by this driver\n",
+		       pScrn->depth);
+	    return FALSE;
+	}
+    }
+
+    /* Collect all of the relevant option flags (fill in pScrn->options) */
+    xf86CollectOptions(pScrn, NULL);
+    /* Process the options */
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, FFBOptions);
+    
+    /*
+     * This must happen after pScrn->display has been set because
+     * xf86SetWeight references it.
+     */
+    if (pScrn->depth > 8) {
+	rgb weight = {8, 8, 8};
+	rgb mask = {0xff, 0xff00, 0xff0000};
+
+	if (!xf86SetWeight(pScrn, weight, mask)) {
+	    return FALSE;
+	}
+    }
+
+    if (!xf86SetDefaultVisual(pScrn, -1))
+	return FALSE;
+
+    /*
+     * The new cmap code requires this to be initialised.
+     */
+
+    {
+	Gamma zeros = {0.0, 0.0, 0.0};
+
+	if (!xf86SetGamma(pScrn, zeros)) {
+	    return FALSE;
+	}
+    }
+
+    /* Set the bits per RGB for 8bpp mode */
+    from = X_DEFAULT;
+
+    /* determine whether we use hardware or software cursor */
+    
+    pFfb->HWCursor = TRUE;
+    if (xf86GetOptValBool(FFBOptions, OPTION_HW_CURSOR, &pFfb->HWCursor))
+	from = X_CONFIG;
+    if (xf86ReturnOptValBool(FFBOptions, OPTION_SW_CURSOR, FALSE)) {
+	from = X_CONFIG;
+	pFfb->HWCursor = FALSE;
+    }
+    
+    xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
+		pFfb->HWCursor ? "HW" : "SW");
+
+    if (xf86ReturnOptValBool(FFBOptions, OPTION_NOACCEL, FALSE)) {
+	pFfb->NoAccel = TRUE;
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
+    }
+        
+    if (xf86LoadSubModule(pScrn, "xf8_32wid") == NULL) {
+	FFBFreeRec(pScrn);
+	return FALSE;
+    }
+
+    if (xf86LoadSubModule(pScrn, "cfb32") == NULL) {
+	FFBFreeRec(pScrn);
+	return FALSE;
+    }
+
+    if (xf86LoadSubModule(pScrn, "cfb") == NULL) {
+	FFBFreeRec(pScrn);
+	return FALSE;
+    }
+
+    if (pFfb->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
+	FFBFreeRec(pScrn);
+	return FALSE;
+    }
+
+    if (xf86LoadSubModule(pScrn, "dbe") == NULL) {
+	FFBFreeRec(pScrn);
+	return FALSE;
+    }
+
+#ifdef XF86DRI
+    if (xf86LoadSubModule(pScrn, "drm") == NULL) {
+	FFBFreeRec(pScrn);
+	return FALSE;
+    }
+
+    if (xf86LoadSubModule(pScrn, "dri") == NULL) {
+	FFBFreeRec(pScrn);
+	return FALSE;
+    }
+#endif
+
+    /*********************
+    set up clock and mode stuff
+    *********************/
+    
+    pScrn->progClock = TRUE;
+
+    if(pScrn->display->virtualX || pScrn->display->virtualY) {
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "FFB does not support a virtual desktop\n");
+	pScrn->display->virtualX = 0;
+	pScrn->display->virtualY = 0;
+    }
+
+    xf86SbusUseBuiltinMode(pScrn, pFfb->psdp);
+    pScrn->currentMode = pScrn->modes;
+    pScrn->displayWidth = pScrn->virtualX;
+
+    /* Set display resolution */
+    xf86SetDpi(pScrn, 0, 0);
+
+    return TRUE;
+}
+
+/* Determine the FFB/AFB board type.  We need this information even
+ * if acceleration is disabled because the ramdac support layer needs
+ * to know what kind of FFB/AFB this is.
+ */
+static void
+FFBProbeBoardType(FFBPtr pFfb)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+	volatile unsigned int *afb_fem;
+	unsigned int val;
+
+	afb_fem = ((volatile unsigned int *) ((char *)ffb + 0x1540));
+	val = *afb_fem;
+	val &= 0x7f;
+
+	xf86Msg(X_INFO, "%s: ", pFfb->psdp->device);
+	if (val == 0x3f || val == 0x07 || val == 0x01) {
+		/* When firmware has not been loaded onto AFB we
+		 * just assume it is an M6 board.
+		 */
+		if (val == 0x3f || val != 0x07) {
+			pFfb->ffb_type = afb_m6;
+			ErrorF("AFB: Detected Elite3D/M6.\n");
+		} else {
+			pFfb->ffb_type = afb_m3;
+			ErrorF("AFB: Detected Elite3D/M3.\n");
+		}
+
+		/* These attributes are invariant on AFB. */
+		pFfb->has_double_res = 0;
+		pFfb->has_z_buffer = 1;
+		pFfb->has_double_buffer = 1;
+	} else {
+		unsigned char sbits;
+
+		/* Read the board strapping bits twice, because sometimes
+		 * the strapping pins can get misrouted to the bus interface
+		 * on the first attempt.  The second attempt will get the
+		 * correct value.
+		 */
+		sbits = *((volatile unsigned char *)pFfb->strapping_bits);
+		sbits = *((volatile unsigned char *)pFfb->strapping_bits);
+		switch (sbits & 0x78) {
+		case (0x0 << 5) | (0x0 << 3):
+			pFfb->ffb_type = ffb1_prototype;
+			ErrorF("Detected FFB1 pre-FCS prototype, ");
+			break;
+		case (0x0 << 5) | (0x1 << 3):
+			pFfb->ffb_type = ffb1_standard;
+			ErrorF("Detected FFB1, ");
+			break;
+		case (0x0 << 5) | (0x3 << 3):
+			pFfb->ffb_type = ffb1_speedsort;
+			ErrorF("Detected FFB1-SpeedSort, ");
+			break;
+		case (0x1 << 5) | (0x0 << 3):
+			pFfb->ffb_type = ffb2_prototype;
+			ErrorF("Detected FFB2/vertical pre-FCS prototype, ");
+			break;
+		case (0x1 << 5) | (0x1 << 3):
+			pFfb->ffb_type = ffb2_vertical;
+			ErrorF("Detected FFB2/vertical, ");
+			break;
+		case (0x1 << 5) | (0x2 << 3):
+			pFfb->ffb_type = ffb2_vertical_plus;
+			ErrorF("Detected FFB2+/vertical, ");
+			break;
+		case (0x2 << 5) | (0x0 << 3):
+			pFfb->ffb_type = ffb2_horizontal;
+			ErrorF("Detected FFB2/horizontal, ");
+			break;
+		case (0x2 << 5) | (0x2 << 3):
+			pFfb->ffb_type = ffb2_horizontal;
+			ErrorF("Detected FFB2+/horizontal, ");
+			break;
+		default:
+			pFfb->ffb_type = ffb2_vertical;
+			ErrorF("Unknown boardID[%08x], assuming FFB2, ", sbits);
+			break;
+		};
+
+		if (sbits & (1 << 2)) {
+			ErrorF("DoubleRES, ");
+			pFfb->has_double_res = 1;
+		} else {
+			pFfb->has_double_res = 0;
+		}
+		if (sbits & (1 << 1)) {
+			ErrorF("Z-buffer, ");
+			pFfb->has_z_buffer = 1;
+		} else {
+			pFfb->has_z_buffer = 0;
+		}
+		if (sbits & (1 << 0)) {
+			ErrorF("Double-buffered.\n");
+
+			/* This state really means to the driver that the double
+			 * buffers are available for hw accelerate Dbe.  When the
+			 * FFB is in high-resolution mode, the buffers are combined
+			 * into one single large framebuffer.  So in high-resolution
+			 * hw accelerated double-buffering is not available.
+			 */
+			if ((ffb->fbcfg0 & FFB_FBCFG0_RES_MASK) != FFB_FBCFG0_RES_HIGH)
+				pFfb->has_double_buffer = 1;
+			else
+				pFfb->has_double_buffer = 1;
+		} else {
+			ErrorF("Single-buffered.\n");
+			pFfb->has_double_buffer = 0;
+		}
+	}
+}
+
+static unsigned long CreatorUnaccelGeneration = 0;
+static int CreatorUnaccelWindowPrivateIndex;
+
+#define CreatorUnaccelGetWid(w) \
+	((w)->devPrivates[CreatorUnaccelWindowPrivateIndex].val)
+#define CreatorUnaccelSetWid(w,wid) \
+	(((w)->devPrivates[CreatorUnaccelWindowPrivateIndex].val) = (wid))
+
+static unsigned int
+CreatorWidGet(WindowPtr pWin)
+{
+	return CreatorUnaccelGetWid(pWin);
+}
+
+static Bool
+CreatorWidAlloc(WindowPtr pWin)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	unsigned int wid;
+	int i, visual, visclass;
+
+	visual = wVisual(pWin);
+	visclass = 0;
+	for (i = 0; i < pScreen->numVisuals; i++) {
+		if (pScreen->visuals[i].vid == visual) {
+			visclass = pScreen->visuals[i].class;
+			break;
+		}
+	}
+
+	wid = FFBWidAlloc(pFfb, visclass, wColormap(pWin), TRUE);
+	if (wid == (unsigned int) -1)
+		return FALSE;
+
+	CreatorUnaccelSetWid(pWin, wid);
+
+	return TRUE;
+}
+
+static void
+CreatorWidFree(WindowPtr pWin)
+{
+	ScrnInfoPtr pScrn = xf86Screens[pWin->drawable.pScreen->myNum];
+	FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+	unsigned int wid = CreatorUnaccelGetWid(pWin);
+
+	FFBWidFree(pFfb, wid);
+}
+
+static cfb8_32WidOps CreatorUnaccelWidOps = {
+	CreatorWidGet,
+	CreatorWidAlloc,
+	CreatorWidFree,
+	NULL,
+	NULL
+};
+
+static Bool
+CreatorUnaccelWidInit(ScreenPtr pScreen)
+{
+	if (serverGeneration != CreatorUnaccelGeneration) {
+		CreatorUnaccelWindowPrivateIndex =
+			AllocateWindowPrivateIndex();
+		if (CreatorUnaccelWindowPrivateIndex == -1)
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+/* Mandatory */
+
+/* This gets called at the start of each server generation */
+
+static Bool
+FFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+{
+    ScrnInfoPtr pScrn;
+    FFBPtr pFfb;
+    int ret;
+    unsigned int afb_fem;
+    VisualPtr visual;
+
+    /* Add in our Dbe hook. */
+    if (!FFBDbePreInit(pScreen))
+	return FALSE;
+
+    /* 
+     * First get the ScrnInfoRec
+     */
+    pScrn = xf86Screens[pScreen->myNum];
+
+    pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+    /* Map the FFB framebuffer, for each view. */
+
+    /* 24-bit RGB Dumb view */
+    pFfb->fb = pFfb->dfb24 =
+	xf86MapSbusMem (pFfb->psdp, FFB_DFB24_VOFF, 0x1000000);
+
+    if (! pFfb->dfb24)
+	return FALSE;
+
+    /* 8-bit R Dumb view */
+    pFfb->dfb8r =
+	xf86MapSbusMem (pFfb->psdp, FFB_DFB8R_VOFF, 0x400000);
+
+    if (! pFfb->dfb8r)
+	return FALSE;
+
+    /* 8-bit X Dumb view */
+    pFfb->dfb8x =
+	xf86MapSbusMem (pFfb->psdp, FFB_DFB8X_VOFF, 0x400000);
+
+    if (! pFfb->dfb8x)
+	return FALSE;
+
+    /* 32-bit RGB Smart view */
+    pFfb->sfb32 =
+	xf86MapSbusMem (pFfb->psdp, FFB_SFB32_VOFF, 0x1000000);
+
+    if (!pFfb->sfb32)
+	return FALSE;
+
+    /* 8-bit R Smart view */
+    pFfb->sfb8r =
+	xf86MapSbusMem(pFfb->psdp, FFB_SFB8R_VOFF, 0x400000);
+
+    if (!pFfb->sfb8r)
+	return FALSE;
+
+    /* 8-bit X Smart view */
+    pFfb->sfb8x =
+	xf86MapSbusMem(pFfb->psdp, FFB_SFB8X_VOFF, 0x400000);
+
+    if (!pFfb->sfb8x)
+	return FALSE;
+
+    /* Map the rendering pipeline */
+    pFfb->regs =
+	xf86MapSbusMem (pFfb->psdp, FFB_FBC_REGS_VOFF, 16384);
+
+    if (! pFfb->regs)
+	return FALSE;
+
+    /* Map the ramdac */
+    pFfb->dac =
+	xf86MapSbusMem (pFfb->psdp, FFB_DAC_VOFF, 8192);
+
+    if (! pFfb->dac)
+	return FALSE;
+
+    /* Map the board strapping bits */
+    pFfb->strapping_bits = (volatile unsigned int *)
+	    xf86MapSbusMem(pFfb->psdp, FFB_EXP_VOFF, 8192);
+
+    if (! pFfb->strapping_bits)
+	return FALSE;
+
+    /* Probe for the type of FFB/AFB we have. */
+    FFBProbeBoardType(pFfb);
+
+    /* Now that we have the board type, we can init the ramdac layer. */
+    if (FFBDacInit(pFfb) == FALSE)
+	return FALSE;
+
+    /* OK, a fun gross hack to detect if this is
+     * AFB and if so whether the correct firmware
+     * has been loaded.  The machine will flatline
+     * if you try to use certain acceleration features
+     * without the full firmware loaded.
+     *
+     * The bootup Elite3D/AFB firmware is minimal, and
+     * will leave the FloatEnableMask register at a
+     * value of 0x01.  Creator{,3D} lacks the FEM register
+     * and will return a "nonsense" value on attempts to
+     * read this location.  After experimentation, an
+     * appropriate definition for "nonsense" seems to
+     * be anything with all low 7 bits not 0x3f, 0x07,
+     * of 0x01.
+     *
+     * If the FEM register is non-zero and is some value
+     * other than 0x1 (usually 0x3f or 0x7 depending upon
+     * whether the card has 3 or 6 floats) we can assume
+     * the correct firmware has been loaded. -DaveM
+     */
+    afb_fem = *(unsigned int *)((char *)pFfb->regs + 0x1540);
+    if ((afb_fem & 0x7f) != 0x3f &&
+	(afb_fem & 0x7f) != 0x07 &&
+	(afb_fem & 0x7f) != 0x01)
+	xf86Msg(X_INFO, "%s: Detected Creator/Creator3D\n", pFfb->psdp->device);
+    else {
+	xf86Msg(X_INFO, "%s: Detected Elite3D M3/M6, checking firmware...\n", pFfb->psdp->device);
+	if (afb_fem == 0x1) {
+	    xf86Msg(X_INFO, "%s: ... AFB firmware not loaded\n", pFfb->psdp->device);
+	    if (!pFfb->NoAccel) {
+		xf86Msg(X_WARNING, "%s: Forcing no acceleration on Elite3D M3/M6\n", pFfb->psdp->device);
+		pFfb->NoAccel = TRUE;
+	    }
+	} else
+	    xf86Msg(X_INFO, "%s: ... AFB firmware is loaded\n", pFfb->psdp->device);
+    }
+
+    /* Darken the screen for aesthetic reasons and set the viewport */
+    FFBSaveScreen(pScreen, SCREEN_SAVER_ON);
+
+    if (pFfb->NoAccel == TRUE) {
+	    if (!CreatorUnaccelWidInit(pScreen))
+		    return FALSE;
+    }
+
+    /*
+     * The next step is to setup the screen's visuals, and initialise the
+     * framebuffer code.  In cases where the framebuffer's default
+     * choices for things like visual layouts and bits per RGB are OK,
+     * this may be as simple as calling the framebuffer's ScreenInit()
+     * function.  If not, the visuals will need to be setup before calling
+     * a fb ScreenInit() function and fixed up after.
+     */
+
+    /*
+     * Reset visual list.
+     */
+    miClearVisualTypes();
+
+    /* Setup the visuals we support. */
+    if (!miSetVisualTypes(24, TrueColorMask | DirectColorMask,
+			  pScrn->rgbBits, TrueColor))
+	    return FALSE;
+    if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask | StaticGrayMask,
+			  pScrn->rgbBits, PseudoColor))
+	    return FALSE;
+
+#ifdef XF86DRI
+    if (pFfb->ffb_type != afb_m3 && pFfb->ffb_type != afb_m6) {
+	    pFfb->dri_enabled = FFBDRIScreenInit(pScreen);
+	    if (pFfb->dri_enabled == TRUE)
+		    xf86Msg(X_INFO, "%s: DRM initialized\n",
+			    pFfb->psdp->device);
+	    else
+		    xf86Msg(X_INFO, "%s: DRM setup failed\n",
+			    pFfb->psdp->device);
+    } else {
+	    pFfb->dri_enabled = FALSE;
+    }
+#endif
+
+    /*
+     * Call the framebuffer layer's ScreenInit function, and fill in other
+     * pScreen fields.
+     */
+    if (pFfb->NoAccel == TRUE) {
+	    ret = cfb8_32WidScreenInit(pScreen, pFfb->dfb24, pFfb->dfb8r, pFfb->dfb8x,
+				       pScrn->virtualX, pScrn->virtualY,
+				       pScrn->xDpi, pScrn->yDpi,
+				       2048, 2048, 2048, 8,
+				       &CreatorUnaccelWidOps);
+    } else {
+	    /* Use smart framebuffer aperture for cfb8/cfb32. */
+	    ret = cfb8_32WidScreenInit(pScreen, pFfb->sfb32, pFfb->sfb8r, pFfb->dfb8x,
+				       pScrn->virtualX, pScrn->virtualY,
+				       pScrn->xDpi, pScrn->yDpi,
+				       2048, 2048, 2048, 8,
+				       &CreatorUnaccelWidOps);
+    }
+
+    if (!ret)
+	return FALSE;
+
+    miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+
+    xf86SetBlackWhitePixels(pScreen);
+
+    if (pScrn->bitsPerPixel > 8) {
+        /* Fixup RGB ordering */
+        visual = pScreen->visuals + pScreen->numVisuals;
+        while (--visual >= pScreen->visuals) {
+	    if ((visual->class | DynamicClass) == DirectColor) {
+		visual->offsetRed = pScrn->offset.red;
+		visual->offsetGreen = pScrn->offset.green;
+		visual->offsetBlue = pScrn->offset.blue;
+		visual->redMask = pScrn->mask.red;
+		visual->greenMask = pScrn->mask.green;
+		visual->blueMask = pScrn->mask.blue;
+	    }
+	}
+    }
+
+    if (!pFfb->NoAccel) {
+	if (!FFBAccelInit(pScreen, pFfb))
+	    return FALSE;
+	xf86Msg(X_INFO, "%s: Using acceleration\n", pFfb->psdp->device);
+    }
+
+    /* Initialise cursor functions */
+    miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
+
+    /* Initialize HW cursor layer. 
+     * Must follow software cursor initialization.
+     */
+    if (pFfb->HWCursor) { 
+	if(!FFBHWCursorInit(pScreen)) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
+		       "Hardware cursor initialization failed\n");
+	    return(FALSE);
+	}
+	xf86SbusHideOsHwCursor(pFfb->psdp);
+    }
+
+    /* Initialise default colourmap. */
+    if (!miCreateDefColormap(pScreen))
+	return FALSE;
+
+    /* Initialize colormap layer.
+     * Must follow initialization of the default colormap.
+     */
+    if (!xf86HandleColormaps(pScreen, 256, 8,
+			     FFBDacLoadPalette, NULL,
+#if 0
+			     CMAP_PALETTED_TRUECOLOR |
+#endif
+			     CMAP_LOAD_EVEN_IF_OFFSCREEN |
+			     CMAP_RELOAD_ON_MODE_SWITCH))
+	return FALSE;
+
+    /* Setup DGA support. */
+    FFB_InitDGA(pScreen);
+
+#ifdef XF86DRI
+    if (pFfb->dri_enabled) {
+	    /* Now that mi, cfb, drm and others have done their thing, 
+	     * complete the DRI setup.
+	     */
+	    pFfb->dri_enabled = FFBDRIFinishScreenInit(pScreen);
+	    if (pFfb->dri_enabled)
+		    xf86Msg(X_INFO, "%s: DRM finish setup complete\n",
+			    pFfb->psdp->device);
+	    else
+		    xf86Msg(X_INFO, "%s: DRM finish setup failed\n",
+			    pFfb->psdp->device);
+    }
+#endif
+
+    pFfb->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = FFBCloseScreen;
+    pScreen->SaveScreen = FFBSaveScreen;
+
+    /* Report any unused options (only for the first generation) */
+    if (serverGeneration == 1) {
+	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+    }
+
+    /* unblank the screen */
+    FFBSaveScreen(pScreen, SCREEN_SAVER_OFF);
+
+    /* Done */
+    return TRUE;
+}
+
+
+/* Usually mandatory */
+static Bool
+FFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This function is used to initialize the Start Address - the first
+ * displayed location in the video memory.
+ */
+/* Usually mandatory */
+static void 
+FFBAdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+    /* we don't support virtual desktops */
+    return;
+}
+
+/*
+ * This is called when VT switching back to the X server.  Its job is
+ * to reinitialise the video mode.
+ */
+
+/* Mandatory */
+static Bool
+FFBEnterVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+    if (!pFfb->NoAccel)
+	CreatorVtChange (pScrn->pScreen, TRUE);
+    if (pFfb->HWCursor)
+	xf86SbusHideOsHwCursor (pFfb->psdp);
+
+    FFBDacEnterVT(pFfb);
+
+    return TRUE;
+}
+
+
+/*
+ * This is called when VT switching away from the X server.
+ */
+
+/* Mandatory */
+static void
+FFBLeaveVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+    FFBDacLeaveVT(pFfb);
+
+    if (!pFfb->NoAccel)
+	CreatorVtChange (pScrn->pScreen, FALSE);
+    return;
+}
+
+
+/*
+ * This is called at the end of each server generation.  It restores the
+ * original (text) mode.  It should really also unmap the video memory too.
+ */
+
+/* Mandatory */
+static Bool
+FFBCloseScreen(int scrnIndex, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
+
+#ifdef XF86DRI
+    if (pFfb->dri_enabled)
+	    FFBDRICloseScreen(pScreen);
+#endif
+
+    /* Restore kernel ramdac state before we unmap registers. */
+    FFBDacFini(pFfb);
+
+    pScrn->vtSema = FALSE;
+
+    xf86UnmapSbusMem(pFfb->psdp, pFfb->dfb24, 0x1000000);
+    xf86UnmapSbusMem(pFfb->psdp, pFfb->dfb8r, 0x400000);
+    xf86UnmapSbusMem(pFfb->psdp, pFfb->dfb8x, 0x400000);
+    xf86UnmapSbusMem(pFfb->psdp, pFfb->sfb32, 0x1000000);
+    xf86UnmapSbusMem(pFfb->psdp, pFfb->sfb8r, 0x400000);
+    xf86UnmapSbusMem(pFfb->psdp, pFfb->sfb8x, 0x400000);
+    xf86UnmapSbusMem(pFfb->psdp, pFfb->regs, 16384);
+    xf86UnmapSbusMem(pFfb->psdp, pFfb->dac, 8192);
+    xf86UnmapSbusMem(pFfb->psdp, (void *)pFfb->strapping_bits, 8192);
+
+    pScreen->CloseScreen = pFfb->CloseScreen;
+    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+}
+
+
+/* Free up any per-generation data structures */
+
+/* Optional */
+static void
+FFBFreeScreen(int scrnIndex, int flags)
+{
+    FFBFreeRec(xf86Screens[scrnIndex]);
+}
+
+
+/* Checks if a mode is suitable for the selected chipset. */
+
+/* Optional */
+static int
+FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+{
+    if (mode->Flags & V_INTERLACE)
+	return(MODE_BAD);
+
+    return(MODE_OK);
+}
+
+/* Do screen blanking */
+
+/* Mandatory */
+static Bool
+FFBSaveScreen(ScreenPtr pScreen, int mode)
+    /* this function should blank the screen when unblank is FALSE and
+       unblank it when unblank is TRUE -- it doesn't actually seem to be
+       used for much though */
+{
+    return TRUE;
+}
+
+/*
+ * This is the implementation of the Sync() function.
+ */
+void
+FFBSync(ScrnInfoPtr pScrn)
+{
+    return;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fifo.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fifo.h:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fifo.h	Mon May 22 21:47:44 2000
@@ -0,0 +1,69 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - fifo macros.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fifo.h,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#ifndef FFBFIFO_H
+#define FFBFIFO_H
+
+#include "ffb.h"
+
+/* This is the smallest FFB fifo size I know of. -DaveM */
+#define FFB_FIFO_MIN	124
+
+#define FFBFifo(__fpriv, __n) \
+do { 	int __cur_slots = (__fpriv)->fifo_cache; \
+	if((__cur_slots - (__n)) < 0) { \
+		ffb_fbcPtr __ffb = pFfb->regs; \
+		do {	__cur_slots = (((int)__ffb->ucsr & FFB_UCSR_FIFO_MASK) - 4); \
+		} while((__cur_slots - (__n)) < 0); \
+	} (__fpriv)->fifo_cache = (__cur_slots - (__n)); \
+} while(0)
+
+/* While we are polling for the raster processor to idle, cache the
+ * fifo count as well.
+ */
+#define FFBWait(__fpriv, __ffb) \
+if ((__fpriv)->rp_active != 0) { \
+	unsigned int __regval = (__ffb)->ucsr; \
+	while((__regval & FFB_UCSR_RP_BUSY) != 0) { \
+		__regval = (__ffb)->ucsr; \
+	} \
+	(__fpriv)->fifo_cache = ((int)(__regval & FFB_UCSR_FIFO_MASK)) - 4; \
+	(__fpriv)->rp_active = 0; \
+} while(0)
+
+/* DEBUGGING:  You can use this if you suspect corruption is occuring
+ *             because someone is touching the framebuffer while the
+ *	       raster processor is active.  If you enable this and the
+ *	       problem goes away, odds are your suspicions are correct.
+ */
+#undef FORCE_WAIT_EVERY_ROP
+#ifdef FORCE_WAIT_EVERY_ROP
+#define FFBSync(__fpriv, __ffb)	FFBWait(__fpriv, __ffb)
+#else
+#define FFBSync(__fpriv, __ffb)	do { } while(0)
+#endif
+
+#endif /* FFBFIFO_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_frect.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_frect.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_frect.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,709 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Rectangle filling.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1998 Michal Rehacek (majkl@iname.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK, MICHAL REHACEK, OR DAVID MILLER BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_frect.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_stip.h"
+#include "ffb_loops.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+#define PAGEFILL_DISABLED(pFfb) ((pFfb)->disable_pagefill != 0)
+#define FASTFILL_AP_DISABLED(pFfb) ((pFfb)->disable_fastfill_ap != 0)
+
+void
+CreatorFillBoxStipple (DrawablePtr pDrawable, int nBox, BoxPtr pBox, CreatorStipplePtr stipple)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	ffb_fbcPtr ffb = pFfb->regs;
+	unsigned int bits[32];
+	unsigned int newalign;
+
+	FFBLOG(("CreatorFillBoxStipple: nbox(%d)\n", nBox));
+	newalign = ((pDrawable->y & 31) << 16) | (pDrawable->x & 31);
+	if (stipple->patalign != newalign) {
+		int x, y, i;
+		
+		x = (pDrawable->x - (stipple->patalign & 0xffff)) & 31;
+		y = (pDrawable->y - (stipple->patalign >> 16)) & 31;
+		if (x | y) {
+			memcpy(bits, stipple->bits, sizeof(bits));
+			for (i = 0; i < 32; i++)
+				stipple->bits[(i + y) & 31] =
+					(bits[i] >> x) | (bits[i] << (32 - x));
+			stipple->inhw = 0;
+		}
+		stipple->patalign = newalign;
+	}
+
+	FFBSetStipple(pFfb, ffb, stipple,
+		      FFB_PPC_APE_DISABLE|FFB_PPC_CS_CONST|FFB_PPC_XS_WID,
+		      FFB_PPC_APE_MASK|FFB_PPC_CS_MASK|FFB_PPC_XS_MASK);
+	FFB_WRITE_PMASK(pFfb, ffb, ~0);
+	FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+	FFB_WRITE_FBC(pFfb, ffb, FFB_FBC_WIN(pWin));
+	FFB_WRITE_WID(pFfb, ffb, FFB_WID_WIN(pWin));
+
+	while(nBox--) {
+		register int x, y, w, h;
+
+		x = pBox->x1;
+		y = pBox->y1;
+		w = (pBox->x2 - x);
+		h = (pBox->y2 - y);
+		FFBFifo(pFfb, 4);
+		FFB_WRITE64(&ffb->by, y, x);
+		FFB_WRITE64_2(&ffb->bh, h, w);
+		pBox++;
+	}
+
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+
+enum ffb_fillrect_method { fillrect_page,
+			   fillrect_fast, fillrect_fast_opaque,
+			   fillrect_normal };
+
+#define BOX_AREA(__w, __h)	((int)(__w) * (int)(__h))
+
+/* Compute the page aligned box for a page mode fast fill.
+ * In 'ework' this returns greater than zero if there are some odd
+ * edges to take care of which are outside of the page aligned area.
+ * It will place less than zero there if the box is too small,
+ * indicating that a different method must be used to fill it.
+ */
+#define CreatorPageFillParms(pFfb, ffp, x, y, w, h, px, py, pw, ph, ework) \
+do {	int xdiff, ydiff; \
+	int pf_bh = ffp->pagefill_height; \
+	int pf_bw = ffp->pagefill_width; \
+	py = ((y + (pf_bh - 1)) & ~(pf_bh - 1)); \
+	ydiff = py - y; \
+	px = pFfb->Pf_AlignTab[x + (pf_bw - 1)]; \
+	xdiff = px - x; \
+	ph = ((h - ydiff) & ~(pf_bh - 1)); \
+	if(ph <= 0) \
+		ework = -1; \
+	else { \
+		pw = pFfb->Pf_AlignTab[w - xdiff]; \
+		if(pw <= 0) { \
+			ework = -1; \
+		} else { \
+			ework = (((xdiff > 0)		|| \
+				  (ydiff > 0)		|| \
+				  ((w - pw) > 0)	|| \
+				  ((h - ph) > 0))) ? 1 : 0; \
+		} \
+	} \
+} while(0);
+
+/* Compute fixups of non-page aligned areas after a page fill.
+ * Return the number of fixups needed.
+ */
+static __inline__ int
+CreatorComputePageFillFixups(xRectangle *fixups,
+			     int x, int y, int w, int h,
+			     int paligned_x, int paligned_y,
+			     int paligned_w, int paligned_h)
+{
+	int nfixups = 0;
+
+	/* FastFill Left */
+	if(paligned_x != x) {
+		fixups[nfixups].x = x;
+		fixups[nfixups].y = paligned_y;
+		fixups[nfixups].width = paligned_x - x;
+		fixups[nfixups].height = paligned_h;
+		nfixups++;
+	}
+	/* FastFill Top */
+	if(paligned_y != y) {
+		fixups[nfixups].x = x;
+		fixups[nfixups].y = y;
+		fixups[nfixups].width = w;
+		fixups[nfixups].height = paligned_y - y;
+		nfixups++;
+	}
+	/* FastFill Right */
+	if((x+w) != (paligned_x+paligned_w)) {
+		fixups[nfixups].x = (paligned_x+paligned_w);
+		fixups[nfixups].y = paligned_y;
+		fixups[nfixups].width = (x+w) - fixups[nfixups].x;
+		fixups[nfixups].height = paligned_h;
+		nfixups++;
+	}
+	/* FastFill Bottom */
+	if((y+h) != (paligned_y+paligned_h)) {
+		fixups[nfixups].x = x;
+		fixups[nfixups].y = (paligned_y+paligned_h);
+		fixups[nfixups].width = w;
+		fixups[nfixups].height = (y+h) - fixups[nfixups].y;
+		nfixups++;
+	}
+	return nfixups;
+}
+
+/* Fill a set of boxes, pagefill and fastfill not allowed. */
+static void
+CreatorBoxFillNormal(FFBPtr pFfb,
+		     int nbox, BoxPtr pbox)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	FFBLOG(("BFNormal: "));
+	if(nbox)
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+	while(nbox--) {
+		register int x, y, w, h;
+
+		x = pbox->x1;
+		y = pbox->y1;
+		w = (pbox->x2 - x);
+		h = (pbox->y2 - y);
+		pbox++;
+		FFBLOG(("[%08x:%08x:%08x:%08x] ", x, y, w, h));
+		FFBFifo(pFfb, 4);
+		FFB_WRITE64(&ffb->by, y, x);
+		FFB_WRITE64_2(&ffb->bh, h, w);
+	}
+	FFBLOG(("\n"));
+}
+
+/* Fill a set of boxes, only non-pagemode fastfill is allowed. */
+static void
+CreatorBoxFillFast(FFBPtr pFfb,
+		   int nbox, BoxPtr pbox)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	FFBLOG(("BFFast: "));
+	while(nbox--) {
+		struct fastfill_parms *ffp = &FFB_FFPARMS(pFfb);
+		register int x, y, w, h;
+
+		x = pbox->x1;
+		y = pbox->y1;
+		w = (pbox->x2 - x);
+		h = (pbox->y2 - y);
+		pbox++;
+		if(BOX_AREA(w, h) < ffp->fastfill_small_area) {
+			/* Too small for fastfill to be useful. */
+			FFBLOG(("NRM(%08x:%08x:%08x:%08x) ",
+				x, y, w, h));
+			FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+			FFBFifo(pFfb, 4);
+			FFB_WRITE64(&ffb->by, y, x);
+			FFB_WRITE64_2(&ffb->bh, h, w);
+		} else {
+			FFBLOG(("FST(%08x:%08x:%08x:%08x:[%08x:%08x]) ",
+				x, y, w, h,
+				(w + (x & (ffp->fastfill_width - 1))),
+				(h + (y & (ffp->fastfill_height - 1)))));
+			if (pFfb->ffb_res == ffb_res_high &&
+			    ((x & 7) != 0 || (w & 7) != 0)) {
+				FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+				if ((x & 7) != 0) {
+					register int nx = x;
+					register int nw;
+
+					nw = 8 - (nx & 7);
+					if (nw > w)
+						nw = w;
+					FFBFifo(pFfb, 4);
+					FFB_WRITE64(&ffb->by, y, nx);
+					FFB_WRITE64_2(&ffb->bh, h, nw);
+					x += nw;
+					w -= nw;
+				}
+				if ((w & 7) != 0) {
+					register int nx, nw;
+
+					nw = (w & 7);
+					nx = x + (w - nw);
+					FFBFifo(pFfb, 4);
+					FFB_WRITE64(&ffb->by, y, nx);
+					FFB_WRITE64_2(&ffb->bh, h, nw);
+					w -= nw;
+				}
+				if (w <= 0)
+					goto next_rect;
+			}
+			FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_FASTFILL);
+			FFBFifo(pFfb, 10);
+			ffb->by = FFB_FASTFILL_COLOR_BLK;
+			FFB_WRITE64(&ffb->dy, 0, 0);
+			FFB_WRITE64_2(&ffb->bh,
+				      ffp->fastfill_height,
+				      (ffp->fastfill_width * 4));
+			FFB_WRITE64_3(&ffb->dy, y, x);
+			ffb->bh = (h + (y & (ffp->fastfill_height - 1)));
+			FFB_WRITE64(&ffb->by, FFB_FASTFILL_BLOCK,
+				    (w + (x & (ffp->fastfill_width - 1))));
+		}
+	next_rect:
+		;
+	}
+	FFBLOG(("\n"));
+}
+
+/* Fill a set of boxes, any fastfill method is allowed. */
+static void
+CreatorBoxFillPage(FFBPtr pFfb,
+		   int nbox, BoxPtr pbox)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	FFBLOG(("BFPage: "));
+	while(nbox--) {
+		struct fastfill_parms *ffp = &FFB_FFPARMS(pFfb);
+		register int x, y, w, h;
+
+		x = pbox->x1;
+		y = pbox->y1;
+		w = (pbox->x2 - x);
+		h = (pbox->y2 - y);
+		pbox++;
+		if(BOX_AREA(w, h) < ffp->fastfill_small_area) {
+			/* Too small for fastfill or page fill to be useful. */
+			FFBLOG(("NRM(%08x:%08x:%08x:%08x) ",
+				x, y, w, h));
+			FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+			FFBFifo(pFfb, 4);
+			FFB_WRITE64(&ffb->by, y, x);
+			FFB_WRITE64_2(&ffb->bh, h, w);
+		} else {
+			int paligned_y, paligned_x;
+			int paligned_h, paligned_w = 0;
+			int extra_work;
+
+			if (pFfb->ffb_res == ffb_res_high &&
+			    ((x & 7) != 0 || (w & 7) != 0)) {
+				FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+				if ((x & 7) != 0) {
+					register int nx = x;
+					register int nw;
+
+					nw = 8 - (nx & 7);
+					if (nw > w)
+						nw = w;
+					FFBFifo(pFfb, 4);
+					FFB_WRITE64(&ffb->by, y, nx);
+					FFB_WRITE64_2(&ffb->bh, h, nw);
+					x += nw;
+					w -= nw;
+				}
+				if ((w & 7) != 0) {
+					register int nx, nw;
+
+					nw = (w & 7);
+					nx = x + (w - nw);
+					FFBFifo(pFfb, 4);
+					FFB_WRITE64(&ffb->by, y, nx);
+					FFB_WRITE64_2(&ffb->bh, h, nw);
+					w -= nw;
+				}
+				if (w <= 0)
+					goto next_rect;
+			}
+
+			FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_FASTFILL);
+			if((w < (ffp->pagefill_width<<1)) ||
+			   (h < (ffp->pagefill_height<<1)))
+				goto do_fastfill;
+
+			CreatorPageFillParms(pFfb, ffp,
+					     x, y, w, h,
+					     paligned_x, paligned_y,
+					     paligned_w, paligned_h, extra_work);
+
+			/* See if the aligned area is large enough for
+			 * page fill to be worthwhile.
+			 */
+			if(extra_work < 0 ||
+			   BOX_AREA(paligned_w, paligned_h) < ffp->pagefill_small_area) {
+		   do_fastfill:
+				FFBLOG(("FST(%08x:%08x:%08x:%08x:[%08x:%08x]) ",
+					x, y, w, h,
+					(w + (x & (ffp->fastfill_width - 1))),
+					(h + (y & (ffp->fastfill_height - 1)))));
+				FFBFifo(pFfb, 10);
+				ffb->by = FFB_FASTFILL_COLOR_BLK;
+				FFB_WRITE64(&ffb->dy, 0, 0);
+				FFB_WRITE64_2(&ffb->bh,
+					      ffp->fastfill_height,
+					      (ffp->fastfill_width * 4));
+				FFB_WRITE64_3(&ffb->dy, y, x);
+				ffb->bh = (h + (y & (ffp->fastfill_height - 1)));
+				FFB_WRITE64(&ffb->by, FFB_FASTFILL_BLOCK,
+					    (w + (x & (ffp->fastfill_width - 1))));
+			} else {
+				/* Ok, page fill is worth it, let it rip. */
+				FFBLOG(("PAG(%08x:%08x:%08x:%08x) ",
+					paligned_x, paligned_y, paligned_w, paligned_h));
+				FFBFifo(pFfb, 15);
+				ffb->by = FFB_FASTFILL_COLOR_BLK;
+				FFB_WRITE64(&ffb->dy, 0, 0);
+				FFB_WRITE64_2(&ffb->bh, ffp->fastfill_height, (ffp->fastfill_width * 4));
+				ffb->by = FFB_FASTFILL_BLOCK_X;
+				FFB_WRITE64(&ffb->dy, 0, 0);
+				FFB_WRITE64_2(&ffb->bh, ffp->pagefill_height, (ffp->pagefill_width * 4));
+				FFB_WRITE64_3(&ffb->dy, paligned_y, paligned_x);
+				ffb->bh = paligned_h;
+				FFB_WRITE64(&ffb->by, FFB_FASTFILL_PAGE, paligned_w);
+
+				if(extra_work) {
+					register int nfixups;
+
+					/* Ok, we're going to do at least one fixup. */
+					nfixups = CreatorComputePageFillFixups(pFfb->Pf_Fixups,
+									       x, y, w, h,
+									       paligned_x, paligned_y,
+									       paligned_w, paligned_h);
+
+					/* NOTE: For the highres case we have already
+					 *       aligned the outermost X and W coordinates.
+					 *	 Therefore we can be assured that the fixup
+					 *	 X and W coordinates below will be 8 pixel
+					 *	 aligned as well.  Do the math, it works. -DaveM
+					 */
+
+					FFBFifo(pFfb, 5 + (nfixups * 5));
+					ffb->by = FFB_FASTFILL_COLOR_BLK;
+					FFB_WRITE64(&ffb->dy, 0, 0);
+					FFB_WRITE64_2(&ffb->bh, ffp->fastfill_height, (ffp->fastfill_width * 4));
+
+					while(--nfixups >= 0) {
+						register int xx, yy, ww, hh;
+
+						xx = pFfb->Pf_Fixups[nfixups].x;
+						yy = pFfb->Pf_Fixups[nfixups].y;
+						FFB_WRITE64(&ffb->dy, yy, xx);
+						ww = (pFfb->Pf_Fixups[nfixups].width +
+						      (xx & (ffp->fastfill_width - 1)));
+						hh = (pFfb->Pf_Fixups[nfixups].height +
+						      (yy & (ffp->fastfill_height - 1)));
+						FFBLOG(("FIXUP(%08x:%08x:%08x:%08x) ",
+							xx, yy, ww, hh));
+						if(nfixups != 0) {
+							ffb->by = FFB_FASTFILL_BLOCK;
+							FFB_WRITE64_2(&ffb->bh, hh, ww);
+						} else {
+							ffb->bh = hh;
+							FFB_WRITE64(&ffb->by, FFB_FASTFILL_BLOCK, ww);
+						}
+					}
+				}
+			}
+		}
+	next_rect:
+		;
+	}
+	FFBLOG(("\n"));
+}
+
+void
+CreatorFillBoxSolid (DrawablePtr pDrawable, int nBox, BoxPtr pBox, unsigned long pixel)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	WindowPtr pWin = (WindowPtr) pDrawable;
+
+	FFBLOG(("CreatorFillBoxSolid: nbox(%d)\n", nBox));
+	FFB_ATTR_FFWIN(pFfb, pWin,
+		       FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+		       pixel);
+	if (PAGEFILL_DISABLED(pFfb))
+		CreatorBoxFillNormal(pFfb, nBox, pBox);
+	else
+		CreatorBoxFillPage(pFfb, nBox, pBox);
+
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+
+static void
+FFBSetStippleFast(FFBPtr pFfb, ffb_fbcPtr ffb,
+		  CreatorStipplePtr stipple,
+		  unsigned int ppc, unsigned int ppc_mask)
+{
+	ppc |= FFB_PPC_APE_ENABLE | FFB_PPC_TBE_TRANSPARENT | FFB_PPC_XS_WID;
+	ppc_mask |= FFB_PPC_APE_MASK | FFB_PPC_TBE_MASK | FFB_PPC_XS_MASK;
+	FFB_WRITE_PPC(pFfb, ffb, ppc, ppc_mask);
+	FFB_WRITE_ROP(pFfb, ffb, (FFB_ROP_EDIT_BIT|stipple->alu)|(FFB_ROP_NEW<<8));
+	FFB_WRITE_FG(pFfb, ffb, stipple->fg);
+	FFBFifo(pFfb, 32);
+	FFB_STIPPLE_LOAD(&ffb->pattern[0], &stipple->bits[0]);
+}
+
+static void
+FFBSetStippleFastIdentity(FFBPtr pFfb,
+			  ffb_fbcPtr ffb,
+			  CreatorStipplePtr stipple)
+{
+	int i;
+
+	FFB_WRITE_FG(pFfb, ffb, stipple->bg);
+	FFBFifo(pFfb, 32);
+	for(i = 0; i < 32; i++)
+		ffb->pattern[i] = ~stipple->bits[i];
+	stipple->inhw = 0;
+	pFfb->laststipple = NULL;
+}
+
+void
+CreatorPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	xRectangle	*prect;
+	RegionPtr	prgnClip;
+	register BoxPtr	pbox;
+	register BoxPtr	pboxClipped;
+	BoxPtr		pboxClippedBase;
+	BoxPtr		pextent;
+	CreatorPrivGCPtr gcPriv;
+	int		numRects;
+	int		n;
+	int		xorg, yorg;
+    
+	/* No garbage please. */
+	if (nrectFill <= 0)
+		return;
+
+	gcPriv = CreatorGetGCPrivate (pGC);
+	FFBLOG(("CreatorPolyFillRect: nrect(%d) ALU(%x) STIP(%p) pmsk(%08x)\n",
+		nrectFill, pGC->alu, gcPriv->stipple, pGC->planemask));
+	prgnClip = cfbGetCompositeClip(pGC);
+	prect = prectInit;
+	xorg = pDrawable->x;
+	yorg = pDrawable->y;
+	if (xorg || yorg) {
+		prect = prectInit;
+		n = nrectFill;
+		while (n--) {
+			prect->x += xorg;
+			prect->y += yorg;
+			prect++;
+		}
+	}
+
+	prect = prectInit;
+	numRects = REGION_NUM_RECTS (prgnClip) * nrectFill;
+	if (numRects > 64) {
+		pboxClippedBase = (BoxPtr)ALLOCATE_LOCAL(numRects * sizeof(BoxRec));
+		if (!pboxClippedBase)
+			return;
+	} else
+		pboxClippedBase = pFfb->ClippedBoxBuf;
+
+	pboxClipped = pboxClippedBase;
+	if (REGION_NUM_RECTS(prgnClip) == 1) {
+		int x1, y1, x2, y2, bx2, by2;
+
+		pextent = REGION_RECTS(prgnClip);
+		x1 = pextent->x1;
+		y1 = pextent->y1;
+		x2 = pextent->x2;
+		y2 = pextent->y2;
+		while (nrectFill--) {
+			if ((pboxClipped->x1 = prect->x) < x1)
+				pboxClipped->x1 = x1;
+
+			if ((pboxClipped->y1 = prect->y) < y1)
+				pboxClipped->y1 = y1;
+
+			bx2 = (int) prect->x + (int) prect->width;
+			if (bx2 > x2)
+				bx2 = x2;
+			pboxClipped->x2 = bx2;
+
+			by2 = (int) prect->y + (int) prect->height;
+			if (by2 > y2)
+				by2 = y2;
+			pboxClipped->y2 = by2;
+
+			prect++;
+			if ((pboxClipped->x1 < pboxClipped->x2) &&
+			    (pboxClipped->y1 < pboxClipped->y2))
+				pboxClipped++;
+		}
+	} else {
+		int x1, y1, x2, y2, bx2, by2;
+
+		pextent = REGION_EXTENTS(pGC->pScreen, prgnClip);
+		x1 = pextent->x1;
+		y1 = pextent->y1;
+		x2 = pextent->x2;
+		y2 = pextent->y2;
+		while (nrectFill--) {
+			BoxRec box;
+
+			if ((box.x1 = prect->x) < x1)
+				box.x1 = x1;
+
+			if ((box.y1 = prect->y) < y1)
+				box.y1 = y1;
+
+			bx2 = (int) prect->x + (int) prect->width;
+			if (bx2 > x2)
+				bx2 = x2;
+			box.x2 = bx2;
+
+			by2 = (int) prect->y + (int) prect->height;
+			if (by2 > y2)
+				by2 = y2;
+			box.y2 = by2;
+
+			prect++;
+
+			if ((box.x1 >= box.x2) || (box.y1 >= box.y2))
+				continue;
+
+			n = REGION_NUM_RECTS (prgnClip);
+			pbox = REGION_RECTS(prgnClip);
+
+			/* Clip the rectangle to each box in the clip region
+			 * this is logically equivalent to calling Intersect()
+			 */
+			while(n--) {
+				pboxClipped->x1 = max(box.x1, pbox->x1);
+				pboxClipped->y1 = max(box.y1, pbox->y1);
+				pboxClipped->x2 = min(box.x2, pbox->x2);
+				pboxClipped->y2 = min(box.y2, pbox->y2);
+				pbox++;
+
+				/* see if clipping left anything */
+				if(pboxClipped->x1 < pboxClipped->x2 &&
+				   pboxClipped->y1 < pboxClipped->y2)
+					pboxClipped++;
+			}
+		}
+	}
+	/* Now fill the pre-clipped boxes. */
+	if(pboxClipped != pboxClippedBase) {
+		enum ffb_fillrect_method how = fillrect_page;
+		int num = (pboxClipped - pboxClippedBase);
+		int f_w = pboxClippedBase->x2 - pboxClippedBase->x1;
+		int f_h = pboxClippedBase->y2 - pboxClippedBase->y1;
+		WindowPtr pWin = (WindowPtr) pDrawable;
+		unsigned int fbc = FFB_FBC_WIN(pWin);
+		unsigned int drawop = FFB_DRAWOP_FASTFILL;
+
+		if (PAGEFILL_DISABLED(pFfb) ||
+		    pGC->alu != GXcopy ||
+		    BOX_AREA(f_w, f_h) < 128) {
+			drawop = FFB_DRAWOP_RECTANGLE;
+			how = fillrect_normal;
+		} else if (gcPriv->stipple != NULL) {
+			if (FASTFILL_AP_DISABLED(pFfb)) {
+				drawop = FFB_DRAWOP_RECTANGLE;
+				how = fillrect_normal;
+			} else {
+				if ((gcPriv->stipple->alu & FFB_ROP_EDIT_BIT) != 0)
+					how = fillrect_fast;
+				else
+					how = fillrect_fast_opaque;
+			}
+		} else {
+			int all_planes;
+
+			/* Plane masks are not controllable with page fills. */
+			if (pGC->depth == 8)
+				all_planes = 0xff;
+			else
+				all_planes = 0xffffff;
+			if ((pGC->planemask & all_planes) != all_planes)
+				how = fillrect_fast;
+		}
+
+		if (how == fillrect_page) {
+			fbc &= ~(FFB_FBC_XE_MASK | FFB_FBC_RGBE_MASK);
+			fbc |= FFB_FBC_XE_ON | FFB_FBC_RGBE_ON;
+		}
+
+		/* In the high-resolution modes, the Creator3D transforms
+		 * the framebuffer such that the dual-buffers present become
+		 * one large single buffer.  As such you need to enable both
+		 * A and B write buffers for page/fast fills to work properly
+		 * under this configuration. -DaveM
+		 */
+		if (pFfb->ffb_res == ffb_res_high)
+			fbc |= FFB_FBC_WB_B;
+
+		/* Setup the attributes. */
+		if (gcPriv->stipple == NULL) {
+			FFB_ATTR_RAW(pFfb,
+				     FFB_PPC_APE_DISABLE|FFB_PPC_CS_CONST|FFB_PPC_XS_WID,
+				     FFB_PPC_APE_MASK|FFB_PPC_CS_MASK|FFB_PPC_XS_MASK,
+				     pGC->planemask,
+				     ((FFB_ROP_EDIT_BIT|pGC->alu)|(FFB_ROP_NEW<<8)),
+				     drawop,
+				     pGC->fgPixel,
+				     fbc, FFB_WID_WIN(pWin));
+		} else {
+			if (how == fillrect_fast_opaque) {
+				FFBSetStippleFast(pFfb, ffb, gcPriv->stipple,
+						  FFB_PPC_CS_CONST|FFB_PPC_XS_WID,
+						  FFB_PPC_CS_MASK|FFB_PPC_XS_MASK);
+			} else {
+				FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+					      FFB_PPC_CS_CONST|FFB_PPC_XS_WID,
+					      FFB_PPC_CS_MASK|FFB_PPC_XS_MASK);
+			}
+			FFB_WRITE_DRAWOP(pFfb, ffb, drawop);
+			FFB_WRITE_FBC(pFfb, ffb, fbc);
+			FFB_WRITE_WID(pFfb, ffb, FFB_WID_WIN(pWin));
+		}
+
+		/* Now render. */
+		if(how == fillrect_normal)
+			CreatorBoxFillNormal(pFfb, num, pboxClippedBase);
+		else if(how == fillrect_fast || how == fillrect_fast_opaque)
+			CreatorBoxFillFast(pFfb, num, pboxClippedBase);
+		else
+			CreatorBoxFillPage(pFfb, num, pboxClippedBase);
+
+		if(how == fillrect_fast_opaque) {
+			FFBSetStippleFastIdentity(pFfb, ffb, gcPriv->stipple);
+			CreatorBoxFillFast(pFfb, num, pboxClippedBase);
+		}
+
+		pFfb->rp_active = 1;
+		FFBSync(pFfb, ffb);
+	}
+	if (pboxClippedBase != pFfb->ClippedBoxBuf)
+		DEALLOCATE_LOCAL (pboxClippedBase);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,121 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Fill spans.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_stip.h"
+#include "ffb_loops.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "mi.h"
+#include "mispans.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+void
+CreatorFillSpans (DrawablePtr pDrawable, GCPtr pGC,
+		  int n, DDXPointPtr ppt,
+		  int *pwidth, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pGC->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	int *pwidthFree;
+	DDXPointPtr pptFree;
+	RegionPtr clip = cfbGetCompositeClip(pGC);
+	int nTmp = n * miFindMaxBand(clip);
+
+	FFBLOG(("CreatorFillSpans: n(%d) fsorted(%d)\n", n, fSorted));
+	pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
+	pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
+	if (!pptFree || !pwidthFree) {
+		if (pptFree) DEALLOCATE_LOCAL(pptFree);
+		if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
+		return;
+	}
+	n = miClipSpans(clip,
+			ppt, pwidth, n,
+			pptFree, pwidthFree, fSorted);
+	pwidth = pwidthFree;
+	ppt = pptFree;
+	if(gcPriv->stipple == NULL) {
+		FFB_ATTR_GC(pFfb, pGC, pWin,
+			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+			    FFB_DRAWOP_BRLINEOPEN);
+	} else {
+		unsigned int fbc;
+
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_BRLINEOPEN);
+		fbc = FFB_FBC_WIN(pWin);
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+		FFB_WRITE_FBC(pFfb, ffb, fbc);
+	}
+	FFBFifo(pFfb, 1);
+	ffb->lpat = 0;
+
+	if (pFfb->has_brline_bug) {
+		while(n--) {
+			register int x, y, w;
+
+			x = ppt->x;
+			y = ppt->y;
+			w = *pwidth++;
+			FFBFifo(pFfb, 5);
+			ffb->ppc = 0;
+			FFB_WRITE64(&ffb->by, y, x);
+			FFB_WRITE64_2(&ffb->bh, y, (x + w));
+			ppt++;
+		}
+	} else {
+		while(n--) {
+			register int x, y, w;
+
+			x = ppt->x;
+			y = ppt->y;
+			w = *pwidth++;
+			FFBFifo(pFfb, 4);
+			FFB_WRITE64(&ffb->by, y, x);
+			FFB_WRITE64_2(&ffb->bh, y, (x + w));
+			ppt++;
+		}
+	}
+
+	DEALLOCATE_LOCAL(pptFree);
+	DEALLOCATE_LOCAL(pwidthFree);
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c	Mon May 22 21:47:44 2000
@@ -0,0 +1,752 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - GC implementation.
+ *
+ * Copyright (C) 1998,1999,2000 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1998 Michal Rehacek (majkl@iname.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK, MICHAL REHACEK, OR DAVID MILLER BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_loops.h"
+#include "ffb_gc.h"
+
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "fontstruct.h"
+#include "dixfontstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+#include "migc.h"
+#include "mi.h"
+#include "mispans.h"
+
+GCOps CreatorTEOps1Rect8 = {
+	CreatorFillSpans,
+	CreatorSetSpans,
+	cfbPutImage,
+	CreatorCopyArea,
+	CreatorCopyPlane,
+	CreatorPolyPoint,
+	CreatorPolylines,
+	CreatorPolySegment,
+	miPolyRectangle,
+	CreatorZeroPolyArc,
+	CreatorFillPolygon,
+	CreatorPolyFillRect,
+	CreatorPolyFillArcSolid,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	CreatorTEGlyphBlt,
+	CreatorPolyTEGlyphBlt,
+	miPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps CreatorTEOps1Rect32 = {
+	CreatorFillSpans,
+	CreatorSetSpans,
+	cfb32PutImage,
+	CreatorCopyArea,
+	CreatorCopyPlane,
+	CreatorPolyPoint,
+	CreatorPolylines,
+	CreatorPolySegment,
+	miPolyRectangle,
+	CreatorZeroPolyArc,
+	CreatorFillPolygon,
+	CreatorPolyFillRect,
+	CreatorPolyFillArcSolid,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	CreatorTEGlyphBlt,
+	CreatorPolyTEGlyphBlt,
+	miPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps CreatorTEOps8 = {
+	CreatorFillSpans,
+	CreatorSetSpans,
+	cfbPutImage,
+	CreatorCopyArea,
+	CreatorCopyPlane,
+	CreatorPolyPoint,
+	CreatorLineSSStub,
+	CreatorSegmentSSStub,
+	miPolyRectangle,
+	CreatorZeroPolyArc,
+	CreatorFillPolygon,
+	CreatorPolyFillRect,
+	CreatorPolyFillArcSolid,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	CreatorTEGlyphBlt,
+	CreatorPolyTEGlyphBlt,
+	miPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps CreatorTEOps32 = {
+	CreatorFillSpans,
+	CreatorSetSpans,
+	cfb32PutImage,
+	CreatorCopyArea,
+	CreatorCopyPlane,
+	CreatorPolyPoint,
+	CreatorLineSSStub,
+	CreatorSegmentSSStub,
+	miPolyRectangle,
+	CreatorZeroPolyArc,
+	CreatorFillPolygon,
+	CreatorPolyFillRect,
+	CreatorPolyFillArcSolid,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	CreatorTEGlyphBlt,
+	CreatorPolyTEGlyphBlt,
+	miPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps CreatorNonTEOps1Rect8 = {
+	CreatorFillSpans,
+	CreatorSetSpans,
+	cfbPutImage,
+	CreatorCopyArea,
+	CreatorCopyPlane,
+	CreatorPolyPoint,
+	CreatorPolylines,
+	CreatorPolySegment,
+	miPolyRectangle,
+	CreatorZeroPolyArc,
+	CreatorFillPolygon,
+	CreatorPolyFillRect,
+	CreatorPolyFillArcSolid,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	miImageGlyphBlt,
+	CreatorPolyGlyphBlt,
+	miPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps CreatorNonTEOps1Rect32 = {
+	CreatorFillSpans,
+	CreatorSetSpans,
+	cfb32PutImage,
+	CreatorCopyArea,
+	CreatorCopyPlane,
+	CreatorPolyPoint,
+	CreatorPolylines,
+	CreatorPolySegment,
+	miPolyRectangle,
+	CreatorZeroPolyArc,
+	CreatorFillPolygon,
+	CreatorPolyFillRect,
+	CreatorPolyFillArcSolid,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	miImageGlyphBlt,
+	CreatorPolyGlyphBlt,
+	miPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps CreatorNonTEOps8 = {
+	CreatorFillSpans,
+	CreatorSetSpans,
+	cfbPutImage,
+	CreatorCopyArea,
+	CreatorCopyPlane,
+	CreatorPolyPoint,
+	CreatorLineSSStub,
+	CreatorSegmentSSStub,
+	miPolyRectangle,
+	CreatorZeroPolyArc,
+	CreatorFillPolygon,
+	CreatorPolyFillRect,
+	CreatorPolyFillArcSolid,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	miImageGlyphBlt,
+	CreatorPolyGlyphBlt,
+	miPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps CreatorNonTEOps32 = {
+	CreatorFillSpans,
+	CreatorSetSpans,
+	cfb32PutImage,
+	CreatorCopyArea,
+	CreatorCopyPlane,
+	CreatorPolyPoint,
+	CreatorLineSSStub,
+	CreatorSegmentSSStub,
+	miPolyRectangle,
+	CreatorZeroPolyArc,
+	CreatorFillPolygon,
+	CreatorPolyFillRect,
+	CreatorPolyFillArcSolid,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	miImageGlyphBlt,
+	CreatorPolyGlyphBlt,
+	miPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+#define FONTWIDTH(font)	(FONTMAXBOUNDS(font,rightSideBearing) - \
+			 FONTMINBOUNDS(font,leftSideBearing))
+#define FONTHEIGHT(font) (FONTMAXBOUNDS(font,ascent) + \
+			  FONTMINBOUNDS(font,descent))
+
+static GCOps *
+CreatorMatchCommon (GCPtr pGC, cfbPrivGCPtr devPriv)
+{
+	int depth = pGC->depth;
+
+	if (pGC->lineWidth != 0) return 0;
+	if (pGC->lineStyle != LineSolid) return 0;
+	if (pGC->fillStyle != FillSolid) return 0;
+	if (devPriv->rop != GXcopy) return 0;
+	if (pGC->font &&
+	    FONTWIDTH (pGC->font) <= 32 &&
+	    FONTHEIGHT (pGC->font) <= 100 &&
+	    FONTMINBOUNDS(pGC->font,characterWidth) >= 0) {
+		if (TERMINALFONT(pGC->font)) {
+			if (devPriv->oneRect) {
+				return (depth == 8 ?
+					&CreatorTEOps1Rect8 :
+					&CreatorTEOps1Rect32);
+			} else {
+				return (depth == 8 ?
+					&CreatorTEOps8 :
+					&CreatorTEOps32);
+			}
+		} else {
+			if (devPriv->oneRect) {
+				return (depth == 8 ?
+					&CreatorNonTEOps1Rect8 :
+					&CreatorNonTEOps1Rect32);
+			} else {
+				return (depth == 8 ?
+					&CreatorNonTEOps8 :
+					&CreatorNonTEOps32);
+			}
+		}
+	}
+	return 0;
+}
+
+static void
+CreatorDestroyGC (GCPtr pGC)
+{
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+        
+	if (gcPriv->stipple)
+		xfree (gcPriv->stipple);
+	miDestroyGC (pGC);
+}
+
+static __inline__ void
+CreatorNewLine(GCPtr pGC, cfbPrivGCPtr devPriv, CreatorPrivGCPtr gcPriv, int accel)
+{
+	pGC->ops->FillPolygon = miFillPolygon;
+	pGC->ops->PolyRectangle = miPolyRectangle;
+	if (pGC->lineWidth == 0)
+		pGC->ops->PolyArc = miZeroPolyArc;
+	else
+		pGC->ops->PolyArc = miPolyArc;
+	if (accel) {
+		pGC->ops->FillPolygon = CreatorFillPolygon;
+		if (pGC->lineWidth == 0 && pGC->capStyle != CapNotLast)
+			pGC->ops->PolyArc = CreatorZeroPolyArc;
+	}
+	pGC->ops->PolySegment = miPolySegment;
+	gcPriv->linepat = 0;
+
+	/* Segment and Line ops are only accelerated if there is
+	 * one clipping region.
+	 */
+	if (accel && !devPriv->oneRect)
+		accel = 0;
+
+	if (pGC->lineStyle == LineSolid) {
+		if(pGC->lineWidth == 0) {
+			if (pGC->fillStyle == FillSolid) {
+				pGC->ops->Polylines = CreatorLineSSStub;
+				pGC->ops->PolySegment = CreatorSegmentSSStub;
+			} else
+				pGC->ops->Polylines = miZeroLine;
+			if (accel) {
+				gcPriv->PolySegment = pGC->ops->PolySegment;
+				gcPriv->Polylines = pGC->ops->Polylines;
+				pGC->ops->PolySegment = CreatorPolySegment;
+				pGC->ops->Polylines = CreatorPolylines;
+			}
+		} else {
+			pGC->ops->Polylines = miWideLine;
+		}
+	} else if(pGC->lineStyle == LineOnOffDash) {
+		if (pGC->lineWidth == 0 && pGC->fillStyle == FillSolid) {
+			pGC->ops->Polylines = CreatorLineSDStub;
+			pGC->ops->PolySegment = CreatorSegmentSDStub;
+			if(accel &&
+			   CreatorCheckLinePattern(pGC, gcPriv)) {
+				gcPriv->PolySegment = pGC->ops->PolySegment;
+				gcPriv->Polylines = pGC->ops->Polylines;
+				pGC->ops->PolySegment = CreatorPolySegment;
+				pGC->ops->Polylines = CreatorPolylines;
+			}
+		} else {
+			pGC->ops->Polylines = miWideDash;
+		}
+	} else if(pGC->lineStyle == LineDoubleDash) {
+		if (pGC->lineWidth == 0 && pGC->fillStyle == FillSolid) {
+			pGC->ops->Polylines = CreatorLineSDStub;
+			pGC->ops->PolySegment = CreatorSegmentSDStub;
+		} else {
+			pGC->ops->Polylines = miWideDash;
+		}
+	}
+}
+
+static __inline__ void
+CreatorNewGlyph(GCPtr pGC, CreatorPrivGCPtr gcPriv)
+{
+	if (FONTWIDTH(pGC->font) > 32 ||
+	    FONTHEIGHT(pGC->font) > 100 ||
+	    FONTMINBOUNDS(pGC->font,characterWidth) < 0) {
+		pGC->ops->PolyGlyphBlt = miPolyGlyphBlt;
+		pGC->ops->ImageGlyphBlt = miImageGlyphBlt;
+	} else {
+		if (pGC->fillStyle == FillSolid) {
+			if (TERMINALFONT (pGC->font)) {
+				pGC->ops->PolyGlyphBlt = CreatorPolyTEGlyphBlt;
+			} else {
+				pGC->ops->PolyGlyphBlt = CreatorPolyGlyphBlt;
+			}
+		} else {
+			pGC->ops->PolyGlyphBlt = miPolyGlyphBlt;
+		}			
+
+		/* special case ImageGlyphBlt for terminal emulator fonts */
+		if (TERMINALFONT(pGC->font))
+			pGC->ops->ImageGlyphBlt = CreatorTEGlyphBlt;
+		else
+			pGC->ops->ImageGlyphBlt = miImageGlyphBlt;
+	}
+}
+
+static __inline__ void
+CreatorNewFillSpans(GCPtr pGC, cfbPrivGCPtr devPriv, CreatorPrivGCPtr gcPriv, int accel)
+{
+	if (pGC->fillStyle == FillSolid) {
+		pGC->ops->FillSpans = CreatorSolidSpansGeneralStub;
+	} else if(pGC->fillStyle == FillTiled) {
+		if (pGC->pRotatedPixmap) {
+			int pmsk = (pGC->depth == 8 ? 0xff : 0xffffff);
+			if (pGC->alu == GXcopy && (pGC->planemask & pmsk) == pmsk)
+				pGC->ops->FillSpans = CreatorTile32FSCopyStub;
+			else
+				pGC->ops->FillSpans = CreatorTile32FSGeneralStub;
+		} else
+			pGC->ops->FillSpans = CreatorUnnaturalTileFSStub;
+	} else if(pGC->fillStyle == FillStippled) {
+		if (pGC->pRotatedPixmap)
+			pGC->ops->FillSpans = Creator8Stipple32FSStub;
+		else
+			pGC->ops->FillSpans = CreatorUnnaturalStippleFSStub;
+	} else if(pGC->fillStyle == FillOpaqueStippled) {
+		if (pGC->pRotatedPixmap)
+			pGC->ops->FillSpans = Creator8OpaqueStipple32FSStub;
+		else
+			pGC->ops->FillSpans = CreatorUnnaturalStippleFSStub;
+	} else
+		FatalError("CreatorValidateGC: illegal fillStyle\n");
+	if (accel)
+		pGC->ops->FillSpans = CreatorFillSpans;
+}
+
+static __inline__ void
+CreatorNewFillArea(GCPtr pGC, cfbPrivGCPtr devPriv, CreatorPrivGCPtr gcPriv, int accel)
+{
+  	if (accel) {
+		pGC->ops->PolyFillRect = CreatorPolyFillRect;
+		pGC->ops->PolyFillArc = CreatorPolyFillArcSolid;
+	} else {
+		pGC->ops->PolyFillRect = miPolyFillRect;
+		if(pGC->fillStyle == FillSolid || pGC->fillStyle == FillTiled)
+			pGC->ops->PolyFillRect = CreatorPolyFillRectStub;
+		pGC->ops->PolyFillArc = miPolyFillArc;
+	}
+	pGC->ops->PushPixels = mfbPushPixels;
+}
+
+void
+CreatorValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
+{
+	int	mask;		/* stateChanges */
+	int	new_rrop;
+	int	new_line, new_text, new_fillspans, new_fillarea;
+	int	new_rotate;
+	int	xrot, yrot;
+	/* flags for changing the proc vector */
+	cfbPrivGCPtr devPriv;
+	CreatorPrivGCPtr gcPriv;
+	int	oneRect;
+	int	accel, drawableChanged;
+
+	gcPriv = CreatorGetGCPrivate (pGC);
+	if (pDrawable->type != DRAWABLE_WINDOW) {
+		if (gcPriv->type == DRAWABLE_WINDOW) {
+			extern GCOps cfbNonTEOps;
+			extern GCOps cfb32NonTEOps;
+
+			miDestroyGCOps (pGC->ops);
+
+			if (pGC->depth == 8)
+				pGC->ops = &cfbNonTEOps;
+			else
+				pGC->ops = &cfb32NonTEOps;
+
+			changes = (1 << (GCLastBit+1)) - 1;
+			pGC->stateChanges = changes;
+			gcPriv->type = pDrawable->type;
+		}
+		if (pGC->depth == 8)
+			cfbValidateGC (pGC, changes, pDrawable);
+		else
+			cfb32ValidateGC (pGC, changes, pDrawable);
+
+		/* Our high speed VIS copyarea can
+		 * be used on pixmaps too.
+		 * But don't clobber someones ops prototype!!
+		 */
+		if (!pGC->ops->devPrivate.val) {
+			pGC->ops = miCreateGCOps(pGC->ops);
+			pGC->ops->devPrivate.val = 1;
+		}
+		pGC->ops->CopyArea = CreatorCopyArea;
+		return;
+	}
+
+	if (gcPriv->type != DRAWABLE_WINDOW) {
+		changes = (1 << (GCLastBit+1)) - 1;
+		gcPriv->type = DRAWABLE_WINDOW;
+	}
+
+	new_rotate = pGC->lastWinOrg.x != pDrawable->x || 
+		     pGC->lastWinOrg.y != pDrawable->y;
+	if(new_rotate != 0) {
+		pGC->lastWinOrg.x = pDrawable->x;
+		pGC->lastWinOrg.y = pDrawable->y;
+	}
+
+	devPriv = cfbGetGCPrivate(pGC);
+	new_rrop = FALSE;
+	new_line = FALSE;
+	new_text = FALSE; 
+	new_fillspans = FALSE;
+	new_fillarea = FALSE;
+
+	drawableChanged = (pDrawable->serialNumber !=
+			   (pGC->serialNumber & (DRAWABLE_SERIAL_BITS)));
+#define CLIP_BITS	(GCClipXOrigin|GCClipYOrigin|GCClipMask|GCSubwindowMode)
+	/* If the client clip is different or moved OR the subwindowMode has
+	 * changed OR the window's clip has changed since the last validation,
+	 * we need to recompute the composite clip .
+	 */
+	if ((changes & CLIP_BITS) != 0 || drawableChanged) {
+		miComputeCompositeClip(pGC, pDrawable);
+		oneRect = REGION_NUM_RECTS(cfbGetCompositeClip(pGC)) == 1;
+		if (oneRect != devPriv->oneRect) {
+			new_line = TRUE;
+			devPriv->oneRect = oneRect;
+		}
+	}
+
+	/* A while loop with a switch statement inside?  No thanks.  -DaveM */
+	mask = changes;
+	if((mask & (GCFunction | GCForeground | GCBackground | GCPlaneMask)) != 0)
+		new_rrop = TRUE;
+	if((mask & (GCPlaneMask | GCFillStyle | GCFont)) != 0)
+		new_text = TRUE;
+	if((mask & (GCLineStyle | GCLineWidth | GCFillStyle | GCCapStyle)) != 0)
+		new_line = TRUE;
+	if((mask & (GCFillStyle | GCTile | GCStipple)) != 0)
+		new_fillspans = new_fillarea = TRUE;
+	if(new_rotate == FALSE &&
+	   (mask & (GCTileStipXOrigin | GCTileStipYOrigin)) != 0)
+		new_rotate = TRUE;
+	if((mask & GCStipple) != 0) {
+		if(pGC->stipple) {
+			int width = pGC->stipple->drawable.width;
+			PixmapPtr nstipple;
+
+			if ((width <= 32) && !(width & (width - 1))) {
+				int depth = pGC->depth;
+				nstipple = (depth == 8 ?
+					    cfbCopyPixmap(pGC->stipple) :
+					    cfb32CopyPixmap(pGC->stipple));
+				if (nstipple) {
+					if (depth == 8)
+						cfbPadPixmap(nstipple);
+					else
+						cfb32PadPixmap(nstipple);
+					(*pGC->pScreen->DestroyPixmap)(pGC->stipple);
+					pGC->stipple = nstipple;
+				}
+			}
+		}
+	}
+
+	/* If the drawable has changed, check its depth and ensure suitable
+	 * entries are in the proc vector.
+	 */
+	if (drawableChanged)
+		new_fillspans = TRUE;	/* deal with FillSpans later */
+
+	if (new_rotate || new_fillspans) {
+		Bool new_pix = FALSE;
+
+		xrot = pGC->patOrg.x + pDrawable->x;
+		yrot = pGC->patOrg.y + pDrawable->y;
+ 		if (!CreatorCheckFill (pGC, pDrawable)) {
+			switch (pGC->fillStyle) {
+			case FillTiled:
+				if (!pGC->tileIsPixel)
+				{
+					int width = pGC->tile.pixmap->drawable.width;
+
+					if (pGC->depth == 8)
+						width *= 8;
+					else
+						width *= 32;
+
+					if ((width <= 32) && !(width & (width - 1))) {
+						if (pGC->depth == 8)
+							cfbCopyRotatePixmap(pGC->tile.pixmap,
+									    &pGC->pRotatedPixmap,
+									    xrot, yrot);
+						else
+							cfb32CopyRotatePixmap(pGC->tile.pixmap,
+									      &pGC->pRotatedPixmap,
+									      xrot, yrot);
+						new_pix = TRUE;
+					}
+				}
+				break;
+			case FillStippled:
+			case FillOpaqueStippled:
+				{
+					int width = pGC->stipple->drawable.width;
+
+					if ((width <= 32) && !(width & (width - 1)))
+					{
+						mfbCopyRotatePixmap(pGC->stipple,
+								    &pGC->pRotatedPixmap, xrot, yrot);
+						new_pix = TRUE;
+					}
+				}
+				break;
+			}
+		}
+		if (!new_pix && pGC->pRotatedPixmap) {
+			(*pGC->pScreen->DestroyPixmap)(pGC->pRotatedPixmap);
+			pGC->pRotatedPixmap = (PixmapPtr) NULL;
+		}
+	}
+
+	if (new_rrop) {
+		int old_rrop;
+
+		if (gcPriv->stipple) {
+			if (pGC->fillStyle == FillStippled)
+				gcPriv->stipple->alu = pGC->alu | FFB_ROP_EDIT_BIT;
+			else
+				gcPriv->stipple->alu = pGC->alu;
+			if (pGC->fillStyle != FillTiled) {
+				gcPriv->stipple->fg = pGC->fgPixel;
+				gcPriv->stipple->bg = pGC->bgPixel;
+			}
+		}
+
+		old_rrop = devPriv->rop;
+		if (pGC->depth == 8)
+			devPriv->rop = cfbReduceRasterOp (pGC->alu, pGC->fgPixel,
+							  pGC->planemask,
+							  &devPriv->and, &devPriv->xor);
+		else
+			devPriv->rop = cfb32ReduceRasterOp (pGC->alu, pGC->fgPixel,
+							    pGC->planemask,
+							    &devPriv->and, &devPriv->xor);
+		if (old_rrop == devPriv->rop)
+			new_rrop = FALSE;
+		else {
+			new_line = TRUE;
+			new_text = TRUE;
+			new_fillspans = TRUE;
+			new_fillarea = TRUE;
+		}
+	}
+
+	if (new_rrop || new_fillspans || new_text || new_fillarea || new_line) {
+		GCOps *newops;
+		int using_creator_ops = 0;
+
+		if ((newops = CreatorMatchCommon (pGC, devPriv))) {
+			if (pGC->ops->devPrivate.val)
+				miDestroyGCOps (pGC->ops);
+			pGC->ops = newops;
+			new_rrop = new_line = new_fillspans = new_text = new_fillarea = 0;
+			using_creator_ops = 1;
+		} else {
+			if (!pGC->ops->devPrivate.val) {
+				pGC->ops = miCreateGCOps (pGC->ops);
+				pGC->ops->devPrivate.val = 1;
+			}
+
+			/* We have to make sure the copyarea op always
+			 * points to our special routine as it maintains the
+			 * synchronization between the raster processor and direct
+			 * access to the frame buffer.
+			 */
+			pGC->ops->CopyArea = CreatorCopyArea;
+		}
+		if (pGC->depth == 8)
+			newops = cfbMatchCommon(pGC, devPriv);
+		else
+			newops = cfb32MatchCommon(pGC, devPriv);
+
+		if (newops) {
+			gcPriv->PolySegment = newops->PolySegment;
+			gcPriv->Polylines = newops->Polylines;
+
+			if (using_creator_ops) {
+				/* Fixup line/segment backup ops. */
+				if (pGC->ops->PolySegment == CreatorPolySegment)
+					gcPriv->PolySegment = CreatorSegmentSSStub;
+				if (pGC->ops->Polylines == CreatorPolylines)
+					gcPriv->Polylines = CreatorLineSSStub;
+			}
+		}
+	}
+
+	accel = pGC->fillStyle == FillSolid || gcPriv->stipple;
+
+	/* deal with the changes we've collected */
+	if (new_line)
+		CreatorNewLine(pGC, devPriv, gcPriv, accel);
+
+	if (new_text && pGC->font)
+		CreatorNewGlyph(pGC, gcPriv);
+
+	if (new_fillspans)
+		CreatorNewFillSpans(pGC, devPriv, gcPriv, accel);
+
+	if (new_fillarea)
+		CreatorNewFillArea(pGC, devPriv, gcPriv, accel);
+}
+
+GCFuncs	CreatorGCFuncs = {
+	CreatorValidateGC,
+	miChangeGC,
+	miCopyGC,
+	CreatorDestroyGC,
+	miChangeClip,
+	miDestroyClip,
+	miCopyClip
+};
+
+Bool
+CreatorCreateGC (GCPtr pGC)
+{
+	CreatorPrivGCPtr gcPriv;
+	
+	if (pGC->depth == 1)
+		return mfbCreateGC(pGC);
+
+	if (pGC->depth == 8) {
+		if (!cfbCreateGC(pGC))
+			return FALSE;
+	} else {
+		if (!cfb32CreateGC(pGC))
+			return FALSE;
+	}
+
+	if (pGC->depth == 8)
+		pGC->ops = &CreatorNonTEOps8;
+	else
+		pGC->ops = &CreatorNonTEOps32;
+
+	pGC->funcs = &CreatorGCFuncs;
+	gcPriv = CreatorGetGCPrivate(pGC);
+	gcPriv->type = DRAWABLE_WINDOW;
+	gcPriv->linepat = 0;
+	gcPriv->stipple = 0;
+	gcPriv->PolySegment = CreatorSegmentSSStub;
+	gcPriv->Polylines = CreatorLineSSStub;
+
+	return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.h:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.h	Mon May 22 21:47:44 2000
@@ -0,0 +1,151 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Accel func declarations.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1998 Michal Rehacek (majkl@iname.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK, MICHAL REHACEK, OR DAVID MILLER BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.h,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+
+#ifndef FFBGC_H
+#define FFBGC_H
+
+extern void CreatorDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst,
+			    DDXPointPtr pptSrc, unsigned long planemask);
+
+extern void CreatorDoVertBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst,
+				DDXPointPtr pptSrc, unsigned long planemask);
+
+extern RegionPtr CreatorCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+				 GCPtr pGC, int srcx, int srcy, int width, int height,
+				 int dstx, int dsty);
+
+extern RegionPtr CreatorCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+				  GCPtr pGC, int srcx, int srcy, int width, int height,
+				  int dstx, int dsty, unsigned long bitPlane);
+
+extern void CreatorFillBoxSolid (DrawablePtr pDrawable, int nBox,
+				 BoxPtr pBox, unsigned long pixel);
+
+extern void CreatorFillBoxStipple (DrawablePtr pDrawable,
+				   int nBox, BoxPtr pBox, CreatorStipplePtr stipple);
+
+extern void CreatorPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
+				int nrectFill, xRectangle *prectInit);
+
+extern void CreatorFillSpans (DrawablePtr pDrawable, GCPtr pGC,
+			      int n, DDXPointPtr ppt,
+			      int *pwidth, int fSorted);
+
+extern void CreatorPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode,
+			     int npt, xPoint *pptInit);
+
+extern void CreatorPolySegment (DrawablePtr pDrawable, GCPtr pGC,
+				int nseg, xSegment *pSeg);
+
+extern void CreatorFillPolygon (DrawablePtr pDrawable, GCPtr pGC,
+				int shape, int mode, int count, DDXPointPtr ppt);
+
+extern void CreatorPolylines (DrawablePtr pDrawable, GCPtr pGC,
+			      int mode, int npt, DDXPointPtr ppt);
+
+extern void CreatorPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+				 unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase);
+
+extern void CreatorTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+			       unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase);
+
+extern void CreatorPolyTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+				   unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase);
+
+extern void CreatorPolyFillArcSolid (DrawablePtr pDrawable, GCPtr pGC,
+				    int narcs, xArc *parcs);
+
+extern void CreatorZeroPolyArc(DrawablePtr pDrawable, GCPtr pGC,
+			       int narcs, xArc *parcs);
+
+extern int CreatorCheckTile (PixmapPtr pPixmap, CreatorStipplePtr stipple,
+			     int ox, int oy, int ph);
+
+extern int CreatorCheckStipple (PixmapPtr pPixmap, CreatorStipplePtr stipple,
+				int ox, int oy, int ph);
+
+extern int CreatorCheckLinePattern(GCPtr pGC, CreatorPrivGCPtr gcPriv);
+
+extern int CreatorCheckFill (GCPtr pGC, DrawablePtr pDrawable);
+
+extern void CreatorSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pcharsrc,
+			    DDXPointPtr ppt, int *pwidth, int nspans, int fSorted);
+
+/* Stuff still not accelerated fully. */
+extern void CreatorSegmentSSStub (DrawablePtr pDrawable, GCPtr pGC,
+				  int nseg, xSegment *pSeg);
+
+extern void CreatorLineSSStub (DrawablePtr pDrawable, GCPtr pGC,
+			       int mode, int npt, DDXPointPtr ppt);
+
+extern void CreatorSegmentSDStub (DrawablePtr pDrawable, GCPtr pGC,
+				  int nseg, xSegment *pSeg);
+
+extern void CreatorLineSDStub (DrawablePtr pDrawable, GCPtr pGC,
+			       int mode, int npt, DDXPointPtr ppt);
+
+extern void CreatorSolidSpansGeneralStub (DrawablePtr pDrawable, GCPtr pGC,
+					  int nInit, DDXPointPtr pptInit,
+					  int *pwidthInit, int fSorted);
+
+extern void CreatorPolyGlyphBlt8Stub (DrawablePtr pDrawable, GCPtr pGC,
+				      int x, int y, unsigned int nglyph, CharInfoPtr *ppci,
+				      pointer pglyphBase);
+
+extern void CreatorImageGlyphBlt8Stub (DrawablePtr pDrawable, GCPtr pGC,
+				       int x, int y, unsigned int nglyph,
+				       CharInfoPtr *ppci, pointer pglyphBase);
+
+extern void CreatorTile32FSCopyStub(DrawablePtr pDrawable, GCPtr pGC,
+				    int nInit, DDXPointPtr pptInit,
+				    int *pwidthInit, int fSorted);
+
+extern void CreatorTile32FSGeneralStub(DrawablePtr pDrawable, GCPtr pGC,
+				       int nInit, DDXPointPtr pptInit,
+				       int *pwidthInit, int fSorted);
+
+extern void CreatorUnnaturalTileFSStub(DrawablePtr pDrawable, GCPtr pGC,
+				       int nInit, DDXPointPtr pptInit,
+				       int *pwidthInit, int fSorted);
+
+extern void Creator8Stipple32FSStub(DrawablePtr pDrawable, GCPtr pGC,
+				    int nInit, DDXPointPtr pptInit,
+				    int *pwidthInit, int fSorted);
+
+extern void CreatorUnnaturalStippleFSStub(DrawablePtr pDrawable, GCPtr pGC,
+					  int nInit, DDXPointPtr pptInit,
+					  int *pwidthInit, int fSorted);
+
+extern void Creator8OpaqueStipple32FSStub(DrawablePtr pDrawable, GCPtr pGC,
+					  int nInit, DDXPointPtr pptInit,
+					  int *pwidthInit, int fSorted);
+
+extern void CreatorPolyFillRectStub(DrawablePtr pDrawable, GCPtr pGC,
+				    int nrectFill, xRectangle *prectInit);
+
+#endif /* FFBGC_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,380 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Glyph rops.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1998 Michal Rehacek (majkl@iname.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK, MICHAL REHACEK, OR DAVID MILLER BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_loops.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+#include "fontstruct.h"
+#include "dixfontstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+void
+CreatorPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+		     unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pGC->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	FontPtr pfont = pGC->font;
+	RegionPtr clip = cfbGetCompositeClip(pGC);
+	BoxPtr pbox = REGION_RECTS(clip);
+	int nbox = REGION_NUM_RECTS(clip);
+	int skippix, skipglyph, width, n, i;
+	int Left, Right, Top, Bottom, LeftEdge, RightEdge;
+
+	FFBLOG(("CreatorPolyGlyphBlt: xy[%08x:%08x] nglyph(%d)\n", x, y, nglyph));
+	x += pDrawable->x;
+	y += pDrawable->y;
+
+	width = 0;
+	for(i = 0; i < (nglyph - 1); i++)
+		width += (ppci[i])->metrics.characterWidth;
+
+	Left   = x + (ppci[0])->metrics.leftSideBearing;
+	Right  = x + (width + (ppci[nglyph - 1])->metrics.rightSideBearing);
+	Top    = y - FONTMAXBOUNDS(pfont, ascent);
+	Bottom = y + FONTMAXBOUNDS(pfont, descent);
+
+	while(nbox && (Top >= pbox->y2)) {
+		pbox++;
+		nbox--;
+	}
+
+	if(!nbox || Bottom < pbox->y1)
+		return;
+
+	/* Ok, setup the chip. */
+	{
+		unsigned int ppc = (FFB_PPC_APE_DISABLE | FFB_PPC_TBE_TRANSPARENT |
+				    FFB_PPC_CS_CONST);
+		unsigned int ppc_mask = (FFB_PPC_APE_MASK | FFB_PPC_TBE_MASK |
+					 FFB_PPC_CS_MASK);
+		unsigned int pmask = pGC->planemask;
+		unsigned int rop = (FFB_ROP_EDIT_BIT | pGC->alu) | (FFB_ROP_NEW << 8);
+		unsigned int fg = pGC->fgPixel;
+		WindowPtr pWin = (WindowPtr) pDrawable;
+		unsigned int fbc = FFB_FBC_WIN(pWin);
+
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+
+		if((pFfb->ppc_cache & ppc_mask) != ppc ||
+		   pFfb->fg_cache != fg ||
+		   pFfb->fbc_cache != fbc ||
+		   pFfb->rop_cache != rop ||
+		   pFfb->pmask_cache != pmask ||
+		   pFfb->fontinc_cache != ((1<<16) | 0)) {
+			pFfb->ppc_cache &= ~ppc_mask;
+			pFfb->ppc_cache |= ppc;
+			pFfb->fg_cache = fg;
+			pFfb->fbc_cache = fbc;
+			pFfb->rop_cache = rop;
+			pFfb->pmask_cache = pmask;
+			pFfb->fontinc_cache = ((1<<16) | 0);
+			pFfb->rp_active = 1;
+			FFBFifo(pFfb, 6);
+			ffb->ppc = ppc;
+			ffb->fg = fg;
+			ffb->fbc = fbc;
+			ffb->rop = rop;
+			ffb->pmask = pmask;
+			ffb->fontinc = ((1 << 16) | 0);
+		}
+	}
+
+	while(nbox && (Bottom >= pbox->y1)) {
+		LeftEdge  = max(Left, pbox->x1);
+		RightEdge = min(Right, pbox->x2);
+		if(RightEdge > LeftEdge) {
+			int walk, x_start;
+
+			skippix = LeftEdge - x;
+			skipglyph = walk = 0;
+			while(skippix >= (walk + (ppci[skipglyph])->metrics.rightSideBearing)) {
+				walk += (ppci[skipglyph])->metrics.characterWidth;
+				skipglyph++;
+			}
+			x_start = x + walk;
+			skippix = RightEdge - x;
+			n = 0;
+			i = skipglyph;
+			while((i < nglyph) &&
+			      (skippix > (walk + (ppci[i])->metrics.leftSideBearing))) {
+				walk += (ppci[i])->metrics.characterWidth;
+				i++;
+				n++;
+			}
+			if(n) {
+				CharInfoPtr *ppci_iter = ppci + skipglyph;
+				CharInfoPtr pci;
+				unsigned int *bits;
+				int w, h, x0, y0, xskip, yskip;
+
+				while(n--) {
+					pci = *ppci_iter++;
+					w = GLYPHWIDTHPIXELS(pci);
+					h = GLYPHHEIGHTPIXELS(pci);
+					if(!w || !h)
+						goto next_glyph;
+
+					x0 = x_start + pci->metrics.leftSideBearing;
+					y0 = y - pci->metrics.ascent;
+					bits = (unsigned int *) pci->bits;
+
+					/* Now clip it to the bits we should actually
+					 * render.
+					 */
+					xskip = yskip = 0;
+					if(pbox->x1 > x0) {
+						xskip = pbox->x1 - x0;
+						w -= xskip;
+						x0 = pbox->x1;
+						if(w <= 0)
+							goto next_glyph;
+					}
+					if(pbox->y1 > y0) {
+						yskip = pbox->y1 - y0;
+						h -= yskip;
+						y0 = pbox->y1;
+						if(h <= 0)
+							goto next_glyph;
+					}
+					if(pbox->x2 < (x0 + w)) {
+						w = pbox->x2 - x0;
+						if(w <= 0)
+							goto next_glyph;
+					}
+					if(pbox->y2 < (y0 + h)) {
+						h = pbox->y2 - y0;
+						if(h <= 0)
+							goto next_glyph;
+					}
+
+					FFB_WRITE_FONTW(pFfb, ffb, w);
+					FFBFifo(pFfb, 1 + h);
+					ffb->fontxy = ((y0 << 16) | x0);
+					for(i = 0; i < h; i++)
+						ffb->font = bits[yskip + i] << xskip;
+
+				next_glyph:
+					x_start += pci->metrics.characterWidth;
+				}
+			}
+		}
+		nbox--;
+		pbox++;
+	}
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+
+void
+CreatorTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+		   unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pGC->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	RegionPtr clip = cfbGetCompositeClip(pGC);
+	int nbox = REGION_NUM_RECTS(clip);
+	BoxPtr pbox = REGION_RECTS(clip);
+	FontPtr pfont = pGC->font;
+	int glyphWidth = FONTMAXBOUNDS(pfont, characterWidth);
+	int skippix, skipglyphs, Left, Right, Top, Bottom;
+	int LeftEdge, RightEdge, ytop, ybot, h, w;
+
+	FFBLOG(("CreatorTEGlyphBlt: xy[%08x:%08x] nglyph(%d) pgbase(%p)\n",
+		x, y, nglyph, pGlyphBase));
+
+	Left = x + pDrawable->x;
+	Right = Left + (glyphWidth * nglyph);
+	y += pDrawable->y;
+	Top = y - FONTASCENT(pfont);
+	Bottom = y + FONTDESCENT(pfont);
+
+	while(nbox && (Top >= pbox->y2)) {
+		pbox++;
+		nbox--;
+	}
+
+	if(!nbox || Bottom <= pbox->y1)
+		return;
+
+	/* Ok, setup the chip. */
+	{
+		unsigned int ppc = FFB_PPC_APE_DISABLE|FFB_PPC_CS_CONST;
+		unsigned int ppc_mask = FFB_PPC_APE_MASK|FFB_PPC_TBE_MASK|FFB_PPC_CS_MASK;
+		unsigned int pmask = pGC->planemask;
+		unsigned int rop;
+		unsigned int fg = pGC->fgPixel;
+		unsigned int bg = pGC->bgPixel;
+		WindowPtr pWin = (WindowPtr) pDrawable;
+		unsigned int fbc = FFB_FBC_WIN(pWin);
+
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+
+		if(pGlyphBase) {
+			ppc |= FFB_PPC_TBE_TRANSPARENT;
+			rop = FFB_ROP_EDIT_BIT | pGC->alu;
+		} else {
+			ppc |= FFB_PPC_TBE_OPAQUE;
+			rop = FFB_ROP_EDIT_BIT | GXcopy;
+		}
+		rop |= (FFB_ROP_NEW << 8);
+		if((pFfb->ppc_cache & ppc_mask) != ppc ||
+		   pFfb->fg_cache != fg ||
+		   pFfb->fbc_cache != fbc ||
+		   pFfb->rop_cache != rop ||
+		   pFfb->pmask_cache != pmask ||
+		   pFfb->fontinc_cache != ((1<<16) | 0) ||
+		   (!pGlyphBase && pFfb->bg_cache != bg)) {
+			pFfb->ppc_cache &= ~ppc_mask;
+			pFfb->ppc_cache |= ppc;
+			pFfb->fg_cache = fg;
+			pFfb->fbc_cache = fbc;
+			pFfb->rop_cache = rop;
+			pFfb->pmask_cache = pmask;
+			pFfb->fontinc_cache = ((1<<16) | 0);
+			if(!pGlyphBase)
+				pFfb->bg_cache = bg;
+			FFBFifo(pFfb, (!pGlyphBase ? 7 : 6));
+			ffb->ppc = ppc;
+			ffb->fg = fg;
+			ffb->fbc = fbc;
+			ffb->rop = rop;
+			ffb->pmask = pmask;
+			ffb->fontinc = ((1 << 16) | 0);
+			if(!pGlyphBase)
+				ffb->bg = bg;
+		}
+	}
+
+	while(nbox && (Bottom > pbox->y1)) {
+		LeftEdge = max(Left, pbox->x1);
+		RightEdge = min(Right, pbox->x2);
+
+		if(RightEdge > LeftEdge) {
+			ytop = max(Top, pbox->y1);
+			ybot = min(Bottom, pbox->y2);
+
+			if((skippix = LeftEdge - Left)) {
+				skipglyphs = skippix / glyphWidth;
+				skippix %= glyphWidth;
+			} else
+				skipglyphs = 0;
+			w = RightEdge - LeftEdge;
+
+			/* Get aligned onto a character. */
+			if(skippix) {
+				unsigned int *gbits = (unsigned int *) ppci[skipglyphs++]->bits;
+				int chunk_size = (glyphWidth - skippix);
+
+				if (chunk_size > w)
+					chunk_size = w;
+
+				FFB_WRITE_FONTW(pFfb, ffb, chunk_size);
+				FFBFifo(pFfb, 1 + (ybot - ytop));
+				ffb->fontxy = ((ytop << 16) | LeftEdge);
+				for(h = (ytop - Top); h < (ybot - Top); h++)
+					ffb->font = gbits[h] << skippix;
+				LeftEdge += chunk_size;
+				w -= chunk_size;
+			}
+			/* And now blit the rest with unrolled loops. */
+#define 		LoopIt(chunkW, loadup, fetch) \
+			FFB_WRITE_FONTW(pFfb, ffb, chunkW); \
+			while (w >= chunkW) { \
+				loadup \
+				FFBFifo(pFfb, 1 + (ybot - ytop)); \
+				ffb->fontxy = ((ytop << 16) | LeftEdge); \
+				for(h = (ytop - Top); h < (ybot - Top); h++) \
+					ffb->font = fetch; \
+				LeftEdge += chunkW; \
+				w -= chunkW; \
+			}
+			if(glyphWidth <= 8) {
+				int chunk_size = glyphWidth << 2;
+				LoopIt(chunk_size,
+				       unsigned int *char1 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);
+				       unsigned int *char2 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);
+				       unsigned int *char3 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);
+				       unsigned int *char4 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);,
+				       (*char1++ | ((*char2++ | ((*char3++ | (*char4++ >> glyphWidth))
+								 >> glyphWidth))
+						    >> glyphWidth)))
+			} else if(glyphWidth <= 10) {
+				int chunk_size = (glyphWidth << 1) + glyphWidth;
+				LoopIt(chunk_size,
+				       unsigned int *char1 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);
+				       unsigned int *char2 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);
+				       unsigned int *char3 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);,
+				       (*char1++ | ((*char2++ | (*char3++ >> glyphWidth)) >> glyphWidth)));
+			} else if(glyphWidth <= 16) {
+				int chunk_size = glyphWidth << 1;
+				LoopIt(chunk_size,
+				       unsigned int *char1 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);
+				       unsigned int *char2 = ((unsigned int *)ppci[skipglyphs++]->bits)+(ytop-Top);,
+				       (*char1++ | (*char2++ >> glyphWidth)));
+			}
+#undef LoopIt
+			/* Take care of any final glyphs. */
+			while(w > 0) {
+				unsigned int *gbits = (unsigned int *) ppci[skipglyphs++]->bits;
+				int pix = glyphWidth;
+
+				if(w < pix)
+					pix = w;
+				FFB_WRITE_FONTW(pFfb, ffb, pix);
+				FFBFifo(pFfb, 1 + (ybot - ytop));
+				ffb->fontxy = ((ytop << 16) | LeftEdge);
+				for(h = (ytop - Top); h < (ybot - Top); h++)
+					ffb->font = gbits[h];
+				LeftEdge += pix;
+				w -= pix;
+			}
+		}
+		nbox--;
+		pbox++;
+	}
+
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
+
+void
+CreatorPolyTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+		       unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase)
+{
+	CreatorTEGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, (char *) 1);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gspans.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gspans.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gspans.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,130 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Get spans.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gspans.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+void
+CreatorGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
+		int *pwidth, int nspans, char *pchardstStart)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	char *addrp;
+
+	FFBLOG(("CreatorGetSpans: wmax(%d) nspans(%d)\n", wMax, nspans));
+
+	/* Punt early for this case. */
+	if(pDrawable->bitsPerPixel == 1) {
+		mfbGetSpans(pDrawable, wMax, ppt, pwidth,
+			    nspans, pchardstStart);
+		return;
+	}
+
+	/* This code only works when sucking bits directly from
+	 * the framebuffer.
+	 */
+	if(pDrawable->type != DRAWABLE_WINDOW) {
+		if (pDrawable->bitsPerPixel == 8)
+			cfbGetSpans(pDrawable, wMax, ppt, pwidth,
+				    nspans, pchardstStart);
+		else
+			cfb32GetSpans(pDrawable, wMax, ppt, pwidth,
+				      nspans, pchardstStart);
+		return;
+	}
+
+	/*
+	 * XFree86 DDX empties the root borderClip when the VT is
+	 * switched away; this checks for that case
+	 */
+	if (!cfbDrawableEnabled(pDrawable))
+		return;
+    
+	/* We're just reading pixels from SFB, but we could be using
+	 * a different read buffer when double-buffering.
+	 */
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, (WindowPtr)pDrawable);
+	FFBWait(pFfb, ffb);
+
+	if (pDrawable->bitsPerPixel == 32) {
+		unsigned int *pdst = (unsigned int *)pchardstStart;
+
+		addrp = (char *) pFfb->sfb32;
+
+		if ((nspans == 1) && (*pwidth == 1)) {
+			*pdst = *(unsigned int *)(addrp + (ppt->y << 13) + (ppt->x << 2));
+			return;
+		}
+
+		while(nspans--) {
+			int w = min(ppt->x + *pwidth, 2048) - ppt->x;
+			unsigned int *psrc = (unsigned int *) (addrp +
+							       (ppt->y << 13) +
+							       (ppt->x << 2));
+			unsigned int *pdstNext = pdst + w;
+
+			while (w--)
+				*psrc++ = *pdst++;
+			pdst = pdstNext;
+			ppt++;
+			pwidth++;
+		}
+	} else {
+		unsigned char *pdst = (unsigned char *)pchardstStart;
+
+		addrp = (char *) pFfb->sfb8r;
+
+		if ((nspans == 1) && (*pwidth == 1)) {
+			*pdst = *(unsigned char *)(addrp + (ppt->y << 11) + (ppt->x << 0));
+			return;
+		}
+
+		while(nspans--) {
+			int w = min(ppt->x + *pwidth, 2048) - ppt->x;
+			unsigned char *psrc = (unsigned char *) (addrp +
+							       (ppt->y << 11) +
+							       (ppt->x << 0));
+			unsigned char *pdstNext = pdst + w;
+
+			while (w--)
+				*psrc++ = *pdst++;
+			pdst = pdstNext;
+			ppt++;
+			pwidth++;
+		}
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_line.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_line.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_line.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,195 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Line rops.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_line.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_stip.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+#include "miline.h"
+
+/* The scheme here is similar as for segments, except that
+ * if there are any out of range coordinate, we fully punt
+ * and do all of the pieces in software.  This is as to
+ * avoid complexity in final line capping, sloped lines, line
+ * patterns etc.
+ */
+#define IN_RANGE(_extent, _x, _y) \
+	((_x) >= (_extent)->x1	&&	(_x) <  (_extent)->x2	&& \
+	 (_y) >= (_extent)->y1	&&	(_y) <  (_extent)->y2)
+
+
+void
+CreatorPolylines (DrawablePtr pDrawable, GCPtr pGC, int mode, int nptInit, DDXPointPtr pptInit)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pGC->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	DDXPointPtr ppt;
+	BoxPtr extent;
+	int x, y, xorg, yorg, npt, capLast;
+
+	npt = nptInit;
+	if (npt <= 1)
+		return;
+	ppt = pptInit;
+	xorg = pDrawable->x;
+	yorg = pDrawable->y;
+	x = ppt->x + xorg;
+	y = ppt->y + yorg;
+	extent = REGION_RECTS(cfbGetCompositeClip(pGC));
+	if (!IN_RANGE(extent, x, y))
+		goto punt_rest;
+	ppt++;
+	while(npt--) {
+		if (mode == CoordModeOrigin) {
+			x = ppt->x + xorg;
+			y = ppt->y + yorg;
+		} else {
+			x += ppt->x;
+			y += ppt->y;
+		}
+		if (!IN_RANGE(extent, x, y))
+			goto punt_rest;
+		ppt++;
+	}
+	FFBLOG(("CreatorPolylines: npt(%d) lpat(%08x) alu(%x) pmsk(%08x)\n",
+		npt, gcPriv->linepat, pGC->alu, pGC->planemask));
+	if(gcPriv->stipple == NULL) {
+		FFB_ATTR_GC(pFfb, pGC, pWin,
+			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+			    FFB_DRAWOP_BRLINEOPEN);
+	} else {
+		unsigned int fbc;
+
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_BRLINEOPEN);
+		fbc = FFB_FBC_WIN(pWin);
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+		FFB_WRITE_FBC(pFfb, ffb, fbc);
+	}
+	pFfb->rp_active = 1;
+
+	ppt = pptInit;
+	npt = nptInit;
+	x = ppt->x + xorg;
+	y = ppt->y + yorg;
+
+	FFBFifo(pFfb, 3);
+	ffb->lpat = gcPriv->linepat;
+	ffb->by = y;
+	ffb->bx = x;
+	ppt++;
+	npt--;
+	capLast = pGC->capStyle != CapNotLast;
+	if (mode == CoordModeOrigin) {
+		if (capLast)
+			npt--;
+		if (pFfb->has_brline_bug) {
+			while (npt--) {
+				x = ppt->x + xorg;
+				y = ppt->y + yorg;
+				ppt++;
+				FFBFifo(pFfb, 3);
+				ffb->ppc = 0;
+				FFB_WRITE64(&ffb->bh, y, x);
+			}
+		} else {
+			while (npt--) {
+				x = ppt->x + xorg;
+				y = ppt->y + yorg;
+				ppt++;
+				FFBFifo(pFfb, 2);
+				FFB_WRITE64(&ffb->bh, y, x);
+			}
+		}
+		if (capLast) {
+			register int x2, y2;
+
+			x2 = ppt->x + xorg;
+			y2 = ppt->y + yorg;
+
+			FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_BRLINECAP);
+			FFBFifo(pFfb, 5);
+			ffb->ppc = 0;
+			FFB_WRITE64(&ffb->by, y, x);
+			FFB_WRITE64_2(&ffb->bh, y2, x2);
+		}
+	} else {
+		if (capLast)
+			npt--;
+		if (pFfb->has_brline_bug) {
+			while (npt--) {
+				x += ppt->x;
+				y += ppt->y;
+				ppt++;
+
+				FFBFifo(pFfb, 3);
+				ffb->ppc = 0;
+				FFB_WRITE64(&ffb->bh, y, x);
+			}
+		} else {
+			while (npt--) {
+				x += ppt->x;
+				y += ppt->y;
+				ppt++;
+
+				FFBFifo(pFfb, 2);
+				FFB_WRITE64(&ffb->bh, y, x);
+			}
+		}
+		if (capLast) {
+			register int x2, y2;
+
+			x2 = x + ppt->x;
+			y2 = y + ppt->y;
+
+			FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_BRLINECAP);
+			FFBFifo(pFfb, 5);
+			ffb->ppc = 0;
+			FFB_WRITE64(&ffb->by, y, x);
+			FFB_WRITE64_2(&ffb->bh, y2, x2);
+		}
+	}
+	FFBSync(pFfb, ffb);
+	return;
+
+punt_rest:
+	gcPriv->Polylines(pDrawable, pGC, mode, nptInit, pptInit);
+	return;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_loops.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_loops.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_loops.h	Thu May 18 16:21:37 2000
@@ -0,0 +1,212 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - fast inner loops.
+ *
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_loops.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+
+#ifndef FFBLOOPS_H
+#define FFBLOOPS_H
+
+#ifdef USE_VIS
+extern void FFB_STIPPLE_LOAD(volatile unsigned int *d,
+			     unsigned int *s);
+
+extern void FFB_PPT_BOX_LOOP(FFBPtr ffbpriv,
+			     ffb_fbcPtr ffb,
+			     BoxPtr pbox, BoxPtr pbox_last,
+			     DDXPointPtr ppt);
+
+extern void FFB_BOX_LOOP(FFBPtr ffbpriv,
+			 ffb_fbcPtr ffb,
+			 BoxPtr pbox,
+			 BoxPtr pbox_last);
+
+extern void FFB_RECT_LOOP(FFBPtr ffbpriv,
+			  ffb_fbcPtr ffb,
+			  xRectangle *prect,
+			  xRectangle *prect_last,
+			  int xOrg, int yOrg);
+
+extern void FFB_PPT_WIDTH_LOOP(FFBPtr ffbpriv,
+			       ffb_fbcPtr ffb,
+			       DDXPointPtr ppt, DDXPointPtr ppt_last,
+			       int *pwidth);
+
+extern DDXPointPtr FFB_PPT_LOOP1(FFBPtr ffbpriv,
+				 ffb_fbcPtr ffb,
+				 DDXPointPtr ppt, DDXPointPtr ppt_last,
+				 int xOrg, int yOrg);
+
+extern DDXPointPtr FFB_PPT_LOOP2(FFBPtr ffbpriv,
+				 ffb_fbcPtr ffb,
+				 DDXPointPtr ppt, DDXPointPtr ppt_last,
+				 int x, int y);
+
+extern DDXPointPtr FFB_LINE_LOOP1(FFBPtr ffbpriv,
+				  ffb_fbcPtr ffb,
+				  DDXPointPtr ppt, DDXPointPtr ppt_last,
+				  int xOrg, int yOrg);
+
+extern DDXPointPtr FFB_LINE_LOOP2(FFBPtr ffbpriv,
+				  ffb_fbcPtr ffb,
+				  DDXPointPtr ppt, DDXPointPtr ppt_last,
+				  int *x, int *y);
+
+#else /* !USE_VIS */
+
+#define FFB_STIPPLE_LOAD(_d,_s)				\
+do {							\
+	volatile unsigned int *d = (_d);		\
+	unsigned int *s = (_s);				\
+	int i;						\
+							\
+	for (i = 0; i < (32 / 2); i++, d+=2, s+=2)	\
+		FFB_WRITE64(d, s[0], s[1]);		\
+} while (0)
+
+#define FFB_PPT_BOX_LOOP(pFfb, ffb, pbox, _pbox_last, ppt)				\
+do {											\
+	BoxPtr pbox_last = (BoxPtr)(_pbox_last);					\
+	while (pbox <= pbox_last) {							\
+		FFBFifo(pFfb, 7);							\
+		ffb->drawop = FFB_DRAWOP_VSCROLL;					\
+		FFB_WRITE64(&ffb->by, ppt->y, ppt->x);					\
+		FFB_WRITE64_2(&ffb->dy, pbox->y1, pbox->x1);				\
+		FFB_WRITE64_3(&ffb->bh, (pbox->y2 - pbox->y1), (pbox->x2 - pbox->x1));	\
+		pbox++; ppt++;								\
+	}										\
+} while (0)
+
+#define FFB_BOX_LOOP(pFfb, ffb, pbox, _pbox_last)					\
+do {											\
+	BoxPtr pbox_last = (BoxPtr)(_pbox_last);					\
+	while (pbox <= pbox_last) {							\
+		FFBFifo(pFfb, 4);							\
+		FFB_WRITE64(&ffb->by, pbox->y1, pbox->x1);				\
+		FFB_WRITE64_2(&ffb->bh, (pbox->y2 - pbox->y1), (pbox->x2 - pbox->x1));	\
+		pbox++;									\
+	}										\
+} while (0)
+
+#define FFB_RECT_LOOP(pFfb, ffb, prect, _prect_last, xOrg, yOrg)			\
+do {											\
+	xRectangle *prect_last = (xRectangle *)(_prect_last);				\
+	for (; prect <= prect_last; prect++) {						\
+		register int x, y, w, h;						\
+		x = prect->x + xOrg;							\
+		y = prect->y + yOrg;							\
+		w = prect->width;							\
+		h = prect->height;							\
+		if (extents->x2 <= x ||							\
+		    extents->x1 >= x + w ||						\
+		    extents->y2 <= y ||							\
+		    extents->y1 >= y + h)						\
+			continue;							\
+		FFBFifo(pFfb, 4);							\
+		FFB_WRITE64(&ffb->by, y, x);						\
+		FFB_WRITE64_2(&ffb->bh, h, w);						\
+	}										\
+} while (0)
+
+#define FFB_PPT_WIDTH_LOOP(pFfb, ffb, ppt, _ppt_last, pwidth)			\
+do {											\
+	DDXPointPtr ppt_last = (DDXPointPtr)(_ppt_last);				\
+	while (ppt <= ppt_last) {							\
+		register int x, y, w;							\
+		x = ppt->x;								\
+		y = ppt->y;								\
+		w = *pwidth++;								\
+		FFBFifo(pFfb, 5);							\
+		ffb->ppc = 0;								\
+		FFB_WRITE64(&ffb->by, y, x);						\
+		FFB_WRITE64_2(&ffb->bh, y, (x + w));					\
+		ppt++;									\
+	}										\
+} while (0)
+
+static __inline__ DDXPointPtr FFB_PPT_LOOP1(FFBPtr pFfb,
+				 ffb_fbcPtr ffb,
+				 DDXPointPtr ppt, DDXPointPtr ppt_last,
+				 int xOrg, int yOrg)
+{
+	while (ppt <= ppt_last) {
+		FFBFifo(pFfb, 2);
+		FFB_WRITE64_2(&ffb->bh, (ppt->y + yOrg), (ppt->x + xOrg));
+		ppt++;
+	}
+	return ppt;
+}
+
+static __inline__ DDXPointPtr FFB_PPT_LOOP2(FFBPtr pFfb,
+					    ffb_fbcPtr ffb,
+					    DDXPointPtr ppt, DDXPointPtr ppt_last,
+					    int x, int y)
+{
+	register int __x = x, __y = y;
+	while (ppt <= ppt_last) {
+		FFBFifo(pFfb, 2);
+		__x += ppt->x;
+		__y += ppt->y;
+		FFB_WRITE64_2(&ffb->bh, __y, __x);
+		ppt++;
+	}
+	return ppt;
+}
+
+static __inline__ DDXPointPtr FFB_LINE_LOOP1(FFBPtr pFfb,
+					     ffb_fbcPtr ffb,
+					     DDXPointPtr ppt, DDXPointPtr ppt_last,
+					     int xOrg, int yOrg)
+{
+	while (ppt <= ppt_last) {
+		FFBFifo(pFfb, 3);
+		ffb->ppc = 0;
+		FFB_WRITE64_2(&ffb->bh, (ppt->y + yOrg), (ppt->x + xOrg));
+		ppt++;
+	}
+	return ppt;
+}
+
+static __inline__ DDXPointPtr FFB_LINE_LOOP2(FFBPtr pFfb,
+					     ffb_fbcPtr ffb,
+					     DDXPointPtr ppt, DDXPointPtr ppt_last,
+					     int *x, int *y)
+{
+	register int __x = *x, __y = *y;
+	while (ppt <= ppt_last) {
+		FFBFifo(pFfb, 3);
+		ffb->ppc = 0;
+		__x += ppt->x;
+		__y += ppt->y;
+		FFB_WRITE64_2(&ffb->bh, __y, __x);
+		ppt++;
+	}
+	*x = __x;
+	*y = __y;
+	return ppt;
+}
+
+#endif /* !USE_VIS */
+
+#endif /* FFBLOOPS_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_plygon.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_plygon.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_plygon.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,167 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Polygon rops.
+ *
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_plygon.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_stip.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+#include "mi.h"
+
+void
+CreatorFillPolygon (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, int count, DDXPointPtr ppt)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pGC->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	BoxRec box;
+	int lx, rx, ty, by;
+	int t, b, i, j, k, l, tt;
+	int xy[12] FFB_ALIGN64;
+	int xOrg, yOrg;
+
+	FFBLOG(("CreatorFillPolygon: ALU(%x) PMSK(%08x) shape(%d) mode(%d) count(%d)\n",
+		pGC->alu, pGC->planemask, shape, mode, count));
+	if (count < 3)
+		return;
+	
+	if (shape != Convex && count > 3) {
+		miFillPolygon (pDrawable, pGC, shape, mode, count, ppt);
+		return;
+	}
+	
+	xOrg = pDrawable->x;
+	yOrg = pDrawable->y;
+
+	ppt->x += xOrg;
+	ppt->y += yOrg;	
+	lx = ppt->x;
+	rx = ppt->x;
+	ty = ppt->y;
+	by = ppt->y;
+	t = b = 0;
+	tt = 1;
+	for (i = 1; i < count; i++) {
+		if (mode == CoordModeOrigin) {
+			ppt[i].x += xOrg;
+			ppt[i].y += yOrg;
+		} else {
+			ppt[i].x += ppt[i-1].x;
+			ppt[i].y += ppt[i-1].y;
+		}
+		if (ppt[i].x < lx)
+			lx = ppt[i].x;
+		if (ppt[i].x > rx)
+			rx = ppt[i].x;
+		if (ppt[i].y < ty) {
+			ty = ppt[i].y;
+			t = i;
+			tt = 1;
+		} else if (ppt[i].y == ty)
+			tt++;
+		if (ppt[i].y > by) {
+			by = ppt[i].y;
+			b = i;
+		}
+	}
+	if (tt > 2) {
+		miFillConvexPoly(pDrawable, pGC, count, ppt);
+		return;
+	} else if (tt == 2) {
+		i = t - 1;
+		if (i < 0)
+			i = count - 1;
+		if (ppt[i].y == ppt[t].y)
+			t = i;
+	}
+	box.x1 = lx;
+	box.x2 = rx + 1;
+	box.y1 = ty;
+	box.y2 = by + 1;
+	
+	switch (RECT_IN_REGION(pGC->pScreen, cfbGetCompositeClip(pGC), &box)) {
+	case rgnPART:
+		miFillConvexPoly(pDrawable, pGC, count, ppt);
+	case rgnOUT:
+		return;
+	}
+	if(gcPriv->stipple == NULL) {
+		FFB_ATTR_GC(pFfb, pGC, pWin,
+			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+			    FFB_DRAWOP_POLYGON);
+	} else {
+		unsigned int fbc;
+
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_POLYGON);
+		fbc = FFB_FBC_WIN(pWin);
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+		FFB_WRITE_FBC(pFfb, ffb, fbc);
+	}	
+	xy[0] = ppt[t].y;
+	xy[1] = ppt[t].x;
+	j = t + 1;
+	if (j == count) j = 0;
+	xy[2] = ppt[j].y;
+	xy[3] = ppt[j].x;
+	j = t + 2;
+	if (j >= count)
+		j -= count;
+	for (i = 2 * count - 4; i; i -= k) {
+		b = 2;
+		for (k = 0; k < i && k < 8; k+=2) {
+			xy[4 + k] = ppt[j].y;
+			xy[4 + k + 1] = ppt[j].x;
+			if (xy[4 + k] > xy[b])
+				b = 4 + k;
+			j++; if (j == count) j = 0;
+		}
+		FFBFifo(pFfb, 4 + k);
+		for (l = 0; l < b - 2; l+=2)
+			FFB_WRITE64P(&ffb->by, &xy[l]);
+		FFB_WRITE64P(&ffb->bh, &xy[l]);
+		for (l+=2; l <= k; l+=2)
+			FFB_WRITE64P(&ffb->by, &xy[l]);
+		FFB_WRITE64P(&ffb->ebyi, &xy[l]);
+		xy[2] = xy[l];
+		xy[3] = xy[l+1];
+	}
+	pFfb->rp_active = 1;
+	FFBSync(pFfb, ffb);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_point.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_point.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_point.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,108 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Point rops.
+ *
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_point.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_loops.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+void
+CreatorPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode,
+		 int npt, xPoint *pptInit)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pGC->pScreen);
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	ffb_fbcPtr ffb = pFfb->regs;
+	RegionPtr clip;
+	int numRects;
+	register int off, c1, c2;
+	register char *addrp;
+	register int *ppt, pt, i;
+	BoxPtr pbox;
+	xPoint *pptPrev;
+
+	FFBLOG(("CreatorPolyPoint: ALU(%x) PMSK(%08x) mode(%d) npt(%d)\n",
+		pGC->alu, pGC->planemask, mode, npt));
+
+	if (pGC->alu == GXnoop)
+		return;
+
+	clip = cfbGetCompositeClip(pGC);
+	numRects = REGION_NUM_RECTS(clip);
+	off = *(int *)&pDrawable->x;
+	off -= (off & 0x8000) << 1;
+	if (mode == CoordModePrevious && npt > 1) {
+		for (pptPrev = pptInit + 1, i = npt - 1; --i >= 0; pptPrev++) {
+			pptPrev->x += pptPrev[-1].x;
+			pptPrev->y += pptPrev[-1].y;
+		}
+	}
+
+	FFB_ATTR_GC(pFfb, pGC, pWin,
+		    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+		    pFfb->drawop_cache);
+	FFBWait(pFfb, ffb);
+
+	if (pGC->depth == 8) {
+		addrp = (char *)pFfb->sfb8r + (pDrawable->y << 11) + (pDrawable->x << 0);
+		pbox = REGION_RECTS(clip);
+		while (numRects--) {
+			c1 = *(int *)&pbox->x1 - off;
+			c2 = *(int *)&pbox->x2 - off - 0x00010001;
+			for (ppt = (int *)pptInit, i = npt; --i >= 0; ) {
+				pt = *ppt++;
+				if (!(((pt - c1) | (c2 - pt)) & 0x80008000))
+					*(unsigned char *)(addrp + ((pt << 11) & 0x3ff800) +
+							   ((pt >> 16) & 0x07ff)) = 0;
+			}
+			pbox++;
+		}
+	} else {
+		addrp = (char *)pFfb->sfb32 + (pDrawable->y << 13) + (pDrawable->x << 2);
+		pbox = REGION_RECTS(clip);
+		while (numRects--) {
+			c1 = *(int *)&pbox->x1 - off;
+			c2 = *(int *)&pbox->x2 - off - 0x00010001;
+			for (ppt = (int *)pptInit, i = npt; --i >= 0; ) {
+				pt = *ppt++;
+				if (!(((pt - c1) | (c2 - pt)) & 0x80008000))
+					*(unsigned int *)(addrp + ((pt << 13) & 0xffe000) +
+							  ((pt >> 14) & 0x1ffc)) = 0;
+			}
+			pbox++;
+		}
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rcache.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rcache.h:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rcache.h	Mon May 22 21:47:45 2000
@@ -0,0 +1,333 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - register caching.
+ *
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rcache.h,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#ifndef FFBRCACHE_H
+#define FFBRCACHE_H
+
+/* We only need to write the bits which actually change,
+ * writing unnessary bits causes the operation to go more
+ * slowly. -DaveM
+ *
+ * We used to have some hairy code here which tried to
+ * avoid writing attribute bits unnecessarily.  It has been
+ * removed because various two bit fields have different
+ * semantics.  For example, for some the higher bit is the
+ * edit bit, for others there are three state patterns
+ * and zero is a special "no edit" value.  Ho hum, it was
+ * a nice idea...
+ */
+#define FFB_WRITE_PPC(__fpriv, __ffb, __val, __chg_mask) \
+do {	unsigned int oldval = (__fpriv)->ppc_cache; \
+	unsigned int __t; \
+	__t = (oldval & (__chg_mask)) ^ (__val); \
+	if (__t) { \
+		unsigned int newval = oldval & ~(__chg_mask); \
+		newval |= (__val); \
+		(__fpriv)->ppc_cache = newval; \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->ppc = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_PMASK(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->pmask_cache != (__val)) { \
+		(__fpriv)->pmask_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->pmask = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_ROP(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->rop_cache != (__val)) { \
+		(__fpriv)->rop_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->rop = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_DRAWOP(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->drawop_cache != (__val)) { \
+		(__fpriv)->drawop_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->drawop = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_FG(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->fg_cache != (__val)) { \
+		(__fpriv)->fg_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->fg = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_BG(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->bg_cache != (__val)) { \
+		(__fpriv)->bg_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->bg = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_FONTW(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->fontw_cache != (__val)) { \
+		(__fpriv)->fontw_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->fontw = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_FONTINC(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->fontinc_cache != (__val)) { \
+		(__fpriv)->fontinc_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->fontinc = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_FBC(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->fbc_cache != (__val)) { \
+		(__fpriv)->fbc_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->fbc = (__val); \
+	} \
+} while(0)
+
+#define FFB_WRITE_WID(__fpriv, __ffb, __val) \
+do {	if((__fpriv)->wid_cache != (__val)) { \
+		(__fpriv)->wid_cache = (__val); \
+		FFBFifo((__fpriv), 1); \
+		(__ffb)->wid = (__val); \
+	} \
+} while(0)
+
+extern void __FFB_Attr_Raw(FFBPtr pFfb,
+			   unsigned int ppc,
+			   unsigned int ppc_mask,
+			   unsigned int pmask,
+			   unsigned int rop,
+			   int drawop, int fg,
+			   unsigned int fbc,
+			   unsigned int wid);
+
+#define FFB_ATTR_RAW(__fpriv, __ppc, __ppc_mask, __pmask, __rop, __drawop, __fg, __fbc, __wid) \
+	if((((__fpriv)->ppc_cache & (__ppc_mask)) != (__ppc))			|| \
+	   ((__fpriv)->pmask_cache != (__pmask))				|| \
+	   ((__fpriv)->rop_cache != (__rop))					|| \
+	   (((__drawop) != -1) && ((__fpriv)->drawop_cache != (__drawop)))	|| \
+	   ((__fpriv)->fg_cache != (__fg))					|| \
+	   ((__fpriv)->fbc_cache != (__fbc))					|| \
+	   ((__fpriv)->wid_cache != (__wid))) \
+		__FFB_Attr_Raw((__fpriv), (__ppc), (__ppc_mask), (__pmask), \
+			       (__rop), (__drawop), (__fg), (__fbc), (__wid))
+
+#define FFB_PPC_GCMASK	(FFB_PPC_APE_MASK | FFB_PPC_CS_MASK)
+
+/* This is for loading the FFB attributes for the case where
+ * where most of the values come directly from the graphics
+ * context and only the PPC and DRAWOP are variable.
+ */
+extern void __FFB_Attr_GC(FFBPtr pFfb, GCPtr pGC, WindowPtr pWin,
+			  unsigned int ppc, int drawop);
+
+#define FFB_ATTR_GC(__fpriv, __pgc, __pwin, __ppc, __drawop)		\
+do {	CreatorPrivWinPtr __winpriv = CreatorGetWindowPrivate(__pwin);	\
+	unsigned int __rop = ((__pgc)->alu | FFB_ROP_EDIT_BIT);		\
+	unsigned int __fbc = ((__winpriv)->fbc_base);			\
+	__fbc &= ~FFB_FBC_XE_MASK;					\
+	__fbc |= FFB_FBC_XE_OFF;					\
+	__rop |= (FFB_ROP_NEW << 8);					\
+	if ((((__fpriv)->ppc_cache & FFB_PPC_GCMASK) != (__ppc))||	\
+	    ((__fpriv)->pmask_cache != ((__pgc)->planemask))	||	\
+	    ((__fpriv)->rop_cache != (__rop))			||	\
+	    ((__fpriv)->drawop_cache != (__drawop))		||	\
+	    ((__fpriv)->fg_cache != ((__pgc)->fgPixel))		||	\
+	    ((__fpriv)->fbc_cache != __fbc))				\
+		__FFB_Attr_GC(__fpriv, __pgc, __pwin, __ppc, __drawop);	\
+} while(0)
+
+#define FFB_PPC_WINMASK	(FFB_PPC_APE_MASK | FFB_PPC_CS_MASK | FFB_PPC_XS_MASK)
+
+extern void __FFB_Attr_FastfillWin(FFBPtr pFfb, WindowPtr pWin,
+				   unsigned int ppc, unsigned int pixel);
+
+#define FFB_ATTR_FFWIN(__fpriv, __pwin, __ppc, __pixel) \
+do {	CreatorPrivWinPtr __winpriv = CreatorGetWindowPrivate(__pwin);	\
+	unsigned int ___ppc = (__ppc) | FFB_PPC_XS_WID;			\
+	unsigned int fbc = (__winpriv)->fbc_base; \
+	unsigned int rop = (FFB_ROP_NEW|(FFB_ROP_NEW<<8)); \
+	if((__fpriv)->has_double_buffer) { \
+		fbc &= ~FFB_FBC_WB_MASK; \
+		fbc |= FFB_FBC_WB_AB; \
+	} \
+	fbc &= ~(FFB_FBC_XE_MASK | FFB_FBC_RGBE_MASK); \
+	fbc |= FFB_FBC_XE_ON | FFB_FBC_RGBE_ON; \
+	if (pFfb->ffb_res == ffb_res_high) \
+		fbc |= FFB_FBC_WB_B; \
+	if ((((__fpriv)->ppc_cache & FFB_PPC_WINMASK) != (___ppc))||	\
+	    ((__fpriv)->pmask_cache != 0x00ffffff)		||	\
+	    ((__fpriv)->rop_cache!= rop)			||	\
+	    ((__fpriv)->drawop_cache != FFB_DRAWOP_FASTFILL)	||	\
+	    ((__fpriv)->fg_cache != (__pixel))			||	\
+	    ((__fpriv)->fbc_cache != fbc)			||	\
+	    ((__fpriv)->wid_cache != ((__winpriv)->wid)))		\
+		__FFB_Attr_FastfillWin(__fpriv, __pwin, ___ppc, __pixel);\
+} while (0)
+
+/* We have to be careful when copying windows around.  For that
+ * case we will use either VIS copies or hw accelerated VSCROLL.
+ * All of the planes needs to be copied in the framebuffer from
+ * src to dst in order to handle child windows using different WIDs
+ * than the parent window being copied.
+ */
+
+/* Setup to access the smart frame buffer (SFB) directly where the
+ * pixel color comes from the cpu on writes.
+ */
+#define FFB_PPC_WINCOPY		(FFB_PPC_APE_DISABLE | FFB_PPC_XS_VAR | FFB_PPC_CS_VAR)
+#define FFB_PPC_WINCOPY_MASK	(FFB_PPC_APE_MASK | FFB_PPC_XS_MASK | FFB_PPC_CS_MASK)
+#define FFB_FBC_WINCOPY		(FFB_FBC_WB_A | FFB_FBC_WM_COMBINED | FFB_FBC_WE_FORCEON | \
+				 FFB_FBC_RB_A | FFB_FBC_SB_BOTH | FFB_FBC_XE_ON | \
+				 FFB_FBC_ZE_OFF | FFB_FBC_YE_OFF | FFB_FBC_RGBE_ON)
+
+#define FFB_ATTR_SFB_VAR_WINCOPY(__fpriv) \
+do {	unsigned int ppc = FFB_PPC_WINCOPY; \
+	unsigned int ppc_mask = FFB_PPC_WINCOPY_MASK; \
+	unsigned int rop = FFB_ROP_NEW|(FFB_ROP_NEW<<8); \
+	unsigned int fbc = FFB_FBC_WINCOPY; \
+	if((__fpriv)->has_double_buffer) { \
+		fbc &= ~FFB_FBC_WB_MASK; \
+		fbc |= FFB_FBC_WB_AB; \
+	} \
+	if (((__fpriv)->ppc_cache & ppc_mask) != ppc || \
+	    (__fpriv)->fbc_cache != fbc || \
+	    (__fpriv)->rop_cache != rop || \
+	    (__fpriv)->pmask_cache != 0xffffffff) { \
+		ffb_fbcPtr __ffb = (__fpriv)->regs; \
+		(__fpriv)->ppc_cache &= ~ppc_mask; \
+		(__fpriv)->ppc_cache |= ppc; \
+		(__fpriv)->fbc_cache = fbc; \
+		(__fpriv)->rop_cache = rop; \
+		(__fpriv)->pmask_cache = 0xffffffff; \
+		(__fpriv)->rp_active = 1; \
+		FFBFifo(__fpriv, 4); \
+		(__ffb)->ppc = ppc; \
+		(__ffb)->fbc = fbc; \
+		(__ffb)->rop = rop; \
+		(__ffb)->pmask = 0xffffffff; \
+		(__fpriv)->rp_active = 1; \
+	} \
+} while(0)
+
+extern void __FFB_Attr_SFB_VAR(FFBPtr pFfb, unsigned int ppc, unsigned int ppc_mask, unsigned int fbc,
+			       unsigned int wid, unsigned int rop, unsigned int pmask);
+
+#define FFB_ATTR_SFB_VAR_WIN(__fpriv, __pmask, __alu, __pwin) \
+do {	unsigned int ppc = FFB_PPC_APE_DISABLE | FFB_PPC_CS_VAR | FFB_PPC_XS_WID; \
+	unsigned int ppc_mask = FFB_PPC_APE_MASK | FFB_PPC_CS_MASK | FFB_PPC_XS_MASK; \
+	unsigned int rop = (FFB_ROP_EDIT_BIT | (__alu))|(FFB_ROP_NEW<<8); \
+	unsigned int fbc = FFB_FBC_WIN(__pwin); \
+	if((__fpriv)->has_double_buffer) { \
+		fbc &= ~FFB_FBC_WB_MASK; \
+		fbc |= FFB_FBC_WB_AB; \
+	} \
+	if(((__fpriv)->ppc_cache & ppc_mask) != ppc || \
+	   (__fpriv)->fbc_cache != fbc || \
+	   (__fpriv)->wid_cache != FFB_WID_WIN(__pwin) || \
+	   (__fpriv)->rop_cache != rop || \
+	   (__fpriv)->pmask_cache != (__pmask)) \
+		__FFB_Attr_SFB_VAR(__fpriv, ppc, ppc_mask, fbc, \
+				   FFB_WID_WIN(__pwin), rop, (__pmask)); \
+} while(0)
+
+/* VSCROLL Attributes:
+ *
+ * PPC) VCE_DISABLE must be set, all other attributes are effectively
+ *      ignored since this drawop just copies pixels within the ram
+ *      chips and bypasses the pixel processor entirely.  So you
+ *	end up with a PPC color source behavior of {ZS,YS,XS,CS}_VAR.
+ * FBC) all options are allowed, but the SRC/DST buffers are determined
+ *      solely by the WB_* setting, that is, the RB_* setting is effectively
+ *      ignored since the pixels are copied directly through the write buffer
+ * ROP) must be FFB_ROP_OLD (even for the X plane!)
+ * PMASK) all options allowed
+ */
+#define FFB_ATTR_VSCROLL_WINCOPY(__fpriv) \
+do {	unsigned int rop = (FFB_ROP_OLD | (FFB_ROP_OLD << 8)); \
+	unsigned int fbc = FFB_FBC_WINCOPY; \
+	if((__fpriv)->has_double_buffer) { \
+		fbc &= ~FFB_FBC_WB_MASK; \
+		fbc |= FFB_FBC_WB_AB; \
+	} \
+	if((__fpriv)->fbc_cache != fbc || \
+	   (__fpriv)->rop_cache != rop || \
+	   (__fpriv)->pmask_cache != 0xffffffff || \
+	   (__fpriv)->drawop_cache != FFB_DRAWOP_VSCROLL) { \
+		ffb_fbcPtr __ffb = (__fpriv)->regs; \
+		(__fpriv)->fbc_cache = fbc; \
+		(__fpriv)->rop_cache = rop; \
+		(__fpriv)->pmask_cache = 0xffffffff; \
+		(__fpriv)->drawop_cache = FFB_DRAWOP_VSCROLL; \
+		(__fpriv)->rp_active = 1; \
+		FFBFifo(__fpriv, 4); \
+		(__ffb)->fbc = fbc; \
+		(__ffb)->rop = rop; \
+		(__ffb)->pmask = 0xffffffff; \
+		(__ffb)->drawop = FFB_DRAWOP_VSCROLL; \
+		(__fpriv)->rp_active = 1; \
+	} \
+} while(0)
+
+#define FFB_ATTR_VSCROLL_WIN(__fpriv, __pmask, __pwin) \
+do {	unsigned int rop = (FFB_ROP_OLD | (FFB_ROP_OLD << 8)); \
+	unsigned int fbc = FFB_FBC_WIN(__pwin); \
+	if((__fpriv)->has_double_buffer) { \
+		fbc &= ~FFB_FBC_WB_MASK; \
+		fbc |= FFB_FBC_WB_AB; \
+	} \
+	if((__fpriv)->fbc_cache != fbc || \
+	   (__fpriv)->rop_cache != rop || \
+	   (__fpriv)->pmask_cache != (__pmask) || \
+	   (__fpriv)->drawop_cache != FFB_DRAWOP_VSCROLL) { \
+		ffb_fbcPtr __ffb = (__fpriv)->regs; \
+		(__fpriv)->fbc_cache = fbc; \
+		(__fpriv)->rop_cache = rop; \
+		(__fpriv)->pmask_cache = (__pmask); \
+		(__fpriv)->drawop_cache = FFB_DRAWOP_VSCROLL; \
+		(__fpriv)->rp_active = 1; \
+		FFBFifo(__fpriv, 4); \
+		(__ffb)->fbc = fbc; \
+		(__ffb)->rop = rop; \
+		(__ffb)->pmask = (__pmask); \
+		(__ffb)->drawop = FFB_DRAWOP_VSCROLL; \
+	} \
+} while(0)
+
+#define FFB_FBC_WIN(pWin)	CreatorGetWindowPrivate(pWin)->fbc_base
+#define FFB_WID_WIN(pWin)	CreatorGetWindowPrivate(pWin)->wid
+
+#endif /* FFBRCACHE_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rect.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rect.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rect.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,207 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Non-filled rects.
+ *
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999 Jakub Jelinek   (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rect.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#define PSZ 32
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_loops.h"
+#include "ffb_clip.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+
+#error If we start using this again, need to fixup FFB_WRITE_ATTRIBUTES for wids -DaveM
+
+/* Heavily derived from mipolyrect.c code, see there for authors. */
+
+/* This about it, capping makes not a single difference ever,
+ * always the upper left corner coordinate will be pixelated.
+ */
+void
+CreatorPolyRectangle(DrawablePtr pDrawable, GCPtr pGC,
+		     int nrects, xRectangle *pRects)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+	ffb_fbcPtr ffb = pFfb->regs;
+	xRectangle *pR = pRects;
+	RegionPtr clip;
+	unsigned int ppc, line_drawop;
+	int bound_tmp, i, numRects;
+
+	if(nrects <= 0)
+		return;
+	clip = ((cfbPrivGC *)(pGC->devPrivates[cfbGCPrivateIndex].ptr))->pCompositeClip;
+	numRects = REGION_NUM_RECTS(clip);
+	if (!numRects)
+		return;
+	if(!(ppc = FFBSetClip(pFfb, ffb, clip, numRects))) {
+		miPolyRectangle(pDrawable, pGC, nrects, pRects);
+		return;
+	}
+	if(pGC->lineStyle == LineDoubleDash)
+		line_drawop = FFB_DRAWOP_DDLINE;
+	else
+		line_drawop = FFB_DRAWOP_BRLINECAP;
+	if(gcPriv->stipple == NULL) {
+		FFB_WRITE_ATTRIBUTES(pFfb,
+				     ppc|FFB_PPC_APE_DISABLE|FFB_PPC_TBE_OPAQUE|
+				     FFB_PPC_XS_CONST|FFB_PPC_YS_CONST|FFB_PPC_ZS_CONST|FFB_PPC_CS_CONST,
+				     FFB_PPC_VCE_MASK|FFB_PPC_ACE_MASK|FFB_PPC_APE_MASK|FFB_PPC_TBE_MASK|
+				     FFB_PPC_XS_MASK|FFB_PPC_YS_MASK|FFB_PPC_ZS_MASK|FFB_PPC_CS_MASK,
+				     pGC->planemask,
+				     FFB_ROP_EDIT_BIT|pGC->alu,
+				     -1, pGC->fgPixel,
+				     FFB_FBC_DEFAULT);
+		if(pGC->lineStyle == LineDoubleDash)
+			FFB_WRITE_BG(pFfb, ffb, pGC->bgPixel);
+	} else {
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      ppc|
+			      FFB_PPC_XS_CONST|FFB_PPC_YS_CONST|FFB_PPC_ZS_CONST|FFB_PPC_CS_CONST,
+			      FFB_PPC_VCE_MASK|FFB_PPC_ACE_MASK|
+			      FFB_PPC_XS_MASK|FFB_PPC_YS_MASK|FFB_PPC_ZS_MASK|FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_FBC(pFfb, ffb, FFB_FBC_DEFAULT);
+	}
+
+#define MINBOUND(dst,eqn)	bound_tmp = eqn; \
+				if (bound_tmp < -32768) \
+				    bound_tmp = -32768; \
+				dst = bound_tmp;
+
+#define MAXBOUND(dst,eqn)	bound_tmp = eqn; \
+				if (bound_tmp > 32767) \
+				    bound_tmp = 32767; \
+				dst = bound_tmp;
+
+#define MAXUBOUND(dst,eqn)	bound_tmp = eqn; \
+				if (bound_tmp > 65535) \
+				    bound_tmp = 65535; \
+				dst = bound_tmp;
+
+	if (pGC->lineStyle == LineSolid &&
+	    pGC->joinStyle == JoinMiter &&
+	    pGC->lineWidth != 0) {
+		int ntmp;
+		int offset1, offset2, offset3;
+		int x, y, width, height;
+		int tx, ty, tw, th;
+
+		ntmp = (nrects << 2);
+		offset2 = pGC->lineWidth;
+		offset1 = offset2 >> 1;
+		offset3 = offset2 - offset1;
+		for (i = 0; i < nrects; i++) {
+			x = pR->x;
+			y = pR->y;
+			width = pR->width;
+			height = pR->height;
+			pR++;
+			if (width == 0 && height == 0) {
+				FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_DOT);
+				FFBFifo(pFfb, 2);
+				FFB_WRITE64(&ffb->bh, y + pDrawable->y, x + pDrawable->x);
+				continue;
+			}
+			FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+			if (height < offset2 || width < offset1) {
+				if (height == 0) {
+					tx = x;
+					tw = width;
+				} else {
+					MINBOUND (tx, x - offset1);
+					MAXUBOUND (tw, width + offset2);
+				}
+				if (width == 0) {
+					ty = y;
+					th = height;
+				} else {
+					MINBOUND (ty, y - offset1);
+					MAXUBOUND (th, height + offset2);
+				}
+				FFBFifo(pFfb, 4);
+				FFB_WRITE64(&ffb->by, ty + pDrawable->y, tx + pDrawable->x);
+				FFB_WRITE64_2(&ffb->bh, th, tw);
+			} else {
+				MINBOUND(tx, x - offset1);
+				MINBOUND(ty, y - offset1);
+				MAXUBOUND(tw, width + offset2);
+				th = offset2;
+				FFBFifo(pFfb, 13);
+				FFB_WRITE64(&ffb->by, ty + pDrawable->y, tx + pDrawable->x);
+				FFB_WRITE64_2(&ffb->bh, th, tw);
+				MAXBOUND(ty, y + offset3);
+				tw = offset2;
+				th = height - offset2;
+				ffb->by = ty + pDrawable->y;
+				FFB_WRITE64_2(&ffb->bh, th, tw);
+				MAXBOUND(tx, x + width - offset1);
+				ffb->bx = tx + pDrawable->x;
+				ffb->bw = tw;				
+				MINBOUND(tx, x - offset1);
+				MAXBOUND(ty, y + height - offset1);
+				MAXUBOUND(tw, width + offset2);
+				th = offset2;
+				FFB_WRITE64(&ffb->by, ty + pDrawable->y, tx + pDrawable->x);
+				FFB_WRITE64_2(&ffb->bh, th, tw);
+			}
+		}
+	} else {
+		int xOrg = pDrawable->x;
+		int yOrg = pDrawable->y;
+		unsigned int linepat = gcPriv->linepat;
+
+		FFB_WRITE_DRAWOP(pFfb, ffb, line_drawop);
+		if(linepat == 0) {
+			FFBFifo(pFfb, 1);
+			ffb->lpat = 0;
+		}
+		for (i=0; i < nrects; i++) {
+			register int x0, xCoord, y0, yCoord;
+
+			x0 = xCoord = pR->x;
+			y0 = yCoord = pR->y;
+			FFBFifo(pFfb, 11);
+			if(linepat)
+				ffb->lpat = linepat;
+			else
+				ffb->ppc = 0;
+			FFB_WRITE64(&ffb->by, (yCoord + yOrg), (xCoord + xOrg));
+			MAXBOUND(xCoord, pR->x + (int) pR->width);
+			FFB_WRITE64(&ffb->bh, (yCoord + yOrg), (xCoord + xOrg));
+			MAXBOUND(yCoord, pR->y + (int) pR->height);
+			FFB_WRITE64_2(&ffb->bh, (yCoord + yOrg), (xCoord + xOrg));
+			FFB_WRITE64_3(&ffb->bh, (yCoord + yOrg), (x0 + xOrg));
+			FFB_WRITE64(&ffb->bh, (y0 + yOrg), (x0 + xOrg));
+			pR++;
+		}
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_regs.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_regs.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_regs.h	Thu May 18 16:21:37 2000
@@ -0,0 +1,509 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - register layout.
+ *
+ * Copyright (C) 1998,1999,2000 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1998 Michal Rehacek (majkl@iname.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK, MICHAL REHACEK, OR DAVID MILLER BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_regs.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+
+#ifndef FFBREGS_H
+#define FFBREGS_H
+
+/* Auxilliary clips. */
+typedef struct  {
+	volatile unsigned int min;
+	volatile unsigned int max;
+} ffb_auxclip, *ffb_auxclipPtr;
+
+/* FFB register set. */
+typedef struct _ffb_fbc {
+	/* Next vertex registers, on the right we list which drawops
+	 * use said register and the logical name the register has in
+	 * that context.
+	 */					/* DESCRIPTION		DRAWOP(NAME)	*/
+/*0x00*/unsigned int		pad1[3];	/* Reserved				*/
+/*0x0c*/volatile unsigned int	alpha;		/* ALPHA Transparency			*/
+/*0x10*/volatile unsigned int	red;		/* RED					*/
+/*0x14*/volatile unsigned int	green;		/* GREEN				*/
+/*0x18*/volatile unsigned int	blue;		/* BLUE					*/
+/*0x1c*/volatile unsigned int	z;		/* DEPTH				*/
+/*0x20*/volatile unsigned int	y;		/* Y			triangle(DOYF)	*/
+						/*                      aadot(DYF)	*/
+						/*                      ddline(DYF)	*/
+						/*                      aaline(DYF)	*/
+/*0x24*/volatile unsigned int	x;		/* X			triangle(DOXF)	*/
+						/*                      aadot(DXF)	*/
+						/*                      ddline(DXF)	*/
+						/*                      aaline(DXF)	*/
+/*0x28*/unsigned int		pad2[2];	/* Reserved				*/
+/*0x30*/volatile unsigned int	ryf;		/* Y (alias to DOYF)	ddline(RYF)	*/
+						/*			aaline(RYF)	*/
+						/*			triangle(RYF)	*/
+/*0x34*/volatile unsigned int	rxf;		/* X			ddline(RXF)	*/
+						/*			aaline(RXF)	*/
+						/*			triangle(RXF)	*/
+/*0x38*/unsigned int		pad3[2];	/* Reserved				*/
+/*0x40*/volatile unsigned int	dmyf;		/* Y (alias to DOYF)	triangle(DMYF)	*/
+/*0x44*/volatile unsigned int	dmxf;		/* X			triangle(DMXF)	*/
+/*0x48*/unsigned int		pad4[2];	/* Reserved				*/
+/*0x50*/volatile unsigned int	ebyi;		/* Y (alias to RYI)	polygon(EBYI)	*/
+/*0x54*/volatile unsigned int	ebxi;		/* X			polygon(EBXI)	*/
+/*0x58*/unsigned int		pad5[2];	/* Reserved				*/
+/*0x60*/volatile unsigned int	by;		/* Y			brline(RYI)	*/
+						/*			fastfill(OP)	*/
+						/*			polygon(YI)	*/
+						/*			rectangle(YI)	*/
+						/*			bcopy(SRCY)	*/
+						/*			vscroll(SRCY)	*/
+/*0x64*/volatile unsigned int	bx;		/* X			brline(RXI)	*/
+						/*			polygon(XI)	*/
+						/*			rectangle(XI)	*/
+						/*			bcopy(SRCX)	*/
+						/*			vscroll(SRCX)	*/
+						/*			fastfill(GO)	*/
+/*0x68*/volatile unsigned int	dy;		/* destination Y	fastfill(DSTY)	*/
+						/*			bcopy(DSRY)	*/
+						/*			vscroll(DSRY)	*/
+/*0x6c*/volatile unsigned int	dx;		/* destination X	fastfill(DSTX)	*/
+						/*			bcopy(DSTX)	*/
+						/*			vscroll(DSTX)	*/
+/*0x70*/volatile unsigned int	bh;		/* Y (alias to RYI)	brline(DYI)	*/
+						/*			dot(DYI)	*/
+						/*			polygon(ETYI)	*/
+						/* Height		fastfill(H)	*/
+						/*			bcopy(H)	*/
+						/*			vscroll(H)	*/
+						/* Y count		fastfill(NY)	*/
+/*0x74*/volatile unsigned int	bw;		/* X			dot(DXI)	*/
+						/*			brline(DXI)	*/
+						/*			polygon(ETXI)	*/
+						/*			fastfill(W)	*/
+						/*			bcopy(W)	*/
+						/*			vscroll(W)	*/
+						/*			fastfill(NX)	*/
+/*0x78*/unsigned int		pad6[2];	/* Reserved				*/
+/*0x80*/unsigned int		pad7[32];	/* Reserved				*/
+	
+	/* Setup Unit's vertex state register */
+/*100*/	volatile unsigned int	suvtx;
+/*104*/	unsigned int		pad8[63];	/* Reserved				*/
+	
+	/* Frame Buffer Control Registers */
+/*200*/	volatile unsigned int	ppc;		/* Pixel Processor Control		*/
+/*204*/	volatile unsigned int	wid;		/* Current WID				*/
+/*208*/	volatile unsigned int	fg;		/* FG data				*/
+/*20c*/	volatile unsigned int	bg;		/* BG data				*/
+/*210*/	volatile unsigned int	consty;		/* Constant Y				*/
+/*214*/	volatile unsigned int	constz;		/* Constant Z				*/
+/*218*/	volatile unsigned int	xclip;		/* X Clip				*/
+/*21c*/	volatile unsigned int	dcss;		/* Depth Cue Scale Slope		*/
+/*220*/	volatile unsigned int	vclipmin;	/* Viewclip XY Min Bounds		*/
+/*224*/	volatile unsigned int	vclipmax;	/* Viewclip XY Max Bounds		*/
+/*228*/	volatile unsigned int	vclipzmin;	/* Viewclip Z Min Bounds		*/
+/*22c*/	volatile unsigned int	vclipzmax;	/* Viewclip Z Max Bounds		*/
+/*230*/	volatile unsigned int	dcsf;		/* Depth Cue Scale Front Bound		*/
+/*234*/	volatile unsigned int	dcsb;		/* Depth Cue Scale Back Bound		*/
+/*238*/	volatile unsigned int	dczf;		/* Depth Cue Z Front			*/
+/*23c*/	volatile unsigned int	dczb;		/* Depth Cue Z Back			*/
+/*240*/	unsigned int		pad9;		/* Reserved				*/
+/*244*/	volatile unsigned int	blendc;		/* Alpha Blend Control			*/
+/*248*/	volatile unsigned int	blendc1;	/* Alpha Blend Color 1			*/
+/*24c*/	volatile unsigned int	blendc2;	/* Alpha Blend Color 2			*/
+/*250*/	volatile unsigned int	fbramitc;	/* FB RAM Interleave Test Control	*/
+/*254*/	volatile unsigned int	fbc;		/* Frame Buffer Control			*/
+/*258*/	volatile unsigned int	rop;		/* Raster OPeration			*/
+/*25c*/	volatile unsigned int	cmp;		/* Frame Buffer Compare			*/
+/*260*/	volatile unsigned int	matchab;	/* Buffer AB Match Mask			*/
+/*264*/	volatile unsigned int	matchc;		/* Buffer C(YZ) Match Mask		*/
+/*268*/	volatile unsigned int	magnab;		/* Buffer AB Magnitude Mask		*/
+/*26c*/	volatile unsigned int	magnc;		/* Buffer C(YZ) Magnitude Mask		*/
+/*270*/	volatile unsigned int	fbcfg0;		/* Frame Buffer Config 0		*/
+/*274*/	volatile unsigned int	fbcfg1;		/* Frame Buffer Config 1		*/
+/*278*/	volatile unsigned int	fbcfg2;		/* Frame Buffer Config 2		*/
+/*27c*/	volatile unsigned int	fbcfg3;		/* Frame Buffer Config 3		*/
+/*280*/	volatile unsigned int	ppcfg;		/* Pixel Processor Config		*/
+/*284*/	volatile unsigned int	pick;		/* Picking Control			*/
+/*288*/	volatile unsigned int	fillmode;	/* FillMode				*/
+/*28c*/	volatile unsigned int	fbramwac;	/* FB RAM Write Address Control		*/
+/*290*/	volatile unsigned int	pmask;		/* RGB PlaneMask			*/
+/*294*/	volatile unsigned int	xpmask;		/* X PlaneMask				*/
+/*298*/	volatile unsigned int	ypmask;		/* Y PlaneMask				*/
+/*29c*/	volatile unsigned int	zpmask;		/* Z PlaneMask				*/
+/*2a0*/	ffb_auxclip		auxclip[4]; 	/* Auxilliary Viewport Clip		*/
+	
+	/* New 3dRAM III support regs */
+/*2c0*/	volatile unsigned int	rawblend2;
+/*2c4*/	volatile unsigned int	rawpreblend;
+/*2c8*/	volatile unsigned int	rawstencil;
+/*2cc*/	volatile unsigned int	rawstencilctl;
+/*2d0*/	volatile unsigned int	threedram1;
+/*2d4*/	volatile unsigned int	threedram2;
+/*2d8*/	volatile unsigned int	passin;
+/*2dc*/	volatile unsigned int	rawclrdepth;
+/*2e0*/	volatile unsigned int	rawpmask;
+/*2e4*/	volatile unsigned int	rawcsrc;
+/*2e8*/	volatile unsigned int	rawmatch;
+/*2ec*/	volatile unsigned int	rawmagn;
+/*2f0*/	volatile unsigned int	rawropblend;
+/*2f4*/	volatile unsigned int	rawcmp;
+/*2f8*/	volatile unsigned int	rawwac;
+/*2fc*/	volatile unsigned int	fbramid;
+	
+/*300*/	volatile unsigned int	drawop;		/* Draw OPeration			*/
+/*304*/	unsigned int		pad10[2];	/* Reserved				*/
+/*30c*/	volatile unsigned int	lpat;		/* Line Pattern control			*/
+/*310*/	unsigned int		pad11;		/* Reserved				*/
+/*314*/	volatile unsigned int	fontxy;		/* XY Font coordinate			*/
+/*318*/	volatile unsigned int	fontw;		/* Font Width				*/
+/*31c*/	volatile unsigned int	fontinc;	/* Font Increment			*/
+/*320*/	volatile unsigned int	font;		/* Font bits				*/
+/*324*/	unsigned int		pad12[3];	/* Reserved				*/
+/*330*/	volatile unsigned int	blend2;
+/*334*/	volatile unsigned int	preblend;
+/*338*/	volatile unsigned int	stencil;
+/*33c*/	volatile unsigned int	stencilctl;
+
+/*340*/	unsigned int		pad13[4];	/* Reserved				*/
+/*350*/	volatile unsigned int	dcss1;		/* Depth Cue Scale Slope 1		*/
+/*354*/	volatile unsigned int	dcss2;		/* Depth Cue Scale Slope 2		*/
+/*358*/	volatile unsigned int	dcss3;		/* Depth Cue Scale Slope 3		*/
+/*35c*/	volatile unsigned int	widpmask;
+/*360*/	volatile unsigned int	dcs2;
+/*364*/	volatile unsigned int	dcs3;
+/*368*/	volatile unsigned int	dcs4;
+/*36c*/	unsigned int		pad14;		/* Reserved				*/
+/*370*/	volatile unsigned int	dcd2;
+/*374*/	volatile unsigned int	dcd3;
+/*378*/	volatile unsigned int	dcd4;
+/*37c*/	unsigned int		pad15;		/* Reserved				*/
+/*380*/	volatile unsigned int	pattern[32];	/* area Pattern				*/
+/*400*/	unsigned int		pad16[8];	/* Reserved				*/
+/*420*/	volatile unsigned int	reset;		/* chip RESET				*/
+/*424*/	unsigned int		pad17[247];	/* Reserved				*/
+/*800*/	volatile unsigned int	devid;		/* Device ID				*/
+/*804*/	unsigned int		pad18[63];	/* Reserved				*/
+/*900*/	volatile unsigned int	ucsr;		/* User Control & Status Register	*/
+/*904*/	unsigned int		pad19[31];	/* Reserved				*/
+/*980*/	volatile unsigned int	mer;		/* Mode Enable Register			*/
+/*984*/	unsigned int		pad20[1439];	/* Reserved				*/
+} ffb_fbc, *ffb_fbcPtr;
+
+/* Draw operations */
+#define FFB_DRAWOP_DOT		0x00
+#define FFB_DRAWOP_AADOT	0x01
+#define FFB_DRAWOP_BRLINECAP	0x02
+#define FFB_DRAWOP_BRLINEOPEN	0x03
+#define FFB_DRAWOP_DDLINE	0x04
+#define FFB_DRAWOP_AALINE	0x05
+#define FFB_DRAWOP_TRIANGLE	0x06
+#define FFB_DRAWOP_POLYGON	0x07
+#define FFB_DRAWOP_RECTANGLE	0x08
+#define FFB_DRAWOP_FASTFILL	0x09
+#define FFB_DRAWOP_BCOPY	0x0a	/* Not implemented in any FFB, VIS is faster		*/
+#define FFB_DRAWOP_VSCROLL	0x0b	/* Up to 12x faster than BCOPY, 3-4x faster than VIS	*/
+
+/* FastFill operation codes. */
+#define FFB_FASTFILL_PAGE	0x01
+#define FFB_FASTFILL_BLOCK	0x02
+#define FFB_FASTFILL_COLOR_BLK	0x03
+#define FFB_FASTFILL_BLOCK_X	0x04
+
+/* Spanfill Unit Line Pattern */
+#define FFB_LPAT_SCALEPTR	0xf0000000
+#define FFB_LPAT_SCALEPTR_SHIFT	28
+#define FFB_LPAT_PATPTR		0x0f000000
+#define FFB_LPAT_PATPTR_SHIFT	24
+#define FFB_LPAT_SCALEVAL	0x00f00000
+#define FFB_LPAT_SCALEVAL_SHIFT	20
+#define FFB_LPAT_PATLEN		0x000f0000
+#define FFB_LPAT_PATLEN_SHIFT	16
+#define FFB_LPAT_PATTERN	0x0000ffff
+#define FFB_LPAT_PATTERN_SHIFT	0
+
+/* Pixel processor control */
+/* Force WID */
+#define FFB_PPC_FW_DISABLE	0x800000
+#define FFB_PPC_FW_ENABLE	0xc00000
+#define FFB_PPC_FW_MASK		0xc00000
+/* Auxiliary clip */
+#define FFB_PPC_ACE_DISABLE	0x040000
+#define FFB_PPC_ACE_AUX_SUB	0x080000
+#define FFB_PPC_ACE_AUX_ADD	0x0c0000
+#define FFB_PPC_ACE_MASK	0x0c0000
+/* Depth cue */
+#define FFB_PPC_DCE_DISABLE	0x020000
+#define FFB_PPC_DCE_ENABLE	0x030000
+#define FFB_PPC_DCE_MASK	0x030000
+/* Alpha blend */
+#define FFB_PPC_ABE_DISABLE	0x008000
+#define FFB_PPC_ABE_ENABLE	0x00c000
+#define FFB_PPC_ABE_MASK	0x00c000
+/* View clip */
+#define FFB_PPC_VCE_DISABLE	0x001000
+#define FFB_PPC_VCE_2D		0x002000
+#define FFB_PPC_VCE_3D		0x003000
+#define FFB_PPC_VCE_MASK	0x003000
+/* Area pattern */
+#define FFB_PPC_APE_DISABLE	0x000800
+#define FFB_PPC_APE_ENABLE	0x000c00
+#define FFB_PPC_APE_MASK	0x000c00
+/* Transparent background */
+#define FFB_PPC_TBE_OPAQUE	0x000200
+#define FFB_PPC_TBE_TRANSPARENT	0x000300
+#define FFB_PPC_TBE_MASK	0x000300
+/* Z source */
+#define FFB_PPC_ZS_VAR		0x000080
+#define FFB_PPC_ZS_CONST	0x0000c0
+#define FFB_PPC_ZS_MASK		0x0000c0
+/* Y source */
+#define FFB_PPC_YS_VAR		0x000020
+#define FFB_PPC_YS_CONST	0x000030
+#define FFB_PPC_YS_MASK		0x000030
+/* X source */
+#define FFB_PPC_XS_WID		0x000004
+#define FFB_PPC_XS_VAR		0x000008
+#define FFB_PPC_XS_CONST	0x00000c
+#define FFB_PPC_XS_MASK		0x00000c
+/* Color (BGR) source */
+#define FFB_PPC_CS_VAR		0x000002
+#define FFB_PPC_CS_CONST	0x000003
+#define FFB_PPC_CS_MASK		0x000003
+
+/* X Clip */
+#define FFB_XCLIP_XREF		0x000000ff
+#define FFB_XCLIP_TEST_MASK	0x00070000
+#define FFB_XCLIP_TEST_ALWAYS	0x00000000
+#define FFB_XCLIP_TEST_GT	0x00010000
+#define FFB_XCLIP_TEST_EQ	0x00020000
+#define FFB_XCLIP_TEST_GE	0x00030000
+#define FFB_XCLIP_TEST_NEVER	0x00040000
+#define FFB_XCLIP_TEST_LE	0x00050000
+#define FFB_XCLIP_TEST_NE	0x00060000
+#define FFB_XCLIP_TEST_LT	0x00070000
+
+/* FB Control register */
+/* Write buffer dest */
+#define FFB_FBC_WB_A		0x20000000
+#define FFB_FBC_WB_B		0x40000000
+#define FFB_FBC_WB_AB		0x60000000
+#define FFB_FBC_WB_C		0x80000000
+#define FFB_FBC_WB_AC		0xa0000000
+#define FFB_FBC_WB_BC		0xc0000000
+#define FFB_FBC_WB_ABC		0xe0000000
+#define FFB_FBC_WB_MASK		0xe0000000
+/* Write enable */
+#define FFB_FBC_WE_FORCEOFF	0x00100000
+#define FFB_FBC_WE_FORCEON	0x00200000
+#define FFB_FBC_WE_USE_WMASK	0x00300000
+#define FFB_FBC_WE_MASK		0x00300000
+/* Write group mode */
+#define FFB_FBC_WM_RSVD		0x00040000
+#define FFB_FBC_WM_COMBINED	0x00080000
+#define FFB_FBC_WM_SEPARATE	0x000c0000
+#define FFB_FBC_WM_MASK		0x000c0000
+/* Read buffer src */
+#define FFB_FBC_RB_A		0x00004000
+#define FFB_FBC_RB_B		0x00008000
+#define FFB_FBC_RB_C		0x0000c000
+#define FFB_FBC_RB_MASK		0x0000c000
+/* Stereo buf dest */
+#define FFB_FBC_SB_LEFT		0x00001000
+#define FFB_FBC_SB_RIGHT	0x00002000
+#define FFB_FBC_SB_BOTH		0x00003000
+#define FFB_FBC_SB_MASK		0x00003000
+/* Z plane group enable */
+#define FFB_FBC_ZE_OFF		0x00000400
+#define FFB_FBC_ZE_ON		0x00000800
+#define FFB_FBC_ZE_MASK		0x00000c00
+/* Y plane group enable */
+#define FFB_FBC_YE_OFF		0x00000100
+#define FFB_FBC_YE_ON		0x00000200
+#define FFB_FBC_YE_MASK		0x00000300
+/* X plane group enable */
+#define FFB_FBC_XE_OFF		0x00000040
+#define FFB_FBC_XE_ON		0x00000080
+#define FFB_FBC_XE_MASK		0x000000c0
+/* B plane group enable */
+#define FFB_FBC_BE_OFF		0x00000010
+#define FFB_FBC_BE_ON		0x00000020
+#define FFB_FBC_BE_MASK		0x00000030
+/* G plane group enable */
+#define FFB_FBC_GE_OFF		0x00000004
+#define FFB_FBC_GE_ON		0x00000008
+#define FFB_FBC_GE_MASK		0x0000000c
+/* R plane group enable */
+#define FFB_FBC_RE_OFF		0x00000001
+#define FFB_FBC_RE_ON		0x00000002
+#define FFB_FBC_RE_MASK		0x00000003
+/* Combined */
+#define FFB_FBC_RGBE_OFF	0x00000015
+#define FFB_FBC_RGBE_ON		0x0000002a
+#define FFB_FBC_RGBE_MASK	0x0000003f
+
+/* Raster OP */
+#define FFB_ROP_YZ_MASK		0x008f0000
+#define FFB_ROP_X_MASK		0x00008f00
+#define FFB_ROP_RGB_MASK	0x0000008f
+
+/* Now the rops themselves which get shifted into the
+ * above fields.
+ */
+#define FFB_ROP_EDIT_BIT	0x80
+#define FFB_ROP_ZERO		0x80
+#define FFB_ROP_NEW_AND_OLD	0x81
+#define FFB_ROP_NEW_AND_NOLD	0x82
+#define FFB_ROP_NEW		0x83
+#define FFB_ROP_NNEW_AND_OLD	0x84
+#define FFB_ROP_OLD		0x85
+#define FFB_ROP_NEW_XOR_OLD	0x86
+#define FFB_ROP_NEW_OR_OLD	0x87
+#define FFB_ROP_NNEW_AND_NOLD	0x88
+#define FFB_ROP_NNEW_XOR_NOLD	0x89
+#define FFB_ROP_NOLD		0x8a
+#define FFB_ROP_NEW_OR_NOLD	0x8b
+#define FFB_ROP_NNEW		0x8c
+#define FFB_ROP_NNEW_OR_OLD	0x8d
+#define FFB_ROP_NNEW_OR_NOLD	0x8e
+#define FFB_ROP_ONES		0x8f
+
+/* FB Compare */
+#define FFB_CMP_MATCHC_MASK	0x8f000000
+#define FFB_CMP_MAGNC_MASK	0x00870000
+#define FFB_CMP_MATCHAB_MASK	0x0000ff00
+#define FFB_CMP_MAGNAB_MASK	0x000000ff
+
+/* Compare Match codes */
+#define FFB_CMP_MATCH_EDIT_BIT	0x80
+#define FFB_CMP_MATCH_ALWAYS	0x80
+#define FFB_CMP_MATCH_NEVER	0x81
+#define FFB_CMP_MATCH_EQ	0x82
+#define FFB_CMP_MATCH_NE	0x83
+#define FFB_CMP_MATCH_A_ALWAYS	0xc0
+#define FFB_CMP_MATCH_B_ALWAYS	0xa0
+
+/* Compare Magnitude codes */
+#define FFB_CMP_MAGN_EDIT_BIT	0x80
+#define FFB_CMP_MAGN_ALWAYS	0x80
+#define FFB_CMP_MAGN_GT		0x81
+#define FFB_CMP_MAGN_EQ		0x82
+#define FFB_CMP_MAGN_GE		0x83
+#define FFB_CMP_MAGN_NEVER	0x84
+#define FFB_CMP_MAGN_LE		0x85
+#define FFB_CMP_MAGN_NE		0x86
+#define FFB_CMP_MAGN_LT		0x87
+#define FFB_CMP_MAGN_A_ALWAYS	0xc0
+#define FFB_CMP_MAGN_B_ALWAYS	0xa0
+
+/* User Control and Status */
+#define FFB_UCSR_FIFO_MASK	0x00000fff
+#define FFB_UCSR_PICK_NO_HIT	0x00020000
+#define FFB_UCSR_PICK_HIT	0x00030000
+#define FFB_UCSR_PICK_DISABLE	0x00080000
+#define FFB_UCSR_PICK_ENABLE	0x000c0000
+#define FFB_UCSR_FB_BUSY	0x01000000
+#define FFB_UCSR_RP_BUSY	0x02000000
+#define FFB_UCSR_ALL_BUSY	(FFB_UCSR_RP_BUSY|FFB_UCSR_FB_BUSY)
+#define FFB_UCSR_READ_ERR	0x40000000
+#define FFB_UCSR_FIFO_OVFL	0x80000000
+#define FFB_UCSR_ALL_ERRORS	(FFB_UCSR_READ_ERR|FFB_UCSR_FIFO_OVFL)
+
+/* Mode Enable Register */
+#define FFB_MER_EIRA		0x00000080 /* Enable read-ahead, increasing */
+#define FFB_MER_EDRA		0x000000c0 /* Enable read-ahead, decreasing */
+#define FFB_MER_DRA		0x00000040 /* No read-ahead */
+
+/* FBram Config 0 */
+#define FFB_FBCFG0_RFTIME	0xff800000
+#define FFB_FBCFG0_XMAX		0x007c0000
+#define FFB_FBCFG0_YMAX		0x0003ffc0
+#define FFB_FBCFG0_RES_MASK	0x00000030
+#define FFB_FBCFG0_RES_HIGH	0x00000030 /* 1920x1360 */
+#define FFB_FBCFG0_RES_STD	0x00000020 /* 1280x1024 */
+#define FFB_FBCFG0_RES_STEREO	0x00000010 /* 960x580 */
+#define FFB_FBCFG0_RES_PRTRAIT	0x00000000 /* 1280x2048 */
+#define FFB_FBCFG0_ITRLACE	0x00000000
+#define FFB_FBCFG0_SEQUENTIAL	0x00000008
+#define FFB_FBCFG0_DRENA	0x00000004
+#define FFB_FBCFG0_BPMODE	0x00000002
+#define FFB_FBCFG0_RFRSH_RST	0x00000001
+
+typedef struct _ffb_dac {
+	volatile unsigned int	cfg;
+	volatile unsigned int	cfgdata;
+	volatile unsigned int	cur;
+	volatile unsigned int	curdata;
+} ffb_dac, *ffb_dacPtr;
+
+/* Writing 2 32-bit registers at a time using 64-bit stores. -DaveM */
+#if defined(__GNUC__) && defined(USE_VIS)
+/* 64-bit register writing support.
+ * Note: "lo" means "low address".
+ */
+#define FFB_WRITE64_COMMON(__regp, __lo32, __hi32, REG0, REG1) \
+do {	__extension__ register unsigned int __r0 __asm__(""#REG0); \
+	__extension__ register unsigned int __r1 __asm__(""#REG1); \
+	__r0 = (__lo32); \
+	__r1 = (__hi32); \
+	__asm__ __volatile__ ("sllx\t%0, 32, %%g1\n\t" \
+			      "srl\t%1, 0, %1\n\t" \
+			      "or\t%%g1, %1, %%g1\n\t" \
+			      "stx\t%%g1, %2" \
+	 : : "r" (__r0), "r" (__r1), "m" (*(__regp)) : "g1"); \
+} while(0)
+
+#define FFB_WRITE64P(__regp, __srcp) \
+do {	__asm__ __volatile__ ("ldx\t%0, %%g2;" \
+			      "stx\t%%g2, %1" \
+	 : : "m" (*(__srcp)), "m" (*(__regp)) \
+         : "g2"); \
+} while(0)			      
+
+#define FFB_WRITE64(__regp, __lo32, __hi32) \
+	FFB_WRITE64_COMMON(__regp, __lo32, __hi32, g2, g3)
+#define FFB_WRITE64_2(__regp, __lo32, __hi32) \
+	FFB_WRITE64_COMMON(__regp, __lo32, __hi32, g4, g5)
+#define FFB_WRITE64_3(__regp, __lo32, __hi32) \
+	FFB_WRITE64_COMMON(__regp, __lo32, __hi32, o4, o5)
+
+#else /* Do not use 64-bit writes. */
+
+#define FFB_WRITE64(__regp, __lo32, __hi32) \
+do {	volatile unsigned int *__p = (__regp); \
+	*__p = (__lo32); \
+	*(__p + 1) = (__hi32); \
+} while(0)
+
+#define FFB_WRITE64P(__regp, __srcp) \
+do {	volatile unsigned int *__p = (__regp); \
+	unsigned int *__q = (__srcp); \
+	*__p = *__q; \
+	*(__p + 1) = *(__q + 1); \
+} while(0)
+
+#define FFB_WRITE64_2(__regp, __lo32, __hi32) \
+	FFB_WRITE64(__regp, __lo32, __hi32)
+#define FFB_WRITE64_3(__regp, __lo32, __hi32) \
+	FFB_WRITE64(__regp, __lo32, __hi32)
+#endif
+
+#endif /* FFBREGS_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,196 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Segment rops.
+ *
+ * Copyright (C) 1998,1999,2000 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_loops.h"
+#include "ffb_stip.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+#include "miline.h"
+
+/* The general strategy is to do the drawing completely in hardware
+ * iff:
+ * 1) Single region rect
+ * 2) Both ends of the segment lie within it
+ */
+#define SEG_DRAWOP(__pgc) ((__pgc)->capStyle == CapNotLast ? \
+			   FFB_DRAWOP_BRLINEOPEN : \
+			   FFB_DRAWOP_BRLINECAP)
+static void
+ReloadSegmentAttrs(FFBPtr pFfb, CreatorPrivGCPtr gcPriv, GCPtr pGC, WindowPtr pWin)
+{
+	if(gcPriv->stipple == NULL) {
+		FFB_ATTR_GC(pFfb, pGC, pWin,
+			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+			    SEG_DRAWOP(pGC));
+	} else {
+		ffb_fbcPtr ffb = pFfb->regs;
+		unsigned int fbc;
+
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_DRAWOP(pFfb, ffb, SEG_DRAWOP(pGC));
+		fbc = FFB_FBC_WIN(pWin);
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+		FFB_WRITE_FBC(pFfb, ffb, fbc);
+	}
+}
+
+void
+CreatorPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pGC->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	BoxPtr extent;
+	int xorg, yorg, lpat;
+
+	if (nseg == 0)
+		return;
+
+	FFBLOG(("CreatorPolySegment: ALU(%x) PMSK(%08x) nseg(%d) lpat(%08x)\n",
+		pGC->alu, pGC->planemask, nseg, gcPriv->linepat));
+
+	if (gcPriv->stipple == NULL) {
+		FFB_ATTR_GC(pFfb, pGC, pWin,
+			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
+			    SEG_DRAWOP(pGC));
+	} else {
+		unsigned int fbc;
+
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_DRAWOP(pFfb, ffb, SEG_DRAWOP(pGC));
+		fbc = FFB_FBC_WIN(pWin);
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+		FFB_WRITE_FBC(pFfb, ffb, fbc);
+	}
+
+	pFfb->rp_active = 1;
+	xorg = pDrawable->x;
+	yorg = pDrawable->y;
+	extent = REGION_RECTS(cfbGetCompositeClip(pGC));
+	lpat = gcPriv->linepat;
+
+	if (lpat == 0) {
+		FFBFifo(pFfb, 1);
+		ffb->lpat = 0;
+		if (pFfb->has_brline_bug) {
+			while (nseg--) {
+				register int x1 = pSeg->x1 + xorg;
+				register int y1 = pSeg->y1 + yorg;
+				register int x2 = pSeg->x2 + xorg;
+				register int y2 = pSeg->y2 + yorg;
+
+				if (x1 >= extent->x1	&&
+				    x2 >= extent->x1	&&
+				    x1 < extent->x2	&&
+				    x2 < extent->x2	&&
+				    y1 >= extent->y1	&&
+				    y2 >= extent->y1	&&
+				    y1 < extent->y2	&&
+				    y2 < extent->y2) {
+					FFBFifo(pFfb, 5);
+					ffb->ppc = 0;
+					FFB_WRITE64(&ffb->by, y1, x1);
+					FFB_WRITE64_2(&ffb->bh, y2, x2);
+				} else {
+					gcPriv->PolySegment(pDrawable, pGC, 1, pSeg);
+					ReloadSegmentAttrs(pFfb, gcPriv, pGC, pWin);
+					pFfb->rp_active = 1;
+				}
+				pSeg++;
+			}
+		} else {
+			while (nseg--) {
+				register int x1 = pSeg->x1 + xorg;
+				register int y1 = pSeg->y1 + yorg;
+				register int x2 = pSeg->x2 + xorg;
+				register int y2 = pSeg->y2 + yorg;
+
+				if (x1 >= extent->x1	&&
+				    x2 >= extent->x1	&&
+				    x1 < extent->x2	&&
+				    x2 < extent->x2	&&
+				    y1 >= extent->y1	&&
+				    y2 >= extent->y1	&&
+				    y1 < extent->y2	&&
+				    y2 < extent->y2) {
+					FFBFifo(pFfb, 4);
+					FFB_WRITE64(&ffb->by, y1, x1);
+					FFB_WRITE64_2(&ffb->bh, y2, x2);
+				} else {
+					gcPriv->PolySegment(pDrawable, pGC, 1, pSeg);
+					ReloadSegmentAttrs(pFfb, gcPriv, pGC, pWin);
+					pFfb->rp_active = 1;
+				}
+				pSeg++;
+			}
+		}
+	} else {
+		/* No reason to optimize the non-brline bug case since
+		 * we have to write the line pattern register each loop
+		 * anyways.
+		 */
+		while (nseg--) {
+			register int x1 = pSeg->x1 + xorg;
+			register int y1 = pSeg->y1 + yorg;
+			register int x2 = pSeg->x2 + xorg;
+			register int y2 = pSeg->y2 + yorg;
+
+			if (x1 >= extent->x1	&&	x2 >= extent->x1	&&
+			    x1 < extent->x2	&&	x2 < extent->x2		&&
+			    y1 >= extent->y1	&&	y2 >= extent->y1	&&
+			    y1 < extent->y2	&&	y2 < extent->y2) {
+				FFBFifo(pFfb, 5);
+				ffb->lpat = lpat;
+				FFB_WRITE64(&ffb->by, y1, x1);
+				FFB_WRITE64_2(&ffb->bh, y2, x2);
+			} else {
+				gcPriv->PolySegment(pDrawable, pGC, 1, pSeg);
+				ReloadSegmentAttrs(pFfb, gcPriv, pGC, pWin);
+				pFfb->rp_active = 1;
+			}
+			pSeg++;
+		}
+	}
+
+	FFBSync(pFfb, ffb);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_sspans.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_sspans.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_sspans.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,166 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Set spans.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_sspans.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+/* PPC does all of the planemask and ROP'ing on the written pixels,
+ * and we know various other things are constant, so this is easy.
+ */
+static void
+CreatorSetScanline(int y, int xOrigin, int xStart, int xEnd,
+		   unsigned int *_psrc, char *sfb, int depth)
+{
+	if (depth == 8) {
+		unsigned char *psrc = (unsigned char *)_psrc;
+		unsigned char *pdst = (unsigned char *)(sfb +
+							(y << 11) +
+							(xStart << 0));
+		int w = xEnd - xStart;
+
+		psrc += (xStart - xOrigin);
+		while(w--)
+			*pdst++ = *psrc++;
+	} else {
+		unsigned int *psrc = (unsigned int *)_psrc;
+		unsigned int *pdst = (unsigned int *)(sfb +
+						      (y << 13) +
+						      (xStart << 2));
+		int w = xEnd - xStart;
+
+		psrc += (xStart - xOrigin);
+		while(w--)
+			*pdst++ = *psrc++;
+	}
+}
+
+void
+CreatorSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pcharsrc,
+		DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	unsigned int *psrc = (unsigned int *)pcharsrc;
+	BoxPtr pbox, pboxLast, pboxTest;
+	DDXPointPtr pptLast;
+	RegionPtr prgnDst;
+	char *addrp;
+	int xStart, xEnd, yMax;
+
+	if(pDrawable->type != DRAWABLE_WINDOW) {
+		if (pDrawable->bitsPerPixel == 8)
+			cfbSetSpans(pDrawable, pGC, pcharsrc, ppt,
+				    pwidth, nspans, fSorted);
+		else
+			cfb32SetSpans(pDrawable, pGC, pcharsrc, ppt,
+				      pwidth, nspans, fSorted);
+		return;
+	}
+	FFBLOG(("CreatorSetSpans: ALU(%x) PMSK(%08x) nspans(%d) fsorted(%d)\n",
+		pGC->alu, pGC->planemask, nspans, fSorted));
+	if (pGC->alu == GXnoop)
+		return;
+
+	/* Get SFB ready. */
+	FFB_ATTR_SFB_VAR_WIN(pFfb, pGC->planemask, pGC->alu, pWin);
+	FFBWait(pFfb, ffb);
+
+	if (pGC->depth == 8)
+		addrp = (char *) pFfb->sfb8r;
+	else
+		addrp = (char *) pFfb->sfb32;
+
+	yMax = (int) pDrawable->y + (int) pDrawable->height;
+	prgnDst = cfbGetCompositeClip(pGC);
+	pbox = REGION_RECTS(prgnDst);
+	pboxLast = pbox + REGION_NUM_RECTS(prgnDst);
+	pptLast = ppt + nspans;
+	if(fSorted) {
+		pboxTest = pbox;
+		while(ppt < pptLast) {
+			pbox = pboxTest;
+			if(ppt->y >= yMax)
+				break;
+			while(pbox < pboxLast) {
+				if(pbox->y1 > ppt->y) {
+					break;
+				} else if(pbox->y2 <= ppt->y) {
+					pboxTest = ++pbox;
+					continue;
+				} else if(pbox->x1 > ppt->x + *pwidth) {
+					break;
+				} else if(pbox->x2 <= ppt->x) {
+					pbox++;
+					continue;
+				}
+				xStart = max(pbox->x1, ppt->x);
+				xEnd = min(ppt->x + *pwidth, pbox->x2);
+				CreatorSetScanline(ppt->y, ppt->x, xStart, xEnd,
+						   psrc, addrp, pGC->depth);
+				if(ppt->x + *pwidth <= pbox->x2)
+					break;
+				else
+					pbox++;
+			}
+			ppt++;
+			psrc += *pwidth++;
+		}
+	} else {
+		while(ppt < pptLast) {
+			if(ppt->y >= 0 && ppt->y < yMax) {
+				for(pbox = REGION_RECTS(prgnDst); pbox < pboxLast; pbox++) {
+					if(pbox->y1 > ppt->y) {
+						break;
+					} else if(pbox->y2 <= ppt->y) {
+						pbox++;
+						break;
+					}
+					if(pbox->x1 <= ppt->x + *pwidth &&
+					   pbox->x2 > ppt->x) {
+						xStart = max(pbox->x1, ppt->x);
+						xEnd = min(pbox->x2, ppt->x + *pwidth);
+						CreatorSetScanline(ppt->y, ppt->x,
+								   xStart, xEnd,
+								   psrc, addrp, pGC->depth);
+					}
+				}
+			}
+			ppt++;
+			psrc += *pwidth++;
+		}
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,64 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - stipple setting.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_stip.h"
+#include "ffb_loops.h"
+
+void
+FFBSetStipple(FFBPtr pFfb, ffb_fbcPtr ffb,
+	      CreatorStipplePtr stipple,
+	      unsigned int ppc, unsigned int ppc_mask)
+{
+	int transparent = ((stipple->alu & FFB_ROP_EDIT_BIT) != 0);
+
+	if(transparent)
+		ppc |= FFB_PPC_APE_ENABLE|FFB_PPC_TBE_TRANSPARENT;
+	else
+		ppc |= FFB_PPC_APE_ENABLE|FFB_PPC_TBE_OPAQUE;
+	ppc_mask |= FFB_PPC_APE_MASK|FFB_PPC_TBE_MASK;
+	FFB_WRITE_PPC(pFfb, ffb, ppc, ppc_mask);
+	FFB_WRITE_ROP(pFfb, ffb,
+		      (FFB_ROP_EDIT_BIT|stipple->alu)| (FFB_ROP_NEW<<8));
+
+	if (stipple->inhw && pFfb->laststipple == stipple) {
+		FFB_WRITE_FG(pFfb, ffb, stipple->fg);
+		if(!transparent)
+			FFB_WRITE_BG(pFfb, ffb, stipple->bg);
+		return;
+	}
+	FFBFifo(pFfb, 32);
+	FFB_STIPPLE_LOAD(&ffb->pattern[0], &stipple->bits[0]);
+	FFB_WRITE_FG(pFfb, ffb, stipple->fg);
+	if(!transparent)
+		FFB_WRITE_BG(pFfb, ffb, stipple->bg);
+	stipple->inhw = 1;
+	pFfb->laststipple = stipple;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.h	Thu May 18 16:21:38 2000
@@ -0,0 +1,36 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - stipple defines.
+ *
+ * Copyright (C) 1998,1999 Jakub Jelinek (jakub@redhat.com)
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.h,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
+
+#ifndef FFBSTIP_H
+#define FFBSTIP_H
+
+extern void FFBSetStipple(FFBPtr pFfb,
+			  ffb_fbcPtr ffb,
+			  CreatorStipplePtr stipple,
+			  unsigned int ppc, unsigned int ppc_mask);
+
+#endif /* FFBSTIP_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stubs.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stubs.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stubs.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,544 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Unaccelerated stuff.
+ *
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999 Jakub Jelinek   (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stubs.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+/* CFB is just too clever for it's own good.  There are paths
+ * in cfb for 8bpp that just arbitrarily change the ROP of the
+ * GC and assume it just works even without revalidating that
+ * GC.  So for now we turn this stuff off.  -DaveM
+ */
+#undef USE_SFB_TRICKS
+
+#ifdef USE_SFB_TRICKS
+/* Sorry, have to expose some CFB internals to get the stubs right. -DaveM */
+struct cfb_gcstate {
+	unsigned long pmask;
+	int alu, rop, and, xor;
+};
+
+#define CFB_STATE_SAVE(__statep, __gcp, __privp) \
+do {	(__statep)->pmask = (__gcp)->planemask; \
+	(__statep)->alu = (__gcp)->alu; \
+	(__statep)->rop = (__privp)->rop; \
+	(__statep)->and = (__privp)->and; \
+	(__statep)->xor = (__privp)->xor; \
+} while(0)
+
+#define CFB_STATE_RESTORE(__statep, __gcp, __privp) \
+do {	(__gcp)->planemask = (__statep)->pmask; \
+	(__gcp)->alu = (__statep)->alu; \
+	(__privp)->rop = (__statep)->rop; \
+	(__privp)->and = (__statep)->and; \
+	(__privp)->xor = (__statep)->xor; \
+} while(0)
+
+#define CFB_STATE_SET_SFB(__gcp, __privp) \
+do {	(__gcp)->alu = GXcopy; \
+	(__gcp)->planemask = (((__gcp)->depth==8)?0xff:0xffffff); \
+	(__privp)->rop = GXcopy; \
+	(__privp)->and = 0; \
+	(__privp)->xor = (__gcp)->fgPixel; \
+} while(0)
+#endif
+
+/* Stubs so we can wait for the raster processor to
+ * unbusy itself before we let the cfb code write
+ * directly to the framebuffer.
+ */
+void
+CreatorSolidSpansGeneralStub (DrawablePtr pDrawable, GCPtr pGC,
+			      int nInit, DDXPointPtr pptInit,
+			      int *pwidthInit, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbSolidSpansGeneral(pDrawable, pGC, nInit, pptInit,
+				     pwidthInit, fSorted);
+	else
+		cfb32SolidSpansGeneral(pDrawable, pGC, nInit, pptInit,
+				       pwidthInit, fSorted);
+}
+
+void
+CreatorSegmentSSStub (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8) {
+		if (devPriv->oneRect &&
+		    ((pDrawable->x >= pGC->pScreen->width - 32768) &&
+		     (pDrawable->y >= pGC->pScreen->height - 32768)))
+			cfb8SegmentSS1Rect(pDrawable, pGC, nseg, pSeg);
+		else
+			cfbSegmentSS(pDrawable, pGC, nseg, pSeg);
+	} else
+		cfb32SegmentSS(pDrawable, pGC, nseg, pSeg);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8) {
+		if (devPriv->oneRect &&
+		    ((pDrawable->x >= pGC->pScreen->width - 32768) &&
+		     (pDrawable->y >= pGC->pScreen->height - 32768)))
+			cfb8SegmentSS1Rect(pDrawable, pGC, nseg, pSeg);
+		else
+			cfbSegmentSS(pDrawable, pGC, nseg, pSeg);
+	} else
+		cfb32SegmentSS(pDrawable, pGC, nseg, pSeg);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorLineSSStub (DrawablePtr pDrawable, GCPtr pGC,
+		   int mode, int npt, DDXPointPtr ppt)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8) {
+		if (devPriv->oneRect &&
+		    ((pDrawable->x >= pGC->pScreen->width - 32768) &&
+		     (pDrawable->y >= pGC->pScreen->height - 32768)))
+			cfb8LineSS1Rect(pDrawable, pGC, mode, npt, ppt);
+		else
+			cfbLineSS(pDrawable, pGC, mode, npt, ppt);
+	} else
+		cfb32LineSS(pDrawable, pGC, mode, npt, ppt);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8) {
+		if (devPriv->oneRect &&
+		    ((pDrawable->x >= pGC->pScreen->width - 32768) &&
+		     (pDrawable->y >= pGC->pScreen->height - 32768)))
+			cfb8LineSS1Rect(pDrawable, pGC, mode, npt, ppt);
+		else
+			cfbLineSS(pDrawable, pGC, mode, npt, ppt);
+	} else
+		cfb32LineSS(pDrawable, pGC, mode, npt, ppt);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorSegmentSDStub (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbSegmentSD(pDrawable, pGC, nseg, pSeg);
+	else
+		cfb32SegmentSD(pDrawable, pGC, nseg, pSeg);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbSegmentSD(pDrawable, pGC, nseg, pSeg);
+	else
+		cfb32SegmentSD(pDrawable, pGC, nseg, pSeg);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorLineSDStub (DrawablePtr pDrawable, GCPtr pGC,
+		   int mode, int npt, DDXPointPtr ppt)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbLineSD(pDrawable, pGC, mode, npt, ppt);
+	else
+		cfb32LineSD(pDrawable, pGC, mode, npt, ppt);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbLineSD(pDrawable, pGC, mode, npt, ppt);
+	else
+		cfb32LineSD(pDrawable, pGC, mode, npt, ppt);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorPolyGlyphBlt8Stub (DrawablePtr pDrawable, GCPtr pGC,
+			  int x, int y, unsigned int nglyph, CharInfoPtr *ppci,
+			  pointer pglyphBase)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbPolyGlyphBlt8(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+	else
+		cfb32PolyGlyphBlt8(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbPolyGlyphBlt8(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+	else
+		cfb32PolyGlyphBlt8(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorImageGlyphBlt8Stub (DrawablePtr pDrawable, GCPtr pGC,
+			   int x, int y, unsigned int nglyph,
+			   CharInfoPtr *ppci, pointer pglyphBase)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbImageGlyphBlt8(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+	else
+		cfb32ImageGlyphBlt8(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbImageGlyphBlt8(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+	else
+		cfb32ImageGlyphBlt8(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorTile32FSCopyStub(DrawablePtr pDrawable, GCPtr pGC,
+			int nInit, DDXPointPtr pptInit,
+			int *pwidthInit, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbTile32FSCopy(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	else
+		cfb32Tile32FSCopy(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbTile32FSCopy(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	else
+		cfb32Tile32FSCopy(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorTile32FSGeneralStub(DrawablePtr pDrawable, GCPtr pGC,
+			   int nInit, DDXPointPtr pptInit,
+			   int *pwidthInit, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbTile32FSGeneral(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	else
+		cfb32Tile32FSGeneral(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbTile32FSGeneral(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	else
+		cfb32Tile32FSGeneral(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorUnnaturalTileFSStub(DrawablePtr pDrawable, GCPtr pGC,
+			   int nInit, DDXPointPtr pptInit,
+			   int *pwidthInit, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	else
+		cfb32UnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	else
+		cfb32UnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+Creator8Stipple32FSStub(DrawablePtr pDrawable, GCPtr pGC,
+			int nInit, DDXPointPtr pptInit,
+			int *pwidthInit, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	cfb8Stipple32FS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	cfb8Stipple32FS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorUnnaturalStippleFSStub(DrawablePtr pDrawable, GCPtr pGC,
+			      int nInit, DDXPointPtr pptInit,
+			      int *pwidthInit, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	else
+		cfb32UnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	else
+		cfb32UnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+Creator8OpaqueStipple32FSStub(DrawablePtr pDrawable, GCPtr pGC,
+			      int nInit, DDXPointPtr pptInit,
+			      int *pwidthInit, int fSorted)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	cfb8OpaqueStipple32FS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	cfb8OpaqueStipple32FS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
+
+void
+CreatorPolyFillRectStub(DrawablePtr pDrawable, GCPtr pGC,
+			int nrectFill, xRectangle *prectInit)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+#ifdef USE_SFB_TRICKS
+	struct cfb_gcstate cfb_state;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+#endif
+
+	FFBLOG(("STUB(%s:%d)\n", __FILE__, __LINE__));
+#ifndef USE_SFB_TRICKS
+	FFB_ATTR_SFB_VAR_WIN(pFfb, 0xffffffff, GXcopy, pWin);
+	FFBWait(pFfb, ffb);
+	if (pGC->depth == 8)
+		cfbPolyFillRect(pDrawable, pGC, nrectFill, prectInit);
+	else
+		cfb32PolyFillRect(pDrawable, pGC, nrectFill, prectInit);
+#else
+	CFB_STATE_SAVE(&cfb_state, pGC, devPriv);
+	FFB_ATTR_SFB_VAR_WIN(pFfb, cfb_state.pmask, cfb_state.alu, pWin);
+	FFBWait(pFfb, ffb);
+	CFB_STATE_SET_SFB(pGC, devPriv);
+	if (pGC->depth == 8)
+		cfbPolyFillRect(pDrawable, pGC, nrectFill, prectInit);
+	else
+		cfb32PolyFillRect(pDrawable, pGC, nrectFill, prectInit);
+	CFB_STATE_RESTORE(&cfb_state, pGC, devPriv);
+#endif
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wid.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wid.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wid.c	Mon Jun 19 22:08:48 2000
@@ -0,0 +1,461 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - WID pool management.
+ *
+ * Copyright (C) 2000 David S. Miller (davem@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wid.c,v 1.2 2000/06/20 05:08:48 dawes Exp $ */
+
+#include "ffb.h"
+
+static void
+determine_numwids(FFBPtr pFfb)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+
+	if (p->flags & FFB_DAC_PAC1)
+		p->wid_table.num_wids = 32;
+	else
+		p->wid_table.num_wids = 64;
+}
+
+static void
+make_wlut_regval(ffb_dac_info_t *p, ffb_wid_info_t *wid)
+{
+	wid->wlut_regval = 0;
+
+	if (p->flags & FFB_DAC_PAC1) {
+		unsigned int color_model_bits;
+
+		/* Pacifica1 format */
+		if (wid->buffer != 0)
+			wid->wlut_regval |= FFBDAC_PAC1_WLUT_DB;
+
+		if (wid->depth == 8) {
+			if (wid->greyscale) {
+				if (wid->linear)
+					color_model_bits = FFBDAC_PAC1_WLUT_C_8LG;
+				else
+					color_model_bits = FFBDAC_PAC1_WLUT_C_8NG;
+			} else {
+				color_model_bits = FFBDAC_PAC1_WLUT_C_8P;
+			}
+		} else {
+			if (wid->direct) {
+				color_model_bits = FFBDAC_PAC1_WLUT_C_24D;
+			} else {
+				if (wid->linear)
+					color_model_bits = FFBDAC_PAC1_WLUT_C_24LT;
+				else
+					color_model_bits = FFBDAC_PAC1_WLUT_C_24NT;
+			}
+		}
+
+		wid->wlut_regval |= color_model_bits;
+
+		switch (wid->channel) {
+		default:
+		case 0:
+			wid->wlut_regval |= FFBDAC_PAC1_WLUT_P_XO;
+			break;
+		case 1:
+			wid->wlut_regval |= FFBDAC_PAC1_WLUT_P_R;
+			break;
+		case 2:
+			wid->wlut_regval |= FFBDAC_PAC1_WLUT_P_G;
+			break;
+		case 3:
+			wid->wlut_regval |= FFBDAC_PAC1_WLUT_P_B;
+			break;
+		};
+	} else {
+		/* Pacifica2 format */
+		if (wid->buffer != 0)
+			wid->wlut_regval |= FFBDAC_PAC2_WLUT_DB;
+
+		if (wid->depth == 24)
+			wid->wlut_regval |= FFBDAC_PAC2_WLUT_DEPTH;
+
+		switch (wid->channel) {
+		default:
+		case 0:
+			wid->wlut_regval |= FFBDAC_PAC2_WLUT_P_XO;
+			break;
+		case 1:
+			wid->wlut_regval |= FFBDAC_PAC2_WLUT_P_R;
+			break;
+		case 2:
+			wid->wlut_regval |= FFBDAC_PAC2_WLUT_P_G;
+			break;
+		case 3:
+			wid->wlut_regval |= FFBDAC_PAC2_WLUT_P_B;
+			break;
+		};
+
+		if ((wid->depth == 8 && wid->greyscale == 0) ||
+		    (wid->depth == 24 && wid->direct != 0))
+			wid->wlut_regval |= FFBDAC_PAC2_WLUT_LKUP;
+
+		if (wid->palette != -1)
+			wid->wlut_regval |=
+				((wid->palette << 4) & FFBDAC_PAC2_WLUT_PTBL);
+	}
+}
+
+static void
+init_wid_table(FFBPtr pFfb)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_wid_pool_t *table = &p->wid_table;
+	int i;
+
+	for (i = 0; i < table->num_wids; i++) {
+		table->wid_pool[i].InUse = FALSE;
+		table->wid_pool[i].buffer = 0;
+		table->wid_pool[i].depth = 24;
+		table->wid_pool[i].greyscale = 0;
+		table->wid_pool[i].linear = 0;
+		table->wid_pool[i].direct = 0;
+		table->wid_pool[i].channel = 0;
+		table->wid_pool[i].palette = -1;
+		make_wlut_regval(p, &table->wid_pool[i]);
+	}
+
+	table->wid_pool[table->num_wids - 1].InUse = TRUE;
+	table->wid_pool[table->num_wids - 1].canshare = FALSE;
+}
+
+static void
+init_hw_wids(FFBPtr pFfb)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_dacPtr dac = pFfb->dac;
+	ffb_wid_pool_t *table = &p->wid_table;
+	int i;
+
+	if (p->flags & FFB_DAC_PAC1)
+		dac->cfg = FFBDAC_PAC1_APWLUT_BASE;
+	else
+		dac->cfg = FFBDAC_PAC2_APWLUT_BASE;
+	for (i = 0; i < table->num_wids; i++)
+		dac->cfgdata = table->wid_pool[i].wlut_regval;
+
+	if (p->flags & FFB_DAC_PAC1)
+		dac->cfg = FFBDAC_PAC1_SPWLUT_BASE;
+	else
+		dac->cfg = FFBDAC_PAC2_SPWLUT_BASE;
+	for (i = 0; i < table->num_wids; i++)
+		dac->cfgdata = table->wid_pool[i].wlut_regval;
+}
+
+static void
+init_hw_widmode(FFBPtr pFfb)
+{
+	ffb_dacPtr dac = pFfb->dac;
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	unsigned int uctrl;
+
+	/* For now we use the Combined WID mode until I figure
+	 * out exactly how Seperate4 and Seperate8 work.  We
+	 * also disable overlays for the time being.
+	 */
+	p->wid_table.wid_shift = 0;
+
+	dac->cfg = FFBDAC_CFG_UCTRL;
+	uctrl = dac->cfgdata;
+	uctrl &= ~FFBDAC_UCTRL_WMODE;
+	uctrl |= FFBDAC_UCTRL_WM_COMB;
+	uctrl &= ~FFBDAC_UCTRL_OVENAB;
+	dac->cfg = FFBDAC_CFG_UCTRL;
+	dac->cfgdata = uctrl;
+}
+
+void
+FFBWidPoolInit(FFBPtr pFfb)
+{
+	determine_numwids(pFfb);
+	init_wid_table(pFfb);
+	init_hw_wids(pFfb);
+	init_hw_widmode(pFfb);
+}
+
+static void
+update_wids(FFBPtr pFfb, int index)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_dacPtr dac = pFfb->dac;
+	unsigned int base;
+	int limit;
+
+	if (p->flags & FFB_DAC_PAC1)
+		base = FFBDAC_PAC1_SPWLUT(index);
+	else
+		base = FFBDAC_PAC2_SPWLUT(index);
+	DACCFG_WRITE(dac, base, p->wid_table.wid_pool[index].wlut_regval);
+
+	/* Schedule the window transfer. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_WTCTRL, 
+		     (FFBDAC_CFG_WTCTRL_TCMD | FFBDAC_CFG_WTCTRL_TE));
+
+	limit = 1000000;
+	while (limit--) {
+		unsigned int wtctrl = DACCFG_READ(dac, FFBDAC_CFG_WTCTRL);
+
+		if ((wtctrl & FFBDAC_CFG_WTCTRL_DS) == 0)
+			break;
+	}
+}
+
+unsigned int
+FFBWidAlloc(FFBPtr pFfb, int visclass, int cmap, Bool canshare)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_wid_pool_t *table = &p->wid_table;
+	int i, depth, direct, static_greyscale, palette, channel;
+
+	direct = 0;
+	static_greyscale = 0;
+	switch (visclass) {
+	case StaticGray:
+		static_greyscale = 1;
+		/* Fallthrough... */
+	case StaticColor:
+	case GrayScale:
+	case PseudoColor:
+		depth = 8;
+		channel = 1;
+		break;
+
+	case DirectColor:
+		direct = 1;
+		/* Fallthrough... */
+	case TrueColor:
+		depth = 24;
+		channel = 0;
+		break;
+
+	default:
+		return (unsigned int) -1;
+	};
+
+	palette = -1;
+	if (p->flags & FFB_DAC_PAC1) {
+		if (visclass == PseudoColor ||
+		    visclass == GrayScale ||
+		    visclass == DirectColor)
+			palette = 0;
+	} else {
+		if (visclass == PseudoColor)
+			palette = 0;
+		if (visclass == GrayScale)
+			palette = 1;
+		if (visclass == DirectColor)
+			palette = 2;
+	}
+
+	if (canshare) {
+		for (i = 0; i < table->num_wids; i++) {
+			if (table->wid_pool[i].InUse == TRUE &&
+			    table->wid_pool[i].canshare == TRUE &&
+			    table->wid_pool[i].palette == palette &&
+			    table->wid_pool[i].direct == direct &&
+			    table->wid_pool[i].greyscale == static_greyscale &&
+			    table->wid_pool[i].channel == channel &&
+			    table->wid_pool[i].depth == depth) {
+				table->wid_pool[i].refcount++;
+				return i << table->wid_shift;
+			}
+		}
+	}
+
+	for (i = 0; i < table->num_wids; i++) {
+		if (table->wid_pool[i].InUse == FALSE)
+			break;
+	}
+
+	if (i != table->num_wids) {
+		table->wid_pool[i].InUse = TRUE;
+		table->wid_pool[i].buffer = 0;
+		table->wid_pool[i].depth = depth;
+		table->wid_pool[i].palette = palette;
+		table->wid_pool[i].direct = direct;
+		table->wid_pool[i].greyscale = static_greyscale;
+		if (depth == 8)
+			table->wid_pool[i].channel = 1;
+		else
+			table->wid_pool[i].channel = 0;
+		table->wid_pool[i].refcount = 1;
+		table->wid_pool[i].canshare = canshare;
+		make_wlut_regval(p, &table->wid_pool[i]);
+		update_wids(pFfb, i);
+		return i << table->wid_shift;
+	}
+
+	return (unsigned int) -1;
+}
+
+void
+FFBWidFree(FFBPtr pFfb, unsigned int wid)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_wid_pool_t *table = &p->wid_table;
+	int index = wid >> table->wid_shift;
+
+	if (index < 0 || index >= table->num_wids) {
+		return;
+	}
+
+	if (--table->wid_pool[index].refcount == 0) {
+		table->wid_pool[index].InUse = FALSE;
+	}
+}
+
+/* Double Buffering support. */
+
+unsigned int
+FFBWidUnshare(FFBPtr pFfb, unsigned int wid)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_wid_pool_t *table = &p->wid_table;
+	int index = wid >> table->wid_shift;
+	int i;
+
+	if (index < 0 || index >= table->num_wids) {
+		return (unsigned int) -1;
+	}
+
+	for (i = 0; i < table->num_wids; i++) {
+		if (table->wid_pool[i].InUse == FALSE)
+			break;
+	}
+
+	if (i == table->num_wids) {
+		return (unsigned int) -1;
+	}
+
+	table->wid_pool[i].InUse = TRUE;
+	table->wid_pool[i].buffer = 0;
+	table->wid_pool[i].depth = table->wid_pool[index].depth;
+	table->wid_pool[i].palette = table->wid_pool[index].palette;
+	table->wid_pool[i].direct = table->wid_pool[index].direct;
+	table->wid_pool[i].greyscale = table->wid_pool[index].greyscale;
+	table->wid_pool[i].channel = table->wid_pool[index].channel;
+	table->wid_pool[i].refcount = 1;
+	table->wid_pool[i].canshare = FALSE;
+	make_wlut_regval(p, &table->wid_pool[i]);
+	update_wids(pFfb, i);
+
+	/* Now free the original WID. */
+	if (--table->wid_pool[index].refcount == 0) {
+		table->wid_pool[index].InUse = FALSE;
+	}
+
+	return i << table->wid_shift;
+}
+
+unsigned int
+FFBWidReshare(FFBPtr pFfb, unsigned int wid)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_wid_pool_t *table = &p->wid_table;
+	int index = wid >> table->wid_shift;
+	int i;
+
+	if (index < 0 || index >= table->num_wids) {
+		return wid;
+	}
+
+	for (i = 0; i < table->num_wids; i++) {
+		if (table->wid_pool[i].InUse == TRUE &&
+		    table->wid_pool[i].canshare == TRUE &&
+		    table->wid_pool[i].depth == table->wid_pool[index].depth &&
+		    table->wid_pool[i].palette == table->wid_pool[index].palette &&
+		    table->wid_pool[i].direct == table->wid_pool[index].direct &&
+		    table->wid_pool[i].greyscale == table->wid_pool[index].greyscale &&
+		    table->wid_pool[i].channel == table->wid_pool[index].channel)
+			break;
+	}
+
+	if (i == table->num_wids) {
+		/* OK, very simple, just make the old one shared. */
+		table->wid_pool[index].canshare = TRUE;
+		table->wid_pool[index].buffer = 0;
+		make_wlut_regval(p, &table->wid_pool[index]);
+		update_wids(pFfb, index);
+		return wid;
+	}
+
+	/* Ok, free the original WID. */
+	if (--table->wid_pool[index].refcount == 0) {
+		table->wid_pool[index].InUse = FALSE;
+	}
+
+	/* And grab a reference to the new one. */
+	table->wid_pool[i].refcount++;
+
+	/* And return the shared one. */
+	return i << table->wid_shift;
+}
+
+void
+FFBWidChangeBuffer(FFBPtr pFfb, unsigned int wid, int visible)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_wid_pool_t *table = &p->wid_table;
+	int index = wid >> table->wid_shift;
+	int buffer;
+
+	if (index < 0 || index >= table->num_wids)
+		return;
+
+	buffer = (table->wid_pool[index].buffer ^= 1);
+	if (visible) {
+		unsigned int bit;
+
+		if (p->flags & FFB_DAC_PAC1)
+			bit = FFBDAC_PAC1_WLUT_DB;
+		else
+			bit = FFBDAC_PAC2_WLUT_DB;
+
+		if (buffer)
+			table->wid_pool[index].wlut_regval |= bit;
+		else
+			table->wid_pool[index].wlut_regval &= ~bit;
+
+		update_wids(pFfb, index);
+	}
+}
+
+/* Used by DRI part of driver. */
+Bool
+FFBWidIsShared(FFBPtr pFfb, unsigned int wid)
+{
+	ffb_dac_info_t *p = &pFfb->dac_info;
+	ffb_wid_pool_t *table = &p->wid_table;
+	int index = wid >> table->wid_shift;
+
+	if (index < 0 || index >= table->num_wids)
+		return TRUE;
+
+	if (table->wid_pool[index].canshare == TRUE)
+		return TRUE;
+
+	return FALSE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wline.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wline.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wline.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,897 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Wide line rops.
+ *
+ * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wline.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#define PSZ 32
+
+#include <math.h>
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+
+#include "miwideline.h"
+
+#error If we start using this again, need to fixup FFB_WRITE_ATTRIBUTES for wids -DaveM
+
+/* Wheee, wide lines... */
+extern int miPolyBuildEdge();
+
+static int LeftClip, RightClip, TopClip, BottomClip;
+
+#define Y_IN_BOX(y)	(((y) >= TopClip) && ((y) <= BottomClip))
+#define CLIPSTEPEDGE(edgey,edge,edgeleft)	\
+if (ybase == edgey) {				\
+	if (edgeleft) {				\
+		if (edge->x > xcl)		\
+			xcl = edge->x;		\
+	} else {				\
+		if (edge->x < xcr)		\
+			xcr = edge->x;		\
+	}					\
+	edgey++;				\
+	edge->x += edge->stepx;			\
+	edge->e += edge->dx;			\
+	if (edge->e > 0) {			\
+		edge->x += edge->signdx;	\
+		edge->e -= edge->dy;		\
+	}					\
+}
+
+#define CreatorPointHelper(pFfb, x, y)			\
+do {								\
+	ffb_fbcPtr ffb = (pFfb)->regs;			\
+	FFB_WRITE_DRAWOP((pFfb), ffb, FFB_DRAWOP_DOT);	\
+	FFBFifo(pFfb, 2);					\
+	FFB_WRITE64(&ffb->bh, (y), (x));			\
+} while (0)
+
+static void CreatorFillRectHelper(FFBPtr pFfb,
+				  int x, int y, int dx, int dy)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+	int x2 = x + dx - 1;
+	int y2 = y + dy - 1;
+	
+	if(x < LeftClip)
+		x = LeftClip;
+	if(x2 > RightClip)
+		x2 = RightClip;
+	if(y < TopClip)
+		y = TopClip;
+	if(y2 > BottomClip)
+		y2 = BottomClip;
+
+	dx = x2 - x + 1;
+	dy = y2 - y + 1;
+
+	if((dx > 0) && (dy > 0)) {
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+		FFBFifo(pFfb, 4);
+		FFB_WRITE64(&ffb->by, y, x);
+		FFB_WRITE64_2(&ffb->bh, dy, dx);
+	}
+}
+
+/* The span helper does not check for y being clipped, caller beware */
+static void CreatorSpanHelper(FFBPtr pFfb,
+			      int x1, int y, int width)
+{
+	ffb_fbcPtr ffb = pFfb->regs;
+	int x2 = x1 + width - 1;
+
+	if(x1 < LeftClip)
+		x1 = LeftClip;
+	if(x2 > RightClip)
+		x2 = RightClip;
+	width = x2 - x1 + 1;	
+
+	if(width > 0) {
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_RECTANGLE);
+		FFBFifo(pFfb, 4);
+		FFB_WRITE64(&ffb->by, y, x1);
+		FFB_WRITE64_2(&ffb->bh, 1, width);
+	}
+}
+
+#define FixError(x, dx, dy, e, sign, step, h)	{	\
+	e += (h) * dx;					\
+	x += (h) * step;				\
+	if(e > 0) {					\
+		x += e * sign/dy;			\
+		e %= dy;				\
+		if(e) {					\
+			x += sign;			\
+			e -= dy;			\
+		}					\
+	} 	 					\
+}
+
+static void
+CreatorFillPolyHelper (DrawablePtr pDrawable, GCPtr pGC,
+		       int y, int overall_height,
+		       PolyEdgePtr left, PolyEdgePtr right, 
+		       int left_count, int right_count)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	int left_x, left_e, left_stepx, left_signdx, left_dy, left_dx;
+	int right_x, right_e, right_stepx, right_signdx, right_dy, right_dx, height;
+	int left_height = 0;
+	int right_height = 0;
+	int xorg = 0;
+    
+	if (pGC->miTranslate) {
+		y += pDrawable->y;
+		xorg = pDrawable->x;
+	}
+
+	while ((left_count || left_height) && (right_count || right_height)) {
+		if (!left_height && left_count) { 
+			left_height = left->height; 
+			left_x = left->x + xorg; 
+			left_stepx = left->stepx; 
+			left_signdx = left->signdx; 
+			left_e = left->e; 
+			left_dy = left->dy; 
+			left_dx = left->dx; 
+			left_count--; 
+			left++;
+		}
+		if (!right_height && right_count) { 
+			right_height = right->height; 
+			right_x = right->x + xorg + 1; 
+			right_stepx = right->stepx; 
+			right_signdx = right->signdx; 
+			right_e = right->e; 
+			right_dy = right->dy; 
+			right_dx = right->dx; 
+			right_count--; 
+			right++; 
+		}
+
+		height = (left_height > right_height) ? right_height : left_height;
+
+		left_height -= height;
+		right_height -= height;
+		while (height--) {
+			if((right_x > left_x) && Y_IN_BOX(y))
+				CreatorSpanHelper(pFfb, left_x, y, right_x - left_x);
+
+			y++;
+    	
+			left_x += left_stepx; 
+			left_e += left_dx; 
+			if (left_e > 0) { 
+				left_x += left_signdx; 
+				left_e -= left_dy; 
+			}
+			right_x += right_stepx; 
+			right_e += right_dx; 
+			if (right_e > 0) { 
+				right_x += right_signdx; 
+				right_e -= right_dy; 
+			}
+		}
+	}
+}
+
+static void
+CreatorWideSegment (DrawablePtr pDrawable, GCPtr pGC,
+		    int x1, int y1, int x2, int y2, 
+		    Bool projectLeft, Bool projectRight,
+		    LineFacePtr leftFace, LineFacePtr rightFace)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	double l, L, r, xa, ya, projectXoff, projectYoff, k, maxy;
+	int x, y, dx, dy, finaly, lefty, righty, topy, bottomy, signdx;
+	PolyEdgePtr left, right, top, bottom;
+	PolyEdgeRec lefts[2], rights[2];
+	LineFacePtr tface;
+	int lw = pGC->lineWidth;
+
+	/* draw top-to-bottom always */
+	if (y2 < y1 || y2 == y1 && x2 < x1) {
+		x = x1;
+		x1 = x2;
+		x2 = x;
+
+		y = y1;
+		y1 = y2;
+		y2 = y;
+
+		x = projectLeft;
+		projectLeft = projectRight;
+		projectRight = x;
+
+		tface = leftFace;
+		leftFace = rightFace;
+		rightFace = tface;
+	}
+
+	dy = y2 - y1;
+	signdx = 1;
+	dx = x2 - x1;
+	if (dx < 0)
+		signdx = -1;
+
+	leftFace->x = x1;
+	leftFace->y = y1;
+	leftFace->dx = dx;
+	leftFace->dy = dy;
+
+	rightFace->x = x2;
+	rightFace->y = y2;
+	rightFace->dx = -dx;
+	rightFace->dy = -dy;
+
+	if (!dy) {
+		rightFace->xa = 0;
+		rightFace->ya = (double) lw / 2.0;
+		rightFace->k = -(double) (lw * dx) / 2.0;
+		leftFace->xa = 0;
+		leftFace->ya = -rightFace->ya;
+		leftFace->k = rightFace->k;
+		x = x1;
+		if (projectLeft)
+			x -= (lw >> 1);
+		y = y1 - (lw >> 1);
+		dx = x2 - x;
+		if (projectRight)
+			dx += (lw + 1 >> 1);
+		dy = lw;
+		if(pGC->miTranslate) {
+			x += pDrawable->x;
+			y += pDrawable->y;
+		}
+		CreatorFillRectHelper(pFfb, x, y, dx, dy);	
+	} else if (!dx) {
+		leftFace->xa =  (double) lw / 2.0;
+		leftFace->ya = 0;
+		leftFace->k = (double) (lw * dy) / 2.0;
+		rightFace->xa = -leftFace->xa;
+		rightFace->ya = 0;
+		rightFace->k = leftFace->k;
+		y = y1;
+		if (projectLeft)
+			y -= lw >> 1;
+		x = x1 - (lw >> 1);
+		dy = y2 - y;
+		if (projectRight)
+			dy += (lw + 1 >> 1);
+		dx = lw;
+		if(pGC->miTranslate) {
+			x += pDrawable->x;
+			y += pDrawable->y;
+		}
+		CreatorFillRectHelper(pFfb, x, y, dx, dy);
+	} else {
+		l = ((double) lw) / 2.0;
+		L = sqrt((double)(dx*dx + dy*dy));
+
+		if (dx < 0) {
+			right = &rights[1];
+			left = &lefts[0];
+			top = &rights[0];
+			bottom = &lefts[1];
+		} else {
+			right = &rights[0];
+			left = &lefts[1];
+			top = &lefts[0];
+			bottom = &rights[1];
+		}
+		r = l / L;
+
+		/* coord of upper bound at integral y */
+		ya = -r * dx;
+		xa = r * dy;
+
+		if (projectLeft | projectRight) {
+			projectXoff = -ya;
+			projectYoff = xa;
+		}
+
+		/* xa * dy - ya * dx */
+		k = l * L;
+
+		leftFace->xa = xa;
+		leftFace->ya = ya;
+		leftFace->k = k;
+		rightFace->xa = -xa;
+		rightFace->ya = -ya;
+		rightFace->k = k;
+
+		if (projectLeft)
+			righty = miPolyBuildEdge (xa - projectXoff, ya - projectYoff,
+						  k, dx, dy, x1, y1, 0, right);
+		else
+			righty = miPolyBuildEdge (xa, ya,
+						  k, dx, dy, x1, y1, 0, right);
+
+		/* coord of lower bound at integral y */
+		ya = -ya;
+		xa = -xa;
+
+		/* xa * dy - ya * dx */
+		k = - k;
+
+		if (projectLeft)
+			lefty = miPolyBuildEdge (xa - projectXoff, ya - projectYoff,
+						 k, dx, dy, x1, y1, 1, left);
+		else
+			lefty = miPolyBuildEdge (xa, ya,
+						 k, dx, dy, x1, y1, 1, left);
+
+		/* coord of top face at integral y */
+		if (signdx > 0) {
+			ya = -ya;
+			xa = -xa;
+		}
+
+		if (projectLeft) {
+			double xap = xa - projectXoff;
+			double yap = ya - projectYoff;
+			topy = miPolyBuildEdge (xap, yap, xap * dx + yap * dy,
+						-dy, dx, x1, y1, dx > 0, top);
+		}
+		else
+			topy = miPolyBuildEdge(xa, ya, 0.0, 
+					       -dy, dx, x1, y1, dx > 0, top);
+
+		/* coord of bottom face at integral y */
+		if (projectRight) {
+			double xap = xa + projectXoff;
+			double yap = ya + projectYoff;
+			bottomy = miPolyBuildEdge (xap, yap, xap * dx + yap * dy,
+						   -dy, dx, x2, y2, dx < 0, bottom);
+			maxy = -ya + projectYoff;
+		} else {
+			bottomy = miPolyBuildEdge (xa, ya, 0.0,
+						   -dy, dx, x2, y2, dx < 0, bottom);
+			maxy = -ya;
+		}
+
+		finaly = ICEIL (maxy) + y2;
+
+		if (dx < 0) {
+			left->height = bottomy - lefty;
+			right->height = finaly - righty;
+			top->height = righty - topy;
+		} else {
+			right->height =  bottomy - righty;
+			left->height = finaly - lefty;
+			top->height = lefty - topy;
+		}
+		bottom->height = finaly - bottomy;
+		CreatorFillPolyHelper (pDrawable, pGC, topy, 
+				       bottom->height + bottomy - topy, lefts, rights, 2, 2);
+	}
+}
+
+static void
+CreatorLineArcI (DrawablePtr pDraw, GCPtr pGC, int xorg, int yorg)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDraw->pScreen);
+	int x, y, e, ex, slw;
+
+	if (pGC->miTranslate) {
+		xorg += pDraw->x;
+		yorg += pDraw->y;
+	}
+
+	slw = pGC->lineWidth;
+	if (slw == 1) {
+		CreatorPointHelper(pFfb, xorg, yorg);
+		return;
+	}
+
+	y = (slw >> 1) + 1;
+	if (slw & 1)
+		e = - ((y << 2) + 3);
+	else
+		e = - (y << 3);
+	ex = -4;
+	x = 0;
+	while (y) {
+		e += (y << 3) - 4;
+		while (e >= 0) {
+			x++;
+			e += (ex = -((x << 3) + 4));
+		}
+		y--;
+		slw = (x << 1) + 1;
+		if ((e == ex) && (slw > 1))
+			slw--;
+	    
+		if(Y_IN_BOX(yorg - y))
+			CreatorSpanHelper(pFfb, xorg - x, yorg - y, slw);
+
+		if ((y != 0) && ((slw > 1) || (e != ex)) && Y_IN_BOX(yorg + y))	
+			CreatorSpanHelper(pFfb, xorg - x, yorg + y, slw);
+	}
+}
+
+static void
+CreatorLineArcD (DrawablePtr pDraw, GCPtr pGC,
+		 double xorg, double yorg,
+		 PolyEdgePtr edge1, int edgey1, Bool edgeleft1,
+		 PolyEdgePtr edge2, int edgey2, Bool edgeleft2)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDraw->pScreen);
+	double radius, x0, y0, el, er, yk, xlk, xrk, k;
+	int xbase, ybase, y, boty, xl, xr, xcl, xcr, ymin, ymax, ymin1, ymin2;
+	Bool edge1IsMin, edge2IsMin;
+
+	xbase = floor(xorg);
+	x0 = xorg - xbase;
+	ybase = ICEIL (yorg);
+	y0 = yorg - ybase;
+	if (pGC->miTranslate) {
+		xbase += pDraw->x;
+		ybase += pDraw->y;
+		edge1->x += pDraw->x;
+		edge2->x += pDraw->x;
+		edgey1 += pDraw->y;
+		edgey2 += pDraw->y;
+	}
+
+	xlk = x0 + x0 + 1.0;
+	xrk = x0 + x0 - 1.0;
+	yk = y0 + y0 - 1.0;
+	radius = ((double)pGC->lineWidth) / 2.0;
+	y = floor(radius - y0 + 1.0);
+	ybase -= y;
+	ymin = ybase;
+	ymax = 65536;
+	edge1IsMin = FALSE;
+	ymin1 = edgey1;
+	if (edge1->dy >= 0) {
+		if (!edge1->dy) {
+			if (edgeleft1)
+				edge1IsMin = TRUE;
+			else
+				ymax = edgey1;
+			edgey1 = 65536;
+		} else if ((edge1->signdx < 0) == edgeleft1)
+			edge1IsMin = TRUE;
+	}
+	edge2IsMin = FALSE;
+	ymin2 = edgey2;
+	if (edge2->dy >= 0) {
+		if (!edge2->dy) {
+			if (edgeleft2)
+				edge2IsMin = TRUE;
+			else
+				ymax = edgey2;
+			edgey2 = 65536;
+		} else if ((edge2->signdx < 0) == edgeleft2)
+			edge2IsMin = TRUE;
+	}
+	if (edge1IsMin) {
+		ymin = ymin1;
+		if (edge2IsMin && (ymin1 > ymin2))
+			ymin = ymin2;
+	} else if (edge2IsMin)
+		ymin = ymin2;
+	el = radius * radius - ((y + y0) * (y + y0)) - (x0 * x0);
+	er = el + xrk;
+	xl = 1;
+	xr = 0;
+	if (x0 < 0.5) {
+		xl = 0;
+		el -= xlk;
+	}
+	boty = (y0 < -0.5) ? 1 : 0;
+	if (ybase + y - boty > ymax)
+		boty = ymax - ybase - y;
+	while (y > boty) {
+		k = (y << 1) + yk;
+		er += k;
+		while (er > 0.0) {
+			xr++;
+			er += xrk - (xr << 1);
+		}
+		el += k;
+		while (el >= 0.0) {
+			xl--;
+			el += (xl << 1) - xlk;
+		}
+		y--;
+		ybase++;
+		if (ybase < ymin)
+			continue;
+		xcl = xl + xbase;
+		xcr = xr + xbase;
+		CLIPSTEPEDGE(edgey1, edge1, edgeleft1);
+		CLIPSTEPEDGE(edgey2, edge2, edgeleft2);
+		if((xcr >= xcl) && Y_IN_BOX(ybase)) 
+			CreatorSpanHelper(pFfb, xcl, ybase, xcr - xcl + 1);
+	}
+	er = xrk - (xr << 1) - er;
+	el = (xl << 1) - xlk - el;
+	boty = floor(-y0 - radius + 1.0);
+	if (ybase + y - boty > ymax)
+		boty = ymax - ybase - y;
+	while (y > boty) {
+		k = (y << 1) + yk;
+		er -= k;
+		while ((er >= 0.0) && (xr >= 0)) {
+			xr--;
+			er += xrk - (xr << 1);
+		}
+		el -= k;
+		while ((el > 0.0) && (xl <= 0)) {
+			xl++;
+			el += (xl << 1) - xlk;
+		}
+		y--;
+		ybase++;
+		if (ybase < ymin)
+			continue;
+		xcl = xl + xbase;
+		xcr = xr + xbase;
+		CLIPSTEPEDGE(edgey1, edge1, edgeleft1);
+		CLIPSTEPEDGE(edgey2, edge2, edgeleft2);
+		if((xcr >= xcl) && Y_IN_BOX(ybase)) 
+			CreatorSpanHelper(pFfb, xcl, ybase, xcr - xcl + 1);
+	}
+}
+
+
+static void
+CreatorLineArc (DrawablePtr pDraw, GCPtr pGC,
+		LineFacePtr leftFace, LineFacePtr rightFace,
+		double xorg, double yorg,
+		Bool isInt)
+{
+	int xorgi, yorgi, edgey1, edgey2;
+	PolyEdgeRec	edge1, edge2;
+	Bool edgeleft1, edgeleft2;
+
+	if (isInt) {
+		xorgi = leftFace ? leftFace->x : rightFace->x;
+		yorgi = leftFace ? leftFace->y : rightFace->y;
+	}
+	edgey1 = 65536;
+	edgey2 = 65536;
+	edge1.x = 0; /* not used, keep memory checkers happy */
+	edge1.dy = -1;
+	edge2.x = 0; /* not used, keep memory checkers happy */
+	edge2.dy = -1;
+	edgeleft1 = FALSE;
+	edgeleft2 = FALSE;
+
+	if ((pGC->lineWidth > 2) &&
+	    (pGC->capStyle == CapRound && pGC->joinStyle != JoinRound ||
+	     pGC->joinStyle == JoinRound && pGC->capStyle == CapButt)) {
+		if (isInt) {
+			xorg = (double) xorgi;
+			yorg = (double) yorgi;
+		}
+
+		if (leftFace && rightFace) {
+			miRoundJoinClip (leftFace, rightFace, &edge1, &edge2,
+					 &edgey1, &edgey2, &edgeleft1, &edgeleft2);
+		} else if (leftFace) { 
+			edgey1 = miRoundCapClip (leftFace, isInt, &edge1, &edgeleft1);
+		} else if (rightFace) {
+			edgey2 = miRoundCapClip (rightFace, isInt, &edge2, &edgeleft2);
+		}
+
+		isInt = FALSE;
+	}
+
+	if (isInt)
+		CreatorLineArcI(pDraw, pGC, xorgi, yorgi);
+	else
+		CreatorLineArcD(pDraw, pGC, xorg, yorg, 
+				&edge1, edgey1, edgeleft1,
+				&edge2, edgey2, edgeleft2);
+}
+
+static void
+CreatorLineJoin (DrawablePtr pDrawable, GCPtr pGC, LineFacePtr pLeft, LineFacePtr pRight)
+{
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	double mx, my, denom;
+	PolyVertexRec vertices[4];
+	PolySlopeRec slopes[4];
+	PolyEdgeRec left[4], right[4];
+	int edgecount, nleft, nright, y, height, swapslopes;
+	int joinStyle = pGC->joinStyle;
+	int lw = pGC->lineWidth;
+
+	if (lw == 1) {
+		/* Lines going in the same direction have no join */
+		if ((pLeft->dx >= 0) == (pRight->dx <= 0))
+			return;
+		if (joinStyle != JoinRound) {
+			denom = - pLeft->dx * (double)pRight->dy + pRight->dx *
+				(double)pLeft->dy;
+			if (denom == 0.0)
+				return;	/* no join to draw */
+		}
+		if (joinStyle != JoinMiter) {
+			if(pGC->miTranslate)
+				CreatorPointHelper(pFfb,
+						   pLeft->x + pDrawable->x,
+						   pLeft->y + pDrawable->y);
+			else
+				CreatorPointHelper(pFfb, pLeft->x, pLeft->y);	
+			return;
+		}
+	} else {
+		if (joinStyle == JoinRound) {
+			CreatorLineArc(pDrawable, pGC, pLeft, pRight,
+				       (double)0.0, (double)0.0, TRUE);
+			return;
+		}
+		denom = - pLeft->dx * (double)pRight->dy + pRight->dx * 
+			(double)pLeft->dy;
+		if (denom == 0.0)
+			return;	/* no join to draw */
+	}
+
+	swapslopes = 0;
+	if (denom > 0) {
+		pLeft->xa = -pLeft->xa;
+		pLeft->ya = -pLeft->ya;
+		pLeft->dx = -pLeft->dx;
+		pLeft->dy = -pLeft->dy;
+	} else {
+		swapslopes = 1;
+		pRight->xa = -pRight->xa;
+		pRight->ya = -pRight->ya;
+		pRight->dx = -pRight->dx;
+		pRight->dy = -pRight->dy;
+	}
+
+	vertices[0].x = pRight->xa;
+	vertices[0].y = pRight->ya;
+	slopes[0].dx = -pRight->dy;
+	slopes[0].dy =  pRight->dx;
+	slopes[0].k = 0;
+
+	vertices[1].x = 0;
+	vertices[1].y = 0;
+	slopes[1].dx =  pLeft->dy;
+	slopes[1].dy = -pLeft->dx;
+	slopes[1].k = 0;
+
+	vertices[2].x = pLeft->xa;
+	vertices[2].y = pLeft->ya;
+
+	if (joinStyle == JoinMiter) {
+		my = (pLeft->dy  * (pRight->xa * pRight->dy - pRight->ya * pRight->dx) -
+		      pRight->dy * (pLeft->xa  * pLeft->dy  - pLeft->ya  * pLeft->dx ))/
+			denom;
+		if (pLeft->dy != 0) 
+			mx = pLeft->xa + (my - pLeft->ya) *
+				(double) pLeft->dx / (double) pLeft->dy;
+		else
+			mx = pRight->xa + (my - pRight->ya) *
+				(double) pRight->dx / (double) pRight->dy;
+    	
+		/* check miter limit */
+		if ((mx * mx + my * my) * 4 > SQSECANT * lw * lw)
+			joinStyle = JoinBevel;
+	}
+
+	if (joinStyle == JoinMiter) {
+		slopes[2].dx = pLeft->dx;
+		slopes[2].dy = pLeft->dy;
+		slopes[2].k =  pLeft->k;
+		if (swapslopes) {
+			slopes[2].dx = -slopes[2].dx;
+			slopes[2].dy = -slopes[2].dy;
+			slopes[2].k  = -slopes[2].k;
+		}
+		vertices[3].x = mx;
+		vertices[3].y = my;
+		slopes[3].dx = pRight->dx;
+		slopes[3].dy = pRight->dy;
+		slopes[3].k  = pRight->k;
+		if (swapslopes) {
+			slopes[3].dx = -slopes[3].dx;
+			slopes[3].dy = -slopes[3].dy;
+			slopes[3].k  = -slopes[3].k;
+		}
+		edgecount = 4;
+	} else {
+		double	scale, dx, dy, adx, ady;
+
+		adx = dx = pRight->xa - pLeft->xa;
+		ady = dy = pRight->ya - pLeft->ya;
+		if (adx < 0)
+			adx = -adx;
+		if (ady < 0)
+			ady = -ady;
+		scale = ady;
+		if (adx > ady)
+			scale = adx;
+		slopes[2].dx = (dx * 65536) / scale;
+		slopes[2].dy = (dy * 65536) / scale;
+		slopes[2].k = ((pLeft->xa + pRight->xa) * slopes[2].dy -
+			       (pLeft->ya + pRight->ya) * slopes[2].dx) / 2.0;
+		edgecount = 3;
+	}
+
+	y = miPolyBuildPoly (vertices, slopes, edgecount, pLeft->x, pLeft->y,
+			     left, right, &nleft, &nright, &height);
+	CreatorFillPolyHelper(pDrawable, pGC, y, height, left, right, nleft, nright);
+}
+
+void
+CreatorWideLineSolid (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pPts)
+{
+	int x1, y1, x2, y2, first = TRUE;
+	Bool projectLeft, projectRight, somethingDrawn = FALSE, selfJoin = FALSE;
+	LineFaceRec leftFace, rightFace, prevRightFace, firstFace;
+	cfbPrivGCPtr devPriv = cfbGetGCPrivate(pGC);
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+	RegionPtr clip;
+	int numRects;
+	unsigned int ppc;
+	BoxPtr pbox;
+
+	clip = ((cfbPrivGC *)(pGC->devPrivates[cfbGCPrivateIndex].ptr))->pCompositeClip;
+	numRects = REGION_NUM_RECTS(clip);
+	if (!numRects)
+		return;
+	if (!(ppc = FFBSetClip(pFfb, ffb, clip, numRects))) {
+		miWideLine(pDrawable, pGC, mode, npt, pPts);
+		return;
+	}
+
+	LeftClip = 2048; TopClip = 2048;
+	RightClip = 0; BottomClip = 0;
+	for (pbox = REGION_RECTS(clip); numRects; numRects--, pbox++) {
+		if (pbox->x1 < LeftClip) LeftClip = pbox->x1;
+		if (pbox->x2 > RightClip) RightClip = pbox->x2 - 1;
+		if (pbox->y1 < TopClip) TopClip = pbox->y1;
+		if (pbox->y2 > BottomClip) BottomClip = pbox->y2 - 1;
+	}
+
+	FFB_WRITE_ATTRIBUTES(pFfb,
+			     ppc|FFB_PPC_APE_DISABLE|FFB_PPC_TBE_OPAQUE|
+			     FFB_PPC_XS_CONST|FFB_PPC_YS_CONST|FFB_PPC_ZS_CONST|FFB_PPC_CS_CONST,
+			     FFB_PPC_VCE_MASK|FFB_PPC_ACE_MASK|FFB_PPC_APE_MASK|FFB_PPC_TBE_MASK|
+			     FFB_PPC_XS_MASK|FFB_PPC_YS_MASK|FFB_PPC_ZS_MASK|FFB_PPC_CS_MASK,
+			     pGC->planemask,
+			     FFB_ROP_EDIT_BIT|pGC->alu,
+			     -1, pGC->fgPixel,
+			     FFB_FBC_DEFAULT);
+
+	x2 = pPts->x;
+	y2 = pPts->y;
+	if (npt > 1) {
+		if (mode == CoordModePrevious) {
+			int nptTmp;
+			register DDXPointPtr pPtsTmp;
+    
+			x1 = x2;
+			y1 = y2;
+			nptTmp = npt;
+			pPtsTmp = pPts + 1;
+			while (--nptTmp) {
+				x1 += pPtsTmp->x;
+				y1 += pPtsTmp->y;
+				++pPtsTmp;
+			}
+			if ((x2 == x1) && (y2 == y1))
+				selfJoin = TRUE;
+		} else if ((x2 == pPts[npt-1].x) && (y2 == pPts[npt-1].y)) 
+			selfJoin = TRUE;
+	}
+
+	projectLeft = ((pGC->capStyle == CapProjecting) && !selfJoin);
+	projectRight = FALSE;
+
+	while (--npt) {
+		x1 = x2;
+		y1 = y2;
+		++pPts;
+		x2 = pPts->x;
+		y2 = pPts->y;
+		if (mode == CoordModePrevious) {
+			x2 += x1;
+			y2 += y1;
+		}
+		if ((x1 != x2) || (y1 != y2)) {
+			somethingDrawn = TRUE;
+			if ((npt == 1) && (pGC->capStyle == CapProjecting) && !selfJoin)
+				projectRight = TRUE;
+			CreatorWideSegment(pDrawable, pGC, x1, y1, x2, y2,
+					   projectLeft, projectRight, &leftFace, &rightFace);
+			if (first) {
+				if (selfJoin)
+					firstFace = leftFace;
+				else if (pGC->capStyle == CapRound) {
+					if (pGC->lineWidth == 1) {
+						if(pGC->miTranslate) 
+							CreatorPointHelper(pFfb,
+									   x1 + pDrawable->x, 
+									   y1 + pDrawable->y);
+						else
+							CreatorPointHelper(pFfb, x1, y1);
+					} else
+						CreatorLineArc(pDrawable, pGC,
+							       &leftFace, (LineFacePtr) NULL,
+							       (double)0.0, (double)0.0,
+							       TRUE);
+				}
+			} else 
+				CreatorLineJoin (pDrawable, pGC, &leftFace, &prevRightFace);
+
+			prevRightFace = rightFace;
+			first = FALSE;
+			projectLeft = FALSE;
+		}
+		if (npt == 1 && somethingDrawn) {
+			if (selfJoin)
+				CreatorLineJoin (pDrawable, pGC, &firstFace, &rightFace);
+			else if (pGC->capStyle == CapRound) {
+				if (pGC->lineWidth == 1) {
+					if(pGC->miTranslate) 
+						CreatorPointHelper(pFfb,
+								   x2 + pDrawable->x, 
+								   y2 + pDrawable->y);
+					else
+						CreatorPointHelper(pFfb, x2, y2);
+				} else
+					CreatorLineArc (pDrawable, pGC, 
+							(LineFacePtr) NULL, &rightFace,
+							(double)0.0, (double)0.0,
+							TRUE);
+			}
+		}
+	}
+
+	/* handle crock where all points are coincedent */
+	if (!somethingDrawn) {
+		projectLeft = (pGC->capStyle == CapProjecting);
+		CreatorWideSegment (pDrawable, pGC,
+				    x2, y2, x2, y2, projectLeft, projectLeft,
+				    &leftFace, &rightFace);
+		if (pGC->capStyle == CapRound) {
+			CreatorLineArc (pDrawable, pGC, 
+					&leftFace, (LineFacePtr) NULL,
+					(double)0.0, (double)0.0,
+					TRUE);
+			rightFace.dx = -1;	/* sleezy hack to make it work */
+			CreatorLineArc (pDrawable, pGC,
+					(LineFacePtr) NULL, &rightFace,
+					(double)0.0, (double)0.0,
+					TRUE);
+		}
+	}
+	pFfb->rp_active = 1;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_zeroarc.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_zeroarc.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_zeroarc.c	Mon May 22 21:47:45 2000
@@ -0,0 +1,536 @@
+/*
+ * Acceleration for the Creator and Creator3D framebuffer - Zero arc
+ * rops.
+ *
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Derived from mi/mizerarc.c, see there for authors.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_zeroarc.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+
+#include "ffb.h"
+#include "ffb_regs.h"
+#include "ffb_rcache.h"
+#include "ffb_fifo.h"
+#include "ffb_stip.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+
+#include "mi.h"
+#include "mizerarc.h"
+
+#define FULLCIRCLE (360 * 64)
+#define OCTANT (45 * 64)
+#define QUADRANT (90 * 64)
+#define HALFCIRCLE (180 * 64)
+#define QUADRANT3 (270 * 64)
+
+typedef struct {
+	int skipStart;
+	int haveStart;
+	DDXPointRec startPt;
+	int haveLast;
+	int skipLast;
+	DDXPointRec endPt;
+	int dashIndex;
+	int dashOffset;
+	int dashIndexInit;
+	int dashOffsetInit;
+} DashInfo;
+
+#define Pixelate(xval,yval,ext) 				\
+if (((xval)+xoff) >= (ext)->x1 &&				\
+    ((xval)+xoff) < (ext)->x2 &&				\
+    ((yval)+yoff) >= (ext)->y1 &&				\
+    ((yval)+yoff) < (ext)->y2) {				\
+	FFBFifo(pFfb, 2);					\
+	FFB_WRITE64(&ffb->bh, ((yval)+yoff), ((xval)+xoff));	\
+}
+
+#define Pixelate1(xval,yval,ext)				\
+if (((xval)+xoff) >= (ext)->x1 &&				\
+    ((xval)+xoff) < (ext)->x2 &&				\
+    ((yval)+yoff) >= (ext)->y1 &&				\
+    ((yval)+yoff) < (ext)->y2) {				\
+	FFBFifo(pFfb, 2);					\
+	FFB_WRITE64(&ffb->bh, ((yval)+yoff), ((xval)+xoff));	\
+}
+
+#define DoPix(idx,xval,yval,ext) if (mask & (1 << idx)) Pixelate(xval, yval,ext);
+
+static void
+CreatorZeroArcPts(xArc *arc, DrawablePtr pDrawable, GCPtr pGC, BoxPtr pextent)
+{
+	miZeroArcRec info;
+	register int x, y, a, b, d, mask;
+	register int k1, k3, dx, dy;
+	int xoff, yoff;
+	Bool do360;
+	FFBPtr pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	ffb_fbcPtr ffb = pFfb->regs;
+
+	xoff = 0;
+	yoff = 0;
+	if (pGC->miTranslate) {
+		xoff = pDrawable->x;
+		yoff = pDrawable->y;
+	}
+	do360 = miZeroArcSetup(arc, &info, TRUE);
+	MIARCSETUP();
+	mask = info.initialMask;
+	if (!(arc->width & 1)) {
+		DoPix(1, info.xorgo, info.yorg, pextent);
+		DoPix(3, info.xorgo, info.yorgo, pextent);
+	}
+	if (!info.end.x || !info.end.y) {
+		mask = info.end.mask;
+		info.end = info.altend;
+	}
+	if (do360 && (arc->width == arc->height) && !(arc->width & 1)) {
+		int yorgh = info.yorg + info.h;
+		int xorghp = info.xorg + info.h;
+		int xorghn = info.xorg - info.h;
+		int lastx = 0, lasty = 0;
+
+		while (1) {
+			if (a < 0)
+				break;
+			Pixelate1(info.xorg + x, info.yorg + y, pextent);
+			Pixelate1(info.xorg - x, info.yorg + y, pextent);
+			Pixelate1(info.xorg - x, info.yorgo - y, pextent);
+			Pixelate1(info.xorg + x, info.yorgo - y, pextent);
+			Pixelate1(xorghp - y, yorgh - x, pextent);
+			Pixelate1(xorghn + y, yorgh - x, pextent);
+			Pixelate1(xorghn + y, yorgh + x, pextent);
+			lastx = xorghp - y; lasty = yorgh + x;
+			Pixelate1(xorghp - y, yorgh + x, pextent);
+			MIARCCIRCLESTEP(;);
+		}
+		if (x <= 0 || lastx != info.xorg + x || lasty != info.yorg + y) {
+			Pixelate1(info.xorg + x, info.yorg + y, pextent);
+			Pixelate1(info.xorg - x, info.yorg + y, pextent);
+			Pixelate1(info.xorg - x, info.yorgo - y, pextent);
+			Pixelate1(info.xorg + x, info.yorgo - y, pextent);
+		}
+		x = info.w;
+		y = info.h;
+	} else if (do360) {
+		while (y < info.h || x < info.w) {
+			MIARCOCTANTSHIFT(;);
+			Pixelate1(info.xorg + x, info.yorg + y, pextent);
+			Pixelate1(info.xorgo - x, info.yorg + y, pextent);
+			Pixelate1(info.xorgo - x, info.yorgo - y, pextent);
+			Pixelate1(info.xorg + x, info.yorgo - y, pextent);
+			MIARCSTEP(;,;);
+		}
+	} else {
+		while (y < info.h || x < info.w) {
+			MIARCOCTANTSHIFT(;);
+			if ((x == info.start.x) || (y == info.start.y)) {
+				mask = info.start.mask;
+				info.start = info.altstart;
+			}
+			DoPix(0, info.xorg + x, info.yorg + y, pextent);
+			DoPix(1, info.xorgo - x, info.yorg + y, pextent);
+			DoPix(2, info.xorgo - x, info.yorgo - y, pextent);
+			DoPix(3, info.xorg + x, info.yorgo - y, pextent);
+			if (x == info.end.x || y == info.end.y) {
+				mask = info.end.mask;
+				info.end = info.altend;
+			}
+			MIARCSTEP(;,;);
+		}
+	}
+	if (x == info.start.x || y == info.start.y)
+		mask = info.start.mask;
+	DoPix(0, info.xorg + x, info.yorg + y, pextent);
+	DoPix(2, info.xorgo - x, info.yorgo - y, pextent);
+	if (arc->height & 1) {
+		DoPix(1, info.xorgo - x, info.yorg + y, pextent);
+		DoPix(3, info.xorg + x, info.yorgo - y, pextent);
+	}
+}
+
+#undef DoPix
+#define DoPix(idx,xval,yval) \
+	if (mask & (1 << idx)) \
+	{ \
+	arcPts[idx]->x = xval; \
+	arcPts[idx]->y = yval; \
+	arcPts[idx]++; \
+	}
+
+static void
+CreatorZeroArcDashPts(GCPtr pGC, xArc *arc, DashInfo *dinfo, DDXPointPtr points,
+                      int maxPts, DDXPointPtr *evenPts, DDXPointPtr *oddPts)
+{
+	miZeroArcRec info;
+	register int x, y, a, b, d, mask;
+	register int k1, k3, dx, dy;
+	int dashRemaining;
+	DDXPointPtr arcPts[4];
+	DDXPointPtr startPts[5], endPts[5];
+	int deltas[5];
+	DDXPointPtr startPt, pt, lastPt, pts;
+	int i, j, delta, ptsdelta, seg, startseg;
+
+	for (i = 0; i < 4; i++)
+		arcPts[i] = points + (i * maxPts);
+	miZeroArcSetup(arc, &info, FALSE);
+	MIARCSETUP();
+	mask = info.initialMask;
+	startseg = info.startAngle / QUADRANT;
+	startPt = arcPts[startseg];
+	if (!(arc->width & 1)) {
+		DoPix(1, info.xorgo, info.yorg);
+		DoPix(3, info.xorgo, info.yorgo);
+	}
+	if (!info.end.x || !info.end.y) {
+		mask = info.end.mask;
+		info.end = info.altend;
+	}
+	while (y < info.h || x < info.w) {
+		MIARCOCTANTSHIFT(;);
+		if ((x == info.firstx) || (y == info.firsty))
+			startPt = arcPts[startseg];
+		if ((x == info.start.x) || (y == info.start.y)) {
+			mask = info.start.mask;
+			info.start = info.altstart;
+		}
+		DoPix(0, info.xorg + x, info.yorg + y);
+		DoPix(1, info.xorgo - x, info.yorg + y);
+		DoPix(2, info.xorgo - x, info.yorgo - y);
+		DoPix(3, info.xorg + x, info.yorgo - y);
+		if (x == info.end.x || y == info.end.y) {
+			mask = info.end.mask;
+			info.end = info.altend;
+		}
+		MIARCSTEP(;,;);
+	}
+	if (x == info.firstx || y == info.firsty)
+		startPt = arcPts[startseg];
+	if (x == info.start.x || y == info.start.y)
+		mask = info.start.mask;
+	DoPix(0, info.xorg + x, info.yorg + y);
+	DoPix(2, info.xorgo - x, info.yorgo - y);
+	if (arc->height & 1) {
+		DoPix(1, info.xorgo - x, info.yorg + y);
+		DoPix(3, info.xorg + x, info.yorgo - y);
+	}
+	for (i = 0; i < 4; i++) {
+		seg = (startseg + i) & 3;
+		pt = points + (seg * maxPts);
+		if (seg & 1) {
+			startPts[i] = pt;
+			endPts[i] = arcPts[seg];
+			deltas[i] = 1;
+		} else {
+			startPts[i] = arcPts[seg] - 1;
+			endPts[i] = pt - 1;
+			deltas[i] = -1;
+		}
+	}
+	startPts[4] = startPts[0];
+	endPts[4] = startPt;
+	startPts[0] = startPt;
+	if (startseg & 1) {
+		if (startPts[4] != endPts[4])
+			endPts[4]--;
+		deltas[4] = 1;
+	} else {
+		if (startPts[0] > startPts[4])
+			startPts[0]--;
+		if (startPts[4] < endPts[4])
+			endPts[4]--;
+		deltas[4] = -1;
+	}
+	if (arc->angle2 < 0) {
+		DDXPointPtr tmps, tmpe;
+		int tmpd;
+
+		tmpd = deltas[0];
+		tmps = startPts[0] - tmpd;
+		tmpe = endPts[0] - tmpd;
+		startPts[0] = endPts[4] - deltas[4];
+		endPts[0] = startPts[4] - deltas[4];
+		deltas[0] = -deltas[4];
+		startPts[4] = tmpe;
+		endPts[4] = tmps;
+		deltas[4] = -tmpd;
+		tmpd = deltas[1];
+		tmps = startPts[1] - tmpd;
+		tmpe = endPts[1] - tmpd;
+		startPts[1] = endPts[3] - deltas[3];
+		endPts[1] = startPts[3] - deltas[3];
+		deltas[1] = -deltas[3];
+		startPts[3] = tmpe;
+		endPts[3] = tmps;
+		deltas[3] = -tmpd;
+		tmps = startPts[2] - deltas[2];
+		startPts[2] = endPts[2] - deltas[2];
+		endPts[2] = tmps;
+		deltas[2] = -deltas[2];
+	}
+	for (i = 0; i < 5 && startPts[i] == endPts[i]; i++);
+	if (i == 5)
+		return;
+	pt = startPts[i];
+	for (j = 4; startPts[j] == endPts[j]; j--);
+	lastPt = endPts[j] - deltas[j];
+	if (dinfo->haveLast &&
+	    (pt->x == dinfo->endPt.x) && (pt->y == dinfo->endPt.y)) {
+		startPts[i] += deltas[i];
+	} else {
+		dinfo->dashIndex = dinfo->dashIndexInit;
+		dinfo->dashOffset = dinfo->dashOffsetInit;
+	}
+	if (!dinfo->skipStart && (info.startAngle != info.endAngle)) {
+		dinfo->startPt = *pt;
+		dinfo->haveStart = TRUE;
+	} else if (!dinfo->skipLast && dinfo->haveStart &&
+		 (lastPt->x == dinfo->startPt.x) &&
+		 (lastPt->y == dinfo->startPt.y) &&
+		 (lastPt != startPts[i]))
+		endPts[j] = lastPt;
+	if (info.startAngle != info.endAngle) {
+		dinfo->haveLast = TRUE;
+		dinfo->endPt = *lastPt;
+	}
+	dashRemaining = pGC->dash[dinfo->dashIndex] - dinfo->dashOffset;
+	for (i = 0; i < 5; i++) {
+		pt = startPts[i];
+		lastPt = endPts[i];
+		delta = deltas[i];
+		while (pt != lastPt) {
+			if (dinfo->dashIndex & 1) {
+				pts = *oddPts;
+				ptsdelta = -1;
+			} else {
+				pts = *evenPts;
+				ptsdelta = 1;
+			}
+			while ((pt != lastPt) && --dashRemaining >= 0) {
+				*pts = *pt;
+				pts += ptsdelta;
+				pt += delta;
+			}
+			if (dinfo->dashIndex & 1)
+				*oddPts = pts;
+			else
+				*evenPts = pts;
+			if (dashRemaining <= 0) {
+				if (++(dinfo->dashIndex) == pGC->numInDashList)
+					dinfo->dashIndex = 0;
+				dashRemaining = pGC->dash[dinfo->dashIndex];
+			}
+		}
+	}
+	dinfo->dashOffset = pGC->dash[dinfo->dashIndex] - dashRemaining;
+}
+
+void
+CreatorZeroPolyArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
+{
+	WindowPtr pWin = (WindowPtr) pDrawable;
+	int maxPts = 0;
+	register int n;
+	register xArc *arc;
+	register int i;
+	register int j, k;
+	DDXPointPtr points = NULL, pts, oddPts;
+	int numPts = 0;
+	DashInfo dinfo;
+	FFBPtr pFfb;
+	ffb_fbcPtr ffb;
+	RegionPtr clip;
+	int numRects, ppc;
+	BoxPtr pbox;
+	CreatorPrivGCPtr gcPriv;
+	register int off = 0, c1, c2;
+	register char *addrp = NULL;
+	register int *ppt, pt, pix;
+	
+	gcPriv = CreatorGetGCPrivate (pGC);
+	pFfb = GET_FFB_FROM_SCREEN(pDrawable->pScreen);
+	ffb = pFfb->regs;
+	clip = cfbGetCompositeClip(pGC);
+	numRects = REGION_NUM_RECTS(clip);
+	if (!numRects)
+		return;
+	if (pGC->lineStyle == LineSolid && numRects != 1) {
+		miZeroPolyArc(pDrawable, pGC, narcs, parcs);
+		return;
+	}
+	FFBLOG(("CreatorZeroPolyArc: ALU(%x) PMSK(%08x) narcs(%d)\n",
+		pGC->alu, pGC->planemask, narcs));
+	if (pGC->lineStyle == LineSolid)
+		for (arc = parcs, i = narcs, j = 0; --i >= 0; arc++) {
+			if (!miCanZeroArc(arc))
+				miPolyArc(pDrawable, pGC, 1, arc);
+			else
+				j++;
+		}
+	else
+		for (arc = parcs, i = narcs, j = 0; --i >= 0; arc++) {
+			if (!miCanZeroArc(arc))
+				miPolyArc(pDrawable, pGC, 1, arc);
+			else {
+				j++;
+				if (arc->width > arc->height)
+					n = arc->width + (arc->height >> 1);
+				else
+					n = arc->height + (arc->width >> 1);
+				if (n > maxPts)
+					maxPts = n;
+			}
+		}
+	if (!j)
+		return;
+
+	if (pGC->lineStyle != LineSolid) {
+		numPts = maxPts << 2;
+		points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * (numPts + (maxPts << 1)));
+		if (!points) return;
+		dinfo.haveStart = FALSE;
+		dinfo.skipStart = FALSE;
+		dinfo.haveLast = FALSE;
+		dinfo.dashIndexInit = 0;
+		dinfo.dashOffsetInit = 0;
+		miStepDash((int)pGC->dashOffset, &dinfo.dashIndexInit,
+			   (unsigned char *) pGC->dash, (int)pGC->numInDashList,
+			   &dinfo.dashOffsetInit);
+		off = *(int *)&pDrawable->x;
+		off -= (off & 0x8000) << 1;
+		if (pGC->depth == 8) {
+			addrp = (char *)pFfb->sfb8r +
+				(pDrawable->y << 11) + (pDrawable->x << 0);
+		} else {
+			addrp = (char *)pFfb->sfb32 +
+				(pDrawable->y << 13) + (pDrawable->x << 2);
+		}
+		ppc = FFB_PPC_CS_VAR;
+	} else
+		ppc = FFB_PPC_CS_CONST;
+
+        if(gcPriv->stipple == NULL) {
+		FFB_ATTR_GC(pFfb, pGC, pWin,
+			    ppc | FFB_PPC_APE_DISABLE,
+			    FFB_DRAWOP_DOT);
+	} else {
+		unsigned int fbc;
+
+		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
+			      ppc, FFB_PPC_CS_MASK);
+		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
+		FFB_WRITE_DRAWOP(pFfb, ffb, FFB_DRAWOP_DOT);
+		fbc = FFB_FBC_WIN(pWin);
+		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
+		FFB_WRITE_FBC(pFfb, ffb, fbc);
+	}
+	if((ppc & FFB_PPC_CS_MASK) == FFB_PPC_CS_VAR)
+		FFBWait(pFfb, ffb);
+
+	for (arc = parcs, i = narcs; --i >= 0; arc++) {
+		if (miCanZeroArc(arc)) {
+			if (pGC->lineStyle == LineSolid)
+				CreatorZeroArcPts(arc, pDrawable, pGC, REGION_RECTS(clip));
+			else {
+				pts = points;
+				oddPts = &points[(numPts >> 1) - 1];
+				dinfo.skipLast = i;
+				CreatorZeroArcDashPts(pGC, arc, &dinfo,
+						      oddPts + 1, maxPts, &pts, &oddPts);
+				dinfo.skipStart = TRUE;
+				n = pts - points;
+				pbox = REGION_RECTS(clip);
+				j = numRects;
+				pix = pGC->fgPixel;
+				if (pGC->depth == 8) {
+					while (j--) {
+						c1 = *(int *)&pbox->x1 - off;
+						c2 = *(int *)&pbox->x2 - off - 0x00010001;
+						for (ppt = (int *)points, k = n; --k >= 0; ) {
+							pt = *ppt++;
+							if (!(((pt - c1) | (c2 - pt)) & 0x80008000))
+								*(unsigned char *)(addrp + ((pt << 11) & 0x3ff800) + ((pt >> 16) & 0x07ff)) = pix;
+						}
+						pbox++;
+					}
+				} else {
+					while (j--) {
+						c1 = *(int *)&pbox->x1 - off;
+						c2 = *(int *)&pbox->x2 - off - 0x00010001;
+						for (ppt = (int *)points, k = n; --k >= 0; ) {
+							pt = *ppt++;
+							if (!(((pt - c1) | (c2 - pt)) & 0x80008000))
+								*(unsigned int *)(addrp + ((pt << 13) & 0xffe000) + ((pt >> 14) & 0x1ffc)) = pix;
+						}
+						pbox++;
+					}
+				}
+				if (pGC->lineStyle != LineDoubleDash)
+					continue;
+				if ((pGC->fillStyle == FillSolid) || (pGC->fillStyle == FillStippled))
+					pix = pGC->bgPixel;
+				pts = &points[numPts >> 1];
+				oddPts++;
+				n = pts - oddPts;
+				pbox = REGION_RECTS(clip);
+				j = numRects;
+				if (pGC->depth == 8) {
+					while (j--) {
+						c1 = *(int *)&pbox->x1 - off;
+						c2 = *(int *)&pbox->x2 - off - 0x00010001;
+						for (ppt = (int *)oddPts, k = n; --k >= 0; ) {
+							pt = *ppt++;
+							if (!(((pt - c1) | (c2 - pt)) & 0x80008000))
+								*(unsigned char *)(addrp + ((pt << 11) & 0x3ff800) + ((pt >> 16) & 0x07ff)) = pix;
+						}
+						pbox++;
+					}
+				} else {
+					while (j--) {
+						c1 = *(int *)&pbox->x1 - off;
+						c2 = *(int *)&pbox->x2 - off - 0x00010001;
+						for (ppt = (int *)oddPts, k = n; --k >= 0; ) {
+							pt = *ppt++;
+							if (!(((pt - c1) | (c2 - pt)) & 0x80008000))
+								*(unsigned int *)(addrp + ((pt << 13) & 0xffe000) + ((pt >> 14) & 0x1ffc)) = pix;
+						}
+						pbox++;
+					}
+				}
+			}
+		}
+	}
+	if (pGC->lineStyle != LineSolid) {
+		DEALLOCATE_LOCAL(points);
+	} else {
+		pFfb->rp_active = 1;
+		FFBSync(pFfb, ffb);
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/sunffb.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunffb/sunffb.cpp:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/sunffb.cpp	Tue Jun 13 19:13:14 2000
@@ -0,0 +1,30 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/sunffb.cpp,v 1.2 2000/06/14 02:13:14 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH FFB __drivermansuffix__ "Version 4.0.1"  "XFree86"
+.SH NAME
+ffb \- SUNFFB video driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qsunffb\*q"
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B ffb
+is an XFree86 driver for Sun Creator, Creator 3D and Elite 3D video cards.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+The
+.B ffb
+driver supports...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details.  This section only covers configuration details specific to this
+driver.
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+.SH AUTHORS
+Authors include: Jakub Jelinek <jakub@redhat.com>, David S. Miller <davem@redhat.com>, Michal Rehacek <majkl@iname.com>
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile	Thu May 18 16:21:38 2000
@@ -0,0 +1,42 @@
+XCOMM
+XCOMM This is an Imakefile for the leo driver.  
+XCOMM
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile,v 1.1 2000/05/18 23:21:38 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = leo_driver.c leo_accel.c leo_bcopy.c leo_checks.c leo_frect.c \
+	leo_frectsp.c leo_fspans.c leo_fspanssp.c leo_gc.c leo_glyph.c \
+	leo_stubs.c leo_cursor.c
+OBJS = leo_driver.o leo_accel.o leo_bcopy.o leo_checks.o leo_frect.o \
+	leo_frectsp.o leo_fspans.o leo_fspanssp.o leo_gc.o leo_glyph.o \
+	leo_stubs.o leo_cursor.o
+
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+           -I$(SERVERSRC)/Xext -I$(SERVERSRC)/cfb \
+	   -I$(XF86SRC)/ramdac \
+           -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(EXTINCSRC)
+#endif
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+ModuleObjectRule()
+
+ObjectModuleTarget(sunleo,$(OBJS))
+
+InstallObjectModule(sunleo,$(MODULEDIR),drivers)
+
+#if !defined(XF86DriverSDK)
+CppManTarget(sunleo,)
+InstallModuleManPage(sunleo)
+#endif
+
+DependTarget()
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h	Fri Jun 30 10:15:16 2000
@@ -0,0 +1,106 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - defines.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h,v 1.2 2000/06/30 17:15:16 dawes Exp $ */
+
+#ifndef LEO_H
+#define LEO_H
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86RamDac.h"
+#include "Xmd.h"
+#include "gcstruct.h"
+#include "leo_regs.h"
+#include "xf86sbusBus.h"
+
+/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
+#define LEO_FB0_VOFF		0x00000000
+#define LEO_LC0_VOFF		0x00800000
+#define LEO_LD0_VOFF		0x00801000
+#define LEO_LX0_CURSOR_VOFF	0x00802000
+#define LEO_FB1_VOFF		0x00803000
+#define LEO_LC1_VOFF		0x01003000
+#define LEO_LD1			0x01004000
+#define LEO_LX0_VERT_VOFF	0x01005000
+#define LEO_LX_KRN_VOFF		0x01006000
+#define LEO_LC0_KRN_VOFF	0x01007000
+#define LEO_LC1_KRN_VOFF	0x01008000
+#define LEO_LD_GBL_VOFF		0x01009000
+
+typedef struct {
+	unsigned int fg, bg;			/* FG/BG colors for stipple */
+	unsigned int patalign;                  /* X/Y alignment of bits */
+        unsigned int alu;			/* Transparent/Opaque + rop */
+        unsigned int bits[32];                  /* The stipple bits themselves */
+} LeoStippleRec, *LeoStipplePtr;
+
+typedef struct {
+	int type;
+	LeoStipplePtr stipple;
+} LeoPrivGCRec, *LeoPrivGCPtr;
+
+typedef struct {
+	LeoCommand0	*lc0;
+	LeoDraw		*ld0;
+	LeoCursor	*dac;
+	unsigned	*fb;
+	int		vclipmax;
+	int		width;
+	int		height;
+	/* cache one stipple; figuring out if we can use the stipple is as hard as
+	 * computing it, so we just use this one and leave it here if it
+	 * can't be used this time
+	 */
+	LeoStipplePtr	tmpStipple;
+
+	sbusDevicePtr	psdp;
+	Bool		HWCursor;
+	Bool		NoAccel;
+	CloseScreenProcPtr CloseScreen;
+	xf86CursorInfoPtr CursorInfoRec;
+	unsigned char	CursorShiftX, CursorShiftY;
+	unsigned char	*CursorData;
+} LeoRec, *LeoPtr;
+
+extern int  LeoScreenPrivateIndex;
+extern int  LeoGCPrivateIndex;
+extern int  LeoWindowPrivateIndex;
+
+#define GET_LEO_FROM_SCRN(p)    ((LeoPtr)((p)->driverPrivate))
+
+#define LeoGetScreenPrivate(s)						\
+((LeoPtr) (s)->devPrivates[LeoScreenPrivateIndex].ptr)
+
+#define LeoGetGCPrivate(g)						\
+((LeoPrivGCPtr) (g)->devPrivates [LeoGCPrivateIndex].ptr)
+
+#define LeoGetWindowPrivate(w)						\
+((LeoStipplePtr) (w)->devPrivates[LeoWindowPrivateIndex].ptr)
+                            
+#define LeoSetWindowPrivate(w,p) 					\
+((w)->devPrivates[LeoWindowPrivateIndex].ptr = (pointer) p)
+
+extern int leoRopTable[];
+
+#endif /* LEO_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c	Thu May 18 16:21:38 2000
@@ -0,0 +1,195 @@
+/*
+ * Acceleration for the LEO (ZX) framebuffer.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
+
+#define	PSZ	32
+#include	<asm/types.h>
+#include	<math.h>
+
+#include	"scrnintstr.h"
+#include	"pixmapstr.h"
+#include	"regionstr.h"
+#include	"mistruct.h"
+#include	"fontstruct.h"
+#include	"dixfontstr.h"
+#include	"cfb.h"
+#include	"cfbmskbits.h"
+#include	"cfb8bit.h"
+#include	"mibstore.h"
+#include	"mifillarc.h"
+#include	"miwideline.h"
+#include	"fastblt.h"
+#include	"mergerop.h"
+#include	"migc.h"
+#include	"mi.h"
+
+#include	"leo.h"
+#include	"leo_gc.h"
+
+int	LeoScreenPrivateIndex;
+int	LeoGCPrivateIndex;
+int	LeoWindowPrivateIndex;
+int	LeoGeneration;
+
+int	leoRopTable[16] = {
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_ZERO,		/* GXclear */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW_AND_OLD,	/* GXand */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW_AND_NOLD,	/* GXandReverse */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW,		/* GXcopy */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NNEW_AND_OLD,	/* GXandInverted */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_OLD,		/* GXnoop */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW_XOR_OLD,	/* GXxor */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW_OR_OLD,	/* GXor */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NNEW_AND_NOLD,	/* GXnor */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NNEW_XOR_NOLD,	/* GXequiv */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NOLD,		/* GXinvert */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW_OR_NOLD,	/* GXorReverse */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NNEW,		/* GXcopyInverted */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NNEW_OR_OLD,	/* GXorInverted */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_NNEW_OR_NOLD,	/* GXnand */
+	LEO_ATTR_RGBE_ENABLE|LEO_ROP_ONES		/* GXset */
+};
+
+static void
+LeoCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+	DDXPointPtr pptSrc;
+	DDXPointPtr ppt;
+	RegionPtr prgnDst;
+	BoxPtr pbox;
+	int dx, dy;
+	int i, nbox;
+	WindowPtr pwinRoot;
+	extern WindowPtr *WindowTable;
+
+	dx = ptOldOrg.x - pWin->drawable.x;
+	dy = ptOldOrg.y - pWin->drawable.y;
+
+	pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];
+
+	prgnDst = REGION_CREATE(pWin->drawable.pScreen, NULL, 1);
+
+	REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
+	REGION_INTERSECT(pWin->drawable.pScreen, prgnDst, &pWin->borderClip, prgnSrc);
+
+	pbox = REGION_RECTS(prgnDst);
+	nbox = REGION_NUM_RECTS(prgnDst);
+	if(!(pptSrc = (DDXPointPtr )ALLOCATE_LOCAL(nbox * sizeof(DDXPointRec))))
+		return;
+	ppt = pptSrc;
+
+	for (i = nbox; --i >= 0; ppt++, pbox++) {
+		ppt->x = pbox->x1 + dx;
+		ppt->y = pbox->y1 + dy;
+	}
+
+	LeoDoBitblt ((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,
+		     GXcopy, prgnDst, pptSrc, ~0L);
+	DEALLOCATE_LOCAL(pptSrc);
+	REGION_DESTROY(pWin->drawable.pScreen, prgnDst);
+}
+
+void LeoVtChange (ScreenPtr pScreen, int enter)
+{
+	LeoPtr pLeo = LeoGetScreenPrivate (pScreen); 
+	LeoCommand0 *lc0 = pLeo->lc0;
+	LeoDraw *ld0 = pLeo->ld0;
+
+	ld0->wid = 1;
+	ld0->widclip = 0;
+	ld0->wmask = 0xffff;
+	ld0->planemask = 0xffffff;
+	ld0->rop = LEO_ATTR_WE_ENABLE|LEO_ATTR_RGBE_ENABLE|LEO_ATTR_FORCE_WID;
+	ld0->fg = 0;
+	ld0->vclipmin = 0;
+	ld0->vclipmax = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 16);
+	
+	while (lc0->csr & LEO_CSR_BLT_BUSY);
+	
+	lc0->extent = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 11);
+	lc0->fill = 0;
+	
+	while (lc0->csr & LEO_CSR_BLT_BUSY);
+	
+	lc0->addrspace = LEO_ADDRSPC_OBGR;
+	ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+}
+
+extern Bool LeoCreateGC (GCPtr pGC);
+
+Bool LeoAccelInit (ScreenPtr pScreen, LeoPtr pLeo)
+{
+	LeoCommand0 *lc0;
+	LeoDraw *ld0;
+
+	if (serverGeneration != LeoGeneration) {
+		LeoScreenPrivateIndex = AllocateScreenPrivateIndex ();
+		if (LeoScreenPrivateIndex == -1) return FALSE;
+		LeoGCPrivateIndex = AllocateGCPrivateIndex ();
+		LeoWindowPrivateIndex = AllocateWindowPrivateIndex ();
+		LeoGeneration = serverGeneration;
+	}
+	
+	/* Allocate private structures holding pointer to both videoRAM and control registers.
+	   We do not have to map these by ourselves, because the XServer did it for us; we
+	   only copy the pointers to out structures. */
+	if (!AllocateGCPrivate(pScreen, LeoGCPrivateIndex, sizeof(LeoPrivGCRec))) return FALSE;
+	if (!AllocateWindowPrivate(pScreen, LeoWindowPrivateIndex, 0)) return FALSE;
+	pScreen->devPrivates[LeoScreenPrivateIndex].ptr = pLeo;
+	pLeo->lc0 = lc0 = (LeoCommand0 *) ((char *)pLeo->fb + LEO_LC0_VOFF);
+	pLeo->ld0 = ld0 = (LeoDraw *) ((char *)pLeo->fb + LEO_LD0_VOFF);
+
+	if (!pLeo->NoAccel) {
+		/* Replace various screen functions. */
+		pScreen->CreateGC = LeoCreateGC;
+		pScreen->CopyWindow = LeoCopyWindow;
+	}
+
+	/* We will now clear the screen: we'll draw a rectangle covering all the
+	 * viewscreen, using a 'blackness' ROP.
+	 */
+	ld0->wid = 1;
+	ld0->widclip = 0;
+	ld0->wmask = 0xffff;
+	ld0->planemask = 0xffffff;
+	ld0->rop = LEO_ATTR_WE_ENABLE|LEO_ATTR_RGBE_ENABLE|LEO_ATTR_FORCE_WID;
+	ld0->fg = 0;
+	ld0->vclipmin = 0;
+	ld0->vclipmax = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 16);
+	pLeo->vclipmax = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 16);
+	pLeo->width = pLeo->psdp->width;
+	pLeo->height = pLeo->psdp->height;
+	
+	while (lc0->csr & LEO_CSR_BLT_BUSY);
+	
+	lc0->extent = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 11);
+	lc0->fill = 0;
+	
+	while (lc0->csr & LEO_CSR_BLT_BUSY);
+	
+	lc0->addrspace = LEO_ADDRSPC_OBGR;
+	ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+
+	/* Success */
+	return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_bcopy.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_bcopy.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_bcopy.c	Thu May 18 16:21:39 2000
@@ -0,0 +1,178 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - Bit-blit copies.
+ *
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_bcopy.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+#include "leo_regs.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+
+void
+LeoDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst,
+		DDXPointPtr pptSrc, unsigned long planemask)
+{
+	LeoPtr pLeo = LeoGetScreenPrivate (pDst->pScreen);
+	LeoCommand0 *lc0 = pLeo->lc0;
+	LeoDraw *ld0 = pLeo->ld0;
+	BoxPtr pboxTmp;
+	DDXPointPtr pptTmp;
+	int nbox;
+	BoxPtr pboxNext, pboxBase, pbox;
+
+	pbox = REGION_RECTS(prgnDst);
+	nbox = REGION_NUM_RECTS(prgnDst);
+
+	pptTmp = pptSrc;
+	pboxTmp = pbox;
+
+	ld0->rop = leoRopTable[alu];
+
+	if (pptSrc->y < pbox->y1) {
+		if (pptSrc->x < pbox->x1) {
+			/* reverse order of bands and rects in each band */
+			pboxTmp=pbox+nbox;
+                        pptTmp=pptSrc+nbox;
+
+			while (nbox--){
+				pboxTmp--;
+				pptTmp--;
+				if (pptTmp->y <= pboxTmp->y2) {
+					lc0->extent = 0x80000000 | (pboxTmp->x2 - pboxTmp->x1 - 1) |
+						      ((pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+					lc0->src = (pptTmp->x + pboxTmp->x2 - pboxTmp->x1 - 1) |
+						   ((pptTmp->y + pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+					lc0->copy = (pboxTmp->x2 - 1) | ((pboxTmp->y2 - 1) << 11);
+				} else {
+					lc0->extent = (pboxTmp->x2 - pboxTmp->x1 - 1) |
+						      ((pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+					lc0->src = pptTmp->x | (pptTmp->y << 11);
+					lc0->copy = pboxTmp->x1 | (pboxTmp->y1 << 11);
+				}
+				while (lc0->csr & LEO_CSR_BLT_BUSY);
+			}
+		} else {
+			/* keep ordering in each band, reverse order of bands */
+			pboxBase = pboxNext = pbox+nbox-1;
+
+			while (pboxBase >= pbox) {			/* for each band */
+
+				/* find first box in band */
+				while (pboxNext >= pbox &&
+				       pboxBase->y1 == pboxNext->y1)
+					pboxNext--;
+		
+				pboxTmp = pboxNext+1;			/* first box in band */
+				pptTmp = pptSrc + (pboxTmp - pbox);	/* first point in band */
+		
+				while (pboxTmp <= pboxBase) {		/* for each box in band */
+					if (pptTmp->y <= pboxTmp->y2) {
+						lc0->extent = 0x80000000 | (pboxTmp->x2 - pboxTmp->x1 - 1) |
+							      ((pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+						lc0->src = (pptTmp->x + pboxTmp->x2 - pboxTmp->x1 - 1) |
+							   ((pptTmp->y + pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+						lc0->copy = (pboxTmp->x2 - 1) | ((pboxTmp->y2 - 1) << 11);
+					} else {
+						lc0->extent = (pboxTmp->x2 - pboxTmp->x1 - 1) |
+							      ((pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+						lc0->src = pptTmp->x | (pptTmp->y << 11);
+						lc0->copy = pboxTmp->x1 | (pboxTmp->y1 << 11);
+					}
+					while (lc0->csr & LEO_CSR_BLT_BUSY);
+					++pboxTmp;
+					++pptTmp;	
+				}
+				pboxBase = pboxNext;
+			
+			}
+		}
+	} else {
+		if (pptSrc->x < pbox->x1) {
+			/* reverse order of rects in each band */
+
+			pboxBase = pboxNext = pbox;
+
+			while (pboxBase < pbox+nbox) { /* for each band */
+
+				/* find last box in band */
+				while (pboxNext < pbox+nbox &&
+				       pboxNext->y1 == pboxBase->y1)
+					pboxNext++;
+
+				pboxTmp = pboxNext;			/* last box in band */
+				pptTmp = pptSrc + (pboxTmp - pbox);	/* last point in band */
+
+				if (pptSrc->y == pbox->y1) {
+					while (pboxTmp != pboxBase) {		/* for each box in band */
+						--pboxTmp;
+						--pptTmp;
+						lc0->extent = 0x80000000 | (pboxTmp->x2 - pboxTmp->x1 - 1) |
+							      ((pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+						lc0->src = (pptTmp->x + pboxTmp->x2 - pboxTmp->x1 - 1) |
+							   ((pptTmp->y + pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+						lc0->copy = (pboxTmp->x2 - 1) | ((pboxTmp->y2 - 1) << 11);
+						while (lc0->csr & LEO_CSR_BLT_BUSY);
+					}
+				} else {
+					while (pboxTmp != pboxBase) {		/* for each box in band */
+						--pboxTmp;
+						--pptTmp;
+						lc0->extent = (pboxTmp->x2 - pboxTmp->x1 - 1) |
+							      ((pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+						lc0->src = pptTmp->x | (pptTmp->y << 11);
+						lc0->copy = pboxTmp->x1 | (pboxTmp->y1 << 11);
+						while (lc0->csr & LEO_CSR_BLT_BUSY);
+					}
+				}
+				pboxBase = pboxNext;
+			}
+		} else {
+			while (nbox--) {
+				lc0->extent = (pboxTmp->x2 - pboxTmp->x1 - 1) |
+					      ((pboxTmp->y2 - pboxTmp->y1 - 1) << 11);
+				lc0->src = pptTmp->x | (pptTmp->y << 11);
+				lc0->copy = pboxTmp->x1 | (pboxTmp->y1 << 11);
+				while (lc0->csr & LEO_CSR_BLT_BUSY);
+				pboxTmp++;
+				pptTmp++;
+			}
+		}
+	}
+
+	ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+}
+
+RegionPtr
+LeoCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+		GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty)
+{
+	if (pSrcDrawable->type != DRAWABLE_WINDOW)
+		return cfbCopyArea (pSrcDrawable, pDstDrawable,
+				    pGC, srcx, srcy, width, height, dstx, dsty);
+	return cfbBitBlt (pSrcDrawable, pDstDrawable,
+			  pGC, srcx, srcy, width, height, dstx, dsty, (void (*)())LeoDoBitblt, 0);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_checks.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_checks.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_checks.c	Thu May 18 16:21:39 2000
@@ -0,0 +1,180 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - stipple/tile verification.
+ *
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+
+int
+LeoCheckTile (PixmapPtr pPixmap, LeoStipplePtr stipple, int ox, int oy)
+{
+	unsigned int *sbits;
+	unsigned int fg = 0, bg = 0;
+	int fgset = 0, bgset = 0;
+	unsigned int *tilebitsLine, *tilebits, tilebit;
+	unsigned int sbit, mask;
+	int nbwidth;
+	int h, w;
+	int x, y;
+	int s_y, s_x;
+
+	h = pPixmap->drawable.height;
+	if (h > 32 || (h & (h - 1)))
+		return FALSE;
+	w = pPixmap->drawable.width;
+	if (w > 32 || (w & (w - 1)))
+		return FALSE;
+	stipple->patalign = (oy << 16) | ox;
+	sbits = stipple->bits;
+	tilebitsLine = (unsigned int *) pPixmap->devPrivate.ptr;
+	nbwidth = pPixmap->devKind / sizeof(unsigned int);
+
+	for (y = 0; y < h; y++) {
+		tilebits = tilebitsLine;
+		tilebitsLine += nbwidth;
+		sbit = 0;
+		mask = 1 << 31;
+		for (x = 0; x < w; x++) {
+			tilebit = *tilebits++;
+			if (fgset && tilebit == fg)
+				sbit |=  mask;
+			else if (!bgset || tilebit != bg) {
+				if (!fgset) {
+					fgset = 1;
+					fg = tilebit;
+					sbit |= mask;
+				} else if (!bgset) {
+					bgset = 1;
+					bg = tilebit;
+				} else
+					return FALSE;
+			}
+			mask >>= 1;
+		}
+		for (s_x = w; s_x < 32; s_x <<= 1)
+			sbit = sbit | (sbit >> s_x);
+		sbit = (sbit >> ox) | (sbit << (32 - ox));
+		for (s_y = y; s_y < 32; s_y += h)
+			sbits[(s_y + oy) & 31] = sbit;
+	}
+	stipple->fg = fg;
+	stipple->bg = bg;
+	return TRUE;
+}
+
+int
+LeoCheckStipple (PixmapPtr pPixmap, LeoStipplePtr stipple, int ox, int oy)
+{
+	unsigned int *sbits;
+	unsigned int *stippleBits;
+	unsigned int sbit, mask, nbwidth;
+	int h, w;
+	int y;
+	int s_y, s_x;
+
+	h = pPixmap->drawable.height;
+	if (h > 32 || (h & (h - 1)))
+		return FALSE;
+	w = pPixmap->drawable.width;
+	if (w > 32 || (w & (w - 1)))
+		return FALSE;
+	stipple->patalign = (oy << 16) | ox;
+	sbits = stipple->bits;
+	stippleBits = (unsigned int *) pPixmap->devPrivate.ptr;
+	nbwidth = pPixmap->devKind / sizeof(unsigned int);
+	mask = ~0 << (32 - w);
+	for (y = 0; y < h; y++) {
+		sbit = (*stippleBits) & mask;
+		stippleBits += nbwidth;
+		for (s_x = w; s_x < 32; s_x <<= 1)
+			sbit = sbit | (sbit >> s_x);
+		sbit = (sbit >> ox) | (sbit << (32 - ox));
+		for (s_y = y; s_y < 32; s_y += h)
+			sbits[(s_y + oy) & 31] = sbit;
+	}
+	return TRUE;
+}
+
+int
+LeoCheckFill (GCPtr pGC, DrawablePtr pDrawable)
+{
+	LeoPrivGCPtr gcPriv = LeoGetGCPrivate (pGC);
+	LeoPtr pLeo = LeoGetScreenPrivate(pDrawable->pScreen);
+	LeoStipplePtr stipple;
+	unsigned int alu;
+	int xrot, yrot;
+
+	if (pGC->fillStyle == FillSolid) {
+		if (gcPriv->stipple) {
+			xfree (gcPriv->stipple);
+			gcPriv->stipple = 0;
+		}
+		return TRUE;
+	}
+	if (!(stipple = gcPriv->stipple)) {
+		if (!pLeo->tmpStipple) {
+			pLeo->tmpStipple = (LeoStipplePtr) xalloc (sizeof *pLeo->tmpStipple);
+			if (!pLeo->tmpStipple)
+				return FALSE;
+		}
+		stipple = pLeo->tmpStipple;
+	}
+	xrot = (pGC->patOrg.x + pDrawable->x) & 31;
+	yrot = (pGC->patOrg.y + pDrawable->y) & 31;
+	alu = pGC->alu;
+	switch (pGC->fillStyle) {
+	case FillTiled:
+		if (!LeoCheckTile (pGC->tile.pixmap, stipple, xrot, yrot)) {
+			if (gcPriv->stipple) {
+				xfree (gcPriv->stipple);
+				gcPriv->stipple = 0;
+			}
+			return FALSE;
+		}
+		break;
+	case FillStippled:
+		alu |= 0x80;
+	case FillOpaqueStippled:
+		if (!LeoCheckStipple (pGC->stipple, stipple, xrot, yrot)) {
+			if (gcPriv->stipple) {
+				xfree (gcPriv->stipple);
+				gcPriv->stipple = 0;
+			}
+			return FALSE;
+		}
+		stipple->fg = pGC->fgPixel;
+		stipple->bg = pGC->bgPixel;
+		break;
+	}
+	stipple->alu = alu;
+	gcPriv->stipple = stipple;
+	if (stipple == pLeo->tmpStipple)
+		pLeo->tmpStipple = 0;
+	return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_cursor.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_cursor.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_cursor.c	Thu May 18 16:21:39 2000
@@ -0,0 +1,155 @@
+/*
+ * Hardware cursor support for Leo (ZX)
+ *
+ * Copyright 2000 by Jakub Jelinek <jakub@redhat.com>.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Jakub
+ * Jelinek not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission.  Jakub Jelinek makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * JAKUB JELINEK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL JAKUB JELINEK BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+
+#include "leo.h"
+
+static void LeoLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
+static void LeoShowCursor(ScrnInfoPtr pScrn);
+static void LeoHideCursor(ScrnInfoPtr pScrn);
+static void LeoSetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
+static void LeoSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
+
+static void
+LeoLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
+{
+    LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
+    int i, j, x, y;
+    unsigned int *data = (unsigned int *)src, value;
+
+    pLeo->CursorData = src;
+    x = pLeo->CursorShiftX;
+    y = pLeo->CursorShiftY;
+    if (x >= 32 || y >= 32)
+	y = 32;
+    pLeo->dac->cur_type = 0;
+    for (j = 0; j < 2; j++) {
+	data += y;
+	for (i = y; i < 32; i++, data++) {
+	    value = (*data >> 16) | (*data << 16);
+	    value = ((value & 0xff00ff00) >> 8) |
+		    ((value & 0x00ff00ff) << 8);
+	    pLeo->dac->cur_data = value >> x;
+	}
+	for (i = 0; i < y; i++)
+	    pLeo->dac->cur_data = 0;
+    }
+}
+
+static void 
+LeoShowCursor(ScrnInfoPtr pScrn)
+{
+    LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
+
+    pLeo->dac->cur_misc |= 0x80;
+}
+
+static void
+LeoHideCursor(ScrnInfoPtr pScrn)
+{
+    LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
+
+    pLeo->dac->cur_misc &= ~0x80;
+    pLeo->CursorData = NULL;
+}
+
+static void
+LeoSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+{
+    LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
+    int CursorShiftX = 0, CursorShiftY = 0;
+
+    if (x < 0) {
+	CursorShiftX = -x;
+	x = 0;
+	if (CursorShiftX > 32)
+	    CursorShiftX = 32;
+    }
+    if (y < 0) {
+	CursorShiftY = -y;
+	y = 0;
+	if (CursorShiftY > 32)
+	    CursorShiftY = 32;
+    }
+    pLeo->dac->cur_misc &= ~0x80;
+    if ((CursorShiftX != pLeo->CursorShiftX ||
+	 CursorShiftY != pLeo->CursorShiftY) &&
+	pLeo->CursorData != NULL) {
+	pLeo->CursorShiftX = CursorShiftX;
+	pLeo->CursorShiftY = CursorShiftY;
+	LeoLoadCursorImage(pScrn, pLeo->CursorData);
+    }
+	
+    pLeo->dac->cur_cursxy = ((y & 0x7ff) << 11) | (x & 0x7ff);
+    pLeo->dac->cur_misc |= 0x30;
+    pLeo->dac->cur_misc |= 0x80;
+}
+
+static void
+LeoSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+{
+    LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
+
+    pLeo->dac->cur_type = 0x50;
+    pLeo->dac->cur_data = bg;
+    pLeo->dac->cur_data = fg;
+    pLeo->dac->cur_misc |= 0x03;
+}
+
+Bool 
+LeoHWCursorInit(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    LeoPtr pLeo;
+    xf86CursorInfoPtr infoPtr;
+
+    pLeo = GET_LEO_FROM_SCRN(pScrn);
+    pLeo->CursorShiftX = 0;
+    pLeo->CursorShiftY = 0;
+    pLeo->CursorData = NULL;
+
+    infoPtr = xf86CreateCursorInfoRec();
+    if(!infoPtr) return FALSE;
+    
+    pLeo->CursorInfoRec = infoPtr;
+    pLeo->dac = (LeoCursor *)((char *)pLeo->fb + LEO_LX0_CURSOR_VOFF);
+
+    infoPtr->MaxWidth = 32;
+    infoPtr->MaxHeight = 32;
+    infoPtr->Flags =  HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
+	HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK |
+	HARDWARE_CURSOR_BIT_ORDER_MSBFIRST |
+	HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED;
+
+    infoPtr->SetCursorColors = LeoSetCursorColors;
+    infoPtr->SetCursorPosition = LeoSetCursorPosition;
+    infoPtr->LoadCursorImage = LeoLoadCursorImage;
+    infoPtr->HideCursor = LeoHideCursor;
+    infoPtr->ShowCursor = LeoShowCursor;
+    infoPtr->UseHWCursor = NULL;
+
+    return xf86InitCursor(pScreen, infoPtr);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c	Mon May 22 21:47:46 2000
@@ -0,0 +1,690 @@
+/*
+ * Leo (ZX) framebuffer driver.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.2 2000/05/23 04:47:46 dawes Exp $ */
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Version.h"
+#include "mipointer.h"
+#include "mibstore.h"
+#include "micmap.h"
+
+#define PSZ 32
+#include "cfb.h"
+#undef PSZ
+#include "xf86cmap.h"
+#include "leo.h"
+
+static OptionInfoPtr LeoAvailableOptions(int chipid, int busid);
+static void	LeoIdentify(int flags);
+static Bool	LeoProbe(DriverPtr drv, int flags);
+static Bool	LeoPreInit(ScrnInfoPtr pScrn, int flags);
+static Bool	LeoScreenInit(int Index, ScreenPtr pScreen, int argc,
+			      char **argv);
+static Bool	LeoEnterVT(int scrnIndex, int flags);
+static void	LeoLeaveVT(int scrnIndex, int flags);
+static Bool	LeoCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	LeoSaveScreen(ScreenPtr pScreen, int mode);
+
+/* Required if the driver supports mode switching */
+static Bool	LeoSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+/* Required if the driver supports moving the viewport */
+static void	LeoAdjustFrame(int scrnIndex, int x, int y, int flags);
+
+/* Optional functions */
+static void	LeoFreeScreen(int scrnIndex, int flags);
+static int	LeoValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
+
+void LeoSync(ScrnInfoPtr pScrn);
+
+#define VERSION 4000
+#define LEO_NAME "SUNLEO"
+#define LEO_DRIVER_NAME "sunleo"
+#define LEO_MAJOR_VERSION 1
+#define LEO_MINOR_VERSION 0
+#define LEO_PATCHLEVEL 0
+
+/* 
+ * This contains the functions needed by the server after loading the driver
+ * module.  It must be supplied, and gets passed back by the SetupProc
+ * function in the dynamic case.  In the static case, a reference to this
+ * is compiled in, and this requires that the name of this DriverRec be
+ * an upper-case version of the driver name.
+ */
+
+DriverRec SUNLEO = {
+    VERSION,
+    LEO_DRIVER_NAME,
+    LeoIdentify,
+    LeoProbe,
+    LeoAvailableOptions,
+    NULL,
+    0
+};
+
+typedef enum {
+    OPTION_SW_CURSOR,
+    OPTION_HW_CURSOR,
+    OPTION_NOACCEL
+} LeoOpts;
+
+static OptionInfoRec LeoOptions[] = {
+    { OPTION_SW_CURSOR,		"SWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_HW_CURSOR,		"HWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_NOACCEL,		"NoAccel",	OPTV_BOOLEAN,	{0}, FALSE },
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+
+#ifdef XFree86LOADER
+
+static MODULESETUPPROTO(leoSetup);
+
+static XF86ModuleVersionInfo sunleoVersRec =
+{
+	"sunleo",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	LEO_MAJOR_VERSION, LEO_MINOR_VERSION, LEO_PATCHLEVEL,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0,0,0,0}
+};
+
+XF86ModuleData sunleoModuleData = { &sunleoVersRec, leoSetup, NULL };
+
+pointer
+leoSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    static Bool setupDone = FALSE;
+
+    if (!setupDone) {
+	setupDone = TRUE;
+	xf86AddDriver(&SUNLEO, module, 0);
+
+	/*
+	 * Modules that this driver always requires can be loaded here
+	 * by calling LoadSubModule().
+	 */
+
+	/*
+	 * The return value must be non-NULL on success even though there
+	 * is no TearDownProc.
+	 */
+	return (pointer)TRUE;
+    } else {
+	if (errmaj) *errmaj = LDR_ONCEONLY;
+	return NULL;
+    }
+}
+
+#endif /* XFree86LOADER */
+
+static Bool
+LeoGetRec(ScrnInfoPtr pScrn)
+{
+    /*
+     * Allocate an LeoRec, and hook it into pScrn->driverPrivate.
+     * pScrn->driverPrivate is initialised to NULL, so we can check if
+     * the allocation has already been done.
+     */
+    if (pScrn->driverPrivate != NULL)
+	return TRUE;
+
+    pScrn->driverPrivate = xnfcalloc(sizeof(LeoRec), 1);
+    return TRUE;
+}
+
+static void
+LeoFreeRec(ScrnInfoPtr pScrn)
+{
+    LeoPtr pLeo;
+
+    if (pScrn->driverPrivate == NULL)
+	return;
+
+    pLeo = GET_LEO_FROM_SCRN(pScrn);
+
+    xfree(pScrn->driverPrivate);
+    pScrn->driverPrivate = NULL;
+
+    return;
+}
+
+static 
+OptionInfoPtr
+LeoAvailableOptions(int chipid, int busid)
+{
+    return LeoOptions;
+}
+
+/* Mandatory */
+static void
+LeoIdentify(int flags)
+{
+    xf86Msg(X_INFO, "%s: driver for Leo (ZX)\n", LEO_NAME);
+}
+
+
+/* Mandatory */
+static Bool
+LeoProbe(DriverPtr drv, int flags)
+{
+    int i;
+    GDevPtr *devSections = NULL;
+    int *usedChips;
+    int numDevSections;
+    int numUsed;
+    Bool foundScreen = FALSE;
+    EntityInfoPtr pEnt;
+
+    /*
+     * The aim here is to find all cards that this driver can handle,
+     * and for the ones not already claimed by another driver, claim the
+     * slot, and allocate a ScrnInfoRec.
+     *
+     * This should be a minimal probe, and it should under no circumstances
+     * change the state of the hardware.  Because a device is found, don't
+     * assume that it will be used.  Don't do any initialisations other than
+     * the required ScrnInfoRec initialisations.  Don't allocate any new
+     * data structures.
+     */
+
+    /*
+     * Next we check, if there has been a chipset override in the config file.
+     * For this we must find out if there is an active device section which
+     * is relevant, i.e., which has no driver specified or has THIS driver
+     * specified.
+     */
+
+    if ((numDevSections = xf86MatchDevice(LEO_DRIVER_NAME,
+					  &devSections)) <= 0) {
+	/*
+	 * There's no matching device section in the config file, so quit
+	 * now.
+	 */
+	return FALSE;
+    }
+
+    /*
+     * We need to probe the hardware first.  We then need to see how this
+     * fits in with what is given in the config file, and allow the config
+     * file info to override any contradictions.
+     */
+
+    numUsed = xf86MatchSbusInstances(LEO_NAME, SBUS_DEVICE_LEO,
+		   devSections, numDevSections,
+		   drv, &usedChips);
+				    
+    if (devSections)
+	xfree(devSections);
+    devSections = NULL;
+    if (numUsed <= 0)
+	return FALSE;
+
+    if (flags & PROBE_DETECT)
+	foundScreen = TRUE;
+    else for (i = 0; i < numUsed; i++) {
+	pEnt = xf86GetEntityInfo(usedChips[i]);
+
+	/*
+	 * Check that nothing else has claimed the slots.
+	 */
+	if(pEnt->active) {
+	    ScrnInfoPtr pScrn;
+	    
+	    /* Allocate a ScrnInfoRec and claim the slot */
+	    pScrn = xf86AllocateScreen(drv, 0);
+
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = VERSION;
+	    pScrn->driverName	 = LEO_DRIVER_NAME;
+	    pScrn->name		 = LEO_NAME;
+	    pScrn->Probe	 = LeoProbe;
+	    pScrn->PreInit	 = LeoPreInit;
+	    pScrn->ScreenInit	 = LeoScreenInit;
+  	    pScrn->SwitchMode	 = LeoSwitchMode;
+  	    pScrn->AdjustFrame	 = LeoAdjustFrame;
+	    pScrn->EnterVT	 = LeoEnterVT;
+	    pScrn->LeaveVT	 = LeoLeaveVT;
+	    pScrn->FreeScreen	 = LeoFreeScreen;
+	    pScrn->ValidMode	 = LeoValidMode;
+	    xf86AddEntityToScreen(pScrn, pEnt->index);
+	    foundScreen = TRUE;
+	}
+	xfree(pEnt);
+    }
+    return foundScreen;
+}
+
+/* Mandatory */
+static Bool
+LeoPreInit(ScrnInfoPtr pScrn, int flags)
+{
+    LeoPtr pLeo;
+    sbusDevicePtr psdp;
+    MessageType from;
+    int i;
+
+    if (flags & PROBE_DETECT) return FALSE;
+
+    /*
+     * Note: This function is only called once at server startup, and
+     * not at the start of each server generation.  This means that
+     * only things that are persistent across server generations can
+     * be initialised here.  xf86Screens[] is (pScrn is a pointer to one
+     * of these).  Privates allocated using xf86AllocateScrnInfoPrivateIndex()  
+     * are too, and should be used for data that must persist across
+     * server generations.
+     *
+     * Per-generation data should be allocated with
+     * AllocateScreenPrivateIndex() from the ScreenInit() function.
+     */
+
+    /* Allocate the LeoRec driverPrivate */
+    if (!LeoGetRec(pScrn)) {
+	return FALSE;
+    }
+    pLeo = GET_LEO_FROM_SCRN(pScrn);
+    
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
+
+    /* This driver doesn't expect more than one entity per screen */
+    if (pScrn->numEntities > 1)
+	return FALSE;
+    /* This is the general case */
+    for (i = 0; i < pScrn->numEntities; i++) {
+	EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+
+	/* LEO is purely SBUS */
+	if (pEnt->location.type == BUS_SBUS) {
+	    psdp = xf86GetSbusInfoForEntity(pEnt->index);
+	    pLeo->psdp = psdp;
+	} else
+	    return FALSE;
+    }
+
+    /*********************
+    deal with depth
+    *********************/
+    
+    if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support32bppFb)) {
+	return FALSE;
+    } else {
+	/* Check that the returned depth is one we support */
+	switch (pScrn->depth) {
+	case 32:
+	    /* OK */
+	    break;
+	default:
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "Given depth (%d) is not supported by this driver\n",
+		       pScrn->depth);
+	    return FALSE;
+	}
+    }
+
+    /* Collect all of the relevant option flags (fill in pScrn->options) */
+    xf86CollectOptions(pScrn, NULL);
+    /* Process the options */
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, LeoOptions);
+    
+    /*
+     * This must happen after pScrn->display has been set because
+     * xf86SetWeight references it.
+     */
+    if (pScrn->depth > 8) {
+	rgb weight = {10, 11, 11};
+	rgb mask = {0xff, 0xff00, 0xff0000};
+
+	if (!xf86SetWeight(pScrn, weight, mask)) {
+	    return FALSE;
+	}
+    }
+
+    if (!xf86SetDefaultVisual(pScrn, -1)) {
+	return FALSE;
+    } else {
+	/* We don't currently support DirectColor */
+	if (pScrn->defaultVisual != TrueColor) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Given default visual"
+		       " (%s) is not supported\n",
+		       xf86GetVisualName(pScrn->defaultVisual));
+	    return FALSE;
+	}
+    }
+
+    /*
+     * The new cmap code requires this to be initialised.
+     */
+
+    {
+	Gamma zeros = {0.0, 0.0, 0.0};
+
+	if (!xf86SetGamma(pScrn, zeros)) {
+	    return FALSE;
+	}
+    }
+
+    /* Set the bits per RGB for 8bpp mode */
+    from = X_DEFAULT;
+
+    /* determine whether we use hardware or software cursor */
+    
+    pLeo->HWCursor = TRUE;
+    if (xf86GetOptValBool(LeoOptions, OPTION_HW_CURSOR, &pLeo->HWCursor))
+	from = X_CONFIG;
+    if (xf86ReturnOptValBool(LeoOptions, OPTION_SW_CURSOR, FALSE)) {
+	from = X_CONFIG;
+	pLeo->HWCursor = FALSE;
+    }
+    
+    xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
+		pLeo->HWCursor ? "HW" : "SW");
+
+    if (xf86ReturnOptValBool(LeoOptions, OPTION_NOACCEL, FALSE)) {
+	pLeo->NoAccel = TRUE;
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
+    }
+        
+    if (xf86LoadSubModule(pScrn, "cfb32") == NULL) {
+	LeoFreeRec(pScrn);
+	return FALSE;
+    }
+
+    if (pLeo->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
+	LeoFreeRec(pScrn);
+	return FALSE;
+    }
+
+    /*********************
+    set up clock and mode stuff
+    *********************/
+    
+    pScrn->progClock = TRUE;
+
+    if(pScrn->display->virtualX || pScrn->display->virtualY) {
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "Leo does not support a virtual desktop\n");
+	pScrn->display->virtualX = 0;
+	pScrn->display->virtualY = 0;
+    }
+
+    xf86SbusUseBuiltinMode(pScrn, pLeo->psdp);
+    pScrn->currentMode = pScrn->modes;
+    pScrn->displayWidth = pScrn->virtualX;
+
+    /* Set display resolution */
+    xf86SetDpi(pScrn, 0, 0);
+
+    return TRUE;
+}
+
+/* Mandatory */
+
+/* This gets called at the start of each server generation */
+
+static Bool
+LeoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+{
+    ScrnInfoPtr pScrn;
+    LeoPtr pLeo;
+    int ret;
+    VisualPtr visual;
+    extern Bool LeoAccelInit(ScreenPtr pScreen, LeoPtr pLeo);
+
+    /* 
+     * First get the ScrnInfoRec
+     */
+    pScrn = xf86Screens[pScreen->myNum];
+
+    pLeo = GET_LEO_FROM_SCRN(pScrn);
+
+    /* Map the Leo memory */
+    pLeo->fb =
+	xf86MapSbusMem (pLeo->psdp, LEO_FB0_VOFF, 0x803000);
+
+    if (! pLeo->fb)
+	return FALSE;
+
+    /* Darken the screen for aesthetic reasons and set the viewport */
+    LeoSaveScreen(pScreen, SCREEN_SAVER_ON);
+
+    /*
+     * The next step is to setup the screen's visuals, and initialise the
+     * framebuffer code.  In cases where the framebuffer's default
+     * choices for things like visual layouts and bits per RGB are OK,
+     * this may be as simple as calling the framebuffer's ScreenInit()
+     * function.  If not, the visuals will need to be setup before calling
+     * a fb ScreenInit() function and fixed up after.
+     */
+
+    /*
+     * Reset visual list.
+     */
+    miClearVisualTypes();
+
+    /* Setup the visuals we support. */
+
+    if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits,
+			  pScrn->defaultVisual))
+	return FALSE;
+
+    /*
+     * Call the framebuffer layer's ScreenInit function, and fill in other
+     * pScreen fields.
+     */
+
+    ret = cfb32ScreenInit(pScreen, pLeo->fb, pScrn->virtualX,
+			  pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+			  2048);
+    if (!ret)
+	return FALSE;
+
+    miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+
+    xf86SetBlackWhitePixels(pScreen);
+
+    if (pScrn->bitsPerPixel > 8) {
+        /* Fixup RGB ordering */
+        visual = pScreen->visuals + pScreen->numVisuals;
+        while (--visual >= pScreen->visuals) {
+	    if ((visual->class | DynamicClass) == DirectColor) {
+		visual->offsetRed = pScrn->offset.red;
+		visual->offsetGreen = pScrn->offset.green;
+		visual->offsetBlue = pScrn->offset.blue;
+		visual->redMask = pScrn->mask.red;
+		visual->greenMask = pScrn->mask.green;
+		visual->blueMask = pScrn->mask.blue;
+	    }
+	}
+    }
+
+    if (!LeoAccelInit(pScreen, pLeo))
+	return FALSE;
+
+    if (!pLeo->NoAccel)
+	xf86Msg(X_INFO, "%s: Using acceleration\n", pLeo->psdp->device);
+
+    /* Initialise cursor functions */
+    miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
+
+    /* Initialize HW cursor layer. 
+       Must follow software cursor initialization*/
+    if (pLeo->HWCursor) { 
+	extern Bool LeoHWCursorInit(ScreenPtr pScreen);
+
+	if(!LeoHWCursorInit(pScreen)) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
+		       "Hardware cursor initialization failed\n");
+	    return(FALSE);
+	}
+	xf86SbusHideOsHwCursor(pLeo->psdp);
+    }
+
+    /* Initialise default colourmap */
+    if (!miCreateDefColormap(pScreen))
+	return FALSE;
+
+    pLeo->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = LeoCloseScreen;
+    pScreen->SaveScreen = LeoSaveScreen;
+
+    /* Report any unused options (only for the first generation) */
+    if (serverGeneration == 1) {
+	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+    }
+
+    /* unblank the screen */
+    LeoSaveScreen(pScreen, SCREEN_SAVER_OFF);
+
+    /* Done */
+    return TRUE;
+}
+
+
+/* Usually mandatory */
+static Bool
+LeoSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This function is used to initialize the Start Address - the first
+ * displayed location in the video memory.
+ */
+/* Usually mandatory */
+static void 
+LeoAdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+    /* we don't support virtual desktops */
+    return;
+}
+
+extern void LeoVtChange (ScreenPtr pScreen, int enter);
+
+/*
+ * This is called when VT switching back to the X server.  Its job is
+ * to reinitialise the video mode.
+ */
+
+/* Mandatory */
+static Bool
+LeoEnterVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
+
+    LeoVtChange (pScrn->pScreen, TRUE);
+    if (pLeo->HWCursor)
+	xf86SbusHideOsHwCursor (pLeo->psdp);
+    return TRUE;
+}
+
+
+/*
+ * This is called when VT switching away from the X server.
+ */
+
+/* Mandatory */
+static void
+LeoLeaveVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+
+    LeoVtChange (pScrn->pScreen, FALSE);
+}
+
+
+/*
+ * This is called at the end of each server generation.  It restores the
+ * original (text) mode.  It should really also unmap the video memory too.
+ */
+
+/* Mandatory */
+static Bool
+LeoCloseScreen(int scrnIndex, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
+
+    pScrn->vtSema = FALSE;
+    xf86UnmapSbusMem(pLeo->psdp, pLeo->fb, 0x803000);
+
+    pScreen->CloseScreen = pLeo->CloseScreen;
+    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+    return FALSE;
+}
+
+
+/* Free up any per-generation data structures */
+
+/* Optional */
+static void
+LeoFreeScreen(int scrnIndex, int flags)
+{
+    LeoFreeRec(xf86Screens[scrnIndex]);
+}
+
+
+/* Checks if a mode is suitable for the selected chipset. */
+
+/* Optional */
+static int
+LeoValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+{
+    if (mode->Flags & V_INTERLACE)
+	return(MODE_BAD);
+
+    return(MODE_OK);
+}
+
+/* Do screen blanking */
+
+/* Mandatory */
+static Bool
+LeoSaveScreen(ScreenPtr pScreen, int mode)
+    /* this function should blank the screen when unblank is FALSE and
+       unblank it when unblank is TRUE -- it doesn't actually seem to be
+       used for much though */
+{
+    return TRUE;
+}
+
+/*
+ * This is the implementation of the Sync() function.
+ */
+void
+LeoSync(ScrnInfoPtr pScrn)
+{
+    return;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c	Mon May 22 21:47:47 2000
@@ -0,0 +1,233 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - Rectangle filling.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+#include "leo_regs.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+#include "cfbmskbits.h"
+
+void
+LeoPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
+	LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+	LeoCommand0 	*lc0 = pLeo->lc0;
+	LeoDraw		*ld0 = pLeo->ld0;
+	xRectangle	*prect;
+	RegionPtr	prgnClip;
+	register BoxPtr	pbox;
+	BoxPtr		pextent;
+	int		n;
+	int		xorg, yorg;
+    
+	/* No garbage please. */
+	if(nrectFill <= 0)
+		return;
+
+	prgnClip = cfbGetCompositeClip(pGC);
+
+	prect = prectInit;
+	xorg = pDrawable->x;
+	yorg = pDrawable->y;
+	if (xorg || yorg) {
+		prect = prectInit;
+		n = nrectFill;
+		while(n--) {
+			prect->x += xorg;
+			prect->y += yorg;
+			prect++;
+		}
+	}
+
+	prect = prectInit;
+	
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	ld0->fg = pGC->fgPixel;
+
+	if (REGION_NUM_RECTS(prgnClip) == 1) {
+		int x1, y1, x2, y2;
+		int x, y, xx, yy;
+
+		pextent = REGION_RECTS(prgnClip);
+		x1 = pextent->x1;
+		y1 = pextent->y1;
+		x2 = pextent->x2;
+		y2 = pextent->y2;
+		while (nrectFill--) {
+			x = prect->x;
+			y = prect->y;
+			xx = x + prect->width;
+			yy = y + prect->height;
+			if (x < x1)
+				x = x1;
+			if (y < y1)
+				y = y1;
+			prect++;
+			if (xx > x2) xx = x2;
+			if (yy > y2) yy = y2;
+			if (x >= xx) continue;
+			if (y >= yy) continue;
+
+			lc0->extent = (xx - x - 1) | ((yy - y - 1) << 11);
+			lc0->fill = x | (y << 11);
+			while (lc0->csr & LEO_CSR_BLT_BUSY);
+		}
+	} else {
+		int x1, y1, x2, y2, bx1, by1, bx2, by2;
+		int x, y, w, h;
+
+		pextent = REGION_EXTENTS(pGC->pScreen, prgnClip);
+		x1 = pextent->x1;
+		y1 = pextent->y1;
+		x2 = pextent->x2;
+		y2 = pextent->y2;
+		while (nrectFill--) {
+			if ((bx1 = prect->x) < x1)
+				bx1 = x1;
+    
+			if ((by1 = prect->y) < y1)
+				by1 = y1;
+    
+			bx2 = (int) prect->x + (int) prect->width;
+			if (bx2 > x2)
+				bx2 = x2;
+    
+			by2 = (int) prect->y + (int) prect->height;
+			if (by2 > y2)
+				by2 = y2;
+
+			prect++;
+    
+			if (bx1 >= bx2 || by1 >= by2)
+				continue;
+    
+			n = REGION_NUM_RECTS (prgnClip);
+			pbox = REGION_RECTS(prgnClip);
+    
+			/* clip the rectangle to each box in the clip region
+			   this is logically equivalent to calling Intersect()
+			 */
+			while(n--) {
+				x = max(bx1, pbox->x1);
+				y = max(by1, pbox->y1);
+				w = min(bx2, pbox->x2) - x;
+				h = min(by2, pbox->y2) - y;
+				pbox++;
+
+				/* see if clipping left anything */
+				if (w > 0 && h > 0) {
+					lc0->extent = (w - 1) | ((h - 1) << 11);
+					lc0->fill = x | (y << 11);
+			
+					while (lc0->csr & LEO_CSR_BLT_BUSY);
+				}
+			}
+		}
+	}
+	
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+}
+
+void
+LeoPolyFillRect1Rect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
+	LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+	LeoCommand0 	*lc0 = pLeo->lc0;
+	LeoDraw		*ld0 = pLeo->ld0;
+	xRectangle	*prect;
+	RegionPtr	prgnClip;
+	BoxPtr		pextent;
+	int		n;
+	int		xorg, yorg;
+	int		x1, y1, x2, y2;
+	int		x, y, xx, yy;
+    
+	/* No garbage please. */
+	if(nrectFill <= 0)
+		return;
+
+	prgnClip = cfbGetCompositeClip(pGC);
+
+	prect = prectInit;
+	xorg = pDrawable->x;
+	yorg = pDrawable->y;
+	if (xorg || yorg) {
+		prect = prectInit;
+		n = nrectFill;
+		while(n--) {
+			prect->x += xorg;
+			prect->y += yorg;
+			prect++;
+		}
+	}
+
+	prect = prectInit;
+	
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	ld0->fg = pGC->fgPixel;
+
+	pextent = REGION_RECTS(prgnClip);
+	x1 = pextent->x1;
+	y1 = pextent->y1;
+	x2 = pextent->x2;
+	y2 = pextent->y2;
+	while (nrectFill--) {
+		x = prect->x;
+		y = prect->y;
+		xx = x + prect->width;
+		yy = y + prect->height;
+		if (x < x1)
+			x = x1;
+		if (y < y1)
+			y = y1;
+		prect++;
+		if (xx > x2) xx = x2;
+		if (x >= xx) continue;
+		if (yy > y2) yy = y2;
+		if (y >= yy) continue;
+
+		lc0->extent = (xx - x - 1) | ((yy - y - 1) << 11);
+		lc0->fill = x | (y << 11);
+		while (lc0->csr & LEO_CSR_BLT_BUSY);
+	}
+	
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c:1.2
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c	Mon May 22 21:47:47 2000
@@ -0,0 +1,276 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - Tiled/stippled rectangle filling.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+#include "leo_regs.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+#include "cfbmskbits.h"
+
+void
+LeoPolyFillStippledRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
+{
+	LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+	LeoPrivGCPtr	gcPriv = LeoGetGCPrivate (pGC);
+	LeoCommand0 	*lc0 = pLeo->lc0;
+	LeoDraw		*ld0 = pLeo->ld0;
+	xRectangle	*prect;
+	RegionPtr	prgnClip;
+	register BoxPtr	pbox;
+	BoxPtr		pextent;
+	int		n;
+	int		xorg, yorg;
+	unsigned char	*fb;
+	unsigned int	*dst, *dline, *src, *srcstart, *srcend;
+    
+	/* No garbage please. */
+	if(nrectFill <= 0)
+		return;
+
+	prgnClip = cfbGetCompositeClip(pGC);
+
+	prect = prectInit;
+	xorg = pDrawable->x;
+	yorg = pDrawable->y;
+	if (xorg || yorg) {
+		prect = prectInit;
+		n = nrectFill;
+		while(n--) {
+			prect->x += xorg;
+			prect->y += yorg;
+			prect++;
+		}
+	}
+
+	prect = prectInit;
+	
+	if ((gcPriv->stipple->alu & 0xf) != GXcopy)
+		ld0->rop = leoRopTable[gcPriv->stipple->alu & 0xf];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	ld0->fg = gcPriv->stipple->fg;
+	lc0->addrspace = LEO_ADDRSPC_FONT_OBGR;
+	if (gcPriv->stipple->alu & 0x80) {
+		lc0->fontt = 1;
+	} else {
+		lc0->fontt = 0;
+		ld0->bg = gcPriv->stipple->bg;
+	}
+	fb = (unsigned char *)pLeo->fb;
+	srcstart = &gcPriv->stipple->bits[0];
+	srcend = &gcPriv->stipple->bits[32];
+
+	if (REGION_NUM_RECTS(prgnClip) == 1) {
+		int x1, y1, x2, y2;
+		int x, y, xx, yy, w, h;
+		int i, j, sw, sm, ew, em, s;
+
+		pextent = REGION_RECTS(prgnClip);
+		x1 = pextent->x1;
+		y1 = pextent->y1;
+		x2 = pextent->x2;
+		y2 = pextent->y2;
+		while (nrectFill--) {
+			x = prect->x;
+			y = prect->y;
+			xx = x + prect->width;
+			yy = y + prect->height;
+			if (x < x1) x = x1;
+			if (y < y1) y = y1;
+			if (xx > x2) xx = x2;
+			if (yy > y2) yy = y2;
+			prect++;
+			if (x >= xx) continue;
+			if (y >= yy) continue;
+			prect++;
+			w = xx - x;
+			h = yy - y;
+			if (x & 31) {
+				sw = 32 - (x & 31);
+				sm = 0xffffffff >> (x & 31);
+			} else {
+				sw = 0;
+				sm = 0xffffffff;
+			}
+			dline = (unsigned int *)(fb + (y << 13) + ((x & ~31) << 2));
+			src = srcstart + (y & 31);
+			w -= sw;
+			if (w <= 0) {
+				if (w)
+					sm &= 0xffffffff << (32 - (w & 31));
+				lc0->fontmsk = sm;
+				
+				for (i = 0; i < h; i++) {
+					s = *src++;
+					*dline = s;
+					if (src == srcend)
+						src = srcstart;
+					dline += 2048;
+				}
+			} else {
+				ew = w & 31;
+				em = 0xffffffff << (32 - ew);
+				w &= ~31;
+				
+				if (!sw && !ew)
+					lc0->fontmsk = 0xffffffff;
+				for (i = 0; i < h; i++) {
+					s = *src++;
+					dst = dline;
+					if (sw) {
+						lc0->fontmsk = sm;
+						*dst = s;
+						dst += 32;
+						lc0->fontmsk = 0xffffffff;
+					} else if (ew)
+						lc0->fontmsk = 0xffffffff;
+					for (j = 0; j < w; j += 32) {
+						*dst = s;
+						dst += 32;
+					}
+					if (ew) {
+						lc0->fontmsk = em;
+						*dst = s;
+					}
+					if (src == srcend)
+						src = srcstart;
+					dline += 2048;
+				}
+			}
+		}
+	} else {
+		int x1, y1, x2, y2, bx1, by1, bx2, by2;
+		int x, y, w, h;
+		int i, j, sw, sm, ew, em, s;
+
+		pextent = REGION_EXTENTS(pGC->pScreen, prgnClip);
+		x1 = pextent->x1;
+		y1 = pextent->y1;
+		x2 = pextent->x2;
+		y2 = pextent->y2;
+		while (nrectFill--) {
+			if ((bx1 = prect->x) < x1)
+				bx1 = x1;
+    
+			if ((by1 = prect->y) < y1)
+				by1 = y1;
+    
+			bx2 = (int) prect->x + (int) prect->width;
+			if (bx2 > x2)
+				bx2 = x2;
+    
+			by2 = (int) prect->y + (int) prect->height;
+			if (by2 > y2)
+				by2 = y2;
+
+			prect++;
+    
+			if (bx1 >= bx2 || by1 >= by2)
+				continue;
+    
+			n = REGION_NUM_RECTS (prgnClip);
+			pbox = REGION_RECTS(prgnClip);
+    
+			/* clip the rectangle to each box in the clip region
+			   this is logically equivalent to calling Intersect()
+			 */
+			while(n--) {
+				x = max(bx1, pbox->x1);
+				y = max(by1, pbox->y1);
+				w = min(bx2, pbox->x2) - x;
+				h = min(by2, pbox->y2) - y;
+				pbox++;
+
+				/* see if clipping left anything */
+				if (w > 0 && h > 0) {
+					if (x & 31) {
+						sw = 32 - (x & 31);
+						sm = 0xffffffff >> (x & 31);
+					} else {
+						sw = 0;
+						sm = 0xffffffff;
+					}
+					dline = (unsigned int *)(fb + (y << 13) + ((x & ~31) << 2));
+					src = srcstart + (y & 31);
+					w -= sw;
+					if (w <= 0) {
+						w += 32;
+						if (w != 32)
+							sm &= 0xffffffff << (32 - (w & 31));
+						lc0->fontmsk = sm;
+				
+						for (i = 0; i < h; i++) {
+							s = *src++;
+							*dline = s;
+							if (src == srcend)
+								src = srcstart;
+							dline += 2048;
+						}
+					} else {
+						ew = w & 31;
+						em = 0xffffffff << (32 - ew);
+						w &= ~31;
+				
+						if (!sw && !ew)
+							lc0->fontmsk = 0xffffffff;
+		
+						for (i = 0; i < h; i++) {
+							s = *src++;
+							dst = dline;
+							if (sw) {
+								lc0->fontmsk = sm;
+								*dst = s;
+								dst += 32;
+								lc0->fontmsk = 0xffffffff;
+							} else if (ew)
+								lc0->fontmsk = 0xffffffff;
+							for (j = 0; j < w; j += 32) {
+								*dst = s;
+								dst += 32;
+							}
+							if (ew) {
+								lc0->fontmsk = em;
+								*dst = s;
+							}
+							if (src == srcend)
+								src = srcstart;
+							dline += 2048;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+	lc0->addrspace = LEO_ADDRSPC_OBGR;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspans.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspans.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspans.c	Thu May 18 16:21:40 2000
@@ -0,0 +1,127 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - Fill spans.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+#include "mi.h"
+#include "mispans.h"
+
+void
+LeoFillSpansSolid (DrawablePtr pDrawable, GCPtr pGC,
+		   int n, DDXPointPtr ppt,
+		   int *pwidth, int fSorted)
+{
+	LeoPtr pLeo = LeoGetScreenPrivate (pGC->pScreen);
+	LeoCommand0 *lc0 = pLeo->lc0;
+	LeoDraw *ld0 = pLeo->ld0;
+	int numRects, *pwidthFree;
+	DDXPointPtr pptFree;
+	RegionPtr clip;
+	unsigned char *fb;
+	int fg;
+	int cx1 = 0, cy1 = 0, cx2 = 0, cy2 = 0;
+
+	clip = cfbGetCompositeClip(pGC);
+	numRects = REGION_NUM_RECTS(clip);
+	
+	if (!numRects)
+		return;
+		
+	if (numRects == 1) {
+		cx1 = clip->extents.x1;
+		cx2 = clip->extents.x2;
+		cy1 = clip->extents.y1;
+		cy2 = clip->extents.y2;
+	} else {
+		int nTmp = n * miFindMaxBand(clip);
+
+		pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
+		pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
+		if (!pptFree || !pwidthFree) {
+			if (pptFree) DEALLOCATE_LOCAL(pptFree);
+			if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
+			return;
+		}
+		n = miClipSpans(clip,
+				ppt, pwidth, n,
+				pptFree, pwidthFree, fSorted);
+		pwidth = pwidthFree;
+		ppt = pptFree;
+	}
+	
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	ld0->fg = fg = pGC->fgPixel;
+	fb = (unsigned char *)pLeo->fb;
+	
+	while (n--) {
+		int x, y, w;
+		unsigned int *fbf;
+		
+		w = *pwidth++;
+		x = ppt->x;
+		y = ppt->y;
+		ppt++;
+
+		if (numRects == 1) {
+			if (y < cy1 || y >= cy2) continue;
+			if (x < cx1) {
+				w -= (cx1 - x);
+				if (w <= 0) continue;
+				x = cx1;
+			}
+			if (x + w > cx2) {
+				if (x >= cx2) continue;
+				w = cx2 - x;
+			}
+		}
+		
+		if (w > 12) {
+			lc0->extent = w - 1;
+			lc0->fill = (y << 11) | x;
+			while (lc0->csr & LEO_CSR_BLT_BUSY);
+		} else {
+			fbf = (unsigned int *)(fb + (y << 13) + (x << 2));
+			while (w--)
+				*fbf++ = fg;
+		}
+	}
+	
+	if (numRects != 1) {
+		DEALLOCATE_LOCAL(pptFree);
+		DEALLOCATE_LOCAL(pwidthFree);
+	}
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspanssp.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspanssp.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspanssp.c	Thu May 18 16:21:40 2000
@@ -0,0 +1,166 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - Fill tiled/stippled spans.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+#include "mi.h"
+#include "mispans.h"
+
+void
+LeoFillSpansStippled (DrawablePtr pDrawable, GCPtr pGC,
+		      int n, DDXPointPtr ppt,
+		      int *pwidth, int fSorted)
+{
+	LeoPrivGCPtr gcPriv = LeoGetGCPrivate (pGC);
+	LeoPtr pLeo = LeoGetScreenPrivate (pGC->pScreen);
+	LeoCommand0 *lc0 = pLeo->lc0;
+	LeoDraw *ld0 = pLeo->ld0;
+	int numRects, *pwidthFree;
+	DDXPointPtr pptFree;
+	RegionPtr clip;
+	unsigned char *fb;
+	unsigned int *bits, msk;
+	int cx1 = 0, cy1 = 0, cx2 = 0, cy2 = 0;
+
+	clip = cfbGetCompositeClip(pGC);
+	numRects = REGION_NUM_RECTS(clip);
+	
+	if (!numRects)
+		return;
+		
+	if (numRects == 1) {
+		cx1 = clip->extents.x1;
+		cx2 = clip->extents.x2;
+		cy1 = clip->extents.y1;
+		cy2 = clip->extents.y2;
+	} else {
+		int nTmp = n * miFindMaxBand(clip);
+
+		pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
+		pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
+		if (!pptFree || !pwidthFree) {
+			if (pptFree) DEALLOCATE_LOCAL(pptFree);
+			if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
+			return;
+		}
+		n = miClipSpans(clip,
+				ppt, pwidth, n,
+				pptFree, pwidthFree, fSorted);
+		pwidth = pwidthFree;
+		ppt = pptFree;
+	}
+	
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	ld0->fg = gcPriv->stipple->fg;
+	fb = (unsigned char *)pLeo->fb;
+	lc0->addrspace = LEO_ADDRSPC_FONT_OBGR;
+	if (gcPriv->stipple->alu & 0x80) {
+		lc0->fontt = 1;
+	} else {
+		lc0->fontt = 0;
+		ld0->bg = gcPriv->stipple->bg;
+	}
+	lc0->fontmsk = 0xffffffff;
+	msk = 0xffffffff;
+	bits = &gcPriv->stipple->bits[0];
+	while (n--) {
+		int x, y, w;
+		unsigned int *dst, s, i, sw, sm;
+		
+		w = *pwidth++;
+		x = ppt->x;
+		y = ppt->y;
+		ppt++;
+		if (numRects == 1) {
+			if (y < cy1 || y >= cy2) continue;
+			if (x < cx1) {
+				w -= (cx1 - x);
+				if (w <= 0) continue;
+				x = cx1;
+			}
+			if (x + w > cx2) {
+				if (x >= cx2) continue;
+				w = cx2 - x;
+			}
+		}
+		s = bits[y & 31];
+		dst = (unsigned int *)(fb + (y << 13) + ((x & ~31) << 2));
+		if (x & 31) {
+			sw = 32 - (x & 31);
+			sm = 0xffffffff >> (x & 31);
+			w -= sw;
+			if (w <= 0) {
+				if (w) sm &= 0xffffffff << (32 - (w & 31));
+				if (msk != sm) {
+					msk = sm;
+					lc0->fontmsk = sm;
+				}
+				*dst = s;
+				continue;
+			}
+			if (msk != sm) {
+				msk = sm;
+				lc0->fontmsk = sm;
+			}
+			*dst = s;
+			dst += 32;
+		} else {
+			sw = 0;
+		}
+		sw = w & 31;
+		w &= ~31;
+		if (w && msk != 0xffffffff) {
+			msk = 0xffffffff;
+			lc0->fontmsk = 0xffffffff;
+			for (i = 0; i < w; i += 32) {
+				*dst = s;
+				dst += 32;
+			}
+		}
+		if (sw) {
+			msk = 0xffffffff << (32 - sw);
+			lc0->fontmsk = msk;
+			*dst = s;
+		}
+	}
+	
+	if (numRects != 1) {
+		DEALLOCATE_LOCAL(pptFree);
+		DEALLOCATE_LOCAL(pwidthFree);
+	}
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+	lc0->addrspace = LEO_ADDRSPC_OBGR;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.c	Thu May 18 16:21:40 2000
@@ -0,0 +1,590 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - GC implementation.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+#include "leo_regs.h"
+#include "leo_gc.h"
+
+#include "X.h"
+#include "Xmd.h"
+#include "Xproto.h"
+#include "cfb.h"
+#include "fontstruct.h"
+#include "dixfontstr.h"
+#include "gcstruct.h"
+#include "windowstr.h"
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+#include "region.h"
+
+#include "mistruct.h"
+#include "mibstore.h"
+#include "migc.h"
+
+#include "cfbmskbits.h"
+#include "cfb8bit.h"
+
+void LeoValidateGC(GCPtr, unsigned long, DrawablePtr);
+static void LeoDestroyGC(GCPtr);
+
+GCFuncs LeoGCFuncs = {
+	LeoValidateGC,
+	miChangeGC,
+	miCopyGC,
+	LeoDestroyGC,
+	miChangeClip,
+	miDestroyClip,
+	miCopyClip,
+};
+
+GCOps	LeoTEOps1Rect = {
+	cfbSolidSpansCopy,
+	cfbSetSpans,
+	cfbPutImage,
+	LeoCopyArea,
+	cfbCopyPlane,
+	cfbPolyPoint,
+	cfb8LineSS1Rect,
+	cfb8SegmentSS1Rect,
+	miPolyRectangle,
+	cfbZeroPolyArcSS8Copy,
+	cfbFillPoly1RectCopy,
+	LeoPolyFillRect1Rect,
+	cfbPolyFillArcSolidCopy,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	LeoTEGlyphBlt,
+	LeoPolyTEGlyphBlt,
+	mfbPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps	LeoNonTEOps1Rect = {
+	cfbSolidSpansCopy,
+	cfbSetSpans,
+	cfbPutImage,
+	LeoCopyArea,
+	cfbCopyPlane,
+	cfbPolyPoint,
+	cfb8LineSS1Rect,
+	cfb8SegmentSS1Rect,
+	miPolyRectangle,
+	cfbZeroPolyArcSS8Copy,
+	cfbFillPoly1RectCopy,
+	LeoPolyFillRect1Rect,
+	cfbPolyFillArcSolidCopy,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	cfbImageGlyphBlt8,
+	LeoPolyGlyphBlt,
+	mfbPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps	LeoTEOps = {
+	cfbSolidSpansCopy,
+	cfbSetSpans,
+	cfbPutImage,
+	LeoCopyArea,
+	cfbCopyPlane,
+	cfbPolyPoint,
+	cfbLineSS,
+	cfbSegmentSS,
+	miPolyRectangle,
+	cfbZeroPolyArcSS8Copy,
+	miFillPolygon,
+	LeoPolyFillRect,
+	cfbPolyFillArcSolidCopy,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	LeoTEGlyphBlt,
+	LeoPolyTEGlyphBlt,
+	mfbPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps	LeoNonTEOps = {
+	cfbSolidSpansCopy,
+	cfbSetSpans,
+	cfbPutImage,
+	LeoCopyArea,
+	cfbCopyPlane,
+	cfbPolyPoint,
+	cfbLineSS,
+	cfbSegmentSS,
+	miPolyRectangle,
+	cfbZeroPolyArcSS8Copy,
+	miFillPolygon,
+	LeoPolyFillRect,
+	cfbPolyFillArcSolidCopy,
+	miPolyText8,
+	miPolyText16,
+	miImageText8,
+	miImageText16,
+	cfbImageGlyphBlt8,
+	LeoPolyGlyphBlt,
+	mfbPushPixels
+#ifdef NEED_LINEHELPER
+	,NULL
+#endif
+};
+
+GCOps *
+LeoMatchCommon (GCPtr pGC, cfbPrivGCPtr devPriv)
+{
+	if (pGC->lineWidth != 0)
+		return 0;
+	if (pGC->lineStyle != LineSolid)
+		return 0;
+	if (pGC->fillStyle != FillSolid)
+		return 0;
+	if (devPriv->rop != GXcopy)
+		return 0;
+	if (pGC->font &&
+		FONTMAXBOUNDS(pGC->font,rightSideBearing) -
+		FONTMINBOUNDS(pGC->font,leftSideBearing) <= 32 &&
+		FONTMINBOUNDS(pGC->font,characterWidth) >= 0) {
+		if (TERMINALFONT(pGC->font))
+			if (devPriv->oneRect)
+				return &LeoTEOps1Rect;
+			else
+				return &LeoTEOps;
+		else
+			if (devPriv->oneRect)
+				return &LeoNonTEOps1Rect;
+			else
+				return &LeoNonTEOps;
+	}
+	return 0;
+}
+
+Bool
+LeoCreateGC(GCPtr pGC)
+{
+	LeoPrivGCPtr gcPriv;
+
+	if (pGC->depth == 1)
+		return mfbCreateGC (pGC);
+	if (!cfbCreateGC (pGC))
+		return FALSE;
+
+	pGC->ops = & LeoNonTEOps;
+	pGC->funcs = & LeoGCFuncs;
+	gcPriv = LeoGetGCPrivate (pGC);
+	gcPriv->type = DRAWABLE_WINDOW;
+	gcPriv->stipple = 0;
+	return TRUE;
+}
+
+static void
+LeoDestroyGC (GCPtr pGC)
+{
+	LeoPrivGCPtr gcPriv = LeoGetGCPrivate (pGC);
+        
+	if (gcPriv->stipple)
+		xfree (gcPriv->stipple);
+	miDestroyGC (pGC);
+}
+
+void
+LeoValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
+{
+	int mask;
+	int index;
+	int new_rrop;
+	int new_line, new_text, new_fillspans, new_fillarea;
+	int new_rotate;
+	int xrot, yrot;
+	/* flags for changing the proc vector */
+	LeoPrivGCPtr gcPriv;
+        cfbPrivGCPtr devPriv;
+	int oneRect;
+	
+	gcPriv = LeoGetGCPrivate (pGC);
+	if (pDrawable->type != DRAWABLE_WINDOW) {
+		if (gcPriv->type == DRAWABLE_WINDOW) {
+			extern GCOps cfbNonTEOps;
+
+			miDestroyGCOps (pGC->ops);
+			pGC->ops = &cfbNonTEOps;
+			changes = (1 << (GCLastBit+1)) - 1;
+			pGC->stateChanges = changes;
+			gcPriv->type = pDrawable->type;
+		}
+		cfbValidateGC (pGC, changes, pDrawable);
+		return;
+	}
+
+	if (gcPriv->type != DRAWABLE_WINDOW) {
+		changes = (1 << (GCLastBit+1)) - 1;
+		gcPriv->type = DRAWABLE_WINDOW;
+	}
+
+	new_rotate = pGC->lastWinOrg.x != pDrawable->x ||
+		 pGC->lastWinOrg.y != pDrawable->y;
+
+	pGC->lastWinOrg.x = pDrawable->x;
+	pGC->lastWinOrg.y = pDrawable->y;
+	devPriv = cfbGetGCPrivate(pGC);
+
+	new_rrop = FALSE;
+	new_line = FALSE;
+	new_text = FALSE;
+	new_fillspans = FALSE;
+	new_fillarea = FALSE;
+
+	/*
+	 * if the client clip is different or moved OR the subwindowMode has
+	 * changed OR the window's clip has changed since the last validation
+	 * we need to recompute the composite clip 
+	 */
+
+	if ((changes & (GCClipXOrigin|GCClipYOrigin|GCClipMask|GCSubwindowMode)) ||
+	    (pDrawable->serialNumber != (pGC->serialNumber & DRAWABLE_SERIAL_BITS))) {
+		miComputeCompositeClip (pGC, pDrawable);
+		oneRect = REGION_NUM_RECTS(cfbGetCompositeClip(pGC)) == 1;
+		if (oneRect != devPriv->oneRect)
+			new_line = TRUE;
+		devPriv->oneRect = oneRect;
+	}
+
+	mask = changes;
+	while (mask) {
+		index = lowbit (mask);
+		mask &= ~index;
+
+		/*
+		 * this switch acculmulates a list of which procedures might have
+		 * to change due to changes in the GC.  in some cases (e.g.
+		 * changing one 16 bit tile for another) we might not really need
+		 * a change, but the code is being paranoid. this sort of batching
+		 * wins if, for example, the alu and the font have been changed,
+		 * or any other pair of items that both change the same thing. 
+		 */
+		switch (index) {
+		case GCFunction:
+		case GCForeground:
+			new_rrop = TRUE;
+			break;
+		case GCPlaneMask:
+			new_rrop = TRUE;
+			new_text = TRUE;
+			break;
+		case GCBackground:
+			break;
+		case GCLineStyle:
+		case GCLineWidth:
+			new_line = TRUE;
+			break;
+		case GCJoinStyle:
+		case GCCapStyle:
+			break;
+		case GCFillStyle:
+			new_text = TRUE;
+			new_fillspans = TRUE;
+			new_line = TRUE;
+			new_fillarea = TRUE;
+			break;
+		case GCFillRule:
+			break;
+		case GCTile:
+			new_fillspans = TRUE;
+			new_fillarea = TRUE;
+			break;
+
+		case GCStipple:
+			if (pGC->stipple) {
+			int width = pGC->stipple->drawable.width;
+				PixmapPtr nstipple;
+
+				if ((width <= PGSZ) && !(width & (width - 1)) &&
+				    (nstipple = cfbCopyPixmap(pGC->stipple))) {
+					cfbPadPixmap(nstipple);
+					(*pGC->pScreen->DestroyPixmap)(pGC->stipple);
+					pGC->stipple = nstipple;
+				}
+			}
+			new_fillspans = TRUE;
+			new_fillarea = TRUE;
+			break;
+
+		case GCTileStipXOrigin:
+			new_rotate = TRUE;
+			break;
+
+		case GCTileStipYOrigin:
+			new_rotate = TRUE;
+			break;
+
+		case GCFont:
+			new_text = TRUE;
+			break;
+		case GCSubwindowMode:
+			break;
+		case GCGraphicsExposures:
+			break;
+		case GCClipXOrigin:
+			break;
+		case GCClipYOrigin:
+			break;
+		case GCClipMask:
+			break;
+		case GCDashOffset:
+			break;
+		case GCDashList:
+			break;
+		case GCArcMode:
+			break;
+		default:
+			break;
+		}
+	}
+
+	/*
+	 * If the drawable has changed,  ensure suitable
+	 * entries are in the proc vector. 
+	 */
+	if (pDrawable->serialNumber != (pGC->serialNumber & (DRAWABLE_SERIAL_BITS))) {
+		new_fillspans = TRUE;	/* deal with FillSpans later */
+	}
+
+	if (new_rotate || new_fillspans) {
+		Bool new_pix = FALSE;
+
+		xrot = pGC->patOrg.x + pDrawable->x;
+		yrot = pGC->patOrg.y + pDrawable->y;
+
+		LeoCheckFill (pGC, pDrawable);
+		
+		switch (pGC->fillStyle) {
+		case FillTiled:
+			if (!pGC->tileIsPixel) {
+				int width = pGC->tile.pixmap->drawable.width * PSZ;
+
+				if ((width <= 32) && !(width & (width - 1))) {
+					cfbCopyRotatePixmap(pGC->tile.pixmap,
+							    &pGC->pRotatedPixmap,
+							    xrot, yrot);
+					new_pix = TRUE;
+				}
+			}
+			break;
+		}
+
+		if (!new_pix && pGC->pRotatedPixmap) {
+			(*pGC->pScreen->DestroyPixmap)(pGC->pRotatedPixmap);
+			pGC->pRotatedPixmap = (PixmapPtr) NULL;
+		}
+	}
+
+	if (new_rrop) {
+		int old_rrop;
+		
+		if (gcPriv->stipple) {
+			if (pGC->fillStyle == FillStippled)
+				gcPriv->stipple->alu = pGC->alu | 0x80;
+			else
+				gcPriv->stipple->alu = pGC->alu;
+			if (pGC->fillStyle != FillTiled) {
+				gcPriv->stipple->fg = pGC->fgPixel;
+				gcPriv->stipple->bg = pGC->bgPixel;
+			}
+                }
+
+		old_rrop = devPriv->rop;
+		devPriv->rop = cfbReduceRasterOp (pGC->alu, pGC->fgPixel,
+						  pGC->planemask,
+						  &devPriv->and, &devPriv->xor);
+		if (old_rrop == devPriv->rop)
+			new_rrop = FALSE;
+		else {
+			new_line = TRUE;
+			new_text = TRUE;
+			new_fillspans = TRUE;
+			new_fillarea = TRUE;
+		}
+	}
+
+	if (new_rrop || new_fillspans || new_text || new_fillarea || new_line) {
+		GCOps	*newops;
+
+		if ((newops = LeoMatchCommon (pGC, devPriv)) != NULL) {
+			if (pGC->ops->devPrivate.val)
+			miDestroyGCOps (pGC->ops);
+			pGC->ops = newops;
+			new_rrop = new_line = new_fillspans = new_text = new_fillarea = 0;
+		} else {
+			if (!pGC->ops->devPrivate.val) {
+				pGC->ops = miCreateGCOps (pGC->ops);
+				pGC->ops->devPrivate.val = 1;
+			}
+			pGC->ops->CopyArea = LeoCopyArea;
+		}
+	}
+
+	/* deal with the changes we've collected */
+	if (new_line) {
+		pGC->ops->FillPolygon = miFillPolygon;
+		if (devPriv->oneRect && pGC->fillStyle == FillSolid) {
+			switch (devPriv->rop) {
+			case GXcopy:
+				pGC->ops->FillPolygon = cfbFillPoly1RectCopy;
+				break;
+			default:
+				pGC->ops->FillPolygon = LeoFillPoly1RectGeneral;
+				break;
+			}
+		}
+		if (pGC->lineWidth == 0) {
+			if ((pGC->lineStyle == LineSolid) && (pGC->fillStyle == FillSolid)) {
+				switch (devPriv->rop) {
+				case GXcopy:
+					pGC->ops->PolyArc = cfbZeroPolyArcSS8Copy;
+					break;
+				default:
+					pGC->ops->PolyArc = LeoZeroPolyArcSS8General;
+					break;
+				}
+			} else
+				pGC->ops->PolyArc = miZeroPolyArc;
+		} else
+			pGC->ops->PolyArc = miPolyArc;
+		pGC->ops->PolySegment = miPolySegment;
+		switch (pGC->lineStyle) {
+		case LineSolid:
+			if(pGC->lineWidth == 0) {
+				if (pGC->fillStyle == FillSolid) {
+					if (devPriv->oneRect &&
+					    ((pDrawable->x >= pGC->pScreen->width - 32768) &&
+					    (pDrawable->y >= pGC->pScreen->height - 32768))) {
+						pGC->ops->Polylines = cfb8LineSS1Rect;
+						pGC->ops->PolySegment = cfb8SegmentSS1Rect;
+					} else {
+						pGC->ops->Polylines = cfbLineSS;
+						pGC->ops->PolySegment = cfbSegmentSS;
+					}
+				} else
+					pGC->ops->Polylines = miZeroLine;
+			} else
+				pGC->ops->Polylines = miWideLine;
+			break;
+		case LineOnOffDash:
+		case LineDoubleDash:
+			if (pGC->lineWidth == 0 && pGC->fillStyle == FillSolid) {
+				pGC->ops->Polylines = cfbLineSD;
+				pGC->ops->PolySegment = cfbSegmentSD;
+			} else
+				pGC->ops->Polylines = miWideDash;
+			break;
+		}
+	}
+
+	if (new_text && pGC->font) {
+		if (FONTMAXBOUNDS(pGC->font,rightSideBearing) -
+		    FONTMINBOUNDS(pGC->font,leftSideBearing) > 32 ||
+		    FONTMINBOUNDS(pGC->font,characterWidth) < 0) {
+			pGC->ops->PolyGlyphBlt = miPolyGlyphBlt;
+			pGC->ops->ImageGlyphBlt = miImageGlyphBlt;
+		} else {
+			if (pGC->fillStyle == FillSolid) {
+				if (TERMINALFONT (pGC->font))
+					pGC->ops->PolyGlyphBlt = LeoPolyTEGlyphBlt;
+				else
+					pGC->ops->PolyGlyphBlt = LeoPolyGlyphBlt;
+			} else
+				pGC->ops->PolyGlyphBlt = miPolyGlyphBlt;
+				
+			/* special case ImageGlyphBlt for terminal emulator fonts */
+			if (TERMINALFONT (pGC->font))
+				pGC->ops->ImageGlyphBlt = LeoTEGlyphBlt;
+			else
+				pGC->ops->ImageGlyphBlt = miImageGlyphBlt;
+		}
+	}	
+
+	if (new_fillspans) {
+		switch (pGC->fillStyle) {
+		case FillSolid:
+			pGC->ops->FillSpans = LeoFillSpansSolid;
+			break;
+		case FillTiled:
+			if (pGC->pRotatedPixmap) {
+				if (pGC->alu == GXcopy && (pGC->planemask & PMSK) == PMSK)
+					pGC->ops->FillSpans = cfbTile32FSCopy;
+				else
+					pGC->ops->FillSpans = LeoTile32FSGeneral;
+			} else
+				pGC->ops->FillSpans = cfbUnnaturalTileFS;
+			break;
+		case FillStippled:
+			pGC->ops->FillSpans = cfbUnnaturalStippleFS;
+			break;
+		case FillOpaqueStippled:
+			pGC->ops->FillSpans = cfbUnnaturalStippleFS;
+			break;
+		default:
+			FatalError("LeoValidateGC: illegal fillStyle\n");
+		}
+		if (gcPriv->stipple)
+			pGC->ops->FillSpans = LeoFillSpansStippled;
+	} /* end of new_fillspans */
+
+	if (new_fillarea) {
+		pGC->ops->PolyFillRect = miPolyFillRect;
+		if (pGC->fillStyle == FillSolid) {
+			if (devPriv->oneRect)
+				pGC->ops->PolyFillRect = LeoPolyFillRect1Rect;
+			else
+				pGC->ops->PolyFillRect = LeoPolyFillRect;
+		} else if (gcPriv->stipple)
+			pGC->ops->PolyFillRect = LeoPolyFillStippledRect;
+		else if (pGC->fillStyle == FillTiled)
+			pGC->ops->PolyFillRect = cfbPolyFillRect;
+		pGC->ops->PolyFillArc = miPolyFillArc;
+		if (pGC->fillStyle == FillSolid) {
+			switch (devPriv->rop) {
+			case GXcopy:
+				pGC->ops->PolyFillArc = cfbPolyFillArcSolidCopy;
+				break;
+			default:
+				pGC->ops->PolyFillArc = LeoPolyFillArcSolidGeneral;
+				break;
+			}
+		}
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.h	Thu May 18 16:21:40 2000
@@ -0,0 +1,81 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - Accel func declarations.
+ *
+ * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_gc.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+
+#ifndef LEOGC_H
+#define LEOGC_H
+
+extern RegionPtr LeoCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+				 GCPtr pGC, int srcx, int srcy, int width, int height,
+				 int dstx, int dsty);
+
+extern RegionPtr LeoCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+				  GCPtr pGC, int srcx, int srcy, int width, int height,
+				  int dstx, int dsty, unsigned long bitPlane);
+
+extern void LeoFillBoxSolid (DrawablePtr pDrawable, int nBox,
+				 BoxPtr pBox, unsigned long pixel);
+
+extern void LeoPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
+				int nrectFill, xRectangle *prectInit);
+
+extern void LeoPolyFillRect1Rect(DrawablePtr pDrawable, register GCPtr pGC,
+				     int nrectFill, xRectangle *prectInit);
+
+extern void LeoPolyFillStippledRect(DrawablePtr pDrawable, GCPtr pGC,
+				    int nrectFill, xRectangle *prectInit);
+
+extern void LeoFillSpansSolid (DrawablePtr pDrawable, GCPtr pGC,
+			       int n, DDXPointPtr ppt,
+			       int *pwidth, int fSorted);
+
+extern void LeoFillSpansStippled (DrawablePtr pDrawable, GCPtr pGC,
+			          int n, DDXPointPtr ppt,
+			          int *pwidth, int fSorted);
+
+extern void LeoPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+				 unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase);
+
+extern void LeoTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+			       unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase);
+
+extern void LeoPolyTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+				   unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase);
+
+extern void LeoFillPoly1RectGeneral(DrawablePtr pDrawable, GCPtr pGC, int shape, 
+			int mode, int count, DDXPointPtr ptsIn);
+
+extern void LeoZeroPolyArcSS8General(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs);
+
+extern void LeoTile32FSGeneral(DrawablePtr pDrawable, GCPtr pGC, int nInit,
+			       DDXPointPtr pptInit, int *pwidthInit, int fSorted);
+
+extern void LeoPolyFillArcSolidGeneral(DrawablePtr pDrawable, GCPtr pGC, 
+				       int narcs, xArc *parcs);
+
+extern int LeoCheckFill (GCPtr pGC, DrawablePtr pDrawable);
+
+extern void LeoDoBitblt (DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst,
+			 DDXPointPtr pptSrc, unsigned long planemask);
+
+#endif /* LEOGC_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_glyph.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_glyph.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_glyph.c	Thu May 18 16:21:40 2000
@@ -0,0 +1,325 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - Glyph rops.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+#include "fontstruct.h"
+#include "dixfontstr.h"
+
+#include "cfb.h"
+#include "mi.h"
+
+void
+LeoPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+		     unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase)
+{
+	LeoPtr pLeo = LeoGetScreenPrivate (pGC->pScreen);
+	LeoCommand0 *lc0 = pLeo->lc0;
+	LeoDraw *ld0 = pLeo->ld0;
+	RegionPtr clip;
+	CharInfoPtr pci;
+	int w, h, x0, y0, i;
+	unsigned int *bits;
+	BoxRec box;
+	int curw = -1;
+	unsigned int *fbf;
+	unsigned char *fb;
+	int height, width;
+
+	clip = cfbGetCompositeClip(pGC);
+	/* compute an approximate (but covering) bounding box */
+	box.x1 = 0;
+	if (ppci[0]->metrics.leftSideBearing < 0)
+		box.x1 = ppci[0]->metrics.leftSideBearing;
+	h = nglyph - 1;
+	w = ppci[h]->metrics.rightSideBearing;
+	while (--h >= 0)
+		w += ppci[h]->metrics.characterWidth;
+	box.x2 = w;
+	box.y1 = -FONTMAXBOUNDS(pGC->font,ascent);
+	box.y2 = FONTMAXBOUNDS(pGC->font,descent);
+		
+	box.x1 += pDrawable->x + x;
+	box.x2 += pDrawable->x + x;
+	box.y1 += pDrawable->y + y;
+	box.y2 += pDrawable->y + y;
+	
+	switch (RECT_IN_REGION(pGC->pScreen, clip, &box)) {
+	case rgnPART:
+		if (REGION_NUM_RECTS(clip) == 1) {
+			ld0->vclipmin = (clip->extents.y1 << 16) | clip->extents.x1;
+			ld0->vclipmax = ((clip->extents.y2 - 1) << 16) | (clip->extents.x2 - 1);
+			break;
+		}
+		cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pGlyphBase);
+	case rgnOUT:
+		return;
+	default:
+		clip = NULL;
+		break;
+	}
+	
+	x += pDrawable->x;
+	y += pDrawable->y;
+	
+	lc0->fontt = 1;
+	lc0->addrspace = LEO_ADDRSPC_FONT_OBGR;
+	ld0->fg = pGC->fgPixel;
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	height = pLeo->height;
+	width = pLeo->width;
+	
+	fb = (unsigned char *)pLeo->fb;
+
+	while (nglyph--) {
+		pci = *ppci++;
+
+		w = GLYPHWIDTHPIXELS (pci);
+		h = GLYPHHEIGHTPIXELS (pci);
+		if (!w || !h)
+			goto next_glyph;
+
+		x0 = x + pci->metrics.leftSideBearing;
+		y0 = y - pci->metrics.ascent;
+
+		/* We're off the screen to the left, making our way
+		 * back onto the screen.
+		 */
+		if((x0 >> 31) == -1)
+			goto next_glyph;
+
+		/* We walked off the screen (to the right or downwards)
+		 * or we started there, we're never going to work our
+		 * way back so stop now.
+		 */
+		if(x0 >= width || y0 >= height)
+			break;
+		
+		bits = (unsigned int *) pci->bits;
+
+		if (w != curw) {
+			curw = w;
+			if (w)
+				lc0->fontmsk = 0xffffffff << (32 - w);
+			else
+				lc0->fontmsk = 0;
+		}
+
+		fbf = (unsigned *)(fb + (y0 << 13) + (x0 << 2));
+		if (y0 + h <= height)
+			for (i = 0; i < h; i++) {
+				*fbf = *bits++;
+				fbf += 2048;
+			}
+		else
+			for (i = 0; i < h && y0 + i < height; i++) {
+				*fbf = *bits++;
+				fbf += 2048;
+			}
+	next_glyph:
+		x += pci->metrics.characterWidth;
+	}
+	
+	lc0->addrspace = LEO_ADDRSPC_OBGR;
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+	if (clip) {
+		ld0->vclipmin = 0;
+		ld0->vclipmax = pLeo->vclipmax;
+	}
+}
+
+void
+LeoTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+		   unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase)
+{
+	LeoPtr pLeo = LeoGetScreenPrivate (pGC->pScreen);
+	LeoCommand0 *lc0 = pLeo->lc0;
+	LeoDraw *ld0 = pLeo->ld0;
+	RegionPtr clip;
+	int h, hTmp;
+	int widthGlyph, widthGlyphs;
+	BoxRec bbox;
+	FontPtr pfont = pGC->font;
+	int curw = -1;
+	unsigned int *fbf;
+	unsigned char *fb;
+	int height, width;
+
+	widthGlyph = FONTMAXBOUNDS(pfont,characterWidth);
+	h = FONTASCENT(pfont) + FONTDESCENT(pfont);
+	clip = cfbGetCompositeClip(pGC);
+	bbox.x1 = x + pDrawable->x;
+	bbox.x2 = bbox.x1 + (widthGlyph * nglyph);
+	bbox.y1 = y + pDrawable->y - FONTASCENT(pfont);
+	bbox.y2 = bbox.y1 + h;
+
+	/* If fully out of range, and we have no chance of getting back
+	 * in range, no work to do.
+	 */
+	y = y + pDrawable->y - FONTASCENT(pfont);
+	x += pDrawable->x;
+	height = pLeo->height;
+	width = pLeo->width;
+	
+	if (x >= width)
+	   	return;
+
+	switch (RECT_IN_REGION(pGC->pScreen, clip, &bbox)) {
+	case rgnPART: 
+		if (REGION_NUM_RECTS(clip) == 1) {
+			ld0->vclipmin = (clip->extents.y1 << 16) | clip->extents.x1;
+			ld0->vclipmax = ((clip->extents.y2 - 1) << 16) | (clip->extents.x2 - 1);
+			break;
+		}
+		x -= pDrawable->x;
+		y = y - pDrawable->y + FONTASCENT(pfont);
+		if (pGlyphBase)
+			cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, NULL);
+		else
+			miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pGlyphBase);
+	case rgnOUT:
+		return;
+	default:
+		clip = NULL;
+		break;
+	}
+	
+	lc0->addrspace = LEO_ADDRSPC_FONT_OBGR;
+	ld0->fg = pGC->fgPixel;
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+		
+	fb = (unsigned char *)pLeo->fb;
+
+	if(pGlyphBase)
+		lc0->fontt = 1;
+	else {
+		lc0->fontt = 0;
+		ld0->bg = pGC->bgPixel;
+	}
+
+#define LoopIt(count, w, loadup, fetch) \
+	if (w != curw) { \
+		curw = w; \
+		lc0->fontmsk = 0xffffffff << (32 - w); \
+	} \
+	while (nglyph >= count) { \
+		loadup \
+		nglyph -= count; \
+		fbf = (unsigned *)(fb + (y << 13) + (x << 2)); \
+		hTmp = h; \
+		if (y + h <= height) \
+			while (hTmp--) { \
+				*fbf = fetch; \
+				fbf += 2048; \
+			} \
+		else \
+			for (hTmp = 0; hTmp < h && y + hTmp < height; hTmp++) { \
+				*fbf = fetch; \
+				fbf += 2048; \
+			} \
+		x += w; \
+		if(x >= width) \
+			goto out; \
+	}
+
+	if (widthGlyph <= 8) {
+		widthGlyphs = widthGlyph << 2;
+		LoopIt(4, widthGlyphs,
+		       unsigned int *char1 = (unsigned int *) (*ppci++)->bits;
+		       unsigned int *char2 = (unsigned int *) (*ppci++)->bits;
+		       unsigned int *char3 = (unsigned int *) (*ppci++)->bits;
+		       unsigned int *char4 = (unsigned int *) (*ppci++)->bits;,
+		       (*char1++ | ((*char2++ | ((*char3++ | (*char4++
+							      >> widthGlyph))
+						 >> widthGlyph))
+				    >> widthGlyph)))
+	} else if (widthGlyph <= 10) {
+		widthGlyphs = (widthGlyph << 1) + widthGlyph;
+		LoopIt(3, widthGlyphs,
+		       unsigned int *char1 = (unsigned int *) (*ppci++)->bits;
+		       unsigned int *char2 = (unsigned int *) (*ppci++)->bits;
+		       unsigned int *char3 = (unsigned int *) (*ppci++)->bits;,
+		       (*char1++ | ((*char2++ | (*char3++ >> widthGlyph)) >> widthGlyph)))
+	} else if (widthGlyph <= 16) {
+		widthGlyphs = widthGlyph << 1;
+		LoopIt(2, widthGlyphs,
+		       unsigned int *char1 = (unsigned int *) (*ppci++)->bits;
+		       unsigned int *char2 = (unsigned int *) (*ppci++)->bits;,
+		       (*char1++ | (*char2++ >> widthGlyph)))
+	}
+	if(nglyph != 0) {
+		if (widthGlyph != curw) {
+			curw = widthGlyph;
+			lc0->fontmsk = 0xffffffff << (32 - widthGlyph);
+		}
+		while (nglyph--) {
+			unsigned int *char1 = (unsigned int *) (*ppci++)->bits;
+			fbf = (unsigned *)(fb + (y << 13) + (x << 2));
+			hTmp = h;
+			if (y + h <= height)
+				while (hTmp--) {
+					*fbf = *char1++;
+					fbf += 2048;
+				}
+			else
+				for (hTmp = 0; hTmp < h && y + hTmp < height; hTmp++) {
+					*fbf = *char1++;
+					fbf += 2048;
+				}
+			x += widthGlyph;
+			if (x >= width)
+				goto out;
+		}
+	}
+	
+out:	lc0->addrspace = LEO_ADDRSPC_OBGR;
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+	if (clip) {
+		ld0->vclipmin = 0;
+		ld0->vclipmax = pLeo->vclipmax;
+	}
+}
+
+void
+LeoPolyTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
+		       unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase)
+{
+	LeoTEGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, (char *) 1);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_regs.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_regs.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_regs.h	Thu May 18 16:21:40 2000
@@ -0,0 +1,198 @@
+/*
+ * Acceleration for the Leo(ZX) framebuffer - register layout.
+ *
+ * Copyright (C) 1999, 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_regs.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+
+#ifndef LEOREGS_H
+#define LEOREGS_H
+
+/* rop register */
+#define LEO_ATTR_PICK_DISABLE	0x00000000
+#define LEO_ATTR_PICK_2D	0x80000000
+#define LEO_ATTR_PICK_3D	0xa0000000
+#define LEO_ATTR_PICK_2D_REND	0xc0000000
+#define LEO_ATTR_PICK_3D_REND	0xe0000000
+
+#define LEO_ATTR_DCE_DISABLE	0x00000000
+#define LEO_ATTR_DCE_ENABLE	0x10000000
+
+#define LEO_ATTR_APE_DISABLE	0x00000000
+#define LEO_ATTR_APE_ENABLE	0x08000000
+
+#define LEO_ATTR_COLOR_VAR	0x00000000
+#define LEO_ATTR_COLOR_CONST	0x04000000
+
+#define LEO_ATTR_AA_DISABLE	0x02000000
+#define LEO_ATTR_AA_ENABLE	0x01000000
+
+#define LEO_ATTR_ABE_BG		0x00000000	/* dst + alpha * (src - bg) */
+#define LEO_ATTR_ABE_FB		0x00800000	/* dst + alpha * (src - dst) */
+
+#define LEO_ATTR_ABE_DISABLE	0x00000000
+#define LEO_ATTR_ABE_ENABLE	0x00400000
+
+#define LEO_ATTR_BLTSRC_A	0x00000000
+#define LEO_ATTR_BLTSRC_B	0x00200000
+
+#define LEO_ROP_ZERO		(0x0 << 18)
+#define LEO_ROP_NEW_AND_OLD	(0x8 << 18)
+#define LEO_ROP_NEW_AND_NOLD	(0x4 << 18)
+#define LEO_ROP_NEW		(0xc << 18)
+#define LEO_ROP_NNEW_AND_OLD	(0x2 << 18)
+#define LEO_ROP_OLD		(0xa << 18)
+#define LEO_ROP_NEW_XOR_OLD	(0x6 << 18)
+#define LEO_ROP_NEW_OR_OLD	(0xe << 18)
+#define LEO_ROP_NNEW_AND_NOLD	(0x1 << 18)
+#define LEO_ROP_NNEW_XOR_NOLD	(0x9 << 18)
+#define LEO_ROP_NOLD		(0x5 << 18)
+#define LEO_ROP_NEW_OR_NOLD	(0xd << 18)
+#define LEO_ROP_NNEW		(0x3 << 18)
+#define LEO_ROP_NNEW_OR_OLD	(0xb << 18)
+#define LEO_ROP_NNEW_OR_NOLD	(0x7 << 18)
+#define LEO_ROP_ONES		(0xf << 18)
+
+#define LEO_ATTR_HSR_DISABLE	0x00000000
+#define LEO_ATTR_HSR_ENABLE	0x00020000
+
+#define LEO_ATTR_WRITEZ_DISABLE	0x00000000
+#define LEO_ATTR_WRITEZ_ENABLE	0x00010000
+
+#define LEO_ATTR_Z_VAR		0x00000000
+#define LEO_ATTR_Z_CONST	0x00008000
+
+#define LEO_ATTR_WCLIP_DISABLE	0x00000000
+#define LEO_ATTR_WCLIP_ENABLE	0x00004000
+
+#define LEO_ATTR_MONO		0x00000000
+#define LEO_ATTR_STEREO_LEFT	0x00001000
+#define LEO_ATTR_STEREO_RIGHT	0x00003000
+
+#define LEO_ATTR_WE_DISABLE	0x00000000
+#define LEO_ATTR_WE_ENABLE	0x00000800
+
+#define LEO_ATTR_FCE_DISABLE	0x00000000
+#define LEO_ATTR_FCE_ENABLE	0x00000400
+
+#define LEO_ATTR_RE_DISABLE	0x00000000
+#define LEO_ATTR_RE_ENABLE	0x00000200
+
+#define LEO_ATTR_GE_DISABLE	0x00000000
+#define LEO_ATTR_GE_ENABLE	0x00000100
+
+#define LEO_ATTR_BE_DISABLE	0x00000000
+#define LEO_ATTR_BE_ENABLE	0x00000080
+
+#define LEO_ATTR_RGBE_DISABLE	0x00000000
+#define LEO_ATTR_RGBE_ENABLE	0x00000380
+
+#define LEO_ATTR_OE_DISABLE	0x00000000
+#define LEO_ATTR_OE_ENABLE	0x00000040
+
+#define LEO_ATTR_ZE_DISABLE	0x00000000
+#define LEO_ATTR_ZE_ENABLE	0x00000020
+
+#define LEO_ATTR_FORCE_WID	0x00000010
+
+#define LEO_ATTR_FC_PLANE_MASK	0x0000000e
+
+#define LEO_ATTR_BUFFER_A	0x00000000
+#define LEO_ATTR_BUFFER_B	0x00000001
+
+/* csr */
+#define LEO_CSR_BLT_BUSY	0x20000000
+
+typedef struct LeoDraw {
+	unsigned char		xxx0[0xe00];
+	volatile unsigned int	csr;
+	volatile unsigned int	wid;
+	volatile unsigned int	wmask;
+	volatile unsigned int	widclip;
+	volatile unsigned int	vclipmin;
+	volatile unsigned int	vclipmax;
+	volatile unsigned int	pickmin;	/* SS1 only */
+	volatile unsigned int	pickmax;	/* SS1 only */
+	volatile unsigned int	fg;
+	volatile unsigned int	bg;
+	volatile unsigned int	src;		/* Copy/Scroll (SS0 only) */
+	volatile unsigned int	dst;		/* Copy/Scroll/Fill (SS0 only) */
+	volatile unsigned int	extent;		/* Copy/Scroll/Fill size (SS0 only) */
+	unsigned int		xxx1[3];
+	volatile unsigned int	setsem;		/* SS1 only */
+	volatile unsigned int	clrsem;		/* SS1 only */
+	volatile unsigned int	clrpick;	/* SS1 only */
+	volatile unsigned int	clrdat;		/* SS1 only */
+	volatile unsigned int	alpha;		/* SS1 only */
+	unsigned char		xxx2[0x2c];
+	volatile unsigned int	winbg;
+	volatile unsigned int	planemask;
+	volatile unsigned int	rop;
+	volatile unsigned int	z;
+	volatile unsigned int	dczf;		/* SS1 only */
+	volatile unsigned int	dczb;		/* SS1 only */
+	volatile unsigned int	dcs;		/* SS1 only */
+	volatile unsigned int	dczs;		/* SS1 only */
+	volatile unsigned int	pickfb;		/* SS1 only */
+	volatile unsigned int	pickbb;		/* SS1 only */
+	volatile unsigned int	dcfc;		/* SS1 only */
+	volatile unsigned int	forcecol;	/* SS1 only */
+	volatile unsigned int	door[8];	/* SS1 only */
+	volatile unsigned int	pick[5];	/* SS1 only */
+} LeoDraw;
+
+#define LEO_ADDRSPC_OBGR	0x00
+#define LEO_ADDRSPC_Z		0x01
+#define LEO_ADDRSPC_W		0x02
+#define LEO_ADDRSPC_FONT_OBGR	0x04
+#define LEO_ADDRSPC_FONT_Z	0x05
+#define LEO_ADDRSPC_FONT_W	0x06
+#define LEO_ADDRSPC_O		0x08
+#define LEO_ADDRSPC_B		0x09
+#define LEO_ADDRSPC_G		0x0a
+#define LEO_ADDRSPC_R		0x0b
+
+typedef struct LeoCommand0 {
+	volatile unsigned int	csr;
+	volatile unsigned int	addrspace;
+	volatile unsigned int 	fontmsk;
+	volatile unsigned int	fontt;
+	volatile unsigned int	extent;
+	volatile unsigned int	src;
+	unsigned int		dst;
+	volatile unsigned int	copy;
+	volatile unsigned int	fill;
+} LeoCommand0;
+
+typedef struct LeoCross {
+	volatile unsigned int	type;
+	volatile unsigned int	csr;
+	volatile unsigned int	value;
+} LeoCross;
+
+typedef struct LeoCursor {
+	unsigned char		xxx0[16];
+	volatile unsigned int	cur_type;
+	volatile unsigned int	cur_misc;
+	volatile unsigned int	cur_cursxy;
+	volatile unsigned int	cur_data;
+} LeoCursor;
+
+#endif /* LEOREGS_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_stubs.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_stubs.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_stubs.c	Thu May 18 16:21:40 2000
@@ -0,0 +1,104 @@
+/*
+ * Acceleration for the Leo (ZX) framebuffer - Unaccelerated stuff.
+ *
+ * Copyright (C) 1999 Jakub Jelinek   (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_stubs.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+
+#define PSZ 32
+
+#include "leo.h"
+
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "cfb.h"
+
+void
+LeoFillPoly1RectGeneral(DrawablePtr pDrawable, GCPtr pGC, int shape, 
+			int mode, int count, DDXPointPtr ptsIn)
+{
+        LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+	LeoDraw		*ld0 = pLeo->ld0;
+
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	cfbFillPoly1RectCopy(pDrawable, pGC, shape, mode, count, ptsIn);
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+}
+
+void
+LeoZeroPolyArcSS8General(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
+{
+        LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+	LeoDraw		*ld0 = pLeo->ld0;
+
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	cfbZeroPolyArcSS8Copy(pDrawable, pGC, narcs, parcs);
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+}
+
+void
+LeoTile32FSGeneral(DrawablePtr pDrawable, GCPtr pGC, int nInit,
+		   DDXPointPtr pptInit, int *pwidthInit, int fSorted)
+{
+        LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+	LeoDraw		*ld0 = pLeo->ld0;
+
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	cfbTile32FSCopy(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+}
+
+void
+LeoPolyFillArcSolidGeneral(DrawablePtr pDrawable, GCPtr pGC,
+			   int narcs, xArc *parcs)
+{
+        LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+	LeoDraw		*ld0 = pLeo->ld0;
+
+	if (pGC->alu != GXcopy)
+		ld0->rop = leoRopTable[pGC->alu];
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = pGC->planemask;
+	cfbPolyFillArcSolidCopy(pDrawable, pGC, narcs, parcs);
+	if (pGC->alu != GXcopy)
+		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	if (pGC->planemask != 0xffffff)
+		ld0->planemask = 0xffffff;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.cpp:1.3
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.cpp	Tue Jun 13 19:13:14 2000
@@ -0,0 +1,30 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.cpp,v 1.3 2000/06/14 02:13:14 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH SUNLEO __drivermansuffix__ "Version 4.0.1"  "XFree86"
+.SH NAME
+sunleo \- Leo video driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qsunleo\*q"
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B leo
+is an XFree86 driver for Sun Leo (ZX) video cards.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+The
+.B leo
+driver supports...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details.  This section only covers configuration details specific to this
+driver.
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+.SH AUTHORS
+Authors include: Jakub Jelinek <jakub@redhat.com>
Index: xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile	Fri Jun 30 10:15:16 2000
@@ -0,0 +1,38 @@
+XCOMM
+XCOMM This is an Imakefile for the tcx driver.
+XCOMM
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile,v 1.1 2000/06/30 17:15:16 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = tcx_driver.c tcx_cursor.c
+OBJS = tcx_driver.o tcx_cursor.o
+
+#if defined(XF86DriverSDK)
+INCLUDES = -I. -I../../include
+#else
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
+           -I$(SERVERSRC)/Xext -I$(SERVERSRC)/cfb \
+	   -I$(XF86SRC)/ramdac \
+           -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(EXTINCSRC)
+#endif
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+ModuleObjectRule()
+
+ObjectModuleTarget(suntcx,$(OBJS))
+
+InstallObjectModule(suntcx,$(MODULEDIR),drivers)
+
+#if !defined(XF86DriverSDK)
+CppManTarget(suntcx,)
+InstallModuleManPage(suntcx)
+#endif
+
+DependTarget()
Index: xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.cpp:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.cpp	Fri Jun 30 10:15:16 2000
@@ -0,0 +1,30 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.cpp,v 1.1 2000/06/30 17:15:16 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH SUNTCX __drivermansuffix__ "Version 4.0"  "XFree86"
+.SH NAME
+suntcx \- TCX video driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qsuntcx\*q"
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B suntcx
+is an XFree86 driver for Sun TCX video cards.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+The
+.B suntcx
+driver supports...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details.  This section only covers configuration details specific to this
+driver.
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+.SH AUTHORS
+Authors include: Jakub Jelinek <jakub@redhat.com>
Index: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h	Fri Jun 30 10:15:16 2000
@@ -0,0 +1,69 @@
+/*
+ * TCX framebuffer - defines.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h,v 1.1 2000/06/30 17:15:16 dawes Exp $ */
+
+#ifndef TCX_H
+#define TCX_H
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86RamDac.h"
+#include "Xmd.h"
+#include "gcstruct.h"
+#include "xf86sbusBus.h"
+#include "tcx_regs.h"
+
+/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
+#define TCX_RAM8_VOFF		0x00000000
+#define TCX_RAM24_VOFF		0x01000000
+#define TCX_CPLANE_VOFF		0x28000000
+#define TCX_TEC_VOFF		0x70000000
+#define TCX_BTREGS_VOFF		0x70002000
+#define TCX_THC_VOFF		0x70004000
+#define TCX_DHC_VOFF		0x70008000
+#define TCX_ALT_VOFF		0x7000a000
+#define TCX_SYNC_VOFF		0x7000e000
+
+typedef struct {
+	unsigned char	*fb;
+	int		width;
+	int		height;
+	unsigned int	*cplane;
+	TcxThcPtr	thc;
+	sbusDevicePtr	psdp;
+	CloseScreenProcPtr CloseScreen;
+	Bool		HWCursor;
+	xf86CursorInfoPtr CursorInfoRec;
+	unsigned int	CursorXY;
+	int		CursorBg, CursorFg;
+	Bool		CursorEnabled;
+	unsigned char	CursorShiftX, CursorShiftY;
+	unsigned char	*CursorData;
+} TcxRec, *TcxPtr;
+
+#define TCX_CPLANE_MODE		0x03000000
+
+#define GET_TCX_FROM_SCRN(p)    ((TcxPtr)((p)->driverPrivate))
+
+#endif /* TCX_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_cursor.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_cursor.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_cursor.c	Fri Jun 30 10:15:16 2000
@@ -0,0 +1,156 @@
+/*
+ * Hardware cursor support for TCX
+ *
+ * Copyright 2000 by Jakub Jelinek <jakub@redhat.com>.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Jakub
+ * Jelinek not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission.  Jakub Jelinek makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * JAKUB JELINEK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL JAKUB JELINEK BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_cursor.c,v 1.1 2000/06/30 17:15:16 dawes Exp $ */
+
+#include "tcx.h"
+
+static void TCXLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
+static void TCXShowCursor(ScrnInfoPtr pScrn);
+static void TCXHideCursor(ScrnInfoPtr pScrn);
+static void TCXSetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
+static void TCXSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
+
+static void
+TCXLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
+{
+    TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+    int i, x, y;
+    unsigned int *data = (unsigned int *)src;
+        
+    pTcx->CursorData = src;
+    x = pTcx->CursorShiftX;
+    y = pTcx->CursorShiftY;
+    if (x >= 32 || y >= 32)
+	y = 32;
+    data += y;
+    for (i = 0; i < 32 - y; i++)
+	pTcx->thc->thc_cursmask[i] = *data++ << x;
+    for (; i < 32; i++)
+	pTcx->thc->thc_cursmask[i] = 0;
+    data += y;
+    for (i = 0; i < 32 - y; i++)
+	pTcx->thc->thc_cursbits[i] = *data++ << x;
+    for (; i < 32; i++)
+	pTcx->thc->thc_cursbits[i] = 0;
+}
+
+static void 
+TCXShowCursor(ScrnInfoPtr pScrn)
+{
+    TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+
+    pTcx->thc->thc_cursxy = pTcx->CursorXY;
+    pTcx->CursorEnabled = TRUE;
+}
+
+static void
+TCXHideCursor(ScrnInfoPtr pScrn)
+{
+    TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+
+    pTcx->thc->thc_cursxy = ((65536 - 32) << 16) | (65536 - 32);
+    pTcx->CursorEnabled = FALSE;
+}
+
+static void
+TCXSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+{
+    TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+    int CursorShiftX = 0, CursorShiftY = 0;
+    
+    if (x < 0) {
+	CursorShiftX = -x;
+	x = 0;
+	if (CursorShiftX > 32)
+	    CursorShiftX = 32;
+    }
+    if (y < 0) {
+	CursorShiftY = -y;
+	y = 0;
+	if (CursorShiftY > 32)
+	    CursorShiftY = 32;
+    }
+    if ((CursorShiftX != pTcx->CursorShiftX ||
+	 CursorShiftY != pTcx->CursorShiftY) &&
+	 pTcx->CursorData != NULL) {
+	pTcx->CursorShiftX = CursorShiftX;
+	pTcx->CursorShiftY = CursorShiftY;
+	TCXLoadCursorImage(pScrn, pTcx->CursorData);
+    }
+
+    pTcx->CursorXY = ((x & 0xffff) << 16) | (y & 0xffff);
+    if (pTcx->CursorEnabled)
+	pTcx->thc->thc_cursxy = pTcx->CursorXY;
+}
+
+static void
+TCXSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+{
+    TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+
+    if (bg != pTcx->CursorBg || fg != pTcx->CursorFg) {
+	xf86SbusSetOsHwCursorCmap(pTcx->psdp, bg, fg);
+	pTcx->CursorBg = bg;
+	pTcx->CursorFg = fg;
+    }
+}
+
+Bool 
+TCXHWCursorInit(ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    TcxPtr pTcx;
+    xf86CursorInfoPtr infoPtr;
+
+    pTcx = GET_TCX_FROM_SCRN(pScrn);
+    pTcx->CursorXY = 0;
+    pTcx->CursorBg = pTcx->CursorFg = 0;
+    pTcx->CursorEnabled = FALSE;
+    pTcx->CursorShiftX = 0;
+    pTcx->CursorShiftY = 0;
+    pTcx->CursorData = NULL;
+
+    infoPtr = xf86CreateCursorInfoRec();
+    if(!infoPtr) return FALSE;
+    
+    pTcx->CursorInfoRec = infoPtr;
+
+    infoPtr->MaxWidth = 32;
+    infoPtr->MaxHeight = 32;
+    infoPtr->Flags = HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
+	HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK |
+	HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED |
+	HARDWARE_CURSOR_TRUECOLOR_AT_8BPP;
+
+    infoPtr->SetCursorColors = TCXSetCursorColors;
+    infoPtr->SetCursorPosition = TCXSetCursorPosition;
+    infoPtr->LoadCursorImage = TCXLoadCursorImage;
+    infoPtr->HideCursor = TCXHideCursor;
+    infoPtr->ShowCursor = TCXShowCursor;
+    infoPtr->UseHWCursor = NULL;
+
+    return xf86InitCursor(pScreen, infoPtr);
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_driver.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_driver.c:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_driver.c	Fri Jun 30 10:15:16 2000
@@ -0,0 +1,769 @@
+/*
+ * TCX framebuffer driver.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_driver.c,v 1.1 2000/06/30 17:15:16 dawes Exp $ */
+
+#define PSZ 8
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Version.h"
+#include "mipointer.h"
+#include "mibstore.h"
+#include "micmap.h"
+
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+#include "xf86cmap.h"
+#include "tcx.h"
+
+static OptionInfoPtr TCXAvailableOptions(int chipid, int busid);
+static void	TCXIdentify(int flags);
+static Bool	TCXProbe(DriverPtr drv, int flags);
+static Bool	TCXPreInit(ScrnInfoPtr pScrn, int flags);
+static Bool	TCXScreenInit(int Index, ScreenPtr pScreen, int argc,
+			      char **argv);
+static Bool	TCXEnterVT(int scrnIndex, int flags);
+static void	TCXLeaveVT(int scrnIndex, int flags);
+static Bool	TCXCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	TCXSaveScreen(ScreenPtr pScreen, int mode);
+static void	TCXInitCplane24(ScrnInfoPtr pScrn);
+
+/* Required if the driver supports mode switching */
+static Bool	TCXSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+/* Required if the driver supports moving the viewport */
+static void	TCXAdjustFrame(int scrnIndex, int x, int y, int flags);
+
+/* Optional functions */
+static void	TCXFreeScreen(int scrnIndex, int flags);
+static int	TCXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
+
+void TCXSync(ScrnInfoPtr pScrn);
+
+#define VERSION 4000
+#define TCX_NAME "SUNTCX"
+#define TCX_DRIVER_NAME "suntcx"
+#define TCX_MAJOR_VERSION 1
+#define TCX_MINOR_VERSION 0
+#define TCX_PATCHLEVEL 0
+
+/* 
+ * This contains the functions needed by the server after loading the driver
+ * module.  It must be supplied, and gets passed back by the SetupProc
+ * function in the dynamic case.  In the static case, a reference to this
+ * is compiled in, and this requires that the name of this DriverRec be
+ * an upper-case version of the driver name.
+ */
+
+DriverRec SUNTCX = {
+    VERSION,
+    TCX_DRIVER_NAME,
+    TCXIdentify,
+    TCXProbe,
+    TCXAvailableOptions,
+    NULL,
+    0
+};
+
+typedef enum {
+    OPTION_SW_CURSOR,
+    OPTION_HW_CURSOR
+} TCXOpts;
+
+static OptionInfoRec TCXOptions[] = {
+    { OPTION_SW_CURSOR,		"SWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_HW_CURSOR,		"HWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
+    { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
+};
+
+#ifdef XFree86LOADER
+
+static MODULESETUPPROTO(tcxSetup);
+
+static XF86ModuleVersionInfo suntcxVersRec =
+{
+	"suntcx",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	TCX_MAJOR_VERSION, TCX_MINOR_VERSION, TCX_PATCHLEVEL,
+	ABI_CLASS_VIDEODRV,
+	ABI_VIDEODRV_VERSION,
+	MOD_CLASS_VIDEODRV,
+	{0,0,0,0}
+};
+
+XF86ModuleData suntcxModuleData = { &suntcxVersRec, tcxSetup, NULL };
+
+pointer
+tcxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    static Bool setupDone = FALSE;
+
+    if (!setupDone) {
+	setupDone = TRUE;
+	xf86AddDriver(&SUNTCX, module, 0);
+
+	/*
+	 * Modules that this driver always requires can be loaded here
+	 * by calling LoadSubModule().
+	 */
+
+	/*
+	 * The return value must be non-NULL on success even though there
+	 * is no TearDownProc.
+	 */
+	return (pointer)TRUE;
+    } else {
+	if (errmaj) *errmaj = LDR_ONCEONLY;
+	return NULL;
+    }
+}
+
+#endif /* XFree86LOADER */
+
+static Bool
+TCXGetRec(ScrnInfoPtr pScrn)
+{
+    /*
+     * Allocate an TcxRec, and hook it into pScrn->driverPrivate.
+     * pScrn->driverPrivate is initialised to NULL, so we can check if
+     * the allocation has already been done.
+     */
+    if (pScrn->driverPrivate != NULL)
+	return TRUE;
+
+    pScrn->driverPrivate = xnfcalloc(sizeof(TcxRec), 1);
+    return TRUE;
+}
+
+static void
+TCXFreeRec(ScrnInfoPtr pScrn)
+{
+    TcxPtr pTcx;
+
+    if (pScrn->driverPrivate == NULL)
+	return;
+
+    pTcx = GET_TCX_FROM_SCRN(pScrn);
+
+    xfree(pScrn->driverPrivate);
+    pScrn->driverPrivate = NULL;
+
+    return;
+}
+
+static 
+OptionInfoPtr
+TCXAvailableOptions(int chipid, int busid)
+{
+    return TCXOptions;
+}
+
+/* Mandatory */
+static void
+TCXIdentify(int flags)
+{
+    xf86Msg(X_INFO, "%s: driver for TCX\n", TCX_NAME);
+}
+
+
+/* Mandatory */
+static Bool
+TCXProbe(DriverPtr drv, int flags)
+{
+    int i;
+    GDevPtr *devSections = NULL;
+    int *usedChips;
+    int numDevSections;
+    int numUsed;
+    Bool foundScreen = FALSE;
+    EntityInfoPtr pEnt;
+
+    /*
+     * The aim here is to find all cards that this driver can handle,
+     * and for the ones not already claimed by another driver, claim the
+     * slot, and allocate a ScrnInfoRec.
+     *
+     * This should be a minimal probe, and it should under no circumstances
+     * change the state of the hardware.  Because a device is found, don't
+     * assume that it will be used.  Don't do any initialisations other than
+     * the required ScrnInfoRec initialisations.  Don't allocate any new
+     * data structures.
+     */
+
+    /*
+     * Next we check, if there has been a chipset override in the config file.
+     * For this we must find out if there is an active device section which
+     * is relevant, i.e., which has no driver specified or has THIS driver
+     * specified.
+     */
+
+    if ((numDevSections = xf86MatchDevice(TCX_DRIVER_NAME,
+					  &devSections)) <= 0) {
+	/*
+	 * There's no matching device section in the config file, so quit
+	 * now.
+	 */
+	return FALSE;
+    }
+
+    /*
+     * We need to probe the hardware first.  We then need to see how this
+     * fits in with what is given in the config file, and allow the config
+     * file info to override any contradictions.
+     */
+
+    numUsed = xf86MatchSbusInstances(TCX_NAME, SBUS_DEVICE_TCX,
+		   devSections, numDevSections,
+		   drv, &usedChips);
+				    
+    if (devSections)
+	xfree(devSections);
+    devSections = NULL;
+    if (numUsed <= 0)
+	return FALSE;
+
+    if (flags & PROBE_DETECT)
+	foundScreen = TRUE;
+    else for (i = 0; i < numUsed; i++) {
+	pEnt = xf86GetEntityInfo(usedChips[i]);
+
+	/*
+	 * Check that nothing else has claimed the slots.
+	 */
+	if(pEnt->active) {
+	    ScrnInfoPtr pScrn;
+	    
+	    /* Allocate a ScrnInfoRec and claim the slot */
+	    pScrn = xf86AllocateScreen(drv, 0);
+
+	    /* Fill in what we can of the ScrnInfoRec */
+	    pScrn->driverVersion = VERSION;
+	    pScrn->driverName	 = TCX_DRIVER_NAME;
+	    pScrn->name		 = TCX_NAME;
+	    pScrn->Probe	 = TCXProbe;
+	    pScrn->PreInit	 = TCXPreInit;
+	    pScrn->ScreenInit	 = TCXScreenInit;
+  	    pScrn->SwitchMode	 = TCXSwitchMode;
+  	    pScrn->AdjustFrame	 = TCXAdjustFrame;
+	    pScrn->EnterVT	 = TCXEnterVT;
+	    pScrn->LeaveVT	 = TCXLeaveVT;
+	    pScrn->FreeScreen	 = TCXFreeScreen;
+	    pScrn->ValidMode	 = TCXValidMode;
+	    xf86AddEntityToScreen(pScrn, pEnt->index);
+	    foundScreen = TRUE;
+	}
+	xfree(pEnt);
+    }
+    return foundScreen;
+}
+
+/* Mandatory */
+static Bool
+TCXPreInit(ScrnInfoPtr pScrn, int flags)
+{
+    TcxPtr pTcx;
+    sbusDevicePtr psdp = NULL;
+    MessageType from;
+    int i;
+    int hwCursor, lowDepth;
+
+    if (flags & PROBE_DETECT) return FALSE;
+
+    /*
+     * Note: This function is only called once at server startup, and
+     * not at the start of each server generation.  This means that
+     * only things that are persistent across server generations can
+     * be initialised here.  xf86Screens[] is (pScrn is a pointer to one
+     * of these).  Privates allocated using xf86AllocateScrnInfoPrivateIndex()  
+     * are too, and should be used for data that must persist across
+     * server generations.
+     *
+     * Per-generation data should be allocated with
+     * AllocateScreenPrivateIndex() from the ScreenInit() function.
+     */
+
+    /* Allocate the TcxRec driverPrivate */
+    if (!TCXGetRec(pScrn)) {
+	return FALSE;
+    }
+    pTcx = GET_TCX_FROM_SCRN(pScrn);
+    
+    /* Set pScrn->monitor */
+    pScrn->monitor = pScrn->confScreen->monitor;
+
+    /* This driver doesn't expect more than one entity per screen */
+    if (pScrn->numEntities > 1)
+	return FALSE;
+    /* This is the general case */
+    for (i = 0; i < pScrn->numEntities; i++) {
+	EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+
+	/* TCX is purely AFX, but we handle it like SBUS */
+	if (pEnt->location.type == BUS_SBUS) {
+	    psdp = xf86GetSbusInfoForEntity(pEnt->index);
+	    pTcx->psdp = psdp;
+	} else
+	    return FALSE;
+    }
+    if (psdp == NULL)
+	return FALSE;
+
+    /**********************
+    check card capabilities
+    **********************/
+    hwCursor = 0;
+    lowDepth = 1;
+    if (sparcPromInit() >= 0) {
+	hwCursor = sparcPromGetBool(&psdp->node, "hw-cursor");
+	lowDepth = sparcPromGetBool(&psdp->node, "tcx-8-bit");
+	sparcPromClose();
+    }
+
+    /*********************
+    deal with depth
+    *********************/
+    
+    if (!xf86SetDepthBpp(pScrn, 0, 0, 0,
+			 lowDepth ? NoDepth24Support : Support32bppFb)) {
+	return FALSE;
+    } else {
+	/* Check that the returned depth is one we support */
+	switch (pScrn->depth) {
+	case 8:
+	    /* OK */
+	    break;
+	case 32:
+	    /* unless lowDepth OK */
+	    if (lowDepth) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "Given depth (32) not supported by hardware\n");
+		return FALSE;
+	    }
+	    break;
+	default:
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		       "Given depth (%d) is not supported by this driver\n",
+		       pScrn->depth);
+	    return FALSE;
+	}
+    }
+
+    /* Collect all of the relevant option flags (fill in pScrn->options) */
+    xf86CollectOptions(pScrn, NULL);
+    /* Process the options */
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, TCXOptions);
+
+    /*
+     * This must happen after pScrn->display has been set because
+     * xf86SetWeight references it.
+     */
+    if (pScrn->depth > 8) {
+	rgb weight = {10, 11, 11};
+	rgb mask = {0xff, 0xff00, 0xff0000};
+                                       
+	if (!xf86SetWeight(pScrn, weight, mask)) {
+	    return FALSE;
+	}
+    }
+                                                                           
+    if (!xf86SetDefaultVisual(pScrn, -1))
+	return FALSE;
+    else if (pScrn->depth > 8) {
+	/* We don't currently support DirectColor */
+	if (pScrn->defaultVisual != TrueColor) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Given default visual"
+		       " (%s) is not supported\n",
+		       xf86GetVisualName(pScrn->defaultVisual));
+	    return FALSE;
+	}
+    }                                                                                                  
+
+    /*
+     * The new cmap code requires this to be initialised.
+     */
+
+    {
+	Gamma zeros = {0.0, 0.0, 0.0};
+
+	if (!xf86SetGamma(pScrn, zeros)) {
+	    return FALSE;
+	}
+    }
+
+    /* determine whether we use hardware or software cursor */
+    
+    from = X_PROBED;
+    pTcx->HWCursor = FALSE;
+    if (hwCursor) {
+	from = X_DEFAULT;
+	pTcx->HWCursor = TRUE;
+	if (xf86GetOptValBool(TCXOptions, OPTION_HW_CURSOR, &pTcx->HWCursor))
+	    from = X_CONFIG;
+	if (xf86ReturnOptValBool(TCXOptions, OPTION_SW_CURSOR, FALSE)) {
+	    from = X_CONFIG;
+	    pTcx->HWCursor = FALSE;
+	}
+    }
+    
+    xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
+		pTcx->HWCursor ? "HW" : "SW");
+
+    if (xf86LoadSubModule(pScrn, pScrn->depth > 8 ? "cfb32" : "cfb") ==
+	NULL) {
+	TCXFreeRec(pScrn);
+	return FALSE;
+    }
+
+    if (pTcx->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
+	TCXFreeRec(pScrn);
+	return FALSE;
+    }
+
+    /*********************
+    set up clock and mode stuff
+    *********************/
+    
+    pScrn->progClock = TRUE;
+
+    if(pScrn->display->virtualX || pScrn->display->virtualY) {
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		   "TCX does not support a virtual desktop\n");
+	pScrn->display->virtualX = 0;
+	pScrn->display->virtualY = 0;
+    }
+
+    xf86SbusUseBuiltinMode(pScrn, pTcx->psdp);
+    pScrn->currentMode = pScrn->modes;
+    pScrn->displayWidth = pScrn->virtualX;
+
+    /* Set display resolution */
+    xf86SetDpi(pScrn, 0, 0);
+
+    return TRUE;
+}
+
+/* Mandatory */
+
+/* This gets called at the start of each server generation */
+
+static Bool
+TCXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+{
+    ScrnInfoPtr pScrn;
+    TcxPtr pTcx;
+    VisualPtr visual;
+    int ret;
+
+    /* 
+     * First get the ScrnInfoRec
+     */
+    pScrn = xf86Screens[pScreen->myNum];
+
+    pTcx = GET_TCX_FROM_SCRN(pScrn);
+
+    /* Map the TCX memory */
+    if (pScrn->depth == 8)
+	pTcx->fb =
+	    xf86MapSbusMem (pTcx->psdp, TCX_RAM8_VOFF,
+			    (pTcx->psdp->width * pTcx->psdp->height));
+    else {
+	pTcx->fb =
+	    xf86MapSbusMem (pTcx->psdp, TCX_RAM24_VOFF,
+			    (pTcx->psdp->width * pTcx->psdp->height * 4));
+	pTcx->cplane =
+	    xf86MapSbusMem (pTcx->psdp, TCX_CPLANE_VOFF,
+			    (pTcx->psdp->width * pTcx->psdp->height * 4));
+	if (! pTcx->cplane)
+	    return FALSE;
+    }
+    if (pTcx->HWCursor == TRUE) {
+	pTcx->thc = xf86MapSbusMem (pTcx->psdp, TCX_THC_VOFF, 8192);
+	if (! pTcx->thc)
+	    return FALSE;
+    }
+
+    if (! pTcx->fb)
+	return FALSE;
+
+    /* Darken the screen for aesthetic reasons and set the viewport */
+    TCXSaveScreen(pScreen, SCREEN_SAVER_ON);
+
+    /*
+     * The next step is to setup the screen's visuals, and initialise the
+     * framebuffer code.  In cases where the framebuffer's default
+     * choices for things like visual layouts and bits per RGB are OK,
+     * this may be as simple as calling the framebuffer's ScreenInit()
+     * function.  If not, the visuals will need to be setup before calling
+     * a fb ScreenInit() function and fixed up after.
+     */
+
+    /*
+     * Reset visual list.
+     */
+    miClearVisualTypes();
+
+    if (pScrn->depth == 8)
+	/* Set the bits per RGB for 8bpp mode */
+	pScrn->rgbBits = 8;
+
+    /* Setup the visuals we support. */
+
+    if (!miSetVisualTypes(pScrn->depth,
+			  pScrn->depth != 8 ? TrueColorMask :
+				miGetDefaultVisualMask(pScrn->depth),
+			  pScrn->rgbBits, pScrn->defaultVisual))
+	return FALSE;
+
+    /*
+     * Call the framebuffer layer's ScreenInit function, and fill in other
+     * pScreen fields.
+     */
+
+    if (pScrn->depth == 8)
+	ret = cfbScreenInit(pScreen, pTcx->fb, pScrn->virtualX,
+			    pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+			    pScrn->virtualX);
+    else {
+	TCXInitCplane24(pScrn);
+	ret = cfb32ScreenInit(pScreen, pTcx->fb, pScrn->virtualX,
+			      pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+			      pScrn->virtualX);
+    }
+
+    if (!ret)
+	return FALSE;
+
+    miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+
+    xf86SetBlackWhitePixels(pScreen);
+
+    if (pScrn->bitsPerPixel > 8) {
+	/* Fixup RGB ordering */
+	visual = pScreen->visuals + pScreen->numVisuals;
+	while (--visual >= pScreen->visuals) {
+	    if ((visual->class | DynamicClass) == DirectColor) {
+		visual->offsetRed = pScrn->offset.red;
+		visual->offsetGreen = pScrn->offset.green;
+		visual->offsetBlue = pScrn->offset.blue;
+		visual->redMask = pScrn->mask.red;
+		visual->greenMask = pScrn->mask.green;
+		visual->blueMask = pScrn->mask.blue;
+	    }
+	}
+    }
+
+    /* Initialise cursor functions */
+    miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
+
+    /* Initialize HW cursor layer. 
+       Must follow software cursor initialization*/
+    if (pTcx->HWCursor) { 
+	extern Bool TCXHWCursorInit(ScreenPtr pScreen);
+
+	if(!TCXHWCursorInit(pScreen)) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
+		       "Hardware cursor initialization failed\n");
+	    return(FALSE);
+	}
+	xf86SbusHideOsHwCursor(pTcx->psdp);
+    }
+
+    /* Initialise default colourmap */
+    if (!miCreateDefColormap(pScreen))
+	return FALSE;
+
+    if(pScrn->depth == 8 && !xf86SbusHandleColormaps(pScreen, pTcx->psdp))
+	return FALSE;
+
+    pTcx->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = TCXCloseScreen;
+    pScreen->SaveScreen = TCXSaveScreen;
+
+    /* Report any unused options (only for the first generation) */
+    if (serverGeneration == 1) {
+	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+    }
+
+    /* unblank the screen */
+    TCXSaveScreen(pScreen, SCREEN_SAVER_OFF);
+
+    /* Done */
+    return TRUE;
+}
+
+
+/* Usually mandatory */
+static Bool
+TCXSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+{
+    return TRUE;
+}
+
+
+/*
+ * This function is used to initialize the Start Address - the first
+ * displayed location in the video memory.
+ */
+/* Usually mandatory */
+static void 
+TCXAdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+    /* we don't support virtual desktops */
+    return;
+}
+
+/*
+ * This is called when VT switching back to the X server.  Its job is
+ * to reinitialise the video mode.
+ */
+
+/* Mandatory */
+static Bool
+TCXEnterVT(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+
+    if (pTcx->HWCursor) {
+	xf86SbusHideOsHwCursor (pTcx->psdp);
+	pTcx->CursorFg = 0;
+	pTcx->CursorBg = 0;
+    }
+    if (pTcx->cplane) {
+	TCXInitCplane24 (pScrn);
+    }
+    return TRUE;
+}
+
+
+/*
+ * This is called when VT switching away from the X server.
+ */
+
+/* Mandatory */
+static void
+TCXLeaveVT(int scrnIndex, int flags)
+{
+    return;
+}
+
+
+/*
+ * This is called at the end of each server generation.  It restores the
+ * original (text) mode.  It should really also unmap the video memory too.
+ */
+
+/* Mandatory */
+static Bool
+TCXCloseScreen(int scrnIndex, ScreenPtr pScreen)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+
+    pScrn->vtSema = FALSE;
+    if (pScrn->depth == 8)
+	xf86UnmapSbusMem(pTcx->psdp, pTcx->fb,
+			 (pTcx->psdp->width * pTcx->psdp->height));
+    else {
+	xf86UnmapSbusMem(pTcx->psdp, pTcx->fb,
+			 (pTcx->psdp->width * pTcx->psdp->height * 4));
+	xf86UnmapSbusMem(pTcx->psdp, pTcx->cplane,
+			 (pTcx->psdp->width * pTcx->psdp->height * 4));
+    }
+    if (pTcx->thc)
+	xf86UnmapSbusMem(pTcx->psdp, pTcx->fb, 8192);
+    
+    pScreen->CloseScreen = pTcx->CloseScreen;
+    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+    return FALSE;
+}
+
+
+/* Free up any per-generation data structures */
+
+/* Optional */
+static void
+TCXFreeScreen(int scrnIndex, int flags)
+{
+    TCXFreeRec(xf86Screens[scrnIndex]);
+}
+
+
+/* Checks if a mode is suitable for the selected chipset. */
+
+/* Optional */
+static int
+TCXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+{
+    if (mode->Flags & V_INTERLACE)
+	return(MODE_BAD);
+
+    return(MODE_OK);
+}
+
+/* Do screen blanking */
+
+/* Mandatory */
+static Bool
+TCXSaveScreen(ScreenPtr pScreen, int mode)
+    /* this function should blank the screen when unblank is FALSE and
+       unblank it when unblank is TRUE -- it doesn't actually seem to be
+       used for much though */
+{
+    return TRUE;
+}
+
+/*
+ * This is the implementation of the Sync() function.
+ */
+void
+TCXSync(ScrnInfoPtr pScrn)
+{
+    return;
+}
+
+/*
+ * This initializes CPLANE for 24 bit mode.
+ */
+static void
+TCXInitCplane24(ScrnInfoPtr pScrn)
+{
+    TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
+    int size;
+    unsigned int *p, *q;
+
+    if (!pTcx->cplane)
+	return;
+
+    size = pScrn->virtualX * pScrn->virtualY;
+    memset (pTcx->fb, 0, size * 4);
+    p = pTcx->cplane;
+    for (q = pTcx->cplane + size; p != q; p++)
+	*p = (*p & 0xffffff) | TCX_CPLANE_MODE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_regs.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_regs.h:1.1
--- /dev/null	Sat Jul  1 20:42:58 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_regs.h	Fri Jun 30 10:15:17 2000
@@ -0,0 +1,56 @@
+/*
+ * TCX framebuffer - hardware registers.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_regs.h,v 1.1 2000/06/30 17:15:17 dawes Exp $ */
+
+#ifndef TCX_REGS_H
+#define TCX_REGS_H
+
+/* THC definitions */
+#define TCX_THC_MISC_REV_SHIFT       16
+#define TCX_THC_MISC_REV_MASK        15
+#define TCX_THC_MISC_RESET           (1 << 12)
+#define TCX_THC_MISC_VIDEO           (1 << 10)
+#define TCX_THC_MISC_SYNC            (1 << 9)
+#define TCX_THC_MISC_VSYNC           (1 << 8)
+#define TCX_THC_MISC_SYNC_ENAB       (1 << 7)
+#define TCX_THC_MISC_CURS_RES        (1 << 6)
+#define TCX_THC_MISC_INT_ENAB        (1 << 5)
+#define TCX_THC_MISC_INT             (1 << 4)
+#define TCX_THC_MISC_INIT            0x9f
+
+typedef struct tcx_thc {
+        unsigned int		thc_pad0[512];
+	volatile unsigned int	thc_hs;		/* hsync timing */
+	volatile unsigned int	thc_hsdvs;
+	volatile unsigned int	thc_hd;
+	volatile unsigned int	thc_vs;		/* vsync timing */
+	volatile unsigned int	thc_vd;
+	volatile unsigned int	thc_refresh;
+	volatile unsigned int	thc_misc;
+	unsigned int		thc_pad1[56];
+	volatile unsigned int	thc_cursxy;	/* cursor x,y position (16 bits each) */
+	volatile unsigned int	thc_cursmask[32];/* cursor mask bits */
+	volatile unsigned int	thc_cursbits[32];/* what to show where mask enabled */
+} TcxThc, *TcxThcPtr;
+
+#endif /* TCX_REGS_H */
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile:1.12 xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile:1.16
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile:1.12	Thu Mar  2 17:05:43 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile	Fri Jun 30 10:15:17 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile,v 1.12 2000/03/03 01:05:43 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile,v 1.16 2000/06/30 17:15:17 dawes Exp $
 XCOMM
 XCOMM This is the Imakefile for the TDFX driver.  
 XCOMM 
@@ -12,22 +12,16 @@
 #if BuildXF86DRI
 DRISRCS = tdfx_dri.c
 DRIOBJS = tdfx_dri.o
-DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri
+DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include
+
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 
-#
-# Uncomment these only if you have the proprietary sources
-#
-PRIVSRCS = tdfx_priv.c
-PRIVOBJS = tdfx_priv.o
-PRIVDEFINES = -DPROP_3DFX
-
 SRCS = tdfx_driver.c tdfx_io.c tdfx_hwcurs.c tdfx_accel.c \
-	tdfx_dga.c $(DRISRCS) $(PRIVSRCS)
+	tdfx_dga.c tdfx_priv.c tdfx_sli.c $(DRISRCS) 
 
 OBJS = tdfx_driver.o tdfx_io.o tdfx_hwcurs.o tdfx_accel.o \
-	tdfx_dga.o $(DRIOBJS) $(PRIVOBJS)
+	tdfx_dga.o tdfx_priv.o tdfx_sli.o $(DRIOBJS)
 
 #if defined(XF86DriverSDK)
 INCLUDES = -I. -I../../include
@@ -35,7 +29,7 @@
 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
            -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
 	   -I$(XF86SRC)/xaa -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \
-           -I$(SERVERSRC)/cfb -I$(XF86SRC)/xaa -I$(XF86SRC)/ramdac \
+           -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa -I$(XF86SRC)/ramdac \
 	   -I$(XF86SRC)/vgahw -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \
            -I$(XF86SRC)/ddc -I$(XF86OSSRC)/vbe -I$(SERVERSRC)/Xext \
            -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
@@ -43,7 +37,7 @@
 	   $(DRIINCLUDES)
 #endif
 
-DEFINES = $(DRIDEFINES) $(PRIVDEFINES)
+DEFINES = -DPROP_3DFX $(DRIDEFINES) 
 
 #if MakeHasPosixVariableSubstitutions
 SubdirLibraryRule($(OBJS))
@@ -74,5 +68,8 @@
 InstallDriverSDKNonExecFile(tdfx_driver.c,$(DRIVERSDKDIR)/drivers/tdfx)
 InstallDriverSDKNonExecFile(tdfx_hwcurs.c,$(DRIVERSDKDIR)/drivers/tdfx)
 InstallDriverSDKNonExecFile(tdfx_io.c,$(DRIVERSDKDIR)/drivers/tdfx)
+InstallDriverSDKNonExecFile(tdfx_priv.c,$(DRIVERSDKDIR)/drivers/tdfx)
+InstallDriverSDKNonExecFile(tdfx_priv.h,$(DRIVERSDKDIR)/drivers/tdfx)
+InstallDriverSDKNonExecFile(tdfx_sli.c,$(DRIVERSDKDIR)/drivers/tdfx)
 
 InstallDriverSDKObjectModule(tdfx,$(DRIVERSDKMODULEDIR),drivers)
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.cpp:1.1	Thu Mar  2 17:05:43 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.cpp	Tue Jun 13 19:13:15 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.cpp,v 1.1 2000/03/03 01:05:43 dawes Exp $ 
-.TH TDFX __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.cpp,v 1.4 2000/06/14 02:13:15 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH TDFX __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 tdfx \- 3Dfx video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""tdfx"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qtdfx\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B tdfx 
 is an XFree86 driver for 3Dfx video cards.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h:1.9 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h:1.9	Fri Feb 18 04:20:02 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h	Fri Jun 16 17:03:24 2000
@@ -5,7 +5,7 @@
 
    Copyright: 1998,1999
 */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h,v 1.9 2000/02/18 12:20:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h,v 1.10 2000/06/17 00:03:24 martin Exp $ */
 
 #ifndef _TDFX_H_
 #define _TDFX_H_
@@ -25,9 +25,22 @@
 #include "tdfx_dripriv.h"
 #endif
 
+#define TDFX_VERSION 4000
+#define TDFX_NAME "TDFX"
+#define TDFX_DRIVER_NAME "tdfx"
+#define TDFX_MAJOR_VERSION 1
+#define TDFX_MINOR_VERSION 0
+#define TDFX_PATCHLEVEL 0
+
 struct _TDFXRec;
 typedef struct _TDFXRec *TDFXPtr;
 
+#ifdef XF86DRI
+#define PIXMAP_CACHE_LINES 128
+#else
+#define PIXMAP_CACHE_LINES 512
+#endif
+
 #ifdef PROP_3DFX
 #include "tdfx_priv.h"
 #else
@@ -37,6 +50,7 @@
 extern Bool TDFXInitPrivate(ScreenPtr pScreen);
 extern void TDFXShutdownPrivate(ScreenPtr pScreen);
 extern void TDFXSwapContextPrivate(ScreenPtr pScreen);
+extern void TDFXLostContext(ScreenPtr pScreen);
 
 #ifdef XF86DRI
 extern void FillPrivateDRI(TDFXPtr pTDFX, TDFXDRIPtr pTDFXDRI);
@@ -49,6 +63,7 @@
 #define TDFX_DEBUG_CMDS
 #define TRACECURS 1
 #define REGDEBUG 1
+#define TRACEREG
 #endif
 
 #ifdef TRACE
@@ -84,6 +99,14 @@
 					char index);
 typedef void (*TDFXWriteWordFunc)(TDFXPtr pTDFX, int addr, int value);
 typedef int (*TDFXReadWordFunc)(TDFXPtr pTDFX, int addr);
+typedef void (*TDFXWriteChipIndexedByteFunc)(TDFXPtr pTDFX, int chip, 
+					     int addr, char index, char value);
+typedef char (*TDFXReadChipIndexedByteFunc)(TDFXPtr pTDFX, int chip, 
+					    int addr, char index);
+typedef void (*TDFXWriteChipWordFunc)(TDFXPtr pTDFX, int chip, 
+				      int addr, int value);
+typedef int (*TDFXReadChipWordFunc)(TDFXPtr pTDFX, int chip,
+				    int addr);
 typedef void (*TDFXSyncFunc)(ScrnInfoPtr pScrn);
 typedef void (*TDFXBufferFunc)(TDFXPtr pTDFX, int which);
 
@@ -111,21 +134,26 @@
   struct TextureData_t *next;
 } TextureData;
 
+#define MAXCHIPS 4
+
 typedef struct _TDFXRec {
-  unsigned char *MMIOBase;
+  unsigned char *MMIOBase[MAXCHIPS];
   unsigned char *FbBase;
-  unsigned int PIOBase;
+  unsigned char *myFbBase;
+  unsigned int PIOBase[MAXCHIPS];
   long FbMapSize;
+  int pixelFormat;
   int stride;
   int cpp;
   int maxClip;
   int MaxClock;
-  int Chipset;
-  int LinearAddr;
-  int MMIOAddr;
-  EntityInfoPtr pEnt;
+  int ChipType;
   pciVideoPtr PciInfo;
-  PCITAG PciTag;
+  int LinearAddr[MAXCHIPS];
+  int MMIOAddr[MAXCHIPS];
+  EntityInfoPtr pEnt;
+  int numChips;
+  PCITAG PciTag[MAXCHIPS];
   int HasSGRAM;
   int PciCnt;
   int PrevDrawState;
@@ -142,6 +170,7 @@
   Bool NoAccel;
   DGAModePtr DGAModes;
   Bool DGAactive;
+  Bool initDone;
   int DGAViewportStatus;
   int cursorOffset;
   int fbOffset;
@@ -153,6 +182,8 @@
   TDFXReadIndexedByteFunc readControl;
   TDFXWriteWordFunc writeLong;
   TDFXReadWordFunc readLong;
+  TDFXWriteChipWordFunc writeChipLong;
+  TDFXReadChipWordFunc readChipLong;
   TDFXSyncFunc sync;
   int syncDone;
   int scanlineWidth;
@@ -188,6 +219,10 @@
 
 #define TDFX2XCUTOFF 135000
 
+#ifndef PCI_CHIP_VOODOO5
+#define PCI_CHIP_VOODOO5 9
+#endif
+
 extern Bool TDFXAccelInit(ScreenPtr pScreen);
 extern Bool TDFXCursorInit(ScreenPtr pScreen);
 extern void TDFXSync(ScrnInfoPtr pScrn);
@@ -197,6 +232,7 @@
 extern Bool TDFXDGAInit(ScreenPtr pScreen);
 extern void TDFXCursorGrabMemory(ScreenPtr pScreen);
 extern void TDFXSetLFBConfig(TDFXPtr pTDFX);
+extern void TDFXSendNOPPrivate(ScrnInfoPtr pScrn);
 
 extern Bool TDFXSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
 extern void TDFXAdjustFrame(int scrnIndex, int x, int y, int flags);
@@ -220,6 +256,9 @@
 				  unsigned int planemask);
 extern void TDFXSubsequentSolidFillRect(ScrnInfoPtr pScrn, int x, int y, 
 					int w, int h);
+
+extern void TDFXSelectBuffer(TDFXPtr pTDFX, int which);
+
 
 #ifndef PROP_3DFX
 #define DECLARE(a)
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c:1.9 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c:1.9	Thu Mar  2 08:07:52 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c	Sat Jun 17 10:44:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c,v 1.9 2000/03/02 16:07:52 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c,v 1.12 2000/06/17 17:44:25 dawes Exp $ */
 
 /* All drivers should typically include these */
 #include "xf86.h"
@@ -79,15 +79,22 @@
 TDFXNeedSync(ScrnInfoPtr pScrn) {
   TDFXPtr pTDFX = TDFXPTR(pScrn);
   pTDFX->syncDone=FALSE;
+  pTDFX->AccelInfoRec->NeedToSync = TRUE;
 }
 
-static void
+void
 TDFXFirstSync(ScrnInfoPtr pScrn) {
   TDFXPtr pTDFX = TDFXPTR(pScrn);
 
   if (!pTDFX->syncDone) {
-    pTDFX->sync(pScrn);
+#ifdef XF86DRI
+    if (pTDFX->directRenderingEnabled) {
+      DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
+      TDFXSwapContextPrivate(screenInfo.screens[pScrn->scrnIndex]);
+    }
+#endif
     pTDFX->syncDone=TRUE;
+    pTDFX->sync(pScrn);
   }
 }
 
@@ -98,12 +105,17 @@
   if (pTDFX->syncDone) {
     pTDFX->sync(pScrn);
     pTDFX->syncDone=FALSE;
+#ifdef XF86DRI
+    if (pTDFX->directRenderingEnabled) {
+      TDFXLostContext(screenInfo.screens[pScrn->scrnIndex]);
+      DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
+    }
+#endif
   }
 }
 
 void
 TDFXSelectBuffer(TDFXPtr pTDFX, int which) {
-#ifdef XF86DRI
   int fmt;
 
   TDFXMakeRoom(pTDFX, 4);
@@ -118,29 +130,49 @@
     TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, fmt);
     break;
   case TDFX_BACK:
-    fmt=((pTDFX->stride+127)/128)|(3<<16); /* Tiled 16bpp */
+    if (pTDFX->cpp==2)
+      fmt=((pTDFX->stride+127)/128)|(3<<16); /* Tiled 16bpp */
+    else
+      fmt=((pTDFX->stride+127)/128)|(5<<16); /* Tiled 32bpp */
     TDFXWriteLong(pTDFX, SST_2D_DSTBASEADDR, pTDFX->backOffset|BIT(31));
     TDFXWriteLong(pTDFX, SST_2D_DSTFORMAT, fmt);
     TDFXWriteLong(pTDFX, SST_2D_SRCBASEADDR, pTDFX->backOffset|BIT(31));
     TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, fmt);
     break;
   case TDFX_DEPTH:
-    fmt=((pTDFX->stride+127)/128)|(3<<16); /* Tiled 16bpp */
+    if (pTDFX->cpp==2)
+      fmt=((pTDFX->stride+127)/128)|(3<<16); /* Tiled 16bpp */
+    else
+      fmt=((pTDFX->stride+127)/128)|(5<<16); /* Tiled 32bpp */
     TDFXWriteLong(pTDFX, SST_2D_DSTBASEADDR, pTDFX->depthOffset|BIT(31));
     TDFXWriteLong(pTDFX, SST_2D_DSTFORMAT, fmt);
     TDFXWriteLong(pTDFX, SST_2D_SRCBASEADDR, pTDFX->depthOffset|BIT(31));
     TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, fmt);
     break;
   default:
+    ;
   }
-#endif  
 }
 
 void
 TDFXSetLFBConfig(TDFXPtr pTDFX) {
-  TDFXWriteLongMMIO(pTDFX, LFBMEMORYCONFIG, (pTDFX->backOffset>>12) |
-		    SST_RAW_LFB_ADDR_STRIDE_4K | 
-		    ((pTDFX->stride+127)/128)<<SST_RAW_LFB_TILE_STRIDE_SHIFT);
+  if (pTDFX->ChipType<=PCI_CHIP_VOODOO3) {
+    TDFXWriteLongMMIO(pTDFX, LFBMEMORYCONFIG, (pTDFX->backOffset>>12) |
+		      SST_RAW_LFB_ADDR_STRIDE_4K | 
+		      ((pTDFX->stride+127)/128)<<SST_RAW_LFB_TILE_STRIDE_SHIFT);
+  } else {
+    int chip;
+    int stride, bits;
+    if (pTDFX->cpp==2) stride=pTDFX->stride;
+    else stride=4*pTDFX->stride/pTDFX->cpp;
+    bits=pTDFX->backOffset>>12;
+    for (chip=0; chip<pTDFX->numChips; chip++) {
+      TDFXWriteChipLongMMIO(pTDFX, chip, LFBMEMORYCONFIG, (bits&0x1FFF) |
+			    SST_RAW_LFB_ADDR_STRIDE_4K | 
+			    ((bits&0x6000)<<10) |
+			    ((stride+127)/128)<<SST_RAW_LFB_TILE_STRIDE_SHIFT);
+    }
+  }
 }
 
 Bool
@@ -265,8 +297,11 @@
   }
 }
 
-static void TDFXSendNOPNoProp(TDFXPtr pTDFX)
+static void TDFXSendNOPNoProp(ScrnInfoPtr pScrn)
 {
+  TDFXPtr pTDFX;
+
+  pTDFX=TDFXPTR(pScrn);
   TDFXMakeRoomNoProp(pTDFX, 1);
   TDFXWriteLongMMIO(pTDFX, SST_2D_COMMAND, SST_2D_NOP);
 }  
@@ -280,7 +315,7 @@
   TDFXTRACEACCEL("TDFXSync\n");
   pTDFX=TDFXPTR(pScrn);
 
-  TDFXSendNOPNoProp(pTDFX);
+  TDFXSendNOPNoProp(pScrn);
   i=0;
   do {
     stat=TDFXReadLongMMIO(pTDFX, 0);
@@ -322,10 +357,15 @@
 }
 
 static void
-TDFXClearState(TDFXPtr pTDFX)
+TDFXClearState(ScrnInfoPtr pScrn)
 {
+  TDFXPtr pTDFX;
+
+  pTDFX=TDFXPTR(pScrn);
   pTDFX->Cmd=0;
   pTDFX->DrawState&=~DRAW_STATE_TRANSPARENT;
+  /* Make sure we've done a sync */
+  TDFXFirstSync(pScrn);
 }
 
 static void
@@ -366,8 +406,7 @@
 		 "rop=%d planemask=%d trans_color=%d\n", 
 		 xdir, ydir, rop, planemask, trans_color);
   pTDFX=TDFXPTR(pScrn);
-  TDFXFirstSync(pScrn);
-  TDFXClearState(pTDFX);
+  TDFXClearState(pScrn);
 
   if (trans_color!=-1) {
     TDFXMakeRoom(pTDFX, 3);
@@ -410,7 +449,7 @@
   }
   if ((srcY>=dstY-32 && srcY<=dstY)||
       (srcY>=pTDFX->prevBlitDest.y1-32 && srcY<=pTDFX->prevBlitDest.y1)) {
-    TDFXSendNOP(pTDFX);
+    TDFXSendNOP(pScrn);
   }
   pTDFX->sync(pScrn);
 
@@ -434,8 +473,7 @@
   TDFXTRACEACCEL("TDFXSetupForSolidFill color=%d rop=%d planemask=%d\n",
                  color, rop, planemask);
   pTDFX=TDFXPTR(pScrn);
-  TDFXClearState(pTDFX);
-  TDFXFirstSync(pScrn);
+  TDFXClearState(pScrn);
 
   pTDFX->Cmd=TDFXROPCvt[rop]<<24;
   if (pTDFX->cpp==1) fmt=(1<<16)|pTDFX->stride; 
@@ -479,8 +517,7 @@
                  " bg=%d rop=%d planemask=%d\n", patx, paty, fg, bg, rop,
 		 planemask);
   pTDFX=TDFXPTR(pScrn);
-  TDFXClearState(pTDFX);
-  TDFXFirstSync(pScrn);
+  TDFXClearState(pScrn);
 
   pTDFX->Cmd = (TDFXROPCvt[rop+ROP_PATTERN_OFFSET]<<24) |
     SST_2D_MONOCHROME_PATTERN;
@@ -525,8 +562,7 @@
 
   TDFXTRACEACCEL("TDFXSetupForSolidLine\n");
   pTDFX=TDFXPTR(pScrn);
-  TDFXClearState(pTDFX);
-  TDFXFirstSync(pScrn);
+  TDFXClearState(pScrn);
 
   pTDFX->Cmd = (TDFXROPCvt[rop]<<24);
 
@@ -591,8 +627,7 @@
 
   TDFXTRACEACCEL("TDFXNonTEGlyphRenderer\n");
   pTDFX=TDFXPTR(pScrn);
-  TDFXFirstSync(pScrn);
-  TDFXClearState(pTDFX);
+  TDFXClearState(pScrn);
   /* Don't bother fixing clip1, we're going to change it anyway */
   pTDFX->DrawState&=~DRAW_STATE_CLIP1CHANGED;
   TDFXMatchState(pTDFX);
@@ -608,8 +643,8 @@
 	  SSTCP_SRCXY|SSTCP_COLORFORE|SSTCP_COMMAND);
   TDFXWriteLong(pTDFX, SST_2D_CLIP1MIN, ((pbox->y1&0x1FFF)<<16) |
 		(pbox->x1&0x1FFF));
-  TDFXWriteLong(pTDFX, SST_2D_CLIP1MAX, (((pbox->y2+1)&0x1FFF)<<16) |
-		((pbox->x2+1)&0x1FFF));
+  TDFXWriteLong(pTDFX, SST_2D_CLIP1MAX, ((pbox->y2&0x1FFF)<<16) |
+		(pbox->x2&0x1FFF));
   TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, SST_2D_PIXFMT_1BPP |
 		SST_2D_SOURCE_PACKING_DWORD);
   TDFXWriteLong(pTDFX, SST_2D_SRCXY, 0);
@@ -657,8 +692,7 @@
 
   TDFXTRACEACCEL("TDFXSetupForDashedLine\n");
   pTDFX=TDFXPTR(pScrn);
-  TDFXClearState(pTDFX);
-  TDFXFirstSync(pScrn);
+  TDFXClearState(pScrn);
 
   pTDFX->Cmd = (TDFXROPCvt[rop]<<24) | SST_2D_STIPPLE_LINE;
   if(bg == -1) {
@@ -701,8 +735,7 @@
 
   TDFXTRACEACCEL("TDFXSetupForScreenToScreenColorExpandFill\n");
   pTDFX=TDFXPTR(pScrn);
-  TDFXClearState(pTDFX);
-  TDFXFirstSync(pScrn);
+  TDFXClearState(pScrn);
   
   TDFXMatchState(pTDFX);
   pTDFX->Cmd|=SST_2D_SCRNTOSCRNBLIT|(TDFXROPCvt[rop]<<24);
@@ -736,7 +769,7 @@
   pTDFX->DrawState|=DRAW_STATE_CLIP1CHANGED;
 
   if (srcy>=pTDFX->prevBlitDest.y1-8 && srcy<=pTDFX->prevBlitDest.y1) {
-    TDFXSendNOP(pTDFX);
+    TDFXSendNOP(pScrn);
   }
 
   if (pTDFX->cpp==1) fmt=(1<<16)|pTDFX->stride; 
@@ -767,8 +800,7 @@
   TDFXTRACEACCEL("SetupForCPUToScreenColorExpandFill bg=%x fg=%x rop=%d\n",
                  bg, fg, rop);
   pTDFX=TDFXPTR(pScrn);
-  TDFXClearState(pTDFX);
-  TDFXFirstSync(pScrn);
+  TDFXClearState(pScrn);
 
   pTDFX->Cmd|=SST_2D_HOSTTOSCRNBLIT|(TDFXROPCvt[rop]<<24);
   
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c:1.2 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c:1.3
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c:1.2	Tue Feb  8 09:19:17 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c	Fri Jun 16 17:03:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c,v 1.2 2000/02/08 17:19:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c,v 1.3 2000/06/17 00:03:25 martin Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -31,6 +31,13 @@
   TDFX_BlitTransRect
 };
 
+/*
+We should allow you to change the depth, but the accel driver isn't
+ready to handle that yet. Also, we are currently taking the default
+visual and using it for the visual reported by DGA. It would be
+relatively easy to at least give DirectColor and TrueColor visuals
+instead of just the default
+*/
 Bool
 TDFXDGAInit(ScreenPtr pScreen)
 {
@@ -71,12 +78,13 @@
     currentMode->red_mask = pScrn->mask.red;
     currentMode->green_mask = pScrn->mask.green;
     currentMode->blue_mask = pScrn->mask.blue;
+    currentMode->visualClass = pScrn->defaultVisual;
     currentMode->viewportWidth = pMode->HDisplay;
     currentMode->viewportHeight = pMode->VDisplay;
     currentMode->xViewportStep = (3 - pTDFX->cpp);
     currentMode->yViewportStep = 1;
     currentMode->viewportFlags = DGA_FLIP_RETRACE;
-    currentMode->offset = 0;
+    currentMode->offset = pTDFX->fbOffset;
     currentMode->address = pTDFX->FbBase;
 
     if (oneMore) { /* first one is narrow width */
@@ -214,7 +222,7 @@
     TDFXPtr pTDFX = TDFXPTR(pScrn);
 
     *name = NULL; 		/* no special device */
-    *mem = (unsigned char*)pTDFX->LinearAddr;
+    *mem = (unsigned char*)pTDFX->LinearAddr[0];
     *size = pTDFX->FbMapSize;
     *offset = 0;
     *flags = DGA_NEED_ROOT;
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c:1.6 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c:1.6	Mon Feb 14 23:13:42 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c	Fri Jun 23 16:43:45 2000
@@ -1,22 +1,14 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c,v 1.6 2000/02/15 07:13:42 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c,v 1.10 2000/06/23 23:43:45 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
 #include "xf86Priv.h"
-
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
-#define PSZ 8
-#include "cfb.h"
-#undef PSZ
-#include "cfb16.h"
-#include "cfb32.h"
-
+#include "fb.h"
 #include "miline.h"
-
 #include "GL/glxtokens.h"
-
 #include "tdfx.h"
 #include "tdfx_dri.h"
 #include "tdfx_dripriv.h"
@@ -24,7 +16,6 @@
 static char TDFXKernelDriverName[] = "tdfx";
 static char TDFXClientDriverName[] = "tdfx";
 
-static Bool TDFXInitVisualConfigs(ScreenPtr pScreen);
 static Bool TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual, 
 			      drmContext hwContext, void *pVisualConfigPriv,
 			      DRIContextType contextStore);
@@ -48,15 +39,12 @@
   __GLXvisualConfig *pConfigs = 0;
   TDFXConfigPrivPtr pTDFXConfigs = 0;
   TDFXConfigPrivPtr *pTDFXConfigPtrs = 0;
-  int i;
+  int i, db, stencil, accum, depth;
 
   switch (pScrn->bitsPerPixel) {
   case 8:
-  case 24:
-  case 32:
-    break;
   case 16:
-    numConfigs = 2;
+    numConfigs = 16;
 
     if (!(pConfigs = (__GLXvisualConfig*)xnfcalloc(sizeof(__GLXvisualConfig),
 						   numConfigs))) {
@@ -75,65 +63,168 @@
     }
     for (i=0; i<numConfigs; i++) 
       pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
+
+    i=0;
+    depth=1;
+    for (db = 0; db <=1; db++) {
+      for (depth = 0; depth<=1; depth++) {
+	for (accum = 0; accum <= 1; accum++) {
+	  for (stencil = 0; stencil <= 1; stencil++) {
+	    pConfigs[i].vid = -1;
+	    pConfigs[i].class = -1;
+	    pConfigs[i].rgba = TRUE;
+	    pConfigs[i].redSize = 5;
+	    pConfigs[i].greenSize = 6;
+	    pConfigs[i].blueSize = 5;
+	    pConfigs[i].redMask = 0x0000F800;
+	    pConfigs[i].greenMask = 0x000007E0;
+	    pConfigs[i].blueMask = 0x0000001F;
+	    pConfigs[i].alphaMask = 0;
+	    if (accum) {
+	      pConfigs[i].accumRedSize = 16;
+	      pConfigs[i].accumGreenSize = 16;
+	      pConfigs[i].accumBlueSize = 16;
+	      pConfigs[i].accumAlphaSize = 0;
+	    } else {
+	      pConfigs[i].accumRedSize = 0;
+	      pConfigs[i].accumGreenSize = 0;
+	      pConfigs[i].accumBlueSize = 0;
+	      pConfigs[i].accumAlphaSize = 0;
+	    }
+	    if (db)
+	      pConfigs[i].doubleBuffer = TRUE;
+	    else
+	      pConfigs[i].doubleBuffer = FALSE;
+	    pConfigs[i].stereo = FALSE;
+	    pConfigs[i].bufferSize = 16;
+	    if (depth) {
+	      if (pTDFX->cpp>2)
+		pConfigs[i].depthSize = 24;
+	      else 
+		pConfigs[i].depthSize = 16;
+	    } else {
+	      pConfigs[i].depthSize = 0;
+	    }
+	    if (stencil)
+	      pConfigs[i].stencilSize = 8;
+	    else
+	      pConfigs[i].stencilSize = 0;
+	    pConfigs[i].auxBuffers = 0;
+	    pConfigs[i].level = 0;
+	    if (stencil || accum)
+	      pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+	    else
+	      pConfigs[i].visualRating = GLX_NONE_EXT;
+	    pConfigs[i].transparentPixel = 0;
+	    pConfigs[i].transparentRed = 0;
+	    pConfigs[i].transparentGreen = 0;
+	    pConfigs[i].transparentBlue = 0;
+	    pConfigs[i].transparentAlpha = 0;
+	    pConfigs[i].transparentIndex = 0;
+	    i++;
+	  }
+	}
+      }
+    }
+    if (i!=numConfigs) {
+      ErrorF("Incorrect initialization of visuals\n");
+      return FALSE;
+    } else ErrorF("Created %d visuals\n", numConfigs);
+    break; /* 16bpp */
 
-    pConfigs[0].vid = -1;
-    pConfigs[0].class = -1;
-    pConfigs[0].rgba = TRUE;
-    pConfigs[0].redSize = 5;
-    pConfigs[0].greenSize = 6;
-    pConfigs[0].blueSize = 5;
-    pConfigs[0].redMask = 0x0000F800;
-    pConfigs[0].greenMask = 0x000007E0;
-    pConfigs[0].blueMask = 0x0000001F;
-    pConfigs[0].alphaMask = 0;
-    pConfigs[0].accumRedSize = 0;
-    pConfigs[0].accumGreenSize = 0;
-    pConfigs[0].accumBlueSize = 0;
-    pConfigs[0].accumAlphaSize = 0;
-    pConfigs[0].doubleBuffer = TRUE;
-    pConfigs[0].stereo = FALSE;
-    pConfigs[0].bufferSize = 16;
-    pConfigs[0].depthSize = 16;
-    pConfigs[0].stencilSize = 0;
-    pConfigs[0].auxBuffers = 0;
-    pConfigs[0].level = 0;
-    pConfigs[0].visualRating = 0;
-    pConfigs[0].transparentPixel = 0;
-    pConfigs[0].transparentRed = 0;
-    pConfigs[0].transparentGreen = 0;
-    pConfigs[0].transparentBlue = 0;
-    pConfigs[0].transparentAlpha = 0;
-    pConfigs[0].transparentIndex = 0;
-
-    pConfigs[1].vid = -1;
-    pConfigs[1].class = -1;
-    pConfigs[1].rgba = TRUE;
-    pConfigs[1].redSize = 5;
-    pConfigs[1].greenSize = 6;
-    pConfigs[1].blueSize = 5;
-    pConfigs[1].redMask = 0x0000F800;
-    pConfigs[1].greenMask = 0x000007E0;
-    pConfigs[1].blueMask = 0x0000001F;
-    pConfigs[1].alphaMask = 0;
-    pConfigs[1].accumRedSize = 0;
-    pConfigs[1].accumGreenSize = 0;
-    pConfigs[1].accumBlueSize = 0;
-    pConfigs[1].accumAlphaSize = 0;
-    pConfigs[1].doubleBuffer = FALSE;
-    pConfigs[1].stereo = FALSE;
-    pConfigs[1].bufferSize = 16;
-    pConfigs[1].depthSize = 16;
-    pConfigs[1].stencilSize = 0;
-    pConfigs[1].auxBuffers = 0;
-    pConfigs[1].level = 0;
-    pConfigs[1].visualRating = 0;
-    pConfigs[1].transparentPixel = 0;
-    pConfigs[1].transparentRed = 0;
-    pConfigs[1].transparentGreen = 0;
-    pConfigs[1].transparentBlue = 0;
-    pConfigs[1].transparentAlpha = 0;
-    pConfigs[1].transparentIndex = 0;
+  case 24:
+  case 32:
+    numConfigs = 8;
+
+    pConfigs = (__GLXvisualConfig*) xnfcalloc(sizeof(__GLXvisualConfig), numConfigs);
+    if (!pConfigs)
+      return FALSE;
+
+    pTDFXConfigs = (TDFXConfigPrivPtr) xnfcalloc(sizeof(TDFXConfigPrivRec), numConfigs);
+    if (!pTDFXConfigs) {
+      xfree(pConfigs);
+      return FALSE;
+    }
 
+    pTDFXConfigPtrs = (TDFXConfigPrivPtr *) xnfcalloc(sizeof(TDFXConfigPrivPtr), numConfigs);
+    if (!pTDFXConfigPtrs) {
+      xfree(pConfigs);
+      xfree(pTDFXConfigs);
+      return FALSE;
+    }
+
+    for (i = 0; i < numConfigs; i++) 
+      pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
+
+    i=0;
+    for (db = 0; db <=1; db++) {
+      for (depth = 0; depth<=1; depth++) {
+         /*stencil = depth;*/  /* Z and stencil share the same memory */
+	for (accum = 0; accum <= 1; accum++) {
+           /*for (stencil = 0; stencil <=1; stencil++) {*/
+           stencil = depth;
+	    pConfigs[i].vid = -1;
+	    pConfigs[i].class = -1;
+	    pConfigs[i].rgba = TRUE;
+	    pConfigs[i].redSize = 8;
+	    pConfigs[i].greenSize = 8;
+	    pConfigs[i].blueSize = 8;
+	    pConfigs[i].alphaSize = (pScrn->bitsPerPixel==32) ? 8 : 0;
+	    pConfigs[i].redMask   = 0x00ff0000;
+	    pConfigs[i].greenMask = 0x0000ff00;
+	    pConfigs[i].blueMask  = 0x000000ff;
+	    pConfigs[i].alphaMask = (pScrn->bitsPerPixel==32) ? 0xff000000 : 0;
+	    if (accum) {
+	      pConfigs[i].accumRedSize = 16;
+	      pConfigs[i].accumGreenSize = 16;
+	      pConfigs[i].accumBlueSize = 16;
+	      pConfigs[i].accumAlphaSize = (pScrn->bitsPerPixel==32) ? 16 : 0;
+	    } else {
+	      pConfigs[i].accumRedSize = 0;
+	      pConfigs[i].accumGreenSize = 0;
+	      pConfigs[i].accumBlueSize = 0;
+	      pConfigs[i].accumAlphaSize = 0;
+	    }
+	    if (db)
+	      pConfigs[i].doubleBuffer = TRUE;
+	    else
+	      pConfigs[i].doubleBuffer = FALSE;
+	    pConfigs[i].stereo = FALSE;
+	    pConfigs[i].bufferSize = 16;
+	    if (depth) {
+	      if (pTDFX->cpp > 2)
+		pConfigs[i].depthSize = 24;
+	      else 
+		pConfigs[i].depthSize = 16;
+	    } else {
+	      pConfigs[i].depthSize = 0;
+	    }
+	    if (stencil)
+	      pConfigs[i].stencilSize = 8;
+	    else
+	      pConfigs[i].stencilSize = 0;
+	    pConfigs[i].auxBuffers = 0;
+	    pConfigs[i].level = 0;
+	    if (accum)
+	      pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+	    else
+	      pConfigs[i].visualRating = GLX_NONE_EXT;
+	    pConfigs[i].transparentPixel = 0;
+	    pConfigs[i].transparentRed = 0;
+	    pConfigs[i].transparentGreen = 0;
+	    pConfigs[i].transparentBlue = 0;
+	    pConfigs[i].transparentAlpha = 0;
+	    pConfigs[i].transparentIndex = 0;
+	    i++;
+         /*}*/
+	}
+      }
+    }
+    if (i!=numConfigs) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "Incorrect initialization of visuals\n");
+      return FALSE;
+    } else ErrorF("Created %d visuals\n", numConfigs);
     break;
   }
   pTDFX->numVisualConfigs = numConfigs;
@@ -143,6 +234,26 @@
   return TRUE;
 }
 
+static void
+TDFXDoWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
+		    pointer pReadmask)
+{
+  ScreenPtr pScreen = screenInfo.screens[screenNum];
+  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+
+  TDFXNeedSync(pScrn);
+}
+
+static void 
+TDFXDoBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
+		  pointer pReadmask)
+{
+  ScreenPtr pScreen = screenInfo.screens[screenNum];
+  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+
+  TDFXCheckSync(pScrn);
+}
+
 Bool TDFXDRIScreenInit(ScreenPtr pScreen)
 {
   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
@@ -150,16 +261,42 @@
   DRIInfoPtr pDRIInfo;
   TDFXDRIPtr pTDFXDRI;
 
-#if XFree86LOADER
+  switch (pScrn->bitsPerPixel) {
+  case 8:
+    return FALSE;
+  case 16:
+    break;
+  case 24:
+  case 32:
+    if (pTDFX->ChipType<=PCI_CHIP_VOODOO3) return FALSE;
+  }
+
     /* Check that the GLX, DRI, and DRM modules have been loaded by testing
        for canonical symbols in each module. */
-    if (!LoaderSymbol("GlxSetVisualConfigs")) return FALSE;
-    if (!LoaderSymbol("DRIScreenInit"))       return FALSE;
-    if (!LoaderSymbol("drmAvailable"))        return FALSE;
-#endif
+    if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
+    if (!xf86LoaderCheckSymbol("DRIScreenInit"))       return FALSE;
+    if (!xf86LoaderCheckSymbol("drmAvailable"))        return FALSE;
+    if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "TDFXDRIScreenInit failed (libdri.a too old)\n");
+      return FALSE;
+    }
+
+  /* Check the DRI version */
+  {
+    int major, minor, patch;
+    DRIQueryVersion(&major, &minor, &patch);
+    if (major != 3 || minor != 0 || patch < 0) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR,
+                 "TDFXDRIScreenInit failed (DRI version = %d.%d.%d, expected 3.0.x).  Disabling DRI.\n",
+                 major, minor, patch);
+      return FALSE;
+    }
+  }
 
   pDRIInfo = DRICreateInfoRec();
-  if (!pDRIInfo) return FALSE;
+  if (!pDRIInfo)
+     return FALSE;
   pTDFX->pDRIInfo = pDRIInfo;
 
   pDRIInfo->drmDriverName = TDFXKernelDriverName;
@@ -169,14 +306,19 @@
 	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->busnum,
 	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->devnum,
 	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->funcnum);
-  pDRIInfo->ddxDriverMajorVersion = 0;
-  pDRIInfo->ddxDriverMinorVersion = 1;
-  pDRIInfo->ddxDriverPatchVersion = 0;
-  pDRIInfo->frameBufferPhysicalAddress = pTDFX->LinearAddr;
+  pDRIInfo->ddxDriverMajorVersion = TDFX_MAJOR_VERSION;
+  pDRIInfo->ddxDriverMinorVersion = TDFX_MINOR_VERSION;
+  pDRIInfo->ddxDriverPatchVersion = TDFX_PATCHLEVEL;
+  pDRIInfo->frameBufferPhysicalAddress = pTDFX->LinearAddr[0];
   pDRIInfo->frameBufferSize = pTDFX->FbMapSize;
   pDRIInfo->frameBufferStride = pTDFX->stride;
   pDRIInfo->ddxDrawableTableEntry = TDFX_MAX_DRAWABLES;
 
+  pDRIInfo->wrap.ValidateTree = 0;
+  pDRIInfo->wrap.PostValidateTree = 0;
+  pDRIInfo->wrap.BlockHandler = TDFXDoBlockHandler;
+  pDRIInfo->wrap.WakeupHandler = TDFXDoWakeupHandler;
+
   if (SAREA_MAX_DRAWABLES < TDFX_MAX_DRAWABLES)
     pDRIInfo->maxDrawableTableEntry = SAREA_MAX_DRAWABLES;
   else
@@ -194,7 +336,7 @@
    * in the SAREA header
    */
   if (sizeof(XF86DRISAREARec)+sizeof(TDFXSAREAPriv)>SAREA_MAX) {
-    ErrorF("Data does not fit in SAREA\n");
+     xf86DrvMsg(pScreen->myNum, X_ERROR, "Data does not fit in SAREA\n");
     return FALSE;
   }
   pDRIInfo->SAREASize = SAREA_MAX;
@@ -224,8 +366,29 @@
     return FALSE;
   }
 
+  /* Check the TDFX DRM version */
+  {
+     drmVersionPtr version = drmGetVersion(pTDFX->drmSubFD);
+     if (version) {
+        if (version->version_major != 1 ||
+            version->version_minor != 0 ||
+            version->version_patchlevel < 0) {
+           /* incompatible drm version */
+           xf86DrvMsg(pScreen->myNum, X_ERROR,
+                      "TDFXDRIScreenInit failed (DRM version = %d.%d.%d, expected 1.0.x).  Disabling DRI.\n",
+                      version->version_major,
+                      version->version_minor,
+                      version->version_patchlevel);
+           TDFXDRICloseScreen(pScreen);
+           drmFreeVersion(version);
+           return FALSE;
+        }
+        drmFreeVersion(version);
+     }
+  }
+
   pTDFXDRI->regsSize=TDFXIOMAPSIZE;
-  if (drmAddMap(pTDFX->drmSubFD, (drmHandle)pTDFX->MMIOAddr, 
+  if (drmAddMap(pTDFX->drmSubFD, (drmHandle)pTDFX->MMIOAddr[0], 
 		pTDFXDRI->regsSize, DRM_REGISTERS, 0, &pTDFXDRI->regs)<0) {
     TDFXDRICloseScreen(pScreen);
     return FALSE;
@@ -267,8 +430,6 @@
 		  drmContext hwContext, void *pVisualConfigPriv,
 		  DRIContextType contextStore)
 {
-  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-  TDFXPtr pTDFX = TDFXPTR(pScrn);
   TDFXConfigPrivPtr pTDFXConfig = (TDFXConfigPrivPtr)pVisualConfigPriv;
   TDFXDRIContextPtr ctx;
 
@@ -315,14 +476,21 @@
 		   DRIContextType oldContextType, void *oldContext,
 		   DRIContextType newContextType, void *newContext)
 {
-  if ((syncType==DRI_3D_SYNC) && (oldContextType==DRI_2D_CONTEXT) &&
-      (newContextType==DRI_2D_CONTEXT)) { /* Entering from Wakeup */
-    TDFXSwapContextPrivate(pScreen);
-  }
+#if 0
+  ScrnInfoPtr pScrn;
+
+  pScrn = xf86Screens[pScreen->myNum];
   if ((syncType==DRI_2D_SYNC) && (oldContextType==DRI_NO_CONTEXT) &&
       (newContextType==DRI_2D_CONTEXT)) { /* Exiting from Block Handler */
+    TDFXCheckSync(pScrn);
     TDFXLostContext(pScreen);
   }
+  if ((syncType==DRI_3D_SYNC) && (oldContextType==DRI_2D_CONTEXT) &&
+      (newContextType==DRI_2D_CONTEXT)) { /* Entering from Wakeup */
+    TDFXSwapContextPrivate(pScreen);
+    TDFXNeedSync(pScrn);
+  }
+#endif
 }
 
 static void
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c:1.30 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c:1.39
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c:1.30	Mon Mar  6 15:54:13 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c	Fri Jun 23 16:43:45 2000
@@ -25,7 +25,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c,v 1.30 2000/03/06 23:54:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c,v 1.39 2000/06/23 23:43:45 alanh Exp $ */
 
 /*
  * Authors:
@@ -35,10 +35,9 @@
 
 /*
  * This server does not support these XFree 4.0 features yet
- * DDC1 & DDC2 (requires I2C)
+ * DDC2 (requires I2C)
  * shadowFb (if requested or acceleration is off)
  * Overlay planes
- * DGA
  */
 
 /*
@@ -75,18 +74,8 @@
 /* Required for line biases */
 #include "miline.h"
 
-/* Drivers using cfb need: */
+#include "fb.h"
 
-#define PSZ 8
-#include "cfb.h"
-#undef PSZ
-
-/* Drivers supporting bpp 16, 24 or 32 with cfb need one or more of: */
-
-#include "cfb16.h"
-#include "cfb24.h"
-#include "cfb32.h"
-
 /* !!! These need to be checked !!! */
 #if 0
 #ifdef XFreeXDGA
@@ -110,6 +99,7 @@
 
 /* Required Functions: */
 
+static OptionInfoPtr	TDFXAvailableOptions(int chipid, int busid);
 /* Print a driver identifying message. */
 static void TDFXIdentify(int flags);
 
@@ -147,23 +137,18 @@
 					int PowerManagermentMode, int flags);
 #endif
 
-#define VERSION 4000
-#define TDFX_NAME "TDFX"
-#define TDFX_DRIVER_NAME "tdfx"
-#define TDFX_MAJOR_VERSION 1
-#define TDFX_MINOR_VERSION 0
-#define TDFX_PATCHLEVEL 0
 #define PCI_SUBDEVICE_ID_VOODOO3_2000 0x0036
 #define PCI_SUBDEVICE_ID_VOODOO3_3000 0x003a
 
 DriverRec TDFX = {
-  VERSION,
+  TDFX_VERSION,
   TDFX_DRIVER_NAME,
 #if 0
-  "Accelerated driver for 3dfx Voodoo Banshee and Voodoo3 cards",
+  "Accelerated driver for 3dfx cards",
 #endif
   TDFXIdentify,
   TDFXProbe,
+  TDFXAvailableOptions,
   NULL,
   0
 };
@@ -172,12 +157,14 @@
 static SymTabRec TDFXChipsets[] = {
   { PCI_CHIP_BANSHEE, "3dfx Banshee"},
   { PCI_CHIP_VOODOO3, "3dfx Voodoo3"},
+  { PCI_CHIP_VOODOO5, "3dfx Voodoo5"},
   { -1, NULL }
 };
 
 static PciChipsets TDFXPciChipsets[] = {
   { PCI_CHIP_BANSHEE, PCI_CHIP_BANSHEE, RES_SHARED_VGA },
   { PCI_CHIP_VOODOO3, PCI_CHIP_VOODOO3, RES_SHARED_VGA },
+  { PCI_CHIP_VOODOO5, PCI_CHIP_VOODOO5, RES_SHARED_VGA },
   { -1, -1, RES_UNDEFINED }
 };
 
@@ -187,13 +174,15 @@
 typedef enum {
   OPTION_NOACCEL,
   OPTION_SW_CURSOR,
-  OPTION_USE_PIO
+  OPTION_USE_PIO,
+  OPTION_NO_SLI
 } TDFXOpts;
 
 static OptionInfoRec TDFXOptions[] = {
   { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE },
   { OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE },
   { OPTION_USE_PIO, "UsePIO", OPTV_BOOLEAN, {0}, FALSE},
+  { OPTION_NO_SLI, "NoSLI", OPTV_BOOLEAN, {0}, FALSE},
   { -1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
@@ -214,13 +203,8 @@
     0
 };
 
-static const char *cfbSymbols[] = {
-    "cfbScreenInit",
-    "cfb16ScreenInit",
-    "cfb24ScreenInit",
-    "cfb32ScreenInit",
-    "cfb8_32ScreenInit",
-    "cfb24_32ScreenInit",
+static const char *fbSymbols[] = {
+    "fbScreenInit",
     NULL
 };
 
@@ -271,6 +255,8 @@
     "drmMapBufs",
     "drmMarkBufs",
     "drmUnmapBufs",
+    "drmFreeVersion",
+    "drmGetVersion",
     NULL
 };
 
@@ -287,6 +273,7 @@
     "DRIUnlock",
     "DRIGetSAREAPrivate",
     "DRIGetContext",
+    "DRIQueryVersion",
     "GlxSetVisualConfigs",
     NULL
 };
@@ -333,7 +320,7 @@
 	 * Tell the loader about symbols from other modules that this module
 	 * might refer to.
 	 */
-	LoaderRefSymLists(vgahwSymbols, cfbSymbols, xaaSymbols, 
+	LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, 
 			  xf8_32bppSymbols, ramdacSymbols, vbeSymbols,
 #ifdef XF86DRI
 			  drmSymbols, driSymbols,
@@ -388,6 +375,26 @@
   xf86PrintChipsets(TDFX_NAME, "Driver for 3dfx Banshee/Voodoo3 chipsets", TDFXChipsets);
 }
 
+static
+OptionInfoPtr
+TDFXAvailableOptions(int chipid, int busid)
+{
+    return TDFXOptions;
+}
+
+void
+TDFXProbeDDC(ScrnInfoPtr pScrn, int index)
+{
+    vbeInfoPtr pVbe;
+#ifdef XFree86LOADER
+    if (xf86LoadSubModule(pScrn, "vbe"))
+#endif
+    {
+	pVbe =  VBEInit(NULL,index);
+	vbeDoEDID(pVbe, NULL);
+    }
+}
+
 /*
  * TDFXProbe --
  *
@@ -420,9 +427,9 @@
 				  TDFXChipsets, TDFXPciChipsets,
 				  devSections, numDevSections,
 				  drv, &usedChips);
+
   if (devSections)
     xfree(devSections);
-  devSections=NULL;
   if (numUsed<=0) return FALSE;
 
   if (flags & PROBE_DETECT)
@@ -431,23 +438,24 @@
     ScrnInfoPtr pScrn;
 
     /* Allocate new ScrnInfoRec and claim the slot */
-    pScrn = xf86AllocateScreen(drv, 0);
-
-    pScrn->driverVersion = VERSION;
-    pScrn->driverName = TDFX_DRIVER_NAME;
-    pScrn->name = TDFX_NAME;
-    pScrn->Probe = TDFXProbe;
-    pScrn->PreInit = TDFXPreInit;
-    pScrn->ScreenInit = TDFXScreenInit;
-    pScrn->SwitchMode = TDFXSwitchMode;
-    pScrn->AdjustFrame = TDFXAdjustFrame;
-    pScrn->EnterVT = TDFXEnterVT;
-    pScrn->LeaveVT = TDFXLeaveVT;
-    pScrn->FreeScreen = TDFXFreeScreen;
-    pScrn->ValidMode = TDFXValidMode;
-    foundScreen = TRUE;
-
-    xf86ConfigActivePciEntity(pScrn, usedChips[i], TDFXPciChipsets, 0, 0, 0, 0, 0);
+    pScrn = NULL;
+    if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
+					   TDFXPciChipsets, 0, 0, 0, 0, 0))) {
+
+	pScrn->driverVersion = TDFX_VERSION;
+	pScrn->driverName = TDFX_DRIVER_NAME;
+	pScrn->name = TDFX_NAME;
+	pScrn->Probe = TDFXProbe;
+	pScrn->PreInit = TDFXPreInit;
+	pScrn->ScreenInit = TDFXScreenInit;
+	pScrn->SwitchMode = TDFXSwitchMode;
+	pScrn->AdjustFrame = TDFXAdjustFrame;
+	pScrn->EnterVT = TDFXEnterVT;
+	pScrn->LeaveVT = TDFXLeaveVT;
+	pScrn->FreeScreen = TDFXFreeScreen;
+	pScrn->ValidMode = TDFXValidMode;
+	foundScreen = TRUE;
+    }
   }
   xfree(usedChips);
 
@@ -463,10 +471,11 @@
   pTDFX = TDFXPTR(pScrn);
   TDFXTRACE("TDFXCountRam start\n");
   memSize=0;
-  if (pTDFX->PIOBase) {
+  if (pTDFX->PIOBase[0]) {
     CARD32 
       partSize,                 /* size of SGRAM chips in Mbits */
       nChips,                   /* # chips of SDRAM/SGRAM */
+      banks,			/* Number of banks of chips */
       dramInit0_strap,    
       dramInit1_strap,    
       dramInit1,
@@ -492,23 +501,28 @@
     /* determine memory size from strapping pins (dramInit0 and dramInit1) */
     dramInit0_strap = pTDFX->readLong(pTDFX, DRAMINIT0);
 
-    dramInit0_strap &= SST_SGRAM_TYPE | SST_SGRAM_NUM_CHIPSETS;
-
-    if ( memType == MEM_TYPE_SDRAM ) {
-      memSize = 16;
-    } else {
-      nChips = ((dramInit0_strap & SST_SGRAM_NUM_CHIPSETS) == 0) ? 4 : 8;
-    
-      if ( (dramInit0_strap & SST_SGRAM_TYPE) == SST_SGRAM_TYPE_8MBIT )  {
-	partSize = 8;
-      } else if ( (dramInit0_strap & SST_SGRAM_TYPE) == SST_SGRAM_TYPE_16MBIT) {
-	partSize = 16;
+    if (pTDFX->ChipType<=PCI_CHIP_VOODOO3) { /* Banshee/V3 */
+      if (memType == MEM_TYPE_SDRAM) {
+	memSize = 16;
       } else {
-	ErrorF("Invalid sgram type = 0x%x",
-	       (dramInit0_strap & SST_SGRAM_TYPE) << SST_SGRAM_TYPE_SHIFT );
-	return 0;
+	nChips = ((dramInit0_strap & SST_SGRAM_NUM_CHIPSETS) == 0) ? 4 : 8;
+    
+	if ( (dramInit0_strap & SST_SGRAM_TYPE) == SST_SGRAM_TYPE_8MBIT )  {
+	  partSize = 8;
+	} else if ( (dramInit0_strap & SST_SGRAM_TYPE) == SST_SGRAM_TYPE_16MBIT) {
+	  partSize = 16;
+	} else {
+	  ErrorF("Invalid sgram type = 0x%x",
+		 (dramInit0_strap & SST_SGRAM_TYPE) << SST_SGRAM_TYPE_SHIFT );
+	  return 0;
+	}
+	memSize = (nChips * partSize) / 8;      /* in MBytes */
       }
-      memSize = (nChips * partSize) / 8;      /* in MBytes */
+    } else { /* V4, V5 */
+      nChips = ((dramInit0_strap & SST_SGRAM_NUM_CHIPSETS)==0) ? 4 : 8;
+      partSize=1<<((dramInit0_strap&0x38000000)>>28);
+      banks=((dramInit0_strap&BIT(30))==0) ? 2 : 4;
+      memSize=nChips*partSize*banks;
     }
     TDFXTRACEREG("dramInit0 = %x dramInit1 = %x\n", dramInit0_strap, dramInit1_strap);
     TDFXTRACEREG("MemConfig %d chips %d size %d total\n", nChips, partSize, memSize);
@@ -528,18 +542,85 @@
   return memSize*1024;
 }
 
-extern xf86MonPtr ConfiguredMonitor;
+static int TDFXCfgToSize(int cfg)
+{
+  if (cfg<4) return 0x8000000<<cfg;
+  return 0x4000000>>(cfg-4);
+}
 
-void
-TDFXProbeDDC(ScrnInfoPtr pScrn, int index)
+static int TDFXSizeToCfg(int size)
 {
-    vbeInfoPtr pVbe;
-    if (xf86LoadSubModule(pScrn, "vbe")) {
-        pVbe = VBEInit(NULL,index);
-        ConfiguredMonitor = vbeDoEDID(pVbe);
+  switch (size) {
+  case 0x40000000: return 3;
+  case 0x20000000: return 2;
+  case 0x10000000: return 1;
+  case 0x08000000: return 0;
+  case 0x04000000: return 4;
+  case 0x02000000: return 5;
+  case 0x01000000: return 6;
+  case 0x00800000: return 7;
+  case 0x00400000: return 8;
+  default:
+    return -1;
+  }
+}
+
+static void
+TDFXFindChips(ScrnInfoPtr pScrn, pciVideoPtr match)
+{
+  TDFXPtr pTDFX;
+  pciVideoPtr *ppPci;
+
+  pTDFX=TDFXPTR(pScrn);
+  pTDFX->numChips=0;
+  pTDFX->ChipType=match->chipType;
+  for (ppPci = xf86GetPciVideoInfo(); *ppPci != NULL; ppPci++) {
+    if ((*ppPci)->bus == match->bus && 
+	(*ppPci)->device == match->device) {
+      pTDFX->PciTag[pTDFX->numChips] = pciTag((*ppPci)->bus, 
+					      (*ppPci)->device,
+					      (*ppPci)->func);
+      pTDFX->PIOBase[pTDFX->numChips] = (*ppPci)->ioBase[2]&0xFFFFFFFC;
+      pTDFX->numChips++;
     }
+  }
+  /* Disable the secondary chips for now */
+  pTDFX->numChips=1;
 }
 
+static void
+TDFXInitChips(ScrnInfoPtr pScrn)
+{
+  TDFXPtr pTDFX;
+  int i, cfgbits, initbits;
+  int mem0base, mem1base, mem0size, mem0bits, mem1size, mem1bits;
+
+  pTDFX=TDFXPTR(pScrn);
+  cfgbits=pciReadLong(pTDFX->PciTag[0], CFG_PCI_DECODE);
+  mem0base=pciReadLong(pTDFX->PciTag[0], CFG_MEM0BASE);
+  mem1base=pciReadLong(pTDFX->PciTag[0], CFG_MEM1BASE);
+  mem0size=32*1024*1024; /* Registers are always 32MB */
+  mem1size=pScrn->videoRam*1024*2; /* Linear mapping is 2x memory */
+  mem0bits=TDFXSizeToCfg(mem0size);
+  mem1bits=TDFXSizeToCfg(mem1size)<<4;
+  cfgbits=(cfgbits&~(0xFF))|mem0bits|mem1bits;
+  for (i=0; i<pTDFX->numChips; i++) {
+    initbits=pciReadLong(pTDFX->PciTag[i], CFG_INIT_ENABLE);
+    initbits|=BIT(10);
+    pciWriteLong(pTDFX->PciTag[i], CFG_INIT_ENABLE, initbits);
+    pTDFX->MMIOAddr[i]=mem0base+i*mem0size;
+    pciWriteLong(pTDFX->PciTag[i], CFG_MEM0BASE, 0xFFFFFFFF);
+    pciWriteLong(pTDFX->PciTag[i], CFG_MEM0BASE, pTDFX->MMIOAddr[i]);
+    pTDFX->MMIOAddr[i]&=0xFFFFFF00;
+    pTDFX->LinearAddr[i]=mem1base+i*mem1size;
+    pciWriteLong(pTDFX->PciTag[i], CFG_MEM1BASE, 0xFFFFFFFF);
+    pciWriteLong(pTDFX->PciTag[i], CFG_MEM1BASE, pTDFX->LinearAddr[i]);
+    pTDFX->LinearAddr[i]&=0xFFFFFF00;
+    pciWriteLong(pTDFX->PciTag[i], CFG_PCI_DECODE, cfgbits);
+    initbits&=~BIT(10);
+    pciWriteLong(pTDFX->PciTag[i], CFG_INIT_ENABLE, initbits);
+  }
+}
 
 /*
  * TDFXPreInit --
@@ -549,8 +630,8 @@
  *
  */
 static Bool
-TDFXPreInit(ScrnInfoPtr pScrn, int flags) {
-  vgaHWPtr hwp;
+TDFXPreInit(ScrnInfoPtr pScrn, int flags) 
+{
   TDFXPtr pTDFX;
   ClockRangePtr clockRanges;
   int i;
@@ -558,6 +639,7 @@
   char *mod=0, *reqSym=0;
   int flags24;
   rgb defaultWeight = {0, 0, 0};
+  pciVideoPtr match;
 
   TDFXTRACE("TDFXPreInit start\n");
   if (pScrn->numEntities != 1) return FALSE;
@@ -569,10 +651,29 @@
 
   pTDFX = TDFXPTR(pScrn);
 
+  pTDFX->initDone=FALSE;
   pTDFX->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 
+  if (flags & PROBE_DETECT) {
+	TDFXProbeDDC(pScrn, pTDFX->pEnt->index);
+	return TRUE;
+  }
+
   if (pTDFX->pEnt->location.type != BUS_PCI) return FALSE;
 
+  if (flags & PROBE_DETECT) {
+    TDFXProbeDDC(pScrn, pTDFX->pEnt->index);
+    return FALSE;
+  }
+  
+  /* The vgahw module should be loaded here when needed */
+  if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE;
+
+  xf86LoaderReqSymLists(vgahwSymbols, NULL);
+
+  /* Allocate a vgaHWRec */
+  if (!vgaHWGetHWRec(pScrn)) return FALSE;
+
   if (xf86LoadSubModule(pScrn, "int10")) {
     xf86Int10InfoPtr pInt;
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
@@ -591,9 +692,8 @@
     }
   }
 
-  pTDFX->PciInfo = xf86GetPciInfoForEntity(pTDFX->pEnt->index);
-  pTDFX->PciTag = pciTag(pTDFX->PciInfo->bus, pTDFX->PciInfo->device,
-			 pTDFX->PciInfo->func);
+  match=pTDFX->PciInfo=xf86GetPciInfoForEntity(pTDFX->pEnt->index);
+  TDFXFindChips(pScrn, match);
 
   if (xf86RegisterResources(pTDFX->pEnt->index, 0, ResNone))
       return FALSE;
@@ -602,11 +702,6 @@
   else
     pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
 
-  if (flags & PROBE_DETECT) {
-    TDFXProbeDDC(pScrn, pTDFX->pEnt->index);
-    return FALSE;
-  }
-  
   /* Set pScrn->monitor */
   pScrn->monitor = pScrn->confScreen->monitor;
 
@@ -634,7 +729,6 @@
       return FALSE;
   }
 
-  pScrn->rgbBits=8;
   if (!xf86SetDefaultVisual(pScrn, -1)) {
     return FALSE;
   } else {
@@ -647,18 +741,9 @@
     }
   }
 
-  /* The vgahw module should be loaded here when needed */
-  if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE;
-
-  xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
-  /* Allocate a vgaHWRec */
-  if (!vgaHWGetHWRec(pScrn)) return FALSE;
-
   /* We use a programamble clock */
   pScrn->progClock = TRUE;
 
-  hwp = VGAHWPTR(pScrn);
   pTDFX->cpp = pScrn->bitsPerPixel/8;
 
   /* Process the options */
@@ -679,7 +764,7 @@
 	       pTDFX->pEnt->device->chipID);
   } else {
     from = X_PROBED;
-    pScrn->chipset = (char *)xf86TokenToString(TDFXChipsets, pTDFX->PciInfo->chipType);
+    pScrn->chipset = (char *)xf86TokenToString(TDFXChipsets, match->chipType);
   }
   if (pTDFX->pEnt->device->chipRev >= 0) {
     xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
@@ -689,11 +774,11 @@
   xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
 
   if (pTDFX->pEnt->device->MemBase != 0) {
-    pTDFX->LinearAddr = pTDFX->pEnt->device->MemBase;
+    pTDFX->LinearAddr[0] = pTDFX->pEnt->device->MemBase;
     from = X_CONFIG;
   } else {
-    if (pTDFX->PciInfo->memBase[1] != 0) {
-      pTDFX->LinearAddr = pTDFX->PciInfo->memBase[1];
+    if (match->memBase[1] != 0) {
+      pTDFX->LinearAddr[0] = match->memBase[1];
       from = X_PROBED;
     } else {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
@@ -703,14 +788,14 @@
     }
   }
   xf86DrvMsg(pScrn->scrnIndex, from, "Linear framebuffer at 0x%lX\n",
-	     (unsigned long)pTDFX->LinearAddr);
+	     (unsigned long)pTDFX->LinearAddr[0]);
 
   if (pTDFX->pEnt->device->IOBase != 0) {
-    pTDFX->MMIOAddr = pTDFX->pEnt->device->IOBase;
+    pTDFX->MMIOAddr[0] = pTDFX->pEnt->device->IOBase;
     from = X_CONFIG;
   } else {
-    if (pTDFX->PciInfo->memBase[0]) {
-      pTDFX->MMIOAddr = pTDFX->PciInfo->memBase[0];
+    if (match->memBase[0]) {
+      pTDFX->MMIOAddr[0] = match->memBase[0];
       from = X_PROBED;
     } else {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -722,8 +807,8 @@
   xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at addr 0x%lX\n",
 	     (unsigned long)pTDFX->MMIOAddr);
 
-  if (pTDFX->PciInfo->ioBase[2]) {
-    pTDFX->PIOBase = pTDFX->PciInfo->ioBase[2]&0xFFFFFFFC;
+  if (match->ioBase[2]) {
+    pTDFX->PIOBase[0] = match->ioBase[2]&0xFFFFFFFC;
   } else {
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 	       "No valid PIO address in PCI config space\n");
@@ -731,7 +816,7 @@
     return FALSE;
   }
   xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "PIO registers at addr 0x%lX\n",
-	     (unsigned long)pTDFX->PIOBase);
+	     (unsigned long)pTDFX->PIOBase[0]);
 
   /* We have to use PIO to probe, because we haven't mappend yet */
   TDFXSetPIOAccess(pTDFX);
@@ -744,6 +829,8 @@
     from = X_CONFIG;
   }
 
+  TDFXInitChips(pScrn);
+
   /* Multiple by two because tiled access requires more address space */
   pTDFX->FbMapSize = pScrn->videoRam*1024*2;
   xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte Mapping %d kByte\n",
@@ -778,12 +865,12 @@
       pTDFX->MaxClock = pTDFX->pEnt->device->dacSpeeds[0];
     from = X_CONFIG;
   } else {
-    switch (pTDFX->PciInfo->chipType) {
+    switch (pTDFX->ChipType) {
     case PCI_CHIP_BANSHEE:
       pTDFX->MaxClock = 270000;
       break;
     case PCI_CHIP_VOODOO3:
-      switch(pTDFX->PciInfo->subsysCard) {
+      switch(match->subsysCard) {
       case PCI_SUBDEVICE_ID_VOODOO3_2000:
 	pTDFX->MaxClock = 300000;
 	break;
@@ -795,14 +882,17 @@
 	break;
       }
       break;
+    case PCI_CHIP_VOODOO5:
+      pTDFX->MaxClock = 350000;
+      break;
     }
   }
-  clockRanges = xnfalloc(sizeof(ClockRange));
+  clockRanges = xnfcalloc(sizeof(ClockRange), 1);
   clockRanges->next=NULL;
   clockRanges->minClock= 12000; /* !!! What's the min clock? !!! */
   clockRanges->maxClock=pTDFX->MaxClock;
   clockRanges->clockIndex = -1;
-  clockRanges->interlaceAllowed = TRUE;
+  clockRanges->interlaceAllowed = FALSE;
   clockRanges->doubleScanAllowed = TRUE;
 
   i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
@@ -833,29 +923,11 @@
 
   xf86SetDpi(pScrn, 0, 0);
 
-  switch (pScrn->bitsPerPixel) {
-  case 8:
-    mod = "cfb";
-    reqSym = "cfbScreenInit";
-    break;
-  case 16:
-    mod = "cfb16";
-    reqSym = "cfb16ScreenInit";
-    break;
-  case 24:
-    mod = "cfb24";
-    reqSym = "cfb24ScreenInit";
-    break;
-  case 32:
-    mod = "cfb32";
-    reqSym = "cfb32ScreenInit";
-    break;
-  }
-  if (mod && !xf86LoadSubModule(pScrn, mod)) {
+  if (!xf86LoadSubModule(pScrn, "fb")) {
     TDFXFreeRec(pScrn);
     return FALSE;
   }
-  xf86LoaderReqSymbols(reqSym, NULL);
+  xf86LoaderReqSymbols("fbScreenInit", NULL);
 
   if (!xf86ReturnOptValBool(TDFXOptions, OPTION_NOACCEL, FALSE)) {
     if (!xf86LoadSubModule(pScrn, "xaa")) {
@@ -883,25 +955,11 @@
   /* Initialize DDC1 if possible */
   if (xf86LoadSubModule(pScrn, "vbe")) {
       xf86MonPtr pMon;
-      pMon = vbeDoEDID(VBEInit(NULL,pTDFX->pEnt->index));
+      pMon = vbeDoEDID(VBEInit(NULL,pTDFX->pEnt->index), NULL);
       xf86SetDDCproperties(pScrn,xf86PrintEDID(pMon));
   }
 
-  
-  /*  We wont be using the VGA access after the probe */
-  if (!xf86ReturnOptValBool(TDFXOptions, OPTION_USE_PIO, FALSE)) {
-    resRange vgaio[] = { {ResShrIoBlock,0x3B0,0x3BB},
-			 {ResShrIoBlock,0x3C0,0x3DF},
-			 _END };
-    resRange vgamem[] = {{ResShrMemBlock,0xA0000,0xAFFFF},
-			 {ResShrMemBlock,0xB8000,0xBFFFF},
-			 {ResShrMemBlock,0xB0000,0xB7FFF},
-			 _END };
-
-    pTDFX->usePIO=FALSE;
-    xf86SetOperatingState(vgaio, pTDFX->pEnt->index, ResUnusedOpr);
-    xf86SetOperatingState(vgamem, pTDFX->pEnt->index, ResDisableOpr);
-  } else {
+  if (xf86ReturnOptValBool(TDFXOptions, OPTION_USE_PIO, FALSE)) {
     pTDFX->usePIO=TRUE;
   }
 
@@ -911,23 +969,26 @@
 static Bool
 TDFXMapMem(ScrnInfoPtr pScrn)
 {
-  int mmioFlags;
+  int mmioFlags, i;
   TDFXPtr pTDFX;
 
   TDFXTRACE("TDFXMapMem start\n");
   pTDFX = TDFXPTR(pScrn);
 
   mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT;
+
+  for (i=0; i<pTDFX->numChips; i++) {
+    pTDFX->MMIOBase[i] = xf86MapPciMem(pScrn->scrnIndex, mmioFlags, 
+				       pTDFX->PciTag[i], 
+				       pTDFX->MMIOAddr[i],
+				       TDFXIOMAPSIZE);
 
-  pTDFX->MMIOBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags, 
-				      pTDFX->PciTag, 
-				      pTDFX->MMIOAddr,
-				      TDFXIOMAPSIZE);
-  if (!pTDFX->MMIOBase) return FALSE;
+    if (!pTDFX->MMIOBase[i]) return FALSE;
+  }
 
   pTDFX->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-				pTDFX->PciTag,
-				pTDFX->LinearAddr,
+				pTDFX->PciTag[0],
+				pTDFX->LinearAddr[0],
 				pTDFX->FbMapSize);
   if (!pTDFX->FbBase) return FALSE;
 
@@ -938,12 +999,16 @@
 TDFXUnmapMem(ScrnInfoPtr pScrn)
 {
   TDFXPtr pTDFX;
+  int i;
 
   TDFXTRACE("TDFXUnmapMem start\n");
   pTDFX = TDFXPTR(pScrn);
 
-  xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pTDFX->MMIOBase, TDFXIOMAPSIZE);
-  pTDFX->MMIOBase=0;
+  for (i=0; i<pTDFX->numChips; i++) {
+    xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pTDFX->MMIOBase[i], 
+		    TDFXIOMAPSIZE);
+    pTDFX->MMIOBase[i]=0;
+  }
 
   xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pTDFX->FbBase, pTDFX->FbMapSize);
   pTDFX->FbBase = 0;
@@ -1118,12 +1183,20 @@
 #define REFFREQ 14318.18
 
 static int
-CalcPLL(int freq, int *f_out) {
+CalcPLL(int freq, int *f_out, int isBanshee) {
   int m, n, k, best_m, best_n, best_k, f_cur, best_error;
+  int minm, maxm;
 
   TDFXTRACE("CalcPLL start\n");
   best_error=freq;
   best_n=best_m=best_k=0;
+  if (isBanshee) {
+    minm=24;
+    maxm=24;
+  } else {
+    minm=1;
+    maxm=64;
+  }
   for (n=1; n<256; n++) {
     f_cur=REFFREQ*(n+2);
     if (f_cur<freq) {
@@ -1136,7 +1209,7 @@
 	continue;
       }
     }
-    for (m=1; m<64; m++) {
+    for (m=minm; m<maxm; m++) {
       for (k=0; k<4; k++) {
 	f_cur=REFFREQ*(n+2)/(m+2)/(1<<k);
 	if (abs(f_cur-freq)<best_error) {
@@ -1175,7 +1248,7 @@
     tdfxReg->dacmode|=SST_DAC_MODE_2X;
     tdfxReg->vidcfg|=SST_VIDEO_2X_MODE_EN;
   }
-  tdfxReg->vidpll=CalcPLL(freq, &f_out);
+  tdfxReg->vidpll=CalcPLL(freq, &f_out, 0);
   TDFXTRACEREG("Vid PLL freq=%d f_out=%d reg=%x\n", freq, f_out, 
      tdfxReg->vidpll);
   return TRUE;
@@ -1207,7 +1280,10 @@
   TDFXTRACE("SetupGfxPLL start\n");
   pTDFX=TDFXPTR();
   tdfxReg=(vgaTDFXPtr)vgaNewVideoState;
-  tdfxReg->gfxpll=CalcPLL(freq, &f_out);
+  if (pTDFX->chipType==PCI_CHIP_BANSHEE)
+    tdfxReg->gfxpll=CalcPLL(freq, &f_out, 1);
+  else
+    tdfxReg->gfxpll=CalcPLL(freq, &f_out, 0);
   pTDFX->writeLong(pTDFX, PLLCTRL2, tdfxReg->gfxpll);
   TDFXTRACEREG("Gfx PLL freq=%d f_out=%d reg=%x\n", freq, f_out, 
      tdfxReg->gfxpll);
@@ -1218,14 +1294,13 @@
 static Bool
 TDFXInitVGA(ScrnInfoPtr pScrn)
 {
-  static Bool initDone=FALSE;
   TDFXPtr pTDFX;
   TDFXRegPtr tdfxReg;
 
   TDFXTRACE("TDFXInitVGA start\n");
-  if (initDone) return TRUE;
-  initDone=TRUE;
   pTDFX=TDFXPTR(pScrn);
+  if (pTDFX->initDone) return TRUE;
+  pTDFX->initDone=TRUE;
   tdfxReg = &pTDFX->ModeReg;
   tdfxReg->vgainit0 = 0;
   tdfxReg->vgainit0 |= SST_VGA0_EXTENSIONS;
@@ -1240,8 +1315,9 @@
 
   tdfxReg->vidcfg = SST_VIDEO_PROCESSOR_EN | SST_CURSOR_X11 | SST_DESKTOP_EN |
     (pTDFX->cpp-1)<<SST_DESKTOP_PIXEL_FORMAT_SHIFT;
-  if (pTDFX->cpp!=1) tdfxReg->vidcfg |= SST_DESKTOP_CLUT_BYPASS;
 
+  /* tdfxReg->vidcfg |= SST_DESKTOP_CLUT_BYPASS; */
+   
   tdfxReg->stride = pTDFX->stride;
 
   tdfxReg->clip0min = tdfxReg->clip1min = 0;
@@ -1377,8 +1453,9 @@
 #endif
   DoRestore(pScrn, &hwp->ModeReg, &pTDFX->ModeReg, FALSE);
 #ifdef XF86DRI
-  if (pTDFX->directRenderingEnabled)
+  if (pTDFX->directRenderingEnabled) {
     DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
+  }
 #endif
 
   return TRUE;
@@ -1388,30 +1465,37 @@
 TDFXLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
 		  short visualClass) {
   TDFXPtr pTDFX;
-  vgaHWPtr hwp;
-  int i, index;
-  unsigned char r, g, b;
+  int i, j, index, v, repeat, max;
 
   TDFXTRACE("TDFXLoadPalette16 start\n");
   pTDFX = TDFXPTR(pScrn);
-  hwp = VGAHWPTR(pScrn);
   for (i=0; i<numColors; i++) {
-    index=indices[i/2];
-    r=colors[index].red;
-    b=colors[index].blue;
     index=indices[i];
-    g=colors[index].green;
-    hwp->writeDacWriteAddr(hwp, index<<2);
-    hwp->writeDacData(hwp, r);
-    hwp->writeDacData(hwp, g);
-    hwp->writeDacData(hwp, b);
-    i++;
-    index=indices[i];
-    g=colors[index].green;
-    hwp->writeDacWriteAddr(hwp, index<<2);
-    hwp->writeDacData(hwp, r);
-    hwp->writeDacData(hwp, g);
-    hwp->writeDacData(hwp, b);
+    v=(colors[index/2].red<<16)|(colors[index].green<<8)|colors[index/2].blue;
+    if (i<numColors-1) max=indices[i+1]<<2;
+    else max=256;
+    for (j=index<<2; j<max; j++) {
+      repeat=100;
+      do {
+	pTDFX->writeLong(pTDFX, DACADDR, j);
+      } while (--repeat && pTDFX->readLong(pTDFX, DACADDR)!=j);
+      if (!repeat) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Failed to set dac index, "
+		   "bypassing CLUT\n");
+	pTDFX->ModeReg.vidcfg |= SST_DESKTOP_CLUT_BYPASS;
+	return;
+      }
+      repeat=100;
+      do {
+	pTDFX->writeLong(pTDFX, DACDATA, v);
+      } while (--repeat && pTDFX->readLong(pTDFX, DACDATA)!=v);
+      if (!repeat) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Failed to set dac value, "
+		   "bypassing CLUT\n");
+	pTDFX->ModeReg.vidcfg |= SST_DESKTOP_CLUT_BYPASS;
+	return;
+      }
+    }
   }
 }
 
@@ -1419,23 +1503,33 @@
 TDFXLoadPalette24(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
 		  short visualClass) {
   TDFXPtr pTDFX;
-  vgaHWPtr hwp;
-  int i, index;
-  unsigned char r, g, b;
+  int i, index, v, repeat;
 
   TDFXTRACE("TDFXLoadPalette24 start\n");
   pTDFX = TDFXPTR(pScrn);
-  hwp = VGAHWPTR(pScrn);
   for (i=0; i<numColors; i++) {
     index=indices[i];
-    r=colors[index].red;
-    b=colors[index].blue;
-    index=indices[i];
-    g=colors[index].green;
-    hwp->writeDacWriteAddr(hwp, index);
-    hwp->writeDacData(hwp, r);
-    hwp->writeDacData(hwp, g);
-    hwp->writeDacData(hwp, b);
+    v=(colors[index].red<<16)|(colors[index].green<<8)|colors[index].blue;
+    repeat=100;
+    do {
+      pTDFX->writeLong(pTDFX, DACADDR, index);
+    } while (--repeat && pTDFX->readLong(pTDFX, DACADDR)!=index);
+    if (!repeat) {
+      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Failed to set dac index, "
+		 "bypassing CLUT\n");
+      pTDFX->ModeReg.vidcfg |= SST_DESKTOP_CLUT_BYPASS;
+      return;
+    }
+    repeat=100;
+    do {
+      pTDFX->writeLong(pTDFX, DACDATA, v);
+    } while (--repeat && pTDFX->readLong(pTDFX, DACDATA)!=v);
+    if (!repeat) {
+      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Failed to set dac value, "
+		 "bypassing CLUT\n");
+      pTDFX->ModeReg.vidcfg |= SST_DESKTOP_CLUT_BYPASS;
+      return;
+    }
   }
 }
 
@@ -1443,20 +1537,17 @@
 #define TILE_HEIGHT 32
 
 static int
-calcBufferStride(int xres, Bool tiled)
+calcBufferStride(int xres, Bool tiled, int cpp)
 {
   int strideInTiles;
 
   if (tiled == TRUE) {
     /* Calculate tile width stuff */
-    strideInTiles = (xres << 1) >> 7;
-    if ((xres << 1) & (TILE_WIDTH - 1))
-      strideInTiles++;
+    strideInTiles = (xres+TILE_WIDTH-1)/TILE_WIDTH;
     
-    return (strideInTiles * TILE_WIDTH);
-
+    return strideInTiles*cpp*TILE_WIDTH;
   } else {
-    return (xres << 1);
+    return xres*cpp;
   }
 } /* calcBufferStride */
 
@@ -1477,26 +1568,26 @@
 } /* calcBufferHeightInTiles */
 
 static int
-calcBufferSizeInTiles(int xres, int yres) {
+calcBufferSizeInTiles(int xres, int yres, int cpp) {
   int bufSizeInTiles;           /* Size of buffer in tiles */
 
   bufSizeInTiles =
-    calcBufferHeightInTiles(yres) * (calcBufferStride(xres, TRUE) >> 7);
+    calcBufferHeightInTiles(yres) * (calcBufferStride(xres, TRUE, cpp) >> 7);
 
   return bufSizeInTiles;
 
 } /* calcBufferSizeInTiles */
 
 static int
-calcBufferSize(int xres, int yres, Bool tiled)
+calcBufferSize(int xres, int yres, Bool tiled, int cpp)
 {
   int stride, height, bufSize;
 
   if (tiled) {
-    stride = calcBufferStride(xres, tiled);
+    stride = calcBufferStride(xres, tiled, cpp);
     height = TILE_HEIGHT * calcBufferHeightInTiles(yres);
   } else {
-    stride = xres << 1;
+    stride = xres*cpp;
     height = yres;
   }
 
@@ -1522,7 +1613,15 @@
   /* Remove one scanline for page alignment */
   memRemaining-=4095;
   /* Remove the back and Z buffers */
-  screenSizeInTiles=calcBufferSize(pScrn->virtualX, pScrn->virtualY, TRUE);
+  if (pTDFX->cpp!=3) {
+    screenSizeInTiles=calcBufferSize(pScrn->virtualX, pScrn->virtualY,
+				     TRUE, pTDFX->cpp);
+  }
+  else {
+    /* cpp==3 needs to bump up to 4 */
+    screenSizeInTiles=calcBufferSize(pScrn->virtualX, pScrn->virtualY,
+				     TRUE, 4);
+  }
   memRemaining-=screenSizeInTiles*2;
 
   /* Give all the rest to textures, rounded down to a page */
@@ -1578,20 +1677,26 @@
   hwp = VGAHWPTR(pScrn);
 
   if (!TDFXMapMem(pScrn)) return FALSE;
-  pScrn->memPhysBase = (int)pTDFX->LinearAddr;
+  pScrn->memPhysBase = (int)pTDFX->LinearAddr[0];
 
-  if (!pTDFX->usePIO) {
-    TDFXSetMMIOAccess(pTDFX);
-    hwp->IOBase = ((hwp->readMiscOut(hwp) & 0x01) ? 
-      VGA_IOBASE_COLOR : VGA_IOBASE_MONO) + (unsigned long)pTDFX->MMIOBase -
-      0x300;
-  } else {
-    vgaHWGetIOBase(hwp);
-  }
+  if (!pTDFX->usePIO) TDFXSetMMIOAccess(pTDFX);
+  vgaHWGetIOBase(hwp);
   if (!vgaHWMapMem(pScrn)) return FALSE;
 
   allocateMemory(pScrn);
 
+  if (pTDFX->numChips>1) {
+    if (xf86ReturnOptValBool(TDFXOptions, OPTION_NO_SLI, FALSE)) {
+      TDFXSetupSLI(pScrn, FALSE, 0);
+    } else {
+      TDFXSetupSLI(pScrn, TRUE, 0);
+    }
+  }
+
+  TDFXSetLFBConfig(pTDFX);
+
+  /* We initialize in the state that our FIFO is up to date */
+  pTDFX->syncDone=TRUE;
 #ifdef PROP_3DFX
   if (!TDFXInitPrivate(pScreen)) {
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to initialize private\n");
@@ -1620,42 +1725,25 @@
 
 #ifdef XF86DRI
   /*
-   * Setup DRI after visuals have been established, but before cfbScreenInit
-   * is called.   cfbScreenInit will eventually call into the drivers
+   * Setup DRI after visuals have been established, but before fbScreenInit
+   * is called.   fbScreenInit will eventually call into the drivers
    * InitGLXVisuals call back.
    */
   pTDFX->directRenderingEnabled = TDFXDRIScreenInit(pScreen);
   /* Force the initialization of the context */
-  TDFXLostContext(pScreen);
+  if (pTDFX->directRenderingEnabled)
+  	TDFXLostContext(pScreen);
 #endif
 
   switch (pScrn->bitsPerPixel) {
   case 8:
-    if (!cfbScreenInit(pScreen, pTDFX->FbBase+pTDFX->fbOffset, 
-		       pScrn->virtualX, pScrn->virtualY,
-		       pScrn->xDpi, pScrn->yDpi,
-		       pScrn->displayWidth))
-      return FALSE;
-    break;
   case 16:
-    if (!cfb16ScreenInit(pScreen, pTDFX->FbBase+pTDFX->fbOffset, 
-			 pScrn->virtualX, pScrn->virtualY,
-			 pScrn->xDpi, pScrn->yDpi,
-			 pScrn->displayWidth))
-      return FALSE;
-    break;
   case 24:
-    if (!cfb24ScreenInit(pScreen, pTDFX->FbBase+pTDFX->fbOffset, 
-			 pScrn->virtualX, pScrn->virtualY,
-			 pScrn->xDpi, pScrn->yDpi,
-			 pScrn->displayWidth))
-      return FALSE;
-    break;
   case 32:
-    if (!cfb32ScreenInit(pScreen, pTDFX->FbBase+pTDFX->fbOffset, 
-			 pScrn->virtualX, pScrn->virtualY,
-			 pScrn->xDpi, pScrn->yDpi,
-			 pScrn->displayWidth))
+    if (!fbScreenInit(pScreen, pTDFX->FbBase+pTDFX->fbOffset, 
+		       pScrn->virtualX, pScrn->virtualY,
+		       pScrn->xDpi, pScrn->yDpi,
+		       pScrn->displayWidth, pScrn->bitsPerPixel))
       return FALSE;
     break;
   default:
@@ -1732,14 +1820,13 @@
 
 #ifdef XF86DRI
     if (pTDFX->directRenderingEnabled) {
-	/* Now that mi, cfb, drm and others have done their thing, 
+	/* Now that mi, fb, drm and others have done their thing, 
          * complete the DRI setup.
          */
 	pTDFX->directRenderingEnabled = TDFXDRIFinishScreenInit(pScreen);
     }
     if (pTDFX->directRenderingEnabled) {
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering enabled\n");
-	TDFXSetLFBConfig(pTDFX);
     } else {
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering disabled\n");
     }
@@ -1806,6 +1893,7 @@
   if (pTDFX->directRenderingEnabled) {
     pScreen = screenInfo.screens[scrnIndex];
     DRIUnlock(pScreen);
+    TDFXLostContext(pScreen);
   }
 #endif
   if (!TDFXModeInit(pScrn, pScrn->currentMode)) return FALSE;
@@ -1832,6 +1920,7 @@
   pTDFX = TDFXPTR(pScrn);
   if (pTDFX->directRenderingEnabled) {
     DRILock(pScreen, 0);
+    TDFXSwapContextPrivate(pScreen);
   }
 #endif
 }
@@ -1978,3 +2067,4 @@
   pTDFX->writeLong(pTDFX, DACMODE, dacmode);
 }
 #endif
+
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c:1.4 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c:1.5
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c:1.4	Tue Feb 22 20:47:21 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c	Fri Jun 16 17:03:25 2000
@@ -24,7 +24,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c,v 1.4 2000/02/23 04:47:21 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c,v 1.5 2000/06/17 00:03:25 martin Exp $ */
 
 /*
  * Authors:
@@ -39,27 +39,35 @@
 
 #include "tdfx.h"
 
-#define minb(p) MMIO_IN8(pTDFX->MMIOBase, (p))
-#define moutb(p,v) MMIO_OUT8(pTDFX->MMIOBase, (p),(v))
-#define minl(p) MMIO_IN32(pTDFX->MMIOBase, (p))
-#define moutl(p,v) MMIO_OUT32(pTDFX->MMIOBase, (p),(v))
+#define minb(b, p) MMIO_IN8((b), (p))
+#define moutb(b, p,v) MMIO_OUT8((b), (p),(v))
+#define minl(b, p) MMIO_IN32((b), (p))
+#define moutl(b, p,v) MMIO_OUT32((b), (p),(v))
 
 static void TDFXWriteControlPIO(TDFXPtr pTDFX, int addr, char index, char val) {
-  outb(pTDFX->PIOBase+addr, index);
-  outb(pTDFX->PIOBase+addr+1, val);
+  outb(pTDFX->PIOBase[0]+addr, index);
+  outb(pTDFX->PIOBase[0]+addr+1, val);
 }
 
 static char TDFXReadControlPIO(TDFXPtr pTDFX, int addr, char index) {
-  outb(pTDFX->PIOBase+addr, index);
-  return inb(pTDFX->PIOBase+addr+1);
+  outb(pTDFX->PIOBase[0]+addr, index);
+  return inb(pTDFX->PIOBase[0]+addr+1);
 }
 
+void TDFXWriteChipLongPIO(TDFXPtr pTDFX, int chip, int addr, int val) {
+  outl(pTDFX->PIOBase[chip]+addr, val);
+}
+
+int TDFXReadChipLongPIO(TDFXPtr pTDFX, int chip, int addr) {
+  return inl(pTDFX->PIOBase[chip]+addr);
+}
+
 static void TDFXWriteLongPIO(TDFXPtr pTDFX, int addr, int val) {
-  outl(pTDFX->PIOBase+addr, val);
+  TDFXWriteChipLongPIO(pTDFX, 0, addr, val);
 }
 
 static int TDFXReadLongPIO(TDFXPtr pTDFX, int addr) {
-  return inl(pTDFX->PIOBase+addr);
+  return TDFXReadChipLongPIO(pTDFX, 0, addr);
 }
 
 void TDFXSetPIOAccess(TDFXPtr pTDFX) {
@@ -69,24 +77,34 @@
   pTDFX->readControl=TDFXReadControlPIO;
   pTDFX->writeLong=TDFXWriteLongPIO;
   pTDFX->readLong=TDFXReadLongPIO;
+  pTDFX->readChipLong=TDFXReadChipLongPIO;
+  pTDFX->writeChipLong=TDFXWriteChipLongPIO;
 }
 
 static void TDFXWriteControlMMIO(TDFXPtr pTDFX, int addr, char index, char val) {
-  moutb(addr, index);
-  moutb(addr+1, val);
+  moutb(pTDFX->MMIOBase[0], addr, index);
+  moutb(pTDFX->MMIOBase[0], addr+1, val);
 }
 
 static char TDFXReadControlMMIO(TDFXPtr pTDFX, int addr, char index) {
-  moutb(addr, index);
-  return minb(addr+1);
+  moutb(pTDFX->MMIOBase[0], addr, index);
+  return minb(pTDFX->MMIOBase[0], addr+1);
+}
+
+void TDFXWriteChipLongMMIO(TDFXPtr pTDFX, int chip, int addr, int val) {
+  moutl(pTDFX->MMIOBase[chip], addr, val);
+}
+
+static int TDFXReadChipLongMMIO(TDFXPtr pTDFX, int chip, int addr) {
+  return minl(pTDFX->MMIOBase[chip], addr);
 }
 
 void TDFXWriteLongMMIO(TDFXPtr pTDFX, int addr, int val) {
-  moutl(addr, val);
+  TDFXWriteChipLongMMIO(pTDFX, 0, addr, val);
 }
 
 int TDFXReadLongMMIO(TDFXPtr pTDFX, int addr) {
-  return minl(addr);
+  return TDFXReadChipLongMMIO(pTDFX, 0, addr);
 }
 
 void TDFXSetMMIOAccess(TDFXPtr pTDFX) {
@@ -96,5 +114,7 @@
   pTDFX->readControl=TDFXReadControlMMIO;
   pTDFX->writeLong=TDFXWriteLongMMIO;
   pTDFX->readLong=TDFXReadLongMMIO;
+  pTDFX->writeChipLong=TDFXWriteChipLongMMIO;
+  pTDFX->readChipLong=TDFXReadChipLongMMIO;
 }
 
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c:1.7 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c:1.10
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c:1.7	Fri Feb 18 04:20:05 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c	Wed Jun 21 14:40:04 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c,v 1.7 2000/02/18 12:20:05 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c,v 1.10 2000/06/21 21:40:04 tsi Exp $ */
 
 
 #if 0
@@ -23,28 +23,41 @@
    C    - D-1  : Z buffer
 */
 
-void TDFXSendNOPPrivate2D(TDFXPtr pTDFX)
+void TDFXSendNOPPrivate3D(ScrnInfoPtr pScrn)
 {
+  TDFXPtr pTDFX;
+
+  pTDFX=TDFXPTR(pScrn);
   TDFXAllocateSlots(pTDFX, 2);
-  SET_3DPK4_HEADER(1, 0x48);
+  SET_3DPK4_HEADER(1, 0x48<<3);
   WRITE_FIFO(pTDFX, 0, 0);
 }
 
-void TDFXSendNOPPrivate3D(TDFXPtr pTDFX)
+void TDFXSendNOPPrivate2D(ScrnInfoPtr pScrn)
 {
+  TDFXPtr pTDFX;
+
+  pTDFX=TDFXPTR(pScrn);
+  if (!pTDFX->syncDone) {
+    TDFXFirstSync(pScrn);
+    return;
+  }
   TDFXAllocateSlots(pTDFX, 2);
   SET_PKT2_HEADER(SSTCP_COMMAND);
   WRITE_FIFO(pTDFX, SST_2D_COMMAND, SST_2D_NOP|SST_2D_GO);
 }  
 
-void TDFXSendNOPPrivate(TDFXPtr pTDFX)
+void TDFXSendNOPPrivate(ScrnInfoPtr pScrn)
 {
-  TDFXSendNOPPrivate2D(pTDFX);
-  TDFXSendNOPPrivate3D(pTDFX);
+  TDFXSendNOPPrivate2D(pScrn);
+  TDFXSendNOPPrivate3D(pScrn);
 }
 
-void InstallFifo(TDFXPtr pTDFX)
+void InstallFifo(ScrnInfoPtr pScrn)
 {
+  TDFXPtr pTDFX;
+
+  pTDFX=TDFXPTR(pScrn);
   /* Install the fifo */
   TDFXWriteLongMMIO(pTDFX, SST_FIFO_BASEADDR0, pTDFX->fifoOffset>>12);
   TDFXWriteLongMMIO(pTDFX, SST_FIFO_BUMP0, 0);
@@ -54,7 +67,7 @@
   TDFXWriteLongMMIO(pTDFX, SST_FIFO_AMAX0, pTDFX->fifoOffset-4);
   TDFXWriteLongMMIO(pTDFX, SST_FIFO_DEPTH0, 0);
   TDFXWriteLongMMIO(pTDFX, SST_FIFO_HOLECNT0, 0);
-  if (pTDFX->PciInfo->chipType == PCI_CHIP_BANSHEE) 
+  if (pTDFX->ChipType == PCI_CHIP_BANSHEE) 
     TDFXWriteLongMMIO(pTDFX, SST_FIFO_FIFOTHRESH, (0x9<<5) | 0x2);
   else 
     TDFXWriteLongMMIO(pTDFX, SST_FIFO_FIFOTHRESH, (0xf<<5) | 0x8);
@@ -65,33 +78,35 @@
   pTDFX->fifoPtr = pTDFX->fifoBase;
   pTDFX->fifoSlots = (pTDFX->fifoSize>>2) - 1;
   pTDFX->fifoEnd = pTDFX->fifoBase+pTDFX->fifoSlots;
-  TDFXSendNOPPrivate(pTDFX);
+  TDFXSendNOPPrivate(pScrn);
 }
 
-void TDFXResetFifo(TDFXPtr pTDFX)
+void TDFXResetFifo(ScrnInfoPtr pScrn)
 {
+  TDFXPtr pTDFX;
   int oldValue;
-  CARD32 start_sec, end_sec, dummy;
+  long start_sec, end_sec, dummy;
 
+  pTDFX=TDFXPTR(pScrn);
   ErrorF("Resetting FIFO\n");
   /* Shut down the fifo */
   TDFXWriteLongMMIO(pTDFX, SST_FIFO_BASESIZE0, 0);
   /* Toggle the reset bits */
   oldValue=TDFXReadLongMMIO(pTDFX, MISCINIT0);
   TDFXWriteLongMMIO(pTDFX, MISCINIT0, oldValue|0x23);
-  xf86getsecs(&start_sec, &dummy);
+  getsecs(&start_sec, &dummy);
   do {
-    xf86getsecs(&end_sec, &dummy);
+    getsecs(&end_sec, &dummy);
   } while (end_sec-start_sec<2);
   TDFXWriteLongMMIO(pTDFX, MISCINIT0, oldValue);
   oldValue=TDFXReadLongMMIO(pTDFX, MISCINIT1);
   TDFXWriteLongMMIO(pTDFX, MISCINIT1, oldValue|BIT(19));
-  xf86getsecs(&start_sec, &dummy);
+  getsecs(&start_sec, &dummy);
   do {
-    xf86getsecs(&end_sec, &dummy);
+    getsecs(&end_sec, &dummy);
   } while (end_sec-start_sec<2);
   TDFXWriteLongMMIO(pTDFX, MISCINIT1, oldValue);
-  InstallFifo(pTDFX);
+  InstallFifo(pScrn);
 }
 
 /*
@@ -102,16 +117,16 @@
 
   !!! We should use expedential backoff in our reads !!!
 */
-void TDFXSyncFifo(ScrnInfoPtr pScrn)
+static void TDFXSyncFifo(ScrnInfoPtr pScrn)
 {
   TDFXPtr pTDFX;
   int i, cnt;
   int stat;
-  CARD32 start_sec, end_sec, dummy;
+  long start_sec, end_sec, dummy;
 
   TDFXTRACEACCEL("TDFXSyncFifo start\n");
   pTDFX=TDFXPTR(pScrn);
-  TDFXSendNOPPrivate(pTDFX);
+  TDFXSendNOPPrivate(pScrn);
   i=0;
   cnt=0;
   start_sec=0;
@@ -121,11 +136,11 @@
     cnt++;
     if (cnt==1000) {
       if (!start_sec) {
-	xf86getsecs(&start_sec, &dummy);
+	getsecs(&start_sec, &dummy);
       } else {
-	xf86getsecs(&end_sec, &dummy);
+	getsecs(&end_sec, &dummy);
 	if (end_sec-start_sec>3) {
-	  TDFXResetFifo(pTDFX);
+	  TDFXResetFifo(pScrn);
 	  start_sec=0;
         }
       }
@@ -153,7 +168,7 @@
   pTDFX->fifoMirrorPtr = pTDFX->fifoMirrorBase;
 #endif
   pTDFX->sync=TDFXSyncFifo;
-  InstallFifo(pTDFX);
+  InstallFifo(pScrn);
   return TRUE;
 }
 
@@ -190,7 +205,6 @@
   ScrnInfoPtr pScrn;
   TDFXPtr pTDFX;
   int dummy, readPos;
-  int offset;
   TDFXSAREAPriv *sPriv;
 
   pScrn = xf86Screens[pScreen->myNum];
@@ -214,7 +228,7 @@
       (sPriv->fifoRead<pTDFX->fifoOffset) ||
       (sPriv->fifoRead>(int)pTDFX->fifoOffset+pTDFX->fifoSize)) {
     ErrorF("Invalid offsets passed between client and X server\n");
-    ResetFifo(pTDFX);
+    ResetFifo(pScrn);
   } else {
     pTDFX->fifoPtr = (unsigned int *)(pTDFX->FbBase+sPriv->fifoPtr);
     pTDFX->fifoRead = (unsigned int *)(pTDFX->FbBase+sPriv->fifoRead);
@@ -226,7 +240,8 @@
     pTDFX->fifoSlots = pTDFX->fifoEnd-pTDFX->fifoPtr-8;
 }    
 
-void TDFXLostContext(ScreenPtr pScreen) {
+void TDFXLostContext(ScreenPtr pScreen)
+{
   ScrnInfoPtr pScrn;
   TDFXPtr pTDFX;
   TDFXSAREAPriv *sPriv;
@@ -312,10 +327,14 @@
 }
 
 void 
-TDFXAllocateSlots(TDFXPtr pTDFX, int slots) {
+TDFXAllocateSlots(TDFXPtr pTDFX, int slots)
+{
 #ifdef TDFX_DEBUG_FIFO
   if (pTDFX->fifoEnd-pTDFX->fifoPtr<pTDFX->fifoSlots)
     ErrorF("FIFO overrun\n");
+  if (!pTDFX->syncDone) {
+    ErrorF("Writing to FIFO without sync\n");
+  }
 #endif
   pTDFX->fifoSlots-=slots;
   if (pTDFX->fifoSlots<0) TDFXMakeSpace(pTDFX, slots);
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_sli.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_sli.c:1.2
--- /dev/null	Sat Jul  1 20:42:59 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_sli.c	Sat Jun 17 11:23:23 2000
@@ -0,0 +1,769 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_sli.c,v 1.2 2000/06/17 18:23:23 dawes Exp $ */
+
+#include "xf86.h"
+#include "xf86_ansic.h"
+#include "xf86_OSproc.h"
+#include "xf86Pci.h"
+#include "tdfx.h"
+
+#define AACLKOUTDEL 0x2
+#define CFGSWAPALGORITHM 0x1
+
+/* #define RD_ABORT_ERROR */
+#define H3VDD
+
+static Bool TDFXDisableSLI(TDFXPtr pTDFX)
+{
+  int i;
+  int v;
+
+  for (i=0; i<pTDFX->numChips; i++) {
+    v=pciReadLong(pTDFX->PciTag[i], CFG_INIT_ENABLE);
+    pciWriteLong(pTDFX->PciTag[i], CFG_INIT_ENABLE,
+		 v&~(CFG_SNOOP_MEMBASE0 | CFG_SNOOP_EN | CFG_SNOOP_MEMBASE0_EN |
+		     CFG_SNOOP_MEMBASE1_EN | CFG_SNOOP_SLAVE |
+		     CFG_SNOOP_FBIINIT_WR_EN | CFG_SWAP_ALGORITHM |
+		     CFG_SWAP_QUICK));
+    v=pciReadLong(pTDFX->PciTag[i], CFG_SLI_LFB_CTRL);
+    pciWriteLong(pTDFX->PciTag[i], CFG_SLI_LFB_CTRL, 
+		 v&~(CFG_SLI_LFB_CPU_WR_EN | CFG_SLI_LFB_DPTCH_WR_EN | 
+		     CFG_SLI_RD_EN));
+#ifdef H3VDD
+    pTDFX->writeChipLong(pTDFX, i, SST_3D_SLICTRL, 0);
+    pTDFX->writeChipLong(pTDFX, i, SST_3D_AACTRL, 0);
+#endif
+    v=pciReadLong(pTDFX->PciTag[i], CFG_AA_LFB_CTRL);
+    pciWriteLong(pTDFX->PciTag[i], CFG_AA_LFB_CTRL,
+		 v&~(CFG_AA_LFB_CPU_WR_EN | CFG_AA_LFB_DPTCH_WR_EN |
+		     CFG_AA_LFB_RD_EN));
+    v=pciReadLong(pTDFX->PciTag[i], CFG_SLI_AA_MISC);
+    pciWriteLong(pTDFX->PciTag[i], CFG_SLI_AA_MISC,
+		 (v&~CFG_VGA_VSYNC_OFFSET) |
+		 (0 << CFG_VGA_VSYNC_OFFSET_PIXELS_SHIFT) |
+		 (0 << CFG_VGA_VSYNC_OFFSET_CHARS_SHIFT) |
+		 (0 << CFG_VGA_VSYNC_OFFSET_HXTRA_SHIFT));
+    pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0, 0);
+    pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1, 0);
+    pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2, 0);
+
+    if (pTDFX->numChips>1) {
+      v=pTDFX->readChipLong(pTDFX, i, PCIINIT0);
+      pTDFX->writeChipLong(pTDFX, i, PCIINIT0,
+			   (v&~(SST_PCI_DISABLE_IO|SST_PCI_DISABLE_MEM|
+				SST_PCI_RETRY_INTERVAL)) |
+			   (0<<SST_PCI_RETRY_INTERVAL_SHIFT) |
+			   SST_PCI_FORCE_FB_HIGH);
+    } else {
+      v=pTDFX->readChipLong(pTDFX, i, PCIINIT0);
+      pTDFX->writeChipLong(pTDFX, i, PCIINIT0,
+			   (v&~(SST_PCI_DISABLE_IO|SST_PCI_DISABLE_MEM|
+				SST_PCI_RETRY_INTERVAL)) |
+			   (0<<SST_PCI_RETRY_INTERVAL_SHIFT));
+    }
+
+#if 0
+    if (i>0) {
+      pTDFX->writeChipLong(pTDFX, i, DACMODE, 
+			   SST_DAC_DPMS_ON_VSYNC | SST_DAC_DPMS_ON_HSYNC);
+      v=pTDFX->readChipLong(pTDFX, i, VIDPROCCFG);
+      pTDFX->writeChipLong(pTDFX, i, VIDPROCCFG, v&~SST_VIDEO_PROCESSOR_EN);
+    }
+#endif
+  }
+  return TRUE;
+}
+
+Bool TDFXSetupSLI(ScrnInfoPtr pScrn, Bool sliEnable, int aaSamples)
+{
+  TDFXPtr pTDFX;
+  int i, sliLines, sliLinesLog2, nChipsLog2, v;
+  int sli_renderMask, sli_compareMask, sli_scanMask;
+  int sliAnalog, dwFormat;
+
+  pTDFX=TDFXPTR(pScrn);
+  if (pScrn->depth == 24 || pScrn->depth==32) {
+    if ((aaSamples == 4) && (pTDFX->numChips>1)) {
+      pTDFX->pixelFormat=GR_PIXFMT_AA_4_ARGB_8888;
+    } else if (aaSamples >= 2) {
+      pTDFX->pixelFormat=GR_PIXFMT_AA_2_ARGB_8888;
+    } else {
+      pTDFX->pixelFormat=GR_PIXFMT_ARGB_8888;
+    }
+  } else if (pScrn->depth == 16) {
+    if ((aaSamples == 4) && (pTDFX->numChips>1)) {
+      pTDFX->pixelFormat=GR_PIXFMT_AA_4_RGB_565;
+    } else if (aaSamples >= 2) {
+      pTDFX->pixelFormat=GR_PIXFMT_AA_2_RGB_565;
+    } else {
+      pTDFX->pixelFormat=GR_PIXFMT_RGB_565;
+    }
+  } else if (pScrn->depth == 8) {
+    pTDFX->pixelFormat=GR_PIXFMT_I_8;
+  }
+  if (!sliEnable && !aaSamples) { /* Turn off */
+    return TDFXDisableSLI(pTDFX);
+  }
+
+  if (pScrn->virtualY>768) sliLinesLog2=5;
+  else sliLinesLog2=4;
+  sliLines=1<<sliLinesLog2;
+  if (pScrn->virtualY*pScrn->virtualX>1600*1024) sliAnalog=1;
+  else sliAnalog=0;
+  /* XXX We need to avoid SLI in double scan modes somehow */
+
+  switch (pTDFX->numChips) {
+  case 1:
+    nChipsLog2=0;
+    break;
+  case 2:
+    nChipsLog2=1;
+    break;
+  case 4:
+    nChipsLog2=2;
+    break;
+  default:
+    return FALSE;
+    /* XXX Huh? Unsupported configuration */
+  }
+
+  for (i=0; i<pTDFX->numChips; i++) {
+    /* Do we want to set these differently for a VIA board? */
+    v=pTDFX->readChipLong(pTDFX, i, PCIINIT0);
+    v=(v&~(SST_PCI_RETRY_INTERVAL|SST_PCI_FORCE_FB_HIGH)) |
+		     SST_PCI_READ_WS | SST_PCI_WRITE_WS |
+		     SST_PCI_DISABLE_IO | SST_PCI_DISABLE_MEM |
+		     (5<<SST_PCI_RETRY_INTERVAL_SHIFT);
+    pTDFX->writeChipLong(pTDFX, i, PCIINIT0,
+			 (v&~(SST_PCI_RETRY_INTERVAL|SST_PCI_FORCE_FB_HIGH)) |
+			 SST_PCI_READ_WS | SST_PCI_WRITE_WS |
+			 SST_PCI_DISABLE_IO | SST_PCI_DISABLE_MEM |
+			 (5<<SST_PCI_RETRY_INTERVAL_SHIFT));
+    v=pTDFX->readChipLong(pTDFX, i, TMUGBEINIT);
+    pTDFX->writeChipLong(pTDFX, i, TMUGBEINIT, 
+			 (v&~(SST_AA_CLK_DELAY | SST_AA_CLK_INVERT)) |
+			 (AACLKOUTDEL<<SST_AA_CLK_DELAY_SHIFT) | 
+			 SST_AA_CLK_INVERT);
+
+    if (pTDFX->numChips>1) {
+      v=pciReadLong(pTDFX->PciTag[i], CFG_INIT_ENABLE);
+      pciWriteLong(pTDFX->PciTag[i], CFG_INIT_ENABLE, v |
+		   (CFGSWAPALGORITHM << CFG_SWAPBUFFER_ALGORITHM_SHIFT) |
+		   CFG_SWAP_ALGORITHM | ((!i)? CFG_SWAP_MASTER : 0));
+      if (!i) {
+	v=pciReadLong(pTDFX->PciTag[i], CFG_INIT_ENABLE);
+	pciWriteLong(pTDFX->PciTag[i], CFG_INIT_ENABLE, 
+			 v | CFG_SNOOP_EN);
+	v=pciReadLong(pTDFX->PciTag[i], CFG_PCI_DECODE);
+      } else {
+	v=pciReadLong(pTDFX->PciTag[i], CFG_INIT_ENABLE);
+	v=(v & ~CFG_SNOOP_MEMBASE0) | CFG_SNOOP_EN | 
+	  CFG_SNOOP_MEMBASE0_EN | CFG_SNOOP_MEMBASE1_EN |
+	  CFG_SNOOP_SLAVE | CFG_SNOOP_FBIINIT_WR_EN |
+	  (((pTDFX->MMIOAddr[0]>>22)&0x3ff)<<CFG_SNOOP_MEMBASE0_SHIFT) |
+	  ((pTDFX->numChips>2)? CFG_SWAP_QUICK : 0);
+	pciWriteLong(pTDFX->PciTag[i], CFG_INIT_ENABLE, v);
+	v=pciReadLong(pTDFX->PciTag[i], CFG_PCI_DECODE);
+	v=(v & ~CFG_SNOOP_MEMBASE1) |
+	  ((pTDFX->LinearAddr[0]>>22)&0x3ff)<<CFG_SNOOP_MEMBASE1_SHIFT;
+	pciWriteLong(pTDFX->PciTag[i], CFG_PCI_DECODE, v);
+      }
+    }
+
+    if (sliEnable && aaSamples<4) {
+      /* SLI is on and we're using less than 4 AA samples */
+      sli_renderMask = (pTDFX->numChips-1) << sliLinesLog2;
+      sli_compareMask = i << sliLinesLog2;
+      sli_scanMask = sliLines - 1;
+      v = (sli_renderMask << CFG_SLI_LFB_RENDERMASK_SHIFT) |
+	(sli_compareMask << CFG_SLI_LFB_COMPAREMASK_SHIFT) |
+	(sli_scanMask << CFG_SLI_LFB_SCANMASK_SHIFT) |
+	(nChipsLog2 << CFG_SLI_LFB_NUMCHIPS_LOG2_SHIFT) |
+	CFG_SLI_LFB_CPU_WR_EN | CFG_SLI_LFB_DPTCH_WR_EN;
+#ifndef RD_ABORT_ERROR
+      v|=CFG_SLI_RD_EN;
+#endif
+      pciWriteLong(pTDFX->PciTag[i], CFG_SLI_LFB_CTRL, v);
+
+#ifdef H3VDD
+      pTDFX->writeChipLong(pTDFX, i, SST_3D_SLICTRL,
+			   (sli_renderMask << SLICTL_3D_RENDERMASK_SHIFT) |
+			   (sli_compareMask << SLICTL_3D_COMPAREMASK_SHIFT) |
+			   (sli_scanMask << SLICTL_3D_SCANMASK_SHIFT) |
+			   (nChipsLog2 << SLICTL_3D_NUMCHIPS_LOG2_SHIFT) |
+			   SLICTL_3D_EN);
+#endif
+    } else if (!sliEnable && aaSamples) {
+      /* SLI is off and AA is on */
+      sli_renderMask = 0;
+      sli_compareMask = 0;
+      sli_scanMask = 0;
+      pciWriteLong(pTDFX->PciTag[i], CFG_SLI_LFB_CTRL,
+		   (sli_renderMask << CFG_SLI_LFB_RENDERMASK_SHIFT) |
+		   (sli_compareMask << CFG_SLI_LFB_COMPAREMASK_SHIFT) |
+		   (sli_scanMask << CFG_SLI_LFB_SCANMASK_SHIFT) |
+		   (0x0 << CFG_SLI_LFB_NUMCHIPS_LOG2_SHIFT));
+#ifdef H3VDD
+      pTDFX->writeChipLong(pTDFX, i, SST_3D_SLICTRL,
+			   (sli_renderMask << SLICTL_3D_RENDERMASK_SHIFT) |
+			   (sli_compareMask << SLICTL_3D_COMPAREMASK_SHIFT) |
+			   (sli_scanMask << SLICTL_3D_SCANMASK_SHIFT) |
+			   (0 << SLICTL_3D_NUMCHIPS_LOG2_SHIFT));
+#endif
+    } else {
+      /* SLI is on && aaSamples=4 */
+      sli_renderMask = ((pTDFX->numChips>>1)-1) << sliLinesLog2;
+      sli_compareMask = (i>>1) << sliLinesLog2;
+      sli_scanMask = sliLines - 1;
+      v = (sli_renderMask << CFG_SLI_LFB_RENDERMASK_SHIFT) |
+	(sli_compareMask << CFG_SLI_LFB_COMPAREMASK_SHIFT) |
+	(sli_scanMask << CFG_SLI_LFB_SCANMASK_SHIFT) |
+	((nChipsLog2-1) << CFG_SLI_LFB_NUMCHIPS_LOG2_SHIFT) |
+	CFG_SLI_LFB_CPU_WR_EN | CFG_SLI_LFB_DPTCH_WR_EN;
+#ifndef RD_ABORT_ERROR
+      v|=CFG_SLI_RD_EN;
+#endif
+      pciWriteLong(pTDFX->PciTag[i], CFG_SLI_LFB_CTRL, v);
+#ifdef H3VDD
+      pTDFX->writeChipLong(pTDFX, i, SST_3D_SLICTRL,
+			   (sli_renderMask << SLICTL_3D_RENDERMASK_SHIFT) |
+			   (sli_compareMask << SLICTL_3D_COMPAREMASK_SHIFT) |
+			   (sli_scanMask << SLICTL_3D_SCANMASK_SHIFT) |
+			   ((nChipsLog2-1) << SLICTL_3D_NUMCHIPS_LOG2_SHIFT) |
+			   SLICTL_3D_EN);
+#endif
+    }
+
+    TDFXSetLFBConfig(pTDFX);
+    if (pTDFX->cpp==2) dwFormat = CFG_AA_LFB_RD_FORMAT_16BPP;
+    else dwFormat = CFG_AA_LFB_RD_FORMAT_32BPP;
+    if (pTDFX->numChips==2 && !sliEnable && aaSamples==2)
+      dwFormat|=CFG_AA_LFB_RD_DIVIDE_BY_4;
+    /* Thess are wrong, because we don't know where the secondary buffers
+       are located */
+    pTDFX->writeChipLong(pTDFX, i, CFG_AA_LFB_CTRL, 
+			 (pScrn->videoRam<<10 /* 2nd buf */ << CFG_AA_BASEADDR_SHIFT) |
+			 CFG_AA_LFB_CPU_WR_EN | CFG_AA_LFB_DPTCH_WR_EN |
+			 CFG_AA_LFB_RD_EN | dwFormat |
+			 ((aaSamples==4)?CFG_AA_LFB_RD_DIVIDE_BY_4:0));
+    pTDFX->writeChipLong(pTDFX, i, CFG_AA_ZBUFF_APERTURE,
+			 ((pTDFX->depthOffset>>12)<<CFG_AA_DEPTH_BUFFER_BEG_SHIFT) |
+			 ((pScrn->videoRam>>2)<<CFG_AA_DEPTH_BUFFER_END_SHIFT));
+
+    if (pTDFX->numChips>1 && i && (aaSamples || sliEnable)) {
+      int vsyncOffsetPixels, vsyncOffsetChars, vsyncOffsetHXtra;
+
+      if (aaSamples || (pTDFX->numChips==4 && sliEnable && aaSamples==4 &&
+			sliAnalog && i==3)) {
+	vsyncOffsetPixels=7;
+	vsyncOffsetChars=4;
+	vsyncOffsetHXtra=0;
+      } else {
+	vsyncOffsetPixels=7;
+	vsyncOffsetChars=5;
+	vsyncOffsetHXtra=0;
+      }
+      v=pciReadLong(pTDFX->PciTag[i], CFG_SLI_AA_MISC);
+      pciWriteLong(pTDFX->PciTag[i], CFG_SLI_AA_MISC, 
+		   (v&~CFG_VGA_VSYNC_OFFSET) |
+		   (vsyncOffsetPixels << CFG_VGA_VSYNC_OFFSET_PIXELS_SHIFT) |
+		   (vsyncOffsetChars << CFG_VGA_VSYNC_OFFSET_CHARS_SHIFT) |
+		   (vsyncOffsetHXtra <<
+		    CFG_VGA_VSYNC_OFFSET_HXTRA_SHIFT));
+    }
+    if (pTDFX->numChips==1 && aaSamples) {
+      /* 1 chip 2 AA */
+      pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		   CFG_ENHANCED_VIDEO_EN | 
+		   CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		   CFG_VIDEO_OTHERMUX_SEL_PIPE<<CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT |
+		   CFG_DIVIDE_VIDEO_BY_2);
+      pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		   0x0 << CFG_SLI_RENDERMASK_FETCH_SHIFT |
+		   0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT |
+		   0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT |
+		   0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT);
+      pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		   0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT |
+		   0xff << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT);
+    } else if (pTDFX->numChips==2 && !sliEnable && aaSamples==4 &&
+	       !sliAnalog) {
+      /* 2 chips 4 digital AA */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN | 
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE_PLUS_AAFIFO <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_4);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (0x0 << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     (CFG_ENHANCED_VIDEO_EN |
+		      CFG_ENHANCED_VIDEO_SLV |
+		      CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		      (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		       CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		      CFG_DIVIDE_VIDEO_BY_1));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (0x0 << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==2 && !sliEnable && aaSamples==4 && sliAnalog) {
+      /* 2 chips 4 analog AA */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     (CFG_ENHANCED_VIDEO_EN |
+		      CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		      (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		       CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		      CFG_DIVIDE_VIDEO_BY_4));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_DAC_HSYNC_TRISTATE |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_4);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (0x0 << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==2 && sliEnable && !aaSamples && !sliAnalog) {
+      /* 2 chips 2 digital SLI */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     (CFG_ENHANCED_VIDEO_EN |
+		      (CFG_VIDEO_OTHERMUX_SEL_AAFIFO <<
+		       CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		      (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		       CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		      CFG_DIVIDE_VIDEO_BY_1));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     ((0x0<<sliLinesLog2) << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     ((i<<sliLinesLog2) <<
+		      CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips>=2 && sliEnable && !aaSamples && sliAnalog) {
+      /* 2 or 4 chips 2/4 analog SLI */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (((pTDFX->numChips-1)<<sliLinesLog2) << 
+		      CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (((pTDFX->numChips-1)<<sliLinesLog2) << 
+		      CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     ((i<<sliLinesLog2) <<
+		      CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==2 && sliEnable && aaSamples==2 && !sliAnalog) {
+      /* 2 chips 2 AA 2 digital SLI */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_AAFIFO <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_2);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     ((0x1<<sliLinesLog2) <<
+		      CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     ((i<<sliLinesLog2) <<
+		      CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==2 && !sliEnable && aaSamples==2 && !sliAnalog) {
+      /* 2 chips 2 digital AA */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE_PLUS_AAFIFO <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_2);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (0x0 << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (0x0 << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==2 && !sliEnable && aaSamples==2 && sliAnalog) {
+      /* 2 chips 2 analog AA */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_2);
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_DAC_HSYNC_TRISTATE |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_2);
+      }
+      pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		   (0x0 << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		   (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		   (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		   (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+      pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		   (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		   (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+    } else if (pTDFX->numChips>=2 && sliEnable && aaSamples==2 && sliAnalog) {
+      /* 2 or 4 chips 2 AA 2 or 4 analog SLI */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_2);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (((pTDFX->numChips-1)<<sliLinesLog2) << 
+		      CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_2);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (((pTDFX->numChips-1)<<sliLinesLog2) << 
+		      CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==4 && sliEnable && !aaSamples && !sliAnalog) {
+      /* 4 chips 4 digital SLI */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     (CFG_VIDEO_OTHERMUX_SEL_AAFIFO <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_SLI_AAFIFO_COMPARE_INV |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     ((0x0<<sliLinesLog2) <<
+		      CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==4 && sliEnable && aaSamples==2 && !sliAnalog) {
+      /* 4 chips 2 AA 4 digital SLI */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_AAFIFO <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_SLI_AAFIFO_COMPARE_INV |
+		     CFG_DIVIDE_VIDEO_BY_2);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     (0x0 << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (((pTDFX->numChips-1)<<sliLinesLog2) <<
+		      CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     ((i<<sliLinesLog2) << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==4 && sliEnable && aaSamples==4 && !sliAnalog) {
+      /* 4 chips 4 AA 2 digital SLI */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE_PLUS_AAFIFO <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_4);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else if (i==1 || i==3) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_DAC_HSYNC_TRISTATE |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_1);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     ((0x0<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     ((0xff<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE_PLUS_AAFIFO <<
+		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_4);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0xff << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    } else if (pTDFX->numChips==4 && sliEnable && aaSamples==4 && sliAnalog) {
+      /* 4 chips 4 AA 2 analog SLI */
+      if (!i) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_4);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else if (i==1 || i==3) {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_DAC_HSYNC_TRISTATE |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_4);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      } else {
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		     CFG_ENHANCED_VIDEO_EN |
+		     CFG_ENHANCED_VIDEO_SLV |
+		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+		     CFG_DIVIDE_VIDEO_BY_4);
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
+	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
+		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+      }
+    }
+    if (pTDFX->numChips==4 && sliEnable && aaSamples==4 && i==3) {
+      v=pciReadLong(pTDFX->PciTag[i], CFG_SLI_AA_MISC);
+      pciWriteLong(pTDFX->PciTag[i], CFG_SLI_AA_MISC, 
+		   v | CFG_AA_LFB_RD_SLV_WAIT);
+    }
+    if (i) {
+      v=pciReadLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0);
+      pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
+		   v|CFG_VIDPLL_SEL);
+      v=pTDFX->readChipLong(pTDFX, i, MISCINIT1);
+      pTDFX->writeChipLong(pTDFX, i, MISCINIT1, v|SST_POWERDOWN_DAC);
+    }
+  }
+  return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h:1.5 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h:1.5	Mon Feb 14 23:13:44 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h	Fri Jun 16 17:03:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h,v 1.5 2000/02/15 07:13:44 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h,v 1.6 2000/06/17 00:03:25 martin Exp $ */
 /*
    Voodoo Banshee driver version 1.0.1
 
@@ -176,7 +176,184 @@
 #define SST_3D_NOP 0
 
 /* 3D Registers */
-#define SST_3D_OFFSET           0x200000
-#define SST_3D_COMMAND SST_3D_OFFSET+0x120
+#define SST_3D_OFFSET           	0x200000
+#define SST_3D_COMMAND 			SST_3D_OFFSET+0x120
+#define SST_3D_SLICTRL 			SST_3D_OFFSET+0x20C
+#define SST_3D_AACTRL			SST_3D_OFFSET+0x210
+#define SST_3D_CHIPMASK			SST_3D_OFFSET+0x214
+
+/* NAPALM REGISTERS */
+#define CFG_MEM0BASE			16
+#define CFG_MEM1BASE			20
+#define CFG_INIT_ENABLE        		64
+#define CFG_PCI_DECODE         		72
+#define CFG_VIDEO_CTRL0        		128
+#define CFG_VIDEO_CTRL1        		132
+#define CFG_VIDEO_CTRL2        		136
+#define CFG_SLI_LFB_CTRL       		140
+#define CFG_AA_ZBUFF_APERTURE  		144
+#define CFG_AA_LFB_CTRL        		148
+#define CFG_SLI_AA_MISC        		172
+
+/* Pixel Formats */
+#define GR_PIXFMT_I_8                   0x0001
+#define GR_PIXFMT_AI_88                 0x0002
+#define GR_PIXFMT_RGB_565               0x0003
+#define GR_PIXFMT_ARGB_1555             0x0004
+#define GR_PIXFMT_ARGB_8888             0x0005
+#define GR_PIXFMT_AA_2_RGB_565          0x0006
+#define GR_PIXFMT_AA_2_ARGB_1555        0x0007
+#define GR_PIXFMT_AA_2_ARGB_8888        0x0008
+#define GR_PIXFMT_AA_4_RGB_565          0x0009
+#define GR_PIXFMT_AA_4_ARGB_1555        0x000a
+#define GR_PIXFMT_AA_4_ARGB_8888        0x000b
+
+/* pciInit0 */
+#define SST_PCI_STALL_ENABLE            BIT(0)
+#define SST_PCI_LOWTHRESH_SHIFT         2
+#define SST_PCI_LOWTHRESH               (0xF << SST_PCI_LOWTHRESH_SHIFT)
+#define SST_PCI_HARDCODE_BASE           BIT(7)
+#define SST_PCI_READ_WS                 BIT(8)
+#define SST_PCI_WRITE_WS                BIT(9)
+#define SST_PCI_DISABLE_IO              BIT(11)
+#define SST_PCI_DISABLE_MEM             BIT(12)
+#define SST_PCI_RETRY_INTERVAL_SHIFT    13
+#define SST_PCI_RETRY_INTERVAL          (0x1F << SST_PCI_RETRY_INTERVAL_SHIFT)
+#define SST_PCI_INTERRUPT_ENABLE        BIT(18)
+#define SST_PCI_TIMEOUT_ENABLE          BIT(19)
+#define SST_PCI_FORCE_FB_HIGH           BIT(26)
+
+#define SST_AA_CLK_INVERT               BIT(20)
+#define SST_AA_CLK_DELAY_SHIFT          21
+#define SST_AA_CLK_DELAY                (0xF<<SST_AA_CLK_DELAY_SHIFT)
+
+#define CFG_SWAP_ALGORITHM_VSYNC	(0x00)
+#define CFG_SWAP_ALGORITHM_SYNCIN	(0x01)
+#define CFG_SWAPBUFFER_ALGORITHM_SHIFT	(25)
+
+/* CFG_INIT_ENABLE */
+#define CFG_UPDATE_MEMBASE_LSBS		BIT(10)
+#define CFG_SNOOP_EN			BIT(11)
+#define CFG_SNOOP_MEMBASE0_EN		BIT(12)
+#define CFG_SNOOP_MEMBASE1_EN		BIT(13)
+#define CFG_SNOOP_SLAVE			BIT(14)
+#define CFG_SNOOP_MEMBASE0_SHIFT	15
+#define CFG_SNOOP_MEMBASE0		(0x3FF<<CFG_SNOOP_MEMBASE0_SHIFT)
+#define CFG_SWAP_ALGORITHM		BIT(25)
+#define CFG_SWAP_MASTER			BIT(26)
+#define CFG_SWAP_QUICK			BIT(27)
+#define CFG_MULTI_FUNCTION_DEV		BIT(28)
+#define CFG_LFB_RD_CACHE_DISABLE	BIT(29)
+#define CFG_SNOOP_FBIINIT_WR_EN		BIT(30)
+#define CFG_SNOOP_MEMBASE0_DECODE_SHIFT	10
+#define CFG_SNOOP_MEMBASE0_DECODE	(0xF<<CFG_SNOOP_MEMBASE0_DECODE_SHIFT)
+#define CFG_SNOOP_MEMBASE1_DECODE_SHIFT	14
+#define CFG_SNOOP_MEMBASE1_DECODE	(0xF<<CFG_SNOOP_MEMBASE1_DECODE_SHIFT)
+#define CFG_SNOOP_MEMBASE1_SHIFT	18
+#define CFG_SNOOP_MEMBASE1		(0x3FF<<CFG_SNOOP_MEMBASE1_SHIFT)
+
+/* CFG_VIDEO_CTRL0 */
+#define CFG_ENHANCED_VIDEO_EN		BIT(0)
+#define CFG_ENHANCED_VIDEO_SLV		BIT(1)
+#define CFG_VIDEO_TV_OUTPUT_EN		BIT(2)
+#define CFG_VIDEO_LOCALMUX_SEL		BIT(3)
+#define CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY	BIT(3)
+#define CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT 	4
+#define CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT	6
+#define CFG_VIDEO_OTHERMUX_SEL_TRUE	(0x3<<CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT)
+#define CFG_VIDEO_OTHERMUX_SEL_FALSE	(0x3<<CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT)
+#define CFG_VIDEO_OTHERMUX_SEL_PIPE	0
+#define CFG_VIDEO_OTHERMUX_SEL_PIPE_PLUS_AAFIFO	1
+#define CFG_VIDEO_OTHERMUX_SEL_AAFIFO 	2
+#define CFG_SLI_FETCH_COMPARE_INV	BIT(8)
+#define CFG_SLI_CRT_COMPARE_INV		BIT(9)
+#define CFG_SLI_AAFIFO_COMPARE_INV	BIT(10)
+#define CFG_VIDPLL_SEL                 	BIT(11)
+#define CFG_DIVIDE_VIDEO_SHIFT		12
+#define CFG_DIVIDE_VIDEO		(0x7<<CFG_DIVIDE_VIDEO_SHIFT)
+#define CFG_DIVIDE_VIDEO_BY_1		(0x0<<CFG_DIVIDE_VIDEO_SHIFT)
+#define CFG_DIVIDE_VIDEO_BY_2		(0x1<<CFG_DIVIDE_VIDEO_SHIFT)
+#define CFG_DIVIDE_VIDEO_BY_4		(0x2<<CFG_DIVIDE_VIDEO_SHIFT)
+#define CFG_DIVIDE_VIDEO_BY_8		(0x3<<CFG_DIVIDE_VIDEO_SHIFT)
+#define CFG_DIVIDE_VIDEO_BY_16		(0x4<<CFG_DIVIDE_VIDEO_SHIFT)
+#define CFG_DIVIDE_VIDEO_BY_32		(0x5<<CFG_DIVIDE_VIDEO_SHIFT)
+#define CFG_ALWAYS_DRIVE_AA_BUS		BIT(15)
+#define CFG_VSYNC_IN_DEL_SHIFT		16
+#define CFG_VSYNC_IN_DEL		(0xF<<CFG_VSYNC_IN_DEL_SHIFT)
+#define CFG_DAC_VSYNC_TRISTATE		BIT(24)
+#define CFG_DAC_HSYNC_TRISTATE		BIT(25)
+
+/* CFG_VIDEO_CTRL1 */
+#define CFG_SLI_RENDERMASK_FETCH_SHIFT	0
+#define CFG_SLI_RENDERMASK_FETCH	(0xFF<<CFG_SLI_RENDERMASK_FETCH_SHIFT)
+#define CFG_SLI_COMPAREMASK_FETCH_SHIFT 8
+#define CFG_SLI_COMPAREMASK_FETCH	(0xFF<<CFG_SLI_COMPAREMASK_FETCH_SHIFT)
+#define CFG_SLI_RENDERMASK_CRT_SHIFT	16
+#define CFG_SLI_RENDERMASK_CRT		(0xFF<<CFG_SLI_RENDERMASK_CRT_SHIFT)
+#define CFG_SLI_COMPAREMASK_CRT_SHIFT	24 
+#define CFG_SLI_COMPAREMASK_CRT		(0xFF<<CFG_SLI_COMPAREMASK_CRT_SHIFT)
+
+/* CFG_VIDEO_CTRL2 */
+#define CFG_SLI_RENDERMASK_AAFIFO_SHIFT 0
+#define CFG_SLI_RENDERMASK_AAFIFO	(0xFF<<CFG_SLI_RENDERMASK_AAFIFO_SHIFT)
+#define CFG_SLI_COMPAREMASK_AAFIFO_SHIFT 8
+#define CFG_SLI_COMPAREMASK_AAFIFO	(0xFF<<CFG_SLI_COMPAREMASK_AAFIFO_SHIFT)
+
+/* CFG_SLI_LFB_CTRL */
+#define CFG_SLI_LFB_RENDERMASK_SHIFT	0
+#define CFG_SLI_LFB_RENDERMASK		(0xFF<<CFG_SLI_LFB_RENDERMASK_SHIFT)
+#define CFG_SLI_LFB_COMPAREMASK_SHIFT	8
+#define CFG_SLI_LFB_COMPAREMASK		(0xFF<<CFG_SLI_LFB_COMPAREMASK_SHIFT)
+#define CFG_SLI_LFB_SCANMASK_SHIFT	16	
+#define CFG_SLI_LFB_SCANMASK		(0xFF<<CFG_SLI_LFB_SCANMASK_SHIFT)
+#define CFG_SLI_LFB_NUMCHIPS_LOG2_SHIFT 24
+#define CFG_SLI_LFB_NUMCHIPS_LOG2	(0x3<<CFG_SLI_LFB_NUMCHIPS_LOG2_SHIFT)
+#define CFG_SLI_LFB_CPU_WR_EN		BIT(26)
+#define CFG_SLI_LFB_DPTCH_WR_EN		BIT(27)
+#define CFG_SLI_RD_EN			BIT(28)
+
+/* CFG_AA_ZBUFF_APERTURE */
+#define CFG_AA_DEPTH_BUFFER_BEG_SHIFT	0
+#define CFG_AA_DEPTH_BUFFER_BEG		(0x7FFF<<CFG_AA_DEPTH_BUFFER_BEG_SHIFT)
+#define CFG_AA_DEPTH_BUFFER_END_SHIFT	16
+#define CFG_AA_DEPTH_BUFFER_END		(0xFFFF<<CFG_AA_DEPTH_BUFFER_END_SHIFT)
+
+/* CFG_AA_LFB_CTRL */
+#define CFG_AA_BASEADDR_SHIFT		0
+#define CFG_AA_BASEADDR			(0x3FFFFFF<<CFG_AA_BASEADDR_SHIFT)
+#define CFG_AA_LFB_CPU_WR_EN		BIT(26)
+#define CFG_AA_LFB_DPTCH_WR_EN		BIT(27)
+#define CFG_AA_LFB_RD_EN		BIT(28)
+#define CFG_AA_LFB_RD_FORMAT_SHIFT	29
+#define CFG_AA_LFB_RD_FORMAT		(0x3<<CFG_AA_LFB_RD_FORMAT_SHIFT)
+#define CFG_AA_LFB_RD_FORMAT_16BPP	(0x0<<CFG_AA_LFB_RD_FORMAT_SHIFT)
+#define CFG_AA_LFB_RD_FORMAT_15BPP	(0x1<<CFG_AA_LFB_RD_FORMAT_SHIFT)
+#define CFG_AA_LFB_RD_FORMAT_32BPP	(0x2<<CFG_AA_LFB_RD_FORMAT_SHIFT)
+#define CFG_AA_LFB_RD_DIVIDE_BY_4	BIT(31)
+
+/* CFG_SLI_AA_MISC */
+#define CFG_VGA_VSYNC_OFFSET_SHIFT	0
+#define CFG_VGA_VSYNC_OFFSET		(0x1ff<<CFG_VGA_VSYNC_OFFSET_SHIFT)
+#define CFG_VGA_VSYNC_OFFSET_PIXELS_SHIFT	0
+#define CFG_VGA_VSYNC_OFFSET_CHARS_SHIFT	3
+#define CFG_VGA_VSYNC_OFFSET_HXTRA_SHIFT	6 
+#define CFG_HOTPLUG_SHIFT		9
+#define CFG_HOTPLUG_TRISTATE		(0x0<<CFG_HOTPLUG_SHIFT)
+#define CFG_HOTPLUG_DRIVE0		(0x2<<CFG_HOTPLUG_SHIFT)
+#define CFG_HOTPLUG_DRIVE1		(0x3<<CFG_HOTPLUG_SHIFT)
+#define CFG_AA_LFB_RD_SLV_WAIT		BIT(12)
+
+/* SLICTL_3D_CTRL */
+#define SLICTL_3D_RENDERMASK_SHIFT	0
+#define SLICTL_3D_RENDERMASK		(0xFF<<SLICTL_3D_RENDERMASK_SHIFT)
+#define SLICTL_3D_COMPAREMASK_SHIFT	8
+#define SLICTL_3D_COMPAREMASK		(0xFF<<SLICTL_3D_COMPAREMASK_SHIFT)
+#define SLICTL_3D_SCANMASK_SHIFT	16	
+#define SLICTL_3D_SCANMASK		(0xFF<<SLICTL_3D_SCANMASK_SHIFT)
+#define SLICTL_3D_NUMCHIPS_LOG2_SHIFT 	24
+#define SLICTL_3D_NUMCHIPS_LOG2		(0x3<<SLICTL_3D_NUMCHIPS_LOG2_SHIFT)
+#define SLICTL_3D_EN			BIT(26)
+
+#define SST_POWERDOWN_DAC               BIT(8)
 
 #endif
Index: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c:1.42 xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c:1.45
--- xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c:1.42	Mon Mar  6 14:59:32 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c	Wed Jun 21 10:28:15 2000
@@ -22,9 +22,8 @@
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  *           Matthew Grossman, <mattg@oz.net> - acceleration and misc fixes
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.42 2000/03/06 22:59:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.45 2000/06/21 17:28:15 dawes Exp $ */
 
-/*  #include "compiler.h" */
 /* everybody includes these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -375,19 +374,15 @@
     if (flags & PROBE_DETECT)
 	foundScreen = TRUE;
     else for (i = 0; i < numUsed; i++) {
-	pEnt = xf86GetEntityInfo(usedChips[i]);
-
 	/*
 	 * Check that nothing else has claimed the slots.
 	 */
-	if(pEnt->active) {
-	    ScrnInfoPtr pScrn;
-	    
-	    /* Allocate a ScrnInfoRec and claim the slot */
-	    pScrn = xf86AllocateScreen(drv, 0);
-
-	    pPci = xf86GetPciInfoForEntity(pEnt->index);
+	ScrnInfoPtr pScrn = NULL;
 	    
+	/* Allocate a ScrnInfoRec and claim the slot */
+	if ((pScrn = xf86ConfigPciEntity(pScrn, 0, pEnt->index,
+					       TGAPciChipsets, NULL, NULL,
+					       NULL, NULL, NULL))) {
 	    /* Fill in what we can of the ScrnInfoRec */
 	    pScrn->driverVersion = VERSION;
 	    pScrn->driverName	 = TGA_DRIVER_NAME;
@@ -401,15 +396,9 @@
 	    pScrn->LeaveVT	 = TGALeaveVT;
 	    pScrn->FreeScreen	 = TGAFreeScreen;
 	    pScrn->ValidMode	 = TGAValidMode;
-/*  	    pScrn->device	 = usedDevs[i]; */
-	    xf86ConfigActivePciEntity(pScrn, pEnt->index, TGAPciChipsets, NULL,
-				      NULL, NULL, NULL, NULL);
 	    foundScreen = TRUE;
 	}
-	xfree(pEnt);
     }
-/*      xfree(usedDevs); */
-/*      xfree(usedPci); */
     return foundScreen;
 }
 
@@ -872,7 +861,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = xnfalloc(sizeof(ClockRange));
+    clockRanges = xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     clockRanges->minClock = pTga->MinClock;
     clockRanges->maxClock = pTga->MaxClock;
Index: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/trident/trident.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/trident/trident.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/trident/trident.cpp:1.1	Thu Mar  2 17:05:44 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident.cpp	Tue Jun 13 19:13:15 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.cpp,v 1.1 2000/03/03 01:05:44 dawes Exp $ 
-.TH TRIDENT __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.cpp,v 1.4 2000/06/14 02:13:15 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH TRIDENT __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 trident \- Trident video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""trident"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qtrident\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B trident 
 is an XFree86 driver for Trident video chips.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h:1.20 xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h:1.24
--- xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h:1.20	Sun Feb  6 12:04:46 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h	Mon Jun 12 19:28:34 2000
@@ -21,7 +21,7 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h,v 1.20 2000/02/06 20:04:46 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h,v 1.24 2000/06/13 02:28:34 dawes Exp $ */
 
 #ifndef _TRIDENT_H_
 #define _TRIDENT_H_
@@ -39,7 +39,7 @@
 	unsigned char tridentRegs3CE[0x100];
 	unsigned char tridentRegs3C4[0x100];
 	unsigned char tridentRegsDAC[0x01];
-	unsigned char tridentRegsClock[0x03];
+        unsigned char tridentRegsClock[0x03];
 	unsigned char DacRegs[0x300];
 } TRIDENTRegRec, *TRIDENTRegPtr;
 
@@ -67,6 +67,7 @@
     Bool		NoAccel;
     Bool		HWCursor;
     Bool		UsePCIRetry;
+    Bool		UsePCIBurst;
     Bool		UseGERetry;
     Bool		NewClockCode;
     Bool		Clipping;
@@ -75,8 +76,13 @@
     Bool		HasSGRAM;
     Bool		MUX;
     Bool		IsCyber;
+#if 0
+    /* obsolete */
+    Bool		CyberShadowSet;
+#endif
     Bool		CyberShadow;
     Bool		NoMMIO;
+    Bool                MMIOonly;
     Bool		ShadowFB;
     Bool		Linear;
     DGAModePtr		DGAModes;
@@ -97,6 +103,7 @@
     int			MCLK;
     int			dwords;
     int			height;
+    int                 lcdMode;
     TRIDENTRegRec	SavedReg;
     TRIDENTRegRec	ModeReg;
     I2CBusPtr		DDC;
@@ -110,11 +117,34 @@
     xf86Int10InfoPtr	Int10;
     XAAInfoRecPtr	AccelInfoRec;
     CloseScreenProcPtr	CloseScreen;
+    int                 panelWidth;
+    int                 panelHeight;
     unsigned int	(*ddc1Read)(ScrnInfoPtr);
     CARD8*		XAAScanlineColorExpandBuffers[2];
     CARD8*		XAAImageScanlineBuffer[1];
 } TRIDENTRec, *TRIDENTPtr;
 
+typedef struct {
+    CARD8 mode;
+    char* display;
+    int clock;
+    int shadow_0;
+    int shadow_3;
+    int shadow_4;
+    int shadow_5;
+    int shadow_6;
+    int shadow_7;
+    int shadow_10;
+    int shadow_11;
+    int shadow_16;
+} tridentLCD;
+
+typedef struct {
+    int x_res;
+    int y_res;
+    int mode;
+} biosMode;
+
 /* Prototypes */
 
 Bool TRIDENTClockSelect(ScrnInfoPtr pScrn, int no);
@@ -192,7 +222,8 @@
     BLADE3D,
     CYBERBLADEI7,
     CYBERBLADEI7D,
-    CYBERBLADEI1
+    CYBERBLADEI1,
+    CYBERBLADEI1D
 } TRIDENTType;
 
 #define UseMMIO		(pTrident->NoMMIO == FALSE)
@@ -215,6 +246,7 @@
 			 (pTrident->Chipset == CYBERBLADEI7)  || \
 			 (pTrident->Chipset == CYBERBLADEI7D)  || \
 			 (pTrident->Chipset == CYBERBLADEI1)  || \
+			 (pTrident->Chipset == CYBERBLADEI1D)  || \
 			 (pTrident->Chipset == BLADE3D))
 
 /*
Index: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c:1.18 xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c:1.23
--- xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c:1.18	Thu Feb 17 13:36:23 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c	Fri Jun 23 11:25:58 2000
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v 1.18 2000/02/17 21:36:23 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v 1.23 2000/06/23 18:25:58 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -35,6 +35,109 @@
 #include "trident.h"
 #include "trident_regs.h"
 
+extern tridentLCD LCD[];
+
+biosMode bios1[] = { 
+    { 640, 480, 0x11 }
+};
+
+biosMode bios4[] = {
+    { 320, 200, 0xd },
+    { 640, 200, 0xe },
+    { 640, 350, 0x11 },
+    { 640, 480, 0x12 },
+    { 800, 600, 0x5b },
+    { 1024, 768 , 0x5f },
+    { 1280, 1024, 0x63 },
+    { 1600, 1200, 0x65 }
+};
+
+biosMode bios8[] = {	
+    { 320, 200, 0x13 },
+    { 640, 400, 0x52 },
+    { 640, 480, 0x5d },
+    { 720, 480, 0x60 },
+    { 1024, 768, 0x62 },
+    { 1280, 1024, 0x64 },
+    { 1600, 1200, 0x66 }
+};
+
+biosMode bios15[] = {
+    { 640, 400, 0x72 },
+    { 640, 480, 0x74 },
+    { 720, 480, 0x70 },
+    { 800, 600, 0x76 },
+    { 1024, 768, 0x78 }
+};
+
+biosMode bios16[] = {
+    { 640, 400, 0x73 },
+    { 640, 480, 0x75 },
+    { 720, 480, 0x71 },
+    { 800, 600, 0x77 },
+    { 1024, 768, 0x79 }
+};
+
+biosMode bios24[] = {
+    { 640, 400, 0x6b },
+    { 640, 480, 0x6c },
+    { 720, 480, 0x61 },
+    { 800, 600, 0x6d },
+    { 1024, 768, 0x6e }
+};
+
+
+static int
+findMode(int xres, int yres, int depth)
+{
+    int xres_s;
+    int i, size;
+    biosMode *mode;
+
+    switch (depth) {
+    case 1:
+	size = sizeof(bios1) / sizeof(biosMode);
+	mode = bios1;
+	break;
+    case 4:
+	size = sizeof(bios4) / sizeof(biosMode);
+	mode = bios4;
+	break;
+    case 8:
+	size = sizeof(bios8) / sizeof(biosMode);
+	mode = bios8;
+	break;
+    case 15:
+	size = sizeof(bios15) / sizeof(biosMode);
+	mode = bios15;
+	break;
+    case 16:
+	size = sizeof(bios16) / sizeof(biosMode);
+	mode = bios16;
+	break;
+    case 24:
+	size = sizeof(bios24) / sizeof(biosMode);
+	mode = bios24;
+	break;
+    default:
+	return 0;
+    }
+
+    for (i = 0; i < size; i++) {
+	if (xres <= mode[i].x_res) {
+	    xres_s = mode[i].x_res;
+	    for (; i < size; i++) {
+		if (mode[i].x_res != xres_s)
+		    return mode[i-1].mode;
+		if (yres <= mode[i].y_res)
+		    return mode[i].mode;
+	    }
+	}
+    }
+    return mode[size - 1].mode;
+    
+}
+
 Bool
 TridentInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
@@ -43,8 +146,18 @@
     int vgaIOBase;
     int offset = 0;
     int clock = mode->Clock;
+    CARD8 protect;
+
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    vgaRegPtr vgaReg = &hwp->ModeReg;
     vgaHWGetIOBase(VGAHWPTR(pScrn));
     vgaIOBase = VGAHWPTR(pScrn)->IOBase;
+    
+    
+    /* Unprotect */
+    OUTB(0x3C4, 0x11);
+    protect = INB(0x3C4);
+    OUTB(0x3C5, 0x92);
 
     OUTB(0x3C4, 0x0B); INB(0x3C5); /* Ensure we are in New Mode */
 
@@ -60,6 +173,7 @@
 	case CYBERBLADEI7:
 	case CYBERBLADEI7D:
 	case CYBERBLADEI1:
+	case CYBERBLADEI1D:
 	case BLADE3D:
 	    OUTB(vgaIOBase + 4, RAMDACTiming);
 	    pReg->tridentRegs3x4[RAMDACTiming] |= 0x0F;
@@ -101,6 +215,15 @@
     }
 
     if (pTrident->IsCyber) {
+	Bool LCDActive;
+	Bool ShadowModeActive;
+	int i;
+	
+	OUTB(0x3CE, CyberControl);
+	ShadowModeActive = ((INB(0x3CF) & 0x81) == 0x81);
+	OUTB(0x3CE, FPConfig);
+	LCDActive = (INB(0x3CF) & 0x10);
+	
 	OUTB(0x3CE, CyberEnhance); 
 	pReg->tridentRegs3CE[CyberEnhance] = INB(0x3CF) & 0x8F;
 	if (mode->CrtcVDisplay > 768)
@@ -111,9 +234,111 @@
 	else
 	if (mode->CrtcVDisplay > 480)
 	    pReg->tridentRegs3CE[CyberEnhance] |= 0x10;
+
 	OUTB(0x3CE, CyberControl);
-	if (!pTrident->CyberShadow)
-	    pReg->tridentRegs3CE[CyberControl] = INB(0x3CF) & 0x7E;
+	pReg->tridentRegs3CE[CyberControl] = INB(0x3CF);
+
+	OUTB(0x3CE,HorStretch);
+	pReg->tridentRegs3CE[HorStretch] = INB(0x3CF);
+	OUTB(0x3CE,VertStretch);
+	pReg->tridentRegs3CE[VertStretch] = INB(0x3CF);
+	
+	if ((!((pReg->tridentRegs3CE[VertStretch] & 1) ||
+	    (pReg->tridentRegs3CE[HorStretch] & 1)))
+	    && (!LCDActive || ShadowModeActive)) {
+	    unsigned char tmp;
+	    
+	    SHADOW_ENABLE(tmp);
+	    OUTB(vgaIOBase + 4,0);
+	    pReg->tridentRegs3x4[0x0] = INB(vgaIOBase + 5);
+	    OUTB(vgaIOBase + 4,3);
+	    pReg->tridentRegs3x4[0x3] = INB(vgaIOBase + 5);
+	    OUTB(vgaIOBase + 4,4);
+	    pReg->tridentRegs3x4[0x4] = INB(vgaIOBase + 5);
+	    OUTB(vgaIOBase + 4,5);
+	    pReg->tridentRegs3x4[0x5] = INB(vgaIOBase + 5);
+	    OUTB(vgaIOBase + 4,0x6);
+	    pReg->tridentRegs3x4[0x6] = INB(vgaIOBase + 5);
+	    OUTB(vgaIOBase + 4,0x7);
+	    pReg->tridentRegs3x4[0x7] = INB(vgaIOBase + 5);
+	    OUTB(vgaIOBase + 4,0x10);
+	    pReg->tridentRegs3x4[0x10] = INB(vgaIOBase + 5);
+	    OUTB(vgaIOBase + 4,0x11);
+	    pReg->tridentRegs3x4[0x11] = INB(vgaIOBase + 5);
+	    OUTB(vgaIOBase + 4,0x16);
+	    pReg->tridentRegs3x4[0x16] = INB(vgaIOBase + 5);
+	    SHADOW_RESTORE(tmp);
+	    xf86DrvMsgVerb(pScrn->scrnIndex,X_INFO,1,"Timing shadow registers:"
+			   "0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x "
+			   "0x%2.2x 0x%2.2x 0x%2.2x\n",pReg->tridentRegs3x4[0],
+			   pReg->tridentRegs3x4[3], pReg->tridentRegs3x4[4],
+			   pReg->tridentRegs3x4[5], pReg->tridentRegs3x4[6],
+			   pReg->tridentRegs3x4[7], pReg->tridentRegs3x4[0x10],
+			   pReg->tridentRegs3x4[0x11],
+			   pReg->tridentRegs3x4[0x16]);
+	} else {
+	    if ((i = pTrident->lcdMode)) {
+		pReg->tridentRegs3x4[0x0] = LCD[i].shadow_0;
+		pReg->tridentRegs3x4[0x3] = LCD[i].shadow_3;
+		pReg->tridentRegs3x4[0x4] = LCD[i].shadow_4;
+		pReg->tridentRegs3x4[0x5] = LCD[i].shadow_5;
+		pReg->tridentRegs3x4[0x6] = LCD[i].shadow_6;
+		pReg->tridentRegs3x4[0x7] = LCD[i].shadow_7;
+		pReg->tridentRegs3x4[0x10] = LCD[i].shadow_10;
+		pReg->tridentRegs3x4[0x11] = LCD[i].shadow_11;
+		pReg->tridentRegs3x4[0x16] = LCD[i].shadow_16;
+		/* Not yet implemented */
+		clock = LCD[i].clock;
+	    }
+	}
+	/* copy over common bits from normal VGA */
+	
+	pReg->tridentRegs3x4[0x7] &= ~0x52;
+	pReg->tridentRegs3x4[0x7] |= (vgaReg->CRTC[0x7] & 0x52);
+	
+	/* disable stretching, enable centering */
+	pReg->tridentRegs3CE[VertStretch] &= 0xFE;
+	pReg->tridentRegs3CE[VertStretch] |= 0x80;
+	pReg->tridentRegs3CE[HorStretch] &= 0xFE;
+	pReg->tridentRegs3CE[HorStretch] |= 0x80;
+	
+	{
+	    int mul = pScrn->bitsPerPixel >> 3;
+	    int val;
+	    
+	    if (!mul) mul = 1;
+	    
+	    /* this is what my BIOS does */ 
+	    val = (pScrn->currentMode->HDisplay * mul / 8) + 16;
+	    
+	    pReg->tridentRegs3x4[PreEndControl] = 2 | ((val >> 8) & 1);
+	    pReg->tridentRegs3x4[PreEndFetch] = val & 0xff;
+	}
+#if 0
+	OUTB(vgaIOBase + 4,PreEndControl);
+	pReg->tridentRegs3x4[PreEndControl] = INB(vgaIOBase + 5);
+	OUTB(vgaIOBase + 4,PreEndFetch);
+	pReg->tridentRegs3x4[PreEndFetch] = INB(vgaIOBase + 5);
+#endif
+	/* set mode */
+	pReg->tridentRegs3CE[BiosMode] = findMode(pScrn->currentMode->HDisplay,
+						  pScrn->currentMode->VDisplay,
+						  pScrn->depth);
+	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 1, "Setting BIOS Mode: %x\n",
+		       pReg->tridentRegs3CE[BiosMode]);
+	
+	/* no stretch */
+	pReg->tridentRegs3CE[BiosReg] = 0;
+	
+#if 0
+	/* obsolete */
+	if (pTrident->CyberShadowSet) {
+	    if (pTrident->CyberShadow) {
+		pReg->tridentRegs3CE[CyberControl] |= 0x81;
+	    } else
+		pReg->tridentRegs3CE[CyberControl] &= 0x7E;
+	}
+#endif
     }
 
     /* Defaults for all trident chipsets follows */
@@ -174,6 +399,7 @@
     }
 
     pReg->tridentRegs3C4[NewMode1] = 0xC0;
+    pReg->tridentRegs3C4[Protection] = 0x92;
 
     if (pTrident->Linear)
     	pReg->tridentRegs3x4[LinearAddReg] = ((pTrident->FbAddress >> 24) << 6)|
@@ -198,6 +424,8 @@
     pReg->tridentRegs3x4[Performance] = INB(vgaIOBase + 5) | 0x10;
     OUTB(vgaIOBase+ 4, DRAMControl);
     pReg->tridentRegs3x4[DRAMControl] = INB(vgaIOBase + 5) | 0x10;
+    if (pTrident->IsCyber && !pTrident->MMIOonly)
+	pReg->tridentRegs3x4[DRAMControl] |= 0x20;
     OUTB(vgaIOBase+ 4, AddColReg);
     pReg->tridentRegs3x4[AddColReg] = INB(vgaIOBase + 5) & 0xEF;
     pReg->tridentRegs3x4[AddColReg] |= (offset & 0x100) >> 4;
@@ -224,8 +452,17 @@
     else
     	pReg->tridentRegs3x4[PCIReg] = INB(vgaIOBase + 5) & 0xF8; 
     /* Enable PCI Bursting on capable chips */
-    if (pTrident->Chipset >= TGUI9660) pReg->tridentRegs3x4[PCIReg] |= 0x06;
-
+    if (pTrident->Chipset >= TGUI9660) {
+	if(pTrident->UsePCIBurst) {
+	    pReg->tridentRegs3x4[PCIReg] |= 0x06;
+	} else {
+	    pReg->tridentRegs3x4[PCIReg] &= 0xF9;
+	}
+    }
+     /* restore */
+    OUTB(0x3C4, 0x11);
+    OUTB(0x3C5, protect);
+   
     return(TRUE);
 }
 
@@ -238,13 +475,15 @@
     vgaHWGetIOBase(VGAHWPTR(pScrn));
     vgaIOBase = VGAHWPTR(pScrn)->IOBase;
 
+    OUTB(0x3C4, Protection);
+    OUTB(0x3C5, 0x92);
     /* Goto New Mode */
     OUTB(0x3C4, 0x0B);
     temp = INB(0x3C5);
 
     /* Unprotect registers */
     OUTW(0x3C4, ((0xC0 ^ 0x02) << 8) | NewMode1);
-
+    
     temp = INB(0x3C8);
     temp = INB(0x3C6);
     temp = INB(0x3C6);
@@ -272,8 +511,27 @@
     if (pTrident->Chipset >= PROVIDIA9685) OUTW_3x4(Enhancement0);
     if (pTrident->Chipset >= BLADE3D) OUTW_3x4(RAMDACTiming);
     if (pTrident->IsCyber) {
+	CARD8 tmp;
+	
+	OUTW_3CE(VertStretch);
+	OUTW_3CE(HorStretch);
+	OUTW_3CE(BiosMode);
+	OUTW_3CE(BiosReg);	
     	OUTW_3CE(CyberControl);
     	OUTW_3CE(CyberEnhance);
+	SHADOW_ENABLE(tmp);
+	OUTW_3x4(0x0);
+	OUTW_3x4(0x3);
+	OUTW_3x4(0x4);
+	OUTW_3x4(0x5);
+	OUTW_3x4(0x6);
+	OUTW_3x4(0x7);	
+	OUTW_3x4(0x10);
+	OUTW_3x4(0x11); 
+	OUTW_3x4(0x96);
+	SHADOW_RESTORE(tmp);
+	OUTW_3x4(PreEndControl);
+	OUTW_3x4(PreEndFetch);
     }
  
     if (Is3Dchip) {
@@ -293,6 +551,8 @@
     }
     OUTB(0x3C2, tridentReg->tridentRegsClock[0x00]);
 
+    OUTB(0x3C4, Protection);
+    OUTB(0x3C5, tridentReg->tridentRegs3C4[Protection]);
     OUTW(0x3C4, ((tridentReg->tridentRegs3C4[NewMode1] ^ 0x02) << 8)| NewMode1);
 }
 
@@ -310,7 +570,8 @@
     temp = INB(0x3C5);
 
     INB_3C4(NewMode1);
-
+    INB_3C4(Protection);
+    
     /* Unprotect registers */
     OUTW(0x3C4, ((0xC0 ^ 0x02) << 8) | NewMode1);
     OUTW(vgaIOBase + 4, (0x92 << 8) | NewMode1);
@@ -330,8 +591,26 @@
     if (pTrident->Chipset >= PROVIDIA9685) INB_3x4(Enhancement0);
     if (pTrident->Chipset >= BLADE3D) INB_3x4(RAMDACTiming);
     if (pTrident->IsCyber) {
+	CARD8 tmp;
+	INB_3CE(VertStretch);
+	INB_3CE(HorStretch);
+	INB_3CE(BiosMode);
+	INB_3CE(BiosReg);	
     	INB_3CE(CyberControl);
     	INB_3CE(CyberEnhance);
+	SHADOW_ENABLE(tmp);
+	INB_3x4(0x0);
+	INB_3x4(0x3);
+	INB_3x4(0x4);
+	INB_3x4(0x5);
+	INB_3x4(0x6);
+	INB_3x4(0x7);
+	INB_3x4(0x10);
+	INB_3x4(0x11);
+	INB_3x4(0x16);
+	SHADOW_RESTORE(tmp);
+	INB_3x4(PreEndControl);
+	INB_3x4(PreEndFetch);
     }
 
     /* save cursor registers */
Index: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c:1.90 xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c:1.100
--- xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c:1.90	Mon Mar  6 15:54:13 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c	Wed Jun 21 10:28:16 2000
@@ -28,7 +28,7 @@
  *	    Massimiliano Ghilardi, max@Linuz.sns.it, some fixes to the
  *				   clockchip programming code.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.90 2000/03/06 23:54:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.100 2000/06/21 17:28:16 dawes Exp $ */
 
 #include "cfb24_32.h"
 
@@ -48,6 +48,8 @@
 #include "xf86RAC.h"
 #include "vbe.h"
 
+#include "compiler.h"
+
 #include "mipointer.h"
 
 #include "mibstore.h"
@@ -95,6 +97,9 @@
 
 static void	TRIDENTEnableMMIO(ScrnInfoPtr pScrn);
 static void	TRIDENTDisableMMIO(ScrnInfoPtr pScrn);
+static void	PC98TRIDENTInit(ScrnInfoPtr pScrn);
+static void	PC98TRIDENTEnable(ScrnInfoPtr pScrn);
+static void	PC98TRIDENTDisable(ScrnInfoPtr pScrn);
 /*
  * This is intentionally screen-independent.  It indicates the binding
  * choice made in the first PreInit.
@@ -152,6 +157,7 @@
     { CYBERBLADEI7,		"cyberbladei7" },
     { CYBERBLADEI7D,		"cyberbladei7d" },
     { CYBERBLADEI1,		"cyberbladei1" },
+    { CYBERBLADEI1D,		"cyberbladei1d" },
     { -1,				NULL }
 };
 
@@ -182,6 +188,7 @@
     { CYBERBLADEI7,	PCI_CHIP_8400,	RES_SHARED_VGA },
     { CYBERBLADEI7D,	PCI_CHIP_8420,	RES_SHARED_VGA },
     { CYBERBLADEI1,	PCI_CHIP_8500,	RES_SHARED_VGA },
+    { CYBERBLADEI1D,	PCI_CHIP_8520,	RES_SHARED_VGA },
     { -1,		-1,		RES_UNDEFINED }
 };
     
@@ -194,8 +201,13 @@
     OPTION_SETMCLK,
     OPTION_MUX_THRESHOLD,
     OPTION_SHADOW_FB,
+    OPTION_MMIO_ONLY,
+#if 0
+    /* obsolete */
     OPTION_CYBER_SHADOW,
-    OPTION_NOMMIO
+#endif
+    OPTION_NOMMIO,
+    OPTION_NOPCIBURST
 } TRIDENTOpts;
 
 static OptionInfoRec TRIDENTOptions[] = {
@@ -206,8 +218,13 @@
     { OPTION_SETMCLK,		"SetMClk",	OPTV_FREQ,	{0}, FALSE },
     { OPTION_MUX_THRESHOLD,	"MUXThreshold",	OPTV_INTEGER,	{0}, FALSE },
     { OPTION_SHADOW_FB,		"ShadowFB",	OPTV_BOOLEAN,	{0}, FALSE },
+#if 0
+        /* obsolete */
     { OPTION_CYBER_SHADOW,	"CyberShadow",	OPTV_BOOLEAN,	{0}, FALSE },
+#endif
     { OPTION_NOMMIO,		"NoMMIO",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_NOPCIBURST,	"NoPciBurst",	OPTV_BOOLEAN,	{0}, FALSE },
+    { OPTION_MMIO_ONLY,		"MMIOonly",	OPTV_BOOLEAN,	{0}, FALSE },
     { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
 };
 
@@ -276,6 +293,7 @@
 	230000,
 	230000,
 	230000,
+	230000,
 };
 
 static int ClockLimit16bpp[] = {
@@ -310,6 +328,7 @@
 	230000,
 	230000,
 	230000,
+	230000,
 }; 
 
 static int ClockLimit24bpp[] = {
@@ -344,6 +363,7 @@
 	115000,
 	115000,
 	115000,
+	115000,
 };
 
 static int ClockLimit32bpp[] = {
@@ -378,9 +398,24 @@
 	115000,
 	115000,
 	115000,
+	115000,
+};
+
+/*
+ * These are fixed modelines for all physical display dimensions the
+ *  chipsets supports on FPs. Most of them are not tested yet.
+ */
+tridentLCD LCD[] = { 
+    { 0,"640x480",25200,0x5f,0x82,0x54,0x80,0xb,0x3e,0xea,0x8c,0xb},
+    { 1,"800x600",40000,0x7f,0x82,0x6b,0x1b,0x72,0xf8,0x58,0x8c,0x72},
+    { 2,"1024x768",65000,0xa3,0x6,0x8f,0xa0,0x24,0xf5,0x0f,0x25,0x96},
+    { 3,"1024x768",65000,0xa3,0x6,0x8f,0xa0,0x24,0xf5,0x0f,0x25,0x96},
+    { 4,"1280x1024",108000,0xa3,0x6,0x8f,0xa0,0x24,0xf5,0x0f,0x25,0x96},
+    { 5,"1024x600",50500 ,0xa3,0x6,0x8f,0xa0,0xb,0x3e,0xea,0x8c,0xb},
+    { 0xff,"", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static const char *xaaSymbols[] = {
+    static const char *xaaSymbols[] = {
     "XAADestroyInfoRec",
     "XAACreateInfoRec",
     "XAAHelpPatternROP",
@@ -805,33 +840,31 @@
 		   numDevSections, drv, &usedChips);
 
 	if (numUsed > 0) {
-	  if (flags & PROBE_DETECT)
-	    foundScreen = TRUE;
-    	  else for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn;
-
-	    /* Allocate a ScrnInfoRec and claim the slot */
-	    pScrn = xf86AllocateScreen(drv, 0);
-	
-	    /* Fill in what we can of the ScrnInfoRec */
-	    pScrn->driverVersion = VERSION;
-	    pScrn->driverName	 = TRIDENT_DRIVER_NAME;
-	    pScrn->name		 = TRIDENT_NAME;
-	    pScrn->Probe	 = TRIDENTProbe;
-	    pScrn->PreInit	 = TRIDENTPreInit;
-	    pScrn->ScreenInit	 = TRIDENTScreenInit;
-	    pScrn->SwitchMode	 = TRIDENTSwitchMode;
-	    pScrn->AdjustFrame	 = TRIDENTAdjustFrame;
-	    pScrn->EnterVT	 = TRIDENTEnterVT;
-	    pScrn->LeaveVT	 = TRIDENTLeaveVT;
-	    pScrn->FreeScreen	 = TRIDENTFreeScreen;
-	    pScrn->ValidMode	 = TRIDENTValidMode;
-	    foundScreen = TRUE;
-	    xf86ConfigActivePciEntity(pScrn, usedChips[i], TRIDENTPciChipsets,
-				  NULL, NULL, NULL, NULL, NULL);
-	  }
-	  xfree(usedChips);
-    	}
+	    if (flags & PROBE_DETECT)
+		foundScreen = TRUE;
+	    else for (i = 0; i < numUsed; i++) {
+		ScrnInfoPtr pScrn = NULL;
+		
+		if ((pScrn = xf86ConfigPciEntity(pScrn, 0,usedChips[i],
+						       TRIDENTPciChipsets, NULL,
+						       NULL, NULL, NULL, NULL))) {
+		    /* Fill in what we can of the ScrnInfoRec */
+		    pScrn->driverVersion = VERSION;
+		    pScrn->driverName	 = TRIDENT_DRIVER_NAME;
+		    pScrn->name		 = TRIDENT_NAME;
+		    pScrn->Probe	 = TRIDENTProbe;
+		    pScrn->PreInit	 = TRIDENTPreInit;
+		    pScrn->ScreenInit	 = TRIDENTScreenInit;
+		    pScrn->SwitchMode	 = TRIDENTSwitchMode;
+		    pScrn->AdjustFrame	 = TRIDENTAdjustFrame;
+		    pScrn->EnterVT	 = TRIDENTEnterVT;
+		    pScrn->LeaveVT	 = TRIDENTLeaveVT;
+		    pScrn->FreeScreen	 = TRIDENTFreeScreen;
+		    pScrn->ValidMode	 = TRIDENTValidMode;
+		    foundScreen = TRUE;
+		}
+	    }
+	}
     }
 
     /* Isa Bus */
@@ -842,27 +875,29 @@
     if (numUsed > 0) {
 	if (flags & PROBE_DETECT)
 	    foundScreen = TRUE;
-	else for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
-	    
-	    pScrn->driverVersion = VERSION;
-	    pScrn->driverName    = TRIDENT_DRIVER_NAME;
-	    pScrn->name          = TRIDENT_NAME;
-	    pScrn->Probe         = TRIDENTProbe;
-	    pScrn->PreInit       = TRIDENTPreInit;
-	    pScrn->ScreenInit    = TRIDENTScreenInit;
-	    pScrn->SwitchMode    = TRIDENTSwitchMode;
-	    pScrn->AdjustFrame   = TRIDENTAdjustFrame;
-	    pScrn->EnterVT       = TRIDENTEnterVT;
-	    pScrn->LeaveVT       = TRIDENTLeaveVT;
-	    pScrn->FreeScreen    = TRIDENTFreeScreen;
-	    pScrn->ValidMode     = TRIDENTValidMode;
-	    foundScreen = TRUE;
-	    xf86ConfigActiveIsaEntity(pScrn,usedChips[i],TRIDENTISAchipsets,
-				      NULL,NULL,NULL,NULL,NULL);
+	else 	for (i = 0; i < numUsed; i++) {
+	    ScrnInfoPtr pScrn = NULL;
+	    if ((pScrn = xf86ConfigIsaEntity(pScrn,0,usedChips[i],
+						  TRIDENTISAchipsets,NULL,
+						  NULL,NULL,NULL,NULL))) {
+		pScrn->driverVersion = VERSION;
+		pScrn->driverName    = TRIDENT_DRIVER_NAME;
+		pScrn->name          = TRIDENT_NAME;
+		pScrn->Probe         = TRIDENTProbe;
+		pScrn->PreInit       = TRIDENTPreInit;
+		pScrn->ScreenInit    = TRIDENTScreenInit;
+		pScrn->SwitchMode    = TRIDENTSwitchMode;
+		pScrn->AdjustFrame   = TRIDENTAdjustFrame;
+		pScrn->EnterVT       = TRIDENTEnterVT;
+		pScrn->LeaveVT       = TRIDENTLeaveVT;
+		pScrn->FreeScreen    = TRIDENTFreeScreen;
+		pScrn->ValidMode     = TRIDENTValidMode;
+		foundScreen = TRUE;
+	    }
 	}
 	xfree(usedChips);
     }
+    
     if (devSections)
 	xfree(devSections);
     return foundScreen;
@@ -929,15 +964,13 @@
     }
 } 
 
-extern xf86MonPtr ConfiguredMonitor;
-
 void
 TRIDENTProbeDDC(ScrnInfoPtr pScrn, int index)
 {
     vbeInfoPtr pVbe;
     if (xf86LoadSubModule(pScrn, "vbe")) {
 	pVbe = VBEInit(NULL,index);
-	ConfiguredMonitor = vbeDoEDID(pVbe);
+	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
     }
 }
 
@@ -958,7 +991,8 @@
     ClockRangePtr clockRanges;
     char *mod = NULL;
     const char *Sym = "";
-
+    Bool ddcLoaded = FALSE;
+    
     /* Allocate the TRIDENTRec driverPrivate */
     if (!TRIDENTGetRec(pScrn)) {
 	return FALSE;
@@ -986,7 +1020,7 @@
     	    pTrident->Linear = FALSE;
 	}
     }
-
+    
     if (flags & PROBE_DETECT) {
 	TRIDENTProbeDDC(pScrn, pTrident->pEnt->index);
 	return TRUE;
@@ -1050,9 +1084,6 @@
 
     xf86SetOperatingState(RES_SHARED_VGA, pTrident->pEnt->index, ResUnusedOpr);
 
-    pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-    pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-
     /* The ramdac module should be loaded here when needed */
     if (!xf86LoadSubModule(pScrn, "ramdac"))
 	return FALSE;
@@ -1134,14 +1165,33 @@
 	pTrident->UsePCIRetry = TRUE;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "PCI retry enabled\n");
     }
-    if (xf86ReturnOptValBool(TRIDENTOptions, OPTION_CYBER_SHADOW, FALSE)) {
-	pTrident->CyberShadow = TRUE;
-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Cyber Shadow Registers enabled\n");
+    pTrident->UsePCIBurst = TRUE;
+    if (xf86ReturnOptValBool(TRIDENTOptions, OPTION_NOPCIBURST, FALSE)) {
+	pTrident->UsePCIBurst = FALSE;
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "PCI Burst disbled\n");
     }
+#if 0
+    /* obsolete */
+    if ((pTrident->CyberShadowSet = xf86GetOptValBool(TRIDENTOptions,
+						     OPTION_CYBER_SHADOW,
+						      &pTrident->CyberShadow)))
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Cyber Shadow Registers %s\n",
+		   pTrident->CyberShadow?"enabled":"disabled");
+#endif
     if (xf86ReturnOptValBool(TRIDENTOptions, OPTION_NOMMIO, FALSE)) {
 	pTrident->NoMMIO = TRUE;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "MMIO Disabled\n");
     }
+    if (xf86ReturnOptValBool(TRIDENTOptions, OPTION_MMIO_ONLY, FALSE)) {
+	if (pTrident->NoMMIO)
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "MMIO only cannot be set"
+		       " with NoMMIO\n");
+	else {
+	    pTrident->MMIOonly = TRUE;
+	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "MMIO Disabled\n");
+	}
+    }
+
     pTrident->MUXThreshold = 80000; /* 100MHz */
     if (xf86GetOptValInteger(TRIDENTOptions, OPTION_MUX_THRESHOLD, 
 						&pTrident->MUXThreshold)) {
@@ -1221,11 +1271,39 @@
 	return FALSE;
     }
 
+    /* Initialize VBE if possible 
+     * Don't move this past MMIO enable!!
+     * PIO access will be blocked
+     * when MMIO is turned on!
+     */
+    if (xf86LoadSubModule(pScrn, "vbe")) {
+	xf86MonPtr pMon;
+	pMon = vbeDoEDID(VBEInit(pTrident->Int10,
+				 pTrident->pEnt->index), NULL);
+	if (pMon) {
+	    if (!xf86LoadSubModule(pScrn, "ddc")) {
+		TRIDENTFreeRec(pScrn);
+		return FALSE;
+	    } else {
+		xf86LoaderReqSymLists(ddcSymbols, NULL);
+		xf86SetDDCproperties(pScrn,xf86PrintEDID(pMon));
+		ddcLoaded = TRUE;
+	    }
+	}
+	    
+    }
+
     if (IsPciCard && UseMMIO) {
     	if (!TRIDENTMapMem(pScrn))
 	    return FALSE;
 
     	TRIDENTEnableMMIO(pScrn);
+	/*
+	 * PC-9821 PCI Trident Card Magic Setup!!
+	 */
+	if (IsPciCard && xf86IsPc98()) {
+	  PC98TRIDENTInit(pScrn);
+	}
     }
 
     OUTB(0x3C4, RevisionID); revision = INB(0x3C5);
@@ -1557,6 +1635,20 @@
 	    pTrident->NewClockCode = TRUE;
 	    pTrident->frequency = NTSC;
 	    break;
+	case CYBERBLADEI1D:
+    	    pTrident->ddc1Read = Tridentddc1Read;
+    	    if ((INB(vgaIOBase + 5) & 0x0C) == 0x08)
+		ramtype = "SDRAM";
+    	    if ((INB(vgaIOBase + 5) & 0x0C) == 0x0C) {
+		pTrident->HasSGRAM = TRUE;
+		ramtype = "SGRAM";
+	    }
+	    pTrident->IsCyber = TRUE;
+	    Support24bpp = TRUE;
+	    chipset = "CyberBlade/DSTN/i1";
+	    pTrident->NewClockCode = TRUE;
+	    pTrident->frequency = NTSC;
+	    break;
     }
 
     if (!pScrn->progClock) {
@@ -1617,6 +1709,8 @@
 	    break;
 	case 0x07:
 	    pScrn->videoRam = 2048;
+	    if (pTrident->Chipset == CYBER9525DVD)
+		pScrn->videoRam = 2560;
 	    break;
 	case 0x0F:
 	    pScrn->videoRam = 4096;
@@ -1630,10 +1724,24 @@
 	}
     }
 
-
     xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n",
                pScrn->videoRam);
 
+    if (pTrident->IsCyber) {
+	unsigned char tmp;
+	
+	pTrident->lcdMode = 0xff;
+	OUTB(0x3CE,0x41);
+	tmp = INB(0x3CF);
+	for (i = 0; LCD[i].mode != 0xff; i++) {
+	    if (LCD[i].mode == (tmp & 0x7)) {
+		pTrident->lcdMode = i;
+		xf86DrvMsg(pScrn->scrnIndex, X_PROBED,"%s Panel %s found\n",
+			   (tmp & 0x8) ? "DSTN" : "TFT", LCD[i].display);
+	    }
+	}
+    }
+    
     pTrident->MCLK = 0;
     mclk = CalculateMCLK(pScrn);
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Memory Clock is %3.2f MHz\n", mclk);
@@ -1698,7 +1806,7 @@
      * Setup the ClockRanges, which describe what clock ranges are available,
      * and what sort of modes they can be used for.
      */
-    clockRanges = xnfalloc(sizeof(ClockRange));
+    clockRanges = xnfcalloc(sizeof(ClockRange), 1);
     clockRanges->next = NULL;
     if (!pScrn->progClock) {
 	if (pScrn->bitsPerPixel == 16)
@@ -1878,33 +1986,32 @@
 
     /* Load DDC if needed */
     /* This gives us DDC1 - we should be able to get DDC2B using i2c */
-    if (!xf86LoadSubModule(pScrn, "ddc")) {
-	if (IsPciCard && UseMMIO) {
-    	    TRIDENTDisableMMIO(pScrn);
- 	    TRIDENTUnmapMem(pScrn);
+
+    if (! ddcLoaded)
+	if (!xf86LoadSubModule(pScrn, "ddc")) {
+	    if (IsPciCard && UseMMIO) {
+		TRIDENTDisableMMIO(pScrn);
+		TRIDENTUnmapMem(pScrn);
+	    }
+	    TRIDENTFreeRec(pScrn);
+	    return FALSE;
 	}
-	TRIDENTFreeRec(pScrn);
-	return FALSE;
-    }
+    
     xf86LoaderReqSymLists(ddcSymbols, NULL);
 
-    /* Initialize DDC1 if possible */
-    if (IsPrimaryCard) {
-       if (pTrident->ddc1Read) {
-    	   if (xf86LoadSubModule(pScrn, "vbe")) {
-		xf86MonPtr pMon;
-		pMon = vbeDoEDID(VBEInit(NULL,pTrident->pEnt->index));
-	   	xf86SetDDCproperties(pScrn,xf86PrintEDID(pMon));
-	   }
-       }
-    }
-
     if (IsPciCard && UseMMIO) {
         TRIDENTDisableMMIO(pScrn);
 	TRIDENTUnmapMem(pScrn);
     }
 
     pTrident->FbMapSize = pScrn->videoRam * 1024;
+    
+    pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
+
+    if (pTrident->IsCyber && pTrident->MMIOonly)
+	pScrn->racIoFlags = 0;
+    else 
+	pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
 
     return TRUE;
 }
@@ -2031,6 +2138,7 @@
 	case CYBERBLADEI7:
 	case CYBERBLADEI7D:
 	case CYBERBLADEI1:
+	case CYBERBLADEI1D:
 	case CYBER9520:
 	case CYBER9525DVD:
 	case CYBER9540:
@@ -2058,6 +2166,19 @@
 	return FALSE;
     pScrn->vtSema = TRUE;
 
+    /* Program the registers */
+    vgaHWProtect(pScrn, TRUE);
+    vgaReg = &hwp->ModeReg;
+    tridentReg = &pTrident->ModeReg;
+
+    vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
+
+    /*
+     * TridentInit() has to modified registers
+     * that have already been set by vgaHWRestore().
+     * So we call it _after_ vgaHWRestore() has
+     * programmed these registers.
+     */
     if (pScrn->progClock) {
     	if (!TridentInit(pScrn, mode))
 	    return FALSE;
@@ -2066,13 +2187,6 @@
 	    return FALSE;
     }
 
-    /* Program the registers */
-    vgaHWProtect(pScrn, TRUE);
-    vgaReg = &hwp->ModeReg;
-    tridentReg = &pTrident->ModeReg;
-
-    vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
-
     if (pScrn->progClock)
     	TridentRestore(pScrn, tridentReg);
     else
@@ -2080,6 +2194,9 @@
 
     vgaHWProtect(pScrn, FALSE);
 
+    if (xf86IsPc98())
+	PC98TRIDENTEnable(pScrn);
+
     return TRUE;
 }
 
@@ -2304,6 +2421,7 @@
 	    if ((pTrident->Chipset == CYBERBLADEI7) ||
 	        (pTrident->Chipset == CYBERBLADEI7D) ||
 	        (pTrident->Chipset == CYBERBLADEI1) ||
+	        (pTrident->Chipset == CYBERBLADEI1D) ||
 	        (pTrident->Chipset == BLADE3D))
 		BladeAccelInit(pScreen);
 	    else
@@ -2475,6 +2593,10 @@
 
     TRIDENTRestore(pScrn);
     vgaHWLock(hwp);
+
+    if (xf86IsPc98())
+	PC98TRIDENTDisable(pScrn);
+
     if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
 }
 
@@ -2492,6 +2614,9 @@
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
+    if (xf86IsPc98())
+	PC98TRIDENTDisable(pScrn);
+
     if (pScrn->vtSema) {
     	TRIDENTRestore(pScrn);
     	vgaHWLock(hwp);
@@ -2550,6 +2675,13 @@
     CARD8 temp = 0;
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
+    /*
+     * Skip MMIO Enable in PC-9821 PCI Trident Card!!
+     * Because of lack of non PCI VGA port
+     */
+    if (IsPciCard && xf86IsPc98())
+      return;
+
     /* Goto New Mode */
     outb(0x3C4, 0x0B); inb(0x3C5);
 
@@ -2573,6 +2705,13 @@
     CARD8 temp = 0;
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
+    /*
+     * Skip MMIO Disable in PC-9821 PCI Trident Card!!
+     * Because of lack of non PCI VGA port
+     */
+    if (IsPciCard && xf86IsPc98())
+      return;
+
     /* Goto New Mode */
     OUTB(0x3C4, 0x0B); temp = INB(0x3C5);
 
@@ -2588,4 +2727,165 @@
     /* Protect registers */
     outb(0x3C4, NewMode1);
     outb(0x3C5, temp);
+}
+/* Initialize VGA Block on Trident(PC-98x1 Only) */
+static void
+PC98TRIDENTInit(ScrnInfoPtr pScrn)
+{
+    TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    CARD8 temp = 0;
+
+    vgaHWProtect(pScrn, TRUE);
+
+    /* Video SusSystem Enable */
+    temp = INB(0x3CC);
+    OUTB(0x3C2, temp | 0xC3);
+    /* Switch Old */
+    OUTB(0x3C4, 0x0B); temp = INB(0x3C5);
+    OUTW(0x3C4, 0x0B | (temp << 8));
+    /* Select Configuration Port 1 */
+    OUTB(0x3C4, 0x0E); temp = INB(0x3C5);
+    OUTW(0x3C4, 0x0E | ((temp | 0x20) << 8));
+
+    OUTB(0x3C4, 0x0c);
+    if((INB(0x3C5) & 0x10) == 0x10)
+    {
+	OUTB(0x3C4, 0x0E | (temp << 8));
+	OUTB(0x94,  0x00);
+	OUTB(0x102, 0x01);
+	OUTB(0x94,  0x20);
+	temp = INB(0x3C3);
+	OUTB(0x3C3, temp | 0x01);
+    } else {
+	OUTB(0x3C4, 0x0E | (temp << 8));
+	OUTB(0x46E8, 0x10);
+	OUTB(0x102,  0x01);
+	OUTB(0x46E8, 0x08);
+    }
+
+    INB(0x3DA);
+    OUTB(0x3C0,0x10);
+    OUTB(0x3C0,0x41);
+  
+    /* Register Unlock */
+    vgaHWUnlock(hwp);
+    OUTB(0x3C4, 0x0B); temp = INB(0x3C5); /* Switch New */
+    OUTB(0x3C4, 0x0E); temp = INB(0x3C5);
+    OUTW(0x3C4, 0x0E | ((temp | 0x80) << 8));
+
+    /* For Speed Up [Facoor 2 at Xengine] */
+    OUTW(0x3D4, 0x3820); /* Command FIFO Register */
+    OUTW(0x3D4, 0x2020); /* Command FIFO Register */
+    /* Latency Control Registers 0x30 - 0x32 */
+    /* Parameter Range 0x00 - 0x0F */
+    /* Tune these parameter to avoid GE Timeout */
+    OUTW(0x3D4, 0x0E30); /* Display Queue Latency Control */
+    /* 8bpp GE No Timeout Parameter 0x0D - 0x0F for PC-9821Xa7 TGUi9680 */
+    OUTW(0x3D4, 0x0031); /* Frame Buffer Latency Control */
+    OUTW(0x3D4, 0x0032); /* Display & Frame Buffer Latency Control */
+    OUTW(0x3D4, 0x213B); /* Clock and Tuning */
+
+    /* MCLK Init */
+    OUTB(0x43C6, 0xAF); OUTB(0x43C7, 0x00); /* 80.0MHz */
+#if 0
+    /* Sample MCLKs */
+    OUTB(0x43C6, 0xAF); OUTB(0x43C7, 0x00); /* 80.0MHz */
+    OUTB(0x43C6, 0xA7); OUTB(0x43C7, 0x00); /* 77.0MHz */
+    OUTB(0x43C6, 0x8E); OUTB(0x43C7, 0x00); /* 75.0MHz */
+    OUTB(0x43C6, 0x86); OUTB(0x43C7, 0x00); /* 72.0MHz */
+    OUTB(0x43C6, 0x8F); OUTB(0x43C7, 0x00); /* 67.2MHz */
+    OUTB(0x43C6, 0xD5); OUTB(0x43C7, 0x02); /* 61.6MHz */
+#endif
+
+    /* Register Lock */
+    OUTB(0x3C4, 0x0B); temp = INB(0x3C5); /* Switch New */
+    OUTB(0x3C4, 0x0E); temp = INB(0x3C5);
+    OUTW(0x3C4, 0x0E | ((temp & 0x7F) << 8));
+    vgaHWLock(hwp);
+
+    vgaHWProtect(pScrn, FALSE);
+}
+
+static void
+PC98TRIDENTEnable(ScrnInfoPtr pScrn)
+{
+    TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
+    CARD8 temp = 0;
+
+    outb(0x68, 0x0E);
+    outb(0x6A, 0x07);
+    outb(0x6A, 0x8F);
+    outb(0x6A, 0x06);
+
+    vgaHWProtect(pScrn, TRUE);
+
+    OUTB(0x3D4, 0x23); temp = INB(0x3D5);
+    OUTW(0x3D4, 0x23 | ((temp & 0xDF) << 8));
+
+    OUTB(0x3D4, 0x29); temp = INB(0x3D5);
+    OUTW(0x3D4, 0x29 | ((temp | 0x04) << 8));
+
+    OUTB(0x83C8, 0x04); temp = INB(0x83c6);
+    OUTB(0x83C8, 0x04); OUTB(0x83c6, (temp | 0x06));
+
+    OUTB(0x83C8, 0x04); temp = INB(0x83c6);
+    OUTB(0x83C8, 0x04); OUTB(0x83c6, (temp | 0x08));
+
+    OUTB(0x3CE, 0x23); temp = INB(0x3CF);
+    OUTW(0x3CE, 0x23 | ((temp & 0xFC) << 8));
+
+    OUTB(0x83C8, 0x04); temp = INB(0x83c6);
+    OUTB(0x83C8, 0x04); OUTB(0x83c6, (temp | 0x01));
+
+    OUTB(0x3C4, 0x01); temp = INB(0x3C5);
+    OUTW(0x3C4, 0x01 | ((temp & 0xEF) << 8));
+
+    vgaHWProtect(pScrn, FALSE);
+
+    outb(0xFAC, 0x02);
+}
+
+static void
+PC98TRIDENTDisable(ScrnInfoPtr pScrn){
+    TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
+    CARD8 temp = 0;
+
+    outb(0xFAC, 0x00);
+
+    vgaHWProtect(pScrn, TRUE);
+
+    OUTB(0x3C4, 0x01); temp = INB(0x3C5);
+    OUTW(0x3C4, 0x01 | ((temp | 0x10) << 8));
+
+    OUTB(0x83C8, 0x04); temp = INB(0x83c6);
+    OUTB(0x83C8, 0x04); OUTB(0x83c6, (temp & 0xFE));
+
+    OUTB(0x3CE, 0x23); temp = INB(0x3CF);
+    OUTW(0x3CE, 0x23 | (((temp & 0xFC) | 0x01) << 8));
+
+    OUTB(0x83C8, 0x04); temp = INB(0x83c6);
+    OUTB(0x83C8, 0x04); OUTB(0x83c6, (temp & 0xFD));
+
+    OUTB(0x83C8, 0x04); temp = INB(0x83c6);
+    OUTB(0x83C8, 0x04); OUTB(0x83c6, (temp & 0xCF));
+
+    OUTB(0x83C8, 0x04); temp = INB(0x83c6);
+    OUTB(0x83C8, 0x04); OUTB(0x83c6, (temp & 0xF7));
+
+    OUTB(0x83C8, 0x04); temp = INB(0x83c6);
+    OUTB(0x83C8, 0x04); OUTB(0x83c6, (temp & 0xFB));
+
+    OUTB(0x3D4, 0x29); temp = INB(0x3D5);
+    OUTW(0x3D4, 0x29 | ((temp & 0xFB) << 8));
+
+    OUTB(0x3D4, 0x23); temp = INB(0x3D5);
+    OUTW(0x3D4, 0x23 | ((temp | 0x20) << 8));
+
+    vgaHWProtect(pScrn, FALSE);
+
+    outb(0x6A, 0x07);
+    outb(0x6A, 0x8E);
+    outb(0x6A, 0x06);
+    outb(0x68, 0x0F);
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h
diff -u xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h:1.11 xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h:1.12
--- xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h:1.11	Sun Oct 24 11:01:47 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h	Tue Jun  6 11:07:37 2000
@@ -21,7 +21,7 @@
  *
  * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h,v 1.11 1999/10/24 18:01:47 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h,v 1.12 2000/06/06 18:07:37 eich Exp $ */
 
 #define DEBUG 1
 
@@ -89,12 +89,20 @@
 #define TVinterface 0xC0
 #define TVMode 0xC1
 #define ClockControl 0xCF
+#define PreEndControl 0x56
+#define PreEndFetch 0x57
 
+
 /* 3CE */
 #define MiscExtFunc 0x0F
 #define MiscIntContReg 0x2F
 #define CyberControl 0x30
 #define CyberEnhance 0x31
+#define FPConfig     0x34
+#define VertStretch  0x52
+#define HorStretch   0x53
+#define BiosMode     0x5c
+#define BiosReg      0x5d
 
 /* Graphics Engine for 9420/9430 */
 
@@ -209,15 +217,15 @@
 		((((CARD32)(y)&0xFFFF) << 16) | ((CARD32)(x) & 0xffff))
 
 #define TRIDENT_WRITE_REG(v,r)					\
-        (*(volatile CARD32 *)((char*)pTrident->IOBase+(r)) = (v))
+        MMIO_OUT32(pTrident->IOBase,(r),(v))
 
 #define TRIDENT_READ_REG(r) \
-	*(volatile CARD32 *)((char*)pTrident->IOBase+(r))
+        MMIO_IN32(pTrident->IOBase,(r))
 
 #define OUTB(addr, data) \
 { \
 	if (IsPciCard && UseMMIO) { \
-	    (*(volatile CARD8 *)(pTrident->IOBase + (addr)) = (data)); \
+            MMIO_OUT8(pTrident->IOBase, addr, data); \
 	} else { \
 	    outb(addr, data); \
 	} \
@@ -225,12 +233,12 @@
 #define OUTW(addr, data) \
 { \
 	if (IsPciCard && UseMMIO) { \
-	    (*(volatile CARD16 *)(pTrident->IOBase + (addr)) = (data)); \
+            MMIO_OUT16(pTrident->IOBase, addr, data); \
 	} else { \
 	    outw(addr, data); \
 	} \
 }
-#define INB(addr) ((IsPciCard && UseMMIO) ? *(volatile CARD8 *)(pTrident->IOBase + addr) : inb(addr))
+#define INB(addr) ((IsPciCard && UseMMIO) ? MMIO_IN8(pTrident->IOBase, addr) : inb(addr))
 
 #define OUTW_3C4(reg) \
     	OUTW(0x3C4, (tridentReg->tridentRegs3C4[reg])<<8 | (reg))
@@ -249,85 +257,98 @@
     	tridentReg->tridentRegs3CE[reg] = INB(0x3CF);
 
 #define BLTBUSY(b) \
-	(b = (*(volatile CARD8 *)(pTrident->IOBase+GER_STATUS)) & GE_BUSY)
+	(b = MMIO_IN8(pTrident->IOBase,GER_STATUS) & GE_BUSY)
 #define OLDBLTBUSY(b) \
-	(b = (*(volatile CARD8 *)(pTrident->IOBase+OLDGER_STATUS))&GE_BUSY)
+	(b = MMIO_IN8(pTrident->IOBase,OLDGER_STATUS) & GE_BUSY)
 #define IMAGE_STATUS(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + IMAGE_GE_STATUS) = (c))
+	MMIO_OUT32(pTrident->IOBase, IMAGE_GE_STATUS, (c))
 #define TGUI_STATUS(c) \
-	(*(volatile CARD8 *)(pTrident->IOBase + GER_STATUS) = (c))
+	MMIO_OUT8(pTrident->IOBase, GER_STATUS, (c))
 #define OLDTGUI_STATUS(c) \
-	(*(volatile CARD8 *)(pTrident->IOBase + OLDGER_STATUS) = (c))
+	MMIO_OUT8(pTrident->IOBase, OLDGER_STATUS, (c))
 #define TGUI_OPERMODE(c) \
-	(*(volatile CARD16 *)(pTrident->IOBase + GER_OPERMODE) = (c))
+	MMIO_OUT16(pTrident->IOBase, GER_OPERMODE, (c))
 /* XXX */
 #define OLDTGUI_OPERMODE(c) \
 	{ \
-		*(CARD16 *)(pTrident->IOBase + OLDGER_MWIDTH) = \
-			            vga256InfoRec.displayWidth - 1; \
-		*(CARD8 *)(pTrident->IOBase + OLDGER_MFORMAT) = c; \
+		MMIO_OUT16(pTrident->IOBase, OLDGER_MWIDTH, \
+			            vga256InfoRec.displayWidth - 1); \
+		MMIO_OUT8(pTrident->IOBase, OLDGER_MFORMAT, (c)); \
 	}
 #define TGUI_FCOLOUR(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_FCOLOUR) = (c))
+	MMIO_OUT32(pTrident->IOBase, GER_FCOLOUR, (c))
 #define TGUI_FPATCOL(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_FPATCOL) = (c))
+	MMIO_OUT32(pTrident->IOBase, GER_FPATCOL, (c))
 #define OLDTGUI_FCOLOUR(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + OLDGER_FCOLOUR) = (c))
+	MMIO_OUT32(pTrident->IOBase, OLDGER_FCOLOUR, (c))
 #define TGUI_BCOLOUR(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_BCOLOUR) = (c))
+	MMIO_OUT32(pTrident->IOBase, GER_BCOLOUR, (c))
 #define TGUI_BPATCOL(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_BPATCOL) = (c))
+	MMIO_OUT32(pTrident->IOBase, GER_BPATCOL, (c))
 #define OLDTGUI_BCOLOUR(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + OLDGER_BCOLOUR) = (c))
+	MMIO_OUT32(pTrident->IOBase, OLDGER_BCOLOUR, (c))
 #define IMAGE_DRAWENV(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + IMAGE_GE_DRAWENV) = (c))
+	MMIO_OUT32(pTrident->IOBase, IMAGE_GE_DRAWENV, (c))
 #define TGUI_DRAWFLAG(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_DRAWFLAG) = (c))
+	MMIO_OUT32(pTrident->IOBase, GER_DRAWFLAG, (c))
 #define OLDTGUI_STYLE(c) \
-	(*(volatile CARD16 *)(pTrident->IOBase + OLDGER_STYLE) = (c))
+	MMIO_OUT16(pTrident->IOBase, OLDGER_STYLE, (c))
 #define TGUI_FMIX(c) \
-	(*(volatile CARD8 *)(pTrident->IOBase + GER_FMIX) = (c))
+	MMIO_OUT8(pTrident->IOBase, GER_FMIX, (c))
 #define OLDTGUI_FMIX(c) \
-	(*(volatile CARD8 *)(pTrident->IOBase + OLDGER_FMIX) = (c))
+	MMIO_OUT8(pTrident->IOBase, OLDGER_FMIX, (c))
 #define OLDTGUI_BMIX(c) \
-	(*(volatile CARD8 *)(pTrident->IOBase + OLDGER_BMIX) = (c))
+	MMIO_OUT8(pTrident->IOBase, OLDGER_BMIX, (c))
 #define TGUI_DIM_XY(w,h) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_DIM_XY) = XY_MERGE((w)-1,(h)-1))
+	MMIO_OUT32(pTrident->IOBase, GER_DIM_XY, XY_MERGE((w)-1,(h)-1))
 #define TGUI_STYLE(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_STYLE) = (c))
+	MMIO_OUT32(pTrident->IOBase, GER_STYLE, (c))
 #define OLDTGUI_DIMXY(w,h) \
-	(*(volatile CARD32 *)(pTrident->IOBase + OLDGER_DIMXY) = XY_MERGE((w)-1,(h)-1))
+	MMIO_OUT32(pTrident->IOBase, OLDGER_DIMXY, XY_MERGE((w)-1,(h)-1))
 #define TGUI_SRC_XY(x,y) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_SRC_XY) = XY_MERGE(x,y))
+	MMIO_OUT32(pTrident->IOBase, GER_SRC_XY, XY_MERGE(x,y))
 #define TGUI_DEST_XY(x,y) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_DEST_XY) = XY_MERGE(x,y))
+	MMIO_OUT32(pTrident->IOBase, GER_DEST_XY, XY_MERGE(x,y))
 #define OLDTGUI_DESTXY(x,y) \
-	(*(volatile CARD32 *)(pTrident->IOBase + OLDGER_DESTXY) = XY_MERGE(x,y))
+	MMIO_OUT32(pTrident->IOBase, OLDGER_DESTXY, XY_MERGE(x,y))
 #define OLDTGUI_DESTLINEAR(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + OLDGER_DESTLINEAR) = (c))
+	MMIO_OUT32(pTrident->IOBase, OLDGER_DESTLINEAR, (c))
 #define TGUI_SRCCLIP_XY(x,y) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_SRCCLIP_XY) = XY_MERGE(x,y))
+	MMIO_OUT32(pTrident->IOBase, GER_SRCCLIP_XY, XY_MERGE(x,y))
 #define TGUI_DSTCLIP_XY(x,y) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_DSTCLIP_XY) = XY_MERGE(x,y))
+	MMIO_OUT32(pTrident->IOBase, GER_DSTCLIP_XY, XY_MERGE(x,y))
 #define TGUI_PATLOC(addr) \
-	(*(volatile CARD16 *)(pTrident->IOBase + GER_PATLOC) = (addr))
+	MMIO_OUT16(pTrident->IOBase, GER_PATLOC, (addr))
 #define TGUI_CKEY(c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + GER_CKEY) = (c))
+	MMIO_OUT32(pTrident->IOBase, GER_CKEY, (c))
 #define IMAGEBUSY(b) \
-	(b = (*(volatile CARD32 *)(pTrident->IOBase+IMAGE_GE_STATUS)) & 0xF0000000)
+	(b = MMIO_IN32(pTrident->IOBase,IMAGE_GE_STATUS) & 0xF0000000)
 #define BLADEBUSY(b) \
-	(b = (*(volatile CARD32 *)(pTrident->IOBase+BLADE_GE_STATUS)) & 0xFE800000)
+	(b = MMIO_IN32(pTrident->IOBase,BLADE_GE_STATUS) & 0xFE800000)
 #define IMAGE_OUT(addr, c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + addr) = (c))
+	MMIO_OUT32(pTrident->IOBase, addr, (c))
 #define BLADE_OUT(addr, c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + addr) = (c))
+	MMIO_OUT32(pTrident->IOBase, addr, (c))
 #define TGUI_OUTL(addr, c) \
-	(*(volatile CARD32 *)(pTrident->IOBase + addr) = (c))
+	MMIO_OUT32(pTrident->IOBase, addr, (c))
 #define TGUI_COMMAND(c) \
-	(*(volatile CARD8 *)(pTrident->IOBase + GER_COMMAND) = (c))
+	MMIO_OUT8(pTrident->IOBase, GER_COMMAND, (c))
 #define OLDTGUI_COMMAND(c) \
 	do { \
 		OLDTGUI_OPERMODE(GE_OP); \
 		OLDTGUISync(); \
-		*(volatile CARD32 *)(pTrident->IOBase + OLDGER_COMMAND) = (c); \
+		MMIO_OUT32(pTrident->IOBase, OLDGER_COMMAND, (c)); \
 	} while (0)
+
+/* Cyber FP support */
+#define SHADOW_ENABLE(oldval) \
+        do {\
+	       OUTB(0x3CE, CyberControl); \
+	       oldval = INB(0x3CF);\
+	       OUTB(0x3CF,oldval | (1 << 6));\
+        } while (0)
+#define SHADOW_RESTORE(val) \
+        do {\
+               OUTB(0x3CE, CyberControl); \
+	       OUTB(0x3CF,tmp); \
+        } while (0);
Index: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.cpp:1.1	Thu Mar  2 17:05:44 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.cpp	Tue Jun 13 19:13:15 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.cpp,v 1.1 2000/03/03 01:05:44 dawes Exp $ 
-.TH TSENG __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.cpp,v 1.4 2000/06/14 02:13:15 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH TSENG __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 tseng \- Tseng Labs video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""tseng"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qtseng\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B tseng 
 is an XFree86 driver for Tseng Labs video cards.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c:1.14 xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c:1.15
--- xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c:1.14	Sat Jun 12 00:18:58 1999
+++ xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c	Wed Jun 21 10:28:16 2000
@@ -1,5 +1,5 @@
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c,v 1.14 1999/06/12 07:18:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_clock.c,v 1.15 2000/06/21 17:28:16 dawes Exp $ */
 
 
 
@@ -175,7 +175,7 @@
      *
      * First, we set up the default case, and modify it later if needed.
      */
-    pTseng->clockRange[0] = xnfalloc(sizeof(ClockRange));
+    pTseng->clockRange[0] = xnfcalloc(sizeof(ClockRange), 1);
     pTseng->clockRange[0]->next = NULL;
     pTseng->clockRange[0]->minClock = pTseng->MinClock;
     pTseng->clockRange[0]->maxClock = dacspeed;
@@ -199,7 +199,7 @@
 	(!(DAC_is_GenDAC && pTseng->NoClockchip)) ) {
 	pTseng->clockRange[0]->maxClock = MAX_TSENG_CLOCK;
 	/* set up 2nd clock range for PIXMUX modes */
-	pTseng->clockRange[1] = xnfalloc(sizeof(ClockRange));
+	pTseng->clockRange[1] = xnfcalloc(sizeof(ClockRange), 1);
 	pTseng->clockRange[0]->next = pTseng->clockRange[1];
 	pTseng->clockRange[1]->next = NULL;
 	pTseng->clockRange[1]->minClock = 75000;
@@ -225,7 +225,7 @@
 	pTseng->clockRange[0]->ClockDivFactor = 1;
 	/* in addition, 16-bit DACs can also transport 2 bytes per clock */
 	if (pTseng->DacInfo.DacPort16) {
-	    pTseng->clockRange[1] = xnfalloc(sizeof(ClockRange));
+	    pTseng->clockRange[1] = xnfcalloc(sizeof(ClockRange), 1);
 	    pTseng->clockRange[0]->next = pTseng->clockRange[1];
 	    pTseng->clockRange[1]->next = NULL;
 	    pTseng->clockRange[1]->minClock = pTseng->MinClock;
Index: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c:1.68 xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c:1.69
--- xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c:1.68	Mon Mar  6 15:54:15 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c	Mon Apr 17 09:30:09 2000
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c,v 1.68 2000/03/06 23:54:15 dawes Exp $ 
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c,v 1.69 2000/04/17 16:30:09 eich Exp $ 
  *
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
@@ -96,7 +96,7 @@
 static Bool TsengMapMem(ScrnInfoPtr pScrn);
 static Bool TsengUnmapMem(ScrnInfoPtr pScrn);
 static void TsengSave(ScrnInfoPtr pScrn);
-static void TsengRestore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, TsengRegPtr tsengReg);
+static void TsengRestore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, TsengRegPtr tsengReg, int flags);
 static Bool TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 static void TsengUnlock(void);
 static void TsengLock(void);
@@ -516,13 +516,15 @@
 		foundScreen = TRUE;
 	    else for (i = 0; i < numUsed; i++) {
 		/* Allocate a ScrnInfoRec  */
-		ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
-		TsengAssignFPtr(pScrn);
-		xf86ConfigActivePciEntity(pScrn,usedChips[i],TsengPciChipsets,
-					  NULL,NULL,NULL,NULL,NULL);
-		foundScreen = TRUE;
+		ScrnInfoPtr pScrn = NULL;
+		if ((pScrn = xf86ConfigPciEntity(pScrn,0,usedChips[i],
+						       TsengPciChipsets,NULL,
+						       NULL,NULL,NULL,NULL))) {
+		    TsengAssignFPtr(pScrn);
+		    foundScreen = TRUE;
+		}
+		xfree(usedChips);
 	    }
-	    xfree(usedChips);
 	}
     }
     
@@ -534,11 +536,13 @@
 	if (flags & PROBE_DETECT)
 	    foundScreen = TRUE;
 	else for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
-	    TsengAssignFPtr(pScrn);
-	    foundScreen = TRUE;
-	    xf86ConfigActiveIsaEntity(pScrn,usedChips[i],TsengIsaChipsets,
-				      NULL,NULL,NULL,NULL,NULL);
+		ScrnInfoPtr pScrn = NULL;
+		if ((pScrn = xf86ConfigIsaEntity(pScrn,0,usedChips[i],
+						       TsengIsaChipsets,NULL,
+						       NULL,NULL,NULL,NULL))) {
+		    TsengAssignFPtr(pScrn);
+		    foundScreen = TRUE;
+		}
 	}
 	xfree(usedChips);
     }
@@ -1458,6 +1462,7 @@
     if (flags & PROBE_DETECT) return FALSE;
 
     PDEBUG("	TsengPreInit\n");
+    
     /*
      * Note: This function is only called once at server startup, and
      * not at the start of each server generation.  This means that
@@ -2193,7 +2198,8 @@
 #endif
 
     PDEBUG("	TsengLeaveVT\n");
-    TsengRestore(pScrn, &(VGAHWPTR(pScrn)->SavedReg), &pTseng->SavedReg);
+    TsengRestore(pScrn, &(VGAHWPTR(pScrn)->SavedReg),
+		 &pTseng->SavedReg,VGA_SR_ALL);
 
     TsengLock();
     vgaHWLock(VGAHWPTR(pScrn));
@@ -2208,7 +2214,8 @@
     PDEBUG("	TsengCloseScreen\n");
 
     if (pScrn->vtSema) {
-    TsengRestore(pScrn, &(VGAHWPTR(pScrn)->SavedReg), &(pTseng->SavedReg));
+    TsengRestore(pScrn, &(VGAHWPTR(pScrn)->SavedReg),
+		 &(pTseng->SavedReg),VGA_SR_ALL);
     TsengUnmapMem(pScrn);
     }
     if (pTseng->AccelInfoRec)
@@ -2656,7 +2663,7 @@
     }
     vgaHWUnlock(hwp);		       /* TODO: is this needed (tsengEnterVT does this) */
     /* Program the registers */
-    TsengRestore(pScrn, &hwp->ModeReg, new);
+    TsengRestore(pScrn, &hwp->ModeReg, new, VGA_SR_MODE);
     return TRUE;
 }
 
@@ -2916,7 +2923,8 @@
  */
 
 static void
-TsengRestore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, TsengRegPtr tsengReg)
+TsengRestore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, TsengRegPtr tsengReg,
+	     int flags)
 {
     vgaHWPtr hwp;
     TsengPtr pTseng;
@@ -3053,7 +3061,7 @@
     outw(iobase + 4, (tsengReg->ExtCRTC[0x3F] << 8) | 0x3F);
     outw(iobase + 4, (tsengReg->ExtCRTC[0x30] << 8) | 0x30);
     outw(iobase + 4, (tsengReg->ExtCRTC[0x31] << 8) | 0x31);
-    vgaHWRestore(pScrn, vgaReg, VGA_SR_ALL); /* TODO: does this belong HERE, in the middle? */
+    vgaHWRestore(pScrn, vgaReg, flags); /* TODO: does this belong HERE, in the middle? */
     outw(0x3C4, (tsengReg->ExtTS[6] << 8) | 0x06);
     outw(0x3C4, (tsengReg->ExtTS[7] << 8) | 0x07);
     tmp = inb(iobase + 0x0A);	       /* reset flip-flop */
Index: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c:1.16 xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c:1.19
--- xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c:1.16	Mon Feb 21 18:00:54 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c	Mon Jun 12 19:28:34 2000
@@ -2,7 +2,7 @@
  *  video4linux Xv Driver 
  *  based on Michael Schimek's permedia 2 driver.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.16 2000/02/22 02:00:54 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.19 2000/06/13 02:28:34 dawes Exp $ */
 
 #include "videodev.h"
 #include "xf86.h"
@@ -25,7 +25,11 @@
 
 /* XXX Lots of xalloc() calls don't check for failure. */
 
-#define DEBUG(x) (x)
+#if 0
+# define DEBUG(x) (x)
+#else
+# define DEBUG(x)
+#endif
 
 static void     V4LIdentify(int flags);
 static Bool     V4LProbe(DriverPtr drv, int flags);
@@ -100,20 +104,27 @@
 
 #endif
 
+#define VIDEO_OFF     0  /* really off */
+#define VIDEO_RGB     1  /* rgb overlay (directly to fb) */
+#define VIDEO_YUV     2  /* yuv overlay (to offscreen memory + hw scaling) */
+#define VIDEO_RECLIP  3  /* temporarly off, window clipping changes */
+
 typedef struct _PortPrivRec {
     ScrnInfoPtr                 pScrn;
     FBAreaPtr			pFBArea[2];
-    int				VideoOn;	/* yes/no */
+    int				VideoOn;
     Bool			StreamOn;
 
     /* file handle */
     int 			fd;
     char                        devname[16];
     int                         useCount;
+    struct video_capability     cap;
 
-    /* overlay */
-    struct video_buffer		ov_fbuf;
-    struct video_window		ov_win;
+    /* RGB overlay */
+    struct video_buffer		rgb_fbuf;
+    struct video_window		rgb_win;
+    int                         rgbpalette;
 
     /* attributes */
     struct video_picture	pict;
@@ -121,6 +132,17 @@
 
     XF86VideoEncodingPtr        enc;
     int                         nenc,cenc;
+
+    /* yuv to offscreen */
+    XF86OffscreenImagePtr       format;   /* list */
+    int                         nformat;  /* # if list entries */
+    XF86OffscreenImagePtr       myfmt;    /* which one is YUY2 (packed) */
+    int                         have_yuv;
+
+    int                         yuv_width,yuv_height;
+    XF86SurfacePtr              surface;
+    struct video_buffer		yuv_fbuf;
+    struct video_window		yuv_win;
 } PortPrivRec, *PortPrivPtr;
 
 #define XV_ENCODING	"XV_ENCODING"
@@ -143,8 +165,24 @@
     { 15, TrueColor },
     { 16, TrueColor },
     { 24, TrueColor },
+    { 32, TrueColor },
+};
+
+#define V4L_ATTR (sizeof(Attributes) / sizeof(XF86AttributeRec))
+
+static XF86AttributeRec Attributes[] = {
+   {XvSettable | XvGettable, -1000,    1000, XV_ENCODING},
+   {XvSettable | XvGettable, -1000,    1000, XV_BRIGHTNESS},
+   {XvSettable | XvGettable, -1000,    1000, XV_CONTRAST},
+   {XvSettable | XvGettable, -1000,    1000, XV_SATURATION},
+   {XvSettable | XvGettable, -1000,    1000, XV_HUE},
+   {XvSettable | XvGettable,     0,       1, XV_MUTE},
+   {XvSettable | XvGettable,     0, 16*1000, XV_FREQ},
 };
+static XF86AttributeRec VolumeAttr = 
+   {XvSettable | XvGettable, -1000,    1000, XV_VOLUME};
 
+
 /* ---------------------------------------------------------------------- */
 /* forward decl */
 
@@ -172,14 +210,26 @@
     if (pPPriv->fd == -1) {
 	pPPriv->fd = open(pPPriv->devname, O_RDWR, 0);
 
-	pPPriv->ov_fbuf.width        = pScrn->virtualX;
-	pPPriv->ov_fbuf.height       = pScrn->virtualY;
-	pPPriv->ov_fbuf.depth        = pScrn->bitsPerPixel;
-	pPPriv->ov_fbuf.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
-	pPPriv->ov_fbuf.base         = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
+	pPPriv->rgb_fbuf.width        = pScrn->virtualX;
+	pPPriv->rgb_fbuf.height       = pScrn->virtualY;
+	pPPriv->rgb_fbuf.depth        = pScrn->bitsPerPixel;
+	pPPriv->rgb_fbuf.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
+	pPPriv->rgb_fbuf.base         = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
 	
-	if (-1 == ioctl(pPPriv->fd,VIDIOCSFBUF,&(pPPriv->ov_fbuf)))
-	    perror("ioctl VIDIOCSFBUF");
+	switch (pScrn->bitsPerPixel) {
+	case 16:
+	    if (pScrn->weight.green == 5)
+		pPPriv->rgbpalette = VIDEO_PALETTE_RGB555;
+	    else
+		pPPriv->rgbpalette = VIDEO_PALETTE_RGB565;
+	    break;
+	case 24:
+	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB24;
+	    break;
+	case 32:
+	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB32;
+	    break;
+	}
     }
 
     if (pPPriv->fd == -1)
@@ -200,7 +250,6 @@
     }
 }
 
-
 static int
 V4lPutVideo(ScrnInfoPtr pScrn,
     short vid_x, short vid_y, short drw_x, short drw_y,
@@ -210,13 +259,133 @@
     PortPrivPtr pPPriv = (PortPrivPtr) data;
     struct video_clip *clip;
     BoxPtr pBox;
+    RegionRec newReg;
+    BoxRec    newBox;
     unsigned int i,dx,dy,dw,dh;
+    int width,height;
     int one=1;
+
+    /* Open a file handle to the device */
+    if (VIDEO_OFF == pPPriv->VideoOn) {
+	if (V4lOpenDevice(pPPriv, pScrn))
+	    return BadAccess;
+    }
+
+    if (pPPriv->have_yuv) {
+	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
+	width  = pPPriv->enc[pPPriv->cenc].width;
+        height = pPPriv->enc[pPPriv->cenc].height/2; /* no interlace */
+	if (drw_w < width)
+	    width = drw_w;
+	if (drw_h < height)
+	    height = drw_h;
+	if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
+	    /* new size -- free old surface */
+	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
+	    if (pPPriv->surface) {
+		pPPriv->VideoOn = VIDEO_OFF;
+		pPPriv->myfmt->stop(pPPriv->surface);
+		pPPriv->myfmt->free_surface(pPPriv->surface);
+		xfree(pPPriv->surface);
+		pPPriv->surface    = NULL;
+	    }
+	    pPPriv->yuv_width  = width;
+	    pPPriv->yuv_height = height;
+	}
+	if (!pPPriv->surface) {
+	    /* allocate + setup offscreen surface */
+	    if (NULL == (pPPriv->surface = xalloc(sizeof(XF86SurfaceRec))))
+		return FALSE;
+	    if (Success != pPPriv->myfmt->alloc_surface
+		(pScrn,pPPriv->myfmt->image->id,
+		 pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
+		xfree(pPPriv->surface);
+		pPPriv->surface = NULL;
+		goto fallback_to_rgb;
+	    }
+	    pPPriv->yuv_fbuf.width        = pPPriv->surface->width;
+	    pPPriv->yuv_fbuf.height       = pPPriv->surface->height;
+	    pPPriv->yuv_fbuf.depth        = 16;
+	    pPPriv->yuv_fbuf.bytesperline = pPPriv->surface->pitches[0];
+	    pPPriv->yuv_fbuf.base         =
+		(pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
+	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface: %p+%d = %p, %dx%d, pitch %d\n",
+				 pScrn->memPhysBase,pPPriv->surface->offsets[0],
+				 pScrn->memPhysBase+pPPriv->surface->offsets[0],
+				 pPPriv->surface->width,pPPriv->surface->height,
+				 pPPriv->surface->pitches[0]));
+	    pPPriv->yuv_win.width         = pPPriv->surface->width;
+	    pPPriv->yuv_win.height        = pPPriv->surface->height;
+	}
+
+	/* program driver */
+	if (VIDEO_YUV != pPPriv->VideoOn) {
+	    if (-1 == ioctl(pPPriv->fd,VIDIOCSFBUF,&(pPPriv->yuv_fbuf)))
+		perror("ioctl VIDIOCSFBUF");
+	    if (-1 == ioctl(pPPriv->fd,VIDIOCGPICT,&pPPriv->pict))
+		perror("ioctl VIDIOCGPICT");
+	    pPPriv->pict.palette = VIDEO_PALETTE_YUV422;
+	    if (-1 == ioctl(pPPriv->fd,VIDIOCSPICT,&pPPriv->pict))
+		perror("ioctl VIDIOCSPICT");
+	    if (-1 == ioctl(pPPriv->fd,VIDIOCSWIN,&(pPPriv->yuv_win)))
+		perror("ioctl VIDIOCSWIN");
+	    if (-1 == ioctl(pPPriv->fd, VIDIOCCAPTURE, &one))
+		perror("ioctl VIDIOCCAPTURE(1)");
+	}
+
+	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
+	    /* invert cliplist */
+	    newBox.x1 = drw_x;
+	    newBox.y1 = drw_y;
+	    newBox.x2 = drw_x + drw_w;
+	    newBox.y2 = drw_y + drw_h;
+
+	    if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
+		/* trim to the viewport */
+		if(newBox.x1 < pScrn->frameX0)
+		    newBox.x1 = pScrn->frameX0;
+		if(newBox.x2 > pScrn->frameX1)
+		    newBox.x2 = pScrn->frameX1;
+		
+		if(newBox.y1 < pScrn->frameY0)
+		    newBox.y1 = pScrn->frameY0;
+		if(newBox.y2 > pScrn->frameY1)
+		    newBox.y2 = pScrn->frameY1;
+	    }
+
+	    REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
+	    REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
+	    clipBoxes = &newReg;
+	}
+	
+	/* start overlay */
+	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
+			     "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
+			     drw_x, drw_y,
+			     drw_x+drw_w, drw_y+drw_h,
+			     drw_w, drw_h,
+			     pPPriv->surface->width,pPPriv->surface->height));
+	pPPriv->myfmt->display(pPPriv->surface,
+			       0, 0, drw_x, drw_y,
+			       pPPriv->surface->width,
+			       pPPriv->surface->height,
+			       drw_w, drw_h,
+			       clipBoxes);
+	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
+	    REGION_UNINIT(pScrn->pScreen, &newReg); 
+	}
+	pPPriv->VideoOn = VIDEO_YUV;
+	return Success;
+    }
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV\n"));
+ fallback_to_rgb:
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV rgb\n"));
     /* FIXME: vid-* is ignored for now, not supported by v4l */
 
-    V4lQueryBestSize(pScrn, 0, vid_w, vid_h, drw_w, drw_h, &dw, &dh, data);
+    dw = (drw_w < pPPriv->enc[pPPriv->cenc].width) ?
+	drw_w : pPPriv->enc[pPPriv->cenc].width;
+    dh = (drw_h < pPPriv->enc[pPPriv->cenc].height) ?
+	drw_h : pPPriv->enc[pPPriv->cenc].height;
     /* if the window is too big, center the video */
     dx = drw_x + (drw_w - dw)/2;
     dy = drw_y + (drw_h - dh)/2;
@@ -230,25 +399,25 @@
 		drw_w,drw_h,drw_x,drw_y));
     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  use: %dx%d+%d+%d\n",
 		dw,dh,dx,dy));
-    pPPriv->ov_win.x      = dx;
-    pPPriv->ov_win.y      = dy;
-    pPPriv->ov_win.width  = dw;
-    pPPriv->ov_win.height = dh;
-    pPPriv->ov_win.flags  = 0;
+    pPPriv->rgb_win.x      = dx;
+    pPPriv->rgb_win.y      = dy;
+    pPPriv->rgb_win.width  = dw;
+    pPPriv->rgb_win.height = dh;
+    pPPriv->rgb_win.flags  = 0;
  
     /* clipping */
-    if (pPPriv->ov_win.clips) {
-	xfree(pPPriv->ov_win.clips);
-	pPPriv->ov_win.clips = NULL;
+    if (pPPriv->rgb_win.clips) {
+	xfree(pPPriv->rgb_win.clips);
+	pPPriv->rgb_win.clips = NULL;
     }
-    pPPriv->ov_win.clipcount = REGION_NUM_RECTS(clipBoxes);
+    pPPriv->rgb_win.clipcount = REGION_NUM_RECTS(clipBoxes);
     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,"  clip: have #%d\n",
-		pPPriv->ov_win.clipcount));
-    if (0 != pPPriv->ov_win.clipcount) {
-	pPPriv->ov_win.clips = xalloc(pPPriv->ov_win.clipcount*sizeof(struct video_clip));
-	memset(pPPriv->ov_win.clips,0,pPPriv->ov_win.clipcount*sizeof(struct video_clip));
+		pPPriv->rgb_win.clipcount));
+    if (0 != pPPriv->rgb_win.clipcount) {
+	pPPriv->rgb_win.clips = xalloc(pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
+	memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
 	pBox = REGION_RECTS(clipBoxes);
-	clip = pPPriv->ov_win.clips;
+	clip = pPPriv->rgb_win.clips;
 	for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
 	    clip->x	 = pBox->x1 - dx;
 	    clip->y      = pBox->y1 - dy;
@@ -257,20 +426,21 @@
 	}
     }
 
-    /* Open a file handle to the device */
-
-    if (!pPPriv->VideoOn) {
-	if (V4lOpenDevice(pPPriv, pScrn))
-	    return BadAccess;
-	pPPriv->VideoOn = 1;
-    }
-
     /* start */
-
-    if (-1 == ioctl(pPPriv->fd,VIDIOCSWIN,&(pPPriv->ov_win)))
+    if (VIDEO_RGB != pPPriv->VideoOn) {
+	if (-1 == ioctl(pPPriv->fd,VIDIOCSFBUF,&(pPPriv->rgb_fbuf)))
+	    perror("ioctl VIDIOCSFBUF");
+	if (-1 == ioctl(pPPriv->fd,VIDIOCGPICT,&pPPriv->pict))
+	    perror("ioctl VIDIOCGPICT");
+	pPPriv->pict.palette = pPPriv->rgbpalette;
+	if (-1 == ioctl(pPPriv->fd,VIDIOCSPICT,&pPPriv->pict))
+	    perror("ioctl VIDIOCSPICT");
+    }
+    if (-1 == ioctl(pPPriv->fd,VIDIOCSWIN,&(pPPriv->rgb_win)))
 	perror("ioctl VIDIOCSWIN");
     if (-1 == ioctl(pPPriv->fd, VIDIOCCAPTURE, &one))
 	perror("ioctl VIDIOCCAPTURE(1)");
+    pPPriv->VideoOn = VIDEO_RGB;
 
     return Success;
 }
@@ -295,18 +465,34 @@
     PortPrivPtr pPPriv = (PortPrivPtr) data;  
     int zero=0;
 
-    if (!pPPriv->VideoOn) {
+    if (VIDEO_OFF == pPPriv->VideoOn) {
 	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
 	      "Xv/StopVideo called with video already off\n"));
 	return;
     }
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/StopVideo\n"));
-
-    if (-1 == ioctl(pPPriv->fd, VIDIOCCAPTURE, &zero))
-	perror("ioctl VIDIOCCAPTURE(0)");
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/StopVideo exit=%d\n",exit));
 
-    V4lCloseDevice(pPPriv);
-    pPPriv->VideoOn = 0;
+    if (!exit) {
+	/* just reclipping, we have to stop DMA transfers to the visible screen */
+	if (VIDEO_RGB == pPPriv->VideoOn) {
+	    if (-1 == ioctl(pPPriv->fd, VIDIOCCAPTURE, &zero))
+		perror("ioctl VIDIOCCAPTURE(0)");
+	    pPPriv->VideoOn = VIDEO_RECLIP;
+	}
+    } else {
+	/* video stop - turn off and free everything */
+	if (VIDEO_YUV == pPPriv->VideoOn) {
+	    pPPriv->myfmt->stop(pPPriv->surface);
+	    pPPriv->myfmt->free_surface(pPPriv->surface);
+	    xfree(pPPriv->surface);
+	    pPPriv->surface = NULL;
+	}
+	if (-1 == ioctl(pPPriv->fd, VIDIOCCAPTURE, &zero))
+	    perror("ioctl VIDIOCCAPTURE(0)");
+	
+	V4lCloseDevice(pPPriv);
+	pPPriv->VideoOn = VIDEO_OFF;
+    }
 }
 
 /* v4l uses range 0 - 65535; Xv uses -1000 - 1000 */
@@ -333,12 +519,12 @@
     struct video_channel chan;
     int ret = Success;
 
-    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/SPA %d, %d\n",
-	attribute, value));
-
     if (V4lOpenDevice(pPPriv, pScrn))
 	return BadAccess;
 
+    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/SPA %d, %d\n",
+	attribute, value));
+
     if (-1 == pPPriv->fd) {
 	ret = Success /* FIXME: EBUSY/ENODEV ?? */;
     } else if (attribute == xvEncoding) {
@@ -370,8 +556,9 @@
 		pPPriv->audio.flags |= VIDEO_AUDIO_MUTE;
 	    else
 		pPPriv->audio.flags &= ~VIDEO_AUDIO_MUTE;
-	} else if (attribute == xvVolume && (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)) {
-	    pPPriv->audio.volume = xv_to_v4l(value);
+	} else if (attribute == xvVolume) {
+	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
+		pPPriv->audio.volume = xv_to_v4l(value);
 	} else {
 	    ret = BadValue;
 	}
@@ -381,6 +568,10 @@
     } else if (attribute == xvFreq) {
 	if (-1 == ioctl(pPPriv->fd,VIDIOCSFREQ,&value))
 	    perror("ioctl VIDIOCSFREQ");
+    } else if (pPPriv->have_yuv &&
+	       pPPriv->myfmt->setAttribute) {
+	/* not mine -> pass to yuv scaler driver */
+	ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
     } else {
 	ret = BadValue;
     }
@@ -417,13 +608,18 @@
 	ioctl(pPPriv->fd,VIDIOCGAUDIO,&pPPriv->audio);
 	if (attribute == xvMute) {
 	    *value = (pPPriv->audio.flags & VIDEO_AUDIO_MUTE) ? 1 : 0;
-	} else if (attribute == xvVolume && (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)) {
-	    *value = v4l_to_xv(pPPriv->audio.volume);
+	} else if (attribute == xvVolume) {
+	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
+		*value = v4l_to_xv(pPPriv->audio.volume);
 	} else {
 	    ret = BadValue;
 	}
     } else if (attribute == xvFreq) {
 	ioctl(pPPriv->fd,VIDIOCGFREQ,value);
+    } else if (pPPriv->have_yuv &&
+	       pPPriv->myfmt->getAttribute) {
+	/* not mine -> pass to yuv scaler driver */
+	ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
     } else {
 	ret = BadValue;
     }
@@ -444,8 +640,13 @@
     int maxx = pPPriv->enc[pPPriv->cenc].width;
     int maxy = pPPriv->enc[pPPriv->cenc].height;
 
-    *p_w = (drw_w < maxx) ? drw_w : maxx;
-    *p_h = (drw_h < maxy) ? drw_h : maxy;
+    if (pPPriv->have_yuv) {
+	*p_w = pPPriv->myfmt->max_width;
+	*p_h = pPPriv->myfmt->max_height;
+    } else {
+	*p_w = (drw_w < maxx) ? drw_w : maxx;
+	*p_h = (drw_h < maxy) ? drw_h : maxy;
+    }
 
     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/BS %d %dx%d %dx%d\n",
 			 pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
@@ -467,32 +668,28 @@
 static char*
 fixname(char *str)
 {
-	int s,d;
-	for (s=0, d=0;; s++) {
-		if (str[s] == '-')
-			continue;
-		str[d++] = tolower(str[s]);
-		if (0 == str[s])
-			break;
-	}
-	return str;
+    int s,d;
+    for (s=0, d=0;; s++) {
+	if (str[s] == '-')
+	    continue;
+	str[d++] = tolower(str[s]);
+	if (0 == str[s])
+	    break;
+    }
+    return str;
 }
 
 static XF86VideoEncodingPtr
-V4LBuildEncodings(int fd, int *count)
+V4LBuildEncodings(int fd, int *count, int channels)
 {
-    static struct video_capability  cap;
     static struct video_channel     channel;
     XF86VideoEncodingPtr            enc;
     int i;
-
-    if (-1 == ioctl(fd,VIDIOCGCAP,&cap))
-	return NULL;
 
-    enc = xalloc(sizeof(XF86VideoEncodingRec)*3*cap.channels);
-    memset(enc,0,sizeof(XF86VideoEncodingRec)*3*cap.channels);
+    enc = xalloc(sizeof(XF86VideoEncodingRec)*3*channels);
+    memset(enc,0,sizeof(XF86VideoEncodingRec)*3*channels);
 
-    for (i = 0; i < 3*cap.channels; ) {
+    for (i = 0; i < 3*channels; ) {
 	channel.channel = i/3;
 	if (-1 == ioctl(fd,VIDIOCGCHAN,&channel)) {
 	    perror("ioctl VIDIOCGCHAN");
@@ -533,38 +730,28 @@
     return enc;
 }
 
-
-static XF86AttributeRec Attributes[8] = {
-   {XvSettable | XvGettable, -1000,    1000, XV_ENCODING},
-   {XvSettable | XvGettable, -1000,    1000, XV_BRIGHTNESS},
-   {XvSettable | XvGettable, -1000,    1000, XV_CONTRAST},
-   {XvSettable | XvGettable, -1000,    1000, XV_SATURATION},
-   {XvSettable | XvGettable, -1000,    1000, XV_HUE},
-   {XvSettable | XvGettable, -1000,    1000, XV_VOLUME},
-   {XvSettable | XvGettable,     0,       1, XV_MUTE},
-   {XvSettable | XvGettable,     0, 16*1000, XV_FREQ},
-};
-
-
 static int
 V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
 {
+    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
     PortPrivPtr pPPriv;
     DevUnion *Private;
     XF86VideoAdaptorPtr *VAR = NULL;
     XF86VideoEncodingPtr enc;
-    char dev[16];
-    int  fd,i,nenc;
+    char dev[18];
+    int  fd,i,j,nenc;
 
     DEBUG(xf86Msg(X_INFO, "v4l: init start\n"));
 
     for (i = 0; i < 4; i++) {
-	sprintf(dev,"/dev/video%d",i);
+	sprintf(dev, "/dev/video%d", i);
 	fd = open(dev, O_RDWR, 0);
-	if (fd == -1)
-	    break;
-	if (NULL == (enc = V4LBuildEncodings(fd,&nenc)))
-	    break;
+	if (fd == -1) {
+	    sprintf(dev, "/dev/v4l/video%d", i);
+	    fd = open(dev, O_RDWR, 0);
+	    if (fd == -1)
+		break;
+	}
 	
 	DEBUG(xf86Msg(X_INFO,  "v4l: %s ok\n",dev));
 
@@ -576,9 +763,44 @@
 	pPPriv->fd    = -1;
 	strncpy(pPPriv->devname, dev, 16);
 	pPPriv->useCount=0;
+
+	/* check device */
+	if (-1   == ioctl(fd,VIDIOCGCAP,&pPPriv->cap)	||
+	    NULL == (enc = V4LBuildEncodings
+		     (fd,&nenc,pPPriv->cap.channels))) {
+	    xfree(pPPriv);
+	    break;
+	}
 	pPPriv->enc = enc;
 	pPPriv->nenc = nenc;
 
+#if 1
+	/* check for yuv (see if the driver accepts VIDEO_PALETTE_YUV422) */
+	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
+	pPPriv->pict.palette = VIDEO_PALETTE_YUV422;
+	if (0 == ioctl(fd,VIDIOCSPICT,&pPPriv->pict)) {
+	    ioctl(fd,VIDIOCGPICT,&pPPriv->pict);    
+	    if (VIDEO_PALETTE_YUV422 == pPPriv->pict.palette) {
+		/* works, check screen capabilities */
+		DEBUG(xf86Msg(X_INFO, "v4l: kernel driver supports yuv422.\n"));
+		pPPriv->format = xf86XVQueryOffscreenImages
+		    (pScreen,&pPPriv->nformat);
+		DEBUG(xf86Msg(X_INFO, "v4l: screen driver supports %d yuv formats (%p)\n",
+			      pPPriv->nformat,pPPriv->format));
+		for (j = 0; j < pPPriv->nformat; j++) {
+		    DEBUG(xf86Msg(X_INFO, "v4l: yuv format: %4.4s\n",
+				  (char*)&(pPPriv->format[j].image->id)));
+		    if (pPPriv->format[j].image->id     == 0x32595559 &&
+			pPPriv->format[j].image->format == XvPacked) {
+			pPPriv->have_yuv = 1;
+			pPPriv->myfmt = pPPriv->format+j;
+			DEBUG(xf86Msg(X_INFO,  "v4l: matching format found, offscreen yuv enabled.\n"));
+		    }
+		}
+	    }
+	}
+#endif
+	
 	/* alloc VideoAdaptorRec */
 	VAR = xrealloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
 	VAR[i] = xalloc(sizeof(XF86VideoAdaptorRec));
@@ -587,8 +809,18 @@
 	memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
 
 	/* add attribute lists */
-	VAR[i]->nAttributes = 8;
-	VAR[i]->pAttributes = Attributes;
+	if (pPPriv->have_yuv) {
+	    VAR[i]->nAttributes = V4L_ATTR + pPPriv->myfmt->num_attributes;
+	    VAR[i]->pAttributes = xalloc(VAR[i]->nAttributes *
+					 sizeof(XF86AttributeRec));
+	    memcpy(VAR[i]->pAttributes, Attributes,
+		   sizeof(XF86AttributeRec) * V4L_ATTR);
+	    memcpy(VAR[i]->pAttributes+V4L_ATTR, pPPriv->myfmt->attributes,
+		   sizeof(XF86AttributeRec) * pPPriv->myfmt->num_attributes);
+	} else {
+	    VAR[i]->nAttributes = V4L_ATTR;
+	    VAR[i]->pAttributes = Attributes;
+	}
 
 	/* hook in private data */
 	Private = xalloc(sizeof(DevUnion));
@@ -616,6 +848,27 @@
 	VAR[i]->nFormats =
 		sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
 	VAR[i]->pFormats = InputVideoFormats;
+
+	/* Check whether we have VIDEO_AUDIO_VOLUME */
+	if (!ioctl(pPPriv->fd,VIDIOCGAUDIO,&pPPriv->audio) && 
+	    pPPriv->audio.flags & VIDEO_AUDIO_VOLUME) {
+	  XF86AttributeRec *oldattrs = VAR[i]->pAttributes;
+	  int nattrs = VAR[i]->nAttributes;
+
+	  DEBUG(xf86Msg(X_INFO, "v4l: Volume supported, adding XV_VOLUME to attribute list\n"));
+
+	  VAR[i]->pAttributes = xalloc((nattrs + 1) *
+					 sizeof(XF86AttributeRec));
+	  memcpy(VAR[i]->pAttributes, oldattrs,
+		sizeof(XF86AttributeRec) * nattrs);
+	  memcpy(VAR[i]->pAttributes+nattrs, &VolumeAttr, 
+		 sizeof(XF86AttributeRec));
+	  VAR[i]->nAttributes++;
+	} else {
+	  DEBUG(xf86Msg(X_INFO, "v4l: Volume not supported\n"));
+	}
+	  
+
 	if (fd != -1)
 	    close(fd);
     }
@@ -640,8 +893,9 @@
 V4LProbe(DriverPtr drv, int flags)
 {
     if (flags & PROBE_DETECT)
-	return FALSE;
+	return TRUE;
 
     xf86XVRegisterGenericAdaptorDriver(V4LInit);
+    drv->refCount++;
     return TRUE;
 }
Index: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.cpp:1.1 xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.cpp:1.1	Thu Mar  2 17:05:45 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.cpp	Tue Jun 13 19:13:16 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.cpp,v 1.1 2000/03/03 01:05:45 dawes Exp $ 
-.TH V4L __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.cpp,v 1.4 2000/06/14 02:13:16 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH V4L __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 v4l \- Video 4 Linux driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""v4l"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qv4l\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B v4l 
 is an XFree86 driver for Video 4 Linux.
@@ -25,6 +25,6 @@
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...
Index: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c
diff -u xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c:1.42 xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c:1.44
--- xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c:1.42	Mon Mar  6 15:54:16 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c	Thu Apr 27 09:26:49 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.42 2000/03/06 23:54:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.44 2000/04/27 16:26:49 eich Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -104,11 +104,13 @@
 };
 
 typedef enum {
-    OPTION_SHADOW_FB
+    OPTION_SHADOW_FB,
+    OPTION_VGA_CLOCKS
 } GenericOpts;
 
 static OptionInfoRec GenericOptions[] = {
     { OPTION_SHADOW_FB,         "ShadowFB",     OPTV_BOOLEAN,   {0}, FALSE },
+    { OPTION_VGA_CLOCKS,        "VGAClocks",    OPTV_BOOLEAN,   {0}, FALSE },
     { -1,                       NULL,           OPTV_NONE,      {0}, FALSE }
 };
 
@@ -232,7 +234,6 @@
 GenericProbe(DriverPtr drv, int flags)
 {
     Bool foundScreen = FALSE;
-    pciVideoPtr pPci;
     int numDevSections, numUsed;
     GDevPtr *devSections = NULL;
     int *usedChips;
@@ -254,12 +255,49 @@
 					devSections,numDevSections,
 					drv, &usedChips);
 	if (numUsed > 0) {
-	  if (flags & PROBE_DETECT)
-	    foundScreen = TRUE;
-	  else {
-	    for (i = 0; i < numUsed; i++) {
-		/* Allocate a ScrnInfoRec  */
-		ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
+	    if (flags & PROBE_DETECT)
+		foundScreen = TRUE;
+	    else {
+		for (i = 0; i < numUsed; i++) {
+		    ScrnInfoPtr pScrn = NULL;
+		    /* Allocate a ScrnInfoRec  */
+		    if ((pScrn = xf86ConfigPciEntity(pScrn,0,usedChips[i],
+							   GenericPCIchipsets,NULL,
+							   NULL,NULL,NULL,NULL))){
+			pScrn->driverVersion = VGA_VERSION_CURRENT;
+			pScrn->driverName    = VGA_DRIVER_NAME;
+			pScrn->name          = VGA_NAME;
+			pScrn->Probe         = GenericProbe;
+			pScrn->PreInit       = GenericPreInit;
+			pScrn->ScreenInit    = GenericScreenInit;
+			pScrn->SwitchMode    = GenericSwitchMode;
+			pScrn->AdjustFrame   = GenericAdjustFrame;
+			pScrn->EnterVT       = GenericEnterVT;
+			pScrn->LeaveVT       = GenericLeaveVT;
+			pScrn->FreeScreen    = GenericFreeScreen;
+			pScrn->ValidMode     = GenericValidMode;
+			foundScreen = TRUE;
+		    }
+		    xfree(usedChips);
+		}
+	    }
+	}
+    }
+    
+    /* Isa Bus */
+    numUsed = xf86MatchIsaInstances(VGA_NAME,GenericChipsets,
+				     GenericISAchipsets,drv,
+				     VGAFindIsaDevice,devSections,
+				     numDevSections,&usedChips);
+    if(numUsed > 0) {
+	if (flags & PROBE_DETECT)
+	    return TRUE;
+	for (i = 0; i < numUsed; i++) {
+	    ScrnInfoPtr pScrn = NULL;
+	    if ((pScrn = xf86ConfigIsaEntity(pScrn,0,usedChips[i],
+						   GenericISAchipsets,NULL,
+						   NULL,NULL,NULL,NULL))) {
+	    
 		pScrn->driverVersion = VGA_VERSION_CURRENT;
 		pScrn->driverName    = VGA_DRIVER_NAME;
 		pScrn->name          = VGA_NAME;
@@ -273,43 +311,11 @@
 		pScrn->FreeScreen    = GenericFreeScreen;
 		pScrn->ValidMode     = GenericValidMode;
 		foundScreen = TRUE;
-		xf86ConfigActivePciEntity(pScrn,usedChips[i],GenericPCIchipsets,
-					  NULL,NULL,NULL,NULL,NULL);
 	    }
-	  }
-	  xfree(usedChips);
+	    xfree(usedChips);
 	}
     }
 
-    /* Isa Bus */
-    numUsed = xf86MatchIsaInstances(VGA_NAME,GenericChipsets,
-				     GenericISAchipsets,drv,
-				     VGAFindIsaDevice,devSections,
-				     numDevSections,&usedChips);
-    if (numUsed > 0) {
-	if (flags & PROBE_DETECT)
-	    foundScreen = TRUE;
-	else for (i = 0; i < numUsed; i++) {
-	    ScrnInfoPtr pScrn = xf86AllocateScreen(drv,0);
-	    
-	    pScrn->driverVersion = VGA_VERSION_CURRENT;
-	    pScrn->driverName    = VGA_DRIVER_NAME;
-	    pScrn->name          = VGA_NAME;
-	    pScrn->Probe         = GenericProbe;
-	    pScrn->PreInit       = GenericPreInit;
-	    pScrn->ScreenInit    = GenericScreenInit;
-	    pScrn->SwitchMode    = GenericSwitchMode;
-	    pScrn->AdjustFrame   = GenericAdjustFrame;
-	    pScrn->EnterVT       = GenericEnterVT;
-	    pScrn->LeaveVT       = GenericLeaveVT;
-	    pScrn->FreeScreen    = GenericFreeScreen;
-	    pScrn->ValidMode     = GenericValidMode;
-	    foundScreen = TRUE;
-	    xf86ConfigActiveIsaEntity(pScrn,usedChips[i],GenericISAchipsets,
-				      NULL,NULL,NULL,NULL,NULL);
-	}
-	xfree(usedChips);
-    }
     if (devSections)
 	xfree(devSections);
     return foundScreen;
@@ -594,8 +600,11 @@
         for (i = 0;  i < pScreenInfo->numClocks;  i++)
             pScreenInfo->clock[i] = pEnt->device->clock[i];
         From = X_CONFIG;
-    }
-    else
+    } else  if (xf86ReturnOptValBool(GenericOptions,OPTION_VGA_CLOCKS,FALSE)) {
+        pScreenInfo->numClocks = 2;
+        pScreenInfo->clock[0] = 25175;
+        pScreenInfo->clock[1] = 28322;
+    } else
     {
         xf86GetClocks(pScreenInfo, 4, GenericClockSelect, GenericProtect,
             GenericBlankScreen, VGAHW_GET_IOBASE() + 0x0A, 0x08, 1, 28322);
Index: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.cpp
diff -u xc/programs/Xserver/hw/xfree86/drivers/vga/vga.cpp:1.3 xc/programs/Xserver/hw/xfree86/drivers/vga/vga.cpp:1.6
--- xc/programs/Xserver/hw/xfree86/drivers/vga/vga.cpp:1.3	Thu Mar  2 17:05:47 2000
+++ xc/programs/Xserver/hw/xfree86/drivers/vga/vga.cpp	Tue Jun 13 19:13:16 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.cpp,v 1.3 2000/03/03 01:05:47 dawes Exp $ 
-.TH VGA __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.cpp,v 1.6 2000/06/14 02:13:16 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH VGA __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 vga \- Generic VGA video driver
 .SH SYNOPSIS
-.B "Section ""Device"""
-.br
-.BI "  Identifier """  devname """"
-.br
-.B  "  Driver ""vga"""
-.br
+.nf
+.B "Section \*qDevice\*q"
+.BI "  Identifier \*q"  devname \*q
+.B  "  Driver \*qvga\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B vga 
 is an XFree86 driver for generic VGA video cards.  It can drive most
@@ -35,7 +35,7 @@
 The driver auto-detects the presence of VGA-compatible hardware.  The
 .B ChipSet
 name may optionally be specified in the config file
-.B """Device"""
+.B \*qDevice\*q
 section, and will override the auto-detection:
 .PP
 .RS 4
@@ -52,7 +52,7 @@
 .B Options
 are supported:
 .TP
-.BI "Option ""ShadowFB"" """ boolean """
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  See
 shadowfb(__drivermansuffix__) for further information.  Default: off.
 
@@ -61,6 +61,6 @@
 when using those depths in a multi-head configuration where one or more
 of the other screens is operating at a different depth.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Marc La France, David Dawes, and Dirk Hohndel.
Index: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c
diff -u xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c:1.1 xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c:1.2
--- xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c:1.1	Sat Feb 12 19:06:40 2000
+++ xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c	Wed May 31 00:15:05 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */
 
 #include "X.h"
 #include "os.h"
@@ -20,3 +20,12 @@
     va_end(ap);
 }
 
+void
+ErrorF(const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    VErrorFVerb(1, format, ap);
+    va_end(ap);
+}
Index: xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh
diff -u xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh:1.7 xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh:1.13
--- xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh:1.7	Tue Feb 29 10:01:20 2000
+++ xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh	Fri Jun 30 14:44:37 2000
@@ -1,12 +1,13 @@
 #!/bin/sh
 
 #
-# $XFree86: xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh,v 1.7 2000/02/29 18:01:20 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh,v 1.13 2000/06/30 21:44:37 dawes Exp $
 #
 # Copyright © 2000 by Precision Insight, Inc.
+# Copyright © 2000 by VA Linux Systems, Inc.
 # Portions Copyright © 1996-2000 by The XFree86 Project, Inc.
 #
-# This script should be used to install XFree86 4.0.
+# This script should be used to install XFree86 4.0.1.
 #
 # Parts of this script are based on the old preinst.sh and postinst.sh
 # scripts.
@@ -16,7 +17,7 @@
 # Authors:	David Dawes <dawes@xfree86.org>
 #
 
-VERSION=4.0
+VERSION=4.0.1
 
 RUNDIR=/usr/X11R6
 ETCDIR=/etc/X11
@@ -39,6 +40,12 @@
 	$RUNDIR/lib/X11/xkb/compiled \
 	"
 
+OLDMODULES=" \
+	xie.so \
+	pex5.so \
+	glx.so \
+	"
+
 BASEDIST=" \
 	Xbin.tgz \
 	Xlib.tgz \
@@ -50,7 +57,7 @@
 
 ETCDIST="Xetc.tgz"
 
-VARDIST="Xvar.tgz"
+VARDIST=""
 
 SERVDIST=" \
 	Xxserv.tgz \
@@ -85,6 +92,8 @@
 	xserver \
 	"
 
+XKBDIR="/etc/X11/xkb"
+
 FONTDIRS=" \
 	local \
 	misc
@@ -235,8 +244,12 @@
 			;;
 		*)
 			L="-L"
+			;;
 		esac
 		;;
+	SunOS)
+		L="-h"				# /bin/sh built-in doesn't do -L
+		;;
 	OS-with-no-symlinks)	# Need to set this correctly
 		L="-b"
 		NoSymlinks=YES
@@ -417,6 +430,16 @@
 				;;
 			esac
 			;;
+		mips)
+			case "$OsLibcMajor.$OsLibcMinor" in
+			6.0)
+				DistName="Linux-mips-glibc20"
+				;;
+			*)	
+				Message="No Linux/Mips binaries for this libc version"
+				;;
+			esac
+			;;
 		*)
 			Message="No Linux binaries available for this architecture"
 			;;
@@ -557,16 +580,20 @@
 
 GetOsInfo
 
-# Make OS-specific adjustments to the distribution file lists
+# Make OS-specific adjustments
 
 case "$OsName" in
+FreeBSD|NetBSD|OpenBSD)
+	VARDIST="Xvar.tgz"
+	XKBDIR="/var/db/xkb"
+	;;
 Interactive)	# Need the correct name for this
-	VARDIST=""
 	EXTRADIST="Xbin1.tgz"
 	EXTRAOPTDIST="Xxdm.tgz"
 	;;
-LynxOS)
-	VARDIST=""
+Linux)
+	VARDIST="Xvar.tgz"
+	XKBDIR="/var/state/xkb"
 	;;
 esac
 
@@ -677,6 +704,8 @@
 	exit 1
 fi
 
+echo ""
+
 # Link extract to gnu-tar so it can also be used as a regular tar
 rm -f gnu-tar
 ln extract gnu-tar
@@ -737,6 +766,10 @@
 	echo ""
 fi
 
+if [ ! -d $RUNDIR/lib/X11/xkb ]; then
+	echo "Creating $RUNDIR/lib/X11/xkb"
+	mkdir $RUNDIR/lib/X11/xkb
+fi
 # Check for config file directories that may need to be moved.
 
 EtcToMove=
@@ -768,7 +801,7 @@
 		;;
 	esac
 	echo ""
-	if [ X"NoSymlinks" != XYES ]; then
+	if [ X"$NoSymLinks" != XYES ]; then
 		for i in $EtcToMove; do
 			echo "Moving $RUNDIR/lib/X11/$i to $ETCDIR/$i ..."
 			if [ ! -d $ETCDIR/$i ]; then
@@ -823,8 +856,20 @@
 			$TAR -C $RUNDIR/lib/X11/$i -v -x -p -U -f -
 	fi
 done
+if [ X"$XKBDIR" != X ]; then
+	rm -fr $RUNDIR/lib/X11/xkb/compiled
+	if [ X"$NoSymLinks" = XYES ]; then
+		XKBDIR=$RUNDIR/lib/X11/xkb/compiled
+	fi
+	if [ -d .etctmp/xkb ]; then
+		mkdir $XKBDIR
+		$TAR -C .etctmp/xkb -c -f - . | \
+			$TAR -C $XKBDIR -v -x -p -U -f -
+	fi
+fi
 rm -fr .etctmp
 
+echo ""
 echo "Installing the mandatory parts of the binary distribution"
 echo ""
 for i in $BASEDIST $SERVDIST; do
@@ -834,6 +879,11 @@
 	(cd $VARDIR; $EXTRACT $WDIR/$VARDIST)
 fi
 
+if [ X"$XKBDIR" != X -a X"$XKBDIR" != X"$RUNDIR/lib/X11/xkb/compiled" ]; then
+	rm -fr $RUNDIR/lib/X11/xkb/compiled
+	ln -s $XKBDIR $RUNDIR/lib/X11/xkb/compiled
+fi
+
 echo "Checking for optional components to install ..."
 for i in $OPTDIST $EXTRAOPTDIST; do
 	if [ -f $i ]; then
@@ -969,6 +1019,67 @@
 	esac
 fi
 
+if [ -f $RUNDIR/lib/libGL.so ]; then
+	existing=""
+	if [ -f /usr/lib/libGL.so ]; then
+		existing="$existing /usr/lib/libGL.so"
+	fi
+	if [ -f /usr/lib/libGL.so.1 ]; then
+		existing="$existing /usr/lib/libGL.so.1"
+	fi
+	if [ -d /usr/include/GL ]; then
+		existing="$existing /usr/include/GL"
+	fi
+	echo ""
+	echo "On some platforms (e.g., Linux), the OpenGL standard requires"
+	echo "that the GL shared library and header files be visible from the"
+	echo "standard system lib and include directories (/usr/lib and"
+	echo "/usr/include).  This can be done by installing links in those"
+	echo "directories to the files that have been installed under $RUNDIR."
+	echo ""
+	echo "NOTE: installing these links will overwrite existing files or"
+	echo "links."
+	if [ X"$existing" != X ]; then
+		echo ""
+		echo "The follwing links/files/directories already exist:"
+		echo ""
+		ls -ld $existing
+	fi
+	echo ""
+	Echo "Do you wish to have the (new) links installed (y/n)? [n] "
+	read response
+	case "$response" in
+	[yY]*)
+		rm -f /usr/lib/libGL.so
+		if [ ! -f /usr/lib/libGL.so ]; then
+			echo "Creating link from $RUNDIR/lib/libGL.so to /usr/lib/libGL.so"
+			ln -s $RUNDIR/lib/libGL.so /usr/lib/libGL.so
+		else
+			echo "Could not remove existing /usr/lib/libGL.so, so the new"
+			echo "link has not been created."
+		fi
+		rm -f /usr/lib/libGL.so.1
+		if [ ! -f /usr/lib/libGL.so.1 ]; then
+			echo "Creating link from $RUNDIR/lib/libGL.so.1 to /usr/lib/libGL.so.1"
+			ln -s $RUNDIR/lib/libGL.so.1 /usr/lib/libGL.so.1
+		else
+			echo "Could not remove existing /usr/lib/libGL.so.1, so the new"
+			echo "link has not been created."
+		fi
+		if [ -d $RUNDIR/include/GL ]; then
+			rm -f /usr/include/GL
+			if [ ! -d /usr/include/GL ]; then
+				echo "Creating link from $RUNDIR/include/GL to /usr/include/GL"
+				ln -s $RUNDIR/include/GL /usr/include/GL
+			else
+				echo "Could not remove existing /usr/include/GL, so the new"
+				echo "link has not been created."
+			fi
+		fi
+		;;
+	esac
+fi
+
 if [ -f $RUNDIR/bin/rstartd ]; then
 	echo ""
 	echo "If you are going to use rstart and $RUNDIR/bin isn't in the"
@@ -984,6 +1095,60 @@
 		ln -s $RUNDIR/bin/rstartd /usr/bin/rstartd
 		;;
 	esac
+fi
+
+# Finally, check for old 3.3.x modules that will conflict with 4.x
+if [ -d $RUNDIR/lib/modules ]; then
+	for i in $OLDMODULES; do
+		if [ -f $RUNDIR/lib/modules/$i ]; then
+			ModList="$ModList $i"
+		fi
+	done
+	if [ X"$ModList" != X ]; then
+		echo ""
+		echo "The following 3.3.x X server modules were found in"
+		echo "$RUNDIR/lib/modules, and they may cause problems when running"
+		echo "$VERSION:"
+		echo ""
+		echo "  $ModList"
+		echo ""
+		echo "Do you want them moved to $RUNDIR/lib/modules/old?"
+		echo "Note: that if you want to use them with 3.3.x again, you'll"
+		Echo "need to move them back manually. (y/n) [n] "
+		read response
+		case "$response" in
+		[yY]*)
+			if [ ! -d $RUNDIR/lib/modules/old ]; then
+				echo ""
+				echo "Creating $RUNDIR/lib/modules/old"
+				mkdir $RUNDIR/lib/modules/old
+			else
+				echo ""
+			fi
+			if [ -d $RUNDIR/lib/modules/old ]; then
+				for i in $ModList; do
+					echo "Moving $i to $RUNDIR/lib/modules/old"
+					mv $RUNDIR/lib/modules/$i $RUNDIR/lib/modules/old/$i
+				done
+			else
+				echo "Failed to create directory $RUNDIR/lib/modules/old"
+			fi
+			;;
+		*)
+			echo ""
+			echo "Make sure that you rename, move or delete the old modules"
+			echo "before running $VERSION."
+		esac
+	fi
+	# Some distributions have old codeconv modules
+	if [ -d $RUNDIR/lib/modules/codeconv ]; then
+		if [ -f $RUNDIR/lib/modules/codeconv/ISO8859_1.so ]; then
+			echo ""
+			echo "Warning: it looks like there are some old *.so modules"
+			echo "in $RUNDIR/lib/modules/codeconv.  You may need to rename,"
+			echo "move or delete them if you use the xtt font module."
+		fi
+	fi
 fi
 
 echo ""
Index: xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar
diff -u xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar:3.11 xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar:3.12
--- xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar:3.11	Mon Dec 13 18:40:14 1999
+++ xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar	Thu May 11 11:14:36 2000
@@ -1,6 +1,6 @@
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
-# create directories; files and directories will be owned by you and
+# create directories;  files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
@@ -28,7 +28,7 @@
 #	xf86test/Makefile
 #	xf86test/xf86test.c
 # 
-# $XFree86: xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar,v 3.11 1999/12/14 02:40:14 robin Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar,v 3.12 2000/05/11 18:14:36 tsi Exp $
 #
 echo x - COPYRIGHT
 sed 's/^X//' >COPYRIGHT << 'END-of-COPYRIGHT'
@@ -125,7 +125,7 @@
 X-----------
 X
 XThis module was originally written to help work around the security
-Xfeature of NetBSD that prevents read/write access to /dev/mem. It also
+Xfeature of NetBSD that prevents read/write access to /dev/mem.  It also
 Xprovide Pentium II and AMD K6 MTRR control in order to control
 Xwrite-combining to the framebuffer memory.
 X
@@ -133,24 +133,24 @@
 Xmemory (especially with VLB and PCI cards) and even requires it for
 Xthe most recent PCI or AGP video boards.
 X
-XThis driver works like the standard /dev/mem driver. It just allows
+XThis driver works like the standard /dev/mem driver.  It just allows
 Xmapping of the VGA framebuffer and BIOS even if kernel security level
 Xis > 0.  The driver only implements the open(), close(), ioctl() and
-Xmmap()  calls. In order not to defeat kernel security, only one open()
-Xat a  time is allowed and only a process with effective user id of 0 can
-Xperform it. So while you're running XFree86, no other process will be
+Xmmap() calls.  In order not to defeat kernel security, only one open()
+Xat a time is allowed and only a process with effective user id of 0 can
+Xperform it.  So while you're running XFree86, no other process will be
 Xallowed to open /dev/xf86.
 X
 XThis work is originally heavily inspired from the Solaris x86 aperture
 Xdriver by Doug Anson (danson@lgc.com) and David Holland
-X(davidh@use.com). MTRR support is derived from FreeBSD. 
+X(davidh@use.com).  MTRR support is derived from FreeBSD. 
 X
 X
 XInstallation:
 X-------------
 X
 Xo Optionnally, edit Makefile.inc to set the APDIR variable to the
-X  directory where you want to install the aperture driver. If you change 
+X  directory where you want to install the aperture driver.  If you change 
 X  this, and want to rebuild XFree86 from source, also define
 X  NetBSDApertureDir in xc/config/cf/host.def before rebuilding it. 
 X
@@ -170,7 +170,7 @@
 X
 Xo Reboot your system.
 X
-Xo Test the module by running 'aptest' as root. The outpout will look like:
+Xo Test the module by running 'aptest' as root.  The output will look like:
 X
 X  # ./aptest
 X  NOTICE: VGA mapped [0xa0000 ,size=4096) to addr=0x10073000...
@@ -179,7 +179,7 @@
 X  UNMAPPING [0xa0000 ,size=4096) to addr=0x10073000... and closing...DONE.
 X  Exiting successful...
 X
-Xo Start the XFree86 server. All XFree86 versions post 3.9.16d have support 
+Xo Start the XFree86 server.  All XFree86 versions post 3.9.16d have support 
 X  for the aperture driver enabled.
 X
 XBug reports, comments, suggestions can be sent to <herrb@XFree86.Org>
@@ -775,7 +775,6 @@
 X#include "xf86_reg.h"
 X#include "memrange.h"
 X
-X#define ISA_START 0xA0000
 X#define ISA_END   0xFFFFF
 X#ifdef PC98 
 X#define HOLE16M_START	0xF00000
@@ -842,7 +841,7 @@
 X	printf("xf86mmap: addr 0x%x\n", offset);
 X#endif
 X	if  ((minor(dev) == 0) 
-X	     && ((offset >= ISA_START && offset <= ISA_END )
+X	     && ((offset <= ISA_END )
 X		 || (unsigned)offset > (unsigned)ctob(physmem)
 X#ifdef PC98
 X		 || ((unsigned)offset >=HOLE16M_START
@@ -1971,8 +1970,8 @@
 X
 XMOD_DEV("xf86", LM_DT_CHAR, -1, &newdev)
 X
-Xchar *xf86_major_version = "1";
-Xchar *xf86_minor_version = "99b";
+Xchar *xf86_major_version = "2";
+Xchar *xf86_minor_version = "0";
 X
 Xstatic int xf86action __P((struct lkm_table *lktmp, int cmd));
 X
@@ -2041,7 +2040,7 @@
 X/*
 X * Copyright (C) 1999, The XFree86 Project Inc.
 X *
-X * $XFree86: xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar,v 3.11 1999/12/14 02:40:14 robin Exp $
+X * $XFree86: xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar,v 3.12 2000/05/11 18:14:36 tsi Exp $
 X */
 X#ifndef _XF86_MOD_H
 X#define _XF86_MOD_H
@@ -2104,6 +2103,7 @@
 X#define MTRR_N16K		16
 X#define MTRR_N4K		64
 X
+X#if defined(__NetBSD__) && (__NetBSD_Version__ < 10424000)
 X/*
 X * XXX - These belong to cpufunc.h
 X */
@@ -2127,6 +2127,7 @@
 X{
 X	__asm __volatile(".byte 0x0f, 0x30" : : "A" (newval), "c" (msr));
 X}
+X#endif /* __NetBSD_Version__ */
 X
 X#ifndef M_MEMDESC
 X#define M_MEMDESC M_TEMP		/* XXX */
Index: xc/programs/Xserver/hw/xfree86/etc/scanpci.c
diff -u xc/programs/Xserver/hw/xfree86/etc/scanpci.c:3.76 xc/programs/Xserver/hw/xfree86/etc/scanpci.c:3.80
--- xc/programs/Xserver/hw/xfree86/etc/scanpci.c:3.76	Sat Feb 12 23:39:01 2000
+++ xc/programs/Xserver/hw/xfree86/etc/scanpci.c	Tue Jun 20 12:38:04 2000
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.76 2000/02/13 07:39:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.80 2000/06/20 19:38:04 eich Exp $ */
 
 #include "X.h"
 #include "os.h"
@@ -116,10 +116,11 @@
 void
 usage(void)
 {
-    printf("Usage: scanpci [-v12fV]\n");
+    printf("Usage: scanpci [-v12OfV]\n");
     printf("           -v print config space\n");
     printf("           -1 config type 1\n");
     printf("           -2 config type 2\n");
+    printf("           -O use OS config support\n");    
     printf("           -f force config type\n");
     printf("           -V set message verbosity level\n");
 }
@@ -135,7 +136,7 @@
     
     xf86Info.pciFlags = PCIProbe1;
 
-    while ((c = getopt(argc, argv, "?v12fV:")) != -1) 
+    while ((c = getopt(argc, argv, "?v12OfV:")) != -1) 
 	switch(c) {
 	case 'v':
 	    Verbose = 1;
@@ -146,6 +147,9 @@
 	case '2':
 	    xf86Info.pciFlags = PCIProbe2;
 	    break;
+	case 'O':
+	    xf86Info.pciFlags = PCIOsConfig;
+	    break;
 	case 'f':
 	    force = 1;
 	    break;
@@ -190,39 +194,38 @@
 identify_card(pciConfigPtr pcr, int verbose)
 {
 
-    int i = 0; 
+    int i, j; 
     int foundit = 0;
+    int foundvendor = 0;
 
     SymTabRec *pvnd;
     pciVendorDeviceInfo *pvd;
     pciVendorDevFuncInfo *vdf = vendorDeviceFuncInfo;
-    pciVendorCardInfo *dummy;
+    pciVendorCardInfo *pvc;
     
-    xf86SetupScanPci(&pvnd,&pvd,&dummy);
+    xf86SetupScanPci(&pvnd,&pvd,&pvc);
     
     printf("\npci bus 0x%x cardnum 0x%02x function 0x%04x: vendor 0x%04x device 0x%04x\n",
 	   pcr->busnum, pcr->devnum, pcr->funcnum,
 	   pcr->pci_vendor, pcr->pci_device);
     
-    while (pvnd[i].name != (char *)NULL)
-	if (pvnd[i++].token == pcr->pci_vendor)
-	    printf(" %s ", pvnd[i-1].name);
+    for (i = 0;  pvnd[i].name;  i++) {
+	if (pvnd[i].token == pcr->pci_vendor) {
+	    printf(" %s ", pvnd[i].name);
+	    break;
+	}
+    }
 
-    i = 0;
-    
-    while (pvd[i].VendorID) {
-	int j = 0;
-	while (pvd[i].Device[j].DeviceName != (char *)NULL) {
+    for (i = 0; pvd[i].VendorID && pvd[i].VendorID != pcr->pci_vendor; i++)
+	;
+    if (pvd[i].VendorID) {
+	for (j = 0;  pvd[i].Device[j].DeviceName;  j++) {
 	    if (pvd[i].Device[j].DeviceID == pcr->pci_device) {
 		printf("%s", pvd[i].Device[j].DeviceName);
 		foundit = 1;
 		break;
 	    }
-	    j++;
 	}
-	if (foundit)
-	    break;
-	i++;
     }
 
     if (!foundit)
@@ -230,26 +233,56 @@
     else {
 	printf("\n");
 	if (verbose) {
-	    while(vdf[i].Vendor) {
+	    for (i = 0;  vdf[i].Vendor;  i++) {
 		if (vdf[i].Vendor == pcr->pci_vendor) {
-		    int j = 0;
-		    while(vdf[i].Device[j].DeviceID) {
+		    for (j = 0;  vdf[i].Device[j].DeviceID;  j++) {
 			if (vdf[i].Device[j].DeviceID == pcr->pci_device) {
 			    vdf[i].Device[j].func(pcr);
 			    return;
 			}
-			j++;
 		    }
 		    break;
 		}
-		i++;
 	    }
 	}
     }
 
-    if (verbose) {
-	printf(" CardVendor 0x%04x card 0x%04x\n",
+    if (verbose && !(pcr->pci_header_type & 0x7f) &&
+	(pcr->pci_subsys_vendor != 0 || pcr->pci_subsys_card != 0)) {
+        foundit = 0;
+        foundvendor = 0;
+	printf(" CardVendor 0x%04x card 0x%04x",
 	       pcr->pci_subsys_vendor, pcr->pci_subsys_card);
+	for (i = 0;  pvnd[i].name;  i++) {
+	    if (pvnd[i].token == pcr->pci_subsys_vendor) {
+	        printf(" (%s", pvnd[i].name);
+		foundvendor = 1;
+	        break;
+	    }
+        }
+
+        for (i = 0; pvc[i].VendorID && pvc[i].VendorID != pcr->pci_subsys_vendor; i++)
+	    ;
+        if (pvc[i].VendorID) {
+	    for (j = 0;  pvc[i].Device[j].CardName;  j++) {
+	        if (pvc[i].Device[j].SubsystemID == pcr->pci_subsys_card) {
+		    printf(" %s)", pvc[i].Device[j].CardName);
+		    foundit = 1;
+		    break;
+	        }
+	    }
+        }
+        if (!foundit) {
+	    if (!foundvendor)
+		printf(" (");
+	    else
+		printf(", ");
+	    printf("Card unknown)");
+	}
+	printf("\n");
+    }
+
+    if (verbose) {
 	if (pcr->pci_status_command)
 	    printf("  STATUS    0x%04x  COMMAND 0x%04x\n",
 		   pcr->pci_status, pcr->pci_command);
@@ -283,41 +316,53 @@
 	       pcr->pci_bist, pcr->pci_header_type, pcr->pci_latency_timer,
 	       pcr->pci_cache_line_size);
     if (pcr->pci_base0)
-	printf("  BASE0     0x%08x  addr 0x%08x  %s\n",
+	printf("  BASE0     0x%08x  addr 0x%08x  %s%s%s\n",
 	      (int)pcr->pci_base0,(int)(pcr->pci_base0
 					& (pcr->pci_base0 & 0x1 ?
 					   0xFFFFFFFC : 0xFFFFFFF0)), 
-	       pcr->pci_base0 & 0x1 ? "I/O" : "MEM");
+	       pcr->pci_base0 & 0x1 ? "I/O" : "MEM",
+	       ((pcr->pci_base0 & 0x9) == 0x8) ? " PREFETCHABLE" :"",
+	       ((pcr->pci_base0 & 0x7) == 0x4) ? " 64BIT" : "");
     if (pcr->pci_base1)
-	printf("  BASE1     0x%08x  addr 0x%08x  %s\n",
+	printf("  BASE1     0x%08x  addr 0x%08x  %s%s%s\n",
 	       (int)pcr->pci_base1, (int)(pcr->pci_base1
 					  & (pcr->pci_base1 & 0x1 ?
 					     0xFFFFFFFC : 0xFFFFFFF0)), 
-	       pcr->pci_base1 & 0x1 ? "I/O" : "MEM");
+	       pcr->pci_base1 & 0x1 ? "I/O" : "MEM",
+	       ((pcr->pci_base1 & 0x9) == 0x8) ? " PREFETCHABLE" :"",
+	       ((pcr->pci_base1 & 0x7) == 0x4) ? " 64BIT" : "");
     if (pcr->pci_base2)
-	printf("  BASE2     0x%08x  addr 0x%08x  %s\n",
+	printf("  BASE2     0x%08x  addr 0x%08x  %s%s%s\n",
 	       (int)pcr->pci_base2, (int)(pcr->pci_base2
 					  & (pcr->pci_base2 & 0x1 ?
 					     0xFFFFFFFC : 0xFFFFFFF0)), 
-	       pcr->pci_base2 & 0x1 ? "I/O" : "MEM");
+	       pcr->pci_base2 & 0x1 ? "I/O" : "MEM",
+	       ((pcr->pci_base2 & 0x9) == 0x8) ? " PREFETCHABLE" :"",
+	       ((pcr->pci_base2 & 0x7) == 0x4) ? " 64BIT" : "");
     if (pcr->pci_base3)
-	printf("  BASE3     0x%08x  addr 0x%08x  %s\n",
+	printf("  BASE3     0x%08x  addr 0x%08x  %s%s%s\n",
 	       (int)pcr->pci_base3, (int)(pcr->pci_base3
 					  & (pcr->pci_base3 & 0x1 ?
 					     0xFFFFFFFC : 0xFFFFFFF0)), 
-	       pcr->pci_base3 & 0x1 ? "I/O" : "MEM");
+	       pcr->pci_base3 & 0x1 ? "I/O" : "MEM",
+	       ((pcr->pci_base3 & 0x9) == 0x8) ? " PREFETCHABLE" :"",
+	       ((pcr->pci_base3 & 0x7) == 0x4) ? " 64BIT" : "");
     if (pcr->pci_base4)
-	printf("  BASE4     0x%08x  addr 0x%08x  %s\n",
+	printf("  BASE4     0x%08x  addr 0x%08x  %s%s%s\n",
 	       (int)pcr->pci_base4, (int)(pcr->pci_base4
 					  & (pcr->pci_base4 & 0x1 ?
 					   0xFFFFFFFC : 0xFFFFFFF0)), 
-	       pcr->pci_base4 & 0x1 ? "I/O" : "MEM");
+	       pcr->pci_base4 & 0x1 ? "I/O" : "MEM",
+	       ((pcr->pci_base4 & 0x9) == 0x8) ? " PREFETCHABLE" :"",
+	       ((pcr->pci_base4 & 0x7) == 0x4) ? " 64BIT" : "");
     if (pcr->pci_base5)
-	printf("  BASE5     0x%08x  addr 0x%08x  %s\n",
+	printf("  BASE5     0x%08x  addr 0x%08x  %s%s%s\n",
 	       (int)pcr->pci_base5, (int)(pcr->pci_base5
 					  & (pcr->pci_base5 & 0x1 ?
 					     0xFFFFFFFC : 0xFFFFFFF0)), 
-	       pcr->pci_base5 & 0x1 ? "I/O" : "MEM");
+	       pcr->pci_base5 & 0x1 ? "I/O" : "MEM",
+	       ((pcr->pci_base5 & 0x9) == 0x8) ? " PREFETCHABLE" :"",
+	       ((pcr->pci_base5 & 0x7) == 0x4) ? " 64BIT" : "");
     if (pcr->pci_baserom)
 	printf("  BASEROM   0x%08x  addr 0x%08x  %sdecode-enabled\n",
 	       (int)pcr->pci_baserom, (int)(pcr->pci_baserom & 0xFFFF8000),
@@ -379,6 +424,8 @@
 {
     CARD32 sparse_io = 0;
 
+    printf(" CardVendor 0x%04x card 0x%04x\n",
+	pcr->pci_subsys_vendor, pcr->pci_subsys_card);
     if (pcr->pci_status_command)
         printf("  STATUS    0x%04x  COMMAND 0x%04x\n",
             pcr->pci_status, pcr->pci_command);
@@ -430,6 +477,8 @@
 void
 print_i128(pciConfigPtr pcr)
 {
+    printf(" CardVendor 0x%04x card 0x%04x\n",
+	pcr->pci_subsys_vendor, pcr->pci_subsys_card);
     if (pcr->pci_status_command)
         printf("  STATUS    0x%04x  COMMAND 0x%04x\n",
             pcr->pci_status, pcr->pci_command);
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/set-list:1.1	Mon May 26 21:00:27 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/set-list	Sat Jul  1 20:43:02 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1.gz
-man/man1/xmseconfig.1.gz
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/set-list:1.1	Tue Feb 22 08:42:35 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/set-list	Sat Jul  1 20:43:03 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1.gz
-man/man1/xmseconfig.1.gz
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/set-list:1.1	Mon May 26 21:00:34 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/set-list	Sat Jul  1 20:43:03 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1x.Z
-man/man1/xmseconfig.1x.Z
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/set-list:1.1	Mon May 26 21:00:39 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/set-list	Sat Jul  1 20:43:03 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1x
-man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/host.def
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/host.def:1.5 xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/host.def:1.6
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/host.def:1.5	Tue Mar  7 06:47:33 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/host.def	Fri Mar 17 07:59:46 2000
@@ -1,14 +1,18 @@
 /*
  * Host.def for building Linux/ix86 bindists
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/host.def,v 1.5 2000/03/07 14:47:33 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/host.def,v 1.6 2000/03/17 15:59:46 dawes Exp $
  */
 
 #define InstallEmptyHostDef
 
 
-/* Need to have glide 2 and glide 3 installed */
+/* Need to have glide 2 and glide 3 installed, where available */
 
 #define HasGlide2 YES
+#if LinuxCLibMajorVersion > 5
 #define HasGlide3 YES
+#endif
+
+#define BuildXF86DRI YES
 
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/set-list:1.1	Mon May 26 21:00:43 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/set-list	Sat Jul  1 20:43:04 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1x
-man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/set-list:1.1	Sat Feb 26 17:11:48 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/set-list	Sat Jul  1 20:43:04 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1x
-man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-excl
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-excl:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-excl	Fri Jun 23 15:42:03 2000
@@ -0,0 +1,10 @@
+bin/XF86_*
+bin/XF98_*
+bin/XF86Setup
+bin/Xnest
+bin/Xprt
+bin/Xvfb
+bin/X
+bin/xfs
+bin/xmseconfig
+bin/XFree86
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-list	Fri Jun 23 15:42:03 2000
@@ -0,0 +1,60 @@
+bin
+lib/libGL.so.1.2
+lib/libGL.so.1
+lib/libGL.so
+lib/libICE.so.6.3
+lib/libICE.so.6
+lib/libICE.so
+lib/libPEX5.so.6.0
+lib/libPEX5.so.6
+lib/libPEX5.so
+lib/libSM.so.6.0
+lib/libSM.so.6
+lib/libSM.so
+lib/libX11.so.6.1
+lib/libX11.so.6
+lib/libX11.so
+lib/libXIE.so.6.0
+lib/libXIE.so.6
+lib/libXIE.so
+lib/libXaw.so.6.1
+lib/libXaw.so.6
+lib/libXaw.so.7.0
+lib/libXaw.so.7
+lib/libXaw.so
+lib/libXext.so.6.4
+lib/libXext.so.6
+lib/libXext.so
+lib/libXfont.so.1.3
+lib/libXfont.so.1
+lib/libXfont.so
+lib/libXi.so.6.0
+lib/libXi.so.6
+lib/libXi.so
+lib/libXmu.so.6.1
+lib/libXmu.so.6
+lib/libXmu.so
+lib/libXp.so.6.2
+lib/libXp.so.6
+lib/libXp.so
+lib/libXpm.so.4.11
+lib/libXpm.so.4
+lib/libXpm.so
+lib/libXt.so.6.0
+lib/libXt.so.6
+lib/libXt.so
+lib/libXtst.so.6.1
+lib/libXtst.so.6
+lib/libXtst.so
+lib/libdps.so.1.0
+lib/libdps.so.1
+lib/libdps.so
+lib/libdpstk.so.1.0
+lib/libdpstk.so.1
+lib/libdpstk.so
+lib/libpsres.so.1.0
+lib/libpsres.so.1
+lib/libpsres.so
+lib/libxrx.so.6.3
+lib/libxrx.so.6
+lib/libxrx.so
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/dir
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/dir:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/dir	Fri Jun 23 15:42:03 2000
@@ -0,0 +1 @@
+usr/X11R6
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-dir
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-dir:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-dir	Fri Jun 23 15:42:03 2000
@@ -0,0 +1 @@
+etc/X11
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-list	Fri Jun 23 15:42:03 2000
@@ -0,0 +1 @@
+.
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/fsrv-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/fsrv-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/fsrv-list	Fri Jun 23 15:42:03 2000
@@ -0,0 +1,2 @@
+bin/xfs
+man/man1/xfs.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/lib-excl
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/lib-excl:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/lib-excl	Fri Jun 23 15:42:04 2000
@@ -0,0 +1,14 @@
+lib/X11/XF86Setup
+lib/X11/app-defaults
+lib/X11/config
+lib/X11/doc
+lib/X11/fonts
+lib/X11/fs
+lib/X11/lbxproxy
+lib/X11/proxymngr
+lib/X11/rstart
+lib/X11/twm
+lib/X11/xdm
+lib/X11/xinit
+lib/X11/xsm
+lib/X11/xserver
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/lib-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/lib-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/lib-list	Fri Jun 23 15:42:04 2000
@@ -0,0 +1,2 @@
+lib/X11
+include/X11/bitmaps
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/man-excl
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/man-excl:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/man-excl	Fri Jun 23 15:42:04 2000
@@ -0,0 +1,3 @@
+man/man1/XF86Setup.1x
+man/man1/xfs.1x
+man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/man-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/man-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/man-list	Fri Jun 23 15:42:04 2000
@@ -0,0 +1 @@
+man
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/mod-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/mod-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/mod-list	Fri Jun 23 15:42:04 2000
@@ -0,0 +1 @@
+lib/modules
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/nest-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/nest-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/nest-list	Fri Jun 23 15:42:04 2000
@@ -0,0 +1 @@
+bin/Xnest
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prog-excl
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prog-excl:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prog-excl	Fri Jun 23 15:42:04 2000
@@ -0,0 +1,5 @@
+lib/Server
+lib/X11
+lib/lib*.so*
+lib/modules
+include/X11/bitmaps
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prog-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prog-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prog-list	Fri Jun 23 15:42:05 2000
@@ -0,0 +1,3 @@
+lib
+include
+lib/X11/config
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prt-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prt-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/prt-list	Fri Jun 23 15:42:05 2000
@@ -0,0 +1 @@
+bin/Xprt
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/set-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/set-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/set-list	Fri Jun 23 15:42:05 2000
@@ -0,0 +1,5 @@
+bin/XF86Setup
+bin/xmseconfig
+lib/X11/XF86Setup
+man/man1/XF86Setup.1x
+man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-dir
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-dir:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-dir	Fri Jun 23 15:42:05 2000
@@ -0,0 +1 @@
+var
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-list	Fri Jun 23 15:42:05 2000
@@ -0,0 +1 @@
+state
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/vfb-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/vfb-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/vfb-list	Fri Jun 23 15:42:05 2000
@@ -0,0 +1 @@
+bin/Xvfb
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/xserv-list
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/xserv-list:1.1
--- /dev/null	Sat Jul  1 20:43:04 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/xserv-list	Fri Jun 23 15:42:05 2000
@@ -0,0 +1,2 @@
+bin/XFree86
+bin/X
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/set-list:1.1	Sat Feb 26 17:15:14 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/set-list	Sat Jul  1 20:43:05 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1x
-man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/set-list:1.2 xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/set-list:1.2	Thu Jul 10 01:17:36 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/set-list	Sat Jul  1 20:43:05 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/cat1/XF86Setup.1
-man/cat1/xmseconfig.1
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/set-list:1.2 xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/set-list:1.2	Mon Feb 28 19:09:23 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/set-list	Sat Jul  1 20:43:05 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/cat1/XF86Setup.0
-man/cat1/xmseconfig.0
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/set-list:1.2 xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/set-list:1.2	Tue Aug 26 03:53:25 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/set-list	Sat Jul  1 20:43:06 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/cat1/XF86Setup.0
-man/cat1/xmseconfig.0
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/set-list:1.1	Mon May 26 21:01:03 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/set-list	Sat Jul  1 20:43:07 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1x
-man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-dir
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-dir:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-dir:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-dir:1.1	Sat Feb 26 17:34:13 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-dir	Sat Jul  1 20:43:07 2000
@@ -1 +0,0 @@
-var
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-list:1.1	Sat Feb 26 17:34:13 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/var-list	Sat Jul  1 20:43:07 2000
@@ -1 +0,0 @@
-db
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/set-list:1.1	Mon May 26 21:01:09 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/set-list	Sat Jul  1 20:43:08 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1x
-man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-dir
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-dir:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-dir:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-dir:1.1	Sat Feb 26 17:36:40 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-dir	Sat Jul  1 20:43:08 2000
@@ -1 +0,0 @@
-var
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-list:1.1	Sat Feb 26 17:36:40 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/var-list	Sat Jul  1 20:43:08 2000
@@ -1 +0,0 @@
-db
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/set-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/set-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/set-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/set-list:1.1	Mon May 26 21:01:16 1997
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/set-list	Sat Jul  1 20:43:08 2000
@@ -1,5 +0,0 @@
-bin/XF86Setup
-bin/xmseconfig
-lib/X11/XF86Setup
-man/man1/XF86Setup.1x
-man/man1/xmseconfig.1x
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-dir
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-dir:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-dir:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-dir:1.1	Sat Feb 26 17:38:36 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-dir	Sat Jul  1 20:43:08 2000
@@ -1 +0,0 @@
-var
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-list
diff -u xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-list:1.1 xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-list:removed
--- xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-list:1.1	Sat Feb 26 17:38:36 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/var-list	Sat Jul  1 20:43:08 2000
@@ -1 +0,0 @@
-db
Index: xc/programs/Xserver/hw/xfree86/etc/bindist/os2/host.def
diff -u /dev/null xc/programs/Xserver/hw/xfree86/etc/bindist/os2/host.def:1.1
--- /dev/null	Sat Jul  1 20:43:08 2000
+++ xc/programs/Xserver/hw/xfree86/etc/bindist/os2/host.def	Thu Apr  6 08:35:04 2000
@@ -0,0 +1,7 @@
+#define NormalLibFont YES 
+#define SharedLibFont NO
+#define BuildDPSLibrary YES
+#define XprtServer NO
+#define XnestServer NO
+#define XVirtualFramebufferServer NO
+
Index: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c
diff -u xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c:1.11 xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c:1.15
--- xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c:1.11	Thu Jan 20 18:30:02 2000
+++ xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c	Fri Jun 30 18:40:46 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.11 2000/01/21 02:30:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.15 2000/07/01 01:40:46 martin Exp $ */
 
 /* all driver need this */
 #include "xf86.h"
@@ -266,13 +266,15 @@
 	{ FB_ACCEL_ATI_RAGE128,         PCI_VENDOR_ATI,    PCI_CHIP_RAGE128RK    },
 	{ FB_ACCEL_ATI_RAGE128,         PCI_VENDOR_ATI,    PCI_CHIP_RAGE128RL    },
 	{ FB_ACCEL_ATI_RAGE128,         PCI_VENDOR_ATI,    PCI_CHIP_RAGE128PF    },
+	{ FB_ACCEL_ATI_RAGE128,         PCI_VENDOR_ATI,    PCI_CHIP_RAGE128LE    },
+	{ FB_ACCEL_ATI_RAGE128,         PCI_VENDOR_ATI,    PCI_CHIP_RAGE128LF    },
 	{ FB_ACCEL_3DFX_BANSHEE,        PCI_VENDOR_3DFX,   PCI_CHIP_VOODOO3      },
 };
 #define FB2PCICOUNT (sizeof(fb2pci_map)/sizeof(struct fb2pci_entry))
 
 /* try to find the framebuffer device for a given PCI device */
 static int
-fbdev_open_pci(pciVideoPtr pPci)
+fbdev_open_pci(pciVideoPtr pPci, char **namep)
 {
 	struct	fb_fix_screeninfo fix;
 	char	filename[16];
@@ -299,45 +301,60 @@
 			close(fd);
 			continue;
 		}
+		if (namep) {
+		    *namep = xnfalloc(16);
+		    xf86strncpy(*namep,fix.id,16);
+		}
 		return fd;
 	}
+	if (namep)
+	    *namep = NULL;
 	return -1;
 }
 
 static int
-fbdev_open(char *dev)
+fbdev_open(char *dev, char** namep)
 {
 	struct fb_con2fbmap c2m;
+	struct	fb_fix_screeninfo fix;
 	char   fbdev[16];
 	int    fd;
 
 	/* try argument (from XF86Config) first */
-	if (NULL != dev)
-		return open(dev,O_RDWR,0);
-
-	/* second: environment variable */
-	dev = getenv("FRAMEBUFFER");
-	if (NULL != dev)
-		return open(dev,O_RDWR,0);
-
-	/* last try: default device */
-	if (-1 == (fd = open("/dev/fb0",O_RDWR,0)))
+	if ((NULL == dev) || ((fd = open(dev,O_RDWR,0)) == -1)) {
+	    /* second: environment variable */
+	    dev = getenv("FRAMEBUFFER");
+	    if ((NULL == dev) || ((fd = open(dev,O_RDWR,0)) == -1)) {
+		/* last try: default device */
+		if (-1 == (fd = open("/dev/fb0",O_RDWR,0)))
+		    return -1;
+	    }
+	}
+	if (namep) {
+	    if (-1 == ioctl(fd,FBIOGET_FSCREENINFO,(void*)(&fix))) {
+		*namep = NULL;
 		return -1;
-
+	    } else {
+		if (namep) {
+		    *namep = xnfalloc(16);
+		    xf86strncpy(*namep,fix.id,16);
+		}
+	    }
+	}
 	return fd;
 }
 
 /* -------------------------------------------------------------------- */
 
 Bool
-fbdevHWProbe(pciVideoPtr pPci, char *device)
+fbdevHWProbe(pciVideoPtr pPci, char *device,char **namep)
 {
 	int fd;
 
 	if (pPci)
-		fd = fbdev_open_pci(pPci);
+		fd = fbdev_open_pci(pPci,namep);
 	else
-		fd = fbdev_open(device);
+		fd = fbdev_open(device,namep);
 
 	if (-1 == fd)
 		return FALSE;
@@ -357,9 +374,9 @@
 
 	/* open device */
 	if (pPci)
-		fPtr->fd = fbdev_open_pci(pPci);
+		fPtr->fd = fbdev_open_pci(pPci,NULL);
 	else
-		fPtr->fd = fbdev_open(device);
+		fPtr->fd = fbdev_open(device,NULL);
 	if (-1 == fPtr->fd)
 		return FALSE;
 
Index: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.cpp
diff -u xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.cpp:1.1 xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.cpp:1.2
--- xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.cpp:1.1	Sun Apr  4 00:46:22 1999
+++ xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.cpp	Tue Jun 13 19:13:16 2000
@@ -1,5 +1,5 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.cpp,v 1.1 1999/04/04 08:46:22 dawes Exp $ 
-.TH FBDEVHW __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.cpp,v 1.2 2000/06/14 02:13:16 dawes Exp $ 
+.TH FBDEVHW __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 fbdevhw \- os-specific submodule for framebuffer device access
 .SH DESCRIPTION
Index: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h
diff -u xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h:1.5 xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h:1.6
--- xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h:1.5	Sat Jul 17 20:27:01 1999
+++ xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h	Mon Apr 17 09:30:10 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.5 1999/07/18 03:27:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.6 2000/04/17 16:30:10 eich Exp $ */
 
 #define FBDEVHW_PACKED_PIXELS		0	/* Packed Pixels	*/
 #define FBDEVHW_PLANES			1	/* Non interleaved planes */
@@ -9,7 +9,7 @@
 Bool  fbdevHWGetRec(ScrnInfoPtr pScrn);
 void  fbdevHWFreeRec(ScrnInfoPtr pScrn);
 
-Bool  fbdevHWProbe(pciVideoPtr pPci, char *device);
+Bool  fbdevHWProbe(pciVideoPtr pPci, char *device, char **namep);
 Bool  fbdevHWInit(ScrnInfoPtr pScrn, pciVideoPtr pPci, char *device);
 
 char* fbdevHWGetName(ScrnInfoPtr pScrn);
Index: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c
diff -u xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c:1.6 xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c:1.7
--- xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c:1.6	Sun Jul 18 01:14:33 1999
+++ xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c	Thu May 18 09:29:58 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.6 1999/07/18 08:14:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.7 2000/05/18 16:29:58 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86cmap.h"
@@ -20,7 +20,7 @@
 
 
 Bool
-fbdevHWProbe(pciVideoPtr pPci, char *device)
+fbdevHWProbe(pciVideoPtr pPci, char *device, char **namep)
 {
 	return FALSE;
 }
Index: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c
diff -u xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c:1.6 xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c:1.7
--- xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c:1.6	Sat Jun 12 08:37:08 1999
+++ xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c	Mon Jun 12 19:28:35 2000
@@ -6,7 +6,7 @@
  *      (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.6 1999/06/12 15:37:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.7 2000/06/13 02:28:35 dawes Exp $ */
 
 #if 1
 #include "misc.h"
@@ -38,17 +38,25 @@
 #define I2C_TIMEOUT(x)	/* (x) */ /* Report timeouts */
 #define I2C_TRACE(x)	/* (x) */ /* Report progress */
 
+/* Set which OSs have bad gettimeofday resolution. */
+#if defined(SVR4) && !defined(sun)
+#define BAD_GETTIMEOFDAY_RESOLUTION
+#endif
+
+
 /* This is the default I2CUDelay function if not supplied by the driver.
  * High level I2C interfaces implementing the bus protocol in hardware
  * should supply this function too.
  *
  * Delay execution at least usec microseconds.
  * All values 0 to 1e6 inclusive must be expected.
- *
+ */
+
+#ifdef BAD_GETTIMEOFDAY_RESOLUTION
+/*
  * This is temporary until a better, portable
  * way is found. Adjust bogo_usec to match CPU speed.
  */
-
 static int bogo_usec = 500;
 
 static void
@@ -60,6 +68,29 @@
 	for (i = usec * bogo_usec; i > 0; i--)
 	    /* (perhaps hw delay action) */;
 }
+#else
+static void
+I2CUDelay(I2CBusPtr b, int usec)
+{
+  long b_secs, b_usecs;
+  long a_secs, a_usecs;
+  long d_secs, d_usecs;
+  long diff;
+
+  if (usec > 0) {
+    xf86getsecs(&b_secs, &b_usecs);
+    do {
+      /* It would be nice to use {xf86}usleep, 
+       * but usleep (1) takes >10000 usec !
+       */
+      xf86getsecs(&a_secs, &a_usecs);
+      d_secs  = (a_secs - b_secs);
+      d_usecs = (a_usecs - b_usecs);
+      diff = d_secs*1000000 + d_usecs;
+    } while (diff>0 && diff<usec);
+  }
+}
+#endif
 
 /* Most drivers will register just with GetBits/PutBits functions.
  * The following functions implement a software I2C protocol
Index: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h
diff -u xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h:1.4 xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h:1.5
--- xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h:1.4	Sun Apr 11 06:11:01 1999
+++ xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h	Fri Apr 14 05:16:06 2000
@@ -2,9 +2,11 @@
  *  Copyright (C) 1998 Itai Nahshon, Michael Schimek
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.4 1999/04/11 13:11:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.5 2000/04/14 12:16:06 tsi Exp $ */
 #ifndef _XF86I2C_H
 #define _XF86I2C_H
+
+#include "miscstruct.h"
 
 typedef unsigned char  I2CByte;
 typedef unsigned short I2CSlaveAddr;
Index: xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.cpp
diff -u xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.cpp:1.1 xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.cpp:1.1	Thu Mar  2 17:05:48 2000
+++ xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.cpp	Tue Jun 13 19:13:17 2000
@@ -1,19 +1,18 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.cpp,v 1.1 2000/03/03 01:05:48 dawes Exp $ 
-.TH DYNAPRO __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.cpp,v 1.4 2000/06/14 02:13:17 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH DYNAPRO __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 dynapro \- Dynapro input driver
 .SH SYNOPSIS
-.B "Section ""InputDevice"""
-.br
-.BI "  Identifier """ idevname """"
-.br
-.B  "  Driver ""dynapro"""
-.br
-.BI "  Option ""Device""   """ devpath """"
-.br
+.nf
+.B "Section \*qInputDevice\*q"
+.BI "  Identifier \*q" idevname \*q
+.B  "  Driver \*qdynapro\*q"
+.BI "  Option \*qDevice\*q   \*q" devpath \*q
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B dynapro 
 is an XFree86 input driver for Dynapro devices...
@@ -32,6 +31,6 @@
 .PP
 Config details...
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1).
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
 .SH AUTHORS
 Authors include...
Index: xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile:1.2 xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile:1.3
--- xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile:1.2	Sat Aug 14 03:50:00 1999
+++ xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile	Mon May 22 21:47:47 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile,v 1.2 1999/08/14 10:50:00 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile,v 1.3 2000/05/23 04:47:47 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -20,6 +20,11 @@
 ObjectModuleTarget($(DRIVER),$(OBJS))
 
 InstallObjectModule($(DRIVER),$(MODULEDIR),input)
+
+#if !defined(XF86DriverSDK)
+CppManTarget($(DRIVER),)
+InstallModuleManPage($(DRIVER))
+#endif
 
 DependTarget()
 
Index: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/input/elographics/elographics.cpp:1.2
--- /dev/null	Sat Jul  1 20:43:09 2000
+++ xc/programs/Xserver/hw/xfree86/input/elographics/elographics.cpp	Tue Jun 13 19:13:17 2000
@@ -0,0 +1,40 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.cpp,v 1.2 2000/06/14 02:13:17 dawes Exp $
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH ELOGRAPHICS __drivermansuffix__ "Version 4.0.1"  "XFree86"
+.SH NAME
+elographics \- Elographics input driver
+.SH SYNOPSIS
+.B "Section \*qInputDevice\*q"
+.br
+.BI "  Identifier \*q" idevname \*q
+.br
+.B  "  Driver \*qelographics\*q"
+.br
+.BI "  Option \*qDevice\*q   \*q" devpath \*q
+.br
+\ \ ...
+.br
+.B EndSection
+.SH DESCRIPTION
+.B elographics 
+is an XFree86 input driver for Elographics devices...
+.PP
+The
+.B elographics
+driver functions as a pointer input device, and may be used as the
+X server's core pointer.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+What is supported...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details and for options that can be used with all input drivers.  This
+section only covers configuration details specific to this driver.
+.PP
+Config details...
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1).
+.SH AUTHORS
+Authors include...
+ Patrick Lecoanet
Index: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c
diff -u xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c:1.7 xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c:1.10
--- xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c:1.7	Mon Dec 13 15:38:13 1999
+++ xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c	Wed Jun  7 15:03:09 2000
@@ -22,7 +22,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.7 1999/12/13 23:38:13 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.10 2000/06/07 22:03:09 tsi Exp $ */
 
 /*
  *******************************************************************************
@@ -292,12 +292,10 @@
 #undef read
 #undef write
 #undef close
-#undef strdup
 #define SYSCALL(call) call
 #define read(fd, ptr, num) xf86ReadSerial(fd, ptr, num)
 #define write(fd, ptr, num) xf86WriteSerial(fd, ptr, num)
 #define close(fd) xf86CloseSerial(fd)
-#define strdup(str) xf86strdup(str)
 #endif
 
 
@@ -1745,7 +1743,7 @@
 #ifdef XFree86LOADER
 static
 #endif
-InputDriverRec ELO = {
+InputDriverRec ELOGRAPHICS = {
     1,				/* driver version */
     "elographics",		/* driver name */
     NULL,			/* identify */
@@ -1755,13 +1753,14 @@
     0				/* ref count */
 };
 
+#ifdef XFree86LOADER
 static pointer
 Plug(pointer	module,
      pointer	options,
      int	*errmaj,
      int	*errmin)
 {
-  xf86AddInputDriver(&ELO, module, 0);
+  xf86AddInputDriver(&ELOGRAPHICS, module, 0);
 
   return module;
 }
@@ -1792,4 +1791,5 @@
  */
 XF86ModuleData elographicsModuleData = { &version_rec, Plug, Unplug };
 
+#endif
 #endif /* XFREE86_V4 */
Index: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.cpp
diff -u xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.cpp:1.1 xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.cpp:1.1	Thu Mar  2 17:05:49 2000
+++ xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.cpp	Tue Jun 13 19:13:17 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.cpp,v 1.1 2000/03/03 01:05:49 dawes Exp $ 
-.TH KEYBOARD __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.cpp,v 1.4 2000/06/14 02:13:17 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH KEYBOARD __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 keyboard \- Keyboard input driver
 .SH SYNOPSIS
-.B "Section ""InputDevice"""
-.br
-.BI "  Identifier """ idevname """"
-.br
-.B  "  Driver ""keyboard"""
-.br
+.nf
+.B "Section \*qInputDevice\*q"
+.BI "  Identifier \*q" idevname \*q
+.B  "  Driver \*qkeyboard\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B keyboard 
 is an XFree86 input driver for keyboards.  The driver supports the standard
@@ -32,7 +32,7 @@
 .B Options
 are supported:
 .TP 7
-.BI "Option ""Protocol"" """ string """
+.BI "Option \*qProtocol\*q \*q" string \*q
 Specify the mouse protocol.  Valid protocol types include:
 .PP
 .RS 12
@@ -43,7 +43,7 @@
 Not all protocols are supported on all platforms.  Default: "Standard".
 .RE
 .TP 7
-.BI "Option ""AutoRepeat"" """ "delay rate" """
+.BI "Option \*qAutoRepeat\*q \*q" "delay rate" \*q
 sets the auto repeat behaviour for the keyboard.  This is not implemented
 on all platforms.
 .I delay
@@ -51,18 +51,18 @@
 .I rate
 is the number of times a key repeats per second.  Default: "500 30".
 .TP 7
-.BI "Option ""XLeds"" """ ledlist """
+.BI "Option \*qXLeds\*q \*q" ledlist \*q
 makes the keyboard LEDs specified in
 .I ledlist
 available for client use instead of their traditional function
 (Scroll Lock, Caps Lock and Num Lock).  The numbers in the list are
 in the range 1 to 3.  Default: empty list.
 .TP 7
-.BI "Option ""XkbDisable"" """ boolean """
+.BI "Option \*qXkbDisable\*q \*q" boolean \*q
 disable/enable the XKEYBOARD extension.  The \-kb command line
 option overrides this config file option.  Default: XKB is enabled.
 .TP 7
-.BI "Option ""XkbRules"" """ rules """
+.BI "Option \*qXkbRules\*q \*q" rules \*q
 specifies which XKB rules file to use for interpreting the
 .BR XkbModel ,
 .BR XkbLayout ,
@@ -72,21 +72,21 @@
 settings.  Default: "xfree86" for most platforms, but "xfree98" for the
 Japanese PC-98 platforms.
 .TP 7
-.BI "Option ""XkbModel"" """ modelname """
+.BI "Option \*qXkbModel\*q \*q" modelname \*q
 specifies the XKB keyboard model name.  Default: "pc101" for most platforms,
 but "pc98" for the Japanese PC-98 platforms, and "pc101_sol8x86" for
 Solaris 8 on x86.
 .TP 7
-.BI "Option ""XkbLayout"" """ layoutname """
+.BI "Option \*qXkbLayout\*q \*q" layoutname \*q
 specifies the XKB keyboard layout name.  This is usually the country or
 language type of the keyboard.  Default: "us" for most platforms, but
 "nec/jp" for the Japanese PC-98 platforms.
 .TP 7
-.BI "Option ""XkbVariant"" """ variants """
+.BI "Option \*qXkbVariant\*q \*q" variants \*q
 specifies the XKB keyboard variant components.  These can be used to
 enhance the keyboard layout details.  Default: not set.
 .TP 7
-.BI "Option ""XkbOptions"" """ options """
+.BI "Option \*qXkbOptions\*q \*q" options \*q
 specifies the XKB keyboard option components.  These can be used to
 enhance the keyboard behaviour.  Default: not set.
 .PP
@@ -94,4 +94,4 @@
 with the ones listed above and are not recommended, so they are not
 documented here.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1).
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
Index: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.cpp
diff -u xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.cpp:1.1 xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.cpp:1.1	Thu Mar  2 17:05:49 2000
+++ xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.cpp	Tue Jun 13 19:13:18 2000
@@ -1,19 +1,18 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.cpp,v 1.1 2000/03/03 01:05:49 dawes Exp $ 
-.TH MICROTOUCH __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.cpp,v 1.4 2000/06/14 02:13:18 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH MICROTOUCH __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 microtouch \- MicroTouch input driver
 .SH SYNOPSIS
-.B "Section ""InputDevice"""
-.br
-.BI "  Identifier """ idevname """"
-.br
-.B  "  Driver ""microtouch"""
-.br
-.BI "  Option ""Device""   """ devpath """"
-.br
+.nf
+.B "Section \*qInputDevice\*q"
+.BI "  Identifier \*q" idevname \*q
+.B  "  Driver \*qmicrotouch\*q"
+.BI "  Option \*qDevice\*q   \*q" devpath \*q
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B microtouch 
 is an XFree86 input driver for MicroTouch devices...
@@ -32,6 +31,6 @@
 .PP
 Config details...
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1).
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
 .SH AUTHORS
 Authors include...
Index: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c
diff -u xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c:1.28 xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c:1.33
--- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c:1.28	Mon Mar  6 14:59:33 2000
+++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c	Wed Jun 28 00:51:50 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.28 2000/03/06 22:59:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.33 2000/06/28 07:51:50 keithp Exp $ */
 /*
  *
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
@@ -60,6 +60,7 @@
 #include "xf86_ansic.h"
 #include "xisb.h"
 #include "mouse.h"
+#include "mousePriv.h"
 #include "mipointer.h"
 
 static InputInfoPtr MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags);
@@ -76,8 +77,6 @@
 static void MousePostEvent(InputInfoPtr pInfo, int buttons,
 			   int dx, int dy, int dz, int dw);
 static void MouseReadInput(InputInfoPtr pInfo);
-/* XXX This is temporary. */
-const char * xf86ProtocolIDToName(ProtocolID id);
 
 #undef MOUSE
 InputDriverRec MOUSE = {
@@ -199,7 +198,7 @@
     { NULL,			MSE_NONE,	NULL,		PROT_UNKNOWN }
 };
 
-static ProtocolID
+static MouseProtocolID
 ProtocolNameToID(const char *name)
 {
     int i;
@@ -211,7 +210,7 @@
 }
 
 static const char *
-ProtocolIDToName(ProtocolID id)
+ProtocolIDToName(MouseProtocolID id)
 {
     int i;
 
@@ -231,13 +230,19 @@
 }
 
 const char *
-xf86ProtocolIDToName(ProtocolID id)
+xf86MouseProtocolIDToName(MouseProtocolID id)
 {
 	return ProtocolIDToName(id);
 }
 
+MouseProtocolID
+xf86MouseProtocolNameToID(const char *name)
+{
+    return ProtocolNameToID(name);
+}
+
 static int
-ProtocolIDToClass(ProtocolID id)
+ProtocolIDToClass(MouseProtocolID id)
 {
     int i;
 
@@ -255,7 +260,7 @@
 }
 
 static MouseProtocolPtr
-GetProtocol(ProtocolID id) {
+GetProtocol(MouseProtocolID id) {
     int i;
 
     switch (id) {
@@ -414,7 +419,7 @@
     MouseDevPtr pMse;
     MessageType from = X_DEFAULT;
     const char *protocol;
-    ProtocolID protocolID;
+    MouseProtocolID protocolID;
     MouseProtocolPtr pProto;
 
     if (!InitProtocols())
@@ -492,12 +497,15 @@
     pMse->protocol = protocol;
     pMse->protocolID = protocolID;
     pMse->class = ProtocolIDToClass(protocolID);
-    pMse->automatic = (protocolID == PROT_AUTO);
 
     /* Collect the options, and process the common options. */
     xf86CollectInputOptions(pInfo, pProto->defaults, NULL);
     xf86ProcessCommonOptions(pInfo, pInfo->options);
 
+    /* XXX should handle this OS dependency elsewhere. */
+#ifndef __OS2ELF__
+    /* OS/2 has a mouse handled by the OS - it cannot fail here */
+
     /* Check if the device can be opened. */
     pInfo->fd = xf86OpenSerial(pInfo->options);
     if (pInfo->fd == -1) {
@@ -511,6 +519,7 @@
 	}
     }
     xf86CloseSerial(pInfo->fd);
+#endif
     pInfo->fd = -1;
 
     pMse->CommonOptions(pInfo);
@@ -547,8 +556,8 @@
 }
 
 /*
- * This array is indexed by the ProtocolID values, so the order of the entries
- * must match that of the ProtocolID enum in mouse.h.
+ * This array is indexed by the MouseProtocolID values, so the order of the entries
+ * must match that of the MouseProtocolID enum in mouse.h.
  */
 static unsigned char proto[PROT_NUMPROTOS][8] = {
   /* --header--  ---data--- packet -4th-byte-  mouse   */
@@ -635,14 +644,17 @@
     int protoPara[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
     const char *name = NULL;
     const char *s;
+    Bool automatic = FALSE;
     unsigned char c;
-    ProtocolID protocolID = PROT_UNKNOWN;
     pointer options;
 
     pMse = pInfo->private;
-
     /* Handle the "Auto" protocol. */
-    if (pMse->automatic) {
+    if (pMse->protocolID == PROT_AUTO) {
+	MouseProtocolID protocolID = PROT_UNKNOWN;
+	
+	automatic = TRUE;
+
 	/* Check if the OS has a detection mechanism. */
 	if (osInfo->SetupAuto) {
 	    name = osInfo->SetupAuto(pInfo, protoPara);
@@ -681,19 +693,20 @@
 	}
     }
     memcpy(pMse->protoPara, proto[pMse->protocolID], sizeof(pMse->protoPara));
-    if (pMse->automatic && name) {
-	/* Possible protoPara overrides from SetupAuto. */
-	for (i = 0; i < sizeof(pMse->protoPara); i++)
-	    if (protoPara[i] != -1)
-		pMse->protoPara[i] = protoPara[i];
-    }
-
-    if (pMse->automatic && !name) {
-	xf86Msg(X_ERROR, "%s: cannot determine the mouse protocol\n",
-		pInfo->name);
-	return FALSE;
+    if (automatic) {
+	
+	if (name) {
+	    /* Possible protoPara overrides from SetupAuto. */
+	    for (i = 0; i < sizeof(pMse->protoPara); i++)
+		if (protoPara[i] != -1)
+		    pMse->protoPara[i] = protoPara[i];
+	} else {
+	    xf86Msg(X_ERROR, "%s: cannot determine the mouse protocol\n",
+		    pInfo->name);
+	    return FALSE;
+	}
     }
-
+    
     /* Set the port parameters. */
     xf86SetSerial(pInfo->fd, pInfo->options);
     param = NULL;
@@ -1434,7 +1447,7 @@
     InputInfoPtr pInfo;
     MouseDevPtr pMse;
     unsigned char map[MSE_MAXBUTTONS + 1];
-    int i;
+    int i, blocked;
 
     pInfo = device->public.devicePrivate;
     pMse = pInfo->private;
@@ -1496,8 +1509,16 @@
 	pMse->lastButtons = 0;
 	pMse->emulateState = 0;
 	device->public.on = TRUE;
+	/*
+	 * send button up events for sanity. If no button down is pending
+	 * xf86PostButtonEvent() will discard them. So we are on the safe side.
+	 */
+	blocked = xf86BlockSIGIO ();
+	for (i = 1; i <= 5; i++)
+	    xf86PostButtonEvent(device,0,i,0,0,0);
+	xf86UnblockSIGIO (blocked);
 	break;
-
+	    
     case DEVICE_OFF:
     case DEVICE_CLOSE:
 	if (pInfo->fd != -1) {
Index: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.cpp
diff -u xc/programs/Xserver/hw/xfree86/input/mouse/mouse.cpp:1.1 xc/programs/Xserver/hw/xfree86/input/mouse/mouse.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.cpp:1.1	Thu Mar  2 17:05:50 2000
+++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.cpp	Tue Jun 13 19:13:18 2000
@@ -1,21 +1,19 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.cpp,v 1.1 2000/03/03 01:05:50 dawes Exp $ 
-.TH MOUSE __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.cpp,v 1.4 2000/06/14 02:13:18 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH MOUSE __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 mouse \- Mouse input driver
 .SH SYNOPSIS
-.B "Section ""InputDevice"""
-.br
-.BI "  Identifier """ idevname """"
-.br
-.B  "  Driver ""mouse"""
-.br
-.BI "  Option ""Protocol"" """ protoname """"
-.br
-.BI "  Option ""Device""   """ devpath """"
-.br
+.nf
+.B "Section \*qInputDevice\*q"
+.BI "  Identifier \*q" idevname \*q
+.B  "  Driver \*qmouse\*q"
+.BI "  Option \*qProtocol\*q \*q" protoname \*q
+.BI "  Option \*qDevice\*q   \*q" devpath \*q
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B mouse 
 is an XFree86 input driver for mice.  The driver supports most available
@@ -52,7 +50,7 @@
 .B Options
 are supported:
 .TP 7
-.BI "Option ""Protocol"" """ string """
+.BI "Option \*qProtocol\*q \*q" string \*q
 Specify the mouse protocol.  Valid protocol types include:
 .PP
 .RS 12
@@ -66,37 +64,38 @@
 Not all protocols are supported on all platforms.  The "Auto" platform
 specifies that protocol auto-detection should be attempted.  There is no
 default protocol setting, and specifying this option is mandatory.
+.RE
 .TP 7
-.BI "Option ""Device"" """ string """
+.BI "Option \*qDevice\*q \*q" string \*q
 Specifies the device through which the mouse can be accessed.  A common
 setting is "/dev/mouse", which is often a symbolic link to the real
 device.  This option is mandatory, and there is no default setting.
 .TP 7
-.BI "Option ""Buttons"" """ integer """
+.BI "Option \*qButtons\*q \*q" integer \*q
 Specifies the number of mouse buttons.  In cases where the number of buttons
 cannot be auto-detected, the default value is 3.
 .TP 7
-.BI "Option ""Emulate3Buttons"" """ boolean """
+.BI "Option \*qEmulate3Buttons\*q \*q" boolean \*q
 Enable/disable the emulation of the third (middle) mouse button for mice
 which only have two physical buttons.  The third button is emulated by
 pressing both buttons simultaneously.  Default: off
 .TP 7
-.BI "Option ""Emulate3Timeout"" """ integer """
+.BI "Option \*qEmulate3Timeout\*q \*q" integer \*q
 Sets the timeout (in milliseconds) that the driver waits before decicing
 if two buttons where pressed "simultaneously" when 3 button emulation is
 enabled.  Default: 50.
 .TP 7
-.BI "Option ""ChordMiddle"" """ boolean """
+.BI "Option \*qChordMiddle\*q \*q" boolean \*q
 Enable/disable handling of mice that send left+right events when the middle
 button is used.  Default: off.
 .TP 7
-.BI "Option ""ZAxisMapping"" ""X"""
+.BI "Option \*qZAxisMapping\*q \*qX\*q"
 .TP 7
-.BI "Option ""ZAxisMapping"" ""Y"""
+.BI "Option \*qZAxisMapping\*q \*qY\*q"
 .TP 7
-.BI "Option ""ZAxisMapping"" """ "N1 N2" """
+.BI "Option \*qZAxisMapping\*q \*q" "N1 N2" \*q
 .TP 7
-.BI "Option ""ZAxisMapping"" """ "N1 N2 N3 N4" """
+.BI "Option \*qZAxisMapping\*q \*q" "N1 N2 N3 N4" \*q
 Set the mapping for the Z axis (wheel) motion to buttons or another axis
 .RB ( X
 or
@@ -112,33 +111,33 @@
 and
 .IR N4 .
 .TP 7
-.BI "Option ""FlipXY"" """ boolean """
+.BI "Option \*qFlipXY\*q \*q" boolean \*q
 Enable/disable swapping the X and Y axes.  Default: off.
 .TP 7
-.BI "Option ""SampleRate"" """ integer """
+.BI "Option \*qSampleRate\*q \*q" integer \*q
 Sets the number of motion/button events the mouse sends per second.  Setting
 this is only supported for some mice, including some Logitech mice and
 some PS/2 mice on some platforms.  Default: whatever the mouse is
 already set to.
 .TP 7
-.BI "Option ""Resolution"" """ integer """
+.BI "Option \*qResolution\*q \*q" integer \*q
 Sets the resolution of the device in counts per inch.  Setting this is
 only supported for some mice, including some PS/2 mice on some platforms.
 Default: whatever the mouse is already set to.
 .TP 7
-.BI "Option ""ClearDTR"" """ boolean """
+.BI "Option \*qClearDTR\*q \*q" boolean \*q
 Enable/disable clearing the DTR line on the serial port used by the mouse.
 Some dual-protocol mice require the DTR line to be cleared to operate
 in the non-default protocol.  This option is for serial mice only.
 Default: off.
 .TP 7
-.BI "Option ""ClearRTS"" """ boolean """
+.BI "Option \*qClearRTS\*q \*q" boolean \*q
 Enable/disable clearing the RTS line on the serial port used by the mouse.
 Some dual-protocol mice require the RTS line to be cleared to operate
 in the non-default protocol.  This option is for serial mice only.
 Default: off.
 .TP 7
-.BI "Option ""BaudRate"" """ integer """
+.BI "Option \*qBaudRate\*q \*q" integer \*q
 Set the baud rate to use for communicating with a serial mouse.  This
 option should rarely be required because the default is correct for almost
 all situations.  Valid values include: 300, 1200, 2400, 4800, 9600, 19200.
@@ -148,5 +147,5 @@
 for serial port communication, but they are not documented here because
 the driver sets them correctly for each mouse protocol type.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1),
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
 README.mouse.
Index: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h
diff -u xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h:1.8 xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h:1.10
--- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h:1.8	Thu Feb 10 14:33:42 2000
+++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h	Wed Apr 19 08:48:35 2000
@@ -1,15 +1,13 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h,v 1.8 2000/02/10 22:33:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h,v 1.10 2000/04/19 15:48:35 tsi Exp $ */
 
 /*
  * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
  */
 
-#ifndef _X_MOUSE_H
-#define _X_MOUSE_H
+#ifndef MOUSE_H_
+#define MOUSE_H_
 
-/* Private interface for the mouse driver. */
-
-/* Protocol IDs.  These are for internal use only. */
+/* Mouse Protocol IDs. */
 typedef enum {
     PROT_UNKNOWN = -2,
     PROT_UNSUP = -1,		/* protocol is not supported */
@@ -35,20 +33,9 @@
     PROT_AUTO,
     PROT_SYSMOUSE,
     PROT_NUMPROTOS	/* This must always be last. */
-} ProtocolID;
-
-typedef struct {
-    const char *	name;
-    int			class;
-    const char **	defaults;
-    ProtocolID		id;
-} MouseProtocolRec, *MouseProtocolPtr;
-
-/* mouse proto flags */
-#define MPF_NONE		0x00
-#define MPF_SAFE		0x01
+} MouseProtocolID;
 
-/* pnp.c */
-int MouseGetPnpProtocol(InputInfoPtr pInfo);
+const char * xf86MouseProtocolIDToName(MouseProtocolID id);
+MouseProtocolID xf86MouseProtocolNameToID(const char *name);
 
-#endif /* _X_MOUSE_H */
+#endif
Index: xc/programs/Xserver/hw/xfree86/input/mouse/mousePriv.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/input/mouse/mousePriv.h:1.5
--- /dev/null	Sat Jul  1 20:43:10 2000
+++ xc/programs/Xserver/hw/xfree86/input/mouse/mousePriv.h	Wed May 31 00:15:06 2000
@@ -0,0 +1,27 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mousePriv.h,v 1.5 2000/05/31 07:15:06 eich Exp $ */
+/*
+ * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
+ */
+
+#ifndef _X_MOUSEPRIV_H
+#define _X_MOUSEPRIV_H
+
+#include "mouse.h"
+#include "xf86Xinput.h"                                                                                              
+/* Private interface for the mouse driver. */
+
+typedef struct {
+    const char *	name;
+    int			class;
+    const char **	defaults;
+    MouseProtocolID	id;
+} MouseProtocolRec, *MouseProtocolPtr;
+
+/* mouse proto flags */
+#define MPF_NONE		0x00
+#define MPF_SAFE		0x01
+
+/* pnp.c */
+int MouseGetPnpProtocol(InputInfoPtr pInfo);
+
+#endif /* _X_MOUSE_H */
Index: xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile:1.2 xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile:1.3
--- xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile:1.2	Sat Aug 14 03:50:02 1999
+++ xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile	Mon May 22 21:47:47 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile,v 1.2 1999/08/14 10:50:02 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile,v 1.3 2000/05/23 04:47:47 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -20,6 +20,11 @@
 ObjectModuleTarget($(DRIVER),$(OBJS))
 
 InstallObjectModule($(DRIVER),$(MODULEDIR),input)
+
+#if !defined(XF86DriverSDK)
+CppManTarget($(DRIVER),)
+InstallModuleManPage($(DRIVER))
+#endif
 
 DependTarget()
 
Index: xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.cpp
diff -u /dev/null xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.cpp:1.2
--- /dev/null	Sat Jul  1 20:43:10 2000
+++ xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.cpp	Tue Jun 13 19:13:18 2000
@@ -0,0 +1,40 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.cpp,v 1.2 2000/06/14 02:13:18 dawes Exp $
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH MUTOUCH __drivermansuffix__ "Version 4.0.1"  "XFree86"
+.SH NAME
+mutouch \- Microtouch input driver
+.SH SYNOPSIS
+.B "Section \*qInputDevice\*q"
+.br
+.BI "  Identifier \*q" idevname \*q
+.br
+.B  "  Driver \*qmutouch\*q"
+.br
+.BI "  Option \*qDevice\*q   \*q" devpath \*q
+.br
+\ \ ...
+.br
+.B EndSection
+.SH DESCRIPTION
+.B mutouch 
+is an XFree86 input driver for Microtouch devices...
+.PP
+The
+.B mutouch
+driver functions as a pointer input device, and may be used as the
+X server's core pointer.
+THIS MAN PAGE NEEDS TO BE FILLED IN.
+.SH SUPPORTED HARDWARE
+What is supported...
+.SH CONFIGURATION DETAILS
+Please refer to XF86Config(__filemansuffix__) for general configuration
+details and for options that can be used with all input drivers.  This
+section only covers configuration details specific to this driver.
+.PP
+Config details...
+.SH "SEE ALSO"
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1).
+.SH AUTHORS
+Authors include...
+ Patrick Lecoanet
Index: xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c
diff -u xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c:1.9 xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c:1.12
--- xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c:1.9	Mon Dec 13 15:38:14 1999
+++ xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c	Wed Jun  7 15:03:10 2000
@@ -21,7 +21,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c,v 1.9 1999/12/13 23:38:14 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c,v 1.12 2000/06/07 22:03:10 tsi Exp $ */
 
 /*
  *******************************************************************************
@@ -291,14 +291,10 @@
 #undef read
 #undef write
 #undef close
-#undef strdup
-#undef strcmp
 #define SYSCALL(call) call
 #define read(fd, ptr, num) xf86ReadSerial(fd, ptr, num)
 #define write(fd, ptr, num) xf86WriteSerial(fd, ptr, num)
 #define close(fd) xf86CloseSerial(fd)
-#define strdup(str) xf86strdup(str)
-#define strcmp(str1, str2) xf86strcmp(str1, str2)
 #endif
 
 
@@ -1843,7 +1839,7 @@
 #ifdef XFree86LOADER
 static
 #endif
-InputDriverRec MUT = {
+InputDriverRec MUTOUCH = {
     1,				/* driver version */
     "mutouch",			/* driver name */
     NULL,			/* identify */
@@ -1853,13 +1849,14 @@
     0				/* ref count */
 };
 
+#ifdef XFree86LOADER
 static pointer
 Plug(pointer	module,
      pointer	options,
      int	*errmaj,
      int	*errmin)
 {
-  xf86AddInputDriver(&MUT, module, 0);
+  xf86AddInputDriver(&MUTOUCH, module, 0);
 
   return module;
 }
@@ -1889,5 +1886,6 @@
  * Do not change it.
  */
 XF86ModuleData mutouchModuleData = { &version_rec, Plug, Unplug };
+#endif
 
 #endif /* XFREE86_V4 */
Index: xc/programs/Xserver/hw/xfree86/input/void/void.cpp
diff -u xc/programs/Xserver/hw/xfree86/input/void/void.cpp:1.1 xc/programs/Xserver/hw/xfree86/input/void/void.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/input/void/void.cpp:1.1	Thu Mar  2 17:05:50 2000
+++ xc/programs/Xserver/hw/xfree86/input/void/void.cpp	Tue Jun 13 19:13:19 2000
@@ -1,17 +1,17 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.cpp,v 1.1 2000/03/03 01:05:50 dawes Exp $ 
-.TH VOID __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.cpp,v 1.4 2000/06/14 02:13:19 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH VOID __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 void \- null input driver
 .SH SYNOPSIS
-.B "Section ""InputDevice"""
-.br
-.BI "  Identifier """ idevname """"
-.br
-.B  "  Driver ""void"""
-.br
+.nf
+.B "Section \*qInputDevice\*q"
+.BI "  Identifier \*q" idevname \*q
+.B  "  Driver \*qvoid\*q"
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B void 
 is an dummy/null XFree86 input driver.  It doesn't connect to any
@@ -24,6 +24,6 @@
 details and for options that can be used with all input drivers.  This
 driver doesn't have any configuration options in addition to those.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1).
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
 .SH AUTHORS
 Authors include...
Index: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.cpp
diff -u xc/programs/Xserver/hw/xfree86/input/wacom/wacom.cpp:1.1 xc/programs/Xserver/hw/xfree86/input/wacom/wacom.cpp:1.4
--- xc/programs/Xserver/hw/xfree86/input/wacom/wacom.cpp:1.1	Thu Mar  2 17:05:51 2000
+++ xc/programs/Xserver/hw/xfree86/input/wacom/wacom.cpp	Tue Jun 13 19:13:19 2000
@@ -1,19 +1,18 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.cpp,v 1.1 2000/03/03 01:05:51 dawes Exp $ 
-.TH WACOM __drivermansuffix__ "Version 4.0"  "XFree86"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.cpp,v 1.4 2000/06/14 02:13:19 dawes Exp $ 
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH WACOM __drivermansuffix__ "Version 4.0.1"  "XFree86"
 .SH NAME
 wacom \- Wacom input driver
 .SH SYNOPSIS
-.B "Section ""InputDevice"""
-.br
-.BI "  Identifier """ idevname """"
-.br
-.B  "  Driver ""wacom"""
-.br
-.BI "  Option ""Device""   """ devpath """"
-.br
+.nf
+.B "Section \*qInputDevice\*q"
+.BI "  Identifier \*q" idevname \*q
+.B  "  Driver \*qwacom\*q"
+.BI "  Option \*qDevice\*q   \*q" devpath \*q
 \ \ ...
-.br
 .B EndSection
+.fi
 .SH DESCRIPTION
 .B wacom 
 is an XFree86 input driver for Wacom devices...
@@ -32,6 +31,6 @@
 .PP
 Config details...
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(1).
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
 .SH AUTHORS
 Authors include...
Index: xc/programs/Xserver/hw/xfree86/int10/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/int10/Imakefile:1.6 xc/programs/Xserver/hw/xfree86/int10/Imakefile:1.9
--- xc/programs/Xserver/hw/xfree86/int10/Imakefile:1.6	Mon Feb 28 19:09:24 2000
+++ xc/programs/Xserver/hw/xfree86/int10/Imakefile	Mon Apr 17 09:30:11 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/int10/Imakefile,v 1.6 2000/02/29 03:09:24 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/int10/Imakefile,v 1.9 2000/04/17 16:30:11 eich Exp $
 
 /* An OS-independent INT10 module/library */
 
@@ -16,7 +16,7 @@
 X86SRCDIR = $(X86TOPDIR)/src/x86emu
 X86EMUINCLUDES = -I$(X86TOPDIR)/include -I$(X86SRCDIR)
 
-#if !defined(X86EMU_LIBPATH)
+# if !defined(X86EMU_LIBPATH)
 X86EMUSRCS = debug.c decode.c fpu.c ops.c ops2.c prim_ops.c sys.c
 X86EMUOBJS = debug.o decode.o fpu.o ops.o ops2.o prim_ops.o sys.o
 
@@ -28,16 +28,16 @@
 LinkSourceFile(prim_ops.c,$(X86SRCDIR))
 LinkSourceFile(sys.c,$(X86SRCDIR))
 
-#else
+# else
 BuildObjectFromLibraryWithPath(X86EMU_LIBPATH,x86emu,x86emu)
 X86EMUOBJS = x86emu.o
-#endif
+# endif
 
 X86EMUDEFINES = -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG
 
-#if defined(i386Architecture)
+# if defined(i386Architecture)
 ARCHDEFINES = -D_PC
-#endif
+# endif
 
 INT10DEFINES = -D_X86EMU $(ARCHDEFINES)
 
@@ -55,9 +55,11 @@
 
 DEFINES = $(X86EMUDEFINES) $(INT10DEFINES)
 
+ModuleObjectRule()
 LibraryModuleTarget(int10,$(OBJS))
 
 InstallLibraryModule(int10,$(MODULEDIR),.)
 
 DependTarget()
 
+InstallDriverSDKNonExecFile(xf86int10.h,$(DRIVERSDKINCLUDEDIR))
Index: xc/programs/Xserver/hw/xfree86/int10/generic.c
diff -u xc/programs/Xserver/hw/xfree86/int10/generic.c:1.3 xc/programs/Xserver/hw/xfree86/int10/generic.c:1.9
--- xc/programs/Xserver/hw/xfree86/int10/generic.c:1.3	Fri Feb 18 08:23:23 2000
+++ xc/programs/Xserver/hw/xfree86/int10/generic.c	Wed Jun  7 15:03:10 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.3 2000/02/18 16:23:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.9 2000/06/07 22:03:10 tsi Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
@@ -14,6 +14,8 @@
 #include "xf86int10.h"
 #include "int10Defines.h"
 
+#define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
+
 static CARD8 read_b(xf86Int10InfoPtr pInt,int addr);
 static CARD16 read_w(xf86Int10InfoPtr pInt,int addr);
 static CARD32 read_l(xf86Int10InfoPtr pInt,int addr);
@@ -28,10 +30,11 @@
 
 typedef struct {
     int shift;
-    int pagesize_1;
     int entries;
+    void* base;
     void* vRam;
-    memType *alloc_rec;
+    void* sysMem;
+    char* alloc;
 } genericInt10Priv;
 
 #define INTPriv(x) ((genericInt10Priv*)x->private)
@@ -47,8 +50,6 @@
 
 static void MapVRam(xf86Int10InfoPtr pInt);
 static void UnmapVRam(xf86Int10InfoPtr pInt);
-static void setupTable(xf86Int10InfoPtr pInt, memType address,
-		       int loc,int size);
 
 static void *sysMem = NULL;
 
@@ -57,11 +58,8 @@
 {
     xf86Int10InfoPtr pInt;
     int screen;
-    void* intMem;
-    void* vbiosMem;
-    int pagesize;
-    int entries;
-    int shift;
+    void* base = 0;
+    void* vbiosMem = 0;
     legacyVGARec vga;
     
     screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
@@ -74,18 +72,11 @@
     if (!xf86Int10ExecSetup(pInt))
 	goto error0;
     pInt->mem = &genericMem;
-    pagesize = xf86getpagesize();
     pInt->private = (pointer)xnfcalloc(1,sizeof(genericInt10Priv));
-    entries = SYS_SIZE / pagesize;
-
+    INTPriv(pInt)->alloc = 
+	(pointer)xnfcalloc(1,sizeof(ALLOC_ENTRIES(getpagesize())));
     pInt->scrnIndex = screen;
-    INTPriv(pInt)->pagesize_1 = pagesize - 1;
-    INTPriv(pInt)->entries = entries;
-    INTPriv(pInt)->alloc_rec =
-	xnfcalloc(1,sizeof(memType) * entries);
-    for (shift = 0 ; (pagesize >> shift) ; shift++) {};
-    shift -= 1;
-    INTPriv(pInt)->shift = shift;
+    base = INTPriv(pInt)->base = xnfalloc(0xf0000);
 
     /*
      * we need to map video RAM MMIO as some chipsets map mmio
@@ -93,54 +84,43 @@
      */
 
     MapVRam(pInt);
-    intMem = xnfalloc(pagesize);
-    setupTable(pInt,(memType)intMem,0,pagesize);
-    vbiosMem = xnfalloc(V_BIOS_SIZE);
-
 #ifdef _PC
     if (!sysMem)
 	sysMem = xf86MapVidMem(screen,VIDMEM_FRAMEBUFFER,SYS_BIOS,BIOS_SIZE);
-    setupTable(pInt,(memType)sysMem,SYS_BIOS,BIOS_SIZE);
-    if (xf86ReadBIOS(0,0,(unsigned char *)intMem,LOW_PAGE_SIZE) < 0) {
+    INTPriv(pInt)->sysMem = sysMem;
+    
+    if (xf86ReadBIOS(0,0,(unsigned char *)base,LOW_PAGE_SIZE) < 0) {
 	xf86DrvMsg(screen,X_ERROR,"Cannot read int vect\n");
 	goto error1;
     }
     if (xf86IsEntityPrimary(entityIndex)) {
-	int size;
 	int cs = MEM_RW(pInt,((0x10<<2)+2));
-	xf86DrvMsg(screen,X_INFO,"Primary V_BIOS segmant is: 0x%x\n",cs);
-	if (xf86ReadBIOS(cs << 4,0,(unsigned char *)vbiosMem,
-			 0x10) < 0) {
-	    xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (1)\n");
-	    goto error1;
-	}
-	if (!((*(CARD8*)vbiosMem == 0x55)
-	      && (*((CARD8*)vbiosMem + 1) == 0xAA))) {
-	    xf86DrvMsg(screen,X_ERROR,"No V_BIOS found\n");
-	    goto error1;
+
+	vbiosMem = (unsigned char *)base + (cs << 4);
+	if (!int10_read_bios(screen,cs,vbiosMem)) {
+	    cs = MEM_RW(pInt,((0x42<<2)+2));
+	    vbiosMem = (unsigned char *)base + (cs << 4);
+	    if (!int10_read_bios(screen,cs,vbiosMem)) {
+		cs = V_BIOS >> 4;
+		vbiosMem = (unsigned char *)base + (cs << 4);
+		if (!int10_read_bios(screen,cs,vbiosMem)) {
+		    xf86DrvMsg(screen,X_ERROR,"No V_BIOS found\n");
+		    goto error1;
+		}
+	    }
 	}
+	xf86DrvMsg(screen,X_INFO,"Primary V_BIOS segment is: 0x%x\n",cs);
 	
-	size = *((CARD8*)vbiosMem + 2) * 512;
-	if (xf86ReadBIOS(cs << 4,0,vbiosMem, size) < 0) {
-	    xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (2)\n");
-	    goto error1;
-	}
-	if (bios_checksum(vbiosMem,size)) {
-	    xf86DrvMsg(screen,X_ERROR,"Bad checksum of V_BIOS \n");
-	    goto error1;
-	}
-
-	setupTable(pInt,(memType)vbiosMem,cs<<4,size);
 	set_return_trap(pInt);
 	pInt->BIOSseg = cs;
     } else {
 	reset_int_vect(pInt);
 	set_return_trap(pInt);
+	vbiosMem = (unsigned char *)base + V_BIOS;
 	if (!mapPciRom(pInt,(unsigned char *)(vbiosMem))) {
 	    xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (3)\n");
 	    goto error1;
 	}
-	setupTable(pInt,(memType)vbiosMem,V_BIOS,V_BIOS_SIZE);
 	pInt->BIOSseg = V_BIOS >> 4;
 	pInt->num = 0xe6;
 	LockLegacyVGA(screen, &vga); 
@@ -152,14 +132,14 @@
 	sysMem = xnfalloc(BIOS_SIZE);
 	setup_system_bios((memType)sysMem);
     }
-    setupTable(pInt,(memType)sysMem,SYS_BIOS,BIOS_SIZE);
+    INTPriv(pInt)->sysMem = sysMem;
     setup_int_vect(pInt);
     set_return_trap(pInt);
+    vbiosMem = (unsigned char *)base + V_BIOS;
     if (!mapPciRom(pInt,(unsigned char *)(vbiosMem))) {
 	xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (4)\n");
 	goto error1;
     }
-    setupTable(pInt,(memType)vbiosMem,V_BIOS,V_BIOS_SIZE);
     pInt->BIOSseg = V_BIOS >> 4;
     pInt->num = 0xe6;
     LockLegacyVGA(screen, &vga);	   
@@ -169,10 +149,9 @@
     return pInt;
 
  error1:
-    xfree(vbiosMem);
-    xfree(intMem);
+    xfree(base);
     UnmapVRam(pInt);
-    xfree(INTPriv(pInt)->alloc_rec);
+    xfree(INTPriv(pInt)->alloc);
     xfree(pInt->private);
  error0:
     xfree(pInt);
@@ -184,7 +163,7 @@
 MapVRam(xf86Int10InfoPtr pInt)
 {
     int screen = pInt->scrnIndex;
-    int pagesize = INTPriv(pInt)->pagesize_1 + 1;
+    int pagesize = getpagesize();
     int size = ((VRAM_SIZE + pagesize - 1)/pagesize) * pagesize;
 
     INTPriv(pInt)->vRam = xf86MapVidMem(screen,VIDMEM_MMIO,V_RAM,size);
@@ -194,7 +173,7 @@
 UnmapVRam(xf86Int10InfoPtr pInt)
 {
     int screen = pInt->scrnIndex;
-    int pagesize = INTPriv(pInt)->pagesize_1 + 1;
+    int pagesize = getpagesize();
     int size = ((VRAM_SIZE + pagesize - 1)/pagesize) * pagesize;
 
     xf86UnMapVidMem(screen,INTPriv(pInt)->vRam,size);
@@ -209,17 +188,13 @@
 void
 xf86FreeInt10(xf86Int10InfoPtr pInt)
 {
-    int pagesize; 
-
     if (!pInt)
       return;
-    pagesize = INTPriv(pInt)->pagesize_1 + 1;
     if (Int10Current == pInt) 
 	Int10Current = NULL;
-    xfree(INTPriv(pInt)->alloc_rec[V_BIOS/pagesize]);
-    xfree(INTPriv(pInt)->alloc_rec[0]);
+    xfree(INTPriv(pInt)->base);
     UnmapVRam(pInt);
-    xfree(INTPriv(pInt)->alloc_rec);
+    xfree(INTPriv(pInt)->alloc);
     xfree(pInt->private);
     xfree(pInt);
 }
@@ -227,15 +202,14 @@
 void *
 xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off)
 {
-    void* addr;
-    int pagesize = INTPriv(pInt)->pagesize_1 + 1;
-    int num_pages = INTPriv(pInt)->entries;
+    int pagesize = getpagesize();
+    int num_pages = ALLOC_ENTRIES(pagesize);
     int i,j;
-    
+
     for (i=0;i<num_pages - num;i++) {
-	if (INTPriv(pInt)->alloc_rec[i] == 0) {
+	if (INTPriv(pInt)->alloc[i] == 0) {
 	    for (j=i;j < num + i;j++)
-		if ((INTPriv(pInt)->alloc_rec[j] != 0))
+		if (INTPriv(pInt)->alloc[j] != 0)
 		    break;
 	    if (j == num + i)
 		break;
@@ -245,134 +219,103 @@
     }
     if (i == num_pages - num)
 	return NULL;
+    
+    for (j = i; j < i + num; j++)
+	INTPriv(pInt)->alloc[j] = 1;
 
-    *off = i * pagesize;
-    addr = xnfalloc(pagesize * num);
-    setupTable(pInt,(memType)addr,*off,pagesize * num);
+    *off = (i + 1) * pagesize;
     
-    return addr;
+    return (void *)
+	((char*)INTPriv(pInt)->base + (i + 1) * pagesize);
 }
 
 void
 xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
-{
-    int num_pages = INTPriv(pInt)->entries;
-    int i,j;
-    for (i = 0;i<num_pages - num; i++)
-	if (INTPriv(pInt)->alloc_rec[i]==(memType)pbase) {
-	    for (j = 0; j < num; j++)
-		INTPriv(pInt)->alloc_rec[i] = 0;
-	    break;
-	}
-    xfree(pbase);
-    return;
-}
-
-static void
-setupTable(xf86Int10InfoPtr pInt, memType address,int loc,int size)
 {
-    int pagesize = INTPriv(pInt)->pagesize_1 + 1;
-    int i,j,num;
-
-    i = loc / pagesize;
-    num = (size + pagesize - 1)/ pagesize; /* round up to the nearest page */
-                                           /* boudary if size is not       */
-                                           /* multiple of pagesize         */
-    for (j = 0; j<num; j++) {
-	INTPriv(pInt)->alloc_rec[i+j] = address;
-	address += pagesize;
-    }
-}
-
-#define OFF(addr) \
-          ((addr) & (INTPriv(pInt)->pagesize_1))
-#define SHIFT \
-          (INTPriv(pInt)->shift)
-#define BASE(addr,shift) \
-          (INTPriv(pInt)->alloc_rec[addr >> shift])
-#define V_ADDR(addr,shift,off) \
-          (BASE(addr,shift) + (off))
-#define VRAM_ADDR(addr) (addr - 0xA0000)
+    int pagesize = getpagesize();
+    int first = ((unsigned long)pbase
+		 - (unsigned long)INTPriv(pInt)->base)
+	/ pagesize - 1;
+    int i;
+
+    for (i = first; i < first + num; i++)
+	INTPriv(pInt)->alloc[i] = 0;
+}
+
+#define OFF(addr) ((addr) & 0xffff)
+#define SYS(addr) ((addr) >= SYS_BIOS)
+#define V_ADDR(addr) \
+          (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - SYS_BIOS) \
+           : ((char*)(INTPriv(pInt)->base) + addr))
+#define VRAM_ADDR(addr) (addr - V_RAM)
 #define VRAM_BASE (INTPriv(pInt)->vRam)
 
-#define VRAM(addr) ((addr >= 0xA0000) && (addr <= 0xBFFFF))
-#define V_ADDR_RB(addr,shift,off) \
+#define VRAM(addr) ((addr >= V_RAM) && (addr < (V_RAM + VRAM_SIZE)))
+#define V_ADDR_RB(addr) \
         (VRAM(addr)) ? MMIO_IN8((CARD8*)VRAM_BASE,VRAM_ADDR(addr)) \
-           : *(CARD8*) V_ADDR(addr,shift,off)
-#define V_ADDR_RW(addr,shift,off) \
+           : *(CARD8*) V_ADDR(addr)
+#define V_ADDR_RW(addr) \
         (VRAM(addr)) ? MMIO_IN16((CARD16*)VRAM_BASE,VRAM_ADDR(addr)) \
-           : ldw_u((pointer)V_ADDR(addr,shift,off))
-#define V_ADDR_RL(addr,shift,off) \
+           : ldw_u((pointer)V_ADDR(addr))
+#define V_ADDR_RL(addr) \
         (VRAM(addr)) ? MMIO_IN32((CARD32*)VRAM_BASE,VRAM_ADDR(addr)) \
-           : ldl_u((pointer)V_ADDR(addr,shift,off))
+           : ldl_u((pointer)V_ADDR(addr))
 
-#define V_ADDR_WB(addr,shift,off,val) \
+#define V_ADDR_WB(addr,val) \
         if(VRAM(addr)) \
             MMIO_OUT8((CARD8*)VRAM_BASE,VRAM_ADDR(addr),val); \
         else \
-            *(CARD8*) V_ADDR(addr,shift,off) = val;
-#define V_ADDR_WW(addr,shift,off,val) \
+            *(CARD8*) V_ADDR(addr) = val;
+#define V_ADDR_WW(addr,val) \
         if(VRAM(addr)) \
             MMIO_OUT16((CARD16*)VRAM_BASE,VRAM_ADDR(addr),val); \
         else \
-            stw_u((val),(pointer)(V_ADDR(addr,shift,off)));
+            stw_u((val),(pointer)(V_ADDR(addr)));
 
-#define V_ADDR_WL(addr,shift,off,val) \
+#define V_ADDR_WL(addr,val) \
         if (VRAM(addr)) \
             MMIO_OUT32((CARD32*)VRAM_BASE,VRAM_ADDR(addr),val); \
         else \
-            stl_u(val,(pointer)(V_ADDR(addr,shift,off)));
+            stl_u(val,(pointer)(V_ADDR(addr)));
 
 static CARD8
 read_b(xf86Int10InfoPtr pInt, int addr)
 {
-    if (!BASE(addr,SHIFT)) return 0xff;
-    
-    return V_ADDR_RB(addr,SHIFT,OFF(addr));
+    return V_ADDR_RB(addr);
 }
 
 static CARD16
 read_w(xf86Int10InfoPtr pInt, int addr)
 {
-    int shift = SHIFT;
-    int off = OFF(addr);
-
-    if (!BASE(addr,shift)) return 0xffff;
-    
 #if X_BYTE_ORDER == X_BIG_ENDIAN
-    return ((V_ADDR_RB(addr,shift,off))
-	    || ((V_ADDR_RB(addr,shift,off + 1)) << 8));
+    return ((V_ADDR_RB(addr))
+	    || ((V_ADDR_RB(addr + 1)) << 8));
 #else
     if (OFF(addr + 1) > 0) {
-	return V_ADDR_RW(addr,SHIFT,OFF(addr));
-    } else {
-	return ((V_ADDR_RB(addr,shift,off + 1))
-	    || ((V_ADDR_RB(addr,shift,off)) << 8));
-    }
+	return V_ADDR_RW(addr);
+    } else
+	return ((V_ADDR_RB(addr + 1))
+		|| ((V_ADDR_RB(addr)) << 8));
+
 #endif
 }
 
 static CARD32
 read_l(xf86Int10InfoPtr pInt, int addr)
 {
-    int shift = SHIFT;
-    int off = OFF(addr);
-	
-    if (!BASE(addr,shift)) return 0xffffffff;
-    
 #if X_BYTE_ORDER == X_BIG_ENDIAN
-    return ((V_ADDR_RB(addr,shift,off))
-	    || ((V_ADDR_RB(addr,shift,off + 1)) << 8)
-	    || ((V_ADDR_RB(addr,shift,off + 2)) << 16)
-	    || ((V_ADDR_RB(addr,shift,off + 3)) << 24));
+    return ((V_ADDR_RB(addr))
+	    || ((V_ADDR_RB(addr + 1)) << 8)
+	    || ((V_ADDR_RB(addr + 2)) << 16)
+	    || ((V_ADDR_RB(addr + 3)) << 24));
 #else
-    if (OFF(addr + 3) > 2) {
-	return V_ADDR_RL(addr,SHIFT,OFF(addr));
+    if (OFF(addr + 3)  > 2) {
+	return V_ADDR_RL(addr);
     } else {
-	return ((V_ADDR_RB(addr,shift,off + 3))
-		|| ((V_ADDR_RB(addr,shift,off + 2)) << 8)
-		|| ((V_ADDR_RB(addr,shift,off + 1)) << 16)
-		|| ((V_ADDR_RB(addr,shift,off)) << 24));
+	return ((V_ADDR_RB(addr + 3))
+		|| ((V_ADDR_RB(addr + 2)) << 8)
+		|| ((V_ADDR_RB(addr + 1)) << 16)
+		|| ((V_ADDR_RB(addr)) << 24));
     }
 #endif
 }
@@ -380,28 +323,21 @@
 static void
 write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val)
 {
-    if (!BASE(addr,SHIFT)) return;
-    
-    V_ADDR_WB(addr,SHIFT,OFF(addr),val);
+    V_ADDR_WB(addr,val);
 }
 
 static void
 write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
 {
-    int shift = SHIFT;
-    int off = OFF(addr);
-    
-    if (!BASE(addr,shift)) return;
-    
 #if X_BYTE_ORDER == X_BIG_ENDIAN
-    V_ADDR_WB(addr,shift,off,val);
-    V_ADDR_WB(addr,shift,off + 1,val >> 8);
+    V_ADDR_WB(addr,val);
+    V_ADDR_WB(addr + 1,val >> 8);
 #else
     if (OFF(addr + 1) > 0) {
-	V_ADDR_WW(addr,shift,OFF(addr),val);
+	V_ADDR_WW(addr,val);
     } else {
-	V_ADDR_WB(addr,shift,off + 1,val);
-	V_ADDR_WB(addr,shift,off,val >> 8);
+	V_ADDR_WB(addr + 1,val);
+	V_ADDR_WB(addr,val >> 8);
     }
 #endif
 }
@@ -409,23 +345,19 @@
 static void
 write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
 {
-    int shift = SHIFT;
-    int off = OFF(addr);
-    if (!BASE(addr,shift)) return;
-    
 #if X_BYTE_ORDER == X_BIG_ENDIAN
-    V_ADDR_WB(addr,shift,off,val);
-    V_ADDR_WB(addr,shift,off + 1, val >> 8);
-    V_ADDR_WB(addr,shift,off + 2, val >> 16);
-    V_ADDR_WB(addr,shift,off + 3, val >> 24);
+    V_ADDR_WB(addr,val);
+    V_ADDR_WB(addr + 1, val >> 8);
+    V_ADDR_WB(addr + 2, val >> 16);
+    V_ADDR_WB(addr + 3, val >> 24);
 #else
     if (OFF(addr + 3) > 2) {
-	V_ADDR_WL(addr,shift,OFF(addr),val);
+	V_ADDR_WL(addr,val);
     } else {
-	V_ADDR_WB(addr,shift,off + 3, val);
-	V_ADDR_WB(addr,shift,off + 2, val >> 8);
-	V_ADDR_WB(addr,shift,off + 1, val >> 16);
-	V_ADDR_WB(addr,shift,off, val >> 24);
+	V_ADDR_WB(addr + 3, val);
+	V_ADDR_WB(addr + 2, val >> 8);
+	V_ADDR_WB(addr + 1, val >> 16);
+	V_ADDR_WB(addr, val >> 24);
     }
 #endif
 }
@@ -433,5 +365,13 @@
 pointer
 xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
 {
-    return (pointer) V_ADDR(addr,SHIFT,OFF(addr));
+    return (pointer) V_ADDR(addr);
 }
+
+
+
+
+
+
+
+
Index: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c
diff -u xc/programs/Xserver/hw/xfree86/int10/helper_exec.c:1.2 xc/programs/Xserver/hw/xfree86/int10/helper_exec.c:1.4
--- xc/programs/Xserver/hw/xfree86/int10/helper_exec.c:1.2	Tue Feb  8 05:13:25 2000
+++ xc/programs/Xserver/hw/xfree86/int10/helper_exec.c	Wed May 31 00:15:06 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.2 2000/02/08 13:13:25 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.4 2000/05/31 07:15:06 eich Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
@@ -7,14 +7,21 @@
  *   Part of this is based on code taken form DOSEMU
  *   (C) Copyright 1992, ..., 1999 the "DOSEMU-Development-Team"
  */   
+
+/*
+ * To debug port accesses define PRINT_PORT.
+ * Note! You also have to comment out ioperm()
+ * in xf86EnableIO(). Otherwise we won't trap
+ * on PIO.
+ */
 #include "xf86.h"
 #include "xf86str.h"
+#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86Pci.h"
 #define _INT10_PRIVATE
 #include "int10Defines.h"
 #include "xf86int10.h"
-#include "xf86_ansic.h"
 
 #ifndef _PC
 static int pciCfg1in(CARD16 addr, CARD32 *val);
@@ -30,12 +37,11 @@
 	MapCurrentInt10(pInt);
 	Int10Current = pInt;
     }
-    
     X86_EAX = (CARD32) pInt->ax;
     X86_EBX = (CARD32) pInt->bx;
     X86_ECX = (CARD32) pInt->cx;
     X86_EDX = (CARD32) pInt->dx;
-    X86_EDX = (CARD32) pInt->si;
+    X86_ESI = (CARD32) pInt->si;
     X86_EDI = (CARD32) pInt->di;
     X86_ES  = (CARD32) pInt->es;
     X86_EBP = 0;
@@ -46,7 +52,8 @@
     X86_DS = 0x40;               /* standard pc ds */  
     X86_FS = 0;
     X86_GS = 0;
-    X86_EFLAGS |= (X86_VIF_MASK | X86_VIP_MASK | X86_IF_MASK | 2);
+    X86_EFLAGS = (X86_IF_MASK | X86_IOPL_MASK);
+    
 }
 
 void
@@ -62,6 +69,8 @@
 }
 
 #define SEG_ADR(type, seg, reg)  type((seg << 4) \
+				      + (X86_##reg))
+#define SEG_EADR(type, seg, reg)  type((seg << 4) \
 				      + (X86_E##reg))
 #ifndef _X86EMU
 /* get the linear address */
@@ -113,7 +122,7 @@
 	/* NOTE: ES can't be overwritten; prefixes 66,67 should use esi,edi,ecx
 	 * but is anyone using extended regs in real mode? */
 	/* WARNING: no test for DI wrapping! */
-	X86_EDI += port_rep_inb(pInt,X86_DX,SEG_ADR((CARD32),X86_ES,DI),
+	X86_EDI += port_rep_inb(pInt,X86_DX,SEG_EADR((CARD32),X86_ES,DI),
 				X86_FLAGS & DF, (is_rep? LWECX:1));
 	if (is_rep) LWECX_ZERO;
 	X86_IP++;
@@ -224,6 +233,7 @@
     return TRUE;
 }
 #endif
+
 /* general software interrupt handler */
 CARD32
 getIntVect(xf86Int10InfoPtr pInt,int num)
@@ -246,9 +256,9 @@
     /* check if bios vector is initialized */
     if (MEM_RW(pInt,(num<<2)+2) == 0xF000) { /* SYS_BIOS_SEG ?*/
 #ifdef PRINT_INT
-	ErrorF("card BIOS not loaded\n");
+        ErrorF("card BIOS not loaded\n");
 #endif
-	return 0;
+        return 0;
     }
 #endif
 #ifdef PRINT_INT
Index: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c
diff -u xc/programs/Xserver/hw/xfree86/int10/helper_mem.c:1.2 xc/programs/Xserver/hw/xfree86/int10/helper_mem.c:1.6
--- xc/programs/Xserver/hw/xfree86/int10/helper_mem.c:1.2	Tue Feb  8 05:13:26 2000
+++ xc/programs/Xserver/hw/xfree86/int10/helper_mem.c	Mon Jun 12 19:28:35 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.2 2000/02/08 13:13:26 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.6 2000/06/13 02:28:35 dawes Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
@@ -6,12 +6,13 @@
  */
 #include "xf86.h"
 #include "xf86str.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86Pci.h"
 #define _INT10_PRIVATE
 #include "int10Defines.h"
 #include "xf86int10.h"
-#include "xf86_ansic.h"
 
 #define REG pInt
 
@@ -24,7 +25,7 @@
     { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
 };
 
-	
+#define nINT10Options (sizeof(INT10Options) / sizeof(INT10Options[0]))
 
 #ifdef DEBUG
 void 
@@ -151,11 +152,48 @@
     EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
     
     if (pEnt->device && pEnt->device->options) {
-	xf86ProcessOptions(pScrn->scrnIndex, pEnt->device->options,
-			   INT10Options);
-	xf86GetOptValBool(INT10Options, OPT_NOINT10, &noint10);
+	OptionInfoRec options[nINT10Options];
+
+	(void)memcpy(options, INT10Options, sizeof(INT10Options));
+	xf86ProcessOptions(pScrn->scrnIndex, pEnt->device->options, options);
+	xf86GetOptValBool(options, OPT_NOINT10, &noint10);
     }
     xfree(pEnt);
 
     return noint10;
 }
+
+
+Bool
+int10_read_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem)
+{
+    int size;
+
+    if (xf86IsPc98())
+        return FALSE;
+
+    if (xf86ReadBIOS(codeSeg << 4,0,(unsigned char *)vbiosMem, 0x10) < 0) {
+	xf86DrvMsg(scrnIndex,X_WARNING,"Cannot read V_BIOS (1)\n");
+	return FALSE;
+    }
+    
+    if (!((*(CARD8*)vbiosMem == 0x55) && (*((CARD8*)vbiosMem+1) == 0xAA)))
+	return FALSE;
+
+    size = *((CARD8*)vbiosMem + 2) * 512;
+
+    if ((size + (codeSeg << 4)) > SYS_BIOS)
+	return FALSE;
+    
+    if (xf86ReadBIOS(codeSeg << 4,0,vbiosMem, size) < 0) {
+	xf86DrvMsg(scrnIndex,X_ERROR,"Cannot read V_BIOS (2)\n");
+	return FALSE;
+    }
+    if (bios_checksum(vbiosMem,size)) {
+	xf86DrvMsg(scrnIndex,X_ERROR,"Bad checksum of V_BIOS \n");
+	return FALSE;
+    }
+    return TRUE;
+}
+	
+
Index: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c
diff -u xc/programs/Xserver/hw/xfree86/int10/xf86int10.c:1.4 xc/programs/Xserver/hw/xfree86/int10/xf86int10.c:1.5
--- xc/programs/Xserver/hw/xfree86/int10/xf86int10.c:1.4	Mon Feb 14 18:00:13 2000
+++ xc/programs/Xserver/hw/xfree86/int10/xf86int10.c	Tue Apr  4 12:25:18 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.4 2000/02/15 02:00:13 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.5 2000/04/04 19:25:18 dawes Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
@@ -7,6 +7,7 @@
 
 #include "xf86.h"
 #include "xf86str.h"
+#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86Pci.h"
 #define _INT10_PRIVATE
Index: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h
diff -u xc/programs/Xserver/hw/xfree86/int10/xf86int10.h:1.3 xc/programs/Xserver/hw/xfree86/int10/xf86int10.h:1.5
--- xc/programs/Xserver/hw/xfree86/int10/xf86int10.h:1.3	Sat Feb 12 18:17:19 2000
+++ xc/programs/Xserver/hw/xfree86/int10/xf86int10.h	Mon Apr 17 09:30:11 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.3 2000/02/13 02:17:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.5 2000/04/17 16:30:11 eich Exp $ */
 
 /*
  *                   XFree86 int10 module
@@ -9,6 +9,9 @@
 #ifndef _XF86INT10_H
 #define _XF86INT10_H
 
+#include "Xmd.h"
+#include "Xdefs.h"
+
 #define SEG_ADDR(x) ((x>>4) & 0xF000)
 #define SEG_OFF(x) (x & 0xFFFF)
 
@@ -162,6 +165,8 @@
 void reset_int_vect(xf86Int10InfoPtr pInt);
 void set_return_trap(xf86Int10InfoPtr pInt);
 Bool int10skip(ScrnInfoPtr pScrn, int entityIndex);
+Bool int10_read_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem);
+
 #ifdef DEBUG
 void dprint(unsigned long start, unsigned long size);
 #endif
Index: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c
diff -u xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c:1.6 xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c:1.7
--- xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c:1.6	Fri Feb 18 08:23:23 2000
+++ xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c	Tue Apr  4 12:25:18 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.6 2000/02/18 16:23:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.7 2000/04/04 19:25:18 dawes Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
@@ -7,9 +7,9 @@
 #include <x86emu.h>
 #include "xf86.h"
 #include "xf86str.h"
+#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Pci.h"
 #include "xf86_libc.h"
 #define _INT10_PRIVATE
Index: xc/programs/Xserver/hw/xfree86/loader/dixsym.c
diff -u xc/programs/Xserver/hw/xfree86/loader/dixsym.c:1.30 xc/programs/Xserver/hw/xfree86/loader/dixsym.c:1.32
--- xc/programs/Xserver/hw/xfree86/loader/dixsym.c:1.30	Sun Mar  5 15:47:52 2000
+++ xc/programs/Xserver/hw/xfree86/loader/dixsym.c	Sun Apr 23 17:19:16 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.30 2000/03/05 23:47:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.32 2000/04/24 00:19:16 mvojkovi Exp $ */
 
 
 /*
@@ -93,6 +93,7 @@
   SYMVAR(dispatchException)
   SYMVAR(isItTimeToYield)
   SYMVAR(ClientStateCallback)
+  SYMVAR(ServerGrabCallback)
   /* dixfonts.c */
   SYMFUNC(CloseFont)
   SYMFUNC(FontToXError)
@@ -192,6 +193,7 @@
   SYMFUNC(AllocateWindowPrivate)
   SYMFUNC(AllocateWindowPrivateIndex)
   SYMFUNC(AllocateScreenPrivateIndex)
+  SYMFUNC(AllocateColormapPrivateIndex)
   /* resource.c */
   SYMFUNC(AddResource)
   SYMFUNC(ChangeResourceValue)
Index: xc/programs/Xserver/hw/xfree86/loader/elfloader.c
diff -u xc/programs/Xserver/hw/xfree86/loader/elfloader.c:1.23 xc/programs/Xserver/hw/xfree86/loader/elfloader.c:1.24
--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c:1.23	Mon Dec 13 15:56:38 1999
+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c	Wed May 17 17:33:19 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.23 1999/12/13 23:56:38 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.24 2000/05/18 00:33:19 dawes Exp $ */
 
 /*
  *
@@ -1236,7 +1236,7 @@
 #else
  /* Linux PPC */
 	case R_PPC_ADDR32: /* 1 */
-	    dest32=(unsigned long *)(secp+rel->r_offset);
+	    dest32=(unsigned int *)(secp+rel->r_offset);
 	    symval=ElfGetSymbolValue(elffile,ELF_R_SYM(rel->r_info));
 #ifdef ELFDEBUG
 	    ELFDEBUG( "R_PPC_ADDR32\t" );
@@ -1328,7 +1328,7 @@
 #endif
 	    break;
 	case R_PPC_REL24: /* 10 */
-	    dest32=(unsigned long *)(secp+rel->r_offset);
+	    dest32=(unsigned int *)(secp+rel->r_offset);
 #ifdef ELFDEBUG
 	    ELFDEBUG( "R_PPC_REL24 %s\t", ElfGetSymbolName(elffile,ELF_R_SYM(rel->r_info)) );
 	    ELFDEBUG( "secp=%x\t", secp );
@@ -1370,7 +1370,7 @@
 #endif
 	    break;
 	case R_PPC_REL32: /* 26 */
-	    dest32=(unsigned long *)(secp+rel->r_offset);
+	    dest32=(unsigned int *)(secp+rel->r_offset);
 #ifdef ELFDEBUG
 	    ELFDEBUG( "R_PPC_REL32\t" );
 	    ELFDEBUG( "secp=%x\t", secp );
Index: xc/programs/Xserver/hw/xfree86/loader/extsym.c
diff -u xc/programs/Xserver/hw/xfree86/loader/extsym.c:1.3 xc/programs/Xserver/hw/xfree86/loader/extsym.c:1.4
--- xc/programs/Xserver/hw/xfree86/loader/extsym.c:1.3	Thu Jan  6 12:10:04 2000
+++ xc/programs/Xserver/hw/xfree86/loader/extsym.c	Thu Mar 30 10:20:58 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.3 2000/01/06 20:10:04 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.4 2000/03/30 18:20:58 mvojkovi Exp $ */
 
 /*
  *
@@ -41,6 +41,11 @@
 extern PanoramiXData *panoramiXdataPtr;
 extern unsigned long XRT_WINDOW;
 extern unsigned long XRT_PIXMAP;
+extern unsigned long XRT_GC;
+extern unsigned long XRT_COLORMAP;
+extern unsigned long XRC_DRAWABLE;
+extern Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
+extern int XineramaDeleteResource(pointer, XID);
 #endif
 
 LOOKUP extLookupTab[] = {
@@ -50,11 +55,16 @@
  SYMVAR(ShmSegType)
 
 #ifdef PANORAMIX
+ SYMFUNC(XineramaRegisterConnectionBlockCallback)
+ SYMFUNC(XineramaDeleteResource)
  SYMVAR(noPanoramiXExtension)
  SYMVAR(PanoramiXNumScreens)
  SYMVAR(panoramiXdataPtr)
  SYMVAR(XRT_WINDOW)
  SYMVAR(XRT_PIXMAP)
+ SYMVAR(XRT_GC)
+ SYMVAR(XRT_COLORMAP)
+ SYMVAR(XRC_DRAWABLE)
 #endif
 
  { 0, 0 },
Index: xc/programs/Xserver/hw/xfree86/loader/loader.c
diff -u xc/programs/Xserver/hw/xfree86/loader/loader.c:1.38 xc/programs/Xserver/hw/xfree86/loader/loader.c:1.41
--- xc/programs/Xserver/hw/xfree86/loader/loader.c:1.38	Tue Dec 28 05:47:43 1999
+++ xc/programs/Xserver/hw/xfree86/loader/loader.c	Mon Apr 17 09:30:12 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.c,v 1.38 1999/12/28 13:47:43 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.c,v 1.41 2000/04/17 16:30:12 eich Exp $ */
 
 /*
  *
@@ -69,7 +69,7 @@
 #endif
 
 #ifdef __EMX__
-void * os2loader_calloc(size_t,size_t);
+void * os2ldcalloc(size_t,size_t);
 #endif
 
 #ifdef HANDLE_IN_HASH_ENTRY
@@ -381,7 +381,7 @@
     if( (ptr=xf86loadercalloc(size,1)) == NULL )
 	FatalError("_LoaderFileToMem() malloc failed\n" );
 #else
-    if( (ptr=os2loader_calloc(size,1)) == NULL )
+    if( (ptr=os2ldcalloc(size,1)) == NULL )
 	FatalError("_LoaderFileToMem() malloc failed\n" );
 #endif
 
@@ -391,6 +391,15 @@
     if(read(fd,ptr,size)!=size)
 	FatalError("\n_LoaderFileToMem() read() failed: %s\n",strerror(errno));
 
+#if defined(linux) && defined(__powerpc__) 
+    { 
+	int i; 
+	for (i = 0; i < size; i += 16) 
+	    ppc_flush_icache(ptr+i); 
+	ppc_flush_icache(ptr+size-1); 
+    } 
+#endif
+
 #ifdef DEBUGMEM
     ErrorF("=%lx\n",ptr);
 #endif
@@ -1158,10 +1167,18 @@
 }
 
 void
+xf86LoaderTrap()
+{
+}
+
+void
 LoaderDefaultFunc(void)
 {
 	ErrorF("\n\n\tThis should not happen!\n"
 		"\tAn unresolved function was called!\n");
+
+	xf86LoaderTrap();
+	
 	FatalError("\n");
 }
 
Index: xc/programs/Xserver/hw/xfree86/loader/loadmod.c
diff -u xc/programs/Xserver/hw/xfree86/loader/loadmod.c:1.50 xc/programs/Xserver/hw/xfree86/loader/loadmod.c:1.53
--- xc/programs/Xserver/hw/xfree86/loader/loadmod.c:1.50	Tue Jan 25 10:37:47 2000
+++ xc/programs/Xserver/hw/xfree86/loader/loadmod.c	Tue Jun  6 19:13:03 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v 1.50 2000/01/25 18:37:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v 1.53 2000/06/07 02:13:03 dawes Exp $ */
 
 /*
  *
@@ -182,12 +182,12 @@
 /* Standard set of module subdirectories to search, in order of preference */
 static const char *stdSubdirs[] =
 {
-	"",
 	"drivers/",
 	"input/",
 	"extensions/",
 	"fonts/",
 	"internal/",
+	"",
 	NULL
 };
 
@@ -386,12 +386,14 @@
 #endif
 	if (strlen(dirpath) > PATH_MAX)
 		return NULL;
+	/*xf86Msg(X_INFO,"OS2DIAG: FindModule: dirpath=%s\n",dirpath);*/
 
 	for (s = subdirs; *s; s++) {
-		if ((dirlen = strlen(dir) + strlen(*s)) > PATH_MAX)
+		if ((dirlen = strlen(dirpath) + strlen(*s)) > PATH_MAX)
 			continue;
 		strcpy(buf, dirpath);
 		strcat(buf, *s);
+		/*xf86Msg(X_INFO,"OS2DIAG: FindModule: buf=%s\n",buf);*/
 		fp = buf + dirlen;
 		if (stat(buf, &stat_buf) == 0 && S_ISDIR(stat_buf.st_mode) &&
 			(d = opendir(buf))) {
@@ -411,6 +413,7 @@
 						len = match[1].rm_eo - match[1].rm_so;
 						if (len == strlen(module) &&
 							strncmp(module, dp->d_name + match[1].rm_so, len) == 0) {
+							/*xf86Msg(X_INFO,"OS2DIAG: matching %s\n",buf);*/
 							name = buf;
 							break;
 						}
@@ -721,35 +724,6 @@
 	return submod;
 }
 
-#if 0
-void
-LoadExtension (ExtensionModule *e)
-{
-	int i;
-
-	if (e == NULL)
-		return;
-	xf86MsgVerb(X_INFO, 2, "Loading extension %s\n", e->name);
-
-	for (i = 0; extension[i].name != NULL; i++)
-	{
-		if (strcmp (extension[i].name, e->name) == 0)
-		{
-			extension[i].initFunc = e->initFunc;
-			extension[i].disablePtr = e->disablePtr;
-			if (e->setupFunc != NULL)
-				e->setupFunc();
-			break;
-		}
-	}
-	if (extension[i].name == NULL)
-	{
-		xf86MsgVerb(X_WARNING, 0,
-			"Extension \"%s\" is not recognised\n", e->name);
-	}
-}
-#endif
-
 ModuleDescPtr
 DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)
 {
@@ -837,6 +811,7 @@
 	int noncanonical = 0;
 	char *m = NULL;
 
+	/*xf86Msg(X_INFO,"OS2DIAG: LoadModule: %s\n",module);*/
 	xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);
 
 	patterns = InitPatterns(patternlist);
Index: xc/programs/Xserver/hw/xfree86/loader/misym.c
diff -u xc/programs/Xserver/hw/xfree86/loader/misym.c:1.29 xc/programs/Xserver/hw/xfree86/loader/misym.c:1.31
--- xc/programs/Xserver/hw/xfree86/loader/misym.c:1.29	Thu Feb 10 22:34:45 2000
+++ xc/programs/Xserver/hw/xfree86/loader/misym.c	Thu May 18 16:21:41 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.29 2000/02/11 06:34:45 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.31 2000/05/18 23:21:41 dawes Exp $ */
 
 /*
  *
@@ -79,6 +79,7 @@
    SYMFUNC(miImageGlyphBlt)
    SYMFUNC(miPolyGlyphBlt)
    SYMFUNC(miFillPolygon)
+   SYMFUNC(miFillConvexPoly)
    SYMFUNC(miPolySegment)
    SYMFUNC(miZeroLine)
    SYMFUNC(miWideLine)
@@ -159,6 +160,7 @@
    SYMFUNC(miOverlayCollectUnderlayRegions)
    SYMFUNC(miInitOverlay)
    SYMFUNC(miOverlayComputeCompositeClip)
+   SYMFUNC(miOverlaySetRootClip)
    SYMVAR(miZeroLineScreenIndex)
    SYMVAR(miSpritePointerFuncs)
    SYMVAR(miPointerScreenIndex)
Index: xc/programs/Xserver/hw/xfree86/loader/os2funcs.c
diff -u xc/programs/Xserver/hw/xfree86/loader/os2funcs.c:1.4 xc/programs/Xserver/hw/xfree86/loader/os2funcs.c:1.5
--- xc/programs/Xserver/hw/xfree86/loader/os2funcs.c:1.4	Mon Mar 10 02:12:22 1997
+++ xc/programs/Xserver/hw/xfree86/loader/os2funcs.c	Wed Apr  5 11:13:50 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/os2funcs.c,v 1.4 1997/03/10 10:12:22 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/os2funcs.c,v 1.5 2000/04/05 18:13:50 dawes Exp $ */
 /*
  * (c) Copyright 1997 by Sebastien Marineau
  *                      <marineau@genie.uottawa.ca>
@@ -39,110 +39,143 @@
 #include <sys/types.h>
 #include <umalloc.h>
 #include "os.h"
+#include "xf86str.h"
 
-#define RESERVED_BLOCKS 512  /* reserve 2MB memory for modules */
+#define RESERVED_BLOCKS 4096  /* reserve 16MB memory for modules */
 
-void *os2loader_AddToHeap(Heap_t, size_t *, int *);
-void os2loader_RemoveFromHeap(Heap_t, void *, size_t);
+void *os2ldAddToHeap(Heap_t, size_t *, int *);
+void os2ldRemoveFromHeap(Heap_t, void *, size_t);
 
-PVOID os2loader_CommitedTop;
-PVOID os2loader_baseAddress;
-Heap_t os2loader_heapAddress;
-int os2loader_TotalCommitedBlocks;
-
-void *os2loader_calloc(size_t num_elem, size_t size_elem){
-APIRET rc;
-int ret;
-static BOOL FirstTime=TRUE;
-void *allocMem;
-
-if(FirstTime){
-	rc=DosAllocMem(&os2loader_baseAddress,RESERVED_BLOCKS * 4096, 
-                PAG_READ | PAG_WRITE | PAG_EXECUTE);
-	if(rc!=0) {
-		ErrorF("OS/2AllocMem: Could not create heap for module loading\n");
-		return(NULL);
+PVOID os2ldCommitedTop;
+PVOID os2ldBase;
+Heap_t os2ldHeap;
+int os2ldTotalCommitedBlocks;
+static BOOL FirstTime = TRUE;
+
+void *os2ldcalloc(size_t num_elem, size_t size_elem) {
+	APIRET rc;
+	int ret;
+
+	if (FirstTime) {
+		if ((rc=DosAllocMem(&os2ldBase,RESERVED_BLOCKS * 4096, 
+				PAG_READ | PAG_WRITE | PAG_EXECUTE)) != 0) {
+			xf86Msg(X_ERROR,
+				"OS2LD: DosAllocMem failed, rc=%d\n",
+				rc);
+			return NULL;
 		}
 
-/* Now commit the first 128Kb, the rest will be done dynamically */
-        rc=DosSetMem(os2loader_baseAddress,32*4096, PAG_DEFAULT | PAG_COMMIT); 
-        	if(rc!=0) {
-		ErrorF("OS/2AllocMem: Could not commit heap memory!\n");
-		DosFreeMem(os2loader_baseAddress);
-                return(NULL);
+		/* Now commit the first 128Kb, the rest will 
+		 * be done dynamically */
+		if ((rc=DosSetMem(os2ldBase,
+				  32*4096,
+				  PAG_DEFAULT | PAG_COMMIT)) != 0) {
+			xf86Msg(X_ERROR,
+				"OS2LD: DosSetMem failed, rc=%d\n",rc);
+			DosFreeMem(os2ldBase);
+			return NULL;
 		}
-        os2loader_CommitedTop=os2loader_baseAddress + 32*4096;
-        os2loader_TotalCommitedBlocks=32;
-	ErrorF("OS2Alloc: allocated mem for heap, rc=%d, addr=%p\n",rc,os2loader_baseAddress);
-
-	if((os2loader_heapAddress=_ucreate(os2loader_baseAddress,32*4096,_BLOCK_CLEAN,
-		_HEAP_REGULAR,os2loader_AddToHeap, os2loader_RemoveFromHeap))==NULL){
-		ErrorF("OS/2AllocMem: Could not create heap for loadable modules\n");
-		DosFreeMem(os2loader_baseAddress);
-		return(NULL);
+	        os2ldCommitedTop = os2ldBase + 32*4096;
+		os2ldTotalCommitedBlocks = 32;
+#ifdef DEBUG
+		xf86Msg(X_INFO,
+			"OS2LD: Initial heap at addr=%p\n",
+			os2ldBase);
+#endif
+
+		if ((os2ldHeap=_ucreate(os2ldBase,
+					32*4096, _BLOCK_CLEAN,
+					_HEAP_REGULAR, os2ldAddToHeap, 
+					os2ldRemoveFromHeap)) == NULL) {
+			xf86Msg(X_ERROR,
+				"OS2LD: heap creation failed\n");
+			DosFreeMem(os2ldBase);
+			return NULL;
 		}
 	
-	ret=_uopen(os2loader_heapAddress);
-	if(ret!=0){
-		ErrorF("OS/2AllocMem: Could not open heap for loadable modules\n");
-		ret=_udestroy(os2loader_heapAddress,_FORCE);
-		DosFreeMem(os2loader_baseAddress);
-		return(NULL);
+		if ((ret=_uopen(os2ldHeap)) != 0) {
+			xf86Msg(X_ERROR,
+				"OS2LD: heap open failed\n");
+			ret = _udestroy(os2ldHeap,_FORCE);
+			DosFreeMem(os2ldBase);
+			return(NULL);
 		}
-	FirstTime=FALSE;
-	ErrorF("OS/2: done creating heap, addr=%p\n",os2loader_heapAddress);
+
+		FirstTime = FALSE;
+
+#ifdef DEBUG
+		xf86Msg(X_INFO,"OS2LD: Created module heap at addr=%p\n",
+			os2ldHeap);
+#endif
 	}
 
-allocMem=_ucalloc(os2loader_heapAddress,num_elem,size_elem);
-return(allocMem);
+	return _ucalloc(os2ldHeap,num_elem,size_elem);
 }
-
 
-void *os2loader_AddToHeap(Heap_t H, size_t *new_size, int *PCLEAN)
+void *os2ldAddToHeap(Heap_t H, size_t *new_size, int *PCLEAN)
 {
-PVOID NewBase;
-long adjusted_size;
-long blocks;
-APIRET rc;
-
-   if(H != os2loader_heapAddress){
-      ErrorF("OS/2: Tried to grow an inexistant heap, p=%08x\n",H);
-      return (NULL);
-      }
-   NewBase=os2loader_CommitedTop;
-   adjusted_size = (*new_size/65536) * 65536;
-   if((*new_size % 65536)> 0 ) adjusted_size += 65536;
-   blocks=adjusted_size / 4096;
-   if((os2loader_TotalCommitedBlocks + blocks)>RESERVED_BLOCKS){
-      ErrorF("OS/2 GrowHeap: Could not allocate any more memory for module loading!\n");
-      ErrorF("Total reserved memory of %ld bytes is exhausted\n",RESERVED_BLOCKS * 4096);
-      return(NULL);
-      }
-   rc = DosSetMem(NewBase, adjusted_size, PAG_DEFAULT | PAG_COMMIT);
-   if(rc!=0) {
-	ErrorF("OS/2 GrowHeap: Could not grow heap! Requested size %d, \n", adjusted_size);
-        return(NULL);
-	}
-   os2loader_CommitedTop+=adjusted_size;
-   os2loader_TotalCommitedBlocks += blocks;
-   *PCLEAN = _BLOCK_CLEAN;
-   *new_size=adjusted_size;
-   ErrorF("OS/2: Added %d bytes to heap, addr %08x\n",adjusted_size, NewBase);
-   return(NewBase);
+	PVOID NewBase;
+	long adjusted_size;
+	long blocks;
+	APIRET rc;
+
+	if (H != os2ldHeap) {
+		xf86Msg(X_ERROR,
+			"OS2LD: Heap corruption in GrowHeap, p=%08x\n",H);
+		return NULL;
+	}
+	NewBase = os2ldCommitedTop;
+	adjusted_size = (*new_size/65536) * 65536;
+	if ((*new_size % 65536) > 0) 
+		adjusted_size += 65536;
+	blocks = adjusted_size / 4096;
+
+	if ((os2ldTotalCommitedBlocks + blocks) > RESERVED_BLOCKS) {
+		xf86Msg(X_ERROR,
+			"OS2LD: Out of memory in GrowHeap\n");
+		xf86Msg(X_ERROR,
+			"OS2LD: Max available memory is of %ld bytes\n",
+			RESERVED_BLOCKS * 4096);
+		return NULL;
+	}
+	if ((rc=DosSetMem(NewBase, adjusted_size, PAG_DEFAULT | PAG_COMMIT)) != 0) {
+		xf86Msg(X_ERROR,
+			"OS2LD: DosSetMem failed in GrowHeap, size req'd=%d, rc=%d\n",
+			adjusted_size,
+			rc);
+		return NULL;
+	}
+
+	os2ldCommitedTop += adjusted_size;
+	os2ldTotalCommitedBlocks += blocks;
+	*PCLEAN = _BLOCK_CLEAN;
+	*new_size = adjusted_size;
+#ifdef DEBUG
+	xf86Msg(X_INFO,"OS2LD: Heap extended by %d bytes, addr=%p\n",
+		adjusted_size, NewBase);
+#endif
+	return NewBase;
 }
 
-void os2loader_RemoveFromHeap(Heap_t H, void *memory, size_t size)
+void os2ldRemoveFromHeap(Heap_t H, void *memory, size_t size)
 {
-   if(H != os2loader_heapAddress){
-      ErrorF("OS/2: Tried to shrink an inexistant heap, p=%08x\n",H);
-      return;
-      }
-/* Currently we do nothing, as we do not keep track of the commited memory */
-ErrorF("OS/2: module heap requests that heap memory be deallocated. Request ignored\n");
-
-/* Only handle it if it is the base address */
-   if(memory == os2loader_baseAddress) {
-        DosFreeMem(os2loader_baseAddress);
-        ErrorF("OS/2: total heap area was deallocated\n");
-        }
+	if (H != os2ldHeap) {
+		xf86Msg(X_ERROR,
+			"OS2LD: Heap corruption in ShrinkHeap, p=%08x\n",H);
+		return;
+	}
+
+	/* Currently we do nothing, as we do not keep track of the
+	 * commited memory */
+
+
+	/* Only handle it if it is the base address */
+	if (memory == os2ldBase) {
+		DosFreeMem(os2ldBase);
+#ifdef DEBUG
+		xf86Msg(X_INFO,"OS2LD: total heap area deallocated\n");
+#endif
+		os2ldBase = 0;
+		FirstTime = TRUE;
+	}
 }
Index: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c
diff -u xc/programs/Xserver/hw/xfree86/loader/xf86sym.c:1.134 xc/programs/Xserver/hw/xfree86/loader/xf86sym.c:1.155
--- xc/programs/Xserver/hw/xfree86/loader/xf86sym.c:1.134	Wed Mar  1 08:01:30 2000
+++ xc/programs/Xserver/hw/xfree86/loader/xf86sym.c	Fri Jun 30 12:06:58 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v 1.134 2000/03/01 16:01:30 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v 1.155 2000/06/30 19:06:58 keithp Exp $ */
 
 /*
  *
@@ -53,8 +53,13 @@
 #include "xisb.h"
 #include "xf86Priv.h"
 #include "vbe.h"
+#include "xf86sbusBus.h"
 
-extern xf86MonPtr ConfiguredMonitor;
+#ifdef __FreeBSD__
+/* XXX used in drmOpen(). This should change to use a less os-specific
+ * method. */
+int sysctlbyname(const char*, void *, size_t *, void *, size_t);
+#endif
 
 /* XXX Should get all of these from elsewhere */
 #if defined (PowerMAX_OS)
@@ -75,6 +80,7 @@
 
 #if defined(__alpha__)
 #ifdef linux
+extern unsigned long _bus_base(void);
 extern void _outb(char val, unsigned short port);
 extern void _outw(short val, unsigned short port);
 extern void _outl(int val, unsigned short port);
@@ -137,7 +143,12 @@
 
 #if defined(__powerpc__) && (defined(Lynx) || defined(linux))
 void eieio();
+void _restf14();
 void _restf17();
+void _restf18();
+void _restf19();
+void _restf20();
+void _restf22();
 void _restf23();
 void _restf24();
 void _restf25();
@@ -145,7 +156,12 @@
 void _restf27();
 void _restf28();
 void _restf29();
+void _savef14();
 void _savef17();
+void _savef18();
+void _savef19();
+void _savef20();
+void _savef22();
 void _savef23();
 void _savef24();
 void _savef25();
@@ -231,6 +247,7 @@
    SYMFUNC(xf86GetSerialModemState)
    SYMFUNC(xf86SerialModemSetBits)
    SYMFUNC(xf86SerialModemClearBits)
+   SYMFUNC(xf86LoadKernelModule)
    SYMFUNC(xf86OSMouseInit)
 
 #ifdef XINPUT
@@ -247,7 +264,7 @@
    SYMFUNC(xf86CheckPciSlot)
    SYMFUNC(xf86ClaimPciSlot)
    SYMFUNC(xf86GetPciVideoInfo)
-   SYMFUNC(xf86GetEntityForPciInfo)
+   SYMFUNC(xf86GetPciEntity)
    SYMFUNC(xf86GetPciConfigInfo)
    SYMFUNC(xf86SetPciVideo)
    SYMFUNC(xf86ClaimIsaSlot)
@@ -260,10 +277,17 @@
    SYMFUNC(xf86IsPrimaryIsa)
    SYMFUNC(xf86CheckPciGAType)
    SYMFUNC(xf86PrintResList)
+   SYMFUNC(xf86AddResToList)
+   SYMFUNC(xf86JoinResLists)
+   SYMFUNC(xf86DupResList)
+   SYMFUNC(xf86FreeResList)
    SYMFUNC(xf86ClaimFixedResources)
    SYMFUNC(xf86AddEntityToScreen)
+   SYMFUNC(xf86SetEntityInstanceForScreen)
    SYMFUNC(xf86RemoveEntityFromScreen)
    SYMFUNC(xf86GetEntityInfo)
+   SYMFUNC(xf86GetNumEntityInstances)
+   SYMFUNC(xf86GetDevFromEntity)
    SYMFUNC(xf86GetPciInfoForEntity)
    SYMFUNC(xf86SetEntityFuncs)
    SYMFUNC(xf86DeallocateResourcesForEntity)
@@ -284,10 +308,23 @@
    SYMFUNC(xf86FindPciClass)
    SYMFUNC(xf86RegisterStateChangeNotificationCallback)
    SYMFUNC(xf86DeregisterStateChangeNotificationCallback)
+   SYMFUNC(xf86NoSharedResources)
 #ifdef async
    SYMFUNC(xf86QueueAsyncEvent)
 #endif
-
+   /* Shared Accel Accessor Functions */
+   SYMFUNC(xf86GetLastScrnFlag)
+   SYMFUNC(xf86SetLastScrnFlag)
+   SYMFUNC(xf86IsEntityShared)
+   SYMFUNC(xf86SetEntityShared)
+   SYMFUNC(xf86IsEntitySharable)
+   SYMFUNC(xf86SetEntitySharable)
+   SYMFUNC(xf86IsPrimInitDone)
+   SYMFUNC(xf86SetPrimInitDone)
+   SYMFUNC(xf86ClearPrimInitDone)
+   SYMFUNC(xf86AllocateEntityPrivateIndex)
+   SYMFUNC(xf86GetEntityPrivate)
+     
    /* xf86Configure.c */
    SYMFUNC(xf86AddDeviceToConfigure)
 	   
@@ -305,6 +342,7 @@
    SYMFUNC(DGAAvailable)
    SYMFUNC(DGAActive)
    SYMFUNC(DGASetMode)
+   SYMFUNC(DGASetInputMode)
    SYMFUNC(DGASelectInput)
    SYMFUNC(DGAGetViewportStatus)
    SYMFUNC(DGASetViewport)
@@ -384,7 +422,9 @@
    SYMFUNC(xf86GetAllowMouseOpenFail)
    SYMFUNC(xf86IsPc98)
    SYMFUNC(xf86GetClocks)
+   SYMFUNC(xf86LoadDrvSubModule)
    SYMFUNC(xf86LoadSubModule)
+   SYMFUNC(xf86UnloadSubModule)
    SYMFUNC(xf86LoaderCheckSymbol)
    SYMFUNC(xf86LoaderReqSymLists)
    SYMFUNC(xf86LoaderReqSymbols)
@@ -396,6 +436,8 @@
    /* SYMFUNC(xf86NewSerialNumber) */
    SYMFUNC(xf86FindXvOptions)
    SYMFUNC(xf86GetOS)
+   SYMFUNC(xf86ConfigPciEntity)
+   SYMFUNC(xf86ConfigIsaEntity)
    SYMFUNC(xf86ConfigActivePciEntity)
    SYMFUNC(xf86ConfigActiveIsaEntity)
    SYMFUNC(xf86ConfigPciEntityInactive)
@@ -404,6 +446,23 @@
    SYMFUNC(xf86RegisterRootWindowProperty)
    SYMFUNC(xf86IsUnblank)
 
+#ifdef __sparc__
+   /* xf86sbusBus.c */
+   SYMFUNC(xf86MatchSbusInstances)
+   SYMFUNC(xf86GetSbusInfoForEntity)
+   SYMFUNC(xf86GetEntityForSbusInfo)
+   SYMFUNC(xf86SbusUseBuiltinMode)
+   SYMFUNC(xf86MapSbusMem)
+   SYMFUNC(xf86UnmapSbusMem)
+   SYMFUNC(xf86SbusHideOsHwCursor)
+   SYMFUNC(xf86SbusSetOsHwCursorCmap)
+   SYMFUNC(xf86SbusHandleColormaps)
+   SYMFUNC(sparcPromInit)
+   SYMFUNC(sparcPromClose)
+   SYMFUNC(sparcPromGetProperty)
+   SYMFUNC(sparcPromGetBool)
+#endif
+
    /* xf86Init.c */
    SYMFUNC(xf86GetPixFormat)
    SYMFUNC(xf86GetBppFromDepth)
@@ -472,6 +531,7 @@
    SYMFUNC(xf86FBManagerRunning)
    SYMFUNC(xf86QueryLargestOffscreenArea)
    SYMFUNC(xf86PurgeUnlockedOffscreenAreas)
+   SYMFUNC(xf86RegisterOffscreenManager)
 
    /* xf86cmap.c */
    SYMFUNC(xf86HandleColormaps)
@@ -481,6 +541,9 @@
    SYMFUNC(xf86XVRegisterGenericAdaptorDriver)
    SYMFUNC(xf86XVListGenericAdaptors)
    SYMFUNC(xf86XVRegisterOffscreenImages)
+   SYMFUNC(xf86XVQueryOffscreenImages)
+   SYMFUNC(xf86XVAllocateVideoAdaptorRec)
+   SYMFUNC(xf86XVFreeVideoAdaptorRec)
 
    /* xf86VidMode.c */
    SYMFUNC(VidModeExtensionInit)
@@ -521,6 +584,7 @@
    SYMFUNC(MiscExtGetKbdValue)
    SYMFUNC(MiscExtSetKbdValue)
    SYMFUNC(MiscExtCreateStruct)
+   SYMFUNC(MiscExtDestroyStruct)
    SYMFUNC(MiscExtApply)
 #endif
 
@@ -778,6 +842,8 @@
    SYMFUNC(xf86fstat)
    SYMFUNC(xf86access)
    SYMFUNC(xf86geteuid)
+   SYMFUNC(xf86getegid)
+   SYMFUNC(xf86getpid)
    SYMFUNC(xf86mknod)
    SYMFUNC(xf86chmod)
    SYMFUNC(xf86chown)
@@ -795,6 +861,9 @@
                                    of the X server) easier. */
    SYMFUNC(xf86InstallSIGIOHandler)
    SYMFUNC(xf86RemoveSIGIOHandler)
+#ifdef __alpha__
+   SYMFUNC(_bus_base)
+#endif
 #endif
    SYMFUNC(xf86BlockSIGIO)
    SYMFUNC(xf86UnblockSIGIO)
@@ -864,7 +933,12 @@
    SYMFUNC(testinx2)
    SYMFUNC(testinx)
 #if defined(Lynx)
+   SYMFUNC(_restf14)
    SYMFUNC(_restf17)
+   SYMFUNC(_restf18)
+   SYMFUNC(_restf19)
+   SYMFUNC(_restf20)
+   SYMFUNC(_restf22)
    SYMFUNC(_restf23)
    SYMFUNC(_restf24)
    SYMFUNC(_restf25)
@@ -872,7 +946,12 @@
    SYMFUNC(_restf27)
    SYMFUNC(_restf28)
    SYMFUNC(_restf29)
+   SYMFUNC(_savef14)
    SYMFUNC(_savef17)
+   SYMFUNC(_savef18)
+   SYMFUNC(_savef19)
+   SYMFUNC(_savef20)
+   SYMFUNC(_savef22)
    SYMFUNC(_savef23)
    SYMFUNC(_savef24)
    SYMFUNC(_savef25)
@@ -889,6 +968,10 @@
    SYMFUNC(debug_outw)
    SYMFUNC(debug_outl)
 #endif
+#endif
+
+#ifdef __FreeBSD__
+   SYMFUNC(sysctlbyname)
 #endif
 
 /*
Index: xc/programs/Xserver/hw/xfree86/os-support/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/Imakefile:3.37 xc/programs/Xserver/hw/xfree86/os-support/Imakefile:3.41
--- xc/programs/Xserver/hw/xfree86/os-support/Imakefile:3.37	Mon Feb 21 17:02:34 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/Imakefile	Fri Jun 30 10:15:17 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v 3.37 2000/02/22 01:02:34 mvojkovi Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v 3.41 2000/06/30 17:15:17 dawes Exp $
 
 
 
@@ -13,7 +13,8 @@
 #if defined(i386Architecture) || defined(ia64Architecture) || \
 	(defined(LinuxArchitecture) && defined(AlphaArchitecture)) || \
 	(defined(FreeBSDArchitecture) && defined(AlphaArchitecture)) || \
-	defined(PpcArchitecture) || defined(SparcArchitecture)
+	defined(PpcArchitecture) || defined(SparcArchitecture) || \
+	(defined(LinuxArchitecture) && defined(MipsArchitecture))
 BUS_SUBDIR = bus
 #endif
 
@@ -62,7 +63,7 @@
 #endif
 
 #if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture)
-# if defined(BSD386Architecture)
+# if defined(BSDOSArchitecture)
 OS_SUBDIR = bsdi
 # else
 OS_SUBDIR = bsd
@@ -100,6 +101,7 @@
 #if BuildXF86DRI && !DoLoadableServer
 DRM_SRC = $(OS_SUBDIR)/drm/?*.c
 DRM_OBJ = $(OS_SUBDIR)/drm/?*.o
+DRM_DONES = $(OS_SUBDIR)/drm/DONE
 #endif
 
 SUBDIRS = $(OS_SUBDIR) $(BUS_SUBDIR) misc vbe
@@ -107,7 +109,7 @@
 SRCS = $(OS_SUBDIR)/?*.c $(BUS_SUBDIR)/?*.c misc/?*.c vbe/?*.c $(DRM_SRC)
 OBJS = $(OS_SUBDIR)/?*.o $(BUS_SUBDIR)/?*.o misc/?*.o vbe/?*.o $(DRM_OBJ)
 
-DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE vbe/DONE
+DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE vbe/DONE $(DRM_DONES)
 
 #if HasParallelMake
 MakeMutex($(SUBDIRS) $(OBJS) $(DONES))
@@ -128,6 +130,7 @@
 DependSubdirs($(SUBDIRS))
 
 InstallDriverSDKNonExecFile(xf86_OSproc.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(xf86_OSlib.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xf86_ansic.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xf86_libc.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xf86drm.h,$(DRIVERSDKINCLUDEDIR))
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h:1.8 xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h:1.9
--- xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h:1.8	Thu Feb 10 14:33:43 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h	Mon Apr 17 09:30:12 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h,v 1.8 2000/02/10 22:33:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h,v 1.9 2000/04/17 16:30:12 eich Exp $ */
 
 /*
  * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
@@ -100,7 +100,6 @@
     const char *	protocol;
     int			protocolID;
     int			class;
-    Bool		automatic;
     int			mseModel;
     int			baudRate;
     int			oldBaudRate;
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h:3.71 xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h:3.72
--- xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h:3.71	Tue Feb  8 05:13:27 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h	Fri Jun 23 15:42:06 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.71 2000/02/08 13:13:27 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.72 2000/06/23 22:42:06 dawes Exp $ */
 /*
  * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1992 by David Dawes <dawes@XFree86.org>
@@ -470,11 +470,20 @@
 #   if defined(PCVT_SUPPORT)
 #    if !defined(SYSCONS_SUPPORT)
       /* no syscons, so include pcvt specific header file */
-#     if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#     if defined(__FreeBSD__) || defined(__OpenBSD__)
 #      include <machine/pcvt_ioctl.h>
 #     else
-#      include <sys/pcvt_ioctl.h>
-#     endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ */
+#      if defined(__NetBSD__)
+#       if defined(WSCONS_SUPPORT)
+         /* NetBSD's wscons has a PCVT-compatibility module. */
+#        include <dev/wscons/wsdisplay_usl_io.h>
+#       else
+#        include <machine/pcvt_ioctl.h>
+#       endif /* WSCONS_SUPPORT */
+#      else
+#       include <sys/pcvt_ioctl.h>
+#      endif /* __NetBSD__ */
+#     endif /* __FreeBSD__ || __OpenBSD__ */
 #    else /* pcvt and syscons: hard-code the ID magic */
 #     define VGAPCVTID _IOWR('V',113, struct pcvtid)
       struct pcvtid {
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h:3.39 xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h:3.42
--- xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h:3.39	Tue Feb  8 05:13:27 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h	Sat Jun 24 10:23:57 2000
@@ -64,7 +64,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.39 2000/02/08 13:13:27 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.42 2000/06/24 17:23:57 dawes Exp $ */
 
 #ifndef _XF86_OSPROC_H
 #define _XF86_OSPROC_H
@@ -164,7 +164,7 @@
 extern int xf86GetSerialModemState(int fd);
 extern int xf86SerialModemSetBits(int fd, int bits);
 extern int xf86SerialModemClearBits(int fd, int bits);
-
+extern int xf86LoadKernelModule(const char *pathname);
 
 #if defined(__alpha__)
 /* entry points for Mmio memory access routines */
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h:3.36 xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h:3.40
--- xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h:3.36	Wed Feb 16 07:28:34 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h	Fri Jun 16 17:03:26 2000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997,1998 by The XFree86 Project, Inc
+ * Copyright 1997-2000 by The XFree86 Project, Inc
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -22,15 +22,32 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v 3.36 2000/02/16 15:28:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v 3.40 2000/06/17 00:03:26 martin Exp $ */
 
 #ifndef _XF86_ANSIC_H
 #define _XF86_ANSIC_H
 
-#ifndef FONTMODULE
-#include "misc.h"
-#endif
-#include "xf86_libc.h"
+/* Handle <stdarg.h> */
+
+#ifndef IN_MODULE
+# include <stdarg.h>
+#else /* !IN_MODULE */
+# ifndef __OS2ELF__
+#  include <stdarg.h>
+# else /* __OS2ELF__ */
+   /* EMX/gcc_elf under OS/2 does not have native header files */
+#  if !defined (_VA_LIST)
+#   define _VA_LIST
+    typedef char *va_list;
+#  endif
+#  define _VA_ROUND(t) ((sizeof (t) + 3) & -4)
+#  if !defined (va_start)
+#   define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4)
+#   define va_end(ap) (ap = 0, (void)0)
+#   define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t)))
+#  endif
+# endif /* __OS2ELF__ */
+#endif /* IN_MODULE */
 
 /*
  * The first set of definitions are required both for modules and
@@ -64,6 +81,11 @@
 #ifndef SHRT_MIN
 #define SHRT_MIN ((short)(1 << (x_SHORTBITS - 1)))
 #endif
+
+#ifndef FONTMODULE
+#include "misc.h"
+#endif
+#include "xf86_libc.h"
 #ifndef SHRT_MAX
 #define SHRT_MAX ((short)~SHRT_MIN)
 #endif
@@ -107,8 +129,6 @@
 #define MAXLONG LONG_MAX
 #endif
 
-#include <stdarg.h>
-
 /*
  * ANSI C compilers only.
  */
@@ -267,6 +287,8 @@
 extern int xf86chmod(const char *, xf86mode_t);
 extern int xf86chown(const char *, xf86uid_t, xf86gid_t);
 extern xf86uid_t xf86geteuid(void);
+extern xf86gid_t xf86getegid(void);
+extern int xf86getpid(void);
 extern int xf86mknod(const char *, xf86mode_t, xf86dev_t);
 extern int xf86mkdir(const char *, xf86mode_t);
 unsigned int xf86sleep(unsigned int seconds);
@@ -296,7 +318,7 @@
 
 extern int xf86getpagesize(void);
 extern void xf86usleep(unsigned long);
-extern void xf86getsecs(CARD32 *, CARD32 *);
+extern void xf86getsecs(long *, long *);
 #ifndef DONT_DEFINE_WRAPPERS
 #undef getpagesize
 #define getpagesize()		xf86getpagesize()
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h:3.47 xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h:3.48
--- xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h:3.47	Tue Feb  8 09:19:21 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h	Fri Jun 16 17:03:26 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.47 2000/02/08 17:19:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.48 2000/06/17 00:03:26 martin Exp $ */
 
 
 
@@ -421,6 +421,10 @@
 #define chown(a,b,c)            xf86chown(a,b,c)
 #undef geteuid
 #define geteuid                 xf86geteuid
+#undef getegid
+#define getegid                 xf86getegid
+#undef getpid
+#define getpid                  xf86getpid
 #undef mknod
 #define mknod(a,b,c)            xf86mknod(a,b,c)
 #undef sleep
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h:1.7 xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h:1.9
--- xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h:1.7	Tue Feb 22 20:47:21 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h	Mon Jun 19 22:08:48 2000
@@ -1,8 +1,8 @@
 /* xf86drm.h -- OS-independent header for DRM user-level library interface
  * Created: Tue Jan  5 08:17:23 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:46:21 2000 by kevin@precisioninsight.com
  *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v 1.7 2000/02/23 04:47:21 martin Exp $
+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v 1.9 2000/06/20 05:08:48 dawes Exp $
  * 
  */
 
@@ -65,7 +67,8 @@
 typedef enum {
     DRM_FRAME_BUFFER    = 0,      /* WC, no caching, no core dump           */
     DRM_REGISTERS       = 1,      /* no caching, no core dump               */
-    DRM_SHM             = 2       /* shared, cached                         */
+    DRM_SHM             = 2,      /* shared, cached                         */
+    DRM_AGP             = 3	  /* AGP/GART                               */
 } drmMapType;
 
 typedef enum {
@@ -95,6 +98,11 @@
 } drmDMAFlags;
 
 typedef enum {
+    DRM_PAGE_ALIGN       = 0x01,
+    DRM_AGP_BUFFER       = 0x02
+} drmBufDescFlags;
+
+typedef enum {
     DRM_LOCK_READY      = 0x01, /* Wait until hardware is ready for DMA */
     DRM_LOCK_QUIESCENT  = 0x02, /* Wait until hardware quiescent        */
     DRM_LOCK_FLUSH      = 0x04, /* Flush this context's DMA queue first */
@@ -195,8 +203,30 @@
 	} while (0)
 #endif
 
+#ifdef __sparc__
+#define DRM_CAS(lock,old,new,__ret)				\
+do {	register unsigned int __old __asm("o0");		\
+	register unsigned int __new __asm("o1");		\
+	register volatile unsigned int *__lock __asm("o2");	\
+	__old = old;						\
+	__new = new;						\
+	__lock = (volatile unsigned int *)lock;			\
+	__asm__ __volatile__(					\
+		/*"cas [%2], %3, %0"*/				\
+		".word 0xd3e29008\n\t"				\
+		/*"membar #StoreStore | #StoreLoad"*/		\
+		".word 0x8143e00a"				\
+		: "=&r" (__new)					\
+		: "0" (__new),					\
+		  "r" (__lock),					\
+		  "r" (__old)					\
+		: "memory");					\
+	__ret = (__new != __old);				\
+} while(0)
+#endif
+
 #ifndef DRM_CAS
-#define DRM_CAS(lock,old,new,ret) /* FAST LOCK FAILS */
+#define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */
 #endif
 
 #define DRM_LIGHT_LOCK(fd,lock,context)                                \
@@ -291,7 +321,9 @@
 			       drmMapType type,
 			       drmMapFlags flags,
 			       drmHandlePtr handle);
-extern int           drmAddBufs(int fd, int count, int size, int flags);
+extern int           drmAddBufs(int fd, int count, int size, 
+				drmBufDescFlags flags,
+				int agp_offset);
 extern int           drmMarkBufs(int fd, double low, double high);
 extern int           drmCreateContext(int fd, drmContextPtr handle);
 extern int           drmSetContextFlags(int fd, drmContext context,
@@ -331,6 +363,29 @@
 			        drmLockFlags flags);
 extern int           drmUnlock(int fd, drmContext context);
 extern int           drmFinish(int fd, int context, drmLockFlags flags);
+
+/* AGP/GART support: X server (root) only */
+extern int           drmAgpAcquire(int fd);
+extern int           drmAgpRelease(int fd);
+extern int           drmAgpEnable(int fd, unsigned long mode);
+extern int           drmAgpAlloc(int fd, unsigned long size, 
+				 unsigned long type, unsigned long *address,
+				 unsigned long *handle);
+extern int           drmAgpFree(int fd, unsigned long handle);
+extern int 	     drmAgpBind(int fd, unsigned long handle,
+				unsigned long offset);
+extern int           drmAgpUnbind(int fd, unsigned long handle);
+
+/* AGP/GART info: authenticated client and/or X */
+extern int           drmAgpVersionMajor(int fd);
+extern int           drmAgpVersionMinor(int fd);
+extern unsigned long drmAgpGetMode(int fd);
+extern unsigned long drmAgpBase(int fd); /* Physical location */
+extern unsigned long drmAgpSize(int fd); /* Bytes */
+extern unsigned long drmAgpMemoryUsed(int fd);
+extern unsigned long drmAgpMemoryAvail(int fd);
+extern unsigned int  drmAgpVendorId(int fd);
+extern unsigned int  drmAgpDeviceId(int fd);
 
 /* Support routines */
 extern int           drmError(int err, const char *label);
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86drmI810.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/xf86drmI810.h:3.1
--- /dev/null	Sat Jul  1 20:43:13 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86drmI810.h	Fri Jun 16 17:03:26 2000
@@ -0,0 +1,46 @@
+
+/* WARNING: If you change any of these defines, make sure to change
+ * the kernel include file as well (i810_drm.h)
+ */
+
+#ifndef _XF86DRI_I810_H_
+#define _XF86DRI_I810_H_
+
+#ifndef _I810_DEFINES_
+#define _I810_DEFINES_
+#define I810_USE_BATCH 1
+
+#define I810_DMA_BUF_ORDER     12
+#define I810_DMA_BUF_SZ        (1<<I810_DMA_BUF_ORDER)
+#define I810_DMA_BUF_NR        256
+
+#define I810_NR_SAREA_CLIPRECTS 8
+
+/* Each region is a minimum of 64k, and there are at most 64 of them.
+ */
+#define I810_NR_TEX_REGIONS 64
+#define I810_LOG_MIN_TEX_REGION_SIZE 16
+#endif
+
+typedef struct _drmI810Init {
+   unsigned int start; 
+   unsigned int end; 
+   unsigned int size; 
+   int ring_map_idx; 
+   int buffer_map_idx; 
+   int sarea_off;
+
+   unsigned int front_offset;
+   unsigned int back_offset;
+   unsigned int depth_offset;
+   unsigned int w;
+   unsigned int h;
+   unsigned int pitch;
+   unsigned int pitch_bits;
+} drmI810Init;
+
+
+Bool drmI810CleanupDma(int driSubFD);
+Bool drmI810InitDma(int driSubFD, drmI810Init *info );
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86drmMga.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/xf86drmMga.h:3.1
--- /dev/null	Sat Jul  1 20:43:13 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86drmMga.h	Fri Jun 16 17:03:26 2000
@@ -0,0 +1,147 @@
+
+/* WARNING: If you change any of these defines, make sure to change
+ * the kernel include file as well (mga_drm.h)
+ */
+
+#ifndef _XF86DRI_MGA_H_
+#define _XF86DRI_MGA_H_
+#ifndef _MGA_DEFINES_
+#define _MGA_DEFINES_
+#define MGA_F  0x1		/* fog */
+#define MGA_A  0x2		/* alpha */
+#define MGA_S  0x4		/* specular */
+#define MGA_T2 0x8		/* multitexture */
+
+#define MGA_WARP_TGZ            0
+#define MGA_WARP_TGZF           (MGA_F)
+#define MGA_WARP_TGZA           (MGA_A)
+#define MGA_WARP_TGZAF          (MGA_F|MGA_A)
+#define MGA_WARP_TGZS           (MGA_S)
+#define MGA_WARP_TGZSF          (MGA_S|MGA_F)
+#define MGA_WARP_TGZSA          (MGA_S|MGA_A)
+#define MGA_WARP_TGZSAF         (MGA_S|MGA_F|MGA_A)
+#define MGA_WARP_T2GZ           (MGA_T2)
+#define MGA_WARP_T2GZF          (MGA_T2|MGA_F)
+#define MGA_WARP_T2GZA          (MGA_T2|MGA_A)
+#define MGA_WARP_T2GZAF         (MGA_T2|MGA_A|MGA_F)
+#define MGA_WARP_T2GZS          (MGA_T2|MGA_S)
+#define MGA_WARP_T2GZSF         (MGA_T2|MGA_S|MGA_F)
+#define MGA_WARP_T2GZSA         (MGA_T2|MGA_S|MGA_A)
+#define MGA_WARP_T2GZSAF        (MGA_T2|MGA_S|MGA_F|MGA_A)
+
+#define MGA_MAX_G400_PIPES 16
+#define MGA_MAX_G200_PIPES  8	/* no multitex */
+
+#define MGA_MAX_WARP_PIPES MGA_MAX_G400_PIPES
+
+#define MGA_CARD_TYPE_G200 1
+#define MGA_CARD_TYPE_G400 2
+#define MGA_FRONT   0x1
+#define MGA_BACK    0x2
+#define MGA_DEPTH   0x4
+
+/* 3d state excluding texture units:
+ */
+#define MGA_CTXREG_DSTORG   0	/* validated */
+#define MGA_CTXREG_MACCESS  1	
+#define MGA_CTXREG_PLNWT    2	
+#define MGA_CTXREG_DWGCTL    3	
+#define MGA_CTXREG_ALPHACTRL 4
+#define MGA_CTXREG_FOGCOLOR  5
+#define MGA_CTXREG_WFLAG     6
+#define MGA_CTXREG_TDUAL0    7
+#define MGA_CTXREG_TDUAL1    8
+#define MGA_CTXREG_FCOL      9
+#define MGA_CTX_SETUP_SIZE   10
+
+/* 2d state
+ */
+#define MGA_2DREG_PITCH 	0
+#define MGA_2D_SETUP_SIZE 	1
+
+/* Each texture unit has a state:
+ */
+#define MGA_TEXREG_CTL        0
+#define MGA_TEXREG_CTL2       1
+#define MGA_TEXREG_FILTER     2
+#define MGA_TEXREG_BORDERCOL  3
+#define MGA_TEXREG_ORG        4 /* validated */
+#define MGA_TEXREG_ORG1       5
+#define MGA_TEXREG_ORG2       6
+#define MGA_TEXREG_ORG3       7
+#define MGA_TEXREG_ORG4       8
+#define MGA_TEXREG_WIDTH      9
+#define MGA_TEXREG_HEIGHT     10
+#define MGA_TEX_SETUP_SIZE    11
+
+/* What needs to be changed for the current vertex dma buffer?
+ */
+#define MGA_UPLOAD_CTX        0x1
+#define MGA_UPLOAD_TEX0       0x2
+#define MGA_UPLOAD_TEX1       0x4
+#define MGA_UPLOAD_PIPE       0x8
+#define MGA_UPLOAD_TEX0IMAGE  0x10
+#define MGA_UPLOAD_TEX1IMAGE  0x20
+#define MGA_UPLOAD_2D 	      0x40
+#define MGA_WAIT_AGE          0x80 /* handled client-side */
+#define MGA_UPLOAD_CLIPRECTS  0x100 /* handled client-side */
+#define MGA_DMA_FLUSH	      0x200 /* set when someone gets the lock
+                                       quiescent */
+
+/* 32 buffers of 64k each, total 1 meg.
+ */
+#define MGA_DMA_BUF_ORDER     16
+#define MGA_DMA_BUF_SZ        (1<<MGA_DMA_BUF_ORDER)
+#define MGA_DMA_BUF_NR        31
+
+/* Keep these small for testing.
+ */
+#define MGA_NR_SAREA_CLIPRECTS 8
+
+/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+ * regions, subject to a minimum region size of (1<<16) == 64k. 
+ *
+ * Clients may subdivide regions internally, but when sharing between
+ * clients, the region size is the minimum granularity. 
+ */
+
+#define MGA_CARD_HEAP 0
+#define MGA_AGP_HEAP  1
+#define MGA_NR_TEX_HEAPS 2
+#define MGA_NR_TEX_REGIONS 16
+#define MGA_LOG_MIN_TEX_REGION_SIZE 16
+#endif
+
+typedef struct _drmMgaWarpIndex {
+   int installed;
+   unsigned long phys_addr;
+   int size;
+} drmMgaWarpIndex;
+
+typedef struct _drmMgaInit {
+   int reserved_map_agpstart;
+   int reserved_map_idx;
+   int buffer_map_idx;
+   int sarea_priv_offset;
+   int primary_size;
+   int warp_ucode_size;
+   unsigned int frontOffset;
+   unsigned int backOffset;
+   unsigned int depthOffset;
+   unsigned int textureOffset;
+   unsigned int textureSize;
+   unsigned int agpTextureSize;
+   unsigned int agpTextureOffset;
+   unsigned int cpp;
+   unsigned int stride;
+   int sgram;
+   int chipset;
+   drmMgaWarpIndex WarpIndex[MGA_MAX_WARP_PIPES];
+   unsigned int mAccess;
+} drmMgaInit;
+
+
+Bool drmMgaCleanupDma(int driSubFD);
+Bool drmMgaLockUpdate(int driSubFD, drmLockFlags flags);
+Bool drmMgaInitDma(int driSubFD, drmMgaInit *info);
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h:3.1
--- /dev/null	Sat Jul  1 20:43:13 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h	Fri Jun 16 17:03:26 2000
@@ -0,0 +1,80 @@
+/* xf86drm.h -- OS-independent header for DRM user-level library interface
+ * Created: Sun Apr  9 18:16:28 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h,v 3.1 2000/06/17 00:03:26 martin Exp $
+ *
+ */
+
+#ifndef _XF86DRI_R128_H_
+#define _XF86DRI_R128_H_
+
+/* WARNING: If you change any of these defines, make sure to change
+ * the kernel include file as well (r128_drm.h)
+ */
+
+typedef struct _drmR128Init {
+    int sarea_priv_offset;
+    int is_pci;
+    int cce_mode;
+    int cce_fifo_size;
+    int cce_secure;
+    int ring_size;
+    int usec_timeout;
+
+    int fb_offset;
+    int agp_ring_offset;
+    int agp_read_ptr_offset;
+    int agp_vertbufs_offset;
+    int agp_indbufs_offset;
+    int agp_textures_offset;
+    int mmio_offset;
+} drmR128Init;
+
+typedef enum {
+    DRM_R128_PRIM_NONE		= 0x0001,
+    DRM_R128_PRIM_POINT		= 0x0002,
+    DRM_R128_PRIM_LINE		= 0x0004,
+    DRM_R128_PRIM_POLY_LINE	= 0x0008,
+    DRM_R128_PRIM_TRI_LIST	= 0x0010,
+    DRM_R128_PRIM_TRI_FAN	= 0x0020,
+    DRM_R128_PRIM_TRI_STRIP	= 0x0040,
+    DRM_R128_PRIM_TRI_TYPE2	= 0x0080
+} drmR128PrimType;
+
+
+extern int drmR128InitCCE(int fd, drmR128Init *info);
+extern int drmR128CleanupCCE(int fd);
+extern int drmR128EngineReset(int fd);
+extern int drmR128EngineFlush(int fd);
+extern int drmR128WaitForIdle(int fd);
+extern int drmR128SubmitPacket(int fd, CARD32 *buffer, int *count, int flags);
+extern int drmR128GetVertexBuffers(int fd, int count, int *indices,
+				   int *sizes);
+extern int drmR128FlushVertexBuffers(int fd, int count, int *indices,
+				     int *sizes, drmR128PrimType prim);
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile:3.2 xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile:3.4
--- xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile:3.2	Sat Jul 10 00:24:47 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile	Tue Jun 27 07:27:29 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile,v 3.2 1999/07/10 07:24:47 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile,v 3.4 2000/06/27 14:27:29 tsi Exp $
 
 
 
@@ -12,10 +12,10 @@
 IOOBJ = inout.o
 #endif
 
-SRCS = am_init.c am_video.c am_io.c mapVT_noop.c ioperm_noop.c \
-	VTsw_noop.c $(IOSRC)
-OBJS = am_init.o am_video.o am_io.o mapVT_noop.o ioperm_noop.o \
-	VTsw_noop.o $(IOOBJ)
+SRCS = am_init.c am_video.c am_io.c ioperm_noop.c \
+	VTsw_noop.c $(IOSRC) kmod_noop.c
+OBJS = am_init.o am_video.o am_io.o ioperm_noop.o \
+	VTsw_noop.o $(IOOBJ) kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC)
@@ -24,9 +24,9 @@
 NormalLibraryObjectRule()
 NormalAsmObjectRule()
 
-ObjectFromSpecialSource(mapVT_noop,../shared/mapVT_noop,/**/)
 ObjectFromSpecialSource(ioperm_noop,../shared/ioperm_noop,/**/)
 ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/)
+ObjectFromSpecialSource(kmod_noop,../shared/kmod_noop,/**/)
 #if AckToolset
 ObjectFromSpecialAsmSource(inout,../shared/inout,/**/)
 #endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile:3.41 xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile:3.43
--- xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile:3.41	Sun Mar  5 08:59:16 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile	Fri Jun 23 12:51:01 2000
@@ -4,7 +4,7 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.41 2000/03/05 16:59:16 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.43 2000/06/23 19:51:01 dawes Exp $
 
 #include <Server.tmpl>
 
@@ -43,6 +43,11 @@
 # endif
 #endif
 
+#if BuildXF86DRI
+DRI_SRC = sigio.c
+DRI_OBJ = sigio.o
+#endif
+
 MOUSESRC = bsd_mouse.c
 MOUSEOBJ = bsd_mouse.o
 
@@ -68,6 +73,14 @@
 APMOBJ = pm_noop.o
 #endif
 
+#if defined(FreeBSDArchitecture) && (OSMajorVersion > 2)
+KMODSRC = bsd_kmod.c
+KMODOBJ = bsd_kmod.o
+#else
+KMODSRC = kmod_noop.c
+KMODOBJ = kmod_noop.o
+#endif
+
 #if defined(i386Architecture) || defined(ia64Architecture)
 RES_SRC=stdResource.c
 RES_OBJ=stdResource.o
@@ -84,12 +97,12 @@
 SRCS = bsd_init.c bsd_video.c bsd_io.c bsd_VTsw.c \
        libc_wrapper.c $(IOPERM_SRC) std_kbdEv.c posix_tty.c $(MOUSESRC) \
        $(RES_SRC) stdPci.c vidmem.c $(JOYSTICK_SRC) sigio.c $(APMSRC) \
-       $(AXP_SRC)
+       $(AXP_SRC) $(KMODSRC)
 
 OBJS = bsd_init.o bsd_video.o bsd_io.o bsd_VTsw.o \
        libc_wrapper.o $(IOPERM_OBJ) std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
        $(RES_OBJ) stdPci.o vidmem.o $(JOYSTICK_OBJ) sigio.o $(APMOBJ) \
-       $(AXP_OBJ)
+       $(AXP_OBJ) $(KMODOBJ)
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi -I$(APINCLUDES) \
@@ -114,6 +127,14 @@
 SubdirLibraryRule($(OBJS))
 NormalLibraryObjectRule()
 
+#if BuildXF86DRI
+#define IHaveSubdirs
+SUBDIRS = drm
+
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
 #if BuildXInputExt
 # if DoLoadableServer
 #  if JoystickSupport
@@ -136,6 +157,7 @@
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(vidmem.c,../shared)
 LinkSourceFile(sigio.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
 
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c:3.1
--- /dev/null	Sat Jul  1 20:43:13 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c	Fri Jun 16 17:03:27 2000
@@ -0,0 +1,25 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/linker.h>
+
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+/*
+ * Load a FreeBSD kernel module.
+ * This is used by the DRI/DRM to load a DRM kernel module when
+ * the X server starts.  It could be used for other purposes in the future.
+ * Input:
+ *    modName - name of the kernel module (Ex: "tdfx")
+ * Return:
+ *    0 for failure, 1 for success
+ */
+int xf86LoadKernelModule(const char *modName)
+{
+    if (kldload(modName))
+	return 1;
+    else
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:43:13 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile	Fri Jun 16 17:03:27 2000
@@ -0,0 +1,41 @@
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile,v 1.1 2000/06/17 00:03:27 martin Exp $
+XCOMM $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile,v 1.7 1999/09/14 19:55:15 faith Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+#if DoLoadableServer
+MSRC = drmmodule.c
+MOBJ = drmmodule.o
+#endif
+
+#if BuildXF86DRI
+#if HasMTRRSupport
+MTRR_DEFINES = -DHAS_MTRR_SUPPORT
+#endif
+
+SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmI810.c xf86drmMga.c xf86drmR128.c $(MSRC)
+OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o xf86drmI810.o xf86drmMga.o xf86drmR128.o $(MOBJ)
+
+
+INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
+           -I$(XINCLUDESRC) -I$(EXTINCSRC) -I../.. -Ikernel
+
+DEFINES = $(MTRR_DEFINES) $(GLX_DEFINES)
+
+ModuleObjectRule()
+LibraryModuleTarget(drm,$(OBJS))
+NormalLintTarget($(SRCS))
+
+InstallLibraryModule(drm,$(MODULEDIR),freebsd)
+
+#define IHaveSubdirs
+SUBDIRS = kernel
+
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
+
+
+InstallDriverSDKLibraryModule(drm,$(DRIVERSDKMODULEDIR),freebsd)
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/drmmodule.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/drmmodule.c:1.1
--- /dev/null	Sat Jul  1 20:43:13 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/drmmodule.c	Fri Jun 16 17:03:27 2000
@@ -0,0 +1,56 @@
+/* drmmodule.c -- Module initialization
+ * Created: Fri Jun  4 09:05:48 1999 by faith@precisioninsight.com
+ * Revised: Fri Jun  4 09:09:22 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.1 1999/06/07 13:01:42 faith Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/drmmodule.c,v 1.1 2000/06/17 00:03:27 martin Exp $
+ * 
+ */
+
+#include "xf86Module.h"
+
+static MODULESETUPPROTO(drmSetup);
+
+static XF86ModuleVersionInfo VersRec =
+{
+        "drm",
+        MODULEVENDORSTRING,
+        MODINFOSTRING1,
+        MODINFOSTRING2,
+        XF86_VERSION_CURRENT,
+        1, 0, 0,
+        ABI_CLASS_EXTENSION,
+        ABI_EXTENSION_VERSION,
+        MOD_CLASS_NONE,
+        {0,0,0,0}
+};
+
+XF86ModuleData drmModuleData = { &VersRec, drmSetup, NULL };
+
+static pointer
+drmSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    return (void *)1;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drm.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drm.c:1.1
--- /dev/null	Sat Jul  1 20:43:13 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drm.c	Fri Jun 16 17:03:27 2000
@@ -0,0 +1,1108 @@
+/* xf86drm.c -- User-level interface to DRM device
+ * Created: Tue Jan  5 08:16:21 1999 by faith@precisioninsight.com
+ * Revised: Wed Aug  4 07:54:23 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.43 1999/08/04 18:14:43 faith Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drm.c,v 1.1 2000/06/17 00:03:27 martin Exp $
+ * 
+ */
+
+#ifdef XFree86Server
+# include "xf86.h"
+# include "xf86_OSproc.h"
+# include "xf86_ansic.h"
+# include "xf86Priv.h"
+# define _DRM_MALLOC xalloc
+# define _DRM_FREE   xfree
+# ifndef XFree86LOADER
+#  include <sys/stat.h>
+#  include <sys/mman.h>
+# endif
+#else
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <ctype.h>
+# include <fcntl.h>
+# include <errno.h>
+# include <signal.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/time.h>
+# include <sys/types.h>
+# ifdef DRM_USE_MALLOC
+#  define _DRM_MALLOC malloc
+#  define _DRM_FREE   free
+extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void*), void*);
+extern int xf86RemoveSIGIOHandler(int fd);
+# else
+#  include <Xlibint.h>
+#  define _DRM_MALLOC Xmalloc
+#  define _DRM_FREE   Xfree
+# endif
+#endif
+
+int sysctlbyname(const char *, void *, size_t *, void *, size_t);
+
+/* Not all systems have MAP_FAILED defined */
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
+#include "xf86drm.h"
+#include "drm.h"
+
+#define makedev(x,y)    ((dev_t)(((x) << 8) | (y)))     /* create dev_t */
+
+static int drmOpenByBusid(const char *busid);
+static int drmOpenDevice(const char *path, long dev,
+			 mode_t mode, uid_t user, gid_t group);
+
+static void *drmHashTable = NULL; /* Context switch callbacks */
+
+typedef struct drmHashEntry {
+    int      fd;
+    void     (*f)(int, void *, void *);
+    void     *tagTable;
+} drmHashEntry;
+
+void *drmMalloc(int size)
+{
+    void *pt;
+    if ((pt = _DRM_MALLOC(size))) memset(pt, 0, size);
+    return pt;
+}
+
+void drmFree(void *pt)
+{
+    if (pt) _DRM_FREE(pt);
+}
+
+static char *drmStrdup(const char *s)
+{
+    return s ? strdup(s) : NULL;
+}
+
+
+static unsigned long drmGetKeyFromFd(int fd)
+{
+#ifdef XFree86LOADER
+    struct xf86stat st;
+#else
+    struct stat     st;
+#endif
+
+    st.st_rdev = 0;
+    fstat(fd, &st);
+    return st.st_rdev;
+}
+
+static drmHashEntry *drmGetEntry(int fd)
+{
+    unsigned long key = drmGetKeyFromFd(fd);
+    void          *value;
+    drmHashEntry  *entry;
+
+    if (!drmHashTable) drmHashTable = drmHashCreate();
+
+    if (drmHashLookup(drmHashTable, key, &value)) {
+	entry           = drmMalloc(sizeof(*entry));
+	entry->fd       = fd;
+	entry->f        = NULL;
+	entry->tagTable = drmHashCreate();
+	drmHashInsert(drmHashTable, key, entry);
+    } else {
+	entry = value;
+    }
+    return entry;
+}
+
+/* drm_open is used to open the /dev/drm device */
+
+static int drm_open(const char *file)
+{
+    int fd = open(file, O_RDWR, 0);
+
+    if (fd >= 0) return fd;
+    return -errno;
+}
+
+/* drmAvailable looks for a usable device node in /dev/dri. */
+
+int drmAvailable(void)
+{
+    int i, fd;
+    char   dev_name[64];
+    mode_t mode   = DRM_DEV_MODE;
+    mode_t dirmode;
+    gid_t  group  = DRM_DEV_GID;
+    uid_t  user   = DRM_DEV_UID;
+    long   dev     = 0;
+
+    if (!geteuid()) {
+	dirmode = mode;
+	if (dirmode & S_IRUSR) dirmode |= S_IXUSR;
+	if (dirmode & S_IRGRP) dirmode |= S_IXGRP;
+	if (dirmode & S_IROTH) dirmode |= S_IXOTH;
+	dirmode &= ~(S_IWGRP | S_IWOTH);
+	mkdir("/dev/dri", 0);
+	chown("/dev/dri", user, group);
+	chmod("/dev/dri", dirmode);
+    }
+
+    for (i = 0; i < 8; i++) {
+	sprintf(dev_name, "/dev/dri/card%d", i);
+	dev = makedev(145, i);
+	fd = drmOpenDevice(dev_name, dev, mode, user, group);
+	if (fd < 0) {
+	    remove(dev_name);
+	    continue;
+	}
+	close(fd);
+	return 1;
+    }
+    return 0;
+}
+
+static int drmOpenDevice(const char *path, long dev,
+			 mode_t mode, uid_t user, gid_t group)
+{
+#ifdef XFree86LOADER
+    struct xf86stat st;
+#else
+    struct stat     st;
+#endif
+
+    if (!stat(path, &st) && st.st_rdev == dev) return drm_open(path);
+
+    if (geteuid()) return DRM_ERR_NOT_ROOT;
+    remove(path);
+    if (mknod(path, S_IFCHR, dev)) {
+	remove(path);
+	return DRM_ERR_NOT_ROOT;
+    }
+    chown(path, user, group);
+    chmod(path, mode);
+    return drm_open(path);
+}
+
+static int drmOpenByName(const char *name)
+{
+    int    i;
+    char   dev_name[64];
+    mode_t mode   = DRM_DEV_MODE;
+    mode_t dirmode;
+    gid_t  group  = DRM_DEV_GID;
+    uid_t  user   = DRM_DEV_UID;
+    long   dev     = 0;
+    drmVersionPtr version;
+    int    fd;
+
+#if defined(XFree86Server)
+    mode  = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE;
+    group = xf86ConfigDRI.group ? xf86ConfigDRI.group : DRM_DEV_GID;
+#endif
+
+#if defined(XFree86Server)
+    if (!drmAvailable()) {
+        /* try to load the kernel module now */
+        if (!xf86LoadKernelModule(name)) {
+            ErrorF("[drm] failed to load kernel module \"%s\"\n",
+		   name);
+            return -1;
+        }
+    }
+#else
+    if (!drmAvailable())
+       return -1;
+#endif
+
+    if (!geteuid()) {
+	dirmode = mode;
+	if (dirmode & S_IRUSR) dirmode |= S_IXUSR;
+	if (dirmode & S_IRGRP) dirmode |= S_IXGRP;
+	if (dirmode & S_IROTH) dirmode |= S_IXOTH;
+	dirmode &= ~(S_IWGRP | S_IWOTH);
+	mkdir("/dev/dri", 0);
+	chown("/dev/dri", user, group);
+	chmod("/dev/dri", dirmode);
+    }
+
+    for (i = 0; i < 8; i++) {
+	sprintf(dev_name, "/dev/dri/card%d", i);
+	dev = makedev(145, i);
+	fd = drmOpenDevice(dev_name, dev, mode, user, group);
+	if (fd < 0) {
+	    remove(dev_name);
+	    continue;
+	}
+	version = drmGetVersion(fd);
+	if (!version) {
+	    continue;
+	}
+	if (!strcmp(version->name, name)) {
+	    drmFreeVersion(version);
+	    return fd;
+	}
+	drmFreeVersion(version);
+    }
+
+#if 0
+    for (i = 0; i < 8; i++) {
+	sprintf(sysctl_name, "hw.dri.%d.name", i);
+	sprintf(dev_name, "/dev/dri/card%d", i);
+	len = sizeof(buf);
+	if (sysctlbyname(sysctl_name, buf, &len, 0, 0) == 0) {
+	    buf[len-1] = '\0';
+	    for (driver = pt = buf; *pt && *pt != ' '; ++pt)
+		;
+	    if (*pt) {	/* Device is next */
+		*pt = '\0';
+		if (!strcmp(driver, name)) { /* Match */
+		    for (devstring = ++pt; *pt && *pt != ' '; ++pt)
+			;
+		    if (*pt) { /* Found busid */
+			return drmOpenByBusid(++pt);
+		    } else {	/* No busid */
+			dev = strtol(devstring, NULL, 0);
+			return drmOpenDevice(dev_name, dev,
+					     mode, user, group);
+		    }
+		}
+	    }
+	} else remove(dev_name);
+    }
+#endif
+
+    return -1;
+}
+
+static int drmOpenByBusid(const char *busid)
+{
+    int    i;
+    char   dev_name[64];
+    char   *buf;
+    int    fd;
+
+    for (i = 0; i < 8; i++) {
+	sprintf(dev_name, "/dev/dri/card%d", i);
+	if ((fd = drm_open(dev_name)) >= 0) {
+	    buf = drmGetBusid(fd);
+	    if (buf && !strcmp(buf, busid)) {
+	      drmFreeBusid(buf);
+	      return fd;
+	    }
+	    if (buf) drmFreeBusid(buf);
+	    close(fd);
+	}
+    }
+    return -1;
+}
+
+
+/* drmOpen looks up the specified name and busid, and opens the device
+   found.  The entry in /dev/dri is created if necessary (and if root).
+   A file descriptor is returned.  On error, the return value is
+   negative. */
+
+int drmOpen(const char *name, const char *busid)
+{
+    if (busid) return drmOpenByBusid(busid);
+    return drmOpenByName(name);
+}
+
+void drmFreeVersion(drmVersionPtr v)
+{
+    if (!v) return;
+    if (v->name) drmFree(v->name);
+    if (v->date) drmFree(v->date);
+    if (v->desc) drmFree(v->desc);
+    drmFree(v);
+}
+
+static void drmFreeKernelVersion(drm_version_t *v)
+{
+    if (!v) return;
+    if (v->name) drmFree(v->name);
+    if (v->date) drmFree(v->date);
+    if (v->desc) drmFree(v->desc);
+    drmFree(v);
+}
+
+static void drmCopyVersion(drmVersionPtr d, drm_version_t *s)
+{
+    d->version_major      = s->version_major;
+    d->version_minor      = s->version_minor;
+    d->version_patchlevel = s->version_patchlevel;
+    d->name_len           = s->name_len;
+    d->name               = drmStrdup(s->name);
+    d->date_len           = s->date_len;
+    d->date               = drmStrdup(s->date);
+    d->desc_len           = s->desc_len;
+    d->desc               = drmStrdup(s->desc);
+}
+
+/* drmVersion obtains the version information via an ioctl.  Similar
+ * information is available via /proc/drm. */
+
+drmVersionPtr drmGetVersion(int fd)
+{
+    drmVersionPtr retval;
+    drm_version_t *version = drmMalloc(sizeof(*version));
+
+				/* First, get the lengths */
+    version->name_len    = 0;
+    version->name        = NULL;
+    version->date_len    = 0;
+    version->date        = NULL;
+    version->desc_len    = 0;
+    version->desc        = NULL;
+    
+    if (ioctl(fd, DRM_IOCTL_VERSION, version)) {
+	drmFreeKernelVersion(version);
+	return NULL;
+    }
+
+				/* Now, allocate space and get the data */
+    if (version->name_len)
+	version->name    = drmMalloc(version->name_len + 1);
+    if (version->date_len)
+	version->date    = drmMalloc(version->date_len + 1);
+    if (version->desc_len)
+	version->desc    = drmMalloc(version->desc_len + 1);
+    
+    if (ioctl(fd, DRM_IOCTL_VERSION, version)) {
+	drmFreeKernelVersion(version);
+	return NULL;
+    }
+
+				/* The results might not be null-terminated
+                                   strings, so terminate them. */
+
+    if (version->name_len) version->name[version->name_len] = '\0';
+    if (version->date_len) version->date[version->date_len] = '\0';
+    if (version->desc_len) version->desc[version->desc_len] = '\0';
+
+				/* Now, copy it all back into the
+                                   client-visible data structure... */
+    retval = drmMalloc(sizeof(*retval));
+    drmCopyVersion(retval, version);
+    drmFreeKernelVersion(version);
+    return retval;
+}
+
+void drmFreeBusid(const char *busid)
+{
+    drmFree((void *)busid);
+}
+
+char *drmGetBusid(int fd)
+{
+    drm_unique_t u;
+
+    u.unique_len = 0;
+    u.unique     = NULL;
+
+    if (ioctl(fd, DRM_IOCTL_GET_UNIQUE, &u)) return NULL;
+    u.unique = drmMalloc(u.unique_len + 1);
+    if (ioctl(fd, DRM_IOCTL_GET_UNIQUE, &u)) return NULL;
+    u.unique[u.unique_len] = '\0';
+    return u.unique;
+}
+
+int drmSetBusid(int fd, const char *busid)
+{
+    drm_unique_t u;
+
+    u.unique     = (char *)busid;
+    u.unique_len = strlen(busid);
+
+    if (ioctl(fd, DRM_IOCTL_SET_UNIQUE, &u)) return -errno;
+    return 0;
+}
+
+int drmGetMagic(int fd, drmMagicPtr magic)
+{
+    drm_auth_t auth;
+
+    *magic = 0;
+    if (ioctl(fd, DRM_IOCTL_GET_MAGIC, &auth)) return -errno;
+    *magic = auth.magic;
+    return 0;
+}
+
+int drmAuthMagic(int fd, drmMagic magic)
+{
+    drm_auth_t auth;
+
+    auth.magic = magic;
+    if (ioctl(fd, DRM_IOCTL_AUTH_MAGIC, &auth)) return -errno;
+    return 0;
+}
+
+int drmAddMap(int fd,
+	      drmHandle offset,
+	      drmSize size,
+	      drmMapType type,
+	      drmMapFlags flags,
+	      drmHandlePtr handle)
+{
+    drm_map_t map;
+
+    map.offset  = offset;
+    map.size    = size;
+    map.handle  = 0;
+    map.type    = type;
+    map.flags   = flags;
+    if (ioctl(fd, DRM_IOCTL_ADD_MAP, &map)) return -errno;
+    if (handle) *handle = (drmHandle)map.handle;
+    return 0;
+}
+
+int drmAddBufs(int fd, int count, int size, drmBufDescFlags flags,
+	       int agp_offset)
+{
+    drm_buf_desc_t request;
+    
+    request.count     = count;
+    request.size      = size;
+    request.low_mark  = 0;
+    request.high_mark = 0;
+    request.flags     = flags;
+    request.agp_start = agp_offset;
+   
+    if (ioctl(fd, DRM_IOCTL_ADD_BUFS, &request)) return -errno;
+    return request.count;
+}
+
+int drmMarkBufs(int fd, double low, double high)
+{
+    drm_buf_info_t info;
+    int            i;
+
+    info.count = 0;
+    info.list  = NULL;
+
+    if (ioctl(fd, DRM_IOCTL_INFO_BUFS, &info)) return -EINVAL;
+
+    if (!info.count) return -EINVAL;
+    
+    if (!(info.list = drmMalloc(info.count * sizeof(*info.list))))
+	return -ENOMEM;
+	
+    if (ioctl(fd, DRM_IOCTL_INFO_BUFS, &info)) {
+	int retval = -errno;
+	drmFree(info.list);
+	return retval;
+    }
+    
+    for (i = 0; i < info.count; i++) {
+	info.list[i].low_mark  = low  * info.list[i].count;
+	info.list[i].high_mark = high * info.list[i].count;
+	if (ioctl(fd, DRM_IOCTL_MARK_BUFS, &info.list[i])) {
+	    int retval = -errno;
+	    drmFree(info.list);
+	    return retval;
+	}
+    }
+    drmFree(info.list);
+    
+    return 0;
+}
+
+int drmFreeBufs(int fd, int count, int *list)
+{
+    drm_buf_free_t request;
+
+    request.count = count;
+    request.list  = list;
+    if (ioctl(fd, DRM_IOCTL_FREE_BUFS, &request)) return -errno;
+    return 0;
+}
+
+int drmClose(int fd)
+{
+    unsigned long key    = drmGetKeyFromFd(fd);
+    drmHashEntry  *entry = drmGetEntry(fd);
+
+    drmHashDestroy(entry->tagTable);
+    entry->fd       = 0;
+    entry->f        = NULL;
+    entry->tagTable = NULL;
+
+    drmHashDelete(drmHashTable, key);
+    drmFree(entry);
+
+    return close(fd);
+}
+
+int drmMap(int fd,
+	   drmHandle handle,
+	   drmSize size,
+	   drmAddressPtr address)
+{
+    if (fd < 0) return -EINVAL;
+    *address = mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, handle);
+    if (*address == MAP_FAILED) return -errno;
+    return 0;
+}
+
+int drmUnmap(drmAddress address, drmSize size)
+{
+    return munmap(address, size);
+}
+
+drmBufInfoPtr drmGetBufInfo(int fd)
+{
+    drm_buf_info_t info;
+    drmBufInfoPtr  retval;
+    int            i;
+
+    info.count = 0;
+    info.list  = NULL;
+
+    if (ioctl(fd, DRM_IOCTL_INFO_BUFS, &info)) return NULL;
+
+    if (info.count) {
+	if (!(info.list = drmMalloc(info.count * sizeof(*info.list))))
+	    return NULL;
+	
+	if (ioctl(fd, DRM_IOCTL_INFO_BUFS, &info)) {
+	    drmFree(info.list);
+	    return NULL;
+	}
+				/* Now, copy it all back into the
+                                   client-visible data structure... */
+	retval = drmMalloc(sizeof(*retval));
+	retval->count = info.count;
+	retval->list  = drmMalloc(info.count * sizeof(*retval->list));
+	for (i = 0; i < info.count; i++) {
+	    retval->list[i].count     = info.list[i].count;
+	    retval->list[i].size      = info.list[i].size;
+	    retval->list[i].low_mark  = info.list[i].low_mark;
+	    retval->list[i].high_mark = info.list[i].high_mark;
+	}
+	drmFree(info.list);
+	return retval;
+    }
+    return NULL;
+}
+
+drmBufMapPtr drmMapBufs(int fd)
+{
+    drm_buf_map_t bufs;
+    drmBufMapPtr  retval;
+    int           i;
+    
+    bufs.count = 0;
+    bufs.list  = NULL;
+    if (ioctl(fd, DRM_IOCTL_MAP_BUFS, &bufs)) return NULL;
+
+    if (bufs.count) {
+	if (!(bufs.list = drmMalloc(bufs.count * sizeof(*bufs.list))))
+	    return NULL;
+
+	if (ioctl(fd, DRM_IOCTL_MAP_BUFS, &bufs)) {
+	    drmFree(bufs.list);
+	    return NULL;
+	}
+				/* Now, copy it all back into the
+                                   client-visible data structure... */
+	retval = drmMalloc(sizeof(*retval));
+	retval->count = bufs.count;
+	retval->list  = drmMalloc(bufs.count * sizeof(*retval->list));
+	for (i = 0; i < bufs.count; i++) {
+	    retval->list[i].idx     = bufs.list[i].idx;
+	    retval->list[i].total   = bufs.list[i].total;
+	    retval->list[i].used    = 0;
+	    retval->list[i].address = bufs.list[i].address;
+	}
+	return retval;
+    }
+    return NULL;
+}
+
+int drmUnmapBufs(drmBufMapPtr bufs)
+{
+    int i;
+    
+    for (i = 0; i < bufs->count; i++) {
+	munmap(bufs->list[i].address, bufs->list[i].total);
+    }
+    return 0;
+}
+
+int drmDMA(int fd, drmDMAReqPtr request)
+{
+    drm_dma_t dma;
+
+				/* Copy to hidden structure */
+    dma.context         = request->context;
+    dma.send_count      = request->send_count;
+    dma.send_indices    = request->send_list;
+    dma.send_sizes      = request->send_sizes;
+    dma.flags           = request->flags;
+    dma.request_count   = request->request_count;
+    dma.request_size    = request->request_size;
+    dma.request_indices = request->request_list;
+    dma.request_sizes   = request->request_sizes;
+    if (ioctl(fd, DRM_IOCTL_DMA, &dma)) return -errno;
+    request->granted_count = dma.granted_count;
+    
+    return 0;
+}
+
+int drmGetLock(int fd, drmContext context, drmLockFlags flags)
+{
+    drm_lock_t lock;
+
+    lock.context = context;
+    lock.flags   = 0;
+    if (flags & DRM_LOCK_READY)      lock.flags |= _DRM_LOCK_READY;
+    if (flags & DRM_LOCK_QUIESCENT)  lock.flags |= _DRM_LOCK_QUIESCENT;
+    if (flags & DRM_LOCK_FLUSH)      lock.flags |= _DRM_LOCK_FLUSH;
+    if (flags & DRM_LOCK_FLUSH_ALL)  lock.flags |= _DRM_LOCK_FLUSH_ALL;
+    if (flags & DRM_HALT_ALL_QUEUES) lock.flags |= _DRM_HALT_ALL_QUEUES;
+    if (flags & DRM_HALT_CUR_QUEUES) lock.flags |= _DRM_HALT_CUR_QUEUES;
+    
+    while (ioctl(fd, DRM_IOCTL_LOCK, &lock))
+	;
+    return 0;
+}
+
+int drmUnlock(int fd, drmContext context)
+{
+    drm_lock_t lock;
+
+    lock.context = context;
+    lock.flags   = 0;
+    return ioctl(fd, DRM_IOCTL_UNLOCK, &lock);
+}
+
+drmContextPtr drmGetReservedContextList(int fd, int *count)
+{
+    drm_ctx_res_t res;
+    drm_ctx_t     *list;
+    drmContextPtr retval;
+    int           i;
+
+    res.count    = 0;
+    res.contexts = NULL;
+    if (ioctl(fd, DRM_IOCTL_RES_CTX, &res)) return NULL;
+
+    if (!res.count) return NULL;
+
+    if (!(list   = drmMalloc(res.count * sizeof(*list)))) return NULL;
+    if (!(retval = drmMalloc(res.count * sizeof(*retval)))) {
+	drmFree(list);
+	return NULL;
+    }
+
+    res.contexts = list;
+    if (ioctl(fd, DRM_IOCTL_RES_CTX, &res)) return NULL;
+
+    for (i = 0; i < res.count; i++) retval[i] = list[i].handle;
+    drmFree(list);
+
+    *count = res.count;
+    return retval;
+}
+
+void drmFreeReservedContextList(drmContextPtr pt)
+{
+    drmFree(pt);
+}
+
+int drmCreateContext(int fd, drmContextPtr handle)
+{
+    drm_ctx_t ctx;
+
+    ctx.flags = 0;	/* Modified with functions below */
+    if (ioctl(fd, DRM_IOCTL_ADD_CTX, &ctx)) return -errno;
+    *handle = ctx.handle;
+    return 0;
+}
+
+int drmSwitchToContext(int fd, drmContext context)
+{
+    drm_ctx_t ctx;
+
+    ctx.handle = context;
+    if (ioctl(fd, DRM_IOCTL_SWITCH_CTX, &ctx)) return -errno;
+    return 0;
+}
+
+int drmSetContextFlags(int fd, drmContext context, drmContextFlags flags)
+{
+    drm_ctx_t ctx;
+
+				/* Context preserving means that no context
+                                   switched are done between DMA buffers
+                                   from one context and the next.  This is
+                                   suitable for use in the X server (which
+                                   promises to maintain hardware context,
+                                   or in the client-side library when
+                                   buffers are swapped on behalf of two
+                                   threads. */
+    ctx.handle = context;
+    ctx.flags  = 0;
+    if (flags & DRM_CONTEXT_PRESERVED) ctx.flags |= _DRM_CONTEXT_PRESERVED;
+    if (flags & DRM_CONTEXT_2DONLY)    ctx.flags |= _DRM_CONTEXT_2DONLY;
+    if (ioctl(fd, DRM_IOCTL_MOD_CTX, &ctx)) return -errno;
+    return 0;
+}
+
+int drmGetContextFlags(int fd, drmContext context, drmContextFlagsPtr flags)
+{
+    drm_ctx_t ctx;
+
+    ctx.handle = context;
+    if (ioctl(fd, DRM_IOCTL_GET_CTX, &ctx)) return -errno;
+    *flags = 0;
+    if (ctx.flags & _DRM_CONTEXT_PRESERVED) *flags |= DRM_CONTEXT_PRESERVED;
+    if (ctx.flags & _DRM_CONTEXT_2DONLY)    *flags |= DRM_CONTEXT_2DONLY;
+    return 0;
+}
+    
+int drmDestroyContext(int fd, drmContext handle)
+{
+    drm_ctx_t ctx;
+    ctx.handle = handle;
+    if (ioctl(fd, DRM_IOCTL_RM_CTX, &ctx)) return -errno;
+    return 0;
+}
+
+int drmCreateDrawable(int fd, drmDrawablePtr handle)
+{
+    drm_draw_t draw;
+    if (ioctl(fd, DRM_IOCTL_ADD_DRAW, &draw)) return -errno;
+    *handle = draw.handle;
+    return 0;
+}
+
+int drmDestroyDrawable(int fd, drmDrawable handle)
+{
+    drm_draw_t draw;
+    draw.handle = handle;
+    if (ioctl(fd, DRM_IOCTL_RM_DRAW, &draw)) return -errno;
+    return 0;
+}
+
+int drmAgpAcquire(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_AGP_ACQUIRE, NULL)) return -errno;
+    return 0;
+}
+
+int drmAgpRelease(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_AGP_RELEASE, NULL)) return -errno;
+    return 0;
+}
+
+int drmAgpEnable(int fd, unsigned long mode)
+{
+    drm_agp_mode_t m;
+
+    m.mode = mode;
+    if (ioctl(fd, DRM_IOCTL_AGP_ENABLE, &m)) return -errno;
+    return 0;
+}
+
+int drmAgpAlloc(int fd, unsigned long size, unsigned long type,
+		unsigned long *address, unsigned long *handle)
+{
+    drm_agp_buffer_t b;
+    *handle = 0;
+    b.size   = size;
+    b.handle = 0;
+    b.type   = type;
+    if (ioctl(fd, DRM_IOCTL_AGP_ALLOC, &b)) return -errno;
+    if (address != 0UL) *address = b.physical;
+    *handle = b.handle;
+    return 0;
+}
+
+int drmAgpFree(int fd, unsigned long handle)
+{
+    drm_agp_buffer_t b;
+
+    b.size   = 0;
+    b.handle = handle;
+    if (ioctl(fd, DRM_IOCTL_AGP_FREE, &b)) return -errno;
+    return 0;
+}
+
+int drmAgpBind(int fd, unsigned long handle, unsigned long offset)
+{
+    drm_agp_binding_t b;
+
+    b.handle = handle;
+    b.offset = offset;
+    if (ioctl(fd, DRM_IOCTL_AGP_BIND, &b)) return -errno;
+    return 0;
+}
+
+int drmAgpUnbind(int fd, unsigned long handle)
+{
+    drm_agp_binding_t b;
+
+    b.handle = handle;
+    b.offset = 0;
+    if (ioctl(fd, DRM_IOCTL_AGP_UNBIND, &b)) return -errno;
+    return 0;
+}
+
+int drmAgpVersionMajor(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return -errno;
+    return i.agp_version_major;
+}
+
+int drmAgpVersionMinor(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return -errno;
+    return i.agp_version_minor;
+}
+
+unsigned long drmAgpGetMode(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.mode;
+}
+
+unsigned long drmAgpBase(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.aperture_base;
+}
+
+unsigned long drmAgpSize(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.aperture_size;
+}
+
+unsigned long drmAgpMemoryUsed(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.memory_used;
+}
+
+unsigned long drmAgpMemoryAvail(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.memory_allowed;
+}
+
+unsigned int drmAgpVendorId(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.id_vendor;
+}
+
+unsigned int drmAgpDeviceId(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.id_device;
+}
+
+int drmError(int err, const char *label)
+{
+    switch (err) {
+    case DRM_ERR_NO_DEVICE: fprintf(stderr, "%s: no device\n", label);   break;
+    case DRM_ERR_NO_ACCESS: fprintf(stderr, "%s: no access\n", label);   break;
+    case DRM_ERR_NOT_ROOT:  fprintf(stderr, "%s: not root\n", label);    break;
+    case DRM_ERR_INVALID:   fprintf(stderr, "%s: invalid args\n", label);break;
+    default:
+	if (err < 0) err = -err;
+	fprintf( stderr, "%s: error %d (%s)\n", label, err, strerror(err) );
+	break;
+    }
+
+    return 1;
+}
+
+int drmCtlInstHandler(int fd, int irq)
+{
+    drm_control_t ctl;
+
+    ctl.func  = DRM_INST_HANDLER;
+    ctl.irq   = irq;
+    if (ioctl(fd, DRM_IOCTL_CONTROL, &ctl)) return -errno;
+    return 0;
+}
+
+int drmCtlUninstHandler(int fd)
+{
+    drm_control_t ctl;
+
+    ctl.func  = DRM_UNINST_HANDLER;
+    ctl.irq   = 0;
+    if (ioctl(fd, DRM_IOCTL_CONTROL, &ctl)) return -errno;
+    return 0;
+}
+
+int drmFinish(int fd, int context, drmLockFlags flags)
+{
+    drm_lock_t lock;
+
+    lock.context = context;
+    lock.flags   = 0;
+    if (flags & DRM_LOCK_READY)      lock.flags |= _DRM_LOCK_READY;
+    if (flags & DRM_LOCK_QUIESCENT)  lock.flags |= _DRM_LOCK_QUIESCENT;
+    if (flags & DRM_LOCK_FLUSH)      lock.flags |= _DRM_LOCK_FLUSH;
+    if (flags & DRM_LOCK_FLUSH_ALL)  lock.flags |= _DRM_LOCK_FLUSH_ALL;
+    if (flags & DRM_HALT_ALL_QUEUES) lock.flags |= _DRM_HALT_ALL_QUEUES;
+    if (flags & DRM_HALT_CUR_QUEUES) lock.flags |= _DRM_HALT_CUR_QUEUES;
+    if (ioctl(fd, DRM_IOCTL_FINISH, &lock)) return -errno;
+    return 0;
+}
+
+int drmGetInterruptFromBusID(int fd, int busnum, int devnum, int funcnum)
+{
+    drm_irq_busid_t p;
+
+    p.busnum  = busnum;
+    p.devnum  = devnum;
+    p.funcnum = funcnum;
+    if (ioctl(fd, DRM_IOCTL_IRQ_BUSID, &p)) return -errno;
+    return p.irq;
+}
+
+int drmAddContextTag(int fd, drmContext context, void *tag)
+{
+    drmHashEntry  *entry = drmGetEntry(fd);
+
+    if (drmHashInsert(entry->tagTable, context, tag)) {
+	drmHashDelete(entry->tagTable, context);
+	drmHashInsert(entry->tagTable, context, tag);
+    }
+    return 0;
+}
+
+int drmDelContextTag(int fd, drmContext context)
+{
+    drmHashEntry  *entry = drmGetEntry(fd);
+
+    return drmHashDelete(entry->tagTable, context);
+}
+
+void *drmGetContextTag(int fd, drmContext context)
+{
+    drmHashEntry  *entry = drmGetEntry(fd);
+    void          *value;
+    
+    if (drmHashLookup(entry->tagTable, context, &value)) return NULL;
+
+    return value;
+}
+
+#if defined(XFree86Server) || defined(DRM_USE_MALLOC)
+static void drmSIGIOHandler(int interrupt, void *arg)
+{
+    unsigned long key;
+    void          *value;
+    ssize_t       count;
+    drm_ctx_t     ctx;
+    typedef void  (*_drmCallback)(int, void *, void *);
+    char          buf[256];
+    drmContext    old;
+    drmContext    new;
+    void          *oldctx;
+    void          *newctx;
+    char          *pt;
+    drmHashEntry  *entry;
+
+    if (!drmHashTable) return;
+    if (drmHashFirst(drmHashTable, &key, &value)) {
+	entry = value;
+	do {
+#if 1
+	    fprintf(stderr, "Trying %d\n", entry->fd);
+#endif
+	    if ((count = read(entry->fd, buf, sizeof(buf)))) {
+		buf[count] = '\0';
+#if 1
+		fprintf(stderr, "Got %s\n", buf);
+#endif
+		
+		for (pt = buf; *pt != ' '; ++pt); /* Find first space */
+		++pt;
+		old    = strtol(pt, &pt, 0);
+		new    = strtol(pt, NULL, 0);
+		oldctx = drmGetContextTag(entry->fd, old);
+		newctx = drmGetContextTag(entry->fd, new);
+#if 1
+		fprintf(stderr, "%d %d %p %p\n", old, new, oldctx, newctx);
+#endif
+		((_drmCallback)entry->f)(entry->fd, oldctx, newctx);
+		ctx.handle = new;
+		ioctl(entry->fd, DRM_IOCTL_NEW_CTX, &ctx);
+	    }
+	} while (drmHashNext(drmHashTable, &key, &value));
+    }
+}
+
+int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
+{
+    drmHashEntry     *entry;
+
+    entry     = drmGetEntry(fd);
+    entry->f  = f;
+
+    return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0);
+}
+
+int drmRemoveSIGIOHandler(int fd)
+{
+    drmHashEntry     *entry = drmGetEntry(fd);
+
+    entry->f = NULL;
+    
+    return xf86RemoveSIGIOHandler(fd);
+}
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmHash.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmHash.c:1.1
--- /dev/null	Sat Jul  1 20:43:13 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmHash.c	Fri Jun 16 17:03:27 2000
@@ -0,0 +1,435 @@
+/* xf86drmHash.c -- Small hash table support for integer -> integer mapping
+ * Created: Sun Apr 18 09:35:45 1999 by faith@precisioninsight.com
+ * Revised: Thu Jun  3 16:11:06 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.3 1999/06/07 13:01:42 faith Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmHash.c,v 1.1 2000/06/17 00:03:27 martin Exp $
+ *
+ * DESCRIPTION
+ *
+ * This file contains a straightforward implementation of a fixed-sized
+ * hash table using self-organizing linked lists [Knuth73, pp. 398-399] for
+ * collision resolution.  There are two potentially interesting things
+ * about this implementation:
+ *
+ * 1) The table is power-of-two sized.  Prime sized tables are more
+ * traditional, but do not have a significant advantage over power-of-two
+ * sized table, especially when double hashing is not used for collision
+ * resolution.
+ *
+ * 2) The hash computation uses a table of random integers [Hanson97,
+ * pp. 39-41].
+ *
+ * FUTURE ENHANCEMENTS
+ *
+ * With a table size of 512, the current implementation is sufficient for a
+ * few hundred keys.  Since this is well above the expected size of the
+ * tables for which this implementation was designed, the implementation of
+ * dynamic hash tables was postponed until the need arises.  A common (and
+ * naive) approach to dynamic hash table implementation simply creates a
+ * new hash table when necessary, rehashes all the data into the new table,
+ * and destroys the old table.  The approach in [Larson88] is superior in
+ * two ways: 1) only a portion of the table is expanded when needed,
+ * distributing the expansion cost over several insertions, and 2) portions
+ * of the table can be locked, enabling a scalable thread-safe
+ * implementation.
+ *
+ * REFERENCES
+ *
+ * [Hanson97] David R. Hanson.  C Interfaces and Implementations:
+ * Techniques for Creating Reusable Software.  Reading, Massachusetts:
+ * Addison-Wesley, 1997.
+ *
+ * [Knuth73] Donald E. Knuth. The Art of Computer Programming.  Volume 3:
+ * Sorting and Searching.  Reading, Massachusetts: Addison-Wesley, 1973.
+ *
+ * [Larson88] Per-Ake Larson. "Dynamic Hash Tables".  CACM 31(4), April
+ * 1988, pp. 446-457.
+ *
+ */
+
+#define HASH_MAIN 0
+
+#if HASH_MAIN
+# include <stdio.h>
+# include <stdlib.h>
+#else
+# include "xf86drm.h"
+# ifdef XFree86LOADER
+#  include "xf86.h"
+#  include "xf86_ansic.h"
+# else
+#  include <stdio.h>
+#  include <stdlib.h>
+# endif
+#endif
+
+#define N(x)  drm##x
+
+#define HASH_MAGIC 0xdeadbeef
+#define HASH_DEBUG 0
+#define HASH_SIZE  512		/* Good for about 100 entries */
+				/* If you change this value, you probably
+                                   have to change the HashHash hashing
+                                   function! */
+
+#if HASH_MAIN
+#define HASH_ALLOC malloc
+#define HASH_FREE  free
+#define HASH_RANDOM_DECL
+#define HASH_RANDOM_INIT(seed)  srandom(seed)
+#define HASH_RANDOM             random()
+#else
+#define HASH_ALLOC drmMalloc
+#define HASH_FREE  drmFree
+#define HASH_RANDOM_DECL        void *state
+#define HASH_RANDOM_INIT(seed)  state = drmRandomCreate(seed)
+#define HASH_RANDOM             drmRandom(state)
+
+#endif
+
+typedef struct HashBucket {
+    unsigned long     key;
+    void              *value;
+    struct HashBucket *next;
+} HashBucket, *HashBucketPtr;
+
+typedef struct HashTable {
+    unsigned long    magic;
+    unsigned long    entries;
+    unsigned long    hits;	/* At top of linked list */
+    unsigned long    partials;	/* Not at top of linked list */
+    unsigned long    misses;	/* Not in table */
+    HashBucketPtr    buckets[HASH_SIZE];
+    int              p0;
+    HashBucketPtr    p1;
+} HashTable, *HashTablePtr;
+
+#if HASH_MAIN
+extern void *N(HashCreate)(void);
+extern int  N(HashDestroy)(void *t);
+extern int  N(HashLookup)(void *t, unsigned long key, unsigned long *value);
+extern int  N(HashInsert)(void *t, unsigned long key, unsigned long value);
+extern int  N(HashDelete)(void *t, unsigned long key);
+#endif
+
+static unsigned long HashHash(unsigned long key)
+{
+    unsigned long        hash = 0;
+    unsigned long        tmp  = key;
+    static int           init = 0;
+    static unsigned long scatter[256];
+    int                  i;
+
+    if (!init) {
+	HASH_RANDOM_DECL;
+	HASH_RANDOM_INIT(37);
+	for (i = 0; i < 256; i++) scatter[i] = HASH_RANDOM;
+	++init;
+    }
+
+    while (tmp) {
+	hash = (hash << 1) + scatter[tmp & 0xff];
+	tmp >>= 8;
+    }
+
+    hash %= HASH_SIZE;
+#if HASH_DEBUG
+    printf( "Hash(%d) = %d\n", key, hash);
+#endif
+    return hash;
+}
+
+void *N(HashCreate)(void)
+{
+    HashTablePtr table;
+    int          i;
+
+    table           = HASH_ALLOC(sizeof(*table));
+    if (!table) return NULL;
+    table->magic    = HASH_MAGIC;
+    table->entries  = 0;
+    table->hits     = 0;
+    table->partials = 0;
+    table->misses   = 0;
+
+    for (i = 0; i < HASH_SIZE; i++) table->buckets[i] = NULL;
+    return table;
+}
+
+int N(HashDestroy)(void *t)
+{
+    HashTablePtr  table = (HashTablePtr)t;
+    HashBucketPtr bucket;
+    HashBucketPtr next;
+    int           i;
+
+    if (table->magic != HASH_MAGIC) return -1; /* Bad magic */
+    
+    for (i = 0; i < HASH_SIZE; i++) {
+	for (bucket = table->buckets[i]; bucket;) {
+	    next = bucket->next;
+	    HASH_FREE(bucket);
+	    bucket = next;
+	}
+    }
+    HASH_FREE(table);
+    return 0;
+}
+
+/* Find the bucket and organize the list so that this bucket is at the
+   top. */
+
+static HashBucketPtr HashFind(HashTablePtr table,
+			      unsigned long key, unsigned long *h)
+{
+    unsigned long hash = HashHash(key);
+    HashBucketPtr prev = NULL;
+    HashBucketPtr bucket;
+
+    if (h) *h = hash;
+
+    for (bucket = table->buckets[hash]; bucket; bucket = bucket->next) {
+	if (bucket->key == key) {
+	    if (prev) {
+				/* Organize */
+		prev->next           = bucket->next;
+		bucket->next         = table->buckets[hash];
+		table->buckets[hash] = bucket;
+		++table->partials;
+	    } else {
+		++table->hits;
+	    }
+	    return bucket;
+	}
+	prev = bucket;
+    }
+    ++table->misses;
+    return NULL;
+}
+
+int N(HashLookup)(void *t, unsigned long key, void **value)
+{
+    HashTablePtr  table = (HashTablePtr)t;
+    HashBucketPtr bucket;
+
+    if (table->magic != HASH_MAGIC) return -1; /* Bad magic */
+    
+    bucket = HashFind(table, key, NULL);
+    if (!bucket) return 1;	/* Not found */
+    *value = bucket->value;
+    return 0;			/* Found */
+}
+
+int N(HashInsert)(void *t, unsigned long key, void *value)
+{
+    HashTablePtr  table = (HashTablePtr)t;
+    HashBucketPtr bucket;
+    unsigned long hash;
+
+    if (table->magic != HASH_MAGIC) return -1; /* Bad magic */
+    
+    if (HashFind(table, key, &hash)) return 1; /* Already in table */
+
+    bucket               = HASH_ALLOC(sizeof(*bucket));
+    if (!bucket) return -1;	/* Error */
+    bucket->key          = key;
+    bucket->value        = value;
+    bucket->next         = table->buckets[hash];
+    table->buckets[hash] = bucket;
+#if HASH_DEBUG
+    printf("Inserted %d at %d/%p\n", key, hash, bucket);
+#endif
+    return 0;			/* Added to table */
+}
+
+int N(HashDelete)(void *t, unsigned long key)
+{
+    HashTablePtr  table = (HashTablePtr)t;
+    unsigned long hash;
+    HashBucketPtr bucket;
+
+    if (table->magic != HASH_MAGIC) return -1; /* Bad magic */
+    
+    bucket = HashFind(table, key, &hash);
+
+    if (!bucket) return 1;	/* Not found */
+
+    table->buckets[hash] = bucket->next;
+    HASH_FREE(bucket);
+    return 0;
+}
+
+int N(HashNext)(void *t, unsigned long *key, void **value)
+{
+    HashTablePtr  table = (HashTablePtr)t;
+    
+    for (; table->p0 < HASH_SIZE;
+	 ++table->p0, table->p1 = table->buckets[table->p0]) {
+	if (table->p1) {
+	    *key       = table->p1->key;
+	    *value     = table->p1->value;
+	    table->p1  = table->p1->next;
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+int N(HashFirst)(void *t, unsigned long *key, void **value)
+{
+    HashTablePtr  table = (HashTablePtr)t;
+    
+    if (table->magic != HASH_MAGIC) return -1; /* Bad magic */
+
+    table->p0 = 0;
+    table->p1 = table->buckets[0];
+    return N(HashNext)(table, key, value);
+}
+
+#if HASH_MAIN
+#define DIST_LIMIT 10
+static int dist[DIST_LIMIT];
+
+static void clear_dist(void) {
+    int i;
+
+    for (i = 0; i < DIST_LIMIT; i++) dist[i] = 0;
+}
+
+static int count_entries(HashBucketPtr bucket)
+{
+    int count = 0;
+
+    for (; bucket; bucket = bucket->next) ++count;
+    return count;
+}
+
+static void update_dist(int count)
+{
+    if (count >= DIST_LIMIT) ++dist[DIST_LIMIT-1];
+    else                     ++dist[count];
+}
+
+static void compute_dist(HashTablePtr table)
+{
+    int           i;
+    HashBucketPtr bucket;
+    
+    printf("Entries = %ld, hits = %ld, partials = %ld, misses = %ld\n",
+	   table->entries, table->hits, table->partials, table->misses);
+    clear_dist();
+    for (i = 0; i < HASH_SIZE; i++) {
+	bucket = table->buckets[i];
+	update_dist(count_entries(bucket));
+    }
+    for (i = 0; i < DIST_LIMIT; i++) {
+	if (i != DIST_LIMIT-1) printf("%5d %10d\n", i, dist[i]);
+	else                   printf("other %10d\n", dist[i]);
+    }
+}
+
+static void check_table(HashTablePtr table,
+			unsigned long key, unsigned long value)
+{
+    unsigned long retval  = 0;
+    int           retcode = N(HashLookup)(table, key, &retval);
+    
+    switch (retcode) {
+    case -1:
+	printf("Bad magic = 0x%08lx:"
+	       " key = %lu, expected = %lu, returned = %lu\n",
+	       table->magic, key, value, retval);
+	break;
+    case 1:
+	printf("Not found: key = %lu, expected = %lu returned = %lu\n",
+	       key, value, retval);
+	break;
+    case 0:
+	if (value != retval)
+	    printf("Bad value: key = %lu, expected = %lu, returned = %lu\n",
+		   key, value, retval);
+	break;
+    default:
+	printf("Bad retcode = %d: key = %lu, expected = %lu, returned = %lu\n",
+	       retcode, key, value, retval);
+	break;
+    }
+}
+
+int main(void)
+{
+    HashTablePtr table;
+    int          i;
+
+    printf("\n***** 256 consecutive integers ****\n");
+    table = N(HashCreate)();
+    for (i = 0; i < 256; i++) N(HashInsert)(table, i, i);
+    for (i = 0; i < 256; i++) check_table(table, i, i);
+    for (i = 256; i >= 0; i--) check_table(table, i, i);
+    compute_dist(table);
+    N(HashDestroy)(table);
+    
+    printf("\n***** 1024 consecutive integers ****\n");
+    table = N(HashCreate)();
+    for (i = 0; i < 1024; i++) N(HashInsert)(table, i, i);
+    for (i = 0; i < 1024; i++) check_table(table, i, i);
+    for (i = 1024; i >= 0; i--) check_table(table, i, i);
+    compute_dist(table);
+    N(HashDestroy)(table);
+    
+    printf("\n***** 1024 consecutive page addresses (4k pages) ****\n");
+    table = N(HashCreate)();
+    for (i = 0; i < 1024; i++) N(HashInsert)(table, i*4096, i);
+    for (i = 0; i < 1024; i++) check_table(table, i*4096, i);
+    for (i = 1024; i >= 0; i--) check_table(table, i*4096, i);
+    compute_dist(table);
+    N(HashDestroy)(table);
+    
+    printf("\n***** 1024 random integers ****\n");
+    table = N(HashCreate)();
+    srandom(0xbeefbeef);
+    for (i = 0; i < 1024; i++) N(HashInsert)(table, random(), i);
+    srandom(0xbeefbeef);
+    for (i = 0; i < 1024; i++) check_table(table, random(), i);
+    srandom(0xbeefbeef);
+    for (i = 0; i < 1024; i++) check_table(table, random(), i);
+    compute_dist(table);
+    N(HashDestroy)(table);
+
+    printf("\n***** 5000 random integers ****\n");
+    table = N(HashCreate)();
+    srandom(0xbeefbeef);
+    for (i = 0; i < 5000; i++) N(HashInsert)(table, random(), i);
+    srandom(0xbeefbeef);
+    for (i = 0; i < 5000; i++) check_table(table, random(), i);
+    srandom(0xbeefbeef);
+    for (i = 0; i < 5000; i++) check_table(table, random(), i);
+    compute_dist(table);
+    N(HashDestroy)(table);
+    
+    return 0;
+}
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmI810.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmI810.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmI810.c	Fri Jun 16 17:03:27 2000
@@ -0,0 +1,86 @@
+#ifdef XFree86Server
+# include "xf86.h"
+# include "xf86_OSproc.h"
+# include "xf86_ansic.h"
+# include "xf86Priv.h"
+# define _DRM_MALLOC xalloc
+# define _DRM_FREE   xfree
+# ifndef XFree86LOADER
+#  include <sys/stat.h>
+#  include <sys/mman.h>
+# endif
+#else
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <ctype.h>
+# include <fcntl.h>
+# include <errno.h>
+# include <signal.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/time.h>
+# ifdef DRM_USE_MALLOC
+#  define _DRM_MALLOC malloc
+#  define _DRM_FREE   free
+extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
+extern int xf86RemoveSIGIOHandler(int fd);
+# else
+#  include <Xlibint.h>
+#  define _DRM_MALLOC Xmalloc
+#  define _DRM_FREE   Xfree
+# endif
+#endif
+
+/* Not all systems have MAP_FAILED defined */
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
+#include "xf86drm.h"
+#include "xf86drmI810.h"
+#include "drm.h"
+
+Bool drmI810CleanupDma(int driSubFD)
+{
+   drm_i810_init_t init;
+   
+   memset(&init, 0, sizeof(drm_i810_init_t));
+   init.func = I810_CLEANUP_DMA;
+   
+   if(ioctl(driSubFD, DRM_IOCTL_I810_INIT, &init)) {
+      return FALSE;
+   }
+   
+   return TRUE;
+}
+
+Bool drmI810InitDma(int driSubFD, drmI810Init *info)
+{
+   drm_i810_init_t init;
+   
+   memset(&init, 0, sizeof(drm_i810_init_t));
+
+   init.func = I810_INIT_DMA;
+   init.ring_map_idx = info->ring_map_idx;
+   init.buffer_map_idx = info->buffer_map_idx;
+   init.ring_start = info->start;
+   init.ring_end = info->end;
+   init.ring_size = info->size;
+   init.sarea_priv_offset = info->sarea_off;
+   init.front_offset = info->front_offset;
+   init.back_offset = info->back_offset;
+   init.depth_offset = info->depth_offset;
+   init.w = info->w;
+   init.h = info->h;
+   init.pitch = info->pitch;
+   init.pitch_bits = info->pitch_bits;
+
+   if(ioctl(driSubFD, DRM_IOCTL_I810_INIT, &init)) {
+      return FALSE;
+   }
+   return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmMga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmMga.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmMga.c	Fri Jun 16 17:03:27 2000
@@ -0,0 +1,116 @@
+#ifdef XFree86Server
+# include "xf86.h"
+# include "xf86_OSproc.h"
+# include "xf86_ansic.h"
+# include "xf86Priv.h"
+# define _DRM_MALLOC xalloc
+# define _DRM_FREE   xfree
+# ifndef XFree86LOADER
+#  include <sys/stat.h>
+#  include <sys/mman.h>
+# endif
+#else
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <ctype.h>
+# include <fcntl.h>
+# include <errno.h>
+# include <signal.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/time.h>
+# ifdef DRM_USE_MALLOC
+#  define _DRM_MALLOC malloc
+#  define _DRM_FREE   free
+extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
+extern int xf86RemoveSIGIOHandler(int fd);
+# else
+#  include <Xlibint.h>
+#  define _DRM_MALLOC Xmalloc
+#  define _DRM_FREE   Xfree
+# endif
+#endif
+
+/* Not all systems have MAP_FAILED defined */
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
+#include "xf86drm.h"
+#include "xf86drmMga.h"
+#include "drm.h"
+
+Bool drmMgaCleanupDma(int driSubFD)
+{
+   drm_mga_init_t init;
+   memset(&init, 0, sizeof(drm_mga_init_t));
+   init.func = MGA_CLEANUP_DMA;
+   if(ioctl(driSubFD, DRM_IOCTL_MGA_INIT, &init)) {
+      return FALSE;
+   }
+   
+   return TRUE;
+}
+
+Bool drmMgaLockUpdate(int driSubFD, drmLockFlags flags)
+{
+   drm_lock_t lock;
+   
+   memset(&lock, 0, sizeof(drm_lock_t));
+   
+   if (flags & DRM_LOCK_QUIESCENT)  lock.flags |= _DRM_LOCK_QUIESCENT;
+   if (flags & DRM_LOCK_FLUSH)      lock.flags |= _DRM_LOCK_FLUSH;
+   if (flags & DRM_LOCK_FLUSH_ALL)  lock.flags |= _DRM_LOCK_FLUSH_ALL;
+   
+   if(ioctl(driSubFD, DRM_IOCTL_MGA_FLUSH, &lock)) {
+      return FALSE;
+   }
+   
+   return TRUE;
+}
+
+Bool drmMgaInitDma(int driSubFD, drmMgaInit *info)
+{
+      drm_mga_init_t init;
+      int i;
+   
+      memset(&init, 0, sizeof(drm_mga_init_t));
+      init.func = MGA_INIT_DMA;
+      init.reserved_map_agpstart = info->reserved_map_agpstart;
+      init.reserved_map_idx = info->reserved_map_idx;
+      init.buffer_map_idx = info->buffer_map_idx;
+      init.sarea_priv_offset = info->sarea_priv_offset;
+      init.primary_size = info->primary_size;
+      init.warp_ucode_size = info->warp_ucode_size;
+      init.frontOffset = info->frontOffset;
+      init.backOffset = info->backOffset;
+      init.depthOffset = info->depthOffset;
+      init.textureOffset = info->textureOffset;
+      init.textureSize = info->textureSize;
+      init.agpTextureSize = info->agpTextureSize;
+      init.agpTextureOffset = info->agpTextureOffset;
+      init.cpp = info->cpp;
+      init.stride = info->stride;
+      init.sgram = info->sgram;
+      init.chipset = info->chipset;
+   
+      for(i = 0; i < MGA_MAX_WARP_PIPES; i++) {
+	       init.WarpIndex[i].installed = info->WarpIndex[i].installed;
+	       init.WarpIndex[i].phys_addr = info->WarpIndex[i].phys_addr;
+	       init.WarpIndex[i].size = info->WarpIndex[i].size;
+      }
+   
+      init.mAccess = info->mAccess;
+   
+   
+   
+      if(ioctl(driSubFD, DRM_IOCTL_MGA_INIT, &init)) {
+	       return FALSE;
+      }
+      return TRUE;
+}
+
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmR128.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmR128.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmR128.c	Fri Jun 16 17:03:27 2000
@@ -0,0 +1,198 @@
+/* xf86drmR128.c -- User-level interface to Rage 128 DRM device
+ * Created: Sun Apr  9 18:13:54 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Author: Kevin E. Martin <kevin@precisioninsight.com>
+ * 
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmR128.c,v 1.1 2000/06/17 00:03:27 martin Exp $
+ * 
+ */
+
+#ifdef XFree86Server
+# include "xf86.h"
+# include "xf86_OSproc.h"
+# include "xf86_ansic.h"
+# include "xf86Priv.h"
+# define _DRM_MALLOC xalloc
+# define _DRM_FREE   xfree
+# ifndef XFree86LOADER
+#  include <sys/stat.h>
+#  include <sys/mman.h>
+# endif
+#else
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <ctype.h>
+# include <fcntl.h>
+# include <errno.h>
+# include <signal.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/time.h>
+# ifdef DRM_USE_MALLOC
+#  define _DRM_MALLOC malloc
+#  define _DRM_FREE   free
+extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
+extern int xf86RemoveSIGIOHandler(int fd);
+# else
+#  include <Xlibint.h>
+#  define _DRM_MALLOC Xmalloc
+#  define _DRM_FREE   Xfree
+# endif
+#endif
+
+/* Not all systems have MAP_FAILED defined */
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
+#include "xf86drm.h"
+#include "xf86drmR128.h"
+#include "drm.h"
+
+int drmR128InitCCE(int fd, drmR128Init *info)
+{
+    drm_r128_init_t init;
+   
+    memset(&init, 0, sizeof(drm_r128_init_t));
+
+    init.func                = R128_INIT_CCE;
+    init.sarea_priv_offset   = info->sarea_priv_offset;
+    init.is_pci              = info->is_pci;
+    init.cce_mode            = info->cce_mode;
+    init.cce_fifo_size       = info->cce_fifo_size;
+    init.cce_secure          = info->cce_secure;
+    init.ring_size           = info->ring_size;
+    init.usec_timeout        = info->usec_timeout;
+
+    init.fb_offset           = info->fb_offset;
+    init.agp_ring_offset     = info->agp_ring_offset;
+    init.agp_read_ptr_offset = info->agp_read_ptr_offset;
+    init.agp_vertbufs_offset = info->agp_vertbufs_offset;
+    init.agp_indbufs_offset  = info->agp_indbufs_offset;
+    init.agp_textures_offset = info->agp_textures_offset;
+    init.mmio_offset         = info->mmio_offset;
+
+    if (ioctl(fd, DRM_IOCTL_R128_INIT, &init)) return -errno;
+
+    return 0;
+}
+
+int drmR128CleanupCCE(int fd)
+{
+    drm_r128_init_t init;
+
+    memset(&init, 0, sizeof(drm_r128_init_t));
+
+    init.func = R128_CLEANUP_CCE;
+
+    if (ioctl(fd, DRM_IOCTL_R128_INIT, &init)) return -errno;
+
+    return 0;
+}
+
+int drmR128EngineReset(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_R128_RESET, NULL)) return -errno;
+
+    return 0;
+}
+
+int drmR128EngineFlush(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_R128_FLUSH, NULL)) return -errno;
+
+    return 0;
+}
+
+int drmR128CCEWaitForIdle(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_R128_CCEIDL, NULL)) return -errno;
+
+    return 0;
+}
+
+int drmR128SubmitPackets(int fd, CARD32 *buffer, int *count, int flags)
+{
+    drm_r128_packet_t packet;
+    int               ret;
+
+    memset(&packet, 0, sizeof(drm_r128_packet_t));
+
+    packet.count = *count;
+    packet.flags = flags;
+
+    while (packet.count > 0) {
+	packet.buffer = buffer + (*count - packet.count);
+	ret = ioctl(fd, DRM_IOCTL_R128_PACKET, &packet);
+	if (ret < 0 && ret != -EAGAIN) {
+	    *count = packet.count;
+	    return -errno;
+	}
+    }
+
+    *count = 0;
+    return 0;
+}
+
+int drmR128GetVertexBuffers(int fd, int count, int *indices, int *sizes)
+{
+    drm_r128_vertex_t v;
+
+    v.send_count      = 0;
+    v.send_indices    = NULL;
+    v.send_sizes      = NULL;
+    v.prim            = DRM_R128_PRIM_NONE;
+    v.request_count   = count;
+    v.request_indices = indices;
+    v.request_sizes   = sizes;
+    v.granted_count   = 0;
+
+    if (ioctl(fd, DRM_IOCTL_R128_VERTEX, &v)) return -errno;
+
+    return v.granted_count;
+}
+
+int drmR128FlushVertexBuffers(int fd, int count, int *indices,
+			      int *sizes, drmR128PrimType prim)
+{
+    drm_r128_vertex_t v;
+
+    v.send_count      = count;
+    v.send_indices    = indices;
+    v.send_sizes      = sizes;
+    v.prim            = prim;
+    v.request_count   = 0;
+    v.request_indices = NULL;
+    v.request_sizes   = NULL;
+    v.granted_count   = 0;
+
+    if (ioctl(fd, DRM_IOCTL_R128_VERTEX, &v) < 0) return -errno;
+
+    return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmRandom.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmRandom.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmRandom.c	Fri Jun 16 17:03:28 2000
@@ -0,0 +1,219 @@
+/* xf86drmRandom.c -- "Minimal Standard" PRNG Implementation
+ * Created: Mon Apr 19 08:28:13 1999 by faith@precisioninsight.com
+ * Revised: Thu Jun 24 14:53:45 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.4 1999/06/24 18:54:55 faith Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmRandom.c,v 1.1 2000/06/17 00:03:28 martin Exp $
+ *
+ * DESCRIPTION
+ *
+ * This file contains a simple, straightforward implementation of the Park
+ * & Miller "Minimal Standard" PRNG [PM88, PMS93], which is a Lehmer
+ * multiplicative linear congruential generator (MLCG) with a period of
+ * 2^31-1.
+ *
+ * This implementation is intended to provide a reliable, portable PRNG
+ * that is suitable for testing a hash table implementation and for
+ * implementing skip lists.
+ *
+ * FUTURE ENHANCEMENTS
+ *
+ * If initial seeds are not selected randomly, two instances of the PRNG
+ * can be correlated.  [Knuth81, pp. 32-33] describes a shuffling technique
+ * that can eliminate this problem.
+ *
+ * If PRNGs are used for simulation, the period of the current
+ * implementation may be too short.  [LE88] discusses methods of combining
+ * MLCGs to produce much longer periods, and suggests some alternative
+ * values for A and M.  [LE90 and Sch92] also provide information on
+ * long-period PRNGs.
+ *
+ * REFERENCES
+ *
+ * [Knuth81] Donald E. Knuth. The Art of Computer Programming.  Volume 2:
+ * Seminumerical Algorithms.  Reading, Massachusetts: Addison-Wesley, 1981.
+ *
+ * [LE88] Pierre L'Ecuyer. "Efficient and Portable Combined Random Number
+ * Generators".  CACM 31(6), June 1988, pp. 742-774.
+ *
+ * [LE90] Pierre L'Ecuyer. "Random Numbers for Simulation". CACM 33(10,
+ * October 1990, pp. 85-97.
+ *
+ * [PM88] Stephen K. Park and Keith W. Miller. "Random Number Generators:
+ * Good Ones are Hard to Find". CACM 31(10), October 1988, pp. 1192-1201.
+ *
+ * [Sch92] Bruce Schneier. "Pseudo-Ransom Sequence Generator for 32-Bit
+ * CPUs".  Dr. Dobb's Journal 17(2), February 1992, pp. 34, 37-38, 40.
+ *
+ * [PMS93] Stephen K. Park, Keith W. Miller, and Paul K. Stockmeyer.  In
+ * "Technical Correspondence: Remarks on Choosing and Implementing Random
+ * Number Generators". CACM 36(7), July 1993, pp. 105-110.
+ *
+ */
+
+#define RANDOM_MAIN 0
+
+#if RANDOM_MAIN
+# include <stdio.h>
+# include <stdlib.h>
+#else
+# include "xf86drm.h"
+# ifdef XFree86LOADER
+#  include "xf86.h"
+#  include "xf86_ansic.h"
+# else
+#  include <stdio.h>
+#  include <stdlib.h>
+# endif
+#endif
+
+#define N(x)  drm##x
+
+#define RANDOM_MAGIC 0xfeedbeef
+#define RANDOM_DEBUG 0
+
+#if RANDOM_MAIN
+#define RANDOM_ALLOC malloc
+#define RANDOM_FREE  free
+#else
+#define RANDOM_ALLOC drmMalloc
+#define RANDOM_FREE  drmFree
+#endif
+
+typedef struct RandomState {
+    unsigned long magic;
+    unsigned long a;
+    unsigned long m;
+    unsigned long q;		/* m div a */
+    unsigned long r;		/* m mod a */
+    unsigned long check;
+    long          seed;
+} RandomState;
+
+#if RANDOM_MAIN
+extern void          *N(RandomCreate)(unsigned long seed);
+extern int           N(RandomDestroy)(void *state);
+extern unsigned long N(Random)(void *state);
+extern double        N(RandomDouble)(void *state);
+#endif
+
+void *N(RandomCreate)(unsigned long seed)
+{
+    RandomState  *state;
+
+    state           = RANDOM_ALLOC(sizeof(*state));
+    if (!state) return NULL;
+    state->magic    = RANDOM_MAGIC;
+#if 0
+				/* Park & Miller, October 1988 */
+    state->a        = 16807;
+    state->m        = 2147483647;
+    state->check    = 1043618065; /* After 10000 iterations */
+#else
+				/* Park, Miller, and Stockmeyer, July 1993 */
+    state->a        = 48271;
+    state->m        = 2147483647;
+    state->check    = 399268537; /* After 10000 iterations */
+#endif
+    state->q        = state->m / state->a;
+    state->r        = state->m % state->a;
+
+    state->seed     = seed;
+				/* Check for illegal boundary conditions,
+                                   and choose closest legal value. */
+    if (state->seed <= 0)        state->seed = 1;
+    if (state->seed >= state->m) state->seed = state->m - 1;
+
+    return state;
+}
+
+int N(RandomDestroy)(void *state)
+{
+    RANDOM_FREE(state);
+    return 0;
+}
+
+unsigned long N(Random)(void *state)
+{
+    RandomState   *s = (RandomState *)state;
+    long          hi;
+    long          lo;
+
+    hi      = s->seed / s->q;
+    lo      = s->seed % s->q;
+    s->seed = s->a * lo - s->r * hi;
+    if (s->seed <= 0) s->seed += s->m;
+
+    return s->seed;
+}
+
+double N(RandomDouble)(void *state)
+{
+    RandomState *s = (RandomState *)state;
+    
+    return (double)N(Random)(state)/(double)s->m;
+}
+
+#if RANDOM_MAIN
+static void check_period(long seed)
+{
+    unsigned long count = 0;
+    unsigned long initial;
+    void          *state;
+    
+    state = N(RandomCreate)(seed);
+    initial = N(Random)(state);
+    ++count;
+    while (initial != N(Random)(state)) {
+	if (!++count) break;
+    }
+    printf("With seed of %10ld, period = %10lu (0x%08lx)\n",
+	   seed, count, count);
+    N(RandomDestroy)(state);
+}
+
+int main(void)
+{
+    RandomState   *state;
+    int           i;
+    unsigned long rand;
+
+    state = N(RandomCreate)(1);
+    for (i = 0; i < 10000; i++) {
+	rand = N(Random)(state);
+    }
+    printf("After 10000 iterations: %lu (%lu expected): %s\n",
+	   rand, state->check,
+	   rand - state->check ? "*INCORRECT*" : "CORRECT");
+    N(RandomDestroy)(state);
+
+    printf("Checking periods...\n");
+    check_period(1);
+    check_period(2);
+    check_period(31415926);
+    
+    return 0;
+}
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmSL.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmSL.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmSL.c	Fri Jun 16 17:03:28 2000
@@ -0,0 +1,490 @@
+/* xf86drmSL.c -- Skip list support
+ * Created: Mon May 10 09:28:13 1999 by faith@precisioninsight.com
+ * Revised: Thu Jun  3 16:13:01 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.2 1999/06/07 13:01:42 faith Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/xf86drmSL.c,v 1.1 2000/06/17 00:03:28 martin Exp $
+ *
+ * DESCRIPTION
+ *
+ * This file contains a straightforward skip list implementation.n
+ *
+ * FUTURE ENHANCEMENTS
+ *
+ * REFERENCES
+ *
+ * [Pugh90] William Pugh.  Skip Lists: A Probabilistic Alternative to
+ * Balanced Trees. CACM 33(6), June 1990, pp. 668-676.
+ *
+ */
+
+#define SL_MAIN 0
+
+#if SL_MAIN
+# include <stdio.h>
+# include <stdlib.h>
+#  include <sys/time.h>
+#else
+# include "xf86drm.h"
+# ifdef XFree86LOADER
+#  include "xf86.h"
+#  include "xf86_ansic.h"
+# else
+#  include <stdio.h>
+#  include <stdlib.h>
+# endif
+#endif
+
+#define N(x)  drm##x
+
+#define SL_LIST_MAGIC  0xfacade00LU
+#define SL_ENTRY_MAGIC 0x00fab1edLU
+#define SL_FREED_MAGIC 0xdecea5edLU
+#define SL_MAX_LEVEL   16
+#define SL_DEBUG       0
+#define SL_RANDOM_SEED 0xc01055a1LU
+
+#if SL_MAIN
+#define SL_ALLOC malloc
+#define SL_FREE  free
+#define SL_RANDOM_DECL        static int state = 0;
+#define SL_RANDOM_INIT(seed)  if (!state) { srandom(seed); ++state; }
+#define SL_RANDOM             random()
+#else
+#define SL_ALLOC drmMalloc
+#define SL_FREE  drmFree
+#define SL_RANDOM_DECL        static void *state = NULL
+#define SL_RANDOM_INIT(seed)  if (!state) state = drmRandomCreate(seed)
+#define SL_RANDOM             drmRandom(state)
+
+#endif
+
+typedef struct SLEntry {
+    unsigned long     magic;	   /* SL_ENTRY_MAGIC */
+    unsigned long     key;
+    void              *value;
+    int               levels;
+    struct SLEntry    *forward[1]; /* variable sized array */
+} SLEntry, *SLEntryPtr;
+
+typedef struct SkipList {
+    unsigned long    magic;	/* SL_LIST_MAGIC */
+    int              level;
+    int              count;
+    SLEntryPtr       head;
+    SLEntryPtr       p0;	/* Position for iteration */
+} SkipList, *SkipListPtr;
+
+#if SL_MAIN
+extern void *N(SLCreate)(void);
+extern int  N(SLDestroy)(void *l);
+extern int  N(SLLookup)(void *l, unsigned long key, void **value);
+extern int  N(SLInsert)(void *l, unsigned long key, void *value);
+extern int  N(SLDelete)(void *l, unsigned long key);
+extern int  N(SLNext)(void *l, unsigned long *key, void **value);
+extern int  N(SLFirst)(void *l, unsigned long *key, void **value);
+extern void N(SLDump)(void *l);
+extern int  N(SLLookupNeighbors)(void *l, unsigned long key,
+				 unsigned long *prev_key, void **prev_value,
+				 unsigned long *next_key, void **next_value);
+#endif
+
+static SLEntryPtr SLCreateEntry(int max_level, unsigned long key, void *value)
+{
+    SLEntryPtr entry;
+    
+    if (max_level < 0 || max_level > SL_MAX_LEVEL) max_level = SL_MAX_LEVEL;
+
+    entry         = SL_ALLOC(sizeof(*entry)
+			     + (max_level + 1) * sizeof(entry->forward[0]));
+    if (!entry) return NULL;
+    entry->magic  = SL_ENTRY_MAGIC;
+    entry->key    = key;
+    entry->value  = value;
+    entry->levels = max_level + 1;
+
+    return entry;
+}
+
+static int SLRandomLevel(void)
+{
+    int level = 1;
+    SL_RANDOM_DECL;
+
+    SL_RANDOM_INIT(SL_RANDOM_SEED);
+    
+    while ((SL_RANDOM & 0x01) && level < SL_MAX_LEVEL) ++level;
+    return level;
+}
+
+void *N(SLCreate)(void)
+{
+    SkipListPtr  list;
+    int          i;
+
+    list           = SL_ALLOC(sizeof(*list));
+    if (!list) return NULL;
+    list->magic    = SL_LIST_MAGIC;
+    list->level    = 0;
+    list->head     = SLCreateEntry(SL_MAX_LEVEL, 0, NULL);
+    list->count    = 0;
+
+    for (i = 0; i <= SL_MAX_LEVEL; i++) list->head->forward[i] = NULL;
+    
+    return list;
+}
+
+int N(SLDestroy)(void *l)
+{
+    SkipListPtr   list  = (SkipListPtr)l;
+    SLEntryPtr    entry;
+    SLEntryPtr    next;
+
+    if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */
+
+    for (entry = list->head; entry; entry = next) {
+	if (entry->magic != SL_ENTRY_MAGIC) return -1; /* Bad magic */
+	next         = entry->forward[0];
+	entry->magic = SL_FREED_MAGIC;
+	SL_FREE(entry);
+    }
+
+    list->magic = SL_FREED_MAGIC;
+    SL_FREE(list);
+    return 0;
+}
+
+static SLEntryPtr SLLocate(void *l, unsigned long key, SLEntryPtr *update)
+{
+    SkipListPtr   list  = (SkipListPtr)l;
+    SLEntryPtr    entry;
+    int           i;
+
+    if (list->magic != SL_LIST_MAGIC) return NULL;
+
+    for (i = list->level, entry = list->head; i >= 0; i--) {
+	while (entry->forward[i] && entry->forward[i]->key < key)
+	    entry = entry->forward[i];
+	update[i] = entry;
+    }
+
+    return entry->forward[0];
+}
+
+int N(SLInsert)(void *l, unsigned long key, void *value)
+{
+    SkipListPtr   list  = (SkipListPtr)l;
+    SLEntryPtr    entry;
+    SLEntryPtr    update[SL_MAX_LEVEL + 1];
+    int           level;
+    int           i;
+
+    if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */
+
+    entry = SLLocate(list, key, update);
+
+    if (entry && entry->key == key) return 1; /* Already in list */
+
+
+    level = SLRandomLevel();
+    if (level > list->level) {
+	level = ++list->level;
+	update[level] = list->head;
+    }
+
+    entry = SLCreateEntry(level, key, value);
+
+				/* Fix up forward pointers */
+    for (i = 0; i <= level; i++) {
+	entry->forward[i]     = update[i]->forward[i];
+	update[i]->forward[i] = entry;
+    }
+
+    ++list->count;
+    return 0;			/* Added to table */
+}
+
+int N(SLDelete)(void *l, unsigned long key)
+{
+    SkipListPtr   list = (SkipListPtr)l;
+    SLEntryPtr    update[SL_MAX_LEVEL + 1];
+    SLEntryPtr    entry;
+    int           i;
+
+    if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */
+
+    entry = SLLocate(list, key, update);
+
+    if (!entry || entry->key != key) return 1; /* Not found */
+
+				/* Fix up forward pointers */
+    for (i = 0; i <= list->level; i++) {
+	if (update[i]->forward[i] == entry)
+	    update[i]->forward[i] = entry->forward[i];
+    }
+
+    entry->magic = SL_FREED_MAGIC;
+    SL_FREE(entry);
+
+    while (list->level && !list->head->forward[list->level]) --list->level;
+    --list->count;
+    return 0;
+}
+
+int N(SLLookup)(void *l, unsigned long key, void **value)
+{
+    SkipListPtr   list = (SkipListPtr)l;
+    SLEntryPtr    update[SL_MAX_LEVEL + 1];
+    SLEntryPtr    entry;
+
+    entry = SLLocate(list, key, update);
+
+    if (entry && entry->key == key) {
+	*value = entry;
+	return 0;
+    }
+    *value = NULL;
+    return -1;
+}
+
+int N(SLLookupNeighbors)(void *l, unsigned long key,
+			 unsigned long *prev_key, void **prev_value,
+			 unsigned long *next_key, void **next_value)
+{
+    SkipListPtr   list = (SkipListPtr)l;
+    SLEntryPtr    update[SL_MAX_LEVEL + 1];
+    SLEntryPtr    entry;
+    int           retcode = 0;
+
+    entry = SLLocate(list, key, update);
+
+    *prev_key   = *next_key   = key;
+    *prev_value = *next_value = NULL;
+	
+    if (update[0]) {
+	*prev_key   = update[0]->key;
+	*prev_value = update[0]->value;
+	++retcode;
+	if (update[0]->forward[0]) {
+	    *next_key   = update[0]->forward[0]->key;
+	    *next_value = update[0]->forward[0]->value;
+	    ++retcode;
+	}
+    }
+    return retcode;
+}
+
+int N(SLNext)(void *l, unsigned long *key, void **value)
+{
+    SkipListPtr   list = (SkipListPtr)l;
+    SLEntryPtr    entry;
+    
+    if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */
+
+    entry    = list->p0;
+
+    if (entry) {
+	list->p0 = entry->forward[0];
+	*key     = entry->key;
+	*value   = entry->value;
+	return 1;
+    }
+    list->p0 = NULL;
+    return 0;
+}
+
+int N(SLFirst)(void *l, unsigned long *key, void **value)
+{
+    SkipListPtr   list = (SkipListPtr)l;
+    
+    if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */
+    
+    list->p0 = list->head->forward[0];
+    return N(SLNext)(list, key, value);
+}
+
+/* Dump internal data structures for debugging. */
+void N(SLDump)(void *l)
+{
+    SkipListPtr   list = (SkipListPtr)l;
+    SLEntryPtr    entry;
+    int           i;
+    
+    if (list->magic != SL_LIST_MAGIC) {
+	printf("Bad magic: 0x%08lx (expected 0x%08lx)\n",
+	       list->magic, SL_LIST_MAGIC);
+	return;
+    }
+
+    printf("Level = %d, count = %d\n", list->level, list->count);
+    for (entry = list->head; entry; entry = entry->forward[0]) {
+	if (entry->magic != SL_ENTRY_MAGIC) {
+	    printf("Bad magic: 0x%08lx (expected 0x%08lx)\n",
+		   list->magic, SL_ENTRY_MAGIC);
+	}
+	printf("\nEntry %p <0x%08lx, %p> has %2d levels\n",
+	       entry, entry->key, entry->value, entry->levels);
+	for (i = 0; i < entry->levels; i++) {
+	    if (entry->forward[i]) {
+		printf("   %2d: %p <0x%08lx, %p>\n",
+		       i,
+		       entry->forward[i],
+		       entry->forward[i]->key,
+		       entry->forward[i]->value);
+	    } else {
+		printf("   %2d: %p\n", i, entry->forward[i]);
+	    }
+	}
+    }
+}
+
+#if SL_MAIN
+static void print(SkipListPtr list)
+{
+    unsigned long key;
+    void          *value;
+    
+    if (N(SLFirst)(list, &key, &value)) {
+	do {
+	    printf("key = %5lu, value = %p\n", key, value);
+	} while (N(SLNext)(list, &key, &value));
+    }
+}
+
+static double do_time(int size, int iter)
+{
+    SkipListPtr    list;
+    int            i, j;
+    unsigned long  keys[1000000];
+    unsigned long  previous;
+    unsigned long  key;
+    void           *value;
+    struct timeval start, stop;
+    double         usec;
+    SL_RANDOM_DECL;
+
+    SL_RANDOM_INIT(12345);
+    
+    list = N(SLCreate)();
+
+    for (i = 0; i < size; i++) {
+	keys[i] = SL_RANDOM;
+	N(SLInsert)(list, keys[i], NULL);
+    }
+
+    previous = 0;
+    if (N(SLFirst)(list, &key, &value)) {
+	do {
+	    if (key <= previous) {
+		printf( "%lu !< %lu\n", previous, key);
+	    }
+	    previous = key;
+	} while (N(SLNext)(list, &key, &value));
+    }
+    
+    gettimeofday(&start, NULL);
+    for (j = 0; j < iter; j++) {
+	for (i = 0; i < size; i++) {
+	    if (N(SLLookup)(list, keys[i], &value))
+		printf("Error %lu %d\n", keys[i], i);
+	}
+    }
+    gettimeofday(&stop, NULL);
+    
+    usec = (double)(stop.tv_sec * 1000000 + stop.tv_usec
+		    - start.tv_sec * 1000000 - start.tv_usec) / (size * iter);
+    
+    printf("%0.2f microseconds for list length %d\n", usec, size);
+
+    N(SLDestroy)(list);
+    
+    return usec;
+}
+
+static void print_neighbors(void *list, unsigned long key)
+{
+    unsigned long prev_key = 0;
+    unsigned long next_key = 0;
+    void          *prev_value;
+    void          *next_value;
+    int           retval;
+
+    retval = drmSLLookupNeighbors(list, key,
+				  &prev_key, &prev_value,
+				  &next_key, &next_value);
+    printf("Neighbors of %5lu: %d %5lu %5lu\n",
+	   key, retval, prev_key, next_key);
+}
+
+int main(void)
+{
+    SkipListPtr    list;
+    double         usec, usec2, usec3, usec4;
+
+    list = N(SLCreate)();
+    printf( "list at %p\n", list);
+
+    print(list);
+    printf("\n==============================\n\n");
+
+    N(SLInsert)(list, 123, NULL);
+    N(SLInsert)(list, 213, NULL);
+    N(SLInsert)(list, 50, NULL);
+    print(list);
+    printf("\n==============================\n\n");
+    
+    print_neighbors(list, 0);
+    print_neighbors(list, 50);
+    print_neighbors(list, 51);
+    print_neighbors(list, 123);
+    print_neighbors(list, 200);
+    print_neighbors(list, 213);
+    print_neighbors(list, 256);
+    printf("\n==============================\n\n");    
+    
+    N(SLDelete)(list, 50);
+    print(list);
+    printf("\n==============================\n\n");
+
+    N(SLDump)(list);
+    N(SLDestroy)(list);
+    printf("\n==============================\n\n");
+
+    usec  = do_time(100, 10000);
+    usec2 = do_time(1000, 500);
+    printf("Table size increased by %0.2f, search time increased by %0.2f\n",
+	   1000.0/100.0, usec2 / usec);
+    
+    usec3 = do_time(10000, 50);
+    printf("Table size increased by %0.2f, search time increased by %0.2f\n",
+	   10000.0/100.0, usec3 / usec);
+    
+    usec4 = do_time(100000, 4);
+    printf("Table size increased by %0.2f, search time increased by %0.2f\n",
+	   100000.0/100.0, usec4 / usec);
+
+    return 0;
+}
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile	Fri Jun 16 17:03:28 2000
@@ -0,0 +1,31 @@
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile,v 1.1 2000/06/17 00:03:28 martin Exp $
+XCOMM $PI$
+
+#include <Server.tmpl>
+
+LinkSourceFile(xf86drm.c,..)
+LinkSourceFile(xf86drmHash.c,..)
+LinkSourceFile(xf86drmRandom.c,..)
+LinkSourceFile(xf86drmSL.c,..)
+LinkSourceFile(xf86drm.h,$(XF86OSSRC))
+LinkSourceFile(xf86_OSproc.h,$(XF86OSSRC))
+LinkSourceFile(sigio.c,$(XF86OSSRC)/shared)
+
+XCOMM This is a kludge until we determine how best to build the
+XCOMM kernel-specific device driver.  This allows us to continue
+XCOMM to maintain the single Makefile.bsd with kernel-specific
+XCOMM support.  Later, we can move to a different Imakefile.
+
+#if BuildXF86DRI && BuildXF86DRM
+all::
+	$(MAKE) -f Makefile.bsd
+
+install::
+	$(MAKE) -f Makefile.bsd install
+#else
+all::
+	echo 'Use "make -f Makefile.bsd" to manually build drm.o'
+#endif
+
+clean::
+	$(MAKE) -f Makefile.bsd clean
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd	Fri Jun 16 17:03:28 2000
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR = drm tdfx gamma
+
+.include <bsd.subdir.mk>
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h	Fri Jun 16 17:03:28 2000
@@ -0,0 +1,362 @@
+/* drm.h -- Header for Direct Rendering Manager -*- c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * Acknowledgements:
+ * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
+ *
+ */
+
+#ifndef _DRM_H_
+#define _DRM_H_
+
+#include <sys/ioccom.h>		/* For _IO* macros */
+
+#define DRM_DEV_DRM	 "/dev/drm"
+#define DRM_DEV_MODE	 (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
+#define DRM_DEV_UID	 0
+#define DRM_DEV_GID	 0
+
+
+#define DRM_NAME	"drm"	  /* Name in kernel, /dev		    */
+#define DRM_MIN_ORDER	5	  /* At least 2^5 bytes = 32 bytes	    */
+#define DRM_MAX_ORDER	22	  /* Up to 2^22 bytes = 4MB		    */
+#define DRM_RAM_PERCENT 10	  /* How much system ram can we lock?	    */
+
+#define _DRM_LOCK_HELD	0x80000000 /* Hardware lock is held		    */
+#define _DRM_LOCK_CONT	0x40000000 /* Hardware lock is contended	    */
+#define _DRM_LOCK_IS_HELD(lock)	   ((lock) & _DRM_LOCK_HELD)
+#define _DRM_LOCK_IS_CONT(lock)	   ((lock) & _DRM_LOCK_CONT)
+#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
+
+typedef unsigned long drm_handle_t;
+typedef unsigned int  drm_context_t;
+typedef unsigned int  drm_drawable_t;
+typedef unsigned int  drm_magic_t;
+
+/* Warning: If you change this structure, make sure you change 
+ * XF86DRIClipRectRec in the server as well */
+
+typedef struct drm_clip_rect {
+           unsigned short x1;
+           unsigned short y1;
+           unsigned short x2;
+           unsigned short y2;
+} drm_clip_rect_t;
+
+/* Seperate include files for the i810/mga/r128 specific structures */
+#include "mga_drm.h"
+#include "i810_drm.h"
+#include "r128_drm.h"
+
+typedef struct drm_version {
+	int    version_major;	  /* Major version			    */
+	int    version_minor;	  /* Minor version			    */
+	int    version_patchlevel;/* Patch level			    */
+	size_t name_len;	  /* Length of name buffer		    */
+	char   *name;		  /* Name of driver			    */
+	size_t date_len;	  /* Length of date buffer		    */
+	char   *date;		  /* User-space buffer to hold date	    */
+	size_t desc_len;	  /* Length of desc buffer		    */
+	char   *desc;		  /* User-space buffer to hold desc	    */
+} drm_version_t;
+
+typedef struct drm_unique {
+	size_t unique_len;	  /* Length of unique			    */
+	char   *unique;		  /* Unique name for driver instantiation   */
+} drm_unique_t;
+
+typedef struct drm_list {
+	int		 count;	  /* Length of user-space structures	    */
+	drm_version_t	 *version;
+} drm_list_t;
+
+typedef struct drm_block {
+	int		 unused;
+} drm_block_t;
+
+typedef struct drm_control {
+	enum {
+		DRM_ADD_COMMAND,
+		DRM_RM_COMMAND,
+		DRM_INST_HANDLER,
+		DRM_UNINST_HANDLER
+	}		 func;
+	int		 irq;
+} drm_control_t;
+
+typedef enum drm_map_type {
+	_DRM_FRAME_BUFFER = 0,	  /* WC (no caching), no core dump	    */
+	_DRM_REGISTERS	  = 1,	  /* no caching, no core dump		    */
+	_DRM_SHM	  = 2,	  /* shared, cached			    */
+	_DRM_AGP	  = 3	  /* AGP/GART				    */
+} drm_map_type_t;
+
+typedef enum drm_map_flags {
+	_DRM_RESTRICTED	     = 0x01, /* Cannot be mapped to user-virtual    */
+	_DRM_READ_ONLY	     = 0x02,
+	_DRM_LOCKED	     = 0x04, /* shared, cached, locked		    */
+	_DRM_KERNEL	     = 0x08, /* kernel requires access		    */
+	_DRM_WRITE_COMBINING = 0x10, /* use write-combining if available    */
+	_DRM_CONTAINS_LOCK   = 0x20  /* SHM page that contains lock	    */
+} drm_map_flags_t;
+
+typedef struct drm_map {
+	unsigned long	offset;	 /* Requested physical address (0 for SAREA)*/
+	unsigned long	size;	 /* Requested physical size (bytes)	    */
+	drm_map_type_t	type;	 /* Type of memory to map		    */
+	drm_map_flags_t flags;	 /* Flags				    */
+	void		*handle; /* User-space: "Handle" to pass to mmap    */
+				 /* Kernel-space: kernel-virtual address    */
+	int		mtrr;	 /* MTRR slot used			    */
+				 /* Private data			    */
+} drm_map_t;
+
+typedef enum drm_lock_flags {
+	_DRM_LOCK_READY	     = 0x01, /* Wait until hardware is ready for DMA */
+	_DRM_LOCK_QUIESCENT  = 0x02, /* Wait until hardware quiescent	     */
+	_DRM_LOCK_FLUSH	     = 0x04, /* Flush this context's DMA queue first */
+	_DRM_LOCK_FLUSH_ALL  = 0x08, /* Flush all DMA queues first	     */
+				/* These *HALT* flags aren't supported yet
+				   -- they will be used to support the
+				   full-screen DGA-like mode. */
+	_DRM_HALT_ALL_QUEUES = 0x10, /* Halt all current and future queues   */
+	_DRM_HALT_CUR_QUEUES = 0x20  /* Halt all current queues		     */
+} drm_lock_flags_t;
+
+typedef struct drm_lock {
+	int		 context;
+	drm_lock_flags_t flags;
+} drm_lock_t;
+
+typedef enum drm_dma_flags {	      /* These values *MUST* match xf86drm.h */
+				      /* Flags for DMA buffer dispatch	     */
+	_DRM_DMA_BLOCK	      = 0x01, /* Block until buffer dispatched.
+					 Note, the buffer may not yet have
+					 been processed by the hardware --
+					 getting a hardware lock with the
+					 hardware quiescent will ensure
+					 that the buffer has been
+					 processed.			     */
+	_DRM_DMA_WHILE_LOCKED = 0x02, /* Dispatch while lock held	     */
+	_DRM_DMA_PRIORITY     = 0x04, /* High priority dispatch		     */
+
+				      /* Flags for DMA buffer request	     */
+	_DRM_DMA_WAIT	      = 0x10, /* Wait for free buffers		     */
+	_DRM_DMA_SMALLER_OK   = 0x20, /* Smaller-than-requested buffers ok   */
+	_DRM_DMA_LARGER_OK    = 0x40  /* Larger-than-requested buffers ok    */
+} drm_dma_flags_t;
+
+typedef struct drm_buf_desc {
+	int	      count;	 /* Number of buffers of this size	     */
+	int	      size;	 /* Size in bytes			     */
+	int	      low_mark;	 /* Low water mark			     */
+	int	      high_mark; /* High water mark			     */
+	enum {
+		_DRM_PAGE_ALIGN = 0x01, /* Align on page boundaries for DMA  */
+		_DRM_AGP_BUFFER = 0x02  /* Buffer is in agp space            */
+	}	      flags;
+	unsigned long agp_start; /* Start address of where the agp buffers
+				  * are in the agp aperture */
+} drm_buf_desc_t;
+
+typedef struct drm_buf_info {
+	int	       count;	/* Entries in list			     */
+	drm_buf_desc_t *list;
+} drm_buf_info_t;
+
+typedef struct drm_buf_free {
+	int	       count;
+	int	       *list;
+} drm_buf_free_t;
+
+typedef struct drm_buf_pub {
+	int		  idx;	       /* Index into master buflist	     */
+	int		  total;       /* Buffer size			     */
+	int		  used;	       /* Amount of buffer in use (for DMA)  */
+	void		  *address;    /* Address of buffer		     */
+} drm_buf_pub_t;
+
+typedef struct drm_buf_map {
+	int	      count;	/* Length of buflist			    */
+	void	      *virtual;	/* Mmaped area in user-virtual		    */
+	drm_buf_pub_t *list;	/* Buffer information			    */
+} drm_buf_map_t;
+
+typedef struct drm_dma {
+				/* Indices here refer to the offset into
+				   buflist in drm_buf_get_t.  */
+	int		context;	  /* Context handle		    */
+	int		send_count;	  /* Number of buffers to send	    */
+	int		*send_indices;	  /* List of handles to buffers	    */
+	int		*send_sizes;	  /* Lengths of data to send	    */
+	drm_dma_flags_t flags;		  /* Flags			    */
+	int		request_count;	  /* Number of buffers requested    */
+	int		request_size;	  /* Desired size for buffers	    */
+	int		*request_indices; /* Buffer information		    */
+	int		*request_sizes;
+	int		granted_count;	  /* Number of buffers granted	    */
+} drm_dma_t;
+
+typedef enum {
+	_DRM_CONTEXT_PRESERVED = 0x01,
+	_DRM_CONTEXT_2DONLY    = 0x02
+} drm_ctx_flags_t;
+
+typedef struct drm_ctx {
+	drm_context_t	handle;
+	drm_ctx_flags_t flags;
+} drm_ctx_t;
+
+typedef struct drm_ctx_res {
+	int		count;
+	drm_ctx_t	*contexts;
+} drm_ctx_res_t;
+
+typedef struct drm_draw {
+	drm_drawable_t	handle;
+} drm_draw_t;
+
+typedef struct drm_auth {
+	drm_magic_t	magic;
+} drm_auth_t;
+
+typedef struct drm_irq_busid {
+	int irq;
+	int busnum;
+	int devnum;
+	int funcnum;
+} drm_irq_busid_t;
+
+typedef struct drm_agp_mode {
+	unsigned long mode;
+} drm_agp_mode_t;
+
+				/* For drm_agp_alloc -- allocated a buffer */
+typedef struct drm_agp_buffer {
+	unsigned long size;	/* In bytes -- will round to page boundary */
+	unsigned long handle;	/* Used for BIND/UNBIND ioctls */
+	unsigned long type;     /* Type of memory to allocate  */
+        unsigned long physical; /* Physical used by i810       */
+} drm_agp_buffer_t;
+
+				/* For drm_agp_bind */
+typedef struct drm_agp_binding {
+	unsigned long handle;   /* From drm_agp_buffer */
+	unsigned long offset;	/* In bytes -- will round to page boundary */
+} drm_agp_binding_t;
+
+typedef struct drm_agp_info {
+	int            agp_version_major;
+	int            agp_version_minor;
+	unsigned long  mode;
+	unsigned long  aperture_base;  /* physical address */
+	unsigned long  aperture_size;  /* bytes */
+	unsigned long  memory_allowed; /* bytes */
+	unsigned long  memory_used;
+
+				/* PCI information */
+	unsigned short id_vendor;
+	unsigned short id_device;
+} drm_agp_info_t;
+
+#define DRM_IOCTL_BASE	     'd'
+#define DRM_IOCTL_NR(n)	     ((n) & 0xff)
+#define DRM_IO(nr)	     _IO(DRM_IOCTL_BASE,nr)
+#define DRM_IOR(nr,size)     _IOR(DRM_IOCTL_BASE,nr,size)
+#define DRM_IOW(nr,size)     _IOW(DRM_IOCTL_BASE,nr,size)
+#define DRM_IOWR(nr,size)    _IOWR(DRM_IOCTL_BASE,nr,size)
+
+
+#define DRM_IOCTL_VERSION    DRM_IOWR(0x00, drm_version_t)
+#define DRM_IOCTL_GET_UNIQUE DRM_IOWR(0x01, drm_unique_t)
+#define DRM_IOCTL_GET_MAGIC  DRM_IOR( 0x02, drm_auth_t)
+#define DRM_IOCTL_IRQ_BUSID  DRM_IOWR(0x03, drm_irq_busid_t)
+
+#define DRM_IOCTL_SET_UNIQUE DRM_IOW( 0x10, drm_unique_t)
+#define DRM_IOCTL_AUTH_MAGIC DRM_IOW( 0x11, drm_auth_t)
+#define DRM_IOCTL_BLOCK	     DRM_IOWR(0x12, drm_block_t)
+#define DRM_IOCTL_UNBLOCK    DRM_IOWR(0x13, drm_block_t)
+#define DRM_IOCTL_CONTROL    DRM_IOW( 0x14, drm_control_t)
+#define DRM_IOCTL_ADD_MAP    DRM_IOWR(0x15, drm_map_t)
+#define DRM_IOCTL_ADD_BUFS   DRM_IOWR(0x16, drm_buf_desc_t)
+#define DRM_IOCTL_MARK_BUFS  DRM_IOW( 0x17, drm_buf_desc_t)
+#define DRM_IOCTL_INFO_BUFS  DRM_IOWR(0x18, drm_buf_info_t)
+#define DRM_IOCTL_MAP_BUFS   DRM_IOWR(0x19, drm_buf_map_t)
+#define DRM_IOCTL_FREE_BUFS  DRM_IOW( 0x1a, drm_buf_free_t)
+
+#define DRM_IOCTL_ADD_CTX    DRM_IOWR(0x20, drm_ctx_t)
+#define DRM_IOCTL_RM_CTX     DRM_IOWR(0x21, drm_ctx_t)
+#define DRM_IOCTL_MOD_CTX    DRM_IOW( 0x22, drm_ctx_t)
+#define DRM_IOCTL_GET_CTX    DRM_IOWR(0x23, drm_ctx_t)
+#define DRM_IOCTL_SWITCH_CTX DRM_IOW( 0x24, drm_ctx_t)
+#define DRM_IOCTL_NEW_CTX    DRM_IOW( 0x25, drm_ctx_t)
+#define DRM_IOCTL_RES_CTX    DRM_IOWR(0x26, drm_ctx_res_t)
+#define DRM_IOCTL_ADD_DRAW   DRM_IOWR(0x27, drm_draw_t)
+#define DRM_IOCTL_RM_DRAW    DRM_IOWR(0x28, drm_draw_t)
+#define DRM_IOCTL_DMA	     DRM_IOWR(0x29, drm_dma_t)
+#define DRM_IOCTL_LOCK	     DRM_IOW( 0x2a, drm_lock_t)
+#define DRM_IOCTL_UNLOCK     DRM_IOW( 0x2b, drm_lock_t)
+#define DRM_IOCTL_FINISH     DRM_IOW( 0x2c, drm_lock_t)
+
+#define DRM_IOCTL_AGP_ACQUIRE DRM_IO(  0x30)
+#define DRM_IOCTL_AGP_RELEASE DRM_IO(  0x31)
+#define DRM_IOCTL_AGP_ENABLE  DRM_IOW( 0x32, drm_agp_mode_t)
+#define DRM_IOCTL_AGP_INFO    DRM_IOR( 0x33, drm_agp_info_t)
+#define DRM_IOCTL_AGP_ALLOC   DRM_IOWR(0x34, drm_agp_buffer_t)
+#define DRM_IOCTL_AGP_FREE    DRM_IOW( 0x35, drm_agp_buffer_t)
+#define DRM_IOCTL_AGP_BIND    DRM_IOW( 0x36, drm_agp_binding_t)
+#define DRM_IOCTL_AGP_UNBIND  DRM_IOW( 0x37, drm_agp_binding_t)
+
+/* Mga specific ioctls */
+#define DRM_IOCTL_MGA_INIT    DRM_IOW( 0x40, drm_mga_init_t)
+#define DRM_IOCTL_MGA_SWAP    DRM_IOW( 0x41, drm_mga_swap_t)
+#define DRM_IOCTL_MGA_CLEAR   DRM_IOW( 0x42, drm_mga_clear_t)
+#define DRM_IOCTL_MGA_ILOAD   DRM_IOW( 0x43, drm_mga_iload_t)
+#define DRM_IOCTL_MGA_VERTEX  DRM_IOW( 0x44, drm_mga_vertex_t)
+#define DRM_IOCTL_MGA_FLUSH   DRM_IOW( 0x45, drm_lock_t )
+#define DRM_IOCTL_MGA_INDICES DRM_IOW( 0x46, drm_mga_indices_t)
+
+/* I810 specific ioctls */
+#define DRM_IOCTL_I810_INIT    DRM_IOW( 0x40, drm_i810_init_t)
+#define DRM_IOCTL_I810_VERTEX  DRM_IOW( 0x41, drm_i810_vertex_t)
+#define DRM_IOCTL_I810_CLEAR   DRM_IOW( 0x42, drm_i810_clear_t)
+#define DRM_IOCTL_I810_FLUSH   DRM_IO ( 0x43)
+#define DRM_IOCTL_I810_GETAGE  DRM_IO ( 0x44)
+#define DRM_IOCTL_I810_GETBUF  DRM_IOWR(0x45, drm_i810_dma_t)
+#define DRM_IOCTL_I810_SWAP    DRM_IO ( 0x46)
+
+/* Rage 128 specific ioctls */
+#define DRM_IOCTL_R128_INIT	DRM_IOW( 0x40, drm_r128_init_t)
+#define DRM_IOCTL_R128_RESET	DRM_IO(  0x41)
+#define DRM_IOCTL_R128_FLUSH	DRM_IO(  0x42)
+#define DRM_IOCTL_R128_CCEIDL	DRM_IO(  0x43)
+#define DRM_IOCTL_R128_PACKET	DRM_IOW( 0x44, drm_r128_packet_t)
+#define DRM_IOCTL_R128_VERTEX	DRM_IOW( 0x45, drm_r128_vertex_t)
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h	Fri Jun 16 17:03:28 2000
@@ -0,0 +1,723 @@
+/* drmP.h -- Private header for Direct Rendering Manager -*- c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
+ * Revised: Tue Oct 12 08:51:07 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h,v 1.1 2000/06/17 00:03:28 martin Exp $
+ * 
+ */
+
+#ifndef _DRM_P_H_
+#define _DRM_P_H_
+
+#ifdef _KERNEL
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/stat.h>
+#include <sys/proc.h>
+#include <sys/lock.h>
+#include <sys/fcntl.h>
+#include <sys/uio.h>
+#include <sys/filio.h>
+#include <sys/sysctl.h>
+#include <sys/select.h>
+#include <sys/bus.h>
+#if __FreeBSD_version >= 500005
+#include <sys/taskqueue.h>
+#endif
+
+#if __FreeBSD_version >= 500006
+#define DRM_AGP
+#endif
+
+#ifdef DRM_AGP
+#include <pci/agpvar.h>
+#endif
+
+#include "drm.h"
+
+typedef u_int32_t atomic_t;
+typedef u_int32_t cycles_t;
+typedef u_int32_t spinlock_t;
+#define atomic_set(p, v)	(*(p) = (v))
+#define atomic_read(p)		(*(p))
+#define atomic_inc(p)		atomic_add_int(p, 1)
+#define atomic_dec(p)		atomic_subtract_int(p, 1)
+#define atomic_add(n, p)	atomic_add_int(p, n)
+#define atomic_sub(n, p)	atomic_subtract_int(p, n)
+
+/* Fake this */
+static __inline u_int32_t
+test_and_set_bit(int b, volatile u_int32_t *p)
+{
+	int s = splhigh();
+	u_int32_t m = 1<<b;
+	u_int32_t r = *p & m;
+	*p |= m;
+	splx(s);
+	return r;
+}
+
+static __inline void
+clear_bit(int b, volatile u_int32_t *p)
+{
+    atomic_clear_int(p + (b >> 5), 1 << (b & 0x1f));
+}
+
+static __inline void
+set_bit(int b, volatile u_int32_t *p)
+{
+    atomic_set_int(p + (b >> 5), 1 << (b & 0x1f));
+}
+
+static __inline int
+test_bit(int b, volatile u_int32_t *p)
+{
+    return p[b >> 5] & (1 << (b & 0x1f));
+}
+
+static __inline int
+find_first_zero_bit(volatile u_int32_t *p, int max)
+{
+    int b;
+
+    for (b = 0; b < max; b += 32) {
+	if (p[b >> 5] != ~0) {
+	    for (;;) {
+		if ((p[b >> 5] & (1 << (b & 0x1f))) == 0)
+		    return b;
+		b++;
+	    }
+	}
+    }
+    return max;
+}
+
+#define spldrm()		spltty()
+
+#define memset(p, v, s)		bzero(p, s)
+
+/*
+ * Fake out the module macros for versions of FreeBSD where they don't
+ * exist.
+ */
+#if __FreeBSD_version < 500002
+
+#define MODULE_VERSION(a,b)		struct __hack
+#define MODULE_DEPEND(a,b,c,d,e)	struct __hack
+
+#endif
+
+#define DRM_DEBUG_CODE 2	  /* Include debugging code (if > 1, then
+				     also include looping detection. */
+#define DRM_DMA_HISTOGRAM 1	  /* Make histogram of DMA latency. */
+
+#define DRM_HASH_SIZE	      16 /* Size of key hash table		  */
+#define DRM_KERNEL_CONTEXT    0	 /* Change drm_resctx if changed	  */
+#define DRM_RESERVED_CONTEXTS 1	 /* Change drm_resctx if changed	  */
+#define DRM_LOOPING_LIMIT     5000000
+#define DRM_BSZ		      1024 /* Buffer size for /dev/drm? output	  */
+#define DRM_TIME_SLICE	      (hz/20) /* Time slice for GLXContexts       */
+#define DRM_LOCK_SLICE	      1	/* Time slice for lock, in jiffies	  */
+
+#define DRM_FLAG_DEBUG	  0x01
+#define DRM_FLAG_NOCTX	  0x02
+
+#define DRM_MEM_DMA	  0
+#define DRM_MEM_SAREA	  1
+#define DRM_MEM_DRIVER	  2
+#define DRM_MEM_MAGIC	  3
+#define DRM_MEM_IOCTLS	  4
+#define DRM_MEM_MAPS	  5
+#define DRM_MEM_VMAS	  6
+#define DRM_MEM_BUFS	  7
+#define DRM_MEM_SEGS	  8
+#define DRM_MEM_PAGES	  9
+#define DRM_MEM_FILES	 10
+#define DRM_MEM_QUEUES	 11
+#define DRM_MEM_CMDS	 12
+#define DRM_MEM_MAPPINGS 13
+#define DRM_MEM_BUFLISTS 14
+#define DRM_MEM_AGPLISTS  15
+#define DRM_MEM_TOTALAGP  16
+#define DRM_MEM_BOUNDAGP  17
+#define DRM_MEM_CTXBITMAP 18
+
+#define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
+
+				/* Backward compatibility section */
+#ifndef _PAGE_PWT
+				/* The name of _PAGE_WT was changed to
+				   _PAGE_PWT in Linux 2.2.6 */
+#define _PAGE_PWT _PAGE_WT
+#endif
+
+#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock)
+#define _DRM_CAS(lock,old,new,__ret)				       \
+	do {							       \
+		int __dummy;	/* Can't mark eax as clobbered */      \
+		__asm__ __volatile__(				       \
+			"lock ; cmpxchg %4,%1\n\t"		       \
+			"setnz %0"				       \
+			: "=d" (__ret),				       \
+			  "=m" (__drm_dummy_lock(lock)),	       \
+			  "=a" (__dummy)			       \
+			: "2" (old),				       \
+			  "r" (new));				       \
+	} while (0)
+
+
+
+				/* Macros to make printk easier */
+#define DRM_ERROR(fmt, arg...) \
+	printf("error: " "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg)
+#define DRM_MEM_ERROR(area, fmt, arg...) \
+	printf("error: " "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \
+	       drm_mem_stats[area].name , ##arg)
+#define DRM_INFO(fmt, arg...)  printf("info: " "[" DRM_NAME "] " fmt , ##arg)
+
+#if DRM_DEBUG_CODE
+#define DRM_DEBUG(fmt, arg...)						  \
+	do {								  \
+		if (drm_flags&DRM_FLAG_DEBUG)				  \
+			printf("[" DRM_NAME ":" __FUNCTION__ "] " fmt ,	  \
+			       ##arg);					  \
+	} while (0)
+#else
+#define DRM_DEBUG(fmt, arg...)		 do { } while (0)
+#endif
+
+#define DRM_PROC_LIMIT (PAGE_SIZE-80)
+
+#define DRM_SYSCTL_PRINT(fmt, arg...)		\
+  snprintf(buf, sizeof(buf), fmt, ##arg);	\
+  error = SYSCTL_OUT(req, buf, strlen(buf));	\
+  if (error) return error;
+
+#define DRM_SYSCTL_PRINT_RET(ret, fmt, arg...)	\
+  snprintf(buf, sizeof(buf), fmt, ##arg);	\
+  error = SYSCTL_OUT(req, buf, strlen(buf));	\
+  if (error) { ret; return error; }
+
+				/* Internal types and structures */
+#define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+#define DRM_MIN(a,b) ((a)<(b)?(a):(b))
+#define DRM_MAX(a,b) ((a)>(b)?(a):(b))
+
+#define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1))
+#define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x))
+#define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist)
+
+typedef struct drm_ioctl_desc {
+	d_ioctl_t	     *func;
+	int		     auth_needed;
+	int		     root_only;
+} drm_ioctl_desc_t;
+
+typedef struct drm_devstate {
+	pid_t		  owner;	/* X server pid holding x_lock */
+	
+} drm_devstate_t;
+
+typedef struct drm_magic_entry {
+	drm_magic_t	       magic;
+	struct drm_file	       *priv;
+	struct drm_magic_entry *next;
+} drm_magic_entry_t;
+
+typedef struct drm_magic_head {
+       struct drm_magic_entry *head;
+       struct drm_magic_entry *tail;
+} drm_magic_head_t;
+
+typedef struct drm_vma_entry {
+	struct vm_area_struct *vma;
+	struct drm_vma_entry  *next;
+	pid_t		      pid;
+} drm_vma_entry_t;
+
+typedef struct drm_buf {
+	int		  idx;	       /* Index into master buflist	     */
+	int		  total;       /* Buffer size			     */
+	int		  order;       /* log-base-2(total)		     */
+	int		  used;	       /* Amount of buffer in use (for DMA)  */
+	unsigned long	  offset;      /* Byte offset (used internally)	     */
+	void		  *address;    /* Address of buffer		     */
+	unsigned long	  bus_address; /* Bus address of buffer		     */
+	struct drm_buf	  *next;       /* Kernel-only: used for free list    */
+	__volatile__ int  waiting;     /* On kernel DMA queue		     */
+	__volatile__ int  pending;     /* On hardware DMA queue		     */
+	int		  dma_wait;    /* Processes waiting		     */
+	pid_t		  pid;	       /* PID of holding process	     */
+	int		  context;     /* Kernel queue for this buffer	     */
+	int		  while_locked;/* Dispatch this buffer while locked  */
+	enum {
+		DRM_LIST_NONE	 = 0,
+		DRM_LIST_FREE	 = 1,
+		DRM_LIST_WAIT	 = 2,
+		DRM_LIST_PEND	 = 3,
+		DRM_LIST_PRIO	 = 4,
+		DRM_LIST_RECLAIM = 5
+	}		  list;	       /* Which list we're on		     */
+
+	void *dev_private;
+	int dev_priv_size;
+
+#if DRM_DMA_HISTOGRAM
+	struct timespec	  time_queued;	   /* Queued to kernel DMA queue     */
+	struct timespec	  time_dispatched; /* Dispatched to hardware	     */
+	struct timespec	  time_completed;  /* Completed by hardware	     */
+	struct timespec	  time_freed;	   /* Back on freelist		     */
+#endif
+} drm_buf_t;
+
+#if DRM_DMA_HISTOGRAM
+#define DRM_DMA_HISTOGRAM_SLOTS		  9
+#define DRM_DMA_HISTOGRAM_INITIAL	 10
+#define DRM_DMA_HISTOGRAM_NEXT(current)	 ((current)*10)
+typedef struct drm_histogram {
+	atomic_t	  total;
+	
+	atomic_t	  queued_to_dispatched[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  dispatched_to_completed[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  completed_to_freed[DRM_DMA_HISTOGRAM_SLOTS];
+	
+	atomic_t	  queued_to_completed[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  queued_to_freed[DRM_DMA_HISTOGRAM_SLOTS];
+	
+	atomic_t	  dma[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  schedule[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  ctx[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  lacq[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  lhld[DRM_DMA_HISTOGRAM_SLOTS];
+} drm_histogram_t;
+#endif
+
+				/* bufs is one longer than it has to be */
+typedef struct drm_waitlist {
+	int		  count;	/* Number of possible buffers	   */
+	drm_buf_t	  **bufs;	/* List of pointers to buffers	   */
+	drm_buf_t	  **rp;		/* Read pointer			   */
+	drm_buf_t	  **wp;		/* Write pointer		   */
+	drm_buf_t	  **end;	/* End pointer			   */
+	spinlock_t	  read_lock;
+	spinlock_t	  write_lock;
+} drm_waitlist_t;
+
+typedef struct drm_freelist {
+	int		  initialized; /* Freelist in use		   */
+	atomic_t	  count;       /* Number of free buffers	   */
+	drm_buf_t	  *next;       /* End pointer			   */
+	
+	int		  waiting;     /* Processes waiting on free bufs   */
+	int		  low_mark;    /* Low water mark		   */
+	int		  high_mark;   /* High water mark		   */
+	atomic_t	  wfh;	       /* If waiting for high mark	   */
+} drm_freelist_t;
+
+typedef struct drm_buf_entry {
+	int		  buf_size;
+	int		  buf_count;
+	drm_buf_t	  *buflist;
+	int		  seg_count;
+	int		  page_order;
+	unsigned long	  *seglist;
+
+	drm_freelist_t	  freelist;
+} drm_buf_entry_t;
+
+typedef struct drm_hw_lock {
+	__volatile__ unsigned int lock;
+	char			  padding[60]; /* Pad to cache line */
+} drm_hw_lock_t;
+
+typedef TAILQ_HEAD(drm_file_list, drm_file) drm_file_list_t;
+typedef struct drm_file {
+	TAILQ_ENTRY(drm_file) link;
+	int		  authenticated;
+	int		  minor;
+	pid_t		  pid;
+	uid_t		  uid;
+	int		  refs;
+	drm_magic_t	  magic;
+	unsigned long	  ioctl_count;
+	struct drm_device *devXX;
+} drm_file_t;
+
+
+typedef struct drm_queue {
+	atomic_t	  use_count;	/* Outstanding uses (+1)	    */
+	atomic_t	  finalization;	/* Finalization in progress	    */
+	atomic_t	  block_count;	/* Count of processes waiting	    */
+	atomic_t	  block_read;	/* Queue blocked for reads	    */
+	int		  read_queue;	/* Processes waiting on block_read  */
+	atomic_t	  block_write;	/* Queue blocked for writes	    */
+	int		  write_queue;	/* Processes waiting on block_write */
+	atomic_t	  total_queued;	/* Total queued statistic	    */
+	atomic_t	  total_flushed;/* Total flushes statistic	    */
+	atomic_t	  total_locks;	/* Total locks statistics	    */
+	drm_ctx_flags_t	  flags;	/* Context preserving and 2D-only   */
+	drm_waitlist_t	  waitlist;	/* Pending buffers		    */
+	int		  flush_queue;	/* Processes waiting until flush    */
+} drm_queue_t;
+
+typedef struct drm_lock_data {
+	drm_hw_lock_t	  *hw_lock;	/* Hardware lock		   */
+	pid_t		  pid;		/* PID of lock holder (0=kernel)   */
+	int		  lock_queue;	/* Queue of blocked processes	   */
+	unsigned long	  lock_time;	/* Time of last lock in jiffies	   */
+} drm_lock_data_t;
+
+typedef struct drm_device_dma {
+				/* Performance Counters */
+	atomic_t	  total_prio;	/* Total DRM_DMA_PRIORITY	   */
+	atomic_t	  total_bytes;	/* Total bytes DMA'd		   */
+	atomic_t	  total_dmas;	/* Total DMA buffers dispatched	   */
+	
+	atomic_t	  total_missed_dma;  /* Missed drm_do_dma	    */
+	atomic_t	  total_missed_lock; /* Missed lock in drm_do_dma   */
+	atomic_t	  total_missed_free; /* Missed drm_free_this_buffer */
+	atomic_t	  total_missed_sched;/* Missed drm_dma_schedule	    */
+
+	atomic_t	  total_tried;	/* Tried next_buffer		    */
+	atomic_t	  total_hit;	/* Sent next_buffer		    */
+	atomic_t	  total_lost;	/* Lost interrupt		    */
+
+	drm_buf_entry_t	  bufs[DRM_MAX_ORDER+1];
+	int		  buf_count;
+	drm_buf_t	  **buflist;	/* Vector of pointers info bufs	   */
+	int		  seg_count; 
+	int		  page_count;
+	vm_offset_t	  *pagelist;
+	unsigned long	  byte_count;
+	enum {
+	   _DRM_DMA_USE_AGP = 0x01
+	} flags;
+
+				/* DMA support */
+	drm_buf_t	  *this_buffer;	/* Buffer being sent		   */
+	drm_buf_t	  *next_buffer; /* Selected buffer to send	   */
+	drm_queue_t	  *next_queue;	/* Queue from which buffer selected*/
+	int		   waiting;	/* Processes waiting on free bufs  */
+} drm_device_dma_t;
+
+#ifdef DRM_AGP
+
+typedef struct drm_agp_mem {
+	void               *handle;
+	unsigned long      bound; /* address */
+	int                pages;
+	struct drm_agp_mem *prev;
+	struct drm_agp_mem *next;
+} drm_agp_mem_t;
+
+typedef struct drm_agp_head {
+	device_t	   agpdev;
+	struct agp_info    info;
+	const char         *chipset;
+	drm_agp_mem_t      *memory;
+	unsigned long      mode;
+	int                enabled;
+	int                acquired;
+	unsigned long      base;
+   	int 		   agp_mtrr;
+} drm_agp_head_t;
+
+#endif
+
+typedef struct drm_device {
+	const char	  *name;	/* Simple driver name		   */
+	char		  *unique;	/* Unique identifier: e.g., busid  */
+	int		  unique_len;	/* Length of unique field	   */
+	device_t	  device;	/* Device instance from newbus     */
+	dev_t		  devnode;	/* Device number for mknod	   */
+	char		  *devname;	/* For /proc/interrupts		   */
+	
+	int		  blocked;	/* Blocked due to VC switch?	   */
+	int		  flags;	/* Flags to open(2)		   */
+	int		  writable;	/* Opened with FWRITE		   */
+	struct proc_dir_entry *root;	/* Root for this device's entries  */
+
+				/* Locks */
+	struct simplelock count_lock;	/* For inuse, open_count, buf_use  */
+	struct lock	  dev_lock;	/* For others			   */
+
+				/* Usage Counters */
+	int		  open_count;	/* Outstanding files open	   */
+	atomic_t	  ioctl_count;	/* Outstanding IOCTLs pending	   */
+	atomic_t	  vma_count;	/* Outstanding vma areas open	   */
+	int		  buf_use;	/* Buffers in use -- cannot alloc  */
+	atomic_t	  buf_alloc;	/* Buffer allocation in progress   */
+
+				/* Performance Counters */
+	atomic_t	  total_open;
+	atomic_t	  total_close;
+	atomic_t	  total_ioctl;
+	atomic_t	  total_irq;	/* Total interruptions		   */
+	atomic_t	  total_ctx;	/* Total context switches	   */
+	
+	atomic_t	  total_locks;
+	atomic_t	  total_unlocks;
+	atomic_t	  total_contends;
+	atomic_t	  total_sleeps;
+
+				/* Authentication */
+	drm_file_list_t   files;
+	drm_magic_head_t  magiclist[DRM_HASH_SIZE];
+
+				/* Memory management */
+	drm_map_t	  **maplist;	/* Vector of pointers to regions   */
+	int		  map_count;	/* Number of mappable regions	   */
+
+	drm_vma_entry_t	  *vmalist;	/* List of vmas (for debugging)	   */
+	drm_lock_data_t	  lock;		/* Information on hardware lock	   */
+
+				/* DMA queues (contexts) */
+	int		  queue_count;	/* Number of active DMA queues	   */
+	int		  queue_reserved; /* Number of reserved DMA queues */
+	int		  queue_slots;	/* Actual length of queuelist	   */
+	drm_queue_t	  **queuelist;	/* Vector of pointers to DMA queues */
+	drm_device_dma_t  *dma;		/* Optional pointer for DMA support */
+
+				/* Context support */
+	struct resource   *irq;		/* Interrupt used by board	   */
+	void		  *irqh;	/* Handle from bus_setup_intr      */
+	__volatile__ int  context_flag;	 /* Context swapping flag	   */
+	__volatile__ int  interrupt_flag;/* Interruption handler flag	   */
+	__volatile__ int  dma_flag;	 /* DMA dispatch flag		   */
+	struct callout	  timer;	/* Timer for delaying ctx switch   */
+	int		  context_wait; /* Processes waiting on ctx switch */
+	int		  last_checked;	/* Last context checked for DMA	   */
+	int		  last_context;	/* Last current context		   */
+	int		  last_switch;	/* Time at last context switch  */
+#if __FreeBSD_version >= 500005
+	struct task	  task;
+#endif
+	struct timespec	  ctx_start;
+	struct timespec	  lck_start;
+#if DRM_DMA_HISTOGRAM
+	drm_histogram_t	  histo;
+#endif
+	
+				/* Callback to X server for context switch
+				   and for heavy-handed reset. */
+	char		  buf[DRM_BSZ]; /* Output buffer		   */
+	char		  *buf_rp;	/* Read pointer			   */
+	char		  *buf_wp;	/* Write pointer		   */
+	char		  *buf_end;	/* End pointer			   */
+	struct sigio	  *buf_sigio;   /* Processes waiting for SIGIO	   */
+	struct selinfo    buf_sel;	/* Workspace for select/poll       */
+	int		  buf_readers;	/* Processes waiting to read	   */
+	int		  buf_writers;	/* Processes waiting to ctx switch */
+	int		  buf_selecting; /* True if poll sleeper           */
+
+				/* Sysctl support */
+	struct drm_sysctl_info *sysctl;
+
+#ifdef DRM_AGP
+	drm_agp_head_t    *agp;
+#endif
+	u_int32_t	  *ctx_bitmap;
+	void		  *dev_private;
+} drm_device_t;
+
+
+				/* Internal function definitions */
+
+				/* Misc. support (init.c) */
+extern int	     drm_flags;
+extern void	     drm_parse_options(char *s);
+
+
+				/* Device support (fops.c) */
+extern drm_file_t *drm_find_file_by_proc(drm_device_t *dev, struct proc *p);
+extern int drm_open_helper(dev_t kdev, int flags, int fmt, struct proc *p,
+			   drm_device_t *dev);
+extern d_close_t     drm_close;
+extern d_read_t	     drm_read;
+extern d_write_t     drm_write;
+extern d_poll_t	     drm_poll;
+extern int	     drm_fsetown(dev_t kdev, u_long cmd, caddr_t data,
+				 int flags, struct proc *p);
+extern int	     drm_fgetown(dev_t kdev, u_long cmd, caddr_t data,
+				 int flags, struct proc *p);
+extern int	     drm_write_string(drm_device_t *dev, const char *s);
+
+#if 0
+				/* Mapping support (vm.c) */
+extern unsigned long drm_vm_nopage(struct vm_area_struct *vma,
+				   unsigned long address,
+				   int write_access);
+extern unsigned long drm_vm_shm_nopage(struct vm_area_struct *vma,
+				       unsigned long address,
+				       int write_access);
+extern unsigned long drm_vm_dma_nopage(struct vm_area_struct *vma,
+				       unsigned long address,
+				       int write_access);
+extern void	     drm_vm_open(struct vm_area_struct *vma);
+extern void	     drm_vm_close(struct vm_area_struct *vma);
+extern int	     drm_mmap_dma(struct file *filp,
+				  struct vm_area_struct *vma);
+#endif
+extern d_mmap_t	     drm_mmap;
+
+				/* Proc support (proc.c) */
+extern int	     drm_sysctl_init(drm_device_t *dev);
+extern int	     drm_sysctl_cleanup(drm_device_t *dev);
+
+				/* Memory management support (memory.c) */
+extern void	     drm_mem_init(void);
+extern int	     drm_mem_info SYSCTL_HANDLER_ARGS;
+extern void	     *drm_alloc(size_t size, int area);
+extern void	     *drm_realloc(void *oldpt, size_t oldsize, size_t size,
+				  int area);
+extern char	     *drm_strdup(const char *s, int area);
+extern void	     drm_strfree(char *s, int area);
+extern void	     drm_free(void *pt, size_t size, int area);
+extern unsigned long drm_alloc_pages(int order, int area);
+extern void	     drm_free_pages(unsigned long address, int order,
+				    int area);
+extern void	     *drm_ioremap(unsigned long offset, unsigned long size);
+extern void	     drm_ioremapfree(void *pt, unsigned long size);
+
+#ifdef DRM_AGP
+extern void	    *drm_alloc_agp(int pages, u_int32_t type);
+extern int           drm_free_agp(void *handle, int pages);
+extern int           drm_bind_agp(void *handle, unsigned int start);
+extern int           drm_unbind_agp(void *handle);
+#endif
+
+				/* Buffer management support (bufs.c) */
+extern int	     drm_order(unsigned long size);
+extern d_ioctl_t     drm_addmap;
+extern d_ioctl_t     drm_addbufs;
+extern d_ioctl_t     drm_infobufs;
+extern d_ioctl_t     drm_markbufs;
+extern d_ioctl_t     drm_freebufs;
+extern d_ioctl_t     drm_mapbufs;
+
+
+				/* Buffer list management support (lists.c) */
+extern int	     drm_waitlist_create(drm_waitlist_t *bl, int count);
+extern int	     drm_waitlist_destroy(drm_waitlist_t *bl);
+extern int	     drm_waitlist_put(drm_waitlist_t *bl, drm_buf_t *buf);
+extern drm_buf_t     *drm_waitlist_get(drm_waitlist_t *bl);
+
+extern int	     drm_freelist_create(drm_freelist_t *bl, int count);
+extern int	     drm_freelist_destroy(drm_freelist_t *bl);
+extern int	     drm_freelist_put(drm_device_t *dev, drm_freelist_t *bl,
+				      drm_buf_t *buf);
+extern drm_buf_t     *drm_freelist_get(drm_freelist_t *bl, int block);
+
+				/* DMA support (gen_dma.c) */
+extern void	     drm_dma_setup(drm_device_t *dev);
+extern void	     drm_dma_takedown(drm_device_t *dev);
+extern void	     drm_free_buffer(drm_device_t *dev, drm_buf_t *buf);
+extern void	     drm_reclaim_buffers(drm_device_t *dev, pid_t pid);
+extern int	     drm_context_switch(drm_device_t *dev, int old, int new);
+extern int	     drm_context_switch_complete(drm_device_t *dev, int new);
+extern void	     drm_wakeup(drm_device_t *dev, drm_buf_t *buf);
+extern void	     drm_clear_next_buffer(drm_device_t *dev);
+extern int	     drm_select_queue(drm_device_t *dev,
+				      void (*wrapper)(void *));
+extern int	     drm_dma_enqueue(drm_device_t *dev, drm_dma_t *dma);
+extern int	     drm_dma_get_buffers(drm_device_t *dev, drm_dma_t *dma);
+#if DRM_DMA_HISTOGRAM
+extern int	     drm_histogram_slot(struct timespec *ts);
+extern void	     drm_histogram_compute(drm_device_t *dev, drm_buf_t *buf);
+#endif
+
+
+				/* Misc. IOCTL support (ioctl.c) */
+extern d_ioctl_t     drm_irq_busid;
+extern d_ioctl_t     drm_getunique;
+extern d_ioctl_t     drm_setunique;
+
+
+				/* Context IOCTL support (context.c) */
+extern d_ioctl_t     drm_resctx;
+extern d_ioctl_t     drm_addctx;
+extern d_ioctl_t     drm_modctx;
+extern d_ioctl_t     drm_getctx;
+extern d_ioctl_t     drm_switchctx;
+extern d_ioctl_t     drm_newctx;
+extern d_ioctl_t     drm_rmctx;
+
+
+				/* Drawable IOCTL support (drawable.c) */
+extern d_ioctl_t     drm_adddraw;
+extern d_ioctl_t     drm_rmdraw;
+
+
+				/* Authentication IOCTL support (auth.c) */
+extern int	     drm_add_magic(drm_device_t *dev, drm_file_t *priv,
+				   drm_magic_t magic);
+extern int	     drm_remove_magic(drm_device_t *dev, drm_magic_t magic);
+extern d_ioctl_t     drm_getmagic;
+extern d_ioctl_t     drm_authmagic;
+
+
+				/* Locking IOCTL support (lock.c) */
+extern d_ioctl_t     drm_block;
+extern d_ioctl_t     drm_unblock;
+extern int	     drm_lock_take(__volatile__ unsigned int *lock,
+				   unsigned int context);
+extern int	     drm_lock_transfer(drm_device_t *dev,
+				       __volatile__ unsigned int *lock,
+				       unsigned int context);
+extern int	     drm_lock_free(drm_device_t *dev,
+				   __volatile__ unsigned int *lock,
+				   unsigned int context);
+extern d_ioctl_t     drm_finish;
+extern int	     drm_flush_unblock(drm_device_t *dev, int context,
+				       drm_lock_flags_t flags);
+extern int	     drm_flush_block_and_flush(drm_device_t *dev, int context,
+					       drm_lock_flags_t flags);
+
+				/* Context Bitmap support (ctxbitmap.c) */
+extern int	     drm_ctxbitmap_init(drm_device_t *dev);
+extern void	     drm_ctxbitmap_cleanup(drm_device_t *dev);
+extern int	     drm_ctxbitmap_next(drm_device_t *dev);
+extern void	     drm_ctxbitmap_free(drm_device_t *dev, int ctx_handle);
+
+#ifdef DRM_AGP
+				/* AGP/GART support (agpsupport.c) */
+extern drm_agp_head_t *drm_agp_init(void);
+extern d_ioctl_t     drm_agp_acquire;
+extern d_ioctl_t     drm_agp_release;
+extern d_ioctl_t     drm_agp_enable;
+extern d_ioctl_t     drm_agp_info;
+extern d_ioctl_t     drm_agp_alloc;
+extern d_ioctl_t     drm_agp_free;
+extern d_ioctl_t     drm_agp_unbind;
+extern d_ioctl_t     drm_agp_bind;
+#endif
+#endif
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/i810_drm.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/i810_drm.h:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/i810_drm.h	Fri Jun 16 17:03:28 2000
@@ -0,0 +1,188 @@
+#ifndef _I810_DRM_H_
+#define _I810_DRM_H_
+
+/* WARNING: These defines must be the same as what the Xserver uses.
+ * if you change them, you must change the defines in the Xserver.
+ */
+
+#ifndef _I810_DEFINES_
+#define _I810_DEFINES_
+
+#define I810_DMA_BUF_ORDER		12
+#define I810_DMA_BUF_SZ 		(1<<I810_DMA_BUF_ORDER)
+#define I810_DMA_BUF_NR 		256
+#define I810_NR_SAREA_CLIPRECTS 	8
+
+/* Each region is a minimum of 64k, and there are at most 64 of them.
+ */
+#define I810_NR_TEX_REGIONS 64
+#define I810_LOG_MIN_TEX_REGION_SIZE 16
+#endif
+
+#define I810_UPLOAD_TEX0IMAGE  0x1 /* handled clientside */
+#define I810_UPLOAD_TEX1IMAGE  0x2 /* handled clientside */
+#define I810_UPLOAD_CTX        0x4
+#define I810_UPLOAD_BUFFERS    0x8
+#define I810_UPLOAD_TEX0       0x10
+#define I810_UPLOAD_TEX1       0x20
+#define I810_UPLOAD_CLIPRECTS  0x40
+
+
+/* Indices into buf.Setup where various bits of state are mirrored per
+ * context and per buffer.  These can be fired at the card as a unit,
+ * or in a piecewise fashion as required.
+ */
+
+/* Destbuffer state 
+ *    - backbuffer linear offset and pitch -- invarient in the current dri
+ *    - zbuffer linear offset and pitch -- also invarient
+ *    - drawing origin in back and depth buffers.
+ *
+ * Keep the depth/back buffer state here to acommodate private buffers
+ * in the future.
+ */
+#define I810_DESTREG_DI0  0	/* CMD_OP_DESTBUFFER_INFO (2 dwords) */
+#define I810_DESTREG_DI1  1
+#define I810_DESTREG_DV0  2	/* GFX_OP_DESTBUFFER_VARS (2 dwords) */
+#define I810_DESTREG_DV1  3
+#define I810_DESTREG_DR0  4	/* GFX_OP_DRAWRECT_INFO (4 dwords) */
+#define I810_DESTREG_DR1  5
+#define I810_DESTREG_DR2  6
+#define I810_DESTREG_DR3  7
+#define I810_DESTREG_DR4  8
+#define I810_DEST_SETUP_SIZE 10
+
+/* Context state
+ */
+#define I810_CTXREG_CF0   0	/* GFX_OP_COLOR_FACTOR */
+#define I810_CTXREG_CF1   1	
+#define I810_CTXREG_ST0   2     /* GFX_OP_STIPPLE */
+#define I810_CTXREG_ST1   3
+#define I810_CTXREG_VF    4	/* GFX_OP_VERTEX_FMT */
+#define I810_CTXREG_MT    5	/* GFX_OP_MAP_TEXELS */
+#define I810_CTXREG_MC0   6	/* GFX_OP_MAP_COLOR_STAGES - stage 0 */
+#define I810_CTXREG_MC1   7     /* GFX_OP_MAP_COLOR_STAGES - stage 1 */
+#define I810_CTXREG_MC2   8	/* GFX_OP_MAP_COLOR_STAGES - stage 2 */
+#define I810_CTXREG_MA0   9	/* GFX_OP_MAP_ALPHA_STAGES - stage 0 */
+#define I810_CTXREG_MA1   10	/* GFX_OP_MAP_ALPHA_STAGES - stage 1 */
+#define I810_CTXREG_MA2   11	/* GFX_OP_MAP_ALPHA_STAGES - stage 2 */
+#define I810_CTXREG_SDM   12	/* GFX_OP_SRC_DEST_MONO */
+#define I810_CTXREG_FOG   13	/* GFX_OP_FOG_COLOR */
+#define I810_CTXREG_B1    14	/* GFX_OP_BOOL_1 */
+#define I810_CTXREG_B2    15	/* GFX_OP_BOOL_2 */
+#define I810_CTXREG_LCS   16	/* GFX_OP_LINEWIDTH_CULL_SHADE_MODE */
+#define I810_CTXREG_PV    17	/* GFX_OP_PV_RULE -- Invarient! */
+#define I810_CTXREG_ZA    18	/* GFX_OP_ZBIAS_ALPHAFUNC */
+#define I810_CTXREG_AA    19	/* GFX_OP_ANTIALIAS */
+#define I810_CTX_SETUP_SIZE 20 
+
+/* Texture state (per tex unit)
+ */
+#define I810_TEXREG_MI0  0	/* GFX_OP_MAP_INFO (4 dwords) */
+#define I810_TEXREG_MI1  1	
+#define I810_TEXREG_MI2  2	
+#define I810_TEXREG_MI3  3	
+#define I810_TEXREG_MF   4	/* GFX_OP_MAP_FILTER */
+#define I810_TEXREG_MLC  5	/* GFX_OP_MAP_LOD_CTL */
+#define I810_TEXREG_MLL  6	/* GFX_OP_MAP_LOD_LIMITS */
+#define I810_TEXREG_MCS  7	/* GFX_OP_MAP_COORD_SETS ??? */
+#define I810_TEX_SETUP_SIZE 8
+
+#define I810_FRONT   0x1
+#define I810_BACK    0x2
+#define I810_DEPTH   0x4
+
+
+typedef struct _drm_i810_init {
+	enum {
+		I810_INIT_DMA = 0x01,
+		I810_CLEANUP_DMA = 0x02
+	} func;
+	int ring_map_idx;
+	int buffer_map_idx;
+	int sarea_priv_offset;
+	unsigned int ring_start;
+	unsigned int ring_end;
+	unsigned int ring_size;
+	unsigned int front_offset;
+	unsigned int back_offset;
+	unsigned int depth_offset;
+	unsigned int w;
+	unsigned int h;
+	unsigned int pitch;
+	unsigned int pitch_bits; 
+} drm_i810_init_t;
+
+/* Warning: If you change the SAREA structure you must change the Xserver
+ * structure as well */
+
+typedef struct _drm_i810_tex_region {
+	unsigned char next, prev; /* indices to form a circular LRU  */
+	unsigned char in_use;	/* owned by a client, or free? */
+	int age;		/* tracked by clients to update local LRU's */
+} drm_i810_tex_region_t;
+
+typedef struct _drm_i810_sarea {
+   	unsigned int ContextState[I810_CTX_SETUP_SIZE];
+   	unsigned int BufferState[I810_DEST_SETUP_SIZE];
+   	unsigned int TexState[2][I810_TEX_SETUP_SIZE];
+   	unsigned int dirty;
+
+	unsigned int nbox;
+	drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS];
+
+	/* Maintain an LRU of contiguous regions of texture space.  If
+	 * you think you own a region of texture memory, and it has an
+	 * age different to the one you set, then you are mistaken and
+	 * it has been stolen by another client.  If global texAge
+	 * hasn't changed, there is no need to walk the list.
+	 *
+	 * These regions can be used as a proxy for the fine-grained
+	 * texture information of other clients - by maintaining them
+	 * in the same lru which is used to age their own textures,
+	 * clients have an approximate lru for the whole of global
+	 * texture space, and can make informed decisions as to which
+	 * areas to kick out.  There is no need to choose whether to
+	 * kick out your own texture or someone else's - simply eject
+	 * them all in LRU order.  
+	 */
+   
+	drm_i810_tex_region_t texList[I810_NR_TEX_REGIONS+1]; 
+				/* Last elt is sentinal */
+        int texAge;		/* last time texture was uploaded */
+        int last_enqueue;	/* last time a buffer was enqueued */
+	int last_dispatch;	/* age of the most recently dispatched buffer */
+	int last_quiescent;     /*  */
+	int ctxOwner;		/* last context to upload state */
+
+	int vertex_prim;
+
+} drm_i810_sarea_t;
+
+typedef struct _drm_i810_clear {
+	int clear_color;
+	int clear_depth;
+	int flags;
+} drm_i810_clear_t;
+
+
+
+/* These may be placeholders if we have more cliprects than
+ * I810_NR_SAREA_CLIPRECTS.  In that case, the client sets discard to
+ * false, indicating that the buffer will be dispatched again with a
+ * new set of cliprects.
+ */
+typedef struct _drm_i810_vertex {
+   	int idx;		/* buffer index */
+	int used;		/* nr bytes in use */
+	int discard;		/* client is finished with the buffer? */
+} drm_i810_vertex_t;
+
+typedef struct drm_i810_dma {
+	void *virtual;
+	int request_idx;
+	int request_size;
+	int granted;
+} drm_i810_dma_t;
+
+#endif /* _I810_DRM_H_ */
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drm.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drm.h:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drm.h	Fri Jun 16 17:03:28 2000
@@ -0,0 +1,269 @@
+/* mga_drm.h -- Public header for the Matrox g200/g400 driver
+ * Created: Tue Jan 25 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Jeff Hartmann <jhartmann@valinux.com>
+ *          Keith Whitwell <keithw@valinux.com>
+ *
+ */
+
+#ifndef _MGA_DRM_H_
+#define _MGA_DRM_H_
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmMga.h)
+ */
+#ifndef _MGA_DEFINES_
+#define _MGA_DEFINES_
+
+#define MGA_F  0x1		/* fog */
+#define MGA_A  0x2		/* alpha */
+#define MGA_S  0x4		/* specular */
+#define MGA_T2 0x8		/* multitexture */
+
+#define MGA_WARP_TGZ            0
+#define MGA_WARP_TGZF           (MGA_F)
+#define MGA_WARP_TGZA           (MGA_A)
+#define MGA_WARP_TGZAF          (MGA_F|MGA_A)
+#define MGA_WARP_TGZS           (MGA_S)
+#define MGA_WARP_TGZSF          (MGA_S|MGA_F)
+#define MGA_WARP_TGZSA          (MGA_S|MGA_A)
+#define MGA_WARP_TGZSAF         (MGA_S|MGA_F|MGA_A)
+#define MGA_WARP_T2GZ           (MGA_T2)
+#define MGA_WARP_T2GZF          (MGA_T2|MGA_F)
+#define MGA_WARP_T2GZA          (MGA_T2|MGA_A)
+#define MGA_WARP_T2GZAF         (MGA_T2|MGA_A|MGA_F)
+#define MGA_WARP_T2GZS          (MGA_T2|MGA_S)
+#define MGA_WARP_T2GZSF         (MGA_T2|MGA_S|MGA_F)
+#define MGA_WARP_T2GZSA         (MGA_T2|MGA_S|MGA_A)
+#define MGA_WARP_T2GZSAF        (MGA_T2|MGA_S|MGA_F|MGA_A)
+
+#define MGA_MAX_G400_PIPES 16
+#define MGA_MAX_G200_PIPES  8	/* no multitex */
+#define MGA_MAX_WARP_PIPES MGA_MAX_G400_PIPES
+
+#define MGA_CARD_TYPE_G200 1
+#define MGA_CARD_TYPE_G400 2
+
+#define MGA_FRONT   0x1
+#define MGA_BACK    0x2
+#define MGA_DEPTH   0x4
+
+/* 3d state excluding texture units:
+ */
+#define MGA_CTXREG_DSTORG   0	/* validated */
+#define MGA_CTXREG_MACCESS  1	
+#define MGA_CTXREG_PLNWT    2	
+#define MGA_CTXREG_DWGCTL    3	
+#define MGA_CTXREG_ALPHACTRL 4
+#define MGA_CTXREG_FOGCOLOR  5
+#define MGA_CTXREG_WFLAG     6
+#define MGA_CTXREG_TDUAL0    7
+#define MGA_CTXREG_TDUAL1    8
+#define MGA_CTXREG_FCOL      9
+#define MGA_CTX_SETUP_SIZE   10
+
+/* 2d state
+ */
+#define MGA_2DREG_PITCH 	0
+#define MGA_2D_SETUP_SIZE 	1
+
+/* Each texture unit has a state:
+ */
+#define MGA_TEXREG_CTL        0
+#define MGA_TEXREG_CTL2       1
+#define MGA_TEXREG_FILTER     2
+#define MGA_TEXREG_BORDERCOL  3
+#define MGA_TEXREG_ORG        4 /* validated */
+#define MGA_TEXREG_ORG1       5
+#define MGA_TEXREG_ORG2       6
+#define MGA_TEXREG_ORG3       7
+#define MGA_TEXREG_ORG4       8
+#define MGA_TEXREG_WIDTH      9
+#define MGA_TEXREG_HEIGHT     10
+#define MGA_TEX_SETUP_SIZE    11
+
+/* What needs to be changed for the current vertex dma buffer?
+ */
+#define MGA_UPLOAD_CTX        0x1
+#define MGA_UPLOAD_TEX0       0x2
+#define MGA_UPLOAD_TEX1       0x4
+#define MGA_UPLOAD_PIPE       0x8
+#define MGA_UPLOAD_TEX0IMAGE  0x10 /* handled client-side */
+#define MGA_UPLOAD_TEX1IMAGE  0x20 /* handled client-side */
+#define MGA_UPLOAD_2D 	      0x40
+#define MGA_WAIT_AGE          0x80 /* handled client-side */
+#define MGA_UPLOAD_CLIPRECTS  0x100 /* handled client-side */
+#define MGA_DMA_FLUSH	      0x200 /* set when someone gets the lock
+                                       quiescent */
+
+/* 32 buffers of 64k each, total 2 meg.
+ */
+#define MGA_DMA_BUF_ORDER     16
+#define MGA_DMA_BUF_SZ        (1<<MGA_DMA_BUF_ORDER)
+#define MGA_DMA_BUF_NR        31
+
+/* Keep these small for testing.
+ */
+#define MGA_NR_SAREA_CLIPRECTS 8
+
+/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+ * regions, subject to a minimum region size of (1<<16) == 64k. 
+ *
+ * Clients may subdivide regions internally, but when sharing between
+ * clients, the region size is the minimum granularity. 
+ */
+
+#define MGA_CARD_HEAP 0
+#define MGA_AGP_HEAP  1
+#define MGA_NR_TEX_HEAPS 2
+#define MGA_NR_TEX_REGIONS 16
+#define MGA_LOG_MIN_TEX_REGION_SIZE 16
+#endif
+
+typedef struct _drm_mga_warp_index {
+   	int installed;
+   	unsigned long phys_addr;
+   	int size;
+} drm_mga_warp_index_t;
+
+typedef struct drm_mga_init {
+   	enum { 
+	   	MGA_INIT_DMA = 0x01,
+	       	MGA_CLEANUP_DMA = 0x02
+	} func;
+   	int reserved_map_agpstart;
+   	int reserved_map_idx;
+   	int buffer_map_idx;
+   	int sarea_priv_offset;
+   	int primary_size;
+   	int warp_ucode_size;
+   	unsigned int frontOffset;
+   	unsigned int backOffset;
+   	unsigned int depthOffset;
+   	unsigned int textureOffset;
+   	unsigned int textureSize;
+        unsigned int agpTextureOffset;
+        unsigned int agpTextureSize;
+   	unsigned int cpp;
+   	unsigned int stride;
+   	int sgram;
+	int chipset;
+   	drm_mga_warp_index_t WarpIndex[MGA_MAX_WARP_PIPES];
+	unsigned int mAccess;
+} drm_mga_init_t;
+
+/* Warning: if you change the sarea structure, you must change the Xserver
+ * structures as well */
+
+typedef struct _drm_mga_tex_region {
+	unsigned char next, prev;	
+	unsigned char in_use;	
+	unsigned int age;			
+} drm_mga_tex_region_t;
+
+typedef struct _drm_mga_sarea {
+	/* The channel for communication of state information to the kernel
+	 * on firing a vertex dma buffer.
+	 */
+   	unsigned int ContextState[MGA_CTX_SETUP_SIZE];
+   	unsigned int ServerState[MGA_2D_SETUP_SIZE];
+   	unsigned int TexState[2][MGA_TEX_SETUP_SIZE];
+   	unsigned int WarpPipe;
+   	unsigned int dirty;
+
+   	unsigned int nbox;
+   	drm_clip_rect_t boxes[MGA_NR_SAREA_CLIPRECTS];
+
+
+	/* Information about the most recently used 3d drawable.  The
+	 * client fills in the req_* fields, the server fills in the 
+	 * exported_ fields and puts the cliprects into boxes, above.
+	 *
+	 * The client clears the exported_drawable field before
+	 * clobbering the boxes data.
+	 */
+        unsigned int req_drawable;	 /* the X drawable id */
+	unsigned int req_draw_buffer;	 /* MGA_FRONT or MGA_BACK */
+
+        unsigned int exported_drawable;	 
+	unsigned int exported_index; 
+        unsigned int exported_stamp;	
+        unsigned int exported_buffers;	 
+        unsigned int exported_nfront;
+        unsigned int exported_nback;
+	int exported_back_x, exported_front_x, exported_w;	
+	int exported_back_y, exported_front_y, exported_h;
+   	drm_clip_rect_t exported_boxes[MGA_NR_SAREA_CLIPRECTS];
+   
+	/* Counters for aging textures and for client-side throttling.
+	 */
+        unsigned int last_enqueue;	/* last time a buffer was enqueued */
+	unsigned int last_dispatch;	/* age of the most recently dispatched buffer */
+	unsigned int last_quiescent;     /*  */
+
+
+	/* LRU lists for texture memory in agp space and on the card
+	 */
+	drm_mga_tex_region_t texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS+1];
+	unsigned int texAge[MGA_NR_TEX_HEAPS];
+	
+	/* Mechanism to validate card state.
+	 */
+   	int ctxOwner;
+} drm_mga_sarea_t;	
+
+/* Device specific ioctls:
+ */
+typedef struct _drm_mga_clear {
+	unsigned int clear_color;
+	unsigned int clear_depth;
+	unsigned int flags;
+} drm_mga_clear_t;
+
+typedef struct _drm_mga_swap {
+   	int dummy;
+} drm_mga_swap_t;
+
+typedef struct _drm_mga_iload {
+	int idx;
+	int length;
+	unsigned int destOrg;
+} drm_mga_iload_t;
+
+typedef struct _drm_mga_vertex {
+   	int idx;		/* buffer to queue */
+	int used;		/* bytes in use */
+	int discard;		/* client finished with buffer?  */
+} drm_mga_vertex_t;
+
+typedef struct _drm_mga_indices {
+   	int idx;		/* buffer to queue */
+	unsigned int start;		
+	unsigned int end;		
+	int discard;		/* client finished with buffer?  */
+} drm_mga_indices_t;
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drm.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drm.h:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drm.h	Fri Jun 16 17:03:29 2000
@@ -0,0 +1,111 @@
+/* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
+ * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drm.h,v 1.1 2000/06/17 00:03:29 martin Exp $
+ */
+
+#ifndef _R128_DRM_H_
+#define _R128_DRM_H_
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmR128.h)
+ */
+typedef struct drm_r128_init {
+	enum { 
+		R128_INIT_CCE    = 0x01,
+		R128_CLEANUP_CCE = 0x02
+	} func;
+	int sarea_priv_offset;
+	int is_pci;
+	int cce_mode;
+	int cce_fifo_size;
+	int cce_secure;
+	int ring_size;
+	int usec_timeout;
+
+	int fb_offset;
+	int agp_ring_offset;
+	int agp_read_ptr_offset;
+	int agp_vertbufs_offset;
+	int agp_indbufs_offset;
+	int agp_textures_offset;
+	int mmio_offset;
+} drm_r128_init_t;
+
+typedef struct drm_r128_packet {
+	unsigned long *buffer;
+	int            count;
+	int            flags;
+} drm_r128_packet_t;
+
+typedef enum drm_r128_prim {
+	_DRM_R128_PRIM_NONE		= 0x0001,
+	_DRM_R128_PRIM_POINT		= 0x0002,
+	_DRM_R128_PRIM_LINE		= 0x0004,
+	_DRM_R128_PRIM_POLY_LINE	= 0x0008,
+	_DRM_R128_PRIM_TRI_LIST		= 0x0010,
+	_DRM_R128_PRIM_TRI_FAN		= 0x0020,
+	_DRM_R128_PRIM_TRI_STRIP	= 0x0040,
+	_DRM_R128_PRIM_TRI_TYPE2	= 0x0080
+} drm_r128_prim_t;
+
+typedef struct drm_r128_vertex {
+				/* Indices here refer to the offset into
+				   buflist in drm_buf_get_t.  */
+	int		send_count;	  /* Number of buffers to send	    */
+	int		*send_indices;	  /* List of handles to buffers	    */
+	int		*send_sizes;	  /* Lengths of data to send	    */
+	drm_r128_prim_t	prim;		  /* Primitive type		    */
+	int		request_count;	  /* Number of buffers requested    */
+	int		*request_indices; /* Buffer information		    */
+	int		*request_sizes;
+	int		granted_count;	  /* Number of buffers granted	    */
+} drm_r128_vertex_t;
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (r128_sarea.h)
+ */
+#define R128_LOCAL_TEX_HEAP       0
+#define R128_AGP_TEX_HEAP         1
+#define R128_NR_TEX_HEAPS         2
+#define R128_NR_TEX_REGIONS      64
+#define R128_LOG_TEX_GRANULARITY 16
+
+typedef struct drm_tex_region {
+	unsigned char next, prev;       
+	unsigned char in_use;   
+	int age;                        
+} drm_tex_region_t;
+
+typedef struct drm_r128_sarea {
+	drm_tex_region_t tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1];
+	int              tex_age[R128_NR_TEX_HEAPS];
+	int              ctx_owner;
+	int              ring_write;
+} drm_r128_sarea_t;
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile	Fri Jun 16 17:03:29 2000
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+KMOD	= drm
+SRCS	= init.c memory.c auth.c context.c drawable.c bufs.c \
+	  lists.c lock.c ioctl.c fops.c vm.c dma.c sysctl.c  \
+	  agpsupport.c ctxbitmap.c
+SRCS   += device_if.h bus_if.h pci_if.h
+CFLAGS += ${DEBUG_FLAGS} -I..
+
+@:
+	ln -sf /sys @
+
+machine:
+	ln -sf /sys/i386/include machine
+
+.include <bsd.kmod.mk>
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/agpsupport.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/agpsupport.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/agpsupport.c	Fri Jun 16 17:03:29 2000
@@ -0,0 +1,270 @@
+/* agpsupport.c -- DRM support for AGP/GART backend
+ * Created: Mon Dec 13 09:56:45 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#ifdef DRM_AGP
+
+#include <pci/agpvar.h>
+
+MODULE_DEPEND(drm, agp, 1, 1, 1);
+
+int
+drm_agp_info(dev_t kdev, u_long cmd, caddr_t data,
+	     int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	struct agp_info *kern;
+	drm_agp_info_t   info;
+
+	if (!dev->agp->acquired) return EINVAL;
+
+	kern                   = &dev->agp->info;
+	agp_get_info(dev->agp->agpdev, kern);
+	info.agp_version_major = 1;
+	info.agp_version_minor = 0;
+	info.mode              = kern->ai_mode;
+	info.aperture_base     = kern->ai_aperture_base;
+	info.aperture_size     = kern->ai_aperture_size;
+	info.memory_allowed    = kern->ai_memory_allowed;
+	info.memory_used       = kern->ai_memory_used;
+	info.id_vendor         = kern->ai_devid & 0xffff;
+	info.id_device         = kern->ai_devid >> 16;
+
+	*(drm_agp_info_t *) data = info;
+	return 0;
+}
+
+int
+drm_agp_acquire(dev_t kdev, u_long cmd, caddr_t data,
+		int flags, struct proc *p)
+{
+	drm_device_t *dev = kdev->si_drv1;
+	int          retcode;
+
+	if (dev->agp->acquired) return EINVAL;
+	retcode = agp_acquire(dev->agp->agpdev);
+	if (retcode) return retcode;
+	dev->agp->acquired = 1;
+	return 0;
+}
+
+int
+drm_agp_release(dev_t kdev, u_long cmd, caddr_t data,
+		int flags, struct proc *p)
+{
+	drm_device_t *dev = kdev->si_drv1;
+
+	if (!dev->agp->acquired) return EINVAL;
+	agp_release(dev->agp->agpdev);
+	dev->agp->acquired = 0;
+	return 0;
+	
+}
+
+int
+drm_agp_enable(dev_t kdev, u_long cmd, caddr_t data,
+	       int flags, struct proc *p)
+{
+	drm_device_t   *dev = kdev->si_drv1;
+	drm_agp_mode_t mode;
+
+	if (!dev->agp->acquired) return EINVAL;
+
+	mode = *(drm_agp_mode_t *) data;
+	
+	dev->agp->mode    = mode.mode;
+	agp_enable(dev->agp->agpdev, mode.mode);
+	dev->agp->base    = dev->agp->info.ai_aperture_base;
+	dev->agp->enabled = 1;
+	return 0;
+}
+
+int drm_agp_alloc(dev_t kdev, u_long cmd, caddr_t data,
+		  int flags, struct proc *p)
+{
+	drm_device_t     *dev = kdev->si_drv1;
+	drm_agp_buffer_t request;
+	drm_agp_mem_t    *entry;
+	void	         *handle;
+	unsigned long    pages;
+	u_int32_t	 type;
+	struct agp_memory_info info;
+
+	if (!dev->agp->acquired) return EINVAL;
+
+	request = *(drm_agp_buffer_t *) data;
+
+	if (!(entry = drm_alloc(sizeof(*entry), DRM_MEM_AGPLISTS)))
+		return ENOMEM;
+   
+   	memset(entry, 0, sizeof(*entry));
+
+	pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;
+	type = (u_int32_t) request.type;
+
+	if (!(handle = drm_alloc_agp(pages, type))) {
+		drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+		return ENOMEM;
+	}
+	
+	entry->handle    = handle;
+	entry->bound     = 0;
+	entry->pages     = pages;
+	entry->prev      = NULL;
+	entry->next      = dev->agp->memory;
+	if (dev->agp->memory) dev->agp->memory->prev = entry;
+	dev->agp->memory = entry;
+
+	agp_memory_info(dev->agp->agpdev, entry->handle, &info);
+
+	request.handle   = (unsigned long) entry->handle;
+        request.physical = info.ami_physical;
+
+	*(drm_agp_buffer_t *) data = request;
+
+	return 0;
+}
+
+static drm_agp_mem_t *
+drm_agp_lookup_entry(drm_device_t *dev, void *handle)
+{
+	drm_agp_mem_t *entry;
+
+	for (entry = dev->agp->memory; entry; entry = entry->next) {
+		if (entry->handle == handle) return entry;
+	}
+	return NULL;
+}
+
+int
+drm_agp_unbind(dev_t kdev, u_long cmd, caddr_t data,
+	       int flags, struct proc *p)
+{
+	drm_device_t      *dev = kdev->si_drv1;
+	drm_agp_binding_t request;
+	drm_agp_mem_t     *entry;
+
+	if (!dev->agp->acquired) return EINVAL;
+	request = *(drm_agp_binding_t *) data;
+	if (!(entry = drm_agp_lookup_entry(dev, (void *) request.handle)))
+		return EINVAL;
+	if (!entry->bound) return EINVAL;
+	return drm_unbind_agp(entry->handle);
+}
+
+int drm_agp_bind(dev_t kdev, u_long cmd, caddr_t data,
+		 int flags, struct proc *p)
+{
+	drm_device_t      *dev = kdev->si_drv1;
+	drm_agp_binding_t request;
+	drm_agp_mem_t     *entry;
+	int               retcode;
+	int               page;
+	
+	if (!dev->agp->acquired) return EINVAL;
+	request = *(drm_agp_binding_t *) data;
+	if (!(entry = drm_agp_lookup_entry(dev, (void *) request.handle)))
+		return EINVAL;
+	if (entry->bound) return EINVAL;
+	page = (request.offset + PAGE_SIZE - 1) / PAGE_SIZE;
+	if ((retcode = drm_bind_agp(entry->handle, page))) return retcode;
+	entry->bound = dev->agp->base + (page << PAGE_SHIFT);
+	return 0;
+}
+
+int drm_agp_free(dev_t kdev, u_long cmd, caddr_t data,
+		 int flags, struct proc *p)
+{
+	drm_device_t     *dev = kdev->si_drv1;
+	drm_agp_buffer_t request;
+	drm_agp_mem_t    *entry;
+	
+	if (!dev->agp->acquired) return EINVAL;
+	request = *(drm_agp_buffer_t *) data;
+	if (!(entry = drm_agp_lookup_entry(dev, (void*) request.handle)))
+		return EINVAL;
+	if (entry->bound) drm_unbind_agp(entry->handle);
+   
+	if (entry->prev) entry->prev->next = entry->next;
+	else             dev->agp->memory  = entry->next;
+	if (entry->next) entry->next->prev = entry->prev;
+	drm_free_agp(entry->handle, entry->pages);
+	drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+	return 0;
+}
+
+drm_agp_head_t *drm_agp_init(void)
+{
+	device_t agpdev;
+	drm_agp_head_t *head   = NULL;
+	int      agp_available = 1;
+   
+	agpdev = agp_find_device();
+	if (!agpdev)
+		agp_available = 0;
+
+	DRM_DEBUG("agp_available = %d\n", agp_available);
+
+	if (agp_available) {
+		if (!(head = drm_alloc(sizeof(*head), DRM_MEM_AGPLISTS)))
+			return NULL;
+		memset((void *)head, 0, sizeof(*head));
+		head->agpdev = agpdev;
+		agp_get_info(agpdev, &head->info);
+		head->memory = NULL;
+#if 0				/* bogus */
+		switch (head->agp_info.chipset) {
+		case INTEL_GENERIC:  head->chipset = "Intel";          break;
+		case INTEL_LX:       head->chipset = "Intel 440LX";    break;
+		case INTEL_BX:       head->chipset = "Intel 440BX";    break;
+		case INTEL_GX:       head->chipset = "Intel 440GX";    break;
+		case INTEL_I810:     head->chipset = "Intel i810";     break;
+		case VIA_GENERIC:    head->chipset = "VIA";            break;
+		case VIA_VP3:        head->chipset = "VIA VP3";        break;
+		case VIA_MVP3:       head->chipset = "VIA MVP3";       break;
+		case VIA_APOLLO_PRO: head->chipset = "VIA Apollo Pro"; break;
+		case SIS_GENERIC:    head->chipset = "SiS";            break;
+		case AMD_GENERIC:    head->chipset = "AMD";            break;
+		case AMD_IRONGATE:   head->chipset = "AMD Irongate";   break;
+		case ALI_GENERIC:    head->chipset = "ALi";            break;
+		case ALI_M1541:      head->chipset = "ALi M1541";      break;
+		default:
+		}
+#endif
+		DRM_INFO("AGP at 0x%08x %dMB\n",
+			 head->info.ai_aperture_base,
+			 head->info.ai_aperture_size >> 20);
+	}
+	return head;
+}
+
+#endif /* DRM_AGP */
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/auth.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/auth.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/auth.c	Fri Jun 16 17:03:29 2000
@@ -0,0 +1,168 @@
+/* auth.c -- IOCTLs for authentication -*- c -*-
+ * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+static int drm_hash_magic(drm_magic_t magic)
+{
+	return magic & (DRM_HASH_SIZE-1);
+}
+
+static drm_file_t *drm_find_file(drm_device_t *dev, drm_magic_t magic)
+{
+	drm_file_t	  *retval = NULL;
+	drm_magic_entry_t *pt;
+	int		  hash	  = drm_hash_magic(magic);
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	for (pt = dev->magiclist[hash].head; pt; pt = pt->next) {
+		if (pt->priv->authenticated) continue;
+		if (pt->magic == magic) {
+			retval = pt->priv;
+			break;
+		}
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+
+	return retval;
+}
+
+int drm_add_magic(drm_device_t *dev, drm_file_t *priv, drm_magic_t magic)
+{
+	int		  hash;
+	drm_magic_entry_t *entry;
+	
+	DRM_DEBUG("%d\n", magic);
+	
+	hash	     = drm_hash_magic(magic);
+	entry	     = drm_alloc(sizeof(*entry), DRM_MEM_MAGIC);
+	if (!entry) return ENOMEM;
+	entry->magic = magic;
+	entry->priv  = priv;
+	entry->next  = NULL;
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	if (dev->magiclist[hash].tail) {
+		dev->magiclist[hash].tail->next = entry;
+		dev->magiclist[hash].tail	= entry;
+	} else {
+		dev->magiclist[hash].head	= entry;
+		dev->magiclist[hash].tail	= entry;
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	
+	return 0;
+}
+
+int drm_remove_magic(drm_device_t *dev, drm_magic_t magic)
+{
+	drm_magic_entry_t *prev = NULL;
+	drm_magic_entry_t *pt;
+	int		  hash;
+	
+	DRM_DEBUG("%d\n", magic);
+	hash = drm_hash_magic(magic);
+	
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	for (pt = dev->magiclist[hash].head; pt; prev = pt, pt = pt->next) {
+		if (pt->magic == magic) {
+			if (dev->magiclist[hash].head == pt) {
+				dev->magiclist[hash].head = pt->next;
+			}
+			if (dev->magiclist[hash].tail == pt) {
+				dev->magiclist[hash].tail = prev;
+			}
+			if (prev) {
+				prev->next = pt->next;
+			}
+			lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+			return 0;
+		}
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+
+	drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+	
+	return EINVAL;
+}
+
+int drm_getmagic(dev_t kdev, u_long cmd, caddr_t data,
+		 int flags, struct proc *p)
+{
+	static drm_magic_t sequence = 0;
+#if 0
+	static struct simplelock lock; /* XXX */
+#endif
+	drm_device_t	   *dev = kdev->si_drv1;
+	drm_file_t	   *priv;
+	drm_auth_t	   auth;
+
+				/* Find unique magic */
+	priv = drm_find_file_by_proc(dev, p);
+	if (!priv) {
+	    DRM_DEBUG("can't find file structure\n");
+	    return EINVAL;
+	}
+	if (priv->magic) {
+		auth.magic = priv->magic;
+	} else {
+		simple_lock(&lock);
+		do {
+			if (!sequence) ++sequence; /* reserve 0 */
+			auth.magic = sequence++;
+		} while (drm_find_file(dev, auth.magic));
+		simple_unlock(&lock);
+		priv->magic = auth.magic;
+		drm_add_magic(dev, priv, auth.magic);
+	}
+	
+	DRM_DEBUG("%u\n", auth.magic);
+	*(drm_auth_t *) data = auth;
+	return 0;
+}
+
+int drm_authmagic(dev_t kdev, u_long cmd, caddr_t data,
+		  int flags, struct proc *p)
+{
+	drm_device_t	   *dev	    = kdev->si_drv1;
+	drm_auth_t	   auth;
+	drm_file_t	   *file;
+
+	auth = *(drm_auth_t *) data;
+	DRM_DEBUG("%u\n", auth.magic);
+	if ((file = drm_find_file(dev, auth.magic))) {
+		file->authenticated = 1;
+		drm_remove_magic(dev, auth.magic);
+		return 0;
+	}
+	return EINVAL;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/bufs.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/bufs.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/bufs.c	Fri Jun 16 17:03:29 2000
@@ -0,0 +1,500 @@
+/* bufs.c -- IOCTLs to manage buffers -*- c -*-
+ * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include <sys/mman.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_map.h>
+
+				/* Compute order.  Can be made faster. */
+int drm_order(unsigned long size)
+{
+	int	      order;
+	unsigned long tmp;
+
+	for (order = 0, tmp = size; tmp >>= 1; ++order);
+	if (size & ~(1 << order)) ++order;
+	return order;
+}
+
+int drm_addmap(dev_t kdev, u_long cmd, caddr_t data,
+	       int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_map_t	*map;
+	
+	if (!(dev->flags & (FREAD|FWRITE)))
+		return EACCES; /* Require read/write */
+
+	map	     = drm_alloc(sizeof(*map), DRM_MEM_MAPS);
+	if (!map) return ENOMEM;
+	*map = *(drm_map_t *) data;
+
+	DRM_DEBUG("offset = 0x%08lx, size = 0x%08lx, type = %d\n",
+		  map->offset, map->size, map->type);
+	if ((map->offset & (PAGE_SIZE-1)) || (map->size & (PAGE_SIZE-1))) {
+		drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+		DRM_DEBUG("offset or size not page aligned\n");
+		return EINVAL;
+	}
+	map->mtrr   = -1;
+	map->handle = 0;
+
+	switch (map->type) {
+	case _DRM_REGISTERS:
+	case _DRM_FRAME_BUFFER:	
+		if (map->offset + map->size < map->offset
+		    /* || map->offset < virt_to_phys(high_memory) */) {
+			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+			DRM_DEBUG("bad frame buffer size\n");
+			return EINVAL;
+		}
+#ifdef CONFIG_MTRR
+		if (map->type == _DRM_FRAME_BUFFER
+		    || (map->flags & _DRM_WRITE_COMBINING)) {
+			map->mtrr = mtrr_add(map->offset, map->size,
+					     MTRR_TYPE_WRCOMB, 1);
+		}
+#endif
+		map->handle = drm_ioremap(map->offset, map->size);
+		break;
+			
+
+	case _DRM_SHM:
+		DRM_DEBUG("%ld %d\n", map->size, drm_order(map->size));
+		map->handle = (void *)drm_alloc_pages(drm_order(map->size)
+						      - PAGE_SHIFT,
+						      DRM_MEM_SAREA);
+		if (!map->handle) {
+			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+			return ENOMEM;
+		}
+		map->offset = (unsigned long)map->handle;
+		if (map->flags & _DRM_CONTAINS_LOCK) {
+			dev->lock.hw_lock = map->handle; /* Pointer to lock */
+		}
+		break;
+#ifdef DRM_AGP
+	case _DRM_AGP:
+		map->offset = map->offset + dev->agp->base;
+		break;
+#endif
+	default:
+		drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+		DRM_DEBUG("bad type\n");
+		return EINVAL;
+	}
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	if (dev->maplist) {
+		++dev->map_count;
+		dev->maplist = drm_realloc(dev->maplist,
+					   (dev->map_count-1)
+					   * sizeof(*dev->maplist),
+					   dev->map_count
+					   * sizeof(*dev->maplist),
+					   DRM_MEM_MAPS);
+	} else {
+		dev->map_count = 1;
+		dev->maplist = drm_alloc(dev->map_count*sizeof(*dev->maplist),
+					 DRM_MEM_MAPS);
+	}
+	dev->maplist[dev->map_count-1] = map;
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+
+	*(drm_map_t *) data = *map;
+	if (map->type != _DRM_SHM)
+		((drm_map_t *)data)->handle = (void *) map->offset;
+
+	return 0;
+}
+
+int drm_addbufs(dev_t kdev, u_long cmd, caddr_t data,
+		int flags, struct proc *p)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	drm_buf_desc_t	 request;
+	int		 count;
+	int		 order;
+	int		 size;
+	int		 total;
+	int		 page_order;
+	drm_buf_entry_t	 *entry;
+	unsigned long	 page;
+	drm_buf_t	 *buf;
+	int		 alignment;
+	unsigned long	 offset;
+	int		 i;
+	int		 byte_count;
+	int		 page_count;
+
+	if (!dma) return EINVAL;
+
+	request = *(drm_buf_desc_t *) data;
+
+	count	   = request.count;
+	order	   = drm_order(request.size);
+	size	   = 1 << order;
+	
+	DRM_DEBUG("count = %d, size = %d (%d), order = %d, queue_count = %d\n",
+		  request.count, request.size, size, order, dev->queue_count);
+
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return EINVAL;
+	if (dev->queue_count) return EBUSY; /* Not while in use */
+
+	alignment  = (request.flags & _DRM_PAGE_ALIGN) ? round_page(size) :size;
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total	   = PAGE_SIZE << page_order;
+
+	simple_lock(&dev->count_lock);
+	if (dev->buf_use) {
+		simple_unlock(&dev->count_lock);
+		return EBUSY;
+	}
+	atomic_inc(&dev->buf_alloc);
+	simple_unlock(&dev->count_lock);
+	
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	entry = &dma->bufs[order];
+	if (entry->buf_count) {
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		atomic_dec(&dev->buf_alloc);
+		return ENOMEM;	/* May only call once for each order */
+	}
+	
+	entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
+				   DRM_MEM_BUFS);
+	if (!entry->buflist) {
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		atomic_dec(&dev->buf_alloc);
+		return ENOMEM;
+	}
+	memset(entry->buflist, 0, count * sizeof(*entry->buflist));
+
+	entry->seglist = drm_alloc(count * sizeof(*entry->seglist),
+				   DRM_MEM_SEGS);
+	if (!entry->seglist) {
+		drm_free(entry->buflist,
+			 count * sizeof(*entry->buflist),
+			 DRM_MEM_BUFS);
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		atomic_dec(&dev->buf_alloc);
+		return ENOMEM;
+	}
+	memset(entry->seglist, 0, count * sizeof(*entry->seglist));
+
+	dma->pagelist = drm_realloc(dma->pagelist,
+				    dma->page_count * sizeof(*dma->pagelist),
+				    (dma->page_count + (count << page_order))
+				    * sizeof(*dma->pagelist),
+				    DRM_MEM_PAGES);
+	DRM_DEBUG("pagelist: %d entries\n",
+		  dma->page_count + (count << page_order));
+
+
+	entry->buf_size	  = size;
+	entry->page_order = page_order;
+	byte_count	  = 0;
+	page_count	  = 0;
+	while (entry->buf_count < count) {
+		if (!(page = drm_alloc_pages(page_order, DRM_MEM_DMA))) break;
+		entry->seglist[entry->seg_count++] = page;
+		for (i = 0; i < (1 << page_order); i++) {
+			DRM_DEBUG("page %d @ 0x%08lx\n",
+				  dma->page_count + page_count,
+				  page + PAGE_SIZE * i);
+			dma->pagelist[dma->page_count + page_count++]
+				= page + PAGE_SIZE * i;
+		}
+		for (offset = 0;
+		     offset + size <= total && entry->buf_count < count;
+		     offset += alignment, ++entry->buf_count) {
+			buf	     = &entry->buflist[entry->buf_count];
+			buf->idx     = dma->buf_count + entry->buf_count;
+			buf->total   = alignment;
+			buf->order   = order;
+			buf->used    = 0;
+			buf->offset  = (dma->byte_count + byte_count + offset);
+			buf->address = (void *)(page + offset);
+			buf->next    = NULL;
+			buf->waiting = 0;
+			buf->pending = 0;
+			buf->dma_wait = 0;
+			buf->pid     = 0;
+#if DRM_DMA_HISTOGRAM
+			timespecclear(&buf->time_queued);
+			timespecclear(&buf->time_dispatched);
+			timespecclear(&buf->time_completed);
+			timespecclear(&buf->time_freed);
+#endif
+			DRM_DEBUG("buffer %d @ %p\n",
+				  entry->buf_count, buf->address);
+		}
+		byte_count += PAGE_SIZE << page_order;
+	}
+
+	dma->buflist = drm_realloc(dma->buflist,
+				   dma->buf_count * sizeof(*dma->buflist),
+				   (dma->buf_count + entry->buf_count)
+				   * sizeof(*dma->buflist),
+				   DRM_MEM_BUFS);
+	for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
+		dma->buflist[i] = &entry->buflist[i - dma->buf_count];
+
+	dma->buf_count	+= entry->buf_count;
+	dma->seg_count	+= entry->seg_count;
+	dma->page_count += entry->seg_count << page_order;
+	dma->byte_count += PAGE_SIZE * (entry->seg_count << page_order);
+	
+	drm_freelist_create(&entry->freelist, entry->buf_count);
+	for (i = 0; i < entry->buf_count; i++) {
+		drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
+	}
+	
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+
+	request.count = entry->buf_count;
+	request.size  = size;
+
+	*(drm_buf_desc_t *) data = request;
+	
+	atomic_dec(&dev->buf_alloc);
+	return 0;
+}
+
+int drm_infobufs(dev_t kdev, u_long cmd, caddr_t data,
+		 int flags, struct proc *p)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	drm_buf_info_t	 request;
+	int		 i;
+	int		 count;
+
+	if (!dma) return EINVAL;
+
+	simple_lock(&dev->count_lock);
+	if (atomic_read(&dev->buf_alloc)) {
+		simple_unlock(&dev->count_lock);
+		return EBUSY;
+	}
+	++dev->buf_use;		/* Can't allocate more after this call */
+	simple_unlock(&dev->count_lock);
+
+	request = *(drm_buf_info_t *) data;
+
+	for (i = 0, count = 0; i < DRM_MAX_ORDER+1; i++) {
+		if (dma->bufs[i].buf_count) ++count;
+	}
+	
+	DRM_DEBUG("count = %d\n", count);
+	
+	if (request.count >= count) {
+		for (i = 0, count = 0; i < DRM_MAX_ORDER+1; i++) {
+			if (dma->bufs[i].buf_count) {
+				int error;
+				error = copyout(&dma->bufs[i].buf_count,
+						&request.list[count].count,
+						sizeof(dma->bufs[0]
+						       .buf_count));
+				if (error) return error;
+				error = copyout(&dma->bufs[i].buf_size,
+						&request.list[count].size,
+						sizeof(dma->bufs[0].buf_size));
+				if (error) return error;
+				error = copyout(&dma->bufs[i]
+						.freelist.low_mark,
+						&request.list[count].low_mark,
+						sizeof(dma->bufs[0]
+						       .freelist.low_mark));
+				if (error) return error;
+				error = copyout(&dma->bufs[i]
+						.freelist.high_mark,
+						&request.list[count].high_mark,
+						sizeof(dma->bufs[0]
+						       .freelist.high_mark));
+				if (error) return error;
+				DRM_DEBUG("%d %d %d %d %d\n",
+					  i,
+					  dma->bufs[i].buf_count,
+					  dma->bufs[i].buf_size,
+					  dma->bufs[i].freelist.low_mark,
+					  dma->bufs[i].freelist.high_mark);
+				++count;
+			}
+		}
+	}
+	request.count = count;
+
+	*(drm_buf_info_t *) data = request;
+	
+	return 0;
+}
+
+int drm_markbufs(dev_t kdev, u_long cmd, caddr_t data,
+		 int flags, struct proc *p)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	drm_buf_desc_t	 request;
+	int		 order;
+	drm_buf_entry_t	 *entry;
+
+	if (!dma) return EINVAL;
+
+	request = *(drm_buf_desc_t *) data;
+
+	DRM_DEBUG("%d, %d, %d\n",
+		  request.size, request.low_mark, request.high_mark);
+	order = drm_order(request.size);
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return EINVAL;
+	entry = &dma->bufs[order];
+
+	if (request.low_mark < 0 || request.low_mark > entry->buf_count)
+		return EINVAL;
+	if (request.high_mark < 0 || request.high_mark > entry->buf_count)
+		return EINVAL;
+
+	entry->freelist.low_mark  = request.low_mark;
+	entry->freelist.high_mark = request.high_mark;
+	
+	return 0;
+}
+
+int drm_freebufs(dev_t kdev, u_long cmd, caddr_t data,
+		 int flags, struct proc *p)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	drm_buf_free_t	 request;
+	int		 i;
+	int		 idx;
+	int		 error;
+	drm_buf_t	 *buf;
+
+	if (!dma) return EINVAL;
+
+	request = *(drm_buf_free_t *) data;
+
+	DRM_DEBUG("%d\n", request.count);
+	for (i = 0; i < request.count; i++) {
+		error = copyin(&request.list[i], &idx, sizeof(idx));
+		if (error)
+			return error;
+		if (idx < 0 || idx >= dma->buf_count) {
+			DRM_ERROR("Index %d (of %d max)\n",
+				  idx, dma->buf_count - 1);
+			return EINVAL;
+		}
+		buf = dma->buflist[idx];
+		if (buf->pid != p->p_pid) {
+			DRM_ERROR("Process %d freeing buffer owned by %d\n",
+				  p->p_pid, buf->pid);
+			return EINVAL;
+		}
+		drm_free_buffer(dev, buf);
+	}
+	
+	return 0;
+}
+
+int drm_mapbufs(dev_t kdev, u_long cmd, caddr_t data,
+		int flags, struct proc *p)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	int		 retcode = 0;
+	const int	 zero	 = 0;
+	vm_offset_t	 virtual;
+	vm_offset_t	 address;
+	drm_buf_map_t	 request;
+	int		 i;
+
+	if (!dma) return EINVAL;
+	
+	DRM_DEBUG("\n");
+
+	simple_lock(&dev->count_lock);
+	if (atomic_read(&dev->buf_alloc)) {
+		simple_unlock(&dev->count_lock);
+		return EBUSY;
+	}
+	++dev->buf_use;		/* Can't allocate more after this call */
+	simple_unlock(&dev->count_lock);
+
+	request = *(drm_buf_map_t *) data;
+
+	if (request.count >= dma->buf_count) {
+		virtual = 0;
+		retcode = vm_mmap(&p->p_vmspace->vm_map,
+				  &virtual,
+				  round_page(dma->byte_count),
+				  PROT_READ|PROT_WRITE, VM_PROT_ALL,
+				  MAP_SHARED,
+				  SLIST_FIRST(&kdev->si_hlist),
+				  0);
+		if (retcode)
+			goto done;
+
+		request.virtual = (void *)virtual;
+
+		for (i = 0; i < dma->buf_count; i++) {
+			retcode = copyout(&dma->buflist[i]->idx,
+					  &request.list[i].idx,
+					  sizeof(request.list[0].idx));
+			if (retcode) goto done;
+			retcode = copyout(&dma->buflist[i]->total,
+					  &request.list[i].total,
+					  sizeof(request.list[0].total));
+			if (retcode) goto done;
+			retcode = copyout(&zero,
+					  &request.list[i].used,
+					  sizeof(request.list[0].used));
+			if (retcode) goto done;
+			address = virtual + dma->buflist[i]->offset;
+			retcode = copyout(&address,
+					  &request.list[i].address,
+					  sizeof(address));
+			if (retcode) goto done;
+		}
+	}
+done:
+	request.count = dma->buf_count;
+	DRM_DEBUG("%d buffers, retcode = %d\n", request.count, retcode);
+
+	*(drm_buf_map_t *) data = request;
+
+	return retcode;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/context.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/context.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/context.c	Fri Jun 16 17:03:29 2000
@@ -0,0 +1,297 @@
+/* context.c -- IOCTLs for contexts and DMA queues -*- c -*-
+ * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+static int drm_init_queue(drm_device_t *dev, drm_queue_t *q, drm_ctx_t *ctx)
+{
+	DRM_DEBUG("\n");
+	
+	if (atomic_read(&q->use_count) != 1
+	    || atomic_read(&q->finalization)
+	    || atomic_read(&q->block_count)) {
+		DRM_ERROR("New queue is already in use: u%d f%d b%d\n",
+			  atomic_read(&q->use_count),
+			  atomic_read(&q->finalization),
+			  atomic_read(&q->block_count));
+	}
+		  
+	atomic_set(&q->finalization,  0);
+	atomic_set(&q->block_count,   0);
+	atomic_set(&q->block_read,    0);
+	atomic_set(&q->block_write,   0);
+	atomic_set(&q->total_queued,  0);
+	atomic_set(&q->total_flushed, 0);
+	atomic_set(&q->total_locks,   0);
+
+	q->write_queue = 0;
+	q->read_queue = 0;
+	q->flush_queue = 0;
+
+	q->flags = ctx->flags;
+
+	drm_waitlist_create(&q->waitlist, dev->dma->buf_count);
+
+	return 0;
+}
+
+
+/* drm_alloc_queue:
+PRE: 1) dev->queuelist[0..dev->queue_count] is allocated and will not
+	disappear (so all deallocation must be done after IOCTLs are off)
+     2) dev->queue_count < dev->queue_slots
+     3) dev->queuelist[i].use_count == 0 and
+	dev->queuelist[i].finalization == 0 if i not in use 
+POST: 1) dev->queuelist[i].use_count == 1
+      2) dev->queue_count < dev->queue_slots */
+		
+static int drm_alloc_queue(drm_device_t *dev)
+{
+	int	    i;
+	drm_queue_t *queue;
+	int	    oldslots;
+	int	    newslots;
+				/* Check for a free queue */
+	for (i = 0; i < dev->queue_count; i++) {
+		atomic_inc(&dev->queuelist[i]->use_count);
+		if (atomic_read(&dev->queuelist[i]->use_count) == 1
+		    && !atomic_read(&dev->queuelist[i]->finalization)) {
+			DRM_DEBUG("%d (free)\n", i);
+			return i;
+		}
+		atomic_dec(&dev->queuelist[i]->use_count);
+	}
+				/* Allocate a new queue */
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	
+	queue = drm_alloc(sizeof(*queue), DRM_MEM_QUEUES);
+	memset(queue, 0, sizeof(*queue));
+	atomic_set(&queue->use_count, 1);
+	
+	++dev->queue_count;
+	if (dev->queue_count >= dev->queue_slots) {
+		oldslots = dev->queue_slots * sizeof(*dev->queuelist);
+		if (!dev->queue_slots) dev->queue_slots = 1;
+		dev->queue_slots *= 2;
+		newslots = dev->queue_slots * sizeof(*dev->queuelist);
+
+		dev->queuelist = drm_realloc(dev->queuelist,
+					     oldslots,
+					     newslots,
+					     DRM_MEM_QUEUES);
+		if (!dev->queuelist) {
+			lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+			DRM_DEBUG("out of memory\n");
+			return -ENOMEM;
+		}
+	}
+	dev->queuelist[dev->queue_count-1] = queue;
+	
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	DRM_DEBUG("%d (new)\n", dev->queue_count - 1);
+	return dev->queue_count - 1;
+}
+
+int drm_resctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_ctx_res_t	res;
+	drm_ctx_t	ctx;
+	int		i;
+	int		error;
+
+	DRM_DEBUG("%d\n", DRM_RESERVED_CONTEXTS);
+	res = *(drm_ctx_res_t *) data;
+	if (res.count >= DRM_RESERVED_CONTEXTS) {
+		memset(&ctx, 0, sizeof(ctx));
+		for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
+			ctx.handle = i;
+			error = copyout(&i, &res.contexts[i],
+					sizeof(i));
+			if (error) return error;
+		}
+	}
+	res.count = DRM_RESERVED_CONTEXTS;
+	*(drm_ctx_res_t *) data = res;
+	return 0;
+}
+
+
+int drm_addctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	if ((ctx.handle = drm_alloc_queue(dev)) == DRM_KERNEL_CONTEXT) {
+				/* Init kernel's context and get a new one. */
+		drm_init_queue(dev, dev->queuelist[ctx.handle], &ctx);
+		ctx.handle = drm_alloc_queue(dev);
+	}
+	drm_init_queue(dev, dev->queuelist[ctx.handle], &ctx);
+	DRM_DEBUG("%d\n", ctx.handle);
+	*(drm_ctx_t *) data = ctx;
+	return 0;
+}
+
+int drm_modctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+	drm_queue_t	*q;
+		
+	ctx = *(drm_ctx_t *) data;
+	
+	DRM_DEBUG("%d\n", ctx.handle);
+	
+	if (ctx.handle < 0 || ctx.handle >= dev->queue_count) return -EINVAL;
+	q = dev->queuelist[ctx.handle];
+	
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) == 1) {
+				/* No longer in use */
+		atomic_dec(&q->use_count);
+		return -EINVAL;
+	}
+
+	if (DRM_BUFCOUNT(&q->waitlist)) {
+		atomic_dec(&q->use_count);
+		return -EBUSY;
+	}
+	
+	q->flags = ctx.flags;
+	
+	atomic_dec(&q->use_count);
+	return 0;
+}
+
+int drm_getctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+	drm_queue_t	*q;
+		
+	ctx = *(drm_ctx_t *) data;
+	
+	DRM_DEBUG("%d\n", ctx.handle);
+	
+	if (ctx.handle >= dev->queue_count) return -EINVAL;
+	q = dev->queuelist[ctx.handle];
+	
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) == 1) {
+				/* No longer in use */
+		atomic_dec(&q->use_count);
+		return -EINVAL;
+	}
+	
+	ctx.flags = q->flags;
+	atomic_dec(&q->use_count);
+	
+	*(drm_ctx_t *) data = ctx;
+	
+	return 0;
+}
+
+int drm_switchctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	DRM_DEBUG("%d\n", ctx.handle);
+	return drm_context_switch(dev, dev->last_context, ctx.handle);
+}
+
+int drm_newctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	DRM_DEBUG("%d\n", ctx.handle);
+	drm_context_switch_complete(dev, ctx.handle);
+
+	return 0;
+}
+
+int drm_rmctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+	drm_queue_t	*q;
+	drm_buf_t	*buf;
+
+	ctx = *(drm_ctx_t *) data;
+	DRM_DEBUG("%d\n", ctx.handle);
+	
+	if (ctx.handle >= dev->queue_count) return -EINVAL;
+	q = dev->queuelist[ctx.handle];
+	
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) == 1) {
+				/* No longer in use */
+		atomic_dec(&q->use_count);
+		return -EINVAL;
+	}
+	
+	atomic_inc(&q->finalization); /* Mark queue in finalization state */
+	atomic_sub(2, &q->use_count); /* Mark queue as unused (pending
+					 finalization) */
+
+	/* Wait while interrupt servicing is in progress */
+	while (test_and_set_bit(0, &dev->interrupt_flag)) {
+		int never;
+		int error = tsleep(&never, PZERO|PCATCH, "drmrc", 1);
+		if (error) {
+			clear_bit(0, &dev->interrupt_flag);
+			return error;
+		}
+	}
+				/* Remove queued buffers */
+	while ((buf = drm_waitlist_get(&q->waitlist))) {
+		drm_free_buffer(dev, buf);
+	}
+	clear_bit(0, &dev->interrupt_flag);
+	
+				/* Wakeup blocked processes */
+	wakeup(&q->read_queue);
+	wakeup(&q->write_queue);
+	wakeup(&q->flush_queue);
+	
+				/* Finalization over.  Queue is made
+				   available when both use_count and
+				   finalization become 0, which won't
+				   happen until all the waiting processes
+				   stop waiting. */
+	atomic_dec(&q->finalization);
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/ctxbitmap.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/ctxbitmap.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/ctxbitmap.c	Fri Jun 16 17:03:29 2000
@@ -0,0 +1,85 @@
+/* ctxbitmap.c -- Context bitmap management
+ * Created: Thu Jan 6 03:56:42 2000 by jhartmann@precisioninsight.com
+ * 
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Jeff Hartmann <jhartmann@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+void drm_ctxbitmap_free(drm_device_t *dev, int ctx_handle)
+{
+	if (ctx_handle < 0) goto failed;
+
+	if (ctx_handle < DRM_MAX_CTXBITMAP) {
+		clear_bit(ctx_handle, dev->ctx_bitmap);
+		return;
+	}
+failed:
+       	DRM_ERROR("Attempt to free invalid context handle: %d\n",
+		  ctx_handle);
+       	return;
+}
+
+int drm_ctxbitmap_next(drm_device_t *dev)
+{
+	int bit;
+
+	bit = find_first_zero_bit(dev->ctx_bitmap, DRM_MAX_CTXBITMAP);
+	if (bit < DRM_MAX_CTXBITMAP) {
+		set_bit(bit, dev->ctx_bitmap);
+	   	DRM_DEBUG("drm_ctxbitmap_next bit : %d\n", bit);
+		return bit;
+	}
+	return -1;
+}
+
+int drm_ctxbitmap_init(drm_device_t *dev)
+{
+	int i;
+   	int temp;
+
+	dev->ctx_bitmap = (u_int32_t *) drm_alloc(PAGE_SIZE, 
+						  DRM_MEM_CTXBITMAP);
+	if(dev->ctx_bitmap == NULL) {
+		return -ENOMEM;
+	}
+	memset((void *) dev->ctx_bitmap, 0, PAGE_SIZE);
+	for(i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
+		temp = drm_ctxbitmap_next(dev);
+	   	DRM_DEBUG("drm_ctxbitmap_init : %d\n", temp);
+	}
+
+	return 0;
+}
+
+void drm_ctxbitmap_cleanup(drm_device_t *dev)
+{
+	drm_free((void *)dev->ctx_bitmap, PAGE_SIZE,
+		 DRM_MEM_CTXBITMAP);
+}
+
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/dma.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/dma.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/dma.c	Fri Jun 16 17:03:29 2000
@@ -0,0 +1,543 @@
+/* dma.c -- DMA IOCTL and function support -*- c -*-
+ * Created: Fri Mar 19 14:30:16 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinuxa.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+void drm_dma_setup(drm_device_t *dev)
+{
+	int i;
+	
+	dev->dma = drm_alloc(sizeof(*dev->dma), DRM_MEM_DRIVER);
+	memset(dev->dma, 0, sizeof(*dev->dma));
+	for (i = 0; i <= DRM_MAX_ORDER; i++)
+		memset(&dev->dma->bufs[i], 0, sizeof(dev->dma->bufs[0]));
+}
+
+void drm_dma_takedown(drm_device_t *dev)
+{
+	drm_device_dma_t  *dma = dev->dma;
+	int		  i, j;
+
+	if (!dma) return;
+	
+				/* Clear dma buffers */
+	for (i = 0; i <= DRM_MAX_ORDER; i++) {
+		if (dma->bufs[i].seg_count) {
+			DRM_DEBUG("order %d: buf_count = %d,"
+				  " seg_count = %d\n",
+				  i,
+				  dma->bufs[i].buf_count,
+				  dma->bufs[i].seg_count);
+			for (j = 0; j < dma->bufs[i].seg_count; j++) {
+				drm_free_pages(dma->bufs[i].seglist[j],
+					       dma->bufs[i].page_order,
+					       DRM_MEM_DMA);
+			}
+			drm_free(dma->bufs[i].seglist,
+				 dma->bufs[i].seg_count
+				 * sizeof(*dma->bufs[0].seglist),
+				 DRM_MEM_SEGS);
+		}
+	   	if(dma->bufs[i].buf_count) {
+		   	for(j = 0; j < dma->bufs[i].buf_count; j++) {
+			   if(dma->bufs[i].buflist[j].dev_private) {
+			      drm_free(dma->bufs[i].buflist[j].dev_private,
+				       dma->bufs[i].buflist[j].dev_priv_size,
+				       DRM_MEM_BUFS);
+			   }
+			}
+		   	drm_free(dma->bufs[i].buflist,
+				 dma->bufs[i].buf_count *
+				 sizeof(*dma->bufs[0].buflist),
+				 DRM_MEM_BUFS);
+		   	drm_freelist_destroy(&dma->bufs[i].freelist);
+		}
+	}
+	
+	if (dma->buflist) {
+		drm_free(dma->buflist,
+			 dma->buf_count * sizeof(*dma->buflist),
+			 DRM_MEM_BUFS);
+	}
+
+	if (dma->pagelist) {
+		drm_free(dma->pagelist,
+			 dma->page_count * sizeof(*dma->pagelist),
+			 DRM_MEM_PAGES);
+	}
+	drm_free(dev->dma, sizeof(*dev->dma), DRM_MEM_DRIVER);
+	dev->dma = NULL;
+}
+
+#if DRM_DMA_HISTOGRAM
+/* This is slow, but is useful for debugging. */
+int drm_histogram_slot(struct timespec *ts)
+{
+	long count = ts->tv_sec * 1000 + ts->tv_nsec / 1000000;
+	int value = DRM_DMA_HISTOGRAM_INITIAL;
+	int slot;
+
+	for (slot = 0;
+	     slot < DRM_DMA_HISTOGRAM_SLOTS;
+	     ++slot, value = DRM_DMA_HISTOGRAM_NEXT(value)) {
+		if (count < value) return slot;
+	}
+	return DRM_DMA_HISTOGRAM_SLOTS - 1;
+}
+
+void drm_histogram_compute(drm_device_t *dev, drm_buf_t *buf)
+{
+	struct timespec queued_to_dispatched;
+	struct timespec dispatched_to_completed;
+	struct timespec completed_to_freed;
+	int	 q2d, d2c, c2f, q2c, q2f;
+	
+	if (timespecisset(&buf->time_queued)) {
+		queued_to_dispatched = buf->time_dispatched;
+		timespecsub(&queued_to_dispatched, &buf->time_queued);
+		dispatched_to_completed = buf->time_completed;
+		timespecsub(&dispatched_to_completed, &buf->time_dispatched);
+		completed_to_freed = buf->time_freed;
+		timespecsub(&completed_to_freed, &buf->time_completed);
+
+		q2d = drm_histogram_slot(&queued_to_dispatched);
+		d2c = drm_histogram_slot(&dispatched_to_completed);
+		c2f = drm_histogram_slot(&completed_to_freed);
+
+		timespecadd(&queued_to_dispatched, &dispatched_to_completed);
+		q2c = drm_histogram_slot(&queued_to_dispatched);
+		timespecadd(&queued_to_dispatched, &completed_to_freed);
+		q2f = drm_histogram_slot(&queued_to_dispatched);
+		
+		atomic_inc(&dev->histo.total);
+		atomic_inc(&dev->histo.queued_to_dispatched[q2d]);
+		atomic_inc(&dev->histo.dispatched_to_completed[d2c]);
+		atomic_inc(&dev->histo.completed_to_freed[c2f]);
+		
+		atomic_inc(&dev->histo.queued_to_completed[q2c]);
+		atomic_inc(&dev->histo.queued_to_freed[q2f]);
+
+	}
+	timespecclear(&buf->time_queued);
+	timespecclear(&buf->time_dispatched);
+	timespecclear(&buf->time_completed);
+	timespecclear(&buf->time_freed);
+}
+#endif
+
+void drm_free_buffer(drm_device_t *dev, drm_buf_t *buf)
+{
+	drm_device_dma_t *dma = dev->dma;
+
+	if (!buf) return;
+	
+	buf->waiting  = 0;
+	buf->pending  = 0;
+	buf->pid      = 0;
+	buf->used     = 0;
+#if DRM_DMA_HISTOGRAMxx
+	buf->time_completed = get_cycles();
+#endif
+	if (buf->dma_wait) {
+		buf->dma_wait = 0;
+		wakeup(&buf->dma_wait);
+	} else {
+				/* If processes are waiting, the last one
+				   to wake will put the buffer on the free
+				   list.  If no processes are waiting, we
+				   put the buffer on the freelist here. */
+		drm_freelist_put(dev, &dma->bufs[buf->order].freelist, buf);
+	}
+}
+
+void drm_reclaim_buffers(drm_device_t *dev, pid_t pid)
+{
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma) return;
+	for (i = 0; i < dma->buf_count; i++) {
+		if (dma->buflist[i]->pid == pid) {
+			switch (dma->buflist[i]->list) {
+			case DRM_LIST_NONE:
+				drm_free_buffer(dev, dma->buflist[i]);
+				break;
+			case DRM_LIST_WAIT:
+				dma->buflist[i]->list = DRM_LIST_RECLAIM;
+				break;
+			default:
+				/* Buffer already on hardware. */
+				break;
+			}
+		}
+	}
+}
+
+int drm_context_switch(drm_device_t *dev, int old, int new)
+{
+	char	    buf[64];
+	drm_queue_t *q;
+
+	atomic_inc(&dev->total_ctx);
+
+	if (test_and_set_bit(0, &dev->context_flag)) {
+		DRM_ERROR("Reentering -- FIXME\n");
+		return EBUSY;
+	}
+
+#if DRM_DMA_HISTOGRAM
+	getnanotime(&dev->ctx_start);
+#endif
+	
+	DRM_DEBUG("Context switch from %d to %d\n", old, new);
+
+	if (new >= dev->queue_count) {
+		clear_bit(0, &dev->context_flag);
+		return EINVAL;
+	}
+
+	if (new == dev->last_context) {
+		clear_bit(0, &dev->context_flag);
+		return 0;
+	}
+	
+	q = dev->queuelist[new];
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) == 1) {
+		atomic_dec(&q->use_count);
+		clear_bit(0, &dev->context_flag);
+		return EINVAL;
+	}
+
+	if (drm_flags & DRM_FLAG_NOCTX) {
+		drm_context_switch_complete(dev, new);
+	} else {
+		sprintf(buf, "C %d %d\n", old, new);
+		drm_write_string(dev, buf);
+	}
+	
+	atomic_dec(&q->use_count);
+	
+	return 0;
+}
+
+int drm_context_switch_complete(drm_device_t *dev, int new)
+{
+	drm_device_dma_t *dma = dev->dma;
+	
+	dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
+	dev->last_switch = ticks;
+	
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("Lock isn't held after context switch\n");
+	}
+
+	if (!dma || !(dma->next_buffer && dma->next_buffer->while_locked)) {
+		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("Cannot free lock\n");
+		}
+	}
+	
+#if DRM_DMA_HISTOGRAM
+	{
+		struct timespec ts;
+		getnanotime(&ts);
+		timespecsub(&ts, &dev->ctx_start);
+		atomic_inc(&dev->histo.ctx[drm_histogram_slot(&ts)]);
+	}
+#endif
+	clear_bit(0, &dev->context_flag);
+	wakeup(&dev->context_wait);
+	
+	return 0;
+}
+
+void drm_clear_next_buffer(drm_device_t *dev)
+{
+	drm_device_dma_t *dma = dev->dma;
+	
+	dma->next_buffer = NULL;
+	if (dma->next_queue && !DRM_BUFCOUNT(&dma->next_queue->waitlist)) {
+		wakeup(&dma->next_queue->flush_queue);
+	}
+	dma->next_queue	 = NULL;
+}
+
+
+int drm_select_queue(drm_device_t *dev, void (*wrapper)(void *))
+{
+	int	   i;
+	int	   candidate = -1;
+	int	   j	     = ticks;
+
+	if (!dev) {
+		DRM_ERROR("No device\n");
+		return -1;
+	}
+	if (!dev->queuelist || !dev->queuelist[DRM_KERNEL_CONTEXT]) {
+				/* This only happens between the time the
+				   interrupt is initialized and the time
+				   the queues are initialized. */
+		return -1;
+	}
+
+				/* Doing "while locked" DMA? */
+	if (DRM_WAITCOUNT(dev, DRM_KERNEL_CONTEXT)) {
+		return DRM_KERNEL_CONTEXT;
+	}
+
+				/* If there are buffers on the last_context
+				   queue, and we have not been executing
+				   this context very long, continue to
+				   execute this context. */
+	if (dev->last_switch <= j
+	    && dev->last_switch + DRM_TIME_SLICE > j
+	    && DRM_WAITCOUNT(dev, dev->last_context)) {
+		return dev->last_context;
+	}
+
+				/* Otherwise, find a candidate */
+	for (i = dev->last_checked + 1; i < dev->queue_count; i++) {
+		if (DRM_WAITCOUNT(dev, i)) {
+			candidate = dev->last_checked = i;
+			break;
+		}
+	}
+
+	if (candidate < 0) {
+		for (i = 0; i < dev->queue_count; i++) {
+			if (DRM_WAITCOUNT(dev, i)) {
+				candidate = dev->last_checked = i;
+				break;
+			}
+		}
+	}
+
+	if (wrapper
+	    && candidate >= 0
+	    && candidate != dev->last_context
+	    && dev->last_switch <= j
+	    && dev->last_switch + DRM_TIME_SLICE > j) {
+		int s = splclock();
+		if (dev->timer.c_time != dev->last_switch + DRM_TIME_SLICE) {
+			callout_reset(&dev->timer,
+				      dev->last_switch + DRM_TIME_SLICE - j,
+				      wrapper,
+				      dev);
+		}
+		splx(s);
+		return -1;
+	}
+
+	return candidate;
+}
+
+
+int drm_dma_enqueue(drm_device_t *dev, drm_dma_t *d)
+{
+	int		  i;
+	drm_queue_t	  *q;
+	drm_buf_t	  *buf;
+	int		  idx;
+	int		  while_locked = 0;
+	drm_device_dma_t  *dma = dev->dma;
+	int		  error;
+
+	DRM_DEBUG("%d\n", d->send_count);
+
+	if (d->flags & _DRM_DMA_WHILE_LOCKED) {
+		int context = dev->lock.hw_lock->lock;
+		
+		if (!_DRM_LOCK_IS_HELD(context)) {
+			DRM_ERROR("No lock held during \"while locked\""
+				  " request\n");
+			return EINVAL;
+		}
+		if (d->context != _DRM_LOCKING_CONTEXT(context)
+		    && _DRM_LOCKING_CONTEXT(context) != DRM_KERNEL_CONTEXT) {
+			DRM_ERROR("Lock held by %d while %d makes"
+				  " \"while locked\" request\n",
+				  _DRM_LOCKING_CONTEXT(context),
+				  d->context);
+			return EINVAL;
+		}
+		q = dev->queuelist[DRM_KERNEL_CONTEXT];
+		while_locked = 1;
+	} else {
+		q = dev->queuelist[d->context];
+	}
+
+
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->block_write)) {
+		atomic_inc(&q->block_count);
+		for (;;) {
+			if (!atomic_read(&q->block_write)) break;
+			error = tsleep(&q->block_write, PZERO|PCATCH,
+				       "dmawr", 0);
+			if (error) {
+				atomic_dec(&q->use_count);
+				return error;
+			}
+		}
+		atomic_dec(&q->block_count);
+	}
+	
+	for (i = 0; i < d->send_count; i++) {
+		idx = d->send_indices[i];
+		if (idx < 0 || idx >= dma->buf_count) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Index %d (of %d max)\n",
+				  d->send_indices[i], dma->buf_count - 1);
+			return EINVAL;
+		}
+		buf = dma->buflist[ idx ];
+		if (buf->pid != curproc->p_pid) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Process %d using buffer owned by %d\n",
+				  curproc->p_pid, buf->pid);
+			return EINVAL;
+		}
+		if (buf->list != DRM_LIST_NONE) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Process %d using buffer %d on list %d\n",
+				  curproc->p_pid, buf->idx, buf->list);
+		}
+		buf->used	  = d->send_sizes[i];
+		buf->while_locked = while_locked;
+		buf->context	  = d->context;
+		if (!buf->used) {
+			DRM_ERROR("Queueing 0 length buffer\n");
+		}
+		if (buf->pending) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Queueing pending buffer:"
+				  " buffer %d, offset %d\n",
+				  d->send_indices[i], i);
+			return EINVAL;
+		}
+		if (buf->waiting) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Queueing waiting buffer:"
+				  " buffer %d, offset %d\n",
+				  d->send_indices[i], i);
+			return EINVAL;
+		}
+		buf->waiting = 1;
+		if (atomic_read(&q->use_count) == 1
+		    || atomic_read(&q->finalization)) {
+			drm_free_buffer(dev, buf);
+		} else {
+			drm_waitlist_put(&q->waitlist, buf);
+			atomic_inc(&q->total_queued);
+		}
+	}
+	atomic_dec(&q->use_count);
+	
+	return 0;
+}
+
+static int drm_dma_get_buffers_of_order(drm_device_t *dev, drm_dma_t *d,
+					int order)
+{
+	int		  i;
+	int		  error;
+	drm_buf_t	  *buf;
+	drm_device_dma_t  *dma = dev->dma;
+	
+	for (i = d->granted_count; i < d->request_count; i++) {
+		buf = drm_freelist_get(&dma->bufs[order].freelist,
+				       d->flags & _DRM_DMA_WAIT);
+		if (!buf) break;
+		if (buf->pending || buf->waiting) {
+			DRM_ERROR("Free buffer %d in use by %d (w%d, p%d)\n",
+				  buf->idx,
+				  buf->pid,
+				  buf->waiting,
+				  buf->pending);
+		}
+		buf->pid     = curproc->p_pid;
+		error = copyout(&buf->idx,
+				&d->request_indices[i],
+				sizeof(buf->idx));
+		if (error)
+			return error;
+		error = copyout(&buf->total,
+				&d->request_sizes[i],
+				sizeof(buf->total));
+		if (error)
+			return error;
+		++d->granted_count;
+	}
+	return 0;
+}
+
+
+int drm_dma_get_buffers(drm_device_t *dev, drm_dma_t *dma)
+{
+	int		  order;
+	int		  retcode = 0;
+	int		  tmp_order;
+	
+	order = drm_order(dma->request_size);
+
+	dma->granted_count = 0;
+	retcode		   = drm_dma_get_buffers_of_order(dev, dma, order);
+
+	if (dma->granted_count < dma->request_count
+	    && (dma->flags & _DRM_DMA_SMALLER_OK)) {
+		for (tmp_order = order - 1;
+		     !retcode
+			     && dma->granted_count < dma->request_count
+			     && tmp_order >= DRM_MIN_ORDER;
+		     --tmp_order) {
+			
+			retcode = drm_dma_get_buffers_of_order(dev, dma,
+							       tmp_order);
+		}
+	}
+
+	if (dma->granted_count < dma->request_count
+	    && (dma->flags & _DRM_DMA_LARGER_OK)) {
+		for (tmp_order = order + 1;
+		     !retcode
+			     && dma->granted_count < dma->request_count
+			     && tmp_order <= DRM_MAX_ORDER;
+		     ++tmp_order) {
+			
+			retcode = drm_dma_get_buffers_of_order(dev, dma,
+							       tmp_order);
+		}
+	}
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/drawable.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/drawable.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/drawable.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,50 @@
+/* drawable.c -- IOCTLs for drawables -*- c -*-
+ * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+int drm_adddraw(dev_t kdev, u_long cmd, caddr_t data,
+		int flags, struct proc *p)
+{
+	drm_draw_t draw;
+
+	draw.handle = 0;	/* NOOP */
+	DRM_DEBUG("%d\n", draw.handle);
+	*(drm_draw_t *) data = draw;
+	return 0;
+}
+
+int drm_rmdraw(dev_t kdev, u_long cmd, caddr_t data,
+	       int flags, struct proc *p)
+{
+	return 0;		/* NOOP */
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/drmstat.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/drmstat.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/drmstat.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,418 @@
+/* drmstat.c -- DRM device status and testing program
+ * Created: Tue Jan  5 08:19:24 1999 by faith@precisioninsight.com
+ * Revised: Sun Aug  1 11:02:00 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c,v 1.28 1999/08/04 18:12:11 faith Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/drmstat.c,v 1.1 2000/06/17 00:03:30 martin Exp $
+ * 
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+#include <strings.h>
+#include <errno.h>
+#include <signal.h>
+#include <fcntl.h>
+#include "xf86drm.h"
+
+int sigio_fd;
+
+static double usec(struct timeval *end, struct timeval *start)
+{
+    double e = end->tv_sec   * 1000000 + end->tv_usec;
+    double s = start->tv_sec * 1000000 + start->tv_usec;
+
+    return e - s;
+}
+
+static void getversion(int fd)
+{
+    drmVersionPtr version;
+    
+    version = drmGetVersion(fd);
+    if (version) {
+	printf( "Name: %s\n", version->name ? version->name : "?" );
+	printf( "    Version: %d.%d.%d\n",
+		version->version_major,
+		version->version_minor,
+		version->version_patchlevel );
+	printf( "    Date: %s\n", version->date ? version->date : "?" );
+	printf( "    Desc: %s\n", version->desc ? version->desc : "?" );
+	drmFreeVersion(version);
+    } else {
+	printf( "No driver available\n" );
+    }
+}
+	
+void handler(int fd, void *oldctx, void *newctx)
+{
+    printf("Got fd %d\n", fd);
+}
+
+void process_sigio(char *device)
+{
+    int              fd;
+
+printf("%s\n", device);
+    if ((fd = open(device, 0)) < 0) {
+printf("%d\n", errno);
+	drmError(-errno, __FUNCTION__);
+	exit(1);
+    }
+
+    sigio_fd = fd;
+    drmInstallSIGIOHandler(fd, handler);
+    for (;;) sleep(60);
+}
+
+int main(int argc, char **argv)
+{
+    int            c;
+    int            r  = 0;
+    int            fd = -1;
+    drmHandle      handle;
+    void           *address;
+    char           *pt;
+    unsigned long  count;
+    unsigned long  offset;
+    unsigned long  size;
+    drmContext     context;
+    int            loops;
+    char           buf[1024];
+    int            i;
+    drmBufInfoPtr  info;
+    drmBufMapPtr   bufs;
+    drmLockPtr     lock;
+    int            secs;
+
+    while ((c = getopt(argc, argv,
+		       "lc:vo:O:f:s:w:W:b:r:R:P:L:C:XS:B:F:")) != EOF)
+	switch (c) {
+	case 'F':
+	    count  = strtoul(optarg, NULL, 0);
+	    if (!fork()) {
+		dup(fd);
+		sleep(count);
+	    }
+	    close(fd);
+	    break;
+	case 'v': getversion(fd);                                        break;
+	case 'X':
+	    if ((r = drmCreateContext(fd, &context))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf( "Got %d\n", context);
+	    break;
+	case 'S':
+	    process_sigio(optarg);
+	    break;
+	case 'C':
+	    if ((r = drmSwitchToContext(fd, strtoul(optarg, NULL, 0)))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    break;
+	case 'c':
+	    if ((r = drmSetBusid(fd,optarg))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    break;
+	case 'o':
+	    if ((fd = drmOpen(optarg, NULL)) < 0) {
+		drmError(fd, argv[0]);
+		return 1;
+	    }
+	    break;
+	case 'O':
+	    if ((fd = drmOpen(NULL, optarg)) < 0) {
+		drmError(fd, argv[0]);
+		return 1;
+	    }
+	    break;
+	case 'B':		/* Test buffer allocation */
+	    count  = strtoul(optarg, &pt, 0);
+	    size   = strtoul(pt+1, &pt, 0);
+	    secs   = strtoul(pt+1, NULL, 0);
+	    {
+		drmDMAReq      dma;
+		int            *indices, *sizes;
+
+		indices = alloca(sizeof(*indices) * count);
+		sizes   = alloca(sizeof(*sizes)   * count);
+		dma.context         = context;
+		dma.send_count      = 0;
+		dma.request_count   = count;
+		dma.request_size    = size;
+		dma.request_list    = indices;
+		dma.request_sizes   = sizes;
+		dma.flags           = DRM_DMA_WAIT;
+		if ((r = drmDMA(fd, &dma))) {
+		    drmError(r, argv[0]);
+		    return 1;
+		}
+		for (i = 0; i < dma.granted_count; i++) {
+		    printf("%5d: index = %d, size = %d\n",
+			   i, dma.request_list[i], dma.request_sizes[i]);
+		}
+		sleep(secs);
+		drmFreeBufs(fd, dma.granted_count, indices);
+	    }
+	    break;
+	case 'b':
+	    count   = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    if ((r = drmAddBufs(fd, count, size, 0, 0)) < 0) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    if (!(info = drmGetBufInfo(fd))) {
+		drmError(0, argv[0]);
+		return 1;
+	    }
+	    for (i = 0; i < info->count; i++) {
+		printf("%5d buffers of size %6d (low = %d, high = %d)\n",
+		       info->list[i].count,
+		       info->list[i].size,
+		       info->list[i].low_mark,
+		       info->list[i].high_mark);
+	    }
+	    if ((r = drmMarkBufs(fd, 0.50, 0.80))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    if (!(info = drmGetBufInfo(fd))) {
+		drmError(0, argv[0]);
+		return 1;
+	    }
+	    for (i = 0; i < info->count; i++) {
+		printf("%5d buffers of size %6d (low = %d, high = %d)\n",
+		       info->list[i].count,
+		       info->list[i].size,
+		       info->list[i].low_mark,
+		       info->list[i].high_mark);
+	    }
+	    printf("===== /proc/drm/1/meminfo =====\n");
+	    sprintf(buf, "cat /proc/drm/1/meminfo");
+	    system(buf);
+#if 1
+	    if (!(bufs = drmMapBufs(fd))) {
+		drmError(0, argv[0]);
+		return 1;
+	    }
+	    printf("===============================\n");
+	    printf( "%d bufs\n", bufs->count);
+	    for (i = 0; i < bufs->count; i++) {
+		printf( "  %4d: %8d bytes at %p\n",
+			i,
+			bufs->list[i].total,
+			bufs->list[i].address);
+	    }
+	    printf("===== /proc/drm/1/vmainfo =====\n");
+	    sprintf(buf, "cat /proc/drm/1/vmainfo");
+	    system(buf);
+#endif
+	    break;
+	case 'f':
+	    offset  = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    handle  = 0;
+	    if ((r = drmAddMap(fd, offset, size,
+			       DRM_FRAME_BUFFER, 0, &handle))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%08lx:0x%04lx added\n", offset, size);
+	    printf("===== /proc/drm/1/meminfo =====\n");
+	    sprintf(buf, "cat /proc/drm/1/meminfo");
+	    system(buf);
+	    break;
+	case 'r':
+	case 'R':
+	    offset  = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    handle  = 0;
+	    if ((r = drmAddMap(fd, offset, size,
+			       DRM_REGISTERS,
+			       c == 'R' ? DRM_READ_ONLY : 0,
+			       &handle))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%08lx:0x%04lx added\n", offset, size);
+	    printf("===== /proc/drm/1/meminfo =====\n");
+	    sprintf(buf, "cat /proc/drm/1/meminfo");
+	    system(buf);
+	    break;
+	case 's':
+	    size = strtoul(optarg, &pt, 0);
+	    handle = 0;
+	    if ((r = drmAddMap(fd, 0, size,
+			       DRM_SHM, DRM_CONTAINS_LOCK,
+			       &handle))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%04lx byte shm added at 0x%08lx\n", size, handle);
+	    sprintf(buf, "sysctl hw.graphics.0.vm");
+	    system(buf);
+	    break;
+	case 'P':
+	    offset  = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    address = NULL;
+	    if ((r = drmMap(fd, offset, size, &address))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%08lx:0x%04lx mapped at %p for pid %d\n",
+		   offset, size, address, getpid());
+	    printf("===== hw.graphics.0.vma =====\n");
+	    sprintf(buf, "sysctl hw.graphics.0.vma");
+	    system(buf);
+	    mprotect((void *)offset, size, PROT_READ);
+	    printf("===== hw.graphics.0.vma =====\n");
+	    sprintf(buf, "sysctl hw.graphics.0.vma");
+	    system(buf);
+	    break;
+	case 'w':
+	case 'W':
+	    offset  = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    address = NULL;
+	    if ((r = drmMap(fd, offset, size, &address))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%08lx:0x%04lx mapped at %p for pid %d\n",
+		   offset, size, address, getpid());
+	    printf("===== /proc/%d/maps =====\n", getpid());
+	    sprintf(buf, "cat /proc/%d/maps", getpid());
+	    system(buf);
+	    printf("===== /proc/drm/1/meminfo =====\n");
+	    sprintf(buf, "cat /proc/drm/1/meminfo");
+	    system(buf);
+	    printf("===== /proc/drm/1/vmainfo =====\n");
+	    sprintf(buf, "cat /proc/drm/1/vmainfo");
+	    system(buf);
+	    printf("===== READING =====\n");
+	    for (i = 0; i < 0x10; i++)
+		printf("%02x ", (unsigned int)((unsigned char *)address)[i]);
+	    printf("\n");
+	    if (c == 'w') {
+		printf("===== WRITING =====\n");
+		for (i = 0; i < size; i+=2) {
+		    ((char *)address)[i]   = i & 0xff;
+		    ((char *)address)[i+1] = i & 0xff;
+		}
+	    }
+	    printf("===== READING =====\n");
+	    for (i = 0; i < 0x10; i++)
+		printf("%02x ", (unsigned int)((unsigned char *)address)[i]);
+	    printf("\n");
+	    printf("===== /proc/drm/1/vmainfo =====\n");
+	    sprintf(buf, "cat /proc/drm/1/vmainfo");
+	    system(buf);
+	    break;
+	case 'L':
+	    context = strtoul(optarg, &pt, 0);
+	    offset  = strtoul(pt+1, &pt, 0);
+	    size    = strtoul(pt+1, &pt, 0);
+	    loops   = strtoul(pt+1, NULL, 0);
+	    address = NULL;
+	    if ((r = drmMap(fd, offset, size, &address))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    lock       = address;
+#if 1
+	    {
+		int            counter = 0;
+		struct timeval loop_start, loop_end;
+		struct timeval lock_start, lock_end;
+		double         wt;
+#define HISTOSIZE 9
+		int            histo[HISTOSIZE];
+		int            output = 0;
+		int            fast   = 0;
+
+		if (loops < 0) {
+		    loops = -loops;
+		    ++output;
+		}
+
+		for (i = 0; i < HISTOSIZE; i++) histo[i] = 0;
+
+		gettimeofday(&loop_start, NULL);
+		for (i = 0; i < loops; i++) {
+		    gettimeofday(&lock_start, NULL);
+		    DRM_LIGHT_LOCK_COUNT(fd,lock,context,fast);
+		    gettimeofday(&lock_end, NULL);
+		    DRM_UNLOCK(fd,lock,context);
+		    ++counter;
+		    wt = usec(&lock_end, &lock_start);
+		    if      (wt <=      2.5) ++histo[8];
+		    if      (wt <       5.0) ++histo[0];
+		    else if (wt <      50.0) ++histo[1];
+		    else if (wt <     500.0) ++histo[2];
+		    else if (wt <    5000.0) ++histo[3];
+		    else if (wt <   50000.0) ++histo[4];
+		    else if (wt <  500000.0) ++histo[5];
+		    else if (wt < 5000000.0) ++histo[6];
+		    else                     ++histo[7];
+		    if (output) printf( "%.2f uSec, %d fast\n", wt, fast);
+		}
+		gettimeofday(&loop_end, NULL);
+		printf( "Average wait time = %.2f usec, %d fast\n",
+			usec(&loop_end, &loop_start) /  counter, fast);
+		printf( "%9d <=     2.5 uS\n", histo[8]);
+		printf( "%9d <        5 uS\n", histo[0]);
+		printf( "%9d <       50 uS\n", histo[1]);
+		printf( "%9d <      500 uS\n", histo[2]);
+		printf( "%9d <     5000 uS\n", histo[3]);
+		printf( "%9d <    50000 uS\n", histo[4]);
+		printf( "%9d <   500000 uS\n", histo[5]);
+		printf( "%9d <  5000000 uS\n", histo[6]);
+		printf( "%9d >= 5000000 uS\n", histo[7]);
+	    }
+#else
+	    printf( "before lock: 0x%08x\n", lock->lock);
+	    printf( "lock: 0x%08x\n", lock->lock);
+	    sleep(5);
+	    printf( "unlock: 0x%08x\n", lock->lock);
+#endif
+	    break;
+	default:
+	    fprintf( stderr, "Usage: drmstat [options]\n" );
+	    return 1;
+	}
+
+    return r; 
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/fops.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/fops.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/fops.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,261 @@
+/* fops.c -- File operations for DRM -*- c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Daryll Strauss <daryll@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include <sys/signalvar.h>
+#include <sys/poll.h>
+
+drm_file_t *drm_find_file_by_proc(drm_device_t *dev, struct proc *p)
+{
+	uid_t uid = p->p_cred->p_svuid;
+	pid_t pid = p->p_pid;
+	drm_file_t *priv;
+
+	TAILQ_FOREACH(priv, &dev->files, link)
+		if (priv->pid == pid && priv->uid == uid)
+			return priv;
+	return NULL;
+}
+
+
+/* drm_open is called whenever a process opens /dev/drm. */
+
+int drm_open_helper(dev_t kdev, int flags, int fmt, struct proc *p,
+		    drm_device_t *dev)
+{
+	int	     m = minor(kdev);
+	drm_file_t   *priv;
+
+	if (flags & O_EXCL)
+		return EBUSY; /* No exclusive opens */
+
+	dev->flags = flags;
+
+	DRM_DEBUG("pid = %d, device = %p, minor = %d\n",
+		  p->p_pid, dev->device, m);
+
+	priv = drm_find_file_by_proc(dev, p);
+	if (priv) {
+		priv->refs++;
+	} else {
+		priv		    = drm_alloc(sizeof(*priv), DRM_MEM_FILES);
+		memset(priv, 0, sizeof(*priv));
+		priv->uid	    = p->p_cred->p_svuid;
+		priv->pid	    = p->p_pid;
+		priv->refs          = 1;
+		priv->minor	    = m;
+		priv->devXX	    = dev;
+		priv->ioctl_count   = 0;
+		priv->authenticated = !suser(p);
+		lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, p);
+		TAILQ_INSERT_TAIL(&dev->files, priv, link);
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, p);
+	}
+
+	kdev->si_drv1 = dev;
+	
+	return 0;
+}
+
+int drm_write(dev_t kdev, struct uio *uio, int ioflag)
+{
+	struct proc   *p      = curproc;
+	drm_device_t  *dev    = kdev->si_drv1;
+
+	DRM_DEBUG("pid = %d, device = %p, open_count = %d\n",
+		  p->p_pid, dev->device, dev->open_count);
+	return 0;
+}
+
+/* drm_release is called whenever a process closes /dev/drm*. */
+
+int drm_close(dev_t kdev, int fflag, int devtype, struct proc *p)
+{
+	drm_device_t  *dev  = kdev->si_drv1;
+	drm_file_t    *priv;
+
+	DRM_DEBUG("pid = %d, device = %p, open_count = %d\n",
+		  p->p_pid, dev->device, dev->open_count);
+
+	priv = drm_find_file_by_proc(dev, p);
+	if (!priv) {
+		DRM_DEBUG("can't find authenticator\n");
+		return EINVAL;
+	}
+
+	if (dev->lock.hw_lock && _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)
+	    && dev->lock.pid == p->p_pid) {
+		DRM_ERROR("Process %d dead, freeing lock for context %d\n",
+			  p->p_pid,
+			  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		drm_lock_free(dev,
+			      &dev->lock.hw_lock->lock,
+			      _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		
+				/* FIXME: may require heavy-handed reset of
+                                   hardware at this point, possibly
+                                   processed via a callback to the X
+                                   server. */
+	}
+	drm_reclaim_buffers(dev, priv->pid);
+
+	funsetown(dev->buf_sigio);
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, p);
+	priv = drm_find_file_by_proc(dev, p);
+	if (priv) {
+		priv->refs--;
+		if (!priv->refs) {
+			TAILQ_REMOVE(&dev->files, priv, link);
+			drm_free(priv, sizeof(*priv), DRM_MEM_FILES);
+		}
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, p);
+	
+	return 0;
+}
+
+/* The drm_read and drm_write_string code (especially that which manages
+   the circular buffer), is based on Alessandro Rubini's LINUX DEVICE
+   DRIVERS (Cambridge: O'Reilly, 1998), pages 111-113. */
+
+ssize_t drm_read(dev_t kdev, struct uio *uio, int ioflag)
+{
+	drm_device_t  *dev    = kdev->si_drv1;
+	int	      left;
+	int	      avail;
+	int	      send;
+	int	      cur;
+	int	      error = 0;
+
+	DRM_DEBUG("%p, %p\n", dev->buf_rp, dev->buf_wp);
+	
+	while (dev->buf_rp == dev->buf_wp) {
+		DRM_DEBUG("  sleeping\n");
+		if (dev->flags & FASYNC) {
+			return EWOULDBLOCK;
+		}
+		error = tsleep(&dev->buf_rp, PZERO|PCATCH, "drmrd", 0);
+		if (error) {
+			DRM_DEBUG("  interrupted\n");
+			return error;
+		}
+		DRM_DEBUG("  awake\n");
+	}
+
+	left  = (dev->buf_rp + DRM_BSZ - dev->buf_wp) % DRM_BSZ;
+	avail = DRM_BSZ - left;
+	send  = DRM_MIN(avail, uio->uio_resid);
+
+	while (send) {
+		if (dev->buf_wp > dev->buf_rp) {
+			cur = DRM_MIN(send, dev->buf_wp - dev->buf_rp);
+		} else {
+			cur = DRM_MIN(send, dev->buf_end - dev->buf_rp);
+		}
+		error = uiomove(dev->buf_rp, cur, uio);
+		if (error)
+			break;
+		dev->buf_rp += cur;
+		if (dev->buf_rp == dev->buf_end) dev->buf_rp = dev->buf;
+		send -= cur;
+	}
+	
+	wakeup(&dev->buf_wp);
+
+	return error;
+}
+
+int drm_write_string(drm_device_t *dev, const char *s)
+{
+	int left   = (dev->buf_rp + DRM_BSZ - dev->buf_wp) % DRM_BSZ;
+	int send   = strlen(s);
+	int count;
+
+	DRM_DEBUG("%d left, %d to send (%p, %p)\n",
+		  left, send, dev->buf_rp, dev->buf_wp);
+	
+	if (left == 1 || dev->buf_wp != dev->buf_rp) {
+		DRM_ERROR("Buffer not empty (%d left, wp = %p, rp = %p)\n",
+			  left,
+			  dev->buf_wp,
+			  dev->buf_rp);
+	}
+
+	while (send) {
+		if (dev->buf_wp >= dev->buf_rp) {
+			count = DRM_MIN(send, dev->buf_end - dev->buf_wp);
+			if (count == left) --count; /* Leave a hole */
+		} else {
+			count = DRM_MIN(send, dev->buf_rp - dev->buf_wp - 1);
+		}
+		strncpy(dev->buf_wp, s, count);
+		dev->buf_wp += count;
+		if (dev->buf_wp == dev->buf_end) dev->buf_wp = dev->buf;
+		send -= count;
+	}
+
+	if (dev->buf_selecting) {
+		dev->buf_selecting = 0;
+		selwakeup(&dev->buf_sel);
+	}
+		
+	DRM_DEBUG("dev->buf_sigio=%p\n", dev->buf_sigio);
+	if (dev->buf_sigio) {
+		DRM_DEBUG("dev->buf_sigio->sio_pgid=%d\n", dev->buf_sigio->sio_pgid);
+		pgsigio(dev->buf_sigio, SIGIO, 0);
+	}
+
+	DRM_DEBUG("waking\n");
+	wakeup(&dev->buf_rp);
+	return 0;
+}
+
+int drm_poll(dev_t kdev, int events, struct proc *p)
+{
+	drm_device_t  *dev    = kdev->si_drv1;
+	int           s;
+	int	      revents = 0;
+
+	s = spldrm();
+	if (events & (POLLIN | POLLRDNORM)) {
+		int left  = (dev->buf_rp + DRM_BSZ - dev->buf_wp) % DRM_BSZ;
+		if (left > 0)
+			revents |= events & (POLLIN | POLLRDNORM);
+		else
+			selrecord(p, &dev->buf_sel);
+	}
+	splx(s);
+
+	return revents;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/init.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/init.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/init.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,100 @@
+/* init.c -- Setup/Cleanup for DRM -*- c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+MODULE_VERSION(drm, 1);
+
+int			      drm_flags		= 0;
+
+/* drm_parse_option parses a single option.  See description for
+   drm_parse_drm for details. */
+
+static void drm_parse_option(char *s)
+{
+	char *c, *r;
+	
+	DRM_DEBUG("\"%s\"\n", s);
+	if (!s || !*s) return;
+	for (c = s; *c && *c != ':'; c++); /* find : or \0 */
+	if (*c) r = c + 1; else r = NULL;  /* remember remainder */
+	*c = '\0';			   /* terminate */
+	if (!strcmp(s, "noctx")) {
+		drm_flags |= DRM_FLAG_NOCTX;
+		DRM_INFO("Server-mediated context switching OFF\n");
+		return;
+	}
+	if (!strcmp(s, "debug")) {
+		drm_flags |= DRM_FLAG_DEBUG;
+		DRM_INFO("Debug messages ON\n");
+		return;
+	}
+	DRM_ERROR("\"%s\" is not a valid option\n", s);
+	return;
+}
+
+/* drm_parse_options parse the insmod "drm=" options, or the command-line
+ * options passed to the kernel via LILO.  The grammar of the format is as
+ * follows:
+ *
+ * drm		::= 'drm=' option_list
+ * option_list	::= option [ ';' option_list ]
+ * option	::= 'device:' major
+ *		|   'debug' 
+ *		|   'noctx'
+ * major	::= INTEGER
+ *
+ * Note that 's' contains option_list without the 'drm=' part.
+ *
+ * device=major,minor specifies the device number used for /dev/drm
+ *	  if major == 0 then the misc device is used
+ *	  if major == 0 and minor == 0 then dynamic misc allocation is used
+ * debug=on specifies that debugging messages will be printk'd
+ * debug=trace specifies that each function call will be logged via printk
+ * debug=off turns off all debugging options
+ *
+ */
+
+void drm_parse_options(char *s)
+{
+	char *h, *t, *n;
+	
+	DRM_DEBUG("\"%s\"\n", s ?: "");
+	if (!s || !*s) return;
+
+	for (h = t = n = s; h && *h; h = n) {
+		for (; *t && *t != ';'; t++);	       /* find ; or \0 */
+		if (*t) n = t + 1; else n = NULL;      /* remember next */
+		*t = '\0';			       /* terminate */
+		drm_parse_option(h);		       /* parse */
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/ioctl.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/ioctl.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/ioctl.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,120 @@
+/* ioctl.c -- IOCTL processing for DRM -*- c -*-
+ * Created: Fri Jan  8 09:01:26 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include <sys/bus.h>
+#include <pci/pcivar.h>
+
+int
+drm_irq_busid(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_irq_busid_t id;
+	devclass_t pci;
+	device_t bus, dev;
+	device_t *kids;
+	int error, i, num_kids;
+
+	id = *(drm_irq_busid_t *) data;
+	pci = devclass_find("pci");
+	if (!pci)
+		return ENOENT;
+	bus = devclass_get_device(pci, id.busnum);
+	if (!bus)
+		return ENOENT;
+	error = device_get_children(bus, &kids, &num_kids);
+	if (error)
+		return error;
+
+	dev = 0;
+	for (i = 0; i < num_kids; i++) {
+		dev = kids[i];
+		if (pci_get_slot(dev) == id.devnum
+		    && pci_get_function(dev) == id.funcnum)
+			break;
+	}
+
+	free(kids, M_TEMP);
+
+	if (i != num_kids)
+		id.irq = pci_get_irq(dev);
+	else
+		id.irq = 0;
+
+	DRM_DEBUG("%d:%d:%d => IRQ %d\n",
+		  id.busnum, id.devnum, id.funcnum, id.irq);
+	*(drm_irq_busid_t *) data = id;
+
+	return 0;
+}
+
+int
+drm_getunique(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_unique_t	 u;
+	int		 error;
+
+	u = *(drm_unique_t *) data;
+	if (u.unique_len >= dev->unique_len) {
+		error = copyout(dev->unique, u.unique, dev->unique_len);
+		if (error)
+			return error;
+	}
+	u.unique_len = dev->unique_len;
+	*(drm_unique_t *) data = u;
+	return 0;
+}
+
+int
+drm_setunique(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_unique_t	 u;
+	int		 error;
+
+	if (dev->unique_len || dev->unique) return EBUSY;
+
+	u = *(drm_unique_t *) data;
+	
+	dev->unique_len = u.unique_len;
+	dev->unique	= drm_alloc(u.unique_len + 1, DRM_MEM_DRIVER);
+	error = copyin(u.unique, dev->unique, dev->unique_len);
+	if (error)
+		return error;
+	dev->unique[dev->unique_len] = '\0';
+
+	dev->devname = drm_alloc(strlen(dev->name) + strlen(dev->unique) + 2,
+				 DRM_MEM_DRIVER);
+	sprintf(dev->devname, "%s@%s", dev->name, dev->unique);
+
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/lists.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/lists.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/lists.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,258 @@
+/* lists.c -- Buffer list handling routines -*- c -*-
+ * Created: Mon Apr 19 20:54:22 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+int drm_waitlist_create(drm_waitlist_t *bl, int count)
+{
+	DRM_DEBUG("%d\n", count);
+	if (bl->count) return EINVAL;
+	
+	bl->count      = count;
+	bl->bufs       = drm_alloc((bl->count + 2) * sizeof(*bl->bufs),
+				   DRM_MEM_BUFLISTS);
+	bl->rp	       = bl->bufs;
+	bl->wp	       = bl->bufs;
+	bl->end	       = &bl->bufs[bl->count+1];
+	simple_lock_init(&bl->write_lock);
+	simple_lock_init(&bl->read_lock);
+	return 0;
+}
+
+int drm_waitlist_destroy(drm_waitlist_t *bl)
+{
+	DRM_DEBUG("\n");
+	if (bl->rp != bl->wp) return EINVAL;
+	if (bl->bufs) drm_free(bl->bufs,
+			       (bl->count + 2) * sizeof(*bl->bufs),
+			       DRM_MEM_BUFLISTS);
+	bl->count = 0;
+	bl->bufs  = NULL;
+	bl->rp	  = NULL;
+	bl->wp	  = NULL;
+	bl->end	  = NULL;
+	return 0;
+}
+
+int drm_waitlist_put(drm_waitlist_t *bl, drm_buf_t *buf)
+{							
+	int	      left;
+	int	      s;
+
+	left = DRM_LEFTCOUNT(bl);
+	DRM_DEBUG("put %d (%d left, rp = %p, wp = %p)\n",
+		  buf->idx, left, bl->rp, bl->wp);
+	if (!left) {
+		DRM_ERROR("Overflow while adding buffer %d from pid %d\n",
+			  buf->idx, buf->pid);
+		return EINVAL;
+	}
+#if DRM_DMA_HISTOGRAM
+	getnanotime(&buf->time_queued);
+#endif
+	buf->list	 = DRM_LIST_WAIT;
+	
+	simple_lock(&bl->write_lock);
+	s = spldrm();
+	*bl->wp = buf;
+	if (++bl->wp >= bl->end) bl->wp = bl->bufs;
+	splx(s);
+	simple_unlock(&bl->write_lock);
+	
+	return 0;
+}
+
+drm_buf_t *drm_waitlist_get(drm_waitlist_t *bl)
+{
+	drm_buf_t     *buf;
+	int	       s;
+
+	simple_lock(&bl->read_lock);
+	s = spldrm();
+	buf = *bl->rp;
+	if (bl->rp == bl->wp) {
+		splx(s);
+		simple_unlock(&bl->read_lock);
+		return NULL;
+	}				     
+	if (++bl->rp >= bl->end) bl->rp = bl->bufs;
+	splx(s);
+	simple_unlock(&bl->read_lock);
+	
+	DRM_DEBUG("get %d\n", buf->idx);
+	return buf;
+}
+
+int drm_freelist_create(drm_freelist_t *bl, int count)
+{
+	DRM_DEBUG("\n");
+	atomic_set(&bl->count, 0);
+	bl->next      = NULL;
+	bl->waiting   = 0;
+	bl->low_mark  = 0;
+	bl->high_mark = 0;
+	atomic_set(&bl->wfh,   0);
+	++bl->initialized;
+	return 0;
+}
+
+int drm_freelist_destroy(drm_freelist_t *bl)
+{
+	DRM_DEBUG("\n");
+	atomic_set(&bl->count, 0);
+	bl->next = NULL;
+	return 0;
+}
+
+int drm_freelist_put(drm_device_t *dev, drm_freelist_t *bl, drm_buf_t *buf)
+{
+	unsigned int	 old;
+	unsigned int	 new;
+	char		 failed;
+	int		 count = 0;
+	drm_device_dma_t *dma = dev->dma;
+
+	if (!dma) {
+		DRM_ERROR("No DMA support\n");
+		return 1;
+	}
+
+	if (buf->waiting || buf->pending || buf->list == DRM_LIST_FREE) {
+		DRM_ERROR("Freed buffer %d: w%d, p%d, l%d\n",
+			  buf->idx, buf->waiting, buf->pending, buf->list);
+	}
+	DRM_DEBUG("%d, count = %d, wfh = %d, w%d, p%d\n",
+		  buf->idx, atomic_read(&bl->count), atomic_read(&bl->wfh),
+		  buf->waiting, buf->pending);
+	if (!bl) return 1;
+#if DRM_DMA_HISTOGRAM
+	getnanotime(&buf->time_freed);
+	drm_histogram_compute(dev, buf);
+#endif
+	buf->list	= DRM_LIST_FREE;
+	do {
+		old	  = (unsigned long)bl->next;
+		buf->next = (void *)old;
+		new	  = (unsigned long)buf;
+		_DRM_CAS(&bl->next, old, new, failed);
+		if (++count > DRM_LOOPING_LIMIT) {
+			DRM_ERROR("Looping\n");
+			return 1;
+		}
+	} while (failed);
+	atomic_inc(&bl->count);
+	if (atomic_read(&bl->count) > dma->buf_count) {
+		DRM_ERROR("%d of %d buffers free after addition of %d\n",
+			  atomic_read(&bl->count), dma->buf_count, buf->idx);
+		return 1;
+	}
+				/* Check for high water mark */
+	if (atomic_read(&bl->wfh) && atomic_read(&bl->count)>=bl->high_mark) {
+		atomic_set(&bl->wfh, 0);
+		if (bl->waiting)
+			wakeup(&bl->waiting);
+	}
+	return 0;
+}
+
+static drm_buf_t *drm_freelist_try(drm_freelist_t *bl)
+{
+	unsigned int	  old;
+	unsigned int	  new;
+	char		  failed;
+	drm_buf_t	  *buf;
+	int		  count = 0;
+
+	if (!bl) return NULL;
+	
+				/* Get buffer */
+	do {
+		old = (unsigned int)bl->next;
+		if (!old) {
+			return NULL;
+		}
+		new = (unsigned long)bl->next->next;
+		_DRM_CAS(&bl->next, old, new, failed);
+		if (++count > DRM_LOOPING_LIMIT) {
+			DRM_ERROR("Looping\n");
+			return NULL;
+		}
+	} while (failed);
+	atomic_dec(&bl->count);
+	
+	buf	  = (drm_buf_t *)old;
+	buf->next = NULL;
+	buf->list = DRM_LIST_NONE;
+	DRM_DEBUG("%d, count = %d, wfh = %d, w%d, p%d\n",
+		  buf->idx, atomic_read(&bl->count), atomic_read(&bl->wfh),
+		  buf->waiting, buf->pending);
+	if (buf->waiting || buf->pending) {
+		DRM_ERROR("Free buffer %d: w%d, p%d, l%d\n",
+			  buf->idx, buf->waiting, buf->pending, buf->list);
+	}
+	
+	return buf;
+}
+
+drm_buf_t *drm_freelist_get(drm_freelist_t *bl, int block)
+{
+	drm_buf_t	  *buf	= NULL;
+	int		   error;
+
+	if (!bl || !bl->initialized) return NULL;
+	
+				/* Check for low water mark */
+	if (atomic_read(&bl->count) <= bl->low_mark) /* Became low */
+		atomic_set(&bl->wfh, 1);
+	if (atomic_read(&bl->wfh)) {
+		DRM_DEBUG("Block = %d, count = %d, wfh = %d\n",
+			  block, atomic_read(&bl->count),
+			  atomic_read(&bl->wfh));
+		if (block) {
+			atomic_inc(&bl->waiting);
+			for (;;) {
+				if (!atomic_read(&bl->wfh)
+				    && (buf = drm_freelist_try(bl))) break;
+				error = tsleep(&bl->waiting, PZERO|PCATCH,
+					       "drmfg", 0);
+				if (error)
+					break;
+			}
+			atomic_dec(&bl->waiting);
+		}
+		return buf;
+	}
+		
+	DRM_DEBUG("Count = %d, wfh = %d\n",
+		  atomic_read(&bl->count), atomic_read(&bl->wfh));
+	return drm_freelist_try(bl);
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/lock.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/lock.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/lock.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,220 @@
+/* lock.c -- IOCTLs for locking -*- c -*-
+ * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+int
+drm_block(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	DRM_DEBUG("\n");
+	return 0;
+}
+
+int
+drm_unblock(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	DRM_DEBUG("\n");
+	return 0;
+}
+
+int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context)
+{
+	unsigned int old;
+	unsigned int new;
+	char	     failed;
+
+	DRM_DEBUG("%d attempts\n", context);
+	do {
+		old = *lock;
+		if (old & _DRM_LOCK_HELD) new = old | _DRM_LOCK_CONT;
+		else			  new = context | _DRM_LOCK_HELD;
+		_DRM_CAS(lock, old, new, failed);
+	} while (failed);
+	if (_DRM_LOCKING_CONTEXT(old) == context) {
+		if (old & _DRM_LOCK_HELD) {
+			if (context != DRM_KERNEL_CONTEXT) {
+				DRM_ERROR("%d holds heavyweight lock\n",
+					  context);
+			}
+			return 0;
+		}
+	}
+	if (new == (context | _DRM_LOCK_HELD)) {
+				/* Have lock */
+		DRM_DEBUG("%d\n", context);
+		return 1;
+	}
+	DRM_DEBUG("%d unable to get lock held by %d\n",
+		  context, _DRM_LOCKING_CONTEXT(old));
+	return 0;
+}
+
+/* This takes a lock forcibly and hands it to context.	Should ONLY be used
+   inside *_unlock to give lock to kernel before calling *_dma_schedule. */
+int drm_lock_transfer(drm_device_t *dev,
+		      __volatile__ unsigned int *lock, unsigned int context)
+{
+	unsigned int old;
+	unsigned int new;
+	char	     failed;
+
+	dev->lock.pid = 0;
+	do {
+		old = *lock;
+		new = context | _DRM_LOCK_HELD;
+		_DRM_CAS(lock, old, new, failed);
+	} while (failed);
+	DRM_DEBUG("%d => %d\n", _DRM_LOCKING_CONTEXT(old), context);
+	return 1;
+}
+
+int drm_lock_free(drm_device_t *dev,
+		  __volatile__ unsigned int *lock, unsigned int context)
+{
+	unsigned int old;
+	unsigned int new;
+	char	     failed;
+	pid_t        pid = dev->lock.pid;
+
+	DRM_DEBUG("%d\n", context);
+	dev->lock.pid = 0;
+	do {
+		old = *lock;
+		new = 0;
+		_DRM_CAS(lock, old, new, failed);
+	} while (failed);
+	if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) != context) {
+		DRM_ERROR("%d freed heavyweight lock held by %d (pid %d)\n",
+			  context,
+			  _DRM_LOCKING_CONTEXT(old),
+			  pid);
+		return 1;
+	}
+	wakeup(&dev->lock.lock_queue);
+	return 0;
+}
+
+static int drm_flush_queue(drm_device_t *dev, int context)
+{
+	int		  ret	= 0;
+	int		  error;
+	drm_queue_t	  *q	= dev->queuelist[context];
+	
+	DRM_DEBUG("\n");
+	
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) > 1) {
+		atomic_inc(&q->block_write);
+		atomic_inc(&q->block_count);
+		error = tsleep(&q->flush_queue, PCATCH|PZERO, "drmfq", 0);
+		if (error)
+			return error;
+		atomic_dec(&q->block_count);
+	}
+	atomic_dec(&q->use_count);
+	atomic_inc(&q->total_flushed);
+		
+				/* NOTE: block_write is still incremented!
+				   Use drm_flush_unlock_queue to decrement. */
+	return ret;
+}
+
+static int drm_flush_unblock_queue(drm_device_t *dev, int context)
+{
+	drm_queue_t	  *q	= dev->queuelist[context];
+	
+	DRM_DEBUG("\n");
+	
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) > 1) {
+		if (atomic_read(&q->block_write)) {
+			atomic_dec(&q->block_write);
+			wakeup(&q->write_queue);
+		}
+	}
+	atomic_dec(&q->use_count);
+	return 0;
+}
+
+int drm_flush_block_and_flush(drm_device_t *dev, int context,
+			      drm_lock_flags_t flags)
+{
+	int ret = 0;
+	int i;
+	
+	DRM_DEBUG("\n");
+	
+	if (flags & _DRM_LOCK_FLUSH) {
+		ret = drm_flush_queue(dev, DRM_KERNEL_CONTEXT);
+		if (!ret) ret = drm_flush_queue(dev, context);
+	}
+	if (flags & _DRM_LOCK_FLUSH_ALL) {
+		for (i = 0; !ret && i < dev->queue_count; i++) {
+			ret = drm_flush_queue(dev, i);
+		}
+	}
+	return ret;
+}
+
+int drm_flush_unblock(drm_device_t *dev, int context, drm_lock_flags_t flags)
+{
+	int ret = 0;
+	int i;
+	
+	DRM_DEBUG("\n");
+	
+	if (flags & _DRM_LOCK_FLUSH) {
+		ret = drm_flush_unblock_queue(dev, DRM_KERNEL_CONTEXT);
+		if (!ret) ret = drm_flush_unblock_queue(dev, context);
+	}
+	if (flags & _DRM_LOCK_FLUSH_ALL) {
+		for (i = 0; !ret && i < dev->queue_count; i++) {
+			ret = drm_flush_unblock_queue(dev, i);
+		}
+	}
+		
+	return ret;
+}
+
+int drm_finish(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	  *dev	  = kdev->si_drv1;
+	int		  ret	  = 0;
+	drm_lock_t	  lock;
+
+	DRM_DEBUG("\n");
+
+	lock = *(drm_lock_t *) data;
+	ret = drm_flush_block_and_flush(dev, lock.context, lock.flags);
+	drm_flush_unblock(dev, lock.context, lock.flags);
+	return ret;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/memory.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/memory.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/memory.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,458 @@
+/* memory.c -- Memory management wrappers for DRM -*- c -*-
+ * Created: Thu Feb  4 14:00:34 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#ifdef DRM_AGP
+#include <sys/agpio.h>
+#endif
+
+MALLOC_DEFINE(M_DRM, "drm", "DRM Data Structures");
+
+typedef struct drm_mem_stats {
+	const char	  *name;
+	int		  succeed_count;
+	int		  free_count;
+	int		  fail_count;
+	unsigned long	  bytes_allocated;
+	unsigned long	  bytes_freed;
+} drm_mem_stats_t;
+
+#ifdef SMP
+static struct simplelock  drm_mem_lock;
+#endif
+static unsigned long	  drm_ram_available = 0;
+static unsigned long	  drm_ram_used	    = 0;
+static drm_mem_stats_t	  drm_mem_stats[]   = {
+	[DRM_MEM_DMA]	    = { "dmabufs"  },
+	[DRM_MEM_SAREA]	    = { "sareas"   },
+	[DRM_MEM_DRIVER]    = { "driver"   },
+	[DRM_MEM_MAGIC]	    = { "magic"	   },
+	[DRM_MEM_IOCTLS]    = { "ioctltab" },
+	[DRM_MEM_MAPS]	    = { "maplist"  },
+	[DRM_MEM_VMAS]	    = { "vmalist"  },
+	[DRM_MEM_BUFS]	    = { "buflist"  },
+	[DRM_MEM_SEGS]	    = { "seglist"  },
+	[DRM_MEM_PAGES]	    = { "pagelist" },
+	[DRM_MEM_FILES]	    = { "files"	   },
+	[DRM_MEM_QUEUES]    = { "queues"   },
+	[DRM_MEM_CMDS]	    = { "commands" },
+	[DRM_MEM_MAPPINGS]  = { "mappings" },
+	[DRM_MEM_BUFLISTS]  = { "buflists" },
+	[DRM_MEM_AGPLISTS]  = { "agplist"  },
+	[DRM_MEM_TOTALAGP]  = { "totalagp" },
+	[DRM_MEM_BOUNDAGP]  = { "boundagp" },
+	[DRM_MEM_CTXBITMAP] = { "ctxbitmap"},
+	{ NULL, 0, }		/* Last entry must be null */
+};
+
+void drm_mem_init(void)
+{
+	drm_mem_stats_t *mem;
+	
+	for (mem = drm_mem_stats; mem->name; ++mem) {
+		mem->succeed_count   = 0;
+		mem->free_count	     = 0;
+		mem->fail_count	     = 0;
+		mem->bytes_allocated = 0;
+		mem->bytes_freed     = 0;
+	}
+	
+	drm_ram_available = 0; /* si.totalram; */
+	drm_ram_used	  = 0;
+}
+
+/* drm_mem_info is called whenever a process reads /dev/drm/mem. */
+
+static int _drm_mem_info SYSCTL_HANDLER_ARGS
+{
+	drm_mem_stats_t *pt;
+	char buf[128];
+	int error;
+
+	DRM_SYSCTL_PRINT("		  total counts			"
+		       " |    outstanding  \n");
+	DRM_SYSCTL_PRINT("type	   alloc freed fail	bytes	   freed"
+		       " | allocs      bytes\n\n");
+	DRM_SYSCTL_PRINT("%-9.9s %5d %5d %4d %10lu	    |\n",
+		       "system", 0, 0, 0, drm_ram_available);
+	DRM_SYSCTL_PRINT("%-9.9s %5d %5d %4d %10lu	    |\n",
+		       "locked", 0, 0, 0, drm_ram_used);
+	DRM_SYSCTL_PRINT("\n");
+	for (pt = drm_mem_stats; pt->name; pt++) {
+		DRM_SYSCTL_PRINT("%-9.9s %5d %5d %4d %10lu %10lu | %6d %10ld\n",
+			       pt->name,
+			       pt->succeed_count,
+			       pt->free_count,
+			       pt->fail_count,
+			       pt->bytes_allocated,
+			       pt->bytes_freed,
+			       pt->succeed_count - pt->free_count,
+			       (long)pt->bytes_allocated
+			       - (long)pt->bytes_freed);
+	}
+	SYSCTL_OUT(req, "", 1);
+	
+	return 0;
+}
+
+int drm_mem_info SYSCTL_HANDLER_ARGS
+{
+	int ret;
+	
+	simple_lock(&drm_mem_lock);
+	ret = _drm_mem_info(oidp, arg1, arg2, req);
+	simple_unlock(&drm_mem_lock);
+	return ret;
+}
+
+void *drm_alloc(size_t size, int area)
+{
+	void *pt;
+	
+	if (!size) {
+		DRM_MEM_ERROR(area, "Allocating 0 bytes\n");
+		return NULL;
+	}
+	
+	if (!(pt = malloc(size, M_DRM, M_NOWAIT))) {
+		simple_lock(&drm_mem_lock);
+		++drm_mem_stats[area].fail_count;
+		simple_unlock(&drm_mem_lock);
+		return NULL;
+	}
+	simple_lock(&drm_mem_lock);
+	++drm_mem_stats[area].succeed_count;
+	drm_mem_stats[area].bytes_allocated += size;
+	simple_unlock(&drm_mem_lock);
+	return pt;
+}
+
+void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area)
+{
+	void *pt;
+	
+	if (!(pt = drm_alloc(size, area))) return NULL;
+	if (oldpt && oldsize) {
+		memcpy(pt, oldpt, oldsize);
+		drm_free(oldpt, oldsize, area);
+	}
+	return pt;
+}
+
+char *drm_strdup(const char *s, int area)
+{
+	char *pt;
+	int	 length = s ? strlen(s) : 0;
+	
+	if (!(pt = drm_alloc(length+1, area))) return NULL;
+	strcpy(pt, s);
+	return pt;
+}
+
+void drm_strfree(char *s, int area)
+{
+	unsigned int size;
+	
+	if (!s) return;
+	
+	size = 1 + (s ? strlen(s) : 0);
+	drm_free((void *)s, size, area);
+}
+
+void drm_free(void *pt, size_t size, int area)
+{
+	int alloc_count;
+	int free_count;
+	
+	if (!pt) DRM_MEM_ERROR(area, "Attempt to free NULL pointer\n");
+	else	 free(pt, M_DRM);
+	simple_lock(&drm_mem_lock);
+	drm_mem_stats[area].bytes_freed += size;
+	free_count  = ++drm_mem_stats[area].free_count;
+	alloc_count =	drm_mem_stats[area].succeed_count;
+	simple_unlock(&drm_mem_lock);
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(area, "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+}
+
+unsigned long drm_alloc_pages(int order, int area)
+{
+	vm_offset_t address;
+	unsigned long bytes	  = PAGE_SIZE << order;
+	unsigned long addr;
+	unsigned int  sz;
+	
+	simple_lock(&drm_mem_lock);
+	if (drm_ram_used > +(DRM_RAM_PERCENT * drm_ram_available) / 100) {
+		simple_unlock(&drm_mem_lock);
+		return 0;
+	}
+	simple_unlock(&drm_mem_lock);
+	
+	address = (vm_offset_t) contigmalloc(1<<order, M_DRM, M_WAITOK, 0, ~0, 1, 0);
+	if (!address) {
+		simple_lock(&drm_mem_lock);
+		++drm_mem_stats[area].fail_count;
+		simple_unlock(&drm_mem_lock);
+		return 0;
+	}
+	simple_lock(&drm_mem_lock);
+	++drm_mem_stats[area].succeed_count;
+	drm_mem_stats[area].bytes_allocated += bytes;
+	drm_ram_used		            += bytes;
+	simple_unlock(&drm_mem_lock);
+	
+	
+				/* Zero outside the lock */
+	memset((void *)address, 0, bytes);
+	
+				/* Reserve */
+	for (addr = address, sz = bytes;
+	     sz > 0;
+	     addr += PAGE_SIZE, sz -= PAGE_SIZE) {
+		/* mem_map_reserve(MAP_NR(addr));*/
+	}
+	
+	return address;
+}
+
+void drm_free_pages(unsigned long address, int order, int area)
+{
+	unsigned long bytes = PAGE_SIZE << order;
+	int		  alloc_count;
+	int		  free_count;
+	unsigned long addr;
+	unsigned int  sz;
+	
+	if (!address) {
+		DRM_MEM_ERROR(area, "Attempt to free address 0\n");
+	} else {
+				/* Unreserve */
+		for (addr = address, sz = bytes;
+		     sz > 0;
+		     addr += PAGE_SIZE, sz -= PAGE_SIZE) {
+			/* mem_map_unreserve(MAP_NR(addr));*/
+		}
+		contigfree((void *) address, bytes, M_DRM);
+	}
+	
+	simple_lock(&drm_mem_lock);
+	free_count  = ++drm_mem_stats[area].free_count;
+	alloc_count =	drm_mem_stats[area].succeed_count;
+	drm_mem_stats[area].bytes_freed += bytes;
+	drm_ram_used			-= bytes;
+	simple_unlock(&drm_mem_lock);
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(area,
+			      "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+}
+
+void *drm_ioremap(unsigned long offset, unsigned long size)
+{
+	void *pt;
+	
+	if (!size) {
+		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
+			      "Mapping 0 bytes at 0x%08lx\n", offset);
+		return NULL;
+	}
+	
+	if (!(pt = pmap_mapdev(offset, size))) {
+		simple_lock(&drm_mem_lock);
+		++drm_mem_stats[DRM_MEM_MAPPINGS].fail_count;
+		simple_unlock(&drm_mem_lock);
+		return NULL;
+	}
+	simple_lock(&drm_mem_lock);
+	++drm_mem_stats[DRM_MEM_MAPPINGS].succeed_count;
+	drm_mem_stats[DRM_MEM_MAPPINGS].bytes_allocated += size;
+	simple_unlock(&drm_mem_lock);
+	return pt;
+}
+
+void drm_ioremapfree(void *pt, unsigned long size)
+{
+	int alloc_count;
+	int free_count;
+	
+	if (!pt)
+		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
+			      "Attempt to free NULL pointer\n");
+	else
+		pmap_unmapdev((vm_offset_t) pt, size);
+	
+	simple_lock(&drm_mem_lock);
+	drm_mem_stats[DRM_MEM_MAPPINGS].bytes_freed += size;
+	free_count  = ++drm_mem_stats[DRM_MEM_MAPPINGS].free_count;
+	alloc_count =	drm_mem_stats[DRM_MEM_MAPPINGS].succeed_count;
+	simple_unlock(&drm_mem_lock);
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
+			      "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+}
+
+#ifdef DRM_AGP
+void *drm_alloc_agp(int pages, u_int32_t type)
+{
+	device_t dev = agp_find_device();
+	void *handle;
+
+	if (!dev)
+		return NULL;
+
+	if (!pages) {
+		DRM_MEM_ERROR(DRM_MEM_TOTALAGP, "Allocating 0 pages\n");
+		return NULL;
+	}
+	
+	if ((handle = agp_alloc_memory(dev, type, pages << AGP_PAGE_SHIFT))) {
+		simple_lock(&drm_mem_lock);
+		++drm_mem_stats[DRM_MEM_TOTALAGP].succeed_count;
+		drm_mem_stats[DRM_MEM_TOTALAGP].bytes_allocated
+			+= pages << PAGE_SHIFT;
+		simple_unlock(&drm_mem_lock);
+		return handle;
+	}
+	simple_lock(&drm_mem_lock);
+	++drm_mem_stats[DRM_MEM_TOTALAGP].fail_count;
+	simple_unlock(&drm_mem_lock);
+	return NULL;
+}
+
+int drm_free_agp(void *handle, int pages)
+{
+	device_t dev = agp_find_device();
+	int           alloc_count;
+	int           free_count;
+	int           retval = EINVAL;
+
+	if (!dev)
+		return EINVAL;
+
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
+			      "Attempt to free NULL AGP handle\n");
+		return retval;
+	}
+	
+	agp_free_memory(dev, handle);
+	simple_lock(&drm_mem_lock);
+	free_count  = ++drm_mem_stats[DRM_MEM_TOTALAGP].free_count;
+	alloc_count =   drm_mem_stats[DRM_MEM_TOTALAGP].succeed_count;
+	drm_mem_stats[DRM_MEM_TOTALAGP].bytes_freed
+		+= pages << PAGE_SHIFT;
+	simple_unlock(&drm_mem_lock);
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
+			      "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+	return 0;
+}
+
+int drm_bind_agp(void *handle, unsigned int start)
+{
+	device_t dev = agp_find_device();
+	int retcode  = EINVAL;
+	struct agp_memory_info info;
+
+	DRM_DEBUG("drm_bind_agp called\n");
+
+	if (!dev)
+		return EINVAL;
+
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+			      "Attempt to bind NULL AGP handle\n");
+		return retcode;
+	}
+
+	if (!(retcode = agp_bind_memory(dev, handle,
+					start << AGP_PAGE_SHIFT))) {
+		simple_lock(&drm_mem_lock);
+		++drm_mem_stats[DRM_MEM_BOUNDAGP].succeed_count;
+		agp_memory_info(dev, handle, &info);
+		drm_mem_stats[DRM_MEM_BOUNDAGP].bytes_allocated
+			+= info.ami_size;
+		simple_unlock(&drm_mem_lock);
+		DRM_DEBUG("drm_agp.bind_memory: retcode %d\n", retcode);
+		return retcode;
+	}
+	simple_lock(&drm_mem_lock);
+	++drm_mem_stats[DRM_MEM_BOUNDAGP].fail_count;
+	simple_unlock(&drm_mem_lock);
+	return retcode;
+}
+
+int drm_unbind_agp(void *handle)
+{
+	device_t dev = agp_find_device();
+	int alloc_count;
+	int free_count;
+	int retcode = EINVAL;
+	struct agp_memory_info info;
+	
+	if (!dev)
+		return EINVAL;
+
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+			      "Attempt to unbind NULL AGP handle\n");
+		return retcode;
+	}
+
+	
+	agp_memory_info(dev, handle, &info);
+	if ((retcode = agp_unbind_memory(dev, handle)))
+		return retcode;
+	simple_lock(&drm_mem_lock);
+	free_count  = ++drm_mem_stats[DRM_MEM_BOUNDAGP].free_count;
+	alloc_count = drm_mem_stats[DRM_MEM_BOUNDAGP].succeed_count;
+	drm_mem_stats[DRM_MEM_BOUNDAGP].bytes_freed += info.ami_size;
+	simple_unlock(&drm_mem_lock);
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+			      "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+	return retcode;
+}
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/proc.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/proc.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/proc.c	Fri Jun 16 17:03:30 2000
@@ -0,0 +1,568 @@
+/* proc.c -- /proc support for DRM -*- c -*-
+ * Created: Mon Jan 11 09:48:47 1999 by faith@precisioninsight.com
+ * Revised: Fri Aug 20 11:31:48 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c,v 1.4 1999/08/20 15:36:46 faith Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/proc.c,v 1.1 2000/06/17 00:03:30 martin Exp $
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+static struct proc_dir_entry *drm_root	   = NULL;
+static struct proc_dir_entry *drm_dev_root = NULL;
+static char		     drm_slot_name[64];
+
+static int	   drm_name_info(char *buf, char **start, off_t offset,
+				 int len, int *eof, void *data);
+static int	   drm_vm_info(char *buf, char **start, off_t offset,
+			       int len, int *eof, void *data);
+static int	   drm_clients_info(char *buf, char **start, off_t offset,
+				    int len, int *eof, void *data);
+static int	   drm_queues_info(char *buf, char **start, off_t offset,
+				   int len, int *eof, void *data);
+static int	   drm_bufs_info(char *buf, char **start, off_t offset,
+				 int len, int *eof, void *data);
+#if DRM_DEBUG_CODE
+static int	   drm_vma_info(char *buf, char **start, off_t offset,
+				int len, int *eof, void *data);
+#endif
+#if DRM_DMA_HISTOGRAM
+static int	   drm_histo_info(char *buf, char **start, off_t offset,
+				  int len, int *eof, void *data);
+#endif
+
+struct drm_proc_list {
+	const char *name;
+	int	   (*f)(char *, char **, off_t, int, int *, void *);
+} drm_proc_list[] = {
+	{ "name",    drm_name_info    },
+	{ "mem",     drm_mem_info     },
+	{ "vm",	     drm_vm_info      },
+	{ "clients", drm_clients_info },
+	{ "queues",  drm_queues_info  },
+	{ "bufs",    drm_bufs_info    },
+#if DRM_DEBUG_CODE
+	{ "vma",     drm_vma_info     },
+#endif
+#if DRM_DMA_HISTOGRAM
+	{ "histo",   drm_histo_info   },
+#endif
+};
+#define DRM_PROC_ENTRIES (sizeof(drm_proc_list)/sizeof(drm_proc_list[0]))
+
+int drm_proc_init(drm_device_t *dev)
+{
+	struct proc_dir_entry *ent;
+	int		      i, j;
+
+	drm_root = create_proc_entry("graphics", S_IFDIR, NULL);
+	if (!drm_root) {
+		DRM_ERROR("Cannot create /proc/graphics\n");
+		return -1;
+	}
+
+				/* Instead of doing this search, we should
+				   add some global support for /proc/graphics. */
+	for (i = 0; i < 8; i++) {
+		sprintf(drm_slot_name, "graphics/%d", i);
+		drm_dev_root = create_proc_entry(drm_slot_name, S_IFDIR, NULL);
+		if (!drm_dev_root) {
+			DRM_ERROR("Cannot create /proc/%s\n", drm_slot_name);
+			remove_proc_entry("graphics", NULL);
+		}
+		if (drm_dev_root->nlink == 2) break;
+		drm_dev_root = NULL;
+	}
+	if (!drm_dev_root) {
+		DRM_ERROR("Cannot find slot in /proc/graphics\n");
+		return -1;
+	}
+
+	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
+		ent = create_proc_entry(drm_proc_list[i].name,
+					S_IFREG|S_IRUGO, drm_dev_root);
+		if (!ent) {
+			DRM_ERROR("Cannot create /proc/%s/%s\n",
+				  drm_slot_name, drm_proc_list[i].name);
+			for (j = 0; j < i; j++)
+				remove_proc_entry(drm_proc_list[i].name,
+						  drm_dev_root);
+			remove_proc_entry(drm_slot_name, NULL);
+			remove_proc_entry("graphics", NULL);
+			return -1;
+		}
+		ent->read_proc = drm_proc_list[i].f;
+		ent->data      = dev;
+	}
+
+	return 0;
+}
+
+
+int drm_proc_cleanup(void)
+{
+	int i;
+	
+	if (drm_root) {
+		if (drm_dev_root) {
+			for (i = 0; i < DRM_PROC_ENTRIES; i++) {
+				remove_proc_entry(drm_proc_list[i].name,
+						  drm_dev_root);
+			}
+			remove_proc_entry(drm_slot_name, NULL);
+		}
+		remove_proc_entry("graphics", NULL);
+		remove_proc_entry(DRM_NAME, NULL);
+	}
+	drm_root = drm_dev_root = NULL;
+	return 0;
+}
+
+static int drm_name_info(char *buf, char **start, off_t offset, int len,
+			 int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+
+	if (offset > 0) return 0; /* no partial requests */
+	len  = 0;
+	*eof = 1;
+
+	if (dev->unique) {
+		DRM_PROC_PRINT("%s 0x%x %s\n",
+			       dev->name, dev->device, dev->unique);
+	} else {
+		DRM_PROC_PRINT("%s 0x%x\n", dev->name, dev->device);
+	}
+	return len;
+}
+
+static int _drm_vm_info(char *buf, char **start, off_t offset, int len,
+			int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	drm_map_t    *map;
+	const char   *types[] = { "FB", "REG", "SHM" };
+	const char   *type;
+	int	     i;
+
+	if (offset > 0) return 0; /* no partial requests */
+	len  = 0;
+	*eof = 1;
+	DRM_PROC_PRINT("slot	 offset	      size type flags	 "
+		       "address mtrr\n\n");
+	for (i = 0; i < dev->map_count; i++) {
+		map = dev->maplist[i];
+		if (map->type < 0 || map->type > 2) type = "??";
+		else				    type = types[map->type];
+		DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
+			       i,
+			       map->offset,
+			       map->size,
+			       type,
+			       map->flags,
+			       (unsigned long)map->handle);
+		if (map->mtrr < 0) {
+			DRM_PROC_PRINT("none\n");
+		} else {
+			DRM_PROC_PRINT("%4d\n", map->mtrr);
+		}
+	}
+
+	return len;
+}
+
+static int drm_vm_info(char *buf, char **start, off_t offset, int len,
+		       int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = _drm_vm_info(buf, start, offset, len, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+
+
+static int _drm_queues_info(char *buf, char **start, off_t offset, int len,
+			    int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     i;
+	drm_queue_t  *q;
+
+	if (offset > 0) return 0; /* no partial requests */
+	len  = 0;
+	*eof = 1;
+	DRM_PROC_PRINT("  ctx/flags   use   fin"
+		       "   blk/rw/rwf  wait    flushed	   queued"
+		       "      locks\n\n");
+	for (i = 0; i < dev->queue_count; i++) {
+		q = dev->queuelist[i];
+		atomic_inc(&q->use_count);
+		DRM_PROC_PRINT_RET(atomic_dec(&q->use_count),
+				   "%5d/0x%03x %5d %5d"
+				   " %5d/%c%c/%c%c%c %5d %10d %10d %10d\n",
+				   i,
+				   q->flags,
+				   atomic_read(&q->use_count),
+				   atomic_read(&q->finalization),
+				   atomic_read(&q->block_count),
+				   atomic_read(&q->block_read) ? 'r' : '-',
+				   atomic_read(&q->block_write) ? 'w' : '-',
+				   waitqueue_active(&q->read_queue) ? 'r':'-',
+				   waitqueue_active(&q->write_queue) ? 'w':'-',
+				   waitqueue_active(&q->flush_queue) ? 'f':'-',
+				   DRM_BUFCOUNT(&q->waitlist),
+				   atomic_read(&q->total_flushed),
+				   atomic_read(&q->total_queued),
+				   atomic_read(&q->total_locks));
+		atomic_dec(&q->use_count);
+	}
+	
+	return len;
+}
+
+static int drm_queues_info(char *buf, char **start, off_t offset, int len,
+			   int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = _drm_queues_info(buf, start, offset, len, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+
+/* drm_bufs_info is called whenever a process reads
+   /dev/drm/<dev>/bufs. */
+
+static int _drm_bufs_info(char *buf, char **start, off_t offset, int len,
+			  int *eof, void *data)
+{
+	drm_device_t	 *dev = (drm_device_t *)data;
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma)	return 0;
+	if (offset > 0) return 0; /* no partial requests */
+	len  = 0;
+	*eof = 1;
+	DRM_PROC_PRINT(" o     size count  free	 segs pages    kB\n\n");
+	for (i = 0; i <= DRM_MAX_ORDER; i++) {
+		if (dma->bufs[i].buf_count)
+			DRM_PROC_PRINT("%2d %8d %5d %5d %5d %5d %5ld\n",
+				       i,
+				       dma->bufs[i].buf_size,
+				       dma->bufs[i].buf_count,
+				       atomic_read(&dma->bufs[i]
+						   .freelist.count),
+				       dma->bufs[i].seg_count,
+				       dma->bufs[i].seg_count
+				       *(1 << dma->bufs[i].page_order),
+				       (dma->bufs[i].seg_count
+					* (1 << dma->bufs[i].page_order))
+				       * PAGE_SIZE / 1024);
+	}
+	DRM_PROC_PRINT("\n");
+	for (i = 0; i < dma->buf_count; i++) {
+		if (i && !(i%32)) DRM_PROC_PRINT("\n");
+		DRM_PROC_PRINT(" %d", dma->buflist[i]->list);
+	}
+	DRM_PROC_PRINT("\n");
+
+	return len;
+}
+
+static int drm_bufs_info(char *buf, char **start, off_t offset, int len,
+			 int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = _drm_bufs_info(buf, start, offset, len, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+
+
+static int _drm_clients_info(char *buf, char **start, off_t offset, int len,
+			     int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	drm_file_t   *priv;
+
+	if (offset > 0) return 0; /* no partial requests */
+	len  = 0;
+	*eof = 1;
+	DRM_PROC_PRINT("a dev	pid    uid	magic	  ioctls\n\n");
+	for (priv = dev->file_first; priv; priv = priv->next) {
+		DRM_PROC_PRINT("%c %3d %5d %5d %10u %10lu\n",
+			       priv->authenticated ? 'y' : 'n',
+			       priv->minor,
+			       priv->pid,
+			       priv->uid,
+			       priv->magic,
+			       priv->ioctl_count);
+	}
+
+	return len;
+}
+
+static int drm_clients_info(char *buf, char **start, off_t offset, int len,
+			    int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = _drm_clients_info(buf, start, offset, len, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+
+#if DRM_DEBUG_CODE
+
+static int _drm_vma_info(char *buf, char **start, off_t offset, int len,
+			 int *eof, void *data)
+{
+	drm_device_t	      *dev = (drm_device_t *)data;
+	drm_vma_entry_t	      *pt;
+	pgd_t		      *pgd;
+	pmd_t		      *pmd;
+	pte_t		      *pte;
+	unsigned long	      i;
+	struct vm_area_struct *vma;
+	unsigned long	      address;
+#if defined(__i386__)
+	unsigned int	      pgprot;
+#endif
+
+	if (offset > 0) return 0; /* no partial requests */
+	len  = 0;
+	*eof = 1;
+	DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%08lx\n",
+		       atomic_read(&dev->vma_count),
+		       high_memory, virt_to_phys(high_memory));
+	for (pt = dev->vmalist; pt; pt = pt->next) {
+		if (!(vma = pt->vma)) continue;
+		DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx",
+			       pt->pid,
+			       vma->vm_start,
+			       vma->vm_end,
+			       vma->vm_flags & VM_READ	   ? 'r' : '-',
+			       vma->vm_flags & VM_WRITE	   ? 'w' : '-',
+			       vma->vm_flags & VM_EXEC	   ? 'x' : '-',
+			       vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
+			       vma->vm_flags & VM_LOCKED   ? 'l' : '-',
+			       vma->vm_flags & VM_IO	   ? 'i' : '-',
+			       vma->vm_offset );
+#if defined(__i386__)
+		pgprot = pgprot_val(vma->vm_page_prot);
+		DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c",
+			       pgprot & _PAGE_PRESENT  ? 'p' : '-',
+			       pgprot & _PAGE_RW       ? 'w' : 'r',
+			       pgprot & _PAGE_USER     ? 'u' : 's',
+			       pgprot & _PAGE_PWT      ? 't' : 'b',
+			       pgprot & _PAGE_PCD      ? 'u' : 'c',
+			       pgprot & _PAGE_ACCESSED ? 'a' : '-',
+			       pgprot & _PAGE_DIRTY    ? 'd' : '-',
+			       pgprot & _PAGE_4M       ? 'm' : 'k',
+			       pgprot & _PAGE_GLOBAL   ? 'g' : 'l' );
+#endif		
+		DRM_PROC_PRINT("\n");
+		for (i = vma->vm_start; i < vma->vm_end; i += PAGE_SIZE) {
+			pgd = pgd_offset(vma->vm_mm, i);
+			pmd = pmd_offset(pgd, i);
+			pte = pte_offset(pmd, i);
+			if (pte_present(*pte)) {
+				address = __pa(pte_page(*pte))
+					+ (i & (PAGE_SIZE-1));
+				DRM_PROC_PRINT("      0x%08lx -> 0x%08lx"
+					       " %c%c%c%c%c\n",
+					       i,
+					       address,
+					       pte_read(*pte)  ? 'r' : '-',
+					       pte_write(*pte) ? 'w' : '-',
+					       pte_exec(*pte)  ? 'x' : '-',
+					       pte_dirty(*pte) ? 'd' : '-',
+					       pte_young(*pte) ? 'a' : '-' );
+			} else {
+				DRM_PROC_PRINT("      0x%08lx\n", i);
+			}
+		}
+	}
+	
+	return len;
+}
+
+static int drm_vma_info(char *buf, char **start, off_t offset, int len,
+			int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = _drm_vma_info(buf, start, offset, len, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+#endif
+
+
+#if DRM_DMA_HISTOGRAM
+static int _drm_histo_info(char *buf, char **start, off_t offset, int len,
+			   int *eof, void *data)
+{
+	drm_device_t	 *dev = (drm_device_t *)data;
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+	unsigned long	 slot_value = DRM_DMA_HISTOGRAM_INITIAL;
+	unsigned long	 prev_value = 0;
+	drm_buf_t	 *buffer;
+
+	if (offset > 0) return 0; /* no partial requests */
+	len  = 0;
+	*eof = 1;
+
+	DRM_PROC_PRINT("general statistics:\n");
+	DRM_PROC_PRINT("total	 %10u\n", atomic_read(&dev->histo.total));
+	DRM_PROC_PRINT("open	 %10u\n", atomic_read(&dev->total_open));
+	DRM_PROC_PRINT("close	 %10u\n", atomic_read(&dev->total_close));
+	DRM_PROC_PRINT("ioctl	 %10u\n", atomic_read(&dev->total_ioctl));
+	DRM_PROC_PRINT("irq	 %10u\n", atomic_read(&dev->total_irq));
+	DRM_PROC_PRINT("ctx	 %10u\n", atomic_read(&dev->total_ctx));
+	
+	DRM_PROC_PRINT("\nlock statistics:\n");
+	DRM_PROC_PRINT("locks	 %10u\n", atomic_read(&dev->total_locks));
+	DRM_PROC_PRINT("unlocks	 %10u\n", atomic_read(&dev->total_unlocks));
+	DRM_PROC_PRINT("contends %10u\n", atomic_read(&dev->total_contends));
+	DRM_PROC_PRINT("sleeps	 %10u\n", atomic_read(&dev->total_sleeps));
+
+
+	if (dma) {
+		DRM_PROC_PRINT("\ndma statistics:\n");
+		DRM_PROC_PRINT("prio	 %10u\n",
+			       atomic_read(&dma->total_prio));
+		DRM_PROC_PRINT("bytes	 %10u\n",
+			       atomic_read(&dma->total_bytes));
+		DRM_PROC_PRINT("dmas	 %10u\n",
+			       atomic_read(&dma->total_dmas));
+		DRM_PROC_PRINT("missed:\n");
+		DRM_PROC_PRINT("  dma	 %10u\n",
+			       atomic_read(&dma->total_missed_dma));
+		DRM_PROC_PRINT("  lock	 %10u\n",
+			       atomic_read(&dma->total_missed_lock));
+		DRM_PROC_PRINT("  free	 %10u\n",
+			       atomic_read(&dma->total_missed_free));
+		DRM_PROC_PRINT("  sched	 %10u\n",
+			       atomic_read(&dma->total_missed_sched));
+		DRM_PROC_PRINT("tried	 %10u\n",
+			       atomic_read(&dma->total_tried));
+		DRM_PROC_PRINT("hit	 %10u\n",
+			       atomic_read(&dma->total_hit));
+		DRM_PROC_PRINT("lost	 %10u\n",
+			       atomic_read(&dma->total_lost));
+		
+		buffer = dma->next_buffer;
+		if (buffer) {
+			DRM_PROC_PRINT("next_buffer %7d\n", buffer->idx);
+		} else {
+			DRM_PROC_PRINT("next_buffer    none\n");
+		}
+		buffer = dma->this_buffer;
+		if (buffer) {
+			DRM_PROC_PRINT("this_buffer %7d\n", buffer->idx);
+		} else {
+			DRM_PROC_PRINT("this_buffer    none\n");
+		}
+	}
+	
+
+	DRM_PROC_PRINT("\nvalues:\n");
+	if (dev->lock.hw_lock) {
+		DRM_PROC_PRINT("lock	       0x%08x\n",
+			       dev->lock.hw_lock->lock);
+	} else {
+		DRM_PROC_PRINT("lock		     none\n");
+	}
+	DRM_PROC_PRINT("context_flag   0x%08x\n", dev->context_flag);
+	DRM_PROC_PRINT("interrupt_flag 0x%08x\n", dev->interrupt_flag);
+	DRM_PROC_PRINT("dma_flag       0x%08x\n", dev->dma_flag);
+
+	DRM_PROC_PRINT("queue_count    %10d\n",	 dev->queue_count);
+	DRM_PROC_PRINT("last_context   %10d\n",	 dev->last_context);
+	DRM_PROC_PRINT("last_switch    %10lu\n", dev->last_switch);
+	DRM_PROC_PRINT("last_checked   %10d\n",	 dev->last_checked);
+		
+	
+	DRM_PROC_PRINT("\n		       q2d	  d2c	     c2f"
+		       "	q2c	   q2f	      dma	 sch"
+		       "	ctx	  lacq	     lhld\n\n");
+	for (i = 0; i < DRM_DMA_HISTOGRAM_SLOTS; i++) {
+		DRM_PROC_PRINT("%s %10lu %10u %10u %10u %10u %10u"
+			       " %10u %10u %10u %10u %10u\n",
+			       i == DRM_DMA_HISTOGRAM_SLOTS - 1 ? ">=" : "< ",
+			       i == DRM_DMA_HISTOGRAM_SLOTS - 1
+			       ? prev_value : slot_value ,
+			       
+			       atomic_read(&dev->histo
+					   .queued_to_dispatched[i]),
+			       atomic_read(&dev->histo
+					   .dispatched_to_completed[i]),
+			       atomic_read(&dev->histo
+					   .completed_to_freed[i]),
+			       
+			       atomic_read(&dev->histo
+					   .queued_to_completed[i]),
+			       atomic_read(&dev->histo
+					   .queued_to_freed[i]),
+			       atomic_read(&dev->histo.dma[i]),
+			       atomic_read(&dev->histo.schedule[i]),
+			       atomic_read(&dev->histo.ctx[i]),
+			       atomic_read(&dev->histo.lacq[i]),
+			       atomic_read(&dev->histo.lhld[i]));
+		prev_value = slot_value;
+		slot_value = DRM_DMA_HISTOGRAM_NEXT(slot_value);
+	}
+	return len;
+}
+
+static int drm_histo_info(char *buf, char **start, off_t offset, int len,
+			  int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = _drm_histo_info(buf, start, offset, len, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/sysctl.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/sysctl.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/sysctl.c	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,554 @@
+/* proc.c -- /proc support for DRM -*- c -*-
+ * Created: Mon Jan 11 09:48:47 1999 by faith@precisioninsight.com
+ * Revised: Fri Aug 20 11:31:48 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * $PI$
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/sysctl.c,v 1.1 2000/06/17 00:03:31 martin Exp $
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include <sys/sysctl.h>
+
+SYSCTL_NODE(_hw, OID_AUTO, dri, CTLFLAG_RW, 0, "DRI Graphics");
+
+static int	   drm_name_info SYSCTL_HANDLER_ARGS;
+static int	   drm_vm_info SYSCTL_HANDLER_ARGS;
+static int	   drm_clients_info SYSCTL_HANDLER_ARGS;
+static int	   drm_queues_info SYSCTL_HANDLER_ARGS;
+static int	   drm_bufs_info SYSCTL_HANDLER_ARGS;
+#if DRM_DEBUG_CODExx
+static int	   drm_vma_info SYSCTL_HANDLER_ARGS;
+#endif
+#if DRM_DMA_HISTOGRAM
+static int	   drm_histo_info SYSCTL_HANDLER_ARGS;
+#endif
+
+struct drm_sysctl_list {
+	const char *name;
+	int	   (*f) SYSCTL_HANDLER_ARGS;
+} drm_sysctl_list[] = {
+	{ "name",    drm_name_info    },
+	{ "mem",     drm_mem_info     },
+	{ "vm",	     drm_vm_info      },
+	{ "clients", drm_clients_info },
+	{ "queues",  drm_queues_info  },
+	{ "bufs",    drm_bufs_info    },
+#if DRM_DEBUG_CODExx
+	{ "vma",     drm_vma_info     },
+#endif
+#if DRM_DMA_HISTOGRAM
+	{ "histo",   drm_histo_info   },
+#endif
+};
+#define DRM_SYSCTL_ENTRIES (sizeof(drm_sysctl_list)/sizeof(drm_sysctl_list[0]))
+
+struct drm_sysctl_info {
+	struct sysctl_oid      oids[DRM_SYSCTL_ENTRIES + 1];
+	struct sysctl_oid_list list;
+	char		       name[2];
+};
+
+int drm_sysctl_init(drm_device_t *dev)
+{
+	struct drm_sysctl_info *info;
+	struct sysctl_oid *oid;
+	struct sysctl_oid *top;
+	int		  i;
+
+	/* Find the next free slot under hw.graphics */
+	i = 0;
+	SLIST_FOREACH(oid, &sysctl__hw_dri_children, oid_link) {
+		if (i <= oid->oid_arg2)
+			i = oid->oid_arg2 + 1;
+	}
+	
+	info = drm_alloc(sizeof *info, DRM_MEM_DRIVER);
+	dev->sysctl = info;
+
+	/* Construct the node under hw.graphics */
+	info->name[0] = '0' + i;
+	info->name[1] = 0;
+	oid = &info->oids[DRM_SYSCTL_ENTRIES];
+	bzero(oid, sizeof(*oid));
+	oid->oid_parent = &sysctl__hw_dri_children;
+	oid->oid_number = OID_AUTO;
+	oid->oid_kind = CTLTYPE_NODE | CTLFLAG_RW;
+	oid->oid_arg1 = &info->list;
+	oid->oid_arg2 = i;
+	oid->oid_name = info->name;
+	oid->oid_handler = 0;
+	oid->oid_fmt = "N";
+	SLIST_INIT(&info->list);
+	sysctl_register_oid(oid);
+	top = oid;
+
+	for (i = 0; i < DRM_SYSCTL_ENTRIES; i++) {
+		oid = &info->oids[i];
+		bzero(oid, sizeof(*oid));
+		oid->oid_parent = top->oid_arg1;
+		oid->oid_number = OID_AUTO;
+		oid->oid_kind = CTLTYPE_INT | CTLFLAG_RD;
+		oid->oid_arg1 = dev;
+		oid->oid_arg2 = 0;
+		oid->oid_name = drm_sysctl_list[i].name;
+		oid->oid_handler = drm_sysctl_list[i].f;
+		oid->oid_fmt = "A";
+		sysctl_register_oid(oid);
+	}
+
+	return 0;
+}
+
+int drm_sysctl_cleanup(drm_device_t *dev)
+{
+	int i;
+
+	DRM_DEBUG("dev->sysctl=%p\n", dev->sysctl);
+	for (i = 0; i < DRM_SYSCTL_ENTRIES + 1; i++)
+		sysctl_unregister_oid(&dev->sysctl->oids[i]);
+
+	drm_free(dev->sysctl, sizeof *dev->sysctl, DRM_MEM_DRIVER);
+	dev->sysctl = NULL;
+
+	return 0;
+}
+
+static int drm_name_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	char buf[128];
+	int error;
+
+	if (dev->unique) {
+		DRM_SYSCTL_PRINT("%s 0x%x %s\n",
+			       dev->name, dev2udev(dev->devnode), dev->unique);
+	} else {
+		DRM_SYSCTL_PRINT("%s 0x%x\n", dev->name, dev2udev(dev->devnode));
+	}
+
+	SYSCTL_OUT(req, "", 1);
+
+	return 0;
+}
+
+static int _drm_vm_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	drm_map_t    *map;
+	const char   *types[] = { "FB", "REG", "SHM" };
+	const char   *type;
+	int	     i;
+	char         buf[128];
+	int          error;
+
+	DRM_SYSCTL_PRINT("slot	 offset	      size type flags	 "
+			 "address mtrr\n\n");
+	error = SYSCTL_OUT(req, buf, strlen(buf));
+	if (error) return error;
+
+	for (i = 0; i < dev->map_count; i++) {
+		map = dev->maplist[i];
+		if (map->type < 0 || map->type > 2) type = "??";
+		else				    type = types[map->type];
+		DRM_SYSCTL_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
+				 i,
+				 map->offset,
+				 map->size,
+				 type,
+				 map->flags,
+				 (unsigned long)map->handle);
+		if (map->mtrr < 0) {
+			DRM_SYSCTL_PRINT("none\n");
+		} else {
+			DRM_SYSCTL_PRINT("%4d\n", map->mtrr);
+		}
+	}
+	SYSCTL_OUT(req, "", 1);
+
+	return 0;
+}
+
+static int drm_vm_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	int	     ret;
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	ret = _drm_vm_info(oidp, arg1, arg2, req);
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+
+	return ret;
+}
+
+
+static int _drm_queues_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	int	     i;
+	drm_queue_t  *q;
+	char         buf[128];
+	int          error;
+
+	DRM_SYSCTL_PRINT("  ctx/flags   use   fin"
+			 "   blk/rw/rwf  wait    flushed	   queued"
+			 "      locks\n\n");
+	for (i = 0; i < dev->queue_count; i++) {
+		q = dev->queuelist[i];
+		atomic_inc(&q->use_count);
+		DRM_SYSCTL_PRINT_RET(atomic_dec(&q->use_count),
+				     "%5d/0x%03x %5d %5d"
+				     " %5d/%c%c/%c%c%c %5d %10d %10d %10d\n",
+				     i,
+				     q->flags,
+				     atomic_read(&q->use_count),
+				     atomic_read(&q->finalization),
+				     atomic_read(&q->block_count),
+				     atomic_read(&q->block_read) ? 'r' : '-',
+				     atomic_read(&q->block_write) ? 'w' : '-',
+				     q->read_queue ? 'r':'-',
+				     q->write_queue ? 'w':'-',
+				     q->flush_queue ? 'f':'-',
+				     DRM_BUFCOUNT(&q->waitlist),
+				     atomic_read(&q->total_flushed),
+				     atomic_read(&q->total_queued),
+				     atomic_read(&q->total_locks));
+		atomic_dec(&q->use_count);
+	}
+
+	SYSCTL_OUT(req, "", 1);
+	return 0;
+}
+
+static int drm_queues_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	int	     ret;
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	ret = _drm_queues_info(oidp, arg1, arg2, req);
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	return ret;
+}
+
+/* drm_bufs_info is called whenever a process reads
+   hw.dri.0.bufs. */
+
+static int _drm_bufs_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t	 *dev = arg1;
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+	char             buf[128];
+	int              error;
+
+	if (!dma)	return 0;
+	DRM_SYSCTL_PRINT(" o     size count  free	 segs pages    kB\n\n");
+	for (i = 0; i <= DRM_MAX_ORDER; i++) {
+		if (dma->bufs[i].buf_count)
+			DRM_SYSCTL_PRINT("%2d %8d %5d %5d %5d %5d %5d\n",
+				       i,
+				       dma->bufs[i].buf_size,
+				       dma->bufs[i].buf_count,
+				       atomic_read(&dma->bufs[i]
+						   .freelist.count),
+				       dma->bufs[i].seg_count,
+				       dma->bufs[i].seg_count
+				       *(1 << dma->bufs[i].page_order),
+				       (dma->bufs[i].seg_count
+					* (1 << dma->bufs[i].page_order))
+				       * PAGE_SIZE / 1024);
+	}
+	DRM_SYSCTL_PRINT("\n");
+	for (i = 0; i < dma->buf_count; i++) {
+		if (i && !(i%32)) DRM_SYSCTL_PRINT("\n");
+		DRM_SYSCTL_PRINT(" %d", dma->buflist[i]->list);
+	}
+	DRM_SYSCTL_PRINT("\n");
+
+	SYSCTL_OUT(req, "", 1);
+	return 0;
+}
+
+static int drm_bufs_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	int	     ret;
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	ret = _drm_bufs_info(oidp, arg1, arg2, req);
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	return ret;
+}
+
+
+static int _drm_clients_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	drm_file_t   *priv;
+	char         buf[128];
+	int          error;
+
+	DRM_SYSCTL_PRINT("a dev	pid    uid	magic	  ioctls\n\n");
+	TAILQ_FOREACH(priv, &dev->files, link) {
+		DRM_SYSCTL_PRINT("%c %3d %5d %5d %10u %10lu\n",
+			       priv->authenticated ? 'y' : 'n',
+			       priv->minor,
+			       priv->pid,
+			       priv->uid,
+			       priv->magic,
+			       priv->ioctl_count);
+	}
+
+	SYSCTL_OUT(req, "", 1);
+	return 0;
+}
+
+static int drm_clients_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	int	     ret;
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	ret = _drm_clients_info(oidp, arg1, arg2, req);
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	return ret;
+}
+
+#if DRM_DEBUG_CODExx
+
+static int _drm_vma_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t	      *dev = arg1;
+	drm_vma_entry_t	      *pt;
+	pgd_t		      *pgd;
+	pmd_t		      *pmd;
+	pte_t		      *pte;
+	unsigned long	      i;
+	struct vm_area_struct *vma;
+	unsigned long	      address;
+#if defined(__i386__)
+	unsigned int	      pgprot;
+#endif
+	char		      buf[128];
+	int		      error;
+
+	DRM_SYSCTL_PRINT("vma use count: %d, high_memory = %p, 0x%08lx\n",
+		       atomic_read(&dev->vma_count),
+		       high_memory, virt_to_phys(high_memory));
+	for (pt = dev->vmalist; pt; pt = pt->next) {
+		if (!(vma = pt->vma)) continue;
+		DRM_SYSCTL_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx",
+			       pt->pid,
+			       vma->vm_start,
+			       vma->vm_end,
+			       vma->vm_flags & VM_READ	   ? 'r' : '-',
+			       vma->vm_flags & VM_WRITE	   ? 'w' : '-',
+			       vma->vm_flags & VM_EXEC	   ? 'x' : '-',
+			       vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
+			       vma->vm_flags & VM_LOCKED   ? 'l' : '-',
+			       vma->vm_flags & VM_IO	   ? 'i' : '-',
+			       vma->vm_offset );
+#if defined(__i386__)
+		pgprot = pgprot_val(vma->vm_page_prot);
+		DRM_SYSCTL_PRINT(" %c%c%c%c%c%c%c%c%c",
+			       pgprot & _PAGE_PRESENT  ? 'p' : '-',
+			       pgprot & _PAGE_RW       ? 'w' : 'r',
+			       pgprot & _PAGE_USER     ? 'u' : 's',
+			       pgprot & _PAGE_PWT      ? 't' : 'b',
+			       pgprot & _PAGE_PCD      ? 'u' : 'c',
+			       pgprot & _PAGE_ACCESSED ? 'a' : '-',
+			       pgprot & _PAGE_DIRTY    ? 'd' : '-',
+			       pgprot & _PAGE_4M       ? 'm' : 'k',
+			       pgprot & _PAGE_GLOBAL   ? 'g' : 'l' );
+#endif		
+		DRM_SYSCTL_PRINT("\n");
+		for (i = vma->vm_start; i < vma->vm_end; i += PAGE_SIZE) {
+			pgd = pgd_offset(vma->vm_mm, i);
+			pmd = pmd_offset(pgd, i);
+			pte = pte_offset(pmd, i);
+			if (pte_present(*pte)) {
+				address = __pa(pte_page(*pte))
+					+ (i & (PAGE_SIZE-1));
+				DRM_SYSCTL_PRINT("      0x%08lx -> 0x%08lx"
+					       " %c%c%c%c%c\n",
+					       i,
+					       address,
+					       pte_read(*pte)  ? 'r' : '-',
+					       pte_write(*pte) ? 'w' : '-',
+					       pte_exec(*pte)  ? 'x' : '-',
+					       pte_dirty(*pte) ? 'd' : '-',
+					       pte_young(*pte) ? 'a' : '-' );
+			} else {
+				DRM_SYSCTL_PRINT("      0x%08lx\n", i);
+			}
+		}
+	}
+	
+	SYSCTL_OUT(req, "", 1);
+	return 0;
+}
+
+static int drm_vma_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	int	     ret;
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	ret = _drm_vma_info(oidp, arg1, arg2, req);
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	return ret;
+}
+#endif
+
+
+#if DRM_DMA_HISTOGRAM
+static int _drm_histo_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t	 *dev = arg1;
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+	unsigned long	 slot_value = DRM_DMA_HISTOGRAM_INITIAL;
+	unsigned long	 prev_value = 0;
+	drm_buf_t	 *buffer;
+	char		 buf[128];
+	int              error;
+
+	DRM_SYSCTL_PRINT("general statistics:\n");
+	DRM_SYSCTL_PRINT("total	 %10u\n", atomic_read(&dev->histo.total));
+	DRM_SYSCTL_PRINT("open	 %10u\n", atomic_read(&dev->total_open));
+	DRM_SYSCTL_PRINT("close	 %10u\n", atomic_read(&dev->total_close));
+	DRM_SYSCTL_PRINT("ioctl	 %10u\n", atomic_read(&dev->total_ioctl));
+	DRM_SYSCTL_PRINT("irq	 %10u\n", atomic_read(&dev->total_irq));
+	DRM_SYSCTL_PRINT("ctx	 %10u\n", atomic_read(&dev->total_ctx));
+	
+	DRM_SYSCTL_PRINT("\nlock statistics:\n");
+	DRM_SYSCTL_PRINT("locks	 %10u\n", atomic_read(&dev->total_locks));
+	DRM_SYSCTL_PRINT("unlocks	 %10u\n", atomic_read(&dev->total_unlocks));
+	DRM_SYSCTL_PRINT("contends %10u\n", atomic_read(&dev->total_contends));
+	DRM_SYSCTL_PRINT("sleeps	 %10u\n", atomic_read(&dev->total_sleeps));
+
+
+	if (dma) {
+		DRM_SYSCTL_PRINT("\ndma statistics:\n");
+		DRM_SYSCTL_PRINT("prio	 %10u\n",
+			       atomic_read(&dma->total_prio));
+		DRM_SYSCTL_PRINT("bytes	 %10u\n",
+			       atomic_read(&dma->total_bytes));
+		DRM_SYSCTL_PRINT("dmas	 %10u\n",
+			       atomic_read(&dma->total_dmas));
+		DRM_SYSCTL_PRINT("missed:\n");
+		DRM_SYSCTL_PRINT("  dma	 %10u\n",
+			       atomic_read(&dma->total_missed_dma));
+		DRM_SYSCTL_PRINT("  lock	 %10u\n",
+			       atomic_read(&dma->total_missed_lock));
+		DRM_SYSCTL_PRINT("  free	 %10u\n",
+			       atomic_read(&dma->total_missed_free));
+		DRM_SYSCTL_PRINT("  sched	 %10u\n",
+			       atomic_read(&dma->total_missed_sched));
+		DRM_SYSCTL_PRINT("tried	 %10u\n",
+			       atomic_read(&dma->total_tried));
+		DRM_SYSCTL_PRINT("hit	 %10u\n",
+			       atomic_read(&dma->total_hit));
+		DRM_SYSCTL_PRINT("lost	 %10u\n",
+			       atomic_read(&dma->total_lost));
+		
+		buffer = dma->next_buffer;
+		if (buffer) {
+			DRM_SYSCTL_PRINT("next_buffer %7d\n", buffer->idx);
+		} else {
+			DRM_SYSCTL_PRINT("next_buffer    none\n");
+		}
+		buffer = dma->this_buffer;
+		if (buffer) {
+			DRM_SYSCTL_PRINT("this_buffer %7d\n", buffer->idx);
+		} else {
+			DRM_SYSCTL_PRINT("this_buffer    none\n");
+		}
+	}
+	
+
+	DRM_SYSCTL_PRINT("\nvalues:\n");
+	if (dev->lock.hw_lock) {
+		DRM_SYSCTL_PRINT("lock	       0x%08x\n",
+			       dev->lock.hw_lock->lock);
+	} else {
+		DRM_SYSCTL_PRINT("lock		     none\n");
+	}
+	DRM_SYSCTL_PRINT("context_flag   0x%08x\n", dev->context_flag);
+	DRM_SYSCTL_PRINT("interrupt_flag 0x%08x\n", dev->interrupt_flag);
+	DRM_SYSCTL_PRINT("dma_flag       0x%08x\n", dev->dma_flag);
+
+	DRM_SYSCTL_PRINT("queue_count    %10d\n",	 dev->queue_count);
+	DRM_SYSCTL_PRINT("last_context   %10d\n",	 dev->last_context);
+	DRM_SYSCTL_PRINT("last_switch    %10u\n",	 dev->last_switch);
+	DRM_SYSCTL_PRINT("last_checked   %10d\n",	 dev->last_checked);
+		
+	
+	DRM_SYSCTL_PRINT("\n		       q2d	  d2c	     c2f"
+		       "	q2c	   q2f	      dma	 sch"
+		       "	ctx	  lacq	     lhld\n\n");
+	for (i = 0; i < DRM_DMA_HISTOGRAM_SLOTS; i++) {
+		DRM_SYSCTL_PRINT("%s %10lu %10u %10u %10u %10u %10u"
+			       " %10u %10u %10u %10u %10u\n",
+			       i == DRM_DMA_HISTOGRAM_SLOTS - 1 ? ">=" : "< ",
+			       i == DRM_DMA_HISTOGRAM_SLOTS - 1
+			       ? prev_value : slot_value ,
+			       
+			       atomic_read(&dev->histo
+					   .queued_to_dispatched[i]),
+			       atomic_read(&dev->histo
+					   .dispatched_to_completed[i]),
+			       atomic_read(&dev->histo
+					   .completed_to_freed[i]),
+			       
+			       atomic_read(&dev->histo
+					   .queued_to_completed[i]),
+			       atomic_read(&dev->histo
+					   .queued_to_freed[i]),
+			       atomic_read(&dev->histo.dma[i]),
+			       atomic_read(&dev->histo.schedule[i]),
+			       atomic_read(&dev->histo.ctx[i]),
+			       atomic_read(&dev->histo.lacq[i]),
+			       atomic_read(&dev->histo.lhld[i]));
+		prev_value = slot_value;
+		slot_value = DRM_DMA_HISTOGRAM_NEXT(slot_value);
+	}
+	SYSCTL_OUT(req, "", 1);
+	return 0;
+}
+
+static int drm_histo_info SYSCTL_HANDLER_ARGS
+{
+	drm_device_t *dev = arg1;
+	int	     ret;
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	ret = _drm_histo_info(oidp, arg1, arg2, req);
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	return ret;
+}
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/vm.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/vm.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/vm.c	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,104 @@
+/* vm.c -- Memory mapping for DRM -*- c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+static int drm_dma_mmap(dev_t kdev, vm_offset_t offset, int prot)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	unsigned long	 physical;
+	unsigned long	 page;
+
+	if (!dma)		   return -1; /* Error */
+	if (!dma->pagelist)	   return -1; /* Nothing allocated */
+
+	page	 = offset >> PAGE_SHIFT;
+	physical = dma->pagelist[page];
+
+	DRM_DEBUG("0x%08x (page %lu) => 0x%08lx\n", offset, page, physical);
+	return atop(physical);
+}
+
+int drm_mmap(dev_t kdev, vm_offset_t offset, int prot)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_map_t	*map	= NULL;
+	int		i;
+	
+	/* DRM_DEBUG("offset = 0x%x\n", offset); */
+
+	if (dev->dma
+	    && offset >= 0
+	    && offset < ptoa(dev->dma->page_count))
+		return drm_dma_mmap(kdev, offset, prot);
+
+				/* A sequential search of a linked list is
+				   fine here because: 1) there will only be
+				   about 5-10 entries in the list and, 2) a
+				   DRI client only has to do this mapping
+				   once, so it doesn't have to be optimized
+				   for performance, even if the list was a
+				   bit longer. */
+	for (i = 0; i < dev->map_count; i++) {
+		map = dev->maplist[i];
+		/* DRM_DEBUG("considering 0x%x..0x%x\n", map->offset, map->offset + map->size - 1); */
+		if (offset >= map->offset
+		    && offset < map->offset + map->size) break;
+	}
+	
+	if (i >= dev->map_count) {
+		DRM_DEBUG("can't find map\n");
+		return -1;
+	}
+	if (!map || ((map->flags&_DRM_RESTRICTED) && suser(curproc))) {
+		DRM_DEBUG("restricted map\n");
+		return -1;
+	}
+
+	switch (map->type) {
+	case _DRM_FRAME_BUFFER:
+	case _DRM_REGISTERS:
+	case _DRM_AGP:
+		return atop(offset);
+	case _DRM_SHM:
+		return atop(vtophys(offset));
+	default:
+		return -1;	/* This should never happen. */
+	}
+	DRM_DEBUG("bailing out\n");
+	
+	return -1;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+KMOD	= gamma
+SRCS    = gamma_drv.c gamma_dma.c
+SRCS   += device_if.h bus_if.h pci_if.h
+CFLAGS += ${DEBUG_FLAGS} -I..
+KMODDEPS = drm
+
+@:
+	ln -sf /sys @
+
+machine:
+	ln -sf /sys/i386/include machine
+
+.include <bsd.kmod.mk>
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_dma.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_dma.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_dma.c	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,824 @@
+/* gamma_dma.c -- DMA support for GMX 2000 -*- c -*-
+ * Created: Fri Mar 19 14:30:16 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "gamma_drv.h"
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+/* WARNING!!! MAGIC NUMBER!!!  The number of regions already added to the
+   kernel must be specified here.  Currently, the number is 2.	This must
+   match the order the X server uses for instantiating register regions ,
+   or must be passed in a new ioctl. */
+#define GAMMA_REG(reg)						   \
+	(2							   \
+	 + ((reg < 0x1000)					   \
+	    ? 0							   \
+	    : ((reg < 0x10000) ? 1 : ((reg < 0x11000) ? 2 : 3))))
+
+#define GAMMA_OFF(reg)						   \
+	((reg < 0x1000)						   \
+	 ? reg							   \
+	 : ((reg < 0x10000)					   \
+	    ? (reg - 0x1000)					   \
+	    : ((reg < 0x11000)					   \
+	       ? (reg - 0x10000)				   \
+	       : (reg - 0x11000))))
+
+#define GAMMA_BASE(reg)	 ((unsigned long)dev->maplist[GAMMA_REG(reg)]->handle)
+#define GAMMA_ADDR(reg)	 (GAMMA_BASE(reg) + GAMMA_OFF(reg))
+#define GAMMA_DEREF(reg) *(__volatile__ int *)GAMMA_ADDR(reg)
+#define GAMMA_READ(reg)	 GAMMA_DEREF(reg)
+#define GAMMA_WRITE(reg,val) do { GAMMA_DEREF(reg) = val; } while (0)
+
+#define GAMMA_BROADCASTMASK    0x9378
+#define GAMMA_COMMANDINTENABLE 0x0c48
+#define GAMMA_DMAADDRESS       0x0028
+#define GAMMA_DMACOUNT	       0x0030
+#define GAMMA_FILTERMODE       0x8c00
+#define GAMMA_GCOMMANDINTFLAGS 0x0c50
+#define GAMMA_GCOMMANDMODE     0x0c40
+#define GAMMA_GCOMMANDSTATUS   0x0c60
+#define GAMMA_GDELAYTIMER      0x0c38
+#define GAMMA_GDMACONTROL      0x0060
+#define GAMMA_GINTENABLE       0x0808
+#define GAMMA_GINTFLAGS	       0x0810
+#define GAMMA_INFIFOSPACE      0x0018
+#define GAMMA_OUTFIFOWORDS     0x0020
+#define GAMMA_OUTPUTFIFO       0x2000
+#define GAMMA_SYNC	       0x8c40
+#define GAMMA_SYNC_TAG	       0x0188
+
+static __inline void gamma_dma_dispatch(drm_device_t *dev,
+					vm_offset_t address,
+					vm_size_t length)
+{
+	GAMMA_WRITE(GAMMA_DMAADDRESS, vtophys(address));
+	while (GAMMA_READ(GAMMA_GCOMMANDSTATUS) != 4)
+		;
+	GAMMA_WRITE(GAMMA_DMACOUNT, length / 4);
+}
+
+static __inline void gamma_dma_quiescent_single(drm_device_t *dev)
+{
+	while (GAMMA_READ(GAMMA_DMACOUNT))
+		;
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
+		;
+
+	GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
+	GAMMA_WRITE(GAMMA_SYNC, 0);
+	
+	do {
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS))
+			;
+	} while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
+}
+
+static __inline void gamma_dma_quiescent_dual(drm_device_t *dev)
+{
+	while (GAMMA_READ(GAMMA_DMACOUNT))
+		;
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
+		;
+
+	GAMMA_WRITE(GAMMA_BROADCASTMASK, 3);
+
+	GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
+	GAMMA_WRITE(GAMMA_SYNC, 0);
+	
+				/* Read from first MX */
+	do {
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS))
+			;
+	} while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
+
+				/* Read from second MX */
+	do {
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS + 0x10000))
+			;
+	} while (GAMMA_READ(GAMMA_OUTPUTFIFO + 0x10000) != GAMMA_SYNC_TAG);
+}
+
+static __inline void gamma_dma_ready(drm_device_t *dev)
+{
+	while (GAMMA_READ(GAMMA_DMACOUNT))
+		;
+}
+
+static __inline int gamma_dma_is_ready(drm_device_t *dev)
+{
+	return !GAMMA_READ(GAMMA_DMACOUNT);
+}
+
+static void gamma_dma_service(void *arg)
+{
+	drm_device_t	 *dev = (drm_device_t *)arg;
+	drm_device_dma_t *dma = dev->dma;
+	
+	atomic_inc(&dev->total_irq);
+	GAMMA_WRITE(GAMMA_GDELAYTIMER, 0xc350/2); /* 0x05S */
+	GAMMA_WRITE(GAMMA_GCOMMANDINTFLAGS, 8);
+	GAMMA_WRITE(GAMMA_GINTFLAGS, 0x2001);
+	if (gamma_dma_is_ready(dev)) {
+				/* Free previous buffer */
+		if (test_and_set_bit(0, &dev->dma_flag)) {
+			atomic_inc(&dma->total_missed_free);
+			return;
+		}
+		if (dma->this_buffer) {
+			drm_free_buffer(dev, dma->this_buffer);
+			dma->this_buffer = NULL;
+		}
+		clear_bit(0, &dev->dma_flag);
+
+#if 0
+				/* Dispatch new buffer */
+		queue_task(&dev->tq, &tq_immediate);
+		mark_bh(IMMEDIATE_BH);
+#endif
+	}
+}
+
+/* Only called by gamma_dma_schedule. */
+static int gamma_do_dma(drm_device_t *dev, int locked)
+{
+	unsigned long	 address;
+	unsigned long	 length;
+	drm_buf_t	 *buf;
+	int		 retcode = 0;
+	drm_device_dma_t *dma = dev->dma;
+#if DRM_DMA_HISTOGRAM
+	struct timespec	 dma_start, dma_stop;
+#endif
+
+	if (test_and_set_bit(0, &dev->dma_flag)) {
+		atomic_inc(&dma->total_missed_dma);
+		return EBUSY;
+	}
+	
+#if DRM_DMA_HISTOGRAM
+	getnanotime(&dma_start);
+#endif
+
+	if (!dma->next_buffer) {
+		DRM_ERROR("No next_buffer\n");
+		clear_bit(0, &dev->dma_flag);
+		return EINVAL;
+	}
+
+	buf	= dma->next_buffer;
+	address = (unsigned long)buf->address;
+	length	= buf->used;
+
+	DRM_DEBUG("context %d, buffer %d (%ld bytes)\n",
+		  buf->context, buf->idx, length);
+
+	if (buf->list == DRM_LIST_RECLAIM) {
+		drm_clear_next_buffer(dev);
+		drm_free_buffer(dev, buf);
+		clear_bit(0, &dev->dma_flag);
+		return EINVAL;
+	}
+
+	if (!length) {
+		DRM_ERROR("0 length buffer\n");
+		drm_clear_next_buffer(dev);
+		drm_free_buffer(dev, buf);
+		clear_bit(0, &dev->dma_flag);
+		return 0;
+	}
+	
+	if (!gamma_dma_is_ready(dev)) {
+		clear_bit(0, &dev->dma_flag);
+		return EBUSY;
+	}
+
+	if (buf->while_locked) {
+		if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+			DRM_ERROR("Dispatching buffer %d from pid %d"
+				  " \"while locked\", but no lock held\n",
+				  buf->idx, buf->pid);
+		}
+	} else {
+		if (!locked && !drm_lock_take(&dev->lock.hw_lock->lock,
+					      DRM_KERNEL_CONTEXT)) {
+			atomic_inc(&dma->total_missed_lock);
+			clear_bit(0, &dev->dma_flag);
+			return EBUSY;
+		}
+	}
+
+	if (dev->last_context != buf->context
+	    && !(dev->queuelist[buf->context]->flags
+		 & _DRM_CONTEXT_PRESERVED)) {
+				/* PRE: dev->last_context != buf->context */
+		if (drm_context_switch(dev, dev->last_context, buf->context)) {
+			drm_clear_next_buffer(dev);
+			drm_free_buffer(dev, buf);
+		}
+		retcode = EBUSY;
+		goto cleanup;
+			
+				/* POST: we will wait for the context
+				   switch and will dispatch on a later call
+				   when dev->last_context == buf->context.
+				   NOTE WE HOLD THE LOCK THROUGHOUT THIS
+				   TIME! */
+	}
+
+	drm_clear_next_buffer(dev);
+	buf->pending	 = 1;
+	buf->waiting	 = 0;
+	buf->list	 = DRM_LIST_PEND;
+#if DRM_DMA_HISTOGRAM
+	getnanotime(&buf->time_dispatched);
+#endif
+
+	gamma_dma_dispatch(dev, address, length);
+	drm_free_buffer(dev, dma->this_buffer);
+	dma->this_buffer = buf;
+
+	atomic_add(length, &dma->total_bytes);
+	atomic_inc(&dma->total_dmas);
+
+	if (!buf->while_locked && !dev->context_flag && !locked) {
+		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+cleanup:
+
+	clear_bit(0, &dev->dma_flag);
+
+#if DRM_DMA_HISTOGRAM
+	getnanotime(&dma_stop);
+	timespecsub(&dma_stop, &dma_start);
+	atomic_inc(&dev->histo.ctx[drm_histogram_slot(&dma_stop)]);
+#endif
+
+	return retcode;
+}
+
+static void gamma_dma_schedule_wrapper(void *dev)
+{
+	gamma_dma_schedule(dev, 0);
+}
+
+int gamma_dma_schedule(drm_device_t *dev, int locked)
+{
+	int		 next;
+	drm_queue_t	 *q;
+	drm_buf_t	 *buf;
+	int		 retcode   = 0;
+	int		 processed = 0;
+	int		 missed;
+	int		 expire	   = 20;
+	drm_device_dma_t *dma	   = dev->dma;
+#if DRM_DMA_HISTOGRAM
+	struct timespec	 schedule_start;
+#endif
+
+	if (test_and_set_bit(0, &dev->interrupt_flag)) {
+				/* Not reentrant */
+		atomic_inc(&dma->total_missed_sched);
+		return EBUSY;
+	}
+	missed = atomic_read(&dma->total_missed_sched);
+
+#if DRM_DMA_HISTOGRAM
+	getnanotime(&schedule_start);
+#endif
+
+again:
+	if (dev->context_flag) {
+		clear_bit(0, &dev->interrupt_flag);
+		return EBUSY;
+	}
+	if (dma->next_buffer) {
+				/* Unsent buffer that was previously
+				   selected, but that couldn't be sent
+				   because the lock could not be obtained
+				   or the DMA engine wasn't ready.  Try
+				   again. */
+		atomic_inc(&dma->total_tried);
+		if (!(retcode = gamma_do_dma(dev, locked))) {
+			atomic_inc(&dma->total_hit);
+			++processed;
+		}
+	} else {
+		do {
+			next = drm_select_queue(dev,
+						gamma_dma_schedule_wrapper);
+			if (next >= 0) {
+				q   = dev->queuelist[next];
+				buf = drm_waitlist_get(&q->waitlist);
+				dma->next_buffer = buf;
+				dma->next_queue	 = q;
+				if (buf && buf->list == DRM_LIST_RECLAIM) {
+					drm_clear_next_buffer(dev);
+					drm_free_buffer(dev, buf);
+				}
+			}
+		} while (next >= 0 && !dma->next_buffer);
+		if (dma->next_buffer) {
+			if (!(retcode = gamma_do_dma(dev, locked))) {
+				++processed;
+			}
+		}
+	}
+
+	if (--expire) {
+		if (missed != atomic_read(&dma->total_missed_sched)) {
+			atomic_inc(&dma->total_lost);
+			if (gamma_dma_is_ready(dev)) goto again;
+		}
+		if (processed && gamma_dma_is_ready(dev)) {
+			atomic_inc(&dma->total_lost);
+			processed = 0;
+			goto again;
+		}
+	}
+	
+	clear_bit(0, &dev->interrupt_flag);
+	
+#if DRM_DMA_HISTOGRAM
+	{
+		struct timespec ts;
+		getnanotime(&ts);
+		timespecsub(&ts, &schedule_start);
+		atomic_inc(&dev->histo.schedule[drm_histogram_slot(&ts)]);
+	}
+#endif
+	return retcode;
+}
+
+static int gamma_dma_priority(drm_device_t *dev, drm_dma_t *d)
+{
+	struct proc	  *p = curproc;
+	unsigned long	  address;
+	unsigned long	  length;
+	int		  must_free = 0;
+	int		  retcode   = 0;
+	int		  i;
+	int		  idx;
+	drm_buf_t	  *buf;
+	drm_buf_t	  *last_buf = NULL;
+	drm_device_dma_t  *dma	    = dev->dma;
+	static int	  never;
+
+				/* Turn off interrupt handling */
+	while (test_and_set_bit(0, &dev->interrupt_flag)) {
+		retcode = tsleep(&never, PZERO|PCATCH, "gamp1", 1);
+		if (retcode)
+			return retcode;
+	}
+	if (!(d->flags & _DRM_DMA_WHILE_LOCKED)) {
+		while (!drm_lock_take(&dev->lock.hw_lock->lock,
+				      DRM_KERNEL_CONTEXT)) {
+			retcode = tsleep(&never, PZERO|PCATCH, "gamp2", 1);
+			if (retcode)
+				return retcode;
+		}
+		++must_free;
+	}
+	atomic_inc(&dma->total_prio);
+
+	for (i = 0; i < d->send_count; i++) {
+		idx = d->send_indices[i];
+		if (idx < 0 || idx >= dma->buf_count) {
+			DRM_ERROR("Index %d (of %d max)\n",
+				  d->send_indices[i], dma->buf_count - 1);
+			continue;
+		}
+		buf = dma->buflist[ idx ];
+		if (buf->pid != p->p_pid) {
+			DRM_ERROR("Process %d using buffer owned by %d\n",
+				  p->p_pid, buf->pid);
+			retcode = EINVAL;
+			goto cleanup;
+		}
+		if (buf->list != DRM_LIST_NONE) {
+			DRM_ERROR("Process %d using %d's buffer on list %d\n",
+				  p->p_pid, buf->pid, buf->list);
+			retcode = EINVAL;
+			goto cleanup;
+		}
+				/* This isn't a race condition on
+				   buf->list, since our concern is the
+				   buffer reclaim during the time the
+				   process closes the /dev/drm? handle, so
+				   it can't also be doing DMA. */
+		buf->list	  = DRM_LIST_PRIO;
+		buf->used	  = d->send_sizes[i];
+		buf->context	  = d->context;
+		buf->while_locked = d->flags & _DRM_DMA_WHILE_LOCKED;
+		address		  = (unsigned long)buf->address;
+		length		  = buf->used;
+		if (!length) {
+			DRM_ERROR("0 length buffer\n");
+		}
+		if (buf->pending) {
+			DRM_ERROR("Sending pending buffer:"
+				  " buffer %d, offset %d\n",
+				  d->send_indices[i], i);
+			retcode = EINVAL;
+			goto cleanup;
+		}
+		if (buf->waiting) {
+			DRM_ERROR("Sending waiting buffer:"
+				  " buffer %d, offset %d\n",
+				  d->send_indices[i], i);
+			retcode = EINVAL;
+			goto cleanup;
+		}
+		buf->pending = 1;
+		
+		if (dev->last_context != buf->context
+		    && !(dev->queuelist[buf->context]->flags
+			 & _DRM_CONTEXT_PRESERVED)) {
+			atomic_inc(&dev->context_wait);
+				/* PRE: dev->last_context != buf->context */
+			drm_context_switch(dev, dev->last_context,
+					   buf->context);
+				/* POST: we will wait for the context
+				   switch and will dispatch on a later call
+				   when dev->last_context == buf->context.
+				   NOTE WE HOLD THE LOCK THROUGHOUT THIS
+				   TIME! */
+			retcode = tsleep(&dev->context_wait,  PZERO|PCATCH,
+				       "gamctx", 0);
+			atomic_dec(&dev->context_wait);
+			if (retcode)
+				goto cleanup;
+			if (dev->last_context != buf->context) {
+				DRM_ERROR("Context mismatch: %d %d\n",
+					  dev->last_context,
+					  buf->context);
+			}
+		}
+
+#if DRM_DMA_HISTOGRAM
+		getnanotime(&buf->time_queued);
+		buf->time_dispatched = buf->time_queued;
+#endif
+		gamma_dma_dispatch(dev, address, length);
+		atomic_add(length, &dma->total_bytes);
+		atomic_inc(&dma->total_dmas);
+		
+		if (last_buf) {
+			drm_free_buffer(dev, last_buf);
+		}
+		last_buf = buf;
+	}
+
+
+cleanup:
+	if (last_buf) {
+		gamma_dma_ready(dev);
+		drm_free_buffer(dev, last_buf);
+	}
+	
+	if (must_free && !dev->context_flag) {
+		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+	clear_bit(0, &dev->interrupt_flag);
+	return retcode;
+}
+
+static int gamma_dma_send_buffers(drm_device_t *dev, drm_dma_t *d)
+{
+	struct proc	  *p = curproc;
+	drm_buf_t	  *last_buf = NULL;
+	int		  retcode   = 0;
+	drm_device_dma_t  *dma	    = dev->dma;
+
+	
+	if ((retcode = drm_dma_enqueue(dev, d))) {
+		return retcode;
+	}
+	
+	gamma_dma_schedule(dev, 0);
+	
+	if (d->flags & _DRM_DMA_BLOCK) {
+		last_buf = dma->buflist[d->send_indices[d->send_count-1]];
+		atomic_inc(&last_buf->dma_wait);
+	}
+
+	if (d->flags & _DRM_DMA_BLOCK) {
+		DRM_DEBUG("%d waiting\n", p->p_pid);
+		for (;;) {
+			retcode = tsleep(&last_buf->dma_wait, PZERO|PCATCH,
+					 "gamdw", 0);
+			if (!last_buf->waiting
+			    && !last_buf->pending)
+				break; /* finished */
+			if (retcode)
+				break;
+		}
+			
+		DRM_DEBUG("%d running\n", p->p_pid);
+		atomic_dec(&last_buf->dma_wait);
+		if (!retcode
+		    || (last_buf->list==DRM_LIST_PEND && !last_buf->pending)) {
+			if (!last_buf->dma_wait) {
+				drm_free_buffer(dev, last_buf);
+			}
+		}
+		if (retcode) {
+			DRM_ERROR("ctx%d w%d p%d c%d i%d l%d %d/%d\n",
+				  d->context,
+				  last_buf->waiting,
+				  last_buf->pending,
+				  DRM_WAITCOUNT(dev, d->context),
+				  last_buf->idx,
+				  last_buf->list,
+				  last_buf->pid,
+				  p->p_pid);
+		}
+	}
+	return retcode;
+}
+
+int gamma_dma(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	  *dev	    = kdev->si_drv1;
+	drm_device_dma_t  *dma	    = dev->dma;
+	int		  retcode   = 0;
+	drm_dma_t	  d;
+
+	d = *(drm_dma_t *) data;
+	DRM_DEBUG("%d %d: %d send, %d req\n",
+		  p->p_pid, d.context, d.send_count, d.request_count);
+
+	if (d.context == DRM_KERNEL_CONTEXT || d.context >= dev->queue_slots) {
+		DRM_ERROR("Process %d using context %d\n",
+			  p->p_pid, d.context);
+		return EINVAL;
+	}
+	if (d.send_count < 0 || d.send_count > dma->buf_count) {
+		DRM_ERROR("Process %d trying to send %d buffers (of %d max)\n",
+			  p->p_pid, d.send_count, dma->buf_count);
+		return EINVAL;
+	}
+	if (d.request_count < 0 || d.request_count > dma->buf_count) {
+		DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
+			  p->p_pid, d.request_count, dma->buf_count);
+		return EINVAL;
+	}
+
+	if (d.send_count) {
+		if (d.flags & _DRM_DMA_PRIORITY)
+			retcode = gamma_dma_priority(dev, &d);
+		else 
+			retcode = gamma_dma_send_buffers(dev, &d);
+	}
+
+	d.granted_count = 0;
+
+	if (!retcode && d.request_count) {
+		retcode = drm_dma_get_buffers(dev, &d);
+	}
+
+	DRM_DEBUG("%d returning, granted = %d\n",
+		  p->p_pid, d.granted_count);
+	*(drm_dma_t *) data = d;
+
+	return retcode;
+}
+
+int gamma_irq_install(drm_device_t *dev, int irq)
+{
+	int rid;
+	int retcode;
+
+	if (!irq)     return EINVAL;
+	
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	if (dev->irq) {
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		return EBUSY;
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	
+	DRM_DEBUG("%d\n", irq);
+
+	dev->context_flag     = 0;
+	dev->interrupt_flag   = 0;
+	dev->dma_flag	      = 0;
+	
+	dev->dma->next_buffer = NULL;
+	dev->dma->next_queue  = NULL;
+	dev->dma->this_buffer = NULL;
+
+#if 0
+	dev->tq.next	      = NULL;
+	dev->tq.sync	      = 0;
+	dev->tq.routine	      = gamma_dma_schedule_tq_wrapper;
+	dev->tq.data	      = dev;
+#endif
+				/* Before installing handler */
+	GAMMA_WRITE(GAMMA_GCOMMANDMODE, 0);
+	GAMMA_WRITE(GAMMA_GDMACONTROL, 0);
+	
+				/* Install handler */
+	rid = 0;
+	dev->irq = bus_alloc_resource(dev->device, SYS_RES_IRQ, &rid,
+				      0, ~0, 1, RF_SHAREABLE);
+	if (!dev->irq)
+		return ENOENT;
+
+	retcode = bus_setup_intr(dev->device, dev->irq, INTR_TYPE_TTY,
+				 gamma_dma_service, dev, &dev->irqh);
+	if (retcode) {
+		bus_release_resource(dev->device, SYS_RES_IRQ, 0, dev->irq);
+		dev->irq = 0;
+		return retcode;
+	}
+
+				/* After installing handler */
+	GAMMA_WRITE(GAMMA_GINTENABLE,	    0x2001);
+	GAMMA_WRITE(GAMMA_COMMANDINTENABLE, 0x0008);
+	GAMMA_WRITE(GAMMA_GDELAYTIMER,	   0x39090);
+	
+	return 0;
+}
+
+int gamma_irq_uninstall(drm_device_t *dev)
+{
+	if (!dev->irq)
+		return EINVAL;
+
+	DRM_DEBUG("%ld\n", rman_get_start(dev->irq));
+
+	GAMMA_WRITE(GAMMA_GDELAYTIMER,	    0);
+	GAMMA_WRITE(GAMMA_COMMANDINTENABLE, 0);
+	GAMMA_WRITE(GAMMA_GINTENABLE,	    0);
+
+	bus_teardown_intr(dev->device, dev->irq, dev->irqh);
+	bus_release_resource(dev->device, SYS_RES_IRQ, 0, dev->irq);
+	dev->irq = 0;
+	
+	return 0;
+}
+
+
+int gamma_control(dev_t kdev, u_long cmd, caddr_t data,
+		  int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_control_t	ctl;
+	int		retcode;
+	
+	ctl = *(drm_control_t *) data;
+	
+	switch (ctl.func) {
+	case DRM_INST_HANDLER:
+		if ((retcode = gamma_irq_install(dev, ctl.irq)))
+			return retcode;
+		break;
+	case DRM_UNINST_HANDLER:
+		if ((retcode = gamma_irq_uninstall(dev)))
+			return retcode;
+		break;
+	default:
+		return EINVAL;
+	}
+	return 0;
+}
+
+int gamma_lock(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	  *dev	  = kdev->si_drv1;
+	int		  ret	= 0;
+	drm_lock_t	  lock;
+	drm_queue_t	  *q;
+#if DRM_DMA_HISTOGRAM
+	struct timespec	  start;
+
+	getnanotime(&start);
+	dev->lck_start = start;
+#endif
+
+	lock = *(drm_lock_t *) data;
+
+	if (lock.context == DRM_KERNEL_CONTEXT) {
+		DRM_ERROR("Process %d using kernel context %d\n",
+			  p->p_pid, lock.context);
+		return EINVAL;
+	}
+
+	DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
+		  lock.context, p->p_pid, dev->lock.hw_lock->lock,
+		  lock.flags);
+
+	if (lock.context < 0 || lock.context >= dev->queue_count)
+		return EINVAL;
+	q = dev->queuelist[lock.context];
+	
+	ret = drm_flush_block_and_flush(dev, lock.context, lock.flags);
+
+	if (!ret) {
+		if (_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)
+		    != lock.context) {
+			long j = ticks - dev->lock.lock_time;
+
+			if (j > 0 && j <= DRM_LOCK_SLICE) {
+				/* Can't take lock if we just had it and
+				   there is contention. */
+				static int never;
+				ret = tsleep(&never, PZERO|PCATCH,
+					     "gaml1", j);
+				if (ret)
+					return ret;
+			}
+		}
+		atomic_inc(&dev->lock.lock_queue);
+		for (;;) {
+			if (!dev->lock.hw_lock) {
+				/* Device has been unregistered */
+				ret = EINTR;
+				break;
+			}
+			if (drm_lock_take(&dev->lock.hw_lock->lock,
+					  lock.context)) {
+				dev->lock.pid	    = p->p_pid;
+				dev->lock.lock_time = ticks;
+				atomic_inc(&dev->total_locks);
+				atomic_inc(&q->total_locks);
+				break;	/* Got lock */
+			}
+			
+				/* Contention */
+			atomic_inc(&dev->total_sleeps);
+			ret = tsleep(&dev->lock.lock_queue, PZERO|PCATCH,
+					 "gaml2", 0);
+			if (ret)
+				break;
+		}
+		atomic_dec(&dev->lock.lock_queue);
+	}
+
+	drm_flush_unblock(dev, lock.context, lock.flags); /* cleanup phase */
+	
+	if (!ret) {
+		if (lock.flags & _DRM_LOCK_READY)
+			gamma_dma_ready(dev);
+		if (lock.flags & _DRM_LOCK_QUIESCENT) {
+			if (gamma_found() == 1) {
+				gamma_dma_quiescent_single(dev);
+			} else {
+				gamma_dma_quiescent_dual(dev);
+			}
+		}
+	}
+	DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
+
+#if DRM_DMA_HISTOGRAM
+	{
+		struct timespec ts;
+		getnanotime(&ts);
+		timespecsub(&ts, &start);
+		atomic_inc(&dev->histo.lacq[drm_histogram_slot(&ts)]);
+	}
+#endif
+	
+	return ret;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_drv.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_drv.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_drv.c	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,629 @@
+/* gamma.c -- 3dlabs GMX 2000 driver -*- c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#include "drmP.h"
+#include "gamma_drv.h"
+
+#include <pci/pcivar.h>
+
+MODULE_DEPEND(gamma, drm, 1, 1, 1);
+
+#ifndef PCI_DEVICE_ID_3DLABS_GAMMA
+#define PCI_DEVICE_ID_3DLABS_GAMMA 0x0008
+#endif
+#ifndef PCI_DEVICE_ID_3DLABS_MX
+#define PCI_DEVICE_ID_3DLABS_MX 0x0006
+#endif
+#ifndef PCI_VENDOR_ID_3DLABS
+#define PCI_VENDOR_ID_3DLABS 0x3d3d
+#endif
+
+static int gamma_init(device_t nbdev);
+static void gamma_cleanup(device_t nbdev);
+
+static int gamma_probe(device_t dev)
+{
+	const char *s = 0;
+
+	switch (pci_get_devid(dev)) {
+	case 0x00083d3d:
+		s = "3D Labs Gamma graphics accelerator";
+		break;
+
+	case 0x00063d3d:
+		s = "3D Labs MX graphics accelerator";
+		break;
+	}
+
+	if (s) {
+		device_set_desc(dev, s);
+		return 0;
+	}
+
+	return ENXIO;
+}
+
+static int gamma_attach(device_t dev)
+{
+	gamma_init(dev);
+	return 0;
+}
+
+static int gamma_detach(device_t dev)
+{
+	gamma_cleanup(dev);
+	return 0;
+}
+
+static device_method_t gamma_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		gamma_probe),
+	DEVMETHOD(device_attach,	gamma_attach),
+	DEVMETHOD(device_detach,	gamma_detach),
+
+	{ 0, 0 }
+};
+
+static driver_t gamma_driver = {
+	"drm",
+	gamma_methods,
+	sizeof(drm_device_t),
+};
+
+static devclass_t gamma_devclass;
+#define GAMMA_SOFTC(unit) \
+	((drm_device_t *) devclass_get_softc(gamma_devclass, unit))
+
+DRIVER_MODULE(if_gamma, pci, gamma_driver, gamma_devclass, 0, 0);
+
+#define GAMMA_NAME	 "gamma"
+#define GAMMA_DESC	 "3dlabs GMX 2000"
+#define GAMMA_DATE	 "20000606"
+#define GAMMA_MAJOR	 1
+#define GAMMA_MINOR	 0
+#define GAMMA_PATCHLEVEL 0
+
+#define CDEV_MAJOR	200
+
+static struct cdevsw gamma_cdevsw = {
+	/* open */	gamma_open,
+	/* close */	gamma_close,
+	/* read */	drm_read,
+	/* write */	drm_write,
+	/* ioctl */	gamma_ioctl,
+	/* poll */	nopoll,
+	/* mmap */	drm_mmap,
+	/* strategy */	nostrategy,
+	/* name */	"gamma",
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY | D_TRACKCLOSE,
+	/* bmaj */	-1
+};
+
+static drm_ioctl_desc_t	      gamma_ioctls[] = {
+	[DRM_IOCTL_NR(DRM_IOCTL_VERSION)]    = { gamma_version,	  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE)] = { drm_getunique,	  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_MAGIC)]  = { drm_getmagic,	  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_IRQ_BUSID)]  = { drm_irq_busid,	  0, 1 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)] = { drm_setunique,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]	     = { drm_block,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]    = { drm_unblock,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]    = { gamma_control,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)] = { drm_authmagic,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]    = { drm_addmap,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_BUFS)]   = { drm_addbufs,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MARK_BUFS)]  = { drm_markbufs,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_INFO_BUFS)]  = { drm_infobufs,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS)]   = { drm_mapbufs,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FREE_BUFS)]  = { drm_freebufs,	  1, 0 },
+	
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)]    = { drm_addctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)]     = { drm_rmctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)]    = { drm_modctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)]    = { drm_getctx,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)] = { drm_switchctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)]    = { drm_newctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)]    = { drm_resctx,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_DRAW)]   = { drm_adddraw,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_DRAW)]    = { drm_rmdraw,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	     = { gamma_dma,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_LOCK)]	     = { gamma_lock,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)]     = { gamma_unlock,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]     = { drm_finish,	  1, 0 },
+};
+#define GAMMA_IOCTL_COUNT DRM_ARRAY_SIZE(gamma_ioctls)
+
+static int 		      devices = 0;
+
+static int gamma_setup(drm_device_t *dev)
+{
+	int i;
+	
+	device_busy(dev->device);
+
+	atomic_set(&dev->ioctl_count, 0);
+	atomic_set(&dev->vma_count, 0);
+	dev->buf_use	  = 0;
+	atomic_set(&dev->buf_alloc, 0);
+
+	drm_dma_setup(dev);
+
+	atomic_set(&dev->total_open, 0);
+	atomic_set(&dev->total_close, 0);
+	atomic_set(&dev->total_ioctl, 0);
+	atomic_set(&dev->total_irq, 0);
+	atomic_set(&dev->total_ctx, 0);
+	atomic_set(&dev->total_locks, 0);
+	atomic_set(&dev->total_unlocks, 0);
+	atomic_set(&dev->total_contends, 0);
+	atomic_set(&dev->total_sleeps, 0);
+
+	for (i = 0; i < DRM_HASH_SIZE; i++) {
+		dev->magiclist[i].head = NULL;
+		dev->magiclist[i].tail = NULL;
+	}
+	dev->maplist	    = NULL;
+	dev->map_count	    = 0;
+	dev->vmalist	    = NULL;
+	dev->lock.hw_lock   = NULL;
+	dev->lock.lock_queue = 0;
+	dev->queue_count    = 0;
+	dev->queue_reserved = 0;
+	dev->queue_slots    = 0;
+	dev->queuelist	    = NULL;
+	dev->irq	    = 0;
+	dev->context_flag   = 0;
+	dev->interrupt_flag = 0;
+	dev->dma_flag	    = 0;
+	dev->last_context   = 0;
+	dev->last_switch    = 0;
+	dev->last_checked   = 0;
+	callout_init(&dev->timer);
+	dev->context_wait   = 0;
+#if DRM_DMA_HISTO
+	memset(&dev->histo, 0, sizeof(dev->histo));
+#endif
+	timespecclear(&dev->ctx_start);
+	timespecclear(&dev->lck_start);
+	
+	dev->buf_rp	  = dev->buf;
+	dev->buf_wp	  = dev->buf;
+	dev->buf_end	  = dev->buf + DRM_BSZ;
+	dev->buf_sigio	  = NULL;
+			
+	DRM_DEBUG("\n");
+			
+	/* The kernel's context could be created here, but is now created
+	   in drm_dma_enqueue.	This is more resource-efficient for
+	   hardware that does not do DMA, but may mean that
+	   drm_select_queue fails between the time the interrupt is
+	   initialized and the time the queues are initialized. */
+			
+	return 0;
+}
+
+
+static int
+gamma_takedown(drm_device_t *dev)
+{
+	int		  i;
+	drm_magic_entry_t *pt, *next;
+	drm_map_t	  *map;
+	drm_vma_entry_t	  *vma, *vma_next;
+
+	DRM_DEBUG("\n");
+
+	if (dev->irq) gamma_irq_uninstall(dev);
+	
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	callout_stop(&dev->timer);
+
+	if (dev->devname) {
+		drm_free(dev->devname, strlen(dev->devname)+1, DRM_MEM_DRIVER);
+		dev->devname = NULL;
+	}
+	
+	if (dev->unique) {
+		drm_free(dev->unique, strlen(dev->unique)+1, DRM_MEM_DRIVER);
+		dev->unique = NULL;
+		dev->unique_len = 0;
+	}
+				/* Clear pid list */
+	for (i = 0; i < DRM_HASH_SIZE; i++) {
+		for (pt = dev->magiclist[i].head; pt; pt = next) {
+			next = pt->next;
+			drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+		}
+		dev->magiclist[i].head = dev->magiclist[i].tail = NULL;
+	}
+	
+				/* Clear vma list (only built for debugging) */
+	if (dev->vmalist) {
+		for (vma = dev->vmalist; vma; vma = vma_next) {
+			vma_next = vma->next;
+			drm_free(vma, sizeof(*vma), DRM_MEM_VMAS);
+		}
+		dev->vmalist = NULL;
+	}
+	
+				/* Clear map area and mtrr information */
+	if (dev->maplist) {
+		for (i = 0; i < dev->map_count; i++) {
+			map = dev->maplist[i];
+			switch (map->type) {
+			case _DRM_REGISTERS:
+			case _DRM_FRAME_BUFFER:
+#ifdef CONFIG_MTRR
+				if (map->mtrr >= 0) {
+					int retcode;
+					retcode = mtrr_del(map->mtrr,
+							   map->offset,
+							   map->size);
+					DRM_DEBUG("mtrr_del = %d\n", retcode);
+				}
+#endif
+				drm_ioremapfree(map->handle, map->size);
+				break;
+			case _DRM_SHM:
+				drm_free_pages((unsigned long)map->handle,
+					       drm_order(map->size)
+					       - PAGE_SHIFT,
+					       DRM_MEM_SAREA);
+				break;
+			case _DRM_AGP:
+				/* Do nothing here, because this is all
+                                   handled in the AGP/GART driver. */
+				break;
+			}
+			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+		}
+		drm_free(dev->maplist,
+			 dev->map_count * sizeof(*dev->maplist),
+			 DRM_MEM_MAPS);
+		dev->maplist   = NULL;
+		dev->map_count = 0;
+	}
+	
+	if (dev->queuelist) {
+		for (i = 0; i < dev->queue_count; i++) {
+			drm_waitlist_destroy(&dev->queuelist[i]->waitlist);
+			if (dev->queuelist[i]) {
+				drm_free(dev->queuelist[i],
+					 sizeof(*dev->queuelist[0]),
+					 DRM_MEM_QUEUES);
+				dev->queuelist[i] = NULL;
+			}
+		}
+		drm_free(dev->queuelist,
+			 dev->queue_slots * sizeof(*dev->queuelist),
+			 DRM_MEM_QUEUES);
+		dev->queuelist	 = NULL;
+	}
+
+	drm_dma_takedown(dev);
+
+	dev->queue_count     = 0;
+	if (dev->lock.hw_lock) {
+		dev->lock.hw_lock    = NULL; /* SHM removed */
+		dev->lock.pid	     = 0;
+		wakeup(&dev->lock.lock_queue);
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	
+	device_unbusy(dev->device);
+
+	return 0;
+}
+
+int gamma_found(void)
+{
+	return devices;
+}
+
+static int
+gamma_find_devices(device_t dev)
+{
+	device_t *children, child;
+	int nchildren, i;
+	int count = 0;
+
+	if (device_get_children(device_get_parent(dev), &children, &nchildren))
+		return 0;
+
+	for (i = 0; i < nchildren; i++) {
+		child = children[i];
+
+		if (pci_get_slot(dev) == pci_get_slot(child) &&
+		    pci_get_vendor(child) == PCI_VENDOR_ID_3DLABS &&
+		    pci_get_device(child) == PCI_DEVICE_ID_3DLABS_MX) {
+			count++;
+		}
+	}
+	free(children, M_TEMP);
+
+	/* we don't currently support more than two */
+	if (count > 2) count = 2;
+
+	return count;
+}
+
+/* gamma_init is called via gamma_attach at module load time */
+
+static int
+gamma_init(device_t nbdev)
+{
+	drm_device_t	      *dev = device_get_softc(nbdev);
+
+	DRM_DEBUG("\n");
+
+	memset((void *)dev, 0, sizeof(*dev));
+	simple_lock_init(&dev->count_lock);
+	lockinit(&dev->dev_lock, PZERO, "drmlk", 0, 0);
+	
+#if 0				/* XXX use getenv I guess */
+	drm_parse_options(gamma);
+#endif
+	devices = gamma_find_devices(nbdev);
+	if (devices == 0) return -1;
+
+#if 0
+	if ((retcode = misc_register(&gamma_misc))) {
+		DRM_ERROR("Cannot register \"%s\"\n", GAMMA_NAME);
+		return retcode;
+	}
+#endif
+	dev->device = nbdev;
+	dev->devnode = make_dev(&gamma_cdevsw,
+				device_get_unit(nbdev),
+				DRM_DEV_UID,
+				DRM_DEV_GID,
+				DRM_DEV_MODE,
+				GAMMA_NAME);
+	dev->name   = GAMMA_NAME;
+
+	drm_mem_init();
+	drm_sysctl_init(dev);
+
+	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d with %d MX devices\n",
+		 GAMMA_NAME,
+		 GAMMA_MAJOR,
+		 GAMMA_MINOR,
+		 GAMMA_PATCHLEVEL,
+		 GAMMA_DATE,
+		 device_get_unit(nbdev),
+		 devices);
+
+	return 0;
+}
+
+/* gamma_cleanup is called via gamma_detach at module unload time. */
+
+static void
+gamma_cleanup(device_t nbdev)
+{
+	drm_device_t	      *dev = device_get_softc(nbdev);
+
+	DRM_DEBUG("\n");
+	
+	drm_sysctl_cleanup(dev);
+#if 0
+	if (misc_deregister(&gamma_misc)) {
+		DRM_ERROR("Cannot unload module\n");
+	} else {
+		DRM_INFO("Module unloaded\n");
+	}
+#endif
+	device_busy(dev->device);
+	gamma_takedown(dev);
+}
+
+SYSUNINIT(gamma_cleanup, SI_SUB_DRIVERS, SI_ORDER_ANY, gamma_cleanup, 0);
+
+#if 0
+int gamma_version(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+	drm_version_t version;
+	int	      len;
+
+	copy_from_user_ret(&version,
+			   (drm_version_t *)arg,
+			   sizeof(version),
+			   -EFAULT);
+
+#define DRM_COPY(name,value)				     \
+	len = strlen(value);				     \
+	if (len > name##_len) len = name##_len;		     \
+	name##_len = strlen(value);			     \
+	if (len && name) {				     \
+		copy_to_user_ret(name, value, len, -EFAULT); \
+	}
+
+	version.version_major	   = GAMMA_MAJOR;
+	version.version_minor	   = GAMMA_MINOR;
+	version.version_patchlevel = GAMMA_PATCHLEVEL;
+
+	DRM_COPY(version.name, GAMMA_NAME);
+	DRM_COPY(version.date, GAMMA_DATE);
+	DRM_COPY(version.desc, GAMMA_DESC);
+
+	copy_to_user_ret((drm_version_t *)arg,
+			 &version,
+			 sizeof(version),
+			 -EFAULT);
+	return 0;
+}
+#endif
+
+int
+gamma_open(dev_t kdev, int flags, int fmt, struct proc *p)
+{
+	drm_device_t  *dev    = GAMMA_SOFTC(minor(kdev));
+	int	      retcode = 0;
+	
+	DRM_DEBUG("open_count = %d\n", dev->open_count);
+
+	device_busy(dev->device);
+	if (!(retcode = drm_open_helper(kdev, flags, fmt, p, dev))) {
+		atomic_inc(&dev->total_open);
+		simple_lock(&dev->count_lock);
+		if (!dev->open_count++) {
+			simple_unlock(&dev->count_lock);
+			retcode = gamma_setup(dev);
+		}
+		simple_unlock(&dev->count_lock);
+	}
+	device_unbusy(dev->device);
+
+	return retcode;
+}
+
+int
+gamma_close(dev_t kdev, int flags, int fmt, struct proc *p)
+{
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	int	      retcode = 0;
+
+	DRM_DEBUG("open_count = %d\n", dev->open_count);
+	if (!(retcode = drm_close(kdev, flags, fmt, p))) {
+		atomic_inc(&dev->total_close);
+		simple_lock(&dev->count_lock);
+		if (!--dev->open_count) {
+			if (atomic_read(&dev->ioctl_count) || dev->blocked) {
+				DRM_ERROR("Device busy: %d %d\n",
+					  atomic_read(&dev->ioctl_count),
+					  dev->blocked);
+				simple_unlock(&dev->count_lock);
+				return EBUSY;
+			}
+			simple_unlock(&dev->count_lock);
+			return gamma_takedown(dev);
+		}
+		simple_unlock(&dev->count_lock);
+	}
+	return retcode;
+}
+
+/* drm_ioctl is called whenever a process performs an ioctl on /dev/drm. */
+
+int
+gamma_ioctl(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	int		 nr	 = DRM_IOCTL_NR(cmd);
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_file_t	 *priv;
+	int		 retcode = 0;
+	drm_ioctl_desc_t *ioctl;
+	d_ioctl_t	 *func;
+
+	priv = drm_find_file_by_proc(dev, p);
+	if (!priv) {
+		DRM_DEBUG("can't find authenticator\n");
+		return EINVAL;
+	}
+
+	atomic_inc(&dev->ioctl_count);
+	atomic_inc(&dev->total_ioctl);
+	++priv->ioctl_count;
+	
+	DRM_DEBUG("pid = %d, cmd = 0x%02lx, nr = 0x%02x, auth = %d\n",
+		  p->p_pid, cmd, nr, priv->authenticated);
+
+	switch (cmd) {
+	case FIOSETOWN:
+		return fsetown(*(int *)data, &dev->buf_sigio);
+
+	case FIOGETOWN:
+		*(int *) data = fgetown(dev->buf_sigio);
+		return 0;
+	}
+
+	if (nr >= GAMMA_IOCTL_COUNT) {
+		retcode = EINVAL;
+	} else {
+		ioctl	  = &gamma_ioctls[nr];
+		func	  = ioctl->func;
+
+		if (!func) {
+			DRM_DEBUG("no function\n");
+			retcode = EINVAL;
+		} else if ((ioctl->root_only && suser(p))
+			    || (ioctl->auth_needed && !priv->authenticated)) {
+			retcode = EACCES;
+		} else {
+			retcode = (func)(kdev, cmd, data, flags, p);
+		}
+	}
+	
+	atomic_dec(&dev->ioctl_count);
+	return retcode;
+}
+
+int gamma_unlock(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	  *dev	  = kdev->si_drv1;
+	drm_lock_t	  *lockp  = (drm_lock_t *) data;
+
+	if (lockp->context == DRM_KERNEL_CONTEXT) {
+		DRM_ERROR("Process %d using kernel context %d\n",
+			  p->p_pid, lockp->context);
+		return -EINVAL;
+	}
+
+	DRM_DEBUG("%d frees lock (%d holds)\n",
+		  lockp->context,
+		  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+	atomic_inc(&dev->total_unlocks);
+	if (_DRM_LOCK_IS_CONT(dev->lock.hw_lock->lock))
+		atomic_inc(&dev->total_contends);
+	drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
+	gamma_dma_schedule(dev, 1);
+	if (!dev->context_flag) {
+		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+
+#if DRM_DMA_HISTOGRAM
+	{
+	    struct timespec ts;
+	    getnanotime(&ts);
+	    timespecsub(&ts, &dev->lck_start);
+	    atomic_inc(&dev->histo.lhld[drm_histogram_slot(&ts)]);
+	}
+#endif
+	
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_drv.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_drv.h:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/gamma_drv.h	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,48 @@
+/* gamma_drv.h -- Private header for 3dlabs GMX 2000 driver -*- c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+#ifndef _GAMMA_DRV_H_
+#define _GAMMA_DRV_H_
+
+				/* gamma_drv.c */
+extern d_open_t gamma_open;
+extern d_close_t gamma_close;
+extern d_ioctl_t gamma_ioctl;
+extern d_ioctl_t gamma_version;
+extern d_ioctl_t gamma_dma;
+extern d_ioctl_t gamma_lock;
+extern d_ioctl_t gamma_unlock;
+extern d_ioctl_t gamma_control;
+
+				/* gamma_dma.c */
+extern int  gamma_dma_schedule(drm_device_t *dev, int locked);
+extern int  gamma_irq_install(drm_device_t *dev, int irq);
+extern int  gamma_irq_uninstall(drm_device_t *dev);
+extern int  gamma_found(void);
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+KMOD	= mga
+SRCS    = mga_drv.c mga_context.c mga_state.c mga_bufs.c mga_dma.c
+SRCS   += device_if.h bus_if.h pci_if.h
+CFLAGS += ${DEBUG_FLAGS} -I..
+KERN    = /usr/src/sys
+KMODDEPS = drm
+
+@:
+	ln -sf /sys @
+
+machine:
+	ln -sf /sys/i386/include machine
+
+.include <bsd.kmod.mk>
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_bufs.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_bufs.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_bufs.c	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,604 @@
+/* mga_bufs.c -- IOCTLs to manage buffers
+ * Created: Thu Jan 6 01:47:26 2000 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ * 
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "mga_drv.h"
+#include <sys/mman.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_map.h>
+
+
+static int
+mga_addbufs_agp(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t *dev = kdev->si_drv1;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_desc_t request;
+	drm_buf_entry_t *entry;
+	drm_buf_t *buf;
+	unsigned long offset;
+	unsigned long agp_offset;
+	int count;
+	int order;
+	int size;
+	int alignment;
+	int page_order;
+	int total;
+	int byte_count;
+	int i;
+
+	if (!dma) return EINVAL;
+
+	request = *(drm_buf_desc_t *) data;
+
+	count = request.count;
+	order = drm_order(request.size);
+	size	= 1 << order;
+	agp_offset = request.agp_start;
+	alignment  = (request.flags & _DRM_PAGE_ALIGN) ? round_page(size) :size;
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total = PAGE_SIZE << page_order;
+	byte_count = 0;
+
+	DRM_DEBUG("count: %d\n", count);
+	DRM_DEBUG("order: %d\n", order);
+	DRM_DEBUG("size: %d\n", size);
+	DRM_DEBUG("agp_offset: %ld\n", agp_offset);
+	DRM_DEBUG("alignment: %d\n", alignment);
+	DRM_DEBUG("page_order: %d\n", page_order);
+	DRM_DEBUG("total: %d\n", total);
+	DRM_DEBUG("byte_count: %d\n", byte_count);
+
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return EINVAL;
+	if (dev->queue_count) return EBUSY; /* Not while in use */
+	simple_lock(&dev->count_lock);
+	if (dev->buf_use) {
+		simple_unlock(&dev->count_lock);
+		return EBUSY;
+	}
+	atomic_inc(&dev->buf_alloc);
+	simple_unlock(&dev->count_lock);
+   
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	entry = &dma->bufs[order];
+	if (entry->buf_count) {
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		atomic_dec(&dev->buf_alloc);
+		return ENOMEM; /* May only call once for each order */
+	}
+   
+	entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
+				   DRM_MEM_BUFS);
+	if (!entry->buflist) {
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		atomic_dec(&dev->buf_alloc);
+		return ENOMEM;
+	}
+	memset(entry->buflist, 0, count * sizeof(*entry->buflist));
+   
+	entry->buf_size   = size;
+	entry->page_order = page_order;
+	offset = 0;
+
+   
+	while(entry->buf_count < count) {
+		buf = &entry->buflist[entry->buf_count];
+		buf->idx = dma->buf_count + entry->buf_count;
+		buf->total = alignment;
+		buf->order = order;
+		buf->used = 0;
+
+		DRM_DEBUG("offset : %ld\n", offset);
+
+		buf->offset = offset; /* Hrm */
+		buf->bus_address = dev->agp->base + agp_offset + offset;
+		buf->address = (void *)(agp_offset + offset + dev->agp->base);
+		buf->next = NULL;
+		buf->waiting = 0;
+		buf->pending = 0;
+		buf->dma_wait = 0;
+		buf->pid = 0;
+
+		buf->dev_private = drm_alloc(sizeof(drm_mga_buf_priv_t), DRM_MEM_BUFS);
+		buf->dev_priv_size = sizeof(drm_mga_buf_priv_t);
+
+#if DRM_DMA_HISTOGRAM
+		timespecclear(&buf->time_queued);
+		timespecclear(&buf->time_dispatched);
+		timespecclear(&buf->time_completed);
+		timespecclear(&buf->time_freed);
+#endif
+		offset = offset + alignment;
+		entry->buf_count++;
+		byte_count += PAGE_SIZE << page_order;
+      
+		DRM_DEBUG("buffer %d @ %p\n",
+			  entry->buf_count, buf->address);
+	}
+   
+	dma->buflist = drm_realloc(dma->buflist,
+				   dma->buf_count * sizeof(*dma->buflist),
+				   (dma->buf_count + entry->buf_count)
+				   * sizeof(*dma->buflist),
+				   DRM_MEM_BUFS);
+	for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
+		dma->buflist[i] = &entry->buflist[i - dma->buf_count];
+   
+	dma->buf_count  += entry->buf_count;
+
+	DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
+
+	dma->byte_count += byte_count;
+
+	DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
+
+	drm_freelist_create(&entry->freelist, entry->buf_count);
+	for (i = 0; i < entry->buf_count; i++) {
+		drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
+	}
+   
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+   
+	request.count = entry->buf_count;
+	request.size  = size;
+   
+	*(drm_buf_desc_t *) data = request;
+   
+	atomic_dec(&dev->buf_alloc);
+
+	DRM_DEBUG("count: %d\n", count);
+	DRM_DEBUG("order: %d\n", order);
+	DRM_DEBUG("size: %d\n", size);
+	DRM_DEBUG("agp_offset: %ld\n", agp_offset);
+	DRM_DEBUG("alignment: %d\n", alignment);
+	DRM_DEBUG("page_order: %d\n", page_order);
+	DRM_DEBUG("total: %d\n", total);
+	DRM_DEBUG("byte_count: %d\n", byte_count);
+
+	dma->flags = _DRM_DMA_USE_AGP;
+
+	DRM_DEBUG("dma->flags : %x\n", dma->flags);
+
+	return 0;
+}
+
+static int
+mga_addbufs_pci(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t *dev = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	drm_buf_desc_t	 request;
+	int		 count;
+	int		 order;
+	int		 size;
+	int		 total;
+	int		 page_order;
+	drm_buf_entry_t	 *entry;
+	unsigned long	 page;
+	drm_buf_t	 *buf;
+	int		 alignment;
+	unsigned long	 offset;
+	int		 i;
+	int		 byte_count;
+	int		 page_count;
+
+	if (!dma) return EINVAL;
+
+	request = *(drm_buf_desc_t *) data;
+
+	count	   = request.count;
+	order	   = drm_order(request.size);
+	size	   = 1 << order;
+	
+	DRM_DEBUG("count = %d, size = %d (%d), order = %d, queue_count = %d\n",
+		  request.count, request.size, size, order, dev->queue_count);
+
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return EINVAL;
+	if (dev->queue_count) return EBUSY; /* Not while in use */
+
+	alignment  = (request.flags & _DRM_PAGE_ALIGN) ? round_page(size) :size;
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total	   = PAGE_SIZE << page_order;
+
+	simple_lock(&dev->count_lock);
+	if (dev->buf_use) {
+		simple_unlock(&dev->count_lock);
+		return EBUSY;
+	}
+	atomic_inc(&dev->buf_alloc);
+	simple_unlock(&dev->count_lock);
+	
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	entry = &dma->bufs[order];
+	if (entry->buf_count) {
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		atomic_dec(&dev->buf_alloc);
+		return ENOMEM;	/* May only call once for each order */
+	}
+	
+	entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
+				   DRM_MEM_BUFS);
+	if (!entry->buflist) {
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		atomic_dec(&dev->buf_alloc);
+		return ENOMEM;
+	}
+	memset(entry->buflist, 0, count * sizeof(*entry->buflist));
+
+	entry->seglist = drm_alloc(count * sizeof(*entry->seglist),
+				   DRM_MEM_SEGS);
+	if (!entry->seglist) {
+		drm_free(entry->buflist,
+			 count * sizeof(*entry->buflist),
+			 DRM_MEM_BUFS);
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		atomic_dec(&dev->buf_alloc);
+		return ENOMEM;
+	}
+	memset(entry->seglist, 0, count * sizeof(*entry->seglist));
+
+	dma->pagelist = drm_realloc(dma->pagelist,
+				    dma->page_count * sizeof(*dma->pagelist),
+				    (dma->page_count + (count << page_order))
+				    * sizeof(*dma->pagelist),
+				    DRM_MEM_PAGES);
+	DRM_DEBUG("pagelist: %d entries\n",
+		  dma->page_count + (count << page_order));
+
+
+	entry->buf_size	  = size;
+	entry->page_order = page_order;
+	byte_count	  = 0;
+	page_count	  = 0;
+	while (entry->buf_count < count) {
+		if (!(page = drm_alloc_pages(page_order, DRM_MEM_DMA))) break;
+		entry->seglist[entry->seg_count++] = page;
+		for (i = 0; i < (1 << page_order); i++) {
+			DRM_DEBUG("page %d @ 0x%08lx\n",
+				  dma->page_count + page_count,
+				  page + PAGE_SIZE * i);
+			dma->pagelist[dma->page_count + page_count++]
+				= page + PAGE_SIZE * i;
+		}
+		for (offset = 0;
+		     offset + size <= total && entry->buf_count < count;
+		     offset += alignment, ++entry->buf_count) {
+			buf	     = &entry->buflist[entry->buf_count];
+			buf->idx     = dma->buf_count + entry->buf_count;
+			buf->total   = alignment;
+			buf->order   = order;
+			buf->used    = 0;
+			buf->offset  = (dma->byte_count + byte_count + offset);
+			buf->address = (void *)(page + offset);
+			buf->next    = NULL;
+			buf->waiting = 0;
+			buf->pending = 0;
+			buf->dma_wait = 0;
+			buf->pid     = 0;
+#if DRM_DMA_HISTOGRAM
+			timespecclear(&buf->time_queued);
+			timespecclear(&buf->time_dispatched);
+			timespecclear(&buf->time_completed);
+			timespecclear(&buf->time_freed);
+#endif
+			DRM_DEBUG("buffer %d @ %p\n",
+				  entry->buf_count, buf->address);
+		}
+		byte_count += PAGE_SIZE << page_order;
+	}
+
+	dma->buflist = drm_realloc(dma->buflist,
+				   dma->buf_count * sizeof(*dma->buflist),
+				   (dma->buf_count + entry->buf_count)
+				   * sizeof(*dma->buflist),
+				   DRM_MEM_BUFS);
+	for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
+		dma->buflist[i] = &entry->buflist[i - dma->buf_count];
+
+	dma->buf_count	+= entry->buf_count;
+	dma->seg_count	+= entry->seg_count;
+	dma->page_count += entry->seg_count << page_order;
+	dma->byte_count += PAGE_SIZE * (entry->seg_count << page_order);
+	
+	drm_freelist_create(&entry->freelist, entry->buf_count);
+	for (i = 0; i < entry->buf_count; i++) {
+		drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
+	}
+	
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+
+	request.count = entry->buf_count;
+	request.size  = size;
+
+	*(drm_buf_desc_t *) data = request;
+	
+	atomic_dec(&dev->buf_alloc);
+	return 0;
+}
+
+int
+mga_addbufs(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_buf_desc_t	 request;
+
+	request = *(drm_buf_desc_t *) data;
+
+	if(request.flags & _DRM_AGP_BUFFER)
+		return mga_addbufs_agp(kdev, cmd, data, flags, p);
+	else
+		return mga_addbufs_pci(kdev, cmd, data, flags, p);
+}
+
+int
+mga_infobufs(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t     *dev    = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	drm_buf_info_t	 request;
+	int		 i;
+	int		 count;
+	int		 error;
+
+	if (!dma) return EINVAL;
+
+	simple_lock(&dev->count_lock);
+	if (atomic_read(&dev->buf_alloc)) {
+		simple_unlock(&dev->count_lock);
+		return EBUSY;
+	}
+	++dev->buf_use;		/* Can't allocate more after this call */
+	simple_unlock(&dev->count_lock);
+
+	request = *(drm_buf_info_t *) data;
+
+	for (i = 0, count = 0; i < DRM_MAX_ORDER+1; i++) {
+		if (dma->bufs[i].buf_count) ++count;
+	}
+	
+	DRM_DEBUG("count = %d\n", count);
+	
+	if (request.count >= count) {
+		for (i = 0, count = 0; i < DRM_MAX_ORDER+1; i++) {
+			if (dma->bufs[i].buf_count) {
+				error = copyout(&dma->bufs[i].buf_count,
+						&request.list[count].count,
+						sizeof(dma->bufs[0]
+						       .buf_count));
+				if (error) return error;
+				error = copyout(&dma->bufs[i].buf_size,
+						&request.list[count].size,
+						sizeof(dma->bufs[0]
+						       .buf_size));
+				if (error) return error;
+				error = copyout(&dma->bufs[i]
+						.freelist.low_mark,
+						&request.list[count].low_mark,
+						sizeof(dma->bufs[0]
+						       .freelist.low_mark));
+				if (error) return error;
+				error = copyout(&dma->bufs[i]
+						.freelist.high_mark,
+						&request.list[count].high_mark,
+						sizeof(dma->bufs[0]
+						       .freelist.high_mark));
+				if (error) return error;
+				DRM_DEBUG("%d %d %d %d %d\n",
+					  i,
+					  dma->bufs[i].buf_count,
+					  dma->bufs[i].buf_size,
+					  dma->bufs[i].freelist.low_mark,
+					  dma->bufs[i].freelist.high_mark);
+				++count;
+			}
+		}
+	}
+	request.count = count;
+
+	*(drm_buf_info_t *) data = request;
+	
+	return 0;
+}
+
+int
+mga_markbufs(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t     *dev    = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	drm_buf_desc_t	 request;
+	int		 order;
+	drm_buf_entry_t	 *entry;
+
+	if (!dma) return EINVAL;
+
+	request = *(drm_buf_desc_t *) data;
+
+	DRM_DEBUG("%d, %d, %d\n",
+		  request.size, request.low_mark, request.high_mark);
+	order = drm_order(request.size);
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return EINVAL;
+	entry = &dma->bufs[order];
+
+	if (request.low_mark < 0 || request.low_mark > entry->buf_count)
+		return EINVAL;
+	if (request.high_mark < 0 || request.high_mark > entry->buf_count)
+		return EINVAL;
+
+	entry->freelist.low_mark  = request.low_mark;
+	entry->freelist.high_mark = request.high_mark;
+	
+	return 0;
+}
+
+int
+mga_freebufs(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t     *dev    = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	drm_buf_free_t	 request;
+	int		 i;
+	int		 error;
+	int		 idx;
+	drm_buf_t	 *buf;
+
+	if (!dma) return EINVAL;
+
+	request = *(drm_buf_free_t *) data;
+
+	DRM_DEBUG("%d\n", request.count);
+	for (i = 0; i < request.count; i++) {
+		error = copyin(&request.list[i],
+			       &idx,
+			       sizeof(idx));
+		if (error) return error;
+		if (idx < 0 || idx >= dma->buf_count) {
+			DRM_ERROR("Index %d (of %d max)\n",
+				  idx, dma->buf_count - 1);
+			return EINVAL;
+		}
+		buf = dma->buflist[idx];
+		if (buf->pid != p->p_pid) {
+			DRM_ERROR("Process %d freeing buffer owned by %d\n",
+				  p->p_pid, buf->pid);
+			return EINVAL;
+		}
+		drm_free_buffer(dev, buf);
+	}
+	
+	return 0;
+}
+
+int
+mga_mapbufs(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t     *dev    = kdev->si_drv1;
+	drm_device_dma_t *dma	 = dev->dma;
+	int		 retcode = 0;
+	const int	 zero	 = 0;
+	vm_offset_t	 virtual;
+	vm_offset_t	 address;
+	drm_buf_map_t	 request;
+	int		 i;
+
+	if (!dma) return EINVAL;
+	
+	DRM_DEBUG("\n");
+
+	simple_lock(&dev->count_lock);
+	if (atomic_read(&dev->buf_alloc)) {
+		simple_unlock(&dev->count_lock);
+		DRM_DEBUG("Busy\n");
+		return EBUSY;
+	}
+	++dev->buf_use;		/* Can't allocate more after this call */
+	simple_unlock(&dev->count_lock);
+
+	request = *(drm_buf_map_t *) data;
+
+	DRM_DEBUG("mga_mapbufs\n");
+   	DRM_DEBUG("dma->flags : %x\n", dma->flags);
+   
+	if (request.count >= dma->buf_count) {
+		if(dma->flags & _DRM_DMA_USE_AGP) {
+			drm_mga_private_t *dev_priv = dev->dev_private;
+			drm_map_t *map = NULL;
+	 
+			map = dev->maplist[dev_priv->buffer_map_idx];
+			if (!map) {
+				DRM_DEBUG("map is null\n");
+				retcode = EINVAL;
+				goto done;
+			}
+
+			DRM_DEBUG("map->offset : %lx\n", map->offset);
+			DRM_DEBUG("map->size : %lx\n", map->size);
+			DRM_DEBUG("map->type : %d\n", map->type);
+			DRM_DEBUG("map->flags : %x\n", map->flags);
+			DRM_DEBUG("map->handle : %p\n", map->handle);
+			DRM_DEBUG("map->mtrr : %d\n", map->mtrr);
+			virtual = 0;
+			retcode = vm_mmap(&p->p_vmspace->vm_map,
+					  &virtual,
+					  map->size,
+					  PROT_READ|PROT_WRITE, VM_PROT_ALL,
+					  MAP_SHARED,
+					  SLIST_FIRST(&kdev->si_hlist),
+					  map->offset);
+		} else {
+			virtual = 0;
+			retcode = vm_mmap(&p->p_vmspace->vm_map,
+					  &virtual,
+					  round_page(dma->byte_count),
+					  PROT_READ|PROT_WRITE, VM_PROT_ALL,
+					  MAP_SHARED,
+					  SLIST_FIRST(&kdev->si_hlist),
+					  0);
+		}
+		if (retcode) {
+			/* Real error */
+			DRM_DEBUG("mmap error\n");
+			goto done;
+		}
+		request.virtual = (void *)virtual;
+      
+		for (i = 0; i < dma->buf_count; i++) {
+			retcode = copyout(&dma->buflist[i]->idx,
+					  &request.list[i].idx,
+					  sizeof(request.list[0].idx));
+			if (retcode) goto done;
+			retcode = copyout(&dma->buflist[i]->total,
+					  &request.list[i].total,
+					  sizeof(request.list[0].total));
+			if (retcode) goto done;
+			retcode = copyout(&zero,
+					  &request.list[i].used,
+					  sizeof(request.list[0].used));
+			if (retcode) goto done;
+			address = virtual + dma->buflist[i]->offset;
+			retcode = copyout(&address,
+					  &request.list[i].address,
+					  sizeof(address));
+			if (retcode) goto done;
+		}
+	}
+ done:
+	request.count = dma->buf_count;
+	DRM_DEBUG("%d buffers, retcode = %d\n", request.count, retcode);
+   
+	*(drm_buf_map_t *) data = request;
+
+	DRM_DEBUG("retcode : %d\n", retcode);
+
+	return retcode;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_context.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_context.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_context.c	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,196 @@
+/* mga_context.c -- IOCTLs for mga contexts
+ * Created: Mon Dec 13 09:51:35 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	   Jeff Hartmann <jhartmann@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "mga_drv.h"
+
+static int mga_alloc_queue(drm_device_t *dev)
+{
+   	int temp = drm_ctxbitmap_next(dev);
+   	DRM_DEBUG("mga_alloc_queue: %d\n", temp);
+	return temp;
+}
+
+int mga_context_switch(drm_device_t *dev, int old, int new)
+{
+        char        buf[64];
+
+        atomic_inc(&dev->total_ctx);
+
+        if (test_and_set_bit(0, &dev->context_flag)) {
+                DRM_ERROR("Reentering -- FIXME\n");
+                return EBUSY;
+        }
+
+#if DRM_DMA_HISTOGRAM
+        getnanotime(&dev->ctx_start);
+#endif
+        
+        DRM_DEBUG("Context switch from %d to %d\n", old, new);
+
+        if (new == dev->last_context) {
+                clear_bit(0, &dev->context_flag);
+                return 0;
+        }
+        
+        if (drm_flags & DRM_FLAG_NOCTX) {
+                mga_context_switch_complete(dev, new);
+        } else {
+                sprintf(buf, "C %d %d\n", old, new);
+                drm_write_string(dev, buf);
+        }
+        
+        return 0;
+}
+
+int mga_context_switch_complete(drm_device_t *dev, int new)
+{
+        dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
+        dev->last_switch  = ticks;
+        
+        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+                DRM_ERROR("Lock isn't held after context switch\n");
+        }
+
+				/* If a context switch is ever initiated
+                                   when the kernel holds the lock, release
+                                   that lock here. */
+#if DRM_DMA_HISTOGRAM
+	{
+	    struct timespec ts;
+	    getnanotime(&ts);
+	    timespecsub(&ts, &dev->lck_start);
+	    atomic_inc(&dev->histo.ctx[drm_histogram_slot(&ts)]);
+	}
+#endif
+        clear_bit(0, &dev->context_flag);
+        wakeup(&dev->context_wait);
+        
+        return 0;
+}
+
+int
+mga_resctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_ctx_res_t	res;
+	drm_ctx_t	ctx;
+	int		i, error;
+
+	DRM_DEBUG("%d\n", DRM_RESERVED_CONTEXTS);
+	res = *(drm_ctx_res_t *) data;
+	if (res.count >= DRM_RESERVED_CONTEXTS) {
+		memset(&ctx, 0, sizeof(ctx));
+		for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
+			ctx.handle = i;
+			error = copyout(&i, &res.contexts[i], sizeof(i));
+			if (error) return error;
+		}
+	}
+	res.count = DRM_RESERVED_CONTEXTS;
+	*(drm_ctx_res_t *) data = res;
+	return 0;
+}
+
+int
+mga_addctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	if ((ctx.handle = mga_alloc_queue(dev)) == DRM_KERNEL_CONTEXT) {
+				/* Skip kernel's context and get a new one. */
+		ctx.handle = mga_alloc_queue(dev);
+	}
+        if (ctx.handle == -1) {
+		DRM_DEBUG("Not enough free contexts.\n");
+				/* Should this return EBUSY instead? */
+		return ENOMEM;
+	}
+	DRM_DEBUG("%d\n", ctx.handle);
+	*(drm_ctx_t *) data = ctx;
+	return 0;
+}
+
+int
+mga_modctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+   	/* This does nothing for the mga */
+	return 0;
+}
+
+int mga_getctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_ctx_t ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	/* This is 0, because we don't hanlde any context flags */
+	ctx.flags = 0;
+	*(drm_ctx_t *) data = ctx;
+	return 0;
+}
+
+int mga_switchctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	DRM_DEBUG("%d\n", ctx.handle);
+	return mga_context_switch(dev, dev->last_context, ctx.handle);
+}
+
+int mga_newctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	DRM_DEBUG("%d\n", ctx.handle);
+	mga_context_switch_complete(dev, ctx.handle);
+
+	return 0;
+}
+
+int mga_rmctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	DRM_DEBUG("%d\n", ctx.handle);
+      	if(ctx.handle != DRM_KERNEL_CONTEXT) {
+	   	drm_ctxbitmap_free(dev, ctx.handle);
+	}
+	
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_dma.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_dma.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_dma.c	Fri Jun 16 17:03:31 2000
@@ -0,0 +1,1106 @@
+/* mga_dma.c -- DMA support for mga g200/g400
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ *	    Keith Whitwell <keithw@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "mga_drv.h"
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#define MGA_REG(reg)		2
+#define MGA_BASE(reg)		((unsigned long) \
+				((drm_device_t *)dev)->maplist[MGA_REG(reg)]->handle)
+#define MGA_ADDR(reg)		(MGA_BASE(reg) + reg)
+#define MGA_DEREF(reg)		*(__volatile__ int *)MGA_ADDR(reg)
+#define MGA_READ(reg)		MGA_DEREF(reg)
+#define MGA_WRITE(reg,val) 	do { MGA_DEREF(reg) = val; } while (0)
+
+#define PDEA_pagpxfer_enable 	     0x2
+
+static int mga_flush_queue(drm_device_t *dev);
+
+static unsigned long mga_alloc_page(drm_device_t *dev)
+{
+	unsigned long address;
+   
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	address = (unsigned long) drm_alloc(PAGE_SIZE, DRM_MEM_DMA);
+	if(address == 0UL) {
+		return 0;
+	}
+   
+	return address;
+}
+
+static void mga_free_page(drm_device_t *dev, unsigned long page)
+{
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if(page == 0UL) {
+		return;
+	}
+	drm_free((void *) page, PAGE_SIZE, DRM_MEM_DMA);
+	return;
+}
+
+static void mga_delay(void)
+{
+   	return;
+}
+
+void mga_flush_write_combine(void)
+{
+   	int xchangeDummy;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	__asm__ volatile(" push %%eax ; xchg %%eax, %0 ; pop %%eax" : : "m" (xchangeDummy));
+   	__asm__ volatile(" push %%eax ; push %%ebx ; push %%ecx ; push %%edx ;"
+			 " movl $0,%%eax ; cpuid ; pop %%edx ; pop %%ecx ; pop %%ebx ;"
+			 " pop %%eax" : /* no outputs */ :  /* no inputs */ );
+}
+
+/* These are two age tags that will never be sent to
+ * the hardware */
+#define MGA_BUF_USED 	0xffffffff
+#define MGA_BUF_FREE	0
+
+static int mga_freelist_init(drm_device_t *dev)
+{
+      	drm_device_dma_t *dma = dev->dma;
+   	drm_buf_t *buf;
+   	drm_mga_buf_priv_t *buf_priv;
+      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+   	drm_mga_freelist_t *item;
+   	int i;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	dev_priv->head = drm_alloc(sizeof(drm_mga_freelist_t), DRM_MEM_DRIVER);
+	if(dev_priv->head == NULL) return ENOMEM;
+   	memset(dev_priv->head, 0, sizeof(drm_mga_freelist_t));
+   	dev_priv->head->age = MGA_BUF_USED;
+   
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	buf = dma->buflist[ i ];
+	        buf_priv = buf->dev_private;
+		item = drm_alloc(sizeof(drm_mga_freelist_t),
+				 DRM_MEM_DRIVER);
+	   	if(item == NULL) return ENOMEM;
+	   	memset(item, 0, sizeof(drm_mga_freelist_t));
+	  	item->age = MGA_BUF_FREE;
+	   	item->prev = dev_priv->head;
+	   	item->next = dev_priv->head->next;
+	   	if(dev_priv->head->next != NULL)
+			dev_priv->head->next->prev = item;
+	   	if(item->next == NULL) dev_priv->tail = item;
+	   	item->buf = buf;
+	   	buf_priv->my_freelist = item;
+		buf_priv->discard = 0;
+		buf_priv->dispatched = 0;
+	   	dev_priv->head->next = item;
+	}
+   
+   	return 0;
+}
+
+static void mga_freelist_cleanup(drm_device_t *dev)
+{
+      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+   	drm_mga_freelist_t *item;
+   	drm_mga_freelist_t *prev;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	item = dev_priv->head;
+   	while(item) {
+	   	prev = item;
+	   	item = item->next;
+	   	drm_free(prev, sizeof(drm_mga_freelist_t), DRM_MEM_DRIVER);
+	}
+   
+   	dev_priv->head = dev_priv->tail = NULL;
+}
+
+/* Frees dispatch lock */
+static __inline void mga_dma_quiescent(drm_device_t *dev)
+{
+	drm_device_dma_t  *dma      = dev->dma;
+	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+   	unsigned long end;
+	int i;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	end = ticks + (hz*3);
+    	while(1) {
+		if(!test_and_set_bit(MGA_IN_DISPATCH, 
+				     &dev_priv->dispatch_status)) {
+			break;
+		}
+	   	if((signed)(end - ticks) <= 0) {
+			DRM_ERROR("irqs: %d wanted %d\n", 
+				  atomic_read(&dev->total_irq), 
+				  atomic_read(&dma->total_lost));
+			DRM_ERROR("lockup\n"); 
+			goto out_nolock;
+		}
+		for (i = 0 ; i < 2000 ; i++) mga_delay();
+	}
+	end = ticks + (hz*3);
+    	DRM_DEBUG("quiescent status : %x\n", MGA_READ(MGAREG_STATUS));
+    	while((MGA_READ(MGAREG_STATUS) & 0x00030001) != 0x00020000) {
+		if((signed)(end - ticks) <= 0) {
+			DRM_ERROR("irqs: %d wanted %d\n", 
+				  atomic_read(&dev->total_irq), 
+				  atomic_read(&dma->total_lost));
+			DRM_ERROR("lockup\n"); 
+			goto out_status;
+		}
+		for (i = 0 ; i < 2000 ; i++) mga_delay();	  
+	}
+    	sarea_priv->dirty |= MGA_DMA_FLUSH;
+
+out_status:
+    	clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status);
+out_nolock:
+}
+
+static void mga_reset_freelist(drm_device_t *dev)
+{
+   	drm_device_dma_t  *dma      = dev->dma;
+   	drm_buf_t *buf;
+   	drm_mga_buf_priv_t *buf_priv;
+	int i;
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	buf = dma->buflist[ i ];
+	        buf_priv = buf->dev_private;
+		buf_priv->my_freelist->age = MGA_BUF_FREE;
+	}
+}
+
+/* Least recently used :
+ * These operations are not atomic b/c they are protected by the 
+ * hardware lock */
+
+drm_buf_t *mga_freelist_get(drm_device_t *dev)
+{
+   	drm_mga_private_t *dev_priv = 
+     		(drm_mga_private_t *) dev->dev_private;
+	drm_mga_freelist_t *prev;
+   	drm_mga_freelist_t *next;
+	static int failed = 0;
+	int ret, s;
+
+	DRM_DEBUG("%s : tail->age : %d last_prim_age : %d\n", __FUNCTION__,
+	       dev_priv->tail->age, dev_priv->last_prim_age);
+   
+	if(failed >= 1000 && dev_priv->tail->age >= dev_priv->last_prim_age) {
+		DRM_DEBUG("I'm waiting on the freelist!!! %d\n", 
+		       dev_priv->last_prim_age);
+		s = splsofttq();
+	   	set_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status);
+	   	for (;;) {
+		   	mga_dma_schedule(dev, 0);
+		   	if(!test_bit(MGA_IN_GETBUF, 
+				     &dev_priv->dispatch_status)) 
+				break;
+		   	atomic_inc(&dev->total_sleeps);
+			ret = tsleep(&dev_priv->buf_queue, PZERO|PCATCH,
+				     "mgafg", 0);
+			if (ret) {
+				clear_bit(MGA_IN_GETBUF,
+					  &dev_priv->dispatch_status);
+				splx(s);
+			   	goto failed_getbuf;
+			}
+		}
+		splx(s);
+	}
+   
+   	if(dev_priv->tail->age < dev_priv->last_prim_age) {
+		prev = dev_priv->tail->prev;
+	   	next = dev_priv->tail;
+	   	prev->next = NULL;
+	   	next->prev = next->next = NULL;
+	   	dev_priv->tail = prev;
+	   	next->age = MGA_BUF_USED;
+		failed = 0;
+	   	return next->buf;
+	}
+
+failed_getbuf:
+	failed++;
+   	return NULL;
+}
+
+int mga_freelist_put(drm_device_t *dev, drm_buf_t *buf)
+{
+      	drm_mga_private_t *dev_priv = 
+     		(drm_mga_private_t *) dev->dev_private;
+   	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_freelist_t *prev;
+   	drm_mga_freelist_t *head;
+   	drm_mga_freelist_t *next;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	if(buf_priv->my_freelist->age == MGA_BUF_USED) {
+		/* Discarded buffer, put it on the tail */
+		next = buf_priv->my_freelist;
+		next->age = MGA_BUF_FREE;
+		prev = dev_priv->tail;
+		prev->next = next;
+		next->prev = prev;
+		next->next = NULL;
+		dev_priv->tail = next;
+		DRM_DEBUG("Discarded\n");
+	} else {
+		/* Normally aged buffer, put it on the head + 1,
+		 * as the real head is a sentinal element
+		 */
+		next = buf_priv->my_freelist;
+		head = dev_priv->head;
+		prev = head->next;
+		head->next = next;
+		prev->prev = next;
+		next->prev = head;
+		next->next = prev;
+	}
+   
+   	return 0;
+}
+
+static int mga_init_primary_bufs(drm_device_t *dev, drm_mga_init_t *init)
+{
+   	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_prim_buf_t *prim_buffer;
+   	int i, temp, size_of_buf;
+   	int offset = init->reserved_map_agpstart;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+   	dev_priv->primary_size = ((init->primary_size + PAGE_SIZE - 1) / 
+				  PAGE_SIZE) * PAGE_SIZE;
+   	size_of_buf = dev_priv->primary_size / MGA_NUM_PRIM_BUFS;
+	dev_priv->warp_ucode_size = init->warp_ucode_size;
+   	dev_priv->prim_bufs = drm_alloc(sizeof(drm_mga_prim_buf_t *) * 
+					(MGA_NUM_PRIM_BUFS + 1), 
+					DRM_MEM_DRIVER);
+   	if(dev_priv->prim_bufs == NULL) {
+		DRM_ERROR("Unable to allocate memory for prim_buf\n");
+		return ENOMEM;
+	}
+   	memset(dev_priv->prim_bufs, 
+	       0, sizeof(drm_mga_prim_buf_t *) * (MGA_NUM_PRIM_BUFS + 1));
+   
+   	temp = init->warp_ucode_size + dev_priv->primary_size;
+	temp = ((temp + PAGE_SIZE - 1) / PAGE_SIZE) * PAGE_SIZE;
+	   
+	dev_priv->ioremap = drm_ioremap(dev->agp->base + offset, 
+					temp);
+	if(dev_priv->ioremap == NULL) {
+		DRM_DEBUG("Ioremap failed\n");
+		return ENOMEM;
+	}
+   	dev_priv->wait_queue = 0;
+   
+   	for(i = 0; i < MGA_NUM_PRIM_BUFS; i++) {
+	   	prim_buffer = drm_alloc(sizeof(drm_mga_prim_buf_t), 
+					DRM_MEM_DRIVER);
+	   	if(prim_buffer == NULL) return ENOMEM;
+	   	memset(prim_buffer, 0, sizeof(drm_mga_prim_buf_t));
+	   	prim_buffer->phys_head = offset + dev->agp->base;
+	   	prim_buffer->current_dma_ptr = 
+			prim_buffer->head = 
+			(u_int32_t *) (dev_priv->ioremap + 
+				       offset - 
+				       init->reserved_map_agpstart);
+	   	prim_buffer->num_dwords = 0;
+	   	prim_buffer->max_dwords = size_of_buf / sizeof(u_int32_t);
+	   	prim_buffer->max_dwords -= 5; /* Leave room for the softrap */
+	   	prim_buffer->sec_used = 0;
+	   	prim_buffer->idx = i;
+		prim_buffer->prim_age = i + 1;
+	   	offset = offset + size_of_buf;
+	   	dev_priv->prim_bufs[i] = prim_buffer;
+	}
+	dev_priv->current_prim_idx = 0;
+        dev_priv->next_prim = 
+		dev_priv->last_prim = 
+		dev_priv->current_prim =
+        	dev_priv->prim_bufs[0];
+	dev_priv->next_prim_age = 2;	
+	dev_priv->last_prim_age = 1;
+   	set_bit(MGA_BUF_IN_USE, &dev_priv->current_prim->buffer_status);
+   	return 0;
+}
+
+static void mga_fire_primary(drm_device_t *dev, drm_mga_prim_buf_t *prim)
+{
+       	drm_mga_private_t *dev_priv = dev->dev_private;
+      	drm_device_dma_t  *dma	    = dev->dma;
+       	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+ 	int use_agp = PDEA_pagpxfer_enable;
+	unsigned long end;
+   	int i;
+   	int next_idx;
+       	PRIMLOCALS;
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+   	dev_priv->last_prim = prim;
+   
+ 	/* We never check for overflow, b/c there is always room */
+    	PRIMPTR(prim);
+   	if(num_dwords <= 0) {
+		DRM_DEBUG("num_dwords == 0 when dispatched\n");
+		goto out_prim_wait;
+	}
+ 	PRIMOUTREG( MGAREG_DMAPAD, 0);
+ 	PRIMOUTREG( MGAREG_DMAPAD, 0);
+       	PRIMOUTREG( MGAREG_DMAPAD, 0);
+   	PRIMOUTREG( MGAREG_SOFTRAP, 0);
+    	PRIMFINISH(prim);
+
+	end = ticks + (hz*3);
+    	if(sarea_priv->dirty & MGA_DMA_FLUSH) {
+		DRM_DEBUG("Dma top flush\n");	   
+		while((MGA_READ(MGAREG_STATUS) & 0x00030001) != 0x00020000) {
+			if((signed)(end - ticks) <= 0) {
+				DRM_ERROR("irqs: %d wanted %d\n", 
+					  atomic_read(&dev->total_irq), 
+					  atomic_read(&dma->total_lost));
+				DRM_ERROR("lockup in fire primary "
+					  "(Dma Top Flush)\n");
+				goto out_prim_wait;
+			}
+	      
+			for (i = 0 ; i < 4096 ; i++) mga_delay();
+		}
+		sarea_priv->dirty &= ~(MGA_DMA_FLUSH);
+	} else {
+		DRM_DEBUG("Status wait\n");
+		while((MGA_READ(MGAREG_STATUS) & 0x00020001) != 0x00020000) {
+			if((signed)(end - ticks) <= 0) {
+				DRM_ERROR("irqs: %d wanted %d\n", 
+					  atomic_read(&dev->total_irq), 
+					  atomic_read(&dma->total_lost));
+				DRM_ERROR("lockup in fire primary "
+					  "(Status Wait)\n");
+				goto out_prim_wait;
+			}
+	   
+			for (i = 0 ; i < 4096 ; i++) mga_delay();
+		}
+	}
+
+   	mga_flush_write_combine();
+    	atomic_inc(&dev_priv->pending_bufs);
+       	MGA_WRITE(MGAREG_PRIMADDRESS, phys_head | TT_GENERAL);
+ 	MGA_WRITE(MGAREG_PRIMEND, (phys_head + num_dwords * 4) | use_agp);
+   	prim->num_dwords = 0;
+	sarea_priv->last_enqueue = prim->prim_age;
+    
+   	next_idx = prim->idx + 1;
+    	if(next_idx >= MGA_NUM_PRIM_BUFS) 
+		next_idx = 0;
+
+    	dev_priv->next_prim = dev_priv->prim_bufs[next_idx];
+	return;
+
+ out_prim_wait:
+	prim->num_dwords = 0;
+	prim->sec_used = 0;
+	clear_bit(MGA_BUF_IN_USE, &prim->buffer_status);
+   	wakeup(&dev_priv->wait_queue);
+	clear_bit(MGA_BUF_SWAP_PENDING, &prim->buffer_status);
+	clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status);
+}
+
+int mga_advance_primary(drm_device_t *dev)
+{
+   	drm_mga_private_t *dev_priv = dev->dev_private;
+   	drm_mga_prim_buf_t *prim_buffer;
+   	drm_device_dma_t  *dma      = dev->dma;
+   	int		  next_prim_idx;
+   	int		  ret = 0;
+	int		  s;
+   
+   	/* This needs to reset the primary buffer if available,
+	 * we should collect stats on how many times it bites
+	 * it's tail */
+	DRM_DEBUG("%s\n", __FUNCTION__);
+   
+   	next_prim_idx = dev_priv->current_prim_idx + 1;
+   	if(next_prim_idx >= MGA_NUM_PRIM_BUFS)
+     		next_prim_idx = 0;
+   	prim_buffer = dev_priv->prim_bufs[next_prim_idx];
+	set_bit(MGA_IN_WAIT, &dev_priv->dispatch_status);
+   
+      	/* In use is cleared in interrupt handler */
+   
+	s = splsofttq();
+   	if(test_and_set_bit(MGA_BUF_IN_USE, &prim_buffer->buffer_status)) {
+	   	for (;;) {
+		   	mga_dma_schedule(dev, 0);
+		   	if(!test_and_set_bit(MGA_BUF_IN_USE, 
+					     &prim_buffer->buffer_status)) 
+				break;
+		   	atomic_inc(&dev->total_sleeps);
+		   	atomic_inc(&dma->total_missed_sched);
+			ret = tsleep(&dev_priv->wait_queue, PZERO|PCATCH,
+				     "mgaap", 0);
+			if (ret)
+				break;
+		}
+	   	if(ret) {
+			splx(s);
+			return ret;
+		}
+	}
+	clear_bit(MGA_IN_WAIT, &dev_priv->dispatch_status);
+	splx(s);
+
+   	/* This primary buffer is now free to use */
+   	prim_buffer->current_dma_ptr = prim_buffer->head;
+   	prim_buffer->num_dwords = 0;
+   	prim_buffer->sec_used = 0;
+	prim_buffer->prim_age = dev_priv->next_prim_age++;
+	if(prim_buffer->prim_age == 0 || prim_buffer->prim_age == 0xffffffff) {
+	   mga_flush_queue(dev);
+	   mga_dma_quiescent(dev);
+	   mga_reset_freelist(dev);
+	   prim_buffer->prim_age = (dev_priv->next_prim_age += 2);
+	}
+
+	/* Reset all buffer status stuff */
+	clear_bit(MGA_BUF_NEEDS_OVERFLOW, &prim_buffer->buffer_status);
+	clear_bit(MGA_BUF_FORCE_FIRE, &prim_buffer->buffer_status);
+	clear_bit(MGA_BUF_SWAP_PENDING, &prim_buffer->buffer_status);
+
+   	dev_priv->current_prim = prim_buffer;
+   	dev_priv->current_prim_idx = next_prim_idx;
+   	return 0;
+}
+
+/* More dynamic performance decisions */
+static __inline int mga_decide_to_fire(drm_device_t *dev)
+{
+   	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+      	drm_device_dma_t  *dma	    = dev->dma;
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	if(test_bit(MGA_BUF_FORCE_FIRE, &dev_priv->next_prim->buffer_status)) {
+	   	atomic_inc(&dma->total_prio);
+	   	return 1;
+	}
+
+	if (test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status) &&
+	    dev_priv->next_prim->num_dwords) {
+	   	atomic_inc(&dma->total_prio);
+	   	return 1;
+	}
+
+	if (test_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status) &&
+	    dev_priv->next_prim->num_dwords) {
+	   	atomic_inc(&dma->total_prio);
+	   	return 1;
+	}
+   
+   	if(atomic_read(&dev_priv->pending_bufs) <= MGA_NUM_PRIM_BUFS - 1) {
+		if(test_bit(MGA_BUF_SWAP_PENDING, 
+			    &dev_priv->next_prim->buffer_status)) {
+			atomic_inc(&dma->total_dmas);
+			return 1;
+		}
+	}
+
+   	if(atomic_read(&dev_priv->pending_bufs) <= MGA_NUM_PRIM_BUFS / 2) {
+		if(dev_priv->next_prim->sec_used >= MGA_DMA_BUF_NR / 8) {
+			atomic_inc(&dma->total_hit);
+			return 1;
+		}
+	}
+
+   	if(atomic_read(&dev_priv->pending_bufs) >= MGA_NUM_PRIM_BUFS / 2) {
+		if(dev_priv->next_prim->sec_used >= MGA_DMA_BUF_NR / 4) {
+			atomic_inc(&dma->total_missed_free);
+			return 1;
+		}
+	}
+
+   	atomic_inc(&dma->total_tried);
+   	return 0;
+}
+
+int mga_dma_schedule(drm_device_t *dev, int locked)
+{
+      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+      	drm_device_dma_t  *dma	    = dev->dma;
+
+   	if (test_and_set_bit(0, &dev->dma_flag)) {
+		atomic_inc(&dma->total_missed_dma);
+		return EBUSY;
+	}
+   
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	if (!dev_priv) {
+		DRM_DEBUG("dev_priv is not set\n");
+		return (0);
+	}
+
+   	if(test_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status) || 
+	   test_bit(MGA_IN_WAIT, &dev_priv->dispatch_status) ||
+	   test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status)) {
+		locked = 1;
+	}
+   
+   	if (!locked && 
+	    !drm_lock_take(&dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT)) {
+	   	atomic_inc(&dma->total_missed_lock);
+	   	clear_bit(0, &dev->dma_flag);
+		DRM_DEBUG("Not locked\n");
+	   	return EBUSY;
+	}
+   	DRM_DEBUG("I'm locked\n");
+
+   	if(!test_and_set_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status)) {
+	   	/* Fire dma buffer */
+	   	if(mga_decide_to_fire(dev)) {
+		   	DRM_DEBUG("idx :%d\n", dev_priv->next_prim->idx);
+			clear_bit(MGA_BUF_FORCE_FIRE, 
+				  &dev_priv->next_prim->buffer_status);
+		   	if(dev_priv->current_prim == dev_priv->next_prim) {
+				/* Schedule overflow for a later time */
+				set_bit(MGA_BUF_NEEDS_OVERFLOW,
+					&dev_priv->next_prim->buffer_status);
+			}
+		   	mga_fire_primary(dev, dev_priv->next_prim);
+		} else {
+			clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status);
+		}
+	} else {
+		DRM_DEBUG("I can't get the dispatch lock\n");
+	}
+   	
+	if (!locked) {
+		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+
+      	if(test_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status) &&
+	   dev_priv->next_prim->num_dwords == 0 &&
+	   atomic_read(&dev_priv->pending_bufs) == 0) {
+	   	/* Everything has been processed by the hardware */
+		clear_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status);
+	   	wakeup(&dev_priv->flush_queue);
+	}
+
+	if(test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status) &&
+	   dev_priv->tail->age < dev_priv->last_prim_age) {
+		clear_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status);
+		DRM_DEBUG("Waking up buf queue\n");
+		wakeup(&dev_priv->buf_queue);
+	} else if (test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status)) {
+	   	DRM_DEBUG("Not waking buf_queue on %d %d\n", 
+			  atomic_read(&dev->total_irq), 
+			  dev_priv->last_prim_age);
+	}
+
+   	clear_bit(0, &dev->dma_flag);
+	return 0;
+}
+
+static void mga_dma_service(void *arg)
+{
+    	drm_device_t	 *dev = (drm_device_t *)arg;
+    	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+    	drm_mga_prim_buf_t *last_prim_buffer;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+    	atomic_inc(&dev->total_irq);
+	if((MGA_READ(MGAREG_STATUS) & 0x00000001) != 0x00000001) return;
+      	MGA_WRITE(MGAREG_ICLEAR, 0x00000001);
+   	last_prim_buffer = dev_priv->last_prim;
+    	last_prim_buffer->num_dwords = 0;
+    	last_prim_buffer->sec_used = 0;
+	dev_priv->sarea_priv->last_dispatch = 
+		dev_priv->last_prim_age = last_prim_buffer->prim_age;
+      	clear_bit(MGA_BUF_IN_USE, &last_prim_buffer->buffer_status);
+   	wakeup(&dev_priv->wait_queue);
+      	clear_bit(MGA_BUF_SWAP_PENDING, &last_prim_buffer->buffer_status);
+      	clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status);
+      	atomic_dec(&dev_priv->pending_bufs);
+	taskqueue_enqueue(taskqueue_swi, &dev->task);
+}
+
+static void mga_dma_task_queue(void *device, int pending)
+{
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	mga_dma_schedule((drm_device_t *)device, 0);
+}
+
+int mga_dma_cleanup(drm_device_t *dev)
+{
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if(dev->dev_private) {
+		drm_mga_private_t *dev_priv = 
+			(drm_mga_private_t *) dev->dev_private;
+      
+		if(dev_priv->ioremap) {
+			int temp = (dev_priv->warp_ucode_size + 
+				    dev_priv->primary_size + 
+				    PAGE_SIZE - 1) / PAGE_SIZE * PAGE_SIZE;
+
+			drm_ioremapfree((void *) dev_priv->ioremap, temp);
+		}
+	   	if(dev_priv->real_status_page != 0UL) {
+		   	mga_free_page(dev, dev_priv->real_status_page);
+		}
+	   	if(dev_priv->prim_bufs != NULL) {
+		   	int i;
+		   	for(i = 0; i < MGA_NUM_PRIM_BUFS; i++) {
+			   	if(dev_priv->prim_bufs[i] != NULL) {
+			     		drm_free(dev_priv->prim_bufs[i],
+						 sizeof(drm_mga_prim_buf_t),
+						 DRM_MEM_DRIVER);
+				}
+			}
+		   	drm_free(dev_priv->prim_bufs, sizeof(void *) *
+				 (MGA_NUM_PRIM_BUFS + 1), 
+				 DRM_MEM_DRIVER);
+		}
+		if(dev_priv->head != NULL) {
+		   	mga_freelist_cleanup(dev);
+		}
+
+
+		drm_free(dev->dev_private, sizeof(drm_mga_private_t), 
+			 DRM_MEM_DRIVER);
+		dev->dev_private = NULL;
+	}
+
+	return 0;
+}
+
+static int mga_dma_initialize(drm_device_t *dev, drm_mga_init_t *init) {
+	drm_mga_private_t *dev_priv;
+	drm_map_t *sarea_map = NULL;
+	int i;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	dev_priv = drm_alloc(sizeof(drm_mga_private_t), DRM_MEM_DRIVER);
+	if(dev_priv == NULL) return ENOMEM;
+	dev->dev_private = (void *) dev_priv;
+
+	memset(dev_priv, 0, sizeof(drm_mga_private_t));
+
+	if((init->reserved_map_idx >= dev->map_count) ||
+	   (init->buffer_map_idx >= dev->map_count)) {
+		mga_dma_cleanup(dev);
+		DRM_DEBUG("reserved_map or buffer_map are invalid\n");
+		return EINVAL;
+	}
+   
+	dev_priv->reserved_map_idx = init->reserved_map_idx;
+	dev_priv->buffer_map_idx = init->buffer_map_idx;
+	sarea_map = dev->maplist[0];
+	dev_priv->sarea_priv = (drm_mga_sarea_t *) 
+		((u_int8_t *)sarea_map->handle + 
+		 init->sarea_priv_offset);
+
+	/* Scale primary size to the next page */
+	dev_priv->chipset = init->chipset;
+	dev_priv->frontOffset = init->frontOffset;
+	dev_priv->backOffset = init->backOffset;
+	dev_priv->depthOffset = init->depthOffset;
+	dev_priv->textureOffset = init->textureOffset;
+	dev_priv->textureSize = init->textureSize;
+	dev_priv->cpp = init->cpp;
+	dev_priv->sgram = init->sgram;
+	dev_priv->stride = init->stride;
+
+	dev_priv->mAccess = init->mAccess;
+   	dev_priv->flush_queue = 0;
+	dev_priv->buf_queue = 0;
+	dev_priv->WarpPipe = -1;
+
+   	DRM_DEBUG("chipset: %d ucode_size: %d backOffset: %x depthOffset: %x\n",
+		  dev_priv->chipset, dev_priv->warp_ucode_size, 
+		  dev_priv->backOffset, dev_priv->depthOffset);
+   	DRM_DEBUG("cpp: %d sgram: %d stride: %d maccess: %x\n",
+		  dev_priv->cpp, dev_priv->sgram, dev_priv->stride, 
+		  dev_priv->mAccess);
+   
+	memcpy(&dev_priv->WarpIndex, &init->WarpIndex, 
+	       sizeof(drm_mga_warp_index_t) * MGA_MAX_WARP_PIPES);
+
+   	for (i = 0 ; i < MGA_MAX_WARP_PIPES ; i++) 
+		DRM_DEBUG("warp pipe %d: installed: %d phys: %lx size: %x\n",
+			  i, 
+			  dev_priv->WarpIndex[i].installed,
+			  dev_priv->WarpIndex[i].phys_addr,
+			  dev_priv->WarpIndex[i].size);
+
+   	if(mga_init_primary_bufs(dev, init) != 0) {
+		DRM_ERROR("Can not initialize primary buffers\n");
+		mga_dma_cleanup(dev);
+		return ENOMEM;
+	}
+   	dev_priv->real_status_page = mga_alloc_page(dev);
+      	if(dev_priv->real_status_page == 0UL) {
+		mga_dma_cleanup(dev);
+		DRM_ERROR("Can not allocate status page\n");
+		return ENOMEM;
+	}
+
+   	dev_priv->status_page = (void*)dev_priv->real_status_page; /* XXX wants nocache */
+#if 0
+   	dev_priv->status_page = 
+		ioremap_nocache(virt_to_bus((void *)dev_priv->real_status_page),
+				PAGE_SIZE);
+
+   	if(dev_priv->status_page == NULL) {
+		mga_dma_cleanup(dev);
+		DRM_ERROR("Can not remap status page\n");
+		return ENOMEM;
+	}
+#endif
+
+   	/* Write status page when secend or softrap occurs */
+   	MGA_WRITE(MGAREG_PRIMPTR, 
+		  vtophys((void *)dev_priv->real_status_page) | 0x00000003);
+      
+
+	/* Private is now filled in, initialize the hardware */
+	{
+		PRIMLOCALS;
+		PRIMGETPTR( dev_priv );
+	   	   
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DWGSYNC, 0x0100);
+		PRIMOUTREG(MGAREG_SOFTRAP, 0);
+		/* Poll for the first buffer to insure that
+		 * the status register will be correct
+		 */
+	   
+		mga_flush_write_combine();
+	   	MGA_WRITE(MGAREG_PRIMADDRESS, phys_head | TT_GENERAL);
+
+		MGA_WRITE(MGAREG_PRIMEND, ((phys_head + num_dwords * 4) | 
+					   PDEA_pagpxfer_enable));
+	   
+	   	while(MGA_READ(MGAREG_DWGSYNC) != 0x0100) ;
+	}
+
+	if(mga_freelist_init(dev) != 0) {
+	   	DRM_ERROR("Could not initialize freelist\n");
+	   	mga_dma_cleanup(dev);
+	   	return ENOMEM;
+	}
+	return 0;
+}
+
+int
+mga_dma_init(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t *dev = kdev->si_drv1;
+	drm_mga_init_t init;
+   
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	init = *(drm_mga_init_t *) data;
+   
+	switch(init.func) {
+	case MGA_INIT_DMA:
+		return mga_dma_initialize(dev, &init);
+	case MGA_CLEANUP_DMA:
+		return mga_dma_cleanup(dev);
+	}
+
+	return EINVAL;
+}
+
+int mga_irq_install(drm_device_t *dev, int irq)
+{
+	int rid;
+	int retcode;
+
+	if (!irq)     return EINVAL;
+	
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	if (dev->irq) {
+		lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+		return EBUSY;
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	
+	DRM_DEBUG("install irq handler %d\n", irq);
+
+	dev->context_flag     = 0;
+	dev->interrupt_flag   = 0;
+	dev->dma_flag	      = 0;
+	dev->dma->next_buffer = NULL;
+	dev->dma->next_queue  = NULL;
+	dev->dma->this_buffer = NULL;
+	TASK_INIT(&dev->task, 0, mga_dma_task_queue, dev);
+
+				/* Before installing handler */
+	MGA_WRITE(MGAREG_IEN, 0);
+   				/* Install handler */
+	rid = 0;
+	dev->irq = bus_alloc_resource(dev->device, SYS_RES_IRQ, &rid,
+				      0, ~0, 1, RF_SHAREABLE);
+	if (!dev->irq)
+		return ENOENT;
+
+	retcode = bus_setup_intr(dev->device, dev->irq, INTR_TYPE_TTY,
+				 mga_dma_service, dev, &dev->irqh);
+	if (retcode) {
+		bus_release_resource(dev->device, SYS_RES_IRQ, 0, dev->irq);
+		dev->irq = 0;
+		return retcode;
+	}
+
+				/* After installing handler */
+   	MGA_WRITE(MGAREG_ICLEAR, 0x00000001);
+	MGA_WRITE(MGAREG_IEN, 0x00000001);
+	return 0;
+}
+
+int mga_irq_uninstall(drm_device_t *dev)
+{
+	if (!dev->irq)
+		return EINVAL;
+	
+   	DRM_DEBUG("remove irq handler %ld\n", rman_get_start(dev->irq));
+      	MGA_WRITE(MGAREG_ICLEAR, 0x00000001);
+	MGA_WRITE(MGAREG_IEN, 0);
+
+	bus_teardown_intr(dev->device, dev->irq, dev->irqh);
+	bus_release_resource(dev->device, SYS_RES_IRQ, 0, dev->irq);
+	dev->irq = 0;
+
+	return 0;
+}
+
+int mga_control(dev_t kdev, u_long cmd, caddr_t data,
+		int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_control_t	ctl;
+   
+	ctl = *(drm_control_t *) data;
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	switch (ctl.func) {
+	case DRM_INST_HANDLER:
+		return mga_irq_install(dev, ctl.irq);
+	case DRM_UNINST_HANDLER:
+		return mga_irq_uninstall(dev);
+	default:
+		return EINVAL;
+	}
+}
+
+static int mga_flush_queue(drm_device_t *dev)
+{
+  	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+   	int ret = 0;
+	int s;
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	if(dev_priv == NULL) {
+	   	return 0;
+	}
+   
+   	if(dev_priv->next_prim->num_dwords != 0) {
+		s = splsofttq();
+		set_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status);
+   		for (;;) {
+		   	mga_dma_schedule(dev, 0);
+	   		if (!test_bit(MGA_IN_FLUSH, 
+				      &dev_priv->dispatch_status)) 
+				break;
+		   	atomic_inc(&dev->total_sleeps);
+			ret = tsleep(&dev_priv->flush_queue, PZERO|PCATCH,
+				     "mgafq", 0);
+			if (ret) {
+				clear_bit(MGA_IN_FLUSH, 
+					  &dev_priv->dispatch_status);
+		   		break;
+			}
+		}
+		splx(s);
+	}
+   	return ret;
+}
+
+/* Must be called with the lock held */
+void mga_reclaim_buffers(drm_device_t *dev, pid_t pid)
+{
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma) return;
+      	if(dev->dev_private == NULL) return;
+	if(dma->buflist == NULL) return;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+        mga_flush_queue(dev);
+
+	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+
+		/* Only buffers that need to get reclaimed ever 
+		 * get set to free 
+		 */
+		if (buf->pid == pid  && buf_priv) {
+			if(buf_priv->my_freelist->age == MGA_BUF_USED) 
+		     		buf_priv->my_freelist->age = MGA_BUF_FREE;
+		}
+	}
+}
+
+int mga_lock(dev_t kdev, u_long cmd, caddr_t data,
+	     int flags, struct proc *p)
+{
+	drm_device_t	  *dev	  = kdev->si_drv1;
+	int		  ret	= 0;
+	drm_lock_t	  lock;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	lock = *(drm_lock_t *) data;
+
+	if (lock.context == DRM_KERNEL_CONTEXT) {
+		DRM_ERROR("Process %d using kernel context %d\n",
+			  p->p_pid, lock.context);
+		return EINVAL;
+	}
+   
+   	DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
+	       lock.context, p->p_pid, dev->lock.hw_lock->lock,
+	       lock.flags);
+
+	if (lock.context < 0) {
+		return EINVAL;
+	}
+   
+	/* Only one queue:
+	 */
+
+	if (!ret) {
+		atomic_inc(&dev->lock.lock_queue);
+		for (;;) {
+			if (!dev->lock.hw_lock) {
+				/* Device has been unregistered */
+				ret = EINTR;
+				break;
+			}
+			if (drm_lock_take(&dev->lock.hw_lock->lock,
+					  lock.context)) {
+				dev->lock.pid	    = p->p_pid;
+				dev->lock.lock_time = ticks;
+				atomic_inc(&dev->total_locks);
+				break;	/* Got lock */
+			}
+			
+				/* Contention */
+			atomic_inc(&dev->total_sleeps);
+			ret = tsleep(&dev->lock.lock_queue, PZERO|PCATCH,
+					 "mgal2", 0);
+			if (ret)
+				break;
+		}
+		atomic_dec(&dev->lock.lock_queue);
+	}
+	
+	if (!ret) {
+		if (lock.flags & _DRM_LOCK_QUIESCENT) {
+		   DRM_DEBUG("_DRM_LOCK_QUIESCENT\n");
+		   mga_flush_queue(dev);
+		   mga_dma_quiescent(dev);
+		}
+	}
+   
+	DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
+	return ret;
+}
+		
+int mga_flush_ioctl(dev_t kdev, u_long cmd, caddr_t data,
+		    int flags, struct proc *p)
+{
+	drm_device_t	  *dev	  = kdev->si_drv1;
+	drm_lock_t	  lock;
+      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+	int		  s;
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+	lock = *(drm_lock_t *) data;
+
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_flush_ioctl called without lock held\n");
+		return EINVAL;
+	}
+
+   	if(lock.flags & _DRM_LOCK_FLUSH || lock.flags & _DRM_LOCK_FLUSH_ALL) {
+		drm_mga_prim_buf_t *temp_buf =
+			dev_priv->prim_bufs[dev_priv->current_prim_idx];
+
+		if(temp_buf && temp_buf->num_dwords) {
+			s = splsofttq();
+			set_bit(MGA_BUF_FORCE_FIRE, &temp_buf->buffer_status);
+			mga_advance_primary(dev);
+			mga_dma_schedule(dev, 1);
+			splx(s);
+ 		}
+	}
+   	if(lock.flags & _DRM_LOCK_QUIESCENT) {
+		mga_flush_queue(dev);
+		mga_dma_quiescent(dev);
+	}
+
+    	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c	Fri Jun 16 17:03:32 2000
@@ -0,0 +1,714 @@
+/* mga_drv.c -- Matrox g200/g400 driver
+ * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
+ * 
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ *
+ *
+ */
+
+#include "drmP.h"
+#include "mga_drv.h"
+
+#include <pci/pcivar.h>
+
+MODULE_DEPEND(mga, drm, 1, 1, 1);
+MODULE_DEPEND(mga, agp, 1, 1, 1);
+
+#define MGA_NAME	 "mga"
+#define MGA_DESC	 "Matrox g200/g400"
+#define MGA_DATE	 "19991213"
+#define MGA_MAJOR	 1
+#define MGA_MINOR	 0
+#define MGA_PATCHLEVEL	 0
+
+drm_ctx_t		      mga_res_ctx;
+
+static int mga_probe(device_t dev)
+{
+	const char *s = 0;
+
+	switch (pci_get_devid(dev)) {
+	case 0x0525102b:
+		s = "Matrox MGA G400 AGP graphics accelerator";
+		break;
+
+	case 0x0521102b:
+		s = "Matrox MGA G200 AGP graphics accelerator";
+		break;
+	}
+
+	if (s) {
+		device_set_desc(dev, s);
+		return 0;
+	}
+
+	return ENXIO;
+}
+
+static int mga_attach(device_t dev)
+{
+	return mga_init(dev);
+}
+
+static int mga_detach(device_t dev)
+{
+	mga_cleanup(dev);
+	return 0;
+}
+
+static device_method_t mga_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		mga_probe),
+	DEVMETHOD(device_attach,	mga_attach),
+	DEVMETHOD(device_detach,	mga_detach),
+
+	{ 0, 0 }
+};
+
+static driver_t mga_driver = {
+	"drm",
+	mga_methods,
+	sizeof(drm_device_t),
+};
+
+static devclass_t mga_devclass;
+#define MGA_SOFTC(unit) \
+	((drm_device_t *) devclass_get_softc(mga_devclass, unit))
+
+DRIVER_MODULE(if_mga, pci, mga_driver, mga_devclass, 0, 0);
+
+#define CDEV_MAJOR	145
+				/* mga_drv.c */
+static struct cdevsw mga_cdevsw = {
+	/* open */	mga_open,
+	/* close */	mga_close,
+	/* read */	drm_read,
+	/* write */	drm_write,
+	/* ioctl */	mga_ioctl,
+	/* poll */	drm_poll,
+	/* mmap */	drm_mmap,
+	/* strategy */	nostrategy,
+	/* name */	"mga",
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY | D_TRACKCLOSE,
+	/* bmaj */	-1
+};
+
+static drm_ioctl_desc_t	      mga_ioctls[] = {
+	[DRM_IOCTL_NR(DRM_IOCTL_VERSION)]     = { mga_version,	  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE)]  = { drm_getunique,  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_MAGIC)]   = { drm_getmagic,	  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_IRQ_BUSID)]   = { drm_irq_busid,  0, 1 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)]  = { drm_setunique,  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]	      = { drm_block,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]     = { drm_unblock,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]     = { mga_control,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)]  = { drm_authmagic,  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]     = { drm_addmap,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_BUFS)]    = { mga_addbufs,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MARK_BUFS)]   = { mga_markbufs,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_INFO_BUFS)]   = { mga_infobufs,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS)]    = { mga_mapbufs,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FREE_BUFS)]   = { mga_freebufs,	  1, 0 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)]     = { mga_addctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)]      = { mga_rmctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)]     = { mga_modctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)]     = { mga_getctx,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)]  = { mga_switchctx,  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)]     = { mga_newctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)]     = { mga_resctx,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_DRAW)]    = { drm_adddraw,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_DRAW)]     = { drm_rmdraw,	  1, 1 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	      = { mga_dma,	  1, 0 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_LOCK)]	      = { mga_lock,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)]      = { mga_unlock,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]      = { drm_finish,	  1, 0 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)] = { drm_agp_acquire, 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)] = { drm_agp_release, 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)]  = { drm_agp_enable,  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)]    = { drm_agp_info,    1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC)]   = { drm_agp_alloc,   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)]    = { drm_agp_free,    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)]    = { drm_agp_bind,    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)]  = { drm_agp_unbind,  1, 1 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INIT)]    = { mga_dma_init,    1, 1 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_SWAP)]    = { mga_swap_bufs,   1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_CLEAR)]   = { mga_clear_bufs,  1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_ILOAD)]   = { mga_iload,       1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_VERTEX)]  = { mga_vertex,      1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_FLUSH)]   = { mga_flush_ioctl, 1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INDICES)] = { mga_indices,     1, 0 },
+};
+
+#define MGA_IOCTL_COUNT DRM_ARRAY_SIZE(mga_ioctls)
+
+static int mga_setup(drm_device_t *dev)
+{
+	int i;
+	
+	device_busy(dev->device);
+
+	atomic_set(&dev->ioctl_count, 0);
+	atomic_set(&dev->vma_count, 0);
+	dev->buf_use	  = 0;
+	atomic_set(&dev->buf_alloc, 0);
+
+	drm_dma_setup(dev);
+
+	atomic_set(&dev->total_open, 0);
+	atomic_set(&dev->total_close, 0);
+	atomic_set(&dev->total_ioctl, 0);
+	atomic_set(&dev->total_irq, 0);
+	atomic_set(&dev->total_ctx, 0);
+	atomic_set(&dev->total_locks, 0);
+	atomic_set(&dev->total_unlocks, 0);
+	atomic_set(&dev->total_contends, 0);
+	atomic_set(&dev->total_sleeps, 0);
+
+	for (i = 0; i < DRM_HASH_SIZE; i++) {
+		dev->magiclist[i].head = NULL;
+		dev->magiclist[i].tail = NULL;
+	}
+	dev->maplist	    = NULL;
+	dev->map_count	    = 0;
+	dev->vmalist	    = NULL;
+	dev->lock.hw_lock   = NULL;
+	dev->lock.lock_queue = 0;
+	dev->queue_count    = 0;
+	dev->queue_reserved = 0;
+	dev->queue_slots    = 0;
+	dev->queuelist	    = NULL;
+	dev->irq	    = 0;
+	dev->context_flag   = 0;
+	dev->interrupt_flag = 0;
+	dev->dma_flag	    = 0;
+	dev->last_context   = 0;
+	dev->last_switch    = 0;
+	dev->last_checked   = 0;
+	callout_init(&dev->timer);
+	dev->context_wait   = 0;
+
+	timespecclear(&dev->ctx_start);
+	timespecclear(&dev->lck_start);
+	
+	dev->buf_rp	  = dev->buf;
+	dev->buf_wp	  = dev->buf;
+	dev->buf_end	  = dev->buf + DRM_BSZ;
+	bzero(&dev->buf_sel, sizeof dev->buf_sel);
+	dev->buf_sigio	  = NULL;
+	dev->buf_readers  = 0;
+	dev->buf_writers  = 0;
+	dev->buf_selecting = 0;
+			
+	DRM_DEBUG("\n");
+			
+	/* The kernel's context could be created here, but is now created
+	   in drm_dma_enqueue.	This is more resource-efficient for
+	   hardware that does not do DMA, but may mean that
+	   drm_select_queue fails between the time the interrupt is
+	   initialized and the time the queues are initialized. */
+			
+	return 0;
+}
+
+
+static int mga_takedown(drm_device_t *dev)
+{
+	int		  i;
+	drm_magic_entry_t *pt, *next;
+	drm_map_t	  *map;
+	drm_vma_entry_t	  *vma, *vma_next;
+
+	DRM_DEBUG("\n");
+
+	if (dev->irq) mga_irq_uninstall(dev);
+	
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	callout_stop(&dev->timer);
+	
+	if (dev->devname) {
+		drm_free(dev->devname, strlen(dev->devname)+1, DRM_MEM_DRIVER);
+		dev->devname = NULL;
+	}
+	
+	if (dev->unique) {
+		drm_free(dev->unique, strlen(dev->unique)+1, DRM_MEM_DRIVER);
+		dev->unique = NULL;
+		dev->unique_len = 0;
+	}
+				/* Clear pid list */
+	for (i = 0; i < DRM_HASH_SIZE; i++) {
+		for (pt = dev->magiclist[i].head; pt; pt = next) {
+			next = pt->next;
+			drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+		}
+		dev->magiclist[i].head = dev->magiclist[i].tail = NULL;
+	}
+   				/* Clear AGP information */
+	if (dev->agp) {
+		drm_agp_mem_t *entry;
+		drm_agp_mem_t *nexte;
+		
+				/* Remove AGP resources, but leave dev->agp
+                                   intact until cleanup is called. */
+		for (entry = dev->agp->memory; entry; entry = nexte) {
+			nexte = entry->next;
+			if (entry->bound) drm_unbind_agp(entry->handle);
+			drm_free_agp(entry->handle, entry->pages);
+			drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+		}
+		dev->agp->memory = NULL;
+		
+		if (dev->agp->acquired)
+			agp_release(dev->agp->agpdev);
+		
+		dev->agp->acquired = 0;
+		dev->agp->enabled  = 0;
+	}
+				/* Clear vma list (only built for debugging) */
+	if (dev->vmalist) {
+		for (vma = dev->vmalist; vma; vma = vma_next) {
+			vma_next = vma->next;
+			drm_free(vma, sizeof(*vma), DRM_MEM_VMAS);
+		}
+		dev->vmalist = NULL;
+	}
+	
+				/* Clear map area and mtrr information */
+	if (dev->maplist) {
+		for (i = 0; i < dev->map_count; i++) {
+			map = dev->maplist[i];
+			switch (map->type) {
+			case _DRM_REGISTERS:
+			case _DRM_FRAME_BUFFER:
+#ifdef CONFIG_MTRR
+				if (map->mtrr >= 0) {
+					int retcode;
+					retcode = mtrr_del(map->mtrr,
+							   map->offset,
+							   map->size);
+					DRM_DEBUG("mtrr_del = %d\n", retcode);
+				}
+#endif
+				drm_ioremapfree(map->handle, map->size);
+				break;
+			case _DRM_SHM:
+				drm_free_pages((unsigned long)map->handle,
+					       drm_order(map->size)
+					       - PAGE_SHIFT,
+					       DRM_MEM_SAREA);
+				break;
+			case _DRM_AGP:
+				break;
+			}
+			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+		}
+		drm_free(dev->maplist,
+			 dev->map_count * sizeof(*dev->maplist),
+			 DRM_MEM_MAPS);
+		dev->maplist   = NULL;
+		dev->map_count = 0;
+	}
+	
+	if (dev->queuelist) {
+		for (i = 0; i < dev->queue_count; i++) {
+			drm_waitlist_destroy(&dev->queuelist[i]->waitlist);
+			if (dev->queuelist[i]) {
+				drm_free(dev->queuelist[i],
+					 sizeof(*dev->queuelist[0]),
+					 DRM_MEM_QUEUES);
+				dev->queuelist[i] = NULL;
+			}
+		}
+		drm_free(dev->queuelist,
+			 dev->queue_slots * sizeof(*dev->queuelist),
+			 DRM_MEM_QUEUES);
+		dev->queuelist	 = NULL;
+	}
+
+	drm_dma_takedown(dev);
+
+	dev->queue_count     = 0;
+	if (dev->lock.hw_lock) {
+		dev->lock.hw_lock    = NULL; /* SHM removed */
+		dev->lock.pid	     = 0;
+		wakeup(&dev->lock.lock_queue);
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+	
+	return 0;
+}
+
+/* mga_init is called via mga_attach at module load time, */
+
+int
+mga_init(device_t nbdev)
+{
+	int		      retcode;
+	drm_device_t	      *dev = device_get_softc(nbdev);
+
+	DRM_DEBUG("\n");
+
+	memset((void *)dev, 0, sizeof(*dev));
+	simple_lock_init(&dev->count_lock);
+	lockinit(&dev->dev_lock, PZERO, "drmlk", 0, 0);
+	
+#if 0
+	drm_parse_options(mga);
+#endif
+	dev->device = nbdev;
+	dev->devnode = make_dev(&mga_cdevsw,
+				device_get_unit(nbdev),
+				DRM_DEV_UID,
+				DRM_DEV_GID,
+				DRM_DEV_MODE,
+				MGA_NAME);
+	dev->name   = MGA_NAME;
+
+   	DRM_DEBUG("doing mem init\n");
+	drm_mem_init();
+	DRM_DEBUG("doing proc init\n");
+	drm_sysctl_init(dev);
+	TAILQ_INIT(&dev->files);
+	DRM_DEBUG("doing agp init\n");
+	dev->agp    = drm_agp_init();
+      	if(dev->agp == NULL) {
+	   	DRM_INFO("The mga drm module requires the agp module"
+			 " to function correctly\nPlease load the agp"
+			 " module before you load the mga module\n");
+	   	drm_sysctl_cleanup(dev);
+	   	mga_takedown(dev);
+	   	return ENOMEM;
+	}
+#if 0
+   	dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,
+				      dev->agp->agp_info.aper_size * 1024 * 1024,
+				      MTRR_TYPE_WRCOMB,
+				      1);
+#endif
+	DRM_DEBUG("doing ctxbitmap init\n");
+	if((retcode = drm_ctxbitmap_init(dev))) {
+		DRM_ERROR("Cannot allocate memory for context bitmap.\n");
+		drm_sysctl_cleanup(dev);
+		mga_takedown(dev);
+		return retcode;
+	}
+
+	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
+		 MGA_NAME,
+		 MGA_MAJOR,
+		 MGA_MINOR,
+		 MGA_PATCHLEVEL,
+		 MGA_DATE,
+		 device_get_unit(nbdev));
+
+	return 0;
+}
+
+/* mga_cleanup is called via cleanup_module at module unload time. */
+
+void mga_cleanup(device_t nbdev)
+{
+	drm_device_t	      *dev = device_get_softc(nbdev);
+
+	DRM_DEBUG("\n");
+	
+	drm_sysctl_cleanup(dev);
+	destroy_dev(dev->devnode);
+
+	DRM_INFO("Module unloaded\n");
+	drm_ctxbitmap_cleanup(dev);
+	mga_dma_cleanup(dev);
+#if 0
+   	if(dev->agp && dev->agp->agp_mtrr) {
+	   	int retval;
+	   	retval = mtrr_del(dev->agp->agp_mtrr, 
+				  dev->agp->agp_info.aper_base,
+				  dev->agp->agp_info.aper_size * 1024*1024);
+	   	DRM_DEBUG("mtrr_del = %d\n", retval);
+	}
+#endif
+
+	mga_takedown(dev);
+	if (dev->agp) {
+		drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
+		dev->agp = NULL;
+	}
+}
+
+int
+mga_version(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_version_t version;
+	int	      len;
+
+	version = *(drm_version_t *) data;
+
+#define DRM_COPY(name,value)				\
+	len = strlen(value);				\
+	if (len > name##_len) len = name##_len;		\
+	name##_len = strlen(value);			\
+	if (len && name) {				\
+		int error = copyout(value, name, len);	\
+		if (error) return error;		\
+	}
+
+	version.version_major	   = MGA_MAJOR;
+	version.version_minor	   = MGA_MINOR;
+	version.version_patchlevel = MGA_PATCHLEVEL;
+
+	DRM_COPY(version.name, MGA_NAME);
+	DRM_COPY(version.date, MGA_DATE);
+	DRM_COPY(version.desc, MGA_DESC);
+
+	*(drm_version_t *) data = version;
+	return 0;
+}
+
+int
+mga_open(dev_t kdev, int flags, int fmt, struct proc *p)
+{
+	drm_device_t  *dev    = MGA_SOFTC(minor(kdev));
+	int	      retcode = 0;
+	
+	DRM_DEBUG("open_count = %d\n", dev->open_count);
+
+	device_busy(dev->device);
+	if (!(retcode = drm_open_helper(kdev, flags, fmt, p, dev))) {
+		atomic_inc(&dev->total_open);
+		simple_lock(&dev->count_lock);
+		if (!dev->open_count++) {
+			simple_unlock(&dev->count_lock);
+			retcode = mga_setup(dev);
+		}
+		simple_unlock(&dev->count_lock);
+	}
+	device_unbusy(dev->device);
+
+	return retcode;
+}
+
+int
+mga_close(dev_t kdev, int flags, int fmt, struct proc *p)
+{
+	drm_device_t  *dev    = kdev->si_drv1;
+	drm_file_t    *priv;
+	int	      retcode = 0;
+
+	DRM_DEBUG("pid = %d, open_count = %d\n",
+		  p->p_pid, dev->open_count);
+
+	priv = drm_find_file_by_proc(dev, p);
+	if (!priv) {
+		DRM_DEBUG("can't find authenticator\n");
+		return EINVAL;
+	}
+
+	if (dev->lock.hw_lock && _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)
+	    && dev->lock.pid == p->p_pid) {
+	      	mga_reclaim_buffers(dev, priv->pid);
+		DRM_ERROR("Process %d dead, freeing lock for context %d\n",
+			  p->p_pid,
+			  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		drm_lock_free(dev,
+			      &dev->lock.hw_lock->lock,
+			      _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		
+				/* FIXME: may require heavy-handed reset of
+                                   hardware at this point, possibly
+                                   processed via a callback to the X
+                                   server. */
+	} else if (dev->lock.hw_lock) {
+	   	/* The lock is required to reclaim buffers */
+		for (;;) {
+			if (!dev->lock.hw_lock) {
+				/* Device has been unregistered */
+				retcode = EINTR;
+				break;
+			}
+			if (drm_lock_take(&dev->lock.hw_lock->lock,
+					  DRM_KERNEL_CONTEXT)) {
+				dev->lock.pid	    = p->p_pid;
+				dev->lock.lock_time = ticks;
+				atomic_inc(&dev->total_locks);
+				break;	/* Got lock */
+			}			
+				/* Contention */
+			atomic_inc(&dev->total_sleeps);
+			retcode = tsleep(&dev->lock.lock_queue,
+					 PZERO|PCATCH,
+					 "drmlk2",
+					 0);
+			if (retcode)
+				break;
+		}
+	   	if(!retcode) {
+		   	mga_reclaim_buffers(dev, priv->pid);
+		   	drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				      DRM_KERNEL_CONTEXT);
+		}
+	}
+	funsetown(dev->buf_sigio);
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, p);
+	priv = drm_find_file_by_proc(dev, p);
+	if (priv) {
+		priv->refs--;
+		if (!priv->refs) {
+			TAILQ_REMOVE(&dev->files, priv, link);
+			drm_free(priv, sizeof(*priv), DRM_MEM_FILES);
+		}
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, p);
+
+   	atomic_inc(&dev->total_close);
+   	simple_lock(&dev->count_lock);
+   	if (!--dev->open_count) {
+	   	if (atomic_read(&dev->ioctl_count) || dev->blocked) {
+		   	DRM_ERROR("Device busy: %d %d\n",
+				  atomic_read(&dev->ioctl_count),
+				  dev->blocked);
+		   	simple_unlock(&dev->count_lock);
+		   	return EBUSY;
+		}
+	   	simple_unlock(&dev->count_lock);
+		device_unbusy(dev->device);
+	   	return mga_takedown(dev);
+	}
+   	simple_unlock(&dev->count_lock);
+	return retcode;
+}
+
+
+/* mga_ioctl is called whenever a process performs an ioctl on /dev/drm. */
+
+int
+mga_ioctl(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	int		 nr	 = DRM_IOCTL_NR(cmd);
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_file_t	 *priv;
+	int		 retcode = 0;
+	drm_ioctl_desc_t *ioctl;
+	d_ioctl_t	 *func;
+
+	DRM_DEBUG("dev=%p\n", dev);
+	priv = drm_find_file_by_proc(dev, p);
+	if (!priv) {
+		DRM_DEBUG("can't find authenticator\n");
+		return EINVAL;
+	}
+
+	atomic_inc(&dev->ioctl_count);
+	atomic_inc(&dev->total_ioctl);
+	++priv->ioctl_count;
+	
+	DRM_DEBUG("pid = %d, cmd = 0x%02lx, nr = 0x%02x, auth = %d\n",
+		  p->p_pid, cmd, nr, priv->authenticated);
+
+	switch (cmd) {
+	case FIONBIO:
+		atomic_dec(&dev->ioctl_count);
+		return 0;
+
+	case FIOASYNC:
+		atomic_dec(&dev->ioctl_count);
+		dev->flags |= FASYNC;
+		return 0;
+
+	case FIOSETOWN:
+		atomic_dec(&dev->ioctl_count);
+		return fsetown(*(int *)data, &dev->buf_sigio);
+
+	case FIOGETOWN:
+		atomic_dec(&dev->ioctl_count);
+		*(int *) data = fgetown(dev->buf_sigio);
+		return 0;
+	}
+
+	if (nr >= MGA_IOCTL_COUNT) {
+		retcode = EINVAL;
+	} else {
+		ioctl	  = &mga_ioctls[nr];
+		func	  = ioctl->func;
+
+		if (!func) {
+			DRM_DEBUG("no function\n");
+			retcode = EINVAL;
+		} else if ((ioctl->root_only && suser(p))
+			    || (ioctl->auth_needed && !priv->authenticated)) {
+			retcode = EACCES;
+		} else {
+			retcode = (func)(kdev, cmd, data, flags, p);
+		}
+	}
+	
+	atomic_dec(&dev->ioctl_count);
+	return retcode;
+}
+
+int
+mga_unlock(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t      *dev    = kdev->si_drv1;
+	drm_lock_t	  lock;
+	int		  s;
+
+	lock = *(drm_lock_t *) data;
+	
+	if (lock.context == DRM_KERNEL_CONTEXT) {
+		DRM_ERROR("Process %d using kernel context %d\n",
+			  p->p_pid, lock.context);
+		return EINVAL;
+	}
+
+	DRM_DEBUG("%d frees lock (%d holds)\n",
+		  lock.context,
+		  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+	atomic_inc(&dev->total_unlocks);
+	if (_DRM_LOCK_IS_CONT(dev->lock.hw_lock->lock))
+		atomic_inc(&dev->total_contends);
+	drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
+
+	s = splsofttq();
+	mga_dma_schedule(dev, 1);
+	splx(s);
+
+	if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+			  DRM_KERNEL_CONTEXT)) {
+	   DRM_ERROR("\n");
+	}
+
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.h:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.h	Fri Jun 16 17:03:32 2000
@@ -0,0 +1,420 @@
+/* mga_drv.h -- Private header for the Matrox g200/g400 driver
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ * 	    Jeff Hartmann <jhartmann@valinux.com>
+ *
+ */
+
+#ifndef _MGA_DRV_H_
+#define _MGA_DRV_H_
+
+#define MGA_BUF_IN_USE         0
+#define MGA_BUF_SWAP_PENDING   1
+#define MGA_BUF_FORCE_FIRE     2
+#define MGA_BUF_NEEDS_OVERFLOW 3
+
+typedef struct {
+	u_int32_t buffer_status;
+   	unsigned int num_dwords;
+   	unsigned int max_dwords;
+   	u_int32_t *current_dma_ptr;
+   	u_int32_t *head;
+   	u_int32_t phys_head;
+	unsigned int prim_age;
+   	int sec_used;
+   	int idx;
+} drm_mga_prim_buf_t;
+
+typedef struct _drm_mga_freelist {
+   	unsigned int age;
+   	drm_buf_t *buf;
+   	struct _drm_mga_freelist *next;
+   	struct _drm_mga_freelist *prev;
+} drm_mga_freelist_t;
+
+#define MGA_IN_DISPATCH   0
+#define MGA_IN_FLUSH      1
+#define MGA_IN_WAIT       2
+#define MGA_IN_GETBUF	  3
+
+typedef struct _drm_mga_private {
+   	u_int32_t dispatch_status;
+	unsigned int next_prim_age;
+	__volatile__ unsigned int last_prim_age;
+   	int reserved_map_idx;
+   	int buffer_map_idx;
+   	drm_mga_sarea_t *sarea_priv;
+   	int primary_size;
+   	int warp_ucode_size;
+   	int chipset;
+   	unsigned int frontOffset;
+   	unsigned int backOffset;
+   	unsigned int depthOffset;
+   	unsigned int textureOffset;
+   	unsigned int textureSize;
+   	int cpp;
+   	unsigned int stride;
+   	int sgram;
+	int use_agp;
+   	drm_mga_warp_index_t WarpIndex[MGA_MAX_G400_PIPES];
+	unsigned int WarpPipe;
+   	atomic_t pending_bufs;
+   	void *status_page;
+   	unsigned long real_status_page;
+   	u_int8_t *ioremap;
+   	drm_mga_prim_buf_t **prim_bufs;
+   	drm_mga_prim_buf_t *next_prim;
+   	drm_mga_prim_buf_t *last_prim;
+   	drm_mga_prim_buf_t *current_prim;
+   	int current_prim_idx;
+   	drm_mga_freelist_t *head;
+   	drm_mga_freelist_t *tail;
+	int flush_queue;		/* Processes waiting until flush    */
+      	int wait_queue;			/* Processes waiting until interrupt */
+	int buf_queue;			/* Processes waiting for a free buf */
+	/* Some validated register values:
+	 */	
+	u_int32_t mAccess;
+} drm_mga_private_t;
+
+				/* mga_drv.c */
+extern int  mga_init(device_t);
+extern void mga_cleanup(device_t);
+extern d_ioctl_t mga_version;
+extern d_open_t mga_open;
+extern d_close_t mga_close;
+extern d_ioctl_t mga_ioctl;
+extern d_ioctl_t mga_unlock;
+
+				/* mga_dma.c */
+extern int  mga_dma_schedule(drm_device_t *dev, int locked);
+extern int  mga_irq_install(drm_device_t *dev, int irq);
+extern int  mga_irq_uninstall(drm_device_t *dev);
+extern d_ioctl_t mga_dma;
+extern d_ioctl_t mga_control;
+extern d_ioctl_t mga_lock;
+
+/* mga_dma_init does init and release */
+extern int mga_dma_cleanup(drm_device_t *dev);
+extern d_ioctl_t mga_dma_init;
+extern d_ioctl_t mga_flush_ioctl;
+extern void mga_flush_write_combine(void);
+extern unsigned int mga_create_sync_tag(drm_device_t *dev);
+extern drm_buf_t *mga_freelist_get(drm_device_t *dev);
+extern int mga_freelist_put(drm_device_t *dev, drm_buf_t *buf);
+extern int mga_advance_primary(drm_device_t *dev);
+extern void mga_reclaim_buffers(drm_device_t *dev, pid_t pid);
+
+				/* mga_bufs.c */
+extern d_ioctl_t mga_addbufs;
+extern d_ioctl_t mga_infobufs;
+extern d_ioctl_t mga_markbufs;
+extern d_ioctl_t mga_freebufs;
+extern d_ioctl_t mga_mapbufs;
+extern d_ioctl_t mga_addmap;
+				/* mga_state.c */
+extern d_ioctl_t mga_clear_bufs;
+extern d_ioctl_t mga_swap_bufs;
+extern d_ioctl_t mga_iload;
+extern d_ioctl_t mga_vertex;
+extern d_ioctl_t mga_indices;
+				/* mga_context.c */
+extern d_ioctl_t mga_resctx;
+extern d_ioctl_t mga_addctx;
+extern d_ioctl_t mga_modctx;
+extern d_ioctl_t mga_getctx;
+extern d_ioctl_t mga_switchctx;
+extern d_ioctl_t mga_newctx;
+extern d_ioctl_t mga_rmctx;
+
+extern int  mga_context_switch(drm_device_t *dev, int old, int new);
+extern int  mga_context_switch_complete(drm_device_t *dev, int new);
+
+
+typedef enum {
+	TT_GENERAL,
+	TT_BLIT,
+	TT_VECTOR,
+	TT_VERTEX
+} transferType_t;
+
+typedef struct {
+   	drm_mga_freelist_t *my_freelist;
+	int discard;
+	int dispatched;
+} drm_mga_buf_priv_t;
+
+#define DWGREG0 	0x1c00
+#define DWGREG0_END 	0x1dff
+#define DWGREG1		0x2c00
+#define DWGREG1_END	0x2dff
+
+#define ISREG0(r)	(r >= DWGREG0 && r <= DWGREG0_END)
+#define ADRINDEX0(r)	(u_int8_t)((r - DWGREG0) >> 2)
+#define ADRINDEX1(r)	(u_int8_t)(((r - DWGREG1) >> 2) | 0x80)
+#define ADRINDEX(r)	(ISREG0(r) ? ADRINDEX0(r) : ADRINDEX1(r)) 
+
+#define MGA_VERBOSE 0
+#define MGA_NUM_PRIM_BUFS 	8
+
+#define PRIMLOCALS	u_int8_t tempIndex[4]; u_int32_t *dma_ptr; u_int32_t phys_head; \
+			int outcount, num_dwords
+
+#define PRIM_OVERFLOW(dev, dev_priv, length) do {			\
+	drm_mga_prim_buf_t *tmp_buf =					\
+ 		dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	if( test_bit(MGA_BUF_NEEDS_OVERFLOW,				\
+		  &tmp_buf->buffer_status)) {				\
+ 		mga_advance_primary(dev);				\
+ 		mga_dma_schedule(dev, 1);				\
+ 	} else if( tmp_buf->max_dwords - tmp_buf->num_dwords < length ||\
+ 	    tmp_buf->sec_used > MGA_DMA_BUF_NR/2) {			\
+		set_bit(MGA_BUF_FORCE_FIRE, &tmp_buf->buffer_status);	\
+ 		mga_advance_primary(dev);				\
+ 		mga_dma_schedule(dev, 1);				\
+	}								\
+} while(0)
+
+#define PRIMGETPTR(dev_priv) do {					\
+	drm_mga_prim_buf_t *tmp_buf =					\
+		dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	if(MGA_VERBOSE)							\
+		DRM_DEBUG("PRIMGETPTR in %s\n", __FUNCTION__);		\
+	dma_ptr = tmp_buf->current_dma_ptr;				\
+	num_dwords = tmp_buf->num_dwords;				\
+	phys_head = tmp_buf->phys_head;					\
+	outcount = 0;							\
+} while(0)
+
+#define PRIMPTR(prim_buf) do {					\
+	if(MGA_VERBOSE)						\
+		DRM_DEBUG("PRIMPTR in %s\n", __FUNCTION__);	\
+	dma_ptr = prim_buf->current_dma_ptr;			\
+	num_dwords = prim_buf->num_dwords;			\
+	phys_head = prim_buf->phys_head;			\
+	outcount = 0;						\
+} while(0)
+
+#define PRIMFINISH(prim_buf) do {				\
+	if (MGA_VERBOSE) {					\
+		DRM_DEBUG( "PRIMFINISH in %s\n", __FUNCTION__);	\
+                if (outcount & 3)				\
+                      DRM_DEBUG(" --- truncation\n");	        \
+        }							\
+	prim_buf->num_dwords = num_dwords;			\
+	prim_buf->current_dma_ptr = dma_ptr;			\
+} while(0)
+
+#define PRIMADVANCE(dev_priv)	do {				\
+drm_mga_prim_buf_t *tmp_buf = 					\
+	dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	if (MGA_VERBOSE) {					\
+		DRM_DEBUG("PRIMADVANCE in %s\n", __FUNCTION__);	\
+                if (outcount & 3)				\
+                      DRM_DEBUG(" --- truncation\n");	\
+        }							\
+	tmp_buf->num_dwords = num_dwords;      			\
+	tmp_buf->current_dma_ptr = dma_ptr;    			\
+} while (0)
+
+#define PRIMUPDATE(dev_priv)	do {					\
+	drm_mga_prim_buf_t *tmp_buf =					\
+		dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	tmp_buf->sec_used++;						\
+} while (0)
+
+#define AGEBUF(dev_priv, buf_priv)	do {				\
+	drm_mga_prim_buf_t *tmp_buf =					\
+		dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	buf_priv->my_freelist->age = tmp_buf->prim_age;			\
+} while (0)
+
+
+#define PRIMOUTREG(reg, val) do {					\
+	tempIndex[outcount]=ADRINDEX(reg);				\
+	dma_ptr[1+outcount] = val;					\
+	if (MGA_VERBOSE)						\
+		DRM_DEBUG("   PRIMOUT %d: 0x%x -- 0x%x\n",		\
+		       num_dwords + 1 + outcount, ADRINDEX(reg), val);	\
+	if( ++outcount == 4) {						\
+		outcount = 0;						\
+		dma_ptr[0] = *(u_int32_t *)tempIndex;			\
+		dma_ptr+=5;						\
+		num_dwords += 5;					\
+	}								\
+}while (0)
+
+/* A reduced set of the mga registers.
+ */
+
+#define MGAREG_MGA_EXEC 			0x0100
+#define MGAREG_ALPHACTRL 			0x2c7c
+#define MGAREG_AR0 				0x1c60
+#define MGAREG_AR1 				0x1c64
+#define MGAREG_AR2 				0x1c68
+#define MGAREG_AR3 				0x1c6c
+#define MGAREG_AR4 				0x1c70
+#define MGAREG_AR5 				0x1c74
+#define MGAREG_AR6 				0x1c78
+#define MGAREG_CXBNDRY				0x1c80
+#define MGAREG_CXLEFT 				0x1ca0
+#define MGAREG_CXRIGHT				0x1ca4
+#define MGAREG_DMAPAD 				0x1c54
+#define MGAREG_DSTORG 				0x2cb8
+#define MGAREG_DWGCTL 				0x1c00
+#define MGAREG_DWGSYNC				0x2c4c
+#define MGAREG_FCOL 				0x1c24
+#define MGAREG_FIFOSTATUS 			0x1e10
+#define MGAREG_FOGCOL 				0x1cf4
+#define MGAREG_FXBNDRY				0x1c84
+#define MGAREG_FXLEFT 				0x1ca8
+#define MGAREG_FXRIGHT				0x1cac
+#define MGAREG_ICLEAR 				0x1e18
+#define MGAREG_IEN 				0x1e1c
+#define MGAREG_LEN 				0x1c5c
+#define MGAREG_MACCESS				0x1c04
+#define MGAREG_PITCH 				0x1c8c
+#define MGAREG_PLNWT 				0x1c1c
+#define MGAREG_PRIMADDRESS 			0x1e58
+#define MGAREG_PRIMEND				0x1e5c
+#define MGAREG_PRIMPTR				0x1e50
+#define MGAREG_SECADDRESS 			0x2c40
+#define MGAREG_SECEND 				0x2c44
+#define MGAREG_SETUPADDRESS 			0x2cd0
+#define MGAREG_SETUPEND 			0x2cd4
+#define MGAREG_SOFTRAP				0x2c48
+#define MGAREG_SRCORG 				0x2cb4
+#define MGAREG_STATUS 				0x1e14
+#define MGAREG_STENCIL				0x2cc8
+#define MGAREG_STENCILCTL 			0x2ccc
+#define MGAREG_TDUALSTAGE0 			0x2cf8
+#define MGAREG_TDUALSTAGE1 			0x2cfc
+#define MGAREG_TEXBORDERCOL 			0x2c5c
+#define MGAREG_TEXCTL 				0x2c30
+#define MGAREG_TEXCTL2				0x2c3c
+#define MGAREG_TEXFILTER 			0x2c58
+#define MGAREG_TEXHEIGHT 			0x2c2c
+#define MGAREG_TEXORG 				0x2c24
+#define MGAREG_TEXORG1				0x2ca4
+#define MGAREG_TEXORG2				0x2ca8
+#define MGAREG_TEXORG3				0x2cac
+#define MGAREG_TEXORG4				0x2cb0
+#define MGAREG_TEXTRANS 			0x2c34
+#define MGAREG_TEXTRANSHIGH 			0x2c38
+#define MGAREG_TEXWIDTH 			0x2c28
+#define MGAREG_WACCEPTSEQ 			0x1dd4
+#define MGAREG_WCODEADDR 			0x1e6c
+#define MGAREG_WFLAG 				0x1dc4
+#define MGAREG_WFLAG1 				0x1de0
+#define MGAREG_WFLAGNB				0x1e64
+#define MGAREG_WFLAGNB1 			0x1e08
+#define MGAREG_WGETMSB				0x1dc8
+#define MGAREG_WIADDR 				0x1dc0
+#define MGAREG_WIADDR2				0x1dd8
+#define MGAREG_WMISC 				0x1e70
+#define MGAREG_WVRTXSZ				0x1dcc
+#define MGAREG_YBOT 				0x1c9c
+#define MGAREG_YDST 				0x1c90
+#define MGAREG_YDSTLEN				0x1c88
+#define MGAREG_YDSTORG				0x1c94
+#define MGAREG_YTOP 				0x1c98
+#define MGAREG_ZORG 				0x1c0c
+
+#define PDEA_pagpxfer_enable			0x2
+
+#define WIA_wmode_suspend			0x0
+#define WIA_wmode_start 			0x3
+#define WIA_wagp_agp				0x4
+
+#define DC_opcod_line_open 			0x0
+#define DC_opcod_autoline_open 			0x1
+#define DC_opcod_line_close 			0x2
+#define DC_opcod_autoline_close 		0x3
+#define DC_opcod_trap 				0x4
+#define DC_opcod_texture_trap 			0x6
+#define DC_opcod_bitblt 			0x8
+#define DC_opcod_iload 				0x9
+#define DC_atype_rpl 				0x0
+#define DC_atype_rstr 				0x10
+#define DC_atype_zi 				0x30
+#define DC_atype_blk 				0x40
+#define DC_atype_i 				0x70
+#define DC_linear_xy 				0x0 		
+#define DC_linear_linear 			0x80 		
+#define DC_zmode_nozcmp 			0x0
+#define DC_zmode_ze 				0x200
+#define DC_zmode_zne 				0x300
+#define DC_zmode_zlt 				0x400
+#define DC_zmode_zlte 				0x500
+#define DC_zmode_zgt 				0x600
+#define DC_zmode_zgte 				0x700
+#define DC_solid_disable 			0x0 		
+#define DC_solid_enable 			0x800 		
+#define DC_arzero_disable 			0x0 		
+#define DC_arzero_enable 			0x1000 		
+#define DC_sgnzero_disable 			0x0 		
+#define DC_sgnzero_enable 			0x2000 		
+#define DC_shftzero_disable 			0x0 		
+#define DC_shftzero_enable 			0x4000 		
+#define DC_bop_SHIFT 				16 		
+#define DC_trans_SHIFT 				20 		
+#define DC_bltmod_bmonolef 			0x0
+#define DC_bltmod_bmonowf 			0x8000000
+#define DC_bltmod_bplan 			0x2000000
+#define DC_bltmod_bfcol 			0x4000000
+#define DC_bltmod_bu32bgr 			0x6000000
+#define DC_bltmod_bu32rgb 			0xe000000
+#define DC_bltmod_bu24bgr 			0x16000000
+#define DC_bltmod_bu24rgb 			0x1e000000
+#define DC_pattern_disable 			0x0 		
+#define DC_pattern_enable 			0x20000000 	
+#define DC_transc_disable 			0x0 		
+#define DC_transc_enable 			0x40000000 	
+#define DC_clipdis_disable 			0x0 		
+#define DC_clipdis_enable 			0x80000000 	
+
+#define SETADD_mode_vertlist                   	0x0 	
+
+
+#define MGA_CLEAR_CMD (DC_opcod_trap | DC_arzero_enable | 		\
+		       DC_sgnzero_enable | DC_shftzero_enable | 	\
+		       (0xC << DC_bop_SHIFT) | DC_clipdis_enable | 	\
+		       DC_solid_enable | DC_transc_enable)
+	  
+
+#define MGA_COPY_CMD (DC_opcod_bitblt | DC_atype_rpl | DC_linear_xy |	\
+		      DC_solid_disable | DC_arzero_disable | 		\
+		      DC_sgnzero_enable | DC_shftzero_enable | 		\
+		      (0xC << DC_bop_SHIFT) | DC_bltmod_bfcol | 	\
+		      DC_pattern_disable | DC_transc_disable | 		\
+		      DC_clipdis_enable)				\
+
+#define MGA_FLUSH_CMD (DC_opcod_texture_trap | (0xF << DC_trans_SHIFT) |\
+		       DC_arzero_enable | DC_sgnzero_enable |		\
+		       DC_atype_i)
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_state.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_state.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_state.c	Fri Jun 16 17:03:32 2000
@@ -0,0 +1,1074 @@
+/* mga_state.c -- State support for mga g200/g400
+ * Created: Thu Jan 27 02:53:43 2000 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Jeff Hartmann <jhartmann@precisioninsight.com>
+ * 	    Keith Whitwell <keithw@precisioninsight.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "mga_drv.h"
+#include "drm.h"
+
+typedef u_int16_t u16;
+typedef u_int32_t u32;
+
+static void mgaEmitClipRect(drm_mga_private_t * dev_priv,
+			    drm_clip_rect_t * box)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	/* This takes 10 dwords */
+	PRIMGETPTR(dev_priv);
+
+	/* Force reset of dwgctl (eliminates clip disable) */
+#if 0
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGSYNC, 0);
+	PRIMOUTREG(MGAREG_DWGSYNC, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+#else
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+	PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 0x80000000);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+	PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 0x80000000);
+#endif
+
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_CXBNDRY, ((box->x2) << 16) | (box->x1));
+	PRIMOUTREG(MGAREG_YTOP, box->y1 * dev_priv->stride / 2);
+	PRIMOUTREG(MGAREG_YBOT, box->y2 * dev_priv->stride / 2);
+
+	PRIMADVANCE(dev_priv);
+}
+
+static void mgaEmitContext(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	/* This takes a max of 15 dwords */
+	PRIMGETPTR(dev_priv);
+
+	PRIMOUTREG(MGAREG_DSTORG, regs[MGA_CTXREG_DSTORG]);
+	PRIMOUTREG(MGAREG_MACCESS, regs[MGA_CTXREG_MACCESS]);
+	PRIMOUTREG(MGAREG_PLNWT, regs[MGA_CTXREG_PLNWT]);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+
+	PRIMOUTREG(MGAREG_ALPHACTRL, regs[MGA_CTXREG_ALPHACTRL]);
+	PRIMOUTREG(MGAREG_FOGCOL, regs[MGA_CTXREG_FOGCOLOR]);
+	PRIMOUTREG(MGAREG_WFLAG, regs[MGA_CTXREG_WFLAG]);
+	PRIMOUTREG(MGAREG_ZORG, dev_priv->depthOffset);	/* invarient */
+
+	if (dev_priv->chipset == MGA_CARD_TYPE_G400) {
+		PRIMOUTREG(MGAREG_WFLAG1, regs[MGA_CTXREG_WFLAG]);
+		PRIMOUTREG(MGAREG_TDUALSTAGE0, regs[MGA_CTXREG_TDUAL0]);
+		PRIMOUTREG(MGAREG_TDUALSTAGE1, regs[MGA_CTXREG_TDUAL1]);
+		PRIMOUTREG(MGAREG_FCOL, regs[MGA_CTXREG_FCOL]);
+	} else {
+		PRIMOUTREG(MGAREG_FCOL, regs[MGA_CTXREG_FCOL]);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+	}
+
+	PRIMADVANCE(dev_priv);
+}
+
+static void mgaG200EmitTex(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->TexState[0];
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	PRIMGETPTR(dev_priv);
+
+	/* This takes 20 dwords */
+
+	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2]);
+	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL]);
+	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER]);
+	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL]);
+
+	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG]);
+	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1]);
+	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2]);
+	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3]);
+
+	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4]);
+	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH]);
+	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT]);
+	PRIMOUTREG(0x2d00 + 24 * 4, regs[MGA_TEXREG_WIDTH]);
+
+	PRIMOUTREG(0x2d00 + 34 * 4, regs[MGA_TEXREG_HEIGHT]);
+	PRIMOUTREG(MGAREG_TEXTRANS, 0xffff);
+	PRIMOUTREG(MGAREG_TEXTRANSHIGH, 0xffff);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+	PRIMADVANCE(dev_priv);
+}
+
+static void mgaG400EmitTex0(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->TexState[0];
+	int multitex = sarea_priv->WarpPipe & MGA_T2;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	PRIMGETPTR(dev_priv);
+
+	/* This takes a max of 30 dwords */
+
+	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] | 0x00008000);
+	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL]);
+	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER]);
+	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL]);
+
+	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG]);
+	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1]);
+	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2]);
+	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3]);
+
+	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4]);
+	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH]);
+	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT]);
+	PRIMOUTREG(0x2d00 + 49 * 4, 0);
+
+	PRIMOUTREG(0x2d00 + 57 * 4, 0);
+	PRIMOUTREG(0x2d00 + 53 * 4, 0);
+	PRIMOUTREG(0x2d00 + 61 * 4, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+	if (!multitex) {
+		PRIMOUTREG(0x2d00 + 52 * 4, 0x40);
+		PRIMOUTREG(0x2d00 + 60 * 4, 0x40);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+	}
+
+	PRIMOUTREG(0x2d00 + 54 * 4, regs[MGA_TEXREG_WIDTH] | 0x40);
+	PRIMOUTREG(0x2d00 + 62 * 4, regs[MGA_TEXREG_HEIGHT] | 0x40);
+	PRIMOUTREG(MGAREG_TEXTRANS, 0xffff);
+	PRIMOUTREG(MGAREG_TEXTRANSHIGH, 0xffff);
+
+	PRIMADVANCE(dev_priv);
+}
+
+#define TMC_map1_enable 		0x80000000
+
+static void mgaG400EmitTex1(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->TexState[1];
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	PRIMGETPTR(dev_priv);
+
+	/* This takes 25 dwords */
+
+	PRIMOUTREG(MGAREG_TEXCTL2,
+		   regs[MGA_TEXREG_CTL2] | TMC_map1_enable | 0x00008000);
+	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL]);
+	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER]);
+	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL]);
+
+	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG]);
+	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1]);
+	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2]);
+	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3]);
+
+	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4]);
+	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH]);
+	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT]);
+	PRIMOUTREG(0x2d00 + 49 * 4, 0);
+
+	PRIMOUTREG(0x2d00 + 57 * 4, 0);
+	PRIMOUTREG(0x2d00 + 53 * 4, 0);
+	PRIMOUTREG(0x2d00 + 61 * 4, 0);
+	PRIMOUTREG(0x2d00 + 52 * 4, regs[MGA_TEXREG_WIDTH] | 0x40);
+
+	PRIMOUTREG(0x2d00 + 60 * 4, regs[MGA_TEXREG_HEIGHT] | 0x40);
+	PRIMOUTREG(MGAREG_TEXTRANS, 0xffff);
+	PRIMOUTREG(MGAREG_TEXTRANSHIGH, 0xffff);
+	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] | 0x00008000);
+
+	PRIMADVANCE(dev_priv);
+}
+
+#define EMIT_PIPE 50
+static void mgaG400EmitPipe(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int pipe = sarea_priv->WarpPipe;
+	float fParam = 12800.0f;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	PRIMGETPTR(dev_priv);
+
+	/* This takes 50 dwords */
+
+	/* Establish vertex size.  
+	 */
+	PRIMOUTREG(MGAREG_WIADDR2, WIA_wmode_suspend);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+	if (pipe & MGA_T2) {
+		PRIMOUTREG(MGAREG_WVRTXSZ, 0x00001e09);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0x1e000000);
+	} else {
+		if (dev_priv->WarpPipe & MGA_T2) {
+			/* Flush the WARP pipe */
+			PRIMOUTREG(MGAREG_YDST, 0);
+			PRIMOUTREG(MGAREG_FXLEFT, 0);
+			PRIMOUTREG(MGAREG_FXRIGHT, 1);
+			PRIMOUTREG(MGAREG_DWGCTL, MGA_FLUSH_CMD);
+
+			PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 1);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DWGSYNC, 0x7000);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+			PRIMOUTREG(MGAREG_TEXCTL2, 0 | 0x00008000);
+			PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 0);
+			PRIMOUTREG(MGAREG_TEXCTL2, 0x80 | 0x00008000);
+			PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 0);
+		}
+
+		PRIMOUTREG(MGAREG_WVRTXSZ, 0x00001807);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0x18000000);
+	}
+
+	PRIMOUTREG(MGAREG_WFLAG, 0);
+	PRIMOUTREG(MGAREG_WFLAG1, 0);
+	PRIMOUTREG(0x2d00 + 56 * 4, *((u32 *) (&fParam)));
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+	PRIMOUTREG(0x2d00 + 49 * 4, 0);	/* Tex stage 0 */
+	PRIMOUTREG(0x2d00 + 57 * 4, 0);	/* Tex stage 0 */
+	PRIMOUTREG(0x2d00 + 53 * 4, 0);	/* Tex stage 1 */
+	PRIMOUTREG(0x2d00 + 61 * 4, 0);	/* Tex stage 1 */
+
+	PRIMOUTREG(0x2d00 + 54 * 4, 0x40);	/* Tex stage 0 : w */
+	PRIMOUTREG(0x2d00 + 62 * 4, 0x40);	/* Tex stage 0 : h */
+	PRIMOUTREG(0x2d00 + 52 * 4, 0x40);	/* Tex stage 1 : w */
+	PRIMOUTREG(0x2d00 + 60 * 4, 0x40);	/* Tex stage 1 : h */
+
+	/* Dma pading required due to hw bug */
+	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
+	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
+	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
+	PRIMOUTREG(MGAREG_WIADDR2,
+		   (u32) (dev_priv->WarpIndex[pipe].
+			  phys_addr | WIA_wmode_start | WIA_wagp_agp));
+	PRIMADVANCE(dev_priv);
+}
+
+static void mgaG200EmitPipe(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int pipe = sarea_priv->WarpPipe;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	PRIMGETPTR(dev_priv);
+
+	/* This takes 15 dwords */
+
+	PRIMOUTREG(MGAREG_WIADDR, WIA_wmode_suspend);
+	PRIMOUTREG(MGAREG_WVRTXSZ, 7);
+	PRIMOUTREG(MGAREG_WFLAG, 0);
+	PRIMOUTREG(0x2d00 + 24 * 4, 0);	/* tex w/h */
+
+	PRIMOUTREG(0x2d00 + 25 * 4, 0x100);
+	PRIMOUTREG(0x2d00 + 34 * 4, 0);	/* tex w/h */
+	PRIMOUTREG(0x2d00 + 42 * 4, 0xFFFF);
+	PRIMOUTREG(0x2d00 + 60 * 4, 0xFFFF);
+
+	/* Dma pading required due to hw bug */
+	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
+	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
+	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
+	PRIMOUTREG(MGAREG_WIADDR,
+		   (u32) (dev_priv->WarpIndex[pipe].
+			  phys_addr | WIA_wmode_start | WIA_wagp_agp));
+
+	PRIMADVANCE(dev_priv);
+}
+
+static void mgaEmitState(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (dev_priv->chipset == MGA_CARD_TYPE_G400) {
+		int multitex = sarea_priv->WarpPipe & MGA_T2;
+
+		if (sarea_priv->WarpPipe != dev_priv->WarpPipe) {
+			mgaG400EmitPipe(dev_priv);
+			dev_priv->WarpPipe = sarea_priv->WarpPipe;
+		}
+
+		if (dirty & MGA_UPLOAD_CTX) {
+			mgaEmitContext(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_CTX;
+		}
+
+		if (dirty & MGA_UPLOAD_TEX0) {
+			mgaG400EmitTex0(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_TEX0;
+		}
+
+		if ((dirty & MGA_UPLOAD_TEX1) && multitex) {
+			mgaG400EmitTex1(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_TEX1;
+		}
+	} else {
+		if (sarea_priv->WarpPipe != dev_priv->WarpPipe) {
+			mgaG200EmitPipe(dev_priv);
+			dev_priv->WarpPipe = sarea_priv->WarpPipe;
+		}
+
+		if (dirty & MGA_UPLOAD_CTX) {
+			mgaEmitContext(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_CTX;
+		}
+
+		if (dirty & MGA_UPLOAD_TEX0) {
+			mgaG200EmitTex(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_TEX0;
+		}
+	}
+}
+
+
+/* Disallow all write destinations except the front and backbuffer.
+ */
+static int mgaVerifyContext(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (regs[MGA_CTXREG_DSTORG] != dev_priv->frontOffset &&
+	    regs[MGA_CTXREG_DSTORG] != dev_priv->backOffset) {
+		DRM_DEBUG("BAD DSTORG: %x (front %x, back %x)\n\n",
+			  regs[MGA_CTXREG_DSTORG], dev_priv->frontOffset,
+			  dev_priv->backOffset);
+		regs[MGA_CTXREG_DSTORG] = 0;
+		return -1;
+	}
+
+	return 0;
+}
+
+/* Disallow texture reads from PCI space.
+ */
+static int mgaVerifyTex(drm_mga_private_t * dev_priv, int unit)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if ((sarea_priv->TexState[unit][MGA_TEXREG_ORG] & 0x3) == 0x1) {
+		DRM_DEBUG("BAD TEXREG_ORG: %x, unit %d\n",
+			  sarea_priv->TexState[unit][MGA_TEXREG_ORG],
+			  unit);
+		sarea_priv->TexState[unit][MGA_TEXREG_ORG] = 0;
+		return -1;
+	}
+
+	return 0;
+}
+
+static int mgaVerifyState(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+	int rv = 0;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	if (dirty & MGA_UPLOAD_CTX)
+		rv |= mgaVerifyContext(dev_priv);
+
+	if (dirty & MGA_UPLOAD_TEX0)
+		rv |= mgaVerifyTex(dev_priv, 0);
+
+	if (dev_priv->chipset == MGA_CARD_TYPE_G400) {
+		if (dirty & MGA_UPLOAD_TEX1)
+			rv |= mgaVerifyTex(dev_priv, 1);
+
+		if (dirty & MGA_UPLOAD_PIPE)
+			rv |= (sarea_priv->WarpPipe > MGA_MAX_G400_PIPES);
+	} else {
+		if (dirty & MGA_UPLOAD_PIPE)
+			rv |= (sarea_priv->WarpPipe > MGA_MAX_G200_PIPES);
+	}
+
+	return rv == 0;
+}
+
+static int mgaVerifyIload(drm_mga_private_t * dev_priv,
+			  unsigned long bus_address,
+			  unsigned int dstOrg, int length)
+{
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (dstOrg < dev_priv->textureOffset ||
+	    dstOrg + length >
+	    (dev_priv->textureOffset + dev_priv->textureSize)) {
+		return EINVAL;
+	}
+	if (length % 64) {
+		return EINVAL;
+	}
+	return 0;
+}
+
+/* This copies a 64 byte aligned agp region to the frambuffer
+ * with a standard blit, the ioctl needs to do checking */
+
+static void mga_dma_dispatch_tex_blit(drm_device_t * dev,
+				      unsigned long bus_address,
+				      int length, unsigned int destOrg)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	int use_agp = PDEA_pagpxfer_enable | 0x00000001;
+	u16 y2;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	y2 = length / 64;
+
+	PRIM_OVERFLOW(dev, dev_priv, 30);
+	PRIMGETPTR(dev_priv);
+
+	PRIMOUTREG(MGAREG_DSTORG, destOrg);
+	PRIMOUTREG(MGAREG_MACCESS, 0x00000000);
+	DRM_DEBUG("srcorg : %lx\n", bus_address | use_agp);
+	PRIMOUTREG(MGAREG_SRCORG, (u32) bus_address | use_agp);
+	PRIMOUTREG(MGAREG_AR5, 64);
+
+	PRIMOUTREG(MGAREG_PITCH, 64);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, MGA_COPY_CMD);
+
+	PRIMOUTREG(MGAREG_AR0, 63);
+	PRIMOUTREG(MGAREG_AR3, 0);
+	PRIMOUTREG(MGAREG_FXBNDRY, (63 << 16));
+	PRIMOUTREG(MGAREG_YDSTLEN + MGAREG_MGA_EXEC, y2);
+
+	PRIMOUTREG(MGAREG_SRCORG, 0);
+	PRIMOUTREG(MGAREG_PITCH, dev_priv->stride / dev_priv->cpp);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMADVANCE(dev_priv);
+}
+
+static void mga_dma_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned long address = (unsigned long) buf->bus_address;
+	int length = buf->used;
+	int use_agp = PDEA_pagpxfer_enable;
+	int i = 0;
+	int primary_needed;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	DRM_DEBUG("dispatch vertex %d addr 0x%lx, "
+		  "length 0x%x nbox %d dirty %x\n",
+		  buf->idx, address, length,
+		  sarea_priv->nbox, sarea_priv->dirty);
+
+	DRM_DEBUG("used : %d, total : %d\n", buf->used, buf->total);
+
+	if (buf->used) {
+		/* WARNING: if you change any of the state functions verify
+		 * these numbers (Overestimating this doesn't hurt).  
+		 */
+		buf_priv->dispatched = 1;
+		primary_needed = (50 + 15 + 15 + 30 + 25 +
+				  10 + 15 * MGA_NR_SAREA_CLIPRECTS);
+		PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+		mgaEmitState(dev_priv);
+
+		do {
+			if (i < sarea_priv->nbox) {
+				DRM_DEBUG("idx %d Emit box %d/%d:"
+					  "%d,%d - %d,%d\n",
+					  buf->idx,
+					  i, sarea_priv->nbox,
+					  sarea_priv->boxes[i].x1,
+					  sarea_priv->boxes[i].y1,
+					  sarea_priv->boxes[i].x2,
+					  sarea_priv->boxes[i].y2);
+
+				mgaEmitClipRect(dev_priv,
+						&sarea_priv->boxes[i]);
+			}
+
+			PRIMGETPTR(dev_priv);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_SECADDRESS,
+				   ((u32) address) | TT_VERTEX);
+			PRIMOUTREG(MGAREG_SECEND,
+				   (((u32) (address + length)) | use_agp));
+			PRIMADVANCE(dev_priv);
+		} while (++i < sarea_priv->nbox);
+	}
+
+	if (buf_priv->discard) {
+		if (buf_priv->dispatched == 1)
+			AGEBUF(dev_priv, buf_priv);
+		buf_priv->dispatched = 0;
+		mga_freelist_put(dev, buf);
+	}
+
+
+}
+
+
+static void mga_dma_dispatch_indices(drm_device_t * dev,
+				     drm_buf_t * buf,
+				     unsigned int start, unsigned int end)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int address = (unsigned int) buf->bus_address;
+	int use_agp = PDEA_pagpxfer_enable;
+	int i = 0;
+	int primary_needed;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	DRM_DEBUG("dispatch indices %d addr 0x%x, "
+		  "start 0x%x end 0x%x nbox %d dirty %x\n",
+		  buf->idx, address, start, end,
+		  sarea_priv->nbox, sarea_priv->dirty);
+
+	if (start != end) {
+		/* WARNING: if you change any of the state functions verify
+		 * these numbers (Overestimating this doesn't hurt).  
+		 */
+		buf_priv->dispatched = 1;
+		primary_needed = (50 + 15 + 15 + 30 + 25 +
+				  10 + 15 * MGA_NR_SAREA_CLIPRECTS);
+		PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+		mgaEmitState(dev_priv);
+
+		do {
+			if (i < sarea_priv->nbox) {
+				DRM_DEBUG("idx %d Emit box %d/%d:"
+					  "%d,%d - %d,%d\n",
+					  buf->idx,
+					  i, sarea_priv->nbox,
+					  sarea_priv->boxes[i].x1,
+					  sarea_priv->boxes[i].y1,
+					  sarea_priv->boxes[i].x2,
+					  sarea_priv->boxes[i].y2);
+
+				mgaEmitClipRect(dev_priv,
+						&sarea_priv->boxes[i]);
+			}
+
+			PRIMGETPTR(dev_priv);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_SETUPADDRESS,
+				   ((address + start) |
+				    SETADD_mode_vertlist));
+			PRIMOUTREG(MGAREG_SETUPEND,
+				   ((address + end) | use_agp));
+			PRIMADVANCE(dev_priv);
+		} while (++i < sarea_priv->nbox);
+	}
+	if (buf_priv->discard) {
+		if (buf_priv->dispatched == 1)
+			AGEBUF(dev_priv, buf_priv);
+		buf_priv->dispatched = 0;
+		mga_freelist_put(dev, buf);
+	}
+}
+
+
+static void mga_dma_dispatch_clear(drm_device_t * dev, int flags,
+				   unsigned int clear_color,
+				   unsigned int clear_zval)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	unsigned int cmd;
+	int i;
+	int primary_needed;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (dev_priv->sgram)
+		cmd = MGA_CLEAR_CMD | DC_atype_blk;
+	else
+		cmd = MGA_CLEAR_CMD | DC_atype_rstr;
+
+	primary_needed = nbox * 70;
+	if (primary_needed == 0)
+		primary_needed = 70;
+	PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+	PRIMGETPTR(dev_priv);
+
+	for (i = 0; i < nbox; i++) {
+		unsigned int height = pbox[i].y2 - pbox[i].y1;
+
+		DRM_DEBUG("dispatch clear %d,%d-%d,%d flags %x!\n",
+			  pbox[i].x1, pbox[i].y1, pbox[i].x2,
+			  pbox[i].y2, flags);
+
+		if (flags & MGA_FRONT) {
+			DRM_DEBUG("clear front\n");
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_YDSTLEN,
+				   (pbox[i].y1 << 16) | height);
+			PRIMOUTREG(MGAREG_FXBNDRY,
+				   (pbox[i].x2 << 16) | pbox[i].x1);
+
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_FCOL, clear_color);
+			PRIMOUTREG(MGAREG_DSTORG, dev_priv->frontOffset);
+			PRIMOUTREG(MGAREG_DWGCTL + MGAREG_MGA_EXEC, cmd);
+		}
+
+		if (flags & MGA_BACK) {
+			DRM_DEBUG("clear back\n");
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_YDSTLEN,
+				   (pbox[i].y1 << 16) | height);
+			PRIMOUTREG(MGAREG_FXBNDRY,
+				   (pbox[i].x2 << 16) | pbox[i].x1);
+
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_FCOL, clear_color);
+			PRIMOUTREG(MGAREG_DSTORG, dev_priv->backOffset);
+			PRIMOUTREG(MGAREG_DWGCTL + MGAREG_MGA_EXEC, cmd);
+		}
+
+		if (flags & MGA_DEPTH) {
+			DRM_DEBUG("clear depth\n");
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_YDSTLEN,
+				   (pbox[i].y1 << 16) | height);
+			PRIMOUTREG(MGAREG_FXBNDRY,
+				   (pbox[i].x2 << 16) | pbox[i].x1);
+
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_FCOL, clear_zval);
+			PRIMOUTREG(MGAREG_DSTORG, dev_priv->depthOffset);
+			PRIMOUTREG(MGAREG_DWGCTL + MGAREG_MGA_EXEC, cmd);
+		}
+	}
+
+	/* Force reset of DWGCTL */
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+	PRIMADVANCE(dev_priv);
+}
+
+static void mga_dma_dispatch_swap(drm_device_t * dev)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int i;
+	int primary_needed;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	primary_needed = nbox * 5;
+	primary_needed += 60;
+	PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+	PRIMGETPTR(dev_priv);
+
+	PRIMOUTREG(MGAREG_DSTORG, dev_priv->frontOffset);
+	PRIMOUTREG(MGAREG_MACCESS, dev_priv->mAccess);
+	PRIMOUTREG(MGAREG_SRCORG, dev_priv->backOffset);
+	PRIMOUTREG(MGAREG_AR5, dev_priv->stride / 2);
+
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, MGA_COPY_CMD);
+
+	for (i = 0; i < nbox; i++) {
+		unsigned int h = pbox[i].y2 - pbox[i].y1;
+		unsigned int start = pbox[i].y1 * dev_priv->stride / 2;
+
+		DRM_DEBUG("dispatch swap %d,%d-%d,%d!\n",
+			  pbox[i].x1, pbox[i].y1, pbox[i].x2, pbox[i].y2);
+
+		PRIMOUTREG(MGAREG_AR0, start + pbox[i].x2 - 1);
+		PRIMOUTREG(MGAREG_AR3, start + pbox[i].x1);
+		PRIMOUTREG(MGAREG_FXBNDRY,
+			   pbox[i].x1 | ((pbox[i].x2 - 1) << 16));
+		PRIMOUTREG(MGAREG_YDSTLEN + MGAREG_MGA_EXEC,
+			   (pbox[i].y1 << 16) | h);
+	}
+
+	/* Force reset of DWGCTL */
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_SRCORG, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+
+	PRIMADVANCE(dev_priv);
+}
+
+int mga_clear_bufs(dev_t kdev, u_long cmd, caddr_t data,
+		   int flags, struct proc *p)
+{
+	drm_device_t *dev = kdev->si_drv1;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_clear_t clear;
+	int s;
+
+	clear = *(drm_mga_clear_t *) data;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_clear_bufs called without lock held\n");
+		return EINVAL;
+	}
+
+	if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CTX;
+	mga_dma_dispatch_clear(dev, clear.flags,
+			       clear.clear_color, clear.clear_depth);
+	PRIMUPDATE(dev_priv);
+	mga_flush_write_combine();
+	s = splsofttq();
+	mga_dma_schedule(dev, 1);
+	splx(s);
+	return 0;
+}
+
+int mga_swap_bufs(dev_t kdev, u_long cmd, caddr_t data,
+		  int flags, struct proc *p)
+{
+	drm_device_t *dev = kdev->si_drv1;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int s;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_swap_bufs called without lock held\n");
+		return EINVAL;
+	}
+
+	if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CTX;
+	mga_dma_dispatch_swap(dev);
+	PRIMUPDATE(dev_priv);
+	set_bit(MGA_BUF_SWAP_PENDING,
+		&dev_priv->current_prim->buffer_status);
+	mga_flush_write_combine();
+	s = splsofttq();
+	mga_dma_schedule(dev, 1);
+	splx(s);
+	return 0;
+}
+
+int mga_iload(dev_t kdev, u_long cmd, caddr_t data,
+	      int flags, struct proc *p)
+{
+	drm_device_t *dev = kdev->si_drv1;
+	drm_device_dma_t *dma = dev->dma;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_iload_t iload;
+	unsigned long bus_address;
+	int s;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	DRM_DEBUG("Starting Iload\n");
+	iload = *(drm_mga_iload_t *) data;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_iload called without lock held\n");
+		return EINVAL;
+	}
+
+	buf = dma->buflist[iload.idx];
+	buf_priv = buf->dev_private;
+	bus_address = buf->bus_address;
+	DRM_DEBUG("bus_address %lx, length %d, destorg : %x\n",
+		  bus_address, iload.length, iload.destOrg);
+
+	if (mgaVerifyIload(dev_priv,
+			   bus_address, iload.destOrg, iload.length)) {
+		mga_freelist_put(dev, buf);
+		return EINVAL;
+	}
+
+	sarea_priv->dirty |= MGA_UPLOAD_CTX;
+
+	mga_dma_dispatch_tex_blit(dev, bus_address, iload.length,
+				  iload.destOrg);
+	AGEBUF(dev_priv, buf_priv);
+	buf_priv->discard = 1;
+	mga_freelist_put(dev, buf);
+	mga_flush_write_combine();
+	s = splsofttq();
+	mga_dma_schedule(dev, 1);
+	splx(s);
+	return 0;
+}
+
+int mga_vertex(dev_t kdev, u_long cmd, caddr_t data,
+	       int flags, struct proc *p)
+{
+	drm_device_t *dev = kdev->si_drv1;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_vertex_t vertex;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	vertex = *(drm_mga_vertex_t *) data;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_vertex called without lock held\n");
+		return EINVAL;
+	}
+
+	DRM_DEBUG("mga_vertex\n");
+
+	buf = dma->buflist[vertex.idx];
+	buf_priv = buf->dev_private;
+
+	buf->used = vertex.used;
+	buf_priv->discard = vertex.discard;
+
+	if (!mgaVerifyState(dev_priv)) {
+		if (vertex.discard) {
+			if (buf_priv->dispatched == 1)
+				AGEBUF(dev_priv, buf_priv);
+			buf_priv->dispatched = 0;
+			mga_freelist_put(dev, buf);
+		}
+		DRM_DEBUG("bad state\n");
+		return EINVAL;
+	}
+
+	mga_dma_dispatch_vertex(dev, buf);
+
+	PRIMUPDATE(dev_priv);
+	mga_flush_write_combine();
+	mga_dma_schedule(dev, 1);
+	return 0;
+}
+
+
+int mga_indices(dev_t kdev, u_long cmd, caddr_t data,
+		int flags, struct proc *p)
+{
+	drm_device_t *dev = kdev->si_drv1;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_indices_t indices;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	indices = *(drm_mga_indices_t *) data;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_indices called without lock held\n");
+		return EINVAL;
+	}
+
+	DRM_DEBUG("mga_indices\n");
+
+	buf = dma->buflist[indices.idx];
+	buf_priv = buf->dev_private;
+
+	buf_priv->discard = indices.discard;
+
+	if (!mgaVerifyState(dev_priv)) {
+		if (indices.discard) {
+			if (buf_priv->dispatched == 1)
+				AGEBUF(dev_priv, buf_priv);
+			buf_priv->dispatched = 0;
+			mga_freelist_put(dev, buf);
+		}
+		return EINVAL;
+	}
+
+	mga_dma_dispatch_indices(dev, buf, indices.start, indices.end);
+
+	PRIMUPDATE(dev_priv);
+	mga_flush_write_combine();
+	mga_dma_schedule(dev, 1);
+	return 0;
+}
+
+
+
+static int
+mga_dma_get_buffers(drm_device_t * dev, drm_dma_t * d, struct proc *p)
+{
+	int i, error;
+	drm_buf_t *buf;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	for (i = d->granted_count; i < d->request_count; i++) {
+		buf = mga_freelist_get(dev);
+		if (!buf)
+			break;
+		buf->pid = p->p_pid;
+		error = copyout(&buf->idx,
+				&d->request_indices[i],
+				sizeof(buf->idx));
+		if (error) return error;
+		error = copyout(&buf->total,
+				&d->request_sizes[i],
+				sizeof(buf->total));
+		if (error) return error;
+		++d->granted_count;
+	}
+	return 0;
+}
+
+int mga_dma(dev_t kdev, u_long cmd, caddr_t data,
+	    int flags, struct proc *p)
+{
+	drm_device_t *dev = kdev->si_drv1;
+	drm_device_dma_t *dma = dev->dma;
+	int retcode = 0;
+	drm_dma_t d;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	d = *(drm_dma_t *) data;
+	DRM_DEBUG("%d %d: %d send, %d req\n",
+		  p->p_pid, d.context, d.send_count, d.request_count);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_dma called without lock held\n");
+		return EINVAL;
+	}
+
+	/* Please don't send us buffers.
+	 */
+	if (d.send_count != 0) {
+		DRM_ERROR
+		    ("Process %d trying to send %d buffers via drmDMA\n",
+		     p->p_pid, d.send_count);
+		return EINVAL;
+	}
+
+	/* We'll send you buffers.
+	 */
+	if (d.request_count < 0 || d.request_count > dma->buf_count) {
+		DRM_ERROR
+		    ("Process %d trying to get %d buffers (of %d max)\n",
+		     p->p_pid, d.request_count, dma->buf_count);
+		return EINVAL;
+	}
+
+	d.granted_count = 0;
+
+	if (d.request_count) {
+		retcode = mga_dma_get_buffers(dev, &d, p);
+	}
+
+	DRM_DEBUG("%d returning, granted = %d\n",
+		  p->p_pid, d.granted_count);
+	*(drm_dma_t *) data = d;
+	return retcode;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile	Fri Jun 16 17:03:32 2000
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+KMOD	= tdfx
+SRCS    = tdfx_drv.c tdfx_context.c
+SRCS   += device_if.h bus_if.h pci_if.h
+CFLAGS += ${DEBUG_FLAGS} -I..
+KMODDEPS = drm
+
+@:
+	ln -sf /sys @
+
+machine:
+	ln -sf /sys/i386/include machine
+
+.include <bsd.kmod.mk>
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_context.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_context.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_context.c	Fri Jun 16 17:03:32 2000
@@ -0,0 +1,204 @@
+/* tdfx_context.c -- IOCTLs for tdfx contexts -*- c -*-
+ * Created: Thu Oct  7 10:50:22 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Daryll Strauss <daryll@valinux.com>
+ *
+ */
+
+#include "drmP.h"
+#include "tdfx_drv.h"
+
+extern drm_ctx_t tdfx_res_ctx;
+
+static int tdfx_alloc_queue(drm_device_t *dev)
+{
+	return drm_ctxbitmap_next(dev);
+}
+
+int tdfx_context_switch(drm_device_t *dev, int old, int new)
+{
+        char        buf[64];
+
+        atomic_inc(&dev->total_ctx);
+
+        if (test_and_set_bit(0, &dev->context_flag)) {
+                DRM_ERROR("Reentering -- FIXME\n");
+                return -EBUSY;
+        }
+
+#if DRM_DMA_HISTOGRAM
+        getnanotime(&dev->ctx_start);
+#endif
+        
+        DRM_DEBUG("Context switch from %d to %d\n", old, new);
+
+        if (new == dev->last_context) {
+                clear_bit(0, &dev->context_flag);
+                return 0;
+        }
+        
+        if (drm_flags & DRM_FLAG_NOCTX) {
+                tdfx_context_switch_complete(dev, new);
+        } else {
+                sprintf(buf, "C %d %d\n", old, new);
+                drm_write_string(dev, buf);
+        }
+        
+        return 0;
+}
+
+int tdfx_context_switch_complete(drm_device_t *dev, int new)
+{
+        dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
+        dev->last_switch  = ticks;
+        
+        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+                DRM_ERROR("Lock isn't held after context switch\n");
+        }
+
+				/* If a context switch is ever initiated
+                                   when the kernel holds the lock, release
+                                   that lock here. */
+#if DRM_DMA_HISTOGRAM
+	{
+	    struct timespec ts;
+	    getnanotime(&ts);
+	    timespecsub(&ts, &dev->lck_start);
+	    atomic_inc(&dev->histo.ctx[drm_histogram_slot(&ts)]);
+	}
+#endif
+        clear_bit(0, &dev->context_flag);
+        wakeup(&dev->context_wait);
+        
+        return 0;
+}
+
+
+int
+tdfx_resctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_ctx_res_t	res;
+	drm_ctx_t	ctx;
+	int		i, error;
+
+	DRM_DEBUG("%d\n", DRM_RESERVED_CONTEXTS);
+	res = *(drm_ctx_res_t *) data;
+	if (res.count >= DRM_RESERVED_CONTEXTS) {
+		memset(&ctx, 0, sizeof(ctx));
+		for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
+			ctx.handle = i;
+			error = copyout(&i, &res.contexts[i], sizeof(i));
+			if (error) return error;
+		}
+	}
+	res.count = DRM_RESERVED_CONTEXTS;
+	*(drm_ctx_res_t *) data = res;
+	return 0;
+}
+
+
+int
+tdfx_addctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	if ((ctx.handle = tdfx_alloc_queue(dev)) == DRM_KERNEL_CONTEXT) {
+				/* Skip kernel's context and get a new one. */
+		ctx.handle = tdfx_alloc_queue(dev);
+	}
+	DRM_DEBUG("%d\n", ctx.handle);
+	if (ctx.handle == -1) {
+		DRM_DEBUG("Not enough free contexts.\n");
+				/* Should this return -EBUSY instead? */
+		return ENOMEM;
+	}
+
+	*(drm_ctx_t *) data = ctx;
+	return 0;
+}
+
+int
+tdfx_modctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_ctx_t ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	if (ctx.flags==_DRM_CONTEXT_PRESERVED)
+		tdfx_res_ctx.handle=ctx.handle;
+	return 0;
+}
+
+int
+tdfx_getctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_ctx_t ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	/* This is 0, because we don't hanlde any context flags */
+	ctx.flags = 0;
+	*(drm_ctx_t *) data = ctx;
+	return 0;
+}
+
+int
+tdfx_switchctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	DRM_DEBUG("%d\n", ctx.handle);
+	return tdfx_context_switch(dev, dev->last_context, ctx.handle);
+}
+
+int
+tdfx_newctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	DRM_DEBUG("%d\n", ctx.handle);
+	tdfx_context_switch_complete(dev, ctx.handle);
+
+	return 0;
+}
+
+int
+tdfx_rmctx(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	*dev	= kdev->si_drv1;
+	drm_ctx_t	ctx;
+
+	ctx = *(drm_ctx_t *) data;
+	drm_ctxbitmap_free(dev, ctx.handle);
+	
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_drv.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_drv.c:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_drv.c	Fri Jun 16 17:03:32 2000
@@ -0,0 +1,738 @@
+/* tdfx.c -- tdfx driver -*- c -*-
+ * Created: Thu Oct  7 10:38:32 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Daryll Strauss <daryll@valinux.com>
+ *
+ */
+
+#include "drmP.h"
+#include "tdfx_drv.h"
+
+#include <pci/pcivar.h>
+
+MODULE_DEPEND(tdfx, drm, 1, 1, 1);
+#ifdef DRM_AGP
+MODULE_DEPEND(tdfx, agp, 1, 1, 1);
+#endif
+
+#define TDFX_NAME	 "tdfx"
+#define TDFX_DESC	 "tdfx"
+#define TDFX_DATE	 "19991009"
+#define TDFX_MAJOR	 1
+#define TDFX_MINOR	 0
+#define TDFX_PATCHLEVEL  0
+
+static int tdfx_init(device_t nbdev);
+static void tdfx_cleanup(device_t nbdev);
+
+drm_ctx_t	              tdfx_res_ctx;
+
+static int tdfx_probe(device_t dev)
+{
+	const char *s = 0;
+
+	switch (pci_get_devid(dev)) {
+	case 0x0003121a:
+		s = "3Dfx Voodoo Banshee graphics accelerator";
+		break;
+		
+	case 0x0005121a:
+		s = "3Dfx Voodoo 3 graphics accelerator";
+		break;
+	}
+
+	if (s) {
+		device_set_desc(dev, s);
+		return 0;
+	}
+
+	return ENXIO;
+}
+
+static int tdfx_attach(device_t dev)
+{
+	tdfx_init(dev);
+	return 0;
+}
+
+static int tdfx_detach(device_t dev)
+{
+	tdfx_cleanup(dev);
+	return 0;
+}
+
+static device_method_t tdfx_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		tdfx_probe),
+	DEVMETHOD(device_attach,	tdfx_attach),
+	DEVMETHOD(device_detach,	tdfx_detach),
+
+	{ 0, 0 }
+};
+
+static driver_t tdfx_driver = {
+	"drm",
+	tdfx_methods,
+	sizeof(drm_device_t),
+};
+
+static devclass_t tdfx_devclass;
+#define TDFX_SOFTC(unit) \
+	((drm_device_t *) devclass_get_softc(tdfx_devclass, unit))
+
+DRIVER_MODULE(if_tdfx, pci, tdfx_driver, tdfx_devclass, 0, 0);
+
+#define CDEV_MAJOR	145
+				/* tdfx_drv.c */
+static d_open_t tdfx_open;
+static d_close_t tdfx_close;
+static d_ioctl_t tdfx_version;
+static d_ioctl_t tdfx_ioctl;
+static d_ioctl_t tdfx_lock;
+static d_ioctl_t tdfx_unlock;
+
+static struct cdevsw tdfx_cdevsw = {
+	/* open */	tdfx_open,
+	/* close */	tdfx_close,
+	/* read */	drm_read,
+	/* write */	drm_write,
+	/* ioctl */	tdfx_ioctl,
+	/* poll */	drm_poll,
+	/* mmap */	drm_mmap,
+	/* strategy */	nostrategy,
+	/* name */	"tdfx",
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY | D_TRACKCLOSE,
+	/* bmaj */	-1
+};
+
+static drm_ioctl_desc_t	      tdfx_ioctls[] = {
+	[DRM_IOCTL_NR(DRM_IOCTL_VERSION)]    = { tdfx_version,	  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE)] = { drm_getunique,	  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_MAGIC)]  = { drm_getmagic,	  0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_IRQ_BUSID)]  = { drm_irq_busid,	  0, 1 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)] = { drm_setunique,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]	     = { drm_block,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]    = { drm_unblock,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)] = { drm_authmagic,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]    = { drm_addmap,	  1, 1 },
+	
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)]    = { tdfx_addctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)]     = { tdfx_rmctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)]    = { tdfx_modctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)]    = { tdfx_getctx,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)] = { tdfx_switchctx,  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)]    = { tdfx_newctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)]    = { tdfx_resctx,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_DRAW)]   = { drm_adddraw,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_DRAW)]    = { drm_rmdraw,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_LOCK)]	     = { tdfx_lock,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)]     = { tdfx_unlock,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]     = { drm_finish,	  1, 0 },
+#ifdef DRM_AGP
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)]   = {drm_agp_acquire, 1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)]   = {drm_agp_release, 1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)]    = {drm_agp_enable,  1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)]      = {drm_agp_info,    1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC)]     = {drm_agp_alloc,   1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)]      = {drm_agp_free,    1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)]      = {drm_agp_unbind,  1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)]    = {drm_agp_bind,    1, 1},
+#endif
+};
+#define TDFX_IOCTL_COUNT DRM_ARRAY_SIZE(tdfx_ioctls)
+
+static int
+tdfx_setup(drm_device_t *dev)
+{
+	int i;
+	
+	device_busy(dev->device);
+
+	atomic_set(&dev->ioctl_count, 0);
+	atomic_set(&dev->vma_count, 0);
+	dev->buf_use	  = 0;
+	atomic_set(&dev->buf_alloc, 0);
+
+	atomic_set(&dev->total_open, 0);
+	atomic_set(&dev->total_close, 0);
+	atomic_set(&dev->total_ioctl, 0);
+	atomic_set(&dev->total_irq, 0);
+	atomic_set(&dev->total_ctx, 0);
+	atomic_set(&dev->total_locks, 0);
+	atomic_set(&dev->total_unlocks, 0);
+	atomic_set(&dev->total_contends, 0);
+	atomic_set(&dev->total_sleeps, 0);
+
+	for (i = 0; i < DRM_HASH_SIZE; i++) {
+		dev->magiclist[i].head = NULL;
+		dev->magiclist[i].tail = NULL;
+	}
+	dev->maplist	    = NULL;
+	dev->map_count	    = 0;
+	dev->vmalist	    = NULL;
+	dev->lock.hw_lock   = NULL;
+	dev->lock.lock_queue = 0;
+	dev->queue_count    = 0;
+	dev->queue_reserved = 0;
+	dev->queue_slots    = 0;
+	dev->queuelist	    = NULL;
+	dev->irq	    = 0;
+	dev->context_flag   = 0;
+	dev->interrupt_flag = 0;
+	dev->dma            = 0;
+	dev->dma_flag	    = 0;
+	dev->last_context   = 0;
+	dev->last_switch    = 0;
+	dev->last_checked   = 0;
+	callout_init(&dev->timer);
+	dev->context_wait   = 0;
+
+	timespecclear(&dev->ctx_start);
+	timespecclear(&dev->lck_start);
+	
+	dev->buf_rp	  = dev->buf;
+	dev->buf_wp	  = dev->buf;
+	dev->buf_end	  = dev->buf + DRM_BSZ;
+	bzero(&dev->buf_sel, sizeof dev->buf_sel);
+	dev->buf_sigio	  = NULL;
+	dev->buf_readers  = 0;
+	dev->buf_writers  = 0;
+	dev->buf_selecting = 0;
+
+	tdfx_res_ctx.handle=-1;
+			
+	DRM_DEBUG("\n");
+			
+	/* The kernel's context could be created here, but is now created
+	   in drm_dma_enqueue.	This is more resource-efficient for
+	   hardware that does not do DMA, but may mean that
+	   drm_select_queue fails between the time the interrupt is
+	   initialized and the time the queues are initialized. */
+			
+	return 0;
+}
+
+
+static int
+tdfx_takedown(drm_device_t *dev)
+{
+	int		  i;
+	drm_magic_entry_t *pt, *next;
+	drm_map_t	  *map;
+	drm_vma_entry_t	  *vma, *vma_next;
+
+	DRM_DEBUG("\n");
+
+	lockmgr(&dev->dev_lock, LK_EXCLUSIVE, 0, curproc);
+	callout_stop(&dev->timer);
+	
+	if (dev->devname) {
+		drm_free(dev->devname, strlen(dev->devname)+1, DRM_MEM_DRIVER);
+		dev->devname = NULL;
+	}
+	
+	if (dev->unique) {
+		drm_free(dev->unique, strlen(dev->unique)+1, DRM_MEM_DRIVER);
+		dev->unique = NULL;
+		dev->unique_len = 0;
+	}
+				/* Clear pid list */
+	for (i = 0; i < DRM_HASH_SIZE; i++) {
+		for (pt = dev->magiclist[i].head; pt; pt = next) {
+			next = pt->next;
+			drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+		}
+		dev->magiclist[i].head = dev->magiclist[i].tail = NULL;
+	}
+#ifdef DRM_AGP
+				/* Clear AGP information */
+	if (dev->agp) {
+		drm_agp_mem_t *temp;
+		drm_agp_mem_t *temp_next;
+	   
+		temp = dev->agp->memory;
+		while(temp != NULL) {
+			temp_next = temp->next;
+			drm_free_agp(temp->handle, temp->pages);
+			drm_free(temp, sizeof(*temp), DRM_MEM_AGPLISTS);
+			temp = temp_next;
+		}
+
+		if (dev->agp->acquired)
+			agp_release(dev->agp->agpdev);
+		drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
+		dev->agp = NULL;
+	}
+#endif
+	
+				/* Clear vma list (only built for debugging) */
+	if (dev->vmalist) {
+		for (vma = dev->vmalist; vma; vma = vma_next) {
+			vma_next = vma->next;
+			drm_free(vma, sizeof(*vma), DRM_MEM_VMAS);
+		}
+		dev->vmalist = NULL;
+	}
+	
+				/* Clear map area and mtrr information */
+	if (dev->maplist) {
+		for (i = 0; i < dev->map_count; i++) {
+			map = dev->maplist[i];
+			switch (map->type) {
+			case _DRM_REGISTERS:
+			case _DRM_FRAME_BUFFER:
+#ifdef CONFIG_MTRR
+				if (map->mtrr >= 0) {
+					int retcode;
+					retcode = mtrr_del(map->mtrr,
+							   map->offset,
+							   map->size);
+					DRM_DEBUG("mtrr_del = %d\n", retcode);
+				}
+#endif
+				drm_ioremapfree(map->handle, map->size);
+				break;
+			case _DRM_SHM:
+				drm_free_pages((unsigned long)map->handle,
+					       drm_order(map->size)
+					       - PAGE_SHIFT,
+					       DRM_MEM_SAREA);
+				break;
+			case _DRM_AGP:
+				break; /* XXX */
+			}
+			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+		}
+		drm_free(dev->maplist,
+			 dev->map_count * sizeof(*dev->maplist),
+			 DRM_MEM_MAPS);
+		dev->maplist   = NULL;
+		dev->map_count = 0;
+	}
+	
+	if (dev->lock.hw_lock) {
+		dev->lock.hw_lock    = NULL; /* SHM removed */
+		dev->lock.pid	     = 0;
+		wakeup(&dev->lock.lock_queue);
+	}
+	lockmgr(&dev->dev_lock, LK_RELEASE, 0, curproc);
+
+	return 0;
+}
+
+/* tdfx_init is called via tdfx_attach at module load time, */
+
+static int
+tdfx_init(device_t nbdev)
+{
+	drm_device_t *dev = device_get_softc(nbdev);
+	int          retcode;
+
+	DRM_DEBUG("\n");
+
+	memset((void *)dev, 0, sizeof(*dev));
+	simple_lock_init(&dev->count_lock);
+	lockinit(&dev->dev_lock, PZERO, "drmlk", 0, 0);
+	
+#if 0
+	drm_parse_options(tdfx);
+#endif
+
+	dev->device = nbdev;
+	dev->devnode = make_dev(&tdfx_cdevsw,
+				device_get_unit(nbdev),
+				DRM_DEV_UID,
+				DRM_DEV_GID,
+				DRM_DEV_MODE,
+				TDFX_NAME);
+	dev->name   = TDFX_NAME;
+
+	drm_mem_init();
+	drm_sysctl_init(dev);
+	TAILQ_INIT(&dev->files);
+
+#ifdef DRM_AGP
+	dev->agp    = drm_agp_init();
+#endif
+	if((retcode = drm_ctxbitmap_init(dev))) {
+		DRM_ERROR("Cannot allocate memory for context bitmap.\n");
+		drm_sysctl_cleanup(dev);
+		tdfx_takedown(dev);
+		return retcode;
+	}
+
+	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
+		 TDFX_NAME,
+		 TDFX_MAJOR,
+		 TDFX_MINOR,
+		 TDFX_PATCHLEVEL,
+		 TDFX_DATE,
+		 device_get_unit(nbdev));
+	
+	return 0;
+}
+
+/* tdfx_cleanup is called via tdfx_detach at module unload time. */
+
+static void
+tdfx_cleanup(device_t nbdev)
+{
+	drm_device_t *dev = device_get_softc(nbdev);
+
+	DRM_DEBUG("\n");
+	
+	drm_sysctl_cleanup(dev);
+	destroy_dev(dev->devnode);
+
+	DRM_INFO("Module unloaded\n");
+
+	drm_ctxbitmap_cleanup(dev);
+	tdfx_takedown(dev);
+}
+
+static int
+tdfx_version(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_version_t version;
+	int	      len;
+
+	version = *(drm_version_t *) data;
+
+#define DRM_COPY(name,value)				\
+	len = strlen(value);				\
+	if (len > name##_len) len = name##_len;		\
+	name##_len = strlen(value);			\
+	if (len && name) {				\
+		int error = copyout(value, name, len);	\
+		if (error) return error;		\
+	}
+
+	version.version_major	   = TDFX_MAJOR;
+	version.version_minor	   = TDFX_MINOR;
+	version.version_patchlevel = TDFX_PATCHLEVEL;
+
+	DRM_COPY(version.name, TDFX_NAME);
+	DRM_COPY(version.date, TDFX_DATE);
+	DRM_COPY(version.desc, TDFX_DESC);
+
+	*(drm_version_t *) data = version;
+	return 0;
+}
+
+static int
+tdfx_open(dev_t kdev, int flags, int fmt, struct proc *p)
+{
+	drm_device_t  *dev    = TDFX_SOFTC(minor(kdev));
+	int	      retcode = 0;
+	
+	DRM_DEBUG("open_count = %d\n", dev->open_count);
+
+	device_busy(dev->device);
+	if (!(retcode = drm_open_helper(kdev, flags, fmt, p, dev))) {
+		atomic_inc(&dev->total_open);
+		simple_lock(&dev->count_lock);
+		if (!dev->open_count++) {
+			simple_unlock(&dev->count_lock);
+			retcode = tdfx_setup(dev);
+		}
+		simple_unlock(&dev->count_lock);
+	}
+	device_unbusy(dev->device);
+
+	return retcode;
+}
+
+static int
+tdfx_close(dev_t kdev, int flags, int fmt, struct proc *p)
+{
+	drm_device_t  *dev    = kdev->si_drv1;
+	int	      retcode = 0;
+
+	DRM_DEBUG("open_count = %d\n", dev->open_count);
+	if (!(retcode = drm_close(kdev, flags, fmt, p))) {
+		atomic_inc(&dev->total_close);
+		simple_lock(&dev->count_lock);
+		if (!--dev->open_count) {
+			if (atomic_read(&dev->ioctl_count) || dev->blocked) {
+				DRM_ERROR("Device busy: %d %d\n",
+					  atomic_read(&dev->ioctl_count),
+					  dev->blocked);
+				simple_unlock(&dev->count_lock);
+				return EBUSY;
+			}
+			simple_unlock(&dev->count_lock);
+			device_unbusy(dev->device);
+			return tdfx_takedown(dev);
+		}
+		simple_unlock(&dev->count_lock);
+	}
+
+	return retcode;
+}
+
+/* tdfx_ioctl is called whenever a process performs an ioctl on /dev/drm. */
+
+static int
+tdfx_ioctl(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	int		 nr	 = DRM_IOCTL_NR(cmd);
+	drm_device_t	 *dev	 = kdev->si_drv1;
+	drm_file_t       *priv;
+	int		 retcode = 0;
+	drm_ioctl_desc_t *ioctl;
+	d_ioctl_t	 *func;
+
+	DRM_DEBUG("dev=%p\n", dev);
+	priv = drm_find_file_by_proc(dev, p);
+	if (!priv) {
+		DRM_DEBUG("can't find authenticator\n");
+		return EINVAL;
+	}
+
+	atomic_inc(&dev->ioctl_count);
+	atomic_inc(&dev->total_ioctl);
+	++priv->ioctl_count;
+	
+	DRM_DEBUG("pid = %d, cmd = 0x%02lx, nr = 0x%02x, auth = %d\n",
+		  p->p_pid, cmd, nr, priv->authenticated);
+
+	switch (cmd) {
+	case FIONBIO:
+		atomic_dec(&dev->ioctl_count);
+		return 0;
+
+	case FIOASYNC:
+		atomic_dec(&dev->ioctl_count);
+		dev->flags |= FASYNC;
+		return 0;
+
+	case FIOSETOWN:
+		atomic_dec(&dev->ioctl_count);
+		return fsetown(*(int *)data, &dev->buf_sigio);
+
+	case FIOGETOWN:
+		atomic_dec(&dev->ioctl_count);
+		*(int *) data = fgetown(dev->buf_sigio);
+		return 0;
+	}
+
+	if (nr >= TDFX_IOCTL_COUNT) {
+		retcode = EINVAL;
+	} else {
+		ioctl	  = &tdfx_ioctls[nr];
+		func	  = ioctl->func;
+
+		if (!func) {
+			DRM_DEBUG("no function\n");
+			retcode = EINVAL;
+		} else if ((ioctl->root_only && suser(p))
+			    || (ioctl->auth_needed && !priv->authenticated)) {
+			retcode = EACCES;
+		} else {
+			retcode = (func)(kdev, cmd, data, flags, p);
+		}
+	}
+	
+	atomic_dec(&dev->ioctl_count);
+	return retcode;
+}
+
+static int
+tdfx_lock(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+        drm_device_t      *dev    = kdev->si_drv1;
+        int               ret   = 0;
+        drm_lock_t        lock;
+#if DRM_DMA_HISTOGRAM
+
+        getnanotime(&dev->lck_start);
+#endif
+
+	lock = *(drm_lock_t *) data;
+
+        if (lock.context == DRM_KERNEL_CONTEXT) {
+                DRM_ERROR("Process %d using kernel context %d\n",
+                          p->p_pid, lock.context);
+                return EINVAL;
+        }
+
+        DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
+                  lock.context, p->p_pid, dev->lock.hw_lock->lock,
+                  lock.flags);
+
+#if 0
+				/* dev->queue_count == 0 right now for
+                                   tdfx.  FIXME? */
+        if (lock.context < 0 || lock.context >= dev->queue_count)
+                return EINVAL;
+#endif
+        
+        if (!ret) {
+#if 0
+                if (_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)
+                    != lock.context) {
+                        long j = ticks - dev->lock.lock_time;
+
+                        if (lock.context == tdfx_res_ctx.handle &&
+				j >= 0 && j < DRM_LOCK_SLICE) {
+                                /* Can't take lock if we just had it and
+                                   there is contention. */
+                                DRM_DEBUG("%d (pid %d) delayed j=%d dev=%d ticks=%d\n",
+					lock.context, p->p_pid, j, 
+					dev->lock.lock_time, ticks);
+				ret = tsleep(&never, PZERO|PCATCH, "drmlk1",
+					       DRM_LOCK_SLICE - j);
+				if (ret)
+					return ret;
+				DRM_DEBUG("ticks=%d\n", ticks);
+                        }
+                }
+#endif
+                for (;;) {
+                        if (!dev->lock.hw_lock) {
+                                /* Device has been unregistered */
+                                ret = EINTR;
+                                break;
+                        }
+                        if (drm_lock_take(&dev->lock.hw_lock->lock,
+                                          lock.context)) {
+                                dev->lock.pid       = p->p_pid;
+                                dev->lock.lock_time = ticks;
+                                atomic_inc(&dev->total_locks);
+                                break;  /* Got lock */
+                        }
+                        
+                                /* Contention */
+                        atomic_inc(&dev->total_sleeps);
+			ret = tsleep(&dev->lock.lock_queue,
+				       PZERO|PCATCH,
+				       "drmlk2",
+				       0);
+			if (ret)
+				break;
+                }
+        }
+
+#if 0
+	if (!ret && dev->last_context != lock.context &&
+		lock.context != tdfx_res_ctx.handle &&
+		dev->last_context != tdfx_res_ctx.handle) {
+		add_wait_queue(&dev->context_wait, &entry);
+	        current->state = TASK_INTERRUPTIBLE;
+                /* PRE: dev->last_context != lock.context */
+	        tdfx_context_switch(dev, dev->last_context, lock.context);
+		/* POST: we will wait for the context
+                   switch and will dispatch on a later call
+                   when dev->last_context == lock.context
+                   NOTE WE HOLD THE LOCK THROUGHOUT THIS
+                   TIME! */
+		current->policy |= SCHED_YIELD;
+	        schedule();
+	        current->state = TASK_RUNNING;
+	        remove_wait_queue(&dev->context_wait, &entry);
+	        if (signal_pending(current)) {
+	                ret = EINTR;
+	        } else if (dev->last_context != lock.context) {
+			DRM_ERROR("Context mismatch: %d %d\n",
+                        	dev->last_context, lock.context);
+	        }
+	}
+#endif
+
+        if (!ret) {
+                if (lock.flags & _DRM_LOCK_READY) {
+				/* Wait for space in DMA/FIFO */
+		}
+                if (lock.flags & _DRM_LOCK_QUIESCENT) {
+				/* Make hardware quiescent */
+#if 0
+                        tdfx_quiescent(dev);
+#endif
+		}
+        }
+
+#if 0
+	DRM_ERROR("pid = %5d, old counter = %5ld\n", 
+		p->p_pid, current->counter);
+#endif
+#if 0
+	while (current->counter > 25)
+		current->counter >>= 1; /* decrease time slice */
+	DRM_ERROR("pid = %5d, new counter = %5ld\n",
+		 p->p_pid, current->counter);
+#endif
+        DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
+
+#if DRM_DMA_HISTOGRAM
+	{
+	    struct timespec ts;
+	    getnanotime(&ts);
+	    timespecsub(&ts, &dev->lck_start);
+	    atomic_inc(&dev->histo.lhld[drm_histogram_slot(&ts)]);
+	}
+#endif
+        
+        return ret;
+}
+
+
+static int
+tdfx_unlock(dev_t kdev, u_long cmd, caddr_t data, int flags, struct proc *p)
+{
+	drm_device_t	  *dev	  = kdev->si_drv1;
+	drm_lock_t	  lock;
+
+	lock = *(drm_lock_t *) data;
+	
+	if (lock.context == DRM_KERNEL_CONTEXT) {
+		DRM_ERROR("Process %d using kernel context %d\n",
+			  p->p_pid, lock.context);
+		return EINVAL;
+	}
+
+	DRM_DEBUG("%d frees lock (%d holds)\n",
+		  lock.context,
+		  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+	atomic_inc(&dev->total_unlocks);
+	if (_DRM_LOCK_IS_CONT(dev->lock.hw_lock->lock))
+		atomic_inc(&dev->total_contends);
+	drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
+				/* FIXME: Try to send data to card here */
+	if (!dev->context_flag) {
+		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_drv.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_drv.h:1.1
--- /dev/null	Sat Jul  1 20:43:14 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/tdfx_drv.h	Fri Jun 16 17:03:32 2000
@@ -0,0 +1,45 @@
+/* tdfx_drv.h -- Private header for tdfx driver -*- c -*-
+ * Created: Thu Oct  7 10:40:04 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * 
+ */
+
+#ifndef _TDFX_DRV_H_
+#define _TDFX_DRV_H_
+
+				/* tdfx_context.c */
+
+extern d_ioctl_t tdfx_resctx;
+extern d_ioctl_t tdfx_addctx;
+extern d_ioctl_t tdfx_modctx;
+extern d_ioctl_t tdfx_getctx;
+extern d_ioctl_t tdfx_switchctx;
+extern d_ioctl_t tdfx_newctx;
+extern d_ioctl_t tdfx_rmctx;
+
+extern int  tdfx_context_switch(drm_device_t *dev, int old, int new);
+extern int  tdfx_context_switch_complete(drm_device_t *dev, int new);
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile:3.10 xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile:3.12
--- xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile:3.10	Sat Feb 12 19:36:06 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile	Tue Jun 27 07:27:29 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile,v 3.10 2000/02/13 03:36:06 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile,v 3.12 2000/06/27 14:27:29 tsi Exp $
 
 
 
@@ -11,12 +11,14 @@
 MOUSEOBJ = bsdi_mouse.o
 
 SRCS = bsdi_init.c bsdi_video.c bsdi_io.c bios_devmem.c \
-       mapVT_noop.c VTsw_noop.c std_kbdEv.c posix_tty.c $(MOUSESRC) \
-       libc_wrapper.c stdResource.c stdPci.c sigiostubs.c pm_noop.c
+       VTsw_noop.c std_kbdEv.c posix_tty.c $(MOUSESRC) \
+       libc_wrapper.c stdResource.c stdPci.c sigiostubs.c pm_noop.c \
+       kmod_noop.c
 
 OBJS = bsdi_init.o bsdi_video.o bsdi_io.o bios_devmem.o \
-       mapVT_noop.o VTsw_noop.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
-       libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o
+       VTsw_noop.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
+       libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o \
+       kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC)
@@ -29,7 +31,6 @@
 NormalLibraryObjectRule()
 
 LinkSourceFile(bios_devmem.c,../shared)
-LinkSourceFile(mapVT_noop.c,../shared)
 LinkSourceFile(VTsw_noop.c,../shared)
 LinkSourceFile(std_kbdEv.c,../shared)
 LinkSourceFile(posix_tty.c,../shared)
@@ -38,6 +39,7 @@
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
 
Index: xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile:1.10 xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile:1.13
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile:1.10	Tue Mar  7 05:59:06 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile	Mon Jun 12 19:28:36 2000
@@ -3,7 +3,7 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v 1.10 2000/03/07 13:59:06 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v 1.13 2000/06/13 02:28:36 dawes Exp $
 
 #include <Server.tmpl>
 
@@ -20,8 +20,10 @@
 
 PCIDRVRSRC = sparcPci.c
 PCIDRVROBJ = sparcPci.o
+SBUSDRVSRC = linuxSbus.c
+SBUSDRVOBJ = linuxSbus.o
 
-#elif defined(LinuxArchitecture) && defined(PpcArchitecture)
+#elif defined(LinuxArchitecture) && (defined(PpcArchitecture) || defined(MipsArchitecture))
 
 XCOMM generic linux PCI driver (using /proc/bus/pci, requires kernel 2.2)
 
@@ -35,8 +37,16 @@
 PCIDRVRSRC = ppcPci.c
 PCIDRVROBJ = ppcPci.o
 
+#elif defined(LinuxArchitecture) && ( defined(i386Architecture) || defined(ia64Architecture))
+
+XCOMM ix86 PCI driver with OS fallback for Linux
+
+PCIDRVRSRC = ix86Pci.c linuxPci.c
+PCIDRVROBJ = ix86Pci.o linuxPci.o
+
 #elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture)
 
+
 XCOMM generic FreeBSD PCI driver (using /dev/pci)
 
 PCIDRVRSRC = freebsdPci.c
@@ -55,8 +65,8 @@
 XCOMM no PCI driver -- shouldn't get here
 #endif
 
-SRCS = Pci.c $(PCIDRVRSRC)
-OBJS = Pci.o $(PCIDRVROBJ)
+SRCS = Pci.c $(PCIDRVRSRC) $(SBUSDRVSRC)
+OBJS = Pci.o $(PCIDRVROBJ) $(SBUSDRVOBJ)
 
 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
 	   -I$(SERVERSRC)/include -I$(XINCLUDESRC)
Index: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c:1.24 xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c:1.32
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c:1.24	Tue Feb  8 05:13:28 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c	Tue Jun 20 12:40:31 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.24 2000/02/08 13:13:28 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.32 2000/06/20 19:40:31 eich Exp $ */
 /*
  * Pci.c - New server PCI access functions
  *
@@ -206,8 +206,9 @@
 	pciAddrNOOP
 };
 		
-pciBusInfo_t  *pciBusInfo[MAX_PCI_BUSES];
+pciBusInfo_t  *pciBusInfo[MAX_PCI_BUSES] = { NULL, };
 int            pciNumBuses = 0;     /* Actual number of PCI buses */
+static Bool    inProbe = FALSE;
 
 static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, };
 #ifdef INCLUDE_LOCKPCI
@@ -240,7 +241,13 @@
 		xf86Verbose = DEBUGPCI;
 #endif
 
-	ARCH_PCI_INIT();	
+	ARCH_PCI_INIT();
+	if (!pciNumBuses)
+#if defined(ARCH_PCI_OS_INIT)
+	    ARCH_PCI_OS_INIT();
+#else
+	    xf86Msg(X_ERROR,"No OS PCI support available\n");
+#endif
 }
 
   
@@ -282,7 +289,7 @@
   if (!pciInitialized)
     pciInit();
 
-  if (bus < pciNumBuses && pciBusInfo[bus] &&
+  if ((bus < pciNumBuses || inProbe) &&  pciBusInfo[bus] &&
 	pciBusInfo[bus]->funcs.pciReadLong) {
     CARD32 rv = (*pciBusInfo[bus]->funcs.pciReadLong)(tag, offset);
 
@@ -618,6 +625,7 @@
 {
   unsigned long devid, tmp;
   unsigned char base_class, sub_class, sec_bus, pri_bus;
+  Bool speculativeProbe = FALSE;
   
 #ifdef DEBUGPCI
 ErrorF("pciGenFindNext\n");
@@ -679,7 +687,13 @@
 		    /*
 		     * No more devices for this bus. Next bus please
 		     */
-		    if (++pciBusNum >= pciNumBuses) {
+     if (speculativeProbe) {
+	 xfree(pciBusInfo[pciBusNum]);
+	 pciBusInfo[pciBusNum] = NULL;
+     }
+     
+	 
+     if (++pciBusNum >= MAX_PCI_BUSES) {
 #ifdef DEBUGPCI
 ErrorF("pciGenFindNext: out of buses\n");
 #endif
@@ -694,8 +708,12 @@
 #ifdef DEBUGPCI
 ErrorF("pciGenFindNext: pciBusInfo[%d] = 0x%lx\n", pciBusNum, pciBusInfo[pciBusNum]);
 #endif
-    if (!pciBusInfo[pciBusNum])
-	    continue;	    /* Bus not defined, next please */
+ if (!pciBusInfo[pciBusNum]) {
+     pciBusInfo[pciBusNum] = xnfalloc(sizeof(pciBusInfo_t));
+     *pciBusInfo[pciBusNum] = *pciBusInfo[0];
+     
+     speculativeProbe = TRUE;
+ }
     
     /*
      * At this point, pciBusNum, pciDevNum, and pciFuncNum have been
@@ -706,13 +724,20 @@
 ErrorF("pciGenFindNext: [%d, %d, %d]\n", pciBusNum, pciDevNum, pciFuncNum);
 #endif
     pciDeviceTag = PCI_MAKE_TAG(pciBusNum, pciDevNum, pciFuncNum);
+    inProbe = TRUE;
     devid = pciReadLong(pciDeviceTag, 0);
+    inProbe = FALSE;
 #ifdef DEBUGPCI
 ErrorF("pciGenFindNext: pciDeviceTag = 0x%lx, devid = 0x%lx\n", pciDeviceTag, devid);
 #endif
     if (devid == 0xffffffff)
 	    continue; /* Nobody home.  Next device please */
 
+    if (speculativeProbe && (pciNumBuses <= pciBusNum))
+	pciNumBuses = pciBusNum + 1;
+    
+    speculativeProbe = FALSE;
+    
     /*
      * Before checking for a specific devid, look for enabled
      * PCI to PCI bridge devices.  If one is found, create and
@@ -722,7 +747,8 @@
     tmp = pciReadLong(pciDeviceTag, PCI_CLASS_REG);
     base_class = PCI_CLASS_EXTRACT(tmp);
     sub_class = PCI_SUBCLASS_EXTRACT(tmp); 
-    if (base_class == PCI_CLASS_BRIDGE && sub_class == PCI_SUBCLASS_BRIDGE_PCI) {
+    if (base_class == PCI_CLASS_BRIDGE)
+	if (sub_class == PCI_SUBCLASS_BRIDGE_PCI) {
 	    tmp = pciReadLong(pciDeviceTag, PCI_PCI_BRIDGE_BUS_REG);
 	    sec_bus = PCI_SECONDARY_BUS_EXTRACT(tmp);
 	    pri_bus = PCI_PRIMARY_BUS_EXTRACT(tmp);
@@ -1113,7 +1139,7 @@
 #elif defined(__sparc__)
 
 pointer
-xf86MapPciMem(int ScreenNum, int Flags, PCITAG Tag, pointer Base,
+xf86MapPciMem(int ScreenNum, int Flags, PCITAG Tag, unsigned long Base,
 		unsigned long Size)
 {
     FatalError("xf86MapPciMem: Unsupported on SPARC\n");
Index: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h:1.9 xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h:1.12
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h:1.9	Sat Feb 12 12:45:42 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h	Tue Jun 20 14:19:11 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.9 2000/02/12 20:45:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.12 2000/06/20 21:19:11 mvojkovi Exp $ */
 /*
  * Copyright 1998 by Concurrent Computer Corporation
  *
@@ -136,7 +136,7 @@
 /*
  * Select architecture specific PCI init function
  */
-#if defined(__powerpc__) && defined(linux)
+#if (defined(__powerpc__) || defined(__mips__)) && defined(linux)
 # define ARCH_PCI_INIT linuxPciInit
 # define INCLUDE_XF86_MAP_PCI_MEM
 #elif defined(__powerpc__)
@@ -149,6 +149,14 @@
 #elif defined(__alpha__) && defined(linux)
 # define ARCH_PCI_INIT axpPciInit
 # define INCLUDE_XF86_MAP_PCI_MEM
+#elif defined(__i386__) && defined(linux)
+# define ARCH_PCI_INIT ix86PciInit
+# define ARCH_PCI_OS_INIT linuxPciInit
+# define INCLUDE_XF86_MAP_PCI_MEM
+#elif defined(__ia64__) && defined(linux)
+# define ARCH_PCI_INIT ix86PciInit
+# define ARCH_PCI_OS_INIT linuxPciInit
+# define INCLUDE_XF86_MAP_PCI_MEM
 #elif defined(__alpha__) && defined(__FreeBSD__)
 # define ARCH_PCI_INIT freebsdPciInit
 # define INCLUDE_XF86_MAP_PCI_MEM
@@ -157,6 +165,9 @@
 # define INCLUDE_XF86_MAP_PCI_MEM
 #endif
 extern void ARCH_PCI_INIT(void);
+#if defined(ARCH_PCI_OS_INIT)
+extern void ARCH_PCI_OS_INIT(void);
+#endif
 
 /*
  * Table of functions used to access a specific PCI bus domain
Index: xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c:1.7 xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c:1.8
--- xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c:1.7	Sat Jul  3 23:39:14 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c	Fri Jun  9 00:53:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c,v 1.7 1999/07/04 06:39:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c,v 1.8 2000/06/09 07:53:25 eich Exp $ */
 /*
  * ix86Pci.c - x86 PCI driver
  *
@@ -430,6 +430,8 @@
       ix86Pci0.funcs.pciSetBitsLong = ix86PciSetBitsLongCFG2;
       return;
 
+    case PCIOsConfig:
+	return;
     }
 
     /* No PCI found */
Index: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxSbus.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bus/linuxSbus.c:1.3
--- /dev/null	Sat Jul  1 20:43:15 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxSbus.c	Fri Jun 30 10:15:18 2000
@@ -0,0 +1,581 @@
+/*
+ * Linux platform specific SBUS and OpenPROM access functions.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxSbus.c,v 1.3 2000/06/30 17:15:18 dawes Exp $ */
+    
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <asm/openpromio.h>
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+
+#include "xf86sbusBus.h"
+#include "xf86Sbus.h"
+
+static int promFd = -1;
+static int promRootNode, promCurrentNode;
+static int promOpenCount = 0;
+static int promP1275 = -1;
+#define MAX_PROP	128
+#define MAX_VAL		(4096-128-4)
+static struct openpromio *promOpio;
+
+static int
+promGetSibling(int node)
+{
+    promOpio->oprom_size = sizeof(int);
+    
+    if (node == -1) return 0;
+    *(int *)promOpio->oprom_array = node;
+    if (ioctl(promFd, OPROMNEXT, promOpio) < 0)
+	return 0;
+    promCurrentNode = *(int *)promOpio->oprom_array;
+    return *(int *)promOpio->oprom_array;
+}
+
+static int
+promGetChild(int node)
+{
+    promOpio->oprom_size = sizeof(int);
+    
+    if (!node || node == -1) return 0;
+    *(int *)promOpio->oprom_array = node;
+    if (ioctl(promFd, OPROMCHILD, promOpio) < 0)
+	return 0;
+    promCurrentNode = *(int *)promOpio->oprom_array;
+    return *(int *)promOpio->oprom_array;
+}
+
+static char *
+promGetProperty(const char *prop, int *lenp)
+{
+    promOpio->oprom_size = MAX_VAL;
+    
+    strcpy(promOpio->oprom_array, prop);
+    if (ioctl(promFd, OPROMGETPROP, promOpio) < 0)
+	return 0;
+    if (lenp) *lenp = promOpio->oprom_size;
+    return promOpio->oprom_array;
+}
+
+static int
+promGetBool(const char *prop)
+{
+    promOpio->oprom_size = 0;
+
+    *(int *)promOpio->oprom_array = 0;
+    for (;;) {
+	promOpio->oprom_size = MAX_PROP;
+	if (ioctl(promFd, OPROMNXTPROP, promOpio) < 0)
+	    return 0;
+	if (!promOpio->oprom_size)
+	    return 0;
+	if (!strcmp(promOpio->oprom_array, prop))
+	    return 1;
+    }
+}
+
+enum {
+    PROM_NODE_PCI = 16,
+    PROM_NODE_EBUS = 8,
+    PROM_NODE_SBUS = 4,
+    PROM_NODE_PREF = 2,
+    PROM_NODE_SIBLING = 1
+};
+
+static int
+promSetNode(sbusPromNodePtr pnode)
+{
+    int node;
+
+    if (!pnode->node || pnode->node == -1)
+	return -1;
+    if (pnode->cookie[0] & PROM_NODE_SIBLING)
+	node = promGetSibling(pnode->cookie[1]);
+    else
+	node = promGetChild(pnode->cookie[1]);
+    if (pnode->node != node)
+	return -1;
+    return 0;
+}
+
+static void
+promIsP1275(void)
+{
+    FILE *f;
+    char buffer[1024];
+
+    if (promP1275 != -1)
+	return;
+    promP1275 = 0;
+    f = fopen("/proc/cpuinfo","r");
+    if (!f) return;
+    while (fgets(buffer, 1024, f) != NULL)
+	if (!strncmp (buffer, "type", 4) && strstr (buffer, "sun4u")) {
+	    promP1275 = 1;
+	    break;
+	}
+    fclose(f);
+}
+
+void
+sparcPromClose(void)
+{
+    if (promOpenCount > 1) {
+	promOpenCount--;
+	return;
+    }
+    if (promFd != -1) {
+	close(promFd);
+	promFd = -1;
+    }
+    if (promOpio) {
+	xfree(promOpio);
+	promOpio = NULL;
+    }
+    promOpenCount = 0;
+}
+
+int
+sparcPromInit(void)
+{
+    if (promOpenCount) {
+	promOpenCount++;
+	return 0;
+    }
+    promFd = open("/dev/openprom", O_RDONLY, 0);
+    if (promFd == -1)
+	return -1;
+    promOpio = (struct openpromio *)xalloc(4096);
+    if (!promOpio) {
+	sparcPromClose();
+	return -1;
+    }
+    promRootNode = promGetSibling(0);
+    if (!promRootNode) {
+	sparcPromClose();
+	return -1;
+    }
+    promIsP1275();
+    promOpenCount++;
+
+    return 0;
+}
+
+char *
+sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp)
+{
+    if (promSetNode(pnode))
+	return NULL;
+    return promGetProperty(prop, lenp);
+}
+
+int
+sparcPromGetBool(sbusPromNodePtr pnode, const char *prop)
+{
+    if (promSetNode(pnode))
+	return 0;
+    return promGetBool(prop);
+}
+
+static sbusDevicePtr *devicePtrs;
+
+static void promWalk(int node, int oldnode, int flags)
+{
+    int nextnode;
+    int len, sbus = (flags & PROM_NODE_SBUS);
+    char *prop = promGetProperty("device_type", &len);
+    int devId, i, j;
+    sbusPromNode pNode, pNode2;
+    
+    while (prop) {
+	if (len <= 0 || strcmp(prop, "display"))
+	    break;
+	prop = promGetProperty("name", &len);
+	if (!prop || len <= 0)
+	    break;
+	while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',') prop++;
+	if (!sbus && strcmp(prop, "ffb") && strcmp(prop, "afb") &&
+	    strcmp(prop, "cgfourteen"))
+	    break;
+	/* All /SUNW,ffb outside of SBUS tree come before all
+	 * /SUNW,afb outside of SBUS tree in Linux. */
+	if (!sbus && !strcmp(prop, "afb"))
+	    flags |= PROM_NODE_PREF;
+	for (i = 0; sbusDeviceTable[i].devId; i++)
+	    if (!strcmp(prop, sbusDeviceTable[i].promName))
+		break;
+	devId = sbusDeviceTable[i].devId;
+	if (! devId)
+	    break;
+	for (i = 0; i < 32; i++) {
+	    if (! devicePtrs[i] || devicePtrs[i]->devId != devId)
+		continue;
+	    if (devicePtrs[i]->node.node) {
+		if ((devicePtrs[i]->node.cookie[0] & ~PROM_NODE_SIBLING) <=
+		    (flags & ~PROM_NODE_SIBLING))
+		    continue;
+		for (j = i + 1, pNode = devicePtrs[i]->node; j < 32; j++) {
+		    if (! devicePtrs[j] || devicePtrs[j]->devId != devId)
+			continue;
+		    pNode2 = devicePtrs[j]->node;
+		    devicePtrs[j]->node = pNode;
+		    pNode = pNode2;
+		}
+	    }
+	    devicePtrs[i]->node.node = node;
+	    devicePtrs[i]->node.cookie[0] = flags;
+	    devicePtrs[i]->node.cookie[1] = oldnode;
+	    break;
+	}
+	break;
+    }
+    prop = promGetProperty("name", &len);
+    if (prop && len > 0) {
+	if (!strcmp(prop, "sbus") || !strcmp(prop, "sbi"))
+	    sbus = PROM_NODE_SBUS;
+    }
+    nextnode = promGetChild(node);
+    if (nextnode)
+	promWalk(nextnode, node, sbus);
+    nextnode = promGetSibling(node);
+    if (nextnode)
+	promWalk(nextnode, node, PROM_NODE_SIBLING|sbus);
+}
+
+void
+sparcPromAssignNodes(void)
+{
+    sbusDevicePtr psdp, *psdpp;
+    int n, holes = 0, i, j;
+    FILE *f;
+
+    devicePtrs = xnfcalloc(sizeof(sbusDevicePtr), 32);
+    for (psdpp = xf86SbusInfo, psdp = *psdpp, n = 0; psdp; psdp = *++psdpp, n++) {
+	if (psdp->fbNum != n)
+	    holes = 1;
+	devicePtrs[psdp->fbNum] = psdp;
+    }
+    if (holes && (f = fopen("/proc/fb", "r")) != NULL) {
+	/* We could not open one of fb devices, check /proc/fb to see what
+	 * were the types of the cards missed. */
+	char buffer[64];
+	int fbNum, devId;
+	static struct {
+	    int devId;
+	    char *prefix;
+	} procFbPrefixes[] = {
+	    { SBUS_DEVICE_BW2, "BWtwo" },
+	    { SBUS_DEVICE_CG14, "CGfourteen" },
+	    { SBUS_DEVICE_CG6, "CGsix" },
+	    { SBUS_DEVICE_CG3, "CGthree" },
+	    { SBUS_DEVICE_FFB, "Creator" },
+	    { SBUS_DEVICE_FFB, "Elite 3D" },
+	    { SBUS_DEVICE_LEO, "Leo" },
+	    { SBUS_DEVICE_TCX, "TCX" },
+	    { 0, NULL },
+	};
+
+	while (fscanf(f, "%d %63s\n", &fbNum, buffer) == 2) {
+	    for (i = 0; procFbPrefixes[i].devId; i++)
+		if (! strncmp(procFbPrefixes[i].prefix, buffer,
+		      strlen(procFbPrefixes[i].prefix)))
+		    break;
+	    devId = procFbPrefixes[i].devId;
+	    if (! devId) continue;
+	    if (devicePtrs[fbNum]) {
+		if (devicePtrs[fbNum]->devId != devId)
+		    xf86ErrorF("Inconsistent /proc/fb with FBIOGATTR\n");
+	    } else if (!devicePtrs[fbNum]) {
+		devicePtrs[fbNum] = psdp = xnfcalloc(sizeof (sbusDevice), 1);
+		psdp->devId = devId;
+		psdp->fbNum = fbNum;
+		psdp->fd = -2;
+	    }
+	}
+	fclose(f);
+    }
+    promGetSibling(0);
+    promWalk(promRootNode, 0, 2);
+    for (i = 0, j = 0; i < 32; i++)
+	if (devicePtrs[i] && devicePtrs[i]->fbNum == -1)
+	    j++;
+    xf86SbusInfo = xnfrealloc(xf86SbusInfo, sizeof(psdp) * (n + j + 1));
+    for (i = 0, psdpp = xf86SbusInfo; i < 32; i++)
+	if (devicePtrs[i]) {
+	    if (devicePtrs[i]->fbNum == -1) {
+		memmove(psdpp + 1, psdpp, sizeof(psdpp) * (n + 1));
+		*psdpp = devicePtrs[i];
+	    } else
+		n--;
+	}
+    xfree(devicePtrs);
+}
+
+static char *
+promGetReg(int type)
+{
+    char *prop;
+    int len;
+    static char regstr[40];
+
+    regstr[0] = 0;
+    prop = promGetProperty("reg", &len);
+    if (prop && len >= 4) {
+	unsigned int *reg = (unsigned int *)prop;
+	if (!promP1275 || (type == PROM_NODE_SBUS) || (type == PROM_NODE_EBUS))
+	    sprintf (regstr, "@%x,%x", reg[0], reg[1]);
+	else if (type == PROM_NODE_PCI) {
+	    if ((reg[0] >> 8) & 7)
+		sprintf (regstr, "@%x,%x", (reg[0] >> 11) & 0x1f, (reg[0] >> 8) & 7);
+	    else
+		sprintf (regstr, "@%x", (reg[0] >> 11) & 0x1f);
+	} else if (len == 4)
+	    sprintf (regstr, "@%x", reg[0]);
+	else {
+	    unsigned int regs[2];
+
+	    /* Things get more complicated on UPA. If upa-portid exists,
+	       then address is @upa-portid,second-int-in-reg, otherwise
+	       it is @first-int-in-reg/16,second-int-in-reg (well, probably
+	       upa-portid always exists, but just to be safe). */
+	    memcpy (regs, reg, sizeof(regs));
+	    prop = promGetProperty("upa-portid", &len);
+	    if (prop && len == 4) {
+		reg = (unsigned int *)prop;
+		sprintf (regstr, "@%x,%x", reg[0], regs[1]);
+	    } else
+		sprintf (regstr, "@%x,%x", regs[0] >> 4, regs[1]);
+	}
+    }
+    return regstr;
+}
+
+static int
+promWalk2(char *path, int parent, int node, int searchNode, int type)
+{
+    int nextnode;
+    int len, ntype = type;
+    char *prop, *p;
+
+    prop = promGetProperty("name", &len);
+    *path = '/';
+    if (!prop || len <= 0)
+	return 0;
+    if ((!strcmp(prop, "sbus") || !strcmp(prop, "sbi")) && !type)
+	ntype = PROM_NODE_SBUS;
+    else if (!strcmp(prop, "ebus") && type == PROM_NODE_PCI)
+	ntype = PROM_NODE_EBUS;
+    else if (!strcmp(prop, "pci") && !type)
+	ntype = PROM_NODE_PCI;
+    strcpy (path + 1, prop);
+    p = promGetReg(type);
+    if (*p)
+	strcat (path, p);
+    if (node == searchNode)
+	return 1;
+    nextnode = promGetChild(node);
+    if (nextnode && promWalk2(strchr (path, 0), node, nextnode, searchNode, ntype))
+	return 1;
+    nextnode = promGetSibling(node);
+    if (nextnode && promWalk2(path, parent, nextnode, searchNode, type))
+	return 1;
+    return 0;
+}
+
+char *
+sparcPromNode2Pathname(sbusPromNodePtr pnode)
+{
+    char *ret;
+
+    if (!pnode->node) return NULL;
+    ret = xalloc(4096);
+    if (!ret) return NULL;
+    if (promWalk2(ret, promRootNode, promGetChild(promRootNode), pnode->node, 0))
+	return ret;
+    xfree(ret);
+    return NULL;
+}
+
+static int
+promWalk3(char *name, char *regstr, int parent, int type)
+{
+    int len, node, ret;
+    char *prop, *p;
+
+    for (;;) {
+	prop = promGetProperty("name", &len);
+	if (!prop || len <= 0)
+	    return 0;
+	if ((!strcmp(prop, "sbus") || !strcmp(prop, "sbi")) && !type)
+	    type = PROM_NODE_SBUS;
+	else if (!strcmp(prop, "ebus") && type == PROM_NODE_PCI)
+	    type = PROM_NODE_EBUS;
+	else if (!strcmp(prop, "pci") && !type)
+	    type = PROM_NODE_PCI;
+	for (node = promGetChild(parent); node; node = promGetSibling(node)) {
+	    prop = promGetProperty("name", &len);
+	    if (!prop || len <= 0)
+		continue;
+	    if (*name && strcmp(name, prop))
+		continue;
+	    if (*regstr) {
+		p = promGetReg(type);
+		if (! *p || strcmp(p + 1, regstr))
+		    continue;
+	    }
+	    break;
+	}
+	if (!node) {
+	    for (node = promGetChild(parent); node; node = promGetSibling(node)) {
+		ret = promWalk3(name, regstr, node, type);
+		if (ret) return ret;
+	    }
+	    return 0;
+	}
+	name = strchr(regstr, 0) + 1;
+	if (! *name)
+	    return node;
+	p = strchr(name, '/');
+	if (p)
+	    *p = 0;
+	else
+	    p = strchr(name, 0);
+	regstr = strchr(name, '@');
+	if (regstr)
+	    *regstr++ = 0;
+	else
+	    regstr = p;
+	if (name == regstr)
+	    return 0;
+	parent = node;
+    }
+}
+
+int
+sparcPromPathname2Node(const char *pathName)
+{
+    int i;
+    char *name, *regstr, *p;
+
+    i = strlen(pathName);
+    name = xalloc(i + 2);
+    if (! name) return 0;
+    strcpy (name, pathName);
+    name [i + 1] = 0;
+    if (name[0] != '/')
+	return 0;
+    p = strchr(name + 1, '/');
+    if (p)
+	*p = 0;
+    else
+	p = strchr(name, 0);
+    regstr = strchr(name, '@');
+    if (regstr)
+	*regstr++ = 0;
+    else
+	regstr = p;
+    if (name + 1 == regstr)
+	return 0;
+    promGetSibling(0);
+    i = promWalk3(name + 1, regstr, promRootNode, 0);
+    xfree(name);
+    return i;
+}
+
+pointer
+xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
+{
+    pointer ret;
+
+    if (psdp->fd == -1) {
+	psdp->fd = open(psdp->device, O_RDWR);
+	if (psdp->fd == -1)
+	    return NULL;
+    } else if (psdp->fd < 0)
+	return NULL;
+
+    ret = (pointer) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE,
+			  psdp->fd, offset);
+    if (ret == (pointer) -1) {
+	ret = (pointer) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+			      psdp->fd, offset);
+    }
+    if (ret == (pointer) -1)
+	return NULL;
+
+    return ret;
+}
+
+void
+xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
+{
+    munmap (addr, size);
+}
+
+/* Tell OS that we are driving the HW cursor ourselves. */
+void
+xf86SbusHideOsHwCursor(sbusDevicePtr psdp)
+{
+    struct fbcursor fbcursor;
+    unsigned char zeros[8];
+
+    memset(&fbcursor, 0, sizeof(fbcursor));
+    memset(&zeros, 0, sizeof(zeros));
+    fbcursor.cmap.count = 2;
+    fbcursor.cmap.red = zeros;
+    fbcursor.cmap.green = zeros;
+    fbcursor.cmap.blue = zeros;
+    fbcursor.image = zeros;
+    fbcursor.mask = zeros;
+    fbcursor.size.x = 32;
+    fbcursor.size.y = 1;
+    fbcursor.set = FB_CUR_SETALL;
+    ioctl(psdp->fd, FBIOSCURSOR, &fbcursor);
+}
+
+/* Set HW cursor colormap. */
+void
+xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg)
+{
+    struct fbcursor fbcursor;
+    unsigned char red[2], green[2], blue[2];
+
+    memset(&fbcursor, 0, sizeof(fbcursor));
+    red[0] = bg >> 16;
+    green[0] = bg >> 8;
+    blue[0] = bg;
+    red[1] = fg >> 16;
+    green[1] = fg >> 8;
+    blue[1] = fg;
+    fbcursor.cmap.count = 2;
+    fbcursor.cmap.red = red;
+    fbcursor.cmap.green = green;
+    fbcursor.cmap.blue = blue;
+    fbcursor.set = FB_CUR_SETCMAP;
+    ioctl(psdp->fd, FBIOSCURSOR, &fbcursor);
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c:1.1	Sun Mar 28 07:32:57 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c	Tue Apr  4 12:25:19 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c,v 1.1 1999/03/28 15:32:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c,v 1.2 2000/04/04 19:25:19 dawes Exp $ */
 /*
  * Copyright 1998 by Concurrent Computer Corporation
  *
@@ -101,7 +101,7 @@
 CARD32
 sparcPciCfgRead(PCITAG tag, int off)
 {
-	int bus, dfn, len;
+	int bus, dfn;
 	CARD32 val = 0xffffffff;
 
 	bus = PCI_BUS_FROM_TAG(tag);
@@ -114,7 +114,7 @@
 void
 sparcPciCfgWrite(PCITAG tag, int off, CARD32 val)
 {
-	int bus, dfn, len;
+	int bus, dfn;
 
 	bus = PCI_BUS_FROM_TAG(tag);
 	dfn = PCI_DFN_FROM_TAG(tag);
@@ -125,7 +125,7 @@
 void
 sparcPciCfgSetBits(PCITAG tag, int off, CARD32 mask, CARD32 bits)
 {
-    int bus, dfn, len;
+    int bus, dfn;
     CARD32 val = 0xffffffff;
 
     bus = PCI_BUS_FROM_TAG(tag);
Index: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h:1.23 xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h:1.24
--- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h:1.23	Tue Feb  8 05:13:29 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	Sun Mar 26 21:10:03 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v 1.23 2000/02/08 13:13:29 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v 1.24 2000/03/27 05:10:03 tsi Exp $ */
 /*
  * Copyright 1998 by Concurrent Computer Corporation
  *
@@ -333,6 +333,7 @@
 #define PCI_PPB_MEMLIMIT_EXTRACT(x)     (((x) <<  0) & 0xFFFF0000)
 
 #define PCI_PCI_BRIDGE_CONTROL_REG         0x3E
+#define PCI_PCI_BRIDGE_ISA_EN              0x04
 #define PCI_PCI_BRIDGE_VGA_EN              0x08
 
 /* Subsystem identification register */
Index: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h:1.2
--- /dev/null	Sat Jul  1 20:43:15 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h	Fri Jun 30 10:15:18 2000
@@ -0,0 +1,40 @@
+/*
+ * Platform specific SBUS and OpenPROM access declarations.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.2 2000/06/30 17:15:18 dawes Exp $ */
+
+#ifndef _XF86_SBUS_H
+#define _XF86_SBUS_H
+
+#ifdef linux
+#include <asm/types.h>
+#include <asm/fbio.h>
+#include <asm/openpromio.h>
+#elif defined(SVR4)
+#include <sys/fbio.h>
+#elif define(CSRG_BASED)
+#include <machine/fbio.h>
+#else
+#include <sun/fbio.h>
+#endif
+
+#endif /* _XF86_SBUS_H */
Index: xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile:1.5 xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile:1.5	Sat Feb 12 19:36:07 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile	Fri Jun 16 17:03:33 2000
@@ -1,15 +1,15 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile,v 1.5 2000/02/13 03:36:07 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile,v 1.6 2000/06/17 00:03:33 martin Exp $
 #include <Server.tmpl>
 
 BIOS_MOD = bios_DGmmap
 
 SRCS = dgux_init.c dgux_video.c IO_utils.c dgux_io.c $(BIOS_MOD).c VTsw_noop.c \
        dgux_kbd.c dgux_kbdEv.c dgux_tty.c std_mouse.c std_mseEv.c \
-       stdResource.c stdPci.c sigiostubs.c pm_noop.c
+       stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c
 
 OBJS = dgux_init.o dgux_video.o IO_utils.o dgux_io.o $(BIOS_MOD).o VTsw_noop.o \
        dgux_kbd.o dgux_kbdEv.o dgux_tty.o std_mouse.o std_mseEv.o \
-       stdResource.o stdPci.o sigiostubs.o pm_noop.o
+       stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC)
@@ -29,5 +29,6 @@
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/dgux/dgux_video.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/dgux/dgux_video.c:1.4 xc/programs/Xserver/hw/xfree86/os-support/dgux/dgux_video.c:1.5
--- xc/programs/Xserver/hw/xfree86/os-support/dgux/dgux_video.c:1.4	Thu Apr 29 05:24:52 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/dgux/dgux_video.c	Tue Jun 27 07:27:29 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/dgux/dgux_video.c,v 1.4 1999/04/29 12:24:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/dgux/dgux_video.c,v 1.5 2000/06/27 14:27:29 tsi Exp $ */
 /*
  * INTEL DG/UX RELEASE 4.20 MU03
  * Copyright 1997 Takis Psarogiannakopoulos Cambridge,UK
@@ -199,29 +199,6 @@
 unsigned long Size;
 {
 	munmap(Base, Size);
-}
-
-
-
-
-
-/* NULL for DG/ux  */
-void xf86MapDisplay(ScreenNum, Region)
-int ScreenNum;
-int Region;
-{
-	return;
-}
-
-
-
-
-/* NULL for DG/ux */
-void xf86UnMapDisplay(ScreenNum, Region)
-int ScreenNum;
-int Region;
-{
-	return;
 }
 
 /***************************************************************************/
Index: xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile:1.9 xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile:1.11
--- xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile:1.9	Sat Feb 12 19:36:08 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile	Tue Jun 27 07:27:30 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile,v 1.9 2000/02/13 03:36:08 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile,v 1.11 2000/06/27 14:27:30 tsi Exp $
 
 #include <Server.tmpl>
 
@@ -8,12 +8,12 @@
 MOUSEOBJ = hurd_mouse.o
 
 SRCS = hurd_init.c hurd_video.c hurd_io.c libc_wrapper.c $(BIOS_MOD).c \
-       mapVT_noop.c VTsw_noop.c posix_tty.c std_kbdEv.c $(MOUSESRC) \
-       stdResource.c stdPci.c sigiostubs.c pm_noop.c
+       VTsw_noop.c posix_tty.c std_kbdEv.c $(MOUSESRC) \
+       stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c
 
 OBJS = hurd_init.o hurd_video.o hurd_io.o libc_wrapper.o $(BIOS_MOD).o \
-       mapVT_noop.o VTsw_noop.o posix_tty.o std_kbdEv.o $(MOUSEOBJ) \
-       stdResource.o stdPci.o sigiostubs.o pm_noop.o
+       VTsw_noop.o posix_tty.o std_kbdEv.o $(MOUSEOBJ) \
+       stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi
@@ -27,7 +27,6 @@
 
 
 LinkSourceFile(VTsw_noop.c,../shared)
-LinkSourceFile(mapVT_noop.c,../shared)
 LinkSourceFile(posix_tty.c,../shared)
 LinkSourceFile(std_kbdEv.c,../shared)
 LinkSourceFile(libc_wrapper.c,../shared)
@@ -35,6 +34,7 @@
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile:3.38 xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile:3.41
--- xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile:3.38	Tue Feb 22 20:47:22 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile	Tue Jun 27 07:27:30 2000
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/10 1996/10/19 18:06:19 kaleb $
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile,v 3.38 2000/02/23 04:47:22 martin Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile,v 3.41 2000/06/27 14:27:30 tsi Exp $
 
 #include <Server.tmpl>
 
@@ -40,14 +40,14 @@
 #endif
 
 SRCS = lnx_init.c lnx_video.c lnx_io.c libc_wrapper.c bios_mmap.c \
-       mapVT_noop.c VTsw_usl.c std_kbdEv.c posix_tty.c $(MOUSESRC) \
+       VTsw_usl.c std_kbdEv.c posix_tty.c $(MOUSESRC) \
        lnx_pci.c vidmem.c lnx_apm.c $(JOYSTICK_SRC) $(DRI_SRC) $(RES_SRCS) \
-       $(AXP_SRC)
+       $(AXP_SRC) lnx_kmod.c
 
 OBJS = lnx_init.o lnx_video.o lnx_io.o libc_wrapper.o bios_mmap.o \
-       mapVT_noop.o VTsw_usl.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
+       VTsw_usl.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
        lnx_pci.o vidmem.o lnx_apm.o $(JOYSTICK_OBJ) $(DRI_OBJ) $(RES_OBJS) \
-       $(AXP_OBJ)
+       $(AXP_OBJ) lnx_kmod.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC)
@@ -94,12 +94,12 @@
 #endif
 
 LinkSourceFile(bios_mmap.c,../shared)
-LinkSourceFile(mapVT_noop.c,../shared)
 LinkSourceFile(std_kbdEv.c,../shared)
 LinkSourceFile(posix_tty.c,../shared)
 LinkSourceFile(libc_wrapper.c,../shared)
 LinkSourceFile(vidmem.c,../shared)
 LinkSourceFile(VTsw_usl.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 LinkSourceFile($(DRI_SRC),../shared)
 
@@ -109,6 +109,7 @@
 
 DependTarget()
 
+InstallDriverSDKNonExecFile(agpgart.h,$(DRIVERSDKINCLUDEDIR)/linux)
 #if 0
 InstallDriverSDKDynamicModule(lnx_jstk.o,$(DRIVERSDKMODULEDIR))
 #endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/agpgart.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/agpgart.h:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/agpgart.h:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/agpgart.h:1.1	Thu Mar  2 08:07:53 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/agpgart.h	Fri Jun 16 17:03:33 2000
@@ -23,6 +23,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/agpgart.h,v 1.3 2000/06/17 00:03:33 martin Exp $ */
 
 #ifndef _AGP_H
 #define _AGP_H 1
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c:3.7 xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c:3.9
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c:3.7	Mon Mar  6 14:59:33 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c	Mon Jun 12 19:28:36 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.7 2000/03/06 22:59:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.9 2000/06/13 02:28:36 dawes Exp $ */
 
 /* Resource information code */
 
@@ -150,7 +150,7 @@
     return ret;
 }
 
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) || defined(__sparc__) || defined(__mips__)
 
  /* XXX this isn't exactly correct but it will get the server working 
   * for now until we get something better.
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c:3.5 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c:3.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c:3.5	Tue Feb 29 16:25:26 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c	Fri Mar 31 14:55:52 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.5 2000/03/01 00:25:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.6 2000/03/31 22:55:52 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
@@ -78,6 +78,8 @@
     if ((n = read( fd, linuxEvents, num * sizeof(apm_event_t) )) == -1)
 	return 0;
     n /= sizeof(apm_event_t);
+    if (n > num)
+	n = num;
     for (i = 0; i < n; i++) {
 	for (j = 0; j < numApmEvents; j++)
 	    if (LinuxToXF86[j].apmLinux == linuxEvents[i]) {
@@ -96,17 +98,13 @@
     switch (event) {
     case XF86_APM_SYS_STANDBY:
     case XF86_APM_USER_STANDBY:
-	if (ioctl( fd, APM_IOC_STANDBY, NULL ) == 0)
-	    return PM_WAIT;  /* should we stop the Xserver in standby, too? */
-	else
-	    return PM_NONE;
+	ioctl( fd, APM_IOC_STANDBY, NULL );
+	return PM_CONTINUE;
     case XF86_APM_SYS_SUSPEND:
     case XF86_APM_CRITICAL_SUSPEND:
     case XF86_APM_USER_SUSPEND:
-	if (ioctl( fd, APM_IOC_SUSPEND, NULL ) == 0)
-	    return PM_WAIT;
-	else
-	    return PM_NONE;
+	ioctl( fd, APM_IOC_SUSPEND, NULL );
+	return PM_CONTINUE;
     case XF86_APM_STANDBY_RESUME:
     case XF86_APM_NORMAL_RESUME:
     case XF86_APM_CRITICAL_RESUME:
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.15 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.17
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c:3.15	Sat Feb 12 12:45:43 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	Fri Jun  9 00:53:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.15 2000/02/12 20:45:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.17 2000/06/09 07:53:25 eich Exp $ */
 /*
  * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
@@ -72,7 +72,7 @@
 
 static int
 KDKBDREP_ioctl_ok(int rate, int delay) {
-#ifdef KDKBDREP
+#if defined(KDKBDREP) && !defined(__sparc__)
      /* This ioctl is defined in <linux/kd.h> but is not
 	implemented anywhere - must be in some m68k patches. */
    struct kbd_repeat kbdrep_s;
@@ -100,7 +100,6 @@
    }
 
    return 1;			/* success! */
-
 #else /* no KDKBDREP */
    return 0;
 #endif /* KDKBDREP */
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c:3.2
--- /dev/null	Sat Jul  1 20:43:16 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c	Fri Jun 30 10:15:18 2000
@@ -0,0 +1,90 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+
+
+#define MODPROBE_PATH_FILE      "/proc/sys/kernel/modprobe"
+#define MAX_PATH                1024
+
+
+/* XFree86 #defines execl to be the xf86execl() function which does
+ * a fork AND exec.  We don't want that.  We want the regular,
+ * standard execl().
+ */
+#ifdef execl
+#undef execl
+#endif
+
+
+/*
+ * Load a Linux kernel module.
+ * This is used by the DRI/DRM to load a DRM kernel module when
+ * the X server starts.  It could be used for other purposes in the future.
+ * Input:
+ *    modName - name of the kernel module (Ex: "tdfx")
+ * Return:
+ *    0 for failure, 1 for success
+ */
+int xf86LoadKernelModule(const char *modName)
+{
+   char mpPath[MAX_PATH] = "";
+   int fd = -1, status, n;
+   pid_t pid;
+
+   /* get the path to the modprobe program */
+   fd = open(MODPROBE_PATH_FILE, O_RDONLY);
+   if (fd >= 0) {
+      int count = read(fd, mpPath, MAX_PATH - 1);
+      if (count <= 0) {
+         mpPath[0] = 0;
+      }
+      else if (mpPath[count - 1] == '\n') {
+         mpPath[count - 1] = 0;  /* replaces \n with \0 */
+      }
+      close(fd);
+      /* if this worked, mpPath will be "/sbin/modprobe" or similar. */
+   }
+
+   if (mpPath[0] == 0) {
+      /* we failed to get the path from the system, use a default */
+      xf86strcpy(mpPath, "/sbin/modprobe");
+   }
+
+   /* now fork/exec the modprobe command */
+   switch (pid = fork()) {
+   case 0:  /* child */
+      n = execl(mpPath, "modprobe", modName, NULL);
+      exit(EXIT_FAILURE);  /* if we get here the child's exec failed */
+      break;
+   case -1:  /* fork failed */
+      return 0;
+   default:  /* fork worked */
+      {
+         /* XXX we loop over waitpid() because it sometimes fails on
+          * the first attempt.  Don't know why!
+          */
+         int count = 0, p;
+         do {
+            p = waitpid(pid, &status, 0);
+         } while (p == -1 && count++ < 4);
+
+         if (p == -1) {
+            return 0;
+         }
+
+         if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
+            return 1;  /* success! */
+         }
+         else {
+            return 0;
+         }
+      }
+   }
+
+   /* never get here */
+   return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c:3.32 xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c:3.36
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c:3.32	Mon Feb 21 17:02:37 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c	Tue Jun 27 14:41:37 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.32 2000/02/22 01:02:37 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.36 2000/06/27 21:41:37 mvojkovi Exp $ */
 /*
  * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
@@ -334,7 +334,11 @@
   pointer base;
   int fd;
 
+#if defined(__ia64__)
+  if ((fd = open("/dev/mem", O_RDWR | O_SYNC)) < 0) {
+#else
   if ((fd = open("/dev/mem", O_RDWR)) < 0) {
+#endif
       FatalError("xf86MapVidMem: failed to open /dev/mem (%s)\n",
 		 strerror(errno));
     }
@@ -370,12 +374,13 @@
 void
 ppc_flush_icache(char *addr)
 {
-	/* cut+paste from linux glibc */
-	__asm__ volatile (" dcbf 0,3");
-	__asm__ volatile (" icbi 0,3");
-	__asm__ volatile (" addi 3,3,32");
-	__asm__ volatile (" dcbf 0,3");
-	__asm__ volatile (" icbi 0,3");
+	__asm__ volatile (
+		"dcbf 0,%0;" 
+		"sync;" 
+		"icbi 0,%0;" 
+		"sync;" 
+		"isync;" 
+		: : "r"(addr) : "memory");
 }
 #endif
 
@@ -385,8 +390,8 @@
 	if (ExtendedEnabled)
 		return;
 
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__)
-	if (iopl(3))
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__)
+	if (ioperm(0, 1024, 1) || iopl(3))
 		FatalError("%s: Failed to set IOPL for I/O\n",
 			   "xf86EnableIOPorts");
 #endif
@@ -401,8 +406,9 @@
 	if (!ExtendedEnabled)
 		return;
 
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__)
 	iopl(0);
+	ioperm(0, 1024, 0);
 #endif
 	ExtendedEnabled = FALSE;
 
@@ -418,11 +424,11 @@
 xf86DisableInterrupts()
 {
 	if (!ExtendedEnabled)
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__)
-		if (iopl(3))
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__)
+	    if (iopl(3) || ioperm(0, 1024, 1))
 			return (FALSE);
 #endif
-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__)
+#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__)
 #else
 #ifdef __GNUC__
 #if defined(__ia64__)
@@ -434,9 +440,12 @@
 	asm("cli");
 #endif
 #endif
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__)
-	if (!ExtendedEnabled)
-		iopl(0);
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__)
+	if (!ExtendedEnabled) {
+	    iopl(0);
+	    ioperm(0, 1024, 0);
+	}
+	
 #endif
 	return (TRUE);
 }
@@ -445,11 +454,11 @@
 xf86EnableInterrupts()
 {
 	if (!ExtendedEnabled)
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__)
-		if (iopl(3))
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__)
+	    if (iopl(3) || ioperm(0, 1024, 1))
 			return;
 #endif
-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__)
+#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__)
 #else
 #ifdef __GNUC__
 #if defined(__ia64__)
@@ -461,10 +470,11 @@
 	asm("sti");
 #endif
 #endif
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__)
-	if (!ExtendedEnabled)
-
-		iopl(0);
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__)
+	if (!ExtendedEnabled) {
+	    iopl(0);
+	    ioperm(0, 1024, 0);
+	}
 #endif
 	return;
 }
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile:1.5	Tue Feb 22 20:47:22 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile	Fri Jun 16 17:03:34 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile,v 1.5 2000/02/23 04:47:22 martin Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile,v 1.6 2000/06/17 00:03:34 martin Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -13,15 +13,16 @@
 MTRR_DEFINES = -DHAS_MTRR_SUPPORT
 #endif
 
-SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c $(MSRC)
-OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o $(MOBJ)
+SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmI810.c xf86drmMga.c xf86drmR128.c $(MSRC)
+OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o xf86drmI810.o xf86drmMga.o xf86drmR128.o $(MOBJ)
 
-
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC) -I../.. -Ikernel
 
 DEFINES = $(MTRR_DEFINES) $(GLX_DEFINES)
 
+#if DoLoadableServer
+
 ModuleObjectRule()
 LibraryModuleTarget(drm,$(OBJS))
 NormalLintTarget($(SRCS))
@@ -29,6 +30,14 @@
 #ifdef LinuxArchitecture
 InstallLibraryModule(drm,$(MODULEDIR),linux)
 #endif
+
+#else
+
+SubdirLibraryRule($(OBJS))
+NormalLibraryObjectRule()
+
+#endif
+
 
 #define IHaveSubdirs
 SUBDIRS = kernel
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c:1.2	Tue Feb 22 20:47:22 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c	Fri Jun 16 17:03:34 2000
@@ -1,6 +1,5 @@
 /* drmmodule.c -- Module initialization
  * Created: Fri Jun  4 09:05:48 1999 by faith@precisioninsight.com
- * Revised: Fri Jun  4 09:09:22 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
@@ -24,7 +23,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.3 2000/06/17 00:03:34 martin Exp $
  * 
  */
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c:1.10 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c:1.14
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c:1.10	Tue Feb 22 20:47:23 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c	Tue Jun 27 09:42:07 2000
@@ -1,8 +1,8 @@
 /* xf86drm.c -- User-level interface to DRM device
  * Created: Tue Jan  5 08:16:21 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:43:32 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,10 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.10 2000/02/23 04:47:23 martin Exp $
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Kevin E. Martin <martin@valinux.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.14 2000/06/27 16:42:07 alanh Exp $
  * 
  */
 
@@ -65,15 +68,35 @@
 # endif
 #endif
 
+#ifdef __alpha__
+extern unsigned long _bus_base(void);
+#define BUS_BASE _bus_base()
+#else
+#define BUS_BASE (0)
+#endif
+
 /* Not all systems have MAP_FAILED defined */
 #ifndef MAP_FAILED
 #define MAP_FAILED ((void *)-1)
 #endif
 
-#include <sys/sysmacros.h>	/* for makedev() */
 #include "xf86drm.h"
 #include "drm.h"
 
+#define DRM_FIXED_DEVICE_MAJOR 145
+
+#ifdef __linux__
+#include <sys/sysmacros.h>	/* for makedev() */
+#endif
+
+#ifndef makedev
+				/* This definition needs to be changed on
+                                   some systems if dev_t is a structure.
+                                   If there is a header file we can get it
+                                   from, there would be best. */
+#define makedev(x,y)    ((dev_t)(((x) << 8) | (y)))
+#endif
+
 static void *drmHashTable = NULL; /* Context switch callbacks */
 
 typedef struct drmHashEntry {
@@ -94,9 +117,16 @@
     if (pt) _DRM_FREE(pt);
 }
 
+/* drmStrdup can't use strdup(3), since it doesn't call _DRM_MALLOC... */
 static char *drmStrdup(const char *s)
 {
-    return s ? strdup(s) : NULL;
+    char *retval = NULL;
+    
+    if (s) {
+	retval = _DRM_MALLOC(strlen(s)+1);
+	strcpy(retval, s);
+    }
+    return retval;
 }
 
 
@@ -133,7 +163,7 @@
     return entry;
 }
 
-/* drm_open is used to open the /dev/drm device */
+/* drm_open is used to open the /dev/dri device */
 
 static int drm_open(const char *file)
 {
@@ -143,14 +173,6 @@
     return -errno;
 }
 
-/* drmAvailable looks for /proc/drm, and returns 1 if it is present. */
-
-int drmAvailable(void)
-{
-    if (!access("/proc/dri/0", R_OK)) return 1;
-    return 0;
-}
-
 static int drmOpenDevice(const char *path, long dev,
 			 mode_t mode, uid_t user, gid_t group)
 {
@@ -159,8 +181,17 @@
 #else
     struct stat     st;
 #endif
+
+				/* Fiddle mode to remove execute bits */
+    mode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
 
-    if (!stat(path, &st) && st.st_rdev == dev) return drm_open(path);
+    if (!stat(path, &st) && st.st_rdev == dev) {
+	if (!geteuid()) {
+	    chown(path, user, group);
+	    chmod(path, mode);
+	}
+	return drm_open(path);
+    }
 
     if (geteuid()) return DRM_ERR_NOT_ROOT;
     remove(path);
@@ -173,6 +204,38 @@
     return drm_open(path);
 }
 
+/* drmAvailable looks for /proc/dri, and returns 1 if it is present.  On
+   OSs that do not have a Linux-like /proc, this information will not be
+   available, and we'll have to create a device and check if the driver is
+   loaded that way. */
+
+int drmAvailable(void)
+{
+    char          dev_name[64];
+    drmVersionPtr version;
+    int           retval = 0;
+    int           fd;
+    
+    if (!access("/proc/dri/0", R_OK)) return 1;
+
+    sprintf(dev_name, "/dev/dri-temp-%d", getpid());
+
+    remove(dev_name);
+    if ((fd = drmOpenDevice(dev_name, makedev(DRM_FIXED_DEVICE_MAJOR, 0),
+			    S_IRUSR, geteuid(), getegid())) >= 0) {
+				/* Read version to make sure this is
+                                   actually a DRI device. */
+	if ((version = drmGetVersion(fd))) {
+	    retval = 1;
+	    drmFreeVersion(version);
+	}
+	close(fd);
+    }
+    remove(dev_name);
+
+    return retval;
+}
+
 static int drmOpenByBusid(const char *busid)
 {
     int    i;
@@ -214,9 +277,23 @@
 
 #if defined(XFree86Server)
     mode  = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE;
-    group = xf86ConfigDRI.group ? xf86ConfigDRI.group : DRM_DEV_GID;
+    group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID;
 #endif
 
+#if defined(XFree86Server)
+    if (!drmAvailable()) {
+        /* try to load the kernel module now */
+        if (!xf86LoadKernelModule(name)) {
+            ErrorF("[drm] failed to load kernel module \"%s\"\n",
+		   name);
+            return -1;
+        }
+    }
+#else
+    if (!drmAvailable())
+       return -1;
+#endif
+
     if (!geteuid()) {
 	dirmode = mode;
 	if (dirmode & S_IRUSR) dirmode |= S_IXUSR;
@@ -253,7 +330,24 @@
 		    }
 		}
 	    }
-	} else remove(dev_name);
+	} else {
+	    drmVersionPtr version;
+				/* /proc/dri not available, possibly
+                                   because we aren't on a Linux system.
+                                   So, try to create the next device and
+                                   see if it's active. */
+	    dev = makedev(DRM_FIXED_DEVICE_MAJOR, i);
+	    if ((fd = drmOpenDevice(dev_name, dev, mode, user, group))) {
+		if ((version = drmGetVersion(fd))) {
+		    if (!strcmp(version->name, name)) {
+			drmFreeVersion(version);
+			return fd;
+		    }
+		    drmFreeVersion(version);
+		}
+	    }
+	    remove(dev_name);
+	}
     }
     return -1;
 }
@@ -288,7 +382,7 @@
     drmFree(v);
 }
 
-static void drmCopyVersion(drmVersionPtr d, drm_version_t *s)
+static void drmCopyVersion(drmVersionPtr d, const drm_version_t *s)
 {
     d->version_major      = s->version_major;
     d->version_minor      = s->version_minor;
@@ -302,7 +396,7 @@
 }
 
 /* drmVersion obtains the version information via an ioctl.  Similar
- * information is available via /proc/drm. */
+ * information is available via /proc/dri. */
 
 drmVersionPtr drmGetVersion(int fd)
 {
@@ -409,6 +503,10 @@
     drm_map_t map;
 
     map.offset  = offset;
+#ifdef __alpha__
+    if (!(type & DRM_SHM))
+	map.offset += BUS_BASE;
+#endif
     map.size    = size;
     map.handle  = 0;
     map.type    = type;
@@ -418,7 +516,8 @@
     return 0;
 }
 
-int drmAddBufs(int fd, int count, int size, int flags)
+int drmAddBufs(int fd, int count, int size, drmBufDescFlags flags,
+	       int agp_offset)
 {
     drm_buf_desc_t request;
     
@@ -427,6 +526,8 @@
     request.low_mark  = 0;
     request.high_mark = 0;
     request.flags     = flags;
+    request.agp_start = agp_offset;
+   
     if (ioctl(fd, DRM_IOCTL_ADD_BUFS, &request)) return -errno;
     return request.count;
 }
@@ -742,6 +843,143 @@
     draw.handle = handle;
     if (ioctl(fd, DRM_IOCTL_RM_DRAW, &draw)) return -errno;
     return 0;
+}
+
+int drmAgpAcquire(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_AGP_ACQUIRE, NULL)) return -errno;
+    return 0;
+}
+
+int drmAgpRelease(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_AGP_RELEASE, NULL)) return -errno;
+    return 0;
+}
+
+int drmAgpEnable(int fd, unsigned long mode)
+{
+    drm_agp_mode_t m;
+
+    m.mode = mode;
+    if (ioctl(fd, DRM_IOCTL_AGP_ENABLE, &m)) return -errno;
+    return 0;
+}
+
+int drmAgpAlloc(int fd, unsigned long size, unsigned long type,
+		unsigned long *address, unsigned long *handle)
+{
+    drm_agp_buffer_t b;
+    *handle = 0;
+    b.size   = size;
+    b.handle = 0;
+    b.type   = type;
+    if (ioctl(fd, DRM_IOCTL_AGP_ALLOC, &b)) return -errno;
+    if (address != 0UL) *address = b.physical;
+    *handle = b.handle;
+    return 0;
+}
+
+int drmAgpFree(int fd, unsigned long handle)
+{
+    drm_agp_buffer_t b;
+
+    b.size   = 0;
+    b.handle = handle;
+    if (ioctl(fd, DRM_IOCTL_AGP_FREE, &b)) return -errno;
+    return 0;
+}
+
+int drmAgpBind(int fd, unsigned long handle, unsigned long offset)
+{
+    drm_agp_binding_t b;
+
+    b.handle = handle;
+    b.offset = offset;
+    if (ioctl(fd, DRM_IOCTL_AGP_BIND, &b)) return -errno;
+    return 0;
+}
+
+int drmAgpUnbind(int fd, unsigned long handle)
+{
+    drm_agp_binding_t b;
+
+    b.handle = handle;
+    b.offset = 0;
+    if (ioctl(fd, DRM_IOCTL_AGP_UNBIND, &b)) return -errno;
+    return 0;
+}
+
+int drmAgpVersionMajor(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return -errno;
+    return i.agp_version_major;
+}
+
+int drmAgpVersionMinor(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return -errno;
+    return i.agp_version_minor;
+}
+
+unsigned long drmAgpGetMode(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.mode;
+}
+
+unsigned long drmAgpBase(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.aperture_base;
+}
+
+unsigned long drmAgpSize(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.aperture_size;
+}
+
+unsigned long drmAgpMemoryUsed(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.memory_used;
+}
+
+unsigned long drmAgpMemoryAvail(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.memory_allowed;
+}
+
+unsigned int drmAgpVendorId(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.id_vendor;
+}
+
+unsigned int drmAgpDeviceId(int fd)
+{
+    drm_agp_info_t i;
+
+    if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0;
+    return i.id_device;
 }
 
 int drmError(int err, const char *label)
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c:1.2	Tue Feb 22 20:47:23 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c	Fri Jun 16 17:03:34 2000
@@ -1,6 +1,5 @@
 /* xf86drmHash.c -- Small hash table support for integer -> integer mapping
  * Created: Sun Apr 18 09:35:45 1999 by faith@precisioninsight.com
- * Revised: Thu Jun  3 16:11:06 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
@@ -24,7 +23,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.2 2000/02/23 04:47:23 martin Exp $
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.3 2000/06/17 00:03:34 martin Exp $
  *
  * DESCRIPTION
  *
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmI810.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmI810.c:1.1
--- /dev/null	Sat Jul  1 20:43:16 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmI810.c	Fri Jun 16 17:03:34 2000
@@ -0,0 +1,87 @@
+#ifdef XFree86Server
+# include "xf86.h"
+# include "xf86_OSproc.h"
+# include "xf86_ansic.h"
+# include "xf86Priv.h"
+# define _DRM_MALLOC xalloc
+# define _DRM_FREE   xfree
+# ifndef XFree86LOADER
+#  include <sys/stat.h>
+#  include <sys/mman.h>
+# endif
+#else
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <ctype.h>
+# include <fcntl.h>
+# include <errno.h>
+# include <signal.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/time.h>
+# ifdef DRM_USE_MALLOC
+#  define _DRM_MALLOC malloc
+#  define _DRM_FREE   free
+extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
+extern int xf86RemoveSIGIOHandler(int fd);
+# else
+#  include <Xlibint.h>
+#  define _DRM_MALLOC Xmalloc
+#  define _DRM_FREE   Xfree
+# endif
+#endif
+
+/* Not all systems have MAP_FAILED defined */
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
+#include <sys/sysmacros.h>	/* for makedev() */
+#include "xf86drm.h"
+#include "xf86drmI810.h"
+#include "drm.h"
+
+Bool drmI810CleanupDma(int driSubFD)
+{
+   drm_i810_init_t init;
+   
+   memset(&init, 0, sizeof(drm_i810_init_t));
+   init.func = I810_CLEANUP_DMA;
+   
+   if(ioctl(driSubFD, DRM_IOCTL_I810_INIT, &init)) {
+      return FALSE;
+   }
+   
+   return TRUE;
+}
+
+Bool drmI810InitDma(int driSubFD, drmI810Init *info)
+{
+   drm_i810_init_t init;
+   
+   memset(&init, 0, sizeof(drm_i810_init_t));
+
+   init.func = I810_INIT_DMA;
+   init.ring_map_idx = info->ring_map_idx;
+   init.buffer_map_idx = info->buffer_map_idx;
+   init.ring_start = info->start;
+   init.ring_end = info->end;
+   init.ring_size = info->size;
+   init.sarea_priv_offset = info->sarea_off;
+   init.front_offset = info->front_offset;
+   init.back_offset = info->back_offset;
+   init.depth_offset = info->depth_offset;
+   init.w = info->w;
+   init.h = info->h;
+   init.pitch = info->pitch;
+   init.pitch_bits = info->pitch_bits;
+
+   if(ioctl(driSubFD, DRM_IOCTL_I810_INIT, &init)) {
+      return FALSE;
+   }
+   return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmMga.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmMga.c:1.1
--- /dev/null	Sat Jul  1 20:43:16 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmMga.c	Fri Jun 16 17:03:34 2000
@@ -0,0 +1,117 @@
+#ifdef XFree86Server
+# include "xf86.h"
+# include "xf86_OSproc.h"
+# include "xf86_ansic.h"
+# include "xf86Priv.h"
+# define _DRM_MALLOC xalloc
+# define _DRM_FREE   xfree
+# ifndef XFree86LOADER
+#  include <sys/stat.h>
+#  include <sys/mman.h>
+# endif
+#else
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <ctype.h>
+# include <fcntl.h>
+# include <errno.h>
+# include <signal.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/time.h>
+# ifdef DRM_USE_MALLOC
+#  define _DRM_MALLOC malloc
+#  define _DRM_FREE   free
+extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
+extern int xf86RemoveSIGIOHandler(int fd);
+# else
+#  include <Xlibint.h>
+#  define _DRM_MALLOC Xmalloc
+#  define _DRM_FREE   Xfree
+# endif
+#endif
+
+/* Not all systems have MAP_FAILED defined */
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
+#include <sys/sysmacros.h>	/* for makedev() */
+#include "xf86drm.h"
+#include "xf86drmMga.h"
+#include "drm.h"
+
+Bool drmMgaCleanupDma(int driSubFD)
+{
+   drm_mga_init_t init;
+   memset(&init, 0, sizeof(drm_mga_init_t));
+   init.func = MGA_CLEANUP_DMA;
+   if(ioctl(driSubFD, DRM_IOCTL_MGA_INIT, &init)) {
+      return FALSE;
+   }
+   
+   return TRUE;
+}
+
+Bool drmMgaLockUpdate(int driSubFD, drmLockFlags flags)
+{
+   drm_lock_t lock;
+   
+   memset(&lock, 0, sizeof(drm_lock_t));
+   
+   if (flags & DRM_LOCK_QUIESCENT)  lock.flags |= _DRM_LOCK_QUIESCENT;
+   if (flags & DRM_LOCK_FLUSH)      lock.flags |= _DRM_LOCK_FLUSH;
+   if (flags & DRM_LOCK_FLUSH_ALL)  lock.flags |= _DRM_LOCK_FLUSH_ALL;
+   
+   if(ioctl(driSubFD, DRM_IOCTL_MGA_FLUSH, &lock)) {
+      return FALSE;
+   }
+   
+   return TRUE;
+}
+
+Bool drmMgaInitDma(int driSubFD, drmMgaInit *info)
+{
+      drm_mga_init_t init;
+      int i;
+   
+      memset(&init, 0, sizeof(drm_mga_init_t));
+      init.func = MGA_INIT_DMA;
+      init.reserved_map_agpstart = info->reserved_map_agpstart;
+      init.reserved_map_idx = info->reserved_map_idx;
+      init.buffer_map_idx = info->buffer_map_idx;
+      init.sarea_priv_offset = info->sarea_priv_offset;
+      init.primary_size = info->primary_size;
+      init.warp_ucode_size = info->warp_ucode_size;
+      init.frontOffset = info->frontOffset;
+      init.backOffset = info->backOffset;
+      init.depthOffset = info->depthOffset;
+      init.textureOffset = info->textureOffset;
+      init.textureSize = info->textureSize;
+      init.agpTextureSize = info->agpTextureSize;
+      init.agpTextureOffset = info->agpTextureOffset;
+      init.cpp = info->cpp;
+      init.stride = info->stride;
+      init.sgram = info->sgram;
+      init.chipset = info->chipset;
+   
+      for(i = 0; i < MGA_MAX_WARP_PIPES; i++) {
+	       init.WarpIndex[i].installed = info->WarpIndex[i].installed;
+	       init.WarpIndex[i].phys_addr = info->WarpIndex[i].phys_addr;
+	       init.WarpIndex[i].size = info->WarpIndex[i].size;
+      }
+   
+      init.mAccess = info->mAccess;
+   
+   
+   
+      if(ioctl(driSubFD, DRM_IOCTL_MGA_INIT, &init)) {
+	       return FALSE;
+      }
+      return TRUE;
+}
+
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmR128.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmR128.c:1.1
--- /dev/null	Sat Jul  1 20:43:16 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmR128.c	Fri Jun 16 17:03:34 2000
@@ -0,0 +1,197 @@
+/* xf86drmR128.c -- User-level interface to Rage 128 DRM device
+ * Created: Sun Apr  9 18:13:54 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Author: Kevin E. Martin <martin@valinux.com>
+ * 
+ */
+
+#ifdef XFree86Server
+# include "xf86.h"
+# include "xf86_OSproc.h"
+# include "xf86_ansic.h"
+# include "xf86Priv.h"
+# define _DRM_MALLOC xalloc
+# define _DRM_FREE   xfree
+# ifndef XFree86LOADER
+#  include <sys/stat.h>
+#  include <sys/mman.h>
+# endif
+#else
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <ctype.h>
+# include <fcntl.h>
+# include <errno.h>
+# include <signal.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/time.h>
+# ifdef DRM_USE_MALLOC
+#  define _DRM_MALLOC malloc
+#  define _DRM_FREE   free
+extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
+extern int xf86RemoveSIGIOHandler(int fd);
+# else
+#  include <Xlibint.h>
+#  define _DRM_MALLOC Xmalloc
+#  define _DRM_FREE   Xfree
+# endif
+#endif
+
+/* Not all systems have MAP_FAILED defined */
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
+
+#include <sys/sysmacros.h>	/* for makedev() */
+#include "xf86drm.h"
+#include "xf86drmR128.h"
+#include "drm.h"
+
+int drmR128InitCCE(int fd, drmR128Init *info)
+{
+    drm_r128_init_t init;
+
+    memset(&init, 0, sizeof(drm_r128_init_t));
+
+    init.func                = R128_INIT_CCE;
+    init.sarea_priv_offset   = info->sarea_priv_offset;
+    init.is_pci              = info->is_pci;
+    init.cce_mode            = info->cce_mode;
+    init.cce_fifo_size       = info->cce_fifo_size;
+    init.cce_secure          = info->cce_secure;
+    init.ring_size           = info->ring_size;
+    init.usec_timeout        = info->usec_timeout;
+
+    init.fb_offset           = info->fb_offset;
+    init.agp_ring_offset     = info->agp_ring_offset;
+    init.agp_read_ptr_offset = info->agp_read_ptr_offset;
+    init.agp_vertbufs_offset = info->agp_vertbufs_offset;
+    init.agp_indbufs_offset  = info->agp_indbufs_offset;
+    init.agp_textures_offset = info->agp_textures_offset;
+    init.mmio_offset         = info->mmio_offset;
+
+    if (ioctl(fd, DRM_IOCTL_R128_INIT, &init)) return -errno;
+
+    return 0;
+}
+
+int drmR128CleanupCCE(int fd)
+{
+    drm_r128_init_t init;
+
+    memset(&init, 0, sizeof(drm_r128_init_t));
+
+    init.func = R128_CLEANUP_CCE;
+
+    if (ioctl(fd, DRM_IOCTL_R128_INIT, &init)) return -errno;
+
+    return 0;
+}
+
+int drmR128EngineReset(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_R128_RESET, NULL)) return -errno;
+
+    return 0;
+}
+
+int drmR128EngineFlush(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_R128_FLUSH, NULL)) return -errno;
+
+    return 0;
+}
+
+int drmR128WaitForIdle(int fd)
+{
+    if (ioctl(fd, DRM_IOCTL_R128_IDLE, NULL)) return -errno;
+
+    return 0;
+}
+
+int drmR128SubmitPacket(int fd, CARD32 *buffer, int *count, int flags)
+{
+    drm_r128_packet_t packet;
+    int               ret;
+
+    memset(&packet, 0, sizeof(drm_r128_packet_t));
+
+    packet.count = *count;
+    packet.flags = flags;
+
+    while (packet.count > 0) {
+	packet.buffer = buffer + (*count - packet.count);
+	ret = ioctl(fd, DRM_IOCTL_R128_PACKET, &packet);
+	if (ret < 0 && ret != -EAGAIN) {
+	    *count = packet.count;
+	    return -errno;
+	}
+    }
+
+    *count = 0;
+    return 0;
+}
+
+int drmR128GetVertexBuffers(int fd, int count, int *indices, int *sizes)
+{
+    drm_r128_vertex_t v;
+
+    v.send_count      = 0;
+    v.send_indices    = NULL;
+    v.send_sizes      = NULL;
+    v.prim            = DRM_R128_PRIM_NONE;
+    v.request_count   = count;
+    v.request_indices = indices;
+    v.request_sizes   = sizes;
+    v.granted_count   = 0;
+
+    if (ioctl(fd, DRM_IOCTL_R128_VERTEX, &v)) return -errno;
+
+    return v.granted_count;
+}
+
+int drmR128FlushVertexBuffers(int fd, int count, int *indices,
+			      int *sizes, drmR128PrimType prim)
+{
+    drm_r128_vertex_t v;
+
+    v.send_count      = count;
+    v.send_indices    = indices;
+    v.send_sizes      = sizes;
+    v.prim            = prim;
+    v.request_count   = 0;
+    v.request_indices = NULL;
+    v.request_sizes   = NULL;
+    v.granted_count   = 0;
+
+    if (ioctl(fd, DRM_IOCTL_R128_VERTEX, &v) < 0) return -errno;
+
+    return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c:1.3 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c:1.4
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c:1.3	Tue Feb 22 20:47:23 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c	Fri Jun 16 17:03:34 2000
@@ -1,6 +1,5 @@
 /* xf86drmRandom.c -- "Minimal Standard" PRNG Implementation
  * Created: Mon Apr 19 08:28:13 1999 by faith@precisioninsight.com
- * Revised: Thu Jun 24 14:53:45 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
@@ -24,7 +23,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.3 2000/02/23 04:47:23 martin Exp $
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.4 2000/06/17 00:03:34 martin Exp $
  *
  * DESCRIPTION
  *
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c:1.2	Tue Feb 22 20:47:24 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c	Fri Jun 16 17:03:34 2000
@@ -1,6 +1,5 @@
 /* xf86drmSL.c -- Skip list support
  * Created: Mon May 10 09:28:13 1999 by faith@precisioninsight.com
- * Revised: Thu Jun  3 16:13:01 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
@@ -24,7 +23,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.2 2000/02/23 04:47:24 martin Exp $
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.3 2000/06/17 00:03:34 martin Exp $
  *
  * DESCRIPTION
  *
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel:1.5	Sun Feb 13 22:27:25 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel	Fri Jun 16 17:03:34 2000
@@ -9,12 +9,13 @@
 # Note 2! The CFLAGS definitions are now inherited from the
 # parent makes..
 #
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.5 2000/02/14 06:27:25 martin Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.6 2000/06/17 00:03:34 martin Exp $
 
 L_TARGET        := libdrm.a
 
 L_OBJS		:= init.o memory.o proc.o auth.o context.o drawable.o bufs.o \
-			lists.o lock.o ioctl.o fops.o vm.o dma.o
+			lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o \
+			agpsupport.o
 
 M_OBJS		:= 
 
@@ -26,6 +27,14 @@
 M_OBJS          += tdfx.o
 endif
 
+ifdef CONFIG_DRM_MGA
+M_OBJS		+= mga.o
+endif
+
+ifdef CONFIG_DRM_R128
+M_OBJS		+= r128.o
+endif
+
 include $(TOPDIR)/Rules.make
 
 gamma.o: gamma_drv.o gamma_dma.o $(L_TARGET)
@@ -33,3 +42,12 @@
 
 tdfx.o: tdfx_drv.o tdfx_context.o $(L_TARGET)
 	$(LD) $(LD_RFLAG) -r -o $@ tdfx_drv.o tdfx_context.o -L. -ldrm
+
+i810.o: i810_drv.o i810_context.o $(L_TARGET)
+	$(LD) $(LD_RFLAG) -r -o $@ i810_drv.o i810_bufs.o i810_dma.o i810_context.o -L. -ldrm
+
+mga.o: mga_drv.o mga_context.o mga_dma.o mga_bufs.o $(L_TARGET)
+	$(LD) $(LD_RFLAG) -r -o $@ mga_drv.o mga_bufs.o mga_dma.o mga_context.o mga_state.o -L. -ldrm
+
+r128.o: r128_drv.o r128_context.o $(L_TARGET)
+	$(LD) $(LD_RFLAG) -r -o $@ r128_drv.o r128_context.o -L. -ldrm
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux:1.6 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux:1.7
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux:1.6	Tue Feb 22 20:47:25 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux	Fri Jun 16 17:03:34 2000
@@ -1,8 +1,8 @@
 # Makefile -- For the Direct Rendering Manager module (drm)
 # Created: Mon Jan  4 09:26:53 1999 by faith@precisioninsight.com
-# Revised: Sun Feb 13 23:15:59 2000 by kevin@precisioninsight.com
 #
 # Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+# Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
 # All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,19 +24,35 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 # 
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.6 2000/02/23 04:47:25 martin Exp $
-# 
+#
+# ***** NOTE NOTE NOTE NOTE NOTE *****
+# To override the automatic Linux source tree determination, pass the
+# pathname for the kernel that you want to compile on the command line,
+# like this:
+# 	make TREE=/usr/my-kernel-tree/include
+#
+#
+# ***** NOTE NOTE NOTE NOTE NOTE *****
+# Because some distributions patch 2.2.x kernels to make kill_fasync have
+# three parameters, this script tries to determine, via the examination of
+# header files, if your kernel has been patched.  If this detection is
+# incorrect, you can override the value on the command line, like this:
+# 	make PARAMS=2
+# or
+# 	make PARAMS=3
 
 .SUFFIXES:
 
 # *** Setup
 
-MODS=           gamma.o tdfx.o
+# **** End of SMP/MODVERSIONS detection
+
+MODS=           gamma.o tdfx.o r128.o
 LIBS=           libdrm.a
 PROGS=		drmstat
 
 DRMOBJS=	init.o memory.o proc.o auth.o context.o drawable.o bufs.o \
-		lists.o lock.o ioctl.o fops.o vm.o dma.o
+		lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o
 DRMHEADERS=	drm.h drmP.h
 
 GAMMAOBJS=      gamma_drv.o gamma_dma.o
@@ -45,9 +61,14 @@
 TDFXOBJS=       tdfx_drv.o tdfx_context.o
 TDFXHEADERS=    tdfx_drv.h $(DRMHEADERS)
 
+R128OBJS=	r128_drv.o r128_dma.o r128_bufs.o r128_context.o
+R128HEADERS=	r128_drv.h r128_drm.h $(DRMHEADERS)
+
 PROGOBJS=       drmstat.po xf86drm.po xf86drmHash.po xf86drmRandom.po sigio.po
 PROGHEADERS=    xf86drm.h $(DRMHEADERS)
 
+INC=		/usr/include
+
 CFLAGS=		-O2 $(WARNINGS)
 WARNINGS=	-Wall -Wwrite-strings -Wpointer-arith -Wcast-align \
 		-Wstrict-prototypes -Wshadow -Wnested-externs \
@@ -90,11 +111,6 @@
 endif
 endif
 
-# To override this determination, pass the path on the make command line:
-# 	make TREE=/usr/my-kernel-tree/include
-# or hardcode a value for TREE here:
-# TREE:=/usr/include
-
 ifeq ($(TREE),0)
 all:; @echo Error: Could not locate kernel tree in $A $B $C
 else
@@ -102,7 +118,30 @@
 	| grep -s 'SMP = ' | cut -d' ' -f3)
 MODVERSIONS := $(shell gcc -E -I $(TREE) picker.c 2>/dev/null \
 	| grep -s 'MODVERSIONS = ' | cut -d' ' -f3)
-all::;@echo KERNEL HEADERS IN $(TREE): SMP=${SMP} MODVERSIONS=${MODVERSIONS}
+AGP := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
+	| grep -s 'AGP = ' | cut -d' ' -f3)
+PARAMS := $(shell if fgrep kill_fasync $(TREE)/linux/fs.h \
+	| fgrep -q band; then echo 3; else echo 2; fi)
+ifeq ($(AGP),0)
+AGP := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
+	| grep -s 'AGP_MODULE = ' | cut -d' ' -f3)
+endif
+
+ifeq ($(AGP),1)
+MODCFLAGS += -DDRM_AGP
+DRMOBJS += agpsupport.o
+MODS += mga.o i810.o
+
+MGAOBJS=	mga_drv.o mga_dma.o mga_bufs.o mga_state.o mga_context.o
+MGAHEADERS=	mga_drv.h $(DRMHEADERS)
+
+I810OBJS=	i810_drv.o i810_dma.o i810_bufs.o i810_context.o
+I810HEADERS=	i810_drv.h $(DRMHEADERS)
+endif
+
+all::;@echo === KERNEL HEADERS IN $(TREE)
+all::;@echo === SMP=${SMP} MODVERSIONS=${MODVERSIONS} AGP=${AGP}
+all::;@echo === kill_fasync has $(PARAMS) parameters
 all:: $(LIBS) $(MODS) $(PROGS)
 endif
 
@@ -115,6 +154,9 @@
 ifeq ($(MODVERSIONS),1)
 MODCFLAGS += -DMODVERSIONS -include $(TREE)/linux/modversions.h
 endif
+ifeq ($(PARAMS),3)
+MODCFLAGS += -DKILLFASYNCHASTHREEPARAMETERS
+endif
 
 # **** End of configuration
 
@@ -128,6 +170,17 @@
 tdfx.o: $(TDFXOBJS) $(LIBS)
 	$(LD) -r $^ -o $@
 
+r128.o: $(R128OBJS) $(LIBS)
+	$(LD) -r $^ -o $@
+
+ifeq ($(AGP),1)
+mga.o: $(MGAOBJS) $(LIBS)
+	$(LD) -r $^ -o $@
+
+i810.o: $(I810OBJS) $(LIBS)
+	$(LD) -r $^ -o $@
+endif
+
 drmstat: $(PROGOBJS)
 	$(CC) $(PRGCFLAGS) $^ $(PRGLIBS) -o $@
 
@@ -140,7 +193,7 @@
 
 # .o files are used for modules
 %.o: %.c
-	$(CC) $(MODCFLAGS) -c $< -o $@
+	$(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
 
 %.po: %.c
 	$(CC) $(PRGCFLAGS) -DDRM_USE_MALLOC -c $< -o $@
@@ -149,8 +202,12 @@
 $(DRMOBJS): $(DRMHEADERS)
 $(GAMMAOBJS): $(GAMMAHEADERS)
 $(TDFXOBJS): $(TDFXHEADERS)
+$(R128OBJS): $(R128HEADERS)
+ifeq ($(AGP),1)
+$(MGAOBJS): $(MGAHEADERS)
+$(I810OBJS): $(I810HEADERS)
+endif
 $(PROGOBJS): $(PROGHEADERS)
 
 clean:
-	rm -f *.o *.po *~ core $(PROGS)
-
+	rm -f *.o *.a *.po *~ core $(PROGS)
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c:1.1	Fri Feb 11 09:26:02 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c	Fri Jun 16 17:03:34 2000
@@ -2,6 +2,7 @@
  * Created: Mon Dec 13 09:56:45 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,10 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * Author: Rickard E. (Rik) Faith <faith@precisioninsight.com>
+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c,v 1.1 2000/02/11 17:26:02 dawes Exp $
- *
  */
 
 #define __NO_VERSION__
@@ -159,6 +158,8 @@
 			   -EFAULT);
 	if (!(entry = drm_alloc(sizeof(*entry), DRM_MEM_AGPLISTS)))
 		return -ENOMEM;
+   
+   	memset(entry, 0, sizeof(*entry));
 
 	pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;
 	type = (u32) request.type;
@@ -237,6 +238,8 @@
 	page = (request.offset + PAGE_SIZE - 1) / PAGE_SIZE;
 	if ((retcode = drm_bind_agp(entry->memory, page))) return retcode;
 	entry->bound = dev->agp->base + (page << PAGE_SHIFT);
+	DRM_DEBUG("base = 0x%lx entry->bound = 0x%lx\n", 
+		  dev->agp->base, entry->bound);
 	return 0;
 }
 
@@ -254,8 +257,10 @@
 	if (!(entry = drm_agp_lookup_entry(dev, request.handle)))
 		return -EINVAL;
 	if (entry->bound) drm_unbind_agp(entry->memory);
-	entry->prev->next = entry->next;
-	entry->next->prev = entry->prev;
+   
+	if (entry->prev) entry->prev->next = entry->next;
+	else             dev->agp->memory  = entry->next;
+	if (entry->next) entry->next->prev = entry->prev;
 	drm_free_agp(entry->memory, entry->pages);
 	drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
 	return 0;
@@ -269,15 +274,12 @@
 
 	for (fill = &drm_agp_fill[0]; fill->name; fill++) {
 		char *n  = (char *)fill->name;
-#if 0
-		*fill->f = (drm_agp_func_u)get_module_symbol(NULL, n);
-#endif
 		*fill->f = (drm_agp_func_u)get_module_symbol(NULL, n);
-		printk("%s resolves to 0x%08lx\n", n, (*fill->f).address);
+		DRM_DEBUG("%s resolves to 0x%08lx\n", n, (*fill->f).address);
 		if (!(*fill->f).address) agp_available = 0;
 	}
    
-	printk("agp_available = %d\n", agp_available);
+	DRM_DEBUG("agp_available = %d\n", agp_available);
 
 	if (agp_available) {
 		if (!(head = drm_alloc(sizeof(*head), DRM_MEM_AGPLISTS)))
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c:1.2	Tue Feb 22 20:47:25 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* auth.c -- IOCTLs for authentication -*- linux-c -*-
  * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
- * Revised: Fri Aug 20 11:31:48 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,8 +23,9 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c,v 1.2 2000/02/23 04:47:25 martin Exp $
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
@@ -44,7 +45,6 @@
 
 	down(&dev->struct_sem);
 	for (pt = dev->magiclist[hash].head; pt; pt = pt->next) {
-		if (pt->priv->authenticated) continue;
 		if (pt->magic == magic) {
 			retval = pt->priv;
 			break;
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c:1.5	Tue Feb 22 20:47:25 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* bufs.c -- IOCTLs to manage buffers -*- linux-c -*-
  * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
- * Revised: Mon Feb 14 00:14:11 2000 by kevin@precisioninsight.com
  *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,11 +24,13 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c,v 1.5 2000/02/23 04:47:25 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
 #define __NO_VERSION__
+#include <linux/config.h>
 #include "drmP.h"
 #include "linux/un.h"
 
@@ -102,6 +104,11 @@
 			dev->lock.hw_lock = map->handle; /* Pointer to lock */
 		}
 		break;
+#ifdef DRM_AGP
+	case _DRM_AGP:
+		map->offset = map->offset + dev->agp->base;
+		break;
+#endif
 	default:
 		drm_free(map, sizeof(*map), DRM_MEM_MAPS);
 		return -EINVAL;
@@ -172,7 +179,7 @@
 	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL;
 	if (dev->queue_count) return -EBUSY; /* Not while in use */
 
-	alignment  = (request.flags & DRM_PAGE_ALIGN) ? PAGE_ALIGN(size) :size;
+	alignment  = (request.flags & _DRM_PAGE_ALIGN) ? PAGE_ALIGN(size):size;
 	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
 	total	   = PAGE_SIZE << page_order;
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/context.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/context.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/context.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/context.c:1.2	Tue Feb 22 20:47:26 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/context.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* context.c -- IOCTLs for contexts and DMA queues -*- linux-c -*-
  * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
- * Revised: Fri Aug 20 11:32:09 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/context.c,v 1.2 2000/02/23 04:47:26 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ctxbitmap.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ctxbitmap.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ctxbitmap.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ctxbitmap.c:1.1	Fri Feb 11 09:26:02 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ctxbitmap.c	Fri Jun 16 17:03:35 2000
@@ -1,7 +1,8 @@
 /* ctxbitmap.c -- Context bitmap management -*- linux-c -*-
  * Created: Thu Jan 6 03:56:42 2000 by jhartmann@precisioninsight.com
  * 
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,10 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Jeff Hartmann <jhartmann@precisioninsight.com>
+ * Author: Jeff Hartmann <jhartmann@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ctxbitmap.c,v 1.1 2000/02/11 17:26:02 dawes Exp $
- *
  */
 
 #define __NO_VERSION__
@@ -53,7 +52,7 @@
 	bit = find_first_zero_bit(dev->ctx_bitmap, DRM_MAX_CTXBITMAP);
 	if (bit < DRM_MAX_CTXBITMAP) {
 		set_bit(bit, dev->ctx_bitmap);
-	   	printk("drm_ctxbitmap_next bit : %d\n", bit);
+	   	DRM_DEBUG("drm_ctxbitmap_next bit : %d\n", bit);
 		return bit;
 	}
 	return -1;
@@ -64,15 +63,15 @@
 	int i;
    	int temp;
 
-	dev->ctx_bitmap = (unsigned long *) drm_alloc(PAGE_SIZE * 4, 
+	dev->ctx_bitmap = (unsigned long *) drm_alloc(PAGE_SIZE, 
 						      DRM_MEM_CTXBITMAP);
 	if(dev->ctx_bitmap == NULL) {
 		return -ENOMEM;
 	}
-	memset((void *) dev->ctx_bitmap, 0, PAGE_SIZE * 4);
+	memset((void *) dev->ctx_bitmap, 0, PAGE_SIZE);
 	for(i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
 		temp = drm_ctxbitmap_next(dev);
-	   	printk("drm_ctxbitmap_init : %d\n", temp);
+	   	DRM_DEBUG("drm_ctxbitmap_init : %d\n", temp);
 	}
 
 	return 0;
@@ -80,7 +79,7 @@
 
 void drm_ctxbitmap_cleanup(drm_device_t *dev)
 {
-	drm_free((void *)dev->ctx_bitmap, PAGE_SIZE * 4,
+	drm_free((void *)dev->ctx_bitmap, PAGE_SIZE,
 		 DRM_MEM_CTXBITMAP);
 }
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c:1.5	Tue Feb 22 20:47:26 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* dma.c -- DMA IOCTL and function support -*- linux-c -*-
  * Created: Fri Mar 19 14:30:16 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:19:45 2000 by kevin@precisioninsight.com
  *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/dma.c,v 1.5 2000/02/23 04:47:26 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinuxa.com>
  *
  */
 
@@ -63,15 +64,24 @@
 					       dma->bufs[i].page_order,
 					       DRM_MEM_DMA);
 			}
-			drm_free(dma->bufs[i].buflist,
-				 dma->buf_count
-				 * sizeof(*dma->bufs[0].buflist),
-				 DRM_MEM_BUFS);
 			drm_free(dma->bufs[i].seglist,
-				 dma->buf_count
+				 dma->bufs[i].seg_count
 				 * sizeof(*dma->bufs[0].seglist),
 				 DRM_MEM_SEGS);
-			drm_freelist_destroy(&dma->bufs[i].freelist);
+		}
+	   	if(dma->bufs[i].buf_count) {
+		   	for(j = 0; j < dma->bufs[i].buf_count; j++) {
+			   if(dma->bufs[i].buflist[j].dev_private) {
+			      drm_free(dma->bufs[i].buflist[j].dev_private,
+				       dma->bufs[i].buflist[j].dev_priv_size,
+				       DRM_MEM_BUFS);
+			   }
+			}
+		   	drm_free(dma->bufs[i].buflist,
+				 dma->bufs[i].buf_count *
+				 sizeof(*dma->bufs[0].buflist),
+				 DRM_MEM_BUFS);
+		   	drm_freelist_destroy(&dma->bufs[i].freelist);
 		}
 	}
 	
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drawable.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drawable.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drawable.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drawable.c:1.2	Tue Feb 22 20:47:26 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drawable.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* drawable.c -- IOCTLs for drawables -*- linux-c -*-
  * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
- * Revised: Fri Aug 20 09:27:03 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drawable.c,v 1.2 2000/02/23 04:47:26 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h:1.5	Tue Feb 22 20:47:26 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- * Revised: Mon Feb 14 00:15:23 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h,v 1.5 2000/02/23 04:47:26 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  * Acknowledgements:
  * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
@@ -61,7 +62,21 @@
 typedef unsigned int  drm_drawable_t;
 typedef unsigned int  drm_magic_t;
 
+/* Warning: If you change this structure, make sure you change
+ * XF86DRIClipRectRec in the server as well */
 
+typedef struct drm_clip_rect {
+           unsigned short x1;
+           unsigned short y1;
+           unsigned short x2;
+           unsigned short y2;
+} drm_clip_rect_t;
+
+/* Seperate include files for the i810/mga/r128 specific structures */
+#include "mga_drm.h"
+#include "i810_drm.h"
+#include "r128_drm.h"
+
 typedef struct drm_version {
 	int    version_major;	  /* Major version			    */
 	int    version_minor;	  /* Minor version			    */
@@ -101,7 +116,8 @@
 typedef enum drm_map_type {
 	_DRM_FRAME_BUFFER = 0,	  /* WC (no caching), no core dump	    */
 	_DRM_REGISTERS	  = 1,	  /* no caching, no core dump		    */
-	_DRM_SHM	  = 2	  /* shared, cached			    */
+	_DRM_SHM	  = 2,	  /* shared, cached			    */
+	_DRM_AGP          = 3	  /* AGP/GART                               */
 } drm_map_type_t;
 
 typedef enum drm_map_flags {
@@ -165,8 +181,11 @@
 	int	      low_mark;	 /* Low water mark			     */
 	int	      high_mark; /* High water mark			     */
 	enum {
-		DRM_PAGE_ALIGN = 0x01  /* Align on page boundaries for DMA   */
+		_DRM_PAGE_ALIGN = 0x01, /* Align on page boundaries for DMA  */
+		_DRM_AGP_BUFFER = 0x02  /* Buffer is in agp space            */
 	}	      flags;
+	unsigned long agp_start; /* Start address of where the agp buffers
+				  * are in the agp aperture */
 } drm_buf_desc_t;
 
 typedef struct drm_buf_info {
@@ -237,6 +256,38 @@
 	int funcnum;
 } drm_irq_busid_t;
 
+typedef struct drm_agp_mode {
+	unsigned long mode;
+} drm_agp_mode_t;
+
+				/* For drm_agp_alloc -- allocated a buffer */
+typedef struct drm_agp_buffer {
+	unsigned long size;	/* In bytes -- will round to page boundary */
+	unsigned long handle;	/* Used for BIND/UNBIND ioctls */
+	unsigned long type;     /* Type of memory to allocate  */
+        unsigned long physical; /* Physical used by i810       */
+} drm_agp_buffer_t;
+
+				/* For drm_agp_bind */
+typedef struct drm_agp_binding {
+	unsigned long handle;   /* From drm_agp_buffer */
+	unsigned long offset;	/* In bytes -- will round to page boundary */
+} drm_agp_binding_t;
+
+typedef struct drm_agp_info {
+	int            agp_version_major;
+	int            agp_version_minor;
+	unsigned long  mode;
+	unsigned long  aperture_base;  /* physical address */
+	unsigned long  aperture_size;  /* bytes */
+	unsigned long  memory_allowed; /* bytes */
+	unsigned long  memory_used;
+
+				/* PCI information */
+	unsigned short id_vendor;
+	unsigned short id_device;
+} drm_agp_info_t;
+
 #define DRM_IOCTL_BASE	     'd'
 #define DRM_IOCTL_NR(n)	     _IOC_NR(n)
 #define DRM_IO(nr)	     _IO(DRM_IOCTL_BASE,nr)
@@ -247,7 +298,7 @@
 
 #define DRM_IOCTL_VERSION    DRM_IOWR(0x00, drm_version_t)
 #define DRM_IOCTL_GET_UNIQUE DRM_IOWR(0x01, drm_unique_t)
-#define DRM_IOCTL_GET_MAGIC  DRM_IOW( 0x02, drm_auth_t)
+#define DRM_IOCTL_GET_MAGIC  DRM_IOR( 0x02, drm_auth_t)
 #define DRM_IOCTL_IRQ_BUSID  DRM_IOWR(0x03, drm_irq_busid_t)
 
 #define DRM_IOCTL_SET_UNIQUE DRM_IOW( 0x10, drm_unique_t)
@@ -275,5 +326,40 @@
 #define DRM_IOCTL_LOCK	     DRM_IOW( 0x2a, drm_lock_t)
 #define DRM_IOCTL_UNLOCK     DRM_IOW( 0x2b, drm_lock_t)
 #define DRM_IOCTL_FINISH     DRM_IOW( 0x2c, drm_lock_t)
+
+#define DRM_IOCTL_AGP_ACQUIRE DRM_IO(  0x30)
+#define DRM_IOCTL_AGP_RELEASE DRM_IO(  0x31)
+#define DRM_IOCTL_AGP_ENABLE  DRM_IOW( 0x32, drm_agp_mode_t)
+#define DRM_IOCTL_AGP_INFO    DRM_IOR( 0x33, drm_agp_info_t)
+#define DRM_IOCTL_AGP_ALLOC   DRM_IOWR(0x34, drm_agp_buffer_t)
+#define DRM_IOCTL_AGP_FREE    DRM_IOW( 0x35, drm_agp_buffer_t)
+#define DRM_IOCTL_AGP_BIND    DRM_IOW( 0x36, drm_agp_binding_t)
+#define DRM_IOCTL_AGP_UNBIND  DRM_IOW( 0x37, drm_agp_binding_t)
+
+/* Mga specific ioctls */
+#define DRM_IOCTL_MGA_INIT    DRM_IOW( 0x40, drm_mga_init_t)
+#define DRM_IOCTL_MGA_SWAP    DRM_IOW( 0x41, drm_mga_swap_t)
+#define DRM_IOCTL_MGA_CLEAR   DRM_IOW( 0x42, drm_mga_clear_t)
+#define DRM_IOCTL_MGA_ILOAD   DRM_IOW( 0x43, drm_mga_iload_t)
+#define DRM_IOCTL_MGA_VERTEX  DRM_IOW( 0x44, drm_mga_vertex_t)
+#define DRM_IOCTL_MGA_FLUSH   DRM_IOW( 0x45, drm_lock_t )
+#define DRM_IOCTL_MGA_INDICES DRM_IOW( 0x46, drm_mga_indices_t)
+
+/* I810 specific ioctls */
+#define DRM_IOCTL_I810_INIT    DRM_IOW( 0x40, drm_i810_init_t)
+#define DRM_IOCTL_I810_VERTEX  DRM_IOW( 0x41, drm_i810_vertex_t)
+#define DRM_IOCTL_I810_CLEAR   DRM_IOW( 0x42, drm_i810_clear_t)
+#define DRM_IOCTL_I810_FLUSH   DRM_IO ( 0x43)
+#define DRM_IOCTL_I810_GETAGE  DRM_IO ( 0x44)
+#define DRM_IOCTL_I810_GETBUF  DRM_IOWR(0x45, drm_i810_dma_t)
+#define DRM_IOCTL_I810_SWAP    DRM_IO ( 0x46)
+
+/* Rage 128 specific ioctls */
+#define DRM_IOCTL_R128_INIT	DRM_IOW( 0x40, drm_r128_init_t)
+#define DRM_IOCTL_R128_RESET	DRM_IO(  0x41)
+#define DRM_IOCTL_R128_FLUSH	DRM_IO(  0x42)
+#define DRM_IOCTL_R128_IDLE	DRM_IO(  0x43)
+#define DRM_IOCTL_R128_PACKET	DRM_IOW( 0x44, drm_r128_packet_t)
+#define DRM_IOCTL_R128_VERTEX	DRM_IOW( 0x45, drm_r128_vertex_t)
 
 #endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h:1.6 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h:1.7
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h:1.6	Tue Feb 22 20:47:27 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:34:30 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.6 2000/02/23 04:47:27 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  * 
  */
 
@@ -32,6 +33,7 @@
 #define _DRM_P_H_
 
 #ifdef __KERNEL__
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
@@ -48,8 +50,12 @@
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
+#ifdef DRM_AGP
+#include <linux/types.h>
+#include <linux/agp_backend.h>
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
-#include <asm/spinlock.h>
+#include <linux/tqueue.h>
 #include <linux/poll.h>
 #endif
 #include "drm.h"
@@ -68,22 +74,28 @@
 
 #define DRM_FLAG_DEBUG	  0x01
 #define DRM_FLAG_NOCTX	  0x02
+
+#define DRM_MEM_DMA	   0
+#define DRM_MEM_SAREA	   1
+#define DRM_MEM_DRIVER	   2
+#define DRM_MEM_MAGIC	   3
+#define DRM_MEM_IOCTLS	   4
+#define DRM_MEM_MAPS	   5
+#define DRM_MEM_VMAS	   6
+#define DRM_MEM_BUFS	   7
+#define DRM_MEM_SEGS	   8
+#define DRM_MEM_PAGES	   9
+#define DRM_MEM_FILES	  10
+#define DRM_MEM_QUEUES	  11
+#define DRM_MEM_CMDS	  12
+#define DRM_MEM_MAPPINGS  13
+#define DRM_MEM_BUFLISTS  14
+#define DRM_MEM_AGPLISTS  15
+#define DRM_MEM_TOTALAGP  16
+#define DRM_MEM_BOUNDAGP  17
+#define DRM_MEM_CTXBITMAP 18
 
-#define DRM_MEM_DMA	  0
-#define DRM_MEM_SAREA	  1
-#define DRM_MEM_DRIVER	  2
-#define DRM_MEM_MAGIC	  3
-#define DRM_MEM_IOCTLS	  4
-#define DRM_MEM_MAPS	  5
-#define DRM_MEM_VMAS	  6
-#define DRM_MEM_BUFS	  7
-#define DRM_MEM_SEGS	  8
-#define DRM_MEM_PAGES	  9
-#define DRM_MEM_FILES	 10
-#define DRM_MEM_QUEUES	 11
-#define DRM_MEM_CMDS	 12
-#define DRM_MEM_MAPPINGS 13
-#define DRM_MEM_BUFLISTS 14
+#define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
 
 				/* Backward compatibility section */
 				/* _PAGE_WT changed to _PAGE_PWT in 2.2.6 */
@@ -118,7 +130,6 @@
 #endif
 
 				/* Generic cmpxchg added in 2.3.x */
-#if CPU != 386
 #ifndef __HAVE_ARCH_CMPXCHG
 				/* Include this here so that driver can be
                                    used with older kernels. */
@@ -153,10 +164,6 @@
   ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),		\
 				 (unsigned long)(n),sizeof(*(ptr))))
 #endif
-#else
-				/* Compiling for a 386 proper... */
-#error DRI not supported on Intel 80386
-#endif
 
 				/* Macros to make printk easier */
 #define DRM_ERROR(fmt, arg...) \
@@ -218,8 +225,8 @@
 } drm_magic_entry_t;
 
 typedef struct drm_magic_head {
-       struct drm_magic_entry *head;
-       struct drm_magic_entry *tail;
+	struct drm_magic_entry *head;
+	struct drm_magic_entry *tail;
 } drm_magic_head_t;
 
 typedef struct drm_vma_entry {
@@ -235,6 +242,7 @@
 	int		  used;	       /* Amount of buffer in use (for DMA)  */
 	unsigned long	  offset;      /* Byte offset (used internally)	     */
 	void		  *address;    /* Address of buffer		     */
+	unsigned long	  bus_address; /* Bus address of buffer		     */
 	struct drm_buf	  *next;       /* Kernel-only: used for free list    */
 	__volatile__ int  waiting;     /* On kernel DMA queue		     */
 	__volatile__ int  pending;     /* On hardware DMA queue		     */
@@ -250,12 +258,16 @@
 		DRM_LIST_PRIO	 = 4,
 		DRM_LIST_RECLAIM = 5
 	}		  list;	       /* Which list we're on		     */
+
 #if DRM_DMA_HISTOGRAM
 	cycles_t	  time_queued;	   /* Queued to kernel DMA queue     */
 	cycles_t	  time_dispatched; /* Dispatched to hardware	     */
 	cycles_t	  time_completed;  /* Completed by hardware	     */
 	cycles_t	  time_freed;	   /* Back on freelist		     */
 #endif
+
+	int		  dev_priv_size; /* Size of buffer private stoarge   */
+	void		  *dev_private;  /* Per-buffer private storage       */
 } drm_buf_t;
 
 #if DRM_DMA_HISTOGRAM
@@ -376,6 +388,9 @@
 	int		  page_count;
 	unsigned long	  *pagelist;
 	unsigned long	  byte_count;
+	enum {
+	   _DRM_DMA_USE_AGP = 0x01
+	} flags;
 
 				/* DMA support */
 	drm_buf_t	  *this_buffer;	/* Buffer being sent		   */
@@ -384,6 +399,41 @@
 	wait_queue_head_t waiting;	/* Processes waiting on free bufs  */
 } drm_device_dma_t;
 
+#ifdef DRM_AGP
+typedef struct drm_agp_mem {
+	unsigned long      handle;
+	agp_memory         *memory;
+	unsigned long      bound; /* address */
+	int                pages;
+	struct drm_agp_mem *prev;
+	struct drm_agp_mem *next;
+} drm_agp_mem_t;
+
+typedef struct drm_agp_head {
+	agp_kern_info      agp_info;
+	const char         *chipset;
+	drm_agp_mem_t      *memory;
+	unsigned long      mode;
+	int                enabled;
+	int                acquired;
+	unsigned long      base;
+   	int 		   agp_mtrr;
+} drm_agp_head_t;
+
+typedef struct {
+	void       (*free_memory)(agp_memory *);
+	agp_memory *(*allocate_memory)(size_t, u32);
+	int        (*bind_memory)(agp_memory *, off_t);
+	int        (*unbind_memory)(agp_memory *);
+	void       (*enable)(u32);
+	int        (*acquire)(void);
+	void       (*release)(void);
+	void       (*copy_info)(agp_kern_info *);
+} drm_agp_func_t;
+
+extern drm_agp_func_t drm_agp;
+#endif
+
 typedef struct drm_device {
 	const char	  *name;	/* Simple driver name		   */
 	char		  *unique;	/* Unique identifier: e.g., busid  */
@@ -462,6 +512,12 @@
 	struct fasync_struct *buf_async;/* Processes waiting for SIGIO	   */
 	wait_queue_head_t buf_readers;	/* Processes waiting to read	   */
 	wait_queue_head_t buf_writers;	/* Processes waiting to ctx switch */
+	
+#ifdef DRM_AGP
+	drm_agp_head_t    *agp;
+#endif
+	unsigned long     *ctx_bitmap;
+	void		  *dev_private;
 } drm_device_t;
 
 
@@ -470,6 +526,7 @@
 				/* Misc. support (init.c) */
 extern int	     drm_flags;
 extern void	     drm_parse_options(char *s);
+extern int           drm_cpu_valid(void);
 
 
 				/* Device support (fops.c) */
@@ -533,6 +590,14 @@
 extern void	     *drm_ioremap(unsigned long offset, unsigned long size);
 extern void	     drm_ioremapfree(void *pt, unsigned long size);
 
+#ifdef DRM_AGP
+extern agp_memory    *drm_alloc_agp(int pages, u32 type);
+extern int           drm_free_agp(agp_memory *handle, int pages);
+extern int           drm_bind_agp(agp_memory *handle, unsigned int start);
+extern int           drm_unbind_agp(agp_memory *handle);
+#endif
+
+
 				/* Buffer management support (bufs.c) */
 extern int	     drm_order(unsigned long size);
 extern int	     drm_addmap(struct inode *inode, struct file *filp,
@@ -642,5 +707,32 @@
 				       drm_lock_flags_t flags);
 extern int	     drm_flush_block_and_flush(drm_device_t *dev, int context,
 					       drm_lock_flags_t flags);
+
+				/* Context Bitmap support (ctxbitmap.c) */
+extern int	     drm_ctxbitmap_init(drm_device_t *dev);
+extern void	     drm_ctxbitmap_cleanup(drm_device_t *dev);
+extern int	     drm_ctxbitmap_next(drm_device_t *dev);
+extern void	     drm_ctxbitmap_free(drm_device_t *dev, int ctx_handle);
+
+#ifdef DRM_AGP
+				/* AGP/GART support (agpsupport.c) */
+extern drm_agp_head_t *drm_agp_init(void);
+extern int            drm_agp_acquire(struct inode *inode, struct file *filp,
+				      unsigned int cmd, unsigned long arg);
+extern int            drm_agp_release(struct inode *inode, struct file *filp,
+				      unsigned int cmd, unsigned long arg);
+extern int            drm_agp_enable(struct inode *inode, struct file *filp,
+				     unsigned int cmd, unsigned long arg);
+extern int            drm_agp_info(struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg);
+extern int            drm_agp_alloc(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern int            drm_agp_free(struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg);
+extern int            drm_agp_unbind(struct inode *inode, struct file *filp,
+				     unsigned int cmd, unsigned long arg);
+extern int            drm_agp_bind(struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg);
+#endif
 #endif
 #endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c:1.6 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c:1.7
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c:1.6	Tue Feb 22 20:47:27 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* drmstat.c -- DRM device status and testing program
  * Created: Tue Jan  5 08:19:24 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:35:00 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c,v 1.6 2000/02/23 04:47:27 martin Exp $
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
  * 
  */
 
@@ -187,7 +187,7 @@
 	case 'b':
 	    count   = strtoul(optarg, &pt, 0);
 	    size    = strtoul(pt+1, NULL, 0);
-	    if ((r = drmAddBufs(fd, count, size, 0)) < 0) {
+	    if ((r = drmAddBufs(fd, count, size, 0, 65536)) < 0) {
 		drmError(r, argv[0]);
 		return 1;
 	    }
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c:1.6 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c:1.7
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c:1.6	Tue Feb 22 20:47:27 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* fops.c -- File operations for DRM -*- linux-c -*-
  * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
- * Revised: Fri Dec  3 10:26:26 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c,v 1.6 2000/02/23 04:47:27 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Daryll Strauss <daryll@valinux.com>
  *
  */
 
@@ -40,6 +42,7 @@
 	drm_file_t   *priv;
 
 	if (filp->f_flags & O_EXCL)   return -EBUSY; /* No exclusive opens */
+	if (!drm_cpu_valid())         return -EINVAL;
 
 	DRM_DEBUG("pid = %d, minor = %d\n", current->pid, minor);
 
@@ -211,10 +214,15 @@
 		send -= count;
 	}
 
-#if LINUX_VERSION_CODE < 0x020315
+#if LINUX_VERSION_CODE < 0x020315 && !defined(KILLFASYNCHASTHREEPARAMETERS)
+	/* The extra parameter to kill_fasync was added in 2.3.21, and is
+           _not_ present in _stock_ 2.2.14 and 2.2.15.  However, some
+           distributions patch 2.2.x kernels to add this parameter.  The
+           Makefile.linux attempts to detect this addition and defines
+           KILLFASYNCHASTHREEPARAMETERS if three parameters are found. */
 	if (dev->buf_async) kill_fasync(dev->buf_async, SIGIO);
 #else
-				/* Parameter added in 2.3.21 */
+	/* Parameter added in 2.3.21 */
 	if (dev->buf_async) kill_fasync(dev->buf_async, SIGIO, POLL_IN);
 #endif
 	DRM_DEBUG("waking\n");
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c:1.4
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c:1.2	Tue Feb 22 20:47:28 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* gamma_dma.c -- DMA support for GMX 2000 -*- linux-c -*-
  * Created: Fri Mar 19 14:30:16 1999 by faith@precisioninsight.com
- * Revised: Thu Sep 16 12:55:37 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c,v 1.2 2000/02/23 04:47:28 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
@@ -87,13 +88,31 @@
 	GAMMA_WRITE(GAMMA_DMACOUNT, length / 4);
 }
 
-static inline void gamma_dma_quiescent(drm_device_t *dev)
+static inline void gamma_dma_quiescent_single(drm_device_t *dev)
 {
 	while (GAMMA_READ(GAMMA_DMACOUNT))
 		;
 	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
 		;
+
+	GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
+	GAMMA_WRITE(GAMMA_SYNC, 0);
+	
+	do {
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS))
+			;
+	} while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
+}
+
+static inline void gamma_dma_quiescent_dual(drm_device_t *dev)
+{
+	while (GAMMA_READ(GAMMA_DMACOUNT))
+		;
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
+		;
+
 	GAMMA_WRITE(GAMMA_BROADCASTMASK, 3);
+
 	GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
 	GAMMA_WRITE(GAMMA_SYNC, 0);
 	
@@ -103,7 +122,6 @@
 			;
 	} while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
 	
-
 				/* Read from second MX */
 	do {
 		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS + 0x10000))
@@ -788,8 +806,13 @@
 	if (!ret) {
 		if (lock.flags & _DRM_LOCK_READY)
 			gamma_dma_ready(dev);
-		if (lock.flags & _DRM_LOCK_QUIESCENT)
-			gamma_dma_quiescent(dev);
+		if (lock.flags & _DRM_LOCK_QUIESCENT) {
+			if (gamma_found() == 1) {
+				gamma_dma_quiescent_single(dev);
+			} else {
+				gamma_dma_quiescent_dual(dev);
+			}
+		}
 	}
 	DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c:1.4 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c:1.4	Tue Feb 22 20:47:28 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* gamma.c -- 3dlabs GMX 2000 driver -*- linux-c -*-
  * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
- * Revised: Tue Oct 12 08:51:36 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,22 +24,32 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v 1.4 2000/02/23 04:47:28 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "gamma_drv.h"
+#include <linux/pci.h>
 EXPORT_SYMBOL(gamma_init);
 EXPORT_SYMBOL(gamma_cleanup);
 
+#ifndef PCI_DEVICE_ID_3DLABS_GAMMA
+#define PCI_DEVICE_ID_3DLABS_GAMMA 0x0008
+#endif
+#ifndef PCI_DEVICE_ID_3DLABS_MX
+#define PCI_DEVICE_ID_3DLABS_MX 0x0006
+#endif
+
 #define GAMMA_NAME	 "gamma"
 #define GAMMA_DESC	 "3dlabs GMX 2000"
-#define GAMMA_DATE	 "19990830"
-#define GAMMA_MAJOR	 0
+#define GAMMA_DATE	 "20000606"
+#define GAMMA_MAJOR	 1
 #define GAMMA_MINOR	 0
-#define GAMMA_PATCHLEVEL 5
+#define GAMMA_PATCHLEVEL 0
 
 static drm_device_t	      gamma_device;
 
@@ -98,10 +108,13 @@
 int			      init_module(void);
 void			      cleanup_module(void);
 static char		      *gamma = NULL;
+static int 		      devices = 0;
 
 MODULE_AUTHOR("Precision Insight, Inc., Cedar Park, Texas.");
 MODULE_DESCRIPTION("3dlabs GMX 2000");
 MODULE_PARM(gamma, "s");
+MODULE_PARM(devices, "i");
+MODULE_PARM_DESC(devices, "devices=x, where x is the number of MX chips on your card\n");
 
 /* init_module is called when insmod is used to load the module */
 
@@ -121,7 +134,7 @@
 #ifndef MODULE
 /* gamma_setup is called by the kernel to parse command-line options passed
  * via the boot-loader (e.g., LILO).  It calls the insmod option routine,
- * drm_parse_drm.
+ * drm_parse_options.
  *
  * This is not currently supported, since it requires changes to
  * linux/init/main.c. */
@@ -271,6 +284,12 @@
 					       - PAGE_SHIFT,
 					       DRM_MEM_SAREA);
 				break;
+#ifdef DRM_AGP
+			case _DRM_AGP:
+				/* Do nothing here, because this is all
+                                   handled in the AGP/GART driver. */
+				break;
+#endif
 			}
 			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
 		}
@@ -310,6 +329,34 @@
 	return 0;
 }
 
+int gamma_found(void)
+{
+	return devices;
+}
+
+int gamma_find_devices(void)
+{
+	struct pci_dev *d = NULL, *one = NULL, *two = NULL;
+
+	d = pci_find_device(PCI_VENDOR_ID_3DLABS,PCI_DEVICE_ID_3DLABS_GAMMA,d);
+	if (!d) return 0;
+
+	one = pci_find_device(PCI_VENDOR_ID_3DLABS,PCI_DEVICE_ID_3DLABS_MX,d);
+	if (!one) return 0;
+
+	/* Make sure it's on the same card, if not - no MX's found */
+	if (PCI_SLOT(d->devfn) != PCI_SLOT(one->devfn)) return 0;
+
+	two = pci_find_device(PCI_VENDOR_ID_3DLABS,PCI_DEVICE_ID_3DLABS_MX,one);
+	if (!two) return 1;
+
+	/* Make sure it's on the same card, if not - only 1 MX found */
+	if (PCI_SLOT(d->devfn) != PCI_SLOT(two->devfn)) return 1;
+
+	/* Two MX's found - we don't currently support more than 2 */
+	return 2;
+}
+
 /* gamma_init is called via init_module at module load time, or via
  * linux/init/main.c (this is not currently supported). */
 
@@ -327,6 +374,8 @@
 #ifdef MODULE
 	drm_parse_options(gamma);
 #endif
+	devices = gamma_find_devices();
+	if (devices == 0) return -1;
 
 	if ((retcode = misc_register(&gamma_misc))) {
 		DRM_ERROR("Cannot register \"%s\"\n", GAMMA_NAME);
@@ -338,13 +387,14 @@
 	drm_mem_init();
 	drm_proc_init(dev);
 
-	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
+	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d with %d MX devices\n",
 		 GAMMA_NAME,
 		 GAMMA_MAJOR,
 		 GAMMA_MINOR,
 		 GAMMA_PATCHLEVEL,
 		 GAMMA_DATE,
-		 gamma_misc.minor);
+		 gamma_misc.minor,
+		 devices);
 	
 	return 0;
 }
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h:1.4
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h:1.2	Tue Feb 22 20:47:28 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h	Fri Jun 16 17:03:35 2000
@@ -1,8 +1,8 @@
 /* gamma_drv.h -- Private header for 3dlabs GMX 2000 driver -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- * Revised: Fri Aug 20 09:24:27 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h,v 1.2 2000/02/23 04:47:28 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@precisioninsight.com>
  * 
  */
 
@@ -53,5 +54,7 @@
 extern int  gamma_irq_uninstall(drm_device_t *dev);
 extern int  gamma_control(struct inode *inode, struct file *filp,
 			  unsigned int cmd, unsigned long arg);
+extern int  gamma_find_devices(void);
+extern int  gamma_found(void);
 
 #endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_bufs.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_bufs.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_bufs.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_bufs.c:1.1	Fri Feb 11 09:26:04 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_bufs.c	Fri Jun 16 17:03:35 2000
@@ -2,6 +2,7 @@
  * Created: Thu Jan 6 01:47:26 2000 by jhartmann@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,183 +24,54 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
- *	    Jeff Hartmann <jhartmann@precisioninsight.com>
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_bufs.c,v 1.1 2000/02/11 17:26:04 dawes Exp $
- *
  */
 
 #define __NO_VERSION__
 #include "drmP.h"
+#include "i810_drv.h"
 #include "linux/un.h"
 
 int i810_addbufs_agp(struct inode *inode, struct file *filp, unsigned int cmd,
 		    unsigned long arg)
 {
-   drm_file_t *priv = filp->private_data;
-   drm_device_t *dev = priv->dev;
-   drm_device_dma_t *dma = dev->dma;
-   drm_buf_desc_t request;
-   drm_buf_entry_t *entry;
-   drm_buf_t *buf;
-   unsigned long offset;
-   unsigned long agp_offset;
-   int count;
-   int order;
-   int size;
-   int alignment;
-   int page_order;
-   int total;
-   int byte_count;
-   int i;
-
-   if (!dma) return -EINVAL;
-
-   copy_from_user_ret(&request,
-		      (drm_buf_desc_t *)arg,
-		      sizeof(request),
-		      -EFAULT);
-
-   count = request.count;
-   order = drm_order(request.size);
-   size	= 1 << order;
-   agp_offset = request.agp_start;
-   alignment  = (request.flags & _DRM_PAGE_ALIGN) ? PAGE_ALIGN(size) :size;
-   page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
-   total = PAGE_SIZE << page_order;
-   byte_count = 0;
-   
-   if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL;
-   if (dev->queue_count) return -EBUSY; /* Not while in use */
-   spin_lock(&dev->count_lock);
-   if (dev->buf_use) {
-      spin_unlock(&dev->count_lock);
-      return -EBUSY;
-   }
-   atomic_inc(&dev->buf_alloc);
-   spin_unlock(&dev->count_lock);
-   
-   down(&dev->struct_sem);
-   entry = &dma->bufs[order];
-   if (entry->buf_count) {
-      up(&dev->struct_sem);
-      atomic_dec(&dev->buf_alloc);
-      return -ENOMEM; /* May only call once for each order */
-   }
-   
-   entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
-			      DRM_MEM_BUFS);
-   if (!entry->buflist) {
-      up(&dev->struct_sem);
-      atomic_dec(&dev->buf_alloc);
-      return -ENOMEM;
-   }
-   memset(entry->buflist, 0, count * sizeof(*entry->buflist));
-   
-   entry->buf_size   = size;
-   entry->page_order = page_order;
-   
-   while(entry->buf_count < count) {
-      for(offset = 0; offset + size <= total && entry->buf_count < count;
-	  offset += alignment, ++entry->buf_count) {
-	 buf = &entry->buflist[entry->buf_count];
-	 buf->idx = dma->buf_count + entry->buf_count;
-	 buf->total = alignment;
-	 buf->order = order;
-	 buf->used = 0;
-	 buf->offset = agp_offset - dev->agp->base + offset;/* ?? */
-	 buf->bus_address = agp_offset + offset;
-	 buf->address = agp_offset + offset + dev->agp->base;
-	 buf->next = NULL;
-	 buf->waiting = 0;
-	 buf->pending = 0;
-	 init_waitqueue_head(&buf->dma_wait);
-	 buf->pid = 0;
-#if DRM_DMA_HISTOGRAM
-	 buf->time_queued = 0;
-	 buf->time_dispatched = 0;
-	 buf->time_completed = 0;
-	 buf->time_freed = 0;
-#endif
-	 DRM_DEBUG("buffer %d @ %p\n",
-		   entry->buf_count, buf->address);
-      }
-      byte_count += PAGE_SIZE << page_order;
-   }
-   
-   dma->buflist = drm_realloc(dma->buflist,
-			      dma->buf_count * sizeof(*dma->buflist),
-			      (dma->buf_count + entry->buf_count)
-			      * sizeof(*dma->buflist),
-			      DRM_MEM_BUFS);
-   for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
-     dma->buflist[i] = &entry->buflist[i - dma->buf_count];
-   
-   dma->buf_count  += entry->buf_count;
-   dma->byte_count += PAGE_SIZE * (entry->seg_count << page_order);
-   
-   drm_freelist_create(&entry->freelist, entry->buf_count);
-   for (i = 0; i < entry->buf_count; i++) {
-      drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
-   }
-   
-   up(&dev->struct_sem);
-   
-   request.count = entry->buf_count;
-   request.size  = size;
-   
-   copy_to_user_ret((drm_buf_desc_t *)arg,
-		    &request,
-		    sizeof(request),
-		    -EFAULT);
-   
-   atomic_dec(&dev->buf_alloc);
-   return 0;
-}
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_desc_t request;
+	drm_buf_entry_t *entry;
+	drm_buf_t *buf;
+	unsigned long offset;
+	unsigned long agp_offset;
+	int count;
+	int order;
+	int size;
+	int alignment;
+	int page_order;
+	int total;
+	int byte_count;
+	int i;
 
-int i810_addbufs_pci(struct inode *inode, struct file *filp, unsigned int cmd,
-		    unsigned long arg)
-{
-   	drm_file_t	 *priv	 = filp->private_data;
-	drm_device_t	 *dev	 = priv->dev;
-	drm_device_dma_t *dma	 = dev->dma;
-	drm_buf_desc_t	 request;
-	int		 count;
-	int		 order;
-	int		 size;
-	int		 total;
-	int		 page_order;
-	drm_buf_entry_t	 *entry;
-	unsigned long	 page;
-	drm_buf_t	 *buf;
-	int		 alignment;
-	unsigned long	 offset;
-	int		 i;
-	int		 byte_count;
-	int		 page_count;
-
 	if (!dma) return -EINVAL;
 
 	copy_from_user_ret(&request,
 			   (drm_buf_desc_t *)arg,
 			   sizeof(request),
 			   -EFAULT);
-
-	count	   = request.count;
-	order	   = drm_order(request.size);
-	size	   = 1 << order;
-	
-	DRM_DEBUG("count = %d, size = %d (%d), order = %d, queue_count = %d\n",
-		  request.count, request.size, size, order, dev->queue_count);
-
-	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL;
-	if (dev->queue_count) return -EBUSY; /* Not while in use */
 
+	count = request.count;
+	order = drm_order(request.size);
+	size	= 1 << order;
+	agp_offset = request.agp_start;
 	alignment  = (request.flags & _DRM_PAGE_ALIGN) ? PAGE_ALIGN(size) :size;
 	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
-	total	   = PAGE_SIZE << page_order;
-
+	total = PAGE_SIZE << page_order;
+	byte_count = 0;
+   
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL;
+	if (dev->queue_count) return -EBUSY; /* Not while in use */
 	spin_lock(&dev->count_lock);
 	if (dev->buf_use) {
 		spin_unlock(&dev->count_lock);
@@ -207,15 +79,15 @@
 	}
 	atomic_inc(&dev->buf_alloc);
 	spin_unlock(&dev->count_lock);
-	
+   
 	down(&dev->struct_sem);
 	entry = &dma->bufs[order];
 	if (entry->buf_count) {
 		up(&dev->struct_sem);
 		atomic_dec(&dev->buf_alloc);
-		return -ENOMEM;	/* May only call once for each order */
+		return -ENOMEM; /* May only call once for each order */
 	}
-	
+   
 	entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
 				   DRM_MEM_BUFS);
 	if (!entry->buflist) {
@@ -224,69 +96,45 @@
 		return -ENOMEM;
 	}
 	memset(entry->buflist, 0, count * sizeof(*entry->buflist));
-
-	entry->seglist = drm_alloc(count * sizeof(*entry->seglist),
-				   DRM_MEM_SEGS);
-	if (!entry->seglist) {
-		drm_free(entry->buflist,
-			 count * sizeof(*entry->buflist),
-			 DRM_MEM_BUFS);
-		up(&dev->struct_sem);
-		atomic_dec(&dev->buf_alloc);
-		return -ENOMEM;
-	}
-	memset(entry->seglist, 0, count * sizeof(*entry->seglist));
-
-	dma->pagelist = drm_realloc(dma->pagelist,
-				    dma->page_count * sizeof(*dma->pagelist),
-				    (dma->page_count + (count << page_order))
-				    * sizeof(*dma->pagelist),
-				    DRM_MEM_PAGES);
-	DRM_DEBUG("pagelist: %d entries\n",
-		  dma->page_count + (count << page_order));
-
-
-	entry->buf_size	  = size;
+   
+	entry->buf_size   = size;
 	entry->page_order = page_order;
-	byte_count	  = 0;
-	page_count	  = 0;
-	while (entry->buf_count < count) {
-		if (!(page = drm_alloc_pages(page_order, DRM_MEM_DMA))) break;
-		entry->seglist[entry->seg_count++] = page;
-		for (i = 0; i < (1 << page_order); i++) {
-			DRM_DEBUG("page %d @ 0x%08lx\n",
-				  dma->page_count + page_count,
-				  page + PAGE_SIZE * i);
-			dma->pagelist[dma->page_count + page_count++]
-				= page + PAGE_SIZE * i;
-		}
-		for (offset = 0;
-		     offset + size <= total && entry->buf_count < count;
-		     offset += alignment, ++entry->buf_count) {
-			buf	     = &entry->buflist[entry->buf_count];
-			buf->idx     = dma->buf_count + entry->buf_count;
-			buf->total   = alignment;
-			buf->order   = order;
-			buf->used    = 0;
-			buf->offset  = (dma->byte_count + byte_count + offset);
-			buf->address = (void *)(page + offset);
-			buf->next    = NULL;
-			buf->waiting = 0;
-			buf->pending = 0;
-			init_waitqueue_head(&buf->dma_wait);
-			buf->pid     = 0;
+	offset = 0;
+   
+	while(entry->buf_count < count) {
+		buf = &entry->buflist[entry->buf_count];
+		buf->idx = dma->buf_count + entry->buf_count;
+		buf->total = alignment;
+		buf->order = order;
+		buf->used = 0;
+		buf->offset = offset;
+		buf->bus_address = dev->agp->base + agp_offset + offset;
+		buf->address = (void *)(agp_offset + offset + dev->agp->base);
+		buf->next = NULL;
+		buf->waiting = 0;
+		buf->pending = 0;
+		init_waitqueue_head(&buf->dma_wait);
+		buf->pid = 0;
+
+		buf->dev_private = drm_alloc(sizeof(drm_i810_buf_priv_t), 
+					     DRM_MEM_BUFS);
+		buf->dev_priv_size = sizeof(drm_i810_buf_priv_t);
+	   	memset(buf->dev_private, 0, sizeof(drm_i810_buf_priv_t));
+
 #if DRM_DMA_HISTOGRAM
-			buf->time_queued     = 0;
-			buf->time_dispatched = 0;
-			buf->time_completed  = 0;
-			buf->time_freed	     = 0;
+		buf->time_queued = 0;
+		buf->time_dispatched = 0;
+		buf->time_completed = 0;
+		buf->time_freed = 0;
 #endif
-			DRM_DEBUG("buffer %d @ %p\n",
-				  entry->buf_count, buf->address);
-		}
+		offset = offset + alignment;
+		entry->buf_count++;
 		byte_count += PAGE_SIZE << page_order;
+      
+		DRM_DEBUG("buffer %d @ %p\n",
+			  entry->buf_count, buf->address);
 	}
-
+   
 	dma->buflist = drm_realloc(dma->buflist,
 				   dma->buf_count * sizeof(*dma->buflist),
 				   (dma->buf_count + entry->buf_count)
@@ -294,45 +142,43 @@
 				   DRM_MEM_BUFS);
 	for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
 		dma->buflist[i] = &entry->buflist[i - dma->buf_count];
-
-	dma->buf_count	+= entry->buf_count;
-	dma->seg_count	+= entry->seg_count;
-	dma->page_count += entry->seg_count << page_order;
-	dma->byte_count += PAGE_SIZE * (entry->seg_count << page_order);
-	
+   
+	dma->buf_count  += entry->buf_count;
+	dma->byte_count += byte_count;
 	drm_freelist_create(&entry->freelist, entry->buf_count);
 	for (i = 0; i < entry->buf_count; i++) {
 		drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
 	}
-	
+   
 	up(&dev->struct_sem);
-
+   
 	request.count = entry->buf_count;
 	request.size  = size;
-
+   
 	copy_to_user_ret((drm_buf_desc_t *)arg,
 			 &request,
 			 sizeof(request),
 			 -EFAULT);
-	
+   
 	atomic_dec(&dev->buf_alloc);
+	dma->flags = _DRM_DMA_USE_AGP;
 	return 0;
 }
 
 int i810_addbufs(struct inode *inode, struct file *filp, unsigned int cmd,
 		unsigned long arg)
 {
-   drm_buf_desc_t	 request;
+	drm_buf_desc_t	 request;
 
-   copy_from_user_ret(&request,
-		      (drm_buf_desc_t *)arg,
-		      sizeof(request),
-		      -EFAULT);
-
-   if(request.flags & _DRM_AGP_BUFFER)
-     return i810_addbufs_agp(inode, filp, cmd, arg);
-   else
-     return i810_addbufs_pci(inode, filp, cmd, arg);
+	copy_from_user_ret(&request,
+			   (drm_buf_desc_t *)arg,
+			   sizeof(request),
+			   -EFAULT);
+
+	if(request.flags & _DRM_AGP_BUFFER)
+		return i810_addbufs_agp(inode, filp, cmd, arg);
+	else
+		return -EINVAL;
 }
 
 int i810_infobufs(struct inode *inode, struct file *filp, unsigned int cmd,
@@ -486,99 +332,3 @@
 	return 0;
 }
 
-int i810_mapbufs(struct inode *inode, struct file *filp, unsigned int cmd,
-		unsigned long arg)
-{
-	drm_file_t	 *priv	 = filp->private_data;
-	drm_device_t	 *dev	 = priv->dev;
-	drm_device_dma_t *dma	 = dev->dma;
-	int		 retcode = 0;
-	const int	 zero	 = 0;
-	unsigned long	 virtual;
-	unsigned long	 address;
-	drm_buf_map_t	 request;
-	int		 i;
-
-	if (!dma) return -EINVAL;
-	
-	DRM_DEBUG("\n");
-
-	spin_lock(&dev->count_lock);
-	if (atomic_read(&dev->buf_alloc)) {
-		spin_unlock(&dev->count_lock);
-		return -EBUSY;
-	}
-	++dev->buf_use;		/* Can't allocate more after this call */
-	spin_unlock(&dev->count_lock);
-
-	copy_from_user_ret(&request,
-			   (drm_buf_map_t *)arg,
-			   sizeof(request),
-			   -EFAULT);
-
-	if (request.count >= dma->buf_count) {
-	   if(dma->flags & _DRM_DMA_USE_AGP) {
-	      /* This is an ugly vicious hack */
-	      drm_map_t *map = NULL;
-	      for(i = 0; i < dev->map_count; i++) {
-		 map = dev->maplist[i];
-		 if(map->type == _DRM_AGP) break;
-	      }
-	      if (i >= dev->map_count || !map) {
-		 retcode = -EINVAL;
-		 goto done;
-	      }
-	      
-	      virtual = do_mmap(filp, 0, map->size, PROT_READ|PROT_WRITE,
-				MAP_SHARED, (unsigned long)map->handle);
-	   }
-	   else {
-	      virtual = do_mmap(filp, 0, dma->byte_count,
-				PROT_READ|PROT_WRITE, MAP_SHARED, 0);
-	   }
-		if (virtual > -1024UL) {
-				/* Real error */
-			retcode = (signed long)virtual;
-			goto done;
-		}
-		request.virtual = (void *)virtual;
-
-		for (i = 0; i < dma->buf_count; i++) {
-			if (copy_to_user(&request.list[i].idx,
-					 &dma->buflist[i]->idx,
-					 sizeof(request.list[0].idx))) {
-				retcode = -EFAULT;
-				goto done;
-			}
-			if (copy_to_user(&request.list[i].total,
-					 &dma->buflist[i]->total,
-					 sizeof(request.list[0].total))) {
-				retcode = -EFAULT;
-				goto done;
-			}
-			if (copy_to_user(&request.list[i].used,
-					 &zero,
-					 sizeof(zero))) {
-				retcode = -EFAULT;
-				goto done;
-			}
-			address = virtual + dma->buflist[i]->offset;
-			if (copy_to_user(&request.list[i].address,
-					 &address,
-					 sizeof(address))) {
-				retcode = -EFAULT;
-				goto done;
-			}
-		}
-	}
-done:
-	request.count = dma->buf_count;
-	DRM_DEBUG("%d buffers, retcode = %d\n", request.count, retcode);
-
-	copy_to_user_ret((drm_buf_map_t *)arg,
-			 &request,
-			 sizeof(request),
-			 -EFAULT);
-
-	return retcode;
-}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_context.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_context.c:1.1
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_context.c	Fri Jun 16 17:03:35 2000
@@ -0,0 +1,205 @@
+/* i810_context.c -- IOCTLs for i810 contexts -*- linux-c -*-
+ * Created: Mon Dec 13 09:51:35 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ *
+ */
+
+#include <linux/sched.h>
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "i810_drv.h"
+
+static int i810_alloc_queue(drm_device_t *dev)
+{
+   	int temp = drm_ctxbitmap_next(dev);
+   	DRM_DEBUG("i810_alloc_queue: %d\n", temp);
+	return temp;
+}
+
+int i810_context_switch(drm_device_t *dev, int old, int new)
+{
+        char        buf[64];
+
+        atomic_inc(&dev->total_ctx);
+
+        if (test_and_set_bit(0, &dev->context_flag)) {
+                DRM_ERROR("Reentering -- FIXME\n");
+                return -EBUSY;
+        }
+
+#if DRM_DMA_HISTOGRAM
+        dev->ctx_start = get_cycles();
+#endif
+        
+        DRM_DEBUG("Context switch from %d to %d\n", old, new);
+
+        if (new == dev->last_context) {
+                clear_bit(0, &dev->context_flag);
+                return 0;
+        }
+        
+        if (drm_flags & DRM_FLAG_NOCTX) {
+                i810_context_switch_complete(dev, new);
+        } else {
+                sprintf(buf, "C %d %d\n", old, new);
+                drm_write_string(dev, buf);
+        }
+        
+        return 0;
+}
+
+int i810_context_switch_complete(drm_device_t *dev, int new)
+{
+        dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
+        dev->last_switch  = jiffies;
+        
+        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+                DRM_ERROR("Lock isn't held after context switch\n");
+        }
+
+				/* If a context switch is ever initiated
+                                   when the kernel holds the lock, release
+                                   that lock here. */
+#if DRM_DMA_HISTOGRAM
+        atomic_inc(&dev->histo.ctx[drm_histogram_slot(get_cycles()
+                                                      - dev->ctx_start)]);
+                   
+#endif
+        clear_bit(0, &dev->context_flag);
+        wake_up(&dev->context_wait);
+        
+        return 0;
+}
+
+int i810_resctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	       unsigned long arg)
+{
+	drm_ctx_res_t	res;
+	drm_ctx_t	ctx;
+	int		i;
+
+	DRM_DEBUG("%d\n", DRM_RESERVED_CONTEXTS);
+	copy_from_user_ret(&res, (drm_ctx_res_t *)arg, sizeof(res), -EFAULT);
+	if (res.count >= DRM_RESERVED_CONTEXTS) {
+		memset(&ctx, 0, sizeof(ctx));
+		for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
+			ctx.handle = i;
+			copy_to_user_ret(&res.contexts[i],
+					 &i,
+					 sizeof(i),
+					 -EFAULT);
+		}
+	}
+	res.count = DRM_RESERVED_CONTEXTS;
+	copy_to_user_ret((drm_ctx_res_t *)arg, &res, sizeof(res), -EFAULT);
+	return 0;
+}
+
+int i810_addctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	       unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
+	if ((ctx.handle = i810_alloc_queue(dev)) == DRM_KERNEL_CONTEXT) {
+				/* Skip kernel's context and get a new one. */
+		ctx.handle = i810_alloc_queue(dev);
+	}
+        if (ctx.handle == -1) {
+		DRM_DEBUG("Not enough free contexts.\n");
+				/* Should this return -EBUSY instead? */
+		return -ENOMEM;
+	}
+	DRM_DEBUG("%d\n", ctx.handle);
+	copy_to_user_ret((drm_ctx_t *)arg, &ctx, sizeof(ctx), -EFAULT);
+	return 0;
+}
+
+int i810_modctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	unsigned long arg)
+{
+   	/* This does nothing for the i810 */
+	return 0;
+}
+
+int i810_getctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	unsigned long arg)
+{
+	drm_ctx_t ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t*)arg, sizeof(ctx), -EFAULT);
+	/* This is 0, because we don't hanlde any context flags */
+	ctx.flags = 0;
+	copy_to_user_ret((drm_ctx_t*)arg, &ctx, sizeof(ctx), -EFAULT);
+	return 0;
+}
+
+int i810_switchctx(struct inode *inode, struct file *filp, unsigned int cmd,
+		   unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
+	DRM_DEBUG("%d\n", ctx.handle);
+	return i810_context_switch(dev, dev->last_context, ctx.handle);
+}
+
+int i810_newctx(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
+	DRM_DEBUG("%d\n", ctx.handle);
+	i810_context_switch_complete(dev, ctx.handle);
+
+	return 0;
+}
+
+int i810_rmctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	      unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
+	DRM_DEBUG("%d\n", ctx.handle);
+   	if(ctx.handle != DRM_KERNEL_CONTEXT) {
+	   	drm_ctxbitmap_free(dev, ctx.handle);
+	}
+	
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c:1.1	Fri Feb 11 09:26:04 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c	Thu Jun 22 07:26:19 2000
@@ -2,6 +2,7 @@
  * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,11 +24,10 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
- *	    Jeff Hartmann <jhartmann@precisioninsight.com>
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ *          Keith Whitwell <keithw@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c,v 1.1 2000/02/11 17:26:04 dawes Exp $
- *
  */
 
 #define __NO_VERSION__
@@ -36,6 +36,18 @@
 
 #include <linux/interrupt.h>	/* For task queue support */
 
+/* in case we don't have a 2.3.99-pre6 kernel or later: */
+#ifndef VM_DONTCOPY
+#define VM_DONTCOPY 0
+#endif
+
+#define I810_BUF_FREE		2
+#define I810_BUF_CLIENT		1
+#define I810_BUF_HARDWARE      	0
+
+#define I810_BUF_UNMAPPED 0
+#define I810_BUF_MAPPED   1
+
 #define I810_REG(reg)		2
 #define I810_BASE(reg)		((unsigned long) \
 				dev->maplist[I810_REG(reg)]->handle)
@@ -43,544 +55,835 @@
 #define I810_DEREF(reg)		*(__volatile__ int *)I810_ADDR(reg)
 #define I810_READ(reg)		I810_DEREF(reg)
 #define I810_WRITE(reg,val) 	do { I810_DEREF(reg) = val; } while (0)
+#define I810_DEREF16(reg)	*(__volatile__ u16 *)I810_ADDR(reg)
+#define I810_READ16(reg)	I810_DEREF16(reg)
+#define I810_WRITE16(reg,val)	do { I810_DEREF16(reg) = val; } while (0)
+
+#define RING_LOCALS	unsigned int outring, ringmask; volatile char *virt;
+
+#define BEGIN_LP_RING(n) do {				\
+	if (I810_VERBOSE)				\
+		DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n",	\
+			  n, __FUNCTION__);		\
+	if (dev_priv->ring.space < n*4) 		\
+		i810_wait_ring(dev, n*4);		\
+	dev_priv->ring.space -= n*4;			\
+	outring = dev_priv->ring.tail;			\
+	ringmask = dev_priv->ring.tail_mask;		\
+	virt = dev_priv->ring.virtual_start;		\
+} while (0)
+
+#define ADVANCE_LP_RING() do {					\
+	if (I810_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING\n");	\
+	dev_priv->ring.tail = outring;				\
+	I810_WRITE(LP_RING + RING_TAIL, outring);		\
+} while(0)
+
+#define OUT_RING(n) do {						\
+	if (I810_VERBOSE) DRM_DEBUG("   OUT_RING %x\n", (int)(n));	\
+	*(volatile unsigned int *)(virt + outring) = n;			\
+	outring += 4;							\
+	outring &= ringmask;						\
+} while (0);
 
-void i810_dma_init(drm_device_t *dev)
+static inline void i810_print_status_page(drm_device_t *dev)
 {
-        printk(KERN_INFO "i810_dma_init\n");
+   	drm_device_dma_t *dma = dev->dma;
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+	u32 *temp = (u32 *)dev_priv->hw_status_page;
+   	int i;
+
+   	DRM_DEBUG(  "hw_status: Interrupt Status : %x\n", temp[0]);
+   	DRM_DEBUG(  "hw_status: LpRing Head ptr : %x\n", temp[1]);
+   	DRM_DEBUG(  "hw_status: IRing Head ptr : %x\n", temp[2]);
+      	DRM_DEBUG(  "hw_status: Reserved : %x\n", temp[3]);
+   	DRM_DEBUG(  "hw_status: Driver Counter : %d\n", temp[5]);
+   	for(i = 6; i < dma->buf_count + 6; i++) {
+	   	DRM_DEBUG( "buffer status idx : %d used: %d\n", i - 6, temp[i]);
+	}
 }
 
-void i810_dma_cleanup(drm_device_t *dev)
+static drm_buf_t *i810_freelist_get(drm_device_t *dev)
 {
-   printk(KERN_INFO "i810_dma_cleanup\n");
+   	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+   	int 		 used;
+   
+	/* Linear search might not be the best solution */
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+		/* In use is already a pointer */
+	   	used = cmpxchg(buf_priv->in_use, I810_BUF_FREE, 
+			       I810_BUF_CLIENT);
+	   	if(used == I810_BUF_FREE) {
+			return buf;
+		}
+	}
+   	return NULL;
 }
 
-static inline void i810_dma_dispatch(drm_device_t *dev, unsigned long address,
-				    unsigned long length)
+/* This should only be called if the buffer is not sent to the hardware
+ * yet, the hardware updates in use for us once its on the ring buffer.
+ */
+
+static int i810_freelist_put(drm_device_t *dev, drm_buf_t *buf)
 {
-   printk(KERN_INFO "i810_dma_dispatch\n");
+   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+   	int used;
+   
+   	/* In use is already a pointer */
+   	used = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, I810_BUF_FREE);
+   	if(used != I810_BUF_CLIENT) {
+	   	DRM_ERROR("Freeing buffer thats not in use : %d\n", buf->idx);
+	   	return -EINVAL;
+	}
+   
+   	return 0;
 }
+
+static struct file_operations i810_buffer_fops = {
+	open:	 i810_open,
+	flush:	 drm_flush,
+	release: i810_release,
+	ioctl:	 i810_ioctl,
+	mmap:	 i810_mmap_buffers,
+	read:	 drm_read,
+	fasync:	 drm_fasync,
+      	poll:	 drm_poll,
+};
 
-static inline void i810_dma_quiescent(drm_device_t *dev)
+int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
 {
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_device_t	  *dev	  = priv->dev;
+	drm_i810_private_t *dev_priv = dev->dev_private;
+	drm_buf_t *buf = dev_priv->mmap_buffer;
+	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+   
+	vma->vm_flags |= (VM_IO | VM_DONTCOPY);
+	vma->vm_file = filp;
+   
+   	buf_priv->currently_mapped = I810_BUF_MAPPED;
+
+	if (remap_page_range(vma->vm_start,
+			     VM_OFFSET(vma),
+			     vma->vm_end - vma->vm_start,
+			     vma->vm_page_prot)) return -EAGAIN;
+	return 0;
 }
 
-static inline void i810_dma_ready(drm_device_t *dev)
+static int i810_map_buffer(drm_buf_t *buf, struct file *filp)
 {
-   i810_dma_quiescent(dev);
-   printk(KERN_INFO "i810_dma_ready\n");
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_device_t	  *dev	  = priv->dev;
+	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+   	struct file_operations *old_fops;
+	int retcode = 0;
+
+	if(buf_priv->currently_mapped == I810_BUF_MAPPED) return -EINVAL;
+	down(&current->mm->mmap_sem);
+   	old_fops = filp->f_op;
+	filp->f_op = &i810_buffer_fops;
+	dev_priv->mmap_buffer = buf;
+	buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total, 
+					    PROT_READ|PROT_WRITE,
+					    MAP_SHARED, 
+					    buf->bus_address);
+	dev_priv->mmap_buffer = NULL;
+   	filp->f_op = old_fops;
+	if ((unsigned long)buf_priv->virtual > -1024UL) {
+		/* Real error */
+		DRM_DEBUG("mmap error\n");
+		retcode = (signed int)buf_priv->virtual;
+		buf_priv->virtual = 0;
+	}
+   	up(&current->mm->mmap_sem);
+	return retcode;
 }
 
-static inline int i810_dma_is_ready(drm_device_t *dev)
+static int i810_unmap_buffer(drm_buf_t *buf)
 {
+	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+	int retcode = 0;
 
-   i810_dma_quiescent(dev);
+	if(buf_priv->currently_mapped != I810_BUF_MAPPED) return -EINVAL;
+	down(&current->mm->mmap_sem);
+        retcode = do_munmap(current->mm, (unsigned long)buf_priv->virtual, 
+			    (size_t) buf->total);
+   	buf_priv->currently_mapped = I810_BUF_UNMAPPED;
+   	buf_priv->virtual = 0;
+   	up(&current->mm->mmap_sem);
 
-   printk(KERN_INFO "i810_dma_is_ready\n");
-   return 1;
+	return retcode;
 }
 
-
-static void i810_dma_service(int irq, void *device, struct pt_regs *regs)
+static int i810_dma_get_buffer(drm_device_t *dev, drm_i810_dma_t *d, 
+			       struct file *filp)
 {
-	drm_device_t	 *dev = (drm_device_t *)device;
-	drm_device_dma_t *dma = dev->dma;
-	
-	atomic_inc(&dev->total_irq);
-	if (i810_dma_is_ready(dev)) {
-				/* Free previous buffer */
-		if (test_and_set_bit(0, &dev->dma_flag)) {
-			atomic_inc(&dma->total_missed_free);
-			return;
-		}
-		if (dma->this_buffer) {
-			drm_free_buffer(dev, dma->this_buffer);
-			dma->this_buffer = NULL;
-		}
-		clear_bit(0, &dev->dma_flag);
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_buf_t	  *buf;
+	drm_i810_buf_priv_t *buf_priv;
+	int retcode = 0;
 
-				/* Dispatch new buffer */
-		queue_task(&dev->tq, &tq_immediate);
-		mark_bh(IMMEDIATE_BH);
+	buf = i810_freelist_get(dev);
+	if (!buf) {
+		retcode = -ENOMEM;
+	   	DRM_DEBUG("%s retcode %d\n", __FUNCTION__, retcode);
+		goto out_get_buf;
 	}
+   
+	retcode = i810_map_buffer(buf, filp);
+	if(retcode) {
+		i810_freelist_put(dev, buf);
+	   	DRM_DEBUG("mapbuf failed in %s retcode %d\n", 
+			  __FUNCTION__, retcode);
+	   	goto out_get_buf;
+	}
+	buf->pid     = priv->pid;
+	buf_priv = buf->dev_private;	
+	d->granted = 1;
+   	d->request_idx = buf->idx;
+   	d->request_size = buf->total;
+   	d->virtual = buf_priv->virtual;
+
+out_get_buf:
+	return retcode;
 }
 
-/* Only called by i810_dma_schedule. */
-static int i810_do_dma(drm_device_t *dev, int locked)
+static unsigned long i810_alloc_page(drm_device_t *dev)
 {
-	unsigned long	 address;
-	unsigned long	 length;
-	drm_buf_t	 *buf;
-	int		 retcode = 0;
-	drm_device_dma_t *dma = dev->dma;
-#if DRM_DMA_HISTOGRAM
-	cycles_t	 dma_start, dma_stop;
-#endif
-
-	if (test_and_set_bit(0, &dev->dma_flag)) {
-		atomic_inc(&dma->total_missed_dma);
-		return -EBUSY;
-	}
+	unsigned long address;
+   
+	address = __get_free_page(GFP_KERNEL);
+	if(address == 0UL) 
+		return 0;
 	
-#if DRM_DMA_HISTOGRAM
-	dma_start = get_cycles();
-#endif
-
-	if (!dma->next_buffer) {
-		DRM_ERROR("No next_buffer\n");
-		clear_bit(0, &dev->dma_flag);
-		return -EINVAL;
-	}
+	atomic_inc(&mem_map[MAP_NR((void *) address)].count);
+	set_bit(PG_locked, &mem_map[MAP_NR((void *) address)].flags);
+   
+	return address;
+}
 
-	buf	= dma->next_buffer;
-	address = (unsigned long)buf->bus_address;
-	length	= buf->used;
+static void i810_free_page(drm_device_t *dev, unsigned long page)
+{
+	if(page == 0UL) 
+		return;
 	
-
-	DRM_DEBUG("context %d, buffer %d (%ld bytes)\n",
-		  buf->context, buf->idx, length);
-
-	if (buf->list == DRM_LIST_RECLAIM) {
-		drm_clear_next_buffer(dev);
-		drm_free_buffer(dev, buf);
-		clear_bit(0, &dev->dma_flag);
-		return -EINVAL;
-	}
+	atomic_dec(&mem_map[MAP_NR((void *) page)].count);
+	clear_bit(PG_locked, &mem_map[MAP_NR((void *) page)].flags);
+	wake_up(&mem_map[MAP_NR((void *) page)].wait);
+	free_page(page);
+	return;
+}
 
-	if (!length) {
-		DRM_ERROR("0 length buffer\n");
-		drm_clear_next_buffer(dev);
-		drm_free_buffer(dev, buf);
-		clear_bit(0, &dev->dma_flag);
-		return 0;
-	}
-	
-	if (!i810_dma_is_ready(dev)) {
-		clear_bit(0, &dev->dma_flag);
-		return -EBUSY;
-	}
+static int i810_dma_cleanup(drm_device_t *dev)
+{
+	drm_device_dma_t *dma = dev->dma;
 
-	if (buf->while_locked) {
-		if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
-			DRM_ERROR("Dispatching buffer %d from pid %d"
-				  " \"while locked\", but no lock held\n",
-				  buf->idx, buf->pid);
-		}
-	} else {
-		if (!locked && !drm_lock_take(&dev->lock.hw_lock->lock,
-					      DRM_KERNEL_CONTEXT)) {
-			atomic_inc(&dma->total_missed_lock);
-			clear_bit(0, &dev->dma_flag);
-			return -EBUSY;
+	if(dev->dev_private) {
+		int i;
+	   	drm_i810_private_t *dev_priv = 
+	     		(drm_i810_private_t *) dev->dev_private;
+	   
+	   	if(dev_priv->ring.virtual_start) {
+		   	drm_ioremapfree((void *) dev_priv->ring.virtual_start,
+					dev_priv->ring.Size);
+		}
+	   	if(dev_priv->hw_status_page != 0UL) {
+		   	i810_free_page(dev, dev_priv->hw_status_page);
+		   	/* Need to rewrite hardware status page */
+		   	I810_WRITE(0x02080, 0x1ffff000);
+		}
+	   	drm_free(dev->dev_private, sizeof(drm_i810_private_t), 
+			 DRM_MEM_DRIVER);
+	   	dev->dev_private = NULL;
+
+		for (i = 0; i < dma->buf_count; i++) {
+			drm_buf_t *buf = dma->buflist[ i ];
+			drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+			drm_ioremapfree(buf_priv->kernel_virtual, buf->total);
 		}
 	}
+   	return 0;
+}
 
-	if (dev->last_context != buf->context
-	    && !(dev->queuelist[buf->context]->flags
-		 & _DRM_CONTEXT_PRESERVED)) {
-				/* PRE: dev->last_context != buf->context */
-		if (drm_context_switch(dev, dev->last_context, buf->context)) {
-			drm_clear_next_buffer(dev);
-			drm_free_buffer(dev, buf);
+static int i810_wait_ring(drm_device_t *dev, int n)
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+   	drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
+   	int iters = 0;
+   	unsigned long end;
+	unsigned int last_head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+
+	end = jiffies + (HZ*3);
+   	while (ring->space < n) {
+	   	int i;
+	
+	   	ring->head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+	   	ring->space = ring->head - (ring->tail+8);
+		if (ring->space < 0) ring->space += ring->Size;
+	   
+		if (ring->head != last_head)
+		   end = jiffies + (HZ*3);
+	  
+	   	iters++;
+		if((signed)(end - jiffies) <= 0) {
+		   	DRM_ERROR("space: %d wanted %d\n", ring->space, n);
+		   	DRM_ERROR("lockup\n");
+		   	goto out_wait_ring;
 		}
-		retcode = -EBUSY;
-		goto cleanup;
-			
-				/* POST: we will wait for the context
-				   switch and will dispatch on a later call
-				   when dev->last_context == buf->context.
-				   NOTE WE HOLD THE LOCK THROUGHOUT THIS
-				   TIME! */
-	}
-
-	drm_clear_next_buffer(dev);
-	buf->pending	 = 1;
-	buf->waiting	 = 0;
-	buf->list	 = DRM_LIST_PEND;
-#if DRM_DMA_HISTOGRAM
-	buf->time_dispatched = get_cycles();
-#endif
 
-	i810_dma_dispatch(dev, address, length);
-	drm_free_buffer(dev, dma->this_buffer);
-	dma->this_buffer = buf;
-
-	atomic_add(length, &dma->total_bytes);
-	atomic_inc(&dma->total_dmas);
-
-	if (!buf->while_locked && !dev->context_flag && !locked) {
-		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
-				  DRM_KERNEL_CONTEXT)) {
-			DRM_ERROR("\n");
-		}
+	   	for (i = 0 ; i < 2000 ; i++) ;
 	}
-cleanup:
-
-	clear_bit(0, &dev->dma_flag);
-
-#if DRM_DMA_HISTOGRAM
-	dma_stop = get_cycles();
-	atomic_inc(&dev->histo.dma[drm_histogram_slot(dma_stop - dma_start)]);
-#endif
 
-	return retcode;
+out_wait_ring:   
+   	return iters;
 }
 
-static void i810_dma_schedule_timer_wrapper(unsigned long dev)
+static void i810_kernel_lost_context(drm_device_t *dev)
 {
-	i810_dma_schedule((drm_device_t *)dev, 0);
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+   	drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
+      
+   	ring->head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+     	ring->tail = I810_READ(LP_RING + RING_TAIL);
+     	ring->space = ring->head - (ring->tail+8);
+     	if (ring->space < 0) ring->space += ring->Size;
 }
 
-static void i810_dma_schedule_tq_wrapper(void *dev)
+static int i810_freelist_init(drm_device_t *dev)
 {
-	i810_dma_schedule(dev, 0);
+      	drm_device_dma_t *dma = dev->dma;
+   	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+   	int my_idx = 24;
+   	u32 *hw_status = (u32 *)(dev_priv->hw_status_page + my_idx);
+   	int i;
+   
+   	if(dma->buf_count > 1019) {
+	   	/* Not enough space in the status page for the freelist */
+	   	return -EINVAL;
+	}
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+	   
+	   	buf_priv->in_use = hw_status++;
+	   	buf_priv->my_use_idx = my_idx;
+	   	my_idx += 4;
+
+	   	*buf_priv->in_use = I810_BUF_FREE;
+
+		buf_priv->kernel_virtual = drm_ioremap(buf->bus_address, 
+						       buf->total);
+	}
+	return 0;
 }
 
-int i810_dma_schedule(drm_device_t *dev, int locked)
+static int i810_dma_initialize(drm_device_t *dev, 
+			       drm_i810_private_t *dev_priv,
+			       drm_i810_init_t *init)
 {
-	int		 next;
-	drm_queue_t	 *q;
-	drm_buf_t	 *buf;
-	int		 retcode   = 0;
-	int		 processed = 0;
-	int		 missed;
-	int		 expire	   = 20;
-	drm_device_dma_t *dma	   = dev->dma;
-#if DRM_DMA_HISTOGRAM
-	cycles_t	 schedule_start;
-#endif
+	drm_map_t *sarea_map;
 
-	if (test_and_set_bit(0, &dev->interrupt_flag)) {
-				/* Not reentrant */
-		atomic_inc(&dma->total_missed_sched);
-		return -EBUSY;
-	}
-	missed = atomic_read(&dma->total_missed_sched);
+   	dev->dev_private = (void *) dev_priv;
+   	memset(dev_priv, 0, sizeof(drm_i810_private_t));
 
-#if DRM_DMA_HISTOGRAM
-	schedule_start = get_cycles();
-#endif
+   	if (init->ring_map_idx >= dev->map_count ||
+	    init->buffer_map_idx >= dev->map_count) {
+	   	i810_dma_cleanup(dev);
+	   	DRM_ERROR("ring_map or buffer_map are invalid\n");
+	   	return -EINVAL;
+	}
+   
+   	dev_priv->ring_map_idx = init->ring_map_idx;
+   	dev_priv->buffer_map_idx = init->buffer_map_idx;
+	sarea_map = dev->maplist[0];
+	dev_priv->sarea_priv = (drm_i810_sarea_t *) 
+		((u8 *)sarea_map->handle + 
+		 init->sarea_priv_offset);
+
+   	atomic_set(&dev_priv->flush_done, 0);
+	init_waitqueue_head(&dev_priv->flush_queue);
+   	
+   	dev_priv->ring.Start = init->ring_start;
+   	dev_priv->ring.End = init->ring_end;
+   	dev_priv->ring.Size = init->ring_size;
+
+   	dev_priv->ring.virtual_start = drm_ioremap(dev->agp->base + 
+						   init->ring_start, 
+						   init->ring_size);
 
-again:
-	if (dev->context_flag) {
-		clear_bit(0, &dev->interrupt_flag);
-		return -EBUSY;
+   	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
+   
+   	if (dev_priv->ring.virtual_start == NULL) {
+	   	i810_dma_cleanup(dev);
+	   	DRM_ERROR("can not ioremap virtual address for"
+			  " ring buffer\n");
+	   	return -ENOMEM;
+	}
+
+	dev_priv->w = init->w;
+	dev_priv->h = init->h;
+	dev_priv->pitch = init->pitch;
+	dev_priv->back_offset = init->back_offset;
+	dev_priv->depth_offset = init->depth_offset;
+
+	dev_priv->front_di1 = init->front_offset | init->pitch_bits;
+	dev_priv->back_di1 = init->back_offset | init->pitch_bits;
+	dev_priv->zi1 = init->depth_offset | init->pitch_bits;
+	
+   
+   	/* Program Hardware Status Page */
+   	dev_priv->hw_status_page = i810_alloc_page(dev);
+   	memset((void *) dev_priv->hw_status_page, 0, PAGE_SIZE);
+   	if(dev_priv->hw_status_page == 0UL) {
+		i810_dma_cleanup(dev);
+		DRM_ERROR("Can not allocate hardware status page\n");
+		return -ENOMEM;
 	}
-	if (dma->next_buffer) {
-				/* Unsent buffer that was previously
-				   selected, but that couldn't be sent
-				   because the lock could not be obtained
-				   or the DMA engine wasn't ready.  Try
-				   again. */
-		atomic_inc(&dma->total_tried);
-		if (!(retcode = i810_do_dma(dev, locked))) {
-			atomic_inc(&dma->total_hit);
-			++processed;
-		}
-	} else {
-		do {
-			next = drm_select_queue(dev,
-					     i810_dma_schedule_timer_wrapper);
-			if (next >= 0) {
-				q   = dev->queuelist[next];
-				buf = drm_waitlist_get(&q->waitlist);
-				dma->next_buffer = buf;
-				dma->next_queue	 = q;
-				if (buf && buf->list == DRM_LIST_RECLAIM) {
-					drm_clear_next_buffer(dev);
-					drm_free_buffer(dev, buf);
-				}
-			}
-		} while (next >= 0 && !dma->next_buffer);
-		if (dma->next_buffer) {
-			if (!(retcode = i810_do_dma(dev, locked))) {
-				++processed;
-			}
-		}
+   	DRM_DEBUG("hw status page @ %lx\n", dev_priv->hw_status_page);
+   
+   	I810_WRITE(0x02080, virt_to_bus((void *)dev_priv->hw_status_page));
+   	DRM_DEBUG("Enabled hardware status page\n");
+   
+   	/* Now we need to init our freelist */
+   	if(i810_freelist_init(dev) != 0) {
+	   	i810_dma_cleanup(dev);
+	   	DRM_ERROR("Not enough space in the status page for"
+			  " the freelist\n");
+	   	return -ENOMEM;
 	}
+   	return 0;
+}
 
-	if (--expire) {
-		if (missed != atomic_read(&dma->total_missed_sched)) {
-			atomic_inc(&dma->total_lost);
-			if (i810_dma_is_ready(dev)) goto again;
-		}
-		if (processed && i810_dma_is_ready(dev)) {
-			atomic_inc(&dma->total_lost);
-			processed = 0;
-			goto again;
-		}
-	}
+int i810_dma_init(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+   	drm_file_t *priv = filp->private_data;
+   	drm_device_t *dev = priv->dev;
+   	drm_i810_private_t *dev_priv;
+   	drm_i810_init_t init;
+   	int retcode = 0;
 	
-	clear_bit(0, &dev->interrupt_flag);
+   	copy_from_user_ret(&init, (drm_i810_init_t *)arg, 
+			   sizeof(init), -EFAULT);
 	
-#if DRM_DMA_HISTOGRAM
-	atomic_inc(&dev->histo.schedule[drm_histogram_slot(get_cycles()
-							   - schedule_start)]);
-#endif
-	return retcode;
+   	switch(init.func) {
+	 	case I810_INIT_DMA:
+	   		dev_priv = drm_alloc(sizeof(drm_i810_private_t), 
+					     DRM_MEM_DRIVER);
+	   		if(dev_priv == NULL) return -ENOMEM;
+	   		retcode = i810_dma_initialize(dev, dev_priv, &init);
+	   	break;
+	 	case I810_CLEANUP_DMA:
+	   		retcode = i810_dma_cleanup(dev);
+	   	break;
+	 	default:
+	   		retcode = -EINVAL;
+	   	break;
+	}
+   
+   	return retcode;
 }
 
-static int i810_dma_priority(drm_device_t *dev, drm_dma_t *d)
-{
-	unsigned long	  address;
-	unsigned long	  length;
-	int		  must_free = 0;
-	int		  retcode   = 0;
-	int		  i;
-	int		  idx;
-	drm_buf_t	  *buf;
-	drm_buf_t	  *last_buf = NULL;
-	drm_device_dma_t  *dma	    = dev->dma;
-	DECLARE_WAITQUEUE(entry, current);
 
-				/* Turn off interrupt handling */
-	while (test_and_set_bit(0, &dev->interrupt_flag)) {
-		schedule();
-		if (signal_pending(current)) return -EINTR;
-	}
-	if (!(d->flags & _DRM_DMA_WHILE_LOCKED)) {
-		while (!drm_lock_take(&dev->lock.hw_lock->lock,
-				      DRM_KERNEL_CONTEXT)) {
-			schedule();
-			if (signal_pending(current)) {
-				clear_bit(0, &dev->interrupt_flag);
-				return -EINTR;
-			}
-		}
-		++must_free;
+
+/* Most efficient way to verify state for the i810 is as it is
+ * emitted.  Non-conformant state is silently dropped.
+ *
+ * Use 'volatile' & local var tmp to force the emitted values to be
+ * identical to the verified ones.
+ */
+static void i810EmitContextVerified( drm_device_t *dev, 
+				     volatile unsigned int *code ) 
+{	
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	int i, j = 0;
+	unsigned int tmp;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( I810_CTX_SETUP_SIZE );
+
+	OUT_RING( GFX_OP_COLOR_FACTOR );
+	OUT_RING( code[I810_CTXREG_CF1] );
+
+	OUT_RING( GFX_OP_STIPPLE );
+	OUT_RING( code[I810_CTXREG_ST1] );
+
+	for ( i = 4 ; i < I810_CTX_SETUP_SIZE ; i++ ) {
+		tmp = code[i];
+
+		if ((tmp & (7<<29)) == (3<<29) &&
+		    (tmp & (0x1f<<24)) < (0x1d<<24)) 
+		{
+			OUT_RING( tmp ); 
+			j++;
+		} 
 	}
-	atomic_inc(&dma->total_prio);
 
-	for (i = 0; i < d->send_count; i++) {
-		idx = d->send_indices[i];
-		if (idx < 0 || idx >= dma->buf_count) {
-			DRM_ERROR("Index %d (of %d max)\n",
-				  d->send_indices[i], dma->buf_count - 1);
-			continue;
-		}
-		buf = dma->buflist[ idx ];
-		if (buf->pid != current->pid) {
-			DRM_ERROR("Process %d using buffer owned by %d\n",
-				  current->pid, buf->pid);
-			retcode = -EINVAL;
-			goto cleanup;
-		}
-		if (buf->list != DRM_LIST_NONE) {
-			DRM_ERROR("Process %d using %d's buffer on list %d\n",
-				  current->pid, buf->pid, buf->list);
-			retcode = -EINVAL;
-			goto cleanup;
-		}
-				/* This isn't a race condition on
-				   buf->list, since our concern is the
-				   buffer reclaim during the time the
-				   process closes the /dev/drm? handle, so
-				   it can't also be doing DMA. */
-		buf->list	  = DRM_LIST_PRIO;
-		buf->used	  = d->send_sizes[i];
-		buf->context	  = d->context;
-		buf->while_locked = d->flags & _DRM_DMA_WHILE_LOCKED;
-		address		  = (unsigned long)buf->address;
-		length		  = buf->used;
-		if (!length) {
-			DRM_ERROR("0 length buffer\n");
-		}
-		if (buf->pending) {
-			DRM_ERROR("Sending pending buffer:"
-				  " buffer %d, offset %d\n",
-				  d->send_indices[i], i);
-			retcode = -EINVAL;
-			goto cleanup;
-		}
-		if (buf->waiting) {
-			DRM_ERROR("Sending waiting buffer:"
-				  " buffer %d, offset %d\n",
-				  d->send_indices[i], i);
-			retcode = -EINVAL;
-			goto cleanup;
+	if (j & 1) 
+		OUT_RING( 0 ); 
+
+	ADVANCE_LP_RING();
+}
+
+static void i810EmitTexVerified( drm_device_t *dev, 
+				 volatile unsigned int *code ) 
+{	
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	int i, j = 0;
+	unsigned int tmp;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( I810_TEX_SETUP_SIZE );
+
+	OUT_RING( GFX_OP_MAP_INFO );
+	OUT_RING( code[I810_TEXREG_MI1] );
+	OUT_RING( code[I810_TEXREG_MI2] );
+	OUT_RING( code[I810_TEXREG_MI3] );
+
+	for ( i = 4 ; i < I810_TEX_SETUP_SIZE ; i++ ) {
+		tmp = code[i];
+
+		if ((tmp & (7<<29)) == (3<<29) &&
+		    (tmp & (0x1f<<24)) < (0x1d<<24)) 
+		{
+			OUT_RING( tmp ); 
+			j++;
 		}
-		buf->pending = 1;
+	} 
 		
-		if (dev->last_context != buf->context
-		    && !(dev->queuelist[buf->context]->flags
-			 & _DRM_CONTEXT_PRESERVED)) {
-			add_wait_queue(&dev->context_wait, &entry);
-			current->state = TASK_INTERRUPTIBLE;
-				/* PRE: dev->last_context != buf->context */
-			drm_context_switch(dev, dev->last_context,
-					   buf->context);
-				/* POST: we will wait for the context
-				   switch and will dispatch on a later call
-				   when dev->last_context == buf->context.
-				   NOTE WE HOLD THE LOCK THROUGHOUT THIS
-				   TIME! */
-			schedule();
-			current->state = TASK_RUNNING;
-			remove_wait_queue(&dev->context_wait, &entry);
-			if (signal_pending(current)) {
-				retcode = -EINTR;
-				goto cleanup;
-			}
-			if (dev->last_context != buf->context) {
-				DRM_ERROR("Context mismatch: %d %d\n",
-					  dev->last_context,
-					  buf->context);
-			}
-		}
+	if (j & 1) 
+		OUT_RING( 0 ); 
 
-#if DRM_DMA_HISTOGRAM
-		buf->time_queued     = get_cycles();
-		buf->time_dispatched = buf->time_queued;
-#endif
-		i810_dma_dispatch(dev, address, length);
-	        if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
-				  DRM_KERNEL_CONTEXT)) {
-		   DRM_ERROR("\n");
-		}
+	ADVANCE_LP_RING();
+}
 
-		atomic_add(length, &dma->total_bytes);
-		atomic_inc(&dma->total_dmas);
-		
-		if (last_buf) {
-			drm_free_buffer(dev, last_buf);
-		}
-		last_buf = buf;
+
+/* Need to do some additional checking when setting the dest buffer.
+ */
+static void i810EmitDestVerified( drm_device_t *dev, 
+				  volatile unsigned int *code ) 
+{	
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	unsigned int tmp;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( I810_DEST_SETUP_SIZE + 2 );
+
+	tmp = code[I810_DESTREG_DI1];
+	if (tmp == dev_priv->front_di1 || tmp == dev_priv->back_di1) {
+		OUT_RING( CMD_OP_DESTBUFFER_INFO );
+		OUT_RING( tmp );
+	} else
+	   DRM_DEBUG("bad di1 %x (allow %x or %x)\n",
+		     tmp, dev_priv->front_di1, dev_priv->back_di1);
+
+	/* invarient:
+	 */
+	OUT_RING( CMD_OP_Z_BUFFER_INFO );
+	OUT_RING( dev_priv->zi1 );
+
+	OUT_RING( GFX_OP_DESTBUFFER_VARS );
+	OUT_RING( code[I810_DESTREG_DV1] );
+
+	OUT_RING( GFX_OP_DRAWRECT_INFO );
+	OUT_RING( code[I810_DESTREG_DR1] );
+	OUT_RING( code[I810_DESTREG_DR2] );
+	OUT_RING( code[I810_DESTREG_DR3] );
+	OUT_RING( code[I810_DESTREG_DR4] );
+	OUT_RING( 0 );
+
+	ADVANCE_LP_RING();
+}
+
+
+
+static void i810EmitState( drm_device_t *dev )
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+      	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+
+	if (dirty & I810_UPLOAD_BUFFERS) {
+		i810EmitDestVerified( dev, sarea_priv->BufferState );
+		sarea_priv->dirty &= ~I810_UPLOAD_BUFFERS;
 	}
 
+	if (dirty & I810_UPLOAD_CTX) {
+		i810EmitContextVerified( dev, sarea_priv->ContextState );
+		sarea_priv->dirty &= ~I810_UPLOAD_CTX;
+	}
 
-cleanup:
-	if (last_buf) {
-		i810_dma_ready(dev);
-		drm_free_buffer(dev, last_buf);
+	if (dirty & I810_UPLOAD_TEX0) {
+		i810EmitTexVerified( dev, sarea_priv->TexState[0] );
+		sarea_priv->dirty &= ~I810_UPLOAD_TEX0;
 	}
-	
-	if (must_free && !dev->context_flag) {
-		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
-				  DRM_KERNEL_CONTEXT)) {
-			DRM_ERROR("\n");
-		}
+
+	if (dirty & I810_UPLOAD_TEX1) {
+		i810EmitTexVerified( dev, sarea_priv->TexState[1] );
+		sarea_priv->dirty &= ~I810_UPLOAD_TEX1;
 	}
-	clear_bit(0, &dev->interrupt_flag);
-	return retcode;
 }
+
 
-static int i810_dma_send_buffers(drm_device_t *dev, drm_dma_t *d)
+
+/* need to verify 
+ */
+static void i810_dma_dispatch_clear( drm_device_t *dev, int flags, 
+				     unsigned int clear_color,
+				     unsigned int clear_zval )
 {
-	DECLARE_WAITQUEUE(entry, current);
-	drm_buf_t	  *last_buf = NULL;
-	int		  retcode   = 0;
-	drm_device_dma_t  *dma	    = dev->dma;
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+      	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int pitch = dev_priv->pitch;
+	int cpp = 2;
+	int i;
+	RING_LOCALS;
+
+  	i810_kernel_lost_context(dev);
+
+      	if (nbox > I810_NR_SAREA_CLIPRECTS)
+     		nbox = I810_NR_SAREA_CLIPRECTS;
+
+	for (i = 0 ; i < nbox ; i++, pbox++) {
+		unsigned int x = pbox->x1;
+		unsigned int y = pbox->y1;
+		unsigned int width = (pbox->x2 - x) * cpp;
+		unsigned int height = pbox->y2 - y;
+		unsigned int start = y * pitch + x * cpp;
+
+		if (pbox->x1 > pbox->x2 ||
+		    pbox->y1 > pbox->y2 ||
+		    pbox->x2 > dev_priv->w ||
+		    pbox->y2 > dev_priv->h)
+			continue;
 
-	if (d->flags & _DRM_DMA_BLOCK) {
-		last_buf = dma->buflist[d->send_indices[d->send_count-1]];
-		add_wait_queue(&last_buf->dma_wait, &entry);
-	}
-	
-	if ((retcode = drm_dma_enqueue(dev, d))) {
-		if (d->flags & _DRM_DMA_BLOCK)
-			remove_wait_queue(&last_buf->dma_wait, &entry);
-		return retcode;
-	}
-	
-	i810_dma_schedule(dev, 0);
-	
-	if (d->flags & _DRM_DMA_BLOCK) {
-		DRM_DEBUG("%d waiting\n", current->pid);
-		current->state = TASK_INTERRUPTIBLE;
-		for (;;) {
-			if (!last_buf->waiting
-			    && !last_buf->pending)
-				break; /* finished */
-			schedule();
-			if (signal_pending(current)) {
-				retcode = -EINTR; /* Can't restart */
-				break;
-			}
+	   	if ( flags & I810_FRONT ) {	    
+		   	DRM_DEBUG("clear front\n");
+			BEGIN_LP_RING( 6 );	    
+			OUT_RING( BR00_BITBLT_CLIENT | 
+				  BR00_OP_COLOR_BLT | 0x3 );
+			OUT_RING( BR13_SOLID_PATTERN | (0xF0 << 16) | pitch );
+			OUT_RING( (height << 16) | width );
+			OUT_RING( start );
+			OUT_RING( clear_color );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
+		}
+
+		if ( flags & I810_BACK ) {
+			DRM_DEBUG("clear back\n");
+			BEGIN_LP_RING( 6 );	    
+			OUT_RING( BR00_BITBLT_CLIENT | 
+				  BR00_OP_COLOR_BLT | 0x3 );
+			OUT_RING( BR13_SOLID_PATTERN | (0xF0 << 16) | pitch );
+			OUT_RING( (height << 16) | width );
+			OUT_RING( dev_priv->back_offset + start );
+			OUT_RING( clear_color );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
+		}
+
+		if ( flags & I810_DEPTH ) {
+			DRM_DEBUG("clear depth\n");
+			BEGIN_LP_RING( 6 );	    
+			OUT_RING( BR00_BITBLT_CLIENT | 
+				  BR00_OP_COLOR_BLT | 0x3 );
+			OUT_RING( BR13_SOLID_PATTERN | (0xF0 << 16) | pitch );
+			OUT_RING( (height << 16) | width );
+			OUT_RING( dev_priv->depth_offset + start );
+			OUT_RING( clear_zval );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
 		}
-		current->state = TASK_RUNNING;
-		DRM_DEBUG("%d running\n", current->pid);
-		remove_wait_queue(&last_buf->dma_wait, &entry);
-		if (!retcode
-		    || (last_buf->list==DRM_LIST_PEND && !last_buf->pending)) {
-			if (!waitqueue_active(&last_buf->dma_wait)) {
-				drm_free_buffer(dev, last_buf);
-			}
-		}
-		if (retcode) {
-			DRM_ERROR("ctx%d w%d p%d c%d i%d l%d %d/%d\n",
-				  d->context,
-				  last_buf->waiting,
-				  last_buf->pending,
-				  DRM_WAITCOUNT(dev, d->context),
-				  last_buf->idx,
-				  last_buf->list,
-				  last_buf->pid,
-				  current->pid);
-		}
 	}
-	return retcode;
 }
 
-int i810_dma(struct inode *inode, struct file *filp, unsigned int cmd,
-	      unsigned long arg)
+static void i810_dma_dispatch_swap( drm_device_t *dev )
 {
-	drm_file_t	  *priv	    = filp->private_data;
-	drm_device_t	  *dev	    = priv->dev;
-	drm_device_dma_t  *dma	    = dev->dma;
-	int		  retcode   = 0;
-	drm_dma_t	  d;
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+      	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int pitch = dev_priv->pitch;
+	int cpp = 2;
+	int ofs = dev_priv->back_offset;
+	int i;
+	RING_LOCALS;
+
+	DRM_DEBUG("swapbuffers\n");
+
+  	i810_kernel_lost_context(dev);
+
+      	if (nbox > I810_NR_SAREA_CLIPRECTS)
+     		nbox = I810_NR_SAREA_CLIPRECTS;
+
+	for (i = 0 ; i < nbox; i++, pbox++) 
+	{
+		unsigned int w = pbox->x2 - pbox->x1;
+		unsigned int h = pbox->y2 - pbox->y1;
+		unsigned int dst = pbox->x1*cpp + pbox->y1*pitch;
+		unsigned int start = ofs + dst;
+
+		if (pbox->x1 > pbox->x2 ||
+		    pbox->y1 > pbox->y2 ||
+		    pbox->x2 > dev_priv->w ||
+		    pbox->y2 > dev_priv->h)
+			continue;
+ 
+	   	DRM_DEBUG("dispatch swap %d,%d-%d,%d!\n",
+			  pbox[i].x1, pbox[i].y1,
+			  pbox[i].x2, pbox[i].y2);
+
+		BEGIN_LP_RING( 6 );
+		OUT_RING( BR00_BITBLT_CLIENT | BR00_OP_SRC_COPY_BLT | 0x4 );
+		OUT_RING( pitch | (0xCC << 16));
+		OUT_RING( (h << 16) | (w * cpp));
+		OUT_RING( dst );
+		OUT_RING( pitch );	
+		OUT_RING( start );
+		ADVANCE_LP_RING();
+	}
+}
 
-        printk("i810_dma start\n");
-   	copy_from_user_ret(&d, (drm_dma_t *)arg, sizeof(d), -EFAULT);
-	DRM_DEBUG("%d %d: %d send, %d req\n",
-		  current->pid, d.context, d.send_count, d.request_count);
-
-	if (d.context == DRM_KERNEL_CONTEXT || d.context >= dev->queue_slots) {
-		DRM_ERROR("Process %d using context %d\n",
-			  current->pid, d.context);
-		return -EINVAL;
+
+static void i810_dma_dispatch_vertex(drm_device_t *dev, 
+				     drm_buf_t *buf,
+				     int discard,
+				     int used)
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+   	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+   	drm_clip_rect_t *box = sarea_priv->boxes;
+   	int nbox = sarea_priv->nbox;
+	unsigned long address = (unsigned long)buf->bus_address;
+	unsigned long start = address - dev->agp->base;     
+	int i = 0, u;
+   	RING_LOCALS;
+
+   	i810_kernel_lost_context(dev);
+
+   	if (nbox > I810_NR_SAREA_CLIPRECTS) 
+		nbox = I810_NR_SAREA_CLIPRECTS;
+
+	if (discard) {
+		u = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, 
+			    I810_BUF_HARDWARE);
+		if(u != I810_BUF_CLIENT) {
+			DRM_DEBUG("xxxx 2\n");
+		}
 	}
 
-	if (d.send_count < 0 || d.send_count > dma->buf_count) {
-		DRM_ERROR("Process %d trying to send %d buffers (of %d max)\n",
-			  current->pid, d.send_count, dma->buf_count);
-		return -EINVAL;
+	if (used > 4*1024) 
+		used = 0;
+
+	if (sarea_priv->dirty)
+	   i810EmitState( dev );
+
+  	DRM_DEBUG("dispatch vertex addr 0x%lx, used 0x%x nbox %d\n", 
+		  address, used, nbox);
+
+   	dev_priv->counter++;
+   	DRM_DEBUG(  "dispatch counter : %ld\n", dev_priv->counter);
+   	DRM_DEBUG(  "i810_dma_dispatch\n");
+   	DRM_DEBUG(  "start : %lx\n", start);
+	DRM_DEBUG(  "used : %d\n", used);
+   	DRM_DEBUG(  "start + used - 4 : %ld\n", start + used - 4);
+
+	if (buf_priv->currently_mapped == I810_BUF_MAPPED) {
+		*(u32 *)buf_priv->virtual = (GFX_OP_PRIMITIVE |
+					     sarea_priv->vertex_prim |
+					     ((used/4)-2));
+		
+		if (used & 4) {
+			*(u32 *)((u32)buf_priv->virtual + used) = 0;
+			used += 4;
+		}
+
+		i810_unmap_buffer(buf);
 	}
-	if (d.request_count < 0 || d.request_count > dma->buf_count) {
-		DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
-			  current->pid, d.request_count, dma->buf_count);
-		return -EINVAL;
+		   
+	if (used) {
+		do {
+			if (i < nbox) {
+				BEGIN_LP_RING(4);
+				OUT_RING( GFX_OP_SCISSOR | SC_UPDATE_SCISSOR | 
+					  SC_ENABLE );
+				OUT_RING( GFX_OP_SCISSOR_INFO );
+				OUT_RING( box[i].x1 | (box[i].y1<<16) );
+				OUT_RING( (box[i].x2-1) | ((box[i].y2-1)<<16) );
+				ADVANCE_LP_RING();
+			}
+			
+			BEGIN_LP_RING(4);
+			OUT_RING( CMD_OP_BATCH_BUFFER );
+			OUT_RING( start | BB1_PROTECTED );
+			OUT_RING( start + used - 4 );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
+			
+		} while (++i < nbox);
 	}
 
-	if (d.send_count) {
-#if 0
-		if (d.flags & _DRM_DMA_PRIORITY)
-			retcode = i810_dma_priority(dev, &d);
-		else 
-			retcode = i810_dma_send_buffers(dev, &d);
-#endif
-	   printk("i810_dma priority\n");
+	BEGIN_LP_RING(10);
+	OUT_RING( CMD_STORE_DWORD_IDX );
+	OUT_RING( 20 );
+	OUT_RING( dev_priv->counter );
+	OUT_RING( 0 );
 
-	   retcode = i810_dma_priority(dev, &d);
+	if (discard) {
+		OUT_RING( CMD_STORE_DWORD_IDX );
+		OUT_RING( buf_priv->my_use_idx );
+		OUT_RING( I810_BUF_FREE );
+		OUT_RING( 0 );
 	}
 
-	d.granted_count = 0;
+      	OUT_RING( CMD_REPORT_HEAD );
+	OUT_RING( 0 );
+   	ADVANCE_LP_RING();
+}
 
-	if (!retcode && d.request_count) {
-		retcode = drm_dma_get_buffers(dev, &d);
-	}
+
+/* Interrupts are only for flushing */
+static void i810_dma_service(int irq, void *device, struct pt_regs *regs)
+{
+	drm_device_t	 *dev = (drm_device_t *)device;
+   	u16 temp;
+   
+	atomic_inc(&dev->total_irq);
+      	temp = I810_READ16(I810REG_INT_IDENTITY_R);
+   	temp = temp & ~(0x6000);
+   	if(temp != 0) I810_WRITE16(I810REG_INT_IDENTITY_R, 
+				   temp); /* Clear all interrupts */
+	else
+	   return;
+ 
+   	queue_task(&dev->tq, &tq_immediate);
+   	mark_bh(IMMEDIATE_BH);
+}
 
-	DRM_DEBUG("%d returning, granted = %d\n",
-		  current->pid, d.granted_count);
-	copy_to_user_ret((drm_dma_t *)arg, &d, sizeof(d), -EFAULT);
+static void i810_dma_task_queue(void *device)
+{
+	drm_device_t *dev = (drm_device_t *) device;
+      	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
 
-   	printk("i810_dma end (granted)\n");
-	return retcode;
+   	atomic_set(&dev_priv->flush_done, 1);
+   	wake_up_interruptible(&dev_priv->flush_queue);
 }
 
 int i810_irq_install(drm_device_t *dev, int irq)
 {
 	int retcode;
-
+	u16 temp;
+   
 	if (!irq)     return -EINVAL;
 	
 	down(&dev->struct_sem);
@@ -591,6 +894,7 @@
 	dev->irq = irq;
 	up(&dev->struct_sem);
 	
+   	DRM_DEBUG(  "Interrupt Install : %d\n", irq);
 	DRM_DEBUG("%d\n", irq);
 
 	dev->context_flag     = 0;
@@ -603,16 +907,25 @@
 
 	dev->tq.next	      = NULL;
 	dev->tq.sync	      = 0;
-	dev->tq.routine	      = i810_dma_schedule_tq_wrapper;
+	dev->tq.routine	      = i810_dma_task_queue;
 	dev->tq.data	      = dev;
 
-
 				/* Before installing handler */
-	/* TODO */	
+   	temp = I810_READ16(I810REG_HWSTAM);
+   	temp = temp & 0x6000;
+   	I810_WRITE16(I810REG_HWSTAM, temp);
+   	
+      	temp = I810_READ16(I810REG_INT_MASK_R);
+   	temp = temp & 0x6000;
+   	I810_WRITE16(I810REG_INT_MASK_R, temp); /* Unmask interrupts */
+   	temp = I810_READ16(I810REG_INT_ENABLE_R);
+   	temp = temp & 0x6000;
+      	I810_WRITE16(I810REG_INT_ENABLE_R, temp); /* Disable all interrupts */
+
 				/* Install handler */
 	if ((retcode = request_irq(dev->irq,
 				   i810_dma_service,
-				   0,
+				   SA_SHIRQ,
 				   dev->devname,
 				   dev))) {
 		down(&dev->struct_sem);
@@ -620,32 +933,47 @@
 		up(&dev->struct_sem);
 		return retcode;
 	}
-
-				/* After installing handler */
-	/* TODO */
+   	temp = I810_READ16(I810REG_INT_ENABLE_R);
+   	temp = temp & 0x6000;
+   	temp = temp | 0x0003;
+   	I810_WRITE16(I810REG_INT_ENABLE_R, 
+		     temp); /* Enable bp & user interrupts */
 	return 0;
 }
 
 int i810_irq_uninstall(drm_device_t *dev)
 {
 	int irq;
+   	u16 temp;
+
 
+/*  	return 0; */
+
 	down(&dev->struct_sem);
 	irq	 = dev->irq;
 	dev->irq = 0;
 	up(&dev->struct_sem);
 	
 	if (!irq) return -EINVAL;
-	
+
+   	DRM_DEBUG(  "Interrupt UnInstall: %d\n", irq);	
 	DRM_DEBUG("%d\n", irq);
-	
-	/* TODO : Disable interrupts */
+   
+   	temp = I810_READ16(I810REG_INT_IDENTITY_R);
+   	temp = temp & ~(0x6000);
+   	if(temp != 0) I810_WRITE16(I810REG_INT_IDENTITY_R, 
+				   temp); /* Clear all interrupts */
+   
+   	temp = I810_READ16(I810REG_INT_ENABLE_R);
+   	temp = temp & 0x6000;
+   	I810_WRITE16(I810REG_INT_ENABLE_R, 
+		     temp);                     /* Disable all interrupts */
+
    	free_irq(irq, dev);
 
 	return 0;
 }
 
-
 int i810_control(struct inode *inode, struct file *filp, unsigned int cmd,
 		  unsigned long arg)
 {
@@ -654,8 +982,7 @@
 	drm_control_t	ctl;
 	int		retcode;
    
-   	printk(KERN_INFO "i810_control\n");
-   	i810_dma_init(dev);
+   	DRM_DEBUG(  "i810_control\n");
 
 	copy_from_user_ret(&ctl, (drm_control_t *)arg, sizeof(ctl), -EFAULT);
 	
@@ -674,20 +1001,161 @@
 	return 0;
 }
 
+static inline void i810_dma_emit_flush(drm_device_t *dev)
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+   	RING_LOCALS;
+
+   	i810_kernel_lost_context(dev);
+
+   	BEGIN_LP_RING(2);
+      	OUT_RING( CMD_REPORT_HEAD );
+      	OUT_RING( GFX_OP_USER_INTERRUPT );
+      	ADVANCE_LP_RING();
+
+/*  	i810_wait_ring( dev, dev_priv->ring.Size - 8 ); */
+/*     	atomic_set(&dev_priv->flush_done, 1); */
+/*     	wake_up_interruptible(&dev_priv->flush_queue); */
+}
+
+static inline void i810_dma_quiescent_emit(drm_device_t *dev)
+{
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+   	RING_LOCALS;
+
+  	i810_kernel_lost_context(dev);
+
+   	BEGIN_LP_RING(4);
+   	OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
+   	OUT_RING( CMD_REPORT_HEAD );
+      	OUT_RING( 0 );
+      	OUT_RING( GFX_OP_USER_INTERRUPT );
+   	ADVANCE_LP_RING();
+
+/*  	i810_wait_ring( dev, dev_priv->ring.Size - 8 ); */
+/*     	atomic_set(&dev_priv->flush_done, 1); */
+/*     	wake_up_interruptible(&dev_priv->flush_queue); */
+}
+
+static void i810_dma_quiescent(drm_device_t *dev)
+{
+      	DECLARE_WAITQUEUE(entry, current);
+  	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+	unsigned long end;      
+
+   	if(dev_priv == NULL) {
+	   	return;
+	}
+      	atomic_set(&dev_priv->flush_done, 0);
+   	current->state = TASK_INTERRUPTIBLE;
+   	add_wait_queue(&dev_priv->flush_queue, &entry);
+   	end = jiffies + (HZ*3);
+   
+   	for (;;) {
+	      	i810_dma_quiescent_emit(dev);
+	   	if (atomic_read(&dev_priv->flush_done) == 1) break;
+		if((signed)(end - jiffies) <= 0) {
+		   	DRM_ERROR("lockup\n");
+		   	break;
+		}	   
+	      	schedule_timeout(HZ*3);
+	      	if (signal_pending(current)) {
+		   	break;
+		}
+	}
+   
+   	current->state = TASK_RUNNING;
+   	remove_wait_queue(&dev_priv->flush_queue, &entry);
+   
+   	return;
+}
+
+static int i810_flush_queue(drm_device_t *dev)
+{
+   	DECLARE_WAITQUEUE(entry, current);
+  	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	unsigned long end;
+   	int i, ret = 0;      
+
+   	if(dev_priv == NULL) {
+	   	return 0;
+	}
+      	atomic_set(&dev_priv->flush_done, 0);
+   	current->state = TASK_INTERRUPTIBLE;
+   	add_wait_queue(&dev_priv->flush_queue, &entry);
+   	end = jiffies + (HZ*3);
+   	for (;;) {
+	      	i810_dma_emit_flush(dev);
+	   	if (atomic_read(&dev_priv->flush_done) == 1) break;
+		if((signed)(end - jiffies) <= 0) {
+		   	DRM_ERROR("lockup\n");
+		   	break;
+		}	   
+	      	schedule_timeout(HZ*3);
+	      	if (signal_pending(current)) {
+		   	ret = -EINTR; /* Can't restart */
+		   	break;
+		}
+	}
+   
+   	current->state = TASK_RUNNING;
+   	remove_wait_queue(&dev_priv->flush_queue, &entry);
+
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+	   
+		int used = cmpxchg(buf_priv->in_use, I810_BUF_HARDWARE, 
+				   I810_BUF_FREE);
+
+		if (used == I810_BUF_HARDWARE)
+			DRM_DEBUG("reclaimed from HARDWARE\n");
+		if (used == I810_BUF_CLIENT)
+			DRM_DEBUG("still on client HARDWARE\n");
+	}
+
+   	return ret;
+}
+
+/* Must be called with the lock held */
+void i810_reclaim_buffers(drm_device_t *dev, pid_t pid)
+{
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma) return;
+      	if (!dev->dev_private) return;
+	if (!dma->buflist) return;
+
+        i810_flush_queue(dev);
+
+	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+	   
+		if (buf->pid == pid && buf_priv) {
+			int used = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, 
+					   I810_BUF_FREE);
+
+			if (used == I810_BUF_CLIENT)
+				DRM_DEBUG("reclaimed from client\n");
+		   	if(buf_priv->currently_mapped == I810_BUF_MAPPED)
+		     		buf_priv->currently_mapped = I810_BUF_UNMAPPED;
+		}
+	}
+}
+
 int i810_lock(struct inode *inode, struct file *filp, unsigned int cmd,
 	       unsigned long arg)
 {
 	drm_file_t	  *priv	  = filp->private_data;
 	drm_device_t	  *dev	  = priv->dev;
+
 	DECLARE_WAITQUEUE(entry, current);
 	int		  ret	= 0;
 	drm_lock_t	  lock;
-	drm_queue_t	  *q;
-#if DRM_DMA_HISTOGRAM
-	cycles_t	  start;
-
-	dev->lck_start = start = get_cycles();
-#endif
 
 	copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT);
 
@@ -696,26 +1164,18 @@
 			  current->pid, lock.context);
 		return -EINVAL;
 	}
+   
+   	DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
+		  lock.context, current->pid, dev->lock.hw_lock->lock,
+		  lock.flags);
 
-	if (lock.context < 0 || lock.context >= dev->queue_count) {
+	if (lock.context < 0) {
 		return -EINVAL;
 	}
-	q = dev->queuelist[lock.context];
-	
-	ret = drm_flush_block_and_flush(dev, lock.context, lock.flags);
+	/* Only one queue:
+	 */
 
 	if (!ret) {
-		if (_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)
-		    != lock.context) {
-			long j = jiffies - dev->lock.lock_time;
-
-			if (j > 0 && j <= DRM_LOCK_SLICE) {
-				/* Can't take lock if we just had it and
-				   there is contention. */
-				current->state = TASK_INTERRUPTIBLE;
-				schedule_timeout(j);
-			}
-		}
 		add_wait_queue(&dev->lock.lock_queue, &entry);
 		for (;;) {
 			if (!dev->lock.hw_lock) {
@@ -728,13 +1188,13 @@
 				dev->lock.pid	    = current->pid;
 				dev->lock.lock_time = jiffies;
 				atomic_inc(&dev->total_locks);
-				atomic_inc(&q->total_locks);
 				break;	/* Got lock */
 			}
 			
 				/* Contention */
 			atomic_inc(&dev->total_sleeps);
 			current->state = TASK_INTERRUPTIBLE;
+		   	DRM_DEBUG("Calling lock schedule\n");
 			schedule();
 			if (signal_pending(current)) {
 				ret = -ERESTARTSYS;
@@ -744,19 +1204,153 @@
 		current->state = TASK_RUNNING;
 		remove_wait_queue(&dev->lock.lock_queue, &entry);
 	}
-
-	drm_flush_unblock(dev, lock.context, lock.flags); /* cleanup phase */
 	
 	if (!ret) {
-		if (lock.flags & _DRM_LOCK_READY)
-			i810_dma_ready(dev);
-		if (lock.flags & _DRM_LOCK_QUIESCENT)
-			i810_dma_quiescent(dev);
+		if (lock.flags & _DRM_LOCK_QUIESCENT) {
+		   DRM_DEBUG("_DRM_LOCK_QUIESCENT\n");
+		   DRM_DEBUG("fred\n");
+		   i810_dma_quiescent(dev);
+		}
+	}
+	DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
+	return ret;
+}
+
+int i810_flush_ioctl(struct inode *inode, struct file *filp, 
+		     unsigned int cmd, unsigned long arg)
+{
+   	drm_file_t	  *priv	  = filp->private_data;
+   	drm_device_t	  *dev	  = priv->dev;
+   
+   	DRM_DEBUG("i810_flush_ioctl\n");
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_flush_ioctl called without lock held\n");
+		return -EINVAL;
 	}
 
-#if DRM_DMA_HISTOGRAM
-	atomic_inc(&dev->histo.lacq[drm_histogram_slot(get_cycles() - start)]);
-#endif
+   	i810_flush_queue(dev);
+   	return 0;
+}
+
+
+int i810_dma_vertex(struct inode *inode, struct file *filp,
+	       unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+   	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+      	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) 
+     					dev_priv->sarea_priv; 
+	drm_i810_vertex_t vertex;
+
+	copy_from_user_ret(&vertex, (drm_i810_vertex_t *)arg, sizeof(vertex),
+			   -EFAULT);
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_dma_vertex called without lock held\n");
+		return -EINVAL;
+	}
+
+	DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n",
+		  vertex.idx, vertex.used, vertex.discard);
+
+	i810_dma_dispatch_vertex( dev, 
+				  dma->buflist[ vertex.idx ], 
+				  vertex.discard, vertex.used );
+
+   	atomic_add(vertex.used, &dma->total_bytes);
+	atomic_inc(&dma->total_dmas);
+	sarea_priv->last_enqueue = dev_priv->counter-1;
+   	sarea_priv->last_dispatch = (int) hw_status[5];
+   
+	return 0;
+}
+
+
+
+int i810_clear_bufs(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_i810_clear_t clear;
+
+   	copy_from_user_ret(&clear, (drm_i810_clear_t *)arg, sizeof(clear), 
+			   -EFAULT);
+   
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_clear_bufs called without lock held\n");
+		return -EINVAL;
+	}
+
+	i810_dma_dispatch_clear( dev, clear.flags, 
+				 clear.clear_color, 
+				 clear.clear_depth );
+   	return 0;
+}
+
+int i810_swap_bufs(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+   
+	DRM_DEBUG("i810_swap_bufs\n");
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_swap_buf called without lock held\n");
+		return -EINVAL;
+	}
+
+	i810_dma_dispatch_swap( dev );
+   	return 0;
+}
+
+int i810_getage(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+   	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+   	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+      	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) 
+     					dev_priv->sarea_priv; 
+
+      	sarea_priv->last_dispatch = (int) hw_status[5];
+	return 0;
+}
+
+int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	int		  retcode   = 0;
+	drm_i810_dma_t	  d;
+   	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+   	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) 
+     					dev_priv->sarea_priv; 
+
+	DRM_DEBUG("getbuf\n");
+   	copy_from_user_ret(&d, (drm_i810_dma_t *)arg, sizeof(d), -EFAULT);
+   
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_dma called without lock held\n");
+		return -EINVAL;
+	}
 	
-	return ret;
+	d.granted = 0;
+
+	retcode = i810_dma_get_buffer(dev, &d, filp);
+
+	DRM_DEBUG("i810_dma: %d returning %d, granted = %d\n",
+		  current->pid, retcode, d.granted);
+
+	copy_to_user_ret((drm_dma_t *)arg, &d, sizeof(d), -EFAULT);   
+   	sarea_priv->last_dispatch = (int) hw_status[5];
+
+	return retcode;
 }
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drm.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drm.h:1.1
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drm.h	Fri Jun 16 17:03:36 2000
@@ -0,0 +1,188 @@
+#ifndef _I810_DRM_H_
+#define _I810_DRM_H_
+
+/* WARNING: These defines must be the same as what the Xserver uses.
+ * if you change them, you must change the defines in the Xserver.
+ */
+
+#ifndef _I810_DEFINES_
+#define _I810_DEFINES_
+
+#define I810_DMA_BUF_ORDER		12
+#define I810_DMA_BUF_SZ 		(1<<I810_DMA_BUF_ORDER)
+#define I810_DMA_BUF_NR 		256
+#define I810_NR_SAREA_CLIPRECTS 	8
+
+/* Each region is a minimum of 64k, and there are at most 64 of them.
+ */
+#define I810_NR_TEX_REGIONS 64
+#define I810_LOG_MIN_TEX_REGION_SIZE 16
+#endif
+
+#define I810_UPLOAD_TEX0IMAGE  0x1 /* handled clientside */
+#define I810_UPLOAD_TEX1IMAGE  0x2 /* handled clientside */
+#define I810_UPLOAD_CTX        0x4
+#define I810_UPLOAD_BUFFERS    0x8
+#define I810_UPLOAD_TEX0       0x10
+#define I810_UPLOAD_TEX1       0x20
+#define I810_UPLOAD_CLIPRECTS  0x40
+
+
+/* Indices into buf.Setup where various bits of state are mirrored per
+ * context and per buffer.  These can be fired at the card as a unit,
+ * or in a piecewise fashion as required.
+ */
+
+/* Destbuffer state 
+ *    - backbuffer linear offset and pitch -- invarient in the current dri
+ *    - zbuffer linear offset and pitch -- also invarient
+ *    - drawing origin in back and depth buffers.
+ *
+ * Keep the depth/back buffer state here to acommodate private buffers
+ * in the future.
+ */
+#define I810_DESTREG_DI0  0	/* CMD_OP_DESTBUFFER_INFO (2 dwords) */
+#define I810_DESTREG_DI1  1
+#define I810_DESTREG_DV0  2	/* GFX_OP_DESTBUFFER_VARS (2 dwords) */
+#define I810_DESTREG_DV1  3
+#define I810_DESTREG_DR0  4	/* GFX_OP_DRAWRECT_INFO (4 dwords) */
+#define I810_DESTREG_DR1  5
+#define I810_DESTREG_DR2  6
+#define I810_DESTREG_DR3  7
+#define I810_DESTREG_DR4  8
+#define I810_DEST_SETUP_SIZE 10
+
+/* Context state
+ */
+#define I810_CTXREG_CF0   0	/* GFX_OP_COLOR_FACTOR */
+#define I810_CTXREG_CF1   1	
+#define I810_CTXREG_ST0   2     /* GFX_OP_STIPPLE */
+#define I810_CTXREG_ST1   3
+#define I810_CTXREG_VF    4	/* GFX_OP_VERTEX_FMT */
+#define I810_CTXREG_MT    5	/* GFX_OP_MAP_TEXELS */
+#define I810_CTXREG_MC0   6	/* GFX_OP_MAP_COLOR_STAGES - stage 0 */
+#define I810_CTXREG_MC1   7     /* GFX_OP_MAP_COLOR_STAGES - stage 1 */
+#define I810_CTXREG_MC2   8	/* GFX_OP_MAP_COLOR_STAGES - stage 2 */
+#define I810_CTXREG_MA0   9	/* GFX_OP_MAP_ALPHA_STAGES - stage 0 */
+#define I810_CTXREG_MA1   10	/* GFX_OP_MAP_ALPHA_STAGES - stage 1 */
+#define I810_CTXREG_MA2   11	/* GFX_OP_MAP_ALPHA_STAGES - stage 2 */
+#define I810_CTXREG_SDM   12	/* GFX_OP_SRC_DEST_MONO */
+#define I810_CTXREG_FOG   13	/* GFX_OP_FOG_COLOR */
+#define I810_CTXREG_B1    14	/* GFX_OP_BOOL_1 */
+#define I810_CTXREG_B2    15	/* GFX_OP_BOOL_2 */
+#define I810_CTXREG_LCS   16	/* GFX_OP_LINEWIDTH_CULL_SHADE_MODE */
+#define I810_CTXREG_PV    17	/* GFX_OP_PV_RULE -- Invarient! */
+#define I810_CTXREG_ZA    18	/* GFX_OP_ZBIAS_ALPHAFUNC */
+#define I810_CTXREG_AA    19	/* GFX_OP_ANTIALIAS */
+#define I810_CTX_SETUP_SIZE 20 
+
+/* Texture state (per tex unit)
+ */
+#define I810_TEXREG_MI0  0	/* GFX_OP_MAP_INFO (4 dwords) */
+#define I810_TEXREG_MI1  1	
+#define I810_TEXREG_MI2  2	
+#define I810_TEXREG_MI3  3	
+#define I810_TEXREG_MF   4	/* GFX_OP_MAP_FILTER */
+#define I810_TEXREG_MLC  5	/* GFX_OP_MAP_LOD_CTL */
+#define I810_TEXREG_MLL  6	/* GFX_OP_MAP_LOD_LIMITS */
+#define I810_TEXREG_MCS  7	/* GFX_OP_MAP_COORD_SETS ??? */
+#define I810_TEX_SETUP_SIZE 8
+
+#define I810_FRONT   0x1
+#define I810_BACK    0x2
+#define I810_DEPTH   0x4
+
+
+typedef struct _drm_i810_init {
+	enum {
+		I810_INIT_DMA = 0x01,
+		I810_CLEANUP_DMA = 0x02
+	} func;
+	int ring_map_idx;
+	int buffer_map_idx;
+	int sarea_priv_offset;
+	unsigned int ring_start;
+	unsigned int ring_end;
+	unsigned int ring_size;
+	unsigned int front_offset;
+	unsigned int back_offset;
+	unsigned int depth_offset;
+	unsigned int w;
+	unsigned int h;
+	unsigned int pitch;
+	unsigned int pitch_bits; 
+} drm_i810_init_t;
+
+/* Warning: If you change the SAREA structure you must change the Xserver
+ * structure as well */
+
+typedef struct _drm_i810_tex_region {
+	unsigned char next, prev; /* indices to form a circular LRU  */
+	unsigned char in_use;	/* owned by a client, or free? */
+	int age;		/* tracked by clients to update local LRU's */
+} drm_i810_tex_region_t;
+
+typedef struct _drm_i810_sarea {
+   	unsigned int ContextState[I810_CTX_SETUP_SIZE];
+   	unsigned int BufferState[I810_DEST_SETUP_SIZE];
+   	unsigned int TexState[2][I810_TEX_SETUP_SIZE];
+   	unsigned int dirty;
+
+	unsigned int nbox;
+	drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS];
+
+	/* Maintain an LRU of contiguous regions of texture space.  If
+	 * you think you own a region of texture memory, and it has an
+	 * age different to the one you set, then you are mistaken and
+	 * it has been stolen by another client.  If global texAge
+	 * hasn't changed, there is no need to walk the list.
+	 *
+	 * These regions can be used as a proxy for the fine-grained
+	 * texture information of other clients - by maintaining them
+	 * in the same lru which is used to age their own textures,
+	 * clients have an approximate lru for the whole of global
+	 * texture space, and can make informed decisions as to which
+	 * areas to kick out.  There is no need to choose whether to
+	 * kick out your own texture or someone else's - simply eject
+	 * them all in LRU order.  
+	 */
+   
+	drm_i810_tex_region_t texList[I810_NR_TEX_REGIONS+1]; 
+				/* Last elt is sentinal */
+        int texAge;		/* last time texture was uploaded */
+        int last_enqueue;	/* last time a buffer was enqueued */
+	int last_dispatch;	/* age of the most recently dispatched buffer */
+	int last_quiescent;     /*  */
+	int ctxOwner;		/* last context to upload state */
+
+	int vertex_prim;
+
+} drm_i810_sarea_t;
+
+typedef struct _drm_i810_clear {
+	int clear_color;
+	int clear_depth;
+	int flags;
+} drm_i810_clear_t;
+
+
+
+/* These may be placeholders if we have more cliprects than
+ * I810_NR_SAREA_CLIPRECTS.  In that case, the client sets discard to
+ * false, indicating that the buffer will be dispatched again with a
+ * new set of cliprects.
+ */
+typedef struct _drm_i810_vertex {
+   	int idx;		/* buffer index */
+	int used;		/* nr bytes in use */
+	int discard;		/* client is finished with the buffer? */
+} drm_i810_vertex_t;
+
+typedef struct drm_i810_dma {
+	void *virtual;
+	int request_idx;
+	int request_size;
+	int granted;
+} drm_i810_dma_t;
+
+#endif /* _I810_DRM_H_ */
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c:1.1	Fri Feb 11 09:26:05 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c	Fri Jun 16 17:03:36 2000
@@ -2,6 +2,7 @@
  * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
  * 
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,25 +24,26 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
- *	    Jeff Hartmann <jhartmann@precisioninsight.com>
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c,v 1.1 2000/02/11 17:26:05 dawes Exp $
- *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "i810_drv.h"
+
+
 EXPORT_SYMBOL(i810_init);
 EXPORT_SYMBOL(i810_cleanup);
 
 #define I810_NAME	 "i810"
-#define I810_DESC	 "Matrox g200/g400"
+#define I810_DESC	 "Intel I810"
 #define I810_DATE	 "19991213"
-#define I810_MAJOR	 0
+#define I810_MAJOR	 1
 #define I810_MINOR	 0
-#define I810_PATCHLEVEL	 1
+#define I810_PATCHLEVEL	 0
 
 static drm_device_t	      i810_device;
 drm_ctx_t		      i810_res_ctx;
@@ -54,6 +56,7 @@
 	mmap:	 drm_mmap,
 	read:	 drm_read,
 	fasync:	 drm_fasync,
+      	poll:	 drm_poll,
 };
 
 static struct miscdevice      i810_misc = {
@@ -77,21 +80,18 @@
 	[DRM_IOCTL_NR(DRM_IOCTL_ADD_BUFS)]    = { i810_addbufs,	  1, 1 },
 	[DRM_IOCTL_NR(DRM_IOCTL_MARK_BUFS)]   = { i810_markbufs,  1, 1 },
 	[DRM_IOCTL_NR(DRM_IOCTL_INFO_BUFS)]   = { i810_infobufs,  1, 0 },
-	[DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS)]    = { i810_mapbufs,	  1, 0 },
 	[DRM_IOCTL_NR(DRM_IOCTL_FREE_BUFS)]   = { i810_freebufs,  1, 0 },
 
-	[DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)]     = { drm_addctx,	  1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)]      = { drm_rmctx,	  1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)]     = { drm_modctx,	  1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)]     = { drm_getctx,	  1, 0 },
-	[DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)]  = { drm_switchctx,  1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)]     = { drm_newctx,	  1, 1 },
-	[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)]     = { drm_resctx,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)]     = { i810_addctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)]      = { i810_rmctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)]     = { i810_modctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)]     = { i810_getctx,	  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)]  = { i810_switchctx,  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)]     = { i810_newctx,	  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)]     = { i810_resctx,	  1, 0 },
 	[DRM_IOCTL_NR(DRM_IOCTL_ADD_DRAW)]    = { drm_adddraw,	  1, 1 },
 	[DRM_IOCTL_NR(DRM_IOCTL_RM_DRAW)]     = { drm_rmdraw,	  1, 1 },
 
-	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	      = { i810_dma,	  1, 0 },
-
 	[DRM_IOCTL_NR(DRM_IOCTL_LOCK)]	      = { i810_lock,	  1, 0 },
 	[DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)]      = { i810_unlock,	  1, 0 },
 	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]      = { drm_finish,	  1, 0 },
@@ -104,6 +104,14 @@
 	[DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)]    = { drm_agp_free,    1, 1 },
 	[DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)]    = { drm_agp_bind,    1, 1 },
 	[DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)]  = { drm_agp_unbind,  1, 1 },
+
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_INIT)]   = { i810_dma_init,   1, 1 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_VERTEX)] = { i810_dma_vertex, 1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_CLEAR)]  = { i810_clear_bufs, 1, 0 },
+      	[DRM_IOCTL_NR(DRM_IOCTL_I810_FLUSH)]  = { i810_flush_ioctl,1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_GETAGE)] = { i810_getage,     1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_GETBUF)] = { i810_getbuf,     1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_SWAP)]   = { i810_swap_bufs,  1, 0 },
 };
 
 #define I810_IOCTL_COUNT DRM_ARRAY_SIZE(i810_ioctls)
@@ -121,7 +129,7 @@
 
 int init_module(void)
 {
-	printk("doing i810_init()\n");
+	DRM_DEBUG("doing i810_init()\n");
 	return i810_init();
 }
 
@@ -364,7 +372,7 @@
 #ifdef MODULE
 	drm_parse_options(i810);
 #endif
-	printk("doing misc_register\n");
+	DRM_DEBUG("doing misc_register\n");
 	if ((retcode = misc_register(&i810_misc))) {
 		DRM_ERROR("Cannot register \"%s\"\n", I810_NAME);
 		return retcode;
@@ -372,13 +380,22 @@
 	dev->device = MKDEV(MISC_MAJOR, i810_misc.minor);
 	dev->name   = I810_NAME;
 
-   	printk("doing mem init\n");
+   	DRM_DEBUG("doing mem init\n");
 	drm_mem_init();
-	printk("doing proc init\n");
+	DRM_DEBUG("doing proc init\n");
 	drm_proc_init(dev);
-	printk("doing agp init\n");
+	DRM_DEBUG("doing agp init\n");
 	dev->agp    = drm_agp_init();
-	printk("doing ctxbitmap init\n");
+   	if(dev->agp == NULL) {
+	   	DRM_INFO("The i810 drm module requires the agpgart module"
+			 " to function correctly\nPlease load the agpgart"
+			 " module before you load the i810 module\n");
+	   	drm_proc_cleanup();
+	   	misc_deregister(&i810_misc);
+	   	i810_takedown(dev);
+	   	return -ENOMEM;
+	}
+	DRM_DEBUG("doing ctxbitmap init\n");
 	if((retcode = drm_ctxbitmap_init(dev))) {
 		DRM_ERROR("Cannot allocate memory for context bitmap.\n");
 		drm_proc_cleanup();
@@ -386,10 +403,6 @@
 		i810_takedown(dev);
 		return retcode;
 	}
-#if 0
-	printk("doing i810_dma_init\n");
-	i810_dma_init(dev);
-#endif
 
 	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
 		 I810_NAME,
@@ -417,7 +430,6 @@
 		DRM_INFO("Module unloaded\n");
 	}
 	drm_ctxbitmap_cleanup(dev);
-	i810_dma_cleanup(dev);
 	i810_takedown(dev);
 	if (dev->agp) {
 		drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
@@ -484,24 +496,82 @@
 	drm_device_t  *dev    = priv->dev;
 	int	      retcode = 0;
 
-	DRM_DEBUG("open_count = %d\n", dev->open_count);
-	if (!(retcode = drm_release(inode, filp))) {
-		MOD_DEC_USE_COUNT;
-		atomic_inc(&dev->total_close);
-		spin_lock(&dev->count_lock);
-		if (!--dev->open_count) {
-			if (atomic_read(&dev->ioctl_count) || dev->blocked) {
-				DRM_ERROR("Device busy: %d %d\n",
-					  atomic_read(&dev->ioctl_count),
-					  dev->blocked);
-				spin_unlock(&dev->count_lock);
-				return -EBUSY;
+	DRM_DEBUG("pid = %d, device = 0x%x, open_count = %d\n",
+		  current->pid, dev->device, dev->open_count);
+
+	if (dev->lock.hw_lock && _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)
+	    && dev->lock.pid == current->pid) {
+	      	i810_reclaim_buffers(dev, priv->pid);
+		DRM_ERROR("Process %d dead, freeing lock for context %d\n",
+			  current->pid,
+			  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		drm_lock_free(dev,
+			      &dev->lock.hw_lock->lock,
+			      _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		
+				/* FIXME: may require heavy-handed reset of
+                                   hardware at this point, possibly
+                                   processed via a callback to the X
+                                   server. */
+	} else if (dev->lock.hw_lock) {
+	   	/* The lock is required to reclaim buffers */
+	   	DECLARE_WAITQUEUE(entry, current);
+	   	add_wait_queue(&dev->lock.lock_queue, &entry);
+		for (;;) {
+			if (!dev->lock.hw_lock) {
+				/* Device has been unregistered */
+				retcode = -EINTR;
+				break;
 			}
-			spin_unlock(&dev->count_lock);
-			return i810_takedown(dev);
+			if (drm_lock_take(&dev->lock.hw_lock->lock,
+					  DRM_KERNEL_CONTEXT)) {
+				dev->lock.pid	    = priv->pid;
+				dev->lock.lock_time = jiffies;
+				atomic_inc(&dev->total_locks);
+				break;	/* Got lock */
+			}			
+				/* Contention */
+			atomic_inc(&dev->total_sleeps);
+			current->state = TASK_INTERRUPTIBLE;
+			schedule();
+			if (signal_pending(current)) {
+				retcode = -ERESTARTSYS;
+				break;
+			}
 		}
-		spin_unlock(&dev->count_lock);
+		current->state = TASK_RUNNING;
+		remove_wait_queue(&dev->lock.lock_queue, &entry);
+	   	if(!retcode) {
+		   	i810_reclaim_buffers(dev, priv->pid);
+		   	drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				      DRM_KERNEL_CONTEXT);
+		}
+	}
+	drm_fasync(-1, filp, 0);
+
+	down(&dev->struct_sem);
+	if (priv->prev) priv->prev->next = priv->next;
+	else		dev->file_first	 = priv->next;
+	if (priv->next) priv->next->prev = priv->prev;
+	else		dev->file_last	 = priv->prev;
+	up(&dev->struct_sem);
+	
+	drm_free(priv, sizeof(*priv), DRM_MEM_FILES);
+   	MOD_DEC_USE_COUNT;
+   	atomic_inc(&dev->total_close);
+   	spin_lock(&dev->count_lock);
+   	if (!--dev->open_count) {
+	   	if (atomic_read(&dev->ioctl_count) || dev->blocked) {
+		   	DRM_ERROR("Device busy: %d %d\n",
+				  atomic_read(&dev->ioctl_count),
+				  dev->blocked);
+		   	spin_unlock(&dev->count_lock);
+		   	return -EBUSY;
+		}
+	   	spin_unlock(&dev->count_lock);
+	   	return i810_takedown(dev);
 	}
+   	spin_unlock(&dev->count_lock);
 	return retcode;
 }
 
@@ -566,8 +636,7 @@
 	atomic_inc(&dev->total_unlocks);
 	if (_DRM_LOCK_IS_CONT(dev->lock.hw_lock->lock))
 		atomic_inc(&dev->total_contends);
-	drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
-	i810_dma_schedule(dev, 1);
+   	drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
 	if (!dev->context_flag) {
 		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
 				  DRM_KERNEL_CONTEXT)) {
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h:1.1	Fri Feb 11 09:26:05 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h	Fri Jun 16 17:03:36 2000
@@ -2,6 +2,7 @@
  * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,15 +24,58 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
- * 	    Jeff Hartmann <jhartmann@precisioninsight.com>
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ * 	    Jeff Hartmann <jhartmann@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h,v 1.1 2000/02/11 17:26:05 dawes Exp $
  */
 
 #ifndef _I810_DRV_H_
 #define _I810_DRV_H_
 
+typedef struct drm_i810_buf_priv {
+   	u32 *in_use;
+   	int my_use_idx;
+	int currently_mapped;
+	void *virtual;
+	void *kernel_virtual;
+	int map_count;
+   	struct vm_area_struct *vma;
+} drm_i810_buf_priv_t;
+
+typedef struct _drm_i810_ring_buffer{
+	int tail_mask;
+	unsigned long Start;
+	unsigned long End;
+	unsigned long Size;
+	u8 *virtual_start;
+	int head;
+	int tail;
+	int space;
+} drm_i810_ring_buffer_t;
+
+typedef struct drm_i810_private {
+   	int ring_map_idx;
+   	int buffer_map_idx;
+
+   	drm_i810_ring_buffer_t ring;
+	drm_i810_sarea_t *sarea_priv;
+
+      	unsigned long hw_status_page;
+   	unsigned long counter;
+
+   	atomic_t flush_done;
+   	wait_queue_head_t flush_queue;	/* Processes waiting until flush    */
+	drm_buf_t *mmap_buffer;
+
+	
+	u32 front_di1, back_di1, zi1;
+	
+	int back_offset;
+	int depth_offset;
+	int w, h;
+	int pitch;
+} drm_i810_private_t;
+
 				/* i810_drv.c */
 extern int  i810_init(void);
 extern void i810_cleanup(void);
@@ -46,16 +90,22 @@
 
 				/* i810_dma.c */
 extern int  i810_dma_schedule(drm_device_t *dev, int locked);
-extern int  i810_dma(struct inode *inode, struct file *filp,
-		      unsigned int cmd, unsigned long arg);
+extern int  i810_getbuf(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
 extern int  i810_irq_install(drm_device_t *dev, int irq);
 extern int  i810_irq_uninstall(drm_device_t *dev);
 extern int  i810_control(struct inode *inode, struct file *filp,
 			  unsigned int cmd, unsigned long arg);
 extern int  i810_lock(struct inode *inode, struct file *filp,
 		       unsigned int cmd, unsigned long arg);
-extern void i810_dma_init(drm_device_t *dev);
-extern void i810_dma_cleanup(drm_device_t *dev);
+extern int  i810_dma_init(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+extern int  i810_flush_ioctl(struct inode *inode, struct file *filp,
+			     unsigned int cmd, unsigned long arg);
+extern void i810_reclaim_buffers(drm_device_t *dev, pid_t pid);
+extern int  i810_getage(struct inode *inode, struct file *filp, unsigned int cmd,
+			unsigned long arg);
+extern int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma);
 
 
 				/* i810_bufs.c */
@@ -67,10 +117,108 @@
 			 unsigned int cmd, unsigned long arg);
 extern int  i810_freebufs(struct inode *inode, struct file *filp,
 			 unsigned int cmd, unsigned long arg);
-extern int  i810_mapbufs(struct inode *inode, struct file *filp,
-			unsigned int cmd, unsigned long arg);
 extern int  i810_addmap(struct inode *inode, struct file *filp,
 		       unsigned int cmd, unsigned long arg);
 
+				/* i810_context.c */
+extern int  i810_resctx(struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg);
+extern int  i810_addctx(struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg);
+extern int  i810_modctx(struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg);
+extern int  i810_getctx(struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg);
+extern int  i810_switchctx(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+extern int  i810_newctx(struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg);
+extern int  i810_rmctx(struct inode *inode, struct file *filp,
+		      unsigned int cmd, unsigned long arg);
+
+extern int  i810_context_switch(drm_device_t *dev, int old, int new);
+extern int  i810_context_switch_complete(drm_device_t *dev, int new);
+
+#define I810_VERBOSE 0
+
 
+int i810_dma_vertex(struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg);
+
+int i810_swap_bufs(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg);
+
+int i810_clear_bufs(struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg);
+
+#define GFX_OP_USER_INTERRUPT 		((0<<29)|(2<<23))
+#define GFX_OP_BREAKPOINT_INTERRUPT	((0<<29)|(1<<23))
+#define CMD_REPORT_HEAD			(7<<23)
+#define CMD_STORE_DWORD_IDX		((0x21<<23) | 0x1)
+#define CMD_OP_BATCH_BUFFER  ((0x0<<29)|(0x30<<23)|0x1)
+
+#define INST_PARSER_CLIENT   0x00000000
+#define INST_OP_FLUSH        0x02000000
+#define INST_FLUSH_MAP_CACHE 0x00000001
+
+
+#define BB1_START_ADDR_MASK   (~0x7)
+#define BB1_PROTECTED         (1<<0)
+#define BB1_UNPROTECTED       (0<<0)
+#define BB2_END_ADDR_MASK     (~0x7)
+
+#define I810REG_HWSTAM		0x02098
+#define I810REG_INT_IDENTITY_R	0x020a4
+#define I810REG_INT_MASK_R 	0x020a8
+#define I810REG_INT_ENABLE_R	0x020a0
+
+#define LP_RING     		0x2030
+#define HP_RING     		0x2040
+#define RING_TAIL      		0x00
+#define TAIL_ADDR		0x000FFFF8
+#define RING_HEAD      		0x04
+#define HEAD_WRAP_COUNT     	0xFFE00000
+#define HEAD_WRAP_ONE       	0x00200000
+#define HEAD_ADDR           	0x001FFFFC
+#define RING_START     		0x08
+#define START_ADDR          	0x00FFFFF8
+#define RING_LEN       		0x0C
+#define RING_NR_PAGES       	0x000FF000 
+#define RING_REPORT_MASK    	0x00000006
+#define RING_REPORT_64K     	0x00000002
+#define RING_REPORT_128K    	0x00000004
+#define RING_NO_REPORT      	0x00000000
+#define RING_VALID_MASK     	0x00000001
+#define RING_VALID          	0x00000001
+#define RING_INVALID        	0x00000000
+
+#define GFX_OP_SCISSOR         ((0x3<<29)|(0x1c<<24)|(0x10<<19))
+#define SC_UPDATE_SCISSOR       (0x1<<1)
+#define SC_ENABLE_MASK          (0x1<<0)
+#define SC_ENABLE               (0x1<<0)
+
+#define GFX_OP_SCISSOR_INFO    ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1))
+#define SCI_YMIN_MASK      (0xffff<<16)
+#define SCI_XMIN_MASK      (0xffff<<0)
+#define SCI_YMAX_MASK      (0xffff<<16)
+#define SCI_XMAX_MASK      (0xffff<<0)
+
+#define GFX_OP_COLOR_FACTOR      ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0)
+#define GFX_OP_STIPPLE           ((0x3<<29)|(0x1d<<24)|(0x83<<16))
+#define GFX_OP_MAP_INFO          ((0x3<<29)|(0x1d<<24)|0x2)
+#define GFX_OP_DESTBUFFER_VARS   ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0)
+#define GFX_OP_DRAWRECT_INFO     ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3))
+#define GFX_OP_PRIMITIVE         ((0x3<<29)|(0x1f<<24))
+
+#define CMD_OP_Z_BUFFER_INFO     ((0x0<<29)|(0x16<<23))
+#define CMD_OP_DESTBUFFER_INFO   ((0x0<<29)|(0x15<<23))
+
+#define BR00_BITBLT_CLIENT   0x40000000
+#define BR00_OP_COLOR_BLT    0x10000000
+#define BR00_OP_SRC_COPY_BLT 0x10C00000
+#define BR13_SOLID_PATTERN   0x80000000
+
+
+
 #endif
+
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c:1.2	Tue Feb 22 20:47:29 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c	Fri Jun 16 17:03:36 2000
@@ -1,8 +1,8 @@
 /* init.c -- Setup/Cleanup for DRM -*- linux-c -*-
  * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
- * Revised: Fri Aug 20 09:27:02 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c,v 1.2 2000/02/23 04:47:29 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
@@ -34,7 +35,7 @@
 int			      drm_flags		= 0;
 
 /* drm_parse_option parses a single option.  See description for
-   drm_parse_drm for details. */
+   drm_parse_options for details. */
 
 static void drm_parse_option(char *s)
 {
@@ -96,3 +97,10 @@
 	}
 }
 
+int drm_cpu_valid(void)
+{
+#if defined(__i386__)
+	if (boot_cpu_data.x86 == 3) return 0; /* No cmpxchg on a 386 */
+#endif
+	return 1;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ioctl.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ioctl.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ioctl.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ioctl.c:1.2	Tue Feb 22 20:47:29 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ioctl.c	Fri Jun 16 17:03:36 2000
@@ -1,8 +1,8 @@
 /* ioctl.c -- IOCTL processing for DRM -*- linux-c -*-
  * Created: Fri Jan  8 09:01:26 1999 by faith@precisioninsight.com
- * Revised: Fri Aug 20 09:27:02 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/ioctl.c,v 1.2 2000/02/23 04:47:29 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c:1.6 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c:1.7
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c:1.6	Tue Feb 22 20:56:42 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c	Fri Jun 16 17:03:36 2000
@@ -1,8 +1,8 @@
 /* lists.c -- Buffer list handling routines -*- linux-c -*-
  * Created: Mon Apr 19 20:54:22 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:37:52 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c,v 1.6 2000/02/23 04:56:42 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c:1.5	Tue Feb 22 20:47:29 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c	Fri Jun 16 17:03:36 2000
@@ -1,8 +1,8 @@
 /* lock.c -- IOCTLs for locking -*- linux-c -*-
  * Created: Tue Feb  2 08:37:54 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:38:25 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lock.c,v 1.5 2000/02/23 04:47:29 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c:1.5	Tue Feb 22 20:47:30 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c	Fri Jun 16 17:03:36 2000
@@ -1,8 +1,8 @@
 /* memory.c -- Memory management wrappers for DRM -*- linux-c -*-
  * Created: Thu Feb  4 14:00:34 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:39:37 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c,v 1.5 2000/02/23 04:47:30 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
@@ -44,21 +45,25 @@
 static unsigned long	  drm_ram_available = 0; /* In pages */
 static unsigned long	  drm_ram_used	    = 0;
 static drm_mem_stats_t	  drm_mem_stats[]   = {
-	[DRM_MEM_DMA]	   = { "dmabufs"  },
-	[DRM_MEM_SAREA]	   = { "sareas"	  },
-	[DRM_MEM_DRIVER]   = { "driver"	  },
-	[DRM_MEM_MAGIC]	   = { "magic"	  },
-	[DRM_MEM_IOCTLS]   = { "ioctltab" },
-	[DRM_MEM_MAPS]	   = { "maplist"  },
-	[DRM_MEM_VMAS]	   = { "vmalist"  },
-	[DRM_MEM_BUFS]	   = { "buflist"  },
-	[DRM_MEM_SEGS]	   = { "seglist"  },
-	[DRM_MEM_PAGES]	   = { "pagelist" },
-	[DRM_MEM_FILES]	   = { "files"	  },
-	[DRM_MEM_QUEUES]   = { "queues"	  },
-	[DRM_MEM_CMDS]	   = { "commands" },
-	[DRM_MEM_MAPPINGS] = { "mappings" },
-	[DRM_MEM_BUFLISTS] = { "buflists" },
+	[DRM_MEM_DMA]	    = { "dmabufs"  },
+	[DRM_MEM_SAREA]	    = { "sareas"   },
+	[DRM_MEM_DRIVER]    = { "driver"   },
+	[DRM_MEM_MAGIC]	    = { "magic"	   },
+	[DRM_MEM_IOCTLS]    = { "ioctltab" },
+	[DRM_MEM_MAPS]	    = { "maplist"  },
+	[DRM_MEM_VMAS]	    = { "vmalist"  },
+	[DRM_MEM_BUFS]	    = { "buflist"  },
+	[DRM_MEM_SEGS]	    = { "seglist"  },
+	[DRM_MEM_PAGES]	    = { "pagelist" },
+	[DRM_MEM_FILES]	    = { "files"	   },
+	[DRM_MEM_QUEUES]    = { "queues"   },
+	[DRM_MEM_CMDS]	    = { "commands" },
+	[DRM_MEM_MAPPINGS]  = { "mappings" },
+	[DRM_MEM_BUFLISTS]  = { "buflists" },
+	[DRM_MEM_AGPLISTS]  = { "agplist"  },
+	[DRM_MEM_TOTALAGP]  = { "totalagp" },
+	[DRM_MEM_BOUNDAGP]  = { "boundagp" },
+	[DRM_MEM_CTXBITMAP] = { "ctxbitmap"},
 	{ NULL, 0, }		/* Last entry must be null */
 };
 
@@ -324,3 +329,120 @@
 			      free_count, alloc_count);
 	}
 }
+
+#ifdef DRM_AGP
+agp_memory *drm_alloc_agp(int pages, u32 type)
+{
+	agp_memory *handle;
+
+	if (!pages) {
+		DRM_MEM_ERROR(DRM_MEM_TOTALAGP, "Allocating 0 pages\n");
+		return NULL;
+	}
+	
+	if (drm_agp.allocate_memory) {
+		if ((handle = (*drm_agp.allocate_memory)(pages,
+							 type))) {
+			spin_lock(&drm_mem_lock);
+			++drm_mem_stats[DRM_MEM_TOTALAGP].succeed_count;
+			drm_mem_stats[DRM_MEM_TOTALAGP].bytes_allocated
+				+= pages << PAGE_SHIFT;
+			spin_unlock(&drm_mem_lock);
+			return handle;
+		}
+	}
+	spin_lock(&drm_mem_lock);
+	++drm_mem_stats[DRM_MEM_TOTALAGP].fail_count;
+	spin_unlock(&drm_mem_lock);
+	return NULL;
+}
+
+int drm_free_agp(agp_memory *handle, int pages)
+{
+	int           alloc_count;
+	int           free_count;
+	int           retval = -EINVAL;
+
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
+			      "Attempt to free NULL AGP handle\n");
+		return retval;;
+	}
+	
+	if (drm_agp.free_memory) {
+		(*drm_agp.free_memory)(handle);
+		spin_lock(&drm_mem_lock);
+		free_count  = ++drm_mem_stats[DRM_MEM_TOTALAGP].free_count;
+		alloc_count =   drm_mem_stats[DRM_MEM_TOTALAGP].succeed_count;
+		drm_mem_stats[DRM_MEM_TOTALAGP].bytes_freed
+			+= pages << PAGE_SHIFT;
+		spin_unlock(&drm_mem_lock);
+		if (free_count > alloc_count) {
+			DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
+				      "Excess frees: %d frees, %d allocs\n",
+				      free_count, alloc_count);
+		}
+		return 0;
+	}
+	return retval;
+}
+
+int drm_bind_agp(agp_memory *handle, unsigned int start)
+{
+	int retcode = -EINVAL;
+
+   DRM_DEBUG("drm_bind_agp called\n");
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+			      "Attempt to bind NULL AGP handle\n");
+		return retcode;
+	}
+
+   DRM_DEBUG("drm_agp.bind_memory : %p\n", drm_agp.bind_memory);
+	if (drm_agp.bind_memory) {
+		if (!(retcode = (*drm_agp.bind_memory)(handle, start))) {
+			spin_lock(&drm_mem_lock);
+			++drm_mem_stats[DRM_MEM_BOUNDAGP].succeed_count;
+			drm_mem_stats[DRM_MEM_BOUNDAGP].bytes_allocated
+				+= handle->page_count << PAGE_SHIFT;
+			spin_unlock(&drm_mem_lock);
+		   DRM_DEBUG("drm_agp.bind_memory: retcode %d\n", retcode);
+			return retcode;
+		}
+	}
+	spin_lock(&drm_mem_lock);
+	++drm_mem_stats[DRM_MEM_BOUNDAGP].fail_count;
+	spin_unlock(&drm_mem_lock);
+	return retcode;
+}
+
+int drm_unbind_agp(agp_memory *handle)
+{
+	int alloc_count;
+	int free_count;
+	int retcode = -EINVAL;
+	
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+			      "Attempt to unbind NULL AGP handle\n");
+		return retcode;
+	}
+
+	if (drm_agp.unbind_memory) {
+		int c = handle->page_count;
+		if ((retcode = (*drm_agp.unbind_memory)(handle)))
+			return retcode;
+		spin_lock(&drm_mem_lock);
+		free_count  = ++drm_mem_stats[DRM_MEM_BOUNDAGP].free_count;
+		alloc_count = drm_mem_stats[DRM_MEM_BOUNDAGP].succeed_count;
+		drm_mem_stats[DRM_MEM_BOUNDAGP].bytes_freed += c << PAGE_SHIFT;
+		spin_unlock(&drm_mem_lock);
+		if (free_count > alloc_count) {
+			DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+				      "Excess frees: %d frees, %d allocs\n",
+				      free_count, alloc_count);
+		}
+	}
+	return retcode;
+}
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_bufs.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_bufs.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_bufs.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_bufs.c:1.1	Fri Feb 11 09:26:06 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_bufs.c	Fri Jun 16 17:03:36 2000
@@ -2,6 +2,7 @@
  * Created: Thu Jan 6 01:47:26 2000 by jhartmann@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,179 +24,176 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
- *	    Jeff Hartmann <jhartmann@precisioninsight.com>
- * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_bufs.c,v 1.1 2000/02/11 17:26:06 dawes Exp $
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
  *
  */
 
 #define __NO_VERSION__
 #include "drmP.h"
 #include "mga_drv.h"
-#include "mga_dma.h"
 #include "linux/un.h"
 
 
 int mga_addbufs_agp(struct inode *inode, struct file *filp, unsigned int cmd,
 		    unsigned long arg)
 {
-   drm_file_t *priv = filp->private_data;
-   drm_device_t *dev = priv->dev;
-   drm_device_dma_t *dma = dev->dma;
-   drm_buf_desc_t request;
-   drm_buf_entry_t *entry;
-   drm_buf_t *buf;
-   unsigned long offset;
-   unsigned long agp_offset;
-   int count;
-   int order;
-   int size;
-   int alignment;
-   int page_order;
-   int total;
-   int byte_count;
-   int i;
-
-   if (!dma) return -EINVAL;
-
-   copy_from_user_ret(&request,
-		      (drm_buf_desc_t *)arg,
-		      sizeof(request),
-		      -EFAULT);
-
-   count = request.count;
-   order = drm_order(request.size);
-   size	= 1 << order;
-   agp_offset = request.agp_start;
-   alignment  = (request.flags & _DRM_PAGE_ALIGN) ? PAGE_ALIGN(size) :size;
-   page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
-   total = PAGE_SIZE << page_order;
-   byte_count = 0;
-
-   DRM_DEBUG("count: %d\n", count);
-   DRM_DEBUG("order: %d\n", order);
-   DRM_DEBUG("size: %d\n", size);
-   DRM_DEBUG("agp_offset: %d\n", agp_offset);
-   DRM_DEBUG("alignment: %d\n", alignment);
-   DRM_DEBUG("page_order: %d\n", page_order);
-   DRM_DEBUG("total: %d\n", total);
-   DRM_DEBUG("byte_count: %d\n", byte_count);
-
-   if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL;
-   if (dev->queue_count) return -EBUSY; /* Not while in use */
-   spin_lock(&dev->count_lock);
-   if (dev->buf_use) {
-      spin_unlock(&dev->count_lock);
-      return -EBUSY;
-   }
-   atomic_inc(&dev->buf_alloc);
-   spin_unlock(&dev->count_lock);
-   
-   down(&dev->struct_sem);
-   entry = &dma->bufs[order];
-   if (entry->buf_count) {
-      up(&dev->struct_sem);
-      atomic_dec(&dev->buf_alloc);
-      return -ENOMEM; /* May only call once for each order */
-   }
-   
-   entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
-			      DRM_MEM_BUFS);
-   if (!entry->buflist) {
-      up(&dev->struct_sem);
-      atomic_dec(&dev->buf_alloc);
-      return -ENOMEM;
-   }
-   memset(entry->buflist, 0, count * sizeof(*entry->buflist));
-   
-   entry->buf_size   = size;
-   entry->page_order = page_order;
-   offset = 0;
-
-   
-   while(entry->buf_count < count) {
-      buf = &entry->buflist[entry->buf_count];
-      buf->idx = dma->buf_count + entry->buf_count;
-      buf->total = alignment;
-      buf->order = order;
-      buf->used = 0;
-
-      DRM_DEBUG("offset : %d\n", offset);
-
-      buf->offset = offset; /* Hrm */
-      buf->bus_address = dev->agp->base + agp_offset + offset;
-      buf->address = (void *)(agp_offset + offset + dev->agp->base);
-      buf->next = NULL;
-      buf->waiting = 0;
-      buf->pending = 0;
-      init_waitqueue_head(&buf->dma_wait);
-      buf->pid = 0;
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_desc_t request;
+	drm_buf_entry_t *entry;
+	drm_buf_t *buf;
+	unsigned long offset;
+	unsigned long agp_offset;
+	int count;
+	int order;
+	int size;
+	int alignment;
+	int page_order;
+	int total;
+	int byte_count;
+	int i;
+
+	if (!dma) return -EINVAL;
+
+	copy_from_user_ret(&request,
+			   (drm_buf_desc_t *)arg,
+			   sizeof(request),
+			   -EFAULT);
+
+	count = request.count;
+	order = drm_order(request.size);
+	size	= 1 << order;
+	agp_offset = request.agp_start;
+	alignment  = (request.flags & _DRM_PAGE_ALIGN) ? PAGE_ALIGN(size) :size;
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total = PAGE_SIZE << page_order;
+	byte_count = 0;
+
+	DRM_DEBUG("count: %d\n", count);
+	DRM_DEBUG("order: %d\n", order);
+	DRM_DEBUG("size: %d\n", size);
+	DRM_DEBUG("agp_offset: %ld\n", agp_offset);
+	DRM_DEBUG("alignment: %d\n", alignment);
+	DRM_DEBUG("page_order: %d\n", page_order);
+	DRM_DEBUG("total: %d\n", total);
+	DRM_DEBUG("byte_count: %d\n", byte_count);
+
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL;
+	if (dev->queue_count) return -EBUSY; /* Not while in use */
+	spin_lock(&dev->count_lock);
+	if (dev->buf_use) {
+		spin_unlock(&dev->count_lock);
+		return -EBUSY;
+	}
+	atomic_inc(&dev->buf_alloc);
+	spin_unlock(&dev->count_lock);
+   
+	down(&dev->struct_sem);
+	entry = &dma->bufs[order];
+	if (entry->buf_count) {
+		up(&dev->struct_sem);
+		atomic_dec(&dev->buf_alloc);
+		return -ENOMEM; /* May only call once for each order */
+	}
+   
+	entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
+				   DRM_MEM_BUFS);
+	if (!entry->buflist) {
+		up(&dev->struct_sem);
+		atomic_dec(&dev->buf_alloc);
+		return -ENOMEM;
+	}
+	memset(entry->buflist, 0, count * sizeof(*entry->buflist));
+   
+	entry->buf_size   = size;
+	entry->page_order = page_order;
+	offset = 0;
+
+   
+	while(entry->buf_count < count) {
+		buf = &entry->buflist[entry->buf_count];
+		buf->idx = dma->buf_count + entry->buf_count;
+		buf->total = alignment;
+		buf->order = order;
+		buf->used = 0;
+
+		DRM_DEBUG("offset : %ld\n", offset);
+
+		buf->offset = offset; /* Hrm */
+		buf->bus_address = dev->agp->base + agp_offset + offset;
+		buf->address = (void *)(agp_offset + offset + dev->agp->base);
+		buf->next = NULL;
+		buf->waiting = 0;
+		buf->pending = 0;
+		init_waitqueue_head(&buf->dma_wait);
+		buf->pid = 0;
 
-      buf->dev_private = drm_alloc(sizeof(drm_mga_buf_priv_t), DRM_MEM_BUFS);
-      buf->dev_priv_size = sizeof(drm_mga_buf_priv_t);
+		buf->dev_private = drm_alloc(sizeof(drm_mga_buf_priv_t), DRM_MEM_BUFS);
+		buf->dev_priv_size = sizeof(drm_mga_buf_priv_t);
 
 #if DRM_DMA_HISTOGRAM
-      buf->time_queued = 0;
-      buf->time_dispatched = 0;
-      buf->time_completed = 0;
-      buf->time_freed = 0;
+		buf->time_queued = 0;
+		buf->time_dispatched = 0;
+		buf->time_completed = 0;
+		buf->time_freed = 0;
 #endif
-      offset = offset + alignment;
-      entry->buf_count++;
-      byte_count += PAGE_SIZE << page_order;
+		offset = offset + alignment;
+		entry->buf_count++;
+		byte_count += PAGE_SIZE << page_order;
       
-      DRM_DEBUG("buffer %d @ %p\n",
-	     entry->buf_count, buf->address);
-   }
+		DRM_DEBUG("buffer %d @ %p\n",
+			  entry->buf_count, buf->address);
+	}
    
-   dma->buflist = drm_realloc(dma->buflist,
-			      dma->buf_count * sizeof(*dma->buflist),
-			      (dma->buf_count + entry->buf_count)
-			      * sizeof(*dma->buflist),
-			      DRM_MEM_BUFS);
-   for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
-     dma->buflist[i] = &entry->buflist[i - dma->buf_count];
+	dma->buflist = drm_realloc(dma->buflist,
+				   dma->buf_count * sizeof(*dma->buflist),
+				   (dma->buf_count + entry->buf_count)
+				   * sizeof(*dma->buflist),
+				   DRM_MEM_BUFS);
+	for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
+		dma->buflist[i] = &entry->buflist[i - dma->buf_count];
    
-   dma->buf_count  += entry->buf_count;
+	dma->buf_count  += entry->buf_count;
 
-   DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
+	DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
 
-   dma->byte_count += byte_count;
+	dma->byte_count += byte_count;
 
-   DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
+	DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
 
-   drm_freelist_create(&entry->freelist, entry->buf_count);
-   for (i = 0; i < entry->buf_count; i++) {
-      drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
-   }
+	drm_freelist_create(&entry->freelist, entry->buf_count);
+	for (i = 0; i < entry->buf_count; i++) {
+		drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
+	}
    
-   up(&dev->struct_sem);
+	up(&dev->struct_sem);
    
-   request.count = entry->buf_count;
-   request.size  = size;
+	request.count = entry->buf_count;
+	request.size  = size;
    
-   copy_to_user_ret((drm_buf_desc_t *)arg,
-		    &request,
-		    sizeof(request),
-		    -EFAULT);
+	copy_to_user_ret((drm_buf_desc_t *)arg,
+			 &request,
+			 sizeof(request),
+			 -EFAULT);
    
-   atomic_dec(&dev->buf_alloc);
+	atomic_dec(&dev->buf_alloc);
 
-   DRM_DEBUG("count: %d\n", count);
-   DRM_DEBUG("order: %d\n", order);
-   DRM_DEBUG("size: %d\n", size);
-   DRM_DEBUG("agp_offset: %d\n", agp_offset);
-   DRM_DEBUG("alignment: %d\n", alignment);
-   DRM_DEBUG("page_order: %d\n", page_order);
-   DRM_DEBUG("total: %d\n", total);
-   DRM_DEBUG("byte_count: %d\n", byte_count);
+	DRM_DEBUG("count: %d\n", count);
+	DRM_DEBUG("order: %d\n", order);
+	DRM_DEBUG("size: %d\n", size);
+	DRM_DEBUG("agp_offset: %ld\n", agp_offset);
+	DRM_DEBUG("alignment: %d\n", alignment);
+	DRM_DEBUG("page_order: %d\n", page_order);
+	DRM_DEBUG("total: %d\n", total);
+	DRM_DEBUG("byte_count: %d\n", byte_count);
 
-   dma->flags = _DRM_DMA_USE_AGP;
+	dma->flags = _DRM_DMA_USE_AGP;
 
-   DRM_DEBUG("dma->flags : %lx\n", dma->flags);
+	DRM_DEBUG("dma->flags : %x\n", dma->flags);
 
-   return 0;
+	return 0;
 }
 
 int mga_addbufs_pci(struct inode *inode, struct file *filp, unsigned int cmd,
@@ -362,17 +360,17 @@
 int mga_addbufs(struct inode *inode, struct file *filp, unsigned int cmd,
 		unsigned long arg)
 {
-   drm_buf_desc_t	 request;
+	drm_buf_desc_t	 request;
 
-   copy_from_user_ret(&request,
-		      (drm_buf_desc_t *)arg,
-		      sizeof(request),
-		      -EFAULT);
-
-   if(request.flags & _DRM_AGP_BUFFER)
-     return mga_addbufs_agp(inode, filp, cmd, arg);
-   else
-     return mga_addbufs_pci(inode, filp, cmd, arg);
+	copy_from_user_ret(&request,
+			   (drm_buf_desc_t *)arg,
+			   sizeof(request),
+			   -EFAULT);
+
+	if(request.flags & _DRM_AGP_BUFFER)
+		return mga_addbufs_agp(inode, filp, cmd, arg);
+	else
+		return mga_addbufs_pci(inode, filp, cmd, arg);
 }
 
 int mga_infobufs(struct inode *inode, struct file *filp, unsigned int cmd,
@@ -546,7 +544,7 @@
 	spin_lock(&dev->count_lock);
 	if (atomic_read(&dev->buf_alloc)) {
 		spin_unlock(&dev->count_lock);
-	   DRM_DEBUG("Buzy\n");
+		DRM_DEBUG("Busy\n");
 		return -EBUSY;
 	}
 	++dev->buf_use;		/* Can't allocate more after this call */
@@ -558,79 +556,84 @@
 			   -EFAULT);
 
 	DRM_DEBUG("mga_mapbufs\n");
-   	DRM_DEBUG("dma->flags : %lx\n", dma->flags);
+   	DRM_DEBUG("dma->flags : %x\n", dma->flags);
    
-   if (request.count >= dma->buf_count) {
-      if(dma->flags & _DRM_DMA_USE_AGP) {
-	 drm_mga_private_t *dev_priv = dev->dev_private;
-	 drm_map_t *map = NULL;
+	if (request.count >= dma->buf_count) {
+		if(dma->flags & _DRM_DMA_USE_AGP) {
+			drm_mga_private_t *dev_priv = dev->dev_private;
+			drm_map_t *map = NULL;
 	 
-	 map = dev->maplist[dev_priv->buffer_map_idx];
-	 if (!map) {
-	    DRM_DEBUG("map is null\n");
-	    retcode = -EINVAL;
-	    goto done;
-	 }
-
-	 DRM_DEBUG("map->offset : %lx\n", map->offset);
-	 DRM_DEBUG("map->size : %lx\n", map->size);
-	 DRM_DEBUG("map->type : %d\n", map->type);
-	 DRM_DEBUG("map->flags : %x\n", map->flags);
-	 DRM_DEBUG("map->handle : %lx\n", map->handle);
-	 DRM_DEBUG("map->mtrr : %d\n", map->mtrr);
-
-	 virtual = do_mmap(filp, 0, map->size, PROT_READ|PROT_WRITE,
-			   MAP_SHARED, (unsigned long)map->offset);
-      } else {
-	      virtual = do_mmap(filp, 0, dma->byte_count,
-				PROT_READ|PROT_WRITE, MAP_SHARED, 0);
-      }
-      if (virtual > -1024UL) {
-	 /* Real error */
-	 DRM_DEBUG("mmap error\n");
-	 retcode = (signed long)virtual;
-	 goto done;
-      }
-      request.virtual = (void *)virtual;
+			map = dev->maplist[dev_priv->buffer_map_idx];
+			if (!map) {
+				DRM_DEBUG("map is null\n");
+				retcode = -EINVAL;
+				goto done;
+			}
+
+			DRM_DEBUG("map->offset : %lx\n", map->offset);
+			DRM_DEBUG("map->size : %lx\n", map->size);
+			DRM_DEBUG("map->type : %d\n", map->type);
+			DRM_DEBUG("map->flags : %x\n", map->flags);
+			DRM_DEBUG("map->handle : %p\n", map->handle);
+			DRM_DEBUG("map->mtrr : %d\n", map->mtrr);
+			down(&current->mm->mmap_sem);
+			virtual = do_mmap(filp, 0, map->size, 
+					  PROT_READ|PROT_WRITE,
+					  MAP_SHARED, 
+					  (unsigned long)map->offset);
+			up(&current->mm->mmap_sem);
+		} else {
+			down(&current->mm->mmap_sem);
+			virtual = do_mmap(filp, 0, dma->byte_count,
+					  PROT_READ|PROT_WRITE, MAP_SHARED, 0);
+			up(&current->mm->mmap_sem);
+		}
+		if (virtual > -1024UL) {
+			/* Real error */
+			DRM_DEBUG("mmap error\n");
+			retcode = (signed long)virtual;
+			goto done;
+		}
+		request.virtual = (void *)virtual;
       
-      for (i = 0; i < dma->buf_count; i++) {
-	 if (copy_to_user(&request.list[i].idx,
-			  &dma->buflist[i]->idx,
-			  sizeof(request.list[0].idx))) {
-	    retcode = -EFAULT;
-	    goto done;
-	 }
-	 if (copy_to_user(&request.list[i].total,
-			  &dma->buflist[i]->total,
-			  sizeof(request.list[0].total))) {
-	    retcode = -EFAULT;
-	    goto done;
-	 }
-	 if (copy_to_user(&request.list[i].used,
-			  &zero,
-			  sizeof(zero))) {
-	    retcode = -EFAULT;
-	    goto done;
-	 }
-	 address = virtual + dma->buflist[i]->offset;
-	 if (copy_to_user(&request.list[i].address,
-			  &address,
-			  sizeof(address))) {
-	    retcode = -EFAULT;
-	    goto done;
-	 }
-      }
-   }
-   done:
-   request.count = dma->buf_count;
-   DRM_DEBUG("%d buffers, retcode = %d\n", request.count, retcode);
-   
-   copy_to_user_ret((drm_buf_map_t *)arg,
-		    &request,
-		    sizeof(request),
-		    -EFAULT);
+		for (i = 0; i < dma->buf_count; i++) {
+			if (copy_to_user(&request.list[i].idx,
+					 &dma->buflist[i]->idx,
+					 sizeof(request.list[0].idx))) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			if (copy_to_user(&request.list[i].total,
+					 &dma->buflist[i]->total,
+					 sizeof(request.list[0].total))) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			if (copy_to_user(&request.list[i].used,
+					 &zero,
+					 sizeof(zero))) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			address = virtual + dma->buflist[i]->offset;
+			if (copy_to_user(&request.list[i].address,
+					 &address,
+					 sizeof(address))) {
+				retcode = -EFAULT;
+				goto done;
+			}
+		}
+	}
+ done:
+	request.count = dma->buf_count;
+	DRM_DEBUG("%d buffers, retcode = %d\n", request.count, retcode);
+   
+	copy_to_user_ret((drm_buf_map_t *)arg,
+			 &request,
+			 sizeof(request),
+			 -EFAULT);
 
-   DRM_DEBUG("retcode : %d\n", retcode);
+	DRM_DEBUG("retcode : %d\n", retcode);
 
-   return retcode;
+	return retcode;
 }
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_clear.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_clear.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_clear.c:removed
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_clear.c:1.1	Fri Feb 11 09:26:06 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_clear.c	Sat Jul  1 20:43:17 2000
@@ -1,417 +0,0 @@
-/* mga_state.c -- State support for mga g200/g400 -*- linux-c -*-
- *
- * Created: February 2000 by keithw@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors: 
- *           Keith Whitwell <keithw@precisioninsight.com>
- *
- */
- 
-#define __NO_VERSION__
-#include "drmP.h"
-#include "mga_drv.h"
-#include "mgareg_flags.h"
-#include "mga_dma.h"
-#include "mga_state.h"
-
-#define MGA_CLEAR_CMD (DC_opcod_trap | DC_arzero_enable | 		\
-		       DC_sgnzero_enable | DC_shftzero_enable | 	\
-		       (0xC << DC_bop_SHIFT) | DC_clipdis_enable | 	\
-		       DC_solid_enable | DC_transc_enable)
-	  
-
-#define MGA_COPY_CMD (DC_opcod_bitblt | DC_atype_rpl | DC_linear_xy |	\
-		      DC_solid_disable | DC_arzero_disable | 		\
-		      DC_sgnzero_enable | DC_shftzero_enable | 		\
-		      (0xC << DC_bop_SHIFT) | DC_bltmod_bfcol | 	\
-		      DC_pattern_disable | DC_transc_disable | 		\
-		      DC_clipdis_enable)				\
-
-
-
-/* Build and queue a TT_GENERAL secondary buffer to do the clears.
- * With Jeff's ringbuffer idea, it might make sense if there are only
- * one or two cliprects to emit straight to the primary buffer.
- */
-static int mgaClearBuffers(drm_device_t *dev,
-			   int clear_color,
-			   int clear_depth,
-			   int flags)
-{
-	int cmd, i;	
-	drm_device_dma_t *dma = dev->dma;
-	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;   
-	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	xf86drmClipRectRec *pbox = sarea_priv->boxes;
-	int nbox = sarea_priv->nbox;
-	drm_buf_t *buf;
-	drm_dma_t d;
-	int order = 10;		/* ??? what orders do we have ???*/
-	DMALOCALS;
-
-
-	if (!nbox) 
-		return -EINVAL;
-
-	if ( dev_priv->sgram ) 
-		cmd = MGA_CLEAR_CMD | DC_atype_blk;
-	else
-		cmd = MGA_CLEAR_CMD | DC_atype_rstr;
-	    
-	buf = drm_freelist_get(&dma->bufs[order].freelist, _DRM_DMA_WAIT);
-
-
-	DMAGETPTR( buf );
-
-	for (i = 0 ; i < nbox ; i++) {
-		unsigned int height = pbox[i].y2 - pbox[i].y1;
-		
-		/* Is it necessary to be this paranoid?  I don't think so.
-		if (pbox[i].x1 > dev_priv->width) continue;
-		if (pbox[i].y1 > dev_priv->height) continue;
-		if (pbox[i].x2 > dev_priv->width) continue;
-		if (pbox[i].y2 > dev_priv->height) continue;
-		if (pbox[i].x2 <= pbox[i].x1) continue;
-		if (pbox[i].y2 <= pbox[i].x1) continue;
-		 */
-
-		DMAOUTREG(MGAREG_YDSTLEN, (pbox[i].y1<<16)|height);
-		DMAOUTREG(MGAREG_FXBNDRY, (pbox[i].x2<<16)|pbox[i].x1);
-
-		if ( flags & MGA_CLEAR_FRONT ) {	    
-			DMAOUTREG(MGAREG_FCOL, clear_color);
-			DMAOUTREG(MGAREG_DSTORG, dev_priv->frontOrg);
-			DMAOUTREG(MGAREG_DWGCTL+MGAREG_MGA_EXEC, cmd );
-		}
-
-		if ( flags & MGA_CLEAR_BACK ) {
-			DMAOUTREG(MGAREG_FCOL, clear_color);
-			DMAOUTREG(MGAREG_DSTORG, dev_priv->backOrg);
-			DMAOUTREG(MGAREG_DWGCTL+MGAREG_MGA_EXEC, cmd );
-		}
-
-		if ( flags & MGA_CLEAR_DEPTH ) 
-		{
-			DMAOUTREG(MGAREG_FCOL, clear_depth);
-			DMAOUTREG(MGAREG_DSTORG, dev_priv->depthOrg);
-			DMAOUTREG(MGAREG_DWGCTL+MGAREG_MGA_EXEC, cmd );
-		}
-	}
-
-	DMAADVANCE( buf );
-
-	/* Make sure we restore the 3D state next time.
-	 */
-	sarea_priv->dirty |= MGASAREA_NEW_CONTEXT;
-
-	((drm_mga_buf_priv_t *)buf->dev_private)->dma_type = MGA_DMA_GENERAL;
-
-	d.context = DRM_KERNEL_CONTEXT;
-	d.send_count = 1;
-	d.send_indices = &buf->idx;
-	d.send_sizes = &buf->used;
-   	d.flags = 0;
-	d.request_count = 0;
-	d.request_size = 0;
-	d.request_indices = NULL;
-	d.request_sizes = NULL;
-	d.granted_count = 0;	   
-
-      	atomic_inc(&dev_priv->pending_bufs);
-   	if((drm_dma_enqueue(dev, &d)) != 0) 
-     		atomic_dec(&dev_priv->pending_bufs);
-	mga_dma_schedule(dev, 1);
-   	return 0;
-}
-
-int mgaSwapBuffers(drm_device_t *dev, int flags) 
-{
-	drm_device_dma_t *dma = dev->dma;
-	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
-	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	xf86drmClipRectRec *pbox = sarea_priv->boxes;
-	int nbox = sarea_priv->nbox;
-	drm_buf_t *buf;
-	drm_dma_t d;
-	int order = 10;		/* ??? */
-	int i;
-	DMALOCALS;	
-
-	if (!nbox) 
-		return -EINVAL;
-
-	buf = drm_freelist_get(&dma->bufs[order].freelist, _DRM_DMA_WAIT);
-
-	DMAGETPTR(buf);
-
-	DMAOUTREG(MGAREG_DSTORG, dev_priv->frontOrg);
-	DMAOUTREG(MGAREG_MACCESS, dev_priv->mAccess);
-	DMAOUTREG(MGAREG_SRCORG, dev_priv->backOrg);
-	DMAOUTREG(MGAREG_AR5, dev_priv->stride); /* unnecessary? */
-	DMAOUTREG(MGAREG_DWGCTL, MGA_COPY_CMD); 
-	     
-	for (i = 0 ; i < nbox; i++) {
-		unsigned int h = pbox[i].y2 - pbox[i].y1;
-		unsigned int start = pbox[i].y1 * dev_priv->stride;
-
-		/*
-		if (pbox[i].x1 > dev_priv->width) continue;
-		if (pbox[i].y1 > dev_priv->height) continue;
-		if (pbox[i].x2 > dev_priv->width) continue;
-		if (pbox[i].y2 > dev_priv->height) continue;
-		if (pbox[i].x2 <= pbox[i].x1) continue;
-		if (pbox[i].y2 <= pbox[i].x1) continue;		
-		*/
-
-		DMAOUTREG(MGAREG_AR0, start + pbox[i].x2 - 1);
-		DMAOUTREG(MGAREG_AR3, start + pbox[i].x1);		
-		DMAOUTREG(MGAREG_FXBNDRY, pbox[i].x1|((pbox[i].x2 - 1)<<16));
-		DMAOUTREG(MGAREG_YDSTLEN+MGAREG_MGA_EXEC, (pbox[i].y1<<16)|h);
-	}
-  
-	DMAOUTREG(MGAREG_SRCORG, 0);
-	DMAADVANCE( buf );
-
-	/* Make sure we restore the 3D state next time.
-	 */
-	sarea_priv->dirty |= MGASAREA_NEW_CONTEXT;
-
-	((drm_mga_buf_priv_t *)buf->dev_private)->dma_type = MGA_DMA_GENERAL;
-
-	d.context = DRM_KERNEL_CONTEXT;
-	d.send_count = 1;
-	d.send_indices = &buf->idx;
-	d.send_sizes = &buf->used;
-   	d.flags = 0;
-	d.request_count = 0;
-	d.request_size = 0;
-	d.request_indices = NULL;
-	d.request_sizes = NULL;
-	d.granted_count = 0;	 
-
-   	atomic_inc(&dev_priv->pending_bufs);
-      	if((drm_dma_enqueue(dev, &d)) != 0) 
-     		atomic_dec(&dev_priv->pending_bufs);
-	mga_dma_schedule(dev, 1);
-   	return 0;
-}
-
-
-static int mgaIload(drm_device_t *dev, drm_mga_iload_t *args)
-{
-	drm_device_dma_t *dma = dev->dma;
-   	drm_buf_t *buf = dma->buflist[ args->idx ];
-	drm_mga_buf_priv_t *buf_priv = (drm_mga_buf_priv_t *)buf->dev_private;
-   	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
-	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	drm_dma_t d;
-   	int pixperdword;
-   	
-   	buf_priv->dma_type = MGA_DMA_ILOAD;
-   	buf_priv->boxes[0].y1 = args->texture.y1;
-   	buf_priv->boxes[0].y2 = args->texture.y2;
-   	buf_priv->boxes[0].x1 = args->texture.x1;
-   	buf_priv->boxes[0].x2 = args->texture.x2;
-   	buf_priv->ContextState[MGA_CTXREG_DSTORG] = args->destOrg;
-   	buf_priv->ContextState[MGA_CTXREG_MACCESS] = args->mAccess;
-   	buf_priv->ServerState[MGA_2DREG_PITCH] = args->pitch;
-	buf_priv->nbox = 1;   
-   	sarea_priv->dirty |= (MGASAREA_NEW_CONTEXT | MGASAREA_NEW_2D);
-   	switch((args->mAccess & 0x00000003)) {
-	 	case 0:
-	   		pixperdword = 4;
-	   	break;
-	 	case 1:
-	   		pixperdword = 2;
-	   	break;
-	 	case 2:
-	   		pixperdword = 1;
-	  	break;
-		default:
-	   		DRM_ERROR("Invalid maccess value passed"
-				  " to mgaIload\n");
-	   	return -EINVAL;
-	}
-   	buf->used = ((args->texture.y2 - args->texture.y1) *
-		     (args->texture.x2 - args->texture.x1) /
-		     pixperdword);
-   	DRM_DEBUG("buf->used : %d\n", buf->used);
-	d.context = DRM_KERNEL_CONTEXT;
-	d.send_count = 1;
-	d.send_indices = &buf->idx;
-	d.send_sizes = &buf->used;
-	d.flags = 0;
-	d.request_count = 0;
-	d.request_size = 0;
-	d.request_indices = NULL;
-	d.request_sizes = NULL;
-	d.granted_count = 0;	 
-   
-      	atomic_inc(&dev_priv->pending_bufs);
-      	if((drm_dma_enqueue(dev, &d)) != 0) 
-     		atomic_dec(&dev_priv->pending_bufs);
-	mga_dma_schedule(dev, 1);
-
-	return 0; 
-}
-
-
-/* Necessary?  Not necessary??
- */
-static int check_lock(void)
-{
-	return 1;
-}
-
-int mga_clear_bufs(struct inode *inode, struct file *filp,
-		   unsigned int cmd, unsigned long arg)
-{
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
-	drm_mga_clear_t clear;
-	int retcode;
-   
-	copy_from_user_ret(&clear, (drm_mga_clear_t *)arg,
-			   sizeof(clear), -EFAULT);
-   
-/*  	if (!check_lock( dev )) */
-/*  		return -EIEIO; */
-		
-	retcode = mgaClearBuffers(dev, clear.clear_color,
-				  clear.clear_depth,
-				  clear.flags);
-   
-	return retcode;
-}
-
-int mga_swap_bufs(struct inode *inode, struct file *filp,
-		  unsigned int cmd, unsigned long arg)
-{
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
-	drm_mga_swap_t swap;
-	int retcode = 0;
-
-/*  	if (!check_lock( dev )) */
-/*  		return -EIEIO; */
-   
-	copy_from_user_ret(&swap, (drm_mga_swap_t *)arg,
-			   sizeof(swap), -EFAULT);
-   
-	retcode = mgaSwapBuffers(dev, swap.flags);
-   
-	return retcode;
-}
-
-int mga_iload(struct inode *inode, struct file *filp,
-	      unsigned int cmd, unsigned long arg)
-{
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
-	drm_mga_iload_t iload;
-	int retcode = 0;
-
-/*  	if (!check_lock( dev )) */
-/*  		return -EIEIO; */
-
-	copy_from_user_ret(&iload, (drm_mga_iload_t *)arg, 
-			   sizeof(iload), -EFAULT);
-   
-	retcode = mgaIload(dev, &iload);
-   
-	return retcode;
-}
-
-
-int mga_dma(struct inode *inode, struct file *filp, unsigned int cmd,
-	    unsigned long arg)
-{
-	drm_file_t	  *priv	    = filp->private_data;
-	drm_device_t	  *dev	    = priv->dev;
-	drm_device_dma_t  *dma	    = dev->dma;
-	int		  retcode   = 0;
-	drm_dma_t	  d;
-
-   	copy_from_user_ret(&d, (drm_dma_t *)arg, sizeof(d), -EFAULT);
-	DRM_DEBUG("%d %d: %d send, %d req\n",
-		  current->pid, d.context, d.send_count, d.request_count);
-
-	/* Per-context queues are unworkable if you are trying to do
-	 * state management from the client.
-	 */
-	d.context = DRM_KERNEL_CONTEXT;
-	d.flags &= ~_DRM_DMA_WHILE_LOCKED;
-
-	/* Maybe multiple buffers is useful for iload...
-	 * But this ioctl is only for *despatching* vertex data...
-	 */
-	if (d.send_count < 0 || d.send_count > 1) {
-		DRM_ERROR("Process %d trying to send %d buffers (max 1)\n",
-			  current->pid, d.send_count);
-		return -EINVAL;
-	}
-
-	
-	/* But it *is* used to request buffers for all types of dma:
-	 */
-	if (d.request_count < 0 || d.request_count > dma->buf_count) {
-		DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
-			  current->pid, d.request_count, dma->buf_count);
-		return -EINVAL;
-	}
-
-	if (d.send_count) {
-		int idx = d.send_indices[0];
-		drm_mga_buf_priv_t *buf_priv = dma->buflist[ idx ]->dev_private;
-		drm_mga_private_t *dev_priv = dev->dev_private;
-
-		buf_priv->dma_type = MGA_DMA_VERTEX;
-
-/*         	if (!check_lock( dev )) */
-/*  		        return -EIEIO; */
-
-		/* Snapshot the relevent bits of the sarea... 
-		 */
-		mgaCopyAndVerifyState( dev_priv, buf_priv );
-
-	      	atomic_inc(&dev_priv->pending_bufs);
-		retcode = drm_dma_enqueue(dev, &d);
-	      	if(retcode != 0) 
-     			atomic_dec(&dev_priv->pending_bufs);
-		mga_dma_schedule(dev, 1);
-	}
-	
-	d.granted_count = 0;
-
-	if (!retcode && d.request_count) {
-		retcode = drm_dma_get_buffers(dev, &d);
-	}
-
-	DRM_DEBUG("%d returning, granted = %d\n",
-		  current->pid, d.granted_count);
-	copy_to_user_ret((drm_dma_t *)arg, &d, sizeof(d), -EFAULT);
-
-	return retcode;
-}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c:1.1	Fri Feb 11 09:26:06 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c	Fri Jun 16 17:03:36 2000
@@ -2,6 +2,7 @@
  * Created: Mon Dec 13 09:51:35 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,10 +24,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * Author: Rickard E. (Rik) Faith <faith@precisioninsight.com>
+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	   Jeff Hartmann <jhartmann@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c,v 1.1 2000/02/11 17:26:06 dawes Exp $
- *
  */
 
 #include <linux/sched.h>
@@ -38,7 +38,7 @@
 static int mga_alloc_queue(drm_device_t *dev)
 {
    	int temp = drm_ctxbitmap_next(dev);
-   	printk("mga_alloc_queue: %d\n", temp);
+   	DRM_DEBUG("mga_alloc_queue: %d\n", temp);
 	return temp;
 }
 
@@ -57,7 +57,7 @@
         dev->ctx_start = get_cycles();
 #endif
         
-        printk("Context switch from %d to %d\n", old, new);
+        DRM_DEBUG("Context switch from %d to %d\n", old, new);
 
         if (new == dev->last_context) {
                 clear_bit(0, &dev->context_flag);
@@ -104,7 +104,7 @@
 	drm_ctx_t	ctx;
 	int		i;
 
-	printk("%d\n", DRM_RESERVED_CONTEXTS);
+	DRM_DEBUG("%d\n", DRM_RESERVED_CONTEXTS);
 	copy_from_user_ret(&res, (drm_ctx_res_t *)arg, sizeof(res), -EFAULT);
 	if (res.count >= DRM_RESERVED_CONTEXTS) {
 		memset(&ctx, 0, sizeof(ctx));
@@ -134,11 +134,11 @@
 		ctx.handle = mga_alloc_queue(dev);
 	}
         if (ctx.handle == -1) {
-		printk("Not enough free contexts.\n");
+		DRM_DEBUG("Not enough free contexts.\n");
 				/* Should this return -EBUSY instead? */
 		return -ENOMEM;
 	}
-	printk("%d\n", ctx.handle);
+	DRM_DEBUG("%d\n", ctx.handle);
 	copy_to_user_ret((drm_ctx_t *)arg, &ctx, sizeof(ctx), -EFAULT);
 	return 0;
 }
@@ -170,7 +170,7 @@
 	drm_ctx_t	ctx;
 
 	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
-	printk("%d\n", ctx.handle);
+	DRM_DEBUG("%d\n", ctx.handle);
 	return mga_context_switch(dev, dev->last_context, ctx.handle);
 }
 
@@ -182,7 +182,7 @@
 	drm_ctx_t	ctx;
 
 	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
-	printk("%d\n", ctx.handle);
+	DRM_DEBUG("%d\n", ctx.handle);
 	mga_context_switch_complete(dev, ctx.handle);
 
 	return 0;
@@ -194,51 +194,11 @@
 	drm_file_t	*priv	= filp->private_data;
 	drm_device_t	*dev	= priv->dev;
 	drm_ctx_t	ctx;
-	drm_queue_t	*q;
-	drm_buf_t	*buf;
 
 	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
-	printk("%d\n", ctx.handle);
-	if(ctx.handle == DRM_KERNEL_CONTEXT) {
-	   q = dev->queuelist[ctx.handle];
-	   atomic_inc(&q->use_count);
-	   if (atomic_read(&q->use_count) == 1) {
-	      /* No longer in use */
-	      atomic_dec(&q->use_count);
-	      return -EINVAL;
-	   }
-	   atomic_inc(&q->finalization); /* Mark queue in finalization state */
-	   atomic_sub(2, &q->use_count); 
-	   /* Mark queue as unused (pending finalization) */
-	   
-	   while (test_and_set_bit(0, &dev->interrupt_flag)) {
-	      printk("Calling schedule from rmctx\n");
-	      schedule();
-	      if (signal_pending(current)) {
-		 clear_bit(0, &dev->interrupt_flag);
-		 return -EINTR;
-	      }
-	   }
-	   
-	   /* Remove queued buffers */
-	   while ((buf = drm_waitlist_get(&q->waitlist))) {
-	      drm_free_buffer(dev, buf);
-	   }
-	   clear_bit(0, &dev->interrupt_flag);
-	   
-	   /* Wakeup blocked processes */
-	   wake_up_interruptible(&q->read_queue);
-	   wake_up_interruptible(&q->write_queue);
-	   wake_up_interruptible(&q->flush_queue);
-	   
-	   /* Finalization over.  Queue is made
-	    available when both use_count and
-	    finalization become 0, which won't
-	    happen until all the waiting processes
-	    stop waiting. */
-	   atomic_dec(&q->finalization);
-	} else {
-	   drm_ctxbitmap_free(dev, ctx.handle);
+	DRM_DEBUG("%d\n", ctx.handle);
+      	if(ctx.handle != DRM_KERNEL_CONTEXT) {
+	   	drm_ctxbitmap_free(dev, ctx.handle);
 	}
 	
 	return 0;
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c:1.1	Fri Feb 11 09:26:07 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c	Fri Jun 30 10:15:18 2000
@@ -2,6 +2,7 @@
  * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,19 +24,15 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
- *	    Jeff Hartmann <jhartmann@precisioninsight.com>
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ *	    Keith Whitwell <keithw@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c,v 1.1 2000/02/11 17:26:07 dawes Exp $
- *
  */
 
 #define __NO_VERSION__
 #include "drmP.h"
 #include "mga_drv.h"
-#include "mgareg_flags.h"
-#include "mga_dma.h"
-#include "mga_state.h"
 
 #include <linux/interrupt.h>	/* For task queue support */
 
@@ -48,23 +45,642 @@
 #define MGA_WRITE(reg,val) 	do { MGA_DEREF(reg) = val; } while (0)
 
 #define PDEA_pagpxfer_enable 	     0x2
-#define MGA_SYNC_TAG         	     0x423f4200
 
-typedef enum {
-	TT_GENERAL,
-	TT_BLIT,
-	TT_VECTOR,
-	TT_VERTEX
-} transferType_t;
+static int mga_flush_queue(drm_device_t *dev);
 
+static unsigned long mga_alloc_page(drm_device_t *dev)
+{
+	unsigned long address;
+   
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	address = __get_free_page(GFP_KERNEL);
+	if(address == 0UL) {
+		return 0;
+	}
+	atomic_inc(&mem_map[MAP_NR((void *) address)].count);
+	set_bit(PG_locked, &mem_map[MAP_NR((void *) address)].flags);
+   
+	return address;
+}
 
+static void mga_free_page(drm_device_t *dev, unsigned long page)
+{
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if(page == 0UL) {
+		return;
+	}
+	atomic_dec(&mem_map[MAP_NR((void *) page)].count);
+	clear_bit(PG_locked, &mem_map[MAP_NR((void *) page)].flags);
+	wake_up(&mem_map[MAP_NR((void *) page)].wait);
+	free_page(page);
+	return;
+}
+
 static void mga_delay(void)
 {
    	return;
 }
 
+void mga_flush_write_combine(void)
+{
+   	int xchangeDummy;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	__asm__ volatile(" push %%eax ; xchg %%eax, %0 ; pop %%eax" : : "m" (xchangeDummy));
+   	__asm__ volatile(" push %%eax ; push %%ebx ; push %%ecx ; push %%edx ;"
+			 " movl $0,%%eax ; cpuid ; pop %%edx ; pop %%ecx ; pop %%ebx ;"
+			 " pop %%eax" : /* no outputs */ :  /* no inputs */ );
+}
+
+/* These are two age tags that will never be sent to
+ * the hardware */
+#define MGA_BUF_USED 	0xffffffff
+#define MGA_BUF_FREE	0
+
+static int mga_freelist_init(drm_device_t *dev)
+{
+      	drm_device_dma_t *dma = dev->dma;
+   	drm_buf_t *buf;
+   	drm_mga_buf_priv_t *buf_priv;
+      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+   	drm_mga_freelist_t *item;
+   	int i;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	dev_priv->head = drm_alloc(sizeof(drm_mga_freelist_t), DRM_MEM_DRIVER);
+	if(dev_priv->head == NULL) return -ENOMEM;
+   	memset(dev_priv->head, 0, sizeof(drm_mga_freelist_t));
+   	dev_priv->head->age = MGA_BUF_USED;
+   
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	buf = dma->buflist[ i ];
+	        buf_priv = buf->dev_private;
+		item = drm_alloc(sizeof(drm_mga_freelist_t),
+				 DRM_MEM_DRIVER);
+	   	if(item == NULL) return -ENOMEM;
+	   	memset(item, 0, sizeof(drm_mga_freelist_t));
+	  	item->age = MGA_BUF_FREE;
+	   	item->prev = dev_priv->head;
+	   	item->next = dev_priv->head->next;
+	   	if(dev_priv->head->next != NULL)
+			dev_priv->head->next->prev = item;
+	   	if(item->next == NULL) dev_priv->tail = item;
+	   	item->buf = buf;
+	   	buf_priv->my_freelist = item;
+		buf_priv->discard = 0;
+		buf_priv->dispatched = 0;
+	   	dev_priv->head->next = item;
+	}
+   
+   	return 0;
+}
+
+static void mga_freelist_cleanup(drm_device_t *dev)
+{
+      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+   	drm_mga_freelist_t *item;
+   	drm_mga_freelist_t *prev;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	item = dev_priv->head;
+   	while(item) {
+	   	prev = item;
+	   	item = item->next;
+	   	drm_free(prev, sizeof(drm_mga_freelist_t), DRM_MEM_DRIVER);
+	}
+   
+   	dev_priv->head = dev_priv->tail = NULL;
+}
+
+/* Frees dispatch lock */
+static inline void mga_dma_quiescent(drm_device_t *dev)
+{
+	drm_device_dma_t  *dma      = dev->dma;
+	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+   	unsigned long end;
+	int i;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	end = jiffies + (HZ*3);
+    	while(1) {
+		if(!test_and_set_bit(MGA_IN_DISPATCH, 
+				     &dev_priv->dispatch_status)) {
+			break;
+		}
+	   	if((signed)(end - jiffies) <= 0) {
+			DRM_ERROR("irqs: %d wanted %d\n", 
+				  atomic_read(&dev->total_irq), 
+				  atomic_read(&dma->total_lost));
+			DRM_ERROR("lockup\n"); 
+			goto out_nolock;
+		}
+		for (i = 0 ; i < 2000 ; i++) mga_delay();
+	}
+	end = jiffies + (HZ*3);
+    	DRM_DEBUG("quiescent status : %x\n", MGA_READ(MGAREG_STATUS));
+    	while((MGA_READ(MGAREG_STATUS) & 0x00030001) != 0x00020000) {
+		if((signed)(end - jiffies) <= 0) {
+			DRM_ERROR("irqs: %d wanted %d\n", 
+				  atomic_read(&dev->total_irq), 
+				  atomic_read(&dma->total_lost));
+			DRM_ERROR("lockup\n"); 
+			goto out_status;
+		}
+		for (i = 0 ; i < 2000 ; i++) mga_delay();	  
+	}
+    	sarea_priv->dirty |= MGA_DMA_FLUSH;
+
+out_status:
+    	clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status);
+out_nolock:
+}
+
+static void mga_reset_freelist(drm_device_t *dev)
+{
+   	drm_device_dma_t  *dma      = dev->dma;
+   	drm_buf_t *buf;
+   	drm_mga_buf_priv_t *buf_priv;
+	int i;
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	buf = dma->buflist[ i ];
+	        buf_priv = buf->dev_private;
+		buf_priv->my_freelist->age = MGA_BUF_FREE;
+	}
+}
+
+/* Least recently used :
+ * These operations are not atomic b/c they are protected by the 
+ * hardware lock */
+
+drm_buf_t *mga_freelist_get(drm_device_t *dev)
+{
+   	DECLARE_WAITQUEUE(entry, current);
+   	drm_mga_private_t *dev_priv = 
+     		(drm_mga_private_t *) dev->dev_private;
+	drm_mga_freelist_t *prev;
+   	drm_mga_freelist_t *next;
+	static int failed = 0;
+
+	DRM_DEBUG("%s : tail->age : %d last_prim_age : %d\n", __FUNCTION__,
+	       dev_priv->tail->age, dev_priv->last_prim_age);
+   
+	if(failed >= 1000 && dev_priv->tail->age >= dev_priv->last_prim_age) {
+		DRM_DEBUG("I'm waiting on the freelist!!! %d\n", 
+		       dev_priv->last_prim_age);
+	   	set_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status);
+		current->state = TASK_INTERRUPTIBLE;
+	   	add_wait_queue(&dev_priv->buf_queue, &entry);
+	   	for (;;) {
+		   	mga_dma_schedule(dev, 0);
+		   	if(!test_bit(MGA_IN_GETBUF, 
+				     &dev_priv->dispatch_status)) 
+				break;
+		   	atomic_inc(&dev->total_sleeps);
+		   	schedule();
+		   	if (signal_pending(current)) {
+				clear_bit(MGA_IN_GETBUF,
+					  &dev_priv->dispatch_status);
+			   	goto failed_getbuf;
+			}
+		}
+	   	current->state = TASK_RUNNING;
+	   	remove_wait_queue(&dev_priv->buf_queue, &entry);
+	}
+   
+   	if(dev_priv->tail->age < dev_priv->last_prim_age) {
+		prev = dev_priv->tail->prev;
+	   	next = dev_priv->tail;
+	   	prev->next = NULL;
+	   	next->prev = next->next = NULL;
+	   	dev_priv->tail = prev;
+	   	next->age = MGA_BUF_USED;
+		failed = 0;
+	   	return next->buf;
+	}
+
+failed_getbuf:
+	failed++;
+   	return NULL;
+}
+
+int mga_freelist_put(drm_device_t *dev, drm_buf_t *buf)
+{
+      	drm_mga_private_t *dev_priv = 
+     		(drm_mga_private_t *) dev->dev_private;
+   	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_freelist_t *prev;
+   	drm_mga_freelist_t *head;
+   	drm_mga_freelist_t *next;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	if(buf_priv->my_freelist->age == MGA_BUF_USED) {
+		/* Discarded buffer, put it on the tail */
+		next = buf_priv->my_freelist;
+		next->age = MGA_BUF_FREE;
+		prev = dev_priv->tail;
+		prev->next = next;
+		next->prev = prev;
+		next->next = NULL;
+		dev_priv->tail = next;
+		DRM_DEBUG("Discarded\n");
+	} else {
+		/* Normally aged buffer, put it on the head + 1,
+		 * as the real head is a sentinal element
+		 */
+		next = buf_priv->my_freelist;
+		head = dev_priv->head;
+		prev = head->next;
+		head->next = next;
+		prev->prev = next;
+		next->prev = head;
+		next->next = prev;
+	}
+   
+   	return 0;
+}
+
+static int mga_init_primary_bufs(drm_device_t *dev, drm_mga_init_t *init)
+{
+   	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_prim_buf_t *prim_buffer;
+   	int i, temp, size_of_buf;
+   	int offset = init->reserved_map_agpstart;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+   	dev_priv->primary_size = ((init->primary_size + PAGE_SIZE - 1) / 
+				  PAGE_SIZE) * PAGE_SIZE;
+   	size_of_buf = dev_priv->primary_size / MGA_NUM_PRIM_BUFS;
+	dev_priv->warp_ucode_size = init->warp_ucode_size;
+   	dev_priv->prim_bufs = drm_alloc(sizeof(drm_mga_prim_buf_t *) * 
+					(MGA_NUM_PRIM_BUFS + 1), 
+					DRM_MEM_DRIVER);
+   	if(dev_priv->prim_bufs == NULL) {
+		DRM_ERROR("Unable to allocate memory for prim_buf\n");
+		return -ENOMEM;
+	}
+   	memset(dev_priv->prim_bufs, 
+	       0, sizeof(drm_mga_prim_buf_t *) * (MGA_NUM_PRIM_BUFS + 1));
+   
+   	temp = init->warp_ucode_size + dev_priv->primary_size;
+	temp = ((temp + PAGE_SIZE - 1) / PAGE_SIZE) * PAGE_SIZE;
+	   
+	dev_priv->ioremap = drm_ioremap(dev->agp->base + offset, 
+					temp);
+	if(dev_priv->ioremap == NULL) {
+		DRM_DEBUG("Ioremap failed\n");
+		return -ENOMEM;
+	}
+   	init_waitqueue_head(&dev_priv->wait_queue);
+   
+   	for(i = 0; i < MGA_NUM_PRIM_BUFS; i++) {
+	   	prim_buffer = drm_alloc(sizeof(drm_mga_prim_buf_t), 
+					DRM_MEM_DRIVER);
+	   	if(prim_buffer == NULL) return -ENOMEM;
+	   	memset(prim_buffer, 0, sizeof(drm_mga_prim_buf_t));
+	   	prim_buffer->phys_head = offset + dev->agp->base;
+	   	prim_buffer->current_dma_ptr = 
+			prim_buffer->head = 
+			(u32 *) (dev_priv->ioremap + 
+				 offset - 
+				 init->reserved_map_agpstart);
+	   	prim_buffer->num_dwords = 0;
+	   	prim_buffer->max_dwords = size_of_buf / sizeof(u32);
+	   	prim_buffer->max_dwords -= 5; /* Leave room for the softrap */
+	   	prim_buffer->sec_used = 0;
+	   	prim_buffer->idx = i;
+		prim_buffer->prim_age = i + 1;
+	   	offset = offset + size_of_buf;
+	   	dev_priv->prim_bufs[i] = prim_buffer;
+	}
+	dev_priv->current_prim_idx = 0;
+        dev_priv->next_prim = 
+		dev_priv->last_prim = 
+		dev_priv->current_prim =
+        	dev_priv->prim_bufs[0];
+	dev_priv->next_prim_age = 2;	
+	dev_priv->last_prim_age = 1;
+   	set_bit(MGA_BUF_IN_USE, &dev_priv->current_prim->buffer_status);
+   	return 0;
+}
+
+void mga_fire_primary(drm_device_t *dev, drm_mga_prim_buf_t *prim)
+{
+       	drm_mga_private_t *dev_priv = dev->dev_private;
+      	drm_device_dma_t  *dma	    = dev->dma;
+       	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+ 	int use_agp = PDEA_pagpxfer_enable;
+	unsigned long end;
+   	int i;
+   	int next_idx;
+       	PRIMLOCALS;
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+   	dev_priv->last_prim = prim;
+   
+ 	/* We never check for overflow, b/c there is always room */
+    	PRIMPTR(prim);
+   	if(num_dwords <= 0) {
+		DRM_DEBUG("num_dwords == 0 when dispatched\n");
+		goto out_prim_wait;
+	}
+ 	PRIMOUTREG( MGAREG_DMAPAD, 0);
+ 	PRIMOUTREG( MGAREG_DMAPAD, 0);
+       	PRIMOUTREG( MGAREG_DMAPAD, 0);
+   	PRIMOUTREG( MGAREG_SOFTRAP, 0);
+    	PRIMFINISH(prim);
+
+	end = jiffies + (HZ*3);
+    	if(sarea_priv->dirty & MGA_DMA_FLUSH) {
+		DRM_DEBUG("Dma top flush\n");	   
+		while((MGA_READ(MGAREG_STATUS) & 0x00030001) != 0x00020000) {
+			if((signed)(end - jiffies) <= 0) {
+				DRM_ERROR("irqs: %d wanted %d\n", 
+					  atomic_read(&dev->total_irq), 
+					  atomic_read(&dma->total_lost));
+				DRM_ERROR("lockup in fire primary "
+					  "(Dma Top Flush)\n");
+				goto out_prim_wait;
+			}
+	      
+			for (i = 0 ; i < 4096 ; i++) mga_delay();
+		}
+		sarea_priv->dirty &= ~(MGA_DMA_FLUSH);
+	} else {
+		DRM_DEBUG("Status wait\n");
+		while((MGA_READ(MGAREG_STATUS) & 0x00020001) != 0x00020000) {
+			if((signed)(end - jiffies) <= 0) {
+				DRM_ERROR("irqs: %d wanted %d\n", 
+					  atomic_read(&dev->total_irq), 
+					  atomic_read(&dma->total_lost));
+				DRM_ERROR("lockup in fire primary "
+					  "(Status Wait)\n");
+				goto out_prim_wait;
+			}
+	   
+			for (i = 0 ; i < 4096 ; i++) mga_delay();
+		}
+	}
+
+   	mga_flush_write_combine();
+    	atomic_inc(&dev_priv->pending_bufs);
+       	MGA_WRITE(MGAREG_PRIMADDRESS, phys_head | TT_GENERAL);
+ 	MGA_WRITE(MGAREG_PRIMEND, (phys_head + num_dwords * 4) | use_agp);
+   	prim->num_dwords = 0;
+	sarea_priv->last_enqueue = prim->prim_age;
+    
+   	next_idx = prim->idx + 1;
+    	if(next_idx >= MGA_NUM_PRIM_BUFS) 
+		next_idx = 0;
+
+    	dev_priv->next_prim = dev_priv->prim_bufs[next_idx];
+	return;
+
+ out_prim_wait:
+	prim->num_dwords = 0;
+	prim->sec_used = 0;
+	clear_bit(MGA_BUF_IN_USE, &prim->buffer_status);
+   	wake_up_interruptible(&dev_priv->wait_queue);
+	clear_bit(MGA_BUF_SWAP_PENDING, &prim->buffer_status);
+	clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status);
+}
+
+int mga_advance_primary(drm_device_t *dev)
+{
+   	DECLARE_WAITQUEUE(entry, current);
+   	drm_mga_private_t *dev_priv = dev->dev_private;
+   	drm_mga_prim_buf_t *prim_buffer;
+   	drm_device_dma_t  *dma      = dev->dma;
+   	int next_prim_idx;
+   	int ret = 0;
+   
+   	/* This needs to reset the primary buffer if available,
+	 * we should collect stats on how many times it bites
+	 * it's tail */
+	DRM_DEBUG("%s\n", __FUNCTION__);
+   
+   	next_prim_idx = dev_priv->current_prim_idx + 1;
+   	if(next_prim_idx >= MGA_NUM_PRIM_BUFS)
+     		next_prim_idx = 0;
+   	prim_buffer = dev_priv->prim_bufs[next_prim_idx];
+	set_bit(MGA_IN_WAIT, &dev_priv->dispatch_status);
+   
+      	/* In use is cleared in interrupt handler */
+   
+   	if(test_and_set_bit(MGA_BUF_IN_USE, &prim_buffer->buffer_status)) {
+	   	add_wait_queue(&dev_priv->wait_queue, &entry);
+		current->state = TASK_INTERRUPTIBLE;
+
+	   	for (;;) {
+		   	mga_dma_schedule(dev, 0);
+		   	if(!test_and_set_bit(MGA_BUF_IN_USE, 
+					     &prim_buffer->buffer_status)) 
+				break;
+		   	atomic_inc(&dev->total_sleeps);
+		   	atomic_inc(&dma->total_missed_sched);
+		   	schedule();
+		   	if (signal_pending(current)) {
+			   	ret = -ERESTARTSYS;
+			   	break;
+			}
+		}
+	   	current->state = TASK_RUNNING;
+	   	remove_wait_queue(&dev_priv->wait_queue, &entry);
+	   	if(ret) return ret;
+	}
+	clear_bit(MGA_IN_WAIT, &dev_priv->dispatch_status);
+
+   	/* This primary buffer is now free to use */
+   	prim_buffer->current_dma_ptr = prim_buffer->head;
+   	prim_buffer->num_dwords = 0;
+   	prim_buffer->sec_used = 0;
+	prim_buffer->prim_age = dev_priv->next_prim_age++;
+	if(prim_buffer->prim_age == 0 || prim_buffer->prim_age == 0xffffffff) {
+	   mga_flush_queue(dev);
+	   mga_dma_quiescent(dev);
+	   mga_reset_freelist(dev);
+	   prim_buffer->prim_age = (dev_priv->next_prim_age += 2);
+	}
+
+	/* Reset all buffer status stuff */
+	clear_bit(MGA_BUF_NEEDS_OVERFLOW, &prim_buffer->buffer_status);
+	clear_bit(MGA_BUF_FORCE_FIRE, &prim_buffer->buffer_status);
+	clear_bit(MGA_BUF_SWAP_PENDING, &prim_buffer->buffer_status);
+
+   	dev_priv->current_prim = prim_buffer;
+   	dev_priv->current_prim_idx = next_prim_idx;
+   	return 0;
+}
+
+/* More dynamic performance decisions */
+static inline int mga_decide_to_fire(drm_device_t *dev)
+{
+   	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+      	drm_device_dma_t  *dma	    = dev->dma;
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	if(test_bit(MGA_BUF_FORCE_FIRE, &dev_priv->next_prim->buffer_status)) {
+	   	atomic_inc(&dma->total_prio);
+	   	return 1;
+	}
+
+	if (test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status) &&
+	    dev_priv->next_prim->num_dwords) {
+	   	atomic_inc(&dma->total_prio);
+	   	return 1;
+	}
+
+	if (test_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status) &&
+	    dev_priv->next_prim->num_dwords) {
+	   	atomic_inc(&dma->total_prio);
+	   	return 1;
+	}
+   
+   	if(atomic_read(&dev_priv->pending_bufs) <= MGA_NUM_PRIM_BUFS - 1) {
+		if(test_bit(MGA_BUF_SWAP_PENDING, 
+			    &dev_priv->next_prim->buffer_status)) {
+			atomic_inc(&dma->total_dmas);
+			return 1;
+		}
+	}
+
+   	if(atomic_read(&dev_priv->pending_bufs) <= MGA_NUM_PRIM_BUFS / 2) {
+		if(dev_priv->next_prim->sec_used >= MGA_DMA_BUF_NR / 8) {
+			atomic_inc(&dma->total_hit);
+			return 1;
+		}
+	}
+
+   	if(atomic_read(&dev_priv->pending_bufs) >= MGA_NUM_PRIM_BUFS / 2) {
+		if(dev_priv->next_prim->sec_used >= MGA_DMA_BUF_NR / 4) {
+			atomic_inc(&dma->total_missed_free);
+			return 1;
+		}
+	}
+
+   	atomic_inc(&dma->total_tried);
+   	return 0;
+}
+
+int mga_dma_schedule(drm_device_t *dev, int locked)
+{
+      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+      	drm_device_dma_t  *dma	    = dev->dma;
+	int retval = 0;
+
+   	if (test_and_set_bit(0, &dev->dma_flag)) {
+		atomic_inc(&dma->total_missed_dma);
+		retval = -EBUSY;
+		goto sch_out_wakeup;
+	}
+   
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	if(test_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status) || 
+	   test_bit(MGA_IN_WAIT, &dev_priv->dispatch_status) ||
+	   test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status)) {
+		locked = 1;
+	}
+   
+   	if (!locked && 
+	    !drm_lock_take(&dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT)) {
+	   	atomic_inc(&dma->total_missed_lock);
+	   	clear_bit(0, &dev->dma_flag);
+		DRM_DEBUG("Not locked\n");
+		retval = -EBUSY;
+		goto sch_out_wakeup;
+	}
+   	DRM_DEBUG("I'm locked\n");
+
+   	if(!test_and_set_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status)) {
+	   	/* Fire dma buffer */
+	   	if(mga_decide_to_fire(dev)) {
+		   	DRM_DEBUG("idx :%d\n", dev_priv->next_prim->idx);
+			clear_bit(MGA_BUF_FORCE_FIRE, 
+				  &dev_priv->next_prim->buffer_status);
+		   	if(dev_priv->current_prim == dev_priv->next_prim) {
+				/* Schedule overflow for a later time */
+				set_bit(MGA_BUF_NEEDS_OVERFLOW,
+					&dev_priv->next_prim->buffer_status);
+			}
+		   	mga_fire_primary(dev, dev_priv->next_prim);
+		} else {
+			clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status);
+		}
+	} else {
+		DRM_DEBUG("I can't get the dispatch lock\n");
+	}
+   	
+	if (!locked) {
+		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+
+sch_out_wakeup:
+      	if(test_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status) &&
+	   atomic_read(&dev_priv->pending_bufs) == 0) {
+		/* Everything has been processed by the hardware */
+		clear_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status);
+		wake_up_interruptible(&dev_priv->flush_queue);
+	}
+
+	if(test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status) &&
+	   dev_priv->tail->age < dev_priv->last_prim_age) {
+		clear_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status);
+		DRM_DEBUG("Waking up buf queue\n");
+		wake_up_interruptible(&dev_priv->buf_queue);
+	} else if (test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status)) {
+	   	DRM_DEBUG("Not waking buf_queue on %d %d\n", 
+			  atomic_read(&dev->total_irq), 
+			  dev_priv->last_prim_age);
+	}
+
+   	clear_bit(0, &dev->dma_flag);
+	return retval;
+}
+
+static void mga_dma_service(int irq, void *device, struct pt_regs *regs)
+{
+    	drm_device_t	 *dev = (drm_device_t *)device;
+    	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+    	drm_mga_prim_buf_t *last_prim_buffer;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+    	atomic_inc(&dev->total_irq);
+	if((MGA_READ(MGAREG_STATUS) & 0x00000001) != 0x00000001) return;
+      	MGA_WRITE(MGAREG_ICLEAR, 0x00000001);
+   	last_prim_buffer = dev_priv->last_prim;
+    	last_prim_buffer->num_dwords = 0;
+    	last_prim_buffer->sec_used = 0;
+	dev_priv->sarea_priv->last_dispatch = 
+		dev_priv->last_prim_age = last_prim_buffer->prim_age;
+      	clear_bit(MGA_BUF_IN_USE, &last_prim_buffer->buffer_status);
+   	wake_up_interruptible(&dev_priv->wait_queue);
+      	clear_bit(MGA_BUF_SWAP_PENDING, &last_prim_buffer->buffer_status);
+      	clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status);
+      	atomic_dec(&dev_priv->pending_bufs);
+   	queue_task(&dev->tq, &tq_immediate);
+   	mark_bh(IMMEDIATE_BH);
+}
+
+static void mga_dma_task_queue(void *device)
+{
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	mga_dma_schedule((drm_device_t *)device, 0);
+}
+
 int mga_dma_cleanup(drm_device_t *dev)
 {
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
 	if(dev->dev_private) {
 		drm_mga_private_t *dev_priv = 
 			(drm_mga_private_t *) dev->dev_private;
@@ -76,7 +692,30 @@
 
 			drm_ioremapfree((void *) dev_priv->ioremap, temp);
 		}
+	   	if(dev_priv->status_page != NULL) {
+		   	iounmap(dev_priv->status_page);
+		}
+	   	if(dev_priv->real_status_page != 0UL) {
+		   	mga_free_page(dev, dev_priv->real_status_page);
+		}
+	   	if(dev_priv->prim_bufs != NULL) {
+		   	int i;
+		   	for(i = 0; i < MGA_NUM_PRIM_BUFS; i++) {
+			   	if(dev_priv->prim_bufs[i] != NULL) {
+			     		drm_free(dev_priv->prim_bufs[i],
+						 sizeof(drm_mga_prim_buf_t),
+						 DRM_MEM_DRIVER);
+				}
+			}
+		   	drm_free(dev_priv->prim_bufs, sizeof(void *) *
+				 (MGA_NUM_PRIM_BUFS + 1), 
+				 DRM_MEM_DRIVER);
+		}
+		if(dev_priv->head != NULL) {
+		   	mga_freelist_cleanup(dev);
+		}
 
+
 		drm_free(dev->dev_private, sizeof(drm_mga_private_t), 
 			 DRM_MEM_DRIVER);
 		dev->dev_private = NULL;
@@ -85,106 +724,36 @@
 	return 0;
 }
 
-static int mga_alloc_kernel_queue(drm_device_t *dev)
-{
-	drm_queue_t *queue = NULL;
-				/* Allocate a new queue */
-	down(&dev->struct_sem);
-	
-   	if(dev->queue_count != 0) {
-	   /* Reseting the kernel context here is not
-	    * a race, since it can only happen when that
-	    * queue is empty.
-	    */
-	   queue = dev->queuelist[DRM_KERNEL_CONTEXT];
-	   printk("Kernel queue already allocated\n");
-	} else {
-	   queue = drm_alloc(sizeof(*queue), DRM_MEM_QUEUES);
-	   if(!queue) {
-	      up(&dev->struct_sem);
-	      printk("out of memory\n");
-	      return -ENOMEM;
-	   }
-	   ++dev->queue_count;
-	   dev->queuelist = drm_alloc(sizeof(*dev->queuelist), 
-				      DRM_MEM_QUEUES);
-	   if(!dev->queuelist) {
-	      up(&dev->struct_sem);
-	      drm_free(queue, sizeof(*queue), DRM_MEM_QUEUES);
-	      printk("out of memory\n");
-	      return -ENOMEM;
-	   }  
-	}
-	   
-	memset(queue, 0, sizeof(*queue));
-	atomic_set(&queue->use_count, 1);
-   	atomic_set(&queue->finalization,  0);
-	atomic_set(&queue->block_count,   0);
-	atomic_set(&queue->block_read,    0);
-	atomic_set(&queue->block_write,   0);
-	atomic_set(&queue->total_queued,  0);
-	atomic_set(&queue->total_flushed, 0);
-	atomic_set(&queue->total_locks,   0);
-
-	init_waitqueue_head(&queue->write_queue);
-	init_waitqueue_head(&queue->read_queue);
-	init_waitqueue_head(&queue->flush_queue);
-
-	queue->flags = 0;
-
-	drm_waitlist_create(&queue->waitlist, dev->dma->buf_count);
-   
-   	dev->queue_slots = 1;
-   	dev->queuelist[DRM_KERNEL_CONTEXT] = queue;
-   	dev->queue_count--;
-	
-	up(&dev->struct_sem);
-	printk("%d (new)\n", dev->queue_count - 1);
-	return DRM_KERNEL_CONTEXT;
-}
-
 static int mga_dma_initialize(drm_device_t *dev, drm_mga_init_t *init) {
 	drm_mga_private_t *dev_priv;
-	drm_map_t *prim_map = NULL;
 	drm_map_t *sarea_map = NULL;
-	int temp;
+	int i;
 
+	DRM_DEBUG("%s\n", __FUNCTION__);
 
 	dev_priv = drm_alloc(sizeof(drm_mga_private_t), DRM_MEM_DRIVER);
 	if(dev_priv == NULL) return -ENOMEM;
 	dev->dev_private = (void *) dev_priv;
 
-	printk("dev_private\n");
-
 	memset(dev_priv, 0, sizeof(drm_mga_private_t));
-      	atomic_set(&dev_priv->pending_bufs, 0);
 
 	if((init->reserved_map_idx >= dev->map_count) ||
 	   (init->buffer_map_idx >= dev->map_count)) {
 		mga_dma_cleanup(dev);
-		printk("reserved_map or buffer_map are invalid\n");
+		DRM_DEBUG("reserved_map or buffer_map are invalid\n");
 		return -EINVAL;
 	}
    
-	if(mga_alloc_kernel_queue(dev) != DRM_KERNEL_CONTEXT) {
-	   mga_dma_cleanup(dev);
-	   DRM_ERROR("Kernel context queue not present\n");
-	}
-
 	dev_priv->reserved_map_idx = init->reserved_map_idx;
 	dev_priv->buffer_map_idx = init->buffer_map_idx;
 	sarea_map = dev->maplist[0];
 	dev_priv->sarea_priv = (drm_mga_sarea_t *) 
 		((u8 *)sarea_map->handle + 
 		 init->sarea_priv_offset);
-	printk("sarea_priv\n");
 
 	/* Scale primary size to the next page */
-	dev_priv->primary_size = ((init->primary_size + PAGE_SIZE - 1) / 
-				  PAGE_SIZE) * PAGE_SIZE;
-	dev_priv->warp_ucode_size = init->warp_ucode_size;
 	dev_priv->chipset = init->chipset;
-	dev_priv->fbOffset = init->fbOffset;
+	dev_priv->frontOffset = init->frontOffset;
 	dev_priv->backOffset = init->backOffset;
 	dev_priv->depthOffset = init->depthOffset;
 	dev_priv->textureOffset = init->textureOffset;
@@ -193,80 +762,82 @@
 	dev_priv->sgram = init->sgram;
 	dev_priv->stride = init->stride;
 
-	dev_priv->frontOrg = init->frontOrg;
-	dev_priv->backOrg = init->backOrg;
-	dev_priv->depthOrg = init->depthOrg;
 	dev_priv->mAccess = init->mAccess;
-	
+   	init_waitqueue_head(&dev_priv->flush_queue);
+	init_waitqueue_head(&dev_priv->buf_queue);
+	dev_priv->WarpPipe = -1;
+
+   	DRM_DEBUG("chipset: %d ucode_size: %d backOffset: %x depthOffset: %x\n",
+		  dev_priv->chipset, dev_priv->warp_ucode_size, 
+		  dev_priv->backOffset, dev_priv->depthOffset);
+   	DRM_DEBUG("cpp: %d sgram: %d stride: %d maccess: %x\n",
+		  dev_priv->cpp, dev_priv->sgram, dev_priv->stride, 
+		  dev_priv->mAccess);
    
-	printk("memcpy\n");
 	memcpy(&dev_priv->WarpIndex, &init->WarpIndex, 
-	       sizeof(mgaWarpIndex) * MGA_MAX_WARP_PIPES);
-	printk("memcpy done\n");
-	prim_map = dev->maplist[init->reserved_map_idx];
-	dev_priv->prim_phys_head = dev->agp->base + init->reserved_map_agpstart;
-	temp = init->warp_ucode_size + dev_priv->primary_size;
-	temp = ((temp + PAGE_SIZE - 1) / 
-		PAGE_SIZE) * PAGE_SIZE;
-	printk("temp : %x\n", temp);
-	printk("dev->agp->base: %lx\n", dev->agp->base);
-	printk("init->reserved_map_agpstart: %x\n", init->reserved_map_agpstart);
+	       sizeof(drm_mga_warp_index_t) * MGA_MAX_WARP_PIPES);
 
+   	for (i = 0 ; i < MGA_MAX_WARP_PIPES ; i++) 
+		DRM_DEBUG("warp pipe %d: installed: %d phys: %lx size: %x\n",
+			  i, 
+			  dev_priv->WarpIndex[i].installed,
+			  dev_priv->WarpIndex[i].phys_addr,
+			  dev_priv->WarpIndex[i].size);
 
-	dev_priv->ioremap = drm_ioremap(dev->agp->base + init->reserved_map_agpstart, 
-					temp);
-	if(dev_priv->ioremap == NULL) {
-		printk("Ioremap failed\n");
+   	if(mga_init_primary_bufs(dev, init) != 0) {
+		DRM_ERROR("Can not initialize primary buffers\n");
+		mga_dma_cleanup(dev);
+		return -ENOMEM;
+	}
+   	dev_priv->real_status_page = mga_alloc_page(dev);
+      	if(dev_priv->real_status_page == 0UL) {
 		mga_dma_cleanup(dev);
+		DRM_ERROR("Can not allocate status page\n");
 		return -ENOMEM;
 	}
 
+   	dev_priv->status_page = 
+		ioremap_nocache(virt_to_bus((void *)dev_priv->real_status_page),
+				PAGE_SIZE);
 
+   	if(dev_priv->status_page == NULL) {
+		mga_dma_cleanup(dev);
+		DRM_ERROR("Can not remap status page\n");
+		return -ENOMEM;
+	}
 
-	dev_priv->prim_head = (u32 *)dev_priv->ioremap;
-	printk("dev_priv->prim_head : %p\n", dev_priv->prim_head);
-	dev_priv->current_dma_ptr = dev_priv->prim_head;
-	dev_priv->prim_num_dwords = 0;
-	dev_priv->prim_max_dwords = dev_priv->primary_size / 4;
-   
-	printk("dma initialization\n");
+   	/* Write status page when secend or softrap occurs */
+   	MGA_WRITE(MGAREG_PRIMPTR, 
+		  virt_to_bus((void *)dev_priv->real_status_page) | 0x00000003);
+      
 
 	/* Private is now filled in, initialize the hardware */
 	{
 		PRIMLOCALS;
-		PRIMRESET( dev_priv );
 		PRIMGETPTR( dev_priv );
+	   	   
 		PRIMOUTREG(MGAREG_DMAPAD, 0);
 		PRIMOUTREG(MGAREG_DMAPAD, 0);
-		PRIMOUTREG(MGAREG_DWGSYNC, 0);
+		PRIMOUTREG(MGAREG_DWGSYNC, 0x0100);
 		PRIMOUTREG(MGAREG_SOFTRAP, 0);
-		PRIMADVANCE( dev_priv );
-
 		/* Poll for the first buffer to insure that
 		 * the status register will be correct
 		 */
-	   	printk("phys_head : %lx\n", phys_head);
-   
-		MGA_WRITE(MGAREG_DWGSYNC, MGA_SYNC_TAG);
-
-		while(MGA_READ(MGAREG_DWGSYNC) != MGA_SYNC_TAG) {
-			int i;
-			for(i = 0 ; i < 4096; i++) mga_delay();
-		}
-
+	   
+		mga_flush_write_combine();
 	   	MGA_WRITE(MGAREG_PRIMADDRESS, phys_head | TT_GENERAL);
 
 		MGA_WRITE(MGAREG_PRIMEND, ((phys_head + num_dwords * 4) | 
 					   PDEA_pagpxfer_enable));
-
-		while(MGA_READ(MGAREG_DWGSYNC) == MGA_SYNC_TAG) {
-			int i;
-			for(i = 0; i < 4096; i++) mga_delay();
-		}
+	   
+	   	while(MGA_READ(MGAREG_DWGSYNC) != 0x0100) ;
+	}
 
+	if(mga_freelist_init(dev) != 0) {
+	   	DRM_ERROR("Could not initialize freelist\n");
+	   	mga_dma_cleanup(dev);
+	   	return -ENOMEM;
 	}
-   
-	printk("dma init was successful\n");
 	return 0;
 }
 
@@ -277,6 +848,8 @@
 	drm_device_t *dev = priv->dev;
 	drm_mga_init_t init;
    
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+
 	copy_from_user_ret(&init, (drm_mga_init_t *)arg, sizeof(init), -EFAULT);
    
 	switch(init.func) {
@@ -289,495 +862,6 @@
 	return -EINVAL;
 }
 
-#define MGA_ILOAD_CMD (DC_opcod_iload | DC_atype_rpl |          	\
-		       DC_linear_linear | DC_bltmod_bfcol |       	\
-		       (0xC << DC_bop_SHIFT) | DC_sgnzero_enable |	\
-		       DC_shftzero_enable | DC_clipdis_enable)
-
-static void __mga_iload_small(drm_device_t *dev,
-			      drm_buf_t *buf,
-			      int use_agp) 
-{
-   	drm_mga_private_t *dev_priv = dev->dev_private;
-   	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
-      	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
-   	unsigned long address = (unsigned long)buf->bus_address;
-	int length = buf->used;
-	int y1 = buf_priv->boxes[0].y1;
-	int x1 = buf_priv->boxes[0].x1;
-	int y2 = buf_priv->boxes[0].y2;
-	int x2 = buf_priv->boxes[0].x2;
-   	int dstorg = buf_priv->ContextState[MGA_CTXREG_DSTORG];
-   	int maccess = buf_priv->ContextState[MGA_CTXREG_MACCESS];
-   	PRIMLOCALS;
-
-	PRIMRESET(dev_priv);		
-   	PRIMGETPTR(dev_priv);
-   
-   	PRIMOUTREG(MGAREG_DSTORG, dstorg | use_agp);
-   	PRIMOUTREG(MGAREG_MACCESS, maccess);
-   	PRIMOUTREG(MGAREG_PITCH, (1 << 15));
-   	PRIMOUTREG(MGAREG_YDST, y1 * (x2 - x1));   
-   	PRIMOUTREG(MGAREG_LEN, 1);
-   	PRIMOUTREG(MGAREG_FXBNDRY, ((x2 - x1) * (y2 - y1) - 1) << 16);
-   	PRIMOUTREG(MGAREG_AR0, (x2 - x1) * (y2 - y1) - 1);
-   	PRIMOUTREG(MGAREG_AR3, 0);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DWGCTL+MGAREG_MGA_EXEC, MGA_ILOAD_CMD);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_SECADDRESS, address | TT_BLIT);
-   	PRIMOUTREG(MGAREG_SECEND, (address + length) | use_agp);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DWGSYNC, 0);
-   	PRIMOUTREG(MGAREG_SOFTRAP, 0);
-   	PRIMADVANCE(dev_priv);
-#if 0
-   	/* For now we need to set this in the ioctl */
-	sarea_priv->dirty |= MGASAREA_NEW_CONTEXT;
-#endif
-   	MGA_WRITE(MGAREG_DWGSYNC, MGA_SYNC_TAG);
-   	while(MGA_READ(MGAREG_DWGSYNC) != MGA_SYNC_TAG) ;
-
-      	MGA_WRITE(MGAREG_PRIMADDRESS, dev_priv->prim_phys_head | TT_GENERAL);
-	MGA_WRITE(MGAREG_PRIMEND, (phys_head + num_dwords * 4) | use_agp);   
-}
-
-static void __mga_iload_xy(drm_device_t *dev,
-			   drm_buf_t *buf,
-			   int use_agp) 
-{
-      	drm_mga_private_t *dev_priv = dev->dev_private;
-   	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
-      	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	unsigned long address = (unsigned long)buf->bus_address;
-   	int length = buf->used;
-	int y1 = buf_priv->boxes[0].y1;
-	int x1 = buf_priv->boxes[0].x1;
-	int y2 = buf_priv->boxes[0].y2;
-	int x2 = buf_priv->boxes[0].x2;
-   	int dstorg = buf_priv->ContextState[MGA_CTXREG_DSTORG];
-   	int maccess = buf_priv->ContextState[MGA_CTXREG_MACCESS];
-   	int pitch = buf_priv->ServerState[MGA_2DREG_PITCH];
-   	int width, height;
-   	int texperdword = 0;
-   	PRIMLOCALS;
-   
-   	width = (x2 - x1);
-   	height = (y2 - y1);
-   	switch((maccess & 0x00000003)) {
-	 	case 0:
-	   	texperdword = 4;
-      		break;
-	 	case 1:
-      		texperdword = 2;
-	   	break;
-    		case 2:
-      		texperdword = 1;
-      		break;
-    		default:
-      		DRM_ERROR("Invalid maccess value passed to __mga_iload_xy\n");
-	   	return;  
-	}
-   
-   	x2 = x1 + width;
-   	x2 = (x2 + (texperdword - 1)) & ~(texperdword - 1);
-   	x1 = (x1 + (texperdword - 1)) & ~(texperdword - 1);
-   	width = x2 - x1;
-   
-	PRIMRESET(dev_priv);		
-   	PRIMGETPTR(dev_priv);
-   	PRIMOUTREG(MGAREG_DSTORG, dstorg | use_agp);
-   	PRIMOUTREG(MGAREG_MACCESS, maccess);
-   	PRIMOUTREG(MGAREG_PITCH, pitch);
-   	PRIMOUTREG(MGAREG_YDSTLEN, (y1 << 16) | height);
-   
-   	PRIMOUTREG(MGAREG_FXBNDRY, ((x1+width-1) << 16) | x1);
-   	PRIMOUTREG(MGAREG_AR0, width * height - 1);
-      	PRIMOUTREG(MGAREG_AR3, 0 );
-   	PRIMOUTREG(MGAREG_DWGCTL+MGAREG_MGA_EXEC, MGA_ILOAD_CMD);
-	   	   
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_SECADDRESS, address | TT_BLIT);
-   	PRIMOUTREG(MGAREG_SECEND, (address + length) | use_agp);
-	   
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   	PRIMOUTREG(MGAREG_DWGSYNC, 0);
-   	PRIMOUTREG(MGAREG_SOFTRAP, 0);
-   	PRIMADVANCE(dev_priv);
-#if 0
-   	/* For now we need to set this in the ioctl */
-	sarea_priv->dirty |= MGASAREA_NEW_CONTEXT;
-#endif
-   	MGA_WRITE(MGAREG_DWGSYNC, MGA_SYNC_TAG);
-   	while(MGA_READ(MGAREG_DWGSYNC) != MGA_SYNC_TAG) ;
-
-      	MGA_WRITE(MGAREG_PRIMADDRESS, dev_priv->prim_phys_head | TT_GENERAL);
-	MGA_WRITE(MGAREG_PRIMEND, (phys_head + num_dwords * 4) | use_agp);
-}
-
-static void mga_dma_dispatch_iload(drm_device_t *dev, drm_buf_t *buf)
-{
-   	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
-
-	int use_agp = PDEA_pagpxfer_enable;
-	int x1 = buf_priv->boxes[0].x1;
-	int x2 = buf_priv->boxes[0].x2;
-   
-   	if((x2 - x1) < 32) {
-	   	printk("using iload small\n");
-	   	__mga_iload_small(dev, buf, use_agp);
-	} else {
-	   	printk("using iload xy\n");
-	   	__mga_iload_xy(dev, buf, use_agp); 
-	}   
-}
-
-static void mga_dma_dispatch_vertex(drm_device_t *dev, drm_buf_t *buf)
-{
-   	drm_mga_private_t *dev_priv = dev->dev_private;
-	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
-	unsigned long address = (unsigned long)buf->bus_address;
-	int length = buf->used;
-	int use_agp = PDEA_pagpxfer_enable;
-	int i, count;
-   	PRIMLOCALS;
-
-	PRIMRESET(dev_priv);
-	
-	count = buf_priv->nbox;
-	if (count == 0) 
-		count = 1;
-
-	mgaEmitState( dev_priv, buf_priv );
-
-	for (i = 0 ; i < count ; i++) {		
-		if (i < buf_priv->nbox)
-			mgaEmitClipRect( dev_priv, &buf_priv->boxes[i] );
-
-		PRIMGETPTR(dev_priv);
-		PRIMOUTREG( MGAREG_DMAPAD, 0);
-		PRIMOUTREG( MGAREG_DMAPAD, 0);
-		PRIMOUTREG( MGAREG_SECADDRESS, address | TT_VERTEX);
-		PRIMOUTREG( MGAREG_SECEND, (address + length) | use_agp);
-
-		PRIMOUTREG( MGAREG_DMAPAD, 0);
-		PRIMOUTREG( MGAREG_DMAPAD, 0);
-		PRIMOUTREG( MGAREG_DWGSYNC, 0);
-		PRIMOUTREG( MGAREG_SOFTRAP, 0);
-		PRIMADVANCE(dev_priv);
-	}
-
-	PRIMGETPTR( dev_priv );
-
-   	MGA_WRITE(MGAREG_DWGSYNC, MGA_SYNC_TAG);
-   	while(MGA_READ(MGAREG_DWGSYNC) != MGA_SYNC_TAG) ;
-
-      	MGA_WRITE(MGAREG_PRIMADDRESS, dev_priv->prim_phys_head | TT_GENERAL);
-	MGA_WRITE(MGAREG_PRIMEND, (phys_head + num_dwords * 4) | use_agp);
-}
-
-
-/* Used internally for the small buffers generated from client state
- * information. 
- */
-static void mga_dma_dispatch_general(drm_device_t *dev, drm_buf_t *buf)
-{
-   	drm_mga_private_t *dev_priv = dev->dev_private;
-	unsigned long address = (unsigned long)buf->bus_address;
-	int length = buf->used;
-	int use_agp = PDEA_pagpxfer_enable;
-   	PRIMLOCALS;
-
-	PRIMRESET(dev_priv);
-   	PRIMGETPTR(dev_priv);
-
-	PRIMOUTREG( MGAREG_DMAPAD, 0);
-	PRIMOUTREG( MGAREG_DMAPAD, 0);
-	PRIMOUTREG( MGAREG_SECADDRESS, address | TT_GENERAL);
-	PRIMOUTREG( MGAREG_SECEND, (address + length) | use_agp);
-
-	PRIMOUTREG( MGAREG_DMAPAD, 0);
-	PRIMOUTREG( MGAREG_DMAPAD, 0);
-      	PRIMOUTREG( MGAREG_DWGSYNC, 0);
-   	PRIMOUTREG( MGAREG_SOFTRAP, 0);
-   	PRIMADVANCE(dev_priv);
-
-   	MGA_WRITE(MGAREG_DWGSYNC, MGA_SYNC_TAG);
-   	while(MGA_READ(MGAREG_DWGSYNC) != MGA_SYNC_TAG) ;
-
-      	MGA_WRITE(MGAREG_PRIMADDRESS, dev_priv->prim_phys_head | TT_GENERAL);
-	MGA_WRITE(MGAREG_PRIMEND, (phys_head + num_dwords * 4) | use_agp);
-}
-
-/* Frees dispatch lock */
-static inline void mga_dma_quiescent(drm_device_t *dev)
-{
-   	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
-
-   	while(1) {
-	   atomic_inc(&dev_priv->dispatch_lock);
-	   if(atomic_read(&dev_priv->dispatch_lock) == 1) {
-	      break;
-	   } else {
-	      atomic_dec(&dev_priv->dispatch_lock);
-	   }
-	}
-	while((MGA_READ(MGAREG_STATUS) & 0x00020001) != 0x00020000) ;
-#if 0
-   MGA_WRITE(MGAREG_DWGSYNC, MGA_SYNC_TAG);
-#endif
-   	while(MGA_READ(MGAREG_DWGSYNC) == MGA_SYNC_TAG) ;
-   	MGA_WRITE(MGAREG_DWGSYNC, MGA_SYNC_TAG);
-	while(MGA_READ(MGAREG_DWGSYNC) != MGA_SYNC_TAG) ;
-   	atomic_dec(&dev_priv->dispatch_lock);
-}
-
-/* Keeps dispatch lock held */
-
-static inline int mga_dma_is_ready(drm_device_t *dev)
-{
-	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
-   
-	atomic_inc(&dev_priv->dispatch_lock);
-	if(atomic_read(&dev_priv->dispatch_lock) == 1) {
-		/* We got the lock */
-		return 1;
-	} else {
-		atomic_dec(&dev_priv->dispatch_lock);
-		return 0;
-	}
-}
-
-static inline int mga_dma_is_ready_no_hold(drm_device_t *dev)
-{
-	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
-   
-	atomic_inc(&dev_priv->dispatch_lock);
-	if(atomic_read(&dev_priv->dispatch_lock) == 1) {
-		/* We got the lock, but free it */
-		atomic_dec(&dev_priv->dispatch_lock);
-		return 1;
-	} else {
-		atomic_dec(&dev_priv->dispatch_lock);
-		return 0;
-	}
-}
-
-static void mga_dma_service(int irq, void *device, struct pt_regs *regs)
-{
-	drm_device_t	 *dev = (drm_device_t *)device;
-	drm_device_dma_t *dma = dev->dma;
-   	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
-
-	atomic_dec(&dev_priv->dispatch_lock);   	
-	atomic_inc(&dev->total_irq);
-      	MGA_WRITE(MGAREG_ICLEAR, 0xfa7);
-
-				/* Free previous buffer */
-   	if (test_and_set_bit(0, &dev->dma_flag)) {
-	   	atomic_inc(&dma->total_missed_free);
-	   	return;
-	}
-   	if (dma->this_buffer) {
-	   	drm_free_buffer(dev, dma->this_buffer);
-	   	dma->this_buffer = NULL;
-	}
-   	clear_bit(0, &dev->dma_flag);
-
-				/* Dispatch new buffer */
-   	queue_task(&dev->tq, &tq_immediate);
-   	mark_bh(IMMEDIATE_BH);
-
-}
-
-/* Only called by mga_dma_schedule. */
-static int mga_do_dma(drm_device_t *dev, int locked)
-{
-	drm_buf_t	 *buf;
-	int		 retcode = 0;
-	drm_device_dma_t *dma = dev->dma;
-      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
-	drm_mga_buf_priv_t *buf_priv;
-
-   	printk("mga_do_dma\n");
-	if (test_and_set_bit(0, &dev->dma_flag)) {
-		atomic_inc(&dma->total_missed_dma);
-		return -EBUSY;
-	}
-	
-	if (!dma->next_buffer) {
-		DRM_ERROR("No next_buffer\n");
-		clear_bit(0, &dev->dma_flag);
-		return -EINVAL;
-	}
-
-	buf	= dma->next_buffer;
-
-	printk("context %d, buffer %d\n", buf->context, buf->idx);
-
-	if (buf->list == DRM_LIST_RECLAIM) {
-		drm_clear_next_buffer(dev);
-		drm_free_buffer(dev, buf);
-		clear_bit(0, &dev->dma_flag);
-		return -EINVAL;
-	}
-
-	if (!buf->used) {
-		DRM_ERROR("0 length buffer\n");
-		drm_clear_next_buffer(dev);
-		drm_free_buffer(dev, buf);
-		clear_bit(0, &dev->dma_flag);
-		return 0;
-	}
-	
-	if (mga_dma_is_ready(dev) == 0) {
-		clear_bit(0, &dev->dma_flag);
-		return -EBUSY;
-	}
-   
-	/* Always hold the hardware lock while dispatching.
-	 */
-	if (!locked && !drm_lock_take(&dev->lock.hw_lock->lock,
-				      DRM_KERNEL_CONTEXT)) {
-		atomic_inc(&dma->total_missed_lock);
-		clear_bit(0, &dev->dma_flag);
-		atomic_dec(&dev_priv->dispatch_lock);
-		return -EBUSY;
-	}
-
-   	dma->next_queue	 = dev->queuelist[DRM_KERNEL_CONTEXT];
-	drm_clear_next_buffer(dev);
-	buf->pending	 = 1;
-	buf->waiting	 = 0;
-	buf->list	 = DRM_LIST_PEND;
-
-	buf_priv = buf->dev_private;
-
-   	printk("dispatch!\n");
-	switch (buf_priv->dma_type) {
-	case MGA_DMA_GENERAL:
-		mga_dma_dispatch_general(dev, buf);
-		break;
-	case MGA_DMA_VERTEX:
-		mga_dma_dispatch_vertex(dev, buf);
-		break;
-/*  	case MGA_DMA_SETUP: */
-/*  		mga_dma_dispatch_setup(dev, address, length); */
-/*  		break; */
-	case MGA_DMA_ILOAD:
-		mga_dma_dispatch_iload(dev, buf);
-		break;
-	default:
-		printk("bad buffer type %x in dispatch\n", buf_priv->dma_type);
-		break;
-	}
-   	atomic_dec(&dev_priv->pending_bufs);
-
-	drm_free_buffer(dev, dma->this_buffer);
-	dma->this_buffer = buf;
-
-	atomic_add(buf->used, &dma->total_bytes);
-	atomic_inc(&dma->total_dmas);
-
-	if (!locked) {
-		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
-				  DRM_KERNEL_CONTEXT)) {
-			DRM_ERROR("\n");
-		}
-	}
-
-	clear_bit(0, &dev->dma_flag);
-   
-   if(!atomic_read(&dev_priv->pending_bufs)) {
-      wake_up_interruptible(&dev->queuelist[DRM_KERNEL_CONTEXT]->flush_queue);
-   }
-   
-#if 0
-   wake_up_interruptible(&dev->lock.lock_queue);
-#endif
-   
-	/* We hold the dispatch lock until the interrupt handler
-	 * frees it
-	 */
-	return retcode;
-}
-
-static void mga_dma_schedule_timer_wrapper(unsigned long dev)
-{
-	mga_dma_schedule((drm_device_t *)dev, 0);
-}
-
-static void mga_dma_schedule_tq_wrapper(void *dev)
-{
-	mga_dma_schedule(dev, 0);
-}
-
-int mga_dma_schedule(drm_device_t *dev, int locked)
-{
-	drm_queue_t	 *q;
-	drm_buf_t	 *buf;
-	int		 retcode   = 0;
-	int		 processed = 0;
-	int		 missed;
-	int		 expire	   = 20;
-	drm_device_dma_t *dma	   = dev->dma;
-
-      	printk("mga_dma_schedule\n");
-
-	if (test_and_set_bit(0, &dev->interrupt_flag)) {
-				/* Not reentrant */
-		atomic_inc(&dma->total_missed_sched);
-		return -EBUSY;
-	}
-	missed = atomic_read(&dma->total_missed_sched);
-
-again:
-	/* There is only one queue:
-	 */
-	if (!dma->next_buffer && DRM_WAITCOUNT(dev, DRM_KERNEL_CONTEXT)) {
-		q   = dev->queuelist[DRM_KERNEL_CONTEXT];
-		buf = drm_waitlist_get(&q->waitlist);
-		dma->next_buffer = buf;
-		dma->next_queue	 = q;
-		if (buf && buf->list == DRM_LIST_RECLAIM) {
-			drm_clear_next_buffer(dev);
-			drm_free_buffer(dev, buf);
-		}
-	}
-
-	if (dma->next_buffer) {
-		if (!(retcode = mga_do_dma(dev, locked))) 
-			++processed;
-	}
-
-	/* Try again if we succesfully dispatched a buffer, or if someone 
-	 * tried to schedule while we were working.
-	 */
-	if (--expire) {
-		if (missed != atomic_read(&dma->total_missed_sched)) {
-			atomic_inc(&dma->total_lost);
-		   	if (mga_dma_is_ready_no_hold(dev)) 
-				goto again;
-		}
-
-		if (processed && mga_dma_is_ready_no_hold(dev)) {
-			atomic_inc(&dma->total_lost);
-			processed = 0;
-			goto again;
-		}
-	}
-	
-	clear_bit(0, &dev->interrupt_flag);
-	
-	return retcode;
-}
-
 int mga_irq_install(drm_device_t *dev, int irq)
 {
 	int retcode;
@@ -792,7 +876,7 @@
 	dev->irq = irq;
 	up(&dev->struct_sem);
 	
-	printk("install irq handler %d\n", irq);
+	DRM_DEBUG("install irq handler %d\n", irq);
 
 	dev->context_flag     = 0;
 	dev->interrupt_flag   = 0;
@@ -802,17 +886,15 @@
 	dev->dma->this_buffer = NULL;
 	dev->tq.next	      = NULL;
 	dev->tq.sync	      = 0;
-	dev->tq.routine	      = mga_dma_schedule_tq_wrapper;
+	dev->tq.routine	      = mga_dma_task_queue;
 	dev->tq.data	      = dev;
 
 				/* Before installing handler */
-	MGA_WRITE(MGAREG_ICLEAR, 0xfa7);
 	MGA_WRITE(MGAREG_IEN, 0);
-
    				/* Install handler */
 	if ((retcode = request_irq(dev->irq,
 				   mga_dma_service,
-				   0,
+				   SA_SHIRQ,
 				   dev->devname,
 				   dev))) {
 		down(&dev->struct_sem);
@@ -820,11 +902,9 @@
 		up(&dev->struct_sem);
 		return retcode;
 	}
-
 				/* After installing handler */
-   	MGA_WRITE(MGAREG_ICLEAR, 0xfa7);
+   	MGA_WRITE(MGAREG_ICLEAR, 0x00000001);
 	MGA_WRITE(MGAREG_IEN, 0x00000001);
-
 	return 0;
 }
 
@@ -838,19 +918,13 @@
 	up(&dev->struct_sem);
 	
 	if (!irq) return -EINVAL;
-	
-	printk("remove irq handler %d\n", irq);
-
-      	MGA_WRITE(MGAREG_ICLEAR, 0xfa7);
+   	DRM_DEBUG("remove irq handler %d\n", irq);
+      	MGA_WRITE(MGAREG_ICLEAR, 0x00000001);
 	MGA_WRITE(MGAREG_IEN, 0);
-   	MGA_WRITE(MGAREG_ICLEAR, 0xfa7);
-
 	free_irq(irq, dev);
-
 	return 0;
 }
 
-
 int mga_control(struct inode *inode, struct file *filp, unsigned int cmd,
 		  unsigned long arg)
 {
@@ -859,7 +933,9 @@
 	drm_control_t	ctl;
    
 	copy_from_user_ret(&ctl, (drm_control_t *)arg, sizeof(ctl), -EFAULT);
-	
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+
 	switch (ctl.func) {
 	case DRM_INST_HANDLER:
 		return mga_irq_install(dev, ctl.irq);
@@ -870,36 +946,69 @@
 	}
 }
 
-int mga_flush_queue(drm_device_t *dev)
+static int mga_flush_queue(drm_device_t *dev)
 {
    	DECLARE_WAITQUEUE(entry, current);
-	drm_queue_t	  *q = dev->queuelist[DRM_KERNEL_CONTEXT];
-   	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+  	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
    	int ret = 0;
-   	
-   	printk("mga_flush_queue\n");
-   	if(atomic_read(&dev_priv->pending_bufs) != 0) {
-	   current->state = TASK_INTERRUPTIBLE;
-	   add_wait_queue(&q->flush_queue, &entry);
-	   for (;;) {
-	      	if (!atomic_read(&dev_priv->pending_bufs)) break;
-	      	printk("Calling schedule from flush_queue : %d\n",
-		       atomic_read(&dev_priv->pending_bufs));
-	      	mga_dma_schedule(dev, 1);
-	      	schedule();
-	      	if (signal_pending(current)) {
-		   	ret = -EINTR; /* Can't restart */
-		   	break;
-		}
-	   }
-	   printk("Exited out of schedule from flush_queue\n");
-	   current->state = TASK_RUNNING;
-	   remove_wait_queue(&q->flush_queue, &entry);
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	if(dev_priv == NULL) {
+	   	return 0;
 	}
    
+   	if(dev_priv->next_prim->num_dwords != 0) {
+   		current->state = TASK_INTERRUPTIBLE;
+   		add_wait_queue(&dev_priv->flush_queue, &entry);
+		set_bit(MGA_IN_FLUSH, &dev_priv->dispatch_status);
+		mga_dma_schedule(dev, 0);
+   		for (;;) {
+	   		if (!test_bit(MGA_IN_FLUSH, 
+				      &dev_priv->dispatch_status)) 
+				break;
+		   	atomic_inc(&dev->total_sleeps);
+	      		schedule();
+	      		if (signal_pending(current)) {
+		   		ret = -EINTR; /* Can't restart */
+				clear_bit(MGA_IN_FLUSH, 
+					  &dev_priv->dispatch_status);
+		   		break;
+			}
+		}
+   		current->state = TASK_RUNNING;
+   		remove_wait_queue(&dev_priv->flush_queue, &entry);
+	}
    	return ret;
 }
 
+/* Must be called with the lock held */
+void mga_reclaim_buffers(drm_device_t *dev, pid_t pid)
+{
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma) return;
+      	if(dev->dev_private == NULL) return;
+	if(dma->buflist == NULL) return;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+        mga_flush_queue(dev);
+
+	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+
+		/* Only buffers that need to get reclaimed ever 
+		 * get set to free 
+		 */
+		if (buf->pid == pid  && buf_priv) {
+			if(buf_priv->my_freelist->age == MGA_BUF_USED) 
+		     		buf_priv->my_freelist->age = MGA_BUF_FREE;
+		}
+	}
+}
+
 int mga_lock(struct inode *inode, struct file *filp, unsigned int cmd,
 	       unsigned long arg)
 {
@@ -909,6 +1018,7 @@
 	int		  ret	= 0;
 	drm_lock_t	  lock;
 
+	DRM_DEBUG("%s\n", __FUNCTION__);
 	copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT);
 
 	if (lock.context == DRM_KERNEL_CONTEXT) {
@@ -916,16 +1026,15 @@
 			  current->pid, lock.context);
 		return -EINVAL;
 	}
-
-   	printk("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
-		  lock.context, current->pid, dev->lock.hw_lock->lock,
-		  lock.flags);
-
+   
+   	DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
+	       lock.context, current->pid, dev->lock.hw_lock->lock,
+	       lock.flags);
 
 	if (lock.context < 0) {
 		return -EINVAL;
 	}
-
+   
 	/* Only one queue:
 	 */
 
@@ -948,8 +1057,6 @@
 				/* Contention */
 			atomic_inc(&dev->total_sleeps);
 			current->state = TASK_INTERRUPTIBLE;
-		   	current->policy |= SCHED_YIELD;
-		   	printk("Calling lock schedule\n");
 			schedule();
 			if (signal_pending(current)) {
 				ret = -ERESTARTSYS;
@@ -962,17 +1069,47 @@
 	
 	if (!ret) {
 		if (lock.flags & _DRM_LOCK_QUIESCENT) {
-		   	printk("_DRM_LOCK_QUIESCENT\n");
-		   	ret = mga_flush_queue(dev);
-		   	if(ret != 0) {
-			   drm_lock_free(dev, &dev->lock.hw_lock->lock,
-					 lock.context);
-			} else {
-			   mga_dma_quiescent(dev);
-			}
+		   DRM_DEBUG("_DRM_LOCK_QUIESCENT\n");
+		   mga_flush_queue(dev);
+		   mga_dma_quiescent(dev);
 		}
 	}
-	printk("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
+   
+	DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
 	return ret;
 }
 		
+int mga_flush_ioctl(struct inode *inode, struct file *filp, 
+		    unsigned int cmd, unsigned long arg)
+{
+       	drm_file_t	  *priv	  = filp->private_data;
+    	drm_device_t	  *dev	  = priv->dev;
+	drm_lock_t	  lock;
+      	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+
+   	DRM_DEBUG("%s\n", __FUNCTION__);
+	copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT);
+
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_flush_ioctl called without lock held\n");
+		return -EINVAL;
+	}
+
+   	if(lock.flags & _DRM_LOCK_FLUSH || lock.flags & _DRM_LOCK_FLUSH_ALL) {
+		drm_mga_prim_buf_t *temp_buf;
+
+		temp_buf = dev_priv->current_prim;
+
+		if(temp_buf && temp_buf->num_dwords) {
+			set_bit(MGA_BUF_FORCE_FIRE, &temp_buf->buffer_status);
+			mga_advance_primary(dev);
+ 		}
+		mga_dma_schedule(dev, 1);
+	}
+   	if(lock.flags & _DRM_LOCK_QUIESCENT) {
+		mga_flush_queue(dev);
+		mga_dma_quiescent(dev);
+	}
+
+    	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.h:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.h:removed
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.h:1.1	Fri Feb 11 09:26:07 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.h	Sat Jul  1 20:43:17 2000
@@ -1,112 +0,0 @@
-#ifndef MGA_DMA_H
-#define MGA_DMA_H
-
-#include "mga_drm_public.h"
-
-
-/* Isn't this fun.  This has to be fixed asap by emitting primary
- * dma commands in the 'do_dma' ioctl.
- */
-typedef struct {
-	int dma_type;
-
-   	unsigned int ContextState[MGA_CTX_SETUP_SIZE];
-   	unsigned int ServerState[MGA_2D_SETUP_SIZE];
-   	unsigned int TexState[2][MGA_TEX_SETUP_SIZE];
-   	unsigned int WarpPipe;
-   	unsigned int dirty;
-
-   	unsigned int nbox;
-   	xf86drmClipRectRec boxes[MGA_NR_SAREA_CLIPRECTS];
-} drm_mga_buf_priv_t;
-
-
-#define MGA_DMA_GENERAL 0
-#define MGA_DMA_VERTEX  1
-#define MGA_DMA_SETUP   2
-#define MGA_DMA_ILOAD   3
-
-
-#define DWGREG0 	0x1c00
-#define DWGREG0_END 	0x1dff
-#define DWGREG1		0x2c00
-#define DWGREG1_END	0x2dff
-
-#define ISREG0(r)	(r >= DWGREG0 && r <= DWGREG0_END)
-#define ADRINDEX0(r)	(u8)((r - DWGREG0) >> 2)
-#define ADRINDEX1(r)	(u8)(((r - DWGREG1) >> 2) | 0x80)
-#define ADRINDEX(r)	(ISREG0(r) ? ADRINDEX0(r) : ADRINDEX1(r)) 
-
-
-/* Macros for inserting commands into a secondary dma buffer.
- */
-
-#define DMALOCALS	u8 tempIndex[4]; u32 *dma_ptr; \
-			int outcount, num_dwords;
-
-#define	DMAGETPTR(buf) do {			\
-  dma_ptr = (u32 *)((u8 *)buf->address + buf->used);	\
-  outcount = 0;					\
-  num_dwords = buf->used / 4;			\
-} while(0)
-
-#define DMAADVANCE(buf)	do {			\
-  buf->used = num_dwords * 4;			\
-} while(0)
-
-#define DMAOUTREG(reg, val) do {		\
-  tempIndex[outcount]=ADRINDEX(reg);		\
-  dma_ptr[++outcount] = val;			\
-  if (outcount == 4) {				\
-     outcount = 0;				\
-     dma_ptr[0] = *(u32 *)tempIndex;		\
-     dma_ptr+=5;				\
-     num_dwords += 5;				\
-  }						\
-}while (0)
-
-
-
-#define VERBO 0
-
-
-/* Primary buffer versions of above -- pretty similar really.
- */
-#define PRIMLOCALS	u8 tempIndex[4]; u32 *dma_ptr; u32 phys_head; \
-			int outcount, num_dwords
-
-#define PRIMRESET(dev_priv) do {				\
-	dev_priv->prim_num_dwords = 0;				\
-   	dev_priv->current_dma_ptr = dev_priv->prim_head;	\
-} while (0)
-	
-#define	PRIMGETPTR(dev_priv) do {		\
-	dma_ptr = dev_priv->current_dma_ptr;	\
-	phys_head = dev_priv->prim_phys_head;	\
-	num_dwords = dev_priv->prim_num_dwords;	\
-	outcount = 0;				\
-} while (0)
-
-#define PRIMADVANCE(dev_priv)	do {		\
-	dev_priv->prim_num_dwords = num_dwords;	\
-	dev_priv->current_dma_ptr = dma_ptr;	\
-} while (0)
-
-#define PRIMOUTREG(reg, val) do {					\
-	tempIndex[outcount]=ADRINDEX(reg);				\
-	dma_ptr[1+outcount] = val;					\
-	if( ++outcount == 4) {						\
-		outcount = 0;						\
-		dma_ptr[0] = *(u32 *)tempIndex;				\
-		dma_ptr+=5;						\
-		num_dwords += 5;					\
-	}								\
-	if (VERBO) 							\
-		printk(KERN_INFO 					\
-		       "OUT %x val %x dma_ptr %p nr_dwords %d\n",	\
-		       outcount, ADRINDEX(reg), dma_ptr, 		\
-		       num_dwords);   					\
-}while (0)
-
-
-#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm.h:1.1
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm.h	Fri Jun 16 17:03:37 2000
@@ -0,0 +1,269 @@
+/* mga_drm.h -- Public header for the Matrox g200/g400 driver -*- linux-c -*-
+ * Created: Tue Jan 25 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Jeff Hartmann <jhartmann@valinux.com>
+ *          Keith Whitwell <keithw@valinux.com>
+ *
+ */
+
+#ifndef _MGA_DRM_H_
+#define _MGA_DRM_H_
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmMga.h)
+ */
+#ifndef _MGA_DEFINES_
+#define _MGA_DEFINES_
+
+#define MGA_F  0x1		/* fog */
+#define MGA_A  0x2		/* alpha */
+#define MGA_S  0x4		/* specular */
+#define MGA_T2 0x8		/* multitexture */
+
+#define MGA_WARP_TGZ            0
+#define MGA_WARP_TGZF           (MGA_F)
+#define MGA_WARP_TGZA           (MGA_A)
+#define MGA_WARP_TGZAF          (MGA_F|MGA_A)
+#define MGA_WARP_TGZS           (MGA_S)
+#define MGA_WARP_TGZSF          (MGA_S|MGA_F)
+#define MGA_WARP_TGZSA          (MGA_S|MGA_A)
+#define MGA_WARP_TGZSAF         (MGA_S|MGA_F|MGA_A)
+#define MGA_WARP_T2GZ           (MGA_T2)
+#define MGA_WARP_T2GZF          (MGA_T2|MGA_F)
+#define MGA_WARP_T2GZA          (MGA_T2|MGA_A)
+#define MGA_WARP_T2GZAF         (MGA_T2|MGA_A|MGA_F)
+#define MGA_WARP_T2GZS          (MGA_T2|MGA_S)
+#define MGA_WARP_T2GZSF         (MGA_T2|MGA_S|MGA_F)
+#define MGA_WARP_T2GZSA         (MGA_T2|MGA_S|MGA_A)
+#define MGA_WARP_T2GZSAF        (MGA_T2|MGA_S|MGA_F|MGA_A)
+
+#define MGA_MAX_G400_PIPES 16
+#define MGA_MAX_G200_PIPES  8	/* no multitex */
+#define MGA_MAX_WARP_PIPES MGA_MAX_G400_PIPES
+
+#define MGA_CARD_TYPE_G200 1
+#define MGA_CARD_TYPE_G400 2
+
+#define MGA_FRONT   0x1
+#define MGA_BACK    0x2
+#define MGA_DEPTH   0x4
+
+/* 3d state excluding texture units:
+ */
+#define MGA_CTXREG_DSTORG   0	/* validated */
+#define MGA_CTXREG_MACCESS  1	
+#define MGA_CTXREG_PLNWT    2	
+#define MGA_CTXREG_DWGCTL    3	
+#define MGA_CTXREG_ALPHACTRL 4
+#define MGA_CTXREG_FOGCOLOR  5
+#define MGA_CTXREG_WFLAG     6
+#define MGA_CTXREG_TDUAL0    7
+#define MGA_CTXREG_TDUAL1    8
+#define MGA_CTXREG_FCOL      9
+#define MGA_CTX_SETUP_SIZE   10
+
+/* 2d state
+ */
+#define MGA_2DREG_PITCH 	0
+#define MGA_2D_SETUP_SIZE 	1
+
+/* Each texture unit has a state:
+ */
+#define MGA_TEXREG_CTL        0
+#define MGA_TEXREG_CTL2       1
+#define MGA_TEXREG_FILTER     2
+#define MGA_TEXREG_BORDERCOL  3
+#define MGA_TEXREG_ORG        4 /* validated */
+#define MGA_TEXREG_ORG1       5
+#define MGA_TEXREG_ORG2       6
+#define MGA_TEXREG_ORG3       7
+#define MGA_TEXREG_ORG4       8
+#define MGA_TEXREG_WIDTH      9
+#define MGA_TEXREG_HEIGHT     10
+#define MGA_TEX_SETUP_SIZE    11
+
+/* What needs to be changed for the current vertex dma buffer?
+ */
+#define MGA_UPLOAD_CTX        0x1
+#define MGA_UPLOAD_TEX0       0x2
+#define MGA_UPLOAD_TEX1       0x4
+#define MGA_UPLOAD_PIPE       0x8
+#define MGA_UPLOAD_TEX0IMAGE  0x10 /* handled client-side */
+#define MGA_UPLOAD_TEX1IMAGE  0x20 /* handled client-side */
+#define MGA_UPLOAD_2D 	      0x40
+#define MGA_WAIT_AGE          0x80 /* handled client-side */
+#define MGA_UPLOAD_CLIPRECTS  0x100 /* handled client-side */
+#define MGA_DMA_FLUSH	      0x200 /* set when someone gets the lock
+                                       quiescent */
+
+/* 32 buffers of 64k each, total 2 meg.
+ */
+#define MGA_DMA_BUF_ORDER     16
+#define MGA_DMA_BUF_SZ        (1<<MGA_DMA_BUF_ORDER)
+#define MGA_DMA_BUF_NR        31
+
+/* Keep these small for testing.
+ */
+#define MGA_NR_SAREA_CLIPRECTS 8
+
+/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+ * regions, subject to a minimum region size of (1<<16) == 64k. 
+ *
+ * Clients may subdivide regions internally, but when sharing between
+ * clients, the region size is the minimum granularity. 
+ */
+
+#define MGA_CARD_HEAP 0
+#define MGA_AGP_HEAP  1
+#define MGA_NR_TEX_HEAPS 2
+#define MGA_NR_TEX_REGIONS 16
+#define MGA_LOG_MIN_TEX_REGION_SIZE 16
+#endif
+
+typedef struct _drm_mga_warp_index {
+   	int installed;
+   	unsigned long phys_addr;
+   	int size;
+} drm_mga_warp_index_t;
+
+typedef struct drm_mga_init {
+   	enum { 
+	   	MGA_INIT_DMA = 0x01,
+	       	MGA_CLEANUP_DMA = 0x02
+	} func;
+   	int reserved_map_agpstart;
+   	int reserved_map_idx;
+   	int buffer_map_idx;
+   	int sarea_priv_offset;
+   	int primary_size;
+   	int warp_ucode_size;
+   	unsigned int frontOffset;
+   	unsigned int backOffset;
+   	unsigned int depthOffset;
+   	unsigned int textureOffset;
+   	unsigned int textureSize;
+        unsigned int agpTextureOffset;
+        unsigned int agpTextureSize;
+   	unsigned int cpp;
+   	unsigned int stride;
+   	int sgram;
+	int chipset;
+   	drm_mga_warp_index_t WarpIndex[MGA_MAX_WARP_PIPES];
+	unsigned int mAccess;
+} drm_mga_init_t;
+
+/* Warning: if you change the sarea structure, you must change the Xserver
+ * structures as well */
+
+typedef struct _drm_mga_tex_region {
+	unsigned char next, prev;	
+	unsigned char in_use;	
+	unsigned int age;			
+} drm_mga_tex_region_t;
+
+typedef struct _drm_mga_sarea {
+	/* The channel for communication of state information to the kernel
+	 * on firing a vertex dma buffer.
+	 */
+   	unsigned int ContextState[MGA_CTX_SETUP_SIZE];
+   	unsigned int ServerState[MGA_2D_SETUP_SIZE];
+   	unsigned int TexState[2][MGA_TEX_SETUP_SIZE];
+   	unsigned int WarpPipe;
+   	unsigned int dirty;
+
+   	unsigned int nbox;
+   	drm_clip_rect_t boxes[MGA_NR_SAREA_CLIPRECTS];
+
+
+	/* Information about the most recently used 3d drawable.  The
+	 * client fills in the req_* fields, the server fills in the 
+	 * exported_ fields and puts the cliprects into boxes, above.
+	 *
+	 * The client clears the exported_drawable field before
+	 * clobbering the boxes data.
+	 */
+        unsigned int req_drawable;	 /* the X drawable id */
+	unsigned int req_draw_buffer;	 /* MGA_FRONT or MGA_BACK */
+
+        unsigned int exported_drawable;	 
+	unsigned int exported_index; 
+        unsigned int exported_stamp;	
+        unsigned int exported_buffers;	 
+        unsigned int exported_nfront;
+        unsigned int exported_nback;
+	int exported_back_x, exported_front_x, exported_w;	
+	int exported_back_y, exported_front_y, exported_h;
+   	drm_clip_rect_t exported_boxes[MGA_NR_SAREA_CLIPRECTS];
+   
+	/* Counters for aging textures and for client-side throttling.
+	 */
+        unsigned int last_enqueue;	/* last time a buffer was enqueued */
+	unsigned int last_dispatch;	/* age of the most recently dispatched buffer */
+	unsigned int last_quiescent;     /*  */
+
+
+	/* LRU lists for texture memory in agp space and on the card
+	 */
+	drm_mga_tex_region_t texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS+1];
+	unsigned int texAge[MGA_NR_TEX_HEAPS];
+	
+	/* Mechanism to validate card state.
+	 */
+   	int ctxOwner;
+} drm_mga_sarea_t;	
+
+/* Device specific ioctls:
+ */
+typedef struct _drm_mga_clear {
+	unsigned int clear_color;
+	unsigned int clear_depth;
+	unsigned int flags;
+} drm_mga_clear_t;
+
+typedef struct _drm_mga_swap {
+   	int dummy;
+} drm_mga_swap_t;
+
+typedef struct _drm_mga_iload {
+	int idx;
+	int length;
+	unsigned int destOrg;
+} drm_mga_iload_t;
+
+typedef struct _drm_mga_vertex {
+   	int idx;		/* buffer to queue */
+	int used;		/* bytes in use */
+	int discard;		/* client finished with buffer?  */
+} drm_mga_vertex_t;
+
+typedef struct _drm_mga_indices {
+   	int idx;		/* buffer to queue */
+	unsigned int start;		
+	unsigned int end;		
+	int discard;		/* client finished with buffer?  */
+} drm_mga_indices_t;
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm_public.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm_public.h:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm_public.h:removed
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm_public.h:1.1	Fri Feb 11 09:26:07 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm_public.h	Sat Jul  1 20:43:17 2000
@@ -1,218 +0,0 @@
-/* mga_drm_public.h -- Public header for the Matrox g200/g400 driver -*- linux-c -*-
- * Created: Tue Jan 25 01:50:01 1999 by jhartmann@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors: Jeff Hartmann <jhartmann@precisioninsight.com>
- *          Keith Whitwell <keithw@precisioninsight.com>
- *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drm_public.h,v 1.1 2000/02/11 17:26:07 dawes Exp $
- */
-
-#ifndef _MGA_DRM_PUBLIC_H_
-#define _MGA_DRM_PUBLIC_H_
-
-#define MGA_F  0x1		/* fog */
-#define MGA_A  0x2		/* alpha */
-#define MGA_S  0x4		/* specular */
-#define MGA_T2 0x8		/* multitexture */
-
-#define MGA_WARP_TGZ            0
-#define MGA_WARP_TGZF           (MGA_F)
-#define MGA_WARP_TGZA           (MGA_A)
-#define MGA_WARP_TGZAF          (MGA_F|MGA_A)
-#define MGA_WARP_TGZS           (MGA_S)
-#define MGA_WARP_TGZSF          (MGA_S|MGA_F)
-#define MGA_WARP_TGZSA          (MGA_S|MGA_A)
-#define MGA_WARP_TGZSAF         (MGA_S|MGA_F|MGA_A)
-#define MGA_WARP_T2GZ           (MGA_T2)
-#define MGA_WARP_T2GZF          (MGA_T2|MGA_F)
-#define MGA_WARP_T2GZA          (MGA_T2|MGA_A)
-#define MGA_WARP_T2GZAF         (MGA_T2|MGA_A|MGA_F)
-#define MGA_WARP_T2GZS          (MGA_T2|MGA_S)
-#define MGA_WARP_T2GZSF         (MGA_T2|MGA_S|MGA_F)
-#define MGA_WARP_T2GZSA         (MGA_T2|MGA_S|MGA_A)
-#define MGA_WARP_T2GZSAF        (MGA_T2|MGA_S|MGA_F|MGA_A)
-
-
-#define MGA_MAX_G400_PIPES 16
-#define MGA_MAX_G200_PIPES  8	/* no multitex */
-
-
-#define MGA_MAX_WARP_PIPES MGA_MAX_G400_PIPES
-
-#define MGA_CARD_TYPE_G200 1
-#define MGA_CARD_TYPE_G400 2
-
-
-typedef struct _drm_mga_warp_index {
-   	int installed;
-   	unsigned long phys_addr;
-   	int size;
-} mgaWarpIndex;
-
-typedef struct drm_mga_init {
-   	enum { 
-	   	MGA_INIT_DMA = 0x01,
-	       	MGA_CLEANUP_DMA = 0x02
-	} func;
-   	int reserved_map_agpstart;
-   	int reserved_map_idx;
-   	int buffer_map_idx;
-   	int sarea_priv_offset;
-   	int primary_size;
-   	int warp_ucode_size;
-   	int fbOffset;
-   	int backOffset;
-   	int depthOffset;
-   	int textureOffset;
-   	int textureSize;
-   	int cpp;
-   	int stride;
-   	int sgram;
-	int chipset;
-   	mgaWarpIndex WarpIndex[MGA_MAX_WARP_PIPES];
-
-	/* Redundant?
-	 */
-	int frontOrg;
-	int backOrg;
-	int depthOrg;
-	int mAccess;
-} drm_mga_init_t;
-
-typedef struct _xf86drmClipRectRec {
-   	unsigned short x1;
-   	unsigned short y1;
-   	unsigned short x2;
-   	unsigned short y2;
-} xf86drmClipRectRec;
-
-#define MGA_CLEAR_FRONT 0x1
-#define MGA_CLEAR_BACK  0x2
-#define MGA_CLEAR_DEPTH 0x4
-
-
-/* Each context has a state:
- */
-#define MGA_CTXREG_DSTORG   0	/* validated */
-#define MGA_CTXREG_MACCESS  1	
-#define MGA_CTXREG_PLNWT    2	
-#define MGA_CTXREG_DWGCTL    3	
-#define MGA_CTXREG_ALPHACTRL 4
-#define MGA_CTXREG_FOGCOLOR  5
-#define MGA_CTXREG_WFLAG     6
-#define MGA_CTXREG_TDUAL0    7
-#define MGA_CTXREG_TDUAL1    8
-#define MGA_CTX_SETUP_SIZE   9
-
-/* 2d state
- */
-#define MGA_2DREG_PITCH 	0
-#define MGA_2D_SETUP_SIZE 	1
-
-/* Each texture unit has a state:
- */
-#define MGA_TEXREG_CTL        0
-#define MGA_TEXREG_CTL2       1
-#define MGA_TEXREG_FILTER     2
-#define MGA_TEXREG_BORDERCOL  3
-#define MGA_TEXREG_ORG        4 /* validated */
-#define MGA_TEXREG_ORG1       5
-#define MGA_TEXREG_ORG2       6
-#define MGA_TEXREG_ORG3       7
-#define MGA_TEXREG_ORG4       8
-#define MGA_TEXREG_WIDTH      9
-#define MGA_TEXREG_HEIGHT     10
-#define MGA_TEX_SETUP_SIZE    11
-
-
-/* What needs to be changed for the current vertex dma buffer?
- */
-#define MGASAREA_NEW_CONTEXT    0x1
-#define MGASAREA_NEW_TEX0       0x2
-#define MGASAREA_NEW_TEX1       0x4
-#define MGASAREA_NEW_PIPE       0x8
-#define MGASAREA_NEW_2D 	0x10
-
-
-/* Keep this small for testing
- */
-#define MGA_NR_SAREA_CLIPRECTS 2
-
-/* Upto 128 regions.  Minimum region size of 256k.
- */
-#define MGA_NR_TEX_REGIONS 128
-#define MGA_MIN_LOG_TEX_GRANULARITY 18
-
-typedef struct {
-   unsigned char next, prev;	
-   unsigned char in_use;	
-   int age;			
-} mgaTexRegion;
-
-typedef struct 
-{
-   	unsigned int ContextState[MGA_CTX_SETUP_SIZE];
-   	unsigned int ServerState[MGA_2D_SETUP_SIZE];
-   	unsigned int TexState[2][MGA_TEX_SETUP_SIZE];
-   	unsigned int WarpPipe;
-   	unsigned int dirty;
-
-   	unsigned int nbox;
-   	xf86drmClipRectRec boxes[MGA_NR_SAREA_CLIPRECTS];
-
-	/* kernel doesn't touch from here down */
-   	int ctxOwner;		
-	mgaTexRegion texList[MGA_NR_TEX_REGIONS+1];
-	int texAge;	                            
-} drm_mga_sarea_t;	
-
-
-/* Device specific ioctls:
- */
-typedef struct {
-	int clear_color;
-	int clear_depth;
-	int flags;
-} drm_mga_clear_t;
-
-
-typedef struct {
-	int flags;		/* not actually used? */
-} drm_mga_swap_t;
-
-typedef struct {
-	unsigned int destOrg;
-	unsigned int mAccess;
-   	unsigned int pitch;
-	xf86drmClipRectRec texture;
-   	int idx;
-} drm_mga_iload_t;
-
-
-#define DRM_IOCTL_MGA_INIT    DRM_IOW( 0x40, drm_mga_init_t)
-#define DRM_IOCTL_MGA_SWAP    DRM_IOW( 0x41, drm_mga_swap_t)
-#define DRM_IOCTL_MGA_CLEAR   DRM_IOW( 0x42, drm_mga_clear_t)
-#define DRM_IOCTL_MGA_ILOAD   DRM_IOW( 0x43, drm_mga_iload_t)
-#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c:1.1	Fri Feb 11 09:26:07 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c	Fri Jun 16 17:03:37 2000
@@ -2,6 +2,7 @@
  * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
  * 
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,13 +24,13 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
- *	    Jeff Hartmann <jhartmann@precisioninsight.com>
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c,v 1.1 2000/02/11 17:26:07 dawes Exp $
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "mga_drv.h"
@@ -39,9 +40,9 @@
 #define MGA_NAME	 "mga"
 #define MGA_DESC	 "Matrox g200/g400"
 #define MGA_DATE	 "19991213"
-#define MGA_MAJOR	 0
+#define MGA_MAJOR	 1
 #define MGA_MINOR	 0
-#define MGA_PATCHLEVEL	 1
+#define MGA_PATCHLEVEL	 0
 
 static drm_device_t	      mga_device;
 drm_ctx_t		      mga_res_ctx;
@@ -54,6 +55,7 @@
 	mmap:	 drm_mmap,
 	read:	 drm_read,
 	fasync:	 drm_fasync,
+   	poll:	 drm_poll,
 };
 
 static struct miscdevice      mga_misc = {
@@ -105,9 +107,12 @@
 	[DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)]    = { drm_agp_bind,    1, 1 },
 	[DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)]  = { drm_agp_unbind,  1, 1 },
    	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INIT)]    = { mga_dma_init,    1, 1 },
-   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_SWAP)]    = { mga_clear_bufs,  1, 1 },
-   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_CLEAR)]   = { mga_swap_bufs,   1, 1 },
-   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_ILOAD)]   = { mga_iload,       1, 1 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_SWAP)]    = { mga_swap_bufs,   1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_CLEAR)]   = { mga_clear_bufs,  1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_ILOAD)]   = { mga_iload,       1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_VERTEX)]  = { mga_vertex,      1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_FLUSH)]   = { mga_flush_ioctl, 1, 0 },
+   	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INDICES)] = { mga_indices,     1, 0 },
 };
 
 #define MGA_IOCTL_COUNT DRM_ARRAY_SIZE(mga_ioctls)
@@ -380,6 +385,21 @@
 	drm_proc_init(dev);
 	DRM_DEBUG("doing agp init\n");
 	dev->agp    = drm_agp_init();
+      	if(dev->agp == NULL) {
+	   	DRM_INFO("The mga drm module requires the agpgart module"
+		         " to function correctly\nPlease load the agpgart"
+		         " module before you load the mga module\n");
+	   	drm_proc_cleanup();
+	   	misc_deregister(&mga_misc);
+	   	mga_takedown(dev);
+	   	return -ENOMEM;
+	}
+#ifdef CONFIG_MTRR
+   	dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,
+				      dev->agp->agp_info.aper_size * 1024 * 1024,
+				      MTRR_TYPE_WRCOMB,
+				      1);
+#endif
 	DRM_DEBUG("doing ctxbitmap init\n");
 	if((retcode = drm_ctxbitmap_init(dev))) {
 		DRM_ERROR("Cannot allocate memory for context bitmap.\n");
@@ -416,6 +436,16 @@
 	}
 	drm_ctxbitmap_cleanup(dev);
 	mga_dma_cleanup(dev);
+#ifdef CONFIG_MTRR
+   	if(dev->agp && dev->agp->agp_mtrr) {
+	   	int retval;
+	   	retval = mtrr_del(dev->agp->agp_mtrr, 
+				  dev->agp->agp_info.aper_base,
+				  dev->agp->agp_info.aper_size * 1024*1024);
+	   	DRM_DEBUG("mtrr_del = %d\n", retval);
+	}
+#endif
+
 	mga_takedown(dev);
 	if (dev->agp) {
 		drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
@@ -482,26 +512,85 @@
 	drm_device_t  *dev    = priv->dev;
 	int	      retcode = 0;
 
-	DRM_DEBUG("open_count = %d\n", dev->open_count);
-	if (!(retcode = drm_release(inode, filp))) {
-		MOD_DEC_USE_COUNT;
-		atomic_inc(&dev->total_close);
-		spin_lock(&dev->count_lock);
-		if (!--dev->open_count) {
-			if (atomic_read(&dev->ioctl_count) || dev->blocked) {
-				DRM_ERROR("Device busy: %d %d\n",
-					  atomic_read(&dev->ioctl_count),
-					  dev->blocked);
-				spin_unlock(&dev->count_lock);
-				return -EBUSY;
+	DRM_DEBUG("pid = %d, device = 0x%x, open_count = %d\n",
+		  current->pid, dev->device, dev->open_count);
+
+	if (dev->lock.hw_lock && _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)
+	    && dev->lock.pid == current->pid) {
+	      	mga_reclaim_buffers(dev, priv->pid);
+		DRM_ERROR("Process %d dead, freeing lock for context %d\n",
+			  current->pid,
+			  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		drm_lock_free(dev,
+			      &dev->lock.hw_lock->lock,
+			      _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+		
+				/* FIXME: may require heavy-handed reset of
+                                   hardware at this point, possibly
+                                   processed via a callback to the X
+                                   server. */
+	} else if (dev->lock.hw_lock) {
+	   	/* The lock is required to reclaim buffers */
+	   	DECLARE_WAITQUEUE(entry, current);
+	   	add_wait_queue(&dev->lock.lock_queue, &entry);
+		for (;;) {
+			if (!dev->lock.hw_lock) {
+				/* Device has been unregistered */
+				retcode = -EINTR;
+				break;
 			}
-			spin_unlock(&dev->count_lock);
-			return mga_takedown(dev);
+			if (drm_lock_take(&dev->lock.hw_lock->lock,
+					  DRM_KERNEL_CONTEXT)) {
+				dev->lock.pid	    = priv->pid;
+				dev->lock.lock_time = jiffies;
+				atomic_inc(&dev->total_locks);
+				break;	/* Got lock */
+			}			
+				/* Contention */
+			atomic_inc(&dev->total_sleeps);
+			current->state = TASK_INTERRUPTIBLE;
+			schedule();
+			if (signal_pending(current)) {
+				retcode = -ERESTARTSYS;
+				break;
+			}
 		}
-		spin_unlock(&dev->count_lock);
+		current->state = TASK_RUNNING;
+		remove_wait_queue(&dev->lock.lock_queue, &entry);
+	   	if(!retcode) {
+		   	mga_reclaim_buffers(dev, priv->pid);
+		   	drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				      DRM_KERNEL_CONTEXT);
+		}
+	}
+	drm_fasync(-1, filp, 0);
+
+	down(&dev->struct_sem);
+	if (priv->prev) priv->prev->next = priv->next;
+	else		dev->file_first	 = priv->next;
+	if (priv->next) priv->next->prev = priv->prev;
+	else		dev->file_last	 = priv->prev;
+	up(&dev->struct_sem);
+	
+	drm_free(priv, sizeof(*priv), DRM_MEM_FILES);
+   	MOD_DEC_USE_COUNT;
+   	atomic_inc(&dev->total_close);
+   	spin_lock(&dev->count_lock);
+   	if (!--dev->open_count) {
+	   	if (atomic_read(&dev->ioctl_count) || dev->blocked) {
+		   	DRM_ERROR("Device busy: %d %d\n",
+				  atomic_read(&dev->ioctl_count),
+				  dev->blocked);
+		   	spin_unlock(&dev->count_lock);
+		   	return -EBUSY;
+		}
+	   	spin_unlock(&dev->count_lock);
+	   	return mga_takedown(dev);
 	}
+   	spin_unlock(&dev->count_lock);
 	return retcode;
 }
+
 
 /* drm_ioctl is called whenever a process performs an ioctl on /dev/drm. */
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h:1.1	Fri Feb 11 09:26:08 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h	Fri Jun 16 17:03:37 2000
@@ -2,6 +2,7 @@
  * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,51 +24,81 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
- * 	    Jeff Hartmann <jhartmann@precisioninsight.com>
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ * 	    Jeff Hartmann <jhartmann@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h,v 1.1 2000/02/11 17:26:08 dawes Exp $
  */
 
 #ifndef _MGA_DRV_H_
 #define _MGA_DRV_H_
-#include "mga_drm_public.h"
 
+#define MGA_BUF_IN_USE         0
+#define MGA_BUF_SWAP_PENDING   1
+#define MGA_BUF_FORCE_FIRE     2
+#define MGA_BUF_NEEDS_OVERFLOW 3
+
+typedef struct {
+	u32 buffer_status;
+   	unsigned int num_dwords;
+   	unsigned int max_dwords;
+   	u32 *current_dma_ptr;
+   	u32 *head;
+   	u32 phys_head;
+	unsigned int prim_age;
+   	int sec_used;
+   	int idx;
+} drm_mga_prim_buf_t;
+
+typedef struct _drm_mga_freelist {
+   	unsigned int age;
+   	drm_buf_t *buf;
+   	struct _drm_mga_freelist *next;
+   	struct _drm_mga_freelist *prev;
+} drm_mga_freelist_t;
+
+#define MGA_IN_DISPATCH   0
+#define MGA_IN_FLUSH      1
+#define MGA_IN_WAIT       2
+#define MGA_IN_GETBUF	  3
+
 typedef struct _drm_mga_private {
+   	u32 dispatch_status;
+	unsigned int next_prim_age;
+	__volatile__ unsigned int last_prim_age;
    	int reserved_map_idx;
    	int buffer_map_idx;
    	drm_mga_sarea_t *sarea_priv;
    	int primary_size;
    	int warp_ucode_size;
    	int chipset;
-   	int fbOffset;
-   	int backOffset;
-   	int depthOffset;
-   	int textureOffset;
-   	int textureSize;
+   	unsigned int frontOffset;
+   	unsigned int backOffset;
+   	unsigned int depthOffset;
+   	unsigned int textureOffset;
+   	unsigned int textureSize;
    	int cpp;
-   	int stride;
+   	unsigned int stride;
    	int sgram;
 	int use_agp;
-   	mgaWarpIndex WarpIndex[MGA_MAX_G400_PIPES];
-   	__volatile__ unsigned long softrap_age;
-   	atomic_t dispatch_lock;
+   	drm_mga_warp_index_t WarpIndex[MGA_MAX_G400_PIPES];
+	unsigned int WarpPipe;
    	atomic_t pending_bufs;
-   	void *ioremap;
-   	u32 *prim_head;
-   	u32 *current_dma_ptr;
-   	u32 prim_phys_head;
-   	int prim_num_dwords;
-   	int prim_max_dwords;
-
-
+   	void *status_page;
+   	unsigned long real_status_page;
+   	u8 *ioremap;
+   	drm_mga_prim_buf_t **prim_bufs;
+   	drm_mga_prim_buf_t *next_prim;
+   	drm_mga_prim_buf_t *last_prim;
+   	drm_mga_prim_buf_t *current_prim;
+   	int current_prim_idx;
+   	drm_mga_freelist_t *head;
+   	drm_mga_freelist_t *tail;
+   	wait_queue_head_t flush_queue;	/* Processes waiting until flush    */
+      	wait_queue_head_t wait_queue;	/* Processes waiting until interrupt */
+	wait_queue_head_t buf_queue;    /* Processes waiting for a free buf */
 	/* Some validated register values:
 	 */	
-	u32 frontOrg;
-	u32 backOrg;
-	u32 depthOrg;
 	u32 mAccess;
-
 } drm_mga_private_t;
 
 				/* mga_drv.c */
@@ -92,16 +123,19 @@
 			  unsigned int cmd, unsigned long arg);
 extern int  mga_lock(struct inode *inode, struct file *filp,
 		       unsigned int cmd, unsigned long arg);
-#if 0
-extern void mga_dma_init(drm_device_t *dev);
-extern void mga_dma_cleanup(drm_device_t *dev);
 
-#endif
+/* mga_dma_init does init and release */
 extern int mga_dma_init(struct inode *inode, struct file *filp,
 			unsigned int cmd, unsigned long arg);
 extern int mga_dma_cleanup(drm_device_t *dev);
-
-/* mga_dma_init does init and release */
+extern int mga_flush_ioctl(struct inode *inode, struct file *filp,
+			   unsigned int cmd, unsigned long arg);
+extern void mga_flush_write_combine(void);
+extern unsigned int mga_create_sync_tag(drm_device_t *dev);
+extern drm_buf_t *mga_freelist_get(drm_device_t *dev);
+extern int mga_freelist_put(drm_device_t *dev, drm_buf_t *buf);
+extern int mga_advance_primary(drm_device_t *dev);
+extern void mga_reclaim_buffers(drm_device_t *dev, pid_t pid);
 
 
 				/* mga_bufs.c */
@@ -124,6 +158,10 @@
 			  unsigned int cmd, unsigned long arg);
 extern int  mga_iload(struct inode *inode, struct file *filp,
 		      unsigned int cmd, unsigned long arg);
+extern int  mga_vertex(struct inode *inode, struct file *filp,
+		      unsigned int cmd, unsigned long arg);
+extern int  mga_indices(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
 				/* mga_context.c */
 extern int  mga_resctx(struct inode *inode, struct file *filp,
 		       unsigned int cmd, unsigned long arg);
@@ -144,13 +182,124 @@
 extern int  mga_context_switch_complete(drm_device_t *dev, int new);
 
 
+typedef enum {
+	TT_GENERAL,
+	TT_BLIT,
+	TT_VECTOR,
+	TT_VERTEX
+} transferType_t;
+
+typedef struct {
+   	drm_mga_freelist_t *my_freelist;
+	int discard;
+	int dispatched;
+} drm_mga_buf_priv_t;
+
+#define DWGREG0 	0x1c00
+#define DWGREG0_END 	0x1dff
+#define DWGREG1		0x2c00
+#define DWGREG1_END	0x2dff
+
+#define ISREG0(r)	(r >= DWGREG0 && r <= DWGREG0_END)
+#define ADRINDEX0(r)	(u8)((r - DWGREG0) >> 2)
+#define ADRINDEX1(r)	(u8)(((r - DWGREG1) >> 2) | 0x80)
+#define ADRINDEX(r)	(ISREG0(r) ? ADRINDEX0(r) : ADRINDEX1(r)) 
+
+#define MGA_VERBOSE 0
+#define MGA_NUM_PRIM_BUFS 	8
+
+#define PRIMLOCALS	u8 tempIndex[4]; u32 *dma_ptr; u32 phys_head; \
+			int outcount, num_dwords
+
+#define PRIM_OVERFLOW(dev, dev_priv, length) do {			\
+	drm_mga_prim_buf_t *tmp_buf =					\
+ 		dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	if( test_bit(MGA_BUF_NEEDS_OVERFLOW,				\
+		  &tmp_buf->buffer_status)) {				\
+ 		mga_advance_primary(dev);				\
+ 		mga_dma_schedule(dev, 1);				\
+ 	} else if( tmp_buf->max_dwords - tmp_buf->num_dwords < length ||\
+ 	    tmp_buf->sec_used > MGA_DMA_BUF_NR/2) {			\
+		set_bit(MGA_BUF_FORCE_FIRE, &tmp_buf->buffer_status);	\
+ 		mga_advance_primary(dev);				\
+ 		mga_dma_schedule(dev, 1);				\
+	}								\
+} while(0)
+
+#define PRIMGETPTR(dev_priv) do {					\
+	drm_mga_prim_buf_t *tmp_buf =					\
+		dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	if(MGA_VERBOSE)							\
+		DRM_DEBUG("PRIMGETPTR in %s\n", __FUNCTION__);		\
+	dma_ptr = tmp_buf->current_dma_ptr;				\
+	num_dwords = tmp_buf->num_dwords;				\
+	phys_head = tmp_buf->phys_head;					\
+	outcount = 0;							\
+} while(0)
+
+#define PRIMPTR(prim_buf) do {					\
+	if(MGA_VERBOSE)						\
+		DRM_DEBUG("PRIMPTR in %s\n", __FUNCTION__);	\
+	dma_ptr = prim_buf->current_dma_ptr;			\
+	num_dwords = prim_buf->num_dwords;			\
+	phys_head = prim_buf->phys_head;			\
+	outcount = 0;						\
+} while(0)
+
+#define PRIMFINISH(prim_buf) do {				\
+	if (MGA_VERBOSE) {					\
+		DRM_DEBUG( "PRIMFINISH in %s\n", __FUNCTION__);	\
+                if (outcount & 3)				\
+                      DRM_DEBUG(" --- truncation\n");	        \
+        }							\
+	prim_buf->num_dwords = num_dwords;			\
+	prim_buf->current_dma_ptr = dma_ptr;			\
+} while(0)
+
+#define PRIMADVANCE(dev_priv)	do {				\
+drm_mga_prim_buf_t *tmp_buf = 					\
+	dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	if (MGA_VERBOSE) {					\
+		DRM_DEBUG("PRIMADVANCE in %s\n", __FUNCTION__);	\
+                if (outcount & 3)				\
+                      DRM_DEBUG(" --- truncation\n");	\
+        }							\
+	tmp_buf->num_dwords = num_dwords;      			\
+	tmp_buf->current_dma_ptr = dma_ptr;    			\
+} while (0)
+
+#define PRIMUPDATE(dev_priv)	do {					\
+	drm_mga_prim_buf_t *tmp_buf =					\
+		dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	tmp_buf->sec_used++;						\
+} while (0)
+
+#define AGEBUF(dev_priv, buf_priv)	do {				\
+	drm_mga_prim_buf_t *tmp_buf =					\
+		dev_priv->prim_bufs[dev_priv->current_prim_idx];	\
+	buf_priv->my_freelist->age = tmp_buf->prim_age;			\
+} while (0)
+
+
+#define PRIMOUTREG(reg, val) do {					\
+	tempIndex[outcount]=ADRINDEX(reg);				\
+	dma_ptr[1+outcount] = val;					\
+	if (MGA_VERBOSE)						\
+		DRM_DEBUG("   PRIMOUT %d: 0x%x -- 0x%x\n",		\
+		       num_dwords + 1 + outcount, ADRINDEX(reg), val);	\
+	if( ++outcount == 4) {						\
+		outcount = 0;						\
+		dma_ptr[0] = *(u32 *)tempIndex;				\
+		dma_ptr+=5;						\
+		num_dwords += 5;					\
+	}								\
+}while (0)
 
+/* A reduced set of the mga registers.
+ */
+
 #define MGAREG_MGA_EXEC 			0x0100
-#define MGAREG_AGP_PLL				0x1e4c
 #define MGAREG_ALPHACTRL 			0x2c7c
-#define MGAREG_ALPHASTART 			0x2c70
-#define MGAREG_ALPHAXINC 			0x2c74
-#define MGAREG_ALPHAYINC 			0x2c78
 #define MGAREG_AR0 				0x1c60
 #define MGAREG_AR1 				0x1c64
 #define MGAREG_AR2 				0x1c68
@@ -158,39 +307,16 @@
 #define MGAREG_AR4 				0x1c70
 #define MGAREG_AR5 				0x1c74
 #define MGAREG_AR6 				0x1c78
-#define MGAREG_BCOL 				0x1c20
 #define MGAREG_CXBNDRY				0x1c80
 #define MGAREG_CXLEFT 				0x1ca0
 #define MGAREG_CXRIGHT				0x1ca4
 #define MGAREG_DMAPAD 				0x1c54
-#define MGAREG_DR0_Z32LSB 			0x2c50
-#define MGAREG_DR0_Z32MSB 			0x2c54
-#define MGAREG_DR2_Z32LSB 			0x2c60
-#define MGAREG_DR2_Z32MSB 			0x2c64
-#define MGAREG_DR3_Z32LSB 			0x2c68
-#define MGAREG_DR3_Z32MSB 			0x2c6c
-#define MGAREG_DR0 				0x1cc0
-#define MGAREG_DR2 				0x1cc8
-#define MGAREG_DR3 				0x1ccc
-#define MGAREG_DR4 				0x1cd0
-#define MGAREG_DR6 				0x1cd8
-#define MGAREG_DR7 				0x1cdc
-#define MGAREG_DR8 				0x1ce0
-#define MGAREG_DR10 				0x1ce8
-#define MGAREG_DR11 				0x1cec
-#define MGAREG_DR12 				0x1cf0
-#define MGAREG_DR14 				0x1cf8
-#define MGAREG_DR15 				0x1cfc
 #define MGAREG_DSTORG 				0x2cb8
-#define MGAREG_DWG_INDIR_WT 			0x1e80
 #define MGAREG_DWGCTL 				0x1c00
 #define MGAREG_DWGSYNC				0x2c4c
 #define MGAREG_FCOL 				0x1c24
 #define MGAREG_FIFOSTATUS 			0x1e10
 #define MGAREG_FOGCOL 				0x1cf4
-#define MGAREG_FOGSTART 			0x1cc4
-#define MGAREG_FOGXINC				0x1cd4
-#define MGAREG_FOGYINC				0x1ce4
 #define MGAREG_FXBNDRY				0x1c84
 #define MGAREG_FXLEFT 				0x1ca8
 #define MGAREG_FXRIGHT				0x1cac
@@ -198,44 +324,22 @@
 #define MGAREG_IEN 				0x1e1c
 #define MGAREG_LEN 				0x1c5c
 #define MGAREG_MACCESS				0x1c04
-#define MGAREG_MCTLWTST 			0x1c08
-#define MGAREG_MEMRDBK				0x1e44
-#define MGAREG_OPMODE 				0x1e54
-#define MGAREG_PAT0 				0x1c10
-#define MGAREG_PAT1 				0x1c14
 #define MGAREG_PITCH 				0x1c8c
 #define MGAREG_PLNWT 				0x1c1c
 #define MGAREG_PRIMADDRESS 			0x1e58
 #define MGAREG_PRIMEND				0x1e5c
 #define MGAREG_PRIMPTR				0x1e50
-#define MGAREG_RST 				0x1e40
 #define MGAREG_SECADDRESS 			0x2c40
 #define MGAREG_SECEND 				0x2c44
 #define MGAREG_SETUPADDRESS 			0x2cd0
 #define MGAREG_SETUPEND 			0x2cd4
-#define MGAREG_SGN 				0x1c58
-#define MGAREG_SHIFT 				0x1c50
 #define MGAREG_SOFTRAP				0x2c48
-#define MGAREG_SPECBSTART 			0x2c98
-#define MGAREG_SPECBXINC 			0x2c9c
-#define MGAREG_SPECBYINC 			0x2ca0
-#define MGAREG_SPECGSTART 			0x2c8c
-#define MGAREG_SPECGXINC 			0x2c90
-#define MGAREG_SPECGYINC 			0x2c94
-#define MGAREG_SPECRSTART 			0x2c80
-#define MGAREG_SPECRXINC 			0x2c84
-#define MGAREG_SPECRYINC 			0x2c88
-#define MGAREG_SRC0 				0x1c30
-#define MGAREG_SRC1 				0x1c34
-#define MGAREG_SRC2 				0x1c38
-#define MGAREG_SRC3 				0x1c3c
 #define MGAREG_SRCORG 				0x2cb4
 #define MGAREG_STATUS 				0x1e14
 #define MGAREG_STENCIL				0x2cc8
 #define MGAREG_STENCILCTL 			0x2ccc
 #define MGAREG_TDUALSTAGE0 			0x2cf8
 #define MGAREG_TDUALSTAGE1 			0x2cfc
-#define MGAREG_TEST0 				0x1e48
 #define MGAREG_TEXBORDERCOL 			0x2c5c
 #define MGAREG_TEXCTL 				0x2c30
 #define MGAREG_TEXCTL2				0x2c3c
@@ -249,18 +353,6 @@
 #define MGAREG_TEXTRANS 			0x2c34
 #define MGAREG_TEXTRANSHIGH 			0x2c38
 #define MGAREG_TEXWIDTH 			0x2c28
-#define MGAREG_TMR0 				0x2c00
-#define MGAREG_TMR1 				0x2c04
-#define MGAREG_TMR2 				0x2c08
-#define MGAREG_TMR3 				0x2c0c
-#define MGAREG_TMR4 				0x2c10
-#define MGAREG_TMR5 				0x2c14
-#define MGAREG_TMR6 				0x2c18
-#define MGAREG_TMR7 				0x2c1c
-#define MGAREG_TMR8 				0x2c20
-#define MGAREG_VBIADDR0 			0x3e08
-#define MGAREG_VBIADDR1 			0x3e0c
-#define MGAREG_VCOUNT 				0x1e20
 #define MGAREG_WACCEPTSEQ 			0x1dd4
 #define MGAREG_WCODEADDR 			0x1e6c
 #define MGAREG_WFLAG 				0x1dc4
@@ -270,23 +362,86 @@
 #define MGAREG_WGETMSB				0x1dc8
 #define MGAREG_WIADDR 				0x1dc0
 #define MGAREG_WIADDR2				0x1dd8
-#define MGAREG_WIADDRNB 			0x1e60
-#define MGAREG_WIADDRNB1 			0x1e04
-#define MGAREG_WIADDRNB2 			0x1e00
-#define MGAREG_WIMEMADDR 			0x1e68
-#define MGAREG_WIMEMDATA 			0x2000
-#define MGAREG_WIMEMDATA1 			0x2100
 #define MGAREG_WMISC 				0x1e70
-#define MGAREG_WR 				0x2d00
 #define MGAREG_WVRTXSZ				0x1dcc
-#define MGAREG_XDST 				0x1cb0
-#define MGAREG_XYEND 				0x1c44
-#define MGAREG_XYSTRT 				0x1c40
 #define MGAREG_YBOT 				0x1c9c
 #define MGAREG_YDST 				0x1c90
 #define MGAREG_YDSTLEN				0x1c88
 #define MGAREG_YDSTORG				0x1c94
 #define MGAREG_YTOP 				0x1c98
 #define MGAREG_ZORG 				0x1c0c
+
+#define PDEA_pagpxfer_enable			0x2
+
+#define WIA_wmode_suspend			0x0
+#define WIA_wmode_start 			0x3
+#define WIA_wagp_agp				0x4
+
+#define DC_opcod_line_open 			0x0
+#define DC_opcod_autoline_open 			0x1
+#define DC_opcod_line_close 			0x2
+#define DC_opcod_autoline_close 		0x3
+#define DC_opcod_trap 				0x4
+#define DC_opcod_texture_trap 			0x6
+#define DC_opcod_bitblt 			0x8
+#define DC_opcod_iload 				0x9
+#define DC_atype_rpl 				0x0
+#define DC_atype_rstr 				0x10
+#define DC_atype_zi 				0x30
+#define DC_atype_blk 				0x40
+#define DC_atype_i 				0x70
+#define DC_linear_xy 				0x0 		
+#define DC_linear_linear 			0x80 		
+#define DC_zmode_nozcmp 			0x0
+#define DC_zmode_ze 				0x200
+#define DC_zmode_zne 				0x300
+#define DC_zmode_zlt 				0x400
+#define DC_zmode_zlte 				0x500
+#define DC_zmode_zgt 				0x600
+#define DC_zmode_zgte 				0x700
+#define DC_solid_disable 			0x0 		
+#define DC_solid_enable 			0x800 		
+#define DC_arzero_disable 			0x0 		
+#define DC_arzero_enable 			0x1000 		
+#define DC_sgnzero_disable 			0x0 		
+#define DC_sgnzero_enable 			0x2000 		
+#define DC_shftzero_disable 			0x0 		
+#define DC_shftzero_enable 			0x4000 		
+#define DC_bop_SHIFT 				16 		
+#define DC_trans_SHIFT 				20 		
+#define DC_bltmod_bmonolef 			0x0
+#define DC_bltmod_bmonowf 			0x8000000
+#define DC_bltmod_bplan 			0x2000000
+#define DC_bltmod_bfcol 			0x4000000
+#define DC_bltmod_bu32bgr 			0x6000000
+#define DC_bltmod_bu32rgb 			0xe000000
+#define DC_bltmod_bu24bgr 			0x16000000
+#define DC_bltmod_bu24rgb 			0x1e000000
+#define DC_pattern_disable 			0x0 		
+#define DC_pattern_enable 			0x20000000 	
+#define DC_transc_disable 			0x0 		
+#define DC_transc_enable 			0x40000000 	
+#define DC_clipdis_disable 			0x0 		
+#define DC_clipdis_enable 			0x80000000 	
+
+#define SETADD_mode_vertlist                   	0x0 	
+
+
+#define MGA_CLEAR_CMD (DC_opcod_trap | DC_arzero_enable | 		\
+		       DC_sgnzero_enable | DC_shftzero_enable | 	\
+		       (0xC << DC_bop_SHIFT) | DC_clipdis_enable | 	\
+		       DC_solid_enable | DC_transc_enable)
+	  
+
+#define MGA_COPY_CMD (DC_opcod_bitblt | DC_atype_rpl | DC_linear_xy |	\
+		      DC_solid_disable | DC_arzero_disable | 		\
+		      DC_sgnzero_enable | DC_shftzero_enable | 		\
+		      (0xC << DC_bop_SHIFT) | DC_bltmod_bfcol | 	\
+		      DC_pattern_disable | DC_transc_disable | 		\
+		      DC_clipdis_enable)				\
+
+#define MGA_FLUSH_CMD (DC_opcod_texture_trap | (0xF << DC_trans_SHIFT) |\
+		       DC_arzero_enable | DC_sgnzero_enable |		\
+		       DC_atype_i)
 
 #endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c:1.1	Fri Feb 11 09:26:08 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c	Fri Jun 30 10:15:18 2000
@@ -2,6 +2,7 @@
  * Created: Thu Jan 27 02:53:43 2000 by jhartmann@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,340 +24,1044 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors: Jeff Hartmann <jhartmann@precisioninsight.com>
- * 	    Keith Whitwell <keithw@precisioninsight.com>
+ * Authors: Jeff Hartmann <jhartmann@valinux.com>
+ * 	    Keith Whitwell <keithw@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c,v 1.1 2000/02/11 17:26:08 dawes Exp $
- *
  */
- 
+
 #define __NO_VERSION__
 #include "drmP.h"
 #include "mga_drv.h"
-#include "mgareg_flags.h"
-#include "mga_dma.h"
-#include "mga_state.h"
 #include "drm.h"
 
-void mgaEmitClipRect( drm_mga_private_t *dev_priv, xf86drmClipRectRec *box )
+static void mgaEmitClipRect(drm_mga_private_t * dev_priv,
+			    drm_clip_rect_t * box)
 {
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
 	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
 
-	PRIMGETPTR( dev_priv );
+	/* This takes 10 dwords */
+	PRIMGETPTR(dev_priv);
 
-	/* The G400 seems to have an issue with the second WARP not
-	 * stalling clipper register writes.  This bothers me, but the only
-	 * way I could get it to never clip the last triangle under any
-	 * circumstances is by inserting TWO dwgsync commands.
-	 */
- 	if (dev_priv->chipset == MGA_CARD_TYPE_G400) { 
-		PRIMOUTREG( MGAREG_DWGSYNC, 0 );
-		PRIMOUTREG( MGAREG_DWGSYNC, 0 );
-	}
+	/* Force reset of dwgctl (eliminates clip disable) */
+#if 0
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGSYNC, 0);
+	PRIMOUTREG(MGAREG_DWGSYNC, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+#else
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+	PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 0x80000000);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+	PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 0x80000000);
+#endif
 
-	PRIMOUTREG( MGAREG_CXBNDRY, ((box->x2)<<16)|(box->x1) );
-	PRIMOUTREG( MGAREG_YTOP, box->y1 * dev_priv->stride );
-	PRIMOUTREG( MGAREG_YBOT, box->y2 * dev_priv->stride );
-	PRIMADVANCE( dev_priv );
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_CXBNDRY, ((box->x2) << 16) | (box->x1));
+	PRIMOUTREG(MGAREG_YTOP, box->y1 * dev_priv->stride / 2);
+	PRIMOUTREG(MGAREG_YBOT, box->y2 * dev_priv->stride / 2);
+
+	PRIMADVANCE(dev_priv);
 }
 
+static void mgaEmitContext(drm_mga_private_t * dev_priv)
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	/* This takes a max of 15 dwords */
+	PRIMGETPTR(dev_priv);
+
+	PRIMOUTREG(MGAREG_DSTORG, regs[MGA_CTXREG_DSTORG]);
+	PRIMOUTREG(MGAREG_MACCESS, regs[MGA_CTXREG_MACCESS]);
+	PRIMOUTREG(MGAREG_PLNWT, regs[MGA_CTXREG_PLNWT]);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+
+	PRIMOUTREG(MGAREG_ALPHACTRL, regs[MGA_CTXREG_ALPHACTRL]);
+	PRIMOUTREG(MGAREG_FOGCOL, regs[MGA_CTXREG_FOGCOLOR]);
+	PRIMOUTREG(MGAREG_WFLAG, regs[MGA_CTXREG_WFLAG]);
+	PRIMOUTREG(MGAREG_ZORG, dev_priv->depthOffset);	/* invarient */
+
+	if (dev_priv->chipset == MGA_CARD_TYPE_G400) {
+		PRIMOUTREG(MGAREG_WFLAG1, regs[MGA_CTXREG_WFLAG]);
+		PRIMOUTREG(MGAREG_TDUALSTAGE0, regs[MGA_CTXREG_TDUAL0]);
+		PRIMOUTREG(MGAREG_TDUALSTAGE1, regs[MGA_CTXREG_TDUAL1]);
+		PRIMOUTREG(MGAREG_FCOL, regs[MGA_CTXREG_FCOL]);
+	} else {
+		PRIMOUTREG(MGAREG_FCOL, regs[MGA_CTXREG_FCOL]);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+	}
 
-static void mgaEmitContext(drm_mga_private_t *dev_priv, 
-			   drm_mga_buf_priv_t *buf_priv)
+	PRIMADVANCE(dev_priv);
+}
+
+static void mgaG200EmitTex(drm_mga_private_t * dev_priv)
 {
-	unsigned int *regs = buf_priv->ContextState;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->TexState[0];
 	PRIMLOCALS;
-	
-	PRIMGETPTR( dev_priv );
-	PRIMOUTREG( MGAREG_DSTORG, regs[MGA_CTXREG_DSTORG] );
-	PRIMOUTREG( MGAREG_MACCESS, regs[MGA_CTXREG_MACCESS] );
-	PRIMOUTREG( MGAREG_PLNWT, regs[MGA_CTXREG_PLNWT] );
-	PRIMOUTREG( MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL] );
-	PRIMOUTREG( MGAREG_ALPHACTRL, regs[MGA_CTXREG_ALPHACTRL] );
-	PRIMOUTREG( MGAREG_FOGCOL, regs[MGA_CTXREG_FOGCOLOR] );
-	PRIMOUTREG( MGAREG_WFLAG, regs[MGA_CTXREG_WFLAG] );
-
- 	if (dev_priv->chipset == MGA_CARD_TYPE_G400) { 
-		PRIMOUTREG( MGAREG_WFLAG1, regs[MGA_CTXREG_WFLAG] );
-		PRIMOUTREG( MGAREG_TDUALSTAGE0, regs[MGA_CTXREG_TDUAL0] );
-		PRIMOUTREG( MGAREG_TDUALSTAGE1, regs[MGA_CTXREG_TDUAL1] );      
-	}   
-   
-	PRIMADVANCE( dev_priv );
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	PRIMGETPTR(dev_priv);
+
+	/* This takes 20 dwords */
+
+	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2]);
+	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL]);
+	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER]);
+	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL]);
+
+	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG]);
+	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1]);
+	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2]);
+	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3]);
+
+	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4]);
+	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH]);
+	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT]);
+	PRIMOUTREG(0x2d00 + 24 * 4, regs[MGA_TEXREG_WIDTH]);
+
+	PRIMOUTREG(0x2d00 + 34 * 4, regs[MGA_TEXREG_HEIGHT]);
+	PRIMOUTREG(MGAREG_TEXTRANS, 0xffff);
+	PRIMOUTREG(MGAREG_TEXTRANSHIGH, 0xffff);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+	PRIMADVANCE(dev_priv);
 }
 
-static void mgaG200EmitTex( drm_mga_private_t *dev_priv, 
-			    drm_mga_buf_priv_t *buf_priv )
+static void mgaG400EmitTex0(drm_mga_private_t * dev_priv)
 {
-	unsigned int *regs = buf_priv->TexState[0];
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->TexState[0];
+	int multitex = sarea_priv->WarpPipe & MGA_T2;
 	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
 
-	PRIMGETPTR( dev_priv );
-	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] );
-	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL] );
-	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER] );
-	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL] );
-	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG] );
-	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1] );
-	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2] );
-	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3] );
-	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4] );		
-	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH] );
-	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );
-   
-	PRIMOUTREG(0x2d00 + 24*4, regs[MGA_TEXREG_WIDTH] );
-	PRIMOUTREG(0x2d00 + 34*4, regs[MGA_TEXREG_HEIGHT] );
-
-	PRIMADVANCE( dev_priv );  
-}
-
-static void mgaG400EmitTex0( drm_mga_private_t *dev_priv, 
-			     drm_mga_buf_priv_t *buf_priv )
-{
-	unsigned int *regs = buf_priv->TexState[0];
-	int multitex = buf_priv->WarpPipe & MGA_T2;
-
-	PRIMLOCALS;
-	PRIMGETPTR( dev_priv );
-
-	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] );
-	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL] );
-	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER] );
-	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL] );
-	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG] );
-	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1] );
-	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2] );
-	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3] );
-	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4] );		
-	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH] );
-	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );
-   
-	PRIMOUTREG(0x2d00 + 49*4, 0);
-	PRIMOUTREG(0x2d00 + 57*4, 0);
-	PRIMOUTREG(0x2d00 + 53*4, 0);
-	PRIMOUTREG(0x2d00 + 61*4, 0);
+	PRIMGETPTR(dev_priv);
+
+	/* This takes a max of 30 dwords */
+
+	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] | 0x00008000);
+	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL]);
+	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER]);
+	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL]);
+
+	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG]);
+	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1]);
+	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2]);
+	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3]);
+
+	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4]);
+	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH]);
+	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT]);
+	PRIMOUTREG(0x2d00 + 49 * 4, 0);
+
+	PRIMOUTREG(0x2d00 + 57 * 4, 0);
+	PRIMOUTREG(0x2d00 + 53 * 4, 0);
+	PRIMOUTREG(0x2d00 + 61 * 4, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
 
 	if (!multitex) {
-		PRIMOUTREG(0x2d00 + 52*4, 0x40 ); 
-		PRIMOUTREG(0x2d00 + 60*4, 0x40 );
-	} 
+		PRIMOUTREG(0x2d00 + 52 * 4, 0x40);
+		PRIMOUTREG(0x2d00 + 60 * 4, 0x40);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+	}
 
-	PRIMOUTREG(0x2d00 + 54*4, regs[MGA_TEXREG_WIDTH] | 0x40 );
-	PRIMOUTREG(0x2d00 + 62*4, regs[MGA_TEXREG_HEIGHT] | 0x40 );
+	PRIMOUTREG(0x2d00 + 54 * 4, regs[MGA_TEXREG_WIDTH] | 0x40);
+	PRIMOUTREG(0x2d00 + 62 * 4, regs[MGA_TEXREG_HEIGHT] | 0x40);
+	PRIMOUTREG(MGAREG_TEXTRANS, 0xffff);
+	PRIMOUTREG(MGAREG_TEXTRANSHIGH, 0xffff);
 
-	PRIMADVANCE( dev_priv );  
+	PRIMADVANCE(dev_priv);
 }
 
-#define TMC_map1_enable 		0x80000000 	
+#define TMC_map1_enable 		0x80000000
 
-
-static void mgaG400EmitTex1( drm_mga_private_t *dev_priv, 
-			     drm_mga_buf_priv_t *buf_priv )
+static void mgaG400EmitTex1(drm_mga_private_t * dev_priv)
 {
 	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	unsigned int *regs = sarea_priv->TexState[1];
-
 	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
 	PRIMGETPTR(dev_priv);
 
-	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] | TMC_map1_enable);
-	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL] );
-	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER] );
-	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL] );
-	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG] );
-	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1] );
-	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2] );
-	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3] );
-	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4] );		
-	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH] );
-	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT] );
-   
-	PRIMOUTREG(0x2d00 + 49*4, 0);
-	PRIMOUTREG(0x2d00 + 57*4, 0);
-	PRIMOUTREG(0x2d00 + 53*4, 0);
-	PRIMOUTREG(0x2d00 + 61*4, 0);
-
-	PRIMOUTREG(0x2d00 + 52*4, regs[MGA_TEXREG_WIDTH] | 0x40 ); 
-	PRIMOUTREG(0x2d00 + 60*4, regs[MGA_TEXREG_HEIGHT] | 0x40 );
+	/* This takes 25 dwords */
 
-	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] );
+	PRIMOUTREG(MGAREG_TEXCTL2,
+		   regs[MGA_TEXREG_CTL2] | TMC_map1_enable | 0x00008000);
+	PRIMOUTREG(MGAREG_TEXCTL, regs[MGA_TEXREG_CTL]);
+	PRIMOUTREG(MGAREG_TEXFILTER, regs[MGA_TEXREG_FILTER]);
+	PRIMOUTREG(MGAREG_TEXBORDERCOL, regs[MGA_TEXREG_BORDERCOL]);
+
+	PRIMOUTREG(MGAREG_TEXORG, regs[MGA_TEXREG_ORG]);
+	PRIMOUTREG(MGAREG_TEXORG1, regs[MGA_TEXREG_ORG1]);
+	PRIMOUTREG(MGAREG_TEXORG2, regs[MGA_TEXREG_ORG2]);
+	PRIMOUTREG(MGAREG_TEXORG3, regs[MGA_TEXREG_ORG3]);
+
+	PRIMOUTREG(MGAREG_TEXORG4, regs[MGA_TEXREG_ORG4]);
+	PRIMOUTREG(MGAREG_TEXWIDTH, regs[MGA_TEXREG_WIDTH]);
+	PRIMOUTREG(MGAREG_TEXHEIGHT, regs[MGA_TEXREG_HEIGHT]);
+	PRIMOUTREG(0x2d00 + 49 * 4, 0);
+
+	PRIMOUTREG(0x2d00 + 57 * 4, 0);
+	PRIMOUTREG(0x2d00 + 53 * 4, 0);
+	PRIMOUTREG(0x2d00 + 61 * 4, 0);
+	PRIMOUTREG(0x2d00 + 52 * 4, regs[MGA_TEXREG_WIDTH] | 0x40);
+
+	PRIMOUTREG(0x2d00 + 60 * 4, regs[MGA_TEXREG_HEIGHT] | 0x40);
+	PRIMOUTREG(MGAREG_TEXTRANS, 0xffff);
+	PRIMOUTREG(MGAREG_TEXTRANSHIGH, 0xffff);
+	PRIMOUTREG(MGAREG_TEXCTL2, regs[MGA_TEXREG_CTL2] | 0x00008000);
 
-	PRIMADVANCE( dev_priv );     
+	PRIMADVANCE(dev_priv);
 }
-
 
-static void mgaG400EmitPipe(drm_mga_private_t *dev_priv, 
-			    drm_mga_buf_priv_t *buf_priv)
+#define EMIT_PIPE 50
+static void mgaG400EmitPipe(drm_mga_private_t * dev_priv)
 {
 	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	unsigned int pipe = sarea_priv->WarpPipe;
 	float fParam = 12800.0f;
 	PRIMLOCALS;
-   
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
 	PRIMGETPTR(dev_priv);
-	PRIMOUTREG(MGAREG_WIADDR2, WIA_wmode_suspend);
-   
+
+	/* This takes 50 dwords */
+
 	/* Establish vertex size.  
 	 */
+	PRIMOUTREG(MGAREG_WIADDR2, WIA_wmode_suspend);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+
 	if (pipe & MGA_T2) {
 		PRIMOUTREG(MGAREG_WVRTXSZ, 0x00001e09);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
 		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0x1e000000);
 	} else {
+		if (dev_priv->WarpPipe & MGA_T2) {
+			/* Flush the WARP pipe */
+			PRIMOUTREG(MGAREG_YDST, 0);
+			PRIMOUTREG(MGAREG_FXLEFT, 0);
+			PRIMOUTREG(MGAREG_FXRIGHT, 1);
+			PRIMOUTREG(MGAREG_DWGCTL, MGA_FLUSH_CMD);
+
+			PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 1);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DWGSYNC, 0x7000);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+			PRIMOUTREG(MGAREG_TEXCTL2, 0 | 0x00008000);
+			PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 0);
+			PRIMOUTREG(MGAREG_TEXCTL2, 0x80 | 0x00008000);
+			PRIMOUTREG(MGAREG_LEN + MGAREG_MGA_EXEC, 0);
+		}
+
 		PRIMOUTREG(MGAREG_WVRTXSZ, 0x00001807);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+		PRIMOUTREG(MGAREG_DMAPAD, 0);
+
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
+		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0);
 		PRIMOUTREG(MGAREG_WACCEPTSEQ, 0x18000000);
 	}
-   
+
 	PRIMOUTREG(MGAREG_WFLAG, 0);
 	PRIMOUTREG(MGAREG_WFLAG1, 0);
-   
-	PRIMOUTREG(0x2d00 + 56*4, *((u32 *)(&fParam)));
-	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(0x2d00 + 56 * 4, *((u32 *) (&fParam)));
 	PRIMOUTREG(MGAREG_DMAPAD, 0);
-   
-	PRIMOUTREG(0x2d00 + 49*4, 0);  /* Tex stage 0 */
-	PRIMOUTREG(0x2d00 + 57*4, 0);  /* Tex stage 0 */
-	PRIMOUTREG(0x2d00 + 53*4, 0);  /* Tex stage 1 */
-	PRIMOUTREG(0x2d00 + 61*4, 0);  /* Tex stage 1 */
-   
-	PRIMOUTREG(0x2d00 + 54*4, 0x40); /* Tex stage 0 : w */
-	PRIMOUTREG(0x2d00 + 62*4, 0x40); /* Tex stage 0 : h */
-	PRIMOUTREG(0x2d00 + 52*4, 0x40); /* Tex stage 1 : w */
-	PRIMOUTREG(0x2d00 + 60*4, 0x40); /* Tex stage 1 : h */
-   
+
+	PRIMOUTREG(0x2d00 + 49 * 4, 0);	/* Tex stage 0 */
+	PRIMOUTREG(0x2d00 + 57 * 4, 0);	/* Tex stage 0 */
+	PRIMOUTREG(0x2d00 + 53 * 4, 0);	/* Tex stage 1 */
+	PRIMOUTREG(0x2d00 + 61 * 4, 0);	/* Tex stage 1 */
+
+	PRIMOUTREG(0x2d00 + 54 * 4, 0x40);	/* Tex stage 0 : w */
+	PRIMOUTREG(0x2d00 + 62 * 4, 0x40);	/* Tex stage 0 : h */
+	PRIMOUTREG(0x2d00 + 52 * 4, 0x40);	/* Tex stage 1 : w */
+	PRIMOUTREG(0x2d00 + 60 * 4, 0x40);	/* Tex stage 1 : h */
+
 	/* Dma pading required due to hw bug */
 	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
 	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
 	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
-	PRIMOUTREG(MGAREG_WIADDR2, (dev_priv->WarpIndex[pipe].phys_addr | 
-				   WIA_wmode_start | WIA_wagp_agp));
+	PRIMOUTREG(MGAREG_WIADDR2,
+		   (u32) (dev_priv->WarpIndex[pipe].
+			  phys_addr | WIA_wmode_start | WIA_wagp_agp));
 	PRIMADVANCE(dev_priv);
 }
 
-static void mgaG200EmitPipe( drm_mga_private_t *dev_priv,
-			     drm_mga_buf_priv_t *buf_priv )
+static void mgaG200EmitPipe(drm_mga_private_t * dev_priv)
 {
 	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	unsigned int pipe = sarea_priv->WarpPipe;
 	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
 
 	PRIMGETPTR(dev_priv);
+
+	/* This takes 15 dwords */
+
 	PRIMOUTREG(MGAREG_WIADDR, WIA_wmode_suspend);
 	PRIMOUTREG(MGAREG_WVRTXSZ, 7);
 	PRIMOUTREG(MGAREG_WFLAG, 0);
-	PRIMOUTREG(0x2d00 + 24*4, 0); /* tex w/h */
-   
-	PRIMOUTREG(0x2d00 + 25*4, 0x100);
-	PRIMOUTREG(0x2d00 + 34*4, 0); /* tex w/h */
-	PRIMOUTREG(0x2d00 + 42*4, 0xFFFF);
-	PRIMOUTREG(0x2d00 + 60*4, 0xFFFF);
-   
+	PRIMOUTREG(0x2d00 + 24 * 4, 0);	/* tex w/h */
+
+	PRIMOUTREG(0x2d00 + 25 * 4, 0x100);
+	PRIMOUTREG(0x2d00 + 34 * 4, 0);	/* tex w/h */
+	PRIMOUTREG(0x2d00 + 42 * 4, 0xFFFF);
+	PRIMOUTREG(0x2d00 + 60 * 4, 0xFFFF);
+
 	/* Dma pading required due to hw bug */
 	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
 	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
 	PRIMOUTREG(MGAREG_DMAPAD, 0xffffffff);
-	PRIMOUTREG(MGAREG_WIADDR, (dev_priv->WarpIndex[pipe].phys_addr | 
-				  WIA_wmode_start | WIA_wagp_agp));
+	PRIMOUTREG(MGAREG_WIADDR,
+		   (u32) (dev_priv->WarpIndex[pipe].
+			  phys_addr | WIA_wmode_start | WIA_wagp_agp));
 
-	PRIMADVANCE(dev_priv);
+	PRIMADVANCE( dev_priv );
 }
 
-void mgaEmitState( drm_mga_private_t *dev_priv, drm_mga_buf_priv_t *buf_priv )
+static void mgaEmitState(drm_mga_private_t * dev_priv)
 {
-	unsigned int dirty = buf_priv->dirty;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+	DRM_DEBUG("%s\n", __FUNCTION__);
 
-	if (dev_priv->chipset == MGA_CARD_TYPE_G400) {	   
-		if (dirty & MGASAREA_NEW_CONTEXT)
-			mgaEmitContext( dev_priv, buf_priv );
-
-		if (dirty & MGASAREA_NEW_TEX1)
-			mgaG400EmitTex1( dev_priv, buf_priv );
-	   
-		if (dirty & MGASAREA_NEW_TEX0)
-			mgaG400EmitTex0( dev_priv, buf_priv );
+	if (dev_priv->chipset == MGA_CARD_TYPE_G400) {
+		int multitex = sarea_priv->WarpPipe & MGA_T2;
 
-		if (dirty & MGASAREA_NEW_PIPE) 
-			mgaG400EmitPipe( dev_priv, buf_priv );
+		if (sarea_priv->WarpPipe != dev_priv->WarpPipe) {
+			mgaG400EmitPipe(dev_priv);
+			dev_priv->WarpPipe = sarea_priv->WarpPipe;
+		}
+
+		if (dirty & MGA_UPLOAD_CTX) {
+			mgaEmitContext(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_CTX;
+		}
+
+		if (dirty & MGA_UPLOAD_TEX0) {
+			mgaG400EmitTex0(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_TEX0;
+		}
+
+		if ((dirty & MGA_UPLOAD_TEX1) && multitex) {
+			mgaG400EmitTex1(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_TEX1;
+		}
 	} else {
-		if (dirty & MGASAREA_NEW_CONTEXT)
-			mgaEmitContext( dev_priv, buf_priv );
-
-		if (dirty & MGASAREA_NEW_TEX0)
-			mgaG200EmitTex( dev_priv, buf_priv );
-
-		if (dirty & MGASAREA_NEW_PIPE) 
-			mgaG200EmitPipe( dev_priv, buf_priv );
-	}	  
+		if (sarea_priv->WarpPipe != dev_priv->WarpPipe) {
+			mgaG200EmitPipe(dev_priv);
+			dev_priv->WarpPipe = sarea_priv->WarpPipe;
+		}
+
+		if (dirty & MGA_UPLOAD_CTX) {
+			mgaEmitContext(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_CTX;
+		}
+
+		if (dirty & MGA_UPLOAD_TEX0) {
+			mgaG200EmitTex(dev_priv);
+			sarea_priv->dirty &= ~MGA_UPLOAD_TEX0;
+		}
+	}
 }
 
 
-
 /* Disallow all write destinations except the front and backbuffer.
  */
-static int mgaCopyContext(drm_mga_private_t *dev_priv, 
-			  drm_mga_buf_priv_t *buf_priv)
+static int mgaVerifyContext(drm_mga_private_t * dev_priv)
 {
 	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	unsigned int *regs = sarea_priv->ContextState;
-	
-	if (regs[MGA_CTXREG_DSTORG] != dev_priv->frontOrg &&
-	    regs[MGA_CTXREG_DSTORG] != dev_priv->backOrg)
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (regs[MGA_CTXREG_DSTORG] != dev_priv->frontOffset &&
+	    regs[MGA_CTXREG_DSTORG] != dev_priv->backOffset) {
+		DRM_DEBUG("BAD DSTORG: %x (front %x, back %x)\n\n",
+			  regs[MGA_CTXREG_DSTORG], dev_priv->frontOffset,
+			  dev_priv->backOffset);
+		regs[MGA_CTXREG_DSTORG] = 0;
 		return -1;
+	}
 
-	memcpy(buf_priv->ContextState, sarea_priv->ContextState,
-	       sizeof(buf_priv->ContextState));
 	return 0;
 }
 
-
 /* Disallow texture reads from PCI space.
  */
-static int mgaCopyTex(drm_mga_private_t *dev_priv, 
-		      drm_mga_buf_priv_t *buf_priv,
-		      int unit)
+static int mgaVerifyTex(drm_mga_private_t * dev_priv, int unit)
 {
 	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
 
-	if ((sarea_priv->TexState[unit][MGA_TEXREG_ORG] & 0x3) == 0x1)
-		return -1;
+	DRM_DEBUG("%s\n", __FUNCTION__);
 
-	memcpy(buf_priv->TexState[unit], sarea_priv->TexState[unit],
-	       sizeof(buf_priv->TexState[0]));
+	if ((sarea_priv->TexState[unit][MGA_TEXREG_ORG] & 0x3) == 0x1) {
+		DRM_DEBUG("BAD TEXREG_ORG: %x, unit %d\n",
+			  sarea_priv->TexState[unit][MGA_TEXREG_ORG],
+			  unit);
+		sarea_priv->TexState[unit][MGA_TEXREG_ORG] = 0;
+		return -1;
+	}
 
 	return 0;
 }
 
-
-int mgaCopyAndVerifyState( drm_mga_private_t *dev_priv, 
-			   drm_mga_buf_priv_t *buf_priv )
+static int mgaVerifyState(drm_mga_private_t * dev_priv)
 {
 	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	unsigned int dirty = sarea_priv->dirty ;
+	unsigned int dirty = sarea_priv->dirty;
 	int rv = 0;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
 
-	buf_priv->dirty = sarea_priv->dirty;
-	buf_priv->WarpPipe = sarea_priv->WarpPipe;
+	if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
 
-	if (dirty & MGASAREA_NEW_CONTEXT)
-		rv |= mgaCopyContext( dev_priv, buf_priv );
+	if (dirty & MGA_UPLOAD_CTX)
+		rv |= mgaVerifyContext(dev_priv);
 
-	if (dirty & MGASAREA_NEW_TEX0)
-		rv |= mgaCopyTex( dev_priv, buf_priv, 0 );
+	if (dirty & MGA_UPLOAD_TEX0)
+		rv |= mgaVerifyTex(dev_priv, 0);
 
-	if (dev_priv->chipset == MGA_CARD_TYPE_G400) 
-	{	   
-		if (dirty & MGASAREA_NEW_TEX1)
-			rv |= mgaCopyTex( dev_priv, buf_priv, 1 );
-	   
-		if (dirty & MGASAREA_NEW_PIPE) 
-			rv |= (buf_priv->WarpPipe > MGA_MAX_G400_PIPES); 
-	} 
-	else 
-	{
-		if (dirty & MGASAREA_NEW_PIPE) 
-			rv |= (buf_priv->WarpPipe > MGA_MAX_G200_PIPES); 
-	}	  
+	if (dev_priv->chipset == MGA_CARD_TYPE_G400) {
+		if (dirty & MGA_UPLOAD_TEX1)
+			rv |= mgaVerifyTex(dev_priv, 1);
 
+		if (dirty & MGA_UPLOAD_PIPE)
+			rv |= (sarea_priv->WarpPipe > MGA_MAX_G400_PIPES);
+	} else {
+		if (dirty & MGA_UPLOAD_PIPE)
+			rv |= (sarea_priv->WarpPipe > MGA_MAX_G200_PIPES);
+	}
+
 	return rv == 0;
 }
 
+static int mgaVerifyIload(drm_mga_private_t * dev_priv,
+			  unsigned long bus_address,
+			  unsigned int dstOrg, int length)
+{
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (dstOrg < dev_priv->textureOffset ||
+	    dstOrg + length >
+	    (dev_priv->textureOffset + dev_priv->textureSize)) {
+		return -EINVAL;
+	}
+	if (length % 64) {
+		return -EINVAL;
+	}
+	return 0;
+}
+
+/* This copies a 64 byte aligned agp region to the frambuffer
+ * with a standard blit, the ioctl needs to do checking */
+
+static void mga_dma_dispatch_tex_blit(drm_device_t * dev,
+				      unsigned long bus_address,
+				      int length, unsigned int destOrg)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	int use_agp = PDEA_pagpxfer_enable | 0x00000001;
+	u16 y2;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	y2 = length / 64;
+
+	PRIM_OVERFLOW(dev, dev_priv, 30);
+	PRIMGETPTR(dev_priv);
+
+	PRIMOUTREG(MGAREG_DSTORG, destOrg);
+	PRIMOUTREG(MGAREG_MACCESS, 0x00000000);
+	DRM_DEBUG("srcorg : %lx\n", bus_address | use_agp);
+	PRIMOUTREG(MGAREG_SRCORG, (u32) bus_address | use_agp);
+	PRIMOUTREG(MGAREG_AR5, 64);
+
+	PRIMOUTREG(MGAREG_PITCH, 64);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, MGA_COPY_CMD);
+
+	PRIMOUTREG(MGAREG_AR0, 63);
+	PRIMOUTREG(MGAREG_AR3, 0);
+	PRIMOUTREG(MGAREG_FXBNDRY, (63 << 16));
+	PRIMOUTREG(MGAREG_YDSTLEN + MGAREG_MGA_EXEC, y2);
+
+	PRIMOUTREG(MGAREG_SRCORG, 0);
+	PRIMOUTREG(MGAREG_PITCH, dev_priv->stride / dev_priv->cpp);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMADVANCE(dev_priv);
+}
+
+static void mga_dma_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned long address = (unsigned long) buf->bus_address;
+	int length = buf->used;
+	int use_agp = PDEA_pagpxfer_enable;
+	int i = 0;
+	int primary_needed;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	DRM_DEBUG("dispatch vertex %d addr 0x%lx, "
+		  "length 0x%x nbox %d dirty %x\n",
+		  buf->idx, address, length,
+		  sarea_priv->nbox, sarea_priv->dirty);
+
+	DRM_DEBUG("used : %d, total : %d\n", buf->used, buf->total);
+
+	if (buf->used) {
+		/* WARNING: if you change any of the state functions verify
+		 * these numbers (Overestimating this doesn't hurt).  
+		 */
+		buf_priv->dispatched = 1;
+		primary_needed = (50 + 15 + 15 + 30 + 25 +
+				  10 + 15 * MGA_NR_SAREA_CLIPRECTS);
+		PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+		mgaEmitState(dev_priv);
+		do {
+			if (i < sarea_priv->nbox) {
+				DRM_DEBUG("idx %d Emit box %d/%d:"
+					  "%d,%d - %d,%d\n",
+					  buf->idx,
+					  i, sarea_priv->nbox,
+					  sarea_priv->boxes[i].x1,
+					  sarea_priv->boxes[i].y1,
+					  sarea_priv->boxes[i].x2,
+					  sarea_priv->boxes[i].y2);
+
+				mgaEmitClipRect(dev_priv,
+						&sarea_priv->boxes[i]);
+			}
+
+			PRIMGETPTR(dev_priv);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_SECADDRESS,
+				   ((u32) address) | TT_VERTEX);
+			PRIMOUTREG(MGAREG_SECEND,
+				   (((u32) (address + length)) | use_agp));
+			PRIMADVANCE(dev_priv);
+		} while (++i < sarea_priv->nbox);
+	}
+	if (buf_priv->discard) {
+		if (buf_priv->dispatched == 1)
+			AGEBUF(dev_priv, buf_priv);
+		buf_priv->dispatched = 0;
+		mga_freelist_put(dev, buf);
+	}
+
+
+}
+
+
+static void mga_dma_dispatch_indices(drm_device_t * dev,
+				     drm_buf_t * buf,
+				     unsigned int start, unsigned int end)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int address = (unsigned int) buf->bus_address;
+	int use_agp = PDEA_pagpxfer_enable;
+	int i = 0;
+	int primary_needed;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
 
+	DRM_DEBUG("dispatch indices %d addr 0x%x, "
+		  "start 0x%x end 0x%x nbox %d dirty %x\n",
+		  buf->idx, address, start, end,
+		  sarea_priv->nbox, sarea_priv->dirty);
+
+	if (start != end) {
+		/* WARNING: if you change any of the state functions verify
+		 * these numbers (Overestimating this doesn't hurt).  
+		 */
+		buf_priv->dispatched = 1;
+		primary_needed = (50 + 15 + 15 + 30 + 25 +
+				  10 + 15 * MGA_NR_SAREA_CLIPRECTS);
+		PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+		mgaEmitState(dev_priv);
+
+		do {
+			if (i < sarea_priv->nbox) {
+				DRM_DEBUG("idx %d Emit box %d/%d:"
+					  "%d,%d - %d,%d\n",
+					  buf->idx,
+					  i, sarea_priv->nbox,
+					  sarea_priv->boxes[i].x1,
+					  sarea_priv->boxes[i].y1,
+					  sarea_priv->boxes[i].x2,
+					  sarea_priv->boxes[i].y2);
+
+				mgaEmitClipRect(dev_priv,
+						&sarea_priv->boxes[i]);
+			}
+
+			PRIMGETPTR(dev_priv);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_SETUPADDRESS,
+				   ((address + start) |
+				    SETADD_mode_vertlist));
+			PRIMOUTREG(MGAREG_SETUPEND,
+				   ((address + end) | use_agp));
+			PRIMADVANCE(dev_priv);
+		} while (++i < sarea_priv->nbox);
+	}
+	if (buf_priv->discard) {
+		if (buf_priv->dispatched == 1)
+			AGEBUF(dev_priv, buf_priv);
+		buf_priv->dispatched = 0;
+		mga_freelist_put(dev, buf);
+	}
+}
+
+
+static void mga_dma_dispatch_clear(drm_device_t * dev, int flags,
+				   unsigned int clear_color,
+				   unsigned int clear_zval)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	unsigned int cmd;
+	int i;
+	int primary_needed;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (dev_priv->sgram)
+		cmd = MGA_CLEAR_CMD | DC_atype_blk;
+	else
+		cmd = MGA_CLEAR_CMD | DC_atype_rstr;
+
+	primary_needed = nbox * 70;
+	if (primary_needed == 0)
+		primary_needed = 70;
+	PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+	PRIMGETPTR(dev_priv);
+
+	for (i = 0; i < nbox; i++) {
+		unsigned int height = pbox[i].y2 - pbox[i].y1;
+
+		DRM_DEBUG("dispatch clear %d,%d-%d,%d flags %x!\n",
+			  pbox[i].x1, pbox[i].y1, pbox[i].x2,
+			  pbox[i].y2, flags);
+
+		if (flags & MGA_FRONT) {
+			DRM_DEBUG("clear front\n");
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_YDSTLEN,
+				   (pbox[i].y1 << 16) | height);
+			PRIMOUTREG(MGAREG_FXBNDRY,
+				   (pbox[i].x2 << 16) | pbox[i].x1);
+
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_FCOL, clear_color);
+			PRIMOUTREG(MGAREG_DSTORG, dev_priv->frontOffset);
+			PRIMOUTREG(MGAREG_DWGCTL + MGAREG_MGA_EXEC, cmd);
+		}
+
+		if (flags & MGA_BACK) {
+			DRM_DEBUG("clear back\n");
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_YDSTLEN,
+				   (pbox[i].y1 << 16) | height);
+			PRIMOUTREG(MGAREG_FXBNDRY,
+				   (pbox[i].x2 << 16) | pbox[i].x1);
+
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_FCOL, clear_color);
+			PRIMOUTREG(MGAREG_DSTORG, dev_priv->backOffset);
+			PRIMOUTREG(MGAREG_DWGCTL + MGAREG_MGA_EXEC, cmd);
+		}
+
+		if (flags & MGA_DEPTH) {
+			DRM_DEBUG("clear depth\n");
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_YDSTLEN,
+				   (pbox[i].y1 << 16) | height);
+			PRIMOUTREG(MGAREG_FXBNDRY,
+				   (pbox[i].x2 << 16) | pbox[i].x1);
+
+			PRIMOUTREG(MGAREG_DMAPAD, 0);
+			PRIMOUTREG(MGAREG_FCOL, clear_zval);
+			PRIMOUTREG(MGAREG_DSTORG, dev_priv->depthOffset);
+			PRIMOUTREG(MGAREG_DWGCTL + MGAREG_MGA_EXEC, cmd);
+		}
+	}
+
+	/* Force reset of DWGCTL */
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+	PRIMADVANCE(dev_priv);
+}
+
+static void mga_dma_dispatch_swap(drm_device_t * dev)
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int *regs = sarea_priv->ContextState;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int i;
+	int primary_needed;
+	PRIMLOCALS;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	primary_needed = nbox * 5;
+	primary_needed += 65;
+	PRIM_OVERFLOW(dev, dev_priv, primary_needed);
+	PRIMGETPTR(dev_priv);
+
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGSYNC, 0x7100);
+	PRIMOUTREG(MGAREG_DWGSYNC, 0x7000);
+
+	PRIMOUTREG(MGAREG_DSTORG, dev_priv->frontOffset);
+	PRIMOUTREG(MGAREG_MACCESS, dev_priv->mAccess);
+	PRIMOUTREG(MGAREG_SRCORG, dev_priv->backOffset);
+	PRIMOUTREG(MGAREG_AR5, dev_priv->stride / 2);
+
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, MGA_COPY_CMD);
+
+	for (i = 0; i < nbox; i++) {
+		unsigned int h = pbox[i].y2 - pbox[i].y1;
+		unsigned int start = pbox[i].y1 * dev_priv->stride / 2;
+
+		DRM_DEBUG("dispatch swap %d,%d-%d,%d!\n",
+			  pbox[i].x1, pbox[i].y1, pbox[i].x2, pbox[i].y2);
+
+		PRIMOUTREG(MGAREG_AR0, start + pbox[i].x2 - 1);
+		PRIMOUTREG(MGAREG_AR3, start + pbox[i].x1);
+		PRIMOUTREG(MGAREG_FXBNDRY,
+			   pbox[i].x1 | ((pbox[i].x2 - 1) << 16));
+		PRIMOUTREG(MGAREG_YDSTLEN + MGAREG_MGA_EXEC,
+			   (pbox[i].y1 << 16) | h);
+	}
+
+	/* Force reset of DWGCTL */
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_DMAPAD, 0);
+	PRIMOUTREG(MGAREG_SRCORG, 0);
+	PRIMOUTREG(MGAREG_DWGCTL, regs[MGA_CTXREG_DWGCTL]);
+
+	PRIMADVANCE(dev_priv);
+}
+
+int mga_clear_bufs(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_clear_t clear;
+
+	copy_from_user_ret(&clear, (drm_mga_clear_t *) arg, sizeof(clear),
+			   -EFAULT);
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_clear_bufs called without lock held\n");
+		return -EINVAL;
+	}
+
+	if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CTX;
+	mga_dma_dispatch_clear(dev, clear.flags,
+			       clear.clear_color, clear.clear_depth);
+	PRIMUPDATE(dev_priv);
+	mga_flush_write_combine();
+	mga_dma_schedule(dev, 1);
+	return 0;
+}
+
+int mga_swap_bufs(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_swap_bufs called without lock held\n");
+		return -EINVAL;
+	}
+
+	if (sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS)
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CTX;
+	mga_dma_dispatch_swap(dev);
+	PRIMUPDATE(dev_priv);
+	set_bit(MGA_BUF_SWAP_PENDING,
+		&dev_priv->current_prim->buffer_status);
+	mga_flush_write_combine();
+	mga_dma_schedule(dev, 1);
+	return 0;
+}
+
+int mga_iload(struct inode *inode, struct file *filp,
+	      unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_iload_t iload;
+	unsigned long bus_address;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	DRM_DEBUG("Starting Iload\n");
+	copy_from_user_ret(&iload, (drm_mga_iload_t *) arg, sizeof(iload),
+			   -EFAULT);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_iload called without lock held\n");
+		return -EINVAL;
+	}
+
+	buf = dma->buflist[iload.idx];
+	buf_priv = buf->dev_private;
+	bus_address = buf->bus_address;
+	DRM_DEBUG("bus_address %lx, length %d, destorg : %x\n",
+		  bus_address, iload.length, iload.destOrg);
+
+	if (mgaVerifyIload(dev_priv,
+			   bus_address, iload.destOrg, iload.length)) {
+		mga_freelist_put(dev, buf);
+		return -EINVAL;
+	}
+
+	sarea_priv->dirty |= MGA_UPLOAD_CTX;
+
+	mga_dma_dispatch_tex_blit(dev, bus_address, iload.length,
+				  iload.destOrg);
+	AGEBUF(dev_priv, buf_priv);
+	buf_priv->discard = 1;
+	mga_freelist_put(dev, buf);
+	mga_flush_write_combine();
+	mga_dma_schedule(dev, 1);
+	return 0;
+}
+
+int mga_vertex(struct inode *inode, struct file *filp,
+	       unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_vertex_t vertex;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	copy_from_user_ret(&vertex, (drm_mga_vertex_t *) arg,
+			   sizeof(vertex), -EFAULT);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_vertex called without lock held\n");
+		return -EINVAL;
+	}
+
+	DRM_DEBUG("mga_vertex\n");
+
+	buf = dma->buflist[vertex.idx];
+	buf_priv = buf->dev_private;
+
+	buf->used = vertex.used;
+	buf_priv->discard = vertex.discard;
+
+	if (!mgaVerifyState(dev_priv)) {
+		if (vertex.discard) {
+			if (buf_priv->dispatched == 1)
+				AGEBUF(dev_priv, buf_priv);
+			buf_priv->dispatched = 0;
+			mga_freelist_put(dev, buf);
+		}
+		DRM_DEBUG("bad state\n");
+		return -EINVAL;
+	}
+
+	mga_dma_dispatch_vertex(dev, buf);
+
+	PRIMUPDATE(dev_priv);
+	mga_flush_write_combine();
+	mga_dma_schedule(dev, 1);
+	return 0;
+}
+
+
+int mga_indices(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_mga_private_t *dev_priv =
+	    (drm_mga_private_t *) dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_indices_t indices;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	copy_from_user_ret(&indices, (drm_mga_indices_t *) arg,
+			   sizeof(indices), -EFAULT);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_indices called without lock held\n");
+		return -EINVAL;
+	}
+
+	DRM_DEBUG("mga_indices\n");
+
+	buf = dma->buflist[indices.idx];
+	buf_priv = buf->dev_private;
+
+	buf_priv->discard = indices.discard;
+
+	if (!mgaVerifyState(dev_priv)) {
+		if (indices.discard) {
+			if (buf_priv->dispatched == 1)
+				AGEBUF(dev_priv, buf_priv);
+			buf_priv->dispatched = 0;
+			mga_freelist_put(dev, buf);
+		}
+		return -EINVAL;
+	}
+
+	mga_dma_dispatch_indices(dev, buf, indices.start, indices.end);
+
+	PRIMUPDATE(dev_priv);
+	mga_flush_write_combine();
+	mga_dma_schedule(dev, 1);
+	return 0;
+}
+
+
+
+static int mga_dma_get_buffers(drm_device_t * dev, drm_dma_t * d)
+{
+	int i;
+	drm_buf_t *buf;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	for (i = d->granted_count; i < d->request_count; i++) {
+		buf = mga_freelist_get(dev);
+		if (!buf)
+			break;
+		buf->pid = current->pid;
+		copy_to_user_ret(&d->request_indices[i],
+				 &buf->idx, sizeof(buf->idx), -EFAULT);
+		copy_to_user_ret(&d->request_sizes[i],
+				 &buf->total, sizeof(buf->total), -EFAULT);
+		++d->granted_count;
+	}
+	return 0;
+}
+
+int mga_dma(struct inode *inode, struct file *filp, unsigned int cmd,
+	    unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	int retcode = 0;
+	drm_dma_t d;
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	copy_from_user_ret(&d, (drm_dma_t *) arg, sizeof(d), -EFAULT);
+	DRM_DEBUG("%d %d: %d send, %d req\n",
+		  current->pid, d.context, d.send_count, d.request_count);
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("mga_dma called without lock held\n");
+		return -EINVAL;
+	}
+
+	/* Please don't send us buffers.
+	 */
+	if (d.send_count != 0) {
+		DRM_ERROR
+		    ("Process %d trying to send %d buffers via drmDMA\n",
+		     current->pid, d.send_count);
+		return -EINVAL;
+	}
+
+	/* We'll send you buffers.
+	 */
+	if (d.request_count < 0 || d.request_count > dma->buf_count) {
+		DRM_ERROR
+		    ("Process %d trying to get %d buffers (of %d max)\n",
+		     current->pid, d.request_count, dma->buf_count);
+		return -EINVAL;
+	}
+
+	d.granted_count = 0;
+
+	if (d.request_count) {
+		retcode = mga_dma_get_buffers(dev, &d);
+	}
+
+	DRM_DEBUG("%d returning, granted = %d\n",
+		  current->pid, d.granted_count);
+	copy_to_user_ret((drm_dma_t *) arg, &d, sizeof(d), -EFAULT);
+	return retcode;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.h:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.h:removed
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.h:1.1	Fri Feb 11 09:26:08 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.h	Sat Jul  1 20:43:17 2000
@@ -1,13 +0,0 @@
-#ifndef MGA_STATE_H
-#define MGA_STATE_H
-
-#include "mga_drv.h"
-
-int mgaCopyAndVerifyState( drm_mga_private_t *dev_priv, 
-			   drm_mga_buf_priv_t *buf_priv );
-
-void mgaEmitClipRect( drm_mga_private_t *dev_priv, xf86drmClipRectRec *box );
-
-void mgaEmitState( drm_mga_private_t *dev_priv, drm_mga_buf_priv_t *buf_priv );
-
-#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mgareg_flags.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mgareg_flags.h:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mgareg_flags.h:removed
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mgareg_flags.h:1.1	Fri Feb 11 09:26:09 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mgareg_flags.h	Sat Jul  1 20:43:17 2000
@@ -1,930 +0,0 @@
-/* author: stephen crowley, crow@debian.org */
-
-/*
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * STEPHEN CROWLEY, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _MGAREGS_H_
-#define _MGAREGS_H_
-
-/*************** (START) AUTOMATICLY GENERATED REGISTER FILE *****************/
-/*
- * Generated on Sat Nov 20 21:25:36 CST 1999
- */
-
-
-
-/*
- * Power Graphic Mode Memory Space Registers
- */
-
-    #define AGP_PLL_agp2xpllen_MASK 	0xfffffffe 	/* bit 0 */
-    #define AGP_PLL_agp2xpllen_disable 	0x0 		
-    #define AGP_PLL_agp2xpllen_enable 	0x1 		
-
-    #define AC_src_MASK 		0xfffffff0 	/* bits 0-3 */
-    #define AC_src_zero 		0x0 		/* val 0, shift 0 */
-    #define AC_src_one 			0x1 		/* val 1, shift 0 */
-    #define AC_src_dst_color 		0x2 		/* val 2, shift 0 */
-    #define AC_src_om_dst_color 	0x3 		/* val 3, shift 0 */
-    #define AC_src_src_alpha 		0x4 		/* val 4, shift 0 */
-    #define AC_src_om_src_alpha 	0x5 		/* val 5, shift 0 */
-    #define AC_src_dst_alpha 		0x6 		/* val 6, shift 0 */
-    #define AC_src_om_dst_alpha 	0x7 		/* val 7, shift 0 */
-    #define AC_src_src_alpha_sat 	0x8 		/* val 8, shift 0 */
-    #define AC_dst_MASK 		0xffffff0f 	/* bits 4-7 */
-    #define AC_dst_zero 		0x0 		/* val 0, shift 4 */
-    #define AC_dst_one 			0x10 		/* val 1, shift 4 */
-    #define AC_dst_src_color 		0x20 		/* val 2, shift 4 */
-    #define AC_dst_om_src_color 	0x30 		/* val 3, shift 4 */
-    #define AC_dst_src_alpha 		0x40 		/* val 4, shift 4 */
-    #define AC_dst_om_src_alpha 	0x50 		/* val 5, shift 4 */
-    #define AC_dst_dst_alpha 		0x60 		/* val 6, shift 4 */
-    #define AC_dst_om_dst_alpha 	0x70 		/* val 7, shift 4 */
-    #define AC_amode_MASK 		0xfffffcff 	/* bits 8-9 */
-    #define AC_amode_FCOL 		0x0 		/* val 0, shift 8 */
-    #define AC_amode_alpha_channel 	0x100 		/* val 1, shift 8 */
-    #define AC_amode_video_alpha 	0x200 		/* val 2, shift 8 */
-    #define AC_amode_RSVD 		0x300 		/* val 3, shift 8 */
-    #define AC_astipple_MASK 		0xfffff7ff 	/* bit 11 */
-    #define AC_astipple_disable 	0x0 		
-    #define AC_astipple_enable 		0x800 		
-    #define AC_aten_MASK 		0xffffefff 	/* bit 12 */
-    #define AC_aten_disable 		0x0 		
-    #define AC_aten_enable 		0x1000 		
-    #define AC_atmode_MASK 		0xffff1fff 	/* bits 13-15 */
-    #define AC_atmode_noacmp 		0x0 		/* val 0, shift 13 */
-    #define AC_atmode_ae 		0x4000 		/* val 2, shift 13 */
-    #define AC_atmode_ane 		0x6000 		/* val 3, shift 13 */
-    #define AC_atmode_alt 		0x8000 		/* val 4, shift 13 */
-    #define AC_atmode_alte 		0xa000 		/* val 5, shift 13 */
-    #define AC_atmode_agt 		0xc000 		/* val 6, shift 13 */
-    #define AC_atmode_agte 		0xe000 		/* val 7, shift 13 */
-    #define AC_atref_MASK 		0xff00ffff 	/* bits 16-23 */
-    #define AC_atref_SHIFT 		16 		
-    #define AC_alphasel_MASK 		0xfcffffff 	/* bits 24-25 */
-    #define AC_alphasel_fromtex 	0x0 		/* val 0, shift 24 */
-    #define AC_alphasel_diffused 	0x1000000 	/* val 1, shift 24 */
-    #define AC_alphasel_modulated 	0x2000000 	/* val 2, shift 24 */
-    #define AC_alphasel_trans 		0x3000000 	/* val 3, shift 24 */
-
-    #define AR0_ar0_MASK 		0xfffc0000 	/* bits 0-17 */
-    #define AR0_ar0_SHIFT 		0 		
-
-    #define AR1_ar1_MASK 		0xff000000 	/* bits 0-23 */
-    #define AR1_ar1_SHIFT 		0 		
-
-    #define AR2_ar2_MASK 		0xfffc0000 	/* bits 0-17 */
-    #define AR2_ar2_SHIFT 		0 		
-
-    #define AR3_ar3_MASK 		0xff000000 	/* bits 0-23 */
-    #define AR3_ar3_SHIFT 		0 		
-    #define AR3_spage_MASK 		0xf8ffffff 	/* bits 24-26 */
-    #define AR3_spage_SHIFT 		24 		
-
-    #define AR4_ar4_MASK 		0xfffc0000 	/* bits 0-17 */
-    #define AR4_ar4_SHIFT 		0 		
-
-    #define AR5_ar5_MASK 		0xfffc0000 	/* bits 0-17 */
-    #define AR5_ar5_SHIFT 		0 		
-
-    #define AR6_ar6_MASK 		0xfffc0000 	/* bits 0-17 */
-    #define AR6_ar6_SHIFT 		0 		
-
-    #define BC_besen_MASK 		0xfffffffe 	/* bit 0 */
-    #define BC_besen_disable 		0x0 		
-    #define BC_besen_enable 		0x1 		
-    #define BC_besv1srcstp_MASK 	0xffffffbf 	/* bit 6 */
-    #define BC_besv1srcstp_even 	0x0 		
-    #define BC_besv1srcstp_odd 		0x40 		
-    #define BC_besv2srcstp_MASK 	0xfffffeff 	/* bit 8 */
-    #define BC_besv2srcstp_disable 	0x0 		
-    #define BC_besv2srcstp_enable 	0x100 		
-    #define BC_beshfen_MASK 		0xfffffbff 	/* bit 10 */
-    #define BC_beshfen_disable 		0x0 		
-    #define BC_beshfen_enable 		0x400 		
-    #define BC_besvfen_MASK 		0xfffff7ff 	/* bit 11 */
-    #define BC_besvfen_disable 		0x0 		
-    #define BC_besvfen_enable 		0x800 		
-    #define BC_beshfixc_MASK 		0xffffefff 	/* bit 12 */
-    #define BC_beshfixc_weight 		0x0 		
-    #define BC_beshfixc_coeff 		0x1000 		
-    #define BC_bescups_MASK 		0xfffeffff 	/* bit 16 */
-    #define BC_bescups_disable 		0x0 		
-    #define BC_bescups_enable 		0x10000 	
-    #define BC_bes420pl_MASK 		0xfffdffff 	/* bit 17 */
-    #define BC_bes420pl_422 		0x0 		
-    #define BC_bes420pl_420 		0x20000 	
-    #define BC_besdith_MASK 		0xfffbffff 	/* bit 18 */
-    #define BC_besdith_disable 		0x0 		
-    #define BC_besdith_enable 		0x40000 	
-    #define BC_beshmir_MASK 		0xfff7ffff 	/* bit 19 */
-    #define BC_beshmir_disable 		0x0 		
-    #define BC_beshmir_enable 		0x80000 	
-    #define BC_besbwen_MASK 		0xffefffff 	/* bit 20 */
-    #define BC_besbwen_color 		0x0 		
-    #define BC_besbwen_bw 		0x100000 	
-    #define BC_besblank_MASK 		0xffdfffff 	/* bit 21 */
-    #define BC_besblank_disable 	0x0 		
-    #define BC_besblank_enable 		0x200000 	
-    #define BC_besfselm_MASK 		0xfeffffff 	/* bit 24 */
-    #define BC_besfselm_soft 		0x0 		
-    #define BC_besfselm_hard 		0x1000000 	
-    #define BC_besfsel_MASK 		0xf9ffffff 	/* bits 25-26 */
-    #define BC_besfsel_a1 		0x0 		/* val 0, shift 25 */
-    #define BC_besfsel_a2 		0x2000000 	/* val 1, shift 25 */
-    #define BC_besfsel_b1 		0x4000000 	/* val 2, shift 25 */
-    #define BC_besfsel_b2 		0x6000000 	/* val 3, shift 25 */
-
-    #define BGC_beshzoom_MASK 		0xfffffffe 	/* bit 0 */
-    #define BGC_beshzoom_disable 	0x0 		
-    #define BGC_beshzoom_enable 	0x1 		
-    #define BGC_beshzoomf_MASK 		0xfffffffd 	/* bit 1 */
-    #define BGC_beshzoomf_disable 	0x0 		
-    #define BGC_beshzoomf_enable 	0x2 		
-    #define BGC_bescorder_MASK 		0xfffffff7 	/* bit 3 */
-    #define BGC_bescorder_even 		0x0 		
-    #define BGC_bescorder_odd 		0x8 		
-    #define BGC_besreghup_MASK 		0xffffffef 	/* bit 4 */
-    #define BGC_besreghup_disable 	0x0 		
-    #define BGC_besreghup_enable 	0x10 		
-    #define BGC_besvcnt_MASK 		0xf000ffff 	/* bits 16-27 */
-    #define BGC_besvcnt_SHIFT 		16 		
-
-    #define BHC_besright_MASK 		0xfffff800 	/* bits 0-10 */
-    #define BHC_besright_SHIFT 		0 		
-    #define BHC_besleft_MASK 		0xf800ffff 	/* bits 16-26 */
-    #define BHC_besleft_SHIFT 		16 		
-
-    #define BHISF_beshiscal_MASK 	0xffe00003 	/* bits 2-20 */
-    #define BHISF_beshiscal_SHIFT 	2 		
-
-    #define BHSE_beshsrcend_MASK 	0xfc000003 	/* bits 2-25 */
-    #define BHSE_beshsrcend_SHIFT 	2 		
-
-    #define BHSL_beshsrclst_MASK 	0xfc00ffff 	/* bits 16-25 */
-    #define BHSL_beshsrclst_SHIFT 	16 		
-
-    #define BHSS_beshsrcst_MASK 	0xfc000003 	/* bits 2-25 */
-    #define BHSS_beshsrcst_SHIFT 	2 		
-
-    #define BP_bespitch_MASK 		0xfffff000 	/* bits 0-11 */
-    #define BP_bespitch_SHIFT 		0 		
-
-    #define BS_besstat_MASK 		0xfffffffc 	/* bits 0-1 */
-    #define BS_besstat_a1 		0x0 		/* val 0, shift 0 */
-    #define BS_besstat_a2 		0x1 		/* val 1, shift 0 */
-    #define BS_besstat_b1 		0x2 		/* val 2, shift 0 */
-    #define BS_besstat_b2 		0x3 		/* val 3, shift 0 */
-
-    #define BSF_besv1srclast_MASK 	0xfffffc00 	/* bits 0-9 */
-    #define BSF_besv1srclast_SHIFT 	0 		
-
-    #define BSF_besv2srclst_MASK 	0xfffffc00 	/* bits 0-9 */
-    #define BSF_besv2srclst_SHIFT 	0 		
-
-    #define BSF_besv1wght_MASK 		0xffff0003 	/* bits 2-15 */
-    #define BSF_besv1wght_SHIFT 	2 		
-    #define BSF_besv1wghts_MASK 	0xfffeffff 	/* bit 16 */
-    #define BSF_besv1wghts_disable 	0x0 		
-    #define BSF_besv1wghts_enable 	0x10000 	
-
-    #define BSF_besv2wght_MASK 		0xffff0003 	/* bits 2-15 */
-    #define BSF_besv2wght_SHIFT 	2 		
-    #define BSF_besv2wghts_MASK 	0xfffeffff 	/* bit 16 */
-    #define BSF_besv2wghts_disable 	0x0 		
-    #define BSF_besv2wghts_enable 	0x10000 	
-
-    #define BVC_besbot_MASK 		0xfffff800 	/* bits 0-10 */
-    #define BVC_besbot_SHIFT 		0 		
-    #define BVC_bestop_MASK 		0xf800ffff 	/* bits 16-26 */
-    #define BVC_bestop_SHIFT 		16 		
-
-    #define BVISF_besviscal_MASK 	0xffe00003 	/* bits 2-20 */
-    #define BVISF_besviscal_SHIFT 	2 		
-
-    #define CXB_cxleft_MASK 		0xfffff000 	/* bits 0-11 */
-    #define CXB_cxleft_SHIFT 		0 		
-    #define CXB_cxright_MASK 		0xf000ffff 	/* bits 16-27 */
-    #define CXB_cxright_SHIFT 		16 		
-
-    #define DO_dstmap_MASK 		0xfffffffe 	/* bit 0 */
-    #define DO_dstmap_fb 		0x0 		
-    #define DO_dstmap_sys 		0x1 		
-    #define DO_dstacc_MASK 		0xfffffffd 	/* bit 1 */
-    #define DO_dstacc_pci 		0x0 		
-    #define DO_dstacc_agp 		0x2 		
-    #define DO_dstorg_MASK 		0x7 		/* bits 3-31 */
-    #define DO_dstorg_SHIFT 		3 		
-
-    #define DC_opcod_MASK 		0xfffffff0 	/* bits 0-3 */
-    #define DC_opcod_line_open 		0x0 		/* val 0, shift 0 */
-    #define DC_opcod_autoline_open 	0x1 		/* val 1, shift 0 */
-    #define DC_opcod_line_close 	0x2 		/* val 2, shift 0 */
-    #define DC_opcod_autoline_close 	0x3 		/* val 3, shift 0 */
-    #define DC_opcod_trap 		0x4 		/* val 4, shift 0 */
-    #define DC_opcod_texture_trap 	0x6 		/* val 6, shift 0 */
-    #define DC_opcod_bitblt 		0x8 		/* val 8, shift 0 */
-    #define DC_opcod_iload 		0x9 		/* val 9, shift 0 */
-    #define DC_atype_MASK 		0xffffff8f 	/* bits 4-6 */
-    #define DC_atype_rpl 		0x0 		/* val 0, shift 4 */
-    #define DC_atype_rstr 		0x10 		/* val 1, shift 4 */
-    #define DC_atype_zi 		0x30 		/* val 3, shift 4 */
-    #define DC_atype_blk 		0x40 		/* val 4, shift 4 */
-    #define DC_atype_i 			0x70 		/* val 7, shift 4 */
-    #define DC_linear_MASK 		0xffffff7f 	/* bit 7 */
-    #define DC_linear_xy 		0x0 		
-    #define DC_linear_linear 		0x80 		
-    #define DC_zmode_MASK 		0xfffff8ff 	/* bits 8-10 */
-    #define DC_zmode_nozcmp 		0x0 		/* val 0, shift 8 */
-    #define DC_zmode_ze 		0x200 		/* val 2, shift 8 */
-    #define DC_zmode_zne 		0x300 		/* val 3, shift 8 */
-    #define DC_zmode_zlt 		0x400 		/* val 4, shift 8 */
-    #define DC_zmode_zlte 		0x500 		/* val 5, shift 8 */
-    #define DC_zmode_zgt 		0x600 		/* val 6, shift 8 */
-    #define DC_zmode_zgte 		0x700 		/* val 7, shift 8 */
-    #define DC_solid_MASK 		0xfffff7ff 	/* bit 11 */
-    #define DC_solid_disable 		0x0 		
-    #define DC_solid_enable 		0x800 		
-    #define DC_arzero_MASK 		0xffffefff 	/* bit 12 */
-    #define DC_arzero_disable 		0x0 		
-    #define DC_arzero_enable 		0x1000 		
-    #define DC_sgnzero_MASK 		0xffffdfff 	/* bit 13 */
-    #define DC_sgnzero_disable 		0x0 		
-    #define DC_sgnzero_enable 		0x2000 		
-    #define DC_shftzero_MASK 		0xffffbfff 	/* bit 14 */
-    #define DC_shftzero_disable 	0x0 		
-    #define DC_shftzero_enable 		0x4000 		
-    #define DC_bop_MASK 		0xfff0ffff 	/* bits 16-19 */
-    #define DC_bop_SHIFT 		16 		
-    #define DC_trans_MASK 		0xff0fffff 	/* bits 20-23 */
-    #define DC_trans_SHIFT 		20 		
-    #define DC_bltmod_MASK 		0xe1ffffff 	/* bits 25-28 */
-    #define DC_bltmod_bmonolef 		0x0 		/* val 0, shift 25 */
-    #define DC_bltmod_bmonowf 		0x8000000 	/* val 4, shift 25 */
-    #define DC_bltmod_bplan 		0x2000000 	/* val 1, shift 25 */
-    #define DC_bltmod_bfcol 		0x4000000 	/* val 2, shift 25 */
-    #define DC_bltmod_bu32bgr 		0x6000000 	/* val 3, shift 25 */
-    #define DC_bltmod_bu32rgb 		0xe000000 	/* val 7, shift 25 */
-    #define DC_bltmod_bu24bgr 		0x16000000 	/* val 11, shift 25 */
-    #define DC_bltmod_bu24rgb 		0x1e000000 	/* val 15, shift 25 */
-    #define DC_pattern_MASK 		0xdfffffff 	/* bit 29 */
-    #define DC_pattern_disable 		0x0 		
-    #define DC_pattern_enable 		0x20000000 	
-    #define DC_transc_MASK 		0xbfffffff 	/* bit 30 */
-    #define DC_transc_disable 		0x0 		
-    #define DC_transc_enable 		0x40000000 	
-    #define DC_clipdis_MASK 		0x7fffffff 	/* bit 31 */
-    #define DC_clipdis_disable 		0x0 		
-    #define DC_clipdis_enable 		0x80000000 	
-
-    #define DS_dwgsyncaddr_MASK 	0x3 		/* bits 2-31 */
-    #define DS_dwgsyncaddr_SHIFT 	2 		
-
-    #define FS_fifocount_MASK 		0xffffff80 	/* bits 0-6 */
-    #define FS_fifocount_SHIFT 		0 		
-    #define FS_bfull_MASK 		0xfffffeff 	/* bit 8 */
-    #define FS_bfull_disable 		0x0 		
-    #define FS_bfull_enable 		0x100 		
-    #define FS_bempty_MASK 		0xfffffdff 	/* bit 9 */
-    #define FS_bempty_disable 		0x0 		
-    #define FS_bempty_enable 		0x200 		
-
-    #define XA_fxleft_MASK 		0xffff0000 	/* bits 0-15 */
-    #define XA_fxleft_SHIFT 		0 		
-    #define XA_fxright_MASK 		0xffff 		/* bits 16-31 */
-    #define XA_fxright_SHIFT 		16 		
-
-    #define IC_softrapiclr_MASK 	0xfffffffe 	/* bit 0 */
-    #define IC_softrapiclr_disable 	0x0 		
-    #define IC_softrapiclr_enable 	0x1 		
-    #define IC_pickiclr_MASK 		0xfffffffb 	/* bit 2 */
-    #define IC_pickiclr_disable 	0x0 		
-    #define IC_pickiclr_enable 		0x4 		
-    #define IC_vlineiclr_MASK 		0xffffffdf 	/* bit 5 */
-    #define IC_vlineiclr_disable 	0x0 		
-    #define IC_vlineiclr_enable 	0x20 		
-    #define IC_wiclr_MASK 		0xffffff7f 	/* bit 7 */
-    #define IC_wiclr_disable 		0x0 		
-    #define IC_wiclr_enable 		0x80 		
-    #define IC_wciclr_MASK 		0xfffffeff 	/* bit 8 */
-    #define IC_wciclr_disable 		0x0 		
-    #define IC_wciclr_enable 		0x100 		
-
-    #define IE_softrapien_MASK 		0xfffffffe 	/* bit 0 */
-    #define IE_softrapien_disable 	0x0 		
-    #define IE_softrapien_enable 	0x1 		
-    #define IE_pickien_MASK 		0xfffffffb 	/* bit 2 */
-    #define IE_pickien_disable 		0x0 		
-    #define IE_pickien_enable 		0x4 		
-    #define IE_vlineien_MASK 		0xffffffdf 	/* bit 5 */
-    #define IE_vlineien_disable 	0x0 		
-    #define IE_vlineien_enable 		0x20 		
-    #define IE_extien_MASK 		0xffffffbf 	/* bit 6 */
-    #define IE_extien_disable 		0x0 		
-    #define IE_extien_enable 		0x40 		
-    #define IE_wien_MASK 		0xffffff7f 	/* bit 7 */
-    #define IE_wien_disable 		0x0 		
-    #define IE_wien_enable 		0x80 		
-    #define IE_wcien_MASK 		0xfffffeff 	/* bit 8 */
-    #define IE_wcien_disable 		0x0 		
-    #define IE_wcien_enable 		0x100 		
-
-    #define MA_pwidth_MASK 		0xfffffffc 	/* bits 0-1 */
-    #define MA_pwidth_8 		0x0 		/* val 0, shift 0 */
-    #define MA_pwidth_16 		0x1 		/* val 1, shift 0 */
-    #define MA_pwidth_32 		0x2 		/* val 2, shift 0 */
-    #define MA_pwidth_24 		0x3 		/* val 3, shift 0 */
-    #define MA_zwidth_MASK 		0xffffffe7 	/* bits 3-4 */
-    #define MA_zwidth_16 		0x0 		/* val 0, shift 3 */
-    #define MA_zwidth_32 		0x8 		/* val 1, shift 3 */
-    #define MA_zwidth_15 		0x10 		/* val 2, shift 3 */
-    #define MA_zwidth_24 		0x18 		/* val 3, shift 3 */
-    #define MA_memreset_MASK 		0xffff7fff 	/* bit 15 */
-    #define MA_memreset_disable 	0x0 		
-    #define MA_memreset_enable 		0x8000 		
-    #define MA_fogen_MASK 		0xfbffffff 	/* bit 26 */
-    #define MA_fogen_disable 		0x0 		
-    #define MA_fogen_enable 		0x4000000 	
-    #define MA_tlutload_MASK 		0xdfffffff 	/* bit 29 */
-    #define MA_tlutload_disable 	0x0 		
-    #define MA_tlutload_enable 		0x20000000 	
-    #define MA_nodither_MASK 		0xbfffffff 	/* bit 30 */
-    #define MA_nodither_disable 	0x0 		
-    #define MA_nodither_enable 		0x40000000 	
-    #define MA_dit555_MASK 		0x7fffffff 	/* bit 31 */
-    #define MA_dit555_disable 		0x0 		
-    #define MA_dit555_enable 		0x80000000 	
-
-    #define MCWS_casltncy_MASK 		0xfffffff8 	/* bits 0-2 */
-    #define MCWS_casltncy_SHIFT 	0 		
-    #define MCWS_rrddelay_MASK 		0xffffffcf 	/* bits 4-5 */
-    #define MCWS_rcddelay_MASK 		0xfffffe7f 	/* bits 7-8 */
-    #define MCWS_rasmin_MASK 		0xffffe3ff 	/* bits 10-12 */
-    #define MCWS_rasmin_SHIFT 		10 		
-    #define MCWS_rpdelay_MASK 		0xffff3fff 	/* bits 14-15 */
-    #define MCWS_wrdelay_MASK 		0xfff3ffff 	/* bits 18-19 */
-    #define MCWS_rddelay_MASK 		0xffdfffff 	/* bit 21 */
-    #define MCWS_rddelay_disable 	0x0 		
-    #define MCWS_rddelay_enable 	0x200000 	
-    #define MCWS_smrdelay_MASK 		0xfe7fffff 	/* bits 23-24 */
-    #define MCWS_bwcdelay_MASK 		0xf3ffffff 	/* bits 26-27 */
-    #define MCWS_bpldelay_MASK 		0x1fffffff 	/* bits 29-31 */
-    #define MCWS_bpldelay_SHIFT 	29 		
-
-    #define MRB_mclkbrd0_MASK 		0xfffffff0 	/* bits 0-3 */
-    #define MRB_mclkbrd0_SHIFT 		0 		
-    #define MRB_mclkbrd1_MASK 		0xfffffe1f 	/* bits 5-8 */
-    #define MRB_mclkbrd1_SHIFT 		5 		
-    #define MRB_strmfctl_MASK 		0xff3fffff 	/* bits 22-23 */
-    #define MRB_mrsopcod_MASK 		0xe1ffffff 	/* bits 25-28 */
-    #define MRB_mrsopcod_SHIFT 		25 		
-
-    #define OM_dmamod_MASK 		0xfffffff3 	/* bits 2-3 */
-    #define OM_dmamod_general 		0x0 		/* val 0, shift 2 */
-    #define OM_dmamod_blit 		0x4 		/* val 1, shift 2 */
-    #define OM_dmamod_vector 		0x8 		/* val 2, shift 2 */
-    #define OM_dmamod_vertex 		0xc 		/* val 3, shift 2 */
-    #define OM_dmadatasiz_MASK 		0xfffffcff 	/* bits 8-9 */
-    #define OM_dmadatasiz_8 		0x0 		/* val 0, shift 8 */
-    #define OM_dmadatasiz_16 		0x100 		/* val 1, shift 8 */
-    #define OM_dmadatasiz_32 		0x200 		/* val 2, shift 8 */
-    #define OM_dirdatasiz_MASK 		0xfffcffff 	/* bits 16-17 */
-    #define OM_dirdatasiz_8 		0x0 		/* val 0, shift 16 */
-    #define OM_dirdatasiz_16 		0x10000 	/* val 1, shift 16 */
-    #define OM_dirdatasiz_32 		0x20000 	/* val 2, shift 16 */
-
-    #define P_iy_MASK 			0xffffe000 	/* bits 0-12 */
-    #define P_iy_SHIFT 			0 		
-    #define P_ylin_MASK 		0xffff7fff 	/* bit 15 */
-    #define P_ylin_disable 		0x0 		
-    #define P_ylin_enable 		0x8000 		
-
-    #define PDCA_primod_MASK 		0xfffffffc 	/* bits 0-1 */
-    #define PDCA_primod_general 	0x0 		/* val 0, shift 0 */
-    #define PDCA_primod_blit 		0x1 		/* val 1, shift 0 */
-    #define PDCA_primod_vector 		0x2 		/* val 2, shift 0 */
-    #define PDCA_primod_vertex 		0x3 		/* val 3, shift 0 */
-    #define PDCA_primaddress_MASK 	0x3 		/* bits 2-31 */
-    #define PDCA_primaddress_SHIFT 	2 		
-
-    #define PDEA_primnostart_MASK 	0xfffffffe 	/* bit 0 */
-    #define PDEA_primnostart_disable 	0x0 		
-    #define PDEA_primnostart_enable 	0x1 		
-    #define PDEA_pagpxfer_MASK 		0xfffffffd 	/* bit 1 */
-    #define PDEA_pagpxfer_disable 	0x0 		
-    #define PDEA_pagpxfer_enable 	0x2 		
-    #define PDEA_primend_MASK 		0x3 		/* bits 2-31 */
-    #define PDEA_primend_SHIFT 		2 		
-
-    #define PLS_primptren0_MASK 	0xfffffffe 	/* bit 0 */
-    #define PLS_primptren0_disable 	0x0 		
-    #define PLS_primptren0_enable 	0x1 		
-    #define PLS_primptren1_MASK 	0xfffffffd 	/* bit 1 */
-    #define PLS_primptren1_disable 	0x0 		
-    #define PLS_primptren1_enable 	0x2 		
-    #define PLS_primptr_MASK 		0x7 		/* bits 3-31 */
-    #define PLS_primptr_SHIFT 		3 		
-
-    #define R_softreset_MASK 		0xfffffffe 	/* bit 0 */
-    #define R_softreset_disable 	0x0 		
-    #define R_softreset_enable 		0x1 		
-    #define R_softextrst_MASK 		0xfffffffd 	/* bit 1 */
-    #define R_softextrst_disable 	0x0 		
-    #define R_softextrst_enable 	0x2 		
-
-    #define SDCA_secmod_MASK 		0xfffffffc 	/* bits 0-1 */
-    #define SDCA_secmod_general 	0x0 		/* val 0, shift 0 */
-    #define SDCA_secmod_blit 		0x1 		/* val 1, shift 0 */
-    #define SDCA_secmod_vector 		0x2 		/* val 2, shift 0 */
-    #define SDCA_secmod_vertex 		0x3 		/* val 3, shift 0 */
-    #define SDCA_secaddress_MASK 	0x3 		/* bits 2-31 */
-    #define SDCA_secaddress_SHIFT 	2 		
-
-    #define SDEA_sagpxfer_MASK 		0xfffffffd 	/* bit 1 */
-    #define SDEA_sagpxfer_disable 	0x0 		
-    #define SDEA_sagpxfer_enable 	0x2 		
-    #define SDEA_secend_MASK 		0x3 		/* bits 2-31 */
-    #define SDEA_secend_SHIFT 		2 		
-
-    #define SETDCA_setupmod_MASK 	0xfffffffc 	/* bits 0-1 */
-    #define SETDCA_setupmod_vertlist 	0x0 		/* val 0, shift 0 */
-    #define SETDCA_setupaddress_MASK 	0x3 		/* bits 2-31 */
-    #define SETDCA_setupaddress_SHIFT 	2 		
-
-    #define SETDEA_setupagpxfer_MASK 	0xfffffffd 	/* bit 1 */
-    #define SETDEA_setupagpxfer_disable 0x0 		
-    #define SETDEA_setupagpxfer_enable 	0x2 		
-    #define SETDEA_setupend_MASK 	0x3 		/* bits 2-31 */
-    #define SETDEA_setupend_SHIFT 	2 		
-
-    #define S_sdydxl_MASK 		0xfffffffe 	/* bit 0 */
-    #define S_sdydxl_y 			0x0 		
-    #define S_sdydxl_x 			0x1 		
-    #define S_scanleft_MASK 		0xfffffffe 	/* bit 0 */
-    #define S_scanleft_disable 		0x0 		
-    #define S_scanleft_enable 		0x1 		
-    #define S_sdxl_MASK 		0xfffffffd 	/* bit 1 */
-    #define S_sdxl_pos 			0x0 		
-    #define S_sdxl_neg 			0x2 		
-    #define S_sdy_MASK 			0xfffffffb 	/* bit 2 */
-    #define S_sdy_pos 			0x0 		
-    #define S_sdy_neg 			0x4 		
-    #define S_sdxr_MASK 		0xffffffdf 	/* bit 5 */
-    #define S_sdxr_pos 			0x0 		
-    #define S_sdxr_neg 			0x20 		
-    #define S_brkleft_MASK 		0xfffffeff 	/* bit 8 */
-    #define S_brkleft_disable 		0x0 		
-    #define S_brkleft_enable 		0x100 		
-    #define S_errorinit_MASK 		0x7fffffff 	/* bit 31 */
-    #define S_errorinit_disable 	0x0 		
-    #define S_errorinit_enable 		0x80000000 	
-
-    #define FSC_x_off_MASK 		0xfffffff0 	/* bits 0-3 */
-    #define FSC_x_off_SHIFT 		0 		
-    #define FSC_funcnt_MASK 		0xffffff80 	/* bits 0-6 */
-    #define FSC_funcnt_SHIFT 		0 		
-    #define FSC_y_off_MASK 		0xffffff8f 	/* bits 4-6 */
-    #define FSC_y_off_SHIFT 		4 		
-    #define FSC_funoff_MASK 		0xffc0ffff 	/* bits 16-21 */
-    #define FSC_funoff_SHIFT 		16 		
-    #define FSC_stylelen_MASK 		0xffc0ffff 	/* bits 16-21 */
-    #define FSC_stylelen_SHIFT 		16 		
-
-
-    #define STH_softraphand_MASK 	0x3 		/* bits 2-31 */
-    #define STH_softraphand_SHIFT 	2 		
-
-    #define SO_srcmap_MASK 		0xfffffffe 	/* bit 0 */
-    #define SO_srcmap_fb 		0x0 		
-    #define SO_srcmap_sys 		0x1 		
-    #define SO_srcacc_MASK 		0xfffffffd 	/* bit 1 */
-    #define SO_srcacc_pci 		0x0 		
-    #define SO_srcacc_agp 		0x2 		
-    #define SO_srcorg_MASK 		0x7 		/* bits 3-31 */
-    #define SO_srcorg_SHIFT 		3 		
-
-    #define STAT_softrapen_MASK 	0xfffffffe 	/* bit 0 */
-    #define STAT_softrapen_disable 	0x0 		
-    #define STAT_softrapen_enable 	0x1 		
-    #define STAT_pickpen_MASK 		0xfffffffb 	/* bit 2 */
-    #define STAT_pickpen_disable 	0x0 		
-    #define STAT_pickpen_enable 	0x4 		
-    #define STAT_vsyncsts_MASK 		0xfffffff7 	/* bit 3 */
-    #define STAT_vsyncsts_disable 	0x0 		
-    #define STAT_vsyncsts_enable 	0x8 		
-    #define STAT_vsyncpen_MASK 		0xffffffef 	/* bit 4 */
-    #define STAT_vsyncpen_disable 	0x0 		
-    #define STAT_vsyncpen_enable 	0x10 		
-    #define STAT_vlinepen_MASK 		0xffffffdf 	/* bit 5 */
-    #define STAT_vlinepen_disable 	0x0 		
-    #define STAT_vlinepen_enable 	0x20 		
-    #define STAT_extpen_MASK 		0xffffffbf 	/* bit 6 */
-    #define STAT_extpen_disable 	0x0 		
-    #define STAT_extpen_enable 		0x40 		
-    #define STAT_wpen_MASK 		0xffffff7f 	/* bit 7 */
-    #define STAT_wpen_disable 		0x0 		
-    #define STAT_wpen_enable 		0x80 		
-    #define STAT_wcpen_MASK 		0xfffffeff 	/* bit 8 */
-    #define STAT_wcpen_disable 		0x0 		
-    #define STAT_wcpen_enable 		0x100 		
-    #define STAT_dwgengsts_MASK 	0xfffeffff 	/* bit 16 */
-    #define STAT_dwgengsts_disable 	0x0 		
-    #define STAT_dwgengsts_enable 	0x10000 	
-    #define STAT_endprdmasts_MASK 	0xfffdffff 	/* bit 17 */
-    #define STAT_endprdmasts_disable 	0x0 		
-    #define STAT_endprdmasts_enable 	0x20000 	
-    #define STAT_wbusy_MASK 		0xfffbffff 	/* bit 18 */
-    #define STAT_wbusy_disable 		0x0 		
-    #define STAT_wbusy_enable 		0x40000 	
-    #define STAT_swflag_MASK 		0xfffffff 	/* bits 28-31 */
-    #define STAT_swflag_SHIFT 		28 		
-
-    #define S_sref_MASK 		0xffffff00 	/* bits 0-7 */
-    #define S_sref_SHIFT 		0 		
-    #define S_smsk_MASK 		0xffff00ff 	/* bits 8-15 */
-    #define S_smsk_SHIFT 		8 		
-    #define S_swtmsk_MASK 		0xff00ffff 	/* bits 16-23 */
-    #define S_swtmsk_SHIFT 		16 		
-
-    #define SC_smode_MASK 		0xfffffff8 	/* bits 0-2 */
-    #define SC_smode_salways 		0x0 		/* val 0, shift 0 */
-    #define SC_smode_snever 		0x1 		/* val 1, shift 0 */
-    #define SC_smode_se 		0x2 		/* val 2, shift 0 */
-    #define SC_smode_sne 		0x3 		/* val 3, shift 0 */
-    #define SC_smode_slt 		0x4 		/* val 4, shift 0 */
-    #define SC_smode_slte 		0x5 		/* val 5, shift 0 */
-    #define SC_smode_sgt 		0x6 		/* val 6, shift 0 */
-    #define SC_smode_sgte 		0x7 		/* val 7, shift 0 */
-    #define SC_sfailop_MASK 		0xffffffc7 	/* bits 3-5 */
-    #define SC_sfailop_keep 		0x0 		/* val 0, shift 3 */
-    #define SC_sfailop_zero 		0x8 		/* val 1, shift 3 */
-    #define SC_sfailop_replace 		0x10 		/* val 2, shift 3 */
-    #define SC_sfailop_incrsat 		0x18 		/* val 3, shift 3 */
-    #define SC_sfailop_decrsat 		0x20 		/* val 4, shift 3 */
-    #define SC_sfailop_invert 		0x28 		/* val 5, shift 3 */
-    #define SC_sfailop_incr 		0x30 		/* val 6, shift 3 */
-    #define SC_sfailop_decr 		0x38 		/* val 7, shift 3 */
-    #define SC_szfailop_MASK 		0xfffffe3f 	/* bits 6-8 */
-    #define SC_szfailop_keep 		0x0 		/* val 0, shift 6 */
-    #define SC_szfailop_zero 		0x40 		/* val 1, shift 6 */
-    #define SC_szfailop_replace 	0x80 		/* val 2, shift 6 */
-    #define SC_szfailop_incrsat 	0xc0 		/* val 3, shift 6 */
-    #define SC_szfailop_decrsat 	0x100 		/* val 4, shift 6 */
-    #define SC_szfailop_invert 		0x140 		/* val 5, shift 6 */
-    #define SC_szfailop_incr 		0x180 		/* val 6, shift 6 */
-    #define SC_szfailop_decr 		0x1c0 		/* val 7, shift 6 */
-    #define SC_szpassop_MASK 		0xfffff1ff 	/* bits 9-11 */
-    #define SC_szpassop_keep 		0x0 		/* val 0, shift 9 */
-    #define SC_szpassop_zero 		0x200 		/* val 1, shift 9 */
-    #define SC_szpassop_replace 	0x400 		/* val 2, shift 9 */
-    #define SC_szpassop_incrsat 	0x600 		/* val 3, shift 9 */
-    #define SC_szpassop_decrsat 	0x800 		/* val 4, shift 9 */
-    #define SC_szpassop_invert 		0xa00 		/* val 5, shift 9 */
-    #define SC_szpassop_incr 		0xc00 		/* val 6, shift 9 */
-    #define SC_szpassop_decr 		0xe00 		/* val 7, shift 9 */
-
-    #define TD1_color1arg2selMASK 	0xfffffffc 	/* bits 0-1 */
-    #define TD1_color1alphaselMASK 	0xffffffe3 	/* bits 2-4 */
-    #define TD1_color1alphaselSHIFT 	2 		
-    #define TD1_color1arg1alphaMASK 	0xffffffdf 	/* bit 5 */
-    #define TD1_color1arg1alphadisable 	0x0 		
-    #define TD1_color1arg1alphaenable 	0x20 		
-    #define TD1_color1arg1invMASK 	0xffffffbf 	/* bit 6 */
-    #define TD1_color1arg1invdisable 	0x0 		
-    #define TD1_color1arg1invenable 	0x40 		
-    #define TD1_color1arg2alphaMASK 	0xffffff7f 	/* bit 7 */
-    #define TD1_color1arg2alphadisable 	0x0 		
-    #define TD1_color1arg2alphaenable 	0x80 		
-    #define TD1_color1arg2invMASK 	0xfffffeff 	/* bit 8 */
-    #define TD1_color1arg2invdisable 	0x0 		
-    #define TD1_color1arg2invenable 	0x100 		
-    #define TD1_color1alpha1invMASK 	0xfffffdff 	/* bit 9 */
-    #define TD1_color1alpha1invdisable 	0x0 		
-    #define TD1_color1alpha1invenable 	0x200 		
-    #define TD1_color1alpha2invMASK 	0xfffffbff 	/* bit 10 */
-    #define TD1_color1alpha2invdisable 	0x0 		
-    #define TD1_color1alpha2invenable 	0x400 		
-    #define TD1_color1selMASK 		0xff9fffff 	/* bits 21-22 */
-    #define TD1_color1selarg1 		0x0 		/* val 0, shift 21 */
-    #define TD1_color1selarg2 		0x200000 	/* val 1, shift 21 */
-    #define TD1_color1seladd 		0x400000 	/* val 2, shift 21 */
-    #define TD1_color1selmul 		0x600000 	/* val 3, shift 21 */
-    #define TD1_alpha1selMASK 		0x3fffffff 	/* bits 30-31 */
-    #define TD1_alpha1selarg1 		0x0 		/* val 0, shift 30 */
-    #define TD1_alpha1selarg2 		0x40000000 	/* val 1, shift 30 */
-    #define TD1_alpha1seladd 		0x80000000 	/* val 2, shift 30 */
-    #define TD1_alpha1selmul 		0xc0000000 	/* val 3, shift 30 */
-
-    #define TST_ramtsten_MASK 		0xfffffffe 	/* bit 0 */
-    #define TST_ramtsten_disable 	0x0 		
-    #define TST_ramtsten_enable 	0x1 		
-    #define TST_ramtstdone_MASK 	0xfffffffd 	/* bit 1 */
-    #define TST_ramtstdone_disable 	0x0 		
-    #define TST_ramtstdone_enable 	0x2 		
-    #define TST_wramtstpass_MASK 	0xfffffffb 	/* bit 2 */
-    #define TST_wramtstpass_disable 	0x0 		
-    #define TST_wramtstpass_enable 	0x4 		
-    #define TST_tcachetstpass_MASK 	0xfffffff7 	/* bit 3 */
-    #define TST_tcachetstpass_disable 	0x0 		
-    #define TST_tcachetstpass_enable 	0x8 		
-    #define TST_tluttstpass_MASK 	0xffffffef 	/* bit 4 */
-    #define TST_tluttstpass_disable 	0x0 		
-    #define TST_tluttstpass_enable 	0x10 		
-    #define TST_luttstpass_MASK 	0xffffffdf 	/* bit 5 */
-    #define TST_luttstpass_disable 	0x0 		
-    #define TST_luttstpass_enable 	0x20 		
-    #define TST_besramtstpass_MASK 	0xffffffbf 	/* bit 6 */
-    #define TST_besramtstpass_disable 	0x0 		
-    #define TST_besramtstpass_enable 	0x40 		
-    #define TST_ringen_MASK 		0xfffffeff 	/* bit 8 */
-    #define TST_ringen_disable 		0x0 		
-    #define TST_ringen_enable 		0x100 		
-    #define TST_apllbyp_MASK 		0xfffffdff 	/* bit 9 */
-    #define TST_apllbyp_disable 	0x0 		
-    #define TST_apllbyp_enable 		0x200 		
-    #define TST_hiten_MASK 		0xfffffbff 	/* bit 10 */
-    #define TST_hiten_disable 		0x0 		
-    #define TST_hiten_enable 		0x400 		
-    #define TST_tmode_MASK 		0xffffc7ff 	/* bits 11-13 */
-    #define TST_tmode_SHIFT 		11 		
-    #define TST_tclksel_MASK 		0xfffe3fff 	/* bits 14-16 */
-    #define TST_tclksel_SHIFT 		14 		
-    #define TST_ringcnten_MASK 		0xfffdffff 	/* bit 17 */
-    #define TST_ringcnten_disable 	0x0 		
-    #define TST_ringcnten_enable 	0x20000 	
-    #define TST_ringcnt_MASK 		0xc003ffff 	/* bits 18-29 */
-    #define TST_ringcnt_SHIFT 		18 		
-    #define TST_ringcntclksl_MASK 	0xbfffffff 	/* bit 30 */
-    #define TST_ringcntclksl_disable 	0x0 		
-    #define TST_ringcntclksl_enable 	0x40000000 	
-    #define TST_biosboot_MASK 		0x7fffffff 	/* bit 31 */
-    #define TST_biosboot_disable 	0x0 		
-    #define TST_biosboot_enable 	0x80000000 	
-
-    #define TMC_tformat_MASK 		0xfffffff0 	/* bits 0-3 */
-    #define TMC_tformat_tw4 		0x0 		/* val 0, shift 0 */
-    #define TMC_tformat_tw8 		0x1 		/* val 1, shift 0 */
-    #define TMC_tformat_tw15 		0x2 		/* val 2, shift 0 */
-    #define TMC_tformat_tw16 		0x3 		/* val 3, shift 0 */
-    #define TMC_tformat_tw12 		0x4 		/* val 4, shift 0 */
-    #define TMC_tformat_tw32 		0x6 		/* val 6, shift 0 */
-    #define TMC_tformat_tw422 		0xa 		/* val 10, shift 0 */
-    #define TMC_tpitchlin_MASK 		0xfffffeff 	/* bit 8 */
-    #define TMC_tpitchlin_disable 	0x0 		
-    #define TMC_tpitchlin_enable 	0x100 		
-    #define TMC_tpitchext_MASK 		0xfff001ff 	/* bits 9-19 */
-    #define TMC_tpitchext_SHIFT 	9 		
-    #define TMC_tpitch_MASK 		0xfff8ffff 	/* bits 16-18 */
-    #define TMC_tpitch_SHIFT 		16 		
-    #define TMC_owalpha_MASK 		0xffbfffff 	/* bit 22 */
-    #define TMC_owalpha_disable 	0x0 		
-    #define TMC_owalpha_enable 		0x400000 	
-    #define TMC_azeroextend_MASK 	0xff7fffff 	/* bit 23 */
-    #define TMC_azeroextend_disable 	0x0 		
-    #define TMC_azeroextend_enable 	0x800000 	
-    #define TMC_decalckey_MASK 		0xfeffffff 	/* bit 24 */
-    #define TMC_decalckey_disable 	0x0 		
-    #define TMC_decalckey_enable 	0x1000000 	
-    #define TMC_takey_MASK 		0xfdffffff 	/* bit 25 */
-    #define TMC_takey_0 		0x0 		
-    #define TMC_takey_1 		0x2000000 	
-    #define TMC_tamask_MASK 		0xfbffffff 	/* bit 26 */
-    #define TMC_tamask_0 		0x0 		
-    #define TMC_tamask_1 		0x4000000 	
-    #define TMC_clampv_MASK 		0xf7ffffff 	/* bit 27 */
-    #define TMC_clampv_disable 		0x0 		
-    #define TMC_clampv_enable 		0x8000000 	
-    #define TMC_clampu_MASK 		0xefffffff 	/* bit 28 */
-    #define TMC_clampu_disable 		0x0 		
-    #define TMC_clampu_enable 		0x10000000 	
-    #define TMC_tmodulate_MASK 		0xdfffffff 	/* bit 29 */
-    #define TMC_tmodulate_disable 	0x0 		
-    #define TMC_tmodulate_enable 	0x20000000 	
-    #define TMC_strans_MASK 		0xbfffffff 	/* bit 30 */
-    #define TMC_strans_disable 		0x0 		
-    #define TMC_strans_enable 		0x40000000 	
-    #define TMC_itrans_MASK 		0x7fffffff 	/* bit 31 */
-    #define TMC_itrans_disable 		0x0 		
-    #define TMC_itrans_enable 		0x80000000 	
-
-    #define TMC_decalblend_MASK 	0xfffffffe 	/* bit 0 */
-    #define TMC_decalblend_disable 	0x0 		
-    #define TMC_decalblend_enable 	0x1 		
-    #define TMC_idecal_MASK 		0xfffffffd 	/* bit 1 */
-    #define TMC_idecal_disable 		0x0 		
-    #define TMC_idecal_enable 		0x2 		
-    #define TMC_decaldis_MASK 		0xfffffffb 	/* bit 2 */
-    #define TMC_decaldis_disable 	0x0 		
-    #define TMC_decaldis_enable 	0x4 		
-    #define TMC_ckstransdis_MASK 	0xffffffef 	/* bit 4 */
-    #define TMC_ckstransdis_disable 	0x0 		
-    #define TMC_ckstransdis_enable 	0x10 		
-    #define TMC_borderen_MASK 		0xffffffdf 	/* bit 5 */
-    #define TMC_borderen_disable 	0x0 		
-    #define TMC_borderen_enable 	0x20 		
-    #define TMC_specen_MASK 		0xffffffbf 	/* bit 6 */
-    #define TMC_specen_disable 		0x0 		
-    #define TMC_specen_enable 		0x40 		
-
-    #define TF_minfilter_MASK 		0xfffffff0 	/* bits 0-3 */
-    #define TF_minfilter_nrst 		0x0 		/* val 0, shift 0 */
-    #define TF_minfilter_bilin 		0x2 		/* val 2, shift 0 */
-    #define TF_minfilter_cnst 		0x3 		/* val 3, shift 0 */
-    #define TF_minfilter_mm1s 		0x8 		/* val 8, shift 0 */
-    #define TF_minfilter_mm2s 		0x9 		/* val 9, shift 0 */
-    #define TF_minfilter_mm4s 		0xa 		/* val 10, shift 0 */
-    #define TF_minfilter_mm8s 		0xc 		/* val 12, shift 0 */
-    #define TF_magfilter_MASK 		0xffffff0f 	/* bits 4-7 */
-    #define TF_magfilter_nrst 		0x0 		/* val 0, shift 4 */
-    #define TF_magfilter_bilin 		0x20 		/* val 2, shift 4 */
-    #define TF_magfilter_cnst 		0x30 		/* val 3, shift 4 */
-    #define TF_avgstride_MASK 		0xfff7ffff 	/* bit 19 */
-    #define TF_avgstride_disable 	0x0 		
-    #define TF_avgstride_enable 	0x80000 	
-    #define TF_filteralpha_MASK 	0xffefffff 	/* bit 20 */
-    #define TF_filteralpha_disable 	0x0 		
-    #define TF_filteralpha_enable 	0x100000 	
-    #define TF_fthres_MASK 		0xe01fffff 	/* bits 21-28 */
-    #define TF_fthres_SHIFT 		21 		
-    #define TF_mapnb_MASK 		0x1fffffff 	/* bits 29-31 */
-    #define TF_mapnb_SHIFT 		29 		
-
-    #define TH_th_MASK 			0xffffffc0 	/* bits 0-5 */
-    #define TH_th_SHIFT 		0 		
-    #define TH_rfh_MASK 		0xffff81ff 	/* bits 9-14 */
-    #define TH_rfh_SHIFT 		9 		
-    #define TH_thmask_MASK 		0xe003ffff 	/* bits 18-28 */
-    #define TH_thmask_SHIFT 		18 		
-
-    #define TO_texorgmap_MASK 		0xfffffffe 	/* bit 0 */
-    #define TO_texorgmap_fb 		0x0 		
-    #define TO_texorgmap_sys 		0x1 		
-    #define TO_texorgacc_MASK 		0xfffffffd 	/* bit 1 */
-    #define TO_texorgacc_pci 		0x0 		
-    #define TO_texorgacc_agp 		0x2 		
-    #define TO_texorg_MASK 		0x1f 		/* bits 5-31 */
-    #define TO_texorg_SHIFT 		5 		
-
-    #define TT_tckey_MASK 		0xffff0000 	/* bits 0-15 */
-    #define TT_tckey_SHIFT 		0 		
-    #define TT_tkmask_MASK 		0xffff 		/* bits 16-31 */
-    #define TT_tkmask_SHIFT 		16 		
-
-    #define TT_tckeyh_MASK 		0xffff0000 	/* bits 0-15 */
-    #define TT_tckeyh_SHIFT 		0 		
-    #define TT_tkmaskh_MASK 		0xffff 		/* bits 16-31 */
-    #define TT_tkmaskh_SHIFT 		16 		
-
-    #define TW_tw_MASK 			0xffffffc0 	/* bits 0-5 */
-    #define TW_tw_SHIFT 		0 		
-    #define TW_rfw_MASK 		0xffff81ff 	/* bits 9-14 */
-    #define TW_rfw_SHIFT 		9 		
-    #define TW_twmask_MASK 		0xe003ffff 	/* bits 18-28 */
-    #define TW_twmask_SHIFT 		18 		
-
-    #define WAS_seqdst0_MASK 		0xffffffc0 	/* bits 0-5 */
-    #define WAS_seqdst0_SHIFT 		0 		
-    #define WAS_seqdst1_MASK 		0xfffff03f 	/* bits 6-11 */
-    #define WAS_seqdst1_SHIFT 		6 		
-    #define WAS_seqdst2_MASK 		0xfffc0fff 	/* bits 12-17 */
-    #define WAS_seqdst2_SHIFT 		12 		
-    #define WAS_seqdst3_MASK 		0xff03ffff 	/* bits 18-23 */
-    #define WAS_seqdst3_SHIFT 		18 		
-    #define WAS_seqlen_MASK 		0xfcffffff 	/* bits 24-25 */
-    #define WAS_wfirsttag_MASK 		0xfbffffff 	/* bit 26 */
-    #define WAS_wfirsttag_disable 	0x0 		
-    #define WAS_wfirsttag_enable 	0x4000000 	
-    #define WAS_wsametag_MASK 		0xf7ffffff 	/* bit 27 */
-    #define WAS_wsametag_disable 	0x0 		
-    #define WAS_wsametag_enable 	0x8000000 	
-    #define WAS_seqoff_MASK 		0xefffffff 	/* bit 28 */
-    #define WAS_seqoff_disable 		0x0 		
-    #define WAS_seqoff_enable 		0x10000000 	
-
-    #define WMA_wcodeaddr_MASK 		0xff 		/* bits 8-31 */
-    #define WMA_wcodeaddr_SHIFT 	8 		
-
-    #define WF_walustsflag_MASK 	0xffffff00 	/* bits 0-7 */
-    #define WF_walustsflag_SHIFT 	0 		
-    #define WF_walucfgflag_MASK 	0xffff00ff 	/* bits 8-15 */
-    #define WF_walucfgflag_SHIFT 	8 		
-    #define WF_wprgflag_MASK 		0xffff 		/* bits 16-31 */
-    #define WF_wprgflag_SHIFT 		16 		
-
-    #define WF1_walustsflag1_MASK 	0xffffff00 	/* bits 0-7 */
-    #define WF1_walustsflag1_SHIFT 	0 		
-    #define WF1_walucfgflag1_MASK 	0xffff00ff 	/* bits 8-15 */
-    #define WF1_walucfgflag1_SHIFT 	8 		
-    #define WF1_wprgflag1_MASK 		0xffff 		/* bits 16-31 */
-    #define WF1_wprgflag1_SHIFT 	16 		
-
-    #define WGV_wgetmsbmin_MASK 	0xffffffe0 	/* bits 0-4 */
-    #define WGV_wgetmsbmin_SHIFT 	0 		
-    #define WGV_wgetmsbmax_MASK 	0xffffe0ff 	/* bits 8-12 */
-    #define WGV_wgetmsbmax_SHIFT 	8 		
-    #define WGV_wbrklefttop_MASK 	0xfffeffff 	/* bit 16 */
-    #define WGV_wbrklefttop_disable 	0x0 		
-    #define WGV_wbrklefttop_enable 	0x10000 	
-    #define WGV_wfastcrop_MASK 		0xfffdffff 	/* bit 17 */
-    #define WGV_wfastcrop_disable 	0x0 		
-    #define WGV_wfastcrop_enable 	0x20000 	
-    #define WGV_wcentersnap_MASK 	0xfffbffff 	/* bit 18 */
-    #define WGV_wcentersnap_disable 	0x0 		
-    #define WGV_wcentersnap_enable 	0x40000 	
-    #define WGV_wbrkrighttop_MASK 	0xfff7ffff 	/* bit 19 */
-    #define WGV_wbrkrighttop_disable 	0x0 		
-    #define WGV_wbrkrighttop_enable 	0x80000 	
-
-    #define WIA_wmode_MASK 		0xfffffffc 	/* bits 0-1 */
-    #define WIA_wmode_suspend 		0x0 		/* val 0, shift 0 */
-    #define WIA_wmode_resume 		0x1 		/* val 1, shift 0 */
-    #define WIA_wmode_jump 		0x2 		/* val 2, shift 0 */
-    #define WIA_wmode_start 		0x3 		/* val 3, shift 0 */
-    #define WIA_wagp_MASK 		0xfffffffb 	/* bit 2 */
-    #define WIA_wagp_pci 		0x0 		
-    #define WIA_wagp_agp 		0x4 		
-    #define WIA_wiaddr_MASK 		0x7 		/* bits 3-31 */
-    #define WIA_wiaddr_SHIFT 		3 		
-
-    #define WIA2_wmode_MASK 		0xfffffffc 	/* bits 0-1 */
-    #define WIA2_wmode_suspend 		0x0 		/* val 0, shift 0 */
-    #define WIA2_wmode_resume 		0x1 		/* val 1, shift 0 */
-    #define WIA2_wmode_jump 		0x2 		/* val 2, shift 0 */
-    #define WIA2_wmode_start 		0x3 		/* val 3, shift 0 */
-    #define WIA2_wagp_MASK 		0xfffffffb 	/* bit 2 */
-    #define WIA2_wagp_pci 		0x0 		
-    #define WIA2_wagp_agp 		0x4 		
-    #define WIA2_wiaddr_MASK 		0x7 		/* bits 3-31 */
-    #define WIA2_wiaddr_SHIFT 		3 		
-
-    #define WIMA_wimemaddr_MASK 	0xffffff00 	/* bits 0-7 */
-    #define WIMA_wimemaddr_SHIFT 	0 		
-
-    #define WM_wucodecache_MASK 	0xfffffffe 	/* bit 0 */
-    #define WM_wucodecache_disable 	0x0 		
-    #define WM_wucodecache_enable 	0x1 		
-    #define WM_wmaster_MASK 		0xfffffffd 	/* bit 1 */
-    #define WM_wmaster_disable 		0x0 		
-    #define WM_wmaster_enable 		0x2 		
-    #define WM_wcacheflush_MASK 	0xfffffff7 	/* bit 3 */
-    #define WM_wcacheflush_disable 	0x0 		
-    #define WM_wcacheflush_enable 	0x8 		
-
-    #define WVS_wvrtxsz_MASK 		0xffffffc0 	/* bits 0-5 */
-    #define WVS_wvrtxsz_SHIFT 		0 		
-    #define WVS_primsz_MASK 		0xffffc0ff 	/* bits 8-13 */
-    #define WVS_primsz_SHIFT 		8 		
-
-    #define XYEA_x_end_MASK 		0xffff0000 	/* bits 0-15 */
-    #define XYEA_x_end_SHIFT 		0 		
-    #define XYEA_y_end_MASK 		0xffff 		/* bits 16-31 */
-    #define XYEA_y_end_SHIFT 		16 		
-
-    #define XYSA_x_start_MASK 		0xffff0000 	/* bits 0-15 */
-    #define XYSA_x_start_SHIFT 		0 		
-    #define XYSA_y_start_MASK 		0xffff 		/* bits 16-31 */
-    #define XYSA_y_start_SHIFT 		16 		
-
-    #define YA_ydst_MASK 		0xff800000 	/* bits 0-22 */
-    #define YA_ydst_SHIFT 		0 		
-    #define YA_sellin_MASK 		0x1fffffff 	/* bits 29-31 */
-    #define YA_sellin_SHIFT 		29 		
-
-    #define YDL_length_MASK 		0xffff0000 	/* bits 0-15 */
-    #define YDL_length_SHIFT 		0 		
-    #define YDL_yval_MASK 		0xffff 		/* bits 16-31 */
-    #define YDL_yval_SHIFT 		16 		
-
-    #define ZO_zorgmap_MASK 		0xfffffffe 	/* bit 0 */
-    #define ZO_zorgmap_fb 		0x0 		
-    #define ZO_zorgmap_sys 		0x1 		
-    #define ZO_zorgacc_MASK 		0xfffffffd 	/* bit 1 */
-    #define ZO_zorgacc_pci 		0x0 		
-    #define ZO_zorgacc_agp 		0x2 		
-    #define ZO_zorg_MASK 		0x3 		/* bits 2-31 */
-    #define ZO_zorg_SHIFT 		2 		
-
-
-
-
-/**************** (END) AUTOMATICLY GENERATED REGISTER FILE ******************/
-
-#endif 	/* _MGAREGS_H_ */
-
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/picker.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/picker.c:1.1 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/picker.c:1.2
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/picker.c:1.1	Tue Feb  8 09:19:22 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/picker.c	Fri Jun 16 17:03:38 2000
@@ -9,6 +9,16 @@
 #define CONFIG_MODVERSIONS 0
 #endif
 
+#ifndef CONFIG_AGP_MODULE
+#define CONFIG_AGP_MODULE 0
+#endif
+
+#ifndef CONFIG_AGP
+#define CONFIG_AGP 0
+#endif
+
 SMP = CONFIG_SMP
 MODVERSIONS = CONFIG_MODVERSIONS
+AGP = CONFIG_AGP
+AGP_MODULE = CONFIG_AGP_MODULE
 RELEASE = UTS_RELEASE
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c:1.6 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c:1.7
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c:1.6	Tue Feb 22 20:47:30 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c	Fri Jun 16 17:03:38 2000
@@ -1,8 +1,8 @@
 /* proc.c -- /proc support for DRM -*- linux-c -*-
  * Created: Mon Jan 11 09:48:47 1999 by faith@precisioninsight.com
- * Revised: Sun Feb 13 23:41:04 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,9 +23,9 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c,v 1.6 2000/02/23 04:47:30 martin Exp $
  *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  */
 
 #define __NO_VERSION__
@@ -164,7 +164,10 @@
 {
 	drm_device_t *dev = (drm_device_t *)data;
 	drm_map_t    *map;
-	const char   *types[] = { "FB", "REG", "SHM" };
+				/* Hardcoded from _DRM_FRAME_BUFFER,
+                                   _DRM_REGISTERS, _DRM_SHM, and
+                                   _DRM_AGP. */
+	const char   *types[] = { "FB", "REG", "SHM", "AGP" };
 	const char   *type;
 	int	     i;
 
@@ -175,7 +178,7 @@
 		       "address mtrr\n\n");
 	for (i = 0; i < dev->map_count; i++) {
 		map = dev->maplist[i];
-		if (map->type < 0 || map->type > 2) type = "??";
+		if (map->type < 0 || map->type > 3) type = "??";
 		else				    type = types[map->type];
 		DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
 			       i,
@@ -397,6 +400,7 @@
 			       pgprot & _PAGE_GLOBAL   ? 'g' : 'l' );
 #endif		
 		DRM_PROC_PRINT("\n");
+#if 0
 		for (i = vma->vm_start; i < vma->vm_end; i += PAGE_SIZE) {
 			pgd = pgd_offset(vma->vm_mm, i);
 			pmd = pmd_offset(pgd, i);
@@ -417,6 +421,7 @@
 				DRM_PROC_PRINT("      0x%08lx\n", i);
 			}
 		}
+#endif
 	}
 	
 	return len;
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_bufs.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_bufs.c:1.1
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_bufs.c	Fri Jun 16 17:03:38 2000
@@ -0,0 +1,308 @@
+/* r128_bufs.c -- IOCTLs to manage buffers -*- linux-c -*-
+ * Created: Wed Apr 12 16:19:08 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors: Kevin E. Martin <martin@valinux.com>
+ *          Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ * 
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "r128_drv.h"
+#include "linux/un.h"
+
+
+#ifdef DRM_AGP
+int r128_addbufs_agp(struct inode *inode, struct file *filp, unsigned int cmd,
+		     unsigned long arg)
+{
+	drm_file_t       *priv = filp->private_data;
+	drm_device_t     *dev  = priv->dev;
+	drm_device_dma_t *dma  = dev->dma;
+	drm_buf_desc_t    request;
+	drm_buf_entry_t  *entry;
+	drm_buf_t        *buf;
+	unsigned long     offset;
+	unsigned long     agp_offset;
+	int               count;
+	int               order;
+	int               size;
+	int               alignment;
+	int               page_order;
+	int               total;
+	int               byte_count;
+	int               i;
+
+	if (!dma) return -EINVAL;
+
+	copy_from_user_ret(&request,
+			   (drm_buf_desc_t *)arg,
+			   sizeof(request),
+			   -EFAULT);
+
+	count      = request.count;
+	order      = drm_order(request.size);
+	size       = 1 << order;
+
+	alignment  = (request.flags & _DRM_PAGE_ALIGN) ? PAGE_ALIGN(size):size;
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total      = PAGE_SIZE << page_order;
+
+	byte_count = 0;
+	agp_offset = dev->agp->base + request.agp_start;
+
+	DRM_DEBUG("count:      %d\n",  count);
+	DRM_DEBUG("order:      %d\n",  order);
+	DRM_DEBUG("size:       %d\n",  size);
+	DRM_DEBUG("agp_offset: %ld\n", agp_offset);
+	DRM_DEBUG("alignment:  %d\n",  alignment);
+	DRM_DEBUG("page_order: %d\n",  page_order);
+	DRM_DEBUG("total:      %d\n",  total);
+
+	if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL;
+	if (dev->queue_count) return -EBUSY; /* Not while in use */
+
+	spin_lock(&dev->count_lock);
+	if (dev->buf_use) {
+		spin_unlock(&dev->count_lock);
+		return -EBUSY;
+	}
+	atomic_inc(&dev->buf_alloc);
+	spin_unlock(&dev->count_lock);
+   
+	down(&dev->struct_sem);
+	entry = &dma->bufs[order];
+	if (entry->buf_count) {
+		up(&dev->struct_sem);
+		atomic_dec(&dev->buf_alloc);
+		return -ENOMEM; /* May only call once for each order */
+	}
+   
+	entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
+				   DRM_MEM_BUFS);
+	if (!entry->buflist) {
+		up(&dev->struct_sem);
+		atomic_dec(&dev->buf_alloc);
+		return -ENOMEM;
+	}
+	memset(entry->buflist, 0, count * sizeof(*entry->buflist));
+   
+	entry->buf_size   = size;
+	entry->page_order = page_order;
+	offset            = 0;
+
+	for (offset = 0;
+	     entry->buf_count < count;
+	     offset += alignment, ++entry->buf_count) {
+		buf          = &entry->buflist[entry->buf_count];
+		buf->idx     = dma->buf_count + entry->buf_count;
+		buf->total   = alignment;
+		buf->order   = order;
+		buf->used    = 0;
+		buf->offset  = (dma->byte_count + offset);
+		buf->address = (void *)(agp_offset + offset);
+		buf->next    = NULL;
+		buf->waiting = 0;
+		buf->pending = 0;
+		init_waitqueue_head(&buf->dma_wait);
+		buf->pid     = 0;
+
+		buf->dev_priv_size = sizeof(drm_r128_buf_priv_t);
+		buf->dev_private   = drm_alloc(sizeof(drm_r128_buf_priv_t),
+					       DRM_MEM_BUFS);
+		memset(buf->dev_private, 0, buf->dev_priv_size);
+
+#if DRM_DMA_HISTOGRAM
+		buf->time_queued     = 0;
+		buf->time_dispatched = 0;
+		buf->time_completed  = 0;
+		buf->time_freed      = 0;
+#endif
+
+		byte_count += PAGE_SIZE << page_order;
+
+		DRM_DEBUG("buffer %d @ %p\n",
+			  entry->buf_count, buf->address);
+	}
+
+	DRM_DEBUG("byte_count: %d\n", byte_count);
+
+	dma->buflist = drm_realloc(dma->buflist,
+				   dma->buf_count * sizeof(*dma->buflist),
+				   (dma->buf_count + entry->buf_count)
+				   * sizeof(*dma->buflist),
+				   DRM_MEM_BUFS);
+	for (i = dma->buf_count; i < dma->buf_count + entry->buf_count; i++)
+		dma->buflist[i] = &entry->buflist[i - dma->buf_count];
+
+	dma->buf_count  += entry->buf_count;
+	dma->byte_count += byte_count;
+
+	drm_freelist_create(&entry->freelist, entry->buf_count);
+	for (i = 0; i < entry->buf_count; i++) {
+		drm_freelist_put(dev, &entry->freelist, &entry->buflist[i]);
+	}
+
+	up(&dev->struct_sem);
+
+	request.count = entry->buf_count;
+	request.size  = size;
+
+	copy_to_user_ret((drm_buf_desc_t *)arg,
+			 &request,
+			 sizeof(request),
+			 -EFAULT);
+
+	dma->flags = _DRM_DMA_USE_AGP;
+
+	atomic_dec(&dev->buf_alloc);
+	return 0;
+}
+#endif
+
+int r128_addbufs(struct inode *inode, struct file *filp, unsigned int cmd,
+		 unsigned long arg)
+{
+	drm_file_t		*priv		= filp->private_data;
+	drm_device_t		*dev		= priv->dev;
+	drm_r128_private_t	*dev_priv	= dev->dev_private;
+	drm_buf_desc_t		request;
+
+	if (!dev_priv || dev_priv->is_pci) return -EINVAL;
+
+	copy_from_user_ret(&request,
+			   (drm_buf_desc_t *)arg,
+			   sizeof(request),
+			   -EFAULT);
+
+#ifdef DRM_AGP
+	if (request.flags & _DRM_AGP_BUFFER)
+		return r128_addbufs_agp(inode, filp, cmd, arg);
+	else
+#endif
+		return -EINVAL;
+}
+
+int r128_mapbufs(struct inode *inode, struct file *filp, unsigned int cmd,
+		 unsigned long arg)
+{
+	drm_file_t		*priv		= filp->private_data;
+	drm_device_t		*dev		= priv->dev;
+	drm_r128_private_t	*dev_priv	= dev->dev_private;
+	drm_device_dma_t	*dma		= dev->dma;
+	int			 retcode	= 0;
+	const int		 zero		= 0;
+	unsigned long		 virtual;
+	unsigned long		 address;
+	drm_buf_map_t		 request;
+	int			 i;
+
+	if (!dma || !dev_priv || dev_priv->is_pci) return -EINVAL;
+
+	DRM_DEBUG("\n");
+
+	spin_lock(&dev->count_lock);
+	if (atomic_read(&dev->buf_alloc)) {
+		spin_unlock(&dev->count_lock);
+		return -EBUSY;
+	}
+	++dev->buf_use;		/* Can't allocate more after this call */
+	spin_unlock(&dev->count_lock);
+
+	copy_from_user_ret(&request,
+			   (drm_buf_map_t *)arg,
+			   sizeof(request),
+			   -EFAULT);
+
+	if (request.count >= dma->buf_count) {
+		if (dma->flags & _DRM_DMA_USE_AGP) {
+			drm_map_t *map;
+
+			map = dev_priv->agp_vertbufs;
+			if (!map) {
+				retcode = -EINVAL;
+				goto done;
+			}
+
+			down(&current->mm->mmap_sem);
+			virtual = do_mmap(filp, 0, map->size, 
+					  PROT_READ|PROT_WRITE,
+					  MAP_SHARED, 
+					  (unsigned long)map->offset);
+			up(&current->mm->mmap_sem);
+		} else {
+			down(&current->mm->mmap_sem);
+			virtual = do_mmap(filp, 0, dma->byte_count,
+					  PROT_READ|PROT_WRITE, MAP_SHARED, 0);
+			up(&current->mm->mmap_sem);
+		}
+		if (virtual > -1024UL) {
+			/* Real error */
+			retcode = (signed long)virtual;
+			goto done;
+		}
+		request.virtual = (void *)virtual;
+
+		for (i = 0; i < dma->buf_count; i++) {
+			if (copy_to_user(&request.list[i].idx,
+					 &dma->buflist[i]->idx,
+					 sizeof(request.list[0].idx))) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			if (copy_to_user(&request.list[i].total,
+					 &dma->buflist[i]->total,
+					 sizeof(request.list[0].total))) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			if (copy_to_user(&request.list[i].used,
+					 &zero,
+					 sizeof(zero))) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			address = virtual + dma->buflist[i]->offset;
+			if (copy_to_user(&request.list[i].address,
+					 &address,
+					 sizeof(address))) {
+				retcode = -EFAULT;
+				goto done;
+			}
+		}
+	}
+ done:
+	request.count = dma->buf_count;
+	DRM_DEBUG("%d buffers, retcode = %d\n", request.count, retcode);
+
+	copy_to_user_ret((drm_buf_map_t *)arg,
+			 &request,
+			 sizeof(request),
+			 -EFAULT);
+
+	return retcode;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_context.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_context.c:1.1
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_context.c	Fri Jun 16 17:03:38 2000
@@ -0,0 +1,213 @@
+/* r128_context.c -- IOCTLs for r128 contexts -*- linux-c -*-
+ * Created: Mon Dec 13 09:51:35 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#include <linux/sched.h>
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "r128_drv.h"
+
+extern drm_ctx_t r128_res_ctx;
+
+static int r128_alloc_queue(drm_device_t *dev)
+{
+#if 0
+	static int context = 0;
+#endif
+
+	return drm_ctxbitmap_next(dev);
+}
+
+int r128_context_switch(drm_device_t *dev, int old, int new)
+{
+        char        buf[64];
+
+        atomic_inc(&dev->total_ctx);
+
+        if (test_and_set_bit(0, &dev->context_flag)) {
+                DRM_ERROR("Reentering -- FIXME\n");
+                return -EBUSY;
+        }
+
+#if DRM_DMA_HISTOGRAM
+        dev->ctx_start = get_cycles();
+#endif
+        
+        DRM_DEBUG("Context switch from %d to %d\n", old, new);
+
+        if (new == dev->last_context) {
+                clear_bit(0, &dev->context_flag);
+                return 0;
+        }
+        
+        if (drm_flags & DRM_FLAG_NOCTX) {
+                r128_context_switch_complete(dev, new);
+        } else {
+                sprintf(buf, "C %d %d\n", old, new);
+                drm_write_string(dev, buf);
+        }
+        
+        return 0;
+}
+
+int r128_context_switch_complete(drm_device_t *dev, int new)
+{
+        dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
+        dev->last_switch  = jiffies;
+        
+        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+                DRM_ERROR("Lock isn't held after context switch\n");
+        }
+
+				/* If a context switch is ever initiated
+                                   when the kernel holds the lock, release
+                                   that lock here. */
+#if DRM_DMA_HISTOGRAM
+        atomic_inc(&dev->histo.ctx[drm_histogram_slot(get_cycles()
+                                                      - dev->ctx_start)]);
+                   
+#endif
+        clear_bit(0, &dev->context_flag);
+        wake_up(&dev->context_wait);
+        
+        return 0;
+}
+
+
+int r128_resctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	       unsigned long arg)
+{
+	drm_ctx_res_t	res;
+	drm_ctx_t	ctx;
+	int		i;
+
+	DRM_DEBUG("%d\n", DRM_RESERVED_CONTEXTS);
+	copy_from_user_ret(&res, (drm_ctx_res_t *)arg, sizeof(res), -EFAULT);
+	if (res.count >= DRM_RESERVED_CONTEXTS) {
+		memset(&ctx, 0, sizeof(ctx));
+		for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
+			ctx.handle = i;
+			copy_to_user_ret(&res.contexts[i],
+					 &i,
+					 sizeof(i),
+					 -EFAULT);
+		}
+	}
+	res.count = DRM_RESERVED_CONTEXTS;
+	copy_to_user_ret((drm_ctx_res_t *)arg, &res, sizeof(res), -EFAULT);
+	return 0;
+}
+
+
+int r128_addctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	       unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
+	if ((ctx.handle = r128_alloc_queue(dev)) == DRM_KERNEL_CONTEXT) {
+				/* Skip kernel's context and get a new one. */
+		ctx.handle = r128_alloc_queue(dev);
+	}
+	DRM_DEBUG("%d\n", ctx.handle);
+	if (ctx.handle == -1) {
+		DRM_DEBUG("Not enough free contexts.\n");
+				/* Should this return -EBUSY instead? */
+		return -ENOMEM;
+	}
+
+	copy_to_user_ret((drm_ctx_t *)arg, &ctx, sizeof(ctx), -EFAULT);
+	return 0;
+}
+
+int r128_modctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	unsigned long arg)
+{
+	drm_ctx_t ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t*)arg, sizeof(ctx), -EFAULT);
+	if (ctx.flags==_DRM_CONTEXT_PRESERVED)
+		r128_res_ctx.handle=ctx.handle;
+	return 0;
+}
+
+int r128_getctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	unsigned long arg)
+{
+	drm_ctx_t ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t*)arg, sizeof(ctx), -EFAULT);
+	/* This is 0, because we don't hanlde any context flags */
+	ctx.flags = 0;
+	copy_to_user_ret((drm_ctx_t*)arg, &ctx, sizeof(ctx), -EFAULT);
+	return 0;
+}
+
+int r128_switchctx(struct inode *inode, struct file *filp, unsigned int cmd,
+		   unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
+	DRM_DEBUG("%d\n", ctx.handle);
+	return r128_context_switch(dev, dev->last_context, ctx.handle);
+}
+
+int r128_newctx(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
+	DRM_DEBUG("%d\n", ctx.handle);
+	r128_context_switch_complete(dev, ctx.handle);
+
+	return 0;
+}
+
+int r128_rmctx(struct inode *inode, struct file *filp, unsigned int cmd,
+	       unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
+	DRM_DEBUG("%d\n", ctx.handle);
+	drm_ctxbitmap_free(dev, ctx.handle);
+
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_dma.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_dma.c:1.2
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_dma.c	Sun Jun 25 22:41:33 2000
@@ -0,0 +1,922 @@
+/* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*-
+ * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Kevin E. Martin <martin@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include "r128_drv.h"
+
+#include <linux/interrupt.h>	/* For task queue support */
+#include <linux/delay.h>
+
+
+
+#define DO_REMAP(_m) (_m)->handle = drm_ioremap((_m)->offset, (_m)->size)
+
+#define DO_REMAPFREE(_m)                                                    \
+	do {                                                                \
+		if ((_m)->handle && (_m)->size)                             \
+			drm_ioremapfree((_m)->handle, (_m)->size);          \
+	} while (0)
+
+#define DO_FIND_MAP(_m, _o)                                                 \
+	do {                                                                \
+		int _i;                                                     \
+		for (_i = 0; _i < dev->map_count; _i++) {                   \
+			if (dev->maplist[_i]->offset == _o) {               \
+				_m = dev->maplist[_i];                      \
+				break;                                      \
+			}                                                   \
+		}                                                           \
+	} while (0)
+
+
+#define R128_MAX_VBUF_AGE	0x10000000
+#define R128_VB_AGE_REG		R128_GUI_SCRATCH_REG0
+
+int R128_READ_PLL(drm_device_t *dev, int addr)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+
+	R128_WRITE8(R128_CLOCK_CNTL_INDEX, addr & 0x1f);
+	return R128_READ(R128_CLOCK_CNTL_DATA);
+}
+
+static void r128_flush_write_combine(void)
+{
+	int xchangeDummy;
+
+	__asm__ volatile("push %%eax ;"
+			 "xchg %%eax, %0 ;"
+			 "pop %%eax" : : "m" (xchangeDummy));
+	__asm__ volatile("push %%eax ;"
+			 "push %%ebx ;"
+			 "push %%ecx ;"
+			 "push %%edx ;"
+			 "movl $0,%%eax ;"
+			 "cpuid ;"
+			 "pop %%edx ;"
+			 "pop %%ecx ;"
+			 "pop %%ebx ;"
+			 "pop %%eax" : /* no outputs */ :  /* no inputs */ );
+}
+
+static void r128_status(drm_device_t *dev)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+
+	printk("GUI_STAT           = 0x%08x\n",
+	       (unsigned int)R128_READ(R128_GUI_STAT));
+	printk("PM4_STAT           = 0x%08x\n",
+	       (unsigned int)R128_READ(R128_PM4_STAT));
+	printk("PM4_BUFFER_DL_WPTR = 0x%08x\n",
+	       (unsigned int)R128_READ(R128_PM4_BUFFER_DL_WPTR));
+	printk("PM4_BUFFER_DL_RPTR = 0x%08x\n",
+	       (unsigned int)R128_READ(R128_PM4_BUFFER_DL_RPTR));
+}
+
+static int r128_do_cleanup_cce(drm_device_t *dev)
+{
+	if (dev->dev_private) {
+		drm_r128_private_t *dev_priv = dev->dev_private;
+
+		if (!dev_priv->is_pci) {
+			DO_REMAPFREE(dev_priv->agp_ring);
+			DO_REMAPFREE(dev_priv->agp_read_ptr);
+			DO_REMAPFREE(dev_priv->agp_vertbufs);
+			DO_REMAPFREE(dev_priv->agp_indbufs);
+			DO_REMAPFREE(dev_priv->agp_textures);
+		}
+
+		drm_free(dev->dev_private, sizeof(drm_r128_private_t),
+			 DRM_MEM_DRIVER);
+		dev->dev_private = NULL;
+	}
+
+	return 0;
+}
+
+static int r128_do_init_cce(drm_device_t *dev, drm_r128_init_t *init)
+{
+	drm_r128_private_t *dev_priv;
+        int                 i;
+
+	dev_priv = drm_alloc(sizeof(drm_r128_private_t), DRM_MEM_DRIVER);
+	if (dev_priv == NULL) return -ENOMEM;
+	dev->dev_private = (void *)dev_priv;
+
+	memset(dev_priv, 0, sizeof(drm_r128_private_t));
+
+	dev_priv->is_pci         = init->is_pci;
+
+	dev_priv->usec_timeout   = init->usec_timeout;
+	if (dev_priv->usec_timeout < 1 ||
+	    dev_priv->usec_timeout > R128_MAX_USEC_TIMEOUT) {
+		drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
+		dev->dev_private = NULL;
+		return -EINVAL;
+	}
+
+	dev_priv->cce_mode       = init->cce_mode;
+	dev_priv->cce_fifo_size  = init->cce_fifo_size;
+	dev_priv->cce_is_bm_mode =
+		((init->cce_mode == R128_PM4_192BM) ||
+		 (init->cce_mode == R128_PM4_128BM_64INDBM) ||
+		 (init->cce_mode == R128_PM4_64BM_128INDBM) ||
+		 (init->cce_mode == R128_PM4_64BM_64VCBM_64INDBM));
+	dev_priv->cce_secure     = init->cce_secure;
+
+	if (dev_priv->cce_is_bm_mode && dev_priv->is_pci) {
+		drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
+		dev->dev_private = NULL;
+		return -EINVAL;
+	}
+
+	for (i = 0; i < dev->map_count; i++) {
+		if (dev->maplist[i]->type == _DRM_SHM) {
+			dev_priv->sarea = dev->maplist[i];
+			break;
+		}
+	}
+
+	DO_FIND_MAP(dev_priv->fb,           init->fb_offset);
+	if (!dev_priv->is_pci) {
+		DO_FIND_MAP(dev_priv->agp_ring,     init->agp_ring_offset);
+		DO_FIND_MAP(dev_priv->agp_read_ptr, init->agp_read_ptr_offset);
+		DO_FIND_MAP(dev_priv->agp_vertbufs, init->agp_vertbufs_offset);
+		DO_FIND_MAP(dev_priv->agp_indbufs,  init->agp_indbufs_offset);
+		DO_FIND_MAP(dev_priv->agp_textures, init->agp_textures_offset);
+	}
+	DO_FIND_MAP(dev_priv->mmio,         init->mmio_offset);
+
+	dev_priv->sarea_priv =
+		(drm_r128_sarea_t *)((u8 *)dev_priv->sarea->handle +
+				     init->sarea_priv_offset);
+
+	if (!dev_priv->is_pci) {
+		DO_REMAP(dev_priv->agp_ring);
+		DO_REMAP(dev_priv->agp_read_ptr);
+		DO_REMAP(dev_priv->agp_vertbufs);
+#if 0
+		DO_REMAP(dev_priv->agp_indirectbufs);
+		DO_REMAP(dev_priv->agp_textures);
+#endif
+
+		dev_priv->ring_size     = init->ring_size;
+		dev_priv->ring_sizel2qw = drm_order(init->ring_size/8);
+		dev_priv->ring_entries  = init->ring_size/sizeof(u32);
+		dev_priv->ring_read_ptr = ((__volatile__ u32 *)
+					   dev_priv->agp_read_ptr->handle);
+		dev_priv->ring_start    = (u32 *)dev_priv->agp_ring->handle;
+		dev_priv->ring_end      = ((u32 *)dev_priv->agp_ring->handle
+					   + dev_priv->ring_entries);
+	}
+
+	dev_priv->submit_age    = 0;
+	R128_WRITE(R128_VB_AGE_REG, dev_priv->submit_age);
+
+	return 0;
+}
+
+int r128_init_cce(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+        drm_file_t        *priv   = filp->private_data;
+        drm_device_t      *dev    = priv->dev;
+	drm_r128_init_t    init;
+
+	copy_from_user_ret(&init, (drm_r128_init_t *)arg, sizeof(init),
+			   -EFAULT);
+
+	switch (init.func) {
+	case R128_INIT_CCE:
+		return r128_do_init_cce(dev, &init);
+	case R128_CLEANUP_CCE:
+		return r128_do_cleanup_cce(dev);
+	}
+
+	return -EINVAL;
+}
+
+static void r128_mark_vertbufs_done(drm_device_t *dev)
+{
+	drm_device_dma_t   *dma      = dev->dma;
+	int                 i;
+
+	for (i = 0; i < dma->buf_count; i++) {
+		drm_buf_t           *buf      = dma->buflist[i];
+		drm_r128_buf_priv_t *buf_priv = buf->dev_private;
+		buf_priv->age = 0;
+	}
+}
+
+static int r128_do_pixcache_flush(drm_device_t *dev)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	u32                 tmp;
+	int                 i;
+
+	tmp = R128_READ(R128_PC_NGUI_CTLSTAT) | R128_PC_FLUSH_ALL;
+	R128_WRITE(R128_PC_NGUI_CTLSTAT, tmp);
+
+	for (i = 0; i < dev_priv->usec_timeout; i++) {
+		if (!(R128_READ(R128_PC_NGUI_CTLSTAT) & R128_PC_BUSY))
+			return 0;
+		udelay(1);
+	}
+
+	return -EBUSY;
+}
+
+static int r128_do_wait_for_fifo(drm_device_t *dev, int entries)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int                 i;
+
+	for (i = 0; i < dev_priv->usec_timeout; i++) {
+		int slots = R128_READ(R128_GUI_STAT) & R128_GUI_FIFOCNT_MASK;
+		if (slots >= entries) return 0;
+		udelay(1);
+	}
+	return -EBUSY;
+}
+
+static int r128_do_wait_for_idle(drm_device_t *dev)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int                 i, ret;
+
+	if (!(ret = r128_do_wait_for_fifo(dev, 64))) return ret;
+
+	for (i = 0; i < dev_priv->usec_timeout; i++) {
+		if (!(R128_READ(R128_GUI_STAT) & R128_GUI_ACTIVE)) {
+			(void)r128_do_pixcache_flush(dev);
+			return 0;
+		}
+		udelay(1);
+	}
+	return -EBUSY;
+}
+
+int r128_do_engine_reset(drm_device_t *dev)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	u32                 clock_cntl_index, mclk_cntl, gen_reset_cntl;
+
+	(void)r128_do_pixcache_flush(dev);
+
+	clock_cntl_index = R128_READ(R128_CLOCK_CNTL_INDEX);
+	mclk_cntl        = R128_READ_PLL(dev, R128_MCLK_CNTL);
+
+	R128_WRITE_PLL(R128_MCLK_CNTL,
+		       mclk_cntl | R128_FORCE_GCP | R128_FORCE_PIPE3D_CP);
+
+	gen_reset_cntl   = R128_READ(R128_GEN_RESET_CNTL);
+
+	R128_WRITE(R128_GEN_RESET_CNTL, gen_reset_cntl | R128_SOFT_RESET_GUI);
+	(void)R128_READ(R128_GEN_RESET_CNTL);
+	R128_WRITE(R128_GEN_RESET_CNTL, gen_reset_cntl & ~R128_SOFT_RESET_GUI);
+	(void)R128_READ(R128_GEN_RESET_CNTL);
+
+	R128_WRITE_PLL(R128_MCLK_CNTL,    mclk_cntl);
+	R128_WRITE(R128_CLOCK_CNTL_INDEX, clock_cntl_index);
+	R128_WRITE(R128_GEN_RESET_CNTL,   gen_reset_cntl);
+
+	/* For CCE ring buffer only */
+	if (dev_priv->cce_is_bm_mode) {
+		R128_WRITE(R128_PM4_BUFFER_DL_WPTR, 0);
+		R128_WRITE(R128_PM4_BUFFER_DL_RPTR, 0);
+		*dev_priv->ring_read_ptr = 0;
+		dev_priv->sarea_priv->ring_write = 0;
+	}
+
+	/* Reset the CCE mode */
+	(void)r128_do_wait_for_idle(dev);
+	R128_WRITE(R128_PM4_BUFFER_CNTL,
+		   dev_priv->cce_mode | dev_priv->ring_sizel2qw);
+	(void)R128_READ(R128_PM4_BUFFER_ADDR); /* as per the sample code */
+	R128_WRITE(R128_PM4_MICRO_CNTL, R128_PM4_MICRO_FREERUN);
+
+	r128_mark_vertbufs_done(dev);
+	return 0;
+}
+
+int r128_eng_reset(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+        drm_file_t        *priv   = filp->private_data;
+        drm_device_t      *dev    = priv->dev;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) ||
+	    dev->lock.pid != current->pid) {
+		DRM_ERROR("r128_eng_reset called without holding the lock\n");
+		return -EINVAL;
+	}
+
+	return r128_do_engine_reset(dev);
+}
+
+static int r128_do_engine_flush(drm_device_t *dev)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	u32                 tmp;
+
+	tmp = R128_READ(R128_PM4_BUFFER_DL_WPTR);
+	R128_WRITE(R128_PM4_BUFFER_DL_WPTR, tmp | R128_PM4_BUFFER_DL_DONE);
+
+	return 0;
+}
+
+int r128_eng_flush(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+        drm_file_t        *priv   = filp->private_data;
+        drm_device_t      *dev    = priv->dev;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) ||
+	    dev->lock.pid != current->pid) {
+		DRM_ERROR("r128_eng_flush called without holding the lock\n");
+		return -EINVAL;
+	}
+
+	return r128_do_engine_flush(dev);
+}
+
+static int r128_do_cce_wait_for_fifo(drm_device_t *dev, int entries)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int                 i;
+
+	for (i = 0; i < dev_priv->usec_timeout; i++) {
+		int slots = R128_READ(R128_PM4_STAT) & R128_PM4_FIFOCNT_MASK;
+		if (slots >= entries) return 0;
+		udelay(1);
+	}
+	return -EBUSY;
+}
+
+int r128_do_cce_wait_for_idle(drm_device_t *dev)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int                 i;
+
+	if (dev_priv->cce_is_bm_mode) {
+		for (i = 0; i < dev_priv->usec_timeout; i++) {
+			if (*dev_priv->ring_read_ptr == dev_priv->sarea_priv->ring_write) {
+				int pm4stat = R128_READ(R128_PM4_STAT);
+				if ((pm4stat & R128_PM4_FIFOCNT_MASK) >= dev_priv->cce_fifo_size &&
+				    !(pm4stat & (R128_PM4_BUSY | R128_PM4_GUI_ACTIVE))) {
+					return r128_do_pixcache_flush(dev);
+				}
+			}
+			udelay(1);
+		}
+		return -EBUSY;
+	} else {
+		int ret = r128_do_cce_wait_for_fifo(dev, dev_priv->cce_fifo_size);
+		if (ret < 0) return ret;
+
+		for (i = 0; i < dev_priv->usec_timeout; i++) {
+			int pm4stat = R128_READ(R128_PM4_STAT);
+			if (!(pm4stat & (R128_PM4_BUSY | R128_PM4_GUI_ACTIVE))) {
+				return r128_do_pixcache_flush(dev);
+			}
+			udelay(1);
+		}
+		return -EBUSY;
+	}
+}
+
+int r128_cce_idle(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+        drm_file_t         *priv     = filp->private_data;
+        drm_device_t       *dev      = priv->dev;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) ||
+	    dev->lock.pid != current->pid) {
+		DRM_ERROR("r128_wait_idle called without holding the lock\n");
+		return -EINVAL;
+	}
+
+	return r128_do_cce_wait_for_idle(dev);
+}
+
+static int r128_submit_packets_ring_secure(drm_device_t *dev,
+					   u32 *commands, int *count)
+{
+	drm_r128_private_t *dev_priv  = dev->dev_private;
+	int                 write     = dev_priv->sarea_priv->ring_write;
+	int                *write_ptr = dev_priv->ring_start + write;
+	int                 c         = *count;
+	u32                 tmp       = 0;
+	int                 psize     = 0;
+	int                 writing   = 1;
+	int                 timeout;
+
+	while (c > 0) {
+		tmp = *commands++;
+		if (!psize) {
+			writing = 1;
+
+			if ((tmp & R128_CCE_PACKET_MASK) == R128_CCE_PACKET0) {
+				if ((tmp & R128_CCE_PACKET0_REG_MASK) <= (0x1004 >> 2)) {
+					if ((tmp & R128_CCE_PACKET0_REG_MASK) !=
+					    (R128_PM4_VC_FPU_SETUP >> 2)) {
+						writing = 0;
+					}
+				}
+				psize = ((tmp & R128_CCE_PACKET_COUNT_MASK) >> 16) + 2;
+			} else if ((tmp & R128_CCE_PACKET_MASK) == R128_CCE_PACKET1) {
+				if ((tmp & R128_CCE_PACKET1_REG0_MASK) <= (0x1004 >> 2)) {
+					if ((tmp & R128_CCE_PACKET1_REG0_MASK) !=
+					    (R128_PM4_VC_FPU_SETUP >> 2)) {
+						writing = 0;
+					}
+				} else if ((tmp & R128_CCE_PACKET1_REG1_MASK) <=
+					   (0x1004 << 9)) {
+					if ((tmp & R128_CCE_PACKET1_REG1_MASK) !=
+					    (R128_PM4_VC_FPU_SETUP << 9)) {
+						writing = 0;
+					}
+				}
+				psize = 3;
+			} else {
+				psize = ((tmp & R128_CCE_PACKET_COUNT_MASK) >> 16) + 2;
+			}
+		}
+		psize--;
+
+		if (writing) {
+			write++;
+			*write_ptr++ = tmp;
+		}
+		if (write >= dev_priv->ring_entries) {
+			write     = 0;
+			write_ptr = dev_priv->ring_start;
+		}
+		timeout = 0;
+		while (write == *dev_priv->ring_read_ptr) {
+			(void)R128_READ(R128_PM4_BUFFER_DL_RPTR);
+			if (timeout++ >= dev_priv->usec_timeout)
+				return -EBUSY;
+			udelay(1);
+		}
+		c--;
+	}
+
+	if (write < 32)
+	    memcpy(dev_priv->ring_end,
+		   dev_priv->ring_start,
+		   write * sizeof(u32));
+
+	/* Make sure WC cache has been flushed */
+	r128_flush_write_combine();
+
+	dev_priv->sarea_priv->ring_write = write;
+	R128_WRITE(R128_PM4_BUFFER_DL_WPTR, write);
+
+	*count = 0;
+
+	return 0;
+}
+
+static int r128_submit_packets_pio_secure(drm_device_t *dev,
+					  u32 *commands, int *count)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	u32                 tmp      = 0;
+	int                 psize    = 0;
+	int                 writing  = 1;
+	int                 addr     = R128_PM4_FIFO_DATA_EVEN;
+	int                 ret;
+
+	while (*count > 0) {
+		tmp = *commands++;
+		if (!psize) {
+			writing = 1;
+
+			if ((tmp & R128_CCE_PACKET_MASK) == R128_CCE_PACKET0) {
+				if ((tmp & R128_CCE_PACKET0_REG_MASK) <= (0x1004 >> 2)) {
+					if ((tmp & R128_CCE_PACKET0_REG_MASK) !=
+					    (R128_PM4_VC_FPU_SETUP >> 2)) {
+						writing = 0;
+					}
+				}
+				psize = ((tmp & R128_CCE_PACKET_COUNT_MASK) >> 16) + 2;
+			} else if ((tmp & R128_CCE_PACKET_MASK) == R128_CCE_PACKET1) {
+				if ((tmp & R128_CCE_PACKET1_REG0_MASK) <= (0x1004 >> 2)) {
+					if ((tmp & R128_CCE_PACKET1_REG0_MASK) !=
+					    (R128_PM4_VC_FPU_SETUP >> 2)) {
+						writing = 0;
+					}
+				} else if ((tmp & R128_CCE_PACKET1_REG1_MASK) <=
+					   (0x1004 << 9)) {
+					if ((tmp & R128_CCE_PACKET1_REG1_MASK) !=
+					    (R128_PM4_VC_FPU_SETUP << 9)) {
+						writing = 0;
+					}
+				}
+				psize = 3;
+			} else {
+				psize = ((tmp & R128_CCE_PACKET_COUNT_MASK) >> 16) + 2;
+			}
+		}
+		psize--;
+
+		if (writing) {
+			if ((ret = r128_do_cce_wait_for_fifo(dev, 1)) < 0)
+				return ret;
+			R128_WRITE(addr, tmp);
+			addr ^= 0x0004;
+		}
+
+		*count -= 1;
+	}
+
+	if (addr == R128_PM4_FIFO_DATA_ODD) {
+		if ((ret = r128_do_cce_wait_for_fifo(dev, 1)) < 0) return ret;
+		R128_WRITE(addr, R128_CCE_PACKET2);
+	}
+
+	return 0;
+}
+
+static int r128_submit_packets_ring(drm_device_t *dev,
+				    u32 *commands, int *count)
+{
+	drm_r128_private_t *dev_priv  = dev->dev_private;
+	int                 write     = dev_priv->sarea_priv->ring_write;
+	int                *write_ptr = dev_priv->ring_start + write;
+	int                 c         = *count;
+	int                 timeout;
+
+	while (c > 0) {
+		write++;
+		*write_ptr++ = *commands++;
+		if (write >= dev_priv->ring_entries) {
+			write     = 0;
+			write_ptr = dev_priv->ring_start;
+		}
+		timeout = 0;
+		while (write == *dev_priv->ring_read_ptr) {
+			(void)R128_READ(R128_PM4_BUFFER_DL_RPTR);
+			if (timeout++ >= dev_priv->usec_timeout)
+				return -EBUSY;
+			udelay(1);
+		}
+		c--;
+	}
+
+	if (write < 32)
+	    memcpy(dev_priv->ring_end,
+		   dev_priv->ring_start,
+		   write * sizeof(u32));
+
+	/* Make sure WC cache has been flushed */
+	r128_flush_write_combine();
+
+	dev_priv->sarea_priv->ring_write = write;
+	R128_WRITE(R128_PM4_BUFFER_DL_WPTR, write);
+
+	*count = 0;
+
+	return 0;
+}
+
+static int r128_submit_packets_pio(drm_device_t *dev,
+				   u32 *commands, int *count)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int                 ret;
+
+	while (*count > 1) {
+		if ((ret = r128_do_cce_wait_for_fifo(dev, 2)) < 0) return ret;
+		R128_WRITE(R128_PM4_FIFO_DATA_EVEN, *commands++);
+		R128_WRITE(R128_PM4_FIFO_DATA_ODD,  *commands++);
+		*count -= 2;
+	}
+
+	if (*count) {
+		if ((ret = r128_do_cce_wait_for_fifo(dev, 2)) < 0) return ret;
+		R128_WRITE(R128_PM4_FIFO_DATA_EVEN, *commands++);
+		R128_WRITE(R128_PM4_FIFO_DATA_ODD,  R128_CCE_PACKET2);
+		*count = 0;
+	}
+
+	return 0;
+}
+
+static int r128_do_submit_packets(drm_device_t *dev, u32 *buffer, int count)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int                 c = count;
+	int                 ret;
+
+	if (dev_priv->cce_is_bm_mode) {
+		int left = 0;
+
+		if (c >= dev_priv->ring_entries) {
+			c    = dev_priv->ring_entries-1;
+			left = count - c;
+		}
+
+		/* Since this is only used by the kernel we can use the
+                   insecure ring buffer submit packet routine */
+		ret = r128_submit_packets_ring(dev, buffer, &c);
+
+		c += left;
+	} else {
+		/* Since this is only used by the kernel we can use the
+                   insecure PIO submit packet routine */
+		ret = r128_submit_packets_pio(dev, buffer, &c);
+	}
+
+	if (ret < 0) return ret;
+	else         return c;
+}
+
+int r128_submit_pkt(struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg)
+{
+        drm_file_t         *priv     = filp->private_data;
+        drm_device_t       *dev      = priv->dev;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_packet_t   packet;
+	u32                *buffer;
+	int                 c;
+	int                 size;
+	int                 ret = 0;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) ||
+	    dev->lock.pid != current->pid) {
+		DRM_ERROR("r128_submit_pkt called without holding the lock\n");
+		return -EINVAL;
+	}
+
+	copy_from_user_ret(&packet, (drm_r128_packet_t *)arg, sizeof(packet),
+			   -EFAULT);
+
+	c    = packet.count;
+	size = c * sizeof(*buffer);
+
+	if (dev_priv->cce_is_bm_mode) {
+		int left = 0;
+
+		if (c >= dev_priv->ring_entries) {
+			c    = dev_priv->ring_entries-1;
+			size = c * sizeof(*buffer);
+			left = packet.count - c;
+		}
+
+		if ((buffer = kmalloc(size, 0)) == NULL) return -ENOMEM;
+		copy_from_user_ret(buffer, packet.buffer, size, -EFAULT);
+
+		if (dev_priv->cce_secure)
+			ret = r128_submit_packets_ring_secure(dev, buffer, &c);
+		else
+			ret = r128_submit_packets_ring(dev, buffer, &c);
+
+		c += left;
+	} else {
+		if ((buffer = kmalloc(size, 0)) == NULL) return -ENOMEM;
+		copy_from_user_ret(buffer, packet.buffer, size, -EFAULT);
+
+		if (dev_priv->cce_secure)
+			ret = r128_submit_packets_pio_secure(dev, buffer, &c);
+		else
+			ret = r128_submit_packets_pio(dev, buffer, &c);
+	}
+
+	kfree(buffer);
+
+	packet.count = c;
+	copy_to_user_ret((drm_r128_packet_t *)arg, &packet, sizeof(packet),
+			 -EFAULT);
+
+	if (ret)        return ret;
+	else if (c > 0) return -EAGAIN;
+
+	return 0;
+}
+
+static int r128_send_vertbufs(drm_device_t *dev, drm_r128_vertex_t *v)
+{
+	drm_device_dma_t    *dma      = dev->dma;
+	drm_r128_private_t  *dev_priv = dev->dev_private;
+	drm_r128_buf_priv_t *buf_priv;
+	drm_buf_t           *buf;
+	int                  i, ret;
+	u32                  cce[2];
+
+	/* Make sure we have valid data */
+	for (i = 0; i < v->send_count; i++) {
+		int idx = v->send_indices[i];
+
+		if (idx < 0 || idx >= dma->buf_count) {
+			DRM_ERROR("Index %d (of %d max)\n",
+				  idx, dma->buf_count - 1);
+			return -EINVAL;
+		}
+		buf = dma->buflist[idx];
+		if (buf->pid != current->pid) {
+			DRM_ERROR("Process %d using buffer owned by %d\n",
+				  current->pid, buf->pid);
+			return -EINVAL;
+		}
+		if (buf->pending) {
+			DRM_ERROR("Sending pending buffer:"
+				  " buffer %d, offset %d\n",
+				  v->send_indices[i], i);
+			return -EINVAL;
+		}
+	}
+
+	/* Wait for idle, if we've wrapped to make sure that all pending
+           buffers have been processed */
+	if (dev_priv->submit_age == R128_MAX_VBUF_AGE) {
+		if ((ret = r128_do_cce_wait_for_idle(dev)) < 0) return ret;
+		dev_priv->submit_age = 0;
+		r128_mark_vertbufs_done(dev);
+	}
+
+	/* Make sure WC cache has been flushed (if in PIO mode) */
+	if (!dev_priv->cce_is_bm_mode) r128_flush_write_combine();
+
+	/* FIXME: Add support for sending vertex buffer to the CCE here
+	   instead of in client code.  The v->prim holds the primitive
+	   type that should be drawn.  Loop over the list buffers in
+	   send_indices[] and submit a packet for each VB.
+
+	   This will require us to loop over the clip rects here as
+	   well, which implies that we extend the kernel driver to allow
+	   cliprects to be stored here.  Note that the cliprects could
+	   possibly come from the X server instead of the client, but
+	   this will require additional changes to the DRI to allow for
+	   this optimization. */
+
+	/* Submit a CCE packet that writes submit_age to R128_VB_AGE_REG */
+	cce[0] = R128CCE0(R128_CCE_PACKET0, R128_VB_AGE_REG, 0);
+	cce[1] = dev_priv->submit_age;
+	if ((ret = r128_do_submit_packets(dev, cce, 2)) < 0) {
+		/* Until we add support for sending VBs to the CCE in
+		   this routine, we can recover from this error.  After
+		   we add that support, we won't be able to easily
+		   recover, so we will probably have to implement
+		   another mechanism for handling timeouts from packets
+		   submitted directly by the kernel. */
+		return ret;
+	}
+
+	/* Now that the submit packet request has succeeded, we can mark
+           the buffers as pending */
+	for (i = 0; i < v->send_count; i++) {
+		buf = dma->buflist[v->send_indices[i]];
+		buf->pending = 1;
+
+		buf_priv      = buf->dev_private;
+		buf_priv->age = dev_priv->submit_age;
+	}
+
+	dev_priv->submit_age++;
+
+	return 0;
+}
+
+static drm_buf_t *r128_freelist_get(drm_device_t *dev)
+{
+	drm_device_dma_t    *dma      = dev->dma;
+	drm_r128_private_t  *dev_priv = dev->dev_private;
+	drm_r128_buf_priv_t *buf_priv;
+	drm_buf_t           *buf;
+	int                  i, t;
+
+	/* FIXME: Optimize -- use freelist code */
+
+	for (i = 0; i < dma->buf_count; i++) {
+		buf = dma->buflist[i];
+		buf_priv = buf->dev_private;
+		if (buf->pid == 0) return buf;
+	}
+
+	for (t = 0; t < dev_priv->usec_timeout; t++) {
+		u32 done_age = R128_READ(R128_VB_AGE_REG);
+
+		for (i = 0; i < dma->buf_count; i++) {
+			buf = dma->buflist[i];
+			buf_priv = buf->dev_private;
+			if (buf->pending && buf_priv->age <= done_age) {
+				/* The buffer has been processed, so it
+                                   can now be used */
+				buf->pending = 0;
+				return buf;
+			}
+		}
+		udelay(1);
+	}
+
+	r128_status(dev);
+	return NULL;
+}
+
+
+static int r128_get_vertbufs(drm_device_t *dev, drm_r128_vertex_t *v)
+{
+	drm_buf_t *buf;
+	int        i;
+
+	for (i = v->granted_count; i < v->request_count; i++) {
+		buf = r128_freelist_get(dev);
+		if (!buf) break;
+		buf->pid = current->pid;
+		copy_to_user_ret(&v->request_indices[i],
+				 &buf->idx,
+				 sizeof(buf->idx),
+				 -EFAULT);
+		copy_to_user_ret(&v->request_sizes[i],
+				 &buf->total,
+				 sizeof(buf->total),
+				 -EFAULT);
+		++v->granted_count;
+	}
+	return 0;
+}
+
+int r128_vertex_buf(struct inode *inode, struct file *filp, unsigned int cmd,
+		    unsigned long arg)
+{
+	drm_file_t	   *priv     = filp->private_data;
+	drm_device_t	   *dev	     = priv->dev;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t   *dma	     = dev->dma;
+	int		    retcode  = 0;
+	drm_r128_vertex_t   v;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) ||
+	    dev->lock.pid != current->pid) {
+		DRM_ERROR("r128_vertex_buf called without holding the lock\n");
+		return -EINVAL;
+	}
+
+	if (!dev_priv || dev_priv->is_pci) {
+		DRM_ERROR("r128_vertex_buf called with a PCI card\n");
+		return -EINVAL;
+	}
+
+	copy_from_user_ret(&v, (drm_r128_vertex_t *)arg, sizeof(v), -EFAULT);
+	DRM_DEBUG("%d: %d send, %d req\n",
+		  current->pid, v.send_count, v.request_count);
+
+	if (v.send_count < 0 || v.send_count > dma->buf_count) {
+		DRM_ERROR("Process %d trying to send %d buffers (of %d max)\n",
+			  current->pid, v.send_count, dma->buf_count);
+		return -EINVAL;
+	}
+	if (v.request_count < 0 || v.request_count > dma->buf_count) {
+		DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
+			  current->pid, v.request_count, dma->buf_count);
+		return -EINVAL;
+	}
+
+	if (v.send_count) {
+		retcode = r128_send_vertbufs(dev, &v);
+	}
+
+	v.granted_count = 0;
+
+	if (!retcode && v.request_count) {
+		retcode = r128_get_vertbufs(dev, &v);
+	}
+
+	DRM_DEBUG("%d returning, granted = %d\n",
+		  current->pid, v.granted_count);
+	copy_to_user_ret((drm_r128_vertex_t *)arg, &v, sizeof(v), -EFAULT);
+
+	return retcode;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drm.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drm.h:1.1
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drm.h	Fri Jun 16 17:03:38 2000
@@ -0,0 +1,111 @@
+/* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
+ * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Kevin E. Martin <martin@valinux.com>
+ *
+ */
+
+#ifndef _R128_DRM_H_
+#define _R128_DRM_H_
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmR128.h)
+ */
+typedef struct drm_r128_init {
+	enum { 
+		R128_INIT_CCE    = 0x01,
+		R128_CLEANUP_CCE = 0x02
+	} func;
+	int sarea_priv_offset;
+	int is_pci;
+	int cce_mode;
+	int cce_fifo_size;
+	int cce_secure;
+	int ring_size;
+	int usec_timeout;
+
+	int fb_offset;
+	int agp_ring_offset;
+	int agp_read_ptr_offset;
+	int agp_vertbufs_offset;
+	int agp_indbufs_offset;
+	int agp_textures_offset;
+	int mmio_offset;
+} drm_r128_init_t;
+
+typedef struct drm_r128_packet {
+	unsigned long *buffer;
+	int            count;
+	int            flags;
+} drm_r128_packet_t;
+
+typedef enum drm_r128_prim {
+	_DRM_R128_PRIM_NONE		= 0x0001,
+	_DRM_R128_PRIM_POINT		= 0x0002,
+	_DRM_R128_PRIM_LINE		= 0x0004,
+	_DRM_R128_PRIM_POLY_LINE	= 0x0008,
+	_DRM_R128_PRIM_TRI_LIST		= 0x0010,
+	_DRM_R128_PRIM_TRI_FAN		= 0x0020,
+	_DRM_R128_PRIM_TRI_STRIP	= 0x0040,
+	_DRM_R128_PRIM_TRI_TYPE2	= 0x0080
+} drm_r128_prim_t;
+
+typedef struct drm_r128_vertex {
+				/* Indices here refer to the offset into
+				   buflist in drm_buf_get_t.  */
+	int		send_count;	  /* Number of buffers to send	    */
+	int		*send_indices;	  /* List of handles to buffers	    */
+	int		*send_sizes;	  /* Lengths of data to send	    */
+	drm_r128_prim_t	prim;		  /* Primitive type		    */
+	int		request_count;	  /* Number of buffers requested    */
+	int		*request_indices; /* Buffer information		    */
+	int		*request_sizes;
+	int		granted_count;	  /* Number of buffers granted	    */
+} drm_r128_vertex_t;
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (r128_sarea.h)
+ */
+#define R128_LOCAL_TEX_HEAP       0
+#define R128_AGP_TEX_HEAP         1
+#define R128_NR_TEX_HEAPS         2
+#define R128_NR_TEX_REGIONS      64
+#define R128_LOG_TEX_GRANULARITY 16
+
+typedef struct drm_tex_region {
+	unsigned char next, prev;       
+	unsigned char in_use;   
+	int age;                        
+} drm_tex_region_t;
+
+typedef struct drm_r128_sarea {
+	drm_tex_region_t tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1];
+	int              tex_age[R128_NR_TEX_HEAPS];
+	int              ctx_owner;
+	int              ring_write;
+} drm_r128_sarea_t;
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c:1.1
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c	Fri Jun 16 17:03:38 2000
@@ -0,0 +1,737 @@
+/* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*-
+ * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *          Kevin E. Martin <martin@valinux.com>
+ *
+ */
+
+#include <linux/config.h>
+#define EXPORT_SYMTAB
+#include "drmP.h"
+#include "r128_drv.h"
+EXPORT_SYMBOL(r128_init);
+EXPORT_SYMBOL(r128_cleanup);
+
+#define R128_NAME	 "r128"
+#define R128_DESC	 "r128"
+#define R128_DATE	 "20000607"
+#define R128_MAJOR	 1
+#define R128_MINOR	 0
+#define R128_PATCHLEVEL  0
+
+static drm_device_t	      r128_device;
+drm_ctx_t	              r128_res_ctx;
+
+static struct file_operations r128_fops = {
+	open:	 r128_open,
+	flush:	 drm_flush,
+	release: r128_release,
+	ioctl:	 r128_ioctl,
+	mmap:	 drm_mmap,
+	read:	 drm_read,
+	fasync:	 drm_fasync,
+	poll:	 drm_poll,
+};
+
+static struct miscdevice      r128_misc = {
+	minor: MISC_DYNAMIC_MINOR,
+	name:  R128_NAME,
+	fops:  &r128_fops,
+};
+
+static drm_ioctl_desc_t	      r128_ioctls[] = {
+	[DRM_IOCTL_NR(DRM_IOCTL_VERSION)]     = { r128_version,	   0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE)]  = { drm_getunique,   0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_MAGIC)]   = { drm_getmagic,	   0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_IRQ_BUSID)]   = { drm_irq_busid,   0, 1 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)]  = { drm_setunique,   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]	      = { drm_block,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]     = { drm_unblock,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)]  = { drm_authmagic,   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]     = { drm_addmap,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_BUFS)]    = { r128_addbufs,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MARK_BUFS)]   = { drm_markbufs,    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_INFO_BUFS)]   = { drm_infobufs,    1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS)]    = { r128_mapbufs,	   1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FREE_BUFS)]   = { drm_freebufs,    1, 0 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)]     = { r128_addctx,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)]      = { r128_rmctx,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)]     = { r128_modctx,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)]     = { r128_getctx,	   1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)]  = { r128_switchctx,  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)]     = { r128_newctx,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)]     = { r128_resctx,	   1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_DRAW)]    = { drm_adddraw,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_DRAW)]     = { drm_rmdraw,	   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_LOCK)]	      = { r128_lock,	   1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)]      = { r128_unlock,	   1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]      = { drm_finish,	   1, 0 },
+
+#ifdef DRM_AGP
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)] = { drm_agp_acquire, 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)] = { drm_agp_release, 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)]  = { drm_agp_enable,  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)]    = { drm_agp_info,    1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC)]   = { drm_agp_alloc,   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)]    = { drm_agp_free,    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)]    = { drm_agp_bind,    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)]  = { drm_agp_unbind,  1, 1 },
+#endif
+
+	[DRM_IOCTL_NR(DRM_IOCTL_R128_INIT)]   = { r128_init_cce,   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)]  = { r128_eng_reset,  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_R128_FLUSH)]  = { r128_eng_flush,  1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_R128_PACKET)] = { r128_submit_pkt, 1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_R128_IDLE)]   = { r128_cce_idle,   1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)] = { r128_vertex_buf, 1, 0 },
+};
+#define R128_IOCTL_COUNT DRM_ARRAY_SIZE(r128_ioctls)
+
+#ifdef MODULE
+int			      init_module(void);
+void			      cleanup_module(void);
+static char		      *r128 = NULL;
+
+MODULE_AUTHOR("Precision Insight, Inc., Cedar Park, Texas.");
+MODULE_DESCRIPTION("r128");
+MODULE_PARM(r128, "s");
+
+/* init_module is called when insmod is used to load the module */
+
+int init_module(void)
+{
+	return r128_init();
+}
+
+/* cleanup_module is called when rmmod is used to unload the module */
+
+void cleanup_module(void)
+{
+	r128_cleanup();
+}
+#endif
+
+#ifndef MODULE
+/* r128_setup is called by the kernel to parse command-line options passed
+ * via the boot-loader (e.g., LILO).  It calls the insmod option routine,
+ * drm_parse_drm.
+ *
+ * This is not currently supported, since it requires changes to
+ * linux/init/main.c. */
+
+
+void __init r128_setup(char *str, int *ints)
+{
+	if (ints[0] != 0) {
+		DRM_ERROR("Illegal command line format, ignored\n");
+		return;
+	}
+	drm_parse_options(str);
+}
+#endif
+
+static int r128_setup(drm_device_t *dev)
+{
+	int i;
+
+	atomic_set(&dev->ioctl_count, 0);
+	atomic_set(&dev->vma_count, 0);
+	dev->buf_use	  = 0;
+	atomic_set(&dev->buf_alloc, 0);
+
+	drm_dma_setup(dev);
+
+	atomic_set(&dev->total_open, 0);
+	atomic_set(&dev->total_close, 0);
+	atomic_set(&dev->total_ioctl, 0);
+	atomic_set(&dev->total_irq, 0);
+	atomic_set(&dev->total_ctx, 0);
+	atomic_set(&dev->total_locks, 0);
+	atomic_set(&dev->total_unlocks, 0);
+	atomic_set(&dev->total_contends, 0);
+	atomic_set(&dev->total_sleeps, 0);
+
+	for (i = 0; i < DRM_HASH_SIZE; i++) {
+		dev->magiclist[i].head = NULL;
+		dev->magiclist[i].tail = NULL;
+	}
+	dev->maplist	    = NULL;
+	dev->map_count	    = 0;
+	dev->vmalist	    = NULL;
+	dev->lock.hw_lock   = NULL;
+	init_waitqueue_head(&dev->lock.lock_queue);
+	dev->queue_count    = 0;
+	dev->queue_reserved = 0;
+	dev->queue_slots    = 0;
+	dev->queuelist	    = NULL;
+	dev->irq	    = 0;
+	dev->context_flag   = 0;
+	dev->interrupt_flag = 0;
+	dev->dma_flag	    = 0;
+	dev->last_context   = 0;
+	dev->last_switch    = 0;
+	dev->last_checked   = 0;
+	init_timer(&dev->timer);
+	init_waitqueue_head(&dev->context_wait);
+
+	dev->ctx_start	    = 0;
+	dev->lck_start	    = 0;
+
+	dev->buf_rp	  = dev->buf;
+	dev->buf_wp	  = dev->buf;
+	dev->buf_end	  = dev->buf + DRM_BSZ;
+	dev->buf_async	  = NULL;
+	init_waitqueue_head(&dev->buf_readers);
+	init_waitqueue_head(&dev->buf_writers);
+
+	r128_res_ctx.handle=-1;
+
+	DRM_DEBUG("\n");
+
+	/* The kernel's context could be created here, but is now created
+	   in drm_dma_enqueue.	This is more resource-efficient for
+	   hardware that does not do DMA, but may mean that
+	   drm_select_queue fails between the time the interrupt is
+	   initialized and the time the queues are initialized. */
+
+	return 0;
+}
+
+
+static int r128_takedown(drm_device_t *dev)
+{
+	int		  i;
+	drm_magic_entry_t *pt, *next;
+	drm_map_t	  *map;
+	drm_vma_entry_t	  *vma, *vma_next;
+
+	DRM_DEBUG("\n");
+
+	down(&dev->struct_sem);
+	del_timer(&dev->timer);
+
+	if (dev->devname) {
+		drm_free(dev->devname, strlen(dev->devname)+1, DRM_MEM_DRIVER);
+		dev->devname = NULL;
+	}
+
+	if (dev->unique) {
+		drm_free(dev->unique, strlen(dev->unique)+1, DRM_MEM_DRIVER);
+		dev->unique = NULL;
+		dev->unique_len = 0;
+	}
+				/* Clear pid list */
+	for (i = 0; i < DRM_HASH_SIZE; i++) {
+		for (pt = dev->magiclist[i].head; pt; pt = next) {
+			next = pt->next;
+			drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+		}
+		dev->magiclist[i].head = dev->magiclist[i].tail = NULL;
+	}
+
+#ifdef DRM_AGP
+				/* Clear AGP information */
+	if (dev->agp) {
+		drm_agp_mem_t *entry;
+		drm_agp_mem_t *nexte;
+
+				/* Remove AGP resources, but leave dev->agp
+                                   intact until r128_cleanup is called. */
+		for (entry = dev->agp->memory; entry; entry = nexte) {
+			nexte = entry->next;
+			if (entry->bound) drm_unbind_agp(entry->memory);
+			drm_free_agp(entry->memory, entry->pages);
+			drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+		}
+		dev->agp->memory = NULL;
+
+		if (dev->agp->acquired && drm_agp.release)
+			(*drm_agp.release)();
+
+		dev->agp->acquired = 0;
+		dev->agp->enabled  = 0;
+	}
+#endif
+
+				/* Clear vma list (only built for debugging) */
+	if (dev->vmalist) {
+		for (vma = dev->vmalist; vma; vma = vma_next) {
+			vma_next = vma->next;
+			drm_free(vma, sizeof(*vma), DRM_MEM_VMAS);
+		}
+		dev->vmalist = NULL;
+	}
+
+				/* Clear map area and mtrr information */
+	if (dev->maplist) {
+		for (i = 0; i < dev->map_count; i++) {
+			map = dev->maplist[i];
+			switch (map->type) {
+			case _DRM_REGISTERS:
+			case _DRM_FRAME_BUFFER:
+#ifdef CONFIG_MTRR
+				if (map->mtrr >= 0) {
+					int retcode;
+					retcode = mtrr_del(map->mtrr,
+							   map->offset,
+							   map->size);
+					DRM_DEBUG("mtrr_del = %d\n", retcode);
+				}
+#endif
+				drm_ioremapfree(map->handle, map->size);
+				break;
+			case _DRM_SHM:
+				drm_free_pages((unsigned long)map->handle,
+					       drm_order(map->size)
+					       - PAGE_SHIFT,
+					       DRM_MEM_SAREA);
+				break;
+			case _DRM_AGP:
+				/* Do nothing here, because this is all
+                                   handled in the AGP/GART driver. */
+				break;
+			}
+			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+		}
+		drm_free(dev->maplist,
+			 dev->map_count * sizeof(*dev->maplist),
+			 DRM_MEM_MAPS);
+		dev->maplist   = NULL;
+		dev->map_count = 0;
+	}
+
+	drm_dma_takedown(dev);
+
+	dev->queue_count     = 0;
+	if (dev->lock.hw_lock) {
+		dev->lock.hw_lock    = NULL; /* SHM removed */
+		dev->lock.pid	     = 0;
+		wake_up_interruptible(&dev->lock.lock_queue);
+	}
+	up(&dev->struct_sem);
+
+	return 0;
+}
+
+/* r128_init is called via init_module at module load time, or via
+ * linux/init/main.c (this is not currently supported). */
+
+int r128_init(void)
+{
+	int		      retcode;
+	drm_device_t	      *dev = &r128_device;
+
+	DRM_DEBUG("\n");
+
+	memset((void *)dev, 0, sizeof(*dev));
+	dev->count_lock	  = SPIN_LOCK_UNLOCKED;
+	sema_init(&dev->struct_sem, 1);
+
+#ifdef MODULE
+	drm_parse_options(r128);
+#endif
+
+	if ((retcode = misc_register(&r128_misc))) {
+		DRM_ERROR("Cannot register \"%s\"\n", R128_NAME);
+		return retcode;
+	}
+	dev->device = MKDEV(MISC_MAJOR, r128_misc.minor);
+	dev->name   = R128_NAME;
+
+	drm_mem_init();
+	drm_proc_init(dev);
+
+#ifdef DRM_AGP
+	dev->agp    = drm_agp_init();
+
+#ifdef CONFIG_MTRR
+	dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,
+				      dev->agp->agp_info.aper_size*1024*1024,
+				      MTRR_TYPE_WRCOMB,
+				      1);
+#endif
+#endif
+
+	if((retcode = drm_ctxbitmap_init(dev))) {
+		DRM_ERROR("Cannot allocate memory for context bitmap.\n");
+		drm_proc_cleanup();
+		misc_deregister(&r128_misc);
+		r128_takedown(dev);
+		return retcode;
+	}
+
+	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
+		 R128_NAME,
+		 R128_MAJOR,
+		 R128_MINOR,
+		 R128_PATCHLEVEL,
+		 R128_DATE,
+		 r128_misc.minor);
+
+	return 0;
+}
+
+/* r128_cleanup is called via cleanup_module at module unload time. */
+
+void r128_cleanup(void)
+{
+	drm_device_t	      *dev = &r128_device;
+
+	DRM_DEBUG("\n");
+
+	drm_proc_cleanup();
+	if (misc_deregister(&r128_misc)) {
+		DRM_ERROR("Cannot unload module\n");
+	} else {
+		DRM_INFO("Module unloaded\n");
+	}
+	drm_ctxbitmap_cleanup(dev);
+	r128_takedown(dev);
+#ifdef DRM_AGP
+	if (dev->agp) {
+				/* FIXME -- free other information, too */
+		drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
+		dev->agp = NULL;
+	}
+#endif
+}
+
+int r128_version(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+	drm_version_t version;
+	int	      len;
+
+	copy_from_user_ret(&version,
+			   (drm_version_t *)arg,
+			   sizeof(version),
+			   -EFAULT);
+
+#define DRM_COPY(name,value)				     \
+	len = strlen(value);				     \
+	if (len > name##_len) len = name##_len;		     \
+	name##_len = strlen(value);			     \
+	if (len && name) {				     \
+		copy_to_user_ret(name, value, len, -EFAULT); \
+	}
+
+	version.version_major	   = R128_MAJOR;
+	version.version_minor	   = R128_MINOR;
+	version.version_patchlevel = R128_PATCHLEVEL;
+
+	DRM_COPY(version.name, R128_NAME);
+	DRM_COPY(version.date, R128_DATE);
+	DRM_COPY(version.desc, R128_DESC);
+
+	copy_to_user_ret((drm_version_t *)arg,
+			 &version,
+			 sizeof(version),
+			 -EFAULT);
+	return 0;
+}
+
+int r128_open(struct inode *inode, struct file *filp)
+{
+	drm_device_t  *dev    = &r128_device;
+	int	      retcode = 0;
+
+	DRM_DEBUG("open_count = %d\n", dev->open_count);
+	if (!(retcode = drm_open_helper(inode, filp, dev))) {
+		MOD_INC_USE_COUNT;
+		atomic_inc(&dev->total_open);
+		spin_lock(&dev->count_lock);
+		if (!dev->open_count++) {
+			spin_unlock(&dev->count_lock);
+			return r128_setup(dev);
+		}
+		spin_unlock(&dev->count_lock);
+	}
+	return retcode;
+}
+
+int r128_release(struct inode *inode, struct file *filp)
+{
+	drm_file_t    *priv   = filp->private_data;
+	drm_device_t  *dev    = priv->dev;
+	int	      retcode = 0;
+
+	DRM_DEBUG("open_count = %d\n", dev->open_count);
+	if (!(retcode = drm_release(inode, filp))) {
+		MOD_DEC_USE_COUNT;
+		atomic_inc(&dev->total_close);
+		spin_lock(&dev->count_lock);
+		if (!--dev->open_count) {
+			if (atomic_read(&dev->ioctl_count) || dev->blocked) {
+				DRM_ERROR("Device busy: %d %d\n",
+					  atomic_read(&dev->ioctl_count),
+					  dev->blocked);
+				spin_unlock(&dev->count_lock);
+				return -EBUSY;
+			}
+			spin_unlock(&dev->count_lock);
+			return r128_takedown(dev);
+		}
+		spin_unlock(&dev->count_lock);
+	}
+	return retcode;
+}
+
+/* r128_ioctl is called whenever a process performs an ioctl on /dev/drm. */
+
+int r128_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	int		 nr	 = DRM_IOCTL_NR(cmd);
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	int		 retcode = 0;
+	drm_ioctl_desc_t *ioctl;
+	drm_ioctl_t	 *func;
+
+	atomic_inc(&dev->ioctl_count);
+	atomic_inc(&dev->total_ioctl);
+	++priv->ioctl_count;
+
+	DRM_DEBUG("pid = %d, cmd = 0x%02x, nr = 0x%02x, dev 0x%x, auth = %d\n",
+		  current->pid, cmd, nr, dev->device, priv->authenticated);
+
+	if (nr >= R128_IOCTL_COUNT) {
+		retcode = -EINVAL;
+	} else {
+		ioctl	  = &r128_ioctls[nr];
+		func	  = ioctl->func;
+
+		if (!func) {
+			DRM_DEBUG("no function\n");
+			retcode = -EINVAL;
+		} else if ((ioctl->root_only && !capable(CAP_SYS_ADMIN))
+			    || (ioctl->auth_needed && !priv->authenticated)) {
+			retcode = -EACCES;
+		} else {
+			retcode = (func)(inode, filp, cmd, arg);
+		}
+	}
+
+	atomic_dec(&dev->ioctl_count);
+	return retcode;
+}
+
+int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
+	      unsigned long arg)
+{
+        drm_file_t        *priv   = filp->private_data;
+        drm_device_t      *dev    = priv->dev;
+        DECLARE_WAITQUEUE(entry, current);
+        int               ret   = 0;
+        drm_lock_t        lock;
+#if DRM_DMA_HISTOGRAM
+        cycles_t          start;
+
+        dev->lck_start = start = get_cycles();
+#endif
+
+        copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT);
+
+        if (lock.context == DRM_KERNEL_CONTEXT) {
+                DRM_ERROR("Process %d using kernel context %d\n",
+                          current->pid, lock.context);
+                return -EINVAL;
+        }
+
+        DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
+                  lock.context, current->pid, dev->lock.hw_lock->lock,
+                  lock.flags);
+
+#if 0
+				/* dev->queue_count == 0 right now for
+                                   r128.  FIXME? */
+        if (lock.context < 0 || lock.context >= dev->queue_count)
+                return -EINVAL;
+#endif
+
+        if (!ret) {
+#if 0
+                if (_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)
+                    != lock.context) {
+                        long j = jiffies - dev->lock.lock_time;
+
+                        if (lock.context == r128_res_ctx.handle &&
+				j >= 0 && j < DRM_LOCK_SLICE) {
+                                /* Can't take lock if we just had it and
+                                   there is contention. */
+                                DRM_DEBUG("%d (pid %d) delayed j=%d dev=%d jiffies=%d\n",
+					lock.context, current->pid, j,
+					dev->lock.lock_time, jiffies);
+                                current->state = TASK_INTERRUPTIBLE;
+				current->policy |= SCHED_YIELD;
+                                schedule_timeout(DRM_LOCK_SLICE-j);
+				DRM_DEBUG("jiffies=%d\n", jiffies);
+                        }
+                }
+#endif
+                add_wait_queue(&dev->lock.lock_queue, &entry);
+                for (;;) {
+                        if (!dev->lock.hw_lock) {
+                                /* Device has been unregistered */
+                                ret = -EINTR;
+                                break;
+                        }
+                        if (drm_lock_take(&dev->lock.hw_lock->lock,
+                                          lock.context)) {
+                                dev->lock.pid       = current->pid;
+                                dev->lock.lock_time = jiffies;
+                                atomic_inc(&dev->total_locks);
+                                break;  /* Got lock */
+                        }
+
+                                /* Contention */
+                        atomic_inc(&dev->total_sleeps);
+                        current->state = TASK_INTERRUPTIBLE;
+#if 1
+			current->policy |= SCHED_YIELD;
+#endif
+                        schedule();
+                        if (signal_pending(current)) {
+                                ret = -ERESTARTSYS;
+                                break;
+                        }
+                }
+                current->state = TASK_RUNNING;
+                remove_wait_queue(&dev->lock.lock_queue, &entry);
+        }
+
+#if 0
+	if (!ret && dev->last_context != lock.context &&
+		lock.context != r128_res_ctx.handle &&
+		dev->last_context != r128_res_ctx.handle) {
+		add_wait_queue(&dev->context_wait, &entry);
+	        current->state = TASK_INTERRUPTIBLE;
+                /* PRE: dev->last_context != lock.context */
+	        r128_context_switch(dev, dev->last_context, lock.context);
+		/* POST: we will wait for the context
+                   switch and will dispatch on a later call
+                   when dev->last_context == lock.context
+                   NOTE WE HOLD THE LOCK THROUGHOUT THIS
+                   TIME! */
+		current->policy |= SCHED_YIELD;
+	        schedule();
+	        current->state = TASK_RUNNING;
+	        remove_wait_queue(&dev->context_wait, &entry);
+	        if (signal_pending(current)) {
+	                ret = -EINTR;
+	        } else if (dev->last_context != lock.context) {
+			DRM_ERROR("Context mismatch: %d %d\n",
+                        	dev->last_context, lock.context);
+	        }
+	}
+#endif
+
+        if (!ret) {
+                if (lock.flags & _DRM_LOCK_READY) {
+				/* Wait for space in DMA/FIFO */
+		}
+                if (lock.flags & _DRM_LOCK_QUIESCENT) {
+				/* Make hardware quiescent */
+#if 0
+                        r128_quiescent(dev);
+#endif
+		}
+        }
+
+#if 0
+	DRM_ERROR("pid = %5d, old counter = %5ld\n",
+		current->pid, current->counter);
+#endif
+	if (lock.context != r128_res_ctx.handle) {
+		current->counter = 5;
+		current->priority = DEF_PRIORITY/4;
+	}
+#if 0
+	while (current->counter > 25)
+		current->counter >>= 1; /* decrease time slice */
+	DRM_ERROR("pid = %5d, new counter = %5ld\n",
+		 current->pid, current->counter);
+#endif
+        DRM_DEBUG("%d %s\n", lock.context, ret ? "interrupted" : "has lock");
+
+#if DRM_DMA_HISTOGRAM
+        atomic_inc(&dev->histo.lacq[drm_histogram_slot(get_cycles() - start)]);
+#endif
+
+        return ret;
+}
+
+
+int r128_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
+		 unsigned long arg)
+{
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_device_t	  *dev	  = priv->dev;
+	drm_lock_t	  lock;
+
+	copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT);
+
+	if (lock.context == DRM_KERNEL_CONTEXT) {
+		DRM_ERROR("Process %d using kernel context %d\n",
+			  current->pid, lock.context);
+		return -EINVAL;
+	}
+
+	DRM_DEBUG("%d frees lock (%d holds)\n",
+		  lock.context,
+		  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
+	atomic_inc(&dev->total_unlocks);
+	if (_DRM_LOCK_IS_CONT(dev->lock.hw_lock->lock))
+		atomic_inc(&dev->total_contends);
+	drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
+				/* FIXME: Try to send data to card here */
+	if (!dev->context_flag) {
+		if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+
+#if 0
+	current->policy |= SCHED_YIELD;
+	current->state = TASK_INTERRUPTIBLE;
+	schedule_timeout(1000);
+#endif
+
+	if (lock.context != r128_res_ctx.handle) {
+		current->counter = 5;
+		current->priority = DEF_PRIORITY;
+	}
+#if 0
+	current->state = TASK_INTERRUPTIBLE;
+	schedule_timeout(10);
+#endif
+
+	return 0;
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h:1.2
--- /dev/null	Sat Jul  1 20:43:17 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h	Sun Jun 25 22:41:33 2000
@@ -0,0 +1,226 @@
+/* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
+ * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *          Kevin E. Martin <martin@valinux.com>
+ *
+ */
+
+#ifndef _R128_DRV_H_
+#define _R128_DRV_H_
+
+typedef struct drm_r128_private {
+	int               is_pci;
+
+	int               cce_mode;
+	int               cce_fifo_size;
+	int               cce_is_bm_mode;
+	int               cce_secure;
+
+	drm_r128_sarea_t *sarea_priv;
+
+	__volatile__ u32 *ring_read_ptr;
+
+	u32              *ring_start;
+	u32              *ring_end;
+	int               ring_size;
+	int               ring_sizel2qw;
+	int               ring_entries;
+
+	int               submit_age;
+
+	int               usec_timeout;
+
+	drm_map_t        *sarea;
+	drm_map_t        *fb;
+	drm_map_t        *agp_ring;
+	drm_map_t        *agp_read_ptr;
+	drm_map_t        *agp_vertbufs;
+	drm_map_t        *agp_indbufs;
+	drm_map_t        *agp_textures;
+	drm_map_t        *mmio;
+} drm_r128_private_t;
+
+typedef struct drm_r128_buf_priv {
+	u32               age;
+} drm_r128_buf_priv_t;
+
+				/* r128_drv.c */
+extern int  r128_init(void);
+extern void r128_cleanup(void);
+extern int  r128_version(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+extern int  r128_open(struct inode *inode, struct file *filp);
+extern int  r128_release(struct inode *inode, struct file *filp);
+extern int  r128_ioctl(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int  r128_lock(struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg);
+extern int  r128_unlock(struct inode *inode, struct file *filp,
+			 unsigned int cmd, unsigned long arg);
+
+				/* r128_dma.c */
+extern int r128_init_cce(struct inode *inode, struct file *filp,
+			 unsigned int cmd, unsigned long arg);
+extern int r128_eng_reset(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+extern int r128_eng_flush(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+extern int r128_submit_pkt(struct inode *inode, struct file *filp,
+			   unsigned int cmd, unsigned long arg);
+extern int r128_cce_idle(struct inode *inode, struct file *filp,
+			 unsigned int cmd, unsigned long arg);
+extern int r128_vertex_buf(struct inode *inode, struct file *filp,
+			   unsigned int cmd, unsigned long arg);
+
+				/* r128_bufs.c */
+extern int r128_addbufs(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int r128_mapbufs(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+
+				/* r128_context.c */
+extern int  r128_resctx(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int  r128_addctx(struct inode *inode, struct file *filp,
+		        unsigned int cmd, unsigned long arg);
+extern int  r128_modctx(struct inode *inode, struct file *filp,
+		        unsigned int cmd, unsigned long arg);
+extern int  r128_getctx(struct inode *inode, struct file *filp,
+		        unsigned int cmd, unsigned long arg);
+extern int  r128_switchctx(struct inode *inode, struct file *filp,
+			   unsigned int cmd, unsigned long arg);
+extern int  r128_newctx(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int  r128_rmctx(struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg);
+
+extern int  r128_context_switch(drm_device_t *dev, int old, int new);
+extern int  r128_context_switch_complete(drm_device_t *dev, int new);
+
+
+/* Register definitions, register access macros and drmAddMap constants
+ * for Rage 128 kernel driver.
+ */
+
+#define R128_PC_NGUI_CTLSTAT	0x0184
+#       define R128_PC_FLUSH_ALL	0x00ff
+#       define R128_PC_BUSY		(1 << 31)
+
+#define R128_CLOCK_CNTL_INDEX	0x0008
+#define R128_CLOCK_CNTL_DATA	0x000c
+#       define R128_PLL_WR_EN		(1 << 7)
+
+#define R128_MCLK_CNTL		0x000f
+#       define R128_FORCE_GCP		(1 << 16)
+#       define R128_FORCE_PIPE3D_CP	(1 << 17)
+#       define R128_FORCE_RCP		(1 << 18)
+
+#define R128_GEN_RESET_CNTL	0x00f0
+#       define R128_SOFT_RESET_GUI	(1 <<  0)
+
+#define R128_PM4_BUFFER_CNTL	0x0704
+#       define R128_PM4_NONPM4			(0  << 28)
+#       define R128_PM4_192PIO			(1  << 28)
+#       define R128_PM4_192BM			(2  << 28)
+#       define R128_PM4_128PIO_64INDBM		(3  << 28)
+#       define R128_PM4_128BM_64INDBM		(4  << 28)
+#       define R128_PM4_64PIO_128INDBM		(5  << 28)
+#       define R128_PM4_64BM_128INDBM		(6  << 28)
+#       define R128_PM4_64PIO_64VCBM_64INDBM	(7  << 28)
+#       define R128_PM4_64BM_64VCBM_64INDBM	(8  << 28)
+#       define R128_PM4_64PIO_64VCPIO_64INDPIO	(15 << 28)
+
+
+#define R128_PM4_BUFFER_DL_RPTR	0x0710
+#define R128_PM4_BUFFER_DL_WPTR	0x0714
+#       define R128_PM4_BUFFER_DL_DONE		(1 << 31)
+
+#define R128_PM4_VC_FPU_SETUP	0x071c
+
+#define R128_PM4_STAT		0x07b8
+#       define R128_PM4_FIFOCNT_MASK		0x0fff
+#       define R128_PM4_BUSY			(1 << 16)
+#       define R128_PM4_GUI_ACTIVE		(1 << 31)
+
+#define R128_PM4_BUFFER_ADDR	0x07f0
+#define R128_PM4_MICRO_CNTL	0x07fc
+#       define R128_PM4_MICRO_FREERUN		(1 << 30)
+
+#define R128_PM4_FIFO_DATA_EVEN	0x1000
+#define R128_PM4_FIFO_DATA_ODD	0x1004
+
+#define R128_GUI_SCRATCH_REG0	0x15e0
+#define R128_GUI_SCRATCH_REG1	0x15e4
+#define R128_GUI_SCRATCH_REG2	0x15e8
+#define R128_GUI_SCRATCH_REG3	0x15ec
+#define R128_GUI_SCRATCH_REG4	0x15f0
+#define R128_GUI_SCRATCH_REG5	0x15f4
+
+#define R128_GUI_STAT		0x1740
+#       define R128_GUI_FIFOCNT_MASK		0x0fff
+#       define R128_GUI_ACTIVE			(1 << 31)
+
+
+/* CCE command packets */
+#define R128_CCE_PACKET0	0x00000000
+#define R128_CCE_PACKET1	0x40000000
+#define R128_CCE_PACKET2	0x80000000
+#       define R128_CCE_PACKET_MASK		0xC0000000
+#       define R128_CCE_PACKET_COUNT_MASK	0x3fff0000
+#       define R128_CCE_PACKET0_REG_MASK	0x000007ff
+#       define R128_CCE_PACKET1_REG0_MASK	0x000007ff
+#       define R128_CCE_PACKET1_REG1_MASK	0x003ff800
+
+
+#define R128_MAX_USEC_TIMEOUT	100000	/* 100 ms */
+
+
+#define R128_BASE(reg)		((u32)(dev_priv->mmio->handle))
+#define R128_ADDR(reg)		(R128_BASE(reg) + reg)
+
+#define R128_DEREF(reg)		*(__volatile__ int *)R128_ADDR(reg)
+#define R128_READ(reg)		R128_DEREF(reg)
+#define R128_WRITE(reg,val)	do { R128_DEREF(reg) = val; } while (0)
+
+#define R128_DEREF8(reg)	*(__volatile__ char *)R128_ADDR(reg)
+#define R128_READ8(reg)		R128_DEREF8(reg)
+#define R128_WRITE8(reg,val)	do { R128_DEREF8(reg) = val; } while (0)
+
+#define R128_WRITE_PLL(addr,val)                                              \
+do {                                                                          \
+	R128_WRITE8(R128_CLOCK_CNTL_INDEX, ((addr) & 0x1f) | R128_PLL_WR_EN); \
+	R128_WRITE(R128_CLOCK_CNTL_DATA, (val));                              \
+} while (0)
+
+extern int R128_READ_PLL(drm_device_t *dev, int addr);
+
+#define R128CCE0(p,r,n)   ((p) | ((n) << 16) | ((r) >> 2))
+#define R128CCE1(p,r1,r2) ((p) | (((r2) >> 2) << 11) | ((r1) >> 2))
+#define R128CCE2(p)       ((p))
+#define R128CCE3(p,n)     ((p) | ((n) << 16))
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c:1.2	Tue Feb 22 20:47:30 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c	Fri Jun 16 17:03:39 2000
@@ -1,8 +1,8 @@
 /* tdfx_context.c -- IOCTLs for tdfx contexts -*- linux-c -*-
  * Created: Thu Oct  7 10:50:22 1999 by faith@precisioninsight.com
- * Revised: Sat Oct  9 23:39:56 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,8 +24,10 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c,v 1.2 2000/02/23 04:47:30 martin Exp $
- *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Daryll Strauss <daryll@valinux.com>
+ * 
  */
 
 #include <linux/sched.h>
@@ -38,9 +40,7 @@
 
 static int tdfx_alloc_queue(drm_device_t *dev)
 {
-	static int context = 0;
-
-	return ++context;	/* Should this reuse contexts in the future? */
+	return drm_ctxbitmap_next(dev);
 }
 
 int tdfx_context_switch(drm_device_t *dev, int old, int new)
@@ -137,6 +137,12 @@
 		ctx.handle = tdfx_alloc_queue(dev);
 	}
 	DRM_DEBUG("%d\n", ctx.handle);
+	if (ctx.handle == -1) {
+		DRM_DEBUG("Not enough free contexts.\n");
+				/* Should this return -EBUSY instead? */
+		return -ENOMEM;
+	}
+   
 	copy_to_user_ret((drm_ctx_t *)arg, &ctx, sizeof(ctx), -EFAULT);
 	return 0;
 }
@@ -193,13 +199,13 @@
 int tdfx_rmctx(struct inode *inode, struct file *filp, unsigned int cmd,
 	       unsigned long arg)
 {
+	drm_file_t      *priv   = filp->private_data;
+	drm_device_t    *dev    = priv->dev;
 	drm_ctx_t	ctx;
 
 	copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
 	DRM_DEBUG("%d\n", ctx.handle);
-				/* This is currently a noop because we
-				   don't reuse context values.  Perhaps we
-				   should? */
-	
+	drm_ctxbitmap_free(dev, ctx.handle);
+
 	return 0;
 }
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c:1.3 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c:1.4
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c:1.3	Tue Feb 22 20:47:31 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c	Fri Jun 16 17:03:39 2000
@@ -1,8 +1,8 @@
 /* tdfx.c -- tdfx driver -*- linux-c -*-
  * Created: Thu Oct  7 10:38:32 1999 by faith@precisioninsight.com
- * Revised: Tue Oct 12 08:51:35 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,10 +24,13 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.3 2000/02/23 04:47:31 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Daryll Strauss <daryll@valinux.com>
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "tdfx_drv.h"
@@ -37,9 +40,9 @@
 #define TDFX_NAME	 "tdfx"
 #define TDFX_DESC	 "tdfx"
 #define TDFX_DATE	 "19991009"
-#define TDFX_MAJOR	 0
+#define TDFX_MAJOR	 1
 #define TDFX_MINOR	 0
-#define TDFX_PATCHLEVEL  1
+#define TDFX_PATCHLEVEL  0
 
 static drm_device_t	      tdfx_device;
 drm_ctx_t	              tdfx_res_ctx;
@@ -85,6 +88,16 @@
 	[DRM_IOCTL_NR(DRM_IOCTL_LOCK)]	     = { tdfx_lock,	  1, 0 },
 	[DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)]     = { tdfx_unlock,	  1, 0 },
 	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]     = { drm_finish,	  1, 0 },
+#ifdef DRM_AGP
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)]   = {drm_agp_acquire, 1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)]   = {drm_agp_release, 1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)]    = {drm_agp_enable,  1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)]      = {drm_agp_info,    1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC)]     = {drm_agp_alloc,   1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)]      = {drm_agp_free,    1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)]      = {drm_agp_unbind,  1, 1},
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)]    = {drm_agp_bind,    1, 1},
+#endif
 };
 #define TDFX_IOCTL_COUNT DRM_ARRAY_SIZE(tdfx_ioctls)
 
@@ -228,7 +241,24 @@
 		}
 		dev->magiclist[i].head = dev->magiclist[i].tail = NULL;
 	}
-	
+#ifdef DRM_AGP
+				/* Clear AGP information */
+	if (dev->agp) {
+		drm_agp_mem_t *temp;
+		drm_agp_mem_t *temp_next;
+	   
+		temp = dev->agp->memory;
+		while(temp != NULL) {
+			temp_next = temp->next;
+			drm_free_agp(temp->memory, temp->pages);
+			drm_free(temp, sizeof(*temp), DRM_MEM_AGPLISTS);
+			temp = temp_next;
+		}
+		if(dev->agp->acquired) (*drm_agp.release)();
+		drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
+		dev->agp = NULL;
+	}
+#endif
 				/* Clear vma list (only built for debugging) */
 	if (dev->vmalist) {
 		for (vma = dev->vmalist; vma; vma = vma_next) {
@@ -262,6 +292,10 @@
 					       - PAGE_SHIFT,
 					       DRM_MEM_SAREA);
 				break;
+			case _DRM_AGP:
+				/* Do nothing here, because this is all
+                                   handled in the AGP/GART driver. */
+				break;
 			}
 			drm_free(map, sizeof(*map), DRM_MEM_MAPS);
 		}
@@ -309,6 +343,16 @@
 
 	drm_mem_init();
 	drm_proc_init(dev);
+#ifdef DRM_AGP
+	dev->agp    = drm_agp_init();
+#endif
+	if((retcode = drm_ctxbitmap_init(dev))) {
+		DRM_ERROR("Cannot allocate memory for context bitmap.\n");
+		drm_proc_cleanup();
+		misc_deregister(&tdfx_misc);
+		tdfx_takedown(dev);
+		return retcode;
+	}
 
 	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
 		 TDFX_NAME,
@@ -335,6 +379,7 @@
 	} else {
 		DRM_INFO("Module unloaded\n");
 	}
+	drm_ctxbitmap_cleanup(dev);
 	tdfx_takedown(dev);
 }
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h:1.2 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h:1.2	Tue Feb 22 20:47:31 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h	Fri Jun 16 17:03:39 2000
@@ -1,8 +1,8 @@
 /* tdfx_drv.h -- Private header for tdfx driver -*- linux-c -*-
  * Created: Thu Oct  7 10:40:04 1999 by faith@precisioninsight.com
- * Revised: Sat Oct  9 23:38:19 1999 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h,v 1.2 2000/02/23 04:47:31 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@precisioninsight.com>
+ *    Daryll Strauss <daryll@precisioninsight.com>
  * 
  */
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c:1.5 xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c:1.6
--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c:1.5	Tue Feb 22 20:47:31 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c	Fri Jun 16 17:03:39 2000
@@ -1,8 +1,8 @@
 /* vm.c -- Memory mapping for DRM -*- linux-c -*-
  * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
- * Revised: Mon Feb 14 00:16:45 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -24,7 +24,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c,v 1.5 2000/02/23 04:47:31 martin Exp $
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
 
@@ -246,13 +247,26 @@
 				/* Check for valid size. */
 	if (map->size != vma->vm_end - vma->vm_start) return -EINVAL;
 	
+	if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) {
+		vma->vm_flags &= VM_MAYWRITE;
+#if defined(__i386__)
+		pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
+#else
+				/* Ye gads this is ugly.  With more thought
+                                   we could move this up higher and use
+                                   `protection_map' instead.  */
+		vma->vm_page_prot = __pgprot(pte_val(pte_wrprotect(
+			__pte(pgprot_val(vma->vm_page_prot)))));
+#endif
+	}
 
 	switch (map->type) {
 	case _DRM_FRAME_BUFFER:
 	case _DRM_REGISTERS:
+	case _DRM_AGP:
 		if (VM_OFFSET(vma) >= __pa(high_memory)) {
 #if defined(__i386__)
-			if (boot_cpu_data.x86 > 3) {
+			if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
 				pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
 				pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
 			}
@@ -264,6 +278,10 @@
 				     vma->vm_end - vma->vm_start,
 				     vma->vm_page_prot))
 				return -EAGAIN;
+		DRM_DEBUG("   Type = %d; start = 0x%lx, end = 0x%lx,"
+			  " offset = 0x%lx\n",
+			  map->type,
+			  vma->vm_start, vma->vm_end, VM_OFFSET(vma));
 		vma->vm_ops = &drm_vm_ops;
 		break;
 	case _DRM_SHM:
@@ -276,19 +294,7 @@
 		return -EINVAL;	/* This should never happen. */
 	}
 	vma->vm_flags |= VM_LOCKED | VM_SHM; /* Don't swap */
-	if (map->flags & _DRM_READ_ONLY) {
-#if defined(__i386__)
-		pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
-#else
-				/* Ye gads this is ugly.  With more thought
-                                   we could move this up higher and use
-                                   `protection_map' instead.  */
-		vma->vm_page_prot = __pgprot(pte_val(pte_wrprotect(
-			__pte(pgprot_val(vma->vm_page_prot)))));
-#endif
-	}
 
-	
 #if LINUX_VERSION_CODE < 0x020203 /* KERNEL_VERSION(2,2,3) */
 				/* In Linux 2.2.3 and above, this is
 				   handled in do_mmap() in mm/mmap.c. */
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/int10/Imakefile:1.9 xc/programs/Xserver/hw/xfree86/os-support/linux/int10/Imakefile:1.10
--- xc/programs/Xserver/hw/xfree86/os-support/linux/int10/Imakefile:1.9	Mon Feb 14 18:00:15 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/int10/Imakefile	Fri Mar 31 14:55:54 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/Imakefile,v 1.9 2000/02/15 02:00:15 eich Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/Imakefile,v 1.10 2000/03/31 22:55:54 dawes Exp $
 
 #define IHaveModules
 
@@ -101,8 +101,6 @@
 	$(LN) linux/int10/LibraryTargetName(int10) . )
 
 InstallDriverSDKLibraryModule(int10,$(DRIVERSDKMODULEDIR),.)
-
-InstallDriverSDKNonExecFile(../../int10/xf86int10.h,$(DRIVERSDKINCLUDEDIR))
 
 #endif
 
Index: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c:1.8 xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c:1.11
--- xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c:1.8	Mon Feb 28 19:09:26 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c	Wed May 31 00:15:10 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.8 2000/02/29 03:09:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.11 2000/05/31 07:15:10 eich Exp $ */
 /*
  * linux specific part of the int10 module
  * Copyright 1999 Egbert Eich
@@ -62,7 +62,6 @@
     char *base;
     char *base_high;
     int pagesize;
-    int alloc_entries;
     legacyVGARec vga;
     
     screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
@@ -111,7 +110,6 @@
 	goto error0;
     pInt->mem = &linuxMem;
     pagesize = getpagesize();
-    alloc_entries = ALLOC_ENTRIES(pagesize);
     pInt->private = (pointer)xnfcalloc(1,sizeof(linuxInt10Priv));
     ((linuxInt10Priv*)pInt->private)->screen = screen;
     ((linuxInt10Priv*)pInt->private)->alloc = 
@@ -155,28 +153,24 @@
 #endif
     
     if (xf86IsEntityPrimary(entityIndex)) {
+	int size;
 	int cs = ((CARD16*)0)[(0x10<<1)+1];
 	CARD8 *bios_base = (unsigned char *)(cs << 4);
-	int size;
 	
-	xf86DrvMsg(screen,X_INFO,"Primary V_BIOS segment is: 0x%x\n",cs);
-	if (xf86ReadBIOS(cs << 4,0,bios_base, 0x10) < 0) {
-	    xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS\n");
-	    goto error3;
-	}
-	if (!(*bios_base == 0x55 && *(bios_base + 1) == 0xAA)) {
-	    xf86DrvMsg(screen,X_ERROR,"No V_BIOS found\n");
-	    goto error3;
-	}
-	size = *(bios_base + 2) * 512;
-	if (xf86ReadBIOS(cs << 4,0,bios_base, size) < 0) {
-	    xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS\n");
-	    goto error3;
-	}
-	if (bios_checksum(bios_base,size)) {
-	    xf86DrvMsg(screen,X_ERROR,"Bad checksum of V_BIOS \n");
-	    goto error3;
+	if (!int10_read_bios(screen,cs,bios_base)) {
+	    int cs = ((CARD16*)0)[(0x42<<1)+1];
+	    bios_base = (unsigned char *)(cs << 4);
+	    if (!int10_read_bios(screen,cs,bios_base)) {
+		cs = V_BIOS >> 4;
+		bios_base = (unsigned char *)(cs << 4);
+		if (!int10_read_bios(screen,cs,bios_base)) {
+		    xf86DrvMsg(screen,X_ERROR,"No V_BIOS found\n");
+		    goto error3;
+		}
+	    }
 	}
+	xf86DrvMsg(screen,X_INFO,"Primary V_BIOS segment is: 0x%x\n",cs);
+
 	pInt->BIOSseg = cs;
 	set_return_trap(pInt);
     } else {
@@ -430,7 +424,7 @@
 			 :"=a" (__res)
 			 :"n" ((int)113), "r" ((struct vm86_struct *)ptr));
 #else
-    __asm__ __volatile__("int $0x80"
+    __asm__ __volatile__("int $0x80\n\t"
 			 :"=a" (__res):"a" ((int)113),
 			 "b" ((struct vm86_struct *)ptr));
 #endif
Index: xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile:3.18 xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile:3.20
--- xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile:3.18	Sat Feb 12 19:36:09 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile	Tue Jun 27 07:27:30 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile,v 3.18 2000/02/13 03:36:09 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile,v 3.20 2000/06/27 14:27:30 tsi Exp $
 #include <Server.tmpl>
 
 #if !defined(PpcArchitecture)
@@ -17,15 +17,15 @@
 MOUSESRC = lynx_mouse.c
 MOUSEOBJ = lynx_mouse.o
 
-SRCS = lynx_init.c lynx_video.c lynx_io.c lynx_mmap.c mapVT_noop.c \
+SRCS = lynx_init.c lynx_video.c lynx_io.c lynx_mmap.c \
        VTsw_usl.c std_kbdEv.c posix_tty.c $(MOUSESRC) \
        $(IOPERM_SRCS) $(PPC_SRCS) libc_wrapper.c stdResource.c stdPci.c \
-       vidmem.c sigio.c pm_noop.c
+       vidmem.c sigio.c pm_noop.c kmod_noop.c
 
-OBJS = lynx_init.o lynx_video.o lynx_io.o lynx_mmap.o mapVT_noop.o \
+OBJS = lynx_init.o lynx_video.o lynx_io.o lynx_mmap.o \
        VTsw_usl.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
        $(IOPERM_OBJS) $(PPC_OBJS) libc_wrapper.o stdResource.o stdPci.o \
-       vidmem.o sigio.o pm_noop.o
+       vidmem.o sigio.o pm_noop.o kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC)
@@ -40,7 +40,6 @@
 #if !defined(PpcArchitecture)
 LinkSourceFile(ioperm_noop.c,../shared)
 #endif
-LinkSourceFile(mapVT_noop.c,../shared)
 LinkSourceFile(VTsw_usl.c,../shared)
 LinkSourceFile(std_kbdEv.c,../shared)
 LinkSourceFile(posix_tty.c,../shared)
@@ -50,5 +49,6 @@
 LinkSourceFile(vidmem.c,../shared)
 LinkSourceFile(sigio.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c:3.15 xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c:3.16
--- xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c:3.15	Fri Mar  3 12:02:20 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c	Mon Apr 17 09:30:13 2000
@@ -21,7 +21,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.15 2000/03/03 20:02:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.16 2000/04/17 16:30:13 eich Exp $ */
 
 #include "X.h"
 #include "input.h"
@@ -34,6 +34,8 @@
 
 #if defined(__powerpc__)
 #include <machine/absolute.h>
+
+void ppcPciIoMap(int bus);
 #endif
 
 #ifdef HAS_MTRR_SUPPORT
@@ -71,7 +73,7 @@
 #endif
 
 static void
-smemCleanup()
+smemCleanup(void)
 {
 	int i;
 
@@ -225,10 +227,13 @@
 #if defined(__powerpc__)
 
 volatile unsigned char *ioBase = MAP_FAILED;
+volatile unsigned char *pciConfBase = MAP_FAILED;
+
 static int IOEnabled;
 
+
 static void
-removeIOSmem()
+removeIOSmem(void)
 {
 	smem_create(NULL, (char *) ioBase, 0, SM_DETACH);
 	smem_remove("IOBASE");
@@ -239,7 +244,7 @@
 xf86EnableIO()
 {
 	if (IOEnabled++ == 0) {
-       		ioBase = (unsigned char *) smem_create("IOBASE",
+	    ioBase = (unsigned char *) smem_create("IOBASE",
        			(char *)0x80000000, 64*1024, SM_READ|SM_WRITE);
 	       	if (ioBase == MAP_FAILED) {
        			--IOEnabled;
@@ -256,19 +261,19 @@
 	if (!IOEnabled)
 		return;
 
-        if (--IOEnabled == 0) {
+        if (--IOEnabled == 0) 
         	removeIOSmem();
-        }
 	return;
 }
 
+#if 0
 void
-xf86DisableIOPrivs()
+xf86DisableIOPrivs(void)
 {
 	return;
 }
-
-void *
+#endif
+void
 ppcPciIoMap(int bus)
 {
 	xf86EnableIO();
@@ -280,7 +285,9 @@
 #ifdef HAS_MTRR_SUPPORT
 /* memory range (MTRR) support for LynxOS (taken from BSD MTRR support) */
 
-/* #define DEBUG	/* */
+#if 0
+#define DEBUG	
+#endif
 
 /*
  * This code is experimental.  Some parts may be overkill, and other parts
Index: xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile:3.1 xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile:3.3
--- xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile:3.1	Sun Dec 22 22:50:09 1996
+++ xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile	Tue Jun 27 07:27:30 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile,v 3.1 1996/12/23 06:50:09 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile,v 3.3 2000/06/27 14:27:30 tsi Exp $
 
 
 
@@ -13,11 +13,11 @@
 BIOS_MOD = bios_mmap
 #endif
 
-SRCS = mach_init.c mach_video.c mach_io.c $(BIOS_MOD).c mapVT_noop.c \
-       VTsw_noop.c
+SRCS = mach_init.c mach_video.c mach_io.c $(BIOS_MOD).c \
+       VTsw_noop.c kmod_noop.c
 
-OBJS = mach_init.o mach_video.o mach_io.o $(BIOS_MOD).o mapVT_noop.o \
-       VTsw_noop.o
+OBJS = mach_init.o mach_video.o mach_io.o $(BIOS_MOD).o \
+       VTsw_noop.o kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC)
@@ -28,8 +28,8 @@
 #if defined(OsfArchitecture)
 ObjectFromSpecialSource(bios_devmem,../shared/bios_devmem,/**/)
 #endif
-ObjectFromSpecialSource(mapVT_noop,../shared/mapVT_noop,/**/)
 ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/)
+ObjectFromSpecialSource(kmod_noop,../shared/kmod_noop,/**/)
 
 DependTarget()
 
Index: xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile:3.4 xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile:3.6
--- xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile:3.4	Sun Dec 22 22:50:15 1996
+++ xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile	Tue Jun 27 07:27:30 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile,v 3.4 1996/12/23 06:50:15 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile,v 3.6 2000/06/27 14:27:30 tsi Exp $
 
 
 
@@ -8,11 +8,11 @@
 
 #include <Server.tmpl>
 
-SRCS = mnx_init.c mnx_video.c mnx_io.c bios_devmem.c mapVT_noop.c \
-       ioperm_noop.c VTsw_noop.c std_mouse.c posix_tty.c
+SRCS = mnx_init.c mnx_video.c mnx_io.c bios_devmem.c \
+       ioperm_noop.c VTsw_noop.c std_mouse.c posix_tty.c kmod_noop.c
 
-OBJS = mnx_init.o mnx_video.o mnx_io.o bios_devmem.o mapVT_noop.o \
-       ioperm_noop.o VTsw_noop.o posix_tty.o
+OBJS = mnx_init.o mnx_video.o mnx_io.o bios_devmem.o \
+       ioperm_noop.o VTsw_noop.o posix_tty.o kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC)
@@ -21,9 +21,9 @@
 NormalLibraryObjectRule()
 NormalAsmObjectRule()
 
-ObjectFromSpecialSource(mapVT_noop,../shared/mapVT_noop,/**/)
 ObjectFromSpecialSource(ioperm_noop,../shared/ioperm_noop,/**/)
 ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/)
 ObjectFromSpecialSource(posix_tty,../shared/posix_tty,/**/)
+ObjectFromSpecialSource(kmod_noop,../shared/kmod_noop,/**/)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile:1.2 xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile:1.4
--- xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile:1.2	Sun Dec 26 16:45:44 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile	Tue Jun 27 07:27:30 2000
@@ -1,14 +1,14 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile,v 1.2 1999/12/27 00:45:44 robin Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile,v 1.4 2000/06/27 14:27:30 tsi Exp $
 XCOMM
 
 #include <Server.tmpl>
 
 
-SRCS = nto_io.c nto_init.c nto_kbdEv.c mapVT_noop.c nto_ioperm.c nto_video.c \
-       VTsw_noop.c posix_tty.c std_mseEv.c std_mouse.c
+SRCS = nto_io.c nto_init.c nto_kbdEv.c nto_ioperm.c nto_video.c \
+       VTsw_noop.c posix_tty.c std_mseEv.c std_mouse.c kmod_noop.c
 
-OBJS = nto_io.o nto_init.o nto_kbdEv.o mapVT_noop.o nto_ioperm.o nto_video.o \
-       VTsw_noop.o posix_tty.o std_mseEv.o std_mouse.o 
+OBJS = nto_io.o nto_init.o nto_kbdEv.o nto_ioperm.o nto_video.o \
+       VTsw_noop.o posix_tty.o std_mseEv.o std_mouse.o kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC)
@@ -18,10 +18,10 @@
 
 
 ObjectFromSpecialSource(IO_utils,../shared/IO_utils,/**/)
-ObjectFromSpecialSource(mapVT_noop,../shared/mapVT_noop,/**/)
 ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/)
 ObjectFromSpecialSource(posix_tty,../shared/posix_tty,/**/)
 ObjectFromSpecialSource(std_mseEv,../shared/std_mseEv,/**/)
 ObjectFromSpecialSource(std_mouse,../shared/std_mouse,/**/)
+ObjectFromSpecialSource(kmod_noop,../shared/kmod_noop,/**/)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile:3.14 xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile:3.16
--- xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile:3.14	Sat Feb 12 19:36:09 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile	Tue Jun 27 07:27:31 2000
@@ -4,20 +4,20 @@
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile,v 3.14 2000/02/13 03:36:09 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile,v 3.16 2000/06/27 14:27:31 tsi Exp $
 #include <Server.tmpl>
 
 BIOS_MOD = os2_bios
 
-SRCS = os2_init.c os2_video.c os2_io.c $(BIOS_MOD).c mapVT_noop.c \
+SRCS = os2_init.c os2_video.c os2_io.c $(BIOS_MOD).c \
        os2_ioperm.c os2_VTsw.c os2_mouse.c os2_KbdEv.c os2_stubs.c \
        os2_select.c os2_diag.c libc_wrapper.c stdResource.c stdPci.c \
-       vidmem.c sigiostubs.c pm_noop.c
+       vidmem.c sigiostubs.c pm_noop.c kmod_noop.c
 
-OBJS = os2_init.o os2_video.o os2_io.o $(BIOS_MOD).o mapVT_noop.o \
+OBJS = os2_init.o os2_video.o os2_io.o $(BIOS_MOD).o \
        os2_ioperm.o os2_VTsw.o os2_mouse.o os2_kbdEv.o os2_stubs.o \
        os2_select.o os2_diag.o libc_wrapper.o stdResource.o stdPci.o \
-       vidmem.o sigiostubs.o pm_noop.o
+       vidmem.o sigiostubs.o pm_noop.o kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC)
@@ -30,7 +30,6 @@
 NormalLibraryObjectRule()
 NormalAsmObjectRule()
 
-LinkSourceFile(mapVT_noop.c,../shared)
 LinkSourceFile(VTsw_noop.c,../shared)
 LinkSourceFile(libc_wrapper.c,../shared)
 LinkSourceFile(stdResource.c,../shared)
@@ -38,5 +37,6 @@
 LinkSourceFile(vidmem.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_VTsw.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/os2_VTsw.c:3.9 xc/programs/Xserver/hw/xfree86/os-support/os2/os2_VTsw.c:3.10
--- xc/programs/Xserver/hw/xfree86/os-support/os2/os2_VTsw.c:3.9	Thu Apr 29 02:13:47 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/os2_VTsw.c	Wed Apr  5 11:13:51 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_VTsw.c,v 3.9 1999/04/29 09:13:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_VTsw.c,v 3.10 2000/04/05 18:13:51 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
  * Modified 1996 by Sebastien Marineau <marineau@genie.uottawa.ca>
@@ -190,13 +190,47 @@
 /* End of thread */
 }
 
-void os2ServerVideoAccess()
+static BOOL is_redirected = FALSE;
+
+static void 
+redirect_output(void) 
+{
+	/* hv300996 create redirect file on boot drive, instead 
+	 * anywhere you are just standing
+	 */
+	char buf[20],dr[3];
+	ULONG drive;
+	APIRET rc;
+
+	if (is_redirected) return;
+
+	if ((rc = DosQuerySysInfo(5,5,&drive,sizeof(drive))) != 0)
+		dr[0] = 0;
+	else {	
+		dr[0] = drive+96;
+		dr[1] = ':';
+		dr[2] = 0;
+	}
+	sprintf(buf,"%s\\xf86log.os2",dr);
+
+	ErrorF("\nThis is the XFree86/OS2-4.0 server\n");
+	ErrorF("\nAll output from now on will be redirected to %s\n",buf);
+	freopen(buf,"w",stderr); 
+
+	is_redirected = TRUE;
+}
+
+void 
+os2ServerVideoAccess()
 {
    APIRET rc;
    ULONG fgSession;
    ULONG length=4;
    CHAR Status;
 
+   /* Redirect output as early as possible */
+   redirect_output();
+  
 /* Wait for screen access. This is called at server reset or at server startup */
 /* Here we do some waiting until this session comes in the foreground before *
  * going any further. This is because we may have been started in the bg      */
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_bios.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/os2_bios.c:3.9 xc/programs/Xserver/hw/xfree86/os-support/os2/os2_bios.c:3.10
--- xc/programs/Xserver/hw/xfree86/os-support/os2/os2_bios.c:3.9	Mon Dec 13 19:38:55 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/os2_bios.c	Wed Apr  5 11:13:52 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_bios.c,v 3.9 1999/12/14 03:38:55 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_bios.c,v 3.10 2000/04/05 18:13:52 dawes Exp $ */
 /*
  * (c) Copyright 1994 by Holger Veit
  *			<Holger.Veit@gmd.de>
@@ -107,7 +107,7 @@
  		Len -= chunksz;
  		rc = doioctl(fd,(ULONG)Phys_address,chunksz,dta+off);
  		if (rc != 0) {
- 			ErrorF("xf86ReadBIOS: BIOS map failed, addr=%lx, rc=%d\n",
+ 			FatalError("xf86ReadBIOS: BIOS map failed, addr=%lx, rc=%d\n",
  			Phys_address,rc);
  			xfree(dta);
  			DosClose(fd);
@@ -120,11 +120,13 @@
 	 * Sanity check... No longer fatal, as some PS/1 and PS/2 fail here but still work.
 	 * S. Marineau, 10/10/96
          */
+#if 0
 	if ((Phys_address & 0x7fff) != 0 && 
 		(dta[0] != 0x55 || dta[1] != 0xaa)) {
 		FatalError("BIOS sanity check failed, addr=%x\nPlease report if you encounter problems\n",
 			Phys_address);
 	}
+#endif
 
 	/* copy data to buffer */
  	memcpy(Buf, dta, lensave);
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_diag.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/os2_diag.c:3.6 xc/programs/Xserver/hw/xfree86/os-support/os2/os2_diag.c:3.7
--- xc/programs/Xserver/hw/xfree86/os-support/os2/os2_diag.c:3.6	Thu Apr 29 02:13:48 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/os2_diag.c	Wed Apr  5 11:13:52 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_diag.c,v 3.6 1999/04/29 09:13:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_diag.c,v 3.7 2000/04/05 18:13:52 dawes Exp $ */
 /*
  * (c) Copyright 1997 by Holger Veit
  *			<Holger.Veit@gmd.de>
@@ -59,7 +59,8 @@
 static BOOL diag_checks = FALSE;
 
 /* from Eberhard to check for the right EMX version */
-static void check_emx (void)
+static void 
+check_emx (void)
 {
 	ULONG rc;
 	HMODULE hmod;
@@ -80,7 +81,8 @@
         }
 }
 
-static void check_bsl(const char *var)
+static void 
+check_bsl(const char *var)
 {
 	char *t1 = strrchr(var,'\\');
 	if (strchr(var,'/')) {
@@ -96,7 +98,8 @@
 }
 
 
-static void check_fsl(const char *var)
+static void 
+check_fsl(const char *var)
 {
 	char *t1 = strrchr(var,'/');
 	if (strchr(var,'\\')) {
@@ -107,7 +110,8 @@
 }
 
 
-static void check_long(const char* path)
+static void 
+check_long(const char* path)
 {
 	FILE *f;
 	char n[300];
@@ -124,7 +128,8 @@
 	}
 }
 
-char *check_env_present(const char *env)
+static char *
+check_env_present(const char *env)
 {
 	char *e = getenv(env);
 	if (!e) {
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c:3.13 xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c:3.14
--- xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c:3.13	Thu Apr 29 02:13:49 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c	Wed Apr  5 11:13:52 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c,v 3.13 1999/04/29 09:13:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c,v 3.14 2000/04/05 18:13:52 dawes Exp $ */
 /*
  * (c) Copyright 1994,1999 by Holger Veit
  *			<Holger.Veit@gmd.de>
@@ -141,6 +141,7 @@
 	return -1;
 }
 
+#if 0 /*OBSOLETE*/
 void xf86MouseInit(mouse)
 MouseDevPtr mouse;
 {
@@ -163,7 +164,9 @@
 	if (rc == 0)
 		xf86Msg(X_INFO,"OsMouse has %d button(s).\n",nbut);
 }
+#endif
 
+#if 0 /*OBSOLETE*/
 int xf86MouseOn(mouse)
 MouseDevPtr mouse;
 {
@@ -194,10 +197,12 @@
 	return (mouse->mseFd);
 #endif
 }
+#endif
 
+#if 0 /*OBSOLETE*/
 /* This table is a bit irritating, because these mouse types are infact
  * defined in the OS/2 kernel, but I want to force the user to put
- * ïOsMouseï in the config file, and not worry about the particular mouse
+ * "OsMouse" in the config file, and not worry about the particular mouse
  * type that is connected.
  */
 Bool xf86SupportedMouseTypes[] =
@@ -214,3 +219,4 @@
 
 int xf86NumMouseTypes = sizeof(xf86SupportedMouseTypes) /
 			sizeof(xf86SupportedMouseTypes[0]);
+#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_mouse.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/os2_mouse.c:3.15 xc/programs/Xserver/hw/xfree86/os-support/os2/os2_mouse.c:3.16
--- xc/programs/Xserver/hw/xfree86/os-support/os2/os2_mouse.c:3.15	Thu Apr 29 02:13:50 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/os2_mouse.c	Wed Apr  5 11:13:53 2000
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_mouse.c,v 3.15 1999/04/29 09:13:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_mouse.c,v 3.16 2000/04/05 18:13:53 dawes Exp $ */
 /*
- * (c) Copyright 1994,1999 by Holger Veit
+ * (c) Copyright 1994,1999,2000 by Holger Veit
  *			<Holger.Veit@gmd.de>
  * Modified (c) 1996 Sebastien Marineau <marineau@genie.uottawa.ca>
  *
@@ -48,167 +48,83 @@
 #include "xf86_OSlib.h"
 #include "xf86Config.h"
 
-extern int miPointerGetMotionEvents(DeviceIntPtr pPtr, xTimecoord *coords,
-				    unsigned long start, unsigned long stop,
-				    ScreenPtr pScreen);
+#include "xf86Xinput.h"
+#include "xf86OSmouse.h"
+#include "mipointer.h"
 
-HMOU hMouse=65535;
-HEV hMouseSem;
-HQUEUE hMouseQueue;
-int MouseTid;
-BOOL HandleValid=FALSE;
-extern BOOL SwitchedToWPS;
-extern CARD32 LastSwitchTime;
-void os2MouseEventThread();
-
-int xf86MouseOff(MouseDevPtr mouse, Bool doclose)
+static int
+SupportedInterfaces(void)
 {
-	return -1;
+	return MSE_MISC;
 }
 
-void xf86SetMouseSpeed(MouseDevPtr mouse, int old, int new, unsigned cflag)
-{
-	/* not required */
-}
+static const char* internalNames[] = {
+	"OS2Mouse",
+	NULL
+};
 
-void xf86OsMouseOption(token, lex_ptr)
-int token;
-pointer lex_ptr;
+static const char**
+BuiltinNames(void)
 {
-	/* no options, anything seen ignored */
+	return internalNames;
 }
 
-/* almost everything stolen from sco_mouse.c */
-int xf86OsMouseProc(DeviceIntPtr pPointer, int what)
+static Bool
+CheckProtocol(const char *protocol)
 {
-	APIRET rc = 0;
-	USHORT nbutton, state;
-	unsigned char *map;
 	int i;
-	MouseDevPtr priv = (MouseDevPtr)((DeviceIntPtr)pPointer)->public.devicePrivate;
-
-	switch (what) {
-	case DEVICE_INIT: 
-		pPointer->public.on = FALSE;
-		if (hMouse == 65535) 
-			rc = MouOpen((PSZ)0, &hMouse);
-		if (rc != 0)
-			FatalError("Cannot open mouse, rc=%d\n", rc);
-		xf86Info.mouseDev->mseFd = -1;
-
-		/* flush mouse queue */
-		MouFlushQue(hMouse);
 
-		/* check buttons */
-		rc = MouGetNumButtons(&nbutton, hMouse);
-		if (rc == 0)
-			xf86Msg(X_INFO,
-				"OsMouse has %d button(s).\n",nbutton);
-		if (nbutton==2) nbutton++;
-		map = xalloc(nbutton + 1);
-		if (map == 0)
-			FatalError("Failed to allocate OsMouse map structure\n");
-
-		for (i = 1; i<=nbutton; i++)
-			map[i] = i;
-
-		InitPointerDeviceStruct((DevicePtr)pPointer, map, nbutton,
-			miPointerGetMotionEvents, (PtrCtrlProcPtr)xf86MseCtrl,
-			miPointerGetMotionBufferSize());
-
-		xfree(map);
-
-#ifdef XINPUT
-		InitValuatorAxisStruct(pPointer,
-                             0,
-                             0, /* min val */
-                             screenInfo.screens[0]->width, /* max val */
-                             1, /* resolution */
-                             0, /* min_res */
-                             1); /* max_res */
-		InitValuatorAxisStruct(pPointer,
-                             1,
-                             0, /* min val */
-                             screenInfo.screens[0]->height, /* max val */
-                             1, /* resolution */
-                             0, /* min_res */
-                             1); /* max_res */
-		/* Initialize valuator values in synch
-		 * with dix/event.c DefineInitialRootWindow
-		 */
-		*pPointer->valuator->axisVal = screenInfo.screens[0]->width / 2;
-		*(pPointer->valuator->axisVal+1) = screenInfo.screens[0]->height / 2;
-#endif
+	for (i = 0; internalNames[i]; i++)
+	if (xf86NameCmp(protocol, internalNames[i]) == 0)
+		return TRUE;
+	return FALSE;
+}
 
-	         /* OK, we are ready to start up the mouse thread ! */
-                if (!HandleValid) {
-                	rc = DosCreateEventSem(NULL,&hMouseSem,DC_SEM_SHARED,TRUE);
-			if (rc != 0)
-				FatalError("xf86OpenMouse: could not create mouse queue semaphore, rc=%d\n",rc);
-			MouseTid = _beginthread(os2MouseEventThread,NULL,0x4000,(void *)NULL);
-			xf86Msg(X_INFO,
-				"Started Mouse event thread, Tid=%d\n",MouseTid);
-			DosSetPriority(2,3,0,MouseTid);
-		}
-		HandleValid=TRUE;
-		break;
-      
-	case DEVICE_ON:
-		/*AddEnabledDevice(xf86Info.mouseDev->mseFd);*/
-		if (!HandleValid) return -1;
-		xf86Info.mouseDev->lastButtons = 0;
-		xf86Info.mouseDev->emulateState = 0;
-		pPointer->public.on = TRUE;
-		state = 0x300;
-		rc = MouSetDevStatus(&state,hMouse);
-		state = 0x7f;
-		rc = MouSetEventMask(&state,hMouse);
-		MouFlushQue(hMouse);
-		break;
+static const char *
+DefaultProtocol(void)
+{
+	return "OS2Mouse";
+}
 
-	case DEVICE_CLOSE:
-	case DEVICE_OFF:
-		if (!HandleValid) return -1;
-		pPointer->public.on = FALSE;
-		state = 0x300;
-		MouSetDevStatus(&state,hMouse);
-		state = 0;
-		MouSetEventMask(&state,hMouse);
-		/*RemoveEnabledDevice(xf86Info.mouseDev->mseFd);*/
-		if (what == DEVICE_CLOSE) {
-/* Comment out for now as this seems to break server */
-#if 0
-			MouClose(hMouse);
-			hMouse = 65535;
-			xf86Info.mouseDev.mseFd = -1;
-		        HandleValid = FALSE;
-#endif
-		}
-		break;
-	}
-	return Success;
+static const char *
+SetupAuto(InputInfoPtr pInfo, int *protoPara)
+{
+	return "OS2Mouse";
 }
 
-void xf86OsMouseEvents()
+HMOU hMouse=65535;
+HEV hMouseSem;
+HQUEUE hMouseQueue;
+InputInfoPtr iinfoPtr;
+int MouseTid;
+BOOL HandleValid=FALSE;
+extern BOOL SwitchedToWPS;
+extern CARD32 LastSwitchTime;
+void os2MouseEventThread(void* arg);
+
+static void
+os2MouseReadInput(InputInfoPtr pInfo)
 {
 	APIRET rc;
 	ULONG postCount,dataLength;
 	PVOID dummy;
 	int buttons;
 	int state;
-	int i, col, row;
+	int i, dx,dy;
 	BYTE elemPriority;
 	REQUESTDATA requestData;
 
+	MouseDevPtr pMse = pInfo->private;
+
 	if (!HandleValid) return;
 	while((rc = DosReadQueue(hMouseQueue,
 				 &requestData,&dataLength,&dummy, 
 				 0L,1L,&elemPriority,hMouseSem)) == 0) {
-		col = requestData.ulData;
+		dx = requestData.ulData;
 		(void)DosReadQueue(hMouseQueue,
 				  &requestData,&dataLength,&dummy,
 				  0L,1L,&elemPriority,hMouseSem);
-		row = requestData.ulData;
+		dy = requestData.ulData;
 		(void)DosReadQueue(hMouseQueue,
 				  &requestData,&dataLength,&dummy,
 				  0L,1L,&elemPriority,hMouseSem);
@@ -228,73 +144,252 @@
 		buttons = ((state & 0x06) ? 4 : 0) |
 			  ((state & 0x18) ? 1 : 0) |
 			  ((state & 0x60) ? 2 : 0);
-		xf86PostMseEvent(xf86Info.pMouse, buttons, col, row);
+		pMse->PostEvent(pInfo, buttons, dx, dy, 0, 0);
 	}
         DosResetEventSem(hMouseSem,&postCount);
-	xf86Info.inputPending = TRUE;
+}
+
+int os2MouseProc(DeviceIntPtr pPointer, int what)
+{
+    APIRET rc = 0;
+    USHORT nbuttons, state;
+    unsigned char map[MSE_MAXBUTTONS + 1];
+    int i;
+
+    InputInfoPtr pInfo = pPointer->public.devicePrivate;
+    MouseDevPtr pMse = pInfo->private;
+    pMse->device = pPointer;
+
+    switch (what) {
+    case DEVICE_INIT: 
+	pPointer->public.on = FALSE;
+	if (hMouse == 65535) 
+	    rc = MouOpen((PSZ)0, &hMouse);
+	if (rc != 0)
+	    xf86Msg(X_WARNING,"%s: cannot open mouse, rc=%d\n", 
+		    pInfo->name,rc);
+	else {
+	    pInfo->fd = hMouse;
+
+	    /* flush mouse queue */
+	    MouFlushQue(hMouse);
+
+	    /* check buttons */
+	    rc = MouGetNumButtons(&nbuttons, hMouse);
+	    if (rc == 0)
+		xf86Msg(X_INFO,"%s: Mouse has %d button(s).\n",
+			pInfo->name,nbuttons);
+	    if (nbuttons==2) nbuttons++;
+
+	    for (i = 1; i<=nbuttons; i++)
+		map[i] = i;
+
+	    InitPointerDeviceStruct((DevicePtr)pPointer, map, nbuttons,
+		miPointerGetMotionEvents, pMse->Ctrl,
+		miPointerGetMotionBufferSize());
+
+	    /* X valuator */
+	    xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1);
+	    xf86InitValuatorDefaults(pPointer, 0);
+	    /* y Valuator */
+	    InitValuatorAxisStruct(pPointer, 1, 0, -1, 1, 0, 1);
+	    xf86InitValuatorDefaults(pPointer, 1);
+	    xf86MotionHistoryAllocate(pInfo);
+
+	    /* OK, we are ready to start up the mouse thread ! */
+	    if (!HandleValid) {
+		rc = DosCreateEventSem(NULL,&hMouseSem,DC_SEM_SHARED,TRUE);
+		if (rc != 0)
+		    xf86Msg(X_ERROR,"%s: could not create mouse queue semaphore, rc=%d\n",
+			    pInfo->name,rc);
+		MouseTid = _beginthread(os2MouseEventThread,NULL,0x4000,(void *)pInfo);
+		xf86Msg(X_INFO,
+			"%s: Started Mouse event thread, Tid=%d\n",
+			pInfo->name, MouseTid);
+		DosSetPriority(2,3,0,MouseTid);
+	    }
+	    HandleValid=TRUE;
+	}
+	break;
+      
+    case DEVICE_ON:
+	if (!HandleValid) return -1;
+	pMse->lastButtons = 0;
+	pMse->emulateState = 0;
+	pPointer->public.on = TRUE;
+	state = 0x300;
+	rc = MouSetDevStatus(&state,hMouse);
+	state = 0x7f;
+	rc = MouSetEventMask(&state,hMouse);
+	MouFlushQue(hMouse);
+	break;
+
+    case DEVICE_CLOSE:
+    case DEVICE_OFF:
+	if (!HandleValid) return -1;
+	pPointer->public.on = FALSE;
+	state = 0x300;
+	MouSetDevStatus(&state,hMouse);
+	state = 0;
+	MouSetEventMask(&state,hMouse);
+	if (what == DEVICE_CLOSE) {
+/* Comment out for now as this seems to break server */
+#if 0
+	    MouClose(hMouse);
+	    hMouse = 65535;
+	    pInfo->fd = -1;
+	    HandleValid = FALSE;
+#endif
+	}
+	break;
+    }
+    return Success;
 }
 
 int os2MouseQueueQuery()
 {
-	/* Now we check for activity on mouse handles */
-	ULONG numElements,postCount;
+    /* Now we check for activity on mouse handles */
+    ULONG numElements,postCount;
 
-        if (!HandleValid) return(1);
-        DosResetEventSem(hMouseSem,&postCount);
-        (void)DosQueryQueue(hMouseQueue,&numElements);
-	if (numElements>0) {     /* Something in mouse queue! */
-		return 0;  /* Will this work? */
-	}
-        return 1;
+    if (!HandleValid) return(1);
+    DosResetEventSem(hMouseSem,&postCount);
+    (void)DosQueryQueue(hMouseQueue,&numElements);
+    if (numElements>0) {     /* Something in mouse queue! */
+	return 0;  /* Will this work? */
+    }
+    return 1;
 }
 
 void os2MouseEventThread(void *arg)
 {
+    APIRET rc;
+    MOUEVENTINFO mev;
+    ULONG queueParam;
+    USHORT waitflg;
+    char queueName[128];
+    MouseDevPtr pMse;
+
+    iinfoPtr = (InputInfoPtr)arg;
+    pMse = iinfoPtr->private;
+
+    sprintf(queueName,"\\QUEUES\\XF86MOU\\%d",getpid());
+    rc = DosCreateQueue(&hMouseQueue,0L,queueName);
+    xf86Msg(X_INFO,"Mouse Queue created, rc=%d\n",rc);
+    (void)DosPurgeQueue(hMouseQueue);
+
+    while(1) {
+	waitflg = 1;
+	rc = MouReadEventQue(&mev,&waitflg,hMouse);
+	if (rc) {
+	    xf86Msg(X_ERROR,
+		    "Bad return code from mouse driver, rc=%d\n",
+		    rc);
+	    xf86Msg(X_ERROR,"Mouse aborting!\n");
+	    break;
+	}
+
+	queueParam = mev.col;
+	if ((rc = DosWriteQueue(hMouseQueue,queueParam,0L,NULL,0L)))
+		break;
+	queueParam = mev.row;
+	if ((rc = DosWriteQueue(hMouseQueue,queueParam,0L,NULL,0L)))
+ 		break;
+        queueParam = mev.fs;
+	if ((rc = DosWriteQueue(hMouseQueue,queueParam,0L,NULL,0L)))
+		break;
+	queueParam = 0xFFFFFFFF;
+	if ((rc = DosWriteQueue(hMouseQueue,queueParam,0L,NULL,0L)))
+		break;
+    }
+    xf86Msg(X_ERROR,
+        "An unrecoverable error in mouse queue has occured, rc=%d. Mouse is shutting down.\n",
+        rc);
+    DosCloseQueue(hMouseQueue);
+}
+
+
+static Bool
+os2MousePreInit(InputInfoPtr pInfo, const char* protocol, int flags) 
+{
+    MouseDevPtr pMse = pInfo->private;
+
+    pMse->protocol = protocol;
+    xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
+
+    /* Collect the options, and process the common options. */
+    xf86CollectInputOptions(pInfo, NULL, NULL);
+    xf86ProcessCommonOptions(pInfo, pInfo->options);
+
+    /* Process common mouse options (like Emulate3Buttons, etc). */
+    pMse->CommonOptions(pInfo);
+
+    /* Setup the local procs. */
+    pInfo->device_control = os2MouseProc;
+    pInfo->read_input = os2MouseReadInput;
+
+    pInfo->flags |= XI86_CONFIGURED;
+    return TRUE;
+}
+
+OSMouseInfoPtr
+xf86OSMouseInit(int flags)
+{
+    OSMouseInfoPtr p;
+
+    p = xcalloc(sizeof(OSMouseInfoRec), 1);
+    if (!p)
+        return NULL;
+    p->SupportedInterfaces = SupportedInterfaces;
+    p->BuiltinNames = BuiltinNames;
+    p->DefaultProtocol = DefaultProtocol;
+    p->CheckProtocol = CheckProtocol;
+    p->PreInit = os2MousePreInit;
+    p->SetupAuto = SetupAuto;
+    return p;
+}
+
+void xf86OsMouseEvents()
+{
 	APIRET rc;
-	MOUEVENTINFO mev;
-	ULONG queueParam;
-	USHORT waitflg;
-	char queueName[128];
-
-	sprintf(queueName,"\\QUEUES\\XF86MOU\\%d",getpid());
-	rc = DosCreateQueue(&hMouseQueue,0L,queueName);
-	xf86Msg(X_INFO,"Mouse Queue created, rc=%d\n",rc);
-	(void)DosPurgeQueue(hMouseQueue);
-
-	while(1) {
-		waitflg = 1;
-		rc = MouReadEventQue(&mev,&waitflg,hMouse);
-		if (rc) {
+	ULONG postCount,dataLength;
+	PVOID dummy;
+	int buttons;
+	int state;
+	int i, dx,dy;
+	BYTE elemPriority;
+	REQUESTDATA requestData;
+
+	MouseDevPtr pMse = iinfoPtr->private;
+
+	if (!HandleValid) return;
+	while((rc = DosReadQueue(hMouseQueue,
+				 &requestData,&dataLength,&dummy, 
+				 0L,1L,&elemPriority,hMouseSem)) == 0) {
+		dx = requestData.ulData;
+		(void)DosReadQueue(hMouseQueue,
+				  &requestData,&dataLength,&dummy,
+				  0L,1L,&elemPriority,hMouseSem);
+		dy = requestData.ulData;
+		(void)DosReadQueue(hMouseQueue,
+				  &requestData,&dataLength,&dummy,
+				  0L,1L,&elemPriority,hMouseSem);
+		state = requestData.ulData;
+		(void)DosReadQueue(hMouseQueue,
+				  &requestData,&dataLength,&dummy,
+				  0L,1L,&elemPriority,hMouseSem);
+		if (requestData.ulData != 0xFFFFFFFF) 
 			xf86Msg(X_ERROR,
-				"Bad return code from mouse driver, rc=%d\n",
-				rc);
-			xf86Msg(X_ERROR,"Mouse aborting!\n");
-			break;
-		}
-
-		/* Format of mouse packet is the following: 
-		 * first queued message is mev.col,
-		 * second is mev.row,
-		 * third is state and 
-		 * last is FFFFFFFF for "end-of-record". 
-		 * We could pack this better but it is a good start... 
-		 */
-
-		queueParam = mev.col;
-		rc = DosWriteQueue(hMouseQueue,queueParam,0L,NULL,0L);
-		if (rc) break;
-		queueParam = mev.row;
-		rc = DosWriteQueue(hMouseQueue,queueParam,0L,NULL,0L);
-		if (rc) break;
-		queueParam = mev.fs;
-		rc = DosWriteQueue(hMouseQueue,queueParam,0L,NULL,0L);
-		if (rc) break;
-		queueParam = 0xFFFFFFFF;
-		rc = DosWriteQueue(hMouseQueue,queueParam,0L,NULL,0L);
-		if (rc) break;
+				"Unexpected mouse event tag, %d\n",
+				requestData.ulData);
+
+		/* Contrary to other systems, OS/2 has mouse buttons *
+		 * in the proper order, so we reverse them before    *
+		 * sending the event.                                */
+		 
+		buttons = ((state & 0x06) ? 4 : 0) |
+			  ((state & 0x18) ? 1 : 0) |
+			  ((state & 0x60) ? 2 : 0);
+		pMse->PostEvent(iinfoPtr, buttons, dx, dy, 0, 0);
 	}
-	xf86Msg(X_ERROR,
-		"An unrecoverable error in mouse queue has occured, rc=%d. Mouse is shutting down.\n",
-		rc);
-	DosCloseQueue(hMouseQueue);
+        DosResetEventSem(hMouseSem,&postCount);
 }
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.c:3.7 xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.c:3.8
--- xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.c:3.7	Thu Apr 29 02:13:50 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.c	Wed Apr  5 11:13:53 2000
@@ -3,7 +3,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.c,v 3.7 1999/04/29 09:13:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_select.c,v 3.8 2000/04/05 18:13:53 dawes Exp $ */
 
 /*
  * (c) Copyright 1996 by Sebastien Marineau
@@ -45,21 +45,22 @@
 #include <sys/errno.h>
 #include <emx/io.h>
 
+#define I_NEED_OS2_H
 #define INCL_DOSSEMAPHORES
 #define INCL_DOSPROFILE
 #define INCL_DOSPROCESS
 #define INCL_DOSFILEMGR
 #define INCL_DOSMISC
 #define INCL_DOSMODULEMGR
-#include <os2.h>
 
-#include "os2_select.h"
 
 #include "Xpoll.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 
+#include "os2_select.h"
+
 int os2MouseQueueQuery();
 int os2KbdQueueQuery();
 void os2RecoverFromPopup();
@@ -337,7 +338,7 @@
                 sd->socket_nwrite, 0, 0);
 
         if(e == 0) return(e);
-/* We have something ready? */
+	/* We have something ready? */
         if(e>0){
             j = 0; n = 0;
             for (i = 0; i < sd->socket_nread; ++i, ++j)
@@ -370,10 +371,10 @@
 struct select_data *sd;
 fd_set *readfds,*writefds;
 {
-int i,e;
-ULONG ulPostCount;
-PIPESEMSTATE pipeSemState[128];
-APIRET rc;
+	int i,e;
+	ULONG ulPostCount;
+	PIPESEMSTATE pipeSemState[128];
+	APIRET rc;
         e = 0;
         rc = DosResetEventSem(hPipeSem,&ulPostCount);
         rc = DosQueryNPipeSemState((HSEM) hPipeSem, (PPIPESEMSTATE)&pipeSemState, 
@@ -404,8 +405,8 @@
             i++;
             } /* endwhile */
 
-errno = 0;
-return(e);
+	errno = 0;
+	return(e);
 }
 
 
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_serial.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/os2_serial.c:1.2 xc/programs/Xserver/hw/xfree86/os-support/os2/os2_serial.c:1.3
--- xc/programs/Xserver/hw/xfree86/os-support/os2/os2_serial.c:1.2	Fri Nov 19 05:55:01 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/os2_serial.c	Wed Apr  5 11:13:53 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_serial.c,v 1.2 1999/11/19 13:55:01 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_serial.c,v 1.3 2000/04/05 18:13:53 dawes Exp $ */
 /*
  * (c) Copyright 1999 by Holger Veit
  *			<Holger.Veit@gmd.de>
@@ -274,7 +274,7 @@
 	return rc ? -1 : (int)nread;
 }
 
-int xf86WriteSerial (int fd, void *buf, int count)
+int xf86WriteSerial (int fd, const void *buf, int count)
 {
 	ULONG nwrite;
 	APIRET rc = DosWrite((HFILE)fd,(PVOID)buf,(ULONG)count,&nwrite);
@@ -336,4 +336,178 @@
 		nq--;
 	}
 	return 0;
+}
+
+static struct states {
+        int xf;
+        int os;
+} modemStates[] = {
+        { XF86_M_DTR, 0x01 },
+        { XF86_M_RTS, 0x02 },
+        { XF86_M_CTS, 0x10 },
+        { XF86_M_DSR, 0x20 },
+        { XF86_M_RNG, 0x40 },
+        { XF86_M_CAR, 0x80 },
+};
+
+static int numStates = sizeof(modemStates) / sizeof(modemStates[0]);
+
+static int
+xf2osState(int state)
+{
+        int i;
+        int ret = 0;
+
+        for (i = 0; i < numStates; i++)
+                if (state & modemStates[i].xf)
+                        ret |= modemStates[i].os;
+        return ret;
+}
+
+static int
+os2xfState(int state)
+{
+        int i;
+        int ret = 0;
+
+        for (i = 0; i < numStates; i++)
+                if (state & modemStates[i].os)
+                        ret |= modemStates[i].xf;
+        return ret;
+}
+
+static int
+getOsStateMask(void)
+{
+        int i;
+        int ret = 0;
+        for (i = 0; i < numStates; i++)
+                ret |= modemStates[i].os;
+        return ret;
+}
+
+static int osStateMask = 0;
+
+static 
+int _get_modem_state(int fd,ULONG* state) 
+{
+	ULONG state1,len;
+
+	if (DosDevIOCtl((HFILE)fd,IOCTL_ASYNC,ASYNC_GETMODEMOUTPUT,
+		NULL,0,NULL, state, sizeof(BYTE), &len) != 0 ||
+	    DosDevIOCtl((HFILE)fd,IOCTL_ASYNC,ASYNC_GETMODEMINPUT,
+		NULL,0,NULL, &state1, sizeof(BYTE), &len) != 0)
+		return -1;
+	*state |= state1;
+	*state &= 0xff;
+	return 0;	
+}
+
+static 
+int _set_modem_state(int fd,ULONG state,ULONG mask) 
+{
+	int len;
+	struct {
+		BYTE onmask;
+		BYTE offmask;
+	} modemctrl;
+	modemctrl.onmask = state;
+	modemctrl.offmask = mask;
+
+	if (DosDevIOCtl((HFILE)fd,IOCTL_ASYNC,ASYNC_SETMODEMCTRL,
+		NULL,0,NULL, (PULONG)&modemctrl, sizeof(modemctrl), &len) != 0)
+		return -1;
+	else
+		return 0;
+}
+
+int
+xf86SetSerialModemState(int fd, int state)
+{
+        ULONG s;
+
+        if (fd < 0)
+                return -1;
+
+        /* Don't try to set parameters for non-tty devices. */
+        if (!isatty(fd))
+                return 0;
+
+        if (!osStateMask)
+                osStateMask = getOsStateMask();
+
+        state = xf2osState(state);
+
+	if (_get_modem_state(fd,&s) != 0)
+		return -1;
+
+        s &= ~osStateMask;
+        s |= state;
+
+	return _set_modem_state(fd,s,0x03);
+}
+
+int
+xf86GetSerialModemState(int fd)
+{
+        ULONG s;
+
+        if (fd < 0)
+                return -1;
+
+        /* Don't try to set parameters for non-tty devices. */
+        if (!isatty(fd))
+                return 0;
+
+	if (_get_modem_state(fd,&s) != 0)
+		return -1;
+
+        return os2xfState(s);
+}
+
+int
+xf86SerialModemSetBits(int fd, int bits)
+{
+        int ret;
+        int s;
+
+        if (fd < 0)
+                return -1;
+
+        /* Don't try to set parameters for non-tty devices. */
+        if (!isatty(fd))
+                return 0;
+
+        s = xf2osState(bits);
+	return _set_modem_state(fd,s,0x03);
+}
+
+int
+xf86SerialModemClearBits(int fd, int bits)
+{
+        int ret;
+        int s;
+
+        if (fd < 0)
+                return -1;
+
+        /* Don't try to set parameters for non-tty devices. */
+        if (!isatty(fd))
+                return 0;
+
+        s = xf2osState(bits);
+	return _set_modem_state(fd, 0, ~s & 0xff);
+}
+
+int
+xf86SetSerialSpeed (int fd, int speed)
+{
+	if (fd < 0)
+		return -1;
+
+        /* Don't try to set parameters for non-tty devices. */
+        if (!isatty(fd))
+                return 0;
+
+	return _set_baudrate(fd,speed);
 }
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_video.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/os2/os2_video.c:3.12 xc/programs/Xserver/hw/xfree86/os-support/os2/os2_video.c:3.13
--- xc/programs/Xserver/hw/xfree86/os-support/os2/os2_video.c:3.12	Thu Apr 29 02:13:51 1999
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/os2_video.c	Wed Apr  5 11:13:54 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_video.c,v 3.12 1999/04/29 09:13:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/os2_video.c,v 3.13 2000/04/05 18:13:54 dawes Exp $ */
 /*
  * (c) Copyright 1994,1999 by Holger Veit
  *			<Holger.Veit@gmd.de>
@@ -116,33 +116,15 @@
 	plen 		= sizeof(par);
 	dlen		= sizeof(dta);
 
-	/* First, redirect stderr to file so that video calls do not block */
-	if (!ErrRedir) {
-		/* hv300996 create redirect file on boot drive, instead 
-		 * anywhere you are just standing
-		 */
-		char buf[20],dr[3];
-		ULONG drive;
-		APIRET rc = DosQuerySysInfo(5,5,&drive,sizeof(drive));
-		if (rc) dr[0] = 0;
-		else {	dr[0] = drive+96;
-			dr[1] = ':';
-			dr[2] = 0;
-		}
-		sprintf(buf,"%s\\xf86log.os2",dr);
-		freopen(buf,"w",stderr); 
-		ErrRedir=TRUE; 
-	}
-
 	open_mmap();
 	if (mapdev == -1)
-		FatalError("xf86MapVidMem: install DEVICE=path\\XF86SUP.SYS!");
+		FatalError("mapVidMem: install DEVICE=path\\XF86SUP.SYS!");
 
 	if ((rc=DosDevIOCtl(mapdev, (ULONG)0x76, (ULONG)0x44,
 	      (PVOID)&par, (ULONG)plen, (PULONG)&plen,
 	      (PVOID)&dta, (ULONG)dlen, (PULONG)&dlen)) == 0) {
-		xf86Msg(X_INFO, xf86MapVidMem succeeded: (ScreenNum= %d, Base= 0x%x, Size= 0x%x\n",
-		ScreenNum, Base, Size);
+		xf86Msg(X_INFO,"mapVidMem succeeded: (ScreenNum= %d, Base= 0x%x, Size= 0x%x,paddr=0x%x)\n",
+		ScreenNum, Base, Size, dta.addr);
 		if (dlen==sizeof(dta)) {
 			return (pointer)dta.addr;
 		}
@@ -150,7 +132,7 @@
 	}
 
 	/* fail */
-	FatalError("xf86MapVidMem FAILED!!: rc = %d (ScreenNum= %d, Base= 0x%x, Size= 0x%x return len %d\n",
+	FatalError("mapVidMem FAILED!!: rc = %d (ScreenNum= %d, Base= 0x%x, Size= 0x%x return len %d)\n",
 		rc, ScreenNum, Base, Size,dlen);
 	return (pointer)0;
 }
@@ -179,7 +161,7 @@
 	    DosDevIOCtl(mapdev, (ULONG)0x76, (ULONG)0x46,
 	      (PVOID)&par, (ULONG)plen, (PULONG)&plen,
 	      &vmaddr, sizeof(ULONG), &plen);
-        xf86Msg(X_INFO,"Unmapping physical memory at base %x, virtual address %x\n",Base,vmaddr);
+        xf86Msg(X_INFO,"unmapVidMem: Unmap phys memory at base %x, virtual address %x\n",Base,vmaddr);
 
 /* Now if more than one region has been allocated and we close the driver,
  * the other pointers will immediately become invalid. We avoid closing
@@ -218,9 +200,11 @@
         pVidMem->linearSupported = TRUE;
         pVidMem->mapMem = mapVidMem;
         pVidMem->unmapMem = unmapVidMem;
+#if 0
         pVidMem->mapMemSparse = 0;
         pVidMem->unmapMemSparse = 0;
-        pVidMem->setWC = 0;
+#endif
+        pVidMem->setWC = 0; /* no MTRR support */
         pVidMem->undoWC = 0;
         pVidMem->initialised = TRUE;
 }
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/int10/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/os2/int10/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:43:18 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/int10/Imakefile	Wed Apr  5 11:13:55 2000
@@ -0,0 +1,110 @@
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/int10/Imakefile,v 1.1 2000/04/05 18:13:55 dawes Exp $
+
+#define IHaveModules
+
+#include <Server.tmpl>
+
+SRCS1 = pci.c xf86int10module.c helper_exec.c helper_mem.c xf86int10.c 
+OBJS1 = pci.o xf86int10module.o helper_exec.o helper_mem.o xf86int10.o 
+
+LinkSourceFile(helper_mem.c,$(XF86SRC)/int10)
+LinkSourceFile(helper_exec.c,$(XF86SRC)/int10)
+LinkSourceFile(xf86int10.c,$(XF86SRC)/int10)
+LinkSourceFile(pci.c,$(XF86SRC)/int10)
+LinkSourceFile(xf86int10module.c,$(XF86SRC)/int10)
+LinkSourceFile(xf86x86emu.c,$(XF86SRC)/int10)
+LinkSourceFile(generic.c,$(XF86SRC)/int10)
+
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/int10 \
+           -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/include -I$(XINCLUDESRC)
+
+DEFINES=-DHAVE_SYSV_IPC
+
+#if 0
+/* debugging stuff */
+#DEFINES =-D_PC
+#undef XF86INT10_BUILD 
+#define XF86INT10_BUILD X86EMU_GENERIC
+#define X86EMU_LIBPATH /usr/local/lib
+#endif
+
+#if defined(i386Architecture)
+DEFINES =-D_PC
+#endif
+
+/* XXX keep this temporarily for reference */
+#if 0
+#if (XF86INT10_BUILD == X86EMU_GENERIC) 
+
+SRCS = $(SRCS1) xf86x86emu.c generic.c
+OBJS = $(OBJS1) xf86x86emu.o generic.o x86emu.o
+SpecialObjectRule(pci.o, pci.c, -D_X86EMU)
+SpecialObjectRule(helper_exec.o, helper_exec.c, -D_X86EMU)
+SpecialObjectRule(xf86int10.o, xf86int10.c, -D_X86EMU -DSHOW_ALL_DEVICES)
+SpecialObjectRule(generic.o, generic.c, -D_X86EMU)
+SpecialObjectRule(xf86x86emu.o, xf86x86emu.c, -D_X86EMU)
+BuildObjectFromLibraryWithPath(X86EMU_LIBPATH,x86emu,x86emu)
+#endif
+#endif
+
+#if defined(XF86INT10_BUILD) && (XF86INT10_BUILD == X86VM)
+
+SRCS = $(SRCS1) linux.c
+OBJS = $(OBJS1) linux.o
+SpecialObjectRule(pci.o, pci.c, -D_VM86_LINUX)
+SpecialObjectRule(helper_exec.o, helper_exec.c, -D_VM86_LINUX)
+SpecialObjectRule(xf86int10.o, xf86int10.c, -D_VM86_LINUX -DSHOW_ALL_DEVICES)
+SpecialObjectRule(linux.o, linux.c, -D_VM86_LINUX -DHAVE_SYSV_IPC)
+
+#elif (XF86INT10_BUILD == X86EMU_OS)
+
+SpecialObjectRule(pci.o, pci.c, -D_X86EMU)
+SpecialObjectRule(helper_exec.o, helper_exec.c, -D_X86EMU)
+SpecialObjectRule(xf86int10.o, xf86int10.c, -D_X86EMU -DSHOW_ALL_DEVICES)
+SpecialObjectRule(linux.o, linux.c, -D_X86EMU -DHAVE_SYSV_IPC)
+
+X86TOPDIR = $(TOP)/extras/x86emu
+X86SRCDIR = $(X86TOPDIR)/src/x86emu
+X86EMUINCLUDES = -I$(X86TOPDIR)/include -I$(X86SRCDIR)
+
+# if !defined(X86EMU_LIBPATH) 
+X86EMUSRCS = debug.c decode.c fpu.c ops.c ops2.c prim_ops.c sys.c
+X86EMUOBJS = debug.o decode.o fpu.o ops.o ops2.o prim_ops.o sys.o
+
+LinkSourceFile(debug.c,$(X86SRCDIR))
+LinkSourceFile(decode.c,$(X86SRCDIR))
+LinkSourceFile(fpu.c,$(X86SRCDIR))
+LinkSourceFile(ops.c,$(X86SRCDIR))
+LinkSourceFile(ops2.c,$(X86SRCDIR))
+LinkSourceFile(prim_ops.c,$(X86SRCDIR))
+LinkSourceFile(sys.c,$(X86SRCDIR))
+# else
+BuildObjectFromLibraryWithPath(X86EMU_LIBPATH,x86emu,x86emu)
+X86EMUOBJS = x86emu.o
+# endif 
+
+SRCS = $(SRCS1) xf86x86emu.c linux.c $(X86EMUSRCS)
+OBJS = $(OBJS1) xf86x86emu.o linux.o $(X86EMUOBJS)
+
+#endif
+
+#if defined(XF86INT10_BUILD) && XF86INT10_BUILD > X86EMU_GENERIC
+
+LibraryModuleTarget(int10, $(OBJS))
+
+InstallLibraryModule(int10,$(MODULEDIR),linux)
+
+all::
+	(set -x; cd ../..; \
+	RemoveFile(LibraryTargetName(int10)); \
+	$(LN) linux/int10/LibraryTargetName(int10) . )
+
+InstallDriverSDKLibraryModule(int10,$(DRIVERSDKMODULEDIR),.)
+
+InstallDriverSDKNonExecFile(../../int10/xf86int10.h,$(DRIVERSDKINCLUDEDIR))
+
+#endif
+
+DependTarget()
+
Index: xc/programs/Xserver/hw/xfree86/os-support/os2/int10/os2.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/os2/int10/os2.c:1.1
--- /dev/null	Sat Jul  1 20:43:18 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/os2/int10/os2.c	Wed Apr  5 11:13:55 2000
@@ -0,0 +1,451 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/os2/int10/os2.c,v 1.1 2000/04/05 18:13:55 dawes Exp $ */
+/*
+ *                   XFree86 int10 module
+ *   execute BIOS int 10h calls in x86 real mode environment
+ *                 Copyright 1999 Egbert Eich
+ */
+#include "xf86.h"
+#include "xf86str.h"
+#include "xf86_OSproc.h"
+#include "xf86_ansic.h"
+#include "xf86Pci.h"
+#include "compiler.h"
+#define _INT10_PRIVATE
+#include "xf86int10.h"
+#include "int10Defines.h"
+
+static CARD8 read_b(xf86Int10InfoPtr pInt,int addr);
+static CARD16 read_w(xf86Int10InfoPtr pInt,int addr);
+static CARD32 read_l(xf86Int10InfoPtr pInt,int addr);
+static void write_b(xf86Int10InfoPtr pInt,int addr, CARD8 val);
+static void write_w(xf86Int10InfoPtr pInt,int addr, CARD16 val);
+static void write_l(xf86Int10InfoPtr pInt,int addr, CARD32 val);
+
+/*
+ * the emulator cannot pass a pointer to the current xf86Int10InfoRec
+ * to the memory access functions therefore store it here.
+ */
+
+typedef struct {
+    int shift;
+    int pagesize_1;
+    int entries;
+    void* vRam;
+    memType *alloc_rec;
+} genericInt10Priv;
+
+#define INTPriv(x) ((genericInt10Priv*)x->private)
+
+int10MemRec genericMem = {
+    read_b,
+    read_w,
+    read_l,
+    write_b,
+    write_w,
+    write_l
+};
+
+static void MapVRam(xf86Int10InfoPtr pInt);
+static void UnmapVRam(xf86Int10InfoPtr pInt);
+static void setupTable(xf86Int10InfoPtr pInt, memType address,
+		       int loc,int size);
+
+static void *sysMem = NULL;
+
+xf86Int10InfoPtr
+xf86InitInt10(int entityIndex)
+{
+    xf86Int10InfoPtr pInt;
+    int screen;
+    void* intMem;
+    void* vbiosMem;
+    int pagesize;
+    int entries;
+    int shift;
+    legacyVGARec vga;
+    
+    screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
+    
+    if (int10skip(xf86Screens[screen],entityIndex))
+	return NULL;
+
+    pInt = (xf86Int10InfoPtr)xnfcalloc(1,sizeof(xf86Int10InfoRec));
+    pInt->entityIndex = entityIndex;
+    if (!xf86Int10ExecSetup(pInt))
+	goto error0;
+    pInt->mem = &genericMem;
+    pagesize = xf86getpagesize();
+    pInt->private = (pointer)xnfcalloc(1,sizeof(genericInt10Priv));
+    entries = SYS_SIZE / pagesize;
+
+    pInt->scrnIndex = screen;
+    INTPriv(pInt)->pagesize_1 = pagesize - 1;
+    INTPriv(pInt)->entries = entries;
+    INTPriv(pInt)->alloc_rec =
+	xnfcalloc(1,sizeof(memType) * entries);
+    for (shift = 0 ; (pagesize >> shift) ; shift++) {};
+    shift -= 1;
+    INTPriv(pInt)->shift = shift;
+
+    /*
+     * we need to map video RAM MMIO as some chipsets map mmio
+     * registers into this range.
+     */
+
+    MapVRam(pInt);
+    intMem = xnfalloc(pagesize);
+    setupTable(pInt,(memType)intMem,0,pagesize);
+    vbiosMem = xnfalloc(V_BIOS_SIZE);
+
+#ifdef _PC
+    if (!sysMem)
+	sysMem = xf86MapVidMem(screen,VIDMEM_FRAMEBUFFER,SYS_BIOS,BIOS_SIZE);
+    setupTable(pInt,(memType)sysMem,SYS_BIOS,BIOS_SIZE);
+    if (xf86ReadBIOS(0,0,(unsigned char *)intMem,LOW_PAGE_SIZE) < 0) {
+	xf86DrvMsg(screen,X_ERROR,"Cannot read int vect\n");
+	goto error1;
+    }
+    if (xf86IsEntityPrimary(entityIndex)) {
+	int size;
+	int cs = MEM_RW(pInt,((0x10<<2)+2));
+
+int i,k,m;
+char buf[100], hx[10];
+for (i=0; i<0x100; i+=16) {
+sprintf(buf,"%04x: ",i);
+for (k=0; k<16; k++) {
+  m = MEM_RB(pInt,i+k);
+  sprintf(hx,"%02x ",((unsigned)m)&0xff);
+  strcat(buf,hx);
+}
+xf86DrvMsg(screen,X_INFO,"%s\n",buf);
+}
+
+
+
+	xf86DrvMsg(screen,X_INFO,"Primary V_BIOS segmant is: 0x%x\n",cs);
+	if (xf86ReadBIOS(cs << 4,0,(unsigned char *)vbiosMem,
+			 0x10) < 0) {
+	    xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (1)\n");
+	    goto error1;
+	}
+	if (!((*(CARD8*)vbiosMem == 0x55)
+	      && (*((CARD8*)vbiosMem + 1) == 0xAA))) {
+	    xf86DrvMsg(screen,X_ERROR,"No V_BIOS found\n");
+	    goto error1;
+	}
+	
+	size = *((CARD8*)vbiosMem + 2) * 512;
+	if (xf86ReadBIOS(cs << 4,0,vbiosMem, size) < 0) {
+	    xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (2)\n");
+	    goto error1;
+	}
+	if (bios_checksum(vbiosMem,size)) {
+	    xf86DrvMsg(screen,X_ERROR,"Bad checksum of V_BIOS \n");
+	    goto error1;
+	}
+
+	setupTable(pInt,(memType)vbiosMem,cs<<4,size);
+	set_return_trap(pInt);
+	pInt->BIOSseg = cs;
+    } else {
+	reset_int_vect(pInt);
+	set_return_trap(pInt);
+	if (!mapPciRom(pInt,(unsigned char *)(vbiosMem))) {
+	    xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (3)\n");
+	    goto error1;
+	}
+	setupTable(pInt,(memType)vbiosMem,V_BIOS,V_BIOS_SIZE);
+	pInt->BIOSseg = V_BIOS >> 4;
+	pInt->num = 0xe6;
+	LockLegacyVGA(screen, &vga); 
+	xf86ExecX86int10(pInt);
+	UnlockLegacyVGA(screen, &vga);
+    }
+#else
+    if (!sysMem) {
+	sysMem = xnfalloc(BIOS_SIZE);
+	setup_system_bios((memType)sysMem);
+    }
+    setupTable(pInt,(memType)sysMem,SYS_BIOS,BIOS_SIZE);
+    setup_int_vect(pInt);
+    set_return_trap(pInt);
+    if (!mapPciRom(pInt,(unsigned char *)(vbiosMem))) {
+	xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (4)\n");
+	goto error1;
+    }
+    setupTable(pInt,(memType)vbiosMem,V_BIOS,V_BIOS_SIZE);
+    pInt->BIOSseg = V_BIOS >> 4;
+    pInt->num = 0xe6;
+    LockLegacyVGA(screen, &vga);	   
+    xf86ExecX86int10(pInt);
+    UnlockLegacyVGA(screen, &vga);
+#endif
+    return pInt;
+
+ error1:
+    xfree(vbiosMem);
+    xfree(intMem);
+    UnmapVRam(pInt);
+    xfree(INTPriv(pInt)->alloc_rec);
+    xfree(pInt->private);
+ error0:
+    xfree(pInt);
+
+    return NULL;
+}
+
+static void
+MapVRam(xf86Int10InfoPtr pInt)
+{
+    int screen = pInt->scrnIndex;
+    int pagesize = INTPriv(pInt)->pagesize_1 + 1;
+    int size = ((VRAM_SIZE + pagesize - 1)/pagesize) * pagesize;
+    INTPriv(pInt)->vRam = xf86MapVidMem(screen,VIDMEM_MMIO,V_RAM,size);
+}
+
+static void 
+UnmapVRam(xf86Int10InfoPtr pInt)
+{
+    int screen = pInt->scrnIndex;
+    int pagesize = INTPriv(pInt)->pagesize_1 + 1;
+    int size = ((VRAM_SIZE + pagesize - 1)/pagesize) * pagesize;
+
+    xf86UnMapVidMem(screen,INTPriv(pInt)->vRam,size);
+}
+
+void
+MapCurrentInt10(xf86Int10InfoPtr pInt)
+{
+  /* nothing to do here */
+}
+
+void
+xf86FreeInt10(xf86Int10InfoPtr pInt)
+{
+    int pagesize; 
+
+    if (!pInt)
+      return;
+    pagesize = INTPriv(pInt)->pagesize_1 + 1;
+    if (Int10Current == pInt) 
+	Int10Current = NULL;
+    xfree(INTPriv(pInt)->alloc_rec[V_BIOS/pagesize]);
+    xfree(INTPriv(pInt)->alloc_rec[0]);
+    UnmapVRam(pInt);
+    xfree(INTPriv(pInt)->alloc_rec);
+    xfree(pInt->private);
+    xfree(pInt);
+}
+
+void *
+xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off)
+{
+    void* addr;
+    int pagesize = INTPriv(pInt)->pagesize_1 + 1;
+    int num_pages = INTPriv(pInt)->entries;
+    int i,j;
+    
+    for (i=0;i<num_pages - num;i++) {
+	if (INTPriv(pInt)->alloc_rec[i] == 0) {
+	    for (j=i;j < num + i;j++)
+		if ((INTPriv(pInt)->alloc_rec[j] != 0))
+		    break;
+	    if (j == num + i)
+		break;
+	    else
+		i = i + num;
+	}
+    }
+    if (i == num_pages - num)
+	return NULL;
+
+    *off = i * pagesize;
+    addr = xnfalloc(pagesize * num);
+    setupTable(pInt,(memType)addr,*off,pagesize * num);
+    
+    return addr;
+}
+
+void
+xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
+{
+    int num_pages = INTPriv(pInt)->entries;
+    int i,j;
+    for (i = 0;i<num_pages - num; i++)
+	if (INTPriv(pInt)->alloc_rec[i]==(memType)pbase) {
+	    for (j = 0; j < num; j++)
+		INTPriv(pInt)->alloc_rec[i] = 0;
+	    break;
+	}
+    xfree(pbase);
+    return;
+}
+
+static void
+setupTable(xf86Int10InfoPtr pInt, memType address,int loc,int size)
+{
+    int pagesize = INTPriv(pInt)->pagesize_1 + 1;
+    int i,j,num;
+
+    i = loc / pagesize;
+    num = (size + pagesize - 1)/ pagesize; /* round up to the nearest page */
+                                           /* boudary if size is not       */
+                                           /* multiple of pagesize         */
+    for (j = 0; j<num; j++) {
+	INTPriv(pInt)->alloc_rec[i+j] = address;
+	address += pagesize;
+    }
+}
+
+#define OFF(addr) \
+          ((addr) & (INTPriv(pInt)->pagesize_1))
+#define SHIFT \
+          (INTPriv(pInt)->shift)
+#define BASE(addr,shift) \
+          (INTPriv(pInt)->alloc_rec[addr >> shift])
+#define V_ADDR(addr,shift,off) \
+          (BASE(addr,shift) + (off))
+#define VRAM_ADDR(addr) (addr - 0xA0000)
+#define VRAM_BASE (INTPriv(pInt)->vRam)
+
+#define VRAM(addr) ((addr >= 0xA0000) && (addr <= 0xBFFFF))
+#define V_ADDR_RB(addr,shift,off) \
+        (VRAM(addr)) ? MMIO_IN8((CARD8*)VRAM_BASE,VRAM_ADDR(addr)) \
+           : *(CARD8*) V_ADDR(addr,shift,off)
+#define V_ADDR_RW(addr,shift,off) \
+        (VRAM(addr)) ? MMIO_IN16((CARD16*)VRAM_BASE,VRAM_ADDR(addr)) \
+           : ldw_u((pointer)V_ADDR(addr,shift,off))
+#define V_ADDR_RL(addr,shift,off) \
+        (VRAM(addr)) ? MMIO_IN32((CARD32*)VRAM_BASE,VRAM_ADDR(addr)) \
+           : ldl_u((pointer)V_ADDR(addr,shift,off))
+
+#define V_ADDR_WB(addr,shift,off,val) \
+        if(VRAM(addr)) \
+            MMIO_OUT8((CARD8*)VRAM_BASE,VRAM_ADDR(addr),val); \
+        else \
+            *(CARD8*) V_ADDR(addr,shift,off) = val;
+#define V_ADDR_WW(addr,shift,off,val) \
+        if(VRAM(addr)) \
+            MMIO_OUT16((CARD16*)VRAM_BASE,VRAM_ADDR(addr),val); \
+        else \
+            stw_u((val),(pointer)(V_ADDR(addr,shift,off)));
+
+#define V_ADDR_WL(addr,shift,off,val) \
+        if (VRAM(addr)) \
+            MMIO_OUT32((CARD32*)VRAM_BASE,VRAM_ADDR(addr),val); \
+        else \
+            stl_u(val,(pointer)(V_ADDR(addr,shift,off)));
+
+static CARD8
+read_b(xf86Int10InfoPtr pInt, int addr)
+{
+    if (!BASE(addr,SHIFT)) return 0xff;
+    
+    return V_ADDR_RB(addr,SHIFT,OFF(addr));
+}
+
+static CARD16
+read_w(xf86Int10InfoPtr pInt, int addr)
+{
+    int shift = SHIFT;
+    int off = OFF(addr);
+
+    if (!BASE(addr,shift)) return 0xffff;
+    
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+    return ((V_ADDR_RB(addr,shift,off))
+	    || ((V_ADDR_RB(addr,shift,off + 1)) << 8));
+#else
+    if (OFF(addr + 1) > 0) {
+	return V_ADDR_RW(addr,SHIFT,OFF(addr));
+    } else {
+	return ((V_ADDR_RB(addr,shift,off + 1))
+	    || ((V_ADDR_RB(addr,shift,off)) << 8));
+    }
+#endif
+}
+
+static CARD32
+read_l(xf86Int10InfoPtr pInt, int addr)
+{
+    int shift = SHIFT;
+    int off = OFF(addr);
+	
+    if (!BASE(addr,shift)) return 0xffffffff;
+    
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+    return ((V_ADDR_RB(addr,shift,off))
+	    || ((V_ADDR_RB(addr,shift,off + 1)) << 8)
+	    || ((V_ADDR_RB(addr,shift,off + 2)) << 16)
+	    || ((V_ADDR_RB(addr,shift,off + 3)) << 24));
+#else
+    if (OFF(addr + 3) > 2) {
+	return V_ADDR_RL(addr,SHIFT,OFF(addr));
+    } else {
+	return ((V_ADDR_RB(addr,shift,off + 3))
+		|| ((V_ADDR_RB(addr,shift,off + 2)) << 8)
+		|| ((V_ADDR_RB(addr,shift,off + 1)) << 16)
+		|| ((V_ADDR_RB(addr,shift,off)) << 24));
+    }
+#endif
+}
+
+static void
+write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val)
+{
+    if (!BASE(addr,SHIFT)) return;
+    
+    V_ADDR_WB(addr,SHIFT,OFF(addr),val);
+}
+
+static void
+write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
+{
+    int shift = SHIFT;
+    int off = OFF(addr);
+    
+    if (!BASE(addr,shift)) return;
+    
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+    V_ADDR_WB(addr,shift,off,val);
+    V_ADDR_WB(addr,shift,off + 1,val >> 8);
+#else
+    if (OFF(addr + 1) > 0) {
+	V_ADDR_WW(addr,shift,OFF(addr),val);
+    } else {
+	V_ADDR_WB(addr,shift,off + 1,val);
+	V_ADDR_WB(addr,shift,off,val >> 8);
+    }
+#endif
+}
+
+static void
+write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
+{
+    int shift = SHIFT;
+    int off = OFF(addr);
+    if (!BASE(addr,shift)) return;
+    
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+    V_ADDR_WB(addr,shift,off,val);
+    V_ADDR_WB(addr,shift,off + 1, val >> 8);
+    V_ADDR_WB(addr,shift,off + 2, val >> 16);
+    V_ADDR_WB(addr,shift,off + 3, val >> 24);
+#else
+    if (OFF(addr + 3) > 2) {
+	V_ADDR_WL(addr,shift,OFF(addr),val);
+    } else {
+	V_ADDR_WB(addr,shift,off + 3, val);
+	V_ADDR_WB(addr,shift,off + 2, val >> 8);
+	V_ADDR_WB(addr,shift,off + 1, val >> 16);
+	V_ADDR_WB(addr,shift,off, val >> 24);
+    }
+#endif
+}
+
+pointer
+xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
+{
+    return (pointer) V_ADDR(addr,SHIFT,OFF(addr));
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile:1.8 xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile:1.9
--- xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile:1.8	Sat Feb 12 19:36:10 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile	Fri Jun 16 17:03:41 2000
@@ -1,5 +1,5 @@
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile,v 1.8 2000/02/13 03:36:10 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile,v 1.9 2000/06/17 00:03:41 martin Exp $
 
 #include <Server.tmpl>
 
@@ -9,13 +9,16 @@
 SRCS =  pmax_devs.c pmax_init.c pmax_map.c pmax_pci.c pmax_ppc.c \
 	bios_V4mmap.c VTsw_usl.c sysv_kbd.c std_kbdEv.c \
 	posix_tty.c $(MOUSESRC) xqueue.c ioperm_noop.c \
-	libc_wrapper.c stdResource.c stdPci.o sigiostubs.c pm_noop.c
+	libc_wrapper.c stdResource.c stdPci.o sigiostubs.c pm_noop.c \
+        kmod_noop.c
 
 OBJS =  pmax_devs.o pmax_init.o pmax_map.o pmax_pci.o pmax_ppc.o \
 	bios_V4mmap.o VTsw_usl.o sysv_kbd.o std_kbdEv.o \
 	posix_tty.o $(MOUSESRC) xqueue.o ioperm_noop.o \
-	libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o
+	libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o \
+        kmod_noop.o
 
+
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I. \
            -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I../sysv
 
@@ -36,6 +39,7 @@
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 LinkSourceFile(bios_V4mmap.c,../sysv)
 LinkSourceFile(xqueue.c,../sysv)
Index: xc/programs/Xserver/hw/xfree86/os-support/pmax/pmax_map.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/pmax/pmax_map.c:1.6 xc/programs/Xserver/hw/xfree86/os-support/pmax/pmax_map.c:1.7
--- xc/programs/Xserver/hw/xfree86/os-support/pmax/pmax_map.c:1.6	Fri Feb 11 14:36:03 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/pmax/pmax_map.c	Tue Jun 27 07:27:31 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/pmax/pmax_map.c,v 1.6 2000/02/11 22:36:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/pmax/pmax_map.c,v 1.7 2000/06/27 14:27:31 tsi Exp $ */
 /*
  * Copyright 1998 by Concurrent Computer Corporation
  *
@@ -147,24 +147,6 @@
 {
 	munmap(Base, Size);
 }
-
-#if 0
-/* ARGSUSED */
-void xf86MapDisplay(ScreenNum, Region)
-int ScreenNum;
-int Region;
-{
-	return;
-}
-
-/* ARGSUSED */
-void xf86UnMapDisplay(ScreenNum, Region)
-int ScreenNum;
-int Region;
-{
-	return;
-}
-#endif
 
 /*
  * Read BIOS via mmap()ing /dev/iomem.
Index: xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile:1.3 xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile:1.5
--- xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile:1.3	Sat Feb 12 19:36:10 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile	Tue Jun 27 07:27:31 2000
@@ -1,17 +1,17 @@
-XCOMM
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile,v 1.3 2000/02/13 03:36:10 dawes Exp $
-XCOMM
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile,v 1.5 2000/06/27 14:27:31 tsi Exp $
 
 #include <Server.tmpl>
 
 
-SRCS = qnx_io.c qnx_init.c qnx_utils.c mapVT_noop.c ioperm_noop.c qnx_video.c \
+SRCS = qnx_io.c qnx_init.c qnx_utils.c ioperm_noop.c qnx_video.c \
        qnx_VTsw.c qnx_kbd.c posix_tty.c qnx_mouse.c qnx_select.c \
-       libc_wrapper.c stdResource.c stdPci.c sigiostubs.c pm_noop.c
+       libc_wrapper.c stdResource.c stdPci.c sigiostubs.c pm_noop.c \
+       kmod_noop.c
 
-OBJS = qnx_io.o qnx_init.o qnx_utils.o mapVT_noop.o ioperm_noop.o qnx_video.o \
+OBJS = qnx_io.o qnx_init.o qnx_utils.o ioperm_noop.o qnx_video.o \
        qnx_VTsw.o qnx_kbd.o posix_tty.o qnx_mouse.o qnx_select.o \
-       libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o
+       libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o \
+       kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC)
@@ -26,11 +26,11 @@
 
 LinkSourceFile(libc_wrapper.c,../shared)
 LinkSourceFile(posix_tty.c,../shared)
-LinkSourceFile(mapVT_noop.c,../shared)
 LinkSourceFile(ioperm_noop.c,../shared)
 LinkSourceFile(stdResource.c,../shared)
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile:3.7 xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile:3.9
--- xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile:3.7	Sat Feb 12 19:36:11 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile	Tue Jun 27 07:27:31 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile,v 3.7 2000/02/13 03:36:11 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile,v 3.9 2000/06/27 14:27:31 tsi Exp $
 
 
 
@@ -7,13 +7,15 @@
 
 #include <Server.tmpl>
 
-SRCS = sco_init.c sco_video.c sco_io.c bios_devmem.c mapVT_noop.c VTsw_sco.c \
+SRCS = sco_init.c sco_video.c sco_io.c bios_devmem.c VTsw_sco.c \
        sysv_kbd.c std_kbdEv.c sysv_tty.c std_mseEv.c sco_mouse.c \
-       libc_wrapper.c stdResource.c stdPci.o sigiostubs.c pm_noop.c
+       libc_wrapper.c stdResource.c stdPci.o sigiostubs.c pm_noop.c \
+       kmod_noop.c
 
-OBJS = sco_init.o sco_video.o sco_io.o bios_devmem.o mapVT_noop.o VTsw_sco.o \
+OBJS = sco_init.o sco_video.o sco_io.o bios_devmem.o VTsw_sco.o \
        sysv_kbd.o std_kbdEv.o sysv_tty.o std_mseEv.o sco_mouse.o \
-       libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o
+       libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o \
+       kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC)
@@ -26,7 +28,6 @@
 NormalLibraryObjectRule()
 
 LinkSourceFile(bios_devmem.c,../shared)
-LinkSourceFile(mapVT_noop.c,../shared)
 LinkSourceFile(sysv_kbd.c,../shared)
 LinkSourceFile(std_kbdEv.c,../shared)
 LinkSourceFile(sysv_tty.c,../shared)
@@ -36,6 +37,7 @@
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
 
Index: xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c:1.1
--- /dev/null	Sat Jul  1 20:43:19 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c	Fri Jun 16 17:03:42 2000
@@ -0,0 +1,8 @@
+
+#include "xf86_OSproc.h"
+
+int xf86LoadKernelModule(const char *pathname)
+{
+    (void) pathname;
+    return 0;  /* failure */
+}
Index: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c:1.60 xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c:1.65
--- xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c:1.60	Wed Feb  9 07:47:50 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c	Fri Jun 16 17:03:42 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v 1.60 2000/02/09 15:47:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v 1.65 2000/06/17 00:03:42 martin Exp $ */
 /*
  * Copyright 1997 by The XFree86 Project, Inc.
  *
@@ -32,10 +32,6 @@
 #undef _ANSI_SOURCE
 #endif
 #include <sys/time.h>
-#if defined(__bsdi__)
-#define _POSIX_SOURCE
-#define _ANSI_SOURCE
-#endif
 #include <math.h>
 #include <stdarg.h>
 #include <fcntl.h>
@@ -50,6 +46,7 @@
 #include <sys/ioctl.h>
 #ifdef __EMX__
 #define NO_MMAP
+#include <sys/param.h>
 #endif
 #ifdef HAS_SVR3_MMAPDRV
 #define NO_MMAP
@@ -1088,7 +1085,7 @@
 }
 
 void
-xf86getsecs(CARD32 * secs, CARD32 * usecs)
+xf86getsecs(long * secs, long * usecs)
 {
 	struct timeval tv;
 
@@ -1323,7 +1320,9 @@
 
     if (xfmode & XF86_S_ISUID) mode |= S_ISUID;
     if (xfmode & XF86_S_ISGID) mode |= S_ISGID;
+#ifndef __EMX__
     if (xfmode & XF86_S_ISVTX) mode |= S_ISVTX;
+#endif
     if (xfmode & XF86_S_IRUSR) mode |= S_IRUSR;
     if (xfmode & XF86_S_IWUSR) mode |= S_IWUSR;
     if (xfmode & XF86_S_IXUSR) mode |= S_IXUSR;
@@ -1350,7 +1349,11 @@
 int
 xf86chown(const char *path, xf86uid_t owner, xf86gid_t group)
 {
+#ifndef __EMX__
     int rc = chown(path, owner, group);
+#else
+    int rc = 0;
+#endif
     xf86errno = xf86GetErrno();
     return rc;
 }
@@ -1361,6 +1364,18 @@
     return geteuid();
 }
 
+xf86gid_t
+xf86getegid(void)
+{
+    return getegid();
+}
+
+int
+xf86getpid(void)
+{
+    return getpid();
+}
+
 static mode_t
 xfToOsMknodMode(xf86mode_t xfmode)
 {
@@ -1368,7 +1383,9 @@
 
     if (xfmode & XF86_S_IFREG) mode |= S_IFREG;
     if (xfmode & XF86_S_IFCHR) mode |= S_IFCHR;
+#ifndef __EMX__
     if (xfmode & XF86_S_IFBLK) mode |= S_IFBLK;
+#endif
     if (xfmode & XF86_S_IFIFO) mode |= S_IFIFO;
 
     return mode;
@@ -1377,8 +1394,11 @@
 int xf86mknod(const char *pathname, xf86mode_t xfmode, xf86dev_t dev)
 {
     mode_t mode = xfToOsMknodMode(xfmode);
+#ifndef __EMX__
     int rc      = mknod(pathname, mode, dev);
-    
+#else
+    int rc = 0;
+#endif    
     xf86errno   = xf86GetErrno();
     return rc;
 }
@@ -1783,7 +1803,7 @@
 int
 xf86shmget(xf86key_t key, int size, int xf86shmflg)
 {
-    int shmflg = 0;
+    int shmflg = xf86shmflg & 0777;
 
     if (key == XF86IPC_PRIVATE) key = IPC_PRIVATE;
     
Index: xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c:3.2 xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c:removed
--- xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c:3.2	Sat Jul 25 09:57:01 1998
+++ xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c	Sat Jul  1 20:43:19 2000
@@ -1,43 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c,v 3.2 1998/07/25 16:57:01 dawes Exp $ */
-/*
- * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of David Wexelblat not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  David Wexelblat makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- */
-/* $XConsortium: mapVT_noop.c /main/3 1996/02/21 17:53:42 kaleb $ */
-
-/*
- * These routines are currently only needed for OSs with true USL-style VTs.
- * All other OSs get no-ops.
- */
-
-#if 0
-/* ARGSUSED */
-void xf86MapDisplay(int ScreenNum, int Region)
-{
-        return;
-}
-
-/* ARGSUSED */
-void xf86UnMapDisplay(int ScreenNum, int Region)
-{
-        return;
-}
-#endif
Index: xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c:1.9 xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c:1.11
--- xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c:1.9	Thu Mar  2 08:07:53 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c	Fri Jun 16 17:03:43 2000
@@ -1,6 +1,5 @@
 /* sigio.c -- Support for SIGIO handler installation and removal
  * Created: Thu Jun  3 15:39:18 1999 by faith@precisioninsight.com
- * Revised: Thu Jan  6 10:32:25 2000 by faith@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
@@ -24,7 +23,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c,v 1.9 2000/03/02 16:07:53 martin Exp $
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c,v 1.11 2000/06/17 00:03:43 martin Exp $
  * 
  */
 
@@ -108,6 +109,16 @@
 }
 
 int
+xf86IsPipe (int fd)
+{
+    struct stat	buf;
+    
+    if (fstat (fd, &buf) < 0)
+	return 0;
+    return S_ISFIFO(buf.st_mode);
+}
+
+int
 xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)
 {
     struct sigaction sa;
@@ -118,19 +129,8 @@
     {
 	if (!xf86SigIOFuncs[i].f)
 	{
-	    sigemptyset(&sa.sa_mask);
-	    sigaddset(&sa.sa_mask, SIGIO);
-	    sa.sa_flags   = 0;
-	    sa.sa_handler = xf86SIGIO;
-	    sigaction(SIGIO, &sa, &osa);
-	    xf86SigIOFuncs[i].fd = fd;
-	    xf86SigIOFuncs[i].closure = closure;
-	    xf86SigIOFuncs[i].f = f;
-	    if (i >= xf86SigIOMax)
-		xf86SigIOMax = i+1;
-	    if (fd >= xf86SigIOMaxFd)
-		xf86SigIOMaxFd = fd + 1;
-	    FD_SET (fd, &xf86SigIOMask);
+	    if (xf86IsPipe (fd))
+		return 0;
 	    if (fcntl(fd, F_SETOWN, getpid()) == -1) {
 #ifdef XFree86Server
 		xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n", 
@@ -151,6 +151,19 @@
 #endif
 		return 0;
 	    }
+	    sigemptyset(&sa.sa_mask);
+	    sigaddset(&sa.sa_mask, SIGIO);
+	    sa.sa_flags   = 0;
+	    sa.sa_handler = xf86SIGIO;
+	    sigaction(SIGIO, &sa, &osa);
+	    xf86SigIOFuncs[i].fd = fd;
+	    xf86SigIOFuncs[i].closure = closure;
+	    xf86SigIOFuncs[i].f = f;
+	    if (i >= xf86SigIOMax)
+		xf86SigIOMax = i+1;
+	    if (fd >= xf86SigIOMaxFd)
+		xf86SigIOMaxFd = fd + 1;
+	    FD_SET (fd, &xf86SigIOMask);
 	    return 1;
 	}
  	/* Allow overwriting of the closure and callback */
Index: xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c:1.14 xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c:1.15
--- xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c:1.14	Tue Feb  8 05:13:31 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c	Sun Apr 23 12:27:03 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c,v 1.14 2000/02/08 13:13:31 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c,v 1.15 2000/04/23 19:27:03 tsi Exp $ */
 
 /* Standard resource information code */
 
@@ -85,6 +85,9 @@
      * 0xffe00000 - 0xffffffff	high BIOS area (should this be included?)
      *
      * reference: Intel 440BX AGP specs
+     *
+     * The two APIC spaces appear to be BX-specific and should be dealt with
+     * elsewhere.
      */
 
     /* Fallback is to claim 0x0 - 0x9ffff and 0x100000 - 0x7fffffff */
@@ -96,10 +99,12 @@
     ret = xf86AddResToList(ret, &range, -1);
     RANGE(range,0x100000,0x3fffffff,ResExcMemBlock | ResBios | ResEstimated);
     ret = xf86AddResToList(ret, &range, -1);
+#if 0
     RANGE(range,0xfec00000,0xfecfffff,ResExcMemBlock | ResBios);
     ret = xf86AddResToList(ret, &range, -1);
     RANGE(range,0xfee00000,0xfeefffff,ResExcMemBlock | ResBios);
     ret = xf86AddResToList(ret, &range, -1);
+#endif
     RANGE(range,0xffe00000,0xffffffff,ResExcMemBlock | ResBios);
     ret = xf86AddResToList(ret, &range, -1);
 
@@ -111,4 +116,3 @@
     /* XXX add others */
     return ret;
 }
-
Index: xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c:1.10 xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c:1.11
--- xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c:1.10	Mon Feb 14 18:00:15 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c	Tue May  2 17:44:20 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c,v 1.10 2000/02/15 02:00:15 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c,v 1.11 2000/05/03 00:44:20 tsi Exp $ */
 /*
  * Copyright 1993-1999 by The XFree86 Project, Inc
  *
@@ -113,19 +113,18 @@
 	{ -1, NULL, OPTV_NONE, {0}, FALSE }
 };
 
+#define nopts (sizeof(opts) / sizeof(opts[0]))
+
 static void
 checkMtrrOption(VidMapPtr vp)
 {
 	if (!vp->mtrrOptChecked && vp->pScrn->options != NULL) {
-		/*
-		 * We get called once for each screen, so reset
-		 * the OptionInfoRecs.
-		 */
-		opts[0].found = FALSE;
+		OptionInfoRec options[nopts];
 
+		(void)memcpy(options, opts, sizeof(opts));
 		xf86ProcessOptions(vp->pScrn->scrnIndex, vp->pScrn->options,
-					opts);
-		if (xf86GetOptValBool(opts, OPTION_MTRR, &vp->mtrrEnabled))
+					options);
+		if (xf86GetOptValBool(options, OPTION_MTRR, &vp->mtrrEnabled))
 			vp->mtrrFrom = X_CONFIG;
 		vp->mtrrOptChecked = TRUE;
 	}
Index: xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile:1.4 xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile:1.5
--- xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile:1.4	Sat Feb 12 19:36:11 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile	Fri Jun 16 17:03:43 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile,v 1.4 2000/02/13 03:36:11 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile,v 1.5 2000/06/17 00:03:43 martin Exp $
 
 
 
@@ -19,12 +19,14 @@
 SRCS = sol8_init.c sol8_vid.c sol8_bios.c sol8_kbd.c sol8_io.c \
 	VTsw_noop.c sol8_kbd.c sol8_kbdEv.c posix_tty.c $(MOUSESRC) \
 	libc_wrapper.c $(PROWORKS_INOUT_SRC) stdResource.c stdPci.c \
-        sol8_kbdgetmapping.c sol8_postkbdevents.c sigiostubs.c pm_noop.c
+        sol8_kbdgetmapping.c sol8_postkbdevents.c sigiostubs.c pm_noop.c \
+        kmod_noop.c
 
 OBJS = sol8_init.o sol8_vid.o sol8_bios.o sol8_kbd.o sol8_io.o \
 	VTsw_noop.o sol8_kbd.o sol8_kbdEv.o posix_tty.o $(MOUSEOBJ) \
 	libc_wrapper.o $(PROWORKS_INOUT_OBJ) stdResource.o stdPci.o \
-        sol8_kbdgetmapping.o sol8_postkbdevents.o sigiostubs.o pm_noop.o
+        sol8_kbdgetmapping.o sol8_postkbdevents.o sigiostubs.o pm_noop.o \
+        kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC)
@@ -44,5 +46,6 @@
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile:3.16 xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile:3.17
--- xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile:3.16	Sat Feb 12 19:36:12 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile	Fri Jun 16 17:03:43 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile,v 3.16 2000/02/13 03:36:12 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile,v 3.17 2000/06/17 00:03:43 martin Exp $
 
 
 
@@ -19,12 +19,12 @@
 SRCS = solx86_init.c solx86_vid.c solx86_bios.c sysv_io.c \
 	VTsw_usl.c sysv_kbd.c std_kbdEv.c posix_tty.c $(MOUSESRC) \
 	libc_wrapper.c $(PROWORKS_INOUT_SRC) stdResource.c stdPci.c \
-        sigiostubs.c pm_noop.c
+        sigiostubs.c pm_noop.c kmod_noop.c
 
 OBJS = solx86_init.o solx86_vid.o solx86_bios.o sysv_io.o \
 	VTsw_usl.o sysv_kbd.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
 	libc_wrapper.o $(PROWORKS_INOUT_OBJ) stdResource.o stdPci.o \
-        sigiostubs.o pm_noop.o
+        sigiostubs.o pm_noop.o kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC)
@@ -47,5 +47,6 @@
 LinkSourceFile(stdPci.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile:3.21 xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile:3.22
--- xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile:3.21	Sat Feb 12 19:36:12 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile	Fri Jun 16 17:03:43 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile,v 3.21 2000/02/13 03:36:12 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile,v 3.22 2000/06/17 00:03:43 martin Exp $
 
 
 
@@ -19,11 +19,13 @@
 
 SRCS = sysv_init.c sysv_video.c sysv_io.c $(BIOS_MOD).c VTsw_usl.c \
        sysv_kbd.c std_kbdEv.c posix_tty.c $(MOUSESRC) xqueue.c \
-       libc_wrapper.c stdResource.c stdPci.c vidmem.c sigiostubs.c pm_noop.c
+       libc_wrapper.c stdResource.c stdPci.c vidmem.c sigiostubs.c pm_noop.c \
+       kmod_noop.c
 
 OBJS = sysv_init.o sysv_video.o sysv_io.o $(BIOS_MOD).o VTsw_usl.o \
        sysv_kbd.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) xqueue.o \
-       libc_wrapper.o stdResource.o stdPci.o vidmem.o sigiostubs.o pm_noop.o
+       libc_wrapper.o stdResource.o stdPci.o vidmem.o sigiostubs.o pm_noop.o \
+       kmod_noop.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi
@@ -50,5 +52,6 @@
 LinkSourceFile(vidmem.c,../shared)
 LinkSourceFile(sigiostubs.c,../shared)
 LinkSourceFile(pm_noop.c,../shared)
+LinkSourceFile(kmod_noop.c,../shared)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/os-support/vbe/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/os-support/vbe/Imakefile:1.4 xc/programs/Xserver/hw/xfree86/os-support/vbe/Imakefile:1.8
--- xc/programs/Xserver/hw/xfree86/os-support/vbe/Imakefile:1.4	Wed Feb  9 12:47:15 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/vbe/Imakefile	Mon May 22 21:47:49 2000
@@ -1,6 +1,10 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/Imakefile,v 1.4 2000/02/09 20:47:15 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/Imakefile,v 1.8 2000/05/23 04:47:49 dawes Exp $
 
-#define IHaveModules
+#if DoLoadableServer
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+
 #include <Server.tmpl>
 
 SRCS = vbe.c vbe_module.c
@@ -12,16 +16,19 @@
 	   -I$(XF86SRC)/int10 -I$(XF86SRC)/ddc \
 	   -I$(XF86SRC)/i2c
 
+#if DoLoadableServer
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+
 SubdirLibraryRule($(OBJS))
 NormalLibraryObjectRule()
-
-LibraryModuleTarget(vbe, $(OBJS))
 
-InstallLibraryModule(vbe,$(MODULEDIR),.)
+#if DoLoadableServer
+ForceSubdirs($(SUBDIRS))
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
 
 DependTarget()
-
-InstallDriverSDKLibraryModule(vbe,$(DRIVERSDKMODULEDIR),.)
-
-InstallDriverSDKNonExecFile(vbe.h,$(DRIVERSDKINCLUDEDIR))
 
Index: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.c
diff -u xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.c:1.4 xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.c:1.9
--- xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.c:1.4	Tue Feb  8 05:13:32 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.c	Wed May 31 02:39:45 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.c,v 1.4 2000/02/08 13:13:32 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.c,v 1.9 2000/05/31 09:39:45 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_ansic.h"
@@ -192,15 +192,34 @@
     return TRUE; 
 }
 
+typedef enum {
+    VBEOPT_NOVBE
+} VBEOpts;
+
+static OptionInfoRec VBEOptions[] = {
+    { VBEOPT_NOVBE,	"NoVBE",	OPTV_BOOLEAN,	{0},	FALSE },
+    { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
+};
+
+#define nVBEOptions (sizeof(VBEOptions) / sizeof(VBEOptions[0]))
+
 static unsigned char *
 vbeReadEDID(vbeInfoPtr pVbe)
 {
     int RealOff = pVbe->real_mode_base;
     pointer page = pVbe->memory;
     unsigned char *tmp = NULL;
+    Bool novbe = FALSE;
     int screen = pVbe->pInt10->scrnIndex;
+    OptionInfoRec options[nVBEOptions];
 
     if (!page) return NULL;
+
+    (void)memcpy(options, VBEOptions, sizeof(VBEOptions));
+    xf86ProcessOptions(screen, xf86Screens[screen]->options, options);
+    xf86GetOptValBool(options, VBEOPT_NOVBE, &novbe);
+    if (novbe) return NULL;
+    
     if (!vbeProbeDDC(pVbe)) goto error;
     
     pVbe->pInt10->ax = 0x4F15;
@@ -232,24 +251,33 @@
 }
 
 xf86MonPtr
-vbeDoEDID(vbeInfoPtr pVbe)
+vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
 {
+    xf86MonPtr    pMonitor;
+    pointer       pModule;
     unsigned char *DDC_data = NULL;
     
     if (!pVbe) return NULL;
     if (pVbe->version < 0x200)
 	return NULL;
+
+    if (!(pModule = pDDCModule)) {
+	pModule =
+	    xf86LoadSubModule(xf86Screens[pVbe->pInt10->scrnIndex], "ddc");
+	if (!pModule)
+	    return NULL;
+
+	xf86LoaderReqSymLists(ddcSymbols, NULL);
+    }
         
     DDC_data = vbeReadEDID(pVbe);
 
     if (!DDC_data) 
 	return NULL;
     
-    if (!xf86LoadSubModule(xf86Screens[pVbe->pInt10->scrnIndex], "ddc"))
-  	return NULL;
-    xf86LoaderReqSymLists(ddcSymbols, NULL);
+    pMonitor = xf86InterpretEDID(pVbe->pInt10->scrnIndex, DDC_data);
 
-    return xf86InterpretEDID(DDC_data);
+    if (!pDDCModule)
+        xf86UnloadSubModule(pModule);
+    return pMonitor;
 }
-
-
Index: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.h
diff -u xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.h:1.3 xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.h:1.4
--- xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.h:1.3	Tue Feb  8 05:13:32 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.h	Thu Apr 20 14:28:50 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.h,v 1.3 2000/02/08 13:13:32 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe.h,v 1.4 2000/04/20 21:28:50 tsi Exp $ */
 
 #ifndef _VBE_H
 #define _VBE_H
@@ -27,7 +27,7 @@
 
 vbeInfoPtr VBEInit(xf86Int10InfoPtr pInt, int entityIndex);
 void vbeFree(vbeInfoPtr pVbe);
-xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe);
+xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule);
 
 #pragma pack(1)
 
Index: xc/programs/Xserver/hw/xfree86/os-support/vbe/module/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/os-support/vbe/module/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:43:21 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/vbe/module/Imakefile	Wed Apr  5 11:13:57 2000
@@ -0,0 +1,31 @@
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/module/Imakefile,v 1.1 2000/04/05 18:13:57 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = vbe.c vbe_module.c
+
+OBJS = vbe.o vbe_module.o
+
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
+           -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
+	   -I$(XF86SRC)/int10 -I$(XF86SRC)/ddc \
+	   -I$(XF86SRC)/i2c
+
+LinkSourceFile(vbe.c,..)
+LinkSourceFile(vbe.h,..)
+LinkSourceFile(vbe_module.c,..)
+
+SubdirLibraryRule($(OBJS))
+NormalLibraryObjectRule()
+
+LibraryModuleTarget(vbe, $(OBJS))
+
+InstallLibraryModule(vbe,$(MODULEDIR),.)
+
+DependTarget()
+
+InstallDriverSDKLibraryModule(vbe,$(DRIVERSDKMODULEDIR),.)
+
+InstallDriverSDKNonExecFile(vbe.h,$(DRIVERSDKINCLUDEDIR))
+
Index: xc/programs/Xserver/hw/xfree86/parser/Configint.h
diff -u xc/programs/Xserver/hw/xfree86/parser/Configint.h:1.14 xc/programs/Xserver/hw/xfree86/parser/Configint.h:1.15
--- xc/programs/Xserver/hw/xfree86/parser/Configint.h:1.14	Mon Sep  6 04:27:37 1999
+++ xc/programs/Xserver/hw/xfree86/parser/Configint.h	Tue Apr  4 12:25:20 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Configint.h,v 1.14 1999/09/06 11:27:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Configint.h,v 1.15 2000/04/04 19:25:20 dawes Exp $ */
 /*
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -147,7 +147,8 @@
 #define WHITE_MSG \
 "The White keyword must be followed by red, green and blue values."
 #define SCREEN_MSG \
-"The Screen keyword must be followed by an optional number and 1 or 5 \n\tscreen names in quotes."
+"The Screen keyword must be followed by an optional number, a screen name\n" \
+"\tin quotes, and optional position/layout information."
 #define INVALID_SCR_MSG \
 "Invalid Screen line."
 #define INPUTDEV_MSG \
@@ -180,6 +181,9 @@
 "InputDevice section \"%s\" must have a Driver line."
 #define INVALID_GAMMA_MSG \
 "gamma correction value(s) expected\n either one value or three r/g/b values."
+#define GROUP_MSG \
+"The Group keyword must be followed by either a group name in quotes or\n" \
+"\ta numerical group id."
 
 /* Warning messages */
 #define OBSOLETE_MSG \
Index: xc/programs/Xserver/hw/xfree86/parser/DRI.c
diff -u xc/programs/Xserver/hw/xfree86/parser/DRI.c:1.3 xc/programs/Xserver/hw/xfree86/parser/DRI.c:1.6
--- xc/programs/Xserver/hw/xfree86/parser/DRI.c:1.3	Sun Mar  5 09:04:19 2000
+++ xc/programs/Xserver/hw/xfree86/parser/DRI.c	Wed May 17 17:37:30 2000
@@ -24,7 +24,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.3 2000/03/05 17:04:19 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.6 2000/05/18 00:37:30 dawes Exp $
  * 
  */
 
@@ -81,17 +81,22 @@
 {
     parsePrologue (XF86ConfDRIPtr, XF86ConfDRIRec);
 
+    /* Zero is a valid value for this. */
+    ptr->dri_group = -1;
     while ((token = xf86GetToken (DRITab)) != ENDSECTION) {
 	switch (token)
 	    {
 	    case GROUP:
-		if (xf86GetToken (NULL) != NUMBER)
-		    Error (QUOTE_MSG, "Group");
-		ptr->dri_group = val.num;
+		if ((token = xf86GetToken (NULL)) == STRING)
+		    ptr->dri_group_name = val.str;
+		else if (token == NUMBER)
+		    ptr->dri_group = val.num;
+		else
+		    Error (GROUP_MSG, NULL);
 		break;
 	    case MODE:
 		if (xf86GetToken (NULL) != NUMBER)
-		    Error (QUOTE_MSG, "Mode");
+		    Error (NUMBER_MSG, "Mode");
 		ptr->dri_mode = val.num;
 		break;
 	    case BUFFERS:
@@ -124,7 +129,9 @@
     if (ptr == NULL)
 	return;
     
-    if (ptr->dri_group)
+    if (ptr->dri_group_name)
+	fprintf (cf, "\tGroup        \"%s\"\n", ptr->dri_group_name);
+    else if (ptr->dri_group >= 0)
 	fprintf (cf, "\tGroup        %d\n", ptr->dri_group);
     for (bufs = ptr->dri_buffers_lst; bufs; bufs = bufs->list.next) {
 	fprintf (cf, "\tBuffers      %d %d",
Index: xc/programs/Xserver/hw/xfree86/parser/Device.c
diff -u xc/programs/Xserver/hw/xfree86/parser/Device.c:1.14 xc/programs/Xserver/hw/xfree86/parser/Device.c:1.15
--- xc/programs/Xserver/hw/xfree86/parser/Device.c:1.14	Wed Mar  1 08:01:30 2000
+++ xc/programs/Xserver/hw/xfree86/parser/Device.c	Mon Jun 19 22:08:48 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Device.c,v 1.14 2000/03/01 16:01:30 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Device.c,v 1.15 2000/06/20 05:08:48 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -60,6 +60,7 @@
 	{BUSID, "busid"},
 	{TEXTCLOCKFRQ, "textclockfreq"},
 	{IRQ, "irq"},
+	{SCREEN, "screen"},
 	{-1, ""},
 };
 
@@ -224,6 +225,11 @@
 				Error (QUOTE_MSG, "IRQ");
 			ptr->dev_irq = val.num;
 			break;
+		case SCREEN:
+			if (xf86GetToken (NULL) != NUMBER)
+				Error (NUMBER_MSG, "Screen");
+			ptr->dev_screen = val.num;
+			break;
 		case EOF_TOKEN:
 			Error (UNEXPECTED_EOF_MSG, NULL);
 			break;
@@ -311,6 +317,8 @@
 		}
 		if (ptr->dev_busid)
 			fprintf (cf, "\tBusID       \"%s\"\n", ptr->dev_busid);
+		if (ptr->dev_screen > 0)
+			fprintf (cf, "\tScreen      \"%d\"\n", ptr->dev_screen);
 		if (ptr->dev_irq >= 0)
 			fprintf (cf, "\tIRQ         %d\n", ptr->dev_irq);
 		fprintf (cf, "EndSection\n\n");
Index: xc/programs/Xserver/hw/xfree86/parser/Flags.c
diff -u xc/programs/Xserver/hw/xfree86/parser/Flags.c:1.11 xc/programs/Xserver/hw/xfree86/parser/Flags.c:1.12
--- xc/programs/Xserver/hw/xfree86/parser/Flags.c:1.11	Tue Jan 25 18:00:51 2000
+++ xc/programs/Xserver/hw/xfree86/parser/Flags.c	Tue Apr  4 15:36:53 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Flags.c,v 1.11 2000/01/26 02:00:51 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Flags.c,v 1.12 2000/04/04 22:36:53 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -200,7 +200,7 @@
 	if (head != NULL && (old = FindOption(head, name)) != NULL)
 		new = old;
 	else
-		new = xf86confmalloc (sizeof (XF86OptionRec));
+		new = xf86confcalloc (1, sizeof (XF86OptionRec));
 	new->opt_name = name;
 	new->opt_val = val;
 	new->opt_used = used;
@@ -277,7 +277,7 @@
 {
     XF86OptionPtr opt;
 
-    opt = xf86confmalloc(sizeof (XF86OptionRec));
+    opt = xf86confcalloc(1, sizeof (XF86OptionRec));
     if (!opt)
 	return NULL;
 
Index: xc/programs/Xserver/hw/xfree86/parser/Layout.c
diff -u xc/programs/Xserver/hw/xfree86/parser/Layout.c:1.11 xc/programs/Xserver/hw/xfree86/parser/Layout.c:1.12
--- xc/programs/Xserver/hw/xfree86/parser/Layout.c:1.11	Tue Jan 25 18:00:51 2000
+++ xc/programs/Xserver/hw/xfree86/parser/Layout.c	Tue Apr  4 15:36:54 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Layout.c,v 1.11 2000/01/26 02:00:51 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Layout.c,v 1.12 2000/04/04 22:36:54 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -85,7 +85,7 @@
 			{
 				XF86ConfInactivePtr iptr;
 
-				iptr = xf86confmalloc (sizeof (XF86ConfInactiveRec));
+				iptr = xf86confcalloc (1, sizeof (XF86ConfInactiveRec));
 				iptr->list.next = NULL;
 				if (xf86GetToken (NULL) != STRING)
 					Error (INACTIVE_MSG, NULL);
@@ -98,7 +98,7 @@
 			{
 				XF86ConfAdjacencyPtr aptr;
 
-				aptr = xf86confmalloc (sizeof (XF86ConfAdjacencyRec));
+				aptr = xf86confcalloc (1, sizeof (XF86ConfAdjacencyRec));
 				aptr->list.next = NULL;
 				aptr->adj_scrnum = -1;
 				aptr->adj_where = CONF_ADJ_OBSOLETE;
@@ -205,7 +205,7 @@
 			{
 				XF86ConfInputrefPtr iptr;
 
-				iptr = xf86confmalloc (sizeof (XF86ConfInputrefRec));
+				iptr = xf86confcalloc (1, sizeof (XF86ConfInputrefRec));
 				iptr->list.next = NULL;
 				iptr->iref_option_lst = NULL;
 				if (xf86GetToken (NULL) != STRING)
Index: xc/programs/Xserver/hw/xfree86/parser/Module.c
diff -u xc/programs/Xserver/hw/xfree86/parser/Module.c:1.4 xc/programs/Xserver/hw/xfree86/parser/Module.c:1.5
--- xc/programs/Xserver/hw/xfree86/parser/Module.c:1.4	Sun May 30 07:04:25 1999
+++ xc/programs/Xserver/hw/xfree86/parser/Module.c	Tue Apr  4 15:36:54 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Module.c,v 1.4 1999/05/30 14:04:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Module.c,v 1.5 2000/04/04 22:36:54 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -198,7 +198,7 @@
 {
 	XF86LoadPtr new;
 
-	new = xf86confmalloc (sizeof (XF86LoadRec));
+	new = xf86confcalloc (1, sizeof (XF86LoadRec));
 	new->load_name = name;
 	new->load_type = type;
 	new->load_opt  = opts;
Index: xc/programs/Xserver/hw/xfree86/parser/Monitor.c
diff -u xc/programs/Xserver/hw/xfree86/parser/Monitor.c:1.12 xc/programs/Xserver/hw/xfree86/parser/Monitor.c:1.13
--- xc/programs/Xserver/hw/xfree86/parser/Monitor.c:1.12	Tue Jan 25 18:00:51 2000
+++ xc/programs/Xserver/hw/xfree86/parser/Monitor.c	Tue Apr  4 15:36:54 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Monitor.c,v 1.12 2000/01/26 02:00:51 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Monitor.c,v 1.13 2000/04/04 22:36:54 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -549,7 +549,7 @@
 
 				/* add to the end of the list of modes sections 
 				   referenced here */
-				mptr = xf86confmalloc (sizeof (XF86ConfModesLinkRec));
+				mptr = xf86confcalloc (1, sizeof (XF86ConfModesLinkRec));
 				mptr->list.next = NULL;
 				mptr->ml_modes_str = val.str;
 				mptr->ml_modes = NULL;
Index: xc/programs/Xserver/hw/xfree86/parser/Screen.c
diff -u xc/programs/Xserver/hw/xfree86/parser/Screen.c:1.11 xc/programs/Xserver/hw/xfree86/parser/Screen.c:1.12
--- xc/programs/Xserver/hw/xfree86/parser/Screen.c:1.11	Fri Feb 25 11:07:53 2000
+++ xc/programs/Xserver/hw/xfree86/parser/Screen.c	Tue Apr  4 15:36:55 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Screen.c,v 1.11 2000/02/25 19:07:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Screen.c,v 1.12 2000/04/04 22:36:55 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -138,7 +138,7 @@
 
 				while ((token = xf86GetToken (DisplayTab)) == STRING)
 				{
-					mptr = xf86confmalloc (sizeof (XF86ModeRec));
+					mptr = xf86confcalloc (1, sizeof (XF86ModeRec));
 					mptr->mode_name = val.str;
 					mptr->list.next = NULL;
 					ptr->disp_mode_lst = (XF86ModePtr)
@@ -280,7 +280,7 @@
 
 				if (aptr == NULL)
 				{
-					aptr = xf86confmalloc (sizeof (XF86ConfAdaptorLinkRec));
+					aptr = xf86confcalloc (1, sizeof (XF86ConfAdaptorLinkRec));
 					aptr->list.next = NULL;
 					aptr->al_adaptor_str = val.str;
 					ptr->scrn_adaptor_lst = (XF86ConfAdaptorLinkPtr)
Index: xc/programs/Xserver/hw/xfree86/parser/read.c
diff -u xc/programs/Xserver/hw/xfree86/parser/read.c:1.11 xc/programs/Xserver/hw/xfree86/parser/read.c:1.12
--- xc/programs/Xserver/hw/xfree86/parser/read.c:1.11	Sat Sep  4 06:04:54 1999
+++ xc/programs/Xserver/hw/xfree86/parser/read.c	Tue Apr  4 15:36:55 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/read.c,v 1.11 1999/09/04 13:04:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/read.c,v 1.12 2000/04/04 22:36:55 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -49,7 +49,7 @@
 	int token;
 	XF86ConfigPtr ptr = NULL;
 
-	if ((ptr = xf86confmalloc (sizeof (XF86ConfigRec))) == NULL)
+	if ((ptr = xf86confcalloc (1, sizeof (XF86ConfigRec))) == NULL)
 	{
 		return NULL;
 	}
Index: xc/programs/Xserver/hw/xfree86/parser/scan.c
diff -u xc/programs/Xserver/hw/xfree86/parser/scan.c:1.10 xc/programs/Xserver/hw/xfree86/parser/scan.c:1.12
--- xc/programs/Xserver/hw/xfree86/parser/scan.c:1.10	Thu Mar  2 09:53:13 2000
+++ xc/programs/Xserver/hw/xfree86/parser/scan.c	Wed Apr  5 11:13:57 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/scan.c,v 1.10 2000/03/02 17:53:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/scan.c,v 1.12 2000/04/05 18:13:57 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -94,7 +94,7 @@
 	if (*p == '0')
 	{
 		p++;
-		if (*p == 'x')
+		if ((*p == 'x') || (*p == 'X'))
 		{
 			p++;
 			base = 16;
@@ -205,7 +205,7 @@
 			configRBuf[0] = c;
 			i = 1;
 			while (isdigit (c = configBuf[configPos++]) ||
-				   (c == '.') || (c == 'x') ||
+				   (c == '.') || (c == 'x') || (c == 'X') ||
 				   ((base == 16) && (((c >= 'a') && (c <= 'f')) ||
 									 ((c >= 'A') && (c <= 'F')))))
 				configRBuf[i++] = c;
@@ -359,6 +359,7 @@
  *    %P    projroot
  *    %M    major version number
  *    %%    %
+ *    %&    EMX only: prepend X11ROOT env var
  */
 
 #ifndef XCONFIGFILE
@@ -407,6 +408,9 @@
 	static const char *env = NULL, *home = NULL;
 	static char *hostname = NULL;
 	static char majorvers[3] = "";
+#ifdef __EMX__
+	static char *x11root = NULL;
+#endif
 
 	if (!template)
 		return NULL;
@@ -523,6 +527,16 @@
 				result[l++] = '%';
 				CHECK_LENGTH;
 				break;
+#ifdef __EMX__
+			case '&':
+				if (!x11root)
+					x11root = getenv("X11ROOT");
+				if (x11root)
+					APPEND_STR(x11root);
+				else
+					BAIL_OUT;
+				break;
+#endif
 			default:
 				fprintf(stderr, "invalid escape %%%c found in path template\n",
 						template[i]);
Index: xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h
diff -u xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h:1.19 xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h:1.21
--- xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h:1.19	Tue Jan 25 18:00:51 2000
+++ xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h	Mon Jun 19 22:08:49 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h,v 1.19 2000/01/26 02:00:51 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h,v 1.21 2000/06/20 05:08:49 dawes Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
@@ -203,6 +203,7 @@
 	int dev_chipid;
 	int dev_chiprev;
 	int dev_irq;
+	int dev_screen;
 	XF86OptionPtr dev_option_lst;
 	char *dev_comment;
 }
@@ -356,8 +357,9 @@
 
 typedef struct
 {
+	char *dri_group_name;
 	int dri_group;
-        int dri_mode;
+	int dri_mode;
 	XF86ConfBuffersPtr dri_buffers_lst;
 }
 XF86ConfDRIRec, *XF86ConfDRIPtr;
Index: xc/programs/Xserver/hw/xfree86/ramdac/TI.c
diff -u xc/programs/Xserver/hw/xfree86/ramdac/TI.c:1.1 xc/programs/Xserver/hw/xfree86/ramdac/TI.c:1.5
--- xc/programs/Xserver/hw/xfree86/ramdac/TI.c:1.1	Mon Jun 14 00:32:08 1999
+++ xc/programs/Xserver/hw/xfree86/ramdac/TI.c	Tue May  2 14:04:46 2000
@@ -24,7 +24,7 @@
  * Modified from IBM.c to support TI RAMDAC routines 
  *   by Jens Owen, <jens@precisioninsight.com>.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.1 1999/06/14 07:32:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.5 2000/05/02 21:04:46 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -71,7 +71,7 @@
      * we don't have to bother checking for this maximum limit.
      */
     VCO = (double)ReqClock;
-    for ( p = *rP; p < 3 && VCO < TI_MIN_VCO_FREQ; ( p )++ )
+    for ( p = 0; p < 3 && VCO < TI_MIN_VCO_FREQ; ( p )++ )
 	 VCO *= 2.0;
 
     /*
@@ -158,56 +158,56 @@
     /* only restore clocks if they were valid to begin with */
 
     if (ramdacReg->DacRegs[TIDAC_PIXEL_VALID]) {
-	/* Reset pixel clock */
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0, 0x3c);
-
-	/* Restore N, M & P values for pixel clocks */
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,
+    /* Reset pixel clock */
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0, 0x3c);
+
+    /* Restore N, M & P values for pixel clocks */
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,
 					ramdacReg->DacRegs[TIDAC_PIXEL_N]);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,
 					ramdacReg->DacRegs[TIDAC_PIXEL_M]);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_pixel_data, 0,
 					ramdacReg->DacRegs[TIDAC_PIXEL_P]);
 
-	/* wait for pixel clock to lock */
-	i = 1000000;
-	do {
-	    status = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);
-	} while ((!(status & 0x40)) && (--i));
-	if (!(status & 0x40)) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
+    /* wait for pixel clock to lock */
+    i = 1000000;
+    do {
+	status = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);
+    } while ((!(status & 0x40)) && (--i));
+    if (!(status & 0x40)) {
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
 			"Pixel clock setup timed out\n");
-	    return;
-	}
+	return;
     }
+    }
 
     if (ramdacReg->DacRegs[TIDAC_LOOP_VALID]) {
-	/* Reset loop clock */
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0, 0x70);
-
-	/* Restore N, M & P values for pixel clocks */
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,
+    /* Reset loop clock */
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0, 0x70);
+
+    /* Restore N, M & P values for pixel clocks */
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,
 					ramdacReg->DacRegs[TIDAC_LOOP_N]);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,
 					ramdacReg->DacRegs[TIDAC_LOOP_M]);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_loop_data, 0,
 					ramdacReg->DacRegs[TIDAC_LOOP_P]);
 
-	/* wait for loop clock to lock */
-	i = 1000000;
-	do {
-	    status = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);
-	} while ((!(status & 0x40)) && (--i));
-	if (!(status & 0x40)) {
+    /* wait for loop clock to lock */
+    i = 1000000;
+    do {
+        status = (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);
+    } while ((!(status & 0x40)) && (--i));
+    if (!(status & 0x40)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
 			"Loop clock setup timed out\n");
 	    return;
-	}
     }
+    }
 
     /* restore palette */
     (*ramdacPtr->WriteAddress)(pScrn, 0);
@@ -228,38 +228,32 @@
 				RamDacRegRecPtr ramdacReg)
 {
     int i;
-    unsigned long status;
 
     (*ramdacPtr->ReadAddress)(pScrn, 0);
     for (i=0;i<768;i++)
 	ramdacReg->DAC[i] = (*ramdacPtr->ReadData)(pScrn);
 
-    if (ramdacReg->DacRegs[TIDAC_PIXEL_VALID]) {
-	/* Read back N,M and P values for pixel clock */
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);
-	ramdacReg->DacRegs[TIDAC_PIXEL_N] = 
-		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x11);
-	ramdacReg->DacRegs[TIDAC_PIXEL_M] = 
+    /* Read back N,M and P values for pixel clock */
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);
+    ramdacReg->DacRegs[TIDAC_PIXEL_N] = 
+			(*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x11);
+    ramdacReg->DacRegs[TIDAC_PIXEL_M] = 
+		    	(*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);
+    ramdacReg->DacRegs[TIDAC_PIXEL_P] = 
 		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);
-	ramdacReg->DacRegs[TIDAC_PIXEL_P] = 
-		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_pixel_data);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x33);
-    }
-    if (ramdacReg->DacRegs[TIDAC_LOOP_VALID]) {
-	/* Read back N,M and P values for loop clock */
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);
-	ramdacReg->DacRegs[TIDAC_LOOP_N] = 
+
+    /* Read back N,M and P values for loop clock */
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0);
+    ramdacReg->DacRegs[TIDAC_LOOP_N] = 
 		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x11);
-	ramdacReg->DacRegs[TIDAC_LOOP_M] = 
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x11);
+    ramdacReg->DacRegs[TIDAC_LOOP_M] = 
 		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);
-	ramdacReg->DacRegs[TIDAC_LOOP_P] = 
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x22);
+    ramdacReg->DacRegs[TIDAC_LOOP_P] = 
 		    (*ramdacPtr->ReadDAC)(pScrn, TIDAC_pll_loop_data);
-	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_pll_addr, 0, 0x33);
-    }
 
     /* Order is important */
     TISAVE(TIDAC_latch_ctrl);
@@ -285,7 +279,7 @@
 }
 
 RamDacHelperRecPtr
-TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/* , RamDacRecPtr ramdacPtr*/)
+TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs)
 {
     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
     RamDacHelperRecPtr ramdacHelperPtr = NULL;
@@ -309,6 +303,10 @@
 		if (id == id2 && rev == rev2)  /* check for READ ONLY */
 		    TIramdac_ID = TI3030_RAMDAC;
 		break;
+	case TIDAC_TVP_3026_ID:
+		if (id == id2 && rev == rev2)  /* check for READ ONLY */
+		    TIramdac_ID = TI3026_RAMDAC;
+		break;
     }
 
     (*ramdacPtr->WriteDAC)(pScrn, rev, 0, TIDAC_rev);
@@ -338,8 +336,12 @@
     switch (TIramdac_ID) {
 	case TI3030_RAMDAC:
  	    ramdacHelperPtr->SetBpp = TIramdac3030SetBpp;
-    	    ramdacHelperPtr->HWCursorInit = TIramdac3030HWCursorInit;
+    	    ramdacHelperPtr->HWCursorInit = TIramdacHWCursorInit;
 	    break;
+	case TI3026_RAMDAC:
+ 	    ramdacHelperPtr->SetBpp = TIramdac3026SetBpp;
+    	    ramdacHelperPtr->HWCursorInit = TIramdacHWCursorInit;
+	    break;
     }
     ramdacPtr->RamDacType = TIramdac_ID;
     ramdacHelperPtr->RamDacType = TIramdac_ID;
@@ -350,14 +352,14 @@
 }
 
 void
-TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
+TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
 {
     switch (pScrn->bitsPerPixel) {
     case 32:
 	/* order is important */
 	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
 	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x46;
-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x5D;
+	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x5c;
 	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
 	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
 	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
@@ -373,7 +375,7 @@
 	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
 	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
 	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
-	if (ramdacReg->Overlay) {
+	if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
 	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x06;
 	    ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;
 	    ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x01;
@@ -404,7 +406,7 @@
 	break;
     case 16:
 	/* order is important */
-#ifdef NOT_DONE
+#if 0
 	/* Matrox driver uses this */
 	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x07;
 #else
@@ -415,20 +417,19 @@
 	} else {
 	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x44;
 	}
-#ifdef NOT_DONE
+#if 0
 	/* Matrox driver uses this */
 	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x50;
 	ramdacReg->DacRegs[TIDAC_clock_select] = 0x15;
 	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
 	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;
-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
 #else
-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x55;
+	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x54;
 	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
 	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
 	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
 #endif
+	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
 	/* 0x2A & 0x2B are reserved */
 	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
 	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
@@ -446,21 +447,106 @@
 	/* order is important */
 	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
 	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x80;
-#ifdef NOT_DONE
-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x48;
+	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x4c;
+	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x1C;
+	/* 0x2A & 0x2B are reserved */
+	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0x00;
+	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x00;
+	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+	break;
+    }
+}
+
+void
+TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
+{
+    switch (pScrn->bitsPerPixel) {
+    case 32:
+	/* order is important */
+	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x46;
+	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x5D;
+	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;
+	/* 0x2A & 0x2B are reserved */
+	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+	if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
+	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x06;
+	    ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x3C;
+	    ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x01;
+	}
+	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+	break;
+    case 24:
+	/* order is important */
+	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x56;
+	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x58;
 	ramdacReg->DacRegs[TIDAC_clock_select] = 0x25;
+	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;
+	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
+	/* 0x2A & 0x2B are reserved */
+	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+	break;
+    case 16:
+	/* order is important */
+#if 0
+	/* Matrox driver uses this */
+	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x07;
 #else
-	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x4d;
-	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
 #endif
+	if (pScrn->depth == 16) {
+	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x45;
+	} else {
+	    ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x44;
+	}
+#if 0
+	/* Matrox driver uses this */
+	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x50;
+	ramdacReg->DacRegs[TIDAC_clock_select] = 0x15;
 	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
-#ifdef NOT_DONE
 	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x00;
-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x0C;
 #else
+	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x55;
+	ramdacReg->DacRegs[TIDAC_clock_select] = 0x85;
+	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
 	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
-	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x1C;
 #endif
+	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x2C;
 	/* 0x2A & 0x2B are reserved */
 	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
 	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
@@ -470,6 +556,28 @@
 	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
 	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0xFF;
 	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
+	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x10;
+	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
+	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
+	break;
+    case 8:
+	/* order is important */
+	ramdacReg->DacRegs[TIDAC_latch_ctrl] = 0x06;
+	ramdacReg->DacRegs[TIDAC_true_color_ctrl] = 0x80;
+	ramdacReg->DacRegs[TIDAC_multiplex_ctrl] = 0x4d;
+	ramdacReg->DacRegs[TIDAC_clock_select] = 0x05;
+	ramdacReg->DacRegs[TIDAC_palette_page] = 0x00;
+	ramdacReg->DacRegs[TIDAC_general_ctrl] = 0x10;
+	ramdacReg->DacRegs[TIDAC_misc_ctrl] = 0x1C;
+	/* 0x2A & 0x2B are reserved */
+	ramdacReg->DacRegs[TIDAC_key_over_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_over_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_red_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_red_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_green_low] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_green_high] = 0xFF;
+	ramdacReg->DacRegs[TIDAC_key_blue_low] = 0x00;
+	ramdacReg->DacRegs[TIDAC_key_blue_high] = 0x00;
 	ramdacReg->DacRegs[TIDAC_key_ctrl] = 0x00;
 	ramdacReg->DacRegs[TIDAC_sense_test] = 0x00;
 	ramdacReg->DacRegs[TIDAC_ind_curs_ctrl] = 0x00;
@@ -478,25 +586,25 @@
 }
 
 void 
-TIramdac3030ShowCursor(ScrnInfoPtr pScrn)
+TIramdacShowCursor(ScrnInfoPtr pScrn)
 {
     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
 
     /* Enable cursor - X11 mode */
-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0x6c, 0x13);
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0, 0x03);
 }
 
 void
-TIramdac3030HideCursor(ScrnInfoPtr pScrn)
+TIramdacHideCursor(ScrnInfoPtr pScrn)
 {
     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
 
     /* Disable cursor - X11 mode */
-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0xfc, 0x00);
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0, 0x00);
 }
 
 void
-TIramdac3030SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+TIramdacSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
 {
     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
 
@@ -510,7 +618,7 @@
 }
 
 void
-TIramdac3030SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+TIramdacSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
 {
     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
 
@@ -528,17 +636,16 @@
 }
 
 void 
-TIramdac3030LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
+TIramdacLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
 {
     RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
     int i = 1024;
-int j = 16;
 
     /* reset A9,A8 */
-    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0xf3, 0x00); 
+    (*ramdacPtr->WriteDAC)(pScrn, TIDAC_ind_curs_ctrl, 0, 0x00); 
     /* reset cursor RAM load address A7..A0 */
     (*ramdacPtr->WriteDAC)(pScrn, TIDAC_INDEX, 0x00, 0x00); 
-
+ 
     while(i--) {
 	/* NOT_DONE: might need a delay here */
 	(*ramdacPtr->WriteDAC)(pScrn, TIDAC_CURS_RAM_DATA, 0, *(src++));
@@ -546,23 +653,61 @@
 }
 
 static Bool 
-TIramdac3030UseHWCursor(ScreenPtr pScr, CursorPtr pCurs)
+TIramdacUseHWCursor(ScreenPtr pScr, CursorPtr pCurs)
 {
     return TRUE;
 }
 
 void
-TIramdac3030HWCursorInit(xf86CursorInfoPtr infoPtr)
+TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr)
 {
     infoPtr->MaxWidth = 64;
     infoPtr->MaxHeight = 64;
     infoPtr->Flags = HARDWARE_CURSOR_BIT_ORDER_MSBFIRST |
 		     HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
 		     HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED;
-    infoPtr->SetCursorColors = TIramdac3030SetCursorColors;
-    infoPtr->SetCursorPosition = TIramdac3030SetCursorPosition;
-    infoPtr->LoadCursorImage = TIramdac3030LoadCursorImage;
-    infoPtr->HideCursor = TIramdac3030HideCursor;
-    infoPtr->ShowCursor = TIramdac3030ShowCursor;
-    infoPtr->UseHWCursor = TIramdac3030UseHWCursor;
+    infoPtr->SetCursorColors = TIramdacSetCursorColors;
+    infoPtr->SetCursorPosition = TIramdacSetCursorPosition;
+    infoPtr->LoadCursorImage = TIramdacLoadCursorImage;
+    infoPtr->HideCursor = TIramdacHideCursor;
+    infoPtr->ShowCursor = TIramdacShowCursor;
+    infoPtr->UseHWCursor = TIramdacUseHWCursor;
+}
+
+void TIramdacLoadPalette(
+    ScrnInfoPtr pScrn, 
+    int numColors, 
+    int *indices,
+    LOCO *colors,
+    VisualPtr pVisual
+){
+    RamDacRecPtr hwp = RAMDACSCRPTR(pScrn);
+    int i, index, shift;
+
+    if (pScrn->depth == 16) {
+    for(i = 0; i < numColors; i++) {
+	index = indices[i];
+    	(*hwp->WriteAddress)(pScrn, index << 2);
+	(*hwp->WriteData)(pScrn, colors[index >> 1].red);
+	(*hwp->WriteData)(pScrn, colors[index].green);
+	(*hwp->WriteData)(pScrn, colors[index >> 1].blue);
+
+	if(index <= 31) {
+	    (*hwp->WriteAddress)(pScrn, index << 3);
+	    (*hwp->WriteData)(pScrn, colors[index].red);
+	    (*hwp->WriteData)(pScrn, colors[(index << 1) + 1].green);
+	    (*hwp->WriteData)(pScrn, colors[index].blue);
+	}
+    }
+} else {
+    shift = (pScrn->depth == 15) ? 3 : 0;
+
+    for(i = 0; i < numColors; i++) {
+	index = indices[i];
+    	(*hwp->WriteAddress)(pScrn, index << shift);
+	(*hwp->WriteData)(pScrn, colors[index].red);
+	(*hwp->WriteData)(pScrn, colors[index].green);
+	(*hwp->WriteData)(pScrn, colors[index].blue);
+    }
+}
 }
Index: xc/programs/Xserver/hw/xfree86/ramdac/TI.h
diff -u xc/programs/Xserver/hw/xfree86/ramdac/TI.h:1.2 xc/programs/Xserver/hw/xfree86/ramdac/TI.h:1.4
--- xc/programs/Xserver/hw/xfree86/ramdac/TI.h:1.2	Mon Nov 15 19:46:06 1999
+++ xc/programs/Xserver/hw/xfree86/ramdac/TI.h	Tue May  2 14:04:46 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.2 1999/11/16 03:46:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */
 
 #include <xf86RamDac.h>
 
@@ -9,14 +9,16 @@
 RamDacHelperRecPtr TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs);
 void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
 void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
+void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
 void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
 unsigned long TIramdac3030CalculateMNPForClock(unsigned long RefClock,
     unsigned long ReqClock, char IsPixClock, unsigned long MinClock,
     unsigned long MaxClock, unsigned long *rM, unsigned long *rN,
     unsigned long *rP);
-void TIramdac3030HWCursorInit(xf86CursorInfoPtr infoPtr);
+void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr);
 
 #define TI3030_RAMDAC		(VENDOR_TI << 16) | 0x00
+#define TI3026_RAMDAC		(VENDOR_TI << 16) | 0x01
 
 /*
  * TI Ramdac registers
@@ -84,4 +86,5 @@
 #define TIDAC_sw_reset		0xff
 
 /* Constants */  
+#define TIDAC_TVP_3026_ID       0x26
 #define TIDAC_TVP_3030_ID       0x30
Index: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h
diff -u xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h:1.1 xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h:1.2
--- xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h:1.1	Mon Jun 14 00:32:09 1999
+++ xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h	Tue Mar 21 13:15:28 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.1 1999/06/14 07:32:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 2000/03/21 21:15:28 alanh Exp $ */
 
 #include "TI.h"
 
@@ -10,7 +10,8 @@
 
 #ifdef INIT_TI_RAMDAC_INFO
 xf86TIramdacInfo TIramdacDeviceInfo[] = {
-	{"TI TVP3030"}
+	{"TI TVP3030"},
+	{"TI TVP3026"}
 };
 #endif
 
Index: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c
diff -u xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c:1.5 xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c:1.7
--- xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c:1.5	Wed Oct 13 15:33:08 1999
+++ xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c	Mon Apr 24 16:40:27 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.5 1999/10/13 22:33:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.7 2000/04/24 23:40:27 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -101,12 +101,14 @@
     PointPriv->spriteFuncs = &xf86CursorSpriteFuncs; 
 
     ScreenPriv->SwitchMode = pScrn->SwitchMode;
-    pScrn->SwitchMode = xf86CursorSwitchMode;
     ScreenPriv->EnterVT = pScrn->EnterVT;
-    pScrn->EnterVT = xf86CursorEnterVT; 
     ScreenPriv->LeaveVT = pScrn->LeaveVT;
-    pScrn->LeaveVT = xf86CursorLeaveVT;
     ScreenPriv->SetDGAMode = pScrn->SetDGAMode;
+
+    if(pScrn->SwitchMode)
+	pScrn->SwitchMode = xf86CursorSwitchMode;
+    pScrn->EnterVT = xf86CursorEnterVT; 
+    pScrn->LeaveVT = xf86CursorLeaveVT;
     pScrn->SetDGAMode = xf86SetDGAMode;
 
     return TRUE;
@@ -261,7 +263,7 @@
 
     ret = (*ScreenPriv->SetDGAMode)(index, num, devRet);
 
-    if(!num && ScreenPriv->CurrentCursor) {
+    if(ScreenPriv->CurrentCursor && (!num || (ret != Success))) {
 	xf86CursorSetCursor(pScreen, ScreenPriv->CurrentCursor, 
 			ScreenPriv->x, ScreenPriv->y);
     }
Index: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h
diff -u xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h:1.10 xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h:1.11
--- xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h:1.10	Mon Jun 14 00:32:09 1999
+++ xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h	Tue Mar 21 13:15:28 2000
@@ -1,8 +1,9 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.10 1999/06/14 07:32:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.11 2000/03/21 21:15:28 alanh Exp $ */
 
 #ifndef _XF86RAMDAC_H
 #define _XF86RAMDAC_H 1
 
+#include "colormapst.h"
 #include "xf86Cursor.h"
 
 /* Define unique vendor codes for RAMDAC's */
@@ -28,6 +29,14 @@
 
 typedef struct _RamDacRec {
     CARD32 RamDacType;
+
+    void (*LoadPalette)(
+	ScrnInfoPtr pScrn, 
+	int numColors, 
+	int *indices, 
+	LOCO *colors,
+	VisualPtr pVisual
+    );
 
     unsigned char (*ReadDAC)(
 	ScrnInfoPtr pScrn,
Index: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c
diff -u xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c:1.5 xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c:1.6
--- xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c:1.5	Sat Jul 17 20:27:01 1999
+++ xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c	Tue Mar 21 13:15:28 2000
@@ -23,7 +23,7 @@
  *
  * Generic RAMDAC access to colormaps.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.5 1999/07/18 03:27:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -60,6 +60,13 @@
 RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits,
 		      unsigned int flags)
 {
-  return xf86HandleColormaps(pScreen, maxColors, sigRGBbits,
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    RamDacRecPtr hwp = RAMDACSCRPTR(pScrn);
+
+    if (hwp->LoadPalette == NULL)
+   	return xf86HandleColormaps(pScreen, maxColors, sigRGBbits,
 			     RamDacLoadPalette, NULL, flags);
+    else
+    	return xf86HandleColormaps(pScreen, maxColors, sigRGBbits,
+			     hwp->LoadPalette, NULL, flags);
 }
Index: xc/programs/Xserver/hw/xfree86/scanpci/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/scanpci/Imakefile:1.6 xc/programs/Xserver/hw/xfree86/scanpci/Imakefile:1.8
--- xc/programs/Xserver/hw/xfree86/scanpci/Imakefile:1.6	Sat Aug 14 03:50:08 1999
+++ xc/programs/Xserver/hw/xfree86/scanpci/Imakefile	Thu Apr  6 08:27:26 2000
@@ -1,7 +1,11 @@
 
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/Imakefile,v 1.6 1999/08/14 10:50:08 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/Imakefile,v 1.8 2000/04/06 15:27:26 dawes Exp $
 
-#define IHaveModules
+#if DoLoadableServer
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+
 #include <Server.tmpl>
 
 MODPATHDEFINES = -DDEFAULT_MODULE_PATH=\"$(MODULEDIR)\"
@@ -13,18 +17,16 @@
 		-I$(XF86SRC)/loader $(VGAINCLUDES) -I$(XF86SRC)/rac
 
 SRCS = xf86ScanPci.c xf86PciData.c
-
-ModuleObjectRule()
 
-LibraryModuleTarget(scanpci,xf86ScanPci.o)
+NormalLibraryObjectRule()
 
-InstallLibraryModule(scanpci,$(MODULEDIR),.)
+NormalLibraryTarget(scanpci,xf86ScanPci.o)
 
-LibraryModuleTarget(pcidata,xf86PciData.o)
+NormalLibraryTarget(pcidata,xf86PciData.o)
 
-InstallLibraryModule(pcidata,$(MODULEDIR),.)
+#if DoLoadableServer
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
 
 DependTarget()
-
-InstallDriverSDKLibraryModule(scanpci,$(DRIVERSDKMODULEDIR),.)
-InstallDriverSDKLibraryModule(pcidata,$(DRIVERSDKMODULEDIR),.)
Index: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.c
diff -u xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.c:1.4 xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.c:1.5
--- xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.c:1.4	Mon Feb 21 10:05:49 2000
+++ xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.c	Wed Apr  5 11:13:58 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.c,v 1.4 2000/02/21 18:05:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.c,v 1.5 2000/04/05 18:13:58 dawes Exp $ */
 /*
  * the PCI data structures
  *
@@ -11,13 +11,18 @@
 
 /* XXX This is including a lot of stuff that modules should not include! */
 
-#include <ctype.h>
-#include <stdlib.h>
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Pci.h"
+
+#ifndef IN_MODULE
+#include <ctype.h>
+#include <stdlib.h>
+#else
+#include <xf86_ansic.h>
+#endif
 
 #define INIT_PCI_CARD_INFO		TRUE
 #define DECLARE_CARD_DATASTRUCTURES	TRUE
Index: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c
diff -u xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c:1.10 xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c:1.11
--- xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c:1.10	Mon Feb 21 10:05:49 2000
+++ xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c	Wed Apr  5 11:13:58 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.10 2000/02/21 18:05:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.11 2000/04/05 18:13:58 dawes Exp $ */
 /*
  * Display the Subsystem Vendor Id and Subsystem Id in order to identify
  * the cards installed in this computer
@@ -11,14 +11,19 @@
 
 /* XXX This is including a lot of stuff that modules should not include! */
 
-#include <ctype.h>
-#include <stdlib.h>
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Pci.h"
 #include "xf86_OSproc.h"
+
+#ifndef IN_MODULE
+#include <ctype.h>
+#include <stdlib.h>
+#else
+#include <xf86_ansic.h>
+#endif
 
 #define INIT_PCI_CARD_INFO		TRUE
 #define DECLARE_CARD_DATASTRUCTURES	TRUE
Index: xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:43:22 2000
+++ xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile	Thu Apr  6 08:35:05 2000
@@ -0,0 +1,33 @@
+
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile,v 1.1 2000/04/06 15:35:05 dawes Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+MODPATHDEFINES = -DDEFAULT_MODULE_PATH=\"$(MODULEDIR)\"
+   INCLUDES =	-I$(XF86SRC)/common -I$(XF86OSSRC) -I$(XF86OSSRC)/bus \
+		-I$(SERVERSRC)/include -I$(SERVERSRC)/os \
+		-I$(XINCLUDESRC) -I$(SERVERSRC)/Xext -I$(EXTINCSRC) \
+		-I$(SERVERSRC)/Xi \
+		-I$(FONTLIBSRC)/include -I$(XF86PARSERSRC) \
+		-I$(XF86SRC)/loader $(VGAINCLUDES) -I$(XF86SRC)/rac -I..
+
+SRCS = xf86ScanPci.c xf86PciData.c
+
+LinkSourceFile(xf86ScanPci.c,..)
+LinkSourceFile(xf86PciData.c,..)
+
+ModuleObjectRule()
+
+LibraryModuleTarget(scanpci,xf86ScanPci.o)
+
+InstallLibraryModule(scanpci,$(MODULEDIR),.)
+
+LibraryModuleTarget(pcidata,xf86PciData.o)
+
+InstallLibraryModule(pcidata,$(MODULEDIR),.)
+
+DependTarget()
+
+InstallDriverSDKLibraryModule(scanpci,$(DRIVERSDKMODULEDIR),.)
+InstallDriverSDKLibraryModule(pcidata,$(DRIVERSDKMODULEDIR),.)
Index: xc/programs/Xserver/hw/xfree86/xaa/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/xaa/Imakefile:3.40 xc/programs/Xserver/hw/xfree86/xaa/Imakefile:3.41
--- xc/programs/Xserver/hw/xfree86/xaa/Imakefile:3.40	Thu Nov  4 13:32:55 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/Imakefile	Mon Jun 19 22:08:49 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xaa/Imakefile,v 3.40 1999/11/04 21:32:55 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xaa/Imakefile,v 3.41 2000/06/20 05:08:49 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -16,7 +16,7 @@
 	xaaImage.c xaaPaintWin.c xaaRect.c xaaLineMisc.c xaaBitOrder.c \
 	xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c xaaLine.c \
 	xaaSeg.c xaaDashLine.c xaaDashSeg.c xaaOverlay.c xaaOffscreen.c \
-	xaaOverlayDF.c
+	xaaOverlayDF.c xaaStateChange.c
 
 GENOBJS = xaaInit.o xaaGC.o xaaInitAccel.o xaaFallback.o xaaBitBlt.o \
 	xaaCpyArea.o xaaGCmisc.o xaaCpyWin.o xaaCpyPlane.o xaaFillRect.o \
@@ -24,7 +24,7 @@
 	xaaImage.o xaaPaintWin.o xaaRect.o xaaLineMisc.o xaaBitOrder.o \
 	xaaFillPoly.o xaaWideLine.o xaaTables.o xaaFillArc.o xaaLine.o \
 	xaaSeg.o xaaDashLine.o xaaDashSeg.o xaaOverlay.o xaaOffscreen.o \
-	xaaOverlayDF.o
+	xaaOverlayDF.o xaaStateChange.o
 
 SRCS = $(GENSRCS)
 OBJS = $(GENOBJS) 
Index: xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP
diff -u xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP:1.5 xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP:1.6
--- xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP:1.5	Sat Jul 10 00:24:53 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP	Tue May  2 17:44:21 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP,v 1.5 1999/07/10 07:24:53 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP,v 1.6 2000/05/03 00:44:21 tsi Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -9,8 +9,8 @@
 
 DEFINES = EXPDEFINES
 
-GENSRCS = xaaBitmap.c xaaTEGlyph.c xaaBitmap3.c xaaStipple.c
-GENOBJS = xaaBitmap.o xaaTEGlyph.o xaaBitmap3.o xaaStipple.o
+GENSRCS = xaaBitmap.c xaaBitmap3.c xaaStipple.c xaaStipple3.c xaaTEGlyph.c 
+GENOBJS = xaaBitmap.o xaaBitmap3.o xaaStipple.o xaaStipple3.o xaaTEGlyph.o 
 
 #if defined(i386Architecture) && defined(UseAssembler) && !MakeDllModules
 SRCS = $(GENSRCS) xaaTEGlyphBlt.S
@@ -36,5 +36,6 @@
 #endif
 
 ObjectFromSpecialSource(xaaBitmap3, xaaBitmap, -DTRIPLE_BITS)
+ObjectFromSpecialSource(xaaStipple3, xaaStipple, -DTRIPLE_BITS)
 
 DependTarget()
Index: xc/programs/Xserver/hw/xfree86/xaa/NOTES
diff -u xc/programs/Xserver/hw/xfree86/xaa/NOTES:3.20 xc/programs/Xserver/hw/xfree86/xaa/NOTES:removed
--- xc/programs/Xserver/hw/xfree86/xaa/NOTES:3.20	Sat Jul 25 17:40:48 1998
+++ xc/programs/Xserver/hw/xfree86/xaa/NOTES	Sat Jul  1 20:43:37 2000
@@ -1,1904 +0,0 @@
-
-This document describes the XAA (XFree86 Acceleration Architecture),
-which is the new acceleration interface for the SVGA server (but not
-limited to the SVGA server).
-
-This code is not at all dependent on the SVGA server, but does
-assume linear addressing at > 8bpp. It might be extendable to an
-mi-based set up for configurations that can't use cfb. There are
-still configurations around that need banked support for 16bpp.
-
-To use the new acceleration interface, write low-level functions
-like the sampledrv.c and ark_accel.c and call the ChipInitAccel()
-function before screen initialization (from FbInit in a SVGA
-driver, for example).
-
-You're welcome to comment, test, debug, or add to this code.
-
-Have fun...
-
-Harm Hanemaayer
-H.Hanemaayer@inter.nl.net
-
-Here's a list of known problems (roughly in order of importance). If you
-can confirm a problem using the lastest version, please do so.
-
-- I've seen crashes when using Netscape related to stipple functions.
-  These might be caused by the "fall-back" logic still getting it
-  wrong.  It seems to be triggered by a call of
-  vga8256FillRectTransparentStippled32. Fixed by mod 186?
-
-- The "NonTE" text acceleration triggers core dumps (related to an invalid
-  fall-back function scheme in ValidateGC). It might also trigger lock-ups
-  (which would point towards a problem in NonTE text color expansion).
-  These functions are currently disabled.
-
-- Color expanded (monochrome) 8x8 pattern is may not be working correctly
-  yet in all cases (not fully tested).
-
-- The disabled non-terminal emulator font acceleration is suspect, I
-  don't think it handles horizontally overlapping characters correctly
-  (no visible evidence yet) in the xf86DrawNonTETextScanline function. 
-  I don't know enough about the X font parameters to correctly
-  implement it.
-
-- The SCANLINE_PAD_BYTE and SCANLINE_NO_PAD text transfer code for CPU
-  to screen color expansion has not been fully tested, nor has the
-  FIXED_BASE support.
-
-- The pattern fill primitives are taken to have the same graphics operation
-  restrictions (planemask, rop etc) as ScreenToScreenCopy.
-
-- The support for TRIPLE_BITS_24BPP has improved, but it has not yet
-  been fully tested.
-
-- For color expansion implementation of stipples the graphics operation
-  restriction of color expansion are not honoured, but instead the
-  CopyArea ones are used. This is now sort-of fixed, but it has not been
-  tested in relevant cases.
-
-- Instead of not accelerating GXinvert operations that would normally
-  access the source, we could instead to a GXinvert FillRectSolid.
-
-When the server crashes, run 'gdb -c core XF86_SVGA' and print a
-back-trace ('backtrace').
-
-Change Log:
-
-218. As well as GXinvert, also avoid GXclear, GXnoop, and GXset.
-217. Don't accelerate functions that use source bitmap data (such as text,
-     stipples, bitmaps) when the raster-op is GXinvert.
-216. Truncate pixel values to pixel depth in ValidateGC.
-
-XFree86 3.2v
-215. Rotate monochrome patterns stored in video memory in opposite
-     direction (David Bateman). I doubt whether this is correct.
-214. Add FullPlanemask field to xf86AccelInfoRec, and use it for planemask
-     checks.
-213. Use GC alu instead of cfb reduced "rrop" when checking raster-op
-     restrictions.
-212. Add secondary restriction flag hack for stippled rectangles to
-     correctly handle different restrictions for pixmap cache and color
-     expansion stipple acceleration.
-211. Move macros for graphics operations restriction checks to from
-     xf86gcmisc.c to xf86local.h.
-210. Fix the check for server resets in xf86initac.c and xf86scrin.c (use
-     serverGeneration instead of xf86Resetting).
-
-XFree86 3.2u
-209. Fix monochrome pattern stored in video memory with PROGRAMMED_ORIGIN
-     and SCREEN_ORIGIN (Corin Anderson).
-
-XFree86 3.2s
-208. Respect CapStyle when using TwoPointLine for a non-clipped segment.
-207. Fix line clipping when hardware clipping is used with multiple
-     clipping regions (Xavier Ducoin).
-206. Add a hack to counter cfb cheating in PolyGlyphBlt when it does not
-     call ValidateGC when changing the foreground color to fill in the
-     background (affecting RGB_EQUAL).
-205. Remove left-over fall-back tile function setting code in xf86gcmisc.c
-     that may have caused problems.
-204. At ValidateGC time, take note of background color changes for
-     evaluation of RGB_EQUAL restrictions.
-203. Add support for a monochrome pattern with PROGRAMMED_BITS that
-     needs to be rotated in software, so that all possible monochrome
-     pattern variations are now supported.
-202. Add NO_TEXT_COLOR_EXPANSION flag.
-201. Fix bitmap (CopyPlane1ToN) color expansion acceleration at 24bpp with
-     TRIPLE_BITS_24BPP defined.
-200. Fix support for ScanlineScreenToScreenColorExpand with
-     TRIPLE_BITS_24BPP defined.
-199. Fix the case of a monochrome 8x8 pattern stored in video memory.
-     The code was not consistently assuming that the patternx
-     coordinate is in units of "bits" (David Bateman).
-198. Invalidate the pixmap cache when VT-switching back (suggested by
-     Andrew Vanderstock).
-197. If color expansion is used for stipples, say so in the start-up
-     messages.
-196. Indicate in start-up messages whether 8x8 pattern fill is actually
-     usable.
-195. Better RGB_EQUAL checks for text acceleration with TRIPLE_BITS_24BPP
-     (David Bateman).
-194. Do not accelerate lines with non-FillSolid fill style. Stippled lines
-     were rendered incorrectly as solid lines.
-
-XFree86 3.2r
-193. Check RGB_EQUAL for text acceleration with TRIPLE_BITS_24BPP
-     (David Bateman).
-192. Honour RGB_EQUAL when deciding CopyPlane1To24 acceleration in
-     xf86plane.c.
-191. Fix bugs in handling of left edge in CPU-to-screen color expansion
-     of bitmaps.
-190. When the server resets, don't execute the start-up benchmarks.
-189. When the server resets, don't execute the main part of the
-     xf86GCInfoRec and xf86AccelInfoRec initialization code, which
-     depends on default values for some fields.
-188. When there is any kind of accelerated stippled rectangle fill, also
-     use it for stippled spans.
-187. Add 10x10 CPU-to-screen color expansion benchmark.
-186. Remove left-over broken fall-back stipple function setting code
-     in xf86gcmisc.c, probably fixing crashes.
-185. Implement "no_pixmap_cache", and new "xaa_benchmark" and
-     "xaa_no_color_exp" server flags.
-184. Only print detailed messages when xf86Verbose is TRUE.
-183. Implement color expansion acceleration of stipple-filled rectangles
-     in xf86stip.c. Requires SCANLINE_PAD_DWORD for CPU-to-screen color
-     expansion, and does not support TRIPLE_BITS_24BPP.
-182. Fix SCANLINE_NO_PAD CPU-to-screen color expansion by not defining
-     the flag definition as zero (Koen Gadeyne).
-181. Add LEFT_EDGE_CLIPPING_NEGATIVE_X color expansion flag.
-180. Fix potential bug in handling of LEFT_EDGE_CLIPPING.
-179. Add new file xf86tables.c with byte expansion tables for
-     TRIPLE_BITS_24BPP.
-178. Support TRIPLE_BITS_24BPP for bitmap color expansion, with the
-     exception of non-DWORD scanline padding of CPU-to-screen color
-     expansion.
-177. Fix a probable bug in CPU-to-screen bitmap color expansion in
-     MSB-first mode without left edge clipping.
-176. When checking for hardware pattern usage for tiles, prefer the
-     color expand (monochrome) pattern.
-175. Improve TRIPLE_BITS_24BPP support with color expansion enabled for
-     text using screen-to-screen color color expansion or CPU-to-screen
-     with SCANLINE_PAD_DWORD.
-174. Add TRANSPARENCY_GXCOPY graphics operation flag, and take it into
-     consideration for ScreenToScreenCopy with transparency.
-
-XFree86 3.2q
-173. Fix infinite loop in CPU_TRANSFER_BASE_FIXED color expansion
-     (Xavier Ducoin).
-172. Fix color expansion benchmark when TRIPLE_BITS_24BPP is defined
-     (David Bateman).
-171. When using the monochrome pattern, use an existing cache entry when
-     the stipple is the same but the colors are different.
-170. Fix bugs in pattern handling code.
-169. Fix a bug in the MSB-first version of the Pentium-optimized text
-     bitmap transfer functions (David Bateman).
-168. Fully implement detection of tiles that only use two colors in order
-     to use a monochrome (color-expand) hardware pattern.
-167. Potentially fix the case of rotated monochrome patterns stored video
-     memory.
-166. Change start-up messages a little.
-165. Add support for 8x8 hardware pattern with SCREEN_ORIGIN in addition
-     to PROGRAMMED_ORIGIN, and take into account the bit order when
-     PROGRAMMED_BITS is defined (Radek).
-164. Mark pixmaps that are found to be unsuitable for caching.
-163. Make caching of transparent stipples possible for chips that don't
-     have ScreenToScreenCopy with transparency but do have a color-expand
-     pattern fill that supports transparency.
-162. Add low-level benchmarks for 10x10 pattern fill.
-161. Use 64-bit access on DEC alpha in CPU-to-framebuffer bandwidth
-     benchmark.
-160. Add the HARDWARE_PATTERN_MONO_TRANSPARENCY flag to further
-     differentiate between mono pattern and regular color expansion.
-159. Use depth instead of bitsperpixel in planemask check for line
-     rectangles.
-158. Reorganize the "cfbGetLongWidthAndPointer" function.
-157. Support the HARDWARE_PATTERN_PROGRAMMED_ORIGIN for non-color
-     expanded patterns (including patterns that must be aligned on a 64
-     pixel boundary) and for color-expanded patterns that are stored
-     in video memory.
-156. Various fixes for the cfb8 (non-vga256) support.
-155. At start-up, display a message when no acceleration primitives
-     are defined.
-154. Add ScratchBufferBase field to support scanline screen-to-screen
-     color expansion without a linear framebuffer.
-153. Support multiple buffers for scanline screen-to-screen color
-     expansion. Adds the PingPongBuffers field.
-
-XFree86 3.2n
-152. Add HARDWARE_PATTERN_BIT_ORDER_MSBFIRST flag to differentiate between
-     mono hardware pattern and regular color expansion.
-151. Fix missing fields in xf86defs.c.
-150. Delay the actual initialization of the pixmap cache until general XAA
-     initialization. A server InfoRec field and pixmap cache memory boundary
-     fields are added to the xf86AccelInfoRec. This also eliminates the
-     dependency of the XAA code on vga256 (the SVGA server).
-149. Lift the SCANLINE_PAD_DWORD requirement in xf86initac.c for the
-     enabling of text color expansion.
-148. Add functions in xf86expblt.c for whole text bitmap transfer in the
-     case of BYTE padding or no padding at the end of scanlines, and
-     support this in xf86text.c.
-147. Add a cfb8-based layer to support stand-alone servers not using
-     vga256.
-146. Enable fixed-base CPU-to-screen color-expansion for bitmap and TE text.
-145. Add FIXEDBASE support to color expansion functions in xf86expblt.c.
-144. Add the HARDWARE_PATTERN_PROGRAMMED_BITS and HARDWARE_PATTERN_
-     PROGRAMMED_ORIGIN flags, and implement 8x8 mono pattern code
-     used when both flags are set.
-143. Don't use scanline-byte-padded CPU to screen color expansion since
-     it doesn't work.
-142. Use MSB-first versions of Pentium-optimized text transfer functions
-     when required.
-141. Finally fix the flawed fall-back function schemes, potentially fixing
-     crashes associated with some span and rectangle fills. Still not stable.
-140. More heavily unroll the CPU to framebuffer benchmark code (mainly
-     for the Cyrix 6x86).
-
-XFree86 3.2g
-139. Enable 24bpp CopyPlane acceleration (Dirk).
-
-Version of 17 December 1996 (XFree86 3.2f)
-138. Enable the Pentium-optimized text transfer functions for 6 and 8-pixel
-     wide fonts.
-137. Fix a problem with accelerated horizontal and vertical lines clashing
-     with framebuffer lines.
-136. In some places, fix the "NO_PLANEMASK" check to only check bits up to
-     the actual depth (rather than PMSK).
-135. Avoid recursive xf86miFillRectStippledFallBack call.
-134. When the new HARDWARE_PATTERN_MOD_64_OFFSET flag is set, do use
-     the hardware pattern when the framebuffer width guarantees
-     corrects alignment.
-133. Avoid unaligned accesses in xf86expblt.c for DEC Alpha. Not tested.
-     What's a mem_barrier? Do we need them?
-132. Do not use 8x8 pattern stipple fill at 24bpp because there's no
-     pixmap-to-pixmap CopyPlane1ToN primitive.
-131. Allow CopyPlane1ToN to be accelerated at 24bpp.
-130. Remove messages printed when xf86miStippleFallBack is called.
-129. Add FillRectSolid graphics operation restriction flags to the line
-     draw restrictions in xf86initac.c, fixing a problem with planemask
-     restrictions not being honoured for some lines.
-128. Add some Pentium-optimized text bitmap transfer functions in
-     xf86txtblt.s, but they are not used yet.
-
-XFree86 3.2e
-127. ImakefileBPP renamed to Imakefile.BPP
-
-Version 0.4f (XFree86 3.2d) (28 November 1996)
-126. Fix typo in xf86frect.c, pixmap-cache re-enabled (Alan).
-125. Disable Non-TE text acceleration.
-124. Add text fall-back functions in xf86gcmisc.c.
-123. Fix ImakefileBPP.
-
-Version 0.4e (XFree86 3.2c) (24 November 1996)
-122. Fix some problems with drawing of Non-TE of text strings.
-121. Fix compilation problem in xf86spans.c (Takaaki Nomura).
-120. Add sanity checks in PolyFillRect and FillSpans for <= 0 specified
-     rects or spans.
-119. Make sure the cfb fall-back text functions are initialized correctly.
-     This problem showed up when non-TE text acceleration was added.
-118. Add the TWO_POINT_LINE_ERROR_TERM flag, but don't implement it yet.
-117. Implement a stipple bitmap scanline function in xf86expblt.c for
-     future use in color expansion stipple acceleration.
-116. Implement color expansion text acceleration for non-terminal emulator
-     fonts. Fix non-TE text scanline function in xf86expblt.c.
-115. Add NO_SYNC_AFTER_CPU_COLOR_EXPAND flag.
-114. When cfb MatchCommon is succesful in ValidateGC, make sure the
-     devPrivate.val is still correct. Fixes memory leak.
-113. Fix bug in xf86PolyFillRect. This does not fix the pixmap cache.
-
-Version 0.4d (XFree86 3.2a) (18 November 1996)
-112. Prepare for integration into source tree (hw/xfree86/xaa/*).
-111. Move the declaration of xf86PixmapIndex into xf86initac.c.
-110. Screeninit functions renamed; vgabpp.h renamed to xf86scrin.h.
-109. Cosmetic changes in preparation for integration into source tree.
-108. Rename xf86gc.h to xf86xaa.h, and modify some long filenames.
-107. In ValidateGC, correctly handle the case of the drawable of an
-     on-screen GC being changed to a pixmap.
-106. Fix a problem with byte-padded CPU to screen color expansion in
-     xf86bitmap.c.
-105. Initialize CPUToScreenColorExpandRange to default value of 64K
-     if it is not defined.
-104. Fix missing cfb stipple function mappings in vga256map.h.
-
-Version 0.4c (15 November 1996)
-103. Really fix the CPU-to-screen color expansion benchmark.
-102. Disable the accidently enabled debugging on-screen pixmap cache.
-
-Version 0.4b (15 November 1996)
-101. Add the UsingVGA256 flag to the xf86AccelInfoRec, and use this
-     to adjust the address pointer for low-level line fall-backs for
-     vga256 so that the non-bank checking versions will be used when
-     linear addressing is enabled (implemented in cfb8GetLongWidthAndPointer
-     in xf86im.c).
-100. Add general line acceleration for chips that can only accelerate
-     horizontal/vertical lines using FillRectSolid and for chips that
-     only have TwoPointLine without fool-proof hardware clipping.
- 99. Fix crash with line rectangles when the raster-op is not GXcopy.
- 98. Change the 8x8 pattern benchmark a little.
- 97. Add an aligned screen copy (scroll) test to the low-level benchmarks,
-     and remove the transparent color expansion tests.
- 96. Fix related type warnings in xf86bitmap.c (Radek).
- 95. Really fix the initialization of CPUToScreenColorExpandEndMarker
-     (Radek). 
- 94. Fix the initialization of CPUToScreenColorExpandEndMarker in
-     xf86initacl.c
- 93. Fix problems with small patterns when using 8x8 hardware pattern fill.
- 92. Fix for CopyPlane1to32 (resolves olvwm crash at 32bpp).
- 91. Fix the CPU to screen color expansion benchmark (Radek).
- 90. Use the accelerated FillPolygonSolid from the GCInfoRec in ValidateGC.
- 89. In xf86orect.c, use cfbGCGetPrivate().
- 88. Add monochrome 8x8 tile detection (not used yet).
- 87. Fix external byte_reversed declaration in xf86expblt.c and
-     xf86pcache.c (fixes problem with 8x8 color expanded pattern).
- 86. Fix xf86expblt.c inline asm for different OSs (Takaaki Nomura).
- 85. Support xf86bench.c on different OSs (Akio Morita).
- 84. Fix a bug in the color expanded 8x8 pattern code.
- 83. In ReduceTileToSize8, don't give up when not using 8bpp.
- 82. Cosmetic changes to sampledrv.c.
- 81. Improve the start-up messages.
- 80. In the benchmark routines, avoid memset().
- 79. Lift the LSBFIRST requirement for buffered screen-to-screen color
-     expansion.
-
-Version 0.4a (7 November 1996)
- 78. Correct xf86AccelInfoRec.BitsPerPixel for 24bpp.
- 77. Add ONLY_LEFT_TO_RIGHT_BITBLT for chips that only support screen-to-
-     screen BitBLTs with xdir = 1, and support this in CopyArea.
- 76. Make decisions in InitAccel about whether specified CPU-to-screen
-     color expansion memory range is large enough.
- 75. Add FramebufferWidth (equivalent to infoRec.displayWidth).
- 74. Add CPUToScreenColorExpandRange, which is taken into account after
-     each scanline in text and bitmap color-expansion operations
-     (CPUToScreenColorExpandEndMarker is derived from it).
- 73. Only allow text CPU-to-screen color expansion with SCANLINE_PAD_DWORD
-     defined.
- 72. If the CPUToScreenColorExpandBase isn't initialized, use the
-     start of the framebuffer as color expansion base address.
- 71. Fix bug in DrawNonTETextScanline (a function not yet used).
- 70. Add ONLY_TWO_BITBLT_DIRECTIONS for chips that only support screen-to-
-     screen BitBLTs with xdir = ydir, and support this in CopyArea.
- 69. Add VIDEO_SOURCE_GRANULARITY_DWORD flag for color expansion.
- 68. Fix cfbPushPixels8 name mapping for vga256. This was probably causing
-     most of the stability problems.
-
-Version 0.4 (5 November 1996)
- 67. Add support for color-expanded 8x8 hardware patterns (untested).
- 66. Fix a bug in FillSpansSolid that caused some spans to be drawn
-     at the wrong position (Radek).
- 65. In FillSpansSolid, correctly handle the case of no spans remaining
-     after clipping.
- 64. When doing the raster-op precomputations for cfb in ValidateGC,
-     don't clear the flag indicating that the raster-op has changed
-     since we must still evaluate accelerated functions.
- 63. Correctly modify devPrivate.val when new GC ops are created in
-     ValidateGC.
- 62. Reduce tiles to 8x8 pixels if possible.
- 61. Set the USE_TWO_POINT_LINE flag if appropriate.
- 60. Reduce stipples to 8x8 pixels if possible.
- 59. Add start-up benchmark timings for low-level primitives.
- 58. Reduce stipples and tiles to 8 pixels wide if possible in order to
-     use the 8x8 hardware pattern.
- 57. Add 8x8 hardware pattern stipples.
- 56. Provide a mechanism to call non-accelerated CopyPlane1toN
-     directly. Adds CopyPlane1toNFallBack to GCInfoRec.
- 55. Add the HARDWARE_PATTERN_ALIGN_64 flag (not supported yet).
- 54. Debug the 8x8 hardware pattern.
- 53. Guarantee a different transparency color instead of using the GC
-     background color when caching transparent stipples.
- 52. Add support for 8x8 hardware patterns, and use them for small
-     tiles.
- 51. Add BitsPerPixel to xf86AccelInfoRec.
- 50. Assign fall-back function to xf86AccelInfoRec.ImageWrite if
-     necessary for convenience.
- 49. Lift the VIDEO_SOURCE_GRANULARITY_PIXEL requirement for indirect
-     screen-to-screen text color expansion.
- 48. Add an extra set of wide slots to the pixmap cache. Disabled.
- 47. Honour ONE_RECT_CLIPPING flag when checking line drawing function.
- 46. Support WriteBitmap when only non-transparent color expansion is
-     supported.
-
-Version 0.3b (31 October 1996)
- 45. Update vga256 patch (vga.c) to force GC validation after a VT-switch.
- 44. Support ImageText when only transparent color expansion is supported.
- 43. Add PolyText color expansion for TE fonts.
- 42. Use devPrivate.val to signal status of GC ops, and use this to
-     modify them when required.
- 41. Create new GC ops when GC ops are still pointing to a defaults
-     structure when modifying GC ops in ValidateGC.
- 40. As a stop-gap measure, reset all GC ops and pretend everything in
-     the GC has changed when a switch-away is detected in ValidateGC.
- 39. Update sampledrv.c.
- 38. Disable the pixmap cache if the memory range is wrongly specified
-     (Alan).
- 37. Fix typo in pixmap cache initialization in sampledrv.c.
- 36. Make xf86PolyRectangle use new line drawing functions for vertical
-     lines.
- 35. Add ErrorTermBits to the xf86AccelInfoRec for re-scaling Bresenham
-     error terms when software clipping is used.
- 34. Add flags to indicate whether PolySegment is supported with CapNotLast
-     using TwoPointLine.
- 33. Implement xf86PolyLine/Segment using BresenhamLine or TwoPointLine
-     (untested).
- 32. Add BresenhamLine and TwoPointLine primitives.
- 32. Fix initial coordinates for color-expanded text.
- 31. Move function prototypes from xf86gc.h to xf86local.h.
- 30. Take into account source offset into first byte of bitmap scanline.
- 29. Bitmap with buffered screen-to-screen color expansion now works.
- 28. Fix prototypes for intermediate-level text functions.
- 27. Fix source overrun problems in xf86DrawBitmapScanline.
- 26. Intialize FramebufferBase in ScreenInit.
- 25. Implement untested/unused functions for filling 24bpp pixels using
-     8bpp mode color expansion in two passes.
- 24. Fix color expand flag testing in xf86bitmap.c.
-
-Version 0.3a (28 October 1996)
- 23. If tiles are cached but not stipples (but stipples are accelerated),
-     be aware of this in xf86PolyFillRect.
- 22. Disable updating of the PolyGlyphBlt GC op in ValidateGC because of an
-     unresolved problem showing up at > 8bpp.
- 21. Implement a better understanding of how GC changes affect the selection
-     of cfb and accelerated functions in ValidateGC.
- 20. Fix the way ValidateGC handles cfb operations initialized with
-     MatchCommon.
- 19. Add xf86mapfuncs.h for local functions that are depth-mapped.
- 18. Fix bugs accidently introduced into xf86initacl.c in version 0.3,
-     which effectively disabled pixmap caching.
- 17. Add untested, unoptimized CopyPlane1to24 (GXcopy, no planemask),
-     for use with stipple caching. Doesn't work yet.
-
-Version 0.3 (27 October 1996)
- 16. Use framebuffer function for some vertical lines in PolyRectangle.
- 15. Fix SaveAreas and RestoreAreas for vga256.
- 14. Add PolyLine and PolySegment hooks to the xf86GCInfoRec.
- 13. Fix missing cfbPolyFillArc mappings in vga256map.h.
- 12. Fix MatchCommon call in ValidateGC. This fixes vga256 operation.
- 11. Fix updating of GC ops for text functions during ValidateGC.
- 10. Optimize the CopyPlane1to16/32 functions.
-  9. Update the docs, and include a sample driver template.
-
-Version 0.2 (26 October 1996)
-  8. Re-enable CopyPlane hook.
-  7. Fix typo that prevented CopyArea from being accelerated.
-  6. Fix confusion over arguments of cfbBitBlt helper function.
-  5. Call the correct depth-specific cfbBitBlt helper function.
-  4. Fix the coordinates for the transparent stipple mi fall-back.
-  3. Fix problem with zero-width spans in FillSpansAsRects.
-  2. Disable CopyPlane hook because it doesn't work.
-
-Version 0.1 (25 October 1996)
-  1. First logged version. Implements solid filled rectangles, arcs,
-     polygons, CopyArea, pixmap caching.
-     Untested are line-drawn rectangles, color expansion text, color
-     expansion stipple upload, bitmaps.
-
-
-Overview of XAA
----------------
-
-1.1
-
-Some advantages of this new interface:
-
-- Easier implementation of accelerated functions.
-- More efficient use of accelerated functions.
-- Code size reduction.
-- Source code size reduction (less duplicated code).
-- Greater test base for higher level code.
-- Improvements can be beneficial for all drivers.
-
-Disadvantages:
-
-- More overhead in ValidateGC.
-- Arguably more complex set of acceleration primitives.
-
-
-1.2	Graphics Operation Flags
-
-GXCOPY_ONLY
-
-    Indicates that the graphics operation only allows a GXcopy
-    raster-op (copy source). If this flag is not defined, the graphics
-    operation is assumed to be supported with all 16 raster operations.
-
-NO_PLANEMASK
-
-    Indicates that the graphics operation does not allow a write
-    planemask. All bits in a pixel are written.
-
-ONE_RECT_CLIPPING
-
-    Indicates that an accelerated function (usually a high-level one that 
-    handles clipping) only accepts one clipping rectangle. This may be
-    of use for line drawing. [It is only checked for line drawing]
-
-RGB_EQUAL
-
-    Indicates that the graphics operation requires that the red, green,
-    and blue bytes of the foreground color (and background color, if
-    applicable) are equal. This is useful for 24bpp when the graphics
-    coprocessor is used in 8bpp mode, which is the often the case since
-    most chips have no or only limited support for acceleration at
-    24bpp. This way, many operations will be accelerated for the common
-    case of "grayscale" colors. It should only be defined for 24bpp.
-
-NO_TRANSPARENCY
-
-    Indicates that the graphics operation does not handle transparency.
-    This can be enabled for screen-to-screen copy.
-
-NO_CAP_NOT_LAST
-
-    Indicates that the graphics operation (PolyLine or PolySegment) does
-    not support not drawing of the last pixel.
-
-TRANSPARENCY_GXCOPY
-
-    Indicates that, unlike the case of no transparency, when
-    transparency is enabled only the GXcopy raster-op is allowed. This
-    is valid only for ScreenToScreenCopy.
-
-
-1.3	The AccelInfoRec
-
-Flags
-
-    This is a set of flags that controls some overall parameters for
-    the acceleration code.
-
-    BACKGROUND_OPERATIONS
-
-    If enabled, the "simple" acceleration functions are not assumed to
-    wait until the graphic coprocessor operation is finished. The
-    generic acceleration functions will call Sync() when all operations
-    have been done.
-
-    DELAYED_SYNC
-    
-    If enabled, the acceleration functions will try to use as much
-    parallellism between the CPU and the accelerator as possible by
-    postponing calls to Sync() as much as possible. Without this flag, and
-    with BACKGROUND_OPERATIONS enabled, the acceleration functions will call
-    Sync() after each major set of acelerated operations. With DELAYED_SYNC
-    set, Sync() will only be called when absolutely necessary to maintain
-    framebuffer consistency. In practice, this means Sync() will only be
-    called just before writing to or reading from the framebuffer with the
-    CPU. This option increases performance, but is much more vulnerable to
-    display errors and synchronisation problems.
-
-    PIXMAP_CACHE
-
-    Use a pixmap cache for tiles and stipples, when the required
-    low-level functions (such as ScreenToScreenCopy) are available.
-
-    COP_FRAMEBUFFER_CONCURRENCY
-
-    CPU access to the framebuffer can continue while a screen-to-screen
-    coprocessor operation is being executed. This is taken advantage of
-    in some color expansion routines when CPU-to-screen color expansion
-    is not available, and potentially in some other places.
-
-    DO_NOT_CACHE_STIPPLES
-
-    Do not cache stipples, but instead use the CPU-to-screen color
-    expansion routines for stipples. These routines have not yet been
-    implemented.
-
-    HARDWARE_CLIP_LINE
-
-    When a general line has to be clipped, use hardware clipping
-    (SetClippingRectangle must be defined, and clipping must only
-    be active for the single following general line draw).
-
-    USE_TWO_POINT_LINE
-
-    Use two-point lines (TwoPointLine) instead of Bresenham lines for
-    general lines. This flag is automatically set if appropriate. It
-    must be set in a driver.
-
-    HORIZONTAL_TWOPOINTLINE
-
-    Use TwoPointLine for Horizontal Lines instead of the FillRectSolid
-    function.
-
-    TWO_POINT_LINE_NOT_LAST
-
-    Indicates that TwoPointLine supports the notlast flag that indicates
-    whether the last pixel should be drawn. If this is not supported,
-    PolyLine and PolySegment cannot support the CapNotLast CapStyle.
-
-    TWO_POINT_LINE_ERROR_TERM
-
-    Indicates that TwoPointLine supports the optional error term flag
-    and parameter that allows the initial error term to be provided
-    for software clipped lines.
-
-    ONLY_TWO_BITBLT_DIRECTIONS
-
-    Indicates that ScreenToScreenCopy is only allowed with xdir = ydir
-    (both -1 or both 1). BitBLTs are converted to smaller BitBLTs with
-    supported directions if necessary.
-
-    ONLY_LEFT_TO_RIGHT_BITBLT
-
-    Indicates that ScreenToScreenCopy is only allowed with xdir = 1.
-    BitBLTs are converted to smaller BitBLTs with supported directions
-    if necessary.
-
-    NO_SYNC_AFTER_CPU_COLOR_EXPAND
-
-    Indicates that a Sync() is not required after a CPU-to-screen color
-    expansion operation. Generally, this can be defined if host color
-    expansion data is processed by the graphics chip in the same way as
-    accelerated graphics commands (it uses the command FIFO).
-
-    NO_TEXT_COLOR_EXPANSION
-
-    Do not use color expansion to accelerate text. Define this if
-    color expansion is slower than plain framebuffer for text (which
-    might happen with scanline screen-to-screen color expansion,
-    when there is little video memory bandwidth but the CPU to
-    framebuffer bandwidth is decent).
-
-    LINE_PATTERN_POWER_OF_2_ONLY
-
-    Indicates that hardware dashed lines only support pattern lengths
-    that are a power of two.
-
-    LINE_PATTERN_ONLY_TRANSPARENCY
-
-    Indicates that the hardware dashed lines only support the foreground
-    colors.
-
-    LINE_PATTERN_MSBFIRST_INCREASING
-    LINE_PATTERN_MSBFIRST_DECREASING
-
-    Indicates that the dashed line pattern stored in the LinePatternBuffer
-    progresses from MSB to LSB within each DWORD.  INCREASING patterns
-    are stored with the beginning of the pattern in the first DWORD of
-    the LinePatternBuffer, while DECREASING indicates that the end of the
-    pattern is in the first DWORD in the LinePatternBuffer. INCREASING or
-    DECREASING is only relevant if the pattern is longer than a DWORD. 
-
-PatternFlags
-
-    This is a set of flags that controls some overall parameters for
-    the acceleration code related to the hardware pattern.
-
-    HARDWARE_PATTERN_SCREEN_ORIGIN
-
-    Indicates that the baseline origin for hardware 8x8 pattern fills
-    is the top left corner of the screen, as opposed to the top left
-    corner of the area to be filled. Note that an origin offset feature
-    might still be supported.
-
-    HARDWARE_PATTERN_TRANSPARENCY
-
-    Indicates that the hardware 8x8 pattern fill supports transparency
-    color compare (does not apply to mono pattern).
-
-    HARDWARE_PATTERN_ALIGN_64
-
-    Indicates that the 8x8 hardware pattern must be stored on a
-    64-pixel boundary in video memory, and programmed pattern start
-    location must be the start of such a pattern. In the absence of a
-    programmable origin, this requires a lot more pre-rotated copies to
-    be made, although they should still fit within a 128x128 cache
-    area.
-
-    HARDWARE_PATTERN_MOD_64_OFFSET
-
-    Indicates that while the 8x8 hardware pattern must be stored
-    aligned on a 64-pixel boundary, the programmed pattern start
-    location can in fact include a multiple-of-8-pixels offset, which
-    indicates the vertical offset into the pattern. This flag is
-    mutually exclusive to HARDWARE_PATTERN_ALIGN_64. If you can also
-    specify the horizontal offset, do not use this flag, but instead
-    use HARDWARE_PATTERN_PROGRAMMED_ORIGIN.
-
-    HARDWARE_PATTERN_PROGRAMMED_BITS
-
-    Indicates that the monochrome (color expand) 8x8 pattern data must be
-    programmed into registers, rather than stored in video memory. This
-    is only supported in combination with the following flag.
-
-    HARDWARE_PATTERN_PROGRAMMED_ORIGIN
-
-    Indicates that the hardware pattern supports a programmable origin
-    (x and y offsets into the pattern). This is supported for all three
-    pattern storage types (programmed monochrome, monochrome in video
-    memory and regular (pixel depth) in video memory).
-
-    HARDWARE_PATTERN_BIT_ORDER_MSBFIRST
-
-    Indicates that the monochrome 8x8 pattern data is in MSB-first bit
-    order ("Windows-style").
-
-    HARDWARE_PATTERN_MONO_TRANSPARENCY
-
-    Indicates that the monochrome 8x8 pattern supports transparency
-    (signalled by a background color equal to -1).
-
-    HARDWARE_PATTERN_NOT_LINEAR
-
-    Indicates that the 8x8 pattern data should not be stored linearly
-    in video memory, but rather, as a tiled 8x8 pattern in the cache.
-
-    HARDWARE_PATTERN_NO_PLANEMASK
-
-    Indicates that the 8x8 pattern doesn't support a write planemask.
-    All bits in a pixel must be written.
-
-Sync()
-
-    This function should be defined if BACKGROUND_OPERATIONS is enabled
-    (and also if any kind of CPU-to-screen color expansion is used). It
-    should wait for all graphics coprocessor operations to finish. It
-    also provides an opportunity to clean up the coprocessor state
-    after a batch for commands.
-
-SetupForFillRectSolid(color, rop, planemask)
-
-    Sets up the color, raster-op and planemask for a solid rectangle
-    fill. It is called once before a batch of "Subsequent" fill
-    commands. Currently the restrictions for the operation are set up 
-    with xf86GCInfoRec.PolyFillRectSolidFlags.
-
-    Another acceleration commmand might still be executing when a SetUp
-    function is called (assuming BACKGROUND_OPERATIONS). You may have
-    to do a Sync() here. In the current XAA code this doesn't happen,
-    but it might in the future.
-
-SubsequentFillRectSolid(x, y, w, h)
-
-    This actually fills a rectangle. When writing spans, h will
-    be 1. It is usually called many times in a row.
-
-    A key thing to notice here is that the function call overhead
-    is "eaten" when performing coprocessor operations "in the
-    background" (concurrently with CPU processing). If you need to
-    wait for the previous operation to finish before sending the
-    commands for the next one, you can do that in this function.
-    Generally, you want to avoid querying the chip as much as
-    possible since PCI read operations have a devastating effect
-    on performance.
-
-    This function is taken advantage of when filling solid rectangles,
-    spans, polygons and arcs, and in other places.
-
-SubsequentFillTrapezoidSolid(y, h, left, dxl, dyl, el, right, dxr, dyr, er)
-
-    Defining this will enable most solid polygons to be rendered as a
-    collection of trapezoids rather than horizontal spans. Y is the
-    top line of a trapezoid which has height h. Left and right are the
-    starting X positions of the left and right edges on the top line.
-    Dyl/dxl and dyr/dxr define the slopes of the left and right edges
-    and el and er are the initial error terms (always rendered from 
-    top of the screen to the bottom). 
-
-    Note that dyl, dxl, dyr and dxr are merely used to define the slope
-    of the line and are not necessarily the deltas between the top and
-    bottom points. 
-
-SetupForScreenToScreenCopy(xdir, ydir, rop, planemask, transparency_color)
-
-    Set up for a screen-to-screen BitBLT. The transparency color is -1
-    when there is no transparency. Transparency is used when drawing
-    transparent stipples from the pixmap cache. There are general flags
-    (set in xf86AccelInfoRec.Flags) to indicate restrictions for the
-    direction of the BitBLT (xdir, ydir); if restrictions exist, the
-    generic code converts the blits to allowable blits. Currently the
-    other restrictions for the operation are set up with
-    xf86GCInfoRec.CopyAreaFlags.
-
-SubsequentScreenToScreenCopy(x1, y1, x2, y2, w, h)
-
-    Perform a screen-to-screen BitBLT. Again often there is
-    a batch of commands. Note that (x1, y1) is always the top-left
-    corner, regardless of the direction.
-
-    It is used for screen-to-screen area copies (such as scrolling),
-    and for the pixmap cache.
-
-SubsequentBresenhamLine(x1, y1, octant, err, e1, e2, length)
-
-    Draw a line using the Bresenham algorithm. This is the most common
-    general line drawing feature that chips support. The octant consists
-    of bitflags that are defined as follows (miline.h defines them):
-
-    XDECREASING	    4	Draw from right to left (a.o.t. right to left).
-    YDECREASING	    2	Draw from bottom to top (top to bottom).
-    YMAJOR	    1	Y is the major axis (X is the major axis).
-
-    The error terms are usually no bigger than a screen coordinate, but
-    when software clipping is used, the error time might be too big; it
-    is then rescaled according to the number of bits specified in
-    ErrorTermBits. When HARDWARE_CLIP_LINE is defined,
-    SetClippingRectangle must be defined. It seems to me that hardware
-    clipping makes the implicit assumption that the chip can handle
-    coordinates in the range [-37268, 32767]. Or are coordinates
-    guaranteed to be on-screen? Anyway I think having the chip trace
-    lines way off the screen does not sound like a good idea.
-
-    There is no SetUp function. SetupForFillRectSolid is called before
-    a batch of lines (this linked to the fact that horizontal lines
-    are drawn with FillRectSolid; they should not be affected by
-    hardware clipping).
-
-SubsequentTwoPointLine(x1, y1, x2, y2, bias)
-
-    Draw a line between (x1, y1) and (x2, y2); the last point is drawn. 
-    This is found in some newer chips. It is taken advantage of. The 8
-    lower bits of bias indicate whether 1 should be subtracted from the
-    error term for each of the octants (e.g. bit 0 matches octant 0),
-    it is not a requirement to support this parameter.  If bit 8
-    (0x100) of bias is set, the last pixel should not be drawn (use
-    TWO_POINT_LINE_NOT_LAST to indicate whether this flag is
-    supported). This function requires hardware clipping.
-
-    Note that horizontal lines are always drawn with FillRectSolid.
-
-SetClippingRectangle(x1, y1, x2, y2)
-
-    Set the hardware clipping rectangle. (x2, y2) is the inclusive
-    right-bottom corner. Clipping should be active only for the first
-    following line draw (BresenhamLine or TwoPointLine). This function
-    is only used when HARDWARE_CLIP_LINE is enabled.
-
-SetupForDashedLine(fg, bg, rop, planemask, size)
-
-    Setup the hardware for accelerated dashed lines. Fg and bg are the
-    foreground and background colors respectively.  If bg is -1, the
-    background is transparent.  Size indicates the length of the color
-    expand pattern in bits (pixels) to be used by the subsequent dashed
-    line command.  By the time this function is called, the bit pattern
-    will already reside in the LinePatternBuffer.  The packing order in
-    the buffer is determined by one of the following flags:
-	LINE_PATTERN_MSBFIRST_MSBJUSTIFIED
-	LINE_PATTERN_MSBFIRST_LSBJUSTIFIED
-    One and only one of these flags must be set.  A LinePatternBuffer must
-    be allocated and its length (in bits) recorded as LinePatternMaxLength
-    in order to use hardware dashed lines.
-
-SubsequentDashedBresenhamLine(x1, y1, octant, err, e1, e2, length, offset)
-SubsequentDashedTwoPointLine(x1, y1, x2, y2, bias, offset)
-
-    Draw a dashed line. The first arguments are identical to those of
-    SubsequentBresenhamLine and SubsequentTwoPointLine.  The only 
-    difference is the offset argument which specifies the offset into 
-    the bit pattern the first pixel of this line must start on.
-
-LinePatternMaxLength
-LinePatternBuffer
-
-    LinePatternMaxLength is the maximum length pattern that the hardware
-    can accelerate. Additionally the LINE_PATTERN_POWER_OF_2_ONLY flag 
-    can be set indicating that only patterns with lengths that are a
-    power of two can be accelerated.  The LinePatternBuffer should be
-    allocated by the driver and should be long enough to hold
-    LinePatternMaxLength bits padded out to a DWORD.
-
-SetupForImageWrite(rop, planemask, transparency_color)
-
-    This sets up for multiple pixmap (image) transfers using the
-    transfer window defined by ImageWriteBase and ImageWriteRange.
-    Currently, DWORD padding is required. CPU_TRANSFER_BASE_FIXED
-    is supported but is often only faster than the non-accelerated 
-    versions for rops other than GXcopy.
-
-    If the transparency_color is not -1, then it defines the
-    transparent "masking" color.  If your hardware cannot do
-    transparent image transfers then you should set NO_TRANSPARENCY
-    in the ImageWriteFlags.
-
-SubsequentImageWrite(x, y, w, h, skipleft)
-
-    This sets up for an individual image transfer and is  
-    analogous to the SubsequentCPUToScreenColorExpand function.
-    If the driver supports left edge clipping, then the skipleft
-    parameter specifies the number of pixels to be skipped on the
-    left edge (0 - 3).  This is used in cases of unfavorable source
-    alignment.
-
-SubsequentScanlineScreenToScreenCopy(LineAddr, skipleft, x, y, w)
-
-    This sets up for a scanline by scanline image transfer. If the
-    driver supports left edge clipping, then the skipleft parameter
-    specifies the number of pixels to be skipped on the left edge
-    (0 - 3). This is used in cases of unfavourable source alignment.
-
-ImageWriteFlags
-    
-    In addition to the regular planemask/rop restrictions, the
-    following flags are defined (with meaning similar to the color 
-    expand flags).
-
-    	LEFT_EDGE_CLIPPING
-    	LEFT_EDGE_CLIPPING_NEGATIVE_X
-    	NO_TRANSPARENCY
-	CPU_TRANSFER_BASE_FIXED
-
-    Additionally, a NO_GXCOPY flag can be set to indicate that
-    ImageWrites should only be used for the more complicated rops.
-    This is useful in the case where accelerator assisted image transfers
-    are not faster than the unaccelerated versions for simple copies. 
-    Note: When using the Scanline version of ImageWrite the
-    CPU_TRANSFER_BASE_FIXED is currently unsupported.
-
-ImageWriteBase
-ImageWriteRange
-ImageWriteOffset
-
-    This is often, but not necessarily, the same window defined by the 
-    CPUToScreenColorExpandBase and Range.  ImageWrites may be
-    suboptimal if this range is not at least as large as the 
-    framebuffer width. By default ImageWriteBase is set to 
-    FramebufferBase if not defined.
-
-    When using the ScanlineScreenToScreenCopy, the ImageWriteRange must
-    be a large buffer in video memory, from testing about four scanlines
-    should be sufficient. (needs furthur testing).
-    ImageWriteOffset should be set as the (x * y) offset into the frame
-    buffer for the copy, similar to ImageWriteBase. ImageWriteBase is
-    not used in the Scanline version.
-
-SetupForFill8x8Pattern(patternx, patterny, rop, planemask, trans_col)
-
-    Set up for hardware 8x8 pattern fill (non-color expanded). If
-    neither the HARDWARE_PATTERN_SCREEN_ORIGIN flag or the HARDWARE_
-    PATTERN_PROGRAMMED_ORIGIN flag is set, patternx and patterny can be
-    ignored. Otherwise, patternx and patterny just indicate the video
-    memory address where the pattern is stored. The pattern is stored
-    linearly in video memory unless HARDWARE_PATTERN_NOT_LINEAR is
-    specified. When the transparency color is -1 there is no transparency.
-
-SubsequentFill8x8Pattern(patternx, patterny, x, y, w, h)
-
-    Perform a hardware 8x8 pattern fill. If the flag HARDWARE_PATTERN_
-    SCREEN_ORIGIN is set, patternx and patterny can be ignored;
-    otherwise, patternx and patterny indicate the video memory address
-    where the pattern is stored. However, if HARDWARE_PATTERN_
-    PROGRAMMED_ORIGIN is set patternx and patterny define the origin
-    offset into the pattern. Any rotation issues are handled by the
-    generic code by generating pre-rotated copies of the pattern. The
-    pattern address will always be at a multiple of 8 pixels offset
-    from the start of a scanline (x will be a multiple of 8), unless
-    the HARDWARE_PATTERN_ALIGN_64 is set. At the moment, setting
-    HARDWARE_PATTERN_ALIGN_64 in the absence of HARDWARE_PATTERN_
-    PROGRAMMED_ORIGIN will disable the use of this function, but this
-    will change in a future version.
-
-SetupFor8x8PatternColorExpand(patternx, patterny, bg, fg, rop, planemask)
-
-    Set up for hardware color-expanded 8x8 pattern fill. If the flag
-    HARDWARE_PATTERN_SCREEN_ORIGIN is set, or HARDWARE_PATTERN_
-    PROGRAMMED_ORIGIN is set in the absence of HARDWARE_PATTERN_
-    PROGRAMMED_BITS, patternx and patterny indicate the video memory
-    address where the pattern is stored, which will be on an 8 byte
-    boundary relative to the start of a scanline. Otherwise, patternx
-    and patterny can be ignored. The pattern x-coordinate will be in
-    units of "bits", that is, a byte offset of one relative to the
-    start of the scanline is represented by a patternx value of 8.
-
-    If HARDWARE_PATTERN_PROGRAMMED_BITS is set, patternx and patterny
-    are overloaded as follows: patternx holds the first 4 lines (32
-    pixels) of the pattern, with each byte (MSB-first bit order if the
-    HARDWARE_PATTERN_BIT_ORDER_MSBFIRST flag is set) corresponding to a
-    scanline of the pattern. patterny holds the second half of the
-    pattern. This is the so-called "Windows-format".
-
-    A background color of -1 indicates transparency (support of
-    transparency is indicated by HARDWARE_PATTERN_MONO_TRANSPARENCY).
-
-Subsequent8x8PatternColorExpand(patternx, patterny, x, y, w, h)
-
-    Perform a hardware color-expanded 8x8 pattern fill. If the flag
-    HARDWARE_PATTERN_SCREEN_ORIGIN is set, patternx and patterny
-    can be ignored; otherwise, patternx and patterny indicate the
-    video memory address where the pattern is stored. Any rotating
-    issues are handled by the generic code by generating pre-rotated
-    copies of the pattern. Again patternx is in "bit" or "stencil"
-    units.
-
-    If HARDWARE_PATTERN_PROGRAMMED_ORIGIN is set, patternx and
-    patterny hold the origin (x and y offsets into the pattern).
-    HARDWARE_PATTERN_SCREEN_ORIGIN may be defined additionally;
-    in that case, the following is true: patternx and patterny will
-    be the same for all "Subsequent" calls. You may only need to
-    program the origin in the first Subsequent call.
-
-ColorExpandFlags
-
-    This selects the restrictions for color expansion operations. The
-    flags are extended with a set of flags that is used to define
-    details about the hardware-specific implementation of color
-    expansion, as performed by the low-level color expansion functions. 
-    The following extra flags are defined:
-
-    SCANLINE_NO_PAD
-    SCANLINE_PAD_BYTE
-    SCANLINE_PAD_DWORD
-
-	Defines the padding at the end of a scanline of monochrome
-	data, which indicates the number of bits that is ignored by the
-	graphics chip at the end of each scanline in multi-scanline
-	color-expansion operations from the CPU to the screen. DWORD
-        padding is preferred. These flags do not apply to screen-to-screen
-        color expansion. Currently, not defining SCANLINE_PAD_DWORD will
-        result in non-optimized and limited use of CPU-to-screen color
-        expansion.
-
-    CPU_TRANSFER_PAD_DWORD
-    CPU_TRANSFER_PAD_QWORD
-
-	Defines the total amount of data to be transferred in a
-        multi-scanline CPU-to-screen color-expansion operation. Most
-        chips pad to a DWORD boundary.
-
-    CPU_TRANSFER_BASE_FIXED
-
-	Indicates that the destination address for monochrome data for
-	CPU-to-screen color-expansion is a fixed address, rather than
-	a large range starting from the ColorExpandBase address.
-
-    ONLY_TRANSPARENCY_SUPPORTED
-
-	Indicates that the color expansion operations only work with
-	transparency (bit 0 pixels are not written).
-	
-    TRIPLE_BITS_24BPP
-
-	When enabled (must be in 24bpp mode), color expansion functions
-	are expected to require three times the amount of bits to be
-	transferred so that 24bpp grayscale colors can used with color
-	expansion in 8bpp coprocessor mode. Each bit is expanded to 3
-	bits when writing the monochrome data. When definining this
-        flag, also define RGB_EQUAL.
-
-    VIDEO_SOURCE_GRANULARITY_PIXEL
-    VIDEO_SOURCE_GRANULARITY_BYTE
-    VIDEO_SOURCE_GRANULARITY_DWORD
-
-	This indicates the granularity of the horizontal source location
-	specification for screen-to-screen color expansion operations.
-	It is either one pixel, 8 pixels (a byte), or 32 pixels (a 32-bit
-        word). If there's some kind of clipping mechanism available, pixel
-        granularity is usually possible.
-
-    BIT_ORDER_IN_BYTE_LSBFIRST
-    BIT_ORDER_IN_BYTE_MSBFIRST
-
-	This defines the order of bits within a byte. As far as X is
-	concerned, it's best when the lowest-order bit corresponds to
-	the leftmost pixel on the screen (this is the technically
-	superior format), but many chips only support the "wrong" bit
-	order (MSBFIRST).
-
-    LEFT_EDGE_CLIPPING
-
-	This indicates that CPU-to-screen color expansion operations
-	support the left-edge clipping parameter, which indicates
-	the number of pixels to skip at the left edge.
-
-    LEFT_EDGE_CLIPPING_NEGATIVE_X
-
-	This indicates that when the left-edge clipping parameter is
-        specified, the x coordinate is allowed to be negative (while
-        being on-screen when the parameter is actually added to it).
-        At the moment, this flag is a requirement for CPU-to-screen
-        color expansion acceleration of (large) stipples.
-
-    Note that the regular graphics operations flags for raster-op,
-    planemask and color restrictions are also valid. NO_TRANSPARENCY
-    indicates that color expansion does not support transparency.
-
-SetupForCPUToScreenColorExpand(bg, fg, rop, planemask)
-
-    Set up for CPU-to-screen color expansion operations. This is used
-    for writing bitmaps and text, and (not yet) stipples. When bg is
-    equal to -1, the background (bits that are 0) is transparent.
-
-SubsequentCPUToScreenColorExpand(x, y, w, h, skipleft)
-
-    Perform a CPU-to-screen color expansion operation. The monochrome
-    data will be transferred after this function has been called.
-    Sync() is called when the data has been transferred. The optional
-    skipleft parameter defines a number of pixels (0 - 7) to be skipped
-    at the left edge (at the start of each scanline).
-
-SetupForScreenToScreenColorExpand(bg, fg, rop, planemask)
-
-    Set up for screen-to-screen color expansion operations. This will
-    only be used when the storing of monochrome data in the pixmap (or
-    font) cache is implemented.
-
-SubsequentScreenToScreenColorExpand(srcx, srcy, x, y, w, h)
-
-    Perform a screen-to-screen color expansion operation. scrx is in
-    pixel units (8 corresponds to one byte offset).
-
-SetupForScanlineCPUToScreenColorExpand(x, y, w, bg, fg, rop, planemask)
-
-    Set up for a scanline-by-scanline color expansion operation from
-    the CPU to the screen. This is not of much use (except when a chip
-    is not compatible with supported methods of color expanding a whole
-    bitmap). It's not used currently.
-
-SubsequentScanlineCPUToScreenColorExpand()
-
-    Color expand a scanline from the CPU to the screen. Many chips
-    automatically add the pitch of the dislay to the destination
-    address after a scanline has been written so that it doesn't need
-    to be updated. Otherwise you'll need to keep track of the address.
-
-SetupForScanlineScreenToScreenColorExpand(x, y, w, h, bg, fg, rop, planemask)
-
-    Set up for a scanline-by-scanline color expansion operation from
-    the screen to the screen (top-down). This is typically used for
-    chips that don't have usable CPU-to-screen color expansion. It is
-    taken advantage of for bitmaps, text, and (not yet) stipples.
-
-SubsequentScanlineScreenToScreenColorExpand(srcaddr)
-
-    This performs color expansion of a scanline from the screen
-    (typically a scratch buffer) to the screen. To take advantage of
-    this operation, ScratchBufferAddr and ScratchBufferSize must be
-    defined (> 0), and either linear addressing must be used or
-    ScratchBufferBase must be defined. Being able to support
-    COP_FRAMEBUFFER_CONCURRENCY is a win here. The srcaddr is the
-    linear framebuffer address in (non-expanded) pixel units. The real
-    address is (srcaddr / 8). When TRIPLE_BITS_24BPP is defined,
-    srcaddr is in non-expanded 8bpp pixel units.
-
-    In addition, PingPongBuffers defines the number of alternating
-    buffers used. The default is two. Depending on the implementation
-    and size of framebuffer and coprocessor write buffers on the chip,
-    you might need more than two.
-
-CPUToScreenColorExpandBase
-
-    This address defines the base address for writing monochrome bitmap
-    data to when performing CPU-to-screen color expansion operations. 
-    When the CPU_TRANSFER_BASE_FIXED flag is not set and
-    CPUToScreenColorExpandRange is not defined, a large range is
-    assumed to be available (at least the number pixels in the virtual
-    screen / 8). For text operations this is probably never a problem.
-    At the moment hardware that has 64 bytes or so of transfer space is
-    unlucky. 32-bit access is always used.
-
-    If this is not defined, FramebufferBase will automatically be
-    used.
-
-CPUToScreenColorExpandRange
-
-    This defines the size of the "window" starting from the base
-    address for writing CPU-to-screen color-expand data. If this is
-    not defined or zero, the range is assumed to be large enough.
-    When it is greater than the width of the screen in pixels / 8,
-    the base address will be adjusted if necessary at the end of each
-    scanline. Currently, if it is smaller than that, the
-    CPU_TRANSFER_BASE_FIXED flag is set.
-
-    At the moment, the bottom line is that you need about 256 bytes
-    of transfer space to use CPU-to-screen color expansion (128 bytes
-    with a 1024 pixel screen width) with PCI-burst mode support.
-    However, "fixed-base" operation is supported.
-
-FramebufferBase
-
-    This is a pointer to the framebuffer. It is required by the
-    ScanlineScreenToScreenColorExpand, and is automatically
-    initialized. It should not be set up in a chip-specific driver.
-
-BitsPerPixel
-
-    This is the number of bits per pixel, stored here for convenience.
-    There's no need to initialize this from a driver.
-
-FramebufferWidth
-
-    The is the width of the framebuffer in pixels, stored here for
-    convenience. There's no need to initialize this from a driver.
-
-ScratchBufferAddr
-ScratchBufferSize
-
-    This specifies the linear address in bytes and size of the scratch
-    buffer used for ScanlineScreenToScreenColorExpand operations.
-
-ScratchBufferBase
-
-    This is a pointer to the mapped video memory of the scratch buffer.
-    When not defined, the scratch buffer is assumed to be at the
-    specified offset (ScratchBufferAddr) into a linear framebuffer.
-    This field should only be initialized when using
-    ScanlineScreenToScreenColorExpand with a non-linear framebuffer,
-    in which case it should be noted that it is totally independent
-    from ScratchBufferAddr.
-
-PingPongBuffers
-
-    This field defines the number of alternating buffers used in the
-    scratch buffer for ScanlineScreenToScreenColorExpand. The default
-    is two. Depending on the implementation and size of framebuffer and
-    coprocessor write buffers on the chip, you might need more than
-    two.
-
-ErrorTermBits
-
-    Indicates the number of bits of precision for the Bresenham line
-    error terms. The absolute values of the of the terms are guaranteed
-    to be in the range [0, 2 ^ ErrorTermBits - 1]. If your registers
-    have 14 significant bits, you would probably use 13 here because of
-    the sign bit.
-
-ServerInfoRec
-
-    This is a pointer to the XFree86 server InfoRec. It must be defined.
-    The InitPixmapCache function initializes it for compatibility with
-    earlier versions of XAA. The SVGA server initializes it
-    automatically.
-
-PixmapCacheMemoryStart
-PixmapCacheMemoryEnd
-
-   These values must be defined if the pixmap cache is enabled. The
-   InitPixmapCache function initializes them, for compatibility with
-   earlier versions of XAA.
-
-
-1.6	Commonly Used Parameters
-
-This section clarifies the format of some of the commonly used
-parameters in the low-level functions (as described above).
-
-Coordinates ("x", "y") are pixel coordinates unless otherwise noted.
-
-The width and height ("w", "h") define the size of the area involved in
-pixel units.
-
-Colors (named "color", "bg" or "fg") are simple pixel values. They are
-not "replicated" over the 32-bit integer argument. So for example in
-8bpp mode, bits 0-7 of the value represent the pixel value, and the
-rest of the bits is zero. If your chip requires a "replicated" 32-bit
-pixel value (4 duplicated pixels for 8bpp), you will have to do that in
-your low-level functions implementation.
-
-The planemask is a mask that defines what bits in the pixel value
-are to be modified on the screen. Again, this value cannot be assumed
-to be "replicated" to 32-bit in 8bpp and 16bpp modes.
-
-The raster-op ("rop") is one of the 16 raster-operations that X
-defines:
-
-    #define GXclear			0x0	/* 0 */
-    #define GXand			0x1	/* src AND dst */
-    #define GXandReverse		0x2	/* src AND NOT dst */
-    #define GXcopy			0x3	/* src */
-    #define GXandInverted		0x4	/* NOT src AND dst */
-    #define GXnoop			0x5	/* dst */
-    #define GXxor			0x6	/* src XOR dst */
-    #define GXor			0x7	/* src OR dst */
-    #define GXnor			0x8	/* NOT src AND NOT dst */
-    #define GXequiv			0x9	/* NOT src XOR dst */
-    #define GXinvert			0xa	/* NOT dst */
-    #define GXorReverse			0xb	/* src OR NOT dst */
-    #define GXcopyInverted		0xc	/* NOT src */
-    #define GXorInverted		0xd	/* NOT src OR dst */
-    #define GXnand			0xe	/* NOT src OR NOT dst */
-    #define GXset			0xf	/* 1 */
-
-For each graphics operation you can define that only GXcopy is supported
-by setting the GXCOPY_ONLY flag in the flags for that particular
-operation. Similarly, NO_PLANEMASK indicates that the plane mask is
-not supported.
-
-
-1.5	The best strategy
-
-Start with simple filled solid rectangles and screen-to-screen copies
-(BitBLT). Those two functions alone will accelerate the vast majority
-of graphic operations requested. The sample driver can be used as a
-starting point.
-
-Next you might want to look at color expansion (CPUToScreen, or if
-that can't be done, ScanlineScreenToScreen), BresenhamLine or
-TwoPointLine, and Fill8x8Pattern/ColorExpand8x8Pattern.
-
-The relative win of seperately implementing functions that are already
-accelerated with solid filled rectangles varies, but it can make a
-difference since just using rectangle fills has some overhead. You may
-be able to make better use of features of the graphics chip, and better
-exploit CPU/graphics concurrency, although this already done by the
-generic code for some operations (such as filled polygons and arcs).
-
-
-2	Acceleration hooks
-
-Many operations can be "hooked" at a higher level, instead of just
-defining the low-level functions. This can be useful for existing code
-or operations for which there are no adequate low-level functions. What
-follow is a description of most of the functions that can be hooked.
-
-[This isn't complete]
-
-2.1	Filled Rectangles
-
-Rectangles can be filled with a single source color, or with three
-different types of repeating pattern:
-
-    Stipple: a transparent bitmap pattern where 1's correspond to the
-    foreground color.
-
-    Opaque stipple: a bitmap pattern where 0's correspond to the
-    background color and 1's to the foreground color.
-
-    Tile: an image pattern that can have full pixel depth.
-
-2.1.1	Solid Filled Rectangles
-
-Solid filled rectangles are a very common operation. Apart from
-a regular solid fill, special raster ops are often used, for example
-for inverting the destination.
-
-To define a simple function for drawing one filled rectangle that will
-be used for many kinds of operation, use this:
-
-    xf86AccelInfoRec.SetupForFillRectSolid = MySetupForFillRectSolid;
-    xf86AccelInfoRec.SubsequentFillRectSolid = MySubsequentFillRectSolid;
-
-If you accelerate solid filled rectangles, and have a complete
-replacement for PolyFillRect that handles clipping, do this:
-
-    xf86GCInfoRec.PolyFillRectSolid = MyPolyFillRect;
-
-If you don't handle clipping, but do have a replacement for accelerated
-solid filled rectangles, do this:
-
-    xf86GCInfoRec.PolyFillRectSolid = xf86PolyFillRect;
-    xf86AccelInfoRec.FillRectSolid = MyFillRectSolid;
-
-In all cases, the following flags can be set in
-xfGCInfoRec.FillRectSolidFlags:
-
-    GXCOPY_ONLY		    Only the raster-op GXcopy is supported.
-    NO_PLANEMASK            No special planemask is supported.
-    RGB_EQUAL		    Only a foreground color with same values
-			    for red, green and blue is accepted.
-
-2.1.2	Tiled Filled Rectangles
-
-If you have the required low-level functions and enable PIXMAP_CACHE,
-the pixmap cache will be used to draw tiles. For tiles, you just need
-ScreenToScreenCopy.
-
-If you accelerate tiled filled rectangles, and have a complete
-replacement for PolyFillRect that handles clipping, do this:
-
-    xf86GCInfoRec.PolyFillRectTiled = MyPolyFillRect;
-
-If you don't handle clipping, but do have accelerated tiled filled
-rectangles, do this:
-
-    xf86GCInfoRec.PolyFillRectTiled = xf86PolyFillRect;
-    xf86AccelInfoRec.FillRectTiled = MyFillRectTiled;
-
-In both cases, the following flags can be set in
-xfGCInfoRec.FillRectTiledFlags:
-
-    GXCOPY_ONLY		    Only the raster-op GXcopy is supported.
-    NO_PLANEMASK            No special planemask is supported.
-
-2.1.3	Stippled Filled Rectangles
-
-If you have the required low-level functions and enable PIXMAP_CACHE,
-the pixmap cache will be used to draw stipples. For stipples, you just need
-ScreenToScreenCopy with support for transparency.
-
-If you accelerate stippled filled rectangles, and have a complete
-replacement for PolyFillRect that handles clipping, do this:
-
-    xf86GCInfoRec.PolyFillRectStippled = MyPolyFillRect;
-
-If you don't handle clipping, but do have accelerated stippled filled
-rectangles, do this:
-
-    xf86GCInfoRec.PolyFillRectStippled = xf86PolyFillRect;
-    xf86AccelInfoRec.FillRectStippled = MyFillRectStippled;
-
-In both cases, the following flags can be set in
-xfGCInfoRec.FillRectStippledFlags:
-
-    GXCOPY_ONLY		    Only the raster-op GXcopy is supported.
-    NO_PLANEMASK            No special planemask is supported.
-
-2.1.4	Opaque Stippled Filled Rectangles
-
-If you have the required low-level functions and enable PIXMAP_CACHE,
-the pixmap cache will be used to draw stipples. For stipples, you just need
-ScreenToScreenCopy.
-
-If you accelerate opaque filled rectangles, and have a complete
-replacement for PolyFillRect that handles clipping, do this:
-
-    xf86GCInfoRec.PolyFillRectOpaqueStippled = MyPolyFillRect;
-
-If you don't handle clipping, but do have accelerated opaque filled
-rectangles, do this:
-
-    xf86GCInfoRec.PolyFillRectOpaqueStippled = xf86PolyFillRect;
-    xf86AccelInfoRec.FillRectOpaqueStippled = MyFillRectOpaqueStippled;
-
-In both cases, the following flags can be set in
-xf86GCInfoRec.FillRectOpaqueStippledFlags:
-
-    GXCOPY_ONLY		    Only the raster-op GXcopy is supported.
-    NO_PLANEMASK            No special planemask is supported.
-
-2.2	Filled Spans
-
-Filled spans can be used for many purposes, mostly filled areas
-of different shapes. The fill style can be solid (by far the most
-useful), tiled, stippled and opaque stippled.
-
-If you accelerate solid filled spans, and have a complete
-replacement for FillSpansSolid that handles clipping, do this:
-
-    xf86GCInfoRec.FillSpansSolid = MyFillSpanstSolid;
-
-And similarly for other fill styles:
-
-    xf86GCInfoRec.FillSpansTiled = MyFillSpanstTiled;
-    xf86GCInfoRec.FillSpansStippled = MyFillSpanstStippled;
-    xf86GCInfoRec.FillSpansOpaqueStippled = MyFillSpanstOpaqueStippled;
-
-If you don't handle clipping, but do have a function for drawing solid
-filled spans, do this:
-
-    xf86GCInfoRec.FillSpansSolid = xf86FillSpans;
-    xf86AccelInfoRec.FillSpansSolid = MyFillSpansSolid;
-
-In all cases, the following flags can be set in
-xfGCInfoRec.FillSpansSolidFlags (and similarly for for other fill styles):
-
-    GXCOPY_ONLY		    Only the raster-op GXcopy is supported.
-    NO_PLANEMASK            No special planemask is supported.
-    RGB_EQUAL		    Only a foreground color with same values
-			    for red, green and blue is accepted.
-
-2.3	Filled Arcs
-
-If you accelerate filled solid arcs, and have a complete replacement
-for PolyFillArc that handles clipping, do this:
-
-    xf86GCInfoRec.PolyFillArc = MyPolyFillArc;
-
-The following flags can be set in xf86GCInfoRec.PolyFillArcFlags:
-
-    GXCOPY_ONLY		    Only the raster-op GXcopy is supported.
-    NO_PLANEMASK            No special planemask is supported.
-
-If you have a function for accelerated solid horizontal spans, it will
-automatically be taken advantage of for filled arcs.
-
-2.4	Text
-
-There are two kinds of text, transparent text (the background is not
-written), and image text (the background is filled with the background
-color).
-
-There are also two types of font. Terminal-emulator fonts, which have
-characters that are all the same size, and non-terminal emulator fonts,
-which have characters of varying size.
-
-In the case of image text with a non-terminal emulator font, the filled
-background corresponds to the bounding box of the text image.
-
-2.4.1	Transparent Text
-
-If you accelerate transparent text strings, and have a complete replacement
-for PolyGlyphBlt that handles clipping, do this if you accelerate
-terminal-emulator fonts:
-
-    xf86GCInfoRec.PolyGlyphBltTE = MyPolyGlyphBltTE;
-
-And if you also support non-terminal emulator fonts:
-
-    xf8GCInfoRec.PolyGlyphBltNonTE = MyPolyGlyphBltNonTE;
-
-And if you also support non-terminal emulator fonts:
-
-    xf8GCInfoRec.PolyGlyphBltNonTE = MyPolyGlyphBltNonTE;
-
-If you don't handle clipping, but do have accelerated transparent text:
-
-    xf86GCInfoRec.PolyGlyphBltTE = xf86PolyGlyphBltTE;
-    xf86AccelInfoRec.PolyTextTE = MyPolyTextTE;
-
-And similarly for non-terminal emulator fonts:
-
-    xf86GCInfoRec.PolyGlyphBltNonTE = xf86PolyGlyphBltNonTE;
-    xf86AccelInfoRec.PolyTextNonTE = MyPolyTextNonTE;
-
-2.4.2	Image text
-
-If you accelerate image text strings, and have a complete replacement
-for ImageGlyphBlt that handles clipping, do this if you accelerate
-terminal-emulator fonts:
-
-    xf86GCInfoRec.ImageGlyphBltTE = MyImageGlyphBltTE;
-
-And if you also support non-terminal emulator fonts:
-
-    xf8GCInfoRec.ImageGlyphBltNonTE = MyImageGlyphBltNonTE;
-
-If you don't handle clipping, but do have accelerated transparent text:
-
-    xf86GCInfoRec.ImageGlyphBltTE = xf86ImageGlyphBltTE;
-    xf86AccelInfoRec.ImageTextTE = MyImageTextTE;
-
-And similarly for non-terminal emulator fonts:
-
-    xf86GCInfoRec.ImageGlyphBltNonTE = xf86ImageGlyphBltNonTE;
-    xf86AccelInfoRec.ImageTextNonTE = MyImageTextNonTE;
-
-2.5	CopyArea
-
-Screen-to-screen area copies (BitBLTs) are extremely useful. It's vital
-for smooth scrolling and dragging of windows. Unaccelerated, this
-operation is often slow because of the slowness of read operations
-from the framebuffer. This function can also be used to great effect
-for caching mechanisms for patterns and fonts, when support for it
-is added.
-
-If you accelerate screen-to-screen area copies (BitBLTs), and have a
-complete replacement for CopyArea that handles clipping, do this:
-
-    xf8GCInfoRec.CopyArea = MyCopyArea;
-
-If you don't handle clipping, but do have an accelerated CopyArea:
-
-    xf86GCInfoRec.CopyArea = xf86CopyArea;
-    xf86AccelInfoRec.ScreenToScreenBitBlt = MyScreenToScreenBitBlt;
-
-In all cases, the following flags can be set in
-xfGCInfoRec.CopyAreaFlags:
-
-    GXCOPY_ONLY		    Only the raster-op GXcopy is supported.
-    NO_PLANEMASK            No special planemask is supported.
-    NO_TRANSPARENCY         Transparency color compare is not supported.
-
-
-3.	Opportunities For Improvement
-
-- The graphics operation flags aren't consistent. There should be
-  seperate flags indicating the restrictions for the lower-level
-  functions.
-
-- VT-switching awareness has not been extensively tested, and the
-  current implement has a few rough edges.
-
-- Solid tile fill may be faster with cfb in some cases (if the chip
-  doesn't have much video memory bandwidth to play with and the PCI
-  bus bandwidth is decent).
-
-- Having a function for clipped filled spans that clips on the fly. This
-  doesn't exist yet anywhere in the source tree. This would be a minor
-  speed up for things like clipped filled polygons and arcs, and wide
-  lines.
-
-- Having the pixmap cache store stipples in monochrome format, and using
-  color expansion features of the graphics chip to replicate them. This
-  is more efficient since less video memory bandwidth is required for
-  the cached pattern source. Not all chips support this kind of operation
-  easily, especially w.r.t. clipping of the leftmost edge (the first pixel
-  to be drawn may start at some bit of the leftmost video memory byte), and
-  defining the location of the monochrome pattern in video memory can be
-  a little complex.
-
-- Taking more advantage of built-in (8x8) chip pattern registers. This
-  works OK now, but things not implemented include detection of
-  tiles that have only two colors so that they can be done with
-  color-expand 8x8 pattern fill, and interleaving schemes allowing 16
-  and 32 pixel high patterns to be done using the hardware pattern. Also
-  some chips support 16x8 and 32x8 pattern fill at 8bpp by using 16bpp
-  or 32bpp pattern fill. Currently, support for chips that require the
-  pattern to be aligned on a 64-pixel boundary is missing in most cases,
-  which in practice means the 8x8 pattern is not usable for many chips.
-
-- Font-caching (useful for configurations where it's not possible to use
-  color expansion for text, and for certain fonts). Non-"terminal emulator"
-  fonts is certainly a weak area of XAA.
-
-- Complete implementation of non-terminal emulator font text acceleration
-  using color expansion (the code is in place, but causes problems).
-
-- Generic hardware-cursor code (this sounds very useful to me), including
-  Harald Koenig's support for real-time software/hardware cursor switching.
-
-- More complete 24bpp-in-8bpp-mode support. Missing is full implementation
-  of color expansion schemes to allow 24bpp fills in 8bpp mode in two
-  passes.
-
-- The Pentium optimized text bitmap functions exist only for 6 and 8-pixel
-  wide fonts. BTW, on a Cyrix 6x86 the Pentium-optimized 6-wide function
-  seems to cause a 2% performance decrease.
-
-- Accelerated stipples using direct color expansion would definitely be
-  worthwhile.  The lowest-level function is in place (but untested). It
-  would take care of cases where the font cache cannot be used (such as
-  24bpp, lack of transparency color compare for transparent stipples,
-  lack of off-screen video memory), or when color expansion is faster
-  (generally on video memory bandwidth-starved configurations).
-
-3.1	More Concurrency?
-
-More concurrency between graphics and CPU processing sounds very
-attractive. This can be implemented by not "syncing" when leaving the
-graphic drawing code, but instead allowing graphics commands to
-continue while X is doing its request processing, or even during
-context switching or when the client is running. The ever larger PCI
-write buffers help to make this a very nice optimization. This requires
-awareness of coprocessor activity at several levels in the server code
-(for example, at any point where something is read or written to the
-video card).
-
-There are variations between chipsets that affect how easily they would
-support such a scheme. The best behaviour is what I would call "in
-order execution" of coprocessor commands and simple CPU writes to the
-framebuffer. That is, if you send some graphics coprocessor commands to
-the chip, and then write something to the framebuffer, it is guaranteed
-that the framebuffer writes will only happen when the graphics commands
-have been completed. This avoids, for example, having to check for
-coprocessor activity each time something is drawn with a "dumb"
-framebuffer function. I think that PCI write buffers on the motherboard
-generally follow this behaviour, but graphics chips generally do not.
-
-Of course, reading or querying anything from the graphics card is
-something you will want to avoid, since in most cases this will result
-in the CPU being stalled until all the PCI and on-chip write buffers
-are flushed and processed. Chips that require frequent querying or do
-not allow concurrent coprocessor execution and CPU framebuffer access
-will take much less benefit.
-
-A somewhat wild way to test this kind of scheme is to simply not define
-the BACKGROUND_OPERATIONS flag, but despite that not do any syncing
-in the graphics primitives. Without BACKGROUND_OPERATIONS set, the XAA
-code almost never calls Sync itself. Someone (inadvertently) tried
-this on an ET6000, and it seemed to measurably increase
-performance. This is of course hazardous and prone to lock-ups etc.
-
-
-4.	Comparison Of Chip-specific Implementations
-
-
-4.1	Current Chip-specific Implementations
-
-ARK Logic
-
-    Uses BACKGROUND_OPERATIONS and COP_FRAMEBUFFER_CONCURRENCY. The
-    latter is vital for high-performance color expansion, since the
-    ARK chips don't appear to have CPU-to-screen color expansion.
-    There's no need to "sync" during a batch of accelerator commands;
-    the ARK chips seem to have "PCI-Retry" support.
-
-    Screen locations are programmed as pixel addresses. The ARK chip
-    also supports coordinates, but that restricts the possible
-    framebuffer widths and I don't think it would be faster.
-
-    FillRectSolid is provided. At 24bpp, it uses 8bpp coprocessor mode
-    which leads to RGB_EQUAL and NO_PLANEMASK restrictions. 
-    ScreenToScreenCopy is supported, again restrictions at 24bpp:
-    NO_PLANEMASK and NO_TRANSPARENCY. BresenhamLine is very
-    straightforward.
-
-    Fill8x8Pattern is supported; the ARK chip requires the pattern to
-    be aligned on a 64-pixel boundary and the address modulo 64 seems
-    to indicate the vertical offset (y origin) (HARDWARE_PATTERN_MOD_
-    64_OFFSET). The latter means the pattern can actually be used (when
-    the framebuffer width is a multiple of 64), despite the limited
-    support for 64-pixel pattern alignment in XAA.  The ARK chips don't
-    seem to have support for a monochrome pattern.
-
-    Color expansion is implemented using ScanlineScreenToScreen-
-    ColorExpand (24bpp: RGB_EQUAL, NO_PLANEMASK), which is pretty fast
-    thanks to COP_FRAMEBUFFER_CONCURRENCY.
-    Color expansion flags are VIDEO_SOURCE_GRANULARITY_PIXEL and
-    BIT_ORDER_IN_BYTE_LSBFIRST. At 24bpp, TRIPLE_BITS_24BPP would be
-    useful but is not yet supported by XAA.
-
-    ScreenToScreenColorExpand is provided for future use by XAA. One
-    thing that ARK chips can accelerate but is not yet provided by XAA
-    is styled (patterned) line drawing.
-
-Cirrus Logic GD5426/28/29/30/34/40/46 and 7543/48
-
-    Uses BACKGROUND_OPERATIONS. The driver is shared by a very wide
-    range of largely compatible chips, from the first-generation
-    accelerator CL-GD5426 to the recent CL-GD5446, which is the only
-    one to support COP_FRAMEBUFFER_CONCURRENCY and also doesn't need
-    "sync"-ing between coprocessor operations. Screen locations are
-    programmed as byte addresses (which makes the driver larger than,
-    for example, ARK). The driver is compiled twice, with programmed I/O
-    (required for earlier chips) and with memory-mapped I/O.
-
-    FillSolidRect is provided (NO_PLANEMASK, since the chips don't
-    support a planemask), and at 24bpp on a non-5436/46 uses 8bpp mode
-    in which case RGB_EQUAL is set.
-
-    ScreenToScreenCopy is supported (NO_PLANEMASK). A few chips
-    (5429/30/34) don't support transparency color compare at all
-    (NO_TRANSPARENCY), and none of the chips support it at pixel depths
-    greater than 16bpp.
-
-    For CPU-to-screen color expansion, chips earlier than the CL-GD5436
-    don't support DWORD padding of scanlines, so the XAA code isn't
-    usable for them. Instead, these chips use byte-padding-aware text
-    acceleration code from the old accelerated driver, and the
-    ScanlineScreenToScreenColorExpand method (which isn't very fast
-    on these chips) is provided for other things. NO_PLANEMASK.  The
-    5436/46 support 24bpp color expansion, but only with transparency
-    (ONLY_TRANSPARENCY_SUPPORTED); the others would benefit from
-    TRIPLE_BITS_24BPP. The bit order is BIT_ORDER_IN_BYTE_MSBFIRST. The
-    LEFT_EDGE_CLIPPING parameter (a value from 0 to 7) is supported for
-    CPU-to-screen color expansion. Screen-to-screen color expansion is
-    provided for future use. It requires the source to be aligned on a
-    DWORD boundary (VIDEO_SOURCE_GRANULARITY_DWORD).
-
-Matrox Millennium
-
-    BACKGROUND_OPERATIONS
-    24bpp: NO_PLANEMASK
-    FillRectSolid
-    ScreenToScreenCopy (NO_TRANSPARENCY)
-
-    Color expansion:
-    CPUToScreenColorExpand
-    SCANLINE_PAD_DWORD
-    CPU_TRANSFER_PAD_DWORD
-    BIT_ORDER_IN_BYTE_LSBFIRST
-    LEFT_EDGE_CLIPPING
-    ScreenToScreenColorExpand
-    VIDEO_SOURCE_GRANULARITY_PIXEL
-
-
-4.2	Chip-specific Performance
-
-This table is intended to help with determining what kinds of
-operations best suit a particular chip. It shows the results (in MB/s)
-for the low-level bandwidth benchmarks run at start-up. Because refresh
-is disabled at the time time benchmark is run, the result reflects the
-full DRAM bandwidth on DRAM-based cards (the dot clock doesn't really
-matter). For this reason, the comparison isn't really fair (biased against
-VRAM/WRAM and MDRAM). The virtual display width can have an influence.
-
-Chip	          ARK1000PV Trid9385  CLGD5434  TGUI9440  MGA-Mill  ET6000
-Memory            1MB DRAM  2MB DRAM  2MB DRAM  1MB DRAM  2MB WRAM  2MB MDRAM
-CPU               DX4/100   ?         DX4/100   AMK5/100  AMK5/100  6x86P150+
-Bus		  PCI 33MHz PCI       VLB 33MHz PCI 33MHz PCI 33MHz PCI 30MHz
-bpp, width        8bpp 1024 8bpp      8bpp 1024 8bpp      8bpp      8bpp
------------------------------------------------------------------------------
-framebuffer        43.95     15.89     32.76     44.23     44.48     61.40
-solid filled rect
-10x1                7.38      3.14      4.58      8.72     34.99     28.22
-40x40              85.82     89.93    120.34     62.60    369.84    143.84
-400x400           108.81    157.20    211.18     80.03   1618.11    264.35
-screen copy
-10x10		   24.77     11.26     20.49     18.53     28.14     24.22
-40x40		   38.81     43.90     41.68     32.11     89.27     70.57
-400x400		   46.70     68.59     54.47     34.14    126.88    194.23
-400x400 scroll       -         -       55.63     40.22       -      189.34
-8x8 pattern fill
-400x400		  105.16    116.08       -       80.02       -      264.34
-color expansion
-CPU to screen        -         -      116.25       -      261.03*      -
-scanl. scr-to-scr  71.75       -       80.64       -         -      187.25
-10x10 scr-to-scr   29.90       -       26.69     20.07       -         -
-
-Chip	          MGA-Mill  MGA-Mill  MGA-Mill  TGUI9680  ARK2000PV
-Memory            2MB WRAM  4MB WRAM  2MB WRAM  2MB DRAM  2MB EDO
-CPU               DX4/133   P133      P133                DX4/100  
-Bus		  PCI 33MHz PCI 33MHz PCI 33Mhz PCI       PCI 33MHz
-bpp, width        8bpp      8bpp 1024 8bpp 1152 8bpp 2048 8bpp 1024
--------------------------------------------------------------------
-framebuffer        26.48     83.70     83.13     10.09     64.44   
-solid filled rect
-10x1               28.63     34.28     41.30      3.06      7.91   
-40x40             385.13    316.47    453.02     55.97    155.76   
-400x400          1656.93   1367.64   1942.59    145.16    244.35   
-screen copy
-10x10		   29.18     23.47     35.09     12.61     33.20   
-40x40		   81.52     74.55     99.92     35.38     78.80   
-400x400		  114.81    105.83    137.60     46.48     99.03   
-400x400 scroll       -         -         -       51.88    100.08   
-8x8 pattern fill
-400x400		     -         -         -       51.74    228.70   
-color expansion
-CPU to screen     211.11*   419.09*   416.23*      -         -     
-scanl. scr-to-scr    -         -         -         -      137.97   
-10x10 scr-to-scr     -         -         -       15.26     36.79   
-
-Chip		  ARK2000PV ARK2000PV MGA-Mill  CL-GD5426 CL-GD5446
-Memory		  2MB EDO   2MB EDO   2MB WRAM  1MB DRAM  2MB DRAM
-CPU		  6x86P150+ 6x86P166+ 6x86P166+ DX4/100   P133
-Bus		  PCI 30MHz PCI 33Mhz PCI 33MHz VLB 33MHz PCI 33Mhz
-bpp, width	  8bpp 1024 8bpp 1024 8bpp 1024 8bpp 1024 8bpp 1280
--------------------------------------------------------------------
-framebuffer	   88.84    100.45     92.18     13.22     80.81
-solid filled rect
-10x1		   20.99     22.82     41.30      1.16     25.49
-40x40		  157.00    157.00    458.38     28.88    167.10
-400x400		  244.34    244.34   1961.74     41.74    218.02
-screen copy
-10x10	           33.22     33.23     35.09      5.35     34.39
-40x40		   78.81     78.81     99.93     15.83     77.71
-400x400		   99.13     99.02    137.87     20.98     97.03
-400x400 scroll	  100.09    100.09    664.02     21.18     98.55
-8x8 pattern fill
-400x400		  228.68    228.72       -       41.10    217.91
-color expansion
-CPU to screen	     -                730.52       -      221.10
-scanl. scr-to-scr 138.01    138.09       -       19.56       -   
-10x10 scr-to-scr   36.87     36.86     39.19      6.16     66.46
-
-(*) After this benchmark was taken, the color expansion benchmark was
-    changed to write a pattern including both colors instead of just the
-    background one, which is likely to affect the score.
-
-The 10x1 filled rectangles score tells a lot about the command overhead
-for small fills, which is important for operations that fill span-by-span.
-The 10x10 and 40x40 screencopy give an impression of pixmap cache
-efficiency, while the 10x10 score also indicates how a simple font cache
-would perform (compare with color expansion). The 10x10 screen-to-screen
-color expand score reflects a smarter kind of font cache.
-
-If your implementation seems weak at a particular kind of operation, maybe
-you are not doing it optimally and can improve it (usually by reducing
-the command overhead, for example by minimizing the number of graphics
-chip queries).
-
-
-5.	Development notes
-
-When adding a function to the GCInfoRec or AccelInfoRec, make sure to
-have a Makefile with dependencies (run make depend after doing make
-Makefile). If you don't, you're bound to get unexplainable core dumps.
-That also applies to SVGA drivers using the new interface; they should
-be recompiled after a new version of the generic acceleration code
-in installed.
-
-Header files:
-
-vgabpp.h	Declares the new ScreenInit functions for each depth.
-
-xf86xaa.h	General public definitions, including the GCInfoRec and
-		AccelInfoRec.
-
-xf86scrin.h	XAA screen initialization functions.
-
-xf86local.h	Declares functions local to the generic acceleration code.
-
-xf86gcmap.h	Maps names of some local functions to depth-specific
-		versions.
-
-xf86maploc.h	Declares local functions that are name-mapped depending on
-		the depth.
-
-vga256map.h	Maps the name of some cfb functions to their vga256
-		equivalents. This is used for the vga256 version of the
-		GC validation code.
-
-xf86pcache.h	Some declarations for the pixmap cache.
-
-xf86expblt.h	Declares monochrome data color-expansion blit functions
-		defined in xf86expblt.c
-
-
-6. Acknowledgements
-
-The Mach64 server by Kevin Martin has been used a base for some parts
-(notably pixmap caching), and the set of functions accelerated in the
-Mach64 server provided a baseline for what to implement first.
-
-
-
-$XFree86: xc/programs/Xserver/hw/xfree86/xaa/NOTES,v 3.20 1998/07/26 00:40:48 dawes Exp $
Index: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO
diff -u xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO:1.10 xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO:1.12
--- xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO:1.10	Sun Mar  7 03:40:45 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO	Wed Apr 12 07:44:42 2000
@@ -24,8 +24,7 @@
   2.8  Image Writes
     2.8.1 The Direct Method
     2.8.2 The Indirect Method
-  2.9  Image Reads
-  2.10 Clipping
+  2.9 Clipping
 3)  The Pixmap Cache
 4)  Offscreen Pixmaps
 
@@ -651,8 +650,7 @@
       are expected to require three times the amount of bits to be
       transferred so that 24bpp grayscale colors can be used with color
       expansion in 8bpp coprocessor mode. Each bit is expanded to 3
-      bits when writing the monochrome data. When definining this
-      flag, also define RGB_EQUAL.  
+      bits when writing the monochrome data.
 
 
  2.5.1 The Direct Method 
@@ -1331,13 +1329,8 @@
     manipulate these buffers and then send the data to the accelerator.
 
 
-2.9  Image Reads
+2.9 Clipping
 
-	/* More to come */
-
-
-2.10 Clipping
-
     XAA supports hardware clipping rectangles.  To use clipping
     in this way it is expected that the graphics accelerator can
     clip primitives with verticies anywhere in the 16 bit signed 
@@ -1435,4 +1428,4 @@
      pixmap with a particular dimension is allowed, then your driver will be
      expected to render primitives as large as that pixmap.  
 
-$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.10 1999/03/07 11:40:45 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.12 2000/04/12 14:44:42 tsi Exp $
Index: xc/programs/Xserver/hw/xfree86/xaa/xaa.h
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaa.h:1.28 xc/programs/Xserver/hw/xfree86/xaa/xaa.h:1.30
--- xc/programs/Xserver/hw/xfree86/xaa/xaa.h:1.28	Fri Feb 18 04:20:08 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaa.h	Mon Jun 19 22:08:49 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.28 2000/02/18 12:20:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.30 2000/06/20 05:08:49 dawes Exp $ */
 
 #ifndef _XAA_H
 #define _XAA_H
@@ -239,6 +239,17 @@
    void (*Sync)(
 	ScrnInfoPtr pScrn
    );
+   
+   /* Restore Accel State is a driver callback that is used
+    * when another screen on the same device has been active.
+    * This allows multihead on a single device to work.
+    * If The entityProp has IS_SHARED_ACCEL defined then this
+    * function is required.
+    */
+   
+   void (*RestoreAccelState)(
+	ScrnInfoPtr pScrn
+   );
 
    /***************** Low Level *****************/
 
@@ -498,7 +509,7 @@
    int NumScanlineImageWriteBuffers;
    unsigned char **ScanlineImageWriteBuffers;
 
-  /* Image Reads */
+  /* Image Reads - OBSOLETE AND NOT USED */
 
    void (*SetupForImageRead) (
 	ScrnInfoPtr pScrn,
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c:1.5 xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c:1.6
--- xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c:1.5	Fri Sep  4 23:37:03 1998
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c	Mon Jun 12 19:51:24 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.5 1998/09/05 06:37:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.6 2000/06/13 02:51:24 mvojkovi Exp $ */
 
 #include "xf86.h"
 #include "xf86_ansic.h"
@@ -10,56 +10,11 @@
 #endif
 
 
-#if defined(__GNUC__) && defined(__i386__) && !defined(DLOPEN_HACK)
 CARD32
-XAAReverseBitOrder(CARD32 data)
+XAAReverseBitOrder(CARD32 v)
 {
-#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__)
-	__asm__(
-		"movl $0,%%ecx\n"
-		"movb %%al,%%cl\n"
-		"movb byte_reversed(%%ecx),%%al\n"
-		"movb %%ah,%%cl\n"
-		"movb byte_reversed(%%ecx),%%ah\n"
-		"roll $16,%%eax\n"
-		"movb %%al,%%cl\n"
-		"movb byte_reversed(%%ecx),%%al\n"
-		"movb %%ah,%%cl\n"
-		"movb byte_reversed(%%ecx),%%ah\n"
-		"roll $16,%%eax\n"
-		: "=a" (data) : "0" (data)
-		: "cx"
-		);
-#else
-	__asm__(
-		"movl $0,%%ecx\n"
-		"movb %%al,%%cl\n"
-		"movb _byte_reversed(%%ecx),%%al\n"
-		"movb %%ah,%%cl\n"
-		"movb _byte_reversed(%%ecx),%%ah\n"
-		"roll $16,%%eax\n"
-		"movb %%al,%%cl\n"
-		"movb _byte_reversed(%%ecx),%%al\n"
-		"movb %%ah,%%cl\n"
-		"movb _byte_reversed(%%ecx),%%ah\n"
-		"roll $16,%%eax\n"
-		: "=a" (data) : "0" (data)
-		: "cx"
-		);
-#endif
-	return data;
-}
-#else
-CARD32
-XAAReverseBitOrder(CARD32 data)
-{
-    unsigned char* kludge = (unsigned char*)&data;
-
-    kludge[0] = byte_reversed[kludge[0]];
-    kludge[1] = byte_reversed[kludge[1]];
-    kludge[2] = byte_reversed[kludge[2]];
-    kludge[3] = byte_reversed[kludge[3]];
-	
-    return data;	
+ return (((0x01010101 & v) << 7) | ((0x02020202 & v) << 5) | 
+         ((0x04040404 & v) << 3) | ((0x08080808 & v) << 1) | 
+         ((0x10101010 & v) >> 1) | ((0x20202020 & v) >> 3) | 
+         ((0x40404040 & v) >> 5) | ((0x80808080 & v) >> 7));
 }
-#endif
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c:1.6 xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c:1.9
--- xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c:1.6	Fri Mar  3 10:49:55 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c	Thu Jun 29 03:55:41 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.6 2000/03/03 18:49:55 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */
 
 
 #include "xaa.h"
@@ -21,7 +21,7 @@
 #endif
 
 #ifdef MSBFIRST
-# define SOURCE(i)	XAAReverseBitOrder(src[i])
+# define SOURCE(i)	SWAP_BITS_IN_BYTES(src[i])
 #else
 # define SOURCE(i)	src[i]
 #endif
@@ -35,15 +35,20 @@
    CARD32 *src, CARD32 *base,
    int count, int skipleft )
 {
+     CARD32 bits;
+
      while(count >= 3) {
-	WRITE_BITS3(*src);
+	bits = *src;
+	WRITE_BITS3(bits);
 	src++;
 	count -= 3;
      }
      if (count == 2) {
-	WRITE_BITS2(*src);
+	bits = *src;
+	WRITE_BITS2(bits);
      } else if (count == 1) {
-	WRITE_BITS1(*src);
+	bits = *src;
+	WRITE_BITS1(bits);
      }
      
      return base;
@@ -54,15 +59,20 @@
    CARD32 *src, CARD32 *base,
    int count, int skipleft )
 {
+     CARD32 bits;
+
      while(count >= 3) {
-	WRITE_BITS3(~(*src));
+	bits = ~(*src);
+	WRITE_BITS3(bits);
 	src++;
 	count -= 3;
      }
      if (count == 2) {
-	WRITE_BITS2(~(*src));
+	bits = ~(*src);
+	WRITE_BITS2(bits);
      } else if (count == 1) {
-	WRITE_BITS1(~(*src));
+	bits = ~(*src);
+	WRITE_BITS1(bits);
      }
      
      return base;
@@ -71,21 +81,23 @@
 
 static CARD32*
 BitmapScanline_Shifted(
-   CARD32 *bits, CARD32 *base,
+   CARD32 *src, CARD32 *base,
    int count, int skipleft )
 {
+     CARD32 bits;
+
      while(count >= 3) {
-	WRITE_BITS3((SHIFT_R(*bits,skipleft) | 
-		SHIFT_L(*(bits + 1),(32 - skipleft))));
-	bits++;
+	bits = SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft));
+	WRITE_BITS3(bits);
+	src++;
 	count -= 3;
      }
      if (count == 2) {
-	WRITE_BITS2((SHIFT_R(*bits,skipleft) | 
-		SHIFT_L(*(bits + 1),(32 - skipleft))));
+	bits = SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft));
+	WRITE_BITS2(bits);
      } else if (count == 1) {
-	WRITE_BITS1((SHIFT_R(*bits,skipleft) | 
-		SHIFT_L(*(bits + 1),(32 - skipleft))));
+	bits = SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft));
+	WRITE_BITS1(bits);
      }
      
      return base;
@@ -93,21 +105,23 @@
 
 static CARD32*
 BitmapScanline_Shifted_Inverted(
-   CARD32 *bits, CARD32 *base,
+   CARD32 *src, CARD32 *base,
    int count, int skipleft )
 {
+     CARD32 bits;
+
      while(count >= 3) {
-	WRITE_BITS3(~(SHIFT_R(*bits,skipleft) | 
-		SHIFT_L(*(bits + 1),(32 - skipleft))));
-	bits++;
+	bits = ~(SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft)));
+	WRITE_BITS3(bits);
+	src++;
 	count -= 3;
      }
      if (count == 2) {
-	WRITE_BITS2(~(SHIFT_R(*bits,skipleft) | 
-		SHIFT_L(*(bits + 1),(32 - skipleft))));
+	bits = ~(SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft)));
+	WRITE_BITS2(bits);
      } else if (count == 1) {
-	WRITE_BITS1(~(SHIFT_R(*bits,skipleft) | 
-		SHIFT_L(*(bits + 1),(32 - skipleft))));
+	bits = ~(SHIFT_R(*src,skipleft) | SHIFT_L(*(src + 1),(32 - skipleft)));
+	WRITE_BITS1(bits);
      }
      
      return base;
@@ -241,7 +255,7 @@
 EXPNAME(XAAWriteBitmapColorExpand)(
 #endif
     ScrnInfoPtr pScrn,
-    int x, int y, int w, int h,
+    int x, int y, int w, int H,
     unsigned char *src,
     int srcwidth,
     int skipleft,
@@ -258,6 +272,7 @@
     BitmapScanlineProcPtr firstFunc;
     BitmapScanlineProcPtr secondFunc;
     int flag;
+    int h = H;
 
 #ifdef TRIPLE_BITS
     if((bg != -1) && 
@@ -268,7 +283,7 @@
     if((bg != -1) && 
 	(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
 #endif
-	if(rop == GXcopy) {
+	if((rop == GXcopy) && infoRec->SetupForSolidFill) {
     	    (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);
             (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
 	} else SecondPassColor = bg;
@@ -336,6 +351,7 @@
     }
 
     if(SecondPassColor != -1) {
+	h = H; /* Reset height */
 	fg = SecondPassColor;
 	SecondPassColor = -1;
 	firstFunc = secondFunc;
@@ -383,7 +399,7 @@
     if((bg != -1) && 
 	(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)){
 #endif
-	if(rop == GXcopy) {
+	if((rop == GXcopy) && infoRec->SetupForSolidFill) {
     	    (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);
             (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
 	} else SecondPassColor = bg;
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c:1.10 xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c:1.11
--- xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c:1.10	Sun Apr  4 00:46:24 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c	Sat Apr  1 14:42:04 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.10 1999/04/04 08:46:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.11 2000/04/01 22:42:04 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -65,6 +65,16 @@
 		pGC, srcx, srcy, width, height, dstx, dsty,
 		XAADoBitBlt, 0L));
 	}
+    } else if((pSrcDrawable->type == DRAWABLE_WINDOW) ||
+	       IS_OFFSCREEN_PIXMAP(pSrcDrawable)) {
+	if(infoRec->ReadPixmap && (pGC->alu == GXcopy) &&
+	   (pSrcDrawable->bitsPerPixel == pDstDrawable->bitsPerPixel) &&
+	  ((pGC->planemask & infoRec->FullPlanemask) == infoRec->FullPlanemask))
+	{
+            return (XAABitBlt( pSrcDrawable, pDstDrawable,
+		pGC, srcx, srcy, width, height, dstx, dsty,
+		XAADoImageRead, 0L));	
+	}
     }
 
     return (XAAFallbackOps.CopyArea(pSrcDrawable, pDstDrawable, pGC,
@@ -218,6 +228,36 @@
 		pGC->alu, pGC->planemask, -1, pSrc->bitsPerPixel, pSrc->depth);
     }
 }
+
+
+void
+XAADoImageRead(
+    DrawablePtr	    pSrc, 
+    DrawablePtr	    pDst,
+    GC		    *pGC,
+    RegionPtr	    prgnDst,
+    DDXPointPtr	    pptSrc )
+{
+    int dstwidth;
+    unsigned char* pdstBase;			/* start of image */
+    unsigned char* dstPntr;			/* index into the image */
+    BoxPtr pbox = REGION_RECTS(prgnDst);
+    int nbox = REGION_NUM_RECTS(prgnDst);
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    int Bpp = pSrc->bitsPerPixel >> 3; 
+
+    pdstBase = (unsigned char *)((PixmapPtr)pDst)->devPrivate.ptr;
+    dstwidth = (int)((PixmapPtr)pSrc)->devKind;
+
+    for(; nbox; pbox++, pptSrc++, nbox--) {
+        dstPntr = pdstBase + (pbox->y1 * dstwidth) + (pbox->x1 * Bpp);
+
+	(*infoRec->ReadPixmap)(infoRec->pScrn, pptSrc->x, pptSrc->y, 
+		pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, dstPntr, dstwidth,
+		pSrc->bitsPerPixel, pSrc->depth);
+    }
+}
+
 
 void 
 XAAScreenToScreenBitBlt(
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c:1.9 xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c:1.10
--- xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c:1.9	Sat Aug 14 03:50:13 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c	Mon Jun 12 19:51:24 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.9 1999/08/14 10:50:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.10 2000/06/13 02:51:24 mvojkovi Exp $ */
 
 /*
    A CopyPlane function that handles bitmap->screen copies and
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.11 xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.13
--- xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.11	Sat May 29 20:03:31 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c	Tue May  2 17:44:22 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.11 1999/05/30 03:03:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.13 2000/05/03 00:44:22 tsi Exp $ */
 
 /*
  * Copyright 1996  The XFree86 Project
@@ -723,8 +723,7 @@
     yorg = (pDraw->y + pGC->patOrg.y);
 
 
-    if((fg == bg) && (bg != -1) &&
-	infoRec->SubsequentSolidFillRect && infoRec->SetupForSolidFill) {
+    if((fg == bg) && (bg != -1) && infoRec->SetupForSolidFill) {
 
 	(*infoRec->SetupForSolidFill)(infoRec->pScrn, fg,
 				pGC->alu, pGC->planemask);
@@ -923,7 +922,7 @@
 	case DO_CACHE_BLT:
             pCache = (*infoRec->CacheTile)(infoRec->pScrn, pGC->tile.pixmap);
 	    (*infoRec->SetupForScreenToScreenCopy)(infoRec->pScrn, 1, 1, 
-		pGC->alu, pGC->planemask, pCache->trans_color);
+		pGC->alu, pGC->planemask, -1);
 
 	    RectFunc = CacheBltRectHelper;
 	    break;
@@ -937,7 +936,7 @@
 		pPriv->offscreenArea->box.y2 - pCache->y;
 
 	    (*infoRec->SetupForScreenToScreenCopy)(infoRec->pScrn, 1, 1, 
-		pGC->alu, pGC->planemask, pCache->trans_color);
+		pGC->alu, pGC->planemask, -1);
 
 	    RectFunc = CacheBltRectHelper;
 	    break;
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c:1.12 xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c:1.13
--- xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c:1.12	Sat Sep 25 07:38:13 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c	Mon Mar 27 17:21:04 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.12 1999/09/25 14:38:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.13 2000/03/28 01:21:04 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -343,6 +343,7 @@
 		pPriv->offscreenArea->box.x2 - pCache->x;
    pCache->h = pCache->orig_h = 
 		pPriv->offscreenArea->box.y2 - pCache->y;
+   pCache->trans_color = -1;
 
    (*infoRec->FillCacheBltRects) (infoRec->pScrn, pGC->alu, 
                 pGC->planemask, nboxes, pClipBoxes, 
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c:1.13 xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c:1.14
--- xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c:1.13	Sat Sep 25 07:38:14 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c	Tue May  2 17:44:23 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.13 1999/09/25 14:38:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -265,7 +265,7 @@
 	if(infoRec->ImageGlyphBltNonTE &&
 		CHECK_PLANEMASK(pGC,infoRec->ImageGlyphBltNonTEFlags) &&
 		CHECK_FG(pGC,infoRec->ImageGlyphBltNonTEFlags) &&
-	   infoRec->SetupForSolidFill && infoRec->SubsequentSolidFillRect &&
+	   infoRec->SetupForSolidFill &&
 		CHECK_PLANEMASK(pGC,infoRec->SolidFillFlags) &&
 		CHECK_BG(pGC,infoRec->SolidFillFlags))
 	{
@@ -283,7 +283,7 @@
 		pGC->ops->ImageGlyphBlt = infoRec->ImageGlyphBltTE;
 	} else {
 	   if(CHECK_FG(pGC,infoRec->ImageGlyphBltTEFlags) &&
-	      infoRec->SetupForSolidFill && infoRec->SubsequentSolidFillRect &&
+	      infoRec->SetupForSolidFill &&
 	      CHECK_PLANEMASK(pGC,infoRec->SolidFillFlags) &&
 	      CHECK_BG(pGC,infoRec->SolidFillFlags)) 
 	   {
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c:1.18 xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c:1.19
--- xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c:1.18	Thu Feb 10 15:21:38 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c	Sat Apr  1 14:42:04 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.18 2000/02/10 23:21:38 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.19 2000/04/01 22:42:04 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -514,89 +514,4 @@
     } else 
 	XAAFallbackOps.PutImage(pDraw, pGC, depth, x, y, w, h, leftPad, 
 				format, pImage);
-}
-
-
-void 
-XAAReadPixmap (
-   ScrnInfoPtr pScrn,
-   int x, int y, int w, int h,
-   unsigned char *dst,	
-   int dstwidth,	/* bytes */
-   int bpp, int depth
-){
-    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
-    int ReadDwords, WriteBytes, Surplus, Bpp = bpp >> 3; 
-    unsigned char *tmp;
-    Bool PlusOne = FALSE;
-    union {
-	CARD32 IntData;
-	unsigned char CharData[4];
-    } extra;
-
-    WriteBytes = w * Bpp;
-    ReadDwords = (WriteBytes + 3) >> 2;
-
-    if((infoRec->ImageReadFlags & CPU_TRANSFER_PAD_QWORD) && 
-				((ReadDwords * h) & 0x01)) {
-	PlusOne = TRUE;
-    } 
-
-
-    (*infoRec->SetupForImageRead)(pScrn, bpp, depth);
-    (*infoRec->SubsequentImageReadRect)(pScrn, x, y, w, h);
-
-    if(ReadDwords > infoRec->ImageWriteRange) {
-	if((Surplus = (ReadDwords << 2) - WriteBytes)) {
-	    ReadDwords--;
-	    while(h--) {
-		if(ReadDwords)
-		    XAAMoveDWORDS_FixedSrc((CARD32*)dst, 
-			(CARD32*)infoRec->ImageReadBase, ReadDwords);
-		extra.IntData = *((CARD32*)infoRec->ImageReadBase);
-		tmp = dst + (ReadDwords << 2); 
-		switch(Surplus) {
-		case 3: tmp[2] = extra.CharData[2];
-		case 2: tmp[1] = extra.CharData[1];
-		case 1: tmp[0] = extra.CharData[0];
-		}
-		dst += dstwidth;
-	    }
-	} else {
-	    while(h--) {
-		XAAMoveDWORDS_FixedSrc((CARD32*)dst, 
-			(CARD32*)infoRec->ImageReadBase, ReadDwords);
-		dst += dstwidth;
-	    }
-	}
-    } else {
-	if((Surplus = (ReadDwords << 2) - WriteBytes)) {
-	    ReadDwords--;
-	    while(h--) {
-		if(ReadDwords)
-		   XAAMoveDWORDS((CARD32*)dst, 
-			(CARD32*)infoRec->ImageReadBase, ReadDwords);
-		extra.IntData = 
-			*((CARD32*)(infoRec->ImageReadBase) + ReadDwords);
-		tmp = dst + (ReadDwords << 2); 
-		switch(Surplus) {
-		case 3: tmp[2] = extra.CharData[2];
-		case 2: tmp[1] = extra.CharData[1];
-		case 1: tmp[0] = extra.CharData[0];
-		}
-		dst += dstwidth;
-	    }
-	} else {
-	    while(h--) {
-		XAAMoveDWORDS((CARD32*)dst, 
-			(CARD32*)infoRec->ImageReadBase, ReadDwords);
-		dst += dstwidth;
-	    }
-	}
-    }
-
-    if(PlusOne) 
-	extra.IntData = *((CARD32*)infoRec->ImageReadBase);
-
-    SET_SYNC_FLAG(infoRec);
 }
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c:1.25 xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c:1.28
--- xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c:1.25	Thu Feb 10 22:35:17 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c	Sat Apr 22 14:47:08 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.25 2000/02/11 06:35:17 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.28 2000/04/22 21:47:08 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -256,11 +256,27 @@
 )
 {
     ScreenPtr pScreen = pDraw->pScreen;
-    XAA_SCREEN_PROLOGUE (pScreen, GetImage);
-    if(xf86Screens[pScreen->myNum]->vtSema && 
-	((pDraw->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pDraw))) {
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+    ScrnInfoPtr pScrn = infoRec->pScrn;
+
+    if(pScrn->vtSema && 
+	((pDraw->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pDraw))) 
+    {
+	if(infoRec->ReadPixmap && (format == ZPixmap) && 
+	   ((planemask & infoRec->FullPlanemask) == infoRec->FullPlanemask) &&
+	   (pDraw->bitsPerPixel == BitsPerPixel(pDraw->depth)))
+	{
+	    (*infoRec->ReadPixmap)(pScrn, 
+		   sx + pDraw->x, sy + pDraw->y, w, h,
+		   (unsigned char *)pdstLine,
+		   PixmapBytePad(w, pDraw->depth), 
+		   pDraw->bitsPerPixel, pDraw->depth);
+	    return;
+	}
 	SYNC_CHECK(pDraw);
     }
+
+    XAA_SCREEN_PROLOGUE (pScreen, GetImage);
     (*pScreen->GetImage) (pDraw, sx, sy, w, h, format, planemask, pdstLine);
     XAA_SCREEN_EPILOGUE (pScreen, GetImage, XAAGetImage);
 }
@@ -624,6 +640,7 @@
     }
 
     ret = (*pScreenPriv->SetDGAMode)(index, num, devRet);
+    if(ret != Success) return ret;
 
     if(num && devRet->pPix) {  /* accelerate this pixmap */
 	XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(devRet->pPix);
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c:1.19 xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c:1.24
--- xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c:1.19	Sat Jul 10 05:17:42 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c	Mon Jun 19 22:08:49 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.19 1999/07/10 12:17:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.24 2000/06/20 05:08:49 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -35,7 +35,6 @@
     XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL,
     XAAOPT_IMAGE_WRITE_RECT,
     XAAOPT_SCANLINE_IMAGE_WRITE_RECT,
-    XAAOPT_IMAGE_READ_RECT,
     XAAOPT_PIXMAP_CACHE,
     XAAOPT_OFFSCREEN_PIXMAPS
 } XAAOpts;
@@ -75,8 +74,6 @@
 				OPTV_BOOLEAN,	{0}, FALSE },
     {XAAOPT_SCANLINE_IMAGE_WRITE_RECT,	"XaaNoScanlineImageWriteRect",
 				OPTV_BOOLEAN,	{0}, FALSE },
-    {XAAOPT_IMAGE_READ_RECT,		"XaaNoImageReadRect",
-				OPTV_BOOLEAN,	{0}, FALSE },
     {XAAOPT_PIXMAP_CACHE,		"XaaNoPixmapCache",
 				OPTV_BOOLEAN,	{0}, FALSE },
     {XAAOPT_OFFSCREEN_PIXMAPS,		"XaaNoOffscreenPixmaps",
@@ -85,6 +82,8 @@
 				OPTV_NONE,	{0}, FALSE }
 };
 
+#define nXAAOptions (sizeof(XAAOptions) / sizeof(XAAOptions[0]))
+
 Bool
 XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 {
@@ -107,16 +106,31 @@
     Bool HaveImageWriteRect = FALSE;
     Bool HaveScanlineImageWriteRect = FALSE;
     Bool HaveScreenToScreenColorExpandFill = FALSE;
-    Bool HaveImageReadRect = FALSE;
+    OptionInfoRec options[nXAAOptions];
+    int is_shared = 0;
+    int i;
 
-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, XAAOptions);
+    (void)memcpy(options, XAAOptions, sizeof(XAAOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
 
     infoRec->pScrn = pScrn;
     infoRec->NeedToSync = FALSE;
 
     /* must have a Sync function */
     if(!infoRec->Sync) return FALSE;
+    for(i = 0; i < pScrn->numEntities; i++) {
+        if(xf86IsEntityShared(pScrn->entityList[i])) is_shared = 1;
+    }
+   
+    /* If this PCI entity has IS_SHARED_ACCEL set in entityProp
+     * then a RestoreAccelState function is required
+     */
+    if(!infoRec->RestoreAccelState && is_shared) return FALSE;
 
+    if(infoRec->RestoreAccelState) {
+        if(!XAAInitStateWrap(pScreen, infoRec)) return FALSE;
+    }
+   
     if(!infoRec->FullPlanemask)
 	infoRec->FullPlanemask =  (1 << pScrn->depth) - 1;
 
@@ -127,33 +141,49 @@
 
     /************** Low Level *************/
 
-    if(!infoRec->SetClippingRectangle || !infoRec->DisableClipping)
+    if(!infoRec->SetClippingRectangle || !infoRec->DisableClipping) {
 	infoRec->ClippingFlags = 0;
+	infoRec->SetClippingRectangle = NULL;
+	infoRec->DisableClipping = NULL;
+    }
 
     /**** CopyArea ****/
 
     if(infoRec->SetupForScreenToScreenCopy &&
        infoRec->SubsequentScreenToScreenCopy &&
-       !xf86IsOptionSet(XAAOptions, XAAOPT_SCREEN_TO_SCREEN_COPY))
+       !xf86IsOptionSet(options, XAAOPT_SCREEN_TO_SCREEN_COPY)) {
 	HaveScreenToScreenCopy = TRUE;
+    } else {
+	infoRec->ScreenToScreenCopyFlags = 0;
+	infoRec->SetupForScreenToScreenCopy = NULL;
+	infoRec->SubsequentScreenToScreenCopy = NULL;
+    }
 
     /**** Solid Filled Rects ****/
 
     if(infoRec->SetupForSolidFill && infoRec->SubsequentSolidFillRect &&
-       !xf86IsOptionSet(XAAOptions, XAAOPT_SOLID_FILL_RECT)) {
+       !xf86IsOptionSet(options, XAAOPT_SOLID_FILL_RECT)) {
 		HaveSolidFillRect = TRUE;
 	if(infoRec->SubsequentSolidFillTrap &&
-	   !xf86IsOptionSet(XAAOptions, XAAOPT_SOLID_FILL_TRAP))
+	   !xf86IsOptionSet(options, XAAOPT_SOLID_FILL_TRAP))
 		HaveSolidFillTrap = TRUE;
+	else
+		infoRec->SubsequentSolidFillTrap = NULL;
+    } else {
+	infoRec->SolidFillFlags = 0;
+	infoRec->SetupForSolidFill = NULL;
+	infoRec->SubsequentSolidFillRect = NULL;
+	infoRec->SubsequentSolidFillTrap = NULL;
     }
 
     /**** Solid lines ****/
+
     if(infoRec->SetupForSolidLine) {
 	if(infoRec->SubsequentSolidTwoPointLine &&
-		!xf86IsOptionSet(XAAOptions, XAAOPT_SOLID_TWO_POINT_LINE))
+		!xf86IsOptionSet(options, XAAOPT_SOLID_TWO_POINT_LINE))
 	    HaveSolidTwoPointLine = TRUE;
 	if(infoRec->SubsequentSolidBresenhamLine &&
-		!xf86IsOptionSet(XAAOptions, XAAOPT_SOLID_BRESENHAM_LINE)) {
+		!xf86IsOptionSet(options, XAAOPT_SOLID_BRESENHAM_LINE)) {
 	    HaveSolidBresenhamLine = TRUE;
 
 	    if(infoRec->SolidBresenhamLineErrorTermBits)
@@ -162,7 +192,7 @@
 	}
 
 	if(infoRec->SubsequentSolidHorVertLine &&
-		!xf86IsOptionSet(XAAOptions, XAAOPT_SOLID_HORVERT_LINE))
+		!xf86IsOptionSet(options, XAAOPT_SOLID_HORVERT_LINE))
 	    HaveSolidHorVertLine = TRUE;
 	else if(HaveSolidTwoPointLine) {
 	    infoRec->SubsequentSolidHorVertLine = 
@@ -173,24 +203,42 @@
 			XAASolidHorVertLineAsBresenham;
 	    HaveSolidHorVertLine = TRUE;
 	}
-    } else if(HaveSolidFillRect) {
+    }
+
+    /* XXX Should this also check for XAAOPT_SOLID_HORVERT_LINE? */
+    if (!HaveSolidTwoPointLine &&
+	!HaveSolidBresenhamLine &&
+	!HaveSolidHorVertLine &&
+	HaveSolidFillRect) {
 	infoRec->SetupForSolidLine = infoRec->SetupForSolidFill;
 	infoRec->SubsequentSolidHorVertLine = XAASolidHorVertLineAsRects;
 	infoRec->SolidLineFlags = infoRec->SolidFillFlags;
 	HaveSolidHorVertLine = TRUE;
     }
 
-
-
+    if (!HaveSolidTwoPointLine)
+	infoRec->SubsequentSolidTwoPointLine = NULL;
+    if (!HaveSolidBresenhamLine)
+	infoRec->SubsequentSolidBresenhamLine = NULL;
+    if (!HaveSolidHorVertLine)
+	infoRec->SubsequentSolidHorVertLine = NULL;
+
+    /* Disable all if nothing left over */
+    if (!HaveSolidTwoPointLine &&
+	!HaveSolidBresenhamLine &&
+	!HaveSolidHorVertLine) {
+	infoRec->SolidLineFlags = 0;
+	infoRec->SetupForSolidLine = NULL;
+    }
 
     /**** 8x8 Mono Pattern Filled Rects ****/
 
    if(infoRec->SetupForMono8x8PatternFill &&
 		infoRec->SubsequentMono8x8PatternFillRect &&
-		!xf86IsOptionSet(XAAOptions, XAAOPT_MONO_8x8_PATTERN_FILL_RECT)) {
+		!xf86IsOptionSet(options, XAAOPT_MONO_8x8_PATTERN_FILL_RECT)) {
 	HaveMono8x8PatternFillRect = TRUE;
 	if(infoRec->SubsequentMono8x8PatternFillTrap &&
-		!xf86IsOptionSet(XAAOptions, XAAOPT_MONO_8x8_PATTERN_FILL_TRAP))
+		!xf86IsOptionSet(options, XAAOPT_MONO_8x8_PATTERN_FILL_TRAP))
 		HaveMono8x8PatternFillTrap = TRUE;
 
         if(infoRec->Mono8x8PatternFillFlags & 
@@ -230,17 +278,20 @@
 		}
 	   }
 	}
+   } else {
+	infoRec->Mono8x8PatternFillFlags = 0;
+	infoRec->SetupForMono8x8PatternFill = NULL;
+	infoRec->SubsequentMono8x8PatternFillRect = NULL;
    }
 
-
     /**** Dashed lines ****/
 
     if(infoRec->SetupForDashedLine && infoRec->DashPatternMaxLength) {
 	if(infoRec->SubsequentDashedTwoPointLine &&
-		!xf86IsOptionSet(XAAOptions, XAAOPT_DASHED_TWO_POINT_LINE))
+		!xf86IsOptionSet(options, XAAOPT_DASHED_TWO_POINT_LINE))
 	    HaveDashedTwoPointLine = TRUE;
 	if(infoRec->SubsequentDashedBresenhamLine &&
-		!xf86IsOptionSet(XAAOptions, XAAOPT_DASHED_BRESENHAM_LINE)) {
+		!xf86IsOptionSet(options, XAAOPT_DASHED_BRESENHAM_LINE)) {
 	    HaveDashedBresenhamLine = TRUE;
 
 	    if(infoRec->DashedBresenhamLineErrorTermBits)
@@ -249,15 +300,28 @@
 	}
     }
 
+    if (!HaveDashedTwoPointLine)
+	infoRec->SubsequentDashedTwoPointLine = NULL;
+    if (!HaveDashedBresenhamLine)
+	infoRec->SubsequentDashedBresenhamLine = NULL;
+
+    /* Disable all if nothing left over */
+    if (!HaveDashedTwoPointLine && !HaveDashedBresenhamLine) {
+	infoRec->DashedLineFlags = 0;
+	infoRec->SetupForDashedLine = NULL;
+    }
+
     /**** 8x8 Color Pattern Filled Rects ****/
 
    if(infoRec->SetupForColor8x8PatternFill &&
       infoRec->SubsequentColor8x8PatternFillRect &&
-      !xf86IsOptionSet(XAAOptions, XAAOPT_COL_8x8_PATTERN_FILL_RECT)) {
+      !xf86IsOptionSet(options, XAAOPT_COL_8x8_PATTERN_FILL_RECT)) {
 	HaveColor8x8PatternFillRect = TRUE;
 	if(infoRec->SubsequentColor8x8PatternFillTrap &&
-	   !xf86IsOptionSet(XAAOptions, XAAOPT_COL_8x8_PATTERN_FILL_TRAP))
+	   !xf86IsOptionSet(options, XAAOPT_COL_8x8_PATTERN_FILL_TRAP))
 		HaveColor8x8PatternFillTrap = TRUE;
+	else
+		infoRec->SubsequentColor8x8PatternFillTrap = NULL;
 
 	infoRec->PixmapCacheFlags |= CACHE_COLOR_8x8;
 
@@ -275,15 +339,19 @@
 		infoRec->CacheHeightColor8x8Pattern = 8;
 	    }
 	}
+   } else {
+	infoRec->Color8x8PatternFillFlags = 0;
+	infoRec->SetupForColor8x8PatternFill = NULL;
+	infoRec->SubsequentColor8x8PatternFillRect = NULL;
+	infoRec->SubsequentColor8x8PatternFillTrap = NULL;
    }
 
     /**** Color Expansion ****/
 
-
     if(infoRec->SetupForCPUToScreenColorExpandFill && 
 	infoRec->ColorExpandBase &&
        	infoRec->SubsequentCPUToScreenColorExpandFill &&
-        !xf86IsOptionSet(XAAOptions, XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL)) {
+        !xf86IsOptionSet(options, XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL)) {
 	int dwordsNeeded = pScrn->virtualX;
 
 	infoRec->ColorExpandRange >>= 2;	/* convert to DWORDS */
@@ -295,6 +363,10 @@
 	dwordsNeeded = (dwordsNeeded + 31) >> 5;
 	if(dwordsNeeded > infoRec->ColorExpandRange)
 	   infoRec->CPUToScreenColorExpandFillFlags |= CPU_TRANSFER_BASE_FIXED;	
+    } else {
+	infoRec->CPUToScreenColorExpandFillFlags = 0;
+	infoRec->SetupForCPUToScreenColorExpandFill = NULL;
+	infoRec->SubsequentCPUToScreenColorExpandFill = NULL;
     } 
 
     /**** Scanline Color Expansion ****/
@@ -304,30 +376,43 @@
        infoRec->SubsequentColorExpandScanline &&
        infoRec->ScanlineColorExpandBuffers && 
        (infoRec->NumScanlineColorExpandBuffers > 0) &&
-       !xf86IsOptionSet(XAAOptions, XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL))
+       !xf86IsOptionSet(options, XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL)) {
 	HaveScanlineColorExpansion = TRUE;
-
+    } else {
+	infoRec->ScanlineCPUToScreenColorExpandFillFlags = 0;
+	infoRec->SetupForScanlineCPUToScreenColorExpandFill = NULL;
+	infoRec->SubsequentScanlineCPUToScreenColorExpandFill = NULL;
+	infoRec->SubsequentColorExpandScanline = NULL;
+    }
 
     /**** Screen to Screen Color Expansion ****/
 
     if(infoRec->SetupForScreenToScreenColorExpandFill &&
        infoRec->SubsequentScreenToScreenColorExpandFill &&
-       !xf86IsOptionSet(XAAOptions, XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL)) {
+       !xf86IsOptionSet(options, XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL)) {
 	HaveScreenToScreenColorExpandFill = TRUE;
 	if (!infoRec->CacheColorExpandDensity)
 	    infoRec->CacheColorExpandDensity = 1;
+    } else {
+	infoRec->ScreenToScreenColorExpandFillFlags = 0;
+	infoRec->SetupForScreenToScreenColorExpandFill = NULL;
+	infoRec->SubsequentScreenToScreenColorExpandFill = NULL;
     }
     
     /**** Image Writes ****/
 
     if(infoRec->SetupForImageWrite && infoRec->ImageWriteBase &&
        infoRec->SubsequentImageWriteRect &&
-       !xf86IsOptionSet(XAAOptions, XAAOPT_IMAGE_WRITE_RECT)) {
+       !xf86IsOptionSet(options, XAAOPT_IMAGE_WRITE_RECT)) {
 
 	infoRec->ImageWriteRange >>= 2;	/* convert to DWORDS */
 	if(infoRec->ImageWriteFlags & CPU_TRANSFER_BASE_FIXED)
 	   infoRec->ImageWriteRange = 0;
 	HaveImageWriteRect = TRUE;	
+    } else {
+	infoRec->ImageWriteFlags = 0;
+	infoRec->SetupForImageWrite = NULL;
+	infoRec->SubsequentImageWriteRect = NULL;
     } 
 
     /**** Scanline Image Writes ****/
@@ -337,20 +422,15 @@
        infoRec->SubsequentImageWriteScanline &&
        infoRec->ScanlineImageWriteBuffers && 
        (infoRec->NumScanlineImageWriteBuffers > 0) &&
-       !xf86IsOptionSet(XAAOptions, XAAOPT_SCANLINE_IMAGE_WRITE_RECT))
+       !xf86IsOptionSet(options, XAAOPT_SCANLINE_IMAGE_WRITE_RECT)) {
 	HaveScanlineImageWriteRect = TRUE;
+    } else {
+	infoRec->ScanlineImageWriteFlags = 0;
+	infoRec->SetupForScanlineImageWrite = NULL;
+	infoRec->SubsequentScanlineImageWriteRect = NULL;
+	infoRec->SubsequentImageWriteScanline = NULL;
+    }
 
-    /**** Image Reads ****/
-
-    if(infoRec->SetupForImageRead && infoRec->ImageReadBase &&
-       infoRec->SubsequentImageReadRect &&
-       !xf86IsOptionSet(XAAOptions, XAAOPT_IMAGE_READ_RECT)) {
-
-	infoRec->ImageReadRange >>= 2;	/* convert to DWORDS */
-	if(infoRec->ImageReadFlags & CPU_TRANSFER_BASE_FIXED)
-	   infoRec->ImageReadRange = 0;
-	HaveImageReadRect = TRUE;	
-    } 
 
     if (serverGeneration == 1) {
 	if(HaveScreenToScreenCopy)
@@ -389,14 +469,12 @@
 	else if(HaveScanlineImageWriteRect)
 	    xf86ErrorF("\tScanline Image Writes\n");
 
-	if(HaveImageReadRect)
-	    xf86ErrorF("\tImage Reads\n");
     }
 
 #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
 
     if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
-		!xf86IsOptionSet(XAAOptions, XAAOPT_OFFSCREEN_PIXMAPS)) {
+		!xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
 	XAAMSG("\tOffscreen Pixmaps\n");
     } else {
 	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
@@ -423,7 +501,6 @@
 	infoRec->FillSolidRectsFlags = infoRec->SolidFillFlags;
     }
 
-
     /**** FillSolidSpans ****/
 
     if(infoRec->FillSolidSpans) {
@@ -433,7 +510,6 @@
 	infoRec->FillSolidSpansFlags = infoRec->SolidFillFlags;
     }
 
-
     /**** FillMono8x8PatternRects ****/
 
     if(infoRec->FillMono8x8PatternRects) {
@@ -490,7 +566,6 @@
 		infoRec->Color8x8PatternFillFlags;      
     }
 
-
     /**** FillCacheBltRects ****/
 
     if(infoRec->FillCacheBltRects) {
@@ -509,7 +584,6 @@
 	infoRec->FillCacheBltSpansFlags = infoRec->ScreenToScreenCopyFlags;     
     }
 
-
     /**** FillCacheExpandRects ****/
 
     if(infoRec->FillCacheExpandRects) {
@@ -530,13 +604,11 @@
 		infoRec->ScreenToScreenColorExpandFillFlags;     
     }
 
-
     /**** FillColorExpandRects ****/
 
     if(infoRec->FillColorExpandRects) {
 	XAAMSG("\tDriver provided FillColorExpandRects replacement\n");
     } else if(HaveColorExpansion) {
-#if 0
 	if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {
 	    if(infoRec->CPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST) {
@@ -556,9 +628,7 @@
 		    infoRec->FillColorExpandRects = 
 			XAAFillColorExpandRects3LSBFirst;
 	    }
-	} else 
-#endif
-	{
+	} else {
 	    if(infoRec->CPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST) {
 		if(infoRec->CPUToScreenColorExpandFillFlags & 
@@ -579,21 +649,18 @@
 	    }
 	}
 	infoRec->FillColorExpandRectsFlags = 
-	  infoRec->CPUToScreenColorExpandFillFlags & ~TRANSPARENCY_ONLY;
+	    infoRec->CPUToScreenColorExpandFillFlags;
     } else if(HaveScanlineColorExpansion) {
-#if 0
 	if (infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
 					TRIPLE_BITS_24BPP) {
 	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST)
 		infoRec->FillColorExpandRects = 
-		    XAAFillColorExpandRects3MSBFirst;
+		    XAAFillScanlineColorExpandRects3MSBFirst;
 	    else
 		infoRec->FillColorExpandRects = 
-		    XAAFillColorExpandRects3LSBFirst;
-	} else 
-#endif
-	{
+		    XAAFillScanlineColorExpandRects3LSBFirst;
+	} else {
 	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST)
 		infoRec->FillColorExpandRects = 
@@ -602,8 +669,8 @@
 		infoRec->FillColorExpandRects = 
 		    XAAFillScanlineColorExpandRectsLSBFirst;
 	}
-	infoRec->FillColorExpandRectsFlags = ~TRANSPARENCY_ONLY &
-		infoRec->ScanlineCPUToScreenColorExpandFillFlags;
+	infoRec->FillColorExpandRectsFlags =
+	    infoRec->ScanlineCPUToScreenColorExpandFillFlags;
     }
 
     /**** FillColorExpandSpans ****/
@@ -611,7 +678,6 @@
     if(infoRec->FillColorExpandSpans) {
 	XAAMSG("\tDriver provided FillColorExpandSpans replacement\n");
     } else if(HaveColorExpansion) {
-#if 0
 	if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {
 	    if(infoRec->CPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST) {
@@ -631,9 +697,7 @@
 		    infoRec->FillColorExpandSpans = 
 			XAAFillColorExpandSpans3LSBFirst;
 	    }
-	} else 
-#endif
-	{
+	} else {
 	    if(infoRec->CPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST) {
 		if(infoRec->CPUToScreenColorExpandFillFlags & 
@@ -654,21 +718,18 @@
 	    }
 	}
 	infoRec->FillColorExpandSpansFlags = 
-	  infoRec->CPUToScreenColorExpandFillFlags & ~TRANSPARENCY_ONLY;
+	    infoRec->CPUToScreenColorExpandFillFlags;
     } else if(HaveScanlineColorExpansion) {
-#if 0
 	if (infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
 					TRIPLE_BITS_24BPP) {
 	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST)
 		infoRec->FillColorExpandSpans = 
-		    XAAFillColorExpandSpans3MSBFirst;
+		    XAAFillScanlineColorExpandSpans3MSBFirst;
 	    else
 		infoRec->FillColorExpandSpans = 
-		    XAAFillColorExpandSpans3LSBFirst;
-	} else 
-#endif
-	{
+		    XAAFillScanlineColorExpandSpans3LSBFirst;
+	} else {
 	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST)
 		infoRec->FillColorExpandSpans = 
@@ -677,11 +738,10 @@
 		infoRec->FillColorExpandSpans = 
 		    XAAFillScanlineColorExpandSpansLSBFirst;
 	}
-	infoRec->FillColorExpandSpansFlags = ~TRANSPARENCY_ONLY &
-		infoRec->ScanlineCPUToScreenColorExpandFillFlags;
+	infoRec->FillColorExpandSpansFlags =
+	    infoRec->ScanlineCPUToScreenColorExpandFillFlags;
     }
 
-
     /**** FillImageWriteRects ****/
 
     if(infoRec->FillImageWriteRects) {
@@ -733,10 +793,10 @@
 		    infoRec->WriteBitmap = XAAWriteBitmapColorExpandLSBFirst;
 	    }
 	}
-	infoRec->WriteBitmapFlags = 
-	  infoRec->CPUToScreenColorExpandFillFlags & ~TRANSPARENCY_ONLY;
+	infoRec->WriteBitmapFlags = infoRec->CPUToScreenColorExpandFillFlags;
     } else if(HaveScanlineColorExpansion) {
-	if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {
+	if (infoRec->ScanlineCPUToScreenColorExpandFillFlags &
+					TRIPLE_BITS_24BPP) {
 	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
 					BIT_ORDER_IN_BYTE_MSBFIRST)
 		infoRec->WriteBitmap = 
@@ -753,85 +813,93 @@
 		infoRec->WriteBitmap = 
 		    XAAWriteBitmapScanlineColorExpandLSBFirst;
 	}
-	infoRec->WriteBitmapFlags = ~TRANSPARENCY_ONLY &
+	infoRec->WriteBitmapFlags =
 		infoRec->ScanlineCPUToScreenColorExpandFillFlags;
     }
 
-
-    
     /**** TE Glyphs ****/
 
-    if(infoRec->TEGlyphRenderer) {
+    if (infoRec->TEGlyphRenderer) {
 	XAAMSG("\tDriver provided TEGlyphRenderer replacement\n");
-    } else if(HaveColorExpansion) {
-        if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {
-	    if(infoRec->CPUToScreenColorExpandFillFlags & 
-					BIT_ORDER_IN_BYTE_MSBFIRST) {
-		if(infoRec->CPUToScreenColorExpandFillFlags & 
-					CPU_TRANSFER_BASE_FIXED)
-		    infoRec->TEGlyphRenderer = 
+    } else if (HaveColorExpansion) {
+	infoRec->TEGlyphRendererFlags =
+	    infoRec->CPUToScreenColorExpandFillFlags;
+
+	if (infoRec->TEGlyphRendererFlags & TRIPLE_BITS_24BPP) {
+	    if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {
+		if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)
+		    infoRec->TEGlyphRenderer =
 			XAATEGlyphRenderer3MSBFirstFixedBase;
 		else
 		    infoRec->TEGlyphRenderer = XAATEGlyphRenderer3MSBFirst;
 	    } else {
-		if(infoRec->CPUToScreenColorExpandFillFlags & 
-					CPU_TRANSFER_BASE_FIXED)
-		    infoRec->TEGlyphRenderer = 
+		if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)
+		    infoRec->TEGlyphRenderer =
 			XAATEGlyphRenderer3LSBFirstFixedBase;
 		else
 		    infoRec->TEGlyphRenderer = XAATEGlyphRenderer3LSBFirst;
 	    }
+
+	    if (!HaveSolidFillRect &&
+		(infoRec->TEGlyphRendererFlags & RGB_EQUAL)) {
+		infoRec->TEGlyphRendererFlags &= ~RGB_EQUAL;
+		XAAMSG("WARNING:  TEGlyphRenderer cannot support RGB_EQUAL"
+		       " without solid fills\n");
+	    }
 	} else {
-	    if(infoRec->CPUToScreenColorExpandFillFlags & 
-					BIT_ORDER_IN_BYTE_MSBFIRST) {
-		if(infoRec->CPUToScreenColorExpandFillFlags & 
-					CPU_TRANSFER_BASE_FIXED)
-		    infoRec->TEGlyphRenderer = 
+	    if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {
+		if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)
+		    infoRec->TEGlyphRenderer =
 			XAATEGlyphRendererMSBFirstFixedBase;
 		else
 		    infoRec->TEGlyphRenderer = XAATEGlyphRendererMSBFirst;
 	    } else {
-		if(infoRec->CPUToScreenColorExpandFillFlags & 
-					CPU_TRANSFER_BASE_FIXED)
-		    infoRec->TEGlyphRenderer = 
+		if (infoRec->TEGlyphRendererFlags & CPU_TRANSFER_BASE_FIXED)
+		    infoRec->TEGlyphRenderer =
 			XAATEGlyphRendererLSBFirstFixedBase;
 		else
 		    infoRec->TEGlyphRenderer = XAATEGlyphRendererLSBFirst;
 	    }
 	}
-	infoRec->TEGlyphRendererFlags = 
-			infoRec->CPUToScreenColorExpandFillFlags;
 
-	if(HaveSolidFillRect)
-	   infoRec->TEGlyphRendererFlags &= ~TRANSPARENCY_ONLY;
+	if (!HaveSolidFillRect &&
+	    (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
+	    infoRec->TEGlyphRendererFlags &= ~TRANSPARENCY_ONLY;
+	    XAAMSG("WARNING:  TEGlyphRenderer cannot support TRANPARENCY_ONLY"
+		   " without solid fills\n");
+	}
 
-    } else if(HaveScanlineColorExpansion) {
-        if (infoRec->CPUToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) {
-	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
-					BIT_ORDER_IN_BYTE_MSBFIRST)
-		infoRec->TEGlyphRenderer = 
-		    XAATEGlyphRendererScanline3MSBFirst;
+    } else if (HaveScanlineColorExpansion) {
+	infoRec->TEGlyphRendererFlags =
+	    infoRec->ScanlineCPUToScreenColorExpandFillFlags;
+
+	if (infoRec->TEGlyphRendererFlags & TRIPLE_BITS_24BPP) {
+	    if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST)
+		infoRec->TEGlyphRenderer = XAATEGlyphRendererScanline3MSBFirst;
 	    else
-		infoRec->TEGlyphRenderer = 
-		    XAATEGlyphRendererScanline3LSBFirst;
+		infoRec->TEGlyphRenderer = XAATEGlyphRendererScanline3LSBFirst;
+
+	    if (!HaveSolidFillRect &&
+		(infoRec->TEGlyphRendererFlags & RGB_EQUAL)) {
+		infoRec->TEGlyphRendererFlags &= ~RGB_EQUAL;
+		XAAMSG("WARNING:  TEGlyphRenderer cannot support RGB_EQUAL"
+		       " without solid fills\n");
+	    }
 	} else {
-	    if(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
-					BIT_ORDER_IN_BYTE_MSBFIRST)
-		infoRec->TEGlyphRenderer = 
-		    XAATEGlyphRendererScanlineMSBFirst;
+	    if (infoRec->TEGlyphRendererFlags & BIT_ORDER_IN_BYTE_MSBFIRST)
+		infoRec->TEGlyphRenderer = XAATEGlyphRendererScanlineMSBFirst;
 	    else
-		infoRec->TEGlyphRenderer = 
-		    XAATEGlyphRendererScanlineLSBFirst;
+		infoRec->TEGlyphRenderer = XAATEGlyphRendererScanlineLSBFirst;
 	}
-
-	infoRec->TEGlyphRendererFlags = 
-		infoRec->ScanlineCPUToScreenColorExpandFillFlags;
 
-	if(HaveSolidFillRect)
-	   infoRec->TEGlyphRendererFlags &= ~TRANSPARENCY_ONLY;
+	if (!HaveSolidFillRect &&
+	    (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
+	    infoRec->TEGlyphRendererFlags &= ~TRANSPARENCY_ONLY;
+	    XAAMSG("WARNING:  TEGlyphRenderer cannot support TRANPARENCY_ONLY"
+		   " without solid fills\n");
+	}
     }
 
-
     /**** NonTE Glyphs ****/
 
     if(infoRec->NonTEGlyphRenderer) {
@@ -841,7 +909,6 @@
 	infoRec->NonTEGlyphRenderer = XAANonTEGlyphRenderer;
 	infoRec->NonTEGlyphRendererFlags = infoRec->WriteBitmapFlags;
     }
-    
 
     /**** WritePixmap ****/
 
@@ -856,16 +923,13 @@
 	infoRec->WritePixmapFlags = infoRec->ScanlineImageWriteFlags;
     }
 
-
     /**** ReadPixmap ****/
 
     if(infoRec->ReadPixmap) {
 	XAAMSG("\tDriver provided ReadPixmap replacement\n");
-    } else if(HaveImageReadRect) {
-	infoRec->ReadPixmap = XAAReadPixmap;
-	infoRec->ReadPixmapFlags = infoRec->ImageReadFlags;
     } 
 
+
     /************** GC Level *************/
 
     /**** CopyArea ****/
@@ -917,7 +981,6 @@
 	}
     }
 
-
     if(infoRec->FillMono8x8PatternRects || infoRec->FillColor8x8PatternRects ||
 	infoRec->FillCacheBltRects || infoRec->FillColorExpandRects ||
 	infoRec->FillCacheExpandRects) {
@@ -927,6 +990,7 @@
 	    infoRec->PolyFillRectStippledFlags = 0;
 	}
     }
+
     if(infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||
 	infoRec->FillCacheBltSpans || infoRec->FillColorExpandSpans ||
 	infoRec->FillCacheExpandSpans) {
@@ -946,6 +1010,7 @@
 	    infoRec->PolyFillRectOpaqueStippledFlags = 0;
 	}
     }
+
     if(infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||
 	infoRec->FillCacheBltSpans || infoRec->FillColorExpandSpans ||
 	infoRec->FillCacheExpandSpans) {
@@ -956,7 +1021,6 @@
 	}
     }
 
-
     if(infoRec->FillMono8x8PatternRects || infoRec->FillColor8x8PatternRects ||
 	infoRec->FillCacheBltRects || infoRec->FillImageWriteRects) {
 	if(!infoRec->PolyFillRectTiled) {
@@ -965,6 +1029,7 @@
 	    infoRec->PolyFillRectTiledFlags = 0;
 	}
     }
+
     if(infoRec->FillMono8x8PatternSpans || infoRec->FillColor8x8PatternSpans ||
 	infoRec->FillCacheBltSpans) {
 	if(!infoRec->FillSpansTiled) {
@@ -974,7 +1039,6 @@
 	}
     }
 
-
     if(infoRec->TEGlyphRenderer &&
 	!(infoRec->TEGlyphRendererFlags & NO_TRANSPARENCY)) {
 
@@ -1029,7 +1093,6 @@
 	}
     }
 
-
     if(infoRec->NonTEGlyphRenderer && HaveSolidFillRect) {
 	if(!infoRec->ImageText8NonTE) {
 	    infoRec->ImageText8NonTE = XAAImageText8NonTEColorExpansion;
@@ -1127,6 +1190,7 @@
 	   infoRec->ComputeDash = XAAComputeDash;
     }
 
+
     /************  Validation Functions **************/
 
     if(!infoRec->ValidateCopyArea && infoRec->CopyArea) {
@@ -1269,8 +1333,8 @@
 	    infoRec->PolylinesMask |= GCForeground;
     }
 
-
 
+    /**** Fill choosers ****/
 
     if(!infoRec->StippledFillChooser)
 	infoRec->StippledFillChooser = XAAStippledFillChooser;
@@ -1284,7 +1348,6 @@
 
     /**** Setup the pixmap cache ****/
 
-
     if(infoRec->WriteBitmapToCache) {}
     else if(infoRec->WriteBitmap && 
 	!(infoRec->WriteBitmapFlags & TRANSPARENCY_ONLY))
@@ -1294,7 +1357,6 @@
     else
 	infoRec->PixmapCacheFlags |= DO_NOT_BLIT_STIPPLES;
 
-
     if(infoRec->WritePixmapToCache) {}
     else if(infoRec->WritePixmap && !(infoRec->WritePixmapFlags & NO_GXCOPY))
 	infoRec->WritePixmapToCache = XAAWritePixmapToCache;
@@ -1303,9 +1365,8 @@
     else
 	infoRec->Flags &= ~PIXMAP_CACHE;
 
-    if (xf86IsOptionSet(XAAOptions, XAAOPT_PIXMAP_CACHE))
+    if (xf86IsOptionSet(options, XAAOPT_PIXMAP_CACHE))
 	infoRec->Flags &= ~PIXMAP_CACHE;
-
 
     if(infoRec->WriteMono8x8PatternToCache) {}
     else if(infoRec->PixmapCacheFlags & CACHE_MONO_8x8) {
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c:1.11 xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c:1.12
--- xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c:1.11	Sat Sep 25 07:38:14 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c	Fri Apr  7 12:11:10 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.11 1999/09/25 14:38:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.12 2000/04/07 19:11:10 mvojkovi Exp $ */
 
 /********************************************************************
 
@@ -266,7 +266,7 @@
 ){
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     CARD32 *block, *pntr, *bits;
-    int pitch, topLine, botLine, top, bot;
+    int pitch, topLine, botLine, top, bot, height;
     int Left, Right, Top, Bottom;
     int LeftEdge, RightEdge;
     int bitPitch, shift, size, i, skippix;
@@ -332,10 +332,12 @@
 	if(RightEdge > LeftEdge) {
 	    skippix = LeftEdge - Left;
 	    topLine = max(Top, pbox->y1);
-	    botLine = min(Bottom, pbox->y2);
+	    botLine = min(Bottom, pbox->y2);	
+	    height = botLine - topLine;
 
-	    (*infoRec->WriteBitmap)(pScrn, LeftEdge, topLine, 
-			RightEdge - LeftEdge, botLine - topLine,
+	    if(height > 0) 
+	       (*infoRec->WriteBitmap)(pScrn, LeftEdge, topLine, 
+			RightEdge - LeftEdge, height,
 			(unsigned char*)(pntr + ((topLine - Top) * pitch) +
 				(skippix >> 5)),
 			pitch << 2, skippix & 31, fg, -1, rop, planemask);
@@ -403,9 +405,10 @@
     nbox = REGION_NUM_RECTS(cclip);
     pbox = REGION_RECTS(cclip);
 
-    if((nglyph > 1) && ((FONTMAXBOUNDS(font, rightSideBearing) - 
-          		FONTMINBOUNDS(font, leftSideBearing)) <= 32)) {
-
+    if(infoRec->WriteBitmap && (nglyph > 1) && 
+			((FONTMAXBOUNDS(font, rightSideBearing) - 
+          		FONTMINBOUNDS(font, leftSideBearing)) <= 32)) 
+   {
 	PolyGlyphBltAsSingleBitmap(pScrn, nglyph, font, 
 				xInit, yInit, nbox, pbox,
 				fg, GXcopy, planemask);
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c:1.10 xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c:1.11
--- xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c:1.10	Thu Feb 10 22:35:17 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c	Mon Mar 27 17:21:04 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.10 2000/02/11 06:35:17 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.11 2000/03/28 01:21:04 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -187,6 +187,7 @@
 		pPriv->offscreenArea->box.x2 - pCache->x;
 	    pCache->h = pCache->orig_h = 
 		pPriv->offscreenArea->box.y2 - pCache->y;
+	    pCache->trans_color = -1;
 	     
 	    (*infoRec->FillCacheBltRects)(infoRec->pScrn, GXcopy, pm,
 				nBox, pBox, xorg, yorg, pCache);
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c:1.28 xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c:1.29
--- xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c:1.28	Sun Feb 27 13:50:20 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c	Mon Jun 12 19:51:24 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.28 2000/02/27 21:50:20 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.29 2000/06/13 02:51:24 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -1176,8 +1176,8 @@
     }
 
     if(infoRec->Mono8x8PatternFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {
-	pPriv->pattern0 = XAAReverseBitOrder(pPriv->pattern0);
-	pPriv->pattern1 = XAAReverseBitOrder(pPriv->pattern1);
+	pPriv->pattern0 = SWAP_BITS_IN_BYTES(pPriv->pattern0);
+	pPriv->pattern1 = SWAP_BITS_IN_BYTES(pPriv->pattern1);
     }
 
 
@@ -1381,8 +1381,8 @@
 	pPriv->flags |= REDUCIBLE_TO_2_COLOR;
 
 	if(infoRec->Mono8x8PatternFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST) {
-	    pPriv->pattern0 = XAAReverseBitOrder(pPriv->pattern0);
-	    pPriv->pattern1 = XAAReverseBitOrder(pPriv->pattern1);
+	    pPriv->pattern0 = SWAP_BITS_IN_BYTES(pPriv->pattern0);
+	    pPriv->pattern1 = SWAP_BITS_IN_BYTES(pPriv->pattern1);
 	}
 
     }
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c:1.8 xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c:1.9
--- xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c:1.8	Sat Aug 28 02:01:18 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c	Mon Mar 27 17:21:05 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.8 1999/08/28 09:01:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.9 2000/03/28 01:21:05 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -112,6 +112,7 @@
 		pPriv->offscreenArea->box.x2 - pCache->x;
 	    pCache->h = pCache->orig_h = 
 		pPriv->offscreenArea->box.y2 - pCache->y;
+	    pCache->trans_color = -1;
 	     
 	    (*infoRec->FillCacheBltRects)(infoRec->pScrn, GXcopy, ~0,
 				nBox, pBox, xorg, yorg, pCache);
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c:1.13 xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c:1.14
--- xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c:1.13	Sun Oct 31 15:52:57 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c	Mon Mar 27 17:21:05 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.13 1999/10/31 23:52:57 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -365,6 +365,7 @@
 		pPriv->offscreenArea->box.x2 - pCache->x;
    pCache->h = pCache->orig_h = 
 		pPriv->offscreenArea->box.y2 - pCache->y;
+   pCache->trans_color = -1;
 
    (*infoRec->FillCacheBltSpans) (infoRec->pScrn, 
                 pGC->alu, pGC->planemask, n, ppt, pwidth, fSorted, pCache, 
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c:3.1
--- /dev/null	Sat Jul  1 20:43:38 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c	Mon Jun 19 22:08:49 2000
@@ -0,0 +1,1628 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_ansic.h"
+#include "xf86_OSproc.h"
+
+#include "X.h"
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "xf86str.h"
+#include "mi.h"
+#include "miline.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+#include "servermd.h"
+
+#define XAA_STATE_WRAP(func) do {\
+if(infoRec->func) { \
+   pStatePriv->func = infoRec->func;\
+   infoRec->func = XAAStateWrap##func;\
+}} while(0)
+
+/* Wrap all XAA functions and allocate our private structure.
+ */
+
+typedef struct _XAAStateWrapRec {
+   ScrnInfoPtr pScrn;   
+   void (*RestoreAccelState)(ScrnInfoPtr pScrn);
+   void (*Sync)(ScrnInfoPtr pScrn);
+   void (*SetupForScreenToScreenCopy)(ScrnInfoPtr pScrn, int xdir, int ydir,
+				      int rop, unsigned int planemask, 
+				      int trans_color);
+   void (*SetupForSolidFill)(ScrnInfoPtr pScrn, int color, int rop, 
+			     unsigned int planemask);
+   void (*SetupForSolidLine)(ScrnInfoPtr pScrn,int color,int rop,
+			     unsigned int planemask);
+   void (*SetupForDashedLine)(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+			      unsigned int planemask, int length,
+			      unsigned char *pattern);
+   void (*SetClippingRectangle) (ScrnInfoPtr pScrn, int left, int top, 
+				 int right, int bottom);
+   void (*DisableClipping)(ScrnInfoPtr pScrn);
+   void (*SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+				      int fg, int bg, int rop, 
+				      unsigned int planemask);
+   void (*SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+				       int rop, unsigned int planemask,
+				       int transparency_color);
+   void (*SetupForCPUToScreenColorExpandFill)(ScrnInfoPtr pScrn, int fg, 
+					      int bg, int rop,
+					      unsigned int planemask);
+   void (*SetupForScanlineCPUToScreenColorExpandFill)(ScrnInfoPtr pScrn,
+						      int fg, int bg, int rop,
+						      unsigned int planemask);
+   void (*SetupForScreenToScreenColorExpandFill) (ScrnInfoPtr pScrn,
+						  int fg, int bg, int rop,
+						  unsigned int planemask);
+   void (*SetupForImageWrite)(ScrnInfoPtr pScrn, int rop, 
+			      unsigned int planemask, int transparency_color,
+			      int bpp, int depth);
+   void (*SetupForScanlineImageWrite)(ScrnInfoPtr pScrn, int rop, 
+				      unsigned int planemask,
+				      int transparency_color,
+				      int bpp, int depth);
+   void (*SetupForImageRead) (ScrnInfoPtr pScrn, int bpp, int depth);
+   void (*ScreenToScreenBitBlt)(ScrnInfoPtr pScrn, int nbox,
+				DDXPointPtr pptSrc, BoxPtr pbox, int xdir, 
+				int ydir, int alu, unsigned int planmask);
+   void (*WriteBitmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+			unsigned char *src, int srcwidth, int skipleft,
+			int fg, int bg, int rop, unsigned int planemask);
+   void (*FillSolidRects)(ScrnInfoPtr pScrn, int fg, int rop,
+			  unsigned int planemask, int nBox, BoxPtr pBox);
+   void (*FillMono8x8PatternRects)(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+				   unsigned int planemask, int nBox, 
+				   BoxPtr pBox, int pat0, int pat1,
+				   int xorg, int yorg);
+   void (*FillColor8x8PatternRects)(ScrnInfoPtr pScrn, int rop,
+				    unsigned int planemask, int nBox,
+				    BoxPtr pBox, int xorg, int yorg,
+				    XAACacheInfoPtr pCache);
+   void (*FillCacheBltRects)(ScrnInfoPtr pScrn, int rop, 
+			     unsigned int planemask, int nBox, BoxPtr pBox,
+			     int xorg, int yorg, XAACacheInfoPtr pCache);
+   void (*FillColorExpandRects)(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+				unsigned int planemask, int nBox,
+				BoxPtr pBox, int xorg, int yorg, 
+				PixmapPtr pPix);
+   void (*FillCacheExpandRects)(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+				unsigned int planemask, int nBox, BoxPtr pBox,
+				int xorg, int yorg, PixmapPtr pPix);
+   void (*FillImageWriteRects)(ScrnInfoPtr pScrn, int rop,
+			       unsigned int planemask, int nBox, BoxPtr pBox,
+			       int xorg, int yorg, PixmapPtr pPix);
+   void (*FillSolidSpans)(ScrnInfoPtr pScrn, int fg, int rop,
+			  unsigned int planemask, int n, DDXPointPtr points,
+			  int *widths, int fSorted);
+   void (*FillMono8x8PatternSpans)(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+				   unsigned int planemask, int n,
+				   DDXPointPtr points, int *widths,
+				   int fSorted, int pat0, int pat1,
+				   int xorg, int yorg);
+   void (*FillColor8x8PatternSpans)(ScrnInfoPtr pScrn, int rop,
+				    unsigned int planemask, int n,
+				    DDXPointPtr points, int *widths,
+				    int fSorted, XAACacheInfoPtr pCache,
+				    int xorg, int yorg);
+   void (*FillCacheBltSpans)(ScrnInfoPtr pScrn, int rop,
+			     unsigned int planemask, int n, DDXPointPtr points,
+			     int *widths, int fSorted, XAACacheInfoPtr pCache,
+			     int xorg, int yorg);
+   void (*FillColorExpandSpans)(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+				unsigned int planemask, int n,
+				DDXPointPtr points, int *widths, int fSorted,
+				int xorg, int yorg, PixmapPtr pPix);
+   void (*FillCacheExpandSpans)(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+				unsigned int planemask, int n, DDXPointPtr ppt,
+				int *pwidth, int fSorted, int xorg, int yorg,
+				PixmapPtr pPix);
+   void (*TEGlyphRenderer)(ScrnInfoPtr pScrn, int x, int y, int w, int h, 
+			   int skipleft, int startline, unsigned int **glyphs,
+			   int glyphWidth, int fg, int bg, int rop, 
+			   unsigned planemask);
+   void (*NonTEGlyphRenderer)(ScrnInfoPtr pScrn, int x, int y, int n,
+			      NonTEGlyphPtr glyphs, BoxPtr pbox,
+			      int fg, int rop, unsigned int planemask);
+   void (*WritePixmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+			unsigned char *src, int srcwidth, int rop,
+			unsigned int planemask, int transparency_color,
+			int bpp, int depth);
+   void (*ReadPixmap) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+		       unsigned char *dst, int dstwidth, int bpp, int depth);
+   RegionPtr (*CopyArea)(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+			 GC *pGC, int srcx, int srcy, int width, int height,
+			 int dstx, int dsty);
+   RegionPtr (*CopyPlane)(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+			  int srcx, int srcy, int width, int height, int dstx,
+			  int dsty, unsigned long bitPlane);
+   void (*PushPixelsSolid) (GCPtr pGC, PixmapPtr pBitMap,
+			    DrawablePtr pDrawable, int dx, int dy, int xOrg, 
+			    int yOrg);
+   void (*PolyFillRectSolid)(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+			     xRectangle *prectInit);
+   void (*PolyFillRectStippled)(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+				xRectangle *prectInit);
+   void (*PolyFillRectOpaqueStippled)(DrawablePtr pDraw, GCPtr pGC,
+				      int nrectFill, xRectangle *prectInit);
+   void (*PolyFillRectTiled)(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+			     xRectangle *prectInit);
+   void (*FillSpansSolid)(DrawablePtr pDraw, GCPtr pGC, int nInit,
+			  DDXPointPtr ppt, int *pwidth, int fSorted);
+   void (*FillSpansStippled)(DrawablePtr pDraw, GCPtr pGC, int nInit,
+			     DDXPointPtr ppt, int *pwidth, int fSorted);
+   void (*FillSpansOpaqueStippled)(DrawablePtr pDraw, GCPtr pGC, int nInit, 
+				   DDXPointPtr ppt, int *pwidth, int fSorted);
+   void (*FillSpansTiled)(DrawablePtr pDraw, GCPtr pGC, int nInit, 
+			  DDXPointPtr ppt, int *pwidth, int fSorted);
+   int (*PolyText8TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+		       char *chars);
+   int (*PolyText16TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+			unsigned short *chars);
+   void (*ImageText8TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+			 char *chars);
+   void (*ImageText16TE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+			  int count, unsigned short *chars);
+   void (*ImageGlyphBltTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit, 
+			    int yInit, unsigned int nglyph, CharInfoPtr *ppci,
+			    pointer pglyphBase);
+   void (*PolyGlyphBltTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit, 
+			   int yInit, unsigned int nglyph, CharInfoPtr *ppci,
+			   pointer pglyphBase);
+   int (*PolyText8NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+			  int count, char *chars);
+   int (*PolyText16NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y, 
+			   int count, unsigned short *chars);
+   void (*ImageText8NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+			    int count, char *chars);
+   void (*ImageText16NonTE) (DrawablePtr pDraw, GCPtr pGC, int x, int y,
+			     int count, unsigned short *chars);
+   void (*ImageGlyphBltNonTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit, 
+			       int yInit, unsigned int nglyph,
+			       CharInfoPtr *ppci, pointer pglyphBase);
+   void (*PolyGlyphBltNonTE) (DrawablePtr pDrawable, GCPtr pGC, int xInit, 
+			      int yInit, unsigned int nglyph,
+			      CharInfoPtr *ppci, pointer pglyphBase);
+   void (*PolyRectangleThinSolid)(DrawablePtr pDrawable,GCPtr pGC,
+				  int nRectsInit, xRectangle *pRectsInit);
+   void (*PolylinesWideSolid)(DrawablePtr pDrawable, GCPtr pGC, int mode, 
+			      int npt, DDXPointPtr pPts);
+   void (*PolylinesThinSolid)(DrawablePtr pDrawable, GCPtr pGC, int mode, 
+			      int npt, DDXPointPtr pPts);
+   void (*PolySegmentThinSolid)(DrawablePtr pDrawable, GCPtr pGC, int nseg,
+				xSegment *pSeg);
+   void (*PolylinesThinDashed)(DrawablePtr pDrawable, GCPtr pGC, int mode, 
+			       int npt, DDXPointPtr pPts);
+   void (*PolySegmentThinDashed)(DrawablePtr pDrawable, GCPtr pGC, int nseg,
+				 xSegment *pSeg);
+   void (*FillPolygonSolid)(DrawablePtr pDrawable, GCPtr pGC, int shape,
+			    int mode, int count, DDXPointPtr ptsIn);
+   void (*FillPolygonStippled)(DrawablePtr pDrawable, GCPtr pGC, int shape,
+			       int mode, int count, DDXPointPtr ptsIn);
+   void (*FillPolygonOpaqueStippled)(DrawablePtr pDrawable, GCPtr pGC,
+				     int shape, int mode, int count,
+				     DDXPointPtr ptsIn);
+   void (*FillPolygonTiled)(DrawablePtr pDrawable, GCPtr pGC, int shape, 
+			    int mode, int count, DDXPointPtr ptsIn);
+   void (*PolyFillArcSolid)(DrawablePtr pDraw, GCPtr pGC, int narcs, 
+			    xArc *parcs);
+   void (*PutImage)(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, 
+		    int w, int h, int leftPad, int format, char *pImage);
+   ValidateGCProcPtr ValidateFillSpans;
+   ValidateGCProcPtr ValidateSetSpans;
+   ValidateGCProcPtr ValidatePutImage;
+   ValidateGCProcPtr ValidateCopyArea;
+   ValidateGCProcPtr ValidateCopyPlane;
+   ValidateGCProcPtr ValidatePolyPoint;
+   ValidateGCProcPtr ValidatePolylines;
+   ValidateGCProcPtr ValidatePolySegment;
+   ValidateGCProcPtr ValidatePolyRectangle;
+   ValidateGCProcPtr ValidatePolyArc;
+   ValidateGCProcPtr ValidateFillPolygon;
+   ValidateGCProcPtr ValidatePolyFillRect;
+   ValidateGCProcPtr ValidatePolyFillArc;
+   ValidateGCProcPtr ValidatePolyText8;
+   ValidateGCProcPtr ValidatePolyText16;
+   ValidateGCProcPtr ValidateImageText8;
+   ValidateGCProcPtr ValidateImageText16;
+   ValidateGCProcPtr ValidatePolyGlyphBlt;
+   ValidateGCProcPtr ValidateImageGlyphBlt;
+   ValidateGCProcPtr ValidatePushPixels;
+   void (*ComputeDash)(GCPtr pGC);
+   void (*InitPixmapCache)(ScreenPtr pScreen, RegionPtr areas, pointer data);
+   void (*ClosePixmapCache)(ScreenPtr pScreen);
+   int (*StippledFillChooser)(GCPtr pGC);
+   int (*OpaqueStippledFillChooser)(GCPtr pGC);
+   int (*TiledFillChooser)(GCPtr pGC);
+   XAACacheInfoPtr (*CacheTile)(ScrnInfoPtr Scrn, PixmapPtr pPix);
+   XAACacheInfoPtr (*CacheStipple)(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, 
+				   int bg);
+   XAACacheInfoPtr (*CacheMonoStipple)(ScrnInfoPtr Scrn, PixmapPtr pPix);
+   XAACacheInfoPtr (*CacheMono8x8Pattern)(ScrnInfoPtr Scrn, int pat0, 
+					  int pat1);
+   XAACacheInfoPtr (*CacheColor8x8Pattern)(ScrnInfoPtr Scrn, PixmapPtr pPix, 
+					   int fg, int bg);
+   void (*WriteBitmapToCache) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+			       unsigned char *src, int srcwidth, int fg, 
+			       int bg);
+   void (*WritePixmapToCache) (ScrnInfoPtr pScrn, int x, int y, int w, int h,
+			       unsigned char *src, int srcwidth, int bpp, 
+			       int depth);
+   void (*WriteMono8x8PatternToCache)(ScrnInfoPtr pScrn, 
+				      XAACacheInfoPtr pCache);
+   void (*WriteColor8x8PatternToCache)(ScrnInfoPtr pScrn, PixmapPtr pPix, 
+				       XAACacheInfoPtr pCache);
+   GetImageProcPtr GetImage;
+   GetSpansProcPtr GetSpans;
+   PaintWindowBackgroundProcPtr PaintWindowBackground;
+   PaintWindowBorderProcPtr PaintWindowBorder;
+   CopyWindowProcPtr CopyWindow;
+   BackingStoreSaveAreasProcPtr SaveAreas;
+   BackingStoreRestoreAreasProcPtr RestoreAreas;
+} XAAStateWrapRec, *XAAStateWrapPtr;
+
+static int XAAStateIndex = -1;
+static unsigned long XAAStateGeneration = 0;
+
+/* Wrap functions start here */
+#define GET_STATEPRIV_GC(pGC)   XAAStateWrapPtr pStatePriv =\
+(XAAStateWrapPtr)(pGC->pScreen->devPrivates[XAAStateIndex].ptr)
+
+#define GET_STATEPRIV_SCREEN(pScreen)   XAAStateWrapPtr pStatePriv =\
+(XAAStateWrapPtr)(pScreen->devPrivates[XAAStateIndex].ptr)
+
+#define GET_STATEPRIV_PSCRN(pScrn)   XAAStateWrapPtr pStatePriv =\
+(XAAStateWrapPtr)(pScrn->pScreen->devPrivates[XAAStateIndex].ptr)
+
+#define STATE_CHECK_SP(pStatePriv) {\
+	ScrnInfoPtr pScrn = pStatePriv->pScrn;\
+	int i = 0;\
+	int need_change = 0;\
+	while(i < pScrn->numEntities) {\
+		if(xf86IsEntityShared(pScrn->entityList[i]) &&\
+		   xf86GetLastScrnFlag(pScrn->entityList[i]) != pScrn->scrnIndex) {\
+			need_change = 1;\
+			xf86SetLastScrnFlag(pScrn->entityList[i],\
+					    pScrn->scrnIndex);\
+		}\
+		i++;\
+	}\
+	if(need_change == 1) (*pStatePriv->RestoreAccelState)(pScrn);\
+}
+
+#define STATE_CHECK_PSCRN(pScrn) {\
+	int i = 0;\
+	int need_change = 0;\
+	while(i < pScrn->numEntities) {\
+		if(xf86IsEntityShared(pScrn->entityList[i]) &&\
+		   xf86GetLastScrnFlag(pScrn->entityList[i]) != pScrn->scrnIndex) {\
+			need_change = 1;\
+			xf86SetLastScrnFlag(pScrn->entityList[i],\
+					    pScrn->scrnIndex);\
+		}\
+		i++;\
+	}\
+	if(need_change == 1) (*pStatePriv->RestoreAccelState)(pScrn);\
+}
+
+static void XAAStateWrapSync(ScrnInfoPtr pScrn)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+   
+   (*pStatePriv->Sync)(pScrn);
+}
+
+static void XAAStateWrapSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir,
+						   int rop, unsigned int planemask, 
+						   int trans_color)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+   
+   (*pStatePriv->SetupForScreenToScreenCopy)(pScrn, xdir, ydir, rop, planemask, 
+					     trans_color);
+}
+
+static void XAAStateWrapSetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop, 
+					  unsigned int planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+   
+   (*pStatePriv->SetupForSolidFill)(pScrn, color, rop, planemask);
+}
+
+static void XAAStateWrapSetupForSolidLine(ScrnInfoPtr pScrn,int color,int rop,
+					  unsigned int planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForSolidLine)(pScrn, color, rop, planemask);
+}
+
+static void XAAStateWrapSetupForDashedLine(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+					   unsigned int planemask, int length,
+					   unsigned char *pattern)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForDashedLine)(pScrn, fg, bg, rop, planemask, length, pattern);
+}
+
+static void XAAStateWrapSetClippingRectangle(ScrnInfoPtr pScrn, int left, int top, 
+					     int right, int bottom)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetClippingRectangle)(pScrn, left, top, right, bottom);
+}
+
+static void XAAStateWrapDisableClipping(ScrnInfoPtr pScrn)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->DisableClipping)(pScrn);
+}
+
+static void XAAStateWrapSetupForMono8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,
+						   int fg, int bg, int rop, 
+						   unsigned int planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForMono8x8PatternFill)(pScrn, patx, paty, fg, bg, rop, planemask);
+}
+
+static void XAAStateWrapSetupForColor8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,
+						    int rop, unsigned int planemask,
+						    int transparency_color)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForColor8x8PatternFill)(pScrn, patx, paty, rop, planemask, 
+					      transparency_color);
+}
+
+static void XAAStateWrapSetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, int fg, 
+							   int bg, int rop,
+							   unsigned int planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForCPUToScreenColorExpandFill)(pScrn, fg, bg, rop, planemask);
+}
+
+static void XAAStateWrapSetupForScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
+								   int fg, int bg, 
+								   int rop,
+								   unsigned int planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForScanlineCPUToScreenColorExpandFill)(pScrn, fg, bg, rop,
+							     planemask);
+}
+
+static void XAAStateWrapSetupForScreenToScreenColorExpandFill(ScrnInfoPtr pScrn,
+							      int fg, int bg, int rop,
+							      unsigned int planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForScreenToScreenColorExpandFill)(pScrn, fg, bg, rop, planemask);
+}
+
+static void XAAStateWrapSetupForImageWrite(ScrnInfoPtr pScrn, int rop, 
+					   unsigned int planemask, int transparency_color,
+					   int bpp, int depth)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForImageWrite)(pScrn, rop, planemask, transparency_color, bpp, 
+				     depth);
+}
+
+static void XAAStateWrapSetupForScanlineImageWrite(ScrnInfoPtr pScrn, int rop, 
+						   unsigned int planemask,
+						   int transparency_color,
+						   int bpp, int depth)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForScanlineImageWrite)(pScrn, rop, planemask, transparency_color, 
+					     bpp, depth);
+}
+
+static void XAAStateWrapSetupForImageRead(ScrnInfoPtr pScrn, int bpp, int depth)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->SetupForImageRead)(pScrn, bpp, depth);
+}
+
+static void XAAStateWrapScreenToScreenBitBlt(ScrnInfoPtr pScrn, int nbox,
+					     DDXPointPtr pptSrc, BoxPtr pbox, int xdir, 
+					     int ydir, int alu, unsigned int planmask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->ScreenToScreenBitBlt)(pScrn, nbox,
+				       pptSrc, pbox, xdir, 
+				       ydir, alu, planmask);
+}
+
+static void XAAStateWrapWriteBitmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+				    unsigned char *src, int srcwidth, int skipleft,
+				    int fg, int bg, int rop, unsigned int planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->WriteBitmap)(pScrn, x, y, w, h,
+			      src, srcwidth, skipleft,
+			      fg, bg, rop, planemask);
+}
+
+static void XAAStateWrapFillSolidRects(ScrnInfoPtr pScrn, int fg, int rop,
+				       unsigned int planemask, int nBox, BoxPtr pBox)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillSolidRects)(pScrn, fg, rop,
+				 planemask, nBox, pBox);
+}
+
+static void XAAStateWrapFillMono8x8PatternRects(ScrnInfoPtr pScrn, int fg, int bg, 
+						int rop, unsigned int planemask, int nBox,
+						BoxPtr pBox, int pat0, int pat1,
+						int xorg, int yorg)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillMono8x8PatternRects)(pScrn, fg, bg, 
+					  rop, planemask, nBox,
+					  pBox, pat0, pat1,
+					  xorg, yorg);
+}
+
+static void XAAStateWrapFillColor8x8PatternRects(ScrnInfoPtr pScrn, int rop,
+						 unsigned int planemask, int nBox,
+						 BoxPtr pBox, int xorg, int yorg,
+						 XAACacheInfoPtr pCache)
+{ 
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillColor8x8PatternRects)(pScrn, rop,
+					   planemask, nBox,
+					   pBox, xorg, yorg,
+					   pCache);
+}
+
+static void XAAStateWrapFillCacheBltRects(ScrnInfoPtr pScrn, int rop, 
+					  unsigned int planemask, int nBox, BoxPtr pBox,
+					  int xorg, int yorg, XAACacheInfoPtr pCache)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillCacheBltRects)(pScrn, rop, 
+				    planemask, nBox, pBox,
+				    xorg, yorg, pCache);
+}
+
+static void XAAStateWrapFillColorExpandRects(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+					     unsigned int planemask, int nBox,
+					     BoxPtr pBox, int xorg, int yorg, 
+					     PixmapPtr pPix)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillColorExpandRects)(pScrn, fg, bg, rop,
+				       planemask, nBox,
+				       pBox, xorg, yorg, 
+				       pPix);
+}
+
+static void XAAStateWrapFillCacheExpandRects(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+					     unsigned int planemask, int nBox, 
+					     BoxPtr pBox, int xorg, int yorg, 
+					     PixmapPtr pPix)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillCacheExpandRects)(pScrn, fg, bg, rop,
+				       planemask, nBox, 
+				       pBox, xorg, yorg, 
+				       pPix);
+}
+
+static void XAAStateWrapFillImageWriteRects(ScrnInfoPtr pScrn, int rop,
+					    unsigned int planemask, int nBox, BoxPtr pBox,
+					    int xorg, int yorg, PixmapPtr pPix)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillImageWriteRects)(pScrn, rop,
+				      planemask, nBox, pBox,
+				      xorg, yorg, pPix);
+}
+
+static void XAAStateWrapFillSolidSpans(ScrnInfoPtr pScrn, int fg, int rop,
+				       unsigned int planemask, int n, DDXPointPtr points,
+				       int *widths, int fSorted)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillSolidSpans)(pScrn, fg, rop,
+				 planemask, n, points,
+				 widths, fSorted);
+}
+
+static void XAAStateWrapFillMono8x8PatternSpans(ScrnInfoPtr pScrn, int fg, int bg, 
+						int rop, unsigned int planemask, int n,
+						DDXPointPtr points, int *widths,
+						int fSorted, int pat0, int pat1,
+						int xorg, int yorg)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillMono8x8PatternSpans)(pScrn, fg, bg, 
+					  rop, planemask, n,
+					  points, widths,
+					  fSorted, pat0, pat1,
+					  xorg, yorg);
+}
+
+static void XAAStateWrapFillColor8x8PatternSpans(ScrnInfoPtr pScrn, int rop,
+						 unsigned int planemask, int n,
+						 DDXPointPtr points, int *widths,
+						 int fSorted, XAACacheInfoPtr pCache,
+						 int xorg, int yorg)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillColor8x8PatternSpans)(pScrn, rop,
+					   planemask, n,
+					   points, widths,
+					   fSorted, pCache,
+					   xorg, yorg);
+}
+
+static void XAAStateWrapFillCacheBltSpans(ScrnInfoPtr pScrn, int rop,
+					  unsigned int planemask, int n, 
+					  DDXPointPtr points, int *widths, 
+					  int fSorted, XAACacheInfoPtr pCache,
+					  int xorg, int yorg)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillCacheBltSpans)(pScrn, rop,
+				    planemask, n, 
+				    points, widths, 
+				    fSorted, pCache,
+				    xorg, yorg);
+}
+
+static void XAAStateWrapFillColorExpandSpans(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+					     unsigned int planemask, int n,
+					     DDXPointPtr points, int *widths, int fSorted,
+					     int xorg, int yorg, PixmapPtr pPix)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillColorExpandSpans)(pScrn, fg, bg, rop,
+				       planemask, n,
+				       points, widths, fSorted,
+				       xorg, yorg, pPix);
+}
+
+static void XAAStateWrapFillCacheExpandSpans(ScrnInfoPtr pScrn, int fg, int bg, int rop,
+					     unsigned int planemask, int n, 
+					     DDXPointPtr ppt, int *pwidth, int fSorted, 
+					     int xorg, int yorg, PixmapPtr pPix)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->FillCacheExpandSpans)(pScrn, fg, bg, rop,
+				       planemask, n, 
+				       ppt, pwidth, fSorted, 
+				       xorg, yorg, pPix);
+}
+
+static void XAAStateWrapTEGlyphRenderer(ScrnInfoPtr pScrn, int x, int y, int w, int h, 
+					int skipleft, int startline, 
+					unsigned int **glyphs,
+					int glyphWidth, int fg, int bg, int rop, 
+					unsigned planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->TEGlyphRenderer)(pScrn, x, y, w, h, 
+				  skipleft, startline, 
+				  glyphs,
+				  glyphWidth, fg, bg, rop, 
+				  planemask);
+}
+
+static void XAAStateWrapNonTEGlyphRenderer(ScrnInfoPtr pScrn, int x, int y, int n,
+					   NonTEGlyphPtr glyphs, BoxPtr pbox,
+					   int fg, int rop, unsigned int planemask)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->NonTEGlyphRenderer)(pScrn, x, y, n,
+				     glyphs, pbox,
+				     fg, rop, planemask);
+}
+
+static void XAAStateWrapWritePixmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+				    unsigned char *src, int srcwidth, int rop,
+				    unsigned int planemask, int transparency_color,
+				    int bpp, int depth)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->WritePixmap)(pScrn, x, y, w, h,
+			      src, srcwidth, rop,
+			      planemask, transparency_color,
+			      bpp, depth);
+}
+
+static void XAAStateWrapReadPixmap(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+				   unsigned char *dst, int dstwidth, int bpp, int depth)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->ReadPixmap)(pScrn, x, y, w, h,
+			     dst, dstwidth, bpp, depth);
+}
+
+static RegionPtr XAAStateWrapCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+				      GC *pGC, int srcx, int srcy, int width, int height,
+				      int dstx, int dsty)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->CopyArea)(pSrcDrawable, pDstDrawable,
+				  pGC, srcx, srcy, width, height,
+				  dstx, dsty);
+}
+
+static RegionPtr XAAStateWrapCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+				       int srcx, int srcy, int width, int height, 
+				       int dstx, int dsty, unsigned long bitPlane)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->CopyPlane)(pSrc, pDst, pGC,
+				   srcx, srcy, width, height, 
+				   dstx, dsty, bitPlane);
+}
+
+static void XAAStateWrapPushPixelsSolid(GCPtr pGC, PixmapPtr pBitMap,
+					DrawablePtr pDrawable, int dx, int dy, int xOrg, 
+					int yOrg)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PushPixelsSolid)(pGC, pBitMap,
+				  pDrawable, dx, dy, xOrg, 
+				  yOrg);
+}
+
+static void XAAStateWrapPolyFillRectSolid(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+					  xRectangle *prectInit)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolyFillRectSolid)(pDraw, pGC, nrectFill,
+				    prectInit);
+}
+
+static void XAAStateWrapPolyFillRectStippled(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+					     xRectangle *prectInit)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolyFillRectStippled)(pDraw, pGC, nrectFill,
+				       prectInit);
+}
+
+static void XAAStateWrapPolyFillRectOpaqueStippled(DrawablePtr pDraw, GCPtr pGC,
+						   int nrectFill, xRectangle *prectInit)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolyFillRectOpaqueStippled)(pDraw, pGC,
+					     nrectFill, prectInit);
+}
+
+static void XAAStateWrapPolyFillRectTiled(DrawablePtr pDraw, GCPtr pGC, int nrectFill,
+					  xRectangle *prectInit)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolyFillRectTiled)(pDraw, pGC, nrectFill,
+				    prectInit);
+}
+
+static void XAAStateWrapFillSpansSolid(DrawablePtr pDraw, GCPtr pGC, int nInit,
+				       DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->FillSpansSolid)(pDraw, pGC, nInit,
+				 ppt, pwidth, fSorted);
+}
+
+static void XAAStateWrapFillSpansStippled(DrawablePtr pDraw, GCPtr pGC, int nInit,
+					  DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->FillSpansStippled)(pDraw, pGC, nInit,
+				    ppt, pwidth, fSorted);
+}
+
+static void XAAStateWrapFillSpansOpaqueStippled(DrawablePtr pDraw, GCPtr pGC, int nInit, 
+						DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->FillSpansOpaqueStippled)(pDraw, pGC, nInit, 
+					  ppt, pwidth, fSorted);
+}
+
+static void XAAStateWrapFillSpansTiled(DrawablePtr pDraw, GCPtr pGC, int nInit, 
+				       DDXPointPtr ppt, int *pwidth, int fSorted)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->FillSpansTiled)(pDraw, pGC, nInit, 
+				 ppt, pwidth, fSorted);
+}
+
+static int XAAStateWrapPolyText8TE(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+				   char *chars)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->PolyText8TE)(pDraw, pGC, x, y, count,
+				     chars);
+}
+
+static int XAAStateWrapPolyText16TE(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count,
+				    unsigned short *chars)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->PolyText16TE)(pDraw, pGC, x, y, count,
+				      chars);
+}
+
+static void XAAStateWrapImageText8TE(DrawablePtr pDraw, GCPtr pGC, int x, int y, 
+				     int count, char *chars)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ImageText8TE)(pDraw, pGC, x, y, 
+			       count, chars);
+}
+
+static void XAAStateWrapImageText16TE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+				      int count, unsigned short *chars)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ImageText16TE)(pDraw, pGC, x, y,
+				count, chars);
+}
+
+static void XAAStateWrapImageGlyphBltTE(DrawablePtr pDrawable, GCPtr pGC, int xInit, 
+					int yInit, unsigned int nglyph, CharInfoPtr *ppci,
+					pointer pglyphBase)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ImageGlyphBltTE)(pDrawable, pGC, xInit, 
+				  yInit, nglyph, ppci,
+				  pglyphBase);
+}
+
+static void XAAStateWrapPolyGlyphBltTE(DrawablePtr pDrawable, GCPtr pGC, int xInit, 
+				       int yInit, unsigned int nglyph, CharInfoPtr *ppci,
+				       pointer pglyphBase)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolyGlyphBltTE)(pDrawable, pGC, xInit, 
+				 yInit, nglyph, ppci,
+				 pglyphBase);
+}
+
+static int XAAStateWrapPolyText8NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+				      int count, char *chars)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->PolyText8NonTE)(pDraw, pGC, x, y,
+					count, chars);
+}
+
+static int XAAStateWrapPolyText16NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+				       int count, unsigned short *chars)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->PolyText16NonTE)(pDraw, pGC, x, y,
+					 count, chars);
+}
+
+static void XAAStateWrapImageText8NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+					int count, char *chars)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ImageText8NonTE)(pDraw, pGC, x, y,
+				  count, chars);
+}
+
+static void XAAStateWrapImageText16NonTE(DrawablePtr pDraw, GCPtr pGC, int x, int y,
+					 int count, unsigned short *chars)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ImageText16NonTE)(pDraw, pGC, x, y,
+				   count, chars);
+}
+
+static void XAAStateWrapImageGlyphBltNonTE(DrawablePtr pDrawable, GCPtr pGC, int xInit,
+					   int yInit, unsigned int nglyph,
+					   CharInfoPtr *ppci, pointer pglyphBase)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ImageGlyphBltNonTE)(pDrawable, pGC, xInit,
+				     yInit, nglyph,
+				     ppci, pglyphBase);
+}
+
+static void XAAStateWrapPolyGlyphBltNonTE(DrawablePtr pDrawable, GCPtr pGC, int xInit,
+					  int yInit, unsigned int nglyph,
+					  CharInfoPtr *ppci, pointer pglyphBase)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolyGlyphBltNonTE)(pDrawable, pGC, xInit,
+				    yInit, nglyph,
+				    ppci, pglyphBase);
+}
+
+static void XAAStateWrapPolyRectangleThinSolid(DrawablePtr pDrawable,GCPtr pGC,
+					       int nRectsInit, xRectangle *pRectsInit)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolyRectangleThinSolid)(pDrawable, pGC,
+					 nRectsInit, pRectsInit);
+}
+
+static void XAAStateWrapPolylinesWideSolid(DrawablePtr pDrawable, GCPtr pGC, int mode,
+					   int npt, DDXPointPtr pPts)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolylinesWideSolid)(pDrawable, pGC, mode,
+				     npt, pPts);
+}
+
+static void XAAStateWrapPolylinesThinSolid(DrawablePtr pDrawable, GCPtr pGC, int mode, 
+					   int npt, DDXPointPtr pPts)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolylinesThinSolid)(pDrawable, pGC, mode, 
+				     npt, pPts);
+}
+
+static void XAAStateWrapPolySegmentThinSolid(DrawablePtr pDrawable, GCPtr pGC, int nseg,
+					     xSegment *pSeg)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolySegmentThinSolid)(pDrawable, pGC, nseg,
+				       pSeg);
+}
+
+static void XAAStateWrapPolylinesThinDashed(DrawablePtr pDrawable, GCPtr pGC, int mode, 
+					    int npt, DDXPointPtr pPts)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolylinesThinDashed)(pDrawable, pGC, mode, 
+				      npt, pPts);
+}
+
+static void XAAStateWrapPolySegmentThinDashed(DrawablePtr pDrawable, GCPtr pGC, int nseg,
+					      xSegment *pSeg)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolySegmentThinDashed)(pDrawable, pGC, nseg,
+					pSeg);
+}
+
+static void XAAStateWrapFillPolygonSolid(DrawablePtr pDrawable, GCPtr pGC, int shape,
+					 int mode, int count, DDXPointPtr ptsIn)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->FillPolygonSolid)(pDrawable, pGC, shape,
+				   mode, count, ptsIn);
+}
+
+static void XAAStateWrapFillPolygonStippled(DrawablePtr pDrawable, GCPtr pGC, int shape,
+					    int mode, int count, DDXPointPtr ptsIn)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->FillPolygonStippled)(pDrawable, pGC, shape,
+				      mode, count, ptsIn);
+}
+
+static void XAAStateWrapFillPolygonOpaqueStippled(DrawablePtr pDrawable, GCPtr pGC,
+						  int shape, int mode, int count,
+						  DDXPointPtr ptsIn)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->FillPolygonOpaqueStippled)(pDrawable, pGC,
+					    shape, mode, count,
+					    ptsIn);
+}
+
+static void XAAStateWrapFillPolygonTiled(DrawablePtr pDrawable, GCPtr pGC, int shape,
+					 int mode, int count, DDXPointPtr ptsIn)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->FillPolygonTiled)(pDrawable, pGC, shape,
+				   mode, count, ptsIn);
+}
+
+static void XAAStateWrapPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs,
+					 xArc *parcs)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PolyFillArcSolid)(pDraw, pGC, narcs,
+				   parcs);
+}
+
+static void XAAStateWrapPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, 
+				 int w, int h, int leftPad, int format, char *pImage)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PutImage)(pDraw, pGC, depth, x, y, 
+			   w, h, leftPad, format, pImage);
+}
+
+static void XAAStateWrapValidateFillSpans(GCPtr pGC, unsigned long changes, 
+					  DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidateFillSpans)(pGC, changes,
+				    pDraw);
+}
+
+static void XAAStateWrapValidateSetSpans(GCPtr pGC, unsigned long changes, 
+					 DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidateSetSpans)(pGC, changes,
+				   pDraw);
+}
+
+static void XAAStateWrapValidatePutImage(GCPtr pGC, unsigned long changes,
+					 DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePutImage)(pGC, changes,
+				   pDraw);
+}
+
+static void XAAStateWrapValidateCopyArea(GCPtr pGC, unsigned long changes,
+					 DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidateCopyArea)(pGC, changes,
+				   pDraw);
+}
+
+static void XAAStateWrapValidateCopyPlane(GCPtr pGC, unsigned long changes,
+					  DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidateCopyPlane)(pGC, changes,
+				    pDraw);
+}
+
+static void XAAStateWrapValidatePolyPoint(GCPtr pGC, unsigned long changes, 
+					  DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolyPoint)(pGC, changes,
+				    pDraw);
+}
+
+static void XAAStateWrapValidatePolylines(GCPtr pGC, unsigned long changes,
+					  DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolylines)(pGC, changes,
+				    pDraw);
+}
+
+static void XAAStateWrapValidatePolySegment(GCPtr pGC, unsigned long changes, 
+					    DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolySegment)(pGC, changes,
+				      pDraw);
+}
+
+static void XAAStateWrapValidatePolyRectangle(GCPtr pGC, unsigned long changes, 
+					      DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolyRectangle)(pGC, changes,
+					pDraw);
+}
+
+static void XAAStateWrapValidatePolyArc(GCPtr pGC, unsigned long changes,
+					DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolyArc)(pGC, changes,
+				  pDraw);
+}
+
+static void XAAStateWrapValidateFillPolygon(GCPtr pGC, unsigned long changes,
+					    DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidateFillPolygon)(pGC, changes,
+				      pDraw);
+}
+
+static void XAAStateWrapValidatePolyFillRect(GCPtr pGC, unsigned long changes,
+					     DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolyFillRect)(pGC, changes,
+				       pDraw);
+}
+
+static void XAAStateWrapValidatePolyFillArc(GCPtr pGC, unsigned long changes,
+					    DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolyFillArc)(pGC, changes,
+				      pDraw);
+}
+
+static void XAAStateWrapValidatePolyText8(GCPtr pGC, unsigned long changes,
+					  DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolyText8)(pGC, changes,
+				    pDraw);
+}
+
+static void XAAStateWrapValidatePolyText16(GCPtr pGC, unsigned long changes, 
+					   DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolyText16)(pGC, changes, 
+				     pDraw);
+}
+
+static void XAAStateWrapValidateImageText8(GCPtr pGC, unsigned long changes, 
+					   DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidateImageText8)(pGC, changes, 
+				     pDraw);
+}
+
+static void XAAStateWrapValidateImageText16(GCPtr pGC, unsigned long changes, 
+					    DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidateImageText16)(pGC, changes, 
+				      pDraw);
+}
+
+static void XAAStateWrapValidatePolyGlyphBlt(GCPtr pGC, unsigned long changes, 
+					     DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePolyGlyphBlt)(pGC, changes, 
+				       pDraw);
+}
+
+static void XAAStateWrapValidateImageGlyphBlt(GCPtr pGC, unsigned long changes, 
+					      DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+   (*pStatePriv->ValidateImageGlyphBlt)(pGC, changes, 
+					pDraw);
+}
+
+static void XAAStateWrapValidatePushPixels(GCPtr pGC, unsigned long changes,
+					   DrawablePtr pDraw)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ValidatePushPixels)(pGC, changes,
+				     pDraw);
+}
+
+static void XAAStateWrapComputeDash(GCPtr pGC)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ComputeDash)(pGC);
+}
+
+static void XAAStateWrapInitPixmapCache(ScreenPtr pScreen, RegionPtr areas,
+					pointer data)
+{
+   GET_STATEPRIV_SCREEN(pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->InitPixmapCache)(pScreen, areas,
+				  data);
+}
+
+static void XAAStateWrapClosePixmapCache(ScreenPtr pScreen)
+{
+   GET_STATEPRIV_SCREEN(pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->ClosePixmapCache)(pScreen);
+}
+
+static int XAAStateWrapStippledFillChooser(GCPtr pGC)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->StippledFillChooser)(pGC);
+}
+
+static int XAAStateWrapOpaqueStippledFillChooser(GCPtr pGC)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->OpaqueStippledFillChooser)(pGC);
+}
+
+static int XAAStateWrapTiledFillChooser(GCPtr pGC)
+{
+   GET_STATEPRIV_GC(pGC);
+   STATE_CHECK_SP(pStatePriv);
+
+   return (*pStatePriv->TiledFillChooser)(pGC);
+}
+
+static XAACacheInfoPtr XAAStateWrapCacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   return (*pStatePriv->CacheTile)(pScrn, pPix);
+}
+
+static XAACacheInfoPtr XAAStateWrapCacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, 
+						int bg)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   return (*pStatePriv->CacheStipple)(pScrn, pPix, fg, 
+				      bg);
+}
+
+static XAACacheInfoPtr XAAStateWrapCacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   return (*pStatePriv->CacheMonoStipple)(pScrn, pPix);
+}
+
+static XAACacheInfoPtr XAAStateWrapCacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0,
+						       int pat1)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   return (*pStatePriv->CacheMono8x8Pattern)(pScrn, pat0,
+					     pat1);
+}
+
+static XAACacheInfoPtr XAAStateWrapCacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix,
+							int fg, int bg)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   return (*pStatePriv->CacheColor8x8Pattern)(pScrn, pPix,
+					      fg, bg);
+}
+
+static void XAAStateWrapWriteBitmapToCache(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+					   unsigned char *src, int srcwidth, int fg, 
+					   int bg)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->WriteBitmapToCache)(pScrn, x, y, w, h,
+				     src, srcwidth, fg, 
+				     bg);
+}
+
+static void XAAStateWrapWritePixmapToCache(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+					   unsigned char *src, int srcwidth, int bpp, 
+					   int depth)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->WritePixmapToCache)(pScrn, x, y, w, h,
+				     src, srcwidth, bpp, 
+				     depth);
+}
+
+static void XAAStateWrapWriteMono8x8PatternToCache(ScrnInfoPtr pScrn, 
+						   XAACacheInfoPtr pCache)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->WriteMono8x8PatternToCache)(pScrn, 
+					     pCache);
+}
+
+static void XAAStateWrapWriteColor8x8PatternToCache(ScrnInfoPtr pScrn, PixmapPtr pPix, 
+						    XAACacheInfoPtr pCache)
+{
+   GET_STATEPRIV_PSCRN(pScrn);
+   STATE_CHECK_PSCRN(pScrn);
+
+   (*pStatePriv->WriteColor8x8PatternToCache)(pScrn, pPix, 
+					      pCache);
+}
+
+static void XAAStateWrapGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
+				 unsigned int format,unsigned long planeMask, 
+				 char *pdstLine)
+{
+   GET_STATEPRIV_SCREEN(pDrawable->pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->GetImage)(pDrawable, sx, sy, w, h,
+			   format, planeMask, 
+			   pdstLine);
+}
+
+static void XAAStateWrapGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
+				 int *pwidth, int nspans, char *pdstStart)
+{
+   GET_STATEPRIV_SCREEN(pDrawable->pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->GetSpans)(pDrawable, wMax, ppt,
+			   pwidth, nspans, pdstStart);
+}
+
+static void XAAStateWrapPaintWindowBackground(WindowPtr pWindow, RegionPtr pRegion,
+					      int what)
+{
+   GET_STATEPRIV_SCREEN(pWindow->drawable.pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PaintWindowBackground)(pWindow, pRegion,
+					what);
+}
+
+static void XAAStateWrapPaintWindowBorder(WindowPtr pWindow, RegionPtr pRegion, 
+					  int what)
+{
+   GET_STATEPRIV_SCREEN(pWindow->drawable.pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->PaintWindowBorder)(pWindow, pRegion, 
+				    what);
+}
+
+static void XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, 
+				   RegionPtr prgnSrc)
+{
+   GET_STATEPRIV_SCREEN(pWindow->drawable.pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->CopyWindow)(pWindow, ptOldOrg, 
+			     prgnSrc);
+}
+
+static void XAAStateWrapSaveAreas(PixmapPtr pBackingPixmap, RegionPtr pObscured, int x, 
+				  int y, WindowPtr pWin)
+{
+   GET_STATEPRIV_SCREEN(pBackingPixmap->drawable.pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->SaveAreas)(pBackingPixmap, pObscured, x, 
+			    y, pWin);
+}
+
+static void XAAStateWrapRestoreAreas(PixmapPtr pBackingPixmap, RegionPtr pExposed,
+				     int x, int y, WindowPtr pWin)
+{
+   GET_STATEPRIV_SCREEN(pBackingPixmap->drawable.pScreen);
+   STATE_CHECK_SP(pStatePriv);
+
+   (*pStatePriv->RestoreAreas)(pBackingPixmap, pExposed,
+			       x, y, pWin);
+}
+
+/* Setup Function */
+Bool
+XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+{
+   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+   XAAStateWrapPtr pStatePriv;
+   int i = 0;
+   
+   if (XAAStateGeneration != serverGeneration) {
+      if((XAAStateIndex = AllocateScreenPrivateIndex()) < 0) return FALSE;
+      XAAStateGeneration = serverGeneration;
+   }
+   if(!(pStatePriv = xalloc(sizeof(XAAStateWrapRec)))) return FALSE;
+   pScreen->devPrivates[XAAStateIndex].ptr = (pointer)pStatePriv;   
+   pStatePriv->RestoreAccelState = infoRec->RestoreAccelState;
+   pStatePriv->pScrn = pScrn;
+   
+   /* Initialize the last screen to -1 so whenever an accel function
+    * is called the proper state is setup
+    */
+   while(i < pScrn->numEntities) {
+      xf86SetLastScrnFlag(pScrn->entityList[i], -1);
+      i++;
+   }
+/* Do the wrapping */
+   XAA_STATE_WRAP(Sync);
+   XAA_STATE_WRAP(SetupForScreenToScreenCopy);
+   XAA_STATE_WRAP(SetupForSolidFill);
+   XAA_STATE_WRAP(SetupForSolidLine);
+   XAA_STATE_WRAP(SetupForDashedLine);
+   XAA_STATE_WRAP(SetClippingRectangle);
+   XAA_STATE_WRAP(DisableClipping);
+   XAA_STATE_WRAP(SetupForMono8x8PatternFill);
+   XAA_STATE_WRAP(SetupForColor8x8PatternFill);
+   XAA_STATE_WRAP(SetupForCPUToScreenColorExpandFill);
+   XAA_STATE_WRAP(SetupForScanlineCPUToScreenColorExpandFill);
+   XAA_STATE_WRAP(SetupForScreenToScreenColorExpandFill);
+   XAA_STATE_WRAP(SetupForImageWrite);
+   XAA_STATE_WRAP(SetupForScanlineImageWrite);
+   XAA_STATE_WRAP(SetupForImageRead);
+   XAA_STATE_WRAP(ScreenToScreenBitBlt);
+   XAA_STATE_WRAP(WriteBitmap);
+   XAA_STATE_WRAP(FillSolidRects);
+   XAA_STATE_WRAP(FillMono8x8PatternRects);
+   XAA_STATE_WRAP(FillColor8x8PatternRects);
+   XAA_STATE_WRAP(FillCacheBltRects);
+   XAA_STATE_WRAP(FillColorExpandRects);
+   XAA_STATE_WRAP(FillCacheExpandRects);
+   XAA_STATE_WRAP(FillImageWriteRects);
+   XAA_STATE_WRAP(FillSolidSpans);
+   XAA_STATE_WRAP(FillMono8x8PatternSpans);
+   XAA_STATE_WRAP(FillColor8x8PatternSpans);
+   XAA_STATE_WRAP(FillCacheBltSpans);
+   XAA_STATE_WRAP(FillColorExpandSpans);
+   XAA_STATE_WRAP(FillCacheExpandSpans);
+   XAA_STATE_WRAP(TEGlyphRenderer);
+   XAA_STATE_WRAP(NonTEGlyphRenderer);
+   XAA_STATE_WRAP(WritePixmap);
+   XAA_STATE_WRAP(ReadPixmap);
+   XAA_STATE_WRAP(CopyArea);
+   XAA_STATE_WRAP(CopyPlane);
+   XAA_STATE_WRAP(PushPixelsSolid);
+   XAA_STATE_WRAP(PolyFillRectSolid);
+   XAA_STATE_WRAP(PolyFillRectStippled);
+   XAA_STATE_WRAP(PolyFillRectOpaqueStippled);
+   XAA_STATE_WRAP(PolyFillRectTiled);
+   XAA_STATE_WRAP(FillSpansSolid);
+   XAA_STATE_WRAP(FillSpansStippled);
+   XAA_STATE_WRAP(FillSpansOpaqueStippled);
+   XAA_STATE_WRAP(FillSpansTiled);
+   XAA_STATE_WRAP(PolyText8TE);
+   XAA_STATE_WRAP(PolyText16TE);
+   XAA_STATE_WRAP(ImageText8TE);
+   XAA_STATE_WRAP(ImageText16TE);
+   XAA_STATE_WRAP(ImageGlyphBltTE);
+   XAA_STATE_WRAP(PolyGlyphBltTE);
+   XAA_STATE_WRAP(PolyText8NonTE);
+   XAA_STATE_WRAP(PolyText16NonTE);
+   XAA_STATE_WRAP(ImageText8NonTE);
+   XAA_STATE_WRAP(ImageText16NonTE);
+   XAA_STATE_WRAP(ImageGlyphBltNonTE);
+   XAA_STATE_WRAP(PolyGlyphBltNonTE);
+   XAA_STATE_WRAP(PolyRectangleThinSolid);
+   XAA_STATE_WRAP(PolylinesWideSolid);
+   XAA_STATE_WRAP(PolylinesThinSolid);
+   XAA_STATE_WRAP(PolySegmentThinSolid);
+   XAA_STATE_WRAP(PolylinesThinDashed);
+   XAA_STATE_WRAP(PolySegmentThinDashed);
+   XAA_STATE_WRAP(FillPolygonSolid);
+   XAA_STATE_WRAP(FillPolygonStippled);
+   XAA_STATE_WRAP(FillPolygonOpaqueStippled);
+   XAA_STATE_WRAP(FillPolygonTiled);
+   XAA_STATE_WRAP(PolyFillArcSolid);
+   XAA_STATE_WRAP(PutImage);
+   XAA_STATE_WRAP(ValidateFillSpans);
+   XAA_STATE_WRAP(ValidateSetSpans);
+   XAA_STATE_WRAP(ValidatePutImage);
+   XAA_STATE_WRAP(ValidateCopyArea);
+   XAA_STATE_WRAP(ValidateCopyPlane);
+   XAA_STATE_WRAP(ValidatePolyPoint);
+   XAA_STATE_WRAP(ValidatePolylines);
+   XAA_STATE_WRAP(ValidatePolySegment);
+   XAA_STATE_WRAP(ValidatePolyRectangle);
+   XAA_STATE_WRAP(ValidatePolyArc);
+   XAA_STATE_WRAP(ValidateFillPolygon);
+   XAA_STATE_WRAP(ValidatePolyFillRect);
+   XAA_STATE_WRAP(ValidatePolyFillArc);
+   XAA_STATE_WRAP(ValidatePolyText8);
+   XAA_STATE_WRAP(ValidatePolyText16);
+   XAA_STATE_WRAP(ValidateImageText8);
+   XAA_STATE_WRAP(ValidateImageText16);
+   XAA_STATE_WRAP(ValidatePolyGlyphBlt);
+   XAA_STATE_WRAP(ValidateImageGlyphBlt);
+   XAA_STATE_WRAP(ValidatePushPixels);
+   XAA_STATE_WRAP(ComputeDash);
+   XAA_STATE_WRAP(InitPixmapCache);
+   XAA_STATE_WRAP(ClosePixmapCache);
+   XAA_STATE_WRAP(StippledFillChooser);
+   XAA_STATE_WRAP(OpaqueStippledFillChooser);
+   XAA_STATE_WRAP(TiledFillChooser);
+   XAA_STATE_WRAP(CacheTile);
+   XAA_STATE_WRAP(CacheStipple);
+   XAA_STATE_WRAP(CacheMonoStipple);
+   XAA_STATE_WRAP(CacheMono8x8Pattern);
+   XAA_STATE_WRAP(CacheColor8x8Pattern);
+   XAA_STATE_WRAP(WriteBitmapToCache);
+   XAA_STATE_WRAP(WritePixmapToCache);
+   XAA_STATE_WRAP(WriteMono8x8PatternToCache);
+   XAA_STATE_WRAP(WriteColor8x8PatternToCache);
+   XAA_STATE_WRAP(GetImage);
+   XAA_STATE_WRAP(GetSpans);
+   XAA_STATE_WRAP(PaintWindowBackground);
+   XAA_STATE_WRAP(PaintWindowBorder);
+   XAA_STATE_WRAP(CopyWindow);
+   XAA_STATE_WRAP(SaveAreas);
+   XAA_STATE_WRAP(RestoreAreas);
+
+   return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c:1.7 xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c:1.9
--- xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c:1.7	Tue Feb 29 09:38:32 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c	Mon Jun 12 19:51:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.7 2000/02/29 17:38:32 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.9 2000/06/13 02:51:25 mvojkovi Exp $ */
 
 #include "xaa.h"
 #include "xaalocal.h"
@@ -13,7 +13,11 @@
 static CARD32* StippleOver32(CARD32*, CARD32*, int, int, int);
 static CARD32* StippleOver32_Inverted(CARD32*, CARD32*, int, int, int);
 
+#ifdef TRIPLE_BITS
+#define stipple_scanline_func EXPNAME(XAAStippleScanlineFunc3)
+#else
 #define stipple_scanline_func EXPNAME(XAAStippleScanlineFunc)
+#endif
 
 StippleScanlineProcPtr stipple_scanline_func[6] = {
    StipplePowerOfTwo,
@@ -34,8 +38,44 @@
 #endif
 
 
-#if defined(FIXEDBASE) && defined(MSBFIRST)
+/* TRIPLE_BITS pattern expansion */
+#ifdef TRIPLE_BITS
+#define EXPAND_PAT \
+	CARD32 pat1 = byte_expand3[pat & 0xFF], \
+	       pat2 = byte_expand3[(pat & 0xFF00) >> 8], \
+	       pat3 = byte_expand3[(pat & 0xFF0000) >> 16], \
+	       pat4 = byte_expand3[(pat & 0xFF000000) >> 24], \
+	       patA = pat1 | (pat2 << 24), \
+	       patB = (pat2 >> 8) | (pat3 << 16), \
+	       patC = (pat3 >> 16) | (pat4 << 8)
+#ifdef FIXED_BASE
+#define WRITE_PAT1 { \
+	*dest = patA; }
+#define WRITE_PAT2 { \
+	*dest = patA; \
+	*dest = patB; }
+#define WRITE_PAT3 { \
+	*dest = patA; \
+	*dest = patB; \
+	*dest = patC; }
+#else
+#define WRITE_PAT1 { \
+	*(dest++) = patA; }
+#define WRITE_PAT2 { \
+	*(dest) = patA; \
+	*(dest + 1) = patB; \
+	dest += 2; }
+#define WRITE_PAT3 { \
+	*(dest) = patA; \
+	*(dest + 1) = patB; \
+	*(dest + 2) = patC; \
+	dest += 3; }
+#endif
+#endif
 
+
+#if !defined(FIXEDBASE) && !defined(MSBFIRST) && !defined(TRIPLE_BITS)
+
 unsigned int XAAShiftMasks[32] = {
   /* gcc is rather pedantic about SHIFT_R(0xFFFFFFFF,32) */
           0x00000000    , SHIFT_R(0xFFFFFFFF,31),
@@ -59,7 +99,11 @@
 #endif
 
 void 
+#ifdef TRIPLE_BITS
+EXPNAME(XAAFillColorExpandRects3)(
+#else
 EXPNAME(XAAFillColorExpandRects)(
+#endif
    ScrnInfoPtr pScrn,
    int fg, int bg, int rop,
    unsigned int planemask,
@@ -88,8 +132,15 @@
     } 
     StippleFunc = stipple_scanline_func[funcNo];
 
+#ifdef TRIPLE_BITS
     if((bg == -1) || 
+	(!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
+	(!(infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
+	(CHECK_RGB_EQUAL(bg))))) {
+#else
+    if((bg == -1) || 
 	!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+#endif
 	/* one pass */
     } else if((rop == GXcopy) && infoRec->FillSolidRects) {
 	/* one pass but we fill background rects first */
@@ -107,7 +158,11 @@
 					pScrn, fg, bg, rop, planemask);
 
     while(nBox--) {
+#ifdef TRIPLE_BITS
+	dwords = (3 * (pBox->x2 - pBox->x1) + 31) >> 5;
+#else
 	dwords = (pBox->x2 - pBox->x1 + 31) >> 5;
+#endif
 
 SECOND_PASS:
 	if(TwoPass) {
@@ -180,7 +235,11 @@
 
 
 void 
+#ifdef TRIPLE_BITS
+EXPNAME(XAAFillColorExpandSpans3)(
+#else
 EXPNAME(XAAFillColorExpandSpans)(
+#endif
    ScrnInfoPtr pScrn,
    int fg, int bg, int rop,
    unsigned int planemask,
@@ -208,8 +267,15 @@
     } 
     StippleFunc = stipple_scanline_func[funcNo];
 
+#ifdef TRIPLE_BITS
     if((bg == -1) || 
+	(!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
+	(!(infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
+	(CHECK_RGB_EQUAL(bg))))) {
+#else
+    if((bg == -1) || 
 	!(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+#endif
 	/* one pass */
     } else if((rop == GXcopy) && infoRec->FillSolidSpans) {
 	/* one pass but we fill background rects first */
@@ -228,7 +294,11 @@
 				pScrn, fg, bg, rop, planemask);
 
     while(n--) {
+#ifdef TRIPLE_BITS
+	dwords = (3 * *pwidth + 31) >> 5;
+#else
 	dwords = (*pwidth + 31) >> 5;
+#endif
 
 	srcy = (ppt->y - yorg) % stippleheight;
 	if(srcy < 0) srcy += stippleheight;
@@ -276,7 +346,11 @@
 #ifndef FIXEDBASE
 
 void 
+#ifdef TRIPLE_BITS
+EXPNAME(XAAFillScanlineColorExpandRects3)(
+#else
 EXPNAME(XAAFillScanlineColorExpandRects)(
+#endif
    ScrnInfoPtr pScrn,
    int fg, int bg, int rop,
    unsigned int planemask,
@@ -304,8 +378,15 @@
     } 
     StippleFunc = stipple_scanline_func[funcNo];
 
+#ifdef TRIPLE_BITS
+    if((bg == -1) || 
+      (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
+      (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
+      (CHECK_RGB_EQUAL(bg))))) {
+#else
     if((bg == -1) || 
       !(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+#endif
 	/* one pass */
     } else if((rop == GXcopy) && infoRec->FillSolidRects) {
 	/* one pass but we fill background rects first */
@@ -323,7 +404,12 @@
 				pScrn, fg, bg, rop, planemask);
 
     while(nBox--) {
+#ifdef TRIPLE_BITS
+	dwords = (3 * (pBox->x2 - pBox->x1) + 31) >> 5;
+#else
 	dwords = (pBox->x2 - pBox->x1 + 31) >> 5;
+#endif
+
 SECOND_PASS:
 	if(TwoPass) {
 	    (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)(pScrn, 
@@ -373,7 +459,11 @@
 }
 
 void 
+#ifdef TRIPLE_BITS
+EXPNAME(XAAFillScanlineColorExpandSpans3)(
+#else
 EXPNAME(XAAFillScanlineColorExpandSpans)(
+#endif
    ScrnInfoPtr pScrn,
    int fg, int bg, int rop,
    unsigned int planemask,
@@ -401,8 +491,15 @@
     } 
     StippleFunc = stipple_scanline_func[funcNo];
 
+#ifdef TRIPLE_BITS
+    if((bg == -1) || 
+      (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) &&
+      (!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & RGB_EQUAL) ||
+      (CHECK_RGB_EQUAL(bg))))) {
+#else
     if((bg == -1) || 
       !(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+#endif
 	/* one pass */
     } else if((rop == GXcopy) && infoRec->FillSolidSpans) {
 	/* one pass but we fill background rects first */
@@ -422,7 +519,11 @@
 
 
     while(n--) {
+#ifdef TRIPLE_BITS
+	dwords = (3 * *pwidth + 31) >> 5;
+#else
 	dwords = (*pwidth + 31) >> 5;
+#endif
 
 	srcy = (ppt->y - yorg) % stippleheight;
 	if(srcy < 0) srcy += stippleheight;
@@ -479,9 +580,26 @@
 	pat = SHIFT_R(pat,shift) | SHIFT_L(pat,32 - shift);
 
 #ifdef MSBFIRST
-    pat = XAAReverseBitOrder(pat);    
+    pat = SWAP_BITS_IN_BYTES(pat);    
 #endif
 
+#ifdef TRIPLE_BITS
+    {
+	EXPAND_PAT;
+
+	while(dwords >= 3) {
+	    WRITE_PAT3;
+	    dwords -= 3;
+	}
+	if (dwords == 2) {
+	    WRITE_PAT2;
+	} else if (dwords == 1) {
+	    WRITE_PAT1;
+	}
+
+	return dest;
+    }
+#else /* TRIPLE_BITS */
    while(dwords >= 4) {
 	DEST(0) = pat;
 	DEST(1) = pat;
@@ -500,6 +618,7 @@
    if(dwords == 2) RETURN(2);
    DEST(2) = pat;
    RETURN(3);
+#endif /* TRIPLE_BITS */
 }
 
 static CARD32 *
@@ -520,11 +639,28 @@
 	pat = SHIFT_R(pat,shift) | SHIFT_L(pat,32 - shift);
 
 #ifdef MSBFIRST
-    pat = XAAReverseBitOrder(pat);    
+    pat = SWAP_BITS_IN_BYTES(pat);    
 #endif
 
    pat = ~pat;
 
+#ifdef TRIPLE_BITS
+    {
+	EXPAND_PAT;
+
+	while(dwords >= 3) {
+	    WRITE_PAT3;
+	    dwords -= 3;
+	}
+	if (dwords == 2) {
+	    WRITE_PAT2;
+	} else if (dwords == 1) {
+	    WRITE_PAT1;
+	}
+
+	return dest;
+    }
+#else /* TRIPLE_BITS */
    while(dwords >= 4) {
 	DEST(0) = pat;
 	DEST(1) = pat;
@@ -543,6 +679,7 @@
    if(dwords == 2) RETURN(2);
    DEST(2) = pat;
    RETURN(3);
+#endif /* TRIPLE_BITS */
 }
 
 
@@ -551,7 +688,6 @@
    CARD32* base, CARD32* src, 
    int shift, int width, int dwords
 ){
-    int offset = shift;
     CARD32 pat = *src & XAAShiftMasks[width];
 
     while(width <= 15) {
@@ -561,9 +697,24 @@
     pat |= SHIFT_L(pat,width);
 
     while(dwords--) {
-	WRITE_BITS(SHIFT_R(pat,offset) | SHIFT_L(pat,width-offset));
-	offset += 32;
-	while(offset >= width) offset -= width;
+#ifdef TRIPLE_BITS
+	CARD32 bits = SHIFT_R(pat,shift) | SHIFT_L(pat,width-shift);
+
+	if(dwords >= 2) {
+	    WRITE_BITS3(bits);
+	    dwords -= 2;
+	} else if(dwords > 0) {
+	    WRITE_BITS2(bits);
+	    dwords--;
+	} else {
+	    WRITE_BITS1(bits);
+	}
+#else
+	WRITE_BITS(SHIFT_R(pat,shift) | SHIFT_L(pat,width-shift));
+#endif
+
+	shift += 32;
+	shift %= width;
     }
     return base;
 }
@@ -583,9 +734,24 @@
     pat |= SHIFT_L(pat,width);
 
     while(dwords--) {
+#ifdef TRIPLE_BITS
+	CARD32 bits = ~(SHIFT_R(pat,shift) | SHIFT_L(pat,width-shift));
+
+	if(dwords >= 2) {
+	    WRITE_BITS3(bits);
+	    dwords -= 2;
+	} else if(dwords > 0) {
+	    WRITE_BITS2(bits);
+	    dwords--;
+	} else {
+	    WRITE_BITS1(bits);
+	}
+#else
 	WRITE_BITS(~(SHIFT_R(pat,shift) | SHIFT_L(pat,width-shift)));
+#endif
+
 	shift += 32;
-	while(shift >= width) shift -= width;
+	shift %= width;
     }
     return base;
 }
@@ -597,25 +763,38 @@
    int offset, int width, int dwords
 ){
    CARD32* srcp;
+   CARD32 bits;
    int bitsleft, shift;   
 
    while(dwords--) {
 	bitsleft = width - offset;
-	srcp = (CARD32*)(src + (offset >> 5));
+	srcp = src + (offset >> 5);
 	shift = offset & 31;
 
-	if(bitsleft >= 32) {
-	    if(shift)
-		WRITE_BITS(SHIFT_R(*srcp,shift) | 
-			   SHIFT_L(srcp[1],32-shift));
-	    else
-		WRITE_BITS(*srcp);
+	if(bitsleft < 32)
+	    bits = SHIFT_L(*src,bitsleft) | 
+		      (SHIFT_R(*srcp,shift) & XAAShiftMasks[bitsleft]);
+	else if(shift)
+	    bits = SHIFT_R(*srcp,shift) | SHIFT_L(srcp[1],32-shift);
+	else
+	    bits = *srcp;
+
+#ifdef TRIPLE_BITS
+	if(dwords >= 2) {
+	    WRITE_BITS3(bits);
+	    dwords -= 2;
+	} else if(dwords > 0) {
+	    WRITE_BITS2(bits);
+	    dwords--;
 	} else {
-	    WRITE_BITS(SHIFT_L(*src,bitsleft) | 
-		      (SHIFT_R(*srcp,shift) & XAAShiftMasks[bitsleft]));
+	    WRITE_BITS1(bits);
 	}
+#else
+	WRITE_BITS(bits);
+#endif
+
 	offset += 32;
-	while(offset >= width) offset -= width;
+	offset %= width;
    }
    return base;
 }
@@ -627,25 +806,40 @@
    int offset, int width, int dwords
 ){
    CARD32* srcp;
+   CARD32 bits;
    int bitsleft, shift;   
 
    while(dwords--) {
 	bitsleft = width - offset;
-	srcp = (CARD32*)(src + (offset >> 5));
+	srcp = src + (offset >> 5);
 	shift = offset & 31;
 
-	if(bitsleft >= 32) {
-	    if(shift)
-		WRITE_BITS(~(SHIFT_R(*srcp,shift) | 
-			   SHIFT_L(srcp[1],32-shift)));
-	    else
-		WRITE_BITS(~(*srcp));
+	if(bitsleft < 32)
+	    bits = SHIFT_L(*src,bitsleft) | 
+		      (SHIFT_R(*srcp,shift) & XAAShiftMasks[bitsleft]);
+	else if(shift)
+	    bits = SHIFT_R(*srcp,shift) | SHIFT_L(srcp[1],32-shift);
+	else
+	    bits = *srcp;
+
+	bits = ~bits;
+
+#ifdef TRIPLE_BITS
+	if(dwords >= 2) {
+	    WRITE_BITS3(bits);
+	    dwords -= 2;
+	} else if(dwords > 0) {
+	    WRITE_BITS2(bits);
+	    dwords--;
 	} else {
-	    WRITE_BITS(~(SHIFT_L(*src,bitsleft) | 
-		      (SHIFT_R(*srcp,shift) & XAAShiftMasks[bitsleft])));
+	    WRITE_BITS1(bits);
 	}
+#else
+	WRITE_BITS(bits);
+#endif
+
 	offset += 32;
-	while(offset >= width) offset -= width;
+	offset %= width;
    }
    return base;
 }
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c:1.7 xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c:1.8
--- xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c:1.7	Sat Nov  6 15:14:46 1999
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c	Tue May  2 17:44:24 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.8 2000/05/03 00:44:24 tsi Exp $ */
 
 
 #include "xaa.h"
@@ -151,8 +151,7 @@
     GlyphScanlineFuncPtr GlyphFunc = glyph_scanline_func[glyphWidth - 1];
     int dwords = 0;
 
-    if((bg != -1) && 
-	(infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+    if((bg != -1) && (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
     	(*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);
         (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
 	bg = -1;
@@ -162,9 +161,8 @@
 				pScrn, fg, bg, rop, planemask);
 
     if(skipleft && 
-	 (!(infoRec->CPUToScreenColorExpandFillFlags & LEFT_EDGE_CLIPPING) || 
-	 (!(infoRec->CPUToScreenColorExpandFillFlags & 
-					LEFT_EDGE_CLIPPING_NEGATIVE_X) && 
+	 (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) || 
+	 (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) && 
 		(skipleft > x)))) {
 	    /* draw the first character only */
 
@@ -183,8 +181,7 @@
 	    }
     
 	    w -= width;
-	    if((infoRec->CPUToScreenColorExpandFillFlags & 
-						CPU_TRANSFER_PAD_QWORD) &&
+	    if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&
 			((((width + 31) >> 5) * h) & 1)) {
 		base = (CARD32*)infoRec->ColorExpandBase;
 		base[0] = 0x00000000;
@@ -215,7 +212,7 @@
 	    (*GlyphFunc)(base, glyphs, startline++, w, glyphWidth);
 	}
 
-    if((infoRec->CPUToScreenColorExpandFillFlags & CPU_TRANSFER_PAD_QWORD) &&
+    if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&
 			(dwords & 1)) {
 	base = (CARD32*)infoRec->ColorExpandBase;
 	base[0] = 0x00000000;
@@ -223,7 +220,7 @@
 
 THE_END:
 
-    if(infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND) 
+    if(infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND) 
 	(*infoRec->Sync)(pScrn);
     else SET_SYNC_FLAG(infoRec);
 }
@@ -250,8 +247,8 @@
     int dwords = 0;
 
     if((bg != -1) && 
-	((infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) ||
-	((infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) && 
+	((infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY) ||
+	((infoRec->TEGlyphRendererFlags & RGB_EQUAL) && 
 	(!CHECK_RGB_EQUAL(bg))))) {
     	(*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);
         (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
@@ -286,8 +283,7 @@
 	    }
 
 	    w -= width;
-	    if((infoRec->CPUToScreenColorExpandFillFlags & 
-						CPU_TRANSFER_PAD_QWORD) &&
+	    if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&
 			((((3 * width + 31) >> 5) * h) & 1)) {
 		base = (CARD32*)infoRec->ColorExpandBase;
 		base[0] = 0x00000000;
@@ -321,7 +317,7 @@
 
     DEALLOCATE_LOCAL(mem);
 
-    if((infoRec->CPUToScreenColorExpandFillFlags & CPU_TRANSFER_PAD_QWORD) &&
+    if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) &&
 			(dwords & 1)) {
 	base = (CARD32*)infoRec->ColorExpandBase;
 	base[0] = 0x00000000;
@@ -329,7 +325,7 @@
 
 THE_END:
 
-    if(infoRec->CPUToScreenColorExpandFillFlags & SYNC_AFTER_COLOR_EXPAND) 
+    if(infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND) 
 	(*infoRec->Sync)(pScrn);
     else SET_SYNC_FLAG(infoRec);
 }
@@ -351,8 +347,7 @@
     CARD32* base;
     GlyphScanlineFuncPtr GlyphFunc = glyph_scanline_func[glyphWidth - 1];
 
-    if((bg != -1) && 
-	(infoRec->ScanlineCPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY)) {
+    if((bg != -1) && (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) {
     	(*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);
         (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
 	bg = -1;
@@ -362,10 +357,9 @@
 				pScrn, fg, bg, rop, planemask);
 
     if(skipleft && 
-	(!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
-						LEFT_EDGE_CLIPPING) || 
-	(!(infoRec->ScanlineCPUToScreenColorExpandFillFlags & 
-		LEFT_EDGE_CLIPPING_NEGATIVE_X) && (skipleft > x)))) {
+	(!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) || 
+	(!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) &&
+	(skipleft > x)))) {
 	/* draw the first character only */
 
 	int count = h, line = startline;
@@ -428,8 +422,8 @@
     GlyphScanlineFuncPtr GlyphFunc = XAAGlyphScanlineFuncLSBFirst[glyphWidth - 1];
 
     if((bg != -1) && 
-	((infoRec->CPUToScreenColorExpandFillFlags & TRANSPARENCY_ONLY) ||
-	((infoRec->CPUToScreenColorExpandFillFlags & RGB_EQUAL) && 
+	((infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY) ||
+	((infoRec->TEGlyphRendererFlags & RGB_EQUAL) && 
 	(!CHECK_RGB_EQUAL(bg))))) {
     	(*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask);
         (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
Index: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h:1.4 xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h:1.5
--- xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h:1.4	Sat Jan 22 11:51:46 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h	Mon Jun 12 19:51:25 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.4 2000/01/22 19:51:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.5 2000/06/13 02:51:25 mvojkovi Exp $ */
 
 
 #include "Xarch.h"
@@ -25,15 +25,15 @@
 # endif
 #else	
 # ifdef FIXEDBASE
-#   define WRITE_IN_BITORDER(dest, offset, data) *(dest) = XAAReverseBitOrder(data);
+#   define WRITE_IN_BITORDER(dest, offset, data) *(dest) = SWAP_BITS_IN_BYTES(data);
 # else  
-#   define WRITE_IN_BITORDER(dest, offset, data) *(dest + offset) = XAAReverseBitOrder(data)
+#   define WRITE_IN_BITORDER(dest, offset, data) *(dest + offset) = SWAP_BITS_IN_BYTES(data)
 # endif
 #endif
 
 #ifdef FIXEDBASE
 # ifdef MSBFIRST
-#  define WRITE_BITS(b)   *base = XAAReverseBitOrder(b)
+#  define WRITE_BITS(b)   *base = SWAP_BITS_IN_BYTES(b)
 #  define WRITE_BITS1(b) { \
 	*base = byte_reversed_expand3[(b) & 0xFF] | \
 		byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; }
@@ -69,7 +69,7 @@
 # endif
 #else
 # ifdef MSBFIRST
-#  define WRITE_BITS(b)   *(base++) = XAAReverseBitOrder(b)
+#  define WRITE_BITS(b)   *(base++) = SWAP_BITS_IN_BYTES(b)
 #  define WRITE_BITS1(b) { \
 	*(base++) = byte_reversed_expand3[(b) & 0xFF] | \
 		byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; }
Index: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h:1.22 xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h:1.26
--- xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h:1.22	Thu Feb 10 22:35:17 2000
+++ xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h	Mon Jun 19 22:08:49 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.22 2000/02/11 06:35:17 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.26 2000/06/20 05:08:49 dawes Exp $ */
 
 #ifndef _XAALOCAL_H
 #define _XAALOCAL_H
@@ -149,6 +149,15 @@
     DDXPointPtr	    pptSrc
 );
 
+void
+XAADoImageRead(
+    DrawablePtr     pSrc,
+    DrawablePtr     pDst,
+    GC              *pGC,
+    RegionPtr       prgnDst,
+    DDXPointPtr     pptSrc
+);
+
 void 
 XAACopyWindow(
     WindowPtr pWin,
@@ -722,6 +731,17 @@
 );
 
 void
+XAAFillColorExpandRects3LSBFirst(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int nBox,
+   BoxPtr pBox,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
+
+void
 XAAFillColorExpandRectsLSBFirstFixedBase(
    ScrnInfoPtr pScrn,
    int fg, int bg, int rop,
@@ -732,6 +752,16 @@
    PixmapPtr pPix
 );
 
+void
+XAAFillColorExpandRects3LSBFirstFixedBase(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int nBox,
+   BoxPtr pBox,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
 
 void
 XAAFillColorExpandRectsMSBFirst(
@@ -744,6 +774,16 @@
    PixmapPtr pPix
 );
 
+void
+XAAFillColorExpandRects3MSBFirst(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int nBox,
+   BoxPtr pBox,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
 
 void
 XAAFillColorExpandRectsMSBFirstFixedBase(
@@ -756,7 +796,16 @@
    PixmapPtr pPix
 );
 
-
+void
+XAAFillColorExpandRects3MSBFirstFixedBase(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int nBox,
+   BoxPtr pBox,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
 
 void
 XAAFillScanlineColorExpandRectsLSBFirst(
@@ -769,6 +818,16 @@
    PixmapPtr pPix
 );
 
+void
+XAAFillScanlineColorExpandRects3LSBFirst(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int nBox,
+   BoxPtr pBox,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
 
 void
 XAAFillScanlineColorExpandRectsMSBFirst(
@@ -781,6 +840,16 @@
    PixmapPtr pPix
 );
 
+void
+XAAFillScanlineColorExpandRects3MSBFirst(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int nBox,
+   BoxPtr pBox,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
 
 void
 XAAFillColorExpandSpansLSBFirst(
@@ -796,6 +865,19 @@
 );
 
 void
+XAAFillColorExpandSpans3LSBFirst(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int n,
+   DDXPointPtr ppt,
+   int *pwidth,
+   int fSorted,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
+
+void
 XAAFillColorExpandSpansLSBFirstFixedBase(
    ScrnInfoPtr pScrn,
    int fg, int bg, int rop,
@@ -808,6 +890,18 @@
    PixmapPtr pPix
 );
 
+void
+XAAFillColorExpandSpans3LSBFirstFixedBase(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int n,
+   DDXPointPtr ppt,
+   int *pwidth,
+   int fSorted,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
 
 void
 XAAFillColorExpandSpansMSBFirst(
@@ -822,6 +916,18 @@
    PixmapPtr pPix
 );
 
+void
+XAAFillColorExpandSpans3MSBFirst(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int n,
+   DDXPointPtr ppt,
+   int *pwidth,
+   int fSorted,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
 
 void
 XAAFillColorExpandSpansMSBFirstFixedBase(
@@ -836,6 +942,18 @@
    PixmapPtr pPix
 );
 
+void
+XAAFillColorExpandSpans3MSBFirstFixedBase(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int n,
+   DDXPointPtr ppt,
+   int *pwidth,
+   int fSorted,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
 
 void
 XAAFillScanlineColorExpandSpansLSBFirst(
@@ -851,6 +969,19 @@
 );
 
 void
+XAAFillScanlineColorExpandSpans3LSBFirst(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int n,
+   DDXPointPtr ppt,
+   int *pwidth,
+   int fSorted,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
+
+void
 XAAPutImage(
     DrawablePtr pDraw,
     GCPtr       pGC,
@@ -877,6 +1008,19 @@
    PixmapPtr pPix
 );
 
+void
+XAAFillScanlineColorExpandSpans3MSBFirst(
+   ScrnInfoPtr pScrn,
+   int fg, int bg, int rop,
+   unsigned int planemask,
+   int n,
+   DDXPointPtr ppt,
+   int *pwidth,
+   int fSorted,
+   int xorg, int yorg,
+   PixmapPtr pPix
+);
+
 
 extern CARD32 *(*XAAStippleScanlineFuncMSBFirstFixedBase[6])(
    CARD32* base, CARD32* src, int offset, int width, int dwords
@@ -1259,15 +1403,6 @@
     XAACacheInfoPtr pCache
 );
 
-void 
-XAAReadPixmap (
-   ScrnInfoPtr pScrn,
-   int x, int y, int w, int h,
-   unsigned char *dst,	
-   int dstwidth,
-   int bpp, int depth
-);
-
 void
 XAAPolySegment(
     DrawablePtr	pDrawable,
@@ -1383,6 +1518,7 @@
 void XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen);
 void XAARemoveAreaCallback(FBAreaPtr area);
 void XAAMoveOutOffscreenPixmap(PixmapPtr pPix); 
+Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
 
 extern GCOps XAAFallbackOps;
 extern GCFuncs XAAGCFuncs;
@@ -1475,6 +1611,11 @@
         }}
 	
 
+#define SWAP_BITS_IN_BYTES(v) \
+ (((0x01010101 & (v)) << 7) | ((0x02020202 & (v)) << 5) | \
+  ((0x04040404 & (v)) << 3) | ((0x08080808 & (v)) << 1) | \
+  ((0x10101010 & (v)) >> 1) | ((0x20202020 & (v)) >> 3) | \
+  ((0x40404040 & (v)) >> 5) | ((0x80808080 & (v)) >> 7))
 
 /*
  * Moved XAAPixmapCachePrivate here from xaaPCache.c, since driver
Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32.h
diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32.h:1.4 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32.h:1.5
--- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32.h:1.4	Wed Jan 26 14:05:58 2000
+++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32.h	Fri Mar 31 16:17:19 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32.h,v 1.4 2000/01/26 22:05:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32.h,v 1.5 2000/04/01 00:17:19 mvojkovi Exp $ */
 
 #ifndef _CFB24_32_H
 #define _CFB24_32_H
@@ -20,6 +20,7 @@
 typedef struct {
    PixmapPtr		pix;
    Bool			freePrivate;
+   Bool			isRefPix;
 } cfb24_32PixmapRec, *cfb24_32PixmapPtr;
 
 RegionPtr
Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c
diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c:1.2 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c:1.3
--- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c:1.2	Sun Jan 31 04:22:15 1999
+++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c	Fri Mar 31 16:17:19 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c,v 1.2 1999/01/31 12:22:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c,v 1.3 2000/04/01 00:17:19 mvojkovi Exp $ */
 
 #include "Xmd.h"
 #include "servermd.h"
@@ -56,6 +56,7 @@
     pPixPriv = CFB24_32_GET_PIXMAP_PRIVATE(pPix);
     pPixPriv->pix = NULL;           /* no clone yet */
     pPixPriv->freePrivate = FALSE;
+    pPixPriv->isRefPix = FALSE;
 
     return pPix;
 }
@@ -119,6 +120,7 @@
 	    newPixPriv = CFB24_32_GET_PIXMAP_PRIVATE(newPix);
 	    newPixPriv->pix = pPix;
 	    newPixPriv->freePrivate = TRUE;
+	    pixPriv->isRefPix = TRUE;
 	}
     } else { /* bitsPerPixel == 32 */
         if(!pixPriv->pix) {	/* need to make a 32bpp clone */
@@ -128,17 +130,21 @@
 	    pixPriv->pix->refcnt = pPix->refcnt;
 	    newPixPriv = CFB24_32_GET_PIXMAP_PRIVATE(pixPriv->pix);
 	    newPixPriv->pix = pPix;
+	    pixPriv->isRefPix = TRUE;
 	}
     }
 
     if(pPix->refcnt != pixPriv->pix->refcnt)
 	ErrorF("Pixmap refcnt mismatch in RefreshPixmap()\n");
 
-    pGC = GetScratchGC(24, pScreen);
-    ValidateGC((DrawablePtr)pixPriv->pix, pGC);
-    (*pGC->ops->CopyArea)((DrawablePtr)pPix, (DrawablePtr)pixPriv->pix,
+    /* make sure copies only go from the real to the clone */
+    if(pixPriv->isRefPix) {
+	pGC = GetScratchGC(24, pScreen);
+	ValidateGC((DrawablePtr)pixPriv->pix, pGC);
+	(*pGC->ops->CopyArea)((DrawablePtr)pPix, (DrawablePtr)pixPriv->pix,
 					pGC, 0, 0, width, height, 0, 0);
-    FreeScratchGC(pGC);
+	FreeScratchGC(pGC);
+    }
 
     return pixPriv->pix;
 }
Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c
diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c:1.5
--- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c:1.4	Sun Jun  6 01:49:00 1999
+++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c	Thu Apr 27 09:26:49 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.4 1999/06/06 08:49:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.5 2000/04/27 16:26:49 eich Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -75,6 +75,7 @@
 #include "servermd.h"
 #include "OScompiler.h"
 #include "ibmTrace.h"
+#include "scrnintstr.h"
 
 PixmapPtr
 xf4bppCreatePixmap( pScreen, width, height, depth )
@@ -85,14 +86,15 @@
 {
     register PixmapPtr pPixmap  = (PixmapPtr)NULL;
     int size ;
-
+    
     TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ;
 
     if ( depth > 8 )
 	return (PixmapPtr) NULL ;
 
     size = PixmapBytePad(width, depth);
-    pPixmap = xalloc( sizeof (PixmapRec) + (height * size) ) ;
+    pPixmap = AllocatePixmap (pScreen, (height * size));
+    
     if ( !pPixmap )
 	return (PixmapPtr) NULL ;
     pPixmap->drawable.type = DRAWABLE_PIXMAP ;
@@ -109,8 +111,12 @@
     pPixmap->devKind = size;
     pPixmap->refcnt = 1 ;
     size = height * pPixmap->devKind ;
-
+#ifdef PIXPRIV
+    pPixmap->devPrivate.ptr = (pointer) (((CARD8*)pPixmap)
+					 + pScreen->totalPixmapSize);
+#else
     pPixmap->devPrivate.ptr = (pointer) (pPixmap + 1);
+#endif
     bzero( (char *) pPixmap->devPrivate.ptr, size ) ;
     return pPixmap ;
 }
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile:1.6
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Tue Jun 13 16:15:51 2000
@@ -0,0 +1,76 @@
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v 1.6 2000/06/13 23:15:51 dawes Exp $
+
+XCOMM CDEBUGFLAGS=-g -Wall -ansi -pedantic
+
+SRCS	=\
+	accessx.c\
+	card-cfg.c\
+	cards.c\
+	config.c\
+	help.c\
+	interface.c\
+	keyboard-cfg.c\
+	monitor-cfg.c\
+	mouse-cfg.c\
+	options.c\
+	screen-cfg.c\
+	screen.c\
+	startx.c\
+	vidmode.c\
+	xf86config.c
+
+OBJS	=\
+	accessx.o\
+	cards.o\
+	config.o\
+	card-cfg.o\
+	help.o\
+	interface.o\
+	keyboard-cfg.o\
+	monitor-cfg.o\
+	mouse-cfg.o\
+	options.o\
+	screen-cfg.o\
+	screen.o\
+	startx.o\
+	vidmode.o\
+	xf86config.o
+
+PROG	= xf86cfg
+
+XBMPICS =\
+	card.xbm\
+	keyboard.xbm\
+	monitor.xbm\
+	mouse.xbm\
+	left.xbm\
+	right.xbm\
+	up.xbm\
+	down.xbm\
+	wider.xbm\
+	narrower.xbm\
+	shorter.xbm\
+	taller.xbm
+
+XPMPICS =\
+	card.xpm\
+	computer.xpm\
+	keyboard.xpm\
+	monitor.xpm\
+	mouse.xpm
+
+AllTarget(ProgramTargetName($(PROG)))
+
+LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \
+		  $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \
+		  $(XPMLIB) $(XLIB) -lm
+
+NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),)
+InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter)
+InstallMultipleFlags($(XBMPICS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS))
+InstallMultipleFlags($(XPMPICS),$(INCDIR)/X11/pixmaps,$(INSTINCFLAGS))
+InstallAppDefaults(XF86Cfg)
+InstallManPage(xf86cfg,$(MANDIR))
+
+NormalLibraryObjectRule()
+DependTarget()
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad:1.3
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad	Tue Jun 13 16:15:51 2000
@@ -0,0 +1,1291 @@
+!!
+!! Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+!! 
+!! Permission is hereby granted, free of charge, to any person obtaining a
+!! copy of this software and associated documentation files (the "Software"),
+!! to deal in the Software without restriction, including without limitation
+!! the rights to use, copy, modify, merge, publish, distribute, sublicense,
+!! and/or sell copies of the Software, and to permit persons to whom the
+!! Software is furnished to do so, subject to the following conditions:
+!! 
+!! The above copyright notice and this permission notice shall be included in
+!! all copies or substantial portions of the Software.
+!!  
+!! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+!! IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+!! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+!! CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+!! WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+!! OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+!! SOFTWARE.
+!! 
+!! Except as contained in this notice, the name of Conectiva Linux shall
+!! not be used in advertising or otherwise to promote the sale, use or other
+!! dealings in this Software without prior written authorization from
+!! Conectiva Linux.
+!!
+!! Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+!!
+!! $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad,v 1.3 2000/06/13 23:15:51 dawes Exp $
+!!
+
+*Form.background:			gray85
+*Label.background:			gray85
+!! keyboard
+*Core.background:			gray85
+*Label.foreground:			gray20
+*Command.background:			gray80
+*Command.foreground:			gray20
+*Command.borderWidth:			0
+*Command.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+
+*Text.?.foreground:			gray20
+*Text.borderWidth:			0
+*Text.background:			gray96
+*Text.?.cursorColor:			rgb:d/5/5
+*Text.displayList:\
+foreground	white;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray40;\
+lines		-1,0,0,0,0,-1
+
+*baseTranslations: #override \
+<Key>Escape:	vidmode-restore()
+
+*List.background:			gray96
+*List.foreground:			gray20
+*Viewport.borderColor:			gray40
+*List.borderColor:			gray40
+
+*MenuButton.background:			gray80
+*MenuButton.foreground:			gray20
+*MenuButton.borderWidth:		0
+*MenuButton.displayList:\
+line-style	solid;\
+foreground	gray40;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1;\
+line-style	onoffdash;\
+foreground	gray80;\
+draw-rect	1,1,-2,-2
+
+*SimpleMenu.background:			gray80
+*SimpleMenu.?.foreground:		gray20
+*SimpleMenu.borderWidth:		0
+*SimpleMenu.displayList:\
+foreground	gray40;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+
+*Dialog.displayList:\
+foreground	gray40;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+
+*Toggle.background:			gray80
+*Toggle.foreground:			gray20
+*Toggle.borderWidth:			0
+*Toggle.displayList:\
+foreground	gray90;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray40;\
+lines		-1,0,0,0,0,-1
+
+*mouse.bitmap:				mouse.xbm
+*keyboard.bitmap:			keyboard.xbm
+*card.bitmap:				card.xbm
+*monitor.bitmap:			monitor.xbm
+
+*Label.borderWidth:			0
+*Viewport.forceBars:			True
+*Viewport.allowVert:			True
+*Viewport.useRight:			True
+
+.xf86cfg.geometry:			320x400
+.xf86cfg.minWidth:			320
+.xf86cfg.minHeight:			400
+.xf86cfg.maxWidth:			320
+.xf86cfg.maxHeight:			400
+
+.xf86cfg.config.geometry:		320x369
+.xf86cfg.config.minWidth:		320
+.xf86cfg.config.maxWidth:		320
+.xf86cfg.config.minHeight:		369
+.xf86cfg.config.maxHeight:		369
+
+*work.width:				320
+*work.height:				240
+
+*error.label.label:\
+Not all required fields\n\
+were filled, or the specified\n\
+identifier is duplicated.
+*error.label.vertDistance:		30
+*error.label.borderWidth:		0
+*error.label.leftBitmap:		Excl
+*error.command.fromVert:		label
+*error.command.label:			Ok
+*error.command.vertDistance:		20
+
+*Scrollbar.translations:\
+<BtnDown>:	StartScroll(Continuous) MoveThumb() NotifyThumb()\n\
+<BtnMotion>:	MoveThumb() NotifyThumb()\n\
+<BtnUp>:	NotifyScroll(Proportional) EndScroll()
+
+*Scrollbar.background:		gray80
+*Scrollbar.foreground:		rgb:a/5/5
+*Scrollbar.borderWidth:		0
+*Scrollbar.thumb:		vlines2
+*Scrollbar.displayList:\
+foreground	gray90;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray40;\
+lines		-1,0,0,0,0,-1
+
+*Text.Translations: #override \
+<Enter>:	no-op()\n\
+<Leave>:	no-op()\n\
+<Btn1Down>:	set-keyboard-focus() select-start()
+
+*top.identifier.Translations: #override \
+<Enter>:	no-op()\n\
+<Leave>:	no-op()\n\
+<Key>Return:	no-op()\n\
+<Btn1Down>:	set-keyboard-focus() select-start()
+
+*List.showCurrent:		True
+*Tip.timeout:			100
+*Tip.background:		rgb:f/f/8
+*Tip.foreground:		gray20
+*Tip.borderWidth:		0
+*Tip.displayList:\
+foreground	rgb:8/8/4;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	rgb:f/f/c;\
+lines		-1,0,0,0,0,-1
+
+*Toggle.internalHeight:		2
+*Toggle.internalWidth:		2
+*mouse.label:			Mouse
+*keyboard.label:		Keyboard
+*card.label:			Card
+*monitor.label:			Monitor
+
+!*commands.background:		black
+*commands.borderWidth:		0
+*commands.defaultDistance:	2
+*commands.?.bottom:		chainTop
+*commands.height:		50
+
+*commands.keyboard.fromHoriz:	mouse
+*card.fromHoriz:		keyboard
+*monitor.fromHoriz:		card
+
+*commands.mouse.tip:		Add mouse
+*commands.keyboard.tip:		Add keyboard
+*commands.card.tip:		Add video card
+*commands.monitor.tip:		Add monitor
+
+*topM.label:			Configure Layout
+*topM*layout.label:		Configure Layout
+*topM*screen.label:		Configure Screen
+*topM*modeline.label:		Configure Modeline
+*topM*accessx.label:		Configure AccessX
+*topM.showGrip:			False
+*work.showGrip:			False
+
+*back.label:			<< Back
+*next.label:			Next >>
+*ok.label:			Ok
+*cancel.label:			Cancel
+*yes.label:			Yes
+*no.label:			No
+
+*help.label:			Help
+*quit.label:			Quit
+*next.fromHoriz:		back
+*config*ok.fromHoriz:		next
+*bottom*cancel.fromHoriz:	ok
+*top.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+*bottom.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+*work.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+*options.pane.Form.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+
+*top.label.label:		Identifier:
+*top.label.borderWidth:		0
+*top.identifier.fromHoriz:	label
+*top.label.internalHeight:	3
+*top.label.justify:		left
+*top.label.left:		chainLeft
+*top.label.right:		chainLeft
+*top.identifier.left:		chainLeft
+*top.identifier.right:		chainRight
+
+*bottom.layout.translations:	#override \
+<Key>Return:	rename-layout()
+*bottom.layout.label:		New server layout
+*bottom.layout.tip:		Type a text and press Return to rename this layout
+*bottom.Command.height:		19
+*bottom.Text.height:		19
+*bottom.MenuButton.height:	19
+*bottom*new.label:		New server layout
+*layout.fromHoriz:		select
+*help.fromHoriz:		layout
+*bottom.layout.justify:		left
+*bottom.select.label:		Layout
+*bottom.select.left:		chainLeft
+*bottom.select.right:		chainLeft
+*bottom.layout.left:		chainLeft
+*quit.fromHoriz:		help
+*bottom.?.left:			chainRight
+*bottom.?.right:		chainRight
+*bottom.?.top:			chainBottom
+*bottom.?.bottom:		chainBottom
+
+*pane.bottom.min:		30
+*pane.bottom.max:		30
+*pane.bottom.showGrip:		False
+*pane.bottom.defaultDistance:	5
+
+!! Wellcome message
+*work.wellcome.borderWidth:	0
+*work.wellcome.label:		Welcome to XFree86 4.0 setup program
+*work.?.borderWidth:		0
+!*work.?.width:			310
+*work.?.height:			290
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! mouseDP widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*mouseDP*Label.internalHeight:		0
+*mouseDP*Label.borderWidth:		0
+*mouseDP.labelD.vertDistance:		0
+*mouseDP.labelD.label:			Select mouse device
+*mouseDP.device.fromVert:		labelD
+*mouseDP.viewportD.fromVert:		device
+*mouseDP.device.width:			302
+*mouseDP.viewportD.vertDistance:	2
+*mouseDP.viewportD.listD.longest:	135
+*mouseDP.viewportD.width:		302
+*mouseDP.viewportD.height:		87
+*mouseDP.labelP.label:			Select mouse protocol
+*mouseDP.labelP.vertDistance:		10
+*mouseDP.labelP.fromVert:		viewportD
+*mouseDP.viewportP.fromVert:		labelP
+*mouseDP.viewportP.forceBars:		True
+*mouseDP.viewportP.allowVert:		True
+*mouseDP.viewportP.useRight:		True
+*mouseDP.viewportP.listP.longest:	135
+*mouseDP.viewportP.width:		302
+*mouseDP.viewportP.height:		110
+*mouseDP.viewportP.vertDistance:	6
+*mouseDP*List.verticalList:		True
+*mouseDP.emulate3.fromVert:		viewportP
+*mouseDP.emulate3.width:		180
+*mouseDP.apply.label:			Apply changes
+*mouseDP.apply.fromVert:		viewportP
+*mouseDP.apply.fromHoriz:		emulate3
+*mouseDP.apply.width:			116
+*mouseDP.emulate3.vertDistance:		10
+*mouseDP.apply.vertDistance:		10
+*mouseDP.emulate3.label:		Emulate 3 buttons
+*mouseDP.emulate3.tip:			Select if your mouse has only two buttons
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! keyboardML widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*keyboardML.labelL.vertDistance:	16
+*keyboardML.layout.vertDistance:	16
+*keyboardML.keyboard.vertDistance:	16
+*keyboardML.Label.borderWidth:		0
+*keyboardML.Label.width:		115
+*keyboardML.Label.internalWidth:	0
+*keyboardML.Label.justify:		right
+*keyboardML.model.width:		185
+*keyboardML.model.left:			chainRight
+*keyboardML.model.right:		chainRight
+*keyboardML.model.justify:		left
+*keyboardML.model.fromHoriz:		labelM
+*keyboardML.labelM.label:		Keyboard model:
+*keyboardML.layout.width:		185
+*keyboardML.layout.left:		chainRight
+*keyboardML.layout.right:		chainRight
+*keyboardML.layout.justify:		left
+*keyboardML.layout.fromVert:		model
+*keyboardML.labelL.fromVert:		model
+*keyboardML.layout.fromHoriz:		labelL
+*keyboardML.labelL.label:		Keyboard layout:
+*keyboardML.keyboard.fromVert:		labelL
+*keyboardML.keyboard.borderWidth:	0
+*keyboardML.keyboard.width:		305
+*keyboardML.keyboard.height:		121
+*keyboardML.apply.vertDistance:		16
+*keyboardML.apply.fromVert:		keyboard
+*keyboardML.apply.label:		Apply changes
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! cardModel widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*cardModel.label.internalHeight:	0
+*cardModel.keyboard.borderWidth:	0
+*cardModel.label.label:			Card model filter
+*cardModel.label.internalHeight:	2
+*cardModel.label.borderWidth:		0
+*cardModel.viewport.vertDistance:	2
+*cardModel.viewport.fromVert:		filter
+*cardModel.filter.fromHoriz:		label
+*cardModel.filter.width:		171
+*cardModel.viewport.width:		302
+*cardModel.viewport.height:		244
+*cardModel.busidL.label:		BusID
+*cardModel.busidL.fromVert:		viewport
+*cardModel.busid.fromVert:		viewport
+*cardModel.busid.fromHoriz:		busidL
+*cardModel.busid.width:			255
+*cardModel.viewport.forceBars:		True
+*cardModel.viewport.allowVert:		True
+*cardModel.viewport.useRight:		True
+*cardModel.viewport.list.longest:	277
+*cardModel.filter.tip:			Type name or vendor of your card and press enter
+*cardModel.filter.translations:	#override \
+<Key>Return:	filter-card()
+
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! main widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*work.cpu.backgroundPixmap:		computer.xpm
+*work.mouse.backgroundPixmap:		mouse.xpm
+*work.keyboard.backgroundPixmap:	keyboard.xpm
+*work.card.backgroundPixmap:		card.xpm
+*work.monitor.backgroundPixmap:		monitor.xpm
+
+*work.cpu.x:				130
+*work.cpu.y:				160
+*work.cpu.width:			30
+*work.cpu.height:			50
+*work.mouse.width:			26
+*work.mouse.height:			35
+*work.keyboard.width:			60
+*work.keyboard.height:			28
+*work.card.width:			41
+*work.card.height:			40
+*work.monitor.width:			47
+*work.monitor.height:			40
+
+.xf86cfg.pane.work.Simple.borderWidth:	1
+.xf86cfg.pane.work.Simple.translations:\
+<Btn1Down>:	select-device()\n\
+<Btn1Motion>:	move-device()\n\
+<Btn1Up>:	unselect-device()\n\
+<Btn3Down>:	device-popup()\n\
+<Btn3Up>:	device-popdown()
+
+.xf86cfg.pane.work.screen.translations:\
+<Btn1Down>:	select-device()\n\
+<Btn1Motion>:	move-device()\n\
+<Btn1Up>:	unselect-device()\n\
+<Btn3Down>:	device-popup()\n\
+<Btn3Up>:	device-popdown()
+
+XF86Cfg.translations:	#override \
+<Message>WM_PROTOCOLS:	quit()
+.xf86cfg.config.translations:	#override \
+<Message>WM_PROTOCOLS:	config-cancel()
+.xf86cfg.options.translations:	#override \
+<Message>WM_PROTOCOLS:	options-cancel()
+.xf86cfg.quit.translations:	#override \
+<Message>WM_PROTOCOLS:	quit-cancel()
+.xf86cfg.error.translations:	#override \
+<Message>WM_PROTOCOLS:	error-cancel()
+.xf86cfg.force.translations:	#override \
+<Message>WM_PROTOCOLS:	addmode-cancel()
+.xf86cfg.accessx.translations:	#override \
+<Message>WM_PROTOCOLS:	accessx-close()
+.xf86cfg.test.translations:	#override \
+<Message>WM_PROTOCOLS:	testmode-cancel()
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! Options
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.xf86cfg.options.geometry:		400x176
+.xf86cfg.options.minWidth:		400
+.xf86cfg.options.maxWidth:		400
+.xf86cfg.options.minHeight:		176
+.xf86cfg.options.maxHeight:		176
+
+*options*commands.remove.fromHoriz:	add
+*options*commands.update.fromHoriz:	remove
+*options*commands.min:			30
+*options*commands.max:			30
+*options*commands.showGrip:		False
+*options*commands.defaultDistance:	4
+*options*commands.?.width:		100
+*options*commands.?.height:		20
+
+*options*name.fromHoriz:		label1
+*options*label2.fromHoriz:		name
+*options*value.fromHoriz:		label2
+*options*label3.fromHoriz:		value
+*options*viewport.fromVert:		name
+*options*Label.borderWidth:		0
+*options*Label.internalWidth:		0
+*options*Label.height:			21
+*options*Text.height:			19
+*options*Label.top:			chainTop
+*options*Text.top:			chainTop
+*options*Label.bottom:			chainTop
+*options*Text.bottom:			chainTop
+*options*Label.horizDistance:		0
+*options*Text.horizDistance:		0
+*options*Label.vertDistance:		8
+*options*Text.vertDistance:		8
+*options*Text.width:			147
+*options*viewport.width:		390
+*options*viewport.height:		50
+
+*options*viewport.horizDistance:	7
+*options*label1.horizDistance:		5
+*options*viewport.left:			chainLeft
+*options*viewport.right:		chainRight
+*options*list.longest:			376
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! monitor
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*monitorl*Viewport.width:		302
+*monitorl*Text.width:			160
+*monitorl*Text.tip:\
+Select standard value from the list\n\
+below, or enter specific value here.
+
+*monitorl*hlabel.justify:		right
+*monitorl*hlabel.width:			138
+*monitorl*hlabel.label:			Horizontal sync
+*monitorl*hsync.fromHoriz:		hlabel
+*monitorl*hviewport.fromVert:		hsync
+*monitorl*hviewport.height:		156
+*monitorl*hlist.longest:		288
+
+*monitorl*vlabel.justify:		right
+*monitorl*vlabel.width:			138
+*monitorl*vlabel.vertDistance:		12
+*monitorl*vsync.vertDistance:		12
+*monitorl*vlabel.fromVert:		hviewport
+*monitorl*vsync.fromVert:		hviewport
+*monitorl*vlabel.label:			Vertical sync
+*monitorl*vsync.fromHoriz:		vlabel
+*monitorl*vviewport.fromVert:		vsync
+*monitorl*vviewport.height:		20
+*monitorl*vlist.longest:		64
+
+*monitorl*clabel.vertDistance:		12
+*monitorl*clabel.fromVert:		vviewport
+*monitorl*clabel.label:			Select card connected to monitor
+*monitorl*cmenu.fromVert:		clabel
+*monitorl*cmenu.width:			302
+*monitorl*cmenu.justify:		left
+*monitorl*none.label:			None
+
+!! vidtune
+*vidtune.Repeater.borderWidth:		1
+*vidtune.Repeater.borderColor:		gray90
+*vidtune.Repeater.shapeStyle:		ellipse
+*vidtune.Repeater.foreground:		gray30
+*vidtune.Repeater.background:		gray80
+*vidtune.Repeater.width:		31
+*vidtune.Repeater.height:		29
+*vidtune.Repeater.repeatDelay:		200
+*vidtune.Repeater.decay:		0
+*vidtune.Repeater.displayList:\
+line-width	2;\
+foreground	gray65;\
+draw-arc	0,0,-0,-0,230,180;\
+foreground	gray95;\
+draw-arc	0,0,-0,-0,40,180;\
+foreground	gray80;\
+draw-arc	0,0,-0,-0,220,10;\
+draw-arc	0,0,-0,-0,40,10
+*vidtune.Repeater.translations:\
+<Enter>:	set-values(1, borderColor, gray50)\n\
+<Leave>:	set-values(1, borderColor, gray90)\n\
+<Btn1Down>:	set-values(1, borderColor, gray90) set() start()\n\
+<Btn1Up>:	stop() unset()
+*vidtune.left.bitmap:			left.xbm
+*vidtune.right.bitmap:			right.xbm
+*vidtune.up.bitmap:			up.xbm
+*vidtune.down.bitmap:			down.xbm
+*vidtune.wider.bitmap:			wider.xbm
+*vidtune.narrower.bitmap:		narrower.xbm
+*vidtune.shorter.bitmap:		shorter.xbm
+*vidtune.taller.bitmap:			taller.xbm
+
+*vidtune.vesaB.label:			Add standard VESA mode to current screen
+*vidtune.vesaB.width:			312
+
+*vidtune.screenB.fromVert:		mode
+*vidtune.screenB.width:			160
+*vidtune.screenB.horizDistance:		80
+*vidtune.prev.fromVert:			vesaB
+*vidtune.mode.fromVert:			vesaB
+*vidtune.next.fromVert:			vesaB
+*vidtune.prev.horizDistance:		54
+*vidtune.prev.label:			<<
+*vidtune.mode.fromHoriz:		prev
+*vidtune.mode.width:			160
+*vidtune.next.label:			>>
+*vidtune.next.fromHoriz:		mode
+
+*vidtune.up.fromVert:			screenB
+*vidtune.up.horizDistance:		143
+*vidtune.left.horizDistance:		98
+*vidtune.left.vertDistance:		16
+*vidtune.left.fromVert:			up
+*vidtune.monitor.fromVert:		up
+*vidtune.monitor.vertDistance:		0
+*vidtune.monitor.fromHoriz:		left
+*vidtune.right.vertDistance:		16
+*vidtune.right.fromVert:		up
+*vidtune.right.fromHoriz:		monitor
+*vidtune.down.horizDistance:		143
+*vidtune.down.fromVert:			monitor
+*vidtune.wider.fromVert:		left
+*vidtune.wider.horizDistance:		91
+*vidtune.narrower.fromVert:		down
+*vidtune.narrower.fromHoriz:		wider
+*vidtune.shorter.fromVert:		down
+*vidtune.shorter.fromHoriz:		narrower
+*vidtune.taller.fromVert:		right
+*vidtune.taller.fromHoriz:		shorter
+*vidtune.monitor.width:			47
+*vidtune.monitor.height:		40
+*vidtune.monitor.backgroundPixmap:	monitor.xpm
+*vidtune.narrower.horizDistance:	0
+*vidtune.shorter.horizDistance:		2
+*vidtune.taller.horizDistance:		0
+*vidtune.wider.vertDistance:		20
+*vidtune.taller.vertDistance:		20
+*vidtune.narrower.vertDistance:		0
+*vidtune.shorter.vertDistance:		0
+*vidtune.down.vertDistance:		0
+
+*vidtune.monitor.tip:\
+\                  WARNING\n\
+\  Using the  controls here  may damage your\n\
+monitor.  You can safely skip  this section\n\
+of the configuration process.\n\
+\n\
+Press ESC if your monitor goes out of sync.
+
+*vidtune.background:			white
+*vidtune.form.borderWidth:		0
+*vidtune.form.background:		white
+*vidtune.form.defaultDistance:		0
+*vidtune.form.vertDistance:		3
+*vidtune.form.horizDistance:		4
+*vidtune.form.Label.foreground:		gray20
+*vidtune.form.Label.background:		white
+*vidtune.form.Label.font:		-*-fixed-*-*-*-*-10-*-*-*-*-*-*-1
+*vidtune.form.Label.vertDistance:	0
+*vidtune*Label.justify:			right
+
+*vidtune.form.fromVert:			auto
+*vidtune*hsyncstart.label:		HSyncStart:
+*vidtune*hsyncstart.width:		95
+*vidtune*v-hsyncstart.width:		40
+*vidtune*v-hsyncstart.fromHoriz:	hsyncstart
+*vidtune*vsyncstart.fromHoriz:		v-hsyncstart
+*vidtune*v-vsyncstart.fromHoriz:	vsyncstart
+*vidtune*vsyncstart.label:		VSyncStart:
+*vidtune*vsyncstart.width:		95
+*vidtune*v-vsyncstart.width:		40
+*vidtune*hsyncend.label:		HSyncEnd:
+*vidtune*hsyncend.width:		95
+*vidtune*v-hsyncend.width:		40
+*vidtune*v-hsyncend.fromHoriz:		hsyncend
+*vidtune*hsyncend.fromVert:		hsyncstart
+*vidtune*v-hsyncend.fromVert:		v-hsyncstart
+*vidtune*vsyncend.label:		VSyncEnd:
+*vidtune*vsyncend.width:		95
+*vidtune*v-vsyncend.width:		40
+*vidtune*vsyncend.fromHoriz:		v-hsyncend
+*vidtune*v-vsyncend.fromHoriz:		vsyncend
+*vidtune*vsyncend.fromVert:		hsyncstart
+*vidtune*v-vsyncend.fromVert:		v-vsyncstart
+*vidtune*htotal.label:			HTotal:
+*vidtune*htotal.width:			95
+*vidtune*v-htotal.width:		40
+*vidtune*v-htotal.fromHoriz:		htotal
+*vidtune*htotal.fromVert:		hsyncend
+*vidtune*v-htotal.fromVert:		v-hsyncend
+*vidtune*vtotal.label:			VTotal:
+*vidtune*vtotal.width:			95
+*vidtune*v-vtotal.width:		40
+*vidtune*vtotal.fromHoriz:		v-htotal
+*vidtune*v-vtotal.fromHoriz:		vtotal
+*vidtune*vtotal.fromVert:		vsyncend
+*vidtune*v-vtotal.fromVert:		v-vsyncend
+*vidtune*flags.label:			Flags:
+*vidtune*flags.width:			142
+*vidtune*v-flags.width:			156
+*vidtune*v-flags.justify:		left
+*vidtune*v-flags.fromHoriz:		flags
+*vidtune*flags.fromVert:		vtotal
+*vidtune*v-flags.fromVert:		v-vtotal
+*vidtune*clock.label:			Pixel Clock (MHz):
+*vidtune*clock.width:			142
+*vidtune*v-clock.width:			48
+*vidtune*v-clock.fromHoriz:		clock
+*vidtune*clock.fromVert:		flags
+*vidtune*v-clock.fromVert:		v-flags
+*vidtune*hsync.label:			Horizontal Sync (kHz):
+*vidtune*hsync.width:			142
+*vidtune*v-hsync.width:			48
+*vidtune*v-hsync.fromHoriz:		hsync
+*vidtune*hsync.fromVert:		clock
+*vidtune*v-hsync.fromVert:		v-clock
+*vidtune*vsync.label:			Vertical Sync (Hz):
+*vidtune*vsync.width:			142
+*vidtune*v-vsync.width:			48
+*vidtune*v-vsync.fromHoriz:		vsync
+*vidtune*vsync.fromVert:		hsync
+*vidtune*v-vsync.fromVert:		v-hsync
+
+*vidtune.auto.horizDistance:		43
+*vidtune.auto.fromVert:			narrower
+*vidtune.auto.label:			Auto
+!*vidtune.auto.state:			True
+*vidtune.apply.fromVert:		narrower
+*vidtune.apply.fromHoriz:		auto
+*vidtune.apply.label:			Apply
+*vidtune.restore.fromHoriz:		apply
+*vidtune.restore.horizDistance:		4
+*vidtune.restore.fromVert:		narrower
+*vidtune.restore.label:			Restore
+*vidtune.update.fromVert:		narrower
+*vidtune.update.fromHoriz:		restore
+*vidtune.update.label:			Update
+*vidtune.test.fromVert:			narrower
+*vidtune.test.fromHoriz:		update
+*vidtune.test.label:			Test
+
+*vidtune.Label.background:		white
+*vidtune.addto.vertDistance:		4
+*vidtune.addto.fromHoriz:		add
+*vidtune.addto.fromVert:		form
+*vidtune.addto.label:			mode to
+*vidtune.addto.horizDistance:		0
+*vidtune.ident.vertDistance:		4
+*vidtune.ident.horizDistance:		0
+*vidtune.ident.fromVert:		form
+*vidtune.ident.fromHoriz:		addto
+*vidtune.ident.width:			98
+*vidtune.ident.justify:			left
+*vidtune.as.vertDistance:		4
+*vidtune.as.horizDistance:		0
+*vidtune.as.fromVert:			form
+*vidtune.as.fromHoriz:			ident
+*vidtune.as.label:			as:
+*vidtune.text.vertDistance:		4
+*vidtune.text.horizDistance:		0
+*vidtune.text.fromVert:			form
+*vidtune.text.fromHoriz:		as
+*vidtune.text.width:			98
+*vidtune.add.vertDistance:		4
+*vidtune.add.fromVert:			form
+*vidtune.add.label:			Add
+.xf86cfg.force.geometry:		268x58
+.xf86cfg.force.minWidth:		268
+.xf86cfg.force.maxWidth:		268
+.xf86cfg.force.minHeight:		58
+.xf86cfg.force.maxHeight:		58
+.xf86cfg.force.?.label:			There is already a modeline with the\n\
+specified identifier. Add anyway?
+.xf86cfg.test.?.label:			\        Testing modeline...\n\n\
+Press ESC or stop button to quit.
+.xf86cfg.test.geometry:			250x72
+.xf86cfg.test.minWidth:			250
+.xf86cfg.test.maxWidth:			250
+.xf86cfg.test.minHeight:		72
+.xf86cfg.test.maxHeight:		72
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! screen
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*screenD*depthL.label:			Default color depth:
+*screenD*depthL.height:			20
+*screenD*1.fromHoriz:			depthL
+*screenD*4.fromHoriz:			1
+*screenD*8.fromHoriz:			4
+*screenD*16.fromHoriz:			8
+*screenD*24.fromHoriz:			16
+*screenD*1.width:			24
+*screenD*4.width:			24
+*screenD*8.width:			24
+*screenD*16.width:			24
+*screenD*24.width:			24
+*screenD*1.horizDistance:		5
+*screenD*4.horizDistance:		5
+*screenD*8.horizDistance:		5
+*screenD*16.horizDistance:		5
+*screenD*24.horizDistance:		5
+*screenD*modeL.fromVert:		depthL
+*screenD*modeL.vertDistance:		14
+*screenD*modeL.label:			Select resolution(s):
+*screenD*viewL.fromVert:		modeL
+*screenD*select.fromHoriz:		viewL
+*screenD*unselect.fromHoriz:		viewL
+*screenD*select.fromVert:		modeL
+*screenD*unselect.fromVert:		select
+*screenD*viewR.fromHoriz:		select
+*screenD*viewR.fromVert:		modeL
+*screenD*select.label:			->
+*screenD*unselect.label:		<-
+*screenD*viewL.width:			133
+*screenD*viewR.width:			133
+*screenD*viewL.height:			184
+*screenD*viewR.height:			184
+*screenD*listLeft.longest:		128
+*screenD*listRight.longest:		128
+*screenD*rotate.tip:			Don't select any option if\n\
+your monitor is not rotated.
+*screenD*rotate.vertDistance:		14
+*screenD*rotate.fromVert:		viewL
+*screenD*rotate.label:			Rotate screen:
+*screenD*CW.tip:			Clock wise
+*screenD*CW.vertDistance:		14
+*screenD*CW.fromVert:			viewL
+*screenD*CW.fromHoriz:			rotate
+*screenD*CW.label:			CW
+*screenD*CW.width:			40
+*screenD*CCW.tip:			Counter-clock wise
+*screenD*CCW.vertDistance:		14
+*screenD*CCW.fromVert:			viewL
+*screenD*CCW.fromHoriz:			CW
+*screenD*CCW.label:			CCW
+*screenD*CCW.width:			40
+
+*work.screen.width:			100
+*work.screen.height:			80
+
+
+*Dialog.background:			gray85
+*quit.ask.label:			Write configuration to
+*quit.ask.value.translations:	#override \
+<Key>Return:	write-config()
+*quit.ask.label.justify:		left
+*quit.ask.value.width:			222
+*quit.ask.icon:				Excl
+.xf86cfg.quit.geometry:			230x92
+.xf86cfg.quit.minWidth:			230
+.xf86cfg.quit.maxWidth:			230
+.xf86cfg.quit.minHeight:		92
+.xf86cfg.quit.maxHeight:		92
+
+*error.notice.label:			Failed to write configuration file.
+.xf86cfg.error.geometry:		280x50
+.xf86cfg.error.minWidth:		260
+.xf86cfg.error.maxWidth:		260
+.xf86cfg.error.minHeight:		50
+.xf86cfg.error.maxHeight:		50
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! accessx
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*Accessx*Label.background:		white
+*Accessx*Label.justify:			left
+*Accessx*Label.internalHeight:		0
+*Accessx*Label.internalWidth:		0
+*Accessx*Label.foreground:		gray35
+*Accessx*Toggle.internalHeight:		0
+*Accessx.Toggle.internalWidth:		18
+*Accessx.Toggle.justify:		left
+*Accessx.Toggle.foreground:		gray30
+*Accessx.Toggle.background:		white
+*Accessx*Toggle.highlightThickness:	0
+*Accessx.Toggle.foreground:		rgb:f/7/7
+*Accessx.Toggle.displayList:\
+foreground	white;\
+points		0,0,-1,0;\
+foreground	rgb:f/7/7;\
+fill-poly	0,2,0,-3,8,6
+*Accessx.Toggle.translations: \
+<Btn1Down>,<Btn1Up>: toggle() notify()\n\
+<Enter>: set-values(1, displayList, "foreground white;points 0,0,-1,0;fill-poly 0,1,10,6,0,-2;foreground rgb:7/7/f;fill-poly 0,2,0,-3,8,6")\n\
+<Leave>: set-values(1, displayList, "foreground white;points 0,0,-1,0;foreground rgb:f/7/7;fill-poly 0,2,0,-3,8,6")
+*Accessx.Form.borderWidth:		1
+*Accessx.Form.borderColor:		rgb:f/7/7
+*Accessx.Form.vertDistance:		0
+*Accessx.Form.defaultDistance:		2
+*Accessx.borderWidth:			0
+*accessxForm.background:		white
+*Accessx*Form.background:		white
+*Accessx.background:			white
+*accessxForm.enable.label:		Enable AccessX
+*accessxForm.enable.width:		208
+*accessxForm.apply.fromHoriz:		enable
+*accessxForm.apply.label:		Apply changes
+*accessxForm.Accessx.fromVert:		enable
+*Accessx.timeoutToggle.background:	white
+*Accessx.timeoutToggle.foreground:	rgb:7/7/f
+*Accessx.timeoutToggle.displayList:\
+foreground	rgb:a/a/f;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	rgb:2/2/a;\
+lines		-1,0,0,0,0,-1
+
+*Accessx.Form.Toggle.background:	white
+*Accessx.Form.Toggle.foreground:	rgb:7/7/f
+*Accessx.Form.Toggle.displayList:\
+foreground	rgb:a/a/f;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	rgb:2/2/a;\
+lines		-1,0,0,0,0,-1
+*Accessx.Form.Toggle.translations: \
+<Btn1Down>,<Btn1Up>: toggle() notify()\n\
+<Enter>: set-values(1, displayList, "foreground rgb:a/a/f;lines 1,-1,-1,-1,-1,1;foreground rgb:2/2/a;lines -1,0,0,0,0,-1;foreground rgb:f/7/7;draw-rect 1,1,-2,-2")\n\
+<Leave>: set-values(1, displayList, "foreground rgb:a/a/f;lines 1,-1,-1,-1,-1,1;foreground rgb:2/2/a;lines -1,0,0,0,0,-1")
+
+*Accessx.timeoutToggle.internalWidth:	4
+*Accessx.timeoutToggle.translations:\
+<Btn1Down>,<Btn1Up>:	toggle() notify()
+*Accessx.timeoutToggle.internalWidth:	4
+*Accessx.timeoutToggle.internalHeight:	1
+*Accessx.timeoutToggle.vertDistance:	6
+*Accessx.timeoutToggle.label:		Time Out
+*Accessx.timeoutLabel.fromHoriz:	timeoutToggle
+*Accessx.timeoutLabel.vertDistance:	7
+*Accessx.timeoutLabel.label:		Time (min)
+*Accessx.Label.background:		white
+*Accessx.timeoutNumber.vertDistance:	1
+*Accessx.timeoutNumber.fromHoriz:	timeoutLabel
+*Accessx.timeoutNumber.font:		6x9
+*Accessx.timeoutNumber.label:		??
+*Accessx.timeoutScroller.fromVert:	timeoutNumber
+*Accessx.timeoutScroller.fromHoriz:	timeoutLabel
+*Accessx.timeoutScroller.width:		133
+*Accessx.timeoutScroller.horizDistance:	31
+*Accessx*Scrollbar.vertDistance:	0
+*Accessx*Scrollbar.orientation:		horizontal
+*Accessx*Scrollbar.thumb:		black
+*Accessx*Scrollbar.height:		8
+*Accessx*Scrollbar.minimumThumb:	5
+*Accessx*Scrollbar.borderWidth:		1
+*Accessx*Scrollbar.borderColor:		gray70
+*Accessx*Scrollbar.foreground:		rgb:f/7/7
+*Accessx*Scrollbar.background:		gray95
+*Accessx*Scrollbar.displayList:\
+foreground	gray80;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+*Accessx.sticky.fromVert:		timeoutToggle
+*Accessx.sticky.vertDistance:		6
+*Accessx.sticky.label:			Enable StickyKeys
+*Accessx.sticky.width:			304
+*Accessx.stickyForm.fromVert:		sticky
+*Accessx.stickyForm.Toggle.width:	148
+*Accessx.stickyForm.Toggle.internalHeight:	1
+*Accessx.stickyForm.auto.label:		Auto off
+*Accessx.stickyForm.beep.fromHoriz:	auto
+*Accessx.stickyForm.beep.label:		Modifiers beep
+*Accessx.mouseKeys.fromVert:		stickyForm
+*Accessx.mouseKeys.width:		304
+*Accessx.mouseKeys.vertDistance:	6
+*Accessx.mouseKeys.label:		Enable MouseKeys
+*Accessx.mouseForm.fromVert:		mouseKeys
+*Accessx.mouseForm.speedLabel.vertDistance:	7
+*Accessx.mouseForm.speedLabel.label:	Peak speed (pixels/sec)
+*Accessx.mouseForm.speedNumber.fromHoriz:	speedLabel
+*Accessx.mouseForm.speedNumber.font:	6x9
+*Accessx.mouseForm.speedNumber.label:		???
+*Accessx.mouseForm.speedScroller.fromHoriz:	speedLabel
+*Accessx.mouseForm.speedScroller.fromVert:	speedNumber
+*Accessx.mouseForm.speedScroller.width:		133
+*Accessx.mouseForm.timeLabel.fromVert:	speedScroller
+*Accessx.mouseForm.timeLabel.label:	Time to peak (sec)
+*Accessx.mouseForm.timeLabel.vertDistance:	7
+*Accessx.mouseForm.timeNumber.label:	???
+*Accessx.mouseForm.timeNumber.fromVert:	speedScroller
+*Accessx.mouseForm.timeNumber.fromHoriz:	timeLabel
+*Accessx.mouseForm.timeNumber.font:	6x9
+*Accessx.mouseForm.timeScroller.fromHoriz:	timeLabel
+*Accessx.mouseForm.timeScroller.fromVert:	timeNumber
+*Accessx.mouseForm.timeScroller.width:	133
+*Accessx.mouseForm.timeScroller.horizDistance:	37
+*Accessx.mouseForm.delayLabel.fromVert:	timeScroller
+*Accessx.mouseForm.delayLabel.label:	Motion delay (sec)
+*Accessx.mouseForm.delayLabel.vertDistance:	7
+*Accessx.mouseForm.delayNumber.label:	???
+*Accessx.mouseForm.delayNumber.fromVert:	timeScroller
+*Accessx.mouseForm.delayNumber.fromHoriz:	delayLabel
+*Accessx.mouseForm.delayNumber.font:	6x9
+*Accessx.mouseForm.delayScroller.fromHoriz:	delayLabel
+*Accessx.mouseForm.delayScroller.fromVert:	delayNumber
+*Accessx.mouseForm.delayScroller.width:	133
+*Accessx.mouseForm.delayScroller.horizDistance:	37
+*Accessx.repeatKeys.fromVert:		mouseForm
+*Accessx.repeatKeys.width:		304
+*Accessx.repeatKeys.vertDistance:	6
+*Accessx.repeatKeys.label:		Enable RepeatKeys
+*Accessx.repeatForm.fromVert:		repeatKeys
+*Accessx.repeatForm.rateLabel.vertDistance:	7
+*Accessx.repeatForm.rateLabel.label:	Repeat rate (sec/key)
+*Accessx.repeatForm.rateNumber.fromHoriz:	rateLabel
+*Accessx.repeatForm.rateNumber.font:	6x9
+*Accessx.repeatForm.rateNumber.label:	????
+*Accessx.repeatForm.rateScroller.fromHoriz:	rateLabel
+*Accessx.repeatForm.rateScroller.fromVert:	rateNumber
+*Accessx.repeatForm.rateScroller.width:	133
+*Accessx.repeatForm.rateScroller.horizDistance:	16
+*Accessx.repeatForm.delayLabel.fromVert:	rateScroller
+*Accessx.repeatForm.delayLabel.label:	Repeat delay (sec)
+*Accessx.repeatForm.delayLabel.vertDistance:	7
+*Accessx.repeatForm.delayNumber.label:	????
+*Accessx.repeatForm.delayNumber.fromVert:	rateScroller
+*Accessx.repeatForm.delayNumber.fromHoriz:	delayLabel
+*Accessx.repeatForm.delayNumber.font:	6x9
+*Accessx.repeatForm.delayScroller.fromHoriz:	delayLabel
+*Accessx.repeatForm.delayScroller.fromVert:	delayNumber
+*Accessx.repeatForm.delayScroller.width:	133
+*Accessx.repeatForm.delayScroller.horizDistance:	37
+*Accessx.slow.fromVert:			repeatForm
+*Accessx.slow.vertDistance:		6
+*Accessx.slow.label:			Enable SlowKeys
+*Accessx.slow.width:			304
+*Accessx.slowForm.fromVert:		slow
+*Accessx.slowForm.Toggle.horizDistance:	4
+*Accessx.slowForm.Toggle.internalWidth:	4
+*Accessx.slowForm.Toggle.internalHeight:	1
+*Accessx.slowForm.beep.label:		Beep when key is
+*Accessx.slowForm.pressed.fromHoriz:	beep
+*Accessx.slowForm.pressed.label:	pressed
+*Accessx.slowForm.accepted.fromHoriz:	pressed
+*Accessx.slowForm.accepted.label:	accepted
+*Accessx.slowForm.slowLabel.fromVert:	accepted
+*Accessx.slowForm.slowLabel.label:	Key delay (sec)
+*Accessx.slowForm.slowLabel.vertDistance:	7
+*Accessx.slowForm.slowNumber.label:	???
+*Accessx.slowForm.slowNumber.fromVert:	accepted
+*Accessx.slowForm.slowNumber.fromHoriz:	slowLabel
+*Accessx.slowForm.slowNumber.font:	6x9
+*Accessx.slowForm.slowScroller.fromHoriz:	slowLabel
+*Accessx.slowForm.slowScroller.fromVert:	slowNumber
+*Accessx.slowForm.slowScroller.width:	133
+*Accessx.slowForm.slowScroller.horizDistance:	58
+*Accessx.bounce.fromVert:		slowForm
+*Accessx.bounce.vertDistance:		6
+*Accessx.bounce.label:			Enable BounceKeys
+*Accessx.bounce.width:			304
+*Accessx.bounceForm.fromVert:		bounce
+*Accessx.bounceForm.bounceLabel.label:	Debounce time (sec)
+*Accessx.bounceForm.bounceLabel.vertDistance:	7
+*Accessx.bounceForm.bounceNumber.label:	???
+*Accessx.bounceForm.bounceNumber.fromHoriz:	bounceLabel
+*Accessx.bounceForm.bounceNumber.font:	6x9
+*Accessx.bounceForm.bounceScroller.fromHoriz:	bounceLabel
+*Accessx.bounceForm.bounceScroller.fromVert:	bounceNumber
+*Accessx.bounceForm.bounceScroller.width:	133
+*Accessx.bounceForm.bounceScroller.horizDistance:	30
+
+*accessx.geometry:			220x253
+*accessx.minWidth:			220
+*accessx.maxWidth:			220
+*accessx.minHeight:			253
+*accessx.maxHeight:			253
+*accessx*lock.fromVert:			label
+*accessx*div.fromVert:			label
+*accessx*div.fromHoriz:			lock
+*accessx*mul.fromVert:			label
+*accessx*mul.fromHoriz:			div
+*accessx*minus.fromVert:		label
+*accessx*minus.fromHoriz:		mul
+*accessx*7.fromVert:			lock
+*accessx*8.fromVert:			div
+*accessx*8.fromHoriz:			7
+*accessx*9.fromVert:			mul
+*accessx*9.fromHoriz:			8
+*accessx*plus.fromVert:			minus
+*accessx*plus.fromHoriz:		9
+*accessx*4.fromVert:			7
+*accessx*5.fromVert:			8
+*accessx*5.fromHoriz:			4
+*accessx*6.fromVert:			9
+*accessx*6.fromHoriz:			5
+*accessx*1.fromVert:			4
+*accessx*2.fromVert:			5
+*accessx*2.fromHoriz:			1
+*accessx*3.fromVert:			6
+*accessx*3.fromHoriz:			2
+*accessx*enter.fromVert:		plus
+*accessx*enter.fromHoriz:		3
+*accessx*0.fromVert:			2
+*accessx*del.fromVert:			3
+*accessx*del.fromHoriz:			0
+*accessx.form.background:		gray80
+*accessx*Label.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+*accessx*label.font:			fixed
+*accessx*Label.font:			-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1
+*accessx*Label.width:			50
+*accessx*Label.height:			35
+*accessx*label.width:			212
+*accessx*label.height:			50
+*accessx*plus.height:			74
+*accessx*enter.height:			74
+*accessx*0.width:			104
+*accessx*lock.label:			Num\nLock
+*accessx*div.label:			/\n\ 
+*accessx*mul.label:			*\n\ 
+*accessx*minus.label:			-\n\ 
+*accessx*7.label:			7\n\ 
+*accessx*8.label:			8\n\ 
+*accessx*9.label:			9\n\ 
+*accessx*plus.label:			+\n\ \n\ \n\ \n\ 
+*accessx*4.label:			4\n\ 
+*accessx*5.label:			5\n\ 
+*accessx*6.label:			6\n\ 
+*accessx*1.label:			1\n\ 
+*accessx*2.label:			2\n\ 
+*accessx*3.label:			3\n\ 
+*accessx*enter.label:			Enter\n\ \n\ \n\ \n\ 
+*accessx*0.label:			0\n\ 
+*accessx*del.label:			.\n\ \n\ 
+*accessx*label.displayList:\
+foreground	white;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	gray20;\
+lines		-1,0,0,0,0,-1
+*accessx*label.label:\
+If your mouse does not work, use\n\
+the  numeric  keypad,  following\n\
+the diagram bellow.
+*accessx*div.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	4,30, "Button 1"
+*accessx*mul.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	4,30, "Button 2"
+*accessx*minus.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	4,30, "Button 3"
+*accessx*7.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	20,20,20,30,30,20
+*accessx*8.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	30,20,20,30,40,30
+*accessx*9.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	20,20,30,30,30,20
+*accessx*plus.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	9,46, "Double";\
+draw-string	14,60, "Click"
+*accessx*4.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	22,22,30,30,30,14
+*accessx*5.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10*-*-*-*-*-*-1;\
+draw-string	14,30, "Click"
+*accessx*6.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	30,22,22,30,22,14
+*accessx*1.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	20,20,20,30,30,30
+*accessx*2.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	28,30,20,22,36,22
+*accessx*3.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	20,30,30,30,30,20
+*accessx*enter.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	9,46, "Toggle";\
+draw-string	10,60, "Speed"
+*accessx*0.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	26,30, "Button Lock"
+*accessx*del.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-8-*-*-*-*-*-*-1;\
+draw-string	12,21, "Button";\
+draw-string	9,30, "Release"
+
+*help*text.properties:\
+default?family=Times&weight=Medium&slant=R&pixelsize=12&registry=ISO8859&encoding=1,\
+b?weight=Bold,\
+strong?weight=Bold,\
+i?slant=I,\
+em?slant=I,\
+address?slant=I,\
+h1?pixelsize=24&weight=Bold,\
+h2?pixelsize=20&weight=Bold,\
+h3?pixelsize=17&weight=Bold,\
+h4?pixelsize=14&weight=Bold,\
+h5?pixelsize=12&weight=Bold,\
+h6?pixelsize=10&weight=Bold,\
+pre?family=Courier&pixelsize=10,\
+kbd?family=Courier&pixelsize=10,\
+code?family=Courier&pixelsize=10,\
+samp?family=Courier&pixelsize=10,\
+tt?family=Courier&pixelsize=10
+*help*close.min:	18
+*help*close.max:	18
+*help*close.showGrip:	False
+*help*wrap:		word
+.xf86cfg.help.geometry:		320x369
+.xf86cfg.help.translations:	#override \
+<Message>WM_PROTOCOLS:	help-close()
+*help*text.translations:\
+<Key>Up:	scroll-one-line-down()\n\
+<Key>Down:	scroll-one-line-up()\n\
+<Key>Next:	next-page()\n\
+<Key>Prior:	previous-page()\n\
+<Key>space:	next-page()\n\
+<Key>BackSpace:	previous-page()\n\
+<Key>Home:	beginning-of-file()\n\
+<Key>End:	end-of-file()
+*help*text*displayCaret:	False
+*help*text.leftMargin:		10
+*help*text.rightMargin:		10
+
+*help.helpDevices:\
+<h2>Configuring devices</h2>\
+You can arrange the icons pressing the <i>left mouse button</i> \
+and dragging them.\
+<p>\
+To configure a device, press the <i>right mouse button</i> and choose the \
+<tt>configure</tt> option.\
+
+*help.helpScreen:\
+<h2>Configuring screens</h2>\
+You can drag the monitors to set the screen layout form <b>Xinerama</b> \
+pressing the <i>left mouse button</i> and moving them.\
+<p>\
+Press the <i>right mouse button</i> to set configure or set options for \
+the given screen.
+
+*help.helpModeline:\
+<h2>Configuring modelines</h2>\
+<b><font size=+1 color=red>The controls here may damage your \
+monitor.</font></b> \
+<p>\
+You can safelly skip this stage of the configuration process.\
+<p>\
+When not running in <b>Xinerama</b> mode, you can configure modelines \
+for every configured monitor. Set the <b>Auto</b> toggle to see the changes \
+while the <i>control buttons</i> are pressed.\
+<p>\
+Note that the <i>arrow</i> buttons are repeaters. Press they only once \
+and they will show the changes in the <i>text labels</i>.\
+<p>\
+<font color=forestgreen>Press <b>ESC</b> if the monitor goes out of sync.</font>
+
+*help.helpAccessX:\
+<h2>Configuring accessx</h2>\
+This interface is expected to allow customizing most of the <b>accessx</b> \
+options.\
+<p>\
+Press in the <b>Enable ???</b> label to set specific options.\
+<p>\
+<font color=red>Note</font>: currently, if you press the \
+<tt><b>Apply changes</b></tt> button there is no way to undo your changes.</font>
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c:1.4
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c	Mon Jun 19 22:08:50 2000
@@ -0,0 +1,687 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.4 2000/06/20 05:08:50 dawes Exp $
+ */
+
+#include "config.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <X11/XKBlib.h>
+#include <X11/Shell.h>
+#include <X11/Xaw/Command.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Label.h>
+#include <X11/Xaw/Scrollbar.h>
+#include <X11/Xaw/Toggle.h>
+#include "keyboard-cfg.h"
+
+#define MAX_TIMEOUT		20
+#define MAX_MOUSE_SPEED		500
+#define MAX_MOUSE_TIME		4
+#define MAX_MOUSE_DELAY		2.09
+#define MAX_REPEAT_RATE		8.04
+#define MAX_REPEAT_DELAY	6.04
+#define MAX_SLOW_TIME		4
+#define MAX_BOUNCE_TIME		4
+
+/*
+ * Types
+ */
+typedef struct {
+    Widget label, number, scroller;
+    double min, max, value, resolution;
+    Bool integer;
+} Scale;
+
+/*
+ * Initialization
+ */
+static Widget shell, accessx, enable, timeoutToggle, form, apply;
+static Widget sticky, stickyAuto, stickyBeep;
+static Widget mouse;
+static Widget repeat;
+static Widget slowToggle, slowPressed, slowAccepted;
+static Widget bounceToggle;
+static Scale *timeout, *mouseSpeed, *mouseTime, *mouseDelay, *slow,
+	*repeatRate, *repeatDelay, *bounce;
+extern Widget work;
+
+/*
+ * Prototypes
+ */
+static void CreateAccessXHelpDialog(void);
+static void EnableCallback(Widget, XtPointer, XtPointer);
+static void ScaleEnableCallback(Widget, XtPointer, XtPointer);
+static void ScaleJumpCallback(Widget, XtPointer, XtPointer);
+
+static void ApplyCallback(Widget, XtPointer, XtPointer);
+
+/*
+ * Implementation
+ */
+void
+startaccessx(void)
+{
+    InitializeKeyboard();
+    XkbGetControls(DPY, XkbAllControlsMask, xkb_info->xkb);
+    if (xkb_info->xkb->ctrls == NULL)
+	xkb_info->xkb->ctrls = (XkbControlsPtr)
+	    XtCalloc(1, sizeof(XkbControlsRec));
+    xkb_info->xkb->ctrls->enabled_ctrls |= XkbMouseKeysMask |
+					   XkbMouseKeysAccelMask;
+    xkb_info->xkb->ctrls->mk_delay = 40;
+    xkb_info->xkb->ctrls->mk_interval = 10;
+    xkb_info->xkb->ctrls->mk_time_to_max = 1000;
+    xkb_info->xkb->ctrls->mk_max_speed = 500;
+    xkb_info->xkb->ctrls->mk_curve = 0;
+    XkbSetControls(DPY, XkbAllControlsMask, xkb_info->xkb);
+    UpdateKeyboard(True);
+    CreateAccessXHelpDialog();
+}
+
+void
+CreateAccessXHelpDialog()
+{
+    Widget form;
+
+    shell = XtVaCreatePopupShell("accessx", transientShellWidgetClass, toplevel,
+				 XtNx, toplevel->core.x + toplevel->core.width,
+				 XtNy, toplevel->core.y, NULL, 0);
+    form = XtCreateManagedWidget("form", formWidgetClass, shell, NULL, 0);
+    XtCreateManagedWidget("label", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("lock", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("div", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("mul", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("minus", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("7", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("8", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("9", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("plus", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("4", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("5", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("6", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("1", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("2", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("3", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("enter", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("0", labelWidgetClass, form, NULL, 0);
+    XtCreateManagedWidget("del", labelWidgetClass, form, NULL, 0);
+
+    XtRealizeWidget(shell);
+    XSetWMProtocols(DPY, XtWindow(shell), &wm_delete_window, 1);
+    XtPopup(shell, XtGrabNone);
+}
+
+/*ARGSUSED*/
+void
+CloseAccessXAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    XtPopdown(shell);
+}
+
+static void
+AccessXInitialize(void)
+{
+    static int first = 1;
+    Arg args[1];
+    Boolean state;
+    Widget stickyForm, mouseForm, repeatForm, slowForm, bounceForm;
+    float val;
+
+    if (!first)
+	return;
+    first = 0;
+
+    InitializeKeyboard();
+
+    XkbGetControls(DPY, XkbAllControlsMask, xkb_info->xkb);
+    if (xkb_info->xkb->ctrls == NULL)
+	xkb_info->xkb->ctrls = (XkbControlsPtr)
+	    XtCalloc(1, sizeof(XkbControlsRec));
+
+    timeout = XtNew(Scale);
+    accessx = XtCreateWidget("accessxForm", formWidgetClass, work, NULL, 0);
+    enable = XtVaCreateManagedWidget("enable", toggleWidgetClass, accessx,
+				     XtNstate,
+				     (xkb_info->xkb->ctrls->enabled_ctrls &
+				      (XkbAccessXKeysMask | XkbStickyKeysMask |
+				       XkbMouseKeysMask | XkbMouseKeysAccelMask |
+				       XkbRepeatKeysMask | XkbSlowKeysMask |
+				       XkbBounceKeysMask)) != 0, NULL, 0);
+
+    apply = XtCreateManagedWidget("apply", commandWidgetClass, accessx, NULL, 0);
+    XtAddCallback(apply, XtNcallback, ApplyCallback, NULL);
+
+    form = XtCreateManagedWidget("Accessx", formWidgetClass, accessx, NULL, 0);
+    XtAddCallback(enable, XtNcallback, EnableCallback, (XtPointer)form);
+    timeoutToggle = XtVaCreateManagedWidget("timeoutToggle", toggleWidgetClass,
+					    form, XtNstate,
+					    xkb_info->xkb->ctrls->ax_timeout > 60
+					    && xkb_info->xkb->ctrls->ax_timeout
+					    < 30000, NULL, 0);
+    XtAddCallback(timeoutToggle, XtNcallback, ScaleEnableCallback,
+		  (XtPointer)timeout);
+    timeout->label = XtCreateManagedWidget("timeoutLabel", labelWidgetClass,
+					   form, NULL, 0);
+    timeout->number = XtCreateManagedWidget("timeoutNumber", labelWidgetClass,
+					    form, NULL, 0);
+    timeout->scroller = XtCreateManagedWidget("timeoutScroller",
+					      scrollbarWidgetClass,
+					      form, NULL, 0);
+    XtAddCallback(timeout->scroller, XtNjumpProc, ScaleJumpCallback,
+		  (XtPointer)timeout);
+    timeout->min = 1;
+    timeout->max = MAX_TIMEOUT;
+    timeout->resolution = 1;
+    timeout->integer = True;
+
+    sticky = XtVaCreateManagedWidget("sticky", toggleWidgetClass, form,
+				     XtNstate,
+				     (xkb_info->xkb->ctrls->enabled_ctrls &
+				      XkbStickyKeysMask) != 0, NULL, 0);
+    stickyForm = XtCreateManagedWidget("stickyForm", formWidgetClass,
+				       form, NULL, 0);
+    XtAddCallback(sticky, XtNcallback, EnableCallback, (XtPointer)stickyForm);
+    stickyAuto = XtVaCreateManagedWidget("auto", toggleWidgetClass, stickyForm,
+					 XtNstate,
+					 (xkb_info->xkb->ctrls->ax_options &
+					  XkbAX_LatchToLockMask) == 0, NULL, 0);
+    stickyBeep = XtVaCreateManagedWidget("beep", toggleWidgetClass, stickyForm,
+					 XtNstate,
+					 (xkb_info->xkb->ctrls->ax_options &
+					  XkbAX_StickyKeysFBMask) != 0, NULL, 0);
+
+    mouse = XtVaCreateManagedWidget("mouseKeys", toggleWidgetClass, form,
+				    XtNstate,
+				    (xkb_info->xkb->ctrls->enabled_ctrls &
+				     (XkbMouseKeysMask | XkbMouseKeysAccelMask))
+				    != 0, NULL, 0);
+    mouseForm = XtCreateManagedWidget("mouseForm", formWidgetClass,
+				      form, NULL, 0);
+    XtAddCallback(mouse, XtNcallback, EnableCallback, (XtPointer)mouseForm);
+    mouseSpeed = XtNew(Scale);
+    mouseSpeed->label = XtCreateManagedWidget("speedLabel", labelWidgetClass,
+					      mouseForm, NULL, 0);
+    mouseSpeed->number = XtCreateManagedWidget("speedNumber", labelWidgetClass,
+					      mouseForm, NULL, 0);
+    mouseSpeed->scroller = XtCreateManagedWidget("speedScroller",
+						 scrollbarWidgetClass,
+						 mouseForm, NULL, 0);
+    XtAddCallback(mouseSpeed->scroller, XtNjumpProc, ScaleJumpCallback,
+		  (XtPointer)mouseSpeed);
+    mouseSpeed->min = 10;
+    mouseSpeed->max = MAX_MOUSE_SPEED;
+    mouseSpeed->resolution = 10;
+    mouseSpeed->integer = True;
+    mouseTime = XtNew(Scale);
+    mouseTime->label = XtCreateManagedWidget("timeLabel", labelWidgetClass,
+					     mouseForm, NULL, 0);
+    mouseTime->number = XtCreateManagedWidget("timeNumber", labelWidgetClass,
+					      mouseForm, NULL, 0);
+    mouseTime->scroller = XtCreateManagedWidget("timeScroller",
+						scrollbarWidgetClass,
+						mouseForm, NULL, 0);
+    XtAddCallback(mouseTime->scroller, XtNjumpProc, ScaleJumpCallback,
+		  (XtPointer)mouseTime);
+    mouseTime->min = .1;
+    mouseTime->max = MAX_MOUSE_TIME;
+    mouseTime->resolution = .1;
+    mouseTime->integer = False;
+    mouseDelay = XtNew(Scale);
+    mouseDelay->label = XtCreateManagedWidget("delayLabel", labelWidgetClass,
+					      mouseForm, NULL, 0);
+    mouseDelay->number = XtCreateManagedWidget("delayNumber", labelWidgetClass,
+					       mouseForm, NULL, 0);
+    mouseDelay->scroller = XtCreateManagedWidget("delayScroller",
+						 scrollbarWidgetClass,
+						 mouseForm, NULL, 0);
+    XtAddCallback(mouseDelay->scroller, XtNjumpProc, ScaleJumpCallback,
+		  (XtPointer)mouseDelay);
+    mouseDelay->min = .1;
+    mouseDelay->max = MAX_MOUSE_DELAY;
+    mouseDelay->resolution = .1;
+    mouseDelay->integer = False;
+
+    repeat = XtVaCreateManagedWidget("repeatKeys", toggleWidgetClass, form,
+				     XtNstate,
+				    (xkb_info->xkb->ctrls->enabled_ctrls &
+				     XkbRepeatKeysMask) != 0, NULL, 0);
+    repeatForm = XtCreateManagedWidget("repeatForm", formWidgetClass,
+				       form, NULL, 0);
+    XtAddCallback(repeat, XtNcallback, EnableCallback, (XtPointer)repeatForm);
+    repeatRate = XtNew(Scale);
+    repeatRate->label = XtCreateManagedWidget("rateLabel", labelWidgetClass,
+					      repeatForm, NULL, 0);
+    repeatRate->number = XtCreateManagedWidget("rateNumber", labelWidgetClass,
+					       repeatForm, NULL, 0);
+    repeatRate->scroller = XtCreateManagedWidget("rateScroller",
+						 scrollbarWidgetClass,
+						 repeatForm, NULL, 0);
+    XtAddCallback(repeatRate->scroller, XtNjumpProc, ScaleJumpCallback,
+		  (XtPointer)repeatRate);
+    repeatRate->min = .05;
+    repeatRate->max = MAX_REPEAT_RATE;
+    repeatRate->resolution = .05;
+    repeatRate->integer = False;
+    repeatDelay = XtNew(Scale);
+    repeatDelay->label = XtCreateManagedWidget("delayLabel", labelWidgetClass,
+					      repeatForm, NULL, 0);
+    repeatDelay->number = XtCreateManagedWidget("delayNumber", labelWidgetClass,
+					       repeatForm, NULL, 0);
+    repeatDelay->scroller = XtCreateManagedWidget("delayScroller",
+						 scrollbarWidgetClass,
+						 repeatForm, NULL, 0);
+    XtAddCallback(repeatDelay->scroller, XtNjumpProc, ScaleJumpCallback,
+		  (XtPointer)repeatDelay);
+    repeatDelay->min = .05;
+    repeatDelay->max = MAX_REPEAT_DELAY;
+    repeatDelay->resolution = .05;
+    repeatDelay->integer = False;
+
+    slowToggle = XtVaCreateManagedWidget("slow", toggleWidgetClass,
+					 form, XtNstate,
+					 (xkb_info->xkb->ctrls->enabled_ctrls &
+					 XkbSlowKeysMask) != 0, NULL, 0);
+    slowForm = XtCreateManagedWidget("slowForm", formWidgetClass,
+				     form, NULL, 0);
+    XtAddCallback(slowToggle, XtNcallback, EnableCallback, (XtPointer)slowForm);
+    XtCreateManagedWidget("beep", labelWidgetClass, slowForm, NULL, 0);
+    slowPressed = XtVaCreateManagedWidget("pressed", toggleWidgetClass,
+					  slowForm, XtNstate,
+					  (xkb_info->xkb->ctrls->ax_options &
+					  XkbAX_SKPressFBMask) != 0,
+					  NULL, 0);
+    slowAccepted = XtVaCreateManagedWidget("accepted", toggleWidgetClass,
+					   slowForm, XtNstate,
+					   (xkb_info->xkb->ctrls->ax_options &
+					   XkbAX_SKAcceptFBMask) != 0,
+					   NULL, 0);
+    slow = XtNew(Scale);
+    slow->label = XtCreateManagedWidget("slowLabel", labelWidgetClass,
+					slowForm, NULL, 0);
+    slow->number = XtCreateManagedWidget("slowNumber", labelWidgetClass,
+					  slowForm, NULL, 0);
+    slow->scroller = XtCreateManagedWidget("slowScroller",
+					   scrollbarWidgetClass,
+					   slowForm, NULL, 0);
+    XtAddCallback(slow->scroller, XtNjumpProc, ScaleJumpCallback,
+		  (XtPointer)slow);
+    slow->min = 0.1;
+    slow->max = MAX_SLOW_TIME;
+    slow->resolution = 0.1;
+    slow->integer = False;
+
+    bounceToggle = XtVaCreateManagedWidget("bounce", toggleWidgetClass,
+					   form, XtNstate,
+					   (xkb_info->xkb->ctrls->enabled_ctrls &
+					   XkbBounceKeysMask) != 0,
+					   NULL, 0);
+    bounceForm = XtCreateManagedWidget("bounceForm", formWidgetClass,
+				     form, NULL, 0);
+    XtAddCallback(bounceToggle, XtNcallback, EnableCallback, (XtPointer)bounceForm);
+    bounce = XtNew(Scale);
+    bounce->label = XtCreateManagedWidget("bounceLabel", labelWidgetClass,
+					bounceForm, NULL, 0);
+    bounce->number = XtCreateManagedWidget("bounceNumber", labelWidgetClass,
+					  bounceForm, NULL, 0);
+    bounce->scroller = XtCreateManagedWidget("bounceScroller",
+					   scrollbarWidgetClass,
+					   bounceForm, NULL, 0);
+    XtAddCallback(bounce->scroller, XtNjumpProc, ScaleJumpCallback,
+		  (XtPointer)bounce);
+    bounce->min = 0.1;
+    bounce->max = MAX_BOUNCE_TIME;
+    bounce->resolution = 0.1;
+    bounce->integer = False;
+
+    XtRealizeWidget(accessx);
+
+    XtSetArg(args[0], XtNstate, &state);
+    XtGetValues(timeoutToggle, args, 1);
+    ScaleEnableCallback(enable, (XtPointer)timeout, (XtPointer)(int)state);
+    if (xkb_info->xkb->ctrls->ax_timeout > 60)
+	val = (float)(xkb_info->xkb->ctrls->ax_timeout - 60) /
+	      (float)(MAX_TIMEOUT * 60);
+    else
+	val = 0;
+    ScaleJumpCallback(timeout->scroller, (XtPointer)timeout, (XtPointer)&val);
+
+    XtSetArg(args[0], XtNstate, &state);
+    XtGetValues(sticky, args, 1);
+    EnableCallback(sticky, (XtPointer)stickyForm, (XtPointer)(int)state);
+
+    XtSetArg(args[0], XtNstate, &state);
+    XtGetValues(mouse, args, 1);
+    EnableCallback(mouse, (XtPointer)mouseForm, (XtPointer)(int)state);
+    if (xkb_info->xkb->ctrls->mk_interval > 10)
+	val = (float)(xkb_info->xkb->ctrls->mk_interval - 10) /
+	      (float)MAX_MOUSE_SPEED;
+    else
+	val = 10.0 / (float)MAX_MOUSE_SPEED;
+    ScaleJumpCallback(mouseSpeed->scroller, (XtPointer)mouseSpeed,
+		      (XtPointer)&val);
+    if (xkb_info->xkb->ctrls->mk_time_to_max > 10)
+	val = (float)(xkb_info->xkb->ctrls->mk_time_to_max - 10) /
+	      (float)(MAX_MOUSE_TIME * 100);
+    else
+	val = 10.0 / (float)(MAX_MOUSE_TIME * 100);
+    ScaleJumpCallback(mouseTime->scroller, (XtPointer)mouseTime,
+		      (XtPointer)&val);
+    if (xkb_info->xkb->ctrls->mk_delay > 10)
+	val = (float)(xkb_info->xkb->ctrls->mk_delay - 10) /
+	      (float)(MAX_MOUSE_DELAY * 100);
+    else
+	val = 10.0 / (float)(MAX_MOUSE_DELAY * 100);
+    ScaleJumpCallback(mouseDelay->scroller, (XtPointer)mouseDelay,
+		      (XtPointer)&val);
+
+    XtSetArg(args[0], XtNstate, &state);
+    XtGetValues(repeat, args, 1);
+    EnableCallback(repeat, (XtPointer)repeatForm, (XtPointer)(int)state);
+    if (xkb_info->xkb->ctrls->repeat_interval > 5)
+	val = (float)(xkb_info->xkb->ctrls->repeat_interval - 5) /
+	      (float)(MAX_REPEAT_RATE * 1000);
+    else
+	val = 5.0 / (float)(MAX_REPEAT_RATE * 1000);
+    ScaleJumpCallback(repeatRate->scroller, (XtPointer)repeatRate,
+		      (XtPointer)&val);
+    if (xkb_info->xkb->ctrls->repeat_delay > 5)
+	val = (float)(xkb_info->xkb->ctrls->repeat_delay - 5) /
+	      (float)(MAX_REPEAT_DELAY * 1000);
+    else
+	val = 5.0 / (float)(MAX_REPEAT_DELAY * 1000);
+    ScaleJumpCallback(repeatDelay->scroller, (XtPointer)repeatDelay,
+		      (XtPointer)&val);
+
+    XtSetArg(args[0], XtNstate, &state);
+    XtGetValues(slowToggle, args, 1);
+    EnableCallback(slowToggle, (XtPointer)slowForm, (XtPointer)(int)state);
+    if (xkb_info->xkb->ctrls->slow_keys_delay > 10)
+	val = (float)(xkb_info->xkb->ctrls->repeat_delay - 10) /
+	      (float)(MAX_SLOW_TIME * 1000);
+    else
+	val = 10.0 / (float)(MAX_SLOW_TIME * 1000);
+    ScaleJumpCallback(slow->scroller, (XtPointer)slow, (XtPointer)&val);
+
+    XtSetArg(args[0], XtNstate, &state);
+    XtGetValues(bounceToggle, args, 1);
+    EnableCallback(bounceToggle, (XtPointer)bounceForm, (XtPointer)(int)state);
+    if (xkb_info->xkb->ctrls->debounce_delay > 10)
+	val = (float)(xkb_info->xkb->ctrls->debounce_delay - 10) /
+	      (float)(MAX_BOUNCE_TIME * 1000);
+    else
+	val = 10.0 / (float)(MAX_BOUNCE_TIME * 1000);
+    ScaleJumpCallback(bounce->scroller, (XtPointer)bounce, (XtPointer)&val);
+
+    XtSetArg(args[0], XtNstate, &state);
+    XtGetValues(enable, args, 1);
+    EnableCallback(enable, (XtPointer)form, (XtPointer)(int)state);
+}
+
+void
+AccessXConfigureStart(void)
+{
+    AccessXInitialize();
+
+    XtMapWidget(accessx);
+}
+
+void
+AccessXConfigureEnd(void)
+{
+    XtUnmapWidget(accessx);
+}
+
+/*ARGSUSED*/
+static void
+EnableCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XtSetSensitive((XtPointer)user_data, (int)call_data);
+}
+
+/*ARGSUSED*/
+static void
+ScaleEnableCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Scale *scale = (Scale*)user_data;
+
+    XtSetSensitive(scale->label, (int)call_data);
+    XtSetSensitive(scale->number, (int)call_data);
+    XtSetSensitive(scale->scroller, (int)call_data);
+}
+
+static void
+ScaleJumpCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Scale *scale = (Scale*)user_data;
+    float percent = *(float *)call_data, timeout = percent * scale->max;
+    int x;
+    char str[8];
+    Arg args[1];
+
+    if (timeout >= scale->max - scale->min)
+	timeout = scale->max - scale->min;
+
+    if (scale->integer) {
+	int tm = timeout + scale->min;
+
+	tm -= tm % (int)scale->resolution;
+	XmuSnprintf(str, sizeof(str), "%i", tm);
+	scale->value = tm;
+    }
+    else {
+	long tm = (timeout + scale->min) * 1e+6;
+
+	tm -= tm % (long)(scale->resolution * 1e+6);
+	scale->value = (double)tm / 1e+6;
+	XmuSnprintf(str, sizeof(str), "%f", scale->value);
+    }
+
+    XtSetArg(args[0], XtNlabel, str);
+    XtSetValues(scale->number, args, 1);
+    x = w->core.x + w->core.border_width;
+    x += ((double)(w->core.width - scale->number->core.width) / scale->max) * timeout;
+    XtMoveWidget(scale->number, x, scale->number->core.y);
+    XawScrollbarSetThumb(w, timeout / (scale->max - scale->min),
+			 scale->resolution / (scale->max - scale->min));
+}
+
+/*ARGSUSED*/
+static void
+ApplyCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+    Boolean state;
+
+    XkbGetControls(DPY, XkbAllControlsMask, xkb_info->xkb);
+
+    /* Enable AccessX */
+    XtSetArg(args[0], XtNstate, &state);
+    XtGetValues(enable, args, 1);
+    if (state) {
+	xkb_info->xkb->ctrls->enabled_ctrls |= XkbAccessXKeysMask;
+	xkb_info->config.initial_ctrls |= XkbAccessXKeysMask;
+
+	/* Timeout */
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(timeoutToggle, args, 1);
+	if (state)
+	    xkb_info->config.ax_timeout =
+	    xkb_info->xkb->ctrls->ax_timeout = timeout->value * 60;
+	else
+	    xkb_info->config.ax_timeout =
+	    xkb_info->xkb->ctrls->ax_timeout = 65535;
+
+	/* Enable StickyKeys */
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(sticky, args, 1);
+	if (state) {
+	    xkb_info->config.initial_ctrls |= XkbStickyKeysMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls |= XkbStickyKeysMask;
+	}
+	else {
+	    xkb_info->config.initial_ctrls &= ~XkbStickyKeysMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbStickyKeysMask;
+	}
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(stickyAuto, args, 1);
+	if (state) {
+	    xkb_info->config.initial_opts &= ~XkbAX_TwoKeysMask;
+	    xkb_info->config.initial_opts &= ~XkbAX_LatchToLockMask;
+	    xkb_info->xkb->ctrls->ax_options &= ~XkbAX_TwoKeysMask;
+	    xkb_info->xkb->ctrls->ax_options &= ~XkbAX_LatchToLockMask;
+	}
+	else {
+	    xkb_info->config.initial_opts &= ~XkbAX_TwoKeysMask;
+	    xkb_info->config.initial_opts |= XkbAX_LatchToLockMask;
+	    xkb_info->xkb->ctrls->ax_options &= ~XkbAX_TwoKeysMask;
+	    xkb_info->xkb->ctrls->ax_options |= XkbAX_LatchToLockMask;
+	}
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(stickyBeep, args, 1);
+	if (state) {
+	    xkb_info->config.initial_opts |= XkbAX_StickyKeysFBMask;
+	    xkb_info->xkb->ctrls->ax_options |= XkbAX_StickyKeysFBMask;
+	}
+	else {
+	    xkb_info->config.initial_opts &= ~XkbAX_StickyKeysFBMask;
+	    xkb_info->xkb->ctrls->ax_options &= ~XkbAX_StickyKeysFBMask;
+	}
+
+	/* Enable MouseKeys */
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(mouse, args, 1);
+	if (state) {
+	    xkb_info->config.initial_ctrls |=  XkbMouseKeysMask |
+						  XkbMouseKeysAccelMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls |= XkbMouseKeysMask |
+						   XkbMouseKeysAccelMask;
+	    xkb_info->config.mk_delay =
+	    xkb_info->xkb->ctrls->mk_delay = mouseDelay->value * 100;
+	    xkb_info->config.mk_interval =
+	    xkb_info->xkb->ctrls->mk_interval = mouseSpeed->value;
+	    xkb_info->config.mk_time_to_max =
+	    xkb_info->xkb->ctrls->mk_time_to_max = mouseTime->value * 100;
+/*	    xkb_info->xkb->ctrls->mk_max_speed = 500;
+	    xkb_info->xkb->ctrls->mk_curve = 0;*/
+	}
+	else {
+	    xkb_info->config.initial_ctrls &= ~(XkbMouseKeysMask |
+						   XkbMouseKeysAccelMask);
+	    xkb_info->xkb->ctrls->enabled_ctrls &= ~(XkbMouseKeysMask |
+						     XkbMouseKeysAccelMask);
+	}
+
+	/* Enable RepeatKeys */
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(repeat, args, 1);
+	if (state) {
+	    xkb_info->config.initial_ctrls |= XkbRepeatKeysMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls |= XkbRepeatKeysMask;
+	    xkb_info->config.repeat_interval =
+	    xkb_info->xkb->ctrls->repeat_interval = repeatRate->value * 1000;
+	    xkb_info->config.repeat_delay =
+	    xkb_info->xkb->ctrls->repeat_delay = repeatDelay->value * 1000;
+	}
+	else {
+	    xkb_info->config.initial_ctrls &= ~XkbRepeatKeysMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbRepeatKeysMask;
+	}
+
+	/* Enable SlowKeys */
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(slowToggle, args, 1);
+	if (state) {
+	    xkb_info->config.initial_ctrls |= XkbSlowKeysMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls |= XkbSlowKeysMask;
+	    xkb_info->config.slow_keys_delay =
+	    xkb_info->xkb->ctrls->slow_keys_delay = slow->value * 1000;
+	}
+	else {
+	    xkb_info->config.initial_ctrls &= ~XkbSlowKeysMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbSlowKeysMask;
+	}
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(slowPressed, args, 1);
+	if (state) {
+	    xkb_info->config.initial_opts |= XkbAX_SKPressFBMask;
+	    xkb_info->xkb->ctrls->ax_options |= XkbAX_SKPressFBMask;
+	}
+	else {
+	    xkb_info->config.initial_opts &= ~XkbAX_SKPressFBMask;
+	    xkb_info->xkb->ctrls->ax_options &= ~XkbAX_SKPressFBMask;
+	}
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(slowAccepted, args, 1);
+	if (state) {
+	    xkb_info->config.initial_opts |= XkbAX_SKAcceptFBMask;
+	    xkb_info->xkb->ctrls->ax_options |= XkbAX_SKAcceptFBMask;
+	}
+	else {
+	    xkb_info->config.initial_opts &= ~XkbAX_SKAcceptFBMask;
+	    xkb_info->xkb->ctrls->ax_options &= ~XkbAX_SKAcceptFBMask;
+	}
+
+	/* Enable BounceKeys */
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(bounceToggle, args, 1);
+	if (state) {
+	    xkb_info->config.initial_ctrls |= XkbBounceKeysMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls |= XkbBounceKeysMask;
+	    xkb_info->config.debounce_delay =
+	    xkb_info->xkb->ctrls->debounce_delay = bounce->value * 1000;
+	}
+	else {
+	    xkb_info->config.initial_ctrls &= ~XkbBounceKeysMask;
+	    xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbBounceKeysMask;
+	}
+    }
+    else {
+	xkb_info->config.initial_ctrls &=
+	~(XkbAccessXKeysMask | XkbStickyKeysMask | XkbMouseKeysMask |
+	  XkbMouseKeysAccelMask | XkbRepeatKeysMask | XkbSlowKeysMask |
+	  XkbBounceKeysMask);
+	xkb_info->config.initial_opts &=
+	~(XkbAX_TwoKeysMask | XkbAX_LatchToLockMask | XkbAX_StickyKeysFBMask |
+	  XkbAX_SKPressFBMask | XkbAX_SKAcceptFBMask);
+
+	xkb_info->xkb->ctrls->enabled_ctrls &=
+	~(XkbAccessXKeysMask | XkbStickyKeysMask | XkbMouseKeysMask |
+	  XkbMouseKeysAccelMask | XkbRepeatKeysMask | XkbSlowKeysMask |
+	  XkbBounceKeysMask);
+	xkb_info->xkb->ctrls->ax_options &=
+	~(XkbAX_TwoKeysMask | XkbAX_LatchToLockMask | XkbAX_StickyKeysFBMask |
+	  XkbAX_SKPressFBMask | XkbAX_SKAcceptFBMask);
+    }
+
+    XkbSetControls(DPY, XkbAllControlsMask, xkb_info->xkb);
+    XSync(DPY, False);
+    UpdateKeyboard(True);
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c	Tue Jun 13 16:15:51 2000
@@ -0,0 +1,316 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.2 2000/06/13 23:15:51 dawes Exp $
+ */
+
+#include "xf86config.h"
+#include "mouse-cfg.h"
+#include "cards.h"
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Label.h>
+#include <X11/Xaw/List.h>
+#include <X11/Xaw/Viewport.h>
+
+/*
+ * Prototypes
+ */
+static Bool CardConfigCheck(void);
+static void CardModelCallback(Widget, XtPointer, XtPointer);
+
+/*
+ * Initialization
+ */
+static CardsEntry *card_entry;
+static XF86ConfDevicePtr current_device;
+static Widget filter, list, busid;
+static char **cards = NULL;
+static int ncards;
+
+
+/*
+ * Implementation
+ */
+/*ARGSUSED*/
+XtPointer
+CardConfig(XtPointer config)
+{
+    XF86ConfDevicePtr card = (XF86ConfDevicePtr)config;
+/*    XF86OptionPtr option;*/
+    char card_name[32];
+    Arg args[1];
+    char *bus;
+
+    xf86info.cur_list = CARD;
+    XtSetSensitive(back, xf86info.lists[CARD].cur_function > 0);
+    XtSetSensitive(next, xf86info.lists[CARD].cur_function <
+			 xf86info.lists[CARD].num_functions - 1);
+    (xf86info.lists[CARD].functions[xf86info.lists[CARD].cur_function])
+	(&xf86info);
+
+    card_entry = NULL;
+    current_device = card;
+    XawListUnhighlight(list);
+    XtSetArg(args[0], XtNstring, "");
+    XtSetValues(filter, args, 1);
+
+    if (card != NULL) {
+	if (card->dev_card != NULL) {
+	    int i;
+
+	    for (i = 0; i < ncards; i++) {
+		if (strcasecmp(cards[i], card->dev_card) == 0) {
+		    card_entry = LookupCard(cards[i]);
+		    XawListHighlight(list, i);
+		    XtSetArg(args[0], XtNstring, cards[i]);
+		    XtSetValues(filter, args, 1);
+		    break;
+		}
+	    }
+	}
+	XtSetArg(args[0], XtNstring, card->dev_identifier);
+	XtSetValues(ident_widget, args, 1);
+	XtSetArg(args[0], XtNstring, card->dev_busid);
+	XtSetValues(busid, args, 1);
+    }
+    else {
+	XF86ConfDevicePtr device = XF86Config->conf_device_lst;
+	int ndevices = 0;
+
+	while (device != NULL) {
+	    ++ndevices;
+	    device = (XF86ConfDevicePtr)(device->list.next);
+	}
+	do {
+	    ++ndevices;
+	    XmuSnprintf(card_name, sizeof(card_name), "Card%d", ndevices);
+	} while (xf86FindDevice(card_name,
+		 XF86Config->conf_device_lst));
+
+	XtSetArg(args[0], XtNstring, card_name);
+	XtSetValues(ident_widget, args, 1);
+	XtSetArg(args[0], XtNstring, "");
+	XtSetValues(busid, args, 1);
+    }
+
+    if (ConfigLoop(CardConfigCheck) == True) {
+	if (card_entry != NULL && card_entry->driver == NULL) {
+	    fprintf(stderr, "No driver field in Cards database.\n"
+		    "Please make sure you have the correct files installed.\n");
+	    exit(1);
+	}
+	if (card == NULL) {
+	    card = (XF86ConfDevicePtr)XtCalloc(1, sizeof(XF86ConfDeviceRec));
+	    card->dev_identifier = XtNewString(ident_string);
+	    card->dev_driver = XtNewString(card_entry->driver);
+	    card->dev_card = XtNewString(card_entry->name);
+	    if (card_entry->chipset)
+		card->dev_chipset = XtNewString(card_entry->chipset);
+	    if (card_entry->ramdac)
+		card->dev_ramdac = XtNewString(card_entry->ramdac);
+	    if (card_entry->clockchip)
+		card->dev_clockchip = XtNewString(card_entry->clockchip);
+	}
+	else if (card_entry != NULL) {
+	    XtFree(card->dev_driver);
+	    card->dev_driver = XtNewString(card_entry->driver);
+	    if (card_entry->chipset) {
+		XtFree(card->dev_chipset);
+		card->dev_chipset = XtNewString(card_entry->chipset);
+	    }
+	    if (card_entry->ramdac) {
+		XtFree(card->dev_ramdac);
+		card->dev_ramdac = XtNewString(card_entry->ramdac);
+	    }
+	    if (card_entry->clockchip) {
+		XtFree(card->dev_clockchip);
+		card->dev_clockchip = XtNewString(card_entry->clockchip);
+	    }
+	}
+	if (strcasecmp(card->dev_identifier, ident_string))
+	    xf86RenameDevice(XF86Config, card, ident_string);
+	XtSetArg(args[0], XtNstring, &bus);
+	XtGetValues(busid, args, 1);
+	XtFree(card->dev_busid);
+	card->dev_busid = XtNewString(bus);
+
+	return ((XtPointer)card);
+    }
+
+    return (NULL);
+}
+
+static Bool
+CardConfigCheck(void)
+{
+    XF86ConfDevicePtr device = XF86Config->conf_device_lst;
+
+    if (ident_string == NULL || strlen(ident_string) == 0 ||
+	(current_device == NULL && card_entry == NULL))
+	return (False);
+
+    while (device != NULL) {
+	if (device != current_device &&
+	    strcasecmp(ident_string, device->dev_identifier) == 0)
+	    return (False);
+	device = (XF86ConfDevicePtr)(device->list.next);
+    }
+
+    return (True);
+}
+
+static void
+CardModelCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+    XawListReturnStruct *info = (XawListReturnStruct *)call_data;
+    char tip[4096], *str;
+    int len;
+    static int first = 1;
+
+    XtSetArg(args[0], XtNstring, info->string);
+    XtSetValues(filter, args, 1);
+    card_entry = LookupCard(info->string);
+
+    len = XmuSnprintf(tip, sizeof(tip), "Name:      %s\n", card_entry->name);
+    if (card_entry->flags & F_UNSUPPORTED)
+	len += XmuSnprintf(tip + len, sizeof(tip) - len,
+			   "**THIS CARD IS UNSUPPORTED**\n");
+    if (card_entry->chipset != NULL)
+	len += XmuSnprintf(tip + len, sizeof(tip) - len,
+			   "Chipset:   %s\n", card_entry->chipset);
+    if (card_entry->driver != NULL)
+	len += XmuSnprintf(tip + len, sizeof(tip) - len,
+			   "Driver:    %s\n", card_entry->driver);
+    if (card_entry->ramdac != NULL)
+	len += XmuSnprintf(tip + len, sizeof(tip),
+			   "Ramdac:    %s\n", card_entry->ramdac);
+    if (card_entry->clockchip != NULL)
+	len += XmuSnprintf(tip + len, sizeof(tip) - len,
+			   "Clockchip: %s\n", card_entry->clockchip);
+    if (card_entry->dacspeed != NULL)
+	len += XmuSnprintf(tip + len, sizeof(tip) - len,
+			   "Dacspeed:  %s\n", card_entry->dacspeed);
+    if (card_entry->lines != NULL)
+	len += XmuSnprintf(tip + len, sizeof(tip) - len,
+			   "\n%s\n", card_entry->lines);
+
+    /* the first tip memory, if any, cannot be released */
+    if (!first) {
+	XtSetArg(args[0], XtNtip, &str);
+	XtGetValues(filter, args, 1);
+	XtFree(str);
+    }
+    else
+	first = 0;
+
+    str = XtNewString(tip);
+    XtSetArg(args[0], XtNtip, str);
+    XtSetValues(filter, args, 1);
+}
+
+/*ARGSUSED*/
+void
+CardFilterAction(Widget w, XEvent *ev, String *params, Cardinal *num_params)
+{
+    char **cards, *pattern, **old_cards;
+    int ncards, old_ncards;
+    Arg args[2];
+
+    XtSetArg(args[0], XtNstring, &pattern);
+    XtGetValues(w, args, 1);
+
+    XtSetArg(args[0], XtNlist, &old_cards);
+    XtSetArg(args[1], XtNnumberStrings, &old_ncards);
+    XtGetValues(list, args, 2);
+
+    cards = FilterCardNames(pattern, &ncards);
+
+    if (ncards == 0) {
+	cards = (char**)XtMalloc(sizeof(char*));
+	cards[0] = XtNewString("");
+	ncards = 1;
+    }
+
+    XtSetArg(args[0], XtNlist, cards);
+    XtSetArg(args[1], XtNnumberStrings, ncards);
+    XtSetValues(list, args, 2);
+
+    if (old_ncards > 1 || (XtName(list) != old_cards[0])) {
+	while (--old_ncards > -1)
+	    XtFree(old_cards[old_ncards]);
+	XtFree((char*)old_cards);
+    }
+
+    /* force relayout */
+    XtUnmanageChild(list);
+    XtManageChild(list);
+}
+
+void
+CardModel(XF86SetupInfo *info)
+{
+    static int first = 1;
+    static Widget model;
+
+    if (first) {
+	Widget label, viewport;
+
+	first = 0;
+
+	cards = GetCardNames(&ncards);
+
+	model = XtCreateWidget("cardModel", formWidgetClass,
+			       configp, NULL, 0);
+	label = XtCreateManagedWidget("label", labelWidgetClass,
+				      model, NULL, 0);
+	filter = XtVaCreateManagedWidget("filter", asciiTextWidgetClass,
+					 model,
+					 XtNeditType, XawtextEdit,
+					 NULL, 0);
+	viewport = XtCreateManagedWidget("viewport", viewportWidgetClass,
+					 model, NULL, 0);
+	list = XtVaCreateManagedWidget("list", listWidgetClass,
+				       viewport,
+				       XtNlist, cards,
+				       XtNnumberStrings, ncards,
+				       NULL, 0);
+	XtAddCallback(list, XtNcallback, CardModelCallback,
+		      (XtPointer)info);
+	XtCreateManagedWidget("busidL", labelWidgetClass, model, NULL, 0);
+	busid = XtVaCreateManagedWidget("busid", asciiTextWidgetClass,
+					 model,
+					 XtNeditType, XawtextEdit,
+					 NULL, 0);
+
+	XtRealizeWidget(model);
+    }
+    XtChangeManagedSet(&current, 1, NULL, NULL, &model, 1);
+    current = model;
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h	Tue Apr  4 15:36:57 2000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ */
+
+#include "config.h"
+
+#ifndef _xf86cfg_card_h
+#define _xf86cfg_card_h
+
+/*
+ * Prototypes
+ */
+XtPointer CardConfig(XtPointer);
+void CardModel(XF86SetupInfo*);
+void CardFilterAction(Widget, XEvent*, String*, Cardinal*);
+
+#endif /* _xf86cfg_card_h */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm	Tue Apr  4 15:36:57 2000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ */
+#define card_width 50
+#define card_height 44
+static unsigned char card_bits[] = {
+  0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfd, 0xff, 0xff, 0xff, 0x07,
+  0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x80, 0x07, 0x00, 0x00,
+  0x00, 0x1c, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x80, 0x01,
+  0x00, 0x00, 0xf8, 0x19, 0x00, 0x80, 0xf9, 0x00, 0x00, 0xf8, 0x19, 0x00,
+  0x80, 0xf9, 0xf8, 0x7f, 0x98, 0x19, 0x00, 0x80, 0x01, 0xf8, 0x7f, 0x98,
+  0x19, 0x00, 0x80, 0x01, 0x18, 0x60, 0xf8, 0x19, 0x00, 0x80, 0xf9, 0x18,
+  0x60, 0xf8, 0x19, 0x00, 0x80, 0xf9, 0x18, 0x60, 0x00, 0x18, 0x00, 0x80,
+  0x01, 0x18, 0x60, 0xf8, 0x19, 0x00, 0x80, 0x01, 0x18, 0x60, 0xf8, 0x19,
+  0x00, 0x80, 0xf9, 0x18, 0x60, 0x98, 0x19, 0x00, 0x80, 0xf9, 0x18, 0x60,
+  0x98, 0x19, 0x00, 0x80, 0x01, 0x18, 0x60, 0xf8, 0x19, 0x00, 0x80, 0x01,
+  0xf8, 0x7f, 0xf8, 0x19, 0x00, 0x80, 0xf9, 0xf8, 0x7f, 0x00, 0x18, 0x00,
+  0x80, 0xf9, 0x00, 0x00, 0xf8, 0x19, 0x00, 0x80, 0x01, 0x00, 0x00, 0xf8,
+  0x19, 0x00, 0x80, 0x01, 0x30, 0x33, 0x98, 0x19, 0x00, 0x80, 0xf9, 0x30,
+  0x33, 0x98, 0x19, 0x00, 0x80, 0xf9, 0x30, 0x33, 0xf8, 0x19, 0x00, 0x80,
+  0x01, 0x30, 0x33, 0xf8, 0x19, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x18,
+  0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x80, 0xff, 0x07, 0x00,
+  0x80, 0x0f, 0x00, 0x80, 0xfd, 0x0f, 0x00, 0xc0, 0x07, 0x00, 0x80, 0x01,
+  0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x80, 0x01, 0xcc, 0xcc, 0xcc, 0x00, 0x00,
+  0x80, 0x01, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x80, 0x01, 0xcc, 0xcc, 0xcc,
+  0x00, 0x00, 0x80, 0x01, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x80, 0x01, 0xf8,
+  0xff, 0x7f, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm	Tue Apr  4 15:36:57 2000
@@ -0,0 +1,81 @@
+/* XPM */
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ */
+static char * card_xpm[] = {
+"41 40 8 1",
+" 	c none",
+"A 	c #B6DABAEAB6DA",
+"X	c #0000AAAA0000",
+"o	c #000071C60000",
+"O	c #000041030000",
+"+	c #618561856185",
+"@	c #186118611861",
+"#	c #CF3CA2892081",
+"AAA                                      ",
+"   A                                     ",
+"   A                                     ",
+"   A                                     ",
+"   A                                     ",
+"   A                                     ",
+"   A                                     ",
+"   AXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ",
+"   AooooooooooooooooooooooooooooooooooooO",
+"   AooooooooooooooooooooooooooooooooooooO",
+"   AooooooooooooooooooooooooooooooooooooO",
+"   AooooooooooooooooooooooooOOOOOOOOOOOOO",
+"   AooooooooooooooooooAoAoAoAooAAAAAAA+oO",
+"   AooooooooooooooooooAoAoAoAooA++++++@oO",
+"   AooooooooooooooooooAoAoAoAooA+oooo+@oO",
+"   AoooooooooooooooooooooooooooA+AAAA+@oO",
+"   AoooooooooooooooooooooooooooA+oooo+@oO",
+"   AoooooooooooooooooooooooooooA++++++@oO",
+"   Aooooooooooooooooooooooooooo+@@@@@@@oO",
+"   AooooooooooooooooooooooooooooooooooooO",
+"   AoooooooooooooooooooooooooooAAAAAAA+oO",
+"  +AoooooooooooooooooAAAAAAAA@oA++++++@oO",
+"   AoooooooooooooooooA+++++++@oA+oooo+@oO",
+"   AoooooooooooooooooA+++++++@oA+AAAA+@oO",
+" ++AoooooooooooooooooA+++++++@oA+oooo+@oO",
+" ++AoooooooooooooooooA+++++++@oA++++++@oO",
+" ++Aooooooooooooooooo@@@@@@@@@o+@@@@@@@oO",
+" ++AooooooooooooooooooooooooooooooooooooO",
+"   AooooooooooooooooooooooooooooooooooooO",
+"   AooooooooooooooooooooooooooooooooooooO",
+"  +AooooooooooooooooooooooooooooooooooooO",
+"   AooooooooooooooooooooooooooooooooooooO",
+"   AoooOOOOooooooooooooooooooooOoooooOOO ",
+"   AooO    X#o#o#o#o#o#o#o#o#oO X#o#O    ",
+"   AOO     X#o#o#o#o#o#o#o#o#oO X#o#O    ",
+"   A       X#o#o#o#o#o#o#o#o#oO X#o#O    ",
+"   A       X#o#o#o#o#o#o#o#o#oO X#o#O    ",
+"   A        OOOOOOOOOOOOOOOOOO   OOO     ",
+"   A                                     ",
+"   A                                     "};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c	Tue Apr  4 15:36:57 2000
@@ -0,0 +1,462 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ */
+
+#include "cards.h"
+
+/* return values from ReadCardsLine. */
+#define ERROR		-3
+#define UNKNOWN		-2
+#define END		-1
+#define	NOTUSEFUL	0
+#define	NAME		1
+#define	CHIPSET		2
+#define	SERVER		3
+#define	DRIVER		4
+#define	RAMDAC		5
+#define	CLOCKCHIP	6
+#define	DACSPEED	7
+#define	NOCLOCKPROBE	8
+#define	UNSUPPORTED	9
+#define	SEE		10
+#define	LINE		11
+
+/*
+ * Prototypes
+ */
+static int ReadCardsLine(FILE*, char*);	/* must have 256 bytes */
+static int CompareCards(_Xconst void *left, _Xconst void *right);
+static int BCompareCards(_Xconst void *left, _Xconst void *right);
+
+/*
+ * Initialization
+ */
+static int linenum = 0;
+static char *Cards = "lib/X11/Cards";
+CardsEntry **CardsDB;
+int NumCardsEntry;
+
+/*
+ * Implementation
+ */
+void
+ReadCardsDatabase(void)
+{
+    char buffer[256];
+    FILE *fp = fopen(Cards, "r");
+    int i, result;
+    CardsEntry *entry = NULL;
+    static char *CardsError = "Error reading Cards database, at line %d (%s).\n";
+
+    if (fp == NULL) {
+	fprintf(stderr, "Cannot open Cards database.\n");
+	exit(1);
+    }
+
+    while ((result = ReadCardsLine(fp, buffer)) != END) {
+	switch (result) {
+	    case ERROR:
+		fprintf(stderr, CardsError, linenum, buffer);
+		break;
+	    case UNKNOWN:
+		fprintf(stderr,
+			"Unknown field type in Cards database, at line %d (%s).\n",
+			linenum, buffer);
+		break;
+	    case NAME:
+		entry = calloc(1, sizeof(CardsEntry));
+		if (NumCardsEntry % 16 == 0) {
+		    CardsDB = realloc(CardsDB, sizeof(CardsEntry*) *
+				      (NumCardsEntry + 16));
+		    if (CardsDB == NULL) {
+			fprintf(stderr, "Out of memory reading Cards database.\n");
+			exit(1);
+		    }
+		}
+		CardsDB[NumCardsEntry++] = entry;
+		entry->name = strdup(buffer);
+		break;
+	    case CHIPSET:
+		if (entry == NULL || entry->chipset != NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->chipset = strdup(buffer);
+		break;
+	    case SERVER:
+		if (entry == NULL || entry->server != NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->server = strdup(buffer);
+		break;
+	    case DRIVER:
+		if (entry == NULL || entry->driver != NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->driver = strdup(buffer);
+		break;
+	    case RAMDAC:
+		if (entry == NULL || entry->ramdac != NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->ramdac = strdup(buffer);
+		break;
+	    case CLOCKCHIP:
+		if (entry == NULL || entry->clockchip != NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->clockchip = strdup(buffer);
+		break;
+	    case DACSPEED:
+		if (entry == NULL || entry->dacspeed != NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->dacspeed = strdup(buffer);
+		break;
+	    case NOCLOCKPROBE:
+		if (entry == NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->flags |= F_NOCLOCKPROBE;
+		break;
+	    case UNSUPPORTED:
+		if (entry == NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->flags |= F_UNSUPPORTED;
+		break;
+	    case SEE:
+		if (entry == NULL || entry->see != NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else
+		    entry->see = strdup(buffer);
+		break;
+	    case LINE:
+		if (entry == NULL) {
+		    fprintf(stderr, CardsError, linenum, buffer);
+		}
+		else if (entry->lines == NULL)
+		    entry->lines = strdup(buffer);
+		else {
+		    char *str = malloc(strlen(entry->lines) + strlen(buffer) + 2);
+
+		    sprintf(str, "%s\n%s", entry->lines, buffer);
+		    free(entry->lines);
+		    entry->lines = str;
+		}
+		break;
+	}
+    }
+
+    fclose(fp);
+
+    qsort(CardsDB, NumCardsEntry, sizeof(CardsEntry*), CompareCards);
+
+#ifdef DEBUG
+    for (i = 0; i < NumCardsEntry - 1; i++) {
+	if (strcmp(CardsDB[i]->name, CardsDB[i+1]->name) == 0)
+	    fprintf(stderr, "Duplicate entry in Cards database: (%s).\n",
+		    CardsDB[i]->name);
+    }
+#endif
+
+    for (i = 0; i < NumCardsEntry - 1; i++) {
+	if (CardsDB[i]->see != NULL) {
+	    if ((entry = LookupCard(CardsDB[i]->see)) == NULL) {
+		fprintf(stderr, "Cannot find card '%s' for filling defaults.\n",
+			CardsDB[i]->see);
+		continue;
+	    }
+	    if (CardsDB[i]->chipset == NULL && entry->chipset != NULL)
+		CardsDB[i]->chipset = strdup(entry->chipset);
+	    if (CardsDB[i]->server == NULL && entry->server != NULL)
+		CardsDB[i]->server = strdup(entry->server);
+	    if (CardsDB[i]->driver == NULL && entry->driver != NULL)
+		CardsDB[i]->driver = strdup(entry->driver);
+	    if (CardsDB[i]->ramdac == NULL && entry->ramdac != NULL)
+		CardsDB[i]->ramdac = strdup(entry->ramdac);
+	    if (CardsDB[i]->clockchip == NULL && entry->clockchip != NULL)
+		CardsDB[i]->clockchip = strdup(entry->clockchip);
+	    if (CardsDB[i]->dacspeed == NULL && entry->dacspeed != NULL)
+		CardsDB[i]->dacspeed = strdup(entry->dacspeed);
+	    if (CardsDB[i]->flags & F_NOCLOCKPROBE)
+		CardsDB[i]->flags |= F_NOCLOCKPROBE;
+	    if (CardsDB[i]->flags & F_UNSUPPORTED)
+		CardsDB[i]->flags |= F_UNSUPPORTED;
+	    if (entry->lines != NULL) {
+		if (CardsDB[i]->lines == NULL)
+		    CardsDB[i]->lines = strdup(entry->lines);
+		else {
+		    char *str = malloc(strlen(entry->lines) +
+					      strlen(CardsDB[i]->lines) + 2);
+
+		    sprintf(str, "%s\n%s", CardsDB[i]->lines, entry->lines);
+		    free(CardsDB[i]->lines);
+		    CardsDB[i]->lines = str;
+		}
+	    }
+	    if (entry->see != NULL) {
+#ifdef DEBUG
+		fprintf(stderr, "Nested SEE entry: %s -> %s -> %s\n",
+			CardsDB[i]->name, CardsDB[i]->see, entry->see);
+#endif
+		CardsDB[i]->see = strdup(entry->see);
+		--i;
+		continue;
+	    }
+	    free(CardsDB[i]->see);
+	    CardsDB[i]->see = NULL;
+	}
+    }
+}
+
+CardsEntry *
+LookupCard(char *name)
+{
+    CardsEntry **ptr;
+
+    ptr = (CardsEntry**)bsearch(name, CardsDB, NumCardsEntry,
+				sizeof(CardsEntry*), BCompareCards);
+
+    return (ptr != NULL ? *ptr : NULL);
+}
+
+char **
+GetCardNames(int *result)
+{
+    char **cards = NULL;
+    int ncards;
+
+    for (ncards = 0; ncards < NumCardsEntry; ncards++) {
+	if (ncards % 16 == 0) {
+	    if ((cards = (char**)realloc(cards, sizeof(char*) *
+					 (ncards + 16))) == NULL) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(1);
+	    }
+	}
+	cards[ncards] = strdup(CardsDB[ncards]->name);
+    }
+
+    *result = ncards;
+
+    return (cards);
+}
+
+char **
+FilterCardNames(char *pattern, int *result)
+{
+    FILE *fp;
+    char **cards = NULL;
+    int len, ncards = 0;
+    char *cmd, *ptr, buffer[256];
+
+    cmd = malloc(32 + (strlen(pattern) * 2) + strlen(Cards));
+
+    strcpy(cmd, "egrep -i '^NAME\\ .*");
+    len = strlen(cmd);
+    ptr = pattern;
+    while (*ptr) {
+	if (!isalnum(*ptr)) {
+	    cmd[len++] = '\\';
+	}
+	cmd[len++] = *ptr++;
+    }
+    cmd[len] = '\0';
+    strcat(cmd, ".*$' ");
+    strcat(cmd, Cards);
+    strcat(cmd, " | sort");
+    /*sprintf(cmd, "egrep -i '^NAME\\ .*%s.*$' %s | sort", pattern, Cards);*/
+
+    if ((fp = popen(cmd, "r")) == NULL) {
+	fprintf(stderr, "Cannot read Cards database.\n");
+	exit(1);
+    }
+    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+	ptr = buffer + strlen(buffer) - 1;
+	while (isspace(*ptr) && ptr > buffer)
+	    --ptr;
+	if (!isspace(*ptr) && ptr > buffer)
+	    ptr[1] = '\0';
+	ptr = buffer;
+	while (!isspace(*ptr) && *ptr)	/* skip NAME */
+	    ++ptr;
+	while (isspace(*ptr) && *ptr)
+	    ++ptr;
+	if (ncards % 16 == 0) {
+	    if ((cards = (char**)realloc(cards, sizeof(char*) *
+					 (ncards + 16))) == NULL) {
+		fprintf(stderr, "Out of memory.\n");
+		exit(1);
+	    }
+	}
+	cards[ncards++] = strdup(ptr);
+    }
+    free(cmd);
+
+    *result = ncards;
+
+    return (cards);
+}
+
+static int
+ReadCardsLine(FILE *fp, char *value)
+{
+    char name[32], buffer[256], *ptr, *end;
+    int result = NOTUSEFUL;
+
+    ++linenum;
+
+    if (fgets(buffer, sizeof(buffer), fp) == NULL)
+	return (END);
+
+    ptr = buffer;
+    /* skip initial spaces; should'nt bother about this.. */
+    while (isspace(*ptr) && *ptr)
+	++ptr;
+
+    if (*ptr == '#' || *ptr == '\0')
+	return (NOTUSEFUL);
+
+    end = ptr;
+    while (!isspace(*end) && *end)
+	++end;
+    if (end - ptr > sizeof(buffer) - 1) {
+	strncpy(value, buffer, 255);
+	value[255] = '\0';
+	return (ERROR);
+    }
+    strncpy(name, ptr, end - ptr);
+    name[end - ptr] = '\0';
+
+    /* read the optional arguments */
+    ptr = end;
+    while (isspace(*ptr) && *ptr)
+	++ptr;
+
+    end = ptr + strlen(ptr) - 1;
+    while (isspace(*end) && end > ptr)
+	--end;
+    if (!isspace(*end))
+	++end;
+    *end = '\0';
+
+    if (strcmp(name, "NAME") == 0)
+	result = NAME;
+    else if (strcmp(name, "CHIPSET") == 0)
+	result = CHIPSET;
+    else if (strcmp(name, "SERVER") == 0)
+	result = SERVER;
+    else if (strcmp(name, "DRIVER") == 0)
+	result = DRIVER;
+    else if (strcmp(name, "RAMDAC") == 0)
+	result = RAMDAC;
+    else if (strcmp(name, "CLOCKCHIP") == 0)
+	result = CLOCKCHIP;
+    else if (strcmp(name, "DACSPEED") == 0)
+	result = DACSPEED;
+    else if (strcmp(name, "NOCLOCKPROBE") == 0)
+	result = NOCLOCKPROBE;
+    else if (strcmp(name, "UNSUPPORTED") == 0)
+	result = UNSUPPORTED;
+    else if (strcmp(name, "SEE") == 0)
+	result = SEE;
+    else if (strcmp(name, "LINE") == 0)
+	result = LINE;
+    else if (strcmp(name, "END") == 0)
+	result = END;
+    else {
+	strcpy(value, name);
+	return (UNKNOWN);
+    }
+
+    /* value *must* have at least 256 bytes */
+    strcpy(value, ptr);
+
+    return (result);
+}
+
+static int
+CompareCards(_Xconst void *left, _Xconst void *right)
+{
+    return strcmp((*(CardsEntry**)left)->name, (*(CardsEntry**)right)->name);
+}
+
+static int
+BCompareCards(_Xconst void *name, _Xconst void *card)
+{
+  return (strcmp((char*)name, (*(CardsEntry**)card)->name));
+}
+
+#ifdef TEST_CARDS
+int
+main(int argc, char *argv[])
+{
+    int i;
+
+    chdir("/usr/X11R6");
+    ReadCardsDatabase();
+
+    for (i = 0; i < NumCardsEntry; i++) {
+	CardsEntry *entry = CardsDB[i];
+
+	printf("name: %s\n", entry->name);
+	if (entry->chipset)
+	    printf("chipset: %s\n", entry->chipset);
+	if (entry->server)
+	    printf("server: %s\n", entry->server);
+	if (entry->driver)
+	    printf("driver: %s\n", entry->driver);
+	if (entry->ramdac)
+	    printf("%s\n", entry->ramdac);
+	if (entry->clockchip)
+	    printf("%s\n", entry->clockchip);
+	if (entry->dacspeed)
+	    printf("%s\n", entry->dacspeed);
+	if (entry->flags & F_NOCLOCKPROBE)
+	    printf("NOCLOCKPROBE\n");
+	if (entry->flags & F_UNSUPPORTED)
+	    printf("UNSUPPORTED\n");
+	if (entry->lines)
+	    printf("%s\n", entry->lines);
+	printf("\n");
+    }
+
+    return (0);
+}
+#endif /* TEST_CARDS */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h	Tue Apr  4 15:36:57 2000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <X11/Xfuncproto.h>
+
+#ifndef _xf86cfg_cards_h
+#define _xf86cfg_cards_h
+
+/* Flags in CardsEntry */
+#define F_NOCLOCKPROBE	0x1	/* Never probe clocks of the card. */
+#define F_UNSUPPORTED	0x2	/* Card is not supported (only VGA). */
+
+/*
+ * Types
+ */
+typedef struct {
+    char *name;		/* Name of the card. */
+    char *chipset;	/* Chipset (decriptive). */
+    char *server;	/* Server identifier. */
+    char *driver;	/* Driver identifier. */
+    char *ramdac;	/* Ramdac identifier. */
+    char *clockchip;	/* Clockchip identifier. */
+    char *dacspeed;	/* DAC speed rating. */
+    int flags;
+    char *lines;	/* Additional Device section lines. */
+    char *see;		/* Must resolve in a last step.
+			 * Allow more than one SEE entry? */
+} CardsEntry;
+
+extern CardsEntry **CardsDB;
+extern int NumCardsEntry;
+
+/*
+ * Prototypes
+ */
+void ReadCardsDatabase(void);
+CardsEntry *LookupCard(char*);
+char **GetCardNames(int*);
+char **FilterCardNames(char*, int*);
+
+#endif /* _xf86cfg_cards_h */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm	Tue Apr  4 15:36:58 2000
@@ -0,0 +1,91 @@
+/* XPM */
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm,v 1.1 2000/04/04 22:36:58 dawes Exp $
+ */
+static char * computer_xpm[] = {
+"30 50 8 1",
+" 	c none",
+".	c #CF3CCF3CCF3C",
+"X	c #B6DABAEAB6DA",
+"o	c #8E388E388E38",
+"O	c #FFFFFFFFFFFF",
+"+	c #FFFF00000000",
+"@	c #514451445144",
+"#	c #0000FFFF0000",
+" ............................ ",
+"..XXXXXXXXXXXXXXXXXXXXXXXXXXXo",
+".XXXXXXXXXXXXXXXXXXXXXXXXXXXXo",
+".XXooooooooooooooooooooooooXXo",
+".XXo.......................XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XX....XXXXXXXXXXXOoXo.XXo",
+".XXo.XXooooXXXXXXXXXXXooXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.......................XXo",
+".XXooooooooooooooooooooooooXXo",
+".XXo.......................XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXooooooooooooooooooooooo.XXo",
+".XXo.......................XXo",
+".XXoooooooooooooo.XXXXXXXo.XXo",
+".XXo..............XXXXXXXo.XXo",
+".XXo.XXXXXXXXXXXX.XX.O.XXo.XXo",
+".XXo.oooooooooooX.XXO+OXXo.XXo",
+".XXo.XXXXXXXXXOOX.XX.O.XXo.XXo",
+".XXo.XXXXXXXXXXXX.XXXXXXXo.XXo",
+".XXo..............XXXXXXXo.XXo",
+".XXooooooooooooooooooooooo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XXX@@@@@@@@@XXX...XXo.XXo",
+".XXo.XX@@+@@@@@#@@X.OXXoXo.XXo",
+".XXo.XXX@@@@@@@@@XXXoooXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XXXXXXXXXXXXXXX..XXXo.XXo",
+".XXo.XXXXXXXXXXXXXX.OXoXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXooXXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXo.XXXXXXXXXXXXXXXXXXXXo.XXo",
+".XXXo.XXXXXXXXXXXXXXXXXXo.XXXo",
+".XXXo.XXXXXXXXXXXXXXXXXXo.XXXo",
+".XXXo.XXXXXXXXXXXXXXXXXXo.XXXo",
+".XXXo.oXXXoXXXoXXXoXXXoXo.XXXo",
+".XXXXo.XXXXXXXXXXXXXXXXo.XXXXo",
+".XXXXo..oXXXoXXXoXXoXXoo.XXXXo",
+".XXXXXoo..XXXXXXXXXXoo..XXXXXo",
+".XXXXXXXoo......oooo..XXXXXXXo",
+".XXXXXXXXXoooooo....XXXXXXXXXo",
+".XXXXXXXXXXXXXXXXXXXXXXXXXXXXo",
+".XXXXXXXXXXXXXXXXXXXXXXXXXXXoo",
+" oooooooooooooooooooooooooooo "};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/config.c:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/config.c	Thu May 18 09:29:59 2000
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include "config.h"
+#include "mouse-cfg.h"
+#include "keyboard-cfg.h"
+#include "card-cfg.h"
+#include "monitor-cfg.h"
+#include "screen-cfg.h"
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Paned.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Label.h>
+#include <X11/Xaw/Command.h>
+#include <X11/Shell.h>
+
+#define CONFPATH "%A,%R,/etc/X11/%R,%P/etc/X11/%R,%E,%F,/etc/X11/%F," \
+		 "%P/etc/X11/%F,%D/%X,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
+		 "%P/etc/X11/%X,%P/lib/X11/%X.%H,%P/lib/X11/%X"
+
+/*
+ * Prototypes
+ */
+void BackCallback(Widget, XtPointer, XtPointer);
+void NextCallback(Widget, XtPointer, XtPointer);
+void ApplyCallback(Widget, XtPointer, XtPointer);
+void CloseCallback(Widget, XtPointer, XtPointer);
+void ErrorCallback(Widget, XtPointer, XtPointer);
+
+/*
+ * Initialization
+ */
+XF86SetupFunction mouse_functions[] = {
+    MouseDeviceAndProtocol,
+};
+
+XF86SetupFunction keyboard_functions[] = {
+    KeyboardModelAndLayout,
+};
+
+XF86SetupFunction card_functions[] = {
+    CardModel,
+};
+
+XF86SetupFunction monitor_functions[] = {
+    MonitorLayout,
+};
+
+XF86SetupFunction screen_functions[] = {
+    ScreenDialog,
+};
+
+XF86SetupFunctionList function_lists[] = {
+    {mouse_functions, sizeof(mouse_functions) / sizeof(mouse_functions[0]),},
+    {keyboard_functions, sizeof(keyboard_functions) / sizeof(keyboard_functions[0]),},
+    {card_functions, sizeof(card_functions) / sizeof(card_functions[0]),},
+    {monitor_functions, sizeof(monitor_functions) / sizeof(monitor_functions[0]),},
+    {screen_functions, sizeof(screen_functions) / sizeof(screen_functions[0]),},
+};
+
+XF86SetupInfo xf86info = {
+    sizeof(function_lists) / sizeof(function_lists[0]),
+    MOUSE,
+    function_lists,
+};
+
+Widget configp, current, ok, back, next;
+static Widget shell, errcurrent, oldcurrent;
+
+static int config_status, config_popped;
+
+static ConfigCheckFunction config_function;
+
+Widget ident_widget;
+char *ident_string;
+XF86ConfigPtr XF86Config;
+
+/*
+ * Implementation
+ */
+void
+StartConfig(void)
+{
+    static int first = 1;
+    Widget pane, top, label, bottom, cancel;
+    const char *filename;
+
+    if (!first)
+	return;
+    first = 0;
+
+    /* Read initial configuration */
+    if ((filename = xf86OpenConfigFile(CONFPATH, XF86Config_path, NULL)) == NULL) {
+	fprintf(stderr, "Cannot to open config file.\n");
+	exit(1);
+    }
+    if ((XF86Config = xf86ReadConfigFile()) == NULL) {
+	fprintf(stderr, "Problem when parsing config file\n");
+	exit(1);
+    }
+
+    shell = XtCreatePopupShell("config", transientShellWidgetClass,
+			       toplevel, NULL, 0);
+    pane = XtCreateManagedWidget("pane", panedWidgetClass,
+				 shell, NULL, 0);
+    top = XtCreateManagedWidget("top", formWidgetClass,
+				pane, NULL, 0);
+    label = XtCreateManagedWidget("label", labelWidgetClass,
+				  top, NULL, 0);
+    ident_widget = XtVaCreateManagedWidget("identifier", asciiTextWidgetClass,
+					   top,
+					   XtNeditType, XawtextEdit,
+					   NULL, 0);
+    configp = XtCreateManagedWidget("work", formWidgetClass,
+				    pane, NULL, 0);
+    current = XtCreateManagedWidget("wellcome", labelWidgetClass,
+				    configp, NULL, 0);
+    bottom = XtCreateManagedWidget("bottom", formWidgetClass,
+				   pane, NULL, 0);
+    back = XtCreateManagedWidget("back", commandWidgetClass,
+				 bottom, NULL, 0);
+    XtAddCallback(back, XtNcallback, BackCallback, (XtPointer)&xf86info);
+    next = XtCreateManagedWidget("next", commandWidgetClass,
+				 bottom, NULL, 0);
+    XtAddCallback(next, XtNcallback, NextCallback, (XtPointer)&xf86info);
+    ok = XtCreateManagedWidget("ok", commandWidgetClass,
+			       bottom, NULL, 0);
+    XtAddCallback(ok, XtNcallback, ApplyCallback, (XtPointer)NULL);
+    cancel = XtCreateManagedWidget("cancel", commandWidgetClass,
+				   bottom, NULL, 0);
+    XtAddCallback(cancel, XtNcallback, CloseCallback, (XtPointer)NULL);
+
+    XtRealizeWidget(shell);
+
+    XSetWMProtocols(DPY, XtWindow(shell), &wm_delete_window, 1);
+}
+
+/*ARGSUSED*/
+Bool
+ConfigLoop(ConfigCheckFunction config_fn)
+{
+    Arg args[1];
+    config_popped = True;
+    XtPopup(shell, XtGrabExclusive);
+
+    config_function = config_fn;
+    while (config_popped)
+	XtAppProcessEvent(XtWidgetToApplicationContext(shell), XtIMAll);
+
+    XtSetArg(args[0], XtNstring, &ident_string);
+    XtGetValues(ident_widget, args, 1);
+
+    return (config_status);
+}
+
+/*ARGSUSED*/
+void
+ConfigError(void)
+{
+    static int first = 1;
+
+    if (first) {
+	Widget label, command;
+
+	errcurrent = XtCreateWidget("error", formWidgetClass,
+			 	     configp, NULL, 0);
+	label = XtCreateManagedWidget("label", labelWidgetClass,
+				      errcurrent, NULL, 0);
+	command = XtCreateManagedWidget("command", commandWidgetClass,
+					errcurrent, NULL, 0);
+	XtAddCallback(command, XtNcallback, ErrorCallback, NULL);
+
+	XtRealizeWidget(errcurrent);
+    }
+
+    oldcurrent = current;
+    XtChangeManagedSet(&current, 1, NULL, NULL, &errcurrent, 1);
+    current = errcurrent;
+
+    XtSetSensitive(ok, False);
+}
+
+/*ARGSUSED*/
+void
+ErrorCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XtChangeManagedSet(&errcurrent, 1, NULL, NULL, &oldcurrent, 1);
+    current = oldcurrent;
+
+    XtSetSensitive(ok, True);
+}
+
+/*ARGSUSED*/
+void
+BackCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XF86SetupInfo *info = (XF86SetupInfo*)user_data;
+    int idx = info->lists[info->cur_list].cur_function - 1;
+
+    if (idx >= 0 && info->lists[info->cur_list].num_functions > 0) {
+	info->lists[info->cur_list].cur_function = idx;
+	if (idx - 1 == -1)
+	    XtSetSensitive(back, False);
+	if (!XtIsSensitive(next))
+	    XtSetSensitive(next, True);
+	(info->lists[info->cur_list].functions[idx])(info);
+    }
+}
+
+/*ARGSUSED*/
+void
+NextCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XF86SetupInfo *info = (XF86SetupInfo*)user_data;
+    int idx = info->lists[info->cur_list].cur_function + 1;
+
+    if (idx < info->lists[info->cur_list].num_functions) {
+	info->lists[info->cur_list].cur_function = idx;
+	if (idx + 1 == info->lists[info->cur_list].num_functions)
+	    XtSetSensitive(next, False);
+	if (!XtIsSensitive(back))
+	    XtSetSensitive(back, True);
+	(info->lists[info->cur_list].functions[idx])(info);
+    }
+}
+
+/*ARGSUSED*/
+void
+CloseCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XtPopdown(shell);
+    config_popped = False;
+    config_status = False;
+    /* make sure it is sensitive */
+    XtSetSensitive(ok, True);
+    xf86info.lists[xf86info.cur_list].cur_function = 0;
+}
+
+/*ARGSUSED*/
+void
+ApplyCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+
+    XtSetArg(args[0], XtNstring, &ident_string);
+    XtGetValues(ident_widget, args, 1);
+
+    if (config_function == NULL || (*config_function)()) {
+	XtPopdown(shell);
+	config_popped = False;
+	config_status = True;
+	xf86info.lists[xf86info.cur_list].cur_function = 0;
+    }
+    else
+	ConfigError();
+}
+
+/*ARGSUSED*/
+void
+ConfigCancelAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    CloseCallback(w, NULL, NULL);
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/config.h:1.4
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/config.h	Thu May 18 09:29:59 2000
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.4 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include <X11/IntrinsicP.h>
+#include <X11/StringDefs.h>
+#include <X11/Xmu/SysUtil.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <string.h>
+#include <unistd.h>
+
+#if NeedVarargsPrototypes
+#include <stdarg.h>
+#define Va_start(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define Va_start(a,b) va_start(a)
+#endif
+
+#ifdef __EMX__
+#define strcasecmp stricmp
+#define setenv putenv
+#define PATH_MAX 260
+#endif
+
+/* Get PATH_MAX */
+#ifndef PATH_MAX
+# if defined(_POSIX_SOURCE)
+#  include <limits.h>
+# else
+#  define _POSIX_SOURCE
+#  include <limits.h>
+#  undef _POSIX_SOURCE
+# endif
+# ifndef PATH_MAX
+#  ifdef MAXPATHLEN
+#   define PATH_MAX MAXPATHLEN
+#  else
+#   define PATH_MAX 1024
+#  endif
+# endif
+#endif
+
+#include <xf86Parser.h>
+#include <X11/XKBlib.h>
+#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKM.h>
+#include <X11/extensions/XKBfile.h>
+#include <X11/extensions/XKBui.h>
+#include <X11/extensions/XKBrules.h>
+
+#ifndef _xf86cfg_config_h
+#define _xf86cfg_config_h
+
+/* Must match the offset in the xf86info structure at config.c,
+ * and is used also by interface.c
+ */
+#define MOUSE			0
+#define KEYBOARD		1
+#define CARD			2
+#define MONITOR			3
+#define SCREEN			4
+#define SERVER			5
+
+#define	UNUSED			0
+#define	USED			1
+
+/*
+ * Types
+ */
+typedef struct _XF86SetupInfo XF86SetupInfo;
+typedef void (*XF86SetupFunction)(XF86SetupInfo*);
+
+typedef struct _XF86SetupFunctionList {
+    XF86SetupFunction *functions;
+    int num_functions;
+    int cur_function;
+} XF86SetupFunctionList;
+
+struct _XF86SetupInfo {
+    int num_lists;
+    int cur_list;
+    XF86SetupFunctionList *lists;
+};
+
+typedef Bool (*ConfigCheckFunction)();
+
+typedef struct _xf86cfgDevice xf86cfgDevice;
+
+struct _xf86cfgDevice {
+    XtPointer config;
+    Widget widget;
+    int type, state, refcount;
+};
+
+typedef struct {
+    XF86ConfScreenPtr screen;
+    Widget widget;
+    int type, state, refcount;
+    xf86cfgDevice *card;
+    xf86cfgDevice *monitor;
+    short row, column;
+    XRectangle rect;
+    short rotate;
+} xf86cfgScreen;
+
+/* this structure is used just to restore
+   properly the monitors layout in the
+   screen window configuration.
+ */
+typedef struct {
+    XF86ConfLayoutPtr layout;
+    xf86cfgScreen **screen;
+    XPoint *position;
+    int num_layouts;
+} xf86cfgLayout;
+
+/* The vidmode extension usage is controlled by this structure.
+ * The information is read at startup, and added monitors cannot
+ * be configured, since they are not attached to a particular screen.
+ */
+typedef struct _xf86cfgVidMode xf86cfgVidmode;
+
+typedef struct {
+    XF86ConfLayoutPtr layout;	/* current layout */
+    Widget cpu;
+    xf86cfgLayout **layouts;
+    Cardinal num_layouts;
+    xf86cfgScreen **screens;
+    Cardinal num_screens;
+    xf86cfgDevice **devices;
+    Cardinal num_devices;
+    xf86cfgVidmode **vidmodes;
+    Cardinal num_vidmodes;
+} xf86cfgComputer;
+
+/*
+ * Prototypes
+ */
+void StartConfig(void);
+Bool ConfigLoop(ConfigCheckFunction);
+void ConfigError(void);
+void ChangeScreen(XF86ConfMonitorPtr, XF86ConfMonitorPtr,
+		  XF86ConfDevicePtr, XF86ConfDevicePtr);
+void SetTip(xf86cfgDevice*);
+Bool startx(void);
+void endx(void);
+void startaccessx(void);
+void ConfigCancelAction(Widget, XEvent*, String*, Cardinal*);
+
+/*
+ * Initialization
+ */
+extern Widget toplevel, configp, current, back, next;
+extern XtAppContext appcon;
+extern XF86SetupInfo xf86info;
+extern Widget ident_widget;
+extern char *ident_string;
+extern XF86ConfigPtr XF86Config;
+extern char *XF86Config_path;
+extern char *XFree86Dir;
+extern xf86cfgComputer computer;
+extern Atom wm_delete_window;
+extern Display *DPY;
+
+#endif /* _xf86cfg_config_h */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/down.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/down.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/down.xbm	Thu May 18 09:29:59 2000
@@ -0,0 +1,8 @@
+#define down_width 19
+#define down_height 19
+static unsigned char down_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0f, 0x00,
+   0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00,
+   0x80, 0x0f, 0x00, 0xfc, 0xff, 0x01, 0xf8, 0xff, 0x00, 0xf0, 0x7f, 0x00,
+   0xe0, 0x3f, 0x00, 0xc0, 0x1f, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x07, 0x00,
+   0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/help.c:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/help.c	Tue Jun 13 16:15:51 2000
@@ -0,0 +1,1785 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.1 2000/06/13 23:15:51 dawes Exp $
+ */
+
+#include <X11/IntrinsicP.h>
+#include <X11/StringDefs.h>
+#include <X11/Shell.h>
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Command.h>
+#include <X11/Xaw/Paned.h>
+
+#include <X11/Xaw/Text.h>
+#include <X11/Xaw/TextSinkP.h>
+#include <X11/Xaw/TextSrcP.h>
+#include <X11/Xmu/Xmu.h>
+#ifndef X_NOT_STDC_ENV
+#include <stdlib.h>		/* for bsearch() */
+#endif
+#include <ctype.h>
+
+/*
+ * Prototypes
+ */
+static void CloseCallback(Widget, XtPointer, XtPointer);
+static void StartHelp(void);
+void Html_ModeStart(Widget);
+
+/*
+ * Initialization
+ */
+static Widget shell, text;
+extern Widget toplevel;
+extern Display *DPY;
+extern Atom wm_delete_window;
+static Bool popped_up = False;
+
+/*
+ * Implementation
+ */
+Bool
+Help(char *topic)
+{
+    Widget source;
+    char *str = NULL;
+    Bool error = False;
+    static char *def_text = "<h2>Help Error</h2>"
+			    "No help available for the topic <b>%s</b>.";
+    XtResource resource = {
+	NULL, "HelpMessage", XtRString, sizeof(char*),
+	0, XtRString, NULL
+    };
+
+    StartHelp();
+    source = XawTextGetSource(text);
+    XawTextSourceClearEntities(source, 0,
+			       XawTextSourceScan(source, 0, XawstAll,
+						 XawsdRight, 1, True));
+    if (topic != NULL) {
+	resource.resource_name = topic;
+	XtGetApplicationResources(shell, (XtPointer)&str,
+				  &resource, 1, NULL, 0);
+    }
+    if (str == NULL) {
+	int len;
+
+	error = True;
+	if (topic == NULL)
+	    topic = "(null argument)";
+	str = XtMalloc(len  = strlen(topic) + strlen(def_text) + 1);
+	XmuSnprintf(str, len, def_text, topic);
+    }
+    XtVaSetValues(text, XtNstring, str, NULL, 0);
+    if (error)
+	XtFree(str);
+
+    Html_ModeStart(source);
+    _XawTextBuildLineTable((TextWidget)text,
+			       XawTextTopPosition(text), True);
+    XawTextDisplay(text);
+    if (popped_up == False) {
+	popped_up = True;
+	XtPopup(shell, XtGrabNone);
+	XtSetKeyboardFocus(shell, text);
+    }
+}
+
+static void
+StartHelp(void)
+{
+    static XtResource resource = {
+	"properties", "Properties", XtRString, sizeof(char*),
+	0, XtRString, NULL
+    };
+
+    if (shell == NULL) {
+	Widget pane, close;
+	char *props;
+	XawTextPropertyList *propl;
+
+	shell = XtCreatePopupShell("help", transientShellWidgetClass,
+				   toplevel, NULL, 0);
+	pane = XtCreateManagedWidget("pane", panedWidgetClass,
+				     shell, NULL, 0);
+	text = XtVaCreateManagedWidget("text", asciiTextWidgetClass,
+				       pane, XtNeditType, XawtextRead, NULL, 0);
+	close = XtCreateManagedWidget("close", commandWidgetClass,
+				      pane, NULL, 0);
+	XtAddCallback(close, XtNcallback, CloseCallback, NULL);
+	XtRealizeWidget(shell);
+	XSetWMProtocols(DPY, XtWindow(shell), &wm_delete_window, 1);
+	XtGetApplicationResources(text, (XtPointer)&props,
+				  &resource, 1, NULL, 0);
+	propl = XawTextSinkConvertPropertyList("html", props,
+					       toplevel->core.screen,
+					       toplevel->core.colormap,
+					       toplevel->core.depth);
+	XtVaSetValues(XawTextGetSink(text), XawNtextProperties, propl, NULL, 0);
+    }
+}
+
+/*ARGSUSED*/
+static void
+CloseCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XtPopdown(shell);
+    popped_up = False;
+}
+
+/*ARGSUSED*/
+void
+HelpCancelAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    CloseCallback(w, NULL, NULL);
+}
+
+
+/* bellow is a modified version of the html-mode.c I wrote for xedit
+ * (at least) temporarily dead.
+ */
+
+/*
+ * Copyright (c) 1999 by The XFree86 Project, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the XFree86 Project shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from the
+ * XFree86 Project.
+ *
+ * Author: Paulo César Pereira de Andrade
+ */
+
+#define Html_Peek(parser)	((parser)->next)
+
+/*
+ * Types
+ */
+typedef struct _Html_Parser Html_Parser;
+typedef struct _Html_Item Html_Item;
+
+typedef struct _Html_TagInfo {
+    char *name;
+    int entity	: 1;	/* it changes the type of the text */
+    int nest	: 1;	/* does not close tags automatically */
+    int end	: 1;	/* need a close markup */
+    int adnl	: 1;	/* add newline before/after tag contents */
+    int para	: 1;	/* changes the paragraph formatting */
+    unsigned long mask;	/* enforce use of attributes of this tag-info */
+    unsigned long xlfd_mask;
+    void (*parse_args)(Html_Parser*, Html_Item*);
+    XawTextProperty *override;
+    XrmQuark ident;
+} Html_TagInfo;
+
+struct _Html_Item {
+    XrmQuark ident;
+    XawTextPosition start, end;
+    Html_TagInfo *info;
+
+    XawTextProperty *combine;
+    Bool override;
+    int li;
+
+    XtPointer replace;
+
+    Html_Item *parent, *child, *next;
+};
+
+struct _Html_Parser {
+    Widget source;
+    XawTextBlock block, replace;
+    XawTextPosition position, offset, start, end, last;
+    XrmQuark quark;
+    int i, ch, next;
+    Html_Item *item, *head;
+    XmuScanline *mask;
+    int space, pre, adnl, list, desc, column;
+    Bool spc;
+    XawTextBlock *entity;
+
+    Pixel alink;
+};
+
+typedef struct _Html_SourceInfo Html_SourceInfo;
+struct _Html_SourceInfo {
+    Widget source;
+    XawTextBlock block;
+    XawTextPosition last;
+    Html_SourceInfo *next;
+};
+
+/*
+ * Proptotypes
+ */
+void Html_ModeStart(Widget);
+void Html_ModeEnd(Widget);
+static void Html_ModeInit(void);
+static void Html_ParseCallback(Widget, XtPointer, XtPointer);
+static Html_TagInfo *Html_GetInfo(char*);
+static int Html_Get(Html_Parser*);
+static int Html_Parse1(Html_Parser*);
+static int Html_Parse2(Html_Parser*);
+static void Html_ParseTag(Html_Parser*);
+static void Html_Commit(Html_Parser*);
+static void Html_AddEntities(Html_Parser*, Html_Item*);
+
+static int Html_Put(Html_Parser*, int);
+static char *Html_Puts(Html_Parser*, char*);
+static int Html_Format1(Html_Parser*);
+static int Html_Format2(Html_Parser*);
+static int Html_Format3(Html_Parser*);
+static void Html_FormatTag(Html_Parser*);
+
+static void Html_AArgs(Html_Parser*, Html_Item*);
+static void Html_FontArgs(Html_Parser*, Html_Item*);
+
+/*
+ * Initialization
+ */
+static XrmQuark
+	Qbr,
+	Qdefault,
+	Qdd,
+	Qdl,
+	Qdt,
+	Qentity,
+	Qetag,
+	Qhide,
+	Qli,
+	Qol,
+	Qp,
+	Qpre,
+	Qspace,
+	Qtag,
+	Qul;
+
+static Html_TagInfo tag_info[] = {
+    {"a",	1, 0, 1, 0, 0,
+     0, 0,
+     Html_AArgs},
+    {"address",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_SLANT,
+     },
+    {"b",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_WEIGHT,
+     },
+    {"blockquote", 0, 1, 1, 1, 1,
+     0, 0,
+     },
+    {"body",	0, 0, 1, 0, 0,
+     0, 0,
+     },
+    {"br",	0, 0, 0, 0, 0,
+     },
+    {"code",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_FAMILY | XAW_TPROP_PIXELSIZE,
+     },
+    {"dd",	0, 1, 1, 0, 1,
+     0, 0},
+    {"dl",	0, 1, 1, 0, 0,
+     0, 0,
+     },
+    {"dt",	0, 0, 1, 0, 0,
+     0, 0},
+    {"em",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_SLANT,
+     },
+    {"font",	1, 1, 1, 0, 0,
+     0, 0,
+     Html_FontArgs},
+    {"h1",	1, 0, 1, 1, 0,
+     0, XAW_TPROP_WEIGHT | XAW_TPROP_PIXELSIZE,
+     },
+    {"h2",	1, 0, 1, 1, 0,
+     0, XAW_TPROP_WEIGHT | XAW_TPROP_PIXELSIZE,
+     },
+    {"h3",	1, 0, 1, 1, 0,
+     0, XAW_TPROP_WEIGHT | XAW_TPROP_PIXELSIZE,
+     },
+    {"h4",	1, 0, 1, 1, 0,
+     0, XAW_TPROP_WEIGHT | XAW_TPROP_PIXELSIZE,
+     },
+    {"h5",	1, 0, 1, 1, 0,
+     0, XAW_TPROP_WEIGHT | XAW_TPROP_PIXELSIZE,
+     },
+    {"h6",	1, 0, 1, 1, 0,
+     0, XAW_TPROP_WEIGHT | XAW_TPROP_PIXELSIZE,
+     },
+    {"head",	0, 0, 1, 0, 0,
+     0, 0,
+     },
+    {"html",	0, 0, 1, 0, 0,
+     0, 0,
+     },
+    {"i",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_SLANT,
+     },
+    {"kbd",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_FAMILY | XAW_TPROP_PIXELSIZE,
+     },
+    {"li",	0, 0, 0, 0, 0,
+     0, 0},
+    {"ol",	0, 1, 1, 0, 1,
+     0, 0,
+     },
+    {"p",	0, 0, 0, 1, 0,
+     },
+    {"pre",	1, 0, 1, 1, 0,
+     0, XAW_TPROP_FAMILY | XAW_TPROP_PIXELSIZE,
+     },
+    {"samp",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_FAMILY | XAW_TPROP_PIXELSIZE,
+     },
+    {"strong",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_WEIGHT,
+     },
+    {"tt",	1, 0, 1, 0, 0,
+     0, XAW_TPROP_FAMILY | XAW_TPROP_PIXELSIZE,
+     },
+    {"ul",	0, 1, 1, 0, 1,
+     0, 0,
+     },
+};
+
+static char *pnl = "<p>\n", *nlpnl = "\n<p>\n";
+static Html_SourceInfo *source_info;
+
+/*
+ * Implementation
+ */
+static char *
+Html_GetText(Widget src, XawTextPosition position)
+{
+    char *result, *tempResult;
+    XawTextPosition offset = 0;
+    XawTextBlock text;
+
+    tempResult = result = XtMalloc((unsigned)(position + 1));
+
+    while (offset < position) {
+	offset = XawTextSourceRead(src, offset, &text, position - offset);
+	if (!text.length)
+	    break;
+	memcpy(tempResult, text.ptr, (unsigned)text.length);
+	tempResult += text.length;
+    }
+
+    *tempResult = '\0';
+
+    return (result);
+}
+
+void
+Html_ModeStart(Widget src)
+{
+    Html_Parser *parser = XtNew(Html_Parser);
+    Html_Item *next, *item;
+    XColor color, exact;
+    Html_SourceInfo *info = XtNew(Html_SourceInfo);
+
+    if (XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap,
+			 "blue", &color, &exact))
+	parser->alink = color.pixel;
+    else
+	parser->alink = 0L;
+
+    XtVaSetValues(src, XtNeditType, XawtextEdit, NULL, 0);
+
+    Html_ModeInit();
+
+    /* initialize parser state */
+    parser->source = src;
+    parser->position = XawTextSourceRead(parser->source, 0,
+					 &parser->block, 4096);
+    parser->replace.ptr = NULL;
+    parser->replace.firstPos = 0;
+    parser->replace.length = 0;
+    parser->replace.format = FMT8BIT;
+    parser->offset = -1;
+    parser->quark = NULLQUARK;
+    parser->i = 0;
+    parser->i = parser->ch = parser->next = 0;
+    parser->last = XawTextSourceScan(src, 0, XawstAll, XawsdRight, 1, 1);
+    if (parser->block.length == 0)
+	parser->ch = parser->next = EOF;
+    else
+	(void)Html_Get(parser);
+    parser->pre = 0;
+    parser->adnl = 1;
+    parser->list = parser->desc = parser->column = 0;
+    parser->spc = True;
+
+    info->source = src;
+    info->block.ptr = Html_GetText(src, parser->last);
+    info->block.length = parser->last;
+    info->block.format = FMT8BIT;
+    info->block.firstPos = 0;
+    info->next = NULL;
+    if (source_info == NULL)
+	source_info = info;
+    else {
+	Html_SourceInfo *tmp = source_info;
+
+	while (tmp->next)
+	    tmp = tmp->next;
+	tmp->next = info;
+    }
+
+    while (Html_Format1(parser) != EOF)
+	;
+    XawTextSourceReplace(parser->source, 0, parser->last, &parser->replace);
+    XtFree(parser->replace.ptr);
+
+    /* re-initialize parser state */
+    parser->position = XawTextSourceRead(parser->source, 0,
+					 &parser->block, 4096);
+    parser->offset = -1;
+    parser->quark = NULLQUARK;
+    parser->i = parser->ch = parser->next = 0;
+    parser->last = XawTextSourceScan(src, 0, XawstAll, XawsdRight, 1, 1);
+    info->last = parser->last;
+    if (parser->block.length == 0)
+	parser->ch = parser->next = EOF;
+    else
+	(void)Html_Get(parser);
+    parser->adnl = 1;
+    parser->list = parser->desc = parser->column = 0;
+    parser->spc = True;
+    parser->head = parser->item = NULL;
+
+    parser->mask = XmuNewScanline(0, 0, 0);
+
+    /* build html structure information */
+    while (Html_Parse1(parser) != EOF)
+	;
+
+    /* create top level entity mask */
+    (void)XmuScanlineNot(parser->mask, 0, parser->last);
+
+    item = parser->item;
+    while (item) {
+	next = item->next;
+	Html_AddEntities(parser, item);
+	if (item->combine)
+	    XtFree((XtPointer)item->combine);
+	XtFree((XtPointer)item);
+	item = next;
+    }
+    XmuDestroyScanline(parser->mask);
+
+    XtVaSetValues(src, XtNeditType, XawtextRead, NULL, 0);
+
+    XtFree((XtPointer)parser);
+
+    /* add callbacks for interactive changes */
+    XtAddCallback(src, XtNpropertyCallback, Html_ParseCallback, NULL);
+}
+
+void
+Html_ModeEnd(Widget src)
+{
+    Html_SourceInfo *info, *pinfo;
+
+    XtRemoveCallback(src, XtNpropertyCallback, Html_ParseCallback, NULL);
+    for (pinfo = info = source_info; info; pinfo = info, info = info->next)
+	if (info->source == src)
+	    break;
+
+    if (info == NULL)
+	return;
+
+    XawTextSourceClearEntities(src, 0, info->last);
+    XtVaSetValues(src, XtNeditType, XawtextEdit, NULL, 0);
+    XawTextSourceReplace(src, 0, info->last, &info->block);
+    XtVaSetValues(src, XtNeditType, XawtextRead, NULL, 0);
+
+    if (info == source_info)
+	source_info = source_info->next;
+    else
+	pinfo->next = info->next;
+    XtFree(info->block.ptr);
+    XtFree((XtPointer)info);
+}
+
+static void
+Html_ParseCallback(Widget w, XtPointer client_data, XtPointer call_data)
+{
+}
+
+static int
+bcmp_tag_info(_Xconst void *left, _Xconst void *right)
+{
+    return (strcmp((char*)left, ((Html_TagInfo*)right)->name));
+}
+
+static Html_TagInfo *
+Html_GetInfo(char *name)
+{
+    return (bsearch(name, tag_info, sizeof(tag_info) / sizeof(tag_info[0]),
+		    sizeof(Html_TagInfo), bcmp_tag_info));
+}
+
+static int
+Html_Get(Html_Parser *parser)
+{
+    if (parser->ch == EOF)
+	return (EOF);
+    if (parser->i >= parser->block.length) {
+	parser->i = 0;
+	parser->position = XawTextSourceRead(parser->source, parser->position,
+					     &parser->block, 4096);
+    }
+    parser->ch = parser->next;
+    if (parser->block.length == 0)
+	parser->next = EOF;
+    else
+	parser->next = (unsigned char)parser->block.ptr[parser->i++];
+    parser->offset++;
+
+    return (parser->ch);
+}
+
+static void
+Html_ModeInit(void)
+{
+    static int initialized;
+    int i;
+
+    if (initialized)
+	return;
+
+    Qbr			= XrmPermStringToQuark("br");
+    Qdd			= XrmPermStringToQuark("dd");
+    Qdefault		= XrmPermStringToQuark("default");
+    Qdl			= XrmPermStringToQuark("dl");
+    Qdt			= XrmPermStringToQuark("dt");
+    Qentity		= XrmPermStringToQuark("entity");
+    Qetag		= XrmPermStringToQuark("/tag");
+    Qhide		= XrmPermStringToQuark("hide");
+    Qli			= XrmPermStringToQuark("li");
+    Qol			= XrmPermStringToQuark("ol");
+    Qp			= XrmPermStringToQuark("p");
+    Qpre		= XrmPermStringToQuark("pre");
+    Qspace		= XrmPermStringToQuark("space");
+    Qtag		= XrmPermStringToQuark("tag");
+    Qul			= XrmPermStringToQuark("ul");
+
+    for (i = 0; i < sizeof(tag_info) / sizeof(tag_info[0]); i++)
+	tag_info[i].ident = XrmPermStringToQuark(tag_info[i].name);
+
+    initialized = True;
+}
+
+/************************************************************************/
+/* PARSE								*/
+/************************************************************************/
+static void
+Html_AddEntities(Html_Parser *parser, Html_Item *item)
+{
+    Html_Item *parent, *next, *child = item->child;
+    XmuSegment segment, *ent;
+    XmuScanline *mask = XmuNewScanline(0, 0, 0);
+    XawTextProperty *tprop, *property = NULL;
+    Widget sink;
+    Bool changed = False;
+
+    /* combine properties */
+    if (item->info &&
+	(item->info->entity ||
+	 (item->parent && item->parent->ident != item->parent->info->ident))) {
+	sink = XawTextGetSink(text);
+	parent = item->parent;
+	property = XawTextSinkCopyProperty(sink, item->ident);
+	property->mask = item->info->mask;
+	property->xlfd_mask = item->info->xlfd_mask;
+	if (parent) {
+	    (void)XawTextSinkCombineProperty(sink, property,
+			XawTextSinkGetProperty(sink, parent->ident), False);
+	    if (item->combine && parent->combine)
+		(void)XawTextSinkCombineProperty(sink, item->combine,
+					 	 parent->combine,
+						 item->override);
+	}
+	if (item->combine)
+	    XawTextSinkCombineProperty(sink, property, item->combine, True);
+	tprop = property;
+	property = XawTextSinkAddProperty(sink, property);
+	XtFree((XtPointer)tprop);
+	if (property && item->ident != property->identifier) {
+	    item->ident = property->identifier;
+	    changed = True;
+	}
+    }
+
+    if (item->end < 0) {
+	if (item->next)
+	    item->end = item->next->start;
+	else if (item->parent)
+	    item->end = item->parent->end;
+	else
+	    item->end = parser->last;
+    }
+
+    while (child) {
+	next = child->next;
+	segment.x1 = child->start;
+	segment.x2 = child->end;
+	(void)XmuScanlineOrSegment(mask, &segment);
+	Html_AddEntities(parser, child);
+	if (child->combine)
+	    XtFree((XtPointer)child->combine);
+	XtFree((XtPointer)child);
+	child = next;
+    }
+
+    /* build entity mask */
+    (void)XmuScanlineNot(mask, item->start, item->end);
+    (void)XmuScanlineAnd(mask, parser->mask);
+
+    /* add entities */
+    if (item->info && changed) {
+	for (ent = mask->segment; ent; ent = ent->next)
+	    (void)XawTextSourceAddEntity(parser->source, 0, 0, NULL, ent->x1,
+					 ent->x2 - ent->x1, item->ident);
+    }
+    else if (item->info == NULL)
+	(void)XawTextSourceAddEntity(parser->source, 0,
+				     XAW_TENTF_READ | XAW_TENTF_REPLACE,
+				     item->replace, item->start,
+				     item->end - item->start,
+				     item->parent->ident);
+
+    /* set mask for parent entities */
+    (void)XmuScanlineOr(parser->mask, mask);
+    XmuDestroyScanline(mask);
+
+#if 0
+    if (item->info && item->info->para) {
+	XawTextSourceSetParagraph(parser->source, item->start, item->end,
+				  40,	/* arbitrary value, for testing */
+				  0, 0);
+    }
+#endif
+}
+
+static void
+Html_Commit(Html_Parser *parser)
+{
+    XawTextPosition position;
+    int length;
+
+    position = parser->start;
+    length = parser->end - parser->start;
+    if (position < 0) {
+	length += position;
+	position = 0;
+    }
+    if (position + length > parser->last + 1)
+	length -= (position + length) - parser->last + 1;
+
+    if (parser->quark != Qdefault && parser->quark != NULLQUARK && length > 0) {
+	XmuSegment segment;
+	Html_Item *head = parser->head;
+	XrmQuark quark = parser->quark;
+
+	parser->quark = Qdefault;
+
+	if (quark == Qli && head &&
+	    (head->info->ident == Qol || head->info->ident == Qul)) {
+	    if (parser->head == NULL || head->info->ident != Qol)
+		XawTextSourceAddEntity(parser->source, 0, /*XAW_TENT_BULLET,*/
+				       XAW_TENTF_HIDE, NULL,
+				       position, length, Qli);
+	    else
+		XawTextSourceAddEntity(parser->source, 0, /*XAW_TENT_LITEM,*/
+				       XAW_TENTF_HIDE, (XtPointer)head->li++,
+				       position, length, Qli);
+	}
+	else if (quark == Qhide)
+	    XawTextSourceAddEntity(parser->source, 0, XAW_TENTF_HIDE, NULL,
+				   position, length, quark);
+	else if (quark == Qentity) {
+	    if (head && head->end == -1) {
+		Html_Item *item, *it;
+
+		item = XtNew(Html_Item);
+		item->ident = Qentity;
+		item->start = position;
+		item->end = position + length;
+		item->info = NULL;
+		item->combine = NULL;
+		item->override = False;
+		item->replace = (XtPointer)parser->entity;
+		item->child = item->next = NULL;
+
+		it = head->child;
+
+		item->parent = head;
+		if (it == NULL)
+		    head->child = item;
+		else {
+		    while (it->next)
+			it = it->next;
+		    it->next = item;
+		}
+
+		return;
+	    }
+	    XawTextSourceAddEntity(parser->source, 0,
+				   XAW_TENTF_READ | XAW_TENTF_REPLACE,
+				   (XtPointer)parser->entity,
+				   position, length, Qentity);
+	}
+
+	segment.x1 = position;
+	segment.x2 = position + length;
+	(void)XmuScanlineOrSegment(parser->mask, &segment);
+    }
+}
+
+static void
+Html_ParseTag(Html_Parser *parser)
+{
+    int ch, sz;
+    char buf[32];
+    Html_TagInfo *info;
+    Html_Item *item = NULL;
+    XawTextPosition offset = parser->offset - 1;
+
+    switch (Html_Peek(parser)) {
+	case '!':
+	    (void)Html_Get(parser);			/* eat `!' */
+	    if (Html_Peek(parser) == '-') {
+		/* comment */
+		(void)Html_Get(parser);			/* eat `-' */
+		if (Html_Peek(parser) == '-') {
+		    int count = 0;
+
+		    (void)Html_Get(parser);
+		    while ((ch = Html_Peek(parser)) != EOF) {
+			if (ch == '>' && count >= 2)
+			    break;
+			else if (ch == '-')
+			    ++count;
+			else
+			    count = 0;
+			(void)Html_Get(parser);
+		    }
+		}
+	    }
+	    break;
+	case '?':
+	    break;
+	case '/':
+	    (void)Html_Get(parser);			/* eat `/' */
+	    sz = 0;
+	    while (isalnum(Html_Peek(parser)) &&
+		   sz <= sizeof(buf) + 1)
+		buf[sz++] = tolower(Html_Get(parser));
+	    buf[sz] = '\0';
+	    if ((info = Html_GetInfo(buf)) != NULL) {
+		if (parser->head) {
+		    Html_Item *it = parser->head;
+
+		    while (it) {
+			if (it->info == info)
+			    break;
+			it = it->parent;
+		    }
+
+		    if (it) {
+			if (it == parser->head)
+			    parser->head->end = offset;
+			else {
+			    it->end = offset;
+			    do {
+				parser->head->end = offset;
+				parser->head = parser->head->parent;
+			    } while (parser->head != it);
+			}
+			if (parser->head->parent)
+			    parser->head = parser->head->parent;
+			else
+			    parser->head = parser->item;
+		    }
+		}
+	    }
+	    break;
+	default:
+	    sz = 0;
+	    while (isalnum(Html_Peek(parser)) &&
+		   sz <= sizeof(buf) + 1)
+		buf[sz++] = tolower(Html_Get(parser));
+	    buf[sz] = '\0';
+	    if ((info = Html_GetInfo(buf)) != NULL) {
+		if (info->end == False) {
+		    if (info->ident == Qli)
+			parser->quark = Qli;
+		    if (!info->para)
+			break;	/* no more processing required */
+		}
+		item = XtNew(Html_Item);
+		item->info = info;
+		item->ident = item->info->ident;
+		item->combine = NULL;
+		item->override = False;
+		item->start = item->end = -1;
+		if (info->ident == Qol)
+		    item->li = 1;
+		else
+		    item->li = 0;
+		item->parent = item->child = item->next = NULL;
+		if (parser->item == NULL)
+		    parser->item = parser->head = item;
+		else if (parser->head->end == -1) {
+		    if (parser->head->info != item->info || info->nest) {
+			Html_Item *it = parser->head;
+
+			/* first, see if we need to close a long list of tags */
+			if (info->ident == Qdd) {
+			    if (parser->head &&
+				parser->head->info->ident == Qdt) {
+				parser->head->end = offset;
+				parser->head = parser->head->parent;
+			    }
+			}
+			else if (info->ident == Qdt) {
+			    if (parser->head &&
+				parser->head->info->ident == Qdd) {
+				parser->head->end = offset;
+				parser->head = parser->head->parent;
+			    }
+			}
+			else if (!info->nest) {
+			    while (it) {
+				if (it->info == info || it->info->end)
+				    break;
+				it = it->parent;
+			    }
+			    if (it) {
+				/* close the items */
+				 while (parser->head != it) {
+				    if (parser->head->info->ident == Qpre)
+					--parser->pre;
+				    parser->head->end = offset;
+				    parser->head = parser->head->parent;
+				}
+			    }
+			}
+
+			/* add child item */
+			it = parser->head->child;
+
+			item->parent = parser->head;
+			if (it == NULL)
+			    parser->head->child = item;
+			else {
+			    while (it->next)
+				it = it->next;
+			    it->next = item;
+			}
+			parser->head = item;
+		    }
+		    else {
+			/* close the `head' item and start a new one */
+			Html_Item *it;
+
+			parser->head->end = offset;
+			if (parser->head->parent)
+			    parser->head = parser->head->parent;
+			else
+			    parser->head = parser->item;
+
+			if ((it = parser->head->child) != NULL) {
+			    item->parent = parser->head;
+			    while (it->next)
+				it = it->next;
+			    it->next = item;
+			    parser->head = item;
+			}
+			else {
+			    parser->head->child = item;
+			    parser->head = item;
+			}
+		    }
+		}
+		else {
+		    /* this is not common, but handle it */
+		    Html_Item *it = parser->item;
+
+		    while (it->next)
+			it = it->next;
+		    it->next = item;
+		    parser->head = item;
+		}
+		if (info->parse_args)
+		    (info->parse_args)(parser, item);
+	    }
+	    break;
+    }
+
+    /* skip anything not processed */
+    while ((ch = Html_Peek(parser)) != '>' && ch != EOF)
+	(void)Html_Get(parser);
+    if (item && item->start == -1)
+	item->start = parser->offset + 1;
+}
+
+/* tags */
+static int
+Html_Parse2(Html_Parser *parser)
+{
+    int ch;
+
+    for (;;) {
+	if ((ch = Html_Get(parser)) == '<') {
+	    parser->end = parser->offset - 1;
+	    Html_Commit(parser);
+	    parser->quark = Qhide;
+	    parser->start = parser->end;
+
+	    Html_ParseTag(parser);
+
+	    (void)Html_Get(parser);	/* eat `>' */
+	    parser->end = parser->offset;
+	    Html_Commit(parser);
+	}
+	else
+	    return (ch);
+    }
+    /*NOTREACHED*/
+}
+
+/* entities */
+static int
+Html_Parse1(Html_Parser *parser)
+{
+    static XawTextBlock *entities[256];
+    static char chars[256];
+    int ch;
+
+    for (;;) {
+	if ((ch = Html_Parse2(parser)) == EOF)
+	    return (EOF);
+
+	if (ch == '&') {
+	    unsigned char idx = '?';
+	    char buf[32];
+	    int sz = 0;
+
+	    /* the string comparisons need a big optmization! */
+	    parser->end = parser->offset - 1;
+	    Html_Commit(parser);
+	    parser->start = parser->end;
+	    while ((ch = Html_Peek(parser)) != ';'
+		   && ch != EOF && !isspace(ch)) {
+		ch = Html_Get(parser);
+		if (sz + 1 <= sizeof(buf))
+		    buf[sz++] = ch;
+	    }
+	    buf[sz] = '\0';
+	    if (ch == ';')
+		(void)Html_Get(parser);
+	    if (sz == 0)
+		idx = '&';
+	    else if (strcasecmp(buf, "lt") == 0)
+		idx = '<';
+	    else if (strcasecmp(buf, "gt") == 0)
+		idx = '>';
+	    else if (strcasecmp(buf, "nbsp") == 0)
+		idx = ' ';
+	    else if (strcasecmp(buf, "amp") == 0)
+		idx = '&';
+	    else if (strcasecmp(buf, "quot") == 0)
+		idx = '"';
+	    else if (*buf == '#') {
+		if (sz == 1)
+		    idx = '#';
+		else {
+		    char *tmp;
+
+		    idx = strtol(buf + 1, &tmp, 10);
+		    if (*tmp)
+			idx = '?';
+		}
+	    }
+	    else if (strcmp(buf + 1, "acute") == 0) {
+		switch (*buf) {
+		    case 'a': idx = 'á'; break;	case 'e': idx = 'é'; break;
+		    case 'i': idx = 'í'; break;	case 'o': idx = 'ó'; break;
+		    case 'u': idx = 'ú'; break;	case 'A': idx = 'Á'; break;
+		    case 'E': idx = 'É'; break;	case 'I': idx = 'Í'; break;
+		    case 'O': idx = 'Ó'; break;	case 'U': idx = 'Ú'; break;
+		    case 'y': idx = 'ý'; break;	case 'Y': idx = 'Ý'; break;
+		}
+	    }
+	    else if (strcmp(buf + 1, "grave") == 0) {
+		switch (*buf) {
+		    case 'a': idx = 'à'; break;	case 'e': idx = 'è'; break;
+		    case 'i': idx = 'ì'; break;	case 'o': idx = 'ò'; break;
+		    case 'u': idx = 'ù'; break;	case 'A': idx = 'À'; break;
+		    case 'E': idx = 'È'; break;	case 'I': idx = 'Ì'; break;
+		    case 'O': idx = 'Ò'; break;	case 'U': idx = 'Ù'; break;
+		}
+	    }
+	    else if (strcmp(buf + 1, "tilde") == 0) {
+		switch (*buf) {
+		    case 'a': idx = 'ã'; break;	case 'o': idx = 'õ'; break;
+		    case 'n': idx = 'ñ'; break;	case 'A': idx = 'Ã'; break;
+		    case 'O': idx = 'Õ'; break;	case 'N': idx = 'Ñ'; break;
+		}
+	    }
+	    else if (strcmp(buf + 1, "circ") == 0) {
+		switch (*buf) {
+		    case 'a': idx = 'â'; break;	case 'e': idx = 'ê'; break;
+		    case 'i': idx = 'î'; break;	case 'o': idx = 'ô'; break;
+		    case 'u': idx = 'û'; break;	case 'A': idx = 'Â'; break;
+		    case 'E': idx = 'Ê'; break;	case 'I': idx = 'Î'; break;
+		    case 'O': idx = 'Ô'; break;	case 'U': idx = 'Û'; break;
+		}
+	    }
+	    else if (strcmp(buf + 1, "uml") == 0) {
+		switch (*buf) {
+		    case 'a': idx = 0xe4;break;	case 'e': idx = 0xeb;break;
+		    case 'i': idx = 0xef;break;	case 'o': idx = 0xf6;break;
+		    case 'u': idx = 'ü'; break;	case 'A': idx = 0xc4;break;
+		    case 'E': idx = 0xcb;break;	case 'I': idx = 0xfc;break;
+		    case 'O': idx = 0xd6;break;	case 'U': idx = 'Ü'; break;
+		    case 'y': idx = 0xff;break;
+		}
+	    }
+	    else if (strcmp(buf + 1, "cedil") == 0) {
+		switch (*buf) {
+		    case 'c': idx = 'ç'; break;	case 'C': idx = 'Ç'; break;
+		}
+	    }
+	    else if (strcmp(buf + 1, "slash") == 0) {
+		switch (*buf) {
+		    case 'o': idx = 0xf8; break;case 'O': idx = 0xd8; break;
+		}
+	    }
+	    else if (strcmp(buf + 1, "ring") == 0) {
+		switch (*buf) {
+		    case 'a': idx = 0xe5; break;case 'A': idx = 0xc5; break;
+		}
+	    }
+	    else if (strcasecmp(buf, "iexcl") == 0)
+		idx = 0xa1;
+	    else if (strcasecmp(buf, "cent") == 0)
+		idx = 0xa2;
+	    else if (strcasecmp(buf, "pound") == 0)
+		idx = 0xa3;
+	    else if (strcasecmp(buf, "curren") == 0)
+		idx = 0xa4;
+	    else if (strcasecmp(buf, "yen") == 0)
+		idx = 0xa5;
+	    else if (strcasecmp(buf, "brvbar") == 0)
+		idx = 0xa6;
+	    else if (strcasecmp(buf, "sect") == 0)
+		idx = 0xa7;
+	    else if (strcasecmp(buf, "uml") == 0)
+		idx = 0xa8;
+	    else if (strcasecmp(buf, "copy") == 0)
+		idx = 0xa9;
+	    else if (strcasecmp(buf, "ordf") == 0)
+		idx = 'ª';
+	    else if (strcasecmp(buf, "laquo") == 0)
+		idx = 0xab;
+	    else if (strcasecmp(buf, "not") == 0)
+		idx = 0xac;
+	    else if (strcasecmp(buf, "shy") == 0)
+		idx = 0xad;
+	    else if (strcasecmp(buf, "reg") == 0)
+		idx = 0xae;
+	    else if (strcasecmp(buf, "macr") == 0)
+		idx = 0xaf;
+	    else if (strcasecmp(buf, "deg") == 0)
+		idx = '°';
+	    else if (strcasecmp(buf, "plusmn") == 0)
+		idx = 0xb1;
+	    else if (strcasecmp(buf, "sup2") == 0)
+		idx = '²';
+	    else if (strcasecmp(buf, "sup3") == 0)
+		idx = '³';
+	    else if (strcasecmp(buf, "acute") == 0)
+		idx = 0xb4;
+	    else if (strcasecmp(buf, "micro") == 0)
+		idx = 0xb5;
+	    else if (strcasecmp(buf, "para") == 0)
+		idx = 0xb6;
+	    else if (strcasecmp(buf, "middot") == 0)
+		idx = 0xb7;
+	    else if (strcasecmp(buf, "cedil") == 0)
+		idx = 0xb8;
+	    else if (strcasecmp(buf, "supl") == 0)
+		idx = '¹';
+	    else if (strcasecmp(buf, "ordm") == 0)
+		idx = 'º';
+	    else if (strcasecmp(buf, "raquo") == 0)
+		idx = 0xbb;
+	    else if (strcasecmp(buf, "frac14") == 0)
+		idx = 0xbc;
+	    else if (strcasecmp(buf, "frac12") == 0)
+		idx = 0xbd;
+	    else if (strcasecmp(buf, "frac34") == 0)
+		idx = 0xbe;
+	    else if (strcasecmp(buf, "iquest") == 0)
+		idx = 0xbf;
+	    else if (strcasecmp(buf, "AElig") == 0)
+		idx = 0xc6;
+	    else if (strcasecmp(buf, "ETH") == 0)
+		idx = 0xd0;
+	    else if (strcasecmp(buf, "THORN") == 0)
+		idx = 0xde;
+	    else if (strcasecmp(buf, "szlig") == 0)
+		idx = 0xdf;
+	    else if (strcasecmp(buf, "aelig") == 0)
+		idx = 0xe6;
+	    else if (strcasecmp(buf, "eth") == 0)
+		idx = 0xf0;
+	    else if (strcasecmp(buf, "thorn") == 0)
+		idx = 0xfe;
+
+	    parser->quark = Qentity;
+	    if (entities[idx] == NULL) {
+		entities[idx] = XtNew(XawTextBlock);
+		entities[idx]->firstPos = 0;
+		entities[idx]->length = 1;
+		entities[idx]->ptr = chars + idx;
+		entities[idx]->format = FMT8BIT;
+		chars[idx] = idx;
+	    }
+	    parser->entity = entities[idx];
+	    parser->end = parser->offset;
+	    Html_Commit(parser);
+	    parser->start = parser->end;
+	}
+    }
+    /*NOTREACHED*/
+}
+
+/************************************************************************/
+/* FORMAT								*/
+/************************************************************************/
+static int
+Html_Put(Html_Parser *parser, int ch)
+{
+    if (ch != '\r') {
+	if (parser->replace.length % 4096 == 0)
+	    parser->replace.ptr = XtRealloc(parser->replace.ptr,
+					    parser->replace.length + 4096);
+	parser->replace.ptr[parser->replace.length++] = ch;
+    }
+
+    return (ch);
+}
+
+static char *
+Html_Puts(Html_Parser *parser, char *str)
+{
+    int len = strlen(str);
+
+    if (parser->replace.length % 4096 == 0 ||
+	parser->replace.length + len > parser->replace.length +
+	(4096 - (parser->replace.length % 4096)))
+	parser->replace.ptr = XtRealloc(parser->replace.ptr,
+					parser->replace.length + 4096);
+    memcpy(parser->replace.ptr + parser->replace.length, str, len);
+    parser->replace.length += len;
+}
+
+static void
+Html_FormatTag(Html_Parser *parser)
+{
+    int ch, sz = 0;
+    char buf[32];
+    Html_TagInfo *info;
+
+    switch (Html_Peek(parser)) {
+	case '!':
+	    Html_Put(parser, '<');
+	    Html_Put(parser, Html_Get(parser));		/* eat `!' */
+	    if (Html_Peek(parser) == '-') {
+		/* comment */
+		Html_Put(parser, Html_Get(parser));	/* eat `-' */
+		if (Html_Peek(parser) == '-') {
+		    int count = 0;
+
+		    Html_Put(parser, Html_Get(parser));
+		    while ((ch = Html_Peek(parser)) != EOF) {
+			if (ch == '>' && count >= 2)
+			    break;
+			else if (ch == '-')
+			    ++count;
+			else
+			    count = 0;
+			Html_Put(parser, Html_Get(parser));
+		    }
+		    (void)Html_Get(parser);		/* eat `>' */
+		    Html_Put(parser, '>');
+		    return;
+		}
+	    }
+	    break;
+	case '?':
+	    Html_Put(parser, '<');
+	    break;
+	case '/':
+	    (void)Html_Get(parser);			/* eat `/' */
+	    while (isalnum(Html_Peek(parser)) &&
+		   sz <= sizeof(buf) + 1)
+		buf[sz++] = ch = tolower(Html_Get(parser));
+	    buf[sz] = '\0';
+	    if ((info = Html_GetInfo(buf)) != NULL && info->adnl) {
+		if (info->ident == Qpre && parser->pre) {
+		    if (--parser->pre == 0)
+			parser->column = 0;
+		}
+		parser->quark = Qetag;
+		parser->spc = True;
+		if (info->ident == Qp) {
+		    while ((ch = Html_Peek(parser) != '>' && ch != EOF))
+			(void)Html_Get(parser);
+		    (void)Html_Get(parser);		/* eat '>' */
+		    return;
+		}
+	    }
+	    else if (info) {
+		if (info->ident == Qol || info->ident == Qul) {
+		    if (parser->list && --parser->list == 0 &&
+			parser->desc == 0) {
+			parser->quark = Qetag;
+			Html_Put(parser, '\n');
+			++parser->adnl;
+			parser->column = 0;
+		    }
+		}
+		else if (info->ident == Qdl) {
+		    if (parser->desc && --parser->desc == 0 &&
+			parser->list == 0) {
+			parser->quark = Qetag;
+			Html_Put(parser, '\n');
+			++parser->adnl;
+			parser->column = 0;
+		    }
+		}
+	    }
+	    Html_Puts(parser, "</");
+	    Html_Puts(parser, buf);
+	    break;
+	default:
+	    while (isalnum(Html_Peek(parser)) &&
+		   sz <= sizeof(buf) + 1)
+		buf[sz++] = tolower(Html_Get(parser));
+	    buf[sz] = '\0';
+	    if ((info = Html_GetInfo(buf)) != NULL && info->adnl) {
+		if (info->ident == Qpre)
+		    ++parser->pre;
+		if (parser->quark != Qtag) {
+		    if (parser->adnl < 2) {
+			Html_Puts(parser, parser->adnl ? pnl : nlpnl);
+			parser->adnl = 2;
+			parser->spc = True;
+			parser->column = 0;
+		    }
+		}
+		parser->quark = Qtag;
+		if (info->ident == Qp) {
+		    while ((ch = Html_Peek(parser) != '>' && ch != EOF))
+			(void)Html_Get(parser);
+		    (void)Html_Get(parser);		/* eat '>' */
+		    return;
+		}
+	    }
+	    else if (info) {
+		if (info->ident == Qol || info->ident == Qul) {
+		    if (++parser->list == 1 && !parser->desc) {
+			if (parser->adnl < 2) {
+			    Html_Puts(parser, parser->adnl ? pnl : nlpnl);
+			    parser->adnl = 2;
+			    parser->column = 0;
+			}
+		    }
+		    else if (parser->adnl == 0) {
+			Html_Put(parser, '\n');
+			parser->adnl = 1;
+			parser->column = 0;
+		    }
+		    parser->spc = True;
+		}
+		else if (info->ident == Qli) {
+		    if (parser->adnl == 0) {
+			Html_Put(parser, '\n');
+			parser->adnl = 1;
+			parser->column = 0;
+		    }
+		}
+
+		else if (info->ident == Qdl) {
+		    if (++parser->desc == 1 && !parser->list) {
+			if (parser->adnl < 2) {
+			    Html_Puts(parser, parser->adnl ? pnl : nlpnl);
+			    parser->adnl = 2;
+			    parser->column = 0;
+			}
+		    }
+		    else if (parser->adnl == 0) {
+			Html_Put(parser, '\n');
+			parser->adnl = 1;
+			parser->column = 0;
+		    }
+		    parser->spc = True;
+		}
+		else if (info->ident == Qdd) {
+		    if (parser->desc == 0) {
+			if (parser->adnl < 2) {
+			    Html_Puts(parser, parser->adnl ? pnl : nlpnl);
+			    parser->adnl = 2;
+			    parser->column = 0;
+			}
+		    }
+		    else if (parser->adnl == 0) {
+			Html_Put(parser, '\n');
+			parser->adnl = 1;
+			parser->column = 0;
+		    }
+		    parser->spc = True;
+		}
+		else if (info->ident == Qdt) {
+		    if (parser->adnl == 0) {
+			Html_Put(parser, '\n');
+			parser->adnl = 1;
+			parser->spc = True;
+			parser->column = 0;
+		    }
+		}
+	    }
+	    Html_Put(parser, '<');
+	    Html_Puts(parser, buf);
+	    break;
+    }
+
+    sz = 0;
+    while ((ch = Html_Peek(parser)) != '>' && ch != EOF) {
+	if (isspace(ch)) {
+	    (void)Html_Get(parser);
+	    ++sz;
+	    continue;
+	}
+	else if (sz) {
+	    Html_Put(parser, ' ');
+	    sz = 0;
+	}
+	Html_Put(parser, Html_Get(parser));
+    }
+    Html_Put(parser, Html_Get(parser));			/* eat `>' */
+    if (info && info->ident == Qbr) {
+	++parser->adnl;
+	parser->spc = True;
+	Html_Put(parser, '\n');
+	parser->quark = info->ident;
+	parser->column = 0;
+    }
+}
+
+/* tags */
+static int
+Html_Format3(Html_Parser *parser)
+{
+    int ch;
+
+    for (;;) {
+	if ((ch = Html_Get(parser)) == '<') {
+	    if (parser->quark == Qspace && parser->spc == False) {
+		Html_Put(parser, ' ');
+		parser->spc = True;
+	    }
+
+/*	    parser->quark = Qhide;*/
+	    Html_FormatTag(parser);
+	}
+	else
+	    return (ch);
+    }
+    /*NOTREACHED*/
+}
+
+/* entities */
+static int
+Html_Format2(Html_Parser *parser)
+{
+    int ch;
+
+    for (ch = Html_Format3(parser); ch == '&'; ch = Html_Format3(parser)) {
+	Html_Put(parser, '&');
+	while ((ch = Html_Peek(parser)) != ';') {
+	    if (isspace(ch) || ch == EOF)
+		break;
+	    Html_Put(parser, Html_Get(parser));
+	}
+	if (ch != EOF)
+	    Html_Put(parser, Html_Get(parser));
+	else
+	    break;
+	if (parser->pre)
+	    ++parser->column;
+    }
+
+    return (ch);
+}
+
+/* spaces */
+static int
+Html_Format1(Html_Parser *parser)
+{
+    int ch;
+
+    for (;;) {
+	if ((ch = Html_Format2(parser)) == EOF)
+	    return (ch);
+
+	if (parser->quark == Qetag) {
+	    if (parser->adnl < 2) {
+		Html_Puts(parser, parser->adnl ? pnl : nlpnl);
+		parser->adnl = 2;
+		parser->spc = True;
+	    }
+	}
+	else if (parser->quark == Qspace && parser->spc == False) {
+	    Html_Put(parser, ' ');
+	    parser->spc = True;
+	}
+
+	if (!parser->pre && isspace(ch))
+	    parser->quark = Qspace;
+	else {
+	    if (parser->pre) {
+		if (parser->spc) {
+		    /* did not yet see any non space character */
+		    if (isspace(ch)) {
+			if (ch == '\n') {
+			    parser->column = 0;
+			    parser->spc = False;
+			    parser->adnl = 1;
+			}
+			else if (ch == '\t')
+			    parser->column += 8 - (parser->column % 8);
+			else
+			    ++parser->column;
+			continue;
+		    }
+		    else {
+			int column = parser->column;
+
+			while (column-- > 0)
+			    Html_Put(parser, ' ');
+			parser->spc = False;
+			parser->adnl = 0;
+		    }
+		}
+		else if (ch == '\n') {
+		    ++parser->adnl;
+		    parser->column = 0;
+		}
+		else if (ch == '\t') {
+		    int column = parser->column + (8 - (parser->column % 8));
+
+		    parser->adnl = 0;
+		    while (parser->column < column) {
+			Html_Put(parser, ' ');
+			++parser->column;
+		    }
+		    continue;
+		}
+		else {
+		    parser->adnl = 0;
+		    ++parser->column;
+		}
+	    }
+	    else
+		parser->adnl = 0;
+	    Html_Put(parser, ch);
+	    parser->quark = Qdefault;
+	    parser->spc = False;
+	}
+    }
+}
+
+/************************************************************************/
+/* ARGUMENTS								*/
+/************************************************************************/
+static void
+Html_AArgs(Html_Parser *parser, Html_Item *item)
+{
+    int ch, sz;
+    char buf[32];
+
+    /*CONSTCOND*/
+    while (True) {
+	sz = 0;
+	while ((ch = Html_Peek(parser)) != '>' && ch != EOF) {
+	    if (isalnum(ch))
+		break;
+	    else
+		(void)Html_Get(parser);
+	}
+
+	if (ch == '>' || ch == EOF)
+	    return;
+	buf[sz++] = tolower(Html_Get(parser));
+	while ((ch = Html_Peek(parser)) != '>' && ch != EOF)
+	    if (isalnum(ch))
+		buf[sz++] = tolower(Html_Get(parser));
+	    else
+		break;
+	buf[sz] = '\0';
+	if (strcmp(buf, "href") == 0) {
+	    item->combine = XawTextSinkCopyProperty(XawTextGetSink(text),
+						    item->info->ident);
+	    item->override = True;
+	    item->combine->xlfd_mask = 0L;
+	    item->combine->mask = XAW_TPROP_UNDERLINE | XAW_TPROP_FOREGROUND;
+	    item->combine->foreground = parser->alink;
+	    return;
+	}
+	while ((ch = Html_Peek(parser)) != '>' && ch != EOF) {
+	    if (isspace(ch))
+		break;
+	    else
+		(void)Html_Get(parser);
+	}
+    }
+}
+
+static void
+Html_FontArgs(Html_Parser *parser, Html_Item *item)
+{
+    int ch, sz;
+    char name[32], value[256], xlfd[128];
+
+    item->combine = XawTextSinkCopyProperty(XawTextGetSink(text),
+					    Qdefault);
+    item->override = True;
+    item->combine->mask = item->combine->xlfd_mask = 0L;
+
+    /*CONSTCOND*/
+    while (True) {
+	/* skip white spaces */
+	while ((ch = Html_Peek(parser)) != '>' && ch != EOF) {
+	    if (isalnum(ch))
+		break;
+	    else
+		(void)Html_Get(parser);
+	}
+
+	if (ch == '>' || ch == EOF)
+	    return;
+
+	/* read option name */
+	sz = 0;
+	name[sz++] = tolower(Html_Get(parser));
+	while ((ch = Html_Peek(parser)) != '>' && ch != EOF)
+	    if (isalnum(ch) && sz + 1 <= sizeof(name))
+		name[sz++] = tolower(Html_Get(parser));
+	    else
+		break;
+	name[sz] = '\0';
+
+	if (ch != '=')
+	    continue;
+	(void)Html_Get(parser);	/* skip `=' */
+	if (Html_Peek(parser) == '"')
+	    (void)Html_Get(parser);
+
+	sz = 0;
+	while ((ch = Html_Peek(parser)) != '>' && ch != EOF) {
+	    if (!isspace(ch) && sz + 1 <= sizeof(value))
+		value[sz++] = Html_Get(parser);
+	    else
+		break;
+	}
+	value[sz] = '\0';
+	if (sz > 0 && value[sz - 1] == '"')
+	    value[--sz] = '\0';
+
+	if (strcmp(name, "color") == 0) {
+	    XColor  color, exact;
+
+	    if (XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap,
+				 value, &color, &exact)) {
+		item->combine->mask |= XAW_TPROP_FOREGROUND;
+		item->combine->foreground = color.pixel;
+	    }
+	}
+	else if (strcmp(name, "face") == 0) {
+	    int count = 0;
+	    char *ptr, *family, **font_list;
+
+	    ptr = value;
+	    do {
+		family = ptr;
+		ptr = strchr(ptr, ',');
+		if (ptr)
+		    *ptr++ = '\0';
+		XmuSnprintf(xlfd, sizeof(xlfd), "-*-%s-*-*-*-*-*-*-*-*-*-*-*-*",
+			    family);
+		font_list = XListFonts(XtDisplay(toplevel), xlfd, 1, &count);
+		if (font_list)
+		    XFreeFontNames(font_list);
+		if (count)
+		    break;
+	    } while (ptr);
+	    if (count) {
+		item->combine->xlfd_mask |= XAW_TPROP_FAMILY;
+		item->combine->family = XrmStringToQuark(family);
+	    }
+	}
+	else if (strcmp(name, "size") == 0) {
+	    int size, sign;
+
+	    if (isalnum(*value)) {
+		size = atoi(value);
+		sign = 0;
+	    }
+	    else {
+		char *str = XrmQuarkToString(item->combine->pixel_size);
+
+		size = str ? atoi(str) : 12;
+		if (*value == '+') {
+		    size += atoi(value + 1);
+		    sign = 1;
+		}
+		else if (*value == '-') {
+		    size -= atoi(value + 1);
+		    sign = -1;
+		}
+	    }
+
+	    if (item->combine->xlfd != NULLQUARK) {
+		int count, ucount, dcount, usize, dsize;
+		char **current, **result, **up, **down;
+
+		current = result = up = down = NULL;
+		/* try to load an appropriate font */
+		XmuSnprintf(value, sizeof(value),
+			    "-*-%s-%s-%s-*--%%d-*-*-*-*-*-%s-%s",
+			    XrmQuarkToString(item->combine->family),
+			    XrmQuarkToString(item->combine->weight),
+			    XrmQuarkToString(item->combine->slant),
+			    XrmQuarkToString(item->combine->registry),
+			    XrmQuarkToString(item->combine->encoding));
+		XmuSnprintf(xlfd, sizeof(xlfd), value,
+			    atoi(XrmQuarkToString(item->combine->pixel_size)));
+		current = XListFonts(XtDisplay(toplevel), xlfd, 1, &count);
+		if (count) {
+		    ucount = dcount = usize = dsize = 0;
+
+		    XmuSnprintf(xlfd, sizeof(xlfd), value, size);
+		    result = XListFonts(XtDisplay(toplevel), xlfd, 1, &count);
+		    if (count == 0 || strstr(*result, "-0-")) {
+			if (sign <= 0) {
+			    sz = dsize = size;
+			    while (dcount == 0 && --sz > size - 8 && sz > 1) {
+				XmuSnprintf(xlfd, sizeof(xlfd), value, sz);
+				down = XListFonts(XtDisplay(toplevel), xlfd,
+						  1, &dcount);
+				if (dcount && strstr(*down, "-0-") != NULL) {
+				    XFreeFontNames(down);
+				    down = NULL;
+				    dcount = 0;
+				}
+			    }
+			    if (dcount)
+				dsize = sz;
+			}
+			if (sign >= 0) {
+			    sz = usize = size;
+			    while (ucount == 0 && ++sz < size + 8) {
+				XmuSnprintf(xlfd, sizeof(xlfd), value, sz);
+				up = XListFonts(XtDisplay(toplevel), xlfd,
+						1, &ucount);
+				if (ucount && strstr(*up, "-0-") != NULL) {
+				    XFreeFontNames(up);
+				    up = NULL;
+				    ucount = 0;
+				}
+			    }
+			    if (ucount)
+				usize = sz;
+			}
+			if (ucount && dcount)
+			    size = size - dsize < usize - size ? dsize : usize;
+			else if (ucount)
+			    size = usize;
+			else if (dcount)
+			    size = dsize;
+		    }
+		    if (current)
+			XFreeFontNames(current);
+		    if (result)
+			XFreeFontNames(result);
+		    if (up)
+			XFreeFontNames(up);
+		    if (down)
+			XFreeFontNames(down);
+		}
+	    }
+
+	    XmuSnprintf(value, sizeof(value), "%d", size);
+	    item->combine->xlfd_mask |= XAW_TPROP_PIXELSIZE;
+	    item->combine->pixel_size = XrmStringToQuark(value);
+	}
+
+	while ((ch = Html_Peek(parser)) != '>' && ch != EOF) {
+	    if (isspace(ch))
+		break;
+	    else
+		(void)Html_Get(parser);
+	}
+    }
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/help.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/help.h:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/help.h	Tue Jun 13 16:15:51 2000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.h,v 1.1 2000/06/13 23:15:51 dawes Exp $
+ */
+
+/* help string definitions */
+#define	HELP_DEVICES	"helpDevices"	/* Configure Layout */
+#define	HELP_SCREEN	"helpScreen"	/* Configure Screen */
+#define HELP_MODELINE	"helpModeline"	/* Configure Modeline */
+#define HELP_ACCESSX	"helpAccessX"	/* Configure AccessX */
+
+/*
+ * Prototypes
+ */
+void Help(char*);
+void HelpCancelAction(Widget, XEvent*, String*, Cardinal*);
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c:1.4
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c	Wed Jun 14 14:57:57 2000
@@ -0,0 +1,1861 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.4 2000/06/14 21:57:57 dawes Exp $
+ */
+
+#include <X11/IntrinsicP.h>
+#include <X11/StringDefs.h>
+#include <X11/Composite.h>
+#include <X11/Shell.h>
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Simple.h>
+#include <X11/Xaw/Paned.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Command.h>
+#include <X11/Xaw/MenuButton.h>
+#include <X11/Xaw/SmeBSB.h>
+#include <X11/Xaw/SmeLine.h>
+#include <X11/Xaw/SimpleMenP.h>
+#include <X11/Xaw/Dialog.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include "xf86config.h"
+#include "mouse-cfg.h"
+#include "keyboard-cfg.h"
+#include "card-cfg.h"
+#include "monitor-cfg.h"
+#include "screen-cfg.h"
+#include "screen.h"
+#include "cards.h"
+#include "options.h"
+#include "vidmode.h"
+#include "help.h"
+
+#define randomize()		srand((unsigned)time((time_t*)NULL))
+#define DefaultXFree86Dir	"/usr/X11R6"
+
+/*
+ * Prototypes
+ */
+void DrawCables(void);
+static void DrawCable(Display*, Window, int, int, int, int);
+static void ComputerEventHandler(Widget, XtPointer, XEvent*, Boolean*);
+void SelectDeviceAction(Widget, XEvent*, String*, Cardinal*);
+void MoveDeviceAction(Widget, XEvent*, String*, Cardinal*);
+void UnselectDeviceAction(Widget, XEvent*, String*, Cardinal*);
+void RenameLayoutAction(Widget, XEvent*, String*, Cardinal*);
+void DevicePopupMenu(Widget, XEvent*, String*, Cardinal*);
+void DevicePopdownMenu(Widget, XEvent*, String*, Cardinal*);
+void AddDeviceCallback(Widget, XtPointer, XtPointer);
+void QuitCallback(Widget, XtPointer, XtPointer);
+void ConfigureDeviceCallback(Widget, XtPointer, XtPointer);
+void EnableDeviceCallback(Widget, XtPointer, XtPointer);
+void DisableDeviceCallback(Widget, XtPointer, XtPointer);
+void RemoveDeviceCallback(Widget, XtPointer, XtPointer);
+void InitializeDevices(void);
+void SetConfigModeCallback(Widget, XtPointer, XtPointer);
+void SelectLayoutCallback(Widget, XtPointer, XtPointer);
+void DefaultLayoutCallback(Widget, XtPointer, XtPointer);
+void RemoveLayoutCallback(Widget, XtPointer, XtPointer);
+void OptionsCallback(Widget, XtPointer, XtPointer);
+xf86cfgDevice *AddDevice(int, XtPointer, int, int);
+static Bool AskConfig(void);
+void WriteConfigAction(Widget, XEvent*, String*, Cardinal*);
+static void ScreenSetup(Bool);
+void QuitAction(Widget, XEvent*, String*, Cardinal*);
+static void ErrorCancelAction(Widget, XEvent*, String*, Cardinal*);
+static void QuitCancelAction(Widget, XEvent*, String*, Cardinal*);
+static void HelpCallback(Widget, XtPointer, XtPointer);
+
+extern void AccessXConfigureStart(void);
+extern void AccessXConfigureEnd(void);
+extern void CloseAccessXAction(Widget, XEvent*, String*, Cardinal*);
+
+/*
+ * Initialization
+ */
+Widget toplevel, work, config, layout, layoutsme, layoutp;
+XtAppContext appcon;
+
+char *XF86Config_path = NULL;
+char *XFree86Dir;
+Bool xf86config_set = False;
+
+xf86cfgComputer computer;
+xf86cfgDevice cpu_device;
+Cursor no_cursor;
+static Widget device, menu, layoutm, popup, commands;
+static int xpos, ypos;
+int sxpos, sypos;
+static char no_cursor_data[] = { 0,0,0,0, 0,0,0,0 };
+static GC cablegc, cablegcshadow;
+Atom wm_delete_window;
+
+#define CONFIG_LAYOUT	0
+#define CONFIG_SCREEN	1
+#define CONFIG_MODELINE	2
+#define CONFIG_ACCESSX	3
+static int config_mode = CONFIG_LAYOUT;
+
+static XtActionsRec actions[] = {
+    {"filter-card", CardFilterAction},
+    {"select-device", SelectDeviceAction},
+    {"move-device", MoveDeviceAction},
+    {"unselect-device", UnselectDeviceAction},
+    {"device-popup", DevicePopupMenu},
+    {"device-popdown", DevicePopdownMenu},
+    {"rename-layout", RenameLayoutAction},
+    {"write-config", WriteConfigAction},
+    {"quit", QuitAction},
+    {"vidmode-restore", VidmodeRestoreAction},
+    {"config-cancel", ConfigCancelAction},
+    {"options-cancel", OptionsCancelAction},
+    {"error-cancel", ErrorCancelAction},
+    {"quit-cancel", QuitCancelAction},
+    {"addmode-cancel", CancelForceAddModeAction},
+    {"accessx-close", CloseAccessXAction},
+    {"testmode-cancel", CancelTestModeAction},
+    {"help-close", HelpCancelAction},
+};
+
+static char *device_names[] = {
+/* MOUSE	*/
+    "mouse",
+/* KEYBOARD	*/
+    "keyboard",
+/* CARD		*/
+    "card",
+/* MONITOR	*/
+    "monitor",
+/* SCREEN	*/
+    "screen",
+};
+
+/*
+static XtResource appResources[] = {
+    {"xf86config",  "XF86Config",  XtRString, sizeof(char*),
+      0, XtRString, "/etc/X11/XF86Config"},
+};
+
+static XrmOptionDescRec optionDescList[] = {
+    {"-xf86config",  "*xf86config",  XrmoptionSepArg,  (XtPointer)"/etc/X11/XF86Config"},
+};
+*/
+
+/*
+ * Implementation
+ */
+int
+main(int argc, char *argv[])
+{
+    Widget pane, popup, mouse, keyboard, card, monitor;
+    Widget bottom, sme, smemodeline, help, quit, layopt;
+    XColor color, tmp;
+    Pixmap pixmap;
+    XGCValues values;
+    XF86ConfLayoutPtr lay;
+    int i, startedx;
+
+    if ((XFree86Dir = getenv("XWINHOME")) == NULL)
+	XFree86Dir = DefaultXFree86Dir;
+
+    chdir(XFree86Dir);
+
+    for (i = 1; i < argc; i++)
+	if (strcmp(argv[i], "-xf86config") == 0) {
+	    if (i + 1 < argc)
+		XF86Config_path = argv[i + 1];
+	    break;
+	}
+
+    startedx = startx();
+    if (XF86Config_path == NULL)
+	XF86Config_path = "/etc/X11/XF86Config";
+    toplevel = XtAppInitialize(&appcon, "XF86Cfg",
+/*			       optionDescList, XtNumber(optionDescList),*/
+		    	       NULL, 0,
+			       &argc, argv,
+			       NULL, NULL, 0);
+    if (DPY == NULL)
+	DPY = XtDisplay(toplevel);
+
+/*
+    XtGetApplicationResources(toplevel, (XtPointer)&XF86Config_path,
+			      appResources, XtNumber(appResources), NULL, 0);
+*/
+
+    XtAppAddActions(appcon, actions, XtNumber(actions));
+
+    XawSimpleMenuAddGlobalActions(appcon);
+    XtRegisterGrabAction(DevicePopupMenu, True,
+			 ButtonPressMask | ButtonReleaseMask,
+			 GrabModeAsync, GrabModeAsync);
+
+    pane = XtCreateManagedWidget("pane", panedWidgetClass,
+				 toplevel, NULL, 0);
+    menu = XtCreateManagedWidget("topM", menuButtonWidgetClass,
+				 pane, NULL, 0);
+    popup = XtCreatePopupShell("menu", simpleMenuWidgetClass,
+			       menu, NULL, 0);
+    sme = XtCreateManagedWidget("layout", smeBSBObjectClass,
+				popup, NULL, 0);
+    XtAddCallback(sme, XtNcallback, SetConfigModeCallback,
+		  (XtPointer)CONFIG_LAYOUT);
+    sme = XtCreateManagedWidget("screen", smeBSBObjectClass,
+				popup, NULL, 0);
+    XtAddCallback(sme, XtNcallback, SetConfigModeCallback,
+		  (XtPointer)CONFIG_SCREEN);
+    smemodeline = XtCreateManagedWidget("modeline", smeBSBObjectClass,
+					popup, NULL, 0);
+    XtAddCallback(smemodeline, XtNcallback, SetConfigModeCallback,
+		  (XtPointer)CONFIG_MODELINE);
+    sme = XtCreateManagedWidget("accessx", smeBSBObjectClass,
+				popup, NULL, 0);
+    XtAddCallback(sme, XtNcallback, SetConfigModeCallback,
+		  (XtPointer)CONFIG_ACCESSX);
+
+    commands = XtCreateManagedWidget("commands", formWidgetClass,
+				     pane, NULL, 0);
+    mouse = XtCreateManagedWidget("mouse", commandWidgetClass,
+				  commands, NULL, 0);
+    XtAddCallback(mouse, XtNcallback, AddDeviceCallback, (XtPointer)MOUSE);
+    keyboard = XtCreateManagedWidget("keyboard", commandWidgetClass,
+				     commands, NULL, 0);
+    XtAddCallback(keyboard, XtNcallback, AddDeviceCallback, (XtPointer)KEYBOARD);
+    card = XtCreateManagedWidget("card", commandWidgetClass,
+				 commands, NULL, 0);
+    XtAddCallback(card, XtNcallback, AddDeviceCallback, (XtPointer)CARD);
+    monitor = XtCreateManagedWidget("monitor", commandWidgetClass,
+				    commands, NULL, 0);
+    XtAddCallback(monitor, XtNcallback, AddDeviceCallback, (XtPointer)MONITOR);
+
+    work = XtCreateManagedWidget("work", compositeWidgetClass,
+				 pane, NULL, 0);
+
+    bottom = XtCreateManagedWidget("bottom", formWidgetClass,
+				   pane, NULL, 0);
+    layoutm = XtCreateManagedWidget("select", menuButtonWidgetClass,
+				    bottom, NULL, 0);
+    layout = XtVaCreateManagedWidget("layout", asciiTextWidgetClass,
+				     bottom,
+				     XtNeditType, XawtextEdit,
+				     NULL, 0);
+    layoutp = XtCreatePopupShell("menu", simpleMenuWidgetClass,
+				 bottom, NULL, 0);
+    sme = XtCreateManagedWidget("new", smeBSBObjectClass, layoutp,
+				NULL, 0);
+    XtAddCallback(sme, XtNcallback, SelectLayoutCallback, NULL);
+    help = XtCreateManagedWidget("help", commandWidgetClass,
+				 bottom, NULL, 0);
+    XtAddCallback(help, XtNcallback, HelpCallback, NULL);
+    quit = XtCreateManagedWidget("quit", commandWidgetClass,
+				 bottom, NULL, 0);
+    XtAddCallback(quit, XtNcallback, QuitCallback, NULL);
+
+    layopt = XtCreatePopupShell("options", simpleMenuWidgetClass,
+				layoutp, NULL, 0);
+    sme = XtCreateManagedWidget("default", smeBSBObjectClass,
+				layopt, NULL, 0);
+    XtAddCallback(sme, XtNcallback, DefaultLayoutCallback, NULL);
+    sme = XtCreateManagedWidget("remove", smeBSBObjectClass,
+				layopt, NULL, 0);
+    XtAddCallback(sme, XtNcallback, RemoveLayoutCallback, NULL);
+
+    XtRealizeWidget(layopt);
+
+    XtRealizeWidget(toplevel);
+    XtRealizeWidget(menu);
+
+    pixmap = XCreateBitmapFromData(XtDisplay(toplevel), XtWindow(toplevel),
+				   no_cursor_data, 8, 8);
+    XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap, "black",
+		     &color, &tmp);
+    no_cursor = XCreatePixmapCursor(XtDisplay(toplevel), pixmap, pixmap,
+				    &color, &color, 0, 0);
+
+    XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap, "gray55",
+		     &color, &tmp);
+    values.line_width = 3;
+    values.foreground = color.pixel;
+    cablegcshadow = XCreateGC(XtDisplay(toplevel), XtWindow(toplevel),
+			GCForeground | GCLineWidth, &values);
+    XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap, "gray85",
+		     &color, &tmp);
+    values.line_width = 1;
+    values.foreground = color.pixel;
+    cablegc = XCreateGC(XtDisplay(toplevel), XtWindow(toplevel),
+			GCForeground | GCLineWidth, &values);
+
+    computer.cpu = XtCreateManagedWidget("cpu", simpleWidgetClass,
+					 work, NULL, 0);
+    cpu_device.widget = computer.cpu;
+    cpu_device.type = SERVER;
+
+    XtAddEventHandler(work, ExposureMask, False,
+		      ComputerEventHandler, (XtPointer)NULL);
+
+    wm_delete_window = XInternAtom(DPY, "WM_DELETE_WINDOW", False);
+    XSetWMProtocols(DPY, XtWindow(toplevel), &wm_delete_window, 1);
+
+    StartConfig();
+    InitializeDevices();
+    XtSetSensitive(smemodeline, VideoModeInitialize());
+    ReadCardsDatabase();
+
+    lay = XF86Config->conf_layout_lst;
+    while (lay != NULL) {
+	sme = XtVaCreateManagedWidget("sme", smeBSBObjectClass,
+				      layoutp,
+				      XtNlabel, lay->lay_identifier,
+				      XtNmenuName, "options",
+				      NULL, 0);
+	XtAddCallback(sme, XtNcallback, SelectLayoutCallback, (XtPointer)lay);
+	if (layoutsme == NULL)
+	    layoutsme = sme;
+	lay = (XF86ConfLayoutPtr)(lay->list.next);
+    }
+    SelectLayoutCallback(layoutsme,
+			 XF86Config->conf_layout_lst, NULL);
+
+    if (startedx) {
+	startaccessx();
+	switch (fork()) {
+	    case 0: {
+		char path[PATH_MAX];
+
+		XmuSnprintf(path, sizeof(path), "%s/bin/twm", XFree86Dir);
+		execl(path, "twm", NULL);
+		exit(-127);
+	    }	break;
+	    case -1:
+		fprintf(stderr, "Cannot fork.\n");
+		exit(1);
+		break;
+	    default:
+		break;
+	}
+    }
+
+    XtAppMainLoop(appcon);
+    if (startedx)
+	endx();
+
+    return (0);
+}
+
+static Widget shell_cf;
+static int write_cf, asking_cf;
+static int cf_state = 0;
+#define	CF_XF86Config	1
+#define	CF_XKBConfig	2
+#define CF_First	CF_XF86Config
+#define CF_Last		CF_XKBConfig
+
+/*ARGSUSED*/
+static void
+WriteConfig(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    asking_cf = 0;
+    XtPopdown(shell_cf);
+    write_cf = (int)user_data;
+}
+
+/*ARGSUSED*/
+void
+QuitCancelAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    WriteConfig(w, (XtPointer)-1, NULL);
+}
+
+/*ARGSUSED*/
+void
+WriteConfigAction(Widget w, XEvent *event,
+		  String *params, Cardinal *num_params)
+{
+    WriteConfig(w, (XtPointer)True, NULL);
+}
+
+static Bool
+AskConfig(void)
+{
+    static Widget dialog;
+
+    if (shell_cf == NULL) {
+	Arg args[1];
+	char *l, *label;
+
+	shell_cf = XtCreatePopupShell("quit", transientShellWidgetClass,
+				      toplevel, NULL, 0);
+	dialog = XtVaCreateManagedWidget("ask", dialogWidgetClass, shell_cf,
+					 XtNvalue, XF86Config_path, NULL, 0);
+	XawDialogAddButton(dialog, "yes", WriteConfig, (XtPointer)1);
+	XawDialogAddButton(dialog, "no", WriteConfig, (XtPointer)0);
+	XawDialogAddButton(dialog, "cancel", WriteConfig, (XtPointer)-1);
+	XtRealizeWidget(shell_cf);
+	XSetWMProtocols(DPY, XtWindow(shell_cf), &wm_delete_window, 1);
+	XtSetArg(args[0], XtNlabel, &l);
+	XtGetValues(dialog, args, 1);
+	label = XtMalloc(strlen(l) + 12);
+	strcpy(label, "XF86Config\n");
+	strcat(label, l);
+	XtSetArg(args[0], XtNlabel, label);
+	XtSetValues(dialog, args, 1);
+	XtFree(label);
+    }
+    else {
+	Arg args[2];
+	Cardinal num_args = 0;
+	char *l, *label, *str = "";
+
+	XtSetArg(args[0], XtNlabel, &l);
+	XtGetValues(dialog, args, 1);
+	switch (cf_state) {
+	    case CF_XF86Config:
+		str = "XF86Config";
+		XtSetArg(args[num_args], XtNvalue, XF86Config_path);
+		++num_args;
+		break;
+	    case CF_XKBConfig:
+		str = "XKB";
+		XtSetArg(args[num_args], XtNvalue, XkbConfigDir XkbConfigFile);
+		++num_args;
+		break;
+	}
+	l = strchr(l, '\n');
+	if (l != NULL) {
+	    label = XtMalloc(strlen(str) + strlen(l) + 1);
+	    strcpy(label, str);
+	    strcat(label, l);
+	    XtSetArg(args[num_args], XtNlabel, label);
+	    ++num_args;
+	}
+	XtSetValues(dialog, args, num_args);
+	if (l != NULL)
+	    XtFree(label);
+    }
+
+    asking_cf = 1;
+
+    XtPopup(shell_cf, XtGrabExclusive);
+    while (asking_cf)
+	XtAppProcessEvent(XtWidgetToApplicationContext(shell_cf), XtIMAll);
+
+    if (write_cf > 0)
+	XF86Config_path = XawDialogGetValueString(dialog);
+
+    return (write_cf);
+}
+
+/*ARGSUSED*/
+void
+PopdownErrorCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XtPopdown((Widget)user_data);
+}
+
+/*ARGSUSED*/
+void
+ErrorCancelAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    XtPopdown((Widget)w);
+}
+
+/*ARGSUSED*/
+void
+QuitAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    QuitCallback(w, NULL, NULL);
+}
+
+/*ARGSUSED*/
+void
+QuitCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    for (cf_state = CF_First; cf_state <= CF_Last; cf_state++) {
+	if (cf_state == CF_XKBConfig && xkb_info == NULL)
+	    continue;
+	
+	switch (AskConfig()) {
+	    case 0:
+		break;
+	    case 1:
+		if ((cf_state == CF_XF86Config &&
+		     !xf86WriteConfigFile(XF86Config_path, XF86Config)) ||
+		    (cf_state == CF_XKBConfig &&
+		     !WriteXKBConfiguration(XkbConfigDir XkbConfigFile,
+					    &xkb_info->config))) {
+		    static Widget shell;
+
+		    if (shell == NULL) {
+			Widget dialog;
+
+			shell = XtCreatePopupShell("error",
+				transientShellWidgetClass,
+				toplevel, NULL, 0);
+			dialog = XtVaCreateManagedWidget("notice",
+				 dialogWidgetClass,
+				 shell, XtNvalue, NULL,
+				 NULL, 0);
+			XawDialogAddButton(dialog, "ok", PopdownErrorCallback,
+					   (XtPointer)shell);
+			XtRealizeWidget(shell);
+			XSetWMProtocols(DPY, XtWindow(shell),
+					&wm_delete_window, 1);
+		    }
+		    XtPopup(shell, XtGrabExclusive);
+		    return;
+		}
+		break;
+	    default:
+		return;
+	}
+    }
+
+    endx();
+    exit(0);
+}
+
+void
+InitializeDevices(void)
+{
+    xf86cfgDevice *device;
+    int mouse_x, mouse_y, keyboard_x, keyboard_y,
+	card_x, card_y, monitor_x, monitor_y, len;
+    XF86ConfInputPtr input = XF86Config->conf_input_lst;
+    XF86ConfDevicePtr card = XF86Config->conf_device_lst;
+    XF86ConfMonitorPtr monitor = XF86Config->conf_monitor_lst;
+    XF86OptionPtr flags = NULL;
+    char buffer[4096], *tip;
+    Arg args[1];
+
+    if (XF86Config->conf_flags != NULL)
+	flags = XF86Config->conf_flags->flg_option_lst;
+
+    len = 0;
+    while (flags && len < sizeof(buffer) - 1) {
+	len += XmuSnprintf(buffer + len, sizeof(buffer) - len,
+			   "Option     \"%s\"",
+			   flags->opt_name);
+	if (flags->opt_val != NULL)
+	    len += XmuSnprintf(buffer + len, sizeof(buffer) - len,
+			       " \"%s\"\n",
+			       flags->opt_val);
+	else
+	    len += XmuSnprintf(buffer + len, sizeof(buffer) - len,
+			       "%s", "\n");
+	flags = (XF86OptionPtr)(flags->list.next);
+    }
+
+    if (len) {
+	tip = XtNewString(buffer);
+	XtSetArg(args[0], XtNtip, tip);
+	XtSetValues(computer.cpu, args, 1);
+    }
+
+#define DEFAULT_MOUSE_WIDTH	30
+#define DEFAULT_MOUSE_HEIGHT	40
+#define DEFAULT_KEYBOARD_WIDTH	48
+#define DEFAULT_KEYBOARD_HEIGHT	36
+    mouse_x = work->core.width - (work->core.width >> 2);
+    mouse_y = work->core.height - DEFAULT_MOUSE_HEIGHT;
+    keyboard_x = 6;
+    keyboard_y = work->core.height - DEFAULT_KEYBOARD_HEIGHT;
+
+    while (input != NULL) {
+	if (strcasecmp(input->inp_driver, "mouse") == 0) {
+	    device = AddDevice(MOUSE, (XtPointer)input, mouse_x, mouse_y);
+	    SetTip(device);
+	    if ((mouse_x += DEFAULT_MOUSE_WIDTH) > work->core.width) {
+		if ((mouse_y -= DEFAULT_MOUSE_HEIGHT) < (work->core.height >> 1))
+		    mouse_y = work->core.height >> 1;
+		mouse_x = work->core.width - (work->core.width >> 2);
+	    }
+	}
+	else if (strcasecmp(input->inp_driver, "keyboard") == 0) {
+	    device = AddDevice(KEYBOARD, (XtPointer)input, keyboard_x, keyboard_y);
+	    SetTip(device);
+	    if ((keyboard_x += DEFAULT_KEYBOARD_WIDTH) >
+		work->core.width - (work->core.width >> 2))  {
+		if ((keyboard_y -= DEFAULT_KEYBOARD_HEIGHT) < (work->core.height >> 1))
+		    keyboard_y = work->core.height >> 1;
+		keyboard_x = 6;
+	    }
+	}
+	input = (XF86ConfInputPtr)(input->list.next);
+    }
+
+#define DEFAULT_CARD_WIDTH	45
+#define DEFAULT_CARD_HEIGHT	46
+    card_x = 6;
+    card_y = (work->core.height >> 1) - 20 - DEFAULT_CARD_HEIGHT;
+    while (card != NULL) {
+	device = AddDevice(CARD, (XtPointer)card, card_x, card_y);
+	SetTip(device);
+	if ((card_x += DEFAULT_CARD_WIDTH) > work->core.width) {
+	    if ((card_y -= DEFAULT_CARD_HEIGHT) < (work->core.height >> 2))
+		card_y = work->core.height >> 2;
+	    card_x = 6;
+	}
+	card = (XF86ConfDevicePtr)(card->list.next);
+    }
+
+#define DEFAULT_MONITOR_WIDTH	48
+#define DEFAULT_MONITOR_HEIGHT	48
+    monitor_x = 6;
+    monitor_y = 6;
+    while (monitor != NULL) {
+	XF86ConfScreenPtr screen = XF86Config->conf_screen_lst;
+
+	device = AddDevice(MONITOR, (XtPointer)monitor, monitor_x, monitor_y);
+	SetTip(device);
+	if ((monitor_x += DEFAULT_MONITOR_WIDTH) > work->core.width) {
+	    if ((monitor_y += DEFAULT_MONITOR_HEIGHT) >
+		(work->core.height >> 2) - DEFAULT_MONITOR_HEIGHT)
+		monitor_y = (work->core.height >> 2) - DEFAULT_MONITOR_HEIGHT;
+	    monitor_x = 6;
+	}
+
+	while (screen != NULL) {
+	    if (screen->scrn_monitor == monitor) {
+		card = XF86Config->conf_device_lst;
+		while (card != NULL) {
+		    if (screen->scrn_device == card) {
+			xf86cfgScreen *scr = (xf86cfgScreen*)
+			    XtCalloc(1, sizeof(xf86cfgScreen));
+			int i;
+
+			for (i = 0; i < computer.num_devices; i++)
+			    if ((XF86ConfDevicePtr)(computer.devices[i]->config)
+				== card)
+				break;
+			scr->screen = screen;
+			scr->card = computer.devices[i];
+			scr->monitor = device;
+			scr->refcount = 0;
+			++scr->card->refcount;
+			++scr->monitor->refcount;
+			computer.screens = (xf86cfgScreen**)
+				XtRealloc((XtPointer)computer.screens,
+					  sizeof(xf86cfgScreen*) *
+					  (computer.num_screens + 1));
+			CreateScreenWidget(scr);
+			scr->type = SCREEN;
+			computer.screens[computer.num_screens++] = scr;
+			SetTip((xf86cfgDevice*)scr);
+			break;
+		    }
+		    card = (XF86ConfDevicePtr)(card->list.next);
+		}
+		device->state = USED;
+	    }
+	    screen = (XF86ConfScreenPtr)(screen->list.next);
+	}
+
+	monitor = (XF86ConfMonitorPtr)(monitor->list.next);
+    }
+}
+
+xf86cfgDevice *
+AddDevice(int type, XtPointer config, int x, int y)
+{
+    switch (type) {
+	case MOUSE:
+	case KEYBOARD:
+	case CARD:
+	case MONITOR:
+	    computer.devices = (xf86cfgDevice**)
+		XtRealloc((XtPointer)computer.devices,
+			  sizeof(xf86cfgDevice*) * (computer.num_devices + 1));
+	    computer.devices[computer.num_devices] = (xf86cfgDevice*)
+		XtCalloc(1, sizeof(xf86cfgDevice));
+	    computer.devices[computer.num_devices]->config = config;
+	    computer.devices[computer.num_devices]->widget =
+		XtVaCreateManagedWidget(device_names[type], simpleWidgetClass,
+					work,
+					XtNx, x,
+					XtNy, y,
+					XtNtip, NULL,
+					NULL, 0);
+	    computer.devices[computer.num_devices]->type = type;
+	    computer.devices[computer.num_devices]->state = UNUSED;
+	    computer.devices[computer.num_devices]->refcount = 0;
+	    ++computer.num_devices;
+	    break;
+	default:
+	    fprintf(stderr, "Bad argument to AddDevice.\n");
+	    exit(1);
+	    return (NULL);
+    }
+
+    return (computer.devices[computer.num_devices - 1]);
+}
+
+/*ARGSUSED*/
+static void
+HelpCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    char *topic = NULL;
+
+    switch (config_mode) {
+	case CONFIG_LAYOUT:
+	    topic = HELP_DEVICES;
+	    break;
+	case CONFIG_SCREEN:
+	    topic = HELP_SCREEN;
+	    break;
+	case CONFIG_MODELINE:
+	    topic = HELP_MODELINE;
+	    break;
+	case CONFIG_ACCESSX:
+	    topic = HELP_ACCESSX;
+	    break;
+    }
+    Help(topic);
+}
+
+void
+SelectLayoutCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    int i, j;
+    XF86ConfLayoutPtr lay = (XF86ConfLayoutPtr)user_data;
+    XF86ConfInputrefPtr input;
+    XF86ConfAdjacencyPtr adj;
+    Arg args[1];
+    char *str;
+
+    if (lay == computer.layout)
+	return;
+
+    if (computer.layout != NULL) {
+	for (i = 0; i < computer.num_layouts; i++) {
+	    if (computer.layouts[i]->layout == computer.layout)
+		break;
+	}
+	if (i < computer.num_layouts) {
+	    XtFree((XtPointer)computer.layouts[i]->screen);
+	    XtFree((XtPointer)computer.layouts[i]->position);
+	}
+	else {
+	    computer.layouts = (xf86cfgLayout**)
+		XtRealloc((XtPointer)computer.layouts, sizeof(xf86cfgLayout*) *
+			  (computer.num_layouts + 1));
+	    ++computer.num_layouts;
+	}
+	computer.layouts[i] = (xf86cfgLayout*)XtCalloc(1, sizeof(xf86cfgLayout));
+	computer.layouts[i]->layout = computer.layout;
+	computer.layouts[i]->num_layouts = computer.num_screens;
+	computer.layouts[i]->screen = (xf86cfgScreen**)
+	    XtMalloc(sizeof(xf86cfgScreen*) * computer.num_screens);
+	computer.layouts[i]->position = (XPoint*)
+	    XtMalloc(sizeof(XPoint) * computer.num_screens);
+	for (j = 0; j < computer.num_screens; j++) {
+	    computer.layouts[i]->screen[j] = computer.screens[j];
+	    computer.layouts[i]->position[j].x = computer.screens[j]->widget->core.x;
+	    computer.layouts[i]->position[j].y = computer.screens[j]->widget->core.y;
+	}
+    }
+
+    if (lay != NULL) {
+	for (i = 0; i < computer.num_layouts; i++)
+	    if (computer.layouts[i]->layout == lay) {
+		for (j = 0; j < computer.layouts[i]->num_layouts; j++) {
+		    int k;
+
+		    for (k = 0; k < computer.num_screens; k++)
+			if (computer.screens[k] == computer.layouts[i]->screen[j]) {
+			    XtMoveWidget(computer.screens[k]->widget,
+					 computer.layouts[i]->position[j].x,
+					 computer.layouts[i]->position[j].y);
+			}
+		}
+		break;
+	    }
+
+	layoutsme = w;
+	XtSetArg(args[0], XtNlabel, &str);
+	XtGetValues(w, args, 1);
+	XtSetArg(args[0], XtNstring, str);
+	XtSetValues(layout, args, 1);
+    }
+
+    computer.layout = lay;
+
+    for (i = 0; i < computer.num_devices; i++)
+	computer.devices[i]->state = UNUSED;
+    for (i = 0; i < computer.num_screens; i++)
+	computer.screens[i]->state = UNUSED;
+
+    if (lay == NULL) {
+	char name[64];
+	XF86ConfLayoutPtr l;
+	int num_layouts = 0;
+
+	l = XF86Config->conf_layout_lst;
+	while (l != NULL) {
+	    if (l->lay_adjacency_lst == NULL &&
+		l->lay_inactive_lst == NULL &&
+		l->lay_input_lst == NULL &&
+		l->lay_option_lst == NULL &&
+		l->lay_comment == NULL) {
+		for (i = 0;
+		     i < ((CompositeWidget)layout)->composite.num_children; i++)
+		    if (strcmp(XtName(((CompositeWidget)layout)->composite.
+			       children[i]), l->lay_identifier) == 0) {
+			layoutsme = ((CompositeWidget)layout)->composite.children[i];
+		    }
+		computer.layout = l;
+		XtSetArg(args[0], XtNstring, l->lay_identifier);
+		XtSetValues(layout, args, 1);
+		if (config_mode == CONFIG_LAYOUT)
+		    DrawCables();
+		if (config_mode == CONFIG_SCREEN)
+		    ScreenSetup(True);
+		return;
+	    }
+	    ++num_layouts;
+	    l = (XF86ConfLayoutPtr)(l->list.next);
+	}
+	do {
+	    ++num_layouts;
+	    XmuSnprintf(name, sizeof(name), "Layout%d", num_layouts);
+	} while (xf86FindLayout(name,
+		 XF86Config->conf_layout_lst) != NULL);
+	l = (XF86ConfLayoutPtr)XtCalloc(1, sizeof(XF86ConfLayoutRec));
+
+	l->lay_identifier = XtNewString(name);
+	XF86Config->conf_layout_lst =
+	    xf86AddLayout(XF86Config->conf_layout_lst, l);
+	layoutsme = XtVaCreateManagedWidget("sme", smeBSBObjectClass,
+					    layoutp,
+					    XtNlabel, name,
+					    XtNmenuName, "options",
+					    NULL, 0);
+	XtAddCallback(layoutsme, XtNcallback,
+		      SelectLayoutCallback, (XtPointer)l);
+	computer.layout = l;
+	XtSetArg(args[0], XtNstring, name);
+	XtSetValues(layout, args, 1);
+	if (config_mode == CONFIG_LAYOUT)
+	    DrawCables();
+	if (config_mode == CONFIG_SCREEN)
+	    ScreenSetup(True);
+	return;
+    }
+
+    input = lay->lay_input_lst;
+    adj = lay->lay_adjacency_lst;
+
+    for (i = 0; i < computer.num_devices; i++)
+	if (computer.devices[i]->config != NULL &&
+	    (computer.devices[i]->type == MOUSE ||
+	     computer.devices[i]->type == KEYBOARD)) {
+	    while (input != NULL) {
+		if (strcmp(input->iref_inputdev_str, ((XF86ConfInputPtr)
+		    (computer.devices[i]->config))->inp_identifier) == 0) {
+		    computer.devices[i]->state = USED;
+		    break;
+		}
+		input = (XF86ConfInputrefPtr)(input->list.next);
+	    }
+	    input = lay->lay_input_lst;
+	}
+
+    for (i = 0; i < computer.num_devices; i++)
+	if (computer.devices[i]->type == CARD) {
+	    while (adj != NULL) {
+		XF86ConfScreenPtr screen = adj->adj_screen;
+
+		if (computer.devices[i]->config != NULL &&
+		    strcmp(screen->scrn_device_str, ((XF86ConfDevicePtr)
+		    (computer.devices[i]->config))->dev_identifier) == 0) {
+		    int j;
+
+		    for (j = 0; j < computer.num_screens; j++)
+			if (computer.screens[j]->card == computer.devices[i])
+			    break;
+		    computer.screens[j]->card->state = USED;
+		    if (computer.screens[j]->monitor != NULL)
+			computer.screens[j]->monitor->state = USED;
+		    computer.screens[j]->state = USED;
+		}
+
+		adj = (XF86ConfAdjacencyPtr)(adj->list.next);
+	    }
+	    adj = lay->lay_adjacency_lst;
+	}
+
+    if (config_mode == CONFIG_LAYOUT)
+	DrawCables();
+    else if (config_mode == CONFIG_SCREEN)
+	ScreenSetup(True);
+}
+
+/*ARGSUSED*/
+void
+DefaultLayoutCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Widget sme = (Widget)(((SimpleMenuWidget)(w->core.parent->core.parent))
+			->simple_menu.entry_set);
+    int i;
+    char *str;
+    Arg args[1];
+    XF86ConfLayoutPtr prev, tmp, lay;
+
+    XtSetArg(args[0], XtNlabel, &str);
+    XtGetValues(sme, args, 1);
+
+    prev = XF86Config->conf_layout_lst;
+    lay = xf86FindLayout(str, prev);
+    if (prev == lay)
+	return;
+
+    tmp = prev;
+    while (tmp != NULL) {
+	if (tmp == lay)
+	    break;
+	prev = tmp;
+	tmp = (XF86ConfLayoutPtr)(tmp->list.next);
+    }
+
+    for (i = 1; i < ((CompositeWidget)layoutp)->composite.num_children; i++)
+	XtDestroyWidget(((CompositeWidget)layoutp)->composite.children[i]);
+
+    prev->list.next = lay->list.next;
+    lay->list.next = XF86Config->conf_layout_lst;
+    XF86Config->conf_layout_lst = lay;
+
+    layoutsme = NULL;
+    lay = XF86Config->conf_layout_lst;
+    while (lay != NULL) {
+	sme = XtVaCreateManagedWidget("sme", smeBSBObjectClass,
+				      layoutp,
+				      XtNlabel, lay->lay_identifier,
+				      XtNmenuName, "options",
+				      NULL, 0);
+	XtAddCallback(sme, XtNcallback, SelectLayoutCallback, (XtPointer)lay);
+	if (layoutsme == NULL)
+	    layoutsme = sme;
+	lay = (XF86ConfLayoutPtr)(lay->list.next);
+    }
+    SelectLayoutCallback(layoutsme,
+			 XF86Config->conf_layout_lst, NULL);
+}
+
+/*ARGSUSED*/
+void
+RemoveLayoutCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XF86ConfLayoutPtr prev, tmp, lay, rem;
+    Widget sme = (Widget)(((SimpleMenuWidget)(w->core.parent->core.parent))
+			->simple_menu.entry_set);
+    char *str;
+    Arg args[1];
+
+    XtSetArg(args[0], XtNlabel, &str);
+    XtGetValues(sme, args, 1);
+    prev = XF86Config->conf_layout_lst;
+    lay = xf86FindLayout(str, prev);
+    tmp = prev;
+    while (tmp != NULL) {
+	if (tmp == lay)
+	    break;
+	prev = tmp;
+	tmp = (XF86ConfLayoutPtr)(tmp->list.next);
+    }
+
+    rem = lay;
+    if (tmp != NULL)
+	lay = (XF86ConfLayoutPtr)(tmp->list.next);
+    if (lay == NULL && prev != tmp)
+	lay = prev;
+
+    if (lay != NULL) {
+	int i;
+
+	for (i = 0; i < ((CompositeWidget)layoutp)->composite.num_children;
+	    i++) {
+	    XtSetArg(args[0], XtNlabel, &str);
+	    XtGetValues(((CompositeWidget)layoutp)->composite.children[i],
+			args, 1);
+	    if (strcmp(lay->lay_identifier, str) == 0) {
+		layoutsme = ((CompositeWidget)layoutp)->composite.children[i];
+		break;
+	    }
+	}
+	SelectLayoutCallback(layoutsme, lay, NULL);
+    }
+    else {
+	int i;
+
+	computer.layout = NULL;
+	XtSetArg(args[0], XtNstring, "");
+	XtSetValues(layout, args, 1);
+
+	for (i = 0; i < computer.num_devices; i++)
+	    computer.devices[i]->state = UNUSED;
+	DrawCables();
+    }
+
+    xf86RemoveLayout(XF86Config, rem);
+    XtDestroyWidget(sme);
+}
+
+void
+SetTip(xf86cfgDevice *device)
+{
+    XF86OptionPtr option;
+    char *tip, buffer[4096];
+    Arg args[1];
+    int len;
+
+    XtSetArg(args[0], XtNtip, &tip);
+    XtGetValues(device->widget, args, 1);
+    if (tip)
+	XtFree((XtPointer)tip);
+
+    switch (device->type) {
+	case MOUSE: {
+	    XF86ConfInputPtr mouse = (XF86ConfInputPtr)device->config;
+
+	    if (mouse == NULL)
+		return;
+	    len = XmuSnprintf(buffer, sizeof(buffer),
+			      "Identifier \"%s\"\n"
+			      "Driver     \"mouse\"\n",
+			      mouse->inp_identifier);
+	    option = mouse->inp_option_lst;
+	}   break;
+	case KEYBOARD: {
+    	    XF86ConfInputPtr keyboard = (XF86ConfInputPtr)device->config;
+
+	    if (keyboard == NULL)
+		return;
+	    len = XmuSnprintf(buffer, sizeof(buffer),
+			      "Identifier \"%s\"\n"
+			      "Driver     \"keyboard\"\n",
+			      keyboard->inp_identifier);
+	    option = keyboard->inp_option_lst;
+	}   break;
+	case CARD: {
+	    XF86ConfDevicePtr card = (XF86ConfDevicePtr)device->config;
+
+	    if (card == NULL)
+		return;
+	    len = XmuSnprintf(buffer, sizeof(buffer),
+			      "Identifier \"%s\"\n"
+			      "Driver     \"%s\"\n",
+			      card->dev_identifier,
+			      card->dev_driver);
+	    option = card->dev_option_lst;
+	}   break;
+	case MONITOR: {
+	    XF86ConfMonitorPtr monitor = (XF86ConfMonitorPtr)device->config;
+
+	    if (monitor == NULL)
+		return;
+	    len = XmuSnprintf(buffer, sizeof(buffer),
+			      "Identifier \"%s\"\n"
+			      "Vendor     \"%s\"\n",
+			      monitor->mon_identifier,
+			      monitor->mon_vendor);
+	    option = monitor->mon_option_lst;
+	}   break;
+	case SCREEN: {
+	    XF86ConfScreenPtr screen = (XF86ConfScreenPtr)device->config;
+
+	    if (screen == NULL)
+		return;
+	    len = XmuSnprintf(buffer, sizeof(buffer),
+			      "Identifier \"%s\"\n",
+			      screen->scrn_identifier);
+	    if (screen->scrn_device_str != NULL)
+		len += XmuSnprintf(buffer + len, sizeof(buffer),
+				   "Device     \"%s\"\n",
+				   screen->scrn_device_str);
+	    if (screen->scrn_monitor_str != NULL)
+		len += XmuSnprintf(buffer + len, sizeof(buffer),
+				   "Monitor    \"%s\"\n",
+				   screen->scrn_monitor_str);
+	    option = screen->scrn_option_lst;
+	}   break;
+	case SERVER: {
+	    len = XmuSnprintf(buffer, sizeof(buffer),
+			      "%s\n", "Server Flags");
+	    option = XF86Config->conf_flags->flg_option_lst;
+	}   break;
+    }
+
+    while (option && len < sizeof(buffer) - 1) {
+	len += XmuSnprintf(buffer + len, sizeof(buffer) - len,
+			   "Option     \"%s\"",
+			   option->opt_name);
+	if (option->opt_val != NULL)
+	    len += XmuSnprintf(buffer + len, sizeof(buffer) - len,
+			       " \"%s\"\n",
+			       option->opt_val);
+	else
+	    len += XmuSnprintf(buffer + len, sizeof(buffer) - len,
+			       "%s", "\n");
+	option = (XF86OptionPtr)(option->list.next);
+    }
+
+    tip = XtNewString(buffer);
+    XtSetArg(args[0], XtNtip, tip);
+    XtSetValues(device->widget, args, 1);
+}
+
+/*ARGSUSED*/
+void
+AddDeviceCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    AddDevice((int)user_data, NULL, 6, 6);
+}
+
+void
+ConfigureDeviceCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    int i, j;
+
+    if (config_mode == CONFIG_LAYOUT) {
+	for (i = 0; i < computer.num_devices; i++) {
+	    if (computer.devices[i]->widget == config) {
+		switch (computer.devices[i]->type) {
+		    case MOUSE: {
+			XF86ConfInputPtr mouse =
+			    MouseConfig(computer.devices[i]->config);
+
+			if (mouse != NULL && computer.devices[i]->config == NULL) {
+			    XF86Config->conf_input_lst =
+				xf86AddInput(XF86Config->conf_input_lst,
+					     mouse);
+			    computer.devices[i]->config = (XtPointer)mouse;
+			}
+			SetTip(computer.devices[i]);
+		    }	break;
+		    case KEYBOARD: {
+			XF86ConfInputPtr keyboard =
+			    KeyboardConfig(computer.devices[i]->config);
+
+			if (keyboard != NULL && computer.devices[i]->config == NULL) {
+			    XF86Config->conf_input_lst =
+				xf86AddInput(XF86Config->conf_input_lst,
+					     keyboard);
+			    computer.devices[i]->config = (XtPointer)keyboard;
+			}
+			SetTip(computer.devices[i]);
+		    }	break;
+		    case CARD: {
+			XF86ConfDevicePtr card =
+			    CardConfig(computer.devices[i]->config);
+
+			if (card != NULL && computer.devices[i]->config == NULL) {
+			    XF86Config->conf_device_lst =
+				xf86AddDevice(XF86Config->conf_device_lst,
+					      card);
+			    computer.devices[i]->config = (XtPointer)card;
+			}
+			SetTip(computer.devices[i]);
+			for (j = 0; j < computer.num_screens; j++)
+			    if (computer.screens[j]->card->widget == config)
+				SetTip((xf86cfgDevice*)computer.screens[j]);
+		    }	break;
+		    case MONITOR: {
+			XF86ConfMonitorPtr monitor =
+			    MonitorConfig(computer.devices[i]->config);
+
+			if (monitor != NULL && computer.devices[i]->config == NULL) {
+			    XF86Config->conf_monitor_lst =
+				xf86AddMonitor(XF86Config->conf_monitor_lst,
+					       monitor);
+			    computer.devices[i]->config = (XtPointer)monitor;
+			}
+			SetTip(computer.devices[i]);
+			for (j = 0; j < computer.num_screens; j++)
+			    if (computer.screens[j]->monitor->widget == config)
+				SetTip((xf86cfgDevice*)computer.screens[j]);
+		    }	break;
+		}
+		break;
+	    }
+	}
+    }
+    else if (config_mode == CONFIG_SCREEN) {
+	for (i = 0; i < computer.num_screens; i++)
+	    if (computer.screens[i]->widget == config) {
+		if (ScreenConfig(computer.screens[i]->screen) != NULL)
+		    SetTip((xf86cfgDevice*)computer.screens[i]);
+	    }
+    }
+}
+
+void
+OptionsCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    int i;
+    XF86OptionPtr *options;
+
+    if (config_mode == CONFIG_SCREEN) {
+	for (i = 0; i < computer.num_screens; i++)
+	    if (computer.screens[i]->widget == config) {
+		options = &(computer.screens[i]->screen->scrn_option_lst);
+		break;
+	    }
+    }
+    else {
+	for (i = 0; i < computer.num_devices; i++)
+	    if (computer.devices[i]->widget == config)
+		break;
+
+	if (i >= computer.num_devices) {
+	    if (XF86Config->conf_flags == NULL)
+		XF86Config->conf_flags = (XF86ConfFlagsPtr)
+		    XtCalloc(1, sizeof(XF86ConfFlagsRec));
+	    options = &(XF86Config->conf_flags->flg_option_lst);
+	}
+	else {
+	    switch (computer.devices[i]->type) {
+		case MOUSE:
+		case KEYBOARD:
+		    options = (XF86OptionPtr*)&(((XF86ConfInputPtr)
+			(computer.devices[i]->config))->inp_option_lst);
+		    break;
+		case CARD:
+		    options = (XF86OptionPtr*)&(((XF86ConfDevicePtr)
+			(computer.devices[i]->config))->dev_option_lst);
+		    break;
+		case MONITOR:
+		    options = (XF86OptionPtr*)&(((XF86ConfMonitorPtr)
+			(computer.devices[i]->config))->mon_option_lst);
+		    break;
+	    }
+	}
+    }
+
+    OptionsPopup(options);
+    if (config_mode == CONFIG_SCREEN) {
+	XF86OptionPtr option, options;
+	int rotate;
+
+	options = computer.screens[i]->screen->scrn_option_lst;
+	if ((option = xf86FindOption(options, "Rotate")) != NULL) {
+	    if (option->opt_val != NULL)
+		rotate = strcasecmp(option->opt_val, "CW") == 0 ? 1 :
+			 strcasecmp(option->opt_val, "CCW") == 0 ? -1 : 0;
+	    XtFree(option->opt_val);
+	    option->opt_val = XtNewString(rotate > 0 ? "CW" : "CCW");
+	    computer.screens[i]->rotate = rotate;
+	}
+	else
+	    computer.screens[i]->rotate = 0;
+	UpdateScreenUI();
+	AdjustScreenUI();
+	SetTip((xf86cfgDevice*)computer.screens[i]);
+    }
+    else {
+	if (i >= computer.num_devices)
+	    SetTip(&cpu_device);
+	else
+	    SetTip(computer.devices[i]);
+    }
+}
+
+void
+EnableDeviceCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    int i;
+
+    if (config_mode == CONFIG_SCREEN) {
+	for (i = 0; i < computer.num_screens; i++)
+	    if (computer.screens[i]->widget == config) {
+		computer.screens[i]->state = USED;
+		computer.screens[i]->card->state = USED;
+		ScreenSetup(False);
+		return;
+	    }
+    }
+
+    for (i = 0; i < computer.num_devices; i++)
+	if (computer.devices[i]->widget == config) {
+	    if (computer.devices[i]->state == USED)
+		return;
+	    computer.devices[i]->state = USED;
+	    DrawCables();
+	    break;
+	}
+    if (i >= computer.num_devices || computer.layout == NULL)
+	return;
+    switch (computer.devices[i]->type) {
+	case MOUSE:
+	case KEYBOARD: {
+	    int nmouses = 0, nkeyboards = 0;
+	    XF86ConfInputPtr input = (XF86ConfInputPtr)
+		(computer.devices[i]->config);
+	    XF86ConfInputrefPtr nex, iref = computer.layout->lay_input_lst;
+	    XF86OptionPtr option;
+
+	    nex = iref;
+	    while (nex != NULL) {
+		if (strcasecmp(nex->iref_inputdev->inp_driver, "mouse") == 0)
+		    ++nmouses;
+		else if (strcasecmp(nex->iref_inputdev->inp_driver,
+				    "keyboard") == 0)
+		    ++nkeyboards;
+		iref = nex;
+		nex = (XF86ConfInputrefPtr)(nex->list.next);
+	    }
+	    nex = (XF86ConfInputrefPtr)XtCalloc(1, sizeof(XF86ConfInputrefRec));
+	    nex->list.next = NULL;
+	    nex->iref_inputdev = input;
+	    nex->iref_inputdev_str = XtNewString(input->inp_identifier);
+	    if (nmouses == 0 && computer.devices[i]->type == MOUSE) 
+		option = xf86NewOption(XtNewString("CorePointer"), NULL);
+	    else if (nkeyboards == 0 && computer.devices[i]->type == KEYBOARD)
+		option = xf86NewOption(XtNewString("CoreKeyboard"), NULL);
+	    else
+		option = xf86NewOption(XtNewString("SendCoreEvents"), NULL);
+	    nex->iref_option_lst = option;
+	    computer.layout->lay_input_lst =
+		xf86AddInputref(computer.layout->lay_input_lst, nex);
+	}   break;
+	case CARD:
+	    for (i = 0; i < computer.num_screens; i++) {
+		if (computer.screens[i]->card->widget == config &&
+		    computer.screens[i]->state != USED) {
+		    XF86ConfAdjacencyPtr adj;
+
+		    adj = (XF86ConfAdjacencyPtr)
+			XtCalloc(1, sizeof(XF86ConfAdjacencyRec));
+		    adj->adj_screen = computer.screens[i]->screen;
+		    adj->adj_screen_str = XtNewString(computer.screens[i]->
+			screen->scrn_identifier);
+		    computer.layout->lay_adjacency_lst = (XF86ConfAdjacencyPtr)
+			addListItem((GenericListPtr)computer.layout->
+				    lay_adjacency_lst, (GenericListPtr)adj);
+		    computer.screens[i]->state = USED;
+		}
+	    }
+	    break;
+	case MONITOR:
+	    break;
+    }
+}
+
+void
+DisableDeviceCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    int i;
+
+    if (config_mode == CONFIG_SCREEN) {
+	for (i = 0; i < computer.num_screens; i++)
+	    if (computer.screens[i]->widget == config) {
+		computer.screens[i]->state = UNUSED;
+		computer.screens[i]->card->state = UNUSED;
+		ScreenSetup(False);
+		return;
+	    }
+    }
+
+    for (i = 0; i < computer.num_devices; i++)
+	if (computer.devices[i]->widget == config) {
+	    if (computer.devices[i]->state == UNUSED)
+		return;
+	    computer.devices[i]->state = UNUSED;
+	    DrawCables();
+	    break;
+	}
+    if (i >= computer.num_devices || computer.layout == NULL)
+	return;
+    switch (computer.devices[i]->type) {
+	case MOUSE:
+	case KEYBOARD:
+	    xf86RemoveInputRef(computer.layout,
+		(XF86ConfInputPtr)(computer.devices[i]->config));
+	    break;
+	case CARD: {
+	    XF86ConfAdjacencyPtr adj;
+	    int j;
+
+	    if (computer.layout == NULL)
+		break;
+	    for (j = 0; j < computer.num_screens; j++)
+		if (computer.screens[j]->card->widget == config) {
+		    adj = computer.layout->lay_adjacency_lst;
+		    while (adj != NULL) {
+			if (adj->adj_screen == computer.screens[j]->screen) {
+			    xf86RemoveAdjacency(computer.layout, adj);
+			    break;
+			}
+			adj = (XF86ConfAdjacencyPtr)(adj->list.next);
+		    }
+		    computer.screens[j]->state = UNUSED;
+		    break;
+		}
+	}   break;
+	case MONITOR:
+	    break;
+    }
+}
+
+void
+RemoveDeviceCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    int i, j;
+
+    if (config_mode == CONFIG_SCREEN) {
+	for (i = 0; i < computer.num_screens; i++)
+	    if (computer.screens[i]->widget == config) {
+		xf86cfgDevice *mon, *dev;
+
+		RemoveScreen(mon = computer.screens[i]->monitor,
+			     dev = computer.screens[i]->card);
+
+/*
+		for (j = 0; j < computer.num_devices; j++) {
+		    if (computer.devices[j] == mon ||
+			computer.devices[j] == dev) {
+			if (--computer.devices[j]->refcount <= 0) {
+			    XtDestroyWidget(computer.devices[j]->widget);
+			    XtFree((XtPointer)computer.devices[j]);
+			    if (--computer.num_devices > j)
+				memmove(&computer.devices[j],
+					&computer.devices[j + 1],
+					(computer.num_devices - j) *
+					sizeof(xf86cfgDevice*));
+			    --j;
+			}
+		    }
+		}
+*/
+
+		ScreenSetup(False);
+	    }
+	return;
+    }
+
+    for (i = 0; i < computer.num_devices; i++) {
+	if (computer.devices[i]->widget == config) {
+	    switch (computer.devices[i]->type) {
+		case MOUSE:
+		case KEYBOARD:
+		    xf86RemoveInput(XF86Config,
+			(XF86ConfInputPtr)(computer.devices[i]->config));
+		    break;
+		case CARD:
+		case MONITOR:
+		    break;
+	    }
+
+	    if (computer.devices[i]->type == CARD) {
+		for (j = 0; j < computer.num_screens; j++)
+		    if (computer.screens[j]->card == computer.devices[i]) {
+			RemoveScreen(computer.screens[j]->monitor,
+				     computer.devices[i]);
+			--j;
+		    }
+		if (computer.devices[i]->refcount <= 0)
+		    xf86RemoveDevice(XF86Config,
+			(XF86ConfDevicePtr)(computer.devices[i]->config));
+	    }
+	    else if (computer.devices[i]->type == MONITOR) {
+		for (j = 0; j < computer.num_screens; j++)
+		    if (computer.screens[j]->monitor == computer.devices[i]) {
+			RemoveScreen(computer.devices[i],
+				     computer.screens[j]->card);
+			--j;
+		    }
+		if (computer.devices[i]->refcount <= 0)
+		    xf86RemoveMonitor(XF86Config,
+			(XF86ConfMonitorPtr)(computer.devices[i]->config));
+	    }
+
+	    if (computer.devices[i]->refcount <= 0) {
+		XtDestroyWidget(computer.devices[i]->widget);
+		XtFree((XtPointer)computer.devices[i]);
+		if (--computer.num_devices > i)
+		    memmove(&computer.devices[i], &computer.devices[i + 1],
+			    (computer.num_devices - i) * sizeof(xf86cfgDevice*));
+
+		DrawCables();
+	    }
+
+	    break;
+	}
+    }
+}
+
+/*ARGSUSED*/
+void
+SelectDeviceAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    device = w;
+    xpos = event->xbutton.x_root;
+    ypos = event->xbutton.y_root;
+    XDefineCursor(XtDisplay(device), XtWindow(device), no_cursor);
+
+    if (config_mode == CONFIG_SCREEN) {
+	sxpos = device->core.x;
+	sypos = device->core.y;
+    }
+}
+
+/*ARGSUSED*/
+void
+MoveDeviceAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    int dx, dy, x, y, oldx, oldy;
+
+    if (device == NULL || device != w)
+	return;
+
+    dx = event->xbutton.x_root - xpos;
+    dy = event->xbutton.y_root - ypos;
+
+    oldx = device->core.x;
+    oldy = device->core.y;
+    x = device->core.x + dx;
+    y = device->core.y + dy;
+
+    if (x < 0)
+	x = 0;
+    else if (x + device->core.width > XtParent(device)->core.width)
+	x = XtParent(device)->core.width - device->core.width;
+    if (y < 0)
+	y = 0;
+    else if (y + device->core.height > XtParent(device)->core.height)
+	y = XtParent(device)->core.height - device->core.height;
+
+    dx = x - oldx;
+    dy = y - oldy;
+
+    XRaiseWindow(XtDisplay(device), XtWindow(device));
+    XtMoveWidget(device, x, y);
+
+    xpos += dx;
+    ypos += dy;
+}
+
+/*ARGSUSED*/
+void
+UnselectDeviceAction(Widget w, XEvent *ev, String *params, Cardinal *num_params)
+{
+    if (device != NULL) {
+	XUndefineCursor(XtDisplay(device), XtWindow(device));
+
+	if (config_mode == CONFIG_SCREEN)
+	    ScreenSetup(False);
+	device = NULL;
+    }
+}
+
+/*ARGSUSED*/
+void
+DevicePopupMenu(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    static Widget configure, options, enable, disable, remove;
+    static int first = 1;
+    int i;
+    xf86cfgDevice *dev;
+
+    if (first) {
+	first = 0;
+
+	popup = XtCreatePopupShell("popup", simpleMenuWidgetClass,
+				   toplevel, NULL, 0);
+	configure = XtCreateManagedWidget("configure", smeBSBObjectClass,
+					  popup, NULL, 0);
+	XtAddCallback(configure, XtNcallback, ConfigureDeviceCallback, NULL);
+	options = XtCreateManagedWidget("options", smeBSBObjectClass,
+					popup, NULL, 0);
+	XtAddCallback(options, XtNcallback, OptionsCallback, NULL);
+	XtCreateManagedWidget("line", smeLineObjectClass,
+			      popup, NULL, 0);
+	enable = XtCreateManagedWidget("enable", smeBSBObjectClass,
+				       popup, NULL, 0);
+	XtAddCallback(enable, XtNcallback, EnableDeviceCallback, NULL);
+	disable = XtCreateManagedWidget("disable", smeBSBObjectClass,
+					popup, NULL, 0);
+	XtAddCallback(disable, XtNcallback, DisableDeviceCallback, NULL);
+	XtCreateManagedWidget("line", smeLineObjectClass,
+			      popup, NULL, 0);
+	remove = XtCreateManagedWidget("remove", smeBSBObjectClass,
+				       popup, NULL, 0);
+	XtAddCallback(remove, XtNcallback, RemoveDeviceCallback, NULL);
+
+	XtRealizeWidget(popup);
+    }
+
+    dev = NULL;
+    if (config_mode == CONFIG_LAYOUT) {
+	for (i = 0; i < computer.num_devices; i++)
+	    if (computer.devices[i]->widget == w) {
+		dev = computer.devices[i];
+		break;
+	    }
+	if (i >= computer.num_devices && strcmp(XtName(w), "cpu"))
+	    return;
+	if (dev == NULL)
+	    dev = &cpu_device;
+    }
+    else if (config_mode == CONFIG_SCREEN) {
+	for (i = 0; i < computer.num_screens; i++)
+	    if (computer.screens[i]->widget == w) {
+		dev = (xf86cfgDevice*)computer.screens[i];
+		break;
+	    }
+    }
+    if (dev == NULL)
+	return;
+
+    config = w;
+
+    if (dev->type != SERVER) {
+	XtSetSensitive(configure, True);
+	XtSetSensitive(remove, True);
+	XtSetSensitive(options, dev->config != NULL);
+	if (computer.layout == NULL || dev->config == NULL ||
+	    dev->type == MONITOR) {
+	    XtSetSensitive(enable, False);
+	    XtSetSensitive(disable, False);
+	}
+	else if (dev->state == USED) {
+	    XtSetSensitive(enable, False);
+	    XtSetSensitive(disable, True);
+	}
+	else {
+	    XtSetSensitive(enable, True);
+	    XtSetSensitive(disable, False);
+	}
+    }
+    else {
+	XtSetSensitive(configure, False);
+	XtSetSensitive(options, True);
+	XtSetSensitive(enable, False);
+	XtSetSensitive(disable, False);
+	XtSetSensitive(remove, False);
+    }
+
+    XtMoveWidget(popup, event->xbutton.x_root, event->xbutton.y_root);
+    XtPopup(popup, XtGrabNone);
+}
+
+/*ARGSUSED*/
+void
+DevicePopdownMenu(Widget w, XEvent *event, String *params, Cardinal *num_params)
+{
+    if (popup && XtIsRealized(popup))
+	XtPopdown(popup);
+}
+
+void RenameLayoutAction(Widget w, XEvent *event,
+			String *params, Cardinal *num_params)
+{
+    XF86ConfLayoutPtr lay = XF86Config->conf_layout_lst;
+    Arg args[1];
+    char *name;
+
+    XtSetArg(args[0], XtNstring, &name);
+    XtGetValues(layout, args, 1);
+
+    if (computer.layout == NULL || (computer.layout &&
+	strcasecmp(name, computer.layout->lay_identifier)) == 0)
+	return;
+
+    if (name == NULL && *name == '\0') {
+	/* tell user about error */
+	return;
+    }
+
+    while (lay) {
+	if (strcasecmp(name, lay->lay_identifier) == 0)
+	    /* tell user about error */
+	    return;
+	lay = (XF86ConfLayoutPtr)(lay->list.next);
+    }
+
+    XtSetArg(args[0], XtNlabel, name);
+    XtSetValues(layoutsme, args, 1);
+    xf86RenameLayout(XF86Config, computer.layout, name);
+}
+
+/*ARGSUSED*/
+static void
+ComputerEventHandler(Widget w, XtPointer closure,
+		     XEvent *event, Boolean *continue_to_dispatch)
+{
+    if (event->xexpose.count > 1)
+	return;
+
+    if (config_mode == CONFIG_LAYOUT)
+	DrawCables();
+}
+
+void
+DrawCables(void)
+{
+    Display *display;
+    Window window;
+    int ox, oy, i;
+    xf86cfgScreen **scr = computer.screens;
+
+    if (config_mode != CONFIG_LAYOUT)
+	return;
+
+    ox = computer.cpu->core.x + (computer.cpu->core.width >> 1);
+    oy = computer.cpu->core.y + (computer.cpu->core.height >> 1);
+
+    display = XtDisplay(work);
+    window = XtWindow(work);
+    XClearWindow(display, window);
+
+    for (i = 0; i < computer.num_devices; i++) {
+	if (computer.devices[i]->state == USED &&
+	    computer.devices[i]->type != MONITOR)
+	    DrawCable(display, window, ox, oy,
+		      computer.devices[i]->widget->core.x +
+			    (computer.devices[i]->widget->core.width>>1),
+		      computer.devices[i]->widget->core.y +
+			    (computer.devices[i]->widget->core.height>>1));
+
+    }
+    for (i = 0; i < computer.num_screens; i++) {
+	if (scr[i]->monitor != NULL)
+	    DrawCable(display, window,
+		      scr[i]->card->widget->core.x +
+			    (scr[i]->card->widget->core.width>>1),
+		      scr[i]->card->widget->core.y +
+			    (scr[i]->card->widget->core.height>>1),
+		      scr[i]->monitor->widget->core.x +
+			    (scr[i]->monitor->widget->core.width>>1),
+		      scr[i]->monitor->widget->core.y +
+			    (scr[i]->monitor->widget->core.height>>1));
+    }
+}
+
+static void
+DrawCable(Display *display, Window window, int o_x, int o_y, int d_x, int d_y)
+{
+    XDrawLine(display, window, cablegcshadow, o_x, o_y, d_x, d_y);
+    XDrawLine(display, window, cablegc, o_x, o_y, d_x, d_y);
+}
+
+/*ARGSUSED*/
+void
+SetConfigModeCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    int i, mode = (int)user_data;
+    Arg args[3];
+    char *ptr;
+    static Dimension height;
+
+    if (mode == config_mode)
+	return;
+    XtSetArg(args[0], XtNlabel, &ptr);
+    XtGetValues(w, args, 1);
+    XtSetArg(args[0], XtNlabel, ptr);
+    XtSetValues(menu, args, 1);
+
+    if (config_mode == CONFIG_LAYOUT) {
+	XtSetArg(args[0], XtNheight, &height);
+	XtGetValues(commands, args, 1);
+	for (i = 0; i < computer.num_devices; i++)
+	    XtUnmapWidget(computer.devices[i]->widget);
+	XtUnmapWidget(commands);
+	XtUnmapWidget(computer.cpu);
+	XtSetSensitive(commands, False);
+	XtSetArg(args[0], XtNheight, 1);
+	XtSetArg(args[1], XtNmin, 1);
+	XtSetArg(args[2], XtNmax, 1);
+	XtSetValues(commands, args, 3);
+    }
+    else if (config_mode == CONFIG_SCREEN) {
+	for (i = 0; i < computer.num_screens; i++)
+	    XtUnmapWidget(computer.screens[i]->widget);
+    }
+    else if (config_mode == CONFIG_MODELINE) {
+	VideoModeConfigureEnd();
+	XtSetSensitive(layout, True);
+	XtSetSensitive(layoutm, True);
+    }
+    else if (config_mode == CONFIG_ACCESSX) {
+	AccessXConfigureEnd();
+	XtSetSensitive(layout, True);
+	XtSetSensitive(layoutm, True);
+    }
+
+    config_mode = mode;
+    XClearWindow(XtDisplay(work), XtWindow(work));
+    if (mode == CONFIG_LAYOUT) {
+	for (i = 0; i < computer.num_devices; i++)
+	    XtMapWidget(computer.devices[i]->widget);
+	XtSetArg(args[0], XtNheight, height);
+	XtSetArg(args[1], XtNmin, height);
+	XtSetArg(args[2], XtNmax, height);
+	XtSetValues(commands, args, 3);
+	XtMapWidget(commands);
+	XtMapWidget(computer.cpu);
+	XtSetSensitive(commands, True);
+	DrawCables();
+    }
+    else if (mode == CONFIG_SCREEN) {
+	for (i = 0; i < computer.num_screens; i++)
+	    XtMapWidget(computer.screens[i]->widget);
+	ScreenSetup(True);
+    }
+    else if (mode == CONFIG_MODELINE) {
+	VideoModeConfigureStart();
+	XtSetSensitive(layout, False);
+	XtSetSensitive(layoutm, False);
+    }
+    else if (mode == CONFIG_ACCESSX) {
+	AccessXConfigureStart();
+	XtSetSensitive(layout, False);
+	XtSetSensitive(layoutm, False);
+    }
+}
+
+static void
+ScreenSetup(Bool check)
+{
+    if (check) {
+	int i;
+
+	for (i = 0; i < computer.num_layouts; i++)
+	    if (computer.layouts[i]->layout == computer.layout)
+		break;
+
+	/* Just to put the screens in the correct positions */
+	if (i >= computer.num_layouts)
+	    AdjustScreenUI();
+    }
+
+    UpdateScreenUI();
+    AdjustScreenUI();
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c:1.5
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c	Mon Jun 19 22:08:50 2000
@@ -0,0 +1,814 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.5 2000/06/20 05:08:50 dawes Exp $
+ */
+
+#include "xf86config.h"
+#include "keyboard-cfg.h"
+#include <X11/Xaw/Command.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Label.h>
+#include <X11/Xaw/MenuButton.h>
+#include <X11/Xaw/SimpleMenu.h>
+#include <X11/Xaw/SmeBSB.h>
+
+/*
+ * Prototypes
+ */
+static void KeyboardModelCallback(Widget, XtPointer, XtPointer);
+static void KeyboardLayoutCallback(Widget, XtPointer, XtPointer);
+static void KeyboardApplyCallback(Widget, XtPointer, XtPointer);
+static Bool KeyboardConfigCheck(void);
+static void XkbUIEventHandler(Widget, XtPointer, XEvent*, Boolean*);
+
+/*
+ * Initialization
+ */
+static XF86XkbDescInfo xkb_model;
+static XF86XkbDescInfo xkb_layout;
+static XF86XkbDescInfo xkb_variant;
+static XF86XkbDescInfo xkb_option;
+static char *XkbRulesFile = "lib/X11/xkb/rules/xfree86";
+static XF86ConfInputPtr current_input;
+
+static char *model, *layout;
+static Widget kbd, modelb, layoutb;
+static XkbInfo **xkb_infos;
+static int num_xkb_infos;
+XkbInfo *xkb_info;
+
+static Widget apply;
+
+/*
+ * Implementation
+ */
+/*ARGSUSED*/
+XtPointer
+KeyboardConfig(XtPointer config)
+{
+    XF86ConfInputPtr keyboard = (XF86ConfInputPtr)config;
+    XF86OptionPtr option;
+    Arg args[1];
+    static char *XkbModel = "XkbModel", *XkbLayout = "XkbLayout";
+
+    InitializeKeyboard();
+
+    if (xkb_info->conf == NULL)
+	xkb_info->conf = keyboard;
+
+    if (xkb_info->conf != keyboard) {
+	int i;
+
+	for (i = 0; i < num_xkb_infos; i++)
+	    if (xkb_infos[i]->conf == keyboard) {
+		xkb_info = xkb_infos[i];
+		break;
+	    }
+
+	if (i >= num_xkb_infos) {
+	    int timeout = 10;
+
+	    xkb_info = (XkbInfo*)XtCalloc(1, sizeof(XkbInfo));
+	    xkb_info->conf = keyboard;
+	    xkb_infos = (XkbInfo**)
+		XtRealloc((XtPointer)xkb_infos, sizeof(XkbInfo*) *
+			  (num_xkb_infos + 1));
+	    xkb_infos[num_xkb_infos++] = xkb_info;
+
+	    xkb_info->conf = keyboard;
+	    while (timeout > 0) {
+		xkb_info->xkb =
+		    XkbGetKeyboard(XtDisplay(configp),
+				   XkbGBN_AllComponentsMask, XkbUseCoreKbd);
+		if (xkb_info->xkb == NULL || xkb_info->xkb->geom == NULL)
+		    sleep(timeout -= 1);
+		else
+		    break;
+	    }
+	    if (timeout <= 0) {
+		fprintf(stderr, "Couldn't get keyboard\n");
+		exit(1);
+	    }
+	    if (xkb_info->xkb->names->geometry == 0)
+		xkb_info->xkb->names->geometry = xkb_info->xkb->geom->name;
+
+	    bzero((char*)&(xkb_info->defs), sizeof(XkbRF_VarDefsRec));
+	}
+
+	/* check for removed devices */
+	for (i = 0; i < num_xkb_infos; i++) {
+	    XF86ConfInputPtr key = XF86Config->conf_input_lst;
+
+	    while (key != NULL) {
+		if (strcasecmp(key->inp_driver, "keyboard") == 0 &&
+		    xkb_infos[i]->conf == key)
+		    break;
+		key = (XF86ConfInputPtr)(key->list.next);
+	    }
+	    if (xkb_infos[i]->conf != NULL && key == NULL) {
+		XkbFreeKeyboard(xkb_infos[i]->xkb, 0, False);
+		XtFree((XtPointer)xkb_infos[i]);
+		if (--num_xkb_infos > i)
+		    memmove(&xkb_infos[i], &xkb_infos[i + 1],
+			(num_xkb_infos - i) * sizeof(XkbInfo*));
+	    }
+	}
+    }
+
+    current_input = keyboard;
+
+    if (keyboard != NULL) {
+	if ((option = xf86FindOption(keyboard->inp_option_lst, XkbModel)) != NULL)
+	    xkb_info->defs.model = model = option->opt_val;
+	else
+	    xkb_info->defs.model = model = xkb_model.name[0];
+	if ((option = xf86FindOption(keyboard->inp_option_lst, XkbLayout)) != NULL)
+	    xkb_info->defs.layout = layout = option->opt_val;
+	else
+	    xkb_info->defs.layout = layout = xkb_layout.name[0];
+
+	XtSetArg(args[0], XtNstring, keyboard->inp_identifier);
+	XtSetValues(ident_widget, args, 1);
+
+	UpdateKeyboard(False);
+    }
+    else {
+	XF86ConfInputPtr input = XF86Config->conf_input_lst;
+	char keyboard_name[48];
+	int nkeyboards = 0;
+
+	while (input != NULL) {
+	    if (strcasecmp(input->inp_driver, "keyboard") == 0)
+		++nkeyboards;
+	    input = (XF86ConfInputPtr)(input->list.next);
+	}
+	do {
+	    ++nkeyboards;
+	    XmuSnprintf(keyboard_name, sizeof(keyboard_name),
+			"Keyboard%d", nkeyboards);
+	} while (xf86FindInput(keyboard_name,
+		 XF86Config->conf_input_lst));
+
+	model = xkb_model.name[0];
+	layout = xkb_layout.name[0];
+	XtSetArg(args[0], XtNstring, keyboard_name);
+	XtSetValues(ident_widget, args, 1);
+    }
+
+    xf86info.cur_list = KEYBOARD;
+    XtSetSensitive(back, xf86info.lists[KEYBOARD].cur_function > 0);
+    XtSetSensitive(next, xf86info.lists[KEYBOARD].cur_function <
+			 xf86info.lists[KEYBOARD].num_functions - 1);
+    (xf86info.lists[KEYBOARD].functions[xf86info.lists[KEYBOARD].cur_function])
+	(&xf86info);
+
+    if (ConfigLoop(KeyboardConfigCheck) == True) {
+	if (keyboard == NULL) {
+	    keyboard = XtNew(XF86ConfInputRec);
+	    keyboard->list.next = NULL;
+	    keyboard->inp_identifier = XtNewString(ident_string);
+	    keyboard->inp_driver = XtNewString("keyboard");
+	    keyboard->inp_option_lst = xf86NewOption(XtNewString(XkbModel),
+						     XtNewString(model));
+	    xf86addNewOption(keyboard->inp_option_lst,
+			     XtNewString(XkbLayout), XtNewString(layout));
+	    keyboard->inp_comment = NULL;
+	}
+	else {
+	    int i;
+	    char *str;
+
+	    XtSetArg(args[0], XtNlabel, &str);
+	    XtGetValues(modelb, args, 1);
+	    for (i = 0; i < xkb_model.nelem; i++)
+		if (strcmp(xkb_model.desc[i], str) == 0) {
+		    model = xkb_model.name[i];
+		    break;
+		}
+
+	    XtSetArg(args[0], XtNlabel, &str);
+	    XtGetValues(layoutb, args, 1);
+	    for (i = 0; i < xkb_layout.nelem; i++)
+		if (strcmp(xkb_layout.desc[i], str) == 0) {
+		    layout = xkb_layout.name[i];
+		    break;
+		}
+
+	    if ((option = xf86FindOption(keyboard->inp_option_lst, XkbModel))
+		!= NULL) {
+		XtFree(option->opt_val);
+		option->opt_val = XtNewString(model);
+		XtFree(option->opt_comment);
+	    }
+/*	    else {
+		if (keyboard->inp_option_lst == NULL)
+		    keyboard->inp_option_lst = xf86NewOption(XtNewString(XkbModel),
+							     XtNewString(model));
+		else
+		    xf86addNewOption(keyboard->inp_option_lst,
+				     XtNewString(XkbModel), XtNewString(model));
+	    }*/
+	    XtFree(xkb_info->config.model);
+	    xkb_info->config.model = XtNewString(model);
+
+	    if ((option = xf86FindOption(keyboard->inp_option_lst, XkbLayout))
+		!= NULL) {
+		XtFree(option->opt_val);
+		option->opt_val = XtNewString(layout);
+		XtFree(option->opt_comment);
+	    }
+	    /*else
+		xf86addNewOption(keyboard->inp_option_lst,
+				 XtNewString(XkbLayout), XtNewString(layout));*/
+	    XtFree(xkb_info->config.layout);
+	    xkb_info->config.layout = XtNewString(layout);
+	}
+	if (strcasecmp(keyboard->inp_identifier, ident_string))
+	    xf86RenameInput(XF86Config, keyboard, ident_string);
+
+	xkb_info->conf = keyboard;
+	return ((XtPointer)keyboard);
+    }
+
+    return (NULL);
+}
+
+static Bool
+KeyboardConfigCheck(void)
+{
+    XF86ConfInputPtr keyboard = XF86Config->conf_input_lst;
+
+    while (keyboard != NULL) {
+	if (keyboard != current_input &&
+	    strcasecmp(ident_string, keyboard->inp_identifier) == 0)
+	    return (False);
+	keyboard = (XF86ConfInputPtr)(keyboard->list.next);
+    }
+
+    return (True);
+}
+
+/*ARGSUSED*/
+static void
+XkbUIEventHandler(Widget w, XtPointer closure,
+		  XEvent *event, Boolean *continue_to_dispatch)
+{
+    XkbUI_ViewOptsRec opts;
+    XkbUI_ViewPtr view;
+    int width, height, bd;
+
+    if (event->xexpose.count > 1)
+	return;
+
+    bzero((char *)&opts, sizeof(opts));
+    bd = 1;
+    opts.present = XkbUI_SizeMask | XkbUI_ColormapMask |
+		   XkbUI_MarginMask | XkbUI_OffsetMask;
+    opts.margin_width = opts.margin_height = 0;
+    opts.viewport.x = opts.viewport.y = bd;
+    width = opts.viewport.width = w->core.width - 2 * bd;
+    height = opts.viewport.height = w->core.height - 2 * bd;
+    opts.cmap = w->core.colormap;
+
+    if ((view = XkbUI_Init(XtDisplay(w), XtWindow(w), width, height,
+	xkb_info->xkb, &opts)) != NULL) {
+	XkbUI_DrawRegion(view, NULL);
+	free(view);
+    }
+}
+
+void
+InitializeKeyboard(void)
+{
+    int major, minor, op, event, error;
+    static int first = 1;
+    XkbRF_RulesPtr list;
+    int i, timeout = 5;
+    XF86ConfInputPtr keyboard = XF86Config->conf_input_lst;
+    XF86OptionPtr option;
+    char name[PATH_MAX];
+    FILE *file;
+
+    if (!first)
+	return;
+    first = 0;
+
+    major = XkbMajorVersion;
+    minor = XkbMinorVersion;
+    if (XkbQueryExtension(DPY, &op, &event, &error, &major, &minor) == 0) {
+	fprintf(stderr, "Unable to initialize XKEYBOARD extension");
+	exit(1);
+    }
+
+    xkb_info = XtNew(XkbInfo);
+    xkb_info->conf = NULL;
+    xkb_infos = (XkbInfo**)XtCalloc(1, sizeof(XkbInfo*));
+    num_xkb_infos = 1;
+    xkb_infos[0] = xkb_info;
+
+    while (timeout > 0) {
+	xkb_info->xkb =
+	    XkbGetKeyboard(DPY, XkbGBN_AllComponentsMask, XkbUseCoreKbd);
+	if (xkb_info->xkb == NULL || xkb_info->xkb->geom == NULL) {
+	    timeout -= 1;
+	    sleep(1);
+	}
+	else
+	    break;
+    }
+    if (timeout <= 0) {
+	fprintf(stderr, "Couldn't get keyboard\n");
+	exit(1);
+    }
+    if (xkb_info->xkb->names->geometry == 0)
+	xkb_info->xkb->names->geometry = xkb_info->xkb->geom->name;
+
+    bzero((char*)&(xkb_info->defs), sizeof(XkbRF_VarDefsRec));
+
+    if ((list = XkbRF_Create(0, 0)) == NULL ||
+	!XkbRF_LoadDescriptionsByName(XkbRulesFile, NULL, list)) {
+	fprintf(stderr, "Can't create rules structure\n");
+	exit(1);
+    }
+
+    for (i = 0; i < list->models.num_desc; i++) {
+	if (i % 16 == 0) {
+	    xkb_model.name = (char**)XtRealloc((XtPointer)xkb_model.name,
+					       (i + 16) * sizeof(char*));
+	    xkb_model.desc = (char**)XtRealloc((XtPointer)xkb_model.desc,
+					       (i + 16) * sizeof(char*));
+	}
+	xkb_model.name[i] = XtNewString(list->models.desc[i].name);
+	xkb_model.desc[i] = XtNewString(list->models.desc[i].desc);
+    }
+    xkb_model.nelem = i;
+
+    for (i = 0; i < list->layouts.num_desc; i++) {
+	if (i % 16 == 0) {
+	    xkb_layout.name = (char**)XtRealloc((XtPointer)xkb_layout.name,
+						(i + 16) * sizeof(char*));
+	    xkb_layout.desc = (char**)XtRealloc((XtPointer)xkb_layout.desc,
+						(i + 16) * sizeof(char*));
+	}
+	xkb_layout.name[i] = XtNewString(list->layouts.desc[i].name);
+	xkb_layout.desc[i] = XtNewString(list->layouts.desc[i].desc);
+    }
+    xkb_layout.nelem = i;
+
+    for (i = 0; i < list->variants.num_desc; i++) {
+	if (i % 16 == 0) {
+	    xkb_variant.name = (char**)XtRealloc((XtPointer)xkb_variant.name,
+						 (i + 16) * sizeof(char*));
+	    xkb_variant.desc = (char**)XtRealloc((XtPointer)xkb_variant.desc,
+						 (i + 16) * sizeof(char*));
+	}
+	xkb_variant.name[i] = XtNewString(list->variants.desc[i].name);
+	xkb_variant.desc[i] = XtNewString(list->variants.desc[i].desc);
+    }
+    xkb_variant.nelem = i;
+
+    for (i = 0; i < list->options.num_desc; i++) {
+	if (i % 16 == 0) {
+	    xkb_option.name = (char**)XtRealloc((XtPointer)xkb_option.name,
+						(i + 16) * sizeof(char*));
+	    xkb_option.desc = (char**)XtRealloc((XtPointer)xkb_option.desc,
+						(i + 16) * sizeof(char*));
+	}
+	xkb_option.name[i] = XtNewString(list->options.desc[i].name);
+	xkb_option.desc[i] = XtNewString(list->options.desc[i].desc);
+    }
+    xkb_option.nelem = i;
+
+    XkbRF_Free(list, True);
+
+    /* Load configuration */
+    XmuSnprintf(name, sizeof(name), "%s%s", XkbConfigDir, XkbConfigFile);
+    file = fopen(name, "r");
+/*    if ((file = fopen(name, "r")) == NULL) {
+	strcpy(name, XkbConfigFile);
+	file = fopen(name, "r");
+    }*/
+    if (file != NULL) {
+	if (XkbCFParse(file, XkbCFDflts, xkb_info->xkb, &xkb_info->config) == 0) {
+	    fprintf(stderr, "Error parsing config file: ");
+	    XkbCFReportError(stderr, name, xkb_info->config.error,
+			     xkb_info->config.line);
+	}
+	fclose(file);
+    }
+
+    /* XXX Assumes the first keyboard is the core keyboard */
+    while (keyboard != NULL) {
+	if (strcasecmp(keyboard->inp_driver, "keyboard") == 0)
+	    break;
+	keyboard = (XF86ConfInputPtr)(keyboard->list.next);
+    }
+    if (keyboard == NULL)
+	return;
+
+    if (xkb_info->config.model != NULL)
+	xkb_info->defs.model = xkb_info->config.model;
+    else if ((option = xf86FindOption(keyboard->inp_option_lst, "XkbModel"))
+	!= NULL)
+	xkb_info->defs.model = option->opt_val;
+    else
+	xkb_info->defs.model = xkb_model.name[0];
+
+    if (xkb_info->config.layout != NULL)
+	xkb_info->defs.layout = xkb_info->config.layout;
+    else if ((option = xf86FindOption(keyboard->inp_option_lst, "XkbLayout"))
+	!= NULL)
+	xkb_info->defs.layout = option->opt_val;
+    else
+	xkb_info->defs.layout = xkb_layout.name[0];
+}
+
+static xf86ConfigSymTabRec ax_controls[] =
+{
+    {XkbRepeatKeysMask,	     "RepeatKeys"},
+    {XkbSlowKeysMask,	     "SlowKeys"},
+    {XkbBounceKeysMask,	     "BounceKeys"},
+    {XkbStickyKeysMask,	     "StickyKeys"},
+    {XkbMouseKeysMask,	     "MouseKeys"},
+    {XkbMouseKeysAccelMask,  "MouseKeysAccel"},
+    {XkbAccessXKeysMask,     "AccessxKeys"},
+    {XkbAccessXTimeoutMask,  "AccessxTimeout"},
+    {XkbAccessXFeedbackMask, "AccessxFeedback"},
+    {XkbAudibleBellMask,     "AudibleBell"},
+    {XkbOverlay1Mask,	     "Overlay1"},
+    {XkbOverlay2Mask,	     "Overlay2"},
+    {XkbIgnoreGroupLockMask, "IgnoreGroupLock"},
+    {-1,		     ""},
+};
+
+static xf86ConfigSymTabRec ax_feedback[] =
+{
+    {XkbAX_SKPressFBMask,    "SlowKeysPress"},
+    {XkbAX_SKAcceptFBMask,   "SlowKeysAccept"},
+    {XkbAX_FeatureFBMask,    "Feature"},
+    {XkbAX_SlowWarnFBMask,   "SlowWarn"},
+    {XkbAX_IndicatorFBMask,  "Indicator"},
+    {XkbAX_StickyKeysFBMask, "StickyKeys"},
+    {XkbAX_TwoKeysMask,	     "TwoKeys"},
+    {XkbAX_LatchToLockMask,  "LatchToLock"},
+    {XkbAX_SKReleaseFBMask,  "SlowKeysRelease"},
+    {XkbAX_SKRejectFBMask,   "SlowkeysReject"},
+    {XkbAX_BKRejectFBMask,   "BounceKeysReject"},
+    {XkbAX_DumbBellFBMask,   "DumbBell"},
+    {-1,		     ""},
+};
+
+Bool
+WriteXKBConfiguration(char *filename, XkbConfigRtrnPtr conf)
+{
+    FILE *fp;
+    int i, count;
+
+    if (filename == NULL || conf == NULL ||
+	(fp = fopen(filename, "w")) == NULL)
+	return (False);
+
+    if (conf->rules_file != NULL)
+	fprintf(fp, "Rules			 =	%s\n",
+		conf->rules_file);
+    if (conf->model != NULL)
+	fprintf(fp, "Model			 =	%s\n",
+		conf->model);
+    if (conf->layout != NULL)
+	fprintf(fp, "Layout			 =	%s\n",
+		conf->layout);
+    if (conf->variant != NULL)
+	fprintf(fp, "Variant			 =	%s\n",
+		conf->variant);
+    if (conf->options != NULL)
+	fprintf(fp, "Options			 =	%s\n",
+		conf->options);
+    if (conf->keymap != NULL)
+	fprintf(fp, "Keymap			 =	%s\n",
+		conf->keymap);
+    if (conf->keycodes != NULL)
+	fprintf(fp, "Keycodes		 =	%s\n",
+		conf->keycodes);
+    if (conf->geometry != NULL)
+	fprintf(fp, "Geometry		 =	%s\n",
+		conf->geometry);
+    if (conf->phys_symbols != NULL)
+	fprintf(fp, "RealSymbols		 =	%s\n",
+		conf->phys_symbols);
+    if (conf->symbols != NULL)
+	fprintf(fp, "Symbols			 =	%s\n",
+		conf->symbols);
+    if (conf->types != NULL)
+	fprintf(fp, "Types			 =	%s\n",
+		conf->types);
+    if (conf->compat != NULL)
+	fprintf(fp, "Compat			 =	%s\n",
+		conf->compat);
+
+    if (conf->click_volume > 0)
+	fprintf(fp, "ClickVolume		 =	%d\n",
+		conf->click_volume);
+    if (conf->bell_volume > 0)
+	fprintf(fp, "BellVolume		 =	%d\n",
+		conf->bell_volume);
+    if (conf->bell_pitch > 0)
+	fprintf(fp, "BellPitch		 =	%d\n",
+		conf->bell_pitch);
+    if (conf->bell_duration > 0)
+	fprintf(fp, "BellDuration		 =	%d\n",
+		conf->bell_duration);
+
+    if (conf->repeat_delay > 0)
+	fprintf(fp, "RepeatDelay		 =	%d\n",
+		conf->repeat_delay);
+    if (conf->repeat_interval > 0)
+	fprintf(fp, "RepeatInterval		 =	%d\n",
+		conf->repeat_interval);
+
+    if (conf->slow_keys_delay > 0)
+	fprintf(fp, "SlowKeysDelay		 =	%d\n",
+		conf->slow_keys_delay);
+
+    if (conf->debounce_delay > 0)
+	fprintf(fp, "DebounceDelay		 =	%d\n",
+		conf->debounce_delay);
+
+    if (conf->mk_delay > 0)
+	fprintf(fp, "MouseKeysDelay		 =	%d\n",
+		conf->mk_delay);
+    if (conf->mk_interval > 0)
+	fprintf(fp, "MouseKeysInterval	 =	%d\n",
+		conf->mk_interval);
+    if (conf->mk_time_to_max > 0)
+	fprintf(fp, "MouseKeysTimeToMax	 =	%d\n",
+		conf->mk_time_to_max);
+    fprintf(fp, "MouseKeysCurve		 =	%d\n", conf->mk_curve);
+
+    fprintf(fp, "AccessXTimeout		 =	%d\n", conf->ax_timeout);
+    if (conf->initial_ctrls != 0) {
+	fprintf(fp, "Controls		%c=	",
+		conf->replace_initial_ctrls ? ' ' : '+');
+	for (i = count = 0; *ax_controls[i].name; i++)
+	    if ((conf->initial_ctrls & ax_controls[i].token)
+		== ax_controls[i].token)
+		fprintf(fp, "%s%s", count++ ? " + " : "",
+			ax_controls[i].name);
+	fprintf(fp, "\n");
+    }
+    if (conf->axt_ctrls_on != 0) {
+	fprintf(fp, "AcessXTimeoutCtrlsOn	%c=	",
+		conf->replace_axt_ctrls_on ? ' ' : '+');
+	for (i = count = 0; *ax_controls[i].name; i++)
+	    if ((conf->axt_ctrls_on & ax_controls[i].token)
+		== ax_controls[i].token)
+		fprintf(fp, "%s%s", count++ ? " + " : "",
+			ax_controls[i].name);
+	fprintf(fp, "\n");
+    }
+    if (conf->axt_ctrls_off != 0) {
+	fprintf(fp, "AcessXTimeoutCtrlsOff	%c=	",
+		conf->replace_axt_ctrls_off ? ' ' : '-');
+	for (i = count = 0; *ax_controls[i].name; i++)
+	    if ((conf->axt_ctrls_off & ax_controls[i].token)
+		== ax_controls[i].token)
+		fprintf(fp, "%s%s", count++ ? " + " : "",
+			ax_controls[i].name);
+	fprintf(fp, "\n");
+    }
+
+    if (conf->initial_opts != 0) {
+	fprintf(fp, "Feedback		%c=	",
+		conf->replace_initial_opts ? ' ' : '+');
+	for (i = count = 0; *ax_feedback[i].name; i++)
+	    if ((conf->initial_opts & ax_feedback[i].token)
+		== ax_feedback[i].token)
+		fprintf(fp, "%s%s", count++ ? " + " : "",
+			ax_feedback[i].name);
+	fprintf(fp, "\n");
+    }
+    if (conf->axt_opts_on != 0) {
+	fprintf(fp, "AcessXTimeoutFeedbackOn	%c=	",
+		conf->replace_axt_opts_on ? ' ' : '+');
+	for (i = count = 0; *ax_controls[i].name; i++)
+	    if ((conf->axt_opts_on & ax_feedback[i].token)
+		== ax_feedback[i].token)
+		fprintf(fp, "%s%s", count++ ? " + " : "",
+			ax_feedback[i].name);
+	fprintf(fp, "\n");
+    }
+    if (conf->axt_opts_off != 0) {
+	fprintf(fp, "AcessXTimeoutFeedbackOff%c=	",
+		conf->replace_axt_opts_off ? ' ' : '-');
+	for (i = count = 0; *ax_feedback[i].name; i++)
+	    if ((conf->axt_opts_off & ax_feedback[i].token)
+		== ax_feedback[i].token)
+		fprintf(fp, "%s%s", count++ ? " + " : "",
+			ax_feedback[i].name);
+	fprintf(fp, "\n");
+    }
+
+    fclose(fp);
+
+    return (True);
+}
+
+void
+UpdateKeyboard(Bool load)
+{
+    static XkbRF_RulesPtr rules;
+    XkbComponentNamesRec comps;
+    XkbDescPtr xkb;
+
+    if (rules == NULL) {
+	FILE *fp;
+
+	if ((fp = fopen(XkbRulesFile, "r")) == NULL) {
+	    fprintf(stderr, "Can't open rules file\n");
+	    exit(1);
+	}
+
+	if ((rules = XkbRF_Create(0, 0)) == NULL) {
+	    fclose(fp);
+	    fprintf(stderr, "Can't create rules structure\n");
+	    exit(1);
+	}
+
+	if (!XkbRF_LoadRules(fp, rules)) {
+	    fclose(fp);
+	    XkbRF_Free(rules, True);
+	    fprintf(stderr, "Can't load rules\n");
+	    exit(1);
+	}
+	fclose(fp);
+    }
+
+    bzero((char*)&comps, sizeof(XkbComponentNamesRec));
+    XkbRF_GetComponents(rules, &(xkb_info->defs), &comps);
+
+    xkb = XkbGetKeyboardByName(DPY, XkbUseCoreKbd, &comps,
+			       XkbGBN_AllComponentsMask, 0, load);
+
+    if (xkb == NULL || xkb->geom == NULL) {
+	fprintf(stderr, "Couldn't get keyboard\n");
+	exit(1);
+    }
+    if (xkb->names->geometry == 0)
+	xkb->names->geometry = xkb->geom->name;
+
+    XkbFreeKeyboard(xkb_info->xkb, 0, False);
+
+    xkb_info->xkb = xkb;
+
+    XtFree(comps.keymap);
+    XtFree(comps.keycodes);
+    XtFree(comps.compat);
+    XtFree(comps.types);
+    XtFree(comps.symbols);
+    XtFree(comps.geometry);
+
+    if (kbd != NULL)
+	XClearArea(XtDisplay(configp), XtWindow(kbd), 0, 0, 0, 0, True);
+}
+
+static void
+KeyboardModelCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+    int i;
+
+    for (i = 0; i < xkb_model.nelem; i++)
+	if (strcmp(XtName(w), xkb_model.name[i]) == 0)
+	    break;
+    XtSetArg(args[0], XtNlabel, xkb_model.desc[i]);
+    XtSetValues(modelb, args, 1);
+    model = xkb_info->defs.model = xkb_model.name[i];
+    UpdateKeyboard(False);
+}
+
+static void
+KeyboardLayoutCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+    int i;
+
+    for (i = 0; i < xkb_layout.nelem; i++)
+	if (strcmp(XtName(w), xkb_layout.name[i]) == 0)
+	    break;
+    XtSetArg(args[0], XtNlabel, xkb_layout.desc[i]);
+    XtSetValues(layoutb, args, 1);
+    layout = xkb_info->defs.layout = xkb_layout.name[i];
+}
+
+/*ARGSUSED*/
+static void
+KeyboardApplyCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    UpdateKeyboard(True);
+}
+
+void
+KeyboardModelAndLayout(XF86SetupInfo *info)
+{
+    static int first = 1;
+    static Widget kbdml;
+    Arg args[1];
+    int i;
+
+    if (first) {
+	Widget label, popup, sme;
+
+	first = 0;
+
+	kbdml = XtCreateWidget("keyboardML", formWidgetClass,
+			       configp, NULL, 0);
+
+	/* MODEL */
+	label = XtCreateManagedWidget("labelM", labelWidgetClass,
+				      kbdml, NULL, 0);
+	modelb = XtVaCreateManagedWidget("model", menuButtonWidgetClass, kbdml,
+					 XtNmenuName, "modelP",
+					 NULL, 0);
+	popup = XtCreatePopupShell("modelP", simpleMenuWidgetClass,
+				   modelb, NULL, 0);
+	for (i = 0; i < xkb_model.nelem; i++) {
+	    sme = XtVaCreateManagedWidget(xkb_model.name[i], smeBSBObjectClass,
+					  popup,
+					  XtNlabel, xkb_model.desc[i],
+					  NULL, 0);
+	    XtAddCallback(sme, XtNcallback,  KeyboardModelCallback, NULL);
+	}
+
+	/* LAYOUT */
+	label = XtCreateManagedWidget("labelL", labelWidgetClass,
+				      kbdml, NULL, 0);
+	layoutb = XtVaCreateManagedWidget("layout", menuButtonWidgetClass, kbdml,
+					  XtNmenuName, "layoutP",
+					  XtNlabel, xkb_layout.desc[0],
+					  NULL, 0);
+	popup = XtCreatePopupShell("layoutP", simpleMenuWidgetClass,
+				   layoutb, NULL, 0);
+	for (i = 0; i < xkb_layout.nelem; i++) {
+	    sme = XtVaCreateManagedWidget(xkb_layout.name[i], smeBSBObjectClass,
+					  popup,
+					  XtNlabel, xkb_layout.desc[i],
+					  NULL, 0);
+	    XtAddCallback(sme, XtNcallback,  KeyboardLayoutCallback, NULL);
+	}
+
+	kbd = XtCreateManagedWidget("keyboard", coreWidgetClass,
+				    kbdml, NULL, 0);
+
+	apply = XtCreateManagedWidget("apply", commandWidgetClass,
+				      kbdml, NULL, 0);
+	XtAddCallback(apply, XtNcallback, KeyboardApplyCallback, NULL);
+
+	XtRealizeWidget(kbdml);
+
+	XtAddEventHandler(kbd, ExposureMask, False, XkbUIEventHandler, NULL);
+	/* Force the first update */
+	XClearArea(XtDisplay(kbd), XtWindow(kbd), 0, 0, 0, 0, True);
+    }
+
+    for (i = 0; i < xkb_model.nelem; i++)
+	if (strcmp(model, xkb_model.name[i]) == 0) {
+	    XtSetArg(args[0], XtNlabel, xkb_model.desc[i]);
+	    XtSetValues(modelb, args, 1);
+	    break;
+	}
+
+    for (i = 0; i < xkb_layout.nelem; i++)
+	if (strcmp(layout, xkb_layout.name[i]) == 0) {
+	    XtSetArg(args[0], XtNlabel, xkb_layout.desc[i]);
+	    XtSetValues(layoutb, args, 1);
+	    break;
+	}
+
+    XtChangeManagedSet(&current, 1, NULL, NULL, &kbdml, 1);
+    current = kbdml;
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h	Tue Jun 13 16:15:51 2000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.2 2000/06/13 23:15:51 dawes Exp $
+ */
+
+#include "config.h"
+#include <X11/extensions/XKBconfig.h>
+
+#ifndef _xf86cfg_keyboard_h
+#define _xf86cfg_keyboard_h
+
+/*
+ * All file names are from XProjectRoot or XWINHOME environment variable.
+ */
+#define	XkbConfigDir		"lib/X11/xkb/"
+#define	XkbConfigFile		"X0-config.keyboard"
+
+/*
+ * Types
+ */
+typedef struct {
+    char **name;
+    char **desc;
+    int nelem;
+} XF86XkbDescInfo;
+
+typedef struct {
+    XF86ConfInputPtr conf;
+    XkbDescPtr xkb;
+    XkbRF_VarDefsRec defs;
+    XkbConfigRtrnRec config;
+} XkbInfo;
+
+/*
+ * Prototypes
+ */
+XtPointer KeyboardConfig(XtPointer);
+void KeyboardModelAndLayout(XF86SetupInfo*);
+void InitializeKeyboard(void);
+void UpdateKeyboard(Bool);
+Bool WriteXKBConfiguration(char*, XkbConfigRtrnPtr);
+
+/*
+ * Initialization
+ */
+extern XkbInfo *xkb_info;
+
+#endif /* _xf86cfg_keyboard_h */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm	Tue Apr  4 15:36:59 2000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm,v 1.1 2000/04/04 22:36:59 dawes Exp $
+ */
+#define keyboard_width 50
+#define keyboard_height 44
+static unsigned char keyboard_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0xe0, 0xff, 0xff, 0xff,
+  0xff, 0x1f, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x78, 0x9e,
+  0xe7, 0x3d, 0xef, 0x79, 0x00, 0x18, 0x9a, 0xa6, 0x35, 0xad, 0x61, 0x00,
+  0x18, 0x9e, 0xe7, 0x3d, 0xef, 0x61, 0x00, 0x18, 0x9e, 0xe7, 0x3d, 0xef,
+  0x61, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x18, 0x00, 0x00,
+  0x00, 0x00, 0x60, 0x00, 0x98, 0xf7, 0xde, 0x7b, 0xef, 0x67, 0x00, 0x98,
+  0xd6, 0x5a, 0x6b, 0x2d, 0x66, 0x00, 0x98, 0xf7, 0xde, 0x7b, 0xef, 0x66,
+  0x00, 0x98, 0xf7, 0xde, 0x7b, 0xef, 0x66, 0x00, 0x18, 0x00, 0x00, 0x00,
+  0x80, 0x66, 0x00, 0x98, 0xdf, 0x7b, 0xef, 0xbd, 0x66, 0x00, 0x98, 0x58,
+  0x6b, 0xad, 0xb5, 0x66, 0x00, 0x98, 0xdf, 0x7b, 0xef, 0xbd, 0x67, 0x00,
+  0x98, 0xdf, 0x7b, 0xef, 0xbd, 0x67, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00,
+  0x60, 0x00, 0x98, 0xf7, 0xde, 0x7b, 0xef, 0x67, 0x00, 0x98, 0xd6, 0x5a,
+  0x6b, 0x2d, 0x66, 0x00, 0x98, 0xf7, 0xde, 0x7b, 0xef, 0x67, 0x00, 0x98,
+  0xf7, 0xde, 0x7b, 0xef, 0x67, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x60,
+  0x00, 0x98, 0xf7, 0xfd, 0xf7, 0xbd, 0x67, 0x00, 0x98, 0x96, 0x05, 0x96,
+  0xb5, 0x66, 0x00, 0x98, 0xf7, 0xfd, 0xf7, 0xbd, 0x67, 0x00, 0x98, 0xf7,
+  0xfd, 0xf7, 0xbd, 0x67, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00,
+  0x38, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff,
+  0x3f, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm	Tue Apr  4 15:36:59 2000
@@ -0,0 +1,66 @@
+/* XPM */
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm,v 1.1 2000/04/04 22:36:59 dawes Exp $
+ */
+static char * card_xpm[] = {
+"60 28 5 1",
+" 	c none",
+".	c #AEBAAEBAAEBA",
+"X	c #CF3CCF3CCF3C",
+"o	c #8E388A288E38",
+"O	c #69A671C669A6",
+"                              ........................      ",
+" .............................XXXXXXXXXXXXXXXXXXXXXXXX..... ",
+".XXXXXXXXXXXXXXXXXXXXXXXXXXXXX........................XXXXoO",
+".X........................................................oO",
+".X........................................................oO",
+".X.Xo..Xo.Xo.Xo..Xo.Xo.Xo.Xo.Xo.Xo..Xo.Xo.Xo..ooooooooooo.oO",
+".X.oo..oo.oo.oo..oo.oo.oo.oo.oo.oo..oo.oo.oo..XXXXXXXXXXX.oO",
+".X........................................................oO",
+".X........................................................oO",
+".X.Xo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.o..Xo.Xo.Xo..Xo.Xo.Xo.Xo.oO",
+".X.oo.oo.oo.oo.oo.oo.oo.oo.oo.oo.o..oo.oo.oo..oo.oo.oo.oo.oO",
+".X........................................................oO",
+".X.XXo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.oXo..Xo.Xo.Xo..Xo.Xo.Xo.Xo.oO",
+".X.ooo.oo.oo.oo.oo.oo.oo.oo.oo..Xo..oo.oo.oo..oo.oo.oo.Xo.oO",
+".X..............................Xo.....................Xo.oO",
+".X.Xo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.XXXo..Xo.Xo.Xo..Xo.Xo.Xo.Xo.oO",
+".X.oo.oo.oo.oo.oo.oo.oo.oo.oo.oooo..oo.oo.oo..oo.oo.oo.oo.oO",
+".X........................................................oO",
+".X.XXo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.Xo.XXo.....Xo.....Xo.Xo.Xo.Xo.oO",
+".X.ooo.oo.oo.oo.oo.oo.oo.oo.oo.ooo.....oo.....oo.oo.oo.Xo.oO",
+".X.....................................................Xo.oO",
+".X.Xo.Xo.Xo.XXXXXXXXXXXXo.Xo.Xo.Xo..Xo.Xo.Xo..XXXXo.Xo.Xo.oO",
+".X.oo.oo.oo.ooooooooooooo.oo.oo.oo..oo.oo.oo..ooooo.oo.oo.oO",
+".X........................................................oO",
+".X........................................................oO",
+".Xooooo.......................oooooooooooooooooooooooooooooO",
+" XOOOOOoooooooooooooooooooooooOOOOOOOOOOOOOOOOOOOOOOOOOOOOO ",
+"       OOOOOOOOOOOOOOOOOOOOOOO                              "};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/left.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/left.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/left.xbm	Thu May 18 09:29:59 2000
@@ -0,0 +1,8 @@
+#define left_width 19
+#define left_height 19
+static unsigned char left_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x06, 0x00,
+   0x00, 0x07, 0x00, 0x80, 0x07, 0x00, 0xc0, 0x07, 0x00, 0xe0, 0xff, 0x01,
+   0xf0, 0xff, 0x01, 0xf8, 0xff, 0x01, 0xf0, 0xff, 0x01, 0xe0, 0xff, 0x01,
+   0xc0, 0x07, 0x00, 0x80, 0x07, 0x00, 0x00, 0x07, 0x00, 0x00, 0x06, 0x00,
+   0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c	Thu May 18 09:29:59 2000
@@ -0,0 +1,448 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include "xf86config.h"
+#include "monitor-cfg.h"
+#include "screen.h"
+#include <X11/extensions/xf86vmode.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Simple.h>
+
+#include <ctype.h>
+#include <X11/Xaw/Label.h>
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/List.h>
+#include <X11/Xaw/MenuButton.h>
+#include <X11/Xaw/Viewport.h>
+#include <X11/Xaw/SimpleMenu.h>
+#include <X11/Xaw/SmeBSB.h>
+
+/*
+ * Prototypes
+ */
+static Bool MonitorConfigCheck(void);
+static void MonitorHsyncCallback(Widget, XtPointer, XtPointer);
+static void MonitorVsyncCallback(Widget, XtPointer, XtPointer);
+static void MonitorSelectCardCallback(Widget, XtPointer, XtPointer);
+static int string_to_parser_range(char*, parser_range*, int);
+#define PARSER_RANGE_SIZE	256
+/* string must have at least 256 bytes */
+static int parser_range_to_string(char*, parser_range*, int);
+
+extern void DrawCables(void);
+
+/*
+ * Initialization
+ */
+static char *hmodes[] = {
+    "Standard VGA, 640x480 @ 60 Hz",
+    "Super VGA, 800x600 @ 56 Hz",
+    "1024x768 @ 87 Hz int. (no 800x600)",
+    "1024x768 @ 87 Hz int., 800x600 @ 56 Hz",
+    "800x600 @ 60 Hz, 640x480 @ 72 Hz",
+    "1024x768 @ 60 Hz, 800x600 @ 72 Hz",
+    "High Frequency SVGA, 1024x768 @ 70 Hz",
+    "Monitor that can do 1280x1024 @ 60 Hz",
+    "Monitor that can do 1280x1024 @ 74 Hz",
+    "Monitor that can do 1280x1024 @ 76 Hz",
+};
+
+static char *hmodes_trans[] = {
+    "31.5",
+    "31.5 - 35.1",
+    "31.5, 35.5",
+    "31.5, 35.15, 35.5",
+    "31.5 - 37.9",
+    "31.5 - 48.5",
+    "31.5 - 57.0",
+    "31.5 - 64.3",
+    "31.5 - 79.0",
+    "31.5 - 82.0",
+};
+
+static char *vmodes [] = { "50 - 70", "50 - 90", "50 - 100", "40 - 150", };
+
+extern Widget config;
+static Widget hsync, vsync, hlist, vlist, cmenu;
+
+static parser_range mon_hsync[CONF_MAX_HSYNC];
+static parser_range mon_vrefresh[CONF_MAX_VREFRESH];
+static int mon_n_hsync, mon_n_vrefresh;
+static XF86ConfDevicePtr oldcard, card;
+static XF86ConfMonitorPtr current_monitor;
+
+/*
+ * Implementation
+ */
+XtPointer
+MonitorConfig(XtPointer conf)
+{
+    XF86ConfMonitorPtr monitor = (XF86ConfMonitorPtr)conf;
+    char monitor_name[48];
+    Arg args[1];
+
+    current_monitor = monitor;
+
+    xf86info.cur_list = MONITOR;
+    XtSetSensitive(back, xf86info.lists[MONITOR].cur_function > 0);
+    XtSetSensitive(next, xf86info.lists[MONITOR].cur_function <
+			 xf86info.lists[MONITOR].num_functions - 1);
+    (xf86info.lists[MONITOR].functions[xf86info.lists[MONITOR].cur_function])
+	(&xf86info);
+
+    XawListUnhighlight(hlist);
+    XawListUnhighlight(vlist);
+
+    if (monitor != NULL) {
+	XF86ConfScreenPtr screen = XF86Config->conf_screen_lst;
+	char str[PARSER_RANGE_SIZE];
+
+	XtSetArg(args[0], XtNstring, monitor->mon_identifier);
+	XtSetValues(ident_widget, args, 1);
+
+	while (screen != NULL) {
+	    if (screen->scrn_monitor == monitor)
+		break;
+
+	    screen = (XF86ConfScreenPtr)(screen->list.next);
+	}
+	if (screen != NULL) {
+	    oldcard = card = screen->scrn_device;
+	    XtSetArg(args[0], XtNlabel, card->dev_identifier);
+	}
+	else {
+	    oldcard = card = NULL;
+	    XtSetArg(args[0], XtNlabel, "");
+	}
+	XtSetValues(cmenu, args, 1);
+
+	mon_n_hsync = monitor->mon_n_hsync;
+	memcpy(mon_hsync, monitor->mon_hsync,
+	       sizeof(parser_range) * mon_n_hsync);
+	*str = '\0';
+	parser_range_to_string(str, mon_hsync, mon_n_hsync);
+	XtSetArg(args[0], XtNstring, str);
+	XtSetValues(hsync, args, 1);
+
+	mon_n_vrefresh = monitor->mon_n_vrefresh;
+	memcpy(mon_vrefresh, monitor->mon_vrefresh,
+	       sizeof(parser_range) * mon_n_vrefresh);
+	*str = '\0';
+	parser_range_to_string(str, mon_vrefresh, mon_n_vrefresh);
+	XtSetArg(args[0], XtNstring, str);
+	XtSetValues(vsync, args, 1);
+    }
+    else {
+	XF86ConfMonitorPtr monitor = XF86Config->conf_monitor_lst;
+	int nmonitors = 0;
+
+	oldcard = card = NULL;
+	while (monitor != NULL) {
+		++nmonitors;
+	    monitor = (XF86ConfMonitorPtr)(monitor->list.next);
+	}
+	do {
+	    ++nmonitors;
+	    XmuSnprintf(monitor_name, sizeof(monitor_name),
+			"Monitor%d", nmonitors);
+	} while (xf86FindMonitor(monitor_name,
+		 XF86Config->conf_monitor_lst));
+
+	XtSetArg(args[0], XtNstring, monitor_name);
+	XtSetValues(ident_widget, args, 1);
+
+	XtSetArg(args[0], XtNstring, "");
+	XtSetValues(hsync, args, 1);
+	XtSetValues(vsync, args, 1);
+
+	XtSetArg(args[0], XtNlabel, "");
+	XtSetValues(cmenu, args, 1);
+    }
+
+    if (ConfigLoop(MonitorConfigCheck) == True) {
+	if (monitor == NULL) {
+	    monitor = (XF86ConfMonitorPtr)
+		XtCalloc(1, sizeof(XF86ConfMonitorRec));
+	    monitor->mon_identifier = XtNewString(ident_string);
+	}
+
+	memcpy(monitor->mon_hsync, mon_hsync, sizeof(parser_range) *
+	       (monitor->mon_n_hsync = mon_n_hsync));
+	memcpy(monitor->mon_vrefresh, mon_vrefresh, sizeof(parser_range) *
+	       (monitor->mon_n_vrefresh = mon_n_vrefresh));
+
+	if (strcasecmp(monitor->mon_identifier, ident_string))
+	    xf86RenameMonitor(XF86Config, monitor, ident_string);
+
+	if (oldcard != card) {
+	    int i;
+
+	    for (i = 0; i < computer.num_devices; i++)
+		if (computer.devices[i]->widget == config)
+		    break;
+	    if (computer.devices[i]->config == NULL)
+		XF86Config->conf_monitor_lst =
+				xf86AddMonitor(XF86Config->conf_monitor_lst,
+					       monitor);
+	    computer.devices[i]->config = (XtPointer)monitor;
+	    ChangeScreen(monitor, monitor, card, oldcard);
+	    DrawCables();
+	}
+
+	return (monitor);
+    }
+
+    return (NULL);
+}
+
+static Bool
+MonitorConfigCheck(void)
+{
+    char *str;
+    Arg args[1];
+    XF86ConfMonitorPtr monitor = XF86Config->conf_monitor_lst;
+
+    if (ident_string == NULL || strlen(ident_string) == 0)
+	return (False);
+
+    bzero(mon_hsync, sizeof(parser_range) * CONF_MAX_HSYNC);
+    bzero(mon_vrefresh, sizeof(parser_range) * CONF_MAX_VREFRESH);
+
+    XtSetArg(args[0], XtNstring, &str);
+    XtGetValues(hsync, args, 1);
+    if ((mon_n_hsync = string_to_parser_range(str, mon_hsync,
+					      CONF_MAX_HSYNC)) <= 0)
+	return (False);
+
+    XtSetArg(args[0], XtNstring, &str);
+    XtGetValues(vsync, args, 1);
+    if ((mon_n_vrefresh = string_to_parser_range(str, mon_vrefresh,
+						 CONF_MAX_VREFRESH)) <= 0)
+	return (False);
+
+    while (monitor != NULL) {
+	if (monitor != current_monitor &&
+	    strcasecmp(ident_string, monitor->mon_identifier) == 0)
+	    return (False);
+	monitor = (XF86ConfMonitorPtr)(monitor->list.next);
+    }
+
+    return (True);
+}
+
+static int
+string_to_parser_range(char *str, parser_range *range, int nrange)
+{
+    double val;
+    int i = 0;
+
+    if (str == NULL || *str == '\0' || range == NULL || nrange == 0)
+	return (0);
+
+    while (*str) {
+	while (*str && isspace(*str))
+	    ++str;
+	val = strtod(str, &str);
+	while (*str && isspace(*str))
+	    ++str;
+	if (*str == ',' || *str == '\0') {
+	    if (*str)
+		++str;
+	    range[i].lo = range[i].hi = val;
+	    if (++i >= nrange || *str == '\0')
+		break;
+	}
+	else if (*str != '-')
+	    return (0);
+	++str;
+	range[i].lo = val;
+	while (*str && isspace(*str))
+	    ++str;
+	if ((range[i].hi = strtod(str, &str)) < range[i].lo)
+	    return (0);
+	if (++i >= nrange)
+	    break;
+    }
+
+    return (i);
+}
+
+static int
+parser_range_to_string(char *str, parser_range *range, int nrange)
+{
+    int i, len;
+
+    if (str == NULL || range == NULL || nrange <= 0)
+	return (0);
+
+    for (i = len = 0; i < nrange; i++) {
+	if (i > 0)
+	    len += XmuSnprintf(str + len, PARSER_RANGE_SIZE - len, "%s",
+			       ", ");
+	if (range[i].lo == range[i].hi)
+	    len += XmuSnprintf(str + len, PARSER_RANGE_SIZE - len, "%g",
+			       range[i].lo);
+	else if (range[i].lo < range[i].hi)
+	    len += XmuSnprintf(str + len, PARSER_RANGE_SIZE - len, "%g - %g",
+			       range[i].lo, range[i].hi);
+	else
+	    return (0);
+    }
+
+    return (i);
+}
+
+/*ARGSUSED*/
+static void
+MonitorHsyncCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XawListReturnStruct *info = (XawListReturnStruct *)call_data;
+    Arg args[1];
+
+    XtSetArg(args[0], XtNstring, hmodes_trans[info->list_index]);
+    XtSetValues(hsync, args, 1);
+}
+
+/*ARGSUSED*/
+static void
+MonitorVsyncCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XawListReturnStruct *info = (XawListReturnStruct *)call_data;
+    Arg args[1];
+
+    XtSetArg(args[0], XtNstring, info->string);
+    XtSetValues(vsync, args, 1);
+}
+
+/*ARGSUSED*/
+static void
+MonitorSelectCardCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+
+    card = (XF86ConfDevicePtr)user_data;
+    XtSetArg(args[0], XtNlabel, card != NULL ? card->dev_identifier : "");
+    XtSetValues(cmenu, args, 1);
+}
+
+void
+MonitorLayout(XF86SetupInfo *info)
+{
+    static int first = 1, men;
+    static Widget layout, menu;
+    XF86ConfDevicePtr device = XF86Config->conf_device_lst;
+    Widget sme;
+    Arg args[1];
+    char *menuname;
+
+    if (first) {
+	Widget viewport;
+
+	first = 0;
+
+	layout = XtCreateWidget("monitorl", formWidgetClass,
+				configp, NULL, 0);
+	XtCreateManagedWidget("hlabel", labelWidgetClass, layout, NULL, 0);
+	hsync = XtVaCreateManagedWidget("hsync", asciiTextWidgetClass, layout,
+					XtNeditType, XawtextEdit,
+					NULL, 0);
+	viewport = XtCreateManagedWidget("hviewport", viewportWidgetClass,
+					 layout, NULL, 0);
+	hlist = XtVaCreateManagedWidget("hlist", listWidgetClass, viewport,
+					XtNlist, hmodes,
+					XtNnumberStrings, sizeof(hmodes) /
+					sizeof(hmodes[0]), NULL, 0);
+	XtAddCallback(hlist, XtNcallback, MonitorHsyncCallback, NULL);
+
+	XtCreateManagedWidget("vlabel", labelWidgetClass, layout, NULL, 0);
+	vsync = XtVaCreateManagedWidget("vsync", asciiTextWidgetClass, layout,
+					XtNeditType, XawtextEdit,
+					NULL, 0);
+	viewport = XtCreateManagedWidget("vviewport", viewportWidgetClass,
+					 layout, NULL, 0);
+	vlist = XtVaCreateManagedWidget("vlist", listWidgetClass, viewport,
+					XtNlist, vmodes,
+					XtNnumberStrings, sizeof(vmodes) /
+					sizeof(vmodes[0]), NULL, 0);
+	XtAddCallback(vlist, XtNcallback, MonitorVsyncCallback, NULL);
+
+	XtCreateManagedWidget("clabel", labelWidgetClass, layout, NULL, 0);
+	cmenu = XtCreateManagedWidget("cmenu", menuButtonWidgetClass,
+				      layout, NULL, 0);
+
+	XtRealizeWidget(layout);
+    }
+
+    if (menu != NULL)
+	XtDestroyWidget(menu);
+
+    /*
+     * swaps names because XtDestroyWidget will only really destroy it
+     * when the code returns to XtAppMainLoop
+     */
+    menuname = men & 1 ? "mena" : "menb";
+    menu = XtCreatePopupShell(menuname, simpleMenuWidgetClass,
+			      cmenu, NULL, 0);
+    XtSetArg(args[0], XtNmenuName, menuname);
+    XtSetValues(cmenu, args, 1);
+    ++men;
+    sme = XtVaCreateManagedWidget("none", smeBSBObjectClass, menu,
+				  NULL, 0);
+    XtAddCallback(sme, XtNcallback, MonitorSelectCardCallback, NULL);
+
+    while (device != NULL) {
+	XF86ConfScreenPtr screen = XF86Config->conf_screen_lst;
+	Widget sme;
+	Bool sensitive = True;
+
+	while (screen != NULL) {
+	    if (screen->scrn_device == device) {
+		sensitive = screen->scrn_monitor == NULL ||
+			    screen->scrn_monitor == current_monitor;
+		break;
+	    }
+	    screen = (XF86ConfScreenPtr)(screen->list.next);
+	}
+	sme = XtCreateManagedWidget(device->dev_identifier,
+				    smeBSBObjectClass, menu,
+				    NULL, 0);
+	if (sensitive)
+	    XtAddCallback(sme, XtNcallback, MonitorSelectCardCallback, device);
+	XtSetSensitive(sme, sensitive);
+
+	device = (XF86ConfDevicePtr)(device->list.next);
+    }
+
+    XtRealizeWidget(menu);
+
+    XtChangeManagedSet(&current, 1, NULL, NULL, &layout, 1);
+    current = layout;
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h	Thu May 18 09:29:59 2000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include "config.h"
+
+#ifndef _xf86cfg_monitor_h
+#define _xf86cfg_monitor_h
+
+/*
+ * Prototypes
+ */
+XtPointer MonitorConfig(XtPointer);
+void MonitorLayout(XF86SetupInfo*);
+void MonitorVidtune(XF86SetupInfo*);
+
+#endif /* _xf86cfg_monitor_h */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm	Tue Apr  4 15:37:00 2000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ */
+#define monitor_width 50
+#define monitor_height 44
+static unsigned char monitor_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+  0x03, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0xe0, 0x01, 0x00,
+  0x00, 0x00, 0x1e, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x70,
+  0xfc, 0xff, 0xff, 0xff, 0x38, 0x00, 0x30, 0xfe, 0xff, 0xff, 0xff, 0x31,
+  0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00,
+  0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03,
+  0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00,
+  0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00,
+  0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00,
+  0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30,
+  0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33,
+  0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00,
+  0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03,
+  0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00,
+  0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00,
+  0x33, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x33, 0x00, 0x30, 0xfe, 0xff,
+  0xff, 0xff, 0x31, 0x00, 0x70, 0xfc, 0xff, 0xff, 0xff, 0x38, 0x00, 0x60,
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x1e,
+  0x00, 0xc0, 0x1f, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff,
+  0xff, 0x03, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0xc0, 0x0f,
+  0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x30, 0x00,
+  0x00, 0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
+  0xf8, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x3f, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm	Tue Apr  4 15:37:00 2000
@@ -0,0 +1,79 @@
+/* XPM */
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ */
+static char * monitor_xpm[] = {
+"47 40 6 1",
+" 	c none",
+"Z	c #DF7DE38DDF7D",
+".	c #BEFBBEFBBEFB",
+"X	c #9E799A699E79",
+"o	c #30C230C230C2",
+"O	c #96589E799658",
+"ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ..",
+"Z..............................................",
+"Z.............................................X",
+"Z.............................................X",
+"Z...XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....X",
+"Z...Xooooooooooooooooooooooooooooooooooooo....X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z...XoooooooooooooooooooooooooooooooooooooZ...X",
+"Z....oooooooooooooooooooooooooooooooooooooZ...X",
+"Z.....ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ...X",
+"Z.............................................X",
+"Z.............................................X",
+"..............................................X",
+"..XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+"           OOOOOOOOOOOOOOOOOOOOOOOOOo          ",
+"           XXXXXXXXXXXXXXXXXXXXXXXXXX          ",
+"     OOOOOOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo.   ",
+"     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo   ",
+"     ooooooooooooooooooooooooooooooooooooooo   "};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c	Thu May 18 09:29:59 2000
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include "xf86config.h"
+#include "mouse-cfg.h"
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Label.h>
+#include <X11/Xaw/List.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Toggle.h>
+#include <X11/Xaw/Viewport.h>
+#include <X11/extensions/xf86misc.h>
+
+/*
+ * Prootypes
+ */
+static void MouseDeviceCallback(Widget, XtPointer, XtPointer);
+static void MouseProtocolCallback(Widget, XtPointer, XtPointer);
+static void MouseEmulateCallback(Widget, XtPointer, XtPointer);
+static void MouseApplyCallback(Widget, XtPointer, XtPointer);
+static Bool MouseConfigCheck(void);
+
+/*
+ * Initialization
+ */
+static char *protocols[] = {
+    "Auto",
+    "BusMouse",
+    "GlidePoint",
+    "IntelliMouse",
+    "Logitech",
+    "Microsoft",
+    "MMHitTab",
+    "MMSeries",
+    "MouseMan",
+    "MouseSystems",
+    "PS/2",
+    "SysMouse",
+    "ThinkingMouse",
+};
+
+static Widget text;
+static char *device, *protocol;
+static Bool emulate;
+static XF86ConfInputPtr current_input;
+
+/*
+ * Implementation
+ */
+/*ARGSUSED*/
+XtPointer
+MouseConfig(XtPointer config)
+{
+    XF86ConfInputPtr mouse = (XF86ConfInputPtr)config;
+    XF86OptionPtr option;
+    char mouse_name[32];
+    Arg args[1];
+
+    static char *Device = "Device", *Protocol = "Protocol",
+		*Emulate3Buttons = "Emulate3Buttons",
+		*Emulate3Timeout = "Emulate3Timeout";
+
+    current_input = mouse;
+
+    if (mouse != NULL) {
+	emulate = xf86FindOption(mouse->inp_option_lst,
+				 Emulate3Buttons) != NULL;
+	if ((option = xf86FindOption(mouse->inp_option_lst, Device)) != NULL)
+	    device = option->opt_val;
+	else
+	    device = NULL;
+	if ((option = xf86FindOption(mouse->inp_option_lst, Protocol)) != NULL)
+	    protocol = option->opt_val;
+	else
+	    protocol = NULL;
+
+	XtSetArg(args[0], XtNstring, mouse->inp_identifier);
+	XtSetValues(ident_widget, args, 1);
+    }
+    else {
+	XF86ConfInputPtr input = XF86Config->conf_input_lst;
+	int nmouses = 0;
+
+	while (input != NULL) {
+	    if (strcasecmp(input->inp_driver, "mouse") == 0)
+		++nmouses;
+	    input = (XF86ConfInputPtr)(input->list.next);
+	}
+	do {
+	    ++nmouses;
+	    XmuSnprintf(mouse_name, sizeof(mouse_name), "Mouse%d", nmouses);
+	} while (xf86FindInput(mouse_name,
+		 XF86Config->conf_input_lst));
+
+	XtSetArg(args[0], XtNstring, mouse_name);
+	XtSetValues(ident_widget, args, 1);
+
+	emulate = True;
+	device = NULL;
+	protocol = NULL;
+    }
+
+    xf86info.cur_list = MOUSE;
+    XtSetSensitive(back, xf86info.lists[MOUSE].cur_function > 0);
+    XtSetSensitive(next, xf86info.lists[MOUSE].cur_function <
+			 xf86info.lists[MOUSE].num_functions - 1);
+    (xf86info.lists[MOUSE].functions[xf86info.lists[MOUSE].cur_function])
+	(&xf86info);
+
+    if (ConfigLoop(MouseConfigCheck) == True) {
+	XtSetArg(args[0], XtNstring, &device);
+	XtGetValues(text, args, 1);
+	if (mouse == NULL) {
+	    mouse = XtNew(XF86ConfInputRec);
+	    mouse->list.next = NULL;
+	    mouse->inp_identifier = XtNewString(ident_string);
+	    mouse->inp_driver = XtNewString("mouse");
+	    mouse->inp_option_lst = xf86NewOption(XtNewString(Device),
+						  XtNewString(device));
+	    xf86addNewOption(mouse->inp_option_lst,
+			     XtNewString(Protocol), XtNewString(protocol));
+	    if (emulate) {
+		xf86addNewOption(mouse->inp_option_lst,
+			         XtNewString(Emulate3Buttons), NULL);
+		xf86addNewOption(mouse->inp_option_lst,
+			         XtNewString(Emulate3Timeout),
+				 XtNewString("50"));
+	    }
+	    mouse->inp_comment = NULL;
+	}
+	else {
+	    if ((option = xf86FindOption(mouse->inp_option_lst, Device)) != NULL) {
+		XtFree(option->opt_val);
+		option->opt_val = XtNewString(device);
+/*		XtFree(option->opt_comment);*/
+	    }
+	    else {
+		if (mouse->inp_option_lst == NULL)
+		    mouse->inp_option_lst = xf86NewOption(XtNewString(Device),
+							  XtNewString(device));
+		else
+		    xf86addNewOption(mouse->inp_option_lst,
+				     XtNewString(Device), XtNewString(device));
+	    }
+
+	    if ((option = xf86FindOption(mouse->inp_option_lst, Protocol)) != NULL) {
+		XtFree(option->opt_val);
+		option->opt_val = XtNewString(protocol);
+/*		XtFree(option->opt_comment);*/
+	    }
+	    else
+		xf86addNewOption(mouse->inp_option_lst,
+				 XtNewString(Protocol), XtNewString(protocol));
+
+	    if (emulate == False) {
+		xf86RemoveOption(&(mouse->inp_option_lst), Emulate3Buttons);
+		xf86RemoveOption(&(mouse->inp_option_lst), Emulate3Timeout);
+	    }
+	    else if (emulate) {
+		xf86addNewOption(mouse->inp_option_lst,
+				 XtNewString(Emulate3Buttons), NULL);
+		xf86addNewOption(mouse->inp_option_lst,
+				 XtNewString(Emulate3Timeout), XtNewString("50"));
+	    }
+	}
+	if (strcasecmp(mouse->inp_identifier, ident_string))
+	    xf86RenameInput(XF86Config, mouse, ident_string);
+
+	return ((XtPointer)mouse);
+    }
+
+    return (NULL);
+}
+
+static Bool
+MouseConfigCheck(void)
+{
+    Arg args[1];
+    XF86ConfInputPtr mouse = XF86Config->conf_input_lst;
+
+    XtSetArg(args[0], XtNstring, &device);
+    XtGetValues(text, args, 1);
+
+    if (ident_string == NULL || strlen(ident_string) == 0 ||
+	device == NULL || strlen(device) == 0 || protocol == NULL)
+	return (False);
+    while (mouse != NULL) {
+	if (mouse != current_input &&
+	    strcasecmp(ident_string, mouse->inp_identifier) == 0)
+	    return (False);
+	mouse = (XF86ConfInputPtr)(mouse->list.next);
+    }
+
+    return (True);
+}
+
+static void
+MouseDeviceCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XawListReturnStruct *info = (XawListReturnStruct *)call_data;
+    Arg args[1];
+
+    XtSetArg(args[0], XtNstring, info->string);
+    XtSetValues((Widget)user_data, args, 1);
+    XawTextSetInsertionPoint((Widget)user_data, strlen(info->string));
+}
+
+static void
+MouseProtocolCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XawListReturnStruct *info = (XawListReturnStruct *)call_data;
+
+    protocol = info->string;
+}
+
+static void
+MouseEmulateCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    emulate = (Bool)call_data;
+}
+
+/* This function does not yet work in 4.0 */
+static void
+MouseApplyCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XF86MiscMouseSettings mouse;
+
+    XF86MiscGetMouseSettings(XtDisplay(w), &mouse);
+    XtFree(mouse.device);
+
+    if (strcmp(protocol, "BusMouse") == 0)
+	mouse.type = MTYPE_BUSMOUSE;
+    else if (strcmp(protocol, "GlidePoint") == 0)
+	mouse.type = MTYPE_GLIDEPOINT;
+    else if (strcmp(protocol, "IntelliMouse") == 0)
+	mouse.type = MTYPE_IMSERIAL;
+    else if (strcmp(protocol, "Logitech") == 0)
+	mouse.type = MTYPE_LOGITECH;
+    else if (strcmp(protocol, "Microsoft") == 0)
+	mouse.type = MTYPE_MICROSOFT;
+    else if (strcmp(protocol, "MMHitTab") == 0)
+	mouse.type = MTYPE_MMHIT;
+    else if (strcmp(protocol, "MMSeries") == 0)
+	mouse.type = MTYPE_MMSERIES;
+    else if (strcmp(protocol, "MouseMan") == 0)
+	mouse.type = MTYPE_LOGIMAN;
+    else if (strcmp(protocol, "MouseSystems") == 0)
+	mouse.type = MTYPE_MOUSESYS;
+    else if (strcmp(protocol, "PS/2") == 0)
+	mouse.type = MTYPE_PS_2;
+    else if (strcmp(protocol, "SysMouse") == 0)
+	mouse.type = MTYPE_SYSMOUSE;
+    else if (strcmp(protocol, "ThinkingMouse") == 0)
+	mouse.type = MTYPE_THINKING;
+    else
+	mouse.type = MTYPE_AUTOMOUSE;
+
+    mouse.emulate3buttons = emulate;
+    mouse.flags |= MF_REOPEN;
+
+    /* This was not working in 3.3 */
+    mouse.device = device;
+
+    XFlush(XtDisplay(w));
+    XF86MiscSetMouseSettings(XtDisplay(w), &mouse);
+}
+
+void
+MouseDeviceAndProtocol(XF86SetupInfo *info)
+{
+    static int first = 1, ndevices;
+    static Widget mouse_dp, listD, listP, emul3, apply;
+    static char **devices;
+    static char *patterns[] = {
+	"cua",
+	"mouse",
+	"ps",
+	"sysmouse",
+	"ttyS",
+    };
+    Arg args[2];
+    int i;
+
+    if (first) {
+	Widget label, viewport;
+	struct dirent *ent;
+	DIR *dir;
+
+	first = 0;
+
+	mouse_dp = XtCreateWidget("mouseDP", formWidgetClass,
+				  configp, NULL, 0);
+
+	/* DEVICE */
+	if ((dir = opendir("/dev")) != NULL) {
+	    int i, len;
+
+	    (void)readdir(dir);
+	    (void)readdir(dir);
+	    while ((ent = readdir(dir)) != NULL) {
+		for (i = 0; i < sizeof(patterns) / sizeof(patterns[0]); i++) {
+		    len = strlen(patterns[i]);
+
+		    if (strncmp(patterns[i], ent->d_name, len) == 0) {
+			len = strlen(ent->d_name) + 6;
+
+			devices = (char**)XtRealloc((XtPointer)devices,
+						    sizeof(char*) * ++ndevices);
+			devices[ndevices - 1] = XtMalloc(len);
+			XmuSnprintf(devices[ndevices - 1], len, "/dev/%s",
+				    ent->d_name);
+		    }
+		}
+	    }
+	    closedir(dir);
+	}
+
+	label = XtCreateManagedWidget("labelD", labelWidgetClass,
+				      mouse_dp, NULL, 0);
+	text = XtVaCreateManagedWidget("device", asciiTextWidgetClass,
+				       mouse_dp,
+				       XtNeditType, XawtextEdit,
+				       NULL, 0);
+	viewport = XtCreateManagedWidget("viewportD", viewportWidgetClass,
+					 mouse_dp, NULL, 0);
+
+	listD = XtVaCreateManagedWidget("listD", listWidgetClass,
+					viewport,
+					XtNlist, devices,
+					XtNnumberStrings, ndevices,
+					NULL, 0);
+	XtAddCallback(listD, XtNcallback, MouseDeviceCallback, (XtPointer)text);
+
+	/* PROTOCOL */
+	label = XtCreateManagedWidget("labelP", labelWidgetClass,
+				      mouse_dp, NULL, 0);
+	viewport = XtCreateManagedWidget("viewportP", viewportWidgetClass,
+					 mouse_dp, NULL, 0);
+
+	listP = XtVaCreateManagedWidget("listP", listWidgetClass,
+					viewport,
+					XtNlist, protocols,
+					XtNnumberStrings,
+					sizeof(protocols) / sizeof(protocols[0]),
+					NULL, 0);
+	XtAddCallback(listP, XtNcallback, MouseProtocolCallback, NULL);
+
+	emul3 = XtCreateManagedWidget("emulate3", toggleWidgetClass,
+				      mouse_dp, NULL, 0);
+	XtAddCallback(emul3, XtNcallback, MouseEmulateCallback, NULL);
+	apply = XtCreateManagedWidget("apply", commandWidgetClass,
+				      mouse_dp, NULL, 0);
+	XtAddCallback(apply, XtNcallback, MouseApplyCallback, NULL);
+
+	XtRealizeWidget(mouse_dp);
+    }
+
+    if (device != NULL) {
+	for (i = 0; i < ndevices; i++)
+	    if (strcmp(device, devices[i]) == 0) {
+		XtSetArg(args[0], XtNstring, device);
+		XtSetValues(text, args, 1);
+		XawListHighlight(listD, i);
+		break;
+	    }
+
+	if (i >= ndevices) {
+	    devices = (char**)XtRealloc((XtPointer)devices,
+					sizeof(char*) * ++ndevices);
+	    devices[ndevices - 1] = XtNewString(device);
+	    XawListHighlight(listD, ndevices - 1);
+	    XtSetArg(args[0], XtNlist, devices);
+	    XtSetArg(args[1], XtNnumberStrings, ndevices);
+	    XtSetValues(listD, args, 2);
+	}
+	device = devices[i];
+    }
+    else {
+	XtSetArg(args[0], XtNstring, "");
+	XtSetValues(text, args, 1);
+	XawListUnhighlight(listD);
+    }
+
+    if (protocol != NULL) {
+	for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++)
+	    if (strcasecmp(protocol, protocols[i]) == 0) {
+		protocol = protocols[i];
+		XawListHighlight(listP, i);
+		break;
+	    }
+    }
+    else {
+	/* "Auto" is the default */
+	protocol = protocols[0];
+	XawListHighlight(listP, 0);
+    }
+
+    XtSetArg(args[0], XtNstate, emulate);
+    XtSetValues(emul3, args, 1);
+
+    XtChangeManagedSet(&current, 1, NULL, NULL, &mouse_dp, 1);
+    current = mouse_dp;
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h	Tue Apr  4 15:37:00 2000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ */
+
+#include "config.h"
+
+#ifndef _xf86cfg_mouse_h
+#define _xf86cfg_mouse_h
+
+/*
+ * Prototypes
+ */
+XtPointer MouseConfig(XtPointer);
+void MouseDeviceAndProtocol(XF86SetupInfo*);
+
+#endif /* _xf86cfg_mouse_h */
+
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm	Tue Apr  4 15:37:01 2000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm,v 1.1 2000/04/04 22:37:01 dawes Exp $
+ */
+#define mouse_width 50
+#define mouse_height 44
+static unsigned char mouse_bits[] = {
+  0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcf, 0xcf, 0x03, 0x00,
+  0x00, 0x00, 0xc0, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xe0, 0x79, 0x78,
+  0x1e, 0x00, 0x00, 0x00, 0x60, 0x38, 0x70, 0x18, 0x00, 0x00, 0x00, 0x70,
+  0x30, 0x30, 0x38, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00,
+  0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30,
+  0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x30, 0x30,
+  0x30, 0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00,
+  0xf0, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x3f, 0x00,
+  0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30,
+  0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00,
+  0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30,
+  0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00,
+  0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00,
+  0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30,
+  0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00,
+  0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x38,
+  0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xe0, 0x01,
+  0x00, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00,
+  0x00, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm	Tue Apr  4 15:37:01 2000
@@ -0,0 +1,76 @@
+/* XPM */
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm,v 1.1 2000/04/04 22:37:01 dawes Exp $
+ */
+static char * mouse_xpm[] = {
+"26 35 8 1",
+" 	c none",
+".	c #E79DE79DE79D",
+"X	c #CF3CCF3CCF3C",
+"o	c #BEFBBAEABEFB",
+"O	c #8E3896588E38",
+"+	c #AEBAAAAAAEBA",
+"@	c #9E79AAAA9E79",
+"#	c #A699A289A699",
+"        .....XXXX.        ",
+"     X..o.XXXXXXXo...     ",
+"   X..XXo.XXXXXXXo.XX.X   ",
+"  X.XXXXo.XXXXXXXo.XXX.X  ",
+"  .XXXXXo.XXXXXXXo.XXXXoo ",
+" X.XXXXXo.XXXoXXXo.XXXXoXo",
+"oX.XXXXXo.XXXXXXXo.XXXXXoo",
+"oX.XoXoXo.XXoXoXXo.XXXXXoO",
+"oX.XXXXXo.XXXXXXXo.XXoXX+O",
+"oX.XXXoXo.XXoXoXXo.XXXXX+O",
+"oX.XXXXXo.XXXXXXXo.XX...+O",
+"ooooo...o........oooo@@@OO",
+"oX.XX#@@@@@@@@@@@@@@@XXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXXX+O",
+"oX.XXXXXXXXXXXXXXXXXXXX+oO",
+" #X.XXXXXXXXXXXXXXXXXXooO ",
+" #X.XXXXXXXXXXXXXXXXXXooO ",
+" #X.XXXXXXXXXXXXXXXXXX+oO ",
+" #X.XXXXXXXXXXXXXXXXXX+oO ",
+"  #.XXXXXXXXXXXXXXXXX++O  ",
+"  #X..XXXXXXXXXXXXXXX+oO  ",
+"   #X.XXXXXXXXXXXXXX+oO   ",
+"    #.XXXXXXXXXXXXXX+O    ",
+"    #X..XXXXXXXXXo++oO    ",
+"     #XX..XXXXXoo+ooO     ",
+"      ##XXooooo+ooOO      ",
+"        ooooooooOO        ",
+"          oOOOOO          "};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/narrower.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/narrower.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/narrower.xbm	Thu May 18 09:29:59 2000
@@ -0,0 +1,8 @@
+#define narrower_width 19
+#define narrower_height 19
+static unsigned char narrower_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0x00, 0x18, 0xc0, 0x00,
+   0x38, 0xe0, 0x00, 0x78, 0xf0, 0x00, 0xf8, 0xf8, 0x00, 0xff, 0xfd, 0x07,
+   0xff, 0xff, 0x07, 0xff, 0xff, 0x07, 0xff, 0xff, 0x07, 0xff, 0xfd, 0x07,
+   0xf8, 0xf8, 0x00, 0x78, 0xf0, 0x00, 0x38, 0xe0, 0x00, 0x18, 0xc0, 0x00,
+   0x08, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/options.c:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/options.c	Thu May 18 09:29:59 2000
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include "options.h"
+#include "xf86config.h"
+#include <X11/Shell.h>
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/List.h>
+#include <X11/Xaw/Command.h>
+#include <X11/Xaw/Paned.h>
+#include <X11/Xaw/Viewport.h>
+
+/*
+ * Prototypes
+ */
+static void PopdownCallback(Widget, XtPointer, XtPointer);
+static void SelectOptionCallback(Widget, XtPointer, XtPointer);
+static void AddOption(Widget, XtPointer, XtPointer);
+static void RemoveOption(Widget, XtPointer, XtPointer);
+static void UpdateOption(Widget, XtPointer, XtPointer);
+static void UpdateOptionList(void);
+
+/*
+ * Initialization
+ */
+static XF86OptionPtr *options;
+static Widget shell, add, remov, update, list, name, value;
+static char *option_str;
+static int option_index, popped = False;
+
+/*
+ * Implementation
+ */
+void
+OptionsPopup(XF86OptionPtr *opts)
+{
+    static int first = 1;
+
+    option_str = NULL;
+    options = opts;
+    if (first) {
+	Widget pane, form, viewport, bottom, popdown;
+
+	first = 0;
+
+	shell = XtCreatePopupShell("options", transientShellWidgetClass,
+				   toplevel, NULL, 0);
+	pane = XtCreateManagedWidget("pane", panedWidgetClass,
+				     shell, NULL, 0);
+	form = XtCreateManagedWidget("commands", formWidgetClass,
+				     pane, NULL, 0);
+	add = XtCreateManagedWidget("add", commandWidgetClass,
+				    form, NULL, 0);
+	XtAddCallback(add, XtNcallback, AddOption, NULL);
+	remov = XtCreateManagedWidget("remove", commandWidgetClass,
+				      form, NULL, 0);
+	XtAddCallback(remov, XtNcallback, RemoveOption, NULL);
+	update = XtCreateManagedWidget("update", commandWidgetClass,
+				       form, NULL, 0);
+	XtAddCallback(update, XtNcallback, UpdateOption, NULL);
+	form = XtCreateManagedWidget("form", formWidgetClass,
+				     pane, NULL, 0);
+	XtVaCreateManagedWidget("label1", labelWidgetClass, form,
+				XtNlabel, " Option \"",
+				NULL, 0);
+	name = XtVaCreateManagedWidget("name", asciiTextWidgetClass, form,
+				       XtNeditType, XawtextEdit,
+				       NULL, 0);
+	XtVaCreateManagedWidget("label2", labelWidgetClass,
+				form,
+				XtNlabel, "\" \"",
+				NULL, 0);
+	value = XtVaCreateManagedWidget("value", asciiTextWidgetClass, form,
+					XtNeditType, XawtextEdit,
+					NULL, 0);
+	XtVaCreateManagedWidget("label3", labelWidgetClass, form,
+				XtNlabel, "\" ",
+				NULL, 0);
+	viewport = XtCreateManagedWidget("viewport", viewportWidgetClass,
+					 form, NULL, 0);
+	list = XtCreateManagedWidget("list", listWidgetClass,
+				     viewport, NULL, 0);
+	XtAddCallback(list, XtNcallback, SelectOptionCallback, NULL);
+	bottom = XtCreateManagedWidget("bottom", formWidgetClass,
+				       pane, NULL, 0);
+	popdown = XtCreateManagedWidget("popdown", commandWidgetClass,
+					bottom, NULL, 0);
+	XtAddCallback(popdown, XtNcallback, PopdownCallback, NULL);
+	XtRealizeWidget(shell);
+	XSetWMProtocols(DPY, XtWindow(shell), &wm_delete_window, 1);
+    }
+
+    UpdateOptionList();
+    popped = True;
+    XtPopup(shell, XtGrabExclusive);
+
+    while (popped)
+	XtAppProcessEvent(XtWidgetToApplicationContext(shell), XtIMAll);
+}
+
+static void
+UpdateOptionList(void)
+{
+    Arg args[2];
+    char **ops, **oldops;
+    int nops, oldnops;
+    XF86OptionPtr opt;
+
+    ops = NULL;
+    nops = 0;
+    XawListUnhighlight(list);
+    XtSetArg(args[0], XtNlist, &oldops);
+    XtSetArg(args[1], XtNnumberStrings, &oldnops);
+    XtGetValues(list, args, 2);
+    opt = *options;
+    while (opt != NULL) {
+	if (nops % 16 == 0)
+	    ops = (char**)XtRealloc((XtPointer)ops, (nops + 16) *
+				    sizeof(char*));
+	ops[nops++] = XtNewString(opt->opt_name);
+	opt = (XF86OptionPtr)(opt->list.next);
+    }
+    if (nops == 0) {
+	ops = (char**)XtMalloc(sizeof(char*));
+	ops[0] = XtNewString("");
+	nops = 1;
+    }
+    XtSetArg(args[0], XtNlist, ops);
+    XtSetArg(args[1], XtNnumberStrings, nops);
+    XtSetValues(list, args, 2);
+    if (oldnops > 0 &&
+	(oldnops != 1 || XtName(list) != oldops[0])) {
+	while (--oldnops >= 0)
+	    XtFree(oldops[oldnops]);
+	XtFree((XtPointer)oldops);
+    }
+
+    XtSetArg(args[0], XtNstring, "");
+    XtSetValues(name, args, 1);
+    XtSetValues(value, args, 1);
+
+    /* force relayout */
+    XtUnmanageChild(list);
+    XtManageChild(list);
+
+    XtSetSensitive(remov, False);
+    XtSetSensitive(update, False);
+}
+
+/*ARGSUSED*/
+static void
+PopdownCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XtPopdown(shell);
+    popped = False;
+}
+
+/*ARGSUSED*/
+void
+OptionsCancelAction(Widget w, XEvent *event,
+		    String *params, Cardinal *num_params)
+{
+    PopdownCallback(w, NULL, NULL);
+}
+
+/*ARGSUSED*/
+static void
+SelectOptionCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+    XF86OptionPtr option;
+    XawListReturnStruct *info = (XawListReturnStruct *)call_data;
+
+    option_str = info->string;
+    option_index = info->list_index;
+    if ((option = xf86FindOption(*options, info->string)) != NULL) {
+	XtSetArg(args[0], XtNstring, option->opt_name);
+	XtSetValues(name, args, 1);
+	XtSetArg(args[0], XtNstring,
+		 option->opt_val != NULL ? option->opt_val : "");
+	XtSetValues(value, args, 1);
+    }
+    XtSetSensitive(remov, True);
+    XtSetSensitive(update, True);
+}
+
+/*ARGSUSED*/
+static void
+AddOption(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+    char *nam, *val;
+
+    XtSetArg(args[0], XtNstring, &nam);
+    XtGetValues(name, args, 1);
+    XtSetArg(args[0], XtNstring, &val);
+    XtGetValues(value, args, 1);
+    if (xf86FindOption(*options, nam) != NULL || strlen(nam) == 0)
+	/* XXX xf86addNewOption will trash the option linked list if
+	 * the options being added already exists.
+	 */
+	return;
+    *options = xf86addNewOption(*options, XtNewString(nam),
+				val && strlen(val) ? XtNewString(val) : NULL);
+    UpdateOptionList();
+}
+
+/*ARGSUSED*/
+static void
+RemoveOption(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[1];
+    char *str;
+
+    XtSetArg(args[0], XtNstring, &str);
+    XtGetValues(name, args, 1);
+    xf86RemoveOption(options, str);
+    UpdateOptionList();
+}
+
+/*ARGSUSED*/
+static void
+UpdateOption(Widget w, XtPointer user_data, XtPointer call_data)
+{
+/*    xf86RemoveOption(options, option_str);
+    AddOption(w, user_data, call_data);
+    UpdateOptionList();*/
+
+    Arg args[1];
+    char *nam, *val;
+    XF86OptionPtr option;
+
+    XtSetArg(args[0], XtNstring, &nam);
+    XtGetValues(name, args, 1);
+    XtSetArg(args[0], XtNstring, &val);
+    XtGetValues(value, args, 1);
+    if ((option = xf86FindOption(*options, option_str)) == NULL)
+	return;
+    XtFree(option->opt_name);
+    option->opt_name = option_str = XtNewString(nam);
+    XtFree(option->opt_val);
+    if (val && strlen(val))
+	option->opt_val = XtNewString(val);
+    else
+	option->opt_val = NULL;
+
+    UpdateOptionList();
+    XawListHighlight(list, option_index);
+    XtSetArg(args[0], XtNstring, option->opt_name);
+    XtSetValues(name, args, 1);
+    XtSetArg(args[0], XtNstring, option->opt_val);
+    XtSetValues(value, args, 1);
+
+    XtSetSensitive(remov, True);
+    XtSetSensitive(update, True);
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/options.h:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/options.h	Thu May 18 09:29:59 2000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include "config.h"
+
+/*
+ * Prototypes
+ */
+void OptionsPopup(XF86OptionPtr*);
+void OptionsCancelAction(Widget, XEvent*, String*, Cardinal*);
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/right.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/right.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/right.xbm	Thu May 18 09:29:59 2000
@@ -0,0 +1,8 @@
+#define right_width 19
+#define right_height 19
+static unsigned char right_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x06, 0x00,
+   0x00, 0x0e, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x3e, 0x00, 0xf8, 0x7f, 0x00,
+   0xf8, 0xff, 0x00, 0xf8, 0xff, 0x01, 0xf8, 0xff, 0x00, 0xf8, 0x7f, 0x00,
+   0x00, 0x3e, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x06, 0x00,
+   0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c	Thu May 18 09:29:59 2000
@@ -0,0 +1,439 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include "xf86config.h"
+#include "screen-cfg.h"
+#include <X11/Xaw/Command.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Label.h>
+#include <X11/Xaw/List.h>
+#include <X11/Xaw/Toggle.h>
+#include <X11/Xaw/Viewport.h>
+
+#define CW	1
+#define CCW	-1
+
+/*
+ * Prototypes
+ */
+static void DepthCallback(Widget, XtPointer, XtPointer);
+static void SelectIndexCallback(Widget, XtPointer, XtPointer);
+static void UnselectIndexCallback(Widget, XtPointer, XtPointer);
+static void SelectCallback(Widget, XtPointer, XtPointer);
+static void UnselectCallback(Widget, XtPointer, XtPointer);
+static void RotateCallback(Widget, XtPointer, XtPointer);
+
+/*
+ * Initialization
+ */
+static char *standard_modes[] = {
+    "640x400",
+    "640x480",
+    "800x600",
+    "1024x768",
+    "1280x1024",
+    "320x200",
+    "320x240",
+    "400x300",
+    "1152x864",
+    "1600x1200",
+    "1800x1400",
+    "512x384",
+};
+
+static char **modes;
+static int nmodes;
+static int default_depth, sel_index, unsel_index;
+static Widget listL, listR;
+static char **defmodes;
+static int ndefmodes;
+static XF86ConfScreenPtr screen;
+static int rotate;
+
+/*
+ * Implementation
+ */
+XtPointer
+ScreenConfig(XtPointer conf)
+{
+    XF86ConfDisplayPtr disp;
+    Arg args[2];
+    int i, oldrotate;
+
+    screen = (XF86ConfScreenPtr)conf;
+    if (screen == NULL)
+	return (NULL);
+
+    XtSetArg(args[0], XtNstring, screen->scrn_identifier);
+    XtSetValues(ident_widget, args, 1);
+    if ((default_depth = screen->scrn_defaultdepth) <= 0)
+	default_depth = 8;
+    sel_index = unsel_index = -1;
+    for (i = 0; i < computer.num_screens; i++)
+	if (computer.screens[i]->screen == screen)
+	    rotate = computer.screens[i]->rotate;
+    oldrotate = rotate;
+
+    ndefmodes = 0;
+    disp = screen->scrn_display_lst;
+    while (disp != NULL) {
+	if (disp->disp_depth == default_depth) {
+	    XF86ModePtr mod = disp->disp_mode_lst;
+
+	    while (mod != NULL) {
+		if (ndefmodes % 16 == 0)
+		    defmodes = (char**)
+			XtRealloc((XtPointer)defmodes,
+				  (ndefmodes + 16) * sizeof(char*));
+		defmodes[ndefmodes++] = XtNewString(mod->mode_name);
+		mod = (XF86ModePtr)(mod->list.next);
+	    }
+	    break;
+	}
+	disp = (XF86ConfDisplayPtr)(disp->list.next);
+    }
+    if (ndefmodes == 0) {
+	defmodes = (char**)XtMalloc(sizeof(char*));
+	defmodes[0] = XtNewString("640x480");
+	ndefmodes = 1;
+    }
+
+    if (listL != NULL) {
+	XawListUnhighlight(listL);
+	XawListUnhighlight(listR);
+    }
+
+    xf86info.cur_list = SCREEN;
+    XtSetSensitive(back, xf86info.lists[SCREEN].cur_function > 0);
+    XtSetSensitive(next, xf86info.lists[SCREEN].cur_function <
+			 xf86info.lists[SCREEN].num_functions - 1);
+    (xf86info.lists[SCREEN].functions[xf86info.lists[SCREEN].cur_function])
+	(&xf86info);
+
+    if (ConfigLoop(NULL) == True) {
+	XF86ModePtr prev, mod;
+
+	/* user may have changed the default depth, read variables again */
+	disp = screen->scrn_display_lst;
+	while (disp != NULL) {
+	    if (disp->disp_depth == default_depth)
+		break;
+	    disp = (XF86ConfDisplayPtr)(disp->list.next);
+	}
+
+	if (disp == NULL) {
+	    disp = (XF86ConfDisplayPtr)XtCalloc(1, sizeof(XF86ConfDisplayRec));
+	    screen->scrn_display_lst = (XF86ConfDisplayPtr)
+		addListItem((GenericListPtr)(screen->scrn_display_lst),
+			    (GenericListPtr)(disp));
+	    disp->disp_depth = default_depth;
+	}
+
+	if (strcasecmp(screen->scrn_identifier, ident_string))
+	    xf86RenameScreen(XF86Config, screen, ident_string);
+
+	screen->scrn_defaultdepth = default_depth;
+
+	XtSetArg(args[0], XtNlist, NULL);
+	XtSetArg(args[1], XtNnumberStrings, 0);
+	XtSetValues(listL, args, 2);
+
+	XtSetArg(args[0], XtNlist, NULL);
+	XtSetArg(args[1], XtNnumberStrings, 0);
+	XtSetValues(listR, args, 2);
+
+	mod = disp->disp_mode_lst;
+	/* free all modes */
+	while (mod != NULL) {
+	    prev = mod;
+	    mod = (XF86ModePtr)(mod->list.next);
+	    XtFree(prev->mode_name);
+	    XtFree((XtPointer)prev);
+	}
+	/* readd modes */
+	for (i = 0; i < ndefmodes; i++) {
+	    mod = XtNew(XF86ModeRec);
+	    mod->mode_name = XtNewString(defmodes[i]);
+	    XtFree(defmodes[i]);
+	    if (i == 0)
+		disp->disp_mode_lst = mod;
+	    else
+		prev->list.next = mod;
+	    prev = mod;
+	}
+	if (i == 0)
+	    disp->disp_mode_lst = NULL;
+	else
+	    mod->list.next = NULL;
+
+	XtFree((XtPointer)defmodes);
+	defmodes = NULL;
+	ndefmodes = 0;
+
+	for (i = 0; i < computer.num_screens; i++)
+	    if (computer.screens[i]->screen == screen)
+		computer.screens[i]->rotate = rotate;
+
+	if (oldrotate != rotate) {
+	    XF86OptionPtr option;
+	    static char *Rotate = "Rotate";
+
+	    if (screen->scrn_option_lst != NULL)
+		xf86RemoveOption(&screen->scrn_option_lst, Rotate);
+	    if (rotate)
+		screen->scrn_option_lst =
+		    xf86addNewOption(screen->scrn_option_lst,
+				     XtNewString(Rotate),
+				     XtNewString(rotate > 0 ? "CW" : "CCW"));
+	    UpdateScreenUI();
+	    AdjustScreenUI();
+	}
+
+	return ((XtPointer)screen);
+    }
+
+    XtSetArg(args[0], XtNlist, NULL);
+    XtSetArg(args[1], XtNnumberStrings, 0);
+    XtSetValues(listL, args, 2);
+
+    XtSetArg(args[0], XtNlist, NULL);
+    XtSetArg(args[1], XtNnumberStrings, 0);
+    XtSetValues(listR, args, 2);
+
+    for (i = 0; i < ndefmodes; i++)
+	XtFree(defmodes[i]);
+    XtFree((XtPointer)defmodes);
+    defmodes = NULL;
+    ndefmodes = 0;
+
+    return (NULL);
+}
+
+/*ARGSUSED*/
+static void
+DepthCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    if (call_data != NULL)
+	default_depth = (int)user_data;
+}
+
+/*ARGSUSED*/
+static void
+SelectIndexCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XawListReturnStruct *info = (XawListReturnStruct *)call_data;
+
+    sel_index = info->list_index;
+}
+
+/*ARGSUSED*/
+static void
+UnselectIndexCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    XawListReturnStruct *info = (XawListReturnStruct *)call_data;
+
+    unsel_index = info->list_index;
+}
+
+/*ARGSUSED*/
+static void
+SelectCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[2];
+
+    if (sel_index < 0 || sel_index >= nmodes)
+	return;
+
+    if (ndefmodes == 1 && *defmodes[0] == '\0') {
+	/* make sure tmp and defentries are not the same pointer */
+	char **tmp = defmodes;
+
+	XtFree(defmodes[0]);
+	defmodes = (char**)XtMalloc(sizeof(char*));
+	--ndefmodes;
+	XtFree((char*)tmp);
+    }
+    else
+	defmodes = (char**)XtRealloc((XtPointer)defmodes,
+				     sizeof(char*) * (ndefmodes + 1));
+    defmodes[ndefmodes++] = XtNewString(modes[sel_index]);
+
+    XtSetArg(args[0], XtNlist, defmodes);
+    XtSetArg(args[1], XtNnumberStrings, ndefmodes);
+    XtSetValues(listR, args, 2);
+    unsel_index = -1;
+}
+
+/*ARGSUSED*/
+static void
+UnselectCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    Arg args[2];
+
+    if (unsel_index < 0 || unsel_index >= ndefmodes)
+	return;
+
+    XtFree(defmodes[unsel_index]);
+    if (--ndefmodes > unsel_index)
+	memmove(&defmodes[unsel_index], &defmodes[unsel_index + 1],
+		(ndefmodes - unsel_index) * sizeof(char*));
+    if (ndefmodes == 0) {
+	char **tmp = defmodes;
+
+	defmodes = (char**)XtMalloc(sizeof(char*));
+	defmodes[0] = XtNewString("");
+	ndefmodes = 1;
+	XtFree((char*)tmp);
+    }
+
+    XtSetArg(args[0], XtNlist, defmodes);
+    XtSetArg(args[1], XtNnumberStrings, ndefmodes);
+    XtSetValues(listR, args, 2);
+    unsel_index = -1;
+}
+
+/*ARGSUSED*/
+void
+RotateCallback(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    if (call_data != NULL)
+	rotate = (int)user_data;
+    else
+	rotate = 0;
+}
+
+void
+ScreenDialog(XF86SetupInfo *info)
+{
+    static Widget dialog, d1, d4, d8, d16, d24, cw, ccw;
+    Arg args[2];
+    XF86ConfMonitorPtr mon = screen->scrn_monitor;
+    XF86ConfModeLinePtr mline = mon != NULL ? mon->mon_modeline_lst : NULL;
+    int i;
+
+    while (nmodes > 0)
+	XtFree(modes[--nmodes]);
+    XtFree((XtPointer)modes);
+    modes = NULL;
+    while (mline) {
+	if (nmodes % 16 == 0)
+	    modes = (char**)XtRealloc((XtPointer)modes,
+				      sizeof(char*) * (nmodes + 16));
+	modes[nmodes++] = XtNewString(mline->ml_identifier);
+	mline = (XF86ConfModeLinePtr)(mline->list.next);
+    }
+    for (i = 0; i < sizeof(standard_modes) / sizeof(standard_modes[0]); i++) {
+	if (nmodes % 16 == 0)
+	    modes = (char**)XtRealloc((XtPointer)modes,
+				      sizeof(char*) * (nmodes + 16));
+	modes[nmodes++] = XtNewString(standard_modes[i]);
+    }
+
+    if (dialog == NULL) {
+	Widget command, viewport;
+
+	dialog = XtCreateWidget("screenD", formWidgetClass,
+				configp, NULL, 0);
+	XtCreateManagedWidget("depthL", labelWidgetClass,
+			      dialog, NULL, 0);
+	d1 = XtCreateManagedWidget("1", toggleWidgetClass, dialog, NULL, 0);
+	XtAddCallback(d1, XtNcallback, DepthCallback, (XtPointer)1);
+	d4 = XtVaCreateManagedWidget("4", toggleWidgetClass, dialog,
+				     XtNradioGroup, d1, NULL, 0);
+	XtAddCallback(d4, XtNcallback, DepthCallback, (XtPointer)4);
+	d8 = XtVaCreateManagedWidget("8", toggleWidgetClass, dialog,
+				      XtNradioGroup, d4, NULL, 0);
+	XtAddCallback(d8, XtNcallback, DepthCallback, (XtPointer)8);
+	d16 = XtVaCreateManagedWidget("16", toggleWidgetClass, dialog,
+				      XtNradioGroup, d8, NULL, 0);
+	XtAddCallback(d16, XtNcallback, DepthCallback, (XtPointer)16);
+	d24 = XtVaCreateManagedWidget("24", toggleWidgetClass, dialog,
+				      XtNradioGroup, d16, NULL, 0);
+	XtAddCallback(d24, XtNcallback, DepthCallback, (XtPointer)24);
+
+	XtCreateManagedWidget("modeL", labelWidgetClass, dialog, NULL, 0);
+	viewport = XtCreateManagedWidget("viewL", viewportWidgetClass, dialog,
+					 NULL, 0);
+	listL = XtCreateManagedWidget("listLeft", listWidgetClass, viewport,
+					NULL, 0);
+	XtAddCallback(listL, XtNcallback, SelectIndexCallback, NULL);
+	command = XtCreateManagedWidget("select", commandWidgetClass,
+					dialog, NULL, 0);
+	XtAddCallback(command, XtNcallback, SelectCallback, NULL);
+	command = XtCreateManagedWidget("unselect", commandWidgetClass,
+					dialog, NULL, 0);
+	XtAddCallback(command, XtNcallback, UnselectCallback, NULL);
+	viewport = XtCreateManagedWidget("viewR", viewportWidgetClass, dialog,
+					 NULL, 0);
+	listR = XtCreateManagedWidget("listRight", listWidgetClass, viewport,
+				      NULL, 0);
+	XtAddCallback(listR, XtNcallback, UnselectIndexCallback, NULL);
+
+	XtCreateManagedWidget("rotate", labelWidgetClass, dialog, NULL, 0);
+	cw = XtCreateManagedWidget("CW", toggleWidgetClass, dialog, NULL, 0);
+	XtAddCallback(cw, XtNcallback, RotateCallback, (XtPointer)CW);
+	ccw = XtVaCreateManagedWidget("CCW", toggleWidgetClass, dialog,
+				      XtNradioGroup, cw, NULL, 0);
+	XtAddCallback(ccw, XtNcallback, RotateCallback, (XtPointer)CCW);
+
+	XtRealizeWidget(dialog);
+    }
+
+    if (rotate == CW) {
+	XtVaSetValues(cw, XtNstate, True, NULL, 0);
+	XtVaSetValues(ccw, XtNstate, False, NULL, 0);
+    }
+    else if (rotate == CCW) {
+	XtVaSetValues(cw, XtNstate, False, NULL, 0);
+	XtVaSetValues(ccw, XtNstate, True, NULL, 0);
+    }
+    else {
+	XtVaSetValues(cw, XtNstate, False, NULL, 0);
+	XtVaSetValues(ccw, XtNstate, False, NULL, 0);
+    }
+
+    XtSetArg(args[0], XtNlist, modes);
+    XtSetArg(args[1], XtNnumberStrings, nmodes);
+    XtSetValues(listL, args, 2);
+
+    XtSetArg(args[0], XtNlist, defmodes);
+    XtSetArg(args[1], XtNnumberStrings, ndefmodes);
+    XtSetValues(listR, args, 2);
+
+    XtSetArg(args[0], XtNstate, True);
+    XtSetValues(default_depth == 1 ? d1 :
+		default_depth == 4 ? d4 :
+		default_depth == 16 ? d16 :
+		default_depth == 24 ? d24 : d8, args, 1);
+
+    XtChangeManagedSet(&current, 1, NULL, NULL, &dialog, 1);
+    current = dialog;
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h	Thu May 18 09:29:59 2000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ */
+
+#include "config.h"
+#include "screen.h"
+
+#ifndef _xf86cfg_screencfg_h
+#define _xf86cfg_screencfg_h
+
+/*
+ * Prototypes
+ */
+XtPointer ScreenConfig(XtPointer);
+void ScreenDialog(XF86SetupInfo*);
+
+#endif /* _xf86cfg_screencfg_h */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c:1.3
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c	Tue Jun 13 16:15:52 2000
@@ -0,0 +1,978 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.3 2000/06/13 23:15:52 dawes Exp $
+ */
+
+#include <X11/IntrinsicP.h>
+#include <X11/extensions/shape.h>
+#include <X11/Xaw/Simple.h>
+#include "screen.h"
+
+#define CW	1
+#define	CCW	-1
+
+/*
+ * Prototypes
+ */
+void ReshapeScreenWidget(xf86cfgScreen*);
+
+/*
+ * Initialization
+ */
+extern Widget work;
+
+static int rows, columns;	/* number of rows/columns of monitors */
+
+static int mon_width, mon_height;
+static int *mon_widths, *mon_heights;
+
+/*
+ * Implementation
+ */
+void
+CreateScreenWidget(xf86cfgScreen *screen)
+{
+    static char *Rotate = "Rotate", *_CW = "CW", *_CCW = "CCW";
+    int rotate = 0;
+    XF86OptionPtr option, options;
+    Widget w = XtCreateWidget("screen", simpleWidgetClass,
+			      XtParent(computer.cpu), NULL, 0);
+
+    /* When this function is called, the monitor and card fields should have
+     * been already set.
+     */
+
+    /* This is the only place where xf86cfg is intrusive, and deletes options
+     * added by the user directly in the config file. The "Rotate" option
+     * will be kept in the screen section.
+     */
+    if (screen->monitor != NULL) {
+	options = ((XF86ConfMonitorPtr)(screen->monitor->config))->mon_option_lst;
+	if ((option = xf86FindOption(options, Rotate)) != NULL) {
+	    if (option->opt_val != NULL)
+		rotate = strcasecmp(option->opt_val, _CW) == 0 ? CW :
+			 strcasecmp(option->opt_val, _CCW) == 0 ? CCW : 0;
+	    xf86RemoveOption(&((XF86ConfMonitorPtr)(screen->monitor->config))
+			     ->mon_option_lst, Rotate);
+	}
+    }
+    if (screen->card != NULL) {
+	options = ((XF86ConfDevicePtr)(screen->card->config))->dev_option_lst;
+	if ((option = xf86FindOption(options, Rotate)) != NULL) {
+	    if (option->opt_val != NULL)
+		rotate += strcasecmp(option->opt_val, _CW) == 0 ? CW :
+			  strcasecmp(option->opt_val, _CCW) == 0 ? CCW : 0;
+	    xf86RemoveOption(&((XF86ConfDevicePtr)(screen->card->config))
+			     ->dev_option_lst, Rotate);
+	}
+    }
+
+    options = screen->screen->scrn_option_lst;
+    if ((option = xf86FindOption(options, Rotate)) != NULL) {
+	if (option->opt_val != NULL)
+	    rotate += strcasecmp(option->opt_val, _CW) == 0 ? CW :
+		      strcasecmp(option->opt_val, _CCW) == 0 ? CCW : 0;
+	xf86RemoveOption(&screen->screen->scrn_option_lst, Rotate);
+    }
+
+    rotate = rotate > 0 ? CW : rotate < 0 ? CCW : 0;
+    if (rotate)
+	screen->screen->scrn_option_lst =
+	    xf86addNewOption(screen->screen->scrn_option_lst,
+			     XtNewString(Rotate),
+			     XtNewString(rotate > 0 ? _CW : _CCW));
+    screen->rotate = rotate;
+
+    XtRealizeWidget(w);
+    screen->widget = w;
+    screen->column = screen->row = -1;
+
+    ReshapeScreenWidget(screen);
+}
+
+void
+ReshapeScreenWidget(xf86cfgScreen *screen)
+{
+    Pixmap pixmap;
+    XGCValues values;
+    GC gc;
+    int x = 0, y = 0, width = screen->rect.width, height = screen->rect.height;
+    Widget w = screen->widget;
+
+    if (screen->state == USED && screen->row >= 0) {
+	if (screen->column == 0)
+	    x = w->core.width - width;
+	else if (screen->column == columns - 1)
+	    x = w->core.width - mon_widths[screen->column];
+	else
+	    x = (w->core.width - mon_widths[screen->column]) +
+		((mon_widths[screen->column] - width) >> 1);
+
+	if (screen->row == 0)
+	    y = w->core.height - height;
+	else if (screen->row == rows - 1)
+	    y = w->core.height - mon_heights[screen->row];
+	else
+	    y = (w->core.height - mon_heights[screen->row]) +
+		((mon_heights[screen->row] - height) >> 1);
+    }
+    else if (screen->rect.width == 0) {
+	width = w->core.width;
+	height = w->core.height;
+    }
+
+    screen->rect.x = x;
+    screen->rect.y = y;
+    screen->rect.width = width;
+    screen->rect.height = height;
+    pixmap = XCreatePixmap(XtDisplay(w), XtWindow(w),
+			   w->core.width, w->core.height, 1);
+    values.foreground = 0;
+    values.background = 1;
+    gc = XCreateGC(XtDisplay(w), pixmap, GCForeground | GCBackground, &values);
+    XFillRectangle(XtDisplay(w), pixmap, gc, 0, 0, w->core.width, w->core.height);
+    XSetForeground(XtDisplay(w), gc, 1);
+
+    DrawScreenMask(XtDisplay(w), pixmap, gc, x, y, x + width, y + height,
+		   screen->rotate);
+    XShapeCombineMask(XtDisplay(w), XtWindow(w), ShapeBounding, 
+		      0, 0, pixmap, ShapeSet);
+
+    /* Do not call XtSetValues, to avoid all extra code for caching pixmaps */
+    XFreePixmap(XtDisplay(w), pixmap);
+    if (XtIsRealized(w)) {
+	pixmap = XCreatePixmap(XtDisplay(w), XtWindow(w),
+			       w->core.width, w->core.height,
+			       DefaultDepthOfScreen(XtScreen(w)));
+	DrawScreen(XtDisplay(w), pixmap, x, y, x + width, y + height,
+		   screen->state == USED ? True : False, screen->rotate);
+	XSetWindowBackgroundPixmap(XtDisplay(w), XtWindow(w), pixmap);
+	XClearWindow(XtDisplay(w), XtWindow(w));
+	XFreePixmap(XtDisplay(w), pixmap);
+    }
+    XFreeGC(XtDisplay(w), gc);
+}
+
+void
+AddScreen(xf86cfgDevice *mon, xf86cfgDevice *dev)
+{
+    int nscreens = 0;
+    char screen_name[48];
+    XF86ConfScreenPtr screen = XF86Config->conf_screen_lst;
+    XF86ConfAdjacencyPtr adj;
+
+    while (screen != NULL) {
+	++nscreens;
+	screen = (XF86ConfScreenPtr)(screen->list.next);
+    }
+    do {
+	++nscreens;
+	XmuSnprintf(screen_name, sizeof(screen_name), "Screen%d",
+		    nscreens);
+    } while (xf86FindScreen(screen_name,
+	     XF86Config->conf_screen_lst) != NULL);
+
+    screen = (XF86ConfScreenPtr)XtCalloc(1, sizeof(XF86ConfScreenRec));
+    screen->scrn_identifier = XtNewString(screen_name);
+    screen->scrn_device_str = XtNewString(((XF86ConfDevicePtr)(dev->config))->dev_identifier);
+    screen->scrn_device = (XF86ConfDevicePtr)(dev->config);
+    screen->scrn_monitor_str = XtNewString(((XF86ConfMonitorPtr)(mon->config))->mon_identifier);
+    screen->scrn_monitor = (XF86ConfMonitorPtr)(mon->config);
+    XF86Config->conf_screen_lst =
+	xf86AddScreen(XF86Config->conf_screen_lst, screen);
+
+    adj = (XF86ConfAdjacencyPtr)XtCalloc(1, sizeof(XF86ConfAdjacencyRec));
+    adj->adj_screen = screen;
+    adj->adj_screen_str = XtNewString(screen_name);
+    if (computer.layout == NULL)
+	computer.layout = XF86Config->conf_layout_lst = (XF86ConfLayoutPtr)
+	    XtCalloc(1, sizeof(XF86ConfLayoutRec));
+    computer.layout->lay_adjacency_lst = (XF86ConfAdjacencyPtr)
+	addListItem((GenericListPtr)computer.layout->lay_adjacency_lst,
+		    (GenericListPtr)adj);
+
+    computer.screens = (xf86cfgScreen**)
+	XtRealloc((XtPointer)computer.screens, sizeof(xf86cfgScreen*) *
+		  (computer.num_screens + 1));
+    computer.screens[computer.num_screens] =
+	(xf86cfgScreen*)XtCalloc(1, sizeof(xf86cfgScreen));
+    computer.screens[computer.num_screens]->screen = screen;
+    computer.screens[computer.num_screens]->card = dev;
+    computer.screens[computer.num_screens]->monitor = mon;
+
+    ++dev->refcount;
+    ++mon->refcount;
+
+    CreateScreenWidget(computer.screens[computer.num_screens]);
+    computer.screens[computer.num_screens]->type = SCREEN;
+    SetTip((xf86cfgDevice*)computer.screens[computer.num_screens]);
+
+    ++computer.num_screens;
+}
+
+void
+RemoveScreen(xf86cfgDevice *mon, xf86cfgDevice *dev)
+{
+    XF86ConfScreenPtr screen = XF86Config->conf_screen_lst;
+    int i;
+
+    mon->state = dev->state = UNUSED;
+    while (screen != NULL) {
+	if ((XtPointer)screen->scrn_monitor == mon->config &&
+	    (XtPointer)screen->scrn_device == dev->config)
+	    break;
+
+	screen = (XF86ConfScreenPtr)(screen->list.next);
+    }
+    --mon->refcount;
+    --dev->refcount;
+
+    for (i = 0; i < computer.num_screens; i++) {
+	if (computer.screens[i]->screen == screen) {
+	    XtDestroyWidget(computer.screens[i]->widget);
+	    if (i < --computer.num_screens)
+		memmove(&computer.screens[i], &computer.screens[i + 1],
+			(computer.num_screens - i) * sizeof(xf86cfgScreen*));
+	    break;
+	}
+    }
+
+    xf86RemoveScreen(XF86Config, screen);
+}
+
+void
+ChangeScreen(XF86ConfMonitorPtr mon, XF86ConfMonitorPtr oldmon,
+	     XF86ConfDevicePtr dev, XF86ConfDevicePtr olddev)
+{
+    int ioldm, im, ioldc, ic;
+
+    if (mon == oldmon && dev == olddev)
+	return;
+
+    if (mon != NULL) {
+	for (im = 0; im < computer.num_devices; im++)
+	    if (computer.devices[im]->config == (XtPointer)mon)
+		break;
+    }
+    else
+	im = -1;
+    if (oldmon != NULL) {
+	for (ioldm = 0; ioldm < computer.num_devices; ioldm++)
+	    if (computer.devices[ioldm]->config == (XtPointer)oldmon)
+		break;
+    }
+    else
+	ioldm = -1;
+
+    if (dev != NULL) {
+	for (ic = 0; ic < computer.num_devices; ic++)
+	    if (computer.devices[ic]->config == (XtPointer)dev)
+		break;
+    }
+    else
+	ic = -1;
+    if (olddev != NULL) {
+	for (ioldc = 0; ioldc < computer.num_devices; ioldc++)
+	    if (computer.devices[ioldc]->config == (XtPointer)olddev)
+		break;
+    }
+    else
+	ioldc = -1;
+
+    if (ioldm >= 0 && ioldc >= 0) {
+	RemoveScreen(computer.devices[ioldm], computer.devices[ioldc]);
+	computer.devices[ioldm]->state = UNUSED;
+/*	computer.devices[ioldc]->state = UNUSED;*/
+    }
+
+    if (im >= 0 && ic >= 0) {
+	AddScreen(computer.devices[im], computer.devices[ic]);
+	computer.devices[im]->state = USED;
+/*	computer.devices[ic]->state = USED;*/
+    }
+}
+
+/*
+
++------------------------------------------------+
+|						 |
+|  +------------------------------------------+  |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  |					      |	 |
+|  +------------------------------------------+  |
+|						 |
++------------------------------------------------+
+	    |			     |
+    +-------+			     +-------+
+    |					     |
+    +----------------------------------------+
+
+ */
+static double oxs = 0.0, oys = 0.0, oxe = 100.0, oye = 70.0;
+static double ixs = 7.0, iys = 7.0, ixe = 93.0, iye = 63.0;
+static double lin[] = { 25.0, 70.0, 25.0, 75.0,  5.0, 75.0,  5.0, 80.0,
+			95.0, 80.0, 95.0, 75.0, 75.0, 75.0, 75.0, 70.0 };
+
+void
+DrawScreen(Display *dpy, Drawable win, int xs, int ys, int xe, int ye,
+	   Bool active, int rotate)
+{
+    double xfact, yfact;
+    XPoint points[(sizeof(lin) / sizeof(lin[0])) >> 1];
+    int i;
+    static GC gray0, gray1, gray2, black, red;
+
+    if (black == NULL) {
+	XColor color, exact;
+	XGCValues values;
+
+	XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap, "gray95",
+			 &color, &exact);
+	values.foreground = color.pixel;
+	gray0 = XCreateGC(XtDisplay(toplevel), win, GCForeground, &values);
+	XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap, "gray75",
+			 &color, &exact);
+	values.foreground = color.pixel;
+	gray1 = XCreateGC(XtDisplay(toplevel), win, GCForeground, &values);
+
+	XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap, "gray60",
+			 &color, &exact);
+	values.foreground = color.pixel;
+	gray2 = XCreateGC(XtDisplay(toplevel), win, GCForeground, &values);
+
+	XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap, "gray20",
+			 &color, &exact);
+	values.foreground = color.pixel;
+	black = XCreateGC(XtDisplay(toplevel), win, GCForeground, &values);
+
+	XAllocNamedColor(XtDisplay(toplevel), toplevel->core.colormap, "red",
+			 &color, &exact);
+	values.foreground = color.pixel;
+	values.line_width = 4;
+	values.cap_style = CapButt;
+	red = XCreateGC(XtDisplay(toplevel), win,
+			GCForeground | GCLineWidth | GCCapStyle, &values);
+    }
+
+    if (rotate) {
+	xfact = (xe - xs) / 80.0;
+	yfact = (ye - ys) / 100.0;
+	if (rotate == CW) {
+	    /* outer rectangle */
+	    XFillRectangle(dpy, win, gray1,
+			   oxs * xfact + xs + .5,
+			   oys * yfact + ys + .5,
+			   (oye - oys) * xfact + .5,
+			   (oxe - oxs) * yfact + .5);
+	    XDrawLine(dpy, win, gray2,
+		      xs, ye - 1,
+		      70 * xfact + xs - 1 + .5, ye - 1);
+	    XDrawLine(dpy, win, gray2,
+		      70 * xfact + xs - 1 + .5, ye - 1,
+		      70 * xfact + xs - 1 + .5, ys);
+	    /* inner rectangle */
+	    XFillRectangle(dpy, win, black,
+			   ixs * xfact + xs + .5,
+			   iys * yfact + ys + .5,
+			   (iye - iys) * xfact + .5,
+			   (ixe - ixs) * yfact + .5);
+	    for (i = 0; i < sizeof(points) / sizeof(points[0]); i++) {
+		points[i].x = lin[(i<<1) + 1] * xfact + xs + .5;
+		points[i].y = lin[(i<<1)] * yfact + ys + .5;
+	    }
+	    XFillPolygon(dpy, win, gray2, points, i, Convex, CoordModeOrigin);
+	    XDrawLine(dpy, win, gray0,
+		      (oxe - 10) * xfact + xs + .5, oys * yfact + ys + .5,
+		      xs, oys * yfact + ys + .5);
+	    XDrawLine(dpy, win, gray0,
+		      xs, ys,
+		      xs, xe);
+	    XDrawLine(dpy, win, black,
+		      lin[7] * xfact + xs - 1 + .5, lin[6] * yfact + ys + .5,
+		      lin[9] * xfact + xs - 1 + .5, lin[8] * yfact + ys - 1 + .5);
+	    XDrawLine(dpy, win, black,
+		      lin[9] * xfact + xs - 1 + .5, lin[8] * yfact + ys - 1 + .5,
+		      lin[11] * xfact + xs + .5, lin[10] * yfact + ys - 1 + .5);
+	    XDrawLine(dpy, win, black,
+		      lin[13] * xfact + xs + .5, lin[12] * yfact + ys - 1 + .5,
+		      lin[15] * xfact + xs + .5, lin[14] * yfact + ys - 1 + .5);
+
+	    if (!active) {
+		XDrawLine(dpy, win, red,
+			  iys * xfact, ixs * yfact, iye * xfact, ixe * yfact);
+		XDrawLine(dpy, win, red,
+			  iye * xfact, ixs * yfact, iys * xfact, ixe * yfact);
+	    }
+	}
+	else if (rotate == CCW) {
+	    /* outer rectangle */
+	    XFillRectangle(dpy, win, gray1,
+			   10 * xfact + xs + .5,
+			   oys * yfact + ys + .5,
+			   (oye - oys) * xfact + .5,
+			   (oxe - oxs) * yfact + .5);
+
+	    XDrawLine(dpy, win, gray2,
+		      10 * xfact + xs + .5, ye - 1,
+		      oxe * xfact + xs - 1 + .5, ye - 1);
+	    XDrawLine(dpy, win, gray2,
+		      xe - 1, ye - 1,
+		      xe - 1, ys);
+	    /* inner rectangle */
+	    XFillRectangle(dpy, win, black,
+			   (ixs + 10) * xfact + xs + .5,
+			   iys * yfact + ys + .5,
+			   (iye - iys) * xfact + .5,
+			   (ixe - ixs) * yfact + .5);
+	    for (i = 0; i < sizeof(points) / sizeof(points[0]); i++) {
+		points[i].x = (-lin[(i<<1) + 1] + 80.0) * xfact + xs + .5;
+		points[i].y = lin[(i<<1)] * yfact + ys + .5;
+	    }
+	    XFillPolygon(dpy, win, gray2, points, i, Convex, CoordModeOrigin);
+	    XDrawLine(dpy, win, gray0,
+		      oxe * xfact + xs + .5, oys * yfact + ys + .5,
+		      (oxs - 10) * xfact + xs + .5, oys * yfact + ys + .5);
+	    XDrawLine(dpy, win, gray0,
+		      (oxs + 10) * xfact + xs + .5, ys,
+		      (oxs + 10) * xfact + xs + .5, xe);
+
+	    XDrawLine(dpy, win, black,
+		      xs, lin[8] * yfact - 1 + ys + .5,
+		      4 * xfact + xs + .5, lin[8] * yfact - 1 + ys + .5);
+	    XDrawLine(dpy, win, black,
+		      4 * xfact + xs, lin[8] * yfact - 1 + ys + .5,
+		      4 * xfact + xs, lin[3] * yfact - 1 + ys + .5);
+	    XDrawLine(dpy, win, black,
+		      4 * xfact + xs + .5, lin[3] * yfact - 1 + ys + .5,
+		      10 * xfact + xs + .5 - 1, lin[3] * yfact - 1 + ys + .5);
+	    XDrawLine(dpy, win, black,
+		      4 * xfact + xs, lin[0] * yfact - 1 + ys + .5,
+		      4 * xfact + xs, lin[4] * yfact - 1 + ys + .5);
+
+	    if (!active) {
+		XDrawLine(dpy, win, red,
+			  (iys + 10) * xfact, ixs * yfact,
+			  (iye + 10) * xfact, ixe * yfact);
+		XDrawLine(dpy, win, red,
+			  (iye + 10) * xfact, ixs * yfact,
+			  (iys + 10) * xfact, ixe * yfact);
+	    }
+	}
+    }
+    else {
+	xfact = (xe - xs) / 100.0;
+	yfact = (ye - ys) / 80.0;
+
+	/* outer rectangle */
+	XFillRectangle(dpy, win, gray1,
+		       oxs * xfact + xs + .5,
+		       oys * yfact + ys + .5,
+		       (oxe - oxs) * xfact + .5,
+		       (oye - oys) * yfact + .5);
+
+	XDrawLine(dpy, win, gray2,
+		  oxs * xfact + xs + .5, oye * yfact + ys - 1 + .5,
+		  oxe * xfact + xs - 1 + .5, oye * yfact + ys - 1 + .5);
+	XDrawLine(dpy, win, gray2,
+		  oxe * xfact + xs - 1 + .5, oys * yfact + ys + .5,
+		  oxe * xfact + xs - 1 + .5, oye * yfact + ys - 1 + .5);
+
+	/* inner rectangle */
+	XFillRectangle(dpy, win, black,
+		       ixs * xfact + xs + .5,
+		       iys * yfact + ys + .5,
+		       (ixe - ixs) * xfact + .5,
+		       (iye - iys) * yfact + .5);
+
+	for (i = 0; i < sizeof(points) / sizeof(points[0]); i++) {
+	    points[i].x = lin[i<<1] * xfact + xs + .5;
+	    points[i].y = lin[(i<<1) + 1] * yfact + ys + .5;
+	}
+
+	XFillPolygon(dpy, win, gray2, points, i, Convex, CoordModeOrigin);
+
+	XDrawLine(dpy, win, black,
+		  lin[6] * xfact + xs + .5, lin[7] * yfact + ys - 1 + .5,
+		  lin[8] * xfact + xs - 1 + .5, lin[9] * yfact + ys - 1 + .5);
+	XDrawLine(dpy, win, black,
+		  lin[8] * xfact + xs - 1 + .5, lin[9] * yfact + ys - 1 + .5,
+		  lin[10] * xfact + xs - 1 + .5, lin[11] * yfact + ys + .5);
+	XDrawLine(dpy, win, black,
+		  lin[12] * xfact + xs - 1 + .5, lin[13] * yfact + ys + .5,
+		  lin[14] * xfact + xs - 1 + .5, lin[15] * yfact + ys + .5);
+
+	XDrawLine(dpy, win, gray0,
+		  oxe * xfact + xs + .5, oys * yfact + ys + .5,
+		  oxs * xfact + xs + .5, oys * yfact + ys + .5);
+	XDrawLine(dpy, win, gray0,
+		  oxs * xfact + xs + .5, oys * yfact + ys + .5,
+		  oxs * xfact + xs + .5, lin[1] * yfact + ys + .5);
+
+	if (!active) {
+	    XDrawLine(dpy, win, red,
+		      ixs * xfact, iys * yfact, ixe * xfact, iye * yfact);
+	    XDrawLine(dpy, win, red,
+		      ixe * xfact, iys * yfact, ixs * xfact, iye * yfact);
+	}
+    }
+}
+
+void
+DrawScreenMask(Display *dpy, Drawable win, GC gc, int xs, int ys, int xe, int ye,
+	       int rotate)
+{
+    double xfact, yfact;
+    XPoint points[(sizeof(lin) / sizeof(lin[0])) >> 1];
+    int i, x, y, width, height;
+
+    if (rotate) {
+	xfact = (xe - xs) / 80.0;
+	yfact = (ye - ys) / 100.0;
+	width = (oye - oys) * xfact + .5;
+	height = (oxe - oxs) * yfact + .5;
+	if (rotate == CW) {
+	    x = oxs * xfact + xs + .5;
+	    y = oys * yfact + ys + .5;
+	    for (i = 0; i < sizeof(points) / sizeof(points[0]); i++) {
+		points[i].x = lin[(i<<1) + 1] * xfact + xs + .5;
+		points[i].y = lin[(i<<1)] * yfact + ys + .5;
+	    }
+	}
+	else if (rotate == CCW) {
+	    x = 10 * xfact + xs + .5;
+	    y = oys * yfact + ys + .5;
+	    for (i = 0; i < sizeof(points) / sizeof(points[0]); i++) {
+		points[i].x = (-lin[(i<<1) + 1] + 80.0) * xfact + xs + .5;
+		points[i].y = lin[(i<<1)] * yfact + ys + .5;
+	    }
+	}
+    }
+    else {
+	xfact = (xe - xs) / 100.0;
+	yfact = (ye - ys) / 80.0;
+	x = oxs * xfact + xs + .5;
+	y = oys * yfact + ys + .5;
+	width = (oxe - oxs) * xfact + .5;
+	height = (oye - oys) * yfact + .5;
+	for (i = 0; i < sizeof(points) / sizeof(points[0]); i++) {
+	    points[i].x = lin[(i<<1)] * xfact + xs + .5;
+	    points[i].y = lin[(i<<1) + 1] * yfact + ys + .5;
+	}
+    }
+
+    /* rectangle */
+    XFillRectangle(dpy, win, gc, x, y, width, height);
+
+
+    XFillPolygon(dpy, win, gc, points, i, Convex, CoordModeOrigin);
+}
+
+void
+AdjustScreenUI(void)
+{
+    XF86ConfLayoutPtr lay = computer.layout;
+    XF86ConfAdjacencyPtr adj;
+    int i, dx, dy, x, y, w, h, base = -1;
+    double xf, yf;
+
+    if (lay == NULL)
+	return;
+
+    adj = lay->lay_adjacency_lst;
+
+#define USED1	-USED
+
+    XtFree((XtPointer)mon_widths);
+    XtFree((XtPointer)mon_heights);
+    mon_widths = (int*)XtCalloc(1, sizeof(int) * columns);
+    mon_heights = (int*)XtCalloc(1, sizeof(int) * rows);
+
+    mon_width = mon_height = 0;
+    for (i = 0; i < computer.num_screens; i++) {
+	if (base == -1 && computer.screens[i]->state == USED)
+	    base = i;
+	if (computer.screens[i]->screen->scrn_monitor->mon_width > mon_width)
+	    mon_width = computer.screens[i]->screen->scrn_monitor->mon_width;
+	if (computer.screens[i]->screen->scrn_monitor->mon_height > mon_height)
+	    mon_height = computer.screens[i]->screen->scrn_monitor->mon_height;
+    }
+    if (base < 0) {
+	for (i = 0; i < computer.num_screens; i++)
+	    ReshapeScreenWidget(computer.screens[i]);
+	return;
+    }
+
+    if (mon_width == 0) {
+	mon_width = 10;
+	mon_height = 8;
+    }
+
+    XtUnmapWidget(work);
+
+    while (adj) {
+	xf86cfgScreen *scr, *topscr, *botscr, *lefscr, *rigscr;
+
+	for (i = 0; i < computer.num_screens; i++)
+	    if (computer.screens[i]->screen == adj->adj_screen)
+		break;
+	    scr = computer.screens[i];
+
+	if (adj->adj_top != NULL) {
+	    for (i = 0; i < computer.num_screens; i++)
+		if (computer.screens[i]->screen == adj->adj_top)
+		    break;
+	    topscr = computer.screens[i];
+	}
+	else
+	    topscr = NULL;
+
+	if (adj->adj_bottom != NULL) {
+	    for (i = 0; i < computer.num_screens; i++)
+		if (computer.screens[i]->screen == adj->adj_bottom)
+		    break;
+	    botscr = computer.screens[i];
+	}
+	else
+	    botscr = NULL;
+
+	if (adj->adj_left != NULL) {
+	    for (i = 0; i < computer.num_screens; i++)
+		if (computer.screens[i]->screen == adj->adj_left)
+		    break;
+	    lefscr = computer.screens[i];
+	}
+	else
+	    lefscr = NULL;
+
+	if (adj->adj_right != NULL) {
+	    for (i = 0; i < computer.num_screens; i++)
+		if (computer.screens[i]->screen == adj->adj_right)
+		    break;
+	    rigscr = computer.screens[i];
+	}
+	else
+	    rigscr = NULL;
+
+	if (lefscr == NULL && rigscr == NULL && topscr == NULL && lefscr == NULL) {
+	    XF86ConfScreenPtr s;
+
+	    if (adj->adj_where >= CONF_ADJ_RIGHTOF < adj->adj_where <= CONF_ADJ_BELOW) {
+		s = xf86FindScreen(adj->adj_refscreen, XF86Config->conf_screen_lst);
+		for (i = 0; i < computer.num_screens; i++)
+		    if (computer.screens[i]->screen == s)
+			break;
+		switch (adj->adj_where) {
+		    case CONF_ADJ_RIGHTOF:
+			lefscr = computer.screens[i];
+			break;
+		    case CONF_ADJ_LEFTOF:
+			rigscr = computer.screens[i];
+			break;
+		    case CONF_ADJ_ABOVE:
+			botscr = computer.screens[i];
+			break;
+		    case CONF_ADJ_BELOW:
+			topscr = computer.screens[i];
+			break;
+		}
+	    }
+	}
+
+	XtMoveWidget(scr->widget, 0, 0);
+	scr->state = USED1;
+	if (lefscr != NULL) {
+	    if (lefscr->state == USED1)
+		XtMoveWidget(scr->widget,
+			     lefscr->widget->core.x + lefscr->widget->core.width,
+			     lefscr->widget->core.y);
+	    else
+		XtMoveWidget(lefscr->widget,
+			     -(int)(lefscr->widget->core.width),
+			     scr->widget->core.y);
+	}
+
+	if (rigscr != NULL) {
+	    if (rigscr->state == USED1) {
+		dx = rigscr->widget->core.x - scr->widget->core.width - scr->widget->core.x;
+		dy = rigscr->widget->core.y - scr->widget->core.y;
+
+		XtMoveWidget(scr->widget, scr->widget->core.x + dx,
+			     scr->widget->core.y + dy);
+		if (lefscr != NULL && lefscr->state != USED1)
+		    XtMoveWidget(lefscr->widget, lefscr->widget->core.x + dx,
+				 lefscr->widget->core.y + dy);
+	    }
+	    else
+		XtMoveWidget(rigscr->widget, scr->widget->core.width,
+			     scr->widget->core.y);
+	}
+
+	if (topscr != NULL) {
+	    if (topscr->state == USED1) {
+		dx = topscr->widget->core.x - scr->widget->core.x;
+		dy = topscr->widget->core.y + topscr->widget->core.height -
+		     scr->widget->core.y;
+
+		XtMoveWidget(scr->widget, scr->widget->core.x + dx,
+			     scr->widget->core.y + dy);
+		if (lefscr != NULL && lefscr->state != USED1)
+		    XtMoveWidget(lefscr->widget, lefscr->widget->core.x + dx,
+				 lefscr->widget->core.y + dy);
+		if (rigscr != NULL && rigscr->state != USED1)
+		    XtMoveWidget(rigscr->widget, rigscr->widget->core.x + dx,
+				 rigscr->widget->core.y + dy);
+	    }
+	    else
+		XtMoveWidget(topscr->widget, scr->widget->core.x,
+			     scr->widget->core.y - topscr->widget->core.height);
+	}
+
+	if (botscr != NULL) {
+	    if (botscr->state == USED1) {
+		dx = botscr->widget->core.x - scr->widget->core.x;
+		dy = botscr->widget->core.y - scr->widget->core.height - scr->widget->core.y;
+
+		XtMoveWidget(scr->widget, scr->widget->core.x + dx,
+			     scr->widget->core.y + dy);
+		if (lefscr != NULL && lefscr->state != USED1)
+		    XtMoveWidget(lefscr->widget, lefscr->widget->core.x + dx,
+				 lefscr->widget->core.y + dy);
+		if (rigscr != NULL && rigscr->state != USED1)
+		    XtMoveWidget(rigscr->widget, rigscr->widget->core.x + dx,
+				 rigscr->widget->core.y + dy);
+		if (botscr != NULL && botscr->state != USED1)
+		    XtMoveWidget(botscr->widget, botscr->widget->core.x + dx,
+				 botscr->widget->core.y + dy);
+	    }
+	    else
+		XtMoveWidget(botscr->widget, scr->widget->core.x,
+			     scr->widget->core.y + scr->widget->core.height);
+	}
+
+	adj = (XF86ConfAdjacencyPtr)(adj->list.next);
+    }
+
+    for (i = 0; i < computer.num_screens; i++)
+	if (computer.screens[i]->state == USED1)
+	    computer.screens[i]->state = USED;
+
+    w = work->core.width / (columns + 1) - 5;
+    h = work->core.height / (rows + 1) - 5;
+
+    if (w > h)
+	w = h;
+    else
+	h = w;
+
+    dx = (work->core.width - (columns * w)) >> 1;
+    dy = (work->core.height - (rows * h)) >> 1;
+
+    xf = (double)w / (double)computer.screens[0]->widget->core.width;
+    yf = (double)h / (double)computer.screens[0]->widget->core.height;
+
+    for (i = 0; i < computer.num_screens; i++) {
+	Widget z = computer.screens[i]->widget;
+
+	if (computer.screens[i]->state == USED)
+	    XtConfigureWidget(z, z->core.x * xf + dx,
+			      z->core.y * yf + dy, w, h, 0);
+	else
+	    XtConfigureWidget(z, z->core.x, z->core.y, w, h, 0);
+    }
+
+    if (computer.screens[base]->row >= 0) {
+	double xf, yf;
+	int width, height;
+
+	for (i = 0; i < computer.num_screens; i++) {
+	    width = computer.screens[i]->screen->scrn_monitor->mon_width;
+	    height = computer.screens[i]->screen->scrn_monitor->mon_height;
+	    if (width <= 0) {
+		width = mon_width;
+		height = mon_height;
+	    }
+
+	    if (computer.screens[i]->rotate) {
+		xf = (double)width / (double)mon_width * 8. / 10.;
+		yf = (double)height / (double)mon_height;
+	    }
+	    else {
+		xf = (double)width / (double)mon_width;
+		yf = (double)height / (double)mon_height * 8. / 10.;
+	    }
+	    width = computer.screens[i]->widget->core.width * xf;
+	    height = computer.screens[i]->widget->core.height * yf;
+	    if (computer.screens[i]->state == USED) {
+		if (mon_widths[computer.screens[i]->column] < width)
+		    mon_widths[computer.screens[i]->column] = width;
+		if (mon_heights[computer.screens[i]->row] < height)
+		    mon_heights[computer.screens[i]->row] = height;
+	    }
+
+	    /* do it here to avoid recalculation */
+	    computer.screens[i]->rect.width = width;
+	    computer.screens[i]->rect.height = height;
+	}
+    }
+
+    for (i = 0; i < computer.num_screens; i++)
+	ReshapeScreenWidget(computer.screens[i]);
+
+    /* do a new pass, to avoid gaps if the monitors have different
+     * sizes.
+     */
+    if (computer.screens[base]->row >= 0) {
+	x = computer.screens[base]->widget->core.x;
+	y = computer.screens[base]->widget->core.y;
+
+	/* screens representations are already ordered */
+	for (i = base; i < computer.num_screens; i++) {
+	    if (computer.screens[i]->state == UNUSED)
+		continue;
+	    if (computer.screens[i]->column != 0)
+		x += mon_widths[computer.screens[i]->column];
+	    else {
+		x = computer.screens[base]->widget->core.x;
+		if (i != base)
+		    y += mon_heights[computer.screens[i]->row];
+	    }
+	    XtMoveWidget(computer.screens[i]->widget, x, y);
+	}
+    }
+    XtMapWidget(work);
+}
+
+int
+qcmp_screen(_Xconst void *a, _Xconst void *b)
+{
+    xf86cfgScreen *s1, *s2;
+
+    s1 = *(xf86cfgScreen**)a;
+    s2 = *(xf86cfgScreen**)b;
+
+    if (s1->widget->core.x > s2->widget->core.x) {
+	if (s2->widget->core.y >=
+	    s1->widget->core.y + (s1->widget->core.height >> 1))
+	    return (-1);
+	return (1);
+    }
+    else {
+	if (s1->widget->core.y >=
+	    s2->widget->core.y + (s2->widget->core.height >> 1))
+	    return (1);
+	return (-1);
+    }
+    /*NOTREACHED*/
+}
+
+void
+UpdateScreenUI(void)
+{
+    XF86ConfLayoutPtr lay = computer.layout;
+    XF86ConfAdjacencyPtr adj, prev, left, base;
+    int i, p, cols, scrno;
+
+    if (lay == NULL)
+	return;
+
+    rows = columns = cols = 1;
+
+    qsort(computer.screens, computer.num_screens, sizeof(xf86cfgScreen*),
+	  qcmp_screen);
+
+    adj = prev, base = NULL;
+    for (i = p = scrno = 0; i < computer.num_screens; i++) {
+	XF86ConfScreenPtr scr = computer.screens[i]->screen;
+
+	if (computer.screens[i]->state == UNUSED)
+	    continue;
+
+	adj = (XF86ConfAdjacencyPtr)XtCalloc(1, sizeof(XF86ConfAdjacencyRec));
+	adj->adj_scrnum = scrno++;
+	adj->adj_screen = scr;
+	adj->adj_screen_str = XtNewString(scr->scrn_identifier);
+	if (base == NULL) {
+	    base = left = adj;
+	    computer.screens[i]->row = computer.screens[i]->column = 0;
+	}
+	else {
+	    int dy = computer.screens[i]->widget->core.y -
+		     computer.screens[p]->widget->core.y;
+
+	    prev->list.next = adj;
+	    if (dy > (computer.screens[i]->widget->core.height >> 1)) {
+		adj->adj_where = CONF_ADJ_BELOW;
+		adj->adj_refscreen = XtNewString(left->adj_screen_str);
+		left = adj;
+		computer.screens[i]->row = rows;
+		computer.screens[i]->column = 0;
+		cols = 1;
+		++rows;
+	    }
+	    else {
+		computer.screens[i]->row = rows - 1;
+		computer.screens[i]->column = cols;
+		adj->adj_where = CONF_ADJ_RIGHTOF;
+		if (++cols > columns)
+		    columns = cols;
+		adj->adj_refscreen = XtNewString(prev->adj_screen_str);
+	    }
+	}
+	prev = adj;
+	p = i;
+    }
+
+    adj = lay->lay_adjacency_lst;
+
+    while (adj != NULL) {
+	prev = adj;
+	adj = (XF86ConfAdjacencyPtr)(adj->list.next);
+	XtFree(prev->adj_screen_str);
+	XtFree(prev->adj_right_str);
+	XtFree(prev->adj_left_str);
+	XtFree(prev->adj_top_str);
+	XtFree(prev->adj_bottom_str);
+	XtFree(prev->adj_refscreen);
+	XtFree((char*)prev);
+    }
+
+    lay->lay_adjacency_lst = base;
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h	Thu May 18 09:30:00 2000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.2 2000/05/18 16:30:00 dawes Exp $
+ */
+
+#include "xf86config.h"
+#include "config.h"
+
+#ifndef _xf86cfg_screen_h
+#define _xf86cfg_screen_h
+
+/*
+ * Prototypes
+ */
+void AddScreen(xf86cfgDevice*, xf86cfgDevice*);
+void RemoveScreen(xf86cfgDevice*, xf86cfgDevice*);
+
+void DrawScreen(Display*, Drawable, int, int, int, int, Bool, int);
+void DrawScreenMask(Display*, Drawable, GC, int, int, int, int, int);
+void CreateScreenWidget(xf86cfgScreen*);
+
+void AdjustScreenUI(void);
+void UpdateScreenUI(void);
+
+#endif /* _xf86cfg_screen_h */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/shorter.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/shorter.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/shorter.xbm	Thu May 18 09:30:00 2000
@@ -0,0 +1,8 @@
+#define shorter_width 19
+#define shorter_height 19
+static unsigned char shorter_bits[] = {
+   0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0xfc, 0xff, 0x01,
+   0xf8, 0xff, 0x00, 0xf0, 0x7f, 0x00, 0xe0, 0x3f, 0x00, 0xc0, 0x1f, 0x00,
+   0x80, 0x0f, 0x00, 0x00, 0x07, 0x00, 0x80, 0x0f, 0x00, 0xc0, 0x1f, 0x00,
+   0xe0, 0x3f, 0x00, 0xf0, 0x7f, 0x00, 0xf8, 0xff, 0x00, 0xfc, 0xff, 0x01,
+   0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c	Thu May 18 09:30:00 2000
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.2 2000/05/18 16:30:00 dawes Exp $
+ */
+
+#include "config.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+
+/*
+ * Initialization
+ */
+static int xpid;
+Display *DPY;
+
+/*
+ * Implementation
+ */
+Bool
+startx(void)
+{
+    int timeout = 8;
+
+    if (getenv("DISPLAY") != NULL)
+	/* already running Xserver */
+	return (False);
+
+    if (XF86Config_path == NULL) {
+	char *home, filename[PATH_MAX];
+
+	if (system("XFree86 :8 -configure") != 0) {
+	    fprintf(stderr, "Failed to run \"XFree86 -configure\".\n");
+	    exit(1);
+	}
+
+	if ((home = getenv("HOME")) == NULL)
+	    home = "/";
+
+	XmuSnprintf(filename, sizeof(filename), "%s/XF86Config.new", home);
+
+	/* this memory is never released, even if the value of XF86Config_path is
+	 * changed.
+	 */
+	XF86Config_path = XtNewString(filename);
+    }
+
+    putenv("DISPLAY=:8");
+
+    switch (xpid = fork()) {
+	case 0: {
+	    char path[PATH_MAX];
+
+	    XmuSnprintf(path, sizeof(path), "%s/bin/XFree86", XFree86Dir);
+	    execl(path, "X", ":8", /*"+xinerama",*/ "+accessx","-allowMouseOpenFail",
+		  "-xf86config", XF86Config_path, NULL);
+	    exit(-127);
+	}   break;
+	case -1:
+	    fprintf(stderr, "Cannot fork.\n");
+	    exit(1);
+	    break;
+	default:
+	    break;
+    }
+
+    while (timeout > 0) {
+	int status;
+
+	sleep(timeout -= 2);
+	if (waitpid(xpid, &status, WNOHANG | WUNTRACED) == xpid)
+	    break;
+	else {
+	    DPY = XOpenDisplay(NULL);
+	    if (DPY != NULL)
+		break;
+	}
+    }
+
+    if (DPY == NULL) {
+	fprintf(stderr, "Cannot connect to X server.\n");
+	exit(1);
+    }
+
+    return (True);
+}
+
+void
+endx(void)
+{
+    if (xpid != 0)
+	kill(xpid, SIGTERM);
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/taller.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/taller.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/taller.xbm	Thu May 18 09:30:00 2000
@@ -0,0 +1,8 @@
+#define taller_width 19
+#define taller_height 19
+static unsigned char taller_bits[] = {
+   0x00, 0x02, 0x00, 0x00, 0x07, 0x00, 0x80, 0x0f, 0x00, 0xc0, 0x1f, 0x00,
+   0xe0, 0x3f, 0x00, 0xf0, 0x7f, 0x00, 0xf8, 0xff, 0x00, 0xfc, 0xff, 0x01,
+   0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0xfc, 0xff, 0x01,
+   0xf8, 0xff, 0x00, 0xf0, 0x7f, 0x00, 0xe0, 0x3f, 0x00, 0xc0, 0x1f, 0x00,
+   0x80, 0x0f, 0x00, 0x00, 0x07, 0x00, 0x00, 0x02, 0x00};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/up.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/up.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/up.xbm	Thu May 18 09:30:00 2000
@@ -0,0 +1,8 @@
+#define up_width 19
+#define up_height 19
+static unsigned char up_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+   0x00, 0x07, 0x00, 0x80, 0x0f, 0x00, 0xc0, 0x1f, 0x00, 0xe0, 0x3f, 0x00,
+   0xf0, 0x7f, 0x00, 0xf8, 0xff, 0x00, 0xfc, 0xff, 0x01, 0x80, 0x0f, 0x00,
+   0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00, 0x80, 0x0f, 0x00,
+   0x80, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c	Thu May 18 09:30:00 2000
@@ -0,0 +1,1236 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.1 2000/05/18 16:30:00 dawes Exp $
+ */
+
+/*
+ * Most of the code here is based on the xvidtune code.
+ */
+
+#include "vidmode.h"
+#include <X11/extensions/Xinerama.h>
+#include <X11/Xaw/Command.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Label.h>
+#include <X11/Xaw/MenuButton.h>
+#include <X11/Xaw/Repeater.h>
+#include <X11/Shell.h>
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Dialog.h>
+#include <X11/Xaw/SimpleMenP.h>
+#include <X11/Xaw/SmeBSB.h>
+#include <X11/Xaw/Toggle.h>
+#include "xf86config.h"
+
+#define V_FLAG_MASK	0x1FF
+#define V_PHSYNC	0x001 
+#define V_NHSYNC	0x002
+#define V_PVSYNC	0x004
+#define V_NVSYNC	0x008
+#define V_INTERLACE	0x010 
+#define V_DBLSCAN	0x020
+#define V_CSYNC		0x040
+#define V_PCSYNC	0x080
+#define V_NCSYNC	0x100
+
+#define	LEFT		0
+#define	RIGHT		1
+#define	UP		2
+#define	DOWN		3
+#define	WIDER		4
+#define	TALLER		5
+#define	NARROWER	6
+#define	SHORTER		7
+
+#define	HDISPLAY	0
+#define VDISPLAY	1
+#define HSYNCSTART	2
+#define HSYNCEND	3
+#define HTOTAL		4
+#define VSYNCSTART	5
+#define VSYNCEND	6
+#define VTOTAL		7
+#define FLAGS		8
+#define CLOCK		9
+#define HSYNC		10
+#define VSYNC		11
+
+#define MINMAJOR	 2
+#define MINMINOR	 0
+
+/*
+ * Types
+ */
+typedef struct {
+    char *ident;
+    XF86VidModeModeInfo info;
+} xf86cfgVesaModeInfo;
+
+/*
+ * Prototypes
+ */
+static Bool GetModeLine(Bool);
+static void StartAdjustMonitorCallback(Widget, XtPointer, XtPointer);
+static void AdjustMonitorCallback(Widget, XtPointer, XtPointer);
+static void EndAdjustMonitorCallback(Widget, XtPointer, XtPointer);
+static void SetLabel(int, int);
+static void UpdateSyncRates(Bool);
+static int VidmodeError(Display*, XErrorEvent*);
+static void CleanUp(Display*);
+static void ApplyCallback(Widget, XtPointer, XtPointer);
+static void AutoCallback(Widget, XtPointer, XtPointer);
+static void RestoreCallback(Widget, XtPointer, XtPointer);
+static void SelectCallback(Widget, XtPointer, XtPointer);
+static void SelectMonitorCallback(Widget, XtPointer, XtPointer);
+static void SwitchCallback(Widget, XtPointer, XtPointer);
+static void SetLabels(void);
+static void UpdateCallback(Widget, XtPointer, XtPointer);
+static void ChangeScreenCallback(Widget, XtPointer, XtPointer);
+static void SetLabelAndModeline(void);
+static void AddVesaModeCallback(Widget, XtPointer, XtPointer);
+static void GetModes(void);
+static void AddModeCallback(Widget, XtPointer, XtPointer);
+static void TestCallback(Widget, XtPointer, XtPointer);
+static void TestTimeout(XtPointer, XtIntervalId*);
+static void StopTestCallback(Widget, XtPointer, XtPointer);
+
+/*
+ * Initialization
+ */
+extern Widget work;
+Widget vtune;
+static Widget apply, automatic, restore, mode, menu, screenb, screenp;
+static Bool autoflag;
+static xf86cfgVidmode *vidtune;
+static XF86VidModeModeLine modeline, orig_modeline;
+static int dot_clock, hsync_rate, vsync_rate, hitError;
+static Bool S3Specials;
+static int invert_vclk, blank1, blank2, early_sc, screenno;
+static int (*XtErrorFunc)(Display*, XErrorEvent*);
+static Widget labels[VSYNC + 1], values[VSYNC + 1], repeater, monitor,
+	      monitorb, add, text, vesab, vesap, forceshell, testshell;
+static int MajorVersion, MinorVersion, EventBase, ErrorBase;
+static XtIntervalId timeout;
+
+/* The information bellow is extracted from
+ * xc/programs/Xserver/hw/xfree86/etc/vesamodes
+ * If that file is changed, please update the table bellow also. Or even
+ * better, write a script to generate the table.
+ */
+static xf86cfgVesaModeInfo vesamodes[] = {
+    {
+	"640x350 @ 85Hz (VESA) hsync: 37.9kHz",
+	{
+	    31500, 640, 672, 736, 832, 0, 350, 382, 385, 445,
+	    V_PHSYNC | V_NVSYNC
+	}
+    },
+    {
+	"640x400 @ 85Hz (VESA) hsync: 37.9kHz",
+	{
+	    31500, 640, 672, 736, 832, 0, 400, 401, 404, 445,
+	    V_NHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"720x400 @ 85Hz (VESA) hsync: 37.9kHz",
+	{
+	    35500, 720, 756, 828, 936, 0, 400, 401, 404, 446,
+	    V_NHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"640x480 @ 60Hz (Industry standard) hsync: 31.5kHz",
+	{
+	    25200, 640, 656, 752, 800, 0, 480, 490, 492, 525,
+	    V_NHSYNC | V_NVSYNC
+	}
+    },
+    {
+	"640x480 @ 72Hz (VESA) hsync: 37.9kHz",
+	{
+	    31500, 640, 664, 704, 832, 0, 480, 489, 491, 520,
+	    V_NHSYNC | V_NVSYNC
+	}
+    },
+    {
+	"640x480 @ 75Hz (VESA) hsync: 37.5kHz",
+	{
+	    31500, 640, 656, 720, 840, 0, 480, 481, 484, 500,
+	    V_NHSYNC | V_NVSYNC
+	}
+    },
+    {
+	"640x480 @ 85Hz (VESA) hsync: 43.3kHz",
+	{
+	    36000, 640, 696, 752, 832, 0, 480, 481, 484, 509,
+	    V_NHSYNC | V_NVSYNC
+	}
+    },
+    {
+	"800x600 @ 56Hz (VESA) hsync: 35.2kHz",
+	{
+	    36000, 800, 824, 896, 1024, 0, 600, 601, 603, 625,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"800x600 @ 60Hz (VESA) hsync: 37.9kHz",
+	{
+	    400000, 800, 840, 968, 1056, 0, 600, 601, 605, 628,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"800x600 @ 72Hz (VESA) hsync: 48.1kHz",
+	{
+	    50000, 800, 856, 976, 1040, 0, 600, 637, 643, 666,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"800x600 @ 75Hz (VESA) hsync: 46.9kHz",
+	{
+	    49500, 800, 816, 896, 1056, 0, 600, 601, 604, 625,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"800x600 @ 85Hz (VESA) hsync: 53.7kHz",
+	{
+	    563000, 800, 832, 896, 1048, 0, 600, 601, 604, 631,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1024x768i @ 43Hz (industry standard) hsync: 35.5kHz",
+	{
+	    44900, 1024, 1032, 1208, 1264, 0, 768, 768, 776, 817,
+	    V_PHSYNC | V_PVSYNC | V_INTERLACE
+	}
+    },
+    {
+	"1024x768 @ 60Hz (VESA) hsync: 48.4kHz",
+	{
+	    65000, 1024, 1048, 1184, 1344, 0, 768, 771, 777, 806,
+	    V_NHSYNC | V_NVSYNC
+	}
+    },
+    {
+	"1024x768 @ 70Hz (VESA) hsync: 56.5kHz",
+	{
+	    75000, 1024, 1048, 1184, 1328, 0, 768, 771, 777, 806,
+	    V_NHSYNC | V_NVSYNC
+	}
+    },
+    {
+	"1024x768 @ 75Hz (VESA) hsync: 60.0kHz",
+	{
+	    78800, 1024, 1040, 1136, 1312, 0, 768, 769, 772, 800,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1024x768 @ 85Hz (VESA) hsync: 68.7kHz",
+	{
+	    94500, 1024, 1072, 1168, 1376, 0, 768, 769, 772, 808,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1152x864 @ 75Hz (VESA) hsync: 67.5kHz",
+	{
+	    108000, 1152, 1216, 1344, 1600, 0, 864, 865, 868, 900,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1280x960 @ 60Hz (VESA) hsync: 60.0kHz",
+	{
+	    108000, 1280, 1376, 1488, 1800, 0, 960, 961, 964, 1000,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1280x960 @ 85Hz (VESA) hsync: 85.9kHz",
+	{
+	    148500, 1280, 1344, 1504, 1728, 0, 960, 961, 964, 1011,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1280x1024 @ 60Hz (VESA) hsync: 64.0kHz",
+	{
+	    108000, 1280, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1280x1024 @ 75Hz (VESA) hsync: 80.0kHz",
+	{
+	    135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1280x1024 @ 85Hz (VESA) hsync: 91.1kHz",
+	{
+	    157500, 1280, 1344, 1504, 1728, 0, 1024, 1025, 1028, 1072,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1600x1200 @ 60Hz (VESA) hsync: 75.0kHz",
+	{
+	    162000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1600x1200 @ 65Hz (VESA) hsync: 81.3kHz",
+	{
+	    175500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1600x1200 @ 70Hz (VESA) hsync: 87.5kHz",
+	{
+	    189000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1600x1200 @ 75Hz (VESA) hsync: 93.8kHz",
+	{
+	    202500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1600x1200 @ 85Hz (VESA) hsync: 106.3kHz",
+	{
+	    229500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250,
+	    V_PHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1792x1344 @ 60Hz (VESA) hsync: 83.6kHz",
+	{
+	    204800, 1792, 1920, 2120, 2448, 0, 1344, 1345, 1348, 1394,
+	    V_NHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1792x1344 @ 75Hz (VESA) hsync: 106.3kHz",
+	{
+	    261000, 1792, 1888, 2104, 2456, 0, 1344, 1345, 1348, 1417,
+	    V_NHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1856x1392 @ 60Hz (VESA) hsync: 86.3kHz",
+	{
+	    218300, 1856, 1952, 2176, 2528, 0, 1392, 1393, 1396, 1439,
+	    V_NHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1856x1392 @ 75Hz (VESA) hsync: 112.5kHz",
+	{
+	    288000, 1856, 1984, 2208, 2560, 0, 1392, 1393, 1396, 1500,
+	    V_NHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1920x1440 @ 60Hz (VESA) hsync: 90.0kHz",
+	{
+	    234000, 1920, 2048, 2256, 2600, 0, 1440, 1441, 1444, 1500,
+	    V_NHSYNC | V_PVSYNC
+	}
+    },
+    {
+	"1920x1440 @ 75Hz (VESA) hsync: 112.5kHz",
+	{
+	    297000, 1920, 2064, 2288, 2640, 0, 1440, 1441, 1444, 1500,
+	    V_NHSYNC | V_PVSYNC
+	}
+    },
+};
+
+/*
+ * Implementation
+ */
+Bool
+VideoModeInitialize(void)
+{
+    Widget form;
+    char dispstr[128], *ptr, *tmp;
+
+    static char *names[] = {
+	NULL,
+	NULL,
+	"hsyncstart",
+	"hsyncend",
+	"htotal",
+	"vsyncstart",
+	"vsyncend",
+	"vtotal",
+	"flags",
+	"clock",
+	"hsync",
+	"vsync",
+    };
+    static char *vnames[] = {
+	NULL,
+	NULL,
+	"v-hsyncstart",
+	"v-hsyncend",
+	"v-htotal",
+	"v-vsyncstart",
+	"v-vsyncend",
+	"v-vtotal",
+	"v-flags",
+	"v-clock",
+	"v-hsync",
+	"v-vsync",
+    };
+    Widget rep;
+    int i;
+
+    if (!XF86VidModeQueryVersion(XtDisplay(toplevel),
+				 &MajorVersion, &MinorVersion)) {
+	fprintf(stderr, "Unable to query video extension version\n");
+	return (False);
+    }
+    else if (!XF86VidModeQueryExtension(XtDisplay(toplevel),
+					&EventBase, &ErrorBase)) {
+	fprintf(stderr, "Unable to query video extension information\n");
+	return (False);
+    }
+    else if (MajorVersion < MINMAJOR ||
+	(MajorVersion == MINMAJOR && MinorVersion < MINMINOR)) {
+	fprintf(stderr,
+		"Xserver is running an old XFree86-VidModeExtension version"
+		" (%d.%d)\n", MajorVersion, MinorVersion);
+	fprintf(stderr, "Minimum required version is %d.%d\n",
+		MINMAJOR, MINMINOR);
+	return (False);
+    }
+    else {
+	int i;
+	Display *display = XtDisplay(toplevel);
+
+	computer.num_vidmodes = ScreenCount(display);
+	computer.vidmodes = (xf86cfgVidmode**)
+	    XtMalloc(sizeof(xf86cfgVidmode*) * computer.num_vidmodes);
+	for (i = 0; i < computer.num_vidmodes; i++) {
+
+	    computer.vidmodes[i] = (xf86cfgVidmode*)
+		XtCalloc(1, sizeof(xf86cfgVidmode));
+	    computer.vidmodes[i]->screen = i;
+	}
+    }
+
+    vtune = XtCreateWidget("vidtune", formWidgetClass,
+			   work, NULL, 0);
+
+    vesab = XtVaCreateManagedWidget("vesaB", menuButtonWidgetClass, vtune,
+				    XtNmenuName, "vesaP", NULL, 0);
+    vesap = XtCreatePopupShell("vesaP", simpleMenuWidgetClass, vtune, NULL, 0);
+    for (i = 0; i < sizeof(vesamodes) / sizeof(vesamodes[0]); i++) {
+	rep = XtCreateManagedWidget(vesamodes[i].ident, smeBSBObjectClass,
+				    vesap, NULL, 0);
+	XtAddCallback(rep, XtNcallback, AddVesaModeCallback,
+		      (XtPointer)&vesamodes[i]);
+    }
+
+    rep = XtCreateManagedWidget("prev", commandWidgetClass, vtune, NULL, 0);
+    XtAddCallback(rep, XtNcallback, SwitchCallback, (XtPointer)-1);
+    mode = XtCreateManagedWidget("mode", menuButtonWidgetClass, vtune, NULL, 0);
+    menu = XtCreatePopupShell("menu", simpleMenuWidgetClass, vtune, NULL, 0);
+    rep = XtCreateManagedWidget("next", commandWidgetClass, vtune, NULL, 0);
+    XtAddCallback(rep, XtNcallback, SwitchCallback, (XtPointer)1);
+
+    screenp = XtCreatePopupShell("screenP", simpleMenuWidgetClass, vtune,
+				 NULL, 0);
+
+    XmuSnprintf(dispstr, sizeof(dispstr), "%s",
+		DisplayString(XtDisplay(toplevel)));
+    ptr = strrchr(dispstr, '.');
+    tmp = strrchr(dispstr, ':');
+    if (tmp != NULL && ptr != NULL && ptr > tmp)
+	*ptr = '\0';
+
+    for (i = 0; i < ScreenCount(XtDisplay(toplevel)); i++) {
+	char name[128];
+
+	XmuSnprintf(name, sizeof(name), "%s.%d", dispstr, i);
+	rep = XtCreateManagedWidget(name, smeBSBObjectClass, screenp,
+				    NULL, 0);
+	XtAddCallback(rep, XtNcallback, ChangeScreenCallback, (XtPointer)i);
+	if (i == 0) {
+	    screenb = XtVaCreateManagedWidget("screenB", menuButtonWidgetClass,
+					      vtune,
+					      XtNmenuName, "screenP",
+					      XtNlabel, name,
+					      NULL, 0);
+	}
+    }
+    XtRealizeWidget(screenp);
+    monitor = XtCreatePopupShell("monitorP", simpleMenuWidgetClass,
+				 vtune, NULL, 0);
+
+    rep = XtCreateManagedWidget("up", repeaterWidgetClass,
+				vtune, NULL, 0);
+    XtAddCallback(rep, XtNstartCallback, StartAdjustMonitorCallback, NULL);
+    XtAddCallback(rep, XtNcallback,
+		  AdjustMonitorCallback, (XtPointer)UP);
+    XtAddCallback(rep, XtNstopCallback, EndAdjustMonitorCallback, NULL);
+    rep = XtCreateManagedWidget("left", repeaterWidgetClass,
+				vtune, NULL, 0);
+    XtAddCallback(rep, XtNstartCallback, StartAdjustMonitorCallback, NULL);
+    XtAddCallback(rep, XtNcallback,
+		  AdjustMonitorCallback, (XtPointer)LEFT);
+    XtAddCallback(rep, XtNstopCallback, EndAdjustMonitorCallback, NULL);
+    XtCreateManagedWidget("monitor", simpleWidgetClass, vtune, NULL, 0);
+    rep = XtCreateManagedWidget("right", repeaterWidgetClass,
+				vtune, NULL, 0);
+    XtAddCallback(rep, XtNstartCallback, StartAdjustMonitorCallback, NULL);
+    XtAddCallback(rep, XtNcallback,
+		  AdjustMonitorCallback, (XtPointer)RIGHT);
+    XtAddCallback(rep, XtNstopCallback, EndAdjustMonitorCallback, NULL);
+    rep = XtCreateManagedWidget("down", repeaterWidgetClass,
+				vtune, NULL, 0);
+    XtAddCallback(rep, XtNstartCallback, StartAdjustMonitorCallback, NULL);
+    XtAddCallback(rep, XtNcallback,
+		  AdjustMonitorCallback, (XtPointer)DOWN);
+    XtAddCallback(rep, XtNstopCallback, EndAdjustMonitorCallback, NULL);
+    rep = XtCreateManagedWidget("wider", repeaterWidgetClass,
+				vtune, NULL, 0);
+    XtAddCallback(rep, XtNstartCallback, StartAdjustMonitorCallback, NULL);
+    XtAddCallback(rep, XtNcallback,
+		  AdjustMonitorCallback, (XtPointer)WIDER);
+    XtAddCallback(rep, XtNstopCallback, EndAdjustMonitorCallback, NULL);
+    rep = XtCreateManagedWidget("narrower", repeaterWidgetClass,
+				vtune, NULL, 0);
+    XtAddCallback(rep, XtNstartCallback, StartAdjustMonitorCallback, NULL);
+    XtAddCallback(rep, XtNcallback,
+		  AdjustMonitorCallback, (XtPointer)NARROWER);
+    XtAddCallback(rep, XtNstopCallback, EndAdjustMonitorCallback, NULL);
+    rep = XtCreateManagedWidget("shorter", repeaterWidgetClass,
+				vtune, NULL, 0);
+    XtAddCallback(rep, XtNstartCallback, StartAdjustMonitorCallback, NULL);
+    XtAddCallback(rep, XtNcallback,
+		  AdjustMonitorCallback, (XtPointer)SHORTER);
+    XtAddCallback(rep, XtNstopCallback, EndAdjustMonitorCallback, NULL);
+    rep = XtCreateManagedWidget("taller", repeaterWidgetClass,
+				vtune, NULL, 0);
+    XtAddCallback(rep, XtNstartCallback, StartAdjustMonitorCallback, NULL);
+    XtAddCallback(rep, XtNcallback,
+		  AdjustMonitorCallback, (XtPointer)TALLER);
+    XtAddCallback(rep, XtNstopCallback, EndAdjustMonitorCallback, NULL);
+
+    automatic = XtCreateManagedWidget("auto", toggleWidgetClass, vtune, NULL, 0);
+    XtAddCallback(automatic, XtNcallback, AutoCallback, NULL);
+    apply = XtCreateManagedWidget("apply", commandWidgetClass, vtune, NULL, 0);
+    XtAddCallback(apply, XtNcallback, ApplyCallback, NULL);
+    restore = XtCreateManagedWidget("restore", commandWidgetClass, vtune, NULL, 0);
+    XtAddCallback(restore, XtNcallback, RestoreCallback, NULL);
+    rep = XtCreateManagedWidget("update", commandWidgetClass, vtune, NULL, 0);
+    XtAddCallback(rep, XtNcallback, UpdateCallback, NULL);
+    rep = XtCreateManagedWidget("test", commandWidgetClass, vtune, NULL, 0);
+    XtAddCallback(rep, XtNcallback, TestCallback, NULL);
+
+    form = XtCreateManagedWidget("form", formWidgetClass, vtune, NULL, 0);
+    for (i = 2; i < VSYNC + 1; i++) {
+	labels[i] = XtCreateManagedWidget(names[i], labelWidgetClass,
+					  form, NULL, 0);
+	values[i] = XtCreateManagedWidget(vnames[i], labelWidgetClass,
+					  form, NULL, 0);
+    }
+
+    add = XtCreateManagedWidget("add", commandWidgetClass, vtune, NULL, 0);
+    XtAddCallback(add, XtNcallback, AddModeCallback, NULL);
+    XtCreateManagedWidget("addto", labelWidgetClass, vtune, NULL, 0);
+    monitorb = XtVaCreateManagedWidget("ident", menuButtonWidgetClass, vtune,
+				       XtNmenuName, "monitorP", NULL, 0);
+    XtCreateManagedWidget("as", labelWidgetClass, vtune, NULL, 0);
+    text = XtVaCreateManagedWidget("text", asciiTextWidgetClass, vtune,
+				   XtNeditType, XawtextEdit, NULL, 0);
+
+    XtRealizeWidget(vtune);
+
+    return (True);
+}
+
+void
+VideoModeConfigureStart(void)
+{
+    vidtune = computer.vidmodes[screenno];
+
+    XtSetSensitive(vtune, vidtune != NULL);
+    if (!XtIsManaged(vtune))
+	XtManageChild(vtune);
+    else
+	XtMapWidget(vtune);
+    if (vidtune != NULL) {
+	int i;
+	Arg args[1];
+	Boolean state;
+	XF86ConfMonitorPtr mon;
+
+	XtErrorFunc = XSetErrorHandler(VidmodeError);
+	XF86VidModeLockModeSwitch(XtDisplay(toplevel), vidtune->screen, True);
+	GetModeLine(True);
+	GetModes();
+
+	SetLabels();
+	XtSetArg(args[0], XtNstate, &state);
+	XtGetValues(automatic, args, 1);
+	XtSetSensitive(apply, !state);
+	autoflag = state;
+
+	for (i = 0; i < ((CompositeWidget)monitor)->composite.num_children; i++)
+	    XtDestroyWidget(((CompositeWidget)monitor)->composite.children[i]);
+	mon = XF86Config->conf_monitor_lst;
+	while (mon != NULL) {
+	    Widget sme = XtCreateManagedWidget(mon->mon_identifier,
+					       smeBSBObjectClass,
+					       monitor, NULL, 0);
+	    XtAddCallback(sme, XtNcallback,
+			  SelectMonitorCallback, (XtPointer)mon);
+
+	    /* guess the monitor at a given screen and/or
+	     * updates configuration if a monitor was removed from the
+	     * configuration.
+	     */
+	    if (XF86Config->conf_layout_lst) {
+		XF86ConfAdjacencyPtr adj = XF86Config->conf_layout_lst->
+		    lay_adjacency_lst;
+
+		while (adj != NULL) {
+		    if (adj->adj_screen != NULL) {
+			if (adj->adj_screen->scrn_monitor == mon &&
+			    adj->adj_scrnum >= 0 &&
+			    adj->adj_scrnum < ScreenCount(XtDisplay(toplevel))) {
+			    if (computer.vidmodes[adj->adj_scrnum]->monitor ==
+				NULL || computer.vidmodes[adj->adj_scrnum]->
+				monitor == adj->adj_screen->scrn_monitor) {
+				computer.vidmodes[adj->adj_scrnum]->monitor =
+				    adj->adj_screen->scrn_monitor;
+				break;
+			    }
+			    else
+				computer.vidmodes[adj->adj_scrnum]->monitor =
+				    NULL;
+			}
+		    }
+		    adj = (XF86ConfAdjacencyPtr)(adj->list.next);
+		}
+	    }
+	    mon = (XF86ConfMonitorPtr)(mon->list.next);
+	}
+	SetLabelAndModeline();
+    }
+}
+
+void
+VideoModeConfigureEnd(void)
+{
+    XtUnmapWidget(vtune);
+    if (vidtune != NULL) {
+	XF86VidModeLockModeSwitch(XtDisplay(toplevel), vidtune->screen, False);
+	XSetErrorHandler(XtErrorFunc);
+    }
+    vidtune = NULL;
+}
+
+static void
+SetLabelAndModeline(void)
+{
+    if (vidtune->monitor != NULL) {
+	char string[32];
+
+	XtVaSetValues(monitorb, XtNlabel,
+		      vidtune->monitor->mon_identifier, NULL);
+	XtSetSensitive(add, True);
+
+	XmuSnprintf(string, sizeof(string), "%dx%d@%d",
+		    modeline.hdisplay, modeline.vdisplay,
+		    (int)((double)dot_clock / (double)modeline.htotal * 1000.0 /
+		    (double)modeline.vtotal));
+	XtVaSetValues(text, XtNstring, string, NULL);
+    }
+    else {
+	XtVaSetValues(monitorb, XtNlabel, "", NULL);
+	XtSetSensitive(add, False);
+	XtVaSetValues(text, XtNstring, "", NULL);
+    }
+}
+
+/*ARGSUSED*/
+void
+VidmodeRestoreAction(Widget w, XEvent *event,
+		     String *params, Cardinal *num_params)
+{
+    if (vidtune != NULL) {
+	if (timeout != 0)
+	    StopTestCallback(w, NULL, NULL);
+	else
+	    RestoreCallback(w, NULL, NULL);
+    }
+}
+
+static void
+UpdateSyncRates(Bool update)
+{
+    hsync_rate = (dot_clock * 1000) / modeline.htotal;
+    vsync_rate = (hsync_rate * 1000) / modeline.vtotal;
+    if (modeline.flags & V_INTERLACE)
+	vsync_rate *= 2;
+    else if (modeline.flags & V_DBLSCAN)
+	vsync_rate /= 2;
+    if (update) {
+	SetLabel(HSYNC, hsync_rate);
+	SetLabel(VSYNC, vsync_rate);
+    }
+}
+
+static void
+SetLabel(int ident, int value)
+{
+    Arg args[1];
+    char label[256];
+
+    if (ident == FLAGS) {
+	int len = 0;
+
+	*label = '\0';
+	if (value & V_PHSYNC)
+	    len += XmuSnprintf(label, sizeof(label), "%s", "+hsync");
+	if (modeline.flags & V_NHSYNC)
+	    len += XmuSnprintf(label + len, sizeof(label), "%s%s",
+			       len ? " " : "", "-hsync");
+	if (value & V_PVSYNC)
+	    len += XmuSnprintf(label + len, sizeof(label), "%s%s",
+			       len ? " " : "", "+vsync");
+	if (value & V_NVSYNC)
+	    len += XmuSnprintf(label + len, sizeof(label), "%s%s",
+			       len ? " " : "", "-vsync");
+	if (value & V_INTERLACE)
+	    len += XmuSnprintf(label + len, sizeof(label), "%s%s",
+			       len ? " " : "", "interlace");
+	if (value & V_CSYNC)
+	    len += XmuSnprintf(label + len, sizeof(label), "%s%s",
+			       len ? " " : "", "composite");
+	if (value & V_PCSYNC)
+	    len += XmuSnprintf(label + len, sizeof(label), "%s%s",
+			       len ? " " : "", "+csync");
+	if (value & V_NCSYNC)
+	    len += XmuSnprintf(label + len, sizeof(label), "%s%s",
+			       len ? " " : "", "-csync");
+	if (value & V_DBLSCAN)
+	    len += XmuSnprintf(label + len, sizeof(label), "%s%s",
+			       len ? " " : "", "doublescan");
+
+    }
+    else if (ident == CLOCK || ident == HSYNC || ident == VSYNC)
+	XmuSnprintf(label, sizeof(label), "%6.2f", (float)value / 1000.0);
+    else
+	XmuSnprintf(label, sizeof(label), "%d", value);
+
+    XtSetArg(args[0], XtNlabel, label);
+    XtSetValues(values[ident], args, 1);
+}
+
+/*ARGSUSED*/
+static void
+StartAdjustMonitorCallback(Widget w, XtPointer client_data, XtPointer call_data)
+{
+    repeater = w;
+}
+
+static void
+AdjustMonitorCallback(Widget w, XtPointer client_data, XtPointer call_data)
+{
+    if (repeater != w)
+	return;
+    switch ((int)client_data) {
+	case LEFT:
+	    if (modeline.hsyncend + 4 < modeline.htotal) {
+		modeline.hsyncstart += 4;
+		modeline.hsyncend += 4;
+		SetLabel(HSYNCSTART, modeline.hsyncstart);
+		SetLabel(HSYNCEND, modeline.hsyncend);
+	    }
+	    else
+		XBell(XtDisplay(w), 80);
+	    break;
+	case RIGHT:
+	    if (modeline.hsyncstart - 4 > modeline.hdisplay) {
+		modeline.hsyncstart -= 4;
+		modeline.hsyncend -= 4;
+		SetLabel(HSYNCSTART, modeline.hsyncstart);
+		SetLabel(HSYNCEND, modeline.hsyncend);
+	    }
+	    else
+		XBell(XtDisplay(w), 80);
+	    break;
+	case NARROWER:
+	    modeline.htotal += 4;
+	    SetLabel(HTOTAL, modeline.htotal);
+	    UpdateSyncRates(True);
+	    break;
+	case WIDER:
+	    if (modeline.htotal - 4 > modeline.hsyncend) {
+		modeline.htotal -= 4;
+		SetLabel(HTOTAL, modeline.htotal);
+		UpdateSyncRates(True);
+	    }
+	    else
+		XBell(XtDisplay(w), 80);
+	    break;
+	case UP:
+	    if (modeline.vsyncend + 4 < modeline.vtotal) {
+		modeline.vsyncstart += 4;
+		modeline.vsyncend += 4;
+		SetLabel(VSYNCSTART, modeline.vsyncstart);
+		SetLabel(VSYNCEND, modeline.vsyncend);
+	    }
+	    else
+		XBell(XtDisplay(w), 80);
+	    break;
+	case DOWN:
+	    if (modeline.vsyncstart - 4 > modeline.vdisplay) {
+		modeline.vsyncstart -= 4;
+		modeline.vsyncend -= 4;
+		SetLabel(VSYNCSTART, modeline.vsyncstart);
+		SetLabel(VSYNCEND, modeline.vsyncend);
+	    }
+	    else
+		XBell(XtDisplay(w), 80);
+	    break;
+	case SHORTER:
+	    modeline.vtotal += 4;
+	    SetLabel(VTOTAL, modeline.vtotal);
+	    UpdateSyncRates(True);
+	    break;
+	case TALLER:
+	    if (modeline.vtotal - 4 >  modeline.vsyncend) {
+		modeline.vtotal -= 4;
+		SetLabel(VTOTAL, modeline.vtotal);
+		UpdateSyncRates(True);
+	    }
+	    else
+		XBell(XtDisplay(w), 80);
+	    break;
+    }
+
+    if (autoflag)
+	ApplyCallback(w, call_data, client_data);
+}
+
+/*ARGSUSED*/
+static void
+EndAdjustMonitorCallback(Widget w, XtPointer client_data, XtPointer call_data)
+{
+    repeater = NULL;
+}
+
+static Bool
+GetModeLine(Bool save)
+{
+    if (XF86VidModeGetModeLine(XtDisplay(toplevel), vidtune->screen,
+			       &dot_clock, &modeline)) {
+	if (save)
+	    memcpy(&orig_modeline, &modeline, sizeof(XF86VidModeModeLine));
+	UpdateSyncRates(False);
+	if (modeline.privsize != 0 && modeline.private != NULL) {
+	    S3Specials = True;
+	    invert_vclk = modeline.private[1];
+	    blank1 = modeline.private[2] & 7;
+	    blank2 = (modeline.private[2] >> 4) & 7;
+	    early_sc = modeline.private[3];
+	}
+	else
+	    S3Specials = False;
+	return (True);
+    }
+
+    return (False);
+}
+
+static void
+CleanUp(Display *display)
+{
+    /* Make sure mode switching is not locked out at exit */
+    XF86VidModeLockModeSwitch(display, vidtune->screen, False);
+    XFlush(display);
+}
+
+static int
+VidmodeError(Display *display, XErrorEvent *error)
+{
+    if ((error->error_code >= ErrorBase &&
+	 error->error_code < ErrorBase + XF86VidModeNumberErrors) ||
+	 error->error_code == BadValue) {
+	 hitError = 1;
+    }
+    else {
+	CleanUp(display);
+	if (XtErrorFunc) 
+	    (*XtErrorFunc)(display, error);
+    }
+    return (0);
+}
+
+/*ARGSUSED*/
+static void
+ApplyCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    hitError = 0;
+    XF86VidModeModModeLine(XtDisplay(w), vidtune->screen, &modeline);
+    XSync(XtDisplay(w), False);
+    if (hitError) {
+	if (repeater != NULL) {
+	    XtCallActionProc(repeater, "unset", NULL, NULL, 0);
+	    XtCallActionProc(repeater, "stop", NULL, NULL, 0);
+	    repeater = NULL;
+	}
+	XBell(XtDisplay(w), 80);
+	if (timeout)
+	    StopTestCallback(w, NULL, NULL);
+	GetModeLine(False);
+	SetLabels();
+    }
+}
+
+/*ARGSUSED*/
+static void
+AutoCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    autoflag = (Bool)client_data;
+    XtSetSensitive(apply, !autoflag);
+}
+
+static void
+RestoreCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    memcpy(&modeline, &orig_modeline, sizeof(XF86VidModeModeLine));
+    if (autoflag)
+	ApplyCallback(w, call_data, client_data);
+    SetLabels();
+}
+
+static void
+SelectCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    XF86VidModeModeInfo *info = (XF86VidModeModeInfo*)call_data;
+    Arg args[1];
+    Bool result;
+
+    XF86VidModeLockModeSwitch(XtDisplay(toplevel), vidtune->screen, False);
+    result = XF86VidModeSwitchToMode(XtDisplay(toplevel), vidtune->screen, info);
+    XF86VidModeLockModeSwitch(XtDisplay(toplevel), vidtune->screen, True);
+    if (!result)
+	return;
+
+    XtSetArg(args[0], XtNlabel, XtName(w));
+    XtSetValues(mode, args, 1);
+    UpdateCallback(w, call_data, client_data);
+}
+
+static void
+SwitchCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    int direction = (int)call_data;
+    Arg args[1];
+    Bool result;
+    char label[32];
+
+    XF86VidModeLockModeSwitch(XtDisplay(toplevel), vidtune->screen, False);
+    result = XF86VidModeSwitchMode(XtDisplay(toplevel), vidtune->screen,
+				   direction);
+    XF86VidModeLockModeSwitch(XtDisplay(toplevel), vidtune->screen, True);
+    if (!result)
+	return;
+
+    UpdateCallback(w, call_data, client_data);
+
+    XmuSnprintf(label, sizeof(label), "%dx%d @ %d Hz",
+		modeline.hdisplay, modeline.vdisplay,
+		(int)((double)dot_clock / (double)modeline.htotal * 1000.0 /
+		(double)modeline.vtotal));
+    XtSetArg(args[0], XtNlabel, label);
+    XtSetValues(mode, args, 1);
+}
+
+/*ARGSUSED*/
+static void
+UpdateCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    GetModeLine(True);
+    SetLabels();
+    SetLabelAndModeline();
+}
+
+static void
+SetLabels(void)
+{
+    SetLabel(HSYNCSTART, modeline.hsyncstart);
+    SetLabel(VSYNCSTART, modeline.vsyncstart);
+    SetLabel(HSYNCEND, modeline.hsyncend);
+    SetLabel(VSYNCEND, modeline.vsyncend);
+    SetLabel(HTOTAL, modeline.htotal);
+    SetLabel(VTOTAL, modeline.vtotal);
+    SetLabel(FLAGS, modeline.flags);
+    SetLabel(CLOCK, dot_clock);
+    UpdateSyncRates(True);
+}
+
+/*ARGSUSED*/
+static void
+ChangeScreenCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    Arg args[1];
+
+    screenno = (int)call_data;
+    if (screenno > computer.num_vidmodes || screenno < 0 ||
+	vidtune == computer.vidmodes[screenno])
+	return;
+
+    XF86VidModeLockModeSwitch(XtDisplay(toplevel), vidtune->screen, False);
+    vidtune = computer.vidmodes[screenno];
+    XF86VidModeLockModeSwitch(XtDisplay(toplevel), vidtune->screen, True);
+    UpdateCallback(w, call_data, client_data);
+    GetModes();
+
+    XtSetArg(args[0], XtNlabel, XtName(w));
+    XtSetValues(screenb, args, 1);
+
+    SetLabelAndModeline();
+}
+
+/*ARGSUSED*/
+static void
+SelectMonitorCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    vidtune->monitor = (XF86ConfMonitorPtr)(call_data);
+    SetLabelAndModeline();
+}
+
+/*ARGSUSED*/
+static void
+AddVesaModeCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    xf86cfgVesaModeInfo *vesa = (xf86cfgVesaModeInfo*)call_data;
+    XF86VidModeModeInfo mode;
+
+    memcpy(&mode, &vesa->info, sizeof(XF86VidModeModeInfo));
+    if (XF86VidModeAddModeLine(XtDisplay(toplevel), vidtune->screen,
+			       &vesa->info, &mode)) {
+	XSync(XtDisplay(toplevel), False);
+	GetModes();
+    }
+    else
+	XBell(XtDisplay(w), 80);
+}
+
+static void
+GetModes(void)
+{
+    int i;
+    char label[32];
+    Arg args[1];
+
+    XFree(vidtune->infos);
+    XF86VidModeGetAllModeLines(XtDisplay(toplevel), vidtune->screen,
+			       &vidtune->num_infos, &vidtune->infos);
+
+    for (i = 0; i < ((CompositeWidget)menu)->composite.num_children; i++)
+	XtDestroyWidget(((CompositeWidget)menu)->composite.children[i]);
+    for (i = 0; i < vidtune->num_infos; i++) {
+	Widget sme;
+
+	XmuSnprintf(label, sizeof(label), "%dx%d @ %d Hz",
+		    vidtune->infos[i]->hdisplay,
+		    vidtune->infos[i]->vdisplay,
+		    (int)((double)vidtune->infos[i]->dotclock /
+		    (double)vidtune->infos[i]->htotal * 1000.0 /
+		    (double)vidtune->infos[i]->vtotal));
+	sme = XtCreateManagedWidget(label, smeBSBObjectClass, menu, NULL, 0);
+	XtAddCallback(sme, XtNcallback, SelectCallback,
+		      (XtPointer)vidtune->infos[i]);
+    }
+
+    XmuSnprintf(label, sizeof(label), "%dx%d @ %d Hz",
+		modeline.hdisplay, modeline.vdisplay,
+		(int)((double)dot_clock / (double)modeline.htotal * 1000.0 /
+		(double)modeline.vtotal));
+    XtSetArg(args[0], XtNlabel, label);
+    XtSetValues(mode, args, 1);
+}
+
+static int do_force, asking_force;
+
+static void
+PopdownForce(Widget w, XtPointer user_data, XtPointer call_data)
+{
+    asking_force = 0;
+    XtPopdown(forceshell);
+    do_force = (int)user_data;
+}
+
+void
+CancelForceAddModeAction(Widget w, XEvent *event,
+			 String *params, Cardinal *num_params)
+{
+    PopdownForce(w, (XtPointer)False, NULL);
+}
+
+static int
+ForceAddMode(void)
+{
+    if (forceshell == NULL) {
+	Widget dialog;
+
+	forceshell = XtCreatePopupShell("force", transientShellWidgetClass,
+					toplevel, NULL, 0);
+	dialog = XtVaCreateManagedWidget("dialog", dialogWidgetClass,
+					 forceshell, XtNvalue, NULL, NULL, 0);
+	XawDialogAddButton(dialog, "yes", PopdownForce, (XtPointer)True);
+	XawDialogAddButton(dialog, "no", PopdownForce, (XtPointer)False);
+	XtRealizeWidget(forceshell);
+	XSetWMProtocols(DPY, XtWindow(forceshell), &wm_delete_window, 1);
+    }
+
+    asking_force = 1;
+
+    XtPopup(forceshell, XtGrabExclusive);
+    while (asking_force)
+	XtAppProcessEvent(XtWidgetToApplicationContext(forceshell), XtIMAll);
+
+    return (do_force);
+}
+
+/*ARGSUSED*/
+static void
+AddModeCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    if (vidtune && vidtune->monitor) {
+	char *label;
+	Arg args[1];
+	XF86ConfModeLinePtr mode;
+
+	XtSetArg(args[0], XtNstring, &label);
+	XtGetValues(text, args, 1);
+	if (*label == '\0') {
+	    XBell(XtDisplay(w), 80);
+	    return;
+	}	    
+	if (xf86FindModeLine(label, vidtune->monitor->mon_modeline_lst)
+	    != NULL && !ForceAddMode())
+	    return;
+
+	mode = (XF86ConfModeLinePtr)XtCalloc(1, sizeof(XF86ConfModeLineRec));
+	mode->ml_identifier = XtNewString(label);
+	mode->ml_clock = dot_clock;
+	mode->ml_hdisplay = modeline.hdisplay;
+	mode->ml_hsyncstart = modeline.hsyncstart;
+	mode->ml_hsyncend = modeline.hsyncend;
+	mode->ml_htotal = modeline.htotal;
+	mode->ml_vdisplay = modeline.vdisplay;
+	mode->ml_vsyncstart = modeline.vsyncstart;
+	mode->ml_vsyncend = modeline.vsyncend;
+	mode->ml_vtotal = modeline.vtotal;
+/*	mode->ml_vscan = ???;*/
+	mode->ml_flags = modeline.flags;
+	mode->ml_hskew = modeline.hskew;
+	vidtune->monitor->mon_modeline_lst =
+	    xf86AddModeLine(vidtune->monitor->mon_modeline_lst, mode);
+    }
+    else
+	XBell(XtDisplay(w), 80);
+}
+
+/*ARGSUSED*/
+static void
+StopTestCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    XtRemoveTimeOut(timeout);
+    TestTimeout((XtPointer)w, NULL);
+}
+
+/*ARGSUSED*/
+void
+CancelTestModeAction(Widget w, XEvent *event,
+		     String *params, Cardinal *num_params)
+{
+    StopTestCallback(w, NULL, NULL);
+}
+
+static void
+TestTimeout(XtPointer client_data, XtIntervalId* id)
+{
+    XF86VidModeModeLine mode;
+
+    XtPopdown(testshell);
+    timeout = 0;
+    memcpy(&mode, &modeline, sizeof(XF86VidModeModeLine));
+    memcpy(&modeline, &orig_modeline, sizeof(XF86VidModeModeLine));
+    ApplyCallback((Widget)client_data, NULL, NULL);
+/*    if (hitError == 0)*/
+	memcpy(&modeline, &mode, sizeof(XF86VidModeModeLine));
+    SetLabels();
+}
+
+static void
+TestCallback(Widget w, XtPointer call_data, XtPointer client_data)
+{
+    if (testshell == NULL) {
+	Widget dialog;
+
+	testshell = XtCreatePopupShell("test", transientShellWidgetClass,
+					toplevel, NULL, 0);
+	dialog = XtVaCreateManagedWidget("dialog", dialogWidgetClass,
+					 testshell, XtNvalue, NULL, NULL, 0);
+	XawDialogAddButton(dialog, "stop", StopTestCallback, NULL);
+	XtRealizeWidget(testshell);
+	XSetWMProtocols(DPY, XtWindow(testshell), &wm_delete_window, 1);
+    }
+
+    XtPopup(testshell, XtGrabExclusive);
+
+    XSync(XtDisplay(toplevel), False);
+    timeout = XtAppAddTimeOut(XtWidgetToApplicationContext(w),
+    /* the timeout probably shoud be converted to a resource */
+			      4000, TestTimeout, (XtPointer)w);
+    ApplyCallback(w, call_data, client_data);
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h	Thu May 18 09:30:00 2000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.1 2000/05/18 16:30:00 dawes Exp $
+ */
+
+#ifndef _xf86cfg_vidmode_h
+#define _xf86cfg_vidmode_h
+
+#include "xf86config.h"
+#include <X11/extensions/xf86vmode.h>
+
+/*
+ * Types
+ */
+struct _xf86cfgVidMode {
+    XF86ConfMonitorPtr monitor;
+    int screen;
+    int num_infos;
+    XF86VidModeModeInfo **infos;
+};
+
+/*
+ * Prototypes
+ */
+Bool VideoModeInitialize(void);
+void VideoModeConfigureStart(void);
+void VideoModeConfigureEnd(void);
+void VidmodeRestoreAction(Widget, XEvent*, String*, Cardinal*);
+void CancelForceAddModeAction(Widget, XEvent*, String*, Cardinal*);
+void CancelTestModeAction(Widget, XEvent*, String*, Cardinal*);
+
+/*
+ * Initialization
+ */
+extern Widget vtune;
+
+#endif /* _xf86cfg_vidmode_h */
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/wider.xbm
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/wider.xbm:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/wider.xbm	Thu May 18 09:30:00 2000
@@ -0,0 +1,8 @@
+#define wider_width 19
+#define wider_height 19
+static unsigned char wider_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x08, 0x00, 0xc0, 0x18, 0x00,
+   0xe0, 0x38, 0x00, 0xf0, 0x78, 0x00, 0xf8, 0xf8, 0x00, 0xfc, 0xff, 0x01,
+   0xfe, 0xff, 0x03, 0xff, 0xff, 0x07, 0xfe, 0xff, 0x03, 0xfc, 0xff, 0x01,
+   0xf8, 0xf8, 0x00, 0xf0, 0x78, 0x00, 0xe0, 0x38, 0x00, 0xc0, 0x18, 0x00,
+   0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man:1.1
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man	Tue Jun 13 16:15:52 2000
@@ -0,0 +1,121 @@
+.\"
+.\" Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+.\" CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+.\" SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of Conectiva Linux shall
+.\" not be used in advertising or otherwise to promote the sale, use or other
+.\" dealings in this Software without prior written authorization from
+.\" Conectiva Linux.
+.\"
+.\" Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+.\"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man,v 1.1 2000/06/13 23:15:52 dawes Exp $
+.\"
+.TH xf86cfg 1 "Version 4.0" "XFree86"
+.SH NAME
+xf86cfg - Graphical configuration tool for XFree86 4.0
+.SH SYNOPSIS
+.B xf86cfg
+[-xf86config \fIXF86Config\fP] [-toolkitoption ...]
+.SH DESCRITPION
+.I Xf86cfg
+is a tool to configure \fIXFree86 4.0\fP, and can be used to either write the
+initial configuration file or make customizations to the current configuration.
+.PP
+When the \fBDISPLAY\fP environment variable is not set, xf86cfg will run
+the command \fIXFree86 -configure\fP to allow the xserver detect the
+hardware in the computer, and write an initial \fIXF86Config\fP file
+in the user's home directory. Then, it will start XFree86 and allow
+customizations.
+.br
+If the \fBDISPLAY\fP environment variable is set, xf86cfg will read the
+default \fIXF86Config\fP, that may not be the same being used by the current
+server, and allow customizations.
+.PP
+Unless there is an \fBApply\fP button in the current xf86cfg dialog, the
+changes made will take place the next time \fIXFree86\fP is started.
+
+.PP
+Xf86cfg allows addition and configuration of new devices, such as video cards,
+monitors, keyboards and mouses.
+.PP
+Screen layout configuration for xinerama or traditional multi-head is also
+available.
+.PP
+Modelines can be configured or optimized.
+.PP
+AccessX basic configurations can be made in the xf86cfg's accessx section.
+
+.SH ENVIRONMENT
+.TP 8
+.I DISPLAY
+Default host and display number
+.TP 8
+.I XENVIRONMENT
+Name of a resource file that overrides the global resources
+stored in the RESOURCE_MANAGER property
+
+.SH FILES
+.TP 8
+.I /etc/XF86Config
+Server configuration file
+.TP 8
+.I /etc/X11/XF86Config
+Server configuration file
+.TP 8
+.I /usr/X11R6/etc/XF86Config
+Server configuration file
+.TP 8
+.I <XRoot>/lib/X11/XF86Config.\fIhostname\fP
+Server configuration file
+.TP 8
+.I <XRoot>/lib/X11/XF86Config
+Server configuration file
+.TP 8
+.I <XRoot>/lib/X11/app-default/XF86Cfg
+Specifies xf86cfg resources
+.TP 8
+.I <Xroot>/lib/X11/xkb/X0-config.keyboard
+Keyboard specific configuration
+
+.SH "SEE ALSO"
+.IR XFree86 (1)
+.IR XF86Config (5x)
+
+.SH RESTRICTIONS
+Not all customizable options are available.
+.br
+A protocol for external modules is in the plans.
+
+.SH COPYRIGHT
+.TP 8
+Copyright 2000, Conectiva Linux S.A.
+\fIhttp://www.conectiva.com\fP
+.TP 8
+Copyright 2000, The XFree86 Project
+\fIhttp://www.XFree86.org\fP
+
+.SH AUTHORS
+.TP 8
+Paulo César Pereira de Andrade \fI<pcpa@conectiva.com.br>\fP
+The XFree86 Project
+
+.SH BUGS
+Probably.
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c	Thu May 18 09:30:01 2000
@@ -0,0 +1,595 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.2 2000/05/18 16:30:01 dawes Exp $
+ */
+
+#include "xf86config.h"
+
+/*
+ * Implementation
+ */
+int
+ErrorF(const char *fmt, ...)
+{
+    int retval;
+    va_list ap;
+
+    Va_start(ap, fmt);
+    retval = vfprintf(stderr, fmt, ap);
+
+    va_end(ap);
+
+    return (retval);
+}
+
+int
+VErrorF(const char *fmt, va_list ap)
+{
+    int retval;
+
+    retval = vfprintf(stderr, fmt, ap);
+
+    return (retval);
+}
+
+int
+xf86RemoveOption(XF86OptionPtr *options, char *name)
+{
+    XF86OptionPtr opt = *options, prev = opt;
+
+    while (opt) {
+	if (strcasecmp(opt->opt_name, name) == 0) {
+	    XtFree(opt->opt_name);
+	    XtFree(opt->opt_val);
+	    XtFree(opt->opt_comment);
+	    if (opt == prev)
+		*options = (XF86OptionPtr)(opt->list.next);
+	    else
+		prev->list.next = opt->list.next;
+	    XtFree((XtPointer)opt);
+
+	    return (True);
+	}
+
+	prev = opt;
+	opt = (XF86OptionPtr)(opt->list.next);
+    }
+
+    return (False);
+}
+
+int
+xf86RemoveInput(XF86ConfigPtr config, XF86ConfInputPtr input)
+{
+    XF86ConfInputPtr prev, inp = config->conf_input_lst;
+    XF86ConfLayoutPtr lay = config->conf_layout_lst;
+
+    /* remove from main structure */
+    prev = inp;
+    while (inp != NULL) {
+	if (inp == input) {
+	    if (inp == prev)
+		config->conf_input_lst = (XF86ConfInputPtr)(inp->list.next);
+	    else
+		prev->list.next = inp->list.next;
+	    break;
+	}
+	prev = inp;
+	inp = (XF86ConfInputPtr)(inp->list.next);
+    }
+
+    if (inp == NULL)
+	return (False);
+
+    /* remove references */
+    while (lay != NULL) {
+	xf86RemoveInputRef(lay, inp);
+	lay = (XF86ConfLayoutPtr)(lay->list.next);
+    }
+
+    XtFree(inp->inp_identifier);
+    XtFree(inp->inp_driver);
+    XtFree(inp->inp_comment);
+    xf86OptionListFree(inp->inp_option_lst);
+    XtFree((XtPointer)inp);
+
+    return (True);
+}
+
+int
+xf86RemoveInputRef(XF86ConfLayoutPtr layout, XF86ConfInputPtr input)
+{
+    XF86ConfInputrefPtr prev, iref = layout->lay_input_lst;
+
+    prev = iref;
+    while (iref != NULL) {
+	if (iref->iref_inputdev == input) {
+	    XtFree(iref->iref_inputdev_str);
+	    xf86OptionListFree(iref->iref_option_lst);
+	    if (prev == iref)
+		layout->lay_input_lst =
+		    (XF86ConfInputrefPtr)(iref->list.next);
+	    else
+		prev->list.next = iref->list.next;
+	    XtFree((XtPointer)iref);
+
+	    return (True);
+	}
+	prev = iref;
+	iref = (XF86ConfInputrefPtr)(iref->list.next);
+    }
+
+    return (False);
+}
+
+int
+xf86RemoveDevice(XF86ConfigPtr config, XF86ConfDevicePtr device)
+{
+    XF86ConfDevicePtr prev, dev = config->conf_device_lst;
+    XF86ConfScreenPtr psc, scr = config->conf_screen_lst;
+
+    /* remove from main structure */
+    prev = dev;
+    while (dev != NULL) {
+	if (dev == device) {
+	    if (dev == prev)
+		config->conf_device_lst = (XF86ConfDevicePtr)(dev->list.next);
+	    else
+		prev->list.next = dev->list.next;
+	    break;
+	}
+	prev = dev;
+	dev = (XF86ConfDevicePtr)(dev->list.next);
+    }
+
+    if (dev == NULL)
+	return (False);
+
+    /* remove references */
+    psc = scr;
+    while (scr != NULL) {
+	if (scr->scrn_device == device) {
+	    xf86RemoveScreen(config, scr);
+	    if (scr == psc)
+		scr = config->conf_screen_lst;
+	    else
+		scr = psc;
+	    continue;
+	}
+	psc = scr;
+	scr = (XF86ConfScreenPtr)(scr->list.next);
+    }
+
+    XtFree(dev->dev_identifier);
+    XtFree(dev->dev_vendor);
+    XtFree(dev->dev_board);
+    XtFree(dev->dev_chipset);
+    XtFree(dev->dev_busid);
+    XtFree(dev->dev_card);
+    XtFree(dev->dev_driver);
+    XtFree(dev->dev_ramdac);
+    XtFree(dev->dev_clockchip);
+    XtFree(dev->dev_comment);
+    xf86OptionListFree(dev->dev_option_lst);
+    XtFree((XtPointer)dev);
+
+    return (True);
+}
+
+int
+xf86RemoveMonitor(XF86ConfigPtr config, XF86ConfMonitorPtr monitor)
+{
+    XF86ConfMonitorPtr prev, mon = config->conf_monitor_lst;
+    XF86ConfScreenPtr psc, scr = config->conf_screen_lst;
+
+    /* remove from main structure */
+    prev = mon;
+    while (mon != NULL) {
+	if (mon == monitor) {
+	    if (mon == prev)
+		config->conf_monitor_lst = (XF86ConfMonitorPtr)(mon->list.next);
+	    else
+		prev->list.next = mon->list.next;
+	    break;
+	}
+	prev = mon;
+	mon = (XF86ConfMonitorPtr)(mon->list.next);
+    }
+
+    if (mon == NULL)
+	return (False);
+
+    /* remove references */
+    psc = scr;
+    while (scr != NULL) {
+	if (scr->scrn_monitor == monitor) {
+	    xf86RemoveScreen(config, scr);
+	    if (scr == psc)
+		scr = config->conf_screen_lst;
+	    else
+		scr = psc;
+	    continue;
+	}
+	psc = scr;
+	scr = (XF86ConfScreenPtr)(scr->list.next);
+    }
+
+    XtFree(mon->mon_identifier);
+    XtFree(mon->mon_vendor);
+    XtFree(mon->mon_modelname);
+    XtFree(mon->mon_comment);
+    xf86OptionListFree(mon->mon_option_lst);
+    XtFree((XtPointer)mon);
+
+    return (True);
+}
+
+int
+xf86RemoveScreen(XF86ConfigPtr config, XF86ConfScreenPtr screen)
+{
+    XF86ConfScreenPtr prev, scrn;
+    XF86ConfLayoutPtr lay;
+
+    if (config == NULL || screen == NULL)
+	return (False);
+
+    lay = config->conf_layout_lst;
+    prev = scrn = config->conf_screen_lst;
+
+    while (scrn != NULL) {
+	if (scrn == screen) {
+	    if (scrn == prev)
+		config->conf_screen_lst = (XF86ConfScreenPtr)(scrn->list.next);
+	    else
+		prev->list.next = scrn->list.next;
+	    break;
+	}
+	prev = scrn;
+	scrn = (XF86ConfScreenPtr)(scrn->list.next);
+    }
+
+
+    while (lay != NULL) {
+	XF86ConfAdjacencyPtr pad, ad = NULL, adj = lay->lay_adjacency_lst;
+
+	pad = adj;
+	while (adj) {
+	    if (adj->adj_screen == screen)
+		ad = adj;
+	    else {
+		if (adj->adj_top != NULL && adj->adj_top == screen) {
+		    XtFree(adj->adj_top_str);
+		    adj->adj_top_str = NULL;
+		    adj->adj_top = NULL;
+		}
+		else if (adj->adj_bottom != NULL && adj->adj_bottom == screen) {
+		    XtFree(adj->adj_bottom_str);
+		    adj->adj_bottom_str = NULL;
+		    adj->adj_bottom = NULL;
+		}
+		else if (adj->adj_left != NULL && adj->adj_left == screen) {
+		    XtFree(adj->adj_left_str);
+		    adj->adj_left_str = NULL;
+		    adj->adj_left = NULL;
+		}
+		else if (adj->adj_right != NULL && adj->adj_right == screen) {
+		    XtFree(adj->adj_right_str);
+		    adj->adj_right_str = NULL;
+		    adj->adj_right = NULL;
+		}
+		else if (adj->adj_refscreen != NULL &&
+		    strcasecmp(scrn->scrn_identifier,
+			       adj->adj_refscreen) == 0) {
+		    XtFree(adj->adj_refscreen);
+		    adj->adj_refscreen = NULL;
+		    adj->adj_where = CONF_ADJ_ABSOLUTE;
+		    adj->adj_x = adj->adj_y = 0;
+		}
+	    }
+	    if (ad == NULL)
+		pad = adj;
+	    adj = (XF86ConfAdjacencyPtr)(adj->list.next);
+	}
+
+	if (ad != NULL) {
+	    if (ad == lay->lay_adjacency_lst)
+		lay->lay_adjacency_lst = (XF86ConfAdjacencyPtr)(ad->list.next);
+	    else
+		pad->list.next = (XF86ConfAdjacencyPtr)(ad->list.next);
+	    XtFree(ad->adj_screen_str);
+	    XtFree(ad->adj_top_str);
+	    XtFree(ad->adj_bottom_str);
+	    XtFree(ad->adj_left_str);
+	    XtFree(ad->adj_right_str);
+	    XtFree(ad->adj_refscreen);
+	    XtFree((XtPointer)ad);
+	}
+
+	lay = (XF86ConfLayoutPtr)(lay->list.next);
+    }
+
+    XtFree(screen->scrn_identifier);
+    XtFree(screen->scrn_obso_driver);
+    XtFree(screen->scrn_monitor_str);
+    XtFree(screen->scrn_device_str);
+    xf86OptionListFree(screen->scrn_option_lst);
+    XtFree((XtPointer)screen);
+
+    return (True);
+}
+
+int
+xf86RemoveAdjacency(XF86ConfLayoutPtr layout, XF86ConfAdjacencyPtr adjacency)
+{
+    XF86ConfAdjacencyPtr prev, adj = layout->lay_adjacency_lst;
+
+    if (layout == NULL || adjacency == NULL)
+	return (False);
+
+    prev = adj;
+    while (adj != NULL) {
+	if (adj == adjacency)
+	    break;
+	prev = adj;
+	adj = (XF86ConfAdjacencyPtr)(adj->list.next);
+    }
+    if (adj == NULL)
+	return (False);
+
+    XtFree(adj->adj_screen_str);
+    XtFree(adj->adj_top_str);
+    XtFree(adj->adj_bottom_str);
+    XtFree(adj->adj_left_str);
+    XtFree(adj->adj_right_str);
+    XtFree(adj->adj_refscreen);
+    if (prev == adj)
+	layout->lay_adjacency_lst = (XF86ConfAdjacencyPtr)(adj->list.next);
+    else
+	prev->list.next = adj->list.next;
+    XtFree((XtPointer)adj);
+
+    return (True);
+}
+
+int
+xf86RemoveInactive(XF86ConfLayoutPtr layout, XF86ConfInactivePtr inactive)
+{
+    XF86ConfInactivePtr prev, inac = layout->lay_inactive_lst;
+
+    if (layout == NULL || inactive == NULL)
+	return (False);
+
+    prev = inac;
+    while (inac != NULL) {
+	if (inac == inactive)
+	    break;
+	prev = inac;
+	inac = (XF86ConfInactivePtr)(inac->list.next);
+    }
+    if (inac == NULL)
+	return (False);
+
+    XtFree(inac->inactive_device_str);
+    if (prev == inac)
+	layout->lay_inactive_lst = (XF86ConfInactivePtr)(inac->list.next);
+    else
+	prev->list.next = inac->list.next;
+    XtFree((XtPointer)inac);
+
+    return (True);
+}
+
+int
+xf86RemoveLayout(XF86ConfigPtr config, XF86ConfLayoutPtr layout)
+{
+    XF86ConfLayoutPtr prev, lay = config->conf_layout_lst;
+    XF86ConfAdjacencyPtr adj, nadj;
+    XF86ConfInactivePtr inac, ninac;
+    XF86ConfInputrefPtr iref, niref;
+
+    if (config == NULL || layout == NULL)
+	return (False);
+
+    prev = lay;
+    while (lay != NULL) {
+	if (lay == layout)
+	    break;
+	prev = lay;
+	lay = (XF86ConfLayoutPtr)(lay->list.next);
+    }
+
+    if (lay == NULL)
+	return (False);
+
+    adj = lay->lay_adjacency_lst;
+    while (adj != NULL) {
+	nadj = (XF86ConfAdjacencyPtr)(adj->list.next);
+	xf86RemoveAdjacency(lay, adj);
+	adj = nadj;
+    }
+
+    inac = lay->lay_inactive_lst;
+    while (inac != NULL) {
+	ninac = (XF86ConfInactivePtr)(inac->list.next);
+	xf86RemoveInactive(lay, inac);
+	inac = ninac;
+    }
+
+    iref = lay->lay_input_lst;
+    while (iref != NULL) {
+	niref = (XF86ConfInputrefPtr)(iref->list.next);
+	xf86RemoveInputRef(lay, iref->iref_inputdev);
+	iref = niref;
+    }
+
+    xf86OptionListFree(lay->lay_option_lst);
+
+    if (prev == lay)
+	config->conf_layout_lst = (XF86ConfLayoutPtr)(lay->list.next);
+    else
+	prev->list.next = lay->list.next;
+    XtFree(lay->lay_identifier);
+    XtFree((XtPointer)lay);
+
+    return (True);
+}
+
+int
+xf86RenameInput(XF86ConfigPtr config, XF86ConfInputPtr input, char *name)
+{
+    XF86ConfLayoutPtr lay = config->conf_layout_lst;
+
+    if (config == NULL || input == NULL || name == NULL || *name == '\0')
+	return (False);
+
+    while (lay != NULL) {
+	XF86ConfInputrefPtr iref = lay->lay_input_lst;
+
+	while (iref != NULL) {
+	    if (strcasecmp(input->inp_identifier, iref->iref_inputdev_str) == 0) {
+		XtFree(iref->iref_inputdev_str);
+		iref->iref_inputdev_str = XtNewString(name);
+	    }
+	    iref = (XF86ConfInputrefPtr)(iref->list.next);
+	}
+	lay = (XF86ConfLayoutPtr)(lay->list.next);
+    }
+
+    XtFree(input->inp_identifier);
+    input->inp_identifier = XtNewString(name);
+
+    return (True);
+}
+
+int
+xf86RenameDevice(XF86ConfigPtr config, XF86ConfDevicePtr dev, char *name)
+{
+    XF86ConfScreenPtr scr = config->conf_screen_lst;
+
+    if (config == NULL || dev == NULL || name == NULL || *name == '\0')
+	return (False);
+
+    while (scr != NULL) {
+	if (scr->scrn_device == dev) {
+	    XtFree(scr->scrn_device_str);
+	    scr->scrn_device_str = XtNewString(name);
+	}
+
+	scr = (XF86ConfScreenPtr)(scr->list.next);
+    }
+
+    XtFree(dev->dev_identifier);
+    dev->dev_identifier = XtNewString(name);
+
+    return (True);
+}
+
+int
+xf86RenameMonitor(XF86ConfigPtr config, XF86ConfMonitorPtr mon, char *name)
+{
+    XF86ConfScreenPtr scr = config->conf_screen_lst;
+
+    if (config == NULL || mon == NULL || name == NULL || *name == '\0')
+	return (False);
+
+    while (scr != NULL) {
+	if (scr->scrn_monitor == mon) {
+	    XtFree(scr->scrn_monitor_str);
+	    scr->scrn_monitor_str = XtNewString(name);
+	}
+
+	scr = (XF86ConfScreenPtr)(scr->list.next);
+    }
+
+    XtFree(mon->mon_identifier);
+    mon->mon_identifier = XtNewString(name);
+
+    return (True);
+}
+
+int
+xf86RenameLayout(XF86ConfigPtr config, XF86ConfLayoutPtr layout, char *name)
+{
+    if (config == NULL || layout == NULL || name == NULL || *name == '\0')
+	return (False);
+
+    XtFree(layout->lay_identifier);
+    layout->lay_identifier = XtNewString(name);
+
+    return (True);
+}
+
+int
+xf86RenameScreen(XF86ConfigPtr config, XF86ConfScreenPtr scrn, char *name)
+{
+    XF86ConfLayoutPtr lay = config->conf_layout_lst;
+
+    if (config == NULL || scrn == NULL || name == NULL || *name == '\0')
+	return (False);
+
+    while (lay != NULL) {
+	XF86ConfAdjacencyPtr adj = lay->lay_adjacency_lst;
+
+	while (adj != NULL) {
+	    if (adj->adj_screen == scrn) {
+		XtFree(adj->adj_screen_str);
+		adj->adj_screen_str = XtNewString(name);
+	    }
+	    else if (adj->adj_top == scrn) {
+		XtFree(adj->adj_top_str);
+		adj->adj_top_str = XtNewString(name);
+	    }
+	    else if (adj->adj_bottom == scrn) {
+		XtFree(adj->adj_bottom_str);
+		adj->adj_bottom_str = XtNewString(name);
+	    }
+	    else if (adj->adj_left == scrn) {
+		XtFree(adj->adj_left_str);
+		adj->adj_left_str = XtNewString(name);
+	    }
+	    else if (adj->adj_right == scrn) {
+		XtFree(adj->adj_right_str);
+		adj->adj_right_str = XtNewString(name);
+	    }
+	    else if (adj->adj_refscreen != NULL &&
+		     strcasecmp(adj->adj_refscreen, name) == 0) {
+		XtFree(adj->adj_refscreen);
+		adj->adj_refscreen = XtNewString(name);
+	    }
+
+	    adj = (XF86ConfAdjacencyPtr)(adj->list.next);
+	}
+	lay = (XF86ConfLayoutPtr)(lay->list.next);
+    }
+
+    XtFree(scrn->scrn_identifier);
+    scrn->scrn_identifier = XtNewString(name);
+
+    return (True);
+}
Index: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h:1.2
--- /dev/null	Sat Jul  1 20:43:41 2000
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h	Thu May 18 09:30:01 2000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of Conectiva Linux shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from
+ * Conectiva Linux.
+ *
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ *
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.2 2000/05/18 16:30:01 dawes Exp $
+ */
+
+#include "config.h"
+
+#define xf86OptionListFree OptionListFree
+#define xf86AddInput(head, ptr)		\
+	(XF86ConfInputPtr)addListItem((GenericListPtr)(head), (GenericListPtr)(ptr))
+#define xf86AddInputref(head, ptr)	\
+	(XF86ConfInputrefPtr)addListItem((GenericListPtr)(head), (GenericListPtr)(ptr))
+#define xf86AddDevice(head, ptr)	\
+	(XF86ConfDevicePtr)addListItem((GenericListPtr)(head), (GenericListPtr)(ptr))
+#define xf86AddMonitor(head, ptr)	\
+	(XF86ConfMonitorPtr)addListItem((GenericListPtr)(head), (GenericListPtr)(ptr))
+#define xf86AddScreen(head, ptr)	\
+	(XF86ConfScreenPtr)addListItem((GenericListPtr)(head), (GenericListPtr)(ptr))
+#define xf86AddLayout(head, ptr)	\
+	(XF86ConfLayoutPtr)addListItem((GenericListPtr)(head), (GenericListPtr)(ptr))
+#define xf86AddModeLine(head, ptr)	\
+	(XF86ConfModeLinePtr)addListItem((GenericListPtr)(head), (GenericListPtr)(ptr))
+#define xf86NewOption NewOption
+#define xf86addNewOption addNewOption
+#define xf86FindOption FindOption
+
+int ErrorF(const char*, ...);
+int VErrorF(const char*, va_list);
+int xf86RemoveOption(XF86OptionPtr*, char*);
+int xf86RemoveInput(XF86ConfigPtr, XF86ConfInputPtr);
+int xf86RemoveInputRef(XF86ConfLayoutPtr, XF86ConfInputPtr);
+int xf86RemoveDevice(XF86ConfigPtr, XF86ConfDevicePtr);
+int xf86RemoveMonitor(XF86ConfigPtr, XF86ConfMonitorPtr);
+int xf86RemoveScreen(XF86ConfigPtr, XF86ConfScreenPtr);
+int xf86RemoveAdjacency(XF86ConfLayoutPtr, XF86ConfAdjacencyPtr);
+int xf86RemoveInactive(XF86ConfLayoutPtr, XF86ConfInactivePtr);
+int xf86RemoveLayout(XF86ConfigPtr, XF86ConfLayoutPtr);
+
+int xf86RenameInput(XF86ConfigPtr, XF86ConfInputPtr, char*);
+int xf86RenameDevice(XF86ConfigPtr, XF86ConfDevicePtr, char*);
+int xf86RenameMonitor(XF86ConfigPtr, XF86ConfMonitorPtr, char*);
+int xf86RenameLayout(XF86ConfigPtr, XF86ConfLayoutPtr, char*);
+int xf86RenameScreen(XF86ConfigPtr, XF86ConfScreenPtr, char*);
Index: xc/programs/Xserver/hw/xfree86/xf86config/Cards
diff -u xc/programs/Xserver/hw/xfree86/xf86config/Cards:3.67 xc/programs/Xserver/hw/xfree86/xf86config/Cards:3.69
--- xc/programs/Xserver/hw/xfree86/xf86config/Cards:3.67	Fri Feb 11 18:54:45 2000
+++ xc/programs/Xserver/hw/xfree86/xf86config/Cards	Fri Mar 31 12:13:40 2000
@@ -18,7 +18,7 @@
 # The majority of entries are just a binding of a model name to a
 # chipset/server and untested.
 #
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.67 2000/02/12 02:54:45 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.69 2000/03/31 20:13:40 dawes Exp $
 
 # VGA
 
@@ -1648,335 +1648,129 @@
 NAME ATI Graphics Ultra
 CHIPSET ATI-Mach8
 SERVER Mach8
-DRIVER vga
-UNSUPPORTED
-LINE     #Probable clocks:
-LINE     #Clocks 43 49 80 36 50 56 0 45 30 32 110 79 40 45 75 65
-LINE     #Clocks 22 25 46 18 25 28 0 22 15 16  55 40 20 22 38 32
+DRIVER ati
 
 NAME ATI Graphics Ultra Pro
 CHIPSET ATI-Mach32
 SERVER Mach32
-DRIVER vga
-UNSUPPORTED
-LINE     #Probable clocks:
-LINE     #Clocks 100 126 92 36 51 57 0 44 135 32 110 80 39
-LINE     #Clocks 45 75 65 50 63 46 18 25 28 0 22 67 16 55 40 19 23 37 33
-LINE     #Option "dac_8_bit"
+DRIVER ati
 
 NAME ATI Wonder SVGA
 CHIPSET ATI vgawonder
 SERVER SVGA
-DRIVER vga
-UNSUPPORTED
-LINE     #probable clocks:
-LINE     #Clocks 30 32 11 80 42 48 92 36 40 45 75 65 50 56 0 0
-LINE     #Clocks 15 16 55 0  21 24 46 18 20 22 37 32 25 28 0 0
+DRIVER ati
 
 NAME ATI Ultra Plus
 CHIPSET ATI-Mach32
 SERVER Mach32
-DRIVER vga
-UNSUPPORTED
+DRIVER ati
 
 NAME ATI Mach32
 CHIPSET ATI-Mach32
 SERVER Mach32
-DRIVER vga
-UNSUPPORTED
+DRIVER ati
 
 NAME ATI Mach64
 CHIPSET ATI-Mach64
 SERVER Mach64
-DRIVER vga
-UNSUPPORTED
+DRIVER ati
 NOCLOCKPROBE
 
-NAME ATI Mach64 with ATI68860 RAMDAC
-LINE     #Ramdac "ati68860"
-SEE ATI Mach64
-
-NAME ATI Mach64 with ATI68860B RAMDAC
-LINE     #Ramdac "ati68860b"
-SEE ATI Mach64
-
-NAME ATI Mach64 with ATI68860C RAMDAC
-LINE     #Ramdac "ati68860c"
-SEE ATI Mach64
-
-NAME ATI Mach64 with ATI68875 RAMDAC
-LINE     #Ramdac "ati68875"
-SEE ATI Mach64
-
-NAME ATI Mach64 with AT&T 20C408 RAMDAC
-LINE     #Ramdac "att20c408"
-SEE ATI Mach64
-
-NAME ATI Mach64 with CH8398 RAMDAC
-LINE     #Ramdac "ch8398"
-SEE ATI Mach64
-
-NAME ATI Mach64 with IBM RGB514 RAMDAC
-LINE     #Ramdac "ibm_rgb514"
-SEE ATI Mach64
-
-NAME ATI Mach64 with STG1702 RAMDAC
-LINE     #Ramdac "stg1702"
-SEE ATI Mach64
-
-NAME ATI Mach64 with STG1703 RAMDAC
-LINE     #Ramdac "stg1703"
-SEE ATI Mach64
-
-NAME ATI Mach64 with TLC34075 RAMDAC
-LINE     #Ramdac "tlc34075"
-SEE ATI Mach64
-
-NAME ATI Mach64 with Internal RAMDAC
-SEE ATI Mach64
-
 NAME ATI Mach64 CT (264CT)
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Mach64 VT (264VT)
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Mach64 GT (264GT), aka 3D RAGE
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Mach64 3D RAGE II
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Mach64 3D RAGE II+DVD
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Mach64 3D Rage IIC
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Mach64 3D Rage Pro
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI 3D Pro Turbo
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI 3D Pro Turbo PC2TV
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI 3D Xpression
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI 3D Xpression+
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI 3D Xpression+ PC2TV
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI All-in-Wonder
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI All-in-Wonder Pro
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Graphics Pro Turbo
 SEE ATI Mach64
 
-NAME ATI Graphics Pro Turbo with ATI68860 RAMDAC
-SEE ATI Mach64 with ATI68860 RAMDAC
-
-NAME ATI Graphics Pro Turbo with ATI68860B RAMDAC
-SEE ATI Mach64 with ATI68860B RAMDAC
-
-NAME ATI Graphics Pro Turbo with ATI68860C RAMDAC
-SEE ATI Mach64 with ATI68860C RAMDAC
-
-NAME ATI Graphics Pro Turbo with ATI68875 RAMDAC
-SEE ATI Mach64 with ATI68875 RAMDAC
-
-NAME ATI Graphics Pro Turbo with AT&T 20C408 RAMDAC
-SEE ATI Mach64 with AT&T 20C408 RAMDAC
-
-NAME ATI Graphics Pro Turbo with CH8398 RAMDAC
-SEE ATI Mach64 with CH8398 RAMDAC
-
-NAME ATI Graphics Pro Turbo with STG1702 RAMDAC
-SEE ATI Mach64 with STG1702 RAMDAC
-
-NAME ATI Graphics Pro Turbo with STG1703 RAMDAC
-SEE ATI Mach64 with STG1703 RAMDAC
-
-NAME ATI Graphics Pro Turbo with TLC34075 RAMDAC
-SEE ATI Mach64 with TLC34075 RAMDAC
-
 NAME ATI Graphics Pro Turbo 1600
-SEE ATI Mach64 with IBM RGB514 RAMDAC
+SEE ATI Mach64
 
 NAME ATI Graphics Xpression
 SEE ATI Mach64
 
-NAME ATI Graphics Xpression with ATI68860 RAMDAC
-SEE ATI Mach64 with ATI68860 RAMDAC
-
-NAME ATI Graphics Xpression with ATI68860B RAMDAC
-SEE ATI Mach64 with ATI68860B RAMDAC
-
-NAME ATI Graphics Xpression with ATI68860C RAMDAC
-SEE ATI Mach64 with ATI68860C RAMDAC
-
-NAME ATI Graphics Xpression with ATI68875 RAMDAC
-SEE ATI Mach64 with ATI68875 RAMDAC
-
-NAME ATI Graphics Xpression with AT&T 20C408 RAMDAC
-SEE ATI Mach64 with AT&T 20C408 RAMDAC
-
-NAME ATI Graphics Xpression with CH8398 RAMDAC
-SEE ATI Mach64 with CH8398 RAMDAC
-
-NAME ATI Graphics Xpression with STG1702 RAMDAC
-SEE ATI Mach64 with STG1702 RAMDAC
-
-NAME ATI Graphics Xpression with STG1703 RAMDAC
-SEE ATI Mach64 with STG1703 RAMDAC
-
-NAME ATI Graphics Xpression with TLC34075 RAMDAC
-SEE ATI Mach64 with TLC34075 RAMDAC
-
-NAME ATI Graphics Xpression with Mach64 CT (264CT)
-SEE ATI Mach64 with Internal RAMDAC
-
 NAME ATI Video Boost
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Video Charger
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Video Xpression
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Video Xpression+
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI WinBoost
 SEE ATI Mach64
 
-NAME ATI WinBoost with ATI68860 RAMDAC
-SEE ATI Mach64 with ATI68860 RAMDAC
-
-NAME ATI WinBoost with ATI68860B RAMDAC
-SEE ATI Mach64 with ATI68860B RAMDAC
-
-NAME ATI WinBoost with ATI68860C RAMDAC
-SEE ATI Mach64 with ATI68860C RAMDAC
-
-NAME ATI WinBoost with ATI68875 RAMDAC
-SEE ATI Mach64 with ATI68875 RAMDAC
-
-NAME ATI WinBoost with AT&T 20C408 RAMDAC
-SEE ATI Mach64 with AT&T 20C408 RAMDAC
-
-NAME ATI WinBoost with CH8398 RAMDAC
-SEE ATI Mach64 with CH8398 RAMDAC
-
-NAME ATI WinBoost with STG1702 RAMDAC
-SEE ATI Mach64 with STG1702 RAMDAC
-
-NAME ATI WinBoost with STG1703 RAMDAC
-SEE ATI Mach64 with STG1703 RAMDAC
-
-NAME ATI WinBoost with TLC34075 RAMDAC
-SEE ATI Mach64 with TLC34075 RAMDAC
-
-NAME ATI WinBoost with Mach64 CT (264CT)
-SEE ATI Mach64 with Internal RAMDAC
-
 NAME ATI WinCharger
 SEE ATI Mach64
 
-NAME ATI WinCharger with ATI68860 RAMDAC
-SEE ATI Mach64 with ATI68860 RAMDAC
-
-NAME ATI WinCharger with ATI68860B RAMDAC
-SEE ATI Mach64 with ATI68860B RAMDAC
-
-NAME ATI WinCharger with ATI68860C RAMDAC
-SEE ATI Mach64 with ATI68860C RAMDAC
-
-NAME ATI WinCharger with ATI68875 RAMDAC
-SEE ATI Mach64 with ATI68875 RAMDAC
-
-NAME ATI WinCharger with AT&T 20C408 RAMDAC
-SEE ATI Mach64 with AT&T 20C408 RAMDAC
-
-NAME ATI WinCharger with CH8398 RAMDAC
-SEE ATI Mach64 with CH8398 RAMDAC
-
-NAME ATI WinCharger with STG1702 RAMDAC
-SEE ATI Mach64 with STG1702 RAMDAC
-
-NAME ATI WinCharger with STG1703 RAMDAC
-SEE ATI Mach64 with STG1703 RAMDAC
-
-NAME ATI WinCharger with TLC34075 RAMDAC
-SEE ATI Mach64 with TLC34075 RAMDAC
-
-NAME ATI WinCharger with Mach64 CT (264CT)
-SEE ATI Mach64 with Internal RAMDAC
-
 NAME ATI WinTurbo
 SEE ATI Mach64
 
-NAME ATI WinTurbo with ATI68860 RAMDAC
-SEE ATI Mach64 with ATI68860 RAMDAC
-
-NAME ATI WinTurbo with ATI68860B RAMDAC
-SEE ATI Mach64 with ATI68860B RAMDAC
-
-NAME ATI WinTurbo with ATI68860C RAMDAC
-SEE ATI Mach64 with ATI68860C RAMDAC
-
-NAME ATI WinTurbo with ATI68875 RAMDAC
-SEE ATI Mach64 with ATI68875 RAMDAC
-
-NAME ATI WinTurbo with AT&T 20C408 RAMDAC
-SEE ATI Mach64 with AT&T 20C408 RAMDAC
-
-NAME ATI WinTurbo with CH8398 RAMDAC
-SEE ATI Mach64 with CH8398 RAMDAC
-
-NAME ATI WinTurbo with STG1702 RAMDAC
-SEE ATI Mach64 with STG1702 RAMDAC
-
-NAME ATI WinTurbo with STG1703 RAMDAC
-SEE ATI Mach64 with STG1703 RAMDAC
-
-NAME ATI WinTurbo with TLC34075 RAMDAC
-SEE ATI Mach64 with TLC34075 RAMDAC
-
-NAME ATI WinTurbo with Mach64 CT (264CT)
-SEE ATI Mach64 with Internal RAMDAC
-
 NAME ATI Xpert 98
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Xpert XL
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Xpert@Play
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Xpert@Play 98
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI Xpert@Work
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ATI integrated on Intel Maui MU440EX motherboard
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ASUS PCI-V264CT
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 NAME ASUS PCI-AV264CT
-SEE ATI Mach64 with Internal RAMDAC
+SEE ATI Mach64
 
 # AGX
 
@@ -2793,6 +2587,12 @@
 
 NAME RIVA TNT2
 CHIPSET RIVATNT2
+SERVER SVGA
+DRIVER nv
+NOCLOCKPROBE
+
+NAME NVIDIA GeForce
+CHIPSET GeForce
 SERVER SVGA
 DRIVER nv
 NOCLOCKPROBE
Index: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile
diff -u xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:3.6 xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:3.7
--- xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:3.6	Sun Dec 22 23:04:41 1996
+++ xc/programs/Xserver/hw/xfree86/xf86config/Imakefile	Wed Apr  5 11:14:00 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.6 1996/12/23 07:04:41 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.7 2000/04/05 18:14:00 dawes Exp $
 
 
 
@@ -13,10 +13,16 @@
       CARDDBFILE = $(LIBDIR)/Cards
          DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"'
 
+#if !defined(OS2Architecture)
 AllTarget(ProgramTargetName(xf86config))
 
 NormalProgramTarget(xf86config,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
 InstallProgram(xf86config,$(BINDIR))
+#else
+all::
+
+InstallNamedProg(xf86config.cmd,xf86config.cmd,$(BINDIR))
+#endif
 DependTarget()
 
 InstallNonExecFile(Cards,$(LIBDIR))
Index: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
diff -u xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c:3.51 xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c:3.53
--- xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c:3.51	Sat Jan 22 21:24:05 2000
+++ xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c	Tue Jun 13 17:16:13 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.51 2000/01/23 05:24:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.53 2000/06/14 00:16:13 dawes Exp $ */
 
 /*
  * This is a configuration program that will create a base XF86Config
@@ -180,6 +180,7 @@
 char *config_xkbrules;
 char *config_xkbmodel;
 char *config_xkblayout;
+char *config_xkbcompat;
 char *config_depth;
 
 char *temp_dir = "";
@@ -546,31 +547,33 @@
 static struct xkb_layout_str {
     char *layout;
     char *desc;
+    char *compat;
 } xkb_layout_list[] = {
-    { "us",            "U.S. English" },
-    { "en_US",         "U.S. English w/ISO9995-3" },
-    { "be",            "Belgian" },
-    { "bg",            "Bulgarian" },
-    { "ca",            "Canadian" },
-    { "cs",            "Czechoslovakian" },
-    { "de",            "German" },
-    { "de_CH",         "Swiss German" },
-    { "dk",            "Danish" },
-    { "es",            "Spanish" },
-    { "fi",            "Finnish" },
-    { "fr",            "French" },
-    { "fr_CH",         "Swiss French" },
-    { "gb",            "United Kingdom" },
-    { "hu",            "Hungarian" },
-    { "it",            "Italian" },
-    { "jp",            "Japanese" },
-    { "no",            "Norwegian" },
-    { "pl",            "Polish" },
-    { "pt",            "Portugese" },
-    { "ru",            "Russian" },
-    { "se",            "Swedish" },
-    { "th",            "Thai" },
-    { "nec/jp",        "PC-98xx Series" },
+    { "us",                 "U.S. English",             ""},
+    { "en_US",              "U.S. English w/ISO9995-3", "" },
+    { "be",                 "Belgian",                  "" },
+    { "bg",                 "Bulgarian",                "" },
+    { "ca",                 "Canadian",                 "" },
+    { "czsk(cz_us_qwertz)", "Czech",                    "group_led" },
+    { "de",                 "German",                   "" },
+    { "de_CH",              "Swiss German",             "" },
+    { "dk",                 "Danish",                   "" },
+    { "es",                 "Spanish",                  "" },
+    { "fi",                 "Finnish",                  "" },
+    { "fr",                 "French",                   "" },
+    { "fr_CH",              "Swiss French",             "" },
+    { "gb",                 "United Kingdom",           "" },
+    { "hu",                 "Hungarian",                "" },
+    { "it",                 "Italian",                  "" },
+    { "jp",                 "Japanese",                 "" },
+    { "no",                 "Norwegian",                "" },
+    { "pl",                 "Polish",                   "" },
+    { "pt",                 "Portugese",                "" },
+    { "ru",                 "Russian",                  "" },
+    { "czsk(sk_us_qwertz)", "Slovak",                   "group_led" },
+    { "se",                 "Swedish",                  "" },
+    { "th",                 "Thai",                     "" },
+    { "nec/jp",             "PC-98xx Series",           "" },
 };
 static int nlayouts = sizeof(xkb_layout_list)/sizeof(struct xkb_layout_str);
 
@@ -640,6 +643,9 @@
 	config_xkblayout = Malloc(strlen(xkb_layout_list[xkblayout].layout)+1);
 	sprintf(config_xkblayout,"%s", xkb_layout_list[xkblayout].layout);
 
+	config_xkbcompat = Malloc(strlen(xkb_layout_list[xkblayout].compat)+1);
+	sprintf(config_xkbcompat,"%s", xkb_layout_list[xkblayout].compat);
+
 	return;
 }
 
@@ -1123,7 +1129,7 @@
 
 #ifdef __EMX__
 /* yet another instance of this code, sigh! */
-static char *
+char *
 __XOS2RedirRoot(char *path, char sep)
 {
 	static char pn[300];
@@ -2295,6 +2301,8 @@
 		config_xkbmodel);
 	fprintf(f, "    Option \"XkbLayout\"	\"%s\"\n",
 		config_xkblayout);
+	fprintf(f, "    Option \"XkbCompat\"	\"%s\"\n",
+		config_xkbcompat);
 
 	fprintf(f, "%s",keyboardlastchunk_text);
 
Index: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.cmd
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf86config/xf86config.cmd:1.1
--- /dev/null	Sat Jul  1 20:43:42 2000
+++ xc/programs/Xserver/hw/xfree86/xf86config/xf86config.cmd	Wed Apr  5 11:14:01 2000
@@ -0,0 +1,99 @@
+/* OS/2 REXX */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.cmd,v 1.1 2000/04/05 18:14:01 dawes Exp $ */
+
+call RxFuncAdd 'SysCls','RexxUtil','SysCls'
+
+env = 'OS2ENVIRONMENT'
+home= VALUE('HOME',,env)
+bootdrv= LEFT(VALUE('SYSTEM_INI',,env),2)
+x11root= TRANSLATE(VALUE('X11ROOT',,env),'\','/')
+editor= VALUE('EDITOR',,env)
+if editor = '' then
+  editor = 'epm'
+
+call SysCls
+if \(exists(home'\XF86Config.new')) then
+do 
+  say "This script will create a default XF86Config file. This is"
+  say "done by running the XFree86-4.0 server's configuration feature."
+  say " "
+
+  call configx86
+end
+
+do until cmd=7
+  call SysCls
+  say "XFree86 created a default config file at "home"\XF86Config.new."
+  say " "
+  say "You may now either:"
+  say "  1. View the logfile"
+  say "  2. Start the graphical configuration tool (alpha version)"
+  say "  3. Start the X server with the default file"
+  say "  4. Edit the config file manually, using the "editor" editor"
+  say "  5. Copy the config file to the standard location"
+  say "  6. Re-run X Server for configuration"
+  say "  7. Exit this program."
+  parse pull cmd
+  select 
+  when cmd=1 then do
+    call show_file
+  end
+  when cmd=2 then do
+    "xinit xf86cfg -xf86config "home"\XF86Config.new -- :0"
+  end
+  when cmd=3 then do
+    "xfree86 -xf86config "home"\XF86Config.new"
+  end
+  when cmd=4 then do
+    editor" "home"\XF86Config.new"
+  end
+  when cmd=5 then do
+    say "Copying file to "x11root"\lib\X11\XF86Config"
+    "copy "home"\XF86Config.new "x11root"\XFree86\lib\X11\XF86Config"
+  end
+  when cmd=6 then do
+    call configx86
+  end
+  when cmd=7 then do
+    say "Exiting from xf86config"
+    exit
+  end
+  otherwise
+    say "***ERROR*** Please enter a number from 1..7!"
+    say " "
+  end
+end
+exit
+
+configx86:
+  say "ATTENTION! If in the following the screen becomes blank or does not"
+  say "change for a minute (be patient), something went wrong -"
+  say "please reboot then (CTRL-ALT-DEL)"
+  say ""
+  say "Press RETURN to start the configuration process"
+  pull input
+  'xfree86 -configure'
+  return
+
+show_file:
+  file=bootdrv"\xf86log.os2"
+  i=0
+  call SysCls
+  do until stream(file,s)="NOTREADY"
+    say linein(file)
+    i = i+1
+    if i = 20 then do
+      say " "
+      say "Press Return for next page"
+      pull input
+      i = 0
+      call SysCls
+    end
+  end
+  return
+
+/* returns 1, if file exists */
+exists:
+  'DIR "'arg(1)'" >nul 2>&1'
+  IF rc = 0 THEN return 1
+  RETURN 0
Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c
diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c:1.6 xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c:1.8
--- xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c:1.6	Sat Sep 25 07:38:19 1999
+++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c	Sat Mar 25 12:14:43 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.6 1999/09/25 14:38:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.8 2000/03/25 20:14:43 mvojkovi Exp $ */
 
 /*
    Copyright (C) 1998.  The XFree86 Project Inc.
@@ -22,6 +22,9 @@
 #include "colormapst.h"
 #include "cfb8_32.h"
 
+#define IS_DIRTY 	1
+#define IS_SHARED	2
+
 /** Screen Functions **/
 
 static Bool OverlayCloseScreen (int, ScreenPtr);
@@ -177,7 +180,7 @@
 
 typedef struct {
    PixmapPtr		pix32;
-   Bool			dirty;
+   CARD32		dirty;
 } OverlayPixmapRec, *OverlayPixmapPtr;
 
 
@@ -251,7 +254,7 @@
     pGCPriv->wrapOps = pGC->ops;\
     pGC->funcs = &OverlayGCFuncs;\
     pGC->ops = &PixmapGCOps;\
-    pPixPriv->dirty = TRUE
+    pPixPriv->dirty |= IS_DIRTY
     
 
 Bool
@@ -359,7 +362,9 @@
     if(pPix) {
 	OverlayPixmapPtr pPriv = OVERLAY_GET_PIXMAP_PRIVATE(pPix);
         pPriv->pix32 = NULL;
-        pPriv->dirty = TRUE;
+        pPriv->dirty = IS_DIRTY;
+	if(!w || !h)
+	   pPriv->dirty |= IS_SHARED;
     }
 
     return pPix;
@@ -455,6 +460,11 @@
 	   if(pWin->backgroundState == BackgroundPixmap) {
 		oldPix = pWin->background.pixmap;
 		pixPriv = OVERLAY_GET_PIXMAP_PRIVATE(oldPix);
+		/* have to do this here because alot of applications
+		   incorrectly assume changes to a pixmap that is
+		   a window background go into effect immediatedly */
+		if(pixPriv->dirty & IS_DIRTY)
+		    OverlayRefreshPixmap(pWin->background.pixmap);
 		pWin->background.pixmap = pixPriv->pix32;
 	   }
 	}
@@ -469,6 +479,8 @@
 	if((pWin->drawable.depth == 8) && !pWin->borderIsPixel) {
 	   oldPix = pWin->border.pixmap;
 	   pixPriv = OVERLAY_GET_PIXMAP_PRIVATE(oldPix);
+	   if(pixPriv->dirty & IS_DIRTY)
+		OverlayRefreshPixmap(pWin->border.pixmap);
 	   pWin->border.pixmap = pixPriv->pix32;
         }
 
@@ -498,7 +510,6 @@
 		pix8->drawable.height, 24);
 	newPix->drawable.depth = 8;  /* Bad Mark! Bad Mark! */
         pixPriv->pix32 = newPix;
-        pixPriv->dirty = TRUE;
     }
 
     if(pixPriv->dirty) {
@@ -515,7 +526,7 @@
 	pScreenPriv->LockPrivate--;
 	FreeScratchGC(pGC);
 
-	pixPriv->dirty = FALSE;
+	pixPriv->dirty &= ~IS_DIRTY;
 	pixPriv->pix32->drawable.serialNumber = NEXT_SERIAL_NUMBER;    
     }
 
Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:43:42 2000
+++ xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile	Sat May 20 18:02:42 2000
@@ -0,0 +1,33 @@
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile,v 1.1 2000/05/21 01:02:42 mvojkovi Exp $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+
+#if DoLoadableServer
+XFMODSRC = cfb8_32widmodule.c
+XFMODOBJ = cfb8_32widmodule.o
+#endif
+
+SRCS = 	cfbscrinit.c cfbwindow.c cfbwid.c $(XFMODSRC)
+
+OBJS = 	cfbscrinit.o cfbwindow.o cfbwid.o $(XFMODOBJ) 
+
+INCLUDES = -I. -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \
+        -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \
+        -I$(XF86OSSRC) -I$(XF86COMSRC) \
+        -I$(FONTINCSRC) -I$(XINCLUDESRC)
+
+
+ModuleObjectRule()
+LibraryModuleTarget(xf8_32wid,$(OBJS))
+LintLibraryTarget(xf8_32wid,$(SRCS))
+NormalLintTarget($(LINTDEFS) $(SRCS))
+
+InstallLibraryModule(xf8_32wid,$(MODULEDIR),.)
+
+DependTarget()
+
+InstallDriverSDKLibraryModule(xf8_32wid,$(DRIVERSDKMODULEDIR),.)
+
+InstallDriverSDKNonExecFile(cfb8_32wid.h,$(DRIVERSDKINCLUDEDIR))
Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h:1.1
--- /dev/null	Sat Jul  1 20:43:42 2000
+++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h	Sat May 20 18:02:43 2000
@@ -0,0 +1,93 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+
+#ifndef _CFB8_32WID_H
+#define _CFB8_32WID_H
+
+#include "regionstr.h"
+#include "windowstr.h"
+
+typedef struct {
+	unsigned int (*WidGet)(WindowPtr);
+	Bool (*WidAlloc)(WindowPtr);
+	void (*WidFree)(WindowPtr);
+	void (*WidFillBox)(DrawablePtr, DrawablePtr, int, BoxPtr);
+	void (*WidCopyArea)(DrawablePtr, RegionPtr, DDXPointPtr);
+} cfb8_32WidOps;
+
+typedef struct {
+	pointer 		pix8;
+	int			width8;
+	pointer 		pix32;
+	int			width32;
+
+	/* WID information */
+	pointer			pixWid;
+	int			widthWid;
+	int			bitsPerWid;
+	cfb8_32WidOps		*WIDOps;
+} cfb8_32WidScreenRec, *cfb8_32WidScreenPtr;
+
+extern int cfb8_32WidScreenPrivateIndex;
+
+Bool
+cfb8_32WidScreenInit (
+    ScreenPtr pScreen,
+    pointer pbits32,
+    pointer pbits8,
+    pointer pbitsWid,
+    int xsize, int ysize,
+    int dpix, int dpiy,	
+    int width32,
+    int width8,
+    int widthWid,
+    int bitsPerWid,
+    cfb8_32WidOps *WIDOps
+);
+
+/* cfbwindow.c */
+
+void
+cfb8_32WidPaintWindow (
+    WindowPtr   pWin,
+    RegionPtr   pRegion,
+    int         what
+);
+
+Bool cfb8_32WidCreateWindow(WindowPtr pWin);
+Bool cfb8_32WidDestroyWindow(WindowPtr pWin);
+
+Bool
+cfb8_32WidPositionWindow(
+    WindowPtr pWin,
+    int x, int y
+);
+
+void
+cfb8_32WidCopyWindow(
+    WindowPtr pWin,
+    DDXPointRec ptOldOrg,
+    RegionPtr prgnSrc
+);
+
+Bool
+cfb8_32WidChangeWindowAttributes(
+    WindowPtr pWin,
+    unsigned long mask
+);
+
+void
+cfb8_32WidWindowExposures(
+   WindowPtr pWin,
+   RegionPtr pReg,
+   RegionPtr pOtherReg
+);
+
+/* cfbwid.c */
+
+Bool
+cfb8_32WidGenericOpsInit(cfb8_32WidScreenPtr pScreenPriv);
+
+#define CFB8_32WID_GET_SCREEN_PRIVATE(pScreen)\
+   (cfb8_32WidScreenPtr)((pScreen)->devPrivates[cfb8_32WidScreenPrivateIndex].ptr)
+
+#endif /* _CFB8_32WID_H */
Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c:1.1
--- /dev/null	Sat Jul  1 20:43:42 2000
+++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c	Sat May 20 18:02:43 2000
@@ -0,0 +1,46 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+
+#ifdef XFree86LOADER
+
+#include "xf86Module.h"
+
+static MODULESETUPPROTO(xf8_32widSetup);
+
+static XF86ModuleVersionInfo VersRec =
+{
+        "xf8_32wid",
+        MODULEVENDORSTRING,
+        MODINFOSTRING1,
+        MODINFOSTRING2,
+        XF86_VERSION_CURRENT,
+        1, 0, 0,
+        ABI_CLASS_ANSIC,                /* Only need the ansic layer */
+        ABI_ANSIC_VERSION,
+        NULL,
+        {0,0,0,0}       /* signature, to be patched into the file by a tool */
+};
+
+XF86ModuleData xf8_32widModuleData = { &VersRec, xf8_32widSetup, NULL };
+
+static pointer
+xf8_32widSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    if (!LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL,
+			errmaj, errmin))
+        return NULL;
+    if (!LoadSubModule(module, "cfb", NULL, NULL, NULL, NULL,
+			errmaj, errmin))
+        return NULL;
+    if (!LoadSubModule(module, "cfb16", NULL, NULL, NULL, NULL,
+			errmaj, errmin))
+        return NULL;
+    if (!LoadSubModule(module, "cfb24", NULL, NULL, NULL, NULL,
+			errmaj, errmin))
+        return NULL;
+    if (!LoadSubModule(module, "cfb32", NULL, NULL, NULL, NULL,
+			errmaj, errmin))
+        return NULL;
+    return (pointer)1;  /* non-NULL required to indicate success */
+}
+
+#endif
Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c:1.1
--- /dev/null	Sat Jul  1 20:43:42 2000
+++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c	Sat May 20 18:02:43 2000
@@ -0,0 +1,382 @@
+/*
+   Copyright (C) 1999.  The XFree86 Project Inc.
+
+   Written by David S. Miller (davem@redhat.com)
+
+   Based largely upon the xf8_16bpp module which is
+   Mark Vojkovich's work.
+*/
+
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+
+#include "X.h"
+#include "Xmd.h"
+#include "misc.h"
+#include "servermd.h"
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "resource.h"
+#include "colormap.h"
+#include "colormapst.h"
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+#include "cfb8_32wid.h"
+#include "mi.h"
+#include "micmap.h"
+#include "mistruct.h"
+#include "gcstruct.h"
+#include "dix.h"
+#include "mibstore.h"
+#include "xf86str.h"
+#include "xf86.h"
+
+/* CAUTION:  We require that cfb8 and cfb32 were NOT 
+	compiled with CFB_NEED_SCREEN_PRIVATE */
+
+int cfb8_32WidScreenPrivateIndex;
+
+static unsigned long cfb8_32WidGeneration = 0;
+extern WindowPtr *WindowTable;
+
+static PixmapPtr cfb8_32WidGetWindowPixmap(WindowPtr pWin);
+
+static void
+cfb8_32WidSaveAreas(
+    PixmapPtr	  	pPixmap,
+    RegionPtr	  	prgnSave, 
+    int	    	  	xorg,
+    int	    	  	yorg,
+    WindowPtr		pWin
+);
+
+static void
+cfb8_32WidRestoreAreas(
+    PixmapPtr	  	pPixmap, 
+    RegionPtr	  	prgnRestore,
+    int	    	  	xorg,
+    int	    	  	yorg,
+    WindowPtr		pWin
+);
+
+static BSFuncRec cfb8_32WidBSFuncRec = {
+    cfb8_32WidSaveAreas,
+    cfb8_32WidRestoreAreas,
+    (BackingStoreSetClipmaskRgnProcPtr) 0,
+    (BackingStoreGetImagePixmapProcPtr) 0,
+    (BackingStoreGetSpansPixmapProcPtr) 0,
+};
+
+static void
+cfb8_32WidGetSpans(
+   DrawablePtr pDraw,
+   int wMax,
+   DDXPointPtr ppt,
+   int *pwidth,
+   int nspans,
+   char *pchardstStart
+);
+
+static void
+cfb8_32WidGetImage (
+    DrawablePtr pDraw,
+    int sx, int sy, int w, int h,
+    unsigned int format,
+    unsigned long planeMask,
+    char *pdstLine
+);
+
+static Bool cfb8_32WidCreateGC(GCPtr pGC);
+static void cfb8_32WidEnableDisableFBAccess(int index, Bool enable);
+
+
+static Bool
+cfb8_32WidAllocatePrivates(ScreenPtr pScreen)
+{
+	cfb8_32WidScreenPtr pScreenPriv;
+
+	if (cfb8_32WidGeneration != serverGeneration) {
+		if ((cfb8_32WidScreenPrivateIndex = AllocateScreenPrivateIndex()) < 0)
+			return FALSE;
+		cfb8_32WidGeneration = serverGeneration;
+	}
+
+	if (!(pScreenPriv = xalloc(sizeof(cfb8_32WidScreenRec))))
+		return FALSE;
+
+	pScreen->devPrivates[cfb8_32WidScreenPrivateIndex].ptr = (pointer)pScreenPriv;
+   
+	/* All cfb will have the same GC and Window private indicies */
+	if (!mfbAllocatePrivates(pScreen, &cfbWindowPrivateIndex, &cfbGCPrivateIndex))
+		return FALSE;
+
+	/* The cfb indicies are the mfb indicies. Reallocating them resizes them */ 
+	if (!AllocateWindowPrivate(pScreen, cfbWindowPrivateIndex, sizeof(cfbPrivWin)))
+		return FALSE;
+
+	if (!AllocateGCPrivate(pScreen, cfbGCPrivateIndex, sizeof(cfbPrivGC)))
+		return FALSE;
+
+	return TRUE;
+}
+
+static Bool
+cfb8_32WidSetupScreen(
+    ScreenPtr pScreen,
+    int xsize, int ysize,	/* in pixels */
+    int dpix, int dpiy
+){
+	if (!cfb8_32WidAllocatePrivates(pScreen))
+		return FALSE;
+
+	pScreen->defColormap = FakeClientID(0);
+
+	/* let CreateDefColormap do whatever it wants for pixels */ 
+	pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
+	pScreen->QueryBestSize = mfbQueryBestSize;
+
+	/* SaveScreen */
+	pScreen->GetImage = cfb8_32WidGetImage;
+	pScreen->GetSpans = cfb8_32WidGetSpans;
+	pScreen->CreateWindow = cfb8_32WidCreateWindow;
+	pScreen->DestroyWindow = cfb8_32WidDestroyWindow;	
+	pScreen->PositionWindow = cfb8_32WidPositionWindow;
+	pScreen->ChangeWindowAttributes = cfb8_32WidChangeWindowAttributes;
+	pScreen->RealizeWindow = cfb32MapWindow;		/* OK */
+	pScreen->UnrealizeWindow = cfb32UnmapWindow;		/* OK */
+	pScreen->PaintWindowBackground = cfb8_32WidPaintWindow;
+	pScreen->PaintWindowBorder = cfb8_32WidPaintWindow;
+	pScreen->CopyWindow = cfb8_32WidCopyWindow;
+	pScreen->CreatePixmap = cfb32CreatePixmap;		/* OK */
+	pScreen->DestroyPixmap = cfb32DestroyPixmap; 		/* OK */
+	pScreen->RealizeFont = mfbRealizeFont;
+	pScreen->UnrealizeFont = mfbUnrealizeFont;
+	pScreen->CreateGC = cfb8_32WidCreateGC;
+	pScreen->CreateColormap = miInitializeColormap;
+	pScreen->DestroyColormap = (void (*)())NoopDDA;
+	pScreen->InstallColormap = miInstallColormap;
+	pScreen->UninstallColormap = miUninstallColormap;
+	pScreen->ListInstalledColormaps = miListInstalledColormaps;
+	pScreen->StoreColors = (void (*)())NoopDDA;
+	pScreen->ResolveColor = miResolveColor;
+	pScreen->BitmapToRegion = mfbPixmapToRegion;
+
+	mfbRegisterCopyPlaneProc (pScreen, cfbCopyPlane);
+	return TRUE;
+}
+
+static Bool
+cfb8_32WidCreateScreenResources(ScreenPtr pScreen)
+{
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	cfb8_32WidScreenPtr pScreenPriv = CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+	PixmapPtr pix8, pix32, pixWid;
+    
+	xfree(pScreen->devPrivate); /* freeing miScreenInitParmsRec */
+
+	pix8 = (*pScreen->CreatePixmap)(pScreen, 0, 0, 8);
+	pix32 = (*pScreen->CreatePixmap)(pScreen, 0, 0, pScrn->depth);
+	pixWid = (*pScreen->CreatePixmap)(pScreen, 0, 0, pScreenPriv->bitsPerWid);
+	if (!pix32 || !pix8 || !pixWid)
+		return FALSE;
+
+	pix8->drawable.width = pScreen->width;
+	pix8->drawable.height = pScreen->height;
+	pix8->devKind = pScreenPriv->width8;
+	pix8->devPrivate.ptr = pScreenPriv->pix8;
+
+	pix32->drawable.width = pScreen->width;
+	pix32->drawable.height = pScreen->height;
+	pix32->devKind = pScreenPriv->width32 * 4;
+	pix32->devPrivate.ptr = pScreenPriv->pix32;
+
+	pixWid->drawable.width = pScreen->width;
+	pixWid->drawable.height = pScreen->height;
+	pixWid->devKind = (pScreenPriv->widthWid * pScreenPriv->bitsPerWid) / 8;
+	pixWid->devPrivate.ptr = pScreenPriv->pixWid;
+
+	pScreenPriv->pix8   = (pointer) pix8;
+	pScreenPriv->pix32  = (pointer) pix32;
+	pScreenPriv->pixWid = (pointer) pixWid;
+
+	pScreen->devPrivate = (pointer) pix32;
+
+	return TRUE;
+}
+
+
+static Bool
+cfb8_32WidCloseScreen (int i, ScreenPtr pScreen)
+{
+	cfb8_32WidScreenPtr pScreenPriv = CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+
+	xfree((pointer) pScreenPriv);
+
+	return cfb32CloseScreen(i, pScreen);
+}
+
+static Bool
+cfb8_32WidFinishScreenInit(
+    ScreenPtr pScreen,
+    int xsize, int ysize,	/* in pixels */
+    int dpix, int dpiy		/* dots per inch */
+){
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	VisualPtr	visuals;
+	DepthPtr	depths;
+	int		nvisuals;
+	int		ndepths;
+	int		rootdepth;
+	VisualID	defaultVisual;
+
+	rootdepth = 0;
+	if (!miInitVisuals(&visuals, &depths, &nvisuals, &ndepths, &rootdepth,
+			    &defaultVisual,((unsigned long)1<<(32-1)), 8, -1))
+		return FALSE;
+
+	if (!miScreenInit(pScreen, NULL, xsize, ysize, dpix, dpiy, 0,
+			  rootdepth, ndepths, depths,
+			  defaultVisual, nvisuals, visuals))
+		return FALSE;
+
+	pScreen->BackingStoreFuncs = cfb8_32WidBSFuncRec;
+	pScreen->CreateScreenResources = cfb8_32WidCreateScreenResources;
+	pScreen->CloseScreen = cfb8_32WidCloseScreen;
+	pScreen->GetWindowPixmap = cfb8_32WidGetWindowPixmap;
+	pScreen->WindowExposures = cfb8_32WidWindowExposures;
+
+	pScrn->EnableDisableFBAccess = cfb8_32WidEnableDisableFBAccess;
+
+	return TRUE;
+}
+
+Bool
+cfb8_32WidScreenInit(
+    ScreenPtr pScreen,
+    pointer pbits32,		/* pointer to screen bitmap */
+    pointer pbits8,
+    pointer pbitsWid,		/* pointer to WID bitmap */
+    int xsize, int ysize,	/* in pixels */
+    int dpix, int dpiy,		/* dots per inch */
+    int width32,		/* pixel width of frame buffer */
+    int width8,
+    int widthWid,
+    int bitsPerWid,
+    cfb8_32WidOps *WIDOps
+){
+	cfb8_32WidScreenPtr pScreenPriv;
+
+	if (!WIDOps || !WIDOps->WidGet || !WIDOps->WidAlloc || !WIDOps->WidFree)
+		return FALSE;
+
+	if (!cfb8_32WidSetupScreen(pScreen, xsize, ysize, dpix, dpiy))
+		return FALSE;
+
+	pScreenPriv = CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+	pScreenPriv->pix8 = pbits8;
+	pScreenPriv->pix32 = pbits32;
+	pScreenPriv->pixWid = pbitsWid;
+	pScreenPriv->width8 = width8;
+	pScreenPriv->width32 = width32;
+	pScreenPriv->widthWid = widthWid;
+	pScreenPriv->bitsPerWid = bitsPerWid;
+
+	pScreenPriv->WIDOps = xalloc(sizeof(cfb8_32WidOps));
+	if (!pScreenPriv->WIDOps)
+		return FALSE;
+
+	*(pScreenPriv->WIDOps) = *WIDOps;
+
+	if (!WIDOps->WidFillBox || !WIDOps->WidCopyArea)
+		cfb8_32WidGenericOpsInit(pScreenPriv);
+
+	return cfb8_32WidFinishScreenInit(pScreen, xsize, ysize, dpix, dpiy);
+}
+
+static PixmapPtr
+cfb8_32WidGetWindowPixmap(WindowPtr pWin)
+{
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pWin->drawable.pScreen);
+
+	return ((pWin->drawable.bitsPerPixel == 8) ?
+		(PixmapPtr) pScreenPriv->pix8 : (PixmapPtr) pScreenPriv->pix32);
+}
+
+static void
+cfb8_32WidGetImage (DrawablePtr pDraw, int sx, int sy, int w, int h,
+		    unsigned int format, unsigned long planemask, char *pdstLine)
+{
+	if (!w || !h)
+		return;
+
+	if (pDraw->bitsPerPixel == 8)
+		cfbGetImage(pDraw, sx, sy, w, h, format, planemask, pdstLine);
+	else
+		cfb32GetImage(pDraw, sx, sy, w, h, format, planemask, pdstLine);
+}
+
+static void
+cfb8_32WidGetSpans(DrawablePtr pDraw, int wMax, DDXPointPtr ppt, int *pwidth, int nspans, char *pDst)
+{
+	if (pDraw->bitsPerPixel == 8)
+		cfbGetSpans(pDraw, wMax, ppt, pwidth, nspans, pDst);
+	else
+		cfb32GetSpans(pDraw, wMax, ppt, pwidth, nspans, pDst);
+}
+
+static void
+cfb8_32WidSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, WindowPtr pWin)
+{
+	if (pWin->drawable.bitsPerPixel == 8)
+		cfbSaveAreas(pPixmap, prgnSave, xorg, yorg, pWin);
+	else
+		cfb32SaveAreas(pPixmap, prgnSave, xorg, yorg, pWin);
+}
+
+static void
+cfb8_32WidRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, int yorg, WindowPtr pWin)
+{
+	if (pWin->drawable.bitsPerPixel == 8)
+		cfbRestoreAreas(pPixmap, prgnRestore, xorg, yorg, pWin);
+	else
+		cfb32RestoreAreas(pPixmap, prgnRestore, xorg, yorg, pWin);
+}
+
+
+static Bool
+cfb8_32WidCreateGC(GCPtr pGC)
+{
+	if (pGC->depth == 8)
+		return cfbCreateGC(pGC);
+	else
+		return cfb32CreateGC(pGC);
+}
+
+static void
+cfb8_32WidEnableDisableFBAccess(int index, Bool enable)
+{
+	ScreenPtr pScreen = xf86Screens[index]->pScreen;
+	cfb8_32WidScreenPtr pScreenPriv = CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+	static DevUnion devPrivates8[MAXSCREENS];
+	static DevUnion devPrivates32[MAXSCREENS];
+	PixmapPtr	pix8, pix32;
+
+	pix8 = (PixmapPtr) pScreenPriv->pix8;
+	pix32 = (PixmapPtr) pScreenPriv->pix32;
+
+	if (enable) {
+		pix8->devPrivate = devPrivates8[index];
+		pix32->devPrivate = devPrivates32[index];
+	}
+
+	xf86EnableDisableFBAccess (index, enable);
+
+	if (!enable) {
+		devPrivates8[index] = pix8->devPrivate;
+		pix8->devPrivate.ptr = 0;
+		devPrivates32[index] = pix32->devPrivate;
+		pix32->devPrivate.ptr = 0;
+	}
+}
Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c:1.1
--- /dev/null	Sat Jul  1 20:43:42 2000
+++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c	Sat May 20 18:02:44 2000
@@ -0,0 +1,147 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c,v 1.1 2000/05/21 01:02:44 mvojkovi Exp $ */
+
+#include "X.h"
+#include "Xmd.h"
+#include "misc.h"
+#include "servermd.h"
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "resource.h"
+#include "colormap.h"
+#include "colormapst.h"
+
+#include "mfb.h"
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb16.h"
+#include "cfb24.h"
+#include "cfb32.h"
+
+#include "cfb8_32wid.h"
+
+static void
+WidFillBox1(DrawablePtr pixWid, DrawablePtr pWinDraw, int nbox, BoxPtr pBox)
+{
+	WindowPtr pWin = (WindowPtr) pWinDraw;
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pWin->drawable.pScreen);
+	unsigned int wid = pScreenPriv->WIDOps->WidGet(pWin);
+
+	if (wid & 1)
+		mfbSolidWhiteArea((DrawablePtr)pWin, nbox, pBox, GXset, NullPixmap);
+	else
+		mfbSolidBlackArea((DrawablePtr)pWin, nbox, pBox, GXset, NullPixmap);
+}
+
+static void
+WidCopyArea1(DrawablePtr pixWid, RegionPtr pRgn, DDXPointPtr pptSrc)
+{
+	mfbDoBitbltCopy(pixWid, pixWid, GXcopy, pRgn, pptSrc);
+}
+
+static void
+WidFillBox8(DrawablePtr pixWid, DrawablePtr pWinDraw, int nbox, BoxPtr pBox)
+{
+	WindowPtr pWin = (WindowPtr) pWinDraw;
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pWin->drawable.pScreen);
+	unsigned int wid = pScreenPriv->WIDOps->WidGet(pWin);
+
+	cfbFillBoxSolid(pixWid, nbox, pBox, wid);
+}
+
+static void
+WidCopyArea8(DrawablePtr pixWid, RegionPtr pRgn, DDXPointPtr pptSrc)
+{
+	cfbDoBitbltCopy(pixWid, pixWid, GXcopy, pRgn, pptSrc, ~0L);
+}
+
+static void
+WidFillBox16(DrawablePtr pixWid, DrawablePtr pWinDraw, int nbox, BoxPtr pBox)
+{
+	WindowPtr pWin = (WindowPtr) pWinDraw;
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pWin->drawable.pScreen);
+	unsigned int wid = pScreenPriv->WIDOps->WidGet(pWin);
+
+	cfb16FillBoxSolid(pixWid, nbox, pBox, wid);
+}
+
+static void
+WidCopyArea16(DrawablePtr pixWid, RegionPtr pRgn, DDXPointPtr pptSrc)
+{
+	cfb16DoBitbltCopy(pixWid, pixWid, GXcopy, pRgn, pptSrc, ~0L);
+}
+
+static void
+WidFillBox24(DrawablePtr pixWid, DrawablePtr pWinDraw, int nbox, BoxPtr pBox)
+{
+	WindowPtr pWin = (WindowPtr) pWinDraw;
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pWin->drawable.pScreen);
+	unsigned int wid = pScreenPriv->WIDOps->WidGet(pWin);
+
+	cfb24FillBoxSolid(pixWid, nbox, pBox, wid);
+}
+
+static void
+WidCopyArea24(DrawablePtr pixWid, RegionPtr pRgn, DDXPointPtr pptSrc)
+{
+	cfb24DoBitbltCopy(pixWid, pixWid, GXcopy, pRgn, pptSrc, ~0L);
+}
+
+static void
+WidFillBox32(DrawablePtr pixWid, DrawablePtr pWinDraw, int nbox, BoxPtr pBox)
+{
+	WindowPtr pWin = (WindowPtr) pWinDraw;
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pWin->drawable.pScreen);
+	unsigned int wid = pScreenPriv->WIDOps->WidGet(pWin);
+
+	cfb32FillBoxSolid(pixWid, nbox, pBox, wid);
+}
+
+static void
+WidCopyArea32(DrawablePtr pixWid, RegionPtr pRgn, DDXPointPtr pptSrc)
+{
+	cfb32DoBitbltCopy(pixWid, pixWid, GXcopy, pRgn, pptSrc, ~0L);
+}
+
+Bool
+cfb8_32WidGenericOpsInit(cfb8_32WidScreenPtr pScreenPriv)
+{
+	cfb8_32WidOps *WIDOps = pScreenPriv->WIDOps;
+
+	switch (pScreenPriv->bitsPerWid) {
+	case 1:
+		WIDOps->WidFillBox = WidFillBox1;
+		WIDOps->WidCopyArea = WidCopyArea1;
+		break;
+
+	case 8:
+		WIDOps->WidFillBox = WidFillBox8;
+		WIDOps->WidCopyArea = WidCopyArea8;
+		break;
+
+	case 16:
+		WIDOps->WidFillBox = WidFillBox16;
+		WIDOps->WidCopyArea = WidCopyArea16;
+		break;
+
+	case 24:
+		WIDOps->WidFillBox = WidFillBox24;
+		WIDOps->WidCopyArea = WidCopyArea24;
+		break;
+
+	case 32:
+		WIDOps->WidFillBox = WidFillBox32;
+		WIDOps->WidCopyArea = WidCopyArea32;
+		break;
+
+	default:
+		return FALSE;
+	};
+
+	return TRUE;
+}
Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c
diff -u /dev/null xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c:1.1
--- /dev/null	Sat Jul  1 20:43:42 2000
+++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c	Sat May 20 18:02:44 2000
@@ -0,0 +1,285 @@
+/*
+   Copyright (C) 1999.  The XFree86 Project Inc.
+
+   Written by David S. Miller (davem@redhat.com)
+
+   Based largely upon the xf8_16bpp module which is
+   Mark Vojkovich's work.
+*/
+
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.1 2000/05/21 01:02:44 mvojkovi Exp $ */
+
+#include "X.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#define PSZ 8
+#include "cfb.h"
+#undef PSZ
+#include "cfb32.h"
+#include "cfb8_32wid.h"
+#include "mistruct.h"
+#include "regionstr.h"
+#include "cfbmskbits.h"
+#include "xf86.h"
+
+/* We don't bother with cfb's fastBackground/Border so we don't
+   need to use the Window privates */
+
+Bool
+cfb8_32WidCreateWindow(WindowPtr pWin)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+	cfbPrivWin *pPrivWin = cfbGetWindowPrivate(pWin);
+
+	pPrivWin->fastBackground = FALSE;
+	pPrivWin->fastBorder = FALSE;
+
+	if (!pScreenPriv->WIDOps->WidAlloc(pWin))
+		return FALSE;
+
+	return TRUE;
+}
+
+
+Bool
+cfb8_32WidDestroyWindow(WindowPtr pWin)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+
+	pScreenPriv->WIDOps->WidFree(pWin);
+	return TRUE;
+}
+
+Bool
+cfb8_32WidPositionWindow(WindowPtr pWin, int x, int y)
+{
+	return TRUE;
+}
+
+static void
+SegregateChildrenBpp(WindowPtr pWin, RegionPtr pReg, int subtract, int bpp, int other_bpp)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	WindowPtr pChild;
+
+	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib) {
+		if (pChild->drawable.bitsPerPixel == bpp) {
+			if (subtract) {
+				REGION_SUBTRACT(pScreen, pReg,
+						pReg, &pChild->borderClip);
+			} else {
+				REGION_UNION(pScreen, pReg,
+					     pReg, &pChild->borderClip);
+			}
+			if (pChild->firstChild)
+				SegregateChildrenBpp(pChild, pReg,
+						     !subtract, other_bpp, bpp);
+		} else {
+			if (pChild->firstChild)
+				SegregateChildrenBpp(pChild, pReg,
+						     subtract, bpp, other_bpp);
+		}
+	}
+}
+
+void
+cfb8_32WidCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	cfb8_32WidScreenPtr pScreenPriv = 
+		CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+	PixmapPtr pPixChildren;
+	DDXPointPtr ppt, pptSrc;
+	RegionRec rgnDst, rgnOther, rgnPixmap;
+	BoxPtr pbox;
+	int i, nbox, dx, dy, other_bpp;
+
+	REGION_INIT(pScreen, &rgnDst, NullBox, 0);
+
+	dx = ptOldOrg.x - pWin->drawable.x;
+	dy = ptOldOrg.y - pWin->drawable.y;
+	REGION_TRANSLATE(pScreen, prgnSrc, -dx, -dy);
+	REGION_INTERSECT(pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
+
+	if ((nbox = REGION_NUM_RECTS(&rgnDst)) == 0) {
+		/* Nothing to render. */
+		REGION_UNINIT(pScreen, &rgnDst);
+		return;
+	}
+
+	/* First, copy the WID plane for the whole area. */
+	pptSrc = (DDXPointPtr )ALLOCATE_LOCAL(nbox * sizeof(DDXPointRec));
+	if(pptSrc) {
+		pbox = REGION_RECTS(&rgnDst);
+		for (i = nbox, ppt = pptSrc; i--; ppt++, pbox++) {
+			ppt->x = pbox->x1 + dx;
+			ppt->y = pbox->y1 + dy;
+		}
+
+		pScreenPriv->WIDOps->WidCopyArea((DrawablePtr)pScreenPriv->pixWid,
+						 &rgnDst, pptSrc);
+
+		DEALLOCATE_LOCAL(pptSrc);
+	}
+
+	/* Next, we copy children which have a different
+	 * bpp than pWin into a temporary pixmap.  We will
+	 * toss this pixmap back onto the framebuffer before
+	 * we return.
+	 */
+	if (pWin->drawable.bitsPerPixel == 8)
+		other_bpp = pScrn->bitsPerPixel;
+	else
+		other_bpp = 8;
+
+	REGION_INIT(pScreen, &rgnOther, NullBox, 0);
+	SegregateChildrenBpp(pWin, &rgnOther, 0,
+			     other_bpp, pWin->drawable.bitsPerPixel);
+	pPixChildren = NULL;
+	if (REGION_NOTEMPTY(pScreen, &rgnOther)) {
+		REGION_INTERSECT(pScreen, &rgnOther, &rgnOther, prgnSrc);
+		nbox = REGION_NUM_RECTS(&rgnOther);
+		if (nbox) {
+			int width = rgnOther.extents.x2 - rgnOther.extents.x1;
+			int height = rgnOther.extents.y2 - rgnOther.extents.y1;
+			int depth = (other_bpp == 8) ? 8 : pScrn->depth;
+
+			if (other_bpp == 8)
+				pPixChildren = cfbCreatePixmap(pScreen, width, height, depth);
+			else
+				pPixChildren = cfb32CreatePixmap(pScreen, width, height, depth);
+		}
+		if (nbox &&
+		    pPixChildren &&
+		    (pptSrc = (DDXPointPtr) ALLOCATE_LOCAL(nbox * sizeof(DDXPointRec)))) {
+			pbox = REGION_RECTS(&rgnOther);
+			for (i = nbox, ppt = pptSrc; i--; ppt++, pbox++) {
+				ppt->x = pbox->x1 + dx;
+				ppt->y = pbox->y1 + dy;
+			}
+
+			REGION_INIT(pScreen, &rgnPixmap, NullBox, 0);
+			REGION_COPY(pScreen, &rgnPixmap, &rgnOther);
+			REGION_TRANSLATE(pScreen, &rgnPixmap, -(rgnOther.extents.x1), -(rgnOther.extents.y1));
+
+			if (other_bpp == 8)
+				cfbDoBitbltCopy((DrawablePtr)pScreenPriv->pix8,
+						(DrawablePtr)pPixChildren,
+						GXcopy, &rgnPixmap, pptSrc, ~0L);
+			else
+				cfb32DoBitbltCopy((DrawablePtr)pScreenPriv->pix32,
+						  (DrawablePtr)pPixChildren,
+						  GXcopy, &rgnPixmap, pptSrc, ~0L);
+
+			REGION_UNINIT(pScreen, &rgnPixmap);
+
+			DEALLOCATE_LOCAL(pptSrc);
+		}
+
+		REGION_SUBTRACT(pScreen, &rgnDst, &rgnDst, &rgnOther);
+	}
+
+	/* Now copy the parent along with all child windows using the same depth. */
+	nbox = REGION_NUM_RECTS(&rgnDst);
+	if(nbox &&
+	   (pptSrc = (DDXPointPtr )ALLOCATE_LOCAL(nbox * sizeof(DDXPointRec)))) {
+		pbox = REGION_RECTS(&rgnDst);
+		for (i = nbox, ppt = pptSrc; i--; ppt++, pbox++) {
+			ppt->x = pbox->x1 + dx;
+			ppt->y = pbox->y1 + dy;
+		}
+
+		if (pWin->drawable.bitsPerPixel == 8)
+			cfbDoBitbltCopy((DrawablePtr)pScreenPriv->pix8,
+					(DrawablePtr)pScreenPriv->pix8,
+					GXcopy, &rgnDst, pptSrc, ~0L);
+		else
+			cfb32DoBitbltCopy((DrawablePtr)pScreenPriv->pix32,
+					  (DrawablePtr)pScreenPriv->pix32,
+					  GXcopy, &rgnDst, pptSrc, ~0L);
+
+		DEALLOCATE_LOCAL(pptSrc);
+	}
+
+	REGION_UNINIT(pScreen, &rgnDst);
+
+	if (pPixChildren) {
+		nbox = REGION_NUM_RECTS(&rgnOther);
+		pptSrc = (DDXPointPtr) ALLOCATE_LOCAL(nbox * sizeof(DDXPointRec));
+		if (pptSrc) {
+			pbox = REGION_RECTS(&rgnOther);
+			for (i = nbox, ppt = pptSrc; i--; ppt++, pbox++) {
+				ppt->x = pbox->x1 - rgnOther.extents.x1;
+				ppt->y = pbox->y1 - rgnOther.extents.y1;
+			}
+
+			if (other_bpp == 8)
+				cfbDoBitbltCopy((DrawablePtr)pPixChildren,
+						(DrawablePtr)pScreenPriv->pix8,
+						GXcopy, &rgnOther, pptSrc, ~0L);
+			else
+				cfb32DoBitbltCopy((DrawablePtr)pPixChildren,
+						  (DrawablePtr)pScreenPriv->pix32,
+						  GXcopy, &rgnOther, pptSrc, ~0L);
+
+			DEALLOCATE_LOCAL(pptSrc);
+		}
+
+		if (other_bpp == 8)
+			cfbDestroyPixmap(pPixChildren);
+		else
+			cfb32DestroyPixmap(pPixChildren);
+	}
+	REGION_UNINIT(pScreen, &rgnOther);
+}
+
+Bool
+cfb8_32WidChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
+{
+	return TRUE;
+}
+
+void
+cfb8_32WidWindowExposures(WindowPtr pWin, RegionPtr pReg, RegionPtr pOtherReg)
+{
+	/* Fill in the WID channel before rendering of
+	 * the exposed window area.
+	 */
+	if (REGION_NUM_RECTS(pReg)) {
+		ScreenPtr pScreen = pWin->drawable.pScreen;
+		cfb8_32WidScreenPtr pScreenPriv = 
+			CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+
+		pScreenPriv->WIDOps->WidFillBox((DrawablePtr)pScreenPriv->pixWid,
+						(DrawablePtr)pWin,
+						REGION_NUM_RECTS(pReg), REGION_RECTS(pReg));
+	}
+
+	miWindowExposures(pWin, pReg, pOtherReg);
+}
+
+void
+cfb8_32WidPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
+{
+	if (what == PW_BORDER) {
+		ScreenPtr pScreen = pWin->drawable.pScreen;
+		cfb8_32WidScreenPtr pScreenPriv = 
+			CFB8_32WID_GET_SCREEN_PRIVATE(pScreen);
+
+		pScreenPriv->WIDOps->WidFillBox((DrawablePtr)pScreenPriv->pixWid,
+						(DrawablePtr)pWin,
+						REGION_NUM_RECTS(pRegion),
+						REGION_RECTS(pRegion));
+	}
+
+	if (pWin->drawable.bitsPerPixel == 8)
+		cfbPaintWindow(pWin, pRegion, what);
+	else
+		cfb32PaintWindow(pWin, pRegion, what);
+}
+
Index: xc/programs/Xserver/hw/xnest/Display.h
diff -u xc/programs/Xserver/hw/xnest/Display.h:1.3 xc/programs/Xserver/hw/xnest/Display.h:1.4
--- xc/programs/Xserver/hw/xnest/Display.h:1.3	Sun Dec 20 14:18:57 1998
+++ xc/programs/Xserver/hw/xnest/Display.h	Fri Jun 16 17:27:33 2000
@@ -12,7 +12,7 @@
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.3 1998/12/20 22:18:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.4 2000/06/17 00:27:33 dawes Exp $ */
 
 #ifndef XNESTCOMMON_H
 #define XNESTCOMMON_H
@@ -20,7 +20,7 @@
 #define UNDEFINED -1
 
 #define MAXDEPTH 32
-#define MAXVISUALSPERDEPTH 32
+#define MAXVISUALSPERDEPTH 64
 
 extern Display *xnestDisplay;
 extern XVisualInfo *xnestVisuals;       
Index: xc/programs/Xserver/hw/xnest/Imakefile
diff -u xc/programs/Xserver/hw/xnest/Imakefile:3.15 xc/programs/Xserver/hw/xnest/Imakefile:3.18
--- xc/programs/Xserver/hw/xnest/Imakefile:3.15	Tue Jan 25 10:37:48 2000
+++ xc/programs/Xserver/hw/xnest/Imakefile	Wed Jun 28 12:06:18 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/12 1997/11/03 14:13:20 kaleb $
-XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.15 2000/01/25 18:37:48 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.18 2000/06/28 19:06:18 tsi Exp $
 #include <Server.tmpl>
 
 #ifdef OS2Architecture
@@ -53,15 +53,15 @@
 INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
 	   -I../../mi -I../../include -I../../os \
            -I$(EXTINCSRC) -I$(XINCLUDESRC)
+DEFINES = $(OS_DEFINES) -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+	  -UMITSHM -UXF86DRI -UXFree86LOADER
 
 all:: $(OBJS)
 
 LinkSourceFile(stubs.c,$(SERVERSRC)/Xi)
 SpecialCObjectRule(Init,$(ICONFIGFILES),$(EXT_DEFINES))
 LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
-SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(OS_DEFINES) -UXINPUT \
-	-UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UMITSHM -UDPMSExtension \
-	-UXF86DRI -UXFree86LOADER)
+SpecialCObjectRule(miinitext,$(ICONFIGFILES),-UDPMSExtension)
 
 NormalLibraryObjectRule()
 NormalLibraryTarget(xnest,$(OBJS))
Index: xc/programs/Xserver/include/dix.h
diff -u xc/programs/Xserver/include/dix.h:3.12 xc/programs/Xserver/include/dix.h:3.13
--- xc/programs/Xserver/include/dix.h:3.12	Wed Oct 13 19:45:28 1999
+++ xc/programs/Xserver/include/dix.h	Thu May 18 16:46:23 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.12 1999/10/14 02:45:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.13 2000/05/18 23:46:23 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -399,6 +399,36 @@
     xGetGeometryReply* /* wa */
 #endif
 );
+
+extern int SendConnSetup(
+#if NeedFunctionPrototypes
+    ClientPtr /*client*/,
+    char* /*reason*/
+#endif
+);
+
+extern int
+DoGetImage(
+#if NeedFunctionPrototypes
+    ClientPtr	/*client*/,
+    int /*format*/,
+    Drawable /*drawable*/,
+    int /*x*/, 
+    int /*y*/, 
+    int /*width*/, 
+    int /*height*/,
+    Mask /*planemask*/,
+    xGetImageReply **/*im_return*/
+#endif
+);
+
+#ifdef LBX
+extern void IncrementClientCount(
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+#endif /* LBX */
 
 /* dixutils.c */
 
Index: xc/programs/Xserver/include/dixstruct.h
diff -u xc/programs/Xserver/include/dixstruct.h:3.10 xc/programs/Xserver/include/dixstruct.h:3.11
--- xc/programs/Xserver/include/dixstruct.h:3.10	Fri Nov 19 05:55:03 1999
+++ xc/programs/Xserver/include/dixstruct.h	Fri May  5 10:53:52 2000
@@ -21,7 +21,7 @@
 
 ******************************************************************/
 /* $XConsortium: dixstruct.h /main/43 1996/12/15 21:25:06 rws $ */
-/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.10 1999/11/19 13:55:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.11 2000/05/05 17:53:52 keithp Exp $ */
 
 #ifndef DIXSTRUCT_H
 #define DIXSTRUCT_H
@@ -150,6 +150,7 @@
     int	    smart_priority;
     long    smart_start_tick;
     long    smart_stop_tick;
+    long    smart_check_tick;
 #endif
 }           ClientRec;
 
@@ -159,7 +160,11 @@
  */
 extern long SmartScheduleTime;
 extern long SmartScheduleInterval;
+extern long SmartScheduleSlice;
+extern long SmartScheduleMaxSlice;
 extern Bool SmartScheduleDisable;
+#define SMART_MAX_PRIORITY  20
+#define SMART_MIN_PRIORITY  -20
 #endif
 
 /* This prototype is used pervasively in Xext, dix */
Index: xc/programs/Xserver/include/globals.h
diff -u xc/programs/Xserver/include/globals.h:1.3 xc/programs/Xserver/include/globals.h:1.4
--- xc/programs/Xserver/include/globals.h:1.3	Sat Sep 25 07:38:21 1999
+++ xc/programs/Xserver/include/globals.h	Wed Jun 28 11:21:22 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */
 
 #ifndef _XSERV_GLOBAL_H_
 #define _XSERV_GLOBAL_H_
@@ -25,7 +25,7 @@
 
 extern DDXPointRec dixScreenOrigins[MAXSCREENS];
 
-#if DPMSExtension
+#ifdef DPMSExtension
 extern CARD32 defaultDPMSStandbyTime;
 extern CARD32 defaultDPMSSuspendTime;
 extern CARD32 defaultDPMSOffTime;
Index: xc/programs/Xserver/include/os.h
diff -u xc/programs/Xserver/include/os.h:3.30 xc/programs/Xserver/include/os.h:3.34
--- xc/programs/Xserver/include/os.h:3.30	Tue Oct 12 21:21:38 1999
+++ xc/programs/Xserver/include/os.h	Thu Jun 15 18:50:21 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/os.h,v 3.30 1999/10/13 04:21:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/os.h,v 3.34 2000/06/16 01:50:21 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -50,8 +50,10 @@
 #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
 #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
 #include "Xalloca.h"
-#if NeedVarargsPrototypes
+#ifndef IN_MODULE
 #include <stdarg.h>
+#else
+#include "xf86_ansic.h"
 #endif
 
 #define NullFID ((FID) 0)
@@ -123,6 +125,12 @@
     ClientPtr /*client*/
 #endif
 );
+
+extern int ClientConnectionNumber(
+#if NeedFunctionPrototypes
+    ClientPtr /*client*/
+#endif
+);
 #else
 extern int ReadRequestFromClient(
 #if NeedFunctionPrototypes
@@ -273,6 +281,20 @@
 #endif
 );
 
+#ifdef LBX
+extern void CloseDownFileDescriptor(
+#if NeedFunctionPrototypes
+    ClientPtr /* client */
+#endif
+);
+#endif
+
+extern void AvailableClientInput(
+#if NeedFunctionPrototypes
+    ClientPtr /* client */
+#endif
+);
+
 extern void Error(
 #if NeedFunctionPrototypes
     char* /*str*/
@@ -531,6 +553,8 @@
 #define Popen(a,b) popen(a,b)
 #define Pclose(a) pclose(a)
 #endif
+
+extern void CheckUserParameters(int argc, char **argv, char **envp);
 
 extern int AddHost(
 #if NeedFunctionPrototypes
Index: xc/programs/Xserver/include/scrnintstr.h
diff -u xc/programs/Xserver/include/scrnintstr.h:1.7 xc/programs/Xserver/include/scrnintstr.h:1.8
--- xc/programs/Xserver/include/scrnintstr.h:1.7	Thu Feb 10 22:27:25 2000
+++ xc/programs/Xserver/include/scrnintstr.h	Thu Apr 27 09:26:49 2000
@@ -41,7 +41,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.7 2000/02/11 06:27:25 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.8 2000/04/27 16:26:49 eich Exp $ */
 
 #ifndef SCREENINTSTRUCT_H
 #define SCREENINTSTRUCT_H
@@ -942,8 +942,8 @@
 
 #ifdef PIXPRIV
     int			PixmapPrivateLen;
-    unsigned		*PixmapPrivateSizes;
-    unsigned		totalPixmapSize;
+    unsigned int		*PixmapPrivateSizes;
+    unsigned int		totalPixmapSize;
 #endif
 
     MarkWindowProcPtr		MarkWindow;
Index: xc/programs/Xserver/include/servermd.h
diff -u xc/programs/Xserver/include/servermd.h:3.38 xc/programs/Xserver/include/servermd.h:3.39
--- xc/programs/Xserver/include/servermd.h:3.38	Mon Feb 21 17:04:01 2000
+++ xc/programs/Xserver/include/servermd.h	Thu May 18 09:30:02 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.38 2000/02/22 01:04:01 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.39 2000/05/18 16:30:02 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -170,10 +170,7 @@
 #if (defined(sun) && !(defined(i386) && defined(SVR4))) || \
     (defined(AMOEBA) && (defined(sparc) || defined(mc68000))) || \
     (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \
-    (defined(Lynx) && defined(__sparc__)) || \
-    (defined(linux) && defined(__sparc__)) || \
-    ((defined(__NetBSD__) || defined(__OpenBSD__)) && \
-     (defined(__sparc__) || defined(__mc68000__)))
+    defined(__sparc__) || defined(__mc68000__)
 
 #if defined(sun386) || defined(sun5)
 # define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the SUN only */
@@ -363,7 +360,15 @@
 
 #endif /* luna */
 
-#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && (defined(__i386__) || defined(__alpha__))) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) || defined(__OS2ELF__) || (defined(__GNU__) && defined(__i386__)) || defined(__QNX__)
+#if	(defined(AMOEBA) && defined(i80386)) || \
+	(defined(SVR4) && defined(i386)) || \
+	defined(__alpha__) || \
+	defined(__i386__) || \
+	defined(__EMX__) || \
+	defined(__OS2ELF__) || \
+	defined(__QNX__) || \
+	defined(MACH386) || \
+	defined(MINIX)
 
 #ifndef IMAGE_BYTE_ORDER
 #define IMAGE_BYTE_ORDER	LSBFirst
Index: xc/programs/Xserver/include/site.h
diff -u xc/programs/Xserver/include/site.h:1.4 xc/programs/Xserver/include/site.h:1.5
--- xc/programs/Xserver/include/site.h:1.4	Sun Oct  4 02:39:02 1998
+++ xc/programs/Xserver/include/site.h	Thu May 18 09:30:02 2000
@@ -41,6 +41,7 @@
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/programs/Xserver/include/site.h,v 1.5 2000/05/18 16:30:02 dawes Exp $ */
 
 #ifndef SITE_H
 #define SITE_H
@@ -95,19 +96,12 @@
 #else
 #define DEFAULT_AUTOREPEAT	FALSE
 #endif
-#ifdef hpux
 #define DEFAULT_AUTOREPEATS	{\
         0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
         0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-#else
-#define DEFAULT_AUTOREPEATS	{\
-	0, 0, 0, 0, 0, 0, 0, 0,\
-	0, 0, 0, 0, 0, 0, 0, 0,\
-	0, 0, 0, 0, 0, 0, 0, 0,\
-	0, 0, 0, 0, 0, 0, 0, 0 }
-#endif
+
 #define DEFAULT_LEDS		0x0        /* all off */
 #define DEFAULT_LEDS_MASK	0xffffffff /* 32 */
 #define DEFAULT_INT_RESOLUTION		1000
Index: xc/programs/Xserver/lbx/lbxcmap.c
diff -u xc/programs/Xserver/lbx/lbxcmap.c:1.5 xc/programs/Xserver/lbx/lbxcmap.c:1.6
--- xc/programs/Xserver/lbx/lbxcmap.c:1.5	Sun Nov 15 03:11:18 1998
+++ xc/programs/Xserver/lbx/lbxcmap.c	Thu May 18 16:46:23 2000
@@ -21,7 +21,7 @@
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.5 1998/11/15 11:11:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.6 2000/05/18 23:46:23 dawes Exp $ */
 
 #include <sys/types.h>
 #define NEED_REPLIES
@@ -35,6 +35,7 @@
 #include "resource.h"
 #include "scrnintstr.h"
 #include "colormapst.h"
+#include "propertyst.h"
 #define _XLBX_SERVER_
 #include "lbxstr.h"
 #include "lbxserve.h"
@@ -67,8 +68,7 @@
 #define CMAP_GRABBED		1
 #define CMAP_WAITING_FOR_UNGRAB	2
 
-static int LbxUnstallClient();
-void LbxReleaseCmap();
+static int LbxUnstallClient(pointer data, XID id);
 
 static RESTYPE StalledResType;
 
@@ -77,8 +77,7 @@
  */
 
 static LbxColormapPriv *
-LbxColormapPrivInit (pmap)
-    ColormapPtr pmap;
+LbxColormapPrivInit (ColormapPtr pmap)
 {
     LbxColormapPriv *cmapPriv;
 
@@ -100,8 +99,7 @@
 
 
 static int
-LbxDefCmapPrivInit (pmap)
-    ColormapPtr pmap;
+LbxDefCmapPrivInit (ColormapPtr pmap)
 {
 #if 0
     /* BUG: You can't do that. lbxColormapPrivIndex hasn't 
@@ -112,8 +110,7 @@
 }
 
 static Bool
-LbxCreateColormap (pmap)
-    ColormapPtr pmap;
+LbxCreateColormap (ColormapPtr pmap)
 {
     ScreenPtr pScreen = pmap->pScreen;
     Bool ret;
@@ -130,8 +127,7 @@
 }
 
 static void
-LbxDestroyColormap (pmap)
-    ColormapPtr pmap;
+LbxDestroyColormap (ColormapPtr pmap)
 {
     ScreenPtr pScreen = pmap->pScreen;
 
@@ -149,7 +145,7 @@
  */
 
 int
-LbxCmapInit ()
+LbxCmapInit (void)
 
 {
     LbxScreenPriv *pScreenPriv;
@@ -197,9 +193,8 @@
  */
 
 static int
-NumAllocatedCells (pent, size)
-    EntryPtr pent;
-    int size;
+NumAllocatedCells (EntryPtr pent,
+		   int size)
 {
     Pixel pixel;
     int count = 0;
@@ -230,13 +225,12 @@
  */
 
 static CARD8 *
-OutputChannel(pmap, chan, size, ptr, flags, channels)
-    ColormapPtr pmap;
-    EntryPtr chan;
-    int size;
-    CARD8 *ptr;
-    CARD8 flags;
-    CARD8 channels;
+OutputChannel(ColormapPtr pmap,
+	      EntryPtr chan,
+	      int size,
+	      CARD8 *ptr,
+	      CARD8 flags,
+	      CARD8 channels)
 {
     Bool	px2;
     Bool	rgb2;
@@ -340,11 +334,10 @@
 }
 
 static void
-GetAllocatedCells (pmap, flags, buf, bytes)
-    ColormapPtr pmap;
-    CARD8 *flags;
-    CARD8 *buf;
-    int *bytes;
+GetAllocatedCells (ColormapPtr pmap,
+		   CARD8 *flags,
+		   CARD8 *buf,
+		   int *bytes)
 {
     CARD8	*ptr;
 
@@ -376,9 +369,8 @@
  */
 
 static void
-SendReleaseCmapEvent (proxy, cmap)
-    LbxProxyPtr proxy;
-    Colormap cmap;
+SendReleaseCmapEvent (LbxProxyPtr proxy,
+		      Colormap cmap)
 {
     xLbxReleaseCmapEvent ev;
     ClientPtr client;
@@ -421,9 +413,8 @@
  */
 
 static Bool
-WaitForServerCmapControl (client, pmap)
-    register ClientPtr client;
-    register ColormapPtr pmap;
+WaitForServerCmapControl (ClientPtr client,
+			  ColormapPtr pmap)
 {
     LbxColormapPriv *cmapPriv = (LbxColormapPriv *)
 	(pmap->devPrivates[lbxColormapPrivIndex].ptr);
@@ -457,10 +448,9 @@
  */
 
 Bool
-LbxCheckColorRequest (client, pmap, req)
-    ClientPtr client;
-    ColormapPtr pmap;
-    xReq *req;
+LbxCheckColorRequest (ClientPtr client,
+		      ColormapPtr pmap,
+		      xReq *req)
 {
     LbxColormapPriv *cmapPriv = (LbxColormapPriv *)
 	(pmap->devPrivates[lbxColormapPrivIndex].ptr);
@@ -551,9 +541,8 @@
 }
 
 static Bool
-LbxGrabbedByClient (client, pmap)
-    ClientPtr client;
-    ColormapPtr pmap;
+LbxGrabbedByClient (ClientPtr client,
+		    ColormapPtr pmap)
 {
     LbxColormapPriv *cmapPriv = (LbxColormapPriv *)
 	(pmap->devPrivates[lbxColormapPrivIndex].ptr);
@@ -567,8 +556,7 @@
  */
 
 int
-LbxCheckCmapGrabbed (pmap)
-    ColormapPtr pmap;
+LbxCheckCmapGrabbed (ColormapPtr pmap)
 {
     LbxColormapPriv *cmapPriv = (LbxColormapPriv *)
 	(pmap->devPrivates[lbxColormapPrivIndex].ptr);
@@ -582,8 +570,7 @@
  */
 
 void
-LbxDisableSmartGrab (pmap)
-    ColormapPtr pmap;
+LbxDisableSmartGrab (ColormapPtr pmap)
 {
     LbxColormapPriv *cmapPriv = (LbxColormapPriv *)
 	(pmap->devPrivates[lbxColormapPrivIndex].ptr);
@@ -598,11 +585,10 @@
  */
 
 static void
-SendFreeCellsEvent (proxy, cmap, pixel_start, pixel_end)
-    LbxProxyPtr proxy;
-    Colormap cmap;
-    Pixel pixel_start;
-    Pixel pixel_end;
+SendFreeCellsEvent (LbxProxyPtr proxy,
+		    Colormap cmap,
+		    Pixel pixel_start,
+		    Pixel pixel_end)
 {
     xLbxFreeCellsEvent ev;
     ClientPtr client;
@@ -651,8 +637,7 @@
 
 /*ARGSUSED*/
 void
-LbxBeginFreeCellsEvent (pmap)
-    ColormapPtr pmap;
+LbxBeginFreeCellsEvent (ColormapPtr pmap)
 {
     pixel_start = -1;
     pixel_end = -1;
@@ -660,9 +645,8 @@
 
 
 void
-LbxAddFreeCellToEvent (pmap, pixel)
-    ColormapPtr pmap;
-    Pixel pixel;
+LbxAddFreeCellToEvent (ColormapPtr pmap,
+		       Pixel pixel)
 {
     /*
      * We must notify the proxy that has this colormap
@@ -696,8 +680,7 @@
 }
 
 void
-LbxEndFreeCellsEvent (pmap)
-    ColormapPtr pmap;
+LbxEndFreeCellsEvent (ColormapPtr pmap)
 {
     /*
      * Check if there is an LbxFreeCellEvent we need to write.
@@ -721,9 +704,8 @@
  */
 
 void
-LbxSortPixelList (pixels, count)
-    Pixel *pixels;
-    int count;
+LbxSortPixelList (Pixel *pixels,
+		  int count)
 {
      int i, j;
 
@@ -743,8 +725,7 @@
  */
 
 int
-ProcLbxGrabCmap(client)
-    register ClientPtr client;
+ProcLbxGrabCmap(ClientPtr client)
 {
     REQUEST(xLbxGrabCmapReq);
     xLbxGrabCmapReply *reply;
@@ -936,9 +917,8 @@
 }
 
 static int
-LbxUnstallClient(data, id)
-    pointer     data;
-    XID         id;
+LbxUnstallClient(pointer     data,
+		 XID         id)
 {
     LbxColormapPriv *cmapPriv = (LbxColormapPriv *)data;
     LbxStalled **prev;
@@ -954,9 +934,8 @@
 }
 
 void
-LbxReleaseCmap(pmap, smart)
-    ColormapPtr pmap;
-    Bool smart;
+LbxReleaseCmap(ColormapPtr pmap,
+	       Bool smart)
 {
     LbxColormapPriv *cmapPriv;
     ColormapPtr *prev;
@@ -988,8 +967,7 @@
  */
 
 int
-ProcLbxReleaseCmap(client)
-    register ClientPtr	client;
+ProcLbxReleaseCmap(ClientPtr	client)
 {
     REQUEST(xLbxReleaseCmapReq);
     ColormapPtr pmap;
@@ -1022,8 +1000,7 @@
  */
 
 int
-ProcLbxAllocColor(client)
-    register ClientPtr	client;
+ProcLbxAllocColor(ClientPtr	client)
 {
     REQUEST(xLbxAllocColorReq);
     ColormapPtr pmap;
@@ -1082,8 +1059,7 @@
  */
 
 int
-ProcLbxIncrementPixel(client)
-    register ClientPtr	client;
+ProcLbxIncrementPixel(ClientPtr	client)
 {
     REQUEST(xLbxIncrementPixelReq);
     ColormapPtr pmap;
Index: xc/programs/Xserver/lbx/lbxdix.c
diff -u xc/programs/Xserver/lbx/lbxdix.c:1.3 xc/programs/Xserver/lbx/lbxdix.c:1.4
--- xc/programs/Xserver/lbx/lbxdix.c:1.3	Sun Jun 13 09:18:16 1999
+++ xc/programs/Xserver/lbx/lbxdix.c	Thu May 18 16:46:24 2000
@@ -42,7 +42,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.3 1999/06/13 16:18:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.4 2000/05/18 23:46:24 dawes Exp $ */
 
 /* various bits of DIX-level mangling */
 
@@ -69,18 +69,19 @@
 #include "lbxtags.h"
 #include "lbxdata.h"
 #include "Xfuncproto.h"
+#ifdef XAPPGROUP
+#include "Xagsrv.h"
+#endif
 
-extern void CopySwap32Write();
-extern int  (*ProcVector[256]) ();
-extern int  (*SwappedProcVector[256]) ();
-extern void (*ReplySwapVector[256]) ();
+extern ReplySwapPtr CopySwap32Write;
+extern int  (*ProcVector[256]) (ClientPtr);
+extern int  (*SwappedProcVector[256]) (ClientPtr);
 
-extern void LbxWriteSConnSetupPrefix();
 
 int         lbx_font_private = -1;
 
 void
-LbxDixInit()
+LbxDixInit(void)
 {
     TagInit();
     lbx_font_private = AllocateFontPrivateIndex();
@@ -88,9 +89,8 @@
 
 /* ARGSUSED */
 void
-LbxAllowMotion(client, num)
-    ClientPtr	client;
-    int		num;
+LbxAllowMotion(ClientPtr       	client,
+	       int		num)
 {
     LbxProxyPtr proxy = LbxProxy(client);
     proxy->motion_allowed_events += num;
@@ -102,9 +102,8 @@
 extern int  connBlockScreenStart;
 
 int
-LbxSendConnSetup(client, reason)
-    ClientPtr   client;
-    char       *reason;
+LbxSendConnSetup(ClientPtr   client,
+		 char       *reason)
 {
     int		dlength;
     int         i, ndex, lim, wndex;
@@ -192,8 +191,7 @@
 static XID modifier_map_tag;
 
 int
-LbxGetModifierMapping(client)
-    ClientPtr   client;
+LbxGetModifierMapping(ClientPtr   client)
 {
     TagData     td;
     pointer     tagdata;
@@ -242,7 +240,7 @@
 }
 
 void
-LbxFlushModifierMapTag()
+LbxFlushModifierMapTag(void)
 {
 
     if (modifier_map_tag)
@@ -252,8 +250,7 @@
 static XID keyboard_map_tag;
 
 int
-LbxGetKeyboardMapping(client)
-    ClientPtr   client;
+LbxGetKeyboardMapping(ClientPtr   client)
 {
     TagData     td;
     pointer     tagdata;
@@ -325,7 +322,7 @@
 }
 
 void
-LbxFlushKeyboardMapTag()
+LbxFlushKeyboardMapTag(void)
 {
     if (keyboard_map_tag)
 	TagDeleteTag(keyboard_map_tag);
@@ -333,8 +330,7 @@
 
 /* counts number of bits needed to hold value */
 static int
-_bitsize(val)
-    int         val;
+_bitsize(int val)
 {
     int         bits = 1;  /* always need one for sign bit */
 
@@ -361,10 +357,9 @@
 int  _lbx_fi_junklen = sizeof(BYTE) * 2 + sizeof(CARD16) + sizeof(CARD32);
 
 static int
-squish_font_info(qfr, rlen, sqrep)
-    xQueryFontReply *qfr;
-    int         rlen;
-    xLbxFontInfo **sqrep;
+squish_font_info(xQueryFontReply *qfr,
+		 int             rlen,
+		 xLbxFontInfo    **sqrep)
 {
     int         len,
                 hlen;
@@ -456,8 +451,7 @@
 }
 
 int
-LbxQueryFont(client)
-    ClientPtr   client;
+LbxQueryFont(ClientPtr   client)
 {
     xQueryFontReply *reply;
     xLbxQueryFontReply lbxrep;
@@ -593,8 +587,7 @@
 }
 
 void
-LbxFreeFontTag(pfont)
-    FontPtr     pfont;
+LbxFreeFontTag(FontPtr     pfont)
 {
     FontTagInfoPtr ftip;
 
@@ -603,19 +596,18 @@
 	TagDeleteTag(ftip->tid);
 }
 
-LbxInvalidateTag(client, tag)
-    ClientPtr   client;
-    XID         tag;
+int
+LbxInvalidateTag(ClientPtr   client,
+		 XID         tag)
 {
     TagClearProxy(tag, LbxProxyID(client));
     return client->noClientException;
 }
 
 void
-LbxSendInvalidateTag(client, tag, tagtype)
-    ClientPtr   client;
-    XID         tag;
-    int         tagtype;
+LbxSendInvalidateTag(ClientPtr   client,
+		     XID         tag,
+		     int         tagtype)
 {
     xLbxInvalidateTagEvent ev;
     int         n;
@@ -638,10 +630,9 @@
 }
 
 static void
-LbxSendSendTagData(pid, tag, tagtype)
-    int         pid;
-    XID         tag;
-    int         tagtype;
+LbxSendSendTagData(int         pid,
+		   XID         tag,
+		   int         tagtype)
 {
     xLbxSendTagDataEvent ev;
     int         n;
@@ -690,9 +681,8 @@
 #define	LbxSendTagAlreadySent	1
 
 static Bool
-LbxQueueSendTag(client, tag)
-    ClientPtr   client;
-    XID         tag;
+LbxQueueSendTag(ClientPtr   client,
+		XID         tag)
 {
     SendTagQPtr stqp, *prev, new;
     ClientPtr  *newlist;
@@ -732,9 +722,8 @@
     return LbxSendTagSendIt;
 }
 
-SendTagQPtr
-LbxFindQTag(tag)
-    XID tag;
+static SendTagQPtr
+LbxFindQTag(XID tag)
 {
     SendTagQPtr stqp;
 
@@ -746,16 +735,14 @@
 }
 
 static void
-LbxFreeQTag(stqp)
-    SendTagQPtr stqp;
+LbxFreeQTag(SendTagQPtr stqp)
 {
     xfree(stqp->stalled_clients);
     xfree(stqp);
 }
 
 static void
-LbxRemoveQTag(tag)
-    XID	tag;
+LbxRemoveQTag(XID	tag)
 {
     SendTagQPtr stqp, *prev;
 
@@ -769,8 +756,7 @@
 }
 
 Bool
-LbxFlushQTag(tag)
-    XID tag;
+LbxFlushQTag(XID tag)
 {
     SendTagQPtr stqp;
     ClientPtr *cp;
@@ -785,7 +771,7 @@
 }
 
 void
-ProcessQTagZombies()
+ProcessQTagZombies(void)
 {
     SendTagQPtr stqp;
     ClientPtr *out, *in;
@@ -807,11 +793,10 @@
  */
 
 void
-LbxQueryTagData(client, owner_pid, tag, tagtype)
-    ClientPtr   client;
-    int         owner_pid;
-    XID         tag;
-    int         tagtype;
+LbxQueryTagData(ClientPtr   client,
+		int         owner_pid,
+		XID         tag,
+		int         tagtype)
 {
     /* save the info and the client being stalled */
     if (LbxQueueSendTag(client, tag) == LbxSendTagSendIt)
@@ -822,11 +807,10 @@
  * server recieves this
  */
 int
-LbxTagData(client, tag, len, data)
-    ClientPtr   client;
-    XID         tag;
-    unsigned long len;
-    pointer     data;
+LbxTagData(ClientPtr     client,
+	   XID           tag,
+	   unsigned long len,
+	   pointer       data)
 {
     TagData     td;
     PropertyPtr pProp;
@@ -869,7 +853,7 @@
 
 /* when server resets, need to reset global tags */
 void
-LbxResetTags()
+LbxResetTags(void)
 {
     SendTagQPtr stqp;
 
Index: xc/programs/Xserver/lbx/lbxexts.c
diff -u xc/programs/Xserver/lbx/lbxexts.c:1.1.1.1 xc/programs/Xserver/lbx/lbxexts.c:1.2
--- xc/programs/Xserver/lbx/lbxexts.c:1.1.1.1	Sat Dec 21 20:07:18 1996
+++ xc/programs/Xserver/lbx/lbxexts.c	Thu May 18 16:46:24 2000
@@ -21,13 +21,17 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
 #include "misc.h"
 #include "dixstruct.h"
+#include "colormapst.h"
+#include "propertyst.h"
 #define _XLBX_SERVER_
 #include "lbxstr.h"
+#include "lbxserve.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
 #include "extensions/security.h"
@@ -54,15 +58,14 @@
 
 
 Bool
-LbxAddExtension(name, opcode, ev_base, err_base)
-    char       *name;
-    int         opcode;
-    int         ev_base,
-                err_base;
+LbxAddExtension(char       *name,
+		int         opcode,
+		int         ev_base,
+                int	    err_base)
 {
     int         i;
-    register LbxExtensionEntry *ext,
-              **newexts;
+    LbxExtensionEntry *ext,
+	**newexts;
 
     ext = (LbxExtensionEntry *) xalloc(sizeof(LbxExtensionEntry));
     if (!ext)
@@ -102,9 +105,8 @@
 }
 
 Bool
-LbxAddExtensionAlias(idx, alias)
-    int         idx;
-    char       *alias;
+LbxAddExtensionAlias(int         idx,
+		     char       *alias)
 {
     char       *name;
     char      **aliases;
@@ -125,9 +127,8 @@
 }
 
 static int
-LbxFindExtension(extname, len)
-    char *extname;
-    int len;
+LbxFindExtension(char *extname,
+		 int len)
 {
     int i, j;
 
@@ -145,9 +146,8 @@
 }
 
 void
-LbxDeclareExtensionSecurity(extname, secure)
-    char *extname;
-    Bool secure;
+LbxDeclareExtensionSecurity(char *extname,
+			    Bool secure)
 {
 #ifdef XCSECURITY
     int i = LbxFindExtension(extname, strlen(extname));
@@ -157,11 +157,10 @@
 }
 
 Bool
-LbxRegisterExtensionGenerationMasks(idx, num_reqs, rep_mask, ev_mask)
-    int         idx;
-    int         num_reqs;
-    char       *rep_mask,
-               *ev_mask;
+LbxRegisterExtensionGenerationMasks(int         idx,
+				    int         num_reqs,
+				    char       *rep_mask,
+				    char       *ev_mask)
 {
     LbxExtensionEntry *ext = lbx_extensions[idx];
     CARD8      *nrm,
@@ -186,10 +185,9 @@
 }
 
 int
-LbxQueryExtension(client, ename, nlen)
-    ClientPtr   client;
-    char       *ename;
-    int         nlen;
+LbxQueryExtension(ClientPtr   client,
+		  char       *ename,
+		  int         nlen)
 {
     xLbxQueryExtensionReply rep;
     int         i;
@@ -237,7 +235,8 @@
     return Success;
 }
 
-LbxCloseDownExtensions()
+void
+LbxCloseDownExtensions(void)
 {
     int         i;
 
@@ -254,10 +253,9 @@
 }
 
 void
-LbxSetReqMask(mask, req, on)
-    CARD8      *mask;
-    int         req;
-    Bool        on;
+LbxSetReqMask(CARD8      *mask,
+	      int         req,
+	      Bool        on)
 {
     int         mword = req / (8 * sizeof(CARD8));
 
Index: xc/programs/Xserver/lbx/lbxgfx.c
diff -u xc/programs/Xserver/lbx/lbxgfx.c:1.1.1.1 xc/programs/Xserver/lbx/lbxgfx.c:1.2
--- xc/programs/Xserver/lbx/lbxgfx.c:1.1.1.1	Sat Dec 21 20:07:19 1996
+++ xc/programs/Xserver/lbx/lbxgfx.c	Thu May 18 16:46:24 2000
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 /* various bits of DIX-level mangling */
 
@@ -48,21 +49,19 @@
 #define DrawableCache(client)	(LbxClient(client)->drawableCache)
 #define GContextCache(client)	(LbxClient(client)->gcontextCache)
 
-extern int (*ProcVector[256])();
+extern int (*ProcVector[256])(ClientPtr);
 
 static void
-push (cache, xid)
-    XID	    cache[GFX_CACHE_SIZE];
-    XID	    xid;
+push (XID	    cache[GFX_CACHE_SIZE],
+      XID	    xid)
 {
     memmove (cache+1, cache, (GFX_CACHE_SIZE - 1) * sizeof (cache[0]));
     cache[0] = xid;
 }
 
 static XID
-use (cache, i)
-    XID	    cache[GFX_CACHE_SIZE];
-    int	    i;
+use (XID	    cache[GFX_CACHE_SIZE],
+     int	    i)
 {
     XID	tmp;
 
@@ -77,13 +76,12 @@
 
 extern char *ConnectionInfo;
 
-int
-LbxDecodeGFXCache(client, cacheEnts, after, drawp, gcp)
-    ClientPtr		client;
-    CARD8		cacheEnts;
-    char		*after;
-    Drawable		*drawp;
-    GContext		*gcp;
+static int
+LbxDecodeGFXCache(ClientPtr	client,
+		  CARD8		cacheEnts,
+		  char		*after,
+		  Drawable	*drawp,
+		  GContext	*gcp)
 {
     int	skip;
     int	dcache, gcache;
@@ -111,12 +109,11 @@
     return skip;
 }
 
-int
-LbxDecodeDrawableCache(client, cacheEnts, after, drawp)
-    ClientPtr		client;
-    CARD8		cacheEnts;
-    char		*after;
-    Drawable		*drawp;
+static int
+LbxDecodeDrawableCache(ClientPtr	client,
+		       CARD8		cacheEnts,
+		       char		*after,
+		       Drawable		*drawp)
 {
     int	skip;
     int	dcache;
@@ -135,12 +132,12 @@
     return skip;
 }
 
-int
-LbxDecodeGCCache(client, cacheEnts, after, gcp)
-    ClientPtr		client;
-    CARD8		cacheEnts;
-    char		*after;
-    GContext		*gcp;
+#ifdef notyet
+static int
+LbxDecodeGCCache(ClientPtr	client,
+		 CARD8		cacheEnts,
+		 char		*after,
+		 GContext	*gcp)
 {
     int	skip;
     int	gcache;
@@ -158,6 +155,7 @@
 	*gcp = use (GContextCache(client), gcache);
     return skip;
 }
+#endif
 
 #define GFX_GET_DRAWABLE_AND_GC(type,in,len) {\
     int	    skip;   \
@@ -203,10 +201,9 @@
 }
 
 int
-LbxDecodePoly(client, xreqtype, decode_rtn)
-    register ClientPtr  client;
-    CARD8		xreqtype;
-    int			(*decode_rtn)();
+LbxDecodePoly(ClientPtr client,
+	      CARD8	xreqtype,
+	      int 	(*decode_rtn)(char *, char *, short *))
 {
     REQUEST(xLbxPolyPointReq);
     char		*in;
@@ -220,7 +217,7 @@
     if ((xreq = (xPolyPointReq *) 
 	    xalloc(sizeof(xPolyPointReq) + (len << 1))) == NULL)
 	return BadAlloc;
-    len = (*decode_rtn)(in, in + len - stuff->padBytes, &xreq[1]);
+    len = (*decode_rtn)(in, in + len - stuff->padBytes, (short *)(&xreq[1]));
     xreq->reqType = xreqtype;
     xreq->coordMode = 1;
     xreq->drawable = drawable;
@@ -234,8 +231,7 @@
 }
 
 int
-LbxDecodeFillPoly(client)
-    register ClientPtr  client;
+LbxDecodeFillPoly(ClientPtr  client)
 {
     REQUEST(xLbxFillPolyReq);
     char		*in;
@@ -314,10 +310,9 @@
     }
 
 int
-LbxDecodePoints(in, inend, out)
-    register char  *in;
-    char	   *inend;
-    register short *out;
+LbxDecodePoints(char  	*in,
+		char	*inend,
+		short 	*out)
 {
     char	   *start_out = (char *)out;
 
@@ -331,12 +326,11 @@
 }
 
 int
-LbxDecodeSegment(in, inend, out)
-    register char  *in;
-    char	   *inend;
-    register short *out;
+LbxDecodeSegment(char	*in,
+		 char	*inend,
+		 short	*out)
 {
-    register short diff;
+    short 	   diff;
     short	   last_x = 0;
     short	   last_y = 0;
     char	   *start_out = (char *)out;
@@ -362,12 +356,11 @@
 }
 
 int
-LbxDecodeRectangle(in, inend, out)
-    register char  *in;
-    char	   *inend;
-    register short *out;
+LbxDecodeRectangle(char	 *in,
+		   char	 *inend,
+		   short *out)
 {
-    register short diff;
+    short	   diff;
     short	   last_x = 0;
     short	   last_y = 0;
     char	   *start_out = (char *)out;
@@ -391,12 +384,11 @@
 }
 
 int
-LbxDecodeArc(in, inend, out)
-    register char  *in;
-    char	   *inend;
-    register short *out;
+LbxDecodeArc(char  *in,
+	     char  *inend,
+	     short *out)
 {
-    register short diff;
+    short 	   diff;
     short	   last_x = 0;
     short	   last_y = 0;
     char	   *start_out = (char *)out;
@@ -425,8 +417,7 @@
 }
 
 int
-LbxDecodeCopyArea (client)
-    ClientPtr	client;
+LbxDecodeCopyArea (ClientPtr	client)
 {
     REQUEST(xLbxCopyAreaReq);
     char		*in;
@@ -452,8 +443,7 @@
 }
 
 int
-LbxDecodeCopyPlane (client)
-    ClientPtr	client;
+LbxDecodeCopyPlane (ClientPtr	client)
 {
     REQUEST(xLbxCopyPlaneReq);
     char		*in;
@@ -480,9 +470,8 @@
 }
 
 static pointer
-get_gfx_buffer(client, len)
-    ClientPtr	client;
-    int		len;
+get_gfx_buffer(ClientPtr	client,
+	       int		len)
 {
     LbxClientPtr    lbxClient = LbxClient(client);
     pointer	tmp;
@@ -499,8 +488,7 @@
 }
 
 int
-LbxDecodePolyText (client)
-    ClientPtr	client;
+LbxDecodePolyText (ClientPtr	client)
 {
     REQUEST(xLbxPolyTextReq);
     char		*in, *pos;
@@ -527,8 +515,7 @@
 }
 
 int
-LbxDecodeImageText (client)
-    ClientPtr	client;
+LbxDecodeImageText (ClientPtr	client)
 {
     REQUEST(xLbxImageTextReq);
     char		*in, *pos;
@@ -556,8 +543,7 @@
 }
 
 int
-LbxDecodePutImage (client)
-    register ClientPtr  client;
+LbxDecodePutImage (ClientPtr  client)
 {
     REQUEST		(xLbxPutImageReq);
     char		*in, *data;
@@ -698,8 +684,7 @@
 }
 
 int
-LbxDecodeGetImage (client)
-    register ClientPtr  client;
+LbxDecodeGetImage (ClientPtr  client)
 {
     REQUEST		(xLbxGetImageReq);
     xLbxGetImageReply	*reply = NULL;
Index: xc/programs/Xserver/lbx/lbxmain.c
diff -u xc/programs/Xserver/lbx/lbxmain.c:1.6 xc/programs/Xserver/lbx/lbxmain.c:1.8
--- xc/programs/Xserver/lbx/lbxmain.c:1.6	Sun Oct  4 02:39:05 1998
+++ xc/programs/Xserver/lbx/lbxmain.c	Wed Jun  7 15:03:14 2000
@@ -41,7 +41,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.6 1998/10/04 09:39:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.8 2000/06/07 22:03:14 tsi Exp $ */
  
 #include <sys/types.h>
 #define NEED_REPLIES
@@ -59,12 +59,13 @@
 #include "gcstruct.h"
 #include "extnsionst.h"
 #include "servermd.h"
-#include "lbxdeltastr.h"
 #define _XLBX_SERVER_
 #include "lbxstr.h"
+#include "lbxdeltastr.h"
 #include "lbxserve.h"
 #include "lbximage.h"
 #include "lbxsrvopts.h"
+#include "lbxtags.h"
 #include "Xfuncproto.h"
 #include <errno.h>
 #ifdef X_NOT_STDC_ENV
@@ -84,12 +85,13 @@
 #define CloseLbxClient	0xff
 
 #define MAXBYTESDIFF	8
+
+extern void LbxAllowMotion ( ClientPtr client, int num );
+extern int LbxDecodePoints ( char *in, char *inend, short *out );
+extern int LbxDecodeSegment ( char *in, char *inend, short *out );
+extern int LbxDecodeRectangle ( char *in, char *inend, short *out );
+extern int LbxDecodeArc ( char *in, char *inend, short *out );
 
-extern void	LbxAllowMotion();
-extern int	LbxDecodePoints();
-extern int	LbxDecodeSegment();
-extern int	LbxDecodeRectangle();
-extern int	LbxDecodeArc();
 
 extern int	GrabInProgress;
 
@@ -99,13 +101,12 @@
 				 * proxy = 0
 				 */
 
-int ProcLbxDispatch();
-extern int SProcLbxDispatch();
-static void LbxResetProc();
-static int DecodeLbxDelta();
-static void LbxFreeClient ();
-static void LbxShutdownProxy ();
 
+static void LbxResetProc ( ExtensionEntry *extEntry );
+static void LbxFreeClient ( ClientPtr client );
+static void LbxShutdownProxy ( LbxProxyPtr proxy );
+static int DecodeLbxDelta ( ClientPtr client );
+
 static LbxProxyPtr proxyList;
 unsigned char LbxReqCode;
 int 	LbxEventCode;
@@ -118,7 +119,7 @@
 
 extern xConnSetupPrefix connSetupPrefix;
 extern char *ConnectionInfo;
-extern int  (*LbxInitialVector[3])();
+extern int  (*LbxInitialVector[3])(ClientPtr);
 
 #ifdef DEBUG
 int lbxDebug = 0;
@@ -126,7 +127,7 @@
 
 
 void
-LbxExtensionInit()
+LbxExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 
@@ -149,16 +150,14 @@
 
 /*ARGSUSED*/
 static void
-LbxResetProc (extEntry)
-ExtensionEntry	*extEntry;
+LbxResetProc (ExtensionEntry	*extEntry)
 {
    LbxResetTags();
    uid_seed = 0;
 }
 
 void
-LbxCloseClient (client)
-    ClientPtr	client;
+LbxCloseClient (ClientPtr	client)
 {
     xLbxCloseEvent  closeEvent;
     ClientPtr	    master;
@@ -205,10 +204,9 @@
 }
 
 static int
-LbxReencodeEvent(client, proxy, buf)
-    ClientPtr	client;
-    LbxProxyPtr	proxy;
-    char *buf;
+LbxReencodeEvent(ClientPtr	client,
+		 LbxProxyPtr	proxy,
+		 char 		*buf)
 {
     xEvent *ev = (xEvent *)buf;
     int n;
@@ -367,27 +365,26 @@
 }
 
 static int
-LbxComposeDelta(proxy, reply, len, buf)
-    LbxProxyPtr	 proxy;
-    char	 *reply;
-    int		 len;
-    char	 *buf;
+LbxComposeDelta(LbxProxyPtr	 proxy,
+		char	 	*reply,
+		int		 len,
+		char	 	*buf)
 {
     int		 diffs;
     int		 cindex;
     int		 n;
     xLbxDeltaReq *p = (xLbxDeltaReq *)buf;
 
-    diffs = LBXDeltaMinDiffs(&proxy->outdeltas, reply, len,
+    diffs = LBXDeltaMinDiffs(&proxy->outdeltas, (unsigned char *)reply, len,
 			     min(MAXBYTESDIFF, (len - sz_xLbxDeltaReq) >> 1),
 			     &cindex);
     if (diffs < 0) {
-	LBXAddDeltaOut(&proxy->outdeltas, reply, len);
+	LBXAddDeltaOut(&proxy->outdeltas, (unsigned char *)reply, len);
 	return 0;
     }
-    LBXEncodeDelta(&proxy->outdeltas, reply, diffs, cindex,
-		   &buf[sz_xLbxDeltaReq]);
-    LBXAddDeltaOut(&proxy->outdeltas, reply, len);
+    LBXEncodeDelta(&proxy->outdeltas, (unsigned char *)reply, diffs, cindex,
+		   (unsigned char *)(&buf[sz_xLbxDeltaReq]));
+    LBXAddDeltaOut(&proxy->outdeltas, (unsigned char *)reply, len);
     p->reqType = LbxEventCode;
     p->lbxReqType = LbxDeltaEvent;
     p->diffs = diffs;
@@ -401,12 +398,11 @@
 }
 
 void
-LbxReencodeOutput(client, pbuf, pcount, cbuf, ccount)
-    ClientPtr client;
-    char *pbuf;
-    int *pcount;
-    char *cbuf;
-    int *ccount;
+LbxReencodeOutput(ClientPtr 	 client,
+		  char 		*pbuf,
+		  int 		*pcount,
+		  char 		*cbuf,
+		  int 		*ccount)
 {
     LbxClientPtr lbxClient = LbxClient(client);
     LbxProxyPtr proxy = lbxClient->proxy;
@@ -498,10 +494,9 @@
 
 /*ARGSUSED*/
 static void
-LbxReplyCallback(pcbl, nulldata, calldata)
-    CallbackListPtr *pcbl;
-    pointer nulldata;
-    pointer calldata;
+LbxReplyCallback(CallbackListPtr *pcbl,
+		 pointer 	  nulldata,
+		 pointer 	  calldata)
 {
     ReplyInfoRec *pri = (ReplyInfoRec *)calldata;
     ClientPtr client = pri->client;
@@ -521,9 +516,8 @@
  */
 /* ARGSUSED */
 static Bool
-LbxCheckCompressInput (dummy1, dummy2)
-    ClientPtr dummy1;
-    pointer dummy2;
+LbxCheckCompressInput (ClientPtr dummy1,
+		       pointer   dummy2)
 {
     LbxProxyPtr	    proxy;
 
@@ -539,8 +533,7 @@
 }
 
 static Bool
-LbxIsClientBlocked (lbxClient)
-    LbxClientPtr	lbxClient;
+LbxIsClientBlocked (LbxClientPtr lbxClient)
 {
     LbxProxyPtr		proxy = lbxClient->proxy;
     
@@ -550,9 +543,8 @@
 }
 
 static void
-LbxSwitchRecv (proxy, lbxClient)
-    LbxProxyPtr		proxy;
-    LbxClientPtr	lbxClient;
+LbxSwitchRecv (LbxProxyPtr  proxy,
+	       LbxClientPtr lbxClient)
 {
     ClientPtr	client;
     
@@ -573,9 +565,8 @@
 
 /* ARGSUSED */
 static Bool
-LbxWaitForUnblocked (client, closure)
-    ClientPtr	client;
-    pointer	closure;
+LbxWaitForUnblocked (ClientPtr	client,
+		     pointer	closure)
 {
     LbxClientPtr    lbxClient;
     LbxProxyPtr	    proxy;
@@ -599,8 +590,7 @@
 }
 
 void
-LbxSetForBlock(lbxClient)
-    LbxClientPtr lbxClient;
+LbxSetForBlock(LbxClientPtr lbxClient)
 {
     lbxClient->reqs_pending++;
     if (!lbxClient->input_blocked)
@@ -612,9 +602,8 @@
 
 /* ARGSUSED */
 static int
-LbxWaitForUngrab (client, closure)
-    ClientPtr	client;
-    pointer	closure;
+LbxWaitForUngrab (ClientPtr	client,
+		  pointer	closure)
 {
     LbxClientPtr lbxClient = LbxClient(client);
     LbxProxyPtr  proxy;
@@ -638,8 +627,7 @@
 }
 
 static void
-LbxServerGrab(proxy)
-    LbxProxyPtr proxy;
+LbxServerGrab(LbxProxyPtr proxy)
 {
     LbxClientPtr	grabbingLbxClient;
     xLbxListenToOneEvent grabEvent;
@@ -723,8 +711,7 @@
 #define NUM(a)	(sizeof (a) / sizeof (a[0]))
 
 static int
-LbxReadRequestFromClient (client)
-    ClientPtr	client;
+LbxReadRequestFromClient (ClientPtr	client)
 {
     int		    ret;
     LbxClientPtr    lbxClient = LbxClient(client);
@@ -802,10 +789,9 @@
 }
 
 static LbxClientPtr
-LbxInitClient (proxy, client, id)
-    LbxProxyPtr	proxy;
-    ClientPtr	client;
-    CARD32	id;
+LbxInitClient (LbxProxyPtr	proxy,
+	       ClientPtr	client,
+	       CARD32		id)
 {
     LbxClientPtr lbxClient;
     int i;
@@ -837,8 +823,7 @@
 }
 
 static void
-LbxFreeClient (client)
-    ClientPtr	client;
+LbxFreeClient (ClientPtr client)
 {
     LbxClientPtr    lbxClient = LbxClient(client);
     LbxProxyPtr	    proxy = lbxClient->proxy;
@@ -867,8 +852,7 @@
 }
 
 static void
-LbxFreeProxy (proxy)
-    LbxProxyPtr proxy;
+LbxFreeProxy (LbxProxyPtr proxy)
 {
     LbxProxyPtr *p;
 
@@ -908,8 +892,7 @@
 }
 
 LbxProxyPtr
-LbxPidToProxy(pid)
-    int         pid;
+LbxPidToProxy(int pid)
 {
     LbxProxyPtr proxy;
 
@@ -921,8 +904,7 @@
 }
 
 static void
-LbxShutdownProxy (proxy)
-    LbxProxyPtr	proxy;
+LbxShutdownProxy (LbxProxyPtr proxy)
 {
     int		    i;
     ClientPtr	    client;
@@ -946,8 +928,7 @@
 
 
 int
-ProcLbxQueryVersion(client)
-    register ClientPtr client;
+ProcLbxQueryVersion (ClientPtr client)
 {
     REQUEST(xLbxQueryVersionReq);
     xLbxQueryVersionReply rep;
@@ -972,7 +953,7 @@
 }
 
 static int
-NextProxyID()
+NextProxyID (void)
 {
     LbxProxyPtr proxy;
     int         id;
@@ -987,8 +968,7 @@
 }
 
 int
-ProcLbxStartProxy(client)
-    register ClientPtr	client;
+ProcLbxStartProxy (ClientPtr	client)
 {
     REQUEST(xLbxStartProxyReq);
     LbxProxyPtr	    proxy;
@@ -1037,9 +1017,9 @@
     LbxOptionInit(&negopt);
 
     replylen = LbxOptionParse(&negopt,
-			      &stuff[1],
+			      (unsigned char *)&stuff[1],
 			      reqlen - sz_xLbxStartProxyReq,
-			      &replybuf->optDataStart);
+			      (unsigned char *)&replybuf->optDataStart);
     if (replylen < 0) {
 	/*
 	 * Didn't understand option format, so we'll just end up
@@ -1137,8 +1117,7 @@
 }
 
 int
-ProcLbxStopProxy(client)
-    register ClientPtr	client;
+ProcLbxStopProxy(ClientPtr client)
 {
     REQUEST(xLbxStopProxyReq);
     LbxProxyPtr	    proxy;
@@ -1158,8 +1137,7 @@
 }
     
 int
-ProcLbxSwitch(client)
-    register ClientPtr	client;
+ProcLbxSwitch(ClientPtr	client)
 {
     REQUEST(xLbxSwitchReq);
     LbxProxyPtr	proxy = LbxMaybeProxy(client);
@@ -1181,8 +1159,7 @@
 }
 
 int
-ProcLbxBeginLargeRequest(client)
-    register ClientPtr	client;
+ProcLbxBeginLargeRequest(ClientPtr client)
 {
     REQUEST(xLbxBeginLargeRequestReq);
 
@@ -1195,8 +1172,7 @@
 
 
 int
-ProcLbxLargeRequestData(client)
-    register ClientPtr	client;
+ProcLbxLargeRequestData(ClientPtr client)
 {
     REQUEST(xLbxLargeRequestDataReq);
 
@@ -1210,8 +1186,7 @@
 
 
 int
-ProcLbxEndLargeRequest(client)
-    register ClientPtr	client;
+ProcLbxEndLargeRequest(ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -1222,8 +1197,7 @@
 
 
 int
-ProcLbxInternAtoms(client)
-    register ClientPtr	client;
+ProcLbxInternAtoms(ClientPtr client)
 {
     REQUEST(xLbxInternAtomsReq);
     LbxClientPtr lbxClient = LbxClient(client);
@@ -1289,8 +1263,7 @@
 
 
 int
-ProcLbxGetWinAttrAndGeom(client)
-    register ClientPtr	client;
+ProcLbxGetWinAttrAndGeom(ClientPtr client)
 {
     REQUEST(xLbxGetWinAttrAndGeomReq);
     xGetWindowAttributesReply wa;
@@ -1369,8 +1342,7 @@
 }
 
 int
-ProcLbxNewClient(client)
-    register ClientPtr client;
+ProcLbxNewClient(ClientPtr client)
 {
     REQUEST(xLbxNewClientReq);
     ClientPtr	    newClient;
@@ -1418,8 +1390,7 @@
 }
 
 int
-ProcLbxEstablishConnection(client)
-    register ClientPtr client;
+ProcLbxEstablishConnection(ClientPtr client)
 {
     char *reason = NULL;
     char *auth_proto, *auth_string;
@@ -1446,8 +1417,7 @@
 }
 
 int
-ProcLbxCloseClient (client)
-    register ClientPtr	client;
+ProcLbxCloseClient (ClientPtr client)
 {
     REQUEST(xLbxCloseClientReq);
     LbxClientPtr lbxClient = LbxClient(client);
@@ -1461,8 +1431,7 @@
 }
 
 int
-ProcLbxModifySequence (client)
-    register ClientPtr	client;
+ProcLbxModifySequence (ClientPtr client)
 {
     REQUEST(xLbxModifySequenceReq);
 
@@ -1472,8 +1441,7 @@
 }
 
 int
-ProcLbxAllowMotion (client)
-    register ClientPtr	client;
+ProcLbxAllowMotion (ClientPtr client)
 {
     REQUEST(xLbxAllowMotionReq);
 
@@ -1485,17 +1453,17 @@
 
 
 static int
-DecodeLbxDelta(client)
-    register ClientPtr	client;
+DecodeLbxDelta (ClientPtr client)
 {
     REQUEST(xLbxDeltaReq);
     LbxClientPtr    lbxClient = LbxClient(client);
     LbxProxyPtr	    proxy = lbxClient->proxy;
     int		    len;
-    char	    *buf;
+    unsigned char  *buf;
 
     /* Note that LBXDecodeDelta decodes and adds current msg to the cache */
-    len = LBXDecodeDelta(&proxy->indeltas, ((char *)stuff) + sz_xLbxDeltaReq,
+    len = LBXDecodeDelta(&proxy->indeltas, 
+			 (xLbxDiffItem *)(((char *)stuff) + sz_xLbxDeltaReq),
 			 stuff->diffs, stuff->cindex, &buf);
     /*
      * Some requests, such as FillPoly, result in the protocol input
@@ -1512,8 +1480,7 @@
 }
 
 int
-ProcLbxGetModifierMapping(client)
-    ClientPtr	client;
+ProcLbxGetModifierMapping(ClientPtr client)
 {
     REQUEST(xLbxGetModifierMappingReq);
 
@@ -1522,8 +1489,7 @@
 }
 
 int
-ProcLbxGetKeyboardMapping(client)
-    ClientPtr	client;
+ProcLbxGetKeyboardMapping(ClientPtr client)
 {
     REQUEST(xLbxGetKeyboardMappingReq);
 
@@ -1532,8 +1498,7 @@
 }
 
 int
-ProcLbxQueryFont(client)
-    ClientPtr	client;
+ProcLbxQueryFont(ClientPtr client)
 {
     REQUEST(xLbxQueryFontReq);
 
@@ -1542,8 +1507,7 @@
 }
 
 int
-ProcLbxChangeProperty(client)
-    ClientPtr	client;
+ProcLbxChangeProperty(ClientPtr	client)
 {
     REQUEST(xLbxChangePropertyReq);
 
@@ -1552,8 +1516,7 @@
 }
 
 int
-ProcLbxGetProperty(client)
-    ClientPtr	client;
+ProcLbxGetProperty(ClientPtr client)
 {
     REQUEST(xLbxGetPropertyReq);
 
@@ -1562,8 +1525,7 @@
 }
 
 int
-ProcLbxTagData(client)
-    ClientPtr	client;
+ProcLbxTagData(ClientPtr client)
 {
     REQUEST(xLbxTagDataReq);
 
@@ -1575,8 +1537,7 @@
 }
 
 int
-ProcLbxInvalidateTag(client)
-    ClientPtr	client;
+ProcLbxInvalidateTag(ClientPtr client)
 {
     REQUEST(xLbxInvalidateTagReq);
 
@@ -1586,93 +1547,80 @@
 }
 
 int
-ProcLbxPolyPoint(client)
-    register ClientPtr	client;
+ProcLbxPolyPoint(ClientPtr client)
 {
     return LbxDecodePoly(client, X_PolyPoint, LbxDecodePoints);
 }
 
 int
-ProcLbxPolyLine(client)
-    register ClientPtr	client;
+ProcLbxPolyLine(ClientPtr client)
 {
     return LbxDecodePoly(client, X_PolyLine, LbxDecodePoints);
 }
 
 int
-ProcLbxPolySegment(client)
-    register ClientPtr	client;
+ProcLbxPolySegment(ClientPtr client)
 {
     return LbxDecodePoly(client, X_PolySegment, LbxDecodeSegment);
 }
 
 int
-ProcLbxPolyRectangle(client)
-    register ClientPtr	client;
+ProcLbxPolyRectangle(ClientPtr client)
 {
     return LbxDecodePoly(client, X_PolyRectangle, LbxDecodeRectangle);
 }
 
 int
-ProcLbxPolyArc(client)
-    register ClientPtr	client;
+ProcLbxPolyArc(ClientPtr client)
 {
     return LbxDecodePoly(client, X_PolyArc, LbxDecodeArc);
 }
 
 int
-ProcLbxFillPoly(client)
-    register ClientPtr	client;
+ProcLbxFillPoly(ClientPtr client)
 {
     return LbxDecodeFillPoly(client);
 }
 
 int
-ProcLbxPolyFillRectangle(client)
-    register ClientPtr	client;
+ProcLbxPolyFillRectangle(ClientPtr client)
 {
     return LbxDecodePoly(client, X_PolyFillRectangle, LbxDecodeRectangle);
 }
 
 int
-ProcLbxPolyFillArc(client)
-    register ClientPtr	client;
+ProcLbxPolyFillArc(ClientPtr client)
 {
     return LbxDecodePoly(client, X_PolyFillArc, LbxDecodeArc);
 }
 
 int
-ProcLbxCopyArea (client)
-    register ClientPtr	client;
+ProcLbxCopyArea(ClientPtr client)
 {
     return LbxDecodeCopyArea(client);
 }
 
 int
-ProcLbxCopyPlane (client)
-    register ClientPtr	client;
+ProcLbxCopyPlane(ClientPtr client)
 {
     return LbxDecodeCopyPlane(client);
 }
 
 
 int
-ProcLbxPolyText (client)
-    register ClientPtr	client;
+ProcLbxPolyText(ClientPtr client)
 {
     return LbxDecodePolyText(client);
 }
 
 int
-ProcLbxImageText (client)
-    register ClientPtr	client;
+ProcLbxImageText(ClientPtr client)
 {
     return LbxDecodeImageText(client);
 }
 
 int
-ProcLbxQueryExtension(client)
-    ClientPtr	client;
+ProcLbxQueryExtension(ClientPtr	client)
 {
     REQUEST(xLbxQueryExtensionReq);
     char	*ename;
@@ -1683,23 +1631,20 @@
 }
 
 int
-ProcLbxPutImage(client)
-    register ClientPtr	client;
+ProcLbxPutImage(ClientPtr client)
 {
     return LbxDecodePutImage(client);
 }
 
 int
-ProcLbxGetImage(client)
-    register ClientPtr	client;
+ProcLbxGetImage(ClientPtr client)
 {
     return LbxDecodeGetImage(client);
 }
 
 
 int
-ProcLbxSync(client)
-    register ClientPtr	client;
+ProcLbxSync(ClientPtr client)
 {
     xLbxSyncReply reply;
 
@@ -1728,8 +1673,7 @@
 
 
 int
-ProcLbxDispatch (client)
-    register ClientPtr	client;
+ProcLbxDispatch(ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
Index: xc/programs/Xserver/lbx/lbxopts.c
diff -u xc/programs/Xserver/lbx/lbxopts.c:1.2 xc/programs/Xserver/lbx/lbxopts.c:1.4
--- xc/programs/Xserver/lbx/lbxopts.c:1.2	Sun Dec 20 03:57:56 1998
+++ xc/programs/Xserver/lbx/lbxopts.c	Wed Jun  7 15:03:14 2000
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.2 1998/12/20 11:57:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.4 2000/06/07 22:03:14 tsi Exp $ */
 
 #ifdef OPTDEBUG
 #include <stdio.h>
@@ -29,6 +29,8 @@
 #include "X.h"
 #include "Xproto.h"
 #include "misc.h"
+#include "colormapst.h"
+#include "propertyst.h"
 #include "lbxserve.h"
 #include "lbxstr.h"
 #include "lbximage.h"
@@ -38,22 +40,35 @@
 #include "lbxzlib.h"
 #endif /* NO_ZLIB */
 
-static int LbxDeltaOpt();
-static int LbxProxyDeltaOpt();
-static int LbxServerDeltaOpt();
-static int LbxStreamCompOpt();
-static int LbxBitmapCompOpt();
-static int LbxPixmapCompOpt();
-static int LbxMessageCompOpt();
-static int LbxUseTagsOpt();
-static int LbxCmapAllOpt();
+static int LbxProxyDeltaOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
+			      int optlen, unsigned char *preply );
+static int LbxServerDeltaOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
+			       int optlen, unsigned char *preply );
+static int LbxDeltaOpt ( unsigned char *popt, int optlen, 
+			 unsigned char *preply, short *pn, short *pmaxlen );
+static int LbxStreamCompOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
+			      int optlen, unsigned char *preply );
+static int ZlibParse ( LbxNegOptsPtr pno, unsigned char *popt, int optlen, 
+		       unsigned char *preply );
+static int LbxMessageCompOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
+			       int optlen, unsigned char *preply );
+static int LbxUseTagsOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
+				  int optlen, unsigned char *preply );
+static int LbxBitmapCompOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
+				     int optlen, unsigned char *preply );
+static int LbxPixmapCompOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
+				     int optlen, unsigned char *preply );
+static int MergeDepths ( int *depths, LbxPixmapCompMethod *method );
+static int LbxCmapAllOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
+				  int optlen, unsigned char *preply );
 
 /*
  * List of LBX options we recognize and are willing to negotiate
  */
 static struct _LbxOptionParser {
     CARD8	optcode;
-    int		(*parser)();
+    int		(*parser)(LbxNegOptsPtr, unsigned char *, 
+			  int, unsigned char *);
 } LbxOptions[] = {
     { LBX_OPT_DELTA_PROXY, 	LbxProxyDeltaOpt },
     { LBX_OPT_DELTA_SERVER,	LbxServerDeltaOpt },
@@ -70,8 +85,8 @@
 /*
  * Set option defaults
  */
-LbxOptionInit(pno)
-    LbxNegOptsPtr pno;
+void
+LbxOptionInit(LbxNegOptsPtr pno)
 {
     bzero(pno, sizeof(LbxNegOptsRec));
     pno->proxyDeltaN = pno->serverDeltaN = LBX_OPT_DELTA_NCACHE_DFLT;
@@ -86,11 +101,10 @@
 }
 
 int
-LbxOptionParse(pno, popt, optlen, preply)
-    LbxNegOptsPtr pno;
-    unsigned char *popt;
-    int		  optlen;
-    unsigned char *preply;
+LbxOptionParse(LbxNegOptsPtr  pno,
+	       unsigned char *popt,
+	       int	      optlen,
+	       unsigned char *preply)
 {
     int		  i;
     int		  nopts = *popt++;
@@ -140,34 +154,31 @@
 }
 
 static int
-LbxProxyDeltaOpt(pno, popt, optlen, preply)
-    LbxNegOptsPtr pno;
-    unsigned char *popt;
-    int		  optlen;
-    unsigned char *preply;
+LbxProxyDeltaOpt(LbxNegOptsPtr  pno,
+		 unsigned char *popt,
+		 int		optlen,
+		 unsigned char *preply)
 {
     return LbxDeltaOpt(popt, optlen, preply,
 		       &pno->proxyDeltaN, &pno->proxyDeltaMaxLen);
 }
 
 static int
-LbxServerDeltaOpt(pno, popt, optlen, preply)
-    LbxNegOptsPtr pno;
-    unsigned char *popt;
-    int		  optlen;
-    unsigned char *preply;
+LbxServerDeltaOpt(LbxNegOptsPtr  pno,
+		  unsigned char *popt,
+		  int		 optlen,
+		  unsigned char *preply)
 {
     return LbxDeltaOpt(popt, optlen, preply,
 		       &pno->serverDeltaN, &pno->serverDeltaMaxLen);
 }
 
 static int
-LbxDeltaOpt(popt, optlen, preply, pn, pmaxlen)
-    unsigned char *popt;
-    int		  optlen;
-    unsigned char *preply;
-    short	  *pn;
-    short	  *pmaxlen;
+LbxDeltaOpt(unsigned char *popt,
+	    int		   optlen,
+	    unsigned char *preply,
+	    short	  *pn,
+	    short	  *pmaxlen)
 {
     short	  n;
     short	  maxlen;
@@ -212,12 +223,12 @@
     return LBX_OPT_DELTA_REPLYLEN;
 }
 
-static int ZlibParse();
 
 static struct _LbxStreamCompParser {
     int		typelen;
     char	*type;
-    int		(*parser)();
+    int		(*parser)(LbxNegOptsPtr, unsigned char *, 
+			  int, unsigned char *);
 } LbxStreamComp[] = {
 #ifndef NO_ZLIB
     { ZLIB_STRCOMP_OPT_LEN,	ZLIB_STRCOMP_OPT, 	ZlibParse },
@@ -228,11 +239,10 @@
     (sizeof(LbxStreamComp) / sizeof(struct _LbxStreamCompParser))
 
 static int
-LbxStreamCompOpt(pno, popt, optlen, preply)
-    LbxNegOptsPtr pno;
-    unsigned char *popt;
-    int		  optlen;
-    unsigned char *preply;
+LbxStreamCompOpt(LbxNegOptsPtr  pno,
+		 unsigned char *popt,
+		 int		optlen,
+		 unsigned char *preply)
 {
     int		  i;
     int		  typelen;
@@ -278,18 +288,11 @@
 }
 
 
-extern LbxStreamCompHandle ZlibInit();
-extern int ZlibStuffInput(), ZlibInputAvail(), ZlibFlush(),
-	 ZlibRead(), ZlibWriteV();
-extern void ZlibCompressOn(), ZlibCompressOff(), ZlibFree();
-
-
 static int
-ZlibParse(pno, popt, optlen, preply)
-    LbxNegOptsPtr  pno;
-    unsigned char  *popt;
-    int		   optlen;
-    unsigned char  *preply;
+ZlibParse(LbxNegOptsPtr   pno,
+	  unsigned char  *popt,
+	  int		  optlen,
+	  unsigned char  *preply)
 {
     int level;		/* compression level */
 
@@ -300,7 +303,8 @@
     if (level < 1 || level > 9)
 	return (-1);
 
-    pno->streamOpts.streamCompInit = ZlibInit;
+    pno->streamOpts.streamCompInit =
+	(LbxStreamCompHandle (*)(int, pointer))ZlibInit;
     pno->streamOpts.streamCompArg = (pointer)(long)level;
     pno->streamOpts.streamCompStuffInput = ZlibStuffInput;
     pno->streamOpts.streamCompInputAvail = ZlibInputAvail;
@@ -309,17 +313,17 @@
     pno->streamOpts.streamCompWriteV = ZlibWriteV;
     pno->streamOpts.streamCompOn = ZlibCompressOn;
     pno->streamOpts.streamCompOff = ZlibCompressOff;
-    pno->streamOpts.streamCompFreeHandle = ZlibFree;
+    pno->streamOpts.streamCompFreeHandle =
+	(void (*)(LbxStreamCompHandle))ZlibFree;
 
     return (0);
 }
 
 static int
-LbxMessageCompOpt(pno, popt, optlen, preply)
-    LbxNegOptsPtr pno;
-    unsigned char *popt;
-    int		  optlen;
-    unsigned char *preply;
+LbxMessageCompOpt(LbxNegOptsPtr  pno,
+		  unsigned char *popt,
+		  int		 optlen,
+		  unsigned char *preply)
 {
 
     if (optlen == 0) {
@@ -335,11 +339,10 @@
 
 
 static int
-LbxUseTagsOpt(pno, popt, optlen, preply)
-    LbxNegOptsPtr pno;
-    unsigned char *popt;
-    int		  optlen;
-    unsigned char *preply;
+LbxUseTagsOpt(LbxNegOptsPtr  pno,
+	      unsigned char *popt,
+	      int 	     optlen,
+	      unsigned char *preply)
 {
 
     if (optlen == 0) {
@@ -405,22 +408,18 @@
 	(sizeof (LbxPixmapCompMethods) / sizeof (LbxPixmapCompMethod))
 #endif
 
-static int MergeDepths ();
-
 
 static int
-LbxImageCompOpt (pixmap, pno, popt, optlen, preply)
+LbxImageCompOpt (Bool	         pixmap,
+		 LbxNegOptsPtr   pno,
+		 unsigned char  *popt,
+		 int	         optlen,
+		 unsigned char  *preply)
 
-Bool	       pixmap;
-LbxNegOptsPtr  pno;
-unsigned char  *popt;
-int	       optlen;
-unsigned char  *preply;
-
 {
     unsigned char *preplyStart = preply;
     int numMethods = *popt++;
-    char *myIndices, *hisIndices;
+    unsigned char *myIndices, *hisIndices;
     unsigned *retFormats;
     int **retDepths;
     int replyCount = 0;
@@ -437,8 +436,8 @@
 	return (1);
     }
 
-    myIndices = (char *) xalloc (numMethods);
-    hisIndices = (char *) xalloc (numMethods);
+    myIndices = (unsigned char *) xalloc (numMethods);
+    hisIndices = (unsigned char *) xalloc (numMethods);
 
     if (!myIndices || !hisIndices)
     {
@@ -635,12 +634,10 @@
 
 
 static int
-LbxBitmapCompOpt (pno, popt, optlen, preply)
-
-LbxNegOptsPtr  pno;
-unsigned char  *popt;
-int	       optlen;
-unsigned char  *preply;
+LbxBitmapCompOpt (LbxNegOptsPtr   pno,
+		  unsigned char  *popt,
+		  int	          optlen,
+		  unsigned char  *preply)
 
 {
     return (LbxImageCompOpt (0 /* bitmap */, pno, popt, optlen, preply));
@@ -648,12 +645,10 @@
 
 
 static int
-LbxPixmapCompOpt (pno, popt, optlen, preply)
-
-LbxNegOptsPtr  pno;
-unsigned char  *popt;
-int	       optlen;
-unsigned char  *preply;
+LbxPixmapCompOpt (LbxNegOptsPtr   pno,
+		  unsigned char  *popt,
+		  int	          optlen,
+		  unsigned char  *preply)
 
 {
     return (LbxImageCompOpt (1 /* Pixmap */, pno, popt, optlen, preply));
@@ -661,11 +656,9 @@
 
 
 LbxBitmapCompMethod *
-LbxSrvrLookupBitmapCompMethod (proxy, methodOpCode)
+LbxSrvrLookupBitmapCompMethod (LbxProxyPtr proxy,
+			       int methodOpCode)
 
-LbxProxyPtr proxy;
-int methodOpCode;
-
 {
     int i;
 
@@ -684,10 +677,8 @@
 
 
 LbxPixmapCompMethod *
-LbxSrvrLookupPixmapCompMethod (proxy, methodOpCode)
-
-LbxProxyPtr proxy;
-int methodOpCode;
+LbxSrvrLookupPixmapCompMethod (LbxProxyPtr proxy,
+			       int methodOpCode)
 
 {
     int i;
@@ -707,9 +698,7 @@
 
 
 LbxBitmapCompMethod *
-LbxSrvrFindPreferredBitmapCompMethod (proxy)
-
-LbxProxyPtr proxy;
+LbxSrvrFindPreferredBitmapCompMethod (LbxProxyPtr proxy)
 
 {
     if (proxy->numBitmapCompMethods == 0)
@@ -721,12 +710,10 @@
 
 
 LbxPixmapCompMethod *
-LbxSrvrFindPreferredPixmapCompMethod (proxy, format, depth)
+LbxSrvrFindPreferredPixmapCompMethod (LbxProxyPtr proxy,
+				      int format,
+				      int depth)
 
-LbxProxyPtr proxy;
-int format;
-int depth;
-
 {
     if (proxy->numPixmapCompMethods == 0)
 	return NULL;
@@ -757,11 +744,10 @@
     }
 }
 
-
-static int MergeDepths (depths, method)
 
-int *depths;
-LbxPixmapCompMethod *method;
+static int 
+MergeDepths (int *depths,
+	     LbxPixmapCompMethod *method)
 
 {
     int i, j, count;
@@ -789,12 +775,10 @@
 #define LbxCmapAllMethod "XC-CMAP"
 
 static int
-LbxCmapAllOpt (pno, popt, optlen, preply)
-
-LbxNegOptsPtr  pno;
-unsigned char  *popt;
-int	       optlen;
-unsigned char  *preply;
+LbxCmapAllOpt (LbxNegOptsPtr   pno,
+	       unsigned char  *popt,
+	       int	       optlen,
+	       unsigned char  *preply)
 
 {
     int numMethods = *popt++;
Index: xc/programs/Xserver/lbx/lbxprop.c
diff -u xc/programs/Xserver/lbx/lbxprop.c:1.1.1.3 xc/programs/Xserver/lbx/lbxprop.c:1.2
--- xc/programs/Xserver/lbx/lbxprop.c:1.1.1.3	Sun Sep 27 01:45:33 1998
+++ xc/programs/Xserver/lbx/lbxprop.c	Thu May 18 16:46:24 2000
@@ -42,6 +42,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 /* various bits of DIX-level mangling */
 
@@ -57,6 +58,7 @@
 #include "resource.h"
 #include "servermd.h"
 #include "propertyst.h"
+#include "colormapst.h"
 #include "windowstr.h"
 #define _XLBX_SERVER_
 #include "lbxstr.h"
@@ -68,14 +70,11 @@
 #include "extensions/security.h"
 #endif
 
-extern int  (*ProcVector[256]) ();
-extern void (*ReplySwapVector[256]) ();
-extern void CopySwap16Write(), CopySwap32Write(), Swap32Write();
+extern ReplySwapPtr CopySwap16Write, CopySwap32Write, Swap32Write;
 
 void
-LbxStallPropRequest(client, pProp)
-    ClientPtr   client;
-    PropertyPtr pProp;
+LbxStallPropRequest(ClientPtr   client,
+		    PropertyPtr pProp)
 {
     xReq *req = (xReq *) client->requestBuffer;
     register char n;
@@ -135,19 +134,17 @@
 }
 
 int
-LbxChangeWindowProperty(client, pWin, property, type, format, mode, len,
-			have_data, value, sendevent, tag)
-    ClientPtr   client;
-    WindowPtr   pWin;
-    Atom        property,
-                type;
-    int         format,
-                mode;
-    unsigned long len;
-    Bool        have_data;
-    pointer     value;
-    Bool        sendevent;
-    XID        *tag;
+LbxChangeWindowProperty(ClientPtr   	client,
+			WindowPtr   	pWin,
+			Atom        	property,
+			Atom	    	type,
+			int         	format,
+			int	    	mode,
+			unsigned long	len,
+			Bool        	have_data,
+			pointer     	value,
+			Bool        	sendevent,
+			XID            *tag)
 {
     PropertyPtr pProp;
     xEvent      event;
@@ -284,8 +281,7 @@
 }
 
 int
-LbxChangeProperty(client)
-    ClientPtr   client;
+LbxChangeProperty(ClientPtr client)
 {
     WindowPtr   pWin;
     char        format,
@@ -366,9 +362,8 @@
 }
 
 static void
-LbxWriteGetpropReply(client, rep)
-    ClientPtr   client;
-    xLbxGetPropertyReply *rep;
+LbxWriteGetpropReply(ClientPtr   	   client,
+		     xLbxGetPropertyReply *rep)
 {
     int         n;
 
@@ -384,8 +379,7 @@
 }
 
 int
-LbxGetProperty(client)
-    ClientPtr   client;
+LbxGetProperty(ClientPtr client)
 {
     PropertyPtr pProp,
                 prevProp;
@@ -527,7 +521,7 @@
 	    client->pSwapReplyFunc = CopySwap16Write;
 	    break;
 	default:
-	    client->pSwapReplyFunc = (void (*) ()) WriteToClient;
+	    client->pSwapReplyFunc = (ReplySwapPtr) WriteToClient;
 	    break;
 	}
 	WriteSwappedDataToClient(client, len,
Index: xc/programs/Xserver/lbx/lbxserve.h
diff -u xc/programs/Xserver/lbx/lbxserve.h:1.1.1.2 xc/programs/Xserver/lbx/lbxserve.h:1.2
--- xc/programs/Xserver/lbx/lbxserve.h:1.1.1.2	Sun Sep 27 01:45:34 1998
+++ xc/programs/Xserver/lbx/lbxserve.h	Thu May 18 16:46:24 2000
@@ -41,12 +41,13 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #ifndef _LBXSERVE_H_
 #define _LBXSERVE_H_
-#include "lbxdeltastr.h"
 #define _XLBX_SERVER_
 #include "lbxstr.h"
+#include "lbxdeltastr.h"
 #include "lbxopts.h"
 
 #define MAX_LBX_CLIENTS	MAXCLIENTS
@@ -100,9 +101,9 @@
     LbxStreamOpts streamOpts;
 
     int		numBitmapCompMethods;
-    char	*bitmapCompMethods;   /* array of indices */
+    unsigned char	*bitmapCompMethods;   /* array of indices */
     int		numPixmapCompMethods;
-    char	*pixmapCompMethods;   /* array of indices */
+    unsigned char	*pixmapCompMethods;   /* array of indices */
     int		**pixmapCompDepths;   /* depths supported from each method */
 
     struct _ColormapRec *grabbedCmaps; /* chained via lbx private */
@@ -121,49 +122,155 @@
 #define LbxProxyClient(proxy) ((proxy)->lbxClients[0]->client)
 
 extern int LbxEventCode;
+
+
+/* os/connection.c */
+extern ClientPtr AllocLbxClientConnection ( ClientPtr client, 
+					    LbxProxyPtr proxy );
+extern void LbxProxyConnection ( ClientPtr client, LbxProxyPtr proxy );
+
+/* os/libxio.c */
+extern int UncompressedWriteToClient ( ClientPtr who, int count, char *buf );
+extern void LbxForceOutput ( LbxProxyPtr proxy );
+extern void SwitchClientInput ( ClientPtr client, Bool pending );
+extern int PrepareLargeReqBuffer ( ClientPtr client );
+extern Bool AppendFakeRequest ( ClientPtr client, char *data, int count );
+extern int LbxFreeOsBuffers ( LbxProxyPtr proxy );
+extern Bool AllocateLargeReqBuffer ( ClientPtr client, int size );
+extern Bool AddToLargeReqBuffer ( ClientPtr client, char *data, int size );
+
+/* lbxcmap.c */
+extern int LbxCmapInit ( void );
+extern Bool LbxCheckColorRequest ( ClientPtr client, ColormapPtr pmap, 
+				   xReq *req );
+extern int LbxCheckCmapGrabbed ( ColormapPtr pmap );
+extern void LbxDisableSmartGrab ( ColormapPtr pmap );
+extern void LbxBeginFreeCellsEvent ( ColormapPtr pmap );
+extern void LbxAddFreeCellToEvent ( ColormapPtr pmap, Pixel pixel );
+extern void LbxEndFreeCellsEvent ( ColormapPtr pmap );
+extern void LbxSortPixelList ( Pixel *pixels, int count );
+extern int ProcLbxGrabCmap ( ClientPtr client );
+extern void LbxReleaseCmap ( ColormapPtr pmap, Bool smart );
+extern int ProcLbxReleaseCmap ( ClientPtr client );
+extern int ProcLbxAllocColor ( ClientPtr client );
+extern int ProcLbxIncrementPixel ( ClientPtr client );
+
+/* lbxdix.h */
+extern void LbxDixInit ( void );
+extern void LbxResetTags ( void );
+extern int LbxSendConnSetup ( ClientPtr client, char *reason );
+extern int LbxGetModifierMapping ( ClientPtr client );
+extern int LbxGetKeyboardMapping ( ClientPtr client );
+extern int LbxQueryFont ( ClientPtr client );
+extern int LbxTagData ( ClientPtr client, XID tag, unsigned long len, 
+			pointer data );
+extern int LbxInvalidateTag ( ClientPtr client, XID tag );
+extern void LbxAllowMotion ( ClientPtr client, int num );
+extern void LbxFlushModifierMapTag ( void );
+extern void LbxFlushKeyboardMapTag ( void );
+extern void LbxFreeFontTag ( FontPtr pfont );
+extern void LbxSendInvalidateTag ( ClientPtr client, XID tag, int tagtype );
+extern Bool LbxFlushQTag ( XID tag );
+extern void ProcessQTagZombies ( void );
+extern void LbxQueryTagData ( ClientPtr client, int owner_pid, XID tag, 
+			      int tagtype );
+
+/* lbxexts.c */
+extern Bool LbxAddExtension ( char *name, int opcode, int ev_base, 
+			      int err_base );
+extern Bool LbxAddExtensionAlias ( int idx, char *alias );
+extern void LbxDeclareExtensionSecurity ( char *extname, Bool secure );
+extern Bool LbxRegisterExtensionGenerationMasks ( int idx, int num_reqs, 
+						  char *rep_mask, 
+						  char *ev_mask );
+extern int LbxQueryExtension ( ClientPtr client, char *ename, int nlen );
+extern void LbxCloseDownExtensions ( void );
+extern void LbxSetReqMask ( CARD8 *mask, int req, Bool on );
+
+/* lbxgfx.c */
+extern int LbxDecodePoly( ClientPtr client, CARD8 xreqtype,
+			  int (*decode_rtn)(char *, char *, short *) );
+extern int LbxDecodeFillPoly ( ClientPtr client );
+extern int LbxDecodeCopyArea ( ClientPtr client );
+extern int LbxDecodeCopyPlane ( ClientPtr client );
+extern int LbxDecodePolyText ( ClientPtr client );
+extern int LbxDecodeImageText ( ClientPtr client );
+extern int LbxDecodePutImage ( ClientPtr client );
+extern int LbxDecodeGetImage ( ClientPtr client );
+extern int LbxDecodePoints ( char *in, char *inend, short *out );
+extern int LbxDecodeSegment ( char *in, char *inend, short *out );
+extern int LbxDecodeRectangle ( char *in, char *inend, short *out );
+extern int LbxDecodeArc ( char *in, char *inend, short *out );
+
+/* lbxmain.c */
+extern LbxProxyPtr LbxPidToProxy ( int pid );
+extern void LbxReencodeOutput ( ClientPtr client, char *pbuf, int *pcount,
+				char *cbuf, int *ccount );
+extern void LbxExtensionInit ( void );
+extern void LbxCloseClient ( ClientPtr client );
+extern void LbxSetForBlock ( LbxClientPtr lbxClient );
+extern int ProcLbxDispatch ( ClientPtr client );
+extern int ProcLbxSwitch ( ClientPtr client );
+extern int ProcLbxQueryVersion ( ClientPtr client );
+extern int ProcLbxStartProxy ( ClientPtr client );
+extern int ProcLbxStopProxy ( ClientPtr client );
+extern int ProcLbxBeginLargeRequest ( ClientPtr client );
+extern int ProcLbxLargeRequestData ( ClientPtr client );
+extern int ProcLbxEndLargeRequest ( ClientPtr client );
+extern int ProcLbxInternAtoms ( ClientPtr client );
+extern int ProcLbxGetWinAttrAndGeom ( ClientPtr client );
+extern int ProcLbxNewClient ( ClientPtr client );
+extern int ProcLbxEstablishConnection ( ClientPtr client );
+extern int ProcLbxCloseClient ( ClientPtr client );
+extern int ProcLbxModifySequence ( ClientPtr client );
+extern int ProcLbxAllowMotion ( ClientPtr client );
+extern int ProcLbxGetModifierMapping ( ClientPtr client );
+extern int ProcLbxGetKeyboardMapping ( ClientPtr client );
+extern int ProcLbxQueryFont ( ClientPtr client );
+extern int ProcLbxChangeProperty ( ClientPtr client );
+extern int ProcLbxGetProperty ( ClientPtr client );
+extern int ProcLbxTagData ( ClientPtr client );
+extern int ProcLbxInvalidateTag ( ClientPtr client );
+extern int ProcLbxPolyPoint ( ClientPtr client );
+extern int ProcLbxPolyLine ( ClientPtr client );
+extern int ProcLbxPolySegment ( ClientPtr client );
+extern int ProcLbxPolyRectangle ( ClientPtr client );
+extern int ProcLbxPolyArc ( ClientPtr client );
+extern int ProcLbxFillPoly ( ClientPtr client );
+extern int ProcLbxPolyFillRectangle ( ClientPtr client );
+extern int ProcLbxPolyFillArc ( ClientPtr client );
+extern int ProcLbxCopyArea ( ClientPtr client );
+extern int ProcLbxCopyPlane ( ClientPtr client );
+extern int ProcLbxPolyText ( ClientPtr client );
+extern int ProcLbxImageText ( ClientPtr client );
+extern int ProcLbxQueryExtension ( ClientPtr client );
+extern int ProcLbxPutImage ( ClientPtr client );
+extern int ProcLbxGetImage ( ClientPtr client );
+extern int ProcLbxSync ( ClientPtr client );
+
+/* lbxprop.c */
+extern int LbxChangeProperty ( ClientPtr client );
+extern int LbxGetProperty ( ClientPtr client );
+extern void LbxStallPropRequest ( ClientPtr client, PropertyPtr pProp );
+extern int LbxChangeWindowProperty ( ClientPtr client, WindowPtr pWin, 
+				     Atom property, Atom type, int format, 
+				     int mode, unsigned long len, 
+				     Bool have_data, pointer value, 
+				     Bool sendevent, XID *tag );
+/* lbxsquish.c */
+extern int LbxSquishEvent ( char *buf );
+
+/* lbwswap.c */
+extern int SProcLbxDispatch( ClientPtr client );
+extern int SProcLbxSwitch ( ClientPtr client );
+extern int SProcLbxBeginLargeRequest ( ClientPtr client );
+extern int SProcLbxLargeRequestData ( ClientPtr client );
+extern int SProcLbxEndLargeRequest ( ClientPtr client );
+extern void LbxWriteSConnSetupPrefix ( ClientPtr pClient, 
+				       xLbxConnSetupPrefix *pcsp );
+extern void LbxSwapFontInfo ( xLbxFontInfo *pr, Bool compressed );
 
-extern void LbxDixInit(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern LbxProxyPtr LbxPidToProxy(
-#if NeedFunctionPrototypes
-    int /* pid */
-#endif
-);
-
-extern void LbxReencodeOutput(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    char* /*pbuf*/,
-    int* /*pcount*/,
-    char* /*cbuf*/,
-    int* /*ccount*/
-#endif
-);
-
-extern int UncompressedWriteToClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*who*/,
-    int /*count*/,
-    char* /*buf*/
-#endif
-);
-
-extern ClientPtr AllocLbxClientConnection(
-#if NeedFunctionPrototypes
-    ClientPtr /* client */,
-    LbxProxyPtr /* proxy */
-#endif
-);
-
-extern void LbxProxyConnection(
-#if NeedFunctionPrototypes
-    ClientPtr /* client */,
-    LbxProxyPtr /* proxy */
-#endif
-);
+/* lbxzerorep.c */
+extern void ZeroReplyPadBytes ( char *buf, int reqType );
 
 #endif				/* _LBXSERVE_H_ */
Index: xc/programs/Xserver/lbx/lbxsquish.c
diff -u xc/programs/Xserver/lbx/lbxsquish.c:1.1.1.2 xc/programs/Xserver/lbx/lbxsquish.c:1.2
--- xc/programs/Xserver/lbx/lbxsquish.c:1.1.1.2	Sun Sep 27 01:45:36 1998
+++ xc/programs/Xserver/lbx/lbxsquish.c	Thu May 18 16:46:24 2000
@@ -42,12 +42,15 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "X.h"
 #include "Xproto.h"
 #include "Xos.h"
 #include "misc.h"
+#include "colormapst.h"
+#include "propertyst.h"
 #include "lbxserve.h"
 #define _XLBX_SERVER_
 #include "lbxstr.h"
@@ -131,8 +134,7 @@
 };
 
 int
-LbxSquishEvent(buf)
-    char *buf;
+LbxSquishEvent(char *buf)
 {
     int delta = lbxevdelta[((xEvent *)buf)->u.u.type];
     int pad = lbxevpad[((xEvent *)buf)->u.u.type];
Index: xc/programs/Xserver/lbx/lbxsrvopts.h
diff -u xc/programs/Xserver/lbx/lbxsrvopts.h:1.1.1.1 xc/programs/Xserver/lbx/lbxsrvopts.h:1.2
--- xc/programs/Xserver/lbx/lbxsrvopts.h:1.1.1.1	Sat Dec 21 20:07:20 1996
+++ xc/programs/Xserver/lbx/lbxsrvopts.h	Thu May 18 16:46:24 2000
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #ifndef _LBX_SRVOPTS_H_
 #define _LBX_SRVOPTS_H_
@@ -35,9 +36,9 @@
     short	serverDeltaMaxLen;
     LbxStreamOpts streamOpts;
     int		numBitmapCompMethods;
-    char	*bitmapCompMethods;   /* array of indices */
+    unsigned char	*bitmapCompMethods;   /* array of indices */
     int		numPixmapCompMethods;
-    char	*pixmapCompMethods;   /* array of indices */
+    unsigned char	*pixmapCompMethods;   /* array of indices */
     int		**pixmapCompDepths;   /* depths supported from each method */
     Bool	squish;
     Bool	useTags;
@@ -46,33 +47,17 @@
 typedef LbxNegOptsRec *LbxNegOptsPtr;
 
 
-extern LbxBitmapCompMethod *LbxSrvrLookupBitmapCompMethod (
-#if NeedFunctionPrototypes
-	LbxProxyPtr,	/* proxy */
-	int		/* methodOpCode */
-#endif
-);
-
-extern LbxPixmapCompMethod *LbxSrvrLookupPixmapCompMethod (
-#if NeedFunctionPrototypes
-	LbxProxyPtr,	/* proxy */
-	int		/* methodOpCode */
-#endif
-);
-
-extern LbxBitmapCompMethod *LbxSrvrFindPreferredBitmapCompMethod (
-#if NeedFunctionPrototypes
-	LbxProxyPtr	/* proxy */
-#endif
-);
-
-extern LbxPixmapCompMethod *LbxSrvrFindPreferredPixmapCompMethod (
-#if NeedFunctionPrototypes
-	LbxProxyPtr,	/* proxy */
-	int,		/* format */
-	int		/* depth */
-#endif
-);
+extern void LbxOptionInit ( LbxNegOptsPtr pno );
+extern int LbxOptionParse ( LbxNegOptsPtr pno, unsigned char *popt, 
+			    int optlen, unsigned char *preply );
+extern LbxBitmapCompMethod * 
+LbxSrvrLookupBitmapCompMethod ( LbxProxyPtr proxy, int methodOpCode );
+extern LbxPixmapCompMethod * 
+LbxSrvrLookupPixmapCompMethod ( LbxProxyPtr proxy, int methodOpCode );
+extern LbxBitmapCompMethod * 
+LbxSrvrFindPreferredBitmapCompMethod ( LbxProxyPtr proxy );
+extern LbxPixmapCompMethod * 
+LbxSrvrFindPreferredPixmapCompMethod ( LbxProxyPtr proxy, int format, int depth );
 
 
 #endif /* _LBX_SRVOPTS_H_ */
Index: xc/programs/Xserver/lbx/lbxswap.c
diff -u xc/programs/Xserver/lbx/lbxswap.c:1.1.1.2 xc/programs/Xserver/lbx/lbxswap.c:1.2
--- xc/programs/Xserver/lbx/lbxswap.c:1.1.1.2	Sun Sep 27 01:45:37 1998
+++ xc/programs/Xserver/lbx/lbxswap.c	Thu May 18 16:46:24 2000
@@ -41,6 +41,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #include <sys/types.h>
 #define NEED_REPLIES
@@ -54,6 +55,8 @@
 #include "pixmapstr.h"
 #include "scrnintstr.h"
 #include "servermd.h"
+#include "swaprep.h"
+#include "propertyst.h"
 #define _XLBX_SERVER_
 #include "lbxstr.h"
 #include "lbxserve.h"
@@ -62,8 +65,7 @@
 #include <stdio.h>
 
 static int
-SProcLbxQueryVersion(client)
-    register ClientPtr client;
+SProcLbxQueryVersion(ClientPtr client)
 {
     register int n;
 
@@ -74,8 +76,7 @@
 }
 
 static int
-SProcLbxStartProxy(client)
-    register ClientPtr client;
+SProcLbxStartProxy(ClientPtr client)
 {
     register int n;
 
@@ -86,8 +87,7 @@
 }
 
 static int
-SProcLbxStopProxy(client)
-    register ClientPtr client;
+SProcLbxStopProxy(ClientPtr client)
 {
     register int n;
 
@@ -98,8 +98,7 @@
 }
 
 int
-SProcLbxSwitch(client)
-    register ClientPtr client;
+SProcLbxSwitch(ClientPtr client)
 {
     register int n;
 
@@ -111,8 +110,7 @@
 }
 
 int
-SProcLbxBeginLargeRequest (client)
-    register ClientPtr client;
+SProcLbxBeginLargeRequest (ClientPtr client)
 {
     register int n;
 
@@ -124,8 +122,7 @@
 }
 
 int
-SProcLbxLargeRequestData (client)
-    register ClientPtr client;
+SProcLbxLargeRequestData (ClientPtr client)
 {
     register int n;
 
@@ -136,8 +133,7 @@
 }
 
 int
-SProcLbxEndLargeRequest (client)
-    register ClientPtr client;
+SProcLbxEndLargeRequest (ClientPtr client)
 {
     register int n;
 
@@ -148,8 +144,7 @@
 }
 
 static int
-SProcLbxNewClient(client)
-    register ClientPtr client;
+SProcLbxNewClient(ClientPtr client)
 {
     register int n;
 
@@ -161,8 +156,7 @@
 }
 
 static int
-SProcLbxCloseClient(client)
-    register ClientPtr client;
+SProcLbxCloseClient(ClientPtr client)
 {
     register int n;
 
@@ -174,8 +168,7 @@
 }
 
 static int
-SProcLbxModifySequence(client)
-    register ClientPtr client;
+SProcLbxModifySequence(ClientPtr client)
 {
     register int n;
 
@@ -187,8 +180,7 @@
 }
 
 static int
-SProcLbxAllowMotion(client)
-    register ClientPtr client;
+SProcLbxAllowMotion(ClientPtr client)
 {
     register int n;
 
@@ -200,8 +192,7 @@
 }
 
 static int
-SProcLbxIncrementPixel(client)
-    register ClientPtr client;
+SProcLbxIncrementPixel(ClientPtr client)
 {
     register int n;
 
@@ -214,8 +205,7 @@
 }
 
 static int
-SProcLbxGrabCmap(client)
-    register ClientPtr client;
+SProcLbxGrabCmap(ClientPtr client)
 {
     register int n;
 
@@ -228,8 +218,7 @@
 }
 
 static int
-SProcLbxReleaseCmap(client)
-    register ClientPtr client;
+SProcLbxReleaseCmap(ClientPtr client)
 {
     register int n;
 
@@ -242,8 +231,7 @@
 }
 
 static int
-SProcLbxAllocColor(client)
-    register ClientPtr client;
+SProcLbxAllocColor(ClientPtr client)
 {
     register int n;
 
@@ -260,8 +248,7 @@
 }
 
 static int
-SProcLbxGetModifierMapping(client)
-    register ClientPtr client;
+SProcLbxGetModifierMapping(ClientPtr client)
 {
     register int n;
 
@@ -272,8 +259,7 @@
 }
 
 static int
-SProcLbxGetKeyboardMapping(client)
-    register ClientPtr client;
+SProcLbxGetKeyboardMapping(ClientPtr client)
 {
     register int n;
 
@@ -284,8 +270,7 @@
 }
 
 static int
-SProcLbxQueryFont(client)
-    register ClientPtr client;
+SProcLbxQueryFont(ClientPtr client)
 {
     register int n;
 
@@ -297,8 +282,7 @@
 }
 
 static int
-SProcLbxChangeProperty(client)
-    register ClientPtr client;
+SProcLbxChangeProperty(ClientPtr client)
 {
     register int n;
 
@@ -324,8 +308,7 @@
 }
 
 static int
-SProcLbxGetProperty(client)
-    register ClientPtr client;
+SProcLbxGetProperty(ClientPtr client)
 {
     register int n;
 
@@ -341,8 +324,7 @@
 }
 
 static int
-SProcLbxTagData(client)
-    register ClientPtr client;
+SProcLbxTagData(ClientPtr client)
 {
     register int n;
 
@@ -355,8 +337,7 @@
 }
 
 static int
-SProcLbxInvalidateTag(client)
-    register ClientPtr client;
+SProcLbxInvalidateTag(ClientPtr client)
 {
     register int n;
 
@@ -368,8 +349,7 @@
 }
 
 static int
-SProcLbxPoly(client)
-    register ClientPtr client;
+SProcLbxPoly(ClientPtr client)
 {
     register int n;
 
@@ -389,8 +369,7 @@
 }
 
 static int
-SProcLbxFillPoly(client)
-    register ClientPtr client;
+SProcLbxFillPoly(ClientPtr client)
 {
     register int n;
 
@@ -410,10 +389,9 @@
 }
 
 static int
-SProcLbxCopyArea (client)
-    register ClientPtr	client;
+SProcLbxCopyArea(ClientPtr client)
 {
-    register int    n;
+    int    n;
 
     REQUEST(xLbxCopyAreaReq);
     char *after;
@@ -436,10 +414,9 @@
 }
 
 static int
-SProcLbxCopyPlane (client)
-    register ClientPtr	client;
+SProcLbxCopyPlane(ClientPtr client)
 {
-    register int    n;
+    int    n;
 
     REQUEST(xLbxCopyPlaneReq);
     char *after;
@@ -463,8 +440,7 @@
 }
 
 static int
-SProcLbxPolyText(client)
-    register ClientPtr client;
+SProcLbxPolyText(ClientPtr client)
 {
     register int n;
 
@@ -484,8 +460,7 @@
 }
 
 static int
-SProcLbxImageText(client)
-    register ClientPtr client;
+SProcLbxImageText(ClientPtr client)
 {
     register int n;
 
@@ -506,8 +481,7 @@
 
 
 static int
-SProcLbxPutImage(client)
-    register ClientPtr client;
+SProcLbxPutImage(ClientPtr client)
 {
     register int n;
 
@@ -518,8 +492,7 @@
 }
 
 static int
-SProcLbxGetImage(client)
-    register ClientPtr client;
+SProcLbxGetImage(ClientPtr client)
 {
     register int n;
 
@@ -536,8 +509,7 @@
 }
 
 static int
-SProcLbxInternAtoms(client)
-    register ClientPtr client;
+SProcLbxInternAtoms(ClientPtr client)
 {
     register int n;
     char *ptr;
@@ -565,8 +537,7 @@
 
 
 static int
-SProcLbxGetWinAttrAndGeom(client)
-    ClientPtr	client;
+SProcLbxGetWinAttrAndGeom(ClientPtr client)
 {
     int	n;
 
@@ -581,8 +552,7 @@
 
 
 static int
-SProcLbxQueryExtension(client)
-    ClientPtr	client;
+SProcLbxQueryExtension(ClientPtr client)
 {
     int	n;
 
@@ -594,8 +564,7 @@
 }
 
 int
-SProcLbxDispatch(client)
-    register ClientPtr client;
+SProcLbxDispatch(ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data) {
@@ -678,10 +647,9 @@
 
 #ifdef notyet
 void
-LbxWriteSConnectionInfo(pClient, size, pInfo)
-    ClientPtr		pClient;
-    unsigned long	size;
-    char 		*pInfo;
+LbxWriteSConnectionInfo(ClientPtr	pClient,
+			unsigned long	size,
+			char 		*pInfo)
 {
     int		i, j, k;
     ScreenPtr	pScreen;
@@ -737,8 +705,8 @@
 }
 
 void
-SwapConnSetup(pConnSetup, pConnSetupT)
-    xConnSetup 	*pConnSetup, *pConnSetupT;
+SwapConnSetup(xConnSetup *pConnSetup, 
+	      xConnSetup *pConnSetupT)
 {
     cpswapl(pConnSetup->release, pConnSetupT->release);
     cpswapl(pConnSetup->ridBase, pConnSetupT->ridBase);
@@ -757,8 +725,8 @@
 }
 
 void
-SwapWinRoot(pRoot, pRootT)
-    xWindowRoot	*pRoot, *pRootT;
+SwapWinRoot(xWindowRoot	*pRoot, 
+	    xWindowRoot *pRootT)
 {
     cpswapl(pRoot->windowId, pRootT->windowId);
     cpswapl(pRoot->defaultColormap, pRootT->defaultColormap);
@@ -779,8 +747,8 @@
 }
 
 void
-SwapVisual(pVis, pVisT)
-    xVisualType 	*pVis, *pVisT;
+SwapVisual(xVisualType *pVis, 
+	   xVisualType *pVisT;
 {
     cpswapl(pVis->visualID, pVisT->visualID);
     pVisT->class = pVis->class;
@@ -793,9 +761,8 @@
 #endif
 
 void
-LbxWriteSConnSetupPrefix(pClient, pcsp)
-    ClientPtr		pClient;
-    xLbxConnSetupPrefix	*pcsp;
+LbxWriteSConnSetupPrefix(ClientPtr		pClient,
+			 xLbxConnSetupPrefix	*pcsp)
 {
     xLbxConnSetupPrefix	cspT;
 
@@ -810,9 +777,8 @@
 }
 
 void
-LbxSwapFontInfo(pr, compressed)
-    xLbxFontInfo	*pr;
-    Bool	compressed;
+LbxSwapFontInfo(xLbxFontInfo	*pr,
+		Bool		compressed)
 {
     unsigned    i;
     xCharInfo  *pxci;
Index: xc/programs/Xserver/lbx/lbxtables.c
diff -u xc/programs/Xserver/lbx/lbxtables.c:1.1.1.1 xc/programs/Xserver/lbx/lbxtables.c:1.2
--- xc/programs/Xserver/lbx/lbxtables.c:1.1.1.1	Sat Dec 21 20:07:20 1996
+++ xc/programs/Xserver/lbx/lbxtables.c	Thu May 18 16:46:24 2000
@@ -21,11 +21,13 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
+#include "dix.h"
 
-extern int ProcInitialConnection();
-extern int ProcLbxEstablishConnection();
+extern int ProcInitialConnection(ClientPtr client);
+extern int ProcLbxEstablishConnection(ClientPtr client);
 
-int (* LbxInitialVector[3]) () =
+int (* LbxInitialVector[3]) (ClientPtr) =
 {
     0,
     ProcInitialConnection,
Index: xc/programs/Xserver/lbx/lbxtags.c
diff -u xc/programs/Xserver/lbx/lbxtags.c:1.1.1.3 xc/programs/Xserver/lbx/lbxtags.c:1.2
--- xc/programs/Xserver/lbx/lbxtags.c:1.1.1.3	Sun Sep 27 04:06:30 1998
+++ xc/programs/Xserver/lbx/lbxtags.c	Thu May 18 16:46:24 2000
@@ -42,30 +42,31 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #include "X.h"
 #include "misc.h"
 #include "lbxdata.h"
 #include "resource.h"
+#include "colormapst.h"
+#include "propertyst.h"
 #include "lbxtags.h"
 #define _XLBX_SERVER_
 #include "lbxstr.h"
 #include "propertyst.h"
 
-static int  tag_free();
-
 static RESTYPE TagResType;
 
+extern int _lbx_fi_junklen;
+
 /* ARGSUSED */
 static int
-tag_free(data, id)
-    pointer     data;
-    XID         id;
+tag_free(pointer     data,
+	 XID         id)
 {
     TagData     td = (TagData) data;
     FontTagInfoPtr	ftip;
     char *t;
-    extern int	_lbx_fi_junklen;
 
     if (td->global)
 	*(td->global) = 0;
@@ -84,21 +85,21 @@
     return 0;
 }
 
-TagInit()
+void
+TagInit(void)
 {
     TagResType = CreateNewResourceType(tag_free);
 }
 
 XID
-TagNewTag()
+TagNewTag(void)
 {
     return FakeClientID(0);
 }
 
 void
-TagClearProxy(tid, pid)
-    XID         tid;
-    int         pid;
+TagClearProxy(XID         tid,
+	      int         pid)
 {
     TagData     td;
 
@@ -108,9 +109,8 @@
 }
 
 void
-TagMarkProxy(tid, pid)
-    XID         tid;
-    int         pid;
+TagMarkProxy(XID         tid,
+	     int         pid)
 {
     TagData     td;
 
@@ -119,9 +119,8 @@
 }
 
 Bool
-TagProxyMarked(tid, pid)
-    XID         tid;
-    int         pid;
+TagProxyMarked(XID         tid,
+	       int         pid)
 {
     TagData     td;
 
@@ -130,11 +129,10 @@
 }
 
 XID
-TagSaveTag(dtype, size, data, global)
-    int         dtype;
-    int         size;
-    pointer     data;
-    XID         *global;
+TagSaveTag(int         dtype,
+	   int         size,
+	   pointer     data,
+	   XID         *global)
 {
     TagData     td;
 
@@ -158,8 +156,7 @@
 }
 
 void
-TagDeleteTag(tid)
-    XID         tid;
+TagDeleteTag(XID         tid)
 {
     int		pid;
     TagData     td;
@@ -188,8 +185,7 @@
 }
 
 TagData
-TagGetTag(tid)
-    XID         tid;
+TagGetTag(XID         tid)
 {
     TagData     td;
 
@@ -198,10 +194,9 @@
 }
 
 static void
-LbxFlushTag(value, tid, cdata)
-    pointer value;
-    XID tid;
-    pointer cdata;
+LbxFlushTag(pointer value,
+	    XID tid,
+	    pointer cdata)
 {
     TagData td = (TagData)value;
     LbxProxyPtr proxy = (LbxProxyPtr)cdata;
@@ -227,8 +222,8 @@
 /*
  * clear out markers for proxies
  */
-LbxFlushTags(proxy)
-    LbxProxyPtr proxy;
+void
+LbxFlushTags(LbxProxyPtr proxy)
 {
     FindClientResourcesByType(NULL, TagResType, LbxFlushTag, (pointer)proxy);
 }
Index: xc/programs/Xserver/lbx/lbxtags.h
diff -u xc/programs/Xserver/lbx/lbxtags.h:1.1.1.2 xc/programs/Xserver/lbx/lbxtags.h:1.2
--- xc/programs/Xserver/lbx/lbxtags.h:1.1.1.2	Sun Sep 27 01:45:39 1998
+++ xc/programs/Xserver/lbx/lbxtags.h	Thu May 18 16:46:25 2000
@@ -42,6 +42,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.2 2000/05/18 23:46:25 dawes Exp $ */
 
 #ifndef _LBXTAGS_H_
 #define _LBXTAGS_H_
@@ -64,52 +65,14 @@
 
 typedef struct _tagdata *TagData;
 
-extern TagData TagGetTag(
-#if NeedFunctionPrototypes
-    XID         /*tid*/
-#endif
-);
-
-extern XID  TagNewTag(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void TagClearProxy(
-#if NeedFunctionPrototypes
-    XID         /*tid*/,
-    int         /*pid*/
-#endif
-);
-
-extern void TagMarkProxy(
-#if NeedFunctionPrototypes
-    XID         /*tid*/,
-    int         /*pid*/
-#endif
-);
-
-extern Bool TagProxyMarked(
-#if NeedFunctionPrototypes
-    XID         /*tid*/,
-    int         /*pid*/
-#endif
-);
-
-extern void TagDeleteTag(
-#if NeedFunctionPrototypes
-    XID         /*tid*/
-#endif
-);
-
-extern XID TagSaveTag(
-#if NeedFunctionPrototypes
-    int         /*dtype*/,
-    int         /*size*/,
-    pointer     /*data*/,
-    XID*        /*global*/
-#endif
-);
+extern void TagInit ( void );
+extern XID TagNewTag ( void );
+extern void TagClearProxy ( XID tid, int pid );
+extern void TagMarkProxy ( XID tid, int pid );
+extern Bool TagProxyMarked ( XID tid, int pid );
+extern XID TagSaveTag ( int dtype, int size, pointer data, XID *global );
+extern void TagDeleteTag ( XID tid );
+extern TagData TagGetTag ( XID tid );
+extern void LbxFlushTags ( LbxProxyPtr proxy );
 
 #endif				/* _LBXTAGS_H_ */
Index: xc/programs/Xserver/lbx/lbxzerorep.c
diff -u xc/programs/Xserver/lbx/lbxzerorep.c:1.1.1.2 xc/programs/Xserver/lbx/lbxzerorep.c:1.2
--- xc/programs/Xserver/lbx/lbxzerorep.c:1.1.1.2	Sun Sep 27 01:45:40 1998
+++ xc/programs/Xserver/lbx/lbxzerorep.c	Thu May 18 16:46:25 2000
@@ -23,6 +23,7 @@
 from The Open Group.
 
 */
+/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.2 2000/05/18 23:46:25 dawes Exp $ */
 
 /*
  * This module handles zeroing out unused pad bytes in core X replies.
@@ -34,10 +35,9 @@
 #include "X.h"
 #include <X11/Xproto.h>
 
-
-ZeroReplyPadBytes (buf, reqType)
-    char *buf;
-    int reqType;
+void
+ZeroReplyPadBytes (char *buf,
+		   int reqType)
 {
     switch (reqType) {
     case X_GetWindowAttributes:
Index: xc/programs/Xserver/mi/Imakefile
diff -u xc/programs/Xserver/mi/Imakefile:3.29 xc/programs/Xserver/mi/Imakefile:3.30
--- xc/programs/Xserver/mi/Imakefile:3.29	Thu Feb 10 22:31:48 2000
+++ xc/programs/Xserver/mi/Imakefile	Fri Mar 31 14:55:54 2000
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/44 1996/12/02 10:22:16 lehors $
-XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.29 2000/02/11 06:31:48 mvojkovi Exp $
+XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.30 2000/03/31 22:55:54 dawes Exp $
 #include <Server.tmpl>
 
 #if ! HasCbrt
@@ -74,6 +74,7 @@
 InstallDriverSDKNonExecFile(mibank.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(mibstore.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(micmap.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(migc.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(miline.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(mipointer.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(mipointrst.h,$(DRIVERSDKINCLUDEDIR))
Index: xc/programs/Xserver/mi/miinitext.c
diff -u xc/programs/Xserver/mi/miinitext.c:3.49 xc/programs/Xserver/mi/miinitext.c:3.50
--- xc/programs/Xserver/mi/miinitext.c:3.49	Sat Feb 12 22:15:41 2000
+++ xc/programs/Xserver/mi/miinitext.c	Mon Apr 17 09:30:14 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.49 2000/02/13 06:15:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.50 2000/04/17 16:30:14 eich Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -228,9 +228,9 @@
     char	*argv[];
 {
 #ifdef PANORAMIX
-#if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
+# if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
   if (!noPanoramiXExtension) PanoramiXExtensionInit();
-#endif
+# endif
 #endif
 #ifdef BEZIER
     BezierExtensionInit();
Index: xc/programs/Xserver/mi/mioverlay.c
diff -u xc/programs/Xserver/mi/mioverlay.c:3.4 xc/programs/Xserver/mi/mioverlay.c:3.8
--- xc/programs/Xserver/mi/mioverlay.c:3.4	Mon Feb 28 16:16:03 2000
+++ xc/programs/Xserver/mi/mioverlay.c	Wed Jun  7 15:03:15 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.4 2000/02/29 00:16:03 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.8 2000/06/07 22:03:15 tsi Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
@@ -391,7 +391,9 @@
 	}
 	if(overMarked)
 	    MARK_OVERLAY(pWin->parent);
-    } else if(doUnderlay) {
+    } 
+
+    if(doUnderlay && !pTree) {
 	if(!(pTree = MIOVERLAY_GET_WINDOW_TREE(pWin))) {
  	    pChild = pWin->lastChild;
 	    while(1) {
@@ -718,8 +720,10 @@
             (* pChild->drawable.pScreen->ClipNotify)(pChild, 0, 0);
         REGION_EMPTY(pChild->drawable.pScreen, &pChild->borderClip);
 	if((pTree = MIOVERLAY_GET_WINDOW_TREE(pChild))) {
-	    REGION_EMPTY(pChild->drawable.pScreen, &pTree->clipList);
-            REGION_EMPTY(pChild->drawable.pScreen, &pTree->borderClip);
+	    if(pTree->valdata != (miOverlayValDataPtr)UnmapValData) {
+		REGION_EMPTY(pChild->drawable.pScreen, &pTree->clipList);
+		REGION_EMPTY(pChild->drawable.pScreen, &pTree->borderClip);
+	    }
 	}
     }
 }
@@ -1208,7 +1212,7 @@
 		        REGION_UNION(pScreen, gravitate2[g],
 				   gravitate2[g], &tChild->borderClip);
 		    } else 
-			CollectUnderlayChildrenRegions(pChild, gravitate[g]);
+			CollectUnderlayChildrenRegions(pChild, gravitate2[g]);
 		}
 	    } else {
 		UnmapWindow(pChild, TRUE);
Index: xc/programs/Xserver/os/Imakefile
diff -u xc/programs/Xserver/os/Imakefile:3.26 xc/programs/Xserver/os/Imakefile:3.27
--- xc/programs/Xserver/os/Imakefile:3.26	Fri Nov 19 05:55:09 1999
+++ xc/programs/Xserver/os/Imakefile	Fri May  5 10:47:29 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/85 1997/12/07 18:26:23 kaleb $
-XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.26 1999/11/19 13:55:09 hohndel Exp $
+XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.27 2000/05/05 17:47:29 keithp Exp $
 #include <Server.tmpl>
 
 /*
@@ -73,15 +73,20 @@
 COLOR_OBJS=oscolor.o
 #endif
 
+#if UseInternalMalloc
+MALLOC_SRCS=xalloc.c
+MALLOC_OBJS=xalloc.o
+#endif
+
 BOOTSTRAPCFLAGS = 
            SRCS = WaitFor.c access.c connection.c io.c $(COLOR_SRCS) \
                   osinit.c utils.c auth.c mitauth.c secauth.c $(XDMAUTHSRCS) \
                   $(RPCSRCS) $(KRB5SRCS) xdmcp.c decompress.c OtherSources \
-                  transport.c xalloc.c $(LBX_SRCS)
+                  transport.c $(MALLOC_SRCS) $(LBX_SRCS)
            OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \
                   osinit.o utils.o auth.o mitauth.o secauth.o $(XDMAUTHOBJS) \
                   $(RPCOBJS) $(KRB5OBJS) xdmcp.o decompress.o OtherObjects \
-                  transport.o xalloc.o $(LBX_OBJS)
+                  transport.o $(MALLOC_OBJS) $(LBX_OBJS)
 
 #if SpecialMalloc
      MEM_DEFINES = -DSPECIAL_MALLOC
Index: xc/programs/Xserver/os/WaitFor.c
diff -u xc/programs/Xserver/os/WaitFor.c:3.23 xc/programs/Xserver/os/WaitFor.c:3.24
--- xc/programs/Xserver/os/WaitFor.c:3.23	Fri Nov 19 05:55:10 1999
+++ xc/programs/Xserver/os/WaitFor.c	Fri May  5 10:53:50 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.23 1999/11/19 13:55:10 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.24 2000/05/05 17:53:50 keithp Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -157,6 +157,7 @@
     CARD32 now;
 #ifdef SMART_SCHEDULE
     Bool    someReady = FALSE;
+    extern Bool	SmartScheduleIdle;
 #endif
 
     FD_ZERO(&clientsReadable);
@@ -329,6 +330,7 @@
 	XFD_COPYSET(&AllSockets, &LastSelectMask);
 #ifdef SMART_SCHEDULE
 	}
+	SmartScheduleIdle = TRUE;
 #endif
 	BlockHandler((pointer)&wt, (pointer)&LastSelectMask);
 	if (NewOutputPending)
@@ -358,27 +360,24 @@
 	}
 #endif /* XTESTEXT1 */
 #ifdef SMART_SCHEDULE
-	if (someReady)
+	if (i >= 0)
 	{
-	    /*
-	     * If no-one else is home, bail quickly
-	     */
-	    if (i == 0)
-	    {
-		XFD_COPYSET(&ClientsWithInput, &LastSelectMask);
-		XFD_COPYSET(&ClientsWithInput, &clientsReadable);
-		break;
-	    }
-	    XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask);
+	    extern unsigned long    SmartScheduleIdleCount;
+	    extern Bool		    SmartScheduleTimerStopped;
+	    extern Bool		    SmartScheduleStartTimer(void);
+
+	    SmartScheduleIdle = FALSE;
+	    SmartScheduleIdleCount = 0;
+	    if (SmartScheduleTimerStopped)
+		(void) SmartScheduleStartTimer ();
 	}
 #endif
 	if (i <= 0) /* An error or timeout occurred */
 	{
-
 	    if (dispatchException)
 		return 0;
-	    FD_ZERO(&clientsWritable);
 	    if (i < 0) 
+	    {
 		if (selecterr == EBADF)    /* Some client disconnected */
 		{
 		    CheckConnections ();
@@ -395,6 +394,18 @@
 		    ErrorF("WaitForSomething(): select: errno=%d\n",
 			selecterr);
 		}
+	    }
+#ifdef SMART_SCHEDULE
+	    else if (someReady)
+	    {
+		/*
+		 * If no-one else is home, bail quickly
+		 */
+		XFD_COPYSET(&ClientsWithInput, &LastSelectMask);
+		XFD_COPYSET(&ClientsWithInput, &clientsReadable);
+		break;
+	    }
+#endif
 	    if (timers)
 	    {
 		now = GetTimeInMillis();
@@ -407,6 +418,10 @@
 	else
 	{
 	    fd_set tmp_set;
+#ifdef SMART_SCHEDULE
+	    if (someReady)
+		XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask);
+#endif	    
 	    if (AnyClientsWriteBlocked && XFD_ANYSET (&clientsWritable))
 	    {
 		NewOutputPending = TRUE;
Index: xc/programs/Xserver/os/connection.c
diff -u xc/programs/Xserver/os/connection.c:3.38 xc/programs/Xserver/os/connection.c:3.40
--- xc/programs/Xserver/os/connection.c:3.38	Sat May 15 05:10:35 1999
+++ xc/programs/Xserver/os/connection.c	Mon Jun 26 16:00:32 2000
@@ -41,7 +41,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.38 1999/05/15 12:10:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.40 2000/06/26 23:00:32 dawes Exp $ */
 /*****************************************************************
  *  Stuff to create connections --- OS dependent
  *
@@ -160,6 +160,8 @@
 #include "extensions/security.h"
 #endif
 #ifdef LBX
+#include "colormapst.h"
+#include "propertyst.h"
 #include "lbxserve.h"
 #endif
 
@@ -639,24 +641,7 @@
 				  string_n, auth_string, client, &reason);
 
 #ifdef LBX
-    if (restore_trans_conn) {
-	/*
-	 * Restore client's trans_conn state
-	 */
-	priv = (OsCommPtr)client->osPrivate;
-	priv->trans_conn = NULL;
-
-	trans_conn = NULL;
-    }
-	
-#endif
-
-#ifdef LBX
-    if (!trans_conn) {
-	/*
-	 * Use the proxy's trans_conn
-	 */
-	trans_conn = ((OsCommPtr)lbxpc->osPrivate)->trans_conn;
+    if (! priv->trans_conn) {
 	if (auth_id == (XID) ~0L && !GetAccessControl())
 	    auth_id = ((OsCommPtr)lbxpc->osPrivate)->auth_id;
 #ifdef XCSECURITY
@@ -686,7 +671,7 @@
 #endif
 	    if (
 #ifdef LBX
-		!priv->trans_conn ||
+		!trans_conn ||
 #endif
 		InvalidHost ((struct sockaddr *) from, fromlen))
 		AuthAudit(client, FALSE, (struct sockaddr *) from,
@@ -703,11 +688,20 @@
 	    xfree ((char *) from);
 	}
 
-	if (auth_id == (XID) ~0L)
+	if (auth_id == (XID) ~0L) {
+#ifdef LBX
+	  /*
+	   * Restore client's trans_conn state
+	   */
+	  if (restore_trans_conn) {
+		priv->trans_conn = NULL;
+	  }
+#endif
 	    if (reason)
 		return reason;
 	    else
 		return "Client is not authorized to connect to Server";
+	}
     }
     else if (auditTrailLevel > 1)
     {
@@ -737,6 +731,11 @@
      * true purpose of the selfhosts list is to see who may change the
      * access control list.
      */
+#ifdef LBX
+     if (restore_trans_conn) {
+	priv->trans_conn = NULL;
+     }
+#endif
     return((char *)NULL);
 }
 
Index: xc/programs/Xserver/os/io.c
diff -u xc/programs/Xserver/os/io.c:3.21 xc/programs/Xserver/os/io.c:3.22
--- xc/programs/Xserver/os/io.c:3.21	Fri Nov 19 05:55:10 1999
+++ xc/programs/Xserver/os/io.c	Thu May 18 16:46:26 2000
@@ -48,7 +48,7 @@
  *   InsertFakeRequest, ResetCurrentRequest
  *
  *****************************************************************/
-/* $XFree86: xc/programs/Xserver/os/io.c,v 3.21 1999/11/19 13:55:10 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/os/io.c,v 3.22 2000/05/18 23:46:26 dawes Exp $ */
 
 #ifdef WIN32
 #include <X11/Xwinsock.h>
@@ -77,6 +77,8 @@
 #include "dixstruct.h"
 #include "misc.h"
 #ifdef LBX
+#include "colormapst.h"
+#include "propertyst.h"
 #include "lbxserve.h"
 #endif
 
Index: xc/programs/Xserver/os/lbxio.c
diff -u xc/programs/Xserver/os/lbxio.c:3.10 xc/programs/Xserver/os/lbxio.c:3.11
--- xc/programs/Xserver/os/lbxio.c:3.10	Sun Oct  4 02:39:44 1998
+++ xc/programs/Xserver/os/lbxio.c	Thu May 18 16:46:26 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.10 1998/10/04 09:39:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.11 2000/05/18 23:46:26 dawes Exp $ */
 /*
 
 Copyright 1996, 1998  The Open Group
@@ -68,6 +68,8 @@
 #include "opaque.h"
 #include "dixstruct.h"
 #include "misc.h"
+#include "colormapst.h"
+#include "propertyst.h"
 #include "lbxserve.h"
 
 /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
Index: xc/programs/Xserver/os/secauth.c
diff -u xc/programs/Xserver/os/secauth.c:1.5 xc/programs/Xserver/os/secauth.c:1.8
--- xc/programs/Xserver/os/secauth.c:1.5	Sun Oct 11 04:23:44 1998
+++ xc/programs/Xserver/os/secauth.c	Thu Jun 15 15:10:41 2000
@@ -20,7 +20,7 @@
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.5 1998/10/11 11:23:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.8 2000/06/15 22:10:41 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
@@ -42,7 +42,7 @@
     ClientPtr	client,
     char	**reason)
 {
-    char	*policy = *dataP;
+    CARD8	*policy = *(CARD8 **)dataP;
     int		length;
     Bool	permit;
     int		nPolicies;
@@ -56,7 +56,7 @@
     }
 
     permit = (*policy++ == 0);
-    nPolicies = *policy++;
+    nPolicies = (CARD8) *policy++;
 
     length -= 2;
 
@@ -70,7 +70,7 @@
 	    return FALSE;
 	}
 
-	strLen = *policy++;
+	strLen = (CARD8) *policy++;
 	if (--length < strLen) {
 	    *reason = InvalidPolicyReason;
 	    return FALSE;
@@ -82,7 +82,7 @@
 	    {
 		char *testPolicy = sitePolicies[sitePolicy];
 		if ((strLen == strlen(testPolicy)) &&
-		    (strncmp(policy, testPolicy, strLen) == 0))
+		    (strncmp((char *)policy, testPolicy, strLen) == 0))
 		{
 		    found = TRUE; /* need to continue parsing the policy... */
 		    break;
@@ -102,7 +102,7 @@
     }
 
     *data_lengthP = length;
-    *dataP = policy;
+    *dataP = (char *)policy;
     return TRUE;
 }
 
Index: xc/programs/Xserver/os/utils.c
diff -u xc/programs/Xserver/os/utils.c:3.56 xc/programs/Xserver/os/utils.c:3.59
--- xc/programs/Xserver/os/utils.c:3.56	Wed Feb 23 12:30:18 2000
+++ xc/programs/Xserver/os/utils.c	Fri Jun 16 17:27:34 2000
@@ -45,7 +45,7 @@
 OR PERFORMANCE OF THIS SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.56 2000/02/23 20:30:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.59 2000/06/17 00:27:34 dawes Exp $ */
 
 #ifdef WIN32
 #include <X11/Xwinsock.h>
@@ -993,6 +993,25 @@
 	{
 	    SmartScheduleDisable = TRUE;
 	}
+	else if ( strcmp( argv[i], "-schedInterval") == 0)
+	{
+	    if (++i < argc)
+	    {
+		SmartScheduleInterval = atoi(argv[i]);
+		SmartScheduleSlice = SmartScheduleInterval;
+	    }
+	    else
+		UseMsg();
+	}
+	else if ( strcmp( argv[i], "-schedMax") == 0)
+	{
+	    if (++i < argc)
+	    {
+		SmartScheduleMaxSlice = atoi(argv[i]);
+	    }
+	    else
+		UseMsg();
+	}
 #endif
  	else
  	{
@@ -1542,17 +1561,59 @@
 
 #ifdef SMART_SCHEDULE
 
+unsigned long	SmartScheduleIdleCount;
+Bool		SmartScheduleIdle;
+Bool		SmartScheduleTimerStopped;
+
 #ifdef SIGVTALRM
 #define SMART_SCHEDULE_POSSIBLE
 #endif
 
 #ifdef SMART_SCHEDULE_POSSIBLE
-#define SMART_SCHEDULE_SIGNAL		SIGVTALRM
+#define SMART_SCHEDULE_SIGNAL		SIGALRM
+#define SMART_SCHEDULE_TIMER		ITIMER_REAL
+#endif
 
 void
+SmartScheduleStopTimer (void)
+{
+#ifdef SMART_SCHEDULE_POSSIBLE
+    struct itimerval	timer;
+    
+    timer.it_interval.tv_sec = 0;
+    timer.it_interval.tv_usec = 0;
+    timer.it_value.tv_sec = 0;
+    timer.it_value.tv_usec = 0;
+    (void) setitimer (ITIMER_REAL, &timer, 0);
+    SmartScheduleTimerStopped = TRUE;
+#endif
+}
+
+Bool
+SmartScheduleStartTimer (void)
+{
+#ifdef SMART_SCHEDULE_POSSIBLE
+    struct itimerval	timer;
+    
+    SmartScheduleTimerStopped = FALSE;
+    timer.it_interval.tv_sec = 0;
+    timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
+    timer.it_value.tv_sec = 0;
+    timer.it_value.tv_usec = SmartScheduleInterval * 1000;
+    return setitimer (ITIMER_REAL, &timer, 0) >= 0;
+#endif
+    return FALSE;
+}
+
+#ifdef SMART_SCHEDULE_POSSIBLE
+void
 SmartScheduleTimer (int sig)
 {
     SmartScheduleTime += SmartScheduleInterval;
+    if (SmartScheduleIdle)
+    {
+	SmartScheduleStopTimer ();
+    }
 }
 #endif
 
@@ -1578,11 +1639,7 @@
 	return FALSE;
     }
     /* Set up the virtual timer */
-    timer.it_interval.tv_sec = 0;
-    timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
-    timer.it_value.tv_sec = 0;
-    timer.it_value.tv_usec = SmartScheduleInterval * 1000;
-    if (setitimer (ITIMER_VIRTUAL, &timer, 0) < 0)
+    if (!SmartScheduleStartTimer ())
     {
 	perror ("scheduling timer");
 	return FALSE;
@@ -1607,7 +1664,9 @@
     char *command;
 {
     int pid, p;
-    void (*csig)();
+#ifdef SIGCHLD
+    void (*csig)(int);
+#endif
     int status;
 
     if (!command)
@@ -1617,7 +1676,9 @@
     csig = signal(SIGCHLD, SIG_DFL);
 #endif
 
+#ifdef DEBUG
     ErrorF("System: `%s'\n", command);
+#endif
 
     switch (pid = fork()) {
     case -1:	/* error */
@@ -1655,7 +1716,6 @@
     struct pid *cur;
     FILE *iop;
     int pdes[2], pid;
-    void (*csig)();
 
     if (command == NULL || type == NULL)
 	return NULL;
@@ -1713,7 +1773,7 @@
     cur->next = pidlist;
     pidlist = cur;
 
-#if 0
+#ifdef DEBUG
     ErrorF("Popen: `%s', fp = %p\n", command, iop);
 #endif
 
@@ -1725,11 +1785,10 @@
     pointer iop;
 {
     struct pid *cur, *last;
-    int omask;
     int pstat;
     int pid;
 
-#if 0
+#ifdef DEBUG
     ErrorF("Pclose: fp = %p\n", iop);
 #endif
 
@@ -1754,3 +1813,190 @@
     return pid == -1 ? -1 : pstat;
 }
 #endif /* !WIN32 && !__EMX__ */
+
+
+/*
+ * CheckUserParameters: check for long command line arguments and long
+ * environment variables.  By default, these checks are only done when
+ * the server's euid != ruid.  In 3.3.x, these checks were done in an
+ * external wrapper utility.
+ */
+
+/* Consider LD* variables insecure? */
+#ifndef REMOVE_ENV_LD
+#define REMOVE_ENV_LD 1
+#endif
+
+/* Remove long environment variables? */
+#ifndef REMOVE_LONG_ENV
+#define REMOVE_LONG_ENV 1
+#endif
+
+/* Check args and env only if running setuid (euid == 0 && euid != uid) ? */
+#ifndef CHECK_EUID
+#define CHECK_EUID 1
+#endif
+
+/*
+ * Maybe the locale can be faked to make isprint(3) report that everything
+ * is printable?  Avoid it by default.
+ */
+#ifndef USE_ISPRINT
+#define USE_ISPRINT 0
+#endif
+
+#define MAX_ARG_LENGTH          128
+#define MAX_ENV_LENGTH          256
+#define MAX_ENV_PATH_LENGTH     2048	/* Limit for *PATH and TERMCAP */
+
+#if USE_ISPRINT
+#include <ctype.h>
+#define checkPrintable(c) isprint(c)
+#else
+#define checkPrintable(c) (((c) & 0x7f) >= 0x20 && ((c) & 0x7f) != 0x7f)
+#endif
+
+enum BadCode {
+    NotBad = 0,
+    UnsafeArg,
+    ArgTooLong,
+    UnprintableArg,
+    EnvTooLong,
+    InternalError
+};
+
+#define ARGMSG \
+    "\nIf the arguments used are valid, and have been rejected incorrectly\n" \
+      "please send details of the arguments and why they are valid to\n" \
+      "XFree86@XFree86.org.  In the meantime, you can start the Xserver as\n" \
+      "the \"super user\" (root).\n"   
+
+#define ENVMSG \
+    "\nIf the environment is valid, and have been rejected incorrectly\n" \
+      "please send details of the environment and why it is valid to\n" \
+      "XFree86@XFree86.org.  In the meantime, you can start the Xserver as\n" \
+      "the \"super user\" (root).\n"
+
+void
+CheckUserParameters(int argc, char **argv, char **envp)
+{
+    enum BadCode bad = NotBad;
+    int i = 0, j;
+    char *a, *e = NULL;
+#if defined(__QNX__) && !defined(__QNXNTO__)
+    char cmd_name[64];
+#endif
+
+#if CHECK_EUID
+    if (geteuid() == 0 && getuid() != geteuid())
+#endif
+    {
+	/* Check each argv[] */
+	for (i = 1; i < argc; i++) {
+	    if (strlen(argv[i]) > MAX_ARG_LENGTH) {
+		bad = ArgTooLong;
+		break;
+	    }
+	    a = argv[i];
+	    while (*a) {
+		if (checkPrintable(*a) == 0) {
+		    bad = UnprintableArg;
+		    break;
+		}
+		a++;
+	    }
+	    if (bad)
+		break;
+	}
+	if (!bad) {
+	    /* Check each envp[] */
+	    for (i = 0; envp[i]; i++) {
+
+		/* Check for bad environment variables and values */
+#if REMOVE_ENV_LD
+		while (envp[i] && (strncmp(envp[i], "LD", 2) == 0)) {
+#ifdef ENVDEBUG
+		    ErrorF("CheckUserParameters: removing %s from the "
+			   "environment\n", strtok(envp[i], "="));
+#endif
+		    for (j = i; envp[j]; j++) {
+			envp[j] = envp[j+1];
+		    }
+		}
+#endif   
+		if (envp[i] && (strlen(envp[i]) > MAX_ENV_LENGTH)) {
+#if REMOVE_LONG_ENV
+#ifdef ENVDEBUG
+		    ErrorF("CheckUserParameters: removing %s from the "
+			   "environment\n", strtok(envp[i], "="));
+#endif
+		    for (j = i; envp[j]; j++) {
+			envp[j] = envp[j+1];
+		    }
+		    i--;
+#else
+		    char *eq;
+		    int len;
+
+		    eq = strchr(envp[i], '=');
+		    if (!eq)
+			continue;
+		    len = eq - envp[i];
+		    e = malloc(len + 1);
+		    if (!e) {
+			bad = InternalError;
+			break;
+		    }
+		    strncpy(e, envp[i], len);
+		    e[len] = 0;
+		    if (len >= 4 &&
+			(strcmp(e + len - 4, "PATH") == 0 ||
+			 strcmp(e, "TERMCAP") == 0)) {
+			if (strlen(envp[i]) > MAX_ENV_PATH_LENGTH) {
+			    bad = EnvTooLong;
+			    break;
+			} else {
+			    free(e);
+			}
+		    } else {
+			bad = EnvTooLong;
+			break;
+		    }
+#endif
+		}
+	    }
+	}
+    }
+    switch (bad) {
+    case NotBad:
+	return;
+    case UnsafeArg:
+	ErrorF("Command line argument number %d is unsafe\n", i);
+	ErrorF(ARGMSG);
+	break;
+    case ArgTooLong:
+	ErrorF("Command line argument number %d is too long\n", i);
+	ErrorF(ARGMSG);
+	break;
+    case UnprintableArg:
+	ErrorF("Command line argument number %d contains unprintable"
+		" characters\n", i);
+	ErrorF(ARGMSG);
+	break;
+    case EnvTooLong:
+	ErrorF("Environment variable `%s' is too long\n", e);
+	ErrorF(ENVMSG);
+	break;
+    case InternalError:
+	ErrorF("Internal Error\n");
+	break;
+    default:
+	ErrorF("Unknown error\n");
+	ErrorF(ARGMSG);
+	ErrorF(ENVMSG);
+	break;
+    }
+    FatalError("X server aborted because of unsafe environment\n");
+}
+
+
Index: xc/programs/Xserver/os/xalloc.c
diff -u xc/programs/Xserver/os/xalloc.c:3.25 xc/programs/Xserver/os/xalloc.c:3.26
--- xc/programs/Xserver/os/xalloc.c:3.25	Mon Feb 21 17:03:25 2000
+++ xc/programs/Xserver/os/xalloc.c	Thu May 18 16:21:42 2000
@@ -25,7 +25,7 @@
 Pascal Haible.
 */
 
-/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.25 2000/02/22 01:03:25 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.26 2000/05/18 23:21:42 dawes Exp $ */
 
 /* Only used if INTERNAL_MALLOC is defined
  * - otherwise xalloc() in utils.c is used
@@ -413,7 +413,7 @@
 		ptr[1] = MAGIC;
 #endif /* XALLOC_DEBUG */
 #ifdef SIZE_TAIL
-		((unsigned long *)((char *)ptr + amount))[-1] = MAGIC2;
+		((unsigned long *)((char *)ptr + amount - TAIL_SIZE))[0] = MAGIC2;
 #endif /* SIZE_TAIL */
 		ptr = (unsigned long *)((char *)ptr + SIZE_HEADER);
 		LOG_ALLOC("Xalloc-L", amount, ptr);
Index: xc/programs/Xserver/record/Imakefile
diff -u xc/programs/Xserver/record/Imakefile:1.8 xc/programs/Xserver/record/Imakefile:1.10
--- xc/programs/Xserver/record/Imakefile:1.8	Sat Aug 14 03:50:20 1999
+++ xc/programs/Xserver/record/Imakefile	Thu Apr  6 08:27:26 2000
@@ -1,29 +1,31 @@
-XCOMM $XFree86: xc/programs/Xserver/record/Imakefile,v 1.8 1999/08/14 10:50:20 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/record/Imakefile,v 1.10 2000/04/06 15:27:26 dawes Exp $
 XCOMM
 XCOMM
 XCOMM $XConsortium: Imakefile /main/3 1996/09/28 17:15:43 rws $
 
-#define IHaveModules
+#if DoLoadableServer
+#define IHaveSubdirs
+#endif
+
 #include <Server.tmpl>
 
 #if DoLoadableServer
-      MSRCS = recordmod.c
-      MOBJS = recordmod.o
+    SUBDIRS = module
 #endif
-
        SRCS = record.c set.c $(MSRCS)
        OBJS = record.o set.o $(MOBJS)
    INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC)
    LINTLIBS = ../dix/llib-ldix.ln
     DEFINES = -DNDEBUG
 
-ModuleObjectRule()
-LibraryModuleTarget(record,$(OBJS))
+NormalLibraryObjectRule()
+NormalLibraryTarget(record,$(OBJS))
 LintLibraryTarget(record,$(SRCS))
 NormalLintTarget($(SRCS))
 
-InstallLibraryModule(record,$(MODULEDIR),extensions)
+#if DoLoadableServer
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
 
 DependTarget()
-
-InstallDriverSDKLibraryModule(record,$(DRIVERSDKMODULEDIR),extensions)
Index: xc/programs/Xserver/record/module/Imakefile
diff -u /dev/null xc/programs/Xserver/record/module/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:43:57 2000
+++ xc/programs/Xserver/record/module/Imakefile	Wed Apr  5 11:14:03 2000
@@ -0,0 +1,33 @@
+XCOMM $XFree86: xc/programs/Xserver/record/module/Imakefile,v 1.1 2000/04/05 18:14:03 dawes Exp $
+XCOMM
+XCOMM
+XCOMM $XConsortium: Imakefile /main/3 1996/09/28 17:15:43 rws $
+
+#define IHaveModules
+#include <Server.tmpl>
+
+#if DoLoadableServer
+      MSRCS = recordmod.c
+      MOBJS = recordmod.o
+#endif
+
+       SRCS = record.c set.c $(MSRCS)
+       OBJS = record.o set.o $(MOBJS)
+   INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC)
+   LINTLIBS = ../../dix/llib-ldix.ln
+    DEFINES = -DNDEBUG
+
+LinkSourceFile(recordmod.c,..)
+LinkSourceFile(record.c,..)
+LinkSourceFile(set.c,..)
+
+ModuleObjectRule()
+LibraryModuleTarget(record,$(OBJS))
+LintLibraryTarget(record,$(SRCS))
+NormalLintTarget($(SRCS))
+
+InstallLibraryModule(record,$(MODULEDIR),extensions)
+
+DependTarget()
+
+InstallDriverSDKLibraryModule(record,$(DRIVERSDKMODULEDIR),extensions)
Index: xc/programs/Xserver/xkb/Imakefile
diff -u xc/programs/Xserver/xkb/Imakefile:3.12 xc/programs/Xserver/xkb/Imakefile:3.13
--- xc/programs/Xserver/xkb/Imakefile:3.12	Sat Apr 17 02:08:51 1999
+++ xc/programs/Xserver/xkb/Imakefile	Tue Jun 13 16:15:52 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/12 1997/07/16 14:51:50 kaleb $
-XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.12 1999/04/17 09:08:51 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.13 2000/06/13 23:15:52 dawes Exp $
 #define SGIHyperOpt
 #include <Server.tmpl>
 
@@ -40,7 +40,8 @@
 	    xkmread.o xkbtext.o xkbfmisc.o xkberrs.o xkbout.o maprules.o \
 	    XKBMisc.o XKBMAlloc.o XKBAlloc.o XKBGAlloc.o \
 	    $(XKBXI_OBJS) $(DDX_OBJS)
-   INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC)
+   INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext \
+	      -I$(SERVERSRC)/mi
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
 DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS)
Index: xc/programs/Xserver/xkb/ddxFakeMtn.c
diff -u xc/programs/Xserver/xkb/ddxFakeMtn.c:1.1.1.2 xc/programs/Xserver/xkb/ddxFakeMtn.c:1.3
--- xc/programs/Xserver/xkb/ddxFakeMtn.c:1.1.1.2	Sat Jan  6 18:36:55 1996
+++ xc/programs/Xserver/xkb/ddxFakeMtn.c	Wed Jun 14 11:20:34 2000
@@ -24,6 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.3 2000/06/14 18:20:34 dawes Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
@@ -36,12 +37,28 @@
 #include "XKBsrv.h"
 #include "XI.h"
 
+#ifdef PANORAMIX
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
+#endif
+
+#include "mipointer.h"
+#include "mipointrst.h"
+
 extern	WindowPtr GetSpriteWindow(
 #if NeedFunctionPrototypes
 	void
 #endif
 );
 
+extern void NewCurrentScreen(
+#if NeedFunctionPrototypes
+    ScreenPtr	/* newScreen */,
+    int		/* x */,
+    int		/* y */
+#endif
+);
+
 void
 #if NeedFunctionPrototypes
 XkbDDXFakePointerMotion(unsigned flags,int x,int y)
@@ -52,25 +69,70 @@
     int 	y;
 #endif
 {
-ScreenPtr	   pScreen;
 int 		   oldX,oldY;
+ScreenPtr	   pScreen, oldScreen;
 
-    pScreen= GetSpriteWindow()->drawable.pScreen;
-    GetSpritePosition(&oldX,&oldY);
-    if (flags&XkbSA_MoveAbsoluteX)
-	 oldX=  x;
-    else oldX+= x;
-    if (flags&XkbSA_MoveAbsoluteY)
-	 oldY=  y;
-    else oldY+= y;
-
-    if (oldX<0)				oldX= 0;
-    else if (oldX>=pScreen->width)	oldX= pScreen->width-1;
-    if (oldY<0)				oldY= 0;
-    else if (oldY>=pScreen->height)	oldY= pScreen->height-1;
+    GetSpritePosition(&oldX, &oldY);
+    pScreen = oldScreen = GetSpriteWindow()->drawable.pScreen;
 
+#ifdef PANORAMIX
+    if (!noPanoramiXExtension) {
+	BoxRec box;
+	int i;
+
+	if(!POINT_IN_REGION(pScreen, &XineramaScreenRegions[pScreen->myNum],
+							    oldX, oldY, &box)) {
+	    FOR_NSCREENS(i) {
+		if(i == pScreen->myNum)
+		    continue;
+		if(POINT_IN_REGION(pScreen, &XineramaScreenRegions[i],
+				   oldX, oldY, &box)) {
+		    pScreen = screenInfo.screens[i];
+		    break;
+		}
+	    }
+	}
+	oldScreen = pScreen;
+
+	if (flags&XkbSA_MoveAbsoluteX)
+	     oldX=  x;
+	else oldX+= x;
+	if (flags&XkbSA_MoveAbsoluteY)
+	     oldY=  y;
+	else oldY+= y;
+
+	if(!POINT_IN_REGION(pScreen, &XineramaScreenRegions[pScreen->myNum],
+							    oldX, oldY, &box)) {
+	    FOR_NSCREENS(i) {
+		if(i == pScreen->myNum)
+		    continue;
+		if(POINT_IN_REGION(pScreen, &XineramaScreenRegions[i],
+				   oldX, oldY, &box)) {
+		    pScreen = screenInfo.screens[i];
+		    break;
+		}
+	    }
+	}
+	oldX -= panoramiXdataPtr[pScreen->myNum].x;
+	oldY -= panoramiXdataPtr[pScreen->myNum].y;
+    }
+    else
+#endif
+    {
+	if (flags&XkbSA_MoveAbsoluteX)
+	     oldX=  x;
+	else oldX+= x;
+	if (flags&XkbSA_MoveAbsoluteY)
+	     oldY=  y;
+	else oldY+= y;
+
+#define GetScreenPrivate(s) ((miPointerScreenPtr) ((s)->devPrivates[miPointerScreenIndex].ptr))	
+	(*(GetScreenPrivate(oldScreen))->screenFuncs->CursorOffScreen)
+	    (&pScreen, &oldX, &oldY);
+    }
+
+    if (pScreen != oldScreen)
+	NewCurrentScreen(pScreen, oldX, oldY);
     if (pScreen->SetCursorPosition)
 	(*pScreen->SetCursorPosition)(pScreen, oldX, oldY, TRUE);
-    return;
 }
-
Index: xc/programs/Xserver/xkb/ddxLoad.c
diff -u xc/programs/Xserver/xkb/ddxLoad.c:3.24 xc/programs/Xserver/xkb/ddxLoad.c:3.25
--- xc/programs/Xserver/xkb/ddxLoad.c:3.24	Sun Jan 31 04:22:21 1999
+++ xc/programs/Xserver/xkb/ddxLoad.c	Thu Jun 15 15:04:13 2000
@@ -24,7 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.24 1999/01/31 12:22:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.25 2000/06/15 22:04:13 dawes Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
@@ -140,10 +140,8 @@
 		+strlen(file)+strlen(xkm_output_dir)
 		+strlen(outFile)+53 > PATH_MAX)
 	{
-#ifdef DEBUG
 	    ErrorF("compiler command for keymap (%s) exceeds max length\n",
 								names->keymap);
-#endif
 	    return False;
 	}
 #ifndef __EMX__
@@ -170,10 +168,8 @@
 		+strlen(file)+strlen(xkm_output_dir)
 		+strlen(outFile)+49 > PATH_MAX)
 	{
-#ifdef DEBUG
             ErrorF("compiler command for keymap (%s) exceeds max length\n",
 							names->keymap);
-#endif
 	    return False;
 	}
 	sprintf(cmd,"xkbcomp -w %d -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s %s%s.xkm",
@@ -237,6 +233,10 @@
 	sprintf(keymap,"server-%s",display);
     }
     else {
+	if (strlen(names->keymap) > PATH_MAX - 1) {
+	    ErrorF("name of keymap (%s) exceeds max length\n", names->keymap);
+	    return False;
+	}
 	strcpy(keymap,names->keymap);
     }
 
@@ -255,10 +255,8 @@
 		+strlen(POST_ERROR_MSG1)+strlen(xkm_output_dir)
 		+strlen(keymap)+48 > PATH_MAX)
 	{
-#ifdef DEBUG
             ErrorF("compiler command for keymap (%s) exceeds max length\n",
 							names->keymap);
-#endif
 	    return False;
 	}
 #ifndef WIN32
@@ -295,10 +293,8 @@
 		+strlen(ERROR_PREFIX)+strlen(POST_ERROR_MSG1)
 		+strlen(xkm_output_dir)+strlen(keymap)+44 > PATH_MAX)
 	{
-#ifdef DEBUG
             ErrorF("compiler command for keymap (%s) exceeds max length\n",
 							names->keymap);
-#endif
 	    return False;
 	}
 #ifndef WIN32
Index: xc/programs/Xserver/xkb/xkb.c
diff -u xc/programs/Xserver/xkb/xkb.c:3.12 xc/programs/Xserver/xkb/xkb.c:3.13
--- xc/programs/Xserver/xkb/xkb.c:3.12	Sun Jun 22 03:16:59 1997
+++ xc/programs/Xserver/xkb/xkb.c	Tue Apr  4 12:25:22 2000
@@ -24,7 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.12 1997/06/22 10:16:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.13 2000/04/04 19:25:22 dawes Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -2397,13 +2397,13 @@
 	    server->behaviors[wire->key].type= wire->type;
 	    server->behaviors[wire->key].data= wire->data;
 	    if ((wire->type==XkbKB_RadioGroup)&&(((int)wire->data)>maxRG))
-		maxRG= wire->data;
+		maxRG= wire->data + 1;
 	}
 	wire++;
     }
 
     if (maxRG>(int)xkbi->nRadioGroups) {
-        int sz = (maxRG+1)*sizeof(XkbRadioGroupRec);
+        int sz = maxRG*sizeof(XkbRadioGroupRec);
         if (xkbi->radioGroups)
              xkbi->radioGroups=(XkbRadioGroupPtr)_XkbRealloc(xkbi->radioGroups,sz);
         else xkbi->radioGroups= (XkbRadioGroupPtr)_XkbCalloc(1, sz);
@@ -2411,7 +2411,7 @@
              if (xkbi->nRadioGroups)
                 bzero(&xkbi->radioGroups[xkbi->nRadioGroups],
                         (maxRG-xkbi->nRadioGroups)*sizeof(XkbRadioGroupRec));
-             xkbi->nRadioGroups= maxRG+1;
+             xkbi->nRadioGroups= maxRG;
         }
         else xkbi->nRadioGroups= 0;
         /* should compute members here */
Index: xc/programs/Xserver/xkb/xkbActions.c
diff -u xc/programs/Xserver/xkb/xkbActions.c:3.2 xc/programs/Xserver/xkb/xkbActions.c:3.3
--- xc/programs/Xserver/xkb/xkbActions.c:3.2	Wed Feb  9 05:30:47 2000
+++ xc/programs/Xserver/xkb/xkbActions.c	Tue Apr  4 12:25:23 2000
@@ -1,5 +1,4 @@
 /* $XConsortium: xkbActions.c /main/3 1996/03/01 14:31:12 kaleb $ */
-/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.2 2000/02/09 13:30:47 dawes Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 
@@ -25,6 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.3 2000/04/04 19:25:23 dawes Exp $ */
 
 #include <stdio.h>
 #include <math.h>
@@ -845,7 +845,7 @@
 	filter->keycode= 0;
 	filter->active= 0;
     }
-    return 0;
+    return 1;
 }
 
 static int
@@ -929,7 +929,7 @@
 unsigned	mods,mask,oldCoreState,oldCorePrevState;
 
     if ((filter->keycode!=0)&&(filter->keycode!=keycode))
-	return 0;
+	return 1;
 
     GetSpritePosition(&x,&y);
     ev.u.keyButtonPointer.time = GetTimeInMillis();
@@ -983,8 +983,6 @@
 	    xkbi->device->key->prev_state= oldCorePrevState;
 	    xkbi->state= old;
 	}
-
-	return 0;
     }
     else if (filter->keycode==keycode) {
 
@@ -1019,9 +1017,8 @@
 
 	filter->keycode= 0;
 	filter->active= 0;
-	return 0;
     }
-    return 0;
+    return 1;
 }
 
 #ifdef XINPUT
Index: xc/programs/Xserver/xkb/xkbEvents.c
diff -u xc/programs/Xserver/xkb/xkbEvents.c:3.4 xc/programs/Xserver/xkb/xkbEvents.c:3.5
--- xc/programs/Xserver/xkb/xkbEvents.c:3.4	Sat Dec 13 18:55:42 1997
+++ xc/programs/Xserver/xkb/xkbEvents.c	Tue Jun 13 16:15:52 2000
@@ -24,7 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.4 1997/12/14 02:55:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.5 2000/06/13 23:15:52 dawes Exp $ */
 
 #include <stdio.h>
 #define NEED_EVENTS 1
@@ -895,7 +895,7 @@
     xEvent	*xE;
 #endif
 {
-int	i;
+int	i, button_mask;
 DeviceIntPtr pXDev = (DeviceIntPtr)LookupKeyboardDevice();
 XkbSrvInfoPtr	xkbi;
 
@@ -946,6 +946,19 @@
 		state= xkbi->state.compat_lookup_mods;
 	    xE[0].u.keyButtonPointer.state= state;
 	}
+	button_mask = 1 << xE[0].u.u.detail;
+	if (xE[0].u.u.type == ButtonPress &&
+	    ((xE[0].u.keyButtonPointer.state >> 7) & button_mask) == button_mask &&
+	    (xkbi->lockedPtrButtons & button_mask) == button_mask) {
+#ifdef DEBUG
+	    /* If the MouseKeys is pressed, and the "real" mouse is also pressed
+	     * when the mouse is released, the server does not behave properly.
+	     * Faking a release of the button here solves the problem.
+	     */
+	    ErrorF("Faking release of button %d\n", xE[0].u.u.detail);
+#endif
+	    XkbDDXFakePointerButton(ButtonRelease, xE[0].u.u.detail);
+        }
     }
     else {
 	register CARD8 	type;
@@ -979,6 +992,15 @@
 	    else if ((type==EnterNotify)||(type==LeaveNotify)) {
 		xE->u.enterLeave.state&= 0x1F00;
 		xE->u.enterLeave.state|= xkbi->state.compat_grab_mods;
+	    }
+	    button_mask = 1 << xE[i].u.u.detail;
+	    if (type == ButtonPress &&
+		((xE[i].u.keyButtonPointer.state >> 7) & button_mask) == button_mask &&
+		(xkbi->lockedPtrButtons & button_mask) == button_mask) {
+#ifdef DEBUG
+		ErrorF("Faking release of button %d\n", xE[i].u.u.detail);
+#endif
+		XkbDDXFakePointerButton(ButtonRelease, xE[i].u.u.detail);
 	    }
 	}
     }
Index: xc/programs/Xserver/xkb/xkbInit.c
diff -u xc/programs/Xserver/xkb/xkbInit.c:3.15 xc/programs/Xserver/xkb/xkbInit.c:3.17
--- xc/programs/Xserver/xkb/xkbInit.c:3.15	Sun Oct  4 02:39:55 1998
+++ xc/programs/Xserver/xkb/xkbInit.c	Thu Jun 15 13:50:03 2000
@@ -24,7 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.15 1998/10/04 09:39:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.17 2000/06/15 20:50:03 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -684,7 +684,7 @@
 KeySymsRec		tmpSyms,*pSyms;
 CARD8			tmpMods[XkbMaxLegalKeyCode+1],*pMods;
 char			name[PATH_MAX],*rules;
-Bool			ok;
+Bool			ok=False;
 XPointer		config;
 XkbComponentNamesRec	cfgNames;
 XkbRF_VarDefsRec	defs;
@@ -702,12 +702,18 @@
 	XkbComponentNamesRec	rNames;
 	bzero(&rNames,sizeof(XkbComponentNamesRec));
 	if (XkbDDXNamesFromRules(dev,rules,&defs,&rNames)) {
-	    if (rNames.keymap)		names->keymap= rNames.keymap;
-	    if (rNames.keycodes)	names->keycodes= rNames.keycodes;
-	    if (rNames.types)		names->types= rNames.types;
-	    if (rNames.compat)		names->compat= rNames.compat;
-	    if (rNames.symbols)		names->symbols= rNames.symbols;
-	    if (rNames.geometry)	names->geometry= rNames.geometry;
+	    if (rNames.keymap   && !names->keymap)
+                names->keymap =     rNames.keymap;
+	    if (rNames.keycodes && !names->keycodes)
+                names->keycodes =   rNames.keycodes;
+	    if (rNames.types    && !names->types)
+		names->types =      rNames.types;
+	    if (rNames.compat   && !names->compat)
+		names->compat =     rNames.compat;
+	    if (rNames.symbols  && !names->symbols)
+		names->symbols =    rNames.symbols;
+	    if (rNames.geometry && !names->geometry)
+                names->geometry =   rNames.geometry;
 	    XkbSetRulesUsed(&defs);
 	}
     }
@@ -718,9 +724,18 @@
     if (cfgNames.symbols)	names->symbols= cfgNames.symbols;
     if (cfgNames.geometry)	names->geometry= cfgNames.geometry;
 
-    if ((XkbDDXLoadKeymapByNames(dev,names,XkmAllIndicesMask,0,
-						&finfo,name,PATH_MAX))&&
-						(finfo.xkb!=NULL)) {
+    if (names->keymap) {
+        XkbComponentNamesRec	tmpNames;
+	bzero(&tmpNames,sizeof(XkbComponentNamesRec));
+	tmpNames.keymap = names->keymap;
+        ok = (Bool) XkbDDXLoadKeymapByNames(dev,&tmpNames,XkmAllIndicesMask,0,
+					    &finfo,name,PATH_MAX);
+    }
+    if (!(ok && (finfo.xkb!=NULL)))
+        ok = (Bool) XkbDDXLoadKeymapByNames(dev,names,XkmAllIndicesMask,0,
+					    &finfo,name,PATH_MAX);
+
+    if (ok && (finfo.xkb!=NULL)) {
 	XkbDescPtr	xkb;
 	int		minKC,maxKC;
 
@@ -911,8 +926,13 @@
     }
     else if (strncmp(argv[i], "-xkbmap", 7) == 0) {
 	if(++i < argc) {
-	    XkbInitialMap= argv[i];
-	    return 2;
+	    if (strlen(argv[i]) < PATH_MAX) {
+		XkbInitialMap= argv[i];
+		return 2;
+	    } else {
+		ErrorF("-xkbmap pathname too long\n");
+		return -1;
+	    }
 	}
 	else {
 	    return -1;
@@ -920,8 +940,13 @@
     }
     else if (strncmp(argv[i], "-xkbdb", 7) == 0) {
 	if(++i < argc) {
-	    XkbDB= argv[i];
-	    return 2;
+	    if (strlen(argv[i]) < PATH_MAX) {
+		XkbDB= argv[i];
+		return 2;
+	    } else {
+		ErrorF("-xkbdb pathname too long\n");
+		return -1;
+	    }
 	}
 	else {
 	    return -1;
Index: xc/programs/Xserver/xkb/xkbPrKeyEv.c
diff -u xc/programs/Xserver/xkb/xkbPrKeyEv.c:3.6 xc/programs/Xserver/xkb/xkbPrKeyEv.c:3.7
--- xc/programs/Xserver/xkb/xkbPrKeyEv.c:3.6	Sat Jul 12 05:09:42 1997
+++ xc/programs/Xserver/xkb/xkbPrKeyEv.c	Tue Apr  4 12:25:24 2000
@@ -24,7 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.6 1997/07/12 12:09:42 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.7 2000/04/04 19:25:24 dawes Exp $ */
 
 #include <stdio.h>
 #include <math.h>
@@ -54,6 +54,7 @@
 XkbSrvInfoPtr	xkbi;
 int		key;
 XkbBehavior	behavior;
+unsigned        ndx;
 
     xkbi= keyc->xkbInfo;
     key= xE->u.u.detail;
@@ -107,34 +108,33 @@
 		}
 		break;
 	    case XkbKB_RadioGroup:
-		if ( xE->u.u.type == KeyRelease )
-		    return;
-		else {
-		    unsigned	ndx= (behavior.data&(~XkbKB_RGAllowNone));
-		    if ( ndx<xkbi->nRadioGroups ) {
-			XkbRadioGroupPtr	rg;
-
-			rg = &xkbi->radioGroups[ndx];
-			if ( rg->currentDown == xE->u.u.detail ) {
-			    if (behavior.data&XkbKB_RGAllowNone) {
-				xE->u.u.type = KeyRelease;
-				XkbHandleActions(keybd,keybd,xE,count);
-				rg->currentDown= 0;
-			    }
-			    return;
-			}
-			if ( rg->currentDown!=0 ) {
-			    int key = xE->u.u.detail;
-			    xE->u.u.type= KeyRelease;
-			    xE->u.u.detail= rg->currentDown;
+		ndx= (behavior.data&(~XkbKB_RGAllowNone));
+		if ( ndx<xkbi->nRadioGroups ) {
+		    XkbRadioGroupPtr	rg;
+
+		    if ( xE->u.u.type == KeyRelease )
+		        return;
+
+		    rg = &xkbi->radioGroups[ndx];
+		    if ( rg->currentDown == xE->u.u.detail ) {
+		        if (behavior.data&XkbKB_RGAllowNone) {
+		            xE->u.u.type = KeyRelease;
 			    XkbHandleActions(keybd,keybd,xE,count);
-			    xE->u.u.type= KeyPress;
-			    xE->u.u.detail= key;
-			}
-			rg->currentDown= key;
+			    rg->currentDown= 0;
+		        }
+		        return;
+		    }
+		    if ( rg->currentDown!=0 ) {
+			int key = xE->u.u.detail;
+			xE->u.u.type= KeyRelease;
+			xE->u.u.detail= rg->currentDown;
+		        XkbHandleActions(keybd,keybd,xE,count);
+		        xE->u.u.type= KeyPress;
+		        xE->u.u.detail= key;
 		    }
-		    else ErrorF("InternalError! Illegal radio group %d\n",ndx);
+		    rg->currentDown= key;
 		}
+		else ErrorF("InternalError! Illegal radio group %d\n",ndx);
 		break;
 	    case XkbKB_Overlay1: case XkbKB_Overlay2:
 		{
Index: xc/programs/fstobdf/chars.c
diff -u xc/programs/fstobdf/chars.c:3.4 xc/programs/fstobdf/chars.c:3.5
--- xc/programs/fstobdf/chars.c:3.4	Fri Feb 19 13:27:08 1999
+++ xc/programs/fstobdf/chars.c	Thu Jun 15 13:50:03 2000
@@ -39,8 +39,10 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/fstobdf/chars.c,v 3.4 1999/02/19 21:27:08 hohndel Exp $ */
+/* $XFree86: xc/programs/fstobdf/chars.c,v 3.5 2000/06/15 20:50:03 dawes Exp $ */
 
+/* Morten Storgaard Nielsen: chars.c,v 3.2-1 2000/01/30 14:11:19 kat Exp */
+
 #include	<stdio.h>
 #include	<X11/Xlib.h>
 #include	"fstobdf.h"
@@ -159,19 +161,22 @@
     unsigned char *glyph;
     unsigned char *glyphs;
     unsigned int nChars;
-    int         firstChar;
-    int         lastChar;
-    int         ch;
+    int         firstCharLow;
+    int         firstCharHigh;
+    int         lastCharLow;
+    int         lastCharHigh;
+    int         chLow;
+    int         chHigh;
     FSBitmapFormat format;
 
     nChars = 0;
 
     format = BYTE_ORDER | BIT_ORDER | SCANLINE_UNIT |
 	SCANLINE_PAD | EXTENTS;
-    firstChar = (fontHeader->char_range.min_char.high << 8)
-	        + fontHeader->char_range.min_char.low;
-    lastChar = (fontHeader->char_range.max_char.high << 8)
-	       + fontHeader->char_range.max_char.low;
+    firstCharLow = fontHeader->char_range.min_char.low; 
+    firstCharHigh = fontHeader->char_range.min_char.high; 
+    lastCharLow = fontHeader->char_range.max_char.low;
+    lastCharHigh = fontHeader->char_range.max_char.high;
 
     (void) FSQueryXExtents16(fontServer, fontID, True, (FSChar2b *) 0, 0,
 			     &extents);
@@ -180,10 +185,12 @@
 
     charInfo = extents;
     /* calculate the actual number of chars */
-    for (ch = 0; ch <= (lastChar - firstChar); ch++) {
+    for (chHigh = 0; chHigh <= (lastCharHigh-firstCharHigh); chHigh++) {
+      for (chLow = 0; chLow <= (lastCharLow-firstCharLow); chLow++) {
 	if ((charInfo->width != 0) || (charInfo->left != charInfo->right))
 	    nChars++;
 	charInfo++;
+      }
     }
 
     fprintf(outFile, "CHARS %u\n", nChars);
@@ -192,19 +199,19 @@
      * actually emit the characters
      */
     charInfo = extents;
-    encoding = firstChar;
     glyph = glyphs;
-    for (ch = 0; ch <= (lastChar - firstChar); ch++) {
+    for (chHigh = firstCharHigh; chHigh <= lastCharHigh; chHigh++) {
+      for (chLow = firstCharLow; chLow <= lastCharLow; chLow++) {
 	int         bpr;
 
 	bpr = GLWIDTHBYTESPADDED((charInfo->right - charInfo->left),
 				 SCANLINE_PAD_BYTES);
+  	  encoding=(chHigh << 8)+chLow;
 	if ((charInfo->width != 0) || (charInfo->right != charInfo->left))
 	    EmitBitmap(outFile, fontHeader, charInfo, encoding, bpr, glyph);
 	glyph += (charInfo->descent + charInfo->ascent) * bpr;
-
 	charInfo++;
-	encoding++;
+      }
     }
     FSFree((char *) extents);
     FSFree((char *) glyphs);
Index: xc/programs/lbxproxy/di/cmaputil.c
diff -u xc/programs/lbxproxy/di/cmaputil.c:1.5 xc/programs/lbxproxy/di/cmaputil.c:1.6
--- xc/programs/lbxproxy/di/cmaputil.c:1.5	Sun Oct  4 02:40:11 1998
+++ xc/programs/lbxproxy/di/cmaputil.c	Sun May 14 13:27:58 2000
@@ -44,7 +44,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/di/cmaputil.c,v 1.5 1998/10/04 09:40:11 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/di/cmaputil.c,v 1.6 2000/05/14 20:27:58 alanh Exp $ */
 
 #include	<stdio.h>
 #include	"misc.h"
@@ -430,8 +430,6 @@
     XID		id;
 {
     ColormapPtr pmap = (ColormapPtr)value;
-    xfree(pmap->blue);
-    xfree(pmap->green);
     xfree(pmap);
     return Success;
 }
Index: xc/programs/lbxproxy/di/options.c
diff -u xc/programs/lbxproxy/di/options.c:1.4 xc/programs/lbxproxy/di/options.c:1.5
--- xc/programs/lbxproxy/di/options.c:1.4	Sun Dec 20 03:58:06 1998
+++ xc/programs/lbxproxy/di/options.c	Wed Jun  7 15:03:15 2000
@@ -42,7 +42,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.4 1998/12/20 11:58:06 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.5 2000/06/07 22:03:15 tsi Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -480,7 +480,8 @@
     unsigned char *preply;
     int		  replylen;
 {
-    server->lbxNegOpt.streamOpts.streamCompInit = ZlibInit;
+    server->lbxNegOpt.streamOpts.streamCompInit =
+	(LbxStreamCompHandle (*)(int, pointer))ZlibInit;
     server->lbxNegOpt.streamOpts.streamCompArg = (pointer)(long) zlevel;
     server->lbxNegOpt.streamOpts.streamCompStuffInput = ZlibStuffInput;
     server->lbxNegOpt.streamOpts.streamCompInputAvail = ZlibInputAvail;
@@ -489,7 +490,8 @@
     server->lbxNegOpt.streamOpts.streamCompWriteV = ZlibWriteV;
     server->lbxNegOpt.streamOpts.streamCompOn = ZlibCompressOn;
     server->lbxNegOpt.streamOpts.streamCompOff = ZlibCompressOff;
-    server->lbxNegOpt.streamOpts.streamCompFreeHandle = ZlibFree;
+    server->lbxNegOpt.streamOpts.streamCompFreeHandle =
+	(void (*)(LbxStreamCompHandle))ZlibFree;
 
     return 0;
 }
Index: xc/programs/lbxproxy/di/wire.c
diff -u xc/programs/lbxproxy/di/wire.c:1.8 xc/programs/lbxproxy/di/wire.c:1.9
--- xc/programs/lbxproxy/di/wire.c:1.8	Sun Dec 26 16:40:02 1999
+++ xc/programs/lbxproxy/di/wire.c	Wed Jun  7 15:03:15 2000
@@ -41,7 +41,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.8 1999/12/27 00:40:02 robin Exp $ */
+/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.9 2000/06/07 22:03:15 tsi Exp $ */
 
 #include "lbx.h"
 #include <stdio.h>
@@ -135,16 +135,16 @@
 	delta_out_attempts++;
 #endif
 
-	if ((diffs = LBXDeltaMinDiffs(&server->outdeltas, buf, len,
-			     min(MAXBYTESDIFF, (len - sz_xLbxDeltaReq) >> 1),
+	if ((diffs = LBXDeltaMinDiffs(&server->outdeltas, (unsigned char *)buf,
+			len, min(MAXBYTESDIFF, (len - sz_xLbxDeltaReq) >> 1),
 				      &cindex)) >= 0) {
 
 #ifdef LBX_STATS
 	    delta_out_hits++;
 #endif
 
-	    LBXEncodeDelta(&server->outdeltas, buf, diffs, cindex,
-			   &server->tempdeltabuf[sz_xLbxDeltaReq]);
+	    LBXEncodeDelta(&server->outdeltas, (unsigned char *)buf, diffs,
+			   cindex, &server->tempdeltabuf[sz_xLbxDeltaReq]);
 	    p->reqType = server->lbxReq;
 	    p->lbxReqType = X_LbxDelta;
 	    p->diffs = diffs;
@@ -155,7 +155,7 @@
 	    WriteToServer(client, newlen, (char *) p, TRUE, checkLargeRequest);
 	    written = TRUE;
 	}
-	LBXAddDeltaOut(&server->outdeltas, buf, len);
+	LBXAddDeltaOut(&server->outdeltas, (unsigned char *)buf, len);
     }
     if (!written) {
 #ifdef BIGREQS
@@ -860,8 +860,10 @@
 #endif
 
 	/* Note that LBXDecodeDelta decodes and adds current msg to the cache */
-	len = LBXDecodeDelta(&server->indeltas, ((char *) rep) + sz_xLbxDeltaReq,
-			     delta->diffs, delta->cindex, &rep);
+	len = LBXDecodeDelta(&server->indeltas,
+			     (xLbxDiffItem *)((char *) rep + sz_xLbxDeltaReq),
+			     delta->diffs, delta->cindex,
+			     (unsigned char **)&rep);
 
 	/* Make local copy in case someone writes to the request buffer */
 	memcpy(server->tempdeltabuf, (char *) rep, len);
@@ -877,7 +879,7 @@
 	delta_in_attempts++;
 #endif
 
-	LBXAddDeltaIn(&server->indeltas, (char *) rep, len);
+	LBXAddDeltaIn(&server->indeltas, (unsigned char *) rep, len);
     }
     if (rep->generic.type == server->lbxEvent &&
 	rep->generic.data1 != LbxMotionDeltaEvent) {
Index: xc/programs/lbxproxy/include/pm.h
diff -u xc/programs/lbxproxy/include/pm.h:1.1 xc/programs/lbxproxy/include/pm.h:1.2
--- xc/programs/lbxproxy/include/pm.h:1.1	Sun Oct 26 05:25:22 1997
+++ xc/programs/lbxproxy/include/pm.h	Thu Jun 22 17:44:36 2000
@@ -1,33 +1,25 @@
-/* $TOG: pm.h /main/1 1997/09/12 14:28:33 barstow $ */
+/* $TOG: pm.h /main/2 1998/02/10 18:17:58 kaleb $ */
 
 /*
-Copyright (c) 1997  The Open Group
+Copyright 1996, 1998  The Open Group
 
-Copyright (c) 1996  X Consortium
+All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of the X Consortium shall
+Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
-from the X Consortium.
+from The Open Group.
 */
 
 #include <X11/ICE/ICElib.h>
Index: xc/programs/lbxproxy/include/pmP.h
diff -u xc/programs/lbxproxy/include/pmP.h:1.1 xc/programs/lbxproxy/include/pmP.h:1.2
--- xc/programs/lbxproxy/include/pmP.h:1.1	Sun Oct 26 05:25:23 1997
+++ xc/programs/lbxproxy/include/pmP.h	Thu Jun 22 17:44:36 2000
@@ -1,15 +1,9 @@
-/* $TOG: pmP.h /main/2 1997/09/12 14:31:06 barstow $ */
+/* $TOG: pmP.h /main/3 1998/02/10 18:17:52 kaleb $ */
 
 /*
-Copyright (c) 1996  X Consortium
+Copyright 1996, 1998  The Open Group
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+All Rights Reserved.
 
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
@@ -17,15 +11,15 @@
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of the X Consortium shall
+Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
-from the X Consortium.
+from The Open Group.
 */
 
 /* Useful ICE message parsing macros */
Index: xc/programs/lbxproxy/os/connection.c
diff -u xc/programs/lbxproxy/os/connection.c:1.10 xc/programs/lbxproxy/os/connection.c:1.12
--- xc/programs/lbxproxy/os/connection.c:1.10	Sun Dec 26 16:40:06 1999
+++ xc/programs/lbxproxy/os/connection.c	Thu May 18 16:46:26 2000
@@ -56,7 +56,7 @@
  *      socket ids aren't small nums (0 - 2^8)
  *
  *****************************************************************/
-/* $XFree86: xc/programs/lbxproxy/os/connection.c,v 1.10 1999/12/27 00:40:06 robin Exp $ */
+/* $XFree86: xc/programs/lbxproxy/os/connection.c,v 1.12 2000/05/18 23:46:26 dawes Exp $ */
 
 #include "misc.h"
 #include <X11/Xtrans.h>
@@ -237,8 +237,8 @@
     }
     MaxClients = lastfdesc;
 
-    ConnectionTranslation = (int *)xalloc(lastfdesc + 1);
-    ConnectionOutputTranslation = (int *)xalloc(lastfdesc + 1);
+    ConnectionTranslation = (int *)xalloc((lastfdesc + 1) * sizeof(int));
+    ConnectionOutputTranslation = (int *)xalloc((lastfdesc + 1) * sizeof(int));
     if (ConnectionTranslation == NULL || ConnectionOutputTranslation == NULL)
 	FatalError("failed to allocate ConnectionTranslation\n");
 }
@@ -580,6 +580,7 @@
     fd_set tmask;
     int i;
 
+    XFD_ANDSET(&tmask, (fd_set*)closure, &WellKnownConnections);
     XFD_COPYSET(&tmask, &readyconnections);
     if (!XFD_ANYSET(&readyconnections))
 	return TRUE;
Index: xc/programs/makepsres/makepsres.c
diff -u xc/programs/makepsres/makepsres.c:1.3 xc/programs/makepsres/makepsres.c:1.4
--- xc/programs/makepsres/makepsres.c:1.3	Fri Feb 18 04:20:15 2000
+++ xc/programs/makepsres/makepsres.c	Wed Apr  5 11:14:03 2000
@@ -35,7 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
-/* $XFree86: xc/programs/makepsres/makepsres.c,v 1.3 2000/02/18 12:20:15 tsi Exp $ */
+/* $XFree86: xc/programs/makepsres/makepsres.c,v 1.4 2000/04/05 18:14:03 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -2189,6 +2189,7 @@
 
     (void) unlink (backupname); /* Ignore error */
 
+#ifndef __EMX__
     if (link (filename, backupname) != 0) {
 	if (errno != ENOENT) {
 	    fprintf(stderr, "%s:  Could not back up output file %s\n",
@@ -2198,6 +2199,15 @@
 	    exit(1);
 	}
     } else (void) unlink(filename);
+#else
+    if (rename(filename,backupname) != 0) {
+	fprintf(stderr, "%s:  Could not back up output file %s\n",
+		program, filename);
+	fprintf(stderr, "            and will not write over it (%s)\n",
+		strerror(errno));
+	exit(1);
+    }
+#endif
     free(backupname);
 }
 
Index: xc/programs/mkcfm/mkcfm.c
diff -u xc/programs/mkcfm/mkcfm.c:1.8 xc/programs/mkcfm/mkcfm.c:1.9
--- xc/programs/mkcfm/mkcfm.c:1.8	Sat Aug 21 06:48:46 1999
+++ xc/programs/mkcfm/mkcfm.c	Thu May 11 11:14:39 2000
@@ -16,13 +16,17 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/programs/mkcfm/mkcfm.c,v 1.8 1999/08/21 13:48:46 dawes Exp $ */
+/* $XFree86: xc/programs/mkcfm/mkcfm.c,v 1.9 2000/05/11 18:14:39 tsi Exp $ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <sys/types.h>
 #include <dirent.h>
+
+#include "os.h"
+
 #include "fntfilst.h"
 #include "FSproto.h"
 #include "FS.h"
@@ -40,8 +44,6 @@
 #include "blues.h"
 #include "t1intf.h"
 #include "t1unicode.h"
-
-#include "os.h"
  
 static void CIDFillVals(FontScalablePtr);
 static Bool DoDirectory(char *dirName);
Index: xc/programs/proxymngr/Imakefile
diff -u xc/programs/proxymngr/Imakefile:1.6 xc/programs/proxymngr/Imakefile:1.7
--- xc/programs/proxymngr/Imakefile:1.6	Mon Jan 31 11:33:41 2000
+++ xc/programs/proxymngr/Imakefile	Thu Mar 23 09:42:40 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/12 1997/08/05 09:00:09 kaleb $
-XCOMM $XFree86: xc/programs/proxymngr/Imakefile,v 1.6 2000/01/31 19:33:41 dawes Exp $
+XCOMM $XFree86: xc/programs/proxymngr/Imakefile,v 1.7 2000/03/23 17:42:40 tsi Exp $
 
          DEFINES = StrcasecmpDefines
 
@@ -33,4 +33,3 @@
 SpecialCObjectRule(main,$(_NOOP_),'-DCONFIG_FILE="'$(PROXYMANAGERDIR)'/pmconfig"')
 
 InstallNonExecFile(pmconfig,$(PROXYMANAGERDIR))
-InstallManPage(proxymngr,$(MANDIR))
Index: xc/programs/proxymngr/main.c
diff -u xc/programs/proxymngr/main.c:1.3 xc/programs/proxymngr/main.c:1.4
--- xc/programs/proxymngr/main.c:1.3	Fri Feb 19 13:27:15 1999
+++ xc/programs/proxymngr/main.c	Thu May 11 11:14:40 2000
@@ -21,7 +21,7 @@
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/proxymngr/main.c,v 1.3 1999/02/19 21:27:15 hohndel Exp $ */
+/* $XFree86: xc/programs/proxymngr/main.c,v 1.4 2000/05/11 18:14:40 tsi Exp $ */
 
 #include <stdlib.h>
 #include "pmint.h"
@@ -495,7 +495,7 @@
 
 		retVal = getpeername(IceConnectionNumber(iceConn),
 				     (struct sockaddr *) &serverSock,
-				     &addrLen);
+				     (void *) &addrLen);
 		if (!retVal) 
 		{
 		    struct hostent *hostent;
Index: xc/programs/rgb/Imakefile
diff -u xc/programs/rgb/Imakefile:3.8 xc/programs/rgb/Imakefile:3.9
--- xc/programs/rgb/Imakefile:3.8	Sun Dec 20 03:58:10 1998
+++ xc/programs/rgb/Imakefile	Fri Jun 30 10:15:19 2000
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/34 1996/11/13 14:45:44 lehors $
-XCOMM $XFree86: xc/programs/rgb/Imakefile,v 3.8 1998/12/20 11:58:10 dawes Exp $
+XCOMM $XFree86: xc/programs/rgb/Imakefile,v 3.9 2000/06/30 17:15:19 dawes Exp $
 
 #if UseRgbTxt
    RGB_DEFINES = -DUSE_RGB_TXT
@@ -21,7 +21,7 @@
          OBJS = $(OBJS1) $(OBJS2)
      PROGRAMS = $(RGB_PROG) ProgramTargetName(showrgb)
 #if !UseRgbTxt
-#if defined(BSD386Architecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
+#if defined(BSDOSArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
     DATAFILES = rgb.db
       DATADEP = rgb.db
 #else
Index: xc/programs/setxkbmap/setxkbmap.man
diff -u xc/programs/setxkbmap/setxkbmap.man:3.1 xc/programs/setxkbmap/setxkbmap.man:3.2
--- xc/programs/setxkbmap/setxkbmap.man:3.1	Fri Aug 16 05:45:53 1996
+++ xc/programs/setxkbmap/setxkbmap.man	Tue Mar 21 13:08:10 2000
@@ -1,6 +1,6 @@
 .TH SETXKBMAP 1 "" "Silicon Graphics"
 .SH NAME
-.B setxkbmap
+setxkbmap
 \- set the keyboard using the X Keyboard Extension
 .SH SYNOPSIS
 .B setxkbmap [
Index: xc/programs/x11perf/x11perf.c
diff -u xc/programs/x11perf/x11perf.c:3.1 xc/programs/x11perf/x11perf.c:3.2
--- xc/programs/x11perf/x11perf.c:3.1	Sun Feb 28 03:20:01 1999
+++ xc/programs/x11perf/x11perf.c	Mon Jun 19 08:01:03 2000
@@ -1,5 +1,5 @@
 /* $XConsortium: x11perf.c,v 2.54 94/03/30 19:40:27 gildea Exp $ */
-/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.1 1999/02/28 11:20:01 dawes Exp $ */
+/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.2 2000/06/19 15:01:03 tsi Exp $ */
 /****************************************************************************
 Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -390,7 +390,7 @@
     if (d == NULL) {
 	fprintf (stderr, "%s:  unable to open display '%s'\n",
 		 program_name, XDisplayName (display_name));
-	/* doesn't return */
+	exit(1);
     }
 
     return(d);
Index: xc/programs/xcalc/math.c
diff -u xc/programs/xcalc/math.c:1.1 xc/programs/xcalc/math.c:1.2
--- xc/programs/xcalc/math.c:1.1	Sat Feb 12 19:26:19 2000
+++ xc/programs/xcalc/math.c	Thu Jun 15 13:50:03 2000
@@ -1,5 +1,5 @@
 /* $XConsortium: math.c,v 1.17 91/07/25 17:51:34 rws Exp $ 
- * $XFree86: xc/programs/xcalc/math.c,v 1.1 2000/02/13 03:26:19 dawes Exp $ 
+ * $XFree86: xc/programs/xcalc/math.c,v 1.2 2000/06/15 20:50:03 dawes Exp $ 
  *
  *  math.c  -  mathematics functions for a hand calculator under X
  *
@@ -26,6 +26,7 @@
 #include <setjmp.h>
 #include "xcalc.h"
 #include <errno.h>
+#include <X11/Xlocale.h>
 
 #ifdef _CRAY		/* kludge around Cray STDC compiler */
 double (*log_p)() = log;
@@ -402,7 +403,11 @@
       strcpy(dispstr,"0");
   }
   if (!Dpoint) {
-    strcat(dispstr,".");
+#ifndef X_LOCALE
+    strcat(dispstr, localeconv()->decimal_point);
+#else
+    strcat(dispstr, ".");
+#endif
     DrawDisplay();
     Dpoint++;
   }
Index: xc/programs/xcalc/xcalc.c
diff -u xc/programs/xcalc/xcalc.c:1.1 xc/programs/xcalc/xcalc.c:1.2
--- xc/programs/xcalc/xcalc.c:1.1	Sat Feb 12 19:26:19 2000
+++ xc/programs/xcalc/xcalc.c	Thu May 11 11:14:41 2000
@@ -28,6 +28,7 @@
 from the X Consortium.
 
 */
+/* $XFree86: xc/programs/xcalc/xcalc.c,v 1.2 2000/05/11 18:14:41 tsi Exp $ */
 
 /*
  * xcalc.c  -  a hand calculator for the X Window system
@@ -110,7 +111,8 @@
 #undef offset
 
 
-void main(argc, argv)
+int
+main(argc, argv)
     int		argc;
     char	**argv;
 {
@@ -166,6 +168,8 @@
 #endif
     ResetCalc();
     XtAppMainLoop(xtcontext);
+
+    return 0;
 }
 
 void create_calculator(shell)
Index: xc/programs/xconsole/XConsole.ad
diff -u xc/programs/xconsole/XConsole.ad:1.1.1.1 xc/programs/xconsole/XConsole.ad:1.2
--- xc/programs/xconsole/XConsole.ad:1.1.1.1	Wed Apr 27 00:21:18 1994
+++ xc/programs/xconsole/XConsole.ad	Fri Mar 31 14:55:55 2000
@@ -1,4 +1,5 @@
 ! $XConsortium: XConsole.ad,v 1.3 94/02/09 19:44:01 gildea Exp $
+! $XFree86: xc/programs/xconsole/XConsole.ad,v 1.2 2000/03/31 22:55:55 dawes Exp $
 *allowShellResize:		true
 XConsole.translations:		#override\
 	<MapNotify>:		Deiconified()	\n\
@@ -14,8 +15,8 @@
 *text.baseTranslations:		#override\
 	Ctrl<KeyPress>C:	Clear()	\n\
 	<KeyPress>Clear:	Clear()
-*text.scrollVertical:		whenNeeded
-*text.scrollHorizontal:		whenNeeded
+*text.scrollVertical:		Always
+*text.scrollHorizontal:		Never
 *text.width:			400
 *text.height:			70
 *text.allowResize:		true
Index: xc/programs/xditview/xditview.c
diff -u xc/programs/xditview/xditview.c:1.1 xc/programs/xditview/xditview.c:1.2
--- xc/programs/xditview/xditview.c:1.1	Wed Feb 23 12:35:32 2000
+++ xc/programs/xditview/xditview.c	Thu May 11 11:14:41 2000
@@ -28,7 +28,7 @@
 from the X Consortium.
 
 */
-
+/* $XFree86: xc/programs/xditview/xditview.c,v 1.2 2000/05/11 18:14:41 tsi Exp $ */
 /*
  * xditview -- 
  *
@@ -205,7 +205,8 @@
     XtSetValues (panner, args, n);
 }
 
-void main(argc, argv)
+int
+main(argc, argv)
     int argc;
     char **argv;
 {
@@ -302,6 +303,8 @@
     (void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel),
                             &wm_delete_window, 1);
     XtAppMainLoop(xtcontext);
+
+    return 0;
 }
 
 static void
Index: xc/programs/xdm/Imakefile
diff -u xc/programs/xdm/Imakefile:3.32 xc/programs/xdm/Imakefile:3.36
--- xc/programs/xdm/Imakefile:3.32	Mon Jan 31 11:33:42 2000
+++ xc/programs/xdm/Imakefile	Fri Jun 16 17:27:34 2000
@@ -2,7 +2,7 @@
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.32 2000/01/31 19:33:42 dawes Exp $
+XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.36 2000/06/17 00:27:34 dawes Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 
@@ -10,23 +10,8 @@
 #define BuildChooser !SystemV
 #endif
 
-/*
- * We define ShareLibXdmGreet true if:
- *	SystemV4 is true
- *	AlphaArchitecture is set and NetBSDArchitecture is not
- *	AlphaArchitecture and NetBSDArchitecture are set, and
- *	    HasSharedLibraries is true.
- *
- * We'd like ShareLibXdmGreet true of SystemV4 or AlphaArchitecture,
- * but not all NetBSD/Alpha systems have shared libraries, and
- * it can't be shared on those which do not.
- */
 #ifndef SharedLibXdmGreet
-#define SharedLibXdmGreet						\
-    ((defined(AlphaArchitecture) &&					\
-      (!defined(NetBSDArchitecture) ||					\
-       (defined(NetBSDArchitecture) && HasSharedLibraries))) ||		\
-     SystemV4)
+#define SharedLibXdmGreet (defined(AlphaArchitecture) || SystemV4)
 #endif
 
 #ifndef BuildBoth
@@ -50,6 +35,12 @@
 RPCLIB = -lrpcsvc
 #endif
 
+#if HasKrbIV
+KRBIV_DEFINES = KrbIVDefines
+KRBIV_INCLUDES = KrbIVIncludes
+KRBIVLIB = KrbIVLibraries
+#endif
+
 #if HasKrb5
 KRB5_DEFINES = Krb5Defines
 KRB5_INCLUDE = Krb5Includes
@@ -63,7 +54,7 @@
     DLLIBRARY = DlLibrary
 #endif
 #else
-GREET_DEFINES = -DGREET_USER_STATIC
+GREET_DEFINES = -DGREET_USER_STATIC $(KRBIV_DEFINES) $(KRBIV_INCLUDES)
 GREETSRCS = greet.c verify.c Login.c
 GREETOBJS = greet.o verify.o Login.o
 #if BuildBoth
@@ -83,8 +74,13 @@
 #else
 PWD_DEFINES = -DUSESHADOW -DSHADOWSUITE
 #endif
+
+#if HasPam
+PAM_LIBRARIES = -lpam DlLibrary
+PAM_DEFINES = -DUSE_PAM
+#endif
 
-#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture)
+#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture)
 SYS_LIBRARIES3 = -lresolv
 #endif
 #if SystemV || defined(SequentArchitecture)
@@ -108,17 +104,24 @@
 CRYPT_LIBRARIES = SpecialLibCrypt
 #else
 CRYPT_LIBRARIES = -lcrypt
+#if defined(LynxOSArchitecture)
+CRYPT_DEFINES = -DHAS_CRYPT
 #endif
 #endif
+#endif
 
 #if HasBSD44Sockets
 SOCK_DEFINES = -DBSD44SOCKETS
 #endif
 
-#ifdef i386Architecture
+#if defined(i386Architecture) || defined(AmigaArchitecture)
 FRAGILE_DEFINES = -DFRAGILE_DEV_MEM
 #endif
 
+#ifdef OpenBSDArchitecture
+RANDOM_DEFINES = -DARC4_RANDOM
+#endif
+
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK
 #endif
@@ -139,7 +142,9 @@
 
 INCLUDES = $(KRB5_INCLUDE)
 DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) $(DEPXAUTHLIB) $(DEPXDMCPLIB)
-LOCAL_LIBRARIES = $(XPMLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(XAUTHLIB) $(XDMCPLIB) $(RPCLIB) $(DLLIBRARY) $(CRYPT_LIBRARIES)
+LOCAL_LIBRARIES = $(XPMLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(XAUTHLIB) \
+	$(XDMCPLIB) $(RPCLIB) $(PAM_LIBRARIES) $(DLLIBRARY) \
+	$(CRYPT_LIBRARIES) $(KRBIVLIB)
 
           SRCS1 = auth.c daemon.c server.c dpylist.c dm.c error.c file.c \
 		  netaddr.c reset.c resource.c protodpy.c policy.c \
@@ -189,10 +194,10 @@
  OSMINORVERSION = OSMinorVersion
    CONN_DEFINES = $(CONNECTION_FLAGS)
         DEFINES = -DBINDIR=\"$(BINDIR)\" -DXDMDIR=\"$(XDMDIR)\" \
-		$(SIGNAL_DEFINES) \
+		$(SIGNAL_DEFINES) $(CRYPT_DEFINES) \
 		$(XDMAUTH_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) \
-		$(PWD_DEFINES) $(CONN_DEFINES) \
-		$(GREET_DEFINES) $(FRAGILE_DEFINES) \
+		$(PWD_DEFINES) $(PAM_DEFINES) $(CONN_DEFINES) \
+		$(GREET_DEFINES) $(FRAGILE_DEFINES) $(RANDOM_DEFINES) \
 		-DOSMAJORVERSION=$(OSMAJORVERSION) \
 		-DOSMINORVERSION=$(OSMINORVERSION) \
 		$(XKB_CLIENT_DEFINES) $(USER_CONTEXT_DEFINES) \
Index: xc/programs/xdm/choose.c
diff -u xc/programs/xdm/choose.c:3.7 xc/programs/xdm/choose.c:3.9
--- xc/programs/xdm/choose.c:3.7	Sat Oct 10 08:25:31 1998
+++ xc/programs/xdm/choose.c	Wed May 31 00:15:11 2000
@@ -22,7 +22,7 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/xdm/choose.c,v 3.7 1998/10/10 15:25:31 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/choose.c,v 3.9 2000/05/31 07:15:11 eich Exp $ */
 
 /*
  * choose.c
@@ -530,7 +530,7 @@
     if (client_fd == -1)
     	return;
 #else /* !MINIX */
-    client_fd = accept (fd, (struct sockaddr *)buf, &len);
+    client_fd = accept (fd, (struct sockaddr *)buf, (void *)&len);
 #endif /* MINIX */
     if (client_fd == -1)
     {
@@ -556,16 +556,22 @@
 	clientAddress.length = 0;
 	choice.data = 0;
 	choice.length = 0;
-	if (XdmcpReadARRAY8 (&buffer, &clientAddress) &&
-	    XdmcpReadCARD16 (&buffer, &connectionType) &&
-	    XdmcpReadARRAY8 (&buffer, &choice))
-	{
-	    Debug ("Read from chooser succesfully\n");
-	    if (!RegisterIndirectChoice (&clientAddress, connectionType, &choice))
-		Debug ("Invalid chooser reply\n");
+	if (XdmcpReadARRAY8 (&buffer, &clientAddress)) {
+	    if (XdmcpReadCARD16 (&buffer, &connectionType)) {
+		if (XdmcpReadARRAY8 (&buffer, &choice)) {
+		    Debug ("Read from chooser succesfully\n");
+		    RegisterIndirectChoice (&clientAddress, connectionType, &choice);
+		    XdmcpDisposeARRAY8 (&choice);
+		} else {
+		    LogError ("Invalid choice response length %d\n", len);
+		}
+	    } else {
+		LogError ("Invalid choice response length %d\n", len);
+	    }
+	    XdmcpDisposeARRAY8 (&clientAddress);
+	} else {
+	    LogError ("Invalid choice response length %d\n", len);
 	}
-	XdmcpDisposeARRAY8 (&clientAddress);
-	XdmcpDisposeARRAY8 (&choice);
     }
     else
     {
Index: xc/programs/xdm/chooser.c
diff -u xc/programs/xdm/chooser.c:3.18 xc/programs/xdm/chooser.c:3.20
--- xc/programs/xdm/chooser.c:3.18	Sat Oct 10 08:25:31 1998
+++ xc/programs/xdm/chooser.c	Thu Jun 15 13:50:04 2000
@@ -22,7 +22,7 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/xdm/chooser.c,v 3.18 1998/10/10 15:25:31 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/chooser.c,v 3.20 2000/06/15 20:50:04 dawes Exp $ */
 
 /*
  * Chooser - display a menu of names and let the user select one
@@ -218,7 +218,7 @@
 static XdmcpBuffer	directBuffer, broadcastBuffer;
 static XdmcpBuffer	buffer;
 
-#if ((defined(SVR4) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF)
+#if ((defined(SVR4) && !defined(sun) && !defined(__sgi) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF)
 
 /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */
 
@@ -373,7 +373,7 @@
 	    	    if (hostent)
 	    	    {
 			XdmcpDisposeARRAY8 (hostname);
-		    	host = hostent->h_name;
+		    	host = (char *)hostent->h_name;
 			XdmcpAllocARRAY8 (hostname, strlen (host));
 			memmove( hostname->data, host, hostname->length);
 	    	    }
Index: xc/programs/xdm/dm.c
diff -u xc/programs/xdm/dm.c:3.9 xc/programs/xdm/dm.c:3.10
--- xc/programs/xdm/dm.c:3.9	Mon Feb  1 03:56:20 1999
+++ xc/programs/xdm/dm.c	Thu Apr 27 09:26:50 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/dm.c,v 3.9 1999/02/01 11:56:20 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/dm.c,v 3.10 2000/04/27 16:26:50 eich Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -544,7 +544,21 @@
 		{
 		    Debug ("Terminating session pid %d\n", d->pid);
 		    TerminateProcess (d->pid, SIGTERM);
-		}		
+		}
+		{
+		  Time_t Time;
+		  time(&Time);
+		  Debug("time %i %i\n",Time,d->lastCrash);
+		  if (d->lastCrash && 
+		      ((Time - d->lastCrash) < XDM_BROKEN_INTERVAL)) {
+		    Debug("Server crash frequency too high:"
+			  " removing display %s\n",d->name);
+		    LogError("Server crash rate too high:"
+			     " removing display %s\n",d->name);
+		    RemoveDisplay (d);
+		  } else 
+		    d->lastCrash = Time;
+		}
 		break;
 	    case notRunning:
 		Debug ("Server exited for notRunning session on display %s\n", d->name);
Index: xc/programs/xdm/dm.h
diff -u xc/programs/xdm/dm.h:3.15 xc/programs/xdm/dm.h:3.19
--- xc/programs/xdm/dm.h:3.15	Sat Dec  5 22:08:48 1998
+++ xc/programs/xdm/dm.h	Tue Jun 13 17:16:14 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/dm.h,v 3.15 1998/12/06 06:08:48 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/dm.h,v 3.19 2000/06/14 00:16:14 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -64,6 +64,13 @@
 #undef _POSIX_SOURCE
 #endif
 #endif
+#ifdef X_NOT_STDC_ENV
+#define Time_t long
+extern Time_t time ();
+#else
+#include <time.h>
+#define Time_t time_t
+#endif
 
 /* If XDMCP symbol defined, compile to run XDMCP protocol */
 
@@ -108,6 +115,11 @@
 #endif
 #endif /* X_NOT_POSIX */
 
+#ifdef USE_PAM
+#include <security/pam_appl.h>
+#endif
+
+
 # define waitCompose(sig,core,code) ((sig) * 256 + (core) * 128 + (code))
 # define waitVal(w)	waitCompose(waitSig(w), waitCore(w), waitCode(w))
 
@@ -166,7 +178,7 @@
 	int		serverPid;	/* process id of server (-1 if none) */
 	FileState	state;		/* state during HUP processing */
 	int		startTries;	/* current start try */
-
+        Time_t          lastCrash;      /* time of last crash */
 #ifdef XDMCP
 	/* XDMCP state */
 	CARD32		sessionID;	/* ID of active session */
@@ -233,7 +245,8 @@
 #ifdef XDMCP
 
 #define PROTO_TIMEOUT	(30 * 60)   /* 30 minutes should be long enough */
-
+#define XDM_BROKEN_INTERVAL (60)    /* server crashing more than once a */
+                                    /* minute is assumed to be broken!  */
 struct protoDisplay {
 	struct protoDisplay	*next;
 	XdmcpNetaddr		address;   /* UDP address */
@@ -259,6 +272,7 @@
 	int		version;	/* for dynamic greeter to see */
 	/* add new fields below this line, and preferably at the end */
 	Boolean		allow_null_passwd; /* allow null password on login */
+	Boolean		allow_root_login; /* allow direct root login */
 };
 
 /* setgroups is not covered by POSIX, arg type varies */
@@ -402,6 +416,9 @@
 extern void ReinitResources (void);
 
 /* in session.c */
+#ifdef USE_PAM
+extern pam_handle_t *thepamh(void);
+#endif
 extern char **defaultEnv (void);
 extern char **systemEnv (struct display *d, char *user, char *home);
 extern int PingServer(struct display *d, Display *alternateDpy);
@@ -431,6 +448,7 @@
 extern char *localHostname (void);
 extern char **parseArgs (char **argv, char *string);
 extern char **setEnv (char **e, char *name, char *value);
+extern char **putEnv(const char *string, char **env);
 extern char *getEnv (char **e, char *name);
 extern void CleanUpChild (void);
 extern void freeArgs (char **argv);
Index: xc/programs/xdm/dm_auth.h
diff -u xc/programs/xdm/dm_auth.h:1.1 xc/programs/xdm/dm_auth.h:1.2
--- xc/programs/xdm/dm_auth.h:1.1	Sat Oct 10 08:25:33 1998
+++ xc/programs/xdm/dm_auth.h	Wed May 31 00:15:11 2000
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/xdm/dm_auth.h,v 1.1 1998/10/10 15:25:33 dawes Exp $
+ * $XFree86: xc/programs/xdm/dm_auth.h,v 1.2 2000/05/31 07:15:11 eich Exp $
  */
 
 /************************************************************
@@ -43,7 +43,7 @@
 extern Xauth	*MitGetAuth (unsigned short namelen, char *name);
 
 #ifdef HASXDMAUTH
-extern int	XdmInitAuth (unsigned short name_len, char *name);
+extern void	XdmInitAuth (unsigned short name_len, char *name);
 extern Xauth	*XdmGetAuth (unsigned short namelen, char *name);
 #ifdef XDMCP
 extern void	XdmGetXdmcpAuth (
Index: xc/programs/xdm/dpylist.c
diff -u xc/programs/xdm/dpylist.c:1.2 xc/programs/xdm/dpylist.c:1.3
--- xc/programs/xdm/dpylist.c:1.2	Sat Oct 10 08:25:34 1998
+++ xc/programs/xdm/dpylist.c	Thu Apr 27 09:26:50 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/dpylist.c,v 1.2 1998/10/10 15:25:34 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/dpylist.c,v 1.3 2000/04/27 16:26:50 eich Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -240,6 +240,7 @@
     d->openTimeout = 0;
     d->startAttempts = 0;
     d->startTries = 0;
+    d->lastCrash = 0;
     d->terminateServer = 0;
     d->grabTimeout = 0;
 #ifdef XDMCP
Index: xc/programs/xdm/genauth.c
diff -u xc/programs/xdm/genauth.c:3.8 xc/programs/xdm/genauth.c:3.9
--- xc/programs/xdm/genauth.c:3.8	Sun Dec 20 03:58:14 1998
+++ xc/programs/xdm/genauth.c	Wed May 31 00:15:11 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/genauth.c,v 3.8 1998/12/20 11:58:14 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/genauth.c,v 3.9 2000/05/31 07:15:11 eich Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -57,7 +57,7 @@
 
 extern void _XdmcpWrapperToOddParity();
 
-static
+static void
 longtochars (long l, unsigned char *c)
 {
     c[0] = (l >> 24) & 0xff;
@@ -70,7 +70,7 @@
 # define FILE_LIMIT	1024	/* no more than this many buffers */
 
 #ifndef ARC4_RANDOM
-static
+static int
 sumFile (char *name, long sum[2])
 {
     long    buf[1024*2];
@@ -107,7 +107,7 @@
 }
 #endif
 
-static
+static void
 InitXdmcpWrapper (void)
 {
 
@@ -214,8 +214,8 @@
     	for (i = 0; i < len; i++) {
 	    auth[i] = 0;
 	    for (bit = 1; bit < 256; bit <<= 1) {
-	    	_XdmcpAuthDoIt (data, data, schedule, 1);
-	    	if (data[0] + data[1] & 0x4)
+		_XdmcpAuthDoIt (data, data, schedule, 1);
+		if ((data[0] + data[1]) & 0x4)
 		    auth[i] |= bit;
 	    }
     	}
Index: xc/programs/xdm/greet.h
diff -u xc/programs/xdm/greet.h:1.4 xc/programs/xdm/greet.h:1.5
--- xc/programs/xdm/greet.h:1.4	Sun Feb 28 03:20:12 1999
+++ xc/programs/xdm/greet.h	Wed May 31 00:15:11 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greet.h,v 1.4 1999/02/28 11:20:12 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/greet.h,v 1.5 2000/05/31 07:15:11 eich Exp $ */
 
 /*
  * greet.h - interface to xdm's dynamically-loadable modular greeter
@@ -64,6 +64,7 @@
     int (*_source)(char **environ, char *file);
     char **(*_defaultEnv)(void);
     char **(*_setEnv)(char **e, char *name, char *value);
+    char **(*_putEnv)(const char *string, char **env);
     char **(*_parseArgs)(char **argv, char *string);
     void (*_printEnv)(char **e);
     char **(*_systemEnv)(struct display *d, char *user, char *home);
@@ -76,7 +77,13 @@
     void (*_endspent)(void);
 #endif
     struct passwd *(*_getpwnam)(GETPWNAM_ARGS);
+#ifdef linux
+    void (*_endpwent)(void);
+#endif
     char *(*_crypt)(CRYPT_ARGS);
+#ifdef USE_PAM
+    pam_handle_t *(*_thepamh)(void);
+#endif
 };
 
 /*
@@ -139,33 +146,40 @@
  * called, with the pointer values passed as a paramter.
  */
 
-extern	int     (*__xdm_PingServer)();
-extern	int     (*__xdm_SessionPingFailed)();
-extern	int     (*__xdm_Debug)();
-extern	int     (*__xdm_RegisterCloseOnFork)();
-extern	int     (*__xdm_SecureDisplay)();
-extern	int     (*__xdm_UnsecureDisplay)();
-extern	int     (*__xdm_ClearCloseOnFork)();
-extern	int     (*__xdm_SetupDisplay)();
-extern	int     (*__xdm_LogError)();
-extern	int     (*__xdm_SessionExit)();
-extern	int     (*__xdm_DeleteXloginResources)();
-extern	int     (*__xdm_source)();
-extern	char    **(*__xdm_defaultEnv)();
-extern	char    **(*__xdm_setEnv)();
-extern	char    **(*__xdm_parseArgs)();
-extern	int     (*__xdm_printEnv)();
-extern	char    **(*__xdm_systemEnv)();
-extern	int     (*__xdm_LogOutOfMem)();
-extern	void    (*__xdm_setgrent)();
-extern	struct group    *(*__xdm_getgrent)();
-extern	void    (*__xdm_endgrent)();
+extern	int     (*__xdm_PingServer)(struct display *d, Display *alternateDpy);
+extern	void    (*__xdm_SessionPingFailed)(struct display *d);
+extern	void    (*__xdm_Debug)(char * fmt, ...);
+extern	void    (*__xdm_RegisterCloseOnFork)(int fd);
+extern	void    (*__xdm_SecureDisplay)(struct display *d, Display *dpy);
+extern	void    (*__xdm_UnsecureDisplay)(struct display *d, Display *dpy);
+extern	void    (*__xdm_ClearCloseOnFork)(int fd);
+extern	void    (*__xdm_SetupDisplay)(struct display *d);
+extern	void    (*__xdm_LogError)(char * fmt, ...);
+extern	void    (*__xdm_SessionExit)(struct display *d, int status, int removeAuth);
+extern	void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy);
+extern	int     (*__xdm_source)(char **environ, char *file);
+extern	char    **(*__xdm_defaultEnv)(void);
+extern	char    **(*__xdm_setEnv)(char **e, char *name, char *value);
+extern	char    **(*__xdm_putEnv)(const char *string, char **env);
+extern	char    **(*__xdm_parseArgs)(char **argv, char *string);
+extern	void    (*__xdm_printEnv)(char **e);
+extern	char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home);
+extern	void    (*__xdm_LogOutOfMem)(char * fmt, ...);
+extern	void    (*__xdm_setgrent)(void);
+extern	struct group    *(*__xdm_getgrent)(void);
+extern	void    (*__xdm_endgrent)(void);
 #ifdef USESHADOW
-extern	struct spwd   *(*__xdm_getspnam)();
-extern	void   (*__xdm_endspent)();
+extern	struct spwd   *(*__xdm_getspnam)(GETSPNAM_ARGS);
+extern	void    (*__xdm_endspent)(void);
 #endif
-extern	struct passwd   *(*__xdm_getpwnam)();
-extern	char     *(*__xdm_crypt)();
+extern	struct passwd   *(*__xdm_getpwnam)(GETPWNAM_ARGS);
+#ifdef linux
+extern  void    (*__xdm_endpwent)(void);
+#endif
+extern	char    *(*__xdm_crypt)(CRYPT_ARGS);
+#ifdef USE_PAM
+extern  pam_handle_t    *(*__xdm_thepamh)(void);
+#endif
 
 /*
  * Force the shared library to call through the function pointer
@@ -183,9 +197,10 @@
 #define	LogError	(*__xdm_LogError)
 #define	SessionExit	(*__xdm_SessionExit)
 #define	DeleteXloginResources	(*__xdm_DeleteXloginResources)
-#define	source	(*__xdm_source)
+#define	source		(*__xdm_source)
 #define	defaultEnv	(*__xdm_defaultEnv)
-#define	setEnv	(*__xdm_setEnv)
+#define	setEnv		(*__xdm_setEnv)
+#define putEnv		(*__xdm_putEnv)
 #define	parseArgs	(*__xdm_parseArgs)
 #define	printEnv	(*__xdm_printEnv)
 #define	systemEnv	(*__xdm_systemEnv)
@@ -197,7 +212,11 @@
 #define	getspnam	(*__xdm_getspnam)
 #define	endspent	(*__xdm_endspent)
 #endif
+#ifdef linux
+#define endpwent	(*__xdm_endpwent)
+#endif
 #define	getpwnam	(*__xdm_getpwnam)
 #define	crypt		(*__xdm_crypt)
+#define thepamh		(*__xdm_thepamh)
 
 #endif /* GREET_LIB */
Index: xc/programs/xdm/server.c
diff -u xc/programs/xdm/server.c:3.7 xc/programs/xdm/server.c:3.8
--- xc/programs/xdm/server.c:3.7	Sun Feb 28 03:20:12 1999
+++ xc/programs/xdm/server.c	Thu May 11 11:14:42 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/server.c,v 3.7 1999/02/28 11:20:12 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/server.c,v 3.8 2000/05/11 18:14:42 tsi Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -292,7 +292,7 @@
     	sinp->sin_addr.s_addr= tcpconf.nwtc_remaddr;
     }
 #else
-    getpeername (fd, (struct sockaddr *) buf, &len);
+    getpeername (fd, (struct sockaddr *) buf, (void *)&len);
 #endif
 #endif
     d->peerlen = 0;
Index: xc/programs/xdm/session.c
diff -u xc/programs/xdm/session.c:3.21 xc/programs/xdm/session.c:3.23
--- xc/programs/xdm/session.c:3.21	Sun Dec 26 16:40:08 1999
+++ xc/programs/xdm/session.c	Fri Jun 16 17:27:34 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/session.c,v 3.21 1999/12/27 00:40:08 robin Exp $ */
+/* $XFree86: xc/programs/xdm/session.c,v 3.23 2000/06/17 00:27:34 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -91,8 +91,18 @@
 #include <unistd.h>
 #else
 extern	struct passwd	*getpwnam(GETPWNAM_ARGS);
+#ifdef linux
+extern  void	endpwent(void);
+#endif
 extern	char	*crypt(CRYPT_ARGS);
 #endif
+#ifdef USE_PAM
+pam_handle_t *thepamh()
+{
+	static pam_handle_t *pamh = NULL;
+	return pamh;
+}
+#endif
 
 static	struct dlfuncs	dlfuncs = {
 	PingServer,
@@ -109,6 +119,7 @@
 	source,
 	defaultEnv,
 	setEnv,
+	putEnv,
 	parseArgs,
 	printEnv,
 	systemEnv,
@@ -123,7 +134,13 @@
 #endif /* QNX4 doesn't use endspent */
 #endif
 	getpwnam,
+#ifdef linux
+	endpwent,
+#endif
 	crypt,
+#ifdef USE_PAM
+	thepamh,
+#endif
 	};
 
 #ifdef X_NOT_STDC_ENV
@@ -450,6 +467,9 @@
 	ResetServer (d);
     if (removeAuth)
     {
+#ifdef USE_PAM
+	pam_handle_t *pamh = thepamh();
+#endif
 	setgid (verify.gid);
 	setuid (verify.uid);
 	RemoveUserAuthorization (d, &verify);
@@ -477,6 +497,14 @@
 	    }
 	}
 #endif /* K5AUTH */
+#ifdef USE_PAM
+	if (pamh) {
+	    /* shutdown PAM session */
+	    pam_close_session(pamh, 0);
+	    pam_end(pamh, PAM_SUCCESS);
+	    pamh = NULL;
+	}
+#endif
     }
     Debug ("Display %s exiting with status %d\n", d->name, status);
     exit (status);
@@ -496,6 +524,9 @@
 #ifdef HAS_SETUSERCONTEXT
     struct passwd* pwd;
 #endif
+#ifdef USE_PAM 
+    pam_handle_t *pamh = thepamh();
+#endif
 
     if (verify->argv) {
 	Debug ("StartSession %s: ", verify->argv[0]);
@@ -508,6 +539,9 @@
 		Debug ("%s ", *f);
 	Debug ("\n");
     }
+#ifdef USE_PAM
+    if (pamh) pam_open_session(pamh, 0);
+#endif    
     switch (pid = fork ()) {
     case 0:
 	CleanUpChild ();
@@ -518,6 +552,18 @@
 
 	/* Do system-dependent login setup here */
 
+#ifdef USE_PAM
+	/* pass in environment variables set by libpam and modules it called */
+	if (pamh) {
+	    long i;
+	    char **pam_env = pam_getenvlist(pamh);
+	    for(i = 0; pam_env && pam_env[i]; i++) {
+		verify->userEnviron = putEnv(pam_env[i], verify->userEnviron);
+	    }
+	}
+#endif
+
+
 #ifndef AIXV3
 #ifndef HAS_SETUSERCONTEXT
 	if (setgid(verify->gid) < 0)
@@ -862,7 +908,7 @@
     return env;
 }
 
-#if defined(Lynx) || defined(SCO) && !defined(SCO_USA) && !defined(_SCO_DS)
+#if (defined(Lynx) && !defined(HAS_CRYPT)) || defined(SCO) && !defined(SCO_USA) && !defined(_SCO_DS)
 char *crypt(char *s1, char *s2)
 {
 	return(s2);
Index: xc/programs/xdm/sessreg.c
diff -u xc/programs/xdm/sessreg.c:3.12 xc/programs/xdm/sessreg.c:3.13
--- xc/programs/xdm/sessreg.c:3.12	Sun Dec 26 16:40:09 1999
+++ xc/programs/xdm/sessreg.c	Wed May 31 00:15:12 2000
@@ -26,7 +26,7 @@
  *   by Andreas Stolcke <stolcke@icsi.berkeley.edu>
  */
 
-/* $XFree86: xc/programs/xdm/sessreg.c,v 3.12 1999/12/27 00:40:09 robin Exp $ */
+/* $XFree86: xc/programs/xdm/sessreg.c,v 3.13 2000/05/31 07:15:12 eich Exp $ */
 
 /*
  * sessreg
@@ -295,7 +295,7 @@
 		else
 			line = line_tmp;
 	}
-	current_time = time ((Time_t *) 0);
+	time (&current_time);
 	set_utmp (&utmp_entry, line, user_name, host_name, current_time, aflag);
 	if (!utmp_none) {
 #ifdef SYSV
@@ -328,11 +328,13 @@
 	        struct passwd *pwd = getpwnam(user_name);
 
 	        sysnerr( pwd != NULL, "get user id");
-	        llog = open (llog_file, O_WRONLY);
+	        llog = open (llog_file, O_RDWR);
 
 		if (llog != -1) {
 			struct lastlog ll;
 
+			sysnerr (lseek(llog, (long) pwd->pw_uid*sizeof(ll), 0)
+				        != -1, "seeking lastlog entry");
 			bzero((char *)&ll, sizeof(ll));
 			ll.ll_time = current_time;
 			if (line)
@@ -340,7 +342,6 @@
 			if (host_name)
 			 (void) strncpy (ll.ll_host, host_name, sizeof (ll.ll_host));
 
-			sysnerr (lseek(llog, (long) pwd->pw_uid*sizeof(ll), 0) != -1, "seeking lastlog entry");
 			sysnerr (write (llog, (char *) &ll, sizeof (ll))
 				        == sizeof (ll), "write lastlog entry");
 			close (llog);
Index: xc/programs/xdm/socket.c
diff -u xc/programs/xdm/socket.c:3.5 xc/programs/xdm/socket.c:3.6
--- xc/programs/xdm/socket.c:3.5	Sat Oct 10 08:25:39 1998
+++ xc/programs/xdm/socket.c	Thu May 11 11:14:43 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/socket.c,v 3.5 1998/10/10 15:25:39 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/socket.c,v 3.6 2000/05/11 18:14:43 tsi Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -213,7 +213,7 @@
     int			len;
 
     len = sizeof in_addr;
-    if (getsockname (chooserFd, (struct sockaddr *)&in_addr, &len) < 0)
+    if (getsockname (chooserFd, (struct sockaddr *)&in_addr, (void *)&len) < 0)
 	return -1;
     Debug ("Chooser socket port: %d\n", ntohs(in_addr.sin_port));
     memmove( addr, (char *) &in_addr, len);
Index: xc/programs/xdm/util.c
diff -u xc/programs/xdm/util.c:3.12 xc/programs/xdm/util.c:3.13
--- xc/programs/xdm/util.c:3.12	Sun Dec 26 16:40:09 1999
+++ xc/programs/xdm/util.c	Wed May 31 00:15:12 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/util.c,v 3.12 1999/12/27 00:40:09 robin Exp $ */
+/* $XFree86: xc/programs/xdm/util.c,v 3.13 2000/05/31 07:15:12 eich Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -130,6 +130,31 @@
 	new[envsize] = newe;
 	new[envsize+1] = 0;
 	return new;
+}
+
+char **
+putEnv(const char *string, char **env)
+{
+    char *v, *b, *n;
+    int nl;
+  
+    if ((b = strchr(string, '=')) == NULL)
+	return NULL;
+    v = b + 1;
+  
+    nl = b - string;
+    if ((n = malloc(nl + 1)) == NULL)
+    {
+	LogOutOfMem ("putAllEnv");
+	return NULL;
+    }
+  
+    strncpy(n, string,nl + 1);
+    n[nl] = 0;
+  
+    env = setEnv(env,n,v);
+    free(n);
+    return env;
 }
 
 void
Index: xc/programs/xdm/xdm.man
diff -u xc/programs/xdm/xdm.man:3.13 xc/programs/xdm/xdm.man:3.14
--- xc/programs/xdm/xdm.man:3.13	Sun Aug 29 05:21:05 1999
+++ xc/programs/xdm/xdm.man	Tue Jun 13 17:16:14 2000
@@ -19,7 +19,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\" 
-.\" $XFree86: xc/programs/xdm/xdm.man,v 3.13 1999/08/29 12:21:05 dawes Exp $
+.\" $XFree86: xc/programs/xdm/xdm.man,v 3.14 2000/06/14 00:16:14 dawes Exp $
 .\" 
 .TH XDM 1 "Release 6.4" "X Version 11"
 .SH NAME
@@ -928,6 +928,10 @@
 	<Key>:	insert-char() \\
 
 .fi
+.IP "\fBxlogin.Login.allowRootLogin\fP"
+If set to ``false'', don't allow root (and any other user with uid = 0) to
+log in directly.
+The default is ``true''.
 .IP "\fBxlogin.Login.allowNullPasswd\fP"
 If set to ``true'', allow an otherwise failing password match to succeed
 if the account does not require a password at all.
@@ -984,6 +988,11 @@
 Be very careful using this;
 it might be better to disconnect the machine from the network
 before doing this.
+.PP
+On some systems (OpenBSD) the user's shell must be listed in
+.I /etc/shells
+to allow login through xdm. The normal password and account expiration 
+dates are enforced too.
 .SH "STARTUP PROGRAM"
 .PP
 The \fIXstartup\fP program is run as
Index: xc/programs/xdm/xdmauth.c
diff -u xc/programs/xdm/xdmauth.c:1.1.1.3 xc/programs/xdm/xdmauth.c:1.3
--- xc/programs/xdm/xdmauth.c:1.1.1.3	Sun Sep 27 01:48:58 1998
+++ xc/programs/xdm/xdmauth.c	Wed Jun  7 15:03:16 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-
+/* $XFree86: xc/programs/xdm/xdmauth.c,v 1.3 2000/06/07 22:03:16 tsi Exp $ */
 /*
  * xdm - display manager daemon
  * Author:  Keith Packard, MIT X Consortium
@@ -33,12 +33,15 @@
  */
 
 #include "dm.h"
+#include "dm_auth.h"
+#include "dm_error.h"
 
 #ifdef HASXDMAUTH
 
 static char	auth_name[256];
 static int	auth_name_len;
 
+void
 XdmPrintDataHex (s, a, l)
     char	    *s;
     char	    *a;
@@ -53,6 +56,7 @@
 }
 
 #ifdef notdef			/* not used */
+void
 XdmPrintKey (s, k)
     char	    *s;
     XdmAuthKeyRec   *k;
@@ -62,6 +66,7 @@
 #endif
 
 #ifdef XDMCP
+void
 XdmPrintArray8Hex (s, a)
     char	*s;
     ARRAY8Ptr	a;
@@ -70,6 +75,7 @@
 }
 #endif
 
+void
 XdmInitAuth (name_len, name)
     unsigned short  name_len;
     char	    *name;
@@ -190,7 +196,7 @@
     XdmPrintDataHex ("Accept packet auth", xdmcpauth->data, xdmcpauth->data_length);
     XdmPrintDataHex ("Auth file auth", fileauth->data, fileauth->data_length);
     /* encrypt the session key for its trip back to the server */
-    XdmcpWrap (xdmcpauth->data, &pdpy->key, xdmcpauth->data, 8);
+    XdmcpWrap (xdmcpauth->data, (unsigned char *)&pdpy->key, xdmcpauth->data, 8);
     pdpy->fileAuthorization = fileauth;
     pdpy->xdmcpAuthorization = xdmcpauth;
 }
@@ -199,7 +205,7 @@
 		 'a' <= c && c <= 'f' ? c - 'a' + 10 : \
 		 'A' <= c && c <= 'F' ? c - 'A' + 10 : -1)
 
-static
+static int
 HexToBinary (key)
     char    *key;
 {
@@ -230,6 +236,7 @@
  * routine accepts either plain ascii strings for keys, or hex-encoded numbers
  */
 
+int
 XdmGetKey (pdpy, displayID)
     struct protoDisplay	*pdpy;
     ARRAY8Ptr		displayID;
@@ -271,6 +278,7 @@
 }
 
 /*ARGSUSED*/
+int
 XdmCheckAuthentication (pdpy, displayID, authenticationName, authenticationData)
     struct protoDisplay	*pdpy;
     ARRAY8Ptr		displayID, authenticationName, authenticationData;
@@ -281,14 +289,14 @@
 	return FALSE;
     if (authenticationData->length != 8)
 	return FALSE;
-    XdmcpUnwrap (authenticationData->data, &pdpy->key,
+    XdmcpUnwrap (authenticationData->data, (unsigned char *)&pdpy->key,
 		  authenticationData->data, 8);
     XdmPrintArray8Hex ("Request packet auth", authenticationData);
     if (!XdmcpCopyARRAY8(authenticationData, &pdpy->authenticationData))
 	return FALSE;
     incoming = (XdmAuthKeyPtr) authenticationData->data;
     XdmcpIncrementKey (incoming);
-    XdmcpWrap (authenticationData->data, &pdpy->key,
+    XdmcpWrap (authenticationData->data, (unsigned char *)&pdpy->key,
 		  authenticationData->data, 8);
     return TRUE;
 }
Index: xc/programs/xdm/greeter/Imakefile
diff -u xc/programs/xdm/greeter/Imakefile:1.1.1.2 xc/programs/xdm/greeter/Imakefile:1.4
--- xc/programs/xdm/greeter/Imakefile:1.1.1.2	Sat Dec 21 20:09:36 1996
+++ xc/programs/xdm/greeter/Imakefile	Tue Jun 13 17:16:15 2000
@@ -1,4 +1,10 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/28 17:17:38 rws $
+
+
+
+
+
+XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.4 2000/06/14 00:16:15 dawes Exp $
 #define DoNormalLib NO
 #define DoSharedLib YES
 #define DoDebugLib NO
@@ -17,6 +23,11 @@
 RPCLIB = -lrpcsvc
 #endif
 
+#if HasKrbIV
+KRBIV_DEFINES = KrbIVDefines
+KRBIV_INCLUDES = KrbIVIncludes
+#endif
+
 #if HasKrb5
 KRB5_DEFINES = Krb5Defines
 KRB5_INCLUDE = Krb5Includes
@@ -42,6 +53,7 @@
 	-expect_unresolved source \
 	-expect_unresolved defaultEnv \
 	-expect_unresolved setEnv \
+	-expect_unresolved putEnv \
 	-expect_unresolved parseArgs \
 	-expect_unresolved printEnv \
 	-expect_unresolved systemEnv \
@@ -53,12 +65,17 @@
 PWD_DEFINES = -DUSESHADOW
 #endif
 
+#if HasPam
+PAM_DEFINES = -DUSE_PAM
+#endif
+
 #if SystemV4
   GREETER_DEFINES = -DGREET_LIB
 #endif
 
-INCLUDES = -I.. $(KRB5_INCLUDE)
- DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES)
+INCLUDES = -I.. $(KRBIV_INCLUDES) $(KRB5_INCLUDE)
+ DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \
+	   $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES)
 
 SHLIBDIR = $(XDMDIR)
 
Index: xc/programs/xdm/greeter/Login.c
diff -u xc/programs/xdm/greeter/Login.c:3.5 xc/programs/xdm/greeter/Login.c:3.9
--- xc/programs/xdm/greeter/Login.c:3.5	Sun Dec 26 16:40:10 1999
+++ xc/programs/xdm/greeter/Login.c	Mon Jun 19 08:01:03 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greeter/Login.c,v 3.5 1999/12/27 00:40:10 robin Exp $ */
+/* $XFree86: xc/programs/xdm/greeter/Login.c,v 3.9 2000/06/19 15:01:03 tsi Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -34,6 +34,7 @@
 # include <X11/IntrinsicP.h>
 # include <X11/StringDefs.h>
 # include <X11/keysym.h>
+# include <X11/DECkeysym.h>
 # include <X11/Xfuncs.h>
 
 # include <stdio.h>
@@ -140,7 +141,9 @@
     {XtNallowAccess, XtCAllowAccess, XtRBoolean, sizeof (Boolean),
 	offset(allow_access), XtRImmediate, False },
     {XtNallowNullPasswd, XtCAllowNullPasswd, XtRBoolean, sizeof (Boolean),
-	offset(allow_null_passwd), XtRImmediate, False}
+	offset(allow_null_passwd), XtRImmediate, False},
+    {XtNallowRootLogin, XtCAllowRootLogin, XtRBoolean, sizeof(Boolean),
+     offset(allow_root_login), XtRImmediate, (XtPointer) True}
 };
 
 #undef offset
@@ -834,6 +837,35 @@
     w->login.state = GET_NAME;
 }
 
+static void
+InitI18N(Widget ctxw)
+{
+    LoginWidget ctx = (LoginWidget)ctxw;
+    XIM         xim = (XIM) NULL;
+    char *p;
+
+    ctx->login.xic = (XIC) NULL;
+
+    if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
+	xim = XOpenIM(XtDisplay(ctx), NULL, NULL, NULL);
+
+    if (!xim) {
+	LogError("Failed to open input method\n");
+	return;
+    }
+
+    ctx->login.xic = XCreateIC(xim,
+	XNInputStyle, (XIMPreeditNothing|XIMStatusNothing),
+	XNClientWindow, ctx->core.window,
+	XNFocusWindow,  ctx->core.window, NULL);
+
+    if (!ctx->login.xic) {
+	LogError("Failed to create input context\n");
+	XCloseIM(xim);
+    }
+    return;
+}
+
 /* ARGSUSED */
 static void
 InsertChar (
@@ -850,8 +882,17 @@
 #else
     int  len,pixels;
 #endif /* XPM */
+    KeySym  keysym = 0;
 
-    len = XLookupString (&event->xkey, strbuf, sizeof (strbuf), 0, 0);
+    if (ctx->login.xic) {
+	static Status status;
+	len = XmbLookupString(ctx->login.xic, &event->xkey, strbuf,
+			      sizeof (strbuf), &keysym, &status);
+    } else {
+	static XComposeStatus compose_status = {NULL, 0};
+	len = XLookupString (&event->xkey, strbuf, sizeof (strbuf),
+			     &keysym, &compose_status);
+    }
     strbuf[len] = '\0';
 
 #ifdef XPM
@@ -862,6 +903,55 @@
     	     	/* pixels to be added */
 #endif /* XPM */
 
+    /*
+     * Note: You can override this default key handling
+     * by the settings in the translation table
+     * loginActionsTable at the end of this file.
+     */
+    switch (keysym) {
+    case XK_Return:
+    case XK_KP_Enter:
+    case XK_Linefeed:
+    case XK_Execute:
+	FinishField(ctxw, event, params, num_params);
+	return;
+    case XK_BackSpace:
+	DeleteBackwardChar(ctxw, event, params, num_params);
+	return;
+    case XK_Delete:
+    case XK_KP_Delete:
+    case DXK_Remove:
+	/* Sorry, it's not a telex machine, it's a terminal */
+	DeleteForwardChar(ctxw, event, params, num_params);
+	return;
+    case XK_Left:
+    case XK_KP_Left:
+	MoveBackwardChar(ctxw, event, params, num_params);
+	return;
+    case XK_Right:
+    case XK_KP_Right:
+	MoveForwardChar(ctxw, event, params, num_params);
+	return;
+    case XK_End:
+    case XK_KP_End:
+	MoveToEnd(ctxw, event, params, num_params);
+	return;
+    case XK_Home:
+    case XK_KP_Home:
+	MoveToBegining(ctxw, event, params, num_params);
+	return;
+    default:
+	if (IsFunctionKey(keysym) || IsMiscFunctionKey(keysym) ||
+	    IsPrivateKeypadKey(keysym) || IsCursorKey(keysym) ||
+	    IsKeypadKey(keysym) || IsPFKey(keysym)) {
+	    XBell(XtDisplay(ctxw), 60);
+	    return;
+	} else if (len == 0 && IsModifierKey(keysym)) {
+	    return; /* it's a modifier */
+	} else
+	    break;
+    }
+
     switch (ctx->login.state) {
     case GET_NAME:
 #ifndef XPM
@@ -1076,7 +1166,7 @@
 #endif /* XPM */
     XtCreateWindow( gw, (unsigned)InputOutput, (Visual *)CopyFromParent,
 		     *valueMask, attrs );
-
+    InitI18N(gw);
 #ifdef XPM
     cursor = XCreateFontCursor(XtDisplay(gw), XC_left_ptr);
     XDefineCursor(XtDisplay(gw), XtWindow(gw), cursor);
@@ -1181,29 +1271,30 @@
 }
 
 char defaultLoginTranslations [] =
-"\
-Ctrl<Key>H:	delete-previous-character() \n\
-Ctrl<Key>D:	delete-character() \n\
-Ctrl<Key>B:	move-backward-character() \n\
-Ctrl<Key>F:	move-forward-character() \n\
-Ctrl<Key>A:	move-to-begining() \n\
-Ctrl<Key>E:	move-to-end() \n\
-Ctrl<Key>K:	erase-to-end-of-line() \n\
-Ctrl<Key>U:	erase-line() \n\
-Ctrl<Key>X:	erase-line() \n\
-Ctrl<Key>C:	restart-session() \n\
-Ctrl<Key>\\\\:	abort-session() \n\
-:Ctrl<Key>plus:	allow-all-access() \n\
-<Key>BackSpace:	delete-previous-character() \n\
-<Key>Delete:	delete-previous-character() \n\
-<Key>Return:	finish-field() \n"
+"Ctrl<Key>H:	delete-previous-character() \n"
+"Ctrl<Key>D:	delete-character() \n"
+"Ctrl<Key>B:	move-backward-character() \n"
+"Ctrl<Key>F:	move-forward-character() \n"
+"Ctrl<Key>A:	move-to-begining() \n"
+"Ctrl<Key>E:	move-to-end() \n"
+"Ctrl<Key>K:	erase-to-end-of-line() \n"
+"Ctrl<Key>U:	erase-line() \n"
+"Ctrl<Key>X:	erase-line() \n"
+"Ctrl<Key>C:	restart-session() \n"
+"Ctrl<Key>\\\\:	abort-session() \n"
+":Ctrl<Key>plus:	allow-all-access() \n"
+"<Key>BackSpace:	delete-previous-character() \n"
+#ifdef linux
+"<Key>Delete:	delete-character() \n"
+#else
+"<Key>Delete:	delete-previous-character() \n"
+#endif
+"<Key>Return:	finish-field() \n"
 #ifndef XPM
-"<Key>:		insert-char() \
-"
+"<KeyPress>:	insert-char()"
 #else
-"<Key>Tab:	tab-field() \n\
-<Key>:		insert-char() \
-"
+"<Key>Tab:	tab-field() \n"
+"<KeyPress>:	insert-char()\n"
 #endif /* XPM */
 ;
 
Index: xc/programs/xdm/greeter/Login.h
diff -u xc/programs/xdm/greeter/Login.h:3.3 xc/programs/xdm/greeter/Login.h:3.4
--- xc/programs/xdm/greeter/Login.h:3.3	Sat Mar 13 19:22:26 1999
+++ xc/programs/xdm/greeter/Login.h	Tue Jun 13 17:16:15 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greeter/Login.h,v 3.3 1999/03/14 03:22:26 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/greeter/Login.h,v 3.4 2000/06/14 00:16:15 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -72,6 +72,7 @@
 # define XtNsecureSession	"secureSession"
 # define XtNallowAccess		"allowAccess"
 # define XtNallowNullPasswd	"allowNullPasswd"
+# define XtNallowRootLogin	"allowRootLogin"
 
 #ifdef XPM
 /* added by Amit Margalit Oct 1996 */
@@ -105,6 +106,7 @@
 # define XtCSecureSession	"SecureSession"
 # define XtCAllowAccess		"AllowAccess"
 # define XtCAllowNullPasswd	"AllowNullPasswd"
+# define XtCAllowRootLogin	"AllowRootLogin"
 
 /* notifyDone interface definition */
 
Index: xc/programs/xdm/greeter/LoginP.h
diff -u xc/programs/xdm/greeter/LoginP.h:3.4 xc/programs/xdm/greeter/LoginP.h:3.6
--- xc/programs/xdm/greeter/LoginP.h:3.4	Sat Mar 13 19:22:26 1999
+++ xc/programs/xdm/greeter/LoginP.h	Tue Jun 13 17:16:15 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greeter/LoginP.h,v 3.4 1999/03/14 03:22:26 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/greeter/LoginP.h,v 3.6 2000/06/14 00:16:15 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -84,6 +84,8 @@
 	Boolean		secure_session;	/* session is secured */
 	Boolean		allow_access;	/* disable access control on login */
 	Boolean		allow_null_passwd; /* allow null password on login */
+	Boolean		allow_root_login; /* allow root login */
+	XIC		xic;		/* input method of input context */
 #ifdef XPM
 	/*caolan begin*/
 	int lastEventTime;
Index: xc/programs/xdm/greeter/greet.c
diff -u xc/programs/xdm/greeter/greet.c:3.5 xc/programs/xdm/greeter/greet.c:3.7
--- xc/programs/xdm/greeter/greet.c:3.5	Sat Mar 13 19:22:26 1999
+++ xc/programs/xdm/greeter/greet.c	Tue Jun 13 17:16:16 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.5 1999/03/14 03:22:26 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.7 2000/06/14 00:16:16 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -42,38 +42,49 @@
 #include "greet.h"
 #include "Login.h"
 
+#ifdef __OpenBSD__
+#include <syslog.h>
+#endif
+
 #ifdef GREET_LIB
 /*
  * Function pointers filled in by the initial call ito the library
  */
 
-int     (*__xdm_PingServer)() = NULL;
-int     (*__xdm_SessionPingFailed)() = NULL;
-int     (*__xdm_Debug)() = NULL;
-int     (*__xdm_RegisterCloseOnFork)() = NULL;
-int     (*__xdm_SecureDisplay)() = NULL;
-int     (*__xdm_UnsecureDisplay)() = NULL;
-int     (*__xdm_ClearCloseOnFork)() = NULL;
-int     (*__xdm_SetupDisplay)() = NULL;
-int     (*__xdm_LogError)() = NULL;
-int     (*__xdm_SessionExit)() = NULL;
-int     (*__xdm_DeleteXloginResources)() = NULL;
-int     (*__xdm_source)() = NULL;
-char    **(*__xdm_defaultEnv)() = NULL;
-char    **(*__xdm_setEnv)() = NULL;
-char    **(*__xdm_parseArgs)() = NULL;
-int     (*__xdm_printEnv)() = NULL;
-char    **(*__xdm_systemEnv)() = NULL;
-int     (*__xdm_LogOutOfMem)() = NULL;
-void    (*__xdm_setgrent)() = NULL;
-struct group    *(*__xdm_getgrent)() = NULL;
-void    (*__xdm_endgrent)() = NULL;
+int     (*__xdm_PingServer)(struct display *d, Display *alternateDpy) = NULL;
+void    (*__xdm_SessionPingFailed)(struct display *d) = NULL;
+void    (*__xdm_Debug)(char * fmt, ...) = NULL;
+void    (*__xdm_RegisterCloseOnFork)(int fd) = NULL;
+void    (*__xdm_SecureDisplay)(struct display *d, Display *dpy) = NULL;
+void    (*__xdm_UnsecureDisplay)(struct display *d, Display *dpy) = NULL;
+void    (*__xdm_ClearCloseOnFork)(int fd) = NULL;
+void    (*__xdm_SetupDisplay)(struct display *d) = NULL;
+void    (*__xdm_LogError)(char * fmt, ...) = NULL;
+void    (*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NULL;
+void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL;
+int     (*__xdm_source)(char **environ, char *file) = NULL;
+char    **(*__xdm_defaultEnv)(void) = NULL;
+char    **(*__xdm_setEnv)(char **e, char *name, char *value) = NULL;
+char    **(*__xdm_putEnv)(const char *string, char **env) = NULL;
+char    **(*__xdm_parseArgs)(char **argv, char *string) = NULL;
+void    (*__xdm_printEnv)(char **e) = NULL;
+char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL;
+void    (*__xdm_LogOutOfMem)(char * fmt, ...) = NULL;
+void    (*__xdm_setgrent)(void) = NULL;
+struct group    *(*__xdm_getgrent)(void) = NULL;
+void    (*__xdm_endgrent)(void) = NULL;
 #ifdef USESHADOW
-struct spwd   *(*__xdm_getspnam)() = NULL;
-void   (*__xdm_endspent)() = NULL;
+struct spwd   *(*__xdm_getspnam)(GETSPNAM_ARGS) = NULL;
+void   (*__xdm_endspent)(void) = NULL;
+#endif
+struct passwd   *(*__xdm_getpwnam)(GETPWNAM_ARGS) = NULL;
+#ifdef linux
+void   (*__xdm_endpwent)(void) = NULL;
+#endif
+char     *(*__xdm_crypt)(CRYPT_ARGS) = NULL;
+#ifdef USE_PAM
+pam_handle_t *(*__xdm_thepamh)(void) = NULL;
 #endif
-struct passwd   *(*__xdm_getpwnam)() = NULL;
-char     *(*__xdm_crypt)() = NULL;
 
 #endif
 
@@ -240,7 +251,7 @@
 Greet (struct display *d, struct greet_info *greet)
 {
     XEvent		event;
-    Arg		arglist[2];
+    Arg		arglist[3];
 
     XtSetArg (arglist[0], XtNallowAccess, False);
     XtSetValues (login, arglist, 1);
@@ -248,8 +259,15 @@
     Debug ("dispatching %s\n", d->name);
     done = 0;
     while (!done) {
-	    XtAppNextEvent (context, &event);
+	XtAppNextEvent (context, &event);
+	switch (event.type) {
+	case MappingNotify:
+	    XRefreshKeyboardMapping(&event.xmapping);
+	    break;
+	default:
 	    XtDispatchEvent (&event);
+	    break;
+	}
     }
     XFlush (XtDisplay (toplevel));
     Debug ("Done dispatch %s\n", d->name);
@@ -259,7 +277,8 @@
 	greet->password = password;
 	XtSetArg (arglist[0], XtNsessionArgument, (char *) &(greet->string));
 	XtSetArg (arglist[1], XtNallowNullPasswd, (char *) &(greet->allow_null_passwd));
-	XtGetValues (login, arglist, 2);
+	XtSetArg (arglist[2], XtNallowRootLogin, (char *) &(greet->allow_root_login));
+	XtGetValues (login, arglist, 3);
 	Debug ("sessionArgument: %s\n", greet->string ? greet->string : "<NULL>");
     }
     return code;
@@ -269,6 +288,13 @@
 static void
 FailedLogin (struct display *d, struct greet_info *greet)
 {
+#ifdef __OpenBSD__
+    syslog(LOG_NOTICE, "LOGIN FAILURE ON %s",
+	   d->name);
+    syslog(LOG_AUTHPRIV|LOG_NOTICE,
+	   "LOGIN FAILURE ON %s, %s",
+	   d->name, greet->name);
+#endif
     DrawFail (login);
     bzero (greet->name, strlen(greet->name));
     bzero (greet->password, strlen(greet->password));
@@ -302,6 +328,7 @@
     __xdm_source = dlfuncs->_source;
     __xdm_defaultEnv = dlfuncs->_defaultEnv;
     __xdm_setEnv = dlfuncs->_setEnv;
+    __xdm_putEnv = dlfuncs->_putEnv;
     __xdm_parseArgs = dlfuncs->_parseArgs;
     __xdm_printEnv = dlfuncs->_printEnv;
     __xdm_systemEnv = dlfuncs->_systemEnv;
@@ -314,8 +341,14 @@
     __xdm_endspent = dlfuncs->_endspent;
 #endif
     __xdm_getpwnam = dlfuncs->_getpwnam;
+#ifdef linux
+    __xdm_endpwent = dlfuncs->_endpwent;
+#endif
     __xdm_crypt = dlfuncs->_crypt;
+#ifdef USE_PAM
+    __xdm_thepamh = dlfuncs->_thepamh;
 #endif
+#endif
 
     *dpy = InitGreet (d);
     /*
@@ -328,6 +361,9 @@
 	LogError ("Cannot reopen display %s for greet window\n", d->name);
 	exit (RESERVER_DISPLAY);
     }
+#ifdef __OpenBSD__
+    openlog("xdm", LOG_ODELAY, LOG_AUTH);
+#endif
     for (;;) {
 	/*
 	 * Greet user, requesting name/password
Index: xc/programs/xdm/greeter/verify.c
diff -u xc/programs/xdm/greeter/verify.c:3.7 xc/programs/xdm/greeter/verify.c:3.9
--- xc/programs/xdm/greeter/verify.c:3.7	Sun Dec 26 16:40:11 1999
+++ xc/programs/xdm/greeter/verify.c	Tue Jun 13 17:16:16 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.7 1999/12/27 00:40:11 robin Exp $ */
+/* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.9 2000/06/14 00:16:16 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -37,13 +37,17 @@
 # include	"dm_error.h"
 
 # include	<pwd.h>
-#ifdef USESHADOW
-# include	<shadow.h>
-# include	<errno.h>
-#ifdef X_NOT_STDC_ENV
+#ifdef USE_PAM
+# include	<security/pam_appl.h>
+#else
+# ifdef USESHADOW
+#  include	<shadow.h>
+#  include	<errno.h>
+#  ifdef X_NOT_STDC_ENV
 extern int errno;
+#  endif
+# endif
 #endif
-#endif
 
 # include	"greet.h"
 
@@ -74,6 +78,13 @@
     NULL
 };
 
+#ifdef KERBEROS
+#include <sys/param.h>
+#include <kerberosIV/krb.h>
+#include <kerberosIV/kafs.h>
+static char krbtkfile[MAXPATHLEN];
+#endif
+
 static char **
 userEnv (struct display *d, int useSystemPath, char *user, char *home, char *shell)
 {
@@ -88,6 +99,10 @@
     env = setEnv (env, "USER", user);    /* BSD */
     env = setEnv (env, "PATH", useSystemPath ? d->systemPath : d->userPath);
     env = setEnv (env, "SHELL", shell);
+#ifdef KERBEROS
+    if (krbtkfile[0] != '\0')
+        env = setEnv (env, "KRBTKFILE", krbtkfile);
+#endif
     for (envvar = envvars; *envvar; envvar++)
     {
 	str = getenv(*envvar);
@@ -97,26 +112,129 @@
     return env;
 }
 
+#ifdef USE_PAM
+static char *PAM_password;
+static int pam_error;
+
+static int PAM_conv (int num_msg,
+		     const struct pam_message **msg,
+		     struct pam_response **resp,
+		     void *appdata_ptr) {
+	int replies = 0;
+	struct pam_response *reply = NULL;
+
+	reply = malloc(sizeof(struct pam_response));
+	if (!reply) return PAM_CONV_ERR;
+#define COPY_STRING(s) (s) ? strdup(s) : NULL
+
+	for (replies = 0; replies < num_msg; replies++) {
+		switch (msg[replies]->msg_style) {
+		case PAM_PROMPT_ECHO_OFF:
+			/* wants password */
+			reply[replies].resp_retcode = PAM_SUCCESS;
+			reply[replies].resp = COPY_STRING(PAM_password);
+			break;
+		case PAM_TEXT_INFO:
+			/* ignore the informational mesage */
+			break;
+		case PAM_PROMPT_ECHO_ON:
+			/* user name given to PAM already */
+			/* fall through */
+		default:
+			/* unknown or PAM_ERROR_MSG */
+			free (reply);
+			return PAM_CONV_ERR;
+		}
+	}
+
+#undef COPY_STRING
+	*resp = reply;
+	return PAM_SUCCESS;
+}
+
+static struct pam_conv PAM_conversation = {
+	&PAM_conv,
+	NULL
+};
+#endif /* USE_PAM */
+
 int
 Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
 {
 	struct passwd	*p;
+#ifdef USE_PAM
+	pam_handle_t *pamh = thepamh();
+#else
 #ifdef USESHADOW
 	struct spwd	*sp;
+#endif
 #endif
-	char		*user_pass;
+#ifdef __OpenBSD__
+	char            *s;
+	struct timeval  tp;
+#endif
+	char		*user_pass = NULL;
 	char		*shell, *home;
 	char		**argv;
 
 	Debug ("Verify %s ...\n", greet->name);
 	p = getpwnam (greet->name);
+	endpwent();
+
 	if (!p || strlen (greet->name) == 0) {
 		Debug ("getpwnam() failed.\n");
 		bzero(greet->password, strlen(greet->password));
 		return 0;
 	} else {
+#ifdef linux
+	    if (p->pw_passwd[0] == '!' || p->pw_passwd[0] == '*') {
+		Debug ("The account is locked, no login allowed.\n");
+		bzero(greet->password, strlen(greet->password));
+		return 0;
+	    }
+#endif
 	    user_pass = p->pw_passwd;
 	}
+#ifdef KERBEROS
+	if(strcmp(greet->name, "root") != 0){
+		char name[ANAME_SZ];
+		char realm[REALM_SZ];
+		char *q;
+		int ret;
+	    
+		if(krb_get_lrealm(realm, 1)){
+			Debug ("Can't get Kerberos realm.\n");
+		} else {
+
+		    sprintf(krbtkfile, "%s.%s", TKT_ROOT, d->name);
+		    krb_set_tkt_string(krbtkfile);
+		    unlink(krbtkfile);
+           
+		    ret = krb_verify_user(greet->name, "", realm, 
+				      greet->password, 1, "rcmd");
+           
+		    if(ret == KSUCCESS){
+			    chown(krbtkfile, p->pw_uid, p->pw_gid);
+			    Debug("kerberos verify succeeded\n");
+			    if (k_hasafs()) {
+				    if (k_setpag() == -1)
+					    LogError ("setpag() failed for %s\n",
+						      greet->name);
+				    
+				    if((ret = k_afsklog(NULL, NULL)) != KSUCCESS)
+					    LogError("Warning %s\n", 
+						     krb_get_err_text(ret));
+			    }
+			    goto done;
+		    } else if(ret != KDC_PR_UNKNOWN && ret != SKDC_CANT){
+			    /* failure */
+			    Debug("kerberos verify failure %d\n", ret);
+			    krbtkfile[0] = '\0';
+		    }
+		}
+	}
+#endif
+#ifndef USE_PAM
 #ifdef USESHADOW
 	errno = 0;
 	sp = getspnam(greet->name);
@@ -141,8 +259,77 @@
 			return 0;
 		} /* else: null passwd okay */
 	}
-	Debug ("verify succeeded\n");
+done:
+#ifdef __OpenBSD__
+	/*
+	 * Only accept root logins if allowRootLogin resource is set
+	 */
+	if ((p->pw_uid == 0) && !greet->allow_root_login) {
+		Debug("root logins not allowed\n");
+		bzero(greet->password, strlen(greet->password));
+		return 0;
+	}
+	/*
+	 * Shell must be in /etc/shells 
+	 */
+	for (;;) {
+		s = getusershell();
+		if (s == NULL) {
+			/* did not found the shell in /etc/shells 
+			   -> failure */
+			Debug("shell not in /etc/shells\n");
+			bzero(greet->password, strlen(greet->password));
+			endusershell();
+			return 0;
+		}
+		if (strcmp(s, p->pw_shell) == 0) {
+			/* found the shell in /etc/shells */
+			endusershell();
+			break;
+		}
+	} 
+	/*
+	 * Test for expired password
+	 */
+	if (p->pw_change || p->pw_expire)
+		(void)gettimeofday(&tp, (struct timezone *)NULL);
+	if (p->pw_change) {
+		if (tp.tv_sec >= p->pw_change) {
+			Debug("Password has expired.\n");
+			bzero(greet->password, strlen(greet->password));
+			return 0;
+		}
+	}
+	if (p->pw_expire) {
+		if (tp.tv_sec >= p->pw_expire) {
+			Debug("account has expired.\n");
+			bzero(greet->password, strlen(greet->password));
+			return 0;
+		} 
+	}
+#endif /* __OpenBSD__ */
 	bzero(user_pass, strlen(user_pass)); /* in case shadow password */
+
+#else /* USE_PAM */
+#define PAM_BAIL	\
+	if (pam_error != PAM_SUCCESS) { pam_end(pamh, 0); return 0; }
+
+	PAM_password = greet->password;
+	pam_error = pam_start("xdm", p->pw_name, &PAM_conversation, &pamh);
+	PAM_BAIL;
+	pam_error = pam_set_item(pamh, PAM_TTY, d->name);
+	PAM_BAIL;
+	pam_error = pam_authenticate(pamh, 0);
+	PAM_BAIL;
+	pam_error = pam_acct_mgmt(pamh, 0);
+	/* really should do password changing, but it doesn't fit well */
+	PAM_BAIL;
+	pam_error = pam_setcred(pamh, 0);
+	PAM_BAIL;
+#undef PAM_BAIL
+#endif /* USE_PAM */
+
+	Debug ("verify succeeded\n");
 	/* The password is passed to StartClient() for use by user-based
 	   authorization schemes.  It is zeroed there. */
 	verify->uid = p->pw_uid;
Index: xc/programs/xdpyinfo/xdpyinfo.c
diff -u xc/programs/xdpyinfo/xdpyinfo.c:3.17 xc/programs/xdpyinfo/xdpyinfo.c:3.18
--- xc/programs/xdpyinfo/xdpyinfo.c:3.17	Sat Sep 25 07:38:22 1999
+++ xc/programs/xdpyinfo/xdpyinfo.c	Sun May 14 13:43:59 2000
@@ -25,7 +25,7 @@
  * Author:  Jim Fulton, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.17 1999/09/25 14:38:22 dawes Exp $ */
+/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.18 2000/05/14 20:43:59 alanh Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -63,6 +63,7 @@
 #endif
 #include <X11/Xos.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 char *ProgramName;
 Bool queryExtensions = False;
@@ -571,11 +572,18 @@
 static int
 print_dga_info(Display *dpy, char *extname)
 {
-    int majorrev, minorrev, width, bank, ram, offset;
+    int majorrev, minorrev, width, bank, ram, offset, flags;
 
     if (!XF86DGAQueryVersion(dpy, &majorrev, &minorrev))
 	return 0;
     print_standard_extension_info(dpy, extname, majorrev, minorrev);
+
+    if (!XF86DGAQueryDirectVideo(dpy, DefaultScreen(dpy), &flags) 
+	|| ! (flags & XF86DGADirectPresent) )
+    {
+	printf("  DGA not available on screen %d.\n", DefaultScreen(dpy));
+	return 1;
+    }
 
     if (!XF86DGAGetVideoLL(dpy, DefaultScreen(dpy), &offset,
 			    &width, &bank, &ram))
Index: xc/programs/xedit/util.c
diff -u xc/programs/xedit/util.c:1.14 xc/programs/xedit/util.c:1.15
--- xc/programs/xedit/util.c:1.14	Sat Aug 28 02:01:21 1999
+++ xc/programs/xedit/util.c	Wed Apr  5 11:14:04 2000
@@ -24,7 +24,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xedit/util.c,v 1.14 1999/08/28 09:01:21 dawes Exp $ */
+/* $XFree86: xc/programs/xedit/util.c,v 1.15 2000/04/05 18:14:04 dawes Exp $ */
 
 #include <stdio.h>
 #ifndef X_NOT_STDC_ENV
@@ -417,7 +417,11 @@
     if (filename == NULL)
 	filename = GetString(filenamewindow);
 
+#ifndef __EMX__
     return (realpath(filename, name));
+#else
+    return filename;
+#endif
 }
 
 static void
Index: xc/programs/xf86dga/dga.c
diff -u xc/programs/xf86dga/dga.c:3.16 xc/programs/xf86dga/dga.c:3.17
--- xc/programs/xf86dga/dga.c:3.16	Sun Mar  7 03:40:50 1999
+++ xc/programs/xf86dga/dga.c	Sun May 14 13:44:00 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xf86dga/dga.c,v 3.16 1999/03/07 11:40:50 dawes Exp $ */
+/* $XFree86: xc/programs/xf86dga/dga.c,v 3.17 2000/05/14 20:44:00 alanh Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Intrinsic.h>
@@ -49,6 +49,7 @@
     XEvent event;
     Colormap cmap;
     Visual *vis;
+    int flags;
 
     if (geteuid()) {
 	fprintf(stderr, "Must be suid root\n");
@@ -85,14 +86,10 @@
         exit(2);
     }
 
-    if (MajorVersion < 1) {
-	int flags;
-
-	XF86DGAQueryDirectVideo(dis, DefaultScreen(dis), &flags);
-	if (!(flags & XF86DGADirectPresent)) {
-	    fprintf(stderr, "Xserver driver doesn't support DirectVideo\n");
-	    exit(2);
-	}
+    XF86DGAQueryDirectVideo(dis, DefaultScreen(dis), &flags);
+    if (!(flags & XF86DGADirectPresent)) {
+      fprintf(stderr, "Xserver driver doesn't support DirectVideo on screen %d\n", DefaultScreen(dis) );
+      exit(2);
     }
 	
    XGrabKeyboard(dis, DefaultRootWindow(dis), True, GrabModeAsync,
Index: xc/programs/xfindproxy/xfindproxy.c
diff -u xc/programs/xfindproxy/xfindproxy.c:1.3 xc/programs/xfindproxy/xfindproxy.c:1.4
--- xc/programs/xfindproxy/xfindproxy.c:1.3	Tue Mar  2 03:49:39 1999
+++ xc/programs/xfindproxy/xfindproxy.c	Mon Jun 26 16:00:33 2000
@@ -21,7 +21,7 @@
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.3 1999/03/02 11:49:39 dawes Exp $ */
+/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.4 2000/06/26 23:00:33 dawes Exp $ */
 
 
 #include <stdio.h>
@@ -328,15 +328,17 @@
 	    if (reply.status == PM_Success)
 	    {
 		fprintf (stdout, "%s\n", reply.addr);
+		exit (0);
 	    }
 	    else
 	    {
 		fprintf (stderr, "Error from proxy manager: %s\n",
 		    reply.error);
+		exit (1);
 	    }
 	}
     }
-    exit(0);
+    /*NOTREACHED*/
 }
 
 
@@ -421,7 +423,7 @@
 
     if (status == IceProcessMessagesIOError)
     {
-	printf ("IO error occured\n");
+	fprintf (stderr, "IO error occured\n");
 	exit (1);
     }
 }
Index: xc/programs/xfontsel/xfontsel.c
diff -u xc/programs/xfontsel/xfontsel.c:1.1 xc/programs/xfontsel/xfontsel.c:1.2
--- xc/programs/xfontsel/xfontsel.c:1.1	Sat Feb 12 19:26:24 2000
+++ xc/programs/xfontsel/xfontsel.c	Thu May 11 11:14:43 2000
@@ -31,7 +31,7 @@
 	one weekend in November, 1989
 Modified: Mark Leisher <mleisher@crl.nmsu.edu> to deal with UCS sample text.
 */
-/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.1 2000/02/13 03:26:24 dawes Exp $ */
+/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.2 2000/05/11 18:14:43 tsi Exp $ */
 
 #include <stdio.h>
 #include <X11/Intrinsic.h>
@@ -249,8 +249,8 @@
 int enabledMenuIndex;
 static Boolean patternFieldSpecified[FIELD_COUNT]; /* = 0 */
 
-
-void main(argc, argv)
+int
+main(argc, argv)
     int argc;
     char **argv;
 {
@@ -359,6 +359,8 @@
     (void) XSetWMProtocols (XtDisplay(topLevel), XtWindow(topLevel),
                             &wm_delete_window, 1);
     XtAppMainLoop(appCtx);
+
+    return 0;
 }
 
 
Index: xc/programs/xfs/os/connection.c
diff -u xc/programs/xfs/os/connection.c:3.17 xc/programs/xfs/os/connection.c:3.18
--- xc/programs/xfs/os/connection.c:3.17	Sun Mar  7 03:41:06 1999
+++ xc/programs/xfs/os/connection.c	Tue Apr  4 12:25:26 2000
@@ -63,16 +63,14 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/connection.c,v 3.17 1999/03/07 11:41:06 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/connection.c,v 3.18 2000/04/04 19:25:26 dawes Exp $ */
 
 #include	<X11/Xtrans.h>
+#include	<stdlib.h>
 #include	"misc.h"
 #include	<stdio.h>
 #include	<errno.h>
 #include	<X11/Xos.h>
-#ifdef linux
-#include	<stdlib.h>
-#endif
 #ifndef MINIX
 #ifndef Lynx
 #include	<sys/param.h>
Index: xc/programs/xfs/os/waitfor.c
diff -u xc/programs/xfs/os/waitfor.c:3.10 xc/programs/xfs/os/waitfor.c:3.11
--- xc/programs/xfs/os/waitfor.c:3.10	Sat Aug 21 06:48:52 1999
+++ xc/programs/xfs/os/waitfor.c	Thu Jun 15 13:50:04 2000
@@ -46,7 +46,7 @@
  * $NCDId: @(#)waitfor.c,v 4.5 1991/06/24 11:59:20 lemke Exp $
  *
  */
-/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.10 1999/08/21 13:48:52 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.11 2000/06/15 20:50:04 dawes Exp $ */
 
 #include	<X11/Xos.h>	/* strings, time, etc */
 
@@ -205,7 +205,7 @@
 	    while (clientsReadable.fds_bits[i]) {
 		curclient = ffs(clientsReadable.fds_bits[i]) - 1;
 		conn = ConnectionTranslation[curclient + (i << 5)];
-		FD_CLR (curclient, &clientsReadable);
+		clientsReadable.fds_bits[i] &= ~(((fd_mask)1L) << curclient);
 		client = clients[conn];
 		if (!client)
 		    continue;
Index: xc/programs/xfwp/io.c
diff -u xc/programs/xfwp/io.c:1.6 xc/programs/xfwp/io.c:1.8
--- xc/programs/xfwp/io.c:1.6	Tue Mar  2 03:49:39 1999
+++ xc/programs/xfwp/io.c	Mon Jun 26 16:00:33 2000
@@ -32,7 +32,7 @@
 X Window System is a trademark of The Open Group.
 
 */
-/* $XFree86: xc/programs/xfwp/io.c,v 1.6 1999/03/02 11:49:39 dawes Exp $ */
+/* $XFree86: xc/programs/xfwp/io.c,v 1.8 2000/06/26 23:00:33 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -219,8 +219,9 @@
 	     * since we just wrote data to the conn_to fd, mark it as ready 
 	     * to check for reading when we go through select() the next time
 	     */
-	    if (client_conn_array[fd_counter]->conn_to != -1)
-		FD_SET(client_conn_array[fd_counter]->conn_to, rinit);
+	    if (client_conn_array[fd_counter] != NULL)
+		if (client_conn_array[fd_counter]->conn_to != -1)
+		    FD_SET(client_conn_array[fd_counter]->conn_to, rinit);
 	} /* end else no errors on write  */
     } else
     {
@@ -350,7 +351,7 @@
      */
     retval = getpeername(temp_sock_fd, 
 			 (struct sockaddr*)&temp_sockaddr_in, 
-			 &addrlen);
+			 (void *)&addrlen);
     if (retval)
     {
         IceCloseConnection(new_ice_conn);
@@ -554,7 +555,7 @@
 
     if ((temp_sock_fd = accept(accept_fd,
                                (struct sockaddr *) &temp_sockaddr_in, 
-	 		       &temp_sock_len)) < 0)
+	 		       (void *)&temp_sock_len)) < 0)
     {
 	(void) fprintf (stderr, "accept call for a client failed\n");
 	return;
Index: xc/programs/xfwp/io.h
diff -u xc/programs/xfwp/io.h:1.1 xc/programs/xfwp/io.h:1.2
--- xc/programs/xfwp/io.h:1.1	Sat Nov 15 22:42:50 1997
+++ xc/programs/xfwp/io.h	Thu Jun 22 17:44:36 2000
@@ -1,16 +1,9 @@
-/* $TOG: io.h /main/3 1997/11/12 08:16:33 barstow $ */
+/* $TOG: io.h /main/4 1998/02/09 13:58:12 kaleb $ */
 /*
 
-Copyright "1986-1997 The Open Group All Rights Reserved
+Copyright "1986-1997, 1998  The Open Group 
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to use the Software without restriction,
-including, without limitation, the rights to copy, modify,
-merge, publish, distribute and sublicense the Software, to make,
-have made, license and distribute derivative works thereof, and
-to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+All Rights Reserved
 
 The above copyright notice and the following permission notice
 shall be included in all copies of the Software:
Index: xc/programs/xfwp/misc.h
diff -u xc/programs/xfwp/misc.h:1.1 xc/programs/xfwp/misc.h:1.2
--- xc/programs/xfwp/misc.h:1.1	Sat Nov 15 22:42:51 1997
+++ xc/programs/xfwp/misc.h	Thu Jun 22 17:44:36 2000
@@ -1,16 +1,9 @@
-/* $TOG: misc.h /main/4 1997/11/12 08:16:37 barstow $ */
+/* $TOG: misc.h /main/5 1998/02/09 13:58:22 kaleb $ */
 /*
 
-Copyright "1986-1997 The Open Group All Rights Reserved
+Copyright "1986-1997, 1998  The Open Group 
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to use the Software without restriction,
-including, without limitation, the rights to copy, modify,
-merge, publish, distribute and sublicense the Software, to make,
-have made, license and distribute derivative works thereof, and
-to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+All Rights Reserved
 
 The above copyright notice and the following permission notice
 shall be included in all copies of the Software:
Index: xc/programs/xfwp/transport.h
diff -u xc/programs/xfwp/transport.h:1.1 xc/programs/xfwp/transport.h:1.2
--- xc/programs/xfwp/transport.h:1.1	Sat Nov 15 22:42:52 1997
+++ xc/programs/xfwp/transport.h	Thu Jun 22 17:44:36 2000
@@ -1,16 +1,9 @@
-/* $TOG: transport.h /main/2 1997/11/12 08:16:42 barstow $ */
+/* $TOG: transport.h /main/3 1998/02/09 13:58:40 kaleb $ */
 /*
 
-Copyright "1986-1997 The Open Group All Rights Reserved
+Copyright "1986-1997, 1998  The Open Group 
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to use the Software without restriction,
-including, without limitation, the rights to copy, modify,
-merge, publish, distribute and sublicense the Software, to make,
-have made, license and distribute derivative works thereof, and
-to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+All Rights Reserved
 
 The above copyright notice and the following permission notice
 shall be included in all copies of the Software:
Index: xc/programs/xgc/lex.l
diff -u xc/programs/xgc/lex.l:1.2 xc/programs/xgc/lex.l:1.3
--- xc/programs/xgc/lex.l:1.2	Mon Feb 14 11:21:01 2000
+++ xc/programs/xgc/lex.l	Wed Apr  5 11:14:07 2000
@@ -1,5 +1,5 @@
 /* $XConsortium: lex.l,v 1.8 94/03/31 20:40:44 rws Exp $ */
-/* $XFree86: xc/programs/xgc/lex.l,v 1.2 2000/02/14 19:21:01 dawes Exp $ */
+/* $XFree86: xc/programs/xgc/lex.l,v 1.3 2000/04/05 18:14:07 dawes Exp $ */
 /*
 ** lex file for xgc syntax
 */
@@ -11,7 +11,7 @@
 #include <X11/X.h>
 #include "gram.h"
 #include "constants.h"
-#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT)
+#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__EMX__)
 int yylineno = 0;
 #endif
 %}
Index: xc/programs/xgc/tests.c
diff -u xc/programs/xgc/tests.c:1.2 xc/programs/xgc/tests.c:1.3
--- xc/programs/xgc/tests.c:1.2	Mon Feb 14 11:21:02 2000
+++ xc/programs/xgc/tests.c	Wed Apr  5 11:14:07 2000
@@ -1,6 +1,6 @@
 /*
 ** $XConsortium: tests.c,v 1.20 91/06/08 18:57:07 rws Exp $
-** $XFree86: xc/programs/xgc/tests.c,v 1.2 2000/02/14 19:21:02 dawes Exp $
+** $XFree86: xc/programs/xgc/tests.c,v 1.3 2000/04/05 18:14:07 dawes Exp $
 **
 */
 
@@ -56,8 +56,10 @@
 #if !defined(SYSV) && !defined(MINIX) && !defined(AMOEBA)
   static struct timeval starttime;  /* starting time for gettimeofday() */
   struct timeval endtime;           /* ending time for gettimeofday() */
+#ifndef __EMX__
   static struct rusage startusage;  /* starting time for getrusage() */
   struct rusage endusage;           /* ending time for getrusage() */
+#endif
   struct timezone tz;               /* to make gettimeofday() happy */
 
   long elapsedtime;                 /* how long since we started the timer */
@@ -65,16 +67,21 @@
   switch (flag) {
     case StartTimer:                       /* store initial values */
       gettimeofday(&starttime,&tz);       
+#ifndef __EMX__
       getrusage(RUSAGE_SELF,&startusage);
+#endif
       return((long) NULL);
     case EndTimer:
       gettimeofday(&endtime,&tz);          /* store final values */
+#ifndef __EMX__
       getrusage(RUSAGE_SELF,&endusage);
+#endif
 
   /* all the following line does is use the formula 
      elapsed time = ending time - starting time, but there are three 
      different timers and two different units of time, ack... */
 
+#ifndef __EMX__
       elapsedtime = (long) ((long)
 	((endtime.tv_sec - endusage.ru_utime.tv_sec - endusage.ru_stime.tv_sec
 	 - starttime.tv_sec + startusage.ru_utime.tv_sec
@@ -82,6 +89,10 @@
       ((endtime.tv_usec - endusage.ru_utime.tv_usec - endusage.ru_stime.tv_usec
 	 - starttime.tv_usec + startusage.ru_utime.tv_usec
 	 + startusage.ru_stime.tv_usec));
+#else
+      elapsedtime = (long)( ((long)endtime.tv_sec-(long)starttime.tv_sec)*1000000
+			   +((long)endtime.tv_usec-(long)starttime.tv_usec));
+#endif
       return(elapsedtime);                
 
     default:                              
Index: xc/programs/xinit/xinit.c
diff -u xc/programs/xinit/xinit.c:3.21 xc/programs/xinit/xinit.c:3.22
--- xc/programs/xinit/xinit.c:3.21	Sun Jun 27 07:08:33 1999
+++ xc/programs/xinit/xinit.c	Wed Apr  5 11:14:08 2000
@@ -21,7 +21,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/xinit/xinit.c,v 3.21 1999/06/27 14:08:33 dawes Exp $ */
+/* $XFree86: xc/programs/xinit/xinit.c,v 3.22 2000/04/05 18:14:08 dawes Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/Xos.h>
@@ -502,13 +502,13 @@
 static int
 startServer(char *server[])
 {
-#if !defined(X_NOT_POSIX) && !defined(__EMX__)
+#if !defined(X_NOT_POSIX)
 	sigset_t mask, old;
 #else
 	int old;
 #endif
 
-#ifndef X_NOT_POSIX
+#if !defined(X_NOT_POSIX)
 	sigemptyset(&mask);
 	sigaddset(&mask, SIGUSR1);
 	sigprocmask(SIG_BLOCK, &mask, &old);
Index: xc/programs/xkbcomp/keycodes/xfree86
diff -u xc/programs/xkbcomp/keycodes/xfree86:3.10 xc/programs/xkbcomp/keycodes/xfree86:3.12
--- xc/programs/xkbcomp/keycodes/xfree86:3.10	Fri Feb 11 18:54:46 2000
+++ xc/programs/xkbcomp/keycodes/xfree86	Sat Jun 17 10:44:25 2000
@@ -1,5 +1,5 @@
 // $TOG: xfree86 /main/5 1997/08/02 10:11:05 kaleb $
-// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.10 2000/02/12 02:54:46 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.12 2000/06/17 17:44:25 dawes Exp $
 default xkb_keycodes "xfree86" {
 
     minimum= 8;
@@ -88,8 +88,10 @@
     <FK12> =  96;
 
     <PRSC> = 111;
+    <SYRQ> =  92;
     <SCLK> =  78;
     <PAUS> = 110;
+    <BRK>  = 114;
 
     <INS>  = 106;
     <HOME> =  97;
Index: xc/programs/xkbcomp/keymap/xfree86
diff -u xc/programs/xkbcomp/keymap/xfree86:3.11 xc/programs/xkbcomp/keymap/xfree86:3.12
--- xc/programs/xkbcomp/keymap/xfree86:3.11	Sun Aug 29 19:34:24 1999
+++ xc/programs/xkbcomp/keymap/xfree86	Thu Jun 15 13:50:04 2000
@@ -1,5 +1,5 @@
 // $TOG: xfree86 /main/13 1997/08/02 10:11:21 kaleb $
-// $XFree86: xc/programs/xkbcomp/keymap/xfree86,v 3.11 1999/08/30 02:34:24 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/xfree86,v 3.12 2000/06/15 20:50:04 dawes Exp $
 default xkb_keymap "us" {
     xkb_keycodes	{ include "xfree86"		};
     xkb_types		{ include "default"		};
@@ -97,6 +97,13 @@
     xkb_compatibility	{ include "default"		};
     xkb_symbols		{ include "en_US(pc105)+it"	};
     xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "mk" {
+    xkb_keycodes        { include "xfree86"                     };
+    xkb_types           { include "default"                     };
+    xkb_compatibility   { include "default"                     };
+    xkb_symbols         { include "en_US(pc105)+mk"             };
+    xkb_geometry        { include "pc(pc102)"                   };
 };
 xkb_keymap "no"	{
     xkb_keycodes	{ include "xfree86"		};
Index: xc/programs/xkbcomp/rules/Imakefile
diff -u xc/programs/xkbcomp/rules/Imakefile:3.1 xc/programs/xkbcomp/rules/Imakefile:3.2
--- xc/programs/xkbcomp/rules/Imakefile:3.1	Thu Dec 26 23:08:51 1996
+++ xc/programs/xkbcomp/rules/Imakefile	Thu May 18 16:21:43 2000
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/3 1996/09/13 10:59:07 kaleb $
 
-    DATAFILES = sgi xfree86
-    LISTFILES = sgi.lst xfree86.lst xfree86-it.lst
+    DATAFILES = sgi xfree86 sun
+    LISTFILES = sgi.lst xfree86.lst xfree86-it.lst sun.lst
 
 all::
 
Index: xc/programs/xkbcomp/rules/sun
diff -u /dev/null xc/programs/xkbcomp/rules/sun:3.1
--- /dev/null	Sat Jul  1 20:44:15 2000
+++ xc/programs/xkbcomp/rules/sun	Thu May 18 16:21:43 2000
@@ -0,0 +1,37 @@
+// $XFree86: xc/programs/xkbcomp/rules/sun,v 3.1 2000/05/18 23:21:43 dawes Exp $
+
+! model			=    keycodes			geometry
+  type4   		=    sun(type4)			sun(type4)
+  type5   		=    sun(type5)			sun
+  type5_euro		=    sun(type5_euro)		sun(type5euro)
+  type5_unix		=    sun(type5)			sun(type5unix)
+
+! model		layout	=  symbols
+  type4		us	=  sun/us(sun4)
+  type5		us	=  sun/us(sun5)
+  type5_unix	us	=  sun/us(sun5)
+  type4		en_US	=  sun/us(sun4)+iso9995-3(basic)
+  type5		en_US	=  sun/us(sun5)+iso9995-3(basic)
+  type5_unix	en_US	=  sun/us(sun5)+iso9995-3(basic)
+  type4		*	=  sun/us(sun4)+%l%(v)
+  type5		*	=  sun/us(sun5)+%l%(v)
+  type5_euro	*	=  sun/us(sun5)+%l%(v)
+
+! model   layout   =    compat     types
+  *       *        =    complete   complete
+
+! option                =   symbols
+  grp:switch            =   +group(switch)
+  grp:toggle            =   +group(toggle)
+  grp:shift_toggle      =   +group(shift_toggle)
+  grp:ctrl_shift_toggle =   +group(ctrl_shift_toggle)
+  grp:ctrl_alt_toggle   =   +group(ctrl_alt_toggle)
+  grp:caps_toggle	=   +group(caps_toggle)
+  ctrl:nocaps           =   +ctrl(nocaps)
+  ctrl:swapcaps         =   +ctrl(swapcaps)
+  ctrl:ctrl_ac          =   +ctrl(ctrl_ac)
+  ctrl:ctrl_aa          =   +ctrl(ctrl_aa)
+  keypad:overlay	=   +keypad(overlay)
+  keypad:overlay1	=   +keypad(overlay)
+  keypad:overlay2	=   +keypad(overlay)
+  lock:shift		=   +lock(shift)
Index: xc/programs/xkbcomp/rules/sun.lst
diff -u /dev/null xc/programs/xkbcomp/rules/sun.lst:3.1
--- /dev/null	Sat Jul  1 20:44:15 2000
+++ xc/programs/xkbcomp/rules/sun.lst	Thu May 18 16:21:43 2000
@@ -0,0 +1,58 @@
+// $XFree86: xc/programs/xkbcomp/rules/sun.lst,v 3.1 2000/05/18 23:21:43 dawes Exp $
+
+! model
+  type4			Sun Type4
+  type5			Sun Type5
+  type5_euro		Sun Type5 European
+  type5_unix		Sun Type5 Unix
+
+! layout
+  be			Belgian
+  bg			Bulgarian
+  ca			Canadian
+  cs			Czechoslovakian
+  de 			German
+  de_CH			Swiss German
+  dvorak		Dvorak (US)
+  dk			Danish
+  en_US			US/English w/ISO9995-3
+  es			Spanish
+  fi			Finnish
+  fr			French
+  fr_CH			Swiss French
+  gb			United Kingdom
+  hu			Hungarian
+  it			Italian
+  intl			US w/Compose Key
+  jp			Japanese
+  no			Norwegian
+  pl			Polish
+  pt			Portugese
+  ru			Russian
+  se			Swedish
+  th			Thai
+  us			US/ASCII
+
+! variant
+  nodeadkeys		Eliminate dead keys from European keyboards
+  typewriter		Cyrillic layout similar to manual typewriters
+  phonetic		Cyrillic layout similar to US/ASCII layout
+
+! option
+  grp			Group Shift/Lock behavior
+  grp:switch		Right Alt key switches group while held down
+  grp:toggle		Pressing Right Alt key toggles group
+  grp:shift_toggle	Pressing both shift keys together toggles group
+  grp:ctrl_shift_toggle	Pressing shift and control together toggles group
+  grp:ctrl_alt_toggle	Pressing alt and control together toggles group
+  grp:caps_toggle       Caps Lock key toggles group
+  ctrl			Control Key Position
+  ctrl:nocaps		Replace Caps Lock with another control key
+  ctrl:swapcaps		Swap positions of control and Caps Lock
+  ctrl:ctrl_ac		Control key is left of the 'A' key
+  ctrl:ctrl_aa		Control key is at the left of the bottom row
+  lock			Specify behavior of the lock key
+  lock:shift		Key is shift lock
+  lock:caps		Key is captals lock
+  lock:group		Key is group lock
+
Index: xc/programs/xkbcomp/rules/xfree86
diff -u xc/programs/xkbcomp/rules/xfree86:3.17 xc/programs/xkbcomp/rules/xfree86:3.18
--- xc/programs/xkbcomp/rules/xfree86:3.17	Sat Feb 12 19:42:42 2000
+++ xc/programs/xkbcomp/rules/xfree86	Fri Jun 16 17:27:34 2000
@@ -4,7 +4,7 @@
 //  Rules for resolving XKB components for use with XFree86
 //  Copyright 1996 by Joseph Moss
 //
-//  $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.17 2000/02/13 03:42:42 dawes Exp $
+//  $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.18 2000/06/17 00:27:34 dawes Exp $
 //
 
 ! model 	=	keycodes	geometry
@@ -78,6 +78,9 @@
   itouch	us	=	us(pc104)+inet(itouch)
   itouch	en_US	=	en_US(pc104)+inet(itouch)
   itouch	*	=	en_US(pc104)+inet(itouch)+%l%(v)
+  microsoftpro	us	=	us(pc104)+inet(microsoftpro)
+  microsoftpro	en_US	=	en_US(pc104)+inet(microsoftpro)
+  microsoftpro	*	=	en_US(pc104)+inet(microsoftpro)+%l%(v)
   *		us	=	us(pc101)
   *		en_US	=	en_US(pc101)
   *		intl	=	us(pc101compose)
Index: xc/programs/xkbcomp/rules/xfree86.lst
diff -u xc/programs/xkbcomp/rules/xfree86.lst:3.8 xc/programs/xkbcomp/rules/xfree86.lst:3.9
--- xc/programs/xkbcomp/rules/xfree86.lst:3.8	Sun Aug 29 19:34:26 1999
+++ xc/programs/xkbcomp/rules/xfree86.lst	Tue Apr  4 12:25:29 2000
@@ -4,7 +4,7 @@
 //  Rules descriptions for XFree86
 //  Copyright 1996 by Joseph Moss
 //
-//  $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.8 1999/08/30 02:34:26 dawes Exp $
+//  $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.9 2000/04/04 19:25:29 dawes Exp $
 
 ! model
   pc101		Generic 101-key PC
@@ -40,6 +40,7 @@
   hu		Hungarian
   it		Italian
   jp		Japanese
+  lt		Lithuanian
   no		Norwegian
   pl		Polish
   pt		Portugese
Index: xc/programs/xkbcomp/symbols/czsk
diff -u xc/programs/xkbcomp/symbols/czsk:1.2 xc/programs/xkbcomp/symbols/czsk:1.4
--- xc/programs/xkbcomp/symbols/czsk:1.2	Sun Aug 29 19:28:57 1999
+++ xc/programs/xkbcomp/symbols/czsk	Thu Jun 15 13:34:13 2000
@@ -1,6 +1,7 @@
 // Czech and Slovak keyboard symbols for XKB and PC keyboard
 //
 // (C) 1997,1999 Stanislav Meduna, stano@eunet.sk
+// (C) 2000  Kamil Toman, ktoman@email.cz
 //
 // Permission is granted to anyone to use, distribute and modify
 // this file in any way, provided that the above copyright notice
@@ -9,16 +10,14 @@
 //
 // This file is distributed without any expressed or implied warranty.
 //
-// $XFree86: xc/programs/xkbcomp/symbols/czsk,v 1.2 1999/08/30 02:28:57 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/czsk,v 1.4 2000/06/15 20:34:13 dawes Exp $
 
 partial default alphanumeric_keys 
 xkb_symbols "us_sk_qwerty" {
     Name[Group1] = "US/ASCII";
     Name[Group2] = "Slovak";
 
-    include "czsk(def_basic)"
-    include "czsk(def_us_czsk)"
-    include "czsk(def_us_sk_prog)"
+    include "czsk(def_qwerty)"
     include "czsk(def_us_sk)"
 };
 
@@ -27,17 +26,8 @@
     Name[Group1] = "US/ASCII";
     Name[Group2] = "Slovak";
 
-    include "czsk(us_sk_qwerty)"
     include "czsk(def_us_qwertz)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_sk_prog" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Slovak";
-
-    include "czsk(def_basic)"
-    include "czsk(def_us_sk_prog)"
+    include "czsk(def_us_sk)"
 };
 
 partial alphanumeric_keys 
@@ -45,9 +35,7 @@
     Name[Group1] = "Slovak";
     Name[Group2] = "US/ASCII";
 
-    include "czsk(def_basic)"
-    include "czsk(def_czsk_us)"
-    include "czsk(def_sk_us_prog)"
+    include "czsk(def_qwerty)"
     include "czsk(def_sk_us)"
 };
 
@@ -56,8 +44,18 @@
     Name[Group1] = "Slovak";
     Name[Group2] = "US/ASCII";
 
-    include "czsk(sk_us_qwerty)"
     include "czsk(def_qwertz_us)"
+    include "czsk(def_sk_us)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us_sk_prog" {
+    Name[Group1] = "US/ASCII";
+    Name[Group2] = "Slovak";
+
+    include "czsk(def_basic)"
+    include "czsk(def_qwerty)"
+    include "czsk(def_us_sk_prog)"
 };
 
 partial alphanumeric_keys 
@@ -66,6 +64,7 @@
     Name[Group2] = "US/ASCII";
 
     include "czsk(def_basic)"
+    include "czsk(def_qwerty)"
     include "czsk(def_sk_us_prog)"
 };
 
@@ -74,9 +73,7 @@
     Name[Group1] = "US/ASCII";
     Name[Group2] = "Czech";
 
-    include "czsk(def_basic)"
-    include "czsk(def_us_czsk)"
-    include "czsk(def_us_cz_prog)"
+    include "czsk(def_qwerty)"
     include "czsk(def_us_cz)"
 };
 
@@ -85,17 +82,8 @@
     Name[Group1] = "US/ASCII";
     Name[Group2] = "Czech";
 
-    include "czsk(us_cz_qwerty)"
     include "czsk(def_us_qwertz)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_cz_prog" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Czech";
-
-    include "czsk(def_basic)"
-    include "czsk(def_us_cz_prog)"
+    include "czsk(def_us_cz)"
 };
 
 partial alphanumeric_keys 
@@ -103,9 +91,7 @@
     Name[Group1] = "Czech";
     Name[Group2] = "US/ASCII";
 
-    include "czsk(def_basic)"
-    include "czsk(def_czsk_us)"
-    include "czsk(def_cz_us_prog)"
+    include "czsk(def_qwerty)"
     include "czsk(def_cz_us)"
 };
 
@@ -114,8 +100,18 @@
     Name[Group1] = "Czech";
     Name[Group2] = "US/ASCII";
 
-    include "czsk(cz_us_qwerty)"
     include "czsk(def_qwertz_us)"
+    include "czsk(def_cz_us)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us_cz_prog" {
+    Name[Group1] = "US/ASCII";
+    Name[Group2] = "Czech";
+
+    include "czsk(def_basic)"
+    include "czsk(def_qwerty)"
+    include "czsk(def_us_cz_prog)"
 };
 
 partial alphanumeric_keys 
@@ -124,26 +120,134 @@
     Name[Group2] = "US/ASCII";
 
     include "czsk(def_basic)"
+    include "czsk(def_qwerty)"
     include "czsk(def_cz_us_prog)"
 };
 
+partial alphanumeric_keys 
+xkb_symbols "def_us_sk" {
+    include "czsk(def_basic)"
+    include "czsk(def_us_czsk)"
+    include "czsk(def_us_sk_prog)"
+    include "czsk(def_us_sk_rp)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "def_sk_us" {
+    include "czsk(def_basic)"
+    include "czsk(def_czsk_us)"
+    include "czsk(def_sk_us_prog)"
+    include "czsk(def_sk_us_rp)"
+};
 
+partial alphanumeric_keys 
+xkb_symbols "def_us_cz" {
+    include "czsk(def_basic)"
+    include "czsk(def_us_czsk)"
+    include "czsk(def_us_cz_prog)"
+    include "czsk(def_us_cz_rp)"
+};
 
+partial alphanumeric_keys 
+xkb_symbols "def_cz_us" {
+    include "czsk(def_basic)"
+    include "czsk(def_czsk_us)"
+    include "czsk(def_cz_us_prog)"
+    include "czsk(def_cz_us_rp)"
+};
 
 partial alphanumeric_keys 
 xkb_symbols "def_basic" {
 
-    // Describes the differences between a very simple us
-    // keyboard and a very simple Slovak keybaord
-
-    include "us(pc102)"
     include "group(shift_toggle)"
 
-    //   key <RCTL> {	[ Multi_key				]	};
-    key <PAUS> {	[ Multi_key				]	};
-    key <RALT> {	[ Mode_switch				]	};
-    key <SCLK> {	[ ISO_Next_Group, 	ISO_Next_Group	]	};
-
+    // Alphanumeric keys identical to US
+    key <ESC>  {	[ Escape			],
+                        [ Escape			]       };
+
+    key <BKSP> {	[ 	BackSpace		],
+                        [      	BackSpace		]	};
+    key <TLDE> { [           grave,     asciitilde      ],       
+	         [           grave,     asciitilde	]	};
+
+
+    key  <TAB> {	[ 	Tab,	ISO_Left_Tab	],
+                        [ 	Tab,	ISO_Left_Tab	]       };
+    key <AD01> {	[	  q,	Q 		],
+                        [	  q,	Q 		]       };
+    key <AD02> {	[	  w,	W		],
+                        [	  w,	W		]       };
+    key <AD03> {	[	  e,	E		],
+                        [	  e,	E		]       };
+    key <AD04> {	[	  r,	R		],
+                        [	  r,	R		]       };
+    key <AD05> {	[	  t,	T		],
+                        [	  t,	T		]       };
+    key <AD07> {	[	  u,	U		],
+                        [	  u,	U		]       };
+    key <AD08> {	[	  i,	I		],
+                        [	  i,	I		]       };
+    key <AD09> {	[	  o,	O		],
+    			[	  o,    O		]	};
+    key <AD10> {	[	  p,	P		],
+                        [	  p,	P		]       };
+    key <RTRN> {	[ Return			],
+    			[ Return 			]	};
+
+    key <CAPS> {	[	Caps_Lock		],
+    			[	Caps_Lock		]	};
+    key <AC01> {	[	  a,	A 		],
+                        [	  a,	A 		]       };
+    key <AC02> {	[	  s,	S		],
+                        [	  s,	S		]       };
+    key <AC03> {	[	  d,	D		],
+                        [	  d,	D		]       };
+    key <AC04> {	[	  f,	F		],
+                        [	  f,	F		]       };
+    key <AC05> {	[	  g,	G		],
+                        [	  g,	G		]       };
+    key <AC06> {	[	  h,	H		],
+                        [	  h,	H		]       };
+    key <AC07> {	[	  j,	J		],
+                        [	  j,	J		]       };
+    key <AC08> {	[	  k,	K		],
+                        [	  k,	K		]       };
+    key <AC09> {	[	  l,	L		],
+                        [	  l,	L		]       };
+
+    key <LFSH> {	[ 	 Shift_L		],
+    			[	 Shift_L		]	};
+    key <AB02> {	[	  x,	X		],
+                        [	  x,	X		]       };
+    key <AB03> {	[	  c,	C		],
+                        [	  c,	C		]       };
+    key <AB04> {	[	  v,	V		],
+                        [	  v,	V		]       };
+    key <AB05> {	[	  b,	B		],
+                        [	  b,	B		]       };
+    key <AB06> {	[	  n,	N		],
+                        [	  n,	N		]       };
+    key <AB07> {	[	  m,	M		],
+                        [	  m,	M		]       };
+    key <BKSL> {	[ backslash,	bar		],
+                        [ backslash,	bar		]       };
+
+    key <LCTL> {	[ 	 Control_L		],
+    			[ 	 Control_L		]	};
+    key <SPCE> {	[ 	 space			],
+    			[ 	 space			]	};
+
+    key <LSGT> {	[      less,    greater		],
+                        [      less,    greater		]       };
+
+    key <LALT> {	[ 	Alt_L		],
+    			[ 	Meta_L		]	};
+    key <LWIN> {	[	Meta_L		],
+    			[	Meta_L		]	};
+    key <RWIN> {	[	Meta_R		],
+			[       Meta_R		]	};
+    key <MENU> {	[	Menu		],
+    			[	Menu		]	};
     // End alphanumeric section
 
     // begin modifier mappings
@@ -152,6 +256,120 @@
     modifier_map Lock   { Caps_Lock };
     modifier_map Control{ Control_L, Control_R };
     modifier_map Mod3   { Mode_switch };
+
+    // Begin "Function" section
+    key <FK01> {        [        F1             ],
+			[        F1             ]       };
+    key <FK02> {        [        F2             ],
+			[        F2             ]       };
+    key <FK03> {        [        F3             ],
+			[        F3             ]       };
+    key <FK04> {        [        F4             ],
+			[        F4             ]       };
+    key <FK05> {        [        F5             ],
+			[        F5             ]       };
+    key <FK06> {        [        F6             ],
+			[        F6             ]       };
+    key <FK07> {        [        F7             ],
+			[        F7             ]       };
+    key <FK08> {        [        F8             ],
+			[        F8             ]       };
+    key <FK09> {        [        F9             ],
+			[        F9             ]       };
+    key <FK10> {        [        F10            ],
+			[        F10            ]       };
+    key <FK11> {        [        F11            ],
+			[        F11            ]       };
+    key <FK12> {        [        F12            ],
+			[        F12            ]       };
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> {
+        type= "PC_SYSRQ",
+        symbols[Group1]= [ Print, Sys_Req ]
+    };
+
+    key <SYRQ> {
+        type= "PC_SYSRQ",
+        symbols[Group1]= [ Print, Sys_Req ]
+    };
+
+    key <BRK> {
+        type= "PC_BREAK",
+        symbols[Group1]= [ Pause, Break ]
+    };
+
+
+    key <PAUS> {	[ Multi_key				]	};
+    key <RALT> {        [ Mode_switch,  Multi_key       	]       };
+    key <SCLK> {	[ ISO_Next_Group, 	ISO_Next_Group	]	};
+
+    // Gray keys
+
+    key  <INS> { 	[  Insert             	],
+			[  Insert             	]       };
+    key <HOME> {        [  Home                 ],
+			[  Home                 ]       };
+    key <PGUP> {        [  Prior                ],
+			[  Prior                ]       };
+    key <DELE> {	[  Delete               ],
+			[  Delete               ]       };
+    key  <END> {        [  End                  ],
+			[  End                  ]       };
+    key <PGDN> {        [  Next                 ],
+			[  Next                 ]       };
+
+    // Cursor keys
+    key   <UP> {        [  Up                   ],
+			[  Up                   ]       };
+    key <LEFT> {        [  Left                 ],
+			[  Left                 ]       };
+    key <DOWN> {        [  Down                 ],
+			[  Down                 ]       };
+    key <RGHT> {        [  Right                ],
+			[  Right                ]       };
+
+
+    // Keypad keys
+    key <NMLK> {        [  Num_Lock, Pointer_EnableKeys         ],
+			[  Num_Lock, Pointer_EnableKeys         ]};
+    key <KPDV> {        [  KP_Divide            ],
+			[  KP_Divide            ]       };
+    key <KPMU> {        [  KP_Multiply          ],
+			[  KP_Multiply          ]       };
+    key <KPSU> {        [  KP_Subtract          ],
+			[  KP_Subtract          ]       };
+
+    key  <KP7> {        [  KP_Home,     KP_7    ],
+			[  KP_Home,     KP_7    ]       };
+    key  <KP8> {        [  KP_Up,       KP_8    ],
+			[  KP_Up,       KP_8    ]       };
+    key  <KP9> {        [  KP_Prior,    KP_9    ],
+			[  KP_Prior,    KP_9    ]       };
+    key <KPAD> {        [       KP_Add          ],
+			[       KP_Add          ]       };
+
+    key  <KP4> {        [  KP_Left,     KP_4    ],
+			[  KP_Left,     KP_4    ]       };
+    key  <KP5> {        [  KP_Begin,    KP_5    ],
+			[  KP_Begin,    KP_5    ]       };
+    key  <KP6> {        [  KP_Right,    KP_6    ],
+			[  KP_Right,    KP_6    ]       };
+
+    key  <KP1> {        [  KP_End,      KP_1    ],
+			[  KP_End,      KP_1    ]       };
+    key  <KP2> {        [  KP_Down,     KP_2    ],
+			[  KP_Down,     KP_2    ]       };
+    key  <KP3> {        [  KP_Next,     KP_3    ],
+			[  KP_Next,     KP_3    ]       };
+    key <KPEN> {        [       KP_Enter        ],
+			[       KP_Enter        ]       };
+
+    key  <KP0> {        [  KP_Insert,   KP_0    ],
+			[  KP_Insert,   KP_0    ]       };
+    key <KPDL> {        [  KP_Delete, KP_Decimal ],
+			[  KP_Delete, KP_Decimal ]      };
 };
 
 partial alphanumeric_keys 
@@ -183,7 +401,35 @@
 };
 
 partial alphanumeric_keys 
-xkb_symbols "def_sk_us" {
+xkb_symbols "def_us_czsk" {
+    key <AE11> {
+	[           minus,     underscore	],
+	[	    equal,        percent	]
+	};
+    key <AD11> {
+	[     bracketleft,      braceleft	],
+	[	   uacute,          slash	]
+	};
+    key <AC11> {
+	[      apostrophe,       quotedbl	],
+	[	  section,         exclam	]
+	};
+    key <AB08> {
+	[	    comma,	     less	],
+	[	    comma,	 question	]
+	};
+    key <AB09> {
+	[	   period,	  greater	],
+	[	   period,	    colon	]
+	};
+    key <AB10> {
+	[	    slash,	 question	],
+	[	    minus,     underscore	]
+	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "def_sk_us_rp" {
     key <AC10> {
 	[     ocircumflex,       quotedbl	],
 	[       semicolon,	    colon	]
@@ -199,7 +445,7 @@
 };
 
 partial alphanumeric_keys 
-xkb_symbols "def_cz_us" {
+xkb_symbols "def_cz_us_rp" {
     key <AC10> {
 	[           uring,       quotedbl	],
 	[       semicolon,	    colon	]
@@ -215,35 +461,7 @@
 };
 
 partial alphanumeric_keys 
-xkb_symbols "def_us_czsk" {
-    key <AE11> {
-	[           minus,     underscore	],
-	[	    equal,        percent	]
-	};
-    key <AD11> {
-	[     bracketleft,      braceleft	],
-	[	   uacute,          slash	]
-	};
-    key <AC11> {
-	[      apostrophe,       quotedbl	],
-	[	  section,         exclam	]
-	};
-    key <AB08> {
-	[	    comma,	     less	],
-	[	    comma,	 question	]
-	};
-    key <AB09> {
-	[	   period,	  greater	],
-	[	   period,	    colon	]
-	};
-    key <AB10> {
-	[	    slash,	 question	],
-	[	    minus,     underscore	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_sk" {
+xkb_symbols "def_us_sk_rp" {
     key <AC10> {
 	[       semicolon,	    colon	],
 	[     ocircumflex,       quotedbl	]
@@ -259,7 +477,7 @@
 };
 
 partial alphanumeric_keys 
-xkb_symbols "def_us_cz" {
+xkb_symbols "def_us_cz_rp" {
     key <AC10> {
 	[       semicolon,	    colon	],
 	[           uring,       quotedbl	]
@@ -299,10 +517,22 @@
 };
 
 partial alphanumeric_keys 
+xkb_symbols "def_qwerty" {
+    key <AD06> {
+	[               y,	        Y	],
+	[               y,              Y	]
+	};
+    key <AB01> {
+	[               z,	        Z	],
+	[               z,              Z	]
+	};
+};
+
+partial alphanumeric_keys 
 xkb_symbols "def_us_sk_prog" {
     key <TLDE> {
 	[           grave,     asciitilde	],
-        [  dead_diaeresis,dead_circumflex       ]        
+        [  dead_diaeresis,     semicolon        ]        
 	};
     key <AE01> {
 	[		1,	   exclam	],
@@ -354,7 +584,7 @@
 xkb_symbols "def_us_cz_prog" {
     key <TLDE> {
 	[           grave,     asciitilde	],
-        [  dead_diaeresis, dead_abovering       ]        
+        [  dead_diaeresis,     semicolon        ]        
 	};
     key <AE01> {
 	[		1,	   exclam	],
@@ -405,7 +635,7 @@
 partial alphanumeric_keys 
 xkb_symbols "def_sk_us_prog" {
     key <TLDE> {
-        [  dead_diaeresis,dead_circumflex       ],
+        [  dead_diaeresis,      semicolon       ],
 	[           grave,     asciitilde	]
 	};
     key <AE01> {
@@ -457,7 +687,7 @@
 partial alphanumeric_keys 
 xkb_symbols "def_cz_us_prog" {
     key <TLDE> {
-        [  dead_diaeresis, dead_abovering       ],       
+        [  dead_diaeresis,     semicolon        ],       
 	[           grave,     asciitilde	]
 	};
     key <AE01> {
Index: xc/programs/xkbcomp/symbols/inet
diff -u xc/programs/xkbcomp/symbols/inet:1.4 xc/programs/xkbcomp/symbols/inet:1.5
--- xc/programs/xkbcomp/symbols/inet:1.4	Thu Feb 10 14:33:46 2000
+++ xc/programs/xkbcomp/symbols/inet	Fri Jun 16 17:27:35 2000
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.4 2000/02/10 22:33:46 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.5 2000/06/17 00:27:35 dawes Exp $
 
 partial alphanumeric_keys 
 xkb_symbols "hp" {
@@ -21,19 +21,18 @@
 
     name[Group1]= "Compaq";
     key <I1E>	{	[ XF86Mail		]	};
-    key <I23>	{	[ XF86HomePage		]	};
+    key <I23>	{	[ Help			]	};
     key <I21>	{	[ XF86Search		]	};
-    // Don't have the correct keysyms for these yet.
-    // key <I25>	{	[ XF86CompaqQ		]	};
-    // key <I26>	{	[ XF86People		]	};
-    // key <I12>	{	[ XF86LightBulb		]	};
-    // key <I32>	{	[ XF86Shop		]	};
+    key <I25>	{	[ XF86VendorHome	]	};
+    key <I26>	{	[ XF86HomePage		]	};
+    key <I12>	{	[ XF86LightBulb		]	};
+    key <I32>	{	[ XF86Shop		]	};
 };
 
 partial alphanumeric_keys 
 xkb_symbols "itouch" {
 
-    // Describes the extra keys on an Logitech iTouch keyboard.
+    // Describes the extra keys on a Logitech iTouch keyboard.
 
     name[Group1]= "iTouch";
     key <I5F>	{	[ XF86Standby		]	};
@@ -48,6 +47,33 @@
     key <I6C>	{	[ XF86Mail		]	};
     key <I65>	{	[ XF86Search		]	};
     key <I66>	{	[ XF86Start		]	};
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "microsoftpro" {
+
+    // Describes the extra keys on a Microsoft Natrual Keyboard Pro
+
+    name[Group1]= "MicrosoftPro";
+    key <I6A>	{	[ XF86Back		]	};
+    key <I69>	{	[ XF86Forward		]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I67>	{	[ XF86Refresh		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I20>	{	[ XF86AudioMute		]	};
+    key <I2E>	{	[ XF86AudioLowerVolume	]	};
+    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    key <I22>	{	[ XF86AudioPlay, XF86AudioPause		]	};
+    key <I24>	{	[ XF86AudioStop		]	};
+    key <I10>	{	[ XF86AudioPrev		]	};
+    key <I19>	{	[ XF86AudioNext		]	};
+    key <I6D>	{	[ XF86AudioMedia	]	};
+    key <I6B>	{	[ XF86MyComputer	]	};
+    key <I5F>	{	[ XF86Standby		]	};
 };
 
 
Index: xc/programs/xkbcomp/symbols/jp
diff -u xc/programs/xkbcomp/symbols/jp:3.4 xc/programs/xkbcomp/symbols/jp:3.5
--- xc/programs/xkbcomp/symbols/jp:3.4	Sun Oct 26 05:25:39 1997
+++ xc/programs/xkbcomp/symbols/jp	Thu Jun 15 13:34:14 2000
@@ -2,7 +2,7 @@
 
 
 
-// $XFree86: xc/programs/xkbcomp/symbols/jp,v 3.4 1997/10/26 13:25:39 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/jp,v 3.5 2000/06/15 20:34:14 dawes Exp $
 //
 // symbols for a Japanese 106 keyboard(by tsuka@kawalab.dnj.ynu.ac.jp)
 default xkb_symbols "jp106" {
@@ -101,8 +101,16 @@
 	type= "PC_SYSRQ",
 	symbols[Group1]= [ Print, Execute ]
     };
+    key <SYRQ> {
+	type= "PC_SYSRQ",
+	symbols[Group1]= [ Print, Execute ]
+    };
     key <SCLK> {  [  Scroll_Lock	]	};
     key <PAUS> {
+	type= "PC_BREAK",
+	symbols[Group1]= [ Pause, Break ]
+    };
+    key <BRK> {
 	type= "PC_BREAK",
 	symbols[Group1]= [ Pause, Break ]
     };
Index: xc/programs/xkbcomp/symbols/lt
diff -u xc/programs/xkbcomp/symbols/lt:1.1 xc/programs/xkbcomp/symbols/lt:1.2
--- xc/programs/xkbcomp/symbols/lt:1.1	Sat Jan 10 19:48:34 1998
+++ xc/programs/xkbcomp/symbols/lt	Tue Apr  4 12:25:29 2000
@@ -1,21 +1,35 @@
-// $XFree86: xc/programs/xkbcomp/symbols/lt,v 1.1 1998/01/11 03:48:34 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/lt,v 1.2 2000/04/04 19:25:29 dawes Exp $
 
 partial alphanumeric_keys modifier_keys 
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
     // keyboard and a very simple Lithuanian keyboard
-    // Usage: put this in `XF86Config' file and remove other Xkb* commands:
-    //     Xkbkeycodes "xfree86"
-    //     XkbTypes    "default"
-    //     XkbCompat   "default"
-    //     XkbSymbols  "en_US(pc102)+lt(pc102)+group(ctrl_shift_toggle)"
-    //     XkbGeometry "pc"
-    // or preferably, use:
-    //     XkbModel    "pc102"
-    //     XkbLayout   "lt"
-    //     XkbOptions  "grp:ctrl_shift_toggle"
-
+    // Ri�ardas Čepas <rch@richard.eu.org>
+    //  Usage: put these commands in `XF86Config' file
+    // and remove other Xkb* commands:
+
+    // # XFree86 4.x syntax:
+    //  Section "InputDevice"
+    //  	Identifier  "Keyboard0"
+    //  	Driver      "keyboard"
+    //  	Option	"XkbRules"        "xfree86"
+    //  	Option	"XkbModel"        "pc102"
+    //   # +lt(left_switch) turns key between left ctrl and shift on "German" keyboards into AltGr
+    //  	Option	"XkbLayout"       "lt+lt(left_switch)"
+    //  	Option	"XkbOptions"      "grp:shift_toggle"
+    //  EndSection
+    //
+    // # XFree86 3.x syntax:
+    //  Section "Keyboard"
+    //...
+    //     XkbRules        "xfree86"
+    //     XkbModel        "pc102"
+    // # +lt(left_switch) turns key between left ctrl and shift on "German" keyboards into AltGr
+    //     XkbLayout       "lt+lt(left_switch)"
+    //     XkbOptions      "grp:ctrl_shift_toggle"
+    //  EndSection
+    //  
     name[Group1]= "US/ASCII";
     name[Group2]= "Lithuanian";
 
@@ -91,7 +105,6 @@
 
 xkb_symbols "generic101" {
     include "lt(basic)"
-    include "lt(function)"
 };
 
 xkb_symbols "pc101" {
@@ -119,24 +132,6 @@
     include "lt(basic)" // for consistent naming
 };
 
-// "extra" function keys.
-xkb_symbols "function" {
-    // Begin "Function" section
-    key <FK01> {	[ 	 F1,		F11		]	};
-    key <FK02> {	[	 F2,		F12		]	};
-    key <FK03> {	[	 F3,		F13		]	};
-    key <FK04> {	[	 F4,		F14		]	};
-    key <FK05> {	[	 F5,		F15		]	};
-    key <FK06> {	[	 F6,		F16		]	};
-    key <FK07> {	[	 F7,		F17		]	};
-    key <FK08> {	[	 F8,		F18		]	};
-    key <FK09> {	[        F9,		F19		]	};
-    key <FK10> {	[        F10,		F20		]	};
-    key <FK11> {	[        F11,		F21		]	};
-    key <FK12> {	[ 	 F12,		F22		]	};
-    // End "Function" section
-};
-
 // definition for the extra key on 102-key keyboards
 // between left Control and Alt
 xkb_symbols "left_switch" {
@@ -145,4 +140,7 @@
     // Begin modifier mappings 
     modifier_map Mod3   { Mode_switch };
 };
+
+
+
 
Index: xc/programs/xkbcomp/symbols/mk
diff -u /dev/null xc/programs/xkbcomp/symbols/mk:3.1
--- /dev/null	Sat Jul  1 20:44:17 2000
+++ xc/programs/xkbcomp/symbols/mk	Thu Jun 15 13:34:14 2000
@@ -0,0 +1,120 @@
+// Author: Damjan Georgievski <gdamjan@freemail.org.mk>
+// usage: xkbcomp mk.xkb :0
+//
+// shift-leftALT and win95 menu key  toggles cyrillic/latin
+// rightALT and win95 start keys  temporarily alternate
+//
+// $XFree86: xc/programs/xkbcomp/symbols/mk,v 3.1 2000/06/15 20:34:14 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols         { 
+
+    name[Group1]= "US/ASCII";
+    name[Group2]= "Macedonian";
+
+    modifier_map Mod3 { Mode_switch };
+    key <CAPS> {        [           Caps_Lock 		     	]	};	
+    key <MENU> {	[ 		ISO_Next_Group		]	};
+    key <RWIN> {	[		Mode_switch		]	};
+    key <LWIN> {	[		Mode_switch		]	};
+    key <LALT> {	[	    Alt_L,	ISO_Next_Group	]	};
+    key <RALT> {	[           	Mode_switch		]	};
+    key <SPCE> {        [               space                  	]      	};
+    key	<AE12> {	[	    equal,	      plus	],
+			[	    equal,	      plus	]	};
+    key	<AB09> {	[	   period,	   greater	],
+			[          period,           colon	]	};
+    key	<AB10> {	[	    slash,	  question	],
+			[	    slash,	  question	]	};
+    key	<AE11> {	[	    minus,	underscore	],
+			[	    minus,	underscore	]	};
+    key	<TLDE> {	[	    grave,	asciitilde	],
+			[	    grave,	asciitilde	]	};
+    key	<LSGT> {	[	     less,	   greater	],
+			[	     less,	   greater	]	};
+    key	<AE01> {	[		1,	    exclam	],
+			[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,		at	],
+			[		2,        	at	]	};
+    key	<AE03> {	[		3,	numbersign	],
+			[		3,      numbersign	]	};
+    key	<AE04> {	[		4,	    dollar	],
+			[		4,          dollar	]	};
+    key	<AE05> {	[		5,	   percent	],
+			[		5,	   percent	]	};
+    key	<AE06> {	[		6,     asciicircum	],
+			[		6,     asciicircum	]	};
+    key	<AE07> {	[		7,	 ampersand	],
+			[		7,	 ampersand	]	};
+    key	<AE08> {	[		8,	  asterisk	],
+			[		8,	  asterisk	]	};
+    key	<AE09> {	[		9,	 parenleft	],
+			[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	],
+			[		0,	parenright	]	};
+    key	<AB01> {	[		z,		 Z	],
+			[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AC02> {	[		s,		 S	],
+			[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AC01> {	[		a,		 A	],
+			[      Cyrillic_a,      Cyrillic_A	]	};
+    key	<AD01> {	[		q,		 Q	],
+			[    Cyrillic_lje,    Cyrillic_LJE	]	};
+    key	<AD02> {	[		w,		 W	],
+			[    Cyrillic_nje,    Cyrillic_NJE	]	};
+    key	<AB03> {	[		c,		 C	],
+			[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AB02> {	[		x,		 X	],
+			[   Cyrillic_dzhe,   Cyrillic_DZHE	]	};
+    key	<AC03> {	[		d,		 D	],
+			[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AD03> {	[		e,		 E	],
+			[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AB04> {	[		v,		 V	],
+			[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[		f,		 F	],
+			[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AD05> {	[		t,		 T	],
+			[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AD04> {	[		r,		 R	],
+			[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AB06> {	[		n,		 N	],
+			[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AB05> {	[		b,		 B	],
+			[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AC06> {	[		h,		 H	],
+			[     Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AC05> {	[		g,		 G	],
+			[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD06> {	[		y,		 Y	],
+			[   Macedonia_dse,   Macedonia_DSE	]	};
+    key	<AB07> {	[		m,		 M	],
+			[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AC07> {	[		j,		 J	],
+			[     Cyrillic_je,     Cyrillic_JE	]	};
+    key	<AD07> {	[		u,		 U	],
+			[      Cyrillic_u,      Cyrillic_U	]	};
+    key	<AB08> {	[	    comma,	      less	],
+			[	    comma,       semicolon	]	};
+    key	<AC08> {	[		k,		 K	],
+			[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD08> {	[		i,		 I	],
+			[      Cyrillic_i,      Cyrillic_I	]	};
+    key	<AD09> {	[		o,		 O	],
+			[      Cyrillic_o,      Cyrillic_O	]	};
+    key	<AC09> {	[		l,		 L	],
+			[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC10> {	[	semicolon,	     colon	],
+			[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AD10> {	[		p,		 P	],
+			[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC11> {	[      apostrophe,	  quotedbl	],
+			[   Macedonia_kje,   Macedonia_KJE	]	};
+    key	<AD11> {	[     bracketleft,	 braceleft	],
+			[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD12> {	[    bracketright,	braceright	],
+			[   Macedonia_gje,   Macedonia_GJE	]	};
+    key	<BKSL> {	[	backslash,	       bar	],
+			[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    };
+};
Index: xc/programs/xkbcomp/symbols/us
diff -u xc/programs/xkbcomp/symbols/us:3.6 xc/programs/xkbcomp/symbols/us:3.8
--- xc/programs/xkbcomp/symbols/us:3.6	Sat Jul  5 22:31:05 1997
+++ xc/programs/xkbcomp/symbols/us	Sat Jun 17 11:23:24 2000
@@ -6,6 +6,8 @@
 // uses the punctuation keys configurations common on PC 
 // keyboards (e.g. key <ABO9> is { [ period greater ] })
 
+// $XFree86: xc/programs/xkbcomp/symbols/us,v 3.8 2000/06/17 18:23:24 dawes Exp $
+
 partial hidden alphanumeric_keys modifier_keys 
 xkb_symbols "basic" {
 
@@ -107,11 +109,19 @@
 
     // Begin "Editing" section
     key <PRSC> {
+	type= "PC_SYSRQ",
+	symbols[Group1]= [ Print, Sys_Req ]
+    };
+    key <SYRQ> {
 	type= "PC_SYSRQ",
-	symbols[Group1]= [ Print, Execute ]
+	symbols[Group1]= [ Print, Sys_Req ]
     };
     key <SCLK> {  [  Scroll_Lock	]	};
     key <PAUS> {
+	type= "PC_BREAK",
+	symbols[Group1]= [ Pause, Break ]
+    };
+    key <BRK> {
 	type= "PC_BREAK",
 	symbols[Group1]= [ Pause, Break ]
     };
Index: xc/programs/xkbcomp/symbols/us_group3
diff -u xc/programs/xkbcomp/symbols/us_group3:1.1 xc/programs/xkbcomp/symbols/us_group3:1.2
--- xc/programs/xkbcomp/symbols/us_group3:1.1	Sat Dec 12 21:33:06 1998
+++ xc/programs/xkbcomp/symbols/us_group3	Thu Jun 15 13:34:15 2000
@@ -4,7 +4,7 @@
 // so that the US keyboard would show as Group 3 on the keymap.
 // I am reachable at eric_moreau@compuserve.com
 //
-// $XFree86: xc/programs/xkbcomp/symbols/us_group3,v 1.1 1998/12/13 05:33:06 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/us_group3,v 1.2 2000/06/15 20:34:15 dawes Exp $
 //
 // Original Header follows:
 //
@@ -120,8 +120,16 @@
 	type= "PC_SYSRQ",
 	symbols[Group3]= [], [], [ Print, Execute ]
     };
+    key <SYRQ> {
+	type= "PC_SYSRQ",
+	symbols[Group3]= [], [], [ Print, Execute ]
+    };
     key <SCLK> {  [], [], [  Scroll_Lock	]	};
     key <PAUS> {
+	type= "PC_BREAK",
+	symbols[Group3]= [], [], [ Pause, Break ]
+    };
+    key <BRK> {
 	type= "PC_BREAK",
 	symbols[Group3]= [], [], [ Pause, Break ]
     };
Index: xc/programs/xkbcomp/symbols/hp/us
diff -u xc/programs/xkbcomp/symbols/hp/us:1.1 xc/programs/xkbcomp/symbols/hp/us:1.2
--- xc/programs/xkbcomp/symbols/hp/us:1.1	Sat Nov 15 22:42:58 1997
+++ xc/programs/xkbcomp/symbols/hp/us	Thu Jun 22 17:44:37 2000
@@ -1,14 +1,8 @@
-// $TOG: us /main/2 1997/10/25 06:32:52 kaleb $
+// $TOG: us /main/3 1998/02/10 13:44:54 kaleb $
 //
-//Copyright (c) 1996  X Consortium
+//Copyright 1996, 1998  The Open Group
 //
-//Permission is hereby granted, free of charge, to any person obtaining
-//a copy of this software and associated documentation files (the
-//"Software"), to deal in the Software without restriction, including
-//without limitation the rights to use, copy, modify, merge, publish,
-//distribute, sublicense, and/or sell copies of the Software, and to
-//permit persons to whom the Software is furnished to do so, subject to
-//the following conditions:
+//All Rights Reserved.
 //
 //The above copyright notice and this permission notice shall be
 //included in all copies or substantial portions of the Software.
@@ -16,15 +10,15 @@
 //THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 //EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 //MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
 //OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 //ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 //OTHER DEALINGS IN THE SOFTWARE.
 //
-//Except as contained in this notice, the name of the X Consortium shall
+//Except as contained in this notice, the name of The Open Group shall
 //not be used in advertising or otherwise to promote the sale, use or
 //other dealings in this Software without prior written authorization
-//from the X Consortium.
+//from The Open Group.
 //
 // US/ASCII layout for a HP non-PC keyboard
 xkb_symbols "hil" {
Index: xc/programs/xkbcomp/symbols/sun/se
diff -u xc/programs/xkbcomp/symbols/sun/se:1.2 xc/programs/xkbcomp/symbols/sun/se:1.3
--- xc/programs/xkbcomp/symbols/sun/se:1.2	Sun Dec 20 01:40:28 1998
+++ xc/programs/xkbcomp/symbols/sun/se	Mon May 22 21:47:49 2000
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/sun/se,v 1.2 1998/12/20 09:40:28 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/sun/se,v 1.3 2000/05/23 04:47:49 dawes Exp $
 //
 // Swedish layout for a Type 5/5c Sun keyboard
 xkb_symbols "sun5" {
@@ -183,10 +183,11 @@
     // End "Keypad" section, 
 
     // Begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_L };
+    modifier_map Shift	{ Shift_R };
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod2	{ Num_Lock };
     modifier_map Mod3	{ Mode_switch };
-    modifier_map Mod4	{ Num_Lock };
+    modifier_map Mod4	{ Meta_L };
+    modifier_map Mod5	{ Meta_R };
     // End modifier mappings
 };
Index: xc/programs/xkbcomp/symbols/sun/us
diff -u xc/programs/xkbcomp/symbols/sun/us:1.1.1.4 xc/programs/xkbcomp/symbols/sun/us:1.2
--- xc/programs/xkbcomp/symbols/sun/us:1.1.1.4	Sun Sep 27 01:55:40 1998
+++ xc/programs/xkbcomp/symbols/sun/us	Mon May 22 21:47:49 2000
@@ -214,10 +214,11 @@
 
     // begin modifier mappings
     modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_L };
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod2	{ Num_Lock };
     modifier_map Mod3	{ Mode_switch };
-    modifier_map Mod4	{ Num_Lock };
+    modifier_map Mod4	{ Meta_L };
+    modifier_map Mod5	{ Meta_R };
 };
 
 // US/ASCII layout for a Type 5 Sun keyboard w/ broken OpenLook keymap
Index: xc/programs/xkbcomp/symbols/xfree68/amiga
diff -u xc/programs/xkbcomp/symbols/xfree68/amiga:1.1 xc/programs/xkbcomp/symbols/xfree68/amiga:1.2
--- xc/programs/xkbcomp/symbols/xfree68/amiga:1.1	Sun Oct 26 05:25:40 1997
+++ xc/programs/xkbcomp/symbols/xfree68/amiga	Thu Jun 22 17:44:37 2000
@@ -2,7 +2,7 @@
 
 
 
-// $XFree86: xc/programs/xkbcomp/symbols/xfree68/amiga,v 1.1 1997/10/26 13:25:40 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/xfree68/amiga,v 1.2 2000/06/23 00:44:37 dawes Exp $
 default xkb_symbols "usa1" {
 
     name[Group1]= "usa1";
@@ -80,11 +80,11 @@
     key <AB10> {	[ slash,	question	]	};
     key <RTSH> {	[	 Shift_R		]	};
 
-    key <LALT> {	[	 Alt_L		]	};
-    key <LAMI> {	[	 Meta_L		]	};
-    key <SPCE> {	[	 space		]	};
-    key <RAMI> {	[	 Meta_R		]	};
-    key <RALT> {	[	 Alt_R		]	};
+    key <LALT> {	[ Alt_L,	Meta_L 		]	};
+    key <LAMI>  {	[	 Mode_switch		]	};
+    key <SPCE> {	[	 space			]	};
+    key <RAMI>  {	[	 Multi_key		]	};
+    key <RALT> {	[ Alt_R,	Meta_R		]	};
     // End alphanumeric section
 
     // Begin "Editing" section
@@ -97,13 +97,10 @@
     // End "Editing" section
 
     // Begin "Keypad" section
-    key <KPLP> {	[	 parenleft		],
-			[	 Num_Lock		]	};
-    key <KPRP> {	[	 parenright		],
-			[	 Scroll_Lock		]	};
+    key <KPLP> {	[	 Num_Lock		]	};
+    key <KPRP> {	[	 Scroll_Lock		]	};
     key <KPDV> {	[	 KP_Divide		]	};
-    key <KPMU> {	[	 KP_Multiply		],
-			[	 Print			]	};
+    key <KPMU> {	[ KP_Multiply,	Print		]	};
 
     key <KP7>  {	[ KP_7,		KP_Home		]	};
     key <KP8>  {	[ KP_8,		KP_Up		]	};
@@ -121,173 +118,7 @@
 
     key <KP0>  {	[ KP_0,		KP_Insert	]	};
     key <KPDC> {	[ KP_Decimal,	KP_Delete	]	};
-    key <KPEN> {	[	  KP_Enter		]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod1	{ Alt_L, Alt_R };
-    modifier_map Mod2	{ Mode_switch };
-    modifier_map Mod3	{ Meta_L, Meta_R };
-};
-
-xkb_symbols "de" {
-
-    name[Group1]= "German";
-    key <ESC>  {	[	 Escape			]	};
-
-    // Begin "Function" section
-    key <FK01> {	[	 F1			]	};
-    key <FK02> {	[	 F2			]	};
-    key <FK03> {	[	 F3			]	};
-    key <FK04> {	[	 F4			]	};
-    key <FK05> {	[	 F5			]	};
-    key <FK06> {	[	 F6			]	};
-    key <FK07> {	[	 F7			]	};
-    key <FK08> {	[	 F8			]	};
-    key <FK09> {	[	 F9			]	};
-    key <FK10> {	[	 F10			]	};
-    // End "Function" section
-
-    // Alphanumeric section
-    key <TLDE> {	[ grave,	asciitilde	],
-			[	quoteleft		]	};
-    key <AE01> {	[	  1,	exclam 		],
-			[ onesuperior,	exclam		]	};
-    key <AE02> {	[	  2,	quotedbl	],
-			[        at,	twosuperior	]	};
-    key <AE03> {	[	  3,	paragraph	],
-			[ threesuperior, numbersign	]	};
-    key <AE04> {	[	  4,	dollar		],
-			[    degree,	cent		]	};
-    key <AE05> {	[	  5,	percent		],
-			[ onequarter,	percent		]	};
-    key <AE06> {	[	  6,	ampersand	],
-			[   onehalf,	asciicircum	]	};
-    key <AE07> {	[	  7,	slash		],
-			[ threequarters, ampersand	]	};
-    key <AE08> {	[	  8,	parenleft	],
-			[ periodcentered, asterisk	]	};
-    key <AE09> {	[	  9,	parenright	],
-			[ guillemotleft, parenleft	]	};
-    key <AE10> {	[	  0,	equal		],
-			[ guillemotright, parenright	]	};
-    key <AE11> {	[    ssharp,	question	],
-			[     minus,	underscore	]	};
-    key <AE12> {	[ quoteright,	quoteleft	],
-			[     equal,	plus		]	};
-    key <BKSL> {	[ backslash,	bar		]	};
-    key <BKSP> {	[	BackSpace		]	};
-
-    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
-    key <AD01> {	[	  q,	Q 		],
-			[     aring,	Aring		]	};
-    key <AD02> {	[	  w,	W		],
-			[    degree,	degree		]	};
-    key <AD03> {	[	  e,	E		],
-			[ copyright,	copyright	]	};
-    key <AD04> {	[	  r,	R		],
-			[ registered,	registered	]	};
-    key <AD05> {	[	  t,	T		],
-			[     thorn,	THORN		]	};
-    key <AD06> {	[	  z,	Z		],
-			[  currency,	yen		]	};
-    key <AD07> {	[	  u,	U		],
-			[        mu,	mu		]	};
-    key <AD08> {	[	  i,	I		],
-			[ exclamdown,	brokenbar	]	};
-    key <AD09> {	[	  o,	O		],
-			[    oslash,	Ooblique	]	};
-    key <AD10> {	[	  p,	P		],
-			[ paragraph,	paragraph	]	};
-    key <AD11> {	[ udiaeresis,	Udiaeresis	],
-			[ bracketleft,	braceleft	]	};
-    key <AD12> {	[      plus,	asterisk	],
-			[ bracketright,	braceright	]	};
-    key <RTRN> {	[	 Return			]	};
-
-    key <LCTL> {	[	 Control_L		]	};
-    key <CAPS> {	[	 Caps_Lock		]	};
-    key <AC01> {	[	  a,	A 		],
-			[        ae,	AE		]	};
-    key <AC02> {	[	  s,	S		],
-			[    ssharp,	section		]	};
-    key <AC03> {	[	  d,	D		],
-			[       eth,	ETH		]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC06> {	[	  h,	H		]	};
-    key <AC07> {	[	  j,	J		]	};
-    key <AC08> {	[	  k,	K		]	};
-    key <AC09> {	[	  l,	L		],
-			[  sterling,	sterling	]	};
-    key <AC10> {	[ odiaeresis,	Odiaeresis	],
-			[ semicolon,	colon		]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis	],
-			[ quoteright,	quotedbl	]	};
-    key <AC12> {	[ numbersign,	asciicircum	]	};
-
-    key <LFSH> {	[	 Shift_L		]	};
-    key <LSGT> {	[      less,	greater		]	};
-    key <AB01> {	[	  y,	Y 		]	};
-    key <AB02> {	[	  x,	X		]	};
-    key <AB03> {	[	  c,	C		]	};
-    key <AB04> {	[	  v,	V		]	};
-    key <AB05> {	[	  b,	B		]	};
-    key <AB06> {	[	  n,	N		]	};
-    key <AB07> {	[	  m,	M		]	};
-    key <AB08> {	[     comma,	semicolon	],
-			[     comma,	less		]	};
-    key <AB09> {	[    period,	colon		],
-			[    period,	greater		]	};
-    key <AB10> {	[     minus,	underscore	],
-			[     slash,	question	]	};
-    key <RTSH> {	[	 Shift_R		]	};
-
-    key <LALT> {	[	 Alt_L 		]	};
-    key <LAMI> {	[	 Meta_L		]	};
-    key <SPCE> {	[	 space		]	};
-    key <RAMI> {	[	 Meta_R		]	};
-    key <RALT> {	[	 Alt_R		]	};
-    // End alphanumeric section
-
-    // Begin "Editing" section
-    key <DELE> {	[	 Delete		]	};
-    key <HELP> {	[	 Help		]	};
-    key <UP>   {	[	 Up		]	};
-    key <LEFT> {	[	 Left		]	};
-    key <DOWN> {	[	 Down		]	};
-    key <RGHT> {	[	 Right		]	};
-    // End "Editing" section
-
-    // Begin "Keypad" section
-    key <KPLP> {	[ bracketleft,	braceleft	],
-			[	 Num_Lock		]	};
-    key <KPRP> {	[ bracketright,	braceright	],
-			[	 Scroll_Lock		]	};
-    key <KPDV> {	[	 KP_Divide		]	};
-    key <KPMU> {	[	 KP_Multiply		],
-			[	 Print			]	};
-
-    key <KP7>  {	[      KP_7,	KP_Home		]	};
-    key <KP8>  {	[      KP_8,	KP_Up		]	};
-    key <KP9>  {	[      KP_9,	KP_Prior	]	};
-    key <KPSU> {	[	 KP_Subtract		]	};
-
-    key <KP4>  {	[      KP_4,	KP_Left		]	};
-    key <KP5>  {	[	    KP_5		]	};
-    key <KP6>  {	[      KP_6,	KP_Right	]	};
-    key <KPAD> {	[	   KP_Add		]	};
-
-    key <KP1>  {	[      KP_1,	KP_End		]	};
-    key <KP2>  {	[      KP_2,	KP_Down		]	};
-    key <KP3>  {	[      KP_3,	KP_Next		]	};
-
-    key <KP0>  {	[      KP_0,	KP_Insert	]	};
-    key <KPDC> {	[ KP_Decimal,	KP_Delete	]	};
-    key <KPEN> {	[	  KP_Enter		]	};
+    key <KPEN> {	[	 KP_Enter	]	};
     // End "Keypad" section
 
     // begin modifier mappings
Index: xc/programs/xkbcomp/symbols/xfree68/ataritt
diff -u xc/programs/xkbcomp/symbols/xfree68/ataritt:1.1 xc/programs/xkbcomp/symbols/xfree68/ataritt:1.2
--- xc/programs/xkbcomp/symbols/xfree68/ataritt:1.1	Sun Oct 26 05:25:41 1997
+++ xc/programs/xkbcomp/symbols/xfree68/ataritt	Thu Jun 22 17:44:37 2000
@@ -2,7 +2,7 @@
 
 
 
-// $XFree86: xc/programs/xkbcomp/symbols/xfree68/ataritt,v 1.1 1997/10/26 13:25:41 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/xfree68/ataritt,v 1.2 2000/06/23 00:44:37 dawes Exp $
 default xkb_symbols "us" {
 
     name[Group1]= "US/ASCII";
Index: xc/programs/xload/Imakefile
diff -u xc/programs/xload/Imakefile:1.1 xc/programs/xload/Imakefile:1.3
--- xc/programs/xload/Imakefile:1.1	Sat Feb 12 19:26:31 2000
+++ xc/programs/xload/Imakefile	Thu Jun 15 13:50:05 2000
@@ -1,31 +1,21 @@
 XCOMM $XConsortium: Imakefile /main/30 1996/03/09 09:37:57 kaleb $
-XCOMM $XFree86: xc/programs/xload/Imakefile,v 1.1 2000/02/13 03:26:31 dawes Exp $
+XCOMM $XFree86: xc/programs/xload/Imakefile,v 1.3 2000/06/15 20:50:05 dawes Exp $
         DEPLIBS = XawClientDepLibs
 LOCAL_LIBRARIES = XawClientLibs
+
 #ifdef i386MachArchitecture
   SYS_LIBRARIES = -lsys
-#endif
-#ifdef SVR4Architecture
-#ifdef SGIArchitecture
+#elif defined(SGIArchitecture) && !defined(MipsN32Architecture)
   SYS_LIBRARIES = -lmld
-#else
-#ifdef SonyArchitecture
+#elif defined(SonyArchitecture)
   SYS_LIBRARIES = -lmld
-#else
-  SYS_LIBRARIES = -lelf
-#endif
-#endif
-#endif
-#if defined(SunArchitecture) && SystemV4
+#elif defined(SunArchitecture) && SystemV4
   SYS_LIBRARIES = -lkvm -lelf
-#endif
-#ifdef SGIArchitecture
-  SYS_LIBRARIES = -lmld
-#endif
-#ifdef OsfArchitecture
+#elif defined(SVR4Architecture)
+  SYS_LIBRARIES = -lelf
+#elif defined(OsfArchitecture)
   SYS_LIBRARIES = -lld
-#endif
-#if defined(i386BsdArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture)
+#elif defined(i386BsdArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture)
   SYS_LIBRARIES = -lutil -lkvm
 #endif
            SRCS = xload.c get_load.c
@@ -34,7 +24,7 @@
  OSMINORVERSION = OSMinorVersion
       DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) 
 
-AllTarget(xload)
+AllTarget(ProgramTargetName(xload))
 NormalProgramTarget(xload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
 
 #if defined(OSF1Architecture) || defined(NetBSDArchitecture) || (defined(FreeBSDArchitecture) && OSMajorVersion > 1) || defined(OpenBSDArchitecture)
Index: xc/programs/xload/get_load.c
diff -u xc/programs/xload/get_load.c:1.2 xc/programs/xload/get_load.c:1.3
--- xc/programs/xload/get_load.c:1.2	Mon Feb 21 10:05:49 2000
+++ xc/programs/xload/get_load.c	Wed Apr  5 11:14:09 2000
@@ -1,5 +1,5 @@
 /* $XConsortium: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */
-/* $XFree86: xc/programs/xload/get_load.c,v 1.2 2000/02/21 18:05:49 dawes Exp $ */
+/* $XFree86: xc/programs/xload/get_load.c,v 1.3 2000/04/05 18:14:09 dawes Exp $ */
 /*
 
 Copyright (c) 1989  X Consortium
@@ -51,7 +51,7 @@
 #ifndef macII
 #ifndef apollo
 #ifndef LOADSTUB
-#if !defined(linux) && !defined(AMOEBA)
+#if !defined(linux) && !defined(AMOEBA) && !defined(__EMX__)
 #include <nlist.h>
 #endif /* linux || AMOEBA */
 #endif /* LOADSTUB */
Index: xc/programs/xload/xload.c
diff -u xc/programs/xload/xload.c:1.1 xc/programs/xload/xload.c:1.2
--- xc/programs/xload/xload.c:1.1	Sat Feb 12 19:26:32 2000
+++ xc/programs/xload/xload.c	Thu May 11 11:14:45 2000
@@ -1,5 +1,5 @@
 /* $XConsortium: xload.c,v 1.37 94/04/17 20:43:44 converse Exp $ */
-/* $XFree86: xc/programs/xload/xload.c,v 1.1 2000/02/13 03:26:32 dawes Exp $ */
+/* $XFree86: xc/programs/xload/xload.c,v 1.2 2000/05/11 18:14:45 tsi Exp $ */
 /*
 
 Copyright (c) 1989  X Consortium
@@ -138,7 +138,8 @@
     exit(1);
 }
 
-void main(argc, argv)
+int
+main(argc, argv)
     int argc;
     char **argv;
 {
@@ -264,6 +265,8 @@
 			    	&wm_delete_window, 1);
     }
     XtAppMainLoop(app_con);
+
+    return 0;
 }
 
 static unsigned long	current_leds;
Index: xc/programs/xman/handler.c
diff -u xc/programs/xman/handler.c:1.4 xc/programs/xman/handler.c:1.5
--- xc/programs/xman/handler.c:1.4	Mon Mar  6 14:59:34 2000
+++ xc/programs/xman/handler.c	Tue Jun 13 16:15:53 2000
@@ -28,7 +28,7 @@
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/handler.c,v 1.4 2000/03/06 22:59:34 dawes Exp $ */
+/* $XFree86: xc/programs/xman/handler.c,v 1.5 2000/06/13 23:15:53 dawes Exp $ */
 
 /*
  * xman - X window system manual page display program.
@@ -186,7 +186,6 @@
     return;
 
   OpenFile(man_globals, file);
-  fclose(file);
 
   if (!man_globals->both_shown) {
     Arg arglist[1];
Index: xc/programs/xman/man.c
diff -u xc/programs/xman/man.c:1.3 xc/programs/xman/man.c:1.4
--- xc/programs/xman/man.c:1.3	Fri Mar  3 15:16:27 2000
+++ xc/programs/xman/man.c	Tue Jun 13 16:15:53 2000
@@ -28,7 +28,7 @@
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/man.c,v 1.3 2000/03/03 23:16:27 dawes Exp $ */
+/* $XFree86: xc/programs/xman/man.c,v 1.4 2000/06/13 23:15:53 dawes Exp $ */
 
 
 #include "globals.h"
@@ -94,21 +94,25 @@
  * SYSMANPATH and LOCALMANPATH.
  */
 
-  ptr = getenv("MANPATH");
-  if (ptr == NULL || streq(ptr , "") ) {
+  /* if MANPATH variable ends in ':'. So, should extend it's value to the
+   * default search path.
+   */
+
+  *manpath = '\0';
+  if ((ptr = getenv("MANPATH")) != NULL)
+    strcpy(manpath, ptr);
+  if (ptr == NULL || streq(ptr , "") || ptr[strlen(ptr) - 1] == ':') {
     lang = getenv("LANG");
 #ifdef MANCONF
-    if (!ReadManConfig(manpath))
+    if (!ReadManConfig(manpath + strlen(manpath)))
 #endif
     {
-      strcpy(manpath, SYSMANPATH);
+      strcat(manpath, SYSMANPATH);
 #ifdef LOCALMANPATH
       strcat(manpath, ":");
       strcat(manpath, LOCALMANPATH);
 #endif
     }
-  } else {
-    strcpy(manpath, ptr);
   }
 
 /*
@@ -188,6 +192,8 @@
  * realloc manual to be minimum space necessary.
  */
 
+  if (sect == 0)
+    PrintError("No manual pages found.");
   manual = (Manual *) XtRealloc( (char *) manual, (sizeof(Manual) * sect));
   if (manual == NULL) 
     PrintError("Could not allocate memory for manual sections.");
@@ -246,20 +252,28 @@
  *  Second step
  *
  *  Move items with duplicate labels right next to each other.
+ *
+ *  Changed to keep the order of the list entries unchanged.
  */
 
-  local = *list;
-  for ( local = *list ; local->next != NULL ; local = local->next) {
-    inner = local->next;
-    while ( inner != NULL) {
-      if ( streq(inner->label, local->label) && (inner != local->next)) {
-	last->next = inner->next; /* Move it to directly follow local. */
-	inner->next = local->next;
-	local->next = inner;
-	inner = last;		/* just so that we keep marching down the
-				   tree (this keeps us from looping). */
+  for (local = *list; local->next != NULL; local = local->next) {
+    head = local;
+    old = inner = local->next;
+    while (inner != NULL) {
+      if (streq(inner->label, local->label)) {
+	if (old != inner) {
+	  old->next = inner->next;
+	  last = inner->next;
+	  inner->next = head->next;
+	  head->next = inner;
+	  head = inner;
+	  old = inner = last;
+	  continue;
+	}
+	else
+	  head = inner;
       }
-      last = inner;
+      old = inner;
       inner = inner->next;
     }
   }
@@ -405,7 +419,7 @@
   register int nalloc;
   char full_name[BUFSIZ], *ptr;
 
-  if((dir = opendir(path)) == NULL) {	
+  if((dir = opendir(path)) == NULL) {
 #ifdef DEBUG
     sprintf(error_buf,"Can't open directory %s", path);
     PopupWarning(NULL, error_buf);
@@ -417,7 +431,7 @@
  * Remove the compression extension from the path name.
  */
 
-  if ( (ptr = rindex(path, '.')) != NULL) 
+  if ( (ptr = rindex(path, '.')) != NULL) {
 #if !defined(SCO) && !defined(ISC)
     if (streq(ptr + 1, COMPRESSION_EXTENSION)) 
 #else
@@ -428,6 +442,7 @@
     else if (streq(ptr + 1, GZIP_EXTENSION))
       *ptr = '\0';
 #endif
+  }
   
   nentries = local_manual->nentries;
   nalloc = local_manual->nalloc;
@@ -454,7 +469,7 @@
  * Remove the compression extension from the entry name.
  */
 
-    if ( (ptr = rindex(full_name, '.')) != NULL) 
+    if ( (ptr = rindex(full_name, '.')) != NULL) {
 #if !defined(SCO) && !defined(ISC)
       if (streq(ptr + 1, COMPRESSION_EXTENSION)) 
 #else
@@ -465,6 +480,7 @@
       else if (streq(ptr + 1, GZIP_EXTENSION))
 	*ptr = '\0';
 #endif
+    }
     local_manual->entries[nentries] = StrAlloc(full_name);
     local_manual->entries_less_paths[nentries] = 
       rindex(local_manual->entries[nentries], '/');
Index: xc/programs/xman/misc.c
diff -u xc/programs/xman/misc.c:1.3 xc/programs/xman/misc.c:1.4
--- xc/programs/xman/misc.c:1.3	Fri Mar  3 15:16:28 2000
+++ xc/programs/xman/misc.c	Tue Jun 13 16:15:53 2000
@@ -28,7 +28,7 @@
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/misc.c,v 1.3 2000/03/03 23:16:28 dawes Exp $ */
+/* $XFree86: xc/programs/xman/misc.c,v 1.4 2000/06/13 23:15:53 dawes Exp $ */
 
 /*
  * xman - X window system manual page display program.
@@ -184,7 +184,7 @@
   temp = CreateManpageName(entry, 0, 0);
   sprintf(man_globals->manpage_title, "The current manual page is: %s.", temp);
   XtFree(temp);
-  
+
   ParseEntry(entry, path, section, page);
 
 /*
@@ -364,13 +364,6 @@
   Position x,y;			/* location to pop up the
 				   "would you like to save" widget. */
 
-  Popup(XtParent(man_globals->standby), XtGrabExclusive);
-  while ( !XCheckTypedWindowEvent(XtDisplay(man_globals->standby), 
-				  XtWindow(man_globals->standby), 
-				  Expose, &event) );
-  XtDispatchEvent( &event );
-  XFlush(XtDisplay(man_globals->standby));
-
   if ( !UncompressUnformatted(man_globals, entry, filename) ) {
     /* We Really could not find it, this should never happen, yea right. */
     sprintf(error_buf, "Could not open manual page, %s", entry);
@@ -379,9 +372,45 @@
     return(NULL);
   }
 
+  if ((file = fopen(filename, "r")) != NULL) {
+    char line[BUFSIZ];
+
+    if (fgets(line, sizeof(line), file) != NULL) {
+	if (strncmp(line, ".so ", 4) == 0) {
+	  line[strlen(line) - 1] = '\0';
+	  fclose(file);
+	  unlink(filename);
+	  if (line[4] != '/') {
+	    char *ptr = NULL;
+
+	    strcpy(tmp, entry);
+	    if ((ptr = rindex(tmp, '/')) != NULL) {
+	      *ptr = '\0';
+	      if ((ptr = rindex(tmp, '/')) != NULL)
+		ptr[1] = '\0';
+	    }
+	  }
+	  else
+	    *tmp = '\0';
+	  sprintf(filename, "%s%s", tmp, line + 4);
+
+	  return (Format(man_globals, filename));
+	}
+    }
+    fclose(file);
+  }
+
+  Popup(XtParent(man_globals->standby), XtGrabExclusive);
+  while ( !XCheckTypedWindowEvent(XtDisplay(man_globals->standby), 
+				  XtWindow(man_globals->standby), 
+				  Expose, &event) );
+  XtDispatchEvent( &event );
+  XFlush(XtDisplay(man_globals->standby));
+
   strcpy(tmp,MANTEMP);		          /* Get a temp file. */
   (void) mktemp(tmp);
   strcpy(man_globals->tempfile, tmp);
+
   ParseEntry(entry, path, NULL, NULL);
 
   sprintf(cmdbuf,"cd %s ; %s %s %s > %s %s", path, TBL,
Index: xc/programs/xman/search.c
diff -u xc/programs/xman/search.c:1.3 xc/programs/xman/search.c:1.4
--- xc/programs/xman/search.c:1.3	Fri Mar  3 15:16:28 2000
+++ xc/programs/xman/search.c	Tue Jun 13 16:15:53 2000
@@ -28,7 +28,7 @@
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/search.c,v 1.3 2000/03/03 23:16:28 dawes Exp $ */
+/* $XFree86: xc/programs/xman/search.c,v 1.4 2000/06/13 23:15:53 dawes Exp $ */
 
 
 #include "globals.h"
@@ -149,7 +149,7 @@
 FILE *
 DoSearch(ManpageGlobals * man_globals, int type)
 {
-  char cmdbuf[BUFSIZ],*mantmp,*manpath;
+  char cmdbuf[BUFSIZ],*mantmp;
   char tmp[BUFSIZ],path[BUFSIZ];
   char string_buf[BUFSIZ], cmp_str[BUFSIZ], error_buf[BUFSIZ];
   char * search_string = SearchString(man_globals);
@@ -174,24 +174,6 @@
   strcpy(tmp, MANTEMP);		/* get a temp file. */
   (void) mktemp(tmp);
   mantmp = tmp;
-
-  /* set the command */
-
-  manpath=getenv("MANPATH");
-  if (manpath == NULL || streq(manpath,"") ) {
-#ifdef MANCONF
-    if (!ReadManConfig(path))
-#endif
-    {
-      strcpy(path,SYSMANPATH);
-#ifdef LOCALMANPATH
-      strcat(path,":");
-      strcat(path,LOCALMANPATH);
-#endif
-    }
-  } else {
-    strcpy(path,manpath);
-  }
 
   if (type == APROPOS) {
     char label[BUFSIZ];
Index: xc/programs/xrx/rx/XUrls.c
diff -u xc/programs/xrx/rx/XUrls.c:1.5 xc/programs/xrx/rx/XUrls.c:1.6
--- xc/programs/xrx/rx/XUrls.c:1.5	Sun Oct  4 02:41:53 1998
+++ xc/programs/xrx/rx/XUrls.c	Thu May 11 11:14:45 2000
@@ -22,6 +22,7 @@
 The Open Group.
 
 */
+/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.6 2000/05/11 18:14:45 tsi Exp $ */
 
 #include "RxI.h"
 #include <sys/utsname.h>
@@ -111,7 +112,7 @@
 
 	  if (rv != -1) {
 	    namelen = sizeof local;
-	    rv = getsockname (s, (struct sockaddr*) &local, &namelen);
+	    rv = getsockname (s, (struct sockaddr*) &local, (void *)&namelen);
 
 	    if (rv != -1) {
 	      hp = gethostbyaddr ((char*) &local.sin_addr.s_addr, 
Index: xc/programs/xset/xset.c
diff -u xc/programs/xset/xset.c:3.18 xc/programs/xset/xset.c:3.19
--- xc/programs/xset/xset.c:3.18	Sat Feb 12 22:15:47 2000
+++ xc/programs/xset/xset.c	Thu Apr 20 14:28:50 2000
@@ -23,7 +23,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/xset/xset.c,v 3.18 2000/02/13 06:15:47 dawes Exp $ */
+/* $XFree86: xc/programs/xset/xset.c,v 3.19 2000/04/20 21:28:50 tsi Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
@@ -131,6 +131,9 @@
 static void usage(char *fmt, ...);
 static void error(char *message);
 static int local_xerror(Display *dpy, XErrorEvent *rep);
+#ifdef XF86MISC
+static void set_repeatrate(Display *dpy, int delay, int rate);
+#endif
 
 int
 main(int argc, char *argv[])
Index: xc/programs/xterm/256colres.pl
diff -u xc/programs/xterm/256colres.pl:1.2 xc/programs/xterm/256colres.pl:1.5
--- xc/programs/xterm/256colres.pl:1.2	Thu Feb 10 10:57:34 2000
+++ xc/programs/xterm/256colres.pl	Fri Jun 16 17:27:35 2000
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
-# Author: Thomas Dickey <dickey@clark.net>
-# $XFree86: xc/programs/xterm/256colres.pl,v 1.2 2000/02/10 18:57:34 dawes Exp $
+#! /usr/bin/perl
+# Author: Thomas E. Dickey
+# $XFree86: xc/programs/xterm/256colres.pl,v 1.5 2000/06/17 00:27:35 dawes Exp $
 
 # Construct a header file defining default resources for the 256-color model
 # of xterm.  This is modeled after the 256colors2.pl script.
Index: xc/programs/xterm/88colres.pl
diff -u xc/programs/xterm/88colres.pl:1.2 xc/programs/xterm/88colres.pl:1.3
--- xc/programs/xterm/88colres.pl:1.2	Thu Feb 10 10:57:35 2000
+++ xc/programs/xterm/88colres.pl	Tue Jun 13 17:16:17 2000
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
-# Author: Steve Wall <swall@redcom.com>
-# $XFree86: xc/programs/xterm/88colres.pl,v 1.2 2000/02/10 18:57:35 dawes Exp $
+# Author: Steve Wall <steve_wall@redcom.com>
+# $XFree86: xc/programs/xterm/88colres.pl,v 1.3 2000/06/14 00:16:17 dawes Exp $
 # Made from 256colres.pl
 
 # Construct a header file defining default resources for the
Index: xc/programs/xterm/AAA_README_VMS.txt
diff -u xc/programs/xterm/AAA_README_VMS.txt:1.1 xc/programs/xterm/AAA_README_VMS.txt:1.2
--- xc/programs/xterm/AAA_README_VMS.txt:1.1	Tue Feb  8 09:19:26 2000
+++ xc/programs/xterm/AAA_README_VMS.txt	Mon Jun 12 19:28:37 2000
@@ -1,4 +1,4 @@
-http://www.clark.net/pub/dickey/xterm/xterm.html
+http://dickey.his.com/xterm/xterm.html
 
 Downloaded 1.22 variant (current Linux version) on 18-JAN-2000.
 
@@ -45,4 +45,4 @@
 Manager, sequence analysis facility, biology division, Caltech 
 
 
-$XFree86: xc/programs/xterm/AAA_README_VMS.txt,v 1.1 2000/02/08 17:19:26 dawes Exp $
+$XFree86: xc/programs/xterm/AAA_README_VMS.txt,v 1.2 2000/06/13 02:28:37 dawes Exp $
Index: xc/programs/xterm/INSTALL
diff -u xc/programs/xterm/INSTALL:3.20 xc/programs/xterm/INSTALL:3.21
--- xc/programs/xterm/INSTALL:3.20	Fri Mar  3 12:02:27 2000
+++ xc/programs/xterm/INSTALL	Mon Jun 12 19:28:37 2000
@@ -1,5 +1,5 @@
--- $XFree86: xc/programs/xterm/INSTALL,v 3.20 2000/03/03 20:02:27 dawes Exp $
--- Thomas E. Dickey <dickey@clark.net>
+-- $XFree86: xc/programs/xterm/INSTALL,v 3.21 2000/06/13 02:28:37 dawes Exp $
+-- Thomas E. Dickey
 
 Xterm is normally built as part of the X Windows source tree, using
 imake to generate a Makefile from Imakefile.  You can also use the
Index: xc/programs/xterm/MANIFEST
diff -u xc/programs/xterm/MANIFEST:1.3 xc/programs/xterm/MANIFEST:1.6
--- xc/programs/xterm/MANIFEST:1.3	Thu Feb 17 06:16:32 2000
+++ xc/programs/xterm/MANIFEST	Thu May 18 09:30:03 2000
@@ -1,4 +1,4 @@
-MANIFEST for xterm-128, version xterm-128
+MANIFEST for xterm-133, version xterm-133
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
@@ -102,4 +102,4 @@
 vttests/title.sh                test-script to show title of xterm in action
 
 
-$XFree86: xc/programs/xterm/MANIFEST,v 1.3 2000/02/17 14:16:32 dawes Exp $
+$XFree86: xc/programs/xterm/MANIFEST,v 1.6 2000/05/18 16:30:03 dawes Exp $
Index: xc/programs/xterm/Makefile.in
diff -u xc/programs/xterm/Makefile.in:3.28 xc/programs/xterm/Makefile.in:3.30
--- xc/programs/xterm/Makefile.in:3.28	Tue Feb  8 09:19:27 2000
+++ xc/programs/xterm/Makefile.in	Tue Jun 13 17:16:17 2000
@@ -1,5 +1,7 @@
-## $XFree86: xc/programs/xterm/Makefile.in,v 3.28 2000/02/08 17:19:27 dawes Exp $ ##
+## $XFree86: xc/programs/xterm/Makefile.in,v 3.30 2000/06/14 00:16:17 dawes Exp $ ##
 
+SHELL		= /bin/sh
+
 #### Start of system configuration section. ####
 
 srcdir		= @srcdir@
@@ -7,6 +9,7 @@
 
 CC		= @CC@
 CPP		= @CPP@
+AWK		= @AWK@
 LINK		= $(CC) $(CFLAGS)
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
@@ -20,8 +23,9 @@
 EXTRA_CFLAGS	= @EXTRA_CFLAGS@
 EXTRA_LOADFLAGS	= @IMAKE_LOADFLAGS@
 
-CPPFLAGS	= -I. -I$(srcdir) -DHAVE_CONFIG_H $(X_CFLAGS) $(IMAKE_CFLAGS)
+CPPFLAGS	= -I. -I$(srcdir) -DHAVE_CONFIG_H $(X_CFLAGS) $(IMAKE_CFLAGS) @CPPFLAGS@
 CFLAGS		= @CFLAGS@ $(EXTRA_CFLAGS)
+LDFLAGS		= @LDFLAGS@
 LIBS		= @LIBS@
 
 prefix		= @prefix@
@@ -35,12 +39,8 @@
 
 #### End of system configuration section. ####
 
-SHELL		= /bin/sh
 RM              = rm -f
-AWK		= awk
 
-LDFLAGS		=
-
 DESTDIR		=
 BINDIR		= $(DESTDIR)$(bindir)
 LIBDIR		= $(DESTDIR)$(libdir)
@@ -49,6 +49,7 @@
 
 INSTALL_DIRS    = $(BINDIR) $(APPSDIR) $(MANDIR)
 
+CLASS		= XTerm
 EXTRAHDR	= @EXTRAHDRS@
 EXTRASRC	= @EXTRASRCS@
 EXTRAOBJ	= @EXTRAOBJS@
@@ -106,16 +107,37 @@
 
 charproc.o : @CHARPROC_DEPS@
 
+install \
+install-bin \
+install-man \
 install-full \
-install :: $(INSTALL_DIRS) xterm resize
+install-dirs :: $(INSTALL_DIRS)
+
+install \
+install-bin \
+install-full :: xterm resize
 	$(srcdir)/sinstall.sh "$(INSTALL_PROGRAM)" xterm  @XTERM_PATH@ $(BINDIR)/xterm
 	$(INSTALL_PROGRAM) -s -m  755 resize $(BINDIR)/resize
+
+install \
+install-man \
+install-full ::
 	$(INSTALL_DATA) $(srcdir)/xterm.man    $(MANDIR)/xterm.$(manext)
 	$(INSTALL_DATA) $(srcdir)/resize.man   $(MANDIR)/resize.$(manext)
-	$(INSTALL_DATA) $(srcdir)/XTerm.ad     $(APPSDIR)/XTerm
-	$(INSTALL_DATA) $(srcdir)/XTerm-col.ad $(APPSDIR)/XTerm-color
-	@echo 'Completed installation of executables and documentation.'
+
+install \
+install-app \
+install-full ::
+	@echo installing $(APPSDIR)/$(CLASS)
+	@sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm.ad >XTerm.tmp
+	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)
+	@echo installing $(APPSDIR)/$(CLASS)-color
+	@sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm-col.ad >XTerm.tmp
+	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)-color
+	@rm -f XTerm.tmp
+
 install ::
+	@echo 'Completed installation of executables and documentation.'
 	@echo 'Use "make install-ti" to install terminfo description.'
 
 TERMINFO_DIR = @TERMINFO_DIR@
@@ -137,11 +159,11 @@
 	-$(RM) $(BINDIR)/resize
 	-$(RM) $(MANDIR)/xterm.$(manext)
 	-$(RM) $(MANDIR)/resize.$(manext)
-	-$(RM) $(APPSDIR)/XTerm
-	-$(RM) $(APPSDIR)/XTerm-color
+	-$(RM) $(APPSDIR)/$(CLASS)
+	-$(RM) $(APPSDIR)/$(CLASS)-color
 
 mostlyclean:
-	-$(RM) *.[ois] XtermLog.* .pure core *~ *.bak *.BAK *.out
+	-$(RM) *.[ois] XtermLog.* .pure core *~ *.bak *.BAK *.out *.tmp
 
 clean: mostlyclean
 	-$(RM) $(PROGRAMS)
Index: xc/programs/xterm/Tekproc.c
diff -u xc/programs/xterm/Tekproc.c:3.29 xc/programs/xterm/Tekproc.c:3.30
--- xc/programs/xterm/Tekproc.c:3.29	Tue Feb  8 09:19:27 2000
+++ xc/programs/xterm/Tekproc.c	Fri Mar 31 12:13:41 2000
@@ -1,6 +1,6 @@
 /*
  * $XConsortium: Tekproc.c /main/120 1996/11/29 10:33:20 swick $
- * $XFree86: xc/programs/xterm/Tekproc.c,v 3.29 2000/02/08 17:19:27 dawes Exp $
+ * $XFree86: xc/programs/xterm/Tekproc.c,v 3.30 2000/03/31 20:13:41 dawes Exp $
  *
  * Warning, there be crufty dragons here.
  */
@@ -79,9 +79,7 @@
 #include <error.h>
 #include <menu.h>
 
-#ifdef X_NOT_STDC_ENV
-extern time_t time ();
-#else
+#ifndef X_NOT_STDC_ENV
 #include <time.h>
 #endif
 
@@ -1732,11 +1730,9 @@
     if (!tekWidget)
 	return;
     if (reset) {
-/*	bzero ((char *)&curmodes, sizeof(Tmodes));	       */
 	bzero ((char *) &screen->cur, sizeof screen->cur);
     }
     TekRefresh = (TekLink *)0;
-/*    screen->cur = curmodes; */
     TekPage ();
     screen->cur_X = 0;
     screen->cur_Y = TEKHOME;
@@ -1747,40 +1743,28 @@
 void
 TekCopy(void)
 {
-	register TScreen *screen = &term->screen;
-	register struct tm *tp;
-	time_t l;
-	char buf[32];
-	int pid;
-#ifndef HAVE_WAITPID
-	int waited;
-	SIGNAL_T (*chldfunc) (int);
+    TScreen *screen = &term->screen;
 
-	chldfunc = signal(SIGCHLD, SIG_DFL);
-#endif
-#ifdef VMS
-	register int tekcopyfd;
-	register TekLink *Tp;
-	char initbuf[5];
-#endif /* VMS */
+    TekLink *Tp;
+    char buf[32];
+    char initbuf[5];
+    int tekcopyfd;
+
+    timestamp_filename(buf, "COPY");
+    if (access(buf, F_OK) >= 0
+     && access(buf, W_OK) < 0) {
+	Bell(XkbBI_MinorError,0);
+	return;
+    }
 
-	time(&l);
-	tp = localtime(&l);
-	/* VMS needs alternate format??? DRM */
-	sprintf(buf, "COPY%d-%02d-%02d.%02d:%02d:%02d", tp->tm_year + 1900,
-	 tp->tm_mon + 1, tp->tm_mday, tp->tm_hour, tp->tm_min, tp->tm_sec);
-	if(access(buf, F_OK) >= 0) {	/* file exists */
-		if(access(buf, W_OK) < 0) {
-			Bell(XkbBI_MinorError,0);
-			return;
-		}
-#ifdef VMS
+#ifndef VMS
+    if(access(".", W_OK) < 0) {	/* can't write in directory */
+	Bell(XkbBI_MinorError,0);
+	return;
+    }
+#endif
 
-	if((tekcopyfd = open(buf, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0) {
-		Bell(XkbBI_MinorError,0);
-		return;
-	}
-	chown(buf, screen->uid, screen->gid);
+    if ((tekcopyfd = open_userfile(screen->uid, screen->gid, buf, False)) >= 0) {
 	sprintf(initbuf, "%c%c%c%c",
 	    ESC, screen->page.fontsize + '8',
 	    ESC, screen->page.linetype + '`');
@@ -1791,57 +1775,5 @@
 	    Tp = Tp->next;
 	} while(Tp);
 	close(tekcopyfd);
-#else /* VMS */
-	} else if(access(".", W_OK) < 0) {	/* can't write in directory */
-		Bell(XkbBI_MinorError,0);
-		return;
-	}
-
-	/* Write the file in an unprivileged child process because
-	   using access before the open still leaves a small window
-	   of opportunity. */
-	pid = fork();
-
-	if (pid == 0) {			/* child */
-	    register int tekcopyfd;
-	    char initbuf[5];
-	    register TekLink *Tp;
-
-	    setgid(screen->gid);
-	    setuid(screen->uid);
-	    tekcopyfd = open(buf, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-	    if (tekcopyfd < 0)
-		_exit(1);
-	    sprintf(initbuf, "%c%c%c%c",
-		ESC, screen->page.fontsize + '8',
-		ESC, screen->page.linetype + '`');
-	    write(tekcopyfd, initbuf, 4);
-	    Tp = &Tek0;
-	    do {
-		write(tekcopyfd, (char *)Tp->data, Tp->count);
-		Tp = Tp->next;
-	    } while(Tp);
-	    close(tekcopyfd);
-	    _exit(0);
-	} else if (pid < 0) {	/* error */
-	    Bell(XkbBI_MinorError,0);
-	    return;
-	} else {		/* parent */
-#ifdef HAVE_WAITPID
-	    waitpid(pid, NULL, 0);
-#else
-	    waited = wait(NULL);
-	    signal(SIGCHLD, chldfunc);
-	    /*
-	      Since we had the signal handler uninstalled for a while,
-	      we might have missed the termination of our screen child.
-	      If we can check for this possibility without hanging, do so.
-	      */
-	    do
-		if (waited == term->screen.pid)
-		    Cleanup(0);
-	    while ( (waited=nonblocking_wait()) > 0);
-#endif
-#endif /* VMS */
-	}
+    }
 }
Index: xc/programs/xterm/VTPrsTbl.c
diff -u xc/programs/xterm/VTPrsTbl.c:3.21 xc/programs/xterm/VTPrsTbl.c:3.22
--- xc/programs/xterm/VTPrsTbl.c:3.21	Mon Jan 24 14:21:51 2000
+++ xc/programs/xterm/VTPrsTbl.c	Mon Jun 12 19:28:37 2000
@@ -1,11 +1,11 @@
 /*
  *	$XConsortium: VTPrsTbl.c,v 1.10 95/06/09 22:17:06 gildea Exp $
- *	$XFree86: xc/programs/xterm/VTPrsTbl.c,v 3.21 2000/01/24 22:21:51 dawes Exp $
+ *	$XFree86: xc/programs/xterm/VTPrsTbl.c,v 3.22 2000/06/13 02:28:37 dawes Exp $
  */
 
 /*
  *
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
Index: xc/programs/xterm/XTerm.ad
diff -u xc/programs/xterm/XTerm.ad:3.16 xc/programs/xterm/XTerm.ad:3.17
--- xc/programs/xterm/XTerm.ad:3.16	Fri Mar  3 12:02:28 2000
+++ xc/programs/xterm/XTerm.ad	Tue Jun 13 17:16:17 2000
@@ -3,7 +3,7 @@
 !
 !
 !
-! $XFree86: xc/programs/xterm/XTerm.ad,v 3.16 2000/03/03 20:02:28 dawes Exp $
+! $XFree86: xc/programs/xterm/XTerm.ad,v 3.17 2000/06/14 00:16:17 dawes Exp $
 
 XTerm.JoinSession:False
 
@@ -26,11 +26,11 @@
 *mainMenu*num-lock*Label: Alt/NumLock Modifiers
 *mainMenu*meta-esc*Label: Meta Sends Escape
 *mainMenu*delete-is-del*Label: Delete is DEL
-*mainMenu*old function-keys*Label: Old Function-Keys
-*mainMenu*sun function-keys*Label: Sun Function-Keys
-*mainMenu*sun keyboard*Label: VT220 Keyboard
-*mainMenu*hp function-keys*Label: HP Function-Keys
-*mainMenu*sco function-keys*Label: SCO Function-Keys
+*mainMenu*oldFunctionKeys*Label: Old Function-Keys
+*mainMenu*sunFunctionKeys*Label: Sun Function-Keys
+*mainMenu*sunKeyboard*Label: VT220 Keyboard
+*mainMenu*hpFunctionKeys*Label: HP Function-Keys
+*mainMenu*scoFunctionKeys*Label: SCO Function-Keys
 *mainMenu*suspend*Label:  Send STOP Signal
 *mainMenu*continue*Label:  Send CONT Signal
 *mainMenu*interrupt*Label:  Send INT Signal
Index: xc/programs/xterm/aclocal.m4
diff -u xc/programs/xterm/aclocal.m4:3.30 xc/programs/xterm/aclocal.m4:3.33
--- xc/programs/xterm/aclocal.m4:3.30	Fri Mar  3 12:02:28 2000
+++ xc/programs/xterm/aclocal.m4	Mon Jun 12 19:28:37 2000
@@ -1,12 +1,12 @@
 dnl
-dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.30 2000/03/03 20:02:28 dawes Exp $
+dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.33 2000/06/13 02:28:37 dawes Exp $
 dnl
 dnl ---------------------------------------------------------------------------
-dnl 
-dnl Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
-dnl 
+dnl
+dnl Copyright 1997-2000 by Thomas E. Dickey
+dnl
 dnl                         All Rights Reserved
-dnl 
+dnl
 dnl Permission to use, copy, modify, and distribute this software and its
 dnl documentation for any purpose and without fee is hereby granted,
 dnl provided that the above copyright notice appear in all copies and that
@@ -15,7 +15,7 @@
 dnl copyright holder(s) not be used in advertising or publicity pertaining
 dnl to distribution of the software without specific, written prior
 dnl permission.
-dnl 
+dnl
 dnl THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
 dnl TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 dnl AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
@@ -23,7 +23,7 @@
 dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl 
+dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
@@ -654,46 +654,27 @@
 ]
 )dnl
 dnl ---------------------------------------------------------------------------
-dnl Special test to workaround gcc 2.6.2, which cannot parse C-preprocessor
-dnl conditionals.
-dnl
-dnl AC_CHECK_HEADERS(termios.h unistd.h)
-dnl AC_CHECK_FUNCS(tcgetattr)
-dnl
-AC_DEFUN([CF_POSIX_VDISABLE],
+dnl Check for POSIX wait support
+AC_DEFUN([CF_POSIX_WAIT],
 [
-AC_MSG_CHECKING(if POSIX VDISABLE symbol should be used)
-AC_CACHE_VAL(cf_cv_posix_vdisable,[
-	AC_TRY_RUN([
-#if defined(HAVE_TERMIOS_H) && defined(HAVE_TCGETATTR)
-#include <termios.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if defined(_POSIX_VDISABLE)
-int main() { exit(_POSIX_VDISABLE == -1); }
-#endif],
-	[cf_cv_posix_vdisable=yes],
-	[cf_cv_posix_vdisable=no],
-	[AC_TRY_COMPILE([
-#if defined(HAVE_TERMIOS_H) && defined(HAVE_TCGETATTR)
-#include <termios.h>
+AC_REQUIRE([AC_HEADER_SYS_WAIT])
+AC_CACHE_CHECK(for POSIX wait functions,cf_cv_posix_wait,[
+AC_TRY_LINK([
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif],[
-#if defined(_POSIX_VDISABLE) && (_POSIX_VDISABLE != -1)
-int temp = _POSIX_VDISABLE;
-#else
-this did not work
-#endif],
-	[cf_cv_posix_vdisable=yes],
-	[cf_cv_posix_vdisable=no],
-	)])
+],[
+	int stat_loc;
+	pid_t pid = waitpid(-1, &stat_loc, WNOHANG|WUNTRACED);
+	pid_t pid2 = wait(&stat_loc);
+],
+[cf_cv_posix_wait=yes],
+[cf_cv_posix_wait=no])
 ])
-AC_MSG_RESULT($cf_cv_posix_vdisable)
-test $cf_cv_posix_vdisable = yes && AC_DEFINE(HAVE_POSIX_VDISABLE)
+test "$cf_cv_posix_wait" = yes && AC_DEFINE(USE_POSIX_WAIT)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl	On both Ultrix and CLIX, I find size_t defined in <stdio.h>
@@ -716,6 +697,62 @@
 test $cf_cv_type_size_t = no && AC_DEFINE(size_t, unsigned)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl Check if this is an SVR4 system.  We need the definition for xterm
+AC_DEFUN([CF_SVR4],
+[
+AC_CHECK_LIB(elf, elf_begin,[
+AC_CACHE_CHECK(if this is an SVR4 system, cf_cv_svr4,[
+AC_TRY_COMPILE([
+#include <elf.h>
+#include <sys/termio.h>
+],[
+static struct termio d_tio;
+	d_tio.c_cc[VINTR] = 0;
+	d_tio.c_cc[VQUIT] = 0;
+	d_tio.c_cc[VERASE] = 0;
+	d_tio.c_cc[VKILL] = 0;
+	d_tio.c_cc[VEOF] = 0;
+	d_tio.c_cc[VEOL] = 0;
+	d_tio.c_cc[VMIN] = 0;
+	d_tio.c_cc[VTIME] = 0;
+	d_tio.c_cc[VLNEXT] = 0;
+],
+[cf_cv_svr4=yes],
+[cf_cv_svr4=no])
+])
+])
+test "$cf_cv_svr4" = yes && AC_DEFINE(SVR4)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl Check if this is a SYSV platform
+AC_DEFUN([CF_SYSV],
+[
+AC_CACHE_CHECK(if this platform has SYSV flavor,cf_cv_sysv,[
+AC_TRY_COMPILE([
+#include <curses.h>
+#include <term.h>
+#include <sys/termio.h>
+],[
+/* FIXME: need a test that excludes linux */
+#ifdef linux
+make an error
+#endif
+static struct termio d_tio;
+	d_tio.c_cc[VINTR] = 0;
+	d_tio.c_cc[VQUIT] = 0;
+	d_tio.c_cc[VERASE] = 0;
+	d_tio.c_cc[VKILL] = 0;
+	d_tio.c_cc[VEOF] = 0;
+	d_tio.c_cc[VEOL] = 0;
+	d_tio.c_cc[VMIN] = 0;
+	d_tio.c_cc[VTIME] = 0;
+],
+[cf_cv_sysv=yes],
+[cf_cv_sysv=no])
+])
+test "$cf_cv_sysv" = yes && AC_DEFINE(SYSV)
+])dn
+dnl ---------------------------------------------------------------------------
 dnl Check if this is a SYSV flavor of UTMP
 AC_DEFUN([CF_SYSV_UTMP],
 [
@@ -736,20 +773,95 @@
 test $cf_cv_sysv_utmp = yes && AC_DEFINE(USE_SYSV_UTMP)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl Check for SGI's broken redefinition of baud rates introduced in IRIX 6.5
+dnl (there doesn't appear to be a useful predefined symbol).
+AC_DEFUN([CF_TERMIO_C_ISPEED],
+[
+AC_CACHE_CHECK(for IRIX 6.5 baud-rate redefinitions,cf_cv_termio_c_ispeed,[
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/termio.h>],[
+struct termio foo;
+foo.c_ispeed = B38400;
+foo.c_ospeed = B9600;
+],[cf_cv_termio_c_ispeed=yes
+],[cf_cv_termio_c_ispeed=no])
+])
+test "$cf_cv_termio_c_ispeed" = yes && AC_DEFINE(HAVE_TERMIO_C_ISPEED)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl Check if the system has a tty-group defined.  This is used in xterm when
 dnl setting pty ownership.
 AC_DEFUN([CF_TTY_GROUP],
 [
-AC_CACHE_CHECK(for tty group,cf_cv_tty_group,[
+AC_CACHE_CHECK(for tty group name,cf_cv_tty_group_name,[
+
+# If we are configuring as root, it is hard to get a clue about the tty group.
+# But we'll guess based on how our connection is set up - assuming it is done
+# properly.
+
+cf_uid=`id | sed -e 's/^[^=]*=//' -e 's/(.*$//'`
+if test "$cf_uid" != 0 ; then
+cf_cv_tty_group_name=
+cf_tty_name=`tty`
+test "$cf_tty_name" = "not a tty" && cf_tty_name=/dev/tty
+test -z "$cf_tty_name" && cf_tty_name=/dev/tty
+if test -c "$cf_tty_name"
+then
+	cf_option="-l -L"
+
+	# Expect listing to have fields like this:
+	#-rwxrwxrwx   1 user      group       34293 Jul 18 16:29 pathname
+	ls $cf_option $cf_tty_name >conftest.out
+	read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <conftest.out
+	if test -z "$cf_rest" ; then
+		cf_option="$cf_option -g"
+		ls $cf_option $cf_tty_name >conftest.out
+		read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <conftest.out
+	fi
+	rm -f conftest.out
+	cf_cv_tty_group_name=$cf_grp
+fi
+fi
+
+# If we cannot deduce the tty group, fall back on hardcoded cases
+
+if test -z "$cf_cv_tty_group_name"
+then
+case $host_os in #(vi
+osf*) #(vi
+	cf_cv_tty_group_name="terminal"
+	;;
+*)
+	cf_cv_tty_group_name="tty"
+	;;
+esac
+fi
+])
+
+AC_DEFINE_UNQUOTED(TTY_GROUP_NAME,"$cf_cv_tty_group_name")
+
+AC_CACHE_CHECK(if we may use tty group,cf_cv_tty_group,[
 AC_TRY_RUN([
+#include <unistd.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <grp.h>
 int main()
 {
-	struct group *ttygrp;
-	int code = (ttygrp = getgrnam("tty")) == 0;
+	struct stat sb;
+	struct group *ttygrp = getgrnam(TTY_GROUP_NAME);
+	char *name = ttyname(0);
+
 	endgrent();
-	exit(code);
+	if (ttygrp != 0
+	 && name != 0
+	 && stat(name, &sb) == 0
+	 && sb.st_gid != getgid()
+	 && sb.st_gid == ttygrp->gr_gid) {
+		exit(0);
+	}
+	exit(1);
 }
 	],
 	[cf_cv_tty_group=yes],
Index: xc/programs/xterm/button.c
diff -u xc/programs/xterm/button.c:3.47 xc/programs/xterm/button.c:3.48
--- xc/programs/xterm/button.c:3.47	Thu Feb 10 10:57:36 2000
+++ xc/programs/xterm/button.c	Mon Jun 12 19:28:37 2000
@@ -1,6 +1,6 @@
 /* $TOG: button.c /main/76 1997/07/30 16:56:19 kaleb $ */
 /*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -50,7 +50,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/programs/xterm/button.c,v 3.47 2000/02/10 18:57:36 dawes Exp $ */
+/* $XFree86: xc/programs/xterm/button.c,v 3.48 2000/06/13 02:28:37 dawes Exp $ */
 
 /*
 button.c	Handles button events in the terminal emulator.
Index: xc/programs/xterm/charproc.c
diff -u xc/programs/xterm/charproc.c:3.102 xc/programs/xterm/charproc.c:3.107
--- xc/programs/xterm/charproc.c:3.102	Mon Feb 28 19:09:26 2000
+++ xc/programs/xterm/charproc.c	Tue Jun 13 17:16:17 2000
@@ -1,11 +1,11 @@
 /*
  * $XConsortium: charproc.c /main/196 1996/12/03 16:52:46 swick $
- * $XFree86: xc/programs/xterm/charproc.c,v 3.102 2000/02/29 03:09:26 dawes Exp $
+ * $XFree86: xc/programs/xterm/charproc.c,v 3.107 2000/06/14 00:16:17 dawes Exp $
  */
 
 /*
 
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -188,7 +188,6 @@
 
 /* Defaults */
 #if OPT_ISO_COLORS
-static  Boolean	defaultCOLORMODE   = DFT_COLORMODE;
 
 /*
  * If we default to colorMode enabled, compile-in defaults for the ANSI colors.
@@ -200,30 +199,8 @@
 #endif
 #endif
 
-static  Boolean	defaultFALSE	   = FALSE;
-static  Boolean	defaultTRUE	   = TRUE;
-static  int	defaultZERO        = 0;
-static  int	defaultIntBorder   = DEFBORDER;
-static  int	defaultSaveLines   = SAVELINES;
-static	int	defaultScrollLines = SCROLLLINES;
-static  int	defaultNMarginBell = N_MARGINBELL;
-static  int	defaultMultiClickTime = MULTICLICKTIME;
-static  int	defaultBellSuppressTime = BELLSUPPRESSMSEC;
 static	char *	_Font_Selected_ = "yes";  /* string is arbitrary */
 
-#if OPT_BLINK_CURS
-static  int	defaultBlinkOnTime = 600;
-static  int	defaultBlinkOffTime = 300;
-#endif
-
-#if OPT_PRINT_COLORS
-static  int	defaultONE = 1;
-#endif
-
-#if OPT_DEC_CHRSET
-static	int	default_NUM_CHRSET = NUM_CHRSET;
-#endif
-
 static char defaultTranslations[] =
 "\
           Shift <KeyPress> Prior:scroll-back(1,halfpage) \n\
@@ -251,16 +228,16 @@
      ! @Num_Lock Ctrl <Btn3Down>:popup-menu(fontMenu) \n\
           ~Ctrl ~Meta <Btn3Down>:start-extend() \n\
               ~Meta <Btn3Motion>:select-extend()      \n\
-                 Ctrl <Btn4Down>:scroll-back(1,halfpage) \n\
-            Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \n\
-  Lock @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \n\
-       @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage) \n\
-                      <Btn4Down>:scroll-back(5,line)     \n\
-                 Ctrl <Btn5Down>:scroll-forw(1,halfpage) \n\
-            Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \n\
-  Lock @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \n\
-       @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage) \n\
-                      <Btn5Down>:scroll-forw(5,line)     \n\
+                 Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+            Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+  Lock @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+       @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+                      <Btn4Down>:scroll-back(5,line,m)     \n\
+                 Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+            Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+  Lock @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+       @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+                      <Btn5Down>:scroll-forw(5,line,m)     \n\
                          <BtnUp>:select-end(PRIMARY, CUT_BUFFER0) \n\
                        <BtnDown>:bell(0) \
 "; /* PROCURA added "Meta <Btn2Down>:clear-saved-lines()" */
@@ -328,6 +305,9 @@
 #if OPT_BLINK_CURS
     { "set-cursorblink",	HandleCursorBlink },
 #endif
+#if OPT_BOX_CHARS
+    { "set-font-linedrawing",	HandleFontBoxChars },
+#endif
 #if OPT_DEC_CHRSET
     { "set-font-doublesize",	HandleFontDoublesize },
 #endif
@@ -365,129 +345,55 @@
 };
 
 static XtResource resources[] = {
-{XtNfont, XtCFont, XtRString, sizeof(char *),
-	XtOffsetOf(XtermWidgetRec, misc.f_n), XtRString,
-	DEFFONT},
-{XtNboldFont, XtCBoldFont, XtRString, sizeof(char *),
-	XtOffsetOf(XtermWidgetRec, misc.f_b), XtRString,
-	DEFBOLDFONT},
-{XtNc132, XtCC132, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.c132),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNcharClass, XtCCharClass, XtRString, sizeof(char *),
-	XtOffsetOf(XtermWidgetRec, screen.charClass),
-	XtRString, (XtPointer) NULL},
-{XtNcurses, XtCCurses, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.curses),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNhpLowerleftBugCompat, XtCHpLowerleftBugCompat, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.hp_ll_bc),
-	XtRBoolean, (XtPointer) &defaultFALSE},
+Sres(XtNfont,		XtCFont,	misc.f_n,		DEFFONT),
+Sres(XtNboldFont,	XtCBoldFont,	misc.f_b,		DEFBOLDFONT),
+Bres(XtNc132,		XtCC132,	screen.c132,		FALSE),
+Sres(XtNcharClass,	XtCCharClass,	screen.charClass,	NULL),
+Bres(XtNcurses,		XtCCurses,	screen.curses,		FALSE),
+Bres(XtNhpLowerleftBugCompat, XtCHpLowerleftBugCompat, screen.hp_ll_bc, FALSE),
 #if OPT_XMC_GLITCH
-{XtNxmcGlitch, XtCXmcGlitch, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.xmc_glitch),
-	XtRString, "0"},
-{XtNxmcAttributes, XtCXmcAttributes, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.xmc_attributes),
-	XtRString, "1"},
-{XtNxmcInline, XtCXmcInline, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.xmc_inline),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNxmcMoveSGR, XtCXmcMoveSGR, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.move_sgr_ok),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-#endif
-{XtNcutNewline, XtCCutNewline, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.cutNewline),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNcutToBeginningOfLine, XtCCutToBeginningOfLine, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.cutToBeginningOfLine),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNhighlightSelection,XtCHighlightSelection,XtRBoolean,
-	sizeof(Boolean),XtOffsetOf(XtermWidgetRec, screen.highlight_selection),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNtrimSelection,XtCTrimSelection,XtRBoolean,
-	sizeof(Boolean),XtOffsetOf(XtermWidgetRec, screen.trim_selection),
-	XtRBoolean, (XtPointer) &defaultFALSE},
+Ires(XtNxmcGlitch,	XtCXmcGlitch,	screen.xmc_glitch,	0),
+Ires(XtNxmcAttributes,	XtCXmcAttributes, screen.xmc_attributes, 1),
+Bres(XtNxmcInline,	XtCXmcInline,	screen.xmc_inline,	FALSE),
+Bres(XtNxmcMoveSGR,	XtCXmcMoveSGR,	screen.move_sgr_ok,	TRUE),
+#endif
+Bres(XtNcutNewline,	XtCCutNewline,	screen.cutNewline,	TRUE),
+Bres(XtNcutToBeginningOfLine, XtCCutToBeginningOfLine, screen.cutToBeginningOfLine, TRUE),
+Bres(XtNhighlightSelection, XtCHighlightSelection, screen.highlight_selection, FALSE),
+Bres(XtNtrimSelection, XtCTrimSelection, screen.trim_selection, FALSE),
 {XtNbackground, XtCBackground, XtRPixel, sizeof(Pixel),
 	XtOffsetOf(XtermWidgetRec, core.background_pixel),
 	XtRString, XtDefaultBackground},
 Cres(XtNforeground,	screen.foreground,	XtDefaultForeground),
 Cres(XtNcursorColor,	screen.cursorcolor,	XtDefaultForeground),
 #if OPT_BLINK_CURS
-{XtNcursorBlink, XtCCursorBlink, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.cursor_blink),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNcursorOnTime, XtCCursorOnTime, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.cursor_on),
-	XtRInt, (XtPointer) &defaultBlinkOnTime},
-{XtNcursorOffTime, XtCCursorOffTime, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.cursor_off),
-	XtRInt, (XtPointer) &defaultBlinkOffTime},
-#endif
-{XtNkeyboardDialect, XtCKeyboardDialect, XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.keyboard_dialect),
-	XtRString, (XtPointer) DFT_KBD_DIALECT},
-{XtNeightBitInput, XtCEightBitInput, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.input_eight_bits),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNeightBitOutput, XtCEightBitOutput, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.output_eight_bits),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNeightBitControl, XtCEightBitControl, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.control_eight_bits),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNmetaSendsEscape, XtCMetaSendsEscape, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.meta_sends_esc),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNgeometry,XtCGeometry, XtRString, sizeof(char *),
-	XtOffsetOf(XtermWidgetRec, misc.geo_metry),
-	XtRString, (XtPointer) NULL},
-{XtNalwaysHighlight,XtCAlwaysHighlight,XtRBoolean,
-	sizeof(Boolean),XtOffsetOf(XtermWidgetRec, screen.always_highlight),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNappcursorDefault,XtCAppcursorDefault,XtRBoolean,
-	sizeof(Boolean),XtOffsetOf(XtermWidgetRec, misc.appcursorDefault),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNappkeypadDefault,XtCAppkeypadDefault,XtRBoolean,
-	sizeof(Boolean),XtOffsetOf(XtermWidgetRec, misc.appkeypadDefault),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNbackarrowKey, XtCBackarrowKey, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.backarrow_key),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNbellSuppressTime, XtCBellSuppressTime, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.bellSuppressTime),
-	XtRInt, (XtPointer) &defaultBellSuppressTime},
-{XtNtekGeometry,XtCGeometry, XtRString, sizeof(char *),
-	XtOffsetOf(XtermWidgetRec, misc.T_geometry),
-	XtRString, (XtPointer) NULL},
-{XtNinternalBorder,XtCBorderWidth,XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.border),
-	XtRInt, (XtPointer) &defaultIntBorder},
-{XtNjumpScroll, XtCJumpScroll, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.jumpscroll),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNoldXtermFKeys, XtCOldXtermFKeys, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.old_fkeys),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-Bres(XtNdeleteIsDEL,	XtCDeleteIsDEL,		screen.delete_is_del,	FALSE),
+Bres(XtNcursorBlink,	XtCCursorBlink, screen.cursor_blink,	FALSE),
+Ires(XtNcursorOnTime,	XtCCursorOnTime, screen.cursor_on,	600),
+Ires(XtNcursorOffTime,	XtCCursorOffTime, screen.cursor_off,	300),
+#endif
+Sres(XtNkeyboardDialect, XtCKeyboardDialect, screen.keyboard_dialect, DFT_KBD_DIALECT),
+Bres(XtNeightBitInput, XtCEightBitInput, screen.input_eight_bits, TRUE),
+Bres(XtNeightBitOutput, XtCEightBitOutput, screen.output_eight_bits, TRUE),
+Bres(XtNeightBitControl, XtCEightBitControl, screen.control_eight_bits, FALSE),
+Bres(XtNmetaSendsEscape, XtCMetaSendsEscape, screen.meta_sends_esc, FALSE),
+Sres(XtNgeometry,	XtCGeometry, misc.geo_metry,		NULL),
+Bres(XtNalwaysHighlight, XtCAlwaysHighlight, screen.always_highlight, FALSE),
+Bres(XtNappcursorDefault, XtCAppcursorDefault, misc.appcursorDefault, FALSE),
+Bres(XtNappkeypadDefault, XtCAppkeypadDefault, misc.appkeypadDefault, FALSE),
+Bres(XtNbackarrowKey, XtCBackarrowKey, screen.backarrow_key, TRUE),
+Ires(XtNbellSuppressTime, XtCBellSuppressTime, screen.bellSuppressTime, BELLSUPPRESSMSEC),
+Sres(XtNtekGeometry,	XtCGeometry, misc.T_geometry,		NULL),
+Ires(XtNinternalBorder, XtCBorderWidth, screen.border,		DEFBORDER),
+Bres(XtNjumpScroll,	XtCJumpScroll, screen.jumpscroll,	TRUE),
+Bres(XtNoldXtermFKeys,	XtCOldXtermFKeys, screen.old_fkeys,	FALSE),
+Bres(XtNdeleteIsDEL,	XtCDeleteIsDEL,	screen.delete_is_del,	2),
 #ifdef ALLOWLOGGING
-{XtNlogFile, XtCLogfile, XtRString, sizeof(char *),
-	XtOffsetOf(XtermWidgetRec, screen.logfile),
-	XtRString, (XtPointer) NULL},
-{XtNlogging, XtCLogging, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.log_on),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNlogInhibit, XtCLogInhibit, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.logInhibit),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-#endif
-{XtNloginShell, XtCLoginShell, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.login_shell),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNmarginBell, XtCMarginBell, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.marginbell),
-	XtRBoolean, (XtPointer) &defaultFALSE},
+Sres(XtNlogFile,	XtCLogfile, screen.logfile,		NULL),
+Bres(XtNlogging,	XtCLogging, misc.log_on,		FALSE),
+Bres(XtNlogInhibit,	XtCLogInhibit, misc.logInhibit,		FALSE),
+#endif
+Bres(XtNloginShell,	XtCLoginShell, misc.login_shell,	FALSE),
+Bres(XtNmarginBell,	XtCMarginBell, screen.marginbell,	FALSE),
 Cres(XtNpointerColor,	screen.mousecolor,	XtDefaultForeground),
 {XtNpointerColorBackground, XtCBackground, XtRPixel, sizeof(Pixel),
 	XtOffsetOf(XtermWidgetRec, screen.mousecolorback),
@@ -495,147 +401,72 @@
 {XtNpointerShape,XtCCursor, XtRCursor, sizeof(Cursor),
 	XtOffsetOf(XtermWidgetRec, screen.pointer_cursor),
 	XtRString, (XtPointer) "xterm"},
-{XtNanswerbackString,XtCAnswerbackString, XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.answer_back),
-	XtRString, (XtPointer) ""},
+Sres(XtNanswerbackString, XtCAnswerbackString, screen.answer_back, ""),
 #if OPT_PRINT_COLORS
-{XtNprintAttributes,XtCPrintAttributes, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.print_attributes),
-	XtRInt, (XtPointer) &defaultONE},
-#endif
-{XtNprinterAutoClose,XtCPrinterAutoClose, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.printer_autoclose),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNprinterControlMode, XtCPrinterControlMode, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.printer_controlmode),
-	XtRInt, (XtPointer) &defaultZERO},
+Ires(XtNprintAttributes, XtCPrintAttributes, screen.print_attributes, 1),
+#endif
+Bres(XtNprinterAutoClose, XtCPrinterAutoClose, screen.printer_autoclose, FALSE),
+Ires(XtNprinterControlMode, XtCPrinterControlMode, screen.printer_controlmode, 0),
 #ifdef VMS
 #define OS_DEPENDENT_PRINT_COMMAND "print/delete/noflag"
 #else  /* VMS */
 #define OS_DEPENDENT_PRINT_COMMAND "lpr"
 #endif /* VMS */
-{XtNprinterCommand,XtCPrinterCommand, XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.printer_command),
-	XtRString, (XtPointer) OS_DEPENDENT_PRINT_COMMAND},
-{XtNprinterExtent,XtCPrinterExtent, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.printer_extent),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNprinterFormFeed,XtCPrinterFormFeed, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.printer_formfeed),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNmultiClickTime,XtCMultiClickTime, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.multiClickTime),
-	XtRInt, (XtPointer) &defaultMultiClickTime},
-{XtNmultiScroll,XtCMultiScroll, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.multiscroll),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNnMarginBell,XtCColumn, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.nmarginbell),
-	XtRInt, (XtPointer) &defaultNMarginBell},
-{XtNreverseVideo,XtCReverseVideo,XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.re_verse),
-	XtRBoolean, (XtPointer) &defaultFALSE},
+Sres(XtNprinterCommand,	XtCPrinterCommand, screen.printer_command, OS_DEPENDENT_PRINT_COMMAND),
+Bres(XtNprinterExtent,	XtCPrinterExtent, screen.printer_extent, FALSE),
+Bres(XtNprinterFormFeed, XtCPrinterFormFeed, screen.printer_formfeed, FALSE),
+Ires(XtNmultiClickTime, XtCMultiClickTime, screen.multiClickTime, MULTICLICKTIME),
+Bres(XtNmultiScroll,	XtCMultiScroll, screen.multiscroll, FALSE),
+Ires(XtNnMarginBell,	XtCColumn, screen.nmarginbell, N_MARGINBELL),
+Bres(XtNreverseVideo,	XtCReverseVideo, misc.re_verse, FALSE),
 {XtNresizeGravity, XtCResizeGravity, XtRGravity, sizeof(XtGravity),
 	XtOffsetOf(XtermWidgetRec, misc.resizeGravity),
 	XtRImmediate, (XtPointer) SouthWestGravity},
-{XtNreverseWrap,XtCReverseWrap, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.reverseWrap),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNautoWrap,XtCAutoWrap, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.autoWrap),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNsaveLines, XtCSaveLines, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.savelines),
-	XtRInt, (XtPointer) &defaultSaveLines},
-{XtNscrollBar, XtCScrollBar, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.scrollbar),
-	XtRBoolean, (XtPointer) &defaultFALSE},
+Bres(XtNreverseWrap,	XtCReverseWrap, misc.reverseWrap,	FALSE),
+Bres(XtNautoWrap,	XtCAutoWrap,	misc.autoWrap,		TRUE),
+Ires(XtNsaveLines,	XtCSaveLines,	screen.savelines,	SAVELINES),
+Bres(XtNscrollBar,	XtCScrollBar,	misc.scrollbar,		FALSE),
+Ires(XtNlimitResize,	XtCLimitResize, misc.limit_resize,	1),
 #ifdef SCROLLBAR_RIGHT
-{XtNrightScrollBar, XtCRightScrollBar, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.useRight),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-#endif
-{XtNscrollTtyOutput,XtCScrollCond, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.scrollttyoutput),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNscrollKey, XtCScrollCond, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.scrollkey),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNscrollLines, XtCScrollLines, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.scrolllines),
-	XtRInt, (XtPointer) &defaultScrollLines},
-{XtNsignalInhibit,XtCSignalInhibit,XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.signalInhibit),
-	XtRBoolean, (XtPointer) &defaultFALSE},
+Bres(XtNrightScrollBar, XtCRightScrollBar, misc.useRight, FALSE),
+#endif
+Bres(XtNscrollTtyOutput, XtCScrollCond, screen.scrollttyoutput, TRUE),
+Bres(XtNscrollKey,	XtCScrollCond,	screen.scrollkey,	FALSE),
+Ires(XtNscrollLines,	XtCScrollLines,	screen.scrolllines,	SCROLLLINES),
+Bres(XtNsignalInhibit,	XtCSignalInhibit, misc.signalInhibit,	FALSE),
 #if OPT_NUM_LOCK
-{XtNnumLock, XtCNumLock, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.real_NumLock),
-	XtRBoolean, (XtPointer) &defaultTRUE},
+Bres(XtNnumLock,	XtCNumLock,	misc.real_NumLock,	TRUE),
+Bres(XtNalwaysUseMods,	XtCAlwaysUseMods, misc.alwaysUseMods,	FALSE),
 #endif
 #if OPT_SHIFT_KEYS
-{XtNshiftKeys, XtCShiftKeys, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.shift_keys),
-	XtRBoolean, (XtPointer) &defaultTRUE},
+Bres(XtNshiftKeys,	XtCShiftKeys,	misc.shift_keys,	TRUE),
 #endif
+#if OPT_SUNPC_KBD
+Ires(XtNctrlFKeys,	XtCCtrlFKeys,	misc.ctrl_fkeys,	10),
+#endif
 #if OPT_TEK4014
-{XtNtekInhibit, XtCTekInhibit, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.tekInhibit),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNtekSmall, XtCTekSmall, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.tekSmall),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNtekStartup, XtCTekStartup, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.TekEmu),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-#endif
-{XtNtiteInhibit, XtCTiteInhibit, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.titeInhibit),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNvisualBell, XtCVisualBell, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.visualbell),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNallowSendEvents, XtCAllowSendEvents, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.allowSendEvents),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNawaitInput, XtCAwaitInput, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.awaitInput),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{"font1", "Font1", XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.menu_font_names[fontMenu_font1]),
-	XtRString, (XtPointer) NULL},
-{"font2", "Font2", XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.menu_font_names[fontMenu_font2]),
-	XtRString, (XtPointer) NULL},
-{"font3", "Font3", XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.menu_font_names[fontMenu_font3]),
-	XtRString, (XtPointer) NULL},
-{"font4", "Font4", XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.menu_font_names[fontMenu_font4]),
-	XtRString, (XtPointer) NULL},
-{"font5", "Font5", XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.menu_font_names[fontMenu_font5]),
-	XtRString, (XtPointer) NULL},
-{"font6", "Font6", XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.menu_font_names[fontMenu_font6]),
-	XtRString, (XtPointer) NULL},
+Bres(XtNtekInhibit,	XtCTekInhibit,	misc.tekInhibit,	FALSE),
+Bres(XtNtekSmall,	XtCTekSmall,	misc.tekSmall,		FALSE),
+Bres(XtNtekStartup,	XtCTekStartup,	screen.TekEmu,		FALSE),
+#endif
+Bres(XtNtiteInhibit,	XtCTiteInhibit, misc.titeInhibit,	FALSE),
+Bres(XtNvisualBell,	XtCVisualBell,	screen.visualbell,	FALSE),
+Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvents, FALSE),
+Bres(XtNawaitInput,	XtCAwaitInput,	screen.awaitInput,	FALSE),
+Sres("font1", "Font1", screen.menu_font_names[fontMenu_font1], NULL),
+Sres("font2", "Font2", screen.menu_font_names[fontMenu_font2], NULL),
+Sres("font3", "Font3", screen.menu_font_names[fontMenu_font3], NULL),
+Sres("font4", "Font4", screen.menu_font_names[fontMenu_font4], NULL),
+Sres("font5", "Font5", screen.menu_font_names[fontMenu_font5], NULL),
+Sres("font6", "Font6", screen.menu_font_names[fontMenu_font6], NULL),
 #if OPT_DEC_CHRSET
-{XtNfontDoublesize, XtCFontDoublesize, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.font_doublesize),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNcacheDoublesize, XtCCacheDoublesize, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.cache_doublesize),
-	XtRInt, (XtPointer) &default_NUM_CHRSET},
+Bres(XtNfontDoublesize, XtCFontDoublesize, screen.font_doublesize, TRUE),
+Ires(XtNcacheDoublesize, XtCCacheDoublesize, screen.cache_doublesize, NUM_CHRSET),
 #endif
 #if OPT_INPUT_METHOD
-{XtNinputMethod, XtCInputMethod, XtRString, sizeof(char*),
-	XtOffsetOf(XtermWidgetRec, misc.input_method),
-	XtRString, (XtPointer)NULL},
-{XtNpreeditType, XtCPreeditType, XtRString, sizeof(char*),
-	XtOffsetOf(XtermWidgetRec, misc.preedit_type),
-	XtRString, (XtPointer)"Root"},
-{XtNopenIm, XtCOpenIm, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.open_im),
-	XtRImmediate, (XtPointer)TRUE},
+Sres(XtNinputMethod,	XtCInputMethod,	misc.input_method,	NULL),
+Sres(XtNpreeditType,	XtCPreeditType,	misc.preedit_type,	"Root"),
+Bres(XtNopenIm,		XtCOpenIm,	misc.open_im,		TRUE),
 #endif
 #if OPT_ISO_COLORS
 COLOR_RES(XtNcolor0,	screen.Acolors[COLOR_0],	DFT_COLOR("black")),
@@ -662,50 +493,28 @@
 COLOR_RES(XtNcolorBD,	screen.Acolors[COLOR_BD],	DFT_COLOR(XtDefaultForeground)),
 COLOR_RES(XtNcolorBL,	screen.Acolors[COLOR_BL],	DFT_COLOR(XtDefaultForeground)),
 COLOR_RES(XtNcolorUL,	screen.Acolors[COLOR_UL],	DFT_COLOR(XtDefaultForeground)),
-{XtNcolorMode, XtCColorMode, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.colorMode),
-	XtRBoolean, (XtPointer) &defaultCOLORMODE},
-{XtNcolorULMode, XtCColorMode, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.colorULMode),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNcolorBDMode, XtCColorMode, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.colorBDMode),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNcolorBLMode, XtCColorMode, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.colorBLMode),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNcolorAttrMode, XtCColorMode, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.colorAttrMode),
-	XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNboldColors, XtCColorMode, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.boldColors),
-	XtRBoolean, (XtPointer) &defaultTRUE},
+COLOR_RES(XtNcolorRV,	screen.Acolors[COLOR_RV],	DFT_COLOR(XtDefaultForeground)),
+Bres(XtNcolorMode,	XtCColorMode, screen.colorMode,	DFT_COLORMODE),
+Bres(XtNcolorULMode,	XtCColorMode, screen.colorULMode,	FALSE),
+Bres(XtNcolorBDMode,	XtCColorMode, screen.colorBDMode,	FALSE),
+Bres(XtNcolorBLMode,	XtCColorMode, screen.colorBLMode,	FALSE),
+Bres(XtNcolorRVMode,	XtCColorMode, screen.colorRVMode,	FALSE),
+Bres(XtNcolorAttrMode,	XtCColorMode, screen.colorAttrMode,	FALSE),
+Bres(XtNboldColors,	XtCColorMode, screen.boldColors,	TRUE),
 #endif /* OPT_ISO_COLORS */
-{XtNdynamicColors, XtCDynamicColors, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.dynamicColors),
-	XtRBoolean, (XtPointer) &defaultTRUE},
+Bres(XtNdynamicColors, XtCDynamicColors, misc.dynamicColors,	TRUE),
 #if OPT_HIGHLIGHT_COLOR
 Cres(XtNhighlightColor,	screen.highlightcolor,	XtDefaultForeground),
 #endif /* OPT_HIGHLIGHT_COLOR */
-{XtNboldMode, XtCBoldMode, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.bold_mode),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNunderLine, XtCUnderLine, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.underline),
-	XtRBoolean, (XtPointer) &defaultTRUE},
-{XtNdecTerminalID, XtCDecTerminalID, XtRString, sizeof(String),
-	XtOffsetOf(XtermWidgetRec, screen.term_id),
-	XtRString, (XtPointer) DFT_DECID},
+Bres(XtNboldMode,	XtCBoldMode, screen.bold_mode,		TRUE),
+Bres(XtNunderLine,	XtCUnderLine, screen.underline,		TRUE),
+Sres(XtNdecTerminalID,	XtCDecTerminalID, screen.term_id,	DFT_DECID),
 #ifndef NO_ACTIVE_ICON
-{"activeIcon", "ActiveIcon", XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, misc.active_icon),
-	XtRString, "false"},
+Bres("activeIcon",	"ActiveIcon", misc.active_icon,		FALSE),
 {"iconFont", "IconFont", XtRFontStruct, sizeof(XFontStruct),
 	XtOffsetOf(XtermWidgetRec, screen.fnt_icon),
 	XtRString, (XtPointer)XtExtdefaultfont},
-{"iconBorderWidth", XtCBorderWidth, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, misc.icon_border_width),
-	XtRString, "2"},
+Ires("iconBorderWidth", XtCBorderWidth, misc.icon_border_width, 2),
 {"iconBorderColor", XtCBorderColor, XtRPixel, sizeof(Pixel),
 	XtOffsetOf(XtermWidgetRec, misc.icon_border_pixel),
 	XtRString, XtExtdefaultbackground},
@@ -714,17 +523,13 @@
 {XtNmenuBar, XtCMenuBar, XtRWidget, sizeof(Widget),
 	XtOffsetOf(XtermWidgetRec, screen.fullVwin.menu_bar),
 	XtRWidget, (XtPointer) 0},
-{XtNmenuHeight, XtCMenuHeight, XtRInt, sizeof(int),
-	XtOffsetOf(XtermWidgetRec, screen.fullVwin.menu_height),
-	XtRString, "25"},
+Ires(XtNmenuHeight, XtCMenuHeight, screen.fullVwin.menu_height, 25),
 #endif
 #if OPT_WIDE_CHARS
 {XtNutf8, XtCUtf8, XtRInt, sizeof(int),
 	XtOffsetOf(XtermWidgetRec, screen.utf8_mode),
 	XtRString, defaultUTF8},
-{XtNwideChars, XtCWideChars, XtRBoolean, sizeof(Boolean),
-	XtOffsetOf(XtermWidgetRec, screen.wide_chars),
-	XtRBoolean, (XtPointer) &defaultFALSE},
+Bres(XtNwideChars, XtCWideChars, screen.wide_chars, FALSE),
 #endif
 };
 
@@ -884,6 +689,23 @@
 	SGR_Foreground(fg);
 }
 
+/* Invoked after updating inverse flag, computes the extended color
+ * index to use for background.  (See also 'extract_bg()').
+ */
+static void
+setExtendedBG(void)
+{
+	int bg = term->sgr_background;
+
+	if (term->screen.colorAttrMode
+	 || (bg < 0)) {
+		if (term->screen.colorRVMode && (term->flags & INVERSE))
+			bg = COLOR_RV;
+	}
+
+	SGR_Background(bg);
+}
+
 static void
 reset_SGR_Foreground(void)
 {
@@ -893,10 +715,17 @@
 }
 
 static void
+reset_SGR_Background(void)
+{
+	term->sgr_background = -1;
+	setExtendedBG();
+}
+
+static void
 reset_SGR_Colors(void)
 {
 	reset_SGR_Foreground();
-	SGR_Background(-1);
+	reset_SGR_Background();
 }
 #endif /* OPT_ISO_COLORS */
 
@@ -1281,6 +1110,8 @@
 			if((row = param[nparam - 1]) == DEFAULT)
 				row = 0;
 			param[nparam - 1] = 10 * row + (c - '0');
+			if (param[nparam - 1] > 65535)
+				param[nparam - 1] = 65535;
 			break;
 
 		 case CASE_ESC_SEMI:
@@ -1602,6 +1433,7 @@
 					break;
 				 case 7:
 					term->flags |= INVERSE;
+					if_OPT_ISO_COLORS(screen,{setExtendedBG();})
 					break;
 				 case 8:
 					term->flags |= INVISIBLE;
@@ -1620,6 +1452,7 @@
 					break;
 				 case 27:
 					term->flags &= ~INVERSE;
+					if_OPT_ISO_COLORS(screen,{setExtendedBG();})
 					break;
 				 case 28:
 					term->flags &= ~INVISIBLE;
@@ -1677,7 +1510,8 @@
 				 case 46:
 				 case 47:
 					if_OPT_ISO_COLORS(screen,{
-					  SGR_Background(param[row] - 40);
+					    term->sgr_background = (param[row] - 40);
+					    setExtendedBG();
 					})
 					break;
 				 case 48:
@@ -1689,7 +1523,8 @@
 								row++;
 								if (row < nparam &&
 								    param[row] < NUM_ANSI_COLORS) {
-									SGR_Background(param[row]);
+									term->sgr_background = param[row];
+									setExtendedBG();
 								}
 								break;
 							default:
@@ -1701,7 +1536,7 @@
 					break;
 				 case 49:
 					if_OPT_ISO_COLORS(screen,{
-					  SGR_Background(-1);
+					  reset_SGR_Background();
 					})
 					break;
 				 case 90:
@@ -1722,7 +1557,7 @@
 #if !OPT_AIX_COLORS
 					if_OPT_ISO_COLORS(screen,{
 					  reset_SGR_Foreground();
-					  SGR_Background(-1);
+					  reset_SGR_Background();
 					})
 					break;
 #endif
@@ -1734,7 +1569,8 @@
 				 case 106:
 				 case 107:
 					if_OPT_AIX_COLORS(screen,{
-					  SGR_Background(param[row] - 100 + 8);
+					  term->sgr_background = (param[row] - 100 + 8);
+					  setExtendedBG();
 					})
 					break;
 				}
@@ -1851,8 +1687,8 @@
 				reply.a_param[0] = row + 2;
 				reply.a_param[1] = 1;	/* no parity */
 				reply.a_param[2] = 1;	/* eight bits */
-				reply.a_param[3] = 112;	/* transmit 9600 baud */
-				reply.a_param[4] = 112;	/* receive 9600 baud */
+				reply.a_param[3] = 128;	/* transmit 38.4k baud */
+				reply.a_param[4] = 128;	/* receive 38.4k baud */
 				reply.a_param[5] = 1;	/* clock multiplier ? */
 				reply.a_param[6] = 0;	/* STP flags ? */
 				reply.a_inters = 0;
@@ -3291,7 +3127,7 @@
 #endif
 #if OPT_SCO_FUNC_KEYS
 		case 1053:
-			set_keyboard_type(keyboardIsHP, func == bitset);
+			set_keyboard_type(keyboardIsSCO, func == bitset);
 			break;
 #endif
 		case 1060:
@@ -3996,13 +3832,16 @@
 }
 
 
+#define okDimension(src,dst) ((src <= 32767) && ((dst = src) == src))
+
 static void RequestResize(
 	XtermWidget termw,
 	int rows,
 	int cols,
 	int text)
 {
-	register TScreen	*screen	= &termw->screen;
+	TScreen	*screen	= &termw->screen;
+	unsigned long value;
 	Dimension replyWidth, replyHeight;
 	Dimension askedWidth, askedHeight;
 	XtGeometryResult status;
@@ -4010,28 +3849,34 @@
 
 	TRACE(("RequestResize(rows=%d, cols=%d, text=%d)\n", rows, cols, text));
 
-	askedWidth  = cols;
-	askedHeight = rows;
+	if ((askedWidth  = cols) < cols
+	 || (askedHeight = rows) < rows)
+		return;
 
 	if (askedHeight == 0
-	 || askedWidth  == 0) {
+	 || askedWidth  == 0
+	 || term->misc.limit_resize > 0) {
 		XGetWindowAttributes(XtDisplay(termw),
 			RootWindowOfScreen(XtScreen(termw)), &attrs);
 	}
 
 	if (text) {
-		if (rows != 0) {
+		if ((value = rows) != 0) {
 			if (rows < 0)
-				askedHeight = screen->max_row + 1;
-			askedHeight *= FontHeight(screen);
-			askedHeight += (2 * screen->border);
+				value = screen->max_row + 1;
+			value *= FontHeight(screen);
+			value += (2 * screen->border);
+			if (!okDimension(value, askedHeight))
+				return;
 		}
 
-		if (cols != 0) {
+		if ((value = cols) != 0) {
 			if (cols < 0)
-				askedWidth = screen->max_col + 1;
-			askedWidth  *= FontWidth(screen);
-			askedWidth  += (2 * screen->border) + Scrollbar(screen);
+				value = screen->max_col + 1;
+			value *= FontWidth(screen);
+			value += (2 * screen->border) + Scrollbar(screen);
+			if (!okDimension(value, askedWidth))
+				return;
 		}
 
 	} else {
@@ -4046,10 +3891,27 @@
 	if (cols == 0)
 		askedWidth  = attrs.width;
 
+	if (term->misc.limit_resize > 0) {
+		Dimension high = term->misc.limit_resize * attrs.height;
+		Dimension wide = term->misc.limit_resize * attrs.width;
+		if (high < attrs.height)
+			high = attrs.height;
+		if (askedHeight > high)
+			askedHeight = high;
+		if (wide < attrs.width)
+			wide = attrs.width;
+		if (askedWidth > wide)
+			askedWidth = wide;
+	}
+
 	status = XtMakeResizeRequest (
 	    (Widget) termw,
 	     askedWidth,  askedHeight,
 	    &replyWidth, &replyHeight);
+	TRACE(("charproc.c XtMakeResizeRequest %dx%d -> %dx%d (status %d)\n",
+		askedHeight, askedWidth,
+		replyHeight, replyWidth,
+		status));
 
 	if (status == XtGeometryYes ||
 	    status == XtGeometryDone) {
@@ -4188,7 +4050,7 @@
    wnew->screen.old_fkeys = request->screen.old_fkeys;
    wnew->screen.delete_is_del = request->screen.delete_is_del;
    wnew->keyboard.type = wnew->screen.old_fkeys
-   		? keyboardIsLegacy
+		? keyboardIsLegacy
 		: keyboardIsDefault;
 #ifdef ALLOWLOGGING
    wnew->screen.logfile = request->screen.logfile;
@@ -4219,8 +4081,10 @@
 
    wnew->screen.ansi_level = (wnew->screen.terminal_id / 100);
    wnew->screen.visualbell = request->screen.visualbell;
+   wnew->misc.limit_resize = request->misc.limit_resize;
 #if OPT_NUM_LOCK
    wnew->misc.real_NumLock = request->misc.real_NumLock;
+   wnew->misc.alwaysUseMods = request->misc.alwaysUseMods;
    wnew->misc.num_lock = 0;
    wnew->misc.alt_left = 0;
    wnew->misc.alt_right = 0;
@@ -4231,6 +4095,9 @@
 #if OPT_SHIFT_KEYS
    wnew->misc.shift_keys = request->misc.shift_keys;
 #endif
+#if OPT_SUNPC_KBD
+   wnew->misc.ctrl_fkeys = request->misc.ctrl_fkeys;
+#endif
 #if OPT_TEK4014
    wnew->misc.tekInhibit = request->misc.tekInhibit;
    wnew->misc.tekSmall = request->misc.tekSmall;
@@ -4302,11 +4169,13 @@
    wnew->screen.colorBLMode   = request->screen.colorBLMode;
    wnew->screen.colorMode     = request->screen.colorMode;
    wnew->screen.colorULMode   = request->screen.colorULMode;
+   wnew->screen.colorRVMode   = request->screen.colorRVMode;
 
    for (i = 0, color_ok = False; i < MAXCOLORS; i++) {
        wnew->screen.Acolors[i] = request->screen.Acolors[i];
 #if OPT_COLOR_RES
        TRACE(("Acolors[%d] = %s\n", i, request->screen.Acolors[i].resource));
+       wnew->screen.Acolors[i].mode = False;
        if (strcmp(wnew->screen.Acolors[i].resource, XtDefaultForeground))
 	   color_ok = True;
 #else
@@ -4334,6 +4203,7 @@
    wnew->num_ptrs = (OFF_COLOR+1);
 #endif
    wnew->sgr_foreground = -1;
+   wnew->sgr_background = -1;
    wnew->sgr_extended = 0;
 #endif /* OPT_ISO_COLORS */
 
@@ -4878,6 +4748,7 @@
 	int	fg_bg = 0;
 	GC	currentGC;
 	Boolean	in_selection;
+	Boolean	reversed;
 	Pixel fg_pix;
 	Pixel bg_pix;
 	Pixel tmp;
@@ -4933,7 +4804,7 @@
 	    fg_bg = SCRN_BUF_COLOR(screen, screen->cursor_row)[screen->cursor_col];
 	})
 	fg_pix = getXtermForeground(flags,extract_fg(fg_bg,flags));
-	bg_pix = getXtermBackground(flags,extract_bg(fg_bg));
+	bg_pix = getXtermBackground(flags,extract_bg(fg_bg,flags));
 
 	if (screen->cur_row > screen->endHRow ||
 	    (screen->cur_row == screen->endHRow &&
@@ -4945,14 +4816,14 @@
 	else
 	    in_selection = True;
 
+	reversed = ReverseOrHilite(screen, flags, in_selection);
+
 	/* This is like updatedXtermGC(), except that we have to worry about
 	 * whether the window has focus, since in that case we want just an
 	 * outline for the cursor.
 	 */
 	if(screen->select || screen->always_highlight) {
-		if (( (flags & INVERSE) && !in_selection) ||
-		    (!(flags & INVERSE) &&  in_selection)){
-		    /* text is reverse video */
+		if (reversed) { /* text is reverse video */
 		    if (screen->cursorGC) {
 			currentGC = screen->cursorGC;
 		    } else {
@@ -4988,9 +4859,16 @@
 		}
 		XSetForeground(screen->display, currentGC, bg_pix);
 	} else { /* not selected */
-		if (( (flags & INVERSE) && !in_selection) ||
-		    (!(flags & INVERSE) &&  in_selection)) {
-		    /* text is reverse video */
+		if (reversed) { /* text is reverse video */
+#if OPT_HIGHLIGHT_COLOR
+			if (hi_pix != screen->foreground
+			 && hi_pix != fg_pix
+			 && hi_pix != bg_pix
+			 && hi_pix != term->dft_foreground) {
+			    bg_pix = fg_pix;
+			    fg_pix = hi_pix;
+			}
+#endif
 			currentGC = ReverseGC(screen);
 			XSetForeground(screen->display, currentGC, bg_pix);
 			XSetBackground(screen->display, currentGC, fg_pix);
Index: xc/programs/xterm/charsets.c
diff -u xc/programs/xterm/charsets.c:1.8 xc/programs/xterm/charsets.c:1.9
--- xc/programs/xterm/charsets.c:1.8	Tue Feb  8 09:19:30 2000
+++ xc/programs/xterm/charsets.c	Mon Jun 12 19:28:38 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/charsets.c,v 1.8 2000/02/08 17:19:30 dawes Exp $
+ * $XFree86: xc/programs/xterm/charsets.c,v 1.9 2000/06/13 02:28:38 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1998-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1998-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
Index: xc/programs/xterm/config.guess
diff -u xc/programs/xterm/config.guess:1.6 xc/programs/xterm/config.guess:1.8
--- xc/programs/xterm/config.guess:1.6	Fri May 14 23:25:01 1999
+++ xc/programs/xterm/config.guess	Tue Jun 13 17:16:18 2000
@@ -150,6 +150,9 @@
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
+    "Power Macintosh":Rhapsody:*:*)
+	echo powerpc-apple-rhapsody`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
     NILE:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
@@ -563,7 +566,8 @@
 	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
 	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
 	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	  elf32ppc*)  echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	  elf64_ia64) echo "${UNAME_MACHINE}-unknown-linux-gnu"     ; exit 0 ;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
@@ -814,11 +818,11 @@
 	exit 0 ;;
     R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+	exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit 0 ;;
@@ -827,6 +831,12 @@
 	exit 0 ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
+	exit 0 ;;
+    Power*Macintosh:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
 esac
 
Index: xc/programs/xterm/config.sub
diff -u xc/programs/xterm/config.sub:1.6 xc/programs/xterm/config.sub:1.8
--- xc/programs/xterm/config.sub:1.6	Fri May 14 23:25:01 1999
+++ xc/programs/xterm/config.sub	Tue Jun 13 17:16:18 2000
@@ -68,6 +68,10 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
+  hurd-gnu*)
+    os=$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
   linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -157,7 +161,7 @@
 		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
 		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
 		| mipstx39 | mipstx39el \
-		| sparc | sparclet | sparclite | sparc64 | v850)
+		| sparc | sparclet | sparclite | sparc64 | v850 | ia64)
 		basic_machine=$basic_machine-unknown
 		;;
 	# We use `pc' rather than `unknown'
@@ -184,7 +188,7 @@
 	      | sparc64-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
 	      | mipstx39-* | mipstx39el-* \
-	      | f301-*)
+	      | f301-* | ia64-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -723,11 +727,14 @@
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* )
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-hurd*)
+		os=`echo $os `
 		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
Index: xc/programs/xterm/configure
diff -u xc/programs/xterm/configure:3.46 xc/programs/xterm/configure:3.49
--- xc/programs/xterm/configure:3.46	Fri Mar  3 12:02:29 2000
+++ xc/programs/xterm/configure	Mon Jun 12 19:28:38 2000
@@ -205,7 +205,7 @@
   --disable-doublechars   disable support for double-size chars
   --disable-boxchars      disable fallback-support for box chars
   --enable-hp-fkeys       enable support for HP-style function keys
-  --enable-sco-fkeys       enable support for SCO-style function keys
+  --enable-sco-fkeys      enable support for SCO-style function keys
   --disable-i18n          disable internationalization
   --disable-initial-erase disable setup for stty erase
   --disable-input-method  disable input-method
@@ -993,6 +993,40 @@
   fi
 fi
 
+for ac_prog in mawk gawk nawk awk
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1002: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AWK="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+AWK="$ac_cv_prog_AWK"
+if test -n "$AWK"; then
+  echo "$ac_t""$AWK" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$AWK" && break
+done
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1005,7 +1039,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1009: checking for a BSD compatible install" >&5
+echo "configure:1043: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1060,9 +1094,9 @@
 
 ###	checks for UNIX variants that set C preprocessor variables
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1064: checking for AIX" >&5
+echo "configure:1098: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1066 "configure"
+#line 1100 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1084,7 +1118,7 @@
 
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1088: checking for POSIXized ISC" >&5
+echo "configure:1122: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1106,17 +1140,17 @@
 
 ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1110: checking for minix/config.h" >&5
+echo "configure:1144: checking for minix/config.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1115 "configure"
+#line 1149 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1163,17 +1197,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1167: checking for $ac_hdr" >&5
+echo "configure:1201: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1172 "configure"
+#line 1206 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1203,13 +1237,13 @@
 ###	checks for typedefs
 
 echo $ac_n "checking for size_t in <sys/types.h> or <stdio.h>""... $ac_c" 1>&6
-echo "configure:1207: checking for size_t in <sys/types.h> or <stdio.h>" >&5
+echo "configure:1241: checking for size_t in <sys/types.h> or <stdio.h>" >&5
 if eval "test \"`echo '$''{'cf_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 1213 "configure"
+#line 1247 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -1222,7 +1256,7 @@
 size_t x
 ; return 0; }
 EOF
-if { (eval echo configure:1226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_type_size_t=yes
 else
@@ -1242,12 +1276,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1246: checking for ANSI C header files" >&5
+echo "configure:1280: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1251 "configure"
+#line 1285 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1255,7 +1289,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1272,7 +1306,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1276 "configure"
+#line 1310 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1290,7 +1324,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1294 "configure"
+#line 1328 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1311,7 +1345,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1315 "configure"
+#line 1349 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1322,7 +1356,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1346,12 +1380,12 @@
 fi
 
 echo $ac_n "checking for time_t""... $ac_c" 1>&6
-echo "configure:1350: checking for time_t" >&5
+echo "configure:1384: checking for time_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1355 "configure"
+#line 1389 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1389,12 +1423,12 @@
 	
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1393: checking for $ac_func" >&5
+echo "configure:1427: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1398 "configure"
+#line 1432 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1417,7 +1451,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1443,12 +1477,12 @@
 
 
 echo $ac_n "checking for memmove""... $ac_c" 1>&6
-echo "configure:1447: checking for memmove" >&5
+echo "configure:1481: checking for memmove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1452 "configure"
+#line 1486 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove(); below.  */
@@ -1471,7 +1505,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_memmove=yes"
 else
@@ -1490,12 +1524,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for bcopy""... $ac_c" 1>&6
-echo "configure:1494: checking for bcopy" >&5
+echo "configure:1528: checking for bcopy" >&5
 if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1499 "configure"
+#line 1533 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy(); below.  */
@@ -1518,7 +1552,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_bcopy=yes"
 else
@@ -1534,7 +1568,7 @@
   echo "$ac_t""yes" 1>&6
   
 	echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6
-echo "configure:1538: checking if bcopy does overlapping moves" >&5
+echo "configure:1572: checking if bcopy does overlapping moves" >&5
 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1543,7 +1577,7 @@
   cf_cv_good_bcopy=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 1547 "configure"
+#line 1581 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1556,7 +1590,7 @@
 }
 		
 EOF
-if { (eval echo configure:1560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_good_bcopy=yes
 else
@@ -1594,7 +1628,7 @@
 
 
 echo $ac_n "checking for full tgetent function""... $ac_c" 1>&6
-echo "configure:1598: checking for full tgetent function" >&5
+echo "configure:1632: checking for full tgetent function" >&5
 if eval "test \"`echo '$''{'cf_cv_lib_tgetent'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1609,7 +1643,7 @@
   echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
 else
   cat > conftest.$ac_ext <<EOF
-#line 1613 "configure"
+#line 1647 "configure"
 #include "confdefs.h"
 
 /* terminfo implementations ignore the buffer argument, making it useless for
@@ -1623,7 +1657,7 @@
 	tgetent(buffer, "vt100");
 	exit(buffer[0] == 0); }
 EOF
-if { (eval echo configure:1627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5
 	 if test -n "$cf_termlib" ; then
@@ -1659,7 +1693,7 @@
 EOF
 
 	cat > conftest.$ac_ext <<EOF
-#line 1663 "configure"
+#line 1697 "configure"
 #include "confdefs.h"
 
 #include <termcap.h>
@@ -1670,7 +1704,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TERMCAP_H 1
@@ -1688,7 +1722,7 @@
         # validate values for the TERM environment variable given to
         # child processes.
 	echo $ac_n "checking for partial tgetent function""... $ac_c" 1>&6
-echo "configure:1692: checking for partial tgetent function" >&5
+echo "configure:1726: checking for partial tgetent function" >&5
 if eval "test \"`echo '$''{'cf_cv_lib_part_tgetent'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1697,14 +1731,14 @@
 	for cf_termlib in $cf_TERMLIB ; do
 		LIBS="$cf_save_LIBS -l$cf_termlib"
 		cat > conftest.$ac_ext <<EOF
-#line 1701 "configure"
+#line 1735 "configure"
 #include "confdefs.h"
 
 int main() {
 tgetent(0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:1708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "there is a terminfo/tgetent in $cf_termlib" 1>&5
 			 cf_cv_lib_part_tgetent="-l$cf_termlib"
@@ -1727,17 +1761,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1731: checking for $ac_hdr" >&5
+echo "configure:1765: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1736 "configure"
+#line 1770 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1778,17 +1812,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1782: checking for $ac_hdr" >&5
+echo "configure:1816: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1787 "configure"
+#line 1821 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1815,13 +1849,13 @@
 done
 
 echo $ac_n "checking for lastlog path""... $ac_c" 1>&6
-echo "configure:1819: checking for lastlog path" >&5
+echo "configure:1853: checking for lastlog path" >&5
 if eval "test \"`echo '$''{'cf_cv_path_lastlog'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 1825 "configure"
+#line 1859 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -1836,7 +1870,7 @@
 char *path = _PATH_LASTLOG
 ; return 0; }
 EOF
-if { (eval echo configure:1840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -1863,7 +1897,7 @@
 
 
 echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6
-echo "configure:1867: checking for utmp implementation" >&5
+echo "configure:1901: checking for utmp implementation" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1871,7 +1905,7 @@
 	cf_cv_have_utmp=no
 for cf_header in utmpx utmp ; do
 	cat > conftest.$ac_ext <<EOF
-#line 1875 "configure"
+#line 1909 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -1887,7 +1921,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=$cf_header
 	 break
@@ -1897,7 +1931,7 @@
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 1901 "configure"
+#line 1935 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -1913,7 +1947,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:1917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=$cf_header
 	 cat >> confdefs.h <<\EOF
@@ -1948,13 +1982,13 @@
 
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_host is declared""... $ac_c" 1>&6
-echo "configure:1952: checking if utmp.ut_host is declared" >&5
+echo "configure:1986: checking if utmp.ut_host is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_host'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 1958 "configure"
+#line 1992 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -1963,7 +1997,7 @@
 struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_host=yes
 else
@@ -1987,7 +2021,7 @@
 
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking for exit-status in $cf_cv_have_utmp""... $ac_c" 1>&6
-echo "configure:1991: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "configure:2025: checking for exit-status in $cf_cv_have_utmp" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xstatus'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1999,7 +2033,7 @@
 	ut_exit.ut_exit
 do
 cat > conftest.$ac_ext <<EOF
-#line 2003 "configure"
+#line 2037 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2008,7 +2042,7 @@
 struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 ; return 0; }
 EOF
-if { (eval echo configure:2012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -2040,13 +2074,13 @@
 
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6
-echo "configure:2044: checking if utmp.ut_xtime is declared" >&5
+echo "configure:2078: checking if utmp.ut_xtime is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xtime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 2050 "configure"
+#line 2084 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2055,7 +2089,7 @@
 struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 ; return 0; }
 EOF
-if { (eval echo configure:2059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xtime=yes
 else
@@ -2063,7 +2097,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 2067 "configure"
+#line 2101 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2072,7 +2106,7 @@
 struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 ; return 0; }
 EOF
-if { (eval echo configure:2076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -2107,13 +2141,13 @@
 
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6
-echo "configure:2111: checking if utmp.ut_session is declared" >&5
+echo "configure:2145: checking if utmp.ut_session is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_session'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 2117 "configure"
+#line 2151 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2122,7 +2156,7 @@
 struct $cf_cv_have_utmp x; long y = x.ut_session
 ; return 0; }
 EOF
-if { (eval echo configure:2126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_session=yes
 else
@@ -2147,14 +2181,14 @@
 	
 
 echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6
-echo "configure:2151: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "configure:2185: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 if eval "test \"`echo '$''{'cf_cv_sysv_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat > conftest.$ac_ext <<EOF
-#line 2158 "configure"
+#line 2192 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2168,7 +2202,7 @@
 	end${cf_prefix}ent();
 ; return 0; }
 EOF
-if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_sysv_utmp=yes
 else
@@ -2191,7 +2225,7 @@
 
 
 echo $ac_n "checking if you want to link with utempter""... $ac_c" 1>&6
-echo "configure:2195: checking if you want to link with utempter" >&5
+echo "configure:2229: checking if you want to link with utempter" >&5
 
 # Check whether --with-utempter or --without-utempter was given.
 if test "${with_utempter+set}" = set; then
@@ -2206,7 +2240,7 @@
 if test $use_utempter = yes ; then
 	
 echo $ac_n "checking if we can link with utempter library""... $ac_c" 1>&6
-echo "configure:2210: checking if we can link with utempter library" >&5
+echo "configure:2244: checking if we can link with utempter library" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utempter'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2214,7 +2248,7 @@
 cf_save_LIBS="$LIBS"
 LIBS="-lutempter $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2218 "configure"
+#line 2252 "configure"
 #include "confdefs.h"
 
 #include <utempter.h>
@@ -2226,7 +2260,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 	cf_cv_have_utempter=yes
@@ -2253,92 +2287,17 @@
 
 fi
 
-###	checks for structures
-
-echo $ac_n "checking if POSIX VDISABLE symbol should be used""... $ac_c" 1>&6
-echo "configure:2260: checking if POSIX VDISABLE symbol should be used" >&5
-if eval "test \"`echo '$''{'cf_cv_posix_vdisable'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-	if test "$cross_compiling" = yes; then
-  cat > conftest.$ac_ext <<EOF
-#line 2267 "configure"
-#include "confdefs.h"
-
-#if defined(HAVE_TERMIOS_H) && defined(HAVE_TCGETATTR)
-#include <termios.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-int main() {
-
-#if defined(_POSIX_VDISABLE) && (_POSIX_VDISABLE != -1)
-int temp = _POSIX_VDISABLE;
-#else
-this did not work
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:2285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  cf_cv_posix_vdisable=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_cv_posix_vdisable=no
-fi
-rm -f conftest*
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2297 "configure"
-#include "confdefs.h"
-
-#if defined(HAVE_TERMIOS_H) && defined(HAVE_TCGETATTR)
-#include <termios.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if defined(_POSIX_VDISABLE)
-int main() { exit(_POSIX_VDISABLE == -1); }
-#endif
-EOF
-if { (eval echo configure:2310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  cf_cv_posix_vdisable=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  cf_cv_posix_vdisable=no
-fi
-rm -fr conftest*
-fi
-
-
-fi
-
-echo "$ac_t""$cf_cv_posix_vdisable" 1>&6
-test $cf_cv_posix_vdisable = yes && cat >> confdefs.h <<\EOF
-#define HAVE_POSIX_VDISABLE 1
-EOF
-
-
-
 ###	checks for external data
 
 
 echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:2336: checking if external errno is declared" >&5
+echo "configure:2295: checking if external errno is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 2342 "configure"
+#line 2301 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -2351,7 +2310,7 @@
 long x = (long) errno
 ; return 0; }
 EOF
-if { (eval echo configure:2355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_dcl_'errno'=yes'
 else
@@ -2382,13 +2341,13 @@
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:2386: checking if external errno exists" >&5
+echo "configure:2345: checking if external errno exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 2392 "configure"
+#line 2351 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -2398,7 +2357,7 @@
 errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:2402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval 'cf_cv_have_'errno'=yes'
 else
@@ -2428,9 +2387,67 @@
 
 
 
+
+echo $ac_n "checking for tty group name""... $ac_c" 1>&6
+echo "configure:2393: checking for tty group name" >&5
+if eval "test \"`echo '$''{'cf_cv_tty_group_name'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+
+# If we are configuring as root, it is hard to get a clue about the tty group.
+# But we'll guess based on how our connection is set up - assuming it is done
+# properly.
 
-echo $ac_n "checking for tty group""... $ac_c" 1>&6
-echo "configure:2434: checking for tty group" >&5
+cf_uid=`id | sed -e 's/^^=*=//' -e 's/(.*$//'`
+if test "$cf_uid" != 0 ; then
+cf_cv_tty_group_name=
+cf_tty_name=`tty`
+test "$cf_tty_name" = "not a tty" && cf_tty_name=/dev/tty
+test -z "$cf_tty_name" && cf_tty_name=/dev/tty
+if test -c "$cf_tty_name"
+then
+	cf_option="-l -L"
+
+	# Expect listing to have fields like this:
+	#-rwxrwxrwx   1 user      group       34293 Jul 18 16:29 pathname
+	ls $cf_option $cf_tty_name >conftest.out
+	read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <conftest.out
+	if test -z "$cf_rest" ; then
+		cf_option="$cf_option -g"
+		ls $cf_option $cf_tty_name >conftest.out
+		read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest <conftest.out
+	fi
+	rm -f conftest.out
+	cf_cv_tty_group_name=$cf_grp
+fi
+fi
+
+# If we cannot deduce the tty group, fall back on hardcoded cases
+
+if test -z "$cf_cv_tty_group_name"
+then
+case $host_os in #(vi
+osf*) #(vi
+	cf_cv_tty_group_name="terminal"
+	;;
+*)
+	cf_cv_tty_group_name="tty"
+	;;
+esac
+fi
+
+fi
+
+echo "$ac_t""$cf_cv_tty_group_name" 1>&6
+
+cat >> confdefs.h <<EOF
+#define TTY_GROUP_NAME "$cf_cv_tty_group_name"
+EOF
+
+
+echo $ac_n "checking if we may use tty group""... $ac_c" 1>&6
+echo "configure:2451: checking if we may use tty group" >&5
 if eval "test \"`echo '$''{'cf_cv_tty_group'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2439,21 +2456,32 @@
   cf_cv_tty_group=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 2443 "configure"
+#line 2460 "configure"
 #include "confdefs.h"
 
+#include <unistd.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <grp.h>
 int main()
 {
-	struct group *ttygrp;
-	int code = (ttygrp = getgrnam("tty")) == 0;
+	struct stat sb;
+	struct group *ttygrp = getgrnam(TTY_GROUP_NAME);
+	char *name = ttyname(0);
+
 	endgrent();
-	exit(code);
+	if (ttygrp != 0
+	 && name != 0
+	 && stat(name, &sb) == 0
+	 && sb.st_gid != getgid()
+	 && sb.st_gid == ttygrp->gr_gid) {
+		exit(0);
+	}
+	exit(1);
 }
 	
 EOF
-if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_tty_group=yes
 else
@@ -2478,7 +2506,7 @@
 ###	checks for compiler characteristics
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2482: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2510: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2502,7 +2530,7 @@
 do
 	CFLAGS="$cf_save_CFLAGS $cf_arg"
 	cat > conftest.$ac_ext <<EOF
-#line 2506 "configure"
+#line 2534 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -2518,7 +2546,7 @@
 	struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -2545,12 +2573,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2549: checking for working const" >&5
+echo "configure:2577: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2554 "configure"
+#line 2582 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2599,7 +2627,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2623,12 +2651,12 @@
 ###	checks for system services and user specified options
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2627: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2655: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2632 "configure"
+#line 2660 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2644,7 +2672,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2666,14 +2694,200 @@
 
 
 
+echo $ac_n "checking for POSIX wait functions""... $ac_c" 1>&6
+echo "configure:2699: checking for POSIX wait functions" >&5
+if eval "test \"`echo '$''{'cf_cv_posix_wait'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 2705 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+int main() {
+
+	int stat_loc;
+	pid_t pid = waitpid(-1, &stat_loc, WNOHANG|WUNTRACED);
+	pid_t pid2 = wait(&stat_loc);
+
+; return 0; }
+EOF
+if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_posix_wait=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_posix_wait=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_posix_wait" 1>&6
+test "$cf_cv_posix_wait" = yes && cat >> confdefs.h <<\EOF
+#define USE_POSIX_WAIT 1
+EOF
+
+
+
+echo $ac_n "checking if this platform has SYSV flavor""... $ac_c" 1>&6
+echo "configure:2744: checking if this platform has SYSV flavor" >&5
+if eval "test \"`echo '$''{'cf_cv_sysv'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 2750 "configure"
+#include "confdefs.h"
+
+#include <curses.h>
+#include <term.h>
+#include <sys/termio.h>
+
+int main() {
+
+/* FIXME: need a test that excludes linux */
+#ifdef linux
+make an error
+#endif
+static struct termio d_tio;
+	d_tio.c_cc[VINTR] = 0;
+	d_tio.c_cc[VQUIT] = 0;
+	d_tio.c_cc[VERASE] = 0;
+	d_tio.c_cc[VKILL] = 0;
+	d_tio.c_cc[VEOF] = 0;
+	d_tio.c_cc[VEOL] = 0;
+	d_tio.c_cc[VMIN] = 0;
+	d_tio.c_cc[VTIME] = 0;
+
+; return 0; }
+EOF
+if { (eval echo configure:2775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_sysv=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_sysv=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_sysv" 1>&6
+test "$cf_cv_sysv" = yes && cat >> confdefs.h <<\EOF
+#define SYSV 1
+EOF
+
+
+
+echo $ac_n "checking for elf_begin in -lelf""... $ac_c" 1>&6
+echo "configure:2796: checking for elf_begin in -lelf" >&5
+ac_lib_var=`echo elf'_'elf_begin | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lelf  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2804 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char elf_begin();
+
+int main() {
+elf_begin()
+; return 0; }
+EOF
+if { (eval echo configure:2815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+echo $ac_n "checking if this is an SVR4 system""... $ac_c" 1>&6
+echo "configure:2832: checking if this is an SVR4 system" >&5
+if eval "test \"`echo '$''{'cf_cv_svr4'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 2838 "configure"
+#include "confdefs.h"
+
+#include <elf.h>
+#include <sys/termio.h>
+
+int main() {
+
+static struct termio d_tio;
+	d_tio.c_cc[VINTR] = 0;
+	d_tio.c_cc[VQUIT] = 0;
+	d_tio.c_cc[VERASE] = 0;
+	d_tio.c_cc[VKILL] = 0;
+	d_tio.c_cc[VEOF] = 0;
+	d_tio.c_cc[VEOL] = 0;
+	d_tio.c_cc[VMIN] = 0;
+	d_tio.c_cc[VTIME] = 0;
+	d_tio.c_cc[VLNEXT] = 0;
+
+; return 0; }
+EOF
+if { (eval echo configure:2859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_svr4=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_svr4=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_svr4" 1>&6
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test "$cf_cv_svr4" = yes && cat >> confdefs.h <<\EOF
+#define SVR4 1
+EOF
+
+
+
 echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:2671: checking if we must define _GNU_SOURCE" >&5
+echo "configure:2885: checking if we must define _GNU_SOURCE" >&5
 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 2677 "configure"
+#line 2891 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -2683,7 +2897,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_gnu_source=no
 else
@@ -2693,7 +2907,7 @@
   cf_save="$CFLAGS"
 	 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	 cat > conftest.$ac_ext <<EOF
-#line 2697 "configure"
+#line 2911 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -2703,7 +2917,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_gnu_source=no
 else
@@ -2728,7 +2942,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:2732: checking for X" >&5
+echo "configure:2946: checking for X" >&5
 
 
 # Check whether --with-x or --without-x was given.
@@ -2791,12 +3005,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 2795 "configure"
+#line 3009 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2865,14 +3079,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2869 "configure"
+#line 3083 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -2972,7 +3186,7 @@
 	# FIXME: modify the library lookup in autoconf to
 	# allow _s.a suffix ahead of .a
 	echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6
-echo "configure:2976: checking for open in -lc_s" >&5
+echo "configure:3190: checking for open in -lc_s" >&5
 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2980,7 +3194,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2984 "configure"
+#line 3198 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2991,7 +3205,7 @@
 open()
 ; return 0; }
 EOF
-if { (eval echo configure:2995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3008,7 +3222,7 @@
   echo "$ac_t""yes" 1>&6
   LIBS="-lc_s $LIBS"
 	echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6
-echo "configure:3012: checking for gethostname in -lbsd" >&5
+echo "configure:3226: checking for gethostname in -lbsd" >&5
 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3016,7 +3230,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3020 "configure"
+#line 3234 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3027,7 +3241,7 @@
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3044,7 +3258,7 @@
   echo "$ac_t""yes" 1>&6
   LIBS="-lbsd $LIBS"
 	echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6
-echo "configure:3048: checking for gethostname in -lnsl_s" >&5
+echo "configure:3262: checking for gethostname in -lnsl_s" >&5
 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3052,7 +3266,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3056 "configure"
+#line 3270 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3063,7 +3277,7 @@
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3080,7 +3294,7 @@
   echo "$ac_t""yes" 1>&6
   LIBS="-lnsl_s $LIBS"
 	echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6
-echo "configure:3084: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:3298: checking for XOpenDisplay in -lX11_s" >&5
 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3088,7 +3302,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3092 "configure"
+#line 3306 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3099,7 +3313,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:3103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3116,7 +3330,7 @@
   echo "$ac_t""yes" 1>&6
   LIBS="-lX11_s $LIBS"
 	echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6
-echo "configure:3120: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:3334: checking for XtAppInitialize in -lXt_s" >&5
 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3124,7 +3338,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3128 "configure"
+#line 3342 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3135,7 +3349,7 @@
 XtAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:3139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3176,7 +3390,7 @@
 	;;
 *)
 	echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3180: checking for socket in -lsocket" >&5
+echo "configure:3394: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3184,7 +3398,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3188 "configure"
+#line 3402 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3195,7 +3409,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3223,7 +3437,7 @@
 fi
 
 	echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:3227: checking for gethostname in -lnsl" >&5
+echo "configure:3441: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3231,7 +3445,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3235 "configure"
+#line 3449 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3242,7 +3456,7 @@
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3293,17 +3507,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:3297: checking whether -R must be followed by a space" >&5
+echo "configure:3511: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 3300 "configure"
+#line 3514 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -3319,14 +3533,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 3323 "configure"
+#line 3537 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -3358,7 +3572,7 @@
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3362: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3576: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3366,7 +3580,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3370 "configure"
+#line 3584 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3377,7 +3591,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:3381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3399,7 +3613,7 @@
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3403: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3617: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3407,7 +3621,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3411 "configure"
+#line 3625 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3418,7 +3632,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:3422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3447,12 +3661,12 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3451: checking for gethostbyname" >&5
+echo "configure:3665: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3456 "configure"
+#line 3670 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -3475,7 +3689,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -3496,7 +3710,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3500: checking for gethostbyname in -lnsl" >&5
+echo "configure:3714: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3504,7 +3718,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3508 "configure"
+#line 3722 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3515,7 +3729,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3545,12 +3759,12 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:3549: checking for connect" >&5
+echo "configure:3763: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3554 "configure"
+#line 3768 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -3573,7 +3787,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -3594,7 +3808,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3598: checking for connect in -lsocket" >&5
+echo "configure:3812: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3602,7 +3816,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3606 "configure"
+#line 3820 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3613,7 +3827,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:3617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3637,12 +3851,12 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:3641: checking for remove" >&5
+echo "configure:3855: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3646 "configure"
+#line 3860 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -3665,7 +3879,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -3686,7 +3900,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3690: checking for remove in -lposix" >&5
+echo "configure:3904: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3694,7 +3908,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3698 "configure"
+#line 3912 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3705,7 +3919,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:3709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3729,12 +3943,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3733: checking for shmat" >&5
+echo "configure:3947: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3738 "configure"
+#line 3952 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -3757,7 +3971,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -3778,7 +3992,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3782: checking for shmat in -lipc" >&5
+echo "configure:3996: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3786,7 +4000,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3790 "configure"
+#line 4004 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3797,7 +4011,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3830,7 +4044,7 @@
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:3834: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4048: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3838,7 +4052,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3842 "configure"
+#line 4056 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3849,7 +4063,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:3853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3876,7 +4090,7 @@
 	LDFLAGS="$LDFLAGS $X_LIBS"
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:3880: checking for XOpenDisplay in -lX11" >&5
+echo "configure:4094: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3884,7 +4098,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3888 "configure"
+#line 4102 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3895,7 +4109,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3916,7 +4130,7 @@
 fi
 
 	echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:3920: checking for XtAppInitialize in -lXt" >&5
+echo "configure:4134: checking for XtAppInitialize in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3924,7 +4138,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3928 "configure"
+#line 4142 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3935,7 +4149,7 @@
 XtAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3986,22 +4200,23 @@
 
 for ac_hdr in \
 	X11/DECkeysym.h \
+	X11/Sunkeysym.h \
 	X11/Xpoll.h \
 	
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3995: checking for $ac_hdr" >&5
+echo "configure:4210: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4000 "configure"
+#line 4215 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4049,7 +4264,7 @@
 
 
 echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4053: checking for XextCreateExtension in -lXext" >&5
+echo "configure:4268: checking for XextCreateExtension in -lXext" >&5
 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4057,7 +4272,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4061 "configure"
+#line 4276 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4068,7 +4283,7 @@
 XextCreateExtension()
 ; return 0; }
 EOF
-if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4104,13 +4319,13 @@
 		if test $cf_path != default ; then
 			CFLAGS="-I$cf_path/include $cf_save"
 			echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
-echo "configure:4108: checking for $cf_test in $cf_path" >&5
+echo "configure:4323: checking for $cf_test in $cf_path" >&5
 		else
 			echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:4111: checking for $cf_test" >&5
+echo "configure:4326: checking for $cf_test" >&5
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 4114 "configure"
+#line 4329 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -4119,7 +4334,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -4145,21 +4360,21 @@
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
 				echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
-echo "configure:4149: checking for $cf_lib in $cf_path" >&5
+echo "configure:4364: checking for $cf_lib in $cf_path" >&5
 			else
 				LIBS="$cf_lib $LIBS"
 				echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
-echo "configure:4153: checking for $cf_test in $cf_lib" >&5
+echo "configure:4368: checking for $cf_test in $cf_lib" >&5
 			fi
 			cat > conftest.$ac_ext <<EOF
-#line 4156 "configure"
+#line 4371 "configure"
 #include "confdefs.h"
 
 int main() {
 $cf_test()
 ; return 0; }
 EOF
-if { (eval echo configure:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -4197,13 +4412,13 @@
 
 
 echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6
-echo "configure:4201: checking for declaration of fd_set" >&5
+echo "configure:4416: checking for declaration of fd_set" >&5
 if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo "trying sys/types alone" 1>&5
 cat > conftest.$ac_ext <<EOF
-#line 4207 "configure"
+#line 4422 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4211,7 +4426,7 @@
 fd_set x
 ; return 0; }
 EOF
-if { (eval echo configure:4215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_type_fd_set=sys/types.h
 else
@@ -4220,7 +4435,7 @@
   rm -rf conftest*
   echo "trying X11/Xpoll.h" 1>&5
 cat > conftest.$ac_ext <<EOF
-#line 4224 "configure"
+#line 4439 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -4230,7 +4445,7 @@
 fd_set x
 ; return 0; }
 EOF
-if { (eval echo configure:4234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_type_fd_set=X11/Xpoll.h
 else
@@ -4239,7 +4454,7 @@
   rm -rf conftest*
   echo "trying sys/select.h" 1>&5
 cat > conftest.$ac_ext <<EOF
-#line 4243 "configure"
+#line 4458 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4248,7 +4463,7 @@
 fd_set x
 ; return 0; }
 EOF
-if { (eval echo configure:4252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_type_fd_set=sys/select.h
 else
@@ -4273,6 +4488,47 @@
 fi
 
 
+echo $ac_n "checking for IRIX 6.5 baud-rate redefinitions""... $ac_c" 1>&6
+echo "configure:4493: checking for IRIX 6.5 baud-rate redefinitions" >&5
+if eval "test \"`echo '$''{'cf_cv_termio_c_ispeed'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 4499 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <sys/termio.h>
+int main() {
+
+struct termio foo;
+foo.c_ispeed = B38400;
+foo.c_ospeed = B9600;
+
+; return 0; }
+EOF
+if { (eval echo configure:4512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_termio_c_ispeed=yes
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_termio_c_ispeed=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_termio_c_ispeed" 1>&6
+test "$cf_cv_termio_c_ispeed" = yes && cat >> confdefs.h <<\EOF
+#define HAVE_TERMIO_C_ISPEED 1
+EOF
+
+
+
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 LIBS="$LIBS $X_EXTRA_LIBS"
@@ -4282,12 +4538,12 @@
 for ac_func in grantpt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4286: checking for $ac_func" >&5
+echo "configure:4542: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4291 "configure"
+#line 4547 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4310,7 +4566,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4332,7 +4588,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4336: checking for openpty in -lutil" >&5
+echo "configure:4592: checking for openpty in -lutil" >&5
 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4340,7 +4596,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lutil  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4344 "configure"
+#line 4600 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4351,7 +4607,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:4355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4385,7 +4641,7 @@
 # Extract the first word of "xterm", so it can be a program name with args.
 set dummy xterm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4389: checking for $ac_word" >&5
+echo "configure:4645: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XTERM_PATH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4423,12 +4679,12 @@
 	
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4427: checking for $ac_func" >&5
+echo "configure:4683: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4432 "configure"
+#line 4688 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4451,7 +4707,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4477,7 +4733,7 @@
 
 
 echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
-echo "configure:4481: checking if we should use imake to help" >&5
+echo "configure:4737: checking if we should use imake to help" >&5
 
 # Check whether --enable-imake or --disable-imake was given.
 if test "${enable_imake+set}" = set; then
@@ -4502,7 +4758,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4506: checking for $ac_word" >&5
+echo "configure:4762: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_IMAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4641,7 +4897,7 @@
 
 
 echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
-echo "configure:4645: checking for default terminal-id" >&5
+echo "configure:4901: checking for default terminal-id" >&5
 
 # Check whether --with-terminal-id or --without-terminal-id was given.
 if test "${with_terminal_id+set}" = set; then
@@ -4662,7 +4918,7 @@
 
 
 echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
-echo "configure:4666: checking for default terminal-type" >&5
+echo "configure:4922: checking for default terminal-type" >&5
 
 # Check whether --with-terminal-type or --without-terminal-type was given.
 if test "${with_terminal_type+set}" = set; then
@@ -4679,7 +4935,7 @@
 
 
 echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
-echo "configure:4683: checking for private terminfo-directory" >&5
+echo "configure:4939: checking for private terminfo-directory" >&5
 
 # Check whether --with-own-terminfo or --without-own-terminfo was given.
 if test "${with_own_terminfo+set}" = set; then
@@ -4718,7 +4974,7 @@
 
 ###	checks for optional features
 echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
-echo "configure:4722: checking if you want active-icons" >&5
+echo "configure:4978: checking if you want active-icons" >&5
 
 # Check whether --enable-active-icon or --disable-active-icon was given.
 if test "${enable_active_icon+set}" = set; then
@@ -4744,7 +5000,7 @@
 fi
 
 echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
-echo "configure:4748: checking if you want ANSI color" >&5
+echo "configure:5004: checking if you want ANSI color" >&5
 
 # Check whether --enable-ansi-color or --disable-ansi-color was given.
 if test "${enable_ansi_color+set}" = set; then
@@ -4770,7 +5026,7 @@
 if test $enable_ansi_color = yes ; then
 
 	echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6
-echo "configure:4774: checking if you want 16 colors like aixterm" >&5
+echo "configure:5030: checking if you want 16 colors like aixterm" >&5
 	
 # Check whether --enable-16-color or --disable-16-color was given.
 if test "${enable_16_color+set}" = set; then
@@ -4794,7 +5050,7 @@
 
 
 	echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6
-echo "configure:4798: checking if you want 256 colors" >&5
+echo "configure:5054: checking if you want 256 colors" >&5
 	
 # Check whether --enable-256-color or --disable-256-color was given.
 if test "${enable_256_color+set}" = set; then
@@ -4821,7 +5077,7 @@
 
 	else
 	echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6
-echo "configure:4825: checking if you want 88 colors" >&5
+echo "configure:5081: checking if you want 88 colors" >&5
 	
 # Check whether --enable-88-color or --disable-88-color was given.
 if test "${enable_88_color+set}" = set; then
@@ -4852,7 +5108,7 @@
 fi
 
 echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
-echo "configure:4856: checking if you want blinking cursor" >&5
+echo "configure:5112: checking if you want blinking cursor" >&5
 
 # Check whether --enable-blink-cursor or --disable-blink-cursor was given.
 if test "${enable_blink_cursor+set}" = set; then
@@ -4878,7 +5134,7 @@
 if test $enable_ansi_color = yes ; then
 
 	echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6
-echo "configure:4882: checking if you want bold colors mapped like IBM PC" >&5
+echo "configure:5138: checking if you want bold colors mapped like IBM PC" >&5
 	
 # Check whether --enable-bold-color or --disable-bold-color was given.
 if test "${enable_bold_color+set}" = set; then
@@ -4902,7 +5158,7 @@
 
 
 	echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
-echo "configure:4906: checking if you want color-mode enabled by default" >&5
+echo "configure:5162: checking if you want color-mode enabled by default" >&5
 	
 # Check whether --enable-color-mode or --disable-color-mode was given.
 if test "${enable_color_mode+set}" = set; then
@@ -4928,7 +5184,7 @@
 fi
 
 echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
-echo "configure:4932: checking if you want support for color highlighting" >&5
+echo "configure:5188: checking if you want support for color highlighting" >&5
 
 # Check whether --enable-highlighting or --disable-highlighting was given.
 if test "${enable_highlighting+set}" = set; then
@@ -4952,7 +5208,7 @@
 
 
 echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
-echo "configure:4956: checking if you want support for doublesize characters" >&5
+echo "configure:5212: checking if you want support for doublesize characters" >&5
 
 # Check whether --enable-doublechars or --disable-doublechars was given.
 if test "${enable_doublechars+set}" = set; then
@@ -4976,7 +5232,7 @@
 
 
 echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
-echo "configure:4980: checking if you want fallback-support for box characters" >&5
+echo "configure:5236: checking if you want fallback-support for box characters" >&5
 
 # Check whether --enable-boxchars or --disable-boxchars was given.
 if test "${enable_boxchars+set}" = set; then
@@ -5000,7 +5256,7 @@
 
 
 echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
-echo "configure:5004: checking if you want support for HP-style function keys" >&5
+echo "configure:5260: checking if you want support for HP-style function keys" >&5
 
 # Check whether --enable-hp-fkeys or --disable-hp-fkeys was given.
 if test "${enable_hp_fkeys+set}" = set; then
@@ -5026,7 +5282,7 @@
 fi
 
 echo $ac_n "checking if you want support for SCO-style function keys""... $ac_c" 1>&6
-echo "configure:5030: checking if you want support for SCO-style function keys" >&5
+echo "configure:5286: checking if you want support for SCO-style function keys" >&5
 
 # Check whether --enable-sco-fkeys or --disable-sco-fkeys was given.
 if test "${enable_sco_fkeys+set}" = set; then
@@ -5052,7 +5308,7 @@
 fi
 
 echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
-echo "configure:5056: checking if you want support for internationalization" >&5
+echo "configure:5312: checking if you want support for internationalization" >&5
 
 # Check whether --enable-i18n or --disable-i18n was given.
 if test "${enable_i18n+set}" = set; then
@@ -5078,7 +5334,7 @@
 fi
 
 echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
-echo "configure:5082: checking if you want support for initial-erase setup" >&5
+echo "configure:5338: checking if you want support for initial-erase setup" >&5
 
 # Check whether --enable-initial-erase or --disable-initial-erase was given.
 if test "${enable_initial_erase+set}" = set; then
@@ -5104,7 +5360,7 @@
 fi
 
 echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
-echo "configure:5108: checking if you want support for input-method" >&5
+echo "configure:5364: checking if you want support for input-method" >&5
 
 # Check whether --enable-input-method or --disable-input-method was given.
 if test "${enable_input_method+set}" = set; then
@@ -5124,13 +5380,13 @@
 echo "$ac_t""$enable_ximp" 1>&6
 
 echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6
-echo "configure:5128: checking if X libraries support input-method" >&5
+echo "configure:5384: checking if X libraries support input-method" >&5
 if eval "test \"`echo '$''{'cf_cv_input_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 5134 "configure"
+#line 5390 "configure"
 #include "confdefs.h"
 
 #include <X11/IntrinsicP.h>
@@ -5157,7 +5413,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_input_method=yes
 else
@@ -5180,7 +5436,7 @@
 fi
 
 echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
-echo "configure:5184: checking if you want support for logging" >&5
+echo "configure:5440: checking if you want support for logging" >&5
 
 # Check whether --enable-logging or --disable-logging was given.
 if test "${enable_logging+set}" = set; then
@@ -5204,7 +5460,7 @@
 EOF
 
 	echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
-echo "configure:5208: checking if you want to allow logging via a pipe" >&5
+echo "configure:5464: checking if you want to allow logging via a pipe" >&5
 	
 # Check whether --enable-logfile-exec or --disable-logfile-exec was given.
 if test "${enable_logfile_exec+set}" = set; then
@@ -5231,7 +5487,7 @@
 fi
 
 echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
-echo "configure:5235: checking if you want support for iconify/maximize translations" >&5
+echo "configure:5491: checking if you want support for iconify/maximize translations" >&5
 
 # Check whether --enable-maximize or --disable-maximize was given.
 if test "${enable_maximize+set}" = set; then
@@ -5255,7 +5511,7 @@
 
 
 echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
-echo "configure:5259: checking if you want NumLock to override keyboard tables" >&5
+echo "configure:5515: checking if you want NumLock to override keyboard tables" >&5
 
 # Check whether --enable-num-lock or --disable-num-lock was given.
 if test "${enable_num_lock+set}" = set; then
@@ -5279,7 +5535,7 @@
 
 
 echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
-echo "configure:5283: checking if you want support for right-scrollbar" >&5
+echo "configure:5539: checking if you want support for right-scrollbar" >&5
 
 # Check whether --enable-rightbar or --disable-rightbar was given.
 if test "${enable_rightbar+set}" = set; then
@@ -5305,7 +5561,7 @@
 fi
 
 echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
-echo "configure:5309: checking if you want check for redundant name-change" >&5
+echo "configure:5565: checking if you want check for redundant name-change" >&5
 
 # Check whether --enable-samename or --disable-samename was given.
 if test "${enable_samename+set}" = set; then
@@ -5329,7 +5585,7 @@
 
 
 echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
-echo "configure:5333: checking if you want support for tek4014" >&5
+echo "configure:5589: checking if you want support for tek4014" >&5
 
 # Check whether --enable-tek4014 or --disable-tek4014 was given.
 if test "${enable_tek4014+set}" = set; then
@@ -5359,7 +5615,7 @@
 fi
 
 echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6
-echo "configure:5363: checking if you want pulldown menus with a toolbar" >&5
+echo "configure:5619: checking if you want pulldown menus with a toolbar" >&5
 
 # Check whether --enable-toolbar or --disable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then
@@ -5383,7 +5639,7 @@
 
 
 echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
-echo "configure:5387: checking if you want VT52 emulation" >&5
+echo "configure:5643: checking if you want VT52 emulation" >&5
 
 # Check whether --enable-vt52 or --disable-vt52 was given.
 if test "${enable_vt52+set}" = set; then
@@ -5407,7 +5663,7 @@
 
 
 echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
-echo "configure:5411: checking if you want wide-character support" >&5
+echo "configure:5667: checking if you want wide-character support" >&5
 
 # Check whether --enable-wide-chars or --disable-wide-chars was given.
 if test "${enable_wide_chars+set}" = set; then
@@ -5436,7 +5692,7 @@
 fi
 
 echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6
-echo "configure:5440: checking if you want DECterm Locator support" >&5
+echo "configure:5696: checking if you want DECterm Locator support" >&5
 
 # Check whether --enable-dec-locator or --disable-dec-locator was given.
 if test "${enable_dec_locator+set}" = set; then
@@ -5462,7 +5718,7 @@
 fi
 
 echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
-echo "configure:5466: checking if you want -ziconbeep option" >&5
+echo "configure:5722: checking if you want -ziconbeep option" >&5
 
 # Check whether --enable-ziconbeep or --disable-ziconbeep was given.
 if test "${enable_ziconbeep+set}" = set; then
@@ -5487,7 +5743,7 @@
 
 # development/testing aids
 echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
-echo "configure:5491: checking if you want debugging traces" >&5
+echo "configure:5747: checking if you want debugging traces" >&5
 
 # Check whether --enable-trace or --disable-trace was given.
 if test "${enable_trace+set}" = set; then
@@ -5516,7 +5772,7 @@
 
 
 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:5520: checking if you want to see long compiling messages" >&5
+echo "configure:5776: checking if you want to see long compiling messages" >&5
 
 # Check whether --enable-echo or --disable-echo was given.
 if test "${enable_echo+set}" = set; then
@@ -5556,7 +5812,7 @@
 
 
 echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
-echo "configure:5560: checking if you want magic cookie emulation" >&5
+echo "configure:5816: checking if you want magic cookie emulation" >&5
 
 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
 if test "${enable_xmc_glitch+set}" = set; then
@@ -5585,7 +5841,7 @@
 
 if test -n "$GCC" ; then
 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:5589: checking if you want to turn on gcc warnings" >&5
+echo "configure:5845: checking if you want to turn on gcc warnings" >&5
 
 # Check whether --enable-warnings or --disable-warnings was given.
 if test "${enable_warnings+set}" = set; then
@@ -5625,9 +5881,9 @@
 if test -n "$GCC"
 then
 	echo "checking for $CC __attribute__ directives" 1>&6
-echo "configure:5629: checking for $CC __attribute__ directives" >&5
+echo "configure:5885: checking for $CC __attribute__ directives" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 5631 "configure"
+#line 5887 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -5665,7 +5921,7 @@
 EOF
 			;;
 		esac
-		if { (eval echo configure:5669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:5925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
 			cat conftest.h >>confdefs.h
 #		else
@@ -5682,11 +5938,11 @@
 if test -n "$GCC"
 then
 		cat > conftest.$ac_ext <<EOF
-#line 5686 "configure"
+#line 5942 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 		echo "checking for $CC warning options" 1>&6
-echo "configure:5690: checking for $CC warning options" >&5
+echo "configure:5946: checking for $CC warning options" >&5
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
 	cf_warn_CONST=""
@@ -5704,7 +5960,7 @@
 		Wstrict-prototypes $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo configure:5708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:5964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
@@ -5873,6 +6129,7 @@
 s%@host_os@%$host_os%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
+s%@AWK@%$AWK%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
Index: xc/programs/xterm/configure.in
diff -u xc/programs/xterm/configure.in:3.39 xc/programs/xterm/configure.in:3.41
--- xc/programs/xterm/configure.in:3.39	Fri Mar  3 12:02:30 2000
+++ xc/programs/xterm/configure.in	Mon Jun 12 19:28:39 2000
@@ -1,9 +1,9 @@
 dnl
-dnl $XFree86: xc/programs/xterm/configure.in,v 3.39 2000/03/03 20:02:30 dawes Exp $
+dnl $XFree86: xc/programs/xterm/configure.in,v 3.41 2000/06/13 02:28:39 dawes Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
-dnl Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+dnl Copyright 1997-2000 by Thomas E. Dickey
 dnl
 dnl                         All Rights Reserved
 dnl
@@ -36,6 +36,7 @@
 AC_PROG_CC
 AC_PROG_CPP
 AC_GCC_TRADITIONAL
+AC_PROG_AWK
 AC_PROG_INSTALL
 
 ###	checks for UNIX variants that set C preprocessor variables
@@ -77,9 +78,6 @@
 	CF_UTEMPTER
 fi
 
-###	checks for structures
-CF_POSIX_VDISABLE
-
 ###	checks for external data
 CF_ERRNO
 CF_TTY_GROUP
@@ -89,9 +87,10 @@
 AC_CONST
 
 ###	checks for system services and user specified options
-
-AC_HEADER_SYS_WAIT
 
+CF_POSIX_WAIT
+CF_SYSV
+CF_SVR4
 CF_GNU_SOURCE
 CF_X_TOOLKIT
 
@@ -109,11 +108,13 @@
 
 AC_CHECK_HEADERS( \
 	X11/DECkeysym.h \
+	X11/Sunkeysym.h \
 	X11/Xpoll.h \
 	)
 
 CF_X_ATHENA
 CF_TYPE_FD_SET
+CF_TERMIO_C_ISPEED
 
 CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -308,7 +309,7 @@
 
 AC_MSG_CHECKING(if you want support for SCO-style function keys)
 CF_ARG_ENABLE(sco-fkeys,
-	[  --enable-sco-fkeys       enable support for SCO-style function keys],
+	[  --enable-sco-fkeys      enable support for SCO-style function keys],
 	[enable_sco_fkeys=yes],
 	[enable_sco_fkeys=no])
 AC_MSG_RESULT($enable_sco_fkeys)
Index: xc/programs/xterm/doublechr.c
diff -u xc/programs/xterm/doublechr.c:3.9 xc/programs/xterm/doublechr.c:3.10
--- xc/programs/xterm/doublechr.c:3.9	Tue Feb  8 09:19:34 2000
+++ xc/programs/xterm/doublechr.c	Mon Jun 12 19:28:39 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/doublechr.c,v 3.9 2000/02/08 17:19:34 dawes Exp $
+ * $XFree86: xc/programs/xterm/doublechr.c,v 3.10 2000/06/13 02:28:39 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
Index: xc/programs/xterm/fontutils.c
diff -u xc/programs/xterm/fontutils.c:1.16 xc/programs/xterm/fontutils.c:1.18
--- xc/programs/xterm/fontutils.c:1.16	Fri Mar  3 12:02:31 2000
+++ xc/programs/xterm/fontutils.c	Fri Jun 16 17:27:35 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/fontutils.c,v 1.16 2000/03/03 20:02:31 dawes Exp $
+ * $XFree86: xc/programs/xterm/fontutils.c,v 1.18 2000/06/17 00:27:35 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1998-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1998-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -619,7 +619,6 @@
 	}
 	TRACE(("Will %suse internal line-drawing characters\n", screen->fnt_boxes ? "not " : ""));
 #endif
-	screen->force_box_chars = !screen->fnt_boxes;
 
 	screen->enbolden = screen->bold_mode
 		&& ((nfs == bfs) || same_font_name(normal, bfontname));
@@ -757,7 +756,7 @@
 				return True;
 			}
 #endif
-			CI_GET_CHAR_INFO_1D (font, ch, tmp, pc);
+			CI_GET_CHAR_INFO_1D (font, E2A(ch), tmp, pc);
 		}
 #if OPT_WIDE_CHARS
 		else {
Index: xc/programs/xterm/fontutils.h
diff -u xc/programs/xterm/fontutils.h:1.6 xc/programs/xterm/fontutils.h:1.7
--- xc/programs/xterm/fontutils.h:1.6	Sat Sep 25 07:38:30 1999
+++ xc/programs/xterm/fontutils.h	Mon Jun 12 19:28:39 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/fontutils.h,v 1.6 1999/09/25 14:38:30 dawes Exp $
+ * $XFree86: xc/programs/xterm/fontutils.h,v 1.7 2000/06/13 02:28:39 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1998 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1998,1999 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -47,7 +47,6 @@
 extern void xtermSaveFontInfo (TScreen *screen, XFontStruct *font);
 extern void xtermSetCursorBox (TScreen *screen);
 extern void xtermUpdateFontInfo (TScreen *screen, Bool doresize);
-
 
 #if OPT_DEC_CHRSET
 extern char *xtermSpecialFont(unsigned atts, unsigned chrset);
Index: xc/programs/xterm/input.c
diff -u xc/programs/xterm/input.c:3.44 xc/programs/xterm/input.c:3.47
--- xc/programs/xterm/input.c:3.44	Fri Mar  3 12:02:31 2000
+++ xc/programs/xterm/input.c	Mon Jun 12 19:28:39 2000
@@ -1,10 +1,10 @@
 /*
  *	$XConsortium: input.c /main/21 1996/04/17 15:54:23 kaleb $
- *	$XFree86: xc/programs/xterm/input.c,v 3.44 2000/03/03 20:02:31 dawes Exp $
+ *	$XFree86: xc/programs/xterm/input.c,v 3.47 2000/06/13 02:28:39 dawes Exp $
  */
 
 /*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -69,6 +69,10 @@
 #include <X11/DECkeysym.h>
 #endif
 
+#ifdef HAVE_X11_SUNKEYSYM_H
+#include <X11/Sunkeysym.h>
+#endif
+
 #include <X11/Xutil.h>
 #include <X11/StringDefs.h>
 #include <ctype.h>
@@ -202,6 +206,7 @@
 
 	for (n = 0; n < sizeof(table)/sizeof(table[0]); n++) {
 		if (table[n].before == keysym) {
+			TRACE(("...Input keypad before was %#04lx\n", keysym));
 			keysym = table[n].after;
 			TRACE(("...Input keypad changed to %#04lx\n", keysym));
 			break;
@@ -278,6 +283,37 @@
 }
 #endif /* OPT_WIDE_CHARS */
 
+/*
+ * Determine if we use the \E[3~ sequence for Delete, or the legacy ^?.  We
+ * maintain the delete_is_del value as 3 states:  unspecified(2), true and
+ * false.  If unspecified, it is handled differently according to whether the
+ * legacy keybord support is enabled, or if xterm emulates a VT220.
+ *
+ * Once the user (or application) has specified delete_is_del via resource
+ * settting, popup menu or escape sequence, it overrides the keyboard type
+ * rather than the reverse.
+ */
+Boolean
+xtermDeleteIsDEL(void)
+{
+	TScreen *screen = &term->screen;
+	Boolean result = True;
+
+	if (term->keyboard.type == keyboardIsDefault
+	 || term->keyboard.type == keyboardIsVT220)
+		result = (screen->delete_is_del == True);
+
+	if (term->keyboard.type == keyboardIsLegacy)
+		result = (screen->delete_is_del != False);
+
+	TRACE(("xtermDeleteIsDEL(%d/%d) = %d\n",
+		term->keyboard.type,
+		screen->delete_is_del,
+		result));
+
+	return result;
+}
+
 void
 Input (
 	register TKeyboard *keyboard,
@@ -424,24 +460,42 @@
 	 && screen->ansi_level != 0
 #endif
 	) {
-#define ModifierParm(ctl,normal) \
-	    modify_parm = (event->state & ControlMask) ? ctl : normal
+/*
+* Modifier codes:
+*	None		1
+*	Shift		2 = 1(None)+1(Shift)
+*	Alt		3 = 1(None)+2(Alt)
+*	Alt+Shift	4 = 1(None)+1(Shift)+2(Alt)
+*	Ctrl		5 = 1(None)+4(Ctrl)
+*	Ctrl+Shift	6 = 1(None)+1(Shift)+4(Ctrl)
+*	Ctrl+Alt	7 = 1(None)+2(Alt)+4(Ctrl)
+*	Ctrl+Alt+Shift	8 = 1(None)+1(Shift)+2(Alt)+4(Ctrl)
+*/
+#define	UNMOD	1
+#define	SHIFT	1
+#define	ALT	2
+#define	CTRL	4
+#define	META	8
+	    modify_parm = UNMOD;
+	    if (event->state & ShiftMask) {
+		modify_parm += SHIFT;
+	    }
+	    if (event->state & ControlMask) {
+		modify_parm += CTRL;
+	    }
 #if OPT_NUM_LOCK
-	    if (term->misc.real_NumLock
+	    if ((term->misc.alwaysUseMods
+	      || term->misc.real_NumLock)
 	     && ((event->state & term->misc.alt_left) != 0
 	      || (event->state & term->misc.alt_right)) != 0) {
-		if (event->state & ShiftMask) {
-		    ModifierParm(8, 4);
-		} else {
-		    ModifierParm(7, 3);
-		}
-	    } else
-#endif
-	    if (event->state & ShiftMask) {
-		ModifierParm(6, 2);
-	    } else {
-		ModifierParm(5, 1);
+		modify_parm += ALT;
 	    }
+	    if (term->misc.alwaysUseMods
+	     && ((event->state & term->misc.meta_left) != 0
+	      || (event->state & term->misc.meta_right)) != 0) {
+		modify_parm += META;
+	    }
+#endif
 	    TRACE(("...ModifierParm %d\n", modify_parm));
 	}
 
@@ -472,13 +526,15 @@
 
 #if OPT_SUNPC_KBD
 	/* make an DEC editing-keypad from a Sun or PC editing-keypad */
-	if (term->keyboard.type == keyboardIsVT220)
+	if (term->keyboard.type == keyboardIsVT220
+	 && (keysym != XK_Delete || !xtermDeleteIsDEL()))
 		keysym = TranslateFromSUNPC(keysym);
 	else
 #endif
 	{
 #ifdef XK_KP_Home
 	if (keysym >= XK_KP_Home && keysym <= XK_KP_Begin) {
+		TRACE(("...Input keypad before was %#04lx\n", keysym));
 		keysym += XK_Home - XK_KP_Home;
 		TRACE(("...Input keypad changed to %#04lx\n", keysym));
 	}
@@ -533,19 +589,18 @@
 	 } else if (IsFunctionKey(keysym)
 		|| IsMiscFunctionKey(keysym)
 		|| IsEditFunctionKey(keysym)
+#ifdef SunXK_F36
+		|| keysym == SunXK_F36
+		|| keysym == SunXK_F37
+#endif
 		|| (keysym == XK_Delete
 		 && ((modify_parm > 1)
-#if OPT_SUNPC_KBD
-		  || ( !screen->delete_is_del
-		   && term->keyboard.type == keyboardIsDefault)
-		  || term->keyboard.type == keyboardIsVT220
-#endif
-		  ))) {
+		  || !xtermDeleteIsDEL()))) {
 #if OPT_SUNPC_KBD
 		if (term->keyboard.type == keyboardIsVT220) {
 			if ((event->state & ControlMask)
 			 && (keysym >= XK_F1 && keysym <= XK_F12))
-				keysym += 12;
+				keysym += term->misc.ctrl_fkeys;
 		}
 #endif
 
@@ -714,6 +769,10 @@
 		case XK_F18:	return(32);
 		case XK_F19:	return(33);
 		case XK_F20:	return(34);
+#ifdef SunXK_F36
+		case SunXK_F36:	return(57);
+		case SunXK_F37:	return(58);
+#endif
 
 		case XK_Find :	return(1);
 		case XK_Insert:	return(2);
@@ -873,6 +932,10 @@
 		case XK_R13:	return(220);	/* kf43=kend */
 		case XK_R14:	return(221);	/* kf44 */
 		case XK_R15:	return(222);	/* kf45 */
+#ifdef SunXK_F36
+		case SunXK_F36:	return(234);
+		case SunXK_F37:	return(235);
+#endif
 
 		case XK_Find :	return(1);
 		case XK_Insert:	return(2);	/* kich1 */
@@ -990,29 +1053,32 @@
 	    }
 	}
 
-	/*
-	 * If the Alt modifier is used in translations, we would rather not
-	 * use it to modify function-keys when NumLock is active.
-	 */
-	if ((term->misc.alt_left != 0
-	  || term->misc.alt_right != 0)
-	 && (TranslationsUseKeyword(toplevel, "alt")
-	  || TranslationsUseKeyword((Widget)term, "alt"))) {
-	    TRACE(("ALT is used as a modifier in translations (ignore mask)\n"));
-	    term->misc.alt_left = 0;
-	    term->misc.alt_right = 0;
-	}
+	/* Don't disable any mods if "alwaysUseMods" is true. */
+	if (!term->misc.alwaysUseMods) {
+	    /*
+	     * If the Alt modifier is used in translations, we would rather not
+	     * use it to modify function-keys when NumLock is active.
+	     */
+	    if ((term->misc.alt_left != 0
+	      || term->misc.alt_right != 0)
+	     && (TranslationsUseKeyword(toplevel, "alt")
+	      || TranslationsUseKeyword((Widget)term, "alt"))) {
+		TRACE(("ALT is used as a modifier in translations (ignore mask)\n"));
+		term->misc.alt_left = 0;
+		term->misc.alt_right = 0;
+	    }
 
-	/*
-	 * If the Meta modifier is used in translations, we would rather not
-	 * use it to modify function-keys.
-	 */
-	if ((term->misc.meta_left != 0
-	  || term->misc.meta_right != 0)
-	 && (TranslationsUseKeyword(toplevel, "meta")
-	  || TranslationsUseKeyword((Widget)term, "meta"))) {
-	    TRACE(("META is used as a modifier in translations\n"));
-	    term->misc.meta_trans = True;
+	    /*
+	     * If the Meta modifier is used in translations, we would rather not
+	     * use it to modify function-keys.
+	     */
+	    if ((term->misc.meta_left != 0
+	      || term->misc.meta_right != 0)
+	     && (TranslationsUseKeyword(toplevel, "meta")
+	      || TranslationsUseKeyword((Widget)term, "meta"))) {
+		TRACE(("META is used as a modifier in translations\n"));
+		term->misc.meta_trans = True;
+	    }
 	}
 
 	XFreeModifiermap(keymap);
Index: xc/programs/xterm/main.c
diff -u xc/programs/xterm/main.c:3.109 xc/programs/xterm/main.c:3.115
--- xc/programs/xterm/main.c:3.109	Fri Mar  3 12:02:32 2000
+++ xc/programs/xterm/main.c	Mon Jun 19 22:08:50 2000
@@ -64,7 +64,7 @@
 
 ******************************************************************/
 
-/* $XFree86: xc/programs/xterm/main.c,v 3.109 2000/03/03 20:02:32 dawes Exp $ */
+/* $XFree86: xc/programs/xterm/main.c,v 3.115 2000/06/20 05:08:50 dawes Exp $ */
 
 
 /* main.c */
@@ -101,7 +101,6 @@
 #include <module/name.h>
 
 #define USE_TERMIOS
-#define USE_POSIX_WAIT
 #define NILCAP ((capability *)NULL)
 #endif
 
@@ -121,7 +120,11 @@
 #define BSDLY	0
 #define VTDLY	0
 #define FFDLY	0
+#else /* MINIX */
+#ifdef DEBUG
+#include <time.h>
 #endif
+#endif /* MINIX */
 
 #ifdef att
 #define ATT
@@ -129,6 +132,7 @@
 
 #ifdef __osf__
 #define USE_SYSV_SIGNALS
+#define WTMP
 #endif
 
 #ifdef SVR4
@@ -175,6 +179,7 @@
 #ifdef __GLIBC__
 #if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
 #include <pty.h>
+#include <stdlib.h> /* getpt() */
 #endif
 #endif
 #endif
@@ -220,6 +225,10 @@
 #include <grp.h>
 #endif
 
+#ifndef TTY_GROUP_NAME
+#define TTY_GROUP_NAME "tty"
+#endif
+
 #ifndef __CYGWIN__
 #include <sys/ioctl.h>
 #endif
@@ -306,16 +315,17 @@
 #include <sys/resource.h>
 #endif
 
-#ifdef SCO
-#define USE_POSIX_WAIT
-#endif /* SCO */
-
 #ifdef __hpux
 #define HAS_BSD_GROUPS
-#define USE_POSIX_WAIT
 #include <sys/ptyio.h>
 #endif /* __hpux */
 
+#ifdef __osf__
+#define HAS_BSD_GROUPS
+#undef  USE_SYSV_PGRP
+#define setpgrp setpgid
+#endif
+
 #ifdef __sgi
 #define HAS_BSD_GROUPS
 #include <sys/sysmacros.h>
@@ -327,20 +337,19 @@
 
 #else /* } !SYSV { */			/* BSD systems */
 
-#ifdef MINIX /* { */
+#ifndef MINIX /* { */
 
-#else /* } !MINIX { */
-
 #ifdef __QNX__
+
 #undef TIOCSLTC  /* <sgtty.h> conflicts with <termios.h> */
 #undef TIOCLSET
-#define USE_POSIX_WAIT
 #ifndef __QNXNTO__
 #define ttyslot() 1
 #else
 #define USE_SYSV_PGRP
 extern __inline__ ttyslot() {return 1;} /* yuk */
 #endif
+
 #else
 
 #ifndef linux
@@ -356,9 +365,6 @@
 #include <resource.h>
 #endif
 #define HAS_BSD_GROUPS
-#ifdef __osf__
-#define setpgrp setpgid
-#endif
 #endif /* !VMS */
 #endif /* !linux */
 
@@ -368,12 +374,7 @@
 
 #endif	/* } !SYSV */
 
-#ifdef _POSIX_SOURCE
-#define USE_POSIX_WAIT
-#endif
-
 #ifdef SVR4
-#define USE_POSIX_WAIT
 #define HAS_SAVED_IDS_AND_SETEUID
 #endif
 
@@ -393,7 +394,6 @@
 #endif
 
 #if defined(BSD) && (BSD >= 199103)
-#define USE_POSIX_WAIT
 #define WTMP
 #define HAS_SAVED_IDS_AND_SETEUID
 #endif
@@ -566,6 +566,15 @@
 #define TERMCAP_ERASE "kb"
 #define VAL_INITIAL_ERASE A2E(127)
 
+/* choose a nice default value for speed - if we make it too low, users who
+ * mistakenly use $TERM set to vt100 will get padding delays
+ */
+#ifdef B38400	/* everyone should define this */
+#define VAL_LINE_SPEED B38400
+#else		/* ...but xterm's used this for a long time */
+#define VAL_LINE_SPEED B9600
+#endif
+
 /* allow use of system default characters if defined and reasonable */
 #ifndef CBRK
 #define CBRK 0
@@ -951,6 +960,8 @@
 {"-leftbar",	"*rightScrollBar", XrmoptionNoArg,	(caddr_t) "off"},
 {"-rightbar",	"*rightScrollBar", XrmoptionNoArg,	(caddr_t) "on"},
 #endif
+{"-rvc",	"*colorRVMode",	XrmoptionNoArg,		(caddr_t) "off"},
+{"+rvc",	"*colorRVMode",	XrmoptionNoArg,		(caddr_t) "on"},
 {"-sf",		"*sunFunctionKeys", XrmoptionNoArg,	(caddr_t) "on"},
 {"+sf",		"*sunFunctionKeys", XrmoptionNoArg,	(caddr_t) "off"},
 {"-si",		"*scrollTtyOutput", XrmoptionNoArg,	(caddr_t) "off"},
@@ -1077,6 +1088,7 @@
 { "-rightbar",             "force scrollbar right (default left)" },
 { "-leftbar",              "force scrollbar left" },
 #endif
+{ "-/+rvc",		   "turn off/on display of reverse as color" },
 { "-/+sf",                 "turn on/off Sun Function Key escape codes" },
 { "-/+si",                 "turn on/off scroll-on-tty-output inhibit" },
 { "-/+sk",                 "turn on/off scroll-on-keypress" },
@@ -1133,6 +1145,26 @@
 "will be started.  Options that start with a plus sign (+) restore the default.",
 NULL};
 
+static Boolean get_termcap(char *name, char *buffer, char *resized)
+{
+    register TScreen *screen = &term->screen;
+
+    *buffer = 0;	/* initialize, in case we're using terminfo's tgetent */
+
+    if (name != 0) {
+	if (tgetent (buffer, name) == 1
+	 && *buffer) {
+	    if (!TEK4014_ACTIVE(screen)) {
+		resize (screen, buffer, resized);
+	    }
+	    return True;
+	} else {
+	    *buffer = 0;
+	}
+    }
+    return False;
+}
+
 static int abbrev (char *tst, char *cmp)
 {
 	size_t len = strlen(tst);
@@ -1274,6 +1306,7 @@
 	/* Do these first, since we may not be able to open the display */
 	ProgramName = argv[0];
 	if (argc > 1) {
+		int n;
 		if (abbrev(argv[1], "-version"))
 			Version();
 		if (abbrev(argv[1], "-help"))
@@ -1343,7 +1376,7 @@
 #endif
 #endif
 #if defined(macII) || defined(ATT) || defined(CRAY) /* { */
-	d_tio.c_cflag = B9600|CS8|CREAD|PARENB|HUPCL;
+	d_tio.c_cflag = VAL_LINE_SPEED|CS8|CREAD|PARENB|HUPCL;
 	d_tio.c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK;
 #ifdef ECHOKE
 	d_tio.c_lflag |= ECHOKE|IEXTEN;
@@ -1395,12 +1428,12 @@
 #ifdef BAUD_0 /* { */
 	d_tio.c_cflag = CS8|CREAD|PARENB|HUPCL;
 #else	/* }{ !BAUD_0 */
-	d_tio.c_cflag = B9600|CS8|CREAD|PARENB|HUPCL;
+	d_tio.c_cflag = VAL_LINE_SPEED|CS8|CREAD|PARENB|HUPCL;
 #endif	/* } !BAUD_0 */
 #else /* USE_POSIX_TERMIOS */
 	d_tio.c_cflag = CS8|CREAD|PARENB|HUPCL;
-	cfsetispeed(&d_tio, B9600);
-	cfsetospeed(&d_tio, B9600);
+	cfsetispeed(&d_tio, VAL_LINE_SPEED);
+	cfsetospeed(&d_tio, VAL_LINE_SPEED);
 #endif
 	d_tio.c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK;
 #ifdef ECHOKE
@@ -1801,10 +1834,13 @@
 	/* Set up stderr properly.  Opening this log file cannot be
 	 done securely by a privileged xterm process (although we try),
 	 so the debug feature is disabled by default. */
+	char dbglogfile[45];
 	int i = -1;
 	if(debug) {
-		creat_as (getuid(), getgid(), "xterm.debug.log", 0666);
-		i = open ("xterm.debug.log", O_WRONLY | O_TRUNC, 0666);
+		timestamp_filename(dbglogfile, "xterm.debug.log.");
+		if(creat_as (getuid(), getgid(), False, dbglogfile, 0666)) {
+			i = open (dbglogfile, O_WRONLY | O_TRUNC, 0666);
+		}
 	}
 	if(i >= 0) {
 #if defined(USE_SYSV_TERMIO) && !defined(SVR4) && !defined(linux)
@@ -1822,11 +1858,7 @@
 #endif
 		_bufend(stderr) = old_bufend;
 #else	/* USE_SYSV_TERMIO */
-#ifndef linux
-		stderr->_file = i;
-#else
-		setfileno(stderr, i);
-#endif
+		freopen(dbglogfile, "w", stderr);
 #endif	/* USE_SYSV_TERMIO */
 
 		/* mark this file as close on exec */
@@ -2079,7 +2111,7 @@
 static int
 pty_search(int *pty)
 {
-    static int devindex, letter = 0;
+    static int devindex = 0, letter = 0;
 
 #if defined(CRAY) || defined(__MVS__)
     for (; devindex < MAXPTTYS; devindex++) {
@@ -2414,6 +2446,9 @@
 		no_dev_tty = FALSE;
 		if (tty < 0) {
 			if (tty_got_hung || errno == ENXIO || errno == EIO ||
+#ifdef ENODEV
+			    errno == ENODEV ||
+#endif
 			    errno == EINVAL || errno == ENOTTY || errno == EACCES) {
 				no_dev_tty = TRUE;
 #ifdef HAS_LTCHARS
@@ -2570,16 +2605,7 @@
 	 * the program to proceed (but not to set $TERMCAP) if the termcap
 	 * entry is not found.
 	 */
-	*ptr = 0;	/* initialize, in case we're using terminfo's tgetent */
-	TermName = NULL;
-	if (resource.term_name) {
-	    TermName = resource.term_name;
-	    if (tgetent (ptr, resource.term_name) == 1) {
-		if (*ptr)
-		    if (!TEK4014_ACTIVE(screen))
-			resize (screen, termcap, newtc);
-	    }
-	}
+	get_termcap(TermName = resource.term_name, ptr, newtc);
 
 	/*
 	 * This block is invoked only if there was no terminal name specified
@@ -2588,12 +2614,9 @@
 	if (!TermName) {
 	    TermName = *envnew;
 	    while (*envnew != NULL) {
-		if(tgetent(ptr, *envnew) == 1) {
-			TermName = *envnew;
-			if (*ptr)
-			    if(!TEK4014_ACTIVE(screen))
-				resize(screen, termcap, newtc);
-			break;
+		if (get_termcap(*envnew, ptr, newtc)) {
+		    TermName = *envnew;
+		    break;
 		}
 		envnew++;
 	    }
@@ -2871,7 +2894,7 @@
 #ifdef USE_TTY_GROUP
 	{
 		struct group *ttygrp;
-		if ((ttygrp = getgrnam("tty")) != 0) {
+		if ((ttygrp = getgrnam(TTY_GROUP_NAME)) != 0) {
 			/* change ownership of tty to real uid, "tty" gid */
 			set_owner (ttydev, screen->uid, ttygrp->gr_gid,
 				   (resource.messages? 0620 : 0600));
@@ -2921,21 +2944,21 @@
 		    tio.c_oflag |= OPOST;
 #endif /* OPOST */
 #ifdef MINIX	/* should be ifdef _POSIX_SOURCE */
-		    cfsetispeed(&tio, B9600);
-		    cfsetospeed(&tio, B9600);
+		    cfsetispeed(&tio, VAL_LINE_SPEED);
+		    cfsetospeed(&tio, VAL_LINE_SPEED);
 #else /* !MINIX */
 #ifndef USE_POSIX_TERMIOS
+		    tio.c_cflag &= ~(CBAUD);
 #ifdef BAUD_0
 		    /* baud rate is 0 (don't care) */
-		    tio.c_cflag &= ~(CBAUD);
+#elif defined(HAVE_TERMIO_C_ISPEED)
+		    tio.c_ispeed = tio.c_ospeed = VAL_LINE_SPEED;
 #else	/* !BAUD_0 */
-		    /* baud rate is 9600 (nice default) */
-		    tio.c_cflag &= ~(CBAUD);
-		    tio.c_cflag |= B9600;
+		    tio.c_cflag |= VAL_LINE_SPEED;
 #endif	/* !BAUD_0 */
 #else /* USE_POSIX_TERMIOS */
-		    cfsetispeed(&tio, B9600);
-		    cfsetospeed(&tio, B9600);
+		    cfsetispeed(&tio, VAL_LINE_SPEED);
+		    cfsetospeed(&tio, VAL_LINE_SPEED);
 #ifdef __MVS__
 		    /* turn off bits that can't be set from the slave side */
 		    tio.c_cflag &= ~(PACKET|PKT3270|PTU3270|PKTXTND);
@@ -3079,8 +3102,8 @@
 		    sg.sg_flags &= ~(ALLDELAY | XTABS | CBREAK | RAW);
 		    sg.sg_flags |= ECHO | CRMOD;
 		    /* make sure speed is set on pty so that editors work right*/
-		    sg.sg_ispeed = B9600;
-		    sg.sg_ospeed = B9600;
+		    sg.sg_ispeed = VAL_LINE_SPEED;
+		    sg.sg_ospeed = VAL_LINE_SPEED;
 		    /* reset t_brkc to default value */
 		    tc.t_brkc = -1;
 #ifdef LPASS8
@@ -3263,17 +3286,9 @@
 		ioctl(0, TIOCSCTTY, 0);
 #endif
 		ioctl(0, TIOCSPGRP, (char *)&pgrp);
-#ifndef __osf__
 		setpgrp(0,0);
-#else
-		setpgid(0,0);
-#endif
 		close(open(ttydev, O_WRONLY, 0));
-#ifndef __osf__
 		setpgrp (0, pgrp);
-#else
-		setpgid (0, pgrp);
-#endif
 #endif /* !USE_SYSV_PGRP */
 
 #if defined(__QNX__)
@@ -3323,7 +3338,7 @@
 		(void) setutent ();
 		/* set up entry to search for */
 		ptyname = ttydev;
-		bzero(&utmp, sizeof(utmp));
+		bzero((char *)&utmp, sizeof(utmp));
 #ifndef __sgi
 		if (PTYCHARLEN >= (int)strlen(ptyname))
 		    ptynameptr = ptyname;
@@ -3337,7 +3352,13 @@
 		utmp.ut_type = DEAD_PROCESS;
 
 		/* position to entry in utmp file */
-		(void) getutid(&utmp);
+		/* Test return value: beware of entries left behind: PSz 9 Mar 00 */
+		if (! getutid(&utmp)) {
+		    utmp.ut_type = USER_PROCESS;
+		    if (! getutid(&utmp)) {
+			(void) setutent();
+		    }
+		}
 
 		/* set up the new entry */
 		utmp.ut_type = USER_PROCESS;
@@ -3392,7 +3413,7 @@
 #else
 		if (term->misc.login_shell &&
 		     (i = open(etc_wtmp, O_WRONLY|O_APPEND)) >= 0) {
-		    write(i, (char *)&utmp, sizeof(struct utmp));
+		    write(i, (char *)&utmp, sizeof(utmp));
 		    close(i);
 		}
 #endif
@@ -3409,7 +3430,7 @@
 		{
 			if (pw && !resource.utmpInhibit &&
 			    (i = open(etc_utmp, O_WRONLY)) >= 0) {
-				bzero((char *)&utmp, sizeof(struct utmp));
+				bzero((char *)&utmp, sizeof(utmp));
 				(void) strncpy(utmp.ut_line,
 					       ttydev + strlen("/dev/"),
 					       sizeof(utmp.ut_line));
@@ -3426,8 +3447,8 @@
 #endif
 				/* cast needed on Ultrix 4.4 */
 				time((time_t*)&utmp.ut_time);
-				lseek(i, (long)(tslot * sizeof(struct utmp)), 0);
-				write(i, (char *)&utmp, sizeof(struct utmp));
+				lseek(i, (long)(tslot * sizeof(utmp)), 0);
+				write(i, (char *)&utmp, sizeof(utmp));
 				close(i);
 				added_utmp_entry = True;
 #if defined(WTMP)
@@ -3435,16 +3456,15 @@
 				(i = open(etc_wtmp, O_WRONLY|O_APPEND)) >= 0) {
 				    int status;
 				    status = write(i, (char *)&utmp,
-						   sizeof(struct utmp));
+						   sizeof(utmp));
 				    status = close(i);
 				}
 #elif defined(MNX_LASTLOG)
 				if (term->misc.login_shell &&
 				(i = open(_U_LASTLOG, O_WRONLY)) >= 0) {
 				    lseek(i, (long)(screen->uid *
-					sizeof (struct utmp)), 0);
-				    write(i, (char *)&utmp,
-					sizeof (struct utmp));
+					sizeof (utmp)), 0);
+				    write(i, (char *)&utmp, sizeof (utmp));
 				    close(i);
 				}
 #endif /* WTMP or MNX_LASTLOG */
@@ -3461,23 +3481,22 @@
 #endif /* USE_SYSV_UTMP */
 
 #ifdef USE_LASTLOG
-				if (term->misc.login_shell &&
-				(i = open(etc_lastlog, O_WRONLY)) >= 0) {
-				    bzero((char *)&lastlog,
-					sizeof (struct lastlog));
-				    (void) strncpy(lastlog.ll_line, ttydev +
-					sizeof("/dev"),
-					sizeof (lastlog.ll_line));
-				    (void) strncpy(lastlog.ll_host,
-					  XDisplayString (screen->display),
-					  sizeof (lastlog.ll_host));
-				    time(&lastlog.ll_time);
-				    lseek(i, (long)(screen->uid *
-					sizeof (struct lastlog)), 0);
-				    write(i, (char *)&lastlog,
-					sizeof (struct lastlog));
-				    close(i);
-				}
+		if (term->misc.login_shell &&
+		(i = open(etc_lastlog, O_WRONLY)) >= 0) {
+		    bzero((char *)&lastlog, sizeof (struct lastlog));
+		    (void) strncpy(lastlog.ll_line, ttydev +
+			sizeof("/dev"),
+			sizeof (lastlog.ll_line));
+		    (void) strncpy(lastlog.ll_host,
+			  XDisplayString (screen->display),
+			  sizeof (lastlog.ll_host));
+		    time(&lastlog.ll_time);
+		    lseek(i, (long)(screen->uid *
+			sizeof (struct lastlog)), 0);
+		    write(i, (char *)&lastlog,
+			sizeof (struct lastlog));
+		    close(i);
+		}
 #endif /* USE_LASTLOG */
 
 #ifdef USE_HANDSHAKE
@@ -3493,10 +3512,17 @@
 
 		(void) setgid (screen->gid);
 #ifdef HAS_BSD_GROUPS
-		if (geteuid() == 0 && pw)
-		  initgroups (pw->pw_name, pw->pw_gid);
+		if (geteuid() == 0 && pw) {
+		    if (initgroups (pw->pw_name, pw->pw_gid)) {
+			perror( "initgroups failed" );
+			exit (errno);
+		    }
+		}
 #endif
-		(void) setuid (screen->uid);
+		if (setuid (screen->uid)) {
+			perror( "setuid failed" );
+			exit (errno);
+		}
 
 #ifdef USE_HANDSHAKE
 		/* mark the pipes as close on exec */
@@ -3577,8 +3603,12 @@
 		}
 #if OPT_INITIAL_ERASE
 		if (*newtc) {
+		    unsigned len;
 		    remove_termcap_entry (newtc, TERMCAP_ERASE "=");
-		    sprintf(newtc + strlen(newtc), ":%s=\\%03o", TERMCAP_ERASE, initial_erase & 0377);
+		    len = strlen(newtc);
+		    if (len != 0 && newtc[len-1] == ':')
+			len--;
+		    sprintf(newtc + len, ":%s=\\%03o:", TERMCAP_ERASE, initial_erase & 0377);
 		}
 #endif
 		if(*newtc)
@@ -3923,25 +3953,13 @@
 	ptr = termcap;
     }
 
-    *ptr = 0;
-    TermName = NULL;
-    if (resource.term_name) {
-	TermName = resource.term_name;
-	if (tgetent (ptr, resource.term_name) == 1) {
-	    if (*ptr)
-		if (!TEK4014_ACTIVE(screen))
-		    resize (screen, termcap, newtc);
-	}
-    }
+    get_termcap(TermName = resource.term_name, ptr, newtc);
 
     if (!TermName) {
 	TermName = *envnew;
 	while (*envnew != NULL) {
-	    if(tgetent(ptr, *envnew) == 1) {
+	    if (get_termcap(*envnew, ptr, newtc)) {
 		TermName = *envnew;
-		if (*ptr)
-		    if(!TEK4014_ACTIVE(screen))
-			resize(screen, termcap, newtc);
 		break;
 	    }
 	    envnew++;
@@ -4220,9 +4238,9 @@
 
 	if (!resource.utmpInhibit && added_utmp_entry &&
 	    (!am_slave && tslot > 0 && (wfd = open(etc_utmp, O_WRONLY)) >= 0)){
-		bzero((char *)&utmp, sizeof(struct utmp));
-		lseek(wfd, (long)(tslot * sizeof(struct utmp)), 0);
-		write(wfd, (char *)&utmp, sizeof(struct utmp));
+		bzero((char *)&utmp, sizeof(utmp));
+		lseek(wfd, (long)(tslot * sizeof(utmp)), 0);
+		write(wfd, (char *)&utmp, sizeof(utmp));
 		close(wfd);
 #ifdef WTMP
 		if (term->misc.login_shell &&
@@ -4231,7 +4249,7 @@
 			(void) strncpy(utmp.ut_line, ttydev +
 			    sizeof("/dev"), sizeof (utmp.ut_line));
 			time(&utmp.ut_time);
-			i = write(wfd, (char *)&utmp, sizeof(struct utmp));
+			i = write(wfd, (char *)&utmp, sizeof(utmp));
 			i = close(wfd);
 		}
 #endif /* WTMP */
@@ -4430,7 +4448,7 @@
 
 	if (*s == '^') {
 	    s++;
-	    c = ((*s == '?') ? 0177 : CONTROL(*s));
+	    c = ((*s == '?') ? A2E(0177) : CONTROL(*s));
 	    if (*s == '-') {
 		c = -1;
 		errno = 0;
@@ -4548,45 +4566,6 @@
     c = x;
     __etoa_l(&c,1);
     return c;
-}
-
-char CONTROL(char c)
-{
-    /* this table was built through trial & error */
-    static char ebcdic_control_chars[256]={
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 00 - 07 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 08 - 0f */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 10 - 17 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 18 - 1f */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 20 - 27 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 28 - 2f */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 30 - 37 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 38 - 3f */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 40 - 47 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 48 - 4f */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 50 - 57 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 58 - 5f */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00,   /* 60 - 67 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,   /* 68 - 6f */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 70 - 77 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 78 - 7f */
-                0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f,   /* 80 - 87 */
-                0x16, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 88 - 8f */
-                0x00, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,   /* 90 - 97 */
-                0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* 98 - 9f */
-                0x00, 0x00, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18,   /* a0 - a7 */
-                0x19, 0x3f, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00,   /* a8 - af */
-                0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* b0 - b7 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00,   /* b8 - bf */
-                0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f,   /* c0 - c7 */
-                0x16, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* c8 - cf */
-                0x00, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,   /* d0 - d7 */
-                0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* d8 - df */
-                0x1c, 0x00, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18,   /* e0 - e7 */
-                0x19, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* e8 - ef */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* f0 - f7 */
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};  /* f8 - ff */
-    return ebcdic_control_chars[CharOf(c)];
 }
 #endif
 
Index: xc/programs/xterm/menu.c
diff -u xc/programs/xterm/menu.c:3.32 xc/programs/xterm/menu.c:3.35
--- xc/programs/xterm/menu.c:3.32	Fri Mar  3 12:02:33 2000
+++ xc/programs/xterm/menu.c	Tue Jun 13 17:16:19 2000
@@ -1,8 +1,8 @@
 /* $XConsortium: menu.c /main/66 1996/12/01 23:46:59 swick $ */
-/* $XFree86: xc/programs/xterm/menu.c,v 3.32 2000/03/03 20:02:33 dawes Exp $ */
+/* $XFree86: xc/programs/xterm/menu.c,v 3.35 2000/06/14 00:16:19 dawes Exp $ */
 /*
 
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -193,16 +193,16 @@
     { "meta-esc",	do_meta_esc,	NULL },
 #endif
     { "delete-is-del",	do_delete_del,	NULL },
-    { "old function-keys",do_old_fkeys,	NULL },
+    { "oldFunctionKeys",do_old_fkeys,	NULL },
 #if OPT_HP_FUNC_KEYS
-    { "hp function-keys",do_hp_fkeys,	NULL },
+    { "hpFunctionKeys",	do_hp_fkeys,	NULL },
 #endif
 #if OPT_SCO_FUNC_KEYS
-    { "sco function-keys",do_sco_fkeys,	NULL },
+    { "scoFunctionKeys",do_sco_fkeys,	NULL },
 #endif
-    { "sun function-keys",do_sun_fkeys,	NULL },
+    { "sunFunctionKeys",do_sun_fkeys,	NULL },
 #if OPT_SUNPC_KBD
-    { "sun keyboard",	do_sun_kbd,	NULL },
+    { "sunKeyboard",	do_sun_kbd,	NULL },
 #endif
     { "line2",		NULL,		NULL },
     { "suspend",	do_suspend,	NULL },
@@ -765,7 +765,10 @@
 	XtPointer closure GCC_UNUSED,
 	XtPointer data GCC_UNUSED)
 {
-    term->screen.delete_is_del = ! term->screen.delete_is_del;
+    if (xtermDeleteIsDEL())
+	term->screen.delete_is_del = False;
+    else
+	term->screen.delete_is_del = True;
     update_delete_del();
 }
 
Index: xc/programs/xterm/menu.h
diff -u xc/programs/xterm/menu.h:3.21 xc/programs/xterm/menu.h:3.23
--- xc/programs/xterm/menu.h:3.21	Fri Mar  3 12:02:34 2000
+++ xc/programs/xterm/menu.h	Mon Jun 12 19:28:40 2000
@@ -1,8 +1,8 @@
 /* $XConsortium: menu.h /main/27 1996/12/01 23:47:03 swick $ */
-/* $XFree86: xc/programs/xterm/menu.h,v 3.21 2000/03/03 20:02:34 dawes Exp $ */
+/* $XFree86: xc/programs/xterm/menu.h,v 3.23 2000/06/13 02:28:40 dawes Exp $ */
 /*
 
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -337,7 +337,7 @@
 #define update_delete_del() \
   update_menu_item (term->screen.mainMenu, \
 		    mainMenuEntries[mainMenu_delete_del].widget, \
-		    term->screen.delete_is_del)
+		    xtermDeleteIsDEL())
 
 #if OPT_SUNPC_KBD
 #define update_sun_kbd() \
Index: xc/programs/xterm/misc.c
diff -u xc/programs/xterm/misc.c:3.49 xc/programs/xterm/misc.c:3.53
--- xc/programs/xterm/misc.c:3.49	Mon Feb 28 19:09:27 2000
+++ xc/programs/xterm/misc.c	Tue Jun 13 17:16:19 2000
@@ -1,11 +1,11 @@
 /*
  *	$XConsortium: misc.c /main/112 1996/11/29 10:34:07 swick $
- *	$XFree86: xc/programs/xterm/misc.c,v 3.49 2000/02/29 03:09:27 dawes Exp $
+ *	$XFree86: xc/programs/xterm/misc.c,v 3.53 2000/06/14 00:16:19 dawes Exp $
  */
 
 /*
  *
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
  *
  *                        All Rights Reserved
  *
@@ -59,11 +59,16 @@
 #include <xterm.h>
 
 #include <X11/Xos.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <stdio.h>
 #include <signal.h>
 #include <ctype.h>
 #include <pwd.h>
 
+#include <sys/types.h>
+#include <sys/wait.h>
+
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 
@@ -71,6 +76,15 @@
 #include <X11/Xmu/Error.h>
 #include <X11/Xmu/SysUtil.h>
 #include <X11/Xmu/WinUtil.h>
+#if HAVE_X11_SUNKEYSYM_H
+#include <X11/Sunkeysym.h>
+#endif
+
+#ifdef X_NOT_STDC_ENV
+extern time_t time ();
+#else
+#include <time.h>
+#endif
 
 #include <data.h>
 #include <error.h>
@@ -760,24 +774,87 @@
 #endif
 }
 
-#if (defined(ALLOWLOGGING) || defined(DEBUG)) && !defined(VMS)
+#ifdef VMS
+#define TIMESTAMP_FMT "%s%d-%02d-%02d-%02d-%02d-%02d"
+#else
+#define TIMESTAMP_FMT "%s%d-%02d-%02d.%02d:%02d:%02d"
+#endif
+
+void
+timestamp_filename(char *dst, const char *src)
+{
+    time_t tstamp;
+    struct tm *tstruct;
 
+    time(&tstamp);
+    tstruct = localtime(&tstamp);
+    sprintf(dst, TIMESTAMP_FMT,
+	    src,
+	    tstruct->tm_year + 1900,
+	    tstruct->tm_mon + 1,
+	    tstruct->tm_mday,
+	    tstruct->tm_hour,
+	    tstruct->tm_min,
+	    tstruct->tm_sec);
+}
+
+int
+open_userfile(int uid, int gid, char *path, Boolean append)
+{
+    int fd;
+    struct stat sb;
+
+#ifdef VMS
+    if((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0) {
+	fprintf(stderr, "%s: cannot open %s: %d:%s\n", xterm_name, path, errno, SysErrorMsg(errno));
+	return -1;
+    }
+    chown(path, uid, gid);
+#else
+    if ((access(path, F_OK) != 0 && (errno != ENOENT))
+     || (!(creat_as(uid, gid, append, path, 0644)))
+     || ((fd = open(path, O_WRONLY | O_APPEND, 0644)) < 0)) {
+	fprintf(stderr, "%s: cannot open %s: %d:%s\n", xterm_name, path, errno, SysErrorMsg(errno));
+	return -1;
+    }
+#endif
+
+    /*
+     * Doublecheck that the user really owns the file that we've opened before
+     * we do any damage, and that it is not world-writable.
+     */
+    if (fstat(fd, &sb) < 0
+     || (int) sb.st_uid != uid
+     || (sb.st_mode & 022) != 0) {
+	fprintf(stderr, "%s: you do not own %s\n", xterm_name, path);
+	close(fd);
+	return -1;
+    }
+    return fd;
+}
+
+#ifndef VMS
 /*
- * create a file only if we could with the permissions of the real user id.
+ * Create a file only if we could with the permissions of the real user id.
  * We could emulate this with careful use of access() and following
  * symbolic links, but that is messy and has race conditions.
  * Forking is messy, too, but we can't count on setreuid() or saved set-uids
  * being available.
  *
- * Note:  when called for user logging, we have ensured that the real and
+ * Note: When called for user logging, we have ensured that the real and
  * effective user ids are the same, so this remains as a convenience function
  * for the debug logs.
+ *
+ * Returns 1 if we can proceed to open the file in relative safety, 0
+ * otherwise.
  */
-void
-creat_as(int uid, int gid, char *pathname, int mode)
+int
+creat_as(int uid, int gid, Boolean append, char *pathname, int mode)
 {
     int fd;
     int pid;
+    int retval = 0;
+    int childstat = 0;
 #ifndef HAVE_WAITPID
     int waited;
     SIGNAL_T (*chldfunc) (int);
@@ -791,7 +868,7 @@
     case 0:			/* child */
 	setgid(gid);
 	setuid(uid);
-	fd = open(pathname, O_WRONLY|O_CREAT|O_APPEND, mode);
+	fd = open(pathname, O_WRONLY|O_CREAT|(append ? O_APPEND : O_EXCL), mode);
 	if (fd >= 0) {
 	    close(fd);
 	    _exit(0);
@@ -799,12 +876,22 @@
 	    _exit(1);
 	/* NOTREACHED */
     case -1:			/* error */
-	return;
+	return retval;
     default:			/* parent */
 #ifdef HAVE_WAITPID
-	waitpid(pid, NULL, 0);
+	while (waitpid(pid, &childstat, 0) < 0) {
+#ifdef EINTR
+	    if (errno == EINTR)
+		continue;
+#endif /* EINTR */
+#ifdef ERESTARTSYS
+	    if (errno == ERESTARTSYS)
+		continue;
+#endif /* ERESTARTSYS */
+	    break;
+	}
 #else  /* HAVE_WAITPID */
-	waited = wait(NULL);
+	waited = wait(&childstat);
 	signal(SIGCHLD, chldfunc);
 	/*
 	  Since we had the signal handler uninstalled for a while,
@@ -816,9 +903,14 @@
 		Cleanup(0);
 	while ( (waited=nonblocking_wait()) > 0);
 #endif /* HAVE_WAITPID */
+#ifndef WIFEXITED
+#define WIFEXITED(status) ((status & 0xff) != 0)
+#endif
+	if (WIFEXITED(childstat)) retval = 1;
+	return retval;
     }
 }
-#endif /* defined(ALLOWLOGGING) || defined(DEBUG) */
+#endif /* !VMS */
 
 #ifdef ALLOWLOGGING
 
@@ -934,20 +1026,8 @@
 		return;
 #endif
 	} else {
-		if(access(screen->logfile, F_OK) != 0) {
-		    if (errno == ENOENT)
-			creat_as(screen->uid, screen->gid,
-				 screen->logfile, 0644);
-		    else
-			return;
-		}
-
-		if(access(screen->logfile, F_OK) != 0
-		   || access(screen->logfile, W_OK) != 0)
+	    if ((screen->logfd = open_userfile(screen->uid, screen->gid, screen->logfile, (log_default != 0))) < 0)
 		    return;
-		if((screen->logfd = open(screen->logfile, O_WRONLY | O_APPEND,
-					 0644)) < 0)
-			return;
 	}
 #endif /*VMS*/
 	screen->logstart = CURRENT_EMU_VAL(screen, Tbuffer->ptr, VTbuffer.ptr);
@@ -1134,6 +1214,8 @@
 		case 0:
 			if (isdigit(*cp)) {
 				mode = 10 * mode + (*cp - '0');
+				if (mode > 65535)
+					return;
 				break;
 			}
 			/* FALLTHRU */
@@ -1268,7 +1350,11 @@
 	}
 }
 
+#ifdef SunXK_F36
+#define MAX_UDK 37
+#else
 #define MAX_UDK 35
+#endif
 static struct {
 	char *str;
 	int   len;
@@ -1314,9 +1400,13 @@
 					 && (term->flags & PROTECTED) ? 1 : 0,
 					cp);
 			} else if (!strcmp(cp, "\"p")) {	/* DECSCL */
-				sprintf(reply, "%d%s",
+				sprintf(reply, "%d%s%s",
 					(screen->ansi_level ?
 					 screen->ansi_level : 1) + 60,
+					(screen->ansi_level >= 2)
+					 ? (screen->control_eight_bits
+						? ";0" : ";1")
+					 : "",
 					cp);
 			} else if (!strcmp(cp, "r")) {		/* DECSTBM */
 				sprintf(reply, "%d;%dr",
@@ -1426,7 +1516,7 @@
 
 		while (*cp) {
 			char *str = (char *)malloc(strlen(cp) + 2);
-			int key = 0;
+			unsigned key = 0;
 			int len = 0;
 
 			while (isdigit(*cp))
Index: xc/programs/xterm/mkdirs.sh
diff -u xc/programs/xterm/mkdirs.sh:3.5 xc/programs/xterm/mkdirs.sh:3.6
--- xc/programs/xterm/mkdirs.sh:3.5	Mon Sep 27 07:59:29 1999
+++ xc/programs/xterm/mkdirs.sh	Wed May 17 17:33:21 2000
@@ -5,7 +5,6 @@
 # Last modified: 1994-03-25
 # Public domain
 #
-# $XFree86: xc/programs/xterm/mkdirs.sh,v 3.5 1999/09/27 14:59:29 dawes Exp $
 
 errstatus=0
 umask 022
@@ -23,7 +22,10 @@
 
      if test ! -d "$pathcomp"; then
         echo "mkdir $pathcomp" 1>&2
-        mkdir "$pathcomp" || errstatus=$?
+        case "$pathcomp" in
+          [a-zA-Z]: )  ;;               # DOSISH systems
+          * )          mkdir "$pathcomp" || errstatus=$? ;;
+        esac
      fi
 
      pathcomp="$pathcomp/"
Index: xc/programs/xterm/os2main.c
diff -u xc/programs/xterm/os2main.c:3.32 xc/programs/xterm/os2main.c:3.38
--- xc/programs/xterm/os2main.c:3.32	Tue Feb  8 09:19:39 2000
+++ xc/programs/xterm/os2main.c	Mon Jun 19 22:08:51 2000
@@ -5,7 +5,7 @@
 #ifndef lint
 static char *rid="$XConsortium: main.c,v 1.227.1.2 95/06/29 18:13:15 kaleb Exp $";
 #endif /* lint */
-/* $XFree86: xc/programs/xterm/os2main.c,v 3.32 2000/02/08 17:19:39 dawes Exp $ */
+/* $XFree86: xc/programs/xterm/os2main.c,v 3.38 2000/06/20 05:08:51 dawes Exp $ */
 
 /***********************************************************
 
@@ -392,6 +392,8 @@
 {"-leftbar",	"*rightScrollBar", XrmoptionNoArg,	(caddr_t) "off"},
 {"-rightbar",	"*rightScrollBar", XrmoptionNoArg,	(caddr_t) "on"},
 #endif
+{"-rvc",	"*colorRVMode",	XrmoptionNoArg,		(caddr_t) "off"},
+{"+rvc",	"*colorRVMode",	XrmoptionNoArg,		(caddr_t) "on"},
 {"-sf",		"*sunFunctionKeys", XrmoptionNoArg,	(caddr_t) "on"},
 {"+sf",		"*sunFunctionKeys", XrmoptionNoArg,	(caddr_t) "off"},
 {"-si",		"*scrollTtyOutput", XrmoptionNoArg,	(caddr_t) "off"},
@@ -473,7 +475,7 @@
 { "-b number",             "internal border in pixels" },
 { "-/+bc",		   "turn on/off text cursor blinking" },
 { "-bcf milliseconds",	   "time text cursor is off when blinking"},
-{ "-bcn milliseconds",	   "time text cursor is on when blinking"}.
+{ "-bcn milliseconds",	   "time text cursor is on when blinking"},
 { "-/+bdc",                "turn off/on display of bold as color"},
 { "-/+cb",                 "turn on/off cut-to-beginning-of-line inhibit" },
 { "-cc classrange",        "specify additional character classes" },
@@ -514,6 +516,7 @@
 { "-rightbar",             "force scrollbar right (default left)" },
 { "-leftbar",              "force scrollbar left" },
 #endif
+{ "-/+rvc",		   "turn off/on display of reverse as color" },
 { "-/+sf",                 "turn on/off Sun Function Key escape codes" },
 { "-/+si",                 "turn on/off scroll-on-tty-output inhibit" },
 { "-/+sk",                 "turn on/off scroll-on-keypress" },
@@ -822,6 +825,7 @@
 #endif /* __EMX__ */
 
 char **gblenvp;
+extern char **environ;
 
 int
 main (int argc, char **argv, char **envp)
@@ -829,11 +833,11 @@
 	Widget form_top, menu_top;
 	register TScreen *screen;
 	int mode;
-	extern char **environ;
 
 	/* Do these first, since we may not be able to open the display */
 	ProgramName = argv[0];
 	if (argc > 1) {
+		int n;
 		if (abbrev(argv[1], "-version"))
 			Version();
 		if (abbrev(argv[1], "-help"))
@@ -870,7 +874,7 @@
 	*/
 	d_tio.c_iflag = ICRNL|IXON;
 	d_tio.c_oflag = OPOST|ONLCR|TAB3;
-    	d_tio.c_cflag = B9600|CS8|CREAD|PARENB|HUPCL;
+    	d_tio.c_cflag = B38400|CS8|CREAD|PARENB|HUPCL;
     	d_tio.c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK;
 	d_tio.c_line = 0;
 	d_tio.c_cc[VINTR] = CONTROL('C');	/* '^C'	*/
@@ -1062,7 +1066,7 @@
 	 so the debug feature is disabled by default. */
 	int i = -1;
 	if(debug) {
-	        creat_as (getuid(), getgid(), "xterm.debug.log", 0666);
+	        creat_as (getuid(), getgid(), True, "xterm.debug.log", 0666);
 		i = open ("xterm.debug.log", O_WRONLY | O_TRUNC, 0666);
 	}
 	if(i >= 0) {
Index: xc/programs/xterm/print.c
diff -u xc/programs/xterm/print.c:1.15 xc/programs/xterm/print.c:1.16
--- xc/programs/xterm/print.c:1.15	Tue Feb  8 09:19:39 2000
+++ xc/programs/xterm/print.c	Mon Jun 12 19:28:40 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/print.c,v 1.15 2000/02/08 17:19:39 dawes Exp $
+ * $XFree86: xc/programs/xterm/print.c,v 1.16 2000/06/13 02:28:40 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -166,7 +166,7 @@
 						? extract_fg((fbf[col]<<8)|(fbb[col]), a[col])
 						: -1;
 					bg = (a[col] & BG_COLOR)
-						? extract_bg((fbf[col]<<8)|(fbb[col]))
+						? extract_bg((fbf[col]<<8)|(fbb[col]), a[col])
 						: -1;
 				}
 			})
@@ -176,7 +176,7 @@
 						? extract_fg(fb[col], a[col])
 						: -1;
 					bg = (a[col] & BG_COLOR)
-						? extract_bg(fb[col])
+						? extract_bg(fb[col], a[col])
 						: -1;
 				}
 			})
Index: xc/programs/xterm/ptydata.c
diff -u xc/programs/xterm/ptydata.c:1.11 xc/programs/xterm/ptydata.c:1.12
--- xc/programs/xterm/ptydata.c:1.11	Tue Feb  8 09:19:40 2000
+++ xc/programs/xterm/ptydata.c	Mon Jun 12 19:28:40 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/ptydata.c,v 1.11 2000/02/08 17:19:40 dawes Exp $
+ * $XFree86: xc/programs/xterm/ptydata.c,v 1.12 2000/06/13 02:28:40 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
Index: xc/programs/xterm/ptyx.h
diff -u xc/programs/xterm/ptyx.h:3.73 xc/programs/xterm/ptyx.h:3.75
--- xc/programs/xterm/ptyx.h:3.73	Fri Mar  3 14:50:36 2000
+++ xc/programs/xterm/ptyx.h	Mon Jun 12 19:28:40 2000
@@ -1,10 +1,10 @@
 /*
  *	$XConsortium: ptyx.h /main/67 1996/11/29 10:34:19 swick $
- *	$XFree86: xc/programs/xterm/ptyx.h,v 3.73 2000/03/03 22:50:36 dawes Exp $
+ *	$XFree86: xc/programs/xterm/ptyx.h,v 3.75 2000/06/13 02:28:40 dawes Exp $
  */
 
 /*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -238,7 +238,7 @@
 #endif
 
 /* constants used for utf8 mode */
-#define UCS_REPL	0xfffd		
+#define UCS_REPL	0xfffd
 #define UCS_LIMIT	0x80000000U	/* both limit and flag for non-UCS */
 
 #define TERMCAP_SIZE 1500		/* 1023 is standard; 'screen' exceeds */
@@ -555,16 +555,27 @@
 #define COLOR_BD	(NUM_ANSI_COLORS)	/* BOLD */
 #define COLOR_UL	(NUM_ANSI_COLORS+1)	/* UNDERLINE */
 #define COLOR_BL	(NUM_ANSI_COLORS+2)	/* BLINK */
-#define MAXCOLORS	(NUM_ANSI_COLORS+3)
+#define COLOR_RV	(NUM_ANSI_COLORS+3)	/* REVERSE */
+#define MAXCOLORS	(NUM_ANSI_COLORS+4)
 #ifndef DFT_COLORMODE
 #define DFT_COLORMODE TRUE	/* default colorMode resource */
 #endif
 
+#define ReverseOrHilite(screen,flags,hilite) \
+		(( screen->colorRVMode && hilite ) || \
+		    ( !screen->colorRVMode && \
+		      (( (flags & INVERSE) && !hilite) || \
+		       (!(flags & INVERSE) &&  hilite)) ))
+
 #else	/* !OPT_ISO_COLORS */
 
 #define if_OPT_ISO_COLORS(screen, code) /* nothing */
 #define TERM_COLOR_FLAGS 0
 
+#define ReverseOrHilite(screen,flags,hilite) \
+		      (( (flags & INVERSE) && !hilite) || \
+		       (!(flags & INVERSE) &&  hilite))
+
 #endif	/* OPT_ISO_COLORS */
 
 #if OPT_AIX_COLORS
@@ -641,13 +652,13 @@
 #if OPT_EBCDIC
 extern int E2A(int);
 extern int A2E(int);
-extern char CONTROL(char);
 #else
 #define E2A(a) (a)
 #define A2E(a) (a)
-#define CONTROL(a) ((a)&037)
 #endif
 
+#define CONTROL(a) (A2E(E2A(a)&037))
+
 /***====================================================================***/
 
 #if OPT_TEK4014
@@ -841,6 +852,7 @@
 	int		cur_foreground; /* current foreground color	*/
 	int		cur_background; /* current background color	*/
 	int		sgr_foreground; /* current SGR foreground color */
+	int		sgr_background; /* current SGR background color */
 	Boolean		sgr_extended;	/* SGR set with extended codes? */
 #endif
 } SavedCursor;
@@ -902,6 +914,7 @@
 	Boolean		colorULMode;	/* use color for underline?	*/
 	Boolean		colorBDMode;	/* use color for bold?		*/
 	Boolean		colorBLMode;	/* use color for blink?		*/
+	Boolean		colorRVMode;	/* use color for reverse?	*/
 	Boolean		colorAttrMode;	/* prefer colorUL/BD to SGR	*/
 #endif
 #if OPT_HIGHLIGHT_COLOR
@@ -1174,6 +1187,7 @@
     char *T_geometry;
     char *f_n;
     char *f_b;
+    int limit_resize;
 #ifdef ALLOWLOGGING
     Boolean log_on;
 #endif
@@ -1214,8 +1228,12 @@
 #if OPT_SHIFT_KEYS
     Boolean shift_keys;		/* true if we interpret shifted special-keys */
 #endif
+#if OPT_SUNPC_KBD
+    int ctrl_fkeys;		/* amount to add to XK_F1 for ctrl modifier */
+#endif
 #if OPT_NUM_LOCK
     Boolean real_NumLock;	/* true if we treat NumLock key specially */
+    Boolean alwaysUseMods;	/* true if we always want f-key modifiers */
     unsigned long num_lock;	/* modifier for Num_Lock */
     unsigned long alt_left;	/* modifier for Alt_L */
     unsigned long alt_right;	/* modifier for Alt_R */
@@ -1268,6 +1286,7 @@
     Pixel       dft_background;	/* default background color	*/
 #if OPT_ISO_COLORS
     int         sgr_foreground;	/* current SGR foreground color	*/
+    int         sgr_background;	/* current SGR background color	*/
     Boolean     sgr_extended;	/* SGR set with extended codes? */
 #endif
 #if OPT_ISO_COLORS || OPT_DEC_CHRSET || OPT_WIDE_CHARS
Index: xc/programs/xterm/resize.c
diff -u xc/programs/xterm/resize.c:3.39 xc/programs/xterm/resize.c:3.41
--- xc/programs/xterm/resize.c:3.39	Tue Oct 12 21:21:46 1999
+++ xc/programs/xterm/resize.c	Wed May 17 17:33:21 2000
@@ -1,6 +1,6 @@
 /*
  *	$XConsortium: resize.c,v 1.34 95/05/24 22:12:04 gildea Exp $
- *	$XFree86: xc/programs/xterm/resize.c,v 3.39 1999/10/13 04:21:46 dawes Exp $
+ *	$XFree86: xc/programs/xterm/resize.c,v 3.41 2000/05/18 00:33:21 dawes Exp $
  */
 
 /*
@@ -80,6 +80,10 @@
 #define USE_TERMIOS
 #endif
 
+#ifdef __MVS__
+#define USE_TERMIOS
+#endif
+
 #ifdef Lynx
 #define USE_SYSV_TERMIO
 #endif
@@ -180,6 +184,12 @@
 #define GCC_UNUSED /* nothing */
 #endif
 
+#ifdef __MVS__
+#define ESC(string) "\047" string
+#else
+#define ESC(string) "\033" string
+#endif
+
 #define	EMULATIONS	2
 #define	SUN		1
 #define	VT100		0
@@ -211,25 +221,25 @@
 char *myname;
 int shell_type = SHELL_UNKNOWN;
 char *getsize[EMULATIONS] = {
-	"\0337\033[r\033[999;999H\033[6n",
-	"\033[18t",
+	ESC("7") ESC("[r") ESC("[999;999H") ESC("[6n"),
+	ESC("[18t"),
 };
 #if !defined(sun) || defined(SVR4)
 #ifdef TIOCSWINSZ
 char *getwsize[EMULATIONS] = {	/* size in pixels */
 	0,
-	"\033[14t",
+	ESC("[14t"),
 };
 #endif	/* TIOCSWINSZ */
 #endif	/* sun */
 char *restore[EMULATIONS] = {
-	"\0338",
+	ESC("8"),
 	0,
 };
 char *setname = "";
 char *setsize[EMULATIONS] = {
 	0,
-	"\033[8;%s;%st",
+	ESC("[8;%s;%st"),
 };
 #ifdef USE_SYSV_TERMIO
 struct termio tioorig;
@@ -241,8 +251,8 @@
 # endif /* USE_TERMIOS */
 #endif /* USE_SYSV_TERMIO */
 char *size[EMULATIONS] = {
-	"\033[%d;%dR",
-	"\033[8;%d;%dt",
+	ESC("[%d;%dR"),
+	ESC("[8;%d;%dt"),
 };
 char sunname[] = "sunsize";
 int tty;
@@ -251,7 +261,7 @@
 #ifdef TIOCSWINSZ
 char *wsize[EMULATIONS] = {
 	0,
-	"\033[4;%hd;%hdt",
+	ESC("[4;%hd;%hdt"),
 };
 #endif	/* TIOCSWINSZ */
 #endif	/* sun */
@@ -277,6 +287,9 @@
 #endif
 #else
 #include <curses.h>
+#ifdef NCURSES_VERSION
+#include <term.h> /* tgetent() */
+#endif
 #endif /* HAVE_TERMCAP_H  */
 #endif
 
@@ -623,10 +636,11 @@
 	setitimer(ITIMER_REAL, &it, (struct itimerval *)NULL);
 #endif
 	if ((c = getc(fp)) == 0233) {	/* meta-escape, CSI */
-		*buf++ = c = '\033';
+		*buf++ = c = ESC("")[0];
 		*buf++ = '[';
-	} else
+	} else {
 		*buf++ = c;
+	}
 	if(c != *str) {
 		fprintf(stderr, "%s: unknown character, exiting.\r\n", myname);
 		onintr(0);
Index: xc/programs/xterm/resize.man
diff -u xc/programs/xterm/resize.man:1.4 xc/programs/xterm/resize.man:1.5
--- xc/programs/xterm/resize.man:1.4	Sat Apr  4 18:29:20 1998
+++ xc/programs/xterm/resize.man	Mon Jun 12 19:28:40 2000
@@ -1,6 +1,6 @@
 .\" $XConsortium: resize.man /main/12 1996/12/09 17:10:48 kaleb $
-.\" $XFree86: xc/programs/xterm/resize.man,v 1.4 1998/04/05 02:29:20 dawes Exp $
-.\" updated by Thomas Dickey <dickey@clark.net> for XFree86, Februrary 1998.
+.\" $XFree86: xc/programs/xterm/resize.man,v 1.5 2000/06/13 02:28:40 dawes Exp $
+.\" updated by Thomas E. Dickey for XFree86, Februrary 1998.
 .TH RESIZE 1 "Release 6.3" "X Version 11"
 .SH NAME
 resize \- set TERMCAP and terminal settings to current xterm window size
Index: xc/programs/xterm/screen.c
diff -u xc/programs/xterm/screen.c:3.48 xc/programs/xterm/screen.c:3.50
--- xc/programs/xterm/screen.c:3.48	Fri Mar  3 12:02:34 2000
+++ xc/programs/xterm/screen.c	Tue Jun 13 17:16:20 2000
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -54,7 +54,7 @@
  * SOFTWARE.
  */
 
-/* $XFree86: xc/programs/xterm/screen.c,v 3.48 2000/03/03 20:02:34 dawes Exp $ */
+/* $XFree86: xc/programs/xterm/screen.c,v 3.50 2000/06/14 00:16:20 dawes Exp $ */
 
 /* screen.c */
 
@@ -147,11 +147,11 @@
  * with the intention of being able to change the total number of pointers per
  * row according to whether the user wants color or not.
  */
-ScrnBuf Allocate (register int nrow, register int ncol, Char **addr)
+ScrnBuf Allocate (int nrow, int ncol, Char **addr)
 {
-	register ScrnBuf base;
-	register Char *tmp;
-	register int i, j, k;
+	ScrnBuf base;
+	Char *tmp;
+	int i, j, k;
 	size_t entries = MAX_PTRS * nrow;
 	size_t length  = BUF_PTRS * nrow * ncol;
 
@@ -188,10 +188,10 @@
 	int oldrow,
 	int oldcol)
 {
-	register ScrnBuf base;
-	register Char *tmp;
-	register int i, j, k, minrows;
-	register size_t mincols;
+	ScrnBuf base;
+	Char *tmp;
+	int i, j, k, minrows;
+	size_t mincols;
 	Char *oldbuf;
 	int move_down = 0, move_up = 0;
 	size_t entries = MAX_PTRS * nrow;
@@ -282,26 +282,26 @@
 ScreenWrite (
 	TScreen *screen,
 	PAIRED_CHARS(Char *str, Char *str2),
-	register unsigned flags,
-	register unsigned cur_fg_bg,
-	register int len)		/* length of string */
+	unsigned flags,
+	unsigned cur_fg_bg,
+	int len)		/* length of string */
 {
 #if OPT_ISO_COLORS
 #if OPT_EXT_COLORS
-	register Char *fbf = 0;
-	register Char *fbb = 0;
+	Char *fbf = 0;
+	Char *fbb = 0;
 #else
-	register Char *fb = 0;
+	Char *fb = 0;
 #endif
 #endif
 #if OPT_DEC_CHRSET
-	register Char *cb = 0;
+	Char *cb = 0;
 #endif
-	register int length = len;	/* workaround for compiler bug? */
-	register Char *attrs;
-	register int avail  = screen->max_col - screen->cur_col + 1;
-	register Char *col;
-	register int wrappedbit;
+	int length = len;	/* workaround for compiler bug? */
+	Char *attrs;
+	int avail  = screen->max_col - screen->cur_col + 1;
+	Char *col;
+	int wrappedbit;
 
 	if (length > avail)
 	    length = avail;
@@ -372,7 +372,7 @@
 static void
 ScrnClearLines (TScreen *screen, ScrnBuf sb, int where, int n, int size)
 {
-	register int i, j;
+	int i, j;
 	size_t len = ScrnPointers(screen, n);
 	int last = (n * MAX_PTRS);
 
@@ -438,13 +438,7 @@
  * Requires: 0 <= where < where + n <= last
  */
 void
-ScrnInsertLine (
-	TScreen *screen,
-	register ScrnBuf sb,
-	int last,
-	register int where,
-	register int n,
-	register int size)
+ScrnInsertLine (TScreen *screen, ScrnBuf sb, int last, int where, int n, int size)
 {
 	size_t len = ScrnPointers(screen, n);
 
@@ -476,13 +470,7 @@
  * Requires 0 <= where < where + n < = last
  */
 void
-ScrnDeleteLine (
-	TScreen *screen,
-	register ScrnBuf sb,
-	register int last,
-	int where,
-	register int n,
-	register int size)
+ScrnDeleteLine (TScreen *screen, ScrnBuf sb, int last, int where, int n, int size)
 {
 	ScrnClearLines(screen, sb, where, n, size);
 
@@ -502,20 +490,25 @@
  * row.
  */
 void
-ScrnInsertChar (
-	register TScreen *screen,
-	register int n,
-	int size)
+ScrnInsertChar (TScreen *screen, int n)
 {
 	ScrnBuf sb = screen->visbuf;
+	int size = screen->max_col + 1;
 	int row = screen->cur_row;
 	int col = screen->cur_col;
-	register int i, j;
-	register Char *ptr = BUF_CHARS(sb, row);
-	register Char *attrs = BUF_ATTRS(sb, row);
-	register size_t nbytes = (size - n - col);
+	int i, j;
+	Char *ptr = BUF_CHARS(sb, row);
+	Char *attrs = BUF_ATTRS(sb, row);
 	int wrappedbit = ScrnTstWrapped(screen, row);
 	int flags = CHARDRAWN | TERM_COLOR_FLAGS;
+	size_t nbytes;
+
+	if (size - (col + n) <= 0) {
+	    if ((n = size - col) <= 0) {
+		return;
+	    }
+	}
+	nbytes = (size - (col + n));
 
 	ScrnClrWrapped(screen, row); /* make sure the bit isn't moved */
 	for (i = size - 1; i >= col + n; i--) {
@@ -558,21 +551,26 @@
 }
 
 /*
- * Deletes n characters at current row, col. Size is the size of each row.
+ * Deletes n characters at current row, col.
  */
 void
-ScrnDeleteChar (
-	register TScreen *screen,
-	register int n,
-	register int size)
+ScrnDeleteChar (TScreen *screen, int n)
 {
 	ScrnBuf sb = screen->visbuf;
+	int size = screen->max_col + 1;
 	int row = screen->cur_row;
 	int col = screen->cur_col;
-	register Char *ptr = BUF_CHARS(sb, row);
-	register Char *attrs = BUF_ATTRS(sb, row);
-	register size_t nbytes = (size - n - col);
+	Char *ptr = BUF_CHARS(sb, row);
+	Char *attrs = BUF_ATTRS(sb, row);
+	size_t nbytes;
 
+	if (size - (col + n) <= 0) {
+	    if ((n = size - col) <= 0) {
+		return;
+	    }
+	}
+	nbytes = (size - (col + n));
+
 	memmove (ptr   + col, ptr   + col + n, nbytes);
 	memmove (attrs + col, attrs + col + n, nbytes);
 	bzero  (ptr + size - n, n);
@@ -613,7 +611,7 @@
  */
 void
 ScrnRefresh (
-	register TScreen *screen,
+	TScreen *screen,
 	int toprow,
 	int leftcol,
 	int nrows,
@@ -621,8 +619,8 @@
 	Bool force)			/* ... leading/trailing spaces */
 {
 	int y = toprow * FontHeight(screen) + screen->border;
-	register int row;
-	register int topline = screen->topline;
+	int row;
+	int topline = screen->topline;
 	int maxrow = toprow + nrows - 1;
 	int scrollamt = screen->scroll_amt;
 	int max = screen->max_row;
@@ -645,23 +643,23 @@
 	for (row = toprow; row <= maxrow; y += FontHeight(screen), row++) {
 #if OPT_ISO_COLORS
 #if OPT_EXT_COLORS
-	   register Char *fbf = 0;
-	   register Char *fbb = 0;
+	   Char *fbf = 0;
+	   Char *fbb = 0;
 #else
-	   register Char *fb = 0;
+	   Char *fb = 0;
 #endif
 #endif
 #if OPT_DEC_CHRSET
-	   register Char *cb = 0;
+	   Char *cb = 0;
 #endif
 #if OPT_WIDE_CHARS
 	   Char *widec = 0;
 #define WIDEC_PTR(cell) widec ? &widec[cell] : 0
 #endif
 	   Char cs = 0;
-	   register Char *chars;
-	   register Char *attrs;
-	   register int col = leftcol;
+	   Char *chars;
+	   Char *attrs;
+	   int col = leftcol;
 	   int maxcol = leftcol + ncols - 1;
 	   int hi_col = maxcol;
 	   int lastind;
@@ -784,13 +782,13 @@
 		/* this combines them, then splits them again.	but
 		   extract_fg does more, so seems reasonable */
 		fg = extract_fg(fg_bg, flags);
-		bg = extract_bg(fg_bg);
+		bg = extract_bg(fg_bg, flags);
 	   })
 	   if_OPT_ISO_TRADITIONAL_COLORS(screen,{
 		fb = SCRN_BUF_COLOR(screen, lastind + topline);
 		fg_bg = fb[col];
 		fg = extract_fg(fg_bg, flags);
-		bg = extract_bg(fg_bg);
+		bg = extract_bg(fg_bg, flags);
 	   })
 	   gc = updatedXtermGC(screen, flags, fg_bg, hilite);
 	   gc_changes |= (flags & (FG_COLOR|BG_COLOR));
@@ -804,10 +802,10 @@
 #if OPT_ISO_COLORS
 #if OPT_EXT_COLORS
 		 || ((flags & FG_COLOR) && (extract_fg((fbf[col]<<8)|fbb[col],attrs[col]) != fg))
-		 || ((flags & BG_COLOR) && (extract_bg((fbf[col]<<8)|fbb[col]) != bg))
+		 || ((flags & BG_COLOR) && (extract_bg((fbf[col]<<8)|fbb[col],attrs[col]) != bg))
 #else
 		 || ((flags & FG_COLOR) && (extract_fg(fb[col],attrs[col]) != fg))
-		 || ((flags & BG_COLOR) && (extract_bg(fb[col]) != bg))
+		 || ((flags & BG_COLOR) && (extract_bg(fb[col],attrs[col]) != bg))
 #endif
 #endif
 #if OPT_DEC_CHRSET
@@ -835,12 +833,12 @@
 		   if_OPT_EXT_COLORS(screen,{
 			fg_bg = (fbf[col]<<8) | fbb[col];
 		        fg = extract_fg(fg_bg, flags);
-		        bg = extract_bg(fg_bg);
+		        bg = extract_bg(fg_bg, flags);
 		   })
 		   if_OPT_ISO_TRADITIONAL_COLORS(screen,{
 			fg_bg = fb[col];
 		        fg = extract_fg(fg_bg, flags);
-		        bg = extract_bg(fg_bg);
+		        bg = extract_bg(fg_bg, flags);
 		   })
 		   if_OPT_DEC_CHRSET({
 		        cs = cb[col];
@@ -900,14 +898,14 @@
  */
 void
 ClearBufRows (
-	register TScreen *screen,
-	register int first,
-	register int last)
+	TScreen *screen,
+	int first,
+	int last)
 {
 	ScrnBuf	buf = screen->visbuf;
 	int	len = screen->max_col + 1;
-	register int row;
-	register int flags = TERM_COLOR_FLAGS;
+	int	row;
+	int	flags = TERM_COLOR_FLAGS;
 
 	TRACE(("ClearBufRows %d..%d\n", first, last));
 	for (row = first; row <= last; row++) {
@@ -948,7 +946,7 @@
   */
 int
 ScreenResize (
-	register TScreen *screen,
+	TScreen *screen,
 	int width,
 	int height,
 	unsigned *flags)
@@ -992,8 +990,8 @@
 
 	/* update buffers if the screen has changed size */
 	if (screen->max_row != rows - 1 || screen->max_col != cols - 1) {
-		register int savelines = screen->scrollWidget ?
-		 screen->savelines : 0;
+		int savelines = screen->scrollWidget
+				? screen->savelines : 0;
 		int delta_rows = rows - (screen->max_row + 1);
 
 		TRACE(("...ScreenResize chars %dx%d\n", rows, cols));
@@ -1120,12 +1118,12 @@
 Bool
 non_blank_line(
 	ScrnBuf sb,
-	register int row,
-	register int col,
-	register int len)
+	int row,
+	int col,
+	int len)
 {
-	register int	i;
-	register Char *ptr = BUF_CHARS(sb, row);
+	int i;
+	Char *ptr = BUF_CHARS(sb, row);
 
 	for (i = col; i < len; i++) {
 		if (ptr[i])
Index: xc/programs/xterm/scrollbar.c
diff -u xc/programs/xterm/scrollbar.c:3.26 xc/programs/xterm/scrollbar.c:3.28
--- xc/programs/xterm/scrollbar.c:3.26	Fri Mar  3 12:02:34 2000
+++ xc/programs/xterm/scrollbar.c	Mon Jun 12 19:28:41 2000
@@ -1,10 +1,10 @@
 /*
  *	$XConsortium: scrollbar.c /main/47 1996/12/01 23:47:08 swick $
- *	$XFree86: xc/programs/xterm/scrollbar.c,v 3.26 2000/03/03 20:02:34 dawes Exp $
+ *	$XFree86: xc/programs/xterm/scrollbar.c,v 3.28 2000/06/13 02:28:41 dawes Exp $
  */
 
 /*
- * Copyright 2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 2000 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -288,7 +288,7 @@
 		screen->scrollWidget,
 #ifdef SCROLLBAR_RIGHT
         	(term->misc.useRight)
-			? (term->core.width -
+			? (screen->fullVwin.fullwidth -
 			   screen->scrollWidget->core.width -
 			   screen->scrollWidget->core.border_width)
 			: -1,
Index: xc/programs/xterm/tabs.c
diff -u xc/programs/xterm/tabs.c:3.7 xc/programs/xterm/tabs.c:3.8
--- xc/programs/xterm/tabs.c:3.7	Tue Feb  8 09:19:42 2000
+++ xc/programs/xterm/tabs.c	Mon Jun 12 19:28:41 2000
@@ -1,10 +1,10 @@
 /*
  *	$XConsortium: tabs.c,v 1.4 91/05/06 17:12:18 gildea Exp $
- *	$XFree86: xc/programs/xterm/tabs.c,v 3.7 2000/02/08 17:19:42 dawes Exp $
+ *	$XFree86: xc/programs/xterm/tabs.c,v 3.8 2000/06/13 02:28:41 dawes Exp $
  */
 
 /*
- * Copyright 2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 2000 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
Index: xc/programs/xterm/terminfo
diff -u xc/programs/xterm/terminfo:3.39 xc/programs/xterm/terminfo:3.40
--- xc/programs/xterm/terminfo:3.39	Mon Feb 28 19:09:29 2000
+++ xc/programs/xterm/terminfo	Mon Jun 12 19:28:41 2000
@@ -1,8 +1,8 @@
 # $XConsortium: terminfo,v 1.11 94/10/13 21:24:31 gildea Exp $
-# $XFree86: xc/programs/xterm/terminfo,v 3.39 2000/02/29 03:09:29 dawes Exp $
+# $XFree86: xc/programs/xterm/terminfo,v 3.40 2000/06/13 02:28:41 dawes Exp $
 #
 # XFree86 updates/notes/new entries (including xterm-8bit, xterm-16color)
-# - Thomas E. Dickey <dickey@clark.net>
+# - Thomas E. Dickey
 #
 # Special Capabilities:
 # --------------------
Index: xc/programs/xterm/testxmc.c
diff -u xc/programs/xterm/testxmc.c:3.7 xc/programs/xterm/testxmc.c:3.8
--- xc/programs/xterm/testxmc.c:3.7	Tue Feb  8 09:19:43 2000
+++ xc/programs/xterm/testxmc.c	Mon Jun 12 19:28:41 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/testxmc.c,v 3.7 2000/02/08 17:19:43 dawes Exp $
+ * $XFree86: xc/programs/xterm/testxmc.c,v 3.8 2000/06/13 02:28:41 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
Index: xc/programs/xterm/trace.c
diff -u xc/programs/xterm/trace.c:3.10 xc/programs/xterm/trace.c:3.11
--- xc/programs/xterm/trace.c:3.10	Sat Jan 29 10:58:40 2000
+++ xc/programs/xterm/trace.c	Mon Jun 12 19:28:41 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/trace.c,v 3.10 2000/01/29 18:58:40 dawes Exp $
+ * $XFree86: xc/programs/xterm/trace.c,v 3.11 2000/06/13 02:28:41 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -112,7 +112,7 @@
 			sprintf(dst, "\\u+%04X", value);
 		else
 #endif
-		if (value < 32 || (value > 127 && value < 160))
+		if (E2A(value) < 32 || (E2A(value) >= 127 && E2A(value) < 160))
 			sprintf(dst, "\\%03o", value);
 		else
 			sprintf(dst, "%c", value);
@@ -141,7 +141,7 @@
 			sprintf(dst, "\\u+%04X", value);
 		else
 #endif
-		if (value < 32 || (value > 127 && value < 160))
+		if (E2A(value) < 32 || (E2A(value) >= 127 && E2A(value) < 160))
 			sprintf(dst, "\\%03o", value);
 		else
 			sprintf(dst, "%c", value);
Index: xc/programs/xterm/trace.h
diff -u xc/programs/xterm/trace.h:3.8 xc/programs/xterm/trace.h:3.9
--- xc/programs/xterm/trace.h:3.8	Tue Feb  8 09:19:43 2000
+++ xc/programs/xterm/trace.h	Mon Jun 12 19:28:41 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/trace.h,v 3.8 2000/02/08 17:19:43 dawes Exp $
+ * $XFree86: xc/programs/xterm/trace.h,v 3.9 2000/06/13 02:28:41 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
Index: xc/programs/xterm/util.c
diff -u xc/programs/xterm/util.c:3.51 xc/programs/xterm/util.c:3.54
--- xc/programs/xterm/util.c:3.51	Mon Feb 28 19:09:30 2000
+++ xc/programs/xterm/util.c	Tue Jun 13 17:16:20 2000
@@ -1,10 +1,10 @@
 /*
  *	$XConsortium: util.c /main/33 1996/12/01 23:47:10 swick $
- *	$XFree86: xc/programs/xterm/util.c,v 3.51 2000/02/29 03:09:30 dawes Exp $
+ *	$XFree86: xc/programs/xterm/util.c,v 3.54 2000/06/14 00:16:20 dawes Exp $
  */
 
 /*
- * Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+ * Copyright 1999-2000 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -70,7 +70,7 @@
 extern Bool waiting_for_initial_map;
 
 static int ClearInLine (TScreen *screen, int row, int col, int len);
-static int handle_translated_exposure (TScreen *screen, int rect_x, int rect_y, unsigned int rect_width, unsigned int rect_height);
+static int handle_translated_exposure (TScreen *screen, int rect_x, int rect_y, unsigned rect_width, unsigned rect_height);
 static void ClearLeft (TScreen *screen);
 static void CopyWait (TScreen *screen);
 static void horizontal_copy_area (TScreen *screen, int firstchar, int nchars, int amount);
@@ -80,15 +80,15 @@
  * These routines are used for the jump scroll feature
  */
 void
-FlushScroll(register TScreen *screen)
+FlushScroll(TScreen *screen)
 {
-	register int i;
-	register int shift = -screen->topline;
-	register int bot = screen->max_row - shift;
-	register int refreshtop;
-	register int refreshheight;
-	register int scrolltop;
-	register int scrollheight;
+	int i;
+	int shift = -screen->topline;
+	int bot = screen->max_row - shift;
+	int refreshtop;
+	int refreshheight;
+	int scrolltop;
+	int scrollheight;
 
 	if(screen->cursor_state)
 		HideCursor();
@@ -158,15 +158,15 @@
 }
 
 int
-AddToRefresh(register TScreen *screen)
+AddToRefresh(TScreen *screen)
 {
-	register int amount = screen->refresh_amt;
-	register int row = screen->cur_row;
+	int amount = screen->refresh_amt;
+	int row = screen->cur_row;
 
 	if(amount == 0)
 		return(0);
 	if(amount > 0) {
-		register int bottom;
+		int bottom;
 
 		if(row == (bottom = screen->bot_marg) - amount) {
 			screen->refresh_amt++;
@@ -174,7 +174,7 @@
 		}
 		return(row >= bottom - amount + 1 && row <= bottom);
 	} else {
-		register int top;
+		int top;
 
 		amount = -amount;
 		if(row == (top = screen->top_marg) + amount) {
@@ -192,15 +192,15 @@
  * requires: amount > 0
  */
 void
-xtermScroll(register TScreen *screen, register int amount)
+xtermScroll(TScreen *screen, int amount)
 {
-	register int i = screen->bot_marg - screen->top_marg + 1;
-	register int shift;
-	register int bot;
-	register int refreshtop = 0;
-	register int refreshheight;
-	register int scrolltop;
-	register int scrollheight;
+	int i = screen->bot_marg - screen->top_marg + 1;
+	int shift;
+	int bot;
+	int refreshtop = 0;
+	int refreshheight;
+	int scrolltop;
+	int scrollheight;
 
 	if(screen->cursor_state)
 		HideCursor();
@@ -293,15 +293,15 @@
  * Requires: amount > 0
  */
 void
-RevScroll(register TScreen *screen, register int amount)
+RevScroll(TScreen *screen, int amount)
 {
-	register int i = screen->bot_marg - screen->top_marg + 1;
-	register int shift;
-	register int bot;
-	register int refreshtop;
-	register int refreshheight;
-	register int scrolltop;
-	register int scrollheight;
+	int i = screen->bot_marg - screen->top_marg + 1;
+	int shift;
+	int bot;
+	int refreshtop;
+	int refreshheight;
+	int scrolltop;
+	int scrollheight;
 
 	if(screen->cursor_state)
 		HideCursor();
@@ -358,15 +358,15 @@
  * bottom margin are lost.
  */
 void
-InsertLine (register TScreen *screen, register int n)
+InsertLine (TScreen *screen, int n)
 {
-	register int i;
-	register int shift;
-	register int bot;
-	register int refreshtop;
-	register int refreshheight;
-	register int scrolltop;
-	register int scrollheight;
+	int i;
+	int shift;
+	int bot;
+	int refreshtop;
+	int refreshheight;
+	int scrolltop;
+	int scrollheight;
 
 	if (screen->cur_row < screen->top_marg ||
 	 screen->cur_row > screen->bot_marg)
@@ -415,15 +415,15 @@
  * at the cursor's position, lines added at bottom margin are blank.
  */
 void
-DeleteLine(register TScreen *screen, register int n)
+DeleteLine(TScreen *screen, int n)
 {
-	register int i;
-	register int shift;
-	register int bot;
-	register int refreshtop;
-	register int refreshheight;
-	register int scrolltop;
-	register int scrollheight;
+	int i;
+	int shift;
+	int bot;
+	int refreshtop;
+	int refreshheight;
+	int scrolltop;
+	int scrollheight;
 
 	if (screen->cur_row < screen->top_marg ||
 	 screen->cur_row > screen->bot_marg)
@@ -494,7 +494,7 @@
  * Insert n blanks at the cursor's position, no wraparound
  */
 void
-InsertChar (register TScreen *screen, register int n)
+InsertChar (TScreen *screen, int n)
 {
 	if(screen->cursor_state)
 		HideCursor();
@@ -529,16 +529,16 @@
 	    }
 	}
 	/* adjust screen->buf */
-	ScrnInsertChar(screen, n, screen->max_col + 1);
+	ScrnInsertChar(screen, n);
 }
 
 /*
  * Deletes n chars at the cursor's position, no wraparound.
  */
 void
-DeleteChar (register TScreen *screen, register int n)
+DeleteChar (TScreen *screen, int n)
 {
-	register int width;
+	int width;
 
 	if(screen->cursor_state)
 		HideCursor();
@@ -570,21 +570,21 @@
 	    }
 	}
 	/* adjust screen->buf */
-	ScrnDeleteChar (screen, n, screen->max_col + 1);
+	ScrnDeleteChar (screen, n);
 }
 
 /*
  * Clear from cursor position to beginning of display, inclusive.
  */
 static void
-ClearAbove (register TScreen *screen)
+ClearAbove (TScreen *screen)
 {
 	if (screen->protected_mode != OFF_PROTECT) {
-		register int row;
+		int row;
 		for (row = 0; row <= screen->max_row; row++)
 			ClearInLine(screen, row, 0, screen->max_col + 1);
 	} else {
-		register int top, height;
+		int top, height;
 
 		if(screen->cursor_state)
 			HideCursor();
@@ -612,16 +612,16 @@
  * Clear from cursor position to end of display, inclusive.
  */
 static void
-ClearBelow (register TScreen *screen)
+ClearBelow (TScreen *screen)
 {
 	ClearRight(screen, -1);
 
 	if (screen->protected_mode != OFF_PROTECT) {
-		register int row;
+		int row;
 		for (row = screen->cur_row + 1; row <= screen->max_row; row++)
 			ClearInLine(screen, row, 0, screen->max_col + 1);
 	} else {
-		register int top;
+		int top;
 
 		if((top = screen->cur_row - screen->topline) <= screen->max_row) {
 			if(screen->scroll_amt)
@@ -643,7 +643,7 @@
  * protected characters were found, 0 otherwise.
  */
 static int
-ClearInLine(register TScreen *screen, int row, int col, int len)
+ClearInLine(TScreen *screen, int row, int col, int len)
 {
 	int rc = 1;
 	int flags = TERM_COLOR_FLAGS;
@@ -654,14 +654,17 @@
 	 * so this has the effect of suppressing trailing blanks from a
 	 * selection.
 	 */
-	if (col + len + 1 < screen->max_col)
+	if (col + len + 1 < screen->max_col) {
 		flags |= CHARDRAWN;
+	} else {
+		len = screen->max_col + 1 - col;
+	}
 
 	/* If we've marked protected text on the screen, we'll have to
 	 * check each time we do an erase.
 	 */
 	if (screen->protected_mode != OFF_PROTECT) {
-		register int n;
+		int n;
 		Char *attrs = SCRN_BUF_ATTRS(screen, row) + col;
 		int saved_mode = screen->protected_mode;
 		Bool done;
@@ -739,7 +742,7 @@
  * position.
  */
 void
-ClearRight (register TScreen *screen, int n)
+ClearRight (TScreen *screen, int n)
 {
 	int	len = (screen->max_col - screen->cur_col + 1);
 
@@ -761,7 +764,7 @@
  * Clear first part of cursor's line, inclusive.
  */
 static void
-ClearLeft (register TScreen *screen)
+ClearLeft (TScreen *screen)
 {
 	(void) ClearInLine(screen, screen->cur_row, 0, screen->cur_col + 1);
 }
@@ -770,15 +773,15 @@
  * Erase the cursor's line.
  */
 static void
-ClearLine(register TScreen *screen)
+ClearLine(TScreen *screen)
 {
 	(void) ClearInLine(screen, screen->cur_row, 0, screen->max_col + 1);
 }
 
 void
-ClearScreen(register TScreen *screen)
+ClearScreen(TScreen *screen)
 {
-	register int top;
+	int top;
 
 	if(screen->cursor_state)
 		HideCursor();
@@ -802,7 +805,7 @@
  */
 void
 do_erase_line(
-	register TScreen *screen,
+	TScreen *screen,
 	int param,
 	int mode)
 {
@@ -835,7 +838,7 @@
  */
 void
 do_erase_display(
-	register TScreen *screen,
+	TScreen *screen,
 	int param,
 	int mode)
 {
@@ -875,7 +878,7 @@
 		 * on 'ClearScreen()' to handle protected characters.
 		 */
 		if (screen->protected_mode != OFF_PROTECT) {
-			register int row;
+			int row;
 			int rc = 1;
 			for (row = 0; row <= screen->max_row; row++)
 				rc &= ClearInLine(screen, row, 0, screen->max_col + 1);
@@ -896,7 +899,7 @@
 }
 
 static void
-CopyWait(register TScreen *screen)
+CopyWait(TScreen *screen)
 {
 	XEvent reply;
 	XEvent *rep = &reply;
@@ -941,8 +944,8 @@
 	TScreen *screen,
 	int src_x,
 	int src_y,
-	unsigned int width,
-	unsigned int height,
+	unsigned width,
+	unsigned height,
 	int dest_x,
 	int dest_y)
 {
@@ -1027,10 +1030,10 @@
  */
 int
 HandleExposure (
-	register TScreen *screen,
-	register XEvent *event)
+	TScreen *screen,
+	XEvent *event)
 {
-    register XExposeEvent *reply = (XExposeEvent *)event;
+    XExposeEvent *reply = (XExposeEvent *)event;
 
 #ifndef NO_ACTIVE_ICON
     if (reply->window == screen->iconVwin.window)
@@ -1080,13 +1083,13 @@
  */
 static int
 handle_translated_exposure (
-	register TScreen *screen,
-	register int rect_x,
-	register int rect_y,
-	register unsigned int rect_width,
-	register unsigned int rect_height)
+	TScreen *screen,
+	int rect_x,
+	int rect_y,
+	unsigned rect_width,
+	unsigned rect_height)
 {
-	register int toprow, leftcol, nrows, ncols;
+	int toprow, leftcol, nrows, ncols;
 
 	TRACE(("handle_translated_exposure (%d,%d) - (%d,%d)\n",
 		rect_y, rect_x, rect_height, rect_width));
@@ -1132,7 +1135,7 @@
 void
 GetColors(XtermWidget tw, ScrnColors *pColors)
 {
-	register TScreen *screen = &tw->screen;
+	TScreen *screen = &tw->screen;
 
 	pColors->which=	0;
 	SET_COLOR_VALUE(pColors,TEXT_FG,	screen->foreground);
@@ -1152,7 +1155,7 @@
 void
 ChangeColors(XtermWidget tw, ScrnColors *pNew)
 {
-	register TScreen *screen = &tw->screen;
+	TScreen *screen = &tw->screen;
 	Bool	newCursor=	TRUE;
 #if OPT_TEK4014
 	Window tek = TWindow(screen);
@@ -1236,7 +1239,7 @@
 void
 ChangeAnsiColors(XtermWidget tw)
 {
-	register TScreen *screen = &tw->screen;
+	TScreen *screen = &tw->screen;
 
 	XClearWindow(screen->display, VWindow(screen));
 	ScrnRefresh (screen, 0, 0,
@@ -1249,7 +1252,7 @@
 void
 ReverseVideo (XtermWidget termw)
 {
-	register TScreen *screen = &termw->screen;
+	TScreen *screen = &termw->screen;
 	GC tmpGC;
 	Pixel tmp;
 #if OPT_TEK4014
@@ -1338,8 +1341,8 @@
 	unsigned long fg,		/* pixel indexes to look up */
 	unsigned long bg)		/* pixel indexes to look up */
 {
-    register TScreen *screen = &term->screen;
-    register Display *dpy = screen->display;
+    TScreen *screen = &term->screen;
+    Display *dpy = screen->display;
     XColor colordefs[2];		/* 0 is foreground, 1 is background */
 
     colordefs[0].pixel = fg;
@@ -1365,7 +1368,7 @@
  */
 int
 drawXtermText(
-	register TScreen *screen,
+	TScreen *screen,
 	unsigned flags,
 	GC gc,
 	int x,
@@ -1554,7 +1557,7 @@
 	}
 
 	/* If the font is complete, draw it as-is */
-	if (screen->fnt_boxes) {
+	if (screen->fnt_boxes && !screen->force_box_chars) {
 		TRACE(("drawtext%c[%4d,%4d] (%d) %d:%s\n",
 			screen->cursor_state == OFF ? ' ' : '*',
 			y, x, chrset, len,
@@ -1624,6 +1627,7 @@
 				  ? screen->fnt_bold
 				  : screen->fnt_norm;
 		Cardinal last, first = 0;
+		Boolean save_force = screen->force_box_chars;
 
 		screen->fnt_boxes = True;
 		for (last = 0; last < len; last++) {
@@ -1634,16 +1638,20 @@
 #endif
 			if (xtermMissingChar(ch, font)) {
 				if (last > first) {
+					screen->force_box_chars = False;
 					DrawSegment(first,last);
+					screen->force_box_chars = save_force;
 				}
 				xtermDrawBoxChar(screen, ch, flags, gc, DrawX(last), y);
 				first = last + 1;
 			}
 		}
 		if (last > first) {
+			screen->force_box_chars = False;
 			DrawSegment(first,last);
 		}
 		screen->fnt_boxes = False;
+		screen->force_box_chars = save_force;
 #endif
 	}
 
@@ -1657,20 +1665,19 @@
  */
 GC
 updatedXtermGC(
-	register TScreen *screen,
+	TScreen *screen,
 	int flags,
 	int fg_bg,
 	Bool hilite)
 {
 	Pixel fg_pix = getXtermForeground(flags,extract_fg(fg_bg,flags));
-	Pixel bg_pix = getXtermBackground(flags,extract_bg(fg_bg));
+	Pixel bg_pix = getXtermBackground(flags,extract_bg(fg_bg,flags));
 #if OPT_HIGHLIGHT_COLOR
 	Pixel hi_pix = screen->highlightcolor;
 #endif
 	GC gc;
 
-	if ( (!hilite && (flags & INVERSE) != 0)
-	  ||  (hilite && (flags & INVERSE) == 0) ) {
+	if (ReverseOrHilite(screen, flags, hilite)) {
 		if (flags & (BOLD|BLINK))
 			gc = ReverseBoldGC(screen);
 		else
@@ -1706,7 +1713,7 @@
  */
 void
 resetXtermGC(
-	register TScreen *screen,
+	TScreen *screen,
 	int flags,
 	Bool hilite)
 {
@@ -1714,8 +1721,7 @@
 	Pixel bg_pix = getXtermBackground(flags,term->cur_background);
 	GC gc;
 
-	if ( (!hilite && (flags & INVERSE) != 0)
-	  ||  (hilite && (flags & INVERSE) == 0) ) {
+	if (ReverseOrHilite(screen, flags, hilite)) {
 		if (flags & (BOLD|BLINK))
 			gc = ReverseBoldGC(screen);
 		else
@@ -1745,16 +1751,10 @@
 	unsigned color,
 	unsigned flags)
 {
-	int fg;
-
-#if OPT_EXT_COLORS
-	fg = (int) ((color >> 8) & 0xff);
-#else
-	fg = (int) ((color >> 4) & 0xf);
-#endif
+	int fg = (int)ExtractForeground(color);
 
 	if (term->screen.colorAttrMode
-	 || (fg == extract_bg(color))) {
+	 || (fg == (int)ExtractBackground(color))) {
 		if (term->screen.colorULMode && (flags & UNDERLINE))
 			fg = COLOR_UL;
 		if (term->screen.colorBDMode && (flags & BOLD))
@@ -1766,6 +1766,25 @@
 }
 
 /*
+ * Extract the background-color index from a one-byte color pair.
+ * If we've got INVERSE color-mode active, that will be used.
+ */
+int
+extract_bg (
+	unsigned color,
+	unsigned flags)
+{
+	int bg = (int)ExtractBackground(color);
+
+	if (term->screen.colorAttrMode
+	 || (bg == (int)ExtractForeground(color))) {
+		if (term->screen.colorRVMode && (flags & INVERSE))
+			bg = COLOR_RV;
+	}
+	return bg;
+}
+
+/*
  * Combine the current foreground and background into a single 8-bit number.
  * Note that we're storing the SGR foreground, since cur_foreground may be set
  * to COLOR_UL, COLOR_BD or COLOR_BL, which would make the code larger than 8
@@ -1790,7 +1809,7 @@
  * Using the "current" SGR background, clear a rectangle.
  */
 void ClearCurBackground(
-	register TScreen *screen,
+	TScreen *screen,
 	int top,
 	int left,
 	unsigned height,
@@ -1844,7 +1863,7 @@
 		if ((s1+n > s2) && (s2+n > s1)) {
 			static	char	*bfr;
 			static	size_t	length;
-			register size_t	j;
+			size_t	j;
 			if (length < n) {
 				length = (n * 3) / 2;
 				bfr = (bfr != 0)
@@ -1890,6 +1909,7 @@
 
 void update_keyboard_type(void)
 {
+    update_delete_del();
     update_old_fkeys();
     update_hp_fkeys();
     update_sco_fkeys();
Index: xc/programs/xterm/version.h
diff -u xc/programs/xterm/version.h:3.49 xc/programs/xterm/version.h:3.57
--- xc/programs/xterm/version.h:3.49	Mon Feb 28 19:09:30 2000
+++ xc/programs/xterm/version.h	Fri Jun 30 11:27:03 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xterm/version.h,v 3.49 2000/02/29 03:09:30 dawes Exp $ */
+/* $XFree86: xc/programs/xterm/version.h,v 3.57 2000/06/30 18:27:03 dawes Exp $ */
 
 /*
  * These definitions are used to build the string that's printed in response to
@@ -6,5 +6,5 @@
  * XFree86 to which this version of xterm has been built.  The number in
  * parentheses is my patch number (T.Dickey).
  */
-#define XTERM_PATCH   129
-#define XFREE86_VERSION "XFree86 4.0"
+#define XTERM_PATCH   139
+#define XFREE86_VERSION "XFree86 4.0.1"
Index: xc/programs/xterm/xterm.dat
diff -u xc/programs/xterm/xterm.dat:1.1 xc/programs/xterm/xterm.dat:1.2
--- xc/programs/xterm/xterm.dat:1.1	Tue Feb  8 09:19:45 2000
+++ xc/programs/xterm/xterm.dat	Tue Jun 13 17:16:21 2000
@@ -1,4 +1,4 @@
-! $XFree86: xc/programs/xterm/xterm.dat,v 1.1 2000/02/08 17:19:45 dawes Exp $
+! $XFree86: xc/programs/xterm/xterm.dat,v 1.2 2000/06/14 00:16:21 dawes Exp $
 !
 *title: Xterm
 *iconName: Xterm
@@ -27,8 +27,8 @@
 *mainMenu*backarrow key*Label: Backarrow Key
 *mainMenu*num-lock*Label: Alt/NumLock Modifiers
 *mainMenu*meta-esc*Label: Meta Sends Escape
-*mainMenu*sun function-keys*Label: Sun Function-Keys
-*mainMenu*sun keyboard*Label: VT220 Keyboard
+*mainMenu*sunFunction-keys*Label: Sun Function-Keys
+*mainMenu*sunKeyboard*Label: VT220 Keyboard
 *mainMenu*hp function-keys*Label: HP Function-Keys
 *mainMenu*suspend*Label:  Send STOP Signal
 *mainMenu*suspend*Sensitive: FALSE
Index: xc/programs/xterm/xterm.h
diff -u xc/programs/xterm/xterm.h:3.56 xc/programs/xterm/xterm.h:3.60
--- xc/programs/xterm/xterm.h:3.56	Mon Feb 28 19:09:31 2000
+++ xc/programs/xterm/xterm.h	Tue Jun 13 17:16:21 2000
@@ -1,8 +1,8 @@
-/* $XFree86: xc/programs/xterm/xterm.h,v 3.56 2000/02/29 03:09:31 dawes Exp $ */
+/* $XFree86: xc/programs/xterm/xterm.h,v 3.60 2000/06/14 00:16:21 dawes Exp $ */
 
 /************************************************************
 
-Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1999-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -57,6 +57,10 @@
 #define HAVE_X11_DECKEYSYM_H 1
 #endif
 
+#ifndef HAVE_X11_SUNKEYSYM_H
+#define HAVE_X11_SUNKEYSYM_H 1
+#endif
+
 #ifndef DFT_TERMTYPE
 #define DFT_TERMTYPE "xterm"
 #endif
@@ -115,14 +119,22 @@
 #define USE_LASTLOG
 #endif
 
+#if defined(AMOEBA) || defined(SCO) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__QNX__) || defined(__hpux) || (defined(BSD) && (BSD >= 199103))
+#define USE_POSIX_WAIT
+#endif
+
 #if defined(AIXV3) || defined(CRAY) || defined(SCO) || defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__MVS__) || defined(__hpux) || defined(__osf__) || defined(linux) || defined(macII)
 #define USE_SYSV_UTMP
 #endif
 
-#if defined(__GNU__) || defined(__MVS__)
+#if defined(__GNU__) || defined(__MVS__) || defined(__osf__)
 #define USE_TTY_GROUP
 #endif
 
+#ifdef __osf__
+#define TTY_GROUP_NAME "terminal"
+#endif
+
 #if defined(__MVS__)
 #undef ut_xstatus
 #define ut_name ut_user
@@ -177,9 +189,10 @@
 
 #if (XtSpecificationRelease >= 6) && !defined(NO_XPOLL_H)
 #include <X11/Xpoll.h>
+#define USE_XPOLL_H 1
 #else
 #define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval *)t)
-#define XFD_COPYSET(src,dst) bcopy((src)->fds_bits, (dst)->fds_bits, sizeof(fd_set))
+#define XFD_COPYSET(src,dst) memcpy((dst)->fds_bits, (src)->fds_bits, sizeof(fd_set))
 #ifdef __MVS__
 #include <sys/time.h>
 #endif
@@ -189,7 +202,7 @@
 
 #include <sys/types.h>
 
-#if defined(AIXV3) && defined(NFDBITS)
+#if defined(USE_XPOLL_H) && defined(AIXV3) && defined(NFDBITS)
 #undef NFDBITS	/* conflict between X11/Xpoll.h and sys/select.h */
 #endif
 
@@ -203,6 +216,7 @@
 
 #define XtNallowSendEvents	"allowSendEvents"
 #define XtNalwaysHighlight	"alwaysHighlight"
+#define XtNalwaysUseMods	"alwaysUseMods"
 #define XtNanswerbackString	"answerbackString"
 #define XtNappcursorDefault	"appcursorDefault"
 #define XtNappkeypadDefault	"appkeypadDefault"
@@ -238,8 +252,11 @@
 #define XtNcolorBL		"colorBL"
 #define XtNcolorBLMode		"colorBLMode"
 #define XtNcolorMode		"colorMode"
+#define XtNcolorRV		"colorRV"
+#define XtNcolorRVMode		"colorRVMode"
 #define XtNcolorUL		"colorUL"
 #define XtNcolorULMode		"colorULMode"
+#define XtNctrlFKeys		"ctrlFKeys"
 #define XtNcurses		"curses"
 #define XtNcursorBlink		"cursorBlink"
 #define XtNcursorColor		"cursorColor"
@@ -260,6 +277,7 @@
 #define XtNinternalBorder	"internalBorder"
 #define XtNjumpScroll		"jumpScroll"
 #define XtNkeyboardDialect	"keyboardDialect"
+#define XtNlimitResize		"limitResize"
 #define XtNlogFile		"logFile"
 #define XtNlogInhibit		"logInhibit"
 #define XtNlogging		"logging"
@@ -310,6 +328,7 @@
 
 #define XtCAllowSendEvents	"AllowSendEvents"
 #define XtCAlwaysHighlight	"AlwaysHighlight"
+#define XtCAlwaysUseMods	"AlwaysUseMods"
 #define XtCAnswerbackString	"AnswerbackString"
 #define XtCAppcursorDefault	"AppcursorDefault"
 #define XtCAppkeypadDefault	"AppkeypadDefault"
@@ -324,6 +343,7 @@
 #define XtCCharClass		"CharClass"
 #define XtCColorMode		"ColorMode"
 #define XtCColumn		"Column"
+#define XtCCtrlFKeys		"CtrlFKeys"
 #define XtCCurses		"Curses"
 #define XtCCursorBlink		"CursorBlink"
 #define XtCCursorOffTime	"CursorOffTime"
@@ -341,6 +361,7 @@
 #define XtCHpLowerleftBugCompat	"HpLowerleftBugCompat"
 #define XtCJumpScroll		"JumpScroll"
 #define XtCKeyboardDialect	"KeyboardDialect"
+#define XtCLimitResize		"LimitResize"
 #define XtCLogInhibit		"LogInhibit"
 #define XtCLogfile		"Logfile"
 #define XtCLogging		"Logging"
@@ -502,6 +523,7 @@
 #endif
 
 /* input.c */
+extern Boolean xtermDeleteIsDEL (void);
 extern void Input (TKeyboard *keyboard, TScreen *screen, XKeyEvent *event, Bool eightbit);
 extern void StringInput (TScreen *screen, char *string, size_t nbytes);
 
@@ -539,6 +561,8 @@
 extern char *strindex (char *s1, char *s2);
 extern char *udk_lookup (int keycode, int *len);
 extern int XStrCmp (char *s1, char *s2);
+extern int creat_as (int uid, int gid, Boolean append, char *pathname, int mode);
+extern int open_userfile (int uid, int gid, char *path, Boolean append);
 extern int xerror (Display *d, XErrorEvent *ev);
 extern int xioerror (Display *dpy);
 extern void Bell (int which, int percent);
@@ -558,7 +582,8 @@
 extern void Panic (char *s, int a);
 extern void Redraw (void);
 extern void ReverseOldColors (void);
-extern void creat_as (int uid, int gid, char *pathname, int mode);
+extern void SysError (int i);
+extern void VisualBell (void);
 extern void do_dcs (Char *buf, size_t len);
 extern void do_osc (Char *buf, int len, int final);
 extern void do_xevents (void);
@@ -570,11 +595,10 @@
 extern void set_tek_visibility (Boolean on);
 extern void set_vt_visibility (Boolean on);
 extern void switch_modes (Bool tovt);
-extern void SysError (int i);
-extern void VisualBell (void);
+extern void timestamp_filename(char *dst, const char *src);
 extern void xevents (void);
-extern void xtermSetenv (char *var, char *value);
 extern void xt_error (String message);
+extern void xtermSetenv (char *var, char *value);
 
 #if OPT_MAXIMIZE
 extern int QueryMaximize (TScreen *screen, unsigned *width, unsigned *height);
@@ -621,9 +645,9 @@
 extern size_t ScrnPointers (TScreen *screen, size_t len);
 extern void ClearBufRows (TScreen *screen, int first, int last);
 extern void ScreenWrite (TScreen *screen, PAIRED_CHARS(Char *str, Char *str2), unsigned flags, unsigned cur_fg_bg, int length);
-extern void ScrnDeleteChar (TScreen *screen, int n, int size);
+extern void ScrnDeleteChar (TScreen *screen, int n);
 extern void ScrnDeleteLine (TScreen *screen, ScrnBuf sb, int n, int last, int size, int where);
-extern void ScrnInsertChar (TScreen *screen, int n, int size);
+extern void ScrnInsertChar (TScreen *screen, int n);
 extern void ScrnInsertLine (TScreen *screen, ScrnBuf sb, int last, int where, int n, int size);
 extern void ScrnRefresh (TScreen *screen, int toprow, int leftcol, int nrows, int ncols, int force);
 
@@ -694,10 +718,11 @@
 extern Pixel getXtermBackground (int flags, int color);
 extern Pixel getXtermForeground (int flags, int color);
 extern int extract_fg (unsigned color, unsigned flags);
+extern int extract_bg (unsigned color, unsigned flags);
 extern unsigned makeColorPair (int fg, int bg);
 extern void ClearCurBackground (TScreen *screen, int top, int left, unsigned height, unsigned width);
 
-#define xtermColorPair() makeColorPair(term->sgr_foreground, term->cur_background)
+#define xtermColorPair() makeColorPair(term->sgr_foreground, term->sgr_background)
 
 #define getXtermForeground(flags, color) \
 	(((flags) & FG_COLOR) && ((color) >= 0) \
@@ -719,9 +744,11 @@
 #endif
 
 #if OPT_EXT_COLORS
-#define extract_bg(color) ((int)((color) & 0xff))
+#define ExtractForeground(color) ((color >> 8) & 0xff)
+#define ExtractBackground(color) (color & 0xff)
 #else
-#define extract_bg(color) ((int)((color) & 0xf))
+#define ExtractForeground(color) ((color >> 4) & 0xf)
+#define ExtractBackground(color) (color & 0xf)
 #endif
 
 #else /* !OPT_ISO_COLORS */
@@ -731,7 +758,7 @@
 		left, top, width, height, FALSE)
 
 #define extract_fg(color, flags) term->cur_foreground
-#define extract_bg(color) term->cur_background
+#define extract_bg(color, flags) term->cur_background
 
 		/* FIXME: Reverse-Video? */
 #define getXtermBackground(flags, color) term->core.background_pixel
Index: xc/programs/xterm/xterm.log.html
diff -u xc/programs/xterm/xterm.log.html:1.49 xc/programs/xterm/xterm.log.html:1.56
--- xc/programs/xterm/xterm.log.html:1.49	Fri Mar  3 12:02:35 2000
+++ xc/programs/xterm/xterm.log.html	Mon Jun 19 22:08:51 2000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
 <!--
  *****************************************************************************
- * Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey (dickey@clark.net) *
+ * Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey                    *
  * All Rights Reserved.                                                      *
  *                                                                           *
  * Permission to use, copy, modify, and distribute this software and its     *
@@ -20,16 +20,17 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.            *
  *****************************************************************************
-  $XFree86: xc/programs/xterm/xterm.log.html,v 1.49 2000/03/03 20:02:35 dawes Exp $
+  $XFree86: xc/programs/xterm/xterm.log.html,v 1.56 2000/06/20 05:08:51 dawes Exp $
   -->
 <HTML>
 <HEAD>
 <TITLE>XTERM - Change Log</TITLE>
-<LINK REV=MADE HREF="mailto:dickey@clark.net">
+<LINK REV=MADE HREF="mailto:dickey@herndon4.his.com">
 </HEAD>
 <BODY>
 <HR>
-Copyright 1997,1998,1999,2000 by Thomas E. Dickey
+Copyright 1997,1998,1999,2000 by <A
+HREF="mailto:dickey@herndon4.his.com">Thomas E. Dickey</A>
 <HR>
 <H1>Contents</H1>
 This file contains a list of the changes that I have made for XFree86 xterm,
@@ -41,6 +42,15 @@
 xc/programs/Xserver/hw/xfree86).
 
 <UL>
+<LI><A HREF="#xterm_139">Patch #139 - 2000/6/17 - XFree86 4.0d</A>
+<LI><A HREF="#xterm_138">Patch #138 - 2000/6/15 - XFree86 4.0c</A>
+<LI><A HREF="#xterm_137">Patch #137 - 2000/6/10 - XFree86 4.0b</A>
+<LI><A HREF="#xterm_136">Patch #136 - 2000/6/3 - XFree86 4.0b</A>
+<LI><A HREF="#xterm_135">Patch #135 - 2000/5/29 - XFree86 4.0b</A>
+<LI><A HREF="#xterm_134">Patch #134 - 2000/5/28 - XFree86 4.0b</A>
+<LI><A HREF="#xterm_133">Patch #133 - 2000/5/2 - XFree86 4.0a</A>
+<LI><A HREF="#xterm_132">Patch #132 - 2000/4/11 - XFree86 4.0a</A>
+<LI><A HREF="#xterm_131">Patch #131 - 2000/3/3 - XFree86 3.9.18b</A>
 <LI><A HREF="#xterm_130">Patch #130 - 2000/3/1 - XFree86 3.9.18a</A>
 <LI><A HREF="#xterm_129">Patch #129 - 2000/2/26 - XFree86 3.9.18a</A>
 <LI><A HREF="#xterm_128">Patch #128 - 2000/2/17 - XFree86 3.9.18</A>
@@ -174,6 +184,260 @@
 <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
 </UL>
 
+<H1><A NAME="xterm_139">Patch #139 - 2000/6/17 - XFree86 4.0d</A></H1>
+<ul>
+	<li>back out change to <code>-name</code> command-line option,
+	  restoring its original behavior (as noted by David Madore, the
+	  correct interpretation of this option is the application instance
+	  rather than the application class).
+</ul>
+
+<H1><A NAME="xterm_138">Patch #138 - 2000/6/15 - XFree86 4.0c</A></H1>
+<ul>
+	<li>workaround for fixed fonts which are generated from Unicode fonts: 
+	  they omit glyphs for some xterm's less-used line-drawing characters,
+	  which caused xterm to set a flag telling it to use only its internal
+	  line-drawing characters.  Do not set the flag (it can be set from the
+	  popup menu), and xterm will generate only the line-drawing glyphs
+	  which actually are missing.
+	  <br>
+	  Otherwise, when used for large fonts, xterm may generate a 2-pixel
+	  wide line, which can leave dots on the screen.
+
+	<li>restore first line of 256colres.pl, omitted in 4.0c diffs.
+</ul>
+<H1><A NAME="xterm_137">Patch #137 - 2000/6/10 - XFree86 4.0b</A></H1>
+<ul>
+	<li>make command-line <code>-name</code> option work as documented.
+	  Apparently this was lost in X11R5 when coding to use
+	  <code>XtAppInitialize</code>.
+
+	<li>limit numeric parameters of control sequences to 65535 to
+	  simplify checks for numeric overflow.
+
+	<li>change index into UDK list to unsigned to guard against numeric
+	  overflow making the index negative (Taneli Huuskonen
+	  &lt;huuskone@cc.helsinki.fi&gt;).
+
+	<li>change <code>sun&nbsp;function-keys</code> resource name to
+	  <code>sunFunctionKeys</code> to work around redefinition of the
+	  token <code>sun</code> by xrdb on Solaris.  Similarly, renamed
+	  resource <code>sun&nbsp;keyboard</code> to <code>sunKeyboard</code>
+	  (Steve Wall).
+
+	<li>change similar resource names for HP and SCO to avoid potential
+	  conflict with xrdb symbols on other systems, as well as for
+	  consistency.
+
+	<li>reorganized the install targets in the autoconf'd Makefile, adding
+	  install-app, install-bin, install-dirs and install-man.  The
+	  app-defaults class can be overridden by setting the make variable
+	  'CLASS', simplifying customization of xterm as a Unicode terminal,
+	  e.g., CLASS=UXTerm.
+
+	<li>add limit checks to <code>ClearInLine()</code>,
+	  <code>ScrnInsertChar()</code>, <code>ScrnDeleteChar()</code> to
+	  correct potential out-of-bounds indexing (prompted by Debian bug
+	  report #64713, which reported a problem with ICH escape sequences).
+
+	<li>updates to config.sub and config.guess
+	  Kevin Buettner &lt;kev@primenet.com&gt; for elf64_ia64
+	  Bernd Kuemmerlen &lt;bkuemmer@mevis.de&gt; and MacOS X.
+
+	<li>patch from Paul Gilmartin for os390 to check for errno set to
+	  ENODEV on failure to open /dev/tty when there is no controlling
+	  terminal.
+
+	<li>patch from H Merijn Brand &lt;h.m.brand@hccnet.nl&gt; for
+	  building on Digital Unix 4.0 and AIX 4.2.
+
+	<li>modify DECRQSS reply for DECSCL to additionally report if the
+	  terminal is set for 8-bit controls.
+</ul>
+
+<H1><A NAME="xterm_136">Patch #136 - 2000/6/3 - XFree86 4.0b</A></H1>
+<ul>
+	<li>add a resource (<code>limitResize</code>)
+	  limiting resizing via the CSI 4 t and CSI 8 t sequences.
+
+	<li>ignore out-of-bounds resize requests, i.e., where sign-extension
+	  or truncation of the parameters would occur.
+</ul>
+
+<H1><A NAME="xterm_135">Patch #135 - 2000/5/29 - XFree86 4.0b</A></H1>
+<ul>
+	<li>remove code introduced in #134 which made some backgrounds bold.
+
+	<li>minor correction to format of updated $TERMCAP when adding
+	  <code>kb</code> capability for <code>ptyInitialErase</code> logic.
+
+	<li>improved test for SVR4 definition.
+</ul>
+
+<H1><A NAME="xterm_134">Patch #134 - 2000/5/28 - XFree86 4.0b</A></H1>
+<ul>
+	<li>update URL's and mailing addresses, moved to http://dickey.his.com
+	  and dickey@herndon4.his.com
+
+	<li>correct missing quotes in CF_TTY_GROUP configure script macro in
+	  case the script is run in batch mode.
+
+	<li>modify ownership-check of log file to ignore the group ownership.
+	  Otherwise xterm cannot create logfiles in directories with set-gid
+	  permissions.
+
+	<li>simplify the logic that reads termcap data.
+
+	<li>add fallback definition for B9600 in case line speed definition
+	  for 38400 is missing (report by Jack J Woehr &lt;jwoehr@ibm.net&gt;,
+	  for OpenBSD 2.6).
+
+	<li>fix:  Set highlightColor, and select a region containing the text
+	  cursor.  If the window loses focus, the cursor becomes hollow, with
+	  the region inside the cursor being background/foreground, unlike the
+	  rest of the selection, which is foreground/highlight
+	  (patch by Ross Paterson &lt;ross@soi.city.ac.uk&gt;).
+
+	<li>add configure script tests to define SVR4, SYSV and USE_POSIX_WAIT,
+	  which enables xterm to compile on Solaris 7 and SCO Openserver
+	  without imake, though there are still a few features for the latter
+	  which require <code>sco</code> to be predefined.
+
+	<li>patches from Steve Wall:
+	<ul>
+	<li>add support for two Sun-specific function keys.  These keys are
+	  labeled F11 and F12 on Sun Type 5 keyboards, but return SunXK_F36 and
+	  SunXK_F37.  Support will only be compiled in if the header file
+	  &lt;X11/Sunkeysym.h&gt; exists and contains the appropriate symbol
+	  definitions.  The keycodes for the DEC keycodes were arbitrary unused
+	  codes, but the ones for the Sun keycodes are what cmdtool and
+	  shelltool actually send.
+
+	<li>add <code>colorRV</code> and <code>colorRVMode</code> resources to allow specifying a
+	  color to use for reverse video, similar to the existing UL, BD, and BL
+	  modes.
+
+	<li>add <code>alwaysUseMods</code> resource, to override check if
+	  <code>alt</code> or <code>meta</code> modifiers are used in
+	  <code>translations</code> resource.  Revamped the code to calculate
+	  the modifier value, and included Meta if alwaysUseMods is TRUE, using
+	  values 9-16.
+	</ul>
+
+	<li>patches from Paul Gilmartin for os390:
+	<ul>
+	<li>regularize the definition of CONTROL() and remove an
+	  acknowledged "trial and error" table.
+
+	<li>translate "^?" into A2E(0177) which is the EBCDIC "DEL"
+	  rather than plain 0177 which is the EBCDIC quotation mark.
+
+	<li>modify <code>xtermMissingChar()</code> so that EBCDIC codes 128-159
+	  are not rendered as blanks by X server running on Solaris, which sees
+	  those as control characters.
+
+	<li>make debugging traces (configure --enable-trace)
+	 work properly with EBCDIC.
+	</ul>
+</ul>
+
+<H1><A NAME="xterm_133">Patch #133 - 2000/5/2 - XFree86 4.0a</A></H1>
+<ul>
+	<li>add substitutions in autoconf'd Makefile for CPPFLAGS, LDFLAGS and
+	  AWK (reported by Neil Bird).
+
+	<li>correct uninitialized <code>childstat</code> variable from patch
+	  #131 in <code>creat_as()</code> function, which caused logging to not
+	  work on Solaris, whose <code>waitpid()</code> function does not
+	  initialize its parameter.  Add check for EINTR on return from
+	  <code>waitpid()</code> as well (reported by Neil Bird
+	  &lt;neil.bird@rdel.co.uk&gt;).
+
+	<li>remove a redundant check for working <code>setuid()</code> function
+	  introduced in patch #132 (Greg Smith reports that this does not work
+	  as intended on os390).
+
+	<li>change line speed from 9600bd to 38400bd, to accommodate people who
+	  mistakenly use $TERM set to <em>vt100</em>, to reduce the effect of
+	  padding associated with this terminal type.
+
+	<li>add configure script check for IRIX 6.5's redefinition of baud
+	  rates associated with <code>struct termio</code>, to correct a
+	  situation where the baud rate was initialized to zero (reported by
+	  Andrew Isaacson &lt;adi@lcse.umn.edu&gt;).
+
+	<li>remove unused configure script check for VDISABLE.
+</ul>
+
+<H1><A NAME="xterm_132">Patch #132 - 2000/4/11 - XFree86 4.0a</A></H1>
+<ul>
+	<li>undo an incorrect change from patch #113 caused the right scrollbar
+	  to be positioned incorrectly when re-enabling it (analysis by
+	  D Roland Walker).
+
+	<li>add ctrlFKeys resource, replacing constant for adjusting
+	  control-F1 to control-F12 to VT220-style F10-F20.  The resource
+	  changes the constant 12 to a default value of 10 (request by
+	  Jim Knoble &lt;jmknoble@pobox.com&gt;).
+
+	<li>correct ifdef'ing for conflict between definitions in AIX's
+	  &lt;sys/select.h&gt; and &lt;X11/XPoll.h&gt; (reported by Clint
+	  Olsen).
+
+	<li>add checks for return-values of getutid(), initgroups() and
+	  setuid() in main.c, as well as modifying ifdef's for __osf__ to
+	  include tty-group and WTMP logic (adapted from patch by Paul Szabo
+	  &lt;psz@maths.usyd.edu.au&gt;)
+
+	<li>modify resize.c to build and work on os390 (uses EBCDIC)
+	  (adapted from patch by Phil Sidler &lt;Phil.Sidler@airborne.com&gt;)
+
+	<li>use Ires(), Bres() and Sres() macros to simplify resource list in
+	  charproc.c
+
+	<li>resync with XFree86 4.0a:
+	<ul>
+	  <li>correct a typo in os2main.c (Holger Veit, from 4.0a).
+	</ul>
+</ul>
+
+<H1><A NAME="xterm_131">Patch #131 - 2000/3/3 - XFree86 3.9.18b</A></H1>
+<ul>
+	<li>integrate patch by Branden Robinson for improving logfile
+	  security:
+	  <ul>
+	  <li>make the <code>creat_as()</code> function more strict by using
+	    O_EXCL rather than O_APPEND.
+	  <li>fixes to make DEBUG ifdef's compile/run, including making the
+	    debug logfile more unique by appending a timestamp to its name.
+	  <li>include &lt;term.h&gt; in resize.c, to fix a missing-prototype
+	    warning.
+	  </ul>
+	    
+	<li>modified <code>creat_as()</code> a little more, retaining the
+	  ability to append to a logfile If the user specifies the name.
+	  Also, check if the opened file (which patch #130 ensures is
+	  owned by the effective user) is not writable by other users.
+
+	<li>use <code>creat_as()</code> logic to make tek4014 screen-copy
+	  more secure (noted by Branden Robinson).
+
+	<li>ifdef'd some of Branden's changes to build/work on older machines. 
+
+	<li>correct missing initialization of the <code>.mode</code> flag in
+	  <code>ColorRes</code> struct, from patch #129.  This worked on Linux
+	  because <code>malloc()</code> zeroes memory on that platform
+	  (reported by Christian Weisgerber).
+
+	<li>modify logic for <code>deleteIsDEL</code> resource so it has
+	  internally 3 states:  unspecified, true and false.  If unspecified,
+	  the keyboard type determines whether the Delete key transmits
+	  <code>&lt;esc&gt;[3~</code> or <code>\177</code>, and the popup menu
+	  entry reflects the internal state.  Otherwise, the popup menu entry
+	  overrides the keyboard type (suggested by Dr Werner Fink, to make it
+	  simpler to set resources that imitate the legacy X11R6 xterm).
+</ul>
+
 <H1><A NAME="xterm_130">Patch #130 - 2000/3/1 - XFree86 3.9.18a</A></H1>
 <ul>
 	<li>modify <code>scroll-forw()</code> and <code>scroll-back()</code> 
@@ -911,7 +1175,7 @@
 
 <H1><A NAME="xterm_107">Patch #107 - 1999/6/12 - XFree86 3.9Pq</A></H1>
 <ul>
-	<li>Two changes from Stephen P Wall &lt;steve_wall@redcom.com&gt;.
+	<li>Two changes from Stephen P Wall.
 	  From his description:
 	<blockquote>
 	The first change is simple - I added ESC[3J to erase the stored lines
Index: xc/programs/xterm/xterm.man
diff -u xc/programs/xterm/xterm.man:3.59 xc/programs/xterm/xterm.man:3.62
--- xc/programs/xterm/xterm.man:3.59	Fri Mar  3 12:02:36 2000
+++ xc/programs/xterm/xterm.man	Tue Jun 13 17:16:23 2000
@@ -1,8 +1,8 @@
 .\" $XConsortium: xterm.man /main/85 1996/12/09 17:10:53 kaleb $
-.\" $XFree86: xc/programs/xterm/xterm.man,v 3.59 2000/03/03 20:02:36 dawes Exp $
+.\" $XFree86: xc/programs/xterm/xterm.man,v 3.62 2000/06/14 00:16:23 dawes Exp $
 .\"
 .\"
-.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey <dickey@clark.net>
+.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey
 .\"
 .\"                         All Rights Reserved
 .\"
@@ -57,7 +57,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.\" updated by Thomas Dickey <dickey@clark.net> for XFree86, July 1996.
+.\" updated by Thomas E. Dickey for XFree86, July 1996.
 .TH XTERM 1 "Release 6.3" "X Version 11"
 .SH NAME
 xterm \- terminal emulator for X
@@ -124,7 +124,7 @@
 menu; see below).
 The name of the file will be
 ``\fBCOPY\fIyyyy\fB\-\fIMM\fB\-\fIdd\fB.\fIhh\fB:\fImm\fB:\fIss\fP'', where
-.IR yy ,
+.IR yyyy ,
 .IR MM ,
 .IR dd ,
 .IR hh ,
@@ -454,6 +454,12 @@
 .B \-rightbar
 Force scrollbar to the right side of VT100 screen.
 .TP 8
+.B "\-rvc"
+This option disables the display of characters with reverse attribute as color.
+.TP 8
+.B "\+rvc"
+This option enables the display of characters with reverse attribute as color.
+.TP 8
 .B \-rw
 This option indicates that reverse-wraparound should be allowed.  This allows
 the cursor to back up from the leftmost column of one line to the rightmost
@@ -783,7 +789,8 @@
 than DEC VT220.
 This causes the keypad `+' to be mapped to `,'.
 and
-CTRL-F1 to F13, CTRL-F2 to F14, etc.,
+CTRL F1-F12 to F11-F20, depending on the setting of the \fBctrlFKeys\fP
+resource.
 so \fIxterm\fP emulates a DEC VT220 more accurately.
 Otherwise (the default, with \fBsunKeyboard\fP set to ``false''),
 \fIxterm\fP uses PC-style bindings for the function keys and keypad.
@@ -880,6 +887,11 @@
 text cursor.  By default, a hollow text cursor is displayed whenever the
 pointer moves out of the window or the window loses the input focus.
 .TP 8
+.B "alwaysUseMods (\fPclass\fB AlwaysUseMods)"
+Override the \fBnumLock\fP resource, telling xterm to use the Alt and Meta
+modifiers as to construct parameters for function key sequences even if
+those modifiers appear in the translations resource.
+.TP 8
 .B "appcursorDefault (\fPclass\fB AppcursorDefault)"
 If ``true,'' the cursor keys are initially in application mode.
 The default is ``false.''
@@ -968,8 +980,8 @@
 The default is ``false.''
 .TP 8
 .B "colorAttrMode (\fPclass\fB ColorMode)"
-Specifies whether ``colorBD'', ``colorBL'' and ``colorUL''
-should override ANSI colors.
+Specifies whether ``colorBD'', ``colorBL'', ``colorUL'', and
+``colorRV'' should override ANSI colors.
 If not, these are displayed only when no ANSI colors
 have been set for the corresponding position.
 The default is ``false.''
@@ -989,6 +1001,11 @@
 color.
 Note that setting ``colorMode'' off disables all colors, including this.
 .TP 8
+.B "colorRVMode (\fPclass\fB ColorMode)"
+Specifies whether characters with the reverse attribute should be displayed in
+color.
+Note that setting ``colorMode'' off disables all colors, including this.
+.TP 8
 .B "colorULMode (\fPclass\fB ColorMode)"
 Specifies whether characters with the underline attribute should be displayed
 in color or as underlined characters.  Note that setting ``colorMode'' off
@@ -1048,10 +1065,21 @@
 This specifies the color to use to display blink characters if
 the ``colorBLMode'' resource is enabled.
 .TP 8
+.B "colorRV (\fPclass\fB Foreground)"
+This specifies the color to use to display reverse characters if
+the ``colorRVMode'' resource is enabled.
+.TP 8
 .B "colorUL (\fPclass\fB Foreground)"
 This specifies the color to use to display underlined characters if
 the ``colorULMode'' resource is enabled.
 .TP 8
+.B "ctrlFKeys (\fPclass\fB CtrlFKeys)"
+In VT220 keyboard mode (see \fBsunKeyboard\fP resource),
+specifies the amount by which to shift F1-F12 given a control modifier (CTRL).
+This allows you to generate key symbols for F10-F20 on a Sun/PC keyboard.
+The default is ``10'', which means that CTRL F1 generates the key
+symbol for F11.
+.TP 8
 .B "cursorBlink (\fPclass\fB CursorBlink)"
 Specifies whether to make the cursor blink.
 The default is ``false.''
@@ -1197,6 +1225,11 @@
 which change character sets.
 The default is ``B'', which corresponds to US ASCII.
 .TP 8
+.B "limitResize (\fPclass\fB LimitResize)"
+Limits resizing of the screen via control sequence to a given multiple of
+the display dimensions.
+The default is ``1''.
+.TP 8
 .B "loginShell (\fPclass\fB LoginShell)"
 Specifies whether or not the shell to be run in the window should be started
 as a login shell.  The default is ``false.''
@@ -1483,20 +1516,20 @@
 .B "delete-is-del (\fPclass\fB SmeBSB)"
 This entry invokes the \fBdelete-is-del(toggle)\fP action.
 .TP 8
-.B "old\ function-keys (\fPclass\fB SmeBSB)"
-This entry invokes the \fBold\ function-keys(toggle)\fP action.
+.B "oldFunctionKeys (\fPclass\fB SmeBSB)"
+This entry invokes the \fBold-function-keys(toggle)\fP action.
 .TP 8
-.B "hp\ function-keys (\fPclass\fB SmeBSB)"
-This entry invokes the \fBhp\ function-keys(toggle)\fP action.
+.B "hpFunctionKeys (\fPclass\fB SmeBSB)"
+This entry invokes the \fBhp-function-keys(toggle)\fP action.
 .TP 8
-.B "sco\ function-keys (\fPclass\fB SmeBSB)"
-This entry invokes the \fBsco\ function-keys(toggle)\fP action.
+.B "scoFunctionKeys (\fPclass\fB SmeBSB)"
+This entry invokes the \fBsco-function-keys(toggle)\fP action.
 .TP 8
-.B "sun\ function-keys (\fPclass\fB SmeBSB)"
-This entry invokes the \fBsun\ function-keys(toggle)\fP action.
+.B "sunFunctionKeys (\fPclass\fB SmeBSB)"
+This entry invokes the \fBsun-function-keys(toggle)\fP action.
 .TP 8
-.B "sun\ keyboard (\fPclass\fB SmeBSB)"
-This entry invokes the \fBsun\ keyboard(toggle)\fP action.
+.B "sunKeyboard (\fPclass\fB SmeBSB)"
+This entry invokes the \fBsunKeyboard(toggle)\fP action.
 .TP 8
 .B "line2 (\fPclass\fB SmeLine)"
 This is a separator.
@@ -2217,7 +2250,7 @@
 .TP 8
 .B "set-hp-function-keys(\fIon/off/toggle\fP)"
 This action toggles the \fBhpFunctionKeys\fP resource and is also invoked by
-the \fBhp\ function-keys\fP entry in \fImainMenu\fP.
+the \fBhpFunctionKeys\fP entry in \fImainMenu\fP.
 .TP 8
 .B "set-jumpscroll(\fIon/off/toggle\fP)"
 This action toggles the \fBjumpscroll\fP resource and is also invoked by the
@@ -2233,7 +2266,7 @@
 .TP 8
 .B "set-old-function-keys(\fIon/off/toggle\fP)"
 This action toggles the state of legacy function keys and is also invoked by
-the \fBold\ function-keys\fP entry in \fImainMenu\fP.
+the \fBoldFunctionKeys\fP entry in \fImainMenu\fP.
 .TP 8
 .B "set-marginbell(\fIon/off/toggle\fP)"
 This action toggles the \fBmarginBell\fP resource and is also invoked from
@@ -2264,15 +2297,15 @@
 .TP 8
 .B "set-sco-function-keys(\fIon/off/toggle\fP)"
 This action toggles the \fBscoFunctionKeys\fP resource and is also invoked by
-the \fBsco\ function-keys\fP entry in \fImainMenu\fP.
+the \fBscoFunctionKeys\fP entry in \fImainMenu\fP.
 .TP 8
 .B "set-sun-function-keys(\fIon/off/toggle\fP)"
 This action toggles the \fBsunFunctionKeys\fP resource and is also invoked by
-the \fBsun\ function-keys\fP entry in \fImainMenu\fP.
+the \fBsunFunctionKeys\fP entry in \fImainMenu\fP.
 .TP 8
 .B "set-sun-keyboard(\fIon/off/toggle\fP)"
 This action toggles the \fBsunKeyboard\fP resource and is also invoked by
-the \fBsun keyboard\fP entry in \fImainMenu\fP.
+the \fBsunKeyboard\fP entry in \fImainMenu\fP.
 .TP 8
 .B "set-tek-text(\fIlarge/2/3/small\fP)"
 This action sets font used in the Tektronix window to the value of the
@@ -2511,7 +2544,7 @@
 \fIXterm Control Sequences\fP
 (this is the file ctlseqs.ms).
 .sp
-http://www.clark.net/pub/dickey/xterm/xterm.html
+http://dickey.his.com/xterm/xterm.html
 .SH BUGS
 .PP
 Large pastes do not work on some systems.  This is not a bug in
@@ -2541,6 +2574,6 @@
 Steve Pitschke (Stellar), Ron Newman (MIT-Athena), Jim Fulton (MIT X
 Consortium), Dave Serisky (HP), Jonathan Kamens (MIT-Athena),
 Jason Bacon <acadix@execpc.com>,
-Stephen P. Wall <swall@redcom.com>,
+Stephen P. Wall <steve_wall@redcom.com>,
 David Wexelblat, and
 Thomas Dickey (XFree86 Project).
Index: xc/programs/xterm/xtermcfg.hin
diff -u xc/programs/xterm/xtermcfg.hin:3.31 xc/programs/xterm/xtermcfg.hin:3.33
--- xc/programs/xterm/xtermcfg.hin:3.31	Fri Mar  3 12:02:37 2000
+++ xc/programs/xterm/xtermcfg.hin	Mon Jun 12 19:28:42 2000
@@ -1,10 +1,10 @@
 /*
- * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.31 2000/03/03 20:02:37 dawes Exp $
+ * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.33 2000/06/13 02:28:42 dawes Exp $
  */
 
 /************************************************************
 
-Copyright 1997-2000 by Thomas E. Dickey <dickey@clark.net>
+Copyright 1997-2000 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -55,6 +55,7 @@
 #undef HAVE_UTMP_UT_XTIME	/* CF_UTMP_UT_XTIME */
 #undef HAVE_WAITPID		/* AC_CHECK_FUNCS(waitpid) */
 #undef HAVE_X11_DECKEYSYM_H	/* AC_CHECK_HEADERS(X11/DECkeysym.h) */
+#undef HAVE_X11_SUNKEYSYM_H	/* AC_CHECK_HEADERS(X11/Sunkeysym.h) */
 #undef HAVE_X11_XPOLL_H		/* AC_CHECK_HEADERS(X11/Xpoll.h) */
 #undef HAVE_XKBSTDBELL		/* AC_CHECK_FUNCS(XkbStdBell) */
 #undef NO_ACTIVE_ICON		/* CF_ARG_DISABLE(active-icon) */
@@ -84,9 +85,13 @@
 #undef OPT_ZICONBEEP		/* CF_ARG_DISABLE(ziconbeep) */
 #undef OWN_TERMINFO_DIR		/* AC_ARG_WITH(own-terminfo) */
 #undef SCROLLBAR_RIGHT		/* CF_ARG_ENABLE(rightbar) */
+#undef SVR4			/* CF_SVR4, imake */
+#undef SYSV			/* CF_SYSV, imake */
+#undef TTY_GROUP_NAME		/* CF_TTY_GROUP */
 #undef USE_LASTLOG		/* CF_LASTLOG */
 #undef USE_MY_MEMMOVE		/* CF_FUNC_MEMMOVE */
 #undef USE_OK_BCOPY		/* CF_FUNC_MEMMOVE */
+#undef USE_POSIX_WAIT		/* CF_POSIX_WAIT */
 #undef USE_SYSV_UTMP		/* CF_UTMP */
 #undef USE_SYS_SELECT_H		/* CF_TYPE_FD_SET */
 #undef USE_TERMCAP		/* CF_FUNC_TGETENT */
@@ -96,10 +101,10 @@
 #undef UTMPX_FOR_UTMP		/* CF_UTMP */
 #undef const			/* AC_CONST */
 #undef size_t			/* AC_TYPE_SIZE_T */
+#undef time_t			/* AC_CHECK_TYPE(time_t, long) */
 #undef ut_name			/* CF_UTMP */
 #undef ut_xstatus		/* CF_UTMP_UT_XSTATUS */
 #undef ut_xtime			/* CF_UTMP_UT_XTIME */
-#undef time_t			/* AC_CHECK_TYPE(time_t, long) */
 
 #undef GCC_PRINTF
 #undef GCC_UNUSED
Index: xc/programs/xterm/unicode/README
diff -u xc/programs/xterm/unicode/README:1.1 xc/programs/xterm/unicode/README:1.2
--- xc/programs/xterm/unicode/README:1.1	Sat Jun 12 08:37:23 1999
+++ xc/programs/xterm/unicode/README	Mon Jun 12 19:28:44 2000
@@ -1,5 +1,5 @@
--- $XFree86: xc/programs/xterm/unicode/README,v 1.1 1999/06/12 15:37:23 dawes Exp $
--- Thomas Dickey <dickey@clark.net>
+-- $XFree86: xc/programs/xterm/unicode/README,v 1.2 2000/06/13 02:28:44 dawes Exp $
+-- Thomas E. Dickey
 
 These are some scripts and datafiles used for generating tables used in the
 experimental UTF-8 implementation in xterm.
Index: xc/include/Imakefile
diff -u xc/include/Imakefile:3.19 xc/include/Imakefile:3.24
--- xc/include/Imakefile:3.19	Sat Feb 12 16:12:37 2000
+++ xc/include/Imakefile	Fri Jun 30 14:51:51 2000
@@ -3,7 +3,7 @@
 
 
 
-XCOMM $XFree86: xc/include/Imakefile,v 3.19 2000/02/13 00:12:37 dawes Exp $
+XCOMM $XFree86: xc/include/Imakefile,v 3.24 2000/06/30 21:51:51 dawes Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags /**/
 
@@ -69,3 +69,12 @@
 InstallDriverSDKNonExecFile(Xosdefs.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(Xproto.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(Xprotostr.h,$(DRIVERSDKINCLUDEDIR))
+
+XCOMM For the Linux/OpenGL base standard
+#if LinkGLToUsrInclude && AlternateIncRoot
+install::
+/*	-$(RM) $(SYSTEMUSRINCDIR)/GL */
+	@if [ ! -d $(SYSTEMUSRINCDIR)/GL ]; then \
+		set -x; $(LN) $(INCDIR)/GL $(SYSTEMUSRINCDIR)/GL; \
+	fi
+#endif
Index: xc/include/XF86keysym.h
diff -u xc/include/XF86keysym.h:1.3 xc/include/XF86keysym.h:1.4
--- xc/include/XF86keysym.h:1.3	Thu Feb 10 07:48:28 2000
+++ xc/include/XF86keysym.h	Fri Jun 16 17:27:29 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/XF86keysym.h,v 1.3 2000/02/10 15:48:28 dawes Exp $ */
+/* $XFree86: xc/include/XF86keysym.h,v 1.4 2000/06/17 00:27:29 dawes Exp $ */
 
 /*
  * ModeLock (not needed since XKB offers this functionality)
@@ -21,5 +21,30 @@
 #define XF86XK_Mail		0x1008FF19
 #define XF86XK_Start		0x1008FF1A
 #define XF86XK_Search		0x1008FF1B
+#define XF86XK_AudioRecord	0x1008FF1C
+
+/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */
+#define XF86XK_Calculator	0x1008FF1D
+#define XF86XK_Memo		0x1008FF1E
+#define XF86XK_ToDoList		0x1008FF1F
+#define XF86XK_Calendar		0x1008FF20
+#define XF86XK_PowerDown	0x1008FF21
+#define XF86XK_ContrastAdjust	0x1008FF22
+#define XF86XK_RockerUp		0x1008FF23
+#define XF86XK_RockerDown	0x1008FF24
+#define XF86XK_RockerEnter	0x1008FF25
+
+/* Some more "Internet" keyboard symbols */
+#define XF86XK_Back		0x1008FF26
+#define XF86XK_Forward		0x1008FF27
+#define XF86XK_Stop		0x1008FF28
+#define XF86XK_Refresh		0x1008FF29
+#define XF86XK_Favorites	0x1008FF30
+#define XF86XK_AudioPause	0x1008FF31
+#define XF86XK_AudioMedia	0x1008FF32
+#define XF86XK_MyComputer	0x1008FF33
+#define XF86XK_VendorHome	0x1008FF34
+#define XF86XK_LightBulb	0x1008FF35
+#define XF86XK_Shop		0x1008FF36
 
 
Index: xc/include/Xarch.h
diff -u xc/include/Xarch.h:1.9 xc/include/Xarch.h:1.10
--- xc/include/Xarch.h:1.9	Sun Dec 26 16:39:19 1999
+++ xc/include/Xarch.h	Thu Jun 15 13:49:58 2000
@@ -25,7 +25,7 @@
  * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/include/Xarch.h,v 1.9 1999/12/27 00:39:19 robin Exp $ */
+/* $XFree86: xc/include/Xarch.h,v 1.10 2000/06/15 20:49:58 dawes Exp $ */
 
 
 /*
@@ -44,7 +44,7 @@
 #if defined(NCR) || defined(Mips)
 #include <sys/endian.h>
 #else
-#if !defined(sun)
+#if !defined(sun) && !defined(__sgi)
 #include <sys/byteorder.h>
 #endif
 #endif
Index: xc/include/Xos.h
diff -u xc/include/Xos.h:3.27 xc/include/Xos.h:3.28
--- xc/include/Xos.h:3.27	Sun Dec 26 16:39:19 1999
+++ xc/include/Xos.h	Wed Apr  5 11:13:15 2000
@@ -23,7 +23,7 @@
  * The X Window System is a Trademark of The Open Group.
  *
  */
-/* $XFree86: xc/include/Xos.h,v 3.27 1999/12/27 00:39:19 robin Exp $ */
+/* $XFree86: xc/include/Xos.h,v 3.28 2000/04/05 18:13:15 dawes Exp $ */
 
 /* This is a collection of things to try and minimize system dependencies
  * in a "signficant" number of source files.
@@ -291,7 +291,7 @@
 #define NGROUPS 16
 #endif
 
-#if defined(ISC) || defined(__EMX__) || (defined(__QNX__) && !defined(UNIXCONN))
+#if defined(ISC) || (defined(__QNX__) && !defined(UNIXCONN))
 /*
  *	Some OS's may not have this
  */
Index: xc/include/Xos_r.h
diff -u xc/include/Xos_r.h:1.5 xc/include/Xos_r.h:1.6
--- xc/include/Xos_r.h:1.5	Fri Oct  2 00:38:51 1998
+++ xc/include/Xos_r.h	Fri Jun 16 17:27:29 2000
@@ -18,7 +18,7 @@
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */
-/* $XFree86: xc/include/Xos_r.h,v 1.5 1998/10/02 07:38:51 dawes Exp $ */
+/* $XFree86: xc/include/Xos_r.h,v 1.6 2000/06/17 00:27:29 dawes Exp $ */
 
 /* 
  * Various and sundry Thread-Safe functions used by X11, Motif, and CDE.
@@ -188,6 +188,14 @@
  * thread-safe feature test macro.  Fix the feature test macro.
  */
 #if defined(sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+# undef _POSIX_THREAD_SAFE_FUNCTIONS
+#endif
+
+/*
+ * LynxOS 3.1 defines _POSIX_THREAD_SAFE_FUNCTIONS but 
+ * getpwuid_r has different semantics than defined by POSIX
+ */
+#if defined(Lynx) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 # undef _POSIX_THREAD_SAFE_FUNCTIONS
 #endif
 
Index: xc/include/Xthreads.h
diff -u xc/include/Xthreads.h:3.6 xc/include/Xthreads.h:3.7
--- xc/include/Xthreads.h:3.6	Tue Oct 12 21:20:47 1999
+++ xc/include/Xthreads.h	Sun Jun 25 09:03:43 2000
@@ -21,7 +21,7 @@
 in this Software without prior written authorization from The Open Group.
  * *
  */
-/* $XFree86: xc/include/Xthreads.h,v 3.6 1999/10/13 04:20:47 dawes Exp $ */
+/* $XFree86: xc/include/Xthreads.h,v 3.7 2000/06/25 16:03:43 tsi Exp $ */
 
 #ifndef _XTHREADS_H_
 #define _XTHREADS_H_
@@ -238,7 +238,7 @@
 #define xthread_clear_id(id) id = 0
 #define xthread_equal(id1,id2) pthread_equal(id1, id2)
 #endif /* linux */
-#if _CMA_VENDOR_ == _CMA__IBM
+#if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM)
 #ifdef DEBUG			/* too much of a hack to enable normally */
 /* see also cma__obj_set_name() */
 #define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str)
Index: xc/include/DPS/ColorSB.h
diff -u xc/include/DPS/ColorSB.h:1.1 xc/include/DPS/ColorSB.h:1.2
--- xc/include/DPS/ColorSB.h:1.1	Sat Feb 12 16:12:37 2000
+++ xc/include/DPS/ColorSB.h	Wed Jun  7 15:02:54 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/ColorSB.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _ColorSelectionBox_h
 #define _ColorSelectionBox_h
@@ -117,7 +118,9 @@
 #define XtNokCallback "okCallback"
 #define XtNapplyCallback "applyCallback"
 #define XtNresetCallback "resetCallback"
+#ifndef XtNcancelCallback
 #define XtNcancelCallback "cancelCallback"
+#endif
 #define XtNvalueChangedCallback "valueChangedCallback"
 
 /* New resource types */
@@ -149,13 +152,6 @@
 
 /* Convenience routine */
 
-#ifdef _NO_PROTO
-
-extern Boolean CSBSetColor();
-extern void CSBGetColor();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -169,7 +165,9 @@
 extern void CSBGetColor(Widget w, CSBColorSpace space, float *c1,
 			float *c2, float *c3, float *c4);
 
-#endif /* _NO_PROTO */
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" }
+#endif
 
 #endif /* _ColorSelectionBox_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
Index: xc/include/DPS/ColorSBP.h
diff -u xc/include/DPS/ColorSBP.h:1.1 xc/include/DPS/ColorSBP.h:1.2
--- xc/include/DPS/ColorSBP.h:1.1	Sat Feb 12 16:12:37 2000
+++ xc/include/DPS/ColorSBP.h	Wed Jun  7 15:02:54 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/ColorSBP.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _ColorSelectionBoxP_H
 #define _ColorSelectionBoxP_H
@@ -142,13 +143,6 @@
     ColorSelectionBoxPart	csb;
 } ColorSelectionBoxRec;
 
-#ifdef _NO_PROTO
-
-typedef Boolean (*CSBSetColorProc) ();
-typedef void (*CSBGetColorProc) ();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -165,7 +159,6 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #define InheritSetColor ((CSBSetColorProc) _XtInherit)
 #define InheritGetColor ((CSBGetColorProc) _XtInherit)
Index: xc/include/DPS/DPSScrollW.h
diff -u xc/include/DPS/DPSScrollW.h:1.1 xc/include/DPS/DPSScrollW.h:1.2
--- xc/include/DPS/DPSScrollW.h:1.1	Sat Feb 12 16:12:38 2000
+++ xc/include/DPS/DPSScrollW.h	Wed Jun  7 15:02:54 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/DPSScrollW.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _DPSScrolledWindow_h
 #define _DPSScrolledWindow_h
@@ -148,29 +149,6 @@
 
 /* Interface routines */
 
-#ifdef _NO_PROTO
-
-extern void DSWSetScale();
-extern void DSWScrollPoint();
-extern void DSWScrollBy();
-extern void DSWScrollTo();
-extern void DSWSetScaleAndScroll();
-extern void DSWConvertXToPS();
-extern void DSWConvertPSToX();
-extern void DSWAddToDirtyArea();
-extern Boolean DSWTakeFeedbackPixmap();
-extern Boolean DSWGiveFeedbackPixmap();
-extern void DSWStartFeedbackDrawing();
-extern void DSWEndFeedbackDrawing();
-extern void DSWSetFeedbackDirtyArea();
-extern void DSWFinishPendingDrawing();
-extern void DSWAbortPendingDrawing();
-extern void DSWGetDrawingInfo();
-extern void DSWUpdateDrawing();
-extern void DSWGetScrollInfo();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -209,8 +187,6 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 };
 #endif
-
-#endif /* _NO_PROTO */
 
 #endif /* _DPSScrolledWindow_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
Index: xc/include/DPS/DPSScrollWP.h
diff -u xc/include/DPS/DPSScrollWP.h:1.1 xc/include/DPS/DPSScrollWP.h:1.2
--- xc/include/DPS/DPSScrollWP.h:1.1	Sat Feb 12 16:12:38 2000
+++ xc/include/DPS/DPSScrollWP.h	Wed Jun  7 15:02:54 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/DPSScrollWP.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _DPSScrolledWindowP_H
 #define _DPSScrolledWindowP_H
@@ -159,29 +160,6 @@
    scratch:  Used to hold temporary copies of rectangle lists.
 */
 
-#ifdef _NO_PROTO
-
-typedef void (*DSWSetScaleProc) ();
-typedef void (*DSWScrollPointProc) ();
-typedef void (*DSWScrollByProc) ();
-typedef void (*DSWScrollToProc) ();
-typedef void (*DSWSetScaleAndScrollProc) ();
-typedef void (*DSWConvertXToPSProc) ();
-typedef void (*DSWConvertPSToXProc) ();
-typedef void (*DSWAddToDirtyAreaProc) ();
-typedef Boolean (*DSWTakeFeedbackPixmapProc) ();
-typedef Boolean (*DSWGiveFeedbackPixmapProc) ();
-typedef void (*DSWStartFeedbackDrawingProc) ();
-typedef void (*DSWEndFeedbackDrawingProc) ();
-typedef void (*DSWSetFeedbackDirtyAreaProc) ();
-typedef void (*DSWFinishPendingDrawingProc) ();
-typedef void (*DSWAbortPendingDrawingProc) ();
-typedef void (*DSWGetDrawingInfoProc) ();
-typedef void (*DSWUpdateDrawingProc) ();
-typedef void (*DSWGetScrollInfoProc)();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 typedef "C" {
 #endif
@@ -226,7 +204,6 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #define InheritSetScale ((DSWSetScaleProc) _XtInherit)
 #define InheritScrollPoint ((DSWScrollPointProc) _XtInherit)
Index: xc/include/DPS/FontSB.h
diff -u xc/include/DPS/FontSB.h:1.1 xc/include/DPS/FontSB.h:1.2
--- xc/include/DPS/FontSB.h:1.1	Sat Feb 12 16:12:39 2000
+++ xc/include/DPS/FontSB.h	Wed Jun  7 15:02:54 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/FontSB.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _FontSelectionBox_h
 #define _FontSelectionBox_h
@@ -96,7 +97,9 @@
 #define XtNokCallback "okCallback"
 #define XtNapplyCallback "applyCallback"
 #define XtNresetCallback "resetCallback"
+#ifndef XtNcancelCallback
 #define XtNcancelCallback "cancelCallback"
+#endif
 #define XtNvalidateCallback "validateCallback"
 #define XtNfaceSelectCallback "faceSelectCallback"
 #define XtNvalueChangedCallback "valueChangedCallback"
@@ -199,31 +202,6 @@
 
 /* Convenience and info routines */
 
-#ifdef _NO_PROTO
-
-extern void FSBSetFontName();
-extern void FSBSetFontFamilyFace();
-extern void FSBSetFontSize();
-extern void FSBRefreshFontList();
-extern void FSBGetFamilyList();
-extern void FSBGetFaceList();
-extern void FSBUndefineUnusedFonts();
-extern Boolean FSBDownloadFontName();
-extern Boolean FSBMatchFontFace();
-extern void FSBFontNameToFamilyFace();
-extern void FSBFontFamilyFaceToName();
-extern String FSBFindAFM();
-extern String FSBFindFontFile();
-extern void FSBGetTextDimensions();
-extern void FSBSetFontFamilyFaceBlend();
-extern void FSBFontNameToFamilyFaceBlend();
-extern void FSBFontFamilyFaceBlendToName();
-extern void FSBGetBlendList();
-extern void FSBGetBlendInfo();
-extern Boolean FSBChangeBlends();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -304,7 +282,6 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #endif /* _FontSelectionBox_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
Index: xc/include/DPS/FontSBP.h
diff -u xc/include/DPS/FontSBP.h:1.1 xc/include/DPS/FontSBP.h:1.2
--- xc/include/DPS/FontSBP.h:1.1	Sat Feb 12 16:12:39 2000
+++ xc/include/DPS/FontSBP.h	Wed Jun  7 15:02:55 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/FontSBP.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef _FontSelectionBoxP_H
 #define _FontSelectionBoxP_H
@@ -186,31 +187,6 @@
     FontSelectionBoxPart	fsb;
 } FontSelectionBoxRec;
 
-#ifdef _NO_PROTO
-
-typedef void (*FSBSetFontNameProc) ();
-typedef void (*FSBSetFontFamilyFaceProc) ();
-typedef void (*FSBSetFontSizeProc) ();
-typedef void (*FSBRefreshFontListProc) ();
-typedef void (*FSBGetFamilyListProc) ();
-typedef void (*FSBGetFaceListProc) ();
-typedef void (*FSBUndefUnusedFontsProc) ();
-typedef Boolean (*FSBDownloadFontNameProc) ();
-typedef Boolean (*FSBMatchFontFaceProc) ();
-typedef void (*FSBFontNameToFamilyFaceProc) ();
-typedef void (*FSBFontFamilyFaceToNameProc) ();
-typedef String (*FSBFindAFMProc) ();
-typedef String (*FSBFindFontFileProc) ();
-typedef void (*FSBGetTextDimensionsProc) ();
-typedef void (*FSBSetFontFamilyFaceBlendProc) ();
-typedef void (*FSBFontNameToFamilyFaceBlendProc) ();
-typedef void (*FSBFontFamilyFaceBlendToNameProc) ();
-typedef void (*FSBGetBlendListProc) ();
-typedef void (*FSBGetBlendInfoProc) ();
-typedef Boolean (*FSBChangeBlendsProc) ();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -296,7 +272,6 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #define InheritSetFontName ((FSBSetFontNameProc) _XtInherit)
 #define InheritSetFontFamilyFace ((FSBSetFontFamilyFaceProc) _XtInherit)
Index: xc/include/DPS/FontSamplP.h
diff -u xc/include/DPS/FontSamplP.h:1.1 xc/include/DPS/FontSamplP.h:1.2
--- xc/include/DPS/FontSamplP.h:1.1	Sat Feb 12 16:12:39 2000
+++ xc/include/DPS/FontSamplP.h	Wed Jun  7 15:02:55 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/FontSamplP.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef _FontSamplerP_H
 #define _FontSamplerP_H
@@ -136,12 +137,6 @@
     FontSamplerPart		sampler;
 } FontSamplerRec;
 
-#ifdef _NO_PROTO
-
-typedef void (*FSBCancelProc) ();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -151,7 +146,6 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #define InheritCancel ((FSBCancelProc) _XtInherit)
 
Index: xc/include/DPS/FontSample.h
diff -u xc/include/DPS/FontSample.h:1.1 xc/include/DPS/FontSample.h:1.2
--- xc/include/DPS/FontSample.h:1.1	Sat Feb 12 16:12:39 2000
+++ xc/include/DPS/FontSample.h	Wed Jun  7 15:02:55 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/FontSample.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef _FontSampler_h
 #define _FontSampler_h
@@ -90,15 +91,7 @@
 
 typedef struct _FontSamplerRec *FontSamplerWidget;
 
-#ifdef _NO_PROTO
-
-extern void FSBCancelSampler();
-
-#else /* _NO_PROTO */
-
 extern void FSBCancelSampler(Widget w);
-
-#endif /* _NO_PROTO */
 
 #endif /* _FontSampler_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
Index: xc/include/DPS/PSres.h
diff -u xc/include/DPS/PSres.h:1.1 xc/include/DPS/PSres.h:1.2
--- xc/include/DPS/PSres.h:1.1	Sat Feb 12 16:12:40 2000
+++ xc/include/DPS/PSres.h	Wed Jun  7 15:02:55 2000
@@ -35,7 +35,11 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/PSres.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
+#ifndef _PSres_h
+#define _PSres_h
+
 extern char *PSResFontOutline, *PSResFontPrebuilt, *PSResFontAFM,
 	*PSResFontBDF, *PSResFontFamily, *PSResFontBDFSizes,
 	*PSResForm, *PSResPattern, *PSResEncoding, *PSResProcSet;
@@ -43,22 +47,6 @@
 typedef enum {PSSaveReturnValues, PSSaveByType, PSSaveEverything}
 	PSResourceSavePolicy;
 
-#ifdef _NO_PROTO
-
-extern int ListPSResourceFiles();
-extern int ListPSResourceTypes();
-extern void FreePSResourceStorage();
-extern void SetPSResourcePolicy();
-typedef int (*PSResourceEnumerator)();
-extern void EnumeratePSResourceFiles();
-extern int CheckPSResourceTime();
-typedef char *(*PSResMallocProc)();
-typedef char *(*PSResReallocProc)();
-typedef void (*PSResFreeProc)();
-typedef void (*PSResFileWarningHandlerProc)();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -108,8 +96,6 @@
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 extern PSResMallocProc PSResMalloc;
 
 extern PSResReallocProc PSResRealloc;
@@ -117,3 +103,5 @@
 extern PSResFreeProc PSResFree;
 
 extern PSResFileWarningHandlerProc PSResFileWarningHandler;
+
+#endif /* _PSres_h */
Index: xc/include/DPS/XDPSlib.h
diff -u xc/include/DPS/XDPSlib.h:1.1 xc/include/DPS/XDPSlib.h:1.3
--- xc/include/DPS/XDPSlib.h:1.1	Sat Feb 12 16:12:42 2000
+++ xc/include/DPS/XDPSlib.h	Wed Jun  7 15:02:55 2000
@@ -34,16 +34,15 @@
  *
  * Author: Adobe Systems Incorporated and Digital Equipment Corporation
  */
+/* $XFree86: xc/include/DPS/XDPSlib.h,v 1.3 2000/06/07 22:02:55 tsi Exp $ */
  
 #ifndef _XDPSlib_h
 #define _XDPSlib_h
 
-#ifndef _NO_PROTO
 #undef _XEVENT_
-#endif
 
 #include <X11/Xlib.h>
-#include "DPS/XDPS.h"
+#include <DPS/XDPS.h>
 #include <X11/Xutil.h>
 
 /*
@@ -83,72 +82,6 @@
 
 #define DPSCAP_SYNCMASK_DFLT	DPSCAP_SYNCMASK_RECONCILE
 
-#ifdef _NO_PROTO
-
-typedef void (*XDPSLEventHandler)();
-
-extern int XDPSLInit();
-extern ContextXID XDPSLCreateContextAndSpace();
-extern SpaceXID XDPSLCreateSpace();
-extern void XDPSLGiveInput();
-extern int XDPSLGetStatus();
-extern void XDPSLDestroySpace();
-extern void XDPSLReset();
-extern void XDPSLNotifyContext();
-extern ContextXID XDPSLCreateContextFromID();
-extern Status XDPSLIDFromContext();
-extern ContextPSID XDPSLContextFromXID();
-extern void XDPSLSetStatusMask();
-extern XExtCodes *XDPSLGetCodes();
-extern void XDPSLSetTextEventHandler();
-extern void XDPSLCallOutputEventHandler();
-extern void XDPSLSetStatusEventHandler();
-extern void XDPSLCallStatusEventHandler();
-extern void XDPSLInitDisplayFlags();
-extern Bool XDPSLGetPassEventsFlag();
-extern void XDPSLSetPassEventsFlag();
-extern Bool XDPSLGetWrapWaitingFlag();
-extern void XDPSLSetWrapWaitingFlag();
-/* L2-DPS/PROTO 9 additions */
-extern void XDPSLNotifyWhenReady();
-extern XDPSLPSErrors XDPSLTestErrorCode();
-extern int XDPSLGetVersion();
-extern void XDPSLSetReadyEventHandler();
-extern void XDPSLCallReadyEventHandler();
-/* DPS NX additions */
-extern char * XDPSLSetAgentName();
-extern void XDPSLSetCodes();
-extern Display * XDPSLGetShunt();
-extern void XDPSLSetShunt();
-extern void XDPSLSetVersion();
-extern void XDPSLSetClientMessageHandler();
-extern CSDPSFakeEventTypes XDPSLGetCSDPSFakeEventType();
-extern Bool XDPSLDispatchCSDPSFakeEvent();
-extern void XDPSLGetCSDPSStatus();
-extern void XDPSLSetXErrorConvertProc();
-extern void XDPSLCAPNotify();
-extern void XDPSLSync();
-extern void *XDPSLEnumerateEvents();
-extern void XDPSLSetAfterProc();
-extern int XDPSLGetSyncMask();
-extern void XDPSLSetSyncMask();
-extern void XDPSLFlush();
-extern void XDPSLGetCSDPSReady();
-extern void XDPSLReconcileRequests();
-extern Status XDPSLSetAgentArg();
-extern void XDPSLCleanAll();
-extern void XDPSLUpdateAgentArgs();
-extern void XDPSLCleanContext();
-#ifdef VMS
-extern void XDPSLSetDisplay();
-#endif /* VMS */
-/* DPS NX 2.0 */
-extern void XDPSLFlushGC();
-extern void XDPSLSetGCFlushMode();
-extern int XDPSLGetGCFlushMode();
-
-#else /* _NO_PROTO */
-
 typedef void (*XDPSLEventHandler)(XEvent *event);
 
 #if defined(__cplusplus) || defined(c_plusplus)
@@ -307,6 +240,8 @@
 
 extern void XDPSLFlush(Display *dpy);
 
+extern void XDPSLSyncGCClip(Display *xdpy, GC gc);
+
 extern void XDPSLGetCSDPSReady(Display *xdpy,
                                  XEvent *event,
                                  void **ret_ctxt,
@@ -322,13 +257,6 @@
 
 extern void XDPSLCleanContext(Display *xdpy, ContextXID cxid);
 
-/* L2-DPS/PROTO 9 additions for DPS NX */
-extern void XDPSLGetCSDPSReady(Display *dpy,
-                                XEvent *event,
-				void **ret_ctxt,
-				int *ret_val);
-
-
 #ifdef VMS
 extern void XDPSLSetDisplay(Display *dpy);
 #endif /* VMS */
@@ -343,8 +271,6 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 typedef struct _XDPSLOutputEvent {
     int type;			/* of event. */
Index: xc/include/DPS/dpsXclient.h
diff -u xc/include/DPS/dpsXclient.h:1.1 xc/include/DPS/dpsXclient.h:1.2
--- xc/include/DPS/dpsXclient.h:1.1	Sat Feb 12 16:12:43 2000
+++ xc/include/DPS/dpsXclient.h	Thu May 18 16:46:11 2000
@@ -116,48 +116,6 @@
 
 /* Event delivery types for XDPSSetEventDelivery */
 
-#ifdef _NO_PROTO
-
-extern DPSContext XDPSCreateContext();
-extern DPSContext XDPSCreateSimpleContext();
-extern DPSContext XDPSCreateSecureContext();
-extern DPSContext DPSCreateTextContext();
-extern DPSContext DPSContextFromContextID();
-extern DPSContext XDPSFindContext ();
-extern void DPSDefaultTextBackstop ();
-extern void DPSChangeEncoding ();
-typedef void (*XDPSStatusProc)();
-extern XDPSStatusProc XDPSRegisterStatusProc();
-extern int XDPSGetContextStatus();
-extern long int DPSNewUserObjectIndex();
-extern DPSContext XDPSContextFromSharedID();
-extern DPSSpace XDPSSpaceFromSharedID();
-extern XID XDPSXIDFromContext();
-extern XID XDPSXIDFromSpace();
-extern DPSContext XDPSContextFromXID();
-extern DPSSpace XDPSSpaceFromXID();
-extern void XDPSUnfreezeContext();
-extern void XDPSSetStatusMask();
-extern DPSEventDelivery XDPSSetEventDelivery();
-extern Bool XDPSIsStatusEvent();
-extern Bool XDPSIsOutputEvent();
-extern Bool XDPSIsReadyEvent();
-extern Bool XDPSIsDPSEvent();
-extern Bool XDPSDispatchEvent();
-extern void XDPSSyncGCClip();
-extern void XDPSReconcileRequests();
-extern Status XDPSNXSetClientArg();
-extern Status XDPSNXSetAgentArg();
-extern void XDPSNotifyWhenReady();	/* L2 DPS/PROTO 9 */
-typedef void (*XDPSReadyProc)();
-extern XDPSReadyProc XDPSRegisterReadyProc();
-extern int XDPSGetProtocolVersion();
-extern Status XDPSCreateStandardColormaps();
-extern void XDPSGetDefaultColorMaps();
-extern void XDPSFlushGC();	/* DPS NX 2.0 */
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -285,7 +243,7 @@
 
   /* Returns the status of 'ctxt' as defined in XDPS.h. */
 
-extern long int DPSNewUserObjectIndex();
+extern long int DPSNewUserObjectIndex(void);
 
   /* Returns a new user object index.  The Client Library is
      the sole allocator of new user object indices.  User object
@@ -461,7 +419,5 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 #endif /* DPSXCLIENT_H */
Index: xc/include/DPS/dpsXpreview.h
diff -u xc/include/DPS/dpsXpreview.h:1.1 xc/include/DPS/dpsXpreview.h:1.2
--- xc/include/DPS/dpsXpreview.h:1.1	Sat Feb 12 16:12:44 2000
+++ xc/include/DPS/dpsXpreview.h	Wed Jun  7 15:02:55 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsXpreview.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef DPS_X_PREVIEW_H
 #define DPS_X_PREVIEW_H
@@ -48,23 +49,6 @@
 	Bool continuedLine;
 } XDPSPosition;
 
-#ifdef _NO_PROTO
-
-typedef void (*XDPSRewindFunction)();
-typedef char *(*XDPSGetsFunction)();
-extern int XDPSSetFileFunctions();
-extern void XDPSFileRewindFunc();
-extern char *XDPSFileGetsFunc();
-extern void XDPSEmbeddedEPSFRewindFunc();
-extern char *XDPSEmbeddedEPSFGetsFunc();
-extern int XDPSCreatePixmapForEPSF();
-extern double XDPSPixelsPerPoint();
-extern int XDPSImageFileIntoDrawable();
-extern int XDPSCheckImagingResults();
-extern void XDPSSetImagingTimeout();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -126,6 +110,8 @@
 extern void XDPSEmbeddedEPSFRewindFunc(FILE *f,
 				       DPSPointer data);
 
+extern char *XDPSEmbeddedGetsFunc(char *buf, int n, FILE *f, DPSPointer data);
+
 extern char *XDPSEmbeddedEPSFGetsFunc(char *buf,
 				      int n,
 				      FILE *f,
@@ -232,7 +218,5 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 #endif /* DPS_X_PREVIEW_H */
Index: xc/include/DPS/dpsXshare.h
diff -u xc/include/DPS/dpsXshare.h:1.1 xc/include/DPS/dpsXshare.h:1.2
--- xc/include/DPS/dpsXshare.h:1.1	Sat Feb 12 16:12:44 2000
+++ xc/include/DPS/dpsXshare.h	Wed Jun  7 15:02:55 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsXshare.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef DPS_X_SHARE_H
 #define DPS_X_SHARE_H
@@ -63,41 +64,6 @@
 #define XDPSContextRGBMap		(1L<<2)
 #define XDPSContextGrayMap		(1L<<3)
 
-#ifdef _NO_PROTO
-
-extern void XDPSRegisterContext();
-extern DPSContext XDPSGetSharedContext();
-extern void XDPSDestroySharedContext();
-extern void XDPSUnregisterContext();
-extern void XDPSFreeDisplayInfo();
-extern int XDPSChainTextContext();
-extern int XDPSSetContextDepth();
-extern int XDPSSetContextDrawable();
-extern int XDPSSetContextRGBMap();
-extern int XDPSSetContextGrayMap();
-extern int XDPSSetContextParameters();
-extern int XDPSPushContextParameters();
-extern int XDPSPopContextParameters();
-extern int XDPSCaptureContextGState();
-extern int XDPSUpdateContextGState();
-extern int XDPSFreeContextGState();
-extern int XDPSSetContextGState();
-extern int XDPSPushContextGState();
-extern int XDPSPopContextGState();
-extern Bool XDPSExtensionPresent();
-extern int PSDefineAsUserObj();
-extern int DPSDefineAsUserObj();
-extern void PSRedefineUserObj();
-extern void DPSRedefineUserObj();
-extern void PSUndefineUserObj();
-extern void DPSUndefineUserObj();
-extern int PSReserveUserObjIndices();
-extern int DPSReserveUserObjIndices();
-extern void PSReturnUserObjIndices();
-extern void DPSReturnUserObjIndices();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -264,7 +230,7 @@
 /* Define, redefine, and undefine user objects.  In all cases the DPS versions
    take a context and the PS versions don't */
 
-extern int PSDefineAsUserObj();
+extern int PSDefineAsUserObj(void);
 extern int DPSDefineAsUserObj(DPSContext context);
 
 extern void PSRedefineUserObj(int userObj);
@@ -284,7 +250,5 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 #endif /* DPS_X_SHARE_H */
Index: xc/include/DPS/dpsXuserpath.h
diff -u xc/include/DPS/dpsXuserpath.h:1.1 xc/include/DPS/dpsXuserpath.h:1.2
--- xc/include/DPS/dpsXuserpath.h:1.1	Sat Feb 12 16:12:45 2000
+++ xc/include/DPS/dpsXuserpath.h	Wed Jun  7 15:02:56 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsXuserpath.h,v 1.2 2000/06/07 22:02:56 tsi Exp $ */
 
 #ifndef DPS_X_DOUSERPATH_H
 #define DPS_X_DOUSERPATH_H
@@ -105,18 +106,6 @@
     dps_send = 113	/* This is really the null operator */
 } DPSUserPathAction;
  
-#ifdef _NO_PROTO
-
-extern void PSDoUserPath();
-
-extern void DPSDoUserPath();
-
-extern Bool PSHitUserPath();
-
-extern Bool DPSHitUserPath();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -164,7 +153,5 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 #endif /* DPS_X_DOUSERPATH_H */
Index: xc/include/DPS/dpsclient.h
diff -u xc/include/DPS/dpsclient.h:1.1 xc/include/DPS/dpsclient.h:1.3
--- xc/include/DPS/dpsclient.h:1.1	Sat Feb 12 16:12:45 2000
+++ xc/include/DPS/dpsclient.h	Wed Jun  7 15:02:56 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsclient.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */
 
 #ifndef DPSCLIENT_H
 #define DPSCLIENT_H
@@ -92,19 +93,19 @@
        values on a text context.
   */
 
-typedef void (*DPSTextProc)(/*
-			    struct _t_DPSContext *ctxt, char *buf,
+typedef void (*DPSTextProc)(
+			    struct _t_DPSContextRec *ctxt, char *buf,
 			    long unsigned int count
-*/);
+);
 
   /* Call-back procedure to handle text from the PostScript interpreter.
      'buf' contains 'count' bytes of ASCII text. */
 
-typedef void (*DPSErrorProc)(/*
-			     struct _t_DPSContext *ctxt,
+typedef void (*DPSErrorProc)(
+			     struct _t_DPSContextRec *ctxt,
 			     DPSErrorCode errorCode,
 			     long unsigned int arg1, long unsigned int arg2
-*/);
+);
   
   /* Call-back procedure to report errors from the PostScript interpreter.
      The meaning of arg1 and arg2 depend on 'errorCode', as described above.
@@ -127,41 +128,12 @@
 
 /*=== PROCEDURES ===*/
 
-#ifdef _NO_PROTO
-
-extern void DPSDefaultErrorProc();
-extern void DPSSetTextBackstop();
-extern DPSTextProc DPSGetCurrentTextBackstop();
-extern void DPSSetErrorBackstop();
-extern DPSErrorProc DPSGetCurrentErrorBackstop();
-extern DPSContext DPSGetCurrentContext();
-extern void DPSSetContext();
-extern void DPSWritePostScript();
-extern void DPSPrintf();
-extern void DPSWriteData();
-extern void DPSFlushContext();
-extern int DPSChainContext();
-extern void DPSUnchainContext();
-extern void DPSResetContext();
-extern void DPSWaitContext();
-extern void DPSInterruptContext();
-extern void DPSDestroyContext();
-extern void DPSDestroySpace();
-extern void DPSSetNumStringConversion();
-extern void DPSSetWrapSynchronization();
-extern void DPSSuppressBinaryConversion();
-extern void DPSSetAbbrevMode();
-extern void DPSFetchAbbrevList();
-extern char *DPSGetSysnameAbbrev();
-extern char *DPSGetOperatorAbbrev();
-extern DPSContextType DPSGetContextType();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
+extern void DPSversion(DPSContext ctxt, int bufsize, char buf[]);
+
 extern void DPSDefaultErrorProc(DPSContext ctxt, DPSErrorCode errorCode,
 				long unsigned int arg1,
 				long unsigned int arg2);
@@ -198,7 +170,7 @@
      not made known to the dps client library. NULL will be passed as the ctxt
      argument to textProc in the latter case. */
 
-extern DPSTextProc DPSGetCurrentTextBackstop();
+extern DPSTextProc DPSGetCurrentTextBackstop(void);
 
   /* Returns the textProc passed most recently to DPSSetTextBackstop, or NULL
      if none */
@@ -210,12 +182,12 @@
      known to the dps client library. NULL will be passed as the ctxt
      argument to errorProc. */
 
-extern DPSErrorProc DPSGetCurrentErrorBackstop();
+extern DPSErrorProc DPSGetCurrentErrorBackstop(void);
 
   /* Returns the errorProc passed most recently to DPSSetErrorBackstop, or NULL
      if none */
 
-extern DPSContext DPSGetCurrentContext();
+extern DPSContext DPSGetCurrentContext(void);
 
   /* Get the default context. Used in conjunction with psops.h and with
      wraps that are defined without an explicit DPSContext argument. 
@@ -399,11 +371,21 @@
 
   /* Returns whether a context is a text context or an execution context */
 
+  /* generated functions used in dpstk */
+extern void DPSrectfill(DPSContext ctxt, double x, double y, double w, double h);
+extern void DPSsetcmykcolor(DPSContext ctxt, double c, double m, double y, double k);
+extern void DPSsetgray(DPSContext ctxt, double gray);
+extern void DPSsethsbcolor(DPSContext ctxt, double h, double s, double b);
+extern void DPSsetrgbcolor(DPSContext ctxt, double r, double g, double b);
+extern void DPSsetXoffset(DPSContext ctxt, int x, int y);
+extern void DPSinitviewclip(DPSContext ctxt);
+extern void DPSinitgraphics(DPSContext ctxt);
+extern void DPSscale(DPSContext ctxt, double x, double y);
+extern void DPSinitclip(DPSContext ctxt);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 #define DPSSetTextProc(ctxt, tp) ((ctxt)->textProc = (tp))
 
Index: xc/include/DPS/dpsexcept.h
diff -u xc/include/DPS/dpsexcept.h:1.1 xc/include/DPS/dpsexcept.h:1.3
--- xc/include/DPS/dpsexcept.h:1.1	Sat Feb 12 16:12:46 2000
+++ xc/include/DPS/dpsexcept.h	Wed Jun  7 15:02:56 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsexcept.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */
 
 /*
 Original version: Jeffrey Mogul, Stanford, 18 February 1983
@@ -163,17 +164,6 @@
 
 /* Exported Procedures */
 
-#ifdef _NO_PROTO
-
-extern void DPSRaise();
-extern void DPSCantHappen();
-#if 0
-extern int setjmp();
-extern void longjmp();
-#endif /* 0 */
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -196,7 +186,7 @@
    writes an error message to os_stderr and aborts with DPSCantHappen.
  */
 
-extern void DPSCantHappen();
+extern void DPSCantHappen(void);
 /* Calls abort. This is used only to handle "impossible" errors;
    there is no recovery, and DPSCantHappen does not return.
  */
@@ -240,8 +230,6 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 /* In-line Procedures */
 
Index: xc/include/DPS/dpsfriends.h
diff -u xc/include/DPS/dpsfriends.h:1.1 xc/include/DPS/dpsfriends.h:1.3
--- xc/include/DPS/dpsfriends.h:1.1	Sat Feb 12 16:12:47 2000
+++ xc/include/DPS/dpsfriends.h	Wed Jun  7 15:02:56 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsfriends.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */
 
 #ifndef	DPSFRIENDS_H
 #define	DPSFRIENDS_H
@@ -130,31 +131,33 @@
   dps_tInt,	dps_tUInt,
   dps_tLong,	dps_tULong } DPSDefinedType;
   
+struct _t_DPSContextRec;
+
   /* Enumerates the C data types that can be used to describe wrap
      parameters. */
 
-typedef void (*DPSContextProc)(/*
+typedef void (*DPSContextProc)(
 			       struct _t_DPSContextRec *ctxt
-*/);
+);
 
-typedef void (*DPSContextBufProc)(/*
+typedef void (*DPSContextBufProc)(
 				  struct _t_DPSContextRec *ctxt, char *buf,
 				  unsigned int count
-*/);
+);
 
-typedef void (*DPSContextTypedArrayProc)(/*
+typedef void (*DPSContextTypedArrayProc)(
 					 struct _t_DPSContextRec *ctxt,
 					 DPSDefinedType type,
 					 char *array, unsigned int length
-*/);
+);
 
-typedef void (*DPSWriteNumStringProc)(/*
-				         struct _t_DPSContextRec ctxt,
+typedef void (*DPSWriteNumStringProc)(
+				         struct _t_DPSContextRec *ctxt,
 					 DPSDefinedType type,
 					 const void *array,
 					 unsigned int count,
 					 int scale
-*/);
+);
 
 typedef struct {
   DPSContextBufProc BinObjSeqWrite;
@@ -226,10 +229,12 @@
 } DPSProcsRec, *DPSProcs;
 
   /* The DPSProcsRec may be extended to include system-specific items */
+
+struct _t_DPSSpaceRec;
 
-typedef void (*DPSSpaceProc)(/*
+typedef void (*DPSSpaceProc)(
 			     struct _t_DPSSpaceRec *space
-*/);
+);
 
 typedef struct {
   DPSSpaceProc DestroySpace;
@@ -270,14 +275,16 @@
   struct _t_DPSContextExtensionRec *next;
 } DPSContextExtensionRec;
 
+struct _t_DPSContextRec;
+
 typedef struct _t_DPSContextRec {
   char *priv;
   DPSSpace space;
   DPSProgramEncoding programEncoding;
   DPSNameEncoding nameEncoding;
   DPSProcs procs;
-  void (*textProc)();
-  void (*errorProc)();
+  void (*textProc)(struct _t_DPSContextRec *, char *, long unsigned);
+  void (*errorProc)(struct _t_DPSContextRec *, int, long unsigned, long unsigned);
   DPSResults resultTable;
   unsigned int resultTableLength;
   struct _t_DPSContextRec *chainParent, *chainChild;
@@ -390,25 +397,6 @@
 
 /*=== PROCEDURES ===*/
 
-#ifdef _NO_PROTO
-
-extern void DPSAwaitReturnValues();
-extern void DPSUpdateNameMap();
-extern void DPSBinObjSeqWrite();
-extern DPSContext DPSPrivCurrentContext();
-extern void DPSWriteStringChars();
-extern void DPSWriteNumString();
-extern void DPSWriteTypedObjectArray();
-extern void DPSSetResultTable();
-extern void DPSMapNames();
-extern char *DPSNameFromIndex();
-extern DPSContextExtensionRec *DPSGetContextExtensionRec();
-extern void DPSAddContextExtensionRec();
-extern DPSContextExtensionRec *DPSRemoveContextExtensionRec();
-extern int DPSGenerateExtensionRecID();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -419,7 +407,7 @@
   
 extern void DPSBinObjSeqWrite(DPSContext ctxt, char *buf, unsigned int count);
   
-extern DPSContext DPSPrivCurrentContext();
+extern DPSContext DPSPrivCurrentContext(void);
     
 extern void DPSWriteStringChars(DPSContext ctxt, char *buf,
 				unsigned int count);
@@ -472,14 +460,12 @@
 
   /* This procedure removes a context extension record */
 
-extern int DPSGenerateExtensionRecID();
+extern int DPSGenerateExtensionRecID(void);
 
   /* This procedure generates a unique extension record id. */
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 #endif /* DPSFRIENDS_H */
Index: xc/include/GL/Imakefile
diff -u xc/include/GL/Imakefile:1.8 xc/include/GL/Imakefile:1.9
--- xc/include/GL/Imakefile:1.8	Thu Mar  2 08:07:29 2000
+++ xc/include/GL/Imakefile	Fri Jun 16 17:02:46 2000
@@ -1,11 +1,12 @@
 
-XCOMM $XFree86: xc/include/GL/Imakefile,v 1.8 2000/03/02 16:07:29 martin Exp $
+XCOMM $XFree86: xc/include/GL/Imakefile,v 1.9 2000/06/17 00:02:46 martin Exp $
 
 LinkSourceFile(gl.h, ../../extras/Mesa/include/GL)
 LinkSourceFile(glext.h, ../../extras/Mesa/include/GL)
+LinkSourceFile(osmesa.h, ../../extras/Mesa/include/GL)
 
 #if BuildGLXLibrary
-GLXHEADERS = gl.h glext.h glx.h glxint.h glxmd.h glxproto.h glxtokens.h
+GLXHEADERS = gl.h glext.h glx.h glxtokens.h osmesa.h
 #endif
 
 HEADERS = $(GLXHEADERS)
Index: xc/include/GL/glx.h
diff -u xc/include/GL/glx.h:1.5 xc/include/GL/glx.h:1.7
--- xc/include/GL/glx.h:1.5	Thu Mar  2 08:07:29 2000
+++ xc/include/GL/glx.h	Fri Jun 30 11:27:00 2000
@@ -1,31 +1,43 @@
 #ifndef __GLX_glx_h__
 #define __GLX_glx_h__
 
-/* $XFree86: xc/include/GL/glx.h,v 1.5 2000/03/02 16:07:29 martin Exp $ */
+/* $XFree86: xc/include/GL/glx.h,v 1.7 2000/06/30 18:27:00 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
-**
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 */
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/Xmd.h>
 #include <GL/gl.h>
 #include <GL/glxtokens.h>
 
@@ -39,19 +51,19 @@
 typedef XID GLXContextID;
 typedef XID GLXPixmap;
 typedef XID GLXDrawable;
-/* GLX 1.3 */
-typedef XID GLXFBConfigID;
-typedef XID GLXPfuffer;
-typedef XID GLXWindow;
 typedef XID GLXPbuffer;
-typedef XID GLXFBConfig;
-
+typedef XID GLXWindow;
+typedef XID GLXFBConfigID;
 
 /*
 ** GLXContext is a pointer to opaque data.
-**/
+*/
 typedef struct __GLXcontextRec *GLXContext;
 
+/*
+** GLXFBConfig is a pointer to opaque data.
+*/
+typedef struct __GLXFBConfigRec *GLXFBConfig;
 
 /************************************************************************/
 
@@ -76,34 +88,57 @@
 extern const char * glXQueryServerString (Display *dpy, int screen, int name );
 extern const char * glXQueryExtensionsString (Display *dpy, int screen );
 
-/* GLX 1.3 */
-extern GLXFBConfig glXChooseFBConfig (Display *dpy, int screen, const int *attribList, int *nitems);
+/* New for GLX 1.3 */
+extern GLXFBConfig * glXGetFBConfigs (Display *dpy, int screen, int *nelements);
+extern GLXFBConfig * glXChooseFBConfig (Display *dpy, int screen, const int *attrib_list, int *nelements);
 extern int glXGetFBConfigAttrib (Display *dpy, GLXFBConfig config, int attribute, int *value);
 extern XVisualInfo * glXGetVisualFromFBConfig (Display *dpy, GLXFBConfig config);
-extern GLXWindow glXCreateWindow (Display *dpy, GLXFBConfig config, Window win, const int *attribList);
-extern void glXDestroyWindow (Display *dpy, GLXWindow window);
-extern GLXPixmap glXCreatePixmap (Display *dpy, GLXFBConfig config,Pixmap pixmap, const int *attribList);
+extern GLXWindow glXCreateWindow (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
+extern void glXDestroyWindow (Display *dpy, GLXWindow win);
+extern GLXPixmap glXCreatePixmap (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
 extern void glXDestroyPixmap (Display *dpy, GLXPixmap pixmap);
-extern GLXPbuffer glXCreatePbuffer (Display *dpy, GLXFBConfig config, const int *attribList);
+extern GLXPbuffer glXCreatePbuffer (Display *dpy, GLXFBConfig config, const int *attrib_list);
 extern void glXDestroyPbuffer (Display *dpy, GLXPbuffer pbuf);
 extern void glXQueryDrawable (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
-extern GLXContext glXCreateNewContext (Display *dpy, GLXFBConfig config, int renderType, GLXContext shareList, Bool direct);
-extern Bool glXMakeContextCurrent (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+extern GLXContext glXCreateNewContext (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+extern Bool glXMakeContextCurrent (Display *display, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
 extern GLXDrawable glXGetCurrentReadDrawable (void);
+extern Display * glXGetCurrentDisplay (void);
 extern int glXQueryContext (Display *dpy, GLXContext ctx, int attribute, int *value);
-extern void glXSelectEvent (Display *dpy, GLXDrawable drawable, unsigned long mask);
-extern void glXGetSelectedEvent (Display *dpy, GLXDrawable drawable, unsigned long *mask);
+extern void glXSelectEvent (Display *dpy, GLXDrawable draw, unsigned long event_mask);
+extern void glXGetSelectedEvent (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
 
-/* Extensions */
-extern Display * glXGetCurrentDisplay (void);
+/*** SGI GLX extensions */
 extern GLXContextID glXGetContextIDEXT (const GLXContext ctx);
 extern GLXDrawable glXGetCurrentDrawableEXT (void);
 extern GLXContext glXImportContextEXT (Display *dpy, GLXContextID contextID);
 extern void glXFreeContextEXT (Display *dpy, GLXContext ctx);
 extern int glXQueryContextInfoEXT (Display *dpy, GLXContext ctx, int attribute, int *value);
-extern void (*glXGetProcAddressARB(const GLubyte *procName))();
 
+extern void (*glXGetProcAddressARB(const GLubyte *procName))( void );
 
+/*** Should these go here, or in another header? */
+/*
+** GLX Events
+*/
+typedef struct {
+    int event_type;		/* GLX_DAMAGED or GLX_SAVED */
+    int draw_type;		/* GLX_WINDOW or GLX_PBUFFER */
+    unsigned long serial;	/* # of last request processed by server */
+    Bool send_event;		/* true if this came for SendEvent request */
+    Display *display;		/* display the event was read from */
+    GLXDrawable drawable;	/* XID of Drawable */
+    unsigned int buffer_mask;	/* mask indicating which buffers are affected */
+    unsigned int aux_buffer;	/* which aux buffer was affected */
+    int x, y;
+    int width, height;
+    int count;			/* if nonzero, at least this many more */
+} GLXPbufferClobberEvent;
+
+typedef union __GLXEvent {
+    GLXPbufferClobberEvent glxpbufferclobber;
+    long pad[24];
+} GLXEvent;
 
 #ifdef __cplusplus
 }
Index: xc/include/GL/glxtokens.h
diff -u xc/include/GL/glxtokens.h:1.3 xc/include/GL/glxtokens.h:1.4
--- xc/include/GL/glxtokens.h:1.3	Mon Feb 14 23:13:24 2000
+++ xc/include/GL/glxtokens.h	Fri Jun 16 17:02:46 2000
@@ -1,26 +1,39 @@
 #ifndef __GLX_glxtokens_h__
 #define __GLX_glxtokens_h__
 
-/* $XFree86: xc/include/GL/glxtokens.h,v 1.3 2000/02/15 07:13:24 martin Exp $ */
+/* $XFree86: xc/include/GL/glxtokens.h,v 1.4 2000/06/17 00:02:46 martin Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
-**
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.0 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 */
 
 #ifdef __cplusplus
@@ -29,9 +42,10 @@
 
 #define GLX_VERSION_1_1 1
 #define GLX_VERSION_1_2 1
+#define GLX_VERSION_1_3 1
 
 /*
-** Names for attributes to glXGetConfig.
+** Visual Config Attributes (glXGetConfig, glXGetFBConfigAttrib)
 */
 #define GLX_USE_GL		1	/* support GLX rendering */
 #define GLX_BUFFER_SIZE		2	/* depth of the color buffer */
@@ -39,7 +53,7 @@
 #define GLX_RGBA		4	/* true if RGBA mode */
 #define GLX_DOUBLEBUFFER	5	/* double buffering supported */
 #define GLX_STEREO		6	/* stereo buffering supported */
-#define GLX_AUX_BUFFERS 	7	/* number of aux buffers */
+#define GLX_AUX_BUFFERS		7	/* number of aux buffers */
 #define GLX_RED_SIZE		8	/* number of red component bits */
 #define GLX_GREEN_SIZE		9	/* number of green component bits */
 #define GLX_BLUE_SIZE		10	/* number of blue component bits */
@@ -50,6 +64,25 @@
 #define GLX_ACCUM_GREEN_SIZE	15	/* number of green accum bits */
 #define GLX_ACCUM_BLUE_SIZE	16	/* number of blue accum bits */
 #define GLX_ACCUM_ALPHA_SIZE	17	/* number of alpha accum bits */
+/*
+** FBConfig-specific attributes
+*/
+#define GLX_X_VISUAL_TYPE		0x22
+#define GLX_CONFIG_CAVEAT		0x20	/* Like visual_info VISUAL_CAVEAT_EXT */
+#define GLX_TRANSPARENT_TYPE		0x23
+#define GLX_TRANSPARENT_INDEX_VALUE	0x24
+#define GLX_TRANSPARENT_RED_VALUE	0x25
+#define GLX_TRANSPARENT_GREEN_VALUE	0x26
+#define GLX_TRANSPARENT_BLUE_VALUE	0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE	0x28
+#define GLX_DRAWABLE_TYPE		0x8010
+#define GLX_RENDER_TYPE			0x8011
+#define GLX_X_RENDERABLE		0x8012
+#define GLX_FBCONFIG_ID			0x8013
+#define GLX_MAX_PBUFFER_WIDTH		0x8016
+#define GLX_MAX_PBUFFER_HEIGHT		0x8017
+#define GLX_MAX_PBUFFER_PIXELS		0x8018
+#define GLX_VISUAL_ID			0x800B
 
 /*
 ** Error return values from glXGetConfig.  Success is indicated by
@@ -59,9 +92,85 @@
 #define GLX_BAD_ATTRIBUTE	2	/* attribute to get is bad */
 #define GLX_NO_EXTENSION	3	/* no glx extension on server */
 #define GLX_BAD_VISUAL		4	/* visual # not known by GLX */
-#define GLX_BAD_CONTEXT         5
-#define GLX_BAD_VALUE           6
-#define GLX_BAD_ENUM            7
+#define GLX_BAD_CONTEXT		5	/* returned only by import_context EXT? */
+#define GLX_BAD_VALUE		6	/* returned only by glXSwapIntervalSGI? */
+#define GLX_BAD_ENUM		7	/* unused? */
+
+/* FBConfig attribute values */
+
+/*
+** Generic "don't care" value for glX ChooseFBConfig attributes (except
+** GLX_LEVEL)
+*/
+#define GLX_DONT_CARE			0xFFFFFFFF
+
+/* GLX_RENDER_TYPE bits */
+#define GLX_RGBA_BIT			0x00000001
+#define GLX_COLOR_INDEX_BIT		0x00000002
+
+/* GLX_DRAWABLE_TYPE bits */
+#define GLX_WINDOW_BIT			0x00000001
+#define GLX_PIXMAP_BIT			0x00000002
+#define GLX_PBUFFER_BIT			0x00000004
+
+/* GLX_CONFIG_CAVEAT attribute values */
+#define GLX_NONE			0x8000
+#define GLX_SLOW_CONFIG			0x8001
+#define GLX_NON_CONFORMANT_CONFIG	0x800D
+
+/* GLX_X_VISUAL_TYPE attribute values */
+#define GLX_TRUE_COLOR			0x8002
+#define GLX_DIRECT_COLOR		0x8003
+#define GLX_PSEUDO_COLOR		0x8004
+#define GLX_STATIC_COLOR		0x8005
+#define GLX_GRAY_SCALE			0x8006
+#define GLX_STATIC_GRAY			0x8007
+
+/* GLX_TRANSPARENT_TYPE attribute values */
+/* #define GLX_NONE			   0x8000 */
+#define GLX_TRANSPARENT_RGB		0x8008
+#define GLX_TRANSPARENT_INDEX		0x8009
+
+/* glXCreateGLXPbuffer attributes */
+#define GLX_PRESERVED_CONTENTS		0x801B
+#define GLX_LARGEST_PBUFFER		0x801C
+#define GLX_PBUFFER_HEIGHT		0x8040	/* New for GLX 1.3 */
+#define GLX_PBUFFER_WIDTH		0x8041	/* New for GLX 1.3 */
+
+/* glXQueryGLXPBuffer attributes */
+#define GLX_WIDTH			0x801D
+#define GLX_HEIGHT			0x801E
+#define GLX_EVENT_MASK			0x801F
+
+/* glXCreateNewContext render_type attribute values */
+#define GLX_RGBA_TYPE			0x8014
+#define GLX_COLOR_INDEX_TYPE		0x8015
+
+/* glXQueryContext attributes */
+/* #define GLX_FBCONFIG_ID		  0x8013 */
+/* #define GLX_RENDER_TYPE		  0x8011 */
+#define GLX_SCREEN			0x800C
+
+/* glXSelectEvent event mask bits */
+#define GLX_PBUFFER_CLOBBER_MASK	0x08000000
+
+/* GLXPbufferClobberEvent event_type values */
+#define GLX_DAMAGED			0x8020
+#define GLX_SAVED			0x8021
+
+/* GLXPbufferClobberEvent draw_type values */
+#define GLX_WINDOW			0x8022
+#define GLX_PBUFFER			0x8023
+
+/* GLXPbufferClobberEvent buffer_mask bits */
+#define GLX_FRONT_LEFT_BUFFER_BIT	0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT	0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT	0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT	0x00000008
+#define GLX_AUX_BUFFERS_BIT		0x00000010
+#define GLX_DEPTH_BUFFER_BIT		0x00000020
+#define GLX_STENCIL_BUFFER_BIT		0x00000040
+#define GLX_ACCUM_BUFFER_BIT		0x00000080
 
 /*
 ** Extension return values from glXGetConfig.  These are also
@@ -71,27 +180,27 @@
 #define GLX_X_VISUAL_TYPE_EXT	0x22	/* visual_info extension type */
 #define GLX_TRANSPARENT_TYPE_EXT 0x23	/* visual_info extension */
 #define GLX_TRANSPARENT_INDEX_VALUE_EXT 0x24	/* visual_info extension */
-#define GLX_TRANSPARENT_RED_VALUE_EXT   0x25	/* visual_info extension */
+#define GLX_TRANSPARENT_RED_VALUE_EXT	0x25	/* visual_info extension */
 #define GLX_TRANSPARENT_GREEN_VALUE_EXT 0x26	/* visual_info extension */
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT  0x27	/* visual_info extension */
+#define GLX_TRANSPARENT_BLUE_VALUE_EXT	0x27	/* visual_info extension */
 #define GLX_TRANSPARENT_ALPHA_VALUE_EXT 0x28	/* visual_info extension */
 
 /* Property values for visual_type */
-#define GLX_TRUE_COLOR_EXT     	0x8002
-#define GLX_DIRECT_COLOR_EXT    0x8003  
-#define GLX_PSEUDO_COLOR_EXT    0x8004 
-#define GLX_STATIC_COLOR_EXT    0x8005
-#define GLX_GRAY_SCALE_EXT    	0x8006  
-#define GLX_STATIC_GRAY_EXT    	0x8007 
+#define GLX_TRUE_COLOR_EXT	0x8002
+#define GLX_DIRECT_COLOR_EXT	0x8003
+#define GLX_PSEUDO_COLOR_EXT	0x8004
+#define GLX_STATIC_COLOR_EXT	0x8005
+#define GLX_GRAY_SCALE_EXT	0x8006
+#define GLX_STATIC_GRAY_EXT	0x8007
 
 /* Property values for transparent pixel */
-#define GLX_NONE_EXT     	0x8000     
-#define GLX_TRANSPARENT_RGB_EXT    	0x8008    
-#define GLX_TRANSPARENT_INDEX_EXT    	0x8009    
+#define GLX_NONE_EXT		0x8000
+#define GLX_TRANSPARENT_RGB_EXT		0x8008
+#define GLX_TRANSPARENT_INDEX_EXT	0x8009
 
 /* Property values for visual_rating */
-#define GLX_VISUAL_CAVEAT_EXT    	0x20  /* visual_rating extension type */
-#define GLX_SLOW_VISUAL_EXT		0x8001   
+#define GLX_VISUAL_CAVEAT_EXT		0x20  /* visual_rating extension type */
+#define GLX_SLOW_VISUAL_EXT		0x8001
 #define GLX_NON_CONFORMANT_VISUAL_EXT	0x800D
 
 /*
@@ -109,10 +218,11 @@
 #define GLX_SCREEN_EXT		0x800C	/* screen number */
 
 /* GLX Extension Strings */
-#define GLX_EXT_import_context  1
-#define GLX_EXT_visual_info     1
-#define GLX_EXT_visual_rating   1
+#define GLX_EXT_import_context	1
+#define GLX_EXT_visual_info	1
+#define GLX_EXT_visual_rating	1
 #define GLX_ARB_get_proc_address 1
+
 
 #ifdef __cplusplus
 }
Index: xc/include/extensions/Imakefile
diff -u xc/include/extensions/Imakefile:3.33 xc/include/extensions/Imakefile:3.34
--- xc/include/extensions/Imakefile:3.33	Mon Feb 28 19:09:00 2000
+++ xc/include/extensions/Imakefile	Fri Mar 31 14:55:18 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/50 1997/11/24 16:47:55 kaleb $
-XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.33 2000/02/29 03:09:00 dawes Exp $
+XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.34 2000/03/31 22:55:18 dawes Exp $
 
 #if BuildScreenSaverLibrary
 SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
@@ -62,8 +62,8 @@
 BuildIncludes($(HEADERS),X11/extensions,../..)
 InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/extensions,$(INSTINCFLAGS))
 
-InstallDriverSDKNonExecFile(XI.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(XIproto.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(XI.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+InstallDriverSDKNonExecFile(XIproto.h,$(DRIVERSDKINCLUDEDIR)/extensions)
 InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(Xvproto.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions)
@@ -71,3 +71,8 @@
 InstallDriverSDKNonExecFile(xf86dgastr.h,$(DRIVERSDKINCLUDEDIR)/extensions)
 InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
+InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
+
Index: xc/include/extensions/dpms.h
diff -u xc/include/extensions/dpms.h:3.3 xc/include/extensions/dpms.h:3.4
--- xc/include/extensions/dpms.h:3.3	Sun Mar  7 03:40:23 1999
+++ xc/include/extensions/dpms.h	Wed Mar 15 08:51:51 2000
@@ -26,7 +26,7 @@
 Equipment Corporation.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/dpms.h,v 3.3 1999/03/07 11:40:23 dawes Exp $ */
+/* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */
 
 /*
  * HISTORY
@@ -42,6 +42,10 @@
 #define DPMSModeOff	3
 
 #ifndef DPMS_SERVER
+
+#include <X11/X.h>
+#include <X11/Xmd.h>
+
 extern Bool DPMSQueryExtension(Display *, int *, int *);
 extern Status DPMSGetVersion(Display *, int *, int *);
 extern Bool DPMSCapable(Display *);
Index: xc/include/extensions/lbxbuf.h
diff -u xc/include/extensions/lbxbuf.h:1.1.1.1 xc/include/extensions/lbxbuf.h:1.2
--- xc/include/extensions/lbxbuf.h:1.1.1.1	Sat Dec 21 19:17:31 1996
+++ xc/include/extensions/lbxbuf.h	Thu May 18 16:46:11 2000
@@ -38,8 +38,8 @@
 
 typedef struct _zlibbuffer  *ZlibBufferPtr;
 
-extern int  InitZlibBuffer();
-extern void FreeZlibBuffer();
-extern char *ReserveOutBuf();
+extern int  InitZlibBuffer(ZlibBufferPtr b, int size);
+extern void FreeZlibBuffer(ZlibBufferPtr b);
+extern char *ReserveOutBuf(ZlibBufferPtr outbuf, int outlen);
 
 #endif	/* _BUFFER_H_ */
Index: xc/include/extensions/lbxdeltastr.h
diff -u xc/include/extensions/lbxdeltastr.h:1.1.1.1 xc/include/extensions/lbxdeltastr.h:1.2
--- xc/include/extensions/lbxdeltastr.h:1.1.1.1	Sat Dec 21 19:17:31 1996
+++ xc/include/extensions/lbxdeltastr.h	Thu May 18 16:46:11 2000
@@ -88,4 +88,18 @@
 } lbxMotionDeltaEvent;
 #define sz_lbxMotionDeltaEvent 8
 
+extern int LBXInitDeltaCache ( LBXDeltasPtr pcache, int nDeltas, 
+			       int maxDeltasize );
+extern void LBXFreeDeltaCache ( LBXDeltasPtr pcache );
+extern int LBXDeltaMinDiffs ( LBXDeltasPtr pcache, unsigned char *inmsg, 
+			      int inmsglen, int maxdiff, int *pindex );
+extern void LBXEncodeDelta ( LBXDeltasPtr pcache, unsigned char *inmsg, 
+			     int ndiff, int index, unsigned char *buf );
+extern int LBXDecodeDelta ( LBXDeltasPtr pcache, xLbxDiffItem *deltas, 
+			    int ndiff, int index, unsigned char **buf );
+extern void LBXAddDeltaOut ( LBXDeltasPtr pcache, unsigned char *inmsg, 
+			     int inmsglen );
+extern void LBXAddDeltaIn ( LBXDeltasPtr pcache, unsigned char *inmsg, 
+			    int inmsglen );
+
 #endif /* LBX_DELTA_STRUCT_H */
Index: xc/include/extensions/lbxopts.h
diff -u xc/include/extensions/lbxopts.h:1.3 xc/include/extensions/lbxopts.h:1.4
--- xc/include/extensions/lbxopts.h:1.3	Fri Jan 17 23:17:15 1997
+++ xc/include/extensions/lbxopts.h	Thu May 18 16:46:11 2000
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/include/extensions/lbxopts.h,v 1.3 1997/01/18 07:17:15 dawes Exp $ */
+/* $XFree86: xc/include/extensions/lbxopts.h,v 1.4 2000/05/18 23:46:11 dawes Exp $ */
 
 #ifndef _LBX_OPTS_H_
 #define _LBX_OPTS_H_
@@ -96,7 +96,7 @@
 typedef void *LbxStreamCompHandle;
 
 typedef struct _LbxStreamOpts {
-    LbxStreamCompHandle	(*streamCompInit)();
+    LbxStreamCompHandle	(*streamCompInit)(int fd, pointer arg);
     pointer		streamCompArg;
     int			(*streamCompStuffInput)(
 			    int fd,
Index: xc/include/extensions/lbxzlib.h
diff -u xc/include/extensions/lbxzlib.h:1.1.1.1 xc/include/extensions/lbxzlib.h:1.2
--- xc/include/extensions/lbxzlib.h:1.1.1.1	Sat Dec 21 19:17:32 1996
+++ xc/include/extensions/lbxzlib.h	Thu May 18 16:46:11 2000
@@ -47,4 +47,18 @@
 
 #define ZLIB_COMPRESSED(p) ((p)[0] & ZLIB_COMPRESS_FLAG)
 
+struct ZlibInfo;
+
+extern void * ZlibInit ( int fd, int level );
+extern void ZlibFree ( struct ZlibInfo *comp );
+extern int ZlibFlush ( int fd );
+extern int ZlibStuffInput ( int fd, unsigned char *buffer, int buflen );
+extern void ZlibCompressOn ( int fd );
+extern void ZlibCompressOff ( int fd );
+extern int ZlibWrite ( int fd, unsigned char *buffer, int buflen );
+extern int ZlibWriteV ( int fd, struct iovec *iov, int iovcnt );
+extern int ZlibRead ( int fd, unsigned char *buffer, int buflen );
+extern int ZlibInputAvail ( int fd );
+
+
 #endif /* _ZLIB_H_ */
Index: xc/include/extensions/xf86misc.h
diff -u xc/include/extensions/xf86misc.h:3.12 xc/include/extensions/xf86misc.h:3.13
--- xc/include/extensions/xf86misc.h:3.12	Sat Jul 10 05:17:12 1999
+++ xc/include/extensions/xf86misc.h	Mon Apr 17 09:29:48 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86misc.h,v 3.12 1999/07/10 12:17:12 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86misc.h,v 3.13 2000/04/17 16:29:48 eich Exp $ */
 
 /*
  * Copyright (c) 1995, 1996  The XFree86 Project, Inc
@@ -30,6 +30,7 @@
 #define XF86MiscBadKbdType		4
 #define XF86MiscModInDevDisabled	5
 #define XF86MiscModInDevClientNotLocal	6
+#define XF86MiscNoModule                7
 #define XF86MiscNumberErrors		(XF86MiscModInDevClientNotLocal + 1)
 
 /* Never renumber these */
@@ -53,6 +54,7 @@
 #define MTYPE_SYSMOUSE		17
 #define MTYPE_AUTOMOUSE		18
 #define MTYPE_ACECAD		19
+#define MTYPE_EXPPS2            20
 
 #define MTYPE_XQUEUE		127
 #define MTYPE_OSMOUSE		126
@@ -93,47 +95,35 @@
 } XF86MiscKbdSettings;
 
 Bool XF86MiscQueryVersion(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int*		/* majorVersion */,
     int*		/* minorVersion */
-#endif
 );
 
 Bool XF86MiscQueryExtension(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int*		/* event_base */,
     int*		/* error_base */
-#endif
 );
 
 Status XF86MiscGetMouseSettings(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     XF86MiscMouseSettings*	/* mouse info */
-#endif
 );
 
 Status XF86MiscGetKbdSettings(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     XF86MiscKbdSettings*	/* keyboard info */
-#endif
 );
 
 Status XF86MiscSetMouseSettings(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     XF86MiscMouseSettings*	/* mouse info */
-#endif
 );
 
 Status XF86MiscSetKbdSettings(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     XF86MiscKbdSettings*	/* keyboard info */
-#endif
 );
 
 _XFUNCPROTOEND
Index: xc/lib/GL/Imakefile
diff -u xc/lib/GL/Imakefile:1.16 xc/lib/GL/Imakefile:1.28
--- xc/lib/GL/Imakefile:1.16	Thu Mar  2 08:07:30 2000
+++ xc/lib/GL/Imakefile	Fri Jun 30 12:30:16 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.16 2000/03/02 16:07:30 martin Exp $
+XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.28 2000/06/30 19:30:16 dawes Exp $
 
 #include <Threads.tmpl>
 
@@ -11,26 +11,29 @@
 #define DoDebugLib DebugLibGlx
 #define DoProfileLib ProfileLibGlx
 
-#if BuildXF86DRI
-DRIDIRS = dri
-MESADIRS = mesa/dri mesa/include/GL mesa/src
-#endif
-SUBDIRS = glx $(DRIDIRS) $(MESADIRS)
+     LIBNAME = GL
+     SOREV   = $(SOGLREV)
 
 #ifdef SharedGLReqs
 REQUIREDLIBS = SharedGLReqs
 #endif
 
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
+#if 0
+      LOWSRC = lowpc.c
+      LOWOBJ = lowpc.o
 
-     LIBNAME = GL
-     SOREV   = $(SOGLREV)
+       HISRC = highpc.c
+       HIOBJ = highpc.o
+#endif
+
+#if BuildXF86DRI && defined(i386Architecture)
+   GLAPI_OBJ = glx/glapi_x86.o
+#endif
 
      GLXOBJS = glx/?*.o
-    GLXUOBJS = glx/unshared/?*.o
-    GLXDOBJS = glx/debugger/?*.o
-    GLXPOBJS = glx/profiled/?*.o
+    GLXUOBJS = glx/unshared/?*.o $(GLAPI_OBJ)
+    GLXDOBJS = glx/debugger/?*.o $(GLAPI_OBJ)
+    GLXPOBJS = glx/profiled/?*.o $(GLAPI_OBJ)
     GLXDONES = glx/DONE
 
 #if BuildXF86DRI
@@ -40,38 +43,72 @@
     DRIPOBJS = dri/profiled/XF86dri.o dri/profiled/dri_glx.o
     DRIDONES = dri/DONE
 
-#if !GlxUseSGISI
-#if GlxBuiltInGamma
      DRMOBJS = dri/drm/?*.o
     DRMUOBJS = dri/drm/unshared/?*.o
     DRMDOBJS = dri/drm/debugger/?*.o
     DRMPOBJS = dri/drm/profiled/?*.o
     DRMDONES = dri/drm/DONE
 
-   GAMMAOBJS = mesa/src/drv/gamma/?*.o
-  GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o
-  GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o
-  GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o
-  GAMMADONES = mesa/src/drv/gamma/DONE
+#ifdef i386Architecture
+    ASM_OBJS =  mesa/src/X86/common_x86asm.o \
+		mesa/src/X86/mmx_blend.o \
+		mesa/src/X86/vertex.o \
+		mesa/src/X86/x86a.o
+#ifdef MesaUse3DNow
+    ASM_OBJS += mesa/src/X86/3dnow_norm.o \
+		mesa/src/X86/3dnow_norm_raw.o \
+		mesa/src/X86/3dnow_xform_masked1.o \
+		mesa/src/X86/3dnow_xform_masked2.o \
+		mesa/src/X86/3dnow_xform_masked3.o \
+		mesa/src/X86/3dnow_xform_masked4.o \
+		mesa/src/X86/3dnow_xform_raw1.o \
+		mesa/src/X86/3dnow_xform_raw2.o \
+		mesa/src/X86/3dnow_xform_raw3.o \
+		mesa/src/X86/3dnow_xform_raw4.o \
+		mesa/src/X86/vertex_3dnow.o
+#endif
+#endif
 
+    MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o
+   MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o $(ASM_OBJS)
+   MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o $(ASM_OBJS)
+   MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o $(ASM_OBJS)
+   MESADONES = mesa/src/DONE mesa/src/X86/DONE
+
  DRIMESAOBJS = mesa/dri/?*.o
 DRIMESAUOBJS = mesa/dri/unshared/?*.o
 DRIMESADOBJS = mesa/dri/debugger/?*.o
 DRIMESAPOBJS = mesa/dri/profiled/?*.o
 DRIMESADONES = mesa/dri/DONE
 
+  COMMONOBJS = mesa/src/drv/common/?*.o
+ COMMONUOBJS = mesa/src/drv/common/unshared/?*.o
+ COMMONDOBJS = mesa/src/drv/common/debugger/?*.o
+ COMMONPOBJS = mesa/src/drv/common/profiled/?*.o
+ COMMONDONES = mesa/src/drv/common/DONE
+
+
+#if GlxUseSGISI
+
+XCOMM nothing
+
+#elif GlxBuiltInGamma
+
+   GAMMAOBJS = mesa/src/drv/gamma/?*.o
+  GAMMAUOBJS = mesa/src/drv/gamma/unshared/?*.o
+  GAMMADOBJS = mesa/src/drv/gamma/debugger/?*.o
+  GAMMAPOBJS = mesa/src/drv/gamma/profiled/?*.o
+  GAMMADONES = mesa/src/drv/gamma/DONE
+
      DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS)
     DRVUOBJS = $(GAMMAUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS)
     DRVDOBJS = $(GAMMADOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS)
     DRVPOBJS = $(GAMMAPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS)
     DRVDONES = $(GAMMADONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES)
 
+  GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/gamma
+
 #elif GlxBuiltInTdfx
-     DRMOBJS = dri/drm/?*.o
-    DRMUOBJS = dri/drm/unshared/?*.o
-    DRMDOBJS = dri/drm/debugger/?*.o
-    DRMPOBJS = dri/drm/profiled/?*.o
-    DRMDONES = dri/drm/DONE
 
     TDFXOBJS = mesa/src/drv/tdfx/?*.o
    TDFXUOBJS = mesa/src/drv/tdfx/unshared/?*.o
@@ -79,74 +116,222 @@
    TDFXPOBJS = mesa/src/drv/tdfx/profiled/?*.o
    TDFXDONES = mesa/src/drv/tdfx/DONE
 
-    MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o
-   MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o
-   MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o
-   MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o
-   MESADONES = mesa/src/DONE mesa/src/X86/DONE
-
- DRIMESAOBJS = mesa/dri/?*.o
-DRIMESAUOBJS = mesa/dri/unshared/?*.o
-DRIMESADOBJS = mesa/dri/debugger/?*.o
-DRIMESAPOBJS = mesa/dri/profiled/?*.o
-DRIMESADONES = mesa/dri/DONE
-
      DRVOBJS = $(TDFXOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS)
     DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS)
     DRVDOBJS = $(TDFXDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS)
     DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS)
     DRVDONES = $(TDFXDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES)
+
+REQUIREDLIBS += -lglide3x -ldl
+
+  GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/tdfx
+
+#elif GlxBuiltInI810
+
+    I810OBJS = mesa/src/drv/i810/?*.o
+   I810UOBJS = mesa/src/drv/i810/unshared/?*.o
+   I810DOBJS = mesa/src/drv/i810/debugger/?*.o
+   I810POBJS = mesa/src/drv/i810/profiled/?*.o
+   I810DONES = mesa/src/drv/i810/DONE
+
+     DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS)
+    DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS)
+    DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS)
+    DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS)
+    DRVDONES = $(I810DONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES)
+
+  GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/i810
+
+#elif GlxBuiltInMga
 
- REQUIREDLIBS += -lglide3x
+     MGAOBJS = mesa/src/drv/mga/?*.o
+    MGAUOBJS = mesa/src/drv/mga/unshared/?*.o
+    MGADOBJS = mesa/src/drv/mga/debugger/?*.o
+    MGAPOBJS = mesa/src/drv/mga/profiled/?*.o
+    MGADONES = mesa/src/drv/mga/DONE
+
+     DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS)
+    DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS)
+    DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS)
+    DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS)
+    DRVDONES = $(MGADONES) $(COMMONDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES)
+
+  GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/mga
+
+#elif GlxBuiltInR128
+
+    R128OBJS = mesa/src/drv/r128/?*.o
+   R128UOBJS = mesa/src/drv/r128/unshared/?*.o
+   R128DOBJS = mesa/src/drv/r128/debugger/?*.o
+   R128POBJS = mesa/src/drv/r128/profiled/?*.o
+   R128DONES = mesa/src/drv/r128/DONE
+
+     DRVOBJS = $(R128OBJS)  $(MESAOBJS)  $(DRIMESAOBJS)  $(DRMOBJS)
+    DRVUOBJS = $(R128UOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS)
+    DRVDOBJS = $(R128DOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS)
+    DRVPOBJS = $(R128POBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS)
+    DRVDONES = $(R128DONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES)
+
+  GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/r128
+
+#elif GlxBuiltInFfb
+
+     FFBOBJS = mesa/src/drv/ffb/?*.o
+    FFBUOBJS = mesa/src/drv/ffb/unshared/?*.o
+    FFBDOBJS = mesa/src/drv/ffb/debugger/?*.o
+    FFBPOBJS = mesa/src/drv/ffb/profiled/?*.o
+    FFBDONES = mesa/src/drv/ffb/DONE
+
+     DRVOBJS = $(FFBOBJS)  $(MESAOBJS)  $(DRIMESAOBJS)  $(DRMOBJS)
+    DRVUOBJS = $(FFBUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS)
+    DRVDOBJS = $(FFBDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS)
+    DRVPOBJS = $(FFBPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS)
+    DRVDONES = $(FFBDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES)
+
+  GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/ffb
+
+#elif GlxBuiltInSIS
+
+     SISOBJS = mesa/src/drv/sis/?*.o
+    SISUOBJS = mesa/src/drv/sis/unshared/?*.o
+    SISDOBJS = mesa/src/drv/sis/debugger/?*.o
+    SISPOBJS = mesa/src/drv/sis/profiled/?*.o
+    SISDONES = mesa/src/drv/sis/DONE
+
+     DRVOBJS = $(SISOBJS) $(MESAOBJS) $(DRIMESAOBJS) $(DRMOBJS)
+    DRVUOBJS = $(SISUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) $(DRMUOBJS)
+    DRVDOBJS = $(SISDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS)
+    DRVPOBJS = $(SISPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS)
+    DRVDONES = $(SISDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES)
+
+  GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/sis
+
 #elif GlxBuiltInMesa
+
 #ifndef GlxDriverUsesMesa
-     DRVOBJS = mesa/src/?*.o mesa/src/X/?*.o
-    DRVUOBJS = mesa/src/unshared/?*.o mesa/src/X/unshared/?*.o
-    DRVDOBJS = mesa/src/debugger/?*.o mesa/src/X/debugger/?*.o
-    DRVPOBJS = mesa/src/profiled/?*.o mesa/src/X/profiled/?*.o
-    DRVDONES = mesa/src/DONE mesa/src/X/DONE
+     DRVOBJS = mesa/src/?*.o
+    DRVUOBJS = mesa/src/unshared/?*.o
+    DRVDOBJS = mesa/src/debugger/?*.o
+    DRVPOBJS = mesa/src/profiled/?*.o
+    DRVDONES = mesa/src/DONE
+
+  GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src
 #endif
+
+#else
+
+XCOMM No built-in drivers. This is the usual case.
+GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src
+
 #endif
+
+#else
+
+XCOMM BuildXF86DRI was not defined.  Just build an indirect-only libGL.
+GLXSUBDIRS = glx
+
 #endif
+
+
+#if !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa))
+MakeSubdirs($(GLXSUBDIRS))
 #endif
 
+
 #ifdef OS2Architecture
         OBJS = $(LIBNAME).a
 #else
-       OBJS = $(GLXOBJS)  $(DRIOBJS)   $(DRVOBJS)
+        OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ)
 #endif
+
 #if HasSharedLibraries
+#if 1
        UOBJS = $(GLXUOBJS) $(DRIUOBJS) $(DRVUOBJS)
 #else
        UOBJS = $(OBJS)
 #endif
+#else
+       UOBJS = $(OBJS)
+#endif
+
        DOBJS = $(GLXDOBJS) $(DRIDOBJS) $(DRVDOBJS)
        POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS)
        DONES = $(GLXDONES) $(DRIDONES) $(DRVDONES)
 
+#if 0
+SubdirLibraryRule(highpc.o lowpc.o)
+NormalLintTarget(highpc.c lowpc.c)
+#endif
+
 #if LocalThreads
   THREADOBJS = $(THREADS_LIBS)
 #endif
 
+#if HasParallelMake
+MakeMutex($(GLXSUBDIRS) $(DONES))
+#endif
+
+#if HasGnuMake || HasBsdMake
+$(DONES): $(GLXSUBDIRS)
+#endif
+
 #include <Library.tmpl>
 
 #undef _LinkBuildLibrary
 #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
 
+
 #if NormalLibGlx
-NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(UOBJS))
+NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS))
 InstallLibrary($(LIBNAME),$(USRLIBDIR))
 #endif
 #if SharedLibGlx
-SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.)
+SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.)
 InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
+#if LinkGLToUsrLib && AlternateUsrLibDir
+install::
+	$(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so
+	$(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so
+	$(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1
+	$(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1
 #endif
+#endif
 #if DebugLibGlx
-DebuggedDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(DOBJS))
+DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS))
 InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
 #endif
 #if ProfileLibGlx
-ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(POBJS))
+ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS))
 InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
 #endif
 
+XCOMM libOSmesa needs libGL, so build it now
+
+#if BuildXF86DRI && !GlxUseSGISI && (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa))
+OSMESASUBDIRS = mesa/src/OSmesa
+MakeSubdirs($(OSMESASUBDIRS))
+#endif
+
+
+XCOMM libGL has now been made, continue with building the drivers.
+
+#if BuildXF86DRI && \
+    !GlxUseSGISI && \
+    !GlxBuiltInGamma && \
+    !GlxBuiltInTdfx && \
+    !GlxBuiltInI810 && \
+    !GlxBuiltInMga && \
+    !GlxBuiltInR128 && \
+    !GlxBuiltInFfb && \
+    !GlxBuiltInSIS && \
+    !GlxBuiltInMesa
+
+DRIVERSUBDIRS = mesa/src/drv
+
+MakeSubdirs($(DRIVERSUBDIRS))
+
+#endif
+
+SUBDIRS = $(GLXSUBDIRS) $(OSMESASUBDIRS) $(DRIVERSUBDIRS)
+
+DependSubdirs($(SUBDIRS))
Index: xc/lib/GL/highpc.c
diff -u /dev/null xc/lib/GL/highpc.c:1.1
--- /dev/null	Sat Jul  1 20:44:31 2000
+++ xc/lib/GL/highpc.c	Fri Jun 16 17:02:47 2000
@@ -0,0 +1,75 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+
+/* Mesa shared lib profiling code by Josh Vanderhoof.  Adapted
+ * (trivially) to the DRI by Keith Whitwell. 
+ */
+
+/*
+ * This is the highest address in libGL.so
+ */
+void glx_highpc(void) { }
+
+#if defined(__GNUC__) && defined(__linux__)
+
+void monstartup( char *lowpc, char *highpc );
+void _mcleanup( void );
+void glx_lowpc( void );
+
+static int profile = 0;
+
+
+/*
+ * Start profiling
+ */
+void __attribute__ ((constructor))
+glx_init_prof( void )
+{
+   FILE *fp;
+   char *s = getenv("GLX_SO_MON");
+
+   fprintf(stderr, "\n\n\nIn glx_init_prof\n\n\n");
+
+   if (!s) return;
+
+   profile = 1;
+   monstartup( (char *)glx_lowpc, (char *)glx_highpc );
+
+   fprintf(stderr, "Starting profiling, %x %x\n", 
+	   (unsigned int)glx_lowpc, 
+	   (unsigned int)glx_highpc);
+
+   if ((fp = fopen( "glx_lowpc", "w" )) != NULL) {
+      fprintf( fp, "0x%08x ", (unsigned int)glx_lowpc );
+      fclose( fp );
+   }
+}
+
+
+
+/*
+ * Finish profiling
+ */
+void __attribute__ ((destructor))
+glx_fini_prof( void )
+{
+   fprintf(stderr, "in glx_fini_prof\n");
+
+   if (profile) {
+      _mcleanup();
+      profile = 0;
+      fprintf(stderr, "Finished profiling\n");
+   }
+}
+
+
+
+
+#else
+
+void force_init_prof( void )
+{
+}
+
+#endif
Index: xc/lib/GL/lowpc.c
diff -u /dev/null xc/lib/GL/lowpc.c:1.1
--- /dev/null	Sat Jul  1 20:44:31 2000
+++ xc/lib/GL/lowpc.c	Fri Jun 16 17:02:47 2000
@@ -0,0 +1,4 @@
+/*
+ * This is the lowest address in Mesa
+ */
+void glx_lowpc(void) { }
Index: xc/lib/GL/makeprofile.sh
diff -u /dev/null xc/lib/GL/makeprofile.sh:1.1
--- /dev/null	Sat Jul  1 20:44:31 2000
+++ xc/lib/GL/makeprofile.sh	Fri Jun 16 17:02:47 2000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+RUNDIR=$1
+
+[ -f ${RUNDIR}/glx_lowpc ] || { echo "no file ${RUNDIR}/glx_lowpc" ; exit 1 } 
+[ -f ${RUNDIR}/gmon.out ] || { echo "no file ${RUNDIR}/gmon.out" ; exit 1 }
+
+rm -f glx_lowpc gmon.out glxsyms profile
+ln -s ${RUNDIR}/glx_lowpc . || exit 1
+ln -s ${RUNDIR}/gmon.out . || exit 1
+
+ld -o glxsyms -noinhibit-exec --whole-archive -Ttext=`cat glx_lowpc` libGL.a 2> /dev/null && \
+gprof glxsyms < gmon.out > profile
Index: xc/lib/GL/dri/XF86dri.c
diff -u xc/lib/GL/dri/XF86dri.c:1.5 xc/lib/GL/dri/XF86dri.c:1.7
--- xc/lib/GL/dri/XF86dri.c:1.5	Tue Feb 22 20:46:33 2000
+++ xc/lib/GL/dri/XF86dri.c	Mon Jun 19 22:08:37 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.5 2000/02/23 04:46:33 martin Exp $ */
+/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.7 2000/06/20 05:08:37 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -183,8 +183,10 @@
 #endif
 
     if (rep.length) {
-        if (!(*busIdString = (char *)Xcalloc(rep.length + 1, 1))) {
+        if (!(*busIdString = (char *)Xcalloc(rep.busIdStringLength + 1, 1))) {
             _XEatData(dpy, ((rep.busIdStringLength+3) & ~3));
+            UnlockDisplay(dpy);
+            SyncHandle();
             return False;
         }
 	_XReadPad(dpy, *busIdString, rep.busIdStringLength);
@@ -203,6 +205,7 @@
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIAuthConnectionReq *req;
+    xXF86DRIAuthConnectionReply rep;
 
     XF86DRICheckExtension (dpy, info, False);
 
@@ -212,6 +215,12 @@
     req->driReqType = X_XF86DRIAuthConnection;
     req->screen = screen;
     req->magic = magic;
+    rep.authenticated = 0;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse) || !rep.authenticated) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return False;
+    }
     UnlockDisplay(dpy);
     SyncHandle();
     return True;
@@ -267,7 +276,7 @@
     *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
 
     if (rep.length) {
-        if (!(*clientDriverName = (char *)Xcalloc(rep.length + 1, 1))) {
+        if (!(*clientDriverName = (char *)Xcalloc(rep.clientDriverNameLength + 1, 1))) {
             _XEatData(dpy, ((rep.clientDriverNameLength+3) & ~3));
             return False;
         }
@@ -384,7 +393,11 @@
 }
 
 Bool XF86DRIGetDrawableInfo(dpy, screen, drawable, 
-	index, stamp, X, Y, W, H, numClipRects, pClipRects)
+			    index, stamp, X, Y, W, H, 
+			    numClipRects, pClipRects,
+			    backX, backY, 
+			    numBackClipRects, pBackClipRects
+			    )
     Display* dpy;
     int screen;
     Drawable drawable;
@@ -396,10 +409,15 @@
     int* H;
     int* numClipRects;
     XF86DRIClipRectPtr* pClipRects;
+    int* backX;
+    int* backY;
+    int* numBackClipRects;
+    XF86DRIClipRectPtr*	pBackClipRects;    
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIGetDrawableInfoReply rep;
     xXF86DRIGetDrawableInfoReq *req;
+    int total_rects;
 
     XF86DRICheckExtension (dpy, info, False);
 
@@ -409,7 +427,9 @@
     req->driReqType = X_XF86DRIGetDrawableInfo;
     req->screen = screen;
     req->drawable = drawable;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+
+    if (!_XReply(dpy, (xReply *)&rep, 1, xFalse)) 
+    {
 	UnlockDisplay(dpy);
 	SyncHandle();
 	return False;
@@ -421,16 +441,41 @@
     *W = (int)rep.drawableWidth;
     *H = (int)rep.drawableHeight;
     *numClipRects = rep.numClipRects;
+    total_rects = *numClipRects;
 
-    if (rep.length) {
-        if (!(*pClipRects = (XF86DRIClipRectPtr)Xcalloc(rep.length, 1))) {
-            _XEatData(dpy, rep.length);
-            return False;
-        }
-	_XRead32(dpy, *pClipRects, rep.length);
+    *backX = rep.backX;
+    *backY = rep.backY;
+    *numBackClipRects = rep.numBackClipRects;
+    total_rects += *numBackClipRects;
+
+    if (rep.length != (SIZEOF(xXF86DRIGetDrawableInfoReply) - 
+		       SIZEOF(xGenericReply) + 
+		       total_rects * sizeof(XF86DRIClipRectRec))) {
+       _XEatData(dpy, rep.length);
+       return False;
+    }
+       
+
+    if (*numClipRects) {
+       int len = sizeof(XF86DRIClipRectRec) * (*numClipRects);
+
+       *pClipRects = (XF86DRIClipRectPtr)Xcalloc(len, 1);
+       if (*pClipRects) 
+	  _XRead32(dpy, *pClipRects, len);
     } else {
         *pClipRects = NULL;
     }
+
+    if (*numBackClipRects) {
+       int len = sizeof(XF86DRIClipRectRec) * (*numBackClipRects);
+
+       *pBackClipRects = (XF86DRIClipRectPtr)Xcalloc(len, 1);
+       if (*pBackClipRects) 
+	  _XRead32(dpy, *pBackClipRects, len);
+    } else {
+        *pBackClipRects = NULL;
+    }
+
     UnlockDisplay(dpy);
     SyncHandle();
     return True;
Index: xc/lib/GL/dri/dri_glx.c
diff -u xc/lib/GL/dri/dri_glx.c:1.3 xc/lib/GL/dri/dri_glx.c:1.5
--- xc/lib/GL/dri/dri_glx.c:1.3	Thu Mar  2 08:07:30 2000
+++ xc/lib/GL/dri/dri_glx.c	Fri Jun 16 17:02:48 2000
@@ -75,6 +75,15 @@
 }
 
 
+static void InfoMessage(const char *msg)
+{
+    const char *env = getenv("LIBGL_DEBUG");
+    if (env && strstr(env, "verbose")) {
+        fprintf(stderr, "libGL: %s\n", msg);
+    }
+}
+
+
 /*
  * We'll save a pointer to this function when we couldn't find a
  * direct rendering driver for a given screen.
@@ -91,7 +100,110 @@
 }
 
 
+
+/*
+ * Extract the ith directory path out of a colon-separated list of
+ * paths.
+ * Input:
+ *   index - index of path to extract (starting at zero)
+ *   paths - the colon-separated list of paths
+ *   dirLen - max length of result to store in <dir>
+ * Output:
+ *   dir - the extracted directory path, dir[0] will be zero when
+ *         extraction fails.
+ */
+static void ExtractDir(int index, const char *paths, int dirLen, char *dir)
+{
+   int i, len;
+   const char *start, *end;
+
+   /* find ith colon */
+   start = paths;
+   i = 0;
+   while (i < index) {
+      if (*start == ':') {
+         i++;
+         start++;
+      }
+      else if (*start == 0) {
+         /* end of string and couldn't find ith colon */
+         dir[0] = 0;
+         return;
+      }
+      else {
+         start++;
+      }
+   }
+
+   while (*start == ':')
+      start++;
+
+   /* find next colon, or end of string */
+   end = start + 1;
+   while (*end != ':' && *end != 0) {
+      end++;
+   }
+
+   /* copy string between <start> and <end> into result string */
+   len = end - start;
+   if (len > dirLen - 1)
+      len = dirLen - 1;
+   strncpy(dir, start, len);
+   dir[len] = 0;
+}
+
+
+
 /*
+ * Try to dlopen() the named driver.  This function adds the
+ * "_dri.so" suffix to the driver name and searches the
+ * directories specified by the LIBGL_DRIVERS_PATH env var
+ * in order to find the driver.
+ * Input:
+ *   driverName - a name like "tdfx", "i810", "mga", etc.
+ * Return:
+ *   handle from dlopen, or NULL if driver file not found.
+ */
+static void *OpenDriver(const char *driverName)
+{
+   char *libPaths = NULL;
+   int i;
+
+   if (geteuid() == getuid()) {
+      /* don't allow setuid apps to use LIBGL_DRIVERS_PATH */
+      libPaths = getenv("LIBGL_DRIVERS_PATH");
+      if (!libPaths)
+         libPaths = getenv("LIBGL_DRIVERS_DIR"); /* deprecated */
+   }
+   if (!libPaths)
+      libPaths = DEFAULT_DRIVER_DIR;
+
+   for (i = 0; ; i++) {
+      char libDir[1000], info[1000], realDriverName[100];
+      void *handle;
+      ExtractDir(i, libPaths, 1000, libDir);
+      if (!libDir[0])
+         return NULL;
+      sprintf(realDriverName, "%s/%s_dri.so", libDir, driverName);
+      sprintf(info, "trying %s", realDriverName);
+      InfoMessage(info);
+      handle = dlopen(realDriverName, RTLD_NOW | RTLD_GLOBAL);
+      if (handle) {
+         return handle;
+      }
+      else {
+         char message[1000];
+         snprintf(message, 1000, "dlopen failed: %s", dlerror());
+         ErrorMessage(message);
+      }
+   }
+
+   return NULL;
+}
+
+
+
+/*
  * Initialize two arrays:  an array of createScreen function pointers
  * and an array of dlopen library handles.  Arrays are indexed by
  * screen number.
@@ -112,15 +224,18 @@
         Bool b;
         int driverMajor, driverMinor, driverPatch;
         char *driverName = NULL;
+        void *handle;
 
         /* defaults */
         createFuncs[scrn] = DummyCreateScreen;
         libraryHandles[scrn] = NULL;
 
         if (!XF86DRIQueryDirectRenderingCapable(dpy, scrn, &directCapable)) {
+            ErrorMessage("XF86DRIQueryDirectRenderingCapable failed");
             continue;
         }
         if (!directCapable) {
+            ErrorMessage("XF86DRIQueryDirectRenderingCapable returned false");
             continue;
         }
 
@@ -138,46 +253,25 @@
 
 
         /*
-         * dlopen the driver module and save the pointer to its
+         * Open the driver module and save the pointer to its
          * __driCreateScreen function.
          */
-        {
-            char realDriverName[100];
-            void *handle;
-            CreateScreenFunc createScreenFunc;
-            char *libDir = NULL;
-
-            if (geteuid() == getuid()) {
-                /* don't allow setuid apps to use LIBGL_DRIVERS_DIR */
-                libDir = getenv("LIBGL_DRIVERS_DIR");
-            }
-            if (!libDir)
-                libDir = DEFAULT_DRIVER_DIR;
-
-            sprintf(realDriverName, "%s/%s_dri.so", libDir, driverName);
-            /*printf("OPEN %s\n", realDriverName);*/
-            handle = dlopen(realDriverName, RTLD_LAZY);
-            if (!handle) {
-                char message[1000];
-                snprintf(message, 1000, "dlopen failed: %s", dlerror());
-                ErrorMessage(message);
-                continue;
-            }
-
-            createScreenFunc = (CreateScreenFunc) dlsym(handle, "__driCreateScreen");
-            if (createScreenFunc) {
-                /* success! */
-                createFuncs[scrn] = createScreenFunc;
-                libraryHandles[scrn] = handle;
-            }
-            else {
-                char message[1000];
-                snprintf(message, 1000, "driCreateScreen() not defined in %s", realDriverName);
-                ErrorMessage(message);
-                dlclose(handle);
-            }
+        handle = OpenDriver(driverName);
+        if (handle) {
+           CreateScreenFunc createScreenFunc;
+           createScreenFunc = (CreateScreenFunc) dlsym(handle, "__driCreateScreen");
+           if (createScreenFunc) {
+              /* success! */
+              createFuncs[scrn] = createScreenFunc;
+              libraryHandles[scrn] = handle;
+              break;  /* onto the next screen */
+           }
+           else {
+              ErrorMessage("driCreateScreen() not defined in driver!");
+              dlclose(handle);
+           }
         }
-    }
+    } /* for scrn */
 }
 
 #endif /* BUILT_IN_DRI_DRIVER */
@@ -220,9 +314,9 @@
 	return NULL;
     }
 
-    pdpyp->major = major;
-    pdpyp->minor = minor;
-    pdpyp->patch = patch;
+    pdpyp->driMajor = major;
+    pdpyp->driMinor = minor;
+    pdpyp->driPatch = patch;
 
     pdisp->destroyDisplay = driDestroyDisplay;
 
@@ -269,6 +363,7 @@
    int driMajor, driMinor, driPatch;
    int driverMajor, driverMinor, driverPatch;
    char *driverName = NULL;
+   void *handle;
 
    /*
     * Check if the DRI extension is available, check the DRI version,
@@ -312,29 +407,16 @@
     * dlopen() the driver library file, get a pointer to the driver's
     * __driRegisterExtensions() function, and call it if it exists.
     */
-   {
-      char realDriverName[100];
-      char *libDir = NULL;
-      void *handle;
-
-      if (geteuid() == getuid()) {
-         /* don't allow setuid apps to use LIBGL_DRIVERS_DIR */
-         libDir = getenv("LIBGL_DRIVERS_DIR");
-      }
-      if (!libDir)
-         libDir = DEFAULT_DRIVER_DIR;
-
-      sprintf(realDriverName, "%s/%s_dri.so", libDir, driverName);
-      /*printf("OPEN %s\n", realDriverName);*/
-      handle = dlopen(realDriverName, RTLD_LAZY);
-      if (handle) {
-         typedef void *(*RegisterExtFunc)(void);
-         RegisterExtFunc registerExtFunc = (RegisterExtFunc) dlsym(handle, "__driRegisterExtensions");
-         if (registerExtFunc) {
-            (*registerExtFunc)();
-         }
-         dlclose(handle);
+   handle = OpenDriver(driverName);
+   if (handle) {
+      typedef void *(*RegisterExtFunc)(void);
+      RegisterExtFunc registerExtFunc = (RegisterExtFunc) dlsym(handle,
+                                                    "__driRegisterExtensions");
+      if (registerExtFunc) {
+         (*registerExtFunc)();
       }
+      dlclose(handle);
+      return;
    }
 }
 #endif /* !BUILT_IN_DRI_DRIVER */
@@ -358,12 +440,14 @@
    if (alreadyCalled)
       return;
 
-#ifdef BUILT_IN_DRI_DRIVER
-   __driRegisterExtensions();
-#else
+#ifndef BUILT_IN_DRI_DRIVER
    {
-      int displayNum;
-      for (displayNum = 0; ; displayNum++) {
+      int displayNum, maxDisplays;
+      if (getenv("LIBGL_MULTIHEAD"))
+          maxDisplays = 10;  /* infinity, really */
+      else
+          maxDisplays = 1;
+      for (displayNum = 0; displayNum < maxDisplays; displayNum++) {
          char displayName[200];
          Display *dpy;
          snprintf(displayName, 199, ":%d.0", displayNum);
@@ -381,13 +465,10 @@
          }
       }
    }
-#endif
 
    alreadyCalled = GL_TRUE;
+#endif
 }
 
 
 #endif /* GLX_DIRECT_RENDERING */
-
-
-
Index: xc/lib/GL/dri/dri_glx.h
diff -u xc/lib/GL/dri/dri_glx.h:1.1 xc/lib/GL/dri/dri_glx.h:1.2
--- xc/lib/GL/dri/dri_glx.h:1.1	Tue Feb  8 09:18:26 2000
+++ xc/lib/GL/dri/dri_glx.h	Fri Jun 16 17:02:48 2000
@@ -41,9 +41,9 @@
     /*
     ** XFree86-DRI version information
     */
-    int major;
-    int minor;
-    int patch;
+    int driMajor;
+    int driMinor;
+    int driPatch;
 
     /*
     ** Array of library handles [indexed by screen number]
Index: xc/lib/GL/dri/xf86dri.h
diff -u xc/lib/GL/dri/xf86dri.h:1.5 xc/lib/GL/dri/xf86dri.h:1.6
--- xc/lib/GL/dri/xf86dri.h:1.5	Tue Feb 22 20:46:34 2000
+++ xc/lib/GL/dri/xf86dri.h	Fri Jun 16 17:02:48 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.5 2000/02/23 04:46:34 martin Exp $ */
+/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.6 2000/06/17 00:02:48 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -59,6 +59,8 @@
 #define XF86DRIOperationNotSupported	1
 #define XF86DRINumberErrors		(XF86DRIOperationNotSupported + 1)
 
+/* Warning : Do not change XF86DRIClipRect without changing the kernel 
+ * structure! */
 typedef struct _XF86DRIClipRect {
     unsigned short	x1; /* Upper left: inclusive */
     unsigned short	y1;
@@ -177,7 +179,11 @@
     int*		/* W */,
     int*		/* H */,
     int*		/* numClipRects */,
-    XF86DRIClipRectPtr*	/* pClipRects */
+    XF86DRIClipRectPtr*,/* pClipRects */
+    int*		/* backX */,
+    int*		/* backY */,
+    int*		/* numBackClipRects */,
+    XF86DRIClipRectPtr*	/* pBackClipRects */    
 #endif
 );
 
Index: xc/lib/GL/dri/xf86dristr.h
diff -u xc/lib/GL/dri/xf86dristr.h:1.5 xc/lib/GL/dri/xf86dristr.h:1.6
--- xc/lib/GL/dri/xf86dristr.h:1.5	Tue Feb 22 20:46:34 2000
+++ xc/lib/GL/dri/xf86dristr.h	Fri Jun 16 17:02:48 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.5 2000/02/23 04:46:34 martin Exp $ */
+/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.6 2000/06/17 00:02:48 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -40,7 +40,7 @@
 
 #define XF86DRINAME "XFree86-DRI"
 
-#define XF86DRI_MAJOR_VERSION	1	/* current version numbers */
+#define XF86DRI_MAJOR_VERSION	3	/* current version numbers */
 #define XF86DRI_MINOR_VERSION	0
 #define XF86DRI_PATCH_VERSION	0
 
@@ -122,6 +122,20 @@
 } xXF86DRIAuthConnectionReq;
 #define sz_xXF86DRIAuthConnectionReq	12
 
+typedef struct {
+    BYTE        type;
+    BOOL        pad1;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD32      authenticated B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+    CARD32      pad6 B32;
+} xXF86DRIAuthConnectionReply;
+#define zx_xXF86DRIAuthConnectionReply  32
+
 typedef struct _XF86DRICloseConnection {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRICloseConnection */
@@ -238,9 +252,13 @@
     INT16	drawableWidth B16;
     INT16	drawableHeight B16;
     CARD32	numClipRects B32;
-    CARD32	pad6 B32;
+    INT16       backX B16;
+    INT16       backY B16;
+    CARD32      numBackClipRects B32;
 } xXF86DRIGetDrawableInfoReply;
-#define sz_xXF86DRIGetDrawableInfoReply	32
+
+#define sz_xXF86DRIGetDrawableInfoReply	36
+
 
 typedef struct _XF86DRIGetDeviceInfo {
     CARD8	reqType;		/* always DRIReqCode */
Index: xc/lib/GL/dri/drm/Imakefile
diff -u xc/lib/GL/dri/drm/Imakefile:1.4 xc/lib/GL/dri/drm/Imakefile:1.6
--- xc/lib/GL/dri/drm/Imakefile:1.4	Tue Feb 22 20:46:35 2000
+++ xc/lib/GL/dri/drm/Imakefile	Fri Jun 30 10:15:07 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/dri/drm/Imakefile,v 1.4 2000/02/23 04:46:35 martin Exp $
+XCOMM $XFree86: xc/lib/GL/dri/drm/Imakefile,v 1.6 2000/06/30 17:15:07 dawes Exp $
 
 #define DoNormalLib NormalLibGlx
 #define DoSharedLib SharedLibGlx
@@ -12,12 +12,17 @@
 
       DEFINES = $(ALLOC_DEFINES)
      INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I.
-         SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
-         OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
+         SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
+		xf86drmR128.c
+         OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o \
+		xf86drmR128.o
 
 #if defined(LinuxArchitecture)
 OS_SUBDIR = linux
 #endif
+#if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture)
+OS_SUBDIR = bsd
+#endif
 
 LinkSourceFile(xf86drm.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm)
 LinkSourceFile(xf86drmHash.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm)
@@ -25,6 +30,11 @@
 LinkSourceFile(xf86drmSL.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm)
 LinkSourceFile(xf86drm.h,$(XF86OSSRC))
 LinkSourceFile(drm.h,$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel)
+LinkSourceFile(mga_drm.h,$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel)
+LinkSourceFile(i810_drm.h,$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel)
+LinkSourceFile(xf86drmR128.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm)
+LinkSourceFile(xf86drmR128.h,$(XF86OSSRC))
+LinkSourceFile(r128_drm.h,$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel)
 
 #include <Library.tmpl>
 
Index: xc/lib/GL/glx/Imakefile
diff -u xc/lib/GL/glx/Imakefile:1.8 xc/lib/GL/glx/Imakefile:1.10
--- xc/lib/GL/glx/Imakefile:1.8	Tue Feb 15 11:19:17 2000
+++ xc/lib/GL/glx/Imakefile	Fri Jun 30 10:15:07 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.8 2000/02/15 19:19:17 dawes Exp $
+XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.10 2000/06/30 17:15:07 dawes Exp $
 XCOMM The contents of this file are subject to the GLX Public License Version 1.0
 XCOMM (the "License"). You may not use this file except in compliance with the
 XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc.,
@@ -90,8 +90,9 @@
 		vertarr.o \
 	        xfont.o
 
-#if BuildXF86DRI
      GLX_DEFS = GlxDefines
+
+#if BuildXF86DRI
      DRI_INCS = -I../dri
 #if defined(i386Architecture)
      ASM_SRCS = glapi_x86.S
@@ -114,6 +115,10 @@
 #include <Library.tmpl>
 
 LibraryObjectRule()
+
+#if BuildXF86DRI && defined(i386Architecture)
+ObjectFromAsmSource(glapi_x86, NullParameter)
+#endif
 
 SubdirLibraryRule($(OBJS))
 NormalLintTarget($(SRCS))
Index: xc/lib/GL/glx/glxcmds.c
diff -u xc/lib/GL/glx/glxcmds.c:1.8 xc/lib/GL/glx/glxcmds.c:1.11
--- xc/lib/GL/glx/glxcmds.c:1.8	Thu Mar  2 08:07:32 2000
+++ xc/lib/GL/glx/glxcmds.c	Sat Jul  1 08:23:10 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.8 2000/03/02 16:07:32 martin Exp $ */
+/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.11 2000/07/01 15:23:10 martin Exp $ */
 /*
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
@@ -49,7 +49,8 @@
 static const char GLXClientExtensions[] = 
 		    "GLX_EXT_visual_info "
 		    "GLX_EXT_visual_rating "
-		    "GLX_EXT_import_context ";
+		    "GLX_EXT_import_context "
+		    "GLX_ARB_get_proc_address ";
 
 /*
 ** Create a new context.
@@ -220,21 +221,24 @@
     xid = gc->xid;
     imported = gc->imported;
     gc->xid = None;
+
+#ifdef GLX_DIRECT_RENDERING
+    /* Destroy the direct rendering context */
+    if (gc->isDirect) {
+	if (gc->driContext.private) {
+	    (*gc->driContext.destroyContext)(dpy, gc->screen,
+					     gc->driContext.private);
+	    gc->driContext.private = NULL;
+	}
+    }
+#endif
+
     if (gc->currentDpy) {
 	/* Have to free later cuz it's in use now */
 	__glXUnlock();
     } else {
 	/* Destroy the handle if not current to anybody */
 	__glXUnlock();
-#ifdef GLX_DIRECT_RENDERING
-	/* Destroy the direct rendering context */
-	if (gc->isDirect) {
-	    if (gc->driContext.private) {
-		(*gc->driContext.destroyContext)(dpy, gc->screen,
-						 gc->driContext.private);
-	    }
-	}
-#endif
 	__glXFreeContext(gc);
     }
 
@@ -1191,7 +1195,7 @@
 	s1 = (char *) malloc( slen + 2 ); strcpy( s1, sext_string );
         s2 = cext_string;
    } else {
-        combo_string = (char *) malloc( clen + 2 );
+        combo_string = (char *) Xmalloc( clen + 2 );
 	s1 = (char *) Xmalloc( clen + 2 ); strcpy( s1, cext_string);
         s2 = sext_string;
    }
@@ -1498,7 +1502,7 @@
  * GLX 1.3 functions - these are just stubs for now!
  */
 
-GLXFBConfig glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems)
+GLXFBConfig *glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems)
 {
     (void) dpy;
     (void) screen;
@@ -1575,6 +1579,15 @@
 }
 
 
+GLXFBConfig *glXGetFBConfigs(Display *dpy, int screen, int *nelements)
+{
+   (void) dpy;
+   (void) screen;
+   (void) nelements;
+   return 0;
+}
+
+
 int glXGetFBConfigAttrib(Display *dpy, GLXFBConfig config, int attribute, int *value)
 {
     (void) dpy;
@@ -1640,6 +1653,48 @@
 
 
 /*
+** Mesa extension stubs.  These will help reduce portability problems.
+*/
+
+void glXReleaseBuffersMESA( Display *dpy, GLXDrawable d )
+{
+   (void) dpy;
+   (void) d;
+   /* no-op stub */
+}
+
+
+GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
+                                  Pixmap pixmap, Colormap cmap )
+{
+   (void) dpy;
+   (void) visual;
+   (void) pixmap;
+   (void) cmap;
+   return 0;
+}
+
+
+void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
+                           int x, int y, int width, int height )
+{
+   (void) dpy;
+   (void) drawable;
+   (void) x;
+   (void) y;
+   (void) width;
+   (void) height;
+}
+
+
+GLboolean glXSet3DfxModeMESA( GLint mode )
+{
+   (void) mode;
+   return GL_FALSE;
+}
+
+
+/*
 ** glXGetProcAddress support
 */
 
@@ -1683,6 +1738,7 @@
    { "glXDestroyWindow", (GLvoid *) glXDestroyWindow },
    { "glXGetCurrentReadDrawable", (GLvoid *) glXGetCurrentReadDrawable },
    { "glXGetFBConfigAttrib", (GLvoid *) glXGetFBConfigAttrib },
+   { "glXGetFBConfigs", (GLvoid *) glXGetFBConfigs },
    { "glXGetSelectedEvent", (GLvoid *) glXGetSelectedEvent },
    { "glXGetVisualFromFBConfig", (GLvoid *) glXGetVisualFromFBConfig },
    { "glXMakeContextCurrent", (GLvoid *) glXMakeContextCurrent },
@@ -1697,6 +1753,12 @@
    { "glXFreeContextEXT", (GLvoid *) glXFreeContextEXT },
    { "glXQueryContextInfoEXT", (GLvoid *) glXQueryContextInfoEXT },
    { "glXGetProcAddressARB", (GLvoid *) glXGetProcAddressARB },
+
+   /* Mesa extensions */
+   { "glXReleaseBuffersMESA", (GLvoid *) glXReleaseBuffersMESA },
+   { "glXCreateGLXPixmapMESA", (GLvoid *) glXCreateGLXPixmapMESA },
+   { "glXCopySubBufferMESA", (GLvoid *) glXCopySubBufferMESA },
+   { "glXSet3DfxModeMESA", (GLvoid *) glXSet3DfxModeMESA },
 
    { NULL, NULL }   /* end of list */
 };
Index: xc/lib/GL/glx/xfont.c
diff -u xc/lib/GL/glx/xfont.c:1.3 xc/lib/GL/glx/xfont.c:1.4
--- xc/lib/GL/glx/xfont.c:1.3	Wed Feb 23 12:29:32 2000
+++ xc/lib/GL/glx/xfont.c	Fri Jun 16 17:02:50 2000
@@ -360,7 +360,7 @@
       glEndList ();
     }
 
-  free (bm);
+  Xfree(bm);
   XFreeFontInfo( NULL, fs, 0 );
   XFreeGC (dpy, gc);
 
Index: xc/lib/GL/mesa/dri/dri_mesa.c
diff -u xc/lib/GL/mesa/dri/dri_mesa.c:1.6 xc/lib/GL/mesa/dri/dri_mesa.c:1.8
--- xc/lib/GL/mesa/dri/dri_mesa.c:1.6	Thu Mar  2 08:07:33 2000
+++ xc/lib/GL/mesa/dri/dri_mesa.c	Sun Jun 25 22:41:29 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.c,v 1.6 2000/03/02 16:07:33 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.c,v 1.8 2000/06/26 05:41:29 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,7 +29,7 @@
 /*
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
- *   Brian Paul <brian@precisioninsight.com>
+ *   Brian E. Paul <brian@precisioninsight.com>
  */
 
 #ifdef GLX_DIRECT_RENDERING
@@ -39,18 +39,14 @@
 #include <Xext.h>
 #include <extutil.h>
 #include "glxclient.h"
-#include "GL/xmesa.h"
 #include "xf86dri.h"
 #include "sarea.h"
 #include "dri_mesaint.h"
 #include "dri_xmesaapi.h"
+#include "../src/context.h"
+#include "../src/mmath.h"
 
 
-#if XMESA_MAJOR_VERSION != 3 || XMESA_MINOR_VERSION != 3
-#error using wrong version of Mesa (need 3.3)
-#endif
-
-
 /* Context binding */
 static Bool driMesaBindContext(Display *dpy, int scrn,
 			       GLXDrawable draw, GLXContext gc);
@@ -75,6 +71,19 @@
 static void driMesaDestroyScreen(Display *dpy, int scrn, void *private);
 
 
+
+/*
+** Print message to stderr if LIBGL_DEBUG env var is set.
+*/
+void
+__driMesaMessage(const char *msg)
+{
+    if (getenv("LIBGL_DEBUG")) {
+        fprintf(stderr, "libGL error: %s\n", msg);
+    }
+}
+
+
 /*****************************************************************/
 
 /* Maintain a list of drawables */
@@ -125,20 +134,18 @@
 
 /*****************************************************************/
 
-static void driMesaInitAPI(__XMESAapi *XMesaAPI)
+static void driMesaInitAPI(__MesaAPI *MesaAPI)
 {
-    XMesaAPI->InitDriver = XMesaInitDriver;
-    XMesaAPI->ResetDriver = XMesaResetDriver;
-    XMesaAPI->CreateVisual = XMesaCreateVisual;
-    XMesaAPI->DestroyVisual = XMesaDestroyVisual;
-    XMesaAPI->CreateContext = XMesaCreateContext;
-    XMesaAPI->DestroyContext = XMesaDestroyContext;
-    XMesaAPI->CreateWindowBuffer = XMesaCreateWindowBuffer;
-    XMesaAPI->CreatePixmapBuffer = XMesaCreatePixmapBuffer;
-    XMesaAPI->DestroyBuffer = XMesaDestroyBuffer;
-    XMesaAPI->SwapBuffers = XMesaSwapBuffers;
-    XMesaAPI->MakeCurrent = XMesaMakeCurrent;
-    XMesaAPI->UnbindContext = XMesaUnbindContext;
+    MesaAPI->InitDriver = XMesaInitDriver;
+    MesaAPI->ResetDriver = XMesaResetDriver;
+    MesaAPI->CreateVisual = XMesaCreateVisual;
+    MesaAPI->CreateContext = XMesaCreateContext;
+    MesaAPI->DestroyContext = XMesaDestroyContext;
+    MesaAPI->CreateWindowBuffer = XMesaCreateWindowBuffer;
+    MesaAPI->CreatePixmapBuffer = XMesaCreatePixmapBuffer;
+    MesaAPI->SwapBuffers = XMesaSwapBuffers;
+    MesaAPI->MakeCurrent = XMesaMakeCurrent;
+    MesaAPI->UnbindContext = XMesaUnbindContext;
 }
 
 /*****************************************************************/
@@ -176,7 +183,7 @@
     }
 
     /* Unbind Mesa's drawable from Mesa's context */
-    (*psp->XMesaAPI.UnbindContext)(pcp->xm_ctx);
+    (*psp->MesaAPI.UnbindContext)(pcp);
 
     if (pdp->refcount == 0) {
 	/* ERROR!!! */
@@ -279,7 +286,7 @@
     }
 
     /* Bind Mesa's drawable to Mesa's context */
-    (*psp->XMesaAPI.MakeCurrent)(pcp->xm_ctx, pdp->xm_buf);
+    (*psp->MesaAPI.MakeCurrent)(pcp, pdp, pdp);
 
     return GL_TRUE;
 }
@@ -307,14 +314,26 @@
 	Xfree(pdp->pClipRects); 
     }
 
+    if (pdp->pBackClipRects) {
+	Xfree(pdp->pBackClipRects); 
+    }
+
+
     DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);
 
     if (!XF86DRIGetDrawableInfo(dpy, scrn, pdp->draw,
 				&pdp->index, &pdp->lastStamp,
 				&pdp->x, &pdp->y, &pdp->w, &pdp->h,
-				&pdp->numClipRects, &pdp->pClipRects)) {
+				&pdp->numClipRects, &pdp->pClipRects,
+				&pdp->backX,
+				&pdp->backY,
+				&pdp->numBackClipRects,
+				&pdp->pBackClipRects
+                                )) {
 	pdp->numClipRects = 0;
 	pdp->pClipRects = NULL;
+	pdp->numBackClipRects = 0;
+	pdp->pBackClipRects = 0;
 	/* ERROR!!! */
     }
 
@@ -332,7 +351,7 @@
     __DRIscreenPrivate *psp;
     __DRIdrawablePrivate *pdp;
     int i;
-    XMesaVisual xm_vis = NULL;
+    GLvisual *mesaVis = NULL;
 
     pdp = (__DRIdrawablePrivate *)Xmalloc(sizeof(__DRIdrawablePrivate));
     if (!pdp) {
@@ -354,7 +373,9 @@
     pdp->w = 0;
     pdp->h = 0;
     pdp->numClipRects = 0;
+    pdp->numBackClipRects = 0;
     pdp->pClipRects = NULL;
+    pdp->pBackClipRects = NULL;
 
     pDRIScreen = __glXFindDRIScreen(dpy, scrn);
     pdp->driScreenPriv = psp = (__DRIscreenPrivate *)pDRIScreen->private;
@@ -363,20 +384,19 @@
 
     for (i = 0; i < psp->numVisuals; i++) {
 	if (vid == psp->visuals[i].vid) {
-	    xm_vis = psp->visuals[i].xm_vis;
+	    mesaVis = psp->visuals[i].mesaVisual;
 	    break;
 	}
     }
 
-    if (1 /* NOT_DONE: Determine if it is a pixmap or not */) {
-	pdp->xm_buf = (*psp->XMesaAPI.CreateWindowBuffer)(xm_vis, draw, pdp);
-    } else {
-	XMesaVisual xm_vis = NULL;
-	XMesaColormap cmap = 0;
-	pdp->xm_buf = (*psp->XMesaAPI.CreatePixmapBuffer)(xm_vis, draw, cmap,
-							  pdp);
+    /* XXX pixmap rendering not implemented yet */
+    if (1) {
+       pdp->mesaBuffer = (*psp->MesaAPI.CreateWindowBuffer)(dpy, psp, pdp, mesaVis);
+    }
+    else {
+       pdp->mesaBuffer = (*psp->MesaAPI.CreatePixmapBuffer)(dpy, psp, pdp, mesaVis);
     }
-    if (!pdp->xm_buf) {
+    if (!pdp->mesaBuffer) {
 	(void)XF86DRIDestroyDrawable(dpy, scrn, pdp->draw);
 	Xfree(pdp);
 	return NULL;
@@ -402,7 +422,7 @@
     __DRIdrawablePrivate *pdp = (__DRIdrawablePrivate *)private;
     __DRIscreenPrivate *psp = pdp->driScreenPriv;
 
-    (*psp->XMesaAPI.SwapBuffers)(pdp->xm_buf);
+    (*psp->MesaAPI.SwapBuffers)(pdp);
 }
 
 static void driMesaDestroyDrawable(Display *dpy, void *private)
@@ -412,7 +432,7 @@
     int scrn = psp->myNum;
 
     if (pdp) {
-	(*psp->XMesaAPI.DestroyBuffer)(pdp->xm_buf);
+        gl_destroy_framebuffer(pdp->mesaBuffer);
 	(void)XF86DRIDestroyDrawable(dpy, scrn, pdp->draw);
 	if (pdp->pClipRects)
 	    Xfree(pdp->pClipRects);
@@ -427,8 +447,6 @@
 {
     __DRIcontextPrivate *pcp;
     __DRIcontextPrivate *pshare = (__DRIcontextPrivate *)shared;
-    XMesaContext shared_xm_ctx = (pshare ?
-				  pshare->xm_ctx : (XMesaContext)NULL);
     __DRIscreenPrivate *psp;
     __DRIscreen *pDRIScreen;
     int i;
@@ -443,7 +461,7 @@
 	    return NULL;
 	}
 	psp->dummyContextPriv.driScreenPriv = psp;
-	psp->dummyContextPriv.xm_ctx = NULL;
+	psp->dummyContextPriv.mesaContext = NULL;
 	psp->dummyContextPriv.driDrawablePriv = NULL;
 	/* No other fields should be used! */
     }
@@ -453,8 +471,9 @@
 	return NULL;
     }
 
+    pcp->display = dpy;
     pcp->driScreenPriv = psp;
-    pcp->xm_ctx = NULL;
+    pcp->mesaContext = NULL;
     pcp->driDrawablePriv = NULL;
 
     if (!XF86DRICreateContext(dpy, vis->screen, vis->visual,
@@ -463,12 +482,28 @@
 	return NULL;
     }
 
-    for (i = 0; i < psp->numVisuals; i++)
-	if (psp->visuals[i].vid == vis->visualid)
-	    pcp->xm_ctx = (*psp->XMesaAPI.CreateContext)
-		(psp->visuals[i].xm_vis, shared_xm_ctx, pcp);
+    for (i = 0; i < psp->numVisuals; i++) {
+        if (psp->visuals[i].vid == vis->visualid) {
+            GLvisual *mesaVis = psp->visuals[i].mesaVisual;
+            GLcontext *sharedMesaCtx = pshare ? pshare->mesaContext : NULL;
+            pcp->mesaContext = gl_create_context(mesaVis,
+                                                 sharedMesaCtx,
+                                                 NULL, /* set below */
+                                                 GL_TRUE);
+            if (pcp->mesaContext) {
+                /* Driver now creates its private context data */
+                if ((*psp->MesaAPI.CreateContext)(dpy, mesaVis, pcp)) {
+                    pcp->mesaContext->DriverCtx = pcp->driverPrivate;
+                }
+                else {
+                    gl_destroy_context(pcp->mesaContext);
+                    pcp->mesaContext = NULL;
+                }
+            }
+        }
+    }
 
-    if (!pcp->xm_ctx) {
+    if (!pcp->mesaContext) {
 	(void)XF86DRIDestroyContext(dpy, vis->screen, pcp->contextID);
 	Xfree(pcp);
 	return NULL;
@@ -483,11 +518,29 @@
 
 static void driMesaDestroyContext(Display *dpy, int scrn, void *private)
 {
-    __DRIcontextPrivate *pcp = (__DRIcontextPrivate *)private;
+    __DRIcontextPrivate  *pcp   = (__DRIcontextPrivate *)private;
+    __DRIdrawablePrivate *pdp;
+    __DRIdrawable        *pdraw;
 
     if (pcp) {
+	pdp = pcp->driDrawablePriv;
+	if (pdp) {
+	    /* Unbind Mesa's drawable from Mesa's context */
+	    (*pcp->driScreenPriv->MesaAPI.UnbindContext)(pcp);
+
+	    if (pdp->refcount == 1) {
+		/* If refcount is 1, then this is the last context to
+                   reference this drawable, so we can destroy the
+                   drawable and remove it from the hash table */
+		pdraw = __driMesaFindDrawable(pdp->draw);
+		(*pdraw->destroyDrawable)(dpy, pdraw->private);
+		__driMesaRemoveDrawable(pdraw);
+		Xfree(pdraw);
+	    }
+	}
 	(void)XF86DRIDestroyContext(dpy, scrn, pcp->contextID);
-	(*pcp->driScreenPriv->XMesaAPI.DestroyContext)(pcp->xm_ctx);
+	(*pcp->driScreenPriv->MesaAPI.DestroyContext)(pcp);
+        gl_destroy_context(pcp->mesaContext);
 	Xfree(pcp);
     }
 }
@@ -517,6 +570,7 @@
 	return NULL;
     }
 
+    psp->display = dpy;
     psp->myNum = scrn;
 
     if (!XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {
@@ -532,7 +586,7 @@
     psp->drawLockID = 1;
 
     psp->fd = drmOpen(NULL,BusID);
-    if (!psp->fd) {
+    if (psp->fd < 0) {
 	Xfree(BusID);
 	Xfree(psp);
 	(void)XF86DRICloseConnection(dpy, scrn);
@@ -547,6 +601,21 @@
 	return NULL;
     }
 
+    {
+        drmVersionPtr version = drmGetVersion(psp->fd);
+        if (version) {
+            psp->drmMajor = version->version_major;
+            psp->drmMinor = version->version_minor;
+            psp->drmPatch = version->version_patchlevel;
+            drmFreeVersion(version);
+        }
+        else {
+            psp->drmMajor = -1;
+            psp->drmMinor = -1;
+            psp->drmPatch = -1;
+        }
+    }
+
     if (!XF86DRIAuthConnection(dpy, scrn, magic)) {
 	(void)drmClose(psp->fd);
 	Xfree(psp);
@@ -555,9 +624,9 @@
     }
 
     if (!XF86DRIGetClientDriverName(dpy, scrn,
-				    &psp->major,
-				    &psp->minor,
-				    &psp->patch,
+				    &psp->ddxMajor,
+				    &psp->ddxMinor,
+				    &psp->ddxPatch,
 				    &driverName)) {
 	(void)drmClose(psp->fd);
 	Xfree(psp);
@@ -565,7 +634,7 @@
 	return NULL;
     }
 
-    driMesaInitAPI(&psp->XMesaAPI);
+    driMesaInitAPI(&psp->MesaAPI);
 
     if (!XF86DRIGetDeviceInfo(dpy, scrn,
 			      &hFB,
@@ -627,22 +696,13 @@
 
     for (i = 0; i < numConfigs; i++, config++) {
 	psp->visuals[i].vid = visinfo[i].visualid;
-	psp->visuals[i].xm_vis =
-	    (*psp->XMesaAPI.CreateVisual)(dpy,
-					  &visinfo[i],
-					  config->rgba,
-					  (config->alphaSize > 0),
-					  config->doubleBuffer,
-					  config->stereo,
-					  GL_TRUE, /* ximage_flag */
-					  config->depthSize,
-					  config->stencilSize,
-					  config->accumRedSize,
-					  config->level);
-	if (!psp->visuals[i].xm_vis) {
+        psp->visuals[i].mesaVisual =
+                 (*psp->MesaAPI.CreateVisual) (dpy, psp, &visinfo[i], config);
+
+	if (!psp->visuals[i].mesaVisual) {
 	    /* Free the visuals so far created */
 	    while (--i >= 0) {
-		(*psp->XMesaAPI.DestroyVisual)(psp->visuals[i].xm_vis);
+               _mesa_destroy_visual(psp->visuals[i].mesaVisual);
 	    }
 	    Xfree(psp->visuals);
 	    XFree(visinfo);
@@ -658,11 +718,10 @@
     XFree(visinfo);
 
     /* Initialize the screen specific GLX driver */
-    if (psp->XMesaAPI.InitDriver) {
-	if (!(*psp->XMesaAPI.InitDriver)(psp)) {
+    if (psp->MesaAPI.InitDriver) {
+	if (!(*psp->MesaAPI.InitDriver)(psp)) {
 	    while (--psp->numVisuals >= 0) {
-		(*psp->XMesaAPI.DestroyVisual)
-		    (psp->visuals[psp->numVisuals].xm_vis);
+               _mesa_destroy_visual(psp->visuals[psp->numVisuals].mesaVisual);
 	    }
 	    Xfree(psp->visuals);
 	    (void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX);
@@ -699,11 +758,10 @@
 	    (void)XF86DRIDestroyContext(dpy, scrn,
 					psp->dummyContextPriv.contextID);
 	}
-	if (psp->XMesaAPI.ResetDriver)
-	    (*psp->XMesaAPI.ResetDriver)(psp);
+	if (psp->MesaAPI.ResetDriver)
+	    (*psp->MesaAPI.ResetDriver)(psp);
 	while (--psp->numVisuals >= 0) {
-	    (*psp->XMesaAPI.DestroyVisual)
-		(psp->visuals[psp->numVisuals].xm_vis);
+           _mesa_destroy_visual(psp->visuals[psp->numVisuals].mesaVisual);
 	}
 	Xfree(psp->visuals);
 	(void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX);
Index: xc/lib/GL/mesa/dri/dri_mesa.h
diff -u xc/lib/GL/mesa/dri/dri_mesa.h:1.3 xc/lib/GL/mesa/dri/dri_mesa.h:1.4
--- xc/lib/GL/mesa/dri/dri_mesa.h:1.3	Thu Mar  2 08:07:33 2000
+++ xc/lib/GL/mesa/dri/dri_mesa.h	Fri Jun 16 17:02:50 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.h,v 1.3 2000/03/02 16:07:33 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.h,v 1.4 2000/06/17 00:02:50 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -43,5 +43,8 @@
 typedef struct __DRIcontextPrivateRec  __DRIcontextPrivate;
 typedef struct __DRIdrawablePrivateRec __DRIdrawablePrivate;
 
+extern void __driMesaMessage(const char *msg);
+
 #endif
+
 #endif /* _DRI_MESA_H_ */
Index: xc/lib/GL/mesa/dri/dri_mesaint.h
diff -u xc/lib/GL/mesa/dri/dri_mesaint.h:1.6 xc/lib/GL/mesa/dri/dri_mesaint.h:1.7
--- xc/lib/GL/mesa/dri/dri_mesaint.h:1.6	Tue Feb 22 20:46:38 2000
+++ xc/lib/GL/mesa/dri/dri_mesaint.h	Fri Jun 16 17:02:51 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/dri/dri_mesaint.h,v 1.6 2000/02/23 04:46:38 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/dri/dri_mesaint.h,v 1.7 2000/06/17 00:02:51 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,6 +29,7 @@
 /*
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Brian E. Paul <brian@precisioninsight.com>
  *
  */
 
@@ -40,10 +41,10 @@
 #include <GL/glx.h>
 #include "xf86dri.h"
 #include "sarea.h"
-#include "GL/xmesa.h"
 #include "dri_mesa.h"
 #include "dri_xmesaapi.h"
 
+
 #define DRI_MESA_VALIDATE_DRAWABLE_INFO(dpy,scrn,pDrawPriv)  \
     do {                                                     \
 	if (*(pDrawPriv->pStamp) != pDrawPriv->lastStamp) {  \
@@ -59,9 +60,9 @@
     drmDrawable hHWDrawable;
 
     /*
-    ** Mesa's private context information.  This structure is opaque.
+    ** Mesa's private frame buffer information.  This structure is opaque.
     */
-    XMesaBuffer xm_buf;
+    GLframebuffer *mesaBuffer;
 
     /*
     ** X's drawable ID associated with this private drawable.
@@ -104,6 +105,16 @@
     XF86DRIClipRectPtr pClipRects;
 
     /*
+    ** Information about the back and depthbuffer where different
+    ** from above.
+    */
+    int backX;
+    int backY;
+    int backClipRectType;
+    int numBackClipRects;
+    XF86DRIClipRectPtr pBackClipRects;
+
+    /*
     ** Pointer to context to which this drawable is currently bound.
     */
     __DRIcontextPrivate *driContextPriv;
@@ -128,9 +139,19 @@
     /*
     ** Mesa's private context information.  This structure is opaque.
     */
-    XMesaContext xm_ctx;
+    GLcontext *mesaContext;
 
     /*
+    ** Device driver's private context data.  This structure is opaque.
+    */
+    void *driverPrivate;
+
+    /*
+    ** This context's display pointer.
+    */
+    Display *display;
+
+    /*
     ** Pointer to drawable currently bound to this context.
     */
     __DRIdrawablePrivate *driDrawablePriv;
@@ -145,7 +166,7 @@
     /*
     ** Mesa's private visual information.  This structure is opaque.
     */
-    XMesaVisual xm_vis;
+    GLvisual *mesaVisual;
 
     /*
     ** X's visual ID associated with this private visual.
@@ -155,6 +176,11 @@
 
 struct __DRIscreenPrivateRec {
     /*
+    ** Display for this screen
+    */
+    Display *display;
+
+    /*
     ** Current screen's number
     */
     int myNum;
@@ -168,15 +194,22 @@
 
     /*
     ** Function pointers associated with Mesa's GLX functions.
+    */
+    __MesaAPI MesaAPI;
+
+    /*
+    ** DDX / 2D driver version information.
     */
-    __XMESAapi XMesaAPI;
+    int ddxMajor;
+    int ddxMinor;
+    int ddxPatch;
 
     /*
-    ** Core rendering library's driver version information.
+    ** DRM version information.
     */
-    int major;
-    int minor;
-    int patch;
+    int drmMajor;
+    int drmMinor;
+    int drmPatch;
 
     /*
     ** ID used when the client sets the drawable lock.  The X server
Index: xc/lib/GL/mesa/dri/dri_xmesaapi.h
diff -u xc/lib/GL/mesa/dri/dri_xmesaapi.h:1.3 xc/lib/GL/mesa/dri/dri_xmesaapi.h:1.4
--- xc/lib/GL/mesa/dri/dri_xmesaapi.h:1.3	Tue Feb 22 20:46:38 2000
+++ xc/lib/GL/mesa/dri/dri_xmesaapi.h	Fri Jun 16 17:02:51 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/dri/dri_xmesaapi.h,v 1.3 2000/02/23 04:46:38 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/dri/dri_xmesaapi.h,v 1.4 2000/06/17 00:02:51 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,48 +29,110 @@
 /*
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
- *
+ *   Brian E. Paul <brian@precisioninsight.com>
  */
 
+
 #ifndef _DRI_XMESAAPI_H_
 #define _DRI_XMESAAPI_H_
-
-#ifdef GLX_DIRECT_RENDERING
 
-#include "GL/xmesa.h"
+#include "glxclient.h"
 #include "dri_mesa.h"
+#include "../src/types.h"
+
+
+extern GLboolean XMesaInitDriver( __DRIscreenPrivate *driScrnPriv );
+
+extern void XMesaResetDriver( __DRIscreenPrivate *driScrnPriv );
+
+/* Driver creates a GLvisual and returns pointer to it.
+ */
+extern GLvisual *XMesaCreateVisual(Display *dpy,
+                                   __DRIscreenPrivate *driScrnPriv,
+                                   const XVisualInfo *visinfo,
+                                   const __GLXvisualConfig *config);
+
+/* Driver creates its private context struct and hooks it into
+ * the driContextPriv->driverPrivate field.  Return true/false for
+ * success/error.
+ */
+extern GLboolean XMesaCreateContext( Display *dpy, GLvisual *mesaVis,
+                                     __DRIcontextPrivate *driContextPriv );
+
+/* Driver frees data attached to driContextPriv->driverPrivate pointer.
+ */
+extern void XMesaDestroyContext( __DRIcontextPrivate *driContextPriv );
+
+/* Driver creates a GLframebuffer struct indicating which ancillary
+ * buffers are in hardware or software.
+ */
+extern GLframebuffer *XMesaCreateWindowBuffer( Display *dpy,
+                                           __DRIscreenPrivate *driScrnPriv,
+                                           __DRIdrawablePrivate *driDrawPriv,
+                                           GLvisual *mesaVis);
+
+extern GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy,
+                                           __DRIscreenPrivate *driScrnPriv,
+                                           __DRIdrawablePrivate *driDrawPriv,
+                                           GLvisual *mesaVis);
 
-typedef struct __XMESAapiRec __XMESAapi;
+extern GLboolean XMesaMakeCurrent( __DRIcontextPrivate *driContextPriv,
+                                   __DRIdrawablePrivate *driDrawPriv,
+                                   __DRIdrawablePrivate *driReadPriv );
 
-struct __XMESAapiRec {
+extern GLboolean XMesaUnbindContext( __DRIcontextPrivate *driContextPriv );
+
+extern void XMesaSwapBuffers( __DRIdrawablePrivate *driDrawPriv );
+
+
+
+
+
+#define XMESA_VALIDATE_DRAWABLE_INFO(dpy, psp, pdp)                     \
+do {                                                                    \
+    while (*(pdp->pStamp) != pdp->lastStamp) {                          \
+	DRM_UNLOCK(psp->fd, &psp->pSAREA->lock,                         \
+		   pdp->driContextPriv->hHWContext);                    \
+                                                                        \
+	DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);     \
+	DRI_MESA_VALIDATE_DRAWABLE_INFO(dpy, psp->myNum, pdp);          \
+	DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);   \
+                                                                        \
+	DRM_LIGHT_LOCK(psp->fd, &psp->pSAREA->lock,                     \
+		       pdp->driContextPriv->hHWContext);                \
+    }                                                                   \
+} while (0)
+
+
+
+typedef struct __MesaAPIRec __MesaAPI;
+
+struct __MesaAPIRec {
     /* XMESA Functions */
     GLboolean    (*InitDriver)(__DRIscreenPrivate *driScrnPriv);
     void         (*ResetDriver)(__DRIscreenPrivate *driScrnPriv);
-    XMesaVisual  (*CreateVisual)(XMesaDisplay *display,
-				 XMesaVisualInfo visinfo,
-				 GLboolean rgb_flag,
-				 GLboolean alpha_flag,
-				 GLboolean db_flag,
-				 GLboolean stereo_flag,
-				 GLboolean ximage_flag,
-				 GLint depth_size,
-				 GLint stencil_size,
-				 GLint accum_size,
-				 GLint level);
-    void         (*DestroyVisual)(XMesaVisual v);
-    XMesaContext (*CreateContext)(XMesaVisual v, XMesaContext share_list,
-				  __DRIcontextPrivate *driContextPriv);
-    void         (*DestroyContext)(XMesaContext c);
-    XMesaBuffer  (*CreateWindowBuffer)(XMesaVisual v, XMesaWindow w,
-				       __DRIdrawablePrivate *driDrawPriv);
-    XMesaBuffer  (*CreatePixmapBuffer)(XMesaVisual v, XMesaPixmap p,
-				       XMesaColormap c,
-				       __DRIdrawablePrivate *driDrawPriv);
-    void         (*DestroyBuffer)(XMesaBuffer b);
-    void         (*SwapBuffers)(XMesaBuffer b);
-    GLboolean    (*MakeCurrent)(XMesaContext c, XMesaBuffer b);
-    GLboolean    (*UnbindContext)(XMesaContext c);
+    GLvisual *   (*CreateVisual)(Display *display,
+                                 __DRIscreenPrivate *driScrnPriv,
+                                 const XVisualInfo *visinfo,
+                                 const __GLXvisualConfig *config);
+    GLboolean    (*CreateContext)(Display *dpy, GLvisual *mesaVis,
+                                  __DRIcontextPrivate *driContextPriv);
+    void         (*DestroyContext)(__DRIcontextPrivate *driContextPriv);
+    GLframebuffer * (*CreateWindowBuffer)(Display *dpy,
+                                          __DRIscreenPrivate *driScrnPriv,
+                                          __DRIdrawablePrivate *driDrawPriv,
+                                          GLvisual *mesaVis);
+    GLframebuffer * (*CreatePixmapBuffer)(Display *dpy,
+                                          __DRIscreenPrivate *driScrnPriv,
+                                          __DRIdrawablePrivate *driDrawPriv,
+                                          GLvisual *mesaVis);
+    void         (*SwapBuffers)(__DRIdrawablePrivate *driDrawPriv);
+    GLboolean    (*MakeCurrent)(__DRIcontextPrivate *driContextPriv,
+                                __DRIdrawablePrivate *driDrawPriv,
+                                __DRIdrawablePrivate *driReadPriv);
+    GLboolean    (*UnbindContext)(__DRIcontextPrivate *driContextPriv);
 };
+
+
 
-#endif
 #endif /* _DRI_XMESAAPI_H_ */
Index: xc/lib/GL/mesa/include/GL/Imakefile
diff -u xc/lib/GL/mesa/include/GL/Imakefile:1.3 xc/lib/GL/mesa/include/GL/Imakefile:1.5
--- xc/lib/GL/mesa/include/GL/Imakefile:1.3	Thu Mar  2 08:07:33 2000
+++ xc/lib/GL/mesa/include/GL/Imakefile	Fri Jun 30 11:27:00 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/mesa/include/GL/Imakefile,v 1.3 2000/03/02 16:07:33 martin Exp $
+XCOMM $XFree86: xc/lib/GL/mesa/include/GL/Imakefile,v 1.5 2000/06/30 18:27:00 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -7,7 +7,9 @@
 
 LinkSourceFile(gl.h, ../../../../../extras/Mesa/include/GL)
 LinkSourceFile(glext.h, ../../../../../extras/Mesa/include/GL)
-LinkSourceFile(glx.h, ../../../../../extras/Mesa/include/GL)
+LinkSourceFile(glx.h, ../../../../../include/GL)
+LinkSourceFile(glxtokens.h, ../../../../../include/GL)
 LinkSourceFile(xmesa.h, ../../../../../extras/Mesa/include/GL)
 LinkSourceFile(xmesa_x.h, ../../../../../extras/Mesa/include/GL)
 LinkSourceFile(xmesa_xf86.h, ../../../../../extras/Mesa/include/GL)
+LinkSourceFile(osmesa.h, ../../../../../extras/Mesa/include/GL)
Index: xc/lib/GL/mesa/src/Imakefile
diff -u xc/lib/GL/mesa/src/Imakefile:1.10 xc/lib/GL/mesa/src/Imakefile:1.15
--- xc/lib/GL/mesa/src/Imakefile:1.10	Thu Mar  2 08:07:34 2000
+++ xc/lib/GL/mesa/src/Imakefile	Sat Jun 24 09:14:07 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.10 2000/03/02 16:07:34 martin Exp $
+XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.15 2000/06/24 16:14:07 dawes Exp $
 
 #include <Threads.tmpl>
 
@@ -16,6 +16,9 @@
     TDFX_DEFS = -DFX
 #endif
 
+LinkSourceFile(aatriangle.c, ../../../../extras/Mesa/src)
+LinkSourceFile(aatriangle.h, ../../../../extras/Mesa/src)
+LinkSourceFile(aatritemp.h, ../../../../extras/Mesa/src)
 LinkSourceFile(accum.c, ../../../../extras/Mesa/src)
 LinkSourceFile(accum.h, ../../../../extras/Mesa/src)
 LinkSourceFile(all.h, ../../../../extras/Mesa/src)
@@ -120,6 +123,8 @@
 LinkSourceFile(pipeline.h, ../../../../extras/Mesa/src)
 LinkSourceFile(pixel.c, ../../../../extras/Mesa/src)
 LinkSourceFile(pixel.h, ../../../../extras/Mesa/src)
+LinkSourceFile(pixeltex.c, ../../../../extras/Mesa/src)
+LinkSourceFile(pixeltex.h, ../../../../extras/Mesa/src)
 LinkSourceFile(points.c, ../../../../extras/Mesa/src)
 LinkSourceFile(points.h, ../../../../extras/Mesa/src)
 LinkSourceFile(polygon.c, ../../../../extras/Mesa/src)
@@ -156,6 +161,8 @@
 LinkSourceFile(texstate.h, ../../../../extras/Mesa/src)
 LinkSourceFile(texture.c, ../../../../extras/Mesa/src)
 LinkSourceFile(texture.h, ../../../../extras/Mesa/src)
+LinkSourceFile(texutil.c, ../../../../extras/Mesa/src)
+LinkSourceFile(texutil.h, ../../../../extras/Mesa/src)
 LinkSourceFile(trans_tmp.h, ../../../../extras/Mesa/src)
 LinkSourceFile(translate.c, ../../../../extras/Mesa/src)
 LinkSourceFile(translate.h, ../../../../extras/Mesa/src)
@@ -189,7 +196,8 @@
 LinkSourceFile(zoom.c, ../../../../extras/Mesa/src)
 LinkSourceFile(zoom.h, ../../../../extras/Mesa/src)
 
-    CORE_SRCS = accum.c \
+    CORE_SRCS = aatriangle.c \
+		accum.c \
 		alpha.c \
 		alphabuf.c \
 		attrib.c \
@@ -220,7 +228,7 @@
 		hash.c \
 		hint.c \
 		image.c \
-		imaging.o \
+		imaging.c \
 		light.c \
 		lines.c \
 		logic.c \
@@ -231,6 +239,7 @@
 		pb.c \
 		pipeline.c \
 		pixel.c \
+		pixeltex.c \
 		points.c \
 		polygon.c \
 		quads.c \
@@ -247,6 +256,7 @@
 		texobj.c \
 		texstate.c \
 		texture.c \
+		texutil.c \
 		translate.c \
 		triangle.c \
 		varray.c \
@@ -262,7 +272,8 @@
 		xform.c \
 		zoom.c
 
-    CORE_OBJS = accum.o \
+    CORE_OBJS = aatriangle.o \
+		accum.o \
 		alpha.o \
 		alphabuf.o \
 		attrib.o \
@@ -301,6 +312,7 @@
 		pb.o \
 		pipeline.o \
 		pixel.o \
+		pixeltex.o \
 		points.o \
 		polygon.o \
 		quads.o \
@@ -317,6 +329,7 @@
 		texobj.o \
 		texstate.o \
 		texture.o \
+		texutil.o \
 		translate.o \
 		triangle.o \
 		varray.o \
@@ -335,8 +348,12 @@
 #ifdef i386Architecture
      ASM_SRCS = 
      ASM_OBJS = 
+#ifdef MesaUse3DNow
+     ASM_DEFS = -DUSE_MMX_ASM -DUSE_X86_ASM -DUSE_3DNOW_ASM
+#else
      ASM_DEFS = -DUSE_MMX_ASM -DUSE_X86_ASM
 #endif
+#endif
 
       DEFINES = $(ALLOC_DEFINES) GlxDefines $(TDFX_DEFS) $(ASM_DEFS)
      INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I../include -I../../dri -I. -I../../../../include
@@ -351,10 +368,10 @@
 #endif
 
 #if GlxBuiltInMesa || GlxDriverUsesMesa || !GlxUseBuiltInDRIDriver
-# We have to go into X to make the xmesaP.h symbolic link
-  MESASUBDIRS = X
-
+  MESASUBDIRS =
+#ifdef i386Architecture
   ASMSUBDIRS = X86
+#endif
 
 #include <Library.tmpl>
 
@@ -362,22 +379,18 @@
 
 SubdirLibraryRule($(OBJS))
 NormalLintTarget($(SRCS))
+
+#else
+
+AllTarget($(OBJS))
+
 #endif
 
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-SUBDIRS = $(MESASUBDIRS) $(ASMSUBDIRS) drv
+SUBDIRS = $(MESASUBDIRS) $(ASMSUBDIRS)
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
-
-#if !GlxUseBuiltInDRIDriver && !GlxDriverUsesMesa
-LIBNAME = mesa_dri.so
-ALL_OBJS = $(CORE_OBJS) X/?*.o X86/?*.o
-ALL_DEPS = $(SUBDIRS) DONE X/DONE X86/DONE
-SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
-InstallDynamicModule($(LIBNAME),$(MODULEDIR)/dri,.)
-#endif
-
 DependTarget()
Index: xc/lib/GL/mesa/src/OSmesa/Imakefile
diff -u /dev/null xc/lib/GL/mesa/src/OSmesa/Imakefile:1.3
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/OSmesa/Imakefile	Mon Jun 26 15:27:41 2000
@@ -0,0 +1,249 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.3 2000/06/26 22:27:41 tsi Exp $
+
+#include <Threads.tmpl>
+
+#define DoNormalLib NormalLibGlx
+#define DoSharedLib SharedLibGlx
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+
+LinkSourceFile(osmesa.c, ../../../../../extras/Mesa/src/OSmesa)
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+MESA_INCLUDES = -I. -I.. -I../../include -I../../../../../include
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES)
+     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+     MESASRCS = ../aatriangle.c \
+		../accum.c \
+		../alpha.c \
+		../alphabuf.c \
+		../attrib.c \
+		../bbox.c \
+		../bitmap.c \
+		../blend.c \
+		../buffers.c \
+		../clip.c \
+		../colortab.c \
+		../config.c \
+		../context.c \
+		../copypix.c \
+		../cva.c \
+		../debug_xform.c \
+		../depth.c \
+		../dlist.c \
+		../drawpix.c \
+		../enable.c \
+		../enums.c \
+		../eval.c \
+		../extensions.c \
+		../feedback.c \
+		../fog.c \
+		../get.c \
+		../glapi.c \
+		../glapinoop.c \
+		../glthread.c \
+		../hash.c \
+		../image.c \
+		../imaging.c \
+		../light.c \
+		../lines.c \
+		../logic.c \
+		../masking.c \
+		../matrix.c \
+		../mem.c \
+		../mmath.c \
+		../pb.c \
+		../pipeline.c \
+		../pixel.c \
+		../pixeltex.c \
+		../points.c \
+		../polygon.c \
+		../quads.c \
+		../rastpos.c \
+		../readpix.c \
+		../rect.c \
+		../scissor.c \
+		../shade.c \
+		../span.c \
+		../stages.c \
+		../state.c \
+		../stencil.c \
+		../teximage.c \
+		../texobj.c \
+		../texstate.c \
+		../texture.c \
+		../texutil.c \
+		../translate.c \
+		../triangle.c \
+		../varray.c \
+		../vb.c \
+		../vbcull.c \
+		../vbfill.c \
+		../vbindirect.c \
+		../vbrender.c \
+		../vbxform.c \
+		../vector.c \
+		../vertices.c \
+		../winpos.c \
+		../xform.c \
+		../zoom.c \
+		osmesa.c
+
+     MESAOBJS = ../aatriangle.o \
+		../accum.o \
+		../alpha.o \
+		../alphabuf.o \
+		../attrib.o \
+		../bbox.o \
+		../bitmap.o \
+		../blend.o \
+		../buffers.o \
+		../clip.o \
+		../colortab.o \
+		../config.o \
+		../context.o \
+		../copypix.o \
+		../cva.o \
+		../debug_xform.o \
+		../depth.o \
+		../dlist.o \
+		../drawpix.o \
+		../enable.o \
+		../enums.o \
+		../eval.o \
+		../extensions.o \
+		../feedback.o \
+		../fog.o \
+		../get.o \
+		../hash.o \
+		../hint.o \
+		../image.o \
+		../imaging.o \
+		../light.o \
+		../lines.o \
+		../logic.o \
+		../masking.o \
+		../matrix.o \
+		../mem.o \
+		../mmath.o \
+		../pb.o \
+		../pipeline.o \
+		../pixel.o \
+		../pixeltex.o \
+		../points.o \
+		../polygon.o \
+		../quads.o \
+		../rastpos.o \
+		../readpix.o \
+		../rect.o \
+		../scissor.o \
+		../shade.o \
+		../span.o \
+		../stages.o \
+		../state.o \
+		../stencil.o \
+		../teximage.o \
+		../texobj.o \
+		../texstate.o \
+		../texture.o \
+		../texutil.o \
+		../translate.o \
+		../triangle.o \
+		../varray.o \
+		../vb.o \
+		../vbcull.o \
+		../vbfill.o \
+		../vbindirect.o \
+		../vbrender.o \
+		../vbxform.o \
+		../vector.o \
+		../vertices.o \
+		../winpos.o \
+		../xform.o \
+		../zoom.o \
+		osmesa.o
+
+#ifdef i386Architecture
+     X86_SRCS = ../X86/x86.c \
+		../X86/x86a.S \
+		../X86/common_x86.c \
+		../X86/common_x86asm.S \
+		../X86/vertex.S
+
+     X86_OBJS = ../X86/x86.o \
+		../X86/x86a.o \
+		../X86/common_x86.o \
+		../X86/common_x86asm.o \
+		../X86/vertex.o
+
+     MMX_SRCS = ../X86/mmx_blend.S
+
+     MMX_OBJS = ../X86/mmx_blend.o
+
+XCOMM Disabling 3Dnow code for the time being.
+#if 0
+   3DNOW_SRCS = ../X86/3dnow.c \
+		../X86/3dnow_norm_raw.S \
+		../X86/3dnow_xform_masked1.S \
+		../X86/3dnow_xform_masked2.S \
+		../X86/3dnow_xform_masked3.S \
+		../X86/3dnow_xform_masked4.S \
+		../X86/3dnow_xform_raw1.S \
+		../X86/3dnow_xform_raw2.S \
+		../X86/3dnow_xform_raw3.S \
+		../X86/3dnow_xform_raw4.S \
+		../X86/vertex_3dnow.S
+
+   3DNOW_OBJS = ../X86/3dnow.o \
+		../X86/3dnow_norm_raw.o \
+		../X86/3dnow_xform_masked1.o \
+		../X86/3dnow_xform_masked2.o \
+		../X86/3dnow_xform_masked3.o \
+		../X86/3dnow_xform_masked4.o \
+		../X86/3dnow_xform_raw1.o \
+		../X86/3dnow_xform_raw2.o \
+		../X86/3dnow_xform_raw3.o \
+		../X86/3dnow_xform_raw4.o \
+		../X86/vertex_3dnow.o
+#endif
+
+#endif
+
+      ASMSRCS = $(X86_SRCS) $(MMX_SRCS) $(3DNOW_SRCS)
+      ASMOBJS = $(X86_OBJS) $(MMX_OBJS) $(3DNOW_OBJS)
+
+         SRCS = $(MESASRCS) $(ASMSRCS)
+         OBJS = $(MESAOBJS) $(ASMOBJS)
+        UOBJS = $(MESAOBJS) $(ASMOBJS)
+        DONES = DONE
+
+#if !GlxUseBuiltInDRIDriver
+ REQUIREDLIBS += -L../../.. -lGL
+#endif
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+LIBNAME = OSMesa
+SOREV = 3.3
+
+
+/*NormalDepLibraryTarget($(LIBNAME), $(DONES), $(UOBJS))*/
+/*InstallLibrary($(LIBNAME),$(USRLIBDIR))*/
+
+SharedDepLibraryTarget($(LIBNAME),$(SOREV), $(DONES), $(OBJS), ., .)
+InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
+
+
+DependTarget()
Index: xc/lib/GL/mesa/src/X86/Imakefile
diff -u xc/lib/GL/mesa/src/X86/Imakefile:1.5 xc/lib/GL/mesa/src/X86/Imakefile:1.9
--- xc/lib/GL/mesa/src/X86/Imakefile:1.5	Thu Mar  2 08:07:34 2000
+++ xc/lib/GL/mesa/src/X86/Imakefile	Fri Jun 16 17:02:53 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.5 2000/03/02 16:07:34 martin Exp $
+XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.9 2000/06/17 00:02:53 martin Exp $
 
 #define DoNormalLib NormalLibGlx
 #define DoSharedLib SharedLibGlx
@@ -16,7 +16,6 @@
 LinkSourceFile(x86a.S, ../../../../../extras/Mesa/src/X86)
 LinkSourceFile(vertex.S, ../../../../../extras/Mesa/src/X86)
 LinkSourceFile(x86flatregs.m4, ../../../../../extras/Mesa/src/X86)
-LinkSourceFile(x86a.S.m4, ../../../../../extras/Mesa/src/X86)
 
 LinkSourceFile(mmx.h, ../../../../../extras/Mesa/src/X86)
 LinkSourceFile(mmx_blend.S, ../../../../../extras/Mesa/src/X86)
@@ -55,9 +54,7 @@
 
       MMX_DEFS = -DUSE_MMX_ASM
 
-
-XCOMM Disabling 3DNow code for the time being
-#if 0
+#ifdef MesaUse3DNow
     3DNOW_SRCS = 3dnow.c 3dnow_norm_raw.S 3dnow_xform_masked1.S \
 		 3dnow_xform_masked2.S 3dnow_xform_masked3.S \
 		 3dnow_xform_masked4.S 3dnow_xform_raw1.S \
@@ -73,6 +70,7 @@
     3DNOW_DEFS = -DUSE_3DNOW_ASM
 #endif
 
+
 #endif
 
       DEFINES = $(ALLOC_DEFINES) GlxDefines -DFX $(X86_DEFS) $(MMX_DEFS) $(3DNOW_DEFS)
@@ -96,7 +94,7 @@
 SubdirLibraryRule($(OBJS))
 NormalLintTarget($(SRCS))
 
-#ifdef HAVE_3DNOW
+#ifdef MesaUse3DNow
 ObjectFromAsmSource(3dnow_norm_raw, NullParameter)
 ObjectFromAsmSource(3dnow_xform_masked1, NullParameter)
 ObjectFromAsmSource(3dnow_xform_masked2, NullParameter)
@@ -109,9 +107,7 @@
 ObjectFromAsmSource(vertex_3dnow, NullParameter)
 #endif
 
-#ifdef HAVE_MMX
 ObjectFromAsmSource(mmx_blend, NullParameter)
-#endif
 
 ObjectFromAsmSource(common_x86asm, NullParameter)
 ObjectFromAsmSource(vertex, NullParameter)
@@ -119,6 +115,3 @@
 
 DependTarget()
 
-x86a.S: x86flatregs.m4
-x86a.S: x86a.S.m4
-	m4 $< >$@
Index: xc/lib/GL/mesa/src/drv/Imakefile
diff -u xc/lib/GL/mesa/src/drv/Imakefile:1.8 xc/lib/GL/mesa/src/drv/Imakefile:1.13
--- xc/lib/GL/mesa/src/drv/Imakefile:1.8	Tue Mar  7 06:31:38 2000
+++ xc/lib/GL/mesa/src/drv/Imakefile	Fri Jun 30 12:30:17 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/drv/Imakefile,v 1.8 2000/03/07 14:31:38 dawes Exp $
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/Imakefile,v 1.13 2000/06/30 19:30:17 dawes Exp $
 
 #define DoNormalLib NormalLibGlx
 #define DoSharedLib SharedLibGlx
@@ -16,12 +16,46 @@
 #if GlxBuiltInTdfx
 DRIVER += tdfx
 #endif
+#if GlxBuiltInMga
+DRIVER += common mga
+#endif
+#if GlxBuiltInI810
+DRIVER += common i810
+#endif
+#if GlxBuiltInR128
+DRIVER += r128
+#endif
+#if GlxBuiltInFfb
+DRIVER += ffb
+#endif
+#if GlxBuiltInSIS
+DRIVER += sis
+#endif
 
 SUBDIRS = $(DRIVER)
 #else
+#if defined(i386Architecture) 
 SUBDIRS += gamma
 #if HasGlide3
 SUBDIRS += tdfx
+#endif
+SUBDIRS += common
+SUBDIRS += mga
+SUBDIRS += i810
+SUBDIRS += r128
+#if 0
+SUBDIRS += sis
+#endif
+#elif defined(AlphaArchitecture) 
+SUBDIRS += gamma
+#if HasGlide3
+SUBDIRS += tdfx
+#endif
+SUBDIRS += common
+SUBDIRS += mga
+SUBDIRS += r128
+#elif defined(SparcArchitecture)
+SUBDIRS += ffb
 #endif
 #endif
 
Index: xc/lib/GL/mesa/src/drv/common/Imakefile
diff -u xc/lib/GL/mesa/src/drv/common/Imakefile:1.2 xc/lib/GL/mesa/src/drv/common/Imakefile:1.3
--- xc/lib/GL/mesa/src/drv/common/Imakefile:1.2	Tue Feb 22 20:46:40 2000
+++ xc/lib/GL/mesa/src/drv/common/Imakefile	Fri Jun 16 17:02:54 2000
@@ -22,13 +22,12 @@
 
 
       DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES)
-     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) \
-		-I/usr/include/glide
+     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES)
       DRISRCS = hwlog.c mm.c
       DRIOBJS = hwlog.o mm.o
 
-	 SRCS = $(DRISRCS) 
-	 OBJS = $(DRIOBJS) 
+         SRCS = $(DRISRCS) 
+         OBJS = $(DRIOBJS) 
 
 #if !GlxUseBuiltInDRIDriver
 #undef DoNormalLib NormalLibGlx
@@ -44,7 +43,8 @@
 SubdirLibraryRule($(OBJS))
 NormalLintTarget($(SRCS))
 
-#if !GlxUseBuiltInDRIDriver
+XCOMM #if !GlxUseBuiltInDRIDriver
+#if 0
 LIBNAME = i810_dri.so
 ALL_OBJS = $(OBJS)
 ALL_DEPS = DONE
Index: xc/lib/GL/mesa/src/drv/common/depthtmp.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/common/depthtmp.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/common/depthtmp.h	Fri Jun 16 17:02:54 2000
@@ -0,0 +1,133 @@
+#ifndef DBG
+#define DBG 0
+#endif
+
+
+
+static void TAG(WriteDepthSpan)( GLcontext *ctx,
+				 GLuint n, GLint x, GLint y,
+				 const GLdepth *depth, 
+				 const GLubyte mask[] )
+{
+   HW_LOCK()
+      {
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_DEPTH_VARS;
+
+	 y = Y_FLIP(y);
+
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+
+	       if (DBG) fprintf(stderr, "WriteDepthSpan %d..%d (x1 %d)\n",
+				(int)i, (int)n1, (int)x1);
+
+	       if (mask)
+	       {
+		  for (;i<n1;i++,x1++)
+		     if (mask[i])
+			WRITE_DEPTH( x1, y, depth[i] );
+	       }
+	       else
+	       {
+		  for (;i<n1;i++,x1++)
+		     WRITE_DEPTH( x1, y, depth[i] );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_UNLOCK();
+}
+
+
+static void TAG(WriteDepthPixels)( GLcontext *ctx,
+				   GLuint n, 
+				   const GLint x[], 
+				   const GLint y[],
+				   const GLdepth depth[], 
+				   const GLubyte mask[] )
+{
+   HW_LOCK()
+      {
+	 GLint i;
+	 LOCAL_DEPTH_VARS;
+
+	 if (DBG) fprintf(stderr, "WriteDepthPixels\n");
+
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+	       {
+		  if (mask[i]) {
+		     const int fy = Y_FLIP(y[i]);
+		     if (CLIPPIXEL(x[i],fy))
+			WRITE_DEPTH( x[i], fy, depth[i] );
+		  }
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_UNLOCK();
+}
+
+
+
+
+/* Read depth spans and pixels
+ */
+static void TAG(ReadDepthSpan)( GLcontext *ctx,
+				GLuint n, GLint x, GLint y,
+				GLdepth depth[])
+{
+   HW_LOCK()
+      {
+	 GLint x1,n1;
+	 LOCAL_DEPTH_VARS;
+
+	 y = Y_FLIP(y);
+
+	 if (DBG) fprintf(stderr, "ReadDepthSpan\n");
+
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+	       for (;i<n1;i++)
+		  READ_DEPTH( depth[i], (x1+i), y );
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_UNLOCK();
+}
+
+static void TAG(ReadDepthPixels)( GLcontext *ctx, GLuint n, 
+				  const GLint x[], const GLint y[],
+				  GLdepth depth[] )
+{
+   HW_LOCK()
+      {
+	 GLint i;
+	 LOCAL_DEPTH_VARS;
+
+	 if (DBG) fprintf(stderr, "ReadDepthPixels\n");
+ 
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++) {
+		  int fy = Y_FLIP( y[i] );
+		  if (CLIPPIXEL( x[i], fy ))
+		     READ_DEPTH( depth[i], x[i], fy );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_UNLOCK();
+}
+
+
+#undef WRITE_DEPTH
+#undef READ_DEPTH
+#undef TAG
Index: xc/lib/GL/mesa/src/drv/common/hwlog.c
diff -u xc/lib/GL/mesa/src/drv/common/hwlog.c:1.1 xc/lib/GL/mesa/src/drv/common/hwlog.c:1.2
--- xc/lib/GL/mesa/src/drv/common/hwlog.c:1.1	Fri Feb 11 09:25:25 2000
+++ xc/lib/GL/mesa/src/drv/common/hwlog.c	Thu Jun 22 09:59:23 2000
@@ -24,6 +24,7 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
+/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.c,v 1.2 2000/06/22 16:59:23 tsi Exp $ */
  
 #include "hwlog.h"
 hwlog_t hwlog = { 0,0,0, "[???] "};
@@ -97,6 +98,27 @@
   }
 }
 
+void hwMsg(int l, const char *format, ...)
+{
+  va_list ap;
+  va_start(ap, format);
+
+  if (l <= hwlog.level) {
+    if (hwIsLogReady()) {
+      int t = usec();
+
+      hwLog(l, "%6i:", t - hwlog.timeTemp);
+      hwlog.timeTemp = t;
+      hwLogv(l, format, ap);
+    } else {
+      fprintf(stderr, hwlog.prefix);
+      vfprintf(stderr, format, ap);
+    }
+  }
+
+  va_end(ap);
+}
+
 #else /* ifdef HW_LOG_ENABLED */
 
 int hwlogdummy()
@@ -105,3 +127,15 @@
 }
 
 #endif
+
+void hwError(const char *format, ...)
+{
+  va_list ap;
+  va_start(ap, format);
+
+  fprintf(stderr, hwlog.prefix);
+  vfprintf(stderr, format, ap);
+  hwLogv(0, format, ap);
+
+  va_end(ap);
+}
Index: xc/lib/GL/mesa/src/drv/common/hwlog.h
diff -u xc/lib/GL/mesa/src/drv/common/hwlog.h:1.1 xc/lib/GL/mesa/src/drv/common/hwlog.h:1.2
--- xc/lib/GL/mesa/src/drv/common/hwlog.h:1.1	Fri Feb 11 09:25:26 2000
+++ xc/lib/GL/mesa/src/drv/common/hwlog.h	Thu Jun 22 09:59:23 2000
@@ -24,6 +24,7 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
+/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.h,v 1.2 2000/06/22 16:59:23 tsi Exp $ */
  
 /* Usage:
  * - use mgaError for error messages. Always write to X error and log file.
@@ -32,6 +33,9 @@
  
 #ifndef HWLOG_INC
 #define HWLOG_INC
+
+
+#include <stdarg.h>
 #include <stdio.h>
 
 #define DBG_LEVEL_BASE          1
@@ -50,7 +54,6 @@
 
 
 #ifdef HW_LOG_ENABLED
-#include <stdarg.h>
 
 /* open and close log file. */
 int  hwOpenLog(const char *filename, char *prefix);
@@ -69,47 +72,30 @@
 void hwLog(int level, const char *format, ...);
 void hwLogv(int level, const char *format, va_list ap);
 
-
 int usec( void );
 
-
 /* hwMsg writes a message to the log file or to the standard X error file. */
-#define hwMsg(level_,format, args...) if ( level_ <= hwlog.level ) {	\
-  if (hwIsLogReady()) {				\
-  	int __t=usec();hwLog(level_,"%6i:",__t-hwlog.timeTemp);hwlog.timeTemp=__t; \
-    hwLog(level_,format, ## args);		\
-  } else {					\
-    if (level_ <= hwGetLogLevel()) {		\
-      fprintf(stderr,hwlog.prefix);			\
-      fprintf(stderr,format, ## args);			\
-    } 						\
-  }						\
-}
-
-#define hwError(format, args...) do {		\
-  fprintf(stderr, hwlog.prefix);		\
-  fprintf(stderr, format, ## args);		\
-  hwLog(0,format, ## args);			\
-} while(0)
+void hwMsg(int level, const char *format, ...);
+
 
 #else
 
+
 static __inline__ int hwOpenLog(const char *f, char *prefix) { hwlog.prefix=prefix; return -1; }
 static __inline__ int hwIsLogReady( void ) { return 0; }
 static __inline__ int hwGetLogLevel( void ) { return -1; }
 static __inline__ int hwLogLevel(int level) { return 0; }
+static __inline__ void hwLog(int level, const char *format, ...) {}
+static __inline__ void hwMsg(int level, const char *format, ...) {}
 
 #define hwCloseLog()
 #define hwSetLogLevel(x)
-#define hwLog(l,f,a...)
 #define hwLogv(l,f,a)
-#define hwMsg(l,f,a...)
 
-#define hwError(format, args...) do {		\
-  fprintf(stderr, hwlog.prefix);				\
-  fprintf(stderr, format, ## args);			\
-} while(0)
 
 #endif
+
+void hwError(const char *format, ...);
+
 
 #endif
Index: xc/lib/GL/mesa/src/drv/common/mm.c
diff -u xc/lib/GL/mesa/src/drv/common/mm.c:1.1 xc/lib/GL/mesa/src/drv/common/mm.c:1.2
--- xc/lib/GL/mesa/src/drv/common/mm.c:1.1	Fri Feb 11 09:25:26 2000
+++ xc/lib/GL/mesa/src/drv/common/mm.c	Thu Jun 22 09:59:23 2000
@@ -20,8 +20,8 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- *
  */
+/* $XFree86: xc/lib/GL/mesa/src/drv/common/mm.c,v 1.2 2000/06/22 16:59:23 tsi Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -30,26 +30,26 @@
 #include "hwlog.h"
 
 #define ISFREE(bptr) ((bptr)->free)
-/*  #define PRINTF(f,a...) hwMsg(1,f, ## a) */
-#define PRINTF(f,a...) fprintf(stderr, f, ## a)
+/*  #define PRINTF hwMsg(1, */
+#define PRINTF fprintf(stderr,
 
 void mmDumpMemInfo( memHeap_t *heap )
 {
   TMemBlock *p;
 
-  PRINTF("Memory heap %p:\n", heap);
+  PRINTF "Memory heap %p:\n", heap);
   if (heap == 0) {
-    PRINTF("  heap == 0\n");
+    PRINTF "  heap == 0\n");
   } else {
     p = (TMemBlock *)heap;
     while (p) {
-      PRINTF("  Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size,
+      PRINTF "  Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size,
 	     p->free ? '.':'U',
 	     p->reserved ? 'R':'.');
       p = p->next;
     }
   }
-  PRINTF("End of memory blocks\n");
+  PRINTF "End of memory blocks\n");
 }
 
 memHeap_t *mmInit(int ofs,
Index: xc/lib/GL/mesa/src/drv/common/shared_texture_lru.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/common/shared_texture_lru.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/common/shared_texture_lru.c	Fri Jun 16 17:02:54 2000
@@ -0,0 +1,88 @@
+#include <stdio.h>
+#include "shared_texture_lru.h"
+
+/* (Re)initialize the global circular LRU list.  The last element
+ * in the array (heap->nrRegions) is the sentinal.  Keeping it
+ * at the end of the array allows the other elements of the array
+ * to be addressed rationally when looking up objects at a
+ * particular location in texture memory.  
+ */
+static void resetGlobalLRU( driHeapPtr heap )
+{
+   driTexRegion *list = heap->shared->list;
+   int sz = 1 << heap->logGranularity;
+   int i;
+
+   heap->localAge = ++heap->shared->texAge;
+
+   for (i = 0 ; (i+1) * sz <= heap->size ; i++) {
+      list[i].prev = i-1;
+      list[i].next = i+1;
+      list[i].age = heap->shared->texAge;   
+   }
+
+   i--;
+   list[0].prev = heap->nrRegions;
+   list[i].prev = i-1;
+   list[i].next = heap->nrRegions;
+   list[heap->nrRegions].prev = i;
+   list[heap->nrRegions].next = 0;
+}
+
+/* Called by the client whenever it touches a local texture.  
+ */
+void driUpdateHeap( driHeapPtr heap, int start, int end )
+{
+   driTexRegion *list = heap->shared->list;
+   int i;
+
+   heap->localAge = ++heap->shared->globalAge;
+
+   for (i = start ; i <= end ; i++) 
+   {
+      list[i].in_use = 1;
+      list[i].age = heap->localAge;
+
+      /* remove_from_list(i)
+       */
+      list[(unsigned)list[i].next].prev = list[i].prev;
+      list[(unsigned)list[i].prev].next = list[i].next;
+      
+      /* insert_at_head(list, i)
+       */
+      list[i].prev = heap->nrRegions;
+      list[i].next = list[heap->nrRegions].next;
+      list[(unsigned)list[heap->nrRegions].next].prev = i;
+      list[heap->nrRegions].next = i;
+   }
+}
+
+
+/* Called by the client on lock contention to determine whether
+ * textures have been stolen
+ */
+void driAgeTextures( driHeapPtr heap )
+{
+   driTexRegion *list = heap->shared->list;
+   int sz = 1 << (heap->logGranularity);
+   int i, nr = 0;
+
+   /* Have to go right round from the back to ensure stuff ends up
+    * LRU in the local list...  Fix with a cursor pointer.
+    */
+   for (i = list[heap->nrRegions].prev ; 
+	i != heap->nrRegions && nr < heap->nrRegions ; 
+	i = list[i].prev, nr++)
+   {
+      if (list[i].age > heap->localAge) 
+	 heap->texturesGone( heap->driverContext, heap->heapId, i * sz, sz, 1); 
+   }
+
+   /* Loop or uninitialized heap detected.  Reset.
+    */
+   if (nr == heap->nrRegions) {
+      heap->texturesGone( heap->driverContext, heap->heapId, 0, heap->size, 0);
+      resetGlobalLRU( heap );
+   }
+}
+
Index: xc/lib/GL/mesa/src/drv/common/shared_texture_lru.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/common/shared_texture_lru.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/common/shared_texture_lru.h	Fri Jun 16 17:02:54 2000
@@ -0,0 +1,76 @@
+#ifndef DRI_TEX_HEAP_H
+#define DRI_TEX_HEAP_H
+
+
+/* Private struct.
+ */
+typedef struct {
+	unsigned char next, prev; /* indices to form a circular LRU  */
+	unsigned char in_use;	  /* owned by a client, or free? */
+	int age;		  /* tracked by clients to update local LRU's */
+} driTexRegion;
+
+
+/* This is the global part of the shared texture mechanism.
+ *
+ * Do not use this struct directly - declare an equivalent one with a 
+ * larger list[] array, tuned to suit your application.
+ *
+ * Your expanded struct should be placed in the driver-specific
+ * portion of the sarea.
+ */
+struct {
+	int globalAge;
+	driTexRegion list[1];	/* drivers will want to define a larger list */
+} driGlobalList; 
+
+
+/* This is the client-private part of the mechanism.
+ *
+ * Clients will place one or more of these structs in their driver
+ * context struct to manage one or more global texture heaps.  All
+ * fields except print_local_lru must be filled in.
+ */
+struct dri_tex_heap_t {
+
+	int heapId;		/* client-supplied identifier */
+	void *driverContext;	/* pointer to the client's context private */
+	int size;		/* heap size in bytes */
+	int logGranularity;	/* log base 2 of size of single heap region */
+	int nrRegions;	        /* number of elements in global list */
+	driGlobalList *shared;	/* pointer to sarea driGlobalList struct */
+	int localAge;	        /* initialize to zero */
+	
+	/* Callback to the client to let it know a region of texture
+	 * space has changed age.  The client must integrate this
+	 * information with its local texture knowledge, in particular
+	 * checking whether any of its own textures have been
+	 * invalidated.
+	 */
+	void (*textures_gone)( void *driverContext,
+			       int heapId,
+			       int offset, 
+			       int size,
+			       int inUse );
+
+	/* Optional hook for debugging.
+	 */
+	void (*print_local_lru)( void *driverContext,
+				 int heapId );
+} driTexHeap;
+
+
+#define DRI_AGE_TEXTURES( heap )			\
+   if ((heap)->localAge > (heap)->shared->globalAge)	\
+      driAgeTextures( heap );
+
+
+/* This should be called whenever there has been contention on the
+ * hardware lock.  Clients can shortcircuit this slightly by using
+ * DRI_AGE_TEXTURES, above.
+ */
+void driAgeTextures( driTexHeap *heap );
+
+#endif
+
+				
Index: xc/lib/GL/mesa/src/drv/common/spantmp.h
diff -u xc/lib/GL/mesa/src/drv/common/spantmp.h:1.1 xc/lib/GL/mesa/src/drv/common/spantmp.h:1.2
--- xc/lib/GL/mesa/src/drv/common/spantmp.h:1.1	Fri Feb 11 09:25:27 2000
+++ xc/lib/GL/mesa/src/drv/common/spantmp.h	Fri Jun 16 17:02:55 2000
@@ -1,37 +1,48 @@
+#ifndef DBG
+#define DBG 0
+#endif
 
 static void TAG(WriteRGBASpan)( const GLcontext *ctx, 
 				GLuint n, GLint x, GLint y, 
 				const GLubyte rgba[][4], 
 				const GLubyte mask[] )
 {
-   GLuint x1,n1;
-   LOCAL_VARS;
-
-   y = Y_FLIP(y);
-
-   if (DBG) fprintf(stderr, "WriteRGBASpan\n");
-
-   HW_CLIPLOOP() 
+   HW_LOCK()
       {
-	 GLuint i = 0;
-	 CLIPSPAN(x,y,n,x1,n1,i);
-	 if (mask)
-	 {
-	    for (i=0;i<n1;i++,x1++)
-	       if (mask[i])
-		  WRITE_RGBA( x1, y, 
-			      rgba[i][0], rgba[i][1], 
-			      rgba[i][2], rgba[i][3] );
-	 }
-	 else
-	 {
-	    for (i=0;i<n1;i++,x1++)
-	       WRITE_RGBA( x1, y, 
-			   rgba[i][0], rgba[i][1], 
-			   rgba[i][2], rgba[i][3] );
-	 }
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_VARS;
+	 
+	 y = Y_FLIP(y);
+
+
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+
+	       if (DBG) fprintf(stderr, "WriteRGBASpan %d..%d (x1 %d)\n",
+				(int)i, (int)n1, (int)x1);
+
+	       if (mask)
+	       {
+		  for (;i<n1;i++,x1++)
+		     if (mask[i])
+			WRITE_RGBA( x1, y, 
+				    rgba[i][0], rgba[i][1], 
+				    rgba[i][2], rgba[i][3] );
+	       }
+	       else
+	       {
+		  for (;i<n1;i++,x1++)
+		     WRITE_RGBA( x1, y, 
+				 rgba[i][0], rgba[i][1], 
+				 rgba[i][2], rgba[i][3] );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
       }
-   HW_ENDCLIPLOOP();
+   HW_UNLOCK();
 }
 
 static void TAG(WriteRGBSpan)( const GLcontext *ctx,
@@ -39,32 +50,37 @@
 			       const GLubyte rgb[][3], 
 			       const GLubyte mask[] )
 {
-   GLuint x1,n1;
-   LOCAL_VARS;
-
-   y = Y_FLIP(y);
-
-
-   if (DBG) fprintf(stderr, "WriteRGBSpan\n");
-
-   HW_CLIPLOOP() 
+   HW_LOCK()
       {
-	 GLuint i = 0;
-	 CLIPSPAN(x,y,n,x1,n1,i);
-
-	 if (mask)
-	 {
-	    for (;i<n1;i++,x1++)
-	       if (mask[i])
-		  WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 0 );
-	 }
-	 else
-	 {
-	    for (;i<n1;i++,x1++)
-	       WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 0 );
-	 }
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_VARS;
+
+	 y = Y_FLIP(y);
+
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+
+	       if (DBG) fprintf(stderr, "WriteRGBSpan %d..%d (x1 %d)\n",
+				(int)i, (int)n1, (int)x1);
+
+	       if (mask)
+	       {
+		  for (;i<n1;i++,x1++)
+		     if (mask[i])
+			WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
+	       }
+	       else
+	       {
+		  for (;i<n1;i++,x1++)
+		     WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
       }
-   HW_ENDCLIPLOOP();
+   HW_UNLOCK();
 }
 
 static void TAG(WriteRGBAPixels)( const GLcontext *ctx,
@@ -74,25 +90,29 @@
 			       const GLubyte rgba[][4], 
 			       const GLubyte mask[] )
 {
-   GLuint i;
-   LOCAL_VARS;
+   HW_LOCK()
+      {
+	 GLint i;
+	 LOCAL_VARS;
 
-   if (DBG) fprintf(stderr, "WriteRGBAPixels\n");
+	 if (DBG) fprintf(stderr, "WriteRGBAPixels\n");
 
-   HW_CLIPLOOP()
-      {
-	 for (i=0;i<n;i++)
-	 {
-	    if (mask[i]) {
-	       const int fy = Y_FLIP(y[i]);
-	       if (CLIPPIXEL(x[i],fy))
-		  WRITE_RGBA( x[i], fy, 
-			      rgba[i][0], rgba[i][1], 
-			      rgba[i][2], rgba[i][3] );
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+	       {
+		  if (mask[i]) {
+		     const int fy = Y_FLIP(y[i]);
+		     if (CLIPPIXEL(x[i],fy))
+			WRITE_RGBA( x[i], fy, 
+				    rgba[i][0], rgba[i][1], 
+				    rgba[i][2], rgba[i][3] );
+		  }
+	       }
 	    }
-	 }
+	 HW_ENDCLIPLOOP();
       }
-   HW_ENDCLIPLOOP();
+   HW_UNLOCK();
 }
 
 
@@ -100,23 +120,28 @@
 				    GLuint n, GLint x, GLint y, 
 				    const GLubyte mask[] )
 {
-   GLuint x1,n1;
-   LOCAL_VARS;
-   INIT_MONO_PIXEL(p);
-
-   y = Y_FLIP( y );
-
-   if (DBG) fprintf(stderr, "WriteMonoRGBASpan\n");
-
-   HW_CLIPLOOP() 
+   HW_LOCK()
       {
-	 GLuint i = 0;
-	 CLIPSPAN(x,y,n,x1,n1,i);
-	 for (;i<n1;i++,x1++)
-	    if (mask[i])
-	       WRITE_PIXEL( x1, y, p );
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_VARS;
+	 INIT_MONO_PIXEL(p);
+
+	 y = Y_FLIP( y );
+
+	 if (DBG) fprintf(stderr, "WriteMonoRGBASpan\n");
+
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+	       for (;i<n1;i++,x1++)
+		  if (mask[i])
+		     WRITE_PIXEL( x1, y, p );
+	    }
+	 HW_ENDCLIPLOOP();
       }
-   HW_ENDCLIPLOOP();
+   HW_UNLOCK();
 }
 
 
@@ -125,22 +150,26 @@
 				      const GLint x[], const GLint y[],
 				      const GLubyte mask[] ) 
 {
-   GLuint i;
-   LOCAL_VARS;
-   INIT_MONO_PIXEL(p);
-
-   if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n");
-
-   HW_CLIPLOOP()
+   HW_LOCK()
       {
-	 for (i=0;i<n;i++)
-	    if (mask[i]) {
-	       int fy = Y_FLIP(y[i]);
-	       if (CLIPPIXEL( x[i], fy ))
-		  WRITE_PIXEL( x[i], fy, p );
+	 GLint i;
+	 LOCAL_VARS;
+	 INIT_MONO_PIXEL(p);
+
+	 if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n");
+
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+		  if (mask[i]) {
+		     int fy = Y_FLIP(y[i]);
+		     if (CLIPPIXEL( x[i], fy ))
+			WRITE_PIXEL( x[i], fy, p );
+		  }
 	    }
-      }
-   HW_ENDCLIPLOOP();
+	 HW_ENDCLIPLOOP();
+      } 
+   HW_UNLOCK();
 }
 
 
@@ -152,42 +181,50 @@
 			       GLuint n, GLint x, GLint y,
 			       GLubyte rgba[][4])
 {
-   GLuint x1,n1;
-   LOCAL_VARS;
+   HW_LOCK()
+      {
+	 GLint x1,n1;
+	 LOCAL_VARS;
 
-   y = Y_FLIP(y);
+	 y = Y_FLIP(y);
 
-   if (DBG) fprintf(stderr, "ReadRGBASpan\n");
+	 if (DBG) fprintf(stderr, "ReadRGBASpan\n");
 
-   HW_CLIPLOOP() 
-      {
-	 GLuint i = 0;
-	 CLIPSPAN(x,y,n,x1,n1,i);
-	 for (;i<n1;i++)
-	    READ_RGBA( rgba[i], x1+i, y );
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+	       for (;i<n1;i++)
+		  READ_RGBA( rgba[i], (x1+i), y );
+	    }
+	 HW_ENDCLIPLOOP();
       }
-   HW_ENDCLIPLOOP();
+   HW_UNLOCK();
 }
 
 static void TAG(ReadRGBAPixels)( const GLcontext *ctx,
 				 GLuint n, const GLint x[], const GLint y[],
 				 GLubyte rgba[][4], const GLubyte mask[] )
 {
-   GLuint i;
-   LOCAL_VARS;
+   HW_LOCK()
+      {
+	 GLint i;
+	 LOCAL_VARS;
 
-   if (DBG) fprintf(stderr, "ReadRGBAPixels\n");
+	 if (DBG) fprintf(stderr, "ReadRGBAPixels\n");
  
-   HW_CLIPLOOP()
-      {
-	 for (i=0;i<n;i++)
-	    if (mask[i]) {
-	       int fy = Y_FLIP( y[i] );
-	       if (CLIPPIXEL( x[i], fy ))
-		  READ_RGBA( rgba[i], x[i], fy );
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+		  if (mask[i]) {
+		     int fy = Y_FLIP( y[i] );
+		     if (CLIPPIXEL( x[i], fy ))
+			READ_RGBA( rgba[i], x[i], fy );
+		  }
 	    }
+	 HW_ENDCLIPLOOP();
       }
-   HW_ENDCLIPLOOP();
+   HW_UNLOCK();
 }
 
 
Index: xc/lib/GL/mesa/src/drv/ffb/Imakefile
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/Imakefile:1.3
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/Imakefile	Sun Jun 25 07:44:26 2000
@@ -0,0 +1,234 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile,v 1.3 2000/06/25 14:44:26 alanh Exp $
+
+#include <Threads.tmpl>
+
+#define DoNormalLib NormalLibGlx
+#define DoSharedLib SharedLibGlx
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DDRIVERTS
+ DRI_INCLUDES = -I../../../../dri -I../../../../glx \
+		-I$(TOP)/include -I$(TOP)/include/GL \
+		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \
+		-I$(XF86DRIVERSRC)/sunffb \
+		-I../../../include -I../.. -I../../X -I../common \
+		-I../../../dri \
+	        -I$(XF86OSSRC)/linux/drm/kernel
+#endif
+
+MESA_INCLUDES = -I. -I.. -I../../include
+
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES)
+     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRISRCS = ../../../dri/dri_mesa.c \
+		../../../../dri/dri_tmm.c
+
+      DRIOBJS = ../../../dri/dri_mesa.o \
+		../../../../dri/dri_tmm.o
+
+      DRMSRCS = ../../../../dri/drm/xf86drm.c \
+		../../../../dri/drm/xf86drmHash.c \
+		../../../../dri/drm/xf86drmRandom.c \
+		../../../../dri/drm/xf86drmSL.c
+
+      DRMOBJS = ../../../../dri/drm/xf86drm.o \
+		../../../../dri/drm/xf86drmHash.o \
+		../../../../dri/drm/xf86drmRandom.o \
+		../../../../dri/drm/xf86drmSL.o
+
+     MESASRCS = ../../aatriangle.c \
+		../../accum.c \
+		../../alpha.c \
+		../../alphabuf.c \
+		../../attrib.c \
+		../../bbox.c \
+		../../bitmap.c \
+		../../blend.c \
+		../../buffers.c \
+		../../clip.c \
+		../../colortab.c \
+		../../config.c \
+		../../context.c \
+		../../copypix.c \
+		../../cva.c \
+		../../debug_xform.c \
+		../../depth.c \
+		../../dlist.c \
+		../../drawpix.c \
+		../../enable.c \
+		../../enums.c \
+		../../eval.c \
+		../../extensions.c \
+		../../feedback.c \
+		../../fog.c \
+		../../get.c \
+		../../glapi.c \
+		../../glapinoop.c \
+		../../glthread.c \
+		../../hash.c \
+		../../image.c \
+		../../imaging.c \
+		../../light.c \
+		../../lines.c \
+		../../logic.c \
+		../../masking.c \
+		../../matrix.c \
+		../../mem.c \
+		../../mmath.c \
+		../../pb.c \
+		../../pipeline.c \
+		../../pixel.c \
+		../../pixeltex.c \
+		../../points.c \
+		../../polygon.c \
+		../../quads.c \
+		../../rastpos.c \
+		../../readpix.c \
+		../../rect.c \
+		../../scissor.c \
+		../../shade.c \
+		../../span.c \
+		../../stages.c \
+		../../state.c \
+		../../stencil.c \
+		../../teximage.c \
+		../../texobj.c \
+		../../texstate.c \
+		../../texture.c \
+		../../texutil.c \
+		../../translate.c \
+		../../triangle.c \
+		../../varray.c \
+		../../vb.c \
+		../../vbcull.c \
+		../../vbfill.c \
+		../../vbindirect.c \
+		../../vbrender.c \
+		../../vbxform.c \
+		../../vector.c \
+		../../vertices.c \
+		../../winpos.c \
+		../../xform.c \
+		../../zoom.c
+
+     MESAOBJS = ../../aatriangle.o \
+		../../accum.o \
+		../../alpha.o \
+		../../alphabuf.o \
+		../../attrib.o \
+		../../bbox.o \
+		../../bitmap.o \
+		../../blend.o \
+		../../buffers.o \
+		../../clip.o \
+		../../colortab.o \
+		../../config.o \
+		../../context.o \
+		../../copypix.o \
+		../../cva.o \
+		../../debug_xform.o \
+		../../depth.o \
+		../../dlist.o \
+		../../drawpix.o \
+		../../enable.o \
+		../../enums.o \
+		../../eval.o \
+		../../extensions.o \
+		../../feedback.o \
+		../../fog.o \
+		../../get.o \
+		../../hash.o \
+		../../hint.o \
+		../../image.o \
+		../../imaging.o \
+		../../light.o \
+		../../lines.o \
+		../../logic.o \
+		../../masking.o \
+		../../matrix.o \
+		../../mem.o \
+		../../mmath.o \
+		../../pb.o \
+		../../pipeline.o \
+		../../pixel.o \
+		../../pixeltex.o \
+		../../points.o \
+		../../polygon.o \
+		../../quads.o \
+		../../rastpos.o \
+		../../readpix.o \
+		../../rect.o \
+		../../scissor.o \
+		../../shade.o \
+		../../span.o \
+		../../stages.o \
+		../../state.o \
+		../../stencil.o \
+		../../teximage.o \
+		../../texobj.o \
+		../../texstate.o \
+		../../texture.o \
+		../../texutil.o \
+		../../translate.o \
+		../../triangle.o \
+		../../varray.o \
+		../../vb.o \
+		../../vbcull.o \
+		../../vbfill.o \
+		../../vbindirect.o \
+		../../vbrender.o \
+		../../vbxform.o \
+		../../vector.o \
+		../../vertices.o \
+		../../winpos.o \
+		../../xform.o \
+		../../zoom.o
+
+      FFBSRCS = ffb_dd.c ffb_span.c ffb_depth.c ffb_state.c ffb_clear.c ffb_vb.c \
+		ffb_lines.c ffb_points.c ffb_tris.c ffb_pipeline.c \
+		ffb_stencil.c ffb_xmesa.c
+
+      FFBOBJS = ffb_dd.o ffb_span.o ffb_depth.o ffb_state.o ffb_clear.o ffb_vb.o \
+		ffb_lines.o ffb_points.o ffb_tris.o ffb_pipeline.o \
+		ffb_stencil.o ffb_xmesa.o
+
+	 SRCS = $(FFBSRCS) $(DRISRCS) $(DRMSRCS) $(MESASRCS)
+	 OBJS = $(FFBOBJS) $(DRIOBJS) $(DRMOBJS) $(MESAOBJS)
+
+REQUIREDLIBS += -lm
+#if !GlxBuiltInFfb
+REQUIREDLIBS += -L../../../.. -lGL
+#endif
+
+#if !GlxUseBuiltInDRIDriver
+#undef DoNormalLib NormalLibGlx
+#undef DoExtraLib SharedLibGlx
+#undef DoDebugLib DebugLibGlx
+#undef DoProfileLib ProfileLibGlx
+#endif
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = ffb_dri.so
+ALL_OBJS = $(OBJS)
+ALL_DEPS = DONE
+SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+#endif
+
+DependTarget()
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c	Mon Jun 19 22:08:37 2000
@@ -0,0 +1,348 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c,v 1.1 2000/06/20 05:08:37 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "vbrender.h"
+
+#include "mm.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_depth.h"
+#include "ffb_context.h"
+#include "ffb_vb.h"
+#include "ffb_tris.h"
+#include "ffb_clear.h"
+#include "ffb_lock.h"
+#include "extensions.h"
+#include "vb.h"
+#include "dd.h"
+
+#define BOX_AREA(__w, __h)	((int)(__w) * (int)(__h))
+
+/* Compute the page aligned box for a page mode fast fill.
+ * In 'ework' this returns greater than zero if there are some odd
+ * edges to take care of which are outside of the page aligned area.
+ * It will place less than zero there if the box is too small,
+ * indicating that a different method must be used to fill it.
+ */
+#define CreatorPageFillParms(ffp, x, y, w, h, px, py, pw, ph, ework) \
+do {	int xdiff, ydiff; \
+	int pf_bh = ffp->pagefill_height; \
+	int pf_bw = ffp->pagefill_width; \
+	py = ((y + (pf_bh - 1)) & ~(pf_bh - 1)); \
+	ydiff = py - y; \
+	px = ffp->Pf_AlignTab[x + (pf_bw - 1)]; \
+	xdiff = px - x; \
+	ph = ((h - ydiff) & ~(pf_bh - 1)); \
+	if(ph <= 0) \
+		ework = -1; \
+	else { \
+		pw = ffp->Pf_AlignTab[w - xdiff]; \
+		if(pw <= 0) { \
+			ework = -1; \
+		} else { \
+			ework = (((xdiff > 0)		|| \
+				  (ydiff > 0)		|| \
+				  ((w - pw) > 0)	|| \
+				  ((h - ph) > 0))) ? 1 : 0; \
+		} \
+	} \
+} while(0);
+
+struct ff_fixups {
+	int x, y, width, height;
+};
+
+/* Compute fixups of non-page aligned areas after a page fill.
+ * Return the number of fixups needed.
+ */
+static __inline__ int
+CreatorComputePageFillFixups(struct ff_fixups *fixups,
+			     int x, int y, int w, int h,
+			     int paligned_x, int paligned_y,
+			     int paligned_w, int paligned_h)
+{
+	int nfixups = 0;
+
+	/* FastFill Left */
+	if(paligned_x != x) {
+		fixups[nfixups].x = x;
+		fixups[nfixups].y = paligned_y;
+		fixups[nfixups].width = paligned_x - x;
+		fixups[nfixups].height = paligned_h;
+		nfixups++;
+	}
+	/* FastFill Top */
+	if(paligned_y != y) {
+		fixups[nfixups].x = x;
+		fixups[nfixups].y = y;
+		fixups[nfixups].width = w;
+		fixups[nfixups].height = paligned_y - y;
+		nfixups++;
+	}
+	/* FastFill Right */
+	if((x+w) != (paligned_x+paligned_w)) {
+		fixups[nfixups].x = (paligned_x+paligned_w);
+		fixups[nfixups].y = paligned_y;
+		fixups[nfixups].width = (x+w) - fixups[nfixups].x;
+		fixups[nfixups].height = paligned_h;
+		nfixups++;
+	}
+	/* FastFill Bottom */
+	if((y+h) != (paligned_y+paligned_h)) {
+		fixups[nfixups].x = x;
+		fixups[nfixups].y = (paligned_y+paligned_h);
+		fixups[nfixups].width = w;
+		fixups[nfixups].height = (y+h) - fixups[nfixups].y;
+		nfixups++;
+	}
+	return nfixups;
+}
+
+static void
+ffb_do_clear(ffbContextPtr fmesa, __DRIdrawablePrivate *dPriv,
+	     GLboolean all, GLint cx, GLint cy, GLint cwidth,
+	     GLint cheight)
+{
+	FFBDRIPtr gDRIPriv = (FFBDRIPtr) fmesa->driScreen->pDevPriv;
+	ffb_fbcPtr ffb = fmesa->regs;
+	XF86DRIClipRectPtr box = dPriv->pClipRects;
+	int nc = dPriv->numClipRects;
+
+	cy  = dPriv->h - cy - cheight;
+	cx += dPriv->x;
+	cy += dPriv->y;
+
+	while (nc--) {
+		GLint x = box[nc].x1;
+		GLint y = box[nc].y1;
+		GLint width = box[nc].x2 - x;
+		GLint height = box[nc].y2 - y;
+		int paligned_y, paligned_x;
+		int paligned_h, paligned_w = 0;
+		int extra_work;
+
+		if (!all) {
+			if (x < cx) {
+				width -= cx - x;
+				x = cx;
+			}
+			if (y < cy) {
+				height -= cy - y;
+				y = cy;
+			}
+			if (x + width > cx + cwidth)
+				width = cx + cwidth - x;
+			if (y + height > cy + cheight)
+				height = cy + cheight - y;
+			if (width <= 0)
+				continue;
+			if (height <= 0)
+				continue;
+		}
+
+		if (BOX_AREA(width, height) < gDRIPriv->fastfill_small_area) {
+			FFBFifo(fmesa, 5);
+			ffb->drawop = FFB_DRAWOP_RECTANGLE;
+			ffb->by = y;
+			ffb->bx = x;
+			ffb->bh = height;
+			ffb->bw = width;
+			continue;
+		}
+
+		FFBFifo(fmesa, 1);
+		ffb->drawop = FFB_DRAWOP_FASTFILL;
+
+		if (gDRIPriv->disable_pagefill ||
+		    (width < (gDRIPriv->pagefill_width<<1)) ||
+		    (height < (gDRIPriv->pagefill_height<<1)))
+			goto do_fastfill;
+
+		CreatorPageFillParms(gDRIPriv,
+				     x, y, width, height,
+				     paligned_x, paligned_y,
+				     paligned_w, paligned_h, extra_work);
+
+		if (extra_work < 0 ||
+		    BOX_AREA(paligned_w, paligned_h) < gDRIPriv->pagefill_small_area) {
+		do_fastfill:
+			FFBFifo(fmesa, 10);
+			ffb->by = FFB_FASTFILL_COLOR_BLK;
+			ffb->dy = 0;
+			ffb->dx = 0;
+			ffb->bh = gDRIPriv->fastfill_height;
+			ffb->bw = (gDRIPriv->fastfill_width * 4);
+			ffb->by = FFB_FASTFILL_BLOCK;
+			ffb->dy = y;
+			ffb->dx = x;
+			ffb->bh = (height + (y & (gDRIPriv->fastfill_height - 1)));
+			ffb->bx = (width + (x & (gDRIPriv->fastfill_width - 1)));
+			continue;
+		}
+
+		/* Ok, page fill is possible and worth it. */
+		FFBFifo(fmesa, 15);
+		ffb->by = FFB_FASTFILL_COLOR_BLK;
+		ffb->dy = 0;
+		ffb->dx = 0;
+		ffb->bh = gDRIPriv->fastfill_height;
+		ffb->bw = gDRIPriv->fastfill_width * 4;
+		ffb->by = FFB_FASTFILL_BLOCK_X;
+		ffb->dy = 0;
+		ffb->dx = 0;
+		ffb->bh = gDRIPriv->pagefill_height;
+		ffb->bw = gDRIPriv->pagefill_width * 4;
+		ffb->by = FFB_FASTFILL_PAGE;
+		ffb->dy = paligned_y;
+		ffb->dx = paligned_x;
+		ffb->bh = paligned_h;
+		ffb->bx = paligned_w;
+
+		if (extra_work) {
+			struct ff_fixups local_fixups[4];
+			int nfixups;
+
+			nfixups = CreatorComputePageFillFixups(local_fixups,
+							       x, y, width, height,
+							       paligned_x, paligned_y,
+							       paligned_w, paligned_h);
+			FFBFifo(fmesa, 5 + (nfixups * 5));
+			ffb->by = FFB_FASTFILL_COLOR_BLK;
+			ffb->dy = 0;
+			ffb->dx = 0;
+			ffb->bh = gDRIPriv->fastfill_height;
+			ffb->bw = gDRIPriv->fastfill_width * 4;
+
+			while (--nfixups >= 0) {
+				int xx, yy, ww, hh;
+
+				xx = local_fixups[nfixups].x;
+				yy = local_fixups[nfixups].y;
+				ffb->dy = yy;
+				ffb->dx = xx;
+				ww = (local_fixups[nfixups].width +
+				      (xx & (gDRIPriv->fastfill_width - 1)));
+				hh = (local_fixups[nfixups].height +
+				      (yy & (gDRIPriv->fastfill_height - 1)));
+				if (nfixups != 0) {
+					ffb->by = FFB_FASTFILL_BLOCK;
+					ffb->bh = hh;
+					ffb->bw = ww;
+				} else {
+					ffb->bh = hh;
+					ffb->by = FFB_FASTFILL_BLOCK;
+					ffb->bx = ww;
+				}
+			}
+		}
+	}
+}
+
+GLbitfield ffbDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
+		      GLint cx, GLint cy, GLint cwidth, GLint cheight)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+	unsigned int stcmask = DD_STENCIL_BIT;
+
+	if (!(fmesa->ffb_sarea->flags & FFB_DRI_FFB2PLUS))
+		stcmask = 0;
+
+	if (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT | DD_DEPTH_BIT | stcmask)) {
+		ffb_fbcPtr ffb = fmesa->regs;
+		unsigned int fbc, ppc;
+
+		fbc = (FFB_FBC_XE_ON);
+		ppc = (FFB_PPC_ACE_DISABLE | FFB_PPC_DCE_DISABLE |
+		       FFB_PPC_ABE_DISABLE | FFB_PPC_VCE_DISABLE |
+		       FFB_PPC_APE_DISABLE | FFB_PPC_XS_WID |
+		       FFB_PPC_ZS_CONST | FFB_PPC_CS_CONST);
+
+		/* Y/X enables must be both on or both off. */
+		if (mask & (DD_DEPTH_BIT | stcmask)) {
+			fbc |= (FFB_FBC_ZE_ON | FFB_FBC_YE_ON | FFB_FBC_WB_C);
+		} else
+			fbc |= FFB_FBC_ZE_OFF | FFB_FBC_YE_OFF;
+
+		/* All RGB enables must be both on or both off. */
+		if (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT)) {
+			if (mask & DD_FRONT_LEFT_BIT) {
+				if (fmesa->back_buffer == 0)
+					fbc |= FFB_FBC_WB_B;
+				else
+					fbc |= FFB_FBC_WB_A;
+			}
+			if (mask & DD_BACK_LEFT_BIT) {
+				if (fmesa->back_buffer == 0)
+					fbc |= FFB_FBC_WB_A;
+				else
+					fbc |= FFB_FBC_WB_B;
+			}
+			fbc |= FFB_FBC_RGBE_ON;
+		} else
+			fbc |= FFB_FBC_RGBE_OFF;
+
+		LOCK_HARDWARE(fmesa);
+
+		if (dPriv->numClipRects) {
+			FFBFifo(fmesa, 8);
+			ffb->fbc = fbc;
+			ffb->ppc = ppc;
+			ffb->xclip = FFB_XCLIP_TEST_ALWAYS;
+			ffb->cmp = 0x80808080;
+			ffb->rop = FFB_ROP_NEW;
+
+			if (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT))
+				ffb->fg = fmesa->clear_pixel;
+			if (mask & DD_DEPTH_BIT)
+				ffb->constz = fmesa->clear_depth;
+			if (mask & stcmask)
+				ffb->consty = fmesa->clear_stencil;
+
+			ffb_do_clear(fmesa, dPriv, all, cx, cy, cwidth, cheight);
+
+			FFBFifo(fmesa, 6);
+			ffb->ppc = fmesa->ppc;
+			ffb->fbc = fmesa->fbc;
+			ffb->xclip = fmesa->xclip;
+			ffb->cmp = fmesa->cmp;
+			ffb->rop = fmesa->rop;
+			ffb->drawop = fmesa->drawop;
+			if (mask & stcmask)
+				ffb->consty = fmesa->consty;
+			fmesa->ffbScreen->rp_active = 1;
+		}
+
+		UNLOCK_HARDWARE(fmesa);
+
+		mask &= ~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT |
+			  DD_DEPTH_BIT | stcmask);
+	}
+
+	return mask;
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,9 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */
+
+#ifndef _FFB_CLEAR_H
+#define _FFB_CLEAR_H
+
+extern GLbitfield ffbDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
+			     GLint cx, GLint cy, GLint cwidth, GLint cheight);
+
+#endif /* !(_FFB_CLEAR_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_context.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_context.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_context.h	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,197 @@
+#ifndef _FFB_CONTEXT_H
+#define _FFB_CONTEXT_H
+
+#include <X11/Xlibint.h>
+#include "dri_mesaint.h"
+#include "dri_mesa.h"
+
+#include "types.h"
+
+#include "ffb_xmesa.h"
+
+typedef struct ffb_context_t {
+	GLcontext		*glCtx;
+	GLuint			MonoColor;
+	GLframebuffer		*glBuffer;
+
+	ffb_fbcPtr		regs;
+	volatile char		*sfb32;
+
+	int			hw_locked;
+	int			SWrender;
+
+	int			back_buffer;	/* 0 = bufferA, 1 = bufferB */
+
+	/* Because MESA does not send us the raw primitives,
+	 * we send everything to the chip as independant lines,
+	 * points, tris, and quads.  If we could get the real
+	 * primitive being used by the user, we can optimize
+	 * things a lot.  This is particularly useful for
+	 * tri strips/fans, and quad strips/fans as FFB
+	 * specifically can optimize these cases.
+	 *
+	 * I suspect MESA does not preserve things to make it's
+	 * transformation/clip/cull optimizations simpler.
+	 *
+	 * Anyways, to try and get around this, we record the
+	 * vertices used in the most recent primitive and we
+	 * detect tri strips/fans and quad strips/fans this
+	 * way.  Actually, we only need to record the ffb_vertex
+	 * pointers, and this makes the tests cheaper and the
+	 * flushing faster (at VB updates and reduced primitive
+	 * changes).
+	 */
+	void			*vtx_cache[4];
+
+	/* This records state bits when a per-fragment attribute has
+	 * been set which prevents us from rendering in hardware.
+	 *
+	 * As attributes change, some of these bits may clear as
+	 * we move back within the chips capabilities.  If they
+	 * all clear, we return to full hw rendering.
+	 */
+	unsigned int		bad_fragment_attrs;
+#define FFB_BADATTR_FOG		0x00000001	/* Bad fog possible only when < FFB2 */
+#define FFB_BADATTR_BLENDFUNC	0x00000002	/* Any non-const func based upon dst alpha */
+#define FFB_BADATTR_BLENDROP	0x00000004	/* Blend enabled and LogicOP != GL_COPY */
+#define FFB_BADATTR_BLENDEQN	0x00000008	/* Blend equation other than ADD */
+#define FFB_BADATTR_STENCIL	0x00000010	/* Stencil enabled when < FFB2+ */
+
+	unsigned int		state_dirty;
+	unsigned int		state_fifo_ents;
+#define FFB_STATE_FBC		0x00000001
+#define FFB_STATE_PPC		0x00000002
+#define FFB_STATE_DRAWOP	0x00000004
+#define FFB_STATE_ROP		0x00000008
+#define FFB_STATE_LPAT		0x00000010
+#define FFB_STATE_PMASK		0x00000020
+#define FFB_STATE_XPMASK	0x00000040
+#define FFB_STATE_YPMASK	0x00000080
+#define FFB_STATE_ZPMASK	0x00000100
+#define FFB_STATE_XCLIP		0x00000200
+#define FFB_STATE_CMP		0x00000400
+#define FFB_STATE_MATCHAB	0x00000800
+#define FFB_STATE_MAGNAB	0x00001000
+#define FFB_STATE_MATCHC	0x00002000
+#define FFB_STATE_MAGNC		0x00004000
+#define FFB_STATE_DCUE		0x00008000
+#define FFB_STATE_BLEND		0x00010000
+#define FFB_STATE_CLIP		0x00020000
+#define FFB_STATE_STENCIL	0x00040000
+#define FFB_STATE_APAT		0x00080000
+#define FFB_STATE_WID		0x00100000
+#define FFB_STATE_ALL		0x001fffff
+
+	unsigned int		state_all_fifo_ents;
+
+	/* General hw reg state. */
+	unsigned int		fbc;
+	unsigned int		ppc;
+	unsigned int		drawop;
+	unsigned int		rop;
+
+	unsigned int		lpat;
+#define FFB_LPAT_BAD		0xffffffff
+
+	unsigned int		wid;
+	unsigned int		pmask;
+	unsigned int		xpmask;
+	unsigned int		ypmask;
+	unsigned int		zpmask;
+	unsigned int		xclip;
+	unsigned int		cmp;
+	unsigned int		matchab;
+	unsigned int		magnab;
+	unsigned int		matchc;
+	unsigned int		magnc;
+
+	/* Depth cue unit hw reg state. */
+	unsigned int		dcss;	/* All FFB		*/
+	unsigned int		dcsf;	/* All FFB		*/
+	unsigned int		dcsb;	/* All FFB		*/
+	unsigned int		dczf;	/* All FFB		*/
+	unsigned int		dczb;	/* All FFB		*/
+	unsigned int		dcss1;	/* >=FFB2 only		*/
+	unsigned int		dcss2;	/* >=FFB2 only		*/
+	unsigned int		dcss3;	/* >=FFB2 only		*/
+	unsigned int		dcs2;	/* >=FFB2 only		*/
+	unsigned int		dcs3;	/* >=FFB2 only		*/
+	unsigned int		dcs4;	/* >=FFB2 only		*/
+	unsigned int		dcd2;	/* >=FFB2 only		*/
+	unsigned int		dcd3;	/* >=FFB2 only		*/
+	unsigned int		dcd4;	/* >=FFB2 only		*/
+
+	/* Blend unit hw reg state. */
+	unsigned int		blendc;
+	unsigned int		blendc1;
+	unsigned int		blendc2;
+
+	/* ViewPort clipping hw reg state. */
+	unsigned int		vclipmin;
+	unsigned int		vclipmax;
+	unsigned int		vclipzmin;
+	unsigned int		vclipzmax;
+	struct {
+		unsigned int	min;
+		unsigned int	max;
+	} aux_clips[4];
+
+	/* Stencil control hw reg state.  >=FFB2+ only. */
+	unsigned int		stencil;
+	unsigned int		stencilctl;
+	unsigned int		consty;		/* Stencil Ref */
+
+	/* Area pattern (used for polygon stipples). */
+	unsigned int		pattern[32];
+
+	/* Fog state. */
+	float			Znear, Zfar;
+
+	drmContext		hHWContext;
+	drmLock			*driHwLock;
+	int			driFd;
+	Display			*display;
+
+	unsigned int		clear_pixel;
+	unsigned int		clear_depth;
+	unsigned int		clear_stencil;
+
+	unsigned int		setupindex;
+	unsigned int		setupdone;
+
+	/* Rendering functions. */
+	points_func   PointsFunc;
+	line_func     LineFunc;
+	triangle_func TriangleFunc;
+	quad_func     QuadFunc;
+
+	__DRIdrawablePrivate	*driDrawable;
+	__DRIscreenPrivate	*driScreen;
+	ffbScreenPrivate	*ffbScreen;
+	ffb_dri_state_t		*ffb_sarea;
+} ffbContextRec, *ffbContextPtr;
+
+#define FFB_CONTEXT(ctx)	((ffbContextPtr)((ctx)->DriverCtx))
+
+/* We want the depth values written during software rendering
+ * to match what the hardware is going to put there when we
+ * hw render.
+ *
+ * The Z buffer is 28 bits deep.  Smooth shaded primitives
+ * specify a 2:30 signed fixed point Z value in the range 0.0
+ * to 1.0 inclusive.
+ *
+ * So for example, when hw rendering, the largest Z value of
+ * 1.0 would produce a value of 0x0fffffff in the actual Z
+ * buffer, which is the maximum value.
+ *
+ * Mesa's depth type is a 32-bit int, so we use the following macro
+ * to convert to/from FFB hw Z values.  Note we also have to clear
+ * out the top bits as that is where the Y (stencil) buffer is stored
+ * and during hw Z buffer reads it is always there. (During writes
+ * we tell the hw to discard those top 4 bits).
+ */
+#define Z_TO_MESA(VAL)		((GLdepth)(((VAL) & 0x0fffffff) << (32 - 28)))
+#define Z_FROM_MESA(VAL)	(((GLuint)(VAL)) >> (32 - 28))
+
+#endif /* !(_FFB_CONTEXT_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,123 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c,v 1.1 2000/06/20 05:08:38 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "vbrender.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mm.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_depth.h"
+#include "ffb_context.h"
+#include "ffb_vb.h"
+#include "ffb_tris.h"
+#include "ffb_clear.h"
+#include "ffb_pipeline.h"
+#include "ffb_lock.h"
+#include "extensions.h"
+#include "vb.h"
+#include "dd.h"
+
+/* Mesa's Driver Functions */
+
+static const GLubyte *ffbDDGetString(GLcontext *ctx, GLenum name)
+{
+	switch (name) {
+	case GL_VENDOR:
+		return (GLubyte *) "David S. Miller";
+	case GL_RENDERER:
+		return (GLubyte *) "DRI-FFB";
+	default:
+		return NULL;
+	};
+}
+
+static GLint ffbGetParameteri(const GLcontext *ctx, GLint param)
+{
+	switch (param) {
+	case DD_HAVE_HARDWARE_FOG:
+		/* XXX We have per-fragment fog, once fog code is done,
+		 * XXX set this.
+		 */
+		return 0;
+	default:
+#if 0
+		ffbError("ffbGetParameteri(): unknown parameter!\n");
+#endif
+		return 0;
+	};
+}
+
+static void ffbBufferSize(GLcontext *ctx, GLuint *width, GLuint *height)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+/*      LOCK_HARDWARE(fmesa); */
+	*width = fmesa->driDrawable->w;
+	*height = fmesa->driDrawable->h;
+/*      UNLOCK_HARDWARE(fmesa); */
+}
+
+void ffbDDExtensionsInit(GLcontext *ctx)
+{
+	/* Nothing for now until we start to add
+	 * real acceleration. -DaveM
+	 */
+
+	/* XXX Need to turn off GL_EXT_blend_func_separate for one.
+	 * XXX Also BlendEquation should be turned off too, what
+	 * XXX EXT is that assosciated with?
+	 */
+}
+
+static void ffbDDFinish(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	LOCK_HARDWARE(fmesa);
+	FFBWait(fmesa, fmesa->regs);
+	UNLOCK_HARDWARE(fmesa);
+}
+
+void ffbDDInitDriverFuncs(GLcontext *ctx)
+{
+	ctx->Driver.GetBufferSize	 = ffbBufferSize;
+	ctx->Driver.GetString		 = ffbDDGetString;
+	ctx->Driver.GetParameteri	 = ffbGetParameteri;
+	ctx->Driver.Clear		 = ffbDDClear;
+
+	ctx->Driver.Finish		 = ffbDDFinish;
+
+	/* VB hooks */
+	ctx->Driver.RegisterVB		 = ffbDDRegisterVB;
+	ctx->Driver.UnregisterVB	 = ffbDDUnregisterVB;
+
+	ctx->Driver.BuildPrecalcPipeline = ffbDDBuildPrecalcPipeline;
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,36 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h,v 1.1 2000/06/20 05:08:38 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D.
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#ifndef _FFB_DD_H
+#define _FFB_DD_H
+
+#include "context.h"
+
+void ffbDDInitDriverFuncs(GLcontext *ctx);
+void ffbDDExtensionsInit(GLcontext *ctx);
+
+#endif /* !(_FFB_DD_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,192 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c,v 1.1 2000/06/20 05:08:38 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_context.h"
+#include "ffb_depth.h"
+#include "ffb_lock.h"
+
+static void 
+FFBWriteDepthSpan(GLcontext *ctx, GLuint n, GLint x, GLint y,
+		  const GLdepth depth[], const GLubyte mask[])
+{
+	if (ctx->Depth.Mask) {
+		ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+		__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+		GLuint *zptr;
+		GLuint i;
+
+		if (!fmesa->hw_locked)
+			LOCK_HARDWARE(fmesa);
+		FFBFifo(fmesa, 2);
+		fmesa->regs->fbc = (FFB_FBC_WB_C | FFB_FBC_ZE_ON |
+				    FFB_FBC_YE_OFF | FFB_FBC_RGBE_OFF);
+		fmesa->regs->ppc = FFB_PPC_ZS_VAR;
+		FFBWait(fmesa, fmesa->regs);
+
+		y = (dPriv->h - y);
+		zptr = (GLuint *)
+			((char *)fmesa->sfb32 +
+			 ((dPriv->x + x) << 2) +
+			 ((dPriv->y + y) << 13));
+		
+		for (i = 0; i < n; i++) {
+			if (mask[i]) {
+				*zptr = Z_FROM_MESA(depth[i]);
+			}
+			zptr++;
+		}
+
+		FFBFifo(fmesa, 2);
+		fmesa->regs->fbc = fmesa->fbc;
+		fmesa->regs->ppc = fmesa->ppc;
+		fmesa->ffbScreen->rp_active = 1;
+		if (!fmesa->hw_locked)
+			UNLOCK_HARDWARE(fmesa);
+	}
+}
+
+static void 
+FFBWriteDepthPixels(GLcontext *ctx, GLuint n, const GLint x[], const GLint y[],
+		    const GLdepth depth[], const GLubyte mask[])
+{
+	if (ctx->Depth.Mask) {
+		ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+		__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+		char *zbase;
+		GLuint i;
+
+		if (!fmesa->hw_locked)
+			LOCK_HARDWARE(fmesa);
+		FFBFifo(fmesa, 2);
+		fmesa->regs->fbc = (FFB_FBC_WB_C | FFB_FBC_ZE_ON |
+				    FFB_FBC_YE_OFF | FFB_FBC_RGBE_OFF);
+		fmesa->regs->ppc = FFB_PPC_ZS_VAR;
+		fmesa->ffbScreen->rp_active = 1;
+		FFBWait(fmesa, fmesa->regs);
+
+		zbase = ((char *)fmesa->sfb32 +
+			 (dPriv->x << 2) + (dPriv->y << 13));
+		
+		for (i = 0; i < n; i++) {
+			GLint y1 = (dPriv->h - y[i]);
+			GLint x1 = x[i];
+			GLuint *zptr;
+
+			zptr = (GLuint *)
+				(zbase + (x1 << 2) + (y1 << 13));
+			if (mask[i])
+				*zptr = Z_FROM_MESA(depth[i]);
+		}
+
+		FFBFifo(fmesa, 2);
+		fmesa->regs->fbc = fmesa->fbc;
+		fmesa->regs->ppc = fmesa->ppc;
+		fmesa->ffbScreen->rp_active = 1;
+		if (!fmesa->hw_locked)
+			UNLOCK_HARDWARE(fmesa);
+	}
+}
+
+static void 
+FFBReadDepthSpan(GLcontext *ctx, GLuint n, GLint x, GLint y, GLdepth depth[])
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+	GLuint *zptr;
+	GLuint i;
+
+	if (!fmesa->hw_locked)
+		LOCK_HARDWARE(fmesa);
+	FFBFifo(fmesa, 1);
+	fmesa->regs->fbc = FFB_FBC_RB_C;
+	fmesa->ffbScreen->rp_active = 1;
+	FFBWait(fmesa, fmesa->regs);
+
+	y = (dPriv->h - y);
+	zptr = (GLuint *)
+		((char *)fmesa->sfb32 +
+		 ((dPriv->x + x) << 2) +
+		 ((dPriv->y + y) << 13));
+		
+	for (i = 0; i < n; i++) {
+		depth[i] = Z_TO_MESA(*zptr);
+		zptr++;
+	}
+
+	FFBFifo(fmesa, 1);
+	fmesa->regs->fbc = fmesa->fbc;
+	fmesa->ffbScreen->rp_active = 1;
+	if (!fmesa->hw_locked)
+		UNLOCK_HARDWARE(fmesa);
+}
+
+static void 
+FFBReadDepthPixels(GLcontext *ctx, GLuint n, const GLint x[], const GLint y[],
+		   GLdepth depth[])
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+	char *zbase;
+	GLuint i;
+
+	if (!fmesa->hw_locked)
+		LOCK_HARDWARE(fmesa);
+	FFBFifo(fmesa, 1);
+	fmesa->regs->fbc = FFB_FBC_RB_C;
+	fmesa->ffbScreen->rp_active = 1;
+	FFBWait(fmesa, fmesa->regs);
+
+	zbase = ((char *)fmesa->sfb32 +
+		 (dPriv->x << 2) + (dPriv->y << 13));
+		
+	for (i = 0; i < n; i++) {
+		GLint y1 = (dPriv->h - y[i]);
+		GLint x1 = x[i];
+		GLuint *zptr;
+
+		zptr = (GLuint *)
+			(zbase + (x1 << 2) + (y1 << 13));
+		depth[i] = Z_TO_MESA(*zptr);
+	}
+
+	FFBFifo(fmesa, 1);
+	fmesa->regs->fbc = fmesa->fbc;
+	fmesa->ffbScreen->rp_active = 1;
+	if (!fmesa->hw_locked)
+		UNLOCK_HARDWARE(fmesa);
+}
+
+void ffbDDInitDepthFuncs(GLcontext *ctx)
+{
+	ctx->Driver.WriteDepthSpan	= FFBWriteDepthSpan;
+	ctx->Driver.ReadDepthSpan	= FFBReadDepthSpan;
+	ctx->Driver.WriteDepthPixels	= FFBWriteDepthPixels;
+	ctx->Driver.ReadDepthPixels	= FFBReadDepthPixels;
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,8 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */
+
+#ifndef _FFB_DEPTH_H
+#define _FFB_DEPTH_H
+
+extern void ffbDDInitDepthFuncs(GLcontext *ctx);
+
+#endif /* !(_FFB_DEPTH_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,28 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */
+
+#ifndef _FFB_FIFO_H
+#define _FFB_FIFO_H
+
+#define FFBFifo(__fmesa, __n) \
+do {	ffbScreenPrivate *__fScrn = (__fmesa)->ffbScreen; \
+	int __cur_slots = __fScrn->fifo_cache; \
+	if ((__cur_slots - (__n)) < 0) { \
+		ffb_fbcPtr __ffb = __fmesa->regs; \
+		do { __cur_slots = (((int)__ffb->ucsr & FFB_UCSR_FIFO_MASK) - 4); \
+		} while ((__cur_slots - (__n)) < 0); \
+	} (__fScrn)->fifo_cache = (__cur_slots - (__n)); \
+} while(0)
+
+#define FFBWait(__fmesa, __ffb) \
+do {	ffbScreenPrivate *__fScrn = (__fmesa)->ffbScreen; \
+	if (__fScrn->rp_active) { \
+		unsigned int __regval = (__ffb)->ucsr; \
+		while((__regval & FFB_UCSR_RP_BUSY) != 0) { \
+			__regval = (__ffb)->ucsr; \
+		} \
+		__fScrn->fifo_cache = ((int)(__regval & FFB_UCSR_FIFO_MASK)) - 4; \
+		__fScrn->rp_active = 0; \
+	} \
+} while(0)
+
+#endif /* !(_FFB_FIFO_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_fog.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_fog.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_fog.c	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,73 @@
+
+/* FFB fog support:
+ *
+ * There are two levels of support for FOG in the Creator3D series.
+ * Both involve a depth cue unit and 1 or 4 slope factors and scales
+ * for varying the pixel intensity.
+ *
+ * Chips prior to FFB2 only have a single set of such settings, FFB2
+ * and later have 4 settings.
+ *
+ * The basic depth cueing equation is:
+ *
+ *	C_final = dcsf(z) * C_orig + (1 - dcsf(z)) * C_fog
+ *
+ * 	C_final	--	The final color passed to blend unit or frame
+ *			buffer (if blending is disabled).
+ *
+ *	C_orig	--	The color we start with, which comes either from
+ *			the raster processor or cpu writes to the smart
+ *			framebuffer aperture.
+ *
+ *	C_fog	--	This is the "fog" color, ie. the desired color
+ *			at the deepest Z.
+ *
+ *	dcsf(z)	--	The depth cue scale as a function of Z.
+ *
+ * With pre-FFB2 chips there are four parameters to control the depth
+ * cue scaling.  Here is a diagram:
+ *
+ *		   1.0	-------------
+ *			|   |   |   |
+ *			|   |   |   |
+ *		Sfront	XXXXX---+---+
+ *			|   |X  |   |
+ *	dcsf(z)		|   | X |   |
+ *			|   |  X|   |
+ *		Sback	+---+---XXXXX
+ *			|   |   |   |
+ *		   0.0	-------------
+ *			0.0 Zf  Zb 1.0
+ *
+ *			      z
+ * Therefore:
+ *
+ *	for Zf < z < Zb
+ *
+ *		dcsf(z) = Sback + ((Sfront - Sback) / (Zf - Zb)) * (Zb - z)
+ *
+ *	for z <= Zf
+ *
+ *		dcsf(z) = Sfront
+ *
+ *	for z >= Zb
+ *
+ *		dcsf(z) = Sback
+ *
+ * With FFB2 and later, 3 more slope regions are provided, the first of
+ * them starts at the end of the region defined above and ends at a
+ * specified depth value, the next slop region starts there and ends
+ * at the next specified depth value, and so on.  Each of the 3 slope
+ * regions also have scale and slope settings of their own.
+ *
+ * The C_fog color is programmed into the alpha blending unit color1
+ * and color2 registers as follows:
+ *
+ *	color1:		-(C_fog)
+ *	color2:		C_fog - bg
+ *
+ * If alpha blending is disabled, the bg factor is zero.  Note that
+ * the alpha blending color registers specify each of the RGB values
+ * as 9 bit 1:8 signed numbers in the range -1.00 to 0.ff inclusive.
+ * (ie. 0x100 == -1.00 and 0x0ff == +0.ff)
+ */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,275 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c,v 1.1 2000/06/20 05:08:38 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "vbrender.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mm.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_depth.h"
+#include "ffb_context.h"
+#include "ffb_vb.h"
+#include "ffb_lines.h"
+#include "ffb_lock.h"
+#include "extensions.h"
+#include "vb.h"
+#include "dd.h"
+#include "pipeline.h"
+
+#define FFB_LINE_FLAT_BIT	0x01
+#define FFB_LINE_TWOSIDE_BIT	0x02
+#define FFB_LINE_OFFSET_BIT	0x04
+#define FFB_LINE_WIDE_BIT	0x08
+#define FFB_LINE_ALPHA_BIT	0x10
+#define FFB_LINE_FALLBACK_BIT	0x20
+
+static line_func ffb_line_tab[0x40];
+
+/* If the line is not wide, we can support all of the line
+ * patterning and smooth shading features of OpenGL fully.
+ * If it is wide we use triangles to render them and as such
+ * we lose the capability to do the patterning+shading in HW.
+ *
+ * XXX Actually, with the triangle method we can probably do
+ * XXX the shading/antialiasing too if we are careful.  It might
+ * XXX not work, need to investigate this. -DaveM
+ */
+
+#define IND (0)
+#define TAG(x) x
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_OFFSET_BIT)
+#define TAG(x) x##_offset
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_OFFSET_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_offset_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_TWOSIDE_BIT)
+#define TAG(x) x##_twoside
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_TWOSIDE_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_twoside_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_TWOSIDE_BIT|FFB_LINE_OFFSET_BIT)
+#define TAG(x) x##_twoside_offset
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_TWOSIDE_BIT|FFB_LINE_OFFSET_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_twoside_offset_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_WIDE_BIT)
+#define TAG(x) x##_wide
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_WIDE_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_wide_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_WIDE_BIT|FFB_LINE_OFFSET_BIT)
+#define TAG(x) x##_wide_offset
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_WIDE_BIT|FFB_LINE_OFFSET_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_wide_offset_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_WIDE_BIT|FFB_LINE_TWOSIDE_BIT)
+#define TAG(x) x##_wide_twoside
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_WIDE_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_wide_twoside_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_WIDE_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_OFFSET_BIT)
+#define TAG(x) x##_wide_twoside_offset
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_WIDE_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_OFFSET_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_wide_twoside_offset_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT)
+#define TAG(x) x##_alpha
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_alpha_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_OFFSET_BIT)
+#define TAG(x) x##_alpha_offset
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_OFFSET_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_alpha_offset_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_TWOSIDE_BIT)
+#define TAG(x) x##_alpha_twoside
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_alpha_twoside_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_OFFSET_BIT)
+#define TAG(x) x##_alpha_twoside_offset
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_OFFSET_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_alpha_twoside_offset_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_WIDE_BIT)
+#define TAG(x) x##_alpha_wide
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_WIDE_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_alpha_wide_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_WIDE_BIT|FFB_LINE_OFFSET_BIT)
+#define TAG(x) x##_alpha_wide_offset
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_WIDE_BIT|FFB_LINE_OFFSET_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_alpha_wide_offset_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_WIDE_BIT|FFB_LINE_TWOSIDE_BIT)
+#define TAG(x) x##_alpha_wide_twoside
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_WIDE_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_alpha_wide_twoside_flat
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_WIDE_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_OFFSET_BIT)
+#define TAG(x) x##_alpha_wide_twoside_offset
+#include "ffb_linetmp.h"
+
+#define IND (FFB_LINE_ALPHA_BIT|FFB_LINE_WIDE_BIT|FFB_LINE_TWOSIDE_BIT|FFB_LINE_OFFSET_BIT|FFB_LINE_FLAT_BIT)
+#define TAG(x) x##_alpha_wide_twoside_offset_flat
+#include "ffb_linetmp.h"
+
+void ffbDDLinefuncInit(void)
+{
+	init();
+	init_flat();
+	init_offset();
+	init_offset_flat();
+	init_twoside();
+	init_twoside_flat();
+	init_twoside_offset();
+	init_twoside_offset_flat();
+	init_wide();
+	init_wide_flat();
+	init_wide_offset();
+	init_wide_offset_flat();
+	init_wide_twoside();
+	init_wide_twoside_flat();
+	init_wide_twoside_offset();
+	init_wide_twoside_offset_flat();
+	init_alpha();
+	init_alpha_flat();
+	init_alpha_offset();
+	init_alpha_offset_flat();
+	init_alpha_twoside();
+	init_alpha_twoside_flat();
+	init_alpha_twoside_offset();
+	init_alpha_twoside_offset_flat();
+	init_alpha_wide();
+	init_alpha_wide_flat();
+	init_alpha_wide_offset();
+	init_alpha_wide_offset_flat();
+	init_alpha_wide_twoside();
+	init_alpha_wide_twoside_flat();
+	init_alpha_wide_twoside_offset();
+	init_alpha_wide_twoside_offset_flat();
+}
+
+/* Our caller makes sure TriangleCaps is non-zero and that
+ * we are not doing feedback/selection (Mesa handles those
+ * cases).
+ */
+void ffbDDChooseLineRenderState(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	GLuint flags = ctx->TriangleCaps;
+	GLuint ind = 0;
+
+	if (!flags) {
+		fmesa->LineFunc = ffb_line_tab[0];
+		return;
+	}
+
+	if (flags & DD_FLATSHADE)
+		ind |= FFB_LINE_FLAT_BIT;
+	if (flags & DD_TRI_OFFSET)
+		ind |= FFB_LINE_OFFSET_BIT;
+	if (flags & DD_TRI_LIGHT_TWOSIDE)
+		ind |= FFB_LINE_TWOSIDE_BIT;
+	if (flags & DD_LINE_WIDTH) {
+		/* We cannot currently do wide lines with stipples
+		 * or antialiased in HW.
+		 */
+		if ((flags & DD_LINE_STIPPLE) != 0 ||
+		    ctx->Line.SmoothFlag)
+			ind |= FFB_LINE_FALLBACK_BIT;
+		else
+			ind |= FFB_LINE_WIDE_BIT;
+	} else {
+		if ((flags & DD_LINE_STIPPLE) != 0 &&
+		    fmesa->lpat == FFB_LPAT_BAD)
+			ind |= FFB_LINE_FALLBACK_BIT;
+	}
+
+	/* If blending or the alpha test is enabled we need to
+	 * provide alpha components to the chip, else we can
+	 * do without it and thus feed vertex data to the chip
+	 * more efficiently.
+	 */
+	if (ctx->Color.BlendEnabled || ctx->Color.AlphaEnabled)
+		ind |= FFB_LINE_ALPHA_BIT;
+
+	fmesa->LineFunc = ffb_line_tab[ind];
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,9 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */
+
+#ifndef _FFB_LINES_H
+#define _FFB_LINES_H
+
+extern void ffbDDLinefuncInit(void);
+extern void ffbDDChooseLineRenderState(GLcontext *);
+
+#endif /* !(_FFB_LINES_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,261 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */
+
+static void TAG(ffb_line)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint pv)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	ffb_fbcPtr ffb = fmesa->regs;
+	struct vertex_buffer *VB = ctx->VB;
+	ffb_vertex *ffbVB = FFB_DRIVER_DATA(VB)->verts;
+	const ffb_vertex *v0 = &ffbVB[e0];
+	const ffb_vertex *v1 = &ffbVB[e1];
+#if (IND & FFB_LINE_OFFSET_BIT)
+	GLuint ffb_zoffset = FFB_Z_FROM_FLOAT(ctx->LineZoffset);
+#endif
+#if (IND & FFB_LINE_TWOSIDE_BIT)
+	const int which_color = (VB->ColorPtr == VB->Color[0]) ? 0 : 1;
+#else
+	const int which_color = 0;
+#endif
+#if (IND & FFB_LINE_FLAT_BIT)
+	const GLuint const_fg = (((GLuint)VB->Color[which_color]->data[pv][0] << 0) |
+				 ((GLuint)VB->Color[which_color]->data[pv][1] << 8) |
+				 ((GLuint)VB->Color[which_color]->data[pv][2] << 16) |
+				 ((GLuint)VB->Color[which_color]->data[pv][3] << 24));
+#endif
+
+#if (IND & FFB_LINE_FLAT_BIT)
+	FFBFifo(fmesa, 1);
+	ffb->fg = const_fg;
+#endif
+
+#if !(IND & FFB_LINE_WIDE_BIT)
+	/* We actually need to do the LINE_LOOP/LINE_STRIP optimization
+	 * in this case so that the line pattern works out correctly.
+	 * Really, Mesa should be fixed so it sends us the real primitive.
+	 */
+	if (v0 == fmesa->vtx_cache[1] &&
+	    v1 != fmesa->vtx_cache[0]) {
+#if (IND & FFB_LINE_FLAT_BIT)
+		FFBFifo(fmesa, 3);
+#else
+#if (IND & FFB_LINE_ALPHA_BIT)
+		FFBFifo(fmesa, 7);
+#else
+		FFBFifo(fmesa, 6);
+#endif
+#endif
+#if !(IND & FFB_LINE_FLAT_BIT)
+#if (IND & FFB_LINE_ALPHA_BIT)
+		ffb->alpha	= v1->color[which_color].alpha;
+#endif
+		ffb->red	= v1->color[which_color].red;
+		ffb->green	= v1->color[which_color].green;
+		ffb->blue	= v1->color[which_color].blue;
+#endif
+#if (IND & FFB_LINE_OFFSET_BIT)
+		ffb->z		= v1->z + ffb_zoffset;
+#else
+		ffb->z		= v1->z;
+#endif
+		ffb->y		= v1->y;
+		ffb->x		= v1->x;
+
+		fmesa->vtx_cache[0] = (void *)v0;
+		fmesa->vtx_cache[1] = (void *)v1;
+		fmesa->ffbScreen->rp_active = 1;
+		return;
+	} else {
+		fmesa->vtx_cache[0] = (void *)v0;
+		fmesa->vtx_cache[1] = (void *)v1;
+	}
+#endif
+
+#if (IND & FFB_LINE_FLAT_BIT)
+#if !(IND & FFB_LINE_WIDE_BIT)
+	/* (2 * 3) + 1 */
+	FFBFifo(fmesa, 7);
+#else
+	/* (4 * 3) */
+	FFBFifo(fmesa, 12);
+#endif
+#else
+#if !(IND & FFB_LINE_WIDE_BIT)
+#if (IND & FFB_LINE_ALPHA_BIT)
+	/* (2 * 7) + 1 */
+	FFBFifo(fmesa, 15);
+#else
+	/* (2 * 6) + 1 */
+	FFBFifo(fmesa, 13);
+#endif
+#else
+#if (IND & FFB_LINE_ALPHA_BIT)
+	/* (4 * 7) */
+	FFBFifo(fmesa, 28);
+#else
+	/* (4 * 6) */
+	FFBFifo(fmesa, 24);
+#endif
+#endif
+#endif
+
+#if !(IND & FFB_LINE_WIDE_BIT)
+	/* Using DDLINE or AALINE, init the line pattern state. */
+	ffb->lpat = fmesa->lpat;
+
+#if !(IND & FFB_LINE_FLAT_BIT)
+#if (IND & FFB_LINE_ALPHA_BIT)
+	ffb->alpha	= v0->color[which_color].alpha;
+#endif
+	ffb->red	= v0->color[which_color].red;
+	ffb->green	= v0->color[which_color].green;
+	ffb->blue	= v0->color[which_color].blue;
+#endif
+#if (IND & FFB_LINE_OFFSET_BIT)
+	ffb->z		= v0->z + ffb_zoffset;
+#else
+	ffb->z		= v0->z;
+#endif
+	ffb->ryf	= v0->y;
+	ffb->rxf	= v0->x;
+
+#if !(IND & FFB_LINE_FLAT_BIT)
+#if (IND & FFB_LINE_ALPHA_BIT)
+	ffb->alpha	= v1->color[which_color].alpha;
+#endif
+	ffb->red	= v1->color[which_color].red;
+	ffb->green	= v1->color[which_color].green;
+	ffb->blue	= v1->color[which_color].blue;
+#endif
+#if (IND & FFB_LINE_OFFSET_BIT)
+	ffb->z		= v1->z + ffb_zoffset;
+#else
+	ffb->z		= v1->z;
+#endif
+	ffb->y		= v1->y;
+	ffb->x		= v1->x;
+
+#else /* FFB_LINE_WIDE_BIT */
+	/* Doing wide lines via triangles. */
+	{
+		float width = ctx->Line.Width;
+		float dx, dy;
+		GLuint ix, iy;
+
+		/* It might be possible to precalculate this stuff in
+		 * our vertex-buffer code.  That code works with
+		 * screen coordinates so it might work.  One problem
+		 * could be that due to potentially drawing polygons
+		 * as lines, it would be very difficult to really
+		 * determine if the calculations were necessary or not.
+		 */
+		dx = VB->Win.data[e0][0] - VB->Win.data[e1][0];
+		dy = VB->Win.data[e0][1] - VB->Win.data[e1][1];
+		ix = FFB_COORD_FROM_FLOAT(width * 0.5f);
+		iy = 0;
+		if ((dx * dx) > (dy * dy)) {
+			iy = ix;
+			ix = 0;
+		}
+
+		/* The vertex sequence using isolated triangles would
+		 * be:
+		 *
+		 *	Vertex0: line vertex0 - I	RXF/RYF
+		 *	Vertex1: line vertex1 + I	DOXF/DOYF
+		 *	Vertex2: line vertex0 + I	DOXF/DOYF
+		 *	Vertex3: line vertex0 - I	RXF/RYF
+		 *	Vertex4: line vertex1 - I	DOXF/DOYF
+		 *	Vertex5: line vertex1 + I	DOXF/DOYF
+		 *
+		 * Using star chaining we can optimize this into a
+		 * four vertex sequence, as follows:
+		 *
+		 *	Vertex0: line vertex0 - I	RXF/RYF
+		 *	Vertex1: line vertex0 + I	DOXF/DOYF
+		 *	Vertex2: line vertex1 + I	DOXF/DOYF
+		 *	Vertex3: line vertex1 - I	DMXF/DMYF
+		 *
+		 * The DMXF/DMYF vertex means "replace middle vertex
+		 * with new vertex and draw".
+		 */
+
+		/* Vertex0: line vertex0 - I, RXF/RYF */
+#if !(IND & FFB_LINE_FLAT_BIT)
+#if (IND & FFB_LINE_ALPHA_BIT)
+		ffb->alpha	= v0->color[which_color].alpha;
+#endif
+		ffb->red	= v0->color[which_color].red;
+		ffb->green	= v0->color[which_color].green;
+		ffb->blue	= v0->color[which_color].blue;
+#endif
+#if (IND & FFB_LINE_OFFSET_BIT)
+		ffb->z		= v0->z + ffb_zoffset;
+#else
+		ffb->z		= v0->z;
+#endif
+		ffb->ryf	= v0->y - iy;
+		ffb->rxf	= v0->x - ix;
+
+		/* Vertex1: line vertex0 + I, DOXF/DOYF */
+#if !(IND & FFB_LINE_FLAT_BIT)
+#if (IND & FFB_LINE_ALPHA_BIT)
+		ffb->alpha	= v0->color[which_color].alpha;
+#endif
+		ffb->red	= v0->color[which_color].red;
+		ffb->green	= v0->color[which_color].green;
+		ffb->blue	= v0->color[which_color].blue;
+#endif
+#if (IND & FFB_LINE_OFFSET_BIT)
+		ffb->z		= v0->z + ffb_zoffset;
+#else
+		ffb->z		= v0->z;
+#endif
+		ffb->y		= v0->y + iy;
+		ffb->x		= v0->x + ix;
+
+		/* Vertex2: line vertex1 + I, DOXF/DOYF */
+#if !(IND & FFB_LINE_FLAT_BIT)
+#if (IND & FFB_LINE_ALPHA_BIT)
+		ffb->alpha	= v1->color[which_color].alpha;
+#endif
+		ffb->red	= v1->color[which_color].red;
+		ffb->green	= v1->color[which_color].green;
+		ffb->blue	= v1->color[which_color].blue;
+#endif
+#if (IND & FFB_LINE_OFFSET_BIT)
+		ffb->z		= v1->z + ffb_zoffset;
+#else
+		ffb->z		= v1->z;
+#endif
+		ffb->y		= v1->y + iy;
+		ffb->x		= v1->x + ix;
+
+		/* Vertex3: line vertex1 - I, DMXF/DMYF */
+#if !(IND & FFB_LINE_FLAT_BIT)
+#if (IND & FFB_LINE_ALPHA_BIT)
+		ffb->alpha	= v1->color[which_color].alpha;
+#endif
+		ffb->red	= v1->color[which_color].red;
+		ffb->green	= v1->color[which_color].green;
+		ffb->blue	= v1->color[which_color].blue;
+#endif
+#if (IND & FFB_LINE_OFFSET_BIT)
+		ffb->z		= v1->z + ffb_zoffset;
+#else
+		ffb->z		= v1->z;
+#endif
+		ffb->dmyf	= v1->y - iy;
+		ffb->dmxf	= v1->x - ix;
+	}
+#endif /* !(FFB_LINE_WIDE_BIT) */
+
+	fmesa->ffbScreen->rp_active = 1;
+}
+
+static void TAG(init)(void)
+{
+	ffb_line_tab[IND] = TAG(ffb_line);
+}
+
+#undef IND
+#undef TAG
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h	Mon Jun 19 22:08:38 2000
@@ -0,0 +1,28 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */
+
+#ifndef _FFB_LOCK_H
+#define _FFB_LOCK_H
+
+#include "ffb_context.h"
+
+extern void ffbXMesaUpdateState(ffbContextPtr fmesa);
+#define FFB_UPDATE_STATE(fmesa)	ffbXMesaUpdateState(fmesa)
+
+/* Lock the hardware and validate our state. */
+#define LOCK_HARDWARE(fmesa)				\
+  do {							\
+    int __ret=0;					\
+    DRM_CAS(fmesa->driHwLock, fmesa->hHWContext,	\
+	    (DRM_LOCK_HELD | fmesa->hHWContext), __ret);\
+    if (__ret) {					\
+        drmGetLock(fmesa->driFd, fmesa->hHWContext, 0);	\
+	FFB_UPDATE_STATE(fmesa);			\
+    }							\
+  } while (0)
+
+
+/* Unlock the hardware. */
+#define UNLOCK_HARDWARE(fmesa)					\
+    DRM_UNLOCK(fmesa->driFd, fmesa->driHwLock, fmesa->hHWContext);	
+
+#endif /* !(_FFB_LOCK_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,84 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c,v 1.1 2000/06/20 05:08:39 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "ffb_xmesa.h"
+#include "ffb_context.h"
+#include "ffb_vb.h"
+#include "ffb_pipeline.h"
+
+#include "stages.h"
+#include "pipeline.h"
+
+GLboolean ffbDDBuildPrecalcPipeline(GLcontext *ctx)
+{   
+	/* This doesn't do anything interesting yet. */
+	return 0;
+}
+
+static void ffbDDCheckRasterSetup(GLcontext *ctx, struct gl_pipeline_stage *d)
+{
+	d->type = PIPE_IMMEDIATE|PIPE_PRECALC;
+	d->inputs = ctx->RenderFlags;
+	d->outputs = VERT_SETUP_FULL;
+
+	if (ctx->IndirectTriangles & DD_SW_SETUP)
+		d->type = PIPE_IMMEDIATE;
+}
+
+GLuint ffbDDRegisterPipelineStages(struct gl_pipeline_stage *out,
+				   const struct gl_pipeline_stage *in,
+				   GLuint nr)
+{
+	GLuint i, o;
+
+	for (i = o = 0 ; i < nr ; i++) {
+		switch (in[i].ops) {
+		case PIPE_OP_RAST_SETUP_0:
+			out[o] = in[i];
+			out[o].cva_state_change =
+				NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS;
+			out[o].state_change = ~0;
+			out[o].check = ffbDDCheckPartialRasterSetup;
+			out[o].run = ffbDDPartialRasterSetup;
+			o++;
+			break;
+
+		case PIPE_OP_RAST_SETUP_0|PIPE_OP_RAST_SETUP_1:
+			out[o] = in[i];
+			out[o].check = ffbDDCheckRasterSetup;
+			out[o].run = ffbDDDoRasterSetup;
+			o++;
+			break;
+
+		default:
+			out[o++] = in[i];
+			break;
+		};
+	}
+
+	return o;
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,11 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */
+
+#ifndef _FFB_PIPELINE_H
+#define _FFB_PIPELINE_H
+
+extern GLboolean ffbDDBuildPrecalcPipeline(GLcontext *);
+extern GLuint ffbDDRegisterPipelineStages(struct gl_pipeline_stage *,
+					  const struct gl_pipeline_stage *,
+					  GLuint);
+
+#endif /* !(_FFB_PIPELINE_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_points.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_points.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_points.c	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,155 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_points.c,v 1.1 2000/06/20 05:08:39 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "vbrender.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mm.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_depth.h"
+#include "ffb_context.h"
+#include "ffb_vb.h"
+#include "ffb_lines.h"
+#include "ffb_points.h"
+#include "ffb_lock.h"
+#include "extensions.h"
+#include "vb.h"
+#include "dd.h"
+#include "pipeline.h"
+
+#define FFB_POINT_OFFSET_BIT	0x01
+#define FFB_POINT_AA_BIT	0x02
+#define FFB_POINT_BIG_BIT	0x04
+#define FFB_POINT_ALPHA_BIT	0x08
+#define FFB_POINT_FALLBACK_BIT	0x10
+
+static points_func ffb_points_tab[0x20];
+
+#define IND (0)
+#define TAG(x) x
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_OFFSET_BIT)
+#define TAG(x) x##_offset
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_AA_BIT)
+#define TAG(x) x##_aa
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_OFFSET_BIT|FFB_POINT_AA_BIT)
+#define TAG(x) x##_offset_aa
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_BIG_BIT)
+#define TAG(x) x##_big
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_BIG_BIT|FFB_POINT_OFFSET_BIT)
+#define TAG(x) x##_big_offset
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_ALPHA_BIT)
+#define TAG(x) x##_alpha
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_ALPHA_BIT|FFB_POINT_OFFSET_BIT)
+#define TAG(x) x##_alpha_offset
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_ALPHA_BIT|FFB_POINT_AA_BIT)
+#define TAG(x) x##_alpha_aa
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_ALPHA_BIT|FFB_POINT_OFFSET_BIT|FFB_POINT_AA_BIT)
+#define TAG(x) x##_alpha_offset_aa
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_ALPHA_BIT|FFB_POINT_BIG_BIT)
+#define TAG(x) x##_alpha_big
+#include "ffb_pointtmp.h"
+
+#define IND (FFB_POINT_ALPHA_BIT|FFB_POINT_BIG_BIT|FFB_POINT_OFFSET_BIT)
+#define TAG(x) x##_alpha_big_offset
+#include "ffb_pointtmp.h"
+
+void ffbDDPointfuncInit(void)
+{
+	init();
+	init_offset();
+	init_aa();
+	init_offset_aa();
+	init_big();
+	init_big_offset();
+	init_alpha();
+	init_alpha_offset();
+	init_alpha_aa();
+	init_alpha_offset_aa();
+	init_alpha_big();
+	init_alpha_big_offset();
+}
+
+/* Our caller makes sure TriangleCaps is non-zero and that
+ * we are not doing feedback/selection (Mesa handles those
+ * cases).
+ */
+void ffbDDChoosePointRenderState(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	GLuint flags = ctx->TriangleCaps;
+	GLuint ind = 0;
+
+	if (!flags) {
+		fmesa->PointsFunc = ffb_points_tab[0];
+		return;
+	}
+
+	if (flags & DD_TRI_OFFSET)
+		ind |= FFB_POINT_OFFSET_BIT;
+	if (flags & DD_POINT_SIZE) {
+		if (ctx->Point.SmoothFlag)
+			ind |= FFB_POINT_FALLBACK_BIT;
+		else
+			ind |= FFB_POINT_BIG_BIT;
+	} else if (ctx->Point.SmoothFlag) {
+		ind |= FFB_POINT_AA_BIT;
+	}
+
+	/* If blending or the alpha test is enabled we need to
+	 * provide alpha components to the chip, else we can
+	 * do without it and thus feed vertex data to the chip
+	 * more efficiently.
+	 */
+	if (ctx->Color.BlendEnabled || ctx->Color.AlphaEnabled)
+		ind |= FFB_POINT_ALPHA_BIT;
+
+	fmesa->PointsFunc = ffb_points_tab[ind];
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_points.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_points.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_points.h	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,9 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_points.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */
+
+#ifndef _FFB_POINTS_H
+#define _FFB_POINTS_H
+
+extern void ffbDDPointfuncInit(void);
+extern void ffbDDChoosePointRenderState(GLcontext *);
+
+#endif /* !(_FFB_POINTS_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,114 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */
+
+static void TAG(ffb_points)(GLcontext *ctx, GLuint first, GLuint last)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	ffb_fbcPtr ffb = fmesa->regs;
+	struct vertex_buffer *VB = ctx->VB;
+	ffb_vertex *ffbVB = FFB_DRIVER_DATA(VB)->verts;
+#if (IND & FFB_POINT_OFFSET_BIT)
+#if (IND & FFB_POINT_AA_BIT)
+	GLuint ffb_zoffset = FFB_Z_FROM_FLOAT(ctx->PointZoffset);
+#else
+	GLuint ffb_zoffset = Z_FROM_MESA(ctx->PointZoffset);
+#endif
+#endif
+#if (IND & FFB_POINT_BIG_BIT)
+	GLuint sz = FFB_COORD_FROM_FLOAT(ctx->Point.Size * 0.5f);
+#endif
+	int i;
+
+	for (i = first; i <= last; i++) {
+		if (VB->ClipMask[i] == 0) {
+			ffb_vertex *tmp = &ffbVB[i];
+#if !(IND & FFB_POINT_BIG_BIT)
+#if (IND & FFB_POINT_AA_BIT)
+			FFBFifo(fmesa, 4);
+			ffb->fg = (((GLuint)VB->Color[0]->data[i][0] << 0) |
+				   ((GLuint)VB->Color[0]->data[i][1] << 8) |
+				   ((GLuint)VB->Color[0]->data[i][2] << 16) |
+				   ((GLuint)VB->Color[0]->data[i][3] << 24));
+#if (IND & FFB_POINT_OFFSET_BIT)
+			ffb->z = tmp->z + ffb_zoffset;
+#else
+			ffb->z = tmp->z;
+#endif
+			ffb->y = tmp->y + 0x8000;
+			ffb->x = tmp->x + 0x8000;
+#else
+			FFBFifo(fmesa, 4);
+			ffb->fg = (((GLuint)VB->Color[0]->data[i][0] << 0) |
+				   ((GLuint)VB->Color[0]->data[i][1] << 8) |
+				   ((GLuint)VB->Color[0]->data[i][2] << 16) |
+				   ((GLuint)VB->Color[0]->data[i][3] << 24));
+#if (IND & FFB_POINT_OFFSET_BIT)
+			ffb->constz =
+				(Z_FROM_MESA(VB->Win.data[i][2]) + ffb_zoffset);
+#else
+			ffb->constz = Z_FROM_MESA(VB->Win.data[i][2]);
+#endif
+			ffb->bh = tmp->y >> 16;
+			ffb->bw = tmp->x >> 16;
+#endif
+#else /* FFB_POINT_BIG_BIT */
+			/* Doing big points via triangles. */
+			FFBFifo(fmesa, 10);
+
+			ffb->fg = (((GLuint)VB->Color[0]->data[i][0] << 0) |
+				   ((GLuint)VB->Color[0]->data[i][1] << 8) |
+				   ((GLuint)VB->Color[0]->data[i][2] << 16) |
+				   ((GLuint)VB->Color[0]->data[i][3] << 24));
+#if (IND & FFB_POINT_OFFSET_BIT)
+			ffb->constz =
+				(Z_FROM_MESA(VB->Win.data[i][2]) + ffb_zoffset);
+#else
+			ffb->constz = Z_FROM_MESA(VB->Win.data[i][2]);
+#endif
+
+			/* The vertex sequence using isolated triangles would
+			 * be:
+			 *	Vertex0: VX - sz, VY - sz	RXF/RYF
+			 *	Vertex1: VX + sz, VY - sz	DOXF/DOYF
+			 *	Vertex2: VX + sz, VY + sz	DOXF/DOYF
+			 *	Vertex3: VX + sz, VY + sz	RXF/RYF
+			 *	Vertex4: VX - sz, VY + sz	DOXF/DOYF
+			 *	Vertex5: VX - sz, VY - sz	DOXF/DOYF
+			 *
+			 * Using star chaining we can optimize this into a
+			 * four vertex sequence, as follows:
+			 *
+			 *	Vertex0: VX - sz, VY - sz	RXF/RYF
+			 *	Vertex1: VX + sz, VY - sz	DOXF/DOYF
+			 *	Vertex2: VX + sz, VY + sz	DOXF/DOYF
+			 *	Vertex3: VX - sz, VY + sz	DMXF/DMYF
+			 */
+
+			/* Vertex0: VX - sz, VY - sz, RXF/RYF */
+			ffb->ryf = tmp->y - sz;
+			ffb->rxf = tmp->x - sz;
+
+			/* Vertex1: VX + sz, VY - sz, DOXF/DOYF */
+			ffb->y = tmp->y - sz;
+			ffb->x = tmp->x + sz;
+
+			/* Vertex2: VX + sz, VY + sz, DOXF/DOYF */
+			ffb->y = tmp->y + sz;
+			ffb->x = tmp->x + sz;
+
+			/* Vertex3: VX - sz, VY + sz, DMXF/DMYF */
+			ffb->dmyf = tmp->y + sz;
+			ffb->dmxf = tmp->x - sz;
+#endif /* !(FFB_POINT_BIG_BIT) */
+		}
+	}
+
+	fmesa->ffbScreen->rp_active = 1;
+}
+
+static void TAG(init)(void)
+{
+	ffb_points_tab[IND] = TAG(ffb_points);
+}
+
+#undef IND
+#undef TAG
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_span.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_span.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_span.c	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,133 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_span.c,v 1.1 2000/06/20 05:08:39 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_context.h"
+#include "ffb_lock.h"
+
+#define DBG 0
+
+#define HW_LOCK()						\
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);			\
+	if (!fmesa->hw_locked)					\
+		LOCK_HARDWARE(fmesa);
+
+#define HW_UNLOCK()			\
+	if (!fmesa->hw_locked)		\
+		UNLOCK_HARDWARE(fmesa); \
+
+#define LOCAL_VARS						\
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;	\
+	GLuint height = dPriv->h;				\
+	char *buf
+
+#define INIT_MONO_PIXEL(p)		\
+	GLuint p = fmesa->MonoColor;
+
+/* We use WID clipping, so this test always passes. */
+#define CLIPPIXEL(__x, __y)	(1)
+
+/* And also, due to WID clipping, we need not do anything
+ * special here.
+ */
+#define CLIPSPAN(__x,__y,__n,__x1,__n1,__i)		\
+	__n1 = __n;					\
+	__x1 = __x;					\
+
+#define HW_CLIPLOOP()							\
+do {	unsigned int fbc, ppc, cmp;					\
+	FFBWait(fmesa, fmesa->regs);					\
+	fbc = fmesa->regs->fbc; ppc = fmesa->regs->ppc; cmp = fmesa->regs->cmp; \
+	fmesa->regs->fbc = ((fbc &					\
+			     ~(FFB_FBC_WB_C | FFB_FBC_ZE_MASK | FFB_FBC_RGBE_MASK)) \
+			    | (FFB_FBC_ZE_OFF | FFB_FBC_RGBE_MASK));	\
+	fmesa->regs->ppc = ((ppc &					\
+			     ~(FFB_PPC_XS_MASK | FFB_PPC_ABE_MASK | FFB_PPC_DCE_MASK | \
+			       FFB_PPC_APE_MASK | FFB_PPC_CS_MASK))	\
+			    | (FFB_PPC_XS_WID | FFB_PPC_ABE_DISABLE |	\
+			       FFB_PPC_DCE_DISABLE | FFB_PPC_APE_DISABLE | \
+			       FFB_PPC_CS_VAR));			\
+	fmesa->regs->cmp = ((cmp & ~(0xff << 16)) | (0x80 << 16));	\
+	fmesa->ffbScreen->rp_active = 1;				\
+	FFBWait(fmesa, fmesa->regs);					\
+	buf = (char *)(fmesa->sfb32 + (dPriv->x << 2) + (dPriv->y << 13));\
+	if (dPriv->numClipRects) {
+
+#define HW_ENDCLIPLOOP()	\
+	}			\
+	fmesa->regs->fbc = fbc;	\
+	fmesa->regs->ppc = ppc;	\
+	fmesa->regs->cmp = cmp;	\
+	fmesa->ffbScreen->rp_active = 1; \
+} while(0)
+
+#define Y_FLIP(__y)		(height - __y)
+
+#define READ_RGBA(rgba,__x,__y)					\
+do {	GLuint p = *(GLuint *)(buf + ((__x)<<2) + ((__y)<<13));	\
+	rgba[0] = (p >>  0) & 0xff;				\
+	rgba[1] = (p >>  8) & 0xff;				\
+	rgba[2] = (p >> 16) & 0xff;				\
+	rgba[3] = 0xff;						\
+} while(0)
+
+#define WRITE_RGBA(__x, __y, __r, __g, __b, __a)		\
+	*(GLuint *)(buf + ((__x)<<2) + ((__y)<<13)) =		\
+		((((__r) & 0xff) <<  0) |			\
+		 (((__g) & 0xff) <<  8) |			\
+		 (((__b) & 0xff) << 16))
+
+#define WRITE_PIXEL(__x, __y, __p) \
+	*(GLuint *)(buf + ((__x)<<2) + ((__y)<<13)) = (__p)
+
+#define TAG(x) ffb##x##_888
+
+#include <spantmp.h>
+
+void ffbDDInitSpanFuncs(GLcontext *ctx)
+{
+	ctx->Driver.WriteRGBASpan	= ffbWriteRGBASpan_888;
+	ctx->Driver.WriteRGBSpan	= ffbWriteRGBSpan_888;
+	ctx->Driver.WriteRGBAPixels	= ffbWriteRGBAPixels_888;
+	ctx->Driver.WriteMonoRGBASpan	= ffbWriteMonoRGBASpan_888;
+	ctx->Driver.WriteMonoRGBAPixels	= ffbWriteMonoRGBAPixels_888;
+	ctx->Driver.ReadRGBASpan	= ffbReadRGBASpan_888;
+	ctx->Driver.ReadRGBAPixels	= ffbReadRGBAPixels_888;
+
+	/* We don't support color index mode yet, but it will be
+	 * very easy to do. -DaveM
+	 */
+	ctx->Driver.WriteCI8Span        = NULL;
+	ctx->Driver.WriteCI32Span       = NULL;
+	ctx->Driver.WriteMonoCISpan     = NULL;
+	ctx->Driver.WriteCI32Pixels     = NULL;
+	ctx->Driver.WriteMonoCIPixels   = NULL;
+	ctx->Driver.ReadCI32Span        = NULL;
+	ctx->Driver.ReadCI32Pixels      = NULL;
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_span.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_span.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_span.h	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,8 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_span.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */
+
+#ifndef _FFB_SPAN_H
+#define _FFB_SPAN_H
+
+extern void ffbDDInitSpanFuncs(GLcontext *ctx);
+
+#endif /* !(_FFB_SPAN_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_state.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_state.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_state.c	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,1400 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_state.c,v 1.1 2000/06/20 05:08:39 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "vbrender.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mm.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_depth.h"
+#include "ffb_context.h"
+#include "ffb_vb.h"
+#include "ffb_tris.h"
+#include "ffb_lines.h"
+#include "ffb_points.h"
+#include "ffb_state.h"
+#include "ffb_lock.h"
+#include "extensions.h"
+#include "vb.h"
+#include "dd.h"
+#include "enums.h"
+#include "pipeline.h"
+#include "pb.h"
+
+#undef STATE_TRACE
+
+static unsigned int ffbComputeAlphaFunc(GLcontext *ctx)
+{
+	unsigned int xclip;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDAlphaFunc: func(%s) ref(%02x)\n",
+		gl_lookup_enum_by_nr(ctx->Color.AlphaFunc),
+		ctx->Color.AlphaRef & 0xff);
+#endif
+
+	switch (ctx->Color.AlphaFunc) {
+	case GL_NEVER: xclip = FFB_XCLIP_TEST_NEVER; break;
+	case GL_LESS: xclip = FFB_XCLIP_TEST_LT; break;
+	case GL_EQUAL: xclip = FFB_XCLIP_TEST_EQ; break;
+	case GL_LEQUAL: xclip = FFB_XCLIP_TEST_LE; break;
+	case GL_GREATER: xclip = FFB_XCLIP_TEST_GT; break;
+	case GL_NOTEQUAL: xclip = FFB_XCLIP_TEST_NE; break;
+	case GL_GEQUAL: xclip = FFB_XCLIP_TEST_GE; break;
+	case GL_ALWAYS: xclip = FFB_XCLIP_TEST_ALWAYS; break;
+
+	default:
+		return FFB_XCLIP_TEST_ALWAYS | 0x00;
+	}
+
+	xclip |= (ctx->Color.AlphaRef & 0xff);
+
+	return xclip;
+}
+
+static void ffbDDAlphaFunc(GLcontext *ctx, GLenum func, GLclampf ref)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	if (ctx->Color.AlphaEnabled) {
+		unsigned int xclip = ffbComputeAlphaFunc(ctx);
+
+		if (fmesa->xclip != xclip) {
+			fmesa->xclip = xclip;
+			fmesa->state_dirty |= FFB_STATE_XCLIP;
+			fmesa->state_fifo_ents += 1;
+		}
+	}
+}
+
+static void ffbDDBlendEquation(GLcontext *ctx, GLenum mode)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDBlendEquation: mode(%s)\n", gl_lookup_enum_by_nr(mode));
+#endif
+	if (mode != GL_FUNC_ADD_EXT)
+		fmesa->bad_fragment_attrs |= FFB_BADATTR_BLENDEQN;
+	else
+		fmesa->bad_fragment_attrs &= ~FFB_BADATTR_BLENDEQN;
+}
+
+static void ffbDDBlendFunc(GLcontext *ctx, GLenum sfactor, GLenum dfactor)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int blendc = 1 << 4;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDBlendFunc: sfactor(%s) dfactor(%s)\n",
+		gl_lookup_enum_by_nr(sfactor), gl_lookup_enum_by_nr(dfactor));
+#endif
+	switch (ctx->Color.BlendSrcRGB) {
+	case GL_ZERO:
+		blendc |= (0 << 0);
+		break;
+
+	case GL_ONE:
+		blendc |= (1 << 0);
+		break;
+
+	case GL_ONE_MINUS_SRC_ALPHA:
+		blendc |= (2 << 0);
+		break;
+
+	case GL_SRC_ALPHA:
+		blendc |= (3 << 0);
+		break;
+
+	default:
+		if (ctx->Color.BlendEnabled)
+			fmesa->bad_fragment_attrs |= FFB_BADATTR_BLENDFUNC;
+		return;
+	};
+
+	switch (ctx->Color.BlendDstRGB) {
+	case GL_ZERO:
+		blendc |= (0 << 2);
+		break;
+
+	case GL_ONE:
+		blendc |= (1 << 2);
+		break;
+
+	case GL_ONE_MINUS_SRC_ALPHA:
+		blendc |= (2 << 2);
+		break;
+
+	case GL_SRC_ALPHA:
+		blendc |= (3 << 2);
+		break;
+
+	default:
+		if (ctx->Color.BlendEnabled)
+			fmesa->bad_fragment_attrs |= FFB_BADATTR_BLENDFUNC;
+		return;
+	};
+
+	if (ctx->Color.BlendEnabled &&
+	    ctx->Color.ColorLogicOpEnabled &&
+	    ctx->Color.LogicOp != GL_COPY) {
+		/* We could avoid this if sfactor is GL_ONE and
+		 * dfactor is GL_ZERO.  I do not think that is even
+		 * worthwhile to check because if someone is using
+		 * blending they use more interesting settings and
+		 * also it would add more state tracking to a lot
+		 * of the code in this file.
+		 */
+		fmesa->bad_fragment_attrs |= FFB_BADATTR_BLENDROP;
+		return;
+	}
+
+	fmesa->bad_fragment_attrs &= ~(FFB_BADATTR_BLENDFUNC |
+				       FFB_BADATTR_BLENDROP);
+
+	if (blendc != fmesa->blendc) {
+		fmesa->blendc = blendc;
+		fmesa->state_dirty |= FFB_STATE_BLEND;
+		fmesa->state_fifo_ents += 1;
+	}
+}
+
+static void ffbDDBlendFuncSeparate(GLcontext *ctx, GLenum sfactorRGB,
+				   GLenum dfactorRGB, GLenum sfactorA,
+				   GLenum dfactorA)
+{
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDBlendFuncSeparate: sRGB(%s) dRGB(%s) sA(%s) dA(%s)\n",
+		gl_lookup_enum_by_nr(sfactorRGB),
+		gl_lookup_enum_by_nr(dfactorRGB),
+		gl_lookup_enum_by_nr(sfactorA),
+		gl_lookup_enum_by_nr(dfactorA));
+#endif
+
+	ffbDDBlendFunc(ctx, sfactorRGB, dfactorRGB);
+}
+
+static void ffbDDDepthFunc(GLcontext *ctx, GLenum func)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	GLuint cmp;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDDepthFunc: func(%s)\n",
+		gl_lookup_enum_by_nr(func));
+#endif
+
+	switch (func) {
+	case GL_NEVER:
+		cmp = FFB_CMP_MAGN_NEVER;
+		break;
+	case GL_ALWAYS:
+		cmp = FFB_CMP_MAGN_ALWAYS;
+		break;
+	case GL_LESS:
+		cmp = FFB_CMP_MAGN_LT;
+		break;
+	case GL_LEQUAL:
+		cmp = FFB_CMP_MAGN_LE;
+		break;
+	case GL_EQUAL:
+		cmp = FFB_CMP_MAGN_EQ;
+		break;
+	case GL_GREATER:
+		cmp = FFB_CMP_MAGN_GT;
+		break;
+	case GL_GEQUAL:
+		cmp = FFB_CMP_MAGN_GE;
+		break;
+	case GL_NOTEQUAL:
+		cmp = FFB_CMP_MAGN_NE;
+		break;
+	default:
+		return;
+	};
+
+	if (! ctx->Depth.Test)
+		cmp = FFB_CMP_MAGN_ALWAYS;
+
+	cmp <<= 16;
+	cmp = (fmesa->cmp & ~(0xff<<16)) | cmp;
+	if (cmp != fmesa->cmp) {
+		fmesa->cmp = cmp;
+		fmesa->state_dirty |= FFB_STATE_CMP;
+		fmesa->state_fifo_ents += 1;
+	}
+}
+
+static void ffbDDDepthMask(GLcontext *ctx, GLboolean flag)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	GLuint fbc = fmesa->fbc;
+	GLboolean enabled_now;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDDepthMask: flag(%d)\n", flag);
+#endif
+
+	if ((fbc & FFB_FBC_ZE_MASK) == FFB_FBC_ZE_OFF)
+		enabled_now = GL_FALSE;
+	else
+		enabled_now = GL_TRUE;
+
+	if (flag != enabled_now) {
+		fbc &= ~FFB_FBC_ZE_MASK;
+		if (flag) {
+			fbc |= FFB_FBC_WB_C | FFB_FBC_ZE_ON;
+		} else {
+			fbc |= FFB_FBC_ZE_OFF;
+			fbc &= ~FFB_FBC_WB_C;
+		}
+		fmesa->fbc = fbc;
+		fmesa->state_dirty |= FFB_STATE_FBC;
+		fmesa->state_fifo_ents += 1;
+	}
+}
+
+static void ffbDDStencilFunc(GLcontext *ctx, GLenum func, GLint ref, GLuint mask)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int stencil, stencilctl, consty;
+
+	/* We will properly update sw/hw state when stenciling is
+	 * enabled.
+	 */
+	if (! ctx->Stencil.Enabled)
+		return;
+
+	stencilctl = fmesa->stencilctl;
+	stencilctl &= ~(7 << 16);
+
+	switch (func) {
+	case GL_ALWAYS:		stencilctl |= (0 << 16); break;
+	case GL_GREATER:	stencilctl |= (1 << 16); break;
+	case GL_EQUAL:		stencilctl |= (2 << 16); break;
+	case GL_GEQUAL:		stencilctl |= (3 << 16); break;
+	case GL_NEVER:		stencilctl |= (4 << 16); break;
+	case GL_LEQUAL:		stencilctl |= (5 << 16); break;
+	case GL_NOTEQUAL:	stencilctl |= (6 << 16); break;
+	case GL_LESS:		stencilctl |= (7 << 16); break;
+
+	default:
+		return;
+	};
+
+	consty = ref & 0xf;
+
+	stencil = fmesa->stencil;
+	stencil &= ~(0xf << 20);
+	stencil |= (mask & 0xf) << 20;
+
+	if (fmesa->stencil != stencil ||
+	    fmesa->stencilctl != stencilctl ||
+	    fmesa->consty != consty) {
+		fmesa->stencil = stencil;
+		fmesa->stencilctl = stencilctl;
+		fmesa->consty = consty;
+		fmesa->state_dirty |= FFB_STATE_STENCIL;
+		fmesa->state_fifo_ents += 6;
+	}
+}
+
+static void ffbDDStencilMask(GLcontext *ctx, GLuint mask)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	mask &= 0xf;
+	if (fmesa->ypmask != mask) {
+		fmesa->ypmask = mask;
+		fmesa->state_dirty |= FFB_STATE_YPMASK;
+		fmesa->state_fifo_ents += 1;
+	}
+}
+
+static void ffbDDStencilOp(GLcontext *ctx, GLenum fail, GLenum zfail, GLenum zpass)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int stencilctl;
+
+	/* We will properly update sw/hw state when stenciling is
+	 * enabled.
+	 */
+	if (! ctx->Stencil.Enabled)
+		return;
+
+	stencilctl = fmesa->stencilctl;
+	stencilctl &= ~(0xfff00000);
+
+	switch (fail) {
+	case GL_ZERO:		stencilctl |= (0 << 28); break;
+	case GL_KEEP:		stencilctl |= (1 << 28); break;
+	case GL_INVERT:		stencilctl |= (2 << 28); break;
+	case GL_REPLACE:	stencilctl |= (3 << 28); break;
+	case GL_INCR:		stencilctl |= (4 << 28); break;
+	case GL_DECR:		stencilctl |= (5 << 28); break;
+
+	default:
+		return;
+	};
+
+	switch (zfail) {
+	case GL_ZERO:		stencilctl |= (0 << 24); break;
+	case GL_KEEP:		stencilctl |= (1 << 24); break;
+	case GL_INVERT:		stencilctl |= (2 << 24); break;
+	case GL_REPLACE:	stencilctl |= (3 << 24); break;
+	case GL_INCR:		stencilctl |= (4 << 24); break;
+	case GL_DECR:		stencilctl |= (5 << 24); break;
+
+	default:
+		return;
+	};
+
+	switch (zpass) {
+	case GL_ZERO:		stencilctl |= (0 << 20); break;
+	case GL_KEEP:		stencilctl |= (1 << 20); break;
+	case GL_INVERT:		stencilctl |= (2 << 20); break;
+	case GL_REPLACE:	stencilctl |= (3 << 20); break;
+	case GL_INCR:		stencilctl |= (4 << 20); break;
+	case GL_DECR:		stencilctl |= (5 << 20); break;
+
+	default:
+		return;
+	};
+
+	if (fmesa->stencilctl != stencilctl) {
+		fmesa->stencilctl = stencilctl;
+		fmesa->state_dirty |= FFB_STATE_STENCIL;
+		fmesa->state_fifo_ents += 6;
+	}
+}
+
+void ffbDDScissor(GLcontext *ctx, GLint cx, GLint cy,
+		  GLsizei cw, GLsizei ch)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+	GLint x, y;
+	unsigned int vcmin, vcmax;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDScissor: x(%x) y(%x) w(%x) h(%x)\n",
+		cx, cy, cw, ch);
+#endif
+	x = cx + dPriv->x;
+	y = dPriv->y + (cy - ch);
+	vcmin = ((y & 0xffff) << 16) | (x & 0xffff);
+	vcmax = ((((y + ch) & 0xffff) << 16) |
+		 (((x + cw) & 0xffff)));
+	if (fmesa->vclipmin != vcmin ||
+	    fmesa->vclipmax != vcmax) {
+		fmesa->vclipmin = vcmin;
+		fmesa->vclipmax = vcmax;
+		fmesa->state_dirty |= FFB_STATE_CLIP;
+		fmesa->state_fifo_ents += 4 + (4 * 2);
+	}
+}
+
+static GLboolean ffbDDSetDrawBuffer(GLcontext *ctx, GLenum buffer)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int fbc = fmesa->fbc;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDSetDrawBuffer: mode(%s)\n",
+		gl_lookup_enum_by_nr(buffer));
+#endif
+	fbc &= ~(FFB_FBC_WB_AB);
+	switch (buffer) {
+	case GL_FRONT_LEFT:
+		if (fmesa->back_buffer == 0)
+			fbc |= FFB_FBC_WB_B;
+		else
+			fbc |= FFB_FBC_WB_A;
+		break;
+
+	case GL_BACK_LEFT:
+		if (fmesa->back_buffer == 0)
+			fbc |= FFB_FBC_WB_A;
+		else
+			fbc |= FFB_FBC_WB_B;
+		break;
+
+	case GL_FRONT_AND_BACK:
+		fbc |= FFB_FBC_WB_AB;
+		break;
+
+	default:
+		return GL_FALSE;
+	};
+
+	if (fbc != fmesa->fbc) {
+		fmesa->fbc = fbc;
+		fmesa->state_dirty |= FFB_STATE_FBC;
+		fmesa->state_fifo_ents += 1;
+	}
+
+	return GL_TRUE;
+}
+
+static void ffbDDSetReadBuffer(GLcontext *ctx, GLframebuffer *colorBuffer,
+			       GLenum buffer)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int fbc = fmesa->fbc;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDSetReadBuffer: mode(%s)\n",
+		gl_lookup_enum_by_nr(buffer));
+#endif
+	fbc &= ~(FFB_FBC_RB_MASK);
+	switch (buffer) {
+	case GL_FRONT_LEFT:
+		if (fmesa->back_buffer == 0)
+			fbc |= FFB_FBC_RB_B;
+		else
+			fbc |= FFB_FBC_RB_A;
+		break;
+
+	case GL_BACK_LEFT:
+		if (fmesa->back_buffer == 0)
+			fbc |= FFB_FBC_RB_A;
+		else
+			fbc |= FFB_FBC_RB_B;
+		break;
+
+	default:
+		return;
+	};
+
+	if (fbc != fmesa->fbc) {
+		fmesa->fbc = fbc;
+		fmesa->state_dirty |= FFB_STATE_FBC;
+		fmesa->state_fifo_ents += 1;
+	}
+}
+
+static void ffbDDSetColor(GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	fmesa->MonoColor = ((r <<  0) |
+			    (g << 8) |
+			    (b << 16));
+}
+
+static void ffbDDClearColor(GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	fmesa->clear_pixel = ((r << 0) |
+			      (g << 8) |
+			      (b << 16));
+}
+
+static void ffbDDClearDepth(GLcontext *ctx, GLclampd depth)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	fmesa->clear_depth = Z_FROM_MESA(depth * 4294967295.0f);
+}
+
+static void ffbDDClearStencil(GLcontext *ctx, GLint stencil)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	fmesa->clear_stencil = stencil & 0xf;
+}
+
+static void ffbDDReducedPrimitiveChange(GLcontext *ctx, GLenum prim)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	GLuint drawop, fbc, ppc;
+	int do_sw = 0;
+
+	drawop = fmesa->drawop;
+	fbc = fmesa->fbc;
+	ppc = fmesa->ppc & ~(FFB_PPC_ZS_MASK | FFB_PPC_CS_MASK);
+
+#ifdef STATE_TRACE
+	fprintf(stderr,
+		"ffbDDReducedPrimitiveChange: prim(%d) ", prim);
+#endif
+	switch(prim) {
+	case GL_POINTS:
+#ifdef STATE_TRACE
+		fprintf(stderr, "GL_POINTS ");
+#endif
+		if (ctx->IndirectTriangles & DD_POINT_SW_RASTERIZE) {
+			do_sw = 1;
+			break;
+		}
+
+		if (ctx->TriangleCaps & DD_POINT_SIZE) {
+			ppc |= FFB_PPC_ZS_CONST | FFB_PPC_CS_CONST;
+			drawop = FFB_DRAWOP_TRIANGLE;
+		} else {
+			if (ctx->Point.SmoothFlag) {
+				ppc |= (FFB_PPC_ZS_VAR | FFB_PPC_CS_CONST);
+				drawop = FFB_DRAWOP_AADOT;
+			} else {
+				ppc |= (FFB_PPC_ZS_CONST | FFB_PPC_CS_CONST);
+				drawop = FFB_DRAWOP_DOT;
+			}
+		}
+		break;
+
+	case GL_LINES:
+#ifdef STATE_TRACE
+		fprintf(stderr, "GL_LINES ");
+#endif
+		if (ctx->IndirectTriangles & DD_LINE_SW_RASTERIZE) {
+			do_sw = 1;
+			break;
+		}
+
+		if (ctx->TriangleCaps & DD_FLATSHADE) {
+			ppc |= FFB_PPC_ZS_VAR | FFB_PPC_CS_CONST;
+		} else {
+			ppc |= FFB_PPC_ZS_VAR | FFB_PPC_CS_VAR;
+		}
+		if (ctx->TriangleCaps & DD_LINE_WIDTH) {
+			drawop = FFB_DRAWOP_TRIANGLE;
+		} else {
+			if (ctx->Line.SmoothFlag)
+				drawop = FFB_DRAWOP_AALINE;
+			else
+				drawop = FFB_DRAWOP_DDLINE;
+		}
+		break;
+
+	case GL_POLYGON:
+#ifdef STATE_TRACE
+		fprintf(stderr, "GL_POLYGON ");
+#endif
+		if (ctx->IndirectTriangles & DD_TRI_SW_RASTERIZE) {
+			do_sw = 1;
+			break;
+		}
+
+		ppc &= ~FFB_PPC_APE_MASK;
+		if (ctx->Polygon.StippleFlag)
+			ppc |= FFB_PPC_APE_ENABLE;
+		else
+			ppc |= FFB_PPC_APE_DISABLE;
+
+		if (ctx->TriangleCaps & DD_FLATSHADE) {
+			ppc |= FFB_PPC_ZS_VAR | FFB_PPC_CS_CONST;
+		} else {
+			ppc |= FFB_PPC_ZS_VAR | FFB_PPC_CS_VAR;
+		}
+		drawop = FFB_DRAWOP_TRIANGLE;
+		break;
+
+	default:
+#ifdef STATE_TRACE
+		fprintf(stderr, "unknown %d!\n", prim);
+#endif
+		return;
+	};
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "do_sw(%d) ", do_sw);
+#endif
+	if (do_sw != 0) {
+		fbc &= ~(FFB_FBC_WB_C);
+		fbc &= ~(FFB_FBC_ZE_MASK | FFB_FBC_RGBE_MASK);
+		fbc |=   FFB_FBC_ZE_OFF  | FFB_FBC_RGBE_MASK;
+		ppc &= ~(FFB_PPC_XS_MASK | FFB_PPC_ABE_MASK |
+			 FFB_PPC_DCE_MASK | FFB_PPC_APE_MASK);
+		ppc |=  (FFB_PPC_ZS_VAR | FFB_PPC_CS_VAR | FFB_PPC_XS_WID |
+			 FFB_PPC_ABE_DISABLE | FFB_PPC_DCE_DISABLE |
+			 FFB_PPC_APE_DISABLE);
+	} else {
+		fbc |= FFB_FBC_WB_C;
+		fbc &= ~(FFB_FBC_RGBE_MASK);
+		fbc |=   FFB_FBC_RGBE_MASK;
+		ppc &= ~(FFB_PPC_ABE_MASK | FFB_PPC_XS_MASK);
+		if (ctx->Color.BlendEnabled) {
+			ppc |= FFB_PPC_ABE_ENABLE | FFB_PPC_XS_VAR;
+		} else {
+			ppc |= FFB_PPC_ABE_DISABLE | FFB_PPC_XS_WID;
+		}
+	}
+#ifdef STATE_TRACE
+	fprintf(stderr, "fbc(%08x) ppc(%08x)\n", fbc, ppc);
+#endif
+
+	FFBFifo(fmesa, 4);
+	if (fmesa->drawop != drawop)
+		fmesa->regs->drawop = fmesa->drawop = drawop;
+	if (fmesa->fbc != fbc)
+		fmesa->regs->fbc = fmesa->fbc = fbc;
+	if (fmesa->ppc != ppc)
+		fmesa->regs->ppc = fmesa->ppc = ppc;
+	if (do_sw != 0) {
+		fmesa->regs->cmp =
+			(fmesa->cmp & ~(0xff<<16)) | (0x80 << 16);
+	} else
+		fmesa->regs->cmp = fmesa->cmp;
+
+	/* Flush the vertex cache. */
+	fmesa->vtx_cache[0] = fmesa->vtx_cache[1] =
+		fmesa->vtx_cache[2] = fmesa->vtx_cache[3] = NULL;
+}
+
+/* XXX Actually, should I be using FBC controls for this? -DaveM */
+static GLboolean ffbDDColorMask(GLcontext *ctx,
+				GLboolean r, GLboolean g,
+				GLboolean b, GLboolean a)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int new_pmask = 0x0;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDColorMask: r(%d) g(%d) b(%d) a(%d)\n",
+		r, g, b, a);
+#endif
+	if (r)
+		new_pmask |= 0x000000ff;
+	if (g)
+		new_pmask |= 0x0000ff00;
+	if (b)
+		new_pmask |= 0x00ff0000;
+
+	if (fmesa->pmask != new_pmask) {
+		fmesa->pmask = new_pmask;
+		fmesa->state_dirty |= FFB_STATE_PMASK;
+		fmesa->state_fifo_ents += 1;
+	}
+
+	return GL_TRUE;
+}
+
+static GLboolean ffbDDLogicOp(GLcontext *ctx, GLenum op)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int rop;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDLogicOp: op(%s)\n",
+		gl_lookup_enum_by_nr(op));
+#endif
+	switch (op) {
+	case GL_CLEAR: rop = FFB_ROP_ZERO; break;
+	case GL_SET: rop = FFB_ROP_ONES; break;
+	case GL_COPY: rop = FFB_ROP_NEW; break;
+	case GL_AND: rop = FFB_ROP_NEW_AND_OLD; break;
+	case GL_NAND: rop = FFB_ROP_NEW_AND_NOLD; break;
+	case GL_OR: rop = FFB_ROP_NEW_OR_OLD; break;
+	case GL_NOR: rop = FFB_ROP_NEW_OR_NOLD; break;
+	case GL_XOR: rop = FFB_ROP_NEW_XOR_OLD; break;
+	case GL_NOOP: rop = FFB_ROP_OLD; break;
+	case GL_COPY_INVERTED: rop = FFB_ROP_NNEW; break;
+	case GL_INVERT: rop = FFB_ROP_NOLD; break;
+	case GL_EQUIV: rop = FFB_ROP_NNEW_XOR_NOLD; break;
+	case GL_AND_REVERSE: rop = FFB_ROP_NEW_AND_NOLD; break;
+	case GL_AND_INVERTED: rop = FFB_ROP_NNEW_AND_OLD; break;
+	case GL_OR_REVERSE: rop = FFB_ROP_NEW_OR_NOLD; break;
+	case GL_OR_INVERTED: rop = FFB_ROP_NNEW_OR_OLD; break;
+
+	default:
+		return GL_FALSE;
+	};
+
+	rop |= fmesa->rop & ~0xff;
+	if (rop != fmesa->rop) {
+		fmesa->rop = rop;
+		fmesa->state_dirty |= FFB_STATE_ROP;
+		fmesa->state_fifo_ents += 1;
+
+		if (op == GL_COPY)
+			fmesa->bad_fragment_attrs &= ~FFB_BADATTR_BLENDROP;
+	}
+
+	return GL_TRUE;
+}
+
+#if 0
+/* XXX Also need to track near/far just like 3dfx driver.
+ * XXX
+ * XXX Actually, that won't work, because the 3dfx chip works by
+ * XXX having 1/w coordinates fed to it for each primitive, and
+ * XXX it uses this to index it's 64 entry fog table.
+ */
+static void ffb_fog_linear(GLcontext *ctx, ffbContextPtr fmesa)
+{
+	GLfloat c = ctx->ProjectionMatrix.m[10];
+	GLfloat d = ctx->ProjectionMatrix.m[14];
+	GLfloat tz = ctx->Viewport.WindowMap.m[MAT_TZ];
+	GLfloat szInv = 1.0F / ctx->Viewport.WindowMap.m[MAT_SZ];
+	GLfloat fogEnd = ctx->Fog.End;
+	GLfloat fogScale = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
+	GLfloat ndcz;
+	GLfloat eyez;
+	GLfloat Zzero, Zone;
+	unsigned int zb, zf;
+
+	/* Compute the Z at which f reaches 0.0, this is the full
+	 * saturation point.
+	 *
+	 * Thus compute Z (as seen by the chip during rendering),
+	 * such that:
+	 *
+	 *	0.0 = (fogEnd - eyez) * fogScale
+	 *
+	 * fogScale is usually not zero, thus we are looking for:
+	 *
+	 *	fogEnd = eyez
+	 *
+	 *	fogEnd = -d / (c + ((Z - tz) * szInv))
+	 *	fogEnd * (c + ((Z - tz) * szInv)) = -d
+	 *	(c + ((Z - tz) * szInv)) = -d / fogEnd
+	 *	(Z - tz) * szInv = (-d / fogEnd) - c
+	 *	(Z - tz) = ((-d / fogEnd) - c) / szInv
+	 *	Z = (((-d / fogEnd) - c) / szInv) + tz
+	 */
+	Zzero = (((-d / fogEnd) - c) / szInv) + tz;
+
+	/* Compute the Z at which f reaches 1.0, this is where
+	 * the incoming frag's full intensity is shown.  This
+	 * equation is:
+	 *
+	 *	1.0 = (fogEnd - eyez)
+	 *
+	 * We are looking for:
+	 *
+	 *	1.0 + eyez = fogEnd
+	 *
+	 *	1.0 + (-d / (c + ((Z - tz) * szInv))) = fogEnd
+	 *	-d / (c + ((Z - tz) * szInv)) = fogEnd - 1.0
+	 *	-d / (FogEnd - 1.0) = (c + ((Z - tz) * szInv))
+	 *	(-d / (fogEnd - 1.0)) - c = ((Z - tz) * szInv)
+	 *	((-d / (fogEnd - 1.0)) - c) / szInv = (Z - tz)
+	 *	(((-d / (fogEnd - 1.0)) - c) / szInv) + tz = Z
+	 */
+	Zone = (((-d / (fogEnd - 1.0)) - c) / szInv) + tz;
+
+	/* FFB's Zfront must be less than Zback, thus we may have
+	 * to invert Sf/Sb to satisfy this constraint.
+	 */
+	if (Zzero < Zone) {
+		sf = 0.0;
+		sb = 1.0;
+		zf = Z_FROM_MESA(Zzero);
+		zb = Z_FROM_MESA(Zone);
+	} else {
+		sf = 1.0;
+		sb = 0.0;
+		zf = Z_FROM_MESA(Zone);
+		zb = Z_FROM_MESA(Zzero);
+	}
+}
+#endif
+
+static void ffbDDFogfv(GLcontext *ctx, GLenum pname, const GLfloat *param)
+{
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDFogfv: pname(%s)\n", gl_lookup_enum_by_nr(pname));
+#endif
+}
+
+static void ffbDDLineStipple(GLcontext *ctx, GLint factor, GLushort pattern)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDLineStipple: factor(%d) pattern(%04x)\n",
+		factor, pattern);
+#endif
+	if (ctx->Line.StippleFlag) {
+		factor = ctx->Line.StippleFactor;
+		pattern = ctx->Line.StipplePattern;
+		if ((GLuint) factor > 15) {
+			ctx->Driver.TriangleCaps &= ~DD_LINE_STIPPLE;
+			fmesa->lpat = FFB_LPAT_BAD;
+		} else {
+			ctx->Driver.TriangleCaps |= DD_LINE_STIPPLE;
+			fmesa->lpat = ((factor << FFB_LPAT_SCALEVAL_SHIFT) |
+				       (0 << FFB_LPAT_PATLEN_SHIFT) |
+				       ((pattern & 0xffff) << FFB_LPAT_PATTERN_SHIFT));
+		}
+	} else {
+		fmesa->lpat = 0;
+	}
+}
+
+void ffbXformAreaPattern(ffbContextPtr fmesa, const GLubyte *mask)
+{
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+	int i, lines, xoff;
+
+	lines = 0;
+	i = (dPriv->y + dPriv->h) & (32 - 1);
+	xoff = dPriv->x & (32 - 1);
+	while (lines++ < 32) {
+		GLuint raw =
+			(((GLuint)mask[0] << 24) |
+			 ((GLuint)mask[1] << 16) |
+			 ((GLuint)mask[2] <<  8) |
+			 ((GLuint)mask[3] <<  0));
+
+		fmesa->pattern[i] =
+			(raw << xoff) | (raw >> (32 - xoff));
+		i = (i - 1) & (32 - 1);
+		mask += 4;
+	}
+
+	fmesa->state_dirty |= FFB_STATE_APAT;
+	fmesa->state_fifo_ents += 32;
+}
+
+static void ffbDDPolygonStipple(GLcontext *ctx, const GLubyte *mask)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDPolygonStipple: state(%d)\n",
+		ctx->Polygon.StippleFlag);
+#endif
+	if (ctx->Polygon.StippleFlag) {
+		ctx->Driver.TriangleCaps |= DD_TRI_STIPPLE;
+	} else {
+		ctx->Driver.TriangleCaps &= ~DD_TRI_STIPPLE;
+	}
+	ffbXformAreaPattern(fmesa, mask);
+}
+
+static void ffbDDEnable(GLcontext *ctx, GLenum cap, GLboolean state)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int tmp;
+
+#ifdef STATE_TRACE
+	fprintf(stderr, "ffbDDEnable: %s state(%d)\n",
+		gl_lookup_enum_by_nr(cap), state);
+#endif
+	switch (cap) {
+	case GL_ALPHA_TEST:
+		if (state)
+			tmp = ffbComputeAlphaFunc(ctx);
+		else
+			tmp = FFB_XCLIP_TEST_ALWAYS;
+
+		if (tmp != fmesa->xclip) {
+			fmesa->xclip = tmp;
+			fmesa->state_dirty |= FFB_STATE_XCLIP;
+			fmesa->state_fifo_ents += 1;
+		}
+		break;
+
+	case GL_BLEND:
+		tmp = (fmesa->ppc & ~FFB_PPC_ABE_MASK);
+		if (state) {
+			tmp |= FFB_PPC_ABE_ENABLE;
+		} else {
+			tmp |= FFB_PPC_ABE_DISABLE;
+		}
+		if (fmesa->ppc != tmp) {
+			fmesa->ppc = tmp;
+			fmesa->state_dirty |= FFB_STATE_PPC;
+			fmesa->state_fifo_ents += 1;
+			ffbDDBlendFunc(ctx, 0, 0);
+		}
+		break;
+
+	case GL_DEPTH_TEST:
+		if (state)
+			tmp = 0x0fffffff;
+		else
+			tmp = 0x00000000;
+		if (tmp != fmesa->magnc) {
+			unsigned int fbc = fmesa->fbc;
+			fbc &= ~FFB_FBC_ZE_MASK;
+			if (state)
+				fbc |= FFB_FBC_ZE_ON;
+			else
+				fbc |= FFB_FBC_ZE_OFF;
+			fmesa->fbc = fbc;
+			ffbDDDepthFunc(ctx, ctx->Depth.Func);
+			fmesa->magnc = tmp;
+			fmesa->state_dirty |= FFB_STATE_MAGNC | FFB_STATE_FBC;
+			fmesa->state_fifo_ents += 2;
+		}
+		break;
+
+	case GL_SCISSOR_TEST:
+		tmp = fmesa->ppc & ~FFB_PPC_VCE_MASK;
+		if (state) {
+			ffbDDScissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
+				     ctx->Scissor.Width, ctx->Scissor.Height);
+			tmp |= FFB_PPC_VCE_2D;
+	        } else {
+			tmp |= FFB_PPC_VCE_DISABLE;
+		}
+		break;
+
+	case GL_STENCIL_TEST:
+		if (!(fmesa->ffb_sarea->flags & FFB_DRI_FFB2PLUS)) {
+			if (state)
+				fmesa->bad_fragment_attrs |= FFB_BADATTR_STENCIL;
+			else
+				fmesa->bad_fragment_attrs &= ~FFB_BADATTR_STENCIL;
+			break;
+		}
+
+		tmp = fmesa->fbc & ~FFB_FBC_YE_MASK;
+		if (state) {
+			ffbDDStencilFunc(ctx,
+					 ctx->Stencil.Function,
+					 ctx->Stencil.Ref,
+					 ctx->Stencil.ValueMask);
+			ffbDDStencilMask(ctx, ctx->Stencil.WriteMask);
+			ffbDDStencilOp(ctx,
+				       ctx->Stencil.FailFunc,
+				       ctx->Stencil.ZFailFunc,
+				       ctx->Stencil.ZPassFunc);
+			tmp |= FFB_FBC_YE_MASK;
+		} else {
+			fmesa->stencil		= 0xf0000000;
+			fmesa->stencilctl	= 0x33300000;
+			fmesa->state_dirty |= FFB_STATE_STENCIL;
+			fmesa->state_fifo_ents += 6;
+			tmp |= FFB_FBC_YE_OFF;
+		}
+		if (tmp != fmesa->fbc) {
+			fmesa->fbc = tmp;
+			fmesa->state_dirty |= FFB_STATE_FBC;
+			fmesa->state_fifo_ents += 1;
+		}
+		break;
+
+	case GL_FOG:
+		/* Until I implement the fog support... */
+		if (state)
+			fmesa->bad_fragment_attrs |= FFB_BADATTR_FOG;
+		else
+			fmesa->bad_fragment_attrs &= ~FFB_BADATTR_FOG;
+		break;
+
+	case GL_LINE_STIPPLE:
+		if (! state)
+			fmesa->lpat = 0;
+		else
+			ffbDDLineStipple(ctx,
+					 ctx->Line.StippleFactor,
+					 ctx->Line.StipplePattern);
+		break;
+
+	case GL_POLYGON_STIPPLE:
+		/* Do nothing, we interrogate the state during
+		 * reduced primitive changes.  Since our caller
+		 * will set NEW_POLYGON in the ctx NewState this
+		 * will cause the driver rasterization functions
+		 * to be reevaluated, which will cause us to force
+		 * a reduced primitive change next rendering pass
+		 * and it all works out.
+		 */
+		break;
+
+	default:
+		break;
+	};
+}
+
+void ffbSyncHardware(ffbContextPtr fmesa)
+{
+	ffb_fbcPtr ffb = fmesa->regs;
+	unsigned int dirty;
+	int i;
+
+	FFBFifo(fmesa, fmesa->state_fifo_ents);
+
+	dirty = fmesa->state_dirty;
+	if (dirty & (FFB_STATE_FBC | FFB_STATE_PPC | FFB_STATE_DRAWOP |
+		     FFB_STATE_ROP | FFB_STATE_LPAT | FFB_STATE_WID)) {
+		if (dirty & FFB_STATE_FBC)
+			ffb->fbc = fmesa->fbc;
+		if (dirty & FFB_STATE_PPC)
+			ffb->ppc = fmesa->ppc;
+		if (dirty & FFB_STATE_DRAWOP)
+			ffb->drawop = fmesa->drawop;
+		if (dirty & FFB_STATE_ROP)
+			ffb->rop = fmesa->rop;
+		if (dirty & FFB_STATE_LPAT)
+			ffb->rop = fmesa->lpat;
+		if (dirty & FFB_STATE_WID)
+			ffb->wid = fmesa->wid;
+	}
+	if (dirty & (FFB_STATE_PMASK | FFB_STATE_XPMASK | FFB_STATE_YPMASK |
+		     FFB_STATE_ZPMASK | FFB_STATE_XCLIP | FFB_STATE_CMP |
+		     FFB_STATE_MATCHAB | FFB_STATE_MAGNAB | FFB_STATE_MATCHC |
+		     FFB_STATE_MAGNC)) {
+		if (dirty & FFB_STATE_PMASK)
+			ffb->pmask = fmesa->pmask;
+		if (dirty & FFB_STATE_XPMASK)
+			ffb->xpmask = fmesa->xpmask;
+		if (dirty & FFB_STATE_YPMASK)
+			ffb->ypmask = fmesa->ypmask;
+		if (dirty & FFB_STATE_ZPMASK)
+			ffb->zpmask = fmesa->zpmask;
+		if (dirty & FFB_STATE_XCLIP)
+			ffb->xclip = fmesa->xclip;
+		if (dirty & FFB_STATE_CMP)
+			ffb->cmp = fmesa->cmp;
+		if (dirty & FFB_STATE_MATCHAB)
+			ffb->matchab = fmesa->matchab;
+		if (dirty & FFB_STATE_MAGNAB)
+			ffb->magnab = fmesa->magnab;
+		if (dirty & FFB_STATE_MATCHC)
+			ffb->matchc = fmesa->matchc;
+		if (dirty & FFB_STATE_MAGNC)
+			ffb->magnc = fmesa->magnc;
+	}
+
+	if (dirty & FFB_STATE_DCUE) {
+		ffb->dcss = fmesa->dcss;
+		ffb->dcsf = fmesa->dcsf;
+		ffb->dcsb = fmesa->dcsb;
+		ffb->dczf = fmesa->dczf;
+		ffb->dczb = fmesa->dczb;
+		if (fmesa->ffb_sarea->flags & (FFB_DRI_FFB2 | FFB_DRI_FFB2PLUS)) {
+			ffb->dcss1 = fmesa->dcss1;
+			ffb->dcss2 = fmesa->dcss2;
+			ffb->dcss3 = fmesa->dcss3;
+			ffb->dcs2  = fmesa->dcs2;
+			ffb->dcs3  = fmesa->dcs3;
+			ffb->dcs4  = fmesa->dcs4;
+			ffb->dcd2  = fmesa->dcd2;
+			ffb->dcd3  = fmesa->dcd3;
+			ffb->dcd4  = fmesa->dcd4;
+		}
+	}
+
+	if (dirty & FFB_STATE_BLEND) {
+		ffb->blendc  = fmesa->blendc;
+		ffb->blendc1 = fmesa->blendc1;
+		ffb->blendc2 = fmesa->blendc2;
+	}
+
+	if (dirty & FFB_STATE_CLIP) {
+		ffb->vclipmin  = fmesa->vclipmin;
+		ffb->vclipmax  = fmesa->vclipmax;
+		ffb->vclipzmin = fmesa->vclipzmin;
+		ffb->vclipzmax = fmesa->vclipzmax;
+		for (i = 0; i < 4; i++) {
+			ffb->auxclip[i].min = fmesa->aux_clips[i].min;
+			ffb->auxclip[i].max = fmesa->aux_clips[i].max;
+		}
+	}
+
+	if ((dirty & FFB_STATE_STENCIL) &&
+	    (fmesa->ffb_sarea->flags & FFB_DRI_FFB2PLUS)) {
+		ffb->stencil    = fmesa->stencil;
+		ffb->stencilctl = fmesa->stencilctl;
+		ffb->fbc = FFB_FBC_WB_C;
+		ffb->rawstencilctl = (fmesa->stencilctl | (1 << 19));
+		ffb->fbc = fmesa->fbc;
+		ffb->consty = fmesa->consty;
+	}
+
+	if (dirty & FFB_STATE_APAT) {
+		for (i = 0; i < 32; i++)
+			ffb->pattern[i] = fmesa->pattern[i];
+	}
+
+	fmesa->state_dirty = 0;
+	fmesa->state_fifo_ents = 0;
+	fmesa->ffbScreen->rp_active = 1;
+}
+
+static void ffbDDRenderStart(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	LOCK_HARDWARE(fmesa);
+	fmesa->hw_locked = 1;
+
+	if (fmesa->state_dirty != 0)
+		ffbSyncHardware(fmesa);
+}
+
+static void ffbDDRenderFinish(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	UNLOCK_HARDWARE(fmesa);
+	fmesa->hw_locked = 0;
+}
+
+#define INTERESTED (~(NEW_MODELVIEW|NEW_PROJECTION|\
+                      NEW_TEXTURE_MATRIX|\
+                      NEW_USER_CLIP|NEW_CLIENT_STATE|\
+                      NEW_TEXTURE_ENABLE))
+
+static void ffbDDUpdateState(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	unsigned int flags;
+
+	if (ctx->NewState & INTERESTED) {
+		if (fmesa->SWrender ||
+		    fmesa->bad_fragment_attrs != 0) {
+			/* Force SW rendering. */
+			fmesa->PointsFunc = NULL;
+			fmesa->LineFunc = NULL;
+			fmesa->TriangleFunc = NULL;
+			fmesa->QuadFunc = NULL;
+		} else {
+			ffbDDChooseTriRenderState(ctx);
+			ffbDDChooseLineRenderState(ctx);
+			ffbDDChoosePointRenderState(ctx);
+		}
+
+		if (0)
+			gl_print_tri_caps("tricaps", ctx->TriangleCaps);
+
+		ffbChooseRasterSetupFunc(ctx);
+
+		/* Force a reduced primitive change next rendering
+		 * pass.
+		 */
+		ctx->PB->primitive = GL_POLYGON + 1;
+	}
+
+#if 0
+	/* When the modelview matrix changes, this changes what
+	 * the eye coordinates will be so we have to recompute
+	 * the depth cueing parameters.
+	 *
+	 * XXX DD_HAVE_HARDWARE_FOG.
+	 */
+	if (ctx->Fog.Enabled && (ctx->NewState & NEW_MODELVIEW))
+		ffb_update_fog();
+#endif
+
+	/* XXX It may be possible to eliminate all of Mesa's sw clip
+	 * XXX processing using the hw clip registers we have.  If
+	 * XXX this is correct, it is just a matter of verifying the
+	 * XXX FFB coordinate overflow rules in ffb_vb.c and if they
+	 * XXX are not violated we clear CLIP_MASK_ACTIVE in
+	 * XXX VB->CullMode.
+	 * XXX
+	 * XXX We would specify the xyz min/max values in the primary
+	 * XXX viewport clip registers, and the user specified
+	 * XXX scissor clip can go into one of the auxilliary viewport
+	 * XXX clips.
+	 */
+	flags = ctx->IndirectTriangles;
+	if (fmesa->PointsFunc != NULL) {
+		ctx->Driver.PointsFunc = fmesa->PointsFunc;
+		flags &= ~DD_POINT_SW_RASTERIZE;
+	}
+	if (fmesa->LineFunc != NULL) {
+		ctx->Driver.LineFunc = fmesa->LineFunc;
+		flags &= ~DD_LINE_SW_RASTERIZE;
+	}
+	if (fmesa->TriangleFunc != NULL) {
+		ctx->Driver.TriangleFunc = fmesa->TriangleFunc;
+		ctx->Driver.QuadFunc = fmesa->QuadFunc;
+		flags &= ~(DD_TRI_SW_RASTERIZE |
+			   DD_QUAD_SW_RASTERIZE);
+	}
+	ctx->IndirectTriangles = flags;
+}
+
+void ffbDDInitStateFuncs(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	ctx->Driver.UpdateState = ffbDDUpdateState;
+	ctx->Driver.Enable = ffbDDEnable;
+	ctx->Driver.LightModelfv = NULL;
+	ctx->Driver.AlphaFunc = ffbDDAlphaFunc;
+	ctx->Driver.BlendEquation = ffbDDBlendEquation;
+	ctx->Driver.BlendFunc = ffbDDBlendFunc;
+	ctx->Driver.BlendFuncSeparate = ffbDDBlendFuncSeparate;
+	ctx->Driver.DepthFunc = ffbDDDepthFunc;
+	ctx->Driver.DepthMask = ffbDDDepthMask;
+	ctx->Driver.Fogfv = ffbDDFogfv;
+	ctx->Driver.LineStipple = ffbDDLineStipple;
+	ctx->Driver.PolygonStipple = ffbDDPolygonStipple;
+	ctx->Driver.Scissor = ffbDDScissor;
+	ctx->Driver.CullFace = NULL;
+	ctx->Driver.FrontFace = NULL;
+	ctx->Driver.ColorMask = ffbDDColorMask;
+	ctx->Driver.LogicOp = ffbDDLogicOp;
+	ctx->Driver.ReducedPrimitiveChange = ffbDDReducedPrimitiveChange;
+	ctx->Driver.RenderStart = ffbDDRenderStart; 
+	ctx->Driver.RenderFinish = ffbDDRenderFinish; 
+
+	if (fmesa->ffb_sarea->flags & FFB_DRI_FFB2PLUS) {
+		ctx->Driver.StencilFunc = ffbDDStencilFunc;
+		ctx->Driver.StencilMask = ffbDDStencilMask;
+		ctx->Driver.StencilOp = ffbDDStencilOp;
+	} else {
+		ctx->Driver.StencilFunc = NULL;
+		ctx->Driver.StencilMask = NULL;
+		ctx->Driver.StencilOp = NULL;
+	}
+
+	ctx->Driver.SetDrawBuffer = ffbDDSetDrawBuffer;
+	ctx->Driver.SetReadBuffer = ffbDDSetReadBuffer;
+	ctx->Driver.Color = ffbDDSetColor;
+	ctx->Driver.ClearColor = ffbDDClearColor;
+	ctx->Driver.ClearDepth = ffbDDClearDepth;
+	ctx->Driver.ClearStencil = ffbDDClearStencil;
+	ctx->Driver.Dither = NULL;
+
+	/* We will support color index modes later... -DaveM */
+	ctx->Driver.Index = 0;
+	ctx->Driver.ClearIndex = 0;
+	ctx->Driver.IndexMask = 0;
+}
+
+void ffbDDInitContextHwState(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	int fifo_count = 0;
+	int i;
+
+	fmesa->hw_locked = 0;
+
+	fmesa->bad_fragment_attrs = 0;
+	fmesa->state_dirty = FFB_STATE_ALL;
+
+	fifo_count = 1;
+	fmesa->fbc = (FFB_FBC_WE_FORCEON | FFB_FBC_WM_COMBINED |
+		      FFB_FBC_SB_BOTH | FFB_FBC_ZE_MASK |
+		      FFB_FBC_YE_OFF | FFB_FBC_XE_OFF |
+		      FFB_FBC_RGBE_MASK);
+	if (ctx->Visual->DBflag) {
+		/* Buffer B is the initial back buffer. */
+		fmesa->back_buffer = 1;
+		fmesa->fbc |= FFB_FBC_WB_BC | FFB_FBC_RB_B;
+	} else {
+		fmesa->back_buffer = 0;
+		fmesa->fbc |= FFB_FBC_WB_A | FFB_FBC_RB_A;
+	}
+
+	fifo_count += 1;
+	fmesa->ppc = (FFB_PPC_ACE_DISABLE | FFB_PPC_DCE_DISABLE |
+		      FFB_PPC_ABE_DISABLE | FFB_PPC_VCE_DISABLE |
+		      FFB_PPC_APE_DISABLE | FFB_PPC_TBE_OPAQUE |
+		      FFB_PPC_ZS_CONST | FFB_PPC_YS_CONST |
+		      FFB_PPC_XS_WID | FFB_PPC_CS_VAR);
+
+	fifo_count += 3;
+	fmesa->drawop = FFB_DRAWOP_RECTANGLE;
+
+	/* GL_COPY is the default LogicOp. */
+	fmesa->rop = (FFB_ROP_NEW << 16) | (FFB_ROP_NEW << 8) | FFB_ROP_NEW;
+
+	/* No line patterning enabled. */
+	fmesa->lpat = 0x00000000;
+
+	/* We do not know the WID value until the first context switch. */
+	fifo_count += 1;
+	fmesa->wid = ~0;
+
+	fifo_count += 5;
+
+	/* ColorMask, all enabled. */
+	fmesa->pmask  = 0xffffffff;
+
+	fmesa->xpmask = 0x000000ff;
+	fmesa->ypmask = 0x0000000f;
+	fmesa->zpmask = 0x0fffffff;
+
+	/* AlphaFunc GL_ALWAYS, AlphaRef 0 */
+	fmesa->xclip  = FFB_XCLIP_TEST_ALWAYS | 0x00;
+
+	/* This sets us up to use WID clipping (so the DRI clipping
+	 * rectangle is unneeded by us).  All other match and magnitude
+	 * tests are set to pass.
+	 */
+	fifo_count += 5;
+	fmesa->cmp = ((FFB_CMP_MATCH_ALWAYS << 24) |	/* MATCH C  */
+		      (FFB_CMP_MAGN_ALWAYS  << 16) |	/* MAGN  C  */
+		      (FFB_CMP_MATCH_EQ     <<  8) |	/* MATCH AB */
+		      (FFB_CMP_MAGN_ALWAYS  <<  0));	/* MAGN  AB */
+	fmesa->matchab = 0xff000000;
+	fmesa->magnab  = 0x00000000;
+	fmesa->matchc  = 0x00000000;
+	fmesa->magnc   = 0x00000000;
+
+	/* Depth cue parameters, all zeros to start. */
+	fifo_count += 14;
+	fmesa->dcss  = 0x00000000;
+	fmesa->dcsf  = 0x00000000;
+	fmesa->dcsb  = 0x00000000;
+	fmesa->dczf  = 0x00000000;
+	fmesa->dczb  = 0x00000000;
+	fmesa->dcss1 = 0x00000000;
+	fmesa->dcss2 = 0x00000000;
+	fmesa->dcss3 = 0x00000000;
+	fmesa->dcs2  = 0x00000000;
+	fmesa->dcs3  = 0x00000000;
+	fmesa->dcs4  = 0x00000000;
+	fmesa->dcd2  = 0x00000000;
+	fmesa->dcd3  = 0x00000000;
+	fmesa->dcd4  = 0x00000000;
+
+	/* Alpha blending unit state. */
+	fifo_count += 3;
+	fmesa->blendc  = (1 << 0) | (0 << 2);  /* src(GL_ONE) | dst(GL_ZERO) */
+	fmesa->blendc1 = 0x00000000;
+	fmesa->blendc2 = 0x00000000;
+
+	/* ViewPort clip state. */
+	fifo_count += 4 + (4 * 2);
+	fmesa->vclipmin  = 0x00000000;
+	fmesa->vclipmax  = 0x00000000;
+	fmesa->vclipzmin = 0x00000000;
+	fmesa->vclipzmax = 0x00000000;
+	for (i = 0; i < 4; i++) {
+		fmesa->aux_clips[0].min = 0x00000000;
+		fmesa->aux_clips[0].max = 0x00000000;
+	}
+
+	/* Stenciling state. */
+	fifo_count += 6;
+	fmesa->stencil    = 0xf0000000; /* Stencil MASK, Y plane */
+	fmesa->stencilctl = 0x33300000; /* All stencil tests disabled */
+	fmesa->consty	  = 0x0;
+
+	/* Area pattern, used for polygon stipples. */
+	fifo_count += 32;
+	for (i = 0; i < 32; i++)
+		fmesa->pattern[i] = 0x00000000;
+
+	fmesa->state_fifo_ents = fifo_count;
+	fmesa->state_all_fifo_ents = fifo_count;
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_state.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_state.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_state.h	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,13 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_state.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */
+
+#ifndef _FFB_STATE_H
+#define _FFB_STATE_H
+
+extern void ffbDDInitStateFuncs(GLcontext *);
+extern void ffbDDInitContextHwState(GLcontext *);
+
+extern void ffbDDScissor(GLcontext *, GLint, GLint, GLint, GLint);
+extern void ffbXformAreaPattern(ffbContextPtr, const GLubyte *);
+extern void ffbSyncHardware(ffbContextPtr fmesa);
+
+#endif /* !(_FFB_STATE_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,200 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c,v 1.1 2000/06/20 05:08:39 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_context.h"
+#include "ffb_stencil.h"
+#include "ffb_lock.h"
+
+static void 
+FFBWriteStencilSpan(GLcontext *ctx, GLuint n, GLint x, GLint y,
+		    const GLstencil stencil[], const GLubyte mask[])
+{
+	if (ctx->Depth.Mask) {
+		ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+		__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+		GLuint *zptr;
+		GLuint i;
+
+		if (!fmesa->hw_locked)
+			LOCK_HARDWARE(fmesa);
+		FFBFifo(fmesa, 2);
+		fmesa->regs->fbc = (FFB_FBC_WB_C | FFB_FBC_ZE_OFF |
+				    FFB_FBC_YE_ON | FFB_FBC_RGBE_OFF);
+		fmesa->regs->ppc = FFB_PPC_YS_VAR;
+		FFBWait(fmesa, fmesa->regs);
+
+		y = (dPriv->h - y);
+		zptr = (GLuint *)
+			((char *)fmesa->sfb32 +
+			 ((dPriv->x + x) << 2) +
+			 ((dPriv->y + y) << 13));
+		
+		for (i = 0; i < n; i++) {
+			if (mask[i])
+				*zptr = (stencil[i] & 0xf) << 28;
+			zptr++;
+		}
+
+		FFBFifo(fmesa, 2);
+		fmesa->regs->fbc = fmesa->fbc;
+		fmesa->regs->ppc = fmesa->ppc;
+		fmesa->ffbScreen->rp_active = 1;
+		if (!fmesa->hw_locked)
+			UNLOCK_HARDWARE(fmesa);
+	}
+}
+
+static void 
+FFBWriteStencilPixels(GLcontext *ctx, GLuint n, const GLint x[], const GLint y[],
+		      const GLstencil stencil[], const GLubyte mask[])
+{
+	if (ctx->Depth.Mask) {
+		ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+		__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+		char *zbase;
+		GLuint i;
+
+		if (!fmesa->hw_locked)
+			LOCK_HARDWARE(fmesa);
+		FFBFifo(fmesa, 2);
+		fmesa->regs->fbc = (FFB_FBC_WB_C | FFB_FBC_ZE_OFF |
+				    FFB_FBC_YE_ON | FFB_FBC_RGBE_OFF);
+		fmesa->regs->ppc = FFB_PPC_YS_VAR;
+		fmesa->ffbScreen->rp_active = 1;
+		FFBWait(fmesa, fmesa->regs);
+
+		zbase = ((char *)fmesa->sfb32 +
+			 (dPriv->x << 2) + (dPriv->y << 13));
+		
+		for (i = 0; i < n; i++) {
+			GLint y1 = (dPriv->h - y[i]);
+			GLint x1 = x[i];
+			GLuint *zptr;
+
+			zptr = (GLuint *)
+				(zbase + (x1 << 2) + (y1 << 13));
+			if (mask[i])
+				*zptr = (stencil[i] & 0xf) << 28;
+		}
+
+		FFBFifo(fmesa, 2);
+		fmesa->regs->fbc = fmesa->fbc;
+		fmesa->regs->ppc = fmesa->ppc;
+		fmesa->ffbScreen->rp_active = 1;
+		if (!fmesa->hw_locked)
+			UNLOCK_HARDWARE(fmesa);
+	}
+}
+
+static void 
+FFBReadStencilSpan(GLcontext *ctx, GLuint n, GLint x, GLint y, GLstencil stencil[])
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+	GLuint *zptr;
+	GLuint i;
+
+	if (!fmesa->hw_locked)
+		LOCK_HARDWARE(fmesa);
+	FFBFifo(fmesa, 1);
+	fmesa->regs->fbc = FFB_FBC_RB_C;
+	fmesa->ffbScreen->rp_active = 1;
+	FFBWait(fmesa, fmesa->regs);
+
+	y = (dPriv->h - y);
+	zptr = (GLuint *)
+		((char *)fmesa->sfb32 +
+		 ((dPriv->x + x) << 2) +
+		 ((dPriv->y + y) << 13));
+		
+	for (i = 0; i < n; i++) {
+		stencil[i] = (*zptr >> 28) & 0xf;
+		zptr++;
+	}
+
+	FFBFifo(fmesa, 1);
+	fmesa->regs->fbc = fmesa->fbc;
+	fmesa->ffbScreen->rp_active = 1;
+	if (!fmesa->hw_locked)
+		UNLOCK_HARDWARE(fmesa);
+}
+
+static void 
+FFBReadStencilPixels(GLcontext *ctx, GLuint n, const GLint x[], const GLint y[],
+		     GLstencil stencil[])
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+	char *zbase;
+	GLuint i;
+
+	if (!fmesa->hw_locked)
+		LOCK_HARDWARE(fmesa);
+	FFBFifo(fmesa, 1);
+	fmesa->regs->fbc = FFB_FBC_RB_C;
+	fmesa->ffbScreen->rp_active = 1;
+	FFBWait(fmesa, fmesa->regs);
+
+	zbase = ((char *)fmesa->sfb32 +
+		 (dPriv->x << 2) + (dPriv->y << 13));
+		
+	for (i = 0; i < n; i++) {
+		GLint y1 = (dPriv->h - y[i]);
+		GLint x1 = x[i];
+		GLuint *zptr;
+
+		zptr = (GLuint *)
+			(zbase + (x1 << 2) + (y1 << 13));
+		stencil[i] = (*zptr >> 28) & 0xf;
+	}
+
+	FFBFifo(fmesa, 1);
+	fmesa->regs->fbc = fmesa->fbc;
+	fmesa->ffbScreen->rp_active = 1;
+	if (!fmesa->hw_locked)
+		UNLOCK_HARDWARE(fmesa);
+}
+
+void ffbDDInitStencilFuncs(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+
+	if (fmesa->ffb_sarea->flags & FFB_DRI_FFB2PLUS) {
+		ctx->Driver.WriteStencilSpan	= FFBWriteStencilSpan;
+		ctx->Driver.ReadStencilSpan	= FFBReadStencilSpan;
+		ctx->Driver.WriteStencilPixels	= FFBWriteStencilPixels;
+		ctx->Driver.ReadStencilPixels	= FFBReadStencilPixels;
+	} else {
+		ctx->Driver.WriteStencilSpan	= NULL;
+		ctx->Driver.ReadStencilSpan	= NULL;
+		ctx->Driver.WriteStencilPixels	= NULL;
+		ctx->Driver.ReadStencilPixels	= NULL;
+	}
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h	Mon Jun 19 22:08:39 2000
@@ -0,0 +1,8 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */
+
+#ifndef _FFB_STENCIL_H
+#define _FFB_STENCIL_H
+
+extern void ffbDDInitStencilFuncs(GLcontext *ctx);
+
+#endif /* !(_FFB_STENCIL_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c	Mon Jun 19 22:08:40 2000
@@ -0,0 +1,292 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c,v 1.1 2000/06/20 05:08:40 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "types.h"
+#include "vbrender.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mm.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_depth.h"
+#include "ffb_context.h"
+#include "ffb_vb.h"
+#include "ffb_tris.h"
+#include "ffb_lock.h"
+#include "extensions.h"
+#include "vb.h"
+#include "dd.h"
+
+#undef TRI_DEBUG
+
+#ifdef TRI_DEBUG
+#define FFB_DUMP_PRIM(name)	\
+		fprintf(stderr, "FFB: Begin primitive %s%s%s" #name ".\n", \
+				(IND & FFB_TRI_OFFSET_BIT) ? "OFFSET " : "", \
+				(IND & FFB_TRI_FLAT_BIT) ? "FLAT " : "", \
+				(IND & FFB_TRI_TWOSIDE_BIT) ? "TWOSIDE " : "")
+#define FFB_DUMP_VERTEX(V)	\
+		fprintf(stderr, "FFB: VERTEX ARGB(%c%x.%08x:%c%x.%08x:%c%x.%08x:%c%x.%08x) " \
+			"XYZ(%04x.%04x:%04x.%04x:%c%x.%08x)\n", \
+			(((V)->color[which_color].alpha & (1 << 31)) ? '-' : ' '), \
+			(((V)->color[which_color].alpha & (1 << 30)) >> 30), \
+			(((V)->color[which_color].alpha & ((1 << 30) - 1))), \
+			(((V)->color[which_color].red & (1 << 31)) ? '-' : ' '), \
+			(((V)->color[which_color].red & (1 << 30)) >> 30), \
+			(((V)->color[which_color].red & ((1 << 30) - 1))), \
+			(((V)->color[which_color].green & (1 << 31)) ? '-' : ' '), \
+			(((V)->color[which_color].green & (1 << 30)) >> 30), \
+			(((V)->color[which_color].green & ((1 << 30) - 1))), \
+			(((V)->color[which_color].blue & (1 << 31)) ? '-' : ' '), \
+			(((V)->color[which_color].blue & (1 << 30)) >> 30), \
+			(((V)->color[which_color].blue & ((1 << 30) - 1))), \
+			(((V)->x >> 16)), (((V)->x & ((1 << 16) - 1))), \
+			(((V)->y >> 16)), (((V)->y & ((1 << 16) - 1))), \
+			(((V)->z & (1 << 31)) ? '-' : ' '), \
+			(((V)->z & (1 << 30)) >> 30), \
+			(((V)->z & ((1 << 30) - 1))))
+#else
+#define FFB_DUMP_PRIM(name)	do { } while(0)
+#define FFB_DUMP_VERTEX(V)	do { } while(0)
+#endif
+
+#define FFB_TRI_FLAT_BIT	0x01
+#define FFB_TRI_TWOSIDE_BIT	0x02
+#define FFB_TRI_OFFSET_BIT	0x04
+#define FFB_TRI_CULL_BIT	0x08
+#define FFB_TRI_ALPHA_BIT	0x10
+#define FFB_TRI_FALLBACK_BIT	0x20
+
+static triangle_func ffb_tri_tab[0x40];
+static quad_func ffb_quad_tab[0x40];
+
+#define IND (0)
+#define TAG(x) x
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_OFFSET_BIT)
+#define TAG(x) x##_offset
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_OFFSET_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_offset_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_TWOSIDE_BIT)
+#define TAG(x) x##_twoside
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_TWOSIDE_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_twoside_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_TWOSIDE_BIT|FFB_TRI_OFFSET_BIT)
+#define TAG(x) x##_twoside_offset
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_TWOSIDE_BIT|FFB_TRI_OFFSET_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_twoside_offset_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_CULL_BIT)
+#define TAG(x) x##_cull
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_CULL_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_cull_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_CULL_BIT|FFB_TRI_OFFSET_BIT)
+#define TAG(x) x##_cull_offset
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_CULL_BIT|FFB_TRI_OFFSET_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_cull_offset_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_CULL_BIT|FFB_TRI_TWOSIDE_BIT)
+#define TAG(x) x##_cull_twoside
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_CULL_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_cull_twoside_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_CULL_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_OFFSET_BIT)
+#define TAG(x) x##_cull_twoside_offset
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_CULL_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_OFFSET_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_cull_twoside_offset_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT)
+#define TAG(x) x##_alpha
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_alpha_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_OFFSET_BIT)
+#define TAG(x) x##_alpha_offset
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_OFFSET_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_alpha_offset_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_TWOSIDE_BIT)
+#define TAG(x) x##_alpha_twoside
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_alpha_twoside_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_OFFSET_BIT)
+#define TAG(x) x##_alpha_twoside_offset
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_OFFSET_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_alpha_twoside_offset_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_CULL_BIT)
+#define TAG(x) x##_alpha_cull
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_CULL_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_alpha_cull_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_CULL_BIT|FFB_TRI_OFFSET_BIT)
+#define TAG(x) x##_alpha_cull_offset
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_CULL_BIT|FFB_TRI_OFFSET_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_alpha_cull_offset_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_CULL_BIT|FFB_TRI_TWOSIDE_BIT)
+#define TAG(x) x##_alpha_cull_twoside
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_CULL_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_alpha_cull_twoside_flat
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_CULL_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_OFFSET_BIT)
+#define TAG(x) x##_alpha_cull_twoside_offset
+#include "ffb_tritmp.h"
+
+#define IND (FFB_TRI_ALPHA_BIT|FFB_TRI_CULL_BIT|FFB_TRI_TWOSIDE_BIT|FFB_TRI_OFFSET_BIT|FFB_TRI_FLAT_BIT)
+#define TAG(x) x##_alpha_cull_twoside_offset_flat
+#include "ffb_tritmp.h"
+
+void ffbDDTrifuncInit()
+{
+	init();
+	init_flat();
+	init_offset();
+	init_offset_flat();
+	init_twoside();
+	init_twoside_flat();
+	init_twoside_offset();
+	init_twoside_offset_flat();
+	init_cull();
+	init_cull_flat();
+	init_cull_offset();
+	init_cull_offset_flat();
+	init_cull_twoside();
+	init_cull_twoside_flat();
+	init_cull_twoside_offset();
+	init_cull_twoside_offset_flat();
+	init_alpha();
+	init_alpha_flat();
+	init_alpha_offset();
+	init_alpha_offset_flat();
+	init_alpha_twoside();
+	init_alpha_twoside_flat();
+	init_alpha_twoside_offset();
+	init_alpha_twoside_offset_flat();
+	init_alpha_cull();
+	init_alpha_cull_flat();
+	init_alpha_cull_offset();
+	init_alpha_cull_offset_flat();
+	init_alpha_cull_twoside();
+	init_alpha_cull_twoside_flat();
+	init_alpha_cull_twoside_offset();
+	init_alpha_cull_twoside_offset_flat();
+}
+
+void ffbDDChooseTriRenderState(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	GLuint flags = ctx->TriangleCaps;
+	GLuint ind = 0;
+
+	if (!flags) {
+		fmesa->TriangleFunc = ffb_tri_tab[0];
+		fmesa->QuadFunc = ffb_quad_tab[0];
+		return;
+	}
+
+	if (ctx->Texture.ReallyEnabled) {
+		fmesa->TriangleFunc = NULL;
+		fmesa->QuadFunc = NULL;
+		return;
+	}
+
+	if (flags & DD_FLATSHADE)
+		ind |= FFB_TRI_FLAT_BIT;
+	if (flags & DD_TRI_CULL)
+		ind |= FFB_TRI_CULL_BIT;
+	if (ctx->Polygon.SmoothFlag)
+		ind |= FFB_TRI_FALLBACK_BIT;
+	if (flags & DD_TRI_OFFSET)
+		ind |= FFB_TRI_OFFSET_BIT;
+	if (flags & DD_TRI_LIGHT_TWOSIDE)
+		ind |= FFB_TRI_TWOSIDE_BIT;
+
+	/* If blending or the alpha test is enabled we need to
+	 * provide alpha components to the chip, else we can
+	 * do without it and thus feed vertex data to the chip
+	 * more efficiently.
+	 */
+	if (ctx->Color.BlendEnabled || ctx->Color.AlphaEnabled)
+		ind |= FFB_TRI_ALPHA_BIT;
+
+	fmesa->TriangleFunc = ffb_tri_tab[ind];
+	fmesa->QuadFunc = ffb_quad_tab[ind];
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h	Mon Jun 19 22:08:40 2000
@@ -0,0 +1,9 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h,v 1.1 2000/06/20 05:08:40 dawes Exp $ */
+
+#ifndef _FFB_TRIS_H
+#define _FFB_TRIS_H
+
+extern void ffbDDTrifuncInit(void);
+extern void ffbDDChooseTriRenderState(GLcontext *);
+
+#endif /* !(_FFB_TRIS_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h	Mon Jun 19 22:08:40 2000
@@ -0,0 +1,324 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h,v 1.1 2000/06/20 05:08:40 dawes Exp $ */
+
+static void TAG(ffb_triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2, GLuint pv)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	ffb_fbcPtr ffb = fmesa->regs;
+	struct vertex_buffer *VB = ctx->VB;
+	ffb_vertex *ffbVB = FFB_DRIVER_DATA(VB)->verts;
+	const ffb_vertex *v0 = &ffbVB[e0];
+	const ffb_vertex *v1 = &ffbVB[e1];
+	const ffb_vertex *v2 = &ffbVB[e2];
+#if (IND & FFB_TRI_OFFSET_BIT)
+	GLuint ffb_zoffset = FFB_Z_FROM_FLOAT(ctx->PolygonZoffset);
+#endif
+#if (IND & FFB_TRI_FLAT_BIT)
+	GLuint const_fg;
+#endif
+#if (IND & FFB_TRI_TWOSIDE_BIT)
+	int which_color = (VB->ColorPtr == VB->Color[0]) ? 0 : 1;
+#else
+	const int which_color = 0;
+#endif
+
+#if (IND & FFB_TRI_CULL_BIT)
+	{
+		GLfloat (*win)[4] = VB->Win.data;
+		GLfloat ex = win[e1][0] - win[e0][0];
+		GLfloat ey = win[e1][1] - win[e0][1];
+		GLfloat fx = win[e2][0] - win[e0][0];
+		GLfloat fy = win[e2][1] - win[e0][1];
+		GLfloat c = ex*fy-ey*fx;
+
+		/* Culled... */
+		if (c * ctx->backface_sign > 0)
+			return;
+	}
+#endif
+
+#if (IND & FFB_TRI_FLAT_BIT)
+	const_fg = (((GLuint)VB->Color[which_color]->data[pv][0] << 0) |
+		    ((GLuint)VB->Color[which_color]->data[pv][1] << 8) |
+		    ((GLuint)VB->Color[which_color]->data[pv][2] << 16) |
+		    ((GLuint)VB->Color[which_color]->data[pv][3] << 24));
+#endif
+
+	FFB_DUMP_PRIM(TRIANGLE);
+
+#if (IND & FFB_TRI_FLAT_BIT)
+	FFBFifo(fmesa, 1);
+	ffb->fg = const_fg;
+#endif
+
+	/* First, check for a triangle strip/fan sequences.
+	 * These checks rely on how MESA sends these primitives
+	 * down to us in render_tmp.h
+	 */
+	if (v0 == fmesa->vtx_cache[1] &&
+	    v1 == fmesa->vtx_cache[2] &&
+	    v2 != fmesa->vtx_cache[0]) {
+#if (IND & FFB_TRI_FLAT_BIT)
+		FFBFifo(fmesa, 3);
+#else
+#if (IND & FFB_TRI_ALPHA_BIT)
+		FFBFifo(fmesa, 7);
+#else
+		FFBFifo(fmesa, 6);
+#endif
+#endif
+		FFB_DUMP_VERTEX(v2);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+		ffb->alpha = v2->color[which_color].alpha;
+#endif
+		ffb->red = v2->color[which_color].red;
+		ffb->green = v2->color[which_color].green;
+		ffb->blue = v2->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+		ffb->z = v2->z + ffb_zoffset;
+#else
+		ffb->z = v2->z;
+#endif
+		ffb->y = v2->y;
+		ffb->x = v2->x;
+
+		goto update_vcache;
+	} else if (v0 == fmesa->vtx_cache[0] &&
+		   v1 == fmesa->vtx_cache[2] &&
+		   v2 != fmesa->vtx_cache[1]) {
+#if (IND & FFB_TRI_FLAT_BIT)
+		FFBFifo(fmesa, 3);
+#else
+#if (IND & FFB_TRI_ALPHA_BIT)
+		FFBFifo(fmesa, 7);
+#else
+		FFBFifo(fmesa, 6);
+#endif
+#endif
+		FFB_DUMP_VERTEX(v2);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+		ffb->alpha = v2->color[which_color].alpha;
+#endif
+		ffb->red = v2->color[which_color].red;
+		ffb->green = v2->color[which_color].green;
+		ffb->blue = v2->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+		ffb->z = v2->z + ffb_zoffset;
+#else
+		ffb->z = v2->z;
+#endif
+		ffb->dmyf = v2->y;
+		ffb->dmxf = v2->x;
+
+		goto update_vcache;
+	}
+
+#if (IND & FFB_TRI_FLAT_BIT)
+	FFBFifo(fmesa, 9);
+#else
+#if (IND & FFB_TRI_ALPHA_BIT)
+	FFBFifo(fmesa, 21);
+#else
+	FFBFifo(fmesa, 18);
+#endif
+#endif
+
+	FFB_DUMP_VERTEX(v0);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+	ffb->alpha = v0->color[which_color].alpha;
+#endif
+	ffb->red = v0->color[which_color].red;
+	ffb->green = v0->color[which_color].green;
+	ffb->blue = v0->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+	ffb->z = v0->z + ffb_zoffset;
+#else
+	ffb->z = v0->z;
+#endif
+	ffb->ryf = v0->y;
+	ffb->rxf = v0->x;
+
+	FFB_DUMP_VERTEX(v1);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+	ffb->alpha = v1->color[which_color].alpha;
+#endif
+	ffb->red = v1->color[which_color].red;
+	ffb->green = v1->color[which_color].green;
+	ffb->blue = v1->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+	ffb->z = v1->z + ffb_zoffset;
+#else
+	ffb->z = v1->z;
+#endif
+	ffb->y = v1->y;
+	ffb->x = v1->x;
+
+	FFB_DUMP_VERTEX(v2);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+	ffb->alpha = v2->color[which_color].alpha;
+#endif
+	ffb->red = v2->color[which_color].red;
+	ffb->green = v2->color[which_color].green;
+	ffb->blue = v2->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+	ffb->z = v2->z + ffb_zoffset;
+#else
+	ffb->z = v2->z;
+#endif
+	ffb->y = v2->y;
+	ffb->x = v2->x;
+
+update_vcache:
+	fmesa->vtx_cache[0] = (void *)v0;
+	fmesa->vtx_cache[1] = (void *)v1;
+	fmesa->vtx_cache[2] = (void *)v2;
+
+	fmesa->ffbScreen->rp_active = 1;
+}
+
+
+static void TAG(ffb_quad)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2, GLuint e3, GLuint pv)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	ffb_fbcPtr ffb = fmesa->regs;
+	struct vertex_buffer *VB = ctx->VB;
+	ffb_vertex *ffbVB = FFB_DRIVER_DATA(VB)->verts;
+	const ffb_vertex *v0 = &ffbVB[e0];
+	const ffb_vertex *v1 = &ffbVB[e1];
+	const ffb_vertex *v2 = &ffbVB[e2];
+	const ffb_vertex *v3 = &ffbVB[e3];
+#if (IND & FFB_TRI_OFFSET_BIT)
+	GLuint ffb_zoffset = FFB_Z_FROM_FLOAT(ctx->PolygonZoffset);
+#endif
+#if (IND & FFB_TRI_FLAT_BIT)
+	GLuint const_fg;
+#endif
+#if (IND & FFB_TRI_TWOSIDE_BIT)
+	int which_color = (VB->ColorPtr == VB->Color[0]) ? 0 : 1;
+#else
+	const int which_color = 0;
+#endif
+
+#if (IND & FFB_TRI_CULL_BIT)
+	{
+		GLfloat (*win)[4] = VB->Win.data;
+		GLfloat ex = win[e2][0] - win[e0][0];
+		GLfloat ey = win[e2][1] - win[e0][1];
+		GLfloat fx = win[e3][0] - win[e1][0];
+		GLfloat fy = win[e3][1] - win[e1][1];
+		GLfloat c = ex*fy-ey*fx;
+
+		/* Culled... */
+		if (c * ctx->backface_sign > 0)
+			return;
+	}
+#endif
+
+#if (IND & FFB_TRI_FLAT_BIT)
+	const_fg = (((GLuint)VB->Color[which_color]->data[pv][0] << 0) |
+		    ((GLuint)VB->Color[which_color]->data[pv][1] << 8) |
+		    ((GLuint)VB->Color[which_color]->data[pv][2] << 16) |
+		    ((GLuint)VB->Color[which_color]->data[pv][3] << 24));
+#endif
+
+	FFB_DUMP_PRIM(QUAD);
+
+#if (IND & FFB_TRI_FLAT_BIT)
+	FFBFifo(fmesa, 13);
+	ffb->fg = const_fg;
+#else
+#if (IND & FFB_TRI_ALPHA_BIT)
+	FFBFifo(fmesa, 28);
+#else
+	FFBFifo(fmesa, 24);
+#endif
+#endif
+
+	FFB_DUMP_VERTEX(v0);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+	ffb->alpha = v0->color[which_color].alpha;
+#endif
+	ffb->red = v0->color[which_color].red;
+	ffb->green = v0->color[which_color].green;
+	ffb->blue = v0->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+	ffb->z = v0->z + ffb_zoffset;
+#else
+	ffb->z = v0->z;
+#endif
+	ffb->ryf = v0->y;
+	ffb->rxf = v0->x;
+
+	FFB_DUMP_VERTEX(v1);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+	ffb->alpha = v1->color[which_color].alpha;
+#endif
+	ffb->red = v1->color[which_color].red;
+	ffb->green = v1->color[which_color].green;
+	ffb->blue = v1->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+	ffb->z = v1->z + ffb_zoffset;
+#else
+	ffb->z = v1->z;
+#endif
+	ffb->y = v1->y;
+	ffb->x = v1->x;
+
+	FFB_DUMP_VERTEX(v2);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+	ffb->alpha = v2->color[which_color].alpha;
+#endif
+	ffb->red = v2->color[which_color].red;
+	ffb->green = v2->color[which_color].green;
+	ffb->blue = v2->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+	ffb->z = v2->z + ffb_zoffset;
+#else
+	ffb->z = v2->z;
+#endif
+	ffb->y = v2->y;
+	ffb->x = v2->x;
+
+	FFB_DUMP_VERTEX(v3);
+#if !(IND & FFB_TRI_FLAT_BIT)
+#if (IND & FFB_TRI_ALPHA_BIT)
+	ffb->alpha = v3->color[which_color].alpha;
+#endif
+	ffb->red = v3->color[which_color].red;
+	ffb->green = v3->color[which_color].green;
+	ffb->blue = v3->color[which_color].blue;
+#endif
+#if (IND & FFB_TRI_OFFSET_BIT)
+	ffb->z = v3->z + ffb_zoffset;
+#else
+	ffb->z = v3->z;
+#endif
+	ffb->dmyf = v3->y;
+	ffb->dmxf = v3->x;
+
+	fmesa->ffbScreen->rp_active = 1;
+}
+
+static void TAG(init)(void)
+{
+	ffb_tri_tab[IND]	= TAG(ffb_triangle);
+	ffb_quad_tab[IND]	= TAG(ffb_quad);
+}
+
+#undef IND
+#undef TAG
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c	Mon Jun 19 22:08:40 2000
@@ -0,0 +1,318 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c,v 1.1 2000/06/20 05:08:40 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#include "ffb_xmesa.h"
+#include "ffb_context.h"
+#include "ffb_vb.h"
+
+#include "stages.h"
+
+#define COL {							\
+	GLubyte *col = &(VB->Color[0]->data[i][0]);		\
+	v->color[0].alpha = FFB_COLOR_FROM_UBYTE(col[3]);	\
+	v->color[0].red   = FFB_COLOR_FROM_UBYTE(col[0]);	\
+	v->color[0].green = FFB_COLOR_FROM_UBYTE(col[1]);	\
+	v->color[0].blue  = FFB_COLOR_FROM_UBYTE(col[2]);	\
+}
+
+#define COL2 {							\
+	GLubyte *col = &(VB->Color[0]->data[i][0]);		\
+	v->color[0].alpha = FFB_COLOR_FROM_UBYTE(col[3]);	\
+	v->color[0].red   = FFB_COLOR_FROM_UBYTE(col[0]);	\
+	v->color[0].green = FFB_COLOR_FROM_UBYTE(col[1]);	\
+	v->color[0].blue  = FFB_COLOR_FROM_UBYTE(col[2]);	\
+								\
+	col = &(VB->Color[1]->data[i][0]);			\
+	v->color[1].alpha = FFB_COLOR_FROM_UBYTE(col[3]);	\
+	v->color[1].red   = FFB_COLOR_FROM_UBYTE(col[0]);	\
+	v->color[1].green = FFB_COLOR_FROM_UBYTE(col[1]);	\
+	v->color[1].blue  = FFB_COLOR_FROM_UBYTE(col[2]);	\
+}
+
+#define COORD {					\
+	GLfloat *win = VB->Win.data[i];		\
+	GLfloat tmp;				\
+	tmp = win[0] + ffbxoff;			\
+	v->x = FFB_COORD_FROM_FLOAT(tmp);	\
+	tmp  = - win[1] + ffbyoff;		\
+	v->y = FFB_COORD_FROM_FLOAT(tmp);	\
+	tmp = win[2] * (1.0f / 65536.0f);	\
+	v->z = FFB_Z_FROM_FLOAT(tmp);		\
+}	
+
+#define NOP
+
+#define SETUPFUNC(name,win,col)						\
+static void name(struct vertex_buffer *VB, GLuint start, GLuint end)	\
+{									\
+	ffbContextPtr fmesa = FFB_CONTEXT(VB->ctx);			\
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;		\
+	ffb_vertex *v;							\
+	GLfloat ffbxoff = dPriv->x - 0.5;				\
+	GLfloat ffbyoff = dPriv->h - 0.5 + dPriv->y;			\
+	int i;								\
+	(void) fmesa; (void) ffbxoff; (void) ffbyoff;			\
+									\
+	if (0)								\
+		fprintf(stderr, #name ": VB(%p) start(%d) end(%d)\n",	\
+			VB, start, end);				\
+	/* Flush the vertex cache. */					\
+	fmesa->vtx_cache[0] = fmesa->vtx_cache[1] =			\
+		fmesa->vtx_cache[2] = fmesa->vtx_cache[3] = NULL;	\
+	gl_import_client_data(VB, VB->ctx->RenderFlags,			\
+			      (VB->ClipOrMask				\
+			       ? VEC_WRITABLE | VEC_GOOD_STRIDE		\
+			       : VEC_GOOD_STRIDE));			\
+									\
+	v = &(FFB_DRIVER_DATA(VB)->verts[start]);			\
+									\
+	if (VB->ClipOrMask == 0) {					\
+		for (i = start; i < end; i++, v++) {			\
+			win;						\
+			col;						\
+		}							\
+	} else {							\
+		for (i = start; i < end; i++, v++) {			\
+			if (VB->ClipMask[i] == 0) {			\
+				win;					\
+			}						\
+			col;						\
+		}							\
+	}								\
+}
+
+SETUPFUNC(rs_w,		COORD,NOP)
+SETUPFUNC(rs_g,		NOP,COL)
+SETUPFUNC(rs_g2,	NOP,COL2)
+SETUPFUNC(rs_wg,	COORD,COL)
+SETUPFUNC(rs_wg2,	COORD,COL2)
+
+static void rs_invalid(struct vertex_buffer *VB, GLuint start, GLuint end)
+{
+	fprintf(stderr, "ffbRasterSetup(): invalid setup function\n");
+}
+
+typedef void (*setupFunc)(struct vertex_buffer *, GLuint, GLuint);
+
+static setupFunc setup_func[8];
+
+void ffbDDSetupInit(void)
+{
+	int i;
+
+	for (i = 0; i < 4; i++)
+		setup_func[i] = rs_invalid;
+
+	setup_func[FFB_VB_WIN_BIT]					= rs_w;
+	setup_func[FFB_VB_RGBA_BIT]					= rs_g;
+	setup_func[FFB_VB_RGBA_BIT|FFB_VB_TWOSIDE_BIT]			= rs_g2;
+	setup_func[FFB_VB_WIN_BIT|FFB_VB_RGBA_BIT]			= rs_wg;
+	setup_func[FFB_VB_WIN_BIT|FFB_VB_RGBA_BIT|FFB_VB_TWOSIDE_BIT]	= rs_wg2;
+}
+
+static void ffbPrintSetupFlags(char *msg, GLuint flags)
+{
+	fprintf(stderr, "%s: %x %s%s%s\n",
+		msg, flags,
+		(flags & FFB_VB_WIN_BIT)	? " xyz,"  : "",
+		(flags & FFB_VB_TWOSIDE_BIT)	? " twoside,"  : "",
+		(flags & FFB_VB_RGBA_BIT)	? " rgba," : "");
+}
+
+void ffbChooseRasterSetupFunc(GLcontext *ctx)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	int funcindex;
+
+	/* Currently just one full vertex setup type. */
+	funcindex = FFB_VB_WIN_BIT | FFB_VB_RGBA_BIT;
+
+	if (ctx->TriangleCaps & DD_TRI_LIGHT_TWOSIDE)
+		funcindex |= FFB_VB_TWOSIDE_BIT;
+
+	if (MESA_VERBOSE)
+		ffbPrintSetupFlags("ffb: full setup function", funcindex);
+
+	fmesa->setupindex = funcindex;
+	ctx->Driver.RasterSetup = setup_func[funcindex];
+}
+
+void ffbDDCheckPartialRasterSetup(GLcontext *ctx, struct gl_pipeline_stage *d)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
+	GLuint tmp = fmesa->setupdone;
+
+	d->type = 0;
+	fmesa->setupdone = 0;
+
+	if ((ctx->Array.Summary & VERT_OBJ_ANY) == 0)
+		return;
+
+	if (ctx->IndirectTriangles)
+		return;
+
+	fmesa->setupdone = tmp;
+}
+
+void ffbDDPartialRasterSetup(struct vertex_buffer *VB)
+{
+	ffbContextPtr fmesa = FFB_CONTEXT(VB->ctx);
+	GLuint new = VB->pipeline->new_outputs;
+	GLuint available = VB->pipeline->outputs;
+	GLuint ind = 0;
+
+#if 1
+	ind = FFB_VB_WIN_BIT | FFB_VB_RGBA_BIT;
+	if (VB->ctx->TriangleCaps & DD_TRI_LIGHT_TWOSIDE)
+		ind |= FFB_VB_TWOSIDE_BIT;
+#else
+	if (new & VERT_WIN) {
+		new = available;
+		ind |= FFB_VB_WIN_BIT;
+	}
+	if (new & VERT_RGBA)
+		ind |= FFB_VB_RGBA_BIT;
+#endif
+
+#if 0
+	fmesa->setupdone &= ~ind;
+	ind &= fmesa->setupindex;
+	fmesa->setupdone |= ind;
+#endif
+
+	if (MESA_VERBOSE)
+		ffbPrintSetupFlags("ffb: partial setup function", ind);
+
+	if (ind)
+		setup_func[ind](VB, VB->Start, VB->Count);
+}
+
+void ffbDDDoRasterSetup(struct vertex_buffer *VB)
+{
+	GLcontext *ctx = VB->ctx;
+
+	if (VB->Type == VB_CVA_PRECALC)
+		ffbDDPartialRasterSetup(VB);
+	else if (ctx->Driver.RasterSetup)
+		ctx->Driver.RasterSetup(VB, VB->CopyStart, VB->Count);
+}
+
+void ffbDDResizeVB(struct vertex_buffer *VB, GLuint size)
+{
+	FFBVertexBufferPtr mvb = FFB_DRIVER_DATA(VB);
+
+	while (mvb->size < size)
+		mvb->size *= 2;
+
+	free(mvb->verts);
+	mvb->verts = (ffb_vertex *)malloc(sizeof(ffb_vertex) * mvb->size);
+	if (!mvb->verts) {
+		fprintf(stderr, "ffb-glx: out of memory !\n");
+		exit(1);
+	}
+
+	gl_vector1ui_free(&mvb->clipped_elements);
+	gl_vector1ui_alloc(&mvb->clipped_elements, VEC_WRITABLE, mvb->size, 32);
+	if (!mvb->clipped_elements.start) {
+		fprintf(stderr, "ffb-glx: out of memory !\n");
+		exit(1);
+	}
+
+	free(VB->ClipMask);
+	VB->ClipMask = (GLubyte *)malloc(sizeof(GLubyte) * mvb->size);
+	if (!VB->ClipMask) {
+		fprintf(stderr, "ffb-glx: out of memory !\n");
+		exit(1);
+	}
+
+	if (VB->Type == VB_IMMEDIATE) {
+		free(mvb->primitive);
+		free(mvb->next_primitive);
+		mvb->primitive = (GLuint *)malloc(sizeof(GLuint) * mvb->size);
+		mvb->next_primitive = (GLuint *)malloc(sizeof(GLuint) * mvb->size);
+		if (!mvb->primitive || !mvb->next_primitive) {
+			fprintf(stderr, "ffb-glx: out of memory !\n");
+			exit(1);
+		}
+	}
+}
+
+void ffbDDRegisterVB(struct vertex_buffer *VB)
+{
+	FFBVertexBufferPtr mvb;
+
+	mvb = (FFBVertexBufferPtr) calloc(1, sizeof(*mvb));
+	if (!mvb) {
+		fprintf(stderr, "ffb-glx: out of memory !\n");
+		exit(1);
+	}
+	mvb->size = VB->Size * 2;
+	mvb->verts = (ffb_vertex *) malloc(sizeof(ffb_vertex) * mvb->size);
+	if (!mvb->verts) {
+		fprintf(stderr, "ffb-glx: out of memory !\n");
+		exit(1);
+	}
+
+	gl_vector1ui_alloc(&mvb->clipped_elements, VEC_WRITABLE, mvb->size, 32);
+	if (!mvb->clipped_elements.start) {
+		fprintf(stderr, "ffb-glx: out of memory !\n");
+		exit(1);
+	}
+
+	free(VB->ClipMask);
+	VB->ClipMask = (GLubyte *)malloc(sizeof(GLubyte) * mvb->size);
+	if (!VB->ClipMask) {
+		fprintf(stderr, "ffb-glx: out of memory !\n");
+		exit(1);
+	}
+
+	mvb->primitive = (GLuint *)malloc(sizeof(GLuint) * mvb->size);
+	mvb->next_primitive = (GLuint *)malloc(sizeof(GLuint) * mvb->size);
+	if (!mvb->primitive || !mvb->next_primitive) {
+		fprintf(stderr, "ffb-glx: out of memory !\n");
+		exit(1);
+	}
+
+	VB->driver_data = mvb;
+}
+
+void ffbDDUnregisterVB(struct vertex_buffer *VB)
+{
+	FFBVertexBufferPtr mvb = FFB_DRIVER_DATA(VB);
+
+	if (mvb) {
+		if (mvb->verts)
+			free(mvb->verts);
+		if (mvb->primitive)
+			free(mvb->primitive);
+		if (mvb->next_primitive)
+			free(mvb->next_primitive);
+		gl_vector1ui_free(&mvb->clipped_elements);
+		free(mvb);
+		VB->driver_data = 0;
+	}
+}
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h	Mon Jun 19 22:08:40 2000
@@ -0,0 +1,63 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h,v 1.1 2000/06/20 05:08:40 dawes Exp $ */
+
+#ifndef _FFB_VB_H
+#define _FFB_VB_H
+
+#include "vb.h"
+#include "types.h"
+
+/* Use this to disable ffb VB processing, presumable to try
+ * and isolate bugs.
+ */
+#undef FFB_VB_DISABLE
+
+/* These are all in 2:30 signed fixed point format. */
+typedef struct {
+	GLuint	alpha;
+	GLuint	red;
+	GLuint	green;
+	GLuint	blue;
+} ffb_color;
+
+#define FFB_COLOR_FROM_UBYTE(VAL)	(((((GLuint)(VAL)) + 1) & (255 << 1)) << (30 - 8))
+
+typedef struct {
+	/* As for colors, this is in 2:30 signed fixed point. */
+	GLint		z;
+
+	/* These are in 16:16 fixed point. */
+	GLuint		y, x;
+
+	ffb_color	color[2];
+} ffb_vertex;
+
+#define FFB_Z_FROM_FLOAT(VAL)		((GLint)((VAL) * 1073741824.0f))
+#define FFB_COORD_FROM_FLOAT(VAL)	((GLuint)((VAL) * 65536.0f))
+
+struct ffb_vertex_buffer_t {
+	GLvector1ui	clipped_elements;
+	ffb_vertex	*verts;
+	int		last_virt;
+	GLuint		*primitive;
+	GLuint		*next_primitive;
+	GLuint		size;
+};
+
+typedef struct ffb_vertex_buffer_t *FFBVertexBufferPtr;
+
+#define FFB_DRIVER_DATA(vb)	((FFBVertexBufferPtr)((vb)->driver_data))
+
+#define FFB_VB_RGBA_BIT		0x01
+#define FFB_VB_WIN_BIT		0x02
+#define FFB_VB_TWOSIDE_BIT	0x04
+
+extern void ffbDDSetupInit(void);
+extern void ffbChooseRasterSetupFunc(GLcontext *);
+extern void ffbDDCheckPartialRasterSetup(GLcontext *, struct gl_pipeline_stage *);
+extern void ffbDDPartialRasterSetup(struct vertex_buffer *);
+extern void ffbDDDoRasterSetup(struct vertex_buffer *);
+extern void ffbDDResizeVB(struct vertex_buffer *, GLuint);
+extern void ffbDDRegisterVB(struct vertex_buffer *);
+extern void ffbDDUnregisterVB(struct vertex_buffer *);
+
+#endif /* !(_FFB_VB_H) */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c	Mon Jun 19 22:08:40 2000
@@ -0,0 +1,547 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c,v 1.1 2000/06/20 05:08:40 dawes Exp $
+ *
+ * GLX Hardware Device Driver for Sun Creator/Creator3D
+ * Copyright (C) 2000 David S. Miller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DAVID MILLER, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ *    David S. Miller <davem@redhat.com>
+ */
+
+#ifdef GLX_DIRECT_RENDERING
+
+#include <X11/Xlibint.h>
+#include <stdio.h>
+
+#include "ffb_xmesa.h"
+#include "context.h"
+#include "vbxform.h"
+#include "matrix.h"
+#include "simple_list.h"
+#include "mmath.h"
+
+#include "xf86dri.h"
+
+#include "ffb_context.h"
+#include "ffb_dd.h"
+#include "ffb_span.h"
+#include "ffb_depth.h"
+#include "ffb_stencil.h"
+#include "ffb_clear.h"
+#include "ffb_vb.h"
+#include "ffb_tris.h"
+#include "ffb_lines.h"
+#include "ffb_points.h"
+#include "ffb_state.h"
+#include "ffb_pipeline.h"
+#include "ffb_lock.h"
+
+#if 0
+#include "xmesaP.h"
+#endif
+
+static ffbContextPtr ffbCtx = NULL;
+
+/* These functions are accessed by dlsym from dri_mesa_init.c:
+ *
+ * XMesaInitDriver
+ * XMesaResetDriver
+ * XMesaCreateVisual
+ * XMesaDestroyVisual
+ * XMesaCreateContext 
+ * XMesaDestroyContext
+ * XMesaCreateWindowBuffer
+ * XMesaCreatePixmapBuffer
+ * XMesaDestroyBuffer
+ * XMesaSwapBuffers
+ * XMesaMakeCurrent
+ *
+ * So this is kind of the public interface to the driver.  The driver
+ * uses the X11 mesa driver context as a kind of wrapper around its
+ * own driver context - but there isn't much justificiation for doing
+ * it that way - the DRI might as well use a (void *) to refer to the
+ * driver contexts.  Nothing in the X context really gets used.
+ */
+
+GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv)
+{
+	ffbScreenPrivate *ffbScreen;
+	FFBDRIPtr gDRIPriv = (FFBDRIPtr) sPriv->pDevPriv;
+
+	/* Allocate the private area. */
+	ffbScreen = (ffbScreenPrivate *) Xmalloc(sizeof(ffbScreenPrivate));
+	if (!ffbScreen)
+		return GL_FALSE;
+
+	/* Map FBC registers. */
+	if (drmMap(sPriv->fd,
+		   gDRIPriv->hFbcRegs,
+		   gDRIPriv->sFbcRegs,
+		   &gDRIPriv->mFbcRegs)) {
+		Xfree(ffbScreen);
+		return GL_FALSE;
+	}
+	ffbScreen->regs = (ffb_fbcPtr) gDRIPriv->mFbcRegs;
+
+	/* Map ramdac registers. */
+	if (drmMap(sPriv->fd,
+		   gDRIPriv->hDacRegs,
+		   gDRIPriv->sDacRegs,
+		   &gDRIPriv->mDacRegs)) {
+		drmUnmap(gDRIPriv->mFbcRegs, gDRIPriv->sFbcRegs);
+		Xfree(ffbScreen);
+		return GL_FALSE;
+	}
+	ffbScreen->dac = (ffb_dacPtr) gDRIPriv->mDacRegs;
+
+	/* Map "Smart" framebuffer views. */
+	if (drmMap(sPriv->fd,
+		   gDRIPriv->hSfb8r,
+		   gDRIPriv->sSfb8r,
+		   &gDRIPriv->mSfb8r)) {
+		drmUnmap(gDRIPriv->mFbcRegs, gDRIPriv->sFbcRegs);
+		drmUnmap(gDRIPriv->mDacRegs, gDRIPriv->sDacRegs);
+		Xfree(ffbScreen);
+		return GL_FALSE;
+	}
+	ffbScreen->sfb8r = (volatile char *) gDRIPriv->mSfb8r;
+
+	if (drmMap(sPriv->fd,
+		   gDRIPriv->hSfb32,
+		   gDRIPriv->sSfb32,
+		   &gDRIPriv->mSfb32)) {
+		drmUnmap(gDRIPriv->mFbcRegs, gDRIPriv->sFbcRegs);
+		drmUnmap(gDRIPriv->mDacRegs, gDRIPriv->sDacRegs);
+		drmUnmap(gDRIPriv->mSfb8r, gDRIPriv->sSfb8r);
+		Xfree(ffbScreen);
+		return GL_FALSE;
+	}
+	ffbScreen->sfb32 = (volatile char *) gDRIPriv->mSfb32;
+
+	if (drmMap(sPriv->fd,
+		   gDRIPriv->hSfb64,
+		   gDRIPriv->sSfb64,
+		   &gDRIPriv->mSfb64)) {
+		drmUnmap(gDRIPriv->mFbcRegs, gDRIPriv->sFbcRegs);
+		drmUnmap(gDRIPriv->mDacRegs, gDRIPriv->sDacRegs);
+		drmUnmap(gDRIPriv->mSfb8r, gDRIPriv->sSfb8r);
+		drmUnmap(gDRIPriv->mSfb32, gDRIPriv->sSfb32);
+		Xfree(ffbScreen);
+		return GL_FALSE;
+	}
+	ffbScreen->sfb64 = (volatile char *) gDRIPriv->mSfb64;
+
+	ffbScreen->fifo_cache = 0;
+	ffbScreen->rp_active = 0;
+
+	ffbScreen->sPriv = sPriv;
+	sPriv->private = (void *) ffbScreen;
+
+	ffbDDSetupInit();
+	ffbDDTrifuncInit();
+	ffbDDLinefuncInit();
+	ffbDDPointfuncInit();
+
+	return GL_TRUE;
+}
+
+/* Accessed by dlsym from dri_mesa_init.c */
+void XMesaResetDriver(__DRIscreenPrivate *sPriv)
+{
+	ffbScreenPrivate *ffbScreen = sPriv->private;
+	FFBDRIPtr gDRIPriv = (FFBDRIPtr) sPriv->pDevPriv;
+
+	drmUnmap(gDRIPriv->mFbcRegs, gDRIPriv->sFbcRegs);
+	drmUnmap(gDRIPriv->mDacRegs, gDRIPriv->sDacRegs);
+	drmUnmap(gDRIPriv->mSfb8r, gDRIPriv->sSfb8r);
+	drmUnmap(gDRIPriv->mSfb32, gDRIPriv->sSfb32);
+	drmUnmap(gDRIPriv->mSfb64, gDRIPriv->sSfb64);
+
+	Xfree(ffbScreen);
+}
+
+/* Accessed by dlsym from dri_mesa_init.c */
+GLvisual *XMesaCreateVisual(Display *dpy,
+			    __DRIscreenPrivate *driScrnPriv,
+			    const XVisualInfo *visinfo,
+			    const __GLXvisualConfig *config)
+{
+	/* Only RGB visuals (for now) in this FFB driver. */
+	if (!config->rgba)
+		return NULL;
+
+	/* Drivers may change the args to _mesa_create_visual() in order to
+	 * setup special visuals.
+	 */
+	return _mesa_create_visual(config->rgba,
+				   config->doubleBuffer,
+				   config->stereo,
+				   _mesa_bitcount(visinfo->red_mask),
+				   _mesa_bitcount(visinfo->green_mask),
+				   _mesa_bitcount(visinfo->blue_mask),
+				   config->alphaSize,
+				   0, /* index bits */
+				   config->depthSize,
+				   config->stencilSize,
+				   config->accumRedSize,
+				   config->accumGreenSize,
+				   config->accumBlueSize,
+				   config->accumAlphaSize,
+				   0 /* num samples */);
+}
+
+/* Create and initialize the Mesa and driver specific context data */
+GLboolean XMesaCreateContext(Display *dpy, GLvisual *mesaVis,
+			     __DRIcontextPrivate *driContextPriv)
+{
+	ffbContextPtr fmesa;
+	GLcontext *glCtx;
+	__DRIscreenPrivate *sPriv;
+	ffbScreenPrivate *ffbScreen;
+
+	fmesa = (ffbContextPtr) Xmalloc(sizeof(ffbContextRec));
+	if (!fmesa)
+		return GL_FALSE;
+
+	glCtx = driContextPriv->mesaContext;
+	sPriv = driContextPriv->driScreenPriv;
+	ffbScreen = (ffbScreenPrivate *) sPriv->private;
+
+	fmesa->glCtx = glCtx;
+	glCtx->DriverCtx = (void *) fmesa;
+
+	/* Dri stuff. */
+	fmesa->display = dpy;
+	fmesa->hHWContext = driContextPriv->hHWContext;
+	fmesa->driFd = sPriv->fd;
+	fmesa->driHwLock = &sPriv->pSAREA->lock;
+
+	fmesa->ffbScreen = ffbScreen;
+	fmesa->driScreen = sPriv;
+	fmesa->ffb_sarea = FFB_DRISHARE(sPriv->pSAREA);
+
+	/* Register and framebuffer hw pointers. */
+	fmesa->regs = ffbScreen->regs;
+	fmesa->sfb32 = ffbScreen->sfb32;
+
+	fmesa->SWrender = 0;
+	if (getenv("LIBGL_SOFTWARE_RENDERING"))
+		fmesa->SWrender = 1;
+
+	ffbDDInitContextHwState(glCtx);
+
+	/* Default clear and depth colors. */
+	{
+		GLubyte r = (GLint) (glCtx->Color.ClearColor[0] * 255.0F);
+		GLubyte g = (GLint) (glCtx->Color.ClearColor[1] * 255.0F);
+		GLubyte b = (GLint) (glCtx->Color.ClearColor[2] * 255.0F);
+
+		fmesa->clear_pixel = ((r << 0) |
+				      (g << 8) |
+				      (b << 16));
+	}
+	fmesa->clear_depth = Z_FROM_MESA(glCtx->Depth.Clear * 4294967295.0f);
+	fmesa->clear_stencil = glCtx->Stencil.Clear & 0xf;
+
+	/* All of this need only be done once for a new context. */
+	ffbDDExtensionsInit(glCtx);
+	ffbDDInitDriverFuncs(glCtx);
+	ffbDDInitStateFuncs(glCtx);
+	ffbDDInitSpanFuncs(glCtx);
+	ffbDDInitDepthFuncs(glCtx);
+	ffbDDInitStencilFuncs(glCtx);
+
+	/* Actually we do the culling in software.  The problem is
+	 * that there is apparently some bug in generic MESA if you
+	 * provide a driver triangle rendering function when culling
+	 * is enabled.
+	 *
+	 * Generic MESA in such a case does the culling in it's very
+	 * own software triangle rasterizers (ie. when the driver indicates
+	 * it cannot do it).  Perhaps this is a clue.
+	 */
+	glCtx->Driver.TriangleCaps = DD_TRI_CULL;
+
+	if (glCtx->VB)
+		ffbDDRegisterVB(glCtx->VB);
+
+	if (glCtx->NrPipelineStages)
+		glCtx->NrPipelineStages =
+			ffbDDRegisterPipelineStages(glCtx->PipelineStage,
+						    glCtx->PipelineStage,
+						    glCtx->NrPipelineStages);
+
+	driContextPriv->driverPrivate = (void *) fmesa;
+
+	return GL_TRUE;
+}
+
+void XMesaDestroyContext(__DRIcontextPrivate *driContextPriv)
+{
+	ffbContextPtr fmesa = (ffbContextPtr) driContextPriv->driverPrivate;
+
+	if (fmesa == ffbCtx)
+		ffbCtx = NULL;
+
+	if (fmesa)
+		Xfree(fmesa);
+}
+
+/* Create and initialize the Mesa and driver specific pixmap buffer data */
+GLframebuffer *XMesaCreateWindowBuffer(Display *dpy,
+				       __DRIscreenPrivate *driScrnPriv,
+				       __DRIdrawablePrivate *driDrawPriv,
+				       GLvisual *mesaVis)
+{
+	return gl_create_framebuffer(mesaVis,
+				     GL_FALSE,  /* software depth buffer? */
+				     mesaVis->StencilBits > 0,
+				     mesaVis->AccumRedBits > 0,
+				     mesaVis->AlphaBits > 0);
+}
+
+/* Create and initialize the Mesa and driver specific pixmap buffer data */
+GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
+{
+	return NULL;  /* not implemented yet */
+}
+
+#define USE_FAST_SWAP
+
+void XMesaSwapBuffers(__DRIdrawablePrivate *driDrawPriv)
+{
+	unsigned int fbc, wid, wid_reg_val, dac_db_bit;
+	unsigned int shadow_dac_addr, active_dac_addr;
+	ffb_fbcPtr ffb;
+	ffb_dacPtr dac;
+
+	if (ffbCtx == NULL ||
+	    ffbCtx->glCtx->Visual->DBflag == 0)
+		return;
+
+	ffb = ffbCtx->regs;
+	dac = ffbCtx->ffbScreen->dac;
+
+	fbc = ffbCtx->fbc;
+	wid = ffbCtx->wid;
+
+	/* Swap the buffer we render into and read pixels from. */
+	ffbCtx->back_buffer ^= 1;
+
+	/* If we are writing into both buffers, don't mess with
+	 * the WB setting.
+	 */
+	if ((fbc & FFB_FBC_WB_AB) != FFB_FBC_WB_AB) {
+		if ((fbc & FFB_FBC_WB_A) != 0)
+			fbc = (fbc & ~FFB_FBC_WB_A) | FFB_FBC_WB_B;
+		else
+			fbc = (fbc & ~FFB_FBC_WB_B) | FFB_FBC_WB_A;
+	}
+
+	/* But either way, we must flip the read buffer setting. */
+	if ((fbc & FFB_FBC_RB_A) != 0)
+		fbc = (fbc & ~FFB_FBC_RB_A) | FFB_FBC_RB_B;
+	else
+		fbc = (fbc & ~FFB_FBC_RB_B) | FFB_FBC_RB_A;
+
+	LOCK_HARDWARE(ffbCtx);
+
+	if (ffbCtx->fbc != fbc) {
+		FFBFifo(ffbCtx, 1);
+		ffb->fbc = ffbCtx->fbc = fbc;
+		ffbCtx->ffbScreen->rp_active = 1;
+	}
+
+	/* And swap the buffer displayed in the WID. */
+	if (ffbCtx->ffb_sarea->flags & FFB_DRI_PAC1) {
+		shadow_dac_addr = FFBDAC_PAC1_SPWLUT(wid);
+		active_dac_addr = FFBDAC_PAC1_APWLUT(wid);
+		dac_db_bit = FFBDAC_PAC1_WLUT_DB;
+	} else {
+		shadow_dac_addr = FFBDAC_PAC2_SPWLUT(wid);
+		active_dac_addr = FFBDAC_PAC2_APWLUT(wid);
+		dac_db_bit = FFBDAC_PAC2_WLUT_DB;
+	}
+
+	FFBWait(ffbCtx, ffb);
+
+	wid_reg_val = DACCFG_READ(dac, active_dac_addr);
+	if (ffbCtx->back_buffer == 0)
+		wid_reg_val |=  dac_db_bit;
+	else
+		wid_reg_val &= ~dac_db_bit;
+#ifdef USE_FAST_SWAP
+	DACCFG_WRITE(dac, active_dac_addr, wid_reg_val);
+#else
+	DACCFG_WRITE(dac, shadow_dac_addr, wid_reg_val);
+
+	/* Schedule the window transfer. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_WTCTRL, 
+		     (FFBDAC_CFG_WTCTRL_TCMD | FFBDAC_CFG_WTCTRL_TE));
+
+	{
+		int limit = 1000000;
+		while (limit--) {
+			unsigned int wtctrl = DACCFG_READ(dac, FFBDAC_CFG_WTCTRL);
+
+			if ((wtctrl & FFBDAC_CFG_WTCTRL_DS) == 0)
+				break;
+		}
+	}
+#endif
+
+	UNLOCK_HARDWARE(ffbCtx);
+}
+
+static void ffb_init_wid(unsigned int wid)
+{
+	ffb_dacPtr dac = ffbCtx->ffbScreen->dac;
+	unsigned int wid_reg_val, dac_db_bit, active_dac_addr;
+	unsigned int shadow_dac_addr;
+
+	if (ffbCtx->ffb_sarea->flags & FFB_DRI_PAC1) {
+		shadow_dac_addr = FFBDAC_PAC1_SPWLUT(wid);
+		active_dac_addr = FFBDAC_PAC1_APWLUT(wid);
+		dac_db_bit = FFBDAC_PAC1_WLUT_DB;
+	} else {
+		shadow_dac_addr = FFBDAC_PAC2_SPWLUT(wid);
+		active_dac_addr = FFBDAC_PAC2_APWLUT(wid);
+		dac_db_bit = FFBDAC_PAC2_WLUT_DB;
+	}
+
+	wid_reg_val = DACCFG_READ(dac, active_dac_addr);
+	wid_reg_val &= ~dac_db_bit;
+#ifdef USE_FAST_SWAP
+	DACCFG_WRITE(dac, active_dac_addr, wid_reg_val);
+#else
+	DACCFG_WRITE(dac, shadow_dac_addr, wid_reg_val);
+
+	/* Schedule the window transfer. */
+	DACCFG_WRITE(dac, FFBDAC_CFG_WTCTRL, 
+		     (FFBDAC_CFG_WTCTRL_TCMD | FFBDAC_CFG_WTCTRL_TE));
+
+	{
+		int limit = 1000000;
+		while (limit--) {
+			unsigned int wtctrl = DACCFG_READ(dac, FFBDAC_CFG_WTCTRL);
+
+			if ((wtctrl & FFBDAC_CFG_WTCTRL_DS) == 0)
+				break;
+		}
+	}
+#endif
+}
+
+/* Force the context `c' to be the current context and associate with it
+   buffer `b' */
+GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
+			   __DRIdrawablePrivate *driDrawPriv,
+			   __DRIdrawablePrivate *driReadPriv)
+{
+	if (driContextPriv) {
+		ffbContextPtr fmesa = (ffbContextPtr) driContextPriv->driverPrivate;
+		int first_time;
+
+		if (ffbCtx != NULL &&
+		    fmesa == ffbCtx &&
+		    driDrawPriv == fmesa->driDrawable)
+			return GL_TRUE;
+
+		ffbCtx = fmesa;
+		fmesa->driDrawable = driDrawPriv;
+
+		gl_make_current2(ffbCtx->glCtx, 
+				 driDrawPriv->mesaBuffer, driReadPriv->mesaBuffer);
+
+		if (!ffbCtx->glCtx->Viewport.Width)
+			gl_Viewport(ffbCtx->glCtx,
+				    0, 0,
+				    driDrawPriv->w, driDrawPriv->h);
+
+		first_time = 0;
+		if (ffbCtx->wid == ~0)
+			first_time = 1;
+
+		LOCK_HARDWARE(ffbCtx);
+		if (first_time) {
+			ffbCtx->wid = ffbCtx->ffb_sarea->wid_table[driDrawPriv->index];
+			ffbCtx->state_dirty |= FFB_STATE_WID;
+			ffb_init_wid(ffbCtx->wid);
+		}
+
+		ffbCtx->state_dirty |= FFB_STATE_ALL;
+		ffbCtx->state_fifo_ents = ffbCtx->state_all_fifo_ents;
+		ffbSyncHardware(ffbCtx);
+		UNLOCK_HARDWARE(ffbCtx);
+
+		if (first_time) {
+			/* Also, at the first switch to a new context,
+			 * we need to clear all the hw buffers.
+			 */
+			ffbDDClear(ffbCtx->glCtx,
+				   (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT |
+				    DD_DEPTH_BIT | DD_STENCIL_BIT),
+				   1, 0, 0, 0, 0);
+		}
+	} else {
+		gl_make_current(0,0);
+		ffbCtx = NULL;
+	}
+
+	return GL_TRUE;
+}
+
+/* Force the context `c' to be unbound from its buffer */
+GLboolean XMesaUnbindContext(__DRIcontextPrivate *driContextPriv)
+{
+	return GL_TRUE;
+}
+
+void ffbXMesaUpdateState(ffbContextPtr fmesa)
+{
+	__DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+	__DRIscreenPrivate *sPriv = fmesa->driScreen;
+	int stamp = dPriv->lastStamp;
+
+	XMESA_VALIDATE_DRAWABLE_INFO(fmesa->display, sPriv, dPriv);
+
+	if (dPriv->lastStamp != stamp) {
+		GLcontext *ctx = fmesa->glCtx;
+
+		if (ctx->Scissor.Enabled)
+			ffbDDScissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
+				     ctx->Scissor.Width, ctx->Scissor.Height);
+		if (ctx->Polygon.StippleFlag)
+			ffbXformAreaPattern(fmesa,
+					    (const GLubyte *)ctx->PolygonStipple);
+	}
+}
+
+/* This function is called by libGL.so as soon as libGL.so is loaded.
+ * This is where we'd register new extension functions with the dispatcher.
+ */
+void __driRegisterExtensions(void)
+{
+}
+
+#endif /* GLX_DIRECT_RENDERING */
Index: xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h:1.1
--- /dev/null	Sat Jul  1 20:44:34 2000
+++ xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h	Mon Jun 19 22:08:40 2000
@@ -0,0 +1,33 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h,v 1.1 2000/06/20 05:08:40 dawes Exp $ */
+
+#ifndef _FFB_XMESA_H_
+#define _FFB_XMESA_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+#include <sys/time.h>
+#include "dri_mesaint.h"
+#include "dri_mesa.h"
+#include "types.h"
+#include "ffb_drishare.h"
+#include "ffb_regs.h"
+#include "ffb_dac.h"
+#include "ffb_fifo.h"
+
+typedef struct {
+	__DRIscreenPrivate		*sPriv;
+	ffb_fbcPtr			regs;
+	ffb_dacPtr			dac;
+	volatile char			*sfb8r;
+	volatile char			*sfb32;
+	volatile char			*sfb64;
+
+	int				fifo_cache;
+	int				rp_active;
+} ffbScreenPrivate;
+
+extern void __driRegisterExtensions(void);
+
+#endif /* GLX_DIRECT_RENDERING */
+
+#endif /* !(_FFB_XMESA_H) */
Index: xc/lib/GL/mesa/src/drv/gamma/Imakefile
diff -u xc/lib/GL/mesa/src/drv/gamma/Imakefile:1.8 xc/lib/GL/mesa/src/drv/gamma/Imakefile:1.11
--- xc/lib/GL/mesa/src/drv/gamma/Imakefile:1.8	Thu Mar  2 08:07:35 2000
+++ xc/lib/GL/mesa/src/drv/gamma/Imakefile	Sun Jun 25 07:44:26 2000
@@ -1,33 +1,42 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.8 2000/03/02 16:07:35 martin Exp $
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.11 2000/06/25 14:44:26 alanh Exp $
 
+#include <Threads.tmpl>
+
 #define DoNormalLib NormalLibGlx
 #define DoSharedLib SharedLibGlx
 #define DoExtraLib SharedLibGlx
 #define DoDebugLib DebugLibGlx
 #define DoProfileLib ProfileLibGlx
 
-LinkSourceFile(xmesaP.h, ../../../../../../extras/Mesa/src/X)
-LinkSourceFile(glapi.h, ../../../../../../extras/Mesa/src)
-
-
 #if Malloc0ReturnsNull
 ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DDRIVERTS
  DRI_INCLUDES = -I../../../../dri -I../../../../glx \
 		-I../../../dri \
 		-I$(TOP)/include -I$(TOP)/include/GL \
 		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \
 		-I$(XF86DRIVERSRC)/glint \
-		-I../../../include -I../.. -I../../X
+		-I../../../include -I../.. -I../../X -I../common \
+	        -I$(XF86OSSRC)/linux/drm/kernel
 #endif
 
 MESA_INCLUDES = -I. -I.. -I../../include
 
+
+
       DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES)
-     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES)
+     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) 
+
+#if 0
+	LOSRC = ../../../../lowpc.c
+	LOOBJ = ../../../../lowpc.o
+
+	HISRC = ../../../../highpc.c
+	HIOBJ = ../../../../highpc.o
+#endif
 
       DRISRCS = ../../../dri/dri_mesa.c \
 		../../../../dri/dri_tmm.c
@@ -46,16 +55,215 @@
 		../../../../dri/drm/xf86drmSL.o
 
     GAMMASRCS = gamma_gl.c gamma_xmesa.c gamma_init.c gamma_matrix.c \
-                gamma_inithw.c gamma_texture.c
+                gamma_inithw.c gamma_texture.c /* gamma_dlist.c */
 
     GAMMAOBJS = gamma_gl.o gamma_xmesa.o gamma_init.o gamma_matrix.o \
-                gamma_inithw.o gamma_texture.o
+                gamma_inithw.o gamma_texture.o /* gamma_dlist.o */
+
+     MESASRCS = ../../aatriangle.c \
+		../../accum.c \
+		../../alpha.c \
+		../../alphabuf.c \
+		../../attrib.c \
+		../../bbox.c \
+		../../bitmap.c \
+		../../blend.c \
+		../../buffers.c \
+		../../clip.c \
+		../../colortab.c \
+		../../config.c \
+		../../context.c \
+		../../copypix.c \
+		../../cva.c \
+		../../debug_xform.c \
+		../../depth.c \
+		../../dlist.c \
+		../../drawpix.c \
+		../../enable.c \
+		../../enums.c \
+		../../eval.c \
+		../../extensions.c \
+		../../feedback.c \
+		../../fog.c \
+		../../get.c \
+		../../glapi.c \
+		../../glapinoop.c \
+		../../glthread.c \
+		../../hash.c \
+		../../image.c \
+		../../imaging.c \
+		../../light.c \
+		../../lines.c \
+		../../logic.c \
+		../../masking.c \
+		../../matrix.c \
+		../../mem.c \
+		../../mmath.c \
+		../../pb.c \
+		../../pipeline.c \
+		../../pixel.c \
+		../../pixeltex.c \
+		../../points.c \
+		../../polygon.c \
+		../../quads.c \
+		../../rastpos.c \
+		../../readpix.c \
+		../../rect.c \
+		../../scissor.c \
+		../../shade.c \
+		../../span.c \
+		../../stages.c \
+		../../state.c \
+		../../stencil.c \
+		../../teximage.c \
+		../../texobj.c \
+		../../texstate.c \
+		../../texture.c \
+		../../texutil.c \
+		../../translate.c \
+		../../triangle.c \
+		../../varray.c \
+		../../vb.c \
+		../../vbcull.c \
+		../../vbfill.c \
+		../../vbindirect.c \
+		../../vbrender.c \
+		../../vbxform.c \
+		../../vector.c \
+		../../vertices.c \
+		../../winpos.c \
+		../../xform.c \
+		../../zoom.c
+
+     MESAOBJS = ../../aatriangle.o \
+		../../accum.o \
+		../../alpha.o \
+		../../alphabuf.o \
+		../../attrib.o \
+		../../bbox.o \
+		../../bitmap.o \
+		../../blend.o \
+		../../buffers.o \
+		../../clip.o \
+		../../colortab.o \
+		../../config.o \
+		../../context.o \
+		../../copypix.o \
+		../../cva.o \
+		../../debug_xform.o \
+		../../depth.o \
+		../../dlist.o \
+		../../drawpix.o \
+		../../enable.o \
+		../../enums.o \
+		../../eval.o \
+		../../extensions.o \
+		../../feedback.o \
+		../../fog.o \
+		../../get.o \
+		../../hash.o \
+		../../hint.o \
+		../../image.o \
+		../../imaging.o \
+		../../light.o \
+		../../lines.o \
+		../../logic.o \
+		../../masking.o \
+		../../matrix.o \
+		../../mem.o \
+		../../mmath.o \
+		../../pb.o \
+		../../pipeline.o \
+		../../pixel.o \
+		../../pixeltex.o \
+		../../points.o \
+		../../polygon.o \
+		../../quads.o \
+		../../rastpos.o \
+		../../readpix.o \
+		../../rect.o \
+		../../scissor.o \
+		../../shade.o \
+		../../span.o \
+		../../stages.o \
+		../../state.o \
+		../../stencil.o \
+		../../teximage.o \
+		../../texobj.o \
+		../../texstate.o \
+		../../texture.o \
+		../../texutil.o \
+		../../translate.o \
+		../../triangle.o \
+		../../varray.o \
+		../../vb.o \
+		../../vbcull.o \
+		../../vbfill.o \
+		../../vbindirect.o \
+		../../vbrender.o \
+		../../vbxform.o \
+		../../vector.o \
+		../../vertices.o \
+		../../winpos.o \
+		../../xform.o \
+		../../zoom.o
+
+#ifdef i386Architecture
+     X86_SRCS = ../../X86/x86.c \
+		../../X86/x86a.S \
+		../../X86/common_x86.c \
+		../../X86/common_x86asm.S \
+		../../X86/vertex.S
+
+     X86_OBJS = ../../X86/x86.o \
+		../../X86/x86a.o \
+		../../X86/common_x86.o \
+		../../X86/common_x86asm.o \
+		../../X86/vertex.o
+
+     MMX_SRCS = ../../X86/mmx_blend.S
+
+     MMX_OBJS = ../../X86/mmx_blend.o
+
+XCOMM Disabling 3Dnow code for the time being.
+#if 0
+   3DNOW_SRCS = ../../X86/3dnow.c \
+		../../X86/3dnow_norm_raw.S \
+		../../X86/3dnow_xform_masked1.S \
+		../../X86/3dnow_xform_masked2.S \
+		../../X86/3dnow_xform_masked3.S \
+		../../X86/3dnow_xform_masked4.S \
+		../../X86/3dnow_xform_raw1.S \
+		../../X86/3dnow_xform_raw2.S \
+		../../X86/3dnow_xform_raw3.S \
+		../../X86/3dnow_xform_raw4.S \
+		../../X86/vertex_3dnow.S
+
+   3DNOW_OBJS = ../../X86/3dnow.o \
+		../../X86/3dnow_norm_raw.o \
+		../../X86/3dnow_xform_masked1.o \
+		../../X86/3dnow_xform_masked2.o \
+		../../X86/3dnow_xform_masked3.o \
+		../../X86/3dnow_xform_masked4.o \
+		../../X86/3dnow_xform_raw1.o \
+		../../X86/3dnow_xform_raw2.o \
+		../../X86/3dnow_xform_raw3.o \
+		../../X86/3dnow_xform_raw4.o \
+		../../X86/vertex_3dnow.o
+#endif
 
-XCOMM	 SRCS = $(DRISRCS) $(DRMSRCS) $(GAMMASRCS)
-XCOMM	 OBJS = $(DRIOBJS) $(DRMOBJS) $(GAMMAOBJS)
+#endif
 
-	 SRCS = $(GAMMASRCS)
-	 OBJS = $(DRIOBJS) $(DRMOBJS) $(GAMMAOBJS)
+      ASMSRCS = $(X86_SRCS) $(MMX_SRCS) $(3DNOW_SRCS)
+      ASMOBJS = $(X86_OBJS) $(MMX_OBJS) $(3DNOW_OBJS)
+
+         SRCS = $(LOWSRC) $(DRISRCS) $(DRMSRCS) $(MESASRCS) $(ASMSRCS) $(GAMMASRCS) $(HISRC)
+         OBJS = $(LOWOBJ) $(DRIOBJS) $(DRMOBJS) $(MESAOBJS) $(ASMOBJS) $(GAMMAOBJS) $(HIOBJ)
+
+REQUIREDLIBS += -lm
+#if !GlxBuiltInGamma
+REQUIREDLIBS += -L../../../.. -lGL
+#endif
 
 
 #if !GlxUseBuiltInDRIDriver
@@ -77,7 +285,7 @@
 ALL_OBJS = $(OBJS)
 ALL_DEPS = DONE
 SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
-InstallDynamicModule($(LIBNAME),$(MODULEDIR)/dri,.)
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
 #endif
 
 DependTarget()
Index: xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c
diff -u xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c:1.4 xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c:1.6
--- xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c:1.4	Thu Mar  2 08:07:35 2000
+++ xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c	Fri Jun 16 17:02:55 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c,v 1.4 2000/03/02 16:07:35 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c,v 1.6 2000/06/17 00:02:55 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -30,13 +30,16 @@
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
  *   Brian Paul <brian@precisioninsight.com>
+ *   Alan Hourihane <Alan.Hourihane@btinternet.com>
  */
 
 #ifdef GLX_DIRECT_RENDERING
 
+#include <Xarch.h>
 #include <math.h>
 #include "gamma_gl.h"
 #include "gamma_init.h"
+#include "glint_dri.h"
 #ifdef RANDOMIZE_COLORS
 #include <stdlib.h>
 #endif
@@ -114,7 +117,7 @@
     DEBUG_GLCMDS(("Begin: %04x\n", (int)mode));
 
     if ((gCCPriv->Begin & B_PrimType_Mask) != B_PrimType_Null) {
-	/* ERROR!!! */
+        DEBUG_ERROR(("Begin: Error\n"));
 	return;
     }
 
@@ -177,8 +180,9 @@
     gCCPriv->curTexObj = gammaTOFind(texture);
 
     /* Make the new texture images resident */
-    if (!driTMMMakeImagesResident(gCCPriv->tmm, MIPMAP_LEVELS,
-				  gCCPriv->curTexObj->image, addrs)) {
+    if (driTMMMakeImagesResident(gCCPriv->tmm, MIPMAP_LEVELS,
+				  gCCPriv->curTexObj->image, addrs) < 0) {
+    	DEBUG_ERROR(("BindTexture: unable\n"));
 	/* NOT_DONE: Handle error */
     }
 
@@ -358,10 +362,12 @@
 
 void _gamma_Clear(GLbitfield mask)
 {
+    int temp;
     unsigned int depth = 0;
     int do_clear = 0;
+    GLINTDRIPtr gDRIPriv = (GLINTDRIPtr)gCC->driScreenPriv->pDevPriv;
 #ifdef DO_VALIDATE
-    __DRIscreenPrivate *driScrnPriv = gCC->driContextPriv->driScreenPriv;
+    __DRIscreenPrivate *driScrnPriv = gCC->driScreenPriv;
 #endif
 
     DEBUG_GLCMDS(("Clear: %04x\n", (int)mask));
@@ -437,11 +443,12 @@
 	gCCPriv->FrameCount &= 0xff;
 #endif
 
+	temp = (gCCPriv->LBReadMode & LBPartialProdMask) | LBWindowOriginBot;
+	/* UGH - move this later ! */
+	if (gDRIPriv->numMXDevices == 2) temp |= LBScanLineInt2;
+
 	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
-	WRITE(gCCPriv->buf, LBReadMode, 
-	      ((gCCPriv->LBReadMode & LBPartialProdMask) |
-	       LBScanLineInt2 |
-	       LBWindowOriginBot));
+	WRITE(gCCPriv->buf, LBReadMode, temp);
 
 	/* Force FCP to be written */
 	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
@@ -627,34 +634,48 @@
 
 void _gamma_Color3b(GLbyte red, GLbyte green, GLbyte blue)
 {
+    GLfloat r,g,b;
+
     DEBUG_GLCMDS(("Color3b: %d %d %d\n", red, green, blue));
+  
+    r = BYTE_TO_FLOAT(red);
+    g = BYTE_TO_FLOAT(green);
+    b = BYTE_TO_FLOAT(blue);
+
+    _gamma_Color3f(r,g,b);
 }
 
 void _gamma_Color3bv(const GLbyte *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Color3bv: %d %d %d\n", v[0], v[1], v[2]));
+
+    p[0] = BYTE_TO_FLOAT(v[0]);
+    p[1] = BYTE_TO_FLOAT(v[1]);
+    p[2] = BYTE_TO_FLOAT(v[2]);
+
+    _gamma_Color3f(p[0],p[1],p[2]);
 }
 
 void _gamma_Color3d(GLdouble red, GLdouble green, GLdouble blue)
 {
     DEBUG_GLCMDS(("Color3d: %f %f %f\n", red, green, blue));
+
+    _gamma_Color3f((GLfloat)red,(GLfloat)green,(GLfloat)blue);
 }
 
 void _gamma_Color3dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("Color3dv: %f %f %f\n", v[0], v[1], v[2]));
+
+    _gamma_Color3fv((GLfloat*)v);
 }
 
 void _gamma_Color3f(GLfloat red, GLfloat green, GLfloat blue)
 {
     DEBUG_GLCMDS(("Color3f: %f %f %f\n", red, green, blue));
 
-#ifdef RANDOMIZE_COLORS
-    red = (random() / (double)RAND_MAX);
-    green = (random() / (double)RAND_MAX);
-    blue = (random() / (double)RAND_MAX);
-#endif
-
     CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
     WRITEF(gCCPriv->buf, Cb,  blue);
     WRITEF(gCCPriv->buf, Cg,  green);
@@ -665,107 +686,188 @@
 {
     DEBUG_GLCMDS(("Color3fv: %f %f %f\n", v[0], v[1], v[2]));
 
-#ifdef RANDOMIZE_COLORS
-    {
-	float r, g, b;
-	r = (random() / (double)RAND_MAX);
-	g = (random() / (double)RAND_MAX);
-	b = (random() / (double)RAND_MAX);
-	CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
-	WRITEF(gCCPriv->buf, Cb,  b);
-	WRITEF(gCCPriv->buf, Cg,  g);
-	WRITEF(gCCPriv->buf, Cr3, r);
-    }
-#else
     CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
     WRITEF(gCCPriv->buf, Cb,  v[2]);
     WRITEF(gCCPriv->buf, Cg,  v[1]);
     WRITEF(gCCPriv->buf, Cr3, v[0]);
-#endif
 }
 
 void _gamma_Color3i(GLint red, GLint green, GLint blue)
 {
+    GLfloat r,g,b;
+
     DEBUG_GLCMDS(("Color3i: %d %d %d\n", (int)red, (int)green, (int)blue));
+
+    r = INT_TO_FLOAT(red);
+    g = INT_TO_FLOAT(green);
+    b = INT_TO_FLOAT(blue);
+
+    _gamma_Color3f(r,g,b);
 }
 
 void _gamma_Color3iv(const GLint *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Color3iv: %d %d %d\n", (int)v[0], (int)v[1], (int)v[2]));
+
+    p[0] = INT_TO_FLOAT(v[0]);
+    p[1] = INT_TO_FLOAT(v[1]);
+    p[2] = INT_TO_FLOAT(v[2]);
+
+    _gamma_Color3f(p[0],p[1],p[2]);
 }
 
 void _gamma_Color3s(GLshort red, GLshort green, GLshort blue)
 {
+    GLfloat r,g,b;
+
     DEBUG_GLCMDS(("Color3s: %d %d %d\n", red, green, blue));
+
+    r = SHORT_TO_FLOAT(red);
+    g = SHORT_TO_FLOAT(green);
+    b = SHORT_TO_FLOAT(blue);
+
+    _gamma_Color3f(r,g,b);
 }
 
 void _gamma_Color3sv(const GLshort *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Color3sv: %d %d %d\n", v[0], v[1], v[2]));
+
+    p[0] = SHORT_TO_FLOAT(v[0]);
+    p[1] = SHORT_TO_FLOAT(v[1]);
+    p[2] = SHORT_TO_FLOAT(v[2]);
+
+    _gamma_Color3f(p[0],p[1],p[2]);
 }
 
 void _gamma_Color3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
+    GLuint c;
+
     DEBUG_GLCMDS(("Color3ub: %d %d %d\n", red, green, blue));
+
+    c = (blue << 16) | (green << 8) | red;
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+    WRITE(gCCPriv->buf, PackedColor3,  c);
 }
 
 void _gamma_Color3ubv(const GLubyte *v)
 {
+    GLuint c;
+
     DEBUG_GLCMDS(("Color3ubv: %d %d %d\n", v[0], v[1], v[2]));
+
+    c = (v[2] << 16) | (v[1] << 8) | v[0];
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+    WRITE(gCCPriv->buf, PackedColor3,  c);
 }
 
 void _gamma_Color3ui(GLuint red, GLuint green, GLuint blue)
 {
+    GLfloat r,g,b;
+
     DEBUG_GLCMDS(("Color3ui: %d %d %d\n",
 		  (unsigned int)red, (unsigned int)green, (unsigned int)blue));
+
+    r = UINT_TO_FLOAT(red);
+    g = UINT_TO_FLOAT(green);
+    b = UINT_TO_FLOAT(blue);
+
+    _gamma_Color3f(r,g,b);
 }
 
 void _gamma_Color3uiv(const GLuint *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Color3uiv: %d %d %d\n",
 		  (unsigned int)v[0], (unsigned int)v[1], (unsigned int)v[2]));
+
+    p[0] = UINT_TO_FLOAT(v[0]);
+    p[1] = UINT_TO_FLOAT(v[1]);
+    p[2] = UINT_TO_FLOAT(v[2]);
+
+    _gamma_Color3f(p[0],p[1],p[2]);
 }
 
 void _gamma_Color3us(GLushort red, GLushort green, GLushort blue)
 {
+    GLfloat r,g,b;
+
     DEBUG_GLCMDS(("Color3us: %d %d %d\n", red, green, blue));
+
+    r = USHORT_TO_FLOAT(red);
+    g = USHORT_TO_FLOAT(green);
+    b = USHORT_TO_FLOAT(blue);
+
+    _gamma_Color3f(r,g,b);
 }
 
 void _gamma_Color3usv(const GLushort *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Color3usv: %d %d %d\n", v[0], v[1], v[2]));
+
+    p[0] = USHORT_TO_FLOAT(v[0]);
+    p[1] = USHORT_TO_FLOAT(v[1]);
+    p[2] = USHORT_TO_FLOAT(v[2]);
+
+    _gamma_Color3f(p[0],p[1],p[2]);
 }
 
 void _gamma_Color4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
+    GLfloat r,g,b,a;
+
     DEBUG_GLCMDS(("Color4b: %d %d %d %d\n", red, green, blue, alpha));
+
+    r = BYTE_TO_FLOAT(red);
+    g = BYTE_TO_FLOAT(green);
+    b = BYTE_TO_FLOAT(blue);
+    a = BYTE_TO_FLOAT(alpha);
+
+    _gamma_Color4f(r,g,b,a);
 }
 
 void _gamma_Color4bv(const GLbyte *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("Color4bv: %d %d %d %d\n", v[0], v[1], v[2], v[3]));
+
+    p[0] = BYTE_TO_FLOAT(v[0]);
+    p[1] = BYTE_TO_FLOAT(v[1]);
+    p[2] = BYTE_TO_FLOAT(v[2]);
+    p[3] = BYTE_TO_FLOAT(v[3]);
+
+    _gamma_Color4f(p[0],p[1],p[2],p[3]);
 }
 
 void _gamma_Color4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
     DEBUG_GLCMDS(("Color4d: %f %f %f %f\n", red, green, blue, alpha));
+
+    _gamma_Color4f((GLfloat)red,(GLfloat)green,(GLfloat)blue,(GLfloat)alpha);
 }
 
 void _gamma_Color4dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("Color4dv: %f %f %f %f\n", v[0], v[1], v[2], v[3]));
+
+    _gamma_Color4fv((GLfloat*)v);
 }
 
 void _gamma_Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
     DEBUG_GLCMDS(("Color4f: %f %f %f %f\n", red, green, blue, alpha));
 
-#ifdef RANDOMIZE_COLORS
-    red = (random() / (double)RAND_MAX);
-    green = (random() / (double)RAND_MAX);
-    blue = (random() / (double)RAND_MAX);
-#endif
-
     CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
     WRITEF(gCCPriv->buf, Ca,  alpha);
     WRITEF(gCCPriv->buf, Cb,  blue);
@@ -777,47 +879,69 @@
 {
     DEBUG_GLCMDS(("Color4fv: %f %f %f %f\n", v[0], v[1], v[2], v[3]));
 
-#ifdef RANDOMIZE_COLORS
-    {
-	float r, g, b;
-	r = (random() / (double)RAND_MAX);
-	g = (random() / (double)RAND_MAX);
-	b = (random() / (double)RAND_MAX);
-	CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
-	WRITEF(gCCPriv->buf, Ca,  v[3]);
-	WRITEF(gCCPriv->buf, Cb,  b);
-	WRITEF(gCCPriv->buf, Cg,  g);
-	WRITEF(gCCPriv->buf, Cr3, r);
-    }
-#else
     CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
     WRITEF(gCCPriv->buf, Ca,  v[3]);
     WRITEF(gCCPriv->buf, Cb,  v[2]);
     WRITEF(gCCPriv->buf, Cg,  v[1]);
     WRITEF(gCCPriv->buf, Cr4, v[0]);
-#endif
 }
 
 void _gamma_Color4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
+    GLfloat r,g,b,a;
+
     DEBUG_GLCMDS(("Color4i: %d %d %d %d\n", (int)red, (int)green, (int)blue,
 		  (int)alpha));
+
+    r = INT_TO_FLOAT(red);
+    g = INT_TO_FLOAT(green);
+    b = INT_TO_FLOAT(blue);
+    a = INT_TO_FLOAT(alpha);
+
+    _gamma_Color4f(r,g,b,a);
 }
 
 void _gamma_Color4iv(const GLint *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("Color4iv: %d %d %d %d\n", (int)v[0], (int)v[1], (int)v[2],
 		  (int)v[3]));
+
+    p[0] = INT_TO_FLOAT(v[0]);
+    p[1] = INT_TO_FLOAT(v[1]);
+    p[2] = INT_TO_FLOAT(v[2]);
+    p[3] = INT_TO_FLOAT(v[3]);
+
+    _gamma_Color4f(p[0],p[1],p[2],p[3]);
 }
 
 void _gamma_Color4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
+    GLfloat r,g,b,a;
+
     DEBUG_GLCMDS(("Color4s: %d %d %d %d\n", red, green, blue, alpha));
+
+    r = SHORT_TO_FLOAT(red);
+    g = SHORT_TO_FLOAT(green);
+    b = SHORT_TO_FLOAT(blue);
+    a = SHORT_TO_FLOAT(alpha);
+
+    _gamma_Color4f(r,g,b,a);
 }
 
 void _gamma_Color4sv(const GLshort *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("Color4sv: %d %d %d %d\n", v[0], v[1], v[2], v[3]));
+
+    p[0] = SHORT_TO_FLOAT(v[0]);
+    p[1] = SHORT_TO_FLOAT(v[1]);
+    p[2] = SHORT_TO_FLOAT(v[2]);
+    p[3] = SHORT_TO_FLOAT(v[3]);
+
+    _gamma_Color4f(p[0],p[1],p[2],p[3]);
 }
 
 void _gamma_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
@@ -826,11 +950,7 @@
 
     DEBUG_GLCMDS(("Color4ub: %d %d %d %d\n", red, green, blue, alpha));
 
-#ifdef RANDOMIZE_COLORS
-    c = (random() / (double)RAND_MAX) * 16777216;
-#else
     c = (alpha << 24) | (blue << 16) | (green << 8) | red;
-#endif
 
     CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
     WRITE(gCCPriv->buf, PackedColor4,  c);
@@ -842,17 +962,7 @@
 
     DEBUG_GLCMDS(("Color4ubv: %d %d %d %d\n", v[0], v[1], v[2], v[3]));
 
-#ifdef RANDOMIZE_COLORS
-    c = (random() / (double)RAND_MAX) * 16777216;
-#else
-/* NOT_DONE: Is there a standard define for endianness? */
-#define IS_LITTLE_ENDIAN 1
-#if IS_LITTLE_ENDIAN
-    c = *((GLuint *)v);
-#else
     c = (v[3] << 24) | (v[2] << 16) | (v[1] << 8) | v[0];
-#endif
-#endif
 
     CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
     WRITE(gCCPriv->buf, PackedColor4,  c);
@@ -860,26 +970,62 @@
 
 void _gamma_Color4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
+    GLfloat r,g,b,a;
+
     DEBUG_GLCMDS(("Color4ui: %d %d %d %d\n",
 		  (unsigned int)red, (unsigned int)green,
 		  (unsigned int)blue, (unsigned int)alpha));
+
+    r = UINT_TO_FLOAT(red);
+    g = UINT_TO_FLOAT(green);
+    b = UINT_TO_FLOAT(blue);
+    a = UINT_TO_FLOAT(alpha);
+
+    _gamma_Color4f(r,g,b,a);
 }
 
 void _gamma_Color4uiv(const GLuint *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("Color4uiv: %d %d %d %d\n",
 		  (unsigned int)v[0], (unsigned int)v[1],
 		  (unsigned int)v[2], (unsigned int)v[3]));
+
+    p[0] = UINT_TO_FLOAT(v[0]);
+    p[1] = UINT_TO_FLOAT(v[1]);
+    p[2] = UINT_TO_FLOAT(v[2]);
+    p[3] = UINT_TO_FLOAT(v[3]);
+
+    _gamma_Color4f(p[0],p[1],p[2],p[3]);
 }
 
 void _gamma_Color4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
+    GLfloat r,g,b,a;
+
     DEBUG_GLCMDS(("Color4us: %d %d %d %d\n", red, green, blue, alpha));
+
+    r = USHORT_TO_FLOAT(red);
+    g = USHORT_TO_FLOAT(green);
+    b = USHORT_TO_FLOAT(blue);
+    a = USHORT_TO_FLOAT(alpha);
+
+    _gamma_Color4f(r,g,b,a);
 }
 
 void _gamma_Color4usv(const GLushort *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("Color4usv: %d %d %d %d\n", v[0], v[1], v[2], v[3]));
+
+    p[0] = USHORT_TO_FLOAT(v[0]);
+    p[1] = USHORT_TO_FLOAT(v[1]);
+    p[2] = USHORT_TO_FLOAT(v[2]);
+    p[3] = USHORT_TO_FLOAT(v[3]);
+
+    _gamma_Color4f(p[0],p[1],p[2],p[3]);
 }
 
 void _gamma_ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
@@ -890,6 +1036,43 @@
 void _gamma_ColorMaterial(GLenum face, GLenum mode)
 {
     DEBUG_GLCMDS(("ColorMaterial: %04x %04x\n", (int)face, (int)mode));
+
+    gCCPriv->MaterialMode &= ~MaterialModeEnable;
+    gCCPriv->ColorMaterialMode = ColorMaterialModeDisable;
+
+    switch (face) {
+    case GL_FRONT:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeFront;
+	break;
+    case GL_BACK:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeBack;
+	break;
+    case GL_FRONT_AND_BACK:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeFrontAndBack;
+	break;
+    }
+
+    switch (mode) {
+    case GL_AMBIENT:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeAmbient;
+	break;
+    case GL_EMISSION:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeEmission;
+	break;
+    case GL_DIFFUSE:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeDiffuse;
+	break;
+    case GL_SPECULAR:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeSpecular;
+	break;
+    case GL_AMBIENT_AND_DIFFUSE:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeAmbAndDiff;
+	break;
+    }
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+    WRITE(gCCPriv->buf, ColorMaterialMode, gCCPriv->ColorMaterialMode);
+    WRITE(gCCPriv->buf, MaterialMode, gCCPriv->MaterialMode);
 }
 
 void _gamma_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
@@ -938,9 +1121,6 @@
 
     gCCPriv->GeometryMode &= ~GM_PolyCullMask;
 
-#ifdef CULL_ALL_PRIMS
-    gCCPriv->GeometryMode |= GM_PolyCullBoth;
-#else
     switch (mode) {
     case GL_FRONT:
 	gCCPriv->GeometryMode |= GM_PolyCullFront;
@@ -955,7 +1135,7 @@
 	/* ERROR!! */
 	break;
     }
-#endif
+
     CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
     WRITE(gCCPriv->buf, GeometryMode, gCCPriv->GeometryMode);
 }
@@ -980,7 +1160,8 @@
 
     for (i = 0; i < n; i++) {
 	gammaTexObj *t = gammaTOFind(textures[i]);
-	if (!driTMMDeleteImages(gCCPriv->tmm, MIPMAP_LEVELS, t->image)) {
+	if (driTMMDeleteImages(gCCPriv->tmm, MIPMAP_LEVELS, t->image) < 0) {
+    	    DEBUG_ERROR(("DeleteTextures: unable\n"));
 	    /* NOT_DONE: Handle error */
 	}
 	gammaTODelete(textures[i]);
@@ -1068,11 +1249,9 @@
 
     switch (cap) {
     case GL_CULL_FACE:
-#ifdef CULL_ALL_PRIMS
 	gCCPriv->GeometryMode &= ~GM_PolyCullEnable;
 	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
 	WRITE(gCCPriv->buf, GeometryMode, gCCPriv->GeometryMode);
-#endif
 	break;
     case GL_DEPTH_TEST:
 	if (gCCPriv->Flags & GAMMA_DEPTH_BUFFER) {
@@ -1106,6 +1285,35 @@
 	WRITE(gCCPriv->buf, FBReadMode, (gCCPriv->FBReadMode |
 					 gCCPriv->AB_FBReadMode));
 	break;
+    case GL_COLOR_MATERIAL:
+	gCCPriv->ColorMaterialMode &= ~ColorMaterialModeEnable;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, ColorMaterialMode, gCCPriv->ColorMaterialMode);
+	break;
+    case GL_FOG:
+	gCCPriv->Begin &= ~B_FogEnable;
+	gCCPriv->GeometryMode &= ~GM_FogEnable;
+	gCCPriv->DeltaMode &= ~DM_FogEnable;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+	WRITE(gCCPriv->buf, GeometryMode, gCCPriv->GeometryMode);
+	WRITE(gCCPriv->buf, DeltaMode, gCCPriv->DeltaMode);
+	WRITE(gCCPriv->buf, FogMode, FogModeDisable);
+	break;
+    case GL_LIGHTING:
+	gCCPriv->LightingMode &= ~LightingModeEnable;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, LightingMode, gCCPriv->LightingMode);
+	break;
+    case GL_LIGHT0:
+	gCCPriv->Light0Mode &= ~LNM_On;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, Light0Mode, gCCPriv->Light0Mode);
+	break;
+    case GL_LIGHT1:
+	gCCPriv->Light1Mode &= ~LNM_On;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, Light1Mode, gCCPriv->Light1Mode);
+	break;
     case GL_TEXTURE_2D:
 	gCCPriv->Texture2DEnabled = GL_FALSE;
 	gCCPriv->Begin                         &= ~B_TextureEnable;
@@ -1227,6 +1435,35 @@
 	WRITE(gCCPriv->buf, FBReadMode, (gCCPriv->FBReadMode |
 					 gCCPriv->AB_FBReadMode));
 	break;
+    case GL_COLOR_MATERIAL:
+	gCCPriv->ColorMaterialMode |= ColorMaterialModeEnable;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, ColorMaterialMode, gCCPriv->ColorMaterialMode);
+	break;
+    case GL_FOG:
+	gCCPriv->Begin |= B_FogEnable;
+	gCCPriv->GeometryMode |= GM_FogEnable;
+	gCCPriv->DeltaMode |= DM_FogEnable;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+	WRITE(gCCPriv->buf, GeometryMode, gCCPriv->GeometryMode);
+	WRITE(gCCPriv->buf, DeltaMode, gCCPriv->DeltaMode);
+	WRITE(gCCPriv->buf, FogMode, FogModeEnable);
+	break;
+    case GL_LIGHTING:
+	gCCPriv->LightingMode |= LightingModeEnable | 16<<6;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, LightingMode, gCCPriv->LightingMode);
+	break;
+    case GL_LIGHT0:
+	gCCPriv->Light0Mode |= LNM_On;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, Light0Mode, gCCPriv->Light0Mode);
+	break;
+    case GL_LIGHT1:
+	gCCPriv->Light1Mode |= LNM_On;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, Light1Mode, gCCPriv->Light1Mode);
+	break;
     case GL_TEXTURE_2D:
 	gCCPriv->Texture2DEnabled = GL_TRUE;
 #ifndef TURN_OFF_TEXTURES
@@ -1294,34 +1531,42 @@
 
 void _gamma_EvalCoord1dv(const GLdouble *u)
 {
+    DEBUG_GLCMDS(("EvalCoord1dv: %f\n", *u));
 }
 
 void _gamma_EvalCoord1f(GLfloat u)
 {
+    DEBUG_GLCMDS(("EvalCoord1f: %f\n", u));
 }
 
 void _gamma_EvalCoord1fv(const GLfloat *u)
 {
+    DEBUG_GLCMDS(("EvalCoord1fv: %f\n", *u));
 }
 
 void _gamma_EvalCoord2d(GLdouble u, GLdouble v)
 {
+    DEBUG_GLCMDS(("EvalCoord2d: %f %f\n", u, v));
 }
 
 void _gamma_EvalCoord2dv(const GLdouble *u)
 {
+    DEBUG_GLCMDS(("EvalCoord2dv: %f %f\n", u[0], u[1]));
 }
 
 void _gamma_EvalCoord2f(GLfloat u, GLfloat v)
 {
+    DEBUG_GLCMDS(("EvalCoord2f: %f %f\n", u, v));
 }
 
 void _gamma_EvalCoord2fv(const GLfloat *u)
 {
+    DEBUG_GLCMDS(("EvalCoord1fv: %f %f\n", u[0], u[1]));
 }
 
 void _gamma_EvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
+    DEBUG_GLCMDS(("EvalMesh1: %d %d %d\n", mode, i1, i2));
 }
 
 void _gamma_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
@@ -1358,16 +1603,55 @@
 void _gamma_Fogf(GLenum pname, GLfloat param)
 {
     DEBUG_GLCMDS(("Fogf: %04x %f\n", (int)pname, param));
+
+    switch (pname) {
+    case GL_FOG_DENSITY:
+    	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITEF(gCCPriv->buf, FogDensity, param);
+	break;
+    }
 }
 
 void _gamma_Fogfv(GLenum pname, const GLfloat *params)
 {
+    int color;
+
     DEBUG_GLCMDS(("Fogfv: %04x %f\n", (int)pname, *params));
+
+    switch (pname) {
+    case GL_FOG_COLOR:
+	color = ((int)params[3]<<24) | ((int)params[2]<<16) |
+	 	((int)params[1]<<8)  | ((int)params[0]);
+    	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, FogColor, color);
+	break;
+    }
 }
 
 void _gamma_Fogi(GLenum pname, GLint param)
 {
     DEBUG_GLCMDS(("Fogi: %04x %d\n", (int)pname, (int)param));
+
+    gCCPriv->GeometryMode &= ~GM_FogMask;
+
+    switch (pname) {
+    case GL_FOG_MODE:
+	switch (param) {
+	case GL_EXP:
+	    gCCPriv->GeometryMode |= GM_FogExp;
+	    break;
+	case GL_EXP2:
+	    gCCPriv->GeometryMode |= GM_FogExpSquared;
+	    break;
+	case GL_LINEAR:
+	    gCCPriv->GeometryMode |= GM_FogLinear;
+	    break;
+	}
+ 	break;
+    }
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+    WRITE(gCCPriv->buf, GeometryMode, gCCPriv->GeometryMode);
 }
 
 void _gamma_Fogiv(GLenum pname, const GLint *params)
@@ -1378,6 +1662,16 @@
 void _gamma_FrontFace(GLenum mode)
 {
     DEBUG_GLCMDS(("FrontFace: %04x\n", (int)mode));
+
+    gCCPriv->GeometryMode &= ~GM_FFMask;
+
+    if (mode == GL_CCW)
+	gCCPriv->GeometryMode |= GM_FrontFaceCCW;
+    else
+	gCCPriv->GeometryMode |= GM_FrontFaceCW;
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+    WRITE(gCCPriv->buf, GeometryMode, gCCPriv->GeometryMode);
 }
 
 void _gamma_Frustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
@@ -1463,14 +1757,24 @@
 void _gamma_GetIntegerv(GLenum val, GLint *i)
 {
     DEBUG_GLCMDS(("GetIntegerv: %04x\n", (int)val));
+
+    switch (val) {
+    case GL_MAX_TEXTURE_SIZE:
+	*i = 2048;
+	break;
+    }
 }
 
 void _gamma_GetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
+    DEBUG_GLCMDS(("GetLightfv: %04x %04x %f\n",
+		  (int)light, (int)pname, *params));
 }
 
 void _gamma_GetLightiv(GLenum light, GLenum pname, GLint *params)
 {
+    DEBUG_GLCMDS(("GetLightiv: %04x %04x %d\n",
+		  (int)light, (int)pname, *params));
 }
 
 void _gamma_GetMapdv(GLenum target, GLenum query, GLdouble *v)
@@ -1517,7 +1821,7 @@
 const GLubyte *_gamma_GetString(GLenum name)
 {
     static unsigned char vendor[] = "Precision Insight, Inc.";
-    static unsigned char renderer[] = "DRI Glint-Gamma 20000228";
+    static unsigned char renderer[] = "DRI Glint-Gamma 20000605";
     static unsigned char version[] = "1.1";
     static unsigned char ext[] = "";
 
@@ -1654,6 +1958,12 @@
 {
     DEBUG_GLCMDS(("IsEnabled: %04x\n", (int)cap));
 
+    switch (cap) {
+    case GL_LIGHTING:
+	return ((gCCPriv->LightingMode & LightingModeEnable)?GL_TRUE:GL_FALSE);
+        break;
+    }
+
     return GL_TRUE;
 }
 
@@ -1673,10 +1983,44 @@
 
 void _gamma_LightModelf(GLenum pname, GLfloat param)
 {
+    DEBUG_GLCMDS(("LightModelf: %04x %f\n",
+		  (int)pname, param));
 }
 
 void _gamma_LightModelfv(GLenum pname, const GLfloat *params)
 {
+    DEBUG_GLCMDS(("LightModelfv: %04x %f\n",
+		  (int)pname, *params));
+
+    switch (pname) {
+    case GL_LIGHT_MODEL_AMBIENT:
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	/* We don't do alpha */
+	WRITEF(gCCPriv->buf, SceneAmbientColorBlue, params[2]);
+	WRITEF(gCCPriv->buf, SceneAmbientColorGreen, params[1]);
+	WRITEF(gCCPriv->buf, SceneAmbientColorRed, params[0]);
+	break;
+    case GL_LIGHT_MODEL_LOCAL_VIEWER:
+	if ((int)params[0] != 0)
+	    gCCPriv->LightingMode |= LightingModeLocalViewer;
+	else
+	    gCCPriv->LightingMode &= ~LightingModeLocalViewer;
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITE(gCCPriv->buf, LightingMode, gCCPriv->LightingMode);
+	break;
+    case GL_LIGHT_MODEL_TWO_SIDE:
+	if ((int)params[0] != 0) {
+	    gCCPriv->LightingMode |= LightingModeTwoSides;
+	    gCCPriv->MaterialMode |= MaterialModeTwoSides;
+	} else {
+	    gCCPriv->LightingMode &= ~LightingModeTwoSides;
+	    gCCPriv->MaterialMode &= ~MaterialModeTwoSides;
+	}
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+	WRITE(gCCPriv->buf, LightingMode, gCCPriv->LightingMode);
+	WRITE(gCCPriv->buf, MaterialMode, gCCPriv->MaterialMode);
+	break;
+    }
 }
 
 void _gamma_LightModeli(GLenum pname, GLint param)
@@ -1689,10 +2033,173 @@
 
 void _gamma_Lightf(GLenum light, GLenum pname, GLfloat param)
 {
+    DEBUG_GLCMDS(("Lightf: %04x %04x %f\n",
+		  (int)light, (int)pname, param));
 }
 
 void _gamma_Lightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
+    GLfloat l,x,y,z;
+    DEBUG_GLCMDS(("Lightfv: %04x %04x %f\n",
+		  (int)light, (int)pname, *params));
+
+    switch(light) {
+    case GL_LIGHT0:
+	switch (pname) {
+	case GL_AMBIENT:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    /* We don't do alpha */
+	    WRITEF(gCCPriv->buf, Light0AmbientIntensityBlue, params[2]);
+	    WRITEF(gCCPriv->buf, Light0AmbientIntensityGreen, params[1]);
+	    WRITEF(gCCPriv->buf, Light0AmbientIntensityRed, params[0]);
+	    break;
+	case GL_DIFFUSE:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    /* We don't do alpha */
+	    WRITEF(gCCPriv->buf, Light0DiffuseIntensityBlue, params[2]);
+	    WRITEF(gCCPriv->buf, Light0DiffuseIntensityGreen, params[1]);
+	    WRITEF(gCCPriv->buf, Light0DiffuseIntensityRed, params[0]);
+	    break;
+	case GL_SPECULAR:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    /* We don't do alpha */
+	    WRITEF(gCCPriv->buf, Light0SpecularIntensityBlue, params[2]);
+	    WRITEF(gCCPriv->buf, Light0SpecularIntensityGreen, params[1]);
+	    WRITEF(gCCPriv->buf, Light0SpecularIntensityRed, params[0]);
+	    break;
+	case GL_POSITION:
+    	    /* Normalize <x,y,z> */
+	    x = params[0]; y = params[1]; z = params[2];
+	    l = sqrt(x*x + y*y + z*z);
+	    x /= l;
+	    y /= l;
+	    z /= l;
+	    if ((int)params[3] != 0) {
+		gCCPriv->Light0Mode |= Light0ModeAttenuation;
+		gCCPriv->Light0Mode |= Light0ModeLocal;
+	    } else {
+		gCCPriv->Light0Mode &= ~Light0ModeAttenuation;
+		gCCPriv->Light0Mode &= ~Light0ModeLocal;
+	    }
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 5);
+	    WRITE(gCCPriv->buf, Light0Mode, gCCPriv->Light0Mode);
+	    WRITEF(gCCPriv->buf, Light0PositionW, params[3]);
+	    WRITEF(gCCPriv->buf, Light0PositionZ, z);
+	    WRITEF(gCCPriv->buf, Light0PositionY, y);
+	    WRITEF(gCCPriv->buf, Light0PositionX, x);
+	    break;
+	case GL_SPOT_DIRECTION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    WRITEF(gCCPriv->buf, Light0SpotlightDirectionZ, params[3]);
+	    WRITEF(gCCPriv->buf, Light0SpotlightDirectionY, params[2]);
+	    WRITEF(gCCPriv->buf, Light0SpotlightDirectionX, params[1]);
+	    /* WRITEF(gCCPriv->buf, Light0SpotlightDirectionW, params[0]); */
+	    break;
+	case GL_SPOT_EXPONENT:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, Light0SpotlightExponent, params[0]);
+	    break;
+	case GL_SPOT_CUTOFF:
+	    if ((int)params[0] != -1) 
+		gCCPriv->Light0Mode |= Light0ModeSpotLight;
+	    else
+		gCCPriv->Light0Mode &= ~Light0ModeSpotLight;
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+	    WRITE(gCCPriv->buf, Light0Mode, gCCPriv->Light0Mode);
+	    WRITEF(gCCPriv->buf, Light0CosSpotlightCutoffAngle, params[0]);
+	    break;
+	case GL_CONSTANT_ATTENUATION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, Light0ConstantAttenuation, params[0]);
+	    break;
+	case GL_LINEAR_ATTENUATION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, Light0LinearAttenuation, params[0]);
+	    break;
+	case GL_QUADRATIC_ATTENUATION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, Light0QuadraticAttenuation, params[0]);
+	    break;
+	}
+	break;
+    case GL_LIGHT1:
+	switch (pname) {
+	case GL_AMBIENT:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    /* We don't do alpha */
+	    WRITEF(gCCPriv->buf, Light1AmbientIntensityBlue, params[2]);
+	    WRITEF(gCCPriv->buf, Light1AmbientIntensityGreen, params[1]);
+	    WRITEF(gCCPriv->buf, Light1AmbientIntensityRed, params[0]);
+	    break;
+	case GL_DIFFUSE:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    /* We don't do alpha */
+	    WRITEF(gCCPriv->buf, Light1DiffuseIntensityBlue, params[2]);
+	    WRITEF(gCCPriv->buf, Light1DiffuseIntensityGreen, params[1]);
+	    WRITEF(gCCPriv->buf, Light1DiffuseIntensityRed, params[0]);
+	    break;
+	case GL_SPECULAR:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    /* We don't do alpha */
+	    WRITEF(gCCPriv->buf, Light1SpecularIntensityBlue, params[2]);
+	    WRITEF(gCCPriv->buf, Light1SpecularIntensityGreen, params[1]);
+	    WRITEF(gCCPriv->buf, Light1SpecularIntensityRed, params[0]);
+	    break;
+	case GL_POSITION:
+    	    /* Normalize <x,y,z> */
+	    x = params[0]; y = params[1]; z = params[2];
+	    l = sqrt(x*x + y*y + z*z);
+	    x /= l;
+	    y /= l;
+	    z /= l;
+	    if ((int)params[3] != 0) {
+		gCCPriv->Light1Mode |= Light1ModeAttenuation;
+		gCCPriv->Light1Mode |= Light1ModeLocal;
+	    } else {
+		gCCPriv->Light0Mode &= ~Light0ModeAttenuation;
+		gCCPriv->Light0Mode &= ~Light0ModeLocal;
+	    }
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 5);
+	    WRITE(gCCPriv->buf, Light1Mode, gCCPriv->Light1Mode);
+	    WRITEF(gCCPriv->buf, Light1PositionW, params[3]);
+	    WRITEF(gCCPriv->buf, Light1PositionZ, z);
+	    WRITEF(gCCPriv->buf, Light1PositionY, y);
+	    WRITEF(gCCPriv->buf, Light1PositionX, x);
+	    break;
+	case GL_SPOT_DIRECTION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    WRITEF(gCCPriv->buf, Light1SpotlightDirectionZ, params[3]);
+	    WRITEF(gCCPriv->buf, Light1SpotlightDirectionY, params[2]);
+	    WRITEF(gCCPriv->buf, Light1SpotlightDirectionX, params[1]);
+	    /* WRITEF(gCCPriv->buf, Light1SpotlightDirectionW, params[0]); */
+	    break;
+	case GL_SPOT_EXPONENT:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, Light1SpotlightExponent, params[0]);
+	    break;
+	case GL_SPOT_CUTOFF:
+	    if ((int)params[0] != -1) 
+		gCCPriv->Light1Mode |= Light1ModeSpotLight;
+	    else
+		gCCPriv->Light1Mode &= ~Light1ModeSpotLight;
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+	    WRITE(gCCPriv->buf, Light1Mode, gCCPriv->Light1Mode);
+	    WRITEF(gCCPriv->buf, Light1CosSpotlightCutoffAngle, params[0]);
+	    break;
+	case GL_CONSTANT_ATTENUATION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, Light1ConstantAttenuation, params[0]);
+	    break;
+	case GL_LINEAR_ATTENUATION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, Light1LinearAttenuation, params[0]);
+	    break;
+	case GL_QUADRATIC_ATTENUATION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, Light1QuadraticAttenuation, params[0]);
+	    break;
+	}
+    }
 }
 
 void _gamma_Lighti(GLenum light, GLenum pname, GLint param)
@@ -1817,29 +2324,127 @@
 {
     DEBUG_GLCMDS(("Materialfv: %04x %04x %f\n",
 		  (int)face, (int)pname, *params));
-}
-
-void _gamma_Materiali(GLenum face, GLenum pname, GLint param)
-{
-    DEBUG_GLCMDS(("Materiali: %04x %04x %d\n",
-		  (int)face, (int)pname, (int)param));
-}
 
-void _gamma_Materialiv(GLenum face, GLenum pname, const GLint *params)
-{
-    DEBUG_GLCMDS(("Materialiv: %04x %04x %d\n",
-		  (int)face, (int)pname, (int)*params));
-}
+    gCCPriv->MaterialMode |= MaterialModeEnable;
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+    WRITE(gCCPriv->buf, MaterialMode, gCCPriv->MaterialMode);
 
-void _gamma_MatrixMode(GLenum mode)
-{
-    DEBUG_GLCMDS(("MatrixMode: %04x\n", (int)mode));
+    if ((face == GL_FRONT) || (face == GL_FRONT_AND_BACK)) {
+	switch (pname) {
+	case GL_AMBIENT:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    WRITEF(gCCPriv->buf, FrontAmbientColorBlue, params[2]);
+	    WRITEF(gCCPriv->buf, FrontAmbientColorGreen, params[1]);
+	    WRITEF(gCCPriv->buf, FrontAmbientColorRed, params[0]);
+	    break;
+	case GL_DIFFUSE:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
+	    WRITEF(gCCPriv->buf, FrontAlpha, params[3]);
+	    WRITEF(gCCPriv->buf, FrontDiffuseColorBlue, params[2]);
+	    WRITEF(gCCPriv->buf, FrontDiffuseColorGreen, params[1]);
+	    WRITEF(gCCPriv->buf, FrontDiffuseColorRed, params[0]);
+	    break;
+	case GL_SPECULAR:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    WRITEF(gCCPriv->buf, FrontSpecularColorBlue, params[2]);
+	    WRITEF(gCCPriv->buf, FrontSpecularColorGreen, params[1]);
+	    WRITEF(gCCPriv->buf, FrontSpecularColorRed, params[0]);
+	    break;
+	case GL_EMISSION:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	    WRITEF(gCCPriv->buf, FrontEmissiveColorBlue, params[2]);
+	    WRITEF(gCCPriv->buf, FrontEmissiveColorGreen, params[1]);
+	    WRITEF(gCCPriv->buf, FrontEmissiveColorRed, params[0]);
+	    break;
+	case GL_SHININESS:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITEF(gCCPriv->buf, FrontSpecularExponent, params[0]);
+	    break;
+	case GL_AMBIENT_AND_DIFFUSE:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 7);
+	    WRITEF(gCCPriv->buf, FrontAmbientColorBlue, params[2]);
+	    WRITEF(gCCPriv->buf, FrontAmbientColorGreen, params[1]);
+	    WRITEF(gCCPriv->buf, FrontAmbientColorRed, params[0]);
+	    WRITEF(gCCPriv->buf, FrontAlpha, params[3]);
+	    WRITEF(gCCPriv->buf, FrontDiffuseColorBlue, params[2]);
+	    WRITEF(gCCPriv->buf, FrontDiffuseColorGreen, params[1]);
+	    WRITEF(gCCPriv->buf, FrontDiffuseColorRed, params[0]);
+	    break;
+	case GL_COLOR_INDEXES:
+	    /* NOT_DONE */
+	    break;
+	}
+    }
 
-    switch (mode) {
-    case GL_TEXTURE:
-	/* Eanble the Texture transform */
+    if ((face == GL_BACK) || (face == GL_FRONT_AND_BACK)) {
+	switch (pname) {
+	case GL_AMBIENT:
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	WRITEF(gCCPriv->buf, BackAmbientColorBlue, params[2]);
+	WRITEF(gCCPriv->buf, BackAmbientColorGreen, params[1]);
+	WRITEF(gCCPriv->buf, BackAmbientColorRed, params[0]);
+	break;
+    case GL_DIFFUSE:
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
+	WRITEF(gCCPriv->buf, BackAlpha, params[3]);
+	WRITEF(gCCPriv->buf, BackDiffuseColorBlue, params[2]);
+	WRITEF(gCCPriv->buf, BackDiffuseColorGreen, params[1]);
+	WRITEF(gCCPriv->buf, BackDiffuseColorRed, params[0]);
+	break;
+    case GL_SPECULAR:
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	WRITEF(gCCPriv->buf, BackSpecularColorBlue, params[2]);
+	WRITEF(gCCPriv->buf, BackSpecularColorGreen, params[1]);
+	WRITEF(gCCPriv->buf, BackSpecularColorRed, params[0]);
+	break;
+    case GL_EMISSION:
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+	WRITEF(gCCPriv->buf, BackEmissiveColorBlue, params[2]);
+	WRITEF(gCCPriv->buf, BackEmissiveColorGreen, params[1]);
+	WRITEF(gCCPriv->buf, BackEmissiveColorRed, params[0]);
+	break;
+    case GL_SHININESS:
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	WRITEF(gCCPriv->buf, BackSpecularExponent, params[0]);
+	break;
+    case GL_AMBIENT_AND_DIFFUSE:
+	CHECK_DMA_BUFFER(gCC, gCCPriv, 7);
+	WRITEF(gCCPriv->buf, BackAmbientColorBlue, params[2]);
+	WRITEF(gCCPriv->buf, BackAmbientColorGreen, params[1]);
+	WRITEF(gCCPriv->buf, BackAmbientColorRed, params[0]);
+	WRITEF(gCCPriv->buf, BackAlpha, params[3]);
+	WRITEF(gCCPriv->buf, BackDiffuseColorBlue, params[2]);
+	WRITEF(gCCPriv->buf, BackDiffuseColorGreen, params[1]);
+	WRITEF(gCCPriv->buf, BackDiffuseColorRed, params[0]);
+	break;
+    case GL_COLOR_INDEXES:
+	/* NOT_DONE */
+	break;
+    }
+    }
+}
+
+void _gamma_Materiali(GLenum face, GLenum pname, GLint param)
+{
+    DEBUG_GLCMDS(("Materiali: %04x %04x %d\n",
+		  (int)face, (int)pname, (int)param));
+}
+
+void _gamma_Materialiv(GLenum face, GLenum pname, const GLint *params)
+{
+    DEBUG_GLCMDS(("Materialiv: %04x %04x %d\n",
+		  (int)face, (int)pname, (int)*params));
+}
+
+void _gamma_MatrixMode(GLenum mode)
+{
+    DEBUG_GLCMDS(("MatrixMode: %04x\n", (int)mode));
+
+    switch (mode) {
+    case GL_TEXTURE:
+	/* Enable the Texture transform */
 	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
-	WRITE(gCCPriv->buf, TransformModeOr, 0x00000010);
+	WRITE(gCCPriv->buf, TransformModeOr, XM_XformTexture);
     case GL_MODELVIEW:
     case GL_PROJECTION:
         gCCPriv->MatrixMode = mode;
@@ -1878,52 +2483,87 @@
 
 void _gamma_Normal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
+    GLfloat x,y,z;
+
     DEBUG_GLCMDS(("Normal3b: %d %d %d\n", nx, ny, nz));
+
+    _gamma_Normal3f((GLfloat)nx,(GLfloat)ny,(GLfloat)nz);
 }
 
 void _gamma_Normal3bv(const GLbyte *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Normal3bv: %d %d %d\n", v[0], v[1], v[2]));
+
+    _gamma_Normal3f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2]);
 }
 
 void _gamma_Normal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
     DEBUG_GLCMDS(("Normal3d: %f %f %f\n", nx, ny, nz));
+
+    _gamma_Normal3f((GLfloat)nx,(GLfloat)ny,(GLfloat)nz);
 }
 
 void _gamma_Normal3dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("Normal3dv: %f %f %f\n", v[0], v[1], v[2]));
+
+    _gamma_Normal3f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2]);
 }
 
 void _gamma_Normal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
     DEBUG_GLCMDS(("Normal3f: %f %f %f\n", nx, ny, nz));
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
+    WRITEF(gCCPriv->buf, Nz, nz);
+    WRITEF(gCCPriv->buf, Ny, ny);
+    WRITEF(gCCPriv->buf, Nx, nx);
 }
 
 void _gamma_Normal3fv(const GLfloat *v)
 {
     DEBUG_GLCMDS(("Normal3fv: %f %f %f\n", v[0], v[1], v[2]));
+
+    _gamma_Normal3f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2]);
 }
 
 void _gamma_Normal3i(GLint nx, GLint ny, GLint nz)
 {
+    GLfloat x,y,z;
+
     DEBUG_GLCMDS(("Normal3i: %d %d %d\n", (int)nx, (int)ny, (int)nz));
+
+    _gamma_Normal3f((GLfloat)nx,(GLfloat)ny,(GLfloat)nz);
 }
 
 void _gamma_Normal3iv(const GLint *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Normal3iv: %d %d %d\n", (int)v[0], (int)v[1], (int)v[2]));
+
+    _gamma_Normal3f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2]);
 }
 
 void _gamma_Normal3s(GLshort nx, GLshort ny, GLshort nz)
 {
+    GLfloat x,y,z;
+
     DEBUG_GLCMDS(("Normal3s: %d %d %d\n", nx, ny, nz));
+
+    _gamma_Normal3f((GLfloat)nx,(GLfloat)ny,(GLfloat)nz);
 }
 
 void _gamma_Normal3sv(const GLshort *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Normal3sv: %d %d %d\n", v[0], v[1], v[2]));
+
+    _gamma_Normal3f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2]);
 }
 
 void _gamma_NormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
@@ -2020,6 +2660,56 @@
 void _gamma_PolygonMode(GLenum face, GLenum mode)
 {
     DEBUG_GLCMDS(("PolygonMode: %04x %04x\n", (int)face, (int)mode));
+
+    gCCPriv->GeometryMode &= ~GM_FB_PolyMask;
+
+    switch (mode) {
+    case GL_FILL:
+	switch (face) {
+	case GL_FRONT:
+	    gCCPriv->GeometryMode |= GM_FrontPolyFill;
+	    break;
+	case GL_BACK:
+	    gCCPriv->GeometryMode |= GM_BackPolyFill;
+	    break;
+	case GL_FRONT_AND_BACK:
+	    gCCPriv->GeometryMode |= GM_FrontPolyFill;
+	    gCCPriv->GeometryMode |= GM_BackPolyFill;
+	    break;
+	}
+	break;
+    case GL_LINE:
+	switch (face) {
+	case GL_FRONT:
+	    gCCPriv->GeometryMode |= GM_FrontPolyLine;
+	    break;
+	case GL_BACK:
+	    gCCPriv->GeometryMode |= GM_BackPolyLine;
+	    break;
+	case GL_FRONT_AND_BACK:
+	    gCCPriv->GeometryMode |= GM_FrontPolyLine;
+	    gCCPriv->GeometryMode |= GM_BackPolyLine;
+	    break;
+	}
+	break;
+    case GL_POINT:
+	switch (face) {
+	case GL_FRONT:
+	    gCCPriv->GeometryMode |= GM_FrontPolyPoint;
+	    break;
+	case GL_BACK:
+	    gCCPriv->GeometryMode |= GM_BackPolyPoint;
+	    break;
+	case GL_FRONT_AND_BACK:
+	    gCCPriv->GeometryMode |= GM_FrontPolyPoint;
+	    gCCPriv->GeometryMode |= GM_BackPolyPoint;
+	    break;
+	}
+	break;
+    }
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+    WRITE(gCCPriv->buf, GeometryMode, gCCPriv->GeometryMode);
 }
 
 void _gamma_PolygonOffset(GLfloat factor, GLfloat units)
@@ -2272,6 +2962,15 @@
 void _gamma_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
     DEBUG_GLCMDS(("Rectf: %f %f %f %f\n", x1, y1, x2, y2));
+ 
+    /* This should be done with Gamma's Rectangle engine - later */
+
+    _gamma_Begin(GL_POLYGON);
+    _gamma_Vertex2f(x1,y1);
+    _gamma_Vertex2f(x2,y1);
+    _gamma_Vertex2f(x2,y2);
+    _gamma_Vertex2f(x1,y2);
+    _gamma_End();
 }
 
 void _gamma_Rectfv(const GLfloat *v1, const GLfloat *v2)
@@ -2474,51 +3173,87 @@
 void _gamma_TexCoord1d(GLdouble s)
 {
     DEBUG_GLCMDS(("TexCoord1d: %f\n", s));
+
+    _gamma_TexCoord1f((GLfloat)s);
 }
 
 void _gamma_TexCoord1dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("TexCoord1dv: %f\n", *v));
+
+    _gamma_TexCoord1fv((GLfloat*)v);
 }
 
 void _gamma_TexCoord1f(GLfloat s)
 {
     DEBUG_GLCMDS(("TexCoord1f: %f\n", s));
+
+    WRITEF(gCCPriv->buf, Ts1, s);
 }
 
 void _gamma_TexCoord1fv(const GLfloat *v)
 {
     DEBUG_GLCMDS(("TexCoord1fv: %f\n", *v));
+
+    WRITEF(gCCPriv->buf, Ts1, v[0]);
 }
 
 void _gamma_TexCoord1i(GLint s)
 {
+    GLfloat x;
+
     DEBUG_GLCMDS(("TexCoord1i: %d\n", (int)s));
+
+    x = INT_TO_FLOAT(s);
+
+    _gamma_TexCoord1f(x);
 }
 
 void _gamma_TexCoord1iv(const GLint *v)
 {
+    GLfloat p[1];
+
     DEBUG_GLCMDS(("TexCoord1iv: %d\n", (int)*v));
+
+    p[0] = INT_TO_FLOAT(v[0]);
+
+    _gamma_TexCoord1fv(p);
 }
 
 void _gamma_TexCoord1s(GLshort s)
 {
+    GLfloat x;
+
     DEBUG_GLCMDS(("TexCoord1s: %d\n", s));
+
+    x = SHORT_TO_FLOAT(s);
+
+    _gamma_TexCoord1f(x);
 }
 
 void _gamma_TexCoord1sv(const GLshort *v)
 {
+    GLfloat p[1];
+
     DEBUG_GLCMDS(("TexCoord1sv: %d\n", *v));
+
+    p[0] = SHORT_TO_FLOAT(v[0]);
+
+    _gamma_TexCoord1fv(p);
 }
 
 void _gamma_TexCoord2d(GLdouble s, GLdouble t)
 {
     DEBUG_GLCMDS(("TexCoord2d: %f %f\n", s, t));
+
+    _gamma_TexCoord2f((GLfloat)s,(GLfloat)t);
 }
 
 void _gamma_TexCoord2dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("TexCoord2dv: %f %f\n", v[0], v[1]));
+
+    _gamma_TexCoord2fv((GLfloat*)v);
 }
 
 void _gamma_TexCoord2f(GLfloat s, GLfloat t)
@@ -2533,107 +3268,240 @@
 void _gamma_TexCoord2fv(const GLfloat *v)
 {
     DEBUG_GLCMDS(("TexCoord2fv: %f %f\n", v[0], v[1]));
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+    WRITEF(gCCPriv->buf, Tt2, v[1]);
+    WRITEF(gCCPriv->buf, Ts2, v[0]);
 }
 
 void _gamma_TexCoord2i(GLint s, GLint t)
 {
+    GLfloat x,y;
+
     DEBUG_GLCMDS(("TexCoord2i: %d %d\n", (int)s, (int)t));
+
+    x = INT_TO_FLOAT(s);
+    y = INT_TO_FLOAT(t);
+
+    _gamma_TexCoord2f(x,y);
 }
 
 void _gamma_TexCoord2iv(const GLint *v)
 {
+    GLfloat p[2];
+
     DEBUG_GLCMDS(("TexCoord2iv: %d %d\n", (int)v[0], (int)v[1]));
+
+    p[0] = INT_TO_FLOAT(v[0]);
+    p[1] = INT_TO_FLOAT(v[1]);
+
+    _gamma_TexCoord2fv(p);
 }
 
 void _gamma_TexCoord2s(GLshort s, GLshort t)
 {
+    GLfloat x,y;
+
     DEBUG_GLCMDS(("TexCoord2s: %d %d\n", s, t));
+
+    x = SHORT_TO_FLOAT(s);
+    y = SHORT_TO_FLOAT(t);
+
+    _gamma_TexCoord2f(x,y);
 }
 
 void _gamma_TexCoord2sv(const GLshort *v)
 {
+    GLfloat p[2];
+
     DEBUG_GLCMDS(("TexCoord2sv: %d %d\n", v[0], v[1]));
+
+    p[0] = SHORT_TO_FLOAT(v[0]);
+    p[1] = SHORT_TO_FLOAT(v[1]);
+
+    _gamma_TexCoord2fv(p);
 }
 
 void _gamma_TexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
     DEBUG_GLCMDS(("TexCoord3d: %f %f %f\n", s, t, r));
+
+    _gamma_TexCoord3f((GLfloat)s,(GLfloat)t,(GLfloat)r);
 }
 
 void _gamma_TexCoord3dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("TexCoord3dv: %f %f %f\n", v[0], v[1], v[2]));
+
+    _gamma_TexCoord3fv((GLfloat*)v);
 }
 
 void _gamma_TexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
     DEBUG_GLCMDS(("TexCoord3f: %f %f %f\n", s, t, r));
+
+    _gamma_TexCoord4f(s,t,r,1.0f);
 }
 
 void _gamma_TexCoord3fv(const GLfloat *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("TexCoord3fv: %f %f %f\n", v[0], v[1], v[2]));
+
+    p[0] = v[0];
+    p[1] = v[1];
+    p[2] = v[2];
+    p[3] = 1.0f;
+
+    _gamma_TexCoord4fv(p);
 }
 
 void _gamma_TexCoord3i(GLint s, GLint t, GLint r)
 {
+    GLfloat x,y,z;
+
     DEBUG_GLCMDS(("TexCoord3i: %d %d %d\n", (int)s, (int)t, (int)r));
+
+    x = INT_TO_FLOAT(s);
+    y = INT_TO_FLOAT(t);
+    z = INT_TO_FLOAT(r);
+
+    _gamma_TexCoord4f(x,y,z,1.0f);
 }
 
 void _gamma_TexCoord3iv(const GLint *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("TexCoord3iv: %d %d %d\n", (int)v[0], (int)v[1], (int)v[2]));
+
+    p[0] = INT_TO_FLOAT(v[0]);
+    p[1] = INT_TO_FLOAT(v[1]);
+    p[2] = INT_TO_FLOAT(v[2]);
+    p[3] = 1.0f;
+
+    _gamma_TexCoord4fv(p);
 }
 
 void _gamma_TexCoord3s(GLshort s, GLshort t, GLshort r)
 {
+    GLfloat x,y,z;
+
     DEBUG_GLCMDS(("TexCoord3s: %d %d %d\n", s, t, r));
+  
+    x = SHORT_TO_FLOAT(s);
+    y = SHORT_TO_FLOAT(t);
+    z = SHORT_TO_FLOAT(r);
+
+    _gamma_TexCoord4f(x,y,z,1.0f);
 }
 
 void _gamma_TexCoord3sv(const GLshort *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("TexCoord3sv: %d %d %d\n", v[0], v[1], v[2]));
+
+    p[0] = SHORT_TO_FLOAT(v[0]);
+    p[1] = SHORT_TO_FLOAT(v[1]);
+    p[2] = SHORT_TO_FLOAT(v[2]);
+    p[3] = 1.0f;
+
+    _gamma_TexCoord4fv(p);
 }
 
 void _gamma_TexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
     DEBUG_GLCMDS(("TexCoord4d: %f %f %f %f\n", s, t, r, q));
+
+    _gamma_TexCoord4f((GLfloat)s,(GLfloat)t,(GLfloat)r,(GLfloat)q);
 }
 
 void _gamma_TexCoord4dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("TexCoord4dv: %f %f %f %f\n", v[0], v[1], v[2], v[3]));
+
+    _gamma_TexCoord4fv((GLfloat*)v);
 }
 
 void _gamma_TexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
     DEBUG_GLCMDS(("TexCoord4f: %f %f %f %f\n", s, t, r, q));
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
+    WRITEF(gCCPriv->buf, Tq4, q);
+    WRITEF(gCCPriv->buf, Tr4, r);
+    WRITEF(gCCPriv->buf, Tt4, t);
+    WRITEF(gCCPriv->buf, Ts4, s);
 }
 
 void _gamma_TexCoord4fv(const GLfloat *v)
 {
     DEBUG_GLCMDS(("TexCoord4fv: %f %f %f %f\n", v[0], v[1], v[2], v[3]));
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
+    WRITEF(gCCPriv->buf, Tq4, v[3]);
+    WRITEF(gCCPriv->buf, Tr4, v[2]);
+    WRITEF(gCCPriv->buf, Tt4, v[1]);
+    WRITEF(gCCPriv->buf, Ts4, v[0]);
 }
 
 void _gamma_TexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
+    GLfloat x,y,z,a;
+
     DEBUG_GLCMDS(("TexCoord4i: %d %d %d %d\n", (int)s, (int)t, (int)r, (int)q));
+
+    x = INT_TO_FLOAT(s);
+    y = INT_TO_FLOAT(t);
+    z = INT_TO_FLOAT(r);
+    a = INT_TO_FLOAT(q);
+
+    _gamma_TexCoord4f(x,y,z,a);
 }
 
 void _gamma_TexCoord4iv(const GLint *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("TexCoord4iv: %d %d %d %d\n",
 		  (int)v[0], (int)v[1], (int)v[2], (int)v[3]));
+
+    p[0] = INT_TO_FLOAT(v[0]);
+    p[1] = INT_TO_FLOAT(v[1]);
+    p[2] = INT_TO_FLOAT(v[2]);
+    p[3] = INT_TO_FLOAT(v[3]);
+
+    _gamma_TexCoord4fv(p);
 }
 
 void _gamma_TexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
+    GLfloat x,y,z,a;
+
     DEBUG_GLCMDS(("TexCoord4s: %d %d %d %d\n", s, t, r, q));
+
+    x = SHORT_TO_FLOAT(s);
+    y = SHORT_TO_FLOAT(t);
+    z = SHORT_TO_FLOAT(r);
+    a = SHORT_TO_FLOAT(q);
+
+    _gamma_TexCoord4f(s,t,r,q);
 }
 
 void _gamma_TexCoord4sv(const GLshort *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("TexCoord4sv: %d %d %d %d\n", v[0], v[1], v[2], v[3]));
+
+    p[0] = SHORT_TO_FLOAT(v[0]);
+    p[1] = SHORT_TO_FLOAT(v[1]);
+    p[2] = SHORT_TO_FLOAT(v[2]);
+    p[3] = SHORT_TO_FLOAT(v[3]);
+
+    _gamma_TexCoord4fv(p);
 }
 
 void _gamma_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
@@ -2678,6 +3546,33 @@
 {
     DEBUG_GLCMDS(("TexEnvfv: %04x %04x %f\n",
 		  (int)target, (int)pname, *params));
+
+    if (target != GL_TEXTURE_ENV) {
+	/* ERROR !! */
+    }
+
+    switch (pname) {
+    case GL_TEXTURE_ENV_MODE:
+	gCCPriv->curTexObj->TextureColorMode &= ~TCM_ApplicationMask;
+	switch ((int)params[0]) {
+	case GL_MODULATE:
+	    gCCPriv->curTexObj->TextureColorMode |= TCM_Modulate;
+	    break;
+	case GL_DECAL:
+	    gCCPriv->curTexObj->TextureColorMode |= TCM_Decal;
+	    break;
+	case GL_BLEND:
+	    gCCPriv->curTexObj->TextureColorMode |= TCM_Blend;
+	    break;
+	case GL_REPLACE:
+	    gCCPriv->curTexObj->TextureColorMode |= TCM_Replace;
+	    break;
+	}
+    }
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+    WRITE(gCCPriv->buf, TextureColorMode,
+	  gCCPriv->curTexObj->TextureColorMode);
 }
 
 void _gamma_TexEnvi(GLenum target, GLenum pname, GLint param)
@@ -2745,10 +3640,12 @@
 
     if (target == GL_TEXTURE_1D) {
 	/* NOT_DONE */
+	DEBUG_ERROR(("TexImage2D: 1D requested - ERROR\n"));
     } else if (target == GL_TEXTURE_2D) {
 	/* NOT_DONE: The follow are not currently supported... */
-	if (border != 0 || format != GL_RGBA || type != GL_UNSIGNED_BYTE ||
+	if (border != 0 /* || format != GL_RGBA */ || type != GL_UNSIGNED_BYTE ||
 	    (components != 3 && components != 4)) {
+	    DEBUG_ERROR(("TexImage2D: 2D op not supported - ERROR\n"));
 	    return;
 	}
 
@@ -2790,7 +3687,11 @@
 		break;
 	    }
 
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
 	    t->TextureFormat = (TF_LittleEndian |
+#else
+	    t->TextureFormat = (TF_BigEndian |
+#endif
 				TF_ColorOrder_BGR |
 				TF_Compnents_4 |
 				TF_OutputFmt_Texel);
@@ -2804,14 +3705,17 @@
 	t->image[level] = driTMMInsertImage(gCCPriv->tmm,
 					    width, height, 1<<l2d,
 					    image, NULL);
+
 	if (!t->image[level]) {
 	    /* NOT_DONE: Handle error */
+	    DEBUG_ERROR(("TexImage2D: unable1\n"));
 	}
 
 	/* Make the new image resident (and all of the other mipmaps) */
-	if (!driTMMMakeImagesResident(gCCPriv->tmm, MIPMAP_LEVELS,
-				      t->image, addrs)) {
+	if (driTMMMakeImagesResident(gCCPriv->tmm, MIPMAP_LEVELS,
+				      t->image, addrs) < 0) {
 	    /* NOT_DONE: Handle error */
+	    DEBUG_ERROR(("TexImage2D: unable2\n"));
 	}
 
 	for (i = 0; i < MIPMAP_LEVELS; i++)
@@ -3010,6 +3914,123 @@
 {
     DEBUG_GLCMDS(("TexParameterfv: %04x %04x %f\n",
 		  (int)target, (int)pname, *params));
+
+    if (target == GL_TEXTURE_1D) {
+	/* NOT_DONE */
+    } else if (target == GL_TEXTURE_2D) {
+	switch (pname) {
+	case GL_TEXTURE_MAG_FILTER:
+	    gCCPriv->curTexObj2D->TextureReadMode &= ~TRM_Mag_Mask;
+	    switch ((int)params[0]) {
+	    case GL_NEAREST:
+		gCCPriv->curTexObj2D->TextureReadMode |=
+		    TRM_Mag_Nearest;
+		break;
+	    case GL_LINEAR:
+		gCCPriv->curTexObj2D->TextureReadMode |=
+		    TRM_Mag_Linear;
+		break;
+	    default:
+		break;
+	    }
+
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
+	    WRITE(gCCPriv->buf, TextureReadMode,
+		  gCCPriv->curTexObj2D->TextureReadMode);
+	    break;
+	case GL_TEXTURE_MIN_FILTER:
+	    gCCPriv->curTexObj2D->TextureReadMode    &= ~TRM_Min_Mask;
+	    gCCPriv->curTexObj2D->TextureReadMode    |= TRM_MipMapEnable;
+	    gCCPriv->curTexObj2D->TextureAddressMode |= TAM_LODEnable;
+	    switch ((int)params[0]) {
+	    case GL_NEAREST:
+		gCCPriv->curTexObj2D->TextureReadMode |=
+		    TRM_Min_Nearest;
+		gCCPriv->curTexObj2D->TextureReadMode    &= ~TRM_MipMapEnable;
+		gCCPriv->curTexObj2D->TextureAddressMode &= ~TAM_LODEnable;
+		break;
+	    case GL_LINEAR:
+		gCCPriv->curTexObj2D->TextureReadMode |=
+		    TRM_Min_Linear;
+		gCCPriv->curTexObj2D->TextureReadMode    &= ~TRM_MipMapEnable;
+		gCCPriv->curTexObj2D->TextureAddressMode &= ~TAM_LODEnable;
+		break;
+	    case GL_NEAREST_MIPMAP_NEAREST:
+		gCCPriv->curTexObj2D->TextureReadMode |=
+		    TRM_Min_NearestMMNearest;
+		break;
+	    case GL_LINEAR_MIPMAP_NEAREST:
+		gCCPriv->curTexObj2D->TextureReadMode |=
+		    TRM_Min_NearestMMLinear;
+		break;
+	    case GL_NEAREST_MIPMAP_LINEAR:
+		gCCPriv->curTexObj2D->TextureReadMode |=
+		    TRM_Min_LinearMMNearest;
+		break;
+	    case GL_LINEAR_MIPMAP_LINEAR:
+		gCCPriv->curTexObj2D->TextureReadMode |=
+		    TRM_Min_LinearMMLinear;
+		break;
+	    default:
+		break;
+	    }
+
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+	    WRITE(gCCPriv->buf, TextureReadMode,
+		  gCCPriv->curTexObj2D->TextureReadMode);
+	    WRITE(gCCPriv->buf, TextureAddressMode,
+		  gCCPriv->curTexObj2D->TextureAddressMode);
+	    break;
+	case GL_TEXTURE_WRAP_S:
+	    gCCPriv->curTexObj2D->TextureAddressMode &= ~TAM_SWrap_Mask;
+	    gCCPriv->curTexObj2D->TextureReadMode    &= ~TRM_UWrap_Mask;
+	    switch ((int)params[0]) {
+	    case GL_CLAMP:
+		gCCPriv->curTexObj2D->TextureAddressMode |= TAM_SWrap_Clamp;
+		gCCPriv->curTexObj2D->TextureReadMode    |= TRM_UWrap_Clamp;
+		break;
+	    case GL_REPEAT:
+		gCCPriv->curTexObj2D->TextureAddressMode |= TAM_SWrap_Repeat;
+		gCCPriv->curTexObj2D->TextureReadMode    |= TRM_UWrap_Repeat;
+		break;
+	    default:
+		break;
+	    }
+
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+	    WRITE(gCCPriv->buf, TextureReadMode,
+		  gCCPriv->curTexObj2D->TextureReadMode);
+	    WRITE(gCCPriv->buf, TextureAddressMode,
+		  gCCPriv->curTexObj2D->TextureAddressMode);
+	    break;
+	case GL_TEXTURE_WRAP_T:
+	    gCCPriv->curTexObj2D->TextureAddressMode &= ~TAM_TWrap_Mask;
+	    gCCPriv->curTexObj2D->TextureReadMode    &= ~TRM_VWrap_Mask;
+	    switch ((int)params[0]) {
+	    case GL_CLAMP:
+		gCCPriv->curTexObj2D->TextureAddressMode |= TAM_TWrap_Clamp;
+		gCCPriv->curTexObj2D->TextureReadMode    |= TRM_VWrap_Clamp;
+		break;
+	    case GL_REPEAT:
+		gCCPriv->curTexObj2D->TextureAddressMode |= TAM_TWrap_Repeat;
+		gCCPriv->curTexObj2D->TextureReadMode    |= TRM_VWrap_Repeat;
+		break;
+	    default:
+		break;
+	    }
+
+	    CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
+	    WRITE(gCCPriv->buf, TextureReadMode,
+		  gCCPriv->curTexObj2D->TextureReadMode);
+	    WRITE(gCCPriv->buf, TextureAddressMode,
+		  gCCPriv->curTexObj2D->TextureAddressMode);
+	    break;
+	default:
+	    break;
+	}
+    } else {
+	/* ERROR !! */
+    }
 }
 
 void _gamma_TexParameteri(GLenum target, GLenum pname, GLint param)
@@ -3054,8 +4075,8 @@
 	** format for the image that it is replacing.
 	*/
 
-	if (!driTMMSubImage(gCCPriv->tmm, gCCPriv->curTexObj2D->image[level],
-			    xoffset, yoffset, width, height, image)) {
+	if (driTMMSubImage(gCCPriv->tmm, gCCPriv->curTexObj2D->image[level],
+			    xoffset, yoffset, width, height, image) < 0) {
 	    /* NOT_DONE: Handle error */
 	}
     } else {
@@ -3089,7 +4110,7 @@
     GLfloat m[16];
     int i;
 
-    DEBUG_GLCMDS(("Tranlatef: %f %f %f\n", x, y, z));
+    DEBUG_GLCMDS(("Translatef: %f %f %f\n", x, y, z));
 
     for (i = 0; i < 16; i++)
 	if (i % 5 == 0)
@@ -3108,26 +4129,21 @@
 void _gamma_Vertex2d(GLdouble x, GLdouble y)
 {
     DEBUG_GLCMDS(("Vertex2d: %f %f\n", x, y));
+
+    _gamma_Vertex2f((GLfloat)x,(GLfloat)y);
 }
 
 void _gamma_Vertex2dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("Vertex2dv: %f %f\n", v[0], v[1]));
+
+    _gamma_Vertex2f((GLfloat)v[0],(GLfloat)v[1]);
 }
 
 void _gamma_Vertex2f(GLfloat x, GLfloat y)
 {
     DEBUG_GLCMDS(("Vertex2f: %f %f\n", x, y));
 
-#ifdef RANDOMIZE_COLORS
-    {
-	GLuint c;
-	c = (random() / (double)RAND_MAX) * 16777216;
-	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
-	WRITE(gCCPriv->buf, PackedColor4,  c);
-    }
-#endif
-
     CHECK_DMA_BUFFER(gCC, gCCPriv, 2);
     WRITEF(gCCPriv->buf, Vy,  y);
     WRITEF(gCCPriv->buf, Vx2, x);
@@ -3136,51 +4152,64 @@
 void _gamma_Vertex2fv(const GLfloat *v)
 {
     DEBUG_GLCMDS(("Vertex2fv: %f %f\n", v[0], v[1]));
+
+    _gamma_Vertex2f(v[0],v[1]);
 }
 
 void _gamma_Vertex2i(GLint x, GLint y)
 {
+    GLfloat a,b;
+
     DEBUG_GLCMDS(("Vertex2i: %d %d\n", (int)x, (int)y));
+
+    _gamma_Vertex2f((GLfloat)x,(GLfloat)y);
 }
 
 void _gamma_Vertex2iv(const GLint *v)
 {
+    GLfloat p[2];
+
     DEBUG_GLCMDS(("Vertex2iv: %d %d\n", (int)v[0], (int)v[1]));
+
+    _gamma_Vertex2f((GLfloat)v[0],(GLfloat)v[1]);
 }
 
 void _gamma_Vertex2s(GLshort x, GLshort y)
 {
+    GLfloat a,b;
+
     DEBUG_GLCMDS(("Vertex2s: %d %d\n", x, y));
+
+    _gamma_Vertex2f((GLfloat)x,(GLfloat)y);
 }
 
 void _gamma_Vertex2sv(const GLshort *v)
 {
+    GLfloat p[2];
+
     DEBUG_GLCMDS(("Vertex2sv: %d %d\n", v[0], v[1]));
+
+    _gamma_Vertex2f((GLfloat)v[0],(GLfloat)v[1]);
 }
 
 void _gamma_Vertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
     DEBUG_GLCMDS(("Vertex3d: %f %f %f\n", x, y, z));
+
+    _gamma_Vertex3f((GLfloat)x,(GLfloat)y,(GLfloat)z);
 }
 
 void _gamma_Vertex3dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("Vertex2fv: %f %f %f\n", v[0], v[1], v[2]));
+
+    _gamma_Vertex3f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2]);
 }
 
 void _gamma_Vertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
     DEBUG_GLCMDS(("Vertex3f: %f %f %f\n", x, y, z));
 
-#ifdef RANDOMIZE_COLORS
-    {
-	GLuint c;
-	c = (random() / (double)RAND_MAX) * 16777216;
-	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
-	WRITE(gCCPriv->buf, PackedColor4,  c);
-    }
-#endif
-
     CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
     WRITEF(gCCPriv->buf, Vz,  z);
     WRITEF(gCCPriv->buf, Vy,  y);
@@ -3191,80 +4220,112 @@
 {
     DEBUG_GLCMDS(("Vertex3fv: %f %f %f\n", v[0], v[1], v[2]));
 
-#ifdef RANDOMIZE_COLORS
-    {
-	GLuint c;
-	c = (random() / (double)RAND_MAX) * 16777216;
-	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
-	WRITE(gCCPriv->buf, PackedColor4,  c);
-    }
-#endif
-
-    CHECK_DMA_BUFFER(gCC, gCCPriv, 3);
-    WRITEF(gCCPriv->buf, Vz,  v[2]);
-    WRITEF(gCCPriv->buf, Vy,  v[1]);
-    WRITEF(gCCPriv->buf, Vx3, v[0]);
+    _gamma_Vertex3f(v[0],v[1],v[2]);
 }
 
 void _gamma_Vertex3i(GLint x, GLint y, GLint z)
 {
+    GLfloat a,b,c;
+
     DEBUG_GLCMDS(("Vertex3i: %d %d %d\n", (int)x, (int)y, (int)z));
+
+    _gamma_Vertex3f((GLfloat)x,(GLfloat)y,(GLfloat)z);
 }
 
 void _gamma_Vertex3iv(const GLint *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Vertex3iv: %d %d %d\n", (int)v[0], (int)v[1], (int)v[2]));
+
+    _gamma_Vertex3f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2]);
 }
 
 void _gamma_Vertex3s(GLshort x, GLshort y, GLshort z)
 {
+    GLfloat a,b,c;
+
     DEBUG_GLCMDS(("Vertex3s: %d %d %d\n", x, y, z));
+
+    _gamma_Vertex3f((GLfloat)x,(GLfloat)y,(GLfloat)z);
 }
 
 void _gamma_Vertex3sv(const GLshort *v)
 {
+    GLfloat p[3];
+
     DEBUG_GLCMDS(("Vertex3sv: %d %d %d\n", v[0], v[1], v[2]));
+
+    _gamma_Vertex3f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2]);
 }
 
 void _gamma_Vertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
     DEBUG_GLCMDS(("Vertex4d: %f %f %f %f\n", x, y, z, w));
+
+    _gamma_Vertex4f((GLfloat)x,(GLfloat)y,(GLfloat)z,(GLfloat)w);
 }
 
 void _gamma_Vertex4dv(const GLdouble *v)
 {
     DEBUG_GLCMDS(("Vertex4dv: %f %f %f %f\n", v[0], v[1], v[2], v[3]));
+
+    _gamma_Vertex4f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2],(GLfloat)v[3]);
 }
 
 void _gamma_Vertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
     DEBUG_GLCMDS(("Vertex4f: %f %f %f %f\n", x, y, z, w));
+
+    CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
+    WRITEF(gCCPriv->buf, Vw,  w);
+    WRITEF(gCCPriv->buf, Vz,  z);
+    WRITEF(gCCPriv->buf, Vy,  y);
+    WRITEF(gCCPriv->buf, Vx4, x);
 }
 
 void _gamma_Vertex4fv(const GLfloat *v)
 {
     DEBUG_GLCMDS(("Vertex4fv: %f %f %f %f\n", v[0], v[1], v[2], v[3]));
+
+    _gamma_Vertex4f(v[0],v[1],v[2],v[3]);
 }
 
 void _gamma_Vertex4i(GLint x, GLint y, GLint z, GLint w)
 {
+    GLfloat a,b,c,d;
+
     DEBUG_GLCMDS(("Vertex4i: %d %d %d %d\n", (int)x, (int)y, (int)z, (int)w));
+
+    _gamma_Vertex4f((GLfloat)x,(GLfloat)y,(GLfloat)z,(GLfloat)w);
 }
 
 void _gamma_Vertex4iv(const GLint *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("Vertex4iv: %d %d %d %d\n",
 		  (int)v[0], (int)v[1], (int)v[2], (int)v[3]));
+
+    _gamma_Vertex4f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2],(GLfloat)v[3]);
 }
 
 void _gamma_Vertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
+    GLfloat a,b,c,d;
+
     DEBUG_GLCMDS(("Vertex4s: %d %d %d %d\n", x, y, z, w));
+
+    _gamma_Vertex4f((GLfloat)x,(GLfloat)y,(GLfloat)z,(GLfloat)w);
 }
 
 void _gamma_Vertex4sv(const GLshort *v)
 {
+    GLfloat p[4];
+
     DEBUG_GLCMDS(("Vertex4sv: %d %d %d %d\n", v[0], v[1], v[2], v[3]));
+
+    _gamma_Vertex4f((GLfloat)v[0],(GLfloat)v[1],(GLfloat)v[2],(GLfloat)v[3]);
 }
 
 void _gamma_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
@@ -3280,10 +4341,10 @@
     DEBUG_GLCMDS(("Viewport: %d %d %d %d\n",
 		  (int)x, (int)y, (int)width, (int)height));
 
-    gCCPriv->x = gCC->driContextPriv->driDrawablePriv->x + x;
-    gCCPriv->y = gCC->driContextPriv->driScreenPriv->fbHeight -
-	(gCC->driContextPriv->driDrawablePriv->y +
-	 gCC->driContextPriv->driDrawablePriv->h) + y;
+    gCCPriv->x = gCC->driDrawablePriv->x + x;
+    gCCPriv->y = gCC->driScreenPriv->fbHeight -
+	(gCC->driDrawablePriv->y +
+	 gCC->driDrawablePriv->h) + y;
     gCCPriv->w = width;
     gCCPriv->h = height;
 
@@ -3296,16 +4357,21 @@
     oy = y + sy;
 
     CHECK_DMA_BUFFER(gCC, gCCPriv, 4);
-    WRITEF(gCCPriv->buf, ViewPortOffsetX, ox);
-    WRITEF(gCCPriv->buf, ViewPortOffsetY, oy);
     WRITEF(gCCPriv->buf, ViewPortScaleX,  sx);
     WRITEF(gCCPriv->buf, ViewPortScaleY,  sy);
+    WRITEF(gCCPriv->buf, ViewPortOffsetX, ox);
+    WRITEF(gCCPriv->buf, ViewPortOffsetY, oy);
+#if 1 /* Err - this shouldn't be needed, but something isn't flushing */
+    FLUSH_DMA_BUFFER(gCC,gCCPriv);
+#endif
 }
 
 
 static GLint
 generic_noop(void)
 {
+   DEBUG_GLCMDS(("OOPS GENERIC NOOP CALLED\n"));
+
    return 0;
 }
 
Index: xc/lib/GL/mesa/src/drv/gamma/gamma_init.h
diff -u xc/lib/GL/mesa/src/drv/gamma/gamma_init.h:1.2 xc/lib/GL/mesa/src/drv/gamma/gamma_init.h:1.3
--- xc/lib/GL/mesa/src/drv/gamma/gamma_init.h:1.2	Tue Feb 22 20:46:43 2000
+++ xc/lib/GL/mesa/src/drv/gamma/gamma_init.h	Fri Jun 16 17:02:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_init.h,v 1.2 2000/02/23 04:46:43 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_init.h,v 1.3 2000/06/17 00:02:56 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -43,7 +43,6 @@
 #include "gamma_regs.h"
 #include "gamma_macros.h"
 #include "gamma_texture.h"
-#include "xmesaP.h"
 
 typedef struct {
     int           regionCount;       /* Count of register regions */
@@ -109,6 +108,12 @@
     int                 AB_FBReadMode;
     int                 AB_FBReadMode_Save;
     int                 DeltaMode;
+    int			ColorMaterialMode;
+    int			MaterialMode;
+    int			LightingMode;
+    int			Light0Mode;
+    int			Light1Mode;
+    int			ScissorMode;
     int                 Window; /* GID part probably should be in draw priv */
 
     gammaTexObj        *curTexObj;
@@ -140,8 +145,8 @@
 extern void       gammaInitHW(gammaContextPrivate *gcp);
 
 extern float                IdentityMatrix[16];
-extern XMesaContext         nullCC;
-extern XMesaContext         gCC;
+extern __DRIcontextPrivate *nullCC;
+extern __DRIcontextPrivate *gCC;
 extern gammaContextPrivate *gCCPriv;
 
 #endif
Index: xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c
diff -u xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c:1.3 xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c:1.5
--- xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c:1.3	Tue Feb 22 20:46:44 2000
+++ xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c	Fri Jun 16 17:02:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c,v 1.3 2000/02/23 04:46:44 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c,v 1.5 2000/06/17 00:02:56 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,28 +29,33 @@
 /*
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Alan Hourihane <Alan.Hourihane@btinternet.com>
  *
  */
 
 #ifdef GLX_DIRECT_RENDERING
 
 #include "gamma_init.h"
+#include "glint_dri.h"
 
 void gammaInitHW(gammaContextPrivate *gcp)
 {
     __DRIscreenPrivate *driScrnPriv = gcp->gammaScrnPriv->driScrnPriv;
+    GLINTDRIPtr         gDRIPriv = (GLINTDRIPtr)driScrnPriv->pDevPriv;
 
-    /* Set up each MX's ScanLineOwnership for OpenGL */
-    CHECK_DMA_BUFFER(nullCC, gcp, 4);
-    WRITE(gcp->buf, BroadcastMask, 1);
-    WRITE(gcp->buf, ScanLineOwnership, 5); /* Use bottom left as [0,0] */
-    WRITE(gcp->buf, BroadcastMask, 2);
-    WRITE(gcp->buf, ScanLineOwnership, 1); /* Use bottom left as [0,0] */
+    if (gDRIPriv->numMXDevices == 2) {
+	/* Set up each MX's ScanLineOwnership for OpenGL */
+	CHECK_DMA_BUFFER(nullCC, gcp, 4);
+	WRITE(gcp->buf, BroadcastMask, 1);
+	WRITE(gcp->buf, ScanLineOwnership, 5); /* Use bottom left as [0,0] */
+	WRITE(gcp->buf, BroadcastMask, 2);
+	WRITE(gcp->buf, ScanLineOwnership, 1); /* Use bottom left as [0,0] */
+
+	/* Broadcast to both MX's */
+	CHECK_DMA_BUFFER(nullCC, gcp, 1);
+	WRITE(gcp->buf, BroadcastMask, 3);
+    }
 
-    /* Broadcast to both MX's */
-    CHECK_DMA_BUFFER(nullCC, gcp, 1);
-    WRITE(gcp->buf, BroadcastMask, 3);
-
     /* Set MXs to known state */
     CHECK_DMA_BUFFER(nullCC, gcp, 27);
     WRITE(gcp->buf, RasterizerMode, 0);
@@ -82,6 +87,7 @@
     WRITE(gcp->buf, PixelSize, 0);
 
     /* Set Gamma to known state */
+    CHECK_DMA_BUFFER(nullCC, gcp, 10);
     WRITE(gcp->buf, TriangleMode, 0);
     WRITE(gcp->buf, GeometryMode, 0);
     WRITE(gcp->buf, NormalizeMode, 0);
@@ -136,7 +142,10 @@
     WRITE(gcp->buf, AlphaTestMode, gcp->AlphaTestMode);
     WRITE(gcp->buf, AlphaBlendMode, gcp->AlphaBlendMode);
     WRITE(gcp->buf, DitherMode, DitherModeEnable | DM_ColorOrder_RGB);
-    WRITE(gcp->buf, RasterizerMode, RM_MultiGLINT | RM_BiasCoordNearHalf);
+    if (gDRIPriv->numMXDevices == 2)
+    	WRITE(gcp->buf, RasterizerMode, RM_MultiGLINT | RM_BiasCoordNearHalf);
+    else
+    	WRITE(gcp->buf, RasterizerMode, RM_BiasCoordNearHalf);
     WRITE(gcp->buf, GLINTWindow, gcp->Window);
     WRITE(gcp->buf, FastClearDepth, 0xffffffff);
     WRITE(gcp->buf, GLINTDepth, 0xffffffff);
@@ -242,7 +251,7 @@
     CHECK_DMA_BUFFER(nullCC, gcp, 5);
     WRITE(gcp->buf, GeometryMode, gcp->GeometryMode);
     WRITE(gcp->buf, NormalizeMode, NormalizeModeDisable);
-    WRITE(gcp->buf, LightingMode, LightingModeDisable);
+    WRITE(gcp->buf, LightingMode, gcp->LightingMode);
     WRITE(gcp->buf, ColorMaterialMode, ColorMaterialModeDisable);
     WRITE(gcp->buf, MaterialMode, MaterialModeDisable);
 
@@ -251,18 +260,18 @@
     WRITE(gcp->buf, BackSpecularExponent,  0); /* fixed point */
 
     CHECK_DMA_BUFFER(nullCC, gcp, 29);
-    WRITEF(gcp->buf, FrontAmbientColorRed,    0.0);
-    WRITEF(gcp->buf, FrontAmbientColorGreen,  0.0);
-    WRITEF(gcp->buf, FrontAmbientColorBlue,   0.0);
-    WRITEF(gcp->buf, BackAmbientColorRed,     0.0);
-    WRITEF(gcp->buf, BackAmbientColorGreen,   0.0);
-    WRITEF(gcp->buf, BackAmbientColorBlue,    0.0);
-    WRITEF(gcp->buf, FrontDiffuseColorRed,    0.0);
-    WRITEF(gcp->buf, FrontDiffuseColorGreen,  0.0);
-    WRITEF(gcp->buf, FrontDiffuseColorBlue,   0.0);
-    WRITEF(gcp->buf, BackDiffuseColorRed,     0.0);
-    WRITEF(gcp->buf, BackDiffuseColorGreen,   0.0);
-    WRITEF(gcp->buf, BackDiffuseColorBlue,    0.0);
+    WRITEF(gcp->buf, FrontAmbientColorRed,    0.2);
+    WRITEF(gcp->buf, FrontAmbientColorGreen,  0.2);
+    WRITEF(gcp->buf, FrontAmbientColorBlue,   0.2);
+    WRITEF(gcp->buf, BackAmbientColorRed,     0.2);
+    WRITEF(gcp->buf, BackAmbientColorGreen,   0.2);
+    WRITEF(gcp->buf, BackAmbientColorBlue,    0.2);
+    WRITEF(gcp->buf, FrontDiffuseColorRed,    0.8);
+    WRITEF(gcp->buf, FrontDiffuseColorGreen,  0.8);
+    WRITEF(gcp->buf, FrontDiffuseColorBlue,   0.8);
+    WRITEF(gcp->buf, BackDiffuseColorRed,     0.8);
+    WRITEF(gcp->buf, BackDiffuseColorGreen,   0.8);
+    WRITEF(gcp->buf, BackDiffuseColorBlue,    0.8);
     WRITEF(gcp->buf, FrontSpecularColorRed,   0.0);
     WRITEF(gcp->buf, FrontSpecularColorGreen, 0.0);
     WRITEF(gcp->buf, FrontSpecularColorBlue,  0.0);
@@ -275,11 +284,11 @@
     WRITEF(gcp->buf, BackEmissiveColorRed,    0.0);
     WRITEF(gcp->buf, BackEmissiveColorGreen,  0.0);
     WRITEF(gcp->buf, BackEmissiveColorBlue,   0.0);
-    WRITEF(gcp->buf, SceneAmbientColorRed,    0.0);
-    WRITEF(gcp->buf, SceneAmbientColorGreen,  0.0);
-    WRITEF(gcp->buf, SceneAmbientColorBlue,   0.0);
-    WRITEF(gcp->buf, FrontAlpha,              0.0);
-    WRITEF(gcp->buf, BackAlpha,               0.0);
+    WRITEF(gcp->buf, SceneAmbientColorRed,    0.2);
+    WRITEF(gcp->buf, SceneAmbientColorGreen,  0.2);
+    WRITEF(gcp->buf, SceneAmbientColorBlue,   0.2);
+    WRITEF(gcp->buf, FrontAlpha,              1.0);
+    WRITEF(gcp->buf, BackAlpha,               1.0);
 
     CHECK_DMA_BUFFER(nullCC, gcp, 8);
     WRITE(gcp->buf, PointMode, (PM_AntialiasDisable |
@@ -319,28 +328,28 @@
     WRITE(gcp->buf, Light14Mode, LNM_Off);
     WRITE(gcp->buf, Light15Mode, LNM_Off);
 
-    CHECK_DMA_BUFFER(nullCC, gcp, 21);
-    WRITEF(gcp->buf, FrontAmbientColorRed,    1.0);
-    WRITEF(gcp->buf, FrontAmbientColorGreen,  1.0);
-    WRITEF(gcp->buf, FrontAmbientColorBlue,   1.0);
-    WRITEF(gcp->buf, BackAmbientColorRed,     1.0);
-    WRITEF(gcp->buf, BackAmbientColorGreen,   1.0);
-    WRITEF(gcp->buf, BackAmbientColorBlue,    1.0);
-    WRITEF(gcp->buf, FrontDiffuseColorRed,    1.0);
-    WRITEF(gcp->buf, FrontDiffuseColorGreen,  1.0);
-    WRITEF(gcp->buf, FrontDiffuseColorBlue,   1.0);
-    WRITEF(gcp->buf, BackDiffuseColorRed,     1.0);
-    WRITEF(gcp->buf, BackDiffuseColorGreen,   1.0);
-    WRITEF(gcp->buf, BackDiffuseColorBlue,    1.0);
-    WRITEF(gcp->buf, FrontSpecularColorRed,   0.0);
-    WRITEF(gcp->buf, FrontSpecularColorGreen, 0.0);
-    WRITEF(gcp->buf, FrontSpecularColorBlue,  0.0);
-    WRITEF(gcp->buf, BackSpecularColorRed,    0.0);
-    WRITEF(gcp->buf, BackSpecularColorGreen,  0.0);
-    WRITEF(gcp->buf, BackSpecularColorBlue,   0.0);
-    WRITEF(gcp->buf, SceneAmbientColorRed,    0.0);
-    WRITEF(gcp->buf, SceneAmbientColorGreen,  0.0);
-    WRITEF(gcp->buf, SceneAmbientColorBlue,   0.0);
+    CHECK_DMA_BUFFER(nullCC, gcp, 22);
+    WRITEF(gcp->buf, Light0AmbientIntensityBlue, 0.0);
+    WRITEF(gcp->buf, Light0AmbientIntensityGreen, 0.0);
+    WRITEF(gcp->buf, Light0AmbientIntensityRed, 0.0);
+    WRITEF(gcp->buf, Light0DiffuseIntensityBlue, 1.0);
+    WRITEF(gcp->buf, Light0DiffuseIntensityGreen, 1.0);
+    WRITEF(gcp->buf, Light0DiffuseIntensityRed, 1.0);
+    WRITEF(gcp->buf, Light0SpecularIntensityBlue, 1.0);
+    WRITEF(gcp->buf, Light0SpecularIntensityGreen, 1.0);
+    WRITEF(gcp->buf, Light0SpecularIntensityRed, 1.0);
+    WRITEF(gcp->buf, Light0SpotlightDirectionZ, 0.0);
+    WRITEF(gcp->buf, Light0SpotlightDirectionY, 0.0);
+    WRITEF(gcp->buf, Light0SpotlightDirectionX, -1.0);
+    WRITEF(gcp->buf, Light0SpotlightExponent, 0.0);
+    WRITEF(gcp->buf, Light0PositionZ, 0.0);
+    WRITEF(gcp->buf, Light0PositionY, 0.0);
+    WRITEF(gcp->buf, Light0PositionX, 1.0);
+    WRITEF(gcp->buf, Light0PositionW, 0.0);
+    WRITEF(gcp->buf, Light0CosSpotlightCutoffAngle, -1.0);
+    WRITEF(gcp->buf, Light0ConstantAttenuation, 1.0);
+    WRITEF(gcp->buf, Light0LinearAttenuation,   0.0);
+    WRITEF(gcp->buf, Light0QuadraticAttenuation,0.0);
 
     CHECK_DMA_BUFFER(nullCC, gcp, 6);
     WRITEF(gcp->buf, ViewPortScaleX,  (gcp->w)/2.0);
Index: xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h
diff -u xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h:1.3 xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h:1.4
--- xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h:1.3	Tue Feb 22 20:46:44 2000
+++ xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h	Fri Jun 16 17:02:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h,v 1.3 2000/02/23 04:46:44 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h,v 1.4 2000/06/17 00:02:56 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -228,14 +228,14 @@
 #ifdef DO_VALIDATE
 #define VALIDATE_DRAWABLE_INFO_NO_LOCK(gcc,gcp)                            \
 do {                                                                       \
-    __DRIcontextPrivate *pcp = gcc->driContextPriv;                        \
+    __DRIcontextPrivate *pcp = gcc;                                        \
     __DRIscreenPrivate *psp = pcp->driScreenPriv;                          \
     __DRIdrawablePrivate *pdp = pcp->driDrawablePriv;                      \
                                                                            \
     if (*(pdp->pStamp) != pdp->lastStamp) {                                \
 	int old_index = pdp->index;                                        \
 	while (*(pdp->pStamp) != pdp->lastStamp) {                         \
-	    DRI_MESA_VALIDATE_DRAWABLE_INFO(gcc->display, psp->myNum, pdp);\
+	    DRI_MESA_VALIDATE_DRAWABLE_INFO(pcp->display, psp->myNum, pdp);\
         }                                                                  \
                                                                            \
 	if (pdp->index != old_index) {                                     \
@@ -303,7 +303,7 @@
 
 #define VALIDATE_DRAWABLE_INFO(gcc,gcp)                                    \
 do {                                                                       \
-    __DRIcontextPrivate *pcp = gcc->driContextPriv;                        \
+    __DRIcontextPrivate *pcp = gcc;                                        \
     __DRIscreenPrivate *psp = pcp->driScreenPriv;                          \
                                                                            \
     DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);            \
Index: xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c
diff -u xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c:1.2 xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c:1.3
--- xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c:1.2	Tue Feb 22 20:46:44 2000
+++ xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c	Fri Jun 16 17:02:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c,v 1.2 2000/02/23 04:46:44 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c,v 1.3 2000/06/17 00:02:56 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -163,9 +163,7 @@
 	WRITEF(gCCPriv->buf, ModelViewMatrix13, gCCPriv->ModelView[13]);
 	WRITEF(gCCPriv->buf, ModelViewMatrix14, gCCPriv->ModelView[14]);
 	WRITEF(gCCPriv->buf, ModelViewMatrix15, gCCPriv->ModelView[15]);
-	/* Fall through to load ModelViewProjectionMatrix */
 #endif
-
     case GL_PROJECTION:
 	CHECK_DMA_BUFFER(gCC, gCCPriv, 16);
 	WRITEF(gCCPriv->buf,
Index: xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h
diff -u xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h:1.2 xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h:1.3
--- xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h:1.2	Tue Feb 22 20:46:45 2000
+++ xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h	Fri Jun 16 17:02:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h,v 1.2 2000/02/23 04:46:45 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h,v 1.3 2000/06/17 00:02:56 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -163,6 +163,10 @@
 #define FBWriteModeEnable             0x00000001
 #define FBW_UploadColorData           0x00000008
 
+/* FogMode */
+#define FogModeDisable                0x00000000
+#define FogModeEnable                 0x00000001
+
 /* LBWriteMode */
 #define LBWriteModeDisable            0x00000000
 #define LBWriteModeEnable             0x00000001
@@ -391,14 +395,17 @@
 #define GM_FogLinear                  0x00000000
 #define GM_FogExp                     0x00000004
 #define GM_FogExpSquared              0x00000008
+#define GM_FogMask                    0x0000000C
 #define GM_FrontPolyPoint             0x00000000
 #define GM_FrontPolyLine              0x00000010
 #define GM_FrontPolyFill              0x00000020
 #define GM_BackPolyPoint              0x00000000
 #define GM_BackPolyLine               0x00000040
 #define GM_BackPolyFill               0x00000080
+#define GM_FB_PolyMask                0x000000F0
 #define GM_FrontFaceCW                0x00000000
 #define GM_FrontFaceCCW               0x00000100
+#define GM_FFMask                     0x00000100
 #define GM_PolyCullDisable            0x00000000
 #define GM_PolyCullEnable             0x00000200
 #define GM_PolyCullFront              0x00000000
@@ -480,18 +487,44 @@
 /* LightingMode */
 #define LightingModeDisable           0x00000000
 #define LightingModeEnable            0x00000001
+#define LightingModeTwoSides          0x00000002
+#define LightingModeLocalViewer       0x00000008
+
+/* Light0Mode */
+#define Light0ModeDisable             0x00000000
+#define Light0ModeEnable              0x00000001
+#define Light0ModeSpotLight           0x00000002
+#define Light0ModeAttenuation         0x00000004
+#define Light0ModeLocal               0x00000008
+
+/* Light0Mode */
+#define Light1ModeDisable             0x00000000
+#define Light1ModeEnable              0x00000001
+#define Light1ModeSpotLight           0x00000002
+#define Light1ModeAttenuation         0x00000004
+#define Light1ModeLocal               0x00000008
 
 /* ColorMaterialMode */
 #define ColorMaterialModeDisable      0x00000000
 #define ColorMaterialModeEnable       0x00000001
+#define ColorMaterialModeFront        0x00000000
+#define ColorMaterialModeBack         0x00000002
+#define ColorMaterialModeFrontAndBack 0x00000004
+#define ColorMaterialModeEmission     0x00000000
+#define ColorMaterialModeAmbient      0x00000008
+#define ColorMaterialModeDiffuse      0x00000010
+#define ColorMaterialModeSpecular     0x00000018
+#define ColorMaterialModeAmbAndDiff   0x00000020
+#define ColorMaterialModeMask         0x0000003e
 
 /* MaterialMode */
 #define MaterialModeDisable           0x00000000
 #define MaterialModeEnable            0x00000001
+#define MaterialModeTwoSides          0x00000080
 
 /* DeltaMode */
 #define DM_Target300SX                0x00000000
-#define DM_Target300TXMX              0x00000001
+#define DM_Target500TXMX              0x00000001
 #define DM_Depth16                    0x00000004
 #define DM_Depth24                    0x00000008
 #define DM_Depth32                    0x0000000c
Index: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c
diff -u xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c:1.2 xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c:1.3
--- xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c:1.2	Tue Feb 22 20:46:45 2000
+++ xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c	Fri Jun 16 17:02:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c,v 1.2 2000/02/23 04:46:45 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c,v 1.3 2000/06/17 00:02:56 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -34,6 +34,7 @@
 
 #ifdef GLX_DIRECT_RENDERING
 
+#include <Xarch.h>
 #include <X11/Xlibint.h>
 #include "gamma_init.h"
 #include <string.h>
@@ -74,7 +75,11 @@
 
     t->TextureFilterMode = (TextureFilterModeDisable);
 
+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
     t->TextureFormat = (TF_LittleEndian |
+#else
+    t->TextureFormat = (TF_BigEndian |
+#endif
 			TF_16Bit_565 |
 			TF_ColorOrder_RGB |
 			TF_Compnents_4 |
Index: xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c
diff -u xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c:1.4 xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c:1.6
--- xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c:1.4	Thu Mar  2 08:07:36 2000
+++ xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c	Fri Jun 16 17:02:56 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c,v 1.4 2000/03/02 16:07:36 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c,v 1.6 2000/06/17 00:02:56 martin Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -30,131 +30,123 @@
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
  *   Brian Paul <brian@precisioninsight.com>
+ *   Alan Hourihane <Alan.Hourihane@btinternet.com>
  */
 
 #ifdef GLX_DIRECT_RENDERING
 
 #include <X11/Xlibint.h>
 #include "gamma_init.h"
+#include "gamma_gl.h"
 #include "glapi.h"
+#include "glint_dri.h"
+#include "context.h"
+#include "mmath.h"
 
 
-XMesaContext         nullCC  = NULL;
-XMesaContext         gCC     = NULL;
+__DRIcontextPrivate *nullCC  = NULL;
+__DRIcontextPrivate *gCC = NULL;
 gammaContextPrivate *gCCPriv = NULL;
 
 static struct _glapi_table *Dispatch = NULL;
 
-static int count_bits(unsigned int n)
-{
-   int bits = 0;
-
-   while (n > 0) {
-      if (n & 1) bits++;
-      n >>= 1;
-   }
-   return bits;
-}
 
-GLboolean XMesaInitDriver(__DRIscreenPrivate *driScrnPriv)
+GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv)
 {
     gammaScreenPrivate *gsp;
 
+    /* Check the DRI version */
+    {
+       int major, minor, patch;
+       if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) {
+          if (major != 3 || minor != 0 || patch < 0) {
+             char msg[1000];
+             sprintf(msg, "gamma DRI driver expected DRI version 3.0.x but got version %d.%d.%d", major, minor, patch);
+             __driMesaMessage(msg);
+             return GL_FALSE;
+          }
+       }
+    }
+
+    /* Check that the DDX driver version is compatible */
+    if (sPriv->ddxMajor != 1 ||
+        sPriv->ddxMinor != 0 ||
+        sPriv->ddxPatch < 0) {
+        char msg[1000];
+        sprintf(msg, "gamma DRI driver expected DDX driver version 1.0.x but got version %d.%d.%d", sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch);
+        __driMesaMessage(msg);
+        return GL_FALSE;
+    }
+
+    /* Check that the DRM driver version is compatible */
+    if (sPriv->drmMajor != 1 ||
+        sPriv->drmMinor != 0 ||
+        sPriv->drmPatch < 0) {
+        char msg[1000];
+        sprintf(msg, "gamm DRI driver expected DRM driver version 1.0.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
+        __driMesaMessage(msg);
+        return GL_FALSE;
+    }
+
     /* Allocate the private area */
     gsp = (gammaScreenPrivate *)Xmalloc(sizeof(gammaScreenPrivate));
     if (!gsp) {
 	return GL_FALSE;
     }
-    gsp->driScrnPriv = driScrnPriv;
+    gsp->driScrnPriv = sPriv;
 
-    driScrnPriv->private = (void *)gsp;
+    sPriv->private = (void *)gsp;
 
-    if (!gammaMapAllRegions(driScrnPriv)) {
-	Xfree(driScrnPriv->private);
+    if (!gammaMapAllRegions(sPriv)) {
+	Xfree(sPriv->private);
 	return GL_FALSE;
     }
 
     return GL_TRUE;
 }
 
-void XMesaResetDriver(__DRIscreenPrivate *driScrnPriv)
+void XMesaResetDriver(__DRIscreenPrivate *sPriv)
 {
-    gammaUnmapAllRegions(driScrnPriv);
-    Xfree(driScrnPriv->private);
+    gammaUnmapAllRegions(sPriv);
+    Xfree(sPriv->private);
+    sPriv->private = NULL;
 }
 
-XMesaVisual XMesaCreateVisual(XMesaDisplay *display,
-				      XMesaVisualInfo visinfo,
-				      GLboolean rgb_flag,
-				      GLboolean alpha_flag,
-				      GLboolean db_flag,
-				      GLboolean stereo_flag,
-				      GLboolean ximage_flag,
-				      GLint depth_size,
-				      GLint stencil_size,
-				      GLint accum_size,
-				      GLint level)
+GLvisual *XMesaCreateVisual(Display *dpy,
+                            __DRIscreenPrivate *driScrnPriv,
+                            const XVisualInfo *visinfo,
+                            const __GLXvisualConfig *config)
 {
-    XMesaVisual v;
-
-    /* Only RGB visuals are supported on the GMX2000 */
-    if (!rgb_flag) {
-	return NULL;
-    }
-
-    v = (XMesaVisual)Xmalloc(sizeof(struct xmesa_visual));
-    if (!v) {
-	return NULL;
-    }
-
-    v->visinfo = (XVisualInfo *)Xmalloc(sizeof(*visinfo));
-    if(!v->visinfo) {
-	Xfree(v);
-	return NULL;
-    }
-    memcpy(v->visinfo, visinfo, sizeof(*visinfo));
-
-    v->display = display;
-    v->level = level;
-
-    v->gl_visual = (GLvisual *)Xmalloc(sizeof(GLvisual));
-    if (!v->gl_visual) {
-	Xfree(v->visinfo);
-	XFree(v);
-	return NULL;
-    }
-
-    v->gl_visual->RGBAflag   = rgb_flag;
-    v->gl_visual->DBflag     = db_flag;
-    v->gl_visual->StereoFlag = stereo_flag;
-
-    v->gl_visual->RedBits   = count_bits(visinfo->red_mask);
-    v->gl_visual->GreenBits = count_bits(visinfo->green_mask);
-    v->gl_visual->BlueBits  = count_bits(visinfo->blue_mask);
-    v->gl_visual->AlphaBits = 0; /* Not currently supported */
-
-    v->gl_visual->AccumBits   = accum_size;
-    v->gl_visual->DepthBits   = depth_size;
-    v->gl_visual->StencilBits = stencil_size;
-
-    return v;
+   /* Drivers may change the args to _mesa_create_visual() in order to
+    * setup special visuals.
+    */
+   return _mesa_create_visual( config->rgba,
+                               config->doubleBuffer,
+                               config->stereo,
+                               _mesa_bitcount(visinfo->red_mask),
+                               _mesa_bitcount(visinfo->green_mask),
+                               _mesa_bitcount(visinfo->blue_mask),
+                               config->alphaSize,
+                               0, /* index bits */
+                               config->depthSize,
+                               config->stencilSize,
+                               config->accumRedSize,
+                               config->accumGreenSize,
+                               config->accumBlueSize,
+                               config->accumAlphaSize,
+                               0 /* num samples */ );
 }
 
-void XMesaDestroyVisual(XMesaVisual v)
-{
-    Xfree(v->gl_visual);
-    Xfree(v->visinfo);
-    Xfree(v);
-}
 
-XMesaContext XMesaCreateContext(XMesaVisual v, XMesaContext share_list,
-					__DRIcontextPrivate *driContextPriv)
+GLboolean XMesaCreateContext( Display *dpy,
+                              GLvisual *mesaVis,
+                              __DRIcontextPrivate *driContextPriv )
 {
     int i;
-    XMesaContext c;
     gammaContextPrivate *cPriv;
     __DRIscreenPrivate *driScrnPriv = driContextPriv->driScreenPriv;
     gammaScreenPrivate *gPriv = (gammaScreenPrivate *)driScrnPriv->private;
+    GLINTDRIPtr         gDRIPriv = (GLINTDRIPtr)driScrnPriv->pDevPriv;
 
     if (!Dispatch) {
        GLuint size = _glapi_get_dispatch_table_size() * sizeof(GLvoid *);
@@ -162,20 +154,9 @@
        _gamma_init_dispatch(Dispatch);
     }
 
-    c = (XMesaContext)Xmalloc(sizeof(struct xmesa_context));
-    if (!c) {
-	return NULL;
-    }
-
-    c->driContextPriv = driContextPriv;
-    c->xm_visual = v;
-    c->xm_buffer = NULL; /* Set by MakeCurrent */
-    c->display = v->display;
-
     cPriv = (gammaContextPrivate *)Xmalloc(sizeof(gammaContextPrivate));
     if (!cPriv) {
-	Xfree(c);
-	return NULL;
+	return GL_FALSE;
     }
 
     cPriv->hHWContext = driContextPriv->hHWContext;
@@ -216,27 +197,26 @@
 		cPriv->ModelViewProj[i] =
 		cPriv->Texture[i] = 0.0;
 
-    /*
-    ** NOT_DONE: The 0xe4 in LBReadMode and FBReadMode refers to the
-    ** partial products for the 640x480 mode.  We will need to look up
-    ** the partial products in a table (c.f., glint_driver.c) to support
-    ** other FB sizes.
-    */
     cPriv->LBReadMode = (LBReadSrcDisable |
 			 LBReadDstDisable |
 			 LBDataTypeDefault |
 			 LBWindowOriginBot |
-			 LBScanLineInt2 |
-			 0xe4); /* NOT_DONE: 640x480 partial products */
+			 gDRIPriv->pprod);
     cPriv->FBReadMode = (FBReadSrcDisable |
 			 FBReadDstDisable |
 			 FBDataTypeDefault |
 			 FBWindowOriginBot |
-			 FBScanLineInt2 |
-			 0xe4); /* NOT_DONE: 640x480 partial products */
-
-    cPriv->FBWindowBase = driScrnPriv->fbWidth * (driScrnPriv->fbHeight/2 - 1);
-    cPriv->LBWindowBase = driScrnPriv->fbWidth * (driScrnPriv->fbHeight/2 - 1);
+			 gDRIPriv->pprod);
+ 
+    if (gDRIPriv->numMXDevices == 2) {
+	cPriv->LBReadMode |= LBScanLineInt2;
+	cPriv->FBReadMode |= FBScanLineInt2;
+    	cPriv->FBWindowBase =driScrnPriv->fbWidth*(driScrnPriv->fbHeight/2 - 1);
+    	cPriv->LBWindowBase =driScrnPriv->fbWidth*(driScrnPriv->fbHeight/2 - 1);
+    } else {
+    	cPriv->FBWindowBase = driScrnPriv->fbWidth * driScrnPriv->fbHeight;
+    	cPriv->LBWindowBase = driScrnPriv->fbWidth * driScrnPriv->fbHeight;
+    }
 
     cPriv->Begin = (B_AreaStippleDisable |
 		    B_LineStippleDisable |
@@ -328,7 +308,7 @@
 			      4, 1,
 			      gammaTOLoad,
 			      gammaTOLoadSub);
-	
+
     cPriv->curTexObj = gammaTOFind(0);
     cPriv->curTexObj1D = cPriv->curTexObj;
     cPriv->curTexObj2D = cPriv->curTexObj;
@@ -338,17 +318,17 @@
 #ifdef FORCE_DEPTH32
     cPriv->DepthSize = 32;
 #else
-    cPriv->DepthSize = v->gl_visual->DepthBits;
+    cPriv->DepthSize = mesaVis->DepthBits;
 #endif
     cPriv->zNear = 0.0;
     cPriv->zFar  = 1.0;
 
     cPriv->Flags  = GAMMA_FRONT_BUFFER;
-    cPriv->Flags |= (v->gl_visual->DBflag ? GAMMA_BACK_BUFFER  : 0);
+    cPriv->Flags |= (mesaVis->DBflag ? GAMMA_BACK_BUFFER  : 0);
     cPriv->Flags |= (cPriv->DepthSize > 0 ? GAMMA_DEPTH_BUFFER : 0);
 
     cPriv->EnabledFlags = GAMMA_FRONT_BUFFER;
-    cPriv->EnabledFlags |= (v->gl_visual->DBflag ? GAMMA_BACK_BUFFER  : 0);
+    cPriv->EnabledFlags |= (mesaVis->DBflag ? GAMMA_BACK_BUFFER  : 0);
 
     cPriv->DepthMode = (DepthModeDisable |
 			DM_WriteMask |
@@ -356,7 +336,7 @@
 
     cPriv->DeltaMode = (DM_SubPixlCorrectionEnable |
 			DM_SmoothShadingEnable |
-			DM_Target300TXMX);
+			DM_Target500TXMX);
 
     switch (cPriv->DepthSize) {
     case 16:
@@ -373,37 +353,69 @@
     }
 
     cPriv->gammaScrnPriv = gPriv;
+
+    cPriv->LightingMode = LightingModeDisable;
+    cPriv->Light0Mode = LNM_Off;
+    cPriv->Light1Mode = LNM_Off;
 
-    c->private = (void *)cPriv;
+    cPriv->MaterialMode = MaterialModeDisable;
 
+    cPriv->ScissorMode = UserScissorDisable | ScreenScissorDisable;
+
+    driContextPriv->driverPrivate = cPriv;
+
     /* Initialize the HW to a known state */
     gammaInitHW(cPriv);
 
-    return c;
+    return GL_TRUE;
 }
 
-void XMesaDestroyContext(XMesaContext c)
+void XMesaDestroyContext(__DRIcontextPrivate *driContextPriv)
 {
+    gammaContextPrivate *cPriv;
+    cPriv = (gammaContextPrivate *) driContextPriv->driverPrivate;
+    if (cPriv) {
+       /* XXX free driver context data? */
+    }
 }
 
-XMesaBuffer XMesaCreateWindowBuffer(XMesaVisual v, XMesaWindow w,
-					    __DRIdrawablePrivate *driDrawPriv)
-{
-    return (XMesaBuffer)1;
-}
 
-XMesaBuffer XMesaCreatePixmapBuffer(XMesaVisual v, XMesaPixmap p,
-					    XMesaColormap c,
-					    __DRIdrawablePrivate *driDrawPriv)
+GLframebuffer *XMesaCreateWindowBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
 {
-    return (XMesaBuffer)1;
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                mesaVis->AlphaBits > 0
+                                );
 }
+
 
-void XMesaDestroyBuffer(XMesaBuffer b)
+GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
 {
+#if 0
+   /* Different drivers may have different combinations of hardware and
+    * software ancillary buffers.
+    */
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                mesaVis->AlphaBits > 0
+                                );
+#else
+   return NULL;  /* not implemented yet */
+#endif
 }
+
 
-void XMesaSwapBuffers(XMesaBuffer b)
+void XMesaSwapBuffers(__DRIdrawablePrivate *driDrawPriv)
 {
     /*
     ** NOT_DONE: This assumes buffer is currently bound to a context.
@@ -420,11 +432,9 @@
     if (gCCPriv->EnabledFlags & GAMMA_BACK_BUFFER) {
 	int src, dst, x0, y0, x1, h;
 	int i;
-	__DRIdrawablePrivate *driDrawPriv =
-	    gCC->driContextPriv->driDrawablePriv;
 	int nRect = driDrawPriv->numClipRects;
 	XF86DRIClipRectPtr pRect = driDrawPriv->pClipRects;
-	__DRIscreenPrivate *driScrnPriv = gCC->driContextPriv->driScreenPriv;
+	__DRIscreenPrivate *driScrnPriv = gCC->driScreenPriv;
 
 #ifdef DO_VALIDATE
 	DRM_SPINLOCK(&driScrnPriv->pSAREA->drawable_lock,
@@ -487,19 +497,23 @@
     }
 }
 
-GLboolean XMesaMakeCurrent(XMesaContext c, XMesaBuffer b)
-{
-    if (c) {
-	gCC     = c;
-	gCCPriv = (gammaContextPrivate *)c->private;
+GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
+                           __DRIdrawablePrivate *driDrawPriv,
+                           __DRIdrawablePrivate *driReadPriv)
+{
+    if (driContextPriv) {
+	gCC     = driContextPriv;
+	gCCPriv = (gammaContextPrivate *) driContextPriv->driverPrivate;
 
 	gCCPriv->Window &= ~W_GIDMask;
-	gCCPriv->Window |= (gCC->driContextPriv->driDrawablePriv->index << 5);
+	gCCPriv->Window |= (driDrawPriv->index << 5);
 
 	CHECK_DMA_BUFFER(gCC, gCCPriv, 1);
 	WRITE(gCCPriv->buf, GLINTWindow, gCCPriv->Window);
 
         _glapi_set_dispatch(Dispatch);
+
+	_gamma_Viewport(0, 0, driDrawPriv->w, driDrawPriv->h);
     } else {
 	gCC     = NULL;
 	gCCPriv = NULL;
@@ -508,7 +522,7 @@
 }
 
 
-GLboolean XMesaUnbindContext( XMesaContext c )
+GLboolean XMesaUnbindContext( __DRIcontextPrivate *driContextPriv )
 {
    /* XXX not 100% sure what's supposed to be done here */
    return GL_TRUE;
Index: xc/lib/GL/mesa/src/drv/i810/Imakefile
diff -u xc/lib/GL/mesa/src/drv/i810/Imakefile:1.2 xc/lib/GL/mesa/src/drv/i810/Imakefile:1.6
--- xc/lib/GL/mesa/src/drv/i810/Imakefile:1.2	Tue Feb 22 20:46:48 2000
+++ xc/lib/GL/mesa/src/drv/i810/Imakefile	Fri Jun 30 10:15:08 2000
@@ -1,4 +1,6 @@
 
+#include <Threads.tmpl>
+
 #define DoNormalLib NormalLibGlx
 #define DoSharedLib SharedLibGlx
 #define DoExtraLib SharedLibGlx
@@ -9,13 +11,22 @@
 ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
 #endif
 
+#if defined(LinuxArchitecture)
+OS_SUBDIR = linux
+#endif
+#if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture)
+OS_SUBDIR = bsd
+#endif
+
 #if BuildXF86DRI
   DRI_DEFINES = GlxDefines -DDRIVERTS
  DRI_INCLUDES = -I../../../../dri -I../../../../glx \
+		-I../../../dri \
 		-I$(TOP)/include -I$(TOP)/include/GL \
 		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \
 		-I$(XF86DRIVERSRC)/i810  \
-		-I../../../include -I../.. -I../common -I../../X
+		-I../../../include -I../.. -I../common -I../../X \
+	        -I$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel
 #endif
 
 MESA_INCLUDES = -I. -I.. -I../../include
@@ -23,20 +34,243 @@
 
 
       DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES)
-     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) \
-		-I/usr/include/glide
-      DRISRCS = i810_xmesa.c i810clear.c	\
-		i810dd.c i810depth.c i810dma.c i810ring.c		\
-		i810pipeline.c i810span.c i810state.c i810swap.c	\
-		i810tex.c i810tris.c i810vb.c i810fastpath.c
-
-      DRIOBJS = i810_xmesa.o i810clear.o	\
-		i810dd.o i810depth.o i810dma.o i810ring.o		\
-		i810pipeline.o i810span.o i810state.o i810swap.o	\
-		i810tex.o i810tris.o i810vb.o i810fastpath.o
+     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) 
+
+      DRISRCS = ../../../dri/dri_mesa.c \
+		../../../../dri/dri_tmm.c
+
+      DRIOBJS = ../../../dri/dri_mesa.o \
+		../../../../dri/dri_tmm.o
+
+      DRMSRCS = ../../../../dri/drm/xf86drm.c \
+		../../../../dri/drm/xf86drmHash.c \
+		../../../../dri/drm/xf86drmRandom.c \
+		../../../../dri/drm/xf86drmSL.c
+
+      DRMOBJS = ../../../../dri/drm/xf86drm.o \
+		../../../../dri/drm/xf86drmHash.o \
+		../../../../dri/drm/xf86drmRandom.o \
+		../../../../dri/drm/xf86drmSL.o
+
+
+     I810SRCS = i810_xmesa.c	\
+		i810dd.c  	\
+		i810pipeline.c i810span.c i810state.c	\
+		i810tex.c i810tris.c i810vb.c i810fastpath.c i810ioctl.c
+
+     I810OBJS = i810_xmesa.o \
+		i810dd.o  		\
+		i810pipeline.o i810span.o i810state.o	\
+		i810tex.o i810tris.o i810vb.o i810fastpath.o i810ioctl.o
+
+     MESASRCS = ../../aatriangle.c \
+		../../accum.c \
+		../../alpha.c \
+		../../alphabuf.c \
+		../../attrib.c \
+		../../bbox.c \
+		../../bitmap.c \
+		../../blend.c \
+		../../buffers.c \
+		../../clip.c \
+		../../colortab.c \
+		../../config.c \
+		../../context.c \
+		../../copypix.c \
+		../../cva.c \
+		../../debug_xform.c \
+		../../depth.c \
+		../../dlist.c \
+		../../drawpix.c \
+		../../enable.c \
+		../../enums.c \
+		../../eval.c \
+		../../extensions.c \
+		../../feedback.c \
+		../../fog.c \
+		../../get.c \
+		../../glapi.c \
+		../../glapinoop.c \
+		../../glthread.c \
+		../../hash.c \
+		../../image.c \
+		../../imaging.c \
+		../../light.c \
+		../../lines.c \
+		../../logic.c \
+		../../masking.c \
+		../../matrix.c \
+		../../mem.c \
+		../../mmath.c \
+		../../pb.c \
+		../../pipeline.c \
+		../../pixel.c \
+		../../pixeltex.c \
+		../../points.c \
+		../../polygon.c \
+		../../quads.c \
+		../../rastpos.c \
+		../../readpix.c \
+		../../rect.c \
+		../../scissor.c \
+		../../shade.c \
+		../../span.c \
+		../../stages.c \
+		../../state.c \
+		../../stencil.c \
+		../../teximage.c \
+		../../texobj.c \
+		../../texstate.c \
+		../../texture.c \
+		../../texutil.c \
+		../../translate.c \
+		../../triangle.c \
+		../../varray.c \
+		../../vb.c \
+		../../vbcull.c \
+		../../vbfill.c \
+		../../vbindirect.c \
+		../../vbrender.c \
+		../../vbxform.c \
+		../../vector.c \
+		../../vertices.c \
+		../../winpos.c \
+		../../xform.c \
+		../../zoom.c
+
+     MESAOBJS = ../../aatriangle.o \
+		../../accum.o \
+		../../alpha.o \
+		../../alphabuf.o \
+		../../attrib.o \
+		../../bbox.o \
+		../../bitmap.o \
+		../../blend.o \
+		../../buffers.o \
+		../../clip.o \
+		../../colortab.o \
+		../../config.o \
+		../../context.o \
+		../../copypix.o \
+		../../cva.o \
+		../../debug_xform.o \
+		../../depth.o \
+		../../dlist.o \
+		../../drawpix.o \
+		../../enable.o \
+		../../enums.o \
+		../../eval.o \
+		../../extensions.o \
+		../../feedback.o \
+		../../fog.o \
+		../../get.o \
+		../../hash.o \
+		../../hint.o \
+		../../image.o \
+		../../imaging.o \
+		../../light.o \
+		../../lines.o \
+		../../logic.o \
+		../../masking.o \
+		../../matrix.o \
+		../../mem.o \
+		../../mmath.o \
+		../../pb.o \
+		../../pipeline.o \
+		../../pixel.o \
+		../../pixeltex.o \
+		../../points.o \
+		../../polygon.o \
+		../../quads.o \
+		../../rastpos.o \
+		../../readpix.o \
+		../../rect.o \
+		../../scissor.o \
+		../../shade.o \
+		../../span.o \
+		../../stages.o \
+		../../state.o \
+		../../stencil.o \
+		../../teximage.o \
+		../../texobj.o \
+		../../texstate.o \
+		../../texture.o \
+		../../texutil.o \
+		../../translate.o \
+		../../triangle.o \
+		../../varray.o \
+		../../vb.o \
+		../../vbcull.o \
+		../../vbfill.o \
+		../../vbindirect.o \
+		../../vbrender.o \
+		../../vbxform.o \
+		../../vector.o \
+		../../vertices.o \
+		../../winpos.o \
+		../../xform.o \
+		../../zoom.o
+
+#ifdef i386Architecture
+     X86_SRCS = ../../X86/x86.c \
+		../../X86/x86a.S \
+		../../X86/common_x86.c \
+		../../X86/common_x86asm.S \
+		../../X86/vertex.S
+
+     X86_OBJS = ../../X86/x86.o \
+		../../X86/x86a.o \
+		../../X86/common_x86.o \
+		../../X86/common_x86asm.o \
+		../../X86/vertex.o
+
+     MMX_SRCS = ../../X86/mmx_blend.S
+
+     MMX_OBJS = ../../X86/mmx_blend.o
+
+XCOMM Disabling 3Dnow code for the time being.
+#if 0
+   3DNOW_SRCS = ../../X86/3dnow.c \
+		../../X86/3dnow_norm_raw.S \
+		../../X86/3dnow_xform_masked1.S \
+		../../X86/3dnow_xform_masked2.S \
+		../../X86/3dnow_xform_masked3.S \
+		../../X86/3dnow_xform_masked4.S \
+		../../X86/3dnow_xform_raw1.S \
+		../../X86/3dnow_xform_raw2.S \
+		../../X86/3dnow_xform_raw3.S \
+		../../X86/3dnow_xform_raw4.S \
+		../../X86/vertex_3dnow.S
+
+   3DNOW_OBJS = ../../X86/3dnow.o \
+		../../X86/3dnow_norm_raw.o \
+		../../X86/3dnow_xform_masked1.o \
+		../../X86/3dnow_xform_masked2.o \
+		../../X86/3dnow_xform_masked3.o \
+		../../X86/3dnow_xform_masked4.o \
+		../../X86/3dnow_xform_raw1.o \
+		../../X86/3dnow_xform_raw2.o \
+		../../X86/3dnow_xform_raw3.o \
+		../../X86/3dnow_xform_raw4.o \
+		../../X86/vertex_3dnow.o
+#endif
+
+#endif
+
+      ASMSRCS = $(X86_SRCS) $(MMX_SRCS) $(3DNOW_SRCS)
+      ASMOBJS = $(X86_OBJS) $(MMX_OBJS) $(3DNOW_OBJS)
+
+      COMMONSRCS = ../common/mm.c ../common/hwlog.c
+      COMMONOBJS = ../common/mm.o ../common/hwlog.o
+
+         SRCS = $(DRISRCS) $(DRMSRCS) $(MESASRCS) $(ASMSRCS) $(COMMONSRCS) $(I810SRCS) 
+         OBJS = $(DRIOBJS) $(DRMOBJS) $(MESAOBJS) $(ASMOBJS) $(COMMONOBJS) $(I810OBJS)
+
+REQUIREDLIBS += -lm
+#if !GlxBuiltInI810
+REQUIREDLIBS += -L../../../.. -lGL
+#endif
 
-	 SRCS = $(DRISRCS) 
-	 OBJS = $(DRIOBJS) 
 
 #if !GlxUseBuiltInDRIDriver
 #undef DoNormalLib NormalLibGlx
@@ -57,7 +291,7 @@
 ALL_OBJS = $(OBJS)
 ALL_DEPS = DONE
 SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
-InstallDynamicModule($(LIBNAME),$(MODULEDIR),.)
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
 #endif
 
 DependTarget()
Index: xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h:1.3
--- xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h:1.1	Fri Feb 11 09:25:27 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h	Mon Jun 19 22:08:40 2000
@@ -108,6 +108,8 @@
 #define LCS_UPDATE_LINEWIDTH    (0x1<<15)
 #define LCS_LINEWIDTH_MASK      (0x7<<12)
 #define LCS_LINEWIDTH_SHIFT           12
+#define LCS_LINEWIDTH_0_5       (0x1<<12)
+#define LCS_LINEWIDTH_1_0       (0x2<<12)
 #define LCS_UPDATE_ALPHA_INTERP (0x1<<11)
 #define LCS_ALPHA_FLAT          (0x0<<10)
 #define LCS_ALPHA_INTERP        (0x1<<10)
@@ -398,6 +400,7 @@
 #define MF_MIP_NONE             (0x0<<6)
 #define MF_MIP_NEAREST          (0x1<<6)
 #define MF_MIP_DITHER           (0x2<<6)
+#define MF_MIP_LINEAR           (0x3<<6)
 #define MF_UPDATE_MAG_FILTER    (1<<5)
 #define MF_MAG_MASK             (1<<3)
 #define MF_MAG_LINEAR           (1<<3)
@@ -616,9 +619,6 @@
 #define DV_PF_555           (0x1<<8)
 #define DV_PF_565           (0x2<<8)
 
-
-
-
 #define GFX_OP_ANTIALIAS         ((0x3<<29)|(0x6<<24))
 #define AA_UPDATE_EDGEFLAG       (1<<13)
 #define AA_ENABLE_EDGEFLAG       (1<<12)
@@ -640,85 +640,17 @@
 #define GFX_OP_STIPPLE           ((0x3<<29)|(0x1d<<24)|(0x83<<16))
 #define ST1_ENABLE               (1<<16)
 #define ST1_MASK                 (0xffff)
-
-
-/* Indices into buf.Setup where various bits of state are mirrored per
- * context and per buffer.  These can be fired at the card as a unit,
- * or in a piecewise fashion as required.
- */
 
-/* Destbuffer state 
- *    - backbuffer linear offset and pitch -- invarient in the current dri
- *    - zbuffer linear offset and pitch -- also invarient
- *    - drawing origin in back and depth buffers.
- *
- * Keep the depth/back buffer state here to acommodate private buffers
- * in the future.
- */
-#define I810_DESTREG_DI0  0	/* CMD_OP_DESTBUFFER_INFO (2 dwords) */
-#define I810_DESTREG_DI1  1
-#define I810_DESTREG_ZB0  2	/* CMD_OP_Z_BUFFER_INFO */
-#define I810_DESTREG_ZB1  3	/* CMD_OP_Z_BUFFER_INFO */
-#define I810_DESTREG_DV0  4	/* GFX_OP_DESTBUFFER_VARS (2 dwords) */
-#define I810_DESTREG_DV1  5
-#define I810_DESTREG_DR0  6	/* GFX_OP_DRAWRECT_INFO (4 dwords) */
-#define I810_DESTREG_DR1  7
-#define I810_DESTREG_DR2  8
-#define I810_DESTREG_DR3  9
-#define I810_DESTREG_DR4  10
-
-#define I810_DEST_SETUP_SIZE (11+1)
-
-/* Context state
- */
-#define I810_CTXREG_VF    0	/* GFX_OP_VERTEX_FMT */
-#define I810_CTXREG_MT    1	/* GFX_OP_MAP_TEXELS */
-#define I810_CTXREG_MC0   2	/* GFX_OP_MAP_COLOR_STAGES - stage 0 */
-#define I810_CTXREG_MC1   3	/* GFX_OP_MAP_COLOR_STAGES - stage 1 */
-#define I810_CTXREG_MC2   4	/* GFX_OP_MAP_COLOR_STAGES - stage 2 */
-#define I810_CTXREG_MA0   5	/* GFX_OP_MAP_ALPHA_STAGES - stage 0 */
-#define I810_CTXREG_MA1   6	/* GFX_OP_MAP_ALPHA_STAGES - stage 1 */
-#define I810_CTXREG_MA2   7	/* GFX_OP_MAP_ALPHA_STAGES - stage 2 */
-#define I810_CTXREG_SDM   8	/* GFX_OP_SRC_DEST_MONO */
-#define I810_CTXREG_CF0   9	/* GFX_OP_COLOR_FACTOR */
-#define I810_CTXREG_CF1   10	
-#define I810_CTXREG_FOG   11	/* GFX_OP_FOG_COLOR */
-#define I810_CTXREG_B1    12	/* GFX_OP_BOOL_1 */
-#define I810_CTXREG_B2    13	/* GFX_OP_BOOL_2 */
-#define I810_CTXREG_LCS   14	/* GFX_OP_LINEWIDTH_CULL_SHADE_MODE */
-#define I810_CTXREG_PV    15	/* GFX_OP_PV_RULE -- Invarient! */
-#define I810_CTXREG_ZA    16	/* GFX_OP_ZBIAS_ALPHAFUNC */
-#define I810_CTXREG_ST0   17    /* GFX_OP_STIPPLE */
-#define I810_CTXREG_ST1   18
-#define I810_CTXREG_AA    19	/* GFX_OP_ANTIALIAS */
-#define I810_CTX_SETUP_SIZE (20) /* pad to qword */
-
-
-/* Cliprect state - keep seperate from context as it is used for
- *                  drawing triangles to the shared backbuffer, and
- *                  changes more frequently than the 'normal' context.
- */
-#define I810_CLIPREG_SCI0  0 	/* GFX_OP_SCISSOR_INFO (3 dwords) */
-#define I810_CLIPREG_SCI1  1	
-#define I810_CLIPREG_SCI2  2	
-#define I810_CLIPREG_SC    3	/* GFX_OP_SCISSOR */
-
-#define I810_CLIP_SETUP_SIZE 4
-
-/* Texture state (per tex_buffer)
- */
-#define I810_TEXREG_MI0  0	/* GFX_OP_MAP_INFO (4 dwords) */
-#define I810_TEXREG_MI1  1	
-#define I810_TEXREG_MI2  2	
-#define I810_TEXREG_MI3  3	
-#define I810_TEXREG_MF   4	/* GFX_OP_MAP_FILTER */
-#define I810_TEXREG_MLC  5	/* GFX_OP_MAP_LOD_CTL */
-#define I810_TEXREG_MLL  6	/* GFX_OP_MAP_LOD_LIMITS */
-#define I810_TEXREG_MCS  7	/* GFX_OP_MAP_COORD_SETS ??? */
+#define I810_SET_FIELD( var, mask, value ) (var &= ~(mask), var |= value)
 
-#define I810_TEX_SETUP_SIZE 8
+#define I810PACKCOLOR4444(r,g,b,a) \
+  ((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
 
+#define I810PACKCOLOR1555(r,g,b,a) \
+  ((((r) & 0xf8) << 7) | (((g) & 0xf8) << 2) | (((b) & 0xf8) >> 3) | \
+    ((a) ? 0x8000 : 0))
 
-#define I810_SET_FIELD( var, mask, value ) (var &= ~(mask), var |= value)
+#define I810PACKCOLOR565(r,g,b) \
+  ((((r) & 0xf8) << 8) | (((g) & 0xfc) << 3) | (((b) & 0xf8) >> 3))
 
 #endif
Index: xc/lib/GL/mesa/src/drv/i810/i810_init.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810_init.h:1.2 xc/lib/GL/mesa/src/drv/i810/i810_init.h:1.3
--- xc/lib/GL/mesa/src/drv/i810/i810_init.h:1.2	Tue Feb 22 20:46:48 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810_init.h	Fri Jun 16 17:02:58 2000
@@ -28,7 +28,6 @@
 /*
  * Authors:
  *   Keith Whitwell <keithw@precisioninsight.com>
- *   Daryll Strauss <daryll@precisioninsight.com> (Origninal tdfx driver).
  *
  */
 
@@ -42,16 +41,18 @@
 #include "dri_mesaint.h"
 #include "dri_mesa.h"
 #include "types.h"
-#include "xmesaP.h"
 
 typedef struct {
-  drmHandle handle;
-  drmSize size;
-  drmAddress map;
+   drmHandle handle;
+   drmSize size;
+   char *map;
 } i810Region, *i810RegionPtr;
 
 typedef struct {
-   i810Region regs;
+   i810Region front;
+   i810Region back;
+   i810Region depth;
+   i810Region tex;
 
    int deviceID;
    int width;
@@ -68,21 +69,22 @@
    int backOffset;
    int depthOffset;
 
-   int auxPitch;
-   int auxPitchBits;
+   int backPitch;
+   int backPitchBits;
 
    int textureOffset;
    int textureSize;
    int logTextureGranularity;
 
    __DRIscreenPrivate *driScrnPriv;
+   drmBufMapPtr  bufs;
 
 } i810ScreenPrivate;
 
 
 #include "i810context.h"
 
-extern void i810XMesaUpdateState( i810ContextPtr imesa );
+extern void i810GetLock( i810ContextPtr imesa, GLuint flags );
 extern void i810EmitHwStateLocked( i810ContextPtr imesa );
 extern void i810EmitScissorValues( i810ContextPtr imesa, int box_nr, int emit );
 extern void i810EmitDrawingRectangle( i810ContextPtr imesa );
@@ -90,6 +92,10 @@
 extern void i810XMesaSetFrontClipRects( i810ContextPtr imesa );
 
 
+#define GET_DISPATCH_AGE( imesa ) imesa->sarea->last_dispatch
+#define GET_ENQUEUE_AGE( imesa ) imesa->sarea->last_enqueue
+
+
 /* Lock the hardware and validate our state.  
  */
 #define LOCK_HARDWARE( imesa )				\
@@ -97,38 +103,28 @@
     char __ret=0;					\
     DRM_CAS(imesa->driHwLock, imesa->hHWContext,	\
 	    (DRM_LOCK_HELD|imesa->hHWContext), __ret);	\
-    if (__ret) {					\
-        drmGetLock(imesa->driFd, imesa->hHWContext, 0);	\
-        i810XMesaUpdateState( imesa );			\
-    }							\
+    if (__ret)						\
+        i810GetLock( imesa, 0 );			\
   } while (0)
 
 
+
 /* Unlock the hardware using the global current context 
  */
 #define UNLOCK_HARDWARE(imesa)					\
     DRM_UNLOCK(imesa->driFd, imesa->driHwLock, imesa->hHWContext);	
 
-
-/*
-  This pair of macros makes a loop over the drawing operations
-  so it is not self contained and doesn't have the nice single 
-  statement semantics of most macros
-*/
-#define BEGIN_CLIP_LOOP(imesa)						\
-  do {									\
-    int _nc;								\
-    LOCK_HARDWARE( imesa );						\
-    for (_nc = imesa->numClipRects; _nc ; _nc--) {			\
-      if (imesa->needClip)						\
-        i810EmitScissorValues(imesa, _nc-1, 1);
 
-
-
-#define END_CLIP_LOOP(imesa)			\
-    }						\
-    UNLOCK_HARDWARE(imesa);			\
-  } while (0)
+/* This is the wrong way to do it, I'm sure.  Otherwise the drm
+ * bitches that I've already got the heavyweight lock.  At worst,
+ * this is 3 ioctls.  The best solution probably only gets me down 
+ * to 2 ioctls in the worst case.
+ */
+#define LOCK_HARDWARE_QUIESCENT( imesa ) do {	\
+   LOCK_HARDWARE( imesa );			\
+   i810RegetLockQuiescent( imesa );		\
+} while(0)
+     
 
 #endif
 #endif
Index: xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c:1.2 xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c:1.4
--- xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c:1.2	Tue Feb 22 20:46:48 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c	Thu Jun 22 09:59:24 2000
@@ -24,6 +24,7 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c,v 1.4 2000/06/22 16:59:24 tsi Exp $ */
 
 /*
  * Authors:
@@ -46,10 +47,9 @@
 #include "i810state.h"
 #include "i810tex.h"
 #include "i810span.h"
-#include "i810depth.h"
 #include "i810tris.h"
-#include "i810swap.h"
 #include "i810pipeline.h"
+#include "i810ioctl.h"
 
 #include "i810_dri.h"
 
@@ -57,36 +57,25 @@
 
 #ifndef I810_DEBUG
 int I810_DEBUG = (0
-   		  | DEBUG_ALWAYS_SYNC 
-		  | DEBUG_VERBOSE_RING   
-		  | DEBUG_VERBOSE_OUTREG 
+/*     		  | DEBUG_ALWAYS_SYNC  */
+/*  		  | DEBUG_VERBOSE_RING    */
+/*  		  | DEBUG_VERBOSE_OUTREG  */
 /*  		  | DEBUG_VERBOSE_MSG */
 /*  		  | DEBUG_NO_OUTRING */
 /*  		  | DEBUG_NO_OUTREG */
 /*  		  | DEBUG_VERBOSE_API */
 /*  		  | DEBUG_VERBOSE_2D */
 /*  		  | DEBUG_VERBOSE_DRI */
-		  | DEBUG_VALIDATE_RING
+/*  		  | DEBUG_VALIDATE_RING */
+/*  		  | DEBUG_VERBOSE_IOCTL */
 		  );
 #endif
 
 
 static i810ContextPtr      i810Ctx = 0;
 
-i810Glx_t	i810glx;
 
-static int count_bits(unsigned int n)
-{
-   int bits = 0;
-
-   while (n > 0) {
-      if (n & 1) bits++;
-      n >>= 1;
-   }
-   return bits;
-}
-
-/* These functions are accessed by dlsym from dri_mesa_init.c:
+/* These functions are accessed externally to the driver:
  *
  * XMesaInitDriver
  * XMesaResetDriver
@@ -100,28 +89,74 @@
  * XMesaSwapBuffers
  * XMesaMakeCurrent
  *
- * So this is kind of the public interface to the driver.  The driver
- * uses the X11 mesa driver context as a kind of wrapper around its
- * own driver context - but there isn't much justificiation for doing
- * it that way - the DRI might as well use a (void *) to refer to the
- * driver contexts.  Nothing in the X context really gets used.
  */
 
 
+static drmBufMapPtr i810_create_empty_buffers(void)
+{
+   drmBufMapPtr retval;
+   
+   retval = (drmBufMapPtr)Xmalloc(sizeof(drmBufMap));
+   if(retval == NULL) return NULL;
+   memset(retval, 0, sizeof(drmBufMap));
+   retval->list = (drmBufPtr)Xmalloc(sizeof(drmBuf) * I810_DMA_BUF_NR);
+   if(retval->list == NULL) {
+      Xfree(retval);
+      return NULL;
+   }
+   memset(retval->list, 0, sizeof(drmBuf) * I810_DMA_BUF_NR);
+   /*
+   fprintf(stderr, "retval : %p, retval->list : %p\n", retval, retval->list);
+   */
+   return retval;
+}
+
 GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv)
 {
    i810ScreenPrivate *i810Screen;
    I810DRIPtr         gDRIPriv = (I810DRIPtr)sPriv->pDevPriv;
 
+   /* Check the DRI version */
+   {
+      int major, minor, patch;
+      if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) {
+         if (major != 3 || minor != 0 || patch < 0) {
+            char msg[1000];
+            sprintf(msg, "i810 DRI driver expected DRI version 3.0.x but got version %d.%d.%d", major, minor, patch);
+            __driMesaMessage(msg);
+            return GL_FALSE;
+         }
+      }
+   }
+
+   /* Check that the DDX driver version is compatible */
+   if (sPriv->ddxMajor != 1 ||
+       sPriv->ddxMinor != 0 ||
+       sPriv->ddxPatch < 0) {
+      char msg[1000];
+      sprintf(msg, "i810 DRI driver expected DDX driver version 1.0.x but got version %d.%d.%d", sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch);
+      __driMesaMessage(msg);
+      return GL_FALSE;
+   }
+
+   /* Check that the DRM driver version is compatible */
+   if (sPriv->drmMajor != 1 ||
+       sPriv->drmMinor != 0 ||
+       sPriv->drmPatch < 0) {
+      char msg[1000];
+      sprintf(msg, "i810 DRI driver expected DRM driver version 1.0.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
+      __driMesaMessage(msg);
+      return GL_FALSE;
+   }
+
    /* Allocate the private area */
    i810Screen = (i810ScreenPrivate *)Xmalloc(sizeof(i810ScreenPrivate));
-   if (!i810Screen) return GL_FALSE;
+   if (!i810Screen)
+      return GL_FALSE;
 
    i810Screen->driScrnPriv = sPriv;
    sPriv->private = (void *)i810Screen;
 
-   i810Screen->regs.handle=gDRIPriv->regs;
-   i810Screen->regs.size=gDRIPriv->regsSize;
    i810Screen->deviceID=gDRIPriv->deviceID;
    i810Screen->width=gDRIPriv->width;
    i810Screen->height=gDRIPriv->height;
@@ -137,39 +172,66 @@
 
    i810Screen->backOffset=gDRIPriv->backOffset; 
    i810Screen->depthOffset=gDRIPriv->depthOffset;
-   i810Screen->auxPitch = gDRIPriv->auxPitch;
-   i810Screen->auxPitchBits = gDRIPriv->auxPitchBits;
+   i810Screen->backPitch = gDRIPriv->auxPitch;
+   i810Screen->backPitchBits = gDRIPriv->auxPitchBits;
    i810Screen->textureOffset=gDRIPriv->textureOffset;
    i810Screen->textureSize=gDRIPriv->textureSize;
    i810Screen->logTextureGranularity = gDRIPriv->logTextureGranularity;
 
-
    if (0)
       fprintf(stderr, "Tex heap size %x, granularity %x bytes\n",
 	      i810Screen->textureSize, 1<<(i810Screen->logTextureGranularity));
+
+   i810Screen->bufs = i810_create_empty_buffers();
+   if(i810Screen->bufs == NULL)
+   {
+      Xfree(i810Screen);
+      return GL_FALSE;
+   }
     
+   i810Screen->back.handle = gDRIPriv->backbuffer;
+   i810Screen->back.size = gDRIPriv->backbufferSize;
+
    if (drmMap(sPriv->fd, 
-	      i810Screen->regs.handle, 
-	      i810Screen->regs.size, 
-	      &i810Screen->regs.map) != 0) 
+	      i810Screen->back.handle, 
+	      i810Screen->back.size, 
+	      (drmAddress *)&i810Screen->back.map) != 0) 
    {
       Xfree(i810Screen);
+      sPriv->private = NULL;
       return GL_FALSE;
    }
 
-   /* Ditch i810glx in favor of i810Screen?
-    */
-   memset(&i810glx, 0, sizeof(i810glx));
+   i810Screen->depth.handle = gDRIPriv->depthbuffer;
+   i810Screen->depth.size = gDRIPriv->depthbufferSize;
+
+   if (drmMap(sPriv->fd, 
+	      i810Screen->depth.handle, 
+	      i810Screen->depth.size, 
+	      (drmAddress *)&i810Screen->depth.map) != 0) 
+   {
+      Xfree(i810Screen);
+      drmUnmap(i810Screen->back.map, i810Screen->back.size);
+      sPriv->private = NULL;
+      return GL_FALSE;
+   }
 
-   i810glx.LpRing.mem.Start = gDRIPriv->ringOffset;
-   i810glx.LpRing.mem.Size = gDRIPriv->ringSize;
-   i810glx.LpRing.mem.End = gDRIPriv->ringOffset + gDRIPriv->ringSize;
-   i810glx.LpRing.virtual_start = sPriv->pFB + i810glx.LpRing.mem.Start;
-   i810glx.LpRing.tail_mask = i810glx.LpRing.mem.Size - 1;
-   i810glx.MMIOBase = i810Screen->regs.map;
-   i810glx.texVirtual = sPriv->pFB + i810Screen->textureOffset;
+   i810Screen->tex.handle = gDRIPriv->textures;
+   i810Screen->tex.size = gDRIPriv->textureSize;
 
-   
+   if (drmMap(sPriv->fd, 
+	      i810Screen->tex.handle, 
+	      i810Screen->tex.size, 
+	      (drmAddress *)&i810Screen->tex.map) != 0) 
+   {
+      Xfree(i810Screen);
+      drmUnmap(i810Screen->back.map, i810Screen->back.size);
+      drmUnmap(i810Screen->depth.map, i810Screen->depth.size);
+      sPriv->private = NULL;
+      return GL_FALSE;
+   }
+
+
    i810DDFastPathInit();
    i810DDTrifuncInit();
    i810DDSetupInit();
@@ -182,112 +244,79 @@
 void XMesaResetDriver(__DRIscreenPrivate *sPriv)
 {
    i810ScreenPrivate *i810Screen = (i810ScreenPrivate *)sPriv->private;
+
+   /* Need to unmap all the bufs and maps here:
+    */
+   drmUnmap(i810Screen->back.map, i810Screen->back.size);
+   drmUnmap(i810Screen->depth.map, i810Screen->depth.size);
+   drmUnmap(i810Screen->tex.map, i810Screen->tex.size);
 
-   drmUnmap(i810Screen->regs.map, i810Screen->regs.size);
    Xfree(i810Screen);
+   sPriv->private = NULL;
 }
 
-/* Accessed by dlsym from dri_mesa_init.c
- */
-XMesaVisual XMesaCreateVisual(XMesaDisplay *display,
-			      XMesaVisualInfo visinfo,
-			      GLboolean rgb_flag,
-			      GLboolean alpha_flag,
-			      GLboolean db_flag,
-			      GLboolean stereo_flag,
-			      GLboolean ximage_flag,
-			      GLint depth_size,
-			      GLint stencil_size,
-			      GLint accum_size,
-			      GLint level)
-{
-   XMesaVisual v;
 
-   /* Only RGB visuals are supported on the I810 boards */
-   if (!rgb_flag) return 0;
-
-   v = (XMesaVisual)Xmalloc(sizeof(struct xmesa_visual));
-   if (!v) return 0;
-
-   v->visinfo = (XVisualInfo *)Xmalloc(sizeof(*visinfo));
-   if(!v->visinfo) {
-      Xfree(v);
-      return 0;
-   }
-   memcpy(v->visinfo, visinfo, sizeof(*visinfo));
-
-   v->display = display;
-   v->level = level;
-  
-   v->gl_visual = (GLvisual *)Xmalloc(sizeof(GLvisual));
-   if (!v->gl_visual) {
-      Xfree(v->visinfo);
-      XFree(v);
-      return 0;
-   }
-
-   v->gl_visual->RGBAflag   = rgb_flag;
-   v->gl_visual->DBflag     = db_flag;
-   v->gl_visual->StereoFlag = stereo_flag;
-
-   v->gl_visual->RedBits   = count_bits(visinfo->red_mask);
-   v->gl_visual->GreenBits = count_bits(visinfo->green_mask);
-   v->gl_visual->BlueBits  = count_bits(visinfo->blue_mask);
-   v->gl_visual->AlphaBits = 0; /* Not currently supported */
-
-   v->gl_visual->AccumBits   = accum_size;
-   v->gl_visual->DepthBits   = depth_size;
-   v->gl_visual->StencilBits = stencil_size;
-
-   return v;
-}
-
-void XMesaDestroyVisual(XMesaVisual v)
+GLvisual *XMesaCreateVisual(Display *dpy,
+                            __DRIscreenPrivate *driScrnPriv,
+                            const XVisualInfo *visinfo,
+                            const __GLXvisualConfig *config)
 {
-   Xfree(v->gl_visual);
-   Xfree(v->visinfo);
-   Xfree(v);
+   /* Drivers may change the args to _mesa_create_visual() in order to
+    * setup special visuals.
+    */
+   return _mesa_create_visual( config->rgba,
+                               config->doubleBuffer,
+                               config->stereo,
+                               _mesa_bitcount(visinfo->red_mask),
+                               _mesa_bitcount(visinfo->green_mask),
+                               _mesa_bitcount(visinfo->blue_mask),
+                               config->alphaSize,
+                               0, /* index bits */
+                               config->depthSize,
+                               config->stencilSize,
+                               config->accumRedSize,
+                               config->accumGreenSize,
+                               config->accumBlueSize,
+                               config->accumAlphaSize,
+                               0 /* num samples */ );
 }
 
-XMesaContext XMesaCreateContext(XMesaVisual v, XMesaContext share_list,
-				__DRIcontextPrivate *driContextPriv)
+
+GLboolean XMesaCreateContext( Display *dpy, GLvisual *mesaVis,
+                              __DRIcontextPrivate *driContextPriv )
 {
-   GLcontext *ctx;
-   XMesaContext c;
+   GLcontext *ctx = driContextPriv->mesaContext;
    i810ContextPtr imesa;
    __DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
    i810ScreenPrivate *i810Screen = (i810ScreenPrivate *)sPriv->private;
-   I810SAREAPriv *saPriv=(I810SAREAPriv*)(((char*)sPriv->pSAREA)+
-					  sizeof(XF86DRISAREARec));
-
-   GLcontext *shareCtx = 0;
-
-   c = (XMesaContext)Xmalloc(sizeof(struct xmesa_context));
-   if (!c) {
-      return 0;
-   }
+   drm_i810_sarea_t *saPriv=(drm_i810_sarea_t *)(((char*)sPriv->pSAREA)+
+						 sizeof(XF86DRISAREARec));
 
-   imesa = (i810ContextPtr)Xmalloc(sizeof(i810Context));
+   imesa = (i810ContextPtr)Xcalloc(sizeof(i810Context), 1);
    if (!imesa) {
-      Xfree(c);
-      return 0;
+      return GL_FALSE;
    }
 
-   c->driContextPriv = driContextPriv;
-   c->xm_visual = v;
-   c->xm_buffer = 0; /* Set by MakeCurrent */
-   c->display = v->display;
-   c->private = (void *)imesa;
 
-   if (share_list)
-      shareCtx=((i810ContextPtr)(share_list->private))->glCtx;
+   /* Set the maximum texture size small enough that we can guarentee
+    * that both texture units can bind a maximal texture and have them
+    * in memory at once.
+    */
+   if (i810Screen->textureSize < 2*1024*1024) {
+      ctx->Const.MaxTextureLevels = 9;
+      ctx->Const.MaxTextureSize = 1<<8;
+   } else if (i810Screen->textureSize < 8*1024*1024) {
+      ctx->Const.MaxTextureLevels = 10;
+      ctx->Const.MaxTextureSize = 1<<9;     
+   } else {
+      ctx->Const.MaxTextureLevels = 11;
+      ctx->Const.MaxTextureSize = 1<<10;
+   }      
 
-   ctx = imesa->glCtx = gl_create_context(v->gl_visual, shareCtx, 
-					  (void*)imesa, GL_TRUE);
 
    /* Dri stuff
     */
-   imesa->display = v->display;
+   imesa->display = dpy;
    imesa->hHWContext = driContextPriv->hHWContext;
    imesa->driFd = sPriv->fd;
    imesa->driHwLock = &sPriv->pSAREA->lock;
@@ -295,11 +324,8 @@
    imesa->i810Screen = i810Screen;
    imesa->driScreen = sPriv;
    imesa->sarea = saPriv;
+   imesa->glBuffer = NULL;
 
-   imesa->glBuffer = gl_create_framebuffer(v->gl_visual);
-
-   imesa->needClip=1;
-
    imesa->texHeap = mmInit( 0, i810Screen->textureSize );
 
 
@@ -315,17 +341,21 @@
    imesa->TextureMode = ctx->Texture.Unit[0].EnvMode;
    imesa->CurrentTexObj[0] = 0;
    imesa->CurrentTexObj[1] = 0;
+
+   ctx->DriverCtx = (void *) imesa;
+   imesa->glCtx = ctx;
    
    i810DDExtensionsInit( ctx );
 
    i810DDInitStateFuncs( ctx );
    i810DDInitTextureFuncs( ctx );
    i810DDInitSpanFuncs( ctx );
-   i810DDInitDepthFuncs( ctx );
    i810DDInitDriverFuncs( ctx );
+   i810DDInitIoctlFuncs( ctx );
 
    ctx->Driver.TriangleCaps = (DD_TRI_CULL|
 			       DD_TRI_LIGHT_TWOSIDE|
+			       DD_TRI_STIPPLE|
 			       DD_TRI_OFFSET);
 
    /* Ask mesa to clip fog coordinates for us.
@@ -345,20 +375,19 @@
 				      ctx->NrPipelineStages);
 
    i810DDInitState( imesa );
+
+   driContextPriv->driverPrivate = (void *) imesa;
 
-   return c;
+   return GL_TRUE;
 }
 
-void XMesaDestroyContext(XMesaContext c)
+void XMesaDestroyContext(__DRIcontextPrivate *driContextPriv)
 {
-   i810ContextPtr imesa = (i810ContextPtr) c->private;
+   i810ContextPtr imesa = (i810ContextPtr) driContextPriv->driverPrivate;
 
    if (imesa) {
       i810TextureObjectPtr next_t, t;
 
-      gl_destroy_context(imesa->glCtx);
-      gl_destroy_framebuffer(imesa->glBuffer);
-
       foreach_s (t, next_t, &(imesa->TexObjList))
 	 i810DestroyTexObj(imesa, t);
 
@@ -366,58 +395,53 @@
 	 i810DestroyTexObj(imesa, t);
 
       Xfree(imesa);
-
-      c->private = 0;
    }
 }
 
-XMesaBuffer XMesaCreateWindowBuffer(XMesaVisual v, XMesaWindow w,
-				    __DRIdrawablePrivate *driDrawPriv)
-{
-  return (XMesaBuffer)1;
+GLframebuffer *XMesaCreateWindowBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
+{
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                mesaVis->AlphaBits > 0
+                                );
 }
 
-XMesaBuffer XMesaCreatePixmapBuffer(XMesaVisual v, XMesaPixmap p,
-				    XMesaColormap c, 
-				    __DRIdrawablePrivate *driDrawPriv)
-{
-  return (XMesaBuffer)1;
-}
 
-void XMesaDestroyBuffer(XMesaBuffer b)
-{
+GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
+{
+#if 0
+   /* Different drivers may have different combinations of hardware and
+    * software ancillary buffers.
+    */
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                mesaVis->AlphaBits > 0
+                                );
+#else
+   return NULL;  /* not implemented yet */
+#endif
 }
+
 
-void XMesaSwapBuffers(XMesaBuffer bogus)
+void XMesaSwapBuffers(__DRIdrawablePrivate *driDrawPriv)
 {
+   /* XXX should do swap according to the buffer, not the context! */
    i810ContextPtr imesa = i810Ctx; 
 
    FLUSH_VB( imesa->glCtx, "swap buffers" );
    i810SwapBuffers(imesa);
 }
 
-static void i810InitClipRects( i810ContextPtr imesa )
-{
-   switch (imesa->numClipRects) {
-   case 0:
-      imesa->ClipSetup[I810_CLIPREG_SC] = ( GFX_OP_SCISSOR |
-					    SC_UPDATE_SCISSOR );
-      imesa->ClipSetup[I810_CLIPREG_SCI1] = 0;
-      imesa->ClipSetup[I810_CLIPREG_SCI2] = 0;
-      imesa->needClip = 0;
-      imesa->dirty |= I810_EMIT_CLIPRECT;
-      break;
-   case 1:
-      imesa->needClip = 0;
-      i810EmitScissorValues( imesa, 0, 0 );
-      imesa->dirty |= I810_EMIT_CLIPRECT;
-      break;
-   default:
-      imesa->needClip=1;
-      break;
-   }
-}
-
 
 
 void i810XMesaSetFrontClipRects( i810ContextPtr imesa )
@@ -426,12 +450,12 @@
 
    imesa->numClipRects = dPriv->numClipRects;
    imesa->pClipRects = dPriv->pClipRects;
+   imesa->dirty |= I810_UPLOAD_CLIPRECTS;
    imesa->drawX = dPriv->x;
    imesa->drawY = dPriv->y;
 
-   imesa->drawOffset = imesa->i810Screen->fbOffset;
+   imesa->drawMap = (char *)imesa->driScreen->pFB;
    i810EmitDrawingRectangle( imesa );
-   i810InitClipRects( imesa );
 }
 
 
@@ -440,7 +464,7 @@
    __DRIdrawablePrivate *dPriv = imesa->driDrawable;
    int i;
 
-   if (dPriv->numAuxClipRects == 0) 
+   if (dPriv->numBackClipRects == 0) 
    {
       if (I810_DEBUG & DEBUG_VERBOSE_DRI)
 	 fprintf(stderr, "FRONT_CLIPRECTS, %d rects\n", 
@@ -452,18 +476,18 @@
       imesa->drawY = dPriv->y;
    } else {
       if (I810_DEBUG & DEBUG_VERBOSE_DRI)
-	 fprintf(stderr, "AUX_RECTS, %d rects\n", 
-		 dPriv->numAuxClipRects);
+	 fprintf(stderr, "BACK_RECTS, %d rects\n", 
+		 dPriv->numBackClipRects);
 
-      imesa->numClipRects = dPriv->numAuxClipRects;
-      imesa->pClipRects = dPriv->pAuxClipRects;
-      imesa->drawX = dPriv->auxX;
-      imesa->drawY = dPriv->auxY;
+      imesa->numClipRects = dPriv->numBackClipRects;
+      imesa->pClipRects = dPriv->pBackClipRects;
+      imesa->drawX = dPriv->backX;
+      imesa->drawY = dPriv->backY;
    }
 
-   imesa->drawOffset = imesa->i810Screen->backOffset;
+   imesa->drawMap = imesa->i810Screen->back.map;
    i810EmitDrawingRectangle( imesa );
-   i810InitClipRects( imesa );
+   imesa->dirty |= I810_UPLOAD_CLIPRECTS;
 
    if (I810_DEBUG & DEBUG_VERBOSE_DRI)
       for (i = 0 ; i < imesa->numClipRects ; i++) 
@@ -478,6 +502,9 @@
 
 static void i810XMesaWindowMoved( i810ContextPtr imesa ) 
 {
+   if (0)
+      fprintf(stderr, "i810XMesaWindowMoved\n\n");
+
    switch (imesa->glCtx->Color.DriverDrawBuffer) {
    case GL_FRONT_LEFT:
       i810XMesaSetFrontClipRects( imesa );
@@ -486,38 +513,43 @@
       i810XMesaSetBackClipRects( imesa );
       break;
    default:
-      fprintf(stderr, "fallback buffer\n");
+      /*fprintf(stderr, "fallback buffer\n");*/
       break;
    }
-
 }
 
 
-/* This looks buggy to me - the 'b' variable isn't used anywhere...
- * Hmm - It seems that the drawable is already hooked in to
- * driDrawablePriv.  
- */
-GLboolean XMesaMakeCurrent(XMesaContext c, XMesaBuffer b)
+GLboolean XMesaUnbindContext(__DRIcontextPrivate *driContextPriv)
 {
-
-   if (c->private==(void *)i810Ctx) return GL_TRUE;
+   i810ContextPtr i810 = (i810ContextPtr) driContextPriv->driverPrivate;
+   if (i810)
+      i810->dirty = ~0;
 
-   if (c) {
-      __DRIdrawablePrivate *dPriv = c->driContextPriv->driDrawablePriv;
-
-      i810Ctx = (i810ContextPtr)c->private;
+   return GL_TRUE;
+}
 
-      gl_make_current(i810Ctx->glCtx, i810Ctx->glBuffer);
 
-      i810Ctx->driDrawable = dPriv;
+GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
+			   __DRIdrawablePrivate *driDrawPriv,
+			   __DRIdrawablePrivate *driReadPriv)
+{
+   if (driContextPriv) {
+      i810Ctx = (i810ContextPtr) driContextPriv->driverPrivate;
+      
+      gl_make_current2(i810Ctx->glCtx, driDrawPriv->mesaBuffer, 
+		       driReadPriv->mesaBuffer);
+      
+      
+      i810Ctx->driDrawable = driDrawPriv;
       i810Ctx->dirty = ~0;
-   
+      
       i810XMesaWindowMoved( i810Ctx );
-
+      
       if (!i810Ctx->glCtx->Viewport.Width)
-	 gl_Viewport(i810Ctx->glCtx, 0, 0, dPriv->w, dPriv->h);
-
-   } else {
+	 gl_Viewport(i810Ctx->glCtx, 0, 0, driDrawPriv->w, driDrawPriv->h);
+   }
+   else 
+   {
       gl_make_current(0,0);
       i810Ctx = NULL;
    }
@@ -525,15 +557,26 @@
 }
 
 
-void i810XMesaUpdateState( i810ContextPtr imesa ) 
+void i810GetLock( i810ContextPtr imesa, GLuint flags ) 
 {
    __DRIdrawablePrivate *dPriv = imesa->driDrawable;
    __DRIscreenPrivate *sPriv = imesa->driScreen;
-   I810SAREAPriv *sarea = imesa->sarea;
+   drm_i810_sarea_t *sarea = imesa->sarea;
    int me = imesa->hHWContext;
    int stamp = dPriv->lastStamp; 
 
 
+   if (0) fprintf(stderr, ".\n");
+
+   /* We know there has been contention.
+    */
+   drmGetLock(imesa->driFd, imesa->hHWContext, flags);	
+
+
+   /* Note contention for throttling hint
+    */
+   imesa->any_contend = 1;
+
    /* If the window moved, may need to set a new cliprect now.
     *
     * NOTE: This releases and regains the hw lock, so all state
@@ -541,26 +584,24 @@
     */
    XMESA_VALIDATE_DRAWABLE_INFO(imesa->display, sPriv, dPriv);		
 
-   i810glx.LpRing.synced = 0;
 
-   /* If another client has touched the ringbuffer, need to update 
-    * where we think the pointers are:
-    */
-   if (sarea->ringOwner != me) {
-      i810glx.c_ringlost++;
-      imesa->dirty |= I810_REFRESH_RING;
-   }
-      
+   if (0)
+   fprintf(stderr, "i810GetLock, last enque: %d last dispatch: %d\n",
+	   sarea->last_enqueue, 
+	   sarea->last_dispatch);
+
    /* If we lost context, need to dump all registers to hardware.
     * Note that we don't care about 2d contexts, even if they perform
     * accelerated commands, so the DRI locking in the X server is even
     * more broken than usual.
     */
    if (sarea->ctxOwner != me) {
-      i810glx.c_ctxlost++;
-      imesa->dirty |= I810_UPLOAD_CTX;
-      imesa->dirty |= I810_EMIT_CLIPRECT;
-      imesa->dirty |= I810_UPLOAD_BUFFERS;
+      imesa->dirty |= (I810_UPLOAD_CTX |
+		       I810_UPLOAD_CLIPRECTS |
+		       I810_UPLOAD_BUFFERS |
+		       I810_UPLOAD_TEX0 |
+		       I810_UPLOAD_TEX1);
+      sarea->ctxOwner = me;
    }
 
    /* Shared texture managment - if another client has played with
@@ -587,23 +628,18 @@
 	 i810ResetGlobalLRU( imesa );
       }
 
+      if (0) fprintf(stderr, "imesa %d sarea %d\n", imesa->texAge, sarea->texAge);
+      imesa->dirty |= I810_UPLOAD_TEX0IMAGE;
+      imesa->dirty |= I810_UPLOAD_TEX1IMAGE;
       imesa->texAge = sarea->texAge;
-      imesa->dirty |= I810_UPLOAD_TEX0IMAGE | I810_UPLOAD_TEX1IMAGE;
    }
 
    
    if (dPriv->lastStamp != stamp)
       i810XMesaWindowMoved( imesa );
-
-   sarea->ctxOwner=me;
-   sarea->ringOwner=me;
-
 
-   _I810RefreshLpRing(imesa, 0);  
-
-   if (imesa->dirty) 
-       i810EmitHwStateLocked( imesa );  
-
+   
+   sarea->last_quiescent = -1;	/* just kill it for now */
 }
 
 
Index: xc/lib/GL/mesa/src/drv/i810/i810clear.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810clear.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810clear.c:removed
--- xc/lib/GL/mesa/src/drv/i810/i810clear.c:1.1	Fri Feb 11 09:25:28 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810clear.c	Sat Jul  1 20:44:35 2000
@@ -1,193 +0,0 @@
-
-
-#include "types.h"
-#include "vbrender.h"
-#include "i810log.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "mm.h"
-#include "i810lib.h"
-#include "i810dd.h"
-#include "i810clear.h"
-#include "i810state.h"
-#include "i810tris.h"
-
-
-
-/* Clear the depthbuffer.  Always uses the auxillary cliprects and
- * origin from 'dPriv'.
- */
-static void i810_clear_depthbuffer( GLcontext *ctx, 
-				    GLboolean all,
-				    GLint cx, GLint cy, 
-				    GLint cwidth, GLint cheight ) 
-{
-   i810ContextPtr imesa = I810_CONTEXT( ctx );
-   GLuint zval = (GLuint) (ctx->Depth.Clear * DEPTH_SCALE);
-   i810ScreenPrivate *i810Screen = imesa->i810Screen;
-   __DRIdrawablePrivate *dPriv = imesa->driDrawable;
-
-/*     int _nc = dPriv->numAuxClipRects; */
-/*     XF86DRIClipRectPtr box = dPriv->pAuxClipRects; */
-
-   int _nc = imesa->numClipRects;
-   XF86DRIClipRectPtr box = imesa->pClipRects;
-
-   cy = dPriv->h-cy-cheight;
-   cx += dPriv->auxX;
-   cy += dPriv->auxY;
-         
-   while (_nc--) {	 
-      GLint x = box[_nc].x1;
-      GLint y = box[_nc].y1;
-      GLint width = box[_nc].x2 - x;
-      GLint height = box[_nc].y2 - y;
-
-      if (!all) {
-	 if (x < cx) width -= cx - x, x = cx; 
-	 if (y < cy) height -= cy - y, y = cy;
-	 if (x + width > cx + cwidth) width = cx + cwidth - x;
-	 if (y + height > cy + cheight) height = cy + cheight - y;
-	 if (width <= 0) continue;
-	 if (height <= 0) continue;
-      }
-
-      if (I810_DEBUG&DEBUG_VERBOSE_2D)
-	 fprintf(stderr, "clear depth rect %d,%d %dx%d\n", 
-		 (int) x, (int) y, (int) width, (int) height);
-
-      {
-	 int start = (i810Screen->depthOffset + 
-		      y * i810Screen->auxPitch + 
-		      x * 2);
-	    
-	 BEGIN_BATCH(imesa, 6);
-   
-	 OUT_BATCH( BR00_BITBLT_CLIENT | BR00_OP_COLOR_BLT | 0x3 );
-	 OUT_BATCH( BR13_SOLID_PATTERN | 
-		    (0xF0 << 16) |
-		    i810Screen->auxPitch );
-	 OUT_BATCH( (height << 16) | (width * 2));
-	 OUT_BATCH( start );
-	 OUT_BATCH( zval );
-	 OUT_BATCH( 0 );
-
-	 ADVANCE_BATCH();   
-      }
-   }
-}
-
-
-/* Clear the current drawbuffer.  Checks 'imesa' to determine which set of
- * cliprects and origin to use.
- */
-static void i810_clear_colorbuffer( GLcontext *ctx, 
-				    GLboolean all,
-				    GLint cx, GLint cy, 
-				    GLint cwidth, GLint cheight ) 
-{
-   i810ContextPtr imesa = I810_CONTEXT( ctx );
-   GLushort c = imesa->ClearColor;
-   i810ScreenPrivate *i810Screen = imesa->i810Screen;
-   __DRIdrawablePrivate *dPriv = imesa->driDrawable;
-
-   int _nc = imesa->numClipRects;
-   XF86DRIClipRectPtr box = imesa->pClipRects;
-
-   cy = dPriv->h-cy-cheight;
-   cx += imesa->drawX;
-   cy += imesa->drawY;
-         
-   while (_nc--) {	 
-      GLint x = box[_nc].x1;
-      GLint y = box[_nc].y1;
-      GLint width = box[_nc].x2 - x;
-      GLint height = box[_nc].y2 - y;
-
-      if (!all) {
-	 if (x < cx) width -= cx - x, x = cx; 
-	 if (y < cy) height -= cy - y, y = cy;
-	 if (x + width > cx + cwidth) width = cx + cwidth - x;
-	 if (y + height > cy + cheight) height = cy + cheight - y;
-	 if (width <= 0) continue;
-	 if (height <= 0) continue;
-      }
-
-      if (I810_DEBUG&DEBUG_VERBOSE_2D)
-	 fprintf(stderr, "clear color rect %d,%d %dx%d\n", 
-		 (int) x, (int) y, (int) width, (int) height);
-
-
-      {
-	 int start = (imesa->drawOffset +  
-		      y * i810Screen->auxPitch + 
-		      x * i810Screen->cpp);
-	    
-	 BEGIN_BATCH( imesa, 6 );
-	    
-	 OUT_BATCH( BR00_BITBLT_CLIENT | BR00_OP_COLOR_BLT | 0x3 );
-	 OUT_BATCH( BR13_SOLID_PATTERN | 
-		    (0xF0 << 16) |
-		    i810Screen->auxPitch );
-	 OUT_BATCH( (height << 16) | (width * i810Screen->cpp));
-	 OUT_BATCH( start );
-	 OUT_BATCH( c );
-	 OUT_BATCH( 0 );
-
-	 ADVANCE_BATCH();
-      }
-   }
-}
-
-
-
-
-/*
- * i810Clear
- *
- * Clear the color and/or depth buffers.  If 'all' is GL_TRUE, clear
- * whole buffer, otherwise clear the region defined by the remaining
- * parameters.  
- */
-GLbitfield i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
-		      GLint cx, GLint cy, GLint cwidth, GLint cheight ) 
-{
-   i810ContextPtr imesa = I810_CONTEXT( ctx );
-
-   if (I810_DEBUG&DEBUG_VERBOSE_API)
-      fprintf(stderr, "i810Clear( %d, %d, %d, %d, %d )\n",
-	      (int)mask, (int)cx, (int)cy, (int)cwidth, (int)cheight );
-	
-   LOCK_HARDWARE(imesa);
-
-   {
-      BEGIN_BATCH( imesa, 2 );   
-      OUT_BATCH( INST_PARSER_CLIENT | INST_OP_FLUSH );
-      OUT_BATCH( 0 );
-      ADVANCE_BATCH();      
-   }
-
-   if (mask & GL_COLOR_BUFFER_BIT) {
-      i810_clear_colorbuffer( ctx, all, cx, cy, cwidth, cheight );
-      mask &= ~GL_COLOR_BUFFER_BIT;
-   }
-
-   if ( (mask & GL_DEPTH_BUFFER_BIT) && ctx->Depth.Mask ) {
-      i810_clear_depthbuffer( ctx, all, cx, cy, cwidth, cheight );
-      mask &= ~GL_DEPTH_BUFFER_BIT;
-   }      
-
-   {
-      BEGIN_BATCH( imesa, 2 );   
-      OUT_BATCH( INST_PARSER_CLIENT | INST_OP_FLUSH );
-      OUT_BATCH( 0 );
-      ADVANCE_BATCH();      
-   }
-
-   UNLOCK_HARDWARE( imesa );
-   return mask;
-}
-
Index: xc/lib/GL/mesa/src/drv/i810/i810clear.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810clear.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810clear.h:removed
--- xc/lib/GL/mesa/src/drv/i810/i810clear.h:1.1	Fri Feb 11 09:25:28 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810clear.h	Sat Jul  1 20:44:35 2000
@@ -1,7 +0,0 @@
-#ifndef _I810_CLEAR_H
-#define _I810_CLEAR_H
-
-extern GLbitfield i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
-			    GLint x, GLint y, GLint width, GLint height );
-
-#endif
Index: xc/lib/GL/mesa/src/drv/i810/i810context.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810context.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810context.h:1.3
--- xc/lib/GL/mesa/src/drv/i810/i810context.h:1.1	Fri Feb 11 09:25:28 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810context.h	Mon Jun 19 22:08:40 2000
@@ -28,24 +28,32 @@
 
 typedef struct i810_context_t i810Context;
 typedef struct i810_context_t *i810ContextPtr;
+typedef struct i810_texture_object_t *i810TextureObjectPtr;
 
 #include <X11/Xlibint.h>
 #include "dri_tmm.h"
 #include "dri_mesaint.h"
 #include "dri_mesa.h"
-#include "xmesaP.h"
 
 #include "types.h"
 #include "i810_init.h"
-#include "i810_sarea.h"
+#include "drm.h"
+#include "mm.h"
+#include "i810log.h"
 
 #include "i810tex.h"
 #include "i810vb.h"
 
 
-
-#define I810_FALLBACK_TEXTURE   0x1
-#define I810_FALLBACK_BUFFER    0x2
+/* Reasons to fallback on all primitives.  (see also
+ * imesa->IndirectTriangles).  
+ */
+#define I810_FALLBACK_TEXTURE        0x1
+#define I810_FALLBACK_DRAW_BUFFER    0x2
+#define I810_FALLBACK_READ_BUFFER    0x4
+#define I810_FALLBACK_COLORMASK      0x8  
+#define I810_FALLBACK_STIPPLE        0x10  
+#define I810_FALLBACK_SPECULAR       0x20 
 
 
 
@@ -53,23 +61,23 @@
  */
 #define I810_NEW_TEXTURE 0x1
 
-/* for i810ctx.dirty - manage driver->hw state changes, including
- * lost contexts.
- */
-#define I810_REQUIRE_QUIESCENT 0x1
-#define I810_UPLOAD_TEX0IMAGE  0x2
-#define I810_UPLOAD_TEX1IMAGE  0x4
-#define I810_UPLOAD_CTX        0x8
-#define I810_UPLOAD_BUFFERS    0x10
-#define I810_REFRESH_RING      0x20
-#define I810_EMIT_CLIPRECT     0x40
-
 
 typedef void (*i810_interp_func)( GLfloat t, 
 				  GLfloat *result,
 				  const GLfloat *in,
 				  const GLfloat *out );
-				 
+
+#ifndef PCI_CHIP_I810				 
+#define PCI_CHIP_I810              0x7121
+#define PCI_CHIP_I810_DC100        0x7123
+#define PCI_CHIP_I810_E            0x7125 
+#define PCI_CHIP_I815              0x1132 
+#endif
+
+#define IS_I810(imesa) (imesa->i810Screen->deviceID == PCI_CHIP_I810 ||	\
+			imesa->i810Screen->deviceID == PCI_CHIP_I810_DC100 || \
+			imesa->i810Screen->deviceID == PCI_CHIP_I810_E)
+#define IS_I815(imesa) (imesa->i810Screen->deviceID == PCI_CHIP_I815)
 
 
 struct i810_context_t {
@@ -88,7 +96,6 @@
     */
    GLuint Setup[I810_CTX_SETUP_SIZE];
    GLuint BufferSetup[I810_DEST_SETUP_SIZE];
-   GLuint ClipSetup[I810_CLIP_SETUP_SIZE];
    
 
    /* Support for CVA and the fast paths.
@@ -125,24 +132,38 @@
 
    /* DRI stuff
     */
+   drmBufPtr  vertex_dma_buffer;
+   GLuint vertex_prim;
+
    GLframebuffer *glBuffer;
    
+   /* Two flags to keep track of fallbacks.
+    */
+   GLuint IndirectTriangles;
    GLuint Fallback;
+
+
    GLuint needClip;
 
    /* These refer to the current draw (front vs. back) buffer:
     */
-   int drawOffset;		/* draw buffer address in agp space */
+   char *drawMap;		/* draw buffer address in virtual mem */
+   char *readMap;	
    int drawX;			/* origin of drawable in draw buffer */
    int drawY;
    GLuint numClipRects;		/* cliprects for that buffer */
    XF86DRIClipRectPtr pClipRects;
 
-
    int lastSwap;
+   int secondLastSwap;
    int texAge;
-
-   XF86DRIClipRectRec draw_rect;
+   int ctxAge;
+   int dirtyAge;
+   int any_contend;		/* throttle me harder */
+
+   int scissor;
+   drm_clip_rect_t draw_rect;
+   drm_clip_rect_t scissor_rect;
 
    drmContext hHWContext;
    drmLock *driHwLock;
@@ -152,7 +173,7 @@
    __DRIdrawablePrivate *driDrawable;
    __DRIscreenPrivate *driScreen;
    i810ScreenPrivate *i810Screen; 
-   I810SAREAPriv *sarea;
+   drm_i810_sarea_t *sarea;
 };
 
 
@@ -161,7 +182,7 @@
  */
 #define I810_DEBUG 0   
 #ifndef I810_DEBUG
-/*  #warning "Debugging enabled - expect reduced performance" */
+#warning "Debugging enabled - expect reduced performance"
 extern int I810_DEBUG;
 #endif
 
@@ -176,6 +197,7 @@
 #define DEBUG_VALIDATE_RING  0x800
 #define DEBUG_VERBOSE_LRU    0x1000
 #define DEBUG_VERBOSE_DRI    0x2000
+#define DEBUG_VERBOSE_IOCTL  0x4000
 
 
 
Index: xc/lib/GL/mesa/src/drv/i810/i810dd.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810dd.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810dd.c:1.3
--- xc/lib/GL/mesa/src/drv/i810/i810dd.c:1.1	Fri Feb 11 09:25:28 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810dd.c	Thu Jun 22 09:59:24 2000
@@ -21,18 +21,15 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810dd.c,v 1.3 2000/06/22 16:59:24 tsi Exp $ */
 
-
 #include "types.h"
 #include "vbrender.h"
 
 #include <stdio.h>
 
 #include "mm.h"
-#include "i810lib.h"
-#include "i810clear.h"
 #include "i810dd.h"
-#include "i810depth.h"
 #include "i810log.h"
 #include "i810state.h"
 #include "i810span.h"
@@ -57,9 +54,9 @@
 {
    switch (name) {
    case GL_VENDOR:
-      return "Keith Whitwell, Precision Insight Inc.";
+      return (GLubyte *)"Keith Whitwell, Precision Insight Inc.";
    case GL_RENDERER:
-      return "DRI-I810";
+      return (GLubyte *)"Mesa DRI I810 20000510";
    default:
       return 0;
    }
@@ -100,10 +97,13 @@
    /* The imaging subset of 1.2 isn't supported by any mesa driver.
     */
    gl_extensions_disable( ctx, "ARB_imaging" );
+   gl_extensions_disable( ctx, "GL_EXT_blend_color" );
    gl_extensions_disable( ctx, "GL_EXT_blend_minmax" );
    gl_extensions_disable( ctx, "GL_EXT_blend_logic_op" );
    gl_extensions_disable( ctx, "GL_EXT_blend_subtract" );
    gl_extensions_disable( ctx, "GL_INGR_blend_func_separate" );
+   gl_extensions_disable( ctx, "GL_EXT_texture_lod_bias" );   
+   gl_extensions_disable( ctx, "GL_MESA_resize_buffers" );   
 
 
    if (0) gl_extensions_disable( ctx, "GL_ARB_multitexture" );
@@ -115,19 +115,7 @@
 }
 
 
-static void i810DDFlush( GLcontext *ctx )
-{
-   i810DmaFlush( I810_CONTEXT(ctx) );
-}
 
-static void i810DDFinish( GLcontext *ctx )
-{
-   i810ContextPtr imesa = I810_CONTEXT(ctx);
-   LOCK_HARDWARE( imesa );
-   i810DmaFinish( imesa );
-   UNLOCK_HARDWARE( imesa );
-}
-
 
 void i810DDInitDriverFuncs( GLcontext *ctx )
 {
@@ -138,9 +126,6 @@
    ctx->Driver.UnregisterVB = i810DDUnregisterVB;
    ctx->Driver.Clear = i810Clear;
 
-
-   ctx->Driver.Flush          = i810DDFlush;
-   ctx->Driver.Finish         = i810DDFinish;
 
    ctx->Driver.BuildPrecalcPipeline = i810DDBuildPrecalcPipeline;
 }
Index: xc/lib/GL/mesa/src/drv/i810/i810depth.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810depth.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810depth.c:removed
--- xc/lib/GL/mesa/src/drv/i810/i810depth.c:1.1	Fri Feb 11 09:25:29 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810depth.c	Sat Jul  1 20:44:35 2000
@@ -1,645 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * This file has been modified by Wittawat Yamwong for GLX module.
- */
-
-/*
- * Depth buffer functions
- */
-
-
-#ifdef PC_HEADER
-#include "all.h"
-#else
-#include <stdlib.h>
-#include <string.h>
-#include "context.h"
-#include "i810depth.h"
-#include "types.h"
-#include "mm.h"
-#include "i810lib.h"
-#endif
-
-
-
-/*
- * Return the address of the Z-buffer value for window coordinate (x,y):
- */
-#define Z_SETUP								\
-   i810ContextPtr imesa = I810_CONTEXT(ctx);				\
-   __DRIscreenPrivate *sPriv = imesa->driScreen;			\
-   i810ScreenPrivate *i810Screen = imesa->i810Screen;			\
-   GLdepth *zbstart = (GLdepth *)(sPriv->pFB + i810Screen->depthOffset);\
-   GLint zbpitch = i810Screen->auxPitch
-
-#define Z_ADDRESS( X, Y )  \
-  (zbstart + zbpitch * (Y) + (X))
-
-
-/**********************************************************************/
-/*****                   Depth Testing Functions                  *****/
-/**********************************************************************/
-
-
-/*
- * Depth test horizontal spans of fragments.  These functions are called
- * via ctx->Driver.depth_test_span only.
- *
- * Input:  n - number of pixels in the span
- *         x, y - location of leftmost pixel in span in window coords
- *         z - array [n] of integer depth values
- * In/Out:  mask - array [n] of flags (1=draw pixel, 0=don't draw) 
- * Return:  number of pixels which passed depth test
- */
-
-
-/*
- * glDepthFunc( any ) and glDepthMask( GL_TRUE or GL_FALSE ).
- */
-static GLuint i810_depth_test_span_generic( GLcontext* ctx,
-					    GLuint n, GLint x, GLint y,
-					    const GLdepth z[],
-					    GLubyte mask[] )
-{
-   Z_SETUP;
-   GLdepth *zptr = Z_ADDRESS( x, y );
-   GLubyte *m = mask;
-   GLuint i;
-   GLuint passed = 0;
-
-   LOCK_HARDWARE(imesa);
-
-   /* switch cases ordered from most frequent to less frequent */
-   switch (ctx->Depth.Func) {
-      case GL_LESS:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0; i<n; i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] < *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		     passed++;
-		  }
-		  else {
-		     /* fail */
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0; i<n; i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] < *zptr) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_LEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] <= *zptr) {
-		     *zptr = z[i];
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] <= *zptr) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] >= *zptr) {
-		     *zptr = z[i];
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] >= *zptr) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GREATER:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] > *zptr) {
-		     *zptr = z[i];
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] > *zptr) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_NOTEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] != *zptr) {
-		     *zptr = z[i];
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] != *zptr) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     *m = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_EQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] == *zptr) {
-		     *zptr = z[i];
-		     passed++;
-		  }
-		  else {
-		     *m =0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  if (z[i] == *zptr) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     *m =0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_ALWAYS:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0;i<n;i++,zptr++,m++) {
-	       if (*m) {
-		  *zptr = z[i];
-		  passed++;
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer or mask */
-	    passed = n;
-	 }
-	 break;
-      case GL_NEVER:
-	 for (i=0;i<n;i++) {
-	    mask[i] = 0;
-	 }
-	 break;
-      default:
-   }   
-
-   UNLOCK_HARDWARE(imesa);
-
-   return passed;
-}
-
-
-
-
-
-/*
- * Depth test an array of randomly positioned fragments.
- */
-
-/*
- * glDepthFunc( any ) and glDepthMask( GL_TRUE or GL_FALSE ).
- */
-static void i810_depth_test_pixels_generic( GLcontext* ctx,
-					    GLuint n, 
-					    const GLint x[], 
-					    const GLint y[],
-					    const GLdepth z[], 
-					    GLubyte mask[] )
-{
-   Z_SETUP;
-   register GLdepth *zptr;
-   register GLuint i;
-
-   LOCK_HARDWARE(imesa);
-
-   /* switch cases ordered from most frequent to less frequent */
-   switch (ctx->Depth.Func) {
-      case GL_LESS:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] < *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] < *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_LEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] <= *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] <= *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] >= *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] >= *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GREATER:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] > *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] > *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_NOTEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] != *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] != *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_EQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] == *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  if (z[i] == *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_ALWAYS:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  zptr = Z_ADDRESS(x[i],y[i]);
-		  *zptr = z[i];
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer or mask */
-	 }
-	 break;
-      case GL_NEVER:
-	 /* depth test never passes */
-	 for (i=0;i<n;i++) {
-	    mask[i] = 0;
-	 }
-	 break;
-      default:
-   } 
-   
-   UNLOCK_HARDWARE(imesa);
-}
-
-
-
-
-
-
-/**********************************************************************/
-/*****                      Read Depth Buffer                     *****/
-/**********************************************************************/
-
-
-/*
- * Return a span of depth values from the depth buffer as floats in [0,1].
- * This function is only called through Driver.read_depth_span_float()
- * Input:  n - how many pixels
- *         x,y - location of first pixel
- * Output:  depth - the array of depth values
- */
-static void i810_read_depth_span_float( GLcontext* ctx,
-					GLuint n, GLint x, GLint y, 
-					GLfloat depth[] )
-{
-   Z_SETUP;
-   GLdepth *zptr;
-   GLfloat scale;
-   GLuint i;
-
-   LOCK_HARDWARE(imesa);
-
-   scale = 1.0F / DEPTH_SCALE;
-
-   if (ctx->Buffer->Depth) {
-      zptr = Z_ADDRESS( x, y );
-      for (i=0;i<n;i++) {
-	 depth[i] = (GLfloat) zptr[i] * scale;
-      }
-   }
-   else {
-      for (i=0;i<n;i++) {
-	 depth[i] = 0.0F;
-      }
-   }
-
-   UNLOCK_HARDWARE(imesa);
-}
-
-
-/*
- * Return a span of depth values from the depth buffer as integers in
- * [0,MAX_DEPTH].
- * This function is only called through Driver.read_depth_span_int()
- * Input:  n - how many pixels
- *         x,y - location of first pixel
- * Output:  depth - the array of depth values
- */
-static void i810_read_depth_span_int( GLcontext* ctx,
-				      GLuint n, GLint x, GLint y, 
-				      GLdepth depth[] )
-{
-   Z_SETUP;
-
-   LOCK_HARDWARE(imesa);
-      
-   if (ctx->Buffer->Depth) {
-      GLdepth *zptr = Z_ADDRESS( x, y );
-      MEMCPY( depth, zptr, n * sizeof(GLdepth) );
-   }
-   else {
-      GLuint i;
-      for (i=0;i<n;i++) {
-	 depth[i] = 0;
-      }
-   }
-
-   UNLOCK_HARDWARE(imesa);
-}
-
-static void i810_alloc_depth_buffer( GLcontext *ctx )
-{
-}
-
-
-void i810DDInitDepthFuncs( GLcontext *ctx )
-{
-   ctx->Driver.AllocDepthBuffer   = i810_alloc_depth_buffer;
-   ctx->Driver.ReadDepthSpanFloat = i810_read_depth_span_float;
-   ctx->Driver.ReadDepthSpanInt = i810_read_depth_span_int;
-   ctx->Driver.DepthTestSpan = i810_depth_test_span_generic;
-   ctx->Driver.DepthTestPixels = i810_depth_test_pixels_generic;
-}
Index: xc/lib/GL/mesa/src/drv/i810/i810depth.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810depth.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810depth.h:removed
--- xc/lib/GL/mesa/src/drv/i810/i810depth.h:1.1	Fri Feb 11 09:25:29 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810depth.h	Sat Jul  1 20:44:35 2000
@@ -1,37 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * This file has been modified by Wittawat Yamwong for GLX module.
- */
-
-
-#ifndef I810DEPTH_INC
-#define I810DEPTH_INC
-
-#include "types.h"
-
-extern void i810DDInitDepthFuncs( GLcontext *ctx );
-
-#endif
Index: xc/lib/GL/mesa/src/drv/i810/i810dma.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810dma.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810dma.c:removed
--- xc/lib/GL/mesa/src/drv/i810/i810dma.c:1.1	Fri Feb 11 09:25:29 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810dma.c	Sat Jul  1 20:44:35 2000
@@ -1,105 +0,0 @@
-/* -*- mode: C; c-basic-offset:8 -*- */
-/*
- * GLX Hardware Device Driver for Intel i810
- * Copyright (C) 1999 Keith Whitwell
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#include "mm.h"
-#include "i810dd.h"
-#include "i810lib.h"
-#include "i810state.h"
-#include "i810dma.h"
-
-
-
-
-
-#if 0
-static void mga_vertex_dma_ioctl(mgaContextPtr mmesa)
-{
-   int retcode;
-   int size = MGA_DMA_BUF_SZ;
-   drmDMAReq dma;
-   drmBufPtr buf = mmesa->dma_buffer;
-
-   dma.context = mmesa->hHWContext;
-   dma.send_count = 1;
-   dma.send_list = &buf->idx;
-   dma.send_sizes = &size;
-   dma.flags = DRM_DMA_WAIT;
-   dma.request_count = 0;
-   dma.request_size = 0;
-   dma.request_list = 0;
-   dma.request_sizes = 0;
-
-   if ((retcode = drmDMA(mmesa->driFd, &dma))) {
-      printf("send iload retcode = %d\n", retcode);
-      exit(1);
-   }
-}
-
-
-
-void i810FlushVerticesLocked( i810ContextPtr imesa )
-{
-	
-}
-
-
-void i810FlushVertices( i810ContextPtr imesa ) {
-	LOCK_HARDWARE( imesa );
-	i810FlushVerticesLocked( imesa );
-	UNLOCK_HARDWARE( imesa );
-}
-
-#endif
-
-
-/*
- * i810DmaFinish
- */
-void i810DmaFinish( i810ContextPtr imesa ) {
-#if I810_USE_BATCH
-#else
-	_I810Sync( imesa );
-#endif
-}
-
-
-
-void i810DmaFlush( i810ContextPtr imesa ) {
-#if I810_USE_BATCH
-#else
-#endif
-}
-
Index: xc/lib/GL/mesa/src/drv/i810/i810dma.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810dma.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810dma.h:removed
--- xc/lib/GL/mesa/src/drv/i810/i810dma.h:1.1	Fri Feb 11 09:25:30 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810dma.h	Sat Jul  1 20:44:35 2000
@@ -1,186 +0,0 @@
-/*
-  GLX Hardware Device Driver for Intel i810
-  Copyright (C) 1999 Keith Whitwell <keithw@precisioninsight.com>
-  
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  any later version.
-  
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-  
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
- original by Jeff Hartmann <slicer@ionet.net>
-  6/16/99: rewrite by John Carmack <johnc@idsoftware.com>
-  Oct 99: port to i180 by Keith Whitwell <keithw@precisioninsight.com>
-*/
-
-#ifndef I810DMA_H
-#define I810DMA_H
-
-#include "i810lib.h"
-#include "mm.h"
-
-/* a flush command will guarantee that all data added to the dma buffer
-is on its way to the card, and will eventually complete with no more
-intervention.
-*/
-void i810DmaFlush( i810ContextPtr imesa );
-
-/* the overflow function is called when a block can't be allocated
-in the current dma buffer.  It flushes the current buffer and
-records some information */
-void i810DmaOverflow(int newDwords);
-
-/* a finish command will guarantee that all dma commands have actually
-been consumed by the card.  Note that there may still be a couple primitives
-that have not yet been executed out of the internal FIFO, so this does not
-guarantee that the drawing engine is idle. */
-void i810DmaFinish( i810ContextPtr imesa );
-
-
-
-typedef struct {
-   unsigned long Start;
-   unsigned long End;
-   unsigned long Size;
-} I810MemRange;
-
-
-
-typedef struct i810_batch_buffer {
-   I810MemRange mem;
-   char *virtual_start;
-   int head;
-   int space;
-   int additional_space;
-   int texture_age;
-} i810BatchBuffer;
-
-
-
-#define I810_USE_BATCH 0
-#if I810_USE_BATCH
-
-#define BEGIN_BATCH( imesa, n )						\
-   unsigned int outbatch;						\
-   volatile char *virt;							\
-   if (I810_DEBUG & DEBUG_VERBOSE_RING)					\
-      fprintf(stderr,							\
-      "BEGIN_BATCH(%d) in %s\n"						\
-      "(spc left %d/%ld, head %x vstart %p start %lx)\n",		\
-      n, __FUNCTION__, i810glx.dma_buffer->space,			\
-      i810glx.dma_buffer->mem.Size - i810glx.dma_buffer->head,		\
-      i810glx.dma_buffer->head,						\
-      i810glx.dma_buffer->virtual_start,				\
-      i810glx.dma_buffer->mem.Start );					\
-   if (i810glx.dma_buffer->space < n*4)					\
-       i810DmaOverflow(n);						\
-   outbatch = i810glx.dma_buffer->head;					\
-   virt = i810glx.dma_buffer->virtual_start;			
-
-
-#define OUT_BATCH(val) {					\
-   *(volatile unsigned int *)(virt + outbatch) = val;		\
-   if (I810_DEBUG & DEBUG_VERBOSE_RING)				\
-      fprintf(stderr, "OUT_BATCH %x: %x\n", (int)(outbatch/4), (int)(val));	\
-   outbatch += 4;						\
-}
-   
-
-#define ADVANCE_BATCH() {						\
-   if (I810_DEBUG & DEBUG_VERBOSE_RING)					\
-      fprintf(stderr, "ADVANCE_BATCH(%f) in %s\n",			\
-                  (outbatch - i810glx.dma_buffer->head) / 4.0,		\
-                  __FUNCTION__);					\
-   i810glx.dma_buffer->space -= outbatch - i810glx.dma_buffer->head;	\
-   i810glx.dma_buffer->head = outbatch;					\
-}
-
-#define FINISH_PRIM()
-
-#else
-
-
-/* As an alternate path to dma, we can export the registers (and hence
- * ringbuffer) to the client.  For security we should alloc these
- * things in agp memory which isn't exported to the client.  But then
- * again, the client could blit over such things if it wanted to hang
- * the system.
- *
- * Malicious clients aren't really delt with by the DRI.
- */
-
-
-extern void _I810RefreshLpRing( i810ContextPtr imesa, int update );
-extern int _I810WaitLpRing( i810ContextPtr imesa, int n, int timeout_usec );
-extern int _I810Sync( i810ContextPtr imesa );
-
-
-#define OUT_RING(n) {					\
-   if (I810_DEBUG & DEBUG_VERBOSE_RING)			\
-      fprintf(stderr, "OUT_RING %x: %x\n", outring, (int)(n));	\
-   if (!(I810_DEBUG & DEBUG_NO_OUTRING)) {		\
-      *(volatile unsigned int *)(virt + outring) = n;	\
-      outring += 4;					\
-      outring &= ringmask;				\
-   }							\
-}
-
-#define ADVANCE_LP_RING() {			\
-    i810glx.LpRing.tail = outring;		\
-    OUTREG(LP_RING + RING_TAIL, outring);	\
-}
-
-#define BEGIN_LP_RING(imesa, n)						\
-   unsigned int outring, ringmask;					\
-   volatile char *virt;							\
-   if ((I810_DEBUG&DEBUG_ALWAYS_SYNC) && n>2) _I810Sync( imesa );	\
-   if (i810glx.LpRing.space < n*4) _I810WaitLpRing( imesa, n*4, 0);	\
-   i810glx.LpRing.space -= n*4;						\
-   if (I810_DEBUG & DEBUG_VERBOSE_RING) 				\
-      fprintf(stderr, "BEGIN_LP_RING %d in %s\n", n, __FUNCTION__);	\
-   if (I810_DEBUG & DEBUG_VALIDATE_RING) { 				\
-      CARD32 tail = INREG(LP_RING+RING_TAIL);				\
-      if (tail != i810glx.LpRing.tail) {				\
-	 fprintf(stderr, "tail %x pI810->LpRing.tail %x\n",		\
-		    (int) tail, (int) i810glx.LpRing.tail);				\
-         exit(1);							\
-      }									\
-   }									\
-   i810glx.LpRing.synced = 0;						\
-   outring = i810glx.LpRing.tail;					\
-   ringmask = i810glx.LpRing.tail_mask;					\
-   virt = i810glx.LpRing.virtual_start;			
-
-
-#define EXTRAAA \
-
-#define INREG(addr)         *(volatile CARD32 *)(i810glx.MMIOBase + (addr))
-#define INREG16(addr)       *(volatile CARD16 *)(i810glx.MMIOBase + (addr))
-#define INREG8(addr)        *(volatile CARD8  *)(i810glx.MMIOBase + (addr))
-
-#define OUTREG(addr, val) do {					\
-   if (I810_DEBUG&DEBUG_VERBOSE_OUTREG)				\
-      fprintf(stderr, "OUTREG(%x, %x)\n", addr, val);		\
-   if (!(I810_DEBUG&DEBUG_NO_OUTREG))				\
-      *(volatile CARD32 *)(i810glx.MMIOBase + (addr)) = (val);	\
-} while (0)
-
-
-#define BEGIN_BATCH(imesa, n) BEGIN_LP_RING(imesa, n)
-#define ADVANCE_BATCH() ADVANCE_LP_RING()
-#define OUT_BATCH(val) OUT_RING(val)
-#define FINISH_PRIM() OUTREG(LP_RING + RING_TAIL, i810glx.LpRing.tail)
-
-#endif
-
-
-
-#endif
Index: xc/lib/GL/mesa/src/drv/i810/i810fastpath.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810fastpath.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810fastpath.c:1.2
--- xc/lib/GL/mesa/src/drv/i810/i810fastpath.c:1.1	Fri Feb 11 09:25:30 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810fastpath.c	Fri Jun 16 17:02:59 2000
@@ -116,14 +116,10 @@
    if (imesa->new_state)
       i810DDUpdateHwState( ctx );
 
-   BEGIN_CLIP_LOOP(imesa) 
-      {
-	 do {
-	    func( VB, 0, nr, 0 );
-	 } while (ctx->Driver.MultipassFunc &&
-		  ctx->Driver.MultipassFunc( VB, ++p ));
-      }
-   END_CLIP_LOOP(imesa);
+   do {
+      func( VB, 0, nr, 0 );
+   } while (ctx->Driver.MultipassFunc &&
+	    ctx->Driver.MultipassFunc( VB, ++p ));
 }
 
 
Index: xc/lib/GL/mesa/src/drv/i810/i810ioctl.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/i810/i810ioctl.c:1.1
--- /dev/null	Sat Jul  1 20:44:35 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810ioctl.c	Fri Jun 16 17:02:59 2000
@@ -0,0 +1,477 @@
+#include <stdio.h>
+#include <unistd.h>
+
+
+#include "types.h"
+#include "pb.h"
+#include "dd.h"
+
+#include "mm.h"
+#include "i810context.h"
+#include "i810log.h"
+#include "i810ioctl.h"
+
+#include "drm.h"
+#include <sys/ioctl.h>
+
+static drmBufPtr i810_get_buffer_ioctl( i810ContextPtr imesa )
+{
+   drm_i810_dma_t dma;
+   drmBufPtr buf;
+   int retcode;
+   
+   if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr,  "Getting dma buffer\n");
+
+   while (1) {
+      retcode = ioctl(imesa->driFd, DRM_IOCTL_I810_GETBUF, &dma);
+
+      if (dma.granted == 1 && retcode == 0) 
+	 break;
+
+      if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "Retcode : %d, granted : %d\n", retcode, dma.granted);
+
+      ioctl(imesa->driFd, DRM_IOCTL_I810_FLUSH);
+   }
+
+   if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, 
+	      "imesa->i810Screen->bufs->list : %p, "
+	      "dma.request_idx : %d\n", 
+	      imesa->i810Screen->bufs->list, dma.request_idx);
+
+   buf = &(imesa->i810Screen->bufs->list[dma.request_idx]);
+   buf->idx = dma.request_idx;
+   buf->used = 0;
+   buf->total = dma.request_size;
+   buf->address = (drmAddress)dma.virtual;
+   return buf;
+}
+
+
+
+#define DEPTH_SCALE ((1<<16)-1)
+
+GLbitfield i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
+		      GLint cx, GLint cy, GLint cw, GLint ch ) 
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   __DRIdrawablePrivate *dPriv = imesa->driDrawable;
+   const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
+   drm_i810_clear_t clear;
+   int i;
+
+   clear.flags = 0;
+   clear.clear_color = imesa->ClearColor;
+   clear.clear_depth = (GLuint) (ctx->Depth.Clear * DEPTH_SCALE);
+
+   FLUSH_BATCH( imesa );
+	
+   if ((mask & DD_FRONT_LEFT_BIT) && colorMask == ~0) {
+      clear.flags |= I810_FRONT;
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
+
+   if ((mask & DD_BACK_LEFT_BIT) && colorMask == ~0) {
+      clear.flags |= I810_BACK;
+      mask &= ~DD_BACK_LEFT_BIT;
+   }
+
+   if ((mask & DD_DEPTH_BIT) && ctx->Depth.Mask) {
+      clear.flags |= I810_DEPTH;
+      mask &= ~DD_DEPTH_BIT;
+   }
+
+   if (!clear.flags)
+      return mask;
+
+   LOCK_HARDWARE( imesa );
+
+   /* flip top to bottom */
+   cy = dPriv->h-cy-ch;
+   cx += imesa->drawX;
+   cy += imesa->drawY;
+
+   if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "Clear, bufs %x nbox %d\n", 
+	      (int)clear.flags, (int)imesa->numClipRects);
+
+   for (i = 0 ; i < imesa->numClipRects ; ) 
+   { 	 
+      int nr = MIN2(i + I810_NR_SAREA_CLIPRECTS, imesa->numClipRects);
+      XF86DRIClipRectRec *box = imesa->pClipRects;	 
+      drm_clip_rect_t *b = imesa->sarea->boxes;
+      int n = 0;
+
+      if (!all) {
+	 for ( ; i < nr ; i++) {
+	    GLint x = box[i].x1;
+	    GLint y = box[i].y1;
+	    GLint w = box[i].x2 - x;
+	    GLint h = box[i].y2 - y;
+
+	    if (x < cx) w -= cx - x, x = cx; 
+	    if (y < cy) h -= cy - y, y = cy;
+	    if (x + w > cx + cw) w = cx + cw - x;
+	    if (y + h > cy + ch) h = cy + ch - y;
+	    if (w <= 0) continue;
+	    if (h <= 0) continue;
+
+	    b->x1 = x;
+	    b->y1 = y;
+	    b->x2 = x + w;
+	    b->y2 = y + h;
+	    b++;
+	    n++;
+	 }
+      } else {
+	 for ( ; i < nr ; i++) {
+	    *b++ = *(drm_clip_rect_t *)&box[i];
+	    n++;
+	 }
+      }
+
+      imesa->sarea->nbox = n;
+      ioctl(imesa->driFd, DRM_IOCTL_I810_CLEAR, &clear);
+   }
+
+   UNLOCK_HARDWARE( imesa );
+   imesa->dirty |= I810_UPLOAD_CLIPRECTS;
+
+   return mask;
+}
+
+
+
+
+/*
+ * Copy the back buffer to the front buffer. 
+ */
+void i810SwapBuffers( i810ContextPtr imesa ) 
+{
+   __DRIdrawablePrivate *dPriv = imesa->driDrawable;
+   XF86DRIClipRectPtr pbox;
+   int nbox;
+   int i;
+   int tmp;
+
+   FLUSH_BATCH( imesa );
+   LOCK_HARDWARE( imesa );
+   
+   pbox = dPriv->pClipRects;
+   nbox = dPriv->numClipRects;
+
+   for (i = 0 ; i < nbox ; )
+   {
+      int nr = MIN2(i + I810_NR_SAREA_CLIPRECTS, dPriv->numClipRects);
+      XF86DRIClipRectRec *b = (XF86DRIClipRectRec *)imesa->sarea->boxes;
+
+      imesa->sarea->nbox = nr - i;
+
+      for ( ; i < nr ; i++) 
+	 *b++ = pbox[i];
+
+      ioctl(imesa->driFd, DRM_IOCTL_I810_SWAP);
+   }
+
+   tmp = GET_ENQUEUE_AGE(imesa);
+   UNLOCK_HARDWARE( imesa );
+
+   if (GET_DISPATCH_AGE(imesa) < imesa->lastSwap)
+      i810WaitAge(imesa, imesa->lastSwap);
+
+   imesa->lastSwap = tmp;
+   imesa->dirty |= I810_UPLOAD_CLIPRECTS;
+}
+
+
+
+
+
+
+/* This waits for *everybody* to finish rendering -- overkill.
+ */
+void i810DmaFinish( i810ContextPtr imesa  ) 
+{
+   FLUSH_BATCH( imesa );
+
+   if (imesa->sarea->last_quiescent != imesa->sarea->last_enqueue) {
+     
+      if (I810_DEBUG&DEBUG_VERBOSE_IOCTL) 
+	 fprintf(stderr, "i810DmaFinish\n");
+
+      LOCK_HARDWARE( imesa );
+      i810RegetLockQuiescent( imesa );
+      UNLOCK_HARDWARE( imesa );
+      imesa->sarea->last_quiescent = imesa->sarea->last_enqueue;
+   }
+}
+
+
+void i810RegetLockQuiescent( i810ContextPtr imesa  ) 
+{
+   if (imesa->sarea->last_quiescent != imesa->sarea->last_enqueue) {
+      if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "i810RegetLockQuiescent\n");
+
+      drmUnlock(imesa->driFd, imesa->hHWContext);
+      i810GetLock( imesa, DRM_LOCK_QUIESCENT ); 
+      imesa->sarea->last_quiescent = imesa->sarea->last_enqueue;
+   }
+}
+
+void i810WaitAgeLocked( i810ContextPtr imesa, int age  ) 
+{
+   int i = 0;
+
+
+   while (++i < 500000 && GET_DISPATCH_AGE(imesa) < age) {
+      ioctl(imesa->driFd, DRM_IOCTL_I810_GETAGE);
+   }
+
+   if (GET_DISPATCH_AGE(imesa) < age) {
+      if (0)
+	 fprintf(stderr, "wait locked %d %d\n", age, GET_DISPATCH_AGE(imesa));
+      ioctl(imesa->driFd, DRM_IOCTL_I810_FLUSH);
+   }
+}
+
+
+void i810WaitAge( i810ContextPtr imesa, int age  ) 
+{
+   int i = 0;
+
+   while (++i < 500000 && GET_DISPATCH_AGE(imesa) < age) {
+      ioctl(imesa->driFd, DRM_IOCTL_I810_GETAGE);
+   }
+
+   if (GET_DISPATCH_AGE(imesa) >= age)
+      return;
+
+   i = 0;
+   while (++i < 1000 && GET_DISPATCH_AGE(imesa) < age) {
+      ioctl(imesa->driFd, DRM_IOCTL_I810_GETAGE);
+      usleep(1000);
+   }
+   
+   /* To be effective at letting other clients at the hardware,
+    * particularly the X server which regularly needs quiescence to
+    * touch the framebuffer, we really need to sleep *beyond* the
+    * point where our last buffer clears the hardware.  
+    */
+   if (imesa->any_contend) {
+      usleep(3000); 
+   }
+
+   imesa->any_contend = 0;
+
+   if (GET_DISPATCH_AGE(imesa) < age) {
+      LOCK_HARDWARE(imesa);
+      if (GET_DISPATCH_AGE(imesa) < age) 
+	 ioctl(imesa->driFd, DRM_IOCTL_I810_FLUSH);
+      UNLOCK_HARDWARE(imesa);
+   }
+}
+
+
+
+void i810FlushVertices( i810ContextPtr imesa ) 
+{
+   if (!imesa->vertex_dma_buffer) return;
+
+   LOCK_HARDWARE( imesa );
+   i810FlushVerticesLocked( imesa );
+   UNLOCK_HARDWARE( imesa );
+}
+
+
+static int intersect_rect( drm_clip_rect_t *out,
+			    drm_clip_rect_t *a,
+			    drm_clip_rect_t *b )
+{
+   *out = *a;
+   if (b->x1 > out->x1) out->x1 = b->x1;
+   if (b->y1 > out->y1) out->y1 = b->y1;
+   if (b->x2 < out->x2) out->x2 = b->x2;
+   if (b->y2 < out->y2) out->y2 = b->y2;
+   if (out->x1 >= out->x2) return 0;
+   if (out->y1 >= out->y2) return 0;
+   return 1;
+}
+
+
+static void age_imesa( i810ContextPtr imesa, int age )
+{
+   if (imesa->CurrentTexObj[0]) imesa->CurrentTexObj[0]->age = age;
+   if (imesa->CurrentTexObj[1]) imesa->CurrentTexObj[1]->age = age;
+}
+
+void i810FlushVerticesLocked( i810ContextPtr imesa )
+{
+   drm_clip_rect_t *pbox = (drm_clip_rect_t *)imesa->pClipRects;
+   int nbox = imesa->numClipRects;
+   drmBufPtr buffer = imesa->vertex_dma_buffer;
+   drm_i810_vertex_t vertex;
+   int i;
+
+   if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "i810FlushVerticesLocked, buf->used %d\n", 
+	      buffer->used);
+
+   if (!buffer)
+      return;
+
+   if (imesa->dirty & ~I810_UPLOAD_CLIPRECTS)
+      i810EmitHwStateLocked( imesa );
+
+   if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "i810FlushVerticesLocked, used %d\n",
+	      buffer->used);
+   
+   imesa->vertex_dma_buffer = 0;
+
+   vertex.idx = buffer->idx;
+   vertex.used = buffer->used;
+   vertex.discard = 0;
+
+   if (!nbox)
+      vertex.used = 0;
+
+   if (nbox > I810_NR_SAREA_CLIPRECTS)
+      imesa->dirty |= I810_UPLOAD_CLIPRECTS;
+
+   imesa->sarea->vertex_prim = imesa->vertex_prim;
+
+   if (!nbox || !(imesa->dirty & I810_UPLOAD_CLIPRECTS)) 
+   {
+      if (nbox == 1) 
+	 imesa->sarea->nbox = 0;
+      else
+	 imesa->sarea->nbox = nbox;
+
+      if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "DRM_IOCTL_I810_VERTEX CASE1 nbox %d used %d\n", 
+		 nbox, vertex.used);
+
+      vertex.discard = 1;
+      ioctl(imesa->driFd, DRM_IOCTL_I810_VERTEX, &vertex);
+      age_imesa(imesa, imesa->sarea->last_enqueue);
+   }  
+   else 
+   {
+      for (i = 0 ; i < nbox ; )
+      {
+	 int nr = MIN2(i + I810_NR_SAREA_CLIPRECTS, nbox);
+	 drm_clip_rect_t *b = imesa->sarea->boxes;
+
+	 if (imesa->scissor) {
+	    imesa->sarea->nbox = 0;
+	 
+	    for ( ; i < nr ; i++) {
+	       b->x1 = pbox[i].x1 - imesa->drawX;
+	       b->y1 = pbox[i].y1 - imesa->drawY;
+	       b->x2 = pbox[i].x2 - imesa->drawX;
+	       b->y2 = pbox[i].y2 - imesa->drawY;
+
+	       if (intersect_rect(b, b, &imesa->scissor_rect)) {
+		  imesa->sarea->nbox++;
+		  b++;
+	       }
+	    }
+
+	    /* Culled?
+	     */
+	    if (!imesa->sarea->nbox) {
+	       if (nr < nbox) continue;
+	       vertex.used = 0;
+	    }
+	 } else {
+	    imesa->sarea->nbox = nr - i;
+	    for ( ; i < nr ; i++, b++) {
+	       b->x1 = pbox[i].x1 - imesa->drawX;
+	       b->y1 = pbox[i].y1 - imesa->drawY;
+	       b->x2 = pbox[i].x2 - imesa->drawX;
+	       b->y2 = pbox[i].y2 - imesa->drawY;
+	    }
+	 }
+	 
+	 /* Finished with the buffer?
+	  */
+	 if (nr == nbox) 
+	    vertex.discard = 1;
+
+     	 if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+	    fprintf(stderr, "DRM_IOCTL_I810_VERTEX nbox %d used %d\n", 
+		    nbox, vertex.used);
+
+	 ioctl(imesa->driFd, DRM_IOCTL_I810_VERTEX, &vertex);
+	 age_imesa(imesa, imesa->sarea->last_enqueue);
+      }
+   }
+
+   imesa->dirty = 0;
+   if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "finished i810FlushVerticesLocked\n");
+}
+
+
+GLuint *i810AllocDwords( i810ContextPtr imesa, int dwords, GLuint prim )
+{
+   GLuint *start;
+
+   if (!imesa->vertex_dma_buffer) 
+   {
+      if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "i810AllocPrimitiveVerts -- get buf\n");
+      LOCK_HARDWARE(imesa);
+      imesa->vertex_dma_buffer = i810_get_buffer_ioctl( imesa );
+      imesa->vertex_dma_buffer->used = 4;
+      imesa->vertex_prim = prim;
+      UNLOCK_HARDWARE(imesa);
+   } 
+   else if (imesa->vertex_prim != prim ||
+	    imesa->vertex_dma_buffer->used + dwords * 4 > 
+	    imesa->vertex_dma_buffer->total) 
+   {
+      if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "i810AllocPrimitiveVerts -- flush\n");
+      i810FlushVertices( imesa );
+      LOCK_HARDWARE(imesa);
+      imesa->vertex_dma_buffer = i810_get_buffer_ioctl( imesa );
+      imesa->vertex_dma_buffer->used = 4;
+      imesa->vertex_prim = prim;
+      UNLOCK_HARDWARE(imesa);
+   }
+
+
+   if (0)
+      fprintf(stderr, "i810AllocPrimitiveVerts %d, buf %d, used %d\n",
+	      dwords, imesa->vertex_dma_buffer->idx,
+	      imesa->vertex_dma_buffer->used);
+      
+   start = (GLuint *)((char *)imesa->vertex_dma_buffer->address + 
+		      imesa->vertex_dma_buffer->used);
+
+   imesa->vertex_dma_buffer->used += dwords * 4;
+
+   return start;
+}
+
+static void i810DDFlush( GLcontext *ctx )
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   FLUSH_BATCH( imesa );
+}
+
+static void i810DDFinish( GLcontext *ctx  ) 
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   i810DmaFinish( imesa );
+}
+
+void i810DDInitIoctlFuncs( GLcontext *ctx )
+{
+   ctx->Driver.Flush = i810DDFlush;
+   ctx->Driver.Finish = i810DDFinish;
+}
Index: xc/lib/GL/mesa/src/drv/i810/i810ioctl.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/i810/i810ioctl.h:1.1
--- /dev/null	Sat Jul  1 20:44:35 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810ioctl.h	Fri Jun 16 17:02:59 2000
@@ -0,0 +1,36 @@
+#ifndef MGA_IOCTL_H
+#define MGA_IOCTL_H
+
+#include "i810context.h"
+
+
+GLuint *i810AllocDwords( i810ContextPtr imesa, int dwords, GLuint prim );
+
+void i810GetGeneralDmaBufferLocked( i810ContextPtr mmesa ); 
+
+void i810FlushVertices( i810ContextPtr mmesa ); 
+void i810FlushVerticesLocked( i810ContextPtr mmesa );
+
+void i810FlushGeneralLocked( i810ContextPtr imesa );
+void i810WaitAgeLocked( i810ContextPtr imesa, int age );
+void i810WaitAge( i810ContextPtr imesa, int age );
+
+void i810DmaFinish( i810ContextPtr imesa );
+
+void i810RegetLockQuiescent( i810ContextPtr imesa );
+
+void i810DDInitIoctlFuncs( GLcontext *ctx );
+
+void i810SwapBuffers( i810ContextPtr imesa );
+
+GLbitfield i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
+		      GLint cx, GLint cy, GLint cw, GLint ch );
+
+#define FLUSH_BATCH(imesa) do {						\
+        if (I810_DEBUG&DEBUG_VERBOSE_IOCTL)  				\
+              fprintf(stderr, "FLUSH_BATCH in %s\n", __FUNCTION__);	\
+	if (imesa->vertex_dma_buffer) i810FlushVertices(imesa);		\
+} while (0)
+
+
+#endif
Index: xc/lib/GL/mesa/src/drv/i810/i810lib.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810lib.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810lib.h:removed
--- xc/lib/GL/mesa/src/drv/i810/i810lib.h:1.1	Fri Feb 11 09:25:30 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810lib.h	Sat Jul  1 20:44:35 2000
@@ -1,130 +0,0 @@
-/*
- * GLX Hardware Device Driver for Intel i810
- * Copyright (C) 1999 Keith Whitwell
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *
- */
-
-#ifndef I810LIB_INC
-#define I810LIB_INC
-
-#include <stdio.h>
-
-#include "i810context.h"
-#include "mm.h"
-#include "i810log.h"
-
-
-struct i810_mem_range {
-   unsigned long Start;
-   unsigned long End;
-   unsigned long Size;
-};
-
-struct i810_batch_buffer;
-
-struct i810_ring_buffer {
-   int tail_mask;
-   struct i810_mem_range mem;
-   char *virtual_start;
-   int head;
-   int tail;
-   int space;
-   int synced;
-};
-
-typedef struct {
-   /* logging stuff */
-   GLuint logLevel;
-   FILE *logFile;
-
-   /* bookkeeping for texture swaps */
-   GLuint dma_buffer_age;
-   GLuint current_texture_age;
-        
-   /* options */
-   GLuint nullprims;		/* skip all primitive generation */
-   GLuint boxes;		/* draw performance boxes */
-   GLuint noFallback;		/* don't fall back to software */
-   GLuint skipDma;		/* don't send anything to hardware */
-
-   /* performance counters */	
-   GLuint c_setupPointers;
-   GLuint c_triangles;
-   GLuint c_points;
-   GLuint c_lines;
-   GLuint c_drawWaits;
-   GLuint c_textureSwaps;
-   GLuint c_dmaFlush;
-   GLuint c_overflows;
-
-   GLuint c_ringlost;
-   GLuint c_texlost;
-   GLuint c_ctxlost;
-	
-   GLuint hardwareWentIdle;	/* cleared each swapbuffers, set if a
-				   waitfordmacompletion ever exited
-				   without having to wait */
-
-   unsigned char *texVirtual;
-
-   
-   struct i810_batch_buffer *dma_buffer;
-   struct i810_ring_buffer LpRing;
-   unsigned char *MMIOBase;
-
-} i810Glx_t;
-
-extern i810Glx_t	i810glx;
-
-
-#define I810PACKCOLOR1555(r,g,b,a) \
-  ((((r) & 0xf8) << 7) | (((g) & 0xf8) << 2) | (((b) & 0xf8) >> 3) | \
-    ((a) ? 0x8000 : 0))
-
-#define I810PACKCOLOR565(r,g,b) \
-  ((((r) & 0xf8) << 8) | (((g) & 0xfc) << 3) | (((b) & 0xf8) >> 3))
-
-#define I810PACKCOLOR4444(r,g,b,a) \
-  ((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
-
-
-#include "i810_3d_reg.h"
-
-static __inline__ GLuint i810PackColor(GLuint format, 
-				       GLubyte r, GLubyte g, 
-				       GLubyte b, GLubyte a)
-{
-  switch (format) {
-  case DV_PF_555:
-    return I810PACKCOLOR1555(r,g,b,a);
-  case DV_PF_565:
-    return I810PACKCOLOR565(r,g,b);
-  default:
-     fprintf(stderr, "unknown format %d\n", (int)format);
-    return 0;
-  }
-}
-
-
-
-
-#endif
Index: xc/lib/GL/mesa/src/drv/i810/i810pipeline.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810pipeline.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810pipeline.c:1.2
--- xc/lib/GL/mesa/src/drv/i810/i810pipeline.c:1.1	Fri Feb 11 09:25:31 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810pipeline.c	Fri Jun 16 17:02:59 2000
@@ -1,13 +1,15 @@
 /*  #include "i810pipeline.h" */
 
 #include <stdio.h>
+
+#include "types.h"
+#include "fog.h"
+
 #include "i810vb.h"
 #include "i810dd.h"
-#include "i810lib.h"
 #include "i810tris.h"
 #include "i810pipeline.h"
 
-#include "fog.h"
 
 static struct gl_pipeline_stage i810_fast_stage = {
    "I810 fast path",
Index: xc/lib/GL/mesa/src/drv/i810/i810ring.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810ring.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810ring.c:removed
--- xc/lib/GL/mesa/src/drv/i810/i810ring.c:1.1	Fri Feb 11 09:25:31 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810ring.c	Sat Jul  1 20:44:35 2000
@@ -1,162 +0,0 @@
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#include "mm.h"
-#include "i810dd.h"
-#include "i810lib.h"
-#include "i810state.h"
-
-
-#include "i810dma.h"
-
-static void 
-I810PrintErrorState( void )
-{
-   fprintf(stderr,  "pgetbl_ctl: 0x%x pgetbl_err: 0x%x\n", 
-	   INREG(PGETBL_CTL),
-	   INREG(PGE_ERR));
-
-   fprintf(stderr,  "ipeir: %x iphdr: %x\n", 
-	   INREG(IPEIR),
-	   INREG(IPEHR));
-
-   fprintf(stderr,  "LP ring tail: %x head: %x len: %x start %x\n",
-	   INREG(LP_RING + RING_TAIL),
-	   INREG(LP_RING + RING_HEAD) & HEAD_ADDR,
-	   INREG(LP_RING + RING_LEN),
-	   INREG(LP_RING + RING_START));
-
-   fprintf(stderr,  "eir: %x esr: %x emr: %x\n",
-	   INREG16(EIR),
-	   INREG16(ESR),
-	   INREG16(EMR));
-
-   fprintf(stderr,  "instdone: %x instpm: %x\n",
-	   INREG16(INST_DONE),
-	   INREG8(INST_PM));
-
-   fprintf(stderr,  "memmode: %x instps: %x\n",
-	   INREG(MEMMODE),
-	   INREG(INST_PS));
-
-   fprintf(stderr,  "hwstam: %x ier: %x imr: %x iir: %x\n",
-	   INREG16(HWSTAM),
-	   INREG16(IER),
-	   INREG16(IMR),
-	   INREG16(IIR));
-}
-
-
-
-
-static int
-I810USec( void ) 
-{
-   struct timeval tv;
-   struct timezone tz;	
-   gettimeofday( &tv, &tz );
-   return (tv.tv_sec & 2047) * 1000000 + tv.tv_usec;
-}
-
-
-
-void
-_I810RefreshLpRing( i810ContextPtr imesa, int update )
-{
-	struct i810_ring_buffer *ring = &(i810glx.LpRing);
-	
-	ring->head = INREG(LP_RING + RING_HEAD) & HEAD_ADDR;
-	ring->tail = INREG(LP_RING + RING_TAIL);
-	ring->space = ring->head - (ring->tail+8);
-
-	if (ring->space < 0) {
-		ring->space += ring->mem.Size;
-		if (update)
-			imesa->sarea->lastWrap = ++imesa->sarea->ringAge;
-	}
-}	
-
-int
-_I810WaitLpRing( i810ContextPtr imesa, int n, int timeout_usec )
-{
-	struct i810_ring_buffer *ring = &(i810glx.LpRing);
-	int iters = 0;
-	int startTime = 0;
-	int curTime = 0;
-   
-	if (timeout_usec == 0)
-		timeout_usec = 15000000;
-
-	if (I810_DEBUG & DEBUG_VERBOSE_API)
-		fprintf(stderr, "I810WaitLpRing %d\n", n);
-
-	while (ring->space < n) 
-	{
-		int i;
-
-		ring->head = INREG(LP_RING + RING_HEAD) & HEAD_ADDR;
-		ring->space = ring->head - (ring->tail+8);
-
-		if (ring->space < 0) {
-			imesa->sarea->lastWrap = ++imesa->sarea->ringAge;
-			ring->space += ring->mem.Size;
-		}
-      
-		iters++;
-		curTime = I810USec();
-		if ( startTime == 0 || curTime < startTime /*wrap case*/) {
-			startTime = curTime;
-		} else if ( curTime - startTime > timeout_usec ) { 
-			I810PrintErrorState();
-			fprintf(stderr, "space: %d wanted %d\n", 
-				ring->space, n );
-			UNLOCK_HARDWARE(imesa);
-			exit(1);
-		}
-
-		for (i = 0 ; i < 2000 ; i++)
-			;
-	}
-
-	return iters;
-}
-
-int
-_I810Sync( i810ContextPtr imesa ) 
-{
-	int rv;
-
-	if (I810_DEBUG & DEBUG_VERBOSE_API)
-		fprintf(stderr, "I810Sync\n");
-   
-	/* Send a flush instruction and then wait till the ring is empty.
-	 * This is stronger than waiting for the blitter to finish as it also
-	 * flushes the internal graphics caches.
-	 */
-	{
-		BEGIN_LP_RING( imesa, 2 );   
-		OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH );
-		OUT_RING( 0 );		/* pad to quadword */
-		ADVANCE_LP_RING();
-	}
-
-
-	i810glx.LpRing.synced = 1;	/* ?? */
-
-	rv =  _I810WaitLpRing( imesa, i810glx.LpRing.mem.Size - 8, 0 );	
-	imesa->sarea->lastSync = ++imesa->sarea->ringAge;
-
-	return rv;
-}
-
-
-
-
Index: xc/lib/GL/mesa/src/drv/i810/i810span.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810span.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810span.c:1.2
--- xc/lib/GL/mesa/src/drv/i810/i810span.c:1.1	Fri Feb 11 09:25:31 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810span.c	Fri Jun 16 17:02:59 2000
@@ -1,31 +1,39 @@
 #include "types.h"
 #include "i810dd.h"
-#include "i810lib.h"
-#include "i810dma.h"
 #include "i810log.h"
 #include "i810span.h"
+#include "i810ioctl.h"
 
 
 #define DBG 0
 
-
 #define LOCAL_VARS					\
-   i810ContextPtr imesa = I810_CONTEXT(ctx);		\
+   __DRIdrawablePrivate *dPriv = imesa->driDrawable;	\
+   i810ScreenPrivate *i810Screen = imesa->i810Screen;	\
+   GLuint pitch = i810Screen->backPitch;		\
+   GLuint height = dPriv->h;				\
+   char *buf = (char *)(imesa->drawMap +		\
+			dPriv->x * 2 +			\
+			dPriv->y * pitch);		\
+   char *read_buf = (char *)(imesa->readMap +		\
+			     dPriv->x * 2 +		\
+			     dPriv->y * pitch); 	\
+   GLushort p = I810_CONTEXT( ctx )->MonoColor;         \
+   (void) read_buf; (void) buf; (void) p
+
+#define LOCAL_DEPTH_VARS				\
    __DRIdrawablePrivate *dPriv = imesa->driDrawable;	\
-   __DRIscreenPrivate *sPriv = imesa->driScreen;	\
    i810ScreenPrivate *i810Screen = imesa->i810Screen;	\
-   GLuint pitch = i810Screen->auxPitch;			\
+   GLuint pitch = i810Screen->backPitch;		\
    GLuint height = dPriv->h;				\
-   char *buf = (char *)(sPriv->pFB + 			\
-			imesa->drawOffset +	\
-			dPriv->x * 2 + 			\
+   char *buf = (char *)(i810Screen->depth.map +	\
+			dPriv->x * 2 +			\
 			dPriv->y * pitch)
 
-#define INIT_MONO_PIXEL(p) \
-   GLushort p = I810_CONTEXT( ctx )->MonoColor;
+#define INIT_MONO_PIXEL(p) 
 
-#define CLIPPIXEL(_x,_y) (_x >= minx && _x <= maxx && \
-			  _y >= miny && _y <= maxy)
+#define CLIPPIXEL(_x,_y) (_x >= minx && _x < maxx && \
+			  _y >= miny && _y < maxy)
 
 
 #define CLIPSPAN(_x,_y,_n,_x1,_n1,_i)				\
@@ -34,15 +42,20 @@
             _n1 = _n;						\
 	    _x1 = _x;						\
 	    if (_x1 < minx) _i += (minx - _x1), _x1 = minx;	\
-	    if (_x1 + _n1 > maxx) n1 -= (_x1 + n1 - maxx);	\
+	    if (_x1 + _n1 >= maxx) n1 -= (_x1 + n1 - maxx) + 1;	\
          }
 
+#define Y_FLIP(_y) (height - _y - 1)
+
+
+#define HW_LOCK()				\
+   i810ContextPtr imesa = I810_CONTEXT(ctx);	\
+   LOCK_HARDWARE_QUIESCENT(imesa);
+
 #define HW_CLIPLOOP()						\
   do {								\
     __DRIdrawablePrivate *dPriv = imesa->driDrawable;		\
     int _nc = dPriv->numClipRects;				\
-    LOCK_HARDWARE(imesa);						\
-    if (!i810glx.LpRing.synced) _I810Sync( imesa );			\
     while (_nc--) {						\
        int minx = dPriv->pClipRects[_nc].x1 - dPriv->x;		\
        int miny = dPriv->pClipRects[_nc].y1 - dPriv->y; 	\
@@ -52,13 +65,16 @@
 
 #define HW_ENDCLIPLOOP()			\
     }						\
-    UNLOCK_HARDWARE(imesa);			\
   } while (0)
 
+#define HW_UNLOCK()				\
+    UNLOCK_HARDWARE(imesa);
 
 
 
-#define Y_FLIP(_y) (height - _y)
+
+/* 16 bit, 565 rgb color spanline and pixel functions
+ */
 #define WRITE_RGBA( _x, _y, r, g, b, a )				\
    *(GLushort *)(buf + _x*2 + _y*pitch)  = ( (((int)r & 0xf8) << 8) |	\
 		                             (((int)g & 0xfc) << 3) |	\
@@ -66,13 +82,13 @@
 #define WRITE_PIXEL( _x, _y, p )  \
    *(GLushort *)(buf + _x*2 + _y*pitch) = p
 
-#define READ_RGBA( rgba, _x, _y )			\
-do {							\
-   GLushort p = *(GLushort *)(buf + _x*2 + _y*pitch);	\
-   rgba[0] = (p >> 8) & 0xf8;				\
-   rgba[1] = (p >> 3) & 0xfc;				\
-   rgba[2] = (p << 3) & 0xf8;				\
-   rgba[3] = 0;			/* or 255? */		\
+#define READ_RGBA( rgba, _x, _y )				\
+do {								\
+   GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch);	\
+   rgba[0] = (p >> 8) & 0xf8;					\
+   rgba[1] = (p >> 3) & 0xfc;					\
+   rgba[2] = (p << 3) & 0xf8;					\
+   rgba[3] = 255;						\
 } while(0)
 
 #define TAG(x) i810##x##_565
@@ -80,29 +96,47 @@
 
 
 
-
 
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
+/* 15 bit, 555 rgb color spanline and pixel functions
+ */
+#define WRITE_RGBA( _x, _y, r, g, b, a )			\
    *(GLushort *)(buf + _x*2 + _y*pitch)  = (((r & 0xf8) << 7) |	\
-		                            ((g & 0xf8) << 3) |		\
+		                            ((g & 0xf8) << 3) |	\
                          		    ((b & 0xf8) >> 3))
 
 #define WRITE_PIXEL( _x, _y, p )  \
    *(GLushort *)(buf + _x*2 + _y*pitch)  = p
 
-#define READ_RGBA( rgba, _x, _y )			\
-do {							\
-   GLushort p = *(GLushort *)(buf + _x*2 + _y*pitch);	\
-   rgba[0] = (p >> 7) & 0xf8;				\
-   rgba[1] = (p >> 3) & 0xf8;				\
-   rgba[2] = (p << 3) & 0xf8;				\
-   rgba[3] = 0;			/* or 255? */		\
+#define READ_RGBA( rgba, _x, _y )				\
+do {								\
+   GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch);	\
+   rgba[0] = (p >> 7) & 0xf8;					\
+   rgba[1] = (p >> 3) & 0xf8;					\
+   rgba[2] = (p << 3) & 0xf8;					\
+   rgba[3] = 255;						\
 } while(0)
 
 #define TAG(x) i810##x##_555
 #include "spantmp.h"
 
 
+
+
+/* 16 bit depthbuffer functions.
+ */
+#define WRITE_DEPTH( _x, _y, d ) \
+   *(GLushort *)(buf + _x*2 + _y*pitch)  = d;
+
+#define READ_DEPTH( d, _x, _y )	\
+   d = *(GLushort *)(buf + _x*2 + _y*pitch);	 
+
+/*     d = 0xffff; */
+
+#define TAG(x) i810##x##_16
+#include "depthtmp.h"
+
+
+
 void i810DDInitSpanFuncs( GLcontext *ctx )
 {
    if (1) {
@@ -122,6 +156,11 @@
       ctx->Driver.ReadRGBASpan = i810ReadRGBASpan_555;
       ctx->Driver.ReadRGBAPixels = i810ReadRGBAPixels_555;
    }
+
+   ctx->Driver.ReadDepthSpan = i810ReadDepthSpan_16;
+   ctx->Driver.WriteDepthSpan = i810WriteDepthSpan_16;
+   ctx->Driver.ReadDepthPixels = i810ReadDepthPixels_16;
+   ctx->Driver.WriteDepthPixels = i810WriteDepthPixels_16;
 
    ctx->Driver.WriteCI8Span        =NULL;
    ctx->Driver.WriteCI32Span       =NULL;
Index: xc/lib/GL/mesa/src/drv/i810/i810state.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810state.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810state.c:1.4
--- xc/lib/GL/mesa/src/drv/i810/i810state.c:1.1	Fri Feb 11 09:25:32 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810state.c	Thu Jun 22 09:59:24 2000
@@ -1,3 +1,4 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810state.c,v 1.4 2000/06/22 16:59:24 tsi Exp $ */
 
 #include <stdio.h>
 
@@ -7,24 +8,40 @@
 #include "dd.h"
 
 #include "mm.h"
-#include "i810lib.h"
 #include "i810dd.h"
 #include "i810context.h"
 #include "i810state.h"
-#include "i810depth.h"
 #include "i810tex.h"
 #include "i810log.h"
 #include "i810vb.h"
 #include "i810tris.h"
+#include "i810ioctl.h"
 
+  
+
+static __inline__ GLuint i810PackColor(GLuint format, 
+				       GLubyte r, GLubyte g, 
+				       GLubyte b, GLubyte a)
+{
+   switch (format) {
+   case DV_PF_555:
+      return I810PACKCOLOR1555(r,g,b,a);
+   case DV_PF_565:
+      return I810PACKCOLOR565(r,g,b);
+   default:
+      fprintf(stderr, "unknown format %d\n", (int)format);
+      return 0;
+   }
+}
 
 
 static void i810DDAlphaFunc(GLcontext *ctx, GLenum func, GLclampf ref)
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
-
    CARD32 a = (ZA_UPDATE_ALPHAFUNC|ZA_UPDATE_ALPHAREF);
 
+   FLUSH_BATCH(imesa);
+
    switch (ctx->Color.AlphaFunc) {
    case GL_NEVER:    a |= ZA_ALPHA_NEVER;    break;
    case GL_LESS:     a |= ZA_ALPHA_LESS;     break;
@@ -44,10 +61,6 @@
    imesa->Setup[I810_CTXREG_ZA] |= a;
 }
 
-/* This shouldn't get called, as the extension is disabled.  However,
- * there are internal Mesa calls, and rogue use of the api which must be
- * caught.
- */
 static void i810DDBlendEquation(GLcontext *ctx, GLenum mode) 
 {
    if (mode != GL_FUNC_ADD_EXT) {
@@ -60,10 +73,9 @@
 static void i810DDBlendFunc(GLcontext *ctx, GLenum sfactor, GLenum dfactor)
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
-   GLuint a;
+   GLuint a = SDM_UPDATE_SRC_BLEND | SDM_UPDATE_DST_BLEND;
+   FLUSH_BATCH(imesa);
 
-   a = SDM_UPDATE_SRC_BLEND | SDM_UPDATE_DST_BLEND;
-
    switch (ctx->Color.BlendSrcRGB) {
    case GL_ZERO:                a |= SDM_SRC_ZERO; break;
    case GL_SRC_ALPHA:           a |= SDM_SRC_SRC_ALPHA; break;
@@ -73,13 +85,8 @@
    case GL_ONE_MINUS_SRC_ALPHA: a |= SDM_SRC_INV_SRC_ALPHA; break;
    case GL_DST_ALPHA:           a |= SDM_SRC_ONE; break;
    case GL_ONE_MINUS_DST_ALPHA: a |= SDM_SRC_ZERO; break;
-   case GL_SRC_ALPHA_SATURATE:      
-      a |= SDM_SRC_SRC_ALPHA;	/* use GFXRENDERSTATE_COLOR_FACTOR ??? */
-      break;
-   default: 
-      i810Error("unknown blend source func");
-      exit(1);
-      return;
+   case GL_SRC_ALPHA_SATURATE:  a |= SDM_SRC_SRC_ALPHA; break;
+   default: return;
    }
 
    switch (ctx->Color.BlendDstRGB) {
@@ -91,10 +98,7 @@
    case GL_ONE_MINUS_SRC_COLOR: a |= SDM_DST_INV_SRC_COLOR; break;
    case GL_DST_ALPHA:           a |= SDM_DST_ONE; break;
    case GL_ONE_MINUS_DST_ALPHA: a |= SDM_DST_ZERO; break;
-   default: 
-      i810Error( "unknown blend dst func");
-      exit(1);
-      return;      
+   default: return;      
    }  
 
    imesa->dirty |= I810_UPLOAD_CTX;
@@ -123,6 +127,8 @@
    i810ContextPtr imesa = I810_CONTEXT(ctx);
    int zmode;
 
+   FLUSH_BATCH(imesa);
+
    switch(func)  { 
    case GL_NEVER: zmode = LCS_Z_NEVER; break;
    case GL_ALWAYS: zmode = LCS_Z_ALWAYS; break;
@@ -134,9 +140,9 @@
    case GL_NOTEQUAL: zmode = LCS_Z_NOTEQUAL; break;
    default: return;
    }
-
+   
    imesa->Setup[I810_CTXREG_LCS] &= ~LCS_Z_MASK;
-   imesa->Setup[I810_CTXREG_LCS] |= LCS_UPDATE_ZMODE | zmode;
+   imesa->Setup[I810_CTXREG_LCS] |= LCS_UPDATE_ZMODE | zmode;   
    imesa->dirty |= I810_UPLOAD_CTX;
 }
 
@@ -144,20 +150,62 @@
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
 
+   FLUSH_BATCH(imesa);
+
    imesa->dirty |= I810_UPLOAD_CTX;
    imesa->Setup[I810_CTXREG_B2] &= ~B2_ZB_WRITE_ENABLE;
-   imesa->Setup[I810_CTXREG_B2] |= B2_UPDATE_ZB_WRITE_ENABLE;
 
    if (flag)
      imesa->Setup[I810_CTXREG_B2] |= B2_ZB_WRITE_ENABLE;
 }
 
-
 
+/* =============================================================
+ * Polygon stipple 
+ * 
+ * The i810 supports a 4x4 stipple natively, GL wants 32x32. 
+ * Fortunately stipple is usually a repeating pattern.  Could
+ * also consider using a multitexturing mechanism for this, but
+ * that has real issues, too.
+ */
+static void i810DDPolygonStipple( GLcontext *ctx, const GLubyte *mask )
+{
+   i810ContextPtr imesa = I810_CONTEXT(ctx);
+   const GLubyte *m = mask;
+   GLubyte p[4];
+   int i,j,k;
+   int active = (ctx->Polygon.StippleFlag && ctx->PB->primitive == GL_POLYGON);
 
+   FLUSH_BATCH(imesa);
+   ctx->Driver.TriangleCaps |= DD_TRI_STIPPLE;
 
+   if (active) {
+      imesa->dirty |= I810_UPLOAD_CTX;
+      imesa->Setup[I810_CTXREG_ST1] &= ~ST1_ENABLE;
+   }
 
+   p[0] = mask[0] & 0xf; p[0] |= p[0] << 4;
+   p[1] = mask[4] & 0xf; p[1] |= p[1] << 4;
+   p[2] = mask[8] & 0xf; p[2] |= p[2] << 4;
+   p[3] = mask[12] & 0xf; p[3] |= p[3] << 4;
+
+   for (k = 0 ; k < 8 ; k++)
+      for (j = 0 ; j < 4; j++) 
+	 for (i = 0 ; i < 4 ; i++) 
+	    if (*m++ != p[j]) {
+	       ctx->Driver.TriangleCaps &= ~DD_TRI_STIPPLE;
+	       return;
+	    }
+   
+   imesa->Setup[I810_CTXREG_ST1] &= ~0xffff;
+   imesa->Setup[I810_CTXREG_ST1] |= ( ((p[0] & 0xf) << 0) |
+				      ((p[1] & 0xf) << 4) |
+				      ((p[2] & 0xf) << 8) |
+				      ((p[3] & 0xf) << 12) );   
 
+   if (active)
+      imesa->Setup[I810_CTXREG_ST1] |= ST1_ENABLE;
+}
 
 
 
@@ -167,40 +215,26 @@
 
 
 static void i810DDScissor( GLcontext *ctx, GLint x, GLint y, 
-			  GLsizei w, GLsizei h )
+			   GLsizei w, GLsizei h )
 { 
    i810ContextPtr imesa = I810_CONTEXT(ctx);
-   __DRIdrawablePrivate *dPriv = imesa->driDrawable;
-   int x1,x2,y1,y2;
-
-   x1 = ctx->Scissor.X;
-   x2 = ctx->Scissor.X + ctx->Scissor.Width - 1;
-   y1 = dPriv->h - ctx->Scissor.Y - ctx->Scissor.Height;
-   y2 = dPriv->h - ctx->Scissor.Y - 1;
-  
-   if (x1 < 0) x1 = 0;
-   if (y1 < 0) y1 = 0;
-   if (x2 >= dPriv->w) x2 = dPriv->w-1;
-   if (y2 >= dPriv->h) y2 = dPriv->h-1;
-
-   if (x1 > x2 || y1 > y2) {
-      x1 = 0; x2 = 0;
-      y2 = 0; y1 = 1;
-   }
-
-   /* Need to push this into drawing rectangle.
-    */
-#if 0
-   imesa->Setup[I810_CTXREG_SCI0] = GFX_OP_SCISSOR_INFO;
-   imesa->Setup[I810_CTXREG_SCI1] = (y1<<16)|x1;
-   imesa->Setup[I810_CTXREG_SCI2] = (y2<<16)|x2;
 
+   FLUSH_BATCH(imesa);
+   imesa->scissor_rect.x1 = x;
+   imesa->scissor_rect.y1 = imesa->driDrawable->h - (y+h);
+   imesa->scissor_rect.x2 = x+w;
+   imesa->scissor_rect.y2 = imesa->driDrawable->h - y;
+
+
+   if (I810_DEBUG&DEBUG_VERBOSE_2D) 
+      fprintf(stderr, "SET SCISSOR %d,%d-%d,%d\n", 
+	      imesa->scissor_rect.x1,
+	      imesa->scissor_rect.y1,
+	      imesa->scissor_rect.x2,
+	      imesa->scissor_rect.y2);
 
-   /* Need to intersect with cliprects???
-    */
-   imesa->dirty |= I810_UPLOAD_CTX;
-#endif
 
+   imesa->dirty |= I810_UPLOAD_CLIPRECTS;
 }
 
 
@@ -209,48 +243,64 @@
 }
 
 
-static GLboolean i810DDSetBuffer(GLcontext *ctx, GLenum mode )
+static GLboolean i810DDSetDrawBuffer(GLcontext *ctx, GLenum mode )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
 
+   FLUSH_BATCH(imesa);
 
-   fprintf(stderr, "i810DDSetBuffer %s\n", gl_lookup_enum_by_nr( mode ));
+   imesa->Fallback &= ~I810_FALLBACK_DRAW_BUFFER;
 
-   imesa->Fallback &= ~I810_FALLBACK_BUFFER;
-
    if (mode == GL_FRONT_LEFT) 
    {
-      imesa->drawOffset = imesa->i810Screen->fbOffset;
+      imesa->drawMap = (char *)imesa->driScreen->pFB;
       imesa->BufferSetup[I810_DESTREG_DI1] = (imesa->i810Screen->fbOffset | 
-					      imesa->i810Screen->auxPitchBits);
+					      imesa->i810Screen->backPitchBits);
       imesa->dirty |= I810_UPLOAD_BUFFERS;
       i810XMesaSetFrontClipRects( imesa );
       return GL_TRUE;
    } 
    else if (mode == GL_BACK_LEFT) 
    {
-      imesa->drawOffset = imesa->i810Screen->backOffset;
+      imesa->drawMap = imesa->i810Screen->back.map;
       imesa->BufferSetup[I810_DESTREG_DI1] = (imesa->i810Screen->backOffset | 
-					      imesa->i810Screen->auxPitchBits);
+					      imesa->i810Screen->backPitchBits);
       imesa->dirty |= I810_UPLOAD_BUFFERS;
       i810XMesaSetBackClipRects( imesa );
       return GL_TRUE;
    }
 
-   imesa->Fallback |= I810_FALLBACK_BUFFER;
+   imesa->Fallback |= I810_FALLBACK_DRAW_BUFFER;
    return GL_FALSE;
 }
 
+static void i810DDSetReadBuffer(GLcontext *ctx, GLframebuffer *colorBuffer,
+				GLenum mode )
+{
+   i810ContextPtr imesa = I810_CONTEXT(ctx);
 
+   if (mode == GL_FRONT_LEFT) 
+   {
+      imesa->readMap = (char *)imesa->driScreen->pFB;
+      imesa->Fallback &= ~I810_FALLBACK_READ_BUFFER;
+   } 
+   else if (mode == GL_BACK_LEFT) 
+   {
+      imesa->readMap = imesa->i810Screen->back.map;
+      imesa->Fallback &= ~I810_FALLBACK_READ_BUFFER;
+   }
+   else
+      imesa->Fallback |= I810_FALLBACK_READ_BUFFER;
+}
+
+
 
 static void i810DDSetColor(GLcontext *ctx, 
 			   GLubyte r, GLubyte g,
 			   GLubyte b, GLubyte a )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
-
-   imesa->MonoColor = i810PackColor( imesa->i810Screen->fbFormat,
-				      r, g, b, a );
+   imesa->MonoColor = i810PackColor( imesa->i810Screen->fbFormat, r, g, b, a );
 }
 
 
@@ -259,9 +309,7 @@
 			     GLubyte b, GLubyte a )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
-
-   imesa->ClearColor = i810PackColor( imesa->i810Screen->fbFormat,
-				      r, g, b, a );
+   imesa->ClearColor = i810PackColor( imesa->i810Screen->fbFormat, r, g, b, a );
 }
 
 
@@ -274,6 +322,8 @@
    i810ContextPtr imesa = I810_CONTEXT(ctx);
    GLuint mode = LCS_CULL_BOTH;
    
+   FLUSH_BATCH(imesa);
+
    if (ctx->Polygon.CullFaceMode != GL_FRONT_AND_BACK) {
       mode = LCS_CULL_CW;
       if (ctx->Polygon.CullFaceMode == GL_FRONT)
@@ -288,27 +338,49 @@
    {
       imesa->dirty |= I810_UPLOAD_CTX;
       imesa->Setup[I810_CTXREG_LCS] &= ~LCS_CULL_MASK;
-      imesa->Setup[I810_CTXREG_LCS] |= (LCS_UPDATE_CULL_MODE | mode);
+      imesa->Setup[I810_CTXREG_LCS] |= mode;
    }
 }
 
 
 static void i810DDReducedPrimitiveChange( GLcontext *ctx, GLenum prim )
 {
-   if (ctx->Polygon.CullFlag) {
-      i810ContextPtr imesa = I810_CONTEXT(ctx);
-      GLuint mode = imesa->LcsCullMode;
-
-      if (ctx->PB->primitive != GL_POLYGON)
-	 mode = LCS_CULL_DISABLE;
-
-      imesa->dirty |= I810_UPLOAD_CTX;
-      imesa->Setup[I810_CTXREG_LCS] &= ~LCS_CULL_MASK;
-      imesa->Setup[I810_CTXREG_LCS] |= (LCS_UPDATE_CULL_MODE | mode);
+   i810ContextPtr imesa = I810_CONTEXT(ctx);
+   FLUSH_BATCH(imesa);
 
-      LOCK_HARDWARE(imesa);
-      i810EmitHwStateLocked( imesa );	
-      UNLOCK_HARDWARE(imesa);
+   imesa->dirty |= I810_UPLOAD_CTX;
+   imesa->Setup[I810_CTXREG_LCS] &= ~LCS_CULL_MASK;
+   imesa->Setup[I810_CTXREG_ST1] &= ~ST1_ENABLE;
+   imesa->Setup[I810_CTXREG_AA] &= ~AA_ENABLE;
+
+   switch (ctx->PB->primitive) {
+   case GL_POLYGON:
+      if (ctx->Polygon.StippleFlag && 
+	  (ctx->Driver.TriangleCaps & DD_TRI_STIPPLE))
+	 imesa->Setup[I810_CTXREG_ST1] |= ST1_ENABLE;
+      if (ctx->Polygon.CullFlag) 
+	 imesa->Setup[I810_CTXREG_LCS] |= imesa->LcsCullMode;
+      else 
+	 imesa->Setup[I810_CTXREG_LCS] |= LCS_CULL_DISABLE;
+      if (ctx->Polygon.SmoothFlag)
+	 imesa->Setup[I810_CTXREG_AA] |= AA_ENABLE;
+      break;
+   case GL_LINES:
+      imesa->Setup[I810_CTXREG_LCS] &= ~LCS_LINEWIDTH_0_5;
+      if (ctx->Line.SmoothFlag) {
+	 imesa->Setup[I810_CTXREG_AA] |= AA_ENABLE;  
+	 imesa->Setup[I810_CTXREG_LCS] |= LCS_LINEWIDTH_0_5;
+      } 
+      imesa->Setup[I810_CTXREG_LCS] |= LCS_CULL_DISABLE;
+      break;
+   case GL_POINTS:
+      if (ctx->Point.SmoothFlag)
+	 imesa->Setup[I810_CTXREG_AA] |= AA_ENABLE;      
+      imesa->Setup[I810_CTXREG_LCS] |= LCS_CULL_DISABLE;
+      break;
+   default:
+      imesa->Setup[I810_CTXREG_LCS] |= LCS_CULL_DISABLE;
+      break;
    }
 }
 
@@ -318,15 +390,36 @@
  * Color masks
  */
 
-/* Mesa calls this from the wrong place.
+/* Mesa calls this from the wrong place - it is called a very large
+ * number of redundant times.
  *
- * Its a fallback...
+ * Colormask can be simulated by multipass or multitexture techniques.
  */
 static GLboolean i810DDColorMask(GLcontext *ctx, 
 				 GLboolean r, GLboolean g, 
 				 GLboolean b, GLboolean a )
 {
-   return 1;
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   GLuint tmp = 0;
+   GLuint rv = 1;
+
+   imesa->Fallback &= ~I810_FALLBACK_COLORMASK;
+
+   if (r && g && b) {
+      tmp = imesa->Setup[I810_CTXREG_B2] | B2_FB_WRITE_ENABLE;
+   } else if (!r && !g && !b) {
+      tmp = imesa->Setup[I810_CTXREG_B2] & ~B2_FB_WRITE_ENABLE;
+   } else {
+      rv = 0;
+      imesa->Fallback |= I810_FALLBACK_COLORMASK;
+   }
+      
+   if (tmp != imesa->Setup[I810_CTXREG_B2]) {
+      FLUSH_BATCH(imesa);
+      imesa->Setup[I810_CTXREG_B2] = tmp;
+   }
+
+   return rv;
 }
 
 /* Seperate specular not fully implemented in hardware...  Needs
@@ -336,12 +429,34 @@
 static void i810DDLightModelfv(GLcontext *ctx, GLenum pname, 
 			      const GLfloat *param)
 {
-   if (pname == GL_LIGHT_MODEL_COLOR_CONTROL) {
-      I810_CONTEXT(ctx)->new_state |= I810_NEW_TEXTURE;
+   if (pname == GL_LIGHT_MODEL_COLOR_CONTROL) 
+   {            
+      i810ContextPtr imesa = I810_CONTEXT( ctx );
+      FLUSH_BATCH(imesa);
+
+      imesa->Fallback &= ~I810_FALLBACK_SPECULAR;
+      if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
+	 imesa->Fallback |= I810_FALLBACK_SPECULAR;
    }
 }
 
+/* The 815 has it...
+ */
+static void i810DDLightModelfv_i815(GLcontext *ctx, GLenum pname, 
+			      const GLfloat *param)
+{
+   if (pname == GL_LIGHT_MODEL_COLOR_CONTROL) 
+   {            
+      i810ContextPtr imesa = I810_CONTEXT( ctx );
+      FLUSH_BATCH(imesa);
+      
+      imesa->Setup[I810_CTXREG_B1] &= ~B1_SPEC_ENABLE;
 
+      if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
+	 imesa->Setup[I810_CTXREG_B1] |= B1_SPEC_ENABLE;
+   }
+}
+  
 
 /* =============================================================
  * Fog
@@ -372,64 +487,105 @@
 
    switch(cap) {
    case GL_ALPHA_TEST:
+      FLUSH_BATCH(imesa);
       imesa->dirty |= I810_UPLOAD_CTX;
       imesa->Setup[I810_CTXREG_B1] &= ~B1_ALPHA_TEST_ENABLE;
-      imesa->Setup[I810_CTXREG_B1] |= B1_UPDATE_ALPHA_TEST_ENABLE;
       if (state)
 	 imesa->Setup[I810_CTXREG_B1] |= B1_ALPHA_TEST_ENABLE;
       break;
    case GL_BLEND:
+      FLUSH_BATCH(imesa);
       imesa->dirty |= I810_UPLOAD_CTX;
       imesa->Setup[I810_CTXREG_B1] &= ~B1_BLEND_ENABLE;
-      imesa->Setup[I810_CTXREG_B1] |= B1_UPDATE_BLEND_ENABLE;
       if (state)
 	 imesa->Setup[I810_CTXREG_B1] |= B1_BLEND_ENABLE;
       break;
    case GL_DEPTH_TEST:
+      FLUSH_BATCH(imesa);
       imesa->dirty |= I810_UPLOAD_CTX;
       imesa->Setup[I810_CTXREG_B1] &= ~B1_Z_TEST_ENABLE;
-      imesa->Setup[I810_CTXREG_B1] |= B1_UPDATE_Z_TEST_ENABLE;
       if (state)
 	 imesa->Setup[I810_CTXREG_B1] |= B1_Z_TEST_ENABLE;
       break;
    case GL_SCISSOR_TEST:
-#if 0
-      imesa->dirty |= I810_UPLOAD_CTX;
-      imesa->Setup[I810_CTXREG_SC] &= ~SC_ENABLE_MASK;
-      imesa->Setup[I810_CTXREG_SC] |= SC_UPDATE_SCISSOR;
-      if (state)
-	 imesa->Setup[I810_CTXREG_SC] |= SC_ENABLE;
-#endif
+      FLUSH_BATCH(imesa);
+      imesa->scissor = state;
+      imesa->dirty |= I810_UPLOAD_CLIPRECTS;
       break;
+   case GL_POLYGON_STIPPLE:      
+      if ((ctx->Driver.TriangleCaps & DD_TRI_STIPPLE) &&
+	  ctx->PB->primitive == GL_POLYGON) 
+      {
+	 FLUSH_BATCH(imesa);
+	 imesa->dirty |= I810_UPLOAD_CTX;
+	 imesa->Setup[I810_CTXREG_ST1] &= ~ST1_ENABLE;
+	 if (state)
+	    imesa->Setup[I810_CTXREG_ST1] |= ST1_ENABLE;
+      }
+      break;
+   case GL_LINE_SMOOTH:
+      if (ctx->PB->primitive == GL_LINE) {
+	 FLUSH_BATCH(imesa);
+	 imesa->dirty |= I810_UPLOAD_CTX;
+	 imesa->Setup[I810_CTXREG_AA] &= ~AA_ENABLE;
+	 imesa->Setup[I810_CTXREG_LCS] &= ~LCS_LINEWIDTH_0_5;
+	 if (state) {
+	    imesa->Setup[I810_CTXREG_AA] |= AA_ENABLE;
+	    imesa->Setup[I810_CTXREG_LCS] |= LCS_LINEWIDTH_0_5;
+	 }
+      }
+      break;
+   case GL_POINT_SMOOTH:
+      if (ctx->PB->primitive == GL_POINT) {
+	 FLUSH_BATCH(imesa);
+	 imesa->dirty |= I810_UPLOAD_CTX;
+	 imesa->Setup[I810_CTXREG_AA] &= ~AA_ENABLE;
+	 if (state) 
+	    imesa->Setup[I810_CTXREG_AA] |= AA_ENABLE;
+      }
+      break;
+   case GL_POLYGON_SMOOTH:
+      if (ctx->PB->primitive == GL_POLYGON) {
+	 FLUSH_BATCH(imesa);
+	 imesa->dirty |= I810_UPLOAD_CTX;
+	 imesa->Setup[I810_CTXREG_AA] &= ~AA_ENABLE;
+	 if (state) 
+	    imesa->Setup[I810_CTXREG_AA] |= AA_ENABLE;
+      }
+      break;
    case GL_FOG:
+      FLUSH_BATCH(imesa);
       imesa->dirty |= I810_UPLOAD_CTX;
       imesa->Setup[I810_CTXREG_B1] &= ~B1_FOG_ENABLE;
-      imesa->Setup[I810_CTXREG_B1] |= B1_UPDATE_FOG_ENABLE;
       if (state)
 	 imesa->Setup[I810_CTXREG_B1] |= B1_FOG_ENABLE;
       break;
    case GL_CULL_FACE:
       if (ctx->PB->primitive == GL_POLYGON) {
+	 FLUSH_BATCH(imesa);
 	 imesa->dirty |= I810_UPLOAD_CTX;
 	 imesa->Setup[I810_CTXREG_LCS] &= ~LCS_CULL_MASK;
-	 imesa->Setup[I810_CTXREG_LCS] |= LCS_UPDATE_CULL_MODE;
 	 if (state)
 	    imesa->Setup[I810_CTXREG_LCS] |= imesa->LcsCullMode;
 	 else
 	    imesa->Setup[I810_CTXREG_LCS] |= LCS_CULL_DISABLE;
       }
       break;
+   case GL_TEXTURE_1D:      
+   case GL_TEXTURE_3D:      
+      FLUSH_BATCH(imesa);
+      imesa->new_state |= I810_NEW_TEXTURE;
+      break;
    case GL_TEXTURE_2D:      
+      FLUSH_BATCH(imesa);
       imesa->new_state |= I810_NEW_TEXTURE;
       imesa->dirty |= I810_UPLOAD_CTX;
       if (ctx->Texture.CurrentUnit == 0) {
 	 imesa->Setup[I810_CTXREG_MT] &= ~MT_TEXEL0_ENABLE;
-	 imesa->Setup[I810_CTXREG_MT] |= MT_UPDATE_TEXEL0_STATE;
 	 if (state)
 	    imesa->Setup[I810_CTXREG_MT] |= MT_TEXEL0_ENABLE;
       } else {
 	 imesa->Setup[I810_CTXREG_MT] &= ~MT_TEXEL1_ENABLE;
-	 imesa->Setup[I810_CTXREG_MT] |= MT_UPDATE_TEXEL1_STATE;
 	 if (state)
 	    imesa->Setup[I810_CTXREG_MT] |= MT_TEXEL1_ENABLE;
       }
@@ -444,92 +600,20 @@
 /* =============================================================
  */
 
-/* Delightfully few possibilities:
- */
-void i810DDPrintState( const char *msg, GLuint state )
-{
-   fprintf(stderr, "%s (0x%x): %s\n",
-	   msg,
-	   (unsigned int) state,
-	   (state & I810_NEW_TEXTURE) ? "texture, " : "");
-}
 
 void i810DDUpdateHwState( GLcontext *ctx )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
 
-   if (imesa->new_state & I810_NEW_TEXTURE)
+   if (imesa->new_state & I810_NEW_TEXTURE) {
+      FLUSH_BATCH(imesa);
       i810UpdateTextureState( ctx );
-
-   imesa->new_state = 0;
-
-   if (imesa->dirty) {
-      LOCK_HARDWARE(imesa);
-      i810EmitHwStateLocked( imesa );	
-      UNLOCK_HARDWARE(imesa);
    }
-}
-
-
-
-/*
- * i810DmaExecute
- * Add a block of data to the dma buffer
- *
- * -- In ring buffer mode, must be called with lock held, and translates to 
- *    OUT_RING rather than outbatch
- *
- * -- In dma mode, probably won't be used because state updates will have
- *    to be done via the kernel for security...
- */
-static void i810DmaExecute( i810ContextPtr imesa,
-			    GLuint *code, int dwords, const char *where ) 
-{	
-   if (I810_DEBUG & DEBUG_VERBOSE_RING)
-      fprintf(stderr, "i810DmaExecute (%s)\n", where);
 
-   if (dwords & 1) {
-      i810Error( "Misaligned buffer in i810DmaExecute\n" );
-      exit(1);
-   }
-
-   {
-      int i;
-      BEGIN_BATCH( imesa, dwords);
-
-      for ( i = 0 ; i < dwords ; i++ ) {
-	 if (0) fprintf(stderr, "%d: %x\n", i, code[i]);
-	 OUT_BATCH( code[i] );
-      }
-
-      ADVANCE_BATCH();
-   }
+   imesa->new_state = 0;
 }
 
 
-
-void i810EmitScissorValues( i810ContextPtr imesa, int nr, int emit )
-{
-   int x1 = imesa->pClipRects[nr].x1 - imesa->drawX;
-   int y1 = imesa->pClipRects[nr].y1 - imesa->drawY;
-   int x2 = imesa->pClipRects[nr].x2 - imesa->drawX;
-   int y2 = imesa->pClipRects[nr].y2 - imesa->drawY;
-
-   if (I810_DEBUG&DEBUG_VERBOSE_DRI)
-      fprintf(stderr, "i810EmitScissorValues %d,%d - %d,%d\n",
-	      x1,y1,x2,y2);
-
-   imesa->ClipSetup[I810_CLIPREG_SCI1] = (x1 | (y1 << 16));
-   imesa->ClipSetup[I810_CLIPREG_SCI2] = (x2 | (y2 << 16));
-   imesa->ClipSetup[I810_CLIPREG_SC] = ( GFX_OP_SCISSOR |
-					 SC_UPDATE_SCISSOR |
-					 SC_ENABLE );
-
-   if (emit)
-      i810DmaExecute( imesa, 
-		      imesa->ClipSetup, I810_CLIP_SETUP_SIZE, "cliprect" );
-}
-
 void i810EmitDrawingRectangle( i810ContextPtr imesa )
 {
    __DRIdrawablePrivate *dPriv = imesa->driDrawable;
@@ -545,7 +629,6 @@
     */
    imesa->BufferSetup[I810_DESTREG_DR4] = ((y0<<16) | 
 					   (((unsigned)x0)&0xFFFF));
-
   
    /* Clip to screen.
     */
@@ -556,74 +639,74 @@
 
 
    /* Onscreen drawing rectangle.
-    *
-    * TODO: clip again to GL scissor values.
     */
    imesa->BufferSetup[I810_DESTREG_DR2] = ((y0<<16) | x0);
-   imesa->BufferSetup[I810_DESTREG_DR3] = ((y1<<16) | x1);
+   imesa->BufferSetup[I810_DESTREG_DR3] = (((y1+1)<<16) | (x1+1));
    imesa->dirty |= I810_UPLOAD_BUFFERS;
 }
 
 
 static void i810DDPrintDirty( const char *msg, GLuint state )
 {
-   fprintf(stderr, "%s (0x%x): %s%s%s%s%s%s%s\n",	   
+   fprintf(stderr, "%s (0x%x): %s%s%s%s%s\n",	   
 	   msg,
 	   (unsigned int) state,
-	   (state & I810_REFRESH_RING)      ? "read-lp-ring, " : "",
-	   (state & I810_REQUIRE_QUIESCENT) ? "req-quiescent, " : "",
 	   (state & I810_UPLOAD_TEX0IMAGE)  ? "upload-tex0, " : "",
 	   (state & I810_UPLOAD_TEX1IMAGE)  ? "upload-tex1, " : "",
 	   (state & I810_UPLOAD_CTX)        ? "upload-ctx, " : "",
 	   (state & I810_UPLOAD_BUFFERS)    ? "upload-bufs, " : "",
-	   (state & I810_EMIT_CLIPRECT)     ? "emit-single-cliprect, " : ""
+	   (state & I810_UPLOAD_CLIPRECTS)  ? "upload-cliprects, " : ""
 	   );
 }
 
 
-/* Spew the state onto the ringbuffer and/or texture memory.
+/* Push the state into the sarea and/or texture memory.
  */
 void i810EmitHwStateLocked( i810ContextPtr imesa )
 {
    if (I810_DEBUG & DEBUG_VERBOSE_API)
-      i810DDPrintDirty( "i810EmitHwStateLocked", imesa->dirty );
-
-   if (imesa->dirty & I810_REQUIRE_QUIESCENT) {
-      i810glx.c_drawWaits += _I810Sync( imesa );
-   }
+      i810DDPrintDirty( "\n\n\ni810EmitHwStateLocked", imesa->dirty );
 
-   /* TODO: Refine mechanism to be equivalent to UploadSubImage
-    */
-   if ((imesa->dirty & I810_UPLOAD_TEX0IMAGE) && imesa->CurrentTexObj[0])
-      i810UploadTexImages(imesa, imesa->CurrentTexObj[0]);
+   if (imesa->dirty & ~I810_UPLOAD_CLIPRECTS)
+   {
+      if ((imesa->dirty & I810_UPLOAD_TEX0IMAGE) && imesa->CurrentTexObj[0])
+	 i810UploadTexImages(imesa, imesa->CurrentTexObj[0]);
    
-   if ((imesa->dirty & I810_UPLOAD_TEX1IMAGE) && imesa->CurrentTexObj[1])
-      i810UploadTexImages(imesa, imesa->CurrentTexObj[1]);
+      if ((imesa->dirty & I810_UPLOAD_TEX1IMAGE) && imesa->CurrentTexObj[1])
+	 i810UploadTexImages(imesa, imesa->CurrentTexObj[1]);
   
-   if ((imesa->dirty & I810_UPLOAD_CTX)) {
-      i810DmaExecute( imesa, imesa->Setup, I810_CTX_SETUP_SIZE, "context" );
-
-      if (imesa->CurrentTexObj[0])
-	 i810DmaExecute( imesa, imesa->CurrentTexObj[0]->Setup,
-			 I810_TEX_SETUP_SIZE, "tex-0");
+      if (imesa->dirty & I810_UPLOAD_CTX)
+	 memcpy( imesa->sarea->ContextState, 
+		 imesa->Setup, 
+		 sizeof(imesa->Setup) );
+
+      if ((imesa->dirty & I810_UPLOAD_TEX0) && imesa->CurrentTexObj[0]) {
+	 imesa->sarea->dirty |= I810_UPLOAD_TEX0;
+	 memcpy(imesa->sarea->TexState[0],
+		imesa->CurrentTexObj[0]->Setup,
+		sizeof(imesa->sarea->TexState[0]));
+      }
 
-      if (imesa->CurrentTexObj[1]) 
-	 i810DmaExecute( imesa, imesa->CurrentTexObj[1]->Setup,
-			 I810_TEX_SETUP_SIZE, "tex-1");
+      if ((imesa->dirty & I810_UPLOAD_TEX1) && imesa->CurrentTexObj[1]) {
+	 imesa->sarea->dirty |= I810_UPLOAD_TEX1;
+	 memcpy(imesa->sarea->TexState[1],
+		imesa->CurrentTexObj[1]->Setup,
+		sizeof(imesa->sarea->TexState[1]));
+      }
+      
+      if (imesa->dirty & I810_UPLOAD_BUFFERS) 
+	 memcpy( imesa->sarea->BufferState, 
+		 imesa->BufferSetup, 
+		 sizeof(imesa->BufferSetup) );
+
+      imesa->sarea->dirty |= (imesa->dirty & 
+			      ~(I810_UPLOAD_TEX1|I810_UPLOAD_TEX0));
+      imesa->dirty &= I810_UPLOAD_CLIPRECTS;
    }
-
-   if (imesa->dirty & I810_UPLOAD_BUFFERS) 
-      i810DmaExecute( imesa, imesa->BufferSetup, 
-		      I810_DEST_SETUP_SIZE, "buffers" );
-   
-   if (imesa->dirty & I810_EMIT_CLIPRECT)
-      i810DmaExecute( imesa, imesa->ClipSetup, 
-		      I810_CLIP_SETUP_SIZE, "cliprect" );
-
-   imesa->dirty = 0;
 }
 
 
+
 void i810DDInitState( i810ContextPtr imesa )
 {
    i810ScreenPrivate *i810Screen = imesa->i810Screen;
@@ -797,7 +880,7 @@
 				     LCS_UPDATE_ZMODE |
 				     LCS_Z_LESS |
 				     LCS_UPDATE_LINEWIDTH |
-				     (0x2<<LCS_LINEWIDTH_SHIFT) |
+				     LCS_LINEWIDTH_1_0 |
 				     LCS_UPDATE_ALPHA_INTERP |
 				     LCS_ALPHA_INTERP |
 				     LCS_UPDATE_FOG_INTERP |
@@ -825,11 +908,9 @@
    imesa->Setup[I810_CTXREG_ST0] = GFX_OP_STIPPLE;
    imesa->Setup[I810_CTXREG_ST1] = 0;
 
-
-
    imesa->Setup[I810_CTXREG_AA] = ( GFX_OP_ANTIALIAS |
 				    AA_UPDATE_EDGEFLAG |
-				    0 |
+				    AA_ENABLE_EDGEFLAG | /* ? */
 				    AA_UPDATE_POLYWIDTH |
 				    AA_POLYWIDTH_05 |
 				    AA_UPDATE_LINEWIDTH |
@@ -839,38 +920,29 @@
 				    AA_UPDATE_AA_ENABLE |
 				    0 );
 
-
-
-   memset(imesa->ClipSetup, 0, sizeof(imesa->ClipSetup));
-   imesa->ClipSetup[I810_CLIPREG_SCI0] = GFX_OP_SCISSOR_INFO; 
-   imesa->ClipSetup[I810_CLIPREG_SCI1] = 0;
-   imesa->ClipSetup[I810_CLIPREG_SCI2] = 0;
-   imesa->ClipSetup[I810_CLIPREG_SC] = ( GFX_OP_SCISSOR | 
-					 SC_UPDATE_SCISSOR |
-					 0 );
-
-   /* This stuff is all invarient as long as we are using
-    * shared back and depth buffers.  
-    */
    memset(imesa->BufferSetup, 0, sizeof(imesa->BufferSetup));
-   imesa->drawOffset = i810Screen->backOffset;
    imesa->BufferSetup[I810_DESTREG_DI0] = CMD_OP_DESTBUFFER_INFO;
 
-   if (imesa->glCtx->Color.DriverDrawBuffer == GL_BACK_LEFT)
+   if (imesa->glCtx->Color.DriverDrawBuffer == GL_BACK_LEFT) {
+      imesa->drawMap = i810Screen->back.map;
       imesa->BufferSetup[I810_DESTREG_DI1] = (i810Screen->backOffset | 
-					      i810Screen->auxPitchBits);
-   else
+					      i810Screen->backPitchBits);
+   } else {
+      imesa->drawMap = (char *)imesa->driScreen->pFB;
       imesa->BufferSetup[I810_DESTREG_DI1] = (i810Screen->fbOffset | 
-					      i810Screen->auxPitchBits);
+					      i810Screen->backPitchBits);
+   }
 
+   if (imesa->glCtx->Color.DriverDrawBuffer == GL_BACK_LEFT) {
+      imesa->readMap = i810Screen->back.map;
+   } else {
+      imesa->readMap = (char *)imesa->driScreen->pFB;
+   }
 
    imesa->BufferSetup[I810_DESTREG_DV0] = GFX_OP_DESTBUFFER_VARS;
    imesa->BufferSetup[I810_DESTREG_DV1] = (DV_HORG_BIAS_OGL |
 					   DV_VORG_BIAS_OGL |
 					   i810Screen->fbFormat);
-   imesa->BufferSetup[I810_DESTREG_ZB0] = CMD_OP_Z_BUFFER_INFO;
-   imesa->BufferSetup[I810_DESTREG_ZB1] = (i810Screen->depthOffset | 
-					   i810Screen->auxPitchBits);
 
    imesa->BufferSetup[I810_DESTREG_DR0] = GFX_OP_DRAWRECT_INFO;
    imesa->BufferSetup[I810_DESTREG_DR1] = DR1_RECT_CLIP_ENABLE;
@@ -886,17 +958,31 @@
 {
    i810ContextPtr imesa = I810_CONTEXT( ctx );
 
+   /* Have to do this here to detect texture fallbacks in time:
+    */
+   if (I810_CONTEXT(ctx)->new_state & I810_NEW_TEXTURE)
+      i810DDUpdateHwState( ctx );
+
+
    if (ctx->NewState & INTERESTED) {
       i810DDChooseRenderState(ctx);  
       i810ChooseRasterSetupFunc(ctx);
    }
+
+   if (0) 
+      fprintf(stderr, "IndirectTriangles %x Fallback %x\n", 
+	      imesa->IndirectTriangles, imesa->Fallback);
    
-   /* TODO: stop mesa from clobbering these.
-    */
-   ctx->Driver.PointsFunc=imesa->PointsFunc;
-   ctx->Driver.LineFunc=imesa->LineFunc;
-   ctx->Driver.TriangleFunc=imesa->TriangleFunc;
-   ctx->Driver.QuadFunc=imesa->QuadFunc;
+   if (!imesa->Fallback)
+   {
+      ctx->IndirectTriangles &= ~DD_SW_RASTERIZE;
+      ctx->IndirectTriangles |= imesa->IndirectTriangles;
+
+      ctx->Driver.PointsFunc=imesa->PointsFunc;
+      ctx->Driver.LineFunc=imesa->LineFunc;
+      ctx->Driver.TriangleFunc=imesa->TriangleFunc;
+      ctx->Driver.QuadFunc=imesa->QuadFunc;
+   }
 }
 
 
@@ -904,7 +990,6 @@
 {
    ctx->Driver.UpdateState = i810DDUpdateState;
    ctx->Driver.Enable = i810DDEnable;
-   ctx->Driver.LightModelfv = i810DDLightModelfv;
    ctx->Driver.AlphaFunc = i810DDAlphaFunc;
    ctx->Driver.BlendEquation = i810DDBlendEquation;
    ctx->Driver.BlendFunc = i810DDBlendFunc;
@@ -919,15 +1004,20 @@
    ctx->Driver.ReducedPrimitiveChange = i810DDReducedPrimitiveChange;
    ctx->Driver.RenderStart = i810DDUpdateHwState; 
    ctx->Driver.RenderFinish = 0; 
-
-   ctx->Driver.SetBuffer = i810DDSetBuffer;
+   ctx->Driver.PolygonStipple = i810DDPolygonStipple;
+   ctx->Driver.LineStipple = 0;
+   ctx->Driver.SetReadBuffer = i810DDSetReadBuffer;
+   ctx->Driver.SetDrawBuffer = i810DDSetDrawBuffer;
    ctx->Driver.Color = i810DDSetColor;
    ctx->Driver.ClearColor = i810DDClearColor;
    ctx->Driver.Dither = i810DDDither;
-
    ctx->Driver.Index = 0;
    ctx->Driver.ClearIndex = 0;
    ctx->Driver.IndexMask = 0;
 
+   if (IS_I815(I810_CONTEXT(ctx))) {
+      ctx->Driver.LightModelfv = i810DDLightModelfv_i815;
+   } else {
+      ctx->Driver.LightModelfv = i810DDLightModelfv;
+   }
 }
-
Index: xc/lib/GL/mesa/src/drv/i810/i810state.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810state.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810state.h:1.2
--- xc/lib/GL/mesa/src/drv/i810/i810state.h:1.1	Fri Feb 11 09:25:32 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810state.h	Fri Jun 16 17:03:00 2000
@@ -1,13 +1,12 @@
 #ifndef _I810_STATE_H
 #define _I810_STATE_H
 
+#include "i810context.h"
 
 extern void i810DDUpdateHwState( GLcontext *ctx );
 extern void i810DDUpdateState( GLcontext *ctx );
 extern void i810DDInitState( i810ContextPtr imesa );
 extern void i810DDInitStateFuncs( GLcontext *ctx );
-
-extern void i810DDPrintState( const char *msg, GLuint state );
 
 
 #endif
Index: xc/lib/GL/mesa/src/drv/i810/i810swap.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810swap.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810swap.c:removed
--- xc/lib/GL/mesa/src/drv/i810/i810swap.c:1.1	Fri Feb 11 09:25:32 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810swap.c	Sat Jul  1 20:44:35 2000
@@ -1,259 +0,0 @@
-
-
-#include "types.h"
-#include "vbrender.h"
-#include "i810log.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "mm.h"
-#include "i810lib.h"
-#include "i810dd.h"
-#include "i810dma.h"
-#include "i810state.h"
-#include "i810swap.h"
-#include "i810dma.h"
-
-/*
- * i810BackToFront
- *
- * Blit the visible rectangles from the back buffer to the screen.
- * Respects the frontbuffer cliprects, and applies the offset
- * necessary if the backbuffer is positioned elsewhere in the screen.
- */
-static int i810BackToFront( i810ContextPtr imesa ) 
-{
-   __DRIdrawablePrivate *dPriv = imesa->driDrawable;
-   i810ScreenPrivate *i810Screen = imesa->i810Screen;
-
-
-   /* Use the frontbuffer cliprects:
-    */
-   XF86DRIClipRectPtr pbox = dPriv->pClipRects;
-   int nbox = dPriv->numClipRects;
-
-   if( nbox ) 
-   {
-      int i;
-      int pitch = i810Screen->auxPitch;
-
-      int dx = dPriv->auxX - dPriv->x;
-      int dy = dPriv->auxY - dPriv->y;
-      int ofs = ( i810Screen->backOffset + 
-		  dy * i810Screen->auxPitch +
-		  dx * i810Screen->cpp);
-
-      unsigned int BR13 = ((i810Screen->fbStride) |
-			   (0xCC << 16));
-
-
-      for (i=0; i < nbox; i++, pbox++) {
-	 int w = pbox->x2 - pbox->x1;
-	 int h = pbox->y2 - pbox->y1;
-
-	 int start = ofs + pbox->x1*i810Screen->cpp + pbox->y1*pitch;
-	 int dst = pbox->x1*i810Screen->cpp + pbox->y1*i810Screen->fbStride;
-	 
-	 if (I810_DEBUG&DEBUG_VERBOSE_2D) 
-	    fprintf(stderr, "i810BackToFront %d,%d-%dx%d\n",
-		    pbox->x1,pbox->y1,w,h);
-
-	 {
-	    BEGIN_BATCH( imesa, 6 );
-	    OUT_BATCH( BR00_BITBLT_CLIENT | BR00_OP_SRC_COPY_BLT | 0x4 );
-	    OUT_BATCH( BR13 );	/* dest pitch, rop */
-
-	    OUT_BATCH( (h << 16) | (w * i810Screen->cpp));
-	    OUT_BATCH( dst );
-
-	    OUT_BATCH( pitch );	/* src pitch */
-	    OUT_BATCH( start );
-	    ADVANCE_BATCH();
-	 }
-      }
-   }
-  
-   return Success;   
-}
-
-
-/*
- * ClearBox
- *
- * Add hardware commands to draw a filled box for the debugging
- * display.  These are drawn into the current drawbuffer, so should
- * work with both front and backbuffer rendering.  (However, it
- * is only ever called on swapbuffer - ie backbuffer rendering).
- */
-static void ClearBox( i810ContextPtr imesa,
-		      int cx, int cy, int cw, int ch, 
-		      int r, int g, int b ) 
-{
-   __DRIdrawablePrivate *dPriv = imesa->driDrawable;
-   i810ScreenPrivate *i810Screen = imesa->i810Screen;
-
-   int _nc = imesa->numClipRects;
-      
-   while (_nc--) {
-      int x1 = cx + dPriv->x;
-      int y1 = cy + dPriv->y;
-      int x2 = x1 + cw;
-      int y2 = y1 + ch;
-
-      if (imesa->needClip) {
-	 int rx1 = imesa->pClipRects[_nc].x1;
-	 int ry1 = imesa->pClipRects[_nc].y1;
-	 int rx2 = imesa->pClipRects[_nc].x2;
-	 int ry2 = imesa->pClipRects[_nc].y2;
-
-
-	 if (x2 < rx1) continue;
-	 if (y2 < ry1) continue;
-	 if (x1 > rx2) continue;
-	 if (y1 > ry2) continue;
-	 if (x1 < rx1) x1 = rx1;
-	 if (y1 < ry1) y1 = ry1;
-	 if (x2 > rx2) x2 = rx2;
-	 if (y2 > ry2) y2 = ry2;
-      }
-
-
-      {
-	 int start = (imesa->drawOffset + 
-		      y1 * i810Screen->auxPitch + 
-		      x1 * i810Screen->cpp);
-
-	 BEGIN_BATCH( imesa, 6 );
-   
-	 OUT_BATCH( BR00_BITBLT_CLIENT | BR00_OP_COLOR_BLT | 0x3 );
-	 OUT_BATCH( BR13_SOLID_PATTERN | 
-		    (0xF0 << 16) |
-		    i810Screen->auxPitch );
-	 OUT_BATCH( ((y2-y1) << 16) | ((x2-x1) * i810Screen->cpp));
-	 OUT_BATCH( start );
-	 OUT_BATCH( i810PackColor( i810Screen->fbFormat, r, g, b, 0 ) );
-	 OUT_BATCH( 0 );
-
-	 if (I810_DEBUG&DEBUG_VERBOSE_2D) 
-	    fprintf(stderr, "box %d,%x %d,%d col %x (%d,%d,%d)\n", 
-		    (int)x1,(int)y1, (int)x2,(int)y2,
-		    (int)i810PackColor( i810Screen->fbFormat, r, g, b, 0 ), 
-		    (int)r, (int)g, (int)b);
-	 
-	 ADVANCE_BATCH();
-      }
-   }
-}
-
-
-/*
- * performanceBoxes
- * Draw some small boxesin the corner of the buffer
- * based on some performance information
- */
-static void i810PerformanceBoxes( i810ContextPtr imesa ) {
-	
-
-   /* draw a box to show we are active, so if it is't seen it means
-      that it is completely software based.  Purple is traditional for
-      direct rendering */
-   ClearBox( imesa, 4, 4, 8, 8, 255, 0, 255 );
-	
-   /* draw a red box if we had to wait for drawing to complete 
-      (software render or texture swap) */
-   if ( i810glx.c_drawWaits ) {
-      ClearBox( imesa, 16, 4, 8, 8, 255, 0, 0 );
-      i810glx.c_drawWaits = 0;
-   }
-	
-   /* draw a blue box if the 3d context was lost
-    */
-   if ( i810glx.c_ctxlost ) {
-      ClearBox( imesa, 28, 4, 8, 8, 0, 0, 255 );
-      i810glx.c_ctxlost = 0;
-   }
-	
-   /* draw an orange box if texture state was stomped */
-   if ( i810glx.c_texlost ) {
-      ClearBox( imesa, 40, 4, 8, 8, 255, 128, 0 );
-      i810glx.c_texlost = 0;
-   }
-
-   /* draw a yellow box if textures were swapped */
-   if ( i810glx.c_textureSwaps ) {
-      ClearBox( imesa, 56, 4, 8, 8, 255, 255, 0 );
-      i810glx.c_textureSwaps = 0;
-   }
-		
-   /* draw a green box if we had to wait for dma to complete (full utilization) 
-      on the previous frame */
-   if ( !i810glx.hardwareWentIdle ) {
-      ClearBox( imesa, 72, 4, 8, 8, 0, 255, 0 );
-   }
-   i810glx.hardwareWentIdle = 0;
-	
-#if 0
-   /* show buffer utilization */
-   if ( i810glx.c_dmaFlush > 1 ) {
-      /* draw a solid bar if we flushed more than one buffer */
-      ClearBox( imesa, 4, 16, 252, 4, 255, 32, 32 );
-   } else {
-      /* draw bars to represent the utilization of primary and
-         secondary buffers */
-      ClearBox( imesa, 4, 16, 252, 4, 32, 32, 32 );
-      t = i810glx.dma_buffer->mem.Size;
-      w = 252 * i810glx.dma_buffer->head / t;
-      if ( w < 1 ) {
-	 w = 1;
-      }
-      ClearBox( imesa, 4, 16, w, 4, 196, 128, 128 );
-   }
-#endif
-
-   i810glx.c_dmaFlush = 0;
-}
-
-
-static void i810SendDmaFlush( i810ContextPtr imesa )
-{
-   BEGIN_BATCH( imesa, 2 );
-   OUT_BATCH( INST_PARSER_CLIENT | INST_OP_FLUSH );
-   OUT_BATCH( 0 );
-   ADVANCE_BATCH();
-}
-
-void i810SwapBuffers( i810ContextPtr imesa )
-{
-   if (I810_DEBUG & DEBUG_VERBOSE_API)
-      fprintf(stderr, "i810SwapBuffers()\n");
-
-   LOCK_HARDWARE( imesa );
-   i810SendDmaFlush( imesa );
-   if ( i810glx.boxes )  
-      i810PerformanceBoxes( imesa );
-   i810BackToFront( imesa );
-
-   /* Check if we are emitting thousands of tiny frames, and if so
-    * throttle them.  Would be better to simply go to sleep until
-    * our stuff had cleared, rather than polling.  A dma solution
-    * should provide for this.
-    */   
-   if (imesa->lastSwap >= imesa->sarea->lastWrap &&
-       imesa->lastSwap >= imesa->sarea->lastSync) {
-
-      if (I810_DEBUG & DEBUG_VERBOSE_API)
-	 fprintf(stderr, ".");
-
-      _I810Sync( imesa );
-   }
-
-   imesa->lastSwap = imesa->sarea->lastSync;
-   if (imesa->sarea->lastWrap > imesa->lastSwap) 
-      imesa->lastSwap = imesa->sarea->lastWrap;
-      
-   
-   UNLOCK_HARDWARE( imesa );
-
-/*     XSync(imesa->display, 0); */
-}
Index: xc/lib/GL/mesa/src/drv/i810/i810swap.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810swap.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810swap.h:removed
--- xc/lib/GL/mesa/src/drv/i810/i810swap.h:1.1	Fri Feb 11 09:25:32 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810swap.h	Sat Jul  1 20:44:35 2000
@@ -1,6 +0,0 @@
-#ifndef I810_SWAP_H
-#define I810_SWAP_H
-
-extern void i810SwapBuffers( i810ContextPtr imesa );
-
-#endif
Index: xc/lib/GL/mesa/src/drv/i810/i810tex.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810tex.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810tex.c:1.3
--- xc/lib/GL/mesa/src/drv/i810/i810tex.c:1.1	Fri Feb 11 09:25:33 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810tex.c	Mon Jun 19 22:08:40 2000
@@ -28,9 +28,10 @@
 #include <GL/gl.h>
 
 #include "mm.h"
-#include "i810lib.h"
+#include "i810context.h"
 #include "i810tex.h"
 #include "i810log.h"
+#include "i810ioctl.h"
 #include "simple_list.h"
 #include "enums.h"
 
@@ -50,7 +51,9 @@
    tex->Setup[I810_TEXREG_MCS] = val;
 }
 
-static void i810SetTexFilter(i810TextureObjectPtr t, GLenum minf, GLenum magf)
+static void i810SetTexFilter(i810ContextPtr imesa, 
+			     i810TextureObjectPtr t, 
+			     GLenum minf, GLenum magf)
 {
    GLuint LastLevel;
 
@@ -76,14 +79,30 @@
 		     MF_MIN_LINEAR | MF_MIP_NEAREST);
       break;
    case GL_NEAREST_MIPMAP_LINEAR:
-      I810_SET_FIELD(t->Setup[I810_TEXREG_MF],
-		     MF_MIN_MASK | MF_MIP_MASK,
-		     MF_MIN_NEAREST | MF_MIP_DITHER );
+      /* This is quite a performance hit - may want to make this
+       * choice user-configurable, otherwise the 815 may look slower
+       * than the 810 (despite having much better image quality).
+       */
+      if (IS_I815(imesa)) {
+	 I810_SET_FIELD(t->Setup[I810_TEXREG_MF],
+			MF_MIN_MASK | MF_MIP_MASK,
+			MF_MIN_NEAREST | MF_MIP_LINEAR );
+      } else {
+	 I810_SET_FIELD(t->Setup[I810_TEXREG_MF],
+			MF_MIN_MASK | MF_MIP_MASK,
+			MF_MIN_NEAREST | MF_MIP_DITHER );
+      }
       break;
    case GL_LINEAR_MIPMAP_LINEAR:
-      I810_SET_FIELD(t->Setup[I810_TEXREG_MF],
-		     MF_MIN_MASK | MF_MIP_MASK,
-		     MF_MIN_LINEAR  | MF_MIP_DITHER );
+      if (IS_I815(imesa)) {
+	 I810_SET_FIELD(t->Setup[I810_TEXREG_MF],
+			MF_MIN_MASK | MF_MIP_MASK,
+			MF_MIN_LINEAR  | MF_MIP_LINEAR );
+      } else {
+	 I810_SET_FIELD(t->Setup[I810_TEXREG_MF],
+			MF_MIN_MASK | MF_MIP_MASK,
+			MF_MIN_LINEAR  | MF_MIP_DITHER );
+      }
       break;
    default:
       i810Error("i810SetTexFilter(): not supported min. filter %d\n",(int)minf);
@@ -102,8 +121,7 @@
    default:
       i810Error("i810SetTexFilter(): not supported mag. filter %d\n",(int)magf);
       break;
-   }
-  
+   }  
 
    if (t->globj->MinFilter != GL_NEAREST && 
        t->globj->MinFilter != GL_LINEAR) {
@@ -147,11 +165,12 @@
 
 
 
-static void ReplicateMesaTexState(i810TextureObjectPtr t,
+static void ReplicateMesaTexState(i810ContextPtr imesa,
+				  i810TextureObjectPtr t,
                                   struct gl_texture_object *mesatex)
 {
    i810SetTexWrapping(t,mesatex->WrapS,mesatex->WrapT);
-   i810SetTexFilter(t,mesatex->MinFilter,mesatex->MagFilter);
+   i810SetTexFilter(imesa, t,mesatex->MinFilter,mesatex->MagFilter);
    i810SetTexBorderColor(t,mesatex->BorderColor);
 }
 
@@ -204,6 +223,7 @@
       log_pitch++;
    
    t->dirty_images = 0;
+   t->bound = 0;
    
    for ( height = i = 0 ; i < I810_TEX_MAXLEVELS && tObj->Image[i] ; i++ ) {
       t->image[i].image = tObj->Image[i];
@@ -269,7 +289,7 @@
 
    t->current_unit = 0;
 
-   ReplicateMesaTexState(t,tObj);
+   ReplicateMesaTexState(imesa, t,tObj);
    tObj->DriverData = t;
    imesa->dirty |= I810_UPLOAD_CTX;
    make_empty_list( t );
@@ -278,24 +298,24 @@
 
 void i810DestroyTexObj(i810ContextPtr imesa, i810TextureObjectPtr t)
 {
-   int i;
    if (!t) return;
 
    /* This is sad - need to sync *in case* we upload a texture
     * to this newly free memory...
     */
    if (t->MemBlock) {
-      imesa->dirty |= I810_REQUIRE_QUIESCENT;
       mmFreeMem(t->MemBlock);
-      t->MemBlock = 0;      
+      t->MemBlock = 0;
+
+      if (t->age > imesa->dirtyAge)
+	 imesa->dirtyAge = t->age;
    }
 
    if (t->globj)
       t->globj->DriverData = 0;
 
-   for ( i = 0 ; i < 2 ; i++ ) 
-      if ( imesa->CurrentTexObj[i] == t ) 
-	 imesa->CurrentTexObj[i] = 0;
+   if (t->bound)
+      imesa->CurrentTexObj[t->bound - 1] = 0; 
 
    remove_from_list(t);
    free(t);
@@ -305,9 +325,11 @@
 static void i810SwapOutTexObj(i810ContextPtr imesa, i810TextureObjectPtr t)
 {
    if (t->MemBlock) {
-      imesa->dirty |= I810_REQUIRE_QUIESCENT;
       mmFreeMem(t->MemBlock);
       t->MemBlock = 0;      
+
+      if (t->age > imesa->dirtyAge)
+	 imesa->dirtyAge = t->age;
    }
 
    t->dirty_images = ~0;
@@ -413,13 +435,28 @@
    }
    break;
 
+   case GL_ALPHA:
+   {
+      GLushort *dst = (GLushort *)(t->BufAddr + t->image[level].offset);
+      GLubyte  *src = (GLubyte *)image->Data;
+      i810Msg(10,"  CopyA: %p %p\n", dst, src);      
+
+      for (j = 0 ; j < image->Height ; j++, dst += (t->Pitch/2)) {
+	 for (i = 0 ; i < image->Width ; i++) {
+	    dst[i] = I810PACKCOLOR4444(255,255,255,src[0]);
+	    src += 1;
+	 }
+      }
+   }
+   break;
+
    /* TODO: Translate color indices *now*:
     */
    case GL_COLOR_INDEX:
       {
 	 GLubyte *dst = (GLubyte *)(t->BufAddr + t->image[level].offset);
 	 GLubyte *src = (GLubyte *)image->Data;
-	 i810Msg(10,"  CopyIndex  %p %p\n", dst, src);      
+	 i810Msg(10,"  CopyIndex: %p %p\n", dst, src);      
 
 	 for (j = 0 ; j < image->Height ; j++, dst += t->Pitch) {
 	    for (i = 0 ; i < image->Width ; i++) {
@@ -431,8 +468,8 @@
    break;
       
    default:
-      i810Error("Not supported texture format %d\n",(int)image->Format);
-      exit(1);
+      i810Error("Not supported texture format %s\n",
+		gl_lookup_enum_by_nr(image->Format));
    }
 }
 
@@ -449,13 +486,19 @@
 		 t->MemBlock->ofs / sz,
 		 t->MemBlock->ofs,
 		 t->MemBlock->size);      
+      else
+	 fprintf(stderr, "Texture (bound %d) at %x sz %x\n", 
+		 t->bound,
+		 t->MemBlock->ofs,
+		 t->MemBlock->size);      
+
    }
 }
 
 void i810PrintGlobalLRU( i810ContextPtr imesa )
 {
    int i, j;
-   i810TexRegion *list = imesa->sarea->texList;
+   drm_i810_tex_region_t *list = imesa->sarea->texList;
 
    for (i = 0, j = I810_NR_TEX_REGIONS ; i < I810_NR_TEX_REGIONS ; i++) {
       fprintf(stderr, "list[%d] age %d next %d prev %d\n",
@@ -471,7 +514,7 @@
 
 void i810ResetGlobalLRU( i810ContextPtr imesa )
 {
-   i810TexRegion *list = imesa->sarea->texList;
+   drm_i810_tex_region_t *list = imesa->sarea->texList;
    int sz = 1 << imesa->i810Screen->logTextureGranularity;
    int i;
 
@@ -481,7 +524,7 @@
     * when looking up objects at a particular location in texture
     * memory.  
     */
-   for (i = 0 ; (i+1) * sz < imesa->i810Screen->textureSize ; i++) {
+   for (i = 0 ; (i+1) * sz <= imesa->i810Screen->textureSize ; i++) {
       list[i].prev = i-1;
       list[i].next = i+1;
       list[i].age = 0;
@@ -503,7 +546,7 @@
    int logsz = imesa->i810Screen->logTextureGranularity;
    int start = t->MemBlock->ofs >> logsz;
    int end = (t->MemBlock->ofs + t->MemBlock->size - 1) >> logsz;
-   i810TexRegion *list = imesa->sarea->texList;
+   drm_i810_tex_region_t *list = imesa->sarea->texList;
    
    imesa->texAge = ++imesa->sarea->texAge;
 
@@ -556,7 +599,7 @@
       /* It overlaps - kick it off.  Need to hold onto the currently bound
        * objects, however.
        */
-      if (t == imesa->CurrentTexObj[0] || t == imesa->CurrentTexObj[1]) 
+      if (t->bound)
 	 i810SwapOutTexObj( imesa, t );
       else
 	 i810DestroyTexObj( imesa, t );
@@ -583,7 +626,6 @@
 {
    int i;
    int ofs;
-   i810glx.c_textureSwaps++;
 
    /* Do we need to eject LRU texture objects?
     */
@@ -594,18 +636,24 @@
 	 if (t->MemBlock)
 	    break;
 
+	 if (imesa->TexObjList.prev->bound) {
+  	    fprintf(stderr, "Hit bound texture in upload\n"); 
+	    i810PrintLocalLRU( imesa );
+	    return -1;
+	 }
+
 	 if (imesa->TexObjList.prev == &(imesa->TexObjList)) {
-	    fprintf(stderr, "Failed to upload texture, sz %d\n", t->totalSize);
+ 	    fprintf(stderr, "Failed to upload texture, sz %d\n", t->totalSize);
 	    mmDumpMemInfo( imesa->texHeap );
 	    return -1;
 	 }
-
+	 
 	 i810DestroyTexObj( imesa, imesa->TexObjList.prev );
       }
  
       ofs = t->MemBlock->ofs;
       t->Setup[I810_TEXREG_MI3] = imesa->i810Screen->textureOffset + ofs;
-      t->BufAddr = i810glx.texVirtual + ofs;
+      t->BufAddr = imesa->i810Screen->tex.map + ofs;
       imesa->dirty |= I810_UPLOAD_CTX;
    }
 
@@ -613,6 +661,14 @@
     */
    i810UpdateTexLRU( imesa, t );
 
+   if (I810_DEBUG & DEBUG_VERBOSE_LRU)
+      fprintf(stderr, "dispatch age: %d age freed memory: %d\n",
+	      GET_DISPATCH_AGE(imesa), imesa->dirtyAge);
+
+   if (imesa->dirtyAge >= GET_DISPATCH_AGE(imesa)) 
+      i810WaitAgeLocked( imesa, imesa->dirtyAge );
+   
+
    if (t->dirty_images) {
       if (I810_DEBUG & DEBUG_VERBOSE_LRU)
 	 fprintf(stderr, "*");
@@ -694,21 +750,37 @@
     
    if (t->dirty_images) 
       imesa->dirty |= I810_UPLOAD_TEX0IMAGE;
-
+   
    imesa->CurrentTexObj[0] = t;
+   t->bound = 1;
+
+   if (t->MemBlock)
+      i810UpdateTexLRU( imesa, t );
   
    switch (ctx->Texture.Unit[0].EnvMode) {
-      case GL_REPLACE:
-      imesa->Setup[I810_CTXREG_MC0] = ( GFX_OP_MAP_COLOR_STAGES |
-					MC_STAGE_0 |
-					MC_UPDATE_DEST |
-					MC_DEST_CURRENT |
-					MC_UPDATE_ARG1 |
-					MC_ARG1_TEX0_COLOR | 
-					MC_UPDATE_ARG2 |
-					MC_ARG2_ONE |
-					MC_UPDATE_OP |
-					MC_OP_ARG1 );
+   case GL_REPLACE:
+      if (t->image[0].internalFormat == GL_ALPHA) 
+	 imesa->Setup[I810_CTXREG_MC0] = ( GFX_OP_MAP_COLOR_STAGES |
+					   MC_STAGE_0 |
+					   MC_UPDATE_DEST |
+					   MC_DEST_CURRENT |
+					   MC_UPDATE_ARG1 |
+					   MC_ARG1_TEX0_COLOR | 
+					   MC_UPDATE_ARG2 |
+					   MC_ARG2_ITERATED_COLOR |
+					   MC_UPDATE_OP |
+					   MC_OP_ARG2 );
+      else 
+	 imesa->Setup[I810_CTXREG_MC0] = ( GFX_OP_MAP_COLOR_STAGES |
+					   MC_STAGE_0 |
+					   MC_UPDATE_DEST |
+					   MC_DEST_CURRENT |
+					   MC_UPDATE_ARG1 |
+					   MC_ARG1_TEX0_COLOR | 
+					   MC_UPDATE_ARG2 |
+					   MC_ARG2_ONE |
+					   MC_UPDATE_OP |
+					   MC_OP_ARG1 );
 
       if (t->image[0].internalFormat == GL_RGB) {
 	 ma_modulate_op = MA_OP_ARG1;
@@ -812,16 +884,28 @@
 					MA_OP_ARG1 );
       break;
    case GL_BLEND:
-      imesa->Setup[I810_CTXREG_MC0] = ( GFX_OP_MAP_COLOR_STAGES |
-					MC_STAGE_0 |
-					MC_UPDATE_DEST |
-					MC_DEST_CURRENT |
-					MC_UPDATE_ARG1 |
-					MC_ARG1_COLOR_FACTOR | 
-					MC_UPDATE_ARG2 |
-					MC_ARG2_ITERATED_COLOR |
-					MC_UPDATE_OP |
-					MC_OP_LIN_BLEND_TEX0_COLOR );
+      if (t->image[0].internalFormat == GL_ALPHA) 
+	 imesa->Setup[I810_CTXREG_MC0] = ( GFX_OP_MAP_COLOR_STAGES |
+					   MC_STAGE_0 |
+					   MC_UPDATE_DEST |
+					   MC_DEST_CURRENT |
+					   MC_UPDATE_ARG1 |
+					   MC_ARG1_TEX0_COLOR | 
+					   MC_UPDATE_ARG2 |
+					   MC_ARG2_ITERATED_COLOR |
+					   MC_UPDATE_OP |
+					   MC_OP_ARG2 );
+      else 
+	 imesa->Setup[I810_CTXREG_MC0] = ( GFX_OP_MAP_COLOR_STAGES |
+					   MC_STAGE_0 |
+					   MC_UPDATE_DEST |
+					   MC_DEST_CURRENT |
+					   MC_UPDATE_ARG1 |
+					   MC_ARG1_COLOR_FACTOR | 
+					   MC_UPDATE_ARG2 |
+					   MC_ARG2_ITERATED_COLOR |
+					   MC_UPDATE_OP |
+					   MC_OP_LIN_BLEND_TEX0_COLOR );
 
       if (t->image[0].internalFormat == GL_RGB) {
 	 imesa->Setup[I810_CTXREG_MA0] = ( GFX_OP_MAP_ALPHA_STAGES |
@@ -911,7 +995,10 @@
       imesa->dirty |= I810_UPLOAD_TEX1IMAGE;
 
    imesa->CurrentTexObj[1] = t;
+   t->bound = 2;
 
+   if (t->MemBlock)
+      i810UpdateTexLRU( imesa, t );
 
    switch (ctx->Texture.Unit[1].EnvMode) {
    case GL_REPLACE:
@@ -1078,11 +1165,15 @@
 void i810UpdateTextureState( GLcontext *ctx )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
+   if (imesa->CurrentTexObj[0]) imesa->CurrentTexObj[0]->bound = 0;
+   if (imesa->CurrentTexObj[1]) imesa->CurrentTexObj[1]->bound = 0;
    imesa->CurrentTexObj[0] = 0;
-   imesa->CurrentTexObj[1] = 0;
+   imesa->CurrentTexObj[1] = 0;   
    i810UpdateTex0State( ctx );
    i810UpdateTex1State( ctx );
-   I810_CONTEXT( ctx )->dirty |= I810_UPLOAD_CTX;
+   I810_CONTEXT( ctx )->dirty |= (I810_UPLOAD_CTX |
+				  I810_UPLOAD_TEX0 | 
+				  I810_UPLOAD_TEX1);
 }
 
 
@@ -1091,25 +1182,30 @@
  * DRIVER functions
  *****************************************/
 
-static void i810TexEnv( GLcontext *ctx, GLenum pname, const GLfloat *param )
+static void i810TexEnv( GLcontext *ctx, GLenum target, 
+			GLenum pname, const GLfloat *param )
 {
    i810ContextPtr imesa = I810_CONTEXT( ctx );
 
    if (pname == GL_TEXTURE_ENV_MODE) {
 
+      FLUSH_BATCH(imesa);	
       imesa->new_state |= I810_NEW_TEXTURE;
 
    } else if (pname == GL_TEXTURE_ENV_COLOR) {
 
       struct gl_texture_unit *texUnit = 
 	 &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-      GLubyte c[4];
+      GLfloat *fc = texUnit->EnvColor;
       GLuint col;
 
-      FLOAT_RGBA_TO_UBYTE_RGBA(texUnit->EnvColor, c);
-      col = (c[3]<<24) | (c[0]<<16) | (c[1]<<8) | (c[2]);
+      col = ((((GLubyte)fc[3])<<24) | 
+	     (((GLubyte)fc[0])<<16) | 
+	     (((GLubyte)fc[1])<<8) | 
+	     (((GLubyte)fc[2])<<0));
     
       if (imesa->Setup[I810_CTXREG_CF1] != col) {
+	 FLUSH_BATCH(imesa);	
 	 imesa->Setup[I810_CTXREG_CF1] = col;      
 	 imesa->dirty |= I810_UPLOAD_CTX;
       }
@@ -1137,6 +1233,7 @@
 
    t = (i810TextureObjectPtr) tObj->DriverData;
    if (t) {
+      if (t->bound) FLUSH_BATCH(imesa);
       /* if this is the current object, it will force an update */
       i810DestroyTexObj( imesa, t );
       tObj->DriverData = 0;
@@ -1163,10 +1260,10 @@
    
    t = (i810TextureObjectPtr) tObj->DriverData;
    if (t) {
+      if (t->bound) FLUSH_BATCH( imesa );
       i810DestroyTexObj( imesa, t );
       tObj->DriverData = 0;
       imesa->new_state |= I810_NEW_TEXTURE;
-      i810glx.c_textureSwaps++;
    }
 }
 
@@ -1183,15 +1280,18 @@
    switch (pname) {
    case GL_TEXTURE_MIN_FILTER:
    case GL_TEXTURE_MAG_FILTER:
-      i810SetTexFilter(t,tObj->MinFilter,tObj->MagFilter);
+      if (t->bound) FLUSH_BATCH( imesa );
+      i810SetTexFilter(imesa, t,tObj->MinFilter,tObj->MagFilter);
       break;
 
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
+      if (t->bound) FLUSH_BATCH( imesa );
       i810SetTexWrapping(t,tObj->WrapS,tObj->WrapT);
       break;
   
    case GL_TEXTURE_BORDER_COLOR:
+      if (t->bound) FLUSH_BATCH( imesa );
       i810SetTexBorderColor(t,tObj->BorderColor);
       break;
 
@@ -1206,7 +1306,14 @@
 			     struct gl_texture_object *tObj )
 {
    i810ContextPtr imesa = I810_CONTEXT( ctx );
-   imesa->CurrentTexObj[ctx->Texture.CurrentUnit] = 0;  
+   
+   FLUSH_BATCH(imesa);
+
+   if (imesa->CurrentTexObj[ctx->Texture.CurrentUnit]) {
+      imesa->CurrentTexObj[ctx->Texture.CurrentUnit]->bound = 0;
+      imesa->CurrentTexObj[ctx->Texture.CurrentUnit] = 0;  
+   }
+
    imesa->new_state |= I810_NEW_TEXTURE;
 }
 
@@ -1216,6 +1323,13 @@
    i810ContextPtr imesa = I810_CONTEXT( ctx );
 
    if (t) {
+
+      if (t->bound) {
+	 FLUSH_BATCH(imesa);
+	 imesa->CurrentTexObj[t->bound-1] = 0;
+	 imesa->new_state |= I810_NEW_TEXTURE;
+      }
+
       i810DestroyTexObj(imesa,t);
       tObj->DriverData=0;
    }
Index: xc/lib/GL/mesa/src/drv/i810/i810tex.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810tex.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810tex.h:1.2
--- xc/lib/GL/mesa/src/drv/i810/i810tex.h:1.1	Fri Feb 11 09:25:33 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810tex.h	Fri Jun 16 17:03:00 2000
@@ -61,10 +61,11 @@
    int Height;
    int texelBytes;
    int totalSize;
+   int bound;
 
    PMemBlock MemBlock;   
    char *BufAddr;
-
+   
    GLuint min_level;
    GLuint max_level;
    GLuint dirty_images;
@@ -86,8 +87,6 @@
 #define I810_USE_PALETTE       0x1
 #define I810_UPDATE_PALETTE    0x2
 #define I810_FALLBACK_PALETTE  0x4
-
-typedef struct i810_texture_object_t *i810TextureObjectPtr;
 
 void i810UpdateTextureState( GLcontext *ctx );
 void i810DDInitTextureFuncs( GLcontext *ctx );
Index: xc/lib/GL/mesa/src/drv/i810/i810tris.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810tris.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810tris.c:1.2
--- xc/lib/GL/mesa/src/drv/i810/i810tris.c:1.1	Fri Feb 11 09:25:33 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810tris.c	Fri Jun 16 17:03:00 2000
@@ -26,35 +26,17 @@
 #include <stdio.h>
 #include <math.h>
 
+#include "types.h"
 #include "vb.h"
 #include "pipeline.h"
 
 #include "mm.h"
-#include "i810lib.h"
 #include "i810tris.h"
 #include "i810vb.h"
 #include "i810log.h"
 
-
-static void i810_null_quad( GLcontext *ctx, GLuint v0,
-			    GLuint v1, GLuint v2, GLuint v3, GLuint pv )
-{
-}     
-
-static void i810_null_triangle( GLcontext *ctx, GLuint v0,
-				GLuint v1, GLuint v2, GLuint pv )
-{
-}     
-
-static void i810_null_line( GLcontext *ctx, GLuint v1, GLuint v2, GLuint pv ) 
-{
-}
-
-static void i810_null_points( GLcontext *ctx, GLuint first, GLuint last ) 
-{
-}
-
-
+/* Used in i810tritmp.h
+ */
 #define I810_COLOR(to, from) {			\
   (to)[0] = (from)[2];				\
   (to)[1] = (from)[1];				\
@@ -69,17 +51,6 @@
 static line_func     line_tab[0x20];  
 static points_func   points_tab[0x20];
 
-void i810PrintRenderState( const char *msg, GLuint state )
-{
-   fprintf(stderr, "%s: (%x) %s%s%s%s%s%s\n",
-	   msg, (int) state,
-	   (state & I810_FLAT_BIT)       ? "flat, "       : "",
-	   (state & I810_OFFSET_BIT)     ? "offset, "     : "",
-	   (state & I810_TWOSIDE_BIT)    ? "twoside, "    : "",
-	   (state & I810_ANTIALIAS_BIT)  ? "antialias, "  : "",
-	   (state & I810_NODRAW_BIT)     ? "no-draw, "    : "",
-	   (state & I810_FALLBACK_BIT)   ? "fallback"     : "");
-}
 
 #define IND (0)
 #define TAG(x) x
@@ -89,33 +60,32 @@
 #define TAG(x) x##_flat
 #include "i810tritmp.h"
 
-#define IND (I810_OFFSET_BIT)
+#define IND (I810_OFFSET_BIT)	/* wide */
 #define TAG(x) x##_offset
 #include "i810tritmp.h"
 
-#define IND (I810_OFFSET_BIT|I810_FLAT_BIT)
+#define IND (I810_OFFSET_BIT|I810_FLAT_BIT) /* wide|flat */
 #define TAG(x) x##_offset_flat
 #include "i810tritmp.h"
 
-#define IND (I810_TWOSIDE_BIT)
+#define IND (I810_TWOSIDE_BIT)	/* stipple */
 #define TAG(x) x##_twoside
 #include "i810tritmp.h"
 
-#define IND (I810_TWOSIDE_BIT|I810_FLAT_BIT)
+#define IND (I810_TWOSIDE_BIT|I810_FLAT_BIT) /* stipple|flat */
 #define TAG(x) x##_twoside_flat
 #include "i810tritmp.h"
 
-#define IND (I810_TWOSIDE_BIT|I810_OFFSET_BIT)
+#define IND (I810_TWOSIDE_BIT|I810_OFFSET_BIT) /* stipple|wide */
 #define TAG(x) x##_twoside_offset
 #include "i810tritmp.h"
 
-#define IND (I810_TWOSIDE_BIT|I810_OFFSET_BIT|I810_FLAT_BIT)
+#define IND (I810_TWOSIDE_BIT|I810_OFFSET_BIT|I810_FLAT_BIT) /* stip|wide|flat*/
 #define TAG(x) x##_twoside_offset_flat
 #include "i810tritmp.h"
 
 void i810DDTrifuncInit()
 {
-   int i;
    init();
    init_flat();
    init_offset();
@@ -124,128 +94,9 @@
    init_twoside_flat();
    init_twoside_offset();
    init_twoside_offset_flat();
-
-   /* Hmmm...
-    */
-   for (i = 0 ; i < 0x20 ; i++) {
-      if (i & ~I810_FLAT_BIT) {
-	 points_tab[i] = points_tab[i&I810_FLAT_BIT];
-	 line_tab[i] = line_tab[i&I810_FLAT_BIT];
-      }
-   }
-
-   for (i = 0 ; i < 0x20 ; i++) 
-      if ((i & (I810_NODRAW_BIT|I810_FALLBACK_BIT)) == I810_NODRAW_BIT ||
-	  i810glx.nullprims) 
-      {
-	 quad_tab[i] = i810_null_quad; 
-	 tri_tab[i] = i810_null_triangle; 
-	 line_tab[i] = i810_null_line;
-	 points_tab[i] = i810_null_points;
-      }
-
-   if (i810glx.noFallback) {
-      for (i = 0 ; i < 0x10 ; i++) {
-	 points_tab[i|I810_FALLBACK_BIT] = points_tab[i];
-	 line_tab[i|I810_FALLBACK_BIT] = line_tab[i];
-	 tri_tab[i|I810_FALLBACK_BIT] = tri_tab[i];
-	 quad_tab[i|I810_FALLBACK_BIT] = quad_tab[i];
-      }
-   }
-
-}
-
-
-/* Everything is done via single triangle instructiopns at the moment;
- * this can change fairly easily.
- */
-#if I810_USE_BATCH
-
-GLuint *i810AllocPrimitiveVerts( i810ContextPtr imesa, int dwords ) 
-{
-   GLuint orig_dwords = dwords;
-
-   dwords+=2;
-   dwords&=~1;
-
-   while (1) {
-      if (i810glx.dma_buffer->space < dwords * 4) 
-      {
-	 if (I810_DEBUG & DEBUG_VERBOSE_RING)
-	    fprintf(stderr, "i810AllocPrimitiveVerts: dma buffer overflow\n");
-	 i810DmaOverflow( dwords );
-      }
-      else
-      {
-	 GLuint start = i810glx.dma_buffer->head;
-	 i810glx.dma_buffer->head += dwords * 4;
-	 i810glx.dma_buffer->space -= dwords * 4;
-
-	 if ((orig_dwords & 1) == 0) {
-	    *(GLuint *)(i810glx.dma_buffer->virtual_start + start ) = 0;
-	    start += 4;
-	 }
-
-	 *(GLuint *)(i810glx.dma_buffer->virtual_start + start ) = 
-	    GFX_OP_PRIMITIVE | PR_TRIANGLES | (orig_dwords-1);
-
-	 return (GLuint *)(i810glx.dma_buffer->virtual_start + start + 4);
-      }
-   }
-}
-
-#else
-
-/* Hardware lock is held.
- */
-GLuint *i810AllocPrimitiveVerts( i810ContextPtr imesa, int dwords ) 
-{
-   GLuint orig_dwords = dwords;
-   
-   dwords+=2;
-   dwords&=~1;
-
-   while (1)
-   {
-      BEGIN_LP_RING( imesa, dwords );
-
-      if (outring + dwords * 4 != ((outring + dwords * 4) & ringmask)) 
-      {
-	 int i;
-
-	 if (I810_DEBUG & DEBUG_VERBOSE_RING)
-	    fprintf(stderr, "\n\nwrap case in i810AllocPrimitiveVerts\n\n");
-	 
-	 for (i = 0 ; i < dwords ; i++)
-	    OUT_RING( 0 );
-	 ADVANCE_LP_RING();
-      }
-      else 
-      {
-	 i810glx.LpRing.tail = outring + dwords * 4;
-	 
-	 if ((orig_dwords & 1) == 0)
-	    OUT_RING(0);
-	 
-	 OUT_RING( GFX_OP_PRIMITIVE | PR_TRIANGLES | (orig_dwords-1) );
-	 return (GLuint *)(virt + outring);
-      }
-   }
 }
 
-#if 0
-void i810FinishPrim( void )
-{
-   char *virt = i810glx.LpRing.virtual_start;
-
-   for (i = i810glx.LpRing.head ; i != i810glx.LpRing.tail ; i += 4) 
-      fprintf(stderr, "prim %x (%f)", *(virt + i), *(float *)(virt + i));
 
-   OUTREG(LP_RING + RING_TAIL, i810glx.LpRing.tail);
-}
-#endif 
-#endif
-
 
 
 void i810DDChooseRenderState( GLcontext *ctx )
@@ -253,50 +104,42 @@
    i810ContextPtr imesa = I810_CONTEXT( ctx );
    GLuint flags = ctx->TriangleCaps;
 
-   ctx->IndirectTriangles &= ~DD_SW_RASTERIZE;
+   imesa->IndirectTriangles = 0;
 
    if (flags) {
       GLuint ind = 0;
       GLuint shared = 0;
-      GLuint setup = imesa->setupindex;
-      GLuint fallback = I810_FALLBACK_BIT; 
-
-      if (i810glx.noFallback) fallback = 0; 
 
-      if ((flags & DD_FLATSHADE) && (setup & I810_RGBA_BIT)) shared |= I810_FLAT_BIT;
-      if (flags & DD_MULTIDRAW)                    shared |= fallback;
+      if (flags & DD_FLATSHADE)                    shared |= I810_FLAT_BIT;
+      if (flags & DD_MULTIDRAW)                    shared |= I810_FALLBACK_BIT;
       if (flags & DD_SELECT)                       shared |= I810_FALLBACK_BIT;
       if (flags & DD_FEEDBACK)                     shared |= I810_FALLBACK_BIT;
+      if (flags & DD_STENCIL)                      shared |= I810_FALLBACK_BIT;
 
-      ind = shared;
-      if (flags & DD_POINT_SMOOTH)                 ind |= I810_ANTIALIAS_BIT;
-      if (flags & DD_POINT_ATTEN)                  ind |= fallback;
-
-      imesa->renderindex = ind;
-      imesa->PointsFunc = points_tab[ind]; 
-      if (ind & I810_FALLBACK_BIT)  
-	 ctx->IndirectTriangles |= DD_POINT_SW_RASTERIZE;
+      imesa->renderindex = shared;
+      imesa->PointsFunc = points_tab[shared]; 
 
       ind = shared;
-      if (flags & DD_LINE_SMOOTH)                   ind |= I810_ANTIALIAS_BIT;
-      if (flags & DD_LINE_STIPPLE)                  ind |= fallback;
+      if (flags & DD_LINE_WIDTH)                    ind |= I810_WIDE_LINE_BIT;
+      if (flags & DD_LINE_STIPPLE)                  ind |= I810_FALLBACK_BIT;
 
       imesa->renderindex |= ind;
       imesa->LineFunc = line_tab[ind];
       if (ind & I810_FALLBACK_BIT) 
-	 ctx->IndirectTriangles |= DD_LINE_SW_RASTERIZE;
+	 imesa->IndirectTriangles |= DD_LINE_SW_RASTERIZE;
 
       ind = shared;
-      if (flags & DD_TRI_SMOOTH)                    ind |= I810_ANTIALIAS_BIT;
       if (flags & DD_TRI_OFFSET)                    ind |= I810_OFFSET_BIT;
       if (flags & DD_TRI_LIGHT_TWOSIDE)             ind |= I810_TWOSIDE_BIT;
-      if (flags & (DD_TRI_UNFILLED|DD_TRI_STIPPLE)) ind |= fallback;	
+      if (flags & DD_TRI_UNFILLED)                  ind |= I810_FALLBACK_BIT;
+      if ((flags & DD_TRI_STIPPLE) &&
+	  (ctx->IndirectTriangles & DD_TRI_STIPPLE)) ind |= I810_FALLBACK_BIT;	
 
       imesa->renderindex |= ind;
       imesa->TriangleFunc = tri_tab[ind];
       imesa->QuadFunc = quad_tab[ind];
       if (ind & I810_FALLBACK_BIT)
-	 ctx->IndirectTriangles |= (DD_TRI_SW_RASTERIZE|DD_QUAD_SW_RASTERIZE);
+	 imesa->IndirectTriangles |= (DD_TRI_SW_RASTERIZE|DD_QUAD_SW_RASTERIZE);
    } 
    else if (imesa->renderindex)
    {
@@ -307,9 +150,9 @@
       imesa->QuadFunc     = quad_tab[0];
    }
 
+
    if (I810_DEBUG&DEBUG_VERBOSE_API) {
       gl_print_tri_caps("tricaps", ctx->TriangleCaps);
-      i810PrintRenderState("i810: Render state", imesa->renderindex);
    }
 }
 
Index: xc/lib/GL/mesa/src/drv/i810/i810tris.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810tris.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810tris.h:1.2
--- xc/lib/GL/mesa/src/drv/i810/i810tris.h:1.1	Fri Feb 11 09:25:33 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810tris.h	Fri Jun 16 17:03:00 2000
@@ -27,62 +27,67 @@
 #define I810TRIS_INC
 
 #include "types.h"
-#include "i810dma.h"
+#include "i810ioctl.h"
 
 extern void i810PrintRenderState( const char *msg, GLuint state );
 extern void i810DDChooseRenderState(GLcontext *ctx);
 extern void i810DDTrifuncInit( void );
 
-extern GLuint *i810AllocPrimitiveVerts( i810ContextPtr imesa, int dwords );
 
-
-
-/* Todo: 
- *    - multidraw, ...
- *    - Antialiasing (?)
- *    - line and polygon stipple
- *    - select and feedback 
- *    - stencil 
- *    - point parameters
- *    - 
- */
-#define I810_ANTIALIAS_BIT   0       /* ignored for now, no fallback */
+/* shared */
 #define I810_FLAT_BIT 	     0x1
+
+/* triangle */
 #define I810_OFFSET_BIT	     0x2	
 #define I810_TWOSIDE_BIT     0x4
-#define I810_NODRAW_BIT	     0x8
-#define I810_FALLBACK_BIT    0x10
+
+/* line */
+#define I810_WIDE_LINE_BIT    0x2 
+#define I810_STIPPLE_LINE_BIT 0x4 
+
+/* shared */
+#define I810_FALLBACK_BIT    0x8 
+
+
+
+
 
-/* Not in use:
- */
-#define I810_FEEDBACK_BIT    0x20
-#define I810_SELECT_BIT      0x40
-#define I810_POINT_PARAM_BIT 0x80	/* not needed? */
+static i810_vertex __inline__ *i810AllocTriangles( i810ContextPtr imesa, int nr)
+{
+   GLuint *start = i810AllocDwords( imesa, 30*nr, PR_TRIANGLES );
+   return (i810_vertex *)start;
+}
 
+static i810_vertex __inline__ *i810AllocLine( i810ContextPtr imesa ) 
+{
+   GLuint *start = i810AllocDwords( imesa, 20, PR_LINES );
+   return (i810_vertex *)start;
+}
 
+static i810_vertex __inline__ *i810AllocRect( i810ContextPtr imesa ) 
+{
+   GLuint *start = i810AllocDwords( imesa, 30, PR_RECTS );
+   return (i810_vertex *)start;
+}
+
 
+
 static void __inline__ i810_draw_triangle( i810ContextPtr imesa,
 					   i810_vertex *v0, 
 					   i810_vertex *v1, 
 					   i810_vertex *v2 )
 {
-   i810_vertex *wv = (i810_vertex *)i810AllocPrimitiveVerts( imesa, 30 );
+   i810_vertex *wv = i810AllocTriangles( imesa, 1 );
    wv[0] = *v0;
    wv[1] = *v1;
    wv[2] = *v2;
-   FINISH_PRIM();
 }
 
 
-
-
-/* These can go soon, but for the meantime we're using triangles for 
- * everything.
- */
 static __inline__ void i810_draw_point( i810ContextPtr imesa,
 					i810_vertex *tmp, float sz )
 {
-   i810_vertex *wv = (i810_vertex *)i810AllocPrimitiveVerts( imesa, 6*10 );
+   i810_vertex *wv = i810AllocTriangles( imesa, 2 );
 
    wv[0] = *tmp;
    wv[0].x = tmp->x - sz;
@@ -108,16 +113,25 @@
    wv[5].x = tmp->x - sz;
    wv[5].y = tmp->y - sz;
 
-   FINISH_PRIM();
 }
 
 
-static __inline__ void i810_draw_line( i810ContextPtr imesa, 
-				       i810_vertex *tmp0, 
-				       i810_vertex *tmp1,
-				       float width )
+static __inline__ void i810_draw_line_line( i810ContextPtr imesa, 
+					    i810_vertex *tmp0, 
+					    i810_vertex *tmp1 )
 {
-   i810_vertex *wv = (i810_vertex *)i810AllocPrimitiveVerts( imesa, 6 * 10 );
+   i810_vertex *wv = i810AllocLine( imesa );
+   wv[0] = *tmp0;
+   wv[1] = *tmp1;
+}
+
+static __inline__ void i810_draw_tri_line( i810ContextPtr imesa, 
+					   i810_vertex *tmp0, 
+					   i810_vertex *tmp1,
+					   float width )
+{
+   i810_vertex *wv = i810AllocTriangles( imesa, 2 );
+      
    float dx, dy, ix, iy;
 
    dx = tmp0->x - tmp1->x;
@@ -151,8 +165,15 @@
    wv[5] = *tmp1;
    wv[5].x = tmp1->x + ix;
    wv[5].y = tmp1->y + iy;
+}
 
-   FINISH_PRIM();
+
+static __inline__ void i810_draw_line( i810ContextPtr imesa, 
+				       i810_vertex *tmp0, 
+				       i810_vertex *tmp1,
+				       float width )
+{
+   i810_draw_line_line( imesa, tmp0, tmp1 );
 }
 
 #endif
Index: xc/lib/GL/mesa/src/drv/i810/i810tritmp.h
diff -u xc/lib/GL/mesa/src/drv/i810/i810tritmp.h:1.1 xc/lib/GL/mesa/src/drv/i810/i810tritmp.h:1.2
--- xc/lib/GL/mesa/src/drv/i810/i810tritmp.h:1.1	Fri Feb 11 09:25:33 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810tritmp.h	Fri Jun 16 17:03:00 2000
@@ -63,44 +63,37 @@
    }
 #endif  
 
-   i810glx.c_triangles++;
-
    
-   BEGIN_CLIP_LOOP(imesa)
-      {
-	 i810_vertex *wv = (i810_vertex *)i810AllocPrimitiveVerts( imesa, 30 );
-	 wv[0] = *v0;
+   {
+      i810_vertex *wv = i810AllocTriangles( imesa, 1 );
+      wv[0] = *v0;
 #if (IND & (I810_FLAT_BIT|I810_TWOSIDE_BIT))
-	 *((int *)(&wv[0].color)) = c0;
+      *((int *)(&wv[0].color)) = c0;
 #endif
 #if (IND & I810_OFFSET_BIT)
-	 wv[0].z = v0->z + offset;
+      wv[0].z = v0->z + offset;
 #endif
 
 
-	 wv[1] = *v1;
+      wv[1] = *v1;
 #if (IND & (I810_FLAT_BIT|I810_TWOSIDE_BIT))
-	 *((int *)(&wv[1].color)) = c1;
+      *((int *)(&wv[1].color)) = c1;
 #endif
 #if (IND & I810_OFFSET_BIT)
-	 wv[1].z = v1->z + offset;
+      wv[1].z = v1->z + offset;
 #endif
 
-	 wv[2] = *v2;
+      wv[2] = *v2;
 #if (IND & (I810_FLAT_BIT|I810_TWOSIDE_BIT))
-	 *((int *)(&wv[2].color)) = c2;
+      *((int *)(&wv[2].color)) = c2;
 #endif
 #if (IND & I810_OFFSET_BIT)
-	 wv[2].z = v2->z + offset;
+      wv[2].z = v2->z + offset;
 #endif
-
-	 FINISH_PRIM();
-      }
-   END_CLIP_LOOP(imesa);
+   }
 }
 
 
-
 static void TAG(quad)( GLcontext *ctx, GLuint v0,
 		       GLuint v1, GLuint v2, GLuint v3, 
 		       GLuint pv )
@@ -109,25 +102,35 @@
    TAG(triangle)( ctx, v1, v2, v3, pv );
 }
 
-
-#if ((IND & ~I810_FLAT_BIT) == 0)
-
 static void TAG(line)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint pv )
 {
    i810ContextPtr imesa = I810_CONTEXT( ctx );
    i810VertexPtr i810VB = I810_DRIVER_DATA(ctx->VB)->verts;
-   i810_vertex tmp0 = i810VB[v0].v;
-   i810_vertex tmp1 = i810VB[v1].v;
-   float width = ctx->Line.Width;
+   int tmp0, tmp1;
+   (void) tmp0; (void) tmp1;
 
+
    if (IND & I810_FLAT_BIT) {
-      *(int *)&tmp1.color = *(int *)&tmp0.color = 
-	 *(int *)&i810VB[pv].v.color;
-   }
+      tmp0 = *(int *)&i810VB[v0].v.color;
+      tmp1 = *(int *)&i810VB[v1].v.color;
+      i810VB[v0].v.color = i810VB[pv].v.color;
+      i810VB[v1].v.color = i810VB[pv].v.color;
+   }      
+
+   if (IND & I810_WIDE_LINE_BIT)
+   {
+      i810_draw_tri_line( imesa, &i810VB[v0].v, &i810VB[v1].v, 
+			  ctx->Line.Width );
+   } 
+   else 
+   {
+      i810_draw_line_line( imesa, &i810VB[v0].v, &i810VB[v1].v );
+   }      
 
-   BEGIN_CLIP_LOOP(imesa)
-      i810_draw_line( imesa, &tmp0, &tmp1, width );
-   END_CLIP_LOOP(imesa);
+   if (IND & I810_FLAT_BIT) {
+      *(int *)&i810VB[v0].v.color = tmp0;
+      *(int *)&i810VB[v1].v.color = tmp1;
+   }      
 }
 
 
@@ -143,28 +146,22 @@
     * ctx->Driver.ReducedPrimitiveChange() callback.  
     */
    
-   BEGIN_CLIP_LOOP(imesa)
-      for(i=first;i<=last;i++) {
-	 if(VB->ClipMask[i]==0) {
-	    i810_vertex *tmp = &i810VB[i].v;
-	    i810_draw_point( imesa, tmp, sz );
-	 }
+   for(i=first;i<=last;i++) {
+      if(VB->ClipMask[i]==0) {
+	 i810_vertex *tmp = &i810VB[i].v;
+	 i810_draw_point( imesa, tmp, sz );
       }
-   END_CLIP_LOOP(imesa);
+   }
 }
 
-#endif
 
 
 static void TAG(init)( void )
 {
    tri_tab[IND] = TAG(triangle);
    quad_tab[IND] = TAG(quad);
-
-#if ((IND & ~I810_FLAT_BIT) == 0) 
    line_tab[IND] = TAG(line);
    points_tab[IND] = TAG(points);
-#endif
 }
 
 
Index: xc/lib/GL/mesa/src/drv/i810/i810vb.c
diff -u xc/lib/GL/mesa/src/drv/i810/i810vb.c:1.1 xc/lib/GL/mesa/src/drv/i810/i810vb.c:1.3
--- xc/lib/GL/mesa/src/drv/i810/i810vb.c:1.1	Fri Feb 11 09:25:34 2000
+++ xc/lib/GL/mesa/src/drv/i810/i810vb.c	Mon Jun 19 22:08:40 2000
@@ -23,11 +23,9 @@
  *
  */
  
-#include "i810lib.h"
 #include "i810context.h"
 #include "i810vb.h"
 #include "i810log.h"
-#include "i810dma.h"
 
 #include "stages.h"
 
@@ -264,9 +262,10 @@
   int funcindex = (I810_WIN_BIT | I810_RGBA_BIT);
 
   if (ctx->Texture.Enabled & 0xf) {
+      /* This doesn't work for non-RGBA textures
       if (ctx->Texture.Unit[0].EnvMode == GL_REPLACE)
 	 funcindex &= ~I810_RGBA_BIT;
-
+      */
      funcindex |= I810_TEX0_BIT;
   }
 
Index: xc/lib/GL/mesa/src/drv/mga/Imakefile
diff -u xc/lib/GL/mesa/src/drv/mga/Imakefile:1.2 xc/lib/GL/mesa/src/drv/mga/Imakefile:1.6
--- xc/lib/GL/mesa/src/drv/mga/Imakefile:1.2	Tue Feb 22 20:46:49 2000
+++ xc/lib/GL/mesa/src/drv/mga/Imakefile	Fri Jun 30 10:15:08 2000
@@ -1,4 +1,6 @@
 
+#include <Threads.tmpl>
+
 #define DoNormalLib NormalLibGlx
 #define DoSharedLib SharedLibGlx
 #define DoExtraLib SharedLibGlx
@@ -9,38 +11,284 @@
 ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
 #endif
 
+#if defined(LinuxArchitecture)
+OS_SUBDIR = linux
+#endif
+#if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture)
+OS_SUBDIR = bsd
+#endif
+
+#ifdef i386Architecture
+#ifdef MesaUse3DNow
+     ASM_DEFS = -DUSE_MMX_ASM -DUSE_X86_ASM -DUSE_3DNOW_ASM
+#else
+     ASM_DEFS = -DUSE_MMX_ASM -DUSE_X86_ASM
+#endif
+#endif
+
+
 #if BuildXF86DRI
   DRI_DEFINES = GlxDefines -DDRIVERTS
  DRI_INCLUDES = -I../../../../dri -I../../../../glx \
+		-I../../../dri \
 		-I$(TOP)/include -I$(TOP)/include/GL \
 		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \
 		-I$(XF86DRIVERSRC)/mga \
 		-I../../../include -I../.. -I../../X -I../common \
-	        -I$(XF86OSSRC)/linux/drm/kernel
+	        -I$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel
 #endif
 
 MESA_INCLUDES = -I. -I.. -I../../include
 
 
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS)
+     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) 
+
+#if 0
+	LOSRC = ../../../../lowpc.c
+	LOOBJ = ../../../../lowpc.o
+
+	HISRC = ../../../../highpc.c
+	HIOBJ = ../../../../highpc.o
+#endif
+
+      DRISRCS = ../../../dri/dri_mesa.c \
+		../../../../dri/dri_tmm.c
 
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES)
-     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) \
-		-I/usr/include/glide
-      DRISRCS = mgaclear.c mgacnvtex.c mgadd.c mgadepth.c	\
-		mgafastpath.c					\
+      DRIOBJS = ../../../dri/dri_mesa.o \
+		../../../../dri/dri_tmm.o
+
+      DRMSRCS = ../../../../dri/drm/xf86drm.c \
+		../../../../dri/drm/xf86drmHash.c \
+		../../../../dri/drm/xf86drmRandom.c \
+		../../../../dri/drm/xf86drmSL.c
+
+      DRMOBJS = ../../../../dri/drm/xf86drm.o \
+		../../../../dri/drm/xf86drmHash.o \
+		../../../../dri/drm/xf86drmRandom.o \
+		../../../../dri/drm/xf86drmSL.o
+
+
+      MGASRCS = mgaclear.c mgacnvtex.c mgadd.c \
+		mgafastpath.c mgaeltpath.c \
 		mgapipeline.c	\
 		mgaspan.c mgastate.c mgatex.c		\
-		mgatris.c mgavb.c mgaioctl.c mga_xmesa.c
+		mgatris.c mgavb.c mgaioctl.c mga_xmesa.c mgabuffers.c
 
-      DRIOBJS = mgaclear.o mgacnvtex.o mgadd.o mgadepth.o	\
-		mgafastpath.o					\
+      MGAOBJS = mgaclear.o mgacnvtex.o mgadd.o \
+		mgafastpath.o mgaeltpath.o \
 		mgapipeline.o	\
 		mgaspan.o mgastate.o mgatex.o		\
-		mgatris.o mgavb.o mgaioctl.o mga_xmesa.o
+		mgatris.o mgavb.o mgaioctl.o mga_xmesa.o mgabuffers.o
+
+     MESASRCS = ../../aatriangle.c \
+		../../accum.c \
+		../../alpha.c \
+		../../alphabuf.c \
+		../../attrib.c \
+		../../bbox.c \
+		../../bitmap.c \
+		../../blend.c \
+		../../buffers.c \
+		../../clip.c \
+		../../colortab.c \
+		../../config.c \
+		../../context.c \
+		../../copypix.c \
+		../../cva.c \
+		../../debug_xform.c \
+		../../depth.c \
+		../../dlist.c \
+		../../drawpix.c \
+		../../enable.c \
+		../../enums.c \
+		../../eval.c \
+		../../extensions.c \
+		../../feedback.c \
+		../../fog.c \
+		../../get.c \
+		../../glapi.c \
+		../../glapinoop.c \
+		../../glthread.c \
+		../../hash.c \
+		../../image.c \
+		../../imaging.c \
+		../../light.c \
+		../../lines.c \
+		../../logic.c \
+		../../masking.c \
+		../../matrix.c \
+		../../mem.c \
+		../../mmath.c \
+		../../pb.c \
+		../../pipeline.c \
+		../../pixel.c \
+		../../pixeltex.c \
+		../../points.c \
+		../../polygon.c \
+		../../quads.c \
+		../../rastpos.c \
+		../../readpix.c \
+		../../rect.c \
+		../../scissor.c \
+		../../shade.c \
+		../../span.c \
+		../../stages.c \
+		../../state.c \
+		../../stencil.c \
+		../../teximage.c \
+		../../texobj.c \
+		../../texstate.c \
+		../../texture.c \
+		../../texutil.c \
+		../../translate.c \
+		../../triangle.c \
+		../../varray.c \
+		../../vb.c \
+		../../vbcull.c \
+		../../vbfill.c \
+		../../vbindirect.c \
+		../../vbrender.c \
+		../../vbxform.c \
+		../../vector.c \
+		../../vertices.c \
+		../../winpos.c \
+		../../xform.c \
+		../../zoom.c
+
+     MESAOBJS = ../../aatriangle.o \
+		../../accum.o \
+		../../alpha.o \
+		../../alphabuf.o \
+		../../attrib.o \
+		../../bbox.o \
+		../../bitmap.o \
+		../../blend.o \
+		../../buffers.o \
+		../../clip.o \
+		../../colortab.o \
+		../../config.o \
+		../../context.o \
+		../../copypix.o \
+		../../cva.o \
+		../../debug_xform.o \
+		../../depth.o \
+		../../dlist.o \
+		../../drawpix.o \
+		../../enable.o \
+		../../enums.o \
+		../../eval.o \
+		../../extensions.o \
+		../../feedback.o \
+		../../fog.o \
+		../../get.o \
+		../../hash.o \
+		../../hint.o \
+		../../image.o \
+		../../imaging.o \
+		../../light.o \
+		../../lines.o \
+		../../logic.o \
+		../../masking.o \
+		../../matrix.o \
+		../../mem.o \
+		../../mmath.o \
+		../../pb.o \
+		../../pipeline.o \
+		../../pixel.o \
+		../../pixeltex.o \
+		../../points.o \
+		../../polygon.o \
+		../../quads.o \
+		../../rastpos.o \
+		../../readpix.o \
+		../../rect.o \
+		../../scissor.o \
+		../../shade.o \
+		../../span.o \
+		../../stages.o \
+		../../state.o \
+		../../stencil.o \
+		../../teximage.o \
+		../../texobj.o \
+		../../texstate.o \
+		../../texture.o \
+		../../texutil.o \
+		../../translate.o \
+		../../triangle.o \
+		../../varray.o \
+		../../vb.o \
+		../../vbcull.o \
+		../../vbfill.o \
+		../../vbindirect.o \
+		../../vbrender.o \
+		../../vbxform.o \
+		../../vector.o \
+		../../vertices.o \
+		../../winpos.o \
+		../../xform.o \
+		../../zoom.o
+
+#ifdef i386Architecture
+     X86_SRCS = ../../X86/x86.c \
+		../../X86/x86a.S \
+		../../X86/common_x86.c \
+		../../X86/common_x86asm.S \
+		../../X86/vertex.S
+
+     X86_OBJS = ../../X86/x86.o \
+		../../X86/x86a.o \
+		../../X86/common_x86.o \
+		../../X86/common_x86asm.o \
+		../../X86/vertex.o
+
+     MMX_SRCS = ../../X86/mmx_blend.S
+
+     MMX_OBJS = ../../X86/mmx_blend.o
+
+#ifdef MesaUse3DNow
+   3DNOW_SRCS = ../../X86/3dnow.c \
+		../../X86/3dnow_norm_raw.S \
+		../../X86/3dnow_xform_masked1.S \
+		../../X86/3dnow_xform_masked2.S \
+		../../X86/3dnow_xform_masked3.S \
+		../../X86/3dnow_xform_masked4.S \
+		../../X86/3dnow_xform_raw1.S \
+		../../X86/3dnow_xform_raw2.S \
+		../../X86/3dnow_xform_raw3.S \
+		../../X86/3dnow_xform_raw4.S \
+		../../X86/vertex_3dnow.S
+
+   3DNOW_OBJS = ../../X86/3dnow.o \
+		../../X86/3dnow_norm_raw.o \
+		../../X86/3dnow_xform_masked1.o \
+		../../X86/3dnow_xform_masked2.o \
+		../../X86/3dnow_xform_masked3.o \
+		../../X86/3dnow_xform_masked4.o \
+		../../X86/3dnow_xform_raw1.o \
+		../../X86/3dnow_xform_raw2.o \
+		../../X86/3dnow_xform_raw3.o \
+		../../X86/3dnow_xform_raw4.o \
+		../../X86/vertex_3dnow.o
+
+#endif
+#endif
+
+      ASMSRCS = $(X86_SRCS) $(MMX_SRCS) $(3DNOW_SRCS)
+      ASMOBJS = $(X86_OBJS) $(MMX_OBJS) $(3DNOW_OBJS)
 
+      COMMONSRCS = ../common/mm.c ../common/hwlog.c
+      COMMONOBJS = ../common/mm.o ../common/hwlog.o
+
+         SRCS = $(LOWSRC) $(DRISRCS) $(DRMSRCS) $(MESASRCS) $(ASMSRCS) $(COMMONSRCS) $(MGASRCS) $(HISRC)
+         OBJS = $(LOWOBJ) $(DRIOBJS) $(DRMOBJS) $(MESAOBJS) $(ASMOBJS) $(COMMONOBJS) $(MGAOBJS) $(HIOBJ)
+
+REQUIREDLIBS += -lm
+#if !GlxBuiltInMga
+REQUIREDLIBS += -L../../../.. -lGL -L../../../../../X11 -lX11
+#endif
 
-	 SRCS = $(DRISRCS) 
-	 OBJS = $(DRIOBJS) 
 
 #if !GlxUseBuiltInDRIDriver
 #undef DoNormalLib NormalLibGlx
@@ -61,7 +309,7 @@
 ALL_OBJS = $(OBJS)
 ALL_DEPS = DONE
 SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
-InstallDynamicModule($(LIBNAME),$(MODULEDIR),.)
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
 #endif
 
 DependTarget()
Index: xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c
diff -u xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c:1.2 xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c:1.4
--- xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c:1.2	Tue Feb 22 20:46:49 2000
+++ xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c	Thu Jun 22 09:59:24 2000
@@ -24,10 +24,11 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c,v 1.4 2000/06/22 16:59:24 tsi Exp $ */
 
 /*
  * Authors:
- *   Daryll Strauss <daryll@precisioninsight.com>
+ *   Keith Whitwell <keithw@precisioninsight.com>
  *
  */
 
@@ -36,10 +37,12 @@
 #include <X11/Xlibint.h>
 #include <stdio.h>
 
+#include "drm.h"
 #include "mga_xmesa.h"
 #include "context.h"
 #include "vbxform.h"
 #include "matrix.h"
+#include "mmath.h"
 #include "simple_list.h"
 
 #include "mgadd.h"
@@ -49,20 +52,25 @@
 #include "mgadepth.h"
 #include "mgatris.h"
 #include "mgapipeline.h"
+#include "mgabuffers.h"
 
 #include "xf86dri.h"
-#include "mga_dri.h"
-#include "mga_drm_public.h"
 #include "mga_xmesa.h"
 
+#include "mga_dri.h"
+
 
 
 
 
 #ifndef MGA_DEBUG
 int MGA_DEBUG = (0
-/*  		  | MGA_DEBUG_ALWAYS_SYNC */
-/*  		  | MGA_DEBUG_VERBOSE_MSG */
+/*  		  | DEBUG_ALWAYS_SYNC */
+/*  		  | DEBUG_VERBOSE_MSG */
+/*   		  | DEBUG_VERBOSE_LRU */
+/*  		  | DEBUG_VERBOSE_DRI */
+/*  		  | DEBUG_VERBOSE_IOCTL */
+/*   		  | DEBUG_VERBOSE_2D */
 		  );
 #endif
 
@@ -70,19 +78,8 @@
 static mgaContextPtr      mgaCtx = 0;
 
 mgaGlx_t	mgaglx;
-
-static int count_bits(unsigned int n)
-{
-   int bits = 0;
-
-   while (n > 0) {
-      if (n & 1) bits++;
-      n >>= 1;
-   }
-   return bits;
-}
 
-/* These functions are accessed by dlsym from dri_mesa_init.c:
+/* These functions are accessed externally to the driver:
  *
  * XMesaInitDriver
  * XMesaResetDriver
@@ -96,163 +93,207 @@
  * XMesaSwapBuffers
  * XMesaMakeCurrent
  *
- * So this is kind of the public interface to the driver.  The driver
- * uses the X11 mesa driver context as a kind of wrapper around its
- * own driver context - but there isn't much justificiation for doing
- * it that way - the DRI might as well use a (void *) to refer to the
- * driver contexts.  Nothing in the X context really gets used.
  */
 
-
 GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv)
 {
    mgaScreenPrivate *mgaScreen;
-   MGADRIPtr         gDRIPriv = (MGADRIPtr)sPriv->pDevPriv;
+   MGADRIPtr         serverInfo = (MGADRIPtr)sPriv->pDevPriv;
+
+   /* Check the DRI version */
+   {
+      int major, minor, patch;
+      if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) {
+         if (major != 3 || minor != 0 || patch < 0) {
+            char msg[1000];
+            sprintf(msg, "MGA DRI driver expected DRI version 3.0.x but got version %d.%d.%d", major, minor, patch);
+            __driMesaMessage(msg);
+            return GL_FALSE;
+         }
+      }
+   }
+
+   /* Check that the DDX driver version is compatible */
+   if (sPriv->ddxMajor != 1 ||
+       sPriv->ddxMinor != 0 ||
+       sPriv->ddxPatch < 0) {
+      char msg[1000];
+      sprintf(msg, "MGA DRI driver expected DDX driver version 1.0.x but got version %d.%d.%d", sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch);
+      __driMesaMessage(msg);
+      return GL_FALSE;
+   }
+
+   /* Check that the DRM driver version is compatible */
+   if (sPriv->drmMajor != 1 ||
+       sPriv->drmMinor != 0 ||
+       sPriv->drmPatch < 0) {
+      char msg[1000];
+      sprintf(msg, "MGA DRI driver expected DRM driver version 1.0.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
+      __driMesaMessage(msg);
+      return GL_FALSE;
+   }
 
    /* Allocate the private area */
    mgaScreen = (mgaScreenPrivate *)Xmalloc(sizeof(mgaScreenPrivate));
-   if (!mgaScreen) return GL_FALSE;
+   if (!mgaScreen)
+      return GL_FALSE;
 
    mgaScreen->sPriv = sPriv;
    sPriv->private = (void *)mgaScreen;
 
-   mgaScreen->chipset=gDRIPriv->chipset;
-   mgaScreen->width=gDRIPriv->width;
-   mgaScreen->height=gDRIPriv->height;
-   mgaScreen->mem=gDRIPriv->mem;
-   mgaScreen->cpp=gDRIPriv->cpp;
-   mgaScreen->frontPitch=gDRIPriv->frontPitch;
-   mgaScreen->frontOffset=gDRIPriv->frontOffset;
-   mgaScreen->backOffset=gDRIPriv->backOffset; 
-   mgaScreen->backPitch = gDRIPriv->backPitch;
-   mgaScreen->depthOffset=gDRIPriv->depthOffset;
-   mgaScreen->depthPitch = gDRIPriv->depthPitch;
-   mgaScreen->textureOffset=gDRIPriv->textureOffset;
-   mgaScreen->textureSize=gDRIPriv->textureSize;
-   mgaScreen->logTextureGranularity = gDRIPriv->logTextureGranularity;
+   /*
+   fprintf(stderr, "serverInfo->chipset: %d\n", serverInfo->chipset);
+   */
+
+   if (serverInfo->chipset != MGA_CARD_TYPE_G200 &&
+       serverInfo->chipset != MGA_CARD_TYPE_G400) {
+      XFree(mgaScreen);
+      sPriv->private = NULL;
+      return GL_FALSE;
+   }
 
+   
+   mgaScreen->chipset = serverInfo->chipset;
+   mgaScreen->width = serverInfo->width;
+   mgaScreen->height = serverInfo->height;
+   mgaScreen->mem = serverInfo->mem;
+   mgaScreen->cpp = serverInfo->cpp;
+   mgaScreen->frontPitch = serverInfo->frontPitch;
+   mgaScreen->frontOffset = serverInfo->frontOffset;
+   mgaScreen->backOffset = serverInfo->backOffset; 
+   mgaScreen->backPitch  =  serverInfo->backPitch;
+   mgaScreen->depthOffset = serverInfo->depthOffset;
+   mgaScreen->depthPitch  =  serverInfo->depthPitch;
+
+
+   mgaScreen->agp.handle = serverInfo->agp;
+   mgaScreen->agp.size = serverInfo->agpSize;
+
+   if (drmMap(sPriv->fd, 
+	      mgaScreen->agp.handle, 
+	      mgaScreen->agp.size, 
+	      (drmAddress *)&mgaScreen->agp.map) != 0) 
+   {
+      Xfree(mgaScreen);
+      sPriv->private = NULL;
+      return GL_FALSE;
+   }
 
-   mgaScreen->bufs = drmMapBufs(sPriv->fd);
+   mgaScreen->textureOffset[MGA_CARD_HEAP] = serverInfo->textureOffset;
+   mgaScreen->textureOffset[MGA_AGP_HEAP] = (serverInfo->agpTextureOffset |
+					     PDEA_pagpxfer_enable | 1);
+
+   /*
+   fprintf(stderr, "CARD texture size %x, granul %d --> %x\n", 
+	   serverInfo->textureSize, serverInfo->logTextureGranularity,
+	   1<<serverInfo->logTextureGranularity);
+   */
+
+   mgaScreen->textureSize[MGA_CARD_HEAP] = serverInfo->textureSize;
+   mgaScreen->textureSize[MGA_AGP_HEAP] = serverInfo->agpTextureSize;
+
+   mgaScreen->logTextureGranularity[MGA_CARD_HEAP] = 
+      serverInfo->logTextureGranularity;
+   mgaScreen->logTextureGranularity[MGA_AGP_HEAP] = 
+      serverInfo->logAgpTextureGranularity;
+
+   mgaScreen->texVirtual[MGA_CARD_HEAP] = (char *)(mgaScreen->sPriv->pFB + 
+					   serverInfo->textureOffset);
+   mgaScreen->texVirtual[MGA_AGP_HEAP] = (mgaScreen->agp.map + 
+					  serverInfo->agpTextureOffset);
+
+   mgaScreen->mAccess = serverInfo->mAccess;
+
+
+   /* For calculating setupdma addresses.
+    */
+   mgaScreen->dmaOffset = serverInfo->agpBufferOffset;   
+   
+   /*
+   fprintf(stderr, "\n\n\nbackOffset: %x pitch %x\n", 
+	   mgaScreen->backOffset,
+	   mgaScreen->backPitch);
+   */
 
+   mgaScreen->Attrib = MGA_PF_565;
+   mgaScreen->bufs = drmMapBufs(sPriv->fd);
+   if (!mgaScreen->bufs) {
+      /*drmUnmap(mgaScreen->agp_tex.map, mgaScreen->agp_tex.size);*/
+      XFree(mgaScreen);
+      sPriv->private = NULL;
+      return GL_FALSE;
+   }
 
    /* Other mgaglx stuff, too??
     */
    memset(&mgaglx, 0, sizeof(mgaglx));
 
    mgaDDFastPathInit();
+   mgaDDEltPathInit();
    mgaDDTrifuncInit();
    mgaDDSetupInit();
 
    return GL_TRUE;
 }
 
+
 /* Accessed by dlsym from dri_mesa_init.c
  */
 void XMesaResetDriver(__DRIscreenPrivate *sPriv)
 {
-   Xfree(sPriv->private);
+   mgaScreenPrivate *mgaScreen = (mgaScreenPrivate *) sPriv->private;
+   /*drmUnmap(mgaScreen->agp_tex.map, mgaScreen->agp_tex.size);*/
+   Xfree(mgaScreen);
+   sPriv->private = NULL;
 }
 
-/* Accessed by dlsym from dri_mesa_init.c
- */
-XMesaVisual XMesaCreateVisual(XMesaDisplay *display,
-			      XMesaVisualInfo visinfo,
-			      GLboolean rgb_flag,
-			      GLboolean alpha_flag,
-			      GLboolean db_flag,
-			      GLboolean stereo_flag,
-			      GLboolean ximage_flag,
-			      GLint depth_size,
-			      GLint stencil_size,
-			      GLint accum_size,
-			      GLint level)
-{
-   XMesaVisual v;
-
-   /* Only RGB visuals are supported on the MGA boards */
-   if (!rgb_flag) return 0;
-
-   v = (XMesaVisual)Xmalloc(sizeof(struct xmesa_visual));
-   if (!v) return 0;
-
-   v->visinfo = (XVisualInfo *)Xmalloc(sizeof(*visinfo));
-   if(!v->visinfo) {
-      Xfree(v);
-      return 0;
-   }
-   memcpy(v->visinfo, visinfo, sizeof(*visinfo));
-
-   v->display = display;
-   v->level = level;
-  
-   v->gl_visual = (GLvisual *)Xmalloc(sizeof(GLvisual));
-   if (!v->gl_visual) {
-      Xfree(v->visinfo);
-      XFree(v);
-      return 0;
-   }
-
-   v->gl_visual->RGBAflag   = rgb_flag;
-   v->gl_visual->DBflag     = db_flag;
-   v->gl_visual->StereoFlag = stereo_flag;
 
-   v->gl_visual->RedBits   = count_bits(visinfo->red_mask);
-   v->gl_visual->GreenBits = count_bits(visinfo->green_mask);
-   v->gl_visual->BlueBits  = count_bits(visinfo->blue_mask);
-   v->gl_visual->AlphaBits = 0; /* Not currently supported */
-
-   v->gl_visual->AccumBits   = accum_size;
-   v->gl_visual->DepthBits   = depth_size;
-   v->gl_visual->StencilBits = stencil_size;
-
-   return v;
-}
-
-void XMesaDestroyVisual(XMesaVisual v)
+GLvisual *XMesaCreateVisual(Display *dpy,
+                            __DRIscreenPrivate *driScrnPriv,
+                            const XVisualInfo *visinfo,
+                            const __GLXvisualConfig *config)
 {
-   Xfree(v->gl_visual);
-   Xfree(v->visinfo);
-   Xfree(v);
+   /* Drivers may change the args to _mesa_create_visual() in order to
+    * setup special visuals.
+    */
+   return _mesa_create_visual( config->rgba,
+                               config->doubleBuffer,
+                               config->stereo,
+                               _mesa_bitcount(visinfo->red_mask),
+                               _mesa_bitcount(visinfo->green_mask),
+                               _mesa_bitcount(visinfo->blue_mask),
+                               config->alphaSize,
+                               0, /* index bits */
+                               config->depthSize,
+                               config->stencilSize,
+                               config->accumRedSize,
+                               config->accumGreenSize,
+                               config->accumBlueSize,
+                               config->accumAlphaSize,
+                               0 /* num samples */ );
 }
+
 
-XMesaContext XMesaCreateContext(XMesaVisual v, XMesaContext share_list,
-				__DRIcontextPrivate *driContextPriv)
+GLboolean XMesaCreateContext( Display *dpy, GLvisual *mesaVis,
+                              __DRIcontextPrivate *driContextPriv )
 {
+   int i;
    GLcontext *ctx;
-   XMesaContext c;
    mgaContextPtr mmesa;
    __DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
    mgaScreenPrivate *mgaScreen = (mgaScreenPrivate *)sPriv->private;
    drm_mga_sarea_t *saPriv=(drm_mga_sarea_t*)(((char*)sPriv->pSAREA)+
 					      sizeof(XF86DRISAREARec));
-   GLcontext *shareCtx = 0;
-
-   c = (XMesaContext)Xmalloc(sizeof(struct xmesa_context));
-   if (!c) {
-      return 0;
-   }
+   /*fprintf(stderr, "XMesaCreateContext\n");*/
 
-   mmesa = (mgaContextPtr)Xmalloc(sizeof(mgaContext));
+   mmesa = (mgaContextPtr)Xcalloc(sizeof(mgaContext), 1);
    if (!mmesa) {
-      Xfree(c);
-      return 0;
+      return GL_FALSE;
    }
-
-   c->driContextPriv = driContextPriv;
-   c->xm_visual = v;
-   c->xm_buffer = 0; /* Set by MakeCurrent */
-   c->display = v->display;
-   c->private = (void *)mmesa;
 
-   if (share_list)
-      shareCtx=((mgaContextPtr)(share_list->private))->glCtx;
+   ctx = driContextPriv->mesaContext;
 
-   ctx = mmesa->glCtx = gl_create_context(v->gl_visual, shareCtx, 
-					  (void*)mmesa, GL_TRUE);
-
-   /* Dri stuff
-    */
-   mmesa->display = v->display;
+   mmesa->display = dpy;
    mmesa->hHWContext = driContextPriv->hHWContext;
    mmesa->driFd = sPriv->fd;
    mmesa->driHwLock = &sPriv->pSAREA->lock;
@@ -260,41 +301,42 @@
    mmesa->mgaScreen = mgaScreen;
    mmesa->driScreen = sPriv;
    mmesa->sarea = saPriv;
+   mmesa->glBuffer = NULL;
 
-   mmesa->glBuffer=gl_create_framebuffer(v->gl_visual);
-
+   make_empty_list(&mmesa->SwappedOut);
 
-   mmesa->needClip=1;
+   mmesa->lastTexHeap = mgaScreen->texVirtual[MGA_AGP_HEAP] ? 2 : 1;
 
-   mmesa->texHeap = mmInit( 0, mgaScreen->textureSize );
+   for (i = 0 ; i < mmesa->lastTexHeap ; i++) {
+      mmesa->texHeap[i] = mmInit( 0, mgaScreen->textureSize[i]);
+      make_empty_list(&mmesa->TexObjList[i]);
+   }
 
-   /* Utah stuff
-    */
    mmesa->renderindex = -1;		/* impossible value */
    mmesa->new_state = ~0;
    mmesa->dirty = ~0;
-
-   mmesa->warp_pipe = 0;
-
-
-   make_empty_list(&mmesa->SwappedOut);
-   make_empty_list(&mmesa->TexObjList);
-   
+   mmesa->warp_pipe = 0;   
    mmesa->CurrentTexObj[0] = 0;
    mmesa->CurrentTexObj[1] = 0;
    
+   mmesa->texAge[0] = 0;
+   mmesa->texAge[1] = 0;
+   
+   ctx->DriverCtx = (void *) mmesa;
+   mmesa->glCtx = ctx;
+
    mgaDDExtensionsInit( ctx );
 
    mgaDDInitStateFuncs( ctx );
    mgaDDInitTextureFuncs( ctx );
    mgaDDInitSpanFuncs( ctx );
-   mgaDDInitDepthFuncs( ctx );
    mgaDDInitDriverFuncs( ctx );
    mgaDDInitIoctlFuncs( ctx );
 
 
    ctx->Driver.TriangleCaps = (DD_TRI_CULL|
 			       DD_TRI_LIGHT_TWOSIDE|
+			       DD_TRI_STIPPLE|
 			       DD_TRI_OFFSET);
 
    /* Ask mesa to clip fog coordinates for us.
@@ -312,19 +354,21 @@
 	 mgaDDRegisterPipelineStages(ctx->PipelineStage,
 				      ctx->PipelineStage,
 				      ctx->NrPipelineStages);
-   return c;
+
+   mgaInitState( mmesa );
+
+   driContextPriv->driverPrivate = (void *) mmesa;
+
+   return GL_TRUE;
 }
 
-void XMesaDestroyContext(XMesaContext c)
+void XMesaDestroyContext(__DRIcontextPrivate *driContextPriv)
 {
-   mgaContextPtr mmesa = (mgaContextPtr) c->private;
+   mgaContextPtr mmesa = (mgaContextPtr) driContextPriv->driverPrivate;
 
    if (mmesa) {
 /*        mgaTextureObjectPtr next_t, t; */
 
-      gl_destroy_context(mmesa->glCtx);
-      gl_destroy_framebuffer(mmesa->glBuffer);
-
 /*        foreach_s (t, next_t, &(mmesa->TexObjList)) */
 /*  	 mgaDestroyTexObj(mmesa, t); */
 
@@ -333,90 +377,62 @@
 
       Xfree(mmesa);
 
-      c->private = 0;
+      driContextPriv->driverPrivate = NULL;
    }
 }
 
-XMesaBuffer XMesaCreateWindowBuffer(XMesaVisual v, XMesaWindow w,
-				    __DRIdrawablePrivate *driDrawPriv)
-{
-  return (XMesaBuffer)1;
-}
 
-XMesaBuffer XMesaCreatePixmapBuffer(XMesaVisual v, XMesaPixmap p,
-				    XMesaColormap c, 
-				    __DRIdrawablePrivate *driDrawPriv)
+GLframebuffer *XMesaCreateWindowBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
 {
-  return (XMesaBuffer)1;
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                mesaVis->AlphaBits > 0
+                                );
 }
+
 
-void XMesaDestroyBuffer(XMesaBuffer b)
+GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
 {
+#if 0
+   /* Different drivers may have different combinations of hardware and
+    * software ancillary buffers.
+    */
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                mesaVis->AlphaBits > 0
+                                );
+#else
+   return NULL;  /* not implemented yet */
+#endif
 }
 
-void XMesaSwapBuffers(XMesaBuffer bogus_value_do_not_use)
+
+void XMesaSwapBuffers(__DRIdrawablePrivate *driDrawPriv)
 {
+   /* XXX should do swap according to the buffer, not the context! */
    mgaContextPtr mmesa = mgaCtx;    
    FLUSH_VB( mmesa->glCtx, "swap buffers" );
    mgaSwapBuffers(mmesa);
 }
 
-
-
-
-
-void mgaXMesaSetFrontClipRects( mgaContextPtr mmesa )
-{
-   __DRIdrawablePrivate *dPriv = mmesa->driDrawable;
-
-   mmesa->numClipRects = dPriv->numClipRects;
-   mmesa->pClipRects = dPriv->pClipRects;
-   mmesa->drawX = dPriv->x;
-   mmesa->drawY = dPriv->y;
-
-   mmesa->drawOffset = mmesa->mgaScreen->frontOffset;
-}
-
-
-void mgaXMesaSetBackClipRects( mgaContextPtr mmesa )
-{
-   __DRIdrawablePrivate *dPriv = mmesa->driDrawable;
-
-   if (dPriv->numAuxClipRects == 0) 
-   {
-      mmesa->numClipRects = dPriv->numClipRects;
-      mmesa->pClipRects = dPriv->pClipRects;
-      mmesa->drawX = dPriv->x;
-      mmesa->drawY = dPriv->y;
-   } else {
-      mmesa->numClipRects = dPriv->numAuxClipRects;
-      mmesa->pClipRects = dPriv->pAuxClipRects;
-      mmesa->drawX = dPriv->auxX;
-      mmesa->drawY = dPriv->auxY;
-   }
-
-   mmesa->drawOffset = mmesa->mgaScreen->backOffset;
-}
-
 
-static void mgaXMesaWindowMoved( mgaContextPtr mmesa ) 
+GLboolean XMesaUnbindContext(__DRIcontextPrivate *driContextPriv)
 {
-   /* Clear any contaminated CVA data.
-    */
-   mmesa->setupdone = 0;
+   mgaContextPtr mmesa = (mgaContextPtr) driContextPriv->driverPrivate;
+   if (mmesa)
+      mmesa->dirty = ~0;
 
-   switch (mmesa->glCtx->Color.DriverDrawBuffer) {
-   case GL_FRONT_LEFT:
-      mgaXMesaSetFrontClipRects( mmesa );
-      break;
-   case GL_BACK_LEFT:
-      mgaXMesaSetBackClipRects( mmesa );
-      break;
-   default:
-      fprintf(stderr, "fallback buffer\n");
-      break;
-   }
-
+   return GL_TRUE;
 }
 
 
@@ -426,27 +442,24 @@
  *
  * But why are we doing context initialization here???
  */
-GLboolean XMesaMakeCurrent(XMesaContext c, XMesaBuffer b)
+GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
+                           __DRIdrawablePrivate *driDrawPriv,
+                           __DRIdrawablePrivate *driReadPriv)
 {
+   if (driContextPriv) {
+      mgaCtx = (mgaContextPtr) driContextPriv->driverPrivate;
 
-   if (c->private==(void *)mgaCtx) return GL_TRUE;
+      gl_make_current2(mgaCtx->glCtx, driDrawPriv->mesaBuffer, driReadPriv->mesaBuffer);
 
-   if (c) {
-      __DRIdrawablePrivate *dPriv = c->driContextPriv->driDrawablePriv;
-
-      mgaCtx = (mgaContextPtr)c->private;
-
-
-      gl_make_current(mgaCtx->glCtx, mgaCtx->glBuffer);
-
-      mgaXMesaWindowMoved( mgaCtx );
-      mgaCtx->driDrawable = dPriv;
+      mgaCtx->driDrawable = driDrawPriv;
       mgaCtx->dirty = ~0;
+      mgaCtx->dirty_cliprects = (MGA_FRONT|MGA_BACK);
 
       if (!mgaCtx->glCtx->Viewport.Width)
-	 gl_Viewport(mgaCtx->glCtx, 0, 0, dPriv->w, dPriv->h);
+	 gl_Viewport(mgaCtx->glCtx, 0, 0, driDrawPriv->w, driDrawPriv->h);
 
-   } else {
+   }
+   else {
       gl_make_current(0,0);
       mgaCtx = NULL;
    }
@@ -455,58 +468,37 @@
 }
 
 
-void mgaXMesaUpdateState( mgaContextPtr mmesa ) 
+void mgaGetLock( mgaContextPtr mmesa, GLuint flags ) 
 {
    __DRIdrawablePrivate *dPriv = mmesa->driDrawable;
-   __DRIscreenPrivate *sPriv = mmesa->driScreen;
    drm_mga_sarea_t *sarea = mmesa->sarea;
-
    int me = mmesa->hHWContext;
-   int stamp = dPriv->lastStamp; 
+   int i;
 
-   /* If the window moved, may need to set a new cliprect now.
-    *
-    * NOTE: This releases and regains the hw lock, so all state
-    * checking must be done *after* this call:
-    */
-   XMESA_VALIDATE_DRAWABLE_INFO(mmesa->display, sPriv, dPriv);		
+   drmGetLock(mmesa->driFd, mmesa->hHWContext, flags);	
 
-   if (sarea->ctxOwner != me) {
-      mmesa->dirty |= MGA_UPLOAD_CTX;
+   if (*(dPriv->pStamp) != dPriv->lastStamp) { 
+      mmesa->setupdone = 0;
+      mmesa->dirty_cliprects = (MGA_FRONT|MGA_BACK);
+      mgaUpdateRects( mmesa, (MGA_FRONT|MGA_BACK) );
    }
 
-   if (sarea->texAge != mmesa->texAge) {
-      int sz = 1 << (mmesa->mgaScreen->logTextureGranularity);
-      int idx, nr = 0;
-
-      /* Have to go right round from the back to ensure stuff ends up
-       * LRU in our local list...
-       */
-      for (idx = sarea->texList[MGA_NR_TEX_REGIONS].prev ; 
-	   idx != MGA_NR_TEX_REGIONS && nr < MGA_NR_TEX_REGIONS ; 
-	   idx = sarea->texList[idx].prev, nr++)
-      {
-	 if (sarea->texList[idx].age > mmesa->texAge)
-	    mgaTexturesGone(mmesa, idx * sz, sz, 1);
-      }
+   mmesa->dirty |= MGA_UPLOAD_CTX | MGA_UPLOAD_CLIPRECTS;
 
-      if (nr == MGA_NR_TEX_REGIONS) {
-	 mgaTexturesGone(mmesa, 0, mmesa->mgaScreen->textureSize, 0);
-	 mgaResetGlobalLRU( mmesa );
-      }
+    mmesa->sarea->dirty |= MGA_UPLOAD_CTX; 
 
-      mmesa->texAge = sarea->texAge;
-      mmesa->dirty |= MGA_UPLOAD_TEX0IMAGE | MGA_UPLOAD_TEX1IMAGE;
+   if (sarea->ctxOwner != me) {
+      mmesa->dirty |= (MGA_UPLOAD_CTX | MGA_UPLOAD_TEX0 | 
+		       MGA_UPLOAD_TEX1 | MGA_UPLOAD_PIPE);
+      sarea->ctxOwner=me;
    }
 
-   if (dPriv->lastStamp != stamp) 
-      mgaXMesaWindowMoved( mmesa );
+   for (i = 0 ; i < mmesa->lastTexHeap ; i++)
+      if (sarea->texAge[i] != mmesa->texAge[i])
+	 mgaAgeTextures( mmesa, i );
 
-   sarea->ctxOwner=me;
+   sarea->last_quiescent = -1;	/* just kill it for now */
 }
-
-
-
 
 
 
Index: xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h
diff -u xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h:1.2 xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h:1.3
--- xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h:1.2	Tue Feb 22 20:46:49 2000
+++ xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h	Fri Jun 16 17:03:01 2000
@@ -28,7 +28,6 @@
 /*
  * Authors:
  *   Keith Whitwell <keithw@precisioninsight.com>
- *   Daryll Strauss <daryll@precisioninsight.com> (Origninal tdfx driver).
  *
  */
 
@@ -42,10 +41,16 @@
 #include "dri_mesaint.h"
 #include "dri_mesa.h"
 #include "types.h"
-#include "xmesaP.h"
+#include "mgaregs.h"
 
 typedef struct {
+   drmHandle handle;
+   drmSize size;
+   char *map;
+} mgaRegion, *mgaRegionPtr;
 
+typedef struct {
+
    int chipset;
    int width;
    int height;
@@ -54,53 +59,69 @@
    int cpp;			/* for front and back buffers */
 
    int Attrib;
+   unsigned int mAccess;
 
-   int frontOffset;
-   int frontPitch;
-   int backOffset;
-   int backPitch;
+   unsigned int frontOffset;
+   unsigned int frontPitch;
+   unsigned int backOffset;
+   unsigned int backPitch;
 
-   int depthOffset;
-   int depthPitch;
+   unsigned int depthOffset;
+   unsigned int depthPitch;
    int depthCpp;
+
+   unsigned int dmaOffset;		
 
-   int textureOffset;
-   int textureSize;
-   int logTextureGranularity;
+   unsigned int textureOffset[MGA_NR_TEX_HEAPS];
+   unsigned int textureSize[MGA_NR_TEX_HEAPS];
+   int logTextureGranularity[MGA_NR_TEX_HEAPS];
+   char *texVirtual[MGA_NR_TEX_HEAPS];
 
+
    __DRIscreenPrivate *sPriv;
    drmBufMapPtr  bufs;
 
+   /* Maps the dma buffers as well as textures ? 
+    */
+   mgaRegion agp;
+
 } mgaScreenPrivate;
 
 
 #include "mgalib.h"
 
-extern void mgaXMesaUpdateState( mgaContextPtr mmesa );
+extern void mgaGetLock( mgaContextPtr mmesa, GLuint flags );
 extern void mgaEmitHwStateLocked( mgaContextPtr mmesa );
 extern void mgaEmitScissorValues( mgaContextPtr mmesa, int box_nr, int emit );
-extern void mgaXMesaSetBackClipRects( mgaContextPtr mmesa );
-extern void mgaXMesaSetFrontClipRects( mgaContextPtr mmesa );
 
+#define GET_DISPATCH_AGE( mmesa ) mmesa->sarea->last_dispatch
+#define GET_ENQUEUE_AGE( mmesa ) mmesa->sarea->last_enqueue
 
 
+
 /* Lock the hardware and validate our state.  
  */
-#define LOCK_HARDWARE( mmesa )				\
-  do {							\
-    char __ret=0;					\
-    DRM_CAS(mmesa->driHwLock, mmesa->hHWContext,	\
-	    (DRM_LOCK_HELD|mmesa->hHWContext), __ret);	\
-    if (__ret) {					\
-        drmGetLock(mmesa->driFd, mmesa->hHWContext, 0);	\
-        mgaXMesaUpdateState( mmesa );			\
-    }							\
+#define LOCK_HARDWARE( mmesa )					\
+  do {								\
+    char __ret=0;						\
+    DRM_CAS(mmesa->driHwLock, mmesa->hHWContext,		\
+	    (DRM_LOCK_HELD|mmesa->hHWContext), __ret);		\
+    if (__ret)							\
+        mgaGetLock( mmesa, 0 );					\
   } while (0)
 
 
+/* 
+ */
+#define LOCK_HARDWARE_QUIESCENT( mmesa ) do {	                        \
+	LOCK_HARDWARE( mmesa );			                        \
+	mgaUpdateLock( mmesa, DRM_LOCK_QUIESCENT | DRM_LOCK_FLUSH );	\
+} while (0)
+
+
 /* Unlock the hardware using the global current context 
  */
-#define UNLOCK_HARDWARE(mmesa)					\
+#define UNLOCK_HARDWARE(mmesa) 				\
     DRM_UNLOCK(mmesa->driFd, mmesa->driHwLock, mmesa->hHWContext);	
 
 
@@ -109,6 +130,8 @@
 #define REFRESH_DRAWABLE_INFO( mmesa )		\
 do {						\
    LOCK_HARDWARE( mmesa );			\
+   mmesa->lastX = mmesa->drawX; 		\
+   mmesa->lastY = mmesa->drawY; 		\
    UNLOCK_HARDWARE( mmesa );			\
 } while (0)
 
Index: xc/lib/GL/mesa/src/drv/mga/mgabuffers.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/mga/mgabuffers.c:1.2
--- /dev/null	Sat Jul  1 20:44:35 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgabuffers.c	Thu Jun 22 09:59:24 2000
@@ -0,0 +1,317 @@
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgabuffers.c,v 1.2 2000/06/22 16:59:24 tsi Exp $ */
+
+/*
+ * Authors:
+ *   Keith Whitwell <keithw@precisioninsight.com>
+ *
+ * $PI: $
+ */
+
+#include <stdio.h>
+#include "mgalib.h"
+#include "mgabuffers.h"
+#include "mgastate.h"
+
+static void mgaXMesaSetFrontClipRects( mgaContextPtr mmesa )
+{
+   __DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
+
+   mmesa->numClipRects = driDrawable->numClipRects;
+   mmesa->pClipRects = driDrawable->pClipRects;
+   mmesa->drawX = driDrawable->x;
+   mmesa->drawY = driDrawable->y;
+
+   mmesa->drawOffset = mmesa->mgaScreen->frontOffset;
+   mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->drawOffset;
+   mmesa->dirty |= MGA_UPLOAD_CTX;
+   mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
+}
+
+
+static void mgaXMesaSetBackClipRects( mgaContextPtr mmesa )
+{
+   __DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
+
+   if (driDrawable->numBackClipRects == 0) 
+   {
+      mmesa->numClipRects = driDrawable->numClipRects;
+      mmesa->pClipRects = driDrawable->pClipRects;
+      mmesa->drawX = driDrawable->x;
+      mmesa->drawY = driDrawable->y;
+   } else {
+      mmesa->numClipRects = driDrawable->numBackClipRects;
+      mmesa->pClipRects = driDrawable->pBackClipRects;
+      mmesa->drawX = driDrawable->backX;
+      mmesa->drawY = driDrawable->backY;
+   }
+
+   mmesa->drawOffset = mmesa->mgaScreen->backOffset;
+   mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->drawOffset;
+
+   mmesa->dirty |= MGA_UPLOAD_CTX;
+   mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
+}
+
+
+
+static void mgaUpdateRectsFromSarea( mgaContextPtr mmesa )
+{
+   __DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
+   __DRIscreenPrivate *driScreen = mmesa->driScreen;
+   drm_mga_sarea_t *sarea = mmesa->sarea;
+   int i = 0, top = 0;
+
+
+   if (sarea->exported_buffers & MGA_BACK) {
+      XF86DRIClipRectPtr boxes = 
+	 (XF86DRIClipRectPtr)malloc( sarea->exported_nback * sizeof(*boxes) );
+
+      if (driDrawable->pBackClipRects)
+	 free(driDrawable->pBackClipRects);
+
+      driDrawable->numBackClipRects = sarea->exported_nback;
+      driDrawable->pBackClipRects = boxes;
+
+      top = sarea->exported_nback;
+      for (i = 0 ; i < top ; i++)
+	 boxes[i] = *(XF86DRIClipRectPtr)&(sarea->exported_boxes[i]);
+   }
+
+
+   if (sarea->exported_buffers & MGA_FRONT) 
+   {
+      int start = top;
+      XF86DRIClipRectPtr boxes = 
+	 (XF86DRIClipRectPtr)malloc( sarea->exported_nfront * sizeof(*boxes) );
+
+      if (driDrawable->pClipRects)
+	 free(driDrawable->pClipRects);
+
+      driDrawable->numClipRects = sarea->exported_nfront;
+      driDrawable->pClipRects = boxes;
+
+      top += sarea->exported_nfront;
+      for ( ; i < top ; i++)
+	 boxes[i-start] = *(XF86DRIClipRectPtr)&(sarea->exported_boxes[i]);
+
+   } 
+
+
+
+   driDrawable->index = sarea->exported_index;
+   driDrawable->lastStamp = sarea->exported_stamp;
+   driDrawable->x = sarea->exported_front_x;
+   driDrawable->y = sarea->exported_front_y;
+   driDrawable->backX = sarea->exported_back_x;
+   driDrawable->backY = sarea->exported_back_y;
+   driDrawable->w = sarea->exported_w;
+   driDrawable->h = sarea->exported_h;
+   driDrawable->pStamp = 
+      &(driScreen->pSAREA->drawableTable[driDrawable->index].stamp);
+
+   mmesa->dirty_cliprects = (MGA_FRONT|MGA_BACK) & ~(sarea->exported_buffers);
+}
+
+
+
+static void printSareaRects( mgaContextPtr mmesa )
+{
+   __DRIscreenPrivate *driScreen = mmesa->driScreen;
+   drm_mga_sarea_t *sarea = mmesa->sarea;
+   int i;
+
+   fprintf(stderr, "sarea->exported: %d\n", sarea->exported_drawable);
+   fprintf(stderr, "sarea->exported_index: %d\n", sarea->exported_index);
+   fprintf(stderr, "sarea->exported_stamp: %d\n", sarea->exported_stamp);
+   fprintf(stderr, "sarea->exported_front_x: %d\n", sarea->exported_front_x);
+   fprintf(stderr, "sarea->exported_front_y: %d\n", sarea->exported_front_y);
+   fprintf(stderr, "sarea->exported_back_x: %d\n", sarea->exported_back_x);
+   fprintf(stderr, "sarea->exported_back_y: %d\n", sarea->exported_back_y);
+   fprintf(stderr, "sarea->exported_w: %d\n", sarea->exported_w);
+   fprintf(stderr, "sarea->exported_h: %d\n", sarea->exported_h);
+   fprintf(stderr, "sarea->exported_buffers: %d\n", sarea->exported_buffers);
+   fprintf(stderr, "sarea->exported_nfront: %d\n", sarea->exported_nfront);
+   fprintf(stderr, "sarea->exported_nback: %d\n", sarea->exported_nback);
+
+   i = 0;
+   if (sarea->exported_buffers & MGA_BACK)
+      for ( ; i < sarea->exported_nback ; i++) 
+	 fprintf(stderr, "back %d: %d,%d-%d,%d\n", i,
+		 sarea->exported_boxes[i].x1, sarea->exported_boxes[i].y1,
+		 sarea->exported_boxes[i].x2, sarea->exported_boxes[i].y2);
+
+   if (sarea->exported_buffers & MGA_FRONT) {
+      int start = i;
+      int top = i + sarea->exported_nfront;
+      for ( ; i < top ; i++) 
+	 fprintf(stderr, "front %d: %d,%d-%d,%d\n", 
+		 i - start,
+		 sarea->exported_boxes[i].x1, sarea->exported_boxes[i].y1,
+		 sarea->exported_boxes[i].x2, sarea->exported_boxes[i].y2);
+   }
+
+   fprintf(stderr, "drawableTable[%d].stamp: %d\n", 
+	   sarea->exported_index,
+	   driScreen->pSAREA->drawableTable[sarea->exported_index].stamp);
+}
+
+static void printMmesaRects( mgaContextPtr mmesa )
+{
+   __DRIscreenPrivate *driScreen = mmesa->driScreen;
+   __DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
+   int nr = mmesa->numClipRects;
+   int i;
+
+   fprintf(stderr, "driDrawable->draw: %ld\n", driDrawable->draw);
+   fprintf(stderr, "driDrawable->index: %d\n", driDrawable->index);
+   fprintf(stderr, "driDrawable->lastStamp: %d\n", driDrawable->lastStamp);
+   fprintf(stderr, "mmesa->drawX: %d\n", mmesa->drawX);
+   fprintf(stderr, "mmesa->drawY: %d\n", mmesa->drawY);
+   fprintf(stderr, "driDrawable->w: %d\n", driDrawable->w);
+   fprintf(stderr, "driDrawable->h: %d\n", driDrawable->h);
+
+   for (i = 0 ; i < nr ; i++) 
+      fprintf(stderr, "box %d: %d,%d-%d,%d\n", i,
+	      mmesa->pClipRects[i].x1, mmesa->pClipRects[i].y1,
+	      mmesa->pClipRects[i].x2, mmesa->pClipRects[i].y2);
+
+   fprintf(stderr, "mmesa->draw_buffer: %d\n", mmesa->draw_buffer);
+   fprintf(stderr, "drawableTable[%d].stamp: %d\n", 
+	   driDrawable->index,
+	   driScreen->pSAREA->drawableTable[driDrawable->index].stamp);
+}
+
+
+
+void mgaUpdateRects( mgaContextPtr mmesa, GLuint buffers )
+{
+   __DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
+   drm_mga_sarea_t *sarea = mmesa->sarea;
+
+   /* The MGA X driver will try to push one set of cliprects (back or
+    * front, the last active) for one drawable (the last used) into
+    * the sarea.  See if that window was ours, else retrieve both back
+    * and front rects from the X server via a protocol request.  
+    *
+    * If there isn't room for the cliprects in the sarea, the X server
+    * clears the drawable value to indicate failure.  
+    */
+   if (0) printSareaRects(mmesa);
+
+   if (sarea->exported_drawable == driDrawable->draw && 
+       (sarea->exported_buffers & buffers) == buffers)
+   {
+      mgaUpdateRectsFromSarea( mmesa );
+   } 
+   else 
+   {
+      if(MGA_DEBUG & DEBUG_VERBOSE_MSG)
+		fprintf(stderr, "^");
+      driDrawable->lastStamp = 0;
+
+      XMESA_VALIDATE_DRAWABLE_INFO(mmesa->display, 
+				   mmesa->driScreen, 
+				   driDrawable); 
+      mmesa->dirty_cliprects = 0;	
+   }
+
+   if (mmesa->draw_buffer == MGA_FRONT)
+      mgaXMesaSetFrontClipRects( mmesa );
+   else
+      mgaXMesaSetBackClipRects( mmesa );
+
+
+   if (0) printMmesaRects(mmesa);
+
+   sarea->req_drawable = driDrawable->draw;
+   sarea->req_draw_buffer = mmesa->draw_buffer;
+
+   
+   mgaUpdateClipping( mmesa->glCtx );
+   
+   mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
+}
+
+
+
+GLboolean mgaDDSetDrawBuffer(GLcontext *ctx, GLenum mode )
+{
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
+
+   mmesa->Fallback &= ~MGA_FALLBACK_BUFFER;
+
+   if (mode == GL_FRONT_LEFT) 
+   {
+      mmesa->drawOffset = mmesa->mgaScreen->frontOffset;
+      mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->mgaScreen->frontOffset;
+      mmesa->dirty |= MGA_UPLOAD_CTX;
+      mmesa->draw_buffer = MGA_FRONT;
+      mgaXMesaSetFrontClipRects( mmesa );
+      return GL_TRUE;
+   } 
+   else if (mode == GL_BACK_LEFT) 
+   {
+      mmesa->drawOffset = mmesa->mgaScreen->backOffset;
+      mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->mgaScreen->backOffset;
+      mmesa->draw_buffer = MGA_BACK;
+      mmesa->dirty |= MGA_UPLOAD_CTX;
+      mgaXMesaSetBackClipRects( mmesa );
+      return GL_TRUE;
+   }
+   else 
+   {
+      mmesa->Fallback |= MGA_FALLBACK_BUFFER;
+      return GL_FALSE;
+   }
+}
+
+/* XXX I don't know whether this is correct, but it at least compiles properly now */
+void mgaDDSetReadBuffer(GLcontext *ctx, GLframebuffer *colorBuffer, GLenum mode)
+{
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+
+   mmesa->Fallback &= ~MGA_FALLBACK_BUFFER;
+
+   if (mode == GL_FRONT_LEFT) 
+   {
+      mmesa->readOffset = mmesa->mgaScreen->frontOffset;
+      mmesa->read_buffer = MGA_FRONT;
+   } 
+   else if (mode == GL_BACK_LEFT) 
+   {
+      mmesa->readOffset = mmesa->mgaScreen->backOffset;
+      mmesa->read_buffer = MGA_BACK;
+   }
+   else 
+   {
+      mmesa->Fallback |= MGA_FALLBACK_BUFFER;
+   }
+}
Index: xc/lib/GL/mesa/src/drv/mga/mgabuffers.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/mga/mgabuffers.h:1.2
--- /dev/null	Sat Jul  1 20:44:35 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgabuffers.h	Thu Jun 22 09:59:24 2000
@@ -0,0 +1,12 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgabuffers.h,v 1.2 2000/06/22 16:59:24 tsi Exp $ */
+
+#ifndef MGA_BUFFERS_H
+#define MGA_BUFFERS_H
+
+void mgaDDSetReadBuffer(GLcontext *ctx, GLframebuffer *colorBuffer,
+                             GLenum mode );
+GLboolean mgaDDSetDrawBuffer(GLcontext *ctx, GLenum mode );
+
+void mgaUpdateRects( mgaContextPtr mmesa, GLuint buffers );
+
+#endif
Index: xc/lib/GL/mesa/src/drv/mga/mgacnvtex.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgacnvtex.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgacnvtex.c:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgacnvtex.c:1.1	Fri Feb 11 09:25:35 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgacnvtex.c	Fri Jun 16 17:03:01 2000
@@ -46,205 +46,206 @@
  */
 void mgaConvertTexture( mgaUI32 *destPtr, int texelBytes, 
 			struct gl_texture_image *image,
-			int x, int y, int width, int height ) {
+			int x, int y, int width, int height ) 
+{
 	register int		i, j;
 	mgaUI8		*src;
 	int stride;
 	
 	/* FIXME: g400 luminance_alpha internal format */
 	switch (texelBytes) {
-	  case 1:
-	    switch (image->Format) {
-		   case GL_COLOR_INDEX:
-		   case GL_INTENSITY:
-		   case GL_LUMINANCE:
-		   case GL_ALPHA:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x );
-			  stride = (image->Width - width);
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width >> 2  ; j ; j-- ) {
-			
-				   *destPtr++ = src[0] | ( src[1] << 8 ) | ( src[2] << 16 ) | ( src[3] << 24 );
-				   src += 4;
-			    }
-				 src += stride;
-		     }
-			  break;
-			default:
-			  goto format_error;
-		 }
-		 break;
-	  case 2:
-	    switch (image->Format) {
-			case GL_RGB:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x ) * 3;
-			  stride = (image->Width - width) * 3;
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width >> 1  ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR565(src[0],src[1],src[2]) |  
-					   ( MGAPACKCOLOR565(src[3],src[4],src[5]) << 16 );
-				   src += 6;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_RGBA:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x ) * 4;
-			  stride = (image->Width - width) * 4;
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width >> 1  ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR4444(src[0],src[1],src[2],src[3]) |  
-				   	( MGAPACKCOLOR4444(src[4],src[5],src[6],src[7]) << 16 );
-				   src += 8;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_LUMINANCE:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x );
-			  stride = (image->Width - width);
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width >> 1  ; j ; j-- ) {
-				   /* FIXME: should probably use 555 texture to get true grey */
-				   *destPtr++ = MGAPACKCOLOR565(src[0],src[0],src[0]) |  
-					   ( MGAPACKCOLOR565(src[1],src[1],src[1]) << 16 );
-				   src += 2;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_INTENSITY:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x );
-			  stride = (image->Width - width);
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width >> 1  ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR4444(src[0],src[0],src[0],src[0]) |  
-					   ( MGAPACKCOLOR4444(src[1],src[1],src[1],src[1]) << 16 );
-				   src += 2;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_ALPHA:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x );
-			  stride = (image->Width - width);
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width >> 1  ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR4444(255,255,255,src[0]) |  
-					   ( MGAPACKCOLOR4444(255,255,255,src[1]) << 16 );
-				   src += 2;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_LUMINANCE_ALPHA:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x ) * 2;
-			  stride = (image->Width - width) * 2;
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width >> 1  ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR4444(src[0],src[0],src[0],src[1]) |  
-					   ( MGAPACKCOLOR4444(src[2],src[2],src[2],src[3]) << 16 );
-				   src += 4;
-			    }
-				 src += stride;
-		     }
-			  break;
-			default:
-			  goto format_error;
-		 }
-		 break;
-	  case 4:
-		 switch (image->Format) {
-			case GL_RGB:
- 	        src = (mgaUI8 *)image->Data + (  y * image->Width + x ) * 3;
-			  stride = (image->Width - width) * 3;
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR8888(src[0],src[1],src[2], 255);
-				   src += 3;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_RGBA:
- 	        src = (mgaUI8 *)image->Data + (  y * image->Width + x ) * 4;
-			  stride = (image->Width - width) * 4;
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width  ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR8888(src[0],src[1],src[2],src[3]);
-				   src += 4;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_LUMINANCE:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x );
-			  stride = (image->Width - width);
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR8888(src[0],src[0],src[0], 255);
-				   src += 1;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_INTENSITY:
- 	        src = (mgaUI8 *)image->Data + (  y * image->Width + x );
-			  stride = (image->Width - width);
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR8888(src[0],src[0],src[0],src[0]);
-				   src += 1;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_ALPHA:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x );
-			  stride = (image->Width - width);
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR8888(255,255,255,src[0]);
-				   src += 1;
-			    }
-				 src += stride;
-		     }
-			  break;
-			case GL_LUMINANCE_ALPHA:
- 	        src = (mgaUI8 *)image->Data + ( y * image->Width + x ) * 2;
-			  stride = (image->Width - width) * 2;
-		     for ( i = height ; i ; i-- ) {
-			    for ( j = width ; j ; j-- ) {
-			
-				   *destPtr++ = MGAPACKCOLOR8888(src[0],src[0],
-						       src[0],src[1]);
-				   src += 2;
-			    }
-				 src += stride;
-		     }
-			  break;
-			default:
-			  goto format_error;
-		 }
-		 break;
-	  default:
-		 goto format_error;
+	case 1:
+		switch (image->Format) {
+		case GL_COLOR_INDEX:
+		case GL_INTENSITY:
+		case GL_LUMINANCE:
+		case GL_ALPHA:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x );
+			stride = (image->Width - width);
+			for ( i = height ; i ; i-- ) {
+				for ( j = width >> 2  ; j ; j-- ) {
+			
+					*destPtr++ = src[0] | ( src[1] << 8 ) | ( src[2] << 16 ) | ( src[3] << 24 );
+					src += 4;
+				}
+				src += stride;
+			}
+			break;
+		default:
+			goto format_error;
+		}
+		break;
+	case 2:
+		switch (image->Format) {
+		case GL_RGB:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x ) * 3;
+			stride = (image->Width - width) * 3;
+			for ( i = height ; i ; i-- ) {
+				for ( j = width >> 1  ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR565(src[0],src[1],src[2]) |  
+						( MGAPACKCOLOR565(src[3],src[4],src[5]) << 16 );
+					src += 6;
+				}
+				src += stride;
+			}
+			break;
+		case GL_RGBA:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x ) * 4;
+			stride = (image->Width - width) * 4;
+			for ( i = height ; i ; i-- ) {
+				for ( j = width >> 1  ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR4444(src[0],src[1],src[2],src[3]) |  
+						( MGAPACKCOLOR4444(src[4],src[5],src[6],src[7]) << 16 );
+					src += 8;
+				}
+				src += stride;
+			}
+			break;
+		case GL_LUMINANCE:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x );
+			stride = (image->Width - width);
+			for ( i = height ; i ; i-- ) {
+				for ( j = width >> 1  ; j ; j-- ) {
+					/* FIXME: should probably use 555 texture to get true grey */
+					*destPtr++ = MGAPACKCOLOR565(src[0],src[0],src[0]) |  
+						( MGAPACKCOLOR565(src[1],src[1],src[1]) << 16 );
+					src += 2;
+				}
+				src += stride;
+			}
+			break;
+		case GL_INTENSITY:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x );
+			stride = (image->Width - width);
+			for ( i = height ; i ; i-- ) {
+				for ( j = width >> 1  ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR4444(src[0],src[0],src[0],src[0]) |  
+						( MGAPACKCOLOR4444(src[1],src[1],src[1],src[1]) << 16 );
+					src += 2;
+				}
+				src += stride;
+			}
+			break;
+		case GL_ALPHA:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x );
+			stride = (image->Width - width);
+			for ( i = height ; i ; i-- ) {
+				for ( j = width >> 1  ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR4444(255,255,255,src[0]) |  
+						( MGAPACKCOLOR4444(255,255,255,src[1]) << 16 );
+					src += 2;
+				}
+				src += stride;
+			}
+			break;
+		case GL_LUMINANCE_ALPHA:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x ) * 2;
+			stride = (image->Width - width) * 2;
+			for ( i = height ; i ; i-- ) {
+				for ( j = width >> 1  ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR4444(src[0],src[0],src[0],src[1]) |  
+						( MGAPACKCOLOR4444(src[2],src[2],src[2],src[3]) << 16 );
+					src += 4;
+				}
+				src += stride;
+			}
+			break;
+		default:
+			goto format_error;
+		}
+		break;
+	case 4:
+		switch (image->Format) {
+		case GL_RGB:
+			src = (mgaUI8 *)image->Data + (  y * image->Width + x ) * 3;
+			stride = (image->Width - width) * 3;
+			for ( i = height ; i ; i-- ) {
+				for ( j = width ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR8888(src[0],src[1],src[2], 255);
+					src += 3;
+				}
+				src += stride;
+			}
+			break;
+		case GL_RGBA:
+			src = (mgaUI8 *)image->Data + (  y * image->Width + x ) * 4;
+			stride = (image->Width - width) * 4;
+			for ( i = height ; i ; i-- ) {
+				for ( j = width  ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR8888(src[0],src[1],src[2],src[3]);
+					src += 4;
+				}
+				src += stride;
+			}
+			break;
+		case GL_LUMINANCE:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x );
+			stride = (image->Width - width);
+			for ( i = height ; i ; i-- ) {
+				for ( j = width ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR8888(src[0],src[0],src[0], 255);
+					src += 1;
+				}
+				src += stride;
+			}
+			break;
+		case GL_INTENSITY:
+			src = (mgaUI8 *)image->Data + (  y * image->Width + x );
+			stride = (image->Width - width);
+			for ( i = height ; i ; i-- ) {
+				for ( j = width ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR8888(src[0],src[0],src[0],src[0]);
+					src += 1;
+				}
+				src += stride;
+			}
+			break;
+		case GL_ALPHA:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x );
+			stride = (image->Width - width);
+			for ( i = height ; i ; i-- ) {
+				for ( j = width ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR8888(255,255,255,src[0]);
+					src += 1;
+				}
+				src += stride;
+			}
+			break;
+		case GL_LUMINANCE_ALPHA:
+			src = (mgaUI8 *)image->Data + ( y * image->Width + x ) * 2;
+			stride = (image->Width - width) * 2;
+			for ( i = height ; i ; i-- ) {
+				for ( j = width ; j ; j-- ) {
+			
+					*destPtr++ = MGAPACKCOLOR8888(src[0],src[0],
+								      src[0],src[1]);
+					src += 2;
+				}
+				src += stride;
+			}
+			break;
+		default:
+			goto format_error;
+		}
+		break;
+	default:
+		goto format_error;
 	}
 
 	return;
 
-format_error:
+ format_error:
 
-		mgaError( "Unsupported texelBytes %i, image->Format %i\n", 
-			  texelBytes, image->Format );
+	mgaError( "Unsupported texelBytes %i, image->Format %i\n", 
+		  (int)texelBytes, (int)image->Format );
 }
Index: xc/lib/GL/mesa/src/drv/mga/mgadd.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgadd.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgadd.c:1.3
--- xc/lib/GL/mesa/src/drv/mga/mgadd.c:1.1	Fri Feb 11 09:25:36 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgadd.c	Thu Jun 22 09:59:24 2000
@@ -23,9 +23,9 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgadd.c,v 1.3 2000/06/22 16:59:24 tsi Exp $ */
 
 
-
 #include "types.h"
 #include "vbrender.h"
 
@@ -61,11 +61,11 @@
    mgaContextPtr mmesa = MGA_CONTEXT( ctx );
    switch (name) {
    case GL_VENDOR:
-      return "Utah GLX";
+      return (GLubyte *)"Precision Insight, Inc.";
    case GL_RENDERER:
-      if (MGA_IS_G200(mmesa)) return "GLX-MGA-G200";
-      if (MGA_IS_G400(mmesa)) return "GLX-MGA-G400";
-      return "GLX-MGA";
+      if (MGA_IS_G200(mmesa)) return (GLubyte *)"Mesa DRI G200 20000510";
+      if (MGA_IS_G400(mmesa)) return (GLubyte *)"Mesa DRI G400 20000510";
+      return (GLubyte *)"Mesa DRI MGA 20000510";
    default:
       return 0;
    }
@@ -102,7 +102,7 @@
 
    /* Support multitexture only on the g400.
     */
-   if (!MGA_IS_G400(MGA_CONTEXT(ctx))) 
+   if (1 /*!MGA_IS_G400(MGA_CONTEXT(ctx))*/) 
    {
       gl_extensions_disable( ctx, "GL_EXT_multitexture" );
       gl_extensions_disable( ctx, "GL_SGIS_multitexture" );
@@ -123,10 +123,13 @@
     * a few rogue fallbacks.
     */
    gl_extensions_disable( ctx, "ARB_imaging" );
+   gl_extensions_disable( ctx, "GL_EXT_blend_color" );
    gl_extensions_disable( ctx, "GL_EXT_blend_minmax" );
    gl_extensions_disable( ctx, "GL_EXT_blend_logic_op" );
    gl_extensions_disable( ctx, "GL_EXT_blend_subtract" );
    gl_extensions_disable( ctx, "GL_INGR_blend_func_separate" );   
+   gl_extensions_disable( ctx, "GL_EXT_texture_lod_bias" );   
+   gl_extensions_disable( ctx, "GL_MESA_resize_buffers" );   
 }
 
 
Index: xc/lib/GL/mesa/src/drv/mga/mgadepth.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgadepth.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgadepth.c:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgadepth.c:1.1	Fri Feb 11 09:25:36 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgadepth.c	Fri Jun 16 17:03:01 2000
@@ -43,20 +43,24 @@
 #include "mgalib.h"
 #endif
 
+#define DEPTH_SCALE 65535.0F
 
-
 /*
  * Return the address of the Z-buffer value for window coordinate (x,y):
  */
-#define Z_SETUP								\
-   mgaContextPtr mmesa = MGA_CONTEXT(ctx);				\
-   __DRIscreenPrivate *sPriv = mmesa->driScreen;			\
-   mgaScreenPrivate *mgaScreen = mmesa->mgaScreen;			\
-   GLdepth *zbstart = (GLdepth *)(sPriv->pFB + mgaScreen->depthOffset);\
-   GLint zbpitch = mgaScreen->depthPitch
+#define Z_SETUP						\
+   __DRIscreenPrivate *sPriv = mmesa->driScreen;	\
+   __DRIdrawablePrivate *dPriv = mmesa->driDrawable;	\
+   GLuint height = dPriv->h;				\
+   mgaScreenPrivate *mgaScreen = mmesa->mgaScreen;	\
+   GLint zbpitch = mgaScreen->depthPitch;		\
+   char *zbstart = (char *)(sPriv->pFB + 		\
+			       mgaScreen->depthOffset +	\
+			       dPriv->x * 2 +		\
+			       dPriv->y * zbpitch)
 
 #define Z_ADDRESS( X, Y )  \
-  (zbstart + zbpitch * (Y) + (X))
+  (GLdepth *)(zbstart + zbpitch * (height - (Y)) + (X) * 2)
 
 
 /**********************************************************************/
@@ -84,16 +88,18 @@
 					   const GLdepth z[],
 					   GLubyte mask[] )
 {
-   Z_SETUP;
-   GLdepth *zptr = Z_ADDRESS( x, y );
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
    GLubyte *m = mask;
    GLuint i;
    GLuint passed = 0;
 
-   LOCK_HARDWARE(mmesa);
+   LOCK_HARDWARE_QUIESCENT(mmesa);
+   {
+      Z_SETUP;
+      GLdepth *zptr = Z_ADDRESS( x, y );
 
-   /* switch cases ordered from most frequent to less frequent */
-   switch (ctx->Depth.Func) {
+      /* switch cases ordered from most frequent to less frequent */
+      switch (ctx->Depth.Func) {
       case GL_LESS:
          if (ctx->Depth.Mask) {
 	    /* Update Z buffer */
@@ -297,8 +303,8 @@
 	 }
 	 break;
       default:
+      }
    }
-
    UNLOCK_HARDWARE(mmesa);
 
    return passed;
@@ -320,14 +326,16 @@
 					   const GLint x[], const GLint y[],
 					   const GLdepth z[], GLubyte mask[] )
 {
-   Z_SETUP;
-   register GLdepth *zptr;
-   register GLuint i;
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+   LOCK_HARDWARE_QUIESCENT(mmesa);
+   {
+      Z_SETUP;
+      register GLdepth *zptr;
+      register GLuint i;
 
-   LOCK_HARDWARE(mmesa);
 
-   /* switch cases ordered from most frequent to less frequent */
-   switch (ctx->Depth.Func) {
+      /* switch cases ordered from most frequent to less frequent */
+      switch (ctx->Depth.Func) {
       case GL_LESS:
          if (ctx->Depth.Mask) {
 	    /* Update Z buffer */
@@ -547,8 +555,8 @@
 	 }
 	 break;
       default:
-    } 
-
+      } 
+   }
    UNLOCK_HARDWARE(mmesa);
 }
 
@@ -570,27 +578,29 @@
 				       GLuint n, GLint x, GLint y, 
 				       GLfloat depth[] )
 {
-   Z_SETUP;
-   GLdepth *zptr;
-   GLfloat scale;
-   GLuint i;
-
-   LOCK_HARDWARE(mmesa);
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+   LOCK_HARDWARE_QUIESCENT(mmesa);
+   {
+
+      Z_SETUP;
+      GLdepth *zptr;
+      GLfloat scale;
+      GLuint i;
 
-   scale = 1.0F / DEPTH_SCALE;
+      scale = 1.0F / DEPTH_SCALE;
 
-   if (ctx->Buffer->Depth) {
-      zptr = Z_ADDRESS( x, y );
-      for (i=0;i<n;i++) {
-	 depth[i] = (GLfloat) zptr[i] * scale;
+      if (ctx->ReadBuffer->Depth) {
+	 zptr = Z_ADDRESS( x, y );
+	 for (i=0;i<n;i++) {
+	    depth[i] = (GLfloat) zptr[i] * scale;
+	 }
       }
-   }
-   else {
-      for (i=0;i<n;i++) {
-	 depth[i] = 0.0F;
+      else {
+	 for (i=0;i<n;i++) {
+	    depth[i] = 0.0F;
+	 }
       }
    }
-   
    UNLOCK_HARDWARE(mmesa);
 }
 
@@ -607,30 +617,32 @@
 				     GLuint n, GLint x, GLint y, 
 				     GLdepth depth[] )
 {
-   Z_SETUP;
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+   LOCK_HARDWARE_QUIESCENT(mmesa);
+   {
+      Z_SETUP;
    
-   LOCK_HARDWARE(mmesa);
       
-   if (ctx->Buffer->Depth) {
-      GLdepth *zptr = Z_ADDRESS( x, y );
-      MEMCPY( depth, zptr, n * sizeof(GLdepth) );
-   }
-   else {
-      GLuint i;
-      for (i=0;i<n;i++) {
-	 depth[i] = 0;
+      if (ctx->ReadBuffer->Depth) {
+	 GLdepth *zptr = Z_ADDRESS( x, y );
+	 MEMCPY( depth, zptr, n * sizeof(GLdepth) );
       }
+      else {
+	 GLuint i;
+	 for (i=0;i<n;i++) {
+	    depth[i] = 0;
+	 }
+      }
    }
-   
    UNLOCK_HARDWARE(mmesa);
 }
 
 
 void mgaDDInitDepthFuncs( GLcontext *ctx )
 {
-   ctx->Driver.ReadDepthSpanFloat = mga_read_depth_span_float;
-   ctx->Driver.ReadDepthSpanInt = mga_read_depth_span_int;
-   ctx->Driver.DepthTestSpan = mga_depth_test_span_generic;
-   ctx->Driver.DepthTestPixels = mga_depth_test_pixels_generic;
+   ctx->Driver.ReadDepthSpan = mga_read_depth_span_float;
+   ctx->Driver.WriteDepthSpan = mga_read_depth_span_float;
+   ctx->Driver.ReadDepthPixels mga_read_depth_span_float;
+   ctx->Driver.WriteDepthPixels = mga_read_depth_span_float;
 }
 
Index: xc/lib/GL/mesa/src/drv/mga/mgaeltpath.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/mga/mgaeltpath.c:1.1
--- /dev/null	Sat Jul  1 20:44:35 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgaeltpath.c	Fri Jun 16 17:03:01 2000
@@ -0,0 +1,457 @@
+/*
+ * GLX Hardware Device Driver for Matrox G400
+ * Copyright (C) 1999 Keith Whitwell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <stdio.h>
+
+#include "types.h"
+#include "enums.h"
+#include "cva.h"
+#include "vertices.h"
+#include "mmath.h"
+#include "xform.h"
+
+#include "mgalib.h"
+#include "mgapipeline.h"
+#include "mgatris.h"
+#include "mgastate.h"
+#include "mgavb.h"
+
+
+/* Always use a full-sized stride for vertices. [FIXME]
+ * Stride in the buffers must be a quadword multiple.
+ */
+#define BUFFER_STRIDE 12 
+#define CLIP_STRIDE 10 
+
+
+static void fire_elts( mgaContextPtr mmesa )
+{
+   LOCK_HARDWARE( mmesa );
+
+   /* Fire queued elements and discard that buffer if its contents
+    * won't be referenced by future elements.
+    */
+   if (mmesa->elt_buf) {
+      GLuint retain = (mmesa->elt_buf == mmesa->retained_buf);
+
+      if (mmesa->first_elt != mmesa->next_elt) {
+	 mgaFireEltsLocked( mmesa, 
+			    ((GLuint)mmesa->first_elt - 
+			     (GLuint)mmesa->elt_buf->address),
+			    ((GLuint)mmesa->next_elt - 
+			     (GLuint)mmesa->elt_buf->address),
+			    !retain );
+      } else if (!retain) 
+	 mgaReleaseBufLocked( mmesa, mmesa->elt_buf );
+      
+      mmesa->elt_buf = 0;
+   } 
+   else if (mmesa->vertex_dma_buffer) 
+   {
+      mgaFlushVerticesLocked( mmesa );
+   }
+
+   mgaGetEltBufLocked( mmesa );
+      
+   UNLOCK_HARDWARE( mmesa );
+
+   mmesa->next_vert = (GLfloat *)((GLuint)mmesa->elt_buf->address + 
+				  mmesa->elt_buf->total - 
+				  BUFFER_STRIDE * sizeof(GLfloat));
+
+   mmesa->next_vert_phys = (mmesa->mgaScreen->dmaOffset + 
+			    mmesa->elt_buf->idx * MGA_DMA_BUF_SZ +
+			    mmesa->elt_buf->total -
+			    BUFFER_STRIDE * sizeof(GLfloat));
+
+   mmesa->first_elt = (GLuint *)mmesa->elt_buf->address;
+   mmesa->next_elt = (GLuint *)mmesa->elt_buf->address;
+
+}
+
+
+static void release_bufs( mgaContextPtr mmesa )
+{
+   if (mmesa->retained_buf && mmesa->retained_buf != mmesa->elt_buf) 
+   {
+      LOCK_HARDWARE( mmesa );
+      if (mmesa->first_elt != mmesa->next_elt) {
+	 mgaFireEltsLocked( mmesa, 
+			    ((GLuint)mmesa->first_elt - 
+			     (GLuint)mmesa->elt_buf->address),
+			    ((GLuint)mmesa->next_elt - 
+			     (GLuint)mmesa->elt_buf->address),
+			    0 );
+
+	 mmesa->first_elt = mmesa->next_elt;
+      }
+
+      mgaReleaseBufLocked( mmesa, mmesa->retained_buf );
+      UNLOCK_HARDWARE( mmesa );
+   }
+
+   mmesa->retained_buf = 0;
+}
+
+
+
+
+#define NEGATIVE(f)          (f < 0)
+#define DIFFERENT_SIGNS(a,b) ((a*b) < 0)
+#define LINTERP( T, A, B )   ( (A) + (T) * ( (B) - (A) ) )
+
+
+#define INTERP_RGBA(t, out, a, b) {			\
+   int i;						\
+   for (i = 0; i < 4; i++) {				\
+      GLfloat fa = UBYTE_COLOR_TO_FLOAT_COLOR(a[i]);	\
+      GLfloat fb = UBYTE_COLOR_TO_FLOAT_COLOR(b[i]);	\
+      GLfloat fo = LINTERP(t, fa, fb);			\
+      FLOAT_COLOR_TO_UBYTE_COLOR(out[i], fo);		\
+   }							\
+}
+
+
+#define CLIP(SGN,V,PLANE)			\
+if (mask & PLANE) {				\
+   GLuint *indata = inlist[in];			\
+   GLuint *outdata = inlist[in ^= 1];		\
+   GLuint nr = n;				\
+   GLfloat *J = verts[indata[nr-1]];		\
+   GLfloat dpJ = (SGN J[V]) + J[3];		\
+						\
+   for (i = n = 0 ; i < nr ; i++) {		\
+      GLuint elt_i = indata[i];			\
+      GLfloat *I = verts[elt_i];		\
+      GLfloat dpI = (SGN I[V]) + I[3];		\
+						\
+      if (DIFFERENT_SIGNS(dpI, dpJ)) {		\
+	 GLfloat *O = verts[next_vert];	\
+	 outdata[n++] = next_vert++;		\
+						\
+	 if (NEGATIVE(dpI)) {			\
+	    GLfloat t = dpI / (dpI - dpJ);	\
+	    interp(t, O, I, J);			\
+	 }					\
+         else					\
+	 {					\
+	    GLfloat t = dpJ / (dpJ - dpI);	\
+	    interp(t, O, J, I);			\
+	 }					\
+      }						\
+						\
+      if (!NEGATIVE(dpI))			\
+	 outdata[n++] = elt_i;			\
+						\
+      J = I;					\
+      dpJ = dpI;				\
+   }						\
+						\
+   if (n < 3) return;				\
+}
+
+
+static void mga_tri_clip( mgaContextPtr mmesa,
+			  struct vertex_buffer *VB,
+			  GLuint *elt,
+			  GLubyte mask )
+{
+   struct mga_elt_tab *tab = mmesa->elt_tab;
+   mga_interp_func interp = tab->interp;
+   GLuint inlist[2][VB_MAX_CLIPPED_VERTS];
+   GLuint in = 0;
+   GLuint n = 3, next_vert = 3;
+   GLuint i;
+   GLfloat verts[VB_MAX_CLIPPED_VERTS][CLIP_STRIDE];
+
+   /* Build temporary vertices in clipspace.  This is the potential
+    * downside to this path.
+    */
+   tab->build_tri_verts( mmesa, VB, (GLfloat *)verts, elt );
+
+   inlist[0][0] = 0;
+   inlist[0][1] = 1;
+   inlist[0][2] = 2;
+
+   CLIP(-,0,CLIP_RIGHT_BIT);
+   CLIP(+,0,CLIP_LEFT_BIT);
+   CLIP(-,1,CLIP_TOP_BIT);
+   CLIP(+,1,CLIP_BOTTOM_BIT);
+   CLIP(-,2,CLIP_FAR_BIT);
+   CLIP(+,2,CLIP_NEAR_BIT); 
+
+
+   {
+      GLuint *out = inlist[in];
+      GLuint space = (GLuint)mmesa->next_vert -	(GLuint)mmesa->next_elt;
+
+      if (space < n * (BUFFER_STRIDE + 3) * sizeof(GLuint))
+         fire_elts(mmesa); 
+
+      /* Project the new vertices and emit to dma buffers.  Translate
+       * out values to physical addresses for setup dma.  
+       */
+      tab->project_and_emit_verts( mmesa, (GLfloat *)verts, out, n );
+      
+      /* Convert the planar polygon to a list of triangles and emit to
+       * elt buffers. 
+       */
+      for (i = 2 ; i < n ; i++) {
+	 mmesa->next_elt[0] = out[0];
+	 mmesa->next_elt[1] = out[i-1];
+	 mmesa->next_elt[2] = out[i];
+	 mmesa->next_elt += 3;
+      }
+   }
+}
+
+
+
+
+/* Build a table of functions to clip each primitive type.  These
+ * produce a list of elements in the appropriate 'reduced' primitive,
+ * ie (points, lines, triangles) containing all the clipped and
+ * unclipped primitives from the original list.
+ */
+
+#define INIT(x)
+
+#define TRI_THRESHOLD         (3 * sizeof(GLuint))
+
+#define UNCLIPPED_VERT(x) (mmesa->first_vert_phys - x * BUFFER_STRIDE * 4)
+
+#define TRIANGLE( e2, e1, e0 )			\
+do {						\
+   if ((GLuint)mmesa->next_vert - 		\
+       (GLuint)mmesa->next_elt < TRI_THRESHOLD)	\
+      fire_elts(mmesa);			\
+   mmesa->next_elt[0] = UNCLIPPED_VERT(e2);	\
+   mmesa->next_elt[1] = UNCLIPPED_VERT(e1);	\
+   mmesa->next_elt[2] = UNCLIPPED_VERT(e0);	\
+   mmesa->next_elt+=3;				\
+} while (0)
+
+#define CLIP_TRIANGLE( e2, e1, e0 )				\
+do {								\
+   GLubyte ormask = mask[e2] | mask[e1] | mask[e0];		\
+   if (ormask == 0) {						\
+      TRIANGLE( e2, e1, e0 );					\
+   } else if ((mask[e2] & mask[e1] & mask[e0]) == 0) {		\
+      out[0] = e2;						\
+      out[1] = e1;						\
+      out[2] = e0;						\
+      mga_tri_clip( mmesa, VB, out, ormask );			\
+   }								\
+} while (0)
+
+#define LOCAL_VARS						\
+   mgaContextPtr mmesa = MGA_CONTEXT( VB->ctx );		\
+   GLuint *elt = VB->EltPtr->data;				\
+   GLuint out[VB_MAX_CLIPPED_VERTS];				\
+   GLubyte *mask = VB->ClipMask; \
+   (void) mask; (void) out; (void) elt; (void) mmesa;
+
+
+
+#define RENDER_POINTS(start, count) 
+#define RENDER_LINE(i1, i0) 
+#define RENDER_TRI(i2, i1, i0, pv, parity)		\
+do {							\
+   GLuint e2 = elt[i2], e1 = elt[i1], e0 = elt[i0];	\
+   if (parity) e2 = elt[i1], e1 = elt[i2];		\
+   CLIP_TRIANGLE( e2, e1, e0 );				\
+} while (0)
+
+#define RENDER_QUAD(i3, i2, i1, i0, pv )		\
+  CLIP_TRIANGLE(elt[i3], elt[i2], elt[i0]);     	\
+  CLIP_TRIANGLE(elt[i2], elt[i1], elt[i0])
+
+#define TAG(x) mga_##x##_elt
+#include "render_tmp.h"
+
+
+
+#define LOCAL_VARS						\
+   mgaContextPtr mmesa = MGA_CONTEXT( VB->ctx );		\
+   GLuint *elt = VB->EltPtr->data;				\
+   (void) elt; (void) mmesa;
+
+#define RENDER_POINTS(start, count) 
+#define RENDER_LINE(i1, i0) 
+#define RENDER_TRI(i2, i1, i0, pv, parity)		\
+do {							\
+   GLuint e2 = elt[i2], e1 = elt[i1], e0 = elt[i0];	\
+   if (parity) e2 = elt[i1], e1 = elt[i2];		\
+   TRIANGLE( e2, e1, e0 );				\
+} while (0)
+
+#define RENDER_QUAD(i3, i2, i1, i0, pv )	\
+  TRIANGLE(elt[i3], elt[i2], elt[i0]);		\
+  TRIANGLE(elt[i2], elt[i1], elt[i0])
+
+#define TAG(x) mga_##x##_elt_unclipped
+#include "render_tmp.h"
+
+
+
+
+static void refresh_projection_matrix( GLcontext *ctx )
+{
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+   GLfloat *m = mmesa->device_matrix;
+   GLmatrix *mat = &ctx->Viewport.WindowMap;
+
+   REFRESH_DRAWABLE_INFO(mmesa);
+
+   m[MAT_SX] =   mat->m[MAT_SX];
+   m[MAT_TX] =   mat->m[MAT_TX] + mmesa->drawX + .5;
+   m[MAT_SY] = (- mat->m[MAT_SY]);
+   m[MAT_TY] = (- mat->m[MAT_TY]) + mmesa->driDrawable->h + mmesa->drawY - .5;
+   m[MAT_SZ] =   mat->m[MAT_SZ] * (1.0 / 0x10000);
+   m[MAT_TZ] =   mat->m[MAT_TZ] * (1.0 / 0x10000);
+}
+
+#define CLIP_UBYTE_B 0   
+#define CLIP_UBYTE_G 1  
+#define CLIP_UBYTE_R 2
+#define CLIP_UBYTE_A 3   
+
+
+#define TYPE (0)
+#define TAG(x) x
+#include "mgaelttmp.h"
+
+#define TYPE (MGA_RGBA_BIT)
+#define TAG(x) x##_RGBA
+#include "mgaelttmp.h"
+
+#define TYPE (MGA_TEX0_BIT)
+#define TAG(x) x##_TEX0
+#include "mgaelttmp.h"
+
+#define TYPE (MGA_RGBA_BIT|MGA_TEX0_BIT)
+#define TAG(x) x##_RGBA_TEX0
+#include "mgaelttmp.h"
+
+#define TYPE (MGA_RGBA_BIT|MGA_TEX0_BIT|MGA_TEX1_BIT)
+#define TAG(x) x##_RGBA_TEX0_TEX1
+#include "mgaelttmp.h"
+
+#define TYPE (MGA_TEX0_BIT|MGA_TEX1_BIT)
+#define TAG(x) x##_TEX0_TEX1
+#include "mgaelttmp.h"
+
+
+/* Very sparsely popluated array - fix the indices.
+ */
+static struct mga_elt_tab mgaEltTab[0x80];
+
+void mgaDDEltPathInit( void )
+{
+   mga_render_init_elt();
+   mga_render_init_elt_unclipped();
+
+   mga_init_eltpath( &mgaEltTab[0] );
+   mga_init_eltpath_RGBA( &mgaEltTab[MGA_RGBA_BIT] );
+   mga_init_eltpath_TEX0( &mgaEltTab[MGA_TEX0_BIT] );
+   mga_init_eltpath_RGBA_TEX0( &mgaEltTab[MGA_RGBA_BIT|MGA_TEX0_BIT] );
+   mga_init_eltpath_TEX0_TEX1( &mgaEltTab[MGA_TEX0_BIT|MGA_TEX1_BIT] );
+   mga_init_eltpath_RGBA_TEX0_TEX1( &mgaEltTab[MGA_RGBA_BIT|MGA_TEX0_BIT|
+						  MGA_TEX1_BIT] );
+}
+
+#define VALID_SETUP (MGA_RGBA_BIT|MGA_TEX0_BIT|MGA_TEX1_BIT)
+
+
+
+/* Use a temporary array for device coordinates, so that we can easily
+ * tap into existing mesa assembly.  Otherwise consider emitting
+ * device coordinates to dma buffers directly from the project/cliptest
+ * routine.  (requires output stride, potential loss of writecombining 
+ * efficiency?)  
+ *
+ * This path is a lot closer to the standard vertex path in the
+ * initial stages than the original fastpath.  A slightly more optimal
+ * path could be constructed, but would require us to write new
+ * assembly.  
+ */
+void mgaDDEltPath( struct vertex_buffer *VB )
+{
+   GLcontext *ctx = VB->ctx;
+   GLenum prim = ctx->CVA.elt_mode;
+   mgaContextPtr mmesa = MGA_CONTEXT( ctx ); 
+   struct mga_elt_tab *tab = &mgaEltTab[mmesa->setupindex & VALID_SETUP];
+
+   VB->ClipPtr = TransformRaw(&VB->Clip, &ctx->ModelProjectMatrix, VB->ObjPtr );
+
+   refresh_projection_matrix( ctx );
+
+   VB->ClipAndMask = ~0; 
+   VB->ClipOrMask = 0;
+   VB->Projected = gl_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,
+						   &VB->Win,
+						   VB->ClipMask,
+						   &VB->ClipOrMask,
+						   &VB->ClipAndMask );
+
+   if (VB->ClipAndMask) 
+      return;
+
+   if (mmesa->vertex_dma_buffer) 
+      mgaFlushVertices( mmesa );
+
+   if (mmesa->new_state)
+      mgaDDUpdateHwState( ctx );
+
+   /* Allocate a single buffer to hold unclipped vertices.  All
+    * unclipped vertices must be contiguous.  
+    */
+   if ((GLuint)mmesa->next_vert - (GLuint)mmesa->next_elt <  
+       VB->Count * BUFFER_STRIDE * sizeof(GLuint))	
+      fire_elts( mmesa );
+
+   mmesa->retained_buf = mmesa->elt_buf;
+   
+   /* Emit unclipped vertices to the buffer.
+    */
+   tab->emit_unclipped_verts( VB ); 
+	 
+   /* Emit indices and clipped vertices to one or more buffers.
+    */
+   if (VB->ClipOrMask) {
+      mmesa->elt_tab = tab;
+      mga_render_tab_elt[prim]( VB, 0, VB->EltPtr->count, 0 ); 
+   } else
+      mga_render_tab_elt_unclipped[prim]( VB, 0, VB->EltPtr->count, 0 );
+
+   /* Send to hardware and release any retained buffers.
+    */
+   release_bufs( mmesa );
+
+   /* This indicates that there is no cached data to reuse.  
+    */
+   VB->pipeline->data_valid = 0;
+   VB->pipeline->new_state = 0;
+}
+
Index: xc/lib/GL/mesa/src/drv/mga/mgaelttmp.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/mga/mgaelttmp.h:1.1
--- /dev/null	Sat Jul  1 20:44:35 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgaelttmp.h	Fri Jun 16 17:03:01 2000
@@ -0,0 +1,269 @@
+/*
+ * DRI Hardware Device Driver for G200/G400
+ * Copyright (C) 1999 Keith Whitwell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+/* Buffers fill from high addresses down with vertices and from low
+ * addresses up with elements.  
+ */
+
+
+/* Emit the bulk of the vertices to the first dma buffer.  Leave
+ * empty slots for clipped vertices so that we can still address
+ * vertices by index.
+ */
+static void TAG(emit_unclipped_verts)( struct vertex_buffer *VB )
+{
+   GLuint i;
+   mgaContextPtr mmesa = MGA_CONTEXT(VB->ctx);
+   GLfloat *dev = VB->Projected->start;
+   GLubyte *color = VB->ColorPtr->start;
+   GLfloat *tex0_data = VB->TexCoordPtr[0]->start;
+   GLfloat *tex1_data = VB->TexCoordPtr[1]->start;
+   GLuint color_stride = VB->ColorPtr->stride;
+   GLuint tex0_stride = VB->TexCoordPtr[0]->stride;
+   GLuint tex1_stride = VB->TexCoordPtr[1]->stride;
+
+   GLfloat *f = mmesa->next_vert;
+   GLuint count = VB->Count;
+   GLubyte *clipmask = VB->ClipMask;
+
+   const GLfloat *m = mmesa->device_matrix;
+   const GLfloat sx = m[0], sy = m[5], sz = m[10];
+   const GLfloat tx = m[12], ty = m[13], tz = m[14];
+
+   mmesa->retained_buf = mmesa->elt_buf;
+   mmesa->first_vert_phys = mmesa->next_vert_phys;
+
+   for (i = 0 ; i < count ; f -= BUFFER_STRIDE, i++) 
+   {
+      if (!clipmask[i]) 
+      {
+	 f[0] = sx * dev[0] + tx;
+	 f[1] = sy * dev[1] + ty;
+	 f[2] = sz * dev[2] + tz;
+	 f[3] = dev[3]; 
+
+	 if (TYPE & MGA_RGBA_BIT) {
+#if defined(USE_X86_ASM)
+	    __asm__ (
+	    "movl (%%edx),%%eax   \n"
+	    "bswap %%eax          \n"
+	    "rorl $8,%%eax        \n"
+	    "movl %%eax,16(%%edi) \n"
+	    :
+	    : "d" (color), "D" (f)
+	    : "%eax" );
+#else
+	    GLubyte *b = (GLubyte *)&f[4];
+	    b[CLIP_UBYTE_B] = color[2];
+	    b[CLIP_UBYTE_G] = color[1];
+	    b[CLIP_UBYTE_R] = color[0];
+	    b[CLIP_UBYTE_A] = color[3];
+#endif
+	 }
+
+	 if (TYPE & MGA_TEX0_BIT) {
+/*  	    fprintf(stderr, "i %d tex0 %f, %f\n", i,  */
+/*  		    tex0_data[0], tex0_data[1]); */
+	    *(int*)&f[6] = *(int*)&tex0_data[0];
+	    *(int*)&f[7] = *(int*)&tex0_data[1];
+	 }
+
+	 if (TYPE & MGA_TEX1_BIT) {
+	    *(int*)&f[8] = *(int*)&tex1_data[0];
+	    *(int*)&f[9] = *(int*)&tex1_data[1];
+	 }
+      }
+
+      STRIDE_F(dev, 16);
+      if (TYPE & MGA_RGBA_BIT) color += color_stride;
+      if (TYPE & MGA_TEX0_BIT) STRIDE_F(tex0_data, tex0_stride);
+      if (TYPE & MGA_TEX1_BIT) STRIDE_F(tex1_data, tex1_stride);
+   }
+
+   mmesa->next_vert = f;
+   mmesa->next_vert_phys -= count * BUFFER_STRIDE * sizeof(GLuint);
+}
+
+
+/* Build three temporary clipspace vertex for clipping a triangle.
+ * Recreate from the VB data rather than trying to read back from
+ * uncached memory.  
+ */
+static void TAG(build_tri_verts)( mgaContextPtr mmesa,
+				  struct vertex_buffer *VB, 
+				  GLfloat *O, 
+				  GLuint *elt ) 
+{
+   int i;
+
+   for (i = 0 ; i < 3 ; i++, O += CLIP_STRIDE) {
+      GLfloat *clip = VB->Clip.start + elt[i]*4;
+
+      O[0] = clip[0];
+      O[1] = clip[1];
+      O[2] = clip[2]; 
+      O[3] = clip[3];
+
+      if (TYPE & MGA_RGBA_BIT) {
+	 GLubyte *col = VEC_ELT(VB->ColorPtr, GLubyte, elt[i]);
+	 GLubyte *b = (GLubyte *)&O[4];
+	 b[CLIP_UBYTE_R] = col[0];
+	 b[CLIP_UBYTE_G] = col[1];
+	 b[CLIP_UBYTE_B] = col[2];
+	 b[CLIP_UBYTE_A] = col[3];
+      }
+
+      if (0)
+	 fprintf(stderr, 
+	      "build_tri_vert elt[%d]: %d phys: %x (first_phys %x elt_buf %x\n",
+	      i, elt[i], UNCLIPPED_VERT(elt[i]), 
+	      mmesa->first_vert_phys, (GLuint)mmesa->elt_buf);
+
+      *(GLuint *)&O[5] = UNCLIPPED_VERT(elt[i]);
+
+      if (TYPE & MGA_TEX0_BIT) {
+	 GLfloat *tex0_data = VEC_ELT(VB->TexCoordPtr[0], GLfloat, elt[i]);
+	 *(int*)&O[6] = *(int*)&tex0_data[0];
+	 *(int*)&O[7] = *(int*)&tex0_data[1];
+      }
+
+      if (TYPE & MGA_TEX1_BIT) {
+	 GLfloat *tex1_data = VEC_ELT(VB->TexCoordPtr[1], GLfloat, elt[i]);
+	 *(int*)&O[8] = *(int*)&tex1_data[0];
+	 *(int*)&O[9] = *(int*)&tex1_data[1];
+      }
+   }
+}
+
+
+/* Interpolate between two of the vertices constructed above.
+ */
+static void TAG(interp)( GLfloat t, 
+			 GLfloat *O,
+			 const GLfloat *I,
+			 const GLfloat *J )
+{
+   O[0] = LINTERP(t, I[0], J[0]);
+   O[1] = LINTERP(t, I[1], J[1]);
+   O[2] = LINTERP(t, I[2], J[2]);
+   O[3] = LINTERP(t, I[3], J[3]);
+
+   if (TYPE & MGA_RGBA_BIT) {
+      INTERP_RGBA(t,
+		  ((GLubyte *)&(O[4])),
+		  ((GLubyte *)&(I[4])),
+		  ((GLubyte *)&(J[4])));
+   }
+
+   if (0) fprintf(stderr, "setting 0x%x to ~0\n", (GLuint)&O[5]);
+
+   *(GLuint *)&O[5] = ~0;	/* note that this is a new vertex */
+ 
+   if (TYPE & MGA_TEX0_BIT) {
+      O[6] = LINTERP(t, I[6], J[6]);
+      O[7] = LINTERP(t, I[7], J[7]);
+   }
+
+   if (TYPE & MGA_TEX1_BIT) {
+      O[8] = LINTERP(t, I[8], J[8]);
+      O[9] = LINTERP(t, I[9], J[9]);
+   }
+}
+
+
+
+/* When clipping is complete, scan the final vertex list and emit any
+ * new ones to dma buffers.  Update the element list to a format
+ * suitable for sending to hardware.
+ */
+static void TAG(project_and_emit_verts)( mgaContextPtr mmesa,
+					 const GLfloat *verts,
+					 GLuint *elt,
+					 int nr)
+{
+   
+   GLfloat *O = mmesa->next_vert;
+   GLuint phys = mmesa->next_vert_phys;
+
+   const GLfloat *m = mmesa->device_matrix;
+   const GLfloat sx = m[0], sy = m[5], sz = m[10];
+   const GLfloat tx = m[12], ty = m[13], tz = m[14];
+   GLuint i;
+   
+   for (i = 0 ; i < nr ; i++) {
+      const GLfloat *I = &verts[elt[i] * CLIP_STRIDE];
+      GLuint tmp = *(GLuint *)&I[5];
+
+      if (0) fprintf(stderr, "elt[%d] (tmp 0x%x %d) %d --> ", i, (GLuint)&I[5],
+	      tmp, elt[i]);
+
+
+      if ((elt[i] = tmp) == ~0) 
+      {      
+	 GLfloat oow = 1.0/I[3];
+
+	 elt[i] = phys;
+	 phys -= BUFFER_STRIDE * sizeof(GLuint);
+	 
+	 O[0] = sx * I[0] * oow + tx;
+	 O[1] = sy * I[1] * oow + ty;
+	 O[2] = sz * I[2] * oow + tz;
+	 O[3] = oow; 
+
+	 if (TYPE & MGA_RGBA_BIT) {
+	    *(int*)&O[4] = *(int*)&I[4];
+	 }
+ 
+	 if (TYPE & MGA_TEX0_BIT) {
+	    *(int*)&O[6] = *(int*)&I[6];
+	    *(int*)&O[7] = *(int*)&I[7];
+	 }
+
+	 if (TYPE & MGA_TEX1_BIT) {
+	    *(int*)&O[8] = *(int*)&I[8];
+	    *(int*)&O[9] = *(int*)&I[9];
+	 }
+
+	 O -= BUFFER_STRIDE;
+      }
+      if (0) fprintf(stderr, "0x%x\n", elt[i]);
+   }
+
+   mmesa->next_vert = O;
+   mmesa->next_vert_phys = phys;
+}
+
+
+
+static void TAG(mga_init_eltpath)( struct mga_elt_tab *tab )
+{
+   tab->emit_unclipped_verts = TAG(emit_unclipped_verts);
+   tab->build_tri_verts = TAG(build_tri_verts);
+   tab->interp = TAG(interp);
+   tab->project_and_emit_verts = TAG(project_and_emit_verts);
+}
+
+#undef TYPE
+#undef TAG
+#undef STRIDE
Index: xc/lib/GL/mesa/src/drv/mga/mgafastpath.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgafastpath.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgafastpath.c:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgafastpath.c:1.1	Fri Feb 11 09:25:37 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgafastpath.c	Fri Jun 16 17:03:01 2000
@@ -380,10 +380,12 @@
    GLmatrix *mat = &ctx->Viewport.WindowMap;
    GLfloat m[16];
 
+   REFRESH_DRAWABLE_INFO(mmesa);
+
    m[MAT_SX] =   mat->m[MAT_SX];
-   m[MAT_TX] =   mat->m[MAT_TX] + mmesa->drawX - .5;
+   m[MAT_TX] =   mat->m[MAT_TX] + mmesa->drawX + SUBPIXEL_X;
    m[MAT_SY] = (- mat->m[MAT_SY]);
-   m[MAT_TY] = (- mat->m[MAT_TY]) + mmesa->driDrawable->h + mmesa->drawY - .5;
+   m[MAT_TY] = (- mat->m[MAT_TY]) + mmesa->driDrawable->h + mmesa->drawY + SUBPIXEL_Y;
    m[MAT_SZ] =   mat->m[MAT_SZ] * (1.0 / 0x10000);
    m[MAT_TZ] =   mat->m[MAT_TZ] * (1.0 / 0x10000);
 
@@ -401,10 +403,12 @@
    GLmatrix *mat = &ctx->Viewport.WindowMap;
    GLfloat m[16];
 
+   REFRESH_DRAWABLE_INFO(mmesa);
+
    m[MAT_SX] =   mat->m[MAT_SX];
-   m[MAT_TX] =   mat->m[MAT_TX] + mmesa->drawX - .5;
+   m[MAT_TX] =   mat->m[MAT_TX] + mmesa->drawX + SUBPIXEL_X;
    m[MAT_SY] = (- mat->m[MAT_SY]);
-   m[MAT_TY] = (- mat->m[MAT_TY]) + mmesa->driDrawable->h + mmesa->drawY - .5;
+   m[MAT_TY] = (- mat->m[MAT_TY]) + mmesa->driDrawable->h + mmesa->drawY - SUBPIXEL_Y;
    m[MAT_SZ] =   mat->m[MAT_SZ] * (1.0 / 0x10000);
    m[MAT_TZ] =   mat->m[MAT_TZ] * (1.0 / 0x10000);
 
@@ -484,6 +488,16 @@
 
    gl_prepare_arrays_cva( VB );	                 /* still need this */
 
+   if (gl_reduce_prim[prim] == GL_TRIANGLES && 
+       VB->Count < (MGA_DMA_BUF_SZ / 48) &&
+       (ctx->ModelProjectMatrix.flags & (MAT_FLAG_GENERAL|
+					 MAT_FLAG_PERSPECTIVE)) &&
+       mmesa->mgaScreen->chipset == MGA_CARD_TYPE_G400) 
+   {
+      mgaDDEltPath( VB );
+      return;
+   }
+
    /* Reserve enough space for the pathological case.
     */
    if (VB->EltPtr->count * 12 > MGA_DRIVER_DATA(VB)->size) {
@@ -507,18 +521,12 @@
 	 ctx->CVA.elt_mode = gl_reduce_prim[prim];
 	 VB->EltPtr = &(MGA_DRIVER_DATA(VB)->clipped_elements);
 
-	 LOCK_HARDWARE( mmesa );
 	 mga_project_clipped_vertices( VB );    /* clip->device space */
 	 mga_render_elements_direct( VB );        /* render using new list */
-	 mgaFlushVerticesLocked( mmesa );
-	 UNLOCK_HARDWARE( mmesa );
       }
    } else {
-      LOCK_HARDWARE( mmesa );
       mga_project_vertices( VB );               /* clip->device space  */
       mga_render_elements_direct( VB );           /* render using orig list */
-      mgaFlushVerticesLocked( mmesa );
-      UNLOCK_HARDWARE( mmesa );
    }
 
    /* This indicates that there is no cached data to reuse.  
Index: xc/lib/GL/mesa/src/drv/mga/mgafasttmp.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgafasttmp.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgafasttmp.h:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgafasttmp.h:1.1	Fri Feb 11 09:25:37 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgafasttmp.h	Fri Jun 16 17:03:01 2000
@@ -39,7 +39,6 @@
    const GLfloat * const m = ctx->ModelProjectMatrix.m;
    GLuint start = VB->CopyStart;
    GLuint count = VB->Count;
-   GLuint i;
 
    gl_xform_points3_v16_general(MGA_DRIVER_DATA(VB)->verts[start].f,
 				m, 
@@ -71,26 +70,63 @@
       GLuint tex1_stride = VB->TexCoordPtr[1]->stride;
 
       GLfloat *f = MGA_DRIVER_DATA(VB)->verts[start].f;
-
-      for (i = start ; i < count ; i++, f += 16) {
+      GLfloat *end = f+(16*(count-start));
+      while (f != end) {
 	 if (TYPE & MGA_RGBA_BIT) {
+#if defined(USE_X86_ASM)
+	    __asm__ (
+	    "movl (%%edx),%%eax   \n"
+	    "bswap %%eax          \n"
+	    "rorl $8,%%eax        \n"
+	    "movl %%eax,16(%%edi) \n"
+	    :
+	    : "d" (color), "D" (f)
+	    : "%eax" );
+#else
+	    GLubyte *col = color;
 	    GLubyte *b = (GLubyte *)&f[CLIP_UBYTE_COLOR];
-	    GLubyte *col = color; color += color_stride;
-	    b[CLIP_UBYTE_R] = col[0];
-	    b[CLIP_UBYTE_G] = col[1];
 	    b[CLIP_UBYTE_B] = col[2];
+	    b[CLIP_UBYTE_G] = col[1];
+	    b[CLIP_UBYTE_R] = col[0];
 	    b[CLIP_UBYTE_A] = col[3];
+#endif
 	 }
 	 if (TYPE & MGA_TEX0_BIT) {
-	    f[CLIP_S0] = tex0_data[0];
-	    f[CLIP_T0] = tex0_data[1];
-	    STRIDE_F(tex0_data, tex0_stride);
+#if defined (USE_X86_ASM)
+	    __asm__ (
+	    "movl (%%ecx), %%eax    \n"
+	    "movl %%eax, 24(%%edi)  \n"
+	    "movl 4(%%ecx), %%eax   \n"
+	    "movl %%eax, 28(%%edi)"
+	    :
+	    : "c" (tex0_data), "D" (f)
+	    : "%eax");
+#else
+	    *(unsigned int *)(f+CLIP_S0) = *(unsigned int *)tex0_data;
+	    *(unsigned int *)(f+CLIP_T0) = *(unsigned int *)(tex0_data+1);
+#endif
 	 }
 	 if (TYPE & MGA_TEX1_BIT) {
-	    f[CLIP_S1] = tex1_data[0];
-	    f[CLIP_T1] = tex1_data[1];
-	    STRIDE_F(tex1_data, tex1_stride);
+	    /* Hits a second cache line.
+	     */
+#if defined (USE_X86_ASM)
+	    __asm__ (
+	    "movl (%%esi), %%eax    \n"
+	    "movl %%eax, 32(%%edi)  \n"
+	    "movl 4(%%esi), %%eax   \n"
+	    "movl %%eax, 36(%%edi)"
+	    :
+	    : "S" (tex1_data), "D" (f)
+	    : "%eax");
+#else
+	    *(unsigned int *)(f+CLIP_S1) = *(unsigned int *)tex1_data;
+	    *(unsigned int *)(f+CLIP_T1) = *(unsigned int *)(tex1_data+1);
+#endif	      
 	 }
+	 if(TYPE & MGA_RGBA_BIT)color += color_stride;
+	 if(TYPE & MGA_TEX0_BIT)STRIDE_F(tex0_data, tex0_stride);
+	 if(TYPE & MGA_TEX1_BIT)STRIDE_F(tex1_data, tex1_stride);
+	 f += 16;
       }
    }
 
Index: xc/lib/GL/mesa/src/drv/mga/mgaioctl.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgaioctl.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgaioctl.c:1.3
--- xc/lib/GL/mesa/src/drv/mga/mgaioctl.c:1.1	Fri Feb 11 09:25:37 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgaioctl.c	Fri Jun 30 10:15:08 2000
@@ -14,115 +14,138 @@
 #include "mgalog.h"
 #include "mgavb.h"
 #include "mgatris.h"
+#include "mgabuffers.h"
 
+
 #include "drm.h"
 #include <sys/ioctl.h>
 
+#define DEPTH_SCALE 65535.0F
+
 static void mga_iload_dma_ioctl(mgaContextPtr mmesa,
-				int x1, int y1, int x2, int y2, 
-				unsigned long dest, unsigned int maccess)
+				unsigned long dest, 
+				int length)
 {
    int retcode;
    drm_mga_iload_t iload;
-   drmBufPtr buf = mmesa->dma_buffer;
+   drmBufPtr buf = mmesa->iload_buffer;
    
    iload.idx = buf->idx;
    iload.destOrg = dest;	
-   iload.mAccess = maccess;
-   iload.texture.x1 = x1;
-   iload.texture.y1 = y1;
-   iload.texture.y2 = x2;
-   iload.texture.x2 = y2;
+   iload.length = length;
+
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL) 
+      fprintf(stderr, "DRM_IOCTL_MGA_ILOAD idx %d dst %x length %d\n",
+	   iload.idx, iload.destOrg, iload.length);
+	   
    
    if ((retcode = ioctl(mmesa->driFd, DRM_IOCTL_MGA_ILOAD, &iload))) {
       printf("send iload retcode = %d\n", retcode);
       exit(1);
    }
-}
 
+   mmesa->iload_buffer = 0;
 
-static void mga_vertex_dma_ioctl(mgaContextPtr mmesa)
-{
-   int retcode;
-   int size = MGA_DMA_BUF_SZ;
-   drmDMAReq dma;
-   drmBufPtr buf = mmesa->dma_buffer;
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL) 
+      fprintf(stderr, "finished iload dma put\n");
 
-   dma.context = mmesa->hHWContext;
-   dma.send_count = 1;
-   dma.send_list = &buf->idx;
-   dma.send_sizes = &size;
-   dma.flags = DRM_DMA_WAIT;
-   dma.request_count = 0;
-   dma.request_size = 0;
-   dma.request_list = 0;
-   dma.request_sizes = 0;
+}
 
-   if ((retcode = drmDMA(mmesa->driFd, &dma))) {
-      printf("send iload retcode = %d\n", retcode);
-      exit(1);
+int mgaUpdateLock( mgaContextPtr mmesa, drmLockFlags flags )
+{
+   drm_lock_t lock;
+   
+   lock.flags = 0;
+
+   if (mmesa->sarea->last_quiescent != mmesa->sarea->last_enqueue &&
+       flags & DRM_LOCK_QUIESCENT) {
+      if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+	fprintf(stderr, "mgaLockQuiescent\n");
+      lock.flags |= _DRM_LOCK_QUIESCENT;
+   }
+   
+   if (flags & DRM_LOCK_FLUSH)      lock.flags |= _DRM_LOCK_FLUSH;
+   if (flags & DRM_LOCK_FLUSH_ALL)  lock.flags |= _DRM_LOCK_FLUSH_ALL;
+ 
+   if (!lock.flags)
+      return 0;
+
+   if(ioctl(mmesa->driFd, DRM_IOCTL_MGA_FLUSH, &lock)) {
+      fprintf(stderr, "Lockupdate failed\n");
+      return -1;
    }
+   
+   if(flags & DRM_LOCK_QUIESCENT)
+     mmesa->sarea->last_quiescent = mmesa->sarea->last_enqueue;
+ 
+   return 0;
 }
-
 
-static void mga_get_buffer_ioctl( mgaContextPtr mmesa )
+static drmBufPtr mga_get_buffer_ioctl( mgaContextPtr mmesa )
 {
    int idx = 0;
    int size = 0;
    drmDMAReq dma;
    int retcode;
+   drmBufPtr buf;
    
-   fprintf(stderr,  "Getting dma buffer\n");
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr,  "Getting dma buffer\n");
    
    dma.context = mmesa->hHWContext;
    dma.send_count = 0;
    dma.send_list = NULL;
    dma.send_sizes = NULL;
-   dma.flags = DRM_DMA_WAIT;
+   dma.flags = 0;
    dma.request_count = 1;
    dma.request_size = MGA_DMA_BUF_SZ;
    dma.request_list = &idx;
    dma.request_sizes = &size;
-   
-   if ((retcode = drmDMA(mmesa->driFd, &dma))) {
-      fprintf(stderr, "request drmDMA retcode = %d\n", retcode);
-      exit(1);
-   }
+   dma.granted_count = 0;
 
-   mmesa->dma_buffer = &mmesa->mgaScreen->bufs->list[idx];
-}
 
-static void mga_swap_ioctl( mgaContextPtr mmesa )
-{
-   int retcode;
-   drm_mga_swap_t swap;
-      
-   if((retcode = ioctl(mmesa->driFd, DRM_IOCTL_MGA_SWAP, &swap))) {
-      printf("send swap retcode = %d\n", retcode);
-      exit(1);
-   }
-}
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "drmDMA (get) ctx %d count %d size 0x%x\n",
+	   dma.context, dma.request_count, 
+	   dma.request_size);
 
+   while (1) {
+      retcode = drmDMA(mmesa->driFd, &dma);
 
+      if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "retcode %d sz %d idx %d count %d\n", 
+		 retcode,
+		 dma.request_sizes[0],
+		 dma.request_list[0],
+		 dma.granted_count);
 
-static void mga_clear_ioctl( mgaContextPtr mmesa, int flags, int col, int zval )
-{
-   int retcode;
-   drm_mga_clear_t clear;
-   
-   clear.flags = flags;
-   clear.clear_color = col;
-   clear.clear_depth = zval;
-      
-   if((retcode = ioctl(mmesa->driFd, DRM_IOCTL_MGA_CLEAR, &clear))) {
-      printf("send clear retcode = %d\n", retcode);
-      exit(1);
+      if (retcode == 0 && 
+	  dma.request_sizes[0] &&
+	  dma.granted_count) 
+	 break;
+
+      if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)  
+	 fprintf(stderr, "\n\nflush");
+      mgaUpdateLock( mmesa, DRM_LOCK_FLUSH );
    }
-}
 
+   buf = &(mmesa->mgaScreen->bufs->list[idx]);
+   buf->used = 0;
 
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, 
+	   "drmDMA (get) returns size[0] 0x%x idx[0] %d\n"
+	   "dma_buffer now: buf idx: %d size: %d used: %d\n",
+	   dma.request_sizes[0], dma.request_list[0],
+	   buf->idx, buf->total,
+	   buf->used);
 
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "finished getbuffer\n");
 
+   return buf;
+}
+
 
 
 
@@ -130,52 +153,59 @@
 		     GLint cx, GLint cy, GLint cw, GLint ch ) 
 {
    mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-   GLuint c = mmesa->ClearColor;
-   mgaUI32 zval = (mgaUI32) (ctx->Depth.Clear * DEPTH_SCALE);
    __DRIdrawablePrivate *dPriv = mmesa->driDrawable;
-   int flags = 0;
+   const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
+   drm_mga_clear_t clear;
+   int retcode;
    int i;
-
-   mgaMsg( 10, "mgaClear( %i, %i, %i, %i, %i )\n", 
-	   mask, x, y, width, height );
+   static int nrclears;
 
+   if (0) fprintf(stderr, "clear %d: %d,%d %dx%d\n", all,cx,cy,cw,ch);
 
-   mgaFlushVertices( mmesa );
+   clear.flags = 0;
+   clear.clear_color = mmesa->ClearColor;
+   clear.clear_depth = (mgaUI32) (ctx->Depth.Clear * DEPTH_SCALE);
 
+   FLUSH_BATCH( mmesa );
+	
+   if ((mask & DD_FRONT_LEFT_BIT) && colorMask == ~0) {
+      clear.flags |= MGA_FRONT;
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
 
-   if (mask & GL_COLOR_BUFFER_BIT) {
-      if (ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT) {
-	 flags |= MGA_CLEAR_FRONT;
-	 mask &= ~GL_COLOR_BUFFER_BIT;
-      } else if (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT) {
-	 flags |= MGA_CLEAR_BACK;
-	 mask &= ~GL_COLOR_BUFFER_BIT;
-      }
+   if ((mask & DD_BACK_LEFT_BIT) && colorMask == ~0) {
+      clear.flags |= MGA_BACK;
+      mask &= ~DD_BACK_LEFT_BIT;
    }
 
-   if ((flags & GL_DEPTH_BUFFER_BIT) && ctx->Depth.Mask) {
-      flags |= MGA_CLEAR_DEPTH;
-      mask &= ~GL_DEPTH_BUFFER_BIT;
+   if ((mask & DD_DEPTH_BIT) && ctx->Depth.Mask) {
+      clear.flags |= MGA_DEPTH;
+      mask &= ~DD_DEPTH_BIT;
    }
 
-   if (!flags)
+   if (!clear.flags)
       return mask;
 
    LOCK_HARDWARE( mmesa );
-   
+
+   if (mmesa->dirty_cliprects)
+      mgaUpdateRects( mmesa, (MGA_FRONT|MGA_BACK));
+
    /* flip top to bottom */
    cy = dPriv->h-cy-ch;
    cx += mmesa->drawX;
    cy += mmesa->drawY;
 
-   for (i = 0 ; i < dPriv->numClipRects ; ) { 	 
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "Clear, bufs %x nbox %d\n", 
+	      (int)clear.flags, (int)mmesa->numClipRects);
 
-      /* Use the cliprects for the current draw buffer
-       */
+   for (i = 0 ; i < mmesa->numClipRects ; ) 
+   { 	 
       int nr = MIN2(i + MGA_NR_SAREA_CLIPRECTS, mmesa->numClipRects);
       XF86DRIClipRectRec *box = mmesa->pClipRects;	 
-      xf86drmClipRectRec *b = mmesa->sarea->boxes;
-      mmesa->sarea->nbox = nr - i;
+      drm_clip_rect_t *b = mmesa->sarea->boxes;
+      int n = 0;
 
       if (!all) {
 	 for ( ; i < nr ; i++) {
@@ -196,16 +226,37 @@
 	    b->x2 = x + w;
 	    b->y2 = y + h;
 	    b++;
+	    n++;
 	 }
       } else {
-	 for ( ; i < nr ; i++) 
-	    *b++ = *(xf86drmClipRectRec *)&box[i];
+	 for ( ; i < nr ; i++) {
+	    *b++ = *(drm_clip_rect_t *)&box[i];
+	    n++;
+	 }
       }
+
 
-      mga_clear_ioctl( mmesa, mask, c, zval );
+      if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, 
+		 "DRM_IOCTL_MGA_CLEAR flag 0x%x color %x depth %x nbox %d\n",
+		 clear.flags, clear.clear_color, 
+		 clear.clear_depth, mmesa->sarea->nbox);
+		
+
+      mmesa->sarea->nbox = n;
+
+      retcode = ioctl(mmesa->driFd, DRM_IOCTL_MGA_CLEAR, &clear);
+      if (retcode) {
+	 printf("send clear retcode = %d\n", retcode);
+	 exit(1);
+      }
+      if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "finished clear %d\n", ++nrclears);
    }
 
    UNLOCK_HARDWARE( mmesa );
+   mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
+
    return mask;
 }
 
@@ -218,50 +269,61 @@
 void mgaSwapBuffers( mgaContextPtr mmesa ) 
 {
    __DRIdrawablePrivate *dPriv = mmesa->driDrawable;
+   XF86DRIClipRectPtr pbox;
+   int nbox;
+   drm_mga_swap_t swap;
+   static int nrswaps;
+   int retcode;
    int i;
+   int tmp;
+
 
-   mgaFlushVertices( mmesa );
+   FLUSH_BATCH( mmesa );
 
    LOCK_HARDWARE( mmesa );
-   {
-      /* Use the frontbuffer cliprects
-       */
-      XF86DRIClipRectPtr pbox = dPriv->pClipRects;
-      int nbox = dPriv->numClipRects;
+   
+   /* Use the frontbuffer cliprects
+    */
+   if (mmesa->dirty_cliprects & MGA_FRONT) 
+      mgaUpdateRects( mmesa, MGA_FRONT );
+   
 
-      for (i = 0 ; i < nbox ; )
-      {
-	 int nr = MIN2(i + MGA_NR_SAREA_CLIPRECTS, dPriv->numClipRects);
-	 XF86DRIClipRectRec *b = (XF86DRIClipRectRec *)mmesa->sarea->boxes;
-	 mmesa->sarea->nbox = nr - i;
+   pbox = dPriv->pClipRects;
+   nbox = dPriv->numClipRects;
 
-	 for ( ; i < nr ; i++) 
-	    *b++ = pbox[i];
-	 
-	 mga_swap_ioctl( mmesa );
-      }
-   }
-
+   if (0) fprintf(stderr, "swap, nbox %d\n", nbox);
 
-#if 1
-   UNLOCK_HARDWARE(mmesa);
-#else
+   for (i = 0 ; i < nbox ; )
    {
-      last_enqueue = mmesa->sarea->lastEnqueue;
-      last_dispatch = mmesa->sarea->lastDispatch;
-      UNLOCK_HARDWARE;
+      int nr = MIN2(i + MGA_NR_SAREA_CLIPRECTS, dPriv->numClipRects);
+      XF86DRIClipRectRec *b = (XF86DRIClipRectRec *)mmesa->sarea->boxes;
+
+      mmesa->sarea->nbox = nr - i;
+	 
+      for ( ; i < nr ; i++) 
+	 *b++ = pbox[i];
       
-      /* Throttle runaway apps - there should be an easier way to sleep
-       * on dma without locking out the rest of the system!
-       */
-      if (mmesa->lastSwap > last_dispatch) {
-	 drmGetLock(mmesa->driFd, mmesa->hHWContext, DRM_LOCK_QUIESCENT);	
-	 DRM_UNLOCK(mmesa->driFd, mmesa->driHwLock, mmesa->hHWContext);	
+      if (0)
+	 fprintf(stderr, "DRM_IOCTL_MGA_SWAP\n"); 
+
+      if((retcode = ioctl(mmesa->driFd, DRM_IOCTL_MGA_SWAP, &swap))) {
+	 printf("send swap retcode = %d\n", retcode);
+	 exit(1);
       }
 
-      mmesa->lastSwap = last_enqueue;
+      if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "finished swap %d\n", ++nrswaps);
    }
-#endif
+
+   tmp = GET_ENQUEUE_AGE(mmesa);
+
+   UNLOCK_HARDWARE( mmesa );
+
+   if (GET_DISPATCH_AGE(mmesa) < mmesa->lastSwap)
+      mgaWaitAge(mmesa, mmesa->lastSwap);
+
+   mmesa->lastSwap = tmp;
+   mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
 }
 
 
@@ -269,14 +331,166 @@
  */
 void mgaDDFinish( GLcontext *ctx  ) 
 {
-   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-   drmGetLock(mmesa->driFd, mmesa->hHWContext, DRM_LOCK_QUIESCENT);	
-   DRM_UNLOCK(mmesa->driFd, mmesa->driHwLock, mmesa->hHWContext);	
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+
+   FLUSH_BATCH( mmesa );
+
+   if (mmesa->sarea->last_quiescent != mmesa->sarea->last_enqueue) {
+      if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+	 fprintf(stderr, "mgaRegetLockQuiescent\n");
+
+      LOCK_HARDWARE( mmesa );
+      mgaUpdateLock( mmesa, DRM_LOCK_QUIESCENT | DRM_LOCK_FLUSH);
+      UNLOCK_HARDWARE( mmesa );
+
+      mmesa->sarea->last_quiescent = mmesa->sarea->last_enqueue;
+   }
+}
+
+void mgaWaitAgeLocked( mgaContextPtr mmesa, int age  ) 
+{
+   if (GET_DISPATCH_AGE(mmesa) < age) {
+      if (0) fprintf(stderr, "\n\n\nmgaWaitAgeLocked\n");
+      mgaUpdateLock( mmesa, DRM_LOCK_FLUSH );
+   }
+}
+
+
+void mgaWaitAge( mgaContextPtr mmesa, int age  ) 
+{
+   if (GET_DISPATCH_AGE(mmesa) < age) {
+      LOCK_HARDWARE(mmesa);
+      if (GET_DISPATCH_AGE(mmesa) < age) {
+	 if (0) fprintf(stderr, "\n\n\nmgaWaitAge\n");
+	 mgaUpdateLock( mmesa, DRM_LOCK_FLUSH );
+      }
+      UNLOCK_HARDWARE(mmesa);
+   }
+}
+
+
+static int intersect_rect( drm_clip_rect_t *out,
+			   drm_clip_rect_t *a,
+			   drm_clip_rect_t *b )
+{
+   *out = *a;
+   if (b->x1 > out->x1) out->x1 = b->x1;
+   if (b->y1 > out->y1) out->y1 = b->y1;
+   if (b->x2 < out->x2) out->x2 = b->x2;
+   if (b->y2 < out->y2) out->y2 = b->y2;
+   if (out->x1 >= out->x2) return 0;
+   if (out->y1 >= out->y2) return 0;
+   return 1;
 }
 
 
 
 
+static void age_mmesa( mgaContextPtr mmesa, int age )
+{
+   if (mmesa->CurrentTexObj[0]) mmesa->CurrentTexObj[0]->age = age;
+   if (mmesa->CurrentTexObj[1]) mmesa->CurrentTexObj[1]->age = age;
+}
+
+void mgaFlushVerticesLocked( mgaContextPtr mmesa )
+{
+   drm_clip_rect_t *pbox = (drm_clip_rect_t *)mmesa->pClipRects;
+   int nbox = mmesa->numClipRects;
+   drmBufPtr buffer = mmesa->vertex_dma_buffer;
+   drm_mga_vertex_t vertex;
+   int i;
+
+   mmesa->vertex_dma_buffer = 0;
+
+   if (!buffer)
+      return;
+
+   if (mmesa->dirty_cliprects & mmesa->draw_buffer)
+      mgaUpdateRects( mmesa, mmesa->draw_buffer );
+
+   if (mmesa->dirty & ~MGA_UPLOAD_CLIPRECTS) 
+      mgaEmitHwStateLocked( mmesa );
+
+   /* FIXME: Workaround bug in kernel module.
+    */
+   mmesa->sarea->dirty |= MGA_UPLOAD_CTX; 
+      
+   /* FIXME: dstorg bug
+    */
+   if (0)
+      if (mmesa->lastX != mmesa->drawX || mmesa->lastY != mmesa->drawY)
+	 fprintf(stderr, "****** last: %d,%d current: %d,%d\n",
+		 mmesa->lastX, mmesa->lastY,
+		 mmesa->drawX, mmesa->drawY);
+
+   vertex.idx = buffer->idx;
+   vertex.used = buffer->used;
+   vertex.discard = 0;
+
+   if (!nbox)
+      vertex.used = 0;
+
+   if (nbox >= MGA_NR_SAREA_CLIPRECTS)
+      mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
+
+   if (!vertex.used || !(mmesa->dirty & MGA_UPLOAD_CLIPRECTS)) 
+   {
+      if (nbox == 1) 
+	 mmesa->sarea->nbox = 0;
+      else
+	 mmesa->sarea->nbox = nbox;
+
+      if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)  
+	 fprintf(stderr, "Firing vertex -- case a nbox %d\n", nbox);
+
+      vertex.discard = 1;
+      ioctl(mmesa->driFd, DRM_IOCTL_MGA_VERTEX, &vertex);
+      age_mmesa(mmesa, mmesa->sarea->last_enqueue);
+   } 
+   else 
+   {      
+      for (i = 0 ; i < nbox ; )
+      {
+	 int nr = MIN2(i + MGA_NR_SAREA_CLIPRECTS, nbox);
+	 drm_clip_rect_t *b = mmesa->sarea->boxes;
+
+	 if (mmesa->scissor) {
+	    mmesa->sarea->nbox = 0;	 
+
+	    for ( ; i < nr ; i++) {	       
+	       *b = pbox[i];
+	       if (intersect_rect(b, b, &mmesa->scissor_rect)) {
+		  mmesa->sarea->nbox++;
+		  b++;
+	       } 
+	    }
+
+	    /* Culled?
+	     */
+	    if (!mmesa->sarea->nbox) {
+	       if (nr < nbox) continue;
+	       vertex.used = 0;
+	    }
+	 } else {
+	    mmesa->sarea->nbox = nr - i;
+	    for ( ; i < nr ; i++) 
+	       *b++ = pbox[i];
+	 }
+
+	 /* Finished with the buffer?
+	  */
+	 if (nr == nbox) 
+	    vertex.discard = 1;
+
+	 mmesa->sarea->dirty |= MGA_UPLOAD_CLIPRECTS;
+	 ioctl(mmesa->driFd, DRM_IOCTL_MGA_VERTEX, &vertex);
+	 age_mmesa(mmesa, mmesa->sarea->last_enqueue);
+      }
+   }
+
+   mmesa->dirty &= ~MGA_UPLOAD_CLIPRECTS;
+}
+
 void mgaFlushVertices( mgaContextPtr mmesa ) 
 {
    LOCK_HARDWARE( mmesa );
@@ -284,38 +498,224 @@
    UNLOCK_HARDWARE( mmesa );
 }
 
+void mgaFlushEltsLocked( mgaContextPtr mmesa ) 
+{
+   if (mmesa->first_elt != mmesa->next_elt) {
+      mgaFireEltsLocked( mmesa, 
+			 ((GLuint)mmesa->first_elt - 
+			  (GLuint)mmesa->elt_buf->address),
+			 ((GLuint)mmesa->next_elt - 
+			  (GLuint)mmesa->elt_buf->address),
+			 0 );
+      mmesa->first_elt = mmesa->next_elt;
+   }
+}
 
-void mgaFlushVerticesLocked( mgaContextPtr mmesa )
+void mgaFlushElts( mgaContextPtr mmesa ) 
+{
+   LOCK_HARDWARE( mmesa );
+   mgaFlushEltsLocked( mmesa );
+   UNLOCK_HARDWARE( mmesa );
+}
+
+
+mgaUI32 *mgaAllocVertexDwords( mgaContextPtr mmesa, int dwords )
+{
+   int bytes = dwords * 4;
+   mgaUI32 *head;
+
+   if (!mmesa->vertex_dma_buffer) {
+      LOCK_HARDWARE( mmesa );
+
+      if (mmesa->first_elt != mmesa->next_elt) 
+	 mgaFlushEltsLocked(mmesa);
+
+      mmesa->vertex_dma_buffer = mga_get_buffer_ioctl( mmesa );
+      UNLOCK_HARDWARE( mmesa );
+   } else if (mmesa->vertex_dma_buffer->used + bytes > 
+	      mmesa->vertex_dma_buffer->total) {
+      LOCK_HARDWARE( mmesa );
+      mgaFlushVerticesLocked( mmesa );
+      mmesa->vertex_dma_buffer = mga_get_buffer_ioctl( mmesa );
+      UNLOCK_HARDWARE( mmesa );
+   }
+
+   head = (mgaUI32 *)((char *)mmesa->vertex_dma_buffer->address + 
+		      mmesa->vertex_dma_buffer->used);
+
+   mmesa->vertex_dma_buffer->used += bytes;
+   return head;
+}
+
+
+void mgaFireILoadLocked( mgaContextPtr mmesa, 
+			 GLuint offset, GLuint length )
 {
-   XF86DRIClipRectPtr pbox = mmesa->pClipRects;
+   if (!mmesa->iload_buffer) {
+      fprintf(stderr, "mgaFireILoad: no buffer\n");
+      return;
+   }
+
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "mgaFireILoad idx %d ofs 0x%x length %d\n",
+	      mmesa->iload_buffer->idx, (int)offset, (int)length );
+
+   mga_iload_dma_ioctl( mmesa, offset, length );
+}
+
+void mgaGetILoadBufferLocked( mgaContextPtr mmesa )
+{
+   if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
+      fprintf(stderr, "mgaGetIloadBuffer (buffer now %p)\n",
+	   mmesa->iload_buffer);
+
+   mmesa->iload_buffer = mga_get_buffer_ioctl( mmesa );
+}
+
+
+ void mgaDDFlush( GLcontext *ctx )
+{
+   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
+
+
+   FLUSH_BATCH( mmesa );
+
+   /* This may be called redundantly - dispatch_age may trail what
+    * has actually been sent and processed by the hardware.
+    */
+#if 0
+   if (GET_DISPATCH_AGE( mmesa ) < mmesa->sarea->last_enqueue)
+#endif
+   {
+      LOCK_HARDWARE( mmesa );
+      if (0) fprintf(stderr, "mgaDDFlush %d %d\n", GET_DISPATCH_AGE( mmesa ),  mmesa->sarea->last_enqueue);
+      mgaUpdateLock( mmesa, DRM_LOCK_FLUSH );
+      UNLOCK_HARDWARE( mmesa );
+   }
+}
+
+
+
+void mgaFireEltsLocked( mgaContextPtr mmesa, 
+			GLuint start, 
+			GLuint end,
+			GLuint discard )
+{
+   drm_clip_rect_t *pbox = (drm_clip_rect_t *)mmesa->pClipRects;
    int nbox = mmesa->numClipRects;
+   drmBufPtr buffer = mmesa->elt_buf;
+   drm_mga_indices_t elts;
    int i;
+
+
+   if (0) fprintf(stderr, "FireElts %d %d\n", start/4, end/4);
 
-   if (mmesa->dirty)
+   if (!buffer)
+      return;
+
+   if (mmesa->dirty_cliprects & mmesa->draw_buffer)
+      mgaUpdateRects( mmesa, mmesa->draw_buffer );
+
+   if (mmesa->dirty & ~MGA_UPLOAD_CLIPRECTS) 
       mgaEmitHwStateLocked( mmesa );
 
-   for (i = 0 ; i < nbox ; )
+   /* FIXME: Workaround bug in kernel module.
+    */
+   mmesa->sarea->dirty |= MGA_UPLOAD_CTX; 
+      
+   elts.idx = buffer->idx;
+   elts.start = start;
+   elts.end = end;
+   elts.discard = 0;
+
+   if (!nbox)
+      elts.end = start;
+
+   if (nbox >= MGA_NR_SAREA_CLIPRECTS)
+      mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
+
+   if (elts.end == start || !(mmesa->dirty & MGA_UPLOAD_CLIPRECTS)) 
    {
-      int nr = MIN2(i + MGA_NR_SAREA_CLIPRECTS, nbox);
-      XF86DRIClipRectRec *b = (XF86DRIClipRectRec *)mmesa->sarea->boxes;
-      mmesa->sarea->nbox = nr - i;
+      if (nbox == 1) 
+	 mmesa->sarea->nbox = 0;
+      else
+	 mmesa->sarea->nbox = nbox;
+
+      if (0)
+	 fprintf(stderr, "Firing elts -- case a nbox %d\n", nbox);
+
+      elts.discard = discard;
+      ioctl(mmesa->driFd, DRM_IOCTL_MGA_INDICES, &elts);
+      age_mmesa(mmesa, mmesa->sarea->last_enqueue);
+   } 
+   else 
+   {      
+      for (i = 0 ; i < nbox ; )
+      {
+	 int nr = MIN2(i + MGA_NR_SAREA_CLIPRECTS, nbox);
+	 drm_clip_rect_t *b = mmesa->sarea->boxes;
 
-      for ( ; i < nr ; i++) 
-	 *b++ = pbox[i];
-	 
-      mga_vertex_dma_ioctl( mmesa );
+	 if (mmesa->scissor) {
+	    mmesa->sarea->nbox = 0;	 
+
+	    for ( ; i < nr ; i++) {	       
+	       *b = pbox[i];
+	       if (intersect_rect(b, b, &mmesa->scissor_rect)) {
+		  mmesa->sarea->nbox++;
+		  b++;
+	       } 
+	    }
+
+	    /* Culled?
+	     */
+	    if (!mmesa->sarea->nbox) {
+	       if (nr < nbox) continue;
+	       elts.end = start;
+	    }
+	 } else {
+	    mmesa->sarea->nbox = nr - i;
+	    for ( ; i < nr ; i++) 
+	       *b++ = pbox[i];
+	 }
 
-      break;			/* fix dma multiple dispatch */
+	 /* Potentially finished with the buffer?
+	  */
+	 if (nr == nbox) 
+	    elts.discard = discard;
+
+	 if (0)
+	    fprintf(stderr, "Firing elts -- case b nbox %d\n", nbox);
+
+	 mmesa->sarea->dirty |= MGA_UPLOAD_CLIPRECTS;
+	 ioctl(mmesa->driFd, DRM_IOCTL_MGA_INDICES, &elts);
+	 age_mmesa(mmesa, mmesa->sarea->last_enqueue);
+      }
    }
+
+   mmesa->dirty &= ~MGA_UPLOAD_CLIPRECTS;
+}
 
-   mga_get_buffer_ioctl( mmesa );
+void mgaGetEltBufLocked( mgaContextPtr mmesa )
+{
+   mmesa->elt_buf = mga_get_buffer_ioctl( mmesa );
 }
 
+void mgaReleaseBufLocked( mgaContextPtr mmesa, drmBufPtr buffer )
+{
+   drm_mga_vertex_t vertex;
+
+   if (!buffer) return;
+   
+   vertex.idx = buffer->idx;
+   vertex.used = 0;
+   vertex.discard = 1;
+   ioctl(mmesa->driFd, DRM_IOCTL_MGA_VERTEX, &vertex);
+}
 
 
 void mgaDDInitIoctlFuncs( GLcontext *ctx )
 {
    ctx->Driver.Clear = mgaClear;
-   ctx->Driver.Flush = 0;
+   ctx->Driver.Flush = mgaDDFlush;
    ctx->Driver.Finish = mgaDDFinish;
 }
Index: xc/lib/GL/mesa/src/drv/mga/mgaioctl.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgaioctl.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgaioctl.h:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgaioctl.h:1.1	Fri Feb 11 09:25:37 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgaioctl.h	Fri Jun 16 17:03:01 2000
@@ -9,9 +9,37 @@
 
 void mgaSwapBuffers( mgaContextPtr mmesa ); 
 
+
+
+mgaUI32 *mgaAllocVertexDwords( mgaContextPtr mmesa, int dwords );
+
+
+void mgaGetILoadBufferLocked( mgaContextPtr mmesa );
+
+
+void mgaFireILoadLocked( mgaContextPtr mmesa, 
+			 GLuint offset, GLuint length );
+
+void mgaWaitAgeLocked( mgaContextPtr mmesa, int age );
+void mgaWaitAge( mgaContextPtr mmesa, int age );
+int mgaUpdateLock( mgaContextPtr mmesa, drmLockFlags flags );
+
 void mgaFlushVertices( mgaContextPtr mmesa ); 
 void mgaFlushVerticesLocked( mgaContextPtr mmesa );
 
+
+void mgaFireEltsLocked( mgaContextPtr mmesa, 
+			GLuint start, 
+			GLuint end,
+			GLuint discard );
+
+void mgaGetEltBufLocked( mgaContextPtr mmesa );
+void mgaReleaseBufLocked( mgaContextPtr mmesa, drmBufPtr buffer );
+
+void mgaFlushEltsLocked( mgaContextPtr mmesa );
+void mgaFlushElts( mgaContextPtr mmesa ) ;
+
+
 /* upload texture
  */
 
@@ -19,5 +47,12 @@
 
 void mgaDDInitIoctlFuncs( GLcontext *ctx );
  
+#define FLUSH_BATCH(mmesa) do {						\
+        if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)  				\
+              fprintf(stderr, "FLUSH_BATCH in %s\n", __FUNCTION__);	\
+	if (mmesa->vertex_dma_buffer) mgaFlushVertices(mmesa);		\
+	else if (mmesa->next_elt != mmesa->first_elt) mgaFlushElts(mmesa);	        	\
+} while (0)
+
 
 #endif
Index: xc/lib/GL/mesa/src/drv/mga/mgalib.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgalib.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgalib.h:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgalib.h:1.1	Fri Feb 11 09:25:37 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgalib.h	Fri Jun 16 17:03:01 2000
@@ -32,10 +32,10 @@
 #include "dri_tmm.h"
 #include "dri_mesaint.h"
 #include "dri_mesa.h"
-#include "xmesaP.h"
 
 #include "types.h"
 
+#include "drm.h"
 #include "mgacommon.h"
 #include "mm.h"
 #include "mgalog.h"
@@ -43,7 +43,6 @@
 #include "mgatex.h"
 #include "mgavb.h"
 
-#include "mga_drm_public.h"
 #include "mga_xmesa.h"
 
 
@@ -51,13 +50,10 @@
 #define MGA_FIELD(field,val) (((val) << (field ## _SHIFT)) & ~(field ## _MASK))
 #define MGA_GET_FIELD(field, val) ((val & ~(field ## _MASK)) >> (field ## _SHIFT))
 
-#define MGA_CHIP_MGAG200 0
-#define MGA_CHIP_MGAG400 1
+#define MGA_IS_G200(mmesa) (mmesa->mgaScreen->chipset == MGA_CARD_TYPE_G200)
+#define MGA_IS_G400(mmesa) (mmesa->mgaScreen->chipset == MGA_CARD_TYPE_G400)
 
-#define MGA_IS_G200(mmesa) (mmesa->mgaScreen->chipset == MGA_CHIP_MGAG200)
-#define MGA_IS_G400(mmesa) (mmesa->mgaScreen->chipset == MGA_CHIP_MGAG400)
 
-
 /* SoftwareFallback 
  *    - texture env GL_BLEND -- can be fixed 
  *    - 1D and 3D textures
@@ -65,6 +61,7 @@
  */
 #define MGA_FALLBACK_TEXTURE   0x1
 #define MGA_FALLBACK_BUFFER    0x2
+#define MGA_FALLBACK_STIPPLE   0x3
 
 
 /* For mgaCtx->new_state.
@@ -97,91 +94,146 @@
 #define MGA_PF_8888  (10 << 4)
 #define MGA_PF_HASALPHA (8 << 4)
 
+
+
+/* Reasons why the GL_BLEND fallback mightn't work:
+ */
+#define MGA_BLEND_ENV_COLOR 0x1
+#define MGA_BLEND_MULTITEX  0x2
+
+struct mga_elt_tab {
+   void (*emit_unclipped_verts)( struct vertex_buffer *VB );
+
+   void (*build_tri_verts)( mgaContextPtr mmesa, 
+			    struct vertex_buffer *VB, 
+			    GLfloat *O, GLuint *elt );
+
+   void (*interp)( GLfloat t, GLfloat *O, 
+		   const GLfloat *I, const GLfloat *J );
+
+   void (*project_and_emit_verts)( mgaContextPtr mmesa,
+				   const GLfloat *verts,
+				   GLuint *elts,
+				   int nr );
+};
+
 struct mga_context_t {
 
    GLcontext *glCtx;
 
-   /* Hardware state - moved from mgabuf.h
-    */
-   mgaUI32 Setup[MGA_CTX_SETUP_SIZE];
 
-   /* Variable sized vertices
+   /* Bookkeeping for texturing 
     */
-   mgaUI32 vertsize;
+   int lastTexHeap;
+   struct mga_texture_object_s TexObjList[MGA_NR_TEX_HEAPS];
+   struct mga_texture_object_s SwappedOut;
+   struct mga_texture_object_s *CurrentTexObj[2];
+   memHeap_t *texHeap[MGA_NR_TEX_HEAPS];
+   int c_texupload;
+   int c_texusage;
+   int tex_thrash;
 
+
    /* Map GL texture units onto hardware.
     */
    mgaUI32 multitex;
    mgaUI32 tmu_source[2];
    mgaUI32 tex_dest[2];
 
-
-
-   /* bookkeeping for textureing */
-   struct mga_texture_object_s TexObjList;
-   struct mga_texture_object_s SwappedOut;
-   struct mga_texture_object_s *CurrentTexObj[2];
 
+   /* Manage fallbacks 
+    */
+   mgaUI32 IndirectTriangles;
+   int Fallback;  
 
-   /* shared texture palette */
-   mgaUI16	GlobalPalette[256];
-  
-   int Fallback;  /* or'ed values of FALLBACK_* */
 
-   /* Support for CVA and the fast paths */
+   /* Support for CVA and the fastpath 
+    */
    unsigned int setupdone;
    unsigned int setupindex;
    unsigned int renderindex;
    unsigned int using_fast_path;
-   unsigned int using_immediate_fast_path;
    mga_interp_func interp;
+
+
+   /* Support for limited GL_BLEND fallback
+    */
+   unsigned int blend_flags;
+   unsigned int envcolor;
+
 
-   /* Shortcircuit some state changes */
+   /* Shortcircuit some state changes 
+    */
    points_func   PointsFunc;
    line_func     LineFunc;
    triangle_func TriangleFunc;
    quad_func     QuadFunc;
+
 
-   /* Manage our own state */
+   /* Manage driver and hardware state 
+    */
    GLuint        new_state; 
    GLuint        dirty;
+   GLuint        Setup[MGA_CTX_SETUP_SIZE];
+   GLuint        warp_pipe;
+   GLuint        vertsize;
+   GLushort      MonoColor;
+   GLushort      ClearColor;
+   GLuint        poly_stipple;
 
-   GLubyte       clearcolor[4];
-   GLushort MonoColor;
-   GLushort ClearColor;
-
    
-   /* DRI stuff
+   /* Dma buffers
     */
-   drmBufPtr  dma_buffer;
+   drmBufPtr  vertex_dma_buffer;
+   drmBufPtr  iload_buffer;
 
-   GLframebuffer *glBuffer;
-   memHeap_t *texHeap;
+   
+   /* Drawable, cliprect and scissor information
+    */
+   int dirty_cliprects;		/* which sets of cliprects are uptodate? */
+   int draw_buffer;		/* which buffer are we rendering to */
+   unsigned int drawOffset;		/* draw buffer address in  space */
+   int read_buffer;	
+   int readOffset;	
+   int drawX, drawY;		/* origin of drawable in draw buffer */
+   int lastX, lastY;		/* detect DSTORG bug */
+   GLuint numClipRects;		/* cliprects for the draw buffer */
+   XF86DRIClipRectPtr pClipRects;
+   XF86DRIClipRectRec draw_rect;
+   drm_clip_rect_t scissor_rect;
+   int scissor;
 
-   GLuint needClip;
-   GLuint warp_pipe;
 
-   /* These refer to the current draw (front vs. back) buffer:
+   /* Texture aging and DMA based aging.
     */
-   int drawOffset;		/* draw buffer address in agp space */
-   int drawX;			/* origin of drawable in draw buffer */
-   int drawY;
-   GLuint numClipRects;		/* cliprects for that buffer */
-   XF86DRIClipRectPtr pClipRects;
+   unsigned int texAge[MGA_NR_TEX_HEAPS];/* texture LRU age  */
+   unsigned int dirtyAge;		/* buffer age for synchronization */
+   unsigned int lastSwap;		/* throttling runaway apps */
 
-   int texAge;
 
-   XF86DRIClipRectRec draw_rect;
 
+   /* Mirrors of some DRI state.
+    */
+   GLframebuffer *glBuffer;
    drmContext hHWContext;
    drmLock *driHwLock;
    int driFd;
    Display *display;
-
    __DRIdrawablePrivate *driDrawable;
    __DRIscreenPrivate *driScreen;
    mgaScreenPrivate *mgaScreen; 
    drm_mga_sarea_t *sarea;
+
+
+   /* New setupdma path
+    */
+   drmBufPtr elt_buf, retained_buf;
+   GLuint *first_elt, *next_elt;
+   GLfloat *next_vert;
+   GLuint next_vert_phys;
+   GLuint first_vert_phys;
+   struct mga_elt_tab *elt_tab;
+   GLfloat device_matrix[16];
 };
 
 
@@ -191,16 +243,12 @@
 
 	/* dma stuff */
         mgaUI32         systemTexture;
-        mgaUI32         noSetupDma;
 
         mgaUI32         default32BitTextures;
-        mgaUI32         swapBuffersCount;
         
 	/* options */
 	mgaUI32		nullprims;  /* skip all primitive generation */
-	mgaUI32		noFallback; /* don't fall back to software, do
-                                       best-effort rendering */
- 	mgaUI32		skipDma;    /* don't send anything to the hardware */
+        mgaUI32         noFallback;
  	
 	/* performance counters */	
 	mgaUI32		c_textureUtilization;
@@ -240,10 +288,12 @@
 extern int MGA_DEBUG;
 #endif
 
-#define MGA_DEBUG_ALWAYS_SYNC    0x1
-#define MGA_DEBUG_VERBOSE_MSG    0x2
-#define MGA_DEBUG_VERBOSE_LRU    0x4
-#define MGA_DEBUG_VERBOSE_DRI    0x8
+#define DEBUG_ALWAYS_SYNC    0x1
+#define DEBUG_VERBOSE_MSG    0x2
+#define DEBUG_VERBOSE_LRU    0x4
+#define DEBUG_VERBOSE_DRI    0x8
+#define DEBUG_VERBOSE_IOCTL  0x10
+#define DEBUG_VERBOSE_2D     0x20
 
 static __inline__ mgaUI32 mgaPackColor(mgaUI32 format,
 				       mgaUI8 r, mgaUI8 g, 
@@ -262,5 +312,13 @@
     return 0;
   }
 }
+
+
+/*
+ * Subpixel offsets for window coordinates:
+ */
+#define SUBPIXEL_X (-0.5F)
+#define SUBPIXEL_Y (-0.5F + 0.125)
+
 
 #endif
Index: xc/lib/GL/mesa/src/drv/mga/mgapipeline.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgapipeline.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgapipeline.h:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgapipeline.h:1.1	Fri Feb 11 09:25:38 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgapipeline.h	Fri Jun 16 17:03:01 2000
@@ -12,4 +12,7 @@
 extern void mgaDDFastPath( struct vertex_buffer *VB );
 extern void mgaDDFastPathInit( void );
 
+extern void mgaDDEltPath( struct vertex_buffer *VB );
+extern void mgaDDEltPathInit( void );
+
 #endif
Index: xc/lib/GL/mesa/src/drv/mga/mgarender.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgarender.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgarender.c:removed
--- xc/lib/GL/mesa/src/drv/mga/mgarender.c:1.1	Fri Feb 11 09:25:38 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgarender.c	Sat Jul  1 20:44:35 2000
@@ -1,334 +0,0 @@
-#include <stdio.h>
-#include "mgadd.h"
-#include "mgavb.h"
-#include "mgadma.h"
-#include "mgalib.h"
-#include "mgatris.h"
-#include "mgastate.h"
-#include "xsmesaP.h"
-#include "enums.h"
-
-#define POINT(x) mga_draw_point(&gWin[x], psize)
-#define LINE(x,y) mga_draw_line(&gWin[x], &gWin[y], lwidth)
-#define TRI(x,y,z) mga_draw_triangle(&gWin[x], &gWin[y], &gWin[z])
-
-
-/* Direct, and no clipping required.  I haven't written the clip funcs
- * yet, so this is only useful for the fast path, which does its own
- * clipping.
- */
-#define RENDER_POINTS( start, count )		\
-do {						\
-   GLuint e;					\
-   for(e=start;e<=count;e++)			\
-     POINT(elt[e]);				\
-} while (0)
-
-#define RENDER_LINE( i1, i )			\
-do {						\
-   GLuint e1 = elt[i1], e = elt[i];		\
-   LINE( e1, e );				\
-} while (0)
-
-
-#define RENDER_TRI( i2, i1, i, pv, parity)		\
-do {							\
-{  GLuint e2 = elt[i2], e1 = elt[i1], e = elt[i];	\
-  if (parity) {GLuint tmp = e2; e2 = e1; e1 = tmp;}	\
-  TRI(e2, e1, e);					\
-}} while (0)
-
-
-#define RENDER_QUAD( i3, i2, i1, i, pv)				\
-do {								\
-  GLuint e3 = elt[i3], e2 = elt[i2], e1 = elt[i1], e = elt[i];	\
-  TRI(e3, e2, e);						\
-  TRI(e2, e1, e);						\
-} while (0)
-
-#define LOCAL_VARS					\
-   mgaVertexPtr gWin = MGA_DRIVER_DATA(VB)->verts;	\
-   const GLuint *elt = VB->EltPtr->data;		\
-   const GLfloat lwidth = VB->ctx->Line.Width;		\
-   const GLfloat psize = VB->ctx->Point.Size;		\
-   GLcontext *ctx = VB->ctx; \
-   (void) lwidth; (void)psize; (void)ctx; (void) gWin;
-
-
-#define TAG(x) x##_mga_smooth_indirect
-#include "render_tmp.h"
-
-
-
-
-#define RENDER_POINTS( start, count )		\
-do {						\
-   GLuint e;					\
-   for(e=start;e<=count;e++)			\
-     POINT(e);					\
-} while (0)
-
-#define RENDER_LINE( i1, i )			\
-do {						\
-   LINE( i1, i );				\
-} while (0)
-
-
-#define RENDER_TRI( i2, i1, i, pv, parity)		\
-do {							\
-  GLuint e2 = i2, e1 = i1;				\
-  if (parity) {GLuint tmp = e2; e2 = e1; e1 = tmp;}	\
-  TRI(e2, e1, i);					\
-} while (0)
-
-
-#define RENDER_QUAD( i3, i2, i1, i, pv)		\
-do {						\
-  TRI(i3, i2, i);				\
-  TRI(i2, i1, i);				\
-} while (0)
-
-#define LOCAL_VARS					\
-   mgaVertexPtr gWin = MGA_DRIVER_DATA(VB)->verts;	\
-   const GLfloat lwidth = VB->ctx->Line.Width;		\
-   const GLfloat psize = VB->ctx->Point.Size;		\
-   GLcontext *ctx = VB->ctx; \
-   (void) lwidth; (void)psize; (void)ctx; (void) gWin;
-
-#define TAG(x) x##_mga_smooth_direct
-#include "render_tmp.h"
-
-
-
-
-
-/* Vertex array rendering via. the SetupDma function - no clipping required. 
- */
-#define RENDER_POINTS( start, count )		\
-do {						\
-    FatalError("Dead code in mgarender.c\n");	\
-} while (0)
-
-#define RENDER_LINE( i1, i )			\
-do {						\
-    FatalError("Dead code in mgarender.c\n");	\
-} while (0)
-
-
-#define RENDER_TRI( i2, i1, i, pv, parity)		\
-do {							\
-   GLuint e2 = elt[i2], e1 = elt[i1], e = elt[i];	\
-   if (/*parity*/0) {GLuint tmp = e2; e2 = e1; e1 = tmp;}	\
-   TRI(e2, e1, e);		\
-} while (0)
-
-#define RENDER_QUAD( i3, i2, i1, i, pv)				\
-do {								\
-  GLuint e3 = elt[i3], e2 = elt[i2], e1 = elt[i1], e = elt[i];	\
-  TRI(e3, e2, e);			\
-  TRI(e2, e1, e);			\
-} while (0)
-
-#define LOCAL_VARS					\
-   mgaVertexBufferPtr mgaVB = MGA_DRIVER_DATA(VB);	\
-   mgaUI32 phys = mgaVB->vert_phys_start;		\
-   const GLuint *elt = VB->EltPtr->data;		\
-   (void) phys; (void) elt;
-
-#define PRESERVE_VB_DEFS
-#undef TRI
-#define VERT_ADDR_10( phys, elt ) ( phys + elt * 48 )
-#define TRI( ee0, ee1, ee2 )				\
-{							\
-   mgaVB->elt_buf[0] = VERT_ADDR_10(phys, ee0);		\
-   mgaVB->elt_buf[1] = VERT_ADDR_10(phys, ee1);		\
-   mgaVB->elt_buf[2] = VERT_ADDR_10(phys, ee2);		\
-   mgaVB->elt_buf += 3;					\
-}
-#define TAG(x) x##_mga_elt_10
-#include "render_tmp.h"
-
-
-#define TAG(x) x##_mga_elt_8
-#undef TRI
-#define VERT_ADDR_8( phys, elt ) ( phys + elt * 32 )
-#define TRI( ee0, ee1, ee2 )			\
-{						\
-   mgaVB->elt_buf[0] = VERT_ADDR_8(phys, ee0);	\
-   mgaVB->elt_buf[1] = VERT_ADDR_8(phys, ee1);	\
-   mgaVB->elt_buf[2] = VERT_ADDR_8(phys, ee2);	\
-   mgaVB->elt_buf += 3;				\
-}
-#include "render_tmp.h"
-
-
-
-
-/* Currently only used on the fast path - need a set of render funcs
- * for clipped primitives.
- */
-void mgaDDRenderElementsDirect( struct vertex_buffer *VB )
-{
-   mgaVertexBufferPtr mgaVB = MGA_DRIVER_DATA(VB);
-   GLcontext *ctx = VB->ctx;
-   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-   GLenum prim = ctx->CVA.elt_mode;
-   GLuint nr = VB->EltPtr->count;
-   render_func func = render_tab_mga_smooth_indirect[prim];
-   GLuint p = 0;
-   mgaUI32 *start = mgaVB->elt_buf;
-   
-   struct vertex_buffer *saved_vb = ctx->VB;
-
-   if (mmesa->new_state)
-      mgaDDUpdateHwState( ctx );
-
-   /* Are we using Setup DMA?
-    */
-   if (start) {
-      switch (MGA_CONTEXT(ctx)->vertsize) {
-      case 10:
-	 func = render_tab_mga_elt_10[prim];
-	 break;
-      case 8:
-	 func = render_tab_mga_elt_8[prim];
-	 break;
-      default:
-      }
-   }
-
-   ctx->VB = VB;
-
-   do {
-      func( VB, 0, nr, 0 );
-   } while (ctx->Driver.MultipassFunc &&
-	    ctx->Driver.MultipassFunc( VB, ++p ));
-
-   ctx->VB = saved_vb;
-
-
-   if (start && nr) {
-      if (0)
-	 fprintf(stderr, "%d/%d elts\n", nr, mgaVB->elt_buf-start);
-      mgaSetupDma( start, mgaVB->elt_buf - start );
-      mgaVB->elt_buf = mgaVB->vert_buf = 0;
-   }
-}
-
-
-void mgaDDRenderElementsImmediate( struct vertex_buffer *VB )
-{
-   GLcontext *ctx = VB->ctx;
-   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-   GLuint nr = VB->EltPtr->count;
-   render_func *tab = render_tab_mga_smooth_indirect;
-   GLuint parity = VB->Parity;
-   GLuint p = 0;
-   GLuint i, next;
-
-   if (mmesa->new_state)
-      mgaDDUpdateHwState( ctx );
-
-   do {
-      for ( i= VB->CopyStart ; i < nr ; parity = 0, i = next ) 
-      {
-	 GLenum prim = VB->Primitive[i];
-	 next = VB->NextPrimitive[i];
-	 tab[prim]( VB, i, next, parity );
-      }
-   } while (ctx->Driver.MultipassFunc &&
-	    ctx->Driver.MultipassFunc( VB, ++p ));
-}
-
-
-void mgaDDRenderDirect( struct vertex_buffer *VB )
-{
-   GLcontext *ctx = VB->ctx;
-   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-   GLuint nr = VB->Count;
-   render_func *tab = render_tab_mga_smooth_direct;
-   GLuint parity = VB->Parity;
-   GLuint p = 0;
-   GLuint i, next;
-
-   if (mmesa->new_state)
-      mgaDDUpdateHwState( ctx );
-
-   do {
-      for ( i= VB->CopyStart ; i < nr ; parity = 0, i = next ) 
-      {
-	 GLenum prim = VB->Primitive[i];
-	 next = VB->NextPrimitive[i];
-	 tab[prim]( VB, i, next, parity );
-      }
-   } while (ctx->Driver.MultipassFunc &&
-	    ctx->Driver.MultipassFunc( VB, ++p ));
-}
-
-
-static void optimized_render_vb_triangle_mga_smooth_indirect(struct vertex_buffer *VB,
-							    GLuint start,
-							    GLuint count,
-							    GLuint parity)
-{
-   mgaVertexPtr gWin = MGA_DRIVER_DATA(VB)->verts;
-   const GLuint *elt = VB->EltPtr->data;
-   GLcontext *ctx = VB->ctx;
-   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-
-   mgaUI32 vertsize = mmesa->vertsize;
-
-   /* We know how many dwords we need so we can allocate all of it
-    * in one call */
-   mgaUI32 *wv = mgaAllocSecondaryBuffer( count * vertsize );
-
-   int vertex;
-
-   (void)ctx; (void) gWin; (void) parity;
-
-
-   for(vertex=start+2;vertex<count;vertex+=3){
-      GLuint e2=elt[vertex-2],e1=elt[vertex-1],e=elt[vertex];
-      mgaUI32 *src;
-
-      int j;
-
-      if(parity){
-         GLuint tmp=e2;
-         e2=e1;
-	 e1=tmp;
-      }
-
-      src=&gWin[e2].ui[0];
-      
-      for(j=vertsize;j;j--){
-	 *wv++=*src++;
-      }
-      
-      src=&gWin[e1].ui[0];
-      for(j=vertsize;j;j--){
-	 *wv++=*src++;
-      }
-      
-      src=&gWin[e].ui[0];
-      for(j=vertsize;j;j--){
-	 *wv++=*src++;
-      }
-   }
-   
-}
-
-
-void mgaDDRenderInit()
-{
-
-   render_init_mga_smooth_indirect();
-   render_init_mga_smooth_direct();
-   render_init_mga_elt_10();
-   render_init_mga_elt_8();
-   
-   render_tab_mga_smooth_indirect[GL_TRIANGLES] =
-      optimized_render_vb_triangle_mga_smooth_indirect; 
-}
-
-
Index: xc/lib/GL/mesa/src/drv/mga/mgarender.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgarender.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgarender.h:removed
--- xc/lib/GL/mesa/src/drv/mga/mgarender.h:1.1	Fri Feb 11 09:25:39 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgarender.h	Sat Jul  1 20:44:35 2000
@@ -1,10 +0,0 @@
-
-#ifndef _MGA_RENDER_H
-#define _MGA_RENDER_H
-
-extern void mgaDDRenderElementsDirect( struct vertex_buffer *VB );
-extern void mgaDDRenderElementsImmediate( struct vertex_buffer *VB );
-extern void mgaDDRenderDirect( struct vertex_buffer *VB );
-extern void mgaDDRenderInit();
-
-#endif
Index: xc/lib/GL/mesa/src/drv/mga/mgaspan.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgaspan.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgaspan.c:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgaspan.c:1.1	Fri Feb 11 09:25:39 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgaspan.c	Fri Jun 16 17:03:02 2000
@@ -5,71 +5,100 @@
 #include "mgalog.h"
 #include "mgaspan.h"
 
+#define DBG 0
 
+
 #define LOCAL_VARS					\
-   mgaContextPtr mmesa = MGA_CONTEXT( ctx );		\
    __DRIdrawablePrivate *dPriv = mmesa->driDrawable;	\
-   __DRIscreenPrivate *sPriv = mmesa->driScreen;	\
    mgaScreenPrivate *mgaScreen = mmesa->mgaScreen;	\
-   GLuint pitch = mgaScreen->backPitch;			\
+   __DRIscreenPrivate *sPriv = mmesa->driScreen;	\
+   GLuint pitch = mgaScreen->frontPitch;		\
    GLuint height = dPriv->h;				\
+   char *read_buf = (char *)(sPriv->pFB +		\
+			mmesa->readOffset +		\
+			dPriv->x * 2 +			\
+			dPriv->y * pitch);              \
    char *buf = (char *)(sPriv->pFB +			\
 			mmesa->drawOffset +		\
 			dPriv->x * 2 +			\
+			dPriv->y * pitch);              \
+   GLushort p = MGA_CONTEXT( ctx )->MonoColor;          \
+   (void) read_buf; (void) buf; (void) p
+   
+
+
+#define LOCAL_DEPTH_VARS				\
+   __DRIdrawablePrivate *dPriv = mmesa->driDrawable;	\
+   mgaScreenPrivate *mgaScreen = mmesa->mgaScreen;	\
+   __DRIscreenPrivate *sPriv = mmesa->driScreen;	\
+   GLuint pitch = mgaScreen->frontPitch;		\
+   GLuint height = dPriv->h;				\
+   char *buf = (char *)(sPriv->pFB +			\
+			mgaScreen->depthOffset +	\
+			dPriv->x * 2 +			\
 			dPriv->y * pitch)
 
-#define INIT_MONO_PIXEL(p) \
-   GLushort p = MGA_CONTEXT( ctx )->MonoColor;
+#define INIT_MONO_PIXEL(p) 
 
-#define CLIPPIXEL(_x,_y) (_x >= minx && _x <= maxx && \
-			  _y >= miny && _y <= maxy)
+#define CLIPPIXEL(_x,_y) (_x >= minx && _x < maxx && \
+			  _y >= miny && _y < maxy)
 
 
-#define CLIPSPAN(_x,_y,_n,_x1,_n1)				\
+#define CLIPSPAN(_x,_y,_n,_x1,_n1,_i)				\
 	 if (_y < miny || _y >= maxy) _n1 = 0, _x1 = x;		\
          else {							\
             _n1 = _n;						\
 	    _x1 = _x;						\
-	    if (_x1 < minx) _n1 -= (minx - _x1), _x1 = minx;	\
-	    if (_x1 + _n1 > maxx) n1 -= (_x1 + n1 - maxx);	\
+	    if (_x1 < minx) _i += (minx - _x1), _x1 = minx;	\
+	    if (_x1 + _n1 >= maxx) n1 -= (_x1 + n1 - maxx) + 1;	\
          }
 
 
 
+#define HW_LOCK()				\
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);	\
+   LOCK_HARDWARE_QUIESCENT(mmesa);
 
-
 #define HW_CLIPLOOP()						\
   do {								\
     int _nc = mmesa->numClipRects;				\
-    LOCK_HARDWARE_QUIESCENT(mmesa);				\
     while (_nc--) {						\
-       int minx = mmesa->pClipRects[_nc].x1 - mmesa->drawX;		\
-       int miny = mmesa->pClipRects[_nc].y1 - mmesa->drawY; 	\
-       int maxx = mmesa->pClipRects[_nc].x2 - mmesa->drawX;		\
+       int minx = mmesa->pClipRects[_nc].x1 - mmesa->drawX;	\
+       int miny = mmesa->pClipRects[_nc].y1 - mmesa->drawY;	\
+       int maxx = mmesa->pClipRects[_nc].x2 - mmesa->drawX;	\
        int maxy = mmesa->pClipRects[_nc].y2 - mmesa->drawY;
 
-
 #define HW_ENDCLIPLOOP()			\
     }						\
-    UNLOCK_HARDWARE(mmesa);			\
   } while (0)
 
+#define HW_UNLOCK()				\
+    UNLOCK_HARDWARE(mmesa);
+
+
 
-#define Y_FLIP(_y) (height - _y)
+
+
+
+
+/* 16 bit, 565 rgb color spanline and pixel functions
+ */
+#define Y_FLIP(_y) (height - _y - 1)
 #define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   *(GLushort *)(buf + _x*2 + _y*pitch)  = ( ((r & 0x1f) << 11) |	\
-		                             ((g & 0x3f) << 5) |	\
-		                             ((b & 0x1f)))
+   *(GLushort *)(buf + _x*2 + _y*pitch)  = ( (((int)r & 0xf8) << 8) |	\
+		                             (((int)g & 0xfc) << 3) |	\
+		                             (((int)b & 0xf8) >> 3))
+
 #define WRITE_PIXEL( _x, _y, p )  \
    *(GLushort *)(buf + _x*2 + _y*pitch) = p
 
-#define READ_RGBA( rgba, _x, _y )			\
-do {							\
-   GLushort p = *(GLushort *)(buf + _x*2 + _y*pitch);	\
-   rgba[0] = (p >> 11) & 0x1f;				\
-   rgba[1] = (p >> 5) & 0x3f;				\
-   rgba[2] = (p >> 0) & 0x1f;				\
-   rgba[3] = 0;			/* or 255? */		\
+#define READ_RGBA( rgba, _x, _y )				\
+do {								\
+   GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch);	\
+   rgba[0] = (p >> 8) & 0xf8;					\
+   rgba[1] = (p >> 3) & 0xfc;					\
+   rgba[2] = (p << 3) & 0xf8;					\
+   rgba[3] = 255;						\
 } while(0)
 
 #define TAG(x) mga##x##_565
@@ -77,23 +106,23 @@
 
 
 
-
-
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   *(GLushort *)(buf + _x*2 + _y*pitch)  = ( ((r & 0x1f) << 10) |	\
-		                            ((g & 0x1f) << 5) |		\
-                         		    ((b & 0x1f)))
 
+/* 15 bit, 555 rgb color spanline and pixel functions
+ */
+#define WRITE_RGBA( _x, _y, r, g, b, a )			\
+   *(GLushort *)(buf + _x*2 + _y*pitch)  = (((r & 0xf8) << 7) |	\
+		                            ((g & 0xf8) << 3) |	\
+                         		    ((b & 0xf8) >> 3))
 #define WRITE_PIXEL( _x, _y, p )  \
    *(GLushort *)(buf + _x*2 + _y*pitch)  = p
 
-#define READ_RGBA( rgba, _x, _y )			\
-do {							\
-   GLushort p = *(GLushort *)(buf + _x*2 + _y*pitch);	\
-   rgba[0] = (p >> 10) & 0x1f;				\
-   rgba[1] = (p >> 5) & 0x1f;				\
-   rgba[2] = (p >> 0) & 0x1f;				\
-   rgba[3] = 0;			/* or 255? */		\
+#define READ_RGBA( rgba, _x, _y )				\
+do {								\
+   GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch);	\
+   rgba[0] = (p >> 7) & 0xf8;					\
+   rgba[1] = (p >> 3) & 0xf8;					\
+   rgba[2] = (p << 3) & 0xf8;					\
+   rgba[3] = 255;						\
 } while(0)
 
 #define TAG(x) mga##x##_555
@@ -101,28 +130,20 @@
 
 
 
-#if 0
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   *(GLuint *)(buf + _x*4 + _y*pitch)  = ( ((r) << 16) |	\
-		                           ((g) << 8) |		\
-                         		   ((b)))
+/* 16 bit depthbuffer functions.
+ */
+#define WRITE_DEPTH( _x, _y, d )	\
+   *(GLushort *)(buf + _x*2 + _y*pitch) = d;
 
-#define WRITE_PIXEL( _x, _y, p )  \
-   *(GLuint *)(buf + _x*4 + _y*pitch)  = p
+#define READ_DEPTH( d, _x, _y )		\
+   d = *(GLushort *)(buf + _x*2 + _y*pitch);	
 
-#define READ_RGBA( rgba, _x, _y )			\
-do {							\
-   GLuint p = *(GLuint *)(buf + _x*4 + _y*pitch);	\
-   rgba[0] = (p >> 16) & 0xff;				\
-   rgba[1] = (p >> 8) & 0xff;				\
-   rgba[2] = (p >> 0) & 0xff;				\
-   rgba[3] = 0;			/* or 255? */		\
-} while(0)
+#define TAG(x) mga##x##_16
+#include "depthtmp.h"
 
-#define TAG(x) mga##x##_888
-#include "spantmp.h"
-#endif
 
+
+
 void mgaDDInitSpanFuncs( GLcontext *ctx )
 {
    if (1) {
@@ -142,6 +163,11 @@
       ctx->Driver.ReadRGBASpan = mgaReadRGBASpan_555;
       ctx->Driver.ReadRGBAPixels = mgaReadRGBAPixels_555;
    }
+
+   ctx->Driver.ReadDepthSpan = mgaReadDepthSpan_16;
+   ctx->Driver.WriteDepthSpan = mgaWriteDepthSpan_16;
+   ctx->Driver.ReadDepthPixels = mgaReadDepthPixels_16;
+   ctx->Driver.WriteDepthPixels = mgaWriteDepthPixels_16;
 
    ctx->Driver.WriteCI8Span        =NULL;
    ctx->Driver.WriteCI32Span       =NULL;
Index: xc/lib/GL/mesa/src/drv/mga/mgastate.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgastate.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgastate.c:1.3
--- xc/lib/GL/mesa/src/drv/mga/mgastate.c:1.1	Fri Feb 11 09:25:39 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgastate.c	Wed Jun 21 05:10:59 2000
@@ -1,7 +1,7 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgastate.c,v 1.3 2000/06/21 12:10:59 tsi Exp $ */
 
 #include <stdio.h>
 
-
 #include "types.h"
 #include "pb.h"
 #include "dd.h"
@@ -16,7 +16,7 @@
 #include "mgavb.h"
 #include "mgatris.h"
 #include "mgaregs.h"
-#include "mga_drm_public.h"
+#include "mgabuffers.h"
 
 static void mgaUpdateZMode(const GLcontext *ctx)
 {
@@ -60,17 +60,20 @@
 
 static void mgaDDAlphaFunc(GLcontext *ctx, GLenum func, GLclampf ref)
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_ALPHA;
 }
 
 
 static void mgaDDBlendEquation(GLcontext *ctx, GLenum mode) 
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_ALPHA;
 }
 
 static void mgaDDBlendFunc(GLcontext *ctx, GLenum sfactor, GLenum dfactor)
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_ALPHA;
 }
 
@@ -78,6 +81,7 @@
 				    GLenum dfactorRGB, GLenum sfactorA,
 				    GLenum dfactorA )
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_ALPHA;
 }
 
@@ -87,6 +91,7 @@
 			      const GLfloat *param)
 {
    if (pname == GL_LIGHT_MODEL_COLOR_CONTROL) {
+      FLUSH_BATCH( MGA_CONTEXT(ctx) );
       MGA_CONTEXT(ctx)->new_state |= MGA_NEW_TEXTURE;
    }
 }
@@ -95,6 +100,7 @@
 static void mgaDDShadeModel(GLcontext *ctx, GLenum mode)
 {
    if (1) {
+      FLUSH_BATCH( MGA_CONTEXT(ctx) );
       MGA_CONTEXT(ctx)->new_state |= MGA_NEW_TEXTURE; 
       mgaMsg(8, "mgaDDShadeModel: %x\n", mode);
    }
@@ -103,11 +109,13 @@
 
 static void mgaDDDepthFunc(GLcontext *ctx, GLenum func)
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_DEPTH;
 }
 
 static void mgaDDDepthMask(GLcontext *ctx, GLboolean flag)
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_DEPTH;
 }
 
@@ -134,6 +142,7 @@
 
 static void mgaDDFogfv(GLcontext *ctx, GLenum pname, const GLfloat *param)
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_FOG;
 }
 
@@ -148,10 +157,11 @@
 static void mgaUpdateAlphaMode(GLcontext *ctx)
 {
    mgaContextPtr mmesa = MGA_CONTEXT( ctx );
+   mgaScreenPrivate *mgaScreen = mmesa->mgaScreen;
    int a = 0;
 
    /* determine source of alpha for blending and testing */
-   if ( !ctx->Texture.Enabled || (mmesa->Fallback & MGA_FALLBACK_TEXTURE)) 
+   if ( !ctx->Texture.Enabled ) 
       a |= AC_alphasel_diffused;
    else {
       switch (ctx->Texture.Unit[0].EnvMode) {
@@ -164,11 +174,12 @@
 	 a |= AC_alphasel_modulated;
 	 break;
       default:
+	 break;
       }
    }
 
 
-   /* alpha test control - disabled by default.
+   /* alpha test control.
     */
    if (ctx->Color.AlphaEnabled) {
       GLubyte ref = ctx->Color.AlphaRef;
@@ -199,6 +210,7 @@
 	 a |= AC_atmode_noacmp; 
 	 break;
       default:
+	 break;
       }
       a |= MGA_FIELD(AC_atref,ref);
    }
@@ -219,13 +231,13 @@
       case GL_ONE_MINUS_SRC_ALPHA:
 	 a |= AC_src_om_src_alpha; break;
       case GL_DST_ALPHA:
-	 if (0) /*(mgaScreen->Attrib & MGA_PF_HASALPHA)*/
+	 if (mgaScreen->Attrib & MGA_PF_HASALPHA)
 	    a |= AC_src_dst_alpha;
 	 else
 	    a |= AC_src_one;
 	 break;
       case GL_ONE_MINUS_DST_ALPHA:
-	 if (0) /*(mgaScreen->Attrib & MGA_PF_HASALPHA)*/
+	 if (mgaScreen->Attrib & MGA_PF_HASALPHA)
 	    a |= AC_src_om_dst_alpha; 
 	 else 
 	    a |= AC_src_zero;
@@ -234,6 +246,7 @@
 	 a |= AC_src_src_alpha_sat; 
 	 break;
       default:		/* never happens */
+	 break;
       }
 
       switch (ctx->Color.BlendDstRGB) {
@@ -250,18 +263,19 @@
       case GL_ONE_MINUS_SRC_COLOR:
 	 a |= AC_dst_om_src_color; break;
       case GL_DST_ALPHA:
-	 if (0) /*(mgaDB->Attrib & MGA_PF_HASALPHA)*/
+	 if (mgaScreen->Attrib & MGA_PF_HASALPHA)
 	    a |= AC_dst_dst_alpha;
 	 else
 	    a |= AC_dst_one;
 	 break;
       case GL_ONE_MINUS_DST_ALPHA:
-	 if (0) /*(mgaScreen->Attrib & MGA_PF_HASALPHA)*/
+	 if (mgaScreen->Attrib & MGA_PF_HASALPHA)
 	    a |= AC_dst_om_dst_alpha;
 	 else
 	    a |= AC_dst_zero;
 	 break;
       default:		/* never happens */
+	 break;
       }
    } else {
       a |= AC_src_one|AC_dst_zero;
@@ -282,50 +296,44 @@
  * Hardware clipping
  */
 
-static void mgaUpdateClipping(const GLcontext *ctx)
+void mgaUpdateClipping(const GLcontext *ctx)
 {
-#if 0
-   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-   __DRIdrawablePrivate *dPriv = mmesa->driDrawable;	
-   int x1,x2,y1,y2;
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
 
-   if ( ctx->Scissor.Enabled) {
-      x1 = ctx->Scissor.X;
-      x2 = ctx->Scissor.X + ctx->Scissor.Width - 1;
-      y1 = dPriv->Height - ctx->Scissor.Y - ctx->Scissor.Height;
-      y2 = dPriv->Height - ctx->Scissor.Y - 1;
-   } else {
-      x1 = 0;
-      y1 = 0;
-      x2 = mgaDB->Width-1;
-      y2 = mgaDB->Height-1;
-   }
-  
-   if (x1 < 0) x1 = 0;
-   if (y1 < 0) y1 = 0;
-   if (x2 >= mgaDB->Width) x2 = mgaDB->Width-1;
-   if (y2 >= mgaDB->Height) y2 = mgaDB->Height-1;
+   if (mmesa->driDrawable)
+   {
+      int x1 = mmesa->driDrawable->x + ctx->Scissor.X;
+      int y1 = mmesa->driDrawable->y + mmesa->driDrawable->h - (ctx->Scissor.Y+
+								ctx->Scissor.Height);
+      int x2 = mmesa->driDrawable->x + ctx->Scissor.X+ctx->Scissor.Width;
+      int y2 = mmesa->driDrawable->y + mmesa->driDrawable->h - ctx->Scissor.Y;
+
+      if (x1 < 0) x1 = 0;
+      if (y1 < 0) y1 = 0;
+      if (x2 < 0) x2 = 0;
+      if (y2 < 0) y2 = 0;
+
+      mmesa->scissor_rect.x1 = x1;
+      mmesa->scissor_rect.y1 = y1;
+      mmesa->scissor_rect.x2 = x2;
+      mmesa->scissor_rect.y2 = y2;
+
+      if (MGA_DEBUG&DEBUG_VERBOSE_2D)
+	 fprintf(stderr, "SET SCISSOR %d,%d-%d,%d\n", 
+		 mmesa->scissor_rect.x1,
+		 mmesa->scissor_rect.y1,
+		 mmesa->scissor_rect.x2,
+		 mmesa->scissor_rect.y2);
 
-   if (x1 > x2 || y1 > y2) {
-      x1 = 0; x2 = 0;
-      y2 = 0; y1 = 1;
+      mmesa->dirty |= MGA_UPLOAD_CLIPRECTS;
    }
-
-
-   mmesa->Setup[MGA_CTXREG_CXBNDRY] = (MGA_FIELD(CXB_cxright,x2) | 
-				      MGA_FIELD(CXB_cxleft,x1));
-   mmesa->Setup[MGA_CTXREG_YTOP] = y1*mgaDB->Pitch;
-   mmesa->Setup[MGA_CTXREG_YBOT] = y2*mgaDB->Pitch;
-
-
-   mmesa->dirty |= MGA_UPLOAD_CTX;
-#endif
 }
 
 
 static void mgaDDScissor( GLcontext *ctx, GLint x, GLint y, 
 			  GLsizei w, GLsizei h )
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_CLIP;
 }
 
@@ -339,35 +347,6 @@
 }
 
 
-static GLboolean mgaDDSetBuffer(GLcontext *ctx, GLenum mode )
-{
-   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
-
-   mmesa->Fallback &= ~MGA_FALLBACK_BUFFER;
-
-   if (mode == GL_FRONT_LEFT) 
-   {
-      mmesa->drawOffset = mmesa->mgaScreen->fbOffset;
-      mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->mgaScreen->fbOffset;
-      mmesa->dirty |= MGA_UPLOAD_CTX;
-      mgaXMesaSetFrontClipRects( mmesa );
-      return GL_TRUE;
-   } 
-   else if (mode == GL_BACK_LEFT) 
-   {
-      mmesa->drawOffset = mmesa->mgaScreen->backOffset;
-      mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->mgaScreen->backOffset;
-      mmesa->dirty |= MGA_UPLOAD_CTX;
-      mgaXMesaSetBackClipRects( mmesa );
-      return GL_TRUE;
-   }
-   else 
-   {
-      mmesa->Fallback |= MGA_FALLBACK_BUFFER;
-      return GL_FALSE;
-   }
-}
-
 
 
 static void mgaDDSetColor(GLcontext *ctx, 
@@ -376,7 +355,7 @@
 {
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);
 
-   mmesa->MonoColor = mgaPackColor( mmesa->mgaScreen->fbFormat,
+   mmesa->MonoColor = mgaPackColor( mmesa->mgaScreen->Attrib,
 				      r, g, b, a );
 }
 
@@ -387,7 +366,7 @@
 {
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);
 
-   mmesa->ClearColor = mgaPackColor( mmesa->mgaScreen->fbFormat,
+   mmesa->ClearColor = mgaPackColor( mmesa->mgaScreen->Attrib,
 				      r, g, b, a );
 }
 
@@ -426,6 +405,7 @@
 
 static void mgaDDCullFaceFrontFace(GLcontext *ctx, GLenum mode)
 {
+   FLUSH_BATCH( MGA_CONTEXT(ctx) );
    MGA_CONTEXT(ctx)->new_state |= MGA_NEW_CULL;
 }
 
@@ -461,6 +441,7 @@
    }
 
    if (mmesa->Setup[MGA_CTXREG_PLNWT] != mask) {
+      FLUSH_BATCH( MGA_CONTEXT(ctx) );
       mmesa->Setup[MGA_CTXREG_PLNWT] = mask;      
       MGA_CONTEXT(ctx)->new_state |= MGA_NEW_MASK; 
       mmesa->dirty |= MGA_UPLOAD_CTX;
@@ -470,6 +451,83 @@
 }
 
 /* =============================================================
+ * Polygon stipple 
+ * 
+ * The mga supports a subset of possible 4x4 stipples natively, GL
+ * wants 32x32.  Fortunately stipple is usually a repeating pattern.
+ */
+static int mgaStipples[16] = {
+   0xffff,
+   0xa5a5,
+   0x5a5a,
+   0xa0a0,
+   0x5050,
+   0x0a0a,
+   0x0505,
+   0x8020,
+   0x0401,
+   0x1040,
+   0x0208,
+   0x0802,
+   0x4010,
+   0x0104,
+   0x2080,
+   0x0000
+};
+
+static void mgaDDPolygonStipple( GLcontext *ctx, const GLubyte *mask )
+{
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+   const GLubyte *m = mask;
+   GLubyte p[4];
+   int i,j,k;
+   int active = (ctx->Polygon.StippleFlag && ctx->PB->primitive == GL_POLYGON);
+   GLuint stipple;
+
+   FLUSH_BATCH(mmesa);
+   ctx->Driver.TriangleCaps |= DD_TRI_STIPPLE;
+
+   if (active) {
+      mmesa->dirty |= MGA_UPLOAD_CTX;
+      mmesa->Setup[MGA_CTXREG_DWGCTL] &= ~(0xf<<20);
+   }
+
+   p[0] = mask[0] & 0xf; p[0] |= p[0] << 4;
+   p[1] = mask[4] & 0xf; p[1] |= p[1] << 4;
+   p[2] = mask[8] & 0xf; p[2] |= p[2] << 4;
+   p[3] = mask[12] & 0xf; p[3] |= p[3] << 4;
+
+   for (k = 0 ; k < 8 ; k++)
+      for (j = 0 ; j < 4; j++) 
+	 for (i = 0 ; i < 4 ; i++) 
+	    if (*m++ != p[j]) {
+	       ctx->Driver.TriangleCaps &= ~DD_TRI_STIPPLE;
+	       return;
+	    }
+
+   stipple = ( ((p[0] & 0xf) << 0) |
+	       ((p[1] & 0xf) << 4) |
+	       ((p[2] & 0xf) << 8) |
+	       ((p[3] & 0xf) << 12) );   
+
+   for (i = 0 ; i < 16 ; i++)
+      if (mgaStipples[i] == stipple) {
+	 mmesa->poly_stipple = i<<20;
+	 break;
+      }
+
+   if (i == 16) {
+      ctx->Driver.TriangleCaps &= ~DD_TRI_STIPPLE;
+      return;
+   }
+   
+   if (active) {
+      mmesa->Setup[MGA_CTXREG_DWGCTL] &= ~(0xf<<20);
+      mmesa->Setup[MGA_CTXREG_DWGCTL] |= mmesa->poly_stipple;
+   }
+}
+
+/* =============================================================
  */
 
 
@@ -477,15 +535,16 @@
 
 static void mgaDDPrintDirty( const char *msg, GLuint state )
 {
-   fprintf(stderr, "%s (0x%x): %s%s%s%s%s%s\n",	   
+   fprintf(stderr, "%s (0x%x): %s%s%s%s%s%s%s\n",
 	   msg,
 	   (unsigned int) state,
-	   (state & MGA_REQUIRE_QUIESCENT) ? "req-quiescent, " : "",
+	   (state & MGA_WAIT_AGE) ? "wait-age, " : "",
 	   (state & MGA_UPLOAD_TEX0IMAGE)  ? "upload-tex0-img, " : "",
 	   (state & MGA_UPLOAD_TEX1IMAGE)  ? "upload-tex1-img, " : "",
 	   (state & MGA_UPLOAD_CTX)        ? "upload-ctx, " : "",
 	   (state & MGA_UPLOAD_TEX0)       ? "upload-tex0, " : "",
-	   (state & MGA_UPLOAD_TEX1)       ? "upload-tex1, " : ""
+	   (state & MGA_UPLOAD_TEX1)       ? "upload-tex1, " : "",
+	   (state & MGA_UPLOAD_PIPE)       ? "upload-pipe, " : ""
 	   );
 }
 
@@ -494,7 +553,7 @@
  */
 void mgaEmitHwStateLocked( mgaContextPtr mmesa )
 {
-   if (MGA_DEBUG & MGA_DEBUG_VERBOSE_MSG)
+   if (MGA_DEBUG & DEBUG_VERBOSE_MSG)
       mgaDDPrintDirty( "mgaEmitHwStateLocked", mmesa->dirty );
 
    if ((mmesa->dirty & MGA_UPLOAD_TEX0IMAGE) && mmesa->CurrentTexObj[0])
@@ -503,27 +562,34 @@
    if ((mmesa->dirty & MGA_UPLOAD_TEX1IMAGE) && mmesa->CurrentTexObj[1])
       mgaUploadTexImages(mmesa, mmesa->CurrentTexObj[1]);
   
-   if (mmesa->dirty & MGA_UPLOAD_CTX) {
+   if (mmesa->dirty & MGA_UPLOAD_CTX) 
       memcpy( mmesa->sarea->ContextState, 
 	      mmesa->Setup,
 	      sizeof(mmesa->Setup));
 
-      if (mmesa->CurrentTexObj[0])
+   if ((mmesa->dirty & MGA_UPLOAD_TEX0) && mmesa->CurrentTexObj[0])
 	 memcpy(mmesa->sarea->TexState[0],
 		mmesa->CurrentTexObj[0]->Setup,
 		sizeof(mmesa->sarea->TexState[0]));
 
-      if (mmesa->CurrentTexObj[1])
+   if ((mmesa->dirty & MGA_UPLOAD_TEX1) && mmesa->CurrentTexObj[1])
 	 memcpy(mmesa->sarea->TexState[1],
 		mmesa->CurrentTexObj[1]->Setup,
 		sizeof(mmesa->sarea->TexState[1]));
-   }
+
+   mmesa->sarea->WarpPipe = ((mmesa->setupindex & MGA_WARP_T2GZSAF) | 
+			     MGA_ALPHA_BIT | MGA_SPEC_BIT | MGA_FOG_BIT);
 
-   if (mmesa->dirty & MGA_UPLOAD_PIPE) 
-      mmesa->sarea->WarpPipe = mmesa->setupindex & MGA_WARP_T2GZSAF;
-      
+
    mmesa->sarea->dirty |= mmesa->dirty;
-   mmesa->dirty = 0;
+
+#if 0
+   mgaPrintSetupFlags("warp pipe", mmesa->sarea->WarpPipe);
+   fprintf(stderr, "in mgaEmitHwStateLocked: dirty now %x\n",
+	   mmesa->sarea->dirty);
+#endif
+
+   mmesa->dirty &= (MGA_UPLOAD_CLIPRECTS|MGA_WAIT_AGE);
 }
 
 
@@ -533,32 +599,53 @@
 
 static void mgaDDEnable(GLcontext *ctx, GLenum cap, GLboolean state)
 {
+   mgaContextPtr mmesa = MGA_CONTEXT( ctx );
+
    switch(cap) {
    case GL_ALPHA_TEST:
-      MGA_CONTEXT(ctx)->new_state |= MGA_NEW_ALPHA;
+      FLUSH_BATCH( mmesa );
+      mmesa->new_state |= MGA_NEW_ALPHA;
       break;
    case GL_BLEND:
-      MGA_CONTEXT(ctx)->new_state |= MGA_NEW_ALPHA;
+      FLUSH_BATCH( mmesa );
+      mmesa->new_state |= MGA_NEW_ALPHA;
       break;
    case GL_DEPTH_TEST:
-      MGA_CONTEXT(ctx)->new_state |= MGA_NEW_DEPTH;
+      FLUSH_BATCH( mmesa );
+      mmesa->new_state |= MGA_NEW_DEPTH;
       break;
    case GL_SCISSOR_TEST:
-      MGA_CONTEXT(ctx)->new_state |= MGA_NEW_CLIP;
+      FLUSH_BATCH( mmesa );
+      mmesa->scissor = state;
+      mmesa->new_state |= MGA_NEW_CLIP;
       break;
    case GL_FOG:
-      MGA_CONTEXT(ctx)->new_state |= MGA_NEW_FOG;
+      FLUSH_BATCH( mmesa );
+      mmesa->new_state |= MGA_NEW_FOG;
       break;
    case GL_CULL_FACE:
-      MGA_CONTEXT(ctx)->new_state |= MGA_NEW_CULL;
+      FLUSH_BATCH( mmesa );
+      mmesa->new_state |= MGA_NEW_CULL;
       break;
    case GL_TEXTURE_1D:
    case GL_TEXTURE_2D:
    case GL_TEXTURE_3D:
-      MGA_CONTEXT(ctx)->new_state |= MGA_NEW_TEXTURE;
+      FLUSH_BATCH( mmesa );
+      mmesa->new_state |= MGA_NEW_TEXTURE;
       break;
+   case GL_POLYGON_STIPPLE:
+      if ((ctx->Driver.TriangleCaps & DD_TRI_STIPPLE) &&
+	  ctx->PB->primitive == GL_POLYGON) 
+      {
+	 FLUSH_BATCH(mmesa);
+	 mmesa->dirty |= MGA_UPLOAD_CTX;
+	 mmesa->Setup[MGA_CTXREG_DWGCTL] &= ~(0xf<<20);
+	 if (state)
+	    mmesa->Setup[MGA_CTXREG_DWGCTL] |= mmesa->poly_stipple;
+      }
+      break;
    default:
-      ; 
+      break;
    }    
 }
 
@@ -581,6 +668,7 @@
    {
       mmesa->warp_pipe = index;
       mmesa->new_state |= MGA_NEW_WARP;
+      mmesa->dirty |= MGA_UPLOAD_PIPE;
    }
 }
 
@@ -611,21 +699,15 @@
 
    if (new_state) 
    {
-      mmesa->new_state = 0;
+      FLUSH_BATCH( mmesa );
 
-      /* Emit any vertices for the current state.  This will also
-       * push the current state into the sarea.
-       */
-/*        mgaFlushVertices( mmesa ); */
+      mmesa->new_state = 0;
 
       if (MESA_VERBOSE&VERBOSE_DRIVER)
 	 mgaDDPrintState("UpdateHwState", new_state);
 
       if (new_state & MGA_NEW_DEPTH)
-      {
 	 mgaUpdateZMode(ctx);
-	 mgaDDInitDepthFuncs(ctx);
-      }
 
       if (new_state & MGA_NEW_ALPHA)
 	 mgaUpdateAlphaMode(ctx);
@@ -641,8 +723,6 @@
 
       if (new_state & (MGA_NEW_WARP|MGA_NEW_TEXTURE))
 	 mgaUpdateTextureState(ctx);
-
-      mmesa->new_state = 0; /* tex uploads scribble newstate */
    }
 }
 
@@ -654,8 +734,17 @@
 
 void mgaDDReducedPrimitiveChange( GLcontext *ctx, GLenum prim )
 {
-   mgaFlushVertices( MGA_CONTEXT(ctx) );
-   mgaUpdateCull(ctx);
+   mgaContextPtr mmesa = MGA_CONTEXT(ctx);
+
+   FLUSH_BATCH( mmesa );
+   mgaUpdateCull(ctx);   
+
+   if (ctx->Polygon.StippleFlag && (ctx->Driver.TriangleCaps & DD_TRI_STIPPLE))
+   {
+      mmesa->Setup[MGA_CTXREG_DWGCTL] &= ~(0xf<<20);
+      if (ctx->PB->primitive == GL_POLYGON)
+	 mmesa->Setup[MGA_CTXREG_DWGCTL] |= mmesa->poly_stipple;
+   }
 }
 
 
@@ -677,10 +766,16 @@
 
    /* Have to do this here to detect texture fallbacks in time:
     */
-   if (MGA_CONTEXT(ctx)->new_state & MGA_NEW_TEXTURE)
+   if (mmesa->new_state & MGA_NEW_TEXTURE)
       mgaDDUpdateHwState( ctx );
 
-   if (!mmesa->Fallback || mgaglx.noFallback) {
+   if (0) fprintf(stderr, "fallback %x indirect %x\n", mmesa->Fallback, 
+		  mmesa->IndirectTriangles);
+   
+   if (!mmesa->Fallback) {
+      ctx->IndirectTriangles &= ~DD_SW_RASTERIZE;
+      ctx->IndirectTriangles |= mmesa->IndirectTriangles;
+
       ctx->Driver.PointsFunc=mmesa->PointsFunc;
       ctx->Driver.LineFunc=mmesa->LineFunc;
       ctx->Driver.TriangleFunc=mmesa->TriangleFunc;
@@ -689,6 +784,60 @@
 }
 
 
+
+void mgaInitState( mgaContextPtr mmesa )
+{
+   mgaScreenPrivate *mgaScreen = mmesa->mgaScreen;
+   GLcontext *ctx = mmesa->glCtx;
+
+   if (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT) {
+      mmesa->draw_buffer = MGA_BACK;
+      mmesa->read_buffer = MGA_BACK;
+      mmesa->drawOffset = mmesa->mgaScreen->backOffset;
+      mmesa->readOffset = mmesa->mgaScreen->backOffset;
+      mmesa->Setup[MGA_CTXREG_DSTORG] = mgaScreen->backOffset;
+   } else {
+      mmesa->drawOffset = mmesa->mgaScreen->frontOffset;
+      mmesa->readOffset = mmesa->mgaScreen->frontOffset;
+      mmesa->draw_buffer = MGA_FRONT;
+      mmesa->read_buffer = MGA_FRONT;
+      mmesa->Setup[MGA_CTXREG_DSTORG] = mgaScreen->frontOffset;
+   }
+
+/*     mmesa->Setup[MGA_CTXREG_MACCESS] = mgaScreen->mAccess; */
+/*     mmesa->Setup[MGA_CTXREG_DWGCTL] = ( DC_clipdis_disable |  */
+/*  				       (0xC << DC_bop_SHIFT) | */
+/*  				       DC_shftzero_enable |  */
+/*  				       DC_zmode_nozcmp |  */
+/*  				       DC_atype_zi ); */
+
+
+   mmesa->Setup[MGA_CTXREG_MACCESS] = 0x1;
+   mmesa->Setup[MGA_CTXREG_DWGCTL] = 0xc4074;
+
+
+   mmesa->Setup[MGA_CTXREG_PLNWT] = ~0;
+   mmesa->Setup[MGA_CTXREG_ALPHACTRL] = ( AC_src_one |
+					  AC_dst_zero | 
+					  AC_amode_FCOL | 
+					  AC_astipple_disable | 
+					  AC_aten_disable | 
+					  AC_atmode_noacmp |
+					  AC_alphasel_fromtex );
+
+   mmesa->Setup[MGA_CTXREG_FOGCOLOR] = 
+      MGAPACKCOLOR888((GLubyte)(ctx->Fog.Color[0]*255.0F), 
+		      (GLubyte)(ctx->Fog.Color[1]*255.0F), 
+		      (GLubyte)(ctx->Fog.Color[2]*255.0F));
+
+   mmesa->Setup[MGA_CTXREG_WFLAG] = 0;
+   mmesa->Setup[MGA_CTXREG_TDUAL0] = 0;
+   mmesa->Setup[MGA_CTXREG_TDUAL1] = 0;
+   mmesa->Setup[MGA_CTXREG_FCOL] = 0;
+   mmesa->new_state = ~0;
+}
+
+
 void mgaDDInitStateFuncs( GLcontext *ctx )
 {
    ctx->Driver.UpdateState = mgaDDUpdateState;
@@ -710,10 +859,13 @@
    ctx->Driver.RenderStart = mgaDDUpdateHwState; 
    ctx->Driver.RenderFinish = 0; 
 
-   ctx->Driver.SetBuffer = mgaDDSetBuffer;
+   ctx->Driver.SetDrawBuffer = mgaDDSetDrawBuffer;
+   ctx->Driver.SetReadBuffer = mgaDDSetReadBuffer;
    ctx->Driver.Color = mgaDDSetColor;
    ctx->Driver.ClearColor = mgaDDClearColor;
    ctx->Driver.Dither = mgaDDDither;
+
+   ctx->Driver.PolygonStipple = mgaDDPolygonStipple;
 
    ctx->Driver.Index = 0;
    ctx->Driver.ClearIndex = 0;
Index: xc/lib/GL/mesa/src/drv/mga/mgastate.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgastate.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgastate.h:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgastate.h:1.1	Fri Feb 11 09:25:39 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgastate.h	Fri Jun 16 17:03:02 2000
@@ -7,9 +7,10 @@
 extern void mgaDDUpdateState( GLcontext *ctx );
 extern void mgaDDReducedPrimitiveChange( GLcontext *ctx, GLenum prim );
 
-/* reprograms the current registers without updating them, used to
-reset state after a dma buffer overflow */
-void mgaUpdateRegs( GLuint regs );
+extern void mgaInitState( mgaContextPtr mmesa );
+
+extern void mgaUpdateClipping(const GLcontext *ctx);
+
 
 
 #endif
Index: xc/lib/GL/mesa/src/drv/mga/mgatex.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgatex.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgatex.c:1.4
--- xc/lib/GL/mesa/src/drv/mga/mgatex.c:1.1	Fri Feb 11 09:25:39 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgatex.c	Thu Jun 22 09:59:24 2000
@@ -26,6 +26,7 @@
  *	9/20/99 rewrite by John Carmack <johnc@idsoftware.com>
  *      13/1/00 port to DRI by Keith Whitwell <keithw@precisioninsight.com>
  */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatex.c,v 1.4 2000/06/22 16:59:24 tsi Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -47,22 +48,25 @@
  * to it.
  */
 static void mgaDestroyTexObj( mgaContextPtr mmesa, mgaTextureObjectPtr t ) {
-	int	i;
 
  	if ( !t ) return;
   	  	
 	/* free the texture memory */
-	mmFreeMem( t->MemBlock );
+	if (t->MemBlock) {
+		mmFreeMem( t->MemBlock );
+		t->MemBlock = 0;
+
+		if (t->age > mmesa->dirtyAge)
+			mmesa->dirtyAge = t->age;
+	}
  
  	/* free mesa's link */   
-	t->tObj->DriverData = NULL;
+	if (t->tObj) 
+		t->tObj->DriverData = NULL;
 
 	/* see if it was the driver's current object */
-	for ( i = 0 ; i < 2 ; i++ ) {
-		if ( mmesa->CurrentTexObj[i] == t ) {
-			mmesa->CurrentTexObj[i] = NULL;
-		}  
-	}
+	if (t->bound)
+		mmesa->CurrentTexObj[t->bound - 1] = 0; 
 	
 	remove_from_list(t);
 	free( t );
@@ -73,29 +77,86 @@
 	if (t->MemBlock) {
 		mmFreeMem(t->MemBlock);
 		t->MemBlock = 0;      
+
+		if (t->age > mmesa->dirtyAge)
+			mmesa->dirtyAge = t->age;
 	}
 
 	t->dirty_images = ~0;
 	move_to_tail(&(mmesa->SwappedOut), t);
 }
 
+
+static void mgaPrintLocalLRU( mgaContextPtr mmesa, int heap ) 
+{
+   mgaTextureObjectPtr t;
+   int sz = 1 << (mmesa->mgaScreen->logTextureGranularity[heap]);
+
+   fprintf(stderr, "\nLocal LRU, heap %d:\n", heap);
+
+   foreach( t, &(mmesa->TexObjList[heap]) ) {
+      if (!t->tObj)
+	 fprintf(stderr, "Placeholder %d at %x sz %x\n", 
+		 t->MemBlock->ofs / sz,
+		 t->MemBlock->ofs,
+		 t->MemBlock->size);      
+      else
+	 fprintf(stderr, "Texture (bound %d) at %x sz %x\n", 
+		 t->bound,
+		 t->MemBlock->ofs,
+		 t->MemBlock->size);      
+
+   }
+
+   fprintf(stderr, "\n\n");
+}
+
+static void mgaPrintGlobalLRU( mgaContextPtr mmesa, int heap )
+{
+   int i, j;
+   drm_mga_tex_region_t *list = mmesa->sarea->texList[heap];
+
+   fprintf(stderr, "\nGlobal LRU, heap %d list %p:\n", heap, list);
+
+   for (i = 0, j = MGA_NR_TEX_REGIONS ; i < MGA_NR_TEX_REGIONS ; i++) {
+      fprintf(stderr, "list[%d] age %d next %d prev %d\n",
+	      j, list[j].age, list[j].next, list[j].prev);
+      j = list[j].next;
+      if (j == MGA_NR_TEX_REGIONS) break;
+   }
+   
+   if (j != MGA_NR_TEX_REGIONS) {
+      fprintf(stderr, "Loop detected in global LRU\n\n\n");
+      for (i = 0 ; i < MGA_NR_TEX_REGIONS ; i++) {
+	      fprintf(stderr, "list[%d] age %d next %d prev %d\n",
+		      i, list[i].age, list[i].next, list[i].prev);
+      }
+   }
+   
+   fprintf(stderr, "\n\n");
+}
+
 
-void mgaResetGlobalLRU( mgaContextPtr mmesa )
+static void mgaResetGlobalLRU( mgaContextPtr mmesa, GLuint heap )
 {
-   mgaTexRegion *list = mmesa->sarea->texList;
-   int sz = 1 << mmesa->mgaScreen->logTextureGranularity;
+   drm_mga_tex_region_t *list = mmesa->sarea->texList[heap];
+   int sz = 1 << mmesa->mgaScreen->logTextureGranularity[heap];
    int i;
 
+   mmesa->texAge[heap] = ++mmesa->sarea->texAge[heap];
+
+   if (0) fprintf(stderr, "mgaResetGlobalLRU %d\n", (int)heap);
+
    /* (Re)initialize the global circular LRU list.  The last element
     * in the array (MGA_NR_TEX_REGIONS) is the sentinal.  Keeping it
     * at the end of the array allows it to be addressed rationally
     * when looking up objects at a particular location in texture
     * memory.  
     */
-   for (i = 0 ; (i+1) * sz < mmesa->mgaScreen->textureSize ; i++) {
+   for (i = 0 ; (i+1) * sz <= mmesa->mgaScreen->textureSize[heap] ; i++) {
       list[i].prev = i-1;
       list[i].next = i+1;
-      list[i].age = 0;
+      list[i].age = mmesa->sarea->texAge[heap];   
    }
 
    i--;
@@ -104,30 +165,41 @@
    list[i].next = MGA_NR_TEX_REGIONS;
    list[MGA_NR_TEX_REGIONS].prev = i;
    list[MGA_NR_TEX_REGIONS].next = 0;
-   mmesa->sarea->texAge = 0;
+
 }
 
 
 static void mgaUpdateTexLRU( mgaContextPtr mmesa, mgaTextureObjectPtr t ) 
 {
    int i;
-   int logsz = mmesa->mgaScreen->logTextureGranularity;
+   int heap = t->heap;
+   int logsz = mmesa->mgaScreen->logTextureGranularity[heap];
    int start = t->MemBlock->ofs >> logsz;
    int end = (t->MemBlock->ofs + t->MemBlock->size - 1) >> logsz;
-   mgaTexRegion *list = mmesa->sarea->texList;
+   drm_mga_tex_region_t *list = mmesa->sarea->texList[heap];
    
-   mmesa->texAge = ++mmesa->sarea->texAge;
+   mmesa->texAge[heap] = ++mmesa->sarea->texAge[heap];
+
+   if (!t->MemBlock) {
+	   fprintf(stderr, "no memblock\n\n");
+	   return;
+   }
 
    /* Update our local LRU
     */
-   move_to_head( &(mmesa->TexObjList), t );
+   move_to_head( &(mmesa->TexObjList[heap]), t );
+
 
+   if (0)
+	   fprintf(stderr, "mgaUpdateTexLRU heap %d list %p\n", heap, list);
+
+
    /* Update the global LRU
     */
    for (i = start ; i <= end ; i++) {
 
       list[i].in_use = 1;
-      list[i].age = mmesa->texAge;
+      list[i].age = mmesa->texAge[heap];
 
       /* remove_from_list(i)
        */
@@ -141,8 +213,12 @@
       list[(unsigned)list[MGA_NR_TEX_REGIONS].next].prev = i;
       list[MGA_NR_TEX_REGIONS].next = i;
    }
-}
 
+   if (0) {
+	   mgaPrintGlobalLRU(mmesa, t->heap);
+	   mgaPrintLocalLRU(mmesa, t->heap);
+   }
+}
 
 /* Called for every shared texture region which has increased in age
  * since we last held the lock.
@@ -151,23 +227,29 @@
  * and pushes a placeholder texture onto the LRU list to represent 
  * the other client's textures.  
  */
-void mgaTexturesGone( mgaContextPtr mmesa,
-		       GLuint offset, 
-		       GLuint size,
-		       GLuint in_use ) 
+static void mgaTexturesGone( mgaContextPtr mmesa,
+			     GLuint heap,
+			     GLuint offset, 
+			     GLuint size,
+			     GLuint in_use ) 
 {
    mgaTextureObjectPtr t, tmp;
-   
-   foreach_s ( t, tmp, &mmesa->TexObjList ) {
+
+
+
+   foreach_s ( t, tmp, &(mmesa->TexObjList[heap]) ) {
 
       if (t->MemBlock->ofs >= offset + size ||
 	  t->MemBlock->ofs + t->MemBlock->size <= offset)
 	 continue;
 
+
+
+
       /* It overlaps - kick it off.  Need to hold onto the currently bound
        * objects, however.
        */
-      if (t == mmesa->CurrentTexObj[0] || t == mmesa->CurrentTexObj[1]) 
+      if (t->bound) 
 	 mgaSwapOutTexObj( mmesa, t );
       else
 	 mgaDestroyTexObj( mmesa, t );
@@ -178,12 +260,54 @@
       t = (mgaTextureObjectPtr) calloc(1,sizeof(*t));
       if (!t) return;
 
-      t->MemBlock = mmAllocMem( mmesa->texHeap, size, 0, offset);      
-      insert_at_head( &mmesa->TexObjList, t );
+      t->heap = heap;
+      t->MemBlock = mmAllocMem( mmesa->texHeap[heap], size, 0, offset);      
+      if (!t->MemBlock) {
+	      fprintf(stderr, "Couldn't alloc placeholder sz %x ofs %x\n",
+		      (int)size, (int)offset);
+	      mmDumpMemInfo( mmesa->texHeap[heap]);
+	      return;
+      }
+      insert_at_head( &(mmesa->TexObjList[heap]), t );
    }
 }
 
 
+void mgaAgeTextures( mgaContextPtr mmesa, int heap )
+{
+	drm_mga_sarea_t *sarea = mmesa->sarea;
+	int sz = 1 << (mmesa->mgaScreen->logTextureGranularity[heap]);
+	int idx, nr = 0;
+
+	/* Have to go right round from the back to ensure stuff ends up
+	 * LRU in our local list...  Fix with a cursor pointer.
+	 */
+	for (idx = sarea->texList[heap][MGA_NR_TEX_REGIONS].prev ; 
+	     idx != MGA_NR_TEX_REGIONS && nr < MGA_NR_TEX_REGIONS ; 
+	     idx = sarea->texList[heap][idx].prev, nr++)
+	{
+		if (sarea->texList[heap][idx].age > mmesa->texAge[heap]) {
+			mgaTexturesGone(mmesa, heap, idx * sz, sz, 1);
+		}
+	}
+
+	if (nr == MGA_NR_TEX_REGIONS) {
+		mgaTexturesGone(mmesa, heap, 0,
+				mmesa->mgaScreen->textureSize[heap], 0);
+		mgaResetGlobalLRU( mmesa, heap );
+	}
+
+	
+	if (0) {
+		mgaPrintGlobalLRU( mmesa, heap );
+		mgaPrintLocalLRU( mmesa, heap );
+	}
+
+	mmesa->texAge[heap] = sarea->texAge[heap];
+	mmesa->dirty |= MGA_UPLOAD_TEX0IMAGE | MGA_UPLOAD_TEX1IMAGE;
+}
+
+
 /*
  * mgaSetTexWrappings
  */
@@ -281,22 +405,22 @@
 
 
 /*
- * mgaUploadSubImage
+ * mgaUploadSubImageLocked
  *
  * Perform an iload based update of a resident buffer.  This is used for
  * both initial loading of the entire image, and texSubImage updates.
  *
  * Performed with the hardware lock held.
  */
-static void mgaUploadSubImage( mgaContextPtr mmesa,
-			       mgaTextureObjectPtr t,
-			       int level,	     
-			       int x, int y, int width, int height ) {
+static void mgaUploadSubImageLocked( mgaContextPtr mmesa,
+				     mgaTextureObjectPtr t,
+				     int level,	     
+				     int x, int y, int width, int height ) {
 	int		x2;
 	int		dwords;
-        int		dstorg;
+        int		offset;
 	struct gl_texture_image *image;
-	int		texelBytes, texelsPerDword, texelMaccess;
+	int		texelBytes, texelsPerDword, texelMaccess, length;
 
 	if ( level < 0 || level >= MGA_TEX_MAXLEVELS ) {
 		mgaMsg( 1, "mgaUploadSubImage: bad level: %i\n", level );
@@ -310,15 +434,9 @@
 	}
 	
 	/* find the proper destination offset for this level */
-   	dstorg = (mmesa->mgaScreen->textureOffset + t->MemBlock->ofs + 
+   	offset = (t->MemBlock->ofs + 
 		  t->offsets[level]);
 
-    	/* turn on PCI/AGP if needed 
-    	if ( textureHeapPhysical ) {
-    		dstorg |= 1 | mgaglx.use_agp;
-    	}
-	*/
-
 	texelBytes = t->texelBytes;	
 	switch( texelBytes ) {
 	case 1:
@@ -363,7 +481,7 @@
 		x = (x + (texelsPerDword-1)) & ~(texelsPerDword-1);
 		width = x2 - x;
 	}
-    
+
 	/* we may not be able to upload the entire texture in one
 	   batch due to register limits or dma buffer limits.
 	   Recursively split it up. */
@@ -374,7 +492,8 @@
 		}
 		mgaMsg(10, "mgaUploadSubImage: recursively subdividing\n" );
 
-		mgaUploadSubImage( mmesa, t, level, x, y, width, height >> 1 );
+		mgaUploadSubImageLocked( mmesa, t, level, x, y, 
+					 width, height >> 1 );
 		y += ( height >> 1 );
 		height -= ( height >> 1 );
 	}
@@ -385,31 +504,50 @@
 	/* bump the performance counter */
 	mgaglx.c_textureSwaps += ( dwords << 2 );
 	
-	
-#if 0
-
-	/* fill in the secondary buffer with properly converted texels
-	from the mesa buffer */
-	mgaConvertTexture( dest, texelBytes, image, x, y, width, height );
-		
-	/* send the secondary data */	
-	mgaSecondaryDma( TT_BLIT, dest, dwords );
-#endif
+   	length = dwords * 4;
 
+	/* Fill in the secondary buffer with properly converted texels
+	 * from the mesa buffer. */
+   	if(t->heap == MGA_CARD_HEAP) {
+	   mgaGetILoadBufferLocked( mmesa );
+	   mgaConvertTexture( (mgaUI32 *)mmesa->iload_buffer->address, 
+			     texelBytes, image, x, y, width, height ); 
+	   if(length < 64) length = 64;
+	   mgaMsg(10, "TexelBytes : %d, offset: %d, length : %d\n",
+		  texelBytes,
+		  mmesa->mgaScreen->textureOffset[t->heap] +
+		  offset + 
+		  y * width * 4/texelsPerDword,
+		  length);
+	   
+	   mgaFireILoadLocked( mmesa, 
+			      mmesa->mgaScreen->textureOffset[t->heap] +
+			      offset + 
+			      y * width * 4/texelsPerDword,
+			      length);
+	} else {
+ 	/* This works, is slower for uploads to card space and needs
+	 * additional synchronization with the dma stream.
+	 */
+	   mgaConvertTexture( (mgaUI32 *)
+			      (mmesa->mgaScreen->texVirtual[t->heap] + 
+					  offset + 
+					  y * width * 4/texelsPerDword), 
+			     texelBytes, image, x, y, width, height ); 
+	}
 }
 
 
-
 static void mgaUploadTexLevel( mgaContextPtr mmesa, 
-			       mgaTextureObjectPtr t,
-			       int l )
+				     mgaTextureObjectPtr t,
+				     int l )
 {
-	mgaUploadSubImage( mmesa,
-			   t,
-			   l,
-			   0, 0,
-			   t->tObj->Image[l]->Width,
-			   t->tObj->Image[l]->Height);
+	mgaUploadSubImageLocked( mmesa,
+				 t,
+				 l,
+				 0, 0,
+				 t->tObj->Image[l]->Width,
+				 t->tObj->Image[l]->Height);
 }
 
 
@@ -527,9 +665,11 @@
 	/* fill in our mga texture object */
 	t->tObj = tObj;
 	t->ctx = mmesa;
+	t->age = 0;
+	t->bound = 0;
 
 	
-	insert_at_tail(&(mmesa->TexObjList), t);
+	insert_at_tail(&(mmesa->SwappedOut), t);
 	
 	t->MemBlock = 0;
 
@@ -596,34 +736,61 @@
   	tObj->DriverData = t;
 }
 
+static void mgaMigrateTexture( mgaContextPtr mmesa, mgaTextureObjectPtr t )
+{
+	/* NOT DONE */
+}
 
 
-int mgaUploadTexImages( mgaContextPtr mmesa, mgaTextureObjectPtr t )
+static int mgaChooseTexHeap( mgaContextPtr mmesa, mgaTextureObjectPtr t )
 {
+	return 0;
+}
+
 
+int mgaUploadTexImages( mgaContextPtr mmesa, mgaTextureObjectPtr t )
+{
+	int heap;
 	int i;
 	int ofs;
 	mgaglx.c_textureSwaps++;
 
+	heap = t->heap = mgaChooseTexHeap( mmesa, t );
+
 	/* Do we need to eject LRU texture objects?
 	 */
 	if (!t->MemBlock) {
 		while (1)
 		{
-			t->MemBlock = mmAllocMem( mmesa->texHeap, t->totalSize, 12, 0 ); 
+			mgaTextureObjectPtr tmp = mmesa->TexObjList[heap].prev;
+
+			t->MemBlock = mmAllocMem( mmesa->texHeap[heap], 
+						  t->totalSize,
+						  6, 0 ); 
 			if (t->MemBlock)
 				break;
 
-			if (mmesa->TexObjList.prev == &(mmesa->TexObjList)) {
-				fprintf(stderr, "Failed to upload texture, sz %d\n", t->totalSize);
-				mmDumpMemInfo( mmesa->texHeap );
+			if (mmesa->TexObjList[heap].prev->bound) {
+				fprintf(stderr, 
+					"Hit bound texture in upload\n"); 
 				return -1;
 			}
 
-			mgaDestroyTexObj( mmesa, mmesa->TexObjList.prev );
+			if (mmesa->TexObjList[heap].prev == 
+			    &(mmesa->TexObjList[heap])) 
+			{
+				fprintf(stderr, "Failed to upload texture, "
+					"sz %d\n", t->totalSize);
+				mmDumpMemInfo( mmesa->texHeap[heap] );
+				return -1;
+			}
+	 
+			mgaDestroyTexObj( mmesa, tmp );
 		}
  
-		ofs = t->MemBlock->ofs;
+		ofs = t->MemBlock->ofs 
+			+ mmesa->mgaScreen->textureOffset[heap]
+			;
 
 		t->Setup[MGA_TEXREG_ORG]  = ofs;
 		t->Setup[MGA_TEXREG_ORG1] = ofs + t->offsets[1];
@@ -638,8 +805,16 @@
 	 */
 	mgaUpdateTexLRU( mmesa, t );
 
+	
+	if (MGA_DEBUG&DEBUG_VERBOSE_LRU)
+		fprintf(stderr, "dispatch age: %d age freed memory: %d\n",
+			GET_DISPATCH_AGE(mmesa), mmesa->dirtyAge);
+
+	if (mmesa->dirtyAge >= GET_DISPATCH_AGE(mmesa)) 
+		mgaWaitAgeLocked( mmesa, mmesa->dirtyAge );
+
 	if (t->dirty_images) {
-		if (MGA_DEBUG & MGA_DEBUG_VERBOSE_MSG)
+  		if (MGA_DEBUG&DEBUG_VERBOSE_LRU)
 			fprintf(stderr, "*");
 
 		for (i = 0 ; i <= t->lastLevel ; i++)
@@ -689,15 +864,14 @@
 		t->ctx->Fallback |= MGA_FALLBACK_TEXTURE;
 		break;
 	default:
+		break;
 	}
 }
 
-/* I don't have the alpha values correct yet:
- */
 static void mgaUpdateTextureStage( GLcontext *ctx, int unit )
 {
 	mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-	mgaUI32 *reg = &mmesa->Setup[MGA_CTXREG_TDUAL0 + unit];
+	GLuint *reg = &mmesa->Setup[MGA_CTXREG_TDUAL0 + unit];
 	GLuint source = mmesa->tmu_source[unit];
 	struct gl_texture_object *tObj = ctx->Texture.Unit[source].Current;
 
@@ -725,13 +899,13 @@
 			*reg = ( TD0_color_arg2_diffuse |
 				 TD0_color_sel_mul | 
 				 TD0_alpha_arg2_diffuse |
-				 TD0_alpha_sel_arg1);
+				 TD0_alpha_sel_mul);
 		else
 			*reg = ( TD0_color_arg2_prevstage |
 				 TD0_color_alpha_prevstage |
 				 TD0_color_sel_mul | 
 				 TD0_alpha_arg2_prevstage |
-				 TD0_alpha_sel_arg1);
+				 TD0_alpha_sel_mul);
 		break;
 	case GL_DECAL:
 		*reg = (TD0_color_arg2_fcol | 
@@ -751,22 +925,52 @@
 				 TD0_color_add_add |
 				 TD0_color_sel_add | 
 				 TD0_alpha_arg2_diffuse |
-				 TD0_alpha_sel_arg1);
+				 TD0_alpha_sel_add);
 		else
 			*reg = ( TD0_color_arg2_prevstage |
 				 TD0_color_alpha_prevstage |
 				 TD0_color_add_add |
 				 TD0_color_sel_add | 
 				 TD0_alpha_arg2_prevstage |
-				 TD0_alpha_sel_arg1);
+				 TD0_alpha_sel_add);
 		break;
 
 	case GL_BLEND:
-		/* Use a multipass mechanism to do this:
+		if (0)
+			fprintf(stderr, "GL_BLEND unit %d flags %x\n", unit,
+				mmesa->blend_flags);
+
+		if (mmesa->blend_flags) 
+			mmesa->Fallback |= MGA_FALLBACK_TEXTURE;
+			return;
+
+		/* Do singletexture GL_BLEND with 'all ones' env-color
+		 * by using both texture units.  Multitexture gl_blend
+		 * is a fallback.  
 		 */
-		mmesa->Fallback |= MGA_FALLBACK_TEXTURE;
+		if (unit == 0) {
+			/* Part 1: R1 = Rf ( 1 - Rt )
+			 *         A1 = Af At
+			 */
+			*reg = ( TD0_color_arg2_diffuse |
+				 TD0_color_arg1_inv_enable |
+				 TD0_color_sel_mul | 
+				 TD0_alpha_arg2_diffuse |
+				 TD0_alpha_sel_arg1);
+		} else {
+			/* Part 2: R2 = R1 + Rt
+			 *         A2 = A1
+			 */
+			*reg = ( TD0_color_arg2_prevstage |
+				 TD0_color_add_add | 
+				 TD0_color_sel_add | 
+				 TD0_alpha_arg2_prevstage |
+				 TD0_alpha_sel_arg2);		
+		}	
+
 		break;
 	default:
+		break;
 	}
 }
 
@@ -782,9 +986,8 @@
 	mgaMsg(15,"mgaUpdateTextureState %d\n", unit);
 	
 	/* disable texturing until it is known to be good */
-	mmesa->Setup[MGA_CTXREG_DWGCTL] = 
-		(( mmesa->Setup[MGA_CTXREG_DWGCTL] & DC_opcod_MASK ) | 
-		 DC_opcod_trap);
+	mmesa->Setup[MGA_CTXREG_DWGCTL] &= DC_opcod_MASK;
+	mmesa->Setup[MGA_CTXREG_DWGCTL] |= DC_opcod_trap;
 
 	enabled = (ctx->Texture.Enabled>>(source*4))&TEXTURE0_ANY;
 	if (enabled != TEXTURE0_2D) {
@@ -797,6 +1000,8 @@
 
 	if ( !tObj || tObj != ctx->Texture.Unit[source].CurrentD[2] ) 
 		return;
+
+/*  	fprintf(stderr, "unit %d: %d\n", unit, tObj->Name); */
 	
 	/* if the texture object doesn't exist at all (never used or
 	   swapped out), create it now, uploading all texture images */
@@ -804,7 +1009,6 @@
 	if ( !tObj->DriverData ) {
 		/* clear the current pointer so that texture object can be
 		   swapped out if necessary to make room */
-		mmesa->CurrentTexObj[source] = NULL;
 		mgaCreateTexObj( mmesa, tObj );
 
 		if ( !tObj->DriverData ) {
@@ -815,9 +1019,8 @@
 	}
 
 	/* we definately have a valid texture now */
-	mmesa->Setup[MGA_CTXREG_DWGCTL] = 
-		(( mmesa->Setup[MGA_CTXREG_DWGCTL] & DC_opcod_MASK ) | 
-		 DC_opcod_texture_trap);
+	mmesa->Setup[MGA_CTXREG_DWGCTL] &= DC_opcod_MASK;
+	mmesa->Setup[MGA_CTXREG_DWGCTL] |= DC_opcod_texture_trap;
 
 	t = (mgaTextureObjectPtr)tObj->DriverData;
 
@@ -825,6 +1028,11 @@
 		mmesa->dirty |= (MGA_UPLOAD_TEX0IMAGE << unit);
 
 	mmesa->CurrentTexObj[unit] = t;
+	t->bound = unit+1;
+
+	if (t->MemBlock)
+		mgaUpdateTexLRU( mmesa, t );
+
 
 	t->Setup[MGA_TEXREG_CTL2] &= ~TMC_dualtex_enable;
 	if (ctx->Texture.Enabled == (TEXTURE0_2D|TEXTURE1_2D))
@@ -848,23 +1056,31 @@
 	mgaContextPtr mmesa = MGA_CONTEXT( ctx );
 	mmesa->Fallback &= ~MGA_FALLBACK_TEXTURE;
 
+	if (mmesa->CurrentTexObj[0]) mmesa->CurrentTexObj[0]->bound = 0;
+	if (mmesa->CurrentTexObj[1]) mmesa->CurrentTexObj[1]->bound = 0;
+	mmesa->CurrentTexObj[0] = 0;
+	mmesa->CurrentTexObj[1] = 0;   
+
 	if (MGA_IS_G400(mmesa)) {
 		mgaUpdateTextureObject( ctx, 0 );		
 		mgaUpdateTextureStage( ctx, 0 );
 
-		mmesa->Setup[MGA_CTXREG_TDUAL1] = mmesa->Setup[MGA_CTXREG_TDUAL0];
+		mmesa->Setup[MGA_CTXREG_TDUAL1] = 
+			mmesa->Setup[MGA_CTXREG_TDUAL0];
 
 		if (mmesa->multitex) {
 			mgaUpdateTextureObject( ctx, 1 );	
 			mgaUpdateTextureStage( ctx, 1 );
 		}
+		
+		mmesa->dirty |= MGA_UPLOAD_TEX0 | MGA_UPLOAD_TEX1;
 	} else {
 		mgaUpdateTextureObject( ctx, 0 );
-		mgaUpdateTextureEnvG200( ctx );
+		mgaUpdateTextureEnvG200( ctx );		
 	}
 
 	/* schedule the register writes */
-	mmesa->dirty |= MGA_UPLOAD_CTX;
+	mmesa->dirty |= MGA_UPLOAD_CTX | MGA_UPLOAD_TEX0;
 }
 
 
@@ -880,14 +1096,58 @@
 /*
  * mgaTexEnv
  */      
-void mgaTexEnv( GLcontext *ctx, GLenum pname, const GLfloat *param ) {
+void mgaTexEnv( GLcontext *ctx, GLenum target, GLenum pname,
+                const GLfloat *param ) 
+{
+	mgaContextPtr mmesa = MGA_CONTEXT(ctx);
 	mgaMsg( 10, "mgaTexEnv( %i )\n", pname );
 
+
 	if (pname == GL_TEXTURE_ENV_MODE) {
 		/* force the texture state to be updated */
-		MGA_CONTEXT(ctx)->CurrentTexObj[0] = 0;  
+		FLUSH_BATCH( MGA_CONTEXT(ctx) );
 		MGA_CONTEXT(ctx)->new_state |= MGA_NEW_TEXTURE;
 	}
+	else if (pname == GL_TEXTURE_ENV_COLOR)
+	{
+		struct gl_texture_unit *texUnit = 
+			&ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+		GLfloat *fc = texUnit->EnvColor;
+		GLubyte c[4];
+		GLuint col;
+
+		
+		c[0] = fc[0];
+		c[1] = fc[1];
+		c[2] = fc[2];
+		c[3] = fc[3];
+
+		/* No alpha at 16bpp?
+		 */
+		col = mgaPackColor( mmesa->mgaScreen->Attrib,
+				    c[0], c[1], c[2], c[3] );
+
+  		mmesa->envcolor = (c[3]<<24) | (c[0]<<16) | (c[1]<<8) | (c[2]); 
+    
+		if (mmesa->Setup[MGA_CTXREG_FCOL] != col) {
+			FLUSH_BATCH(mmesa);	
+			mmesa->Setup[MGA_CTXREG_FCOL] = col;      
+			mmesa->dirty |= MGA_UPLOAD_CTX;
+
+			mmesa->blend_flags &= ~MGA_BLEND_ENV_COLOR;
+
+			/* Actually just require all four components to be
+			 * equal.  This permits a single-pass GL_BLEND.
+			 * 
+			 * More complex multitexture/multipass fallbacks
+			 * for blend can be done later.
+			 */
+			if (mmesa->envcolor != 0x0 &&
+			    mmesa->envcolor != 0xffffffff)
+				mmesa->blend_flags |= MGA_BLEND_ENV_COLOR;
+		}
+	}
+
 }
 
 /*
@@ -907,6 +1167,7 @@
 	mgaUpdateTextureState time. */  
 	t = (mgaTextureObjectPtr) tObj->DriverData;
 	if ( t ) {
+		if (t->bound) FLUSH_BATCH(mmesa);
 		/* if this is the current object, it will force an update */
  	 	mgaDestroyTexObj( mmesa, t );
 		mmesa->new_state |= MGA_NEW_TEXTURE;
@@ -936,6 +1197,7 @@
 	mgaUpdateTextureState time. */  
 	t = (mgaTextureObjectPtr) tObj->DriverData;
 	if ( t ) {
+		if (t->bound) FLUSH_BATCH(mmesa);
 		/* if this is the current object, it will force an update */
  	 	mgaDestroyTexObj( mmesa, t );
 		mmesa->new_state |= MGA_NEW_TEXTURE;
@@ -956,7 +1218,9 @@
  */
 void mgaTexParameter( GLcontext *ctx, GLenum target,
 		      struct gl_texture_object *tObj,
-		      GLenum pname, const GLfloat *params ) {
+		      GLenum pname, const GLfloat *params )
+{
+	mgaContextPtr mmesa = MGA_CONTEXT( ctx );
 	mgaTextureObjectPtr t;
 
 	mgaMsg( 10, "mgaTexParameter( %p, %i )\n", tObj, pname );
@@ -973,52 +1237,68 @@
 	switch (pname) {
 	case GL_TEXTURE_MIN_FILTER:
 	case GL_TEXTURE_MAG_FILTER:
+		if (t->bound) FLUSH_BATCH(mmesa);
 		mgaSetTexFilter( t, tObj->MinFilter, tObj->MagFilter );
 		break;
 
 	case GL_TEXTURE_WRAP_S:
 	case GL_TEXTURE_WRAP_T:
+		if (t->bound) FLUSH_BATCH(mmesa);
 		mgaSetTexWrapping(t,tObj->WrapS,tObj->WrapT);
 		break;
   
 	case GL_TEXTURE_BORDER_COLOR:
+		if (t->bound) FLUSH_BATCH(mmesa);
 		mgaSetTexBorderColor(t,tObj->BorderColor);
 		break;
 
 	default:
 		return;
 	}
-	/* force the texture state to be updated */
-	MGA_CONTEXT(ctx)->CurrentTexObj[0] = NULL;  
-	MGA_CONTEXT(ctx)->new_state |= MGA_NEW_TEXTURE;
+
+	mmesa->new_state |= MGA_NEW_TEXTURE;
 }
 
 /*
  * mgaBindTexture
  */      
 void mgaBindTexture( GLcontext *ctx, GLenum target,
-		     struct gl_texture_object *tObj ) {
+		     struct gl_texture_object *tObj ) 
+{
+	mgaContextPtr mmesa = MGA_CONTEXT( ctx );
 
 	mgaMsg( 10, "mgaBindTexture( %p )\n", tObj );
-		
+
+	FLUSH_BATCH(mmesa);
+
+	if (mmesa->CurrentTexObj[ctx->Texture.CurrentUnit]) {
+		mmesa->CurrentTexObj[ctx->Texture.CurrentUnit]->bound = 0;
+		mmesa->CurrentTexObj[ctx->Texture.CurrentUnit] = 0;  
+	}
+
 	/* force the texture state to be updated 
 	 */
-	MGA_CONTEXT(ctx)->CurrentTexObj[0] = NULL;  
 	MGA_CONTEXT(ctx)->new_state |= MGA_NEW_TEXTURE;
 }
 
 /*
  * mgaDeleteTexture
  */      
-void mgaDeleteTexture( GLcontext *ctx, struct gl_texture_object *tObj ) {
+void mgaDeleteTexture( GLcontext *ctx, struct gl_texture_object *tObj ) 
+{
+	mgaContextPtr mmesa = MGA_CONTEXT( ctx );
+	mgaTextureObjectPtr t = (mgaTextureObjectPtr)tObj->DriverData;
 
 	mgaMsg( 10, "mgaDeleteTexture( %p )\n", tObj );
 	
-	/* delete our driver data */
-	if ( tObj->DriverData ) {
-		mgaContextPtr mmesa = MGA_CONTEXT( ctx );
-		mgaDestroyTexObj( mmesa,
-				  (mgaTextureObjectPtr)(tObj->DriverData) );
+	if ( t ) {
+		if (t->bound) {
+			FLUSH_BATCH(mmesa);
+			mmesa->CurrentTexObj[t->bound-1] = 0;
+			mmesa->new_state |= MGA_NEW_TEXTURE;
+		}
+
+		mgaDestroyTexObj( mmesa, t );
 		mmesa->new_state |= MGA_NEW_TEXTURE;
 	}
 }
Index: xc/lib/GL/mesa/src/drv/mga/mgatex.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgatex.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgatex.h:1.3
--- xc/lib/GL/mesa/src/drv/mga/mgatex.h:1.1	Fri Feb 11 09:25:40 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgatex.h	Thu Jun 22 09:59:24 2000
@@ -24,11 +24,11 @@
  *    John Carmack <johnc@idsoftware.com>
  *    Keith Whitwell <keithw@precisioninsight.com>
  */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatex.h,v 1.3 2000/06/22 16:59:24 tsi Exp $ */
 
 #ifndef MGATEX_INC
 #define MGATEX_INC
 
-#include "mga_drm_public.h"
 #include "types.h"
 #include "mgacommon.h"
 #include "mm.h"
@@ -48,7 +48,9 @@
         mgaUI32         dirty_images;
 	mgaUI32		totalSize;		
 	int		texelBytes;
-	mgaUI32 	age;   			
+	mgaUI32 	age;
+        int             bound;
+        int             heap;	/* agp or card */
         mgaUI32         Setup[MGA_TEX_SETUP_SIZE];
 } mgaTextureObject_t;
 
@@ -69,7 +71,8 @@
 
 /* Driver functions which are called directly from mesa */
 
-void mgaTexEnv( GLcontext *ctx, GLenum pname, const GLfloat *param );
+void mgaTexEnv( GLcontext *ctx, GLenum target, GLenum pname,
+                const GLfloat *param );
 
 void mgaTexImage( GLcontext *ctx, GLenum target,
 		  struct gl_texture_object *tObj, GLint level,
@@ -96,7 +99,7 @@
 
 GLboolean mgaIsTextureResident( GLcontext *ctx, struct gl_texture_object *t );
 
-void mgaConvertTexture( mgaUI32 *destPtr, int texelBytes,
+void mgaConvertTexture( mgaUI32 *dest, int texelBytes,
 			struct gl_texture_image *image,
 			int x, int y, int width, int height );
 
@@ -107,9 +110,7 @@
 
 
 
-void mgaResetGlobalLRU( mgaContextPtr mmesa );
-void mgaTexturesGone( mgaContextPtr mmesa, GLuint offset, 
-		      GLuint size, GLuint in_use );
+void mgaAgeTextures( mgaContextPtr mmesa, int heap );
 
 void mgaDDInitTextureFuncs( GLcontext *ctx );
 
Index: xc/lib/GL/mesa/src/drv/mga/mgatris.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgatris.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgatris.c:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgatris.c:1.1	Fri Feb 11 09:25:40 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgatris.c	Fri Jun 16 17:03:02 2000
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <math.h>
 
+#include "types.h"
 #include "vb.h"
 #include "pipeline.h"
 
@@ -122,34 +123,14 @@
    init_twoside_offset();
    init_twoside_offset_flat();
 
-   /* Hmmm...
-    */
-   for (i = 0 ; i < 0x20 ; i++) {
-      if (i & ~MGA_FLAT_BIT) {
-	 points_tab[i] = points_tab[i&MGA_FLAT_BIT];
-	 line_tab[i] = line_tab[i&MGA_FLAT_BIT];
-      }
-   }
-
    for (i = 0 ; i < 0x20 ; i++) 
-      if ((i & (MGA_NODRAW_BIT|MGA_FALLBACK_BIT)) == MGA_NODRAW_BIT ||
-	  mgaglx.nullprims) 
+      if ((i & (MGA_NODRAW_BIT|MGA_FALLBACK_BIT)) == MGA_NODRAW_BIT)
       {
 	 quad_tab[i] = mga_null_quad; 
 	 tri_tab[i] = mga_null_triangle; 
 	 line_tab[i] = mga_null_line;
 	 points_tab[i] = mga_null_points;
       }
-
-   if (mgaglx.noFallback) {
-      for (i = 0 ; i < 0x10 ; i++) {
-	 points_tab[i|MGA_FALLBACK_BIT] = points_tab[i];
-	 line_tab[i|MGA_FALLBACK_BIT] = line_tab[i];
-	 tri_tab[i|MGA_FALLBACK_BIT] = tri_tab[i];
-	 quad_tab[i|MGA_FALLBACK_BIT] = quad_tab[i];
-      }
-   }
-
 }
 
 
@@ -161,51 +142,62 @@
 {
    mgaContextPtr mmesa = MGA_CONTEXT( ctx );
    GLuint flags = ctx->TriangleCaps;
+
+   if (mmesa->Fallback)
+      return;
 
-   ctx->IndirectTriangles &= ~DD_SW_RASTERIZE;
+   mmesa->IndirectTriangles = 0;
 
    if (flags) {
       GLuint ind = 0;
       GLuint shared = 0;
-      GLuint fallback = MGA_FALLBACK_BIT;
-
-      if (mgaglx.noFallback) fallback = 0;
 
       if (flags & DD_Z_NEVER)                      shared |= MGA_NODRAW_BIT;
       if (flags & DD_FLATSHADE)                    shared |= MGA_FLAT_BIT;
-      if (flags & DD_MULTIDRAW)                    shared |= fallback;
-      if (flags & (DD_SELECT|DD_FEEDBACK))         shared |= MGA_FALLBACK_BIT;
+      if (flags & (DD_MULTIDRAW|
+		   DD_SELECT|
+		   DD_FEEDBACK))                   shared |= MGA_FALLBACK_BIT;
       if (flags & DD_STENCIL)                      shared |= MGA_FALLBACK_BIT;
 
       ind = shared;
+#if 0
       if (flags & DD_POINT_SMOOTH)                 ind |= MGA_ANTIALIAS_BIT;
-      if (flags & DD_POINT_ATTEN)                  ind |= fallback;
+#else
+      if (flags & DD_POINT_SMOOTH)                 ind |= MGA_FALLBACK_BIT;
+#endif
 
       mmesa->renderindex = ind;
       mmesa->PointsFunc = points_tab[ind];
       if (ind & MGA_FALLBACK_BIT) 
-	 ctx->IndirectTriangles |= DD_POINT_SW_RASTERIZE;
+	 mmesa->IndirectTriangles |= DD_POINT_SW_RASTERIZE;
 
       ind = shared;
+#if 0
       if (flags & DD_LINE_SMOOTH)                   ind |= MGA_ANTIALIAS_BIT;
-      if (flags & DD_LINE_STIPPLE)                  ind |= fallback;
+#else
+      if (flags & DD_LINE_SMOOTH)                   ind |= MGA_FALLBACK_BIT;
+#endif
+      if (flags & DD_LINE_STIPPLE)                  ind |= MGA_FALLBACK_BIT;
 
       mmesa->renderindex |= ind;
       mmesa->LineFunc = line_tab[ind];
       if (ind & MGA_FALLBACK_BIT) 
-	 ctx->IndirectTriangles |= DD_LINE_SW_RASTERIZE;
+	 mmesa->IndirectTriangles |= DD_LINE_SW_RASTERIZE;
 
       ind = shared;
       if (flags & DD_TRI_SMOOTH)                    ind |= MGA_ANTIALIAS_BIT;
       if (flags & DD_TRI_OFFSET)                    ind |= MGA_OFFSET_BIT;
       if (flags & DD_TRI_LIGHT_TWOSIDE)             ind |= MGA_TWOSIDE_BIT;
-      if (flags & (DD_TRI_UNFILLED|DD_TRI_STIPPLE)) ind |= fallback;	
+      if (flags & DD_TRI_UNFILLED)                  ind |= MGA_FALLBACK_BIT;
+      if ((flags & DD_TRI_STIPPLE) &&
+	  (ctx->IndirectTriangles & DD_TRI_STIPPLE)) ind |= MGA_FALLBACK_BIT;	
 
       mmesa->renderindex |= ind;
       mmesa->TriangleFunc = tri_tab[ind];
       mmesa->QuadFunc = quad_tab[ind];
       if (ind & MGA_FALLBACK_BIT)
-	 ctx->IndirectTriangles |= (DD_TRI_SW_RASTERIZE | DD_QUAD_SW_RASTERIZE);
+	 mmesa->IndirectTriangles |= (DD_TRI_SW_RASTERIZE | 
+				      DD_QUAD_SW_RASTERIZE);
    } 
    else if (mmesa->renderindex)
    {
Index: xc/lib/GL/mesa/src/drv/mga/mgatris.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgatris.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgatris.h:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgatris.h:1.1	Fri Feb 11 09:25:40 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgatris.h	Fri Jun 16 17:03:02 2000
@@ -34,26 +34,16 @@
 
 
 /* Todo: 
- *    - multidraw, ...
  *    - Antialiasing (?)
  *    - line and polygon stipple
- *    - select and feedback 
  *    - stencil 
- *    - point parameters
- *    - 
  */
 #define MGA_ANTIALIAS_BIT   0       /* ignored for now, no fallback */
-#define MGA_FLAT_BIT	0x1
-#define MGA_OFFSET_BIT	0x2	/* 3.1 only */
-#define MGA_TWOSIDE_BIT	0x4	/* 3.1 only */
-#define MGA_NODRAW_BIT	0x8
-#define MGA_FALLBACK_BIT	0x10
-
-/* Not in use:
- */
-#define MGA_FEEDBACK_BIT    0x20
-#define MGA_SELECT_BIT      0x40
-#define MGA_POINT_PARAM_BIT 0x80	/* not needed? */
+#define MGA_FLAT_BIT	    0x1
+#define MGA_OFFSET_BIT	    0x2	
+#define MGA_TWOSIDE_BIT	    0x4	
+#define MGA_NODRAW_BIT	    0x8
+#define MGA_FALLBACK_BIT    0x10
 
 
 
Index: xc/lib/GL/mesa/src/drv/mga/mgatritmp.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgatritmp.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgatritmp.h:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgatritmp.h:1.1	Fri Feb 11 09:25:40 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgatritmp.h	Fri Jun 16 17:03:02 2000
@@ -98,19 +98,31 @@
 }
 
 
-#if ((IND & ~MGA_FLAT_BIT) == 0)
-
 static void TAG(line)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint pv )
 {
    mgaContextPtr mmesa = MGA_CONTEXT( ctx );
    mgaVertexPtr mgaVB = MGA_DRIVER_DATA(ctx->VB)->verts;
    float width = ctx->Line.Width;
 
-   if (IND & MGA_FLAT_BIT) {
+   if (IND & (MGA_TWOSIDE_BIT|MGA_FLAT_BIT)) {
       mgaVertex tmp0 = mgaVB[v0];
       mgaVertex tmp1 = mgaVB[v1];
-      *(int *)&tmp0.warp1.color = *(int *)&mgaVB[pv].warp1.color;
-      *(int *)&tmp1.warp1.color = *(int *)&mgaVB[pv].warp1.color;
+
+      if (IND & MGA_TWOSIDE_BIT) {
+	 GLubyte (*vbcolor)[4] = ctx->VB->ColorPtr->data;
+
+	 if (IND & MGA_FLAT_BIT) {
+ 	    MGA_COLOR((char *)&tmp0.warp1.color,vbcolor[pv]);
+	    *(int *)&tmp1.warp1.color = *(int *)&tmp0.warp1.color;
+	 } else {
+	    MGA_COLOR((char *)&tmp0.warp1.color,vbcolor[v0]);
+	    MGA_COLOR((char *)&tmp1.warp1.color,vbcolor[v1]);
+	 }
+
+      } else {
+	 *(int *)&tmp0.warp1.color = *(int *)&mgaVB[pv].warp1.color;
+	 *(int *)&tmp1.warp1.color = *(int *)&mgaVB[pv].warp1.color;
+      }
       mga_draw_line( mmesa, &tmp0, &tmp1, width );
    }
    else
@@ -125,13 +137,20 @@
    mgaVertexPtr mgaVB = MGA_DRIVER_DATA(VB)->verts;
    GLfloat sz = ctx->Point.Size * .5;
    int i;
-
+   
    for(i=first;i<=last;i++) 
-      if(VB->ClipMask[i]==0) 
-	 mga_draw_point( mmesa, &mgaVB[i], sz );
+      if(VB->ClipMask[i]==0) {
+	 if (IND & MGA_TWOSIDE_BIT) {	
+	    GLubyte (*vbcolor)[4] = VB->ColorPtr->data;
+	    mgaVertex tmp0 = mgaVB[i];
+	    MGA_COLOR((char *)&tmp0.warp1.color, vbcolor[i]);
+	    mga_draw_point( mmesa, &tmp0, sz );
+	 } else
+	    mga_draw_point( mmesa, &mgaVB[i], sz );
+      }
 }
+
 
-#endif
 
 
 static void TAG(init)( void )
@@ -139,10 +158,9 @@
    tri_tab[IND] = TAG(triangle);
    quad_tab[IND] = TAG(quad);
 
-#if ((IND & ~MGA_FLAT_BIT) == 0) 
    line_tab[IND] = TAG(line);
    points_tab[IND] = TAG(points);
-#endif
+
 }
 
 
Index: xc/lib/GL/mesa/src/drv/mga/mgavb.c
diff -u xc/lib/GL/mesa/src/drv/mga/mgavb.c:1.1 xc/lib/GL/mesa/src/drv/mga/mgavb.c:1.3
--- xc/lib/GL/mesa/src/drv/mga/mgavb.c:1.1	Fri Feb 11 09:25:40 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgavb.c	Mon Jun 19 22:08:41 2000
@@ -100,11 +100,11 @@
    mgaVertexPtr v;							\
    GLfloat (*tc0)[4];							\
    GLfloat (*tc1)[4];							\
-   GLfloat xoffset = 0.5 + mmesa->drawX;		\
-   GLfloat yoffset = mmesa->driDrawable->h - 0.5 + mmesa->drawY;	\
+   GLfloat xoffset = mmesa->drawX + SUBPIXEL_X;				\
+   GLfloat yoffset = mmesa->driDrawable->h + mmesa->drawY + SUBPIXEL_Y;	\
    int i;								\
    (void) xoffset; (void) yoffset;					\
-									\
+   if (0) fprintf(stderr, "V");						\
    gl_import_client_data( VB, VB->ctx->RenderFlags,			\
 			  (VB->ClipOrMask				\
 			   ? VEC_WRITABLE|VEC_GOOD_STRIDE		\
@@ -260,10 +260,21 @@
    mmesa->tex_dest[0] = MGA_TEX0_BIT;
    mmesa->tex_dest[1] = MGA_TEX1_BIT;
    mmesa->multitex = 0;
+   mmesa->blend_flags &= ~MGA_BLEND_MULTITEX;
 
    if (ctx->Texture.Enabled & 0xf) {
+      /* This doesn't work for non-RGBA textures
       if (ctx->Texture.Unit[0].EnvMode == GL_REPLACE)
 	 funcindex &= ~MGA_RGBA_BIT;
+      */
+      if (ctx->Texture.Unit[0].EnvMode == GL_BLEND &&
+	  mmesa->envcolor) 
+      {
+	 mmesa->multitex = 1;
+	 mmesa->vertsize = 10;
+	 mmesa->tmu_source[1] = 0;
+	 funcindex |= MGA_TEX1_BIT;
+      }	 
 
       funcindex |= MGA_TEX0_BIT;
    }
@@ -272,20 +283,37 @@
       if (ctx->Texture.Enabled & 0xf) {
 	 mmesa->multitex = 1;
 	 mmesa->vertsize = 10;
-	 funcindex |= MGA_TEX1_BIT;
+	 mmesa->blend_flags |= MGA_BLEND_MULTITEX;
+	 funcindex |= MGA_TEX1_BIT;	 
       } else {
 	 /* Just a funny way of doing single texturing 
 	  */
 	 mmesa->tmu_source[0] = 1;
 	 mmesa->tex_dest[1] = MGA_TEX0_BIT;
 
+         /* This doesn't work for non-RGBA textures
 	 if (ctx->Texture.Unit[1].EnvMode == GL_REPLACE)
 	    funcindex &= ~MGA_RGBA_BIT;
+         */
+
+	 if (ctx->Texture.Unit[0].EnvMode == GL_BLEND &&
+	     mmesa->envcolor) 
+	 {
+	    mmesa->multitex = 1;
+	    mmesa->vertsize = 10;
+	    mmesa->tmu_source[1] = 1;
+	    funcindex |= MGA_TEX1_BIT;
+	 }	 
 
 	 funcindex |= MGA_TEX0_BIT;
       }
    }
 
+   /* Not really a good place to do this - need to make the mga state
+    * management code more event-driven so this can be calculated for
+    * free.
+    */
+
    if (ctx->Color.BlendEnabled)
       funcindex |= MGA_ALPHA_BIT;
 
@@ -298,6 +326,7 @@
    if (0)
       mgaPrintSetupFlags("xsmesa: full setup function", funcindex); 
 
+   mmesa->dirty |= MGA_UPLOAD_PIPE;
    mmesa->setupindex = funcindex;
 
    /* Called by mesa's clip functons:
@@ -477,17 +506,3 @@
 }
 
 
-mgaUI32 *mgaAllocVertexDwords( mgaContextPtr mmesa, int dwords )
-{
-   int bytes = dwords * 4;
-   mgaUI32 *head;
-
-   if (mmesa->dma_buffer->used + bytes > mmesa->dma_buffer->total)
-      mgaFlushVertices( mmesa );
-
-   head = (mgaUI32 *)((char *)mmesa->dma_buffer->address + 
-		      mmesa->dma_buffer->used);
-
-   mmesa->dma_buffer->used += bytes;
-   return head;
-}
Index: xc/lib/GL/mesa/src/drv/mga/mgavb.h
diff -u xc/lib/GL/mesa/src/drv/mga/mgavb.h:1.1 xc/lib/GL/mesa/src/drv/mga/mgavb.h:1.2
--- xc/lib/GL/mesa/src/drv/mga/mgavb.h:1.1	Fri Feb 11 09:25:41 2000
+++ xc/lib/GL/mesa/src/drv/mga/mgavb.h	Fri Jun 16 17:03:02 2000
@@ -27,6 +27,7 @@
 #ifndef MGAVB_INC
 #define MGAVB_INC
 
+#include "types.h"
 #include "vb.h"
 #include "mgacommon.h"
 
@@ -124,9 +125,6 @@
 extern void mgaDDResizeVB( struct vertex_buffer *VB, GLuint size );
 
 extern void mgaDDSetupInit( void );
-
-
-extern mgaUI32 *mgaAllocVertexDwords( mgaContextPtr mmesa, int dwords );
 
 
 #endif
Index: xc/lib/GL/mesa/src/drv/r128/Imakefile
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/Imakefile:1.4
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/Imakefile	Sun Jun 25 22:41:29 2000
@@ -0,0 +1,332 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.4 2000/06/26 05:41:29 martin Exp $
+
+#include <Threads.tmpl>
+
+#define DoNormalLib NormalLibGlx
+#define DoSharedLib SharedLibGlx
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#ifdef i386Architecture
+#ifdef MesaUse3DNow
+  ASM_DEFINES = -DUSE_MMX_ASM -DUSE_X86_ASM -DUSE_3DNOW_ASM
+#else
+  ASM_DEFINES = -DUSE_MMX_ASM -DUSE_X86_ASM
+#endif
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DDRIVERTS
+ DRI_INCLUDES = -I../../../../dri \
+		-I../../../../glx \
+		-I../../../dri \
+		-I$(TOP)/include \
+		-I$(TOP)/include/GL \
+		-I$(XF86OSSRC) \
+		-I$(XF86COMSRC) \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86DRIVERSRC)/r128 \
+		-I../../../include \
+		-I../.. \
+		-I../../X \
+		-I../common
+#endif
+
+LinkSourceFile(mm.c, ../common)
+LinkSourceFile(mm.h, ../common)
+LinkSourceFile(hwlog.c, ../common)
+LinkSourceFile(hwlog.h, ../common)
+
+MESA_INCLUDES = -I. -I.. -I../../include
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFINES)
+     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+     R128SRCS = r128_cce.c \
+		r128_clear.c \
+		r128_context.c \
+		r128_dd.c \
+		r128_fastpath.c \
+		r128_pipeline.c \
+                r128_screen.c \
+		r128_span.c \
+		r128_state.c \
+		r128_swap.c \
+		r128_tex.c \
+		r128_tris.c \
+		r128_vb.c \
+		r128_xmesa.c
+
+     R128OBJS = r128_cce.o \
+		r128_clear.o \
+		r128_context.o \
+		r128_dd.o \
+		r128_fastpath.o \
+		r128_pipeline.o \
+                r128_screen.o \
+		r128_span.o \
+		r128_state.o \
+		r128_swap.o \
+		r128_tex.o \
+		r128_tris.o \
+		r128_vb.o \
+		r128_xmesa.o
+
+#if !GlxUseBuiltInDRIDriver
+      DRISRCS = ../../../dri/dri_mesa.c \
+		../../../../dri/dri_tmm.c
+
+      DRIOBJS = ../../../dri/dri_mesa.o \
+		../../../../dri/dri_tmm.o
+
+      DRMSRCS = ../../../../dri/drm/xf86drm.c \
+		../../../../dri/drm/xf86drmHash.c \
+		../../../../dri/drm/xf86drmRandom.c \
+		../../../../dri/drm/xf86drmSL.c \
+		../../../../dri/drm/xf86drmR128.c
+
+      DRMOBJS = ../../../../dri/drm/xf86drm.o \
+		../../../../dri/drm/xf86drmHash.o \
+		../../../../dri/drm/xf86drmRandom.o \
+		../../../../dri/drm/xf86drmSL.o \
+		../../../../dri/drm/xf86drmR128.o
+
+     MESASRCS = ../../aatriangle.c \
+		../../accum.c \
+		../../alpha.c \
+		../../alphabuf.c \
+		../../attrib.c \
+		../../bbox.c \
+		../../bitmap.c \
+		../../blend.c \
+		../../buffers.c \
+		../../clip.c \
+		../../colortab.c \
+		../../config.c \
+		../../context.c \
+		../../copypix.c \
+		../../cva.c \
+		../../debug_xform.c \
+		../../depth.c \
+		../../dlist.c \
+		../../drawpix.c \
+		../../enable.c \
+		../../enums.c \
+		../../eval.c \
+		../../extensions.c \
+		../../feedback.c \
+		../../fog.c \
+		../../get.c \
+		../../glapi.c \
+		../../glapinoop.c \
+		../../glthread.c \
+		../../hash.c \
+		../../image.c \
+		../../imaging.c \
+		../../light.c \
+		../../lines.c \
+		../../logic.c \
+		../../masking.c \
+		../../matrix.c \
+		../../mem.c \
+		../../mmath.c \
+		../../pb.c \
+		../../pipeline.c \
+		../../pixel.c \
+		../../pixeltex.c \
+		../../points.c \
+		../../polygon.c \
+		../../quads.c \
+		../../rastpos.c \
+		../../readpix.c \
+		../../rect.c \
+		../../scissor.c \
+		../../shade.c \
+		../../span.c \
+		../../stages.c \
+		../../state.c \
+		../../stencil.c \
+		../../teximage.c \
+		../../texobj.c \
+		../../texstate.c \
+		../../texture.c \
+		../../texutil.c \
+		../../translate.c \
+		../../triangle.c \
+		../../varray.c \
+		../../vb.c \
+		../../vbcull.c \
+		../../vbfill.c \
+		../../vbindirect.c \
+		../../vbrender.c \
+		../../vbxform.c \
+		../../vector.c \
+		../../vertices.c \
+		../../winpos.c \
+		../../xform.c \
+		../../zoom.c
+
+     MESAOBJS = ../../aatriangle.o \
+		../../accum.o \
+		../../alpha.o \
+		../../alphabuf.o \
+		../../attrib.o \
+		../../bbox.o \
+		../../bitmap.o \
+		../../blend.o \
+		../../buffers.o \
+		../../clip.o \
+		../../colortab.o \
+		../../config.o \
+		../../context.o \
+		../../copypix.o \
+		../../cva.o \
+		../../debug_xform.o \
+		../../depth.o \
+		../../dlist.o \
+		../../drawpix.o \
+		../../enable.o \
+		../../enums.o \
+		../../eval.o \
+		../../extensions.o \
+		../../feedback.o \
+		../../fog.o \
+		../../get.o \
+		../../hash.o \
+		../../hint.o \
+		../../image.o \
+		../../imaging.o \
+		../../light.o \
+		../../lines.o \
+		../../logic.o \
+		../../masking.o \
+		../../matrix.o \
+		../../mem.o \
+		../../mmath.o \
+		../../pb.o \
+		../../pipeline.o \
+		../../pixel.o \
+		../../pixeltex.o \
+		../../points.o \
+		../../polygon.o \
+		../../quads.o \
+		../../rastpos.o \
+		../../readpix.o \
+		../../rect.o \
+		../../scissor.o \
+		../../shade.o \
+		../../span.o \
+		../../stages.o \
+		../../state.o \
+		../../stencil.o \
+		../../teximage.o \
+		../../texobj.o \
+		../../texstate.o \
+		../../texture.o \
+		../../texutil.o \
+		../../translate.o \
+		../../triangle.o \
+		../../varray.o \
+		../../vb.o \
+		../../vbcull.o \
+		../../vbfill.o \
+		../../vbindirect.o \
+		../../vbrender.o \
+		../../vbxform.o \
+		../../vector.o \
+		../../vertices.o \
+		../../winpos.o \
+		../../xform.o \
+		../../zoom.o
+
+#ifdef i386Architecture
+     X86_SRCS = ../../X86/x86.c \
+		../../X86/x86a.S \
+		../../X86/common_x86.c \
+		../../X86/common_x86asm.S \
+		../../X86/vertex.S
+
+     X86_OBJS = ../../X86/x86.o \
+		../../X86/x86a.o \
+		../../X86/common_x86.o \
+		../../X86/common_x86asm.o \
+		../../X86/vertex.o
+
+     MMX_SRCS = ../../X86/mmx_blend.S
+
+     MMX_OBJS = ../../X86/mmx_blend.o
+
+XCOMM Disabling 3Dnow code for the time being.
+#if 0
+   3DNOW_SRCS = ../../X86/3dnow.c \
+		../../X86/3dnow_norm_raw.S \
+		../../X86/3dnow_xform_masked1.S \
+		../../X86/3dnow_xform_masked2.S \
+		../../X86/3dnow_xform_masked3.S \
+		../../X86/3dnow_xform_masked4.S \
+		../../X86/3dnow_xform_raw1.S \
+		../../X86/3dnow_xform_raw2.S \
+		../../X86/3dnow_xform_raw3.S \
+		../../X86/3dnow_xform_raw4.S \
+		../../X86/vertex_3dnow.S
+
+   3DNOW_OBJS = ../../X86/3dnow.o \
+		../../X86/3dnow_norm_raw.o \
+		../../X86/3dnow_xform_masked1.o \
+		../../X86/3dnow_xform_masked2.o \
+		../../X86/3dnow_xform_masked3.o \
+		../../X86/3dnow_xform_masked4.o \
+		../../X86/3dnow_xform_raw1.o \
+		../../X86/3dnow_xform_raw2.o \
+		../../X86/3dnow_xform_raw3.o \
+		../../X86/3dnow_xform_raw4.o \
+		../../X86/vertex_3dnow.o
+#endif
+
+#endif
+#endif
+
+      ASMSRCS = $(X86_SRCS) $(MMX_SRCS) $(3DNOW_SRCS)
+      ASMOBJS = $(X86_OBJS) $(MMX_OBJS) $(3DNOW_OBJS)
+
+   COMMONSRCS = mm.c hwlog.c
+   COMMONOBJS = mm.o hwlog.o
+
+         SRCS = $(DRISRCS) $(DRMSRCS) $(MESASRCS) $(ASMSRCS) \
+		$(COMMONSRCS) $(R128SRCS)
+         OBJS = $(DRIOBJS) $(DRMOBJS) $(MESAOBJS) $(ASMOBJS) \
+		$(COMMONOBJS) $(R128OBJS)
+
+REQUIREDLIBS += -lm
+#if !GlxBuiltInMga
+REQUIREDLIBS += -L../../../.. -lGL
+#endif
+
+#if !GlxUseBuiltInDRIDriver
+#undef DoNormalLib NormalLibGlx
+#undef DoExtraLib SharedLibGlx
+#undef DoDebugLib DebugLibGlx
+#undef DoProfileLib ProfileLibGlx
+#endif
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = r128_dri.so
+ALL_OBJS = $(OBJS)
+ALL_DEPS = DONE
+SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+#endif
+
+DependTarget()
Index: xc/lib/GL/mesa/src/drv/r128/r128_cce.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_cce.c:1.2
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_cce.c	Sun Jun 25 22:41:29 2000
@@ -0,0 +1,330 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_cce.c,v 1.2 2000/06/26 05:41:29 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Gareth Hughes <gareth@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_state.h"
+#include "r128_reg.h"
+#include "r128_cce.h"
+
+#define R128_TIMEOUT        2000000
+
+r128_get_buffer_func		r128GetBufferLocked;
+r128_fire_vertices_func		r128FireVerticesLocked;
+
+
+static void r128RingStatus( r128ContextPtr r128ctx )
+{
+   r128ScreenPtr r128scrn = r128ctx->r128Screen;
+   unsigned char *R128MMIO = r128scrn->mmio;
+
+   fprintf( stderr, "GUI_STAT           = 0x%08x\n",
+	    (unsigned int) INREG( R128_GUI_STAT ) );
+   fprintf( stderr, "PM4_STAT           = 0x%08x\n",
+	    (unsigned int) INREG( R128_PM4_STAT ) );
+   fprintf( stderr, "PM4_BUFFER_DL_WPTR = 0x%08x\n",
+	    (unsigned int) INREG( R128_PM4_BUFFER_DL_WPTR ) );
+   fprintf( stderr, "PM4_BUFFER_DL_RPTR = 0x%08x\n",
+	    (unsigned int) INREG( R128_PM4_BUFFER_DL_RPTR ) );
+   fprintf( stderr, "ringWrite          = 0x%08x\n",
+	    r128scrn->SAREA->ringWrite );
+   fprintf( stderr, "*ringReadPtr       = 0x%08x\n",
+	    *r128scrn->ringReadPtr );
+}
+
+
+/* Get a new VB from the pool of vertex buffers in AGP space.
+ */
+static drmBufPtr r128_get_buffer_locked( r128ContextPtr r128ctx )
+{
+   int fd = r128ctx->r128Screen->driScreen->fd;
+   int num = 0;
+   int index = 0;
+   int size = 0;
+   int to = 0;
+   drmBufPtr buf = NULL;
+
+   while ( !buf && ( to++ < r128ctx->CCEtimeout ) ) {
+      num = drmR128GetVertexBuffers( fd, 1, &index, &size );
+
+      if ( num > 0 ) {
+	 buf = &r128ctx->r128Screen->vbBufs->list[index];
+	 buf->used = 0;
+#if ENABLE_PERF_BOXES
+	 /* Bump the performance counter */
+	 r128ctx->c_vertexBuffers++;
+#endif
+	 return buf;
+      }
+   }
+
+   if ( !buf ) {
+      drmR128EngineReset( fd );
+      fprintf( stderr, "Error: Could not get new VB... exiting\n" );
+      exit( -1 );
+   }
+
+   return buf;
+}
+
+static void r128_fire_vertices_locked( r128ContextPtr r128ctx )
+{
+   int vertsize = r128ctx->vertsize;
+   int format = r128ctx->vc_format;
+   int index = r128ctx->vert_buf->idx;
+   int offset = r128ctx->r128Screen->vbOffset +
+      index * r128ctx->r128Screen->vbBufSize;
+   int size = r128ctx->vert_buf->used / (vertsize * sizeof(GLuint));
+   int fd = r128ctx->r128Screen->driScreen->fd;
+   int to = 0;
+   int ret;
+   CARD32 prim;
+
+   prim = R128_CCE_VC_CNTL_PRIM_TYPE_TRI_LIST;
+
+   /* Send the vertex buffer to the hardware */
+   BEGIN_CLIP_LOOP( r128ctx );
+   {
+      R128CCE3( R128_CCE_PACKET3_3D_RNDR_GEN_INDX_PRIM, 3 );
+      R128CCE( offset );
+      R128CCE( size );
+      R128CCE( format );
+      R128CCE( prim | R128_CCE_VC_CNTL_PRIM_WALK_LIST |
+	       (size << R128_CCE_VC_CNTL_NUM_SHIFT) );
+
+      R128CCE_SUBMIT_PACKET();
+   }
+   END_CLIP_LOOP( r128ctx );
+
+   /* Tell the kernel to release the vertex buffer */
+   do {
+      ret = drmR128FlushVertexBuffers( fd, 1, &index, &size, 0 );
+   } while ( ( ret == -EBUSY ) && ( to++ < r128ctx->CCEtimeout ) );
+
+   if ( ret < 0 ) {
+      drmR128EngineReset( fd );
+      fprintf( stderr, "Error: Could not flush VB... exiting\n" );
+      exit( -1 );
+   }
+
+   r128ctx->vert_buf = NULL;
+}
+
+static drmBufPtr r128_get_ring_locked( r128ContextPtr r128ctx )
+{
+   r128ScreenPtr r128scrn = r128ctx->r128Screen;
+   drmBufPtr buf = NULL;
+
+   buf = (drmBufPtr) malloc( sizeof(*buf) );
+
+   buf->idx = -666;
+   buf->total = r128scrn->vbBufSize;
+   buf->used = 0;
+   buf->address = (drmAddress *) malloc( r128scrn->vbBufSize );
+
+#if ENABLE_PERF_BOXES
+   /* Bump the performance counter */
+   r128ctx->c_vertexBuffers++;
+#endif
+
+   return buf;
+}
+
+static void r128_fire_ring_locked( r128ContextPtr r128ctx )
+{
+   int vertsize = r128ctx->vertsize;
+   int format = r128ctx->vc_format;
+   int size = r128ctx->vert_buf->used / (vertsize * sizeof(GLuint));
+   drmBufPtr buf = r128ctx->vert_buf;
+   int dwords = buf->used >> 2;
+   CARD32 prim;
+
+   prim = R128_CCE_VC_CNTL_PRIM_TYPE_TRI_LIST;
+
+   /* Send the vertex buffer to the hardware */
+   BEGIN_CLIP_LOOP( r128ctx );
+   {
+      R128CCE3( R128_CCE_PACKET3_3D_RNDR_GEN_PRIM, dwords + 1 );
+      R128CCE( format );
+      R128CCE( prim | R128_CCE_VC_CNTL_PRIM_WALK_RING |
+	       (size << R128_CCE_VC_CNTL_NUM_SHIFT) );
+
+      memcpy( &r128ctx->CCEbuf[r128ctx->CCEcount], buf->address, buf->used );
+      r128ctx->CCEcount += dwords;
+
+      R128CCE_SUBMIT_PACKET();
+   }
+   END_CLIP_LOOP( r128ctx );
+
+   free( buf->address );
+   free( buf );
+
+   r128ctx->vert_buf = NULL;
+}
+
+/* Allocate some space in the current vertex buffer.  If the current
+ * buffer is full, flush it and grab another one.
+ */
+CARD32 *r128AllocVertexDwords( r128ContextPtr r128ctx, int dwords )
+{
+	return r128AllocVertexDwordsInlined( r128ctx, dwords );
+}
+
+
+/* ================================================================ */
+
+
+void r128GetEltBufLocked( r128ContextPtr r128ctx )
+{
+#if 0
+   r128ctx->elt_buf = r128GetBufferLocked( r128ctx );
+#endif
+}
+
+void r128FireEltsLocked( r128ContextPtr r128ctx,
+			 GLuint num_elts, GLuint discard )
+{
+#if 0
+   r128ScreenPtr r128scrn = r128ctx->r128Screen;
+   int vertsize = r128ctx->vertsize;
+   int format = r128ctx->vc_format;
+
+   int index = r128ctx->elt_buf->idx;
+   int offset = r128scrn->vbOffset;
+   int total = r128scrn->vbRgn.size / (vertsize * sizeof(GLuint));
+   int size = r128ctx->elt_buf->used / (vertsize * sizeof(GLuint));
+
+   int fd = r128scrn->driScreen->fd;
+   int to = 0;
+   int ret;
+   CARD32 prim;
+
+   fprintf( stderr, "%s: ofs=0x%x sz=0x%x tot=%d elts=%d discard=%d\n",
+	    __FUNCTION__, offset, size, total, num_elts, discard );
+
+   prim = R128_CCE_VC_CNTL_PRIM_TYPE_TRI_LIST;
+
+   /* Send the vertex buffer to the hardware */
+   BEGIN_CLIP_LOOP( r128ctx );
+   {
+      R128CCE3( R128_CCE_PACKET3_3D_RNDR_GEN_INDX_PRIM, 3 );
+      R128CCE( offset );
+      R128CCE( size );
+      R128CCE( format );
+      R128CCE( prim | R128_CCE_VC_CNTL_PRIM_WALK_IND |
+	       (num_elts << R128_CCE_VC_CNTL_NUM_SHIFT) );
+
+      /* GTH: We really need indirect buffers for this... */
+
+      R128CCE_SUBMIT_PACKET();
+   }
+   END_CLIP_LOOP( r128ctx );
+
+   if ( discard ) {
+      /* Tell the kernel to release the vertex buffer */
+      do {
+	 ret = drmR128FlushVertexBuffers( fd, 1, &index, &size, 0 );
+      } while ( ( ret == -EBUSY ) && ( to++ < r128ctx->CCEtimeout ) );
+
+      if ( ret < 0 ) {
+	 drmR128EngineReset( fd );
+	 fprintf( stderr, "Error: Could not flush VB... exiting\n" );
+	 exit( -1 );
+      }
+   }
+
+   r128ctx->vert_buf = NULL;
+#endif
+}
+
+void r128FlushEltsLocked( r128ContextPtr r128ctx )
+{
+#if 0
+   if ( r128ctx->first_elt != r128ctx->next_elt ) {
+      r128FireEltsLocked( r128ctx,
+			  (GLuint)r128ctx->next_elt -
+			  (GLuint)r128ctx->first_elt,
+			  0 );
+      r128ctx->first_elt = r128ctx->next_elt;
+   }
+#endif
+}
+
+void r128ReleaseBufLocked( r128ContextPtr r128ctx, drmBufPtr buffer )
+{
+#if 0
+   int index;
+   int size;
+   int fd = r128ctx->r128Screen->driScreen->fd;
+   int to = 0;
+   int ret;
+
+   if ( !buffer ) return;
+
+   index = buffer->idx;
+   size = buffer->used = 0;
+
+   /* Tell the kernel to release the vertex buffer */
+   do {
+      ret = drmR128FlushVertexBuffers( fd, 1, &index, &size, 0 );
+   } while ( ( ret == -EBUSY ) && ( to++ < r128ctx->CCEtimeout ) );
+
+   if ( ret < 0 ) {
+      drmR128EngineReset( fd );
+      fprintf( stderr, "Error: Could not release VB... exiting\n" );
+      exit( -1 );
+   }
+#endif
+}
+
+
+void r128InitVertexBuffers( r128ScreenPtr r128scrn )
+{
+   if ( !r128scrn->IsPCI ) {
+      r128GetBufferLocked = r128_get_buffer_locked;
+      r128FireVerticesLocked = r128_fire_vertices_locked;
+   } else {
+      r128GetBufferLocked = r128_get_ring_locked;
+      r128FireVerticesLocked = r128_fire_ring_locked;
+   }
+
+   /* Provide a fallback for Rage 128 Pro cards until we fix the lockups */
+   if (getenv("LIBGL_USE_RING_VB")) {
+      r128GetBufferLocked = r128_get_ring_locked;
+      r128FireVerticesLocked = r128_fire_ring_locked;
+   }
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_cce.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_cce.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_cce.h	Fri Jun 16 17:03:04 2000
@@ -0,0 +1,203 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_cce.h,v 1.1 2000/06/17 00:03:04 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Gareth Hughes <gareth@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_CCE_H_
+#define _R128_CCE_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+#include "r128_dri.h"
+#include "r128_reg.h"
+#include "r128_lock.h"
+#include "r128_xmesa.h"
+
+#include "xf86drmR128.h"
+
+#define R128_DEFAULT_TOTAL_CCE_TIMEOUT 1000000 /* usecs */
+
+typedef union {
+    float f;
+    int   i;
+} floatTOint;
+
+/* Insert an integer value into the CCE ring buffer. */
+#define R128CCE(v)				\
+do {						\
+   r128ctx->CCEbuf[r128ctx->CCEcount] = (v);	\
+   r128ctx->CCEcount++;				\
+} while (0)
+
+/* Insert an floating point value into the CCE ring buffer. */
+#define R128CCEF(v)				\
+do {						\
+   floatTOint fTi;				\
+   fTi.f = (v);					\
+   r128ctx->CCEbuf[r128ctx->CCEcount] = fTi.i;	\
+   r128ctx->CCEcount++;				\
+} while (0)
+
+/* Insert a type-[0123] packet header into the ring buffer */
+#define R128CCE0(p,r,n)   R128CCE((p) | ((n) << 16) | ((r) >> 2))
+#define R128CCE1(p,r1,r2) R128CCE((p) | (((r2) >> 2) << 11) | ((r1) >> 2))
+#define R128CCE2(p)       R128CCE((p))
+#define R128CCE3(p,n)     R128CCE((p) | ((n) << 16))
+
+#define R128CCE_SUBMIT_PACKET()						  \
+do {									  \
+   r128SubmitPacketLocked( r128ctx, r128ctx->CCEbuf, r128ctx->CCEcount ); \
+   r128ctx->CCEcount = 0;						  \
+} while (0)
+
+static __inline void r128SubmitPacketLocked( r128ContextPtr r128ctx,
+					     CARD32 *buf, GLuint count )
+{
+   CARD32 *b;
+   int c = count;
+   int fd = r128ctx->r128Screen->driScreen->fd;
+   int to = 0;
+   int ret;
+
+   do {
+      b = buf + (count - c);
+      ret = drmR128SubmitPacket( fd, b, &c, 0 );
+   } while ( ( ret == -EBUSY ) && ( to++ < r128ctx->CCEtimeout ) );
+
+   if ( ret < 0 ) {
+      drmR128EngineReset( fd );
+      fprintf( stderr, "Error: Could not submit packet... exiting\n" );
+      exit( -1 );
+   }
+}
+
+static __inline void r128WaitForIdleLocked( r128ContextPtr r128ctx )
+{
+    int fd = r128ctx->r128Screen->driScreen->fd;
+    int to = 0;
+    int ret;
+
+    drmR128EngineFlush( fd );
+
+    do {
+	ret = drmR128WaitForIdle( fd );
+    } while ( ( ret == -EBUSY ) && ( to++ < r128ctx->CCEtimeout ) );
+
+    if ( ret < 0 ) {
+	drmR128EngineReset( fd );
+	fprintf( stderr, "Error: Rage 128 timed out... exiting\n" );
+	exit( -1 );
+    }
+}
+
+/* Vertex buffer handling functions:
+ */
+extern void r128InitVertexBuffers( r128ScreenPtr r128scrn );
+
+typedef drmBufPtr (*r128_get_buffer_func)( r128ContextPtr r128ctx );
+typedef void (*r128_fire_vertices_func)( r128ContextPtr r128ctx );
+
+extern r128_get_buffer_func		r128GetBufferLocked;
+extern r128_fire_vertices_func		r128FireVerticesLocked;
+
+extern CARD32 *r128AllocVertexDwords( r128ContextPtr r128ctx, int dwords );
+
+extern void r128GetEltBufLocked( r128ContextPtr r128ctx );
+extern void r128FlushEltsLocked( r128ContextPtr r128ctx );
+extern void r128FireEltsLocked( r128ContextPtr r128ctx,
+				GLuint num_elts, GLuint discard );
+extern void r128ReleaseBufLocked( r128ContextPtr r128ctx, drmBufPtr buffer );
+
+
+static __inline void r128FlushVerticesLocked( r128ContextPtr r128ctx )
+{
+    if ( r128ctx->vert_buf && r128ctx->vert_buf->used ) {
+       r128FireVerticesLocked( r128ctx );
+    }
+}
+
+static __inline CARD32 *r128AllocVertexDwordsInlined( r128ContextPtr r128ctx,
+						      int dwords )
+{
+    int bytes = dwords * 4;
+    CARD32 *head;
+
+    if ( !r128ctx->vert_buf ) {
+	LOCK_HARDWARE( r128ctx );
+#if 0
+	if ( r128ctx->first_elt != r128ctx->next_elt ) {
+	    r128FlushEltsLocked( r128ctx );
+	}
+#endif
+	r128ctx->vert_buf = r128GetBufferLocked( r128ctx );
+
+	UNLOCK_HARDWARE( r128ctx );
+    } else if ( r128ctx->vert_buf->used + bytes > r128ctx->vert_buf->total ) {
+	LOCK_HARDWARE( r128ctx );
+
+	r128FlushVerticesLocked( r128ctx );
+	r128ctx->vert_buf = r128GetBufferLocked( r128ctx );
+
+	UNLOCK_HARDWARE( r128ctx );
+    }
+
+    head = (CARD32 *)((char *)r128ctx->vert_buf->address +
+		      r128ctx->vert_buf->used);
+
+    r128ctx->vert_buf->used += bytes;
+    return head;
+}
+
+#define r128WaitForIdle( r128ctx )		\
+do {						\
+   LOCK_HARDWARE( r128ctx );			\
+   r128WaitForIdleLocked( r128ctx );		\
+   UNLOCK_HARDWARE( r128ctx );			\
+} while (0)
+
+#define r128FlushVertices( r128ctx )		\
+do {						\
+   LOCK_HARDWARE( r128ctx );			\
+   r128FlushVerticesLocked( r128ctx );		\
+   UNLOCK_HARDWARE( r128ctx );			\
+} while (0)
+
+#define r128FlushElts( r128ctx )		\
+do {						\
+   LOCK_HARDWARE( r128ctx );			\
+   r128FlushEltsLocked( r128ctx );		\
+   UNLOCK_HARDWARE( r128ctx );			\
+} while (0)
+
+#endif
+#endif /* _R128_CCE_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_clear.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_clear.c:1.2
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_clear.c	Sun Jun 25 22:41:29 2000
@@ -0,0 +1,223 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_clear.c,v 1.2 2000/06/26 05:41:29 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_reg.h"
+#include "r128_cce.h"
+#include "r128_state.h"
+#include "r128_vb.h"
+#include "r128_clear.h"
+
+/* Clear the depth buffer */
+void r128ClearDepthBuffer(r128ContextPtr r128ctx, GLboolean all,
+			  GLint cx, GLint cy, GLint cw, GLint ch)
+{
+    __DRIdrawablePrivate *dPriv    = r128ctx->driDrawable;
+    int                   nc;
+    XF86DRIClipRectPtr    c;
+    int                   dst_bpp;
+    CARD32                write_mask;
+
+    if (!(r128ctx->regs.tex_cntl_c & R128_Z_WRITE_ENABLE)) return;
+
+    switch (r128ctx->regs.z_sten_cntl_c & R128_Z_PIX_WIDTH_MASK) {
+    case R128_Z_PIX_WIDTH_16:
+	write_mask = 0x0000ffff;
+	dst_bpp    = R128_GMC_DST_16BPP;
+	break;
+    case R128_Z_PIX_WIDTH_24:
+	write_mask = 0x00ffffff;
+	dst_bpp    = R128_GMC_DST_32BPP;
+	break;
+    case R128_Z_PIX_WIDTH_32:
+	write_mask = 0xffffffff;
+	dst_bpp    = R128_GMC_DST_32BPP;
+	break;
+    default: return;
+    }
+
+#if ENABLE_PERF_BOXES
+    /* Bump the performance counter */
+    r128ctx->c_clears++;
+#endif
+
+    cx += dPriv->x;
+    cy  = dPriv->y + dPriv->h - cy - ch;
+
+    LOCK_HARDWARE(r128ctx);
+
+    /* Flush any outstanding vertex buffers */
+    r128FlushVerticesLocked(r128ctx);
+
+    /* Init the clip rects here in case they changed during the
+       LOCK_HARDWARE macro */
+    c  = dPriv->pClipRects;
+    nc = dPriv->numClipRects;
+
+    /* Set the write mask so that we _only_ clear the Z buffer */
+    R128CCE0(R128_CCE_PACKET0, R128_DP_WRITE_MASK, 0);
+    R128CCE(write_mask);
+
+    /* Cycle through the clip rects */
+    while (nc--) {
+	int x = c[nc].x1;
+	int y = c[nc].y1;
+	int w = c[nc].x2 - x;
+	int h = c[nc].y2 - y;
+
+	if (!all) {
+	    if (x < cx) w -= cx - x, x = cx;
+	    if (y < cy) h -= cy - y, y = cy;
+
+	    if (x + w > cx + cw) w = cx + cw - x;
+	    if (y + h > cy + ch) h = cy + ch - y;
+
+	    if (w <= 0 || h <= 0) continue;
+	}
+
+	x += r128ctx->r128Screen->depthX;
+	y += r128ctx->r128Screen->depthY;
+
+	R128CCE3(R128_CCE_PACKET3_CNTL_PAINT_MULTI, 3);
+	R128CCE(R128_GMC_BRUSH_SOLID_COLOR
+		| dst_bpp
+		| R128_GMC_SRC_DATATYPE_COLOR
+		| R128_ROP3_P
+		| R128_GMC_CLR_CMP_CNTL_DIS
+		| R128_GMC_AUX_CLIP_DIS);
+	R128CCE(r128ctx->ClearDepth);
+	R128CCE((x << 16) | y);
+	R128CCE((w << 16) | h);
+    }
+
+    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+    r128ctx->dirty_context |= (R128_CTX_MISC        |
+			       R128_CTX_ENGINESTATE |
+			       R128_CTX_ALPHASTATE);
+
+    R128CCE_SUBMIT_PACKET();
+
+    UNLOCK_HARDWARE(r128ctx);
+}
+
+/* Clear a color buffer */
+void r128ClearColorBuffer(r128ContextPtr r128ctx, GLboolean all,
+			  GLint cx, GLint cy, GLint cw, GLint ch,
+			  GLint drawX, GLint drawY)
+{
+    __DRIdrawablePrivate *dPriv    = r128ctx->driDrawable;
+    int                   nc;
+    XF86DRIClipRectPtr    c;
+    int                   dst_bpp;
+
+    switch (r128ctx->r128Screen->bpp) {
+    case 8:
+	dst_bpp = R128_GMC_DST_8BPP_CI;
+	break;
+    case 16:
+	if (r128ctx->r128Screen->depth == 15) dst_bpp = R128_GMC_DST_15BPP;
+	else                                  dst_bpp = R128_GMC_DST_16BPP;
+	break;
+    case 24:
+	dst_bpp = R128_GMC_DST_24BPP;
+	break;
+    case 32:
+    default:
+	dst_bpp = R128_GMC_DST_32BPP;
+	break;
+    }
+
+#if ENABLE_PERF_BOXES
+    /* Bump the performance counter */
+    r128ctx->c_clears++;
+#endif
+
+    cx += dPriv->x;
+    cy  = dPriv->y + dPriv->h - cy - ch;
+
+    LOCK_HARDWARE(r128ctx);
+
+    /* Flush any outstanding vertex buffers */
+    r128FlushVerticesLocked(r128ctx);
+
+    /* Init the clip rects here in case they changed during the
+       LOCK_HARDWARE macro */
+    c  = dPriv->pClipRects;
+    nc = dPriv->numClipRects;
+
+    /* Cycle through the clip rects */
+    while (nc--) {
+	int x = c[nc].x1;
+	int y = c[nc].y1;
+	int w = c[nc].x2 - x;
+	int h = c[nc].y2 - y;
+
+	if (!all) {
+	    if (x < cx) w -= cx - x, x = cx;
+	    if (y < cy) h -= cy - y, y = cy;
+
+	    if (x + w > cx + cw) w = cx + cw - x;
+	    if (y + h > cy + ch) h = cy + ch - h;
+
+	    if (w <= 0 || h <= 0) continue;
+	}
+
+	x += drawX;
+	y += drawY;
+
+	R128CCE3(R128_CCE_PACKET3_CNTL_PAINT_MULTI, 3);
+	R128CCE(R128_GMC_BRUSH_SOLID_COLOR
+		| dst_bpp
+		| R128_GMC_SRC_DATATYPE_COLOR
+		| R128_ROP3_P
+		| R128_GMC_CLR_CMP_CNTL_DIS
+		| R128_GMC_AUX_CLIP_DIS);
+	R128CCE(r128ctx->ClearColor);
+	R128CCE((x << 16) | y);
+	R128CCE((w << 16) | h);
+    }
+
+    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+    r128ctx->dirty_context |= (R128_CTX_MISC        |
+			       R128_CTX_ENGINESTATE |
+			       R128_CTX_ALPHASTATE);
+
+    R128CCE_SUBMIT_PACKET();
+
+    UNLOCK_HARDWARE(r128ctx);
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_clear.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_clear.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_clear.h	Fri Jun 16 17:03:04 2000
@@ -0,0 +1,47 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_clear.h,v 1.1 2000/06/17 00:03:04 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_CLEAR_H_
+#define _R128_CLEAR_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+extern void r128ClearDepthBuffer(r128ContextPtr r128ctx, GLboolean all,
+				 GLint x, GLint y, GLint width, GLint height);
+extern void r128ClearColorBuffer(r128ContextPtr r128ctx, GLboolean all,
+				 GLint x, GLint y, GLint width, GLint height,
+				 GLint drawX, GLint drawY);
+
+#endif
+#endif /* _R128_CLEAR_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_context.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_context.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_context.c	Fri Jun 16 17:03:04 2000
@@ -0,0 +1,224 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_context.c,v 1.1 2000/06/17 00:03:04 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include <stdlib.h>
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_cce.h"
+#include "r128_dd.h"
+#include "r128_state.h"
+#include "r128_span.h"
+#include "r128_tex.h"
+#include "r128_vb.h"
+#include "r128_pipeline.h"
+
+#include "context.h"
+#include "simple_list.h"
+
+/* Create the device specific context */
+GLboolean r128CreateContext(Display *dpy, GLvisual *glVisual,
+			    __DRIcontextPrivate *driContextPriv)
+{
+    r128ContextPtr  r128ctx;
+    r128ScreenPtr   r128scrn;
+    GLcontext      *glCtx    = driContextPriv->mesaContext;
+    int             i;
+    char           *v;
+
+    r128ctx = (r128ContextPtr)Xmalloc(sizeof(*r128ctx));
+    if (!r128ctx) return GL_FALSE;
+
+    /* Initialize r128Context */
+    r128ctx->glCtx         = glCtx;
+    r128ctx->display       = dpy;
+    r128ctx->driContext    = driContextPriv;
+    r128ctx->driDrawable   = NULL; /* Set by XMesaMakeCurrent */
+
+    r128scrn = r128ctx->r128Screen =
+	(r128ScreenPtr)(driContextPriv->driScreenPriv->private);
+
+    r128ctx->CurrentTexObj[0] = NULL;
+    r128ctx->CurrentTexObj[1] = NULL;
+    make_empty_list(&r128ctx->SwappedOut);
+    for (i = 0; i < r128scrn->NRTexHeaps; i++) {
+	make_empty_list(&r128ctx->TexObjList[i]);
+	r128ctx->texHeap[i] = mmInit(0, r128scrn->texSize[i]);
+	r128ctx->lastTexAge[i] = -1;
+    }
+
+    r128ctx->lastSwapAge      = 0;
+
+    r128ctx->useFastPath      = GL_FALSE;
+
+    r128ctx->vert_buf         = NULL;
+
+    r128ctx->CCEbuf           = (CARD32 *)malloc(sizeof(*r128ctx->CCEbuf) *
+						 r128scrn->ringEntries);
+    r128ctx->CCEcount         = 0;
+
+    if ((v = getenv("LIBGL_CCE_TIMEOUT")))
+	r128ctx->CCEtimeout   = strtoul(v, NULL, 10);
+    else
+	r128ctx->CCEtimeout   = (R128_DEFAULT_TOTAL_CCE_TIMEOUT /
+				 R128_DEFAULT_CCE_TIMEOUT);
+    if (r128ctx->CCEtimeout <= 0) r128ctx->CCEtimeout = 1;
+
+    /* Initialize GLcontext */
+    glCtx->DriverCtx = (void *)r128ctx;
+
+    r128DDInitExtensions(glCtx);
+
+    r128DDInitDriverFuncs(glCtx);
+    r128DDInitStateFuncs(glCtx);
+    r128DDInitSpanFuncs(glCtx);
+    r128DDInitTextureFuncs(glCtx);
+
+    /* Do this after initialization of r128ctx->Fallback in InitState().
+     */
+    if (getenv("LIBGL_SOFTWARE_RENDERING"))
+	r128ctx->Fallback  |= R128_FALLBACK_SWONLY;
+
+    /* KW: No vertex buffer code for PCI cards -- for now fallback to
+     * software always.
+     * GTH: There is support there, but I'm seeing strange behaviour
+     * with it enabled.  I'll leave the software fallbacks in place
+     * for now.
+     */
+    if (r128scrn->IsPCI)
+	r128ctx->Fallback  |= R128_FALLBACK_SWONLY;
+
+    if (getenv("LIBGL_NO_SOFTWARE_FALLBACKS"))
+	r128ctx->SWfallbackDisable = GL_TRUE;
+    else
+	r128ctx->SWfallbackDisable = GL_FALSE;
+
+    glCtx->Driver.TriangleCaps = (DD_TRI_CULL
+				  | DD_TRI_LIGHT_TWOSIDE
+				  | DD_TRI_OFFSET);
+
+    /* Reset Mesa's current 2D texture pointers to the driver's textures */
+    glCtx->Shared->DefaultD[2][0].DriverData = NULL;
+    glCtx->Shared->DefaultD[2][1].DriverData = NULL;
+
+    /* KW: Set the maximum texture size small enough that we can
+     * guarentee that both texture units can bind a maximal texture
+     * and have them both in on-card memory at once.  (Kevin or
+     * Gareth: Please check these numbers are OK)
+     */
+    if (r128scrn->texSize[0] < 2*1024*1024) {
+       glCtx->Const.MaxTextureLevels = 9;
+       glCtx->Const.MaxTextureSize = 1<<8;
+    } else if (r128scrn->texSize[0] < 8*1024*1024) {
+       glCtx->Const.MaxTextureLevels = 10;
+       glCtx->Const.MaxTextureSize = 1<<9;
+    } else {
+       glCtx->Const.MaxTextureLevels = 11;
+       glCtx->Const.MaxTextureSize = 1<<10;
+    }
+
+    glCtx->Const.MaxTextureUnits = 2;
+
+#if ENABLE_PERF_BOXES
+    if (getenv("LIBGL_PERFORMANCE_BOXES"))
+	r128ctx->boxes = 1;
+    else
+	r128ctx->boxes = 0;
+#endif
+
+    /* If Mesa has current a vertex buffer, make sure the driver's VB
+       data is up to date */
+    if (glCtx->VB) r128DDRegisterVB(glCtx->VB);
+
+    /* Register the fast path */
+    if (glCtx->NrPipelineStages)
+	glCtx->NrPipelineStages =
+	    r128RegisterPipelineStages(glCtx->PipelineStage,
+				       glCtx->PipelineStage,
+				       glCtx->NrPipelineStages);
+
+    r128DDInitState(r128ctx);
+
+    driContextPriv->driverPrivate = (void *)r128ctx;
+
+    return GL_TRUE;
+}
+
+/* Destroy the device specific context */
+void r128DestroyContext(r128ContextPtr r128ctx)
+{
+    if (r128ctx) {
+	r128TexObjPtr t, next_t;
+	int           i;
+
+	free(r128ctx->CCEbuf);
+
+	for (i = 0; i < r128ctx->r128Screen->NRTexHeaps; i++) {
+	    foreach_s (t, next_t, &r128ctx->TexObjList[i])
+		r128DestroyTexObj(r128ctx, t);
+	}
+
+	foreach_s (t, next_t, &r128ctx->SwappedOut)
+	    r128DestroyTexObj(r128ctx, t);
+
+	Xfree(r128ctx);
+    }
+}
+
+/* Load the device specific context into the hardware.  The actual
+   setting of the hardware state is done in the r128UpdateHWState(). */
+r128ContextPtr r128MakeCurrent(r128ContextPtr oldCtx,
+			       r128ContextPtr newCtx,
+			       __DRIdrawablePrivate *dPriv)
+{
+    if (oldCtx) {
+	if (!R128CCE_USE_RING_BUFFER(newCtx->r128Screen->CCEMode))
+	    newCtx->dirty         |= R128_REQUIRE_QUIESCENCE;
+	if (oldCtx != newCtx) {
+	    newCtx->dirty         |= R128_UPDATE_CONTEXT;
+	    newCtx->dirty_context |= R128_CTX_ALL_DIRTY;
+	}
+	if (oldCtx->driDrawable != dPriv)
+	    newCtx->dirty         |= R128_UPDATE_WINPOS;
+    } else {
+	newCtx->dirty             |= R128_UPDATE_CONTEXT;
+	newCtx->dirty_context     |= R128_CTX_ALL_DIRTY;
+    }
+
+    newCtx->driDrawable = dPriv;
+
+    return newCtx;
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_context.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_context.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_context.h	Fri Jun 16 17:03:05 2000
@@ -0,0 +1,247 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_context.h,v 1.1 2000/06/17 00:03:05 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_CONTEXT_H_
+#define _R128_CONTEXT_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+struct r128_context;
+typedef struct r128_context r128ContextRec;
+typedef struct r128_context *r128ContextPtr;
+
+#include "r128_texobj.h"
+#include "r128_fastpath.h"
+
+/* Flags for what needs to be updated before a new primitive is rendered */
+#define R128_CLEAN                  0x0000
+#define R128_REQUIRE_QUIESCENCE     0x0001
+#define R128_UPDATE_CONTEXT         0x0002
+#define R128_UPDATE_WINPOS          0x0004
+#define R128_UPDATE_TEX0IMAGES      0x0008
+#define R128_UPDATE_TEX1IMAGES      0x0010
+#define R128_UPDATE_TEXSTATE        0x0020
+#define R128_ALL_DIRTY              0xffff
+
+/* Flags for what context state needs to be updated */
+#define R128_CTX_CLEAN              0x0000
+#define R128_CTX_MISC               0x0001
+#define R128_CTX_ENGINESTATE        0x0002
+#define R128_CTX_TEX0STATE          0x0004
+#define R128_CTX_TEX1STATE          0x0008
+#define R128_CTX_TEXENVSTATE        0x0010
+#define R128_CTX_FOGSTATE           0x0020
+#define R128_CTX_FOGTABLE           0x0040
+#define R128_CTX_ZSTENSTATE         0x0080
+#define R128_CTX_SCISSORS           0x0100
+#define R128_CTX_ALPHASTATE         0x0200
+#define R128_CTX_SETUPSTATE         0x0400
+#define R128_CTX_WIN_Z_POS          0x0800
+#define R128_CTX_FLUSH_PIX_CACHE    0x1000
+#define R128_CTX_ALL_DIRTY          0xffff
+
+/* Flags for software fallback cases */
+#define R128_FALLBACK_TEXTURE       0x0001
+#define R128_FALLBACK_DRAW_BUFFER   0x0002
+#define R128_FALLBACK_READ_BUFFER   0x0004
+#define R128_FALLBACK_COLORMASK     0x0008
+#define R128_FALLBACK_STIPPLE       0x0010
+#define R128_FALLBACK_SWONLY        0x0020
+#define R128_FALLBACK_RENDER_MODE   0x0040
+#define R128_FALLBACK_MULTIDRAW     0x0080
+
+/* NOTE: The groups below need to be kept together so that a single
+   memcpy can be used to transfer data to the ring buffer */
+typedef struct {
+    CARD32  scale_3d_cntl;                        /* 0x1a00 */
+
+    CARD32  aux_sc_cntl;                          /* 0x1660 */
+    CARD32  aux1_sc_left;
+    CARD32  aux1_sc_right;
+    CARD32  aux1_sc_top;
+    CARD32  aux1_sc_bottom;
+    CARD32  aux2_sc_left;
+    CARD32  aux2_sc_right;
+    CARD32  aux2_sc_top;
+    CARD32  aux2_sc_bottom;
+    CARD32  aux3_sc_left;
+    CARD32  aux3_sc_right;
+    CARD32  aux3_sc_top;
+    CARD32  aux3_sc_bottom;                       /* 0x1690 */
+
+    CARD32  dst_pitch_offset_c;                   /* 0x1c80 */
+    CARD32  dp_gui_master_cntl;
+    CARD32  sc_top_left_c;
+    CARD32  sc_bottom_right_c;
+    CARD32  z_offset_c;
+    CARD32  z_pitch_c;
+    CARD32  z_sten_cntl_c;
+    CARD32  tex_cntl_c;
+    CARD32  misc_3d_state_cntl_reg;
+    CARD32  texture_clr_cmp_clr_c;
+    CARD32  texture_clr_cmp_msk_c;
+    CARD32  fog_color_c;
+    CARD32  prim_tex_cntl_c;
+    CARD32  prim_texture_combine_cntl_c;
+    CARD32  tex_size_pitch_c;
+    CARD32  prim_tex_offset[R128_TEX_MAXLEVELS];  /* 0x1ce4 */
+
+    CARD32  sec_tex_cntl_c;                       /* 0x1d00 */
+    CARD32  sec_tex_combine_cntl_c;
+    CARD32  sec_tex_offset[R128_TEX_MAXLEVELS];
+    CARD32  constant_color_c;
+    CARD32  prim_texture_border_color_c;
+    CARD32  sec_texture_border_color_c;
+    CARD32  sten_ref_mask_c;
+    CARD32  plane_3d_mask_c;                      /* 0x1d44 */
+
+    CARD32  setup_cntl;                           /* 0x1bc4 */
+
+    CARD32  pm4_vc_fpu_setup;                     /* 0x071c */
+
+    CARD32  fog_3d_table_start;                   /* 0x1810 */
+    CARD32  fog_3d_table_end;
+    CARD32  fog_3d_table_density;                 /* 0x181c */
+
+    CARD32  window_xy_offset;                     /* 0x1bcc */
+
+    CARD32  dp_write_mask;                        /* 0x16cc */
+
+    CARD32  pc_gui_ctlstat;                       /* 0x1748 */
+} r128ContextRegs;
+
+struct r128_context {
+    GLcontext            *glCtx;	/* Mesa context */
+    int                   dirty;	/* Hardware state to be updated */
+    int                   dirty_context; /* Context state to be updated */
+
+    int                   vertsize;	/* Size of current vertices */
+    CARD32                vc_format;	/* Format of current vertices */
+    int                   multitex;
+    GLfloat               depth_scale;
+
+    int                   SWfallbackDisable; /* Disable software fallbacks */
+
+    r128TexObjPtr         CurrentTexObj[2]; /* Ptr to current texture
+					       object associated with
+					       each texture unit */
+					/* List of tex swapped in per heap*/
+    r128TexObj            TexObjList[R128_NR_TEX_HEAPS];
+    r128TexObj            SwappedOut;	/* List of textures swapped out */
+    memHeap_t            *texHeap[R128_NR_TEX_HEAPS]; /* Global tex heaps */
+					/* Last known global tex heap ages */
+    int                   lastTexAge[R128_NR_TEX_HEAPS];
+
+    CARD32                lastSwapAge;  /* Last known swap age */
+
+    GLenum                FogMode;      /* Current fog equation */
+
+    int                   Scissor;
+    XF86DRIClipRectRec    ScissorRect;  /* Current software scissor */
+
+    int                   useFastPath;	/* Currently using Fast Path code */
+    int                   SetupIndex;	/* Raster setup function index */
+    int                   SetupDone;	/* Partial raster setup done? */
+    int                   RenderIndex;	/* Render state function index */
+    r128InterpFunc        interp;	/* Current vert interp function */
+
+    drmBufPtr             vert_buf;	/* VB currently being filled */
+
+#if 0
+    drmBufPtr		  elt_buf, retained_buf, index_buf;
+    GLushort		 *first_elt, *next_elt, *last_elt;
+    GLfloat		 *next_vert, *last_vert;
+    CARD32		  next_vert_index;
+    CARD32		  first_vert_index;
+    struct r128_elt_tab	 *elt_tab;
+    GLfloat		  device_matrix[16];
+#endif
+
+    points_func           PointsFunc;	/* Current Points, Line, Triangle */
+    line_func             LineFunc;	/* and Quad rendering functions */
+    triangle_func         TriangleFunc;
+    quad_func             QuadFunc;
+
+    CARD32                IndirectTriangles; /* Flags for point, line,
+						tri and quad software
+						fallbacks */
+    CARD32                Fallback;     /* Need software fallback */
+
+    r128ContextRegs       regs;		/* Hardware state */
+    CARD32                Color;	/* Current draw color */
+    CARD32                ClearColor;	/* Color used to clear color buffer */
+    CARD32                ClearDepth;	/* Value used to clear depth buffer */
+
+    int                   drawX;	/* x-offset to current draw buffer */
+    int                   drawY;	/* y-offset to current draw buffer */
+
+    int                   readX;	/* x-offset to current read buffer */
+    int                   readY;	/* y-offset to current read buffer */
+
+    CARD32               *CCEbuf;	/* buffer to submit to CCE */
+    int                   CCEcount;	/* number of dwords in CCEbuf */
+
+    int                   CCEtimeout;   /* number of times to loop
+					   before exiting */
+
+    Display              *display;	/* X server display */
+
+    __DRIcontextPrivate  *driContext;	/* DRI context */
+    __DRIdrawablePrivate *driDrawable;	/* DRI drawable bound to this ctx */
+
+    r128ScreenPtr         r128Screen;	/* Screen private DRI data */
+
+    /* Performance counters: */
+    int                   boxes;	/* Draw performance boxes */
+    int			  hardwareWentIdle;
+    int			  c_clears;
+    int			  c_drawWaits;
+    int			  c_textureSwaps;
+    int			  c_textureBytes;
+    int			  c_vertexBuffers;
+};
+
+#define R128_MESACTX(r128ctx)     ((r128ctx)->glCtx)
+#define R128_DRIDRAWABLE(r128ctx) ((r128ctx)->driDrawable)
+#define R128_DRISCREEN(r128ctx)   ((r128ctx)->r128Screen->driScreen)
+
+extern GLboolean r128CreateContext(Display *dpy, GLvisual *glVisual,
+				   __DRIcontextPrivate *driContextPriv);
+extern void           r128DestroyContext(r128ContextPtr r128ctx);
+extern r128ContextPtr r128MakeCurrent(r128ContextPtr oldCtx,
+				      r128ContextPtr newCtx,
+				      __DRIdrawablePrivate *dPriv);
+
+#endif
+#endif /* _R128_CONTEXT_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_dd.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_dd.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_dd.c	Fri Jun 16 17:03:05 2000
@@ -0,0 +1,193 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_dd.c,v 1.1 2000/06/17 00:03:05 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_cce.h"
+#include "r128_clear.h"
+#include "r128_state.h"
+#include "r128_swap.h"
+#include "r128_vb.h"
+#include "r128_pipeline.h"
+#include "r128_dd.h"
+
+/* Driver entry point for clearing color and ancillary buffers */
+static GLbitfield r128DDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
+			      GLint x, GLint y, GLint width, GLint height)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    if (mask & DD_FRONT_LEFT_BIT) {
+	r128ClearColorBuffer(r128ctx, all, x, y, width, height,
+			     r128ctx->r128Screen->fbX,
+			     r128ctx->r128Screen->fbY);
+	mask &= ~DD_FRONT_LEFT_BIT;
+    }
+
+    if (mask & DD_BACK_LEFT_BIT) {
+	r128ClearColorBuffer(r128ctx, all, x, y, width, height,
+			     r128ctx->r128Screen->backX,
+			     r128ctx->r128Screen->backY);
+	mask &= ~DD_BACK_LEFT_BIT;
+    }
+
+    if (mask & DD_DEPTH_BIT) {
+	r128ClearDepthBuffer(r128ctx, all, x, y, width, height);
+	mask &= ~DD_DEPTH_BIT;
+    }
+
+#if 0
+    /* FIXME: Add stencil support */
+    if (mask & DD_STENCIL_BIT) {
+	r128ClearStencilBuffer(r128ctx, all, x, y, width, height);
+	mask &= ~DD_STENCIL_BIT;
+    }
+#endif
+
+    return mask;
+}
+
+/* Return the current color buffer size */
+static void r128DDGetBufferSize(GLcontext *ctx, GLuint *width, GLuint *height)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    *width  = r128ctx->driDrawable->w;
+    *height = r128ctx->driDrawable->h;
+}
+
+/* Return various strings for glGetString() */
+static const GLubyte *r128DDGetString(GLcontext *ctx, GLenum name)
+{
+    switch (name) {
+    case GL_VENDOR:
+	return (GLubyte *)"Precision Insight, Inc.";
+    case GL_RENDERER:
+	return (GLubyte *)"Mesa DRI Rage128 20000613";
+    default:
+	return NULL;
+    }
+}
+
+/* Send all commands to the hardware.  If vertex buffers or indirect
+   buffers are in use, then we need to make sure they are sent to the
+   hardware.  All commands that are normally sent to the ring are
+   already considered `flushed'. */
+static void r128DDFlush(GLcontext *ctx)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    r128FlushVertices(r128ctx);
+
+#if ENABLE_PERF_BOXES
+    if (r128ctx->boxes) {
+	LOCK_HARDWARE(r128ctx);
+	r128PerformanceBoxesLocked(r128ctx);
+	UNLOCK_HARDWARE(r128ctx);
+    }
+
+    /* Log the performance counters if necessary */
+    r128PerformanceCounters(r128ctx);
+#endif
+}
+
+/* Make sure all commands have been sent to the hardware and have
+   completed processing. */
+static void r128DDFinish(GLcontext *ctx)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+#if ENABLE_PERF_BOXES
+    /* Bump the performance counter */
+    r128ctx->c_drawWaits++;
+#endif
+
+    r128DDFlush(ctx);
+    r128WaitForIdle(r128ctx);
+}
+
+/* Return various parameters requested by Mesa (this is deprecated) */
+static GLint r128DDGetParameteri(const GLcontext *ctx, GLint param)
+{
+    switch (param) {
+       /* Hardware fog isn't working yet -- however returning zero
+	* here means that it looks like fog is working in some cases.
+	* It is less confusing to simply have it never work until it
+	* is actually fixed.
+	*/
+    case DD_HAVE_HARDWARE_FOG: return 1;
+    default:                   return 0;
+    }
+}
+
+/* Initialize the extensions supported by this driver */
+void r128DDInitExtensions(GLcontext *ctx)
+{
+    /* FIXME: Are there other extensions to enable/disable??? */
+    gl_extensions_disable(ctx, "GL_EXT_shared_texture_palette");
+    gl_extensions_disable(ctx, "GL_EXT_paletted_texture");
+    gl_extensions_disable(ctx, "GL_EXT_point_parameters");
+    gl_extensions_disable(ctx, "ARB_imaging");
+    gl_extensions_disable(ctx, "GL_EXT_blend_minmax");
+    gl_extensions_disable(ctx, "GL_EXT_blend_logic_op");
+    gl_extensions_disable(ctx, "GL_EXT_blend_subtract");
+    gl_extensions_disable(ctx, "GL_INGR_blend_func_separate");
+
+    if (getenv("LIBGL_NO_MULTITEXTURE"))
+	gl_extensions_disable(ctx, "GL_ARB_multitexture");
+}
+
+/* Initialize the driver's misc functions */
+void r128DDInitDriverFuncs(GLcontext *ctx)
+{
+    ctx->Driver.Clear                = r128DDClear;
+
+    ctx->Driver.GetBufferSize        = r128DDGetBufferSize;
+    ctx->Driver.GetString            = r128DDGetString;
+    ctx->Driver.Finish               = r128DDFinish;
+    ctx->Driver.Flush                = r128DDFlush;
+
+    ctx->Driver.Error                = NULL;
+    ctx->Driver.GetParameteri        = r128DDGetParameteri;
+
+    ctx->Driver.DrawPixels           = NULL;
+    ctx->Driver.Bitmap               = NULL;
+
+    ctx->Driver.RegisterVB           = r128DDRegisterVB;
+    ctx->Driver.UnregisterVB         = r128DDUnregisterVB;
+    ctx->Driver.BuildPrecalcPipeline = r128DDBuildPrecalcPipeline;
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_dd.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_dd.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_dd.h	Fri Jun 16 17:03:05 2000
@@ -0,0 +1,44 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_dd.h,v 1.1 2000/06/17 00:03:05 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_DD_H_
+#define _R128_DD_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+extern void r128DDInitExtensions(GLcontext *ctx);
+extern void r128DDInitDriverFuncs(GLcontext *ctx);
+
+#endif
+#endif /* _R128_DD_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_fastpath.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_fastpath.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_fastpath.c	Fri Jun 16 17:03:05 2000
@@ -0,0 +1,536 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_fastpath.c,v 1.1 2000/06/17 00:03:05 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_state.h"
+#include "r128_vb.h"
+#include "r128_cce.h"
+#include "r128_tris.h"
+#include "r128_fastpath.h"
+
+#include "mmath.h"
+#include "cva.h"
+#include "vertices.h"
+
+/* FIXME: These routines were copied from the i810 driver, and were only
+   slightly modified for the Rage 128.  They still need to be optmizied
+   and cleaned up.  Also, support for USE_RHW2 needs to be added.
+
+   KW: The fastpath never does projective texturing, so RHW2 support
+   isn't necesary here.
+*/
+
+typedef struct r128_fast_table {
+    r128BuildVerticesFunc build_vertices;
+    r128InterpFunc        interp;
+} r128FastPathTable;
+
+#define POINT(x)   r128DrawPointVB(r128ctx, &vert[x], psize)
+#define LINE(x,y)  r128DrawLineVB(r128ctx, &vert[x], &vert[y], lwidth)
+#define TRI(x,y,z) r128DrawTriangleVB(r128ctx, &vert[x], &vert[y], &vert[z])
+
+/* Direct, and no clipping required.  The clip funcs have not been
+  written yet, so this is only useful for the fast path. */
+#define RENDER_POINTS(start, count)                                       \
+do {                                                                      \
+    GLuint e;                                                             \
+    for (e = start; e <= count; e++)                                      \
+	POINT(elt[e]);                                                    \
+} while (0)
+
+#define RENDER_LINE(i1, i)                                                \
+do {                                                                      \
+    GLuint e1 = elt[i1], e = elt[i];                                      \
+    LINE(e1, e);                                                          \
+} while (0)
+
+#define RENDER_TRI(i2, i1, i, pv, parity)                                 \
+do {                                                                      \
+    GLuint e2 = elt[i2], e1 = elt[i1], e = elt[i];                        \
+    if (parity) {                                                         \
+	GLuint tmp = e2;                                                  \
+	e2 = e1;                                                          \
+	e1 = tmp;                                                         \
+    }                                                                     \
+    TRI(e2, e1, e);                                                       \
+} while (0)
+
+#define RENDER_QUAD(i3, i2, i1, i, pv)                                    \
+do {                                                                      \
+    GLuint e3 = elt[i3], e2 = elt[i2], e1 = elt[i1], e = elt[i];          \
+    TRI(e3, e2, e);                                                       \
+    TRI(e2, e1, e);                                                       \
+} while (0)
+
+#define LOCAL_VARS                                                        \
+    r128VertexPtr   vert    = R128_DRIVER_DATA(VB)->verts;                \
+    const GLuint   *elt     = VB->EltPtr->data;                           \
+    GLcontext      *ctx     = VB->ctx;                                    \
+    r128ContextPtr  r128ctx = R128_CONTEXT(ctx);                          \
+    const GLfloat   lwidth  = ctx->Line.Width;                            \
+    const GLfloat   psize   = ctx->Point.Size;                            \
+    (void) lwidth; (void)psize; (void) vert;
+
+#define TAG(x) r128_##x##_smooth_indirect
+#include "render_tmp.h"
+
+
+
+#define NEGATIVE(f)          (f < 0)
+#define DIFFERENT_SIGNS(a,b) ((a*b) < 0)
+#define LINTERP(T, A, B)     ((A) + (T) * ((B) - (A)))
+
+
+#define INTERP_RGBA(t, out, a, b)                                         \
+do {                                                                      \
+    int i;                                                                \
+    for (i = 0; i < 4; i++) {                                             \
+	GLfloat fa = UBYTE_COLOR_TO_FLOAT_COLOR(a[i]);                    \
+	GLfloat fb = UBYTE_COLOR_TO_FLOAT_COLOR(b[i]);                    \
+	GLfloat fo = LINTERP(t, fa, fb);                                  \
+	FLOAT_COLOR_TO_UBYTE_COLOR(out[i], fo);                           \
+   }                                                                      \
+} while (0)
+
+
+#define CLIP(SGN, V, PLANE)                                               \
+do {                                                                      \
+    if (mask & PLANE) {                                                   \
+	GLuint   *indata  = inlist[in];                                   \
+	GLuint   *outdata = inlist[in ^= 1];                              \
+	GLuint   nr       = n;                                            \
+	GLfloat *J        = verts[indata[nr-1]].f;                        \
+	GLfloat  dpJ      = (SGN J[V]) + J[3];                            \
+                                                                          \
+	inlist[0] = vlist1;                                               \
+	for (i = n = 0 ; i < nr ; i++) {                                  \
+	    GLuint   elt_i = indata[i];                                   \
+	    GLfloat *I     = verts[elt_i].f;                              \
+	    GLfloat  dpI   = (SGN I[V]) + I[3];                           \
+                                                                          \
+	    if (DIFFERENT_SIGNS(dpI, dpJ)) {                              \
+		GLfloat *O = verts[next_vert].f;                          \
+		GLfloat t, *in, *out;                                     \
+                                                                          \
+		if (NEGATIVE(dpI)) {                                      \
+		    t = dpI / (dpI - dpJ);                                \
+		    in = I;                                               \
+		    out = J;                                              \
+		} else {                                                  \
+		    t = dpJ / (dpJ - dpI);                                \
+		    in = J;                                               \
+		    out = I;                                              \
+		}                                                         \
+                                                                          \
+		interp(t, O, in, out);                                    \
+                                                                          \
+		clipmask[next_vert] = 0;                                  \
+		outdata[n++] = next_vert++;                               \
+	    }                                                             \
+                                                                          \
+	    clipmask[elt_i] |= PLANE;      /* don't set up */             \
+                                                                          \
+	    if (!NEGATIVE(dpI)) {                                         \
+		outdata[n++] = elt_i;                                     \
+		clipmask[elt_i] &= ~PLANE; /* set up after all */         \
+	    }                                                             \
+                                                                          \
+	    J = I;                                                        \
+	    dpJ = dpI;                                                    \
+	}                                                                 \
+                                                                          \
+	if (n < 3) return;                                                \
+    }                                                                     \
+} while (0)
+
+#define LINE_CLIP(x,y,z,w,PLANE)                                          \
+do {                                                                      \
+    if (mask & PLANE) {                                                   \
+	GLfloat dpI = DOT4V(I,x,y,z,w);                                   \
+	GLfloat dpJ = DOT4V(J,x,y,z,w);                                   \
+                                                                          \
+	if (DIFFERENT_SIGNS(dpI, dpJ)) {                                  \
+	    GLfloat *O = verts[next_vert].f;                              \
+	    GLfloat  t = dpI / (dpI - dpJ);                               \
+                                                                          \
+	    interp(t, O, I, J);                                           \
+                                                                          \
+	    clipmask[next_vert] = 0;                                      \
+                                                                          \
+	    if (NEGATIVE(dpI)) {                                          \
+		clipmask[elts[0]] |= PLANE;                               \
+		I = O;                                                    \
+		elts[0] = next_vert++;                                    \
+	    } else {                                                      \
+		clipmask[elts[1]] |= PLANE;                               \
+		J = O;                                                    \
+		elts[1] = next_vert++;                                    \
+	    }                                                             \
+	} else if (NEGATIVE(dpI)) return;                                 \
+    }                                                                     \
+} while (0)
+
+
+static void r128TriClip(GLuint **p_elts,
+			r128Vertex *verts,
+			GLubyte *clipmask,
+			GLuint *p_next_vert,
+			GLubyte mask,
+			r128InterpFunc interp)
+{
+    GLuint *elts      = *p_elts;
+    GLuint  next_vert = *p_next_vert;
+    GLuint  in        = 0;
+    GLuint  n         = 3;
+    GLuint  vlist1[VB_MAX_CLIPPED_VERTS];
+    GLuint  vlist2[VB_MAX_CLIPPED_VERTS];
+    GLuint *inlist[2];
+    GLuint *out;
+    GLuint  i;
+
+    inlist[0] = elts;
+    inlist[1] = vlist2;
+
+    CLIP(-,0,CLIP_RIGHT_BIT);
+    CLIP(+,0,CLIP_LEFT_BIT);
+    CLIP(-,1,CLIP_TOP_BIT);
+    CLIP(+,1,CLIP_BOTTOM_BIT);
+    CLIP(-,2,CLIP_FAR_BIT);
+    CLIP(+,2,CLIP_NEAR_BIT);
+
+    /* Convert the planar polygon to a list of triangles */
+    out = inlist[in];
+
+    for (i = 2 ; i < n ; i++) {
+	elts[0] = out[0];
+	elts[1] = out[i-1];
+	elts[2] = out[i];
+	elts += 3;
+    }
+
+    *p_next_vert = next_vert;
+    *p_elts      = elts;
+}
+
+
+static void r128LineClip(GLuint **p_elts,
+			 r128Vertex *verts,
+			 GLubyte *clipmask,
+			 GLuint *p_next_vert,
+			 GLubyte mask,
+			 r128InterpFunc interp)
+{
+    GLuint  *elts      = *p_elts;
+    GLfloat *I         = verts[elts[0]].f;
+    GLfloat *J         = verts[elts[1]].f;
+    GLuint   next_vert = *p_next_vert;
+
+    LINE_CLIP(1,0,0,-1,CLIP_LEFT_BIT);
+    LINE_CLIP(-1,0,0,1,CLIP_RIGHT_BIT);
+    LINE_CLIP(0,1,0,-1,CLIP_TOP_BIT);
+    LINE_CLIP(0,-1,0,1,CLIP_BOTTOM_BIT);
+    LINE_CLIP(0,0,1,-1,CLIP_FAR_BIT);
+    LINE_CLIP(0,0,-1,1,CLIP_NEAR_BIT);
+
+    *p_next_vert  = next_vert;
+    *p_elts      += 2;
+}
+
+
+
+#define CLIP_POINT(e)                                                     \
+do {                                                                      \
+   if (mask[e]) *out++ = e;                                               \
+} while (0)
+
+#define CLIP_LINE(e1, e0)                                                 \
+do {                                                                      \
+    GLubyte ormask = mask[e0] | mask[e1];                                 \
+    out[0] = e1;                                                          \
+    out[1] = e0;                                                          \
+    out += 2;                                                             \
+    if (ormask) {                                                         \
+	out-=2;                                                           \
+	if (!(mask[e0] & mask[e1])) {                                     \
+	    r128LineClip(&out, verts, mask, &next_vert, ormask, interp);  \
+	}                                                                 \
+    }                                                                     \
+} while (0)
+
+#define CLIP_TRIANGLE(e2, e1, e0)                                         \
+do {                                                                      \
+    GLubyte ormask;                                                       \
+    out[0] = e2;                                                          \
+    out[1] = e1;                                                          \
+    out[2] = e0;                                                          \
+    out += 3;                                                             \
+    ormask = mask[e2] | mask[e1] | mask[e0];                              \
+    if (ormask) {                                                         \
+	out -= 3;                                                         \
+	if (!(mask[e2] & mask[e1] & mask[e0])) {                          \
+	    r128TriClip(&out, verts, mask, &next_vert, ormask, interp);   \
+	}                                                                 \
+    }                                                                     \
+} while (0)
+
+
+
+/* Build a table of functions to clip each primitive type.  These
+ * produce a list of elements in the appropriate 'reduced' primitive,
+ * ie (points, lines, triangles) containing all the clipped and
+ * unclipped primitives from the original list.
+ */
+#define LOCAL_VARS                                                        \
+    r128ContextPtr       r128ctx   = R128_CONTEXT(VB->ctx);               \
+    r128VertexBufferPtr  r128VB    = R128_DRIVER_DATA(VB);                \
+    GLuint              *elt       = VB->EltPtr->data;                    \
+    r128Vertex          *verts     = r128VB->verts;                       \
+    GLuint               next_vert = r128VB->last_vert;                   \
+    GLuint              *out       = r128VB->clipped_elements.data;       \
+    GLubyte             *mask      = VB->ClipMask;                        \
+    r128InterpFunc       interp    = r128ctx->interp;                     \
+    (void) interp; (void) verts;
+
+#define POSTFIX                                                           \
+    r128VB->clipped_elements.count = out - r128VB->clipped_elements.data; \
+    r128VB->last_vert = next_vert;
+
+
+#define INIT(x)
+
+#define RENDER_POINTS(start, count)                                       \
+do {                                                                      \
+    GLuint i;                                                             \
+    for (i = start; i < count; i++)                                       \
+	CLIP_POINT(elt[i]);                                               \
+} while (0)
+
+#define RENDER_LINE(i1, i0)                                               \
+do {                                                                      \
+    CLIP_LINE(elt[i1], elt[i0]);                                          \
+} while (0)
+
+#define RENDER_TRI(i2, i1, i0, pv, parity)                                \
+do {                                                                      \
+    GLuint e2 = elt[i2], e1 = elt[i1], e0 = elt[i0];                      \
+    if (parity) e2 = elt[i1], e1 = elt[i2];                               \
+    CLIP_TRIANGLE(e2, e1, e0);                                            \
+} while (0)
+
+#define RENDER_QUAD(i3, i2, i1, i0, pv)                                   \
+do {                                                                      \
+  CLIP_TRIANGLE(elt[i3], elt[i2], elt[i0]);                               \
+  CLIP_TRIANGLE(elt[i2], elt[i1], elt[i0]);                               \
+} while (0)
+
+#define TAG(x) r128_##x##_clip_elt
+#include "render_tmp.h"
+
+
+/* Pack rgba and/or texture into the remaining half of a 32 byte vertex.
+ */
+#define CLIP_UBYTE_COLOR  4
+#define CLIP_UBYTE_B 0
+#define CLIP_UBYTE_G 1
+#define CLIP_UBYTE_R 2
+#define CLIP_UBYTE_A 3
+#define CLIP_S0 6
+#define CLIP_T0 7
+#define CLIP_S1 8
+#define CLIP_T1 9
+
+#define TYPE (0)
+#define TAG(x) x
+#include "r128_fasttmp.h"
+
+#define TYPE (R128_RGBA_BIT)
+#define TAG(x) x##_RGBA
+#include "r128_fasttmp.h"
+
+#define TYPE (R128_TEX0_BIT)
+#define TAG(x) x##_TEX0
+#include "r128_fasttmp.h"
+
+#define TYPE (R128_RGBA_BIT | R128_TEX0_BIT)
+#define TAG(x) x##_RGBA_TEX0
+#include "r128_fasttmp.h"
+
+#define TYPE (R128_RGBA_BIT | R128_TEX0_BIT | R128_TEX1_BIT)
+#define TAG(x) x##_RGBA_TEX0_TEX1
+#include "r128_fasttmp.h"
+
+/* This one *could* get away with sneaking TEX1 into the color and
+ * specular slots, thus fitting inside a cache line.  Would be even
+ * better to switch to a smaller vertex.
+ */
+#define TYPE (R128_TEX0_BIT | R128_TEX1_BIT)
+#define TAG(x) x##_TEX0_TEX1
+#include "r128_fasttmp.h"
+
+
+
+/* Render elements directly from original list of vertices. */
+static void r128RenderElementsDirect(struct vertex_buffer *VB)
+{
+    GLcontext           *ctx     = VB->ctx;
+    r128ContextPtr       r128ctx = R128_CONTEXT(ctx);
+    GLenum               prim    = ctx->CVA.elt_mode;
+    GLuint               nr      = VB->EltPtr->count;
+    render_func          func    = r128_render_tab_smooth_indirect[prim];
+    GLuint               p       = 0;
+
+    if (r128ctx->dirty) r128UpdateHWState(r128ctx);
+
+    do {
+	func(VB, 0, nr, 0);
+    } while (ctx->Driver.MultipassFunc &&
+	     ctx->Driver.MultipassFunc(VB, ++p));
+}
+
+/* Project vertices from clip to device space */
+static void r128ProjectVertices(struct vertex_buffer *VB)
+{
+    GLcontext           *ctx     = VB->ctx;
+    GLmatrix            *mat     = &ctx->Viewport.WindowMap;
+    r128ContextPtr       r128ctx = R128_CONTEXT(ctx);
+    r128VertexBufferPtr  r128VB  = R128_DRIVER_DATA(VB);
+    GLfloat              m[16];
+
+    m[MAT_SX] =  mat->m[MAT_SX];
+    m[MAT_TX] =  mat->m[MAT_TX];
+    m[MAT_SY] = -mat->m[MAT_SY];
+    m[MAT_TY] = -mat->m[MAT_TY] + r128ctx->driDrawable->h;
+    m[MAT_SZ] =  mat->m[MAT_SZ] * r128ctx->depth_scale;
+    m[MAT_TZ] =  mat->m[MAT_TZ] * r128ctx->depth_scale;
+
+    gl_project_v16(r128VB->verts[VB->CopyStart].f,
+		   r128VB->verts[r128VB->last_vert].f,
+		   m,
+		   16 * 4);
+}
+
+/* Project clipped vertices from clip to device space */
+static void r128ProjectClippedVertices(struct vertex_buffer *VB)
+{
+    GLcontext           *ctx     = VB->ctx;
+    GLmatrix            *mat     = &ctx->Viewport.WindowMap;
+    r128ContextPtr       r128ctx = R128_CONTEXT(ctx);
+    r128VertexBufferPtr  r128VB  = R128_DRIVER_DATA(VB);
+    GLfloat              m[16];
+
+    m[MAT_SX] =  mat->m[MAT_SX];
+    m[MAT_TX] =  mat->m[MAT_TX];
+    m[MAT_SY] = -mat->m[MAT_SY];
+    m[MAT_TY] = -mat->m[MAT_TY] + r128ctx->driDrawable->h;
+    m[MAT_SZ] =  mat->m[MAT_SZ] * r128ctx->depth_scale;
+    m[MAT_TZ] =  mat->m[MAT_TZ] * r128ctx->depth_scale;
+
+    gl_project_clipped_v16(r128VB->verts[VB->CopyStart].f,
+			   r128VB->verts[r128VB->last_vert].f,
+			   m,
+			   16 * 4,
+			   VB->ClipMask + VB->CopyStart);
+}
+
+static r128FastPathTable r128FastTab[0x80];
+
+/* Initialize the table of fast path support functions */
+void r128FastPathInit(void)
+{
+   r128_render_init_clip_elt();
+   r128_render_init_smooth_indirect();
+
+   r128_init_fastpath(&r128FastTab[0]);
+   r128_init_fastpath_RGBA(&r128FastTab[R128_RGBA_BIT]);
+   r128_init_fastpath_TEX0(&r128FastTab[R128_TEX0_BIT]);
+   r128_init_fastpath_RGBA_TEX0(&r128FastTab[R128_RGBA_BIT|R128_TEX0_BIT]);
+   r128_init_fastpath_TEX0_TEX1(&r128FastTab[R128_TEX0_BIT|R128_TEX1_BIT]);
+   r128_init_fastpath_RGBA_TEX0_TEX1(&r128FastTab[R128_RGBA_BIT|R128_TEX0_BIT|
+						  R128_TEX1_BIT]);
+}
+
+#define VALID_SETUP (R128_RGBA_BIT | R128_TEX0_BIT | R128_TEX1_BIT)
+
+void r128FastPath(struct vertex_buffer *VB)
+{
+    GLcontext         *ctx  = VB->ctx;
+    GLenum             prim = ctx->CVA.elt_mode;
+    r128ContextPtr     r128ctx = R128_CONTEXT(ctx);
+    r128FastPathTable *tab  = &r128FastTab[r128ctx->SetupIndex & VALID_SETUP];
+    GLuint             do_cliptest = 1;
+
+    gl_prepare_arrays_cva(VB);   /* still need this */
+
+#if 0
+    if ((gl_reduce_prim[prim] == GL_TRIANGLES) &&
+	(VB->Count < (r128ctx->r128Screen->vbBufSize / 48)) &&
+	(ctx->ModelProjectMatrix.flags & (MAT_FLAG_GENERAL|
+					  MAT_FLAG_PERSPECTIVE)))
+    {
+	r128EltPath( VB );
+	return;
+    }
+#endif
+
+    /* Reserve enough space for the pathological case */
+    if (VB->EltPtr->count * 12 > R128_DRIVER_DATA(VB)->size) {
+	r128ResizeVB(VB, VB->EltPtr->count * 12);
+	do_cliptest = 1;
+    }
+
+    tab->build_vertices(VB, do_cliptest);         /* object->clip space */
+
+    if (r128ctx->dirty) r128UpdateHWState(r128ctx);
+
+    if (VB->ClipOrMask) {
+	if (!VB->ClipAndMask) {
+	    render_func *clip = r128_render_tab_clip_elt;
+
+	    r128ctx->interp = tab->interp;
+	    clip[prim](VB, 0, VB->EltPtr->count, 0); /* build new elts */
+	    ctx->CVA.elt_mode = gl_reduce_prim[prim];
+	    VB->EltPtr = &(R128_DRIVER_DATA(VB)->clipped_elements);
+	    r128ProjectClippedVertices(VB);    /* clip->device space */
+	    r128RenderElementsDirect(VB);      /* render using new list */
+	}
+    } else {
+	r128ProjectVertices(VB);               /* clip->device space  */
+	r128RenderElementsDirect(VB);          /* render using orig list */
+    }
+
+    /* This indicates that there is no cached data to reuse */
+    VB->pipeline->data_valid = 0;
+    VB->pipeline->new_state = 0;
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_fastpath.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_fastpath.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_fastpath.h	Fri Jun 16 17:03:05 2000
@@ -0,0 +1,48 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_fastpath.h,v 1.1 2000/06/17 00:03:05 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_FASTPATH_H_
+#define _R128_FASTPATH_H_
+
+typedef void (*r128BuildVerticesFunc)(struct vertex_buffer *VB,
+				      GLuint do_cliptest);
+typedef void (*r128InterpFunc)(GLfloat t,
+			       GLfloat *result,
+			       const GLfloat *in,
+			       const GLfloat *out);
+
+extern void r128FastPathInit(void);
+extern void r128FastPath(struct vertex_buffer *VB);
+
+#endif /* _R128_FASTPATH_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h	Fri Jun 16 17:03:05 2000
@@ -0,0 +1,192 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h,v 1.1 2000/06/17 00:03:05 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+/* FIXME: These routines were copied from the i810 driver, and were only
+   slightly modified for the Rage 128.  They still need to be optmizied
+   and cleaned up.  Also, support for USE_RHW2 needs to be added. */
+
+/* The first part of setup is applied to all vertices, clipped or
+ * unclipped.  This data w!ill be used for clipping, and then all
+ * vertices with a zero clipmask will be projected to device space.
+ *
+ * This could be split into several loops, but - it seems that the
+ * large stride of the fxVertices makes cache issues the big
+ * performance factor, and that multiple loops mean multiple cache
+ * misses....
+ */
+static void TAG(r128_setup_full)(struct vertex_buffer *VB, GLuint do_cliptest)
+{
+    GLcontext           *ctx    = VB->ctx;
+    r128VertexBufferPtr  r128VB = R128_DRIVER_DATA(VB);
+    const GLfloat       *m      = ctx->ModelProjectMatrix.m;
+    GLuint               start  = VB->CopyStart;
+    GLuint               count  = VB->Count;
+
+    gl_xform_points3_v16_general(r128VB->verts[start].f,
+				 m,
+				 VB->ObjPtr->start,
+				 VB->ObjPtr->stride,
+				 count - start);
+
+    if (do_cliptest) {
+	VB->ClipAndMask = ~0;
+	VB->ClipOrMask = 0;
+	gl_cliptest_points4_v16(r128VB->verts[start].f,
+				r128VB->verts[count].f,
+				&(VB->ClipOrMask),
+				&(VB->ClipAndMask),
+				VB->ClipMask + start);
+    }
+
+    /* These branches are all resolved at compile time.  Hopefully all
+     * the pointers are valid addresses even when not enabled.
+     */
+    if (TYPE) {
+       GLubyte *color = VB->ColorPtr->start;
+       GLfloat *tex0_data = VB->TexCoordPtr[0]->start;
+       GLfloat *tex1_data = VB->TexCoordPtr[1]->start;
+
+       GLuint color_stride = VB->ColorPtr->stride;
+       GLuint tex0_stride = VB->TexCoordPtr[0]->stride;
+       GLuint tex1_stride = VB->TexCoordPtr[1]->stride;
+
+       GLfloat *f = r128VB->verts[start].f;
+       GLfloat *end = f + (16 * (count - start));
+
+       while (f != end) {
+	  if (TYPE & R128_RGBA_BIT) {
+#if defined(USE_X86_ASM)
+	     /* GTH: I'd like to get some accurate timing data on the
+	      * bswap instruction, but it gives a nice speedup anyway.
+	      */
+	     __asm__ ("movl (%%edx),%%eax   \n"
+		      "bswap %%eax          \n"
+		      "rorl $8,%%eax        \n"
+		      "movl %%eax,16(%%edi) \n"
+		      :
+		      : "d" (color), "D" (f)
+		      : "%eax");
+#else
+	     GLubyte *col = color;
+	     GLubyte *b = (GLubyte *)&f[CLIP_UBYTE_COLOR];
+	     b[CLIP_UBYTE_B] = col[2];
+	     b[CLIP_UBYTE_G] = col[1];
+	     b[CLIP_UBYTE_R] = col[0];
+	     b[CLIP_UBYTE_A] = col[3];
+#endif
+	  }
+	  if (TYPE & R128_TEX0_BIT) {
+#if defined (USE_X86_ASM)
+	     __asm__ ("movl (%%ecx), %%eax    \n"
+		      "movl %%eax, 24(%%edi)  \n"
+		      "movl 4(%%ecx), %%eax   \n"
+		      "movl %%eax, 28(%%edi)"
+		      :
+		      : "c" (tex0_data), "D" (f)
+		      : "%eax");
+#else
+	     *(unsigned int *)(f+CLIP_S0) = *(unsigned int *)tex0_data;
+	     *(unsigned int *)(f+CLIP_T0) = *(unsigned int *)(tex0_data+1);
+#endif
+	  }
+	  if (TYPE & R128_TEX1_BIT) {
+	     /* Hits a second cache line.
+	      */
+#if defined (USE_X86_ASM)
+	     __asm__ ("movl (%%esi), %%eax    \n"
+		      "movl %%eax, 32(%%edi)  \n"
+		      "movl 4(%%esi), %%eax   \n"
+		      "movl %%eax, 36(%%edi)"
+		      :
+		      : "S" (tex1_data), "D" (f)
+		      : "%eax");
+#else
+	     *(unsigned int *)(f+CLIP_S1) = *(unsigned int *)tex1_data;
+	     *(unsigned int *)(f+CLIP_T1) = *(unsigned int *)(tex1_data+1);
+#endif
+	  }
+	  if (TYPE & R128_RGBA_BIT) color += color_stride;
+	  if (TYPE & R128_TEX0_BIT) STRIDE_F(tex0_data, tex0_stride);
+	  if (TYPE & R128_TEX1_BIT) STRIDE_F(tex1_data, tex1_stride);
+	  f += 16;
+       }
+    }
+
+    r128VB->clipped_elements.count = start;
+    r128VB->last_vert = count;
+}
+
+
+/* Changed to just put the interp func instead of the whole clip
+ * routine into the header.  Less code and better chance of doing some
+ * of this stuff in assembly.
+ */
+static void TAG(r128_interp_vert)(GLfloat t,
+				  GLfloat *O,
+				  const GLfloat *I,
+				  const GLfloat *J)
+{
+    O[0] = LINTERP(t, I[0], J[0]);
+    O[1] = LINTERP(t, I[1], J[1]);
+    O[2] = LINTERP(t, I[2], J[2]);
+    O[3] = LINTERP(t, I[3], J[3]);
+
+    if (TYPE & R128_RGBA_BIT) {
+	INTERP_RGBA(t,
+		    ((GLubyte *)&(O[4])),
+		    ((GLubyte *)&(I[4])),
+		    ((GLubyte *)&(J[4])));
+    }
+
+    if (TYPE & R128_TEX0_BIT) {
+	O[6] = LINTERP(t, I[6], J[6]);
+	O[7] = LINTERP(t, I[7], J[7]);
+    }
+
+    if (TYPE & R128_TEX1_BIT) {
+	O[8] = LINTERP(t, I[8], J[8]);
+	O[9] = LINTERP(t, I[9], J[9]);
+    }
+}
+
+
+static void TAG(r128_init_fastpath)(r128FastPathTable *tab)
+{
+   tab->build_vertices = TAG(r128_setup_full);
+   tab->interp         = TAG(r128_interp_vert);
+}
+
+#undef TYPE
+#undef TAG
+#undef SIZE
Index: xc/lib/GL/mesa/src/drv/r128/r128_init.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_init.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_init.h	Fri Jun 16 17:03:05 2000
@@ -0,0 +1,86 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_init.h,v 1.1 2000/06/17 00:03:05 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_INIT_H_
+#define _R128_INIT_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+#include <X11/Xlibint.h>
+
+#include "types.h"
+#include "xf86drm.h"
+#include "dri_tmm.h"
+#include "dri_mesaint.h"
+
+#include "r128_screen.h"
+#include "r128_context.h"
+
+#define DEBUG			1
+#define DEBUG_LOCKING		1
+#define ENABLE_PERF_BOXES	0
+
+
+#if DEBUG
+
+#include <stdio.h>
+#define R128_DEBUG(p)                                                       \
+    do {                                                                    \
+	printf p ;                                                          \
+	fflush(stdout);                                                     \
+    } while (0)
+
+extern int R128_DEBUG_FLAGS;
+
+#else
+
+#define R128_DEBUG_FLAGS            0
+
+#endif
+
+#define DEBUG_VERBOSE_2D            0x0001
+#define DEBUG_VERBOSE_CCE           0x0008
+#define DEBUG_VERBOSE_OUTREG        0x0010
+#define DEBUG_ALWAYS_SYNC           0x0040
+#define DEBUG_VERBOSE_MSG           0x0080
+#define DEBUG_NO_OUTRING            0x0100
+#define DEBUG_NO_OUTREG             0x0200
+#define DEBUG_VERBOSE_API           0x0400
+#define DEBUG_VALIDATE_RING         0x0800
+#define DEBUG_VERBOSE_LRU           0x1000
+#define DEBUG_VERBOSE_DRI           0x2000
+#define DEBUG_VERBOSE_IOCTL         0x4000
+
+#endif
+#endif /* _R128_INIT_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_lock.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_lock.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_lock.h	Fri Jun 16 17:03:06 2000
@@ -0,0 +1,134 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_lock.h,v 1.1 2000/06/17 00:03:06 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_LOCK_H_
+#define _R128_LOCK_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+/* Turn DEBUG_LOCKING on to find locking conflicts (see r128_init.h) */
+#if DEBUG_LOCKING
+extern char *prevLockFile;
+extern int   prevLockLine;
+
+#define DEBUG_LOCK()                                                    \
+    do {                                                                \
+	prevLockFile = (__FILE__);                                      \
+	prevLockLine = (__LINE__);                                      \
+    } while (0)
+
+#define DEBUG_RESET()                                                   \
+    do {                                                                \
+	prevLockFile = 0;                                               \
+	prevLockLine = 0;                                               \
+    } while (0)
+
+#define DEBUG_CHECK_LOCK()                                              \
+    do {                                                                \
+	if (prevLockFile) {                                             \
+	    fprintf(stderr,                                             \
+		    "LOCK SET!\n\tPrevious %s:%d\n\tCurrent: %s:%d\n",  \
+		    prevLockFile, prevLockLine, __FILE__, __LINE__);    \
+	    exit(1);                                                    \
+	}                                                               \
+    } while (0)
+
+#else
+
+#define DEBUG_LOCK()
+#define DEBUG_RESET()
+#define DEBUG_CHECK_LOCK()
+
+#endif
+
+/*
+ * !!! We may want to separate locks from locks with validation.  This
+ * could be used to improve performance for those things commands that
+ * do not do any drawing !!!
+ */
+
+/* Lock the hardware using the current context */
+#define LOCK_HARDWARE(CC)                                               \
+    do {                                                                \
+	char                  __ret = 0;                                \
+	__DRIcontextPrivate  *cPriv = CC->driContext;                   \
+	__DRIscreenPrivate   *sPriv = CC->r128Screen->driScreen;        \
+                                                                        \
+	DEBUG_CHECK_LOCK();                                             \
+	DRM_CAS(&sPriv->pSAREA->lock, cPriv->hHWContext,                \
+		DRM_LOCK_HELD|cPriv->hHWContext, __ret);                \
+	if (__ret) {                                                    \
+	    /* We lost the context, so we need to request the lock from \
+               the kernel and update our state. */                      \
+	    drmGetLock(sPriv->fd, cPriv->hHWContext, 0);                \
+	    XMesaUpdateState(cPriv);                                    \
+	}                                                               \
+	DEBUG_LOCK();                                                   \
+    } while (0)
+
+/* Unlock the hardware using the current context */
+#define UNLOCK_HARDWARE(CC)                                             \
+    do {                                                                \
+	__DRIcontextPrivate  *cPriv = CC->driContext;                   \
+	__DRIscreenPrivate   *sPriv = CC->r128Screen->driScreen;        \
+                                                                        \
+	DRM_UNLOCK(sPriv->fd, &sPriv->pSAREA->lock, cPriv->hHWContext); \
+	DEBUG_RESET();                                                  \
+    } while (0)
+
+/*
+ * This pair of macros makes a loop over the drawing operations, so it
+ * is not self contained and does not have the nice single statement
+ * semantics of most macros.
+ */
+#define BEGIN_CLIP_LOOP(CC)                                             \
+    do {                                                                \
+	__DRIdrawablePrivate *_dPriv = CC->driDrawable;                 \
+	XF86DRIClipRectPtr    _pc = _dPriv->pClipRects;                 \
+	int                   _nc, _sc;                                 \
+                                                                        \
+	for (_nc = _dPriv->numClipRects; _nc > 0; _nc -= 3, _pc += 3) { \
+	    _sc = (_nc <= 3) ? _nc : 3;                                 \
+	    r128SetClipRects(CC, _pc, _sc)
+
+/* FIXME: This should be a function call to turn off aux clipping */
+#define END_CLIP_LOOP(CC)                                               \
+	    R128CCE0(R128_CCE_PACKET0, R128_AUX_SC_CNTL, 0);            \
+	    R128CCE(0x00000000);                                        \
+	    R128CCE_SUBMIT_PACKET();                                    \
+	}                                                               \
+    } while (0)
+
+#endif
+#endif /* _R128_LOCK_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_mesa.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_mesa.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_mesa.h	Fri Jun 16 17:03:06 2000
@@ -0,0 +1,43 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_mesa.h,v 1.1 2000/06/17 00:03:06 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_MESA_H_
+#define _R128_MESA_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+#define R128_CONTEXT(ctx) ((r128ContextPtr)(ctx->DriverCtx))
+
+#endif
+#endif /* _R128_MESA_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_pipeline.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_pipeline.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_pipeline.c	Fri Jun 16 17:03:06 2000
@@ -0,0 +1,123 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_pipeline.c,v 1.1 2000/06/17 00:03:06 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_vb.h"
+#include "r128_fastpath.h"
+#include "r128_pipeline.h"
+
+#include "types.h"
+
+static struct gl_pipeline_stage r128FastStage = {
+    "R128 Fast Path",
+    (PIPE_OP_VERT_XFORM   |
+     PIPE_OP_RAST_SETUP_0 |
+     PIPE_OP_RAST_SETUP_1 |
+     PIPE_OP_RENDER),
+    PIPE_PRECALC,
+    0, 0, 0, 0, 0, 0, 0, 0, 0,   
+    r128FastPath
+};
+
+/* Build the PRECALC pipeline with our stage, if possible.  Otherwise,
+   return GL_FALSE */
+GLboolean r128DDBuildPrecalcPipeline(GLcontext *ctx)
+{
+    r128ContextPtr      r128ctx = R128_CONTEXT(ctx);
+    struct gl_pipeline *pipe    = &ctx->CVA.pre;
+
+    if (r128ctx->RenderIndex == 0 &&
+	!(ctx->Enabled & (TEXTURE0_3D     |
+			  TEXTURE1_3D     |
+			  ENABLE_TEXMAT0  |
+			  ENABLE_TEXMAT1  |
+			  ENABLE_TEXGEN0  |
+			  ENABLE_TEXGEN1  |
+			  ENABLE_USERCLIP |
+			  ENABLE_LIGHT    |
+			  ENABLE_FOG)) &&
+	(ctx->Array.Flags & (VERT_OBJ_234 |
+			     VERT_TEX0_4  |
+			     VERT_TEX1_4  |
+			     VERT_ELT)) == (VERT_OBJ_23 |
+					    VERT_ELT)) {
+	pipe->stages[0]  = &r128FastStage;
+	pipe->stages[1]  = 0;
+	pipe->new_inputs = ctx->RenderFlags & VERT_DATA;
+	pipe->ops        = pipe->stages[0]->ops;
+
+	r128ctx->useFastPath = GL_TRUE;
+	return GL_TRUE;
+    }
+
+    if (r128ctx->useFastPath) {
+	r128ctx->useFastPath = GL_FALSE;
+
+	ctx->CVA.VB->ClipOrMask   = 0;
+	ctx->CVA.VB->ClipAndMask  = CLIP_ALL_BITS;
+	ctx->Array.NewArrayState |= ctx->Array.Summary;
+    }
+
+    return GL_FALSE;
+}
+
+
+/* Register the pipeline with our stages included */
+GLuint r128RegisterPipelineStages(struct gl_pipeline_stage *out,
+				  const struct gl_pipeline_stage *in,
+				  GLuint nr)
+{
+    int i;
+
+    for (i = 0; i < nr; i++) {
+	out[i] = in[i];
+	switch (in[i].ops) {
+	case PIPE_OP_RAST_SETUP_0:
+	    out[i].cva_state_change = (NEW_LIGHTING  |
+				       NEW_TEXTURING |
+				       NEW_RASTER_OPS);
+	    out[i].state_change     = ~0;
+	    out[i].check            = r128CheckPartialRasterSetup;
+	    out[i].run              = r128PartialRasterSetup;
+	    break;
+
+	case PIPE_OP_RAST_SETUP_0|PIPE_OP_RAST_SETUP_1:
+	    out[i].run              = r128DoRasterSetup;
+	    break;
+	}
+    }
+
+    return nr;
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_pipeline.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_pipeline.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_pipeline.h	Fri Jun 16 17:03:06 2000
@@ -0,0 +1,43 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_pipeline.h,v 1.1 2000/06/17 00:03:06 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_PIPELINE_H_
+#define _R128_PIPELINE_H_
+
+extern GLboolean r128DDBuildPrecalcPipeline(GLcontext *ctx);
+extern GLuint    r128RegisterPipelineStages(struct gl_pipeline_stage *out,
+					    const struct gl_pipeline_stage *in,
+					    GLuint nr);
+
+#endif /* _R128_PIPELINE_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_screen.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_screen.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_screen.c	Fri Jun 16 17:03:06 2000
@@ -0,0 +1,260 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_screen.c,v 1.1 2000/06/17 00:03:06 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_dri.h"
+#include "r128_reg.h"
+
+#include "r128_init.h"
+#include "r128_context.h"
+#include "r128_xmesa.h"
+#include "r128_cce.h"
+#include "r128_tris.h"
+#include "r128_vb.h"
+#include "r128_fastpath.h"
+
+#include <sys/mman.h>
+
+/* Create the device specific screen private data struct */
+r128ScreenPtr r128CreateScreen(__DRIscreenPrivate *sPriv)
+{
+    r128ScreenPtr    r128Screen;
+    R128DRIPtr       r128DRIPriv = (R128DRIPtr)sPriv->pDevPriv;
+
+    /* Allocate the private area */
+    r128Screen = (r128ScreenPtr)Xmalloc(sizeof(*r128Screen));
+    if (!r128Screen) return NULL;
+
+    /* This is first since which regions we map depends on whether or
+       not we are using a PCI card */
+    r128Screen->IsPCI          = r128DRIPriv->IsPCI;
+
+    r128Screen->mmioRgn.handle = r128DRIPriv->registerHandle;
+    r128Screen->mmioRgn.size   = r128DRIPriv->registerSize;
+    if (drmMap(sPriv->fd,
+	       r128Screen->mmioRgn.handle,
+	       r128Screen->mmioRgn.size,
+	       (drmAddressPtr)&r128Screen->mmio)) {
+	Xfree(r128Screen);
+	return NULL;
+    }
+
+    if (!r128Screen->IsPCI) {
+	r128Screen->ringRgn.handle = r128DRIPriv->ringHandle;
+	r128Screen->ringRgn.size   = r128DRIPriv->ringMapSize;
+	if (drmMap(sPriv->fd,
+		   r128Screen->ringRgn.handle,
+		   r128Screen->ringRgn.size,
+		   (drmAddressPtr)&r128Screen->ring)) {
+	    drmUnmap((drmAddress)r128Screen->mmio, r128Screen->mmioRgn.size);
+	    Xfree(r128Screen);
+	    return NULL;
+	}
+
+	r128Screen->ringReadRgn.handle = r128DRIPriv->ringReadPtrHandle;
+	r128Screen->ringReadRgn.size   = r128DRIPriv->ringReadMapSize;
+	if (drmMap(sPriv->fd,
+		   r128Screen->ringReadRgn.handle,
+		   r128Screen->ringReadRgn.size,
+		   (drmAddressPtr)&r128Screen->ringReadPtr)) {
+	    drmUnmap((drmAddress)r128Screen->ring, r128Screen->ringRgn.size);
+	    drmUnmap((drmAddress)r128Screen->mmio, r128Screen->mmioRgn.size);
+	    Xfree(r128Screen);
+	    return NULL;
+	}
+
+	r128Screen->vbRgn.handle = r128DRIPriv->vbHandle;
+	r128Screen->vbRgn.size   = r128DRIPriv->vbMapSize;
+	r128Screen->vbOffset     = r128DRIPriv->vbOffset;
+	if (drmMap(sPriv->fd,
+		   r128Screen->vbRgn.handle,
+		   r128Screen->vbRgn.size,
+		   (drmAddressPtr)&r128Screen->vb)) {
+	    drmUnmap((drmAddress)r128Screen->ringReadPtr,
+		     r128Screen->ringReadRgn.size);
+	    drmUnmap((drmAddress)r128Screen->ring, r128Screen->ringRgn.size);
+	    drmUnmap((drmAddress)r128Screen->mmio, r128Screen->mmioRgn.size);
+	    Xfree(r128Screen);
+	    return NULL;
+	}
+	r128Screen->vbOffset     = r128DRIPriv->vbOffset;
+	r128Screen->vbBufSize    = r128DRIPriv->vbBufSize;
+
+	r128Screen->indRgn.handle = r128DRIPriv->indHandle;
+	r128Screen->indRgn.size   = r128DRIPriv->indMapSize;
+	if (drmMap(sPriv->fd,
+		   r128Screen->indRgn.handle,
+		   r128Screen->indRgn.size,
+		   (drmAddressPtr)&r128Screen->ind)) {
+	    drmUnmap((drmAddress)r128Screen->vb, r128Screen->vbRgn.size);
+	    drmUnmap((drmAddress)r128Screen->ringReadPtr,
+		     r128Screen->ringReadRgn.size);
+	    drmUnmap((drmAddress)r128Screen->ring, r128Screen->ringRgn.size);
+	    drmUnmap((drmAddress)r128Screen->mmio, r128Screen->mmioRgn.size);
+	    Xfree(r128Screen);
+	    return NULL;
+	}
+
+	r128Screen->agpTexRgn.handle = r128DRIPriv->agpTexHandle;
+	r128Screen->agpTexRgn.size   = r128DRIPriv->agpTexMapSize;
+	if (drmMap(sPriv->fd,
+		   r128Screen->agpTexRgn.handle,
+		   r128Screen->agpTexRgn.size,
+		   (drmAddressPtr)&r128Screen->agpTex)) {
+	    drmUnmap((drmAddress)r128Screen->ind,  r128Screen->indRgn.size);
+	    drmUnmap((drmAddress)r128Screen->vb,   r128Screen->vbRgn.size);
+	    drmUnmap((drmAddress)r128Screen->ringReadPtr,
+		     r128Screen->ringReadRgn.size);
+	    drmUnmap((drmAddress)r128Screen->ring, r128Screen->ringRgn.size);
+	    drmUnmap((drmAddress)r128Screen->mmio, r128Screen->mmioRgn.size);
+	    Xfree(r128Screen);
+	    return NULL;
+	}
+	r128Screen->agpTexOffset   = r128DRIPriv->agpTexOffset;
+
+	if (!(r128Screen->vbBufs = drmMapBufs(sPriv->fd))) {
+	    drmUnmap((drmAddress)r128Screen->agpTex,
+		     r128Screen->agpTexRgn.size);
+	    drmUnmap((drmAddress)r128Screen->ind,  r128Screen->indRgn.size);
+	    drmUnmap((drmAddress)r128Screen->vb,   r128Screen->vbRgn.size);
+	    drmUnmap((drmAddress)r128Screen->ringReadPtr,
+		     r128Screen->ringReadRgn.size);
+	    drmUnmap((drmAddress)r128Screen->ring, r128Screen->ringRgn.size);
+	    drmUnmap((drmAddress)r128Screen->mmio, r128Screen->mmioRgn.size);
+	    Xfree(r128Screen);
+	    return NULL;
+	}
+    }
+
+    r128Screen->deviceID         = r128DRIPriv->deviceID;
+
+    r128Screen->width            = r128DRIPriv->width;
+    r128Screen->height           = r128DRIPriv->height;
+    r128Screen->depth            = r128DRIPriv->depth;
+    r128Screen->bpp              = r128DRIPriv->bpp;
+    r128Screen->pixel_code       = (r128Screen->bpp != 16 ?
+				    r128Screen->bpp :
+				    r128Screen->depth);
+
+    r128Screen->fb               = sPriv->pFB;
+    r128Screen->fbOffset         = sPriv->fbOrigin;
+    r128Screen->fbStride         = sPriv->fbStride;
+    r128Screen->fbSize           = sPriv->fbSize;
+
+    r128Screen->fbX              = r128DRIPriv->fbX;
+    r128Screen->fbY              = r128DRIPriv->fbY;
+    r128Screen->backX            = r128DRIPriv->backX;
+    r128Screen->backY            = r128DRIPriv->backY;
+    r128Screen->depthX           = r128DRIPriv->depthX;
+    r128Screen->depthY           = r128DRIPriv->depthY;
+
+    r128Screen->texOffset[R128_LOCAL_TEX_HEAP]     = (r128DRIPriv->textureY *
+						      r128Screen->fbStride +
+						      r128DRIPriv->textureX *
+						      (r128Screen->bpp/8));
+    r128Screen->texSize[R128_LOCAL_TEX_HEAP]       = r128DRIPriv->textureSize;
+    r128Screen->log2TexGran[R128_LOCAL_TEX_HEAP]   = r128DRIPriv->log2TexGran;
+
+    if (r128Screen->IsPCI) {
+	r128Screen->texOffset[R128_AGP_TEX_HEAP]   = 0;
+	r128Screen->texSize[R128_AGP_TEX_HEAP]     = 0;
+	r128Screen->log2TexGran[R128_AGP_TEX_HEAP] = 0;
+	r128Screen->NRTexHeaps                     = R128_NR_TEX_HEAPS-1;
+    } else {
+	r128Screen->texOffset[R128_AGP_TEX_HEAP]   = 0;
+	r128Screen->texSize[R128_AGP_TEX_HEAP]     =
+	    r128DRIPriv->agpTexMapSize;
+	r128Screen->log2TexGran[R128_AGP_TEX_HEAP] =
+	    r128DRIPriv->log2AGPTexGran;
+	r128Screen->NRTexHeaps                     = R128_NR_TEX_HEAPS;
+    }
+
+#if 1
+    /* FIXME: For testing only */
+    if (getenv("LIBGL_SHOW_BUFFERS")) {
+	r128Screen->backX        = 0;
+	r128Screen->backY        = r128DRIPriv->height/2;
+	r128Screen->depthX       = r128DRIPriv->width/2;
+	r128Screen->depthY       = r128DRIPriv->height/2;
+    }
+#endif
+
+    r128Screen->CCEMode          = r128DRIPriv->CCEMode;
+    r128Screen->CCEFifoSize      = r128DRIPriv->CCEFifoSize;
+
+    r128Screen->ringEntries      = r128DRIPriv->ringSize/sizeof(CARD32);
+    if (!r128Screen->IsPCI) {
+	r128Screen->ringStartPtr = (int *)r128Screen->ring;
+	r128Screen->ringEndPtr   = (int *)(r128Screen->ring
+					   + r128DRIPriv->ringSize);
+    }
+
+    r128Screen->MMIOFifoSlots    = 0;
+    r128Screen->CCEFifoSlots     = 0;
+
+    r128Screen->CCEFifoAddr      = R128_PM4_FIFO_DATA_EVEN;
+
+    r128Screen->SAREA            = (R128SAREAPrivPtr)((char *)sPriv->pSAREA +
+						      sizeof(XF86DRISAREARec));
+
+    r128Screen->driScreen        = sPriv;
+
+    r128InitVertexBuffers(r128Screen);
+
+    r128FastPathInit();
+    r128TriangleFuncsInit();
+    r128SetupInit();
+
+    return r128Screen;
+}
+
+/* Destroy the device specific screen private data struct */
+void r128DestroyScreen(__DRIscreenPrivate *sPriv)
+{
+    r128ScreenPtr r128Screen = (r128ScreenPtr)sPriv->private;
+
+    if (!r128Screen->IsPCI) {
+	drmUnmapBufs(r128Screen->vbBufs);
+
+	drmUnmap((drmAddress)r128Screen->agpTex, r128Screen->agpTexRgn.size);
+	drmUnmap((drmAddress)r128Screen->ind,    r128Screen->indRgn.size);
+	drmUnmap((drmAddress)r128Screen->vb,     r128Screen->vbRgn.size);
+	drmUnmap((drmAddress)r128Screen->ringReadPtr,
+		 r128Screen->ringReadRgn.size);
+	drmUnmap((drmAddress)r128Screen->ring,   r128Screen->ringRgn.size);
+    }
+    drmUnmap((drmAddress)r128Screen->mmio,   r128Screen->mmioRgn.size);
+
+    Xfree(r128Screen);
+    sPriv->private = NULL;
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_screen.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_screen.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_screen.h	Fri Jun 16 17:03:06 2000
@@ -0,0 +1,129 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_screen.h,v 1.1 2000/06/17 00:03:06 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_SCREEN_H_
+#define _R128_SCREEN_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+#include "r128_sarea.h"
+
+typedef struct {
+    drmHandle  handle;			/* Handle to the DRM region */
+    drmSize    size;			/* Size of the DRM region */
+} r128RegionRec, *r128RegionPtr;
+
+typedef struct {
+    /* MMIO register data */
+    r128RegionRec       mmioRgn;
+    unsigned char      *mmio;
+
+    /* CCE ring buffer data */
+    r128RegionRec       ringRgn;
+    unsigned char      *ring;
+
+    /* CCE ring read pointer data */
+    r128RegionRec       ringReadRgn;
+
+    /* CCE vertex buffer data */
+    r128RegionRec       vbRgn;
+    unsigned char      *vb;
+    int                 vbOffset;
+    int                 vbBufSize;
+    drmBufMapPtr        vbBufs;
+
+    /* CCE indirect buffer data */
+    r128RegionRec       indRgn;
+    unsigned char      *ind;
+
+    /* CCE AGP Texture data */
+    r128RegionRec       agpTexRgn;
+    unsigned char      *agpTex;
+    int                 agpTexOffset;
+
+    /* Frame buffer data */
+    unsigned char      *fb;
+    unsigned long       fbOffset;
+    int                 fbStride;
+    int                 fbSize;
+
+    int                 IsPCI;		/* Current card is a PCI card */
+
+    int                 CCEMode;	/* CCE mode that server/clients use */
+    int                 CCEFifoSize;	/* Size of the CCE command FIFO */
+
+    /* CCE ring buffer data */
+    int                 ringEntries;
+
+    volatile int       *ringReadPtr;	/* Pointer to current read addr */
+    int                *ringStartPtr;   /* Pointer to end of ring buffer */
+    int                *ringEndPtr;     /* Pointer to end of ring buffer */
+
+    /* DRI screen private data */
+    int                 deviceID;	/* PCI device ID */
+    int                 width;		/* Width in pixels of display */
+    int                 height;		/* Height in scanlines of display */
+    int                 depth;		/* Depth of display (8, 15, 16, 24) */
+    int                 bpp;		/* Bit depth of disp (8, 16, 24, 32) */
+    int                 pixel_code;	/* 8, 15, 16, 24, 32 */
+
+    int                 fbX;		/* Start of frame buffer */
+    int                 fbY;
+    int                 backX;		/* Start of shared back buffer */
+    int                 backY;
+    int                 depthX;		/* Start of shared depth buffer */
+    int                 depthY;
+
+    /* Shared texture data */
+    int                 NRTexHeaps;
+    int                 texOffset[R128_NR_TEX_HEAPS];
+    int                 texSize[R128_NR_TEX_HEAPS];
+    int                 log2TexGran[R128_NR_TEX_HEAPS];
+
+    int                 MMIOFifoSlots;	/* Free slots in the FIFO (64 max) */
+    int                 CCEFifoSlots;	/* Free slots in the CCE FIFO */
+
+    int                 CCEFifoAddr;    /* MMIO offset to write next CCE
+					   value (only used when CCE is
+					   in PIO mode). */
+    R128SAREAPrivPtr    SAREA;		/* Pointer to SAREA private data */
+
+    __DRIscreenPrivate *driScreen;
+} r128ScreenRec, *r128ScreenPtr;
+
+r128ScreenPtr r128CreateScreen(__DRIscreenPrivate *sPriv);
+void          r128DestroyScreen(__DRIscreenPrivate *sPriv);
+
+#endif
+#endif /* _R128_SCREEN_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_span.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_span.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_span.c	Fri Jun 16 17:03:07 2000
@@ -0,0 +1,329 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_span.c,v 1.1 2000/06/17 00:03:07 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Keith Whitwell <keith@precisioninsight.com>
+ *   Gareth Hughes <gareth@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_state.h"
+#include "r128_reg.h"
+#include "r128_cce.h"
+#include "r128_span.h"
+
+#define DBG 0
+
+#define LOCAL_VARS                                                            \
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);                               \
+    r128ScreenPtr r128scrn = r128ctx->r128Screen;                             \
+    __DRIdrawablePrivate *dPriv = r128ctx->driDrawable;                       \
+    GLuint pitch = r128scrn->fbStride;                                        \
+    GLuint height = dPriv->h;                                                 \
+    char *buf = (char *)(r128scrn->fb +                                       \
+			 (r128ctx->drawX + dPriv->x) * (r128scrn->bpp/8) +    \
+			 (r128ctx->drawY + dPriv->y) * pitch);                \
+    char *read_buf = (char *)(r128scrn->fb +                                  \
+			      (r128ctx->readX + dPriv->x) * (r128scrn->bpp/8)+\
+			      (r128ctx->readY + dPriv->y) * pitch);           \
+    GLushort p;                                                               \
+    (void) read_buf; (void) buf; (void) p
+
+#define LOCAL_DEPTH_VARS                                                      \
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);                               \
+    r128ScreenPtr r128scrn = r128ctx->r128Screen;                             \
+    __DRIdrawablePrivate *dPriv = r128ctx->driDrawable;                       \
+    GLuint pitch = r128scrn->fbStride;                                        \
+    GLuint height = dPriv->h;                                                 \
+    char *buf = (char *)(r128scrn->fb +                                       \
+			 (r128scrn->depthX + dPriv->x) * (r128scrn->bpp/8) +  \
+			 (r128scrn->depthY + dPriv->y) * pitch);              \
+    (void) buf
+
+#define INIT_MONO_PIXEL(p)                                                    \
+    p = R128_CONTEXT(ctx)->Color
+
+#define CLIPPIXEL(_x, _y)                                                     \
+    ((_x >= minx) && (_x < maxx) && (_y >= miny) && (_y < maxy))
+
+
+#define CLIPSPAN(_x, _y, _n, _x1, _n1, _i)                                    \
+    if (( _y < miny) || (_y >= maxy)) {                                       \
+	_n1 = 0, _x1 = x;                                                     \
+    } else {                                                                  \
+	_n1 = _n;                                                             \
+	_x1 = _x;                                                             \
+	if (_x1 < minx) _i += (minx - _x1), _x1 = minx;                       \
+	if (_x1 + _n1 >= maxx) n1 -= (_x1 + n1 - maxx) + 1;                   \
+    }
+
+#define Y_FLIP(_y) (height - _y - 1)
+
+
+#define HW_LOCK()                                                             \
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);                               \
+    LOCK_HARDWARE(r128ctx);                                                   \
+    r128WaitForIdleLocked(r128ctx);
+
+#define HW_CLIPLOOP()                                                         \
+    do {                                                                      \
+	__DRIdrawablePrivate *dPriv = r128ctx->driDrawable;                   \
+	int _nc = dPriv->numClipRects;                                        \
+                                                                              \
+	while (_nc--) {                                                       \
+	    int minx = dPriv->pClipRects[_nc].x1 - dPriv->x;                  \
+	    int miny = dPriv->pClipRects[_nc].y1 - dPriv->y;                  \
+	    int maxx = dPriv->pClipRects[_nc].x2 - dPriv->x;                  \
+	    int maxy = dPriv->pClipRects[_nc].y2 - dPriv->y;
+
+#define HW_ENDCLIPLOOP()                                                      \
+	}                                                                     \
+    } while (0)
+
+#define HW_UNLOCK()                                                           \
+    UNLOCK_HARDWARE(r128ctx)
+
+
+
+/* 16 bit, RGB565 color spanline and pixel functions */
+#define WRITE_RGBA(_x, _y, r, g, b, a)                                        \
+    *(GLushort *)(buf + _x*2 + _y*pitch) = ((((int)r & 0xf8) << 8) |          \
+					    (((int)g & 0xfc) << 3) |          \
+					    (((int)b & 0xf8) >> 3) )
+
+#define WRITE_PIXEL(_x, _y, p)                                                \
+    *(GLushort *)(buf + _x*2 + _y*pitch) = p
+
+#define READ_RGBA(rgba, _x, _y)                                               \
+    do {                                                                      \
+	GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch);               \
+	rgba[0] = (p >> 8) & 0xf8;                                            \
+	rgba[1] = (p >> 3) & 0xfc;                                            \
+	rgba[2] = (p << 3) & 0xf8;                                            \
+	rgba[3] = 0xff;                                                       \
+    } while (0)
+
+#define TAG(x) r128##x##_RGB565
+#include "spantmp.h"
+
+
+
+/* 15 bit, ARGB1555 color spanline and pixel functions */
+#define WRITE_RGBA(_x, _y, r, g, b, a)                                        \
+    *(GLushort *)(buf + _x*2 + _y*pitch) = (((r & 0xf8) << 7) |               \
+					    ((g & 0xf8) << 2) |               \
+					    ((b & 0xf8) >> 3) |               \
+					    ((a) ? 0x8000 : 0))
+
+#define WRITE_PIXEL(_x, _y, p)                                                \
+    *(GLushort *)(buf + _x*2 + _y*pitch) = p
+
+#define READ_RGBA(rgba, _x, _y)                                               \
+    do {                                                                      \
+	GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch);               \
+	rgba[0] = (p >> 7) & 0xf8;                                            \
+	rgba[1] = (p >> 2) & 0xf8;                                            \
+	rgba[2] = (p << 3) & 0xf8;                                            \
+	rgba[3] = (p & 0x8000) ? 0xff : 0;                                    \
+    } while (0)
+
+#define TAG(x) r128##x##_ARGB1555
+#include "spantmp.h"
+
+
+
+/* 16 bit depthbuffer functions */
+#define WRITE_DEPTH(_x, _y, d)                                                \
+    *(GLushort *)(buf + _x*2 + _y*pitch) = d;
+
+#define READ_DEPTH(d, _x, _y)                                                 \
+    d = *(GLushort *)(buf + _x*2 + _y*pitch)
+
+#define TAG(x) r128##x##_16
+#include "depthtmp.h"
+
+
+
+/* 24 bit, RGB888 color spanline and pixel functions */
+#define WRITE_RGBA(_x, _y, r, g, b, a)                                        \
+    *(GLuint *)(buf + _x*3 + _y*pitch) = ((r << 16) |                         \
+					  (g << 8)  |                         \
+					  (b << 0))
+
+#define WRITE_PIXEL(_x, _y, p)                                                \
+    *(GLuint *)(buf + _x*3 + _y*pitch) = p
+
+#define READ_RGBA(rgba, _x, _y)                                               \
+    do {                                                                      \
+	GLuint p = *(GLuint *)(read_buf + _x*3 + _y*pitch);                   \
+	rgba[0] = (p >> 16) & 0xff;                                           \
+	rgba[1] = (p >> 8)  & 0xff;                                           \
+	rgba[2] = (p >> 0)  & 0xff;                                           \
+	rgba[3] = 0xff;                                                       \
+    } while (0)
+
+#define TAG(x) r128##x##_RGB888
+#include "spantmp.h"
+
+
+
+/* 24 bit depthbuffer functions */
+#define WRITE_DEPTH(_x, _y, d)                                                \
+    *(GLuint *)(buf + _x*3 + _y*pitch) = d
+
+#define READ_DEPTH(d, _x, _y)                                                 \
+    d = *(GLuint *)(buf + _x*3 + _y*pitch)
+
+#define TAG(x) r128##x##_24
+#include "depthtmp.h"
+
+
+
+/* 32 bit, ARGB8888 color spanline and pixel functions */
+#define WRITE_RGBA(_x, _y, r, g, b, a)                                        \
+    *(GLuint *)(buf + _x*4 + _y*pitch) = ((r << 16) |                         \
+					  (g << 8)  |                         \
+					  (b << 0)  |                         \
+					  (a << 24) )
+
+#define WRITE_PIXEL(_x, _y, p)                                                \
+    *(GLuint *)(buf + _x*4 + _y*pitch) = p
+
+#define READ_RGBA(rgba, _x, _y)                                               \
+    do {                                                                      \
+	GLuint p = *(GLuint *)(read_buf + _x*4 + _y*pitch);                   \
+	rgba[0] = (p >> 16) & 0xff;                                           \
+	rgba[1] = (p >> 8)  & 0xff;                                           \
+	rgba[2] = (p >> 0)  & 0xff;                                           \
+	rgba[3] = (p >> 24) & 0xff;                                           \
+    } while (0)
+
+#define TAG(x) r128##x##_ARGB8888
+#include "spantmp.h"
+
+
+
+/* 32 bit depthbuffer functions */
+#define WRITE_DEPTH(_x, _y, d)                                                \
+    *(GLuint *)(buf + _x*4 + _y*pitch) = d
+
+#define READ_DEPTH(d, _x, _y)                                                 \
+    d = *(GLuint *)(buf + _x*4 + _y*pitch)
+
+#define TAG(x) r128##x##_32
+#include "depthtmp.h"
+
+
+
+void r128DDInitSpanFuncs(GLcontext *ctx)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    switch (r128ctx->r128Screen->pixel_code) {
+    case 8: /* Color Index mode not supported */
+	break;
+
+    case 15:
+	ctx->Driver.WriteRGBASpan       = r128WriteRGBASpan_ARGB1555;
+	ctx->Driver.WriteRGBSpan        = r128WriteRGBSpan_ARGB1555;
+	ctx->Driver.WriteMonoRGBASpan   = r128WriteMonoRGBASpan_ARGB1555;
+	ctx->Driver.WriteRGBAPixels     = r128WriteRGBAPixels_ARGB1555;
+	ctx->Driver.WriteMonoRGBAPixels = r128WriteMonoRGBAPixels_ARGB1555;
+	ctx->Driver.ReadRGBASpan        = r128ReadRGBASpan_ARGB1555;
+	ctx->Driver.ReadRGBAPixels      = r128ReadRGBAPixels_ARGB1555;
+
+	ctx->Driver.ReadDepthSpan       = r128ReadDepthSpan_16;
+	ctx->Driver.WriteDepthSpan      = r128WriteDepthSpan_16;
+	ctx->Driver.ReadDepthPixels     = r128ReadDepthPixels_16;
+	ctx->Driver.WriteDepthPixels    = r128WriteDepthPixels_16;
+	break;
+
+    case 16:
+	ctx->Driver.WriteRGBASpan       = r128WriteRGBASpan_RGB565;
+	ctx->Driver.WriteRGBSpan        = r128WriteRGBSpan_RGB565;
+	ctx->Driver.WriteMonoRGBASpan   = r128WriteMonoRGBASpan_RGB565;
+	ctx->Driver.WriteRGBAPixels     = r128WriteRGBAPixels_RGB565;
+	ctx->Driver.WriteMonoRGBAPixels = r128WriteMonoRGBAPixels_RGB565;
+	ctx->Driver.ReadRGBASpan        = r128ReadRGBASpan_RGB565;
+	ctx->Driver.ReadRGBAPixels      = r128ReadRGBAPixels_RGB565;
+
+	ctx->Driver.ReadDepthSpan       = r128ReadDepthSpan_16;
+	ctx->Driver.WriteDepthSpan      = r128WriteDepthSpan_16;
+	ctx->Driver.ReadDepthPixels     = r128ReadDepthPixels_16;
+	ctx->Driver.WriteDepthPixels    = r128WriteDepthPixels_16;
+	break;
+
+    case 24:
+	ctx->Driver.WriteRGBASpan       = r128WriteRGBASpan_RGB888;
+	ctx->Driver.WriteRGBSpan        = r128WriteRGBSpan_RGB888;
+	ctx->Driver.WriteMonoRGBASpan   = r128WriteMonoRGBASpan_RGB888;
+	ctx->Driver.WriteRGBAPixels     = r128WriteRGBAPixels_RGB888;
+	ctx->Driver.WriteMonoRGBAPixels = r128WriteMonoRGBAPixels_RGB888;
+	ctx->Driver.ReadRGBASpan        = r128ReadRGBASpan_RGB888;
+	ctx->Driver.ReadRGBAPixels      = r128ReadRGBAPixels_RGB888;
+
+	ctx->Driver.ReadDepthSpan       = r128ReadDepthSpan_24;
+	ctx->Driver.WriteDepthSpan      = r128WriteDepthSpan_24;
+	ctx->Driver.ReadDepthPixels     = r128ReadDepthPixels_24;
+	ctx->Driver.WriteDepthPixels    = r128WriteDepthPixels_24;
+	break;
+
+    case 32:
+	ctx->Driver.WriteRGBASpan       = r128WriteRGBASpan_ARGB8888;
+	ctx->Driver.WriteRGBSpan        = r128WriteRGBSpan_ARGB8888;
+	ctx->Driver.WriteMonoRGBASpan   = r128WriteMonoRGBASpan_ARGB8888;
+	ctx->Driver.WriteRGBAPixels     = r128WriteRGBAPixels_ARGB8888;
+	ctx->Driver.WriteMonoRGBAPixels = r128WriteMonoRGBAPixels_ARGB8888;
+	ctx->Driver.ReadRGBASpan        = r128ReadRGBASpan_ARGB8888;
+	ctx->Driver.ReadRGBAPixels      = r128ReadRGBAPixels_ARGB8888;
+
+	ctx->Driver.ReadDepthSpan       = r128ReadDepthSpan_32;
+	ctx->Driver.WriteDepthSpan      = r128WriteDepthSpan_32;
+	ctx->Driver.ReadDepthPixels     = r128ReadDepthPixels_32;
+	ctx->Driver.WriteDepthPixels    = r128WriteDepthPixels_32;
+	break;
+
+    default:
+	break;
+    }
+
+    ctx->Driver.WriteCI8Span      = NULL;
+    ctx->Driver.WriteCI32Span     = NULL;
+    ctx->Driver.WriteMonoCISpan   = NULL;
+    ctx->Driver.WriteCI32Pixels   = NULL;
+    ctx->Driver.WriteMonoCIPixels = NULL;
+    ctx->Driver.ReadCI32Span      = NULL;
+    ctx->Driver.ReadCI32Pixels    = NULL;
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_span.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_span.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_span.h	Fri Jun 16 17:03:07 2000
@@ -0,0 +1,44 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_span.h,v 1.1 2000/06/17 00:03:07 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Gareth Hughes <gareth@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_SPAN_H_
+#define _R128_SPAN_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+extern void r128DDInitSpanFuncs(GLcontext *ctx);
+
+#endif
+#endif /* _R128_SPAN_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_state.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_state.c:1.3
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_state.c	Sun Jun 25 22:41:29 2000
@@ -0,0 +1,1401 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_state.c,v 1.3 2000/06/26 05:41:29 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_state.h"
+#include "r128_reg.h"
+#include "r128_cce.h"
+#include "r128_tris.h"
+#include "r128_vb.h"
+#include "r128_tex.h"
+
+#include "mmath.h"
+#include "pb.h"
+
+#define INTERESTED (~(NEW_MODELVIEW      | \
+		      NEW_PROJECTION     | \
+		      NEW_TEXTURE_MATRIX | \
+		      NEW_USER_CLIP      | \
+		      NEW_CLIENT_STATE   | \
+		      NEW_TEXTURE_ENABLE))
+
+static void r128DDUpdateState(GLcontext *ctx)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API) {
+	fprintf(stderr, "r128DDUpdateState(%p)\n", ctx);
+    }
+
+    /* Need to do this here to detect texture fallbacks before
+     * setting triangle functions.
+     */
+    if (r128ctx->dirty & R128_UPDATE_TEXSTATE)
+	r128UpdateHWState(r128ctx);
+
+    if (ctx->NewState & INTERESTED) {
+	r128ChooseRenderState(ctx);
+	r128ChooseRasterSetupFunc(ctx);
+    }
+
+    if (!r128ctx->Fallback) {
+	ctx->IndirectTriangles   &= ~DD_SW_RASTERIZE;
+	ctx->IndirectTriangles   |= r128ctx->IndirectTriangles;
+
+	ctx->Driver.PointsFunc    = r128ctx->PointsFunc;
+	ctx->Driver.LineFunc      = r128ctx->LineFunc;
+	ctx->Driver.TriangleFunc  = r128ctx->TriangleFunc;
+	ctx->Driver.QuadFunc      = r128ctx->QuadFunc;
+	ctx->Driver.RectFunc      = NULL;
+    }
+}
+
+static void r128DDUpdateHWState(GLcontext *ctx)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    /* FIXME: state is being updated too often */
+    if (r128ctx->dirty)
+	r128UpdateHWState(r128ctx);
+}
+
+
+/* This is called when mesa switches between rendering triangle
+ * primitives (such as GL_POLYGON, GL_QUADS, GL_TRIANGLE_STRIP, etc),
+ * and lines, points and bitmaps.
+ *
+ * As the r128 uses triangles to render lines and points, it is
+ * necessary to turn off hardware culling when rendering these
+ * primitives.
+ */
+static void r128DDReducedPrimitiveChange(GLcontext *ctx, GLenum prim)
+{
+   r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+   CARD32         f       = r128ctx->regs.pm4_vc_fpu_setup;
+
+   f |= R128_BACKFACE_SOLID | R128_FRONTFACE_SOLID;
+
+   /* Should really use an intermediate value to hold this rather
+    * than recalculating all the time.
+    */
+   if (prim == GL_POLYGON && ctx->Polygon.CullFlag) {
+      switch (ctx->Polygon.CullFaceMode) {
+      case GL_FRONT:          f &= ~R128_FRONTFACE_SOLID;   break;
+      case GL_BACK:           f &= ~R128_BACKFACE_SOLID;    break;
+      case GL_FRONT_AND_BACK: f &= ~(R128_BACKFACE_SOLID |
+				     R128_FRONTFACE_SOLID); break;
+      default: break;
+      }
+   }
+
+    if (r128ctx->regs.pm4_vc_fpu_setup != f) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.pm4_vc_fpu_setup = f;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_SETUPSTATE;
+    }
+}
+
+static void r128DDClearColor(GLcontext *ctx,
+                             GLubyte r, GLubyte g, GLubyte b, GLubyte a)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    r128ctx->ClearColor = r128PackColor(r128ctx->r128Screen->depth,
+					r, g, b, a);
+}
+
+static void r128DDColor(GLcontext *ctx,
+			GLubyte r, GLubyte g, GLubyte b, GLubyte a)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    r128ctx->Color = r128PackColor(r128ctx->r128Screen->depth, r, g, b, a);
+}
+
+static GLboolean r128DDSetDrawBuffer(GLcontext *ctx, GLenum mode)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    int            x       = r128ctx->driDrawable->x;
+    int            y       = r128ctx->driDrawable->y;
+    int            found;
+
+    r128ctx->Fallback &= ~R128_FALLBACK_DRAW_BUFFER;
+
+    switch (mode) {
+    case GL_FRONT_LEFT:
+	r128ctx->drawX = r128ctx->r128Screen->fbX;
+	r128ctx->drawY = r128ctx->r128Screen->fbY;
+	found = GL_TRUE;
+	break;
+    case GL_BACK_LEFT:
+	r128ctx->drawX = r128ctx->r128Screen->backX;
+	r128ctx->drawY = r128ctx->r128Screen->backY;
+	found = GL_TRUE;
+	break;
+    default:
+	r128ctx->Fallback |= R128_FALLBACK_DRAW_BUFFER;
+	found = GL_FALSE;
+	break;
+    }
+
+    x += r128ctx->drawX;
+    y += r128ctx->drawY;
+
+    r128FlushVertices(r128ctx);
+
+    r128ctx->regs.window_xy_offset = ((y << R128_WINDOW_Y_SHIFT) |
+				      (x << R128_WINDOW_X_SHIFT));
+
+    /* Recalculate the Z buffer offset since we might be drawing to the
+       back buffer and window_xy_offset affects both color buffer and
+       depth drawing */
+    r128ctx->regs.z_offset_c        = ((r128ctx->r128Screen->depthX -
+					r128ctx->drawX) *
+				       (r128ctx->r128Screen->bpp/8) +
+				       (r128ctx->r128Screen->depthY -
+					r128ctx->drawY) *
+				       r128ctx->r128Screen->fbStride);
+
+    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+    r128ctx->dirty_context |= R128_CTX_WIN_Z_POS;
+    return found;
+}
+
+static void r128DDSetReadBuffer(GLcontext *ctx,
+				GLframebuffer *colorBuffer,
+				GLenum mode)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    r128ctx->Fallback &= ~R128_FALLBACK_READ_BUFFER;
+
+    switch (mode) {
+    case GL_FRONT_LEFT:
+	r128ctx->readX = r128ctx->r128Screen->fbX;
+	r128ctx->readY = r128ctx->r128Screen->fbY;
+	break;
+    case GL_BACK_LEFT:
+	r128ctx->readX = r128ctx->r128Screen->backX;
+	r128ctx->readY = r128ctx->r128Screen->backY;
+	break;
+    default:
+	r128ctx->Fallback |= R128_FALLBACK_READ_BUFFER;
+	break;
+    }
+}
+
+static GLboolean r128DDColorMask(GLcontext *ctx,
+				 GLboolean r, GLboolean g,
+				 GLboolean b, GLboolean a)
+{
+    r128ContextPtr r128ctx  = R128_CONTEXT(ctx);
+
+    GLuint mask = r128PackColor(r128ctx->r128Screen->pixel_code,
+				ctx->Color.ColorMask[RCOMP],
+				ctx->Color.ColorMask[GCOMP],
+				ctx->Color.ColorMask[BCOMP],
+				ctx->Color.ColorMask[ACOMP]);
+
+    if (r128ctx->regs.plane_3d_mask_c != mask) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.plane_3d_mask_c = mask;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_MISC;
+    }
+
+    return GL_TRUE;
+}
+
+
+static void r128DDDither(GLcontext *ctx, GLboolean enable)
+{
+}
+
+static void r128DDAlphaFunc(GLcontext *ctx, GLenum func, GLclampf ref)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    CARD32         a       = r128ctx->regs.misc_3d_state_cntl_reg;
+
+    a &= ~(R128_ALPHA_TEST_MASK | R128_REF_ALPHA_MASK);
+    a |= ctx->Color.AlphaRef & R128_REF_ALPHA_MASK;
+
+    switch (func) {
+    case GL_NEVER:    a |= R128_ALPHA_TEST_NEVER;        break;
+    case GL_LESS:     a |= R128_ALPHA_TEST_LESS;         break;
+    case GL_LEQUAL:   a |= R128_ALPHA_TEST_LESSEQUAL;    break;
+    case GL_EQUAL:    a |= R128_ALPHA_TEST_EQUAL;        break;
+    case GL_GEQUAL:   a |= R128_ALPHA_TEST_GREATEREQUAL; break;
+    case GL_GREATER:  a |= R128_ALPHA_TEST_GREATER;      break;
+    case GL_NOTEQUAL: a |= R128_ALPHA_TEST_NEQUAL;       break;
+    case GL_ALWAYS:   a |= R128_ALPHA_TEST_ALWAYS;
+	break;
+    default:
+	/* ERROR!!! */
+	return;
+    }
+
+    if (r128ctx->regs.misc_3d_state_cntl_reg != a) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.misc_3d_state_cntl_reg = a;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_ALPHASTATE;
+    }
+}
+
+static void r128DDBlendFunc(GLcontext *ctx, GLenum sfactor, GLenum dfactor)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    CARD32         b       = r128ctx->regs.misc_3d_state_cntl_reg;
+
+    b &= ~(R128_ALPHA_BLEND_SRC_MASK | R128_ALPHA_BLEND_DST_MASK);
+
+    switch (sfactor) {
+    case GL_ZERO:                     b |= R128_ALPHA_BLEND_SRC_ZERO;
+	break;
+    case GL_ONE:                      b |= R128_ALPHA_BLEND_SRC_ONE;
+	break;
+    case GL_DST_COLOR:                b |= R128_ALPHA_BLEND_SRC_DESTCOLOR;
+	break;
+    case GL_ONE_MINUS_DST_COLOR:      b |= R128_ALPHA_BLEND_SRC_INVDESTCOLOR;
+	break;
+    case GL_SRC_ALPHA:                b |= R128_ALPHA_BLEND_SRC_SRCALPHA;
+	break;
+    case GL_ONE_MINUS_SRC_ALPHA:      b |= R128_ALPHA_BLEND_SRC_INVSRCALPHA;
+	break;
+    case GL_DST_ALPHA:                b |= R128_ALPHA_BLEND_SRC_DESTALPHA;
+	break;
+    case GL_ONE_MINUS_DST_ALPHA:      b |= R128_ALPHA_BLEND_SRC_INVDESTALPHA;
+	break;
+    case GL_SRC_ALPHA_SATURATE:       b |= R128_ALPHA_BLEND_SRC_SRCALPHASAT;
+	break;
+#if 0
+	/* FIXME: These are not supported directly by the Rage 128.
+           They could be emulated using something like the TexEnv
+           modes. */
+    case GL_CONSTANT_COLOR:           b |= 0;
+	break;
+    case GL_ONE_MINUS_CONSTANT_COLOR: b |= 0;
+	break;
+    case GL_CONSTANT_ALPHA:           b |= 0;
+	break;
+    case GL_ONE_MINUS_CONSTANT_ALPHA: b |= 0;
+	break;
+#endif
+    default:
+	/* ERROR!!! */
+	return;
+    }
+
+    switch (dfactor) {
+    case GL_ZERO:                     b |= R128_ALPHA_BLEND_DST_ZERO;
+	break;
+    case GL_ONE:                      b |= R128_ALPHA_BLEND_DST_ONE;
+	break;
+    case GL_SRC_COLOR:                b |= R128_ALPHA_BLEND_DST_SRCCOLOR;
+	break;
+    case GL_ONE_MINUS_SRC_COLOR:      b |= R128_ALPHA_BLEND_DST_INVSRCCOLOR;
+	break;
+    case GL_SRC_ALPHA:                b |= R128_ALPHA_BLEND_DST_SRCALPHA;
+	break;
+    case GL_ONE_MINUS_SRC_ALPHA:      b |= R128_ALPHA_BLEND_DST_INVSRCALPHA;
+	break;
+    case GL_DST_ALPHA:                b |= R128_ALPHA_BLEND_DST_DESTALPHA;
+	break;
+    case GL_ONE_MINUS_DST_ALPHA:      b |= R128_ALPHA_BLEND_DST_INVDESTALPHA;
+	break;
+#if 0
+	/* FIXME: These are not supported directly by the Rage 128.
+           They could be emulated using something like the TexEnv
+           modes. */
+    case GL_CONSTANT_COLOR:           b |= 0;
+	break;
+    case GL_ONE_MINUS_CONSTANT_COLOR: b |= 0;
+	break;
+    case GL_CONSTANT_ALPHA:           b |= 0;
+	break;
+    case GL_ONE_MINUS_CONSTANT_ALPHA: b |= 0;
+	break;
+#endif
+    default:
+	/* ERROR!!! */
+	return;
+    }
+
+    if (r128ctx->regs.misc_3d_state_cntl_reg != b) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.misc_3d_state_cntl_reg = b;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_ALPHASTATE;
+    }
+}
+
+static void r128DDBlendFuncSeparate(GLcontext *ctx, GLenum sfactorRGB,
+				    GLenum dfactorRGB, GLenum sfactorA,
+				    GLenum dfactorA)
+{
+    if (sfactorRGB != sfactorA || dfactorRGB != dfactorA) {
+	/* ERROR!!! */
+	return;
+    }
+
+    r128DDBlendFunc(ctx, sfactorRGB, dfactorRGB);
+}
+
+static void r128DDClearDepth(GLcontext *ctx, GLclampd d)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    switch (r128ctx->regs.z_sten_cntl_c & R128_Z_PIX_WIDTH_MASK) {
+    case R128_Z_PIX_WIDTH_16: r128ctx->ClearDepth = d * 0x0000ffff; break;
+    case R128_Z_PIX_WIDTH_24: r128ctx->ClearDepth = d * 0x00ffffff; break;
+    case R128_Z_PIX_WIDTH_32: r128ctx->ClearDepth = d * 0xffffffff; break;
+    default: return;
+    }
+}
+
+static void r128DDCullFace(GLcontext *ctx, GLenum mode)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    CARD32         f       = r128ctx->regs.pm4_vc_fpu_setup;
+
+    if (!ctx->Polygon.CullFlag) return;
+
+    f &= ~(R128_BACKFACE_MASK | R128_FRONTFACE_MASK);
+
+    switch (mode) {
+    case GL_FRONT:          f |= R128_BACKFACE_SOLID;  break;
+    case GL_BACK:           f |= R128_FRONTFACE_SOLID; break;
+    case GL_FRONT_AND_BACK:                            break;
+    default: return;
+    }
+
+    if (r128ctx->regs.pm4_vc_fpu_setup != f) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.pm4_vc_fpu_setup = f;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_SETUPSTATE;
+    }
+}
+
+static void r128DDFrontFace(GLcontext *ctx, GLenum mode)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    CARD32         f       = r128ctx->regs.pm4_vc_fpu_setup;
+
+    f &= ~R128_FRONT_DIR_MASK;
+
+    switch (mode) {
+    case GL_CW:  f |= R128_FRONT_DIR_CW;  break;
+    case GL_CCW: f |= R128_FRONT_DIR_CCW; break;
+    default: return;
+    }
+
+    if (r128ctx->regs.pm4_vc_fpu_setup != f) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.pm4_vc_fpu_setup = f;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_SETUPSTATE;
+    }
+}
+
+static void r128DDDepthFunc(GLcontext *ctx, GLenum func)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    CARD32         z       = r128ctx->regs.z_sten_cntl_c;
+
+    z &= ~R128_Z_TEST_MASK;
+
+    switch (func) {
+    case GL_NEVER:    z |= R128_Z_TEST_NEVER;        break;
+    case GL_LESS:     z |= R128_Z_TEST_LESS;         break;
+    case GL_LEQUAL:   z |= R128_Z_TEST_LESSEQUAL;    break;
+    case GL_EQUAL:    z |= R128_Z_TEST_EQUAL;        break;
+    case GL_GEQUAL:   z |= R128_Z_TEST_GREATEREQUAL; break;
+    case GL_GREATER:  z |= R128_Z_TEST_GREATER;      break;
+    case GL_NOTEQUAL: z |= R128_Z_TEST_NEQUAL;       break;
+    case GL_ALWAYS:   z |= R128_Z_TEST_ALWAYS;       break;
+    default: return;
+    }
+
+    if (r128ctx->regs.z_sten_cntl_c != z) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.z_sten_cntl_c = z;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_ZSTENSTATE;
+    }
+}
+
+static void r128DDDepthMask(GLcontext *ctx, GLboolean flag)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    CARD32         t       = r128ctx->regs.tex_cntl_c;
+
+    if (flag) t |=  R128_Z_WRITE_ENABLE;
+    else      t &= ~R128_Z_WRITE_ENABLE;
+
+    if (r128ctx->regs.tex_cntl_c != t) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.tex_cntl_c = t;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_ENGINESTATE;
+    }
+}
+
+static void r128DDLightModelfv(GLcontext *ctx, GLenum pname,
+			       const GLfloat *param)
+{
+   if (pname == GL_LIGHT_MODEL_COLOR_CONTROL)
+   {
+      r128ContextPtr r128ctx = R128_CONTEXT( ctx );
+      CARD32         t       = r128ctx->regs.tex_cntl_c;
+
+      if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
+	 t |=  R128_SPEC_LIGHT_ENABLE;
+      else
+	 t &= ~R128_SPEC_LIGHT_ENABLE;
+
+      if (r128ctx->regs.tex_cntl_c != t) {
+	 r128FlushVertices(r128ctx);
+	 r128ctx->regs.tex_cntl_c = t;
+
+	 /* FIXME: Load into hardware now??? */
+	 r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	 r128ctx->dirty_context |= R128_CTX_ENGINESTATE;
+      }
+   }
+}
+
+
+static void r128DDEnable(GLcontext *ctx, GLenum cap, GLboolean state)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    CARD32         t       = r128ctx->regs.tex_cntl_c;
+    CARD32         f       = r128ctx->regs.pm4_vc_fpu_setup;
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API) {
+	fprintf(stderr, "r128DDEnable( %p, 0x%x = %s )\n",
+		ctx, cap, state ? "GL_TRUE" : "GL_FALSE");
+    }
+
+    switch (cap) {
+    case GL_ALPHA_TEST:
+	if (state) t |=  R128_ALPHA_TEST_ENABLE;
+	else       t &= ~R128_ALPHA_TEST_ENABLE;
+	break;
+
+    case GL_AUTO_NORMAL: return;
+
+    case GL_BLEND:
+	if (state) t |=  R128_ALPHA_ENABLE;
+	else       t &= ~R128_ALPHA_ENABLE;
+	break;
+
+    case GL_CLIP_PLANE0:
+    case GL_CLIP_PLANE1:
+    case GL_CLIP_PLANE2:
+    case GL_CLIP_PLANE3:
+    case GL_CLIP_PLANE4:
+    case GL_CLIP_PLANE5:
+    case GL_COLOR_MATERIAL: return;
+
+    case GL_CULL_FACE:
+        if (ctx->PB->primitive == GL_POLYGON) {
+	    f &= ~(R128_BACKFACE_MASK | R128_FRONTFACE_MASK);
+	    if (state) {
+	        switch (ctx->Polygon.CullFaceMode) {
+	        case GL_FRONT:          f |= R128_BACKFACE_SOLID;  break;
+	        case GL_BACK:           f |= R128_FRONTFACE_SOLID; break;
+	        case GL_FRONT_AND_BACK:                            break;
+	        default: return;
+	        }
+	    } else {
+	        f |= R128_BACKFACE_SOLID | R128_FRONTFACE_SOLID;
+	    }
+        }
+	break;
+
+    case GL_DEPTH_TEST:
+	if (state) t |=  R128_Z_ENABLE;
+	else       t &= ~R128_Z_ENABLE;
+	break;
+
+    case GL_DITHER:
+	if (state) t |=  R128_DITHER_ENABLE;
+	else       t &= ~R128_DITHER_ENABLE;
+	break;
+
+    case GL_FOG:
+	if (state) t |=  R128_FOG_ENABLE;
+	else       t &= ~R128_FOG_ENABLE;
+	break;
+
+    case GL_LIGHT0:
+    case GL_LIGHT1:
+    case GL_LIGHT2:
+    case GL_LIGHT3:
+    case GL_LIGHT4:
+    case GL_LIGHT5:
+    case GL_LIGHT6:
+    case GL_LIGHT7:
+    case GL_LIGHTING:
+    case GL_LINE_SMOOTH:
+    case GL_LINE_STIPPLE:
+    case GL_INDEX_LOGIC_OP:
+    case GL_COLOR_LOGIC_OP:
+    case GL_MAP1_COLOR_4:
+    case GL_MAP1_INDEX:
+    case GL_MAP1_NORMAL:
+    case GL_MAP1_TEXTURE_COORD_1:
+    case GL_MAP1_TEXTURE_COORD_2:
+    case GL_MAP1_TEXTURE_COORD_3:
+    case GL_MAP1_TEXTURE_COORD_4:
+    case GL_MAP1_VERTEX_3:
+    case GL_MAP1_VERTEX_4:
+    case GL_MAP2_COLOR_4:
+    case GL_MAP2_INDEX:
+    case GL_MAP2_NORMAL:
+    case GL_MAP2_TEXTURE_COORD_1:
+    case GL_MAP2_TEXTURE_COORD_2:
+    case GL_MAP2_TEXTURE_COORD_3:
+    case GL_MAP2_TEXTURE_COORD_4:
+    case GL_MAP2_VERTEX_3:
+    case GL_MAP2_VERTEX_4:
+    case GL_NORMALIZE:
+    case GL_POINT_SMOOTH:
+    case GL_POLYGON_SMOOTH:
+    case GL_POLYGON_STIPPLE:
+    case GL_POLYGON_OFFSET_POINT:
+    case GL_POLYGON_OFFSET_LINE:
+    case GL_POLYGON_OFFSET_FILL:
+    case GL_RESCALE_NORMAL_EXT: return;
+
+    case GL_SCISSOR_TEST:
+	/* FIXME: Hook up the software scissor */
+#if 0
+	r128ctx->Scissor = state;
+#endif
+	break;
+
+    case GL_SHARED_TEXTURE_PALETTE_EXT:
+    case GL_STENCIL_TEST: return;
+
+    case GL_TEXTURE_1D:
+    case GL_TEXTURE_2D:
+    case GL_TEXTURE_3D:
+	/* This is handled in r128UpdateTex[01]State() */
+	r128ctx->dirty |= R128_UPDATE_TEXSTATE;
+	break;
+
+    case GL_TEXTURE_GEN_Q:
+    case GL_TEXTURE_GEN_R:
+    case GL_TEXTURE_GEN_S:
+    case GL_TEXTURE_GEN_T: return;
+
+	/* Client state */
+    case GL_VERTEX_ARRAY:
+    case GL_NORMAL_ARRAY:
+    case GL_COLOR_ARRAY:
+    case GL_INDEX_ARRAY:
+    case GL_TEXTURE_COORD_ARRAY:
+    case GL_EDGE_FLAG_ARRAY: return;
+
+    default: return;
+    }
+
+    if (r128ctx->regs.tex_cntl_c != t) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.tex_cntl_c = t;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_ENGINESTATE;
+    }
+    if (r128ctx->regs.pm4_vc_fpu_setup != f) {
+	r128FlushVertices(r128ctx);
+	r128ctx->regs.pm4_vc_fpu_setup = f;
+
+	/* FIXME: Load into hardware now??? */
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_SETUPSTATE;
+    }
+
+}
+
+static void r128DDFogfv(GLcontext *ctx, GLenum pname, const GLfloat *param)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    GLubyte        c[4];
+    CARD32         col;
+    floatTOint     fog;
+    GLenum         mode;
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API) {
+	fprintf(stderr, "r128DDFogfv(%p, 0x%x)\n", ctx, pname);
+    }
+
+    switch (pname) {
+    case GL_FOG_MODE:
+	mode = (GLenum)(GLint)*param;
+	if (r128ctx->FogMode != mode) {
+	    r128FlushVertices(r128ctx);
+	    r128ctx->FogMode = mode;
+
+	    /* FIXME: Load into hardware now??? */
+	    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	    r128ctx->dirty_context |= R128_CTX_FOGTABLE;
+	}
+	break;
+
+    case GL_FOG_DENSITY:
+	fog.f = *param;
+	if (r128ctx->regs.fog_3d_table_density != fog.i) {
+	    r128FlushVertices(r128ctx);
+	    r128ctx->regs.fog_3d_table_density = fog.i;
+
+	    /* FIXME: Load into hardware now??? */
+	    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	    r128ctx->dirty_context |= R128_CTX_FOGSTATE;
+	}
+	break;
+
+    case GL_FOG_START:
+	fog.f = *param;
+	if (r128ctx->regs.fog_3d_table_start != fog.i) {
+	    r128FlushVertices(r128ctx);
+	    r128ctx->regs.fog_3d_table_start = fog.i;
+
+	    /* FIXME: Load into hardware now??? */
+	    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	    r128ctx->dirty_context |= R128_CTX_FOGSTATE;
+	}
+	break;
+
+    case GL_FOG_END:
+	fog.f = *param;
+	if (r128ctx->regs.fog_3d_table_end != fog.i) {
+	    r128FlushVertices(r128ctx);
+	    r128ctx->regs.fog_3d_table_end = fog.i;
+
+	    /* FIXME: Load into hardware now??? */
+	    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	    r128ctx->dirty_context |= R128_CTX_FOGSTATE;
+	}
+	break;
+
+    case GL_FOG_COLOR:
+	FLOAT_RGBA_TO_UBYTE_RGBA(c, ctx->Fog.Color);
+	col = r128PackColor(32, c[0], c[1], c[2], c[3]);
+	if (r128ctx->regs.fog_color_c != col) {
+	    r128FlushVertices(r128ctx);
+	    r128ctx->regs.fog_color_c = col;
+
+	    /* FIXME: Load into hardware now??? */
+	    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	    r128ctx->dirty_context |= R128_CTX_FOGSTATE;
+	}
+	break;
+
+    default:
+	return;
+    }
+}
+
+static void r128DDScissor(GLcontext *ctx,
+			  GLint x, GLint y, GLsizei w, GLsizei h)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    r128ctx->ScissorRect.x1 = x;
+    r128ctx->ScissorRect.y1 = r128ctx->driDrawable->h - (y + h);
+    r128ctx->ScissorRect.x2 = x + w;
+    r128ctx->ScissorRect.y2 = r128ctx->driDrawable->h - y;
+}
+
+/* Initialize the driver's state functions */
+void r128DDInitStateFuncs(GLcontext *ctx)
+{
+    ctx->Driver.UpdateState            = r128DDUpdateState;
+
+    ctx->Driver.ClearIndex             = NULL;
+    ctx->Driver.ClearColor             = r128DDClearColor;
+    ctx->Driver.Index                  = NULL;
+    ctx->Driver.Color                  = r128DDColor;
+    ctx->Driver.SetDrawBuffer          = r128DDSetDrawBuffer;
+    ctx->Driver.SetReadBuffer          = r128DDSetReadBuffer;
+
+    ctx->Driver.IndexMask              = NULL;
+    ctx->Driver.ColorMask              = r128DDColorMask;
+    ctx->Driver.LogicOp                = NULL;
+    ctx->Driver.Dither                 = r128DDDither;
+
+    ctx->Driver.NearFar                = NULL;
+
+    ctx->Driver.RenderStart            = r128DDUpdateHWState;
+    ctx->Driver.RenderFinish           = NULL;
+    ctx->Driver.RasterSetup            = NULL;
+
+    ctx->Driver.RenderVBClippedTab     = NULL;
+    ctx->Driver.RenderVBCulledTab      = NULL;
+    ctx->Driver.RenderVBRawTab         = NULL;
+
+    ctx->Driver.ReducedPrimitiveChange = r128DDReducedPrimitiveChange;
+    ctx->Driver.MultipassFunc          = NULL;
+
+    ctx->Driver.AlphaFunc              = r128DDAlphaFunc;
+    ctx->Driver.BlendEquation          = NULL;
+    ctx->Driver.BlendFunc              = r128DDBlendFunc;
+    ctx->Driver.BlendFuncSeparate      = r128DDBlendFuncSeparate;
+    ctx->Driver.ClearDepth             = r128DDClearDepth;
+    ctx->Driver.CullFace               = r128DDCullFace;
+    ctx->Driver.FrontFace              = r128DDFrontFace;
+    ctx->Driver.DepthFunc              = r128DDDepthFunc;
+    ctx->Driver.DepthMask              = r128DDDepthMask;
+    ctx->Driver.DepthRange             = NULL;
+    ctx->Driver.Enable                 = r128DDEnable;
+    ctx->Driver.Fogfv                  = r128DDFogfv;
+    ctx->Driver.Hint                   = NULL;
+    ctx->Driver.Lightfv                = NULL;
+    ctx->Driver.LightModelfv           = r128DDLightModelfv;
+    ctx->Driver.PolygonMode            = NULL;
+    ctx->Driver.Scissor                = r128DDScissor;
+    ctx->Driver.ShadeModel             = NULL;
+    ctx->Driver.ClearStencil           = NULL;
+    ctx->Driver.StencilFunc            = NULL;
+    ctx->Driver.StencilMask            = NULL;
+    ctx->Driver.StencilOp              = NULL;
+    ctx->Driver.Viewport               = NULL;
+}
+
+/* Initialize the context's hardware state */
+void r128DDInitState(r128ContextPtr r128ctx)
+{
+    int    dst_bpp, depth_bpp, pitch, i;
+    CARD32 depthClear;
+
+    pitch = r128ctx->r128Screen->fbStride / r128ctx->r128Screen->bpp;
+
+    switch (r128ctx->r128Screen->pixel_code) {
+    case  8: dst_bpp = R128_GMC_DST_8BPP_CI; break;
+    case 15: dst_bpp = R128_GMC_DST_15BPP;   break;
+    case 16: dst_bpp = R128_GMC_DST_16BPP;   break;
+    case 24: dst_bpp = R128_GMC_DST_24BPP;   break;
+    case 32: dst_bpp = R128_GMC_DST_32BPP;   break;
+    default:
+	fprintf(stderr, "Error: Unsupported pixel depth %d... exiting\n",
+		r128ctx->r128Screen->pixel_code);
+	exit(-1);
+    }
+
+    /* FIXME: Figure out how to use 16bpp depth buffer in 32bpp mode */
+    switch (r128ctx->glCtx->Visual->DepthBits) {
+    case 16: depthClear = 0x0000ffff; depth_bpp  = R128_Z_PIX_WIDTH_16; break;
+    case 24: depthClear = 0x00ffffff; depth_bpp  = R128_Z_PIX_WIDTH_24; break;
+    case 32: depthClear = 0xffffffff; depth_bpp  = R128_Z_PIX_WIDTH_32; break;
+    default:
+	fprintf(stderr, "Error: Unsupported depth %d... exiting\n",
+		r128ctx->r128Screen->bpp);
+	exit(-1);
+	break;
+    }
+
+    /* Precalculate the depth scale while we're here */
+    switch (r128ctx->glCtx->Visual->DepthBits) {
+    case 16: r128ctx->depth_scale = 1.0 / 65536.0; break;
+    case 24: r128ctx->depth_scale = 1.0 / 16777216.0; break;
+    case 32: r128ctx->depth_scale = 1.0 / 4294967296.0; break;
+    default: r128ctx->depth_scale = 1.0 / 65536.0; break;
+    }
+
+    r128ctx->dirty             = R128_ALL_DIRTY;
+    r128ctx->dirty_context     = R128_CTX_ALL_DIRTY;
+
+    r128ctx->RenderIndex       = R128_FALLBACK_BIT;
+    r128ctx->PointsFunc        = NULL;
+    r128ctx->LineFunc          = NULL;
+    r128ctx->TriangleFunc      = NULL;
+    r128ctx->QuadFunc          = NULL;
+
+    r128ctx->IndirectTriangles = 0;
+    r128ctx->Fallback          = 0;
+
+    if (r128ctx->glCtx->Visual->DBflag) {
+	r128ctx->drawX         = r128ctx->r128Screen->backX;
+	r128ctx->drawY         = r128ctx->r128Screen->backY;
+	r128ctx->readX         = r128ctx->r128Screen->backX;
+	r128ctx->readY         = r128ctx->r128Screen->backY;
+    } else {
+	r128ctx->drawX         = r128ctx->r128Screen->fbX;
+	r128ctx->drawY         = r128ctx->r128Screen->fbY;
+	r128ctx->readX         = r128ctx->r128Screen->fbX;
+	r128ctx->readY         = r128ctx->r128Screen->fbY;
+    }
+
+    r128ctx->ClearColor = 0x00000000;
+    r128ctx->ClearDepth = depthClear;
+
+    r128ctx->regs.scale_3d_cntl =
+	R128_SCALE_DITHER_TABLE         |
+	R128_TEX_CACHE_SIZE_FULL        |
+	R128_DITHER_INIT_RESET          |
+	R128_SCALE_3D_TEXMAP_SHADE      |
+	R128_SCALE_PIX_REPLICATE        |
+	R128_ALPHA_COMB_ADD_CLAMP       |
+	R128_FOG_TABLE                  |
+	R128_ALPHA_BLEND_SRC_ONE        |
+	R128_ALPHA_BLEND_DST_ZERO       |
+	R128_ALPHA_TEST_ALWAYS          |
+	R128_COMPOSITE_SHADOW_CMP_EQUAL |
+	R128_TEX_MAP_ALPHA_IN_TEXTURE   |
+	R128_TEX_CACHE_LINE_SIZE_8QW;
+
+    r128ctx->regs.dst_pitch_offset_c = pitch << R128_PITCH_SHIFT;
+
+    r128ctx->regs.dp_gui_master_cntl =
+	R128_GMC_DST_PITCH_OFFSET_CNTL |
+	R128_GMC_DST_CLIPPING          |
+	R128_GMC_BRUSH_SOLID_COLOR     |
+	dst_bpp                        |
+	R128_GMC_SRC_DATATYPE_COLOR    |
+	R128_GMC_BYTE_MSB_TO_LSB       |
+	R128_GMC_CONVERSION_TEMP_6500  |
+	R128_ROP3_S                    |
+	R128_DP_SRC_SOURCE_MEMORY      |
+	R128_GMC_3D_FCN_EN             |
+	R128_GMC_CLR_CMP_CNTL_DIS      |
+	R128_GMC_AUX_CLIP_DIS          |
+	R128_GMC_WR_MSK_DIS;
+
+    r128ctx->regs.sc_top_left_c     = 0x00000000;
+    r128ctx->regs.sc_bottom_right_c = 0x1fff1fff;
+
+    r128ctx->regs.aux_sc_cntl       = 0x00000000;
+
+    r128ctx->regs.aux1_sc_left      = 0x00000000;
+    r128ctx->regs.aux1_sc_right     = 0x00001fff;
+    r128ctx->regs.aux1_sc_top       = 0x00000000;
+    r128ctx->regs.aux1_sc_bottom    = 0x00001fff;
+
+    r128ctx->regs.aux2_sc_left      = 0x00000000;
+    r128ctx->regs.aux2_sc_right     = 0x00001fff;
+    r128ctx->regs.aux2_sc_top       = 0x00000000;
+    r128ctx->regs.aux2_sc_bottom    = 0x00001fff;
+
+    r128ctx->regs.aux3_sc_left      = 0x00000000;
+    r128ctx->regs.aux3_sc_right     = 0x00001fff;
+    r128ctx->regs.aux3_sc_top       = 0x00000000;
+    r128ctx->regs.aux3_sc_bottom    = 0x00001fff;
+
+    r128ctx->regs.z_offset_c        = (r128ctx->r128Screen->depthX *
+				       (r128ctx->r128Screen->bpp/8) +
+				       r128ctx->r128Screen->depthY *
+				       r128ctx->r128Screen->fbStride);
+    r128ctx->regs.z_pitch_c         = pitch;
+
+    r128ctx->regs.z_sten_cntl_c =
+	depth_bpp                |
+	R128_Z_TEST_LESS         |
+	R128_STENCIL_TEST_ALWAYS |
+	R128_STENCIL_S_FAIL_KEEP |
+	R128_STENCIL_ZPASS_KEEP  |
+	R128_STENCIL_ZFAIL_KEEP;
+
+    r128ctx->regs.tex_cntl_c =
+	R128_Z_WRITE_ENABLE          |
+	R128_SHADE_ENABLE            |
+	R128_DITHER_ENABLE           |
+	R128_ALPHA_IN_TEX_COMPLETE_A |
+	R128_LIGHT_DIS               |
+	R128_ALPHA_LIGHT_DIS         |
+	R128_TEX_CACHE_FLUSH         |
+	(0x0f << R128_LOD_BIAS_SHIFT);
+
+    r128ctx->regs.misc_3d_state_cntl_reg =
+	R128_MISC_SCALE_3D_TEXMAP_SHADE |
+	R128_MISC_SCALE_PIX_REPLICATE   |
+	R128_ALPHA_COMB_ADD_CLAMP       |
+	R128_FOG_TABLE                  |
+	R128_ALPHA_BLEND_SRC_ONE        |
+	R128_ALPHA_BLEND_DST_ZERO       |
+	R128_ALPHA_TEST_ALWAYS;
+
+    r128ctx->regs.texture_clr_cmp_clr_c = 0x00000000;
+    r128ctx->regs.texture_clr_cmp_msk_c = 0xffffffff;
+
+    r128ctx->regs.prim_tex_cntl_c =
+	R128_MIN_BLEND_NEAREST |
+	R128_MAG_BLEND_NEAREST |
+	R128_MIP_MAP_DISABLE   |
+	R128_TEX_CLAMP_S_WRAP  |
+	R128_TEX_CLAMP_T_WRAP;
+
+    r128ctx->regs.prim_texture_combine_cntl_c =
+	R128_COMB_MODULATE          |
+	R128_COLOR_FACTOR_TEX       |
+	R128_INPUT_FACTOR_INT_COLOR |
+	R128_COMB_ALPHA_COPY        |
+	R128_ALPHA_FACTOR_TEX_ALPHA |
+	R128_INP_FACTOR_A_INT_ALPHA;
+
+    r128ctx->regs.tex_size_pitch_c     =
+	(0 << R128_TEX_PITCH_SHIFT)      |
+	(0 << R128_TEX_SIZE_SHIFT)       |
+	(0 << R128_TEX_HEIGHT_SHIFT)     |
+	(0 << R128_TEX_MIN_SIZE_SHIFT)   |
+	(0 << R128_SEC_TEX_PITCH_SHIFT)  |
+	(0 << R128_SEC_TEX_SIZE_SHIFT)   |
+	(0 << R128_SEC_TEX_HEIGHT_SHIFT) |
+	(0 << R128_SEC_TEX_MIN_SIZE_SHIFT);
+
+    for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+	r128ctx->regs.prim_tex_offset[i]  = 0x00000000;
+
+    r128ctx->regs.sec_tex_cntl_c =
+	R128_SEC_SELECT_PRIM_ST;
+
+    r128ctx->regs.sec_tex_combine_cntl_c =
+	R128_COMB_DIS                |
+	R128_COLOR_FACTOR_TEX        |
+	R128_INPUT_FACTOR_PREV_COLOR |
+	R128_COMB_ALPHA_DIS          |
+	R128_ALPHA_FACTOR_TEX_ALPHA  |
+	R128_INP_FACTOR_A_PREV_ALPHA;
+
+    for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+	r128ctx->regs.sec_tex_offset[i] = 0x00000000;
+
+    r128ctx->regs.constant_color_c            = 0x00ffffff;
+    r128ctx->regs.prim_texture_border_color_c = 0x00ffffff;
+    r128ctx->regs.sec_texture_border_color_c  = 0x00ffffff;
+    r128ctx->regs.sten_ref_mask_c             = 0xffff0000;
+    r128ctx->regs.plane_3d_mask_c             = 0xffffffff;
+
+    r128ctx->regs.setup_cntl =
+	R128_COLOR_GOURAUD         |
+	R128_PRIM_TYPE_TRI         |
+#if 1
+	/* FIXME: Let r128 multiply? */
+	R128_TEXTURE_ST_MULT_W     |
+#else
+	/* FIXME: Or, pre multiply? */
+	R128_TEXTURE_ST_DIRECT     |
+#endif
+	R128_STARTING_VERTEX_1     |
+	R128_ENDING_VERTEX_3       |
+	R128_SU_POLY_LINE_NOT_LAST |
+	R128_SUB_PIX_4BITS;
+
+    r128ctx->regs.pm4_vc_fpu_setup =
+	R128_FRONT_DIR_CCW         |
+	R128_BACKFACE_SOLID        |
+	R128_FRONTFACE_SOLID       |
+	R128_FPU_COLOR_GOURAUD     |
+	R128_FPU_SUB_PIX_4BITS     |
+	R128_FPU_MODE_3D           |
+	R128_TRAP_BITS_DISABLE     |
+	R128_XFACTOR_2             |
+	R128_YFACTOR_2             |
+	R128_FLAT_SHADE_VERTEX_OGL |
+	R128_FPU_ROUND_TRUNCATE    |
+	R128_WM_SEL_8DW;
+
+    r128ctx->FogMode                   = GL_EXP;
+    r128ctx->regs.fog_color_c          = 0x00808080;
+    r128ctx->regs.fog_3d_table_start   = 0x00000000;
+    r128ctx->regs.fog_3d_table_end     = 0xffffffff;
+    r128ctx->regs.fog_3d_table_density = 0x00000000;
+
+    r128ctx->regs.window_xy_offset     = 0x00000000;
+
+    r128ctx->regs.dp_write_mask        = 0xffffffff;
+
+    r128ctx->regs.pc_gui_ctlstat       = R128_PC_FLUSH_GUI;
+
+    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+    r128ctx->dirty_context |= R128_CTX_ALL_DIRTY;
+}
+
+/* Upload the fog table for the current fog mode */
+static void r128UploadFogTable(r128ContextPtr r128ctx)
+{
+    int i;
+
+    R128CCE0(R128_CCE_PACKET0, R128_FOG_TABLE_INDEX, 0);
+    R128CCE(0x00000000);
+
+    R128CCE0(R128_CCE_PACKET0_ONE_REG_WR, R128_FOG_TABLE_DATA, 255);
+
+
+    if (0)
+       fprintf(stderr, "uploading fog table for %s\n",
+	       gl_lookup_enum_by_nr(r128ctx->FogMode));
+
+
+    /* KW: I'm not sure we're doing enough here - shouldn't density
+     *  play a role in calculating the exp and exp2 tables -- is the
+     *  card really doing exponent calculations of its own?  Need to
+     *  see the spec...
+     */
+    switch (r128ctx->FogMode) {
+    case GL_LINEAR:
+	for (i = 0; i < 256; i++) {
+	    R128CCE(255 - i);
+	}
+	break;
+    case GL_EXP:
+	for (i = 0; i < 256; i++) {
+	   float arg = (255 - i)/255.0;
+	   float exparg = (exp(arg) - 1) / (M_E - 1); /* range [0,1] */
+	   int result;
+	   FLOAT_COLOR_TO_UBYTE_COLOR(result, exparg);
+	   R128CCE(result);
+	}
+	break;
+    case GL_EXP2:
+	for (i = 0; i < 256; i++) {
+	   float arg = (255 - i)/255.0;
+	   float exparg = (exp(arg*arg) - 1) / (M_E - 1); /* range [0,1] */
+	   int result;
+	   FLOAT_COLOR_TO_UBYTE_COLOR(result, exparg);
+	   R128CCE(result);
+	}
+	break;
+    }
+}
+
+/* Load the current context's state into the hardware */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128LoadContext(r128ContextPtr r128ctx)
+{
+    int i;
+    int tex_size_pitch_done = GL_FALSE;
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API) {
+	fprintf(stderr, "r128LoadContext(%p)\n", r128ctx->glCtx);
+    }
+
+#if 0
+    r128ctx->dirty_context = R128_CTX_ALL_DIRTY;
+#endif
+
+#if 1
+    /* FIXME: Why do these need to be updated even when they don't change? */
+    r128ctx->dirty_context |= (R128_CTX_MISC        |
+			       R128_CTX_ENGINESTATE |
+			       R128_CTX_ALPHASTATE);
+#endif
+
+#if 1
+    /* FIXME: Is this _really_ needed? */
+    if (r128ctx->dirty_context)
+	if (!R128CCE_USE_RING_BUFFER(r128ctx->r128Screen->CCEMode))
+	    r128WaitForIdleLocked(r128ctx);
+#endif
+
+    if (r128ctx->dirty_context & R128_CTX_MISC) {
+	R128CCE1(R128_CCE_PACKET1, R128_SCALE_3D_CNTL, R128_DP_WRITE_MASK);
+	R128CCE(r128ctx->regs.scale_3d_cntl);
+	R128CCE(r128ctx->regs.dp_write_mask);
+
+	R128CCE0(R128_CCE_PACKET0, R128_DST_PITCH_OFFSET_C, 1);
+	R128CCE(r128ctx->regs.dst_pitch_offset_c);
+	R128CCE(r128ctx->regs.dp_gui_master_cntl);
+
+	R128CCE0(R128_CCE_PACKET0, R128_TEXTURE_CLR_CMP_CLR_C, 1);
+	R128CCE(r128ctx->regs.texture_clr_cmp_clr_c);
+	R128CCE(r128ctx->regs.texture_clr_cmp_msk_c);
+
+	R128CCE0(R128_CCE_PACKET0, R128_STEN_REF_MASK_C, 1);
+	R128CCE(r128ctx->regs.sten_ref_mask_c);
+	R128CCE(r128ctx->regs.plane_3d_mask_c);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_ENGINESTATE) {
+	R128CCE0(R128_CCE_PACKET0, R128_TEX_CNTL_C, 0);
+	R128CCE(r128ctx->regs.tex_cntl_c);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_TEX0STATE) {
+	R128CCE0(R128_CCE_PACKET0, R128_PRIM_TEX_CNTL_C, 2+R128_TEX_MAXLEVELS);
+	R128CCE(r128ctx->regs.prim_tex_cntl_c);
+	R128CCE(r128ctx->regs.prim_texture_combine_cntl_c);
+	R128CCE(r128ctx->regs.tex_size_pitch_c);
+	for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+	    R128CCE(r128ctx->regs.prim_tex_offset[i]);
+
+	R128CCE0(R128_CCE_PACKET0, R128_PRIM_TEXTURE_BORDER_COLOR_C, 0);
+	R128CCE(r128ctx->regs.prim_texture_border_color_c);
+
+	tex_size_pitch_done = GL_TRUE;
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_TEX1STATE) {
+	if (!tex_size_pitch_done) {
+	    R128CCE0(R128_CCE_PACKET0, R128_TEX_SIZE_PITCH_C, 0);
+	    R128CCE(r128ctx->regs.tex_size_pitch_c);
+	}
+
+	R128CCE0(R128_CCE_PACKET0, R128_SEC_TEX_CNTL_C, 1+R128_TEX_MAXLEVELS);
+	R128CCE(r128ctx->regs.sec_tex_cntl_c);
+	R128CCE(r128ctx->regs.sec_tex_combine_cntl_c);
+	for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+	    R128CCE(r128ctx->regs.sec_tex_offset[i]);
+
+	R128CCE0(R128_CCE_PACKET0, R128_SEC_TEXTURE_BORDER_COLOR_C, 0);
+	R128CCE(r128ctx->regs.sec_texture_border_color_c);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_TEXENVSTATE) {
+	R128CCE0(R128_CCE_PACKET0, R128_CONSTANT_COLOR_C, 0);
+	R128CCE(r128ctx->regs.constant_color_c);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_FOGSTATE) {
+	R128CCE0(R128_CCE_PACKET0, R128_FOG_3D_TABLE_START, 1);
+	R128CCE(r128ctx->regs.fog_3d_table_start);
+	R128CCE(r128ctx->regs.fog_3d_table_end);
+
+	R128CCE1(R128_CCE_PACKET1,
+		 R128_FOG_COLOR_C, R128_FOG_3D_TABLE_DENSITY);
+	R128CCE(r128ctx->regs.fog_color_c);
+	R128CCE(r128ctx->regs.fog_3d_table_density);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_FOGTABLE) {
+	r128UploadFogTable(r128ctx);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_ZSTENSTATE) {
+	R128CCE0(R128_CCE_PACKET0, R128_Z_STEN_CNTL_C, 0);
+	R128CCE(r128ctx->regs.z_sten_cntl_c);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_SCISSORS) {
+	R128CCE0(R128_CCE_PACKET0, R128_SC_TOP_LEFT_C, 1);
+	R128CCE(r128ctx->regs.sc_top_left_c);
+	R128CCE(r128ctx->regs.sc_bottom_right_c);
+    }
+
+    if (r128ctx->dirty_context & (R128_CTX_ALPHASTATE |
+				  R128_CTX_FOGSTATE)) {
+	R128CCE0(R128_CCE_PACKET0, R128_MISC_3D_STATE_CNTL_REG, 0);
+	R128CCE(r128ctx->regs.misc_3d_state_cntl_reg);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_SETUPSTATE) {
+	R128CCE1(R128_CCE_PACKET1, R128_SETUP_CNTL, R128_PM4_VC_FPU_SETUP);
+	R128CCE(r128ctx->regs.setup_cntl);
+	R128CCE(r128ctx->regs.pm4_vc_fpu_setup);
+    }
+
+    if (r128ctx->dirty_context & R128_CTX_WIN_Z_POS) {
+	R128CCE0(R128_CCE_PACKET0, R128_WINDOW_XY_OFFSET, 0);
+	R128CCE(r128ctx->regs.window_xy_offset);
+
+	R128CCE0(R128_CCE_PACKET0, R128_Z_OFFSET_C, 1);
+	R128CCE(r128ctx->regs.z_offset_c);
+	R128CCE(r128ctx->regs.z_pitch_c);
+    }
+
+#if 0
+    if (r128ctx->dirty_context & R128_CTX_FLUSH_PIX_CACHE) {
+	R128CCE0(R128_CCE_PACKET0, R128_PC_GUI_CTLSTAT, 0);
+	R128CCE(r128ctx->regs.pc_gui_ctlstat);
+    }
+#endif
+
+    R128CCE_SUBMIT_PACKET();
+
+    /* Turn off the texture cache flushing */
+    r128ctx->regs.tex_cntl_c     &= ~R128_TEX_CACHE_FLUSH;
+
+    /* Turn off the pixel cache flushing */
+    r128ctx->regs.pc_gui_ctlstat &= ~R128_PC_FLUSH_ALL;
+
+    r128ctx->dirty_context = R128_CTX_CLEAN;
+}
+
+/* Set the hardware clip rects for drawing to the current color buffer */
+/* NOTE: This function is only called while holding the hardware lock */
+void r128SetClipRects(r128ContextPtr r128ctx,
+		      XF86DRIClipRectPtr pc, int nc)
+{
+    if (!pc) return;
+
+    /* Clear any previous auxiliary scissors */
+    r128ctx->regs.aux_sc_cntl = 0x00000000;
+
+    switch (nc) {
+    case 3:
+	R128CCE0(R128_CCE_PACKET0, R128_AUX3_SC_LEFT, 3);
+	R128CCE(pc[2].x1   + r128ctx->drawX);
+	R128CCE(pc[2].x2-1 + r128ctx->drawX);
+	R128CCE(pc[2].y1   + r128ctx->drawY);
+	R128CCE(pc[2].y2-1 + r128ctx->drawY);
+
+	r128ctx->regs.aux_sc_cntl |= R128_AUX3_SC_EN | R128_AUX3_SC_MODE_OR;
+
+    case 2:
+	R128CCE0(R128_CCE_PACKET0, R128_AUX2_SC_LEFT, 3);
+	R128CCE(pc[1].x1   + r128ctx->drawX);
+	R128CCE(pc[1].x2-1 + r128ctx->drawX);
+	R128CCE(pc[1].y1   + r128ctx->drawY);
+	R128CCE(pc[1].y2-1 + r128ctx->drawY);
+
+	r128ctx->regs.aux_sc_cntl |= R128_AUX2_SC_EN | R128_AUX2_SC_MODE_OR;
+
+    case 1:
+	R128CCE0(R128_CCE_PACKET0, R128_AUX1_SC_LEFT, 3);
+	R128CCE(pc[0].x1   + r128ctx->drawX);
+	R128CCE(pc[0].x2-1 + r128ctx->drawX);
+	R128CCE(pc[0].y1   + r128ctx->drawY);
+	R128CCE(pc[0].y2-1 + r128ctx->drawY);
+
+	r128ctx->regs.aux_sc_cntl |= R128_AUX1_SC_EN | R128_AUX1_SC_MODE_OR;
+	break;
+
+    default:
+	return;
+    }
+
+    R128CCE0(R128_CCE_PACKET0, R128_AUX_SC_CNTL, 0);
+    R128CCE(r128ctx->regs.aux_sc_cntl);
+
+    R128CCE_SUBMIT_PACKET();
+}
+
+/* Update the driver's notion of the window position */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128UpdateWindowPosition(r128ContextPtr r128ctx)
+{
+    int x = r128ctx->driDrawable->x + r128ctx->drawX;
+    int y = r128ctx->driDrawable->y + r128ctx->drawY;
+
+#if 0
+    /* FIXME: Is this _really_ needed? */
+    R128CCE_FLUSH_VB(r128ctx);
+#endif
+    r128ctx->regs.window_xy_offset = ((y << R128_WINDOW_Y_SHIFT) |
+				      (x << R128_WINDOW_X_SHIFT));
+
+    /* Recalculate the Z buffer offset since we might be drawing to the
+       back buffer and window_xy_offset affects both color buffer and
+       depth drawing */
+    r128ctx->regs.z_offset_c        = ((r128ctx->r128Screen->depthX -
+					r128ctx->drawX) *
+				       (r128ctx->r128Screen->bpp/8) +
+				       (r128ctx->r128Screen->depthY -
+					r128ctx->drawY) *
+				       r128ctx->r128Screen->fbStride);
+
+    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+    r128ctx->dirty_context |= R128_CTX_WIN_Z_POS;
+}
+
+/* Update the hardware state */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128UpdateHWStateLocked(r128ContextPtr r128ctx)
+{
+    if (r128ctx->dirty & R128_REQUIRE_QUIESCENCE)
+	r128WaitForIdleLocked(r128ctx);
+
+    /* Update any state that might have changed recently */
+
+    /* Update the clip rects */
+    if (r128ctx->dirty & R128_UPDATE_WINPOS)
+	r128UpdateWindowPosition(r128ctx);
+
+    /* Update texture state and then upload the images */
+    /* Note: Texture images can only be updated after the state has been set */
+    if (r128ctx->dirty & R128_UPDATE_TEXSTATE)
+	r128UpdateTextureState(r128ctx);
+    if (r128ctx->dirty & R128_UPDATE_TEX0IMAGES)
+        r128UploadTexImages(r128ctx, r128ctx->CurrentTexObj[0]);
+    if (r128ctx->dirty & R128_UPDATE_TEX1IMAGES)
+        r128UploadTexImages(r128ctx, r128ctx->CurrentTexObj[1]);
+
+    /* Load the state into the hardware */
+    /* Note: This must be done after all other state has been set */
+    if (r128ctx->dirty & R128_UPDATE_CONTEXT)
+	r128LoadContext(r128ctx);
+
+    r128ctx->dirty = R128_CLEAN;
+}
+
+/* Update the hardware state */
+void r128UpdateHWState(r128ContextPtr r128ctx)
+{
+    LOCK_HARDWARE(r128ctx);
+    r128UpdateHWStateLocked(r128ctx);
+    UNLOCK_HARDWARE(r128ctx);
+}
+
+/* Update the driver's state */
+/* NOTE: This function is only called while holding the hardware lock */
+void r128UpdateState(r128ContextPtr r128ctx, int winMoved)
+{
+    R128SAREAPrivPtr sarea = r128ctx->r128Screen->SAREA;
+    int              i;
+
+    if (sarea->ctxOwner != r128ctx->driContext->hHWContext) {
+	sarea->ctxOwner = r128ctx->driContext->hHWContext;
+	r128ctx->dirty_context = R128_CTX_ALL_DIRTY;
+	r128LoadContext(r128ctx);
+    }
+
+    for (i = 0; i < r128ctx->r128Screen->NRTexHeaps; i++)
+	r128AgeTextures(r128ctx, i);
+
+    if (winMoved) r128ctx->dirty |= R128_UPDATE_WINPOS;
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_state.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_state.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_state.h	Fri Jun 16 17:03:07 2000
@@ -0,0 +1,50 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_state.h,v 1.1 2000/06/17 00:03:07 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_STATE_H_
+#define _R128_STATE_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+extern void   r128DDInitState(r128ContextPtr r128ctx);
+extern void   r128DDInitStateFuncs(GLcontext *ctx);
+
+extern void   r128UpdateState(r128ContextPtr r128ctx, int winMoved);
+extern void   r128UpdateHWState(r128ContextPtr r128ctx);
+
+extern void   r128SetClipRects(r128ContextPtr r128ctx,
+			       XF86DRIClipRectPtr pc, int nc);
+
+#endif
+#endif /* _R128_STATE_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_swap.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_swap.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_swap.c	Fri Jun 16 17:03:07 2000
@@ -0,0 +1,290 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_swap.c,v 1.1 2000/06/17 00:03:07 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_reg.h"
+#include "r128_cce.h"
+#include "r128_state.h"
+#include "r128_vb.h"
+#include "r128_tex.h"
+#include "r128_swap.h"
+
+
+#if ENABLE_PERF_BOXES
+
+/*
+ * Add hardware commands to draw a filled box for the debugging display.
+ */
+static void r128ClearBoxLocked( r128ContextPtr r128ctx,
+				int x, int y, int w, int h,
+				int r, int g, int b )
+{
+    int dst_bpp;
+    int color;
+
+    switch ( r128ctx->r128Screen->bpp ) {
+    case 8:
+	dst_bpp = R128_GMC_DST_8BPP_CI;
+	break;
+    case 16:
+	if ( r128ctx->r128Screen->depth == 15 ) {
+	    dst_bpp = R128_GMC_DST_15BPP;
+	} else {
+	    dst_bpp = R128_GMC_DST_16BPP;
+	}
+	break;
+    case 24:
+	dst_bpp = R128_GMC_DST_24BPP;
+	break;
+    case 32:
+    default:
+	dst_bpp = R128_GMC_DST_32BPP;
+	break;
+    }
+
+    x += r128ctx->driDrawable->x + r128ctx->drawX;
+    y += r128ctx->driDrawable->y + r128ctx->drawY;
+
+    color = r128PackColor( r128ctx->r128Screen->bpp, r, g, b, 0 );
+
+    /* Temporarily disable Z and stencil buffer and texture mapping modes */
+    R128CCE0( R128_CCE_PACKET0, R128_TEX_CNTL_C, 0 );
+    R128CCE( r128ctx->regs.tex_cntl_c & ~(R128_Z_ENABLE |
+					  R128_STENCIL_ENABLE |
+					  R128_TEXMAP_ENABLE) );
+
+    R128CCE3( R128_CCE_PACKET3_CNTL_PAINT_MULTI, 3 );
+    R128CCE( R128_GMC_BRUSH_SOLID_COLOR
+	     | dst_bpp
+	     | R128_GMC_SRC_DATATYPE_COLOR
+	     | R128_ROP3_P
+	     | R128_GMC_3D_FCN_EN		/* FIXME?? */
+	     | R128_GMC_CLR_CMP_CNTL_DIS	/* FIXME?? */
+	     | R128_AUX_CLIP_DIS );		/* FIXME?? */
+    R128CCE( color );
+    R128CCE( (x << 16) | y );
+    R128CCE( (w << 16) | h );
+
+    R128CCE_SUBMIT_PACKET();
+}
+
+/*
+ * Draw some small boxes in the corner of the buffer based on some
+ * performance information.
+ */
+void r128PerformanceBoxesLocked( r128ContextPtr r128ctx )
+{
+    int		w, t;
+
+    if ( !r128ctx->boxes ) {
+	return;
+    }
+
+    /* Draw a box to show we are active, so if it is't seen
+     * it means that it is completely software based rendering
+     */
+    if ( R128CCE_USE_RING_BUFFER( r128ctx->r128Screen->CCEMode ) ) {
+	r128ClearBoxLocked( r128ctx, 4, 4, 8, 8, 255, 0, 255 );
+    } else {
+	r128ClearBoxLocked( r128ctx, 4, 4, 8, 8, 255, 255, 255 );
+    }
+
+    /* Draw a red box if we had to wait for drawing to complete
+     * (software render or texture swap)
+     */
+    if ( r128ctx->c_drawWaits ) {
+	r128ClearBoxLocked( r128ctx, 16, 4, 8, 8, 255, 0, 0 );
+    }
+
+    /* Draw a yellow box if textures were swapped */
+    if ( r128ctx->c_textureSwaps ) {
+	r128ClearBoxLocked( r128ctx, 40, 4, 8, 8, 255, 255, 0 );
+    }
+
+    /* Draw a green box if we had to wait for the previous frame
+     * to complete (full utilization)
+     */
+    if ( !r128ctx->hardwareWentIdle ) {
+	r128ClearBoxLocked( r128ctx, 64, 4, 8, 8, 0, 255, 0 );
+    }
+
+    /* Draw bars to represent the utilization of the vertex buffers */
+    r128ClearBoxLocked( r128ctx, 4, 16, 252, 4, 32, 32, 32 );
+    t = r128ctx->r128Screen->vbRgn.size / r128ctx->r128Screen->vbBufSize;
+    w = 252 * r128ctx->c_vertexBuffers / t;
+    if ( w < 1 ) {
+	w = 1;
+    }
+    if ( r128ctx->c_vertexBuffers > t ) {
+	r128ClearBoxLocked( r128ctx, 4, 16, 252, 4, 255, 32, 32 );
+    } else {
+	r128ClearBoxLocked( r128ctx, 4, 16, w, 4, 196, 128, 128 );
+    }
+}
+
+#endif /* ENABLE_PERF_BOXES */
+
+
+static void delay( void ) {
+/* Prevent an optimizing compiler from removing a spin loop */
+}
+
+/* Throttle the frame rate -- only allow one pending swap buffers
+ * request at a time.
+ * GTH: We probably don't want a timeout here, as we can wait as
+ * long as we want for a frame to complete.  If it never does, then
+ * the card has locked.
+ */
+static int r128WaitForFrameCompletion( r128ContextPtr r128ctx )
+{
+    unsigned char *R128MMIO = r128ctx->r128Screen->mmio;
+    CARD32 swapAge;
+    int i;
+    int wait = 0;
+
+    while ( 1 ) {
+	swapAge = INREG( R128_SWAP_AGE_REG );
+	if ( r128ctx->lastSwapAge <= swapAge ) {
+	    break;
+	}
+
+	/* Spin in place a bit so we aren't hammering the register */
+	wait++;
+	for ( i = 0 ; i < 256 ; i++ ) {
+	    delay();
+	}
+    }
+
+    /* Increment the frame counter */
+    r128ctx->lastSwapAge = ++swapAge;
+
+    return wait;
+}
+
+
+
+/* Copy the back color buffer to the front color buffer */
+void r128SwapBuffers(r128ContextPtr r128ctx)
+{
+    __DRIdrawablePrivate *dPriv = r128ctx->driDrawable;
+    int                   nc;
+    XF86DRIClipRectPtr    c;
+    int                   dst_bpp;
+
+    switch (r128ctx->r128Screen->bpp) {
+    case 8:
+	dst_bpp = R128_GMC_DST_8BPP_CI;
+	break;
+    case 16:
+	if (r128ctx->r128Screen->depth == 15) dst_bpp = R128_GMC_DST_15BPP;
+	else                                  dst_bpp = R128_GMC_DST_16BPP;
+	break;
+    case 24:
+	dst_bpp = R128_GMC_DST_24BPP;
+	break;
+    case 32:
+    default:
+	dst_bpp = R128_GMC_DST_32BPP;
+	break;
+    }
+
+    LOCK_HARDWARE(r128ctx);
+
+    /* Flush any outstanding vertex buffers */
+    r128FlushVerticesLocked(r128ctx);
+
+    /* Throttle the frame rate -- only allow one pending swap buffers
+     * request at a time.
+     */
+    if ( !r128WaitForFrameCompletion(r128ctx) ) {
+	r128ctx->hardwareWentIdle = 1;
+    } else {
+	r128ctx->hardwareWentIdle = 0;
+    }
+
+#if ENABLE_PERF_BOXES
+    /* Draw the performance boxes */
+    r128PerformanceBoxesLocked(r128ctx);
+#endif
+
+    /* Init the clip rects here in case they changed during the
+       LOCK_HARDWARE macro */
+    c  = dPriv->pClipRects;
+    nc = dPriv->numClipRects;
+
+    /* Cycle through the clip rects */
+    while (nc--) {
+	int fx = c[nc].x1;
+	int fy = c[nc].y1;
+	int fw = c[nc].x2 - fx;
+	int fh = c[nc].y2 - fy;
+	int bx = fx + r128ctx->r128Screen->backX;
+	int by = fy + r128ctx->r128Screen->backY;
+
+	fx += r128ctx->r128Screen->fbX;
+	fy += r128ctx->r128Screen->fbY;
+
+	R128CCE3(R128_CCE_PACKET3_CNTL_BITBLT_MULTI, 3);
+	R128CCE(R128_GMC_BRUSH_NONE
+		| R128_GMC_SRC_DATATYPE_COLOR
+		| R128_DP_SRC_SOURCE_MEMORY
+		| dst_bpp
+		| R128_ROP3_S);
+	R128CCE((bx << 16) | by);
+	R128CCE((fx << 16) | fy);
+	R128CCE((fw << 16) | fh);
+    }
+
+    R128CCE0(R128_CCE_PACKET0, R128_SWAP_AGE_REG, 0);
+    R128CCE(r128ctx->lastSwapAge);
+
+    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+/*      r128ctx->dirty_context |= R128_CTX_ALL_DIRTY; */
+    r128ctx->dirty_context |= (R128_CTX_MISC        |
+			       R128_CTX_ENGINESTATE |
+			       R128_CTX_ALPHASTATE);
+
+    R128CCE_SUBMIT_PACKET();
+
+    UNLOCK_HARDWARE(r128ctx);
+
+#if ENABLE_PERF_BOXES
+    /* Log the performance counters if necessary */
+    r128PerformanceCounters(r128ctx);
+#endif
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_swap.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_swap.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_swap.h	Fri Jun 16 17:03:07 2000
@@ -0,0 +1,58 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_swap.h,v 1.1 2000/06/17 00:03:07 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_SWAP_H_
+#define _R128_SWAP_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+extern void r128SwapBuffers(r128ContextPtr r128ctx);
+
+#if ENABLE_PERF_BOXES
+extern void r128PerformanceBoxesLocked(r128ContextPtr r128ctx);
+
+static __inline void r128PerformanceCounters( r128ContextPtr r128ctx )
+{
+    r128ctx->c_clears = 0;
+    r128ctx->c_drawWaits = 0;
+
+    r128ctx->c_textureSwaps = 0;
+    r128ctx->c_textureBytes = 0;
+
+    r128ctx->c_vertexBuffers = 0;
+}
+#endif
+
+#endif
+#endif /* _R128_SWAP_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_tex.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_tex.c:1.2
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_tex.c	Sun Jun 25 22:41:29 2000
@@ -0,0 +1,1872 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tex.c,v 1.2 2000/06/26 05:41:29 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Gareth Hughes <gareth@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_state.h"
+#include "r128_reg.h"
+#include "r128_cce.h"
+#include "r128_vb.h"
+#include "r128_tex.h"
+
+#include "mmath.h"
+#include "simple_list.h"
+
+static void r128SetTexWrap(r128TexObjPtr t, GLenum srwap, GLenum twrap);
+static void r128SetTexFilter(r128TexObjPtr t, GLenum minf, GLenum magf);
+static void r128SetTexBorderColor(r128TexObjPtr t, GLubyte c[4]);
+
+/* Allocate and initialize hardware state associated with texture `t' */
+/* NOTE: This function is only called while holding the hardware lock */
+static r128TexObjPtr r128CreateTexObj(r128ContextPtr r128ctx,
+				      struct gl_texture_object *tObj)
+{
+    r128TexObjPtr            t;
+    struct gl_texture_image *image;
+    int                      log2Pitch, log2Height, log2Size, log2MinSize;
+    int                      totalSize;
+    int                      i;
+
+    image = tObj->Image[0];
+    if (!image) return NULL; /* ERROR!!! */
+
+    t = (r128TexObjPtr)calloc(1,sizeof(*t));
+    if (!t) return NULL;     /* ERROR!!! */
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API)
+	fprintf(stderr, "r128CreateTexObj(%p)\n", tObj);
+
+    switch (image->Format) {
+    case GL_RGBA:
+    case GL_ALPHA:
+    case GL_LUMINANCE_ALPHA:
+    case GL_INTENSITY:
+	if (r128ctx->r128Screen->bpp == 32) {
+	    t->texelBytes    = 4;
+	    t->textureFormat = R128_DATATYPE_ARGB8888;
+	} else {
+	    t->texelBytes    = 2;
+	    t->textureFormat = R128_DATATYPE_ARGB4444;
+	}
+	break;
+
+    case GL_RGB:
+	if (r128ctx->r128Screen->bpp == 32) {
+	    t->texelBytes    = 4;
+	    t->textureFormat = R128_DATATYPE_ARGB8888;
+	} else {
+	    t->texelBytes    = 2;
+	    t->textureFormat = R128_DATATYPE_RGB565;
+	}
+	break;
+
+    case GL_LUMINANCE:
+	if (r128ctx->r128Screen->bpp == 32) {
+	    t->texelBytes    = 4;
+	    t->textureFormat = R128_DATATYPE_ARGB8888;
+	} else {
+	    t->texelBytes    = 2;
+					/* Use this to get true greys */
+	    t->textureFormat = R128_DATATYPE_ARGB1555;
+	}
+	break;
+
+    case GL_COLOR_INDEX:
+	t->texelBytes    = 1;
+	t->textureFormat = R128_DATATYPE_CI8;
+	break;
+
+    default:
+	/* ERROR!!! */
+	fprintf(stderr, "r128CreateTexObj: bad image->Format\n");
+	free(t);
+	return NULL;
+    }
+
+    /* Calculate dimensions in log domain */
+    for (i = 1, log2Height = 0; i < image->Height; i *= 2) log2Height++;
+    for (i = 1, log2Pitch = 0;  i < image->Width;  i *= 2) log2Pitch++;
+    if (image->Width > image->Height) log2Size = log2Pitch;
+    else                              log2Size = log2Height;
+
+    t->dirty_images = 0;
+
+    /* Calculate mipmap offsets and dimensions */
+    totalSize = 0;
+    for (i = 0; i <= log2Size && tObj->Image[i]; i++) {
+	t->image[i].offset  = totalSize;
+	t->image[i].width   = tObj->Image[i]->Width;
+	t->image[i].height  = tObj->Image[i]->Height;
+	t->dirty_images    |= 1 << i;
+	totalSize          += (tObj->Image[i]->Height *
+			       tObj->Image[i]->Width *
+			       t->texelBytes);
+
+	/* Offsets must be 32-byte aligned for host data blits */
+	totalSize           = (totalSize + 31) & ~31;
+    }
+    log2MinSize = log2Size - i + 1;
+
+    t->totalSize    = totalSize;
+    t->internFormat = image->IntFormat;
+
+    t->bound        = 0;
+    t->heap         = 0; /* This is set in r128UploadTexImages */
+    t->tObj         = tObj;
+
+    t->memBlock     = NULL;
+    t->bufAddr      = NULL;
+
+    t->regs.tex_cntl         = t->textureFormat;
+    t->regs.size_pitch       = ((log2Pitch   << R128_TEX_PITCH_SHIFT)  |
+				(log2Size    << R128_TEX_SIZE_SHIFT)   |
+				(log2Height  << R128_TEX_HEIGHT_SHIFT) |
+				(log2MinSize << R128_TEX_MIN_SIZE_SHIFT));
+    t->regs.border_color     = 0x00000000;
+
+    if (log2MinSize == log2Size ||
+	log2MinSize != 0)
+	t->regs.tex_cntl |= R128_MIP_MAP_DISABLE;
+
+    r128SetTexWrap(t, tObj->WrapS, tObj->WrapT);
+    r128SetTexFilter(t, tObj->MinFilter, tObj->MagFilter);
+    r128SetTexBorderColor(t, tObj->BorderColor);
+
+    tObj->DriverData = t;
+
+    make_empty_list(t);
+
+    return t;
+}
+
+/* Destroy hardware state associated with texture `t' */
+/* NOTE: This function can be called while holding the hardware lock and
+   while not holding the lock*/
+void r128DestroyTexObj(r128ContextPtr r128ctx, r128TexObjPtr t)
+{
+#if ENABLE_PERF_BOXES
+    /* Bump the performace counter */
+    r128ctx->c_textureSwaps++;
+#endif
+    if (!t) return;
+
+    if (t->memBlock) {
+	mmFreeMem(t->memBlock);
+	t->memBlock = NULL;
+    }
+
+    if (t->tObj)  t->tObj->DriverData                = NULL;
+    if (t->bound) r128ctx->CurrentTexObj[t->bound-1] = NULL;
+
+    remove_from_list(t);
+    free(t);
+}
+
+/* Keep track of swapped out texture objects */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128SwapOutTexObj(r128ContextPtr r128ctx, r128TexObjPtr t)
+{
+#if ENABLE_PERF_BOXES
+    /* Bump the performace counter */
+    r128ctx->c_textureSwaps++;
+#endif
+    if (t->memBlock) {
+	mmFreeMem(t->memBlock);
+	t->memBlock = NULL;
+    }
+
+    t->dirty_images = ~0;
+    move_to_tail(&r128ctx->SwappedOut, t);
+}
+
+/* Print out debugging information about texture LRU */
+void r128PrintLocalLRU(r128ContextPtr r128ctx, int heap)
+{
+    r128TexObjPtr t;
+    int           sz = 1 << (r128ctx->r128Screen->log2TexGran[heap]);
+
+    foreach(t, &r128ctx->TexObjList[heap]) {
+	if (!t->tObj) {
+	    fprintf(stderr, "Placeholder %d at 0x%x sz 0x%x\n",
+		    t->memBlock->ofs / sz,
+		    t->memBlock->ofs,
+		    t->memBlock->size);
+	} else {
+	    fprintf(stderr, "Texture (bound %d) at 0x%x sz 0x%x\n",
+		    t->bound,
+		    t->memBlock->ofs,
+		    t->memBlock->size);
+	}
+    }
+}
+
+void r128PrintGlobalLRU(r128ContextPtr r128ctx, int heap)
+{
+    R128TexRegion *list = r128ctx->r128Screen->SAREA->texList[heap];
+    int            i, j;
+
+    for (i = 0, j = R128_NR_TEX_REGIONS ; i < R128_NR_TEX_REGIONS ; i++) {
+	fprintf(stderr, "list[%d] age %d next %d prev %d\n",
+		j, list[j].age, list[j].next, list[j].prev);
+	j = list[j].next;
+	if (j == R128_NR_TEX_REGIONS) break;
+    }
+
+    if (j != R128_NR_TEX_REGIONS) {
+	fprintf(stderr, "Loop detected in global LRU\n");
+    }
+}
+
+/* Reset the global texture LRU */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128ResetGlobalLRU(r128ContextPtr r128ctx, int heap)
+{
+    R128TexRegion *list   = r128ctx->r128Screen->SAREA->texList[heap];
+    int            log2sz = 1 << r128ctx->r128Screen->log2TexGran[heap];
+    int            i;
+
+    /*
+     * (Re)initialize the global circular LRU list.  The last element in
+     * the array (R128_NR_TEX_REGIONS) is the sentinal.  Keeping it at
+     * the end of the array allows it to be addressed rationally when
+     * looking up objects at a particular location in texture memory.
+     */
+
+    for (i = 0; (i+1) * log2sz <= r128ctx->r128Screen->texSize[heap]; i++) {
+	list[i].prev = i-1;
+	list[i].next = i+1;
+	list[i].age = 0;
+    }
+
+    i--;
+    list[0].prev = R128_NR_TEX_REGIONS;
+    list[i].prev = i-1;
+    list[i].next = R128_NR_TEX_REGIONS;
+    list[R128_NR_TEX_REGIONS].prev = i;
+    list[R128_NR_TEX_REGIONS].next = 0;
+    r128ctx->r128Screen->SAREA->texAge[heap] = 0;
+}
+
+/* Update the local and glock texture LRUs */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128UpdateTexLRU(r128ContextPtr r128ctx, r128TexObjPtr t)
+{
+    int            heap   = t->heap;
+    R128TexRegion *list = r128ctx->r128Screen->SAREA->texList[heap];
+    int            log2sz = r128ctx->r128Screen->log2TexGran[heap];
+
+    int            start  = t->memBlock->ofs >> log2sz;
+    int            end    = (t->memBlock->ofs + t->memBlock->size-1) >> log2sz;
+    int            i;
+
+    r128ctx->lastTexAge[heap] = ++r128ctx->r128Screen->SAREA->texAge[heap];
+
+    /* Update our local LRU */
+    move_to_head(&r128ctx->TexObjList[heap], t);
+
+    /* Update the global LRU */
+    for (i = start ; i <= end ; i++) {
+	list[i].in_use = 1;
+	list[i].age = r128ctx->lastTexAge[heap];
+
+	/* remove_from_list(i) */
+	list[(CARD32)list[i].next].prev = list[i].prev;
+	list[(CARD32)list[i].prev].next = list[i].next;
+
+	/* insert_at_head(list, i) */
+	list[i].prev = R128_NR_TEX_REGIONS;
+	list[i].next = list[R128_NR_TEX_REGIONS].next;
+	list[(CARD32)list[R128_NR_TEX_REGIONS].next].prev = i;
+	list[R128_NR_TEX_REGIONS].next = i;
+    }
+}
+
+/* Update our notion of what textures have been changed since we last
+   held the lock.  This pertains to both our local textures and the
+   textures belonging to other clients.  Keep track of other client's
+   textures by pushing a placeholder texture onto the LRU list -- these
+   are denoted by (tObj == NULL). */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128TexturesGone(r128ContextPtr r128ctx, int heap,
+			     int offset, int size, int in_use)
+{
+    r128TexObjPtr t, tmp;
+
+    foreach_s (t, tmp, &r128ctx->TexObjList[heap]) {
+	if (t->memBlock->ofs >= offset + size ||
+	    t->memBlock->ofs + t->memBlock->size <= offset)
+	    continue;
+
+	/* It overlaps - kick it out.  Need to hold onto the currently
+	   bound objects, however. */
+	if (t->bound) r128SwapOutTexObj(r128ctx, t);
+	else          r128DestroyTexObj(r128ctx, t);
+    }
+
+    if (in_use) {
+	t = (r128TexObjPtr) calloc(1,sizeof(*t));
+	if (!t) return;
+
+	t->memBlock = mmAllocMem(r128ctx->texHeap[heap], size, 0, offset);
+	insert_at_head(&r128ctx->TexObjList[heap], t);
+    }
+}
+
+/* Update our client's shared texture state.  If another client has
+   modified a region in which we have textures, then we need to figure
+   out which of our textures has been removed, and update our global
+   LRU. */
+void r128AgeTextures(r128ContextPtr r128ctx, int heap)
+{
+    R128SAREAPrivPtr sarea = r128ctx->r128Screen->SAREA;
+
+    if (sarea->texAge[heap] != r128ctx->lastTexAge[heap]) {
+	int log2sz = 1 << r128ctx->r128Screen->log2TexGran[heap];
+	int nr     = 0;
+	int idx;
+
+	for (idx = sarea->texList[heap][R128_NR_TEX_REGIONS].prev;
+	     idx != R128_NR_TEX_REGIONS && nr < R128_NR_TEX_REGIONS;
+	     idx = sarea->texList[heap][idx].prev, nr++) {
+
+	    /* If switching texturing schemes, then the SAREA might not
+               have been properly cleared, so we need to reset the
+               global texture LRU. */
+	    if (idx * log2sz > r128ctx->r128Screen->texSize[heap]) {
+		nr = R128_NR_TEX_REGIONS;
+		break;
+	    }
+
+	    if (sarea->texList[heap][idx].age > r128ctx->lastTexAge[heap])
+		r128TexturesGone(r128ctx, heap, idx * log2sz, log2sz,
+				 sarea->texList[heap][idx].in_use);
+	}
+
+	if (nr == R128_NR_TEX_REGIONS) {
+	    r128TexturesGone(r128ctx, heap,
+			     0, r128ctx->r128Screen->texSize[heap], 0);
+	    r128ResetGlobalLRU(r128ctx, heap);
+	}
+
+	r128ctx->dirty |= R128_UPDATE_TEX0IMAGES;
+	r128ctx->dirty |= R128_UPDATE_TEX1IMAGES;
+	r128ctx->lastTexAge[heap] = sarea->texAge[heap];
+    }
+}
+
+/* Convert a block of Mesa-formatted texture to an 8bpp hardware format */
+static void r128ConvertTexture8bpp(r128ContextPtr r128ctx,
+				   struct gl_texture_image *image,
+				   int x, int y, int width, int height,
+				   int pitch)
+{
+    CARD8  *src;
+    CARD32  pix;
+    int     i, j;
+
+    switch (image->Format) {
+    case GL_RGB:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x) * 3;
+	    for (j = width >> 2; j; j--) {
+		pix = ((R128PACKCOLOR332( src[0], src[1],  src[2])       ) |
+		       (R128PACKCOLOR332( src[3], src[4],  src[5])  <<  8) |
+		       (R128PACKCOLOR332( src[6], src[7],  src[8])  << 16) |
+		       (R128PACKCOLOR332( src[9], src[10], src[11]) << 24));
+		R128CCE(pix);
+		src += 12;
+	    }
+	}
+	break;
+
+    case GL_ALPHA:
+    case GL_LUMINANCE:
+    case GL_INTENSITY:
+    case GL_COLOR_INDEX:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x);
+	    for (j = width >> 2; j; j--) {
+		pix = src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
+		R128CCE(pix);
+		src += 4;
+	    }
+	}
+	break;
+
+    default:
+	fprintf(stderr, "r128ConvertTexture8bpp: unsupported format 0x%x\n",
+		image->Format);
+    }
+}
+
+/* Convert a block of Mesa-formatted texture to a 16bpp hardware format */
+static void r128ConvertTexture16bpp(r128ContextPtr r128ctx,
+				    struct gl_texture_image *image,
+				    int x, int y, int width, int height,
+				    int pitch)
+{
+    CARD8  *src;
+    CARD32  pix;
+    int     i, j;
+
+    switch (image->Format) {
+    case GL_RGB:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x) * 3;
+	    for (j = width >> 1; j; j--) {
+		pix = ((R128PACKCOLOR565(src[0], src[1], src[2])      ) |
+		       (R128PACKCOLOR565(src[3], src[4], src[5]) << 16));
+		R128CCE(pix);
+		src += 6;
+	    }
+	}
+	break;
+
+    case GL_RGBA:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x) * 4;
+	    for (j = width >> 1; j; j--) {
+		pix =
+		    ((R128PACKCOLOR4444(src[0], src[1], src[2], src[3])    ) |
+		     (R128PACKCOLOR4444(src[4], src[5], src[6], src[7])<<16));
+		R128CCE(pix);
+		src += 8;
+	    }
+	}
+	break;
+
+    case GL_ALPHA:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x);
+	    for (j = width >> 1; j; j--) {
+		pix = ((R128PACKCOLOR4444(0xff, 0xff, 0xff, src[0])      ) |
+		       (R128PACKCOLOR4444(0xff, 0xff, 0xff, src[1]) << 16));
+		R128CCE(pix);
+		src += 2;
+	    }
+	}
+	break;
+
+    case GL_LUMINANCE:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x);
+	    for (j = width >> 1; j; j--) {
+		pix = ((R128PACKCOLOR1555(src[0], src[0], src[0], 0xff)    ) |
+		       (R128PACKCOLOR1555(src[1], src[1], src[1], 0xff)<<16));
+		R128CCE(pix);
+		src += 2;
+	    }
+	}
+	break;
+
+    case GL_LUMINANCE_ALPHA:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x) * 2;
+	    for (j = width >> 1; j; j--) {
+		pix =
+		    ((R128PACKCOLOR4444(src[0], src[0], src[0], src[1])    ) |
+		     (R128PACKCOLOR4444(src[2], src[2], src[2], src[3])<<16));
+		R128CCE(pix);
+		src += 4;
+	    }
+	}
+	break;
+
+    case GL_INTENSITY:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x);
+	    for (j = width >> 1; j; j--) {
+		pix =
+		    ((R128PACKCOLOR4444(src[0], src[0], src[0], src[0])    ) |
+		     (R128PACKCOLOR4444(src[1], src[1], src[1], src[1])<<16));
+		R128CCE(pix);
+		src += 2;
+	    }
+	}
+	break;
+
+    default:
+	fprintf(stderr, "r128ConvertTexture16bpp: unsupported format 0x%x\n",
+		image->Format);
+    }
+}
+
+/* Convert a block of Mesa-formatted texture to a 32bpp hardware format */
+static void r128ConvertTexture32bpp(r128ContextPtr r128ctx,
+				    struct gl_texture_image *image,
+				    int x, int y, int width, int height,
+				    int pitch)
+{
+    CARD8  *src;
+    CARD32  pix;
+    int     i, j;
+
+    switch (image->Format) {
+    case GL_RGB:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x) * 3;
+	    for (j = width; j; j--) {
+		pix = R128PACKCOLOR8888(src[0], src[1], src[2], 0xff);
+		R128CCE(pix);
+		src += 3;
+	    }
+	}
+	break;
+
+    case GL_RGBA:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x) * 4;
+	    for (j = width; j; j--) {
+		pix = R128PACKCOLOR8888(src[0], src[1], src[2], src[3]);
+		R128CCE(pix);
+		src += 4;
+	    }
+	}
+	break;
+
+    case GL_ALPHA:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x);
+	    for (j = width; j; j--) {
+		pix = R128PACKCOLOR8888(0xff, 0xff, 0xff, src[0]);
+		R128CCE(pix);
+		src += 1;
+	    }
+	}
+	break;
+
+    case GL_LUMINANCE:
+	for (i = 0 ; i < height ; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x);
+	    for (j = width; j; j--) {
+		pix = R128PACKCOLOR8888(src[0], src[0], src[0], 0xff);
+		R128CCE(pix);
+		src += 1;
+	    }
+	}
+	break;
+
+    case GL_LUMINANCE_ALPHA:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x) * 2;
+	    for (j = width; j; j-- ) {
+		pix = R128PACKCOLOR8888(src[0], src[0], src[0], src[1]);
+		R128CCE(pix);
+		src += 2;
+	    }
+	}
+	break;
+
+    case GL_INTENSITY:
+	for (i = 0; i < height; i++) {
+	    src = (CARD8 *)image->Data + ((y + i) * pitch + x);
+	    for (j = width; j; j--) {
+		pix = R128PACKCOLOR8888(src[0], src[0], src[0], src[0]);
+		R128CCE(pix);
+		src += 1;
+	    }
+	}
+	break;
+
+    default:
+	fprintf(stderr, "r128ConvertTexture32bpp: unsupported format 0x%x\n",
+		image->Format);
+    }
+}
+
+/* Upload the texture image associated with texture `t' at level `level'
+   at the address relative to `start'. */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128UploadSubImage(r128ContextPtr r128ctx,
+			       r128TexObjPtr t, int level,
+			       int x, int y, int width, int height)
+{
+    struct gl_texture_image *image;
+    int                      texelsPerDword = 0;
+    int                      imageWidth, imageHeight;
+    int                      remaining, rows;
+    int                      format, pitch, dwords;
+    CARD32                   offset;
+
+    /* Ensure we have a valid texture to upload */
+    if (level < 0 || level > R128_TEX_MAXLEVELS) return;
+    if (!(image = t->tObj->Image[level]))        return;
+
+    /* FIXME: support RGB888 (i.e., 24bpp) textures? */
+    switch (t->texelBytes) {
+    case 1: texelsPerDword = 4; break;
+    case 2: texelsPerDword = 2; break;
+    case 4: texelsPerDword = 1; break;
+    }
+
+    imageWidth  = image->Width;
+    imageHeight = image->Height;
+
+    format = t->textureFormat >> 16;
+
+    /* The texel upload routines have a minimum width, so force the size
+       if needed */
+    if (imageWidth < texelsPerDword) {
+	int factor;
+
+	factor        = texelsPerDword / imageWidth;
+	imageWidth    = texelsPerDword;
+	imageHeight /= factor;
+	if (imageHeight == 0) {
+	    /* In this case, the texel converter will actually walk a
+	       texel or two off the end of the image, but normal malloc
+	       alignment should prevent it from ever causing a fault. */
+	    imageHeight = 1;
+	}
+    }
+
+    /* We can't upload to a pitch less than 8 texels so we will need to
+       linearly upload all modified rows for textures smaller than this.
+       This makes the x/y/width/height different for the blitter and the
+       texture walker. */
+    if (imageWidth >= 8) {
+	/* The texture walker and the blitter look identical */
+	pitch      = imageWidth >> 3;
+    } else {
+	int factor;
+	int y2;
+	int start, end;
+
+	start = (y * imageWidth) & ~7;
+	end   = (y + height) * imageWidth;
+
+	if (end - start < 8) {
+	    /* Handle the case where the total number of texels uploaded
+               is < 8 */
+	    x       = 0;
+	    y       = start / 8;
+	    width   = end - start;
+	    height  = 1;
+	} else {
+	    /* Upload some number of full 8 texel blit rows */
+	    factor  = 8 / imageWidth;
+
+	    y2      = y + height - 1;
+	    y      /= factor;
+	    y2     /= factor;
+
+	    x       = 0;
+	    width   = 8;
+	    height  = y2 - y + 1;
+	}
+
+	/* Fixed pitch of 8 */
+	pitch = 1;
+    }
+
+    dwords = width * height / texelsPerDword;
+    offset = (CARD32)(t->bufAddr + t->image[level].offset);
+
+#if ENABLE_PERF_BOXES
+    /* Bump the performace counter */
+    r128ctx->c_textureBytes += (dwords << 2);
+#endif
+
+    /* Fix offset for AGP textures */
+    if (t->heap == R128_AGP_TEX_HEAP)
+	offset += R128_AGP_TEX_OFFSET + r128ctx->r128Screen->agpTexOffset;
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API) {
+	fprintf(stderr, "r128UploadSubImage: %d,%d of %d,%d at %d,%d\n",
+		width, height, image->Width, image->Height, x, y);
+	fprintf(stderr, "          blit ofs: 0x%08x pitch: 0x%x dwords: %d "
+				  "level: %d format: %x\n",
+		(int)offset, pitch, dwords, level, format);
+    }
+
+    /* Subdivide the texture if required */
+    if (dwords < R128_CCE_PACKET_MAX_DWORDS) {
+	rows = height;
+    } else {
+	rows = (R128_CCE_PACKET_MAX_DWORDS * texelsPerDword) / (2 * width);
+    }
+
+    /* Flush the pixel cache, and mark the contents as Read Invalid */
+    R128CCE0(R128_CCE_PACKET0, R128_PC_GUI_CTLSTAT, 0);
+    R128CCE(r128ctx->regs.pc_gui_ctlstat |
+	    R128_PC_RI_GUI               |
+	    R128_PC_FLUSH_GUI);
+    R128CCE_SUBMIT_PACKET();
+
+    /* Build the CCE host data blit header */
+    R128CCE3(R128_CCE_PACKET3_CNTL_HOSTDATA_BLT, 0);
+
+    /* DP_GUI_MASTER_CNTL */
+    R128CCE(R128_GMC_DST_PITCH_OFFSET_CNTL |
+	    R128_GMC_BRUSH_NONE            |
+	    (format << 8)                  |
+	    R128_GMC_SRC_DATATYPE_COLOR    |
+	    R128_ROP3_S                    |
+	    R128_DP_SRC_SOURCE_HOST_DATA   |
+	    R128_GMC_CLR_CMP_CNTL_DIS      |
+	    R128_GMC_AUX_CLIP_DIS          |
+	    R128_GMC_WR_MSK_DIS           );
+
+    /* DST_OFFSET_PITCH - fixed at the moment until we get better ring
+       control */
+    R128CCE((pitch << 21) | (offset>>5));
+
+    /* FRGD_COLOR, BKGD_COLOR */
+    R128CCE(0xffffffff);
+    R128CCE(0xffffffff);
+
+    for (remaining = height; remaining > 0; remaining -= rows, y += rows) {
+	height = (remaining >= rows) ? rows : remaining;
+	dwords = width * height / texelsPerDword;
+
+	if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API) {
+	    fprintf(stderr, "          blitting: %d,%d at %d,%d - %d dwords\n",
+		    width, height, x, y, dwords);
+	}
+
+	r128ctx->CCEbuf[0] &= ~R128_CCE_PACKET_COUNT_MASK;
+	r128ctx->CCEbuf[0] |= (dwords + 6) << 16;
+
+	/* Blit coords, size */
+	R128CCE((y      << 16) | x);
+	R128CCE((height << 16) | width);
+	R128CCE(dwords);
+
+	/* Actually do the texture conversion */
+	switch (t->texelBytes) {
+	case 1:
+	    r128ConvertTexture8bpp(r128ctx, image,
+				   x, y, width, height, width);
+	    break;
+	case 2:
+	    r128ConvertTexture16bpp(r128ctx, image,
+				    x, y, width, height, width);
+	    break;
+	case 4:
+	    r128ConvertTexture32bpp(r128ctx,
+				    image, x, y, width, height, width);
+	    break;
+	}
+
+	/* Flush the pixel cache */
+	R128CCE0(R128_CCE_PACKET0, R128_PC_GUI_CTLSTAT, 0 );
+	R128CCE(r128ctx->regs.pc_gui_ctlstat | R128_PC_FLUSH_GUI);
+
+	/* Save the partial blit header */
+	R128CCE_SUBMIT_PACKET();
+	r128ctx->CCEcount = 5;
+    }
+
+    /* Clean up CCE ring buffer */
+    r128ctx->CCEcount = 0;
+}
+
+/* Upload the texture images associated with texture `t'.  This might
+   require removing our own and/or other client's texture objects to
+   make room for these images. */
+/* NOTE: This function is only called while holding the hardware lock */
+int r128UploadTexImages(r128ContextPtr r128ctx, r128TexObjPtr t)
+{
+    int i;
+    int minLevel;
+    int maxLevel;
+    int heap;
+
+    if (!t) return 0;
+
+    /* Choose the heap appropriately */
+    heap = t->heap = R128_LOCAL_TEX_HEAP;
+    if (!r128ctx->r128Screen->IsPCI &&
+	t->totalSize > r128ctx->r128Screen->texSize[heap])
+	heap = t->heap = R128_AGP_TEX_HEAP;
+
+    /* Do we need to eject LRU texture objects? */
+    if (!t->memBlock) {
+	/* Allocate a memory block on a 4k boundary (1<<12 == 4096) */
+	t->memBlock = mmAllocMem(r128ctx->texHeap[heap], t->totalSize, 12, 0);
+
+	/* Try AGP before kicking anything out of local mem */
+	if (!t->memBlock && heap == R128_LOCAL_TEX_HEAP) {
+	    t->memBlock = mmAllocMem(r128ctx->texHeap[R128_AGP_TEX_HEAP],
+				     t->totalSize, 12, 0);
+
+	    if (t->memBlock) heap = t->heap = R128_AGP_TEX_HEAP;
+	}
+
+	/* Kick out textures until the requested texture fits */
+	while (!t->memBlock) {
+	    if (r128ctx->TexObjList[heap].prev->bound) {
+		fprintf(stderr,
+			"r128UploadTexImages: ran into bound texture\n");
+		return -1;
+	    }
+	    if (r128ctx->TexObjList[heap].prev ==
+		&(r128ctx->TexObjList[heap])) {
+		if (r128ctx->r128Screen->IsPCI) {
+		    fprintf(stderr, "r128UploadTexImages: upload texture "
+			    "failure on local texture heaps, sz=%d\n",
+			    t->totalSize);
+		    return -1;
+		} else if (heap == R128_LOCAL_TEX_HEAP) {
+		    heap = t->heap = R128_AGP_TEX_HEAP;
+		    continue;
+		} else {
+		    fprintf(stderr, "r128UploadTexImages: upload texture "
+			    "failure on both local and AGP texture heaps, "
+			    "sz=%d\n",
+			    t->totalSize);
+		    return -1;
+		}
+	    }
+
+	    r128DestroyTexObj(r128ctx, r128ctx->TexObjList[heap].prev);
+
+	    t->memBlock = mmAllocMem(r128ctx->texHeap[heap],
+				     t->totalSize, 12, 0);
+	}
+
+	/* Set the base offset of the texture image */
+	t->bufAddr = (unsigned char *)r128ctx->r128Screen->texOffset[heap];
+	t->bufAddr += t->memBlock->ofs;
+
+	maxLevel = ((t->regs.size_pitch & R128_TEX_SIZE_MASK) >>
+		    R128_TEX_SIZE_SHIFT);
+	minLevel = ((t->regs.size_pitch & R128_TEX_MIN_SIZE_MASK) >>
+		    R128_TEX_MIN_SIZE_SHIFT);
+
+	/* Update the hardware's texture image addresses */
+	switch (t->bound) {
+	case 1:
+	    /* Set texture offsets */
+	    if (t->regs.tex_cntl & R128_MIP_MAP_DISABLE) {
+		for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+		    r128ctx->regs.prim_tex_offset[i] = (CARD32)t->bufAddr;
+	    } else {
+		for (i = maxLevel; i >= minLevel; i--)
+		    r128ctx->regs.prim_tex_offset[i] =
+			t->image[maxLevel-i].offset + (CARD32)t->bufAddr;
+	    }
+	    /* Fix AGP texture offsets */
+	    if (heap == R128_AGP_TEX_HEAP)
+		for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+		    r128ctx->regs.prim_tex_offset[i] +=
+			R128_AGP_TEX_OFFSET +
+			r128ctx->r128Screen->agpTexOffset;
+	    /* Force loading the new state into the hardware */
+	    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	    r128ctx->dirty_context |= R128_CTX_TEX0STATE;
+	    break;
+
+	case 2:
+	    /* Set texture offsets */
+	    if (t->regs.tex_cntl & R128_MIP_MAP_DISABLE) {
+		for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+		    r128ctx->regs.sec_tex_offset[i] = (CARD32)t->bufAddr;
+	    } else {
+		for (i = maxLevel; i >= minLevel; i--)
+		    r128ctx->regs.sec_tex_offset[i] =
+			t->image[maxLevel-i].offset + (CARD32)t->bufAddr;
+	    }
+	    /* Fix AGP texture offsets */
+	    if (heap == R128_AGP_TEX_HEAP)
+		for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+		    r128ctx->regs.sec_tex_offset[i] +=
+			R128_AGP_TEX_OFFSET +
+			r128ctx->r128Screen->agpTexOffset;
+	    /* Force loading the new state into the hardware */
+	    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	    r128ctx->dirty_context |= R128_CTX_TEX1STATE;
+	    break;
+
+	default:
+	    return -1;
+	}
+    }
+
+    /* Let the world know we've used this memory recently */
+    r128UpdateTexLRU(r128ctx, t);
+
+    /* Upload any images that are new */
+    if (t->dirty_images) {
+	int num_levels = (((t->regs.size_pitch & R128_TEX_SIZE_MASK) >>
+			   R128_TEX_SIZE_SHIFT) -
+			  ((t->regs.size_pitch & R128_TEX_MIN_SIZE_MASK) >>
+			   R128_TEX_MIN_SIZE_SHIFT));
+
+	for (i = 0; i <= num_levels; i++) {
+	    if (t->dirty_images & (1<<i)) {
+		r128UploadSubImage(r128ctx, t, i, 0, 0,
+				   t->image[i].width, t->image[i].height);
+	    }
+	}
+
+	r128ctx->regs.tex_cntl_c |= R128_TEX_CACHE_FLUSH;
+
+	r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	r128ctx->dirty_context |= R128_CTX_ENGINESTATE;
+    }
+
+    t->dirty_images = 0;
+    return 0;
+}
+
+/* Update the hardware state for texture unit 0 */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128UpdateTex0State(r128ContextPtr r128ctx)
+{
+    GLcontext                *ctx = r128ctx->glCtx;
+    r128TexObjPtr             t;
+    struct gl_texture_object *tObj;
+    int                       i;
+    CARD32                    tex_size_pitch, tex_combine_cntl;
+
+    /* Only update the hardware texture state if the texture is current,
+       complete and enabled. */
+    if (!(tObj = ctx->Texture.Unit[0].Current))       return;
+    if ((tObj != ctx->Texture.Unit[0].CurrentD[2]) &&
+	(tObj != ctx->Texture.Unit[0].CurrentD[1]))   return;
+    if (!tObj->Complete)                              return;
+
+    /* If neither tex0 nor tex1 is enabled, then disable tex0.  However,
+       if tex1 is enabled but tex0 is disabled, then we need to enable
+       tex0 and have it to copy the input (see how tex_combine_cntl is
+       setup below). */
+    if (!(ctx->Texture.Enabled & (ENABLE_TEX0 | ENABLE_TEX1))) {
+	r128ctx->regs.tex_cntl_c &= ~R128_TEXMAP_ENABLE;
+	return;
+    }
+
+    r128ctx->regs.scale_3d_cntl &= ~R128_TEX_CACHE_SPLIT;
+
+    /* If this is the first time the texture has been used, then create
+       a new texture object for it. */
+    t = tObj->DriverData;
+    if (!t) t = r128CreateTexObj(r128ctx, tObj);
+    if (!t) return;
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API)
+	fprintf(stderr, "r128UpdateTex0State(%p, 0x%08x)\n",
+		tObj, (int)t->dirty_images);
+
+    /* Force any texture images to be loaded into the hardware */
+    if (t->dirty_images) r128ctx->dirty |= R128_UPDATE_TEX0IMAGES;
+
+    /* Bind texture to texture 0 unit */
+    r128ctx->CurrentTexObj[0] = t;
+    t->bound = 1;
+
+    if (t->memBlock) r128UpdateTexLRU(r128ctx, t);
+
+    /* Set the texture environment state */
+    switch (ctx->Texture.Unit[0].EnvMode) {
+    case GL_REPLACE:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	case GL_LUMINANCE_ALPHA:
+	case GL_INTENSITY:
+	    tex_combine_cntl = (R128_COMB_DIS                |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_DIS          |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_RGB:
+	case GL_LUMINANCE:
+	    tex_combine_cntl = (R128_COMB_DIS                |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_COPY_INP     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_ALPHA:
+	    tex_combine_cntl = (R128_COMB_COPY_INP           |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_DIS          |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    case GL_BLEND:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	case GL_LUMINANCE_ALPHA:
+	    switch (r128ctx->regs.constant_color_c &
+		    R128_CONSTANT_COLOR_MASK) {
+	    case R128_CONSTANT_COLOR_ZERO:
+		tex_combine_cntl = (R128_COMB_MODULATE           |
+				    R128_COLOR_FACTOR_NTEX       |
+				    R128_INPUT_FACTOR_INT_COLOR  |
+				    R128_COMB_ALPHA_MODULATE     |
+				    R128_ALPHA_FACTOR_TEX_ALPHA  |
+				    R128_INP_FACTOR_A_INT_ALPHA);
+		break;
+	    case R128_CONSTANT_COLOR_ONE:
+	    default:
+		tex_combine_cntl = (R128_COMB_MODULATE           |
+				    R128_COLOR_FACTOR_TEX        |
+				    R128_INPUT_FACTOR_INT_COLOR  |
+				    R128_COMB_ALPHA_MODULATE     |
+				    R128_ALPHA_FACTOR_TEX_ALPHA  |
+				    R128_INP_FACTOR_A_INT_ALPHA);
+		r128ctx->Fallback |= R128_FALLBACK_TEXTURE;
+		break;
+	    }
+	    break;
+	case GL_RGB:
+	case GL_LUMINANCE:
+	    switch (r128ctx->regs.constant_color_c &
+		    R128_CONSTANT_COLOR_MASK) {
+	    case R128_CONSTANT_COLOR_ZERO:
+		tex_combine_cntl = (R128_COMB_MODULATE           |
+				    R128_COLOR_FACTOR_NTEX       |
+				    R128_INPUT_FACTOR_INT_COLOR  |
+				    R128_COMB_ALPHA_COPY_INP     |
+				    R128_ALPHA_FACTOR_TEX_ALPHA  |
+				    R128_INP_FACTOR_A_INT_ALPHA);
+		break;
+	    case R128_CONSTANT_COLOR_ONE:
+	    default:
+		tex_combine_cntl = (R128_COMB_MODULATE           |
+				    R128_COLOR_FACTOR_TEX        |
+				    R128_INPUT_FACTOR_INT_COLOR  |
+				    R128_COMB_ALPHA_COPY_INP     |
+				    R128_ALPHA_FACTOR_TEX_ALPHA  |
+				    R128_INP_FACTOR_A_INT_ALPHA);
+		r128ctx->Fallback |= R128_FALLBACK_TEXTURE;
+		break;
+	    }
+	    break;
+	case GL_ALPHA:
+	    tex_combine_cntl = (R128_COMB_COPY_INP           |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_MODULATE     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_INTENSITY:
+	    switch (r128ctx->regs.constant_color_c &
+		    R128_CONSTANT_COLOR_MASK) {
+	    case R128_CONSTANT_COLOR_ZERO:
+		tex_combine_cntl = (R128_COMB_MODULATE           |
+				    R128_COLOR_FACTOR_NTEX       |
+				    R128_INPUT_FACTOR_INT_COLOR  |
+				    R128_COMB_ALPHA_MODULATE     |
+				    R128_ALPHA_FACTOR_NTEX_ALPHA |
+				    R128_INP_FACTOR_A_INT_ALPHA);
+		break;
+	    case R128_CONSTANT_COLOR_ONE:
+	    default:
+		tex_combine_cntl = (R128_COMB_MODULATE           |
+				    R128_COLOR_FACTOR_TEX        |
+				    R128_INPUT_FACTOR_INT_COLOR  |
+				    R128_COMB_ALPHA_MODULATE     |
+				    R128_ALPHA_FACTOR_TEX_ALPHA  |
+				    R128_INP_FACTOR_A_INT_ALPHA);
+		r128ctx->Fallback |= R128_FALLBACK_TEXTURE;
+		break;
+	    }
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    case GL_MODULATE:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	case GL_LUMINANCE_ALPHA:
+	case GL_INTENSITY:
+	    tex_combine_cntl = (R128_COMB_MODULATE           |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_MODULATE     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_RGB:
+	case GL_LUMINANCE:
+	    tex_combine_cntl = (R128_COMB_MODULATE           |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_COPY_INP     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_ALPHA:
+	    tex_combine_cntl = (R128_COMB_COPY_INP           |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_MODULATE     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    case GL_DECAL:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	    tex_combine_cntl = (R128_COMB_BLEND_TEXTURE      |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_COPY_INP     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_RGB:
+	    tex_combine_cntl = (R128_COMB_DIS                |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_COPY_INP     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_ALPHA:
+	case GL_LUMINANCE:
+	case GL_LUMINANCE_ALPHA:
+	case GL_INTENSITY:
+	    /* Undefined behaviour - just copy the input */
+	    tex_combine_cntl = (R128_COMB_COPY_INP           |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_COPY_INP     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    case GL_ADD:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	case GL_LUMINANCE_ALPHA:
+	case GL_INTENSITY:
+	    tex_combine_cntl = (R128_COMB_ADD                |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_MODULATE     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_RGB:
+	case GL_LUMINANCE:
+	    tex_combine_cntl = (R128_COMB_ADD                |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_COPY_INP     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_ALPHA:
+	    tex_combine_cntl = (R128_COMB_COPY_INP           |
+				R128_COLOR_FACTOR_TEX        |
+				R128_INPUT_FACTOR_INT_COLOR  |
+				R128_COMB_ALPHA_MODULATE     |
+				R128_ALPHA_FACTOR_TEX_ALPHA  |
+				R128_INP_FACTOR_A_INT_ALPHA);
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    default:
+	return;
+    }
+
+    /* If tex0 is disabled, then make sure it just copies the input */
+    if (!(ctx->Texture.Enabled & ENABLE_TEX0))
+	tex_combine_cntl = (R128_COMB_COPY_INP           |
+			    R128_COLOR_FACTOR_TEX        |
+			    R128_INPUT_FACTOR_INT_COLOR  |
+			    R128_COMB_ALPHA_COPY_INP     |
+			    R128_ALPHA_FACTOR_TEX_ALPHA  |
+			    R128_INP_FACTOR_A_INT_ALPHA);
+
+    /* Enable tex0 */
+    r128ctx->regs.tex_cntl_c |= R128_TEXMAP_ENABLE;
+
+    tex_size_pitch  = r128ctx->regs.tex_size_pitch_c;
+    tex_size_pitch &= ~R128_TEX_SIZE_PITCH_MASK;
+    tex_size_pitch |= t->regs.size_pitch << R128_TEX_SIZE_PITCH_SHIFT;
+
+    /* Set the primary texture state in r128ctx->regs */
+    r128ctx->regs.prim_tex_cntl_c             = t->regs.tex_cntl;
+    r128ctx->regs.prim_texture_combine_cntl_c = tex_combine_cntl;
+    r128ctx->regs.tex_size_pitch_c            = tex_size_pitch;
+    r128ctx->regs.prim_texture_border_color_c = t->regs.border_color;
+
+    /* Set texture offsets */
+    if (t->regs.tex_cntl & R128_MIP_MAP_DISABLE) {
+	for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+	    r128ctx->regs.prim_tex_offset[i] = (CARD32)t->bufAddr;
+    } else {
+	int maxLevel = ((t->regs.size_pitch & R128_TEX_SIZE_MASK) >>
+			R128_TEX_SIZE_SHIFT);
+	int minLevel = ((t->regs.size_pitch & R128_TEX_MIN_SIZE_MASK) >>
+			R128_TEX_MIN_SIZE_SHIFT);
+	for (i = maxLevel; i >= minLevel; i--)
+	    r128ctx->regs.prim_tex_offset[i] =
+		t->image[maxLevel-i].offset + (CARD32)t->bufAddr;
+    }
+    /* Fix AGP texture offsets */
+    if (t->heap == R128_AGP_TEX_HEAP)
+	for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+	    r128ctx->regs.prim_tex_offset[i] +=
+		R128_AGP_TEX_OFFSET + r128ctx->r128Screen->agpTexOffset;
+
+    /* Force loading the new state into the hardware */
+    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+    r128ctx->dirty_context |= R128_CTX_TEX0STATE | R128_CTX_ENGINESTATE;
+}
+
+/* Update the hardware state for texture unit 1 */
+/* NOTE: This function is only called while holding the hardware lock */
+static void r128UpdateTex1State(r128ContextPtr r128ctx)
+{
+    GLcontext                *ctx = r128ctx->glCtx;
+    r128TexObjPtr             t;
+    struct gl_texture_object *tObj;
+    int                       i;
+    CARD32                    tex_size_pitch, tex_combine_cntl, tex_cntl;
+
+    /* Only update the hardware texture state if the texture is current,
+       complete and enabled. */
+    if (!(tObj = ctx->Texture.Unit[1].Current))       return;
+    if ((tObj != ctx->Texture.Unit[1].CurrentD[2]) &&
+	(tObj != ctx->Texture.Unit[1].CurrentD[1]))   return;
+    if (!tObj->Complete)                              return;
+
+    /* If tex1 is not enabled, then disable it */
+    if (!(ctx->Texture.Enabled & ENABLE_TEX1)) {
+	r128ctx->regs.tex_cntl_c &= ~R128_SEC_TEXMAP_ENABLE;
+	return;
+    }
+
+    /* If te1 is enabled, split the texel cache */
+    r128ctx->regs.scale_3d_cntl |= R128_TEX_CACHE_SPLIT;
+
+    /* If this is the first time the texture has been used, then create
+       a new texture object for it. */
+    t = tObj->DriverData;
+    if (!t) t = r128CreateTexObj(r128ctx, tObj);
+    if (!t) return;
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API)
+	fprintf(stderr, "r128UpdateTex1State(%p, 0x%08x)\n",
+		tObj, (int)t->dirty_images);
+
+    /* Force any texture images to be loaded into the hardware */
+    if (t->dirty_images) r128ctx->dirty |= R128_UPDATE_TEX1IMAGES;
+
+    /* Bind texture to texture 1 unit */
+    r128ctx->CurrentTexObj[1] = t;
+    t->bound = 2;
+
+    if (t->memBlock) r128UpdateTexLRU(r128ctx, t);
+
+    /* Set the texture environment state */
+    switch (ctx->Texture.Unit[1].EnvMode) {
+    case GL_REPLACE:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	case GL_LUMINANCE_ALPHA:
+	case GL_INTENSITY:
+	    tex_combine_cntl = (R128_COMB_DIS                 |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_DIS           |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_RGB:
+	case GL_LUMINANCE:
+	    tex_combine_cntl = (R128_COMB_DIS                 |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_COPY_INP      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_ALPHA:
+	    tex_combine_cntl = (R128_COMB_COPY_INP            |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_DIS           |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    case GL_BLEND:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	case GL_LUMINANCE_ALPHA:
+	    switch ( r128ctx->regs.constant_color_c & R128_CONSTANT_COLOR_MASK ) {
+	    case R128_CONSTANT_COLOR_ZERO:
+		tex_combine_cntl = (R128_COMB_MODULATE            |
+				    R128_COLOR_FACTOR_NTEX        |
+				    R128_INPUT_FACTOR_PREV_COLOR  |
+				    R128_COMB_ALPHA_MODULATE      |
+				    R128_ALPHA_FACTOR_TEX_ALPHA   |
+				    R128_INP_FACTOR_A_PREV_ALPHA);
+		break;
+	    case R128_CONSTANT_COLOR_ONE:
+	    default:
+		tex_combine_cntl = (R128_COMB_MODULATE            |
+				    R128_COLOR_FACTOR_TEX         |
+				    R128_INPUT_FACTOR_PREV_COLOR  |
+				    R128_COMB_ALPHA_MODULATE      |
+				    R128_ALPHA_FACTOR_TEX_ALPHA   |
+				    R128_INP_FACTOR_A_PREV_ALPHA);
+		r128ctx->Fallback |= R128_FALLBACK_TEXTURE;
+		break;
+	    }
+	    break;
+	case GL_RGB:
+	case GL_LUMINANCE:
+	    switch (r128ctx->regs.constant_color_c &
+		    R128_CONSTANT_COLOR_MASK) {
+	    case R128_CONSTANT_COLOR_ZERO:
+		tex_combine_cntl = (R128_COMB_MODULATE            |
+				    R128_COLOR_FACTOR_NTEX        |
+				    R128_INPUT_FACTOR_PREV_COLOR  |
+				    R128_COMB_ALPHA_COPY_INP      |
+				    R128_ALPHA_FACTOR_TEX_ALPHA   |
+				    R128_INP_FACTOR_A_PREV_ALPHA );
+		break;
+	    case R128_CONSTANT_COLOR_ONE:
+	    default:
+		tex_combine_cntl = (R128_COMB_MODULATE            |
+				    R128_COLOR_FACTOR_TEX         |
+				    R128_INPUT_FACTOR_PREV_COLOR  |
+				    R128_COMB_ALPHA_COPY_INP      |
+				    R128_ALPHA_FACTOR_TEX_ALPHA   |
+				    R128_INP_FACTOR_A_PREV_ALPHA );
+		r128ctx->Fallback |= R128_FALLBACK_TEXTURE;
+		break;
+	    }
+	    break;
+	case GL_ALPHA:
+	    tex_combine_cntl = (R128_COMB_COPY_INP            |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_MODULATE      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_INTENSITY:
+	    switch (r128ctx->regs.constant_color_c &
+		    R128_CONSTANT_COLOR_MASK) {
+	    case R128_CONSTANT_COLOR_ZERO:
+		tex_combine_cntl = (R128_COMB_MODULATE            |
+				    R128_COLOR_FACTOR_NTEX        |
+				    R128_INPUT_FACTOR_PREV_COLOR  |
+				    R128_COMB_ALPHA_MODULATE      |
+				    R128_ALPHA_FACTOR_NTEX_ALPHA  |
+				    R128_INP_FACTOR_A_PREV_ALPHA);
+		break;
+	    case R128_CONSTANT_COLOR_ONE:
+	    default:
+		tex_combine_cntl = (R128_COMB_MODULATE            |
+				    R128_COLOR_FACTOR_TEX         |
+				    R128_INPUT_FACTOR_PREV_COLOR  |
+				    R128_COMB_ALPHA_MODULATE      |
+				    R128_ALPHA_FACTOR_TEX_ALPHA   |
+				    R128_INP_FACTOR_A_PREV_ALPHA);
+		r128ctx->Fallback |= R128_FALLBACK_TEXTURE;
+		break;
+	    }
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    case GL_MODULATE:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	case GL_LUMINANCE_ALPHA:
+	case GL_INTENSITY:
+	    tex_combine_cntl = (R128_COMB_MODULATE            |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_MODULATE      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_RGB:
+	case GL_LUMINANCE:
+	    tex_combine_cntl = (R128_COMB_MODULATE            |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_COPY_INP      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_ALPHA:
+	    tex_combine_cntl = (R128_COMB_COPY_INP            |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_MODULATE      |
+				 R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    case GL_DECAL:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	    tex_combine_cntl = (R128_COMB_BLEND_TEXTURE       |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_COPY_INP      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_RGB:
+	    tex_combine_cntl = (R128_COMB_DIS                 |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_COPY_INP      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_ALPHA:
+	case GL_LUMINANCE:
+	case GL_LUMINANCE_ALPHA:
+	case GL_INTENSITY:
+	    /* Undefined behaviour - just copy the input */
+	    tex_combine_cntl = (R128_COMB_COPY_INP            |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_COPY_INP      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    case GL_ADD:
+	switch (tObj->Image[0]->Format) {
+	case GL_RGBA:
+	case GL_LUMINANCE_ALPHA:
+	case GL_INTENSITY:
+	    tex_combine_cntl = (R128_COMB_ADD                 |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_MODULATE      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_RGB:
+	case GL_LUMINANCE:
+	    tex_combine_cntl = (R128_COMB_ADD                 |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_COPY_INP      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_ALPHA:
+	    tex_combine_cntl = (R128_COMB_COPY_INP            |
+				R128_COLOR_FACTOR_TEX         |
+				R128_INPUT_FACTOR_PREV_COLOR  |
+				R128_COMB_ALPHA_MODULATE      |
+				R128_ALPHA_FACTOR_TEX_ALPHA   |
+				R128_INP_FACTOR_A_PREV_ALPHA);
+	    break;
+	case GL_COLOR_INDEX:
+	default:
+	    return;
+	}
+	break;
+
+    default:
+	return;
+    }
+
+    /* Enable tex1 */
+    r128ctx->regs.tex_cntl_c |= R128_SEC_TEXMAP_ENABLE;
+
+    tex_size_pitch  = r128ctx->regs.tex_size_pitch_c;
+    tex_size_pitch &= ~R128_SEC_TEX_SIZE_PITCH_MASK;
+    tex_size_pitch |= t->regs.size_pitch << R128_SEC_TEX_SIZE_PITCH_SHIFT;
+
+    tex_cntl        = t->regs.tex_cntl | R128_SEC_SELECT_SEC_ST;
+
+    /* Set the secondary texture state in r128ctx->regs */
+    r128ctx->regs.sec_tex_cntl_c              = tex_cntl;
+    r128ctx->regs.sec_tex_combine_cntl_c      = tex_combine_cntl;
+    r128ctx->regs.tex_size_pitch_c            = tex_size_pitch;
+    r128ctx->regs.sec_texture_border_color_c  = t->regs.border_color;
+
+    /* Set texture offsets */
+    if (t->regs.tex_cntl & R128_MIP_MAP_DISABLE) {
+	for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+	    r128ctx->regs.sec_tex_offset[i] = (CARD32)t->bufAddr;
+    } else {
+	int maxLevel = ((t->regs.size_pitch & R128_TEX_SIZE_MASK) >>
+			R128_TEX_SIZE_SHIFT);
+	int minLevel = ((t->regs.size_pitch & R128_TEX_MIN_SIZE_MASK) >>
+			R128_TEX_MIN_SIZE_SHIFT);
+	for (i = maxLevel; i >= minLevel; i--)
+	    r128ctx->regs.sec_tex_offset[i] =
+		t->image[maxLevel-i].offset + (CARD32)t->bufAddr;
+    }
+    /* Fix AGP texture offsets */
+    if (t->heap == R128_AGP_TEX_HEAP)
+	for (i = 0; i < R128_TEX_MAXLEVELS; i++)
+	    r128ctx->regs.sec_tex_offset[i] +=
+		R128_AGP_TEX_OFFSET + r128ctx->r128Screen->agpTexOffset;
+
+    /* Force loading the new state into the hardware */
+    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+    r128ctx->dirty_context |= R128_CTX_TEX1STATE | R128_CTX_ENGINESTATE;
+}
+
+/* Update the hardware texture state */
+/* NOTE: This function is only called while holding the hardware lock */
+void r128UpdateTextureState(r128ContextPtr r128ctx)
+{
+    /* Clear the GL_BLEND texturing fallback */
+    r128ctx->Fallback &= ~R128_FALLBACK_TEXTURE;
+
+    /* Unbind any currently bound textures */
+    if (r128ctx->CurrentTexObj[0]) r128ctx->CurrentTexObj[0]->bound = 0;
+    if (r128ctx->CurrentTexObj[1]) r128ctx->CurrentTexObj[1]->bound = 0;
+    r128ctx->CurrentTexObj[0] = NULL;
+    r128ctx->CurrentTexObj[1] = NULL;
+
+    if (r128ctx->glCtx->Enabled & (TEXTURE0_3D|TEXTURE1_3D))
+       r128ctx->Fallback |= R128_FALLBACK_TEXTURE;
+
+    /* Update the texture unit 0/1 state */
+    r128UpdateTex0State(r128ctx);
+    r128UpdateTex1State(r128ctx);
+}
+
+/* Set the texture wrap mode */
+static void r128SetTexWrap(r128TexObjPtr t, GLenum swrap, GLenum twrap)
+{
+    t->regs.tex_cntl &= ~(R128_TEX_CLAMP_S_MASK | R128_TEX_CLAMP_T_MASK);
+
+    switch (swrap) {
+    case GL_CLAMP:  t->regs.tex_cntl |= R128_TEX_CLAMP_S_CLAMP; break;
+    case GL_REPEAT: t->regs.tex_cntl |= R128_TEX_CLAMP_S_WRAP;  break;
+    default: /* ERROR!! */ return;
+    }
+
+    switch (twrap) {
+    case GL_CLAMP:  t->regs.tex_cntl |= R128_TEX_CLAMP_T_CLAMP; break;
+    case GL_REPEAT: t->regs.tex_cntl |= R128_TEX_CLAMP_T_WRAP;  break;
+    default: /* ERROR!! */ return;
+    }
+}
+
+/* Set the texture filter mode */
+static void r128SetTexFilter(r128TexObjPtr t, GLenum minf, GLenum magf)
+{
+    t->regs.tex_cntl &= ~(R128_MIN_BLEND_MASK | R128_MAG_BLEND_MASK);
+
+    switch (minf) {
+    case GL_NEAREST:
+	t->regs.tex_cntl |= R128_MIN_BLEND_NEAREST;
+	break;
+    case GL_LINEAR:
+	t->regs.tex_cntl |= R128_MIN_BLEND_LINEAR;
+	break;
+    case GL_NEAREST_MIPMAP_NEAREST:
+	t->regs.tex_cntl |= R128_MIN_BLEND_MIPNEAREST;
+	break;
+    case GL_LINEAR_MIPMAP_NEAREST:
+	t->regs.tex_cntl |= R128_MIN_BLEND_LINEARMIPNEAREST;
+	break;
+    case GL_NEAREST_MIPMAP_LINEAR:
+	t->regs.tex_cntl |= R128_MIN_BLEND_MIPLINEAR;
+	break;
+    case GL_LINEAR_MIPMAP_LINEAR:
+	t->regs.tex_cntl |= R128_MIN_BLEND_LINEARMIPLINEAR;
+	break;
+    default: /* ERROR!! */ return;
+    }
+
+    switch (magf) {
+    case GL_NEAREST:
+	t->regs.tex_cntl |= R128_MAG_BLEND_NEAREST;
+	break;
+    case GL_LINEAR:
+	t->regs.tex_cntl |= R128_MAG_BLEND_LINEAR;
+	break;
+    }
+}
+
+/* Set the texture border color */
+static void r128SetTexBorderColor(r128TexObjPtr t, GLubyte c[4])
+{
+    t->regs.border_color = r128PackColor(32, c[0], c[1], c[2], c[3]);
+}
+
+/* Set the texture environment state */
+static void r128DDTexEnv(GLcontext *ctx, GLenum target, GLenum pname,
+			 const GLfloat *param)
+{
+    r128ContextPtr          r128ctx = R128_CONTEXT(ctx);
+    struct gl_texture_unit *texUnit;
+    GLubyte                 c[4];
+    CARD32                  col;
+
+    /* FIXME: Add texture LOD bias extension */
+
+    switch (pname) {
+    case GL_TEXTURE_ENV_MODE:
+	/* TexEnv modes are handled in UpdateTextureState */
+	r128FlushVertices(r128ctx);
+	r128ctx->dirty |= R128_UPDATE_TEXSTATE;
+	break;
+    case GL_TEXTURE_ENV_COLOR:
+	texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+	FLOAT_RGBA_TO_UBYTE_RGBA(texUnit->EnvColor, c);
+	col = r128PackColor(32, c[0], c[1], c[2], c[3]);
+	if (r128ctx->regs.constant_color_c != col) {
+	    r128FlushVertices(r128ctx);
+	    r128ctx->regs.constant_color_c = col;
+
+	    /* FIXME: Load into hardware now??? */
+	    r128ctx->dirty         |= R128_UPDATE_CONTEXT;
+	    r128ctx->dirty_context |= R128_CTX_TEXENVSTATE;
+	}
+	break;
+    default:
+	return;
+    }
+}
+
+/* Upload a new texture image */
+static void r128DDTexImage(GLcontext *ctx, GLenum target,
+			   struct gl_texture_object *tObj, GLint level,
+			   GLint internalFormat,
+			   const struct gl_texture_image *image)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    r128TexObjPtr  t;
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API)
+	fprintf(stderr, "r128DDTexImage(%p, level %d)\n", tObj, level);
+
+    if ((target != GL_TEXTURE_2D) && (target != GL_TEXTURE_1D)) return;
+    if (level >= R128_TEX_MAXLEVELS) return;
+
+    t = (r128TexObjPtr)tObj->DriverData;
+    if (t) {
+	if (t->bound) r128FlushVertices(r128ctx);
+
+	/* Destroy the old texture, and upload a new one.  The actual
+           uploading of the texture image occurs in the UploadSubImage
+           function. */
+	r128DestroyTexObj(r128ctx, t);
+	r128ctx->dirty |= R128_UPDATE_TEXSTATE;
+    }
+}
+
+/* Upload a new texture sub-image */
+static void r128DDTexSubImage(GLcontext *ctx, GLenum target,
+			      struct gl_texture_object *tObj, GLint level,
+			      GLint xoffset, GLint yoffset,
+			      GLsizei width, GLsizei height,
+			      GLint internalFormat,
+			      const struct gl_texture_image *image)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    r128TexObjPtr  t;
+
+    if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API)
+	fprintf(stderr, "r128DDTexSubImage(%p, level %d) "
+		"size: %d,%d of %d,%d\n",
+		tObj, level, width, height, image->Width, image->Height);
+
+    if ((target != GL_TEXTURE_2D) && (target != GL_TEXTURE_1D)) return;
+    if (level >= R128_TEX_MAXLEVELS) return;
+
+    t = (r128TexObjPtr)tObj->DriverData;
+    if (t) {
+	if (t->bound) r128FlushVertices(r128ctx);
+
+	LOCK_HARDWARE(r128ctx);
+	r128UploadSubImage(r128ctx, t, level,
+			   xoffset, yoffset, width, height);
+	UNLOCK_HARDWARE(r128ctx);
+
+	/* Update the context state */
+	r128ctx->regs.tex_cntl_c |= R128_TEX_CACHE_FLUSH;
+
+	r128ctx->dirty           |= (R128_UPDATE_CONTEXT |
+				     R128_UPDATE_TEXSTATE);
+	r128ctx->dirty_context   |= (R128_CTX_ENGINESTATE |
+				     R128_CTX_TEX0STATE   |
+				     R128_CTX_TEX1STATE);
+    }
+}
+
+/* Set the texture parameter state */
+static void r128DDTexParameter(GLcontext *ctx, GLenum target,
+			       struct gl_texture_object *tObj,
+			       GLenum pname, const GLfloat *params)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    r128TexObjPtr  t       = (r128TexObjPtr)tObj->DriverData;
+
+    if (!t) return;
+    if ((target != GL_TEXTURE_2D) && (target != GL_TEXTURE_1D)) return;
+
+    switch (pname) {
+    case GL_TEXTURE_MIN_FILTER:
+    case GL_TEXTURE_MAG_FILTER:
+	if (t->bound) r128FlushVertices(r128ctx);
+	r128SetTexFilter(t, tObj->MinFilter, tObj->MagFilter);
+	break;
+
+    case GL_TEXTURE_WRAP_S:
+    case GL_TEXTURE_WRAP_T:
+	if (t->bound) r128FlushVertices(r128ctx);
+	r128SetTexWrap(t, tObj->WrapS, tObj->WrapT);
+	break;
+
+    case GL_TEXTURE_BORDER_COLOR:
+	if (t->bound) r128FlushVertices(r128ctx);
+	r128SetTexBorderColor(t, tObj->BorderColor);
+	break;
+
+    default:
+	return;
+    }
+
+    r128ctx->dirty |= R128_UPDATE_TEXSTATE;
+}
+
+/* Bind a texture to the currently active texture unit */
+static void r128DDBindTexture(GLcontext *ctx, GLenum target,
+			      struct gl_texture_object *tObj)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+
+    r128FlushVertices(r128ctx);
+
+    /* Unbind the old texture */
+    if (r128ctx->CurrentTexObj[ctx->Texture.CurrentUnit]) {
+	r128ctx->CurrentTexObj[ctx->Texture.CurrentUnit]->bound = 0;
+	r128ctx->CurrentTexObj[ctx->Texture.CurrentUnit] = NULL;
+    }
+
+    /* The actualy binding occurs in the Tex[01]UpdateState function */
+    r128ctx->dirty |= R128_UPDATE_TEXSTATE;
+}
+
+/* Remove texture from AGP/local texture memory */
+static void r128DDDeleteTexture(GLcontext *ctx,
+				struct gl_texture_object *tObj)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    r128TexObjPtr  t       = (r128TexObjPtr)tObj->DriverData;
+
+    if (t) {
+	if (t->bound) {
+	    r128FlushVertices(r128ctx);
+
+	    r128ctx->CurrentTexObj[t->bound-1] = 0;
+	    r128ctx->dirty |= R128_UPDATE_TEXSTATE;
+	}
+
+	r128DestroyTexObj(r128ctx, t);
+	tObj->DriverData = NULL;
+    }
+}
+
+/* Determine if a texture is currently residing in either AGP/local
+   texture memory */
+static GLboolean r128DDIsTextureResident(GLcontext *ctx,
+					 struct gl_texture_object *tObj)
+{
+    r128TexObjPtr t = (r128TexObjPtr)tObj->DriverData;
+
+    return t && t->memBlock;
+}
+
+/* Initialize the driver's texture functions */
+void r128DDInitTextureFuncs(GLcontext *ctx)
+{
+    ctx->Driver.TexEnv                  = r128DDTexEnv;
+    ctx->Driver.TexImage                = r128DDTexImage;
+    ctx->Driver.TexSubImage             = r128DDTexSubImage;
+    ctx->Driver.TexParameter            = r128DDTexParameter;
+    ctx->Driver.BindTexture             = r128DDBindTexture;
+    ctx->Driver.DeleteTexture           = r128DDDeleteTexture;
+    ctx->Driver.UpdateTexturePalette    = NULL;
+    ctx->Driver.ActiveTexture           = NULL;
+    ctx->Driver.IsTextureResident       = r128DDIsTextureResident;
+    ctx->Driver.PrioritizeTexture       = NULL;
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_tex.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_tex.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_tex.h	Fri Jun 16 17:03:08 2000
@@ -0,0 +1,82 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tex.h,v 1.1 2000/06/17 00:03:08 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Gareth Hughes <gareth@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_TEX_H_
+#define _R128_TEX_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+extern void r128AgeTextures(r128ContextPtr r128ctx, int heap);
+extern int  r128UploadTexImages(r128ContextPtr r128ctx, r128TexObjPtr t);
+extern void r128UpdateTextureState(r128ContextPtr r128ctx);
+extern void r128DestroyTexObj(r128ContextPtr r128ctx, r128TexObjPtr t);
+
+extern void r128DDInitTextureFuncs(GLcontext *ctx);
+
+#define R128PACKCOLOR332(r, g, b)                                             \
+    (((r) & 0xe0) | (((g) & 0xe0) >> 3) | (((b) & 0xc0) >> 6))
+
+#define R128PACKCOLOR1555(r, g, b, a)                                         \
+    ((((r) & 0xf8) << 7) | (((g) & 0xf8) << 2) | (((b) & 0xf8) >> 3) |        \
+     ((a) ? 0x8000 : 0))
+
+#define R128PACKCOLOR565(r, g, b)                                             \
+    ((((r) & 0xf8) << 8) | (((g) & 0xfc) << 3) | (((b) & 0xf8) >> 3))
+
+#define R128PACKCOLOR888(r, g, b)                                             \
+    (((r) << 16) | ((g) << 8) | (b))
+
+#define R128PACKCOLOR8888(r, g, b, a)                                         \
+    (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+
+#define R128PACKCOLOR4444(r, g, b, a)                                         \
+    ((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
+
+static __inline__ CARD32 r128PackColor(GLuint depth,
+				       GLubyte r, GLubyte g,
+				       GLubyte b, GLubyte a)
+{
+    switch (depth) {
+    case  8: return R128PACKCOLOR332(r, g, b);
+    case 15: return R128PACKCOLOR1555(r, g, b, a);
+    case 16: return R128PACKCOLOR565(r, g, b);
+    case 24: return R128PACKCOLOR888(r, g, b);
+    case 32: return R128PACKCOLOR8888(r, g, b, a);
+    default: return 0;
+    }
+}
+
+#endif
+#endif /* _R128_TEX_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_texobj.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_texobj.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_texobj.h	Fri Jun 16 17:03:08 2000
@@ -0,0 +1,87 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_texobj.h,v 1.1 2000/06/17 00:03:08 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *   Gareth Hughes <gareth@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_TEXOBJ_H_
+#define _R128_TEXOBJ_H_
+
+#include "mm.h"
+
+#define R128_TEX_MAXLEVELS 11
+
+/* Setup registers for each texture */
+typedef struct {
+    CARD32  tex_cntl;
+    CARD32  size_pitch;
+    CARD32  border_color;
+} r128TextureRegs;
+
+/* Individual texture image information */
+typedef struct {
+    int offset;		/* Offset into locally shared texture space (i.e.,
+			   relative to bufAddr (below) */
+    int width;		/* Width of texture image */
+    int height;		/* Height of texture image */
+} r128TexImage;
+
+typedef struct r128_tex_obj r128TexObj, *r128TexObjPtr;
+
+/* Texture object in locally shared texture space */
+struct r128_tex_obj {
+    r128TexObjPtr    next, prev;
+
+    struct gl_texture_object *tObj;	/* Mesa texture object */
+
+    PMemBlock        memBlock;		/* Memory block containing texture */
+    unsigned char   *bufAddr;		/* Offset to start of locally
+					   shared texture block */
+
+    CARD32           dirty_images;	/* Flags for whether or not
+					   images need to be uploaded to
+					   local or AGP texture space */
+    int              bound;		/* Texture unit currently bound to */
+    int              heap;              /* Texture heap currently stored in */
+    r128TexImage     image[R128_TEX_MAXLEVELS]; /* Image data for all
+						   mipmap levels */
+    int              totalSize;		/* Total size of the texture
+					   including all mipmap levels */
+    int              internFormat;	/* Internal GL format used to store
+					   texture on card */
+    int              textureFormat;	/* Actual hardware format */
+    int              texelBytes;	/* Number of bytes per texel */
+
+    r128TextureRegs  regs;		/* Setup regs for texture */
+};
+
+#endif /* _R128_TEXOBJ_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_tris.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_tris.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_tris.c	Fri Jun 16 17:03:08 2000
@@ -0,0 +1,182 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tris.c,v 1.1 2000/06/17 00:03:08 martin Exp $ */ /* -*- c-basic-offset: 4 -*- */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_reg.h"
+#include "r128_cce.h"
+#include "r128_vb.h"
+#include "r128_tris.h"
+#include "r128_state.h"
+
+static triangle_func tri_tab[0x10];
+static quad_func     quad_tab[0x10];
+static line_func     line_tab[0x10];
+static points_func   points_tab[0x10];
+
+#define R128_COLOR(to, from)                                                \
+do {                                                                        \
+    (to)[0] = (from)[2];                                                    \
+    (to)[1] = (from)[1];                                                    \
+    (to)[2] = (from)[0];                                                    \
+    (to)[3] = (from)[3];                                                    \
+} while (0)
+
+#define IND (0)
+#define TAG(x) x
+#include "r128_tritmp.h"
+
+#define IND (R128_FLAT_BIT)
+#define TAG(x) x##_flat
+#include "r128_tritmp.h"
+
+#define IND (R128_OFFSET_BIT)
+#define TAG(x) x##_offset
+#include "r128_tritmp.h"
+
+#define IND (R128_OFFSET_BIT | R128_FLAT_BIT)
+#define TAG(x) x##_offset_flat
+#include "r128_tritmp.h"
+
+#define IND (R128_TWOSIDE_BIT)
+#define TAG(x) x##_twoside
+#include "r128_tritmp.h"
+
+#define IND (R128_TWOSIDE_BIT | R128_FLAT_BIT)
+#define TAG(x) x##_twoside_flat
+#include "r128_tritmp.h"
+
+#define IND (R128_TWOSIDE_BIT | R128_OFFSET_BIT)
+#define TAG(x) x##_twoside_offset
+#include "r128_tritmp.h"
+
+#define IND (R128_TWOSIDE_BIT | R128_OFFSET_BIT | R128_FLAT_BIT)
+#define TAG(x) x##_twoside_offset_flat
+#include "r128_tritmp.h"
+
+/* Initialize the table of points, line and triangle drawing functions */
+void r128TriangleFuncsInit(void)
+{
+    init();
+    init_flat();
+    init_offset();
+    init_offset_flat();
+    init_twoside();
+    init_twoside_flat();
+    init_twoside_offset();
+    init_twoside_offset_flat();
+}
+
+/* Setup the Point, Line, Triangle and Quad functions based on the
+   current rendering state.  Wherever possible, use the hardware to
+   render the primitive.  Otherwise, fallback to software rendering. */
+void r128ChooseRenderState(GLcontext *ctx)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    GLuint         flags   = ctx->TriangleCaps;
+
+    /* KW: Includes handling of SWonly rendering:
+     */
+    if (r128ctx->Fallback)
+       return;
+
+    r128ctx->IndirectTriangles = 0;
+
+    if (flags) {
+	CARD32 index    = 0;
+	CARD32 shared   = 0;
+ 	CARD32 fallback = R128_FALLBACK_BIT;
+
+	/* KW: I'd prefer to remove SWfallbackDisable & just use
+	 * R128_FALLBACK_BIT throughout this routine.
+	 */
+  	if (r128ctx->SWfallbackDisable) fallback = 0;
+
+	if (flags & DD_FLATSHADE)               shared |= R128_FLAT_BIT;
+	if (flags & DD_TRI_LIGHT_TWOSIDE)       shared |= R128_TWOSIDE_BIT;
+
+	/* TODO: Fix mesa so that these can be handled in
+	 * r128ctx->Fallback.
+	 */
+	if (flags & (DD_MULTIDRAW |
+		     DD_SELECT    |
+		     DD_FEEDBACK))              shared |= R128_FALLBACK_BIT;
+
+	/* FIXME: Only enable in 16 bpp mode after we have hardware
+           stencil support */
+	if (flags & DD_STENCIL)                 shared |= R128_FALLBACK_BIT;
+
+	/* Setup PointFunc */
+	index = shared;
+	if (flags & DD_POINT_SMOOTH)            index  |= fallback;
+
+	r128ctx->RenderIndex = index;
+	r128ctx->PointsFunc  = points_tab[index];
+	if (index & R128_FALLBACK_BIT)
+	    r128ctx->IndirectTriangles |= DD_POINT_SW_RASTERIZE;
+
+	/* Setup LineFunc */
+	index = shared;
+	if (flags & DD_LINE_SMOOTH)             index  |= fallback;
+	if (flags & DD_LINE_STIPPLE)            index  |= fallback;
+
+	r128ctx->RenderIndex |= index;
+	r128ctx->LineFunc     = line_tab[index];
+	if (index & R128_FALLBACK_BIT)
+	    r128ctx->IndirectTriangles |= DD_LINE_SW_RASTERIZE;
+
+	/* Setup TriangleFunc and QuadFunc */
+	index = shared;
+	if (flags & DD_TRI_OFFSET)              index  |= R128_OFFSET_BIT;
+	if (flags & DD_TRI_SMOOTH)              index  |= fallback;
+	if (flags & DD_TRI_UNFILLED)            index  |= fallback;
+	if (flags & DD_TRI_STIPPLE)             index  |= fallback;
+
+	r128ctx->RenderIndex  |= index;
+	r128ctx->TriangleFunc  = tri_tab[index];
+	r128ctx->QuadFunc      = quad_tab[index];
+	if (index & R128_FALLBACK_BIT)
+	    r128ctx->IndirectTriangles |= (DD_TRI_SW_RASTERIZE |
+					   DD_QUAD_SW_RASTERIZE);
+    } else if (r128ctx->RenderIndex) {
+	r128ctx->RenderIndex  = 0;
+	r128ctx->PointsFunc   = points_tab[0];
+	r128ctx->LineFunc     = line_tab[0];
+	r128ctx->TriangleFunc = tri_tab[0];
+	r128ctx->QuadFunc     = quad_tab[0];
+    }
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_tris.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_tris.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_tris.h	Fri Jun 16 17:03:08 2000
@@ -0,0 +1,196 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tris.h,v 1.1 2000/06/17 00:03:08 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_TRIS_H_
+#define _R128_TRIS_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+#include "r128_vb.h"
+
+extern void r128ChooseRenderState(GLcontext *ctx);
+extern void r128TriangleFuncsInit(void);
+
+#define R128_FLAT_BIT        0x01
+#define R128_OFFSET_BIT      0x02
+#define R128_TWOSIDE_BIT     0x04
+#define R128_FALLBACK_BIT    0x08
+
+/* Draw a triangle from the vertices in the vertex buffer */
+static __inline void r128DrawTriangleVB( r128ContextPtr r128ctx,
+					 r128Vertex *v0,
+					 r128Vertex *v1,
+					 r128Vertex *v2 )
+{
+    int vertsize = r128ctx->vertsize;
+    CARD32 *vb = r128AllocVertexDwordsInlined( r128ctx, 3 * vertsize );
+    int j;
+
+#if defined (USE_X86_ASM)
+    /* GTH: We can safely assume the vertex stride is some number of
+     * dwords, and thus a "rep movsd" is okay.  The vb pointer is
+     * automagically updated with this instruction, so we don't have
+     * to manually take care of incrementing it.
+     */
+    __asm__ __volatile__( "rep ; movsl"
+			  : "=%c" (j)
+			  : "0" (vertsize), "D" ((long)vb), "S" ((long)v0)
+			  : "memory" );
+    __asm__ __volatile__( "rep ; movsl"
+			  : "=%c" (j)
+			  : "0" (vertsize), "S" ((long)v1)
+			  : "memory" );
+    __asm__ __volatile__( "rep ; movsl"
+			  : "=%c" (j)
+			  : "0" (vertsize), "S" ((long)v2)
+			  : "memory" );
+#else
+    for (j = 0 ; j < vertsize ; j++)
+        vb[j] = v0->ui[j];
+
+    vb += vertsize;
+    for (j = 0 ; j < vertsize ; j++)
+        vb[j] = v1->ui[j];
+
+    vb += vertsize;
+    for (j = 0 ; j < vertsize ; j++)
+        vb[j] = v2->ui[j];
+#endif
+}
+
+/* Draw a line from the vertices in the vertex buffer */
+static __inline void r128DrawLineVB( r128ContextPtr r128ctx,
+				     r128Vertex *tmp0,
+				     r128Vertex *tmp1,
+				     float width )
+{
+    int vertsize = r128ctx->vertsize;
+    CARD32 *vb = r128AllocVertexDwordsInlined( r128ctx, 6 * vertsize );
+    float dx, dy, ix, iy;
+    int j;
+
+    dx = tmp0->vert1.x - tmp1->vert1.x;
+    dy = tmp0->vert1.y - tmp1->vert1.y;
+
+    ix = width * .5; iy = 0;
+
+    if ((ix<.5) && (ix>0.1)) ix = .5; /* I want to see lines with width
+					 0.5 also */
+
+    if (dx * dx > dy * dy) {
+        iy = ix; ix = 0;
+    }
+
+    *(float *)&vb[0] = tmp0->vert1.x - ix;
+    *(float *)&vb[1] = tmp0->vert1.y - iy;
+    for (j = 2 ; j < vertsize ; j++)
+        vb[j] = tmp0->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp1->vert1.x + ix;
+    *(float *)&vb[1] = tmp1->vert1.y + iy;
+    for (j = 2 ; j < vertsize ; j++)
+        vb[j] = tmp1->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp0->vert1.x + ix;
+    *(float *)&vb[1] = tmp0->vert1.y + iy;
+    for (j = 2 ; j < vertsize ; j++)
+        vb[j] = tmp0->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp0->vert1.x - ix;
+    *(float *)&vb[1] = tmp0->vert1.y - iy;
+    for (j = 2 ; j < vertsize ; j++)
+        vb[j] = tmp0->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp1->vert1.x - ix;
+    *(float *)&vb[1] = tmp1->vert1.y - iy;
+    for (j = 2 ; j < vertsize ; j++)
+        vb[j] = tmp1->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp1->vert1.x + ix;
+    *(float *)&vb[1] = tmp1->vert1.y + iy;
+    for (j = 2 ; j < vertsize ; j++)
+        vb[j] = tmp1->ui[j];
+}
+
+/* Draw a point from the vertices in the vertex buffer */
+static __inline void r128DrawPointVB( r128ContextPtr r128ctx,
+				      r128Vertex *tmp, float sz )
+{
+    int vertsize = r128ctx->vertsize;
+    CARD32 *vb = r128AllocVertexDwordsInlined( r128ctx, 6 * vertsize );
+    int j;
+
+    *(float *)&vb[0] = tmp->vert1.x - sz;
+    *(float *)&vb[1] = tmp->vert1.y - sz;
+    for (j = 2 ; j < vertsize ; j++)
+	vb[j] = tmp->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp->vert1.x + sz;
+    *(float *)&vb[1] = tmp->vert1.y - sz;
+    for (j = 2 ; j < vertsize ; j++)
+	vb[j] = tmp->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp->vert1.x + sz;
+    *(float *)&vb[1] = tmp->vert1.y + sz;
+    for (j = 2 ; j < vertsize ; j++)
+	vb[j] = tmp->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp->vert1.x + sz;
+    *(float *)&vb[1] = tmp->vert1.y + sz;
+    for (j = 2 ; j < vertsize ; j++)
+	vb[j] = tmp->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp->vert1.x - sz;
+    *(float *)&vb[1] = tmp->vert1.y + sz;
+    for (j = 2 ; j < vertsize ; j++)
+	vb[j] = tmp->ui[j];
+    vb += vertsize;
+
+    *(float *)&vb[0] = tmp->vert1.x - sz;
+    *(float *)&vb[1] = tmp->vert1.y - sz;
+    for (j = 2 ; j < vertsize ; j++)
+	vb[j] = tmp->ui[j];
+}
+
+#endif
+#endif /* _R128_TRIS_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_tritmp.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_tritmp.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_tritmp.h	Fri Jun 16 17:03:09 2000
@@ -0,0 +1,204 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tritmp.h,v 1.1 2000/06/17 00:03:09 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#if !defined(TAG) || !defined(IND)
+    this is an error
+#endif
+
+/* Draw a single triangle.  Note that the device-dependent vertex data
+   might need to be changed based on the render state. */
+static __inline void TAG(triangle)(GLcontext *ctx,
+				   GLuint e0, GLuint e1, GLuint e2,
+				   GLuint pv)
+{
+    r128ContextPtr        r128ctx   = R128_CONTEXT(ctx);
+    int                   vertsize  = r128ctx->vertsize;
+    CARD32               *vb        = r128AllocVertexDwords(r128ctx,
+							    3 * vertsize);
+    struct vertex_buffer *VB        = ctx->VB;
+    r128VertexPtr         r128verts = R128_DRIVER_DATA(VB)->verts;
+    const r128Vertex     *v[3];
+    int                   i, j;
+
+#if (IND & R128_OFFSET_BIT)
+    GLfloat offset = ctx->Polygon.OffsetUnits * r128ctx->depth_scale;
+#endif
+
+#if (IND & (R128_FLAT_BIT | R128_TWOSIDE_BIT))
+    int c[3];
+
+    c[0] = c[1] = c[2] = *(int *)&r128verts[pv].vert1.dif_argb;
+#endif
+
+    v[0] = &r128verts[e0];
+    v[1] = &r128verts[e1];
+    v[2] = &r128verts[e2];
+
+#if (IND & (R128_TWOSIDE_BIT | R128_OFFSET_BIT))
+    {
+	GLfloat ex = v[0]->vert1.x - v[2]->vert1.x;
+	GLfloat ey = v[0]->vert1.y - v[2]->vert1.y;
+	GLfloat fx = v[1]->vert1.x - v[2]->vert1.x;
+	GLfloat fy = v[1]->vert1.y - v[2]->vert1.y;
+	GLfloat cc  = ex*fy - ey*fx;
+
+#if (IND & R128_TWOSIDE_BIT)
+	{
+	    GLuint  facing        = (cc > 0.0) ^ ctx->Polygon.FrontBit;
+	    GLubyte (*vbcolor)[4] = VB->Color[facing]->data;
+	    if (IND & R128_FLAT_BIT) {
+		R128_COLOR((char *)&c[0], vbcolor[pv]);
+		c[2] = c[1] = c[0];
+	    } else {
+		R128_COLOR((char *)&c[0], vbcolor[e0]);
+		R128_COLOR((char *)&c[1], vbcolor[e1]);
+		R128_COLOR((char *)&c[2], vbcolor[e2]);
+	    }
+	}
+#endif
+
+#if (IND & R128_OFFSET_BIT)
+	{
+	    if (cc * cc > 1e-16) {
+		GLfloat factor = ctx->Polygon.OffsetFactor;
+		GLfloat ez     = v[0]->vert1.z - v[2]->vert1.z;
+		GLfloat fz     = v[1]->vert1.z - v[2]->vert1.z;
+		GLfloat a      = ey*fz - ez*fy;
+		GLfloat b      = ez*fx - ex*fz;
+		GLfloat ic     = 1.0 / cc;
+		GLfloat ac     = a * ic;
+		GLfloat bc     = b * ic;
+		if (ac < 0.0f) ac = -ac;
+		if (bc < 0.0f) bc = -bc;
+		offset += MAX2(ac, bc) * factor;
+	    }
+	}
+#endif
+    }
+#endif
+
+    for (j = 0 ; j < 3 ; j++, vb += vertsize) {
+
+       for (i = 0 ; i < vertsize ; i++)
+	  vb[i] = v[j]->ui[i];
+
+#if (IND & (R128_FLAT_BIT|R128_TWOSIDE_BIT))
+       vb[4] = c[j];		/* color is the fifth element... */
+#endif
+#if (IND & R128_OFFSET_BIT)
+       *(float *)&vb[2] = v[j]->vert1.z + offset;
+#endif
+   }
+}
+
+
+static void TAG(quad)(GLcontext *ctx,
+		      GLuint v0, GLuint v1, GLuint v2, GLuint v3,
+		      GLuint pv)
+{
+    TAG(triangle)(ctx, v0, v1, v3, pv);
+    TAG(triangle)(ctx, v1, v2, v3, pv);
+}
+
+
+/* Draw a single line.  Note that the device-dependent vertex data might
+   need to be changed based on the render state. */
+static void TAG(line)(GLcontext *ctx,
+		      GLuint v0, GLuint v1,
+		      GLuint pv)
+{
+    r128ContextPtr  r128ctx   = R128_CONTEXT(ctx);
+    r128VertexPtr   r128verts = R128_DRIVER_DATA(ctx->VB)->verts;
+    float           width     = ctx->Line.Width;
+
+   if (IND & (R128_TWOSIDE_BIT|R128_FLAT_BIT)) {
+      r128Vertex tmp0 = r128verts[v0];
+      r128Vertex tmp1 = r128verts[v1];
+
+      if (IND & R128_TWOSIDE_BIT) {
+	 GLubyte (*vbcolor)[4] = ctx->VB->ColorPtr->data;
+
+	 if (IND & R128_FLAT_BIT) {
+ 	    R128_COLOR((char *)&tmp0.vert1.dif_argb, vbcolor[pv]);
+	    *(int *)&tmp1.vert1.dif_argb = *(int *)&tmp0.vert1.dif_argb;
+	 } else {
+	    R128_COLOR((char *)&tmp0.vert1.dif_argb, vbcolor[v0]);
+	    R128_COLOR((char *)&tmp1.vert1.dif_argb, vbcolor[v1]);
+	 }
+      } else {
+	 *(int *)&tmp0.vert1.dif_argb = *(int *)&r128verts[pv].vert1.dif_argb;
+	 *(int *)&tmp1.vert1.dif_argb = *(int *)&r128verts[pv].vert1.dif_argb;
+      }
+
+      r128DrawLineVB( r128ctx, &tmp0, &tmp1, width );
+   }
+   else
+      r128DrawLineVB( r128ctx, &r128verts[v0], &r128verts[v1], width );
+}
+
+/* Draw a set of points.  Note that the device-dependent vertex data
+   might need to be changed based on the render state. */
+static void TAG(points)(GLcontext *ctx,
+			GLuint first, GLuint last)
+{
+    r128ContextPtr        r128ctx   = R128_CONTEXT(ctx);
+    struct vertex_buffer *VB        = ctx->VB;
+    r128VertexPtr         r128verts = R128_DRIVER_DATA(VB)->verts;
+    GLfloat               size      = ctx->Point.Size * 0.5;
+    int                   i;
+
+    for(i = first; i <= last; i++) {
+	if(VB->ClipMask[i] == 0) {
+	   if (IND & R128_TWOSIDE_BIT) {
+	      GLubyte (*vbcolor)[4] = VB->ColorPtr->data;
+	      r128Vertex tmp0 = r128verts[i];
+	      R128_COLOR((char *)&tmp0.vert1.dif_argb, vbcolor[i]);
+	      r128DrawPointVB( r128ctx, &tmp0, size );
+	   } else
+	      r128DrawPointVB( r128ctx, &r128verts[i], size );
+	}
+    }
+}
+
+/* Initialize the table of primitives to render. */
+static void TAG(init)(void)
+{
+    tri_tab[IND]    = TAG(triangle);
+    quad_tab[IND]   = TAG(quad);
+    line_tab[IND]   = TAG(line);
+    points_tab[IND] = TAG(points);
+}
+
+#undef IND
+#undef TAG
Index: xc/lib/GL/mesa/src/drv/r128/r128_vb.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_vb.c:1.3
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_vb.c	Sun Jun 25 09:03:43 2000
@@ -0,0 +1,422 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_vb.c,v 1.3 2000/06/25 16:03:43 tsi Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#include "r128_init.h"
+#include "r128_mesa.h"
+#include "r128_xmesa.h"
+#include "r128_context.h"
+#include "r128_lock.h"
+#include "r128_reg.h"
+#include "r128_cce.h"
+#include "r128_state.h"
+#include "r128_vb.h"
+
+#include "stages.h"
+
+#define TEX0                                                            \
+do {                                                                    \
+    v->vert1.tu0 = tc0[i][0];                                           \
+    v->vert1.tv0 = tc0[i][1];                                           \
+} while (0)
+
+#define TEX1                                                            \
+do {                                                                    \
+    v->vert2.tu1 = tc1[i][0];                                           \
+    v->vert2.tv1 = tc1[i][1];                                           \
+} while (0)
+
+#define SPC                                                             \
+do {                                                                    \
+    GLubyte *spec = &(VB->Spec[0][i][0]);                               \
+    v->vert1.spec_frgb.r = spec[0];                                     \
+    v->vert1.spec_frgb.g = spec[1];                                     \
+    v->vert1.spec_frgb.b = spec[2];                                     \
+} while (0)
+
+
+#define COL                                                             \
+do {                                                                    \
+    GLubyte *col = &(VB->Color[0]->data[i][0]);                         \
+    v->vert1.dif_argb.a = col[3];                                       \
+    v->vert1.dif_argb.r = col[0];                                       \
+    v->vert1.dif_argb.g = col[1];                                       \
+    v->vert1.dif_argb.b = col[2];                                       \
+} while (0)
+
+#if 1
+/* FIXME: These are handled by the Rage 128 */
+#define TEX0_4
+#define TEX1_4
+#else
+#define TEX0_4                                                          \
+do {                                                                    \
+    if (VB->TexCoordPtr[0]->size == 4) {                                \
+	GLfloat (*tc)[4] = VB->TexCoordPtr[0]->data;                    \
+	v = &(R128_DRIVER_DATA(VB)->verts[start]);                      \
+	for (i = start; i < end; i++, v++)   {                          \
+	    float oow = 1.0 / tc[i][3];                                 \
+	    v->vert1.rhw *= tc[i][3];                                   \
+	    v->vert1.tu0 *= oow;                                        \
+	    v->vert1.tv0 *= oow;                                        \
+	}                                                               \
+    }                                                                   \
+} while (0)
+
+#ifdef USE_RHW2
+#define TEX1_4                                                          \
+do {                                                                    \
+    if (VB->TexCoordPtr[1]->size == 4) {                                \
+	GLfloat (*tc)[4] = VB->TexCoordPtr[1]->data;                    \
+	v = &(R128_DRIVER_DATA(VB)->verts[start]);                      \
+	for (i = start; i < end; i++, v++)   {                          \
+	    float oow = 1.0 / tc[i][3];                                 \
+	    v->vert3.rhw2 *= tc[i][3];                                  \
+	    v->vert3.tu1  *= oow;                                       \
+	    v->vert3.tv1  *= oow;                                       \
+	}                                                               \
+    }                                                                   \
+} while (0)
+#else
+#define TEX1_4
+#endif
+#endif
+
+#ifdef USE_RHW2
+#define COORD                                                           \
+do {                                                                    \
+    GLfloat *win = VB->Win.data[i];                                     \
+    v->vert3.x =                   win[0];                              \
+    v->vert3.y =      r128height - win[1];                              \
+    v->vert3.z =           scale * win[2];                              \
+    v->vert3.rhw = v->vert3.rhw2 = win[3];                              \
+} while (0)
+#else
+#define COORD                                                           \
+do {                                                                    \
+    GLfloat *win = VB->Win.data[i];                                     \
+    v->vert1.x =                win[0];                                 \
+    v->vert1.y =   r128height - win[1];                                 \
+    v->vert1.z =        scale * win[2];                                 \
+    v->vert1.rhw =              win[3];                                 \
+} while (0)
+#endif
+
+#define NOP
+
+/* Setup the r128 vertex buffer entries */
+#define SETUPFUNC(name,win,col,tex0,tex1,tex0_4,tex1_4,spec)            \
+static void name(struct vertex_buffer *VB, GLuint start, GLuint end)    \
+{                                                                       \
+    r128ContextPtr        r128ctx    = R128_CONTEXT(VB->ctx);           \
+    __DRIdrawablePrivate *dPriv      = r128ctx->driDrawable;            \
+    r128VertexPtr         v;                                            \
+    GLfloat               (*tc0)[4];                                    \
+    GLfloat               (*tc1)[4];                                    \
+    GLfloat               r128height = dPriv->h;                        \
+    GLfloat               scale = r128ctx->depth_scale;                 \
+    int                   i;                                            \
+                                                                        \
+    (void) r128height; (void) r128ctx; (void) scale;                    \
+                                                                        \
+    gl_import_client_data(VB, VB->ctx->RenderFlags,                     \
+			  (VB->ClipOrMask                               \
+			   ? VEC_WRITABLE | VEC_GOOD_STRIDE             \
+			   : VEC_GOOD_STRIDE));                         \
+                                                                        \
+    tc0 = VB->TexCoordPtr[0]->data;                                     \
+    tc1 = VB->TexCoordPtr[1]->data;                                     \
+                                                                        \
+    v = &(R128_DRIVER_DATA(VB)->verts[start]);                          \
+                                                                        \
+    if (VB->ClipOrMask == 0)                                            \
+	for (i = start; i < end; i++, v++) {                            \
+	    win;                                                        \
+	    col;                                                        \
+	    spec;                                                       \
+	    tex0;                                                       \
+	    tex1;                                                       \
+	}                                                               \
+    else                                                                \
+	for (i = start; i < end; i++, v++) {                            \
+	    if (VB->ClipMask[i] == 0) {                                 \
+		win;                                                    \
+		spec;                                                   \
+		tex0;                                                   \
+		tex1;                                                   \
+	    }                                                           \
+	    col;                                                        \
+	}                                                               \
+    tex0_4;                                                             \
+    tex1_4;                                                             \
+}
+
+
+SETUPFUNC(rs_wt0,       COORD, NOP, TEX0, NOP,  TEX0_4, NOP,    NOP)
+SETUPFUNC(rs_wt1,       COORD, NOP, NOP,  TEX1, NOP,    TEX1_4, NOP)
+SETUPFUNC(rs_wt0t1,     COORD, NOP, TEX0, TEX1, TEX0_4, TEX1_4, NOP)
+SETUPFUNC(rs_wg,        COORD, COL, NOP,  NOP,  NOP,    NOP,    NOP)
+SETUPFUNC(rs_wgs,       COORD, COL, NOP,  NOP,  NOP,    NOP,    SPC)
+SETUPFUNC(rs_wgt0,      COORD, COL, TEX0, NOP,  TEX0_4, NOP,    NOP)
+SETUPFUNC(rs_wgt1,      COORD, COL, NOP,  TEX1, NOP,    TEX1_4, NOP)
+SETUPFUNC(rs_wgt0t1,    COORD, COL, TEX0, TEX1, TEX0_4, TEX1_4, NOP)
+SETUPFUNC(rs_wgst0,     COORD, COL, TEX0, NOP,  TEX0_4, NOP,    SPC)
+SETUPFUNC(rs_wgst1,     COORD, COL, NOP,  TEX1, NOP,    TEX1_4, SPC)
+SETUPFUNC(rs_wgst0t1,   COORD, COL, TEX0, TEX1, TEX0_4, TEX1_4, SPC)
+
+SETUPFUNC(rs_t0,        NOP,   NOP, TEX0, NOP,  TEX0_4, NOP,    NOP)
+SETUPFUNC(rs_t1,        NOP,   NOP, NOP,  TEX1, NOP,    TEX1_4, NOP)
+SETUPFUNC(rs_t0t1,      NOP,   NOP, TEX0, TEX1, TEX0_4, TEX1_4, NOP)
+SETUPFUNC(rs_g,         NOP,   COL, NOP,  NOP,  NOP,    NOP,    NOP)
+SETUPFUNC(rs_gs,        NOP,   COL, NOP,  NOP,  NOP,    NOP,    SPC)
+SETUPFUNC(rs_gt0,       NOP,   COL, TEX0, NOP,  TEX0_4, NOP,    NOP)
+SETUPFUNC(rs_gt1,       NOP,   COL, NOP,  TEX1, NOP,    TEX1_4, NOP)
+SETUPFUNC(rs_gt0t1,     NOP,   COL, TEX0, TEX1, TEX0_4, TEX1_4, NOP)
+SETUPFUNC(rs_gst0,      NOP,   COL, TEX0, NOP,  TEX0_4, NOP,    SPC)
+SETUPFUNC(rs_gst1,      NOP,   COL, NOP,  TEX1, NOP,    TEX1_4, SPC)
+SETUPFUNC(rs_gst0t1,    NOP,   COL, TEX0, TEX1, TEX0_4, TEX1_4, SPC)
+
+static void rs_invalid(struct vertex_buffer *VB, GLuint start, GLuint end)
+{
+    fprintf(stderr, "r128RasterSetup(): invalid setup function\n");
+}
+
+typedef void (*setupFunc)(struct vertex_buffer *, GLuint, GLuint);
+static setupFunc setup_func[0x20];
+
+/* Initialize the table of vertex buffer setup functions */
+void r128SetupInit(void)
+{
+    int i;
+
+    for (i = 0; i < 0x20; i++) setup_func[i] = rs_invalid;
+
+    /* Funcs to build vertices from scratch */
+    setup_func[R128_WIN_BIT|R128_TEX0_BIT] = rs_wt0;
+    setup_func[R128_WIN_BIT|R128_TEX1_BIT] = rs_wt1;
+    setup_func[R128_WIN_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_wt0t1;
+
+    setup_func[R128_WIN_BIT|R128_RGBA_BIT] = rs_wg;
+    setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_SPEC_BIT] = rs_wgs;
+    setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_TEX0_BIT] = rs_wgt0;
+    setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_TEX1_BIT] = rs_wgt1;
+    setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_wgt0t1;
+    setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX0_BIT] = rs_wgst0;
+    setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX1_BIT] = rs_wgst1;
+    setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_wgst0t1;
+
+
+    /* Funcs to repair vertices */
+    setup_func[R128_TEX0_BIT] = rs_t0;
+    setup_func[R128_TEX1_BIT] = rs_t1;
+    setup_func[R128_TEX0_BIT|R128_TEX1_BIT] = rs_t0t1;
+    setup_func[R128_RGBA_BIT] = rs_g;
+    setup_func[R128_RGBA_BIT|R128_SPEC_BIT] = rs_gs;
+    setup_func[R128_RGBA_BIT|R128_TEX0_BIT] = rs_gt0;
+    setup_func[R128_RGBA_BIT|R128_TEX1_BIT] = rs_gt1;
+    setup_func[R128_RGBA_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_gt0t1;
+    setup_func[R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX0_BIT] = rs_gst0;
+    setup_func[R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX1_BIT] = rs_gst1;
+    setup_func[R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_gst0t1;
+}
+
+/* Initialize the vertex buffer setup functions based on the current
+   rendering state */
+void r128ChooseRasterSetupFunc(GLcontext *ctx)
+{
+    r128ContextPtr r128ctx   = R128_CONTEXT(ctx);
+    int            funcIndex = R128_WIN_BIT | R128_RGBA_BIT;
+
+    r128ctx->vertsize = 8;
+    r128ctx->vc_format = R128_TEX0_VERTEX_FORMAT;
+    r128ctx->multitex = 0;
+
+    if (ctx->Texture.Enabled & ENABLE_TEX0) {
+        /* This doesn't work for non-RGBA textures
+	if (ctx->Texture.Unit[0].EnvMode == GL_REPLACE)
+	    funcIndex &= ~R128_RGBA_BIT;
+        */
+	funcIndex |= R128_TEX0_BIT;
+    }
+
+    if (ctx->Texture.Enabled & ENABLE_TEX1) {
+        /* GTH: we should really only enable the second texture unit
+	 * when we're doing true multitexturing.  I guess there aren't
+	 * that many cases where apps will only bind a texture to the
+	 * second texture unit, but it would definitely be a performance
+	 * win in those cases.
+	 */
+	r128ctx->vertsize = 10;
+	r128ctx->vc_format = R128_TEX1_VERTEX_FORMAT;
+	r128ctx->multitex = 1;
+	funcIndex |= R128_TEX1_BIT;
+    }
+
+    /* FIXME: Verify this works properly */
+    if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
+	funcIndex |= R128_SPEC_BIT;
+
+    r128ctx->SetupIndex = funcIndex;
+    ctx->Driver.RasterSetup = setup_func[funcIndex];
+}
+
+/* Check to see if any updates of the vertex buffer entries are needed */
+void r128CheckPartialRasterSetup(GLcontext *ctx,
+				 struct gl_pipeline_stage *s)
+{
+    r128ContextPtr r128ctx = R128_CONTEXT(ctx);
+    int            tmp     = r128ctx->SetupDone;
+
+    s->type = 0;
+    r128ctx->SetupDone = GL_FALSE;
+
+    if ((ctx->Array.Summary & VERT_OBJ_ANY) == 0) return;
+    if (ctx->IndirectTriangles) return;
+
+    r128ctx->SetupDone = tmp;
+}
+
+
+/* Update the vertex buffer entries, if necessary */
+void r128PartialRasterSetup(struct vertex_buffer *VB)
+{
+    r128ContextPtr r128ctx   = R128_CONTEXT(VB->ctx);
+    int            new       = VB->pipeline->new_outputs;
+    int            available = VB->pipeline->outputs;
+    int            index     = 0;
+
+    if (new & VERT_WIN) {
+	new = available;
+	index |= R128_WIN_BIT;
+    }
+
+    if (new & VERT_RGBA)      index |= R128_RGBA_BIT | R128_SPEC_BIT;
+    if (new & VERT_TEX0_ANY)  index |= R128_TEX0_BIT;
+    if (new & VERT_TEX1_ANY)  index |= R128_TEX1_BIT;
+
+    r128ctx->SetupDone &= ~index;
+    index              &= r128ctx->SetupIndex;
+    r128ctx->SetupDone |= index;
+
+    if (index) setup_func[index](VB, VB->Start, VB->Count);
+}
+
+/* Perform the raster setup for the fast path, if using CVA */
+void r128DoRasterSetup(struct vertex_buffer *VB)
+{
+    GLcontext *ctx = VB->ctx;
+
+    if (VB->Type == VB_CVA_PRECALC)   r128PartialRasterSetup(VB);
+    else if (ctx->Driver.RasterSetup) ctx->Driver.RasterSetup(VB,
+							      VB->CopyStart,
+							      VB->Count);
+}
+
+/* Resize an existing vertex buffer */
+void r128ResizeVB(struct vertex_buffer *VB, GLuint size)
+{
+    r128VertexBufferPtr r128vb = R128_DRIVER_DATA(VB);
+
+    while (r128vb->size < size)
+	r128vb->size *= 2;
+
+    free(r128vb->vert_store);
+    r128vb->vert_store = malloc(sizeof(r128Vertex) * r128vb->size + 31);
+    if (!r128vb->vert_store) {
+	fprintf(stderr, "Cannot allocate vertex store!  Exiting...\n");
+	exit(1);
+    }
+
+    r128vb->verts = (r128VertexPtr)(((CARD32)r128vb->vert_store + 31) & ~31);
+
+    gl_vector1ui_free(&r128vb->clipped_elements);
+    gl_vector1ui_alloc(&r128vb->clipped_elements,
+		       VEC_WRITABLE, r128vb->size, 32);
+    if (!r128vb->clipped_elements.start) {
+	fprintf(stderr, "Cannot allocate clipped elements!  Exiting...\n");
+	exit(1);
+    }
+
+    free(VB->ClipMask);
+    VB->ClipMask = (GLubyte *)malloc(sizeof(GLubyte) * r128vb->size);
+    if (!VB->ClipMask) {
+	fprintf(stderr, "Cannot allocate clipmask!  Exiting...\n");
+	exit(1);
+    }
+}
+
+/* Create a new device-dependent vertex buffer */
+void r128DDRegisterVB(struct vertex_buffer *VB)
+{
+    r128VertexBufferPtr r128vb;
+
+    r128vb = (r128VertexBufferPtr)calloc(1, sizeof(*r128vb));
+
+    r128vb->size = VB->Size * 2;
+    r128vb->vert_store = malloc(sizeof(r128Vertex) * r128vb->size + 31);
+    if (!r128vb->vert_store) {
+	fprintf(stderr, "Cannot allocate vertex store!  Exiting...\n");
+	exit(1);
+    }
+
+    r128vb->verts = (r128VertexPtr)(((CARD32)r128vb->vert_store + 31) & ~31);
+
+    gl_vector1ui_alloc(&r128vb->clipped_elements,
+		       VEC_WRITABLE, r128vb->size, 32);
+    if (!r128vb->clipped_elements.start) {
+	fprintf(stderr, "Cannot allocate clipped elements!  Exiting...\n");
+	exit(1);
+    }
+
+    free(VB->ClipMask);
+    VB->ClipMask = (GLubyte *)malloc(sizeof(GLubyte) * r128vb->size);
+    if (!VB->ClipMask) {
+	fprintf(stderr, "Cannot allocate clipmask!  Exiting...\n");
+	exit(1);
+    }
+
+    VB->driver_data = r128vb;
+}
+
+/* Destroy a device-dependent vertex buffer */
+void r128DDUnregisterVB(struct vertex_buffer *VB)
+{
+    r128VertexBufferPtr r128vb = R128_DRIVER_DATA(VB);
+
+    if (r128vb) {
+	if (r128vb->vert_store)     free(r128vb->vert_store);
+	gl_vector1ui_free(&r128vb->clipped_elements);
+	free(r128vb);
+	VB->driver_data = 0;
+    }
+}
Index: xc/lib/GL/mesa/src/drv/r128/r128_vb.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_vb.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_vb.h	Fri Jun 16 17:03:09 2000
@@ -0,0 +1,166 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_vb.h,v 1.1 2000/06/17 00:03:09 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_VB_H_
+#define _R128_VB_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+/* FIXME: This is endian-specific */
+typedef struct {
+    GLubyte b;
+    GLubyte g;
+    GLubyte r;
+    GLubyte a;
+} r128Color;
+
+/* Single texture vertex, single x86 cache line.
+ *
+ * GTH: This is in use now.
+ */
+typedef struct {
+    GLfloat   x, y, z;		/* Coordinates in screen space */
+    GLfloat   rhw;		/* Reciprocal homogeneous w */
+    r128Color dif_argb;		/* Diffuse color */
+    r128Color spec_frgb;	/* Specular color (alpha is fog) */
+    GLfloat   tu0, tv0;		/* Texture 0 coordinates */
+} r128_vertex1;
+
+/* The only vertex format in current use, but unsatisfactory for two
+ * reasons:
+ *       - Not possible to implement fully conformant rendering
+ *         with this format (projective multitexturing),
+ *       - Performance is lower with this vertex for single-texture
+ *         geometry, as the vertex is unnecessarily larger than
+ *         a cacheline.
+ *
+ * Switching to single-texture vertices can be accomplished in state
+ * management, and is relatively trivial.  Switching to the rhw2
+ * format is data-dependent (are there any glTexCoord4f's in the
+ * current buffer).  One option is to switch between single-texture
+ * and rhw2 vertex formats only on the standard path.
+ *
+ * The fastpath never requires the rhw2 format, as it already makes
+ * the data-dependent checks.
+ *
+ * GTH: This is fixed.
+ */
+typedef struct {
+    GLfloat   x, y, z;		/* Coordinates in screen space */
+    GLfloat   rhw;		/* Reciprocal homogeneous w */
+    r128Color dif_argb;		/* Diffuse color */
+    r128Color spec_frgb;	/* Specular color (alpha is fog) */
+    GLfloat   tu0, tv0;		/* Texture 0 coordinates */
+    GLfloat   tu1, tv1;		/* Texture 1 coordinates */
+} r128_vertex2;
+
+/* Need to be slightly clever about flushing vertex buffers in order
+ * to use rhw2 only on demand.
+ *
+ * GTH: This can be used now.
+ */
+typedef struct {
+    GLfloat   x, y, z;		/* Coordinates in screen space */
+    GLfloat   rhw;		/* Reciprocal homogeneous w */
+    r128Color dif_argb;		/* Diffuse color */
+    r128Color spec_frgb;	/* Specular color (alpha is fog) */
+    GLfloat   tu0, tv0;		/* Texture 0 coordinates */
+    GLfloat   tu1, tv1;		/* Texture 1 coordinates */
+    GLfloat   rhw2;		/* Reciprocal homogeneous w2 */
+} r128_vertex2_rhw2;
+
+/* Format of vertices in r128_vertex struct */
+#define R128_TEX0_VERTEX_FORMAT                                            \
+    R128_CCE_VC_FRMT_RHW          |                                        \
+    R128_CCE_VC_FRMT_DIFFUSE_ARGB |                                        \
+    R128_CCE_VC_FRMT_SPEC_FRGB    |                                        \
+    R128_CCE_VC_FRMT_S_T
+
+#define R128_TEX1_VERTEX_FORMAT                                            \
+    R128_CCE_VC_FRMT_RHW          |                                        \
+    R128_CCE_VC_FRMT_DIFFUSE_ARGB |                                        \
+    R128_CCE_VC_FRMT_SPEC_FRGB    |                                        \
+    R128_CCE_VC_FRMT_S_T          |                                        \
+    R128_CCE_VC_FRMT_S2_T2
+
+#define R128_PROJ_TEX1_VERTEX_FORMAT                                       \
+    R128_CCE_VC_FRMT_RHW          |                                        \
+    R128_CCE_VC_FRMT_DIFFUSE_ARGB |                                        \
+    R128_CCE_VC_FRMT_SPEC_FRGB    |                                        \
+    R128_CCE_VC_FRMT_S_T          |                                        \
+    R128_CCE_VC_FRMT_S2_T2        |                                        \
+    R128_CCE_VC_FRMT_RHW2
+
+
+/* FIXME: We currently only have assembly for 16-stride vertices */
+union r128_vertex_t {
+    r128_vertex1	vert1;
+    r128_vertex2	vert2;
+    r128_vertex2_rhw2	vert3;
+    float		f[16];
+    CARD32		ui[16];
+};
+
+typedef union r128_vertex_t r128Vertex;
+typedef union r128_vertex_t *r128VertexPtr;
+
+/* Vertex buffer for use when on the fast path */
+typedef struct {
+    GLuint         size;		/* Number of vertices in store */
+    void          *vert_store;		/* Storage for vertex buffer */
+    r128VertexPtr  verts;		/* Aligned start of verts in storage */
+    int            last_vert;		/* Index of last vertex used */
+    GLvector1ui    clipped_elements;	/* List of clipped elements */
+} *r128VertexBufferPtr;
+
+#define R128_DRIVER_DATA(vb) ((r128VertexBufferPtr)((vb)->driver_data))
+
+#define R128_SPEC_BIT       0x01
+#define R128_TEX1_BIT       0x02
+#define R128_TEX0_BIT       0x04
+#define R128_RGBA_BIT       0x08
+#define R128_WIN_BIT        0x10
+
+extern void         r128SetupInit(void);
+extern void         r128ChooseRasterSetupFunc(GLcontext *ctx);
+extern void         r128CheckPartialRasterSetup(GLcontext *ctx,
+						struct gl_pipeline_stage *s);
+extern void         r128PartialRasterSetup(struct vertex_buffer *VB);
+extern void         r128DoRasterSetup(struct vertex_buffer *VB);
+extern void         r128ResizeVB(struct vertex_buffer *VB, GLuint size);
+extern void         r128DDRegisterVB(struct vertex_buffer *VB);
+extern void         r128DDUnregisterVB(struct vertex_buffer *VB);
+
+#endif
+#endif /* _R128_VB_H_ */
Index: xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c	Fri Jun 16 17:03:09 2000
@@ -0,0 +1,255 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c,v 1.1 2000/06/17 00:03:09 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifdef GLX_DIRECT_RENDERING
+
+/* r128 Mesa driver includes */
+#include "r128_init.h"
+#include "r128_context.h"
+#include "r128_xmesa.h"
+#include "r128_state.h"
+#include "r128_tex.h"
+#include "r128_swap.h"
+
+/* Mesa src includes */
+#include "context.h"
+#include "simple_list.h"
+#include "mmath.h"
+
+#ifndef R128_DEBUG_FLAGS
+int R128_DEBUG_FLAGS = (0
+/*			| DEBUG_ALWAYS_SYNC */
+/*			| DEBUG_VERBOSE_CCE */
+/*			| DEBUG_VERBOSE_OUTREG */
+/*			| DEBUG_VERBOSE_MSG */
+/*			| DEBUG_NO_OUTRING */
+/*			| DEBUG_NO_OUTREG */
+/*			| DEBUG_VERBOSE_API */
+/*			| DEBUG_VERBOSE_2D */
+/*			| DEBUG_VERBOSE_DRI */
+/*			| DEBUG_VALIDATE_RING */
+/*			| DEBUG_VERBOSE_IOCTL */
+    );
+#endif
+
+#if DEBUG_LOCKING
+char *prevLockFile = NULL;
+int   prevLockLine = 0;
+#endif
+
+static r128ContextPtr r128Context = NULL;
+
+
+/* Initialize the driver specific screen private data */
+GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv)
+{
+    sPriv->private = (void *)r128CreateScreen(sPriv);
+    if (!sPriv->private) {
+	r128DestroyScreen(sPriv);
+	return GL_FALSE;
+    }
+
+    return GL_TRUE;
+}
+
+/* Reset the driver specific screen private data */
+void XMesaResetDriver(__DRIscreenPrivate *sPriv)
+{
+    r128DestroyScreen(sPriv);
+}
+
+/* Create and initialize the Mesa and driver specific visual data */
+GLvisual *XMesaCreateVisual(Display *dpy,
+			    __DRIscreenPrivate *driScrnPriv,
+			    const XVisualInfo *visinfo,
+			    const __GLXvisualConfig *config)
+{
+    /* Drivers may change the args to _mesa_create_visual() in order to
+     * setup special visuals.
+     */
+    return _mesa_create_visual(config->rgba,
+			       config->doubleBuffer,
+			       config->stereo,
+			       _mesa_bitcount(visinfo->red_mask),
+			       _mesa_bitcount(visinfo->green_mask),
+			       _mesa_bitcount(visinfo->blue_mask),
+			       config->alphaSize,
+			       0, /* index bits */
+			       config->depthSize,
+			       config->stencilSize,
+			       config->accumRedSize,
+			       config->accumGreenSize,
+			       config->accumBlueSize,
+			       config->accumAlphaSize,
+			       0 /* num samples */);
+}
+
+/* Create and initialize the Mesa and driver specific context data */
+GLboolean XMesaCreateContext(Display *dpy, GLvisual *mesaVis,
+			     __DRIcontextPrivate *driContextPriv)
+{
+    return r128CreateContext(dpy, mesaVis, driContextPriv);
+}
+
+/* Destroy the Mesa and driver specific context data */
+void XMesaDestroyContext(__DRIcontextPrivate *driContextPriv)
+{
+    r128ContextPtr r128ctx = (r128ContextPtr)driContextPriv->driverPrivate;
+
+    if (r128ctx == (void *)r128Context) r128Context = NULL;
+    r128DestroyContext(r128ctx);
+}
+
+/* Create and initialize the Mesa and driver specific pixmap buffer data */
+GLframebuffer *XMesaCreateWindowBuffer(Display *dpy,
+				       __DRIscreenPrivate *driScrnPriv,
+				       __DRIdrawablePrivate *driDrawPriv,
+				       GLvisual *mesaVis)
+{
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                mesaVis->AlphaBits > 0
+                                );
+}
+
+/* Create and initialize the Mesa and driver specific pixmap buffer data */
+GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
+{
+#if 0
+    /* Different drivers may have different combinations of hardware and
+     * software ancillary buffers.
+     */
+    return gl_create_framebuffer(mesaVis,
+				 GL_FALSE,  /* software depth buffer? */
+				 mesaVis->StencilBits > 0,
+				 mesaVis->AccumRedBits > 0,
+				 mesaVis->AlphaBits > 0);
+#else
+    return NULL;  /* not implemented yet */
+#endif
+}
+
+/* Copy the back color buffer to the front color buffer */
+void XMesaSwapBuffers(__DRIdrawablePrivate *driDrawPriv)
+{
+    /* FIXME: This assumes buffer is currently bound to a context.  This
+       needs to be able to swap buffers when not currently bound.  Also,
+       this needs to swap according to buffer, and NOT according to
+       context! */
+    if (r128Context == NULL) return;
+
+    /* Only swap buffers when a back buffer exists */
+    if (R128_MESACTX(r128Context)->Visual->DBflag) {
+	FLUSH_VB(R128_MESACTX(r128Context), "swap buffers");
+	r128SwapBuffers(r128Context);
+    }
+}
+
+/* Force the context `c' to be the current context and associate with it
+   buffer `b' */
+GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
+			   __DRIdrawablePrivate *driDrawPriv,
+			   __DRIdrawablePrivate *driReadPriv)
+{
+    if (driContextPriv) {
+	r128ContextPtr r128ctx = (r128ContextPtr)driContextPriv->driverPrivate;
+
+	if (r128Context &&
+	    r128ctx == (void *)r128Context &&
+	    driDrawPriv == R128_DRIDRAWABLE(r128Context))
+	    return GL_TRUE;
+
+	r128Context = r128MakeCurrent(r128Context, r128ctx, driDrawPriv);
+
+	gl_make_current2(R128_MESACTX(r128Context),
+			 driDrawPriv->mesaBuffer, driReadPriv->mesaBuffer);
+
+	if (!R128_MESACTX(r128Context)->Viewport.Width) {
+	    gl_Viewport(R128_MESACTX(r128Context), 0, 0,
+			driDrawPriv->w, driDrawPriv->h);
+	}
+    } else {
+	gl_make_current(0,0);
+	r128Context = NULL;
+    }
+
+    return GL_TRUE;
+}
+
+/* Force the context `c' to be unbound from its buffer */
+GLboolean XMesaUnbindContext(__DRIcontextPrivate *driContextPriv)
+{
+    return GL_TRUE;
+}
+
+/* Update the hardware state.  This is called if another context has
+   grabbed the hardware lock, which includes the X server.  This
+   function also updates the driver's window state after the X server
+   moves, resizes or restacks a window -- the change will be reflected
+   in the drawable position and clip rects.  Since the X server grabs
+   the hardware lock when it changes the window state, this routine will
+   automatically be called after such a change. */
+/* NOTE: This routine is only called while holding the hardware lock. */
+void XMesaUpdateState(__DRIcontextPrivate *driContextPriv)
+{
+    r128ContextPtr        r128ctx = driContextPriv->driverPrivate;
+    __DRIscreenPrivate   *sPriv   = R128_DRISCREEN(r128ctx);
+    __DRIdrawablePrivate *dPriv   = R128_DRIDRAWABLE(r128ctx);
+    int                   stamp   = dPriv->lastStamp;
+
+    /* The window might have moved, so we might need to get new clip
+       rects.
+
+       NOTE: This releases and regrabs the hw lock to allow the X server
+       to respond to the DRI protocol request for new drawable info.
+       Since the hardware state depends on having the latest drawable
+       clip rects, all state checking must be done _after_ this call. */
+    XMESA_VALIDATE_DRAWABLE_INFO(r128ctx->display, sPriv, dPriv);
+
+    r128UpdateState(r128ctx, (stamp != dPriv->lastStamp));
+}
+
+/* This function is called by libGL.so as soon as libGL.so is loaded.
+ * This is where we'd register new extension functions with the dispatcher.
+ */
+void __driRegisterExtensions(void)
+{
+}
+
+#endif
Index: xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h	Fri Jun 16 17:03:09 2000
@@ -0,0 +1,44 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h,v 1.1 2000/06/17 00:03:09 martin Exp $ */
+/**************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
+                                               Cedar Park, Texas. 
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _R128_XMESA_H_
+#define _R128_XMESA_H_
+
+#ifdef GLX_DIRECT_RENDERING
+
+extern void XMesaUpdateState(__DRIcontextPrivate *driContextPriv);
+extern void __driRegisterExtensions(void);
+
+#endif
+#endif /* _R128_XMESA_H_ */
Index: xc/lib/GL/mesa/src/drv/sis/Imakefile
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/Imakefile:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/Imakefile	Fri Jun 30 12:30:17 2000
@@ -0,0 +1,315 @@
+XCOMM $PI:$
+
+#include <Threads.tmpl>
+
+#define DoNormalLib NormalLibGlx
+#define DoSharedLib SharedLibGlx
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+
+XCOMM SIS_DEFINES = -DSIS_USE_HW_CULL -DSIS_USE_FASTPATH
+SIS_DEFINES = -DSIS_USE_HW_CULL
+
+XCOMM DEBUG_DEFINES = -DDEBUG_LOCKING
+XCOMM DEBUG_DEFINES = -DSIS_DEBUG
+ 
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines $(SIS_DEFINES)
+  DRI_INCLUDES = -I../../../../dri -I../../../../glx \
+		-I../../../dri \
+      		-I$(TOP)/include -I$(TOP)/include/GL \
+    		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \
+		-I$(XF86DRIVERSRC)/sis \
+		-I../../../include -I../.. -I../../X \
+                -I../common/ \
+                -I$(XF86OSSRC)/linux/drm/kernel
+#endif
+
+MESA_INCLUDES = -I. -I.. -I../../include
+
+LinkSourceFile(xdriP.h, ../../X)
+
+#if 0
+ DEBUG_SRC = sis_debug.c
+ DEBUG_OBJ = sis_debug.o
+ LinkSourceFile(sis_debug.c, ../../../../../../extras/Mesa/src/SIS)
+ LinkSourceFile(sis_debug.h, ../../../../../../extras/Mesa/src/SIS)
+ DEBUG_DEFINES += -DSIS_DUMP
+#endif
+
+#if 0
+ STEREO_SRC = sis_stereo.c
+ STEREO_OBJ = sis_stereo.o
+ LinkSourceFile(sis_stereo.c, ../../../../../../extras/Mesa/src/SIS)
+ LinkSourceFile(sis_stereo.h, ../../../../../../extras/Mesa/src/SIS)
+ STEREO_DEFINES = -DSIS_STEREO=1
+#else
+ STEREO_DEFINES = -DSIS_STEREO=0
+#endif
+
+     DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(DEBUG_DEFINES) \
+               $(STEREO_DEFINES)
+     INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) \
+		-I./misc \
+                -I$(SERVERSRC)/hw/xfree86/drivers/sis
+
+     SISSRCS = sis_render.c sis_mesa.c sis_ctx.c sis_alloc.c \
+            sis_fog.c sis_clear.c sis_stencil.c \
+            sis_texture.c sis_xwin.c sis_xmesa.c sis_span.c sis_fastpath.c \
+            $(DEBUG_SRC) \
+            $(STEREO_SRC)
+
+     SISOBJS = sis_render.o sis_mesa.o sis_ctx.o sis_alloc.o \
+            sis_fog.o sis_clear.o sis_stencil.o \
+            sis_texture.o sis_xwin.o sis_xmesa.o sis_span.o sis_fastpath.o \
+            $(DEBUG_OBJ) \
+            $(STEREO_OBJ)
+
+      DRISRCS = ../../../dri/dri_mesa.c \
+		../../../../dri/dri_tmm.c
+
+      DRIOBJS = ../../../dri/dri_mesa.o \
+		../../../../dri/dri_tmm.o
+
+      DRMSRCS = ../../../../dri/drm/xf86drm.c \
+		../../../../dri/drm/xf86drmHash.c \
+		../../../../dri/drm/xf86drmRandom.c \
+		../../../../dri/drm/xf86drmSL.c
+
+      DRMOBJS = ../../../../dri/drm/xf86drm.o \
+		../../../../dri/drm/xf86drmHash.o \
+		../../../../dri/drm/xf86drmRandom.o \
+		../../../../dri/drm/xf86drmSL.o
+
+     MESASRCS = ../../aatriangle.c \
+		../../accum.c \
+		../../alpha.c \
+		../../alphabuf.c \
+		../../attrib.c \
+		../../bbox.c \
+		../../bitmap.c \
+		../../blend.c \
+		../../buffers.c \
+		../../clip.c \
+		../../colortab.c \
+		../../config.c \
+		../../context.c \
+		../../copypix.c \
+		../../cva.c \
+		../../debug_xform.c \
+		../../depth.c \
+		../../dlist.c \
+		../../drawpix.c \
+		../../enable.c \
+		../../enums.c \
+		../../eval.c \
+		../../extensions.c \
+		../../feedback.c \
+		../../fog.c \
+		../../get.c \
+		../../glapi.c \
+		../../glapinoop.c \
+		../../glthread.c \
+		../../hash.c \
+		../../image.c \
+		../../imaging.c \
+		../../light.c \
+		../../lines.c \
+		../../logic.c \
+		../../masking.c \
+		../../matrix.c \
+		../../mem.c \
+		../../mmath.c \
+		../../pb.c \
+		../../pipeline.c \
+		../../pixel.c \
+		../../pixeltex.c \
+		../../points.c \
+		../../polygon.c \
+		../../quads.c \
+		../../rastpos.c \
+		../../readpix.c \
+		../../rect.c \
+		../../scissor.c \
+		../../shade.c \
+		../../span.c \
+		../../stages.c \
+		../../state.c \
+		../../stencil.c \
+		../../teximage.c \
+		../../texobj.c \
+		../../texstate.c \
+		../../texture.c \
+		../../texutil.c \
+		../../translate.c \
+		../../triangle.c \
+		../../varray.c \
+		../../vb.c \
+		../../vbcull.c \
+		../../vbfill.c \
+		../../vbindirect.c \
+		../../vbrender.c \
+		../../vbxform.c \
+		../../vector.c \
+		../../vertices.c \
+		../../winpos.c \
+		../../xform.c \
+		../../zoom.c \
+		../../X86/common_x86.c
+
+     MESAOBJS = ../../aatriangle.o \
+		../../accum.o \
+		../../alpha.o \
+		../../alphabuf.o \
+		../../attrib.o \
+		../../bbox.o \
+		../../bitmap.o \
+		../../blend.o \
+		../../buffers.o \
+		../../clip.o \
+		../../colortab.o \
+		../../config.o \
+		../../context.o \
+		../../copypix.o \
+		../../cva.o \
+		../../debug_xform.o \
+		../../depth.o \
+		../../dlist.o \
+		../../drawpix.o \
+		../../enable.o \
+		../../enums.o \
+		../../eval.o \
+		../../extensions.o \
+		../../feedback.o \
+		../../fog.o \
+		../../get.o \
+		../../hash.o \
+		../../hint.o \
+		../../image.o \
+		../../imaging.o \
+		../../light.o \
+		../../lines.o \
+		../../logic.o \
+		../../masking.o \
+		../../matrix.o \
+		../../mem.o \
+		../../mmath.o \
+		../../pb.o \
+		../../pipeline.o \
+		../../pixel.o \
+		../../pixeltex.o \
+		../../points.o \
+		../../polygon.o \
+		../../quads.o \
+		../../rastpos.o \
+		../../readpix.o \
+		../../rect.o \
+		../../scissor.o \
+		../../shade.o \
+		../../span.o \
+		../../stages.o \
+		../../state.o \
+		../../stencil.o \
+		../../teximage.o \
+		../../texobj.o \
+		../../texstate.o \
+		../../texture.o \
+		../../texutil.o \
+		../../translate.o \
+		../../triangle.o \
+		../../varray.o \
+		../../vb.o \
+		../../vbcull.o \
+		../../vbfill.o \
+		../../vbindirect.o \
+		../../vbrender.o \
+		../../vbxform.o \
+		../../vector.o \
+		../../vertices.o \
+		../../winpos.o \
+		../../xform.o \
+		../../zoom.o
+
+#ifdef i386Architecture
+     X86_SRCS = ../../X86/x86.c \
+		../../X86/x86a.S \
+		../../X86/common_x86.c \
+		../../X86/common_x86asm.S \
+		../../X86/vertex.S
+
+     X86_OBJS = ../../X86/x86.o \
+		../../X86/x86a.o \
+		../../X86/common_x86.o \
+		../../X86/common_x86asm.o \
+		../../X86/vertex.o
+
+     MMX_SRCS = ../../X86/mmx_blend.S
+
+     MMX_OBJS = ../../X86/mmx_blend.o
+
+#if MesaUse3DNow
+   3DNOW_SRCS = ../../X86/3dnow.c \
+		../../X86/3dnow_norm_raw.S \
+		../../X86/3dnow_xform_masked1.S \
+		../../X86/3dnow_xform_masked2.S \
+		../../X86/3dnow_xform_masked3.S \
+		../../X86/3dnow_xform_masked4.S \
+		../../X86/3dnow_xform_raw1.S \
+		../../X86/3dnow_xform_raw2.S \
+		../../X86/3dnow_xform_raw3.S \
+		../../X86/3dnow_xform_raw4.S \
+		../../X86/vertex_3dnow.S
+
+   3DNOW_OBJS = ../../X86/3dnow.o \
+		../../X86/3dnow_norm_raw.o \
+		../../X86/3dnow_xform_masked1.o \
+		../../X86/3dnow_xform_masked2.o \
+		../../X86/3dnow_xform_masked3.o \
+		../../X86/3dnow_xform_masked4.o \
+		../../X86/3dnow_xform_raw1.o \
+		../../X86/3dnow_xform_raw2.o \
+		../../X86/3dnow_xform_raw3.o \
+		../../X86/3dnow_xform_raw4.o \
+		../../X86/vertex_3dnow.o
+#endif
+
+#endif
+
+      ASMSRCS = $(X86_SRCS) $(MMX_SRCS) $(3DNOW_SRCS)
+      ASMOBJS = $(X86_OBJS) $(MMX_OBJS) $(3DNOW_OBJS)
+
+	 SRCS = $(DRISRCS) $(DRMSRCS) $(SISSRCS) $(MESASRCS) $(ASMSRCS)
+	 OBJS = $(DRIOBJS) $(DRMOBJS) $(SISOBJS) $(MESAOBJS) $(ASMOBJS)
+
+#if !GlxUseBuiltInDRIDriver || GlxDebugSIS 
+#undef DoNormalLib NormalLibGlx
+#undef DoExtraLib SharedLibGlx
+#undef DoDebugLib DebugLibGlx
+#undef DoProfileLib ProfileLibGlx
+#endif
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver || GlxDebugSIS
+# if GlxDebugSIS && GlxUseBuiltInDRIDriver
+LIBNAME = libsis_dri.so
+# else
+LIBNAME = sis_dri.so
+# endif
+ALL_OBJS = $(OBJS) 
+ALL_DEPS = DONE
+SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR)/dri,.)
+#endif
+
+DependTarget()
Index: xc/lib/GL/mesa/src/drv/sis/sis_alloc.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_alloc.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_alloc.c	Fri Jun 30 12:30:18 2000
@@ -0,0 +1,447 @@
+#include <assert.h>
+
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+#if defined(XFree86Server) && !defined(XF86DRI)
+# include "xf86fbman.h"
+#else
+# include "drm.h"
+# include "sis_drm_public.h"
+# include <sys/ioctl.h>
+#endif
+
+#define Z_BUFFER_HW_ALIGNMENT 16
+#define Z_BUFFER_HW_PLUS (16 + 4)
+
+/* 3D engine uses 2,and bitblt uses 4 */
+#define DRAW_BUFFER_HW_ALIGNMENT 16
+#define DRAW_BUFFER_HW_PLUS (16 + 4)
+
+#define TEXTURE_HW_ALIGNMENT 4
+#define TEXTURE_HW_PLUS (4 + 4)
+
+#ifdef ROUNDUP
+#undef ROUNDUP
+#endif
+#define ROUNDUP(nbytes, pad) (((nbytes)+(pad-1))/(pad))
+
+#ifdef ALIGNMENT
+#undef ALIGNMENT
+#endif
+#define ALIGNMENT(value, align) (ROUNDUP((value),(align))*(align))
+
+#if defined(XFree86Server) && !defined(XF86DRI)
+
+static void *
+sis_malloc (__GLSiScontext * hwcx, GLuint size, void **free)
+{
+  GLcontext *ctx = hwcx->gc;
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+
+  ScreenPtr pScreen = xmesa->display;
+
+  GLuint offset;
+  BoxPtr pBox;
+
+  size = ROUNDUP (size, GET_DEPTH (hwcx));
+  *free = xf86AllocateLinearOffscreenArea (pScreen, size, 1,
+					   NULL, NULL, NULL);
+
+  if (!*free)
+    return NULL;
+
+  pBox = &((FBAreaPtr) (*free))->box;
+  offset = pBox->y1 * GET_PITCH (hwcx) + pBox->x1 * GET_DEPTH (hwcx);
+
+  return GET_FbBase (hwcx) + offset;
+}
+
+static void
+sis_free (__GLSiScontext * hwcx, void *free)
+{
+  xf86FreeOffscreenArea ((FBAreaPtr) free);
+}
+
+#else
+
+/* debug */
+#if 1
+
+static int _total_video_memory_used = 0;
+static int _total_video_memory_count = 0;
+
+static void *
+sis_malloc (__GLSiScontext * hwcx, GLuint size, void **free)
+{
+  GLcontext *ctx = hwcx->gc;
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+
+  drm_sis_mem_t fb;
+
+  _total_video_memory_used += size;
+
+  fb.context = xmesa->driContextPriv->hHWContext;
+  fb.size = size;
+  if(ioctl(hwcx->drmSubFD, SIS_IOCTL_FB_ALLOC, &fb) || !fb.physical)
+    return NULL;
+  *free = (void *)fb.free;
+
+  /* debug */
+  /* memset(fb.physical + GET_FbBase(hwcx), 0xff, size); */
+
+  if (SIS_VERBOSE&VERBOSE_SIS_MEMORY)
+  {
+    fprintf(stderr, "sis_malloc: size=%u, offset=%lu, pid=%lu, count=%d\n", 
+           size, (DWORD)fb.physical, (DWORD)getpid(), 
+           ++_total_video_memory_count);
+  }
+
+  return (void *)(fb.physical + GET_FbBase(hwcx));
+}
+
+static void
+sis_free (__GLSiScontext * hwcx, void *free)
+{
+  GLcontext *ctx = hwcx->gc;
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+
+  drm_sis_mem_t fb;
+
+  if (SIS_VERBOSE&VERBOSE_SIS_MEMORY)
+  {
+    fprintf(stderr, "sis_free: free=%lu, pid=%lu, count=%d\n", 
+            (DWORD)free, (DWORD)getpid(), --_total_video_memory_count);
+  }
+  
+  fb.context = xmesa->driContextPriv->hHWContext;
+  fb.free = (unsigned int)free;
+  ioctl(hwcx->drmSubFD, SIS_IOCTL_FB_FREE, &fb);
+}
+
+#else
+
+static void *
+sis_malloc (__GLSiScontext * hwcx, GLuint size, void **free)
+{
+  static char *vidmem_base = 0x400000;
+  char *rval = vidmem_base;
+
+  vidmem_base += size;
+  if(vidmem_base >= 31*0x100000)
+    return NULL;
+  
+  *free = rval + (DWORD)hwcx->FbBase;
+
+  return rval + (DWORD)hwcx->FbBase;
+}
+
+static void
+sis_free (__GLSiScontext * hwcx, void *free)
+{
+  return;
+}
+
+#endif
+
+#endif
+
+/* debug */
+static unsigned int Total_Real_Textures_Used = 0;
+static unsigned int Total_Textures_Used = 0;
+
+void
+sis_alloc_z_stencil_buffer (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  XMesaBuffer xm_buffer = xmesa->xm_buffer;
+  sisBufferInfo *priv = (sisBufferInfo *) xm_buffer->private;
+
+  GLuint z_depth;
+  GLuint totalBytes;
+  int width2;
+
+  GLubyte *addr;
+
+  z_depth = (xm_buffer->xm_visual->gl_visual->DepthBits +
+	     xm_buffer->xm_visual->gl_visual->StencilBits) / 8;
+
+  width2 = ALIGNMENT (xm_buffer->width * z_depth, 4);
+
+  totalBytes = xm_buffer->height * width2 + Z_BUFFER_HW_PLUS;
+
+  if (xm_buffer->gl_buffer->DepthBuffer)
+    {
+      sis_free_z_stencil_buffer (xm_buffer);
+    }
+
+  addr = sis_malloc (hwcx, totalBytes, &priv->zbFree);
+  if (!addr)
+    {
+      fprintf (stderr, "SIS driver : out of video memory\n");
+      sis_fatal_error ();
+    }
+
+  if (SIS_VERBOSE&VERBOSE_SIS_BUFFER)
+  {
+    fprintf(stderr, "sis_alloc_z_stencil_buffer: addr=%lu\n", (DWORD)addr);
+  }
+
+  addr = (GLubyte *) ALIGNMENT ((GLuint) addr, Z_BUFFER_HW_ALIGNMENT);
+
+  xm_buffer->gl_buffer->DepthBuffer = (void *) addr;
+
+  /* software render */
+  hwcx->swZBase = addr;
+  hwcx->swZPitch = width2;
+
+  /* set pZClearPacket */
+  memset (priv->pZClearPacket, 0, sizeof (ENGPACKET));
+
+  priv->pZClearPacket->dwSrcPitch = (z_depth == 2) ? 0x80000000 : 0xf0000000;
+  priv->pZClearPacket->dwDestBaseAddr =
+    (DWORD) addr - (DWORD) GET_FbBase (hwcx);
+  priv->pZClearPacket->wDestPitch = width2;
+  priv->pZClearPacket->stdwDestPos.wY = 0;
+  priv->pZClearPacket->stdwDestPos.wX = 0;
+
+  priv->pZClearPacket->wDestHeight = hwcx->virtualY;
+  priv->pZClearPacket->stdwDim.wWidth = (WORD) width2 / z_depth;
+  priv->pZClearPacket->stdwDim.wHeight = (WORD) xm_buffer->height;
+  priv->pZClearPacket->stdwCmd.cRop = 0xf0;
+
+  if (hwcx->blockWrite)
+    {
+      priv->pZClearPacket->stdwCmd.cCmd0 = (BYTE) (CMD0_PAT_FG_COLOR);
+      priv->pZClearPacket->stdwCmd.cCmd1 =
+	(BYTE) (CMD1_DIR_X_INC | CMD1_DIR_Y_INC);
+    }
+  else
+    {
+      priv->pZClearPacket->stdwCmd.cCmd0 = 0;
+      priv->pZClearPacket->stdwCmd.cCmd1 =
+	(BYTE) (CMD1_DIR_X_INC | CMD1_DIR_Y_INC);
+    }
+}
+
+void
+sis_free_z_stencil_buffer (XMesaBuffer buf)
+{
+  sisBufferInfo *priv = (sisBufferInfo *) buf->private;
+  __GLSiScontext *hwcx = (__GLSiScontext *) buf->xm_context->private;
+
+  sis_free (hwcx, priv->zbFree);
+  priv->zbFree = NULL;
+  buf->gl_buffer->DepthBuffer = NULL;
+}
+
+void
+sis_alloc_back_image (GLcontext * ctx, XMesaImage *image, void **free,
+                      ENGPACKET *packet)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  XMesaBuffer xm_buffer = xmesa->xm_buffer;
+
+  GLuint depth = GET_DEPTH (hwcx);
+  GLuint size, width2;
+
+  GLbyte *addr;
+
+  if (image->data)
+    {
+      sis_free_back_image (xm_buffer, image, *free);
+      *free = NULL;
+    }
+
+  width2 = (depth == 2) ? ALIGNMENT (xm_buffer->width, 2) : xm_buffer->width;
+  size = width2 * xm_buffer->height * depth + DRAW_BUFFER_HW_PLUS;
+
+  addr = sis_malloc (hwcx, size, free);
+  if (!addr)
+    {
+      fprintf (stderr, "SIS driver : out of video memory\n");
+      sis_fatal_error ();
+    }
+
+  addr = (GLbyte *) ALIGNMENT ((GLuint) addr, DRAW_BUFFER_HW_ALIGNMENT);
+
+  image->data = addr;
+
+  image->bytes_per_line = width2 * depth;
+  image->bits_per_pixel = depth * 8;
+
+  memset (packet, 0, sizeof (ENGPACKET));
+
+  packet->dwSrcPitch = (depth == 2) ? 0x80000000 : 0xf0000000;
+  packet->dwDestBaseAddr =
+    (DWORD) addr - (DWORD) GET_FbBase (hwcx);
+  packet->wDestPitch = image->bytes_per_line;
+  packet->stdwDestPos.wY = 0;
+  packet->stdwDestPos.wX = 0;
+
+  packet->wDestHeight = hwcx->virtualY;
+  packet->stdwDim.wWidth = (WORD) width2;
+  packet->stdwDim.wHeight = (WORD) xm_buffer->height;
+  packet->stdwCmd.cRop = 0xf0;
+
+  if (hwcx->blockWrite)
+    {
+      packet->stdwCmd.cCmd0 = (BYTE) (CMD0_PAT_FG_COLOR);
+      packet->stdwCmd.cCmd1 =
+	(BYTE) (CMD1_DIR_X_INC | CMD1_DIR_Y_INC);
+    }
+  else
+    {
+      packet->stdwCmd.cCmd0 = 0;
+      packet->stdwCmd.cCmd1 = (BYTE) (CMD1_DIR_X_INC | CMD1_DIR_Y_INC);
+    }
+}
+
+void
+sis_free_back_image (XMesaBuffer buf, XMesaImage *image, void *free)
+{
+  __GLSiScontext *hwcx = (__GLSiScontext *) buf->xm_context->private;
+
+  sis_free (hwcx, free);
+  image->data = NULL; 
+}
+
+void
+sis_alloc_texture_image (GLcontext * ctx, GLtextureImage * image)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  GLuint size;
+
+  SIStextureArea *area = image->DriverData;
+  char *addr;
+
+  GLuint texel_size;
+  GLenum driver_format;
+
+  if (area)
+    sis_free_texture_image (image);
+
+  area = calloc (1, sizeof (SIStextureArea));
+  if (!area){
+    fprintf (stderr, "SIS Driver : allocating context fails\n");
+    sis_fatal_error ();
+    return;
+  }
+
+  switch (image->IntFormat)
+    {
+    case GL_ALPHA:
+    case GL_ALPHA4:
+    case GL_ALPHA8:
+    case GL_ALPHA12:
+    case GL_ALPHA16:
+      texel_size = 1;
+      driver_format = GL_ALPHA8;
+      break;
+    case 1:
+    case GL_LUMINANCE:
+    case GL_LUMINANCE4:
+    case GL_LUMINANCE8:
+    case GL_LUMINANCE12:
+    case GL_LUMINANCE16:
+      texel_size = 1;
+      driver_format = GL_LUMINANCE8;
+      break;
+    case 2:
+    case GL_LUMINANCE_ALPHA:
+    case GL_LUMINANCE4_ALPHA4:
+    case GL_LUMINANCE6_ALPHA2:
+    case GL_LUMINANCE8_ALPHA8:
+    case GL_LUMINANCE12_ALPHA4:
+    case GL_LUMINANCE12_ALPHA12:
+    case GL_LUMINANCE16_ALPHA16:
+      texel_size = 2;
+      driver_format = GL_LUMINANCE8_ALPHA8;
+      break;
+    case GL_INTENSITY:
+    case GL_INTENSITY4:
+    case GL_INTENSITY8:
+    case GL_INTENSITY12:
+    case GL_INTENSITY16:
+      texel_size = 1;
+      driver_format = GL_INTENSITY8;
+      break;
+    case 3:
+    case GL_RGB:
+    case GL_R3_G3_B2:
+    case GL_RGB4:
+    case GL_RGB5:
+    case GL_RGB8:
+    case GL_RGB10:
+    case GL_RGB12:
+    case GL_RGB16:
+      texel_size = 4;
+      driver_format = GL_RGB8;
+      break;
+    case 4:
+    case GL_RGBA:
+    case GL_RGBA2:
+    case GL_RGBA4:
+    case GL_RGB5_A1:
+    case GL_RGBA8:
+    case GL_RGB10_A2:
+    case GL_RGBA12:
+    case GL_RGBA16:
+      texel_size = 4;
+      driver_format = GL_RGBA8;
+      break;
+    default:
+      assert(0);
+      return;
+    }
+
+  size = image->Width * image->Height * texel_size + TEXTURE_HW_PLUS;
+
+  addr = sis_malloc (hwcx, size, &area->pArea);
+  if (!addr)
+    {
+      fprintf (stderr, "SIS driver : out of video memory\n");
+      sis_fatal_error ();
+      return;
+    }
+
+  area->Data = (GLbyte *) ALIGNMENT ((GLuint) addr, TEXTURE_HW_ALIGNMENT);
+  area->Pitch = image->Width * texel_size;
+  area->Format = driver_format;
+  area->Size = image->Width * image->Height * texel_size;
+  area->texelSize = texel_size;
+  area->hwcx = hwcx;
+
+  /* debug */
+  area->realSize = area->Size;
+  Total_Real_Textures_Used += area->realSize;
+  Total_Textures_Used++;
+
+  image->DriverData = area;
+}
+
+void
+sis_free_texture_image (GLtextureImage * image)
+{
+  SIStextureArea *area = (SIStextureArea *) image->DriverData;
+  __GLSiScontext *hwcx = (__GLSiScontext *) area->hwcx;
+
+  /* debug */
+  Total_Real_Textures_Used -= area->realSize;
+  Total_Textures_Used--;
+
+  if (!area)
+    return;
+
+  if (area->Data)
+    sis_free (hwcx, area->pArea);
+
+  free (area);
+  image->DriverData = NULL;
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_clear.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_clear.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_clear.c	Fri Jun 30 12:30:19 2000
@@ -0,0 +1,570 @@
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+#include "sis_lock.h"
+
+__inline__ static GLbitfield sis_3D_Clear (GLcontext * ctx, GLbitfield mask,
+					   GLint x, GLint y, GLint width,
+					   GLint height);
+__inline__ static void sis_clear_color_buffer (GLcontext * ctx, GLint x,
+					       GLint y, GLint width,
+					       GLint height);
+__inline__ static void sis_clear_z_stencil_buffer (GLcontext * ctx,
+						   GLbitfield mask, GLint x,
+						   GLint y, GLint width,
+						   GLint height);
+
+GLbitfield
+sis_Clear (GLcontext * ctx, GLbitfield mask, GLboolean all,
+	   GLint x, GLint y, GLint width, GLint height)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  XMesaBuffer xm_buffer = xmesa->xm_buffer;
+  GLint x1, y1, width1, height1;
+
+  if (all)
+    {
+      GLframebuffer *buffer = ctx->DrawBuffer;
+
+      x1 = 0;
+      y1 = 0;
+      width1 = buffer->Width;
+      height1 = buffer->Height;
+    }
+  else
+    {
+      x1 = x;
+      y1 = Y_FLIP(y+height-1);
+      width1 = width;            
+      height1 = height;
+    }
+
+  LOCK_HARDWARE ();
+
+  /* 
+   * TODO: no considering multiple-buffer and clear buffer
+   * differs from current draw buffer 
+   */
+
+  if ((xm_buffer->xm_visual->gl_visual->StencilBits &&
+       ((mask | GL_DEPTH_BUFFER_BIT) ^ (mask | GL_STENCIL_BUFFER_BIT))) 
+      || (*(DWORD *) (ctx->Color.ColorMask) != 0xffffffff)
+    )
+    {
+      /* only Clear either depth or stencil buffer */ 
+      mask = sis_3D_Clear (ctx, mask, x1, y1, width1, height1);
+    }
+
+  if (mask & ctx->Color.DrawDestMask)
+    {
+      sis_clear_color_buffer (ctx, x1, y1, width1, height1);
+      mask &= ~ctx->Color.DrawDestMask;
+    }
+  if (mask & (GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT))
+    {
+      if (xm_buffer->gl_buffer->DepthBuffer)
+	sis_clear_z_stencil_buffer (ctx, mask, x1, y1, width1, height1);
+      mask &= ~(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+    }
+  if (mask & GL_ACCUM_BUFFER_BIT)
+    {
+    }
+
+  UNLOCK_HARDWARE ();
+
+  return mask;
+}
+
+void
+sis_ClearDepth (GLcontext * ctx, GLclampd d)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  set_z_stencil_pattern (hwcx, d, ctx->Stencil.Clear);
+}
+
+void
+sis_ClearStencil (GLcontext * ctx, GLint s)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  set_z_stencil_pattern (hwcx, ctx->Depth.Clear, s);
+
+}
+
+#define MAKE_CLEAR_COLOR_8888(cc)   \
+            ( (((DWORD)(((GLubyte *)(cc))[3] * 255.0 + 0.5))<<24) | \
+              (((DWORD)(((GLubyte *)(cc))[0] * 255.0 + 0.5))<<16) | \
+              (((DWORD)(((GLubyte *)(cc))[1] * 255.0 + 0.5))<<8) | \
+               ((DWORD)(((GLubyte *)(cc))[2] * 255.0 + 0.5)) )
+
+__inline__ static GLbitfield
+sis_3D_Clear (GLcontext * ctx, GLbitfield mask,
+	      GLint x, GLint y, GLint width, GLint height)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *current = &hwcx->current;
+
+#define RESETSTATE (GFLAG_ENABLESETTING | GFLAG_ENABLESETTING2 | \
+                    GFLAG_ZSETTING | GFLAG_DESTSETTING | \
+                    GFLAG_STENCILSETTING | GFLAG_CLIPPING)
+#define STEN_OP (SiS_SFAIL_REPLACE | SiS_SPASS_ZFAIL_REPLACE | \
+                 SiS_SPASS_ZPASS_REPLACE)
+
+  float left, top, right, bottom, zClearVal;
+  DWORD dwColor=0;
+  DWORD bClrColor, bClrDepth, bClrStencil;
+  DWORD dwPrimitiveSet;
+  DWORD dwEnable1, dwEnable2, dwDepthMask=0, dwSten1=0, dwSten2=0;
+
+  int count;
+  BoxPtr pExtents;
+
+  bClrColor = 0;
+  bClrDepth = (mask & GL_DEPTH_BUFFER_BIT) && 
+              (xmesa->xm_visual->gl_visual->DepthBits);
+  bClrStencil = (mask & GL_STENCIL_BUFFER_BIT) && 
+                (xmesa->xm_visual->gl_visual->StencilBits);
+
+  /* update HW state */
+  /* TODO: if enclosing sis_Clear by sis_RenderStart and sis_RenderEnd is
+   * uniform, but it seems needless to do so
+   */
+  if (hwcx->GlobalFlag)
+    {
+      sis_update_render_state (hwcx, 0);
+    }
+
+  dwEnable2 = 0;
+  if (bClrColor)
+    {
+      dwColor = MAKE_CLEAR_COLOR_8888 (ctx->Color.ClearColor);
+    }
+  else
+    {
+      dwEnable2 |= 0x8000;
+    }
+
+  if (bClrDepth && bClrStencil)
+    {
+      DWORD wmask, smask;
+      GLstencil sten;
+
+      zClearVal = ctx->Depth.Clear;
+      sten = ctx->Stencil.Clear;
+      wmask = (DWORD) ctx->Stencil.WriteMask;
+      smask = 0xff;
+
+      dwEnable1 = MASK_ZWriteEnable | MASK_StencilTestEnable;
+      dwEnable2 |= MASK_ZMaskWriteEnable;
+      dwDepthMask = ((wmask << 24) | 0x00ffffff);
+      dwSten1 = S_8 | (((DWORD) sten << 8) | smask) | SiS_STENCIL_ALWAYS;
+      dwSten2 = STEN_OP;
+    }
+  else if (bClrDepth)
+    {
+      zClearVal = ctx->Depth.Clear;
+      dwEnable1 = MASK_ZWriteEnable;
+      dwEnable2 |= MASK_ZMaskWriteEnable;
+      dwDepthMask = 0xffffff;
+    }
+  else if (bClrStencil)
+    {
+      DWORD wmask, smask;
+      GLstencil sten;
+
+      sten = (GLstencil) ctx->Stencil.Clear;
+      wmask = (DWORD) ctx->Stencil.WriteMask;
+      smask = 0xff;
+
+      zClearVal = 0;
+      dwEnable1 = MASK_ZWriteEnable | MASK_StencilTestEnable;
+      dwEnable2 |= MASK_ZMaskWriteEnable;
+      dwDepthMask = (wmask << 24) & 0xff000000;
+      dwSten1 = S_8 | (((DWORD) sten << 8) | smask) | SiS_STENCIL_ALWAYS;
+      dwSten2 = STEN_OP;
+    }
+  else
+    {
+      dwEnable2 &= ~MASK_ZMaskWriteEnable;
+      dwEnable1 = 0L;
+      zClearVal = 1;
+    }
+
+  mWait3DCmdQueue (35);
+  MMIO (REG_3D_TEnable, dwEnable1);
+  MMIO (REG_3D_TEnable2, dwEnable2);
+  if (bClrDepth | bClrStencil)
+    {
+      MMIO (REG_3D_ZSet, current->hwZ);
+      MMIO (REG_3D_ZStWriteMask, dwDepthMask);
+      MMIO (REG_3D_ZAddress, current->hwOffsetZ);
+    }
+  if (bClrColor)
+    {
+      MMIO (REG_3D_DstSet, (current->hwDstSet & 0x00ffffff) | 0xc000000);
+      MMIO (REG_3D_DstAddress, current->hwOffsetDest);
+    }
+  else
+    {
+      MMIO (REG_3D_DstAlphaWriteMask, 0L);
+    }
+  if (bClrStencil)
+    {
+      MMIO (REG_3D_StencilSet, dwSten1);
+      MMIO (REG_3D_StencilSet2, dwSten2);
+    }
+
+  if (ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT)
+    {
+      sis_get_clip_rects (xmesa, &pExtents, &count);
+    }
+  else
+    {
+      pExtents = NULL;
+      count = 1;
+    }
+
+  while(count--)
+    {
+      left = x;
+      right = x + width - 1;
+      top = y;
+      bottom = y + height - 1;
+
+      if (pExtents)
+	{
+	  GLuint origin_x, origin_y;
+	  GLuint x1, y1, x2, y2;
+
+	  sis_get_drawable_origin (xmesa, &origin_x, &origin_y);
+
+	  x1 = pExtents->x1 - origin_x;
+	  y1 = pExtents->y1 - origin_y;
+	  x2 = pExtents->x2 - origin_x - 1;
+	  y2 = pExtents->y2 - origin_y - 1;
+
+	  left = (left > x1) ? left : x1;
+	  right = (right > x2) ? x2 : right;
+	  top = (top > y1) ? top : y1;
+	  bottom = (bottom > y2) ? y2 : bottom;
+	  if (left > right || top > bottom)
+	    continue;
+	  pExtents++;
+	}
+
+      MMIO (REG_3D_ClipTopBottom, ((DWORD) top << 13) | (DWORD) bottom);
+      MMIO (REG_3D_ClipLeftRight, ((DWORD) left << 13) | (DWORD) right);
+
+      /* the first triangle */
+      dwPrimitiveSet = (OP_3D_TRIANGLE_DRAW | OP_3D_FIRE_TSARGBc | 
+                        SHADE_FLAT_VertexC);
+      MMIO (REG_3D_PrimitiveSet, dwPrimitiveSet);
+
+      MMIO (REG_3D_TSZa, *(DWORD *) & zClearVal);
+      MMIO (REG_3D_TSXa, *(DWORD *) & right);
+      MMIO (REG_3D_TSYa, *(DWORD *) & top);
+      MMIO (REG_3D_TSARGBa, dwColor);
+
+      MMIO (REG_3D_TSZb, *(DWORD *) & zClearVal);
+      MMIO (REG_3D_TSXb, *(DWORD *) & left);
+      MMIO (REG_3D_TSYb, *(DWORD *) & top);
+      MMIO (REG_3D_TSARGBb, dwColor);
+
+      MMIO (REG_3D_TSZc, *(DWORD *) & zClearVal);
+      MMIO (REG_3D_TSXc, *(DWORD *) & left);
+      MMIO (REG_3D_TSYc, *(DWORD *) & bottom);
+      MMIO (REG_3D_TSARGBc, dwColor);
+
+      /* second triangle */
+      dwPrimitiveSet = (OP_3D_TRIANGLE_DRAW | OP_3D_FIRE_TSARGBb |
+                        SHADE_FLAT_VertexB);
+      MMIO (REG_3D_PrimitiveSet, dwPrimitiveSet);
+
+      MMIO (REG_3D_TSZb, *(DWORD *) & zClearVal);
+      MMIO (REG_3D_TSXb, *(DWORD *) & right);
+      MMIO (REG_3D_TSYb, *(DWORD *) & bottom);
+      MMIO (REG_3D_TSARGBb, dwColor);
+    }
+
+  mEndPrimitive ();
+
+  hwcx->GlobalFlag |= RESETSTATE;
+
+#undef RESETSTATE
+#undef STEN_OP
+  
+  /* 
+   * TODO: will mesa call several times if multiple draw buffer
+   */
+  return (mask & ~(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT));
+}
+
+__inline__ static void
+sis_bitblt_clear_cmd (__GLSiScontext * hwcx, ENGPACKET * pkt)
+{
+  LPDWORD lpdwDest, lpdwSrc;
+  int i;
+
+  lpdwSrc = (DWORD *) pkt + 1;
+  lpdwDest = (DWORD *) (GET_IOBase (hwcx) + REG_SRC_ADDR) + 1;
+
+  mWait3DCmdQueue (10);
+
+  *lpdwDest++ = *lpdwSrc++;
+  lpdwSrc++;
+  lpdwDest++;
+  for (i = 3; i < 8; i++)
+    {
+      *lpdwDest++ = *lpdwSrc++;
+    }
+
+  MMIO (REG_CMD0, *(DWORD *) & pkt->stdwCmd);
+  MMIO (0x8240, -1);
+
+}
+
+__inline__ static void
+sis_clear_color_buffer (GLcontext * ctx,
+			GLint x, GLint y, GLint width, GLint height)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  XMesaBuffer xm_buffer = xmesa->xm_buffer;
+  sisBufferInfo *priv = (sisBufferInfo *) xm_buffer->private;
+
+  int count;
+  GLuint origin_x, origin_y;
+  GLuint depth = GET_DEPTH (hwcx);
+  BoxPtr pExtents = NULL;
+  GLint xx, yy;
+  GLint x0, y0, width0, height0;
+
+  ENGPACKET stEngPacket;
+
+  GLuint pitch;
+
+  switch (ctx->Color.DriverDrawBuffer)
+    {
+    case GL_BACK_LEFT:
+      priv->pCbClearPacket->stdwDestPos.wY = y;
+      priv->pCbClearPacket->stdwDestPos.wX = x;
+      priv->pCbClearPacket->stdwDim.wWidth = (WORD) width;
+      priv->pCbClearPacket->stdwDim.wHeight = (WORD) height;
+      priv->pCbClearPacket->dwFgRopColor = hwcx->clearColorPattern;
+
+      sis_bitblt_clear_cmd (hwcx, priv->pCbClearPacket);
+      return;
+    case GL_FRONT_LEFT:
+      x0 = x;
+      y0 = y;
+      width0 = width;
+      height0 = height;
+
+      pitch = GET_PITCH (hwcx);
+      sis_get_drawable_origin (xmesa, &origin_x, &origin_y);
+      sis_get_clip_rects (xmesa, &pExtents, &count);
+      break;
+    case GL_BACK_RIGHT:
+    case GL_FRONT_RIGHT:
+    default:
+      assert (0);
+      return;
+    }
+
+  memset (&stEngPacket, 0, sizeof (ENGPACKET));
+
+  while (count--)
+    {
+      GLint x2 = pExtents->x1 - origin_x;
+      GLint y2 = pExtents->y1 - origin_y;
+      GLint xx2 = pExtents->x2 - origin_x;
+      GLint yy2 = pExtents->y2 - origin_y;
+
+      x = (x0 > x2) ? x0 : x2;
+      y = (y0 > y2) ? y0 : y2;
+      xx = ((x0 + width0) > (xx2)) ? xx2 : x0 + width0;
+      yy = ((y0 + height0) > (yy2)) ? yy2 : y0 + height0;
+      width = xx - x;
+      height = yy - y;
+      pExtents++;
+
+      if (width <= 0 || height <= 0)
+	continue;
+
+      stEngPacket.dwSrcPitch = (depth == 2) ? 0x80000000 : 0xc0000000;
+      stEngPacket.stdwDestPos.wY = y + origin_y;
+      stEngPacket.stdwDestPos.wX = x + origin_x;
+      stEngPacket.dwDestBaseAddr = (DWORD) 0;
+      stEngPacket.wDestPitch = pitch;
+      /* TODO: set maximum value? */
+      stEngPacket.wDestHeight = hwcx->virtualY;
+      stEngPacket.stdwDim.wWidth = (WORD) width;
+      stEngPacket.stdwDim.wHeight = (WORD) height;
+      stEngPacket.stdwCmd.cRop = 0xf0;
+      stEngPacket.dwFgRopColor = hwcx->clearColorPattern;
+
+      /* for SGRAM Block Write Enable */
+      if (hwcx->blockWrite)
+	{
+	  stEngPacket.stdwCmd.cCmd0 = (BYTE) (CMD0_PAT_FG_COLOR);
+	  stEngPacket.stdwCmd.cCmd1 =
+	    (BYTE) (CMD1_DIR_X_INC | CMD1_DIR_Y_INC);
+	}
+      else
+	{
+	  stEngPacket.stdwCmd.cCmd0 = 0;
+	  stEngPacket.stdwCmd.cCmd1 =
+	    (BYTE) (CMD1_DIR_X_INC | CMD1_DIR_Y_INC);
+	}
+
+      sis_bitblt_clear_cmd (hwcx, &stEngPacket);
+    }
+}
+
+__inline__ static void
+sis_clear_z_stencil_buffer (GLcontext * ctx, GLbitfield mask,
+			    GLint x, GLint y, GLint width, GLint height)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  GLframebuffer *buffer = ctx->DrawBuffer;
+  sisBufferInfo *priv = (sisBufferInfo *) xmesa->xm_buffer->private;
+
+  /* TODO: check write mask */
+
+  if (!buffer->DepthBuffer)
+    return;
+
+  /* TODO: consider alignment of width, height? */
+  priv->pZClearPacket->stdwDestPos.wY = y;
+  priv->pZClearPacket->stdwDestPos.wX = x;
+  priv->pZClearPacket->stdwDim.wWidth = (WORD) width;
+  priv->pZClearPacket->stdwDim.wHeight = (WORD) height;
+  priv->pZClearPacket->dwFgRopColor = hwcx->clearZStencilPattern;
+
+  sis_bitblt_clear_cmd (hwcx, priv->pZClearPacket);
+}
+
+__inline__ static void
+sis_bitblt_copy_cmd (__GLSiScontext * hwcx, ENGPACKET * pkt)
+{
+  LPDWORD lpdwDest, lpdwSrc;
+  int i;
+
+  lpdwSrc = (DWORD *) pkt;
+  lpdwDest = (DWORD *) (GET_IOBase (hwcx) + REG_SRC_ADDR);
+
+  mWait3DCmdQueue (10);
+
+  for (i = 0; i < 7; i++)
+    {
+      *lpdwDest++ = *lpdwSrc++;
+    }
+
+  MMIO (REG_CMD0, *(DWORD *) & pkt->stdwCmd);
+  MMIO (0x8240, -1);
+}
+
+__inline__ static void
+sis_swap_image (XMesaBuffer b, XMesaDrawable d, XMesaImage * image)
+{
+  XMesaContext xmesa = b->xm_context;
+  __GLSiScontext *hwcx = (__GLSiScontext *) b->xm_context->private;
+
+  GLuint depth = GET_DEPTH (hwcx);
+  ENGPACKET stEngPacket;
+  DWORD src;
+  GLuint srcPitch, dstPitch;
+
+  BoxPtr pExtents;
+  BoxRec box;
+  int count;
+  GLuint origin_x, origin_y;
+
+  memset (&stEngPacket, 0, sizeof (ENGPACKET));
+
+  if (!sis_get_clip_rects (xmesa, &pExtents, &count))
+    {
+      sis_get_drawable_box (xmesa, &box);
+      pExtents = &box;
+      count = 1;
+    }
+
+  src = (DWORD) image->data - (DWORD) GET_FbBase (hwcx);
+  srcPitch = image->bytes_per_line;
+  dstPitch = GET_PITCH (hwcx);
+  sis_get_drawable_origin (xmesa, &origin_x, &origin_y);
+
+  while(count --)
+    {
+      stEngPacket.dwSrcPitch = (depth == 2) ? 0x80000000 : 0xc0000000;
+
+      stEngPacket.dwSrcBaseAddr = src;
+      stEngPacket.dwSrcPitch |= srcPitch;
+
+      stEngPacket.stdwSrcPos.wY = pExtents->y1 - origin_y;
+      stEngPacket.stdwSrcPos.wX = pExtents->x1 - origin_x;
+      stEngPacket.stdwDestPos.wY = pExtents->y1;
+      stEngPacket.stdwDestPos.wX = pExtents->x1;
+      stEngPacket.dwDestBaseAddr = (DWORD) 0;
+      stEngPacket.wDestPitch = dstPitch;
+
+      /* TODO: set maximum value? */
+      stEngPacket.wDestHeight = hwcx->virtualY;
+      stEngPacket.stdwDim.wWidth = (WORD) pExtents->x2 - pExtents->x1;
+      stEngPacket.stdwDim.wHeight = (WORD) pExtents->y2 - pExtents->y1;
+      stEngPacket.stdwCmd.cRop = 0xcc;
+
+      if (hwcx->blockWrite)
+	{
+	  stEngPacket.stdwCmd.cCmd0 = (BYTE) (CMD0_PAT_FG_COLOR);
+	  stEngPacket.stdwCmd.cCmd1 =
+	    (BYTE) (CMD1_DIR_X_INC | CMD1_DIR_Y_INC);
+	}
+      else
+	{
+	  stEngPacket.stdwCmd.cCmd0 = 0;
+	  stEngPacket.stdwCmd.cCmd1 =
+	    (BYTE) (CMD1_DIR_X_INC | CMD1_DIR_Y_INC);
+	}
+
+      sis_bitblt_copy_cmd (hwcx, &stEngPacket);
+
+      pExtents++;
+    }
+}
+
+void
+sis_swap_buffers (XMesaBuffer b)
+{
+  XMesaContext xmesa = b->xm_context;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  GLcontext *ctx = hwcx->gc;
+
+  /* debug */
+  /* return; */
+
+  /* frame control */
+  /* TODO: need lock? */
+  while((*hwcx->FrameCountPtr) - *(DWORD *)(hwcx->IOBase+0x8a2c) 
+        > SIS_MAX_FRAME_LENGTH)
+  {
+    DWORD temp = *(DWORD *)(hwcx->IOBase+0x8a2c);
+  }
+
+  LOCK_HARDWARE ();
+  
+  *(DWORD *)(hwcx->IOBase+0x8a2c) = *hwcx->FrameCountPtr;
+  (*hwcx->FrameCountPtr)++;  
+  sis_swap_image (b, b->frontbuffer, b->backimage);
+   
+  UNLOCK_HARDWARE ();
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_common.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_common.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_common.h	Fri Jun 30 12:30:19 2000
@@ -0,0 +1,190 @@
+#ifndef _sis_common_h_
+#define _sis_common_h_
+
+#include "types.h"
+#include "sis_xmesaP.h"
+
+#if defined(SIS_DUMP)
+#include "sis_debug.h"
+#endif
+
+#if SIS_STEREO
+# include "sis_stereo.h"
+#else
+# define STEREO_OFFSET(v) 0
+# define STEREO_SAMPLE(v) do{}while(0)
+#endif
+
+#ifdef XFree86Server
+# include "resource.h"
+# include "windowstr.h"
+# include "gcstruct.h"
+# include "GL/xf86glx.h"
+# include "xf86glx_util.h"
+# include "xf86_ansic.h"
+# include "xf86_libc.h"
+#else
+# ifdef GLX_DIRECT_RENDERING
+#  include <stdio.h>
+#  include <unistd.h>
+#  include <stdlib.h>
+#  include <string.h>
+#  include "dri_mesaint.h"
+typedef struct _Box
+{
+  short x1, y1, x2, y2;
+}
+BoxRec;
+#define NullBox ((BoxPtr)0)
+typedef struct _Box *BoxPtr;
+# endif
+#endif
+
+typedef unsigned short WORD;
+typedef unsigned long DWORD;
+typedef unsigned int UINT;
+typedef int INT;
+typedef long LONG;
+typedef DWORD *LPDWORD;
+
+/*
+ * BitBlt Commands
+ */
+#define  Index_SR_Misc_Ctrl11                   0x3e
+#define CMD0_DD_ENABLE      0x06
+#define CMD0_SRC_VIDEO      0x00
+#define CMD0_SRC_CPU        0x10
+#define CMD0_PAT_FG_COLOR   0x00
+#define CMD1_DIR_X_DEC      0x00
+#define CMD1_DIR_X_INC      0x01
+#define CMD1_DIR_Y_DEC      0x00
+#define CMD1_DIR_Y_INC      0x02
+#define REG_SRC_ADDR        0x8200
+#define REG_CMD0            0x823c
+
+typedef struct
+{
+  WORD wSrcPitch;
+  WORD wDestPitch;
+}
+_PITCH;
+typedef struct
+{
+  WORD wWidth;
+  WORD wHeight;
+}
+_DIM;
+typedef struct
+{
+  WORD wY;
+  WORD wX;
+}
+_POS;
+
+typedef struct
+{
+  BYTE cCmd0;
+  BYTE cRop;
+  BYTE cCmd1;
+  BYTE cReserved;
+}
+_CMD;
+
+typedef struct
+{
+  WORD wStatus0;
+  BYTE cStatus0_BYTE3;
+  BYTE cStatus0_BYTE4;
+}
+_CMDQUESTATUS;
+
+typedef struct
+{
+  DWORD dwSrcBaseAddr;
+  DWORD dwSrcPitch;
+  _POS stdwSrcPos;
+  _POS stdwDestPos;
+  DWORD dwDestBaseAddr;
+  WORD wDestPitch;
+  WORD wDestHeight;
+  _DIM stdwDim;
+  DWORD dwFgRopColor;
+  DWORD dwBgRopColor;
+  DWORD dwSrcHiCKey;
+  DWORD dwSrcLoCKey;
+  DWORD dwMaskA;
+  DWORD dwMaskB;
+  DWORD dwClipA;
+  DWORD dwClipB;
+  _CMD stdwCmd;
+  _CMDQUESTATUS stdwCmdQueStatus;
+}
+ENGPACKET, *LPENGPACKET;
+
+/* 
+ * Hardware Info
+ */
+#include "sis_reg.h"
+#include "sis_init.h"
+
+typedef struct gl_texture_object GLtextureObject;
+typedef struct gl_texture_image GLtextureImage;
+
+typedef struct sis_texure_area
+{
+  GLbyte *Data;
+  GLenum Format;
+  void *pArea;
+  GLuint Pitch;
+  GLuint Size;
+  GLuint texelSize;
+  void *hwcx;
+
+  /* Debug */
+  GLuint realSize;
+}
+SIStextureArea;
+
+/* dirtyFlag */
+#define SIS_TEX_ENV 0x1
+#define SIS_TEX_IMAGE 0x2	/* image in video memory is stale */
+#define SIS_TEX_PARAMETER 0x4
+#define SIS_TEX_ALL (SIS_TEX_IMAGE | SIS_TEX_PARAMETER)
+
+typedef struct sis_texobj_area
+{
+  DWORD dirtyFlag;
+  GLboolean valid;
+  struct sis_texobj_area *prev, *next;
+}
+sisTexobjInfo;
+
+typedef struct sis_buffer_private
+{
+  void *zbFree, *bbFree;
+
+  ENGPACKET *pZClearPacket, *pCbClearPacket;
+
+  ENGPACKET zClearPacket, cbClearPacket;
+  
+#if SIS_STEREO 
+  XMesaImage *pStereoImages[3];
+  ENGPACKET *pStereoPackets[3];
+  void *stereoFrees[3];  /* stereoFrees[0] is useless */
+  
+  ENGPACKET stereoPackets[2];
+#endif
+}
+sisBufferInfo;
+
+/* HW capability */
+#define SIS_MAX_MIPMAP_LEVEL 11
+#define SIS_MAX_TEXTURE_SIZE 2048
+#define SIS_MAX_TEXTURES 2
+
+#define SIS_MAX_FRAME_LENGTH 3
+
+DWORD doFPtoFixedNoRound (DWORD dwInValue, int nFraction);
+
+#define Y_FLIP(Y)  (xmesa->xm_buffer->bottom-(Y))
+#endif
Index: xc/lib/GL/mesa/src/drv/sis/sis_ctx.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_ctx.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_ctx.c	Fri Jun 30 12:30:20 2000
@@ -0,0 +1,840 @@
+#ifdef XFree86Server
+# define PSZ 8
+# include "cfb.h"
+# undef PSZ
+# include "cfb16.h"
+# include "cfb24.h"
+# include "cfb32.h"
+# include "cfb24_32.h"
+/* for SISPtr */
+# include "xf86.h"
+# include "xf86_OSproc.h"
+# include "xf86Resources.h"
+# include "xf86Version.h"
+# include "xf86PciInfo.h"
+# include "xf86Pci.h"
+# include "xf86cmap.h"
+# include "vgaHW.h"
+# include "xf86RAC.h"
+# include "sis_regs.h"
+# include "sis.h"
+# include "dristruct.h"
+# include "dri.h"
+#else
+#include "sis_dri.h"
+#endif
+
+#include "extensions.h"
+
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+int GlobalCurrentHwcx = -1;
+int GlobalHwcxCountBase = 1;
+int GlobalCmdQueueLen = 0;
+
+void
+WaitEngIdle (__GLSiScontext * hwcx)
+{
+  BYTE *IOBase = GET_IOBase (hwcx);
+  BYTE cEngineState;
+
+  cEngineState = *((BYTE volatile *) (IOBase + 0x8243));
+  while (((cEngineState & 0x80) == 0) ||
+	 ((cEngineState & 0x40) == 0) || ((cEngineState & 0x20) == 0))
+    {
+      cEngineState = *((BYTE volatile *) (IOBase + 0x8243));
+    }
+}
+
+void
+Wait2DEngIdle (__GLSiScontext * hwcx)
+{
+  BYTE *IOBase = GET_IOBase (hwcx);
+  BYTE cEngineState;
+
+  cEngineState = *((BYTE volatile *) (IOBase + 0x8243));
+  while (!(cEngineState & 0x80))
+    {
+      cEngineState = *((BYTE volatile *) (IOBase + 0x8243));
+    }
+}
+
+static void
+sis_init_opengl_state (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *current = &hwcx->current;
+  __GLSiSHardware *prev = &(hwcx->prev);
+
+  /*
+  prev->hwCapEnable = INIT_6327_CapsEnable ;  
+  prev->hwCapEnable = 0x000000a0;
+  */
+  /* add Texture Perspective Enable */
+  prev->hwCapEnable = 0x000002a0;
+
+  /*
+  prev->hwCapEnable2 = INIT_6327_CapsEnable2;  
+  prev->hwCapEnable2 = 0x00aa0080;
+  */
+  /* if multi-texture enabled, disable Z pre-test */
+  prev->hwCapEnable2 = 0x00000000;
+
+  /* Z test mode is LE */
+  prev->hwZ = INIT_6327_ZSet;
+
+  /* TODO : maybe call sis_DepthFunc to update is a better way */
+  ctx->Driver.DepthFunc (ctx, ctx->Depth.Func);
+
+  /* Depth mask */
+  prev->hwZMask = INIT_6327_ZMask;
+
+  /* Alpha test mode is ALWAYS, Alpha ref value is 0 */
+  prev->hwAlpha = INIT_6327_AlphaSet;
+
+  /* ROP2 is COPYPEN */
+  prev->hwDstSet = INIT_6327_DstSet;
+
+  /* color mask */
+  prev->hwDstMask = INIT_6327_DstMask;
+
+  /* LinePattern is 0, Repeat Factor is 0 */
+  prev->hwLinePattern = 0x00008000;
+
+  /* Fog mode is Linear Fog, Fog color is (0, 0, 0) */
+  prev->hwFog = INIT_6327_FogSet;
+
+  /* Src blend is BLEND_ONE, Dst blend is D3DBLEND_ZERO */
+  prev->hwDstSrcBlend = INIT_6327_BlendMode;
+
+  /* Texture mapping mode is Tile */
+#if 0
+  prev->texture[0].hwTextqureSet = INIT_6327_TextureSet;
+#endif
+  /* Magnified & minified texture filter is NEAREST */
+#if 0
+  prev->texture[0].hwTextureMip = INIT_6327_TextureMip;
+#endif
+
+  /* Texture Blending seeting */
+  prev->hwTexBlendClr0 = INIT_6327_TextureColorBlend0;
+
+  prev->hwTexBlendClr1 = INIT_6327_TextureColorBlend1;
+
+  prev->hwTexBlendAlpha0 = INIT_6327_TextureAlphaBlend0;
+
+  prev->hwTexBlendAlpha1 = INIT_6327_TextureAlphaBlend1;
+
+  memcpy (current, prev, sizeof (__GLSiSHardware));
+
+  /* Init the texture transparency color high range value */
+#if 0
+  lpdwRegIO = ((LPDWORD)hwcx->lpEngIO + REG_3D_TransparencyColorHigh);
+  prev->hwTextureClrHigh = INIT_6326_TextureClrHigh;
+  *(lpdwRegIO) = INIT_6327_TextureClrHigh;
+#endif
+}
+
+static void
+sis_init_user_setting (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  /* disable all unsupported per-pixel extensions */  
+  gl_extensions_disable (ctx, "GL_EXT_blend_color");
+  gl_extensions_disable (ctx, "GL_EXT_blend_minmax");
+  gl_extensions_disable (ctx, "GL_EXT_blend_logic_op");
+  gl_extensions_disable (ctx, "GL_EXT_blend_subtract");
+  gl_extensions_disable (ctx, "GL_EXT_paletted_texture");
+  gl_extensions_disable (ctx, "GL_EXT_point_parameters");
+  gl_extensions_disable (ctx, "GL_EXT_texture3D");
+  gl_extensions_disable (ctx, "GL_INGR_blend_func_separate");
+  gl_extensions_disable (ctx, "GL_PGI_misc_hints");
+  gl_extensions_disable (ctx, "GL_EXT_clip_volume_hint");
+  gl_extensions_disable (ctx, "GL_EXT_texture_env_add");
+    
+  /* TODO: driver doesn't handle this */
+  if (getenv ("SIS_SINGLE_TEXTURE"))
+    gl_extensions_disable (ctx, "GL_ARB_multitexture");
+
+  /* turning off the extension has more speed */
+  /* if mesa supports indirect VB rendering, remove it */
+  
+  /* if disable it, quake3 will have broken triangle */
+  /*  gl_extensions_disable (ctx, "GL_EXT_compiled_vertex_array"); */
+
+  /* debug */
+  if(getenv ("SIS_NO_AGP_CMDS"))
+    hwcx->AGPCmdModeEnabled = GL_FALSE;
+
+#if SIS_STEREO
+  if(getenv ("SIS_STEREO") && hwcx->irqEnabled)
+    hwcx->useStereo = GL_TRUE;
+  else
+    hwcx->useStereo = GL_FALSE;
+
+  {
+    float val;
+    char *str;
+    
+    /* TODO: error check */
+    if((str=getenv("SIS_STEREO_OFFSET"))){
+      val= atof(str);
+      if(val>0 && val<1){
+        StereoInitOffset = val;
+      }
+    }
+
+    if((str=getenv("SIS_STEREO_SCALE"))){
+      val= atof(str);
+      if(val>0){      
+        StereoInitScale = val;
+      }
+    }  
+  }
+  
+  if(getenv("SIS_STEREO_DYNAMIC_Z"))
+    StereoDynamicZ = GL_TRUE;
+#endif
+}
+
+void
+SiSCreateContext (XMesaContext xmesa)
+{
+  GLcontext *ctx = xmesa->gl_ctx;
+  __GLSiScontext *hwcx;
+
+  int i;
+
+  hwcx = (__GLSiScontext *) calloc (1, sizeof (__GLSiScontext));
+  if (!hwcx)
+    {
+      fprintf (stderr, "SIS Driver : allocating context fails\n");
+      sis_fatal_error ();
+      return;
+    }
+
+  /* set gc */
+  hwcx->gc = ctx;
+  xmesa->private = hwcx;
+
+  /* set static part in ctx->Driver */
+  sis_init_driver (ctx);
+
+  /* Set 2D data (from X-Server) */
+  /* i assume the data will not change during X-server's lifetime */
+#ifdef XFree86Server
+  {
+    ScrnInfoPtr pScrn = xf86Screens[xmesa->display->myNum];
+    SISPtr pSiS = SISPTR (pScrn);
+
+    hwcx->virtualX = pSiS->pScrn->virtualX;
+    hwcx->virtualY = pSiS->pScrn->virtualY;
+    hwcx->bytesPerPixel = (pSiS->pScrn->bitsPerPixel + 7) / 8;
+    hwcx->IOBase = pSiS->IOBase;
+    hwcx->FbBase = pSiS->FbBase;
+    hwcx->displayWidth = pSiS->pScrn->displayWidth * hwcx->bytesPerPixel;
+    hwcx->pitch = pSiS->scrnOffset;
+    hwcx->Chipset = pSiS->Chipset;
+    hwcx->drmSubFD = pSiS->drmSubFD;
+#if SIS_STEREO
+    hwcx->irqEnabled = pSiS->irqEnabled;
+#endif
+  }
+#else
+  {
+    __DRIscreenPrivate *psp = xmesa->driContextPriv->driScreenPriv;
+    SISDRIPtr priv = (SISDRIPtr) psp->pDevPriv;
+
+    hwcx->virtualX = priv->width;
+    hwcx->virtualY = priv->height;
+    hwcx->bytesPerPixel = priv->bytesPerPixel;
+    hwcx->IOBase = priv->regs.map;
+    hwcx->FbBase = psp->pFB;
+    hwcx->displayWidth = psp->fbWidth;
+    hwcx->pitch = psp->fbStride;
+    hwcx->Chipset = priv->deviceID;
+    /* TODO: make sure psp->fd is sub-driver's fd */
+    hwcx->drmSubFD = psp->fd;
+#if SIS_STEREO
+    hwcx->irqEnabled = priv->irqEnabled;
+#endif
+  }
+#endif
+
+#if defined(SIS_DUMP)
+  IOBase4Debug = GET_IOBase (hwcx);
+#endif
+
+  /* support ARGB8888 and RGB565 */
+  switch (hwcx->bytesPerPixel)
+    {
+    case 4:
+      hwcx->redMask = 0x00ff0000;
+      hwcx->greenMask = 0x0000ff00;
+      hwcx->blueMask = 0x000000ff;
+      hwcx->alphaMask = 0xff000000;
+      hwcx->colorFormat = DST_FORMAT_ARGB_8888;
+      break;
+    case 2:
+      hwcx->redMask = 0xf800;
+      hwcx->greenMask = 0x07e0;
+      hwcx->blueMask = 0x001f;
+      hwcx->alphaMask = 0;
+      hwcx->colorFormat = DST_FORMAT_RGB_565;
+      break;
+    default:
+      assert (0);
+    }
+   
+    sis_sw_init_driver (ctx);
+
+  /* TODO: index mode */
+  
+#if defined(XFree86Server)
+  {
+#if defined(XF86DRI)
+    ScreenPtr pScreen = xmesa->display;
+    ScrnInfoPtr pScrn = xf86Screens[xmesa->display->myNum];
+    SISPtr pSiS = SISPTR (pScrn);
+
+    if (pSiS->directRenderingEnabled)
+      {
+	SISSAREAPriv *saPriv = (SISSAREAPriv *) DRIGetSAREAPrivate (pScreen);
+
+	drmContextPtr contextPtr;
+
+	/* in DR, the action is done by DRI */
+	hwcx->pDRIContextPriv = DRICreateContextPriv (pScreen, contextPtr, 0);
+	if (!contextPtr)
+	  {
+	    /* TODO */
+	    assert(0);
+	  }
+
+	hwcx->serialNumber = (int) *contextPtr;
+	hwcx->CurrentHwcxPtr = &(saPriv->CtxOwner);
+	hwcx->CurrentQueueLenPtr = pSiS->cmdQueueLenPtr;
+        /* hwcx->FrameCountPtr = */
+
+	/* what does this do? */
+	/*
+	drmFreeReservedContextList (contextPtr);
+        */
+        
+	/* TODO, set AGP command buffer */
+	hwcx->AGPCmdModeEnabled = GL_FALSE;
+      }
+    else
+#endif
+      {
+	hwcx->serialNumber = GlobalHwcxCountBase++;
+	hwcx->CurrentHwcxPtr = &GlobalCurrentHwcx;
+	hwcx->CurrentQueueLenPtr = pSiS->cmdQueueLenPtr;
+        /* hwcx->FrameCountPtr = */
+
+	/* TODO, set AGP command buffer */
+	hwcx->AGPCmdModeEnabled = GL_FALSE;
+      }
+  }
+#else
+  {
+    __DRIscreenPrivate *psp = xmesa->driContextPriv->driScreenPriv;
+    SISDRIPtr priv = (SISDRIPtr) psp->pDevPriv;
+    SISSAREAPriv *saPriv = (SISSAREAPriv *) (((char *) psp->pSAREA) +
+					     sizeof (XF86DRISAREARec));
+
+    /* or use xmesa->driContextPriv->contextID
+     * use hHWContext is better, but limit ID to [0..2^31-1] (modify driver)
+     * hHWContext is CARD32
+     */
+    hwcx->serialNumber = xmesa->driContextPriv->hHWContext;
+    hwcx->CurrentHwcxPtr = &(saPriv->CtxOwner);
+    hwcx->CurrentQueueLenPtr = &(saPriv->QueueLength);
+    hwcx->FrameCountPtr = &(saPriv->FrameCount);
+
+    /* set AGP */
+    hwcx->AGPSize = priv->agp.size;
+    hwcx->AGPBase = priv->agp.map;    
+    hwcx->AGPAddr = priv->agp.handle;        
+    
+    /* set AGP command buffer */
+    hwcx->AGPCmdModeEnabled = GL_FALSE;
+    if (hwcx->AGPSize){	
+	if(priv->AGPCmdBufSize){
+          hwcx->AGPCmdBufBase = hwcx->AGPBase + priv->AGPCmdBufOffset;
+          hwcx->AGPCmdBufAddr = hwcx->AGPAddr + priv->AGPCmdBufOffset;
+          hwcx->AGPCmdBufSize = priv->AGPCmdBufSize;
+
+          hwcx->pAGPCmdBufNext = (DWORD *)&(saPriv->AGPCmdBufNext);
+          hwcx->AGPCmdModeEnabled = GL_TRUE;
+        }
+      }
+  }
+#endif
+
+  hwcx->GlobalFlag = 0L;
+
+  hwcx->swRenderFlag = 0;
+  hwcx->swForceRender = GL_FALSE;
+  hwcx->Primitive = 0;
+  hwcx->useFastPath = GL_FALSE;
+
+  /* TODO */
+  /* hwcx->blockWrite = SGRAMbw = IsBlockWrite (); */
+  hwcx->blockWrite = GL_FALSE;
+
+  /* this function will over-write AGPCmdModeEnabled */
+  /* TODO: pay attention to side-effect */
+  sis_init_user_setting (ctx);
+
+  sis_init_opengl_state (ctx);
+  sis_set_buffer_static (ctx);
+  set_color_pattern (hwcx, 0, 0, 0, 0);
+  set_z_stencil_pattern (hwcx, 1.0, 0);
+
+  /* TODO: need to clear cache? */
+  hwcx->clearTexCache = GL_TRUE;
+ 
+  hwcx->AGPParseSet = 0x00000040;
+  hwcx->dwPrimitiveSet = 0x00060000;
+
+  for (i = 0; i < SIS_MAX_TEXTURES; i++)
+    {
+      hwcx->TexStates[i] = 0;
+      hwcx->PrevTexFormat[i] = 0;
+    }
+
+#if SIS_STEREO
+  hwcx->isFullScreen = GL_FALSE;
+  hwcx->stereoEnabled = GL_FALSE;
+#endif
+}
+
+void
+SiSDestroyContext (XMesaContext xmesa)
+{
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+#if defined(XFree86Server) && defined(XF86DRI)
+  DRIDestroyContextPriv ((DRIContextPrivPtr)hwcx->pDRIContextPriv);
+#endif
+  
+  /* 
+   * TODO: if the context ID given by kernel will be recycled,
+   *       then, the current ID will set to -1 if the current ID
+   *       is equal to my id
+   */
+  free (hwcx);
+}
+
+void
+sis_update_render_state (__GLSiScontext * hwcx, GLuint stateType)
+{
+  __GLSiSHardware *prev = &hwcx->prev;
+
+  mWait3DCmdQueue (45);
+
+  if (hwcx->GlobalFlag & GFLAG_ENABLESETTING)
+    {
+      if (!hwcx->clearTexCache)
+	{
+	  MMIO (REG_3D_TEnable, prev->hwCapEnable);
+	}
+      else
+	{
+	  MMIO (REG_3D_TEnable, prev->hwCapEnable | MASK_TextureCacheClear);
+	  MMIO (REG_3D_TEnable, prev->hwCapEnable);
+	  hwcx->clearTexCache = GL_FALSE;
+	}
+    }
+
+  if (hwcx->GlobalFlag & GFLAG_ENABLESETTING2)
+    {
+      MMIO (REG_3D_TEnable2, prev->hwCapEnable2);
+    }
+
+  /* Z Setting */
+  if (hwcx->GlobalFlag & GFLAG_ZSETTING)
+    {
+      MMIO (REG_3D_ZSet, prev->hwZ);
+      MMIO (REG_3D_ZStWriteMask, prev->hwZMask);
+      MMIO (REG_3D_ZAddress, prev->hwOffsetZ);
+    }
+
+  /* Alpha Setting */
+  if (hwcx->GlobalFlag & GFLAG_ALPHASETTING)
+    {
+      MMIO (REG_3D_AlphaSet, prev->hwAlpha);
+    }
+
+  if (hwcx->GlobalFlag & GFLAG_DESTSETTING)
+    {
+      MMIO (REG_3D_DstSet, prev->hwDstSet);
+      MMIO (REG_3D_DstAlphaWriteMask, prev->hwDstMask);
+      MMIO (REG_3D_DstAddress, prev->hwOffsetDest);
+    }
+
+  /* Line Setting */
+#if 0
+     if (hwcx->GlobalFlag & GFLAG_LINESETTING) 
+     {
+     MMIO(REG_3D_LinePattern, prev->hwLinePattern);
+     }
+#endif
+
+  /* Fog Setting */
+  if (hwcx->GlobalFlag & GFLAG_FOGSETTING)
+    {
+      MMIO (REG_3D_FogSet, prev->hwFog);
+      MMIO (REG_3D_FogInverseDistance, prev->hwFogInverse);
+      MMIO (REG_3D_FogFarDistance, prev->hwFogFar);
+      MMIO (REG_3D_FogFactorDensity, prev->hwFogDensity);
+    }
+
+  /* Stencil Setting */
+  if (hwcx->GlobalFlag & GFLAG_STENCILSETTING)
+    {
+      MMIO (REG_3D_StencilSet, prev->hwStSetting);
+      MMIO (REG_3D_StencilSet2, prev->hwStSetting2);
+    }
+
+  /* Miscellaneous Setting */
+  if (hwcx->GlobalFlag & GFLAG_DSTBLEND)
+    {
+      MMIO (REG_3D_DstBlendMode, prev->hwDstSrcBlend);
+    }
+  if (hwcx->GlobalFlag & GFLAG_CLIPPING)
+    {
+      MMIO (REG_3D_ClipTopBottom, prev->clipTopBottom);
+      MMIO (REG_3D_ClipLeftRight, prev->clipLeftRight);
+    }
+
+  hwcx->GlobalFlag &= ~GFLAG_RENDER_STATES;
+}
+
+void
+sis_update_texture_state (__GLSiScontext * hwcx)
+{
+  __GLSiSHardware *prev = &hwcx->prev;
+
+  mWait3DCmdQueue (55);
+
+  if (hwcx->clearTexCache)
+    {
+      MMIO (REG_3D_TEnable, prev->hwCapEnable | MASK_TextureCacheClear);
+      MMIO (REG_3D_TEnable, prev->hwCapEnable);
+      hwcx->clearTexCache = GL_FALSE;
+    }
+
+  /* Texture Setting */
+  if (hwcx->GlobalFlag & CFLAG_TEXTURERESET)
+    {
+      MMIO (REG_3D_TextureSet, prev->texture[0].hwTextureSet);
+    }
+  if (hwcx->GlobalFlag & GFLAG_TEXTUREMIPMAP)
+    {
+      MMIO (REG_3D_TextureMip, prev->texture[0].hwTextureMip);
+    }
+
+  /*
+  MMIO(REG_3D_TextureTransparencyColorHigh, prev->texture[0].hwTextureClrHigh);
+  MMIO(REG_3D_TextureTransparencyColorLow, prev->texture[0].hwTextureClrLow);
+  */
+
+  if (hwcx->GlobalFlag & GFLAG_TEXBORDERCOLOR)
+    {
+      MMIO (REG_3D_TextureBorderColor, prev->texture[0].hwTextureBorderColor);
+    }
+  if (hwcx->GlobalFlag & GFLAG_TEXTUREADDRESS)
+    {
+      MMIO (REG_3D_TEnable, prev->hwCapEnable | MASK_TextureCacheClear);
+      MMIO (REG_3D_TEnable, prev->hwCapEnable);
+
+      switch ((prev->texture[0].hwTextureSet & MASK_TextureLevel) >> 8)
+	{
+	case 11:		
+	  MMIO (REG_3D_TextureAddress11, prev->texture[0].texOffset11);
+	case 10:		
+	  MMIO (REG_3D_TextureAddress10, prev->texture[0].texOffset10);
+	  MMIO (REG_3D_TexturePitch10, prev->texture[0].texPitch10);
+	case 9:		
+	  MMIO (REG_3D_TextureAddress9, prev->texture[0].texOffset9);
+	case 8:		
+	  MMIO (REG_3D_TextureAddress8, prev->texture[0].texOffset8);
+	  MMIO (REG_3D_TexturePitch8, prev->texture[0].texPitch89);
+	case 7:		
+	  MMIO (REG_3D_TextureAddress7, prev->texture[0].texOffset7);
+	case 6:		
+	  MMIO (REG_3D_TextureAddress6, prev->texture[0].texOffset6);
+	  MMIO (REG_3D_TexturePitch6, prev->texture[0].texPitch67);
+	case 5:		
+	  MMIO (REG_3D_TextureAddress5, prev->texture[0].texOffset5);
+	case 4:		
+	  MMIO (REG_3D_TextureAddress4, prev->texture[0].texOffset4);
+	  MMIO (REG_3D_TexturePitch4, prev->texture[0].texPitch45);
+	case 3:		
+	  MMIO (REG_3D_TextureAddress3, prev->texture[0].texOffset3);
+	case 2:		
+	  MMIO (REG_3D_TextureAddress2, prev->texture[0].texOffset2);
+	  MMIO (REG_3D_TexturePitch2, prev->texture[0].texPitch23);
+	case 1:		
+	  MMIO (REG_3D_TextureAddress1, prev->texture[0].texOffset1);
+	case 0:		
+	  MMIO (REG_3D_TextureAddress0, prev->texture[0].texOffset0);
+	  MMIO (REG_3D_TexturePitch0, prev->texture[0].texPitch01);
+	}
+    }
+  if (hwcx->GlobalFlag & CFLAG_TEXTURERESET_1)
+    {
+      MMIO (REG_3D_Texture1Set, prev->texture[1].hwTextureSet);
+    }
+  if (hwcx->GlobalFlag & GFLAG_TEXTUREMIPMAP_1)
+    {
+      MMIO (REG_3D_Texture1Mip, prev->texture[1].hwTextureMip);
+    }
+
+  if (hwcx->GlobalFlag & GFLAG_TEXBORDERCOLOR_1)
+    {
+      MMIO (REG_3D_Texture1BorderColor,
+	    prev->texture[1].hwTextureBorderColor);
+    }
+  if (hwcx->GlobalFlag & GFLAG_TEXTUREADDRESS_1)
+    {
+      switch ((prev->texture[1].hwTextureSet & MASK_TextureLevel) >> 8)
+	{
+	case 11:		
+	  MMIO (REG_3D_Texture1Address11, prev->texture[1].texOffset11);
+	case 10:		
+	  MMIO (REG_3D_Texture1Address10, prev->texture[1].texOffset10);
+	  MMIO (REG_3D_Texture1Pitch10, prev->texture[1].texPitch10);
+	case 9:		
+	  MMIO (REG_3D_Texture1Address9, prev->texture[1].texOffset9);
+	case 8:		
+	  MMIO (REG_3D_Texture1Address8, prev->texture[1].texOffset8);
+	  MMIO (REG_3D_Texture1Pitch8, prev->texture[1].texPitch89);
+	case 7:		
+	  MMIO (REG_3D_Texture1Address7, prev->texture[1].texOffset7);
+	case 6:		
+	  MMIO (REG_3D_Texture1Address6, prev->texture[1].texOffset6);
+	  MMIO (REG_3D_Texture1Pitch6, prev->texture[1].texPitch67);
+	case 5:		
+	  MMIO (REG_3D_Texture1Address5, prev->texture[1].texOffset5);
+	case 4:		
+	  MMIO (REG_3D_Texture1Address4, prev->texture[1].texOffset4);
+	  MMIO (REG_3D_Texture1Pitch4, prev->texture[1].texPitch45);
+	case 3:		
+	  MMIO (REG_3D_Texture1Address3, prev->texture[1].texOffset3);
+	case 2:		
+	  MMIO (REG_3D_Texture1Address2, prev->texture[1].texOffset2);
+	  MMIO (REG_3D_Texture1Pitch2, prev->texture[1].texPitch23);
+	case 1:		
+	  MMIO (REG_3D_Texture1Address1, prev->texture[1].texOffset1);
+	case 0:		
+	  MMIO (REG_3D_Texture1Address0, prev->texture[1].texOffset0);
+	  MMIO (REG_3D_Texture1Pitch0, prev->texture[1].texPitch01);
+	}
+    }
+
+  /* texture environment */
+  if (hwcx->GlobalFlag & GFLAG_TEXTUREENV)
+    {
+      MMIO (REG_3D_TextureBlendFactor, prev->hwTexEnvColor);
+      MMIO (REG_3D_TextureColorBlendSet0, prev->hwTexBlendClr0);
+      MMIO (REG_3D_TextureAlphaBlendSet0, prev->hwTexBlendAlpha0);
+    }
+  if (hwcx->GlobalFlag & GFLAG_TEXTUREENV_1)
+    {
+      MMIO (REG_3D_TextureBlendFactor, prev->hwTexEnvColor);
+      MMIO (REG_3D_TextureColorBlendSet1, prev->hwTexBlendClr1);
+      MMIO (REG_3D_TextureAlphaBlendSet1, prev->hwTexBlendAlpha1);
+    }
+
+  hwcx->GlobalFlag &= ~GFLAG_TEXTURE_STATES;
+}
+
+void
+sis_validate_all_state (__GLSiScontext * hwcx)
+{
+  __GLSiSHardware *prev = &hwcx->prev;
+
+  mEndPrimitive ();
+  mWait3DCmdQueue (40);
+
+  /* Enable Setting */
+  MMIO (REG_3D_TEnable, prev->hwCapEnable);
+  MMIO (REG_3D_TEnable2, prev->hwCapEnable2);
+
+  /* Z Setting */
+  /* if (prev->hwCapEnable & MASK_ZTestEnable) { */
+  MMIO (REG_3D_ZSet, prev->hwZ);
+  MMIO (REG_3D_ZStWriteMask, prev->hwZMask);
+  MMIO (REG_3D_ZAddress, prev->hwOffsetZ);
+  /* } */
+
+  /* Alpha Setting */
+  if (prev->hwCapEnable & MASK_AlphaTestEnable)
+    {
+      MMIO (REG_3D_AlphaSet, prev->hwAlpha);
+    }
+
+  /* Destination Setting */
+  MMIO (REG_3D_DstSet, prev->hwDstSet);
+  MMIO (REG_3D_DstAlphaWriteMask, prev->hwDstMask);
+  MMIO (REG_3D_DstAddress, prev->hwOffsetDest);
+
+  /* Line Setting */
+#if 0
+  if (prev->hwCapEnable2 & MASK_LinePatternEnable) {
+        MMIO(REG_3D_LinePattern, prev->hwLinePattern);
+  }
+#endif
+
+  /* Fog Setting */
+  if (prev->hwCapEnable & MASK_FogEnable)
+    {
+      MMIO (REG_3D_FogSet, prev->hwFog);
+      MMIO (REG_3D_FogInverseDistance, prev->hwFogInverse);
+      MMIO (REG_3D_FogFarDistance, prev->hwFogFar);
+      MMIO (REG_3D_FogFactorDensity, prev->hwFogDensity);
+    }
+
+  /* Stencil Setting */
+  if (prev->hwCapEnable & MASK_StencilTestEnable)
+    {
+      MMIO (REG_3D_StencilSet, prev->hwStSetting);
+      MMIO (REG_3D_StencilSet2, prev->hwStSetting2);
+    }
+
+  /* Miscellaneous Setting */
+  if (prev->hwCapEnable & MASK_BlendEnable)
+    {
+      MMIO (REG_3D_DstBlendMode, prev->hwDstSrcBlend);
+    }
+
+  MMIO (REG_3D_ClipTopBottom, prev->clipTopBottom);
+  MMIO (REG_3D_ClipLeftRight, prev->clipLeftRight);
+
+  /* TODO */
+  /* Texture Setting */
+  /* if (prev->hwCapEnable & MASK_TextureEnable) */
+  {
+  MMIO (REG_3D_TEnable, prev->hwCapEnable | MASK_TextureCacheClear);
+
+  MMIO (REG_3D_TEnable, prev->hwCapEnable);
+
+  MMIO (REG_3D_TextureSet, prev->texture[0].hwTextureSet);
+  MMIO (REG_3D_TextureMip, prev->texture[0].hwTextureMip);
+  /*
+  MMIO(REG_3D_TextureTransparencyColorHigh, prev->texture[0].hwTextureClrHigh);
+  MMIO(REG_3D_TextureTransparencyColorLow, prev->texture[0].hwTextureClrLow);
+  */
+  MMIO (REG_3D_TextureBorderColor, prev->texture[0].hwTextureBorderColor);
+
+  switch ((prev->texture[0].hwTextureSet & MASK_TextureLevel) >> 8)
+    {
+    case 11:			
+      MMIO (REG_3D_TextureAddress11, prev->texture[0].texOffset11);
+    case 10:			
+      MMIO (REG_3D_TextureAddress10, prev->texture[0].texOffset10);
+      MMIO (REG_3D_TexturePitch10, prev->texture[0].texPitch10);
+    case 9:			
+      MMIO (REG_3D_TextureAddress9, prev->texture[0].texOffset9);
+    case 8:			
+      MMIO (REG_3D_TextureAddress8, prev->texture[0].texOffset8);
+      MMIO (REG_3D_TexturePitch8, prev->texture[0].texPitch89);
+    case 7:			
+      MMIO (REG_3D_TextureAddress7, prev->texture[0].texOffset7);
+    case 6:			
+      MMIO (REG_3D_TextureAddress6, prev->texture[0].texOffset6);
+      MMIO (REG_3D_TexturePitch6, prev->texture[0].texPitch67);
+    case 5:			
+      MMIO (REG_3D_TextureAddress5, prev->texture[0].texOffset5);
+    case 4:			
+      MMIO (REG_3D_TextureAddress4, prev->texture[0].texOffset4);
+      MMIO (REG_3D_TexturePitch4, prev->texture[0].texPitch45);
+    case 3:			
+      MMIO (REG_3D_TextureAddress3, prev->texture[0].texOffset3);
+    case 2:			
+      MMIO (REG_3D_TextureAddress2, prev->texture[0].texOffset2);
+      MMIO (REG_3D_TexturePitch2, prev->texture[0].texPitch23);
+    case 1:			
+      MMIO (REG_3D_TextureAddress1, prev->texture[0].texOffset1);
+    case 0:			
+      MMIO (REG_3D_TextureAddress0, prev->texture[0].texOffset0);
+      MMIO (REG_3D_TexturePitch0, prev->texture[0].texPitch01);
+    }
+
+  /* TODO */
+  /* if (hwcx->ctx->Texture.Unit[1].ReallyEnabled) */
+  {
+    MMIO (REG_3D_Texture1Set, prev->texture[1].hwTextureSet);
+    MMIO (REG_3D_Texture1Mip, prev->texture[1].hwTextureMip);
+    /*
+    MMIO(REG_3D_Texture1TransparencyColorHigh, prev->texture[1].hwTextureClrHigh);
+    MMIO(REG_3D_Texture1TransparencyColorLow, prev->texture[1].hwTextureClrLow);
+    */
+    MMIO (REG_3D_Texture1BorderColor, prev->texture[1].hwTextureBorderColor);
+
+    switch ((prev->texture[1].hwTextureSet & MASK_TextureLevel) >> 8)
+      {
+      case 11:			
+	MMIO (REG_3D_Texture1Address11, prev->texture[1].texOffset11);
+      case 10:			
+	MMIO (REG_3D_Texture1Address10, prev->texture[1].texOffset10);
+	MMIO (REG_3D_Texture1Pitch10, prev->texture[1].texPitch10);
+      case 9:			
+	MMIO (REG_3D_Texture1Address9, prev->texture[1].texOffset9);
+      case 8:			
+	MMIO (REG_3D_Texture1Address8, prev->texture[1].texOffset8);
+	MMIO (REG_3D_Texture1Pitch8, prev->texture[1].texPitch89);
+      case 7:			
+	MMIO (REG_3D_Texture1Address7, prev->texture[1].texOffset7);
+      case 6:			
+	MMIO (REG_3D_Texture1Address6, prev->texture[1].texOffset6);
+	MMIO (REG_3D_Texture1Pitch6, prev->texture[1].texPitch67);
+      case 5:			
+	MMIO (REG_3D_Texture1Address5, prev->texture[1].texOffset5);
+      case 4:			
+	MMIO (REG_3D_Texture1Address4, prev->texture[1].texOffset4);
+	MMIO (REG_3D_Texture1Pitch4, prev->texture[1].texPitch45);
+      case 3:			
+	MMIO (REG_3D_Texture1Address3, prev->texture[1].texOffset3);
+      case 2:			
+	MMIO (REG_3D_Texture1Address2, prev->texture[1].texOffset2);
+	MMIO (REG_3D_Texture1Pitch2, prev->texture[1].texPitch23);
+      case 1:			
+	MMIO (REG_3D_Texture1Address1, prev->texture[1].texOffset1);
+      case 0:			
+	MMIO (REG_3D_Texture1Address0, prev->texture[1].texOffset0);
+	MMIO (REG_3D_Texture1Pitch0, prev->texture[1].texPitch01);
+      }
+  }
+
+  /* texture environment */
+  MMIO (REG_3D_TextureBlendFactor, prev->hwTexEnvColor);
+  MMIO (REG_3D_TextureColorBlendSet0, prev->hwTexBlendClr0);
+  MMIO (REG_3D_TextureColorBlendSet1, prev->hwTexBlendClr1);
+  MMIO (REG_3D_TextureAlphaBlendSet0, prev->hwTexBlendAlpha0);
+  MMIO (REG_3D_TextureAlphaBlendSet1, prev->hwTexBlendAlpha1);
+  }
+
+  hwcx->GlobalFlag = 0;
+}
+
+void
+sis_fatal_error (void)
+{
+  /* free video memory, or the framebuffer device will do it automatically */
+
+#ifdef XFree86Server
+  FatalError ("Fatal errors in libGLcore.a\n");
+#else
+  fprintf(stderr, "Fatal errors in sis_dri.so\n");
+  exit (-1);
+#endif
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_ctx.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_ctx.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_ctx.h	Fri Jun 30 12:30:20 2000
@@ -0,0 +1,255 @@
+#ifndef _sis_ctx_h_
+#define _sis_ctx_h_
+
+#include "sis_common.h"
+
+/* for GLboolean */
+#include <GL/gl.h>
+
+#define PCI_CHIP_SIS300		0x0300
+#define PCI_CHIP_SIS630		0x6300
+#define PCI_CHIP_SIS540		0x5300
+
+#define SIS_STATE_TRIANGLE      1
+#define SIS_STATE_LINE          2
+#define SIS_STATE_POINT         3
+
+/* for swRenderFlag */
+#define SIS_SW_TRIANGLE 0x1
+#define SIS_SW_LINE 0x2
+#define SIS_SW_POINT 0x4
+#define SIS_SW_TEXTURE_DIM 0x8
+#define SIS_SW_TEXTURE_OBJ 0x10
+#define SIS_SW_TEXTURE_OBJ1 0x20
+#define SIS_SW_TEXTURE_ENV 0x100
+#define SIS_SW_TEXTURE_ENV1 0x200
+
+#define SIS_SW_TEXTURE (SIS_SW_TEXTURE_DIM | \
+                        SIS_SW_TEXTURE_OBJ | SIS_SW_TEXTURE_OBJ1 | \
+                        SIS_SW_TEXTURE_ENV | SIS_SW_TEXTURE_ENV1)
+#define SIS_SW_ALL (SIS_SW_POINT | SIS_SW_LINE | SIS_SW_TRIANGLE | \
+                    SIS_SW_TEXTURE)
+
+/*
+ ** Device dependent context state
+ */
+typedef struct __GLSiSTextureRec
+{
+  DWORD hwTextureSet;
+  DWORD hwTextureMip;
+  DWORD hwTextureClrHigh;
+  DWORD hwTextureClrLow;
+  DWORD hwTextureBorderColor;
+
+  DWORD texOffset0;
+  DWORD texOffset1;
+  DWORD texOffset2;
+  DWORD texOffset3;
+  DWORD texOffset4;
+  DWORD texOffset5;
+  DWORD texOffset6;
+  DWORD texOffset7;
+  DWORD texOffset8;
+  DWORD texOffset9;
+  DWORD texOffset10;
+  DWORD texOffset11;
+
+  DWORD texPitch01;
+  DWORD texPitch23;
+  DWORD texPitch45;
+  DWORD texPitch67;
+  DWORD texPitch89;
+  DWORD texPitch10;
+}
+__GLSiSTexture;
+
+typedef struct __GLSiSHardwareRec
+{
+  DWORD hwCapEnable, hwCapEnable2;	/*  Enable Setting */
+
+  DWORD hwOffsetZ, hwZ;		/* Z Setting */
+
+  DWORD hwZBias, hwZMask;	/* Z Setting */
+
+  DWORD hwAlpha;		/* Alpha Setting */
+
+  DWORD hwDstSet, hwDstMask;	/* Destination Setting */
+
+  DWORD hwOffsetDest;		/* Destination Setting */
+
+  DWORD hwLinePattern;		/* Line Setting */
+
+  DWORD hwFog;			/* Fog Setting */
+
+  DWORD hwFogFar, hwFogInverse;	/* Fog Distance setting */
+
+  DWORD hwFogDensity;		/* Fog factor & density */
+
+  DWORD hwStSetting, hwStSetting2;	/* Stencil Setting */
+
+  DWORD hwStOffset;		/* Stencil Setting */
+
+  DWORD hwDstSrcBlend;		/* Blending mode Setting */
+
+  DWORD clipTopBottom;		/* Clip for Top & Bottom */
+
+  DWORD clipLeftRight;		/* Clip for Left & Right */
+
+  struct __GLSiSTextureRec texture[2];
+
+  DWORD hwTexEnvColor;		/* Texture Blending Setting */
+
+  DWORD hwTexBlendClr0;
+  DWORD hwTexBlendClr1;
+  DWORD hwTexBlendAlpha0;
+  DWORD hwTexBlendAlpha1;
+
+}
+__GLSiSHardware;
+
+/*
+ ** Device dependent context state
+ */
+typedef struct __GLSiScontextRec
+{
+  /* This must be first in this structure */
+  GLcontext *gc;
+
+  unsigned int virtualX, virtualY;
+  unsigned int bytesPerPixel;
+  unsigned char *IOBase;
+  unsigned char *FbBase;
+  unsigned int displayWidth;	/* per byte */
+  unsigned int pitch;
+
+  /* for sw-render */
+  GLubyte *swRenderBase;
+  GLuint swRenderPitch;
+  GLubyte *swZBase;
+  GLuint swZPitch;
+  GLuint pixelValue;
+  GLboolean swForceRender;
+
+  /* HW RGBA layout */
+  unsigned int redMask, greenMask, blueMask, alphaMask;
+  unsigned int colorFormat;
+
+  /* Z format */
+  unsigned int zFormat;
+
+  /* Clear patterns, 4 bytes */
+  unsigned int clearColorPattern;
+  unsigned int clearZStencilPattern;
+
+  /* render function */
+  points_func PointsFunc;
+  line_func LineFunc;
+  triangle_func TriangleFunc;
+  quad_func QuadFunc;
+  rect_func RectFunc;
+
+  /* DRM fd */
+  int drmSubFD;
+  
+  /* AGP Memory */
+  unsigned int AGPSize;
+  unsigned char *AGPBase;
+  unsigned int AGPAddr;
+  
+  /* AGP Command Buffer */
+  /* TODO: use Global variables */
+  unsigned char *AGPCmdBufBase;
+  DWORD AGPCmdBufAddr;
+  unsigned int AGPCmdBufSize;
+  DWORD *pAGPCmdBufNext;
+  GLboolean AGPCmdModeEnabled;
+  GLboolean UseAGPCmdMode;
+
+  /* register 0x89F4 */
+  DWORD AGPParseSet;
+
+  /* register 0x89F8 */
+  DWORD dwPrimitiveSet;
+
+  __GLSiSHardware prev, current;
+
+  DWORD chipVer;
+  int Chipset;
+
+  DWORD drawableID;
+
+  /* SGRAM block write */
+  GLboolean blockWrite;
+
+  GLuint swRenderFlag;
+  GLenum Primitive;
+  
+  /* Fast Path */
+  GLboolean useFastPath;
+
+  DWORD GlobalFlag;
+
+  DWORD rawLockMask;
+  DWORD lockMask;
+
+  void (*SwapBuffers)(XMesaBuffer b);
+
+  /* stereo */
+  GLboolean isFullScreen;
+  GLboolean useStereo;
+  GLboolean stereoEnabled;
+  int stereo_drawIndex;
+  int stereo_drawSide;
+  GLboolean irqEnabled;
+      
+  int serialNumber;
+
+#if defined(XFree86Server) && defined(XF86DRI)
+  void *pDRIContextPriv;
+#endif
+
+  GLboolean clearTexCache;
+
+  GLuint TexStates[SIS_MAX_TEXTURES];
+  GLuint PrevTexFormat[SIS_MAX_TEXTURES];
+
+  int *CurrentHwcxPtr;
+  int *CurrentQueueLenPtr;
+  unsigned int *FrameCountPtr;
+}
+__GLSiScontext;
+
+/* Macros to access hwcx */
+#define GET_IOBase(x) ((x)->IOBase)
+#define GET_FbBase(x) ((x)->FbBase)
+#define GET_DEPTH(x) ((x)->bytesPerPixel)
+#define GET_WIDTH(x) ((x)->displayWidth)
+#define GET_PITCH(x) ((x)->pitch)
+#define GET_FbPos(hwcx,x,y) (GET_FbBase(hwcx)+(x)*GET_DEPTH(hwcx)\
+                             +(y)*GET_PITCH(hwcx))
+
+#define GET_ColorFormat(x) ((x)->colorFormat)
+
+#define GET_RMASK(x) ((x)->redMask)
+#define GET_GMASK(x) ((x)->greenMask)
+#define GET_BMASK(x) ((x)->blueMask)
+#define GET_AMASK(x) ((x)->alphaMask)
+
+/* update to hwcx->prev */
+extern void sis_update_drawable_state (GLcontext * ctx);
+
+/* update to hw */
+extern void sis_update_texture_state (__GLSiScontext * hwcx);
+extern void sis_update_render_state (__GLSiScontext * hwcx, GLuint stateType);
+extern void sis_validate_all_state (__GLSiScontext * hwcx);
+
+extern void sis_set_scissor (GLcontext * gc);
+
+/* AGP */
+void sis_StartAGP (GLcontext * ctx);
+void sis_FlushAGP (GLcontext * ctx);
+extern float *AGP_CurrentPtr;
+
+void sis_fatal_error (void);
+
+#endif
Index: xc/lib/GL/mesa/src/drv/sis/sis_debug.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_debug.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_debug.c	Fri Jun 30 12:30:21 2000
@@ -0,0 +1,138 @@
+/* 
+ * dump HW states, set environment variable SIS_DE1BUG
+ * to enable these functions 
+ */
+
+#include <fcntl.h>
+#include <assert.h>
+
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+/* for SiS 300 */
+#define MMIOLength (0x8FFF-0x8800+1)
+#define MMIO3DOffset (0x8800)
+#define FILE_NAME "300.dump"
+
+char *IOBase4Debug = 0;
+
+char *prevLockFile = NULL;
+int prevLockLine = 0;
+
+DWORD _empty[0x10000];
+
+//#if defined(DEBUG)
+
+void
+dump_agp (void *addr, int dword_count)
+{
+  if (!getenv ("SIS_DEBUG"))
+    return;
+
+  {
+    int i;
+    FILE *file = fopen ("300agp.dump", "w");
+
+    if (file)
+      {
+	for (i = 0; i < dword_count; i++)
+	  {
+	    fprintf (file, "%f\n", *(float *) addr);
+	    ((unsigned char *) addr) += 4;
+	  }
+	fclose (file);
+      }
+  }
+}
+
+void
+d2f_once (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  static int serialNumber = -1;
+
+  if (serialNumber == hwcx->serialNumber)
+    return;
+  else
+    serialNumber = hwcx->serialNumber;
+
+  d2f();
+}
+
+void
+d2f (void)
+{
+  if (!getenv ("SIS_DEBUG"))
+    return;
+
+  /* dump 0x8800 - 0x8AFF */
+  {
+    int fh;
+    int rval;
+    void *addr = IOBase4Debug + MMIO3DOffset;
+
+    assert (IOBase4Debug);
+
+    if ((fh = open (FILE_NAME, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE)) != -1)
+      {
+	rval = write (fh, addr, MMIOLength);
+	assert (rval != -1);
+	close (fh);
+      }
+  }
+}
+
+/* dump to HW */
+void
+d2h (char *file_name)
+{
+  int fh;
+  int rval;
+  void *addr[MMIOLength];
+
+  if (!getenv ("SIS_DEBUG"))
+    return;
+
+  if ((fh = open (file_name, O_CREAT, S_IREAD | S_IWRITE)) != -1)
+    {
+      rval = read (fh, addr, MMIOLength);
+      assert (rval != -1);
+      close (fh);
+    }
+  memcpy (IOBase4Debug + MMIO3DOffset, addr, MMIOLength);
+
+}
+
+/* dump video memory to file  */
+void
+dvidmem (unsigned char *addr, int size)
+{
+  int fh;
+  int rval;
+  static char *file_name = "vidmem.dump";
+
+  if (!getenv ("SIS_DEBUG"))
+    return;
+
+  if ((fh = open (file_name, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE)) != -1)
+    {
+      rval = write (fh, addr, size);
+      assert (rval != -1);
+      close (fh);
+    }
+}
+
+/*
+#else
+
+#define dump_agp(a,b) do{}while(0)
+#define d2f() do{}while(0)
+#define d2f_once(a) do{}while(0)
+#define void d2f(a) do{}while(0)
+#define void d2h(a) do{}while(0)
+#define dvidmem(a,b) do{}while(0)
+
+#endif
+*/
\ No newline at end of file
Index: xc/lib/GL/mesa/src/drv/sis/sis_debug.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_debug.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_debug.h	Fri Jun 30 12:30:21 2000
@@ -0,0 +1,11 @@
+#ifndef _sis_debug_h_
+#define _sis_debug_h_
+
+void dump_agp (void *addr, int dword_count);
+void d2f (void);
+void d2f_once (GLcontext * ctx);
+void d2h (char *file_name);
+void dvidmem (unsigned char *addr, int size);
+extern char *IOBase4Debug;
+
+#endif
Index: xc/lib/GL/mesa/src/drv/sis/sis_fastpath.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_fastpath.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_fastpath.c	Fri Jun 30 12:30:22 2000
@@ -0,0 +1,193 @@
+/* 
+ *  FOR 
+ *  1. triangle/strip with 2-texture with no other capability  
+ *     (depth-offset, edge-flag...)
+ *  2. smooth shading
+ *  3. render to backbuffer
+ *  4. use AGP command mode   
+ */   
+
+#ifdef PC_HEADER
+#include "all.h"
+#else
+#include "glheader.h"
+#include "clip.h"
+#include "context.h"
+#include "light.h"
+#include "lines.h"
+#include "macros.h"
+#include "matrix.h"
+#include "pb.h"
+#include "points.h"
+#include "pipeline.h"
+#include "stages.h"
+#include "types.h"
+#include "vb.h"
+#include "vbcull.h"
+#include "vbrender.h"
+#include "vbindirect.h"
+#include "xform.h"
+#endif
+
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+#define WRITE_SMOOTH_W_T2(v) \
+do{ \
+  DWORD dcSARGB; \
+  \
+  AGP_CurrentPtr[0] = VB->Win.data[v][0] - 0.5; \
+  AGP_CurrentPtr[1] = Y_FLIP (VB->Win.data[v][1]) + 0.5; \
+  AGP_CurrentPtr[2] = VB->Win.data[v][2] / 65535.0; \
+  AGP_CurrentPtr[3] = VB->Win.data[v][3]; \
+  RGBA8ConvertToBGRA8 (&dcSARGB, VB->ColorPtr->data[v]); \
+  ((DWORD *)AGP_CurrentPtr)[4] = dcSARGB; \
+  AGP_CurrentPtr[5] = VB->TexCoordPtr[0]->data[v][0]; \
+  AGP_CurrentPtr[6] = VB->TexCoordPtr[0]->data[v][1]; \
+  AGP_CurrentPtr[7] = VB->TexCoordPtr[1]->data[v][0]; \
+  AGP_CurrentPtr[8] = VB->TexCoordPtr[1]->data[v][1]; \
+  AGP_CurrentPtr+=9; \
+}while(0)
+
+  /* TODO or use for loop and let compiler unroll it */
+#define COPY_SMOOTH_W_T2(i) \
+do{ \
+  AGP_CurrentPtr[0] = (AGP_CurrentPtr+(i)*9)[0]; \
+  AGP_CurrentPtr[1] = (AGP_CurrentPtr+(i)*9)[1]; \
+  AGP_CurrentPtr[2] = (AGP_CurrentPtr+(i)*9)[2]; \
+  AGP_CurrentPtr[3] = (AGP_CurrentPtr+(i)*9)[3]; \
+  AGP_CurrentPtr[4] = (AGP_CurrentPtr+(i)*9)[4]; \
+  AGP_CurrentPtr[5] = (AGP_CurrentPtr+(i)*9)[5]; \
+  AGP_CurrentPtr[6] = (AGP_CurrentPtr+(i)*9)[6]; \
+  AGP_CurrentPtr[7] = (AGP_CurrentPtr+(i)*9)[7]; \
+  AGP_CurrentPtr[8] = (AGP_CurrentPtr+(i)*9)[8]; \
+  AGP_CurrentPtr+=9; \
+}while(0)
+
+#if defined(SIS_USE_FASTPATH)
+static void sis_render_vb( struct vertex_buffer *VB )
+{
+   GLcontext *ctx = VB->ctx;
+   GLuint i, next, prim;
+   GLuint parity = VB->Parity;
+   render_func *tab;
+   GLuint count = VB->Count;
+
+   XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+   __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  
+   if(!hwcx->useFastPath){
+     gl_render_vb(VB);
+     return;
+   } 
+      
+   if (VB->Indirect) { 
+      return; 
+#ifndef SIS_USE_HW_CULL
+   } else if (VB->CullMode & CULL_MASK_ACTIVE) {
+      tab = ctx->Driver.RenderVBCulledTab;
+
+      /* TODO: check */
+      if (!VB->CullDone)
+         gl_fast_copy_vb( VB );
+#endif
+   } else if (VB->CullMode & CLIP_MASK_ACTIVE) {
+      tab = ctx->Driver.RenderVBClippedTab;
+   } else {
+      tab = ctx->Driver.RenderVBRawTab;
+   }
+
+   /* TODO: know what does it do */
+   gl_import_client_data( VB, ctx->RenderFlags,
+			  (VB->ClipOrMask
+			   ? VEC_WRITABLE|VEC_GOOD_STRIDE
+			   : VEC_GOOD_STRIDE));
+
+   ctx->Driver.RenderStart( ctx );
+
+   if(tab != ctx->Driver.RenderVBRawTab){
+      for ( i= VB->CopyStart ; i < count ; parity = 0, i = next ) 
+      {
+	 prim = VB->Primitive[i];
+	 next = VB->NextPrimitive[i];
+
+	 tab[prim]( VB, i, next, parity );
+      }          
+   }
+   else{
+     for ( i= VB->CopyStart ; i < count ; parity = 0, i = next ) 
+      {
+        prim = VB->Primitive[i];
+        next = VB->NextPrimitive[i];
+
+        if(prim == GL_TRIANGLE_STRIP)
+          {
+            int j;
+            
+            /* assume size >= 3 */
+            /* assert(next-i+1 >= 3); */
+
+            if(i+2 >=next)
+              break;
+
+            if(parity){
+              WRITE_SMOOTH_W_T2(i+1);
+              WRITE_SMOOTH_W_T2(i);
+              WRITE_SMOOTH_W_T2(i+2);        
+            }
+            else{
+              WRITE_SMOOTH_W_T2(i);
+              WRITE_SMOOTH_W_T2(i+1);
+              WRITE_SMOOTH_W_T2(i+2);        
+            }
+
+            for(j=i+3; j<next; j++){
+              if(parity){
+                COPY_SMOOTH_W_T2(-3);
+                COPY_SMOOTH_W_T2(-2);
+                WRITE_SMOOTH_W_T2(j);
+              }
+              else{
+                COPY_SMOOTH_W_T2(-1);
+                COPY_SMOOTH_W_T2(-3);
+                WRITE_SMOOTH_W_T2(j);
+              }              
+              parity ^= 1;
+            }	
+          }
+        else
+          {
+            tab[prim]( VB, i, next, parity );
+          }
+      }
+   }
+
+   ctx->Driver.RenderFinish( ctx );
+}
+#endif
+
+GLuint sis_RegisterPipelineStages (struct gl_pipeline_stage *out,
+				   const struct gl_pipeline_stage *in,
+				   GLuint nr)
+{
+   GLuint i, o;
+
+   for (i = o = 0 ; i < nr ; i++) {
+      switch (in[i].ops) {
+      case PIPE_OP_RENDER:
+	 out[o] = in[i];
+#if defined(SIS_USE_FASTPATH)
+	 if (in[i].run == gl_render_vb) {
+  	    out[o].run = sis_render_vb; 
+	 }
+#endif
+	 o++;
+	 break;
+      default:
+	 out[o++] = in[i];
+	 break;
+      }
+   }
+
+   return o;
+}				   
Index: xc/lib/GL/mesa/src/drv/sis/sis_fog.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_fog.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_fog.c	Fri Jun 30 12:30:22 2000
@@ -0,0 +1,141 @@
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+static DWORD convertFtToFogFt (DWORD dwInValue);
+
+void
+sis_Fogfv (GLcontext * ctx, GLenum pname, const GLfloat * params)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  __GLSiSHardware *current = &hwcx->current;
+
+  GLubyte dwFogColor[4];
+  DWORD dwArg;
+  float fArg;
+
+  switch (pname)
+    {
+    case GL_FOG_MODE:
+      current->hwFog &= ~(FOGMODE_LINEAR | FOGMODE_EXP | FOGMODE_EXP2);
+      switch (ctx->Fog.Mode)
+	{
+	case GL_LINEAR:
+	  current->hwFog |= FOGMODE_LINEAR;
+	  break;
+	case GL_EXP:
+	  current->hwFog |= FOGMODE_EXP;
+	  break;
+	case GL_EXP2:
+	  current->hwFog |= FOGMODE_EXP2;
+	  break;
+	}
+      break;
+    case GL_FOG_DENSITY:
+      dwArg = *(DWORD *) (&(ctx->Fog.Density));
+      current->hwFogDensity = 0;
+      current->hwFogDensity |= convertFtToFogFt (dwArg);
+      break;
+    case GL_FOG_START:
+    case GL_FOG_END:
+      fArg = 1.0 / (ctx->Fog.End - ctx->Fog.Start);
+      current->hwFogInverse = doFPtoFixedNoRound (*(DWORD *) (&fArg), 10);
+      if (pname == GL_FOG_END)
+	{
+	  dwArg = *(DWORD *) (&(ctx->Fog.End));
+	  if (hwcx->Chipset == PCI_CHIP_SIS300)
+	    {
+	      current->hwFogFar = doFPtoFixedNoRound (dwArg, 10);
+	    }
+	  else
+	    {
+	      current->hwFogFar = doFPtoFixedNoRound (dwArg, 6);
+	    }
+	}
+      break;
+    case GL_FOG_INDEX:
+      /* TODO */
+      break;
+    case GL_FOG_COLOR:
+      *((DWORD *) dwFogColor) = 0;
+      dwFogColor[2] =  (GLubyte)((ctx->Fog.Color[0]) * 255.0);
+      dwFogColor[1] =  (GLubyte)((ctx->Fog.Color[1]) * 255.0);
+      dwFogColor[0] =  (GLubyte)((ctx->Fog.Color[2]) * 255.0);
+      current->hwFog &= 0xff000000;
+      current->hwFog |= *((DWORD *) dwFogColor);
+      break;
+    }
+}
+
+DWORD
+doFPtoFixedNoRound (DWORD dwInValue, int nFraction)
+{
+  DWORD dwMantissa;
+  int nTemp;
+
+  if (dwInValue == 0)
+    return 0;
+  nTemp = (int) (dwInValue & 0x7F800000) >> 23;
+  nTemp = nTemp - 127 + nFraction - 23;
+  dwMantissa = (dwInValue & 0x007FFFFF) | 0x00800000;
+
+  if (nTemp < -25)
+    return 0;
+  if (nTemp > 0)
+    {
+      dwMantissa <<= nTemp;
+    }
+  else
+    {
+      nTemp = -nTemp;
+      dwMantissa >>= nTemp;
+    }
+  if (dwInValue & 0x80000000)
+    {
+      dwMantissa = ~dwMantissa + 1;
+    }
+  return (dwMantissa);
+}
+
+/* s[8].23->s[7].10 */
+static DWORD
+convertFtToFogFt (DWORD dwInValue)
+{
+  DWORD dwMantissa, dwExp;
+  DWORD dwRet;
+
+  if (dwInValue == 0)
+    return 0;
+
+  /* ----- Standard float Format: s[8].23                          -----
+   * -----     = (-1)^S * 2^(E      - 127) * (1 + M        / 2^23) -----
+   * -----     = (-1)^S * 2^((E-63) -  64) * (1 + (M/2^13) / 2^10) -----
+   * ----- Density float Format:  s[7].10                          -----
+   * -----     New Exponential = E - 63                            -----
+   * -----     New Mantissa    = M / 2^13                          -----
+   * -----                                                         -----
+   */
+
+  dwExp = (dwInValue & 0x7F800000) >> 23;
+  dwExp -= 63;
+
+  if ((LONG) dwExp < 0)
+    return 0;
+
+  if (dwExp <= 0x7F)
+    {
+      dwMantissa = (dwInValue & 0x007FFFFF) >> (23 - 10);
+    }
+  else
+    {
+      /* ----- To Return +Max(or -Max) ----- */
+      dwExp = 0x7F;
+      dwMantissa = 0x3FF;
+    }
+
+  dwRet = (dwInValue & 0x80000000) >> (31 - 17);  /* Shift Sign Bit */
+
+  dwRet |= (dwExp << 10) | dwMantissa;
+
+  return (dwRet);
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_init.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_init.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_init.h	Fri Jun 30 12:30:23 2000
@@ -0,0 +1,260 @@
+#ifndef _sis_init_h_
+#define _sis_init_h_
+
+typedef LONG fixed;
+
+typedef struct _FIXEDCOLOR
+{
+  fixed r, g, b, a;
+}
+FIXEDCOLOR;
+
+#define COMMANDMODE_MMIO    1
+#define COMMANDMODE_WC      2
+#define COMMANDMODE_AGP     0
+#define	_HAS_AGPBUF 1
+
+#define floatConvertToFixedRGB(fixedColor, floatColor)\
+{\
+  fixedColor.r = (fixed) (floatColor.r * gc->constants.oneOverRedScale * ((float) 0xffffff));\
+  fixedColor.g = (fixed) (floatColor.g * gc->constants.oneOverGreenScale * ((float) 0xffffff));\
+  fixedColor.b = (fixed) (floatColor.b * gc->constants.oneOverBlueScale * ((float) 0xffffff));\
+  fixedColor.a = (fixed) (floatColor.a * gc->constants.oneOverAlphaScale * ((float) 0xffffff));\
+}
+
+/* Optimize */
+#define RGBA8ConvertToBGRA8(fixedColor, color)\
+{\
+  ((GLubyte *)fixedColor)[0] = ((GLubyte *)color)[2] ; \
+  ((GLubyte *)fixedColor)[1] = ((GLubyte *)color)[1] ; \
+  ((GLubyte *)fixedColor)[2] = ((GLubyte *)color)[0] ; \
+  ((GLubyte *)fixedColor)[3] = ((GLubyte *)color)[3] ; \
+}
+
+/* Put ARGB into DWORD */
+#define setTSARGB(dcSARGB, fixedColor)\
+{\
+  dcSARGB = ((fixedColor.a & 0x00ff0000) << 8 | \
+            (fixedColor.r & 0x00ff0000) | \
+            (fixedColor.g & 0x00ff0000) >> 8 | \
+            (fixedColor.b & 0x00ff0000) >> 16 ); \
+}
+
+#define setTSFS(dwFactor, fFactor) \
+{\
+  (dwFactor) = ((fixed)((fFactor) *  0xff))  << 24;\
+}
+
+#define MMIO(reg, value) \
+{\
+  *(LPDWORD)(GET_IOBase(hwcx) + (reg)) = value; \
+}
+
+#define mEndPrimitive()  \
+{       \
+  *(GET_IOBase(hwcx) + REG_3D_EndPrimitiveList) = 0xFF;   \
+  *(DWORD *)(GET_IOBase(hwcx) + 0x8b60) = (DWORD)(-1); \
+}
+
+#define INIT_6327_CapsEnable            0x00000080
+#define INIT_6327_CapsEnable2           0x00000000
+
+#define INIT_6327_ZSet                  0x00030000
+#define INIT_6327_ZMask			0xffffffff
+#define INIT_6327_AlphaSet              0x07000000
+#define INIT_6327_DstSet                0x0C000000
+#define INIT_6327_DstMask		0xffffffff
+#define INIT_6327_FogSet                0x04000000
+#define INIT_6327_BlendMode             0x00000001
+#define INIT_6327_TextureSet            0x00030000
+#define INIT_6327_TextureMip            0x00000000
+/* #define INIT_6327_Texture0BlendSet    0x33031941 */
+#define INIT_6327_TextureColorBlend0    0xC1485000
+#define INIT_6327_TextureAlphaBlend0    0x333A0000
+#define INIT_6327_Texture1Set           0x00030000
+#define INIT_6327_Texture1Set2          0x00000000
+/* #define INIT_6327_Texture1BlendSet    0x00000000 */
+#define INIT_6327_TextureColorBlend1    0x294B4000
+#define INIT_6327_TextureAlphaBlend1    0x333A0000
+/* #define INIT_6327_TexAddrType         0x00001000 */
+/* #define INIT_6326_InputColorFormat    0xA0000000 */
+#define INIT_6327_ParsingSet            0x00000060
+
+#define SiS_Z_COMP_NEVER                  0x00000000
+#define SiS_Z_COMP_S_LT_B                 0x00010000
+#define SiS_Z_COMP_S_EQ_B                 0x00020000
+#define SiS_Z_COMP_S_LE_B                 0x00030000
+#define SiS_Z_COMP_S_GT_B                 0x00040000
+#define SiS_Z_COMP_S_NE_B                 0x00050000
+#define SiS_Z_COMP_S_GE_B                 0x00060000
+#define SiS_Z_COMP_ALWAYS                 0x00070000
+
+#define SiS_ALPHA_NEVER                   0x00000000
+#define SiS_ALPHA_LESS                    0x01000000
+#define SiS_ALPHA_EQUAL                   0x02000000
+#define SiS_ALPHA_LEQUAL                  0x03000000
+#define SiS_ALPHA_GREATER                 0x04000000
+#define SiS_ALPHA_NOTEQUAL                0x05000000
+#define SiS_ALPHA_GEQUAL                  0x06000000
+#define SiS_ALPHA_ALWAYS                  0x07000000
+
+#define SiS_STENCIL_NEVER		  0x00000000
+#define SiS_STENCIL_LESS                  0x01000000
+#define SiS_STENCIL_EQUAL                 0x02000000
+#define SiS_STENCIL_LEQUAL                0x03000000
+#define SiS_STENCIL_GREATER               0x04000000
+#define SiS_STENCIL_NOTEQUAL		  0x05000000
+#define SiS_STENCIL_GEQUAL                0x06000000
+#define SiS_STENCIL_ALWAYS                0x07000000
+
+#define SiS_SFAIL_KEEP			  0x00000000
+#define SiS_SFAIL_ZERO			  0x00100000
+#define SiS_SFAIL_REPLACE                 0x00200000
+#define SiS_SFAIL_INVERT		  0x00500000
+#define SiS_SFAIL_INCR			  0x00600000
+#define SiS_SFAIL_DECR			  0x00700000
+
+#define SiS_SPASS_ZFAIL_KEEP			  0x00000000
+#define SiS_SPASS_ZFAIL_ZERO			  0x00010000
+#define SiS_SPASS_ZFAIL_REPLACE			  0x00020000
+#define SiS_SPASS_ZFAIL_INVERT			  0x00050000
+#define SiS_SPASS_ZFAIL_INCR			  0x00060000
+#define SiS_SPASS_ZFAIL_DECR			  0x00070000
+
+#define SiS_SPASS_ZPASS_KEEP			  0x00000000
+#define SiS_SPASS_ZPASS_ZERO			  0x00001000
+#define SiS_SPASS_ZPASS_REPLACE			  0x00002000
+#define SiS_SPASS_ZPASS_INVERT			  0x00005000
+#define SiS_SPASS_ZPASS_INCR			  0x00006000
+#define SiS_SPASS_ZPASS_DECR			  0x00007000
+
+#define SiS_D_ZERO			      0x00000000
+#define SiS_D_ONE			      0x00000010
+#define SiS_D_SRC_COLOR			      0x00000020
+#define SiS_D_ONE_MINUS_SRC_COLOR	      0x00000030
+#define SiS_D_SRC_ALPHA			      0x00000040
+#define SiS_D_ONE_MINUS_SRC_ALPHA	      0x00000050
+#define SiS_D_DST_ALPHA			      0x00000060
+#define SiS_D_ONE_MINUS_DST_ALPHA	      0x00000070
+
+#define SiS_S_ZERO			  0x00000000
+#define SiS_S_ONE			  0x00000001
+#define SiS_S_SRC_ALPHA                   0x00000004
+#define SiS_S_ONE_MINUS_SRC_ALPHA	  0x00000005
+#define SiS_S_DST_ALPHA                   0x00000006
+#define SiS_S_ONE_MINUS_DST_ALPHA         0x00000007
+#define SiS_S_DST_COLOR                   0x00000008
+#define SiS_S_ONE_MINUS_DST_COLOR         0x00000009
+#define SiS_S_SRC_ALPHA_SATURATE          0x0000000a
+
+/* Logic Op */
+#define LOP_CLEAR						  0x00000000
+#define LOP_NOR							  0x01000000
+#define LOP_AND_INVERTED				  0x02000000
+#define LOP_COPY_INVERTED				  0x03000000
+#define LOP_AND_REVERSE					  0x04000000
+#define LOP_INVERT						  0x05000000
+#define LOP_XOR							  0x06000000
+#define LOP_NAND						  0x07000000
+#define LOP_AND							  0x08000000
+#define LOP_EQUIV						  0x09000000
+#define LOP_NOOP						  0x0a000000
+#define LOP_OR_INVERTED					  0x0b000000
+#define LOP_COPY						  0x0c000000
+#define LOP_OR_REVERSE					  0x0d000000
+#define LOP_OR							  0x0e000000
+#define LOP_SET							  0x0f000000
+
+/* Get lock before calling this */
+#define mWait3DCmdQueue(wLen)\
+do{\
+  while ( *(hwcx->CurrentQueueLenPtr) < (int)(wLen))\
+    {\
+      *(hwcx->CurrentQueueLenPtr) = \
+      (int)(*(DWORD *)(GET_IOBase(hwcx) + REG_QUELEN) & MASK_QUELEN) \
+      - (int)20; \
+    }\
+  *(hwcx->CurrentQueueLenPtr) -= (int)(wLen);\
+}while(0)
+
+#if 0
+#define mWait3DCmdQueue(wLen) do{}while(0);
+#endif
+
+#define GFLAG_ENABLESETTING               0x00000001
+#define GFLAG_ENABLESETTING2              0x00000002
+#define GFLAG_ZSETTING                    0x00000004
+#define GFLAG_ALPHASETTING                0x00000008
+#define GFLAG_DESTSETTING                 0x00000010
+#define GFLAG_LINESETTING                 0x00000020
+#define GFLAG_STENCILSETTING              0x00000040
+#define GFLAG_FOGSETTING                  0x00000080
+#define GFLAG_DSTBLEND                    0x00000100
+#define GFLAG_CLIPPING                    0x00000200
+#define CFLAG_TEXTURERESET 		  0x00000400
+#define GFLAG_TEXTUREMIPMAP               0x00000800
+#define GFLAG_TEXBORDERCOLOR              0x00001000
+#define GFLAG_TEXTUREADDRESS              0x00002000
+#define GFLAG_TEXTUREENV                  0x00004000
+#define CFLAG_TEXTURERESET_1 		  0x00008000
+#define GFLAG_TEXTUREMIPMAP_1             0x00010000
+#define GFLAG_TEXBORDERCOLOR_1            0x00020000
+#define GFLAG_TEXTUREADDRESS_1            0x00040000
+#define GFLAG_TEXTUREENV_1                0x00080000
+
+#define GFLAG_TEXTURE_STATES (CFLAG_TEXTURERESET | GFLAG_TEXTUREMIPMAP | \
+			      GFLAG_TEXBORDERCOLOR | GFLAG_TEXTUREADDRESS | \
+			      CFLAG_TEXTURERESET_1 | GFLAG_TEXTUREMIPMAP_1 | \
+			      GFLAG_TEXBORDERCOLOR_1 | \
+			      GFLAG_TEXTUREADDRESS_1 | \
+			      GFLAG_TEXTUREENV | GFLAG_TEXTUREENV_1)
+
+
+#define GFLAG_RENDER_STATES  (GFLAG_ENABLESETTING | GFLAG_ENABLESETTING2 | \
+			      GFLAG_ZSETTING | GFLAG_ALPHASETTING | \
+			      GFLAG_DESTSETTING | GFLAG_FOGSETTING | \
+			      GFLAG_STENCILSETTING | GFLAG_DSTBLEND | \
+			      GFLAG_CLIPPING)
+
+
+
+#define  Index_SR_Ext_BIOS                     0x10
+#define REVISION_6205BASE   3
+#define SiS6326             (REVISION_6205BASE+20)	/* 6326 A/B/C0 */
+#define SiS6326C            (REVISION_6205BASE+21)	/* 6326 C1 */
+#define SiS6326C5           (REVISION_6205BASE+22)	/* 6326 C5 */
+#define SiS6326G            (REVISION_6205BASE+25)	/* 6326 C1 */
+#define SiS6326D0           (REVISION_6205BASE+30)	/* 6326 D0 */
+#define SiS6326D1           (REVISION_6205BASE+31)	/* 6326 D1 */
+#define SiS6326D2           (REVISION_6205BASE+32)	/* 6326 D2 */
+#define SiS6326H0           (REVISION_6205BASE+35)	/* 6326 H0 */
+#define SiS6215A            (REVISION_6205BASE+1)	/* 6205 B2, Video only version */
+#define SiS6215B            (REVISION_6205BASE+2)	/* 6205 D3, Video only version */
+#define SiS6215C            (REVISION_6205BASE+3)	/* 6205 B2, Video XOR version */
+#define SiS6205B            (REVISION_6205BASE+4)	/* 6205 B2 */
+#define SiS6205D            (REVISION_6205BASE+5)	/* 6205 D3 */
+#define SiS5597             (REVISION_6205BASE+7)	/* Jedi, 5597, 5598 */
+
+#define REVISION_6205       {{0x6326, 0xAF, 0, SiS6326  },\
+                             {0x6326, 0xC1, 0, SiS6326C },\
+                             {0x6326, 0x92, 0, SiS6326D2},\
+                             {0x6326, 0x92, 1, SiS6326D2},\
+                             {0x6326, 0x0A, 0, SiS6326G },\
+                             {0x6326, 0xD0, 0, SiS6326D0},\
+                             {0x6326, 0xD1, 0, SiS6326D1},\
+                             {0x6326, 0xD2, 0, SiS6326D2},\
+                             {0x6326, 0xD2, 1, SiS6326D2},\
+                             {0x6326, 0x0B, 0, SiS6326H0},\
+                             {0x6326, 0x0B, 1, SiS6326H0},\
+                             {0x0200, 0x6F, 0, SiS5597  },\
+                             {0x0205, 0x6F, 0, SiS5597  },\
+                             {0x0205, 0x44, 1, SiS6215A },\
+                             {0x0205, 0xD3, 1, SiS6215B },\
+                             {0x0204, 0x2F, 1, SiS6215C },\
+                             {0x0205, 0x44, 0, SiS6205B },\
+                             {0x0205, 0xD3, 0, SiS6205D }}
+
+#define  REG_QUELEN           0x8240	/* Byte for 201C */
+#define  MASK_QUELEN          0xffff
+
+#endif
Index: xc/lib/GL/mesa/src/drv/sis/sis_linefunc.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_linefunc.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_linefunc.h	Fri Jun 30 12:30:23 2000
@@ -0,0 +1,243 @@
+#define SIS_TRI_FUNC 0
+
+#define SIS_MMIO_WRITE_VERTEX(v, i) \
+  if(SIS_STEREO && hwcx->stereoEnabled) \
+  { \
+    MMIOBase[(REG_3D_TSXa+(i)*0x30)/4] = VB->Win.data[v][0] - 0.5 + STEREO_OFFSET(v); \
+    MMIOBase[(REG_3D_TSYa+(i)*0x30)/4] = Y_FLIP (VB->Win.data[v][1]) + 0.5; \
+  } \
+  else \
+  { \
+    MMIOBase[(REG_3D_TSXa+(i)*0x30)/4] = VB->Win.data[v][0] - 0.5 ; \
+    MMIOBase[(REG_3D_TSYa+(i)*0x30)/4] = Y_FLIP (VB->Win.data[v][1]) + 0.5; \
+  } \
+\
+  if (ctx->TriangleCaps & DD_TRI_OFFSET) \
+    { \
+      if(SIS_TRI_FUNC){ \
+        MMIOBase[(REG_3D_TSZa+(i)*0x30)/4] = \
+  	(VB->Win.data[v][2] + ctx->PolygonZoffset) / 65535.0; \
+      } \
+      else{ \
+        MMIOBase[(REG_3D_TSZa+(i)*0x30)/4] = \
+  	(VB->Win.data[v][2] + ctx->LineZoffset) / 65535.0; \
+      } \
+    } \
+  else \
+    { \
+      MMIOBase[(REG_3D_TSZa+(i)*0x30)/4] = VB->Win.data[v][2] / 65535.0; \
+    } \
+\
+  if (SIS_STATES & SIS_TEXTURE0) \
+    { \
+      if(VB->TexCoordPtr[0]->size == 4){ \
+        MMIOBase[(REG_3D_TSUAa+(i)*0x30)/4] = VB->TexCoordPtr[0]->data[v][0] / \
+                                   VB->TexCoordPtr[0]->data[v][3]; \
+        MMIOBase[(REG_3D_TSVAa+(i)*0x30)/4] = VB->TexCoordPtr[0]->data[v][1] / \
+                                   VB->TexCoordPtr[0]->data[v][3]; \
+      } \
+      else{ \
+        MMIOBase[(REG_3D_TSUAa+(i)*0x30)/4] = VB->TexCoordPtr[0]->data[v][0]; \
+        MMIOBase[(REG_3D_TSVAa+(i)*0x30)/4] = VB->TexCoordPtr[0]->data[v][1]; \
+      } \
+    } \
+\
+  if (SIS_STATES & SIS_TEXTURE1) \
+    { \
+      if(VB->TexCoordPtr[1]->size == 4){ \
+        MMIOBase[(REG_3D_TSUBa+(i)*0x30)/4] = VB->TexCoordPtr[1]->data[v][0] / \
+                                   VB->TexCoordPtr[1]->data[v][3]; \
+        MMIOBase[(REG_3D_TSVBa+(i)*0x30)/4] = VB->TexCoordPtr[1]->data[v][1] / \
+                                   VB->TexCoordPtr[1]->data[v][3]; \
+      } \
+      else{ \
+        MMIOBase[(REG_3D_TSUBa+(i)*0x30)/4] = VB->TexCoordPtr[1]->data[v][0]; \
+        MMIOBase[(REG_3D_TSVBa+(i)*0x30)/4] = VB->TexCoordPtr[1]->data[v][1]; \
+      } \
+    } \
+\
+  if (SIS_STATES & (SIS_USE_W)) \
+    { \
+      if(VB->TexCoordPtr[0]->size == 4){ \
+        MMIOBase[(REG_3D_TSWGa+(i)*0x30)/4] = VB->Win.data[v][3] * \
+                                     VB->TexCoordPtr[0]->data[v][3]; \
+      } \
+      else{ \
+        MMIOBase[(REG_3D_TSWGa+(i)*0x30)/4] = VB->Win.data[v][3]; \
+      } \
+    } \
+\
+  if (SIS_STATES & (SIS_SMOOTH)) \
+    { \
+      DWORD dcSARGB; \
+\
+      RGBA8ConvertToBGRA8 (&dcSARGB, VB->ColorPtr->data[v]); \
+\
+      ((DWORD *) MMIOBase)[(REG_3D_TSARGBa+(i)*0x30)/4] = dcSARGB; \
+    } \
+  else if(LAST_VERTEX) \
+    { \
+      DWORD dcSARGB; \
+\
+      RGBA8ConvertToBGRA8 (&dcSARGB, VB->ColorPtr->data[pv]); \
+\
+      ((DWORD *) MMIOBase)[(REG_3D_TSARGBa+(i)*0x30)/4] = dcSARGB; \
+    } \
+
+static void
+SIS_TAG (sis_line) (GLcontext * ctx, GLuint vert0, GLuint vert1, GLuint pv)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  struct vertex_buffer *VB = ctx->VB;
+  float *MMIOBase = (float *) GET_IOBase (hwcx);
+
+  STEREO_SAMPLE(vert0);
+
+  mWait3DCmdQueue (10 * 2 + 1);
+
+  if (SIS_STATES & (SIS_SMOOTH))
+    {
+      hwcx->dwPrimitiveSet &= ~0x07001f07;
+      hwcx->dwPrimitiveSet |= 
+        (OP_3D_FIRE_TSARGBb | SHADE_GOURAUD | OP_3D_LINE_DRAW);
+
+      ((DWORD *) MMIOBase)[REG_3D_PrimitiveSet / 4] = hwcx->dwPrimitiveSet;
+    }
+  else
+    {
+      hwcx->dwPrimitiveSet &= ~0x07001f07;
+      hwcx->dwPrimitiveSet |= 
+        (OP_3D_FIRE_TSARGBb | SHADE_FLAT_VertexB | OP_3D_LINE_DRAW);
+
+      ((DWORD *) MMIOBase)[REG_3D_PrimitiveSet / 4] = hwcx->dwPrimitiveSet;
+    }
+
+#define LAST_VERTEX 0
+  SIS_MMIO_WRITE_VERTEX (vert0, 0);
+#undef LAST_VERTEX
+#define LAST_VERTEX 1
+  SIS_MMIO_WRITE_VERTEX (vert1, 1);
+#undef LAST_VERTEX
+
+  /* debug
+  mEndPrimitive ();
+  WaitEngIdle(hwcx);  
+  d2f_once (ctx);
+  */
+}
+
+#define SIS_AGP_WRITE_VERTEX(v) \
+do{ \
+if(SIS_STEREO && hwcx->stereoEnabled) \
+{ \
+  AGP_CurrentPtr[0] = VB->Win.data[v][0] - 0.5 + STEREO_OFFSET(v); \
+} \
+else \
+{ \
+  AGP_CurrentPtr[0] = VB->Win.data[v][0] - 0.5; \
+} \
+AGP_CurrentPtr[1] = Y_FLIP (VB->Win.data[v][1]) + 0.5; \
+\
+if (ctx->TriangleCaps & DD_TRI_OFFSET){ \
+  if(SIS_TRI_FUNC){ \
+    AGP_CurrentPtr[2] = (VB->Win.data[v][2] + ctx->PolygonZoffset) / 65535.0; \
+  } \
+  else{ \
+    AGP_CurrentPtr[2] = (VB->Win.data[v][2] + ctx->LineZoffset) / 65535.0; \
+  } \
+} \
+else{ \
+  AGP_CurrentPtr[2] = VB->Win.data[v][2] / 65535.0; \
+}\
+AGP_CurrentPtr+=3; \
+if (SIS_STATES & (SIS_USE_W)) \
+{ \
+   if(VB->TexCoordPtr[1]->size == 4){ \
+     AGP_CurrentPtr[0] = VB->Win.data[v][3] * \
+                         VB->TexCoordPtr[0]->data[v][3]; \
+   } \
+   else{ \
+     AGP_CurrentPtr[0] = VB->Win.data[v][3]; \
+   } \
+   AGP_CurrentPtr+=1; \
+} \
+\
+if (SIS_STATES & (SIS_SMOOTH)) \
+{ \
+  RGBA8ConvertToBGRA8 (&dcSARGB, VB->ColorPtr->data[v]); \
+  ((DWORD *)AGP_CurrentPtr)[0] = dcSARGB; \
+} \
+else if(FIRST_VERTEX) \
+{ \
+  RGBA8ConvertToBGRA8 (&dcSARGB, VB->ColorPtr->data[pv]); \
+  ((DWORD *)AGP_CurrentPtr)[0] = dcSARGB; \
+} \
+else \
+{ \
+  ((DWORD *)AGP_CurrentPtr)[0] = dcSARGB; \
+} \
+AGP_CurrentPtr+=1; \
+\
+if (SIS_STATES & SIS_TEXTURE0) \
+{ \
+  if(VB->TexCoordPtr[0]->size == 4){ \
+    AGP_CurrentPtr[0] = VB->TexCoordPtr[0]->data[v][0] / \
+                        VB->TexCoordPtr[0]->data[v][3]; \
+    AGP_CurrentPtr[1] = VB->TexCoordPtr[0]->data[v][1] / \
+                        VB->TexCoordPtr[0]->data[v][3]; \
+  } \
+  else{ \
+    AGP_CurrentPtr[0] = VB->TexCoordPtr[0]->data[v][0]; \
+    AGP_CurrentPtr[1] = VB->TexCoordPtr[0]->data[v][1]; \
+  } \
+  AGP_CurrentPtr+=2; \
+} \
+\
+if (SIS_STATES & SIS_TEXTURE1) \
+{ \
+  if(VB->TexCoordPtr[1]->size == 4){ \
+    AGP_CurrentPtr[0] = VB->TexCoordPtr[1]->data[v][0] / \
+                        VB->TexCoordPtr[1]->data[v][3]; \
+    AGP_CurrentPtr[1] = VB->TexCoordPtr[1]->data[v][1] / \
+                        VB->TexCoordPtr[1]->data[v][3]; \
+  } \
+  else{ \
+    AGP_CurrentPtr[0] = VB->TexCoordPtr[1]->data[v][0]; \
+    AGP_CurrentPtr[1] = VB->TexCoordPtr[1]->data[v][1]; \
+  } \
+  AGP_CurrentPtr+=2; \
+} \
+}while(0)
+
+static void
+SIS_TAG (sis_agp_line) (GLcontext * ctx, GLuint vert0, GLuint vert1,
+			GLuint pv)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  struct vertex_buffer *VB = ctx->VB;
+
+  DWORD dcSARGB;
+
+  STEREO_SAMPLE(vert0);
+
+#if 0
+  if ((DWORD) AGP_CurrentPtr - (DWORD) AGP_StartPtr >= (AGP_ALLOC_SIZE - 0x10))
+    {
+      sis_FlushAGP (ctx);
+      sis_StartAGP (ctx);
+    }
+#endif
+
+#define FIRST_VERTEX 1
+  SIS_AGP_WRITE_VERTEX (vert0);
+#undef FIRST_VERTEX
+#define FIRST_VERTEX 0
+  SIS_AGP_WRITE_VERTEX (vert1);
+#undef FIRST_VERTEX
+}
+
+#undef SIS_TRI_FUNC
Index: xc/lib/GL/mesa/src/drv/sis/sis_lock.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_lock.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_lock.h	Fri Jun 30 12:30:24 2000
@@ -0,0 +1,102 @@
+#ifndef _sis_dri_h_
+#define _sis_dri_h_
+
+/* from tdfx */
+#define SIS_VALIDATE_DRAWABLE_INFO(dpy, psp, pdp)                       \
+do {                                                                    \
+    while (*(pdp->pStamp) != pdp->lastStamp) {                          \
+	DRM_SPINLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);     \
+	DRI_MESA_VALIDATE_DRAWABLE_INFO(dpy, psp->myNum, pdp);          \
+	DRM_SPINUNLOCK(&psp->pSAREA->drawable_lock, psp->drawLockID);   \
+        sis_SetDrawBuffer (ctx, ctx->Color.DriverDrawBuffer);           \
+    }                                                                   \
+} while (0)
+
+#ifdef DEBUG_LOCKING
+extern char *prevLockFile;
+extern int prevLockLine;
+#define DEBUG_LOCK() \
+  do { \
+    prevLockFile=(__FILE__); \
+    prevLockLine=(__LINE__); \
+  } while (0)
+#define DEBUG_RESET() \
+  do { \
+    prevLockFile=NULL; \
+    prevLockLine=0; \
+  } while (0)
+#define DEBUG_CHECK_LOCK() \
+  do { \
+      if(prevLockFile){ \
+        fprintf(stderr, "LOCK SET : %s:%d\n", __FILE__, __LINE__); \
+      } \
+  } while (0)
+#else
+#define DEBUG_LOCK()
+#define DEBUG_RESET()
+#define DEBUG_CHECK_LOCK()
+#endif
+
+#ifdef XFree86Server
+
+/* TODO, X-server will inform us if drawable state changed?  */
+#define LOCK_HARDWARE() \
+  do { \
+    mEndPrimitive(); \
+    sis_SetDrawBuffer (ctx, ctx->Color.DriverDrawBuffer); \
+    if(*(hwcx->CurrentHwcxPtr) != hwcx->serialNumber) \
+      sis_validate_all_state(hwcx); \
+  } while (0)
+
+#define UNLOCK_HARDWARE() \
+  do { \
+    mEndPrimitive(); \
+  } while (0)
+
+#else
+
+#define DRM_LIGHT_LOCK_RETURN(fd,lock,context,__ret)                   \
+	do {                                                           \
+		DRM_CAS(lock,context,DRM_LOCK_HELD|context,__ret);     \
+                if (__ret) drmGetLock(fd,context,0);                   \
+        } while(0)
+
+/* Lock the hardware using the global current context */
+#define LOCK_HARDWARE() \
+  do { \
+    int stamp; \
+    char __ret=0; \
+    __DRIdrawablePrivate *dPriv = xmesa->driContextPriv->driDrawablePriv; \
+    __DRIscreenPrivate *sPriv = dPriv->driScreenPriv; \
+    mEndPrimitive(); \
+    DEBUG_CHECK_LOCK(); \
+    DEBUG_LOCK(); \
+    DRM_LIGHT_LOCK_RETURN(sPriv->fd, &sPriv->pSAREA->lock, \
+		   dPriv->driContextPriv->hHWContext, __ret); \
+    stamp=dPriv->lastStamp; \
+    XMESA_VALIDATE_DRAWABLE_INFO(xmesa->display, sPriv, dPriv); \
+    if (*(dPriv->pStamp)!=stamp) \
+     { \
+       sis_SetDrawBuffer (ctx, ctx->Color.DriverDrawBuffer); \
+     } \
+    if(__ret && (*(hwcx->CurrentHwcxPtr) != hwcx->serialNumber)) \
+      { \
+        sis_validate_all_state(hwcx); \
+      } \
+  } while (0)
+
+/* Unlock the hardware using the global current context */
+#define UNLOCK_HARDWARE() \
+  do { \
+    __DRIdrawablePrivate *dPriv = xmesa->driContextPriv->driDrawablePriv; \
+    __DRIscreenPrivate *sPriv = dPriv->driScreenPriv; \
+    mEndPrimitive(); \
+    DEBUG_RESET(); \
+    *(hwcx->CurrentHwcxPtr) = hwcx->serialNumber; \
+    DRM_UNLOCK(sPriv->fd, &sPriv->pSAREA->lock, \
+	       dPriv->driContextPriv->hHWContext); \
+  } while (0)
+
+#endif
+
+#endif
Index: xc/lib/GL/mesa/src/drv/sis/sis_mesa.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_mesa.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_mesa.c	Fri Jun 30 12:30:24 2000
@@ -0,0 +1,1542 @@
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+#include "sis_lock.h"
+
+#include "state.h"
+
+void
+sis_RenderStart (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  LOCK_HARDWARE ();
+
+  if (hwcx->Primitive & hwcx->swRenderFlag)
+    {
+      WaitEngIdle (hwcx);
+    }
+
+  if (ctx->Texture.ReallyEnabled)
+    {
+      sis_validate_texture (ctx);
+      if (hwcx->swRenderFlag & SIS_SW_TEXTURE)
+        {
+          hwcx->swForceRender = GL_TRUE;
+          gl_update_state(ctx);
+          hwcx->swForceRender = GL_FALSE;
+        }
+      else
+        {
+          if (hwcx->GlobalFlag & GFLAG_TEXTURE_STATES)
+            sis_update_texture_state (hwcx);
+        }
+    }
+
+  if (hwcx->GlobalFlag & GFLAG_RENDER_STATES)
+    {
+      sis_update_render_state (hwcx, 0);
+    }
+
+  if (hwcx->UseAGPCmdMode)
+    {
+      sis_StartAGP (ctx);
+    }
+  
+   /* d2f_once (ctx); */
+}
+
+void
+sis_RenderFinish (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  if (hwcx->UseAGPCmdMode)
+    {
+      sis_FlushAGP (ctx);
+    }
+
+  UNLOCK_HARDWARE ();
+}
+
+void
+sis_ReducedPrimitiveChange (GLcontext * ctx, GLenum primitive)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  
+  /* it is possible several primitive types per VB */
+  if (hwcx->UseAGPCmdMode)
+    {
+      sis_FlushAGP (ctx);
+      sis_StartAGP (ctx);
+    }
+  else
+    {
+      mEndPrimitive();
+      
+      /* 
+       * do nothing now because each hw's primitive-type will be set 
+       * per primitive 
+       */
+      
+      /* TODO: if above rule changes, remember to modify */
+    }
+
+  hwcx->AGPParseSet &= ~0xf;
+  switch (primitive)
+    {
+    case GL_POINT:
+    case GL_POINTS:
+      hwcx->Primitive = SIS_SW_POINT;
+      hwcx->AGPParseSet |= 0x0;
+      break;
+    case GL_LINE:
+    case GL_LINES:
+      hwcx->Primitive = SIS_SW_LINE;
+      hwcx->AGPParseSet |= 0x4;
+      break;
+    case GL_POLYGON:
+      hwcx->Primitive = SIS_SW_TRIANGLE;
+      hwcx->AGPParseSet |= 0x8;
+      break;
+    }
+}
+
+void
+sis_init_driver (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  ctx->Driver.UpdateState = sis_UpdateState;
+
+  ctx->Driver.RenderStart = sis_RenderStart;
+  ctx->Driver.RenderFinish = sis_RenderFinish;
+  ctx->Driver.ReducedPrimitiveChange = sis_ReducedPrimitiveChange;
+  ctx->Driver.Finish = sis_Finish;
+  ctx->Driver.Flush = sis_Flush;
+
+  ctx->Driver.AlphaFunc = sis_AlphaFunc;
+  ctx->Driver.BlendEquation = sis_BlendEquation;
+  ctx->Driver.BlendFunc = sis_BlendFunc;
+  ctx->Driver.BlendFuncSeparate = sis_BlendFuncSeparate;
+  ctx->Driver.ClearDepth = sis_ClearDepth;
+  ctx->Driver.CullFace = sis_CullFace;
+  ctx->Driver.FrontFace = sis_FrontFace;
+  ctx->Driver.DepthFunc = sis_DepthFunc;
+  ctx->Driver.DepthMask = sis_DepthMask;
+  ctx->Driver.DepthRange = sis_DepthRange;
+  ctx->Driver.Enable = sis_Enable;
+  ctx->Driver.Fogfv = sis_Fogfv;
+  ctx->Driver.Hint = sis_Hint;
+  ctx->Driver.Lightfv = sis_Lightfv;
+  ctx->Driver.LightModelfv = sis_LightModelfv;
+  ctx->Driver.PolygonMode = sis_PolygonMode;
+  ctx->Driver.Scissor = sis_Scissor;
+  ctx->Driver.ShadeModel = sis_ShadeModel;
+  ctx->Driver.ClearStencil = sis_ClearStencil;
+  ctx->Driver.StencilFunc = sis_StencilFunc;
+  ctx->Driver.StencilMask = sis_StencilMask;
+  ctx->Driver.StencilOp = sis_StencilOp;
+  ctx->Driver.Viewport = sis_Viewport;
+
+  ctx->Driver.Clear = sis_Clear;
+
+  ctx->Driver.TexEnv = sis_TexEnv;
+  ctx->Driver.TexImage = sis_TexImage;
+  ctx->Driver.TexSubImage = sis_TexSubImage;
+  ctx->Driver.TexParameter = sis_TexParameter;
+  ctx->Driver.BindTexture = sis_BindTexture;
+  ctx->Driver.DeleteTexture = sis_DeleteTexture;
+  ctx->Driver.UpdateTexturePalette = sis_UpdateTexturePalette;
+  ctx->Driver.ActiveTexture = sis_ActiveTexture;
+  ctx->Driver.IsTextureResident = sis_IsTextureResident;
+  ctx->Driver.PrioritizeTexture = sis_PrioritizeTexture;
+
+  ctx->Driver.ClearColor = sis_ClearColor;
+  ctx->Driver.SetDrawBuffer = sis_SetDrawBuffer;
+  ctx->Driver.SetReadBuffer = sis_SetReadBuffer;
+  ctx->Driver.GetBufferSize = sis_GetBufferSize;
+  ctx->Driver.GetString = sis_GetString;
+  ctx->Driver.ColorMask = sis_ColorMask;
+  ctx->Driver.LogicOp = sis_LogicOp;
+  ctx->Driver.Dither = sis_Dither;
+  ctx->Driver.GetParameteri = sis_GetParameteri;
+  ctx->Driver.DrawPixels = sis_DrawPixels;
+  ctx->Driver.Bitmap = sis_Bitmap;
+  
+  /* Optimization */
+#if NOT_DONE
+  ctx->Driver.RasterSetup = sis_ChooseRasterSetupFunc(ctx);
+  ctx->Driver.RegisterVB = sis_RegisterVB;
+  ctx->Driver.UnregisterVB = sis_UnregisterVB;
+  ctx->Driver.ResetVB = sis_ResetVB;
+  ctx->Driver.ResetCvaVB = sis_ResetCvaVB;
+#endif
+
+ /* Fast Path */
+ ctx->Driver.RegisterPipelineStages = sis_RegisterPipelineStages;
+
+ /* driver-specific */
+ hwcx->SwapBuffers = sis_swap_buffers;
+
+#ifdef SIS_USE_HW_CULL
+  /* set capability flag */
+  ctx->Driver.TriangleCaps = DD_TRI_CULL;
+#endif
+}
+
+void
+sis_UpdateState (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  sis_set_render_func (ctx);
+
+  /* ?? duplicate in sis_Enable */
+  if (ctx->NewState & NEW_FOG)
+    {
+      if (ctx->RasterMask & FOG_BIT)
+	current->hwCapEnable |= MASK_FogEnable;
+      else
+	current->hwCapEnable &= ~MASK_FogEnable;
+    }
+
+  /* TODO: mesa->NewState. In sis_Enable? */
+  if (ctx->RasterMask & STENCIL_BIT)
+    {
+      current->hwCapEnable |=
+	(MASK_StencilTestEnable | MASK_StencilWriteEnable);
+    }
+  else
+    {
+      current->hwCapEnable &=
+	~(MASK_StencilTestEnable | MASK_StencilWriteEnable);
+    }
+
+  /* NEW_TEXTURE_ENABLE depends on glEnable() instead of ReallyEnabled */
+  /* if (ctx->NewState & NEW_TEXTURE_ENABLE) */
+  if(1)
+    {
+      if (ctx->Texture.ReallyEnabled &
+	  (TEXTURE0_1D | TEXTURE0_2D | TEXTURE1_1D | TEXTURE1_2D))
+	{
+	  current->hwCapEnable |= MASK_TextureEnable;
+
+	  current->hwCapEnable &= ~MASK_TextureNumUsed;
+	  if (ctx->Texture.ReallyEnabled & TEXTURE1_ANY)
+	    current->hwCapEnable |= 0x00002000;
+	  else
+	    current->hwCapEnable |= 0x00001000;
+	}
+      else
+	{
+	  current->hwCapEnable &= ~MASK_TextureEnable;
+	}
+
+#if 1
+    /* TODO : if unmark these, error in multitexture */
+    if(ctx->NewState & NEW_TEXTURE_ENABLE)
+      {
+	int i;
+	for (i = 0; i < SIS_MAX_TEXTURES; i++)
+	  {
+	    hwcx->TexStates[i] |= (NEW_TEXTURING | NEW_TEXTURE_ENV);
+	  }
+      }
+#endif
+    }
+
+  /* enable setting 1 */
+  if (current->hwCapEnable ^ prev->hwCapEnable)
+    {
+      prev->hwCapEnable = current->hwCapEnable;
+      hwcx->GlobalFlag |= GFLAG_ENABLESETTING;
+    }
+
+  /* enable setting 2 */
+  if (current->hwCapEnable2 ^ prev->hwCapEnable2)
+    {
+      prev->hwCapEnable2 = current->hwCapEnable2;
+      hwcx->GlobalFlag |= GFLAG_ENABLESETTING2;
+    }
+
+  /* TODO: if fog disable, don't check */
+  if (current->hwCapEnable & MASK_FogEnable)
+    {
+      /* fog setting */
+      if (current->hwFog ^ prev->hwFog)
+	{
+	  prev->hwFog = current->hwFog;
+	  hwcx->GlobalFlag |= GFLAG_FOGSETTING;
+	}
+      if (current->hwFogFar ^ prev->hwFogFar)
+	{
+	  prev->hwFogFar = current->hwFogFar;
+	  hwcx->GlobalFlag |= GFLAG_FOGSETTING;
+	}
+      if (current->hwFogInverse ^ prev->hwFogInverse)
+	{
+	  prev->hwFogInverse = current->hwFogInverse;
+	  hwcx->GlobalFlag |= GFLAG_FOGSETTING;
+	}
+      if (current->hwFogDensity ^ prev->hwFogDensity)
+	{
+	  prev->hwFogDensity = current->hwFogDensity;
+	  hwcx->GlobalFlag |= GFLAG_FOGSETTING;
+	}
+    }
+
+#if NOT_DONE
+  sis_set_render_vb_tabs(ctx);
+#endif
+
+  /* TODO: assume when isFullScreen/DrawBuffer changed, UpdateState 
+   *       will be called 
+   */
+#if SIS_STEREO
+  if(hwcx->isFullScreen && 
+     (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT) &&
+     hwcx->useStereo)
+  {
+    if(!hwcx->stereoEnabled){
+      sis_init_stereo(ctx);
+    }
+  }
+  else{
+    if(hwcx->stereoEnabled){
+      sis_final_stereo(ctx);
+    }    
+  }
+#endif
+  
+  /* TODO : 1. where to handle SIS_SW_TEXTURE?
+   *        2. sw<->hw
+   *        3. sw-render only if next primitve need to do
+   */
+}
+
+void
+sis_set_buffer_static (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  GLvisual *visual = ctx->Visual;
+
+  switch (hwcx->bytesPerPixel)
+    {
+    case 2:
+      /* TODO: don't check
+      if (hwcx->redMask == 0xf800 && hwcx->greenMask == 0x07e0 &&
+          hwcx->blueMask == 0x001f)
+      */
+      {
+	current->hwDstSet |= DST_FORMAT_RGB_565;
+      }
+      break;
+    case 4:
+      /*
+      if (hwcx->redMask == 0xff0000 && hwcx->greenMask == 0xff00 &&
+          hwcx->blueMask == 0xff)
+      */
+      {
+	switch (visual->AlphaBits)
+	  {
+	  case 0:
+	  case 1:
+	  case 2:
+	  case 4:
+	  case 8:
+	    /* TODO */
+	    current->hwDstSet |= DST_FORMAT_ARGB_8888;
+	    break;
+	  }
+      }
+      break;
+    default:
+      assert (0);
+    }
+
+  switch (visual->DepthBits)
+    {
+    case 0:
+      current->hwCapEnable &= ~MASK_ZWriteEnable;
+    case 16:
+      hwcx->zFormat = Z_16;
+      current->hwCapEnable |= MASK_ZWriteEnable;
+      break;
+    case 32:
+      hwcx->zFormat = Z_32;
+      current->hwCapEnable |= MASK_ZWriteEnable;
+      break;
+    case 24:
+      assert (visual->StencilBits);
+      hwcx->zFormat = S_8_Z_24;
+      current->hwCapEnable |= MASK_StencilBufferEnable;
+      current->hwCapEnable |= MASK_ZWriteEnable;
+      break;
+    }
+
+  current->hwZ &= ~MASK_ZBufferFormat;
+  current->hwZ |= hwcx->zFormat;
+
+  /* Destination Color Format */
+  if (current->hwDstSet ^ prev->hwDstSet)
+    {
+      prev->hwDstSet = current->hwDstSet;
+      hwcx->GlobalFlag |= GFLAG_DESTSETTING;
+    }
+
+  /* Z Buffer Data Format */
+  if (current->hwZ ^ prev->hwZ)
+    {
+      prev->hwZ = current->hwZ;
+      hwcx->GlobalFlag |= GFLAG_ZSETTING;
+    }
+
+  sis_sw_set_zfuncs_static (ctx);
+}
+
+void
+sis_Finish (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  sis_Flush (ctx);
+
+  WaitEngIdle (hwcx);
+}
+
+void
+sis_Flush (GLcontext * ctx)
+{
+  /* do nothing now */
+}
+
+void
+sis_AlphaFunc (GLcontext * ctx, GLenum func, GLclampf ref)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  /* TODO: ref is type GLclampf, but mesa has scaled it to 0 - 255.0 */
+  current->hwAlpha = ((unsigned char) ref) << 16;
+
+  /* Alpha Test function */
+  current->hwAlpha &= ~0x07000000;
+  switch (func)
+    {
+    case GL_NEVER:
+      current->hwAlpha |= SiS_ALPHA_NEVER;
+      break;
+    case GL_LESS:
+      current->hwAlpha |= SiS_ALPHA_LESS;
+      break;
+    case GL_EQUAL:
+      current->hwAlpha |= SiS_ALPHA_EQUAL;
+      break;
+    case GL_LEQUAL:
+      current->hwAlpha |= SiS_ALPHA_LEQUAL;
+      break;
+    case GL_GREATER:
+      current->hwAlpha |= SiS_ALPHA_GREATER;
+      break;
+    case GL_NOTEQUAL:
+      current->hwAlpha |= SiS_ALPHA_NOTEQUAL;
+      break;
+    case GL_GEQUAL:
+      current->hwAlpha |= SiS_ALPHA_GEQUAL;
+      break;
+    case GL_ALWAYS:
+      current->hwAlpha |= SiS_ALPHA_ALWAYS;
+      break;
+    }
+
+  prev->hwAlpha = current->hwAlpha;
+  hwcx->GlobalFlag |= GFLAG_ALPHASETTING;
+}
+
+void
+sis_BlendEquation (GLcontext * ctx, GLenum mode)
+{
+  /* version 1.2 specific */
+  /* TODO: 300 don't support, fall back? */
+}
+
+void
+sis_BlendFunc (GLcontext * ctx, GLenum sfactor, GLenum dfactor)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  /* TODO: in ICD, if no blend, it will reset these value */
+  /* blending enable */
+  current->hwDstSrcBlend = 0x10000;	/* Default destination alpha */
+
+  switch (dfactor)
+    {
+    case GL_ZERO:
+      current->hwDstSrcBlend |= SiS_D_ZERO;
+      break;
+    case GL_ONE:
+      current->hwDstSrcBlend |= SiS_D_ONE;
+      break;
+    case GL_SRC_COLOR:
+      current->hwDstSrcBlend |= SiS_D_SRC_COLOR;
+      break;
+    case GL_ONE_MINUS_SRC_COLOR:
+      current->hwDstSrcBlend |= SiS_D_ONE_MINUS_SRC_COLOR;
+      break;
+    case GL_SRC_ALPHA:
+      current->hwDstSrcBlend |= SiS_D_SRC_ALPHA;
+      break;
+    case GL_ONE_MINUS_SRC_ALPHA:
+      current->hwDstSrcBlend |= SiS_D_ONE_MINUS_SRC_ALPHA;
+      break;
+    case GL_DST_ALPHA:
+      current->hwDstSrcBlend |= SiS_D_DST_ALPHA;
+      break;
+    case GL_ONE_MINUS_DST_ALPHA:
+      current->hwDstSrcBlend |= SiS_D_ONE_MINUS_DST_ALPHA;
+      break;
+    }
+
+  switch (sfactor)
+    {
+    case GL_ZERO:
+      current->hwDstSrcBlend |= SiS_S_ZERO;
+      break;
+    case GL_ONE:
+      current->hwDstSrcBlend |= SiS_S_ONE;
+      break;
+    case GL_SRC_ALPHA:
+      current->hwDstSrcBlend |= SiS_S_SRC_ALPHA;
+      break;
+    case GL_ONE_MINUS_SRC_ALPHA:
+      current->hwDstSrcBlend |= SiS_S_ONE_MINUS_SRC_ALPHA;
+      break;
+    case GL_DST_ALPHA:
+      current->hwDstSrcBlend |= SiS_S_DST_ALPHA;
+      break;
+    case GL_ONE_MINUS_DST_ALPHA:
+      current->hwDstSrcBlend |= SiS_S_ONE_MINUS_DST_ALPHA;
+      break;
+    case GL_DST_COLOR:
+      current->hwDstSrcBlend |= SiS_S_DST_COLOR;
+      break;
+    case GL_ONE_MINUS_DST_COLOR:
+      current->hwDstSrcBlend |= SiS_S_ONE_MINUS_DST_COLOR;
+      break;
+    case GL_SRC_ALPHA_SATURATE:
+      current->hwDstSrcBlend |= SiS_S_SRC_ALPHA_SATURATE;
+      break;
+    }
+
+  if (current->hwDstSrcBlend ^ prev->hwDstSrcBlend)
+    {
+      prev->hwDstSrcBlend = current->hwDstSrcBlend;
+      hwcx->GlobalFlag |= GFLAG_DSTBLEND;
+    }
+}
+
+void
+sis_BlendFuncSeparate (GLcontext * ctx, GLenum sfactorRGB,
+		       GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA)
+{
+}
+
+void
+sis_CullFace (GLcontext * ctx, GLenum mode)
+{
+#ifdef SIS_USE_HW_CULL
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  hwcx->AGPParseSet &= ~0x00008000;
+  hwcx->dwPrimitiveSet &= ~0x08000000;
+  
+  /* TODO : GL_FRONT_AND_BACK must be handled elsewhere */
+  if((mode == GL_FRONT && ctx->Polygon.FrontFace == GL_CCW) ||
+     (mode == GL_BACK && ctx->Polygon.FrontFace == GL_CW))
+    {
+      hwcx->AGPParseSet |= 0x00008000;
+      hwcx->dwPrimitiveSet |= 0x08000000;
+    }
+#endif
+}
+
+void
+sis_FrontFace (GLcontext * ctx, GLenum mode)
+{
+#ifdef SIS_USE_HW_CULL
+  sis_CullFace (ctx, ctx->Polygon.CullFaceMode);
+#endif
+}
+
+void
+sis_DepthFunc (GLcontext * ctx, GLenum func)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  GLuint hwZFunc = 0;
+
+  switch (func)
+    {
+    case GL_LESS:
+      hwZFunc = SiS_Z_COMP_S_LT_B;
+      break;
+    case GL_GEQUAL:
+      hwZFunc = SiS_Z_COMP_S_GE_B;
+      break;
+    case GL_LEQUAL:
+      hwZFunc = SiS_Z_COMP_S_LE_B;
+      break;
+    case GL_GREATER:
+      hwZFunc = SiS_Z_COMP_S_GT_B;
+      break;
+    case GL_NOTEQUAL:
+      hwZFunc = SiS_Z_COMP_S_NE_B;
+      break;
+    case GL_EQUAL:
+      hwZFunc = SiS_Z_COMP_S_EQ_B;
+      break;
+    case GL_ALWAYS:
+      hwZFunc = SiS_Z_COMP_ALWAYS;
+      break;
+    case GL_NEVER:
+      hwZFunc = SiS_Z_COMP_NEVER;
+      break;
+    }
+  current->hwZ &= ~MASK_ZTestMode;
+  current->hwZ |= hwZFunc;
+
+  if (current->hwZ ^ prev->hwZ)
+    {
+      prev->hwZ = current->hwZ;
+
+      hwcx->GlobalFlag |= GFLAG_ZSETTING;
+    }
+}
+
+void
+sis_DepthMask (GLcontext * ctx, GLboolean flag)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  /* TODO, in xfree 3.9.18, no ctx->Buffer */
+  if (ctx->Visual->StencilBits)
+    {
+      if (flag || ctx->Stencil.WriteMask)
+	{
+	  current->hwCapEnable |= MASK_ZWriteEnable;
+	  if (flag && ctx->Stencil.WriteMask == 0xff)
+	    {
+	      current->hwCapEnable2 &= ~MASK_ZMaskWriteEnable;
+	    }
+	  else
+	    {
+	      current->hwCapEnable2 |= MASK_ZMaskWriteEnable;
+	      current->hwZMask = ((DWORD) ctx->Stencil.WriteMask << 24) |
+		((flag) ? 0x00ffffff : 0);
+
+	      if (current->hwZMask ^ prev->hwZMask)
+		{
+		  prev->hwZMask = current->hwZMask;
+		  hwcx->GlobalFlag |= GFLAG_ZSETTING;
+		}
+	    }
+	}
+      else
+	{
+	  current->hwCapEnable &= ~MASK_ZWriteEnable;
+	}
+    }
+  else
+    {
+      if (flag)
+	{
+	  current->hwCapEnable |= MASK_ZWriteEnable;
+	  current->hwCapEnable2 &= ~MASK_ZMaskWriteEnable;
+	}
+      else
+	{
+	  current->hwCapEnable &= ~MASK_ZWriteEnable;
+	}
+    }
+}
+
+void
+sis_DepthRange (GLcontext * ctx, GLclampd nearval, GLclampd farval)
+{
+  /* mesa handles it? */
+}
+
+void
+sis_Enable (GLcontext * ctx, GLenum cap, GLboolean state)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *current = &hwcx->current;
+
+  switch (cap)
+    {
+    case GL_ALPHA_TEST:
+      if (state)
+	{
+	  current->hwCapEnable |= MASK_AlphaTestEnable;
+	}
+      else
+	{
+	  current->hwCapEnable &= ~MASK_AlphaTestEnable;
+	}
+      break;
+/*
+    case GL_AUTO_NORMAL:
+      break;
+*/
+    case GL_BLEND:
+      /* TODO: */
+      if(state)
+      /* if (state & !ctx->Color.ColorLogicOpEnabled) */
+	{
+	  current->hwCapEnable |= MASK_BlendEnable;
+	}
+      else
+	{
+	  current->hwCapEnable &= ~MASK_BlendEnable;
+	}
+      break;
+/*
+    case GL_CLIP_PLANE0:
+    case GL_CLIP_PLANE1:
+    case GL_CLIP_PLANE2:
+    case GL_CLIP_PLANE3:
+    case GL_CLIP_PLANE4:
+    case GL_CLIP_PLANE5:
+      break;
+    case GL_COLOR_MATERIAL:
+      break;
+*/
+    case GL_CULL_FACE:
+#ifdef SIS_USE_HW_CULL
+      if (state)
+	{
+	  current->hwCapEnable |= MASK_CullEnable;
+	}
+      else
+	{
+	  current->hwCapEnable &= ~MASK_CullEnable;
+	}
+#endif
+      break;
+    case GL_DEPTH_TEST:
+      if (state && xmesa->xm_buffer->gl_buffer->DepthBuffer)
+	{
+	  current->hwCapEnable |= MASK_ZTestEnable;
+	}
+      else
+	{
+	  current->hwCapEnable &= ~MASK_ZTestEnable;
+	}
+      break;
+    case GL_DITHER:
+      if (state)
+	{
+	  current->hwCapEnable |= MASK_DitherEnable;
+	}
+      else
+	{
+	  current->hwCapEnable &= ~MASK_DitherEnable;
+	}
+      break;
+/*
+    case GL_FOG:
+      break;
+    case GL_LIGHT0:
+    case GL_LIGHT1:
+    case GL_LIGHT2:
+    case GL_LIGHT3:
+    case GL_LIGHT4:
+    case GL_LIGHT5:
+    case GL_LIGHT6:
+    case GL_LIGHT7:
+      break;
+    case GL_LIGHTING:
+      break;
+    case GL_LINE_SMOOTH:
+      break;
+    case GL_LINE_STIPPLE:
+      break;
+    case GL_INDEX_LOGIC_OP:
+      break;
+*/
+    case GL_COLOR_LOGIC_OP:
+      if (state)
+	{
+	  sis_LogicOp (ctx, ctx->Color.LogicOp);
+	}
+      else
+	{
+	  sis_LogicOp (ctx, GL_COPY);
+	}
+      break;
+/*
+    case GL_MAP1_COLOR_4:
+      break;
+    case GL_MAP1_INDEX:
+      break;
+    case GL_MAP1_NORMAL:
+      break;
+    case GL_MAP1_TEXTURE_COORD_1:
+      break;
+    case GL_MAP1_TEXTURE_COORD_2:
+      break;
+    case GL_MAP1_TEXTURE_COORD_3:
+      break;
+    case GL_MAP1_TEXTURE_COORD_4:
+      break;
+    case GL_MAP1_VERTEX_3:
+      break;
+    case GL_MAP1_VERTEX_4:
+      break;
+    case GL_MAP2_COLOR_4:
+      break;
+    case GL_MAP2_INDEX:
+      break;
+    case GL_MAP2_NORMAL:
+      break;
+    case GL_MAP2_TEXTURE_COORD_1:
+      break;
+    case GL_MAP2_TEXTURE_COORD_2:
+      break;
+    case GL_MAP2_TEXTURE_COORD_3:
+      break;
+    case GL_MAP2_TEXTURE_COORD_4:
+      break;
+    case GL_MAP2_VERTEX_3:
+      break;
+    case GL_MAP2_VERTEX_4:
+      break;
+    case GL_NORMALIZE:
+      break;
+    case GL_POINT_SMOOTH:
+      break;
+    case GL_POLYGON_SMOOTH:
+      break;
+    case GL_POLYGON_STIPPLE:
+      break;
+    case GL_POLYGON_OFFSET_POINT:
+      break;
+    case GL_POLYGON_OFFSET_LINE:
+      break;
+    case GL_POLYGON_OFFSET_FILL:
+    case GL_POLYGON_OFFSET_EXT:
+     break;
+    case GL_RESCALE_NORMAL_EXT:
+      break;
+*/
+    case GL_SCISSOR_TEST:
+      sis_set_scissor (ctx);
+      break;
+/*
+    case GL_SHARED_TEXTURE_PALETTE_EXT:
+      break;
+*/
+    case GL_STENCIL_TEST:
+      if (state)
+	{
+	  current->hwCapEnable |= (MASK_StencilTestEnable |
+				   MASK_StencilWriteEnable);
+	}
+      else
+	{
+	  current->hwCapEnable &= ~(MASK_StencilTestEnable |
+				    MASK_StencilWriteEnable);
+	}
+      break;
+/*
+    case GL_TEXTURE_1D:
+    case GL_TEXTURE_2D:
+    case GL_TEXTURE_3D:
+      break;
+    case GL_TEXTURE_GEN_Q:
+      break;
+    case GL_TEXTURE_GEN_R:
+      break;
+    case GL_TEXTURE_GEN_S:
+      break;
+    case GL_TEXTURE_GEN_T:
+      break;
+
+    case GL_VERTEX_ARRAY:
+      break;
+    case GL_NORMAL_ARRAY:
+      break;
+    case GL_COLOR_ARRAY:
+      break;
+    case GL_INDEX_ARRAY:
+      break;
+    case GL_TEXTURE_COORD_ARRAY:
+      break;
+    case GL_EDGE_FLAG_ARRAY:
+      break;
+*/
+    }
+}
+
+void
+sis_Hint (GLcontext * ctx, GLenum target, GLenum mode)
+{
+#if 0
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  __GLSiSHardware *current = &hwcx->current;
+#endif
+
+  switch (target)
+    {
+    case GL_FOG_HINT:
+      switch (mode)
+	{
+	case GL_DONT_CARE:
+	  break;
+	case GL_FASTEST:
+	  /* vertex fog */
+	  /* TODO */
+	  break;
+	case GL_NICEST:
+	  /* pixel fog */
+	  break;
+	}
+      break;
+    case GL_LINE_SMOOTH_HINT:
+      break;
+    case GL_PERSPECTIVE_CORRECTION_HINT:
+#if 0
+      if (mode == GL_NICEST)
+	current->hwCapEnable |= MASK_TexturePerspectiveEnable;
+      else if (!(ctx->RasterMask & FOG_BIT))
+	current->hwCapEnable &= ~MASK_TexturePerspectiveEnable;
+#endif
+      break;
+    case GL_POINT_SMOOTH_HINT:
+      break;
+    case GL_POLYGON_SMOOTH_HINT:
+      break;
+    }
+}
+
+void
+sis_Lightfv (GLcontext * ctx, GLenum light,
+	     GLenum pname, const GLfloat * params, GLint nparams)
+{
+}
+
+void
+sis_LightModelfv (GLcontext * ctx, GLenum pname, const GLfloat * params)
+{
+}
+
+void
+sis_PolygonMode (GLcontext * ctx, GLenum face, GLenum mode)
+{
+}
+
+void
+sis_Scissor (GLcontext * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
+{
+  if (ctx->Scissor.Enabled)
+    sis_set_scissor (ctx);
+}
+
+void
+sis_ShadeModel (GLcontext * ctx, GLenum mode)
+{
+}
+
+void
+sis_Viewport (GLcontext * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
+{
+}
+
+void
+sis_ClearColor (GLcontext * ctx, GLubyte red, GLubyte green,
+		GLubyte blue, GLubyte alpha)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  set_color_pattern (hwcx, red, green, blue, alpha);
+
+}
+
+/* TODO */
+void
+sis_ClearIndex (GLcontext * ctx, GLuint index)
+{
+}
+
+void sis_set_render_pos(GLcontext * ctx, GLubyte *base, GLuint pitch)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  assert (base != NULL);
+
+  if (SIS_VERBOSE&VERBOSE_SIS_BUFFER){
+    fprintf(stderr, "set drawing position: base=%x, pitch=%u\n", 
+            (unsigned int)base, pitch);
+  }
+
+  /* software render */
+  hwcx->swRenderBase = base;
+  hwcx->swRenderPitch = pitch;
+
+  current->hwOffsetDest = ((DWORD) base - (DWORD) GET_FbBase (hwcx)) >> 1;
+  current->hwDstSet &= ~MASK_DstBufferPitch;
+  current->hwDstSet |= pitch >> 2;
+
+  /* destination setting */
+  if (current->hwDstSet ^ prev->hwDstSet)
+    {
+      prev->hwDstSet = current->hwDstSet;
+      hwcx->GlobalFlag |= GFLAG_DESTSETTING;
+    }
+
+  if (current->hwOffsetDest ^ prev->hwOffsetDest)
+    {
+      prev->hwOffsetDest = current->hwOffsetDest;
+      hwcx->GlobalFlag |= GFLAG_DESTSETTING;
+    }
+}
+
+GLboolean
+sis_SetDrawBuffer (GLcontext * ctx, GLenum mode)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  XMesaBuffer xm_buffer = xmesa->xm_buffer;
+  GLubyte *base;
+  GLuint pitch;
+  GLboolean retval = GL_FALSE;
+
+  /* if new context bind, the function will be call? */
+  switch (mode)
+    {
+    case GL_BACK_LEFT:	  
+      base = (GLubyte *) xm_buffer->backimage->data;
+      pitch = xm_buffer->backimage->bytes_per_line;
+            
+      retval = GL_TRUE;
+      break;
+    case GL_FRONT_LEFT:
+      base = sis_get_drawable_pos (xmesa);
+      pitch = GET_PITCH (hwcx);
+      retval = GL_TRUE;
+      break;
+    case GL_BACK_RIGHT:
+    case GL_FRONT_RIGHT:
+    default:
+      assert (0);
+      return GL_FALSE;
+    }
+
+  sis_set_render_pos(ctx, base, pitch);
+  
+  return retval;
+}
+
+void
+sis_SetReadBuffer (GLcontext *ctx, GLframebuffer *colorBuffer,
+                        GLenum buffer)
+{
+  /* TODO */
+}                        
+
+GLboolean
+sis_ColorMask (GLcontext * ctx,
+	       GLboolean rmask, GLboolean gmask,
+	       GLboolean bmask, GLboolean amask)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+
+  if (rmask & gmask & bmask &
+      (!xmesa->xm_visual->gl_visual->AlphaBits | amask))
+    {
+      current->hwCapEnable2 &= ~(MASK_AlphaMaskWriteEnable |
+				 MASK_ColorMaskWriteEnable);
+    }
+  else
+    {
+      current->hwCapEnable2 |= (MASK_AlphaMaskWriteEnable |
+				MASK_ColorMaskWriteEnable);
+
+      current->hwDstMask = (rmask) ? GET_RMASK (hwcx) : 0 |
+	                   (gmask) ? GET_GMASK (hwcx) : 0 |
+	                   (bmask) ? GET_BMASK (hwcx) : 0 | 
+	                   (amask) ? GET_AMASK (hwcx) : 0;
+    }
+
+  if (current->hwDstMask ^ prev->hwDstMask)
+    {
+      prev->hwDstMask = current->hwDstMask;
+      hwcx->GlobalFlag |= GFLAG_DESTSETTING;
+    }
+
+  return GL_TRUE;
+}
+
+GLboolean
+sis_LogicOp (GLcontext * ctx, GLenum op)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  if (ctx->Color.ColorLogicOpEnabled)
+    {
+      current->hwDstSet &= ~MASK_ROP2;
+      switch (op)
+	{
+	case GL_CLEAR:
+	  current->hwDstSet |= LOP_CLEAR;
+	  break;
+	case GL_SET:
+	  current->hwDstSet |= LOP_SET;
+	  break;
+	case GL_COPY:
+	  current->hwDstSet |= LOP_COPY;
+	  break;
+	case GL_COPY_INVERTED:
+	  current->hwDstSet |= LOP_COPY_INVERTED;
+	  break;
+	case GL_NOOP:
+	  current->hwDstSet |= LOP_NOOP;
+	  break;
+	case GL_INVERT:
+	  current->hwDstSet |= LOP_INVERT;
+	  break;
+	case GL_AND:
+	  current->hwDstSet |= LOP_AND;
+	  break;
+	case GL_NAND:
+	  current->hwDstSet |= LOP_NAND;
+	  break;
+	case GL_OR:
+	  current->hwDstSet |= LOP_OR;
+	  break;
+	case GL_NOR:
+	  current->hwDstSet |= LOP_NOR;
+	  break;
+	case GL_XOR:
+	  current->hwDstSet |= LOP_XOR;
+	  break;
+	case GL_EQUIV:
+	  current->hwDstSet |= LOP_EQUIV;
+	  break;
+	case GL_AND_REVERSE:
+	  current->hwDstSet |= LOP_AND_REVERSE;
+	  break;
+	case GL_AND_INVERTED:
+	  current->hwDstSet |= LOP_AND_INVERTED;
+	  break;
+	case GL_OR_REVERSE:
+	  current->hwDstSet |= LOP_OR_REVERSE;
+	  break;
+	case GL_OR_INVERTED:
+	  current->hwDstSet |= LOP_OR_INVERTED;
+	  break;
+	}
+
+      if (current->hwDstSet ^ prev->hwDstSet)
+	{
+	  prev->hwDstSet = current->hwDstSet;
+	  hwcx->GlobalFlag |= GFLAG_DESTSETTING;
+	}
+    }
+  return GL_TRUE;
+}
+
+void
+sis_Dither (GLcontext * ctx, GLboolean enable)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *current = &hwcx->current;
+
+  if (enable)
+    {
+      current->hwCapEnable |= MASK_DitherEnable;
+    }
+  else
+    {
+      current->hwCapEnable &= ~MASK_DitherEnable;
+    }
+}
+
+GLint
+sis_GetParameteri (const GLcontext * ctx, GLint param)
+{
+  switch (param)
+    {
+    case DD_HAVE_HARDWARE_FOG:
+      /* 
+       * fragment fogging is not free when compared with hardware 
+       * vertex fogging because of the overhead of W
+       */
+      return 0;
+/*
+    case DD_MAX_TEXTURE_SIZE:
+      return SIS_MAX_TEXTURE_SIZE;
+    case DD_MAX_TEXTURES:
+      return SIS_MAX_TEXTURES;
+*/
+    }
+  return 0;
+}
+
+/* just sync between CPU and rendering-engine */
+GLboolean sis_DrawPixels (GLcontext * ctx,
+			  GLint x, GLint y, GLsizei width, GLsizei height,
+			  GLenum format, GLenum type,
+			  const struct gl_pixelstore_attrib *unpack,
+			  const GLvoid * pixels)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  WaitEngIdle (hwcx);
+  return 0;
+}
+
+GLboolean sis_Bitmap (GLcontext * ctx,
+		      GLint x, GLint y, GLsizei width, GLsizei height,
+		      const struct gl_pixelstore_attrib *unpack,
+		      const GLubyte * bitmap)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  ctx->Driver.RenderStart( ctx );  
+  
+  WaitEngIdle (hwcx);
+  /* TODO: use tdfx's Bitmap */
+
+  ctx->Driver.RenderFinish( ctx );
+
+  return 0;		      
+}
+
+void
+set_color_pattern (__GLSiScontext * hwcx, GLubyte red, GLubyte green,
+		   GLubyte blue, GLubyte alpha)
+{
+  /* XXX only RGB565 and ARGB8888 */
+  switch (GET_ColorFormat (hwcx))
+    {
+    case DST_FORMAT_ARGB_8888:
+      hwcx->clearColorPattern = (alpha << 24) +
+	(red << 16) + (green << 8) + (blue);
+      break;
+    case DST_FORMAT_RGB_565:
+      hwcx->clearColorPattern = ((red >> 3) << 11) +
+	((green >> 2) << 5) + (blue >> 3);
+      hwcx->clearColorPattern |= hwcx->clearColorPattern << 16;
+      break;
+    default:
+      assert (0);
+    }
+}
+
+void
+set_z_stencil_pattern (__GLSiScontext * hwcx, GLclampd z, int stencil)
+{
+  GLuint zPattern, stencilPattern;
+  GLboolean dword_pattern;
+
+  if (z <= (float) 0.0)
+    zPattern = 0x0;
+  else if (z >= (float) 1.0)
+    zPattern = 0xFFFFFFFF;
+  else
+    zPattern = doFPtoFixedNoRound (*(DWORD *) & z, 32);
+
+  stencilPattern = 0;
+
+  switch (hwcx->zFormat)
+    {
+    case Z_16:
+      zPattern = zPattern >> 16;
+      zPattern &= 0x0000FFFF;
+      dword_pattern = GL_FALSE;
+      break;
+    case S_8_Z_24:
+      zPattern = zPattern >> 8;
+      zPattern &= 0x00FFFFFF;
+      stencilPattern = (stencilPattern << 24);
+      dword_pattern = GL_TRUE;
+      break;
+    case Z_32:
+      dword_pattern = GL_TRUE;
+      break;
+    default:
+      assert (0);
+    }
+  hwcx->clearZStencilPattern = zPattern | stencilPattern;
+  /* ?? */
+  if (!dword_pattern)
+    hwcx->clearZStencilPattern |= (zPattern | stencilPattern) << 16;
+}
+
+void 
+sis_update_drawable_state (GLcontext * ctx)
+{
+  const XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *current = &hwcx->current;
+  __GLSiSHardware *prev = &hwcx->prev;
+
+  XMesaBuffer xm_buffer = xmesa->xm_buffer;
+  GLuint z_depth;  
+
+  sis_SetDrawBuffer (ctx, ctx->Color.DriverDrawBuffer);
+  /* TODO: call sis_SetReadBuffer? */
+
+  switch (hwcx->zFormat)
+    {
+      case Z_16:
+        z_depth = 2;
+	break;
+      case Z_32:
+      case S_8_Z_24:
+	z_depth = 4;
+	break;
+      default:
+	assert (0);
+    }
+
+  current->hwZ &= ~MASK_ZBufferPitch;
+  current->hwZ |= xm_buffer->width * z_depth >> 2;
+  /* TODO, in xfree 3.9.18, no ctx->Buffer */
+  current->hwOffsetZ = ((DWORD) (ctx->DrawBuffer->DepthBuffer) -
+		       (DWORD) GET_FbBase (hwcx)) >> 2;
+
+  if ((current->hwOffsetZ ^ prev->hwOffsetZ)
+      || (current->hwZ ^ prev->hwZ))
+    {
+      prev->hwOffsetZ = current->hwOffsetZ;
+      prev->hwZ = current->hwZ;
+
+      /* Z setting */
+      hwcx->GlobalFlag |= GFLAG_ZSETTING;
+    }
+}
+
+void
+sis_GetBufferSize (GLcontext * ctx, GLuint * width, GLuint * height)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *current = &hwcx->current;
+  __GLSiSHardware *prev = &hwcx->prev;
+
+  GLuint winwidth, winheight;
+  XMesaBuffer xm_buffer = xmesa->xm_buffer;
+
+#ifndef XFree86Server
+  SIS_VALIDATE_DRAWABLE_INFO (xmesa->display, 
+                              xmesa->driContextPriv->driScreenPriv, 
+                              xmesa->driContextPriv->driDrawablePriv);
+#endif
+  sis_get_drawable_size (xmesa, &winwidth, &winheight);
+
+  *width = winwidth;
+  *height = winheight;
+
+  if (winwidth != xm_buffer->width || winheight != xm_buffer->height)
+    {
+      GLuint z_depth;
+
+      if (SIS_VERBOSE&VERBOSE_SIS_BUFFER)
+      {
+        fprintf(stderr, "GetBufferSize: before=(%d,%d), after=(%d,%d)\n",
+                xm_buffer->width, xm_buffer->height, winwidth, winheight);
+      }
+      
+      xm_buffer->width = winwidth;
+      xm_buffer->height = winheight;
+      
+      /* update hwcx->isFullScreen */
+      /* TODO: Does X-server have exclusive-mode? */      
+      /* TODO: physical screen width/height will be changed dynamicly */
+
+#if SIS_STEREO
+      if((hwcx->virtualX == winwidth) && (hwcx->virtualY == winheight))
+        hwcx->isFullScreen = GL_TRUE;
+      else        
+        hwcx->isFullScreen = GL_FALSE;
+#endif
+
+      if (xm_buffer->db_state)
+	{
+          sisBufferInfo *priv = (sisBufferInfo *) xm_buffer->private;
+	  
+	  sis_alloc_back_image (ctx, xm_buffer->backimage, &priv->bbFree,
+	                        &priv->cbClearPacket);
+	}
+
+      if (xm_buffer->xm_visual->gl_visual->DepthBits)
+	sis_alloc_z_stencil_buffer (ctx);
+
+      switch (hwcx->zFormat)
+	{
+	case Z_16:
+	  z_depth = 2;
+	  break;
+	case Z_32:
+	case S_8_Z_24:
+	  z_depth = 4;
+	  break;
+	default:
+	  assert (0);
+	}
+
+      sis_SetDrawBuffer (ctx, ctx->Color.DriverDrawBuffer);
+      /* TODO: call sis_SetReadBuffer? */
+
+      current->hwZ &= ~MASK_ZBufferPitch;
+      current->hwZ |= xm_buffer->width * z_depth >> 2;
+      /* TODO, in xfree 3.9.18, no ctx->Buffer */
+      current->hwOffsetZ = ((DWORD) (ctx->DrawBuffer->DepthBuffer) -
+			    (DWORD) GET_FbBase (hwcx)) >> 2;
+
+      if ((current->hwOffsetZ ^ prev->hwOffsetZ)
+	  || (current->hwZ ^ prev->hwZ))
+	{
+	  prev->hwOffsetZ = current->hwOffsetZ;
+	  prev->hwZ = current->hwZ;
+
+	  /* Z setting */
+	  hwcx->GlobalFlag |= GFLAG_ZSETTING;
+	}
+    }
+
+  /* Needed by Y_FLIP macro */
+  xm_buffer->bottom = (int) winheight - 1;
+
+  sis_set_scissor (ctx);
+}
+
+const GLubyte *
+sis_GetString (GLcontext * ctx, GLenum name)
+{
+  (void) ctx;  
+
+  switch (name)
+    {
+    case GL_RENDERER:
+#ifdef XFree86Server
+      return (GLubyte *)"SIS 300/630/530 IR Mode";
+#else
+      return (GLubyte *)"SiS 300/630/530 DR Mode";
+#endif
+    default:
+      return NULL;
+    }
+}
+
+const char *
+sis_ExtensionString (GLcontext * ctx)
+{
+  return NULL;
+}
+
+void
+sis_set_scissor (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  GLint x1, y1, x2, y2;
+
+  /* ?? from context.c, do it 2 times */
+
+  x1 = 0;
+  y1 = 0;
+  x2 = xmesa->xm_buffer->width - 1;
+  y2 = xmesa->xm_buffer->height - 1;
+
+  if (ctx->Scissor.Enabled)
+    {
+      if (ctx->Scissor.X > x1)
+	{
+	  x1 = ctx->Scissor.X;
+	}
+      if (ctx->Scissor.Y > y1)
+	{
+	  y1 = ctx->Scissor.Y;
+	}
+      if (ctx->Scissor.X + ctx->Scissor.Width - 1 < x2)
+	{
+	  x2 = ctx->Scissor.X + ctx->Scissor.Width - 1;
+	}
+      if (ctx->Scissor.Y + ctx->Scissor.Height - 1 < y2)
+	{
+	  y2 = ctx->Scissor.Y + ctx->Scissor.Height - 1;
+	}
+    }
+
+  y1 = Y_FLIP (y1);
+  y2 = Y_FLIP (y2);
+
+  current->clipTopBottom = (y2 << 13) | y1;
+  current->clipLeftRight = (x1 << 13) | x2;
+
+  if ((current->clipTopBottom ^ prev->clipTopBottom) ||
+      (current->clipLeftRight ^ prev->clipLeftRight))
+    {
+      prev->clipTopBottom = current->clipTopBottom;
+      prev->clipLeftRight = current->clipLeftRight;
+      hwcx->GlobalFlag |= GFLAG_CLIPPING;
+    }
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_mesa.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_mesa.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_mesa.h	Fri Jun 30 12:30:25 2000
@@ -0,0 +1,201 @@
+#ifndef _sis_mesa_h_
+#define _sis_mesa_h_
+
+void sis_UpdateState (GLcontext * ctx);
+void sis_ClearIndex (GLcontext * ctx, GLuint index);
+void sis_ClearColor (GLcontext * ctx, GLubyte red, GLubyte green,
+		     GLubyte blue, GLubyte alpha);
+GLbitfield sis_Clear (GLcontext * ctx, GLbitfield mask, GLboolean all,
+		      GLint x, GLint y, GLint width, GLint height);
+GLboolean sis_SetDrawBuffer (GLcontext * ctx, GLenum mode);
+void sis_SetReadBuffer (GLcontext *ctx, GLframebuffer *colorBuffer,
+                        GLenum buffer);
+void sis_GetBufferSize (GLcontext * ctx, GLuint * width, GLuint * height);
+const char *sis_ExtensionString (GLcontext * ctx);
+const GLubyte *sis_GetString (GLcontext * ctx, GLenum name);
+void sis_Finish (GLcontext * ctx);
+void sis_Flush (GLcontext * ctx);
+GLboolean sis_IndexMask (GLcontext * ctx, GLuint mask);
+GLboolean sis_ColorMask (GLcontext * ctx,
+			 GLboolean rmask, GLboolean gmask,
+			 GLboolean bmask, GLboolean amask);
+GLboolean sis_LogicOp (GLcontext * ctx, GLenum op);
+void sis_Dither (GLcontext * ctx, GLboolean enable);
+void sis_Error (GLcontext * ctx);
+void sis_NearFar (GLcontext * ctx, GLfloat nearVal, GLfloat farVal);
+GLint sis_GetParameteri (const GLcontext * ctx, GLint param);
+GLboolean sis_DrawPixels (GLcontext * ctx,
+			  GLint x, GLint y, GLsizei width, GLsizei height,
+			  GLenum format, GLenum type,
+			  const struct gl_pixelstore_attrib *unpack,
+			  const GLvoid * pixels);
+GLboolean sis_Bitmap (GLcontext * ctx,
+		      GLint x, GLint y, GLsizei width, GLsizei height,
+		      const struct gl_pixelstore_attrib *unpack,
+		      const GLubyte * bitmap);
+void sis_RenderStart (GLcontext * ctx);
+void sis_RenderFinish (GLcontext * ctx);
+
+typedef void (*sis_setup_func_t)(struct vertex_buffer *, GLuint, GLuint);
+sis_setup_func_t sis_ChooseRasterSetupFunc (GLcontext * ctx);
+
+void sis_ReducedPrimitiveChange (GLcontext * ctx, GLenum primitive);
+GLboolean sis_MultipassFunc (struct vertex_buffer *VB, GLuint passno);
+
+/* 
+ * Texture
+ */
+void sis_validate_texture (GLcontext * ctx);
+
+void sis_TexEnv( GLcontext *ctx, GLenum target, GLenum pname, 
+                 const GLfloat *param );
+
+void sis_TexImage (GLcontext * ctx, GLenum target,
+		   struct gl_texture_object *tObj, GLint level,
+		   GLint internalFormat,
+		   const struct gl_texture_image *image);
+
+void sis_TexSubImage (GLcontext * ctx, GLenum target,
+		      struct gl_texture_object *tObj, GLint level,
+		      GLint xoffset, GLint yoffset,
+		      GLsizei width, GLsizei height,
+		      GLint internalFormat,
+		      const struct gl_texture_image *image);
+
+void sis_TexParameter (GLcontext * ctx, GLenum target,
+		       struct gl_texture_object *tObj,
+		       GLenum pname, const GLfloat * params);
+
+void sis_BindTexture (GLcontext * ctx, GLenum target,
+		      struct gl_texture_object *tObj);
+
+void sis_DeleteTexture (GLcontext * ctx, struct gl_texture_object *tObj);
+
+void sis_UpdateTexturePalette (GLcontext * ctx,
+			       struct gl_texture_object *tObj);
+
+void sis_UseGlobalTexturePalette (GLcontext * ctx, GLboolean state);
+
+void sis_ActiveTexture (GLcontext * ctx, GLuint texUnitNumber);
+
+GLboolean sis_IsTextureResident (GLcontext * ctx,
+				 struct gl_texture_object *t);
+void sis_PrioritizeTexture (GLcontext * ctx,
+			    struct gl_texture_object *t, GLclampf priority);
+
+/* 
+ * Optimization
+ */
+void sis_RegisterVB (struct vertex_buffer *VB);
+void sis_UnregisterVB (struct vertex_buffer *VB);
+void sis_ResetVB (struct vertex_buffer *VB);
+void sis_ResetCvaVB (struct vertex_buffer *VB, GLuint stages);
+GLuint sis_RegisterPipelineStages (struct gl_pipeline_stage *out,
+				   const struct gl_pipeline_stage *in,
+				   GLuint nr);
+GLboolean sis_BuildPrecalcPipeline (GLcontext * ctx);
+GLboolean sis_BuildEltPipeline (GLcontext * ctx);
+void sis_OptimizePrecalcPipeline (GLcontext * ctx, struct gl_pipeline *pipe);
+void sis_OptimizeImmediatePipeline (GLcontext * ctx,
+				    struct gl_pipeline *pipe);
+
+/* 
+ * State-Change
+ */
+void sis_AlphaFunc (GLcontext * ctx, GLenum func, GLclampf ref);
+void sis_BlendEquation (GLcontext * ctx, GLenum mode);
+void sis_BlendFunc (GLcontext * ctx, GLenum sfactor, GLenum dfactor);
+void sis_BlendFuncSeparate (GLcontext * ctx, GLenum sfactorRGB,
+			    GLenum dfactorRGB, GLenum sfactorA,
+			    GLenum dfactorA);
+void sis_ClearDepth (GLcontext * ctx, GLclampd d);
+void sis_CullFace (GLcontext * ctx, GLenum mode);
+void sis_FrontFace (GLcontext * ctx, GLenum mode);
+void sis_DepthFunc (GLcontext * ctx, GLenum func);
+void sis_DepthMask (GLcontext * ctx, GLboolean flag);
+void sis_DepthRange (GLcontext * ctx, GLclampd nearval, GLclampd farval);
+void sis_Enable (GLcontext * ctx, GLenum cap, GLboolean state);
+void sis_Fogfv (GLcontext * ctx, GLenum pname, const GLfloat * params);
+void sis_Hint (GLcontext * ctx, GLenum target, GLenum mode);
+void sis_Lightfv (GLcontext * ctx, GLenum light,
+		  GLenum pname, const GLfloat * params, GLint nparams);
+void sis_LightModelfv (GLcontext * ctx, GLenum pname, const GLfloat * params);
+void sis_PolygonMode (GLcontext * ctx, GLenum face, GLenum mode);
+void sis_Scissor (GLcontext * ctx, GLint x, GLint y, GLsizei w, GLsizei h);
+void sis_ShadeModel (GLcontext * ctx, GLenum mode);
+void sis_ClearStencil (GLcontext * ctx, GLint s);
+void sis_StencilFunc (GLcontext * ctx, GLenum func, GLint ref, GLuint mask);
+void sis_StencilMask (GLcontext * ctx, GLuint mask);
+void sis_StencilOp (GLcontext * ctx, GLenum fail, GLenum zfail, GLenum zpass);
+void sis_Viewport (GLcontext * ctx, GLint x, GLint y, GLsizei w, GLsizei h);
+
+/* 
+ * Buffer Allocation
+ */
+void sis_alloc_z_stencil_buffer (GLcontext * ctx);
+void sis_free_z_stencil_buffer (XMesaBuffer buf);
+void sis_alloc_back_image (GLcontext * ctx, XMesaImage *image, void **free,
+                           ENGPACKET *packet);
+void sis_free_back_image (XMesaBuffer buf, XMesaImage *image, void *free);
+void sis_alloc_texture_image (GLcontext * ctx, GLtextureImage * image);
+void sis_free_texture_image (GLtextureImage * image);
+
+/* 
+ * Raster-Function Picker
+ */
+void sis_set_render_func (GLcontext * ctx);
+
+/* 
+ * VB Rendering Function
+ */
+void sis_init_vbrender (void);
+void sis_set_render_vb_tabs (GLcontext * ctx);
+ 
+/* 
+ * Local
+ */
+void set_color_pattern (__GLSiScontext * hwcx, GLubyte red, GLubyte green,
+			GLubyte blue, GLubyte alpha);
+
+void set_z_stencil_pattern (__GLSiScontext * hwcx, GLclampd z, int stencil);
+
+void sis_init_driver (GLcontext * ctx);
+void sis_sw_init_driver (GLcontext * ctx);
+void sis_sw_set_zfuncs_static (GLcontext * ctx);
+
+void WaitEngIdle (__GLSiScontext * hwcx);
+void Wait2DEngIdle (__GLSiScontext * hwcx);
+
+void sis_set_buffer_static (GLcontext * ctx);
+void sis_set_render_pos(GLcontext * ctx, GLubyte *base, GLuint pitch);
+
+/* 
+ * X window system Information
+ */
+#define sis_is_window(xmesa) (!((xmesa)->xm_buffer->pixmap_flag))
+GLboolean sis_get_clip_rects (XMesaContext xmesa, BoxPtr * ppExtents,
+			      int *pCount);
+void *sis_get_drawable_pos (XMesaContext xmesa);
+void sis_get_drawable_origin (XMesaContext xmesa, GLuint * x, GLuint * y);
+void sis_get_drawable_size (XMesaContext xmesa, GLuint * w, GLuint * h);
+void sis_get_drawable_box (XMesaContext xmesa, BoxPtr pBox);
+
+/* GLX */
+void SiSCreateContext (XMesaContext xmesa);
+void SiSDestroyContext (XMesaContext xmesa);
+void sis_swap_buffers (XMesaBuffer b);
+void SiSDestroyBuffer (XMesaBuffer buf);
+
+/* Profile */
+#ifndef SIS_DEBUG
+# define SIS_VERBOSE 0
+#else
+extern int SIS_VERBOSE; 
+#endif
+
+enum _sis_verbose {
+	VERBOSE_SIS_BUFFER  = 0x1,
+	VERBOSE_SIS_MEMORY  = 0x2
+}; 
+
+#endif
Index: xc/lib/GL/mesa/src/drv/sis/sis_reg.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_reg.h:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_reg.h	Fri Jun 30 12:30:25 2000
@@ -0,0 +1,948 @@
+#ifndef _sis_reg_h_
+#define _sis_reg_h_
+
+/*
+ * Define All the Register Address of 6327
+ */
+#define REG_3D_TSFSa                    0x8800
+#define REG_3D_TSZa                     0x8804
+#define REG_3D_TSXa                     0x8808
+#define REG_3D_TSYa                     0x880C
+#define REG_3D_TSARGBa                  0x8810
+#define REG_3D_TSWGa                    0x8814
+#define REG_3D_TSUAa                    0x8818
+#define REG_3D_TSVAa                    0x881C
+#define REG_3D_TSUBa                    0x8820
+#define REG_3D_TSVBa                    0x8824
+#define REG_3D_TSUCa                    0x8828
+#define REG_3D_TSVCa                    0x882C
+
+#define REG_3D_TSFSb                    0x8830
+#define REG_3D_TSZb                     0x8834
+#define REG_3D_TSXb                     0x8838
+#define REG_3D_TSYb                     0x883C
+#define REG_3D_TSARGBb                  0x8840
+#define REG_3D_TSWGb                    0x8844
+#define REG_3D_TSUAb                    0x8848
+#define REG_3D_TSVAb                    0x884C
+#define REG_3D_TSUBb                    0x8850
+#define REG_3D_TSVBb                    0x8854
+#define REG_3D_TSUCb                    0x8858
+#define REG_3D_TSVCb                    0x885C
+
+#define REG_3D_TSFSc                    0x8860
+#define REG_3D_TSZc                     0x8864
+#define REG_3D_TSXc                     0x8868
+#define REG_3D_TSYc                     0x886C
+#define REG_3D_TSARGBc                  0x8870
+#define REG_3D_TSWGc                    0x8874
+#define REG_3D_TSUAc                    0x8878
+#define REG_3D_TSVAc                    0x887C
+#define REG_3D_TSUBc                    0x8880
+#define REG_3D_TSVBc                    0x8884
+#define REG_3D_TSUCc                    0x8888
+#define REG_3D_TSVCc                    0x888C
+
+/*
+ * REG_3D_AGPCmdSetting (89e4h-89f7)
+ */
+#define REG_3D_AGPCmBase                0x89E4
+#define REG_3D_AGPRmDwNum               0x89E8
+#define REG_3D_AGPTtDwNum               0x89EC
+#define REG_3D_AGPCmFire                0x89F0
+
+#define REG_3D_ParsingSet               0x89F4
+#define REG_3D_PrimitiveSet             0x89F8
+#define REG_3D_ShadeMode                0x89F8
+#define REG_3D_EngineFire               0x89FC
+#define REG_3D_EngineStatus             0x89FC
+#define REG_3D_TEnable                  0x8A00
+#define REG_3D_TEnable2                 0x8A04
+
+#define REG_3D_ZSet                     0x8A08
+#define REG_3D_ZBias                    0x8A0C
+#define REG_3D_ZStWriteMask             0x8A10
+
+#define REG_3D_ZAddress                 0x8A14
+#define REG_3D_AlphaSet                 0x8A18
+#define REG_3D_AlphaAddress             0x8A1C
+#define REG_3D_DstSet                   0x8A20
+#define REG_3D_DstAlphaWriteMask        0x8A24
+
+#define REG_3D_DstAddress               0x8A28
+
+#define REG_3D_LinePattern              0x8A2C
+
+#define REG_3D_FogSet                   0x8A30
+
+#define REG_3D_FogFarDistance           0x8A34
+#define REG_3D_FogInverseDistance       0x8A38
+#define REG_3D_FogFactorDensity         0x8A3C
+
+#define REG_3D_StencilSet               0x8A44
+#define REG_3D_StencilSet2              0x8A48
+#define REG_3D_StencilAddress           0x8A4C
+
+#define REG_3D_DstBlendMode             0x8A50
+#define REG_3D_SrcBlendMode             0x8A50
+#define REG_3D_ClipTopBottom            0x8A54
+#define REG_3D_ClipLeftRight            0x8A58
+
+#define REG_3D_Brightness               0x8A5C
+
+#define REG_3D_BumpMapSet               0x8A68
+#define REG_3D_BumpMapAddress           0x8A6C
+#define REG_3D_BumpMapPitch             0x8A70
+#define REG_3D_BumpMapMatrix0           0x8A74
+#define REG_3D_BumpMapMatrix1           0x8A78
+
+/*
+ * Define the Texture Register Address of 6326
+ */
+#define REG_3D_TextureSet                     0x8A7C
+#define REG_3D_TextureWidthHeight             0x8A7C
+#define REG_3D_TextureMip                     0x8A80
+
+#define REG_3D_TextureTransparencyColorHigh    0x8A84
+#define REG_3D_TextureTransparencyColorLow     0x8A88
+#define REG_3D_TextureBorderColor              0x8A8C
+#define REG_3D_TextureAddress0                 0x8A90
+#define REG_3D_TextureAddress1                 0x8A94
+#define REG_3D_TextureAddress2                 0x8A98
+#define REG_3D_TextureAddress3                 0x8A9C
+#define REG_3D_TextureAddress4                 0x8AA0
+#define REG_3D_TextureAddress5                 0x8AA4
+#define REG_3D_TextureAddress6                 0x8AA8
+#define REG_3D_TextureAddress7                 0x8AAC
+#define REG_3D_TextureAddress8                 0x8AB0
+#define REG_3D_TextureAddress9                 0x8AB4
+#define REG_3D_TextureAddress10                0x8AB8
+#define REG_3D_TextureAddress11                0x8ABC
+#define REG_3D_TexturePitch0                   0x8AC0
+#define REG_3D_TexturePitch1                   0x8AC0
+#define REG_3D_TexturePitch2                   0x8AC4
+#define REG_3D_TexturePitch3                   0x8AC4
+#define REG_3D_TexturePitch4                   0x8AC8
+#define REG_3D_TexturePitch5                   0x8AC8
+#define REG_3D_TexturePitch6                   0x8ACC
+#define REG_3D_TexturePitch7                   0x8ACC
+#define REG_3D_TexturePitch8                   0x8AD0
+#define REG_3D_TexturePitch9                   0x8AD0
+#define REG_3D_TexturePitch10                  0x8AD4
+
+#define REG_3D_Texture1Set                     0x8ADC
+#define REG_3D_Texture1WidthHeight             0x8ADC
+#define REG_3D_Texture1Mip                     0x8AE0
+
+#define REG_3D_Texture1TransparencyColorHigh   0x8AE4
+#define REG_3D_Texture1TransparencyColorLow    0x8AE8
+#define REG_3D_Texture1BorderColor             0x8AEC
+#define REG_3D_Texture1Address0                0x8AF0
+#define REG_3D_Texture1Address1                0x8AF4
+#define REG_3D_Texture1Address2                0x8AF8
+#define REG_3D_Texture1Address3                0x8AFC
+#define REG_3D_Texture1Address4                0x8B00
+#define REG_3D_Texture1Address5                0x8B04
+#define REG_3D_Texture1Address6                0x8B08
+#define REG_3D_Texture1Address7                0x8B0C
+#define REG_3D_Texture1Address8                0x8B10
+#define REG_3D_Texture1Address9                0x8B14
+#define REG_3D_Texture1Address10               0x8B18
+#define REG_3D_Texture1Address11               0x8B1C
+#define REG_3D_Texture1Pitch0                  0x8B20
+#define REG_3D_Texture1Pitch1                  0x8B20
+#define REG_3D_Texture1Pitch2                  0x8B24
+#define REG_3D_Texture1Pitch3                  0x8B24
+#define REG_3D_Texture1Pitch4                  0x8B28
+#define REG_3D_Texture1Pitch5                  0x8B28
+#define REG_3D_Texture1Pitch6                  0x8B2C
+#define REG_3D_Texture1Pitch7                  0x8B2C
+#define REG_3D_Texture1Pitch8                  0x8B30
+#define REG_3D_Texture1Pitch9                  0x8B30
+#define REG_3D_Texture1Pitch10                 0x8B34
+
+#define REG_3D_TextureBlendFactor              0x8B3C
+#define REG_3D_TextureColorBlendSet0           0x8B40
+#define REG_3D_TextureColorBlendSet1           0x8B44
+#define REG_3D_TextureAlphaBlendSet0           0x8B48
+#define REG_3D_TextureAlphaBlendSet1           0x8B4C
+/*
+ * Define the End of Primitive List of 6326
+ */
+#define REG_3D_EndPrimitiveList                0X8B50
+
+
+/*
+ * Define the Stipple Register Address of 6326
+ */
+#define REG_3D_Stipple0                        0X8B60
+
+#define REG_3D_TexturePalette                  0x8C00
+
+
+/*
+ *  Define All the Register Address of 6327
+ */
+#define X_REG_3D_TSFSa                     0
+#define X_REG_3D_TSZa                      4
+#define X_REG_3D_TSXa                      8
+#define X_REG_3D_TSYa                     12
+#define X_REG_3D_TSARGBa                  16
+#define X_REG_3D_TSWGa                    20
+#define X_REG_3D_TSUAa                    24
+#define X_REG_3D_TSVAa                    28
+#define X_REG_3D_TSUBa                    32
+#define X_REG_3D_TSVBa                    36
+#define X_REG_3D_TSUCa                    40
+#define X_REG_3D_TSVCa                    44
+
+#define X_REG_3D_TSFSb                    48
+#define X_REG_3D_TSZb                     52
+#define X_REG_3D_TSXb                     56
+#define X_REG_3D_TSYb                     60
+#define X_REG_3D_TSARGBb                  64
+#define X_REG_3D_TSWGb                    68
+#define X_REG_3D_TSUAb                    72
+#define X_REG_3D_TSVAb                    76
+#define X_REG_3D_TSUBb                    80
+#define X_REG_3D_TSVBb                    84
+#define X_REG_3D_TSUCb                    88
+#define X_REG_3D_TSVCb                    92
+
+#define X_REG_3D_TSFSc                    96
+#define X_REG_3D_TSZc                    100
+#define X_REG_3D_TSXc                    104
+#define X_REG_3D_TSYc                    108
+#define X_REG_3D_TSARGBc                 112
+#define X_REG_3D_TSWGc                   116
+#define X_REG_3D_TSUAc                   120
+#define X_REG_3D_TSVAc                   124
+#define X_REG_3D_TSUBc                   128
+#define X_REG_3D_TSVBc                   132
+#define X_REG_3D_TSUCc                   136
+#define X_REG_3D_TSVCc                   140
+
+#define X_REG_3D_ParsingSet              176
+#define X_REG_3D_PrimitiveSet            180
+#define X_REG_3D_ShadeMode               180
+#define X_REG_3D_EngineFire              184
+#define X_REG_3D_EngineStatus            184
+#define X_REG_3D_TEnable                 188
+#define X_REG_3D_TEnable2                192
+
+#define X_REG_3D_ZSet                    196
+#define X_REG_3D_ZBias                   200
+#define X_REG_3D_ZStWriteMask            204
+
+#define X_REG_3D_ZAddress                208
+#define X_REG_3D_AlphaSet                212
+#define X_REG_3D_AlphaAddress            216
+#define X_REG_3D_DstSet                  220
+#define X_REG_3D_DstAlphaWriteMask       224
+
+#define X_REG_3D_DstAddress              228
+
+#define X_REG_3D_LinePattern             232
+
+#define X_REG_3D_FogSet                  236
+#define X_REG_3D_FogFarDistance          240
+#define X_REG_3D_FogInverseDistance      244
+#define X_REG_3D_FogFactorDensity        248
+
+#define X_REG_3D_StencilSet              256
+#define X_REG_3D_StencilSet2             260
+#define X_REG_3D_StencilAddress          264
+
+#define X_REG_3D_DstBlendMode            268
+#define X_REG_3D_SrcBlendMode            268
+#define X_REG_3D_ClipTopBottom           272
+#define X_REG_3D_ClipLeftRight           276
+#define X_REG_3D_Brightness              280
+
+#define X_REG_3D_BumpMapSet              292
+#define X_REG_3D_BumpMapAddress          296
+#define X_REG_3D_BumpMapPitch            300
+#define X_REG_3D_BumpMapMatrix0          304
+#define X_REG_3D_BumpMapMatrix1          308
+
+
+/*
+ * Define the Texture Register Address of 6327
+ */
+#define X_REG_3D_Texture0Set                     312
+#define X_REG_3D_Texture0WidthHeight             312
+#define X_REG_3D_Texture0Set2                    316
+
+#define X_REG_3D_Texture0TransparencyColorHigh   320
+#define X_REG_3D_Texture0TransparencyColorLow    324
+#define X_REG_3D_Texture0BorderColor             328
+#define X_REG_3D_Texture0Address0                332
+#define X_REG_3D_Texture0Address1                336
+#define X_REG_3D_Texture0Address2                340
+#define X_REG_3D_Texture0Address3                344
+#define X_REG_3D_Texture0Address4                348
+#define X_REG_3D_Texture0Address5                352
+#define X_REG_3D_Texture0Address6                356
+#define X_REG_3D_Texture0Address7                360
+#define X_REG_3D_Texture0Address8                364
+#define X_REG_3D_Texture0Address9                368
+#define X_REG_3D_Texture0Address10               372
+#define X_REG_3D_Texture0Address11               376
+#define X_REG_3D_Texture0Pitch0                  380
+#define X_REG_3D_Texture0Pitch1                  380
+#define X_REG_3D_Texture0Pitch2                  384
+#define X_REG_3D_Texture0Pitch3                  384
+#define X_REG_3D_Texture0Pitch4                  388
+#define X_REG_3D_Texture0Pitch5                  388
+#define X_REG_3D_Texture0Pitch6                  392
+#define X_REG_3D_Texture0Pitch7                  392
+#define X_REG_3D_Texture0Pitch8                  396
+#define X_REG_3D_Texture0Pitch9                  396
+#define X_REG_3D_Texture0Pitch10                 400
+
+#define X_REG_3D_Texture1Set                     408
+#define X_REG_3D_Texture1WidthHeight             408
+#define X_REG_3D_Texture1Set2                    412
+
+#define X_REG_3D_Texture1TransparencyColorHigh   416
+#define X_REG_3D_Texture1TransparencyColorLow    420
+#define X_REG_3D_Texture1BorderColor             424
+#define X_REG_3D_Texture1Address0                428
+#define X_REG_3D_Texture1Address1                432
+#define X_REG_3D_Texture1Address2                436
+#define X_REG_3D_Texture1Address3                440
+#define X_REG_3D_Texture1Address4                444
+#define X_REG_3D_Texture1Address5                448
+#define X_REG_3D_Texture1Address6                452
+#define X_REG_3D_Texture1Address7                456
+#define X_REG_3D_Texture1Address8                460
+#define X_REG_3D_Texture1Address9                464
+#define X_REG_3D_Texture1Address10               468
+#define X_REG_3D_Texture1Address11               472
+#define X_REG_3D_Texture1Pitch0                  476
+#define X_REG_3D_Texture1Pitch1                  476
+#define X_REG_3D_Texture1Pitch2                  480
+#define X_REG_3D_Texture1Pitch3                  480
+#define X_REG_3D_Texture1Pitch4                  484
+#define X_REG_3D_Texture1Pitch5                  484
+#define X_REG_3D_Texture1Pitch6                  488
+#define X_REG_3D_Texture1Pitch7                  488
+#define X_REG_3D_Texture1Pitch8                  492
+#define X_REG_3D_Texture1Pitch9                  492
+#define X_REG_3D_Texture1Pitch10                 496
+
+#define X_REG_3D_TextureBlendFactor              504
+#define X_REG_3D_TextureColorBlendSet0           508
+#define X_REG_3D_TextureColorBlendSet1           512
+#define X_REG_3D_TextureAlphaBlendSet0           516
+#define X_REG_3D_TextureAlphaBlendSet1           520
+
+/*
+ * Define the End of Primitive List of 6326
+ */
+#define X_REG_3D_EndPrimitiveList                524
+
+
+/*
+ * Define the Stipple Register Address of 6326
+ */
+#define X_REG_3D_Stipple0                        540
+
+#define X_REG_3D_TexturePalette                 1520
+
+
+/*
+ * REG_3D_ParsingSet -- Define Parsing Mask (89F4h-89F7h)
+ */
+#define MASK_VertexDWSize								0xF0000000
+#define MASK_VertexDataFormat							0x0FFF0000
+#define MASK_PsVertex_HAS_RHW                   0x08000000
+#define MASK_PsVertex_HAS_NORMALXYZ             0x04000000
+#define MASK_PsVertex_HAS_DIFFUSE               0x02000000
+#define MASK_PsVertex_HAS_SPECULAR              0x01000000
+#define MASK_PsUVSet                            0x00FF0000
+#define MASK_PsVertex_HAS_1SetUV                0x00800000
+#define MASK_PsVertex_HAS_2SetUV                0x00C00000
+#define MASK_PsVertex_HAS_3SetUV                0x00E00000
+#define MASK_PsVertex_HAS_UVSet1                0x00800000
+#define MASK_PsVertex_HAS_UVSet2                0x00400000
+#define MASK_PsVertex_HAS_UVSet3                0x00200000
+#define MASK_PsCullDirection_CCW        0x00008000
+#define MASK_PsShadingMode              0x00007000
+#define MASK_PsTextureFrom              0x000003F0
+#define MASK_PsTexture0FromA            0x00000000
+#define MASK_PsTexture1FromA            0x00000000
+#define MASK_PsTexture1FromB            0x00000040
+#define MASK_PsBumpTextureFromA                 0x00000000
+#define MASK_PsBumpTextureFromB                 0x00000010
+#define MASK_PsBumpTextureFromC                 0x00000020
+#define MASK_PsDataType                                 0x0000000F
+#define MASK_PsPointList                                0x00000000
+#define MASK_PsLineList                                 0x00000004
+#define MASK_PsLineStrip                                0x00000005
+#define MASK_PsTriangleList                             0x00000008
+#define MASK_PsTriangleStrip                            0x00000009
+#define MASK_PsTriangleFan                              0x0000000A
+/*
+ * REG_3D_PrimitiveSet -- Define Fire Primitive Mask (89F8h-89FBh)
+ */
+#define MASK_DrawPrimitiveCommand       0x00000007
+#define MASK_SetFirePosition            0x00001F00
+#define MASK_BumpTextureFrom            0x00030000
+#define MASK_Texture1From               0x000C0000
+#define MASK_Texture0From               0x00300000
+#define MASK_ShadingMode                0x07000000
+#define MASK_CullDirection              0x08000000
+/*
+ *           Define Command Queue Length Mask (89FCh-89FF)
+ */
+#define MASK_CmdQueueLen                0x0FFF0000
+
+/*
+ * REG_3D_TEnable -- Define Capility Enable Mask (8A00h-8A03h)
+ */
+#define MASK_DitherEnable               0x00000001
+#define MASK_BlendEnable                0x00000002
+#define MASK_FogTestEnable              0x00000004
+#define MASK_FogEnable                  0x00000008
+#define MASK_SpecularEnable             0x00000010
+#define MASK_FogPerspectiveEnable      0x00000020
+#define MASK_TextureCacheClear          0x00000040
+#define MASK_TextureCacheEnable         0x00000080
+#define MASK_BumpMapEnable              0x00000100
+#define MASK_TexturePerspectiveEnable   0x00000200
+#define MASK_TextureEnable              0x00000400
+#define MASK_CullEnable                 0x00000800
+#define MASK_TextureNumUsed             0x0000F000
+#define MASK_AlphaBufferEnable          0x00010000
+#define MASK_AlphaTestEnable            0x00020000
+#define MASK_AlphaWriteEnable           0x00040000
+#define MASK_ZTestEnable                0x00080000
+#define MASK_ZWriteEnable               0x00100000
+#define MASK_StencilBufferEnable        0x00200000
+#define MASK_StencilTestEnable          0x00400000
+#define MASK_StencilWriteEnable         0x00800000
+#define MASK_Texture0TransparencyEnable 0x01000000
+#define MASK_Texture1TransparencyEnable 0x02000000
+#define MASK_TextureAWrapUCorrection    0x04000000
+#define MASK_TextureAWrapVCorrection    0x08000000
+#define MASK_TextureBWrapUCorrection    0x10000000
+#define MASK_TextureBWrapVCorrection    0x20000000
+#define MASK_TextureCWrapUCorrection    0x40000000
+#define MASK_TextureCWrapVCorrection    0x80000000
+
+
+
+/*
+ * REG_3D_TEnable2 -- Define Capility Enable Mask2 (8A04h-8A07h)
+ */
+#define MASK_Texture0BlockTextureEnable 0x00000001
+#define MASK_Texture1BlockTextureEnable 0x00000002
+#define MASK_Texture0AnisotropicEnable  0x00000010
+#define MASK_Texture1AnisotropicEnable  0x00000020
+#define MASK_TextureMipmapBiasEnable    0x00000040
+#define MASK_LinePatternEnable          0x00000100
+#define MASK_StippleAlphaEnable         0x00000200
+#define MASK_StippleEnable              0x00000400
+#define MASK_AntiAliasEnable            0x00000800
+#define MASK_ZMaskWriteEnable           0x00001000
+#define MASK_StencilMaskWriteEnable     0x00002000
+#define MASK_AlphaMaskWriteEnable       0x00004000
+#define MASK_ColorMaskWriteEnable       0x00008000
+#define MASK_ZCacheClear                0x00010000
+#define MASK_ZCacheEnable               0x00020000
+#define MASK_StencilCacheClear          0x00040000
+#define MASK_StencilCacheEnable         0x00080000
+#define MASK_AlphaCacheClear            0x00100000
+#define MASK_AlphaCacheEnable           0x00200000
+#define MASK_ColorCacheClear            0x00400000
+#define MASK_ColorCacheEnable           0x00800000
+
+/*
+ * REG_3D_ZSet -- Define Z Buffer Setting Mask (8A08h-8A0Bh)
+ */
+#define MASK_ZBufferPitch               0x00000FFF
+#define MASK_ZTestMode                  0x00070000
+#define MASK_ZBufferInSystem            0x00080000
+#define MASK_ZBufferFormat              0x01F00000
+
+/*
+ * REG_3D_ZBias -- Define Z Buffer Setting Mask (8A0Ch-8A0Fh)
+ */
+#define MASK_ZBias                      0xFFFFFFFF
+
+/*
+ * REG_3D_ZStWriteMask -- Define Z and Stencil Buffer Mask (8A10h-8A13h)
+ */
+#define MASK_ZWriteMask                 0x00FFFFFF
+
+/*
+ * REG_3D_ZAddress -- Define Z Buffer Base Address(8A14h-8A17h)
+ */
+#define MASK_ZAddress                   0xFFFFFFFF
+
+/*
+ * REG_3D_AlphaSet -- Define Alpha Buffer Setting Mask (8A18h-8A1Bh)
+ */
+#define MASK_AlphaBufferPitch           0x000003FF
+#define MASK_AlphaRefValue              0x00FF0000
+#define MASK_AlphaTestMode              0x07000000
+#define MASK_AlphaBufferInSystem        0x08000000
+#define MASK_AlphaBufferFormat          0x30000000
+
+/*
+ * REG_3D_AlphaAddress -- Define Alpha Buffer Base Address(8A1Ch-8A1Fh)
+ */
+#define MASK_AlphaAddress               0xFFFFFFFF
+
+/*
+ * REG_3D_DstSet -- Define Destination Buffer Setting Mask (8A20h-8A23h)
+ */
+#define MASK_DstBufferPitch             0x00000FFF
+#define MASK_DstBufferFormat            0x000F0000
+#define MASK_DstBufferBitDepth          0x00300000
+#define MASK_DstBufferRgbOrder          0x00400000
+#define MASK_DstBufferInSystem          0x00800000
+#define MASK_Dst7BitFormat              0x007F0000
+#define MASK_ROP2                       0x0F000000
+
+/*
+ * REG_3D_DstAlphaWriteMask -- Define Destination/Alpha  Buffer Write Mask (8A24h-8A27h)
+ */
+#define MASK_ColorWriteMask             0x00FFFFFF
+#define MASK_AlphaWriteMask             0xFF000000
+
+/*
+ * REG_3D_DstAddress -- Define Destination Buffer Base Address(8A1Ch-8A1Fh)
+ */
+#define MASK_DstAddress                 0xFFFFFFFF
+
+/*
+ * REG_3D_LinePattern -- Define Line Pattern (8A2Ch-8A2Fh)
+ */
+#define MASK_LinePatternRepeatFactor    0x00007FFF
+#define MASK_LinePatternLastPixelFlag   0x00008000
+#define MASK_LinePattern                0xFFFF0000
+
+/*
+ * REG_3D_FogSet -- Define Fog Mask (8A30h-8A33h)
+ */
+#define MASK_FogColor                   0x00FFFFFF
+#define MASK_FogMode                    0x07000000
+#define MASK_FogZLookup		        0x08000000
+
+/*
+ * REG_3D_FogStartEnd -- Define Fog Start End Setting (8A34h-8A37h)
+ */
+#define MASK_FogFarDistance                             0x0007FFFF
+
+/*
+ * REG_3D_FogStartEnd -- Define Fog End Setting (8A38h-8A3Bh)
+ */
+#define MASK_FogInvFarDistance          0x0007FFFF
+
+#define MASK_FogDensity                 0x0003FFFF
+#define MASK_FogFactor                  0xFF000000
+
+#define MASK_StencilMaskValue           0x000000FF
+#define MASK_StencilReferenceValue      0x0000FF00
+#define MASK_StencilTestMode            0x07000000
+#define MASK_StencilBufferInSystem      0x08000000
+#define MASK_StencilFormat              0x30000000
+
+#define MASK_StencilMode_ALWAYS         0x07000000
+#define MASK_StencilBufferPitch         0x00000FFF
+#define MASK_StencilZPassOp             0x00007000
+#define MASK_StencilZFailOp             0x00070000
+#define MASK_StencilFailOp              0x00700000
+#define MASK_StencilWriteMask           0xFF000000
+
+#define MASK_StencilZPassOp_REPLACE     0x00002000
+#define MASK_StencilZFailOp_REPLACE     0x00020000
+#define MASK_StencilFailOp_REPLACE      0x00200000
+#define MASK_StencilAddress             0xFFFFFFFF
+
+#define MASK_SrcBlendMode                       0x0000000F
+#define MASK_DstBlendMode                       0x000000F0
+#define MASK_DSTBLEND_ZERO                      0x00000000
+#define MASK_DSTBLEND_ONE                       0x00000010
+#define MASK_DSTBLEND_SRC_COLOR                 0x00000020
+#define MASK_DSTBLEND_INV_SRC_COLOR             0x00000030
+#define MASK_DSTBLEND_SRC_ALPHA                 0x00000040
+#define MASK_DSTBLEND_INV_SRC_ALPHA             0x00000050
+#define MASK_DSTBLEND_DST_ALPHA                 0x00000060
+#define MASK_DSTBLEND_INV_DST_ALPHA             0x00000070
+#define MASK_DSTBLEND_DST_COLOR                 0x00000080
+#define MASK_DSTBLEND_INV_DST_COLOR             0x00000090
+#define MASK_DSTBLEND_SRC_ALPHA_SAT             0x000000A0
+
+#define MASK_SRCBLEND_ZERO                      0x00000000
+#define MASK_SRCBLEND_ONE                       0x00000001
+#define MASK_SRCBLEND_SRC_COLOR                 0x00000002
+#define MASK_SRCBLEND_INV_SRC_COLOR             0x00000003
+#define MASK_SRCBLEND_SRC_ALPHA                 0x00000004
+#define MASK_SRCBLEND_INV_SRC_ALPHA             0x00000005
+#define MASK_SRCBLEND_DST_ALPHA                 0x00000006
+#define MASK_SRCBLEND_INV_DST_ALPHA             0x00000007
+#define MASK_SRCBLEND_DST_COLOR                 0x00000008
+#define MASK_SRCBLEND_INV_DST_COLOR             0x00000009
+#define MASK_SRCBLEND_SRC_ALPHA_SAT             0x0000000A
+#define MASK_SRCBLEND_BOTH_SRC_ALPHA            0x0000000B
+#define MASK_SRCBLEND_BOTH_INV_SRC_ALPHA        0x0000000C
+
+#define MASK_BottomClip                 0x00001FFF
+#define MASK_TopClip                    0x03FFE000
+
+#define MASK_RightClip                  0x00001FFF
+#define MASK_LeftClip                   0x03FFE000
+
+#define MASK_BMMemoryInSystem           0x00000080
+#define MASK_BMHeight                   0x00000F00
+#define MASK_BMWidth                    0x0000F000
+#define MASK_BMFilter                   0x00010000
+#define MASK_BMMappingMode              0x007E0000
+#define MASK_BMFormat                   0x07800000
+#define MASK_BMTxBumpmap                0x08000000
+
+#define MASK_BMAddress                  0xFFFFFFFC
+
+#define MASK_BMOffset                   0xFF800000
+#define MASK_BMScale                    0x007FE000
+#define MASK_BMPitch                    0x00001FFF
+
+#define MASK_BMMatrix00                 0x000007FF
+#define MASK_BMMatrix01                 0x07FF0000
+#define MASK_BMMatrix10                 0x000007FF
+#define MASK_BMMatrix11                 0x07FF0000
+
+#define MASK_TextureHeight             0x0000000F
+#define MASK_TextureWidth              0x000000F0
+#define MASK_TextureLevel              0x00000F00
+#define MASK_TextureSignYUVFormat      0x00001000
+#define MASK_TextureMappingMode        0x00FF0000
+#define MASK_TextureWrapU              0x00010000
+#define MASK_TextureWrapV              0x00020000
+#define MASK_TextureMirrorU            0x00040000
+#define MASK_TextureMirrorV            0x00080000
+#define MASK_TextureClampU             0x00100000
+#define MASK_TextureClampV             0x00200000
+#define MASK_TextureBorderU            0x00400000
+#define MASK_TextureBorderV            0x00800000
+#define MASK_TextureFormat             0xFF000000
+#define MASK_TextureBitDepth           0x70000000
+#define MASK_TextureRgbOrder           0x80000000
+
+#define MASK_TextureAnisotropyRatio    0x0000000F
+#define MASK_TextureMipmapLodBias      0x00003FF0
+#define MASK_TextureFilterMin          0x0001C000
+#define MASK_TextureFilterMag          0x00020000
+#define MASK_TextureFilter             0x0003C000
+#define MASK_TextureLevelInSystem      0x3FFC0000
+#define MASK_TextureLevel0InSystem     0x00040000
+#define MASK_TextureBlockLength        0xF0000000
+
+#define MASK_TextureTransparencyColorHighB  0x000000FF
+#define MASK_TextureTransparencyColorHighG  0x0000FF00
+#define MASK_TextureTransparencyColorHighR  0x00FF0000
+#define MASK_TextureAlphaTransparencyMode   0x08000000
+
+#define MASK_TextureTransparencyColorLowB   0x000000FF
+#define MASK_TextureTransparencyColorLowG   0x0000FF00
+#define MASK_TextureTransparencyColorLowR   0x00FF0000
+#define MASK_TextureBlockHeight             0x07000000
+#define MASK_TextureBlockWidth              0x70000000
+
+#define MASK_TextureBorderColorB       0x000000FF
+#define MASK_TextureBorderColorG       0x0000FF00
+#define MASK_TextureBorderColorR       0x00FF0000
+#define MASK_TextureBorderColorA       0xFF000000
+
+#define MASK_TexturePitchOdd            0x000003FF
+#define MASK_TexturePitchEven           0x03FF0000
+#define SHIFT_TexturePitchEven          16
+
+#define MASK_TextureRealInSystem        0x00000001
+#define MASK_TextureDowngrade           0x00000002
+
+#define OP_3D_POINT_DRAW                0x00000000
+#define OP_3D_LINE_DRAW                 0x00000001
+#define OP_3D_TRIANGLE_DRAW             0x00000002
+
+#define OP_3D_DIRECTION_RIGHT           0x00000000
+#define OP_3D_DIRECTION_LEFT            0x00000100
+#define OP_3D_DIRECTION_HORIZONTAL      0x00000000
+#define OP_3D_DIRECTION_VERTICAL        0x00000100
+
+#define OP_3D_FIRE_TFIRE                0x00000000
+#define OP_3D_FIRE_TSARGBa              0x00000100
+#define OP_3D_FIRE_TSWa                0x00000200
+#define OP_3D_FIRE_TSVAa                0x00000300
+#define OP_3D_FIRE_TSVBa                0x00000400
+#define OP_3D_FIRE_TSVCa                0x00000500
+
+#define OP_3D_FIRE_TSARGBb              0x00000900
+#define OP_3D_FIRE_TSWb                0x00000a00
+#define OP_3D_FIRE_TSVAb                0x00000b00
+#define OP_3D_FIRE_TSVBb                0x00000c00
+#define OP_3D_FIRE_TSVCb                0x00000d00
+
+#define OP_3D_FIRE_TSARGBc              0x00001100
+#define OP_3D_FIRE_TSWc                0x00001200
+#define OP_3D_FIRE_TSVAc                0x00001300
+#define OP_3D_FIRE_TSVBc                0x00001400
+#define OP_3D_FIRE_TSVCc                0x00001500
+
+#define OP_3D_Texture0FromA             0x00000000
+#define OP_3D_Texture0FromB             0x00100000
+#define OP_3D_Texture0FromC             0x00200000
+#define OP_3D_Texture1FromA             0x00000000
+#define OP_3D_Texture1FromB             0x00040000
+#define OP_3D_Texture1FromC             0x00080000
+#define OP_3D_TextureBumpFromA          0x00000000
+#define OP_3D_TextureBumpFromB          0x00010000
+#define OP_3D_TextureBumpFromC          0x00020000
+
+#define SHADE_FLAT_VertexA              0x01000000
+#define SHADE_FLAT_VertexB              0x02000000
+#define SHADE_FLAT_VertexC              0x03000000
+#define SHADE_GOURAUD                   0x04000000
+
+#define Z_BUFFER_FORMAT_Z16             0x00000000
+#define Z_BUFFER_FORMAT_Z16_INT         0x00100000
+#define Z_BUFFER_FORMAT_S1Z15           0x00400000
+#define Z_BUFFER_FORMAT_S1Z15_INT       0x00500000
+#define Z_BUFFER_FORMAT_Z32             0x00800000
+#define Z_BUFFER_FORMAT_S1Z31           0x00C00000
+#define Z_BUFFER_FORMAT_S2Z30           0x00D00000
+#define Z_BUFFER_FORMAT_S4Z28           0x00E00000
+#define Z_BUFFER_FORMAT_S8Z24           0x00F00000
+#define Z_BUFFER_FORMAT_FZ30            0x01800000
+#define Z_BUFFER_FORMAT_FS1Z30          0x01C00000
+#define Z_BUFFER_FORMAT_FS2Z30          0x01D00000
+#define MASK_Z_BUFFER_FORMAT                    0x01F00000
+
+#define ALPHA_BUFFER_FORMAT_1           0x00000000
+#define ALPHA_BUFFER_FORMAT_2           0x10000000
+#define ALPHA_BUFFER_FORMAT_4           0x20000000
+#define ALPHA_BUFFER_FORMAT_8           0x30000000
+
+#define DST_FORMAT_RGB_555              0x00100000
+#define DST_FORMAT_RGB_565              0x00110000
+#define DST_FORMAT_ARGB_1555            0x00120000
+#define DST_FORMAT_ARGB_4444            0x00130000
+#define DST_FORMAT_ARGB_1888            0x00300000
+#define DST_FORMAT_ARGB_2888            0x00310000
+#define DST_FORMAT_ARGB_4888            0x00320000
+#define DST_FORMAT_ARGB_8888            0x00330000
+#define DST_FORMAT_ARGB_0888            0x00340000
+
+#define DST_FORMAT_BGR_555              0x00500000
+#define DST_FORMAT_BGR_565              0x00510000
+#define DST_FORMAT_ABGR_1555            0x00520000
+#define DST_FORMAT_ABGR_4444            0x00530000
+#define DST_FORMAT_ABGR_1888            0x00700000
+#define DST_FORMAT_ABGR_2888            0x00710000
+#define DST_FORMAT_ABGR_4888            0x00720000
+#define DST_FORMAT_ABGR_8888            0x00730000
+#define DST_FORMAT_ABGR_0888            0x00740000
+
+#define MASK_TEXTURE_FORMAT                             0xFF000000
+
+#define TEXEL_INDEX1                    0x00000000
+#define TEXEL_INDEX2                    0x01000000
+#define TEXEL_INDEX4                    0x02000000
+#define TEXEL_INDEX8                    0x03000000
+
+#define TEXEL_INDEX1WithAlpha           0x04000000
+#define TEXEL_INDEX2WithAlpha           0x05000000
+#define TEXEL_INDEX4WithAlpha           0x06000000
+#define TEXEL_INDEX8WithAlpha           0x07000000
+
+#define TEXEL_I1                        0x10000000
+#define TEXEL_I2                        0x11000000
+#define TEXEL_I4                        0x12000000
+#define TEXEL_I8                        0x13000000
+
+#define TEXEL_DXT1                      0x19000000
+#define TEXEL_DXT2                      0x1A000000
+#define TEXEL_DXT3                      0x1B000000
+
+#define TEXEL_YUV422                    0x20000000
+#define TEXEL_YVU422                    0x21000000
+#define TEXEL_UVY422                    0x22000000
+#define TEXEL_VUY422                    0x23000000
+#define TEXEL_YUV411                    0x24000000
+
+#define TEXEL_L1                        0x30000000
+#define TEXEL_L2                        0x31000000
+#define TEXEL_L4                        0x32000000
+#define TEXEL_L8                        0x33000000
+
+#define TEXEL_AL11                      0x34000000
+#define TEXEL_AL44                      0x35000000
+#define TEXEL_AL26                      0x37000000
+#define TEXEL_AL88                      0x38000000
+
+#define TEXEL_A1                        0x40000000
+#define TEXEL_A2                        0x41000000
+#define TEXEL_A4                        0x42000000
+#define TEXEL_A8                        0x43000000
+
+#define TEXEL_RGB_332_8                 0x50000000
+#define TEXEL_RGB_233_8                 0x51000000
+#define TEXEL_RGB_232_8                 0x52000000
+#define TEXEL_ARGB_1232_8               0x53000000
+#define TEXEL_ARGB_2222_8               0x54000000
+
+#define TEXEL_RGB_555_16                0x60000000
+#define TEXEL_RGB_565_16                0x61000000
+#define TEXEL_ARGB_1555_16              0x62000000
+#define TEXEL_ARGB_4444_16              0x63000000
+
+#define TEXEL_ARGB_1888_32              0x70000000
+#define TEXEL_ARGB_2888_32              0x71000000
+#define TEXEL_ARGB_4888_32              0x72000000
+#define TEXEL_ARGB_8888_32              0x73000000
+#define TEXEL_ARGB_0888_32              0x74000000
+
+#define TEXEL_BGR_332_8                 0xD0000000
+#define TEXEL_BGR_233_8                 0xD1000000
+#define TEXEL_BGR_232_8                 0xD2000000
+#define TEXEL_ABGR_1232_8               0xD3000000
+#define TEXEL_ABGR_2222_8               0xD4000000
+
+#define TEXEL_BGR_555_16                0xE0000000
+#define TEXEL_BGR_565_16                0xE1000000
+#define TEXEL_ABGR_1555_16              0xE2000000
+#define TEXEL_ABGR_4444_16              0xE3000000
+
+#define TEXEL_ABGR_1888_32              0xF0000000
+#define TEXEL_ABGR_2888_32              0xF1000000
+#define TEXEL_ABGR_4888_32              0xF2000000
+#define TEXEL_ABGR_8888_32              0xF3000000
+#define TEXEL_ABGR_0888_32              0xF4000000
+
+#define TEXEL_VU88                      0x00000000
+#define TEXEL_LVU655                    0x00800000
+#define TEXEL_LVU888                    0x01000000
+#define TEXEL_UV88                      0x02000000
+#define TEXEL_LUV655                    0x02800000
+#define TEXEL_LUV888                    0x03000000
+
+#define FOGMODE_CHEAP                  0x04000000
+#define FOGMODE_LINEAR                  0x05000000
+#define FOGMODE_EXP                     0x06000000
+#define FOGMODE_EXP2                    0x07000000
+
+#define Z_16												0x00000000
+#define S_1_Z_15										0x00400000
+#define Z_32												0x00800000
+#define S_1_Z_31										0x00c00000
+#define S_2_Z_30										0x00d00000
+#define S_4_Z_28										0x00e00000
+#define S_8_Z_24										0x00f00000
+
+#define S_1													0x00000000
+#define S_2													0x10000000
+#define S_4													0x20000000
+#define S_8													0x30000000
+
+#define TEXTURE_FILTER_NEAREST									0x00000000
+#define TEXTURE_FILTER_LINEAR										0x00004000
+#define TEXTURE_FILTER_NEAREST_MIP_NEAREST		0x00008000
+#define TEXTURE_FILTER_NEAREST_MIP_LINEAR			0x00010000
+#define TEXTURE_FILTER_LINEAR_MIP_NEAREST			0x0000c000
+#define TEXTURE_FILTER_LINEAR_MIP_LINEAR				0x00014000
+
+#define A_REPLACE_RGB_STAGE0						0xa1485000
+#define A_REPLACE_A_STAGE0								0xc3230000
+#define L_REPLACE__RGB_STAGE0						0xc1485000
+#define L_REPLACE__A_STAGE0								0x63230000
+#define LA_REPLACE__RGB_STAGE0					0xc1485000
+#define LA_REPLACE__A_STAGE0						0xc3230000
+#define I_REPLACE__RGB_STAGE0						0xc1485000
+#define I_REPLACE__A_STAGE0								0xc3230000
+#define RGB_REPLACE__RGB_STAGE0					0xc1485000
+#define RGB_REPLACE__A_STAGE0						0x63230000
+#define RGBA_REPLACE__RGB_STAGE0			0xc1485000
+#define RGBA_REPLACE__A_STAGE0					0xc3230000
+
+#define A_MODULATE_RGB_STAGE0					0xa1485000
+#define A_MODULATE_A_STAGE0							0x63c30000
+#define L_MODULATE__RGB_STAGE0					0xa1705000
+#define L_MODULATE__A_STAGE0						0x63230000
+#define LA_MODULATE__RGB_STAGE0				0xa1705000
+#define LA_MODULATE__A_STAGE0					0x63c30000
+#define I_MODULATE__RGB_STAGE0					0xa1705000
+#define I_MODULATE__A_STAGE0						0x63c30000
+#define RGB_MODULATE__RGB_STAGE0			0xa1705000
+#define RGB_MODULATE__A_STAGE0					0x63230000
+#define RGBA_MODULATE__RGB_STAGE0		0xa1705000
+#define RGBA_MODULATE__A_STAGE0				0x63c30000
+
+#define RGB_DECAL__RGB_STAGE0			0xc1485000
+#define RGB_DECAL__A_STAGE0					0x63230000
+#define RGBA_DECAL__RGB_STAGE0			0xc534c001
+#define RGBA_DECAL__A_STAGE0				0x63230000
+
+#define A_BLEND_RGB_STAGE0					0xa1485000
+#define A_BLEND_A_STAGE0						0x63c30000
+#define L_BLEND__RGB_STAGE0					0x4530c001
+#define L_BLEND__A_STAGE0						0x63230000
+#define LA_BLEND__RGB_STAGE0			0x4530c001
+#define LA_BLEND__A_STAGE0					0x63c30000
+#define I_BLEND__RGB_STAGE0					0x4530c001
+#define I_BLEND__A_STAGE0						0x46c60001
+#define RGB_BLEND__RGB_STAGE0			0x4530c001
+#define RGB_BLEND__A_STAGE0					0x63230000
+#define RGBA_BLEND__RGB_STAGE0		0x4530c001
+#define RGBA_BLEND__A_STAGE0			0x63c30000
+
+#define RGB_STAGE1										0xa1485000
+#define A_STAGE1											0xa3230000
+
+#define A_REPLACE_RGB_STAGE1				0xa1485000
+#define A_REPLACE_A_STAGE1						0xe3230000
+#define L_REPLACE__RGB_STAGE1			0xe1485000
+#define L_REPLACE__A_STAGE1					0xa3230000
+#define LA_REPLACE__RGB_STAGE1			0xe1485000
+#define LA_REPLACE__A_STAGE1				0xe3230000
+#define I_REPLACE__RGB_STAGE1				0xe1485000
+#define I_REPLACE__A_STAGE1					0xe3230000
+#define RGB_REPLACE__RGB_STAGE1			0xe1485000
+#define RGB_REPLACE__A_STAGE1				0xa3230000
+#define RGBA_REPLACE__RGB_STAGE1		0xe1485000
+#define RGBA_REPLACE__A_STAGE1				0xe3230000
+
+#define A_MODULATE_RGB_STAGE1		0xa1485000
+#define A_MODULATE_A_STAGE1				0xa3e30000
+#define L_MODULATE__RGB_STAGE1		0xa1785000
+#define L_MODULATE__A_STAGE1				0xa3230000
+#define LA_MODULATE__RGB_STAGE1			0xa1785000
+#define LA_MODULATE__A_STAGE1				0xa3e30000
+#define I_MODULATE__RGB_STAGE1				0xa1785000
+#define I_MODULATE__A_STAGE1					0xa3e30000
+#define RGB_MODULATE__RGB_STAGE1		0xa1785000
+#define RGB_MODULATE__A_STAGE1				0xa3230000
+#define RGBA_MODULATE__RGB_STAGE1	0xa1785000
+#define RGBA_MODULATE__A_STAGE1			0xa3e30000
+
+#define RGB_DECAL__RGB_STAGE1		0xe1485000
+#define RGB_DECAL__A_STAGE1					0xa3230000
+#define RGBA_DECAL__RGB_STAGE1			0xe5394001
+#define RGBA_DECAL__A_STAGE1			0xa3230000
+
+#define A_BLEND_RGB_STAGE1				0xa1485000
+#define A_BLEND_A_STAGE1					0xa3e30000
+#define L_BLEND__RGB_STAGE1				0x45394001
+#define L_BLEND__A_STAGE1					0xa3230000
+#define LA_BLEND__RGB_STAGE1		0x45394001
+#define LA_BLEND__A_STAGE1				0xa3e30000
+#define I_BLEND__RGB_STAGE1				0x45394001
+#define I_BLEND__A_STAGE1						0x4aea0001
+#define RGB_BLEND__RGB_STAGE1			0x45394001
+#define RGB_BLEND__A_STAGE1					0xa3230000
+#define RGBA_BLEND__RGB_STAGE1		0x45394001
+#define RGBA_BLEND__A_STAGE1			0xa3e30000
+
+#endif
Index: xc/lib/GL/mesa/src/drv/sis/sis_render.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_render.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_render.c	Fri Jun 30 12:30:26 2000
@@ -0,0 +1,491 @@
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+#define SIS_SMOOTH 0x1
+#define SIS_USE_W 0x2
+#define SIS_TEXTURE0 0x4
+#define SIS_TEXTURE1 0x8
+#define SIS_TRI_OFFSET 0x10
+#define SIS_USE_Z 0x11
+#define SIS_FALLBACK 0x80000000
+
+/* 
+ * TODO: assert(hwcx->AGPCmdBufSize % AGP_ALLOC_SIZE == 0) 
+ *       depends on VB_SIZE is better
+ */
+#define AGP_ALLOC_SIZE 0x10000
+/* #define AGP_ALLOC_SIZE (VB_SIZE/3*4 * 9) */
+static DWORD AGP_EngineOffset;
+static DWORD *AGP_StartPtr;
+/* export to sis_fastpath.c */
+float *AGP_CurrentPtr;
+
+#define SIS_TAG(x) x##_flat
+#define SIS_STATES (0)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_smooth
+#define SIS_STATES (SIS_SMOOTH)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_flat_w
+#define SIS_STATES (SIS_USE_W)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_smooth_w
+#define SIS_STATES (SIS_SMOOTH | SIS_USE_W)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_flat_t0
+#define SIS_STATES (SIS_TEXTURE0)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_smooth_t0
+#define SIS_STATES (SIS_SMOOTH | SIS_TEXTURE0)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_flat_w_t0
+#define SIS_STATES (SIS_USE_W | SIS_TEXTURE0)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_smooth_w_t0
+#define SIS_STATES (SIS_SMOOTH | SIS_USE_W | SIS_TEXTURE0)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_flat_t1
+#define SIS_STATES (SIS_TEXTURE1)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_smooth_t1
+#define SIS_STATES (SIS_SMOOTH | SIS_TEXTURE1)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_flat_w_t1
+#define SIS_STATES (SIS_USE_W | SIS_TEXTURE1)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_smooth_w_t1
+#define SIS_STATES (SIS_SMOOTH | SIS_USE_W | SIS_TEXTURE1)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_flat_t2
+#define SIS_STATES (SIS_TEXTURE0 | SIS_TEXTURE1)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_smooth_t2
+#define SIS_STATES (SIS_SMOOTH | SIS_TEXTURE0 | SIS_TEXTURE1)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_flat_w_t2
+#define SIS_STATES (SIS_USE_W | SIS_TEXTURE0 | SIS_TEXTURE1)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+#define SIS_TAG(x) x##_smooth_w_t2
+#define SIS_STATES (SIS_SMOOTH | SIS_USE_W | SIS_TEXTURE0 | SIS_TEXTURE1)
+#include "sis_linefunc.h"
+#include "sis_trifunc.h"
+
+static line_func sis_draw_line_func[32] = {
+  sis_line_flat,
+  sis_line_smooth,
+  sis_line_flat_w,
+  sis_line_smooth_w,
+  sis_line_flat_t0,
+  sis_line_smooth_t0,
+  sis_line_flat_w_t0,
+  sis_line_smooth_w_t0,
+  sis_line_flat_t1,
+  sis_line_smooth_t1,
+  sis_line_flat_w_t1,
+  sis_line_smooth_w_t1,
+  sis_line_flat_t2,
+  sis_line_smooth_t2,
+  sis_line_flat_w_t2,
+  sis_line_smooth_w_t2,
+};
+
+static line_func sis_agp_draw_line_func[32] = {
+  sis_agp_line_flat,
+  sis_agp_line_smooth,
+  sis_agp_line_flat_w,
+  sis_agp_line_smooth_w,
+  sis_agp_line_flat_t0,
+  sis_agp_line_smooth_t0,
+  sis_agp_line_flat_w_t0,
+  sis_agp_line_smooth_w_t0,
+  sis_agp_line_flat_t1,
+  sis_agp_line_smooth_t1,
+  sis_agp_line_flat_w_t1,
+  sis_agp_line_smooth_w_t1,
+  sis_agp_line_flat_t2,
+  sis_agp_line_smooth_t2,
+  sis_agp_line_flat_w_t2,
+  sis_agp_line_smooth_w_t2,
+};
+
+/* TODO: get another path if not clipped */
+static void
+sis_line_clip (GLcontext * ctx, GLuint vert0, GLuint vert1, GLuint pv)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  BoxPtr pExtents;
+  int count;
+  GLuint x, y;
+  
+  sis_get_drawable_origin (xmesa, &x, &y);
+  sis_get_clip_rects (xmesa, &pExtents, &count);
+
+  while (count--)
+    {
+      DWORD clipTopBottom, clipLeftRight;
+
+      clipTopBottom = ((pExtents->y1 - y) << 13) | (pExtents->y2 - y - 1);
+      clipLeftRight = ((pExtents->x1 - x) << 13) | (pExtents->x2 - x - 1);
+
+      mWait3DCmdQueue (5);
+
+      MMIO (REG_3D_ClipTopBottom, clipTopBottom);
+      MMIO (REG_3D_ClipLeftRight, clipLeftRight);
+
+      (hwcx->LineFunc) (ctx, vert0, vert1, pv);
+      mEndPrimitive ();
+
+      pExtents++;
+    }
+  hwcx->GlobalFlag |= GFLAG_CLIPPING;
+}
+
+static triangle_func sis_fill_triangle_func[32] = {
+  sis_tri_flat,
+  sis_tri_smooth,
+  sis_tri_flat_w,
+  sis_tri_smooth_w,
+  sis_tri_flat_t0,
+  sis_tri_smooth_t0,
+  sis_tri_flat_w_t0,
+  sis_tri_smooth_w_t0,
+  sis_tri_flat_t1,
+  sis_tri_smooth_t1,
+  sis_tri_flat_w_t1,
+  sis_tri_smooth_w_t1,
+  sis_tri_flat_t2,
+  sis_tri_smooth_t2,
+  sis_tri_flat_w_t2,
+  sis_tri_smooth_w_t2,
+};
+
+static triangle_func sis_agp_fill_triangle_func[32] = {
+  sis_agp_tri_flat,
+  sis_agp_tri_smooth,
+  sis_agp_tri_flat_w,
+  sis_agp_tri_smooth_w,
+  sis_agp_tri_flat_t0,
+  sis_agp_tri_smooth_t0,
+  sis_agp_tri_flat_w_t0,
+  sis_agp_tri_smooth_w_t0,
+  sis_agp_tri_flat_t1,
+  sis_agp_tri_smooth_t1,
+  sis_agp_tri_flat_w_t1,
+  sis_agp_tri_smooth_w_t1,
+  sis_agp_tri_flat_t2,
+  sis_agp_tri_smooth_t2,
+  sis_agp_tri_flat_w_t2,
+  sis_agp_tri_smooth_w_t2,
+};
+
+#define USE_XYZ 0x08000000
+#define USE_W   0x04000000
+#define USE_RGB 0x01000000
+#define USE_UV1 0x00400000
+#define USE_UV2 0x00200000
+#define USE_FLAT 0x0001000
+#define USE_SMOOTH 0x0004000
+
+static DWORD AGPParsingValues[32] = {
+  (4 << 28) | USE_XYZ | USE_RGB | USE_FLAT,
+  (4 << 28) | USE_XYZ | USE_RGB | USE_SMOOTH,
+  (5 << 28) | USE_XYZ | USE_W | USE_RGB | USE_FLAT,
+  (5 << 28) | USE_XYZ | USE_W | USE_RGB | USE_SMOOTH,
+  (6 << 28) | USE_XYZ | USE_RGB | USE_UV1 | USE_FLAT,
+  (6 << 28) | USE_XYZ | USE_RGB | USE_UV1 | USE_SMOOTH,
+  (7 << 28) | USE_XYZ | USE_W | USE_RGB | USE_UV1 | USE_FLAT,
+  (7 << 28) | USE_XYZ | USE_W | USE_RGB | USE_UV1 | USE_SMOOTH,
+  (6 << 28) | USE_XYZ | USE_RGB | USE_UV2 | USE_FLAT,
+  (6 << 28) | USE_XYZ | USE_RGB | USE_UV2 | USE_SMOOTH,
+  (7 << 28) | USE_XYZ | USE_W | USE_RGB | USE_UV2 | USE_FLAT,
+  (7 << 28) | USE_XYZ | USE_W | USE_RGB | USE_UV2 | USE_SMOOTH,
+  (8 << 28) | USE_XYZ | USE_RGB | USE_UV1 | USE_UV2 | USE_FLAT,
+  (8 << 28) | USE_XYZ | USE_RGB | USE_UV1 | USE_UV2 | USE_SMOOTH,
+  (9 << 28) | USE_XYZ | USE_W | USE_RGB | USE_UV1 | USE_UV2 | USE_FLAT,
+  (9 << 28) | USE_XYZ | USE_W | USE_RGB | USE_UV1 | USE_UV2 | USE_SMOOTH,
+};
+
+static void
+sis_tri_clip (GLcontext * ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  BoxPtr pExtents;
+  int count;
+  GLuint x, y;
+
+  sis_get_drawable_origin (xmesa, &x, &y);
+  sis_get_clip_rects (xmesa, &pExtents, &count);
+
+  while (count--)
+    {
+      DWORD clipTopBottom, clipLeftRight;
+
+      clipTopBottom = ((pExtents->y1 - y) << 13) | (pExtents->y2 - y - 1);
+      clipLeftRight = ((pExtents->x1 - x) << 13) | (pExtents->x2 - x - 1);
+
+      mWait3DCmdQueue (5);
+
+      MMIO (REG_3D_ClipTopBottom, clipTopBottom);
+      MMIO (REG_3D_ClipLeftRight, clipLeftRight);
+
+      (hwcx->TriangleFunc) (ctx, v0, v1, v2, pv);
+      mEndPrimitive ();
+
+      pExtents++;
+    }
+  hwcx->GlobalFlag |= GFLAG_CLIPPING;
+}
+
+void
+sis_set_render_func (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  GLuint caps = ctx->TriangleCaps;
+  int line_index = 0;
+  int tri_index = 0;
+
+  if(hwcx->swForceRender){
+    ctx->Driver.LineFunc = NULL;
+    ctx->Driver.TriangleFunc = NULL;    
+    return;
+  }
+      
+  ctx->IndirectTriangles &= ~(DD_LINE_SW_RASTERIZE | DD_TRI_SW_RASTERIZE);
+  hwcx->swRenderFlag &= ~(SIS_SW_POINT | SIS_SW_LINE | SIS_SW_TRIANGLE);
+
+/* 
+ * TODO: Mesa 3.3 will set ctx->TriangleCaps to DD_SELECT
+ */
+#if 0
+  if ((caps & (DD_SELECT | DD_FEEDBACK))
+      /* Fixme */
+      || (ctx->Texture.ReallyEnabled & (TEXTURE0_3D | TEXTURE1_3D)))
+    {
+      line_index |= SIS_FALLBACK;
+      tri_index |= SIS_FALLBACK;
+    }
+#endif
+
+  /* always set */
+  hwcx->swRenderFlag |= SIS_SW_POINT;
+
+  if ((caps & DD_LINE_STIPPLE) || (caps & DD_LINE_WIDTH))
+    {
+      line_index |= SIS_FALLBACK;
+      hwcx->swRenderFlag |= SIS_SW_LINE;
+    }
+
+  if ((caps & DD_TRI_STIPPLE))
+    {
+      tri_index |= SIS_FALLBACK;
+      hwcx->swRenderFlag |= SIS_SW_TRIANGLE;
+    }
+
+  if (ctx->Light.ShadeModel == GL_SMOOTH)
+    {
+      line_index |= SIS_SMOOTH;
+      tri_index |= SIS_SMOOTH;
+    }
+
+  if (ctx->RasterMask & FOG_BIT)
+    {
+      line_index |= SIS_USE_W;
+      tri_index |= SIS_USE_W;
+    }
+
+  if (ctx->Texture.ReallyEnabled)
+    {
+      line_index |= SIS_USE_W;
+      tri_index |= SIS_USE_W;
+
+      if (ctx->Texture.ReallyEnabled & TEXTURE0_ANY)
+	{	  
+	  line_index |= SIS_TEXTURE0;
+	  tri_index |= SIS_TEXTURE0;
+	}
+      if (ctx->Texture.ReallyEnabled & TEXTURE1_ANY)
+	{
+	  line_index |= SIS_TEXTURE1;
+	  tri_index |= SIS_TEXTURE1;
+	}
+    }
+
+  /* TODO, use Pick */
+  hwcx->UseAGPCmdMode = GL_FALSE;
+
+  if (line_index & SIS_FALLBACK)
+    {
+      ctx->IndirectTriangles |= DD_LINE_SW_RASTERIZE;
+      hwcx->LineFunc = NULL;
+    }
+  else
+    {
+      if ((ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT) &&
+	  sis_is_window (xmesa))
+	{
+	  hwcx->LineFunc = sis_draw_line_func[line_index];
+	  ctx->Driver.LineFunc = sis_line_clip;
+	}
+      else
+	{
+	  if (hwcx->AGPCmdModeEnabled)
+	    {
+	      ctx->Driver.LineFunc = sis_agp_draw_line_func[line_index];
+	      hwcx->UseAGPCmdMode = GL_TRUE;
+	    }
+	  else
+	    {
+	      ctx->Driver.LineFunc = sis_draw_line_func[line_index];
+	    }
+	}
+    }
+
+  if (tri_index & SIS_FALLBACK)
+    {
+      ctx->IndirectTriangles |= DD_TRI_SW_RASTERIZE;
+      hwcx->TriangleFunc = NULL;
+    }
+  else
+    {
+      if ((ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT) &&
+	  sis_is_window (xmesa))
+	{
+	  hwcx->TriangleFunc = sis_fill_triangle_func[tri_index];
+	  ctx->Driver.TriangleFunc = sis_tri_clip;
+	}
+      else
+	{
+	  if (hwcx->AGPCmdModeEnabled)
+	    {
+	      ctx->Driver.TriangleFunc = sis_agp_fill_triangle_func[tri_index];
+	      hwcx->UseAGPCmdMode = GL_TRUE;
+	    }
+	  else
+	    {
+	      ctx->Driver.TriangleFunc = sis_fill_triangle_func[tri_index];
+	    }
+	}
+    }
+	
+  /* fast path */
+  if(!(ctx->TriangleCaps & (DD_TRI_UNFILLED | DD_TRI_LIGHT_TWOSIDE)) &&
+     (ctx->Driver.TriangleFunc == sis_agp_tri_smooth_w_t2) &&
+     (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT)){
+    hwcx->useFastPath = GL_TRUE;
+  }
+  else{
+    hwcx->useFastPath = GL_FALSE;
+  }
+	   	       
+  /* TODO: AGP and MMIO use different sis_set_render_state */
+  hwcx->AGPParseSet &= ~0xffff7000;
+  hwcx->AGPParseSet |= AGPParsingValues[line_index & ~SIS_FALLBACK];
+
+  /* Debug, test sw-render 
+  ctx->Driver.LineFunc = NULL;
+  ctx->Driver.TriangleFunc = NULL;  
+  */
+}
+
+void
+sis_StartAGP (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  DWORD start, end;
+
+  start = *(hwcx->pAGPCmdBufNext);
+  end = start + AGP_ALLOC_SIZE;
+  if (end >= hwcx->AGPCmdBufSize)
+    {
+      start = 0;
+      end = AGP_ALLOC_SIZE;
+    }
+
+  /*
+   * TODO: use AGP_EngineOffset to get a safe value and not query current
+   * postion processed every time
+   * ?? use < instead of <=
+   */
+  do
+    {
+      AGP_EngineOffset =
+	*(DWORD volatile *) (GET_IOBase (hwcx) + REG_3D_AGPCmBase) -
+	(DWORD) hwcx->AGPCmdBufAddr;
+    }
+  while ((AGP_EngineOffset <= end) && (AGP_EngineOffset >= start)
+	 && ((*(GET_IOBase (hwcx) + 0x8243) & 0xe0) != 0xe0));
+
+  AGP_StartPtr = (DWORD *) (start + hwcx->AGPCmdBufBase);
+  AGP_CurrentPtr = (float *) AGP_StartPtr;
+}
+
+void
+sis_FlushAGP (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  /* TODO: wait queue length */
+
+  if((DWORD *)AGP_CurrentPtr == AGP_StartPtr)
+    {
+      return;
+    }
+
+  /* debug
+  d2f_once(ctx); 
+  */
+     
+  mWait3DCmdQueue (5);
+  mEndPrimitive ();
+  MMIO (REG_3D_AGPCmBase, ((DWORD) AGP_StartPtr - (DWORD) hwcx->AGPCmdBufBase)
+	+ (DWORD) hwcx->AGPCmdBufAddr);
+  MMIO (REG_3D_AGPTtDwNum,
+	(((DWORD) AGP_CurrentPtr - (DWORD) AGP_StartPtr) >> 2) | 0x50000000);
+  MMIO (REG_3D_ParsingSet, hwcx->AGPParseSet);
+
+  MMIO (REG_3D_AGPCmFire, (DWORD) (-1));
+  mEndPrimitive ();
+
+  *(hwcx->pAGPCmdBufNext) =
+    (DWORD) AGP_CurrentPtr - (DWORD) hwcx->AGPCmdBufBase;
+  *(hwcx->pAGPCmdBufNext) = (*(hwcx->pAGPCmdBufNext) + 0xf) & ~0xf;
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_span.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_span.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_span.c	Fri Jun 30 12:30:26 2000
@@ -0,0 +1,285 @@
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+#define DBG 0
+
+/* from mga */
+/* TODO: should lock drawable in these routines because glBitmap will
+ *       call this function without locking, or modify sis_Bitmap
+ */
+
+#define LOCAL_VARS					\
+   XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;  \
+   __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private; \
+   GLuint pitch = hwcx->swRenderPitch;			\
+   char *buf = hwcx->swRenderBase			
+
+#define CLIPPIXEL(_x,_y) (_x >= minx && _x < maxx && \
+			  _y >= miny && _y < maxy)
+
+#define CLIPSPAN(_x,_y,_n,_x1,_n1,_i)				\
+	 if (_y < miny || _y >= maxy) _n1 = 0, _x1 = x;		\
+         else {							\
+            _n1 = _n;						\
+	    _x1 = _x;						\
+	    if (_x1 < minx) _i += (minx - _x1), _x1 = minx;	\
+	    if (_x1 + _n1 > maxx) n1 -= (_x1 + n1 - maxx);	\
+         }
+
+#define HW_LOCK() do{}while(0);
+
+#define HW_CLIPLOOP()						\
+  do {								\
+    BoxPtr _pExtents;                                           \
+    int _nc;                                                    \
+    GLuint _x, _y;                    			        \
+    sis_get_drawable_origin (xmesa, &_x, &_y);                  \
+    sis_get_clip_rects (xmesa, &_pExtents, &_nc);               \
+    while (_nc--) {						\
+       int minx = _pExtents->x1 - _x;	\
+       int miny = _pExtents->y1 - _y; 	\
+       int maxx = _pExtents->x2 - _x;	\
+       int maxy = _pExtents->y2 - _y;   \
+       _pExtents++;
+       
+#define HW_ENDCLIPLOOP()			\
+    }						\
+  } while (0)
+
+#define HW_UNLOCK() do{}while(0);
+
+/* RGB565 */
+#define INIT_MONO_PIXEL(p) \
+   GLushort p = hwcx->pixelValue;
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )				\
+   *(GLushort *)(buf + _x*2 + _y*pitch)  = ( ((r & 0xf8) << 8) |	\
+		                             ((g & 0xfc) << 3) |	\
+		                             (b >> 3))
+
+#define WRITE_PIXEL( _x, _y, p )  \
+   *(GLushort *)(buf + _x*2 + _y*pitch) = p
+
+#define READ_RGBA( rgba, _x, _y )			\
+do {							\
+   GLushort p = *(GLushort *)(buf + _x*2 + _y*pitch);	\
+   rgba[0] = (p & 0xf800) >> 8;				\
+   rgba[1] = (p & 0x07e0) >> 3;			        \
+   rgba[2] = (p & 0x001f) << 3;			        \
+   rgba[3] = 0;			         		\
+} while(0)
+
+#define TAG(x) sis_##x##_565
+#include "spantmp.h"
+static void sis_Color_565( GLcontext *ctx,
+                  GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
+{
+   XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+   __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+   
+   hwcx->pixelValue = ((red & 0xf8) << 8) |
+                      ((green & 0xfc) << 3) |
+                      (blue >> 3);
+}                  
+
+
+/* ARGB8888 */
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p) \
+   GLuint p = hwcx->pixelValue;
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )			\
+   *(GLuint *)(buf + _x*4 + _y*pitch)  = ( ((a) << 24) |        \
+                                           ((r) << 16) |	\
+		                           ((g) << 8) |		\
+                         		   ((b)))
+
+#define WRITE_PIXEL( _x, _y, p )  \
+   *(GLuint *)(buf + _x*4 + _y*pitch)  = p
+
+#define READ_RGBA( rgba, _x, _y )			\
+do {							\
+   GLuint p = *(GLuint *)(buf + _x*4 + _y*pitch);	\
+   rgba[0] = (p >> 16) & 0xff;				\
+   rgba[1] = (p >> 8) & 0xff;				\
+   rgba[2] = (p >> 0) & 0xff;				\
+   rgba[3] = (p >> 24) & 0xff;			        \
+} while(0)
+
+#define TAG(x) sis_##x##_8888
+#include "spantmp.h"
+static void sis_Color_8888( GLcontext *ctx,
+                  GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
+{
+   XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+   __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+   
+   hwcx->pixelValue = (red << 16) |
+                      (green << 8) |
+                      (blue) |
+                      (alpha << 24);
+}                  
+
+void sis_sw_init_driver( GLcontext *ctx )
+{
+   XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+   __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+   if (hwcx->colorFormat == DST_FORMAT_RGB_565) {
+      ctx->Driver.Color = sis_Color_565;      
+      ctx->Driver.WriteRGBASpan = sis_WriteRGBASpan_565;
+      ctx->Driver.WriteRGBSpan = sis_WriteRGBSpan_565;
+      ctx->Driver.WriteMonoRGBASpan = sis_WriteMonoRGBASpan_565;
+      ctx->Driver.WriteRGBAPixels = sis_WriteRGBAPixels_565;
+      ctx->Driver.WriteMonoRGBAPixels = sis_WriteMonoRGBAPixels_565;
+      ctx->Driver.ReadRGBASpan = sis_ReadRGBASpan_565;
+      ctx->Driver.ReadRGBAPixels = sis_ReadRGBAPixels_565;
+   } 
+   else if(hwcx->colorFormat == DST_FORMAT_ARGB_8888){
+      ctx->Driver.Color = sis_Color_8888;      
+      ctx->Driver.WriteRGBASpan = sis_WriteRGBASpan_8888;
+      ctx->Driver.WriteRGBSpan = sis_WriteRGBSpan_8888;
+      ctx->Driver.WriteMonoRGBASpan = sis_WriteMonoRGBASpan_8888;
+      ctx->Driver.WriteRGBAPixels = sis_WriteRGBAPixels_8888;
+      ctx->Driver.WriteMonoRGBAPixels = sis_WriteMonoRGBAPixels_8888;
+      ctx->Driver.ReadRGBASpan = sis_ReadRGBASpan_8888;
+      ctx->Driver.ReadRGBAPixels = sis_ReadRGBAPixels_8888;
+   }
+   else{
+     assert(0);
+   }
+
+   ctx->Driver.WriteCI8Span        =NULL;
+   ctx->Driver.WriteCI32Span       =NULL;
+   ctx->Driver.WriteMonoCISpan     =NULL;
+   ctx->Driver.WriteCI32Pixels     =NULL;
+   ctx->Driver.WriteMonoCIPixels   =NULL;
+   ctx->Driver.ReadCI32Span        =NULL;
+   ctx->Driver.ReadCI32Pixels      =NULL;
+}
+
+/* Depth/Stencil Functions
+ * use sizeof(GLdepth) to know the Z rnage of mesa is
+ * 0 ~ 2^16-1 or 0 ~ 2^32-1
+ */
+#define SIS_SW_Z_BASE(x,y) \
+   ((SIS_SW_DTYPE *)(hwcx->swZBase + (x)*sizeof(SIS_SW_DTYPE) + \
+       (y)*hwcx->swZPitch))
+
+/* Z16 */
+#define SIS_TAG(x) x##_Z16
+#define SIS_SW_DTYPE GLushort
+#define SIS_SW_D2I(D,I) \
+  do{ \
+    if(sizeof(GLdepth) == 2) \
+      I = D; \
+    else \
+      I = D << 16; \
+  }while(0)
+#define SIS_SW_I2D(I,D) \
+  do{ \
+    if(sizeof(GLdepth) == 2) \
+      D = I; \
+    else \
+      D = I >> 16; \
+  }while(0)
+#include "sis_swzfunc.h"
+
+/* Z32 */
+#define SIS_TAG(x) x##_Z32
+#define SIS_SW_DTYPE GLuint
+#define SIS_SW_D2I(D,I) \
+  do{ \
+    if(sizeof(GLdepth) == 4) \
+      I = D; \
+    else \
+      I = D >> 16; \
+  }while(0)
+#define SIS_SW_I2D(I,D) \
+  do{ \
+    if(sizeof(GLdepth) == 4) \
+      D = I; \
+    else \
+      D = I << 16; \
+  }while(0)
+#include "sis_swzfunc.h"
+
+#define SIS_SW_STENCIL_FUNC
+
+/* S8Z24 */
+# define SIS_TAG(x) x##_S8Z24
+# define SIS_SW_DTYPE GLuint
+# define SIS_SW_D2I(D,I) \
+   do{ \
+    if(sizeof(GLdepth) == 4) \
+      I = (D << 8); \
+    else \
+      I = (D >> 8); \
+   }while(0)
+# define SIS_SW_I2D(I,D) \
+   do{ \
+    if(sizeof(GLdepth) == 4){ \
+      D &= 0xff000000; \
+      D |= (I >> 8); \
+    } \
+    else{ \
+      D &= 0xff000000; \
+      D |= (I << 8); \
+    } \
+   }while(0)
+# define SIS_SW_S2I(S,I) \
+   do{ \
+     I = (S >> 24); \
+   }while(0)
+# define SIS_SW_I2S(I,S) \
+   do{ \
+     S &= 0x00ffffff; \
+     S |= (I << 24); \
+   }while(0)
+# include "sis_swzfunc.h"
+
+#undef SIS_SW_STENCIL_FUNC
+
+void
+sis_sw_set_zfuncs_static (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  switch (hwcx->zFormat)
+    {
+    case Z_16:
+      ctx->Driver.ReadDepthSpan = sis_ReadDepthSpan_Z16;
+      ctx->Driver.ReadDepthPixels = sis_ReadDepthPixels_Z16;
+      ctx->Driver.WriteDepthSpan = sis_WriteDepthSpan_Z16;
+      ctx->Driver.WriteDepthPixels = sis_WriteDepthPixels_Z16;
+
+      ctx->Driver.ReadStencilSpan = NULL;
+      ctx->Driver.ReadStencilPixels = NULL;
+      ctx->Driver.WriteStencilSpan = NULL;
+      ctx->Driver.WriteStencilPixels = NULL;
+      break;
+    case Z_32:
+      ctx->Driver.ReadDepthSpan = sis_ReadDepthSpan_Z32;
+      ctx->Driver.ReadDepthPixels = sis_ReadDepthPixels_Z32;
+      ctx->Driver.WriteDepthSpan = sis_WriteDepthSpan_Z32;
+      ctx->Driver.WriteDepthPixels = sis_WriteDepthPixels_Z32;
+
+      ctx->Driver.ReadStencilSpan = NULL;
+      ctx->Driver.ReadStencilPixels = NULL;
+      ctx->Driver.WriteStencilSpan = NULL;
+      ctx->Driver.WriteStencilPixels = NULL;
+      break;
+    case S_8_Z_24:
+      ctx->Driver.ReadDepthSpan = sis_ReadDepthSpan_S8Z24;
+      ctx->Driver.ReadDepthPixels = sis_ReadDepthPixels_S8Z24;
+      ctx->Driver.WriteDepthSpan = sis_WriteDepthSpan_S8Z24;
+      ctx->Driver.WriteDepthPixels = sis_WriteDepthPixels_S8Z24;
+
+      ctx->Driver.ReadStencilSpan = sis_ReadStencilSpan_S8Z24;
+      ctx->Driver.ReadStencilPixels = sis_ReadStencilPixels_S8Z24;
+      ctx->Driver.WriteStencilSpan = sis_WriteStencilSpan_S8Z24;
+      ctx->Driver.WriteStencilPixels = sis_WriteStencilPixels_S8Z24;
+      break;
+    }
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_stencil.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_stencil.c:1.1
--- /dev/null	Sat Jul  1 20:44:36 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_stencil.c	Fri Jun 30 12:30:27 2000
@@ -0,0 +1,149 @@
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+void
+sis_StencilFunc (GLcontext * ctx, GLenum func, GLint ref, GLuint mask)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  /* set reference */ 
+  current->hwStSetting = ((DWORD) ref << 8) | mask;
+
+  current->hwStSetting &= ~0x07000000;
+  switch (func)
+    {
+    case GL_NEVER:
+      current->hwStSetting |= SiS_STENCIL_NEVER;
+      break;
+    case GL_LESS:
+      current->hwStSetting |= SiS_STENCIL_LESS;
+      break;
+    case GL_EQUAL:
+      current->hwStSetting |= SiS_STENCIL_EQUAL;
+      break;
+    case GL_LEQUAL:
+      current->hwStSetting |= SiS_STENCIL_LEQUAL;
+      break;
+    case GL_GREATER:
+      current->hwStSetting |= SiS_STENCIL_GREATER;
+      break;
+    case GL_NOTEQUAL:
+      current->hwStSetting |= SiS_STENCIL_NOTEQUAL;
+      break;
+    case GL_GEQUAL:
+      current->hwStSetting |= SiS_STENCIL_GEQUAL;
+      break;
+    case GL_ALWAYS:
+      current->hwStSetting |= SiS_STENCIL_ALWAYS;
+      break;
+    }
+
+  if ((current->hwStSetting2 ^ prev->hwStSetting2) ||
+      (current->hwStSetting ^ prev->hwStSetting))
+    {
+      prev->hwStSetting = current->hwStSetting;
+      prev->hwStSetting2 = current->hwStSetting2;
+
+      hwcx->GlobalFlag |= GFLAG_STENCILSETTING;
+    }
+}
+
+void
+sis_StencilMask (GLcontext * ctx, GLuint mask)
+{
+  if (!ctx->Visual->StencilBits)
+    return;
+
+  /* set Z buffer Write Enable */
+  sis_DepthMask (ctx, ctx->Depth.Mask);
+}
+
+void
+sis_StencilOp (GLcontext * ctx, GLenum fail, GLenum zfail, GLenum zpass)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  current->hwStSetting2 &= ~0x00777000;
+
+  switch (fail)
+    {
+    case GL_KEEP:
+      current->hwStSetting2 |= SiS_SFAIL_KEEP;
+      break;
+    case GL_ZERO:
+      current->hwStSetting2 |= SiS_SFAIL_ZERO;
+      break;
+    case GL_REPLACE:
+      current->hwStSetting2 |= SiS_SFAIL_REPLACE;
+      break;
+    case GL_INVERT:
+      current->hwStSetting2 |= SiS_SFAIL_INVERT;
+      break;
+    case GL_INCR:
+      current->hwStSetting2 |= SiS_SFAIL_INCR;
+      break;
+    case GL_DECR:
+      current->hwStSetting2 |= SiS_SFAIL_DECR;
+      break;
+    }
+
+  switch (zfail)
+    {
+    case GL_KEEP:
+      current->hwStSetting2 |= SiS_SPASS_ZFAIL_KEEP;
+      break;
+    case GL_ZERO:
+      current->hwStSetting2 |= SiS_SPASS_ZFAIL_ZERO;
+      break;
+    case GL_REPLACE:
+      current->hwStSetting2 |= SiS_SPASS_ZFAIL_REPLACE;
+      break;
+    case GL_INVERT:
+      current->hwStSetting2 |= SiS_SPASS_ZFAIL_INVERT;
+      break;
+    case GL_INCR:
+      current->hwStSetting2 |= SiS_SPASS_ZFAIL_INCR;
+      break;
+    case GL_DECR:
+      current->hwStSetting2 |= SiS_SPASS_ZFAIL_DECR;
+      break;
+    }
+
+  switch (zpass)
+    {
+    case GL_KEEP:
+      current->hwStSetting2 |= SiS_SPASS_ZPASS_KEEP;
+      break;
+    case GL_ZERO:
+      current->hwStSetting2 |= SiS_SPASS_ZPASS_ZERO;
+      break;
+    case GL_REPLACE:
+      current->hwStSetting2 |= SiS_SPASS_ZPASS_REPLACE;
+      break;
+    case GL_INVERT:
+      current->hwStSetting2 |= SiS_SPASS_ZPASS_INVERT;
+      break;
+    case GL_INCR:
+      current->hwStSetting2 |= SiS_SPASS_ZPASS_INCR;
+      break;
+    case GL_DECR:
+      current->hwStSetting2 |= SiS_SPASS_ZPASS_DECR;
+      break;
+    }
+
+  if ((current->hwStSetting2 ^ prev->hwStSetting2) ||
+      (current->hwStSetting ^ prev->hwStSetting))
+    {
+      prev->hwStSetting = current->hwStSetting;
+      prev->hwStSetting2 = current->hwStSetting2;
+
+      hwcx->GlobalFlag |= GFLAG_STENCILSETTING;
+
+    }
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_swzfunc.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_swzfunc.h:1.1
--- /dev/null	Sat Jul  1 20:44:37 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_swzfunc.h	Fri Jun 30 12:30:27 2000
@@ -0,0 +1,153 @@
+static void SIS_TAG (sis_WriteDepthSpan) (GLcontext * ctx, GLuint n, GLint x,
+					  GLint y, const GLdepth depth[],
+					  const GLubyte mask[])
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIS_SW_DTYPE *base = SIS_SW_Z_BASE (x, Y_FLIP (y));
+
+  int i;
+  for (i = 0; i < n; i++, base++)
+    {
+      if (mask[i])
+	SIS_SW_I2D (depth[i], *base);
+    }
+}
+
+static void SIS_TAG (sis_ReadDepthSpan) (GLcontext * ctx, GLuint n, GLint x,
+					 GLint y, GLdepth depth[])
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIS_SW_DTYPE *base = SIS_SW_Z_BASE (x, Y_FLIP (y));
+
+  int i;
+  for (i = 0; i < n; i++, base++)
+    {
+      SIS_SW_D2I (*base, depth[i]);
+    }
+}
+
+static void SIS_TAG (sis_WriteDepthPixels) (GLcontext * ctx, GLuint n,
+					    const GLint x[], const GLint y[],
+					    const GLdepth depth[],
+					    const GLubyte mask[])
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIS_SW_DTYPE *base;
+
+  int i;
+  for (i = 0; i < n; i++, base++)
+    {
+      if (mask[i])
+	{
+	  base = SIS_SW_Z_BASE (x[i], Y_FLIP (y[i]));
+	  SIS_SW_I2D (depth[i], *base);
+	}
+    }
+}
+
+static void SIS_TAG (sis_ReadDepthPixels) (GLcontext * ctx, GLuint n,
+					   const GLint x[], const GLint y[],
+					   GLdepth depth[])
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIS_SW_DTYPE *base;
+
+  int i;
+  for (i = 0; i < n; i++, base++)
+    {
+      base = SIS_SW_Z_BASE (x[i], Y_FLIP (y[i]));
+      SIS_SW_D2I (*base, depth[i]);
+    }
+}
+
+#ifdef SIS_SW_STENCIL_FUNC
+
+static void SIS_TAG (sis_WriteStencilSpan) (GLcontext * ctx, GLuint n,
+					    GLint x, GLint y,
+					    const GLstencil depth[],
+					    const GLubyte mask[])
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIS_SW_DTYPE *base = SIS_SW_Z_BASE (x, Y_FLIP (y));
+
+  int i;
+  for (i = 0; i < n; i++, base++)
+    {
+      if (mask[i])
+	SIS_SW_I2S (depth[i], *base);
+    }
+}
+
+static void SIS_TAG (sis_ReadStencilSpan) (GLcontext * ctx, GLuint n, GLint x,
+					   GLint y, GLstencil depth[])
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIS_SW_DTYPE *base = SIS_SW_Z_BASE (x, Y_FLIP (y));
+
+  int i;
+  for (i = 0; i < n; i++, base++)
+    {
+      SIS_SW_S2I (*base, depth[i]);
+    }
+}
+
+static void SIS_TAG (sis_WriteStencilPixels) (GLcontext * ctx, GLuint n,
+					      const GLint x[],
+					      const GLint y[],
+					      const GLstencil depth[],
+					      const GLubyte mask[])
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIS_SW_DTYPE *base;
+
+  int i;
+  for (i = 0; i < n; i++, base++)
+    {
+      if (mask[i])
+	{
+	  base = SIS_SW_Z_BASE (x[i], Y_FLIP (y[i]));
+	  SIS_SW_I2S (depth[i], *base);
+	}
+    }
+}
+
+static void SIS_TAG (sis_ReadStencilPixels) (GLcontext * ctx, GLuint n,
+					     const GLint x[], const GLint y[],
+					     GLstencil depth[])
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIS_SW_DTYPE *base;
+
+  int i;
+  for (i = 0; i < n; i++, base++)
+    {
+      base = SIS_SW_Z_BASE (x[i], Y_FLIP (y[i]));
+      SIS_SW_S2I (*base, depth[i]);
+    }
+}
+
+# undef SIS_SW_S2I
+# undef SIS_SW_I2S
+
+#endif
+
+#undef SIS_TAG
+#undef SIS_SW_DTYPE
+#undef SIS_SW_D2I
+#undef SIS_SW_I2D
Index: xc/lib/GL/mesa/src/drv/sis/sis_texture.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_texture.c:1.1
--- /dev/null	Sat Jul  1 20:44:37 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_texture.c	Fri Jun 30 12:30:28 2000
@@ -0,0 +1,884 @@
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+static void
+sis_set_texture_env0 (GLcontext * ctx, GLtextureObject * object, int unit);
+
+static void
+sis_set_texture_env1 (GLcontext * ctx, GLtextureObject * object, int unit);
+
+static void
+sis_set_texobj_parm (GLcontext * ctx, GLtextureObject * object, int hw_unit);
+
+static void sis_reset_texture_env (GLcontext * ctx, int hw_unit);
+
+static DWORD TransferTexturePitch (DWORD dwPitch);
+
+void
+sis_validate_texture (GLcontext * ctx)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  struct gl_texture_unit *tex_unit;
+  struct gl_texture_object *tObj;
+  sisTexobjInfo *texObjArea;
+
+  if(ctx->Texture.ReallyEnabled & (TEXTURE0_3D | TEXTURE1_3D)) 
+    {
+      hwcx->swRenderFlag |= SIS_SW_TEXTURE_DIM;
+      return;        
+    }
+  else
+    {
+      hwcx->swRenderFlag &= ~SIS_SW_TEXTURE_DIM;    
+    }
+
+  if ((ctx->Texture.ReallyEnabled & TEXTURE0_ANY) &&
+      (ctx->Texture.ReallyEnabled & TEXTURE1_ANY))
+    {
+      int unit;
+
+      for (unit = 0; unit <= 1; unit++)
+	{
+	  tex_unit = &ctx->Texture.Unit[unit];
+	  tObj = tex_unit->Current;
+	  texObjArea = (sisTexobjInfo *) tObj->DriverData;
+
+	  if (hwcx->TexStates[unit] & NEW_TEXTURING)
+	  {
+            hwcx->swRenderFlag &= ~(SIS_SW_TEXTURE_OBJ << unit);
+	    sis_set_texobj_parm (ctx, tObj, unit);
+          }
+          
+	  if (hwcx->TexStates[unit] & NEW_TEXTURE_ENV)
+	    {
+              hwcx->swRenderFlag &= ~(SIS_SW_TEXTURE_ENV << unit);
+	      if (unit == 0)
+		sis_set_texture_env0 (ctx, tObj, unit);
+	      else
+		sis_set_texture_env1 (ctx, tObj, unit);
+	    }
+
+	  hwcx->TexStates[unit] = 0;
+	}
+    }
+  else
+    {
+      int unit = (ctx->Texture.ReallyEnabled & TEXTURE0_ANY) ? 0 : 1;
+
+      tex_unit = &ctx->Texture.Unit[unit];
+      tObj = tex_unit->Current;
+      texObjArea = (sisTexobjInfo *) tObj->DriverData;
+
+      if (hwcx->TexStates[unit] & NEW_TEXTURING)
+	sis_set_texobj_parm (ctx, tObj, unit);
+
+      if (hwcx->TexStates[unit] & NEW_TEXTURE_ENV)
+	{
+	  if(unit == 0){
+	    sis_set_texture_env0 (ctx, tObj, unit);
+	    sis_reset_texture_env (ctx, 1);
+	  }
+	  else{
+	    sis_set_texture_env1 (ctx, tObj, unit);
+	    sis_reset_texture_env (ctx, 0);
+	  }
+	}
+
+      hwcx->TexStates[unit] = 0;
+    }
+}
+
+void 
+sis_TexEnv( GLcontext *ctx, GLenum target, GLenum pname,
+            const GLfloat *param )
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  hwcx->TexStates[ctx->Texture.CurrentUnit] |= NEW_TEXTURE_ENV;
+}
+
+void
+sis_TexImage (GLcontext * ctx, GLenum target,
+	      struct gl_texture_object *tObj, GLint level,
+	      GLint internalFormat, const struct gl_texture_image *image)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIStextureArea *area;
+
+  if (target == GL_TEXTURE_3D || image->Border)
+    {
+      return;
+    }
+
+  if (!tObj->DriverData)
+    {
+      sisTexobjInfo *info;
+      
+      info = (sisTexobjInfo *)calloc (1, sizeof (sisTexobjInfo));
+      
+      /* TODO */
+      assert(info);
+      
+      info->prev = info->next = NULL;
+      info->valid = GL_FALSE;
+      tObj->DriverData = info;      
+    }
+
+  if (image->DriverData)
+    {
+      /* image has a copy in video memory, and it may be in the cache */
+
+      ((sisTexobjInfo *) tObj->DriverData)->dirtyFlag |= SIS_TEX_ALL;
+    }
+  else
+    {
+      /* Optimize */
+      
+      ((sisTexobjInfo *) tObj->DriverData)->dirtyFlag |= (SIS_TEX_PARAMETER
+							  | SIS_TEX_ENV);
+    }
+
+  sis_alloc_texture_image (ctx, (struct gl_texture_image *) image);
+
+  area = (SIStextureArea *) image->DriverData;
+  assert (area->Data);
+
+  if (area->Format == GL_RGB8)
+    {
+      int i;
+      GLbyte *src = image->Data;
+      GLbyte *dst = area->Data;
+
+      for (i = 0; i < area->Size / 4; i++)
+	{
+          *(DWORD *)dst = *(DWORD *)src & 0x00ffffff;
+	  src += 3;
+	  dst += 4;
+	}
+    }
+  else
+    {
+      memcpy (area->Data, image->Data, area->Size);
+    }
+
+  if (hwcx->PrevTexFormat[ctx->Texture.CurrentUnit] != area->Format)
+    {
+      hwcx->TexStates[ctx->Texture.CurrentUnit] |= NEW_TEXTURE_ENV;
+      hwcx->PrevTexFormat[ctx->Texture.CurrentUnit] = area->Format;
+    }
+  hwcx->TexStates[ctx->Texture.CurrentUnit] |= NEW_TEXTURING;
+}
+
+void
+sis_TexSubImage (GLcontext * ctx, GLenum target,
+		 struct gl_texture_object *tObj, GLint level, GLint xoffset,
+		 GLint yoffset, GLsizei width, GLsizei height, GLint
+		 internalFormat, const struct gl_texture_image *image)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  SIStextureArea *area;
+  int i, j;
+  GLbyte *src, *dst;
+  GLuint soffset, doffset;
+
+  area = (SIStextureArea *) image->DriverData;
+
+  hwcx->clearTexCache = GL_TRUE;
+
+  {
+    /*
+     * Optimize
+     */
+    WaitEngIdle (hwcx);
+  }
+
+  if (area->Format == GL_RGB8)
+    {
+      src = image->Data + (xoffset + yoffset * image->Width) * 3;
+      dst = area->Data + (xoffset + yoffset * image->Width) * 4;
+      soffset = (image->Width - width) * 3;
+      doffset = (image->Width - width) * 4;
+      for (j = yoffset; j < yoffset + height; j++)
+	{
+	  for (i = xoffset; i < xoffset + width; i++)
+	    {
+              *(DWORD *)dst = *(DWORD *)src & 0x00ffffff;
+	      src += 3;
+	      dst += 4;
+	    }
+	  src += soffset;
+	  dst += doffset;
+	}
+    }
+  else
+    {
+      GLuint texelSize = area->texelSize;
+      GLuint copySize = texelSize * width;
+
+      src = image->Data + (xoffset + yoffset * image->Width) * texelSize;
+      dst = area->Data + (xoffset + yoffset * image->Width) * texelSize;
+      soffset = image->Width * texelSize;
+
+      for (j = yoffset; j < yoffset + height; j++)
+	{
+	  memcpy (dst, src, copySize);
+	  src += soffset;
+	  dst += soffset;
+	}
+    }
+}
+
+void
+sis_TexParameter (GLcontext * ctx, GLenum target,
+		  struct gl_texture_object *tObj, GLenum pname, const
+		  GLfloat * params)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  if (tObj->DriverData)
+    ((sisTexobjInfo *) tObj->DriverData)->dirtyFlag |= SIS_TEX_PARAMETER;
+
+  hwcx->TexStates[ctx->Texture.CurrentUnit] |= NEW_TEXTURING;
+}
+
+void
+sis_BindTexture (GLcontext * ctx, GLenum target,
+		 struct gl_texture_object *tObj)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  SIStextureArea *area;
+
+  if (!tObj->Image[0])
+    return;
+
+  if (!(area = (SIStextureArea *) tObj->Image[0]->DriverData))
+    return;
+
+  if (hwcx->PrevTexFormat[ctx->Texture.CurrentUnit] != area->Format)
+    {
+      hwcx->TexStates[ctx->Texture.CurrentUnit] |= NEW_TEXTURE_ENV;
+      hwcx->PrevTexFormat[ctx->Texture.CurrentUnit] = area->Format;
+    }
+  hwcx->TexStates[ctx->Texture.CurrentUnit] |= NEW_TEXTURING;
+}
+
+void
+sis_DeleteTexture (GLcontext * ctx, struct gl_texture_object *tObj)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  int i;
+
+  for (i = 0; i < MAX_TEXTURE_LEVELS; i++)
+    {
+      if (tObj->Image[i])
+	sis_free_texture_image (tObj->Image[i]);
+    }
+
+  if (tObj->DriverData)
+    {
+      free (tObj->DriverData);
+      tObj->DriverData = NULL;
+    }
+  else
+    {
+      /* 
+       * this shows the texture is default object and never be a 
+       * argument of sis_TexImage
+       */
+    }
+
+  hwcx->clearTexCache = GL_TRUE;
+}
+
+void
+sis_UpdateTexturePalette (GLcontext * ctx, struct gl_texture_object *tObj)
+{
+
+}
+
+void
+sis_UseGlobalTexturePalette (GLcontext * ctx, GLboolean state)
+{
+
+}
+
+void
+sis_ActiveTexture (GLcontext * ctx, GLuint texUnitNumber)
+{
+}
+
+GLboolean sis_IsTextureResident (GLcontext * ctx, struct gl_texture_object *t)
+{
+  return GL_TRUE;
+}
+
+void
+sis_PrioritizeTexture (GLcontext * ctx,
+		       struct gl_texture_object *t, GLclampf priority)
+{
+}
+
+static void
+sis_set_texture_env0 (GLcontext * ctx, GLtextureObject * object, int unit)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  struct gl_texture_unit *texture_unit = &ctx->Texture.Unit[unit];
+
+  GLtextureImage *image = object->Image[0];
+  SIStextureArea *area = (SIStextureArea *) image->DriverData;
+
+  /*
+     current->hwTexBlendClr1 = RGB_STAGE1; 
+     current->hwTexBlendAlpha1 = A_STAGE1;
+   */
+
+  switch (texture_unit->EnvMode)
+    {
+    case GL_REPLACE:
+      switch (area->Format)
+	{
+	case GL_ALPHA8:
+	  current->hwTexBlendClr0 = A_REPLACE_RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = A_REPLACE_A_STAGE0;
+	  break;
+	case GL_INTENSITY8:
+	case GL_RGB8:
+	  current->hwTexBlendClr0 = RGB_REPLACE__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = RGB_REPLACE__A_STAGE0;
+	  break;
+	case GL_LUMINANCE8:
+	case GL_LUMINANCE8_ALPHA8:
+	case GL_RGBA8:
+	  current->hwTexBlendClr0 = RGBA_REPLACE__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = RGBA_REPLACE__A_STAGE0;
+	  break;
+	}
+      break;
+
+    case GL_MODULATE:
+      switch (area->Format)
+	{
+	case GL_ALPHA8:
+	  current->hwTexBlendClr0 = A_MODULATE_RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = A_MODULATE_A_STAGE0;
+	  break;
+	case GL_LUMINANCE8:
+	case GL_RGB8:
+	  current->hwTexBlendClr0 = RGB_MODULATE__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = RGB_MODULATE__A_STAGE0;
+	  break;
+	case GL_INTENSITY8:
+	case GL_LUMINANCE8_ALPHA8:
+	case GL_RGBA8:
+	  current->hwTexBlendClr0 = RGBA_MODULATE__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = RGBA_MODULATE__A_STAGE0;
+	  break;
+	}
+      break;
+
+    case GL_DECAL:
+      switch (area->Format)
+	{
+	case GL_RGB8:
+	  current->hwTexBlendClr0 = RGB_DECAL__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = RGB_DECAL__A_STAGE0;
+	  break;
+	case GL_RGBA8:
+	  current->hwTexBlendClr0 = RGBA_DECAL__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = RGBA_DECAL__A_STAGE0;
+	  break;
+	}
+      break;
+
+    case GL_BLEND:
+      current->hwTexEnvColor =
+	((DWORD) (texture_unit->EnvColor[3])) << 24 |
+	((DWORD) (texture_unit->EnvColor[0])) << 16 |
+	((DWORD) (texture_unit->EnvColor[1])) << 8 |
+	((DWORD) (texture_unit->EnvColor[2]));
+      switch (area->Format)
+	{
+	case GL_ALPHA8:
+	  current->hwTexBlendClr0 = A_BLEND_RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = A_BLEND_A_STAGE0;
+	  break;
+	case GL_LUMINANCE8:
+	case GL_RGB8:
+	  current->hwTexBlendClr0 = RGB_BLEND__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = RGB_BLEND__A_STAGE0;
+	  break;
+	case GL_INTENSITY8:
+	  current->hwTexBlendClr0 = I_BLEND__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = I_BLEND__A_STAGE0;
+	  break;
+	case GL_LUMINANCE8_ALPHA8:
+	case GL_RGBA8:
+	  current->hwTexBlendClr0 = RGBA_BLEND__RGB_STAGE0;
+	  current->hwTexBlendAlpha0 = RGBA_BLEND__A_STAGE0;
+	  break;
+	}
+      break;
+    }
+
+  if ((current->hwTexBlendClr0 ^ prev->hwTexBlendClr0) ||
+      (current->hwTexBlendAlpha0 ^ prev->hwTexBlendAlpha0) ||
+      (current->hwTexEnvColor ^ prev->hwTexEnvColor))
+    {
+      prev->hwTexEnvColor = current->hwTexEnvColor;
+      prev->hwTexBlendClr0 = current->hwTexBlendClr0;
+      prev->hwTexBlendAlpha0 = current->hwTexBlendAlpha0;
+      hwcx->GlobalFlag |= GFLAG_TEXTUREENV;
+    }
+}
+
+void
+sis_set_texture_env1 (GLcontext * ctx, GLtextureObject * object, int unit)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  struct gl_texture_unit *texture_unit = &ctx->Texture.Unit[unit];
+  GLtextureImage *image = object->Image[0];
+  SIStextureArea *area = (SIStextureArea *) image->DriverData;
+
+  /*
+     current->hwTexBlendClr1 = RGB_STAGE1; current->hwTexBlendAlpha1 =
+     A_STAGE1;
+   */
+
+  switch (texture_unit->EnvMode)
+    {
+    case GL_REPLACE:
+      switch (area->Format)
+	{
+	case GL_ALPHA8:
+	  current->hwTexBlendClr1 = A_REPLACE_RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = A_REPLACE_A_STAGE1;
+	  break;
+	case GL_INTENSITY8:
+	case GL_RGB8:
+	  current->hwTexBlendClr1 = RGB_REPLACE__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = RGB_REPLACE__A_STAGE1;
+	  break;
+	case GL_LUMINANCE8:
+	case GL_LUMINANCE8_ALPHA8:
+	case GL_RGBA8:
+	  current->hwTexBlendClr1 = RGBA_REPLACE__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = RGBA_REPLACE__A_STAGE1;
+	  break;
+	}
+      break;
+
+    case GL_MODULATE:
+      switch (area->Format)
+	{
+	case GL_ALPHA8:
+	  current->hwTexBlendClr1 = A_MODULATE_RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = A_MODULATE_A_STAGE1;
+	  break;
+	case GL_LUMINANCE8:
+	case GL_RGB8:
+	  current->hwTexBlendClr1 = RGB_MODULATE__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = RGB_MODULATE__A_STAGE1;
+	  break;
+	case GL_INTENSITY8:
+	case GL_LUMINANCE8_ALPHA8:
+	case GL_RGBA8:
+	  current->hwTexBlendClr1 = RGBA_MODULATE__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = RGBA_MODULATE__A_STAGE1;
+	  break;
+	}
+      break;
+
+    case GL_DECAL:
+
+      switch (area->Format)
+	{
+	case GL_RGB8:
+	  current->hwTexBlendClr1 = RGB_DECAL__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = RGB_DECAL__A_STAGE1;
+	  break;
+	case GL_RGBA8:
+	  current->hwTexBlendClr1 = RGBA_DECAL__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = RGBA_DECAL__A_STAGE1;
+	  break;
+	}
+      break;
+
+    case GL_BLEND:
+      current->hwTexEnvColor =
+	((DWORD) (texture_unit->EnvColor[3])) << 24 |
+	((DWORD) (texture_unit->EnvColor[0])) << 16 |
+	((DWORD) (texture_unit->EnvColor[1])) << 8 |
+	((DWORD) (texture_unit->EnvColor[2]));
+      switch (area->Format)
+	{
+	case GL_ALPHA8:
+	  current->hwTexBlendClr1 = A_BLEND_RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = A_BLEND_A_STAGE1;
+	  break;
+	case GL_LUMINANCE8:
+	case GL_RGB8:
+	  current->hwTexBlendClr1 = RGB_BLEND__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = RGB_BLEND__A_STAGE1;
+	  break;
+	case GL_INTENSITY8:
+	  current->hwTexBlendClr1 = I_BLEND__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = I_BLEND__A_STAGE1;
+	  break;
+	case GL_LUMINANCE8_ALPHA8:
+	case GL_RGBA8:
+	  current->hwTexBlendClr1 = RGBA_BLEND__RGB_STAGE1;
+	  current->hwTexBlendAlpha1 = RGBA_BLEND__A_STAGE1;
+	  break;
+	}
+      break;
+    }
+
+  if ((current->hwTexBlendClr1 ^ prev->hwTexBlendClr1) ||
+      (current->hwTexBlendAlpha1 ^ prev->hwTexBlendAlpha1) ||
+      (current->hwTexEnvColor ^ prev->hwTexEnvColor))
+    {
+      prev->hwTexBlendClr1 = current->hwTexBlendClr1;
+      prev->hwTexBlendAlpha1 = current->hwTexBlendAlpha1;
+      prev->hwTexEnvColor = current->hwTexEnvColor;
+      hwcx->GlobalFlag |= GFLAG_TEXTUREENV_1;
+    }
+}
+
+static void
+sis_set_texobj_parm (GLcontext * ctx, GLtextureObject * object, int hw_unit)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  GLtextureImage *image = object->Image[0];
+  SIStextureArea *area = (SIStextureArea *) image->DriverData;
+
+  GLint TxLevel;
+  GLint i;
+
+  current->texture[hw_unit].hwTextureSet = 0UL;
+  current->texture[hw_unit].hwTextureMip = 0UL;
+
+  switch (area->Format)
+    {
+    case GL_RGBA8:
+      current->texture[hw_unit].hwTextureSet |= TEXEL_ABGR_8888_32;
+      break;
+    case GL_INTENSITY8:
+      current->texture[hw_unit].hwTextureSet |= TEXEL_I8;
+      break;
+    case GL_ALPHA8:
+      current->texture[hw_unit].hwTextureSet |= TEXEL_A8;
+      break;
+    case GL_LUMINANCE8:
+      current->texture[hw_unit].hwTextureSet |= TEXEL_L8;
+      break;
+    case GL_LUMINANCE8_ALPHA8:
+      current->texture[hw_unit].hwTextureSet |= TEXEL_AL88;
+      break;
+    case GL_RGB8:
+      current->texture[hw_unit].hwTextureSet |= TEXEL_ABGR_0888_32;
+      break;
+    default:
+      hwcx->swRenderFlag |= SIS_SW_TEXTURE_OBJ;
+    }
+
+  if ((object->MinFilter == GL_NEAREST) || (object->MinFilter == GL_LINEAR))
+    {
+      TxLevel = 0;
+    }
+  else
+    {
+      TxLevel = object->P;
+    }
+
+  if (TxLevel < SIS_MAX_MIPMAP_LEVEL)
+    {
+      current->texture[hw_unit].hwTextureSet |= (TxLevel << 8);
+    }
+  else
+    {
+      /* can i limit capacity */
+      hwcx->swRenderFlag |= SIS_SW_TEXTURE_OBJ;
+    }
+
+  switch (object->MagFilter)
+    {
+    case GL_NEAREST:
+      current->texture[hw_unit].hwTextureMip |= TEXTURE_FILTER_NEAREST;
+      break;
+
+    case GL_LINEAR:
+      current->texture[hw_unit].hwTextureMip |= (TEXTURE_FILTER_LINEAR << 3);
+      break;
+    }
+
+  switch (object->MinFilter)
+    {
+    case GL_NEAREST:
+      current->texture[hw_unit].hwTextureMip |= TEXTURE_FILTER_NEAREST;
+      break;
+
+    case GL_LINEAR:
+      current->texture[hw_unit].hwTextureMip |= TEXTURE_FILTER_LINEAR;
+      break;
+
+    case GL_NEAREST_MIPMAP_NEAREST:
+      current->texture[hw_unit].hwTextureMip |=
+	TEXTURE_FILTER_NEAREST_MIP_NEAREST;
+      break;
+
+    case GL_NEAREST_MIPMAP_LINEAR:
+      current->texture[hw_unit].hwTextureMip |=
+	TEXTURE_FILTER_NEAREST_MIP_LINEAR;
+      break;
+
+    case GL_LINEAR_MIPMAP_NEAREST:
+      current->texture[hw_unit].hwTextureMip |=
+	TEXTURE_FILTER_LINEAR_MIP_NEAREST;
+      break;
+
+    case GL_LINEAR_MIPMAP_LINEAR:
+      current->texture[hw_unit].hwTextureMip |=
+	TEXTURE_FILTER_LINEAR_MIP_LINEAR;
+      break;
+    }
+
+  switch (object->WrapS)
+    {
+    case GL_REPEAT:
+      current->texture[hw_unit].hwTextureSet |= MASK_TextureWrapU;
+      break;
+    case GL_CLAMP:
+      current->texture[hw_unit].hwTextureSet |= MASK_TextureClampU;
+      break;
+    case GL_CLAMP_TO_EDGE:
+      /* 
+       * ?? not support yet 
+       */
+      break;
+    }
+
+  switch (object->WrapT)
+    {
+    case GL_REPEAT:
+      current->texture[hw_unit].hwTextureSet |= MASK_TextureWrapV;
+      break;
+    case GL_CLAMP:
+      current->texture[hw_unit].hwTextureSet |= MASK_TextureClampV;
+      break;
+    case GL_CLAMP_TO_EDGE:
+      /* 
+       * ?? not support yet 
+       */
+      break;
+    }
+
+/*
+      if (current->texture[hw_unit].hwTextureSet & MASK_TextureClampU) {
+	  current->texture[hw_unit].hwTextureSet &= ~MASK_TextureClampU;
+	  current->texture[hw_unit].hwTextureSet |= MASK_TextureBorderU;
+	}
+
+      if (current->texture[hw_unit].hwTextureSet & MASK_TextureClampV) {
+	  current->texture[hw_unit].hwTextureSet &= ~MASK_TextureClampV;
+	  current->texture[hw_unit].hwTextureSet |= MASK_TextureBorderV;
+	}
+*/
+      current->texture[hw_unit].hwTextureBorderColor = 
+        ((GLuint) object->BorderColor[3] << 24) + 
+        ((GLuint) object->BorderColor[0] << 16) + 
+        ((GLuint) object->BorderColor[1] << 8) + 
+        ((GLuint) object->BorderColor[2]);
+
+      if (current->texture[hw_unit].hwTextureBorderColor ^
+	  prev->texture[hw_unit].hwTextureBorderColor) 
+	{
+	  prev->texture[hw_unit].hwTextureBorderColor =
+	  current->texture[hw_unit].hwTextureBorderColor; 
+	  if (hw_unit == 1)
+	    hwcx->GlobalFlag |= GFLAG_TEXBORDERCOLOR_1; 
+	  else
+	    hwcx->GlobalFlag |= GFLAG_TEXBORDERCOLOR;
+	}
+
+  current->texture[hw_unit].hwTextureSet |= (image->WidthLog2 << 4);
+  current->texture[hw_unit].hwTextureSet |= (image->HeightLog2);
+
+  {
+    if (hw_unit == 0)
+      hwcx->GlobalFlag |= GFLAG_TEXTUREADDRESS;
+    else
+      hwcx->GlobalFlag |= GFLAG_TEXTUREADDRESS_1;
+
+    for (i = 0; i < TxLevel + 1; i++)
+      {
+	SIStextureArea *area =
+	  (SIStextureArea *) object->Image[i]->DriverData;
+	GLuint texOffset = ((GLuint) area->Data - (GLuint) GET_FbBase (hwcx));
+	GLuint texPitch = TransferTexturePitch (area->Pitch);
+
+	switch (i)
+	  {
+	  case 0:
+	    prev->texture[hw_unit].texOffset0 = texOffset;
+	    prev->texture[hw_unit].texPitch01 = texPitch << 16;
+	    break;
+	  case 1:
+	    prev->texture[hw_unit].texOffset1 = texOffset;
+	    prev->texture[hw_unit].texPitch01 |= texPitch;
+	    break;
+	  case 2:
+	    prev->texture[hw_unit].texOffset2 = texOffset;
+	    prev->texture[hw_unit].texPitch23 = texPitch << 16;
+	    break;
+	  case 3:
+	    prev->texture[hw_unit].texOffset3 = texOffset;
+	    prev->texture[hw_unit].texPitch23 |= texPitch;
+	    break;
+	  case 4:
+	    prev->texture[hw_unit].texOffset4 = texOffset;
+	    prev->texture[hw_unit].texPitch45 = texPitch << 16;
+	    break;
+	  case 5:
+	    prev->texture[hw_unit].texOffset5 = texOffset;
+	    prev->texture[hw_unit].texPitch45 |= texPitch;
+	    break;
+	  case 6:
+	    prev->texture[hw_unit].texOffset6 = texOffset;
+	    prev->texture[hw_unit].texPitch67 = texPitch << 16;
+	    break;
+	  case 7:
+	    prev->texture[hw_unit].texOffset7 = texOffset;
+	    prev->texture[hw_unit].texPitch67 |= texPitch;
+	    break;
+	  case 8:
+	    prev->texture[hw_unit].texOffset8 = texOffset;
+	    prev->texture[hw_unit].texPitch89 = texPitch << 16;
+	    break;
+	  case 9:
+	    prev->texture[hw_unit].texOffset9 = texOffset;
+	    prev->texture[hw_unit].texPitch89 |= texPitch;
+	    break;
+	  case 10:
+	    prev->texture[hw_unit].texOffset10 = texOffset;
+	    prev->texture[hw_unit].texPitch10 = texPitch << 16;
+	    break;
+	  case 11:
+	    prev->texture[hw_unit].texOffset11 = texOffset;
+	    prev->texture[hw_unit].texPitch10 |= texPitch;
+	    break;
+	  }
+      }
+  }
+
+  if (current->texture[hw_unit].hwTextureSet ^ 
+      prev->texture[hw_unit].hwTextureSet)
+    {
+      prev->texture[hw_unit].hwTextureSet =
+	current->texture[hw_unit].hwTextureSet;
+      if (hw_unit == 1)
+	hwcx->GlobalFlag |= CFLAG_TEXTURERESET_1;
+      else
+	hwcx->GlobalFlag |= CFLAG_TEXTURERESET;
+    }
+  if (current->texture[hw_unit].hwTextureMip ^ 
+      prev->texture[hw_unit].hwTextureMip)
+    {
+      prev->texture[hw_unit].hwTextureMip =
+	current->texture[hw_unit].hwTextureMip;
+      if (hw_unit == 1)
+	hwcx->GlobalFlag |= GFLAG_TEXTUREMIPMAP_1;
+      else
+	hwcx->GlobalFlag |= GFLAG_TEXTUREMIPMAP;
+    }
+}
+
+static void
+sis_reset_texture_env (GLcontext * ctx, int hw_unit)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __GLSiSHardware *prev = &hwcx->prev;
+  __GLSiSHardware *current = &hwcx->current;
+
+  if (hw_unit == 1)
+    {
+      current->hwTexBlendClr1 = RGB_STAGE1;
+      current->hwTexBlendAlpha1 = A_STAGE1;
+
+      if ((current->hwTexBlendClr1 ^ prev->hwTexBlendClr1) ||
+	  (current->hwTexBlendAlpha1 ^ prev->hwTexBlendAlpha1) ||
+	  (current->hwTexEnvColor ^ prev->hwTexEnvColor))
+	{
+	  prev->hwTexBlendClr1 = current->hwTexBlendClr1;
+	  prev->hwTexBlendAlpha1 = current->hwTexBlendAlpha1;
+	  prev->hwTexEnvColor = current->hwTexEnvColor;
+	  hwcx->GlobalFlag |= GFLAG_TEXTUREENV_1;
+	}
+    }
+  else
+    {
+      current->hwTexBlendClr0 = RGB_STAGE1;
+      current->hwTexBlendAlpha0 = A_STAGE1;
+
+      if ((current->hwTexBlendClr0 ^ prev->hwTexBlendClr0) ||
+	  (current->hwTexBlendAlpha0 ^ prev->hwTexBlendAlpha0) ||
+	  (current->hwTexEnvColor ^ prev->hwTexEnvColor))
+	{
+	  prev->hwTexBlendClr0 = current->hwTexBlendClr0;
+	  prev->hwTexBlendAlpha0 = current->hwTexBlendAlpha0;
+	  prev->hwTexEnvColor = current->hwTexEnvColor;
+	  hwcx->GlobalFlag |= GFLAG_TEXTUREENV;
+	}
+    }
+}
+
+static DWORD
+BitScanForward (WORD w)
+{
+  DWORD i;
+
+  for (i = 0; i < 16; i++)
+    {
+      if (w & (1 << i))
+	break;
+    }
+  return (i);
+}
+
+static DWORD
+TransferTexturePitch (DWORD dwPitch)
+{
+  DWORD dwRet, i;
+
+  i = BitScanForward ((WORD) dwPitch);
+  dwRet = dwPitch >> i;
+  dwRet |= i << 9;
+  return (dwRet);
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_trifunc.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_trifunc.h:1.1
--- /dev/null	Sat Jul  1 20:44:37 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_trifunc.h	Fri Jun 30 12:30:28 2000
@@ -0,0 +1,91 @@
+#define SIS_TRI_FUNC 1
+
+static void
+SIS_TAG (sis_tri) (GLcontext * ctx, GLuint v0, GLuint v1, GLuint v2,
+		   GLuint pv)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  struct vertex_buffer *VB = ctx->VB;
+  float *MMIOBase = (float *) GET_IOBase (hwcx);
+
+  STEREO_SAMPLE(v0);
+  
+  /* specular color is considered */
+  mWait3DCmdQueue (10 * 3 + 1);
+
+  if (SIS_STATES & (SIS_SMOOTH))
+    {
+      /* 
+       * not move it to UpdateState because maybe optimization can be done
+       * according to FAN and STRIP
+       */
+      hwcx->dwPrimitiveSet &= ~0x07001f07;
+      hwcx->dwPrimitiveSet |=
+	(OP_3D_FIRE_TSARGBc | SHADE_GOURAUD | OP_3D_TRIANGLE_DRAW);      
+    }
+  else
+    {
+      hwcx->dwPrimitiveSet &= ~0x07001f07;
+      hwcx->dwPrimitiveSet |=
+	(OP_3D_FIRE_TSARGBc | SHADE_FLAT_VertexC | OP_3D_TRIANGLE_DRAW);
+    }
+
+  {
+    ((DWORD *) MMIOBase)[REG_3D_PrimitiveSet / 4] = hwcx->dwPrimitiveSet;
+  }
+  
+#define LAST_VERTEX 0
+  SIS_MMIO_WRITE_VERTEX (v0, 0);
+  SIS_MMIO_WRITE_VERTEX (v1, 1);
+#undef LAST_VERTEX
+#define LAST_VERTEX 1
+  SIS_MMIO_WRITE_VERTEX (v2, 2);
+#undef LAST_VERTEX
+
+  /* debug
+  mEndPrimitive ();
+  WaitEngIdle(hwcx); 
+  d2f_once (ctx);
+  */
+}
+
+static void
+SIS_TAG (sis_agp_tri) (GLcontext * ctx, GLuint v0, GLuint v1,
+		       GLuint v2, GLuint pv)
+{
+  XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  struct vertex_buffer *VB = ctx->VB;
+
+  DWORD dcSARGB;
+
+  STEREO_SAMPLE(v0);
+
+  /* delete if VB size <= AGP_ALLOC_SIZE */
+#if 0
+  if ((DWORD) AGP_CurrentPtr - (DWORD) AGP_StartPtr >= (AGP_ALLOC_SIZE - 0x10))
+    {
+      sis_FlushAGP (ctx);
+      sis_StartAGP (ctx);
+    }
+#endif
+
+#define FIRST_VERTEX 1
+  SIS_AGP_WRITE_VERTEX (v0);
+#undef FIRST_VERTEX
+#define FIRST_VERTEX 0
+  SIS_AGP_WRITE_VERTEX (v1);
+  SIS_AGP_WRITE_VERTEX (v2);
+#undef FIRST_VERTEX
+}
+
+#undef SIS_MMIO_WRITE_VERTEX
+#undef SIS_AGP_WRITE_VERTEX
+
+#undef SIS_TAG
+#undef SIS_IS_SMOOTH
+#undef SIS_STATES
+#undef SIS_TRI_FUNC
Index: xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c:1.1
--- /dev/null	Sat Jul  1 20:44:37 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c	Fri Jun 30 12:30:29 2000
@@ -0,0 +1,962 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c,v 1.1 2000/06/30 19:30:29 dawes Exp $ */
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ * $PI: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.15 1999/08/04 18:14:14 faith Exp $
+ */
+
+#include <miscstruct.h>
+#include <resource.h>
+#include <GL/gl.h>
+#include <GL/glxint.h>
+#include <GL/glxtokens.h>
+#include <scrnintstr.h>
+#include <config.h>
+#include <glxserver.h>
+#include <glxscreens.h>
+#include <glxdrawable.h>
+#include <glxcontext.h>
+#include <glxext.h>
+#include <glxutil.h>
+#include "xf86glxint.h"
+#include "xmesaP.h"
+#include <GL/xf86glx.h>
+
+/*
+ * This define is for the glcore.h header file.
+ * If you add it here, then make sure you also add it in
+ * ../../../glx/Imakefile.
+ */
+#if 0
+#define DEBUG
+#include <GL/internal/glcore.h>
+#undef DEBUG
+#else
+#include <GL/internal/glcore.h>
+#endif
+
+
+/*
+ * This structure is statically allocated in the __glXScreens[]
+ * structure.  This struct is not used anywhere other than in
+ * __glXScreenInit to initialize each of the active screens
+ * (__glXActiveScreens[]).  Several of the fields must be initialized by
+ * the screenProbe routine before they are copied to the active screens
+ * struct.  In particular, the contextCreate, pGlxVisual, numVisuals,
+ * and numUsableVisuals fields must be initialized.
+ */
+__GLXscreenInfo __glDDXScreenInfo = {
+    __MESA_screenProbe,   /* Must be generic and handle all screens */
+    __MESA_createContext, /* Substitute screen's createContext routine */
+    __MESA_createBuffer,  /* Substitute screen's createBuffer routine */
+    NULL,                 /* Set up pGlxVisual in probe */
+    NULL,                 /* Set up pVisualPriv in probe */
+    0,                    /* Set up numVisuals in probe */
+    0,                    /* Set up numUsableVisuals in probe */
+    "Vendor String",      /* GLXvendor is overwritten by __glXScreenInit */
+    "Version String",     /* GLXversion is overwritten by __glXScreenInit */
+    "Extensions String",  /* GLXextensions is overwritten by __glXScreenInit */
+    NULL                  /* WrappedPositionWindow is overwritten */
+};
+
+__GLXextensionInfo __glDDXExtensionInfo = {
+    GL_CORE_MESA,
+    __MESA_resetExtension,
+    __MESA_initVisuals,
+    __MESA_setVisualConfigs
+};
+
+__MESA_screen  MESAScreens[MAXSCREENS];
+__GLcontext   *MESA_CC        = NULL;
+
+int                 numConfigs     = 0;
+__GLXvisualConfig  *visualConfigs  = NULL;
+void              **visualPrivates = NULL;
+
+static int count_bits(unsigned int n)
+{
+   int bits = 0;
+
+   while (n > 0) {
+      if (n & 1) bits++;
+      n >>= 1;
+   }
+   return bits;
+}
+
+static XMesaVisual find_mesa_visual(int screen, VisualID vid)
+{
+    XMesaVisual xm_vis = NULL;
+    __MESA_screen *pMScr = &MESAScreens[screen];
+    int i;
+
+    for (i = 0; i < pMScr->num_vis; i++) {
+	if (pMScr->glx_vis[i].vid == vid) {
+	    break;
+	}
+    }
+
+    if (i < pMScr->num_vis) {
+	xm_vis = pMScr->xm_vis[i];
+    }
+    return xm_vis;
+}
+
+#define VISUAL_CONFIG(rgba,accum,back,depth,stencil,rating)                  \
+{                                                                            \
+    -1,                 /* vid */                                            \
+    -1,                 /* class */                                          \
+    rgba,               /* rgba */                                           \
+    -1, -1, -1, 0,      /* rgba sizes, alpha not supported, yet */           \
+    -1, -1, -1, 0,      /* rgba masks, alpha not supported, yet */           \
+    accum, accum, accum, accum, /* rgba accum sizes */                       \
+    back,               /* doubleBuffer */                                   \
+    GL_FALSE,           /* stereo */                                         \
+    -1,                 /* bufferSize */                                     \
+    depth,              /* depthSize */                                      \
+    stencil,            /* stencilSize */                                    \
+    0,                  /* auxBuffers */                                     \
+    0,                  /* level */                                          \
+    rating,             /* visualRating */                                   \
+    0,                  /* transparentPixel */                               \
+    0, 0, 0, 0,         /* transparent rgba color (floats scaled to ints) */ \
+    0                   /* transparentIndex */                               \
+}
+
+#define IS_RGBA     GL_TRUE
+#define IS_CI       GL_FALSE
+#define HAS_ACCUM   ACCUM_BITS
+#define NO_ACCUM    0
+#define HAS_BACK    GL_TRUE
+#define NO_BACK     GL_FALSE
+#define HAS_DEPTH   DEPTH_BITS
+#define NO_DEPTH    0
+#define HAS_STENCIL STENCIL_BITS
+#define NO_STENCIL  0
+
+static __GLXvisualConfig __MESAvisualConfigs[] = {
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK,  0,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK,  16,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK,  32,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK,  24,  8, 0),
+
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK,  0,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK,  16,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK,  32,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK,  24,  8, 0),
+
+    VISUAL_CONFIG(IS_RGBA,  HAS_ACCUM,  NO_BACK,  0,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  HAS_ACCUM,  NO_BACK,  16,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  HAS_ACCUM,  NO_BACK,  32,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  HAS_ACCUM,  NO_BACK,  24,  8, 0),
+
+    VISUAL_CONFIG(IS_RGBA,  HAS_ACCUM, HAS_BACK,  0,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  HAS_ACCUM, HAS_BACK,  16,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  HAS_ACCUM, HAS_BACK,  32,  0, 0),
+    VISUAL_CONFIG(IS_RGBA,  HAS_ACCUM, HAS_BACK,  24,  8, 0),
+/*
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK, HAS_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
+*/
+};
+
+/*
+static __GLXvisualConfig __MESAvisualConfigs[] = {
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK, HAS_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK, HAS_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(IS_RGBA,  NO_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
+    VISUAL_CONFIG(IS_RGBA, HAS_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK, HAS_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM,  NO_BACK,  NO_DEPTH,  NO_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
+    VISUAL_CONFIG(  IS_CI,  NO_ACCUM, HAS_BACK, HAS_DEPTH, HAS_STENCIL, 0),
+};
+*/
+
+static int __numMESAvisualConfigs =
+                    sizeof(__MESAvisualConfigs)/sizeof(__GLXvisualConfig);
+static int __numRGBconfigs        = -1;
+static int __numCIconfigs         = -1;
+
+static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
+			 VisualID *defaultVisp,
+			 int ndepth, DepthPtr pdepth,
+			 int rootDepth)
+{
+    int numVisuals = *nvisualp;
+    int numMesaVisuals = 0;
+    int numMergedVisualConfigs = 0;
+    VisualPtr pVisual = *visualp;
+    VisualPtr pVisualNew = NULL;
+    VisualID *orig_vid = NULL;
+    __GLXvisualConfig *glXVisualPtr = NULL;
+    __GLXvisualConfig *pMergedVisualConfigs = NULL;
+    void **glXVisualPriv;
+    void **pMergedVisualPriv;
+    int *mesaConfigUsed;
+    int *driverConfigUsed;
+    int found_default = FALSE;
+    int i, j, k;
+    int is_rgb;
+    Bool match;
+
+    /* Alloc space for the list of merged GLX visuals */
+    pMergedVisualConfigs =
+	(__GLXvisualConfig *)__glXMalloc((numConfigs +
+					  __numMESAvisualConfigs) * 
+					 sizeof(__GLXvisualConfig));
+    if (!pMergedVisualConfigs) {
+	return FALSE;
+    }
+
+    /* Alloc space for the list of merged GLX visual privates */
+    pMergedVisualPriv =
+	(void **)__glXMalloc((numConfigs + __numMESAvisualConfigs) *
+			     sizeof(void *));
+    if (!pMergedVisualPriv) {
+	__glXFree(pMergedVisualConfigs);
+	return FALSE;
+    }
+
+    /* Compute the intersection of the driver's visual configs */
+    mesaConfigUsed = __glXCalloc(__numMESAvisualConfigs, sizeof(int));
+    driverConfigUsed = __glXCalloc(numConfigs, sizeof(int));
+
+    for (i = j = 0; i < numConfigs; i++) {
+	k = 0;
+	while ((k < __numMESAvisualConfigs) && (!driverConfigUsed[i])) {
+	    if (!mesaConfigUsed[k]) {
+
+#ifdef DEBUG_VISUAL_CONFIG
+#define TEST_AND_COPY(fld) do {						    \
+	if (match) {							    \
+	    if ((__MESAvisualConfigs[k].fld == visualConfigs[i].fld) ||	    \
+		(__MESAvisualConfigs[k].fld == -1)) {		    	    \
+		pMergedVisualConfigs[j].fld = visualConfigs[i].fld; 	    \
+	    } 								    \
+	    else if (visualConfigs[i].fld == -1) {			    \
+		pMergedVisualConfigs[j].fld = __MESAvisualConfigs[k].fld;   \
+	    }								    \
+	    else {							    \
+		match = FALSE;						    \
+		xf86DrvMsg (0, 0, "[GLXVisualInit] mismatch: "		    \
+		    "(%s) DriverVisualConfig[%d] MesaVisualConfig[%d]\n",   \
+		    #fld, i, k);					    \
+	    } 								    \
+	} 								    \
+    } while (0)
+#else
+#define TEST_AND_COPY(fld) do {						    \
+	if (match) {							    \
+	    if ((__MESAvisualConfigs[k].fld == visualConfigs[i].fld) ||	    \
+		(__MESAvisualConfigs[k].fld == -1)) {		    	    \
+		pMergedVisualConfigs[j].fld = visualConfigs[i].fld; 	    \
+	    } 								    \
+	    else if (visualConfigs[i].fld == -1) {			    \
+		pMergedVisualConfigs[j].fld = __MESAvisualConfigs[k].fld;   \
+	    }								    \
+	    else {							    \
+		match = FALSE;						    \
+	    } 								    \
+	} 								    \
+    } while (0)
+#endif
+
+		match = TRUE;
+		TEST_AND_COPY(class);
+		TEST_AND_COPY(rgba);
+		TEST_AND_COPY(redSize);
+		TEST_AND_COPY(greenSize);
+		TEST_AND_COPY(blueSize);
+		TEST_AND_COPY(alphaSize);
+		TEST_AND_COPY(redMask);
+		TEST_AND_COPY(greenMask);
+		TEST_AND_COPY(blueMask);
+		TEST_AND_COPY(alphaMask);
+		TEST_AND_COPY(accumRedSize);
+		TEST_AND_COPY(accumGreenSize);
+		TEST_AND_COPY(accumBlueSize);
+		TEST_AND_COPY(accumAlphaSize);
+		TEST_AND_COPY(doubleBuffer);
+		TEST_AND_COPY(stereo);
+		TEST_AND_COPY(bufferSize);
+		TEST_AND_COPY(depthSize);
+		TEST_AND_COPY(stencilSize);
+		TEST_AND_COPY(auxBuffers);
+		TEST_AND_COPY(level);
+		TEST_AND_COPY(visualRating);
+		TEST_AND_COPY(transparentPixel);
+		TEST_AND_COPY(transparentRed);
+		TEST_AND_COPY(transparentGreen);
+		TEST_AND_COPY(transparentBlue);
+		TEST_AND_COPY(transparentAlpha);
+		TEST_AND_COPY(transparentIndex);
+		if (match) {
+		    driverConfigUsed[i] = TRUE;
+		    mesaConfigUsed[k] = TRUE;
+		    pMergedVisualPriv[j] = visualPrivates[i];
+		    j++;
+#ifdef DEBUG_VISUAL_CONFIG
+		    xf86DrvMsg (0, 0, "[GLXVisualInit] MATCH: "
+			"DriverVisualConfig[%d] MesaVisualConfig[%d]\n", i, k);
+#endif
+		}
+	    }
+	    k++;
+	}
+    }
+
+    /*
+    ** If SetVisualConfigs was not called, then just make all of Mesa's
+    ** visual configs available.
+    */
+    if (!numConfigs) {
+	memcpy(pMergedVisualConfigs, __MESAvisualConfigs,
+	       sizeof(__GLXvisualConfig) * __numMESAvisualConfigs);
+	memset(pMergedVisualPriv, 0, sizeof(void *) * __numMESAvisualConfigs);
+	memset(mesaConfigUsed, TRUE, sizeof(int) * __numMESAvisualConfigs);
+	j = __numMESAvisualConfigs;
+    }
+
+    /*
+    ** This code is not currently used.  When the visual caveat
+    ** extension is supported by the DRI and Mesa, we can take advantage
+    ** of this code.
+    */
+#if 0
+    /* Add any unclaimed MESA configs w/ slow caveat */
+    for (i = 0; i < __numMESAvisualConfigs; i++) {
+	if (!mesaConfigUsed[i]) {
+	    memcpy(&pMergedVisualConfigs[j], &__MESAvisualConfigs[i],
+		   sizeof(__GLXvisualConfig));
+	    pMergedVisualConfigs[j].visualRating = GLX_SLOW_VISUAL_EXT;
+	    j++;
+#ifdef DEBUG_VISUAL_CONFIG
+	    xf86DrvMsg (0, 0, "[GLXVisualInit] slow config: "
+				    "MesaVisualConfig[%d]\n", i);
+#endif
+	}
+    }
+
+    /* Add any unclaimed driver configs w/ nonconformant caveat */
+    for (i = 0; i < numConfigs; i++) {
+	if (!driverConfigUsed[i]) {
+	    memcpy(&pMergedVisualConfigs[j], &visualConfigs[i],
+		   sizeof(__GLXvisualConfig));
+	    pMergedVisualConfigs[j].visualRating = GLX_NON_CONFORMANT_VISUAL_EXT;
+	    j++;
+#ifdef DEBUG_VISUAL_CONFIG
+	    xf86DrvMsg (0, 0, "[GLXVisualInit] non-conformant config: "
+				    "DriverVisualConfig[%d]\n", i);
+#endif
+	}
+    }
+#endif
+
+    numMergedVisualConfigs = j;
+
+    /* Count the number of RGB and CI visual configs */
+    __numRGBconfigs = __numCIconfigs = 0;
+    for (i = 0; i < numMergedVisualConfigs; i++) {
+	if (pMergedVisualConfigs[i].rgba)
+	    __numRGBconfigs++;
+	else
+	    __numCIconfigs++;
+    }
+
+    /* Count the total number of visuals to compute */
+    for (i = 0; i < numVisuals; i++) {
+        numMesaVisuals +=
+	    (pVisual[i].class == TrueColor || pVisual[i].class == DirectColor)
+	    ? __numRGBconfigs : __numCIconfigs;
+    }
+
+    /* Reset variables for use with the next screen/driver's visual configs */
+    visualConfigs = NULL;
+    numConfigs = 0;
+
+    /* Alloc temp space for the list of orig VisualIDs for each new visual */
+    orig_vid = (VisualID *)__glXMalloc(numMesaVisuals * sizeof(VisualID));
+    if (!orig_vid) {
+	__glXFree(pMergedVisualPriv);
+	__glXFree(pMergedVisualConfigs);
+	return FALSE;
+    }
+
+    /* Alloc space for the list of glXVisuals */
+    glXVisualPtr = (__GLXvisualConfig *)__glXMalloc(numMesaVisuals *
+						    sizeof(__GLXvisualConfig));
+    if (!glXVisualPtr) {
+	__glXFree(orig_vid);
+	__glXFree(pMergedVisualPriv);
+	__glXFree(pMergedVisualConfigs);
+	return FALSE;
+    }
+
+    /* Alloc space for the list of glXVisualPrivates */
+    glXVisualPriv = (void **)__glXMalloc(numMesaVisuals * sizeof(void *));
+    if (!glXVisualPriv) {
+	__glXFree(glXVisualPtr);
+	__glXFree(orig_vid);
+	__glXFree(pMergedVisualPriv);
+	__glXFree(pMergedVisualConfigs);
+	return FALSE;
+    }
+
+    /* Alloc space for the new list of the X server's visuals */
+    pVisualNew = (VisualPtr)__glXMalloc(numMesaVisuals * sizeof(VisualRec));
+    if (!pVisualNew) {
+	__glXFree(glXVisualPriv);
+	__glXFree(glXVisualPtr);
+	__glXFree(orig_vid);
+	__glXFree(pMergedVisualPriv);
+	__glXFree(pMergedVisualConfigs);
+	return FALSE;
+    }
+
+    /* Initialize the new visuals */
+    for (i = j = 0; i < numVisuals; i++) {
+	is_rgb = (pVisual[i].class == TrueColor ||
+		  pVisual[i].class == DirectColor);
+
+	for (k = 0; k < numMergedVisualConfigs; k++) {
+	    if (pMergedVisualConfigs[k].rgba != is_rgb)
+		continue;
+
+	    /* Initialize the new visual */
+	    pVisualNew[j] = pVisual[i];
+	    pVisualNew[j].vid = FakeClientID(0);
+
+	    /* Check for the default visual */
+	    if (!found_default && pVisual[i].vid == *defaultVisp) {
+		*defaultVisp = pVisualNew[j].vid;
+		found_default = TRUE;
+	    }
+
+	    /* Save the old VisualID */
+	    orig_vid[j] = pVisual[i].vid;
+
+	    /* Initialize the glXVisual */
+	    glXVisualPtr[j] = pMergedVisualConfigs[k];
+	    glXVisualPtr[j].vid = pVisualNew[j].vid;
+
+	    /*
+	     * If the class is -1, then assume the X visual information
+	     * is identical to what GLX needs, and take them from the X
+	     * visual.  NOTE: if class != -1, then all other fields MUST
+	     * be initialized.
+	     */
+	    if (glXVisualPtr[j].class == -1) {
+		glXVisualPtr[j].class      = pVisual[i].class;
+		glXVisualPtr[j].redSize    = count_bits(pVisual[i].redMask);
+		glXVisualPtr[j].greenSize  = count_bits(pVisual[i].greenMask);
+		glXVisualPtr[j].blueSize   = count_bits(pVisual[i].blueMask);
+		glXVisualPtr[j].alphaSize  = 0; /* Not supported in Mesa */
+		glXVisualPtr[j].redMask    = pVisual[i].redMask;
+		glXVisualPtr[j].greenMask  = pVisual[i].greenMask;
+		glXVisualPtr[j].blueMask   = pVisual[i].blueMask;
+		glXVisualPtr[j].alphaMask  = 0; /* Not supported in Mesa */
+		glXVisualPtr[j].bufferSize = rootDepth;
+	    }
+
+	    /* Save the device-dependent private for this visual */
+	    glXVisualPriv[j] = pMergedVisualPriv[k];
+
+	    j++;
+	}
+    }
+
+    /* Save the GLX visuals in the screen structure */
+    MESAScreens[screenInfo.numScreens-1].num_vis = numMesaVisuals;
+    MESAScreens[screenInfo.numScreens-1].glx_vis = glXVisualPtr;
+    MESAScreens[screenInfo.numScreens-1].private = glXVisualPriv;
+
+    /* Set up depth's VisualIDs */
+    for (i = 0; i < ndepth; i++) {
+	int numVids = 0;
+	VisualID *pVids = NULL;
+	int k, n = 0;
+
+	/* Count the new number of VisualIDs at this depth */
+	for (j = 0; j < pdepth[i].numVids; j++)
+	    for (k = 0; k < numMesaVisuals; k++)
+		if (pdepth[i].vids[j] == orig_vid[k])
+		    numVids++;
+
+	/* Allocate a new list of VisualIDs for this depth */
+	pVids = (VisualID *)__glXMalloc(numVids * sizeof(VisualID));
+
+	/* Initialize the new list of VisualIDs for this depth */
+	for (j = 0; j < pdepth[i].numVids; j++)
+	    for (k = 0; k < numMesaVisuals; k++)
+		if (pdepth[i].vids[j] == orig_vid[k])
+		    pVids[n++] = pVisualNew[k].vid;
+
+	/* Update this depth's list of VisualIDs */
+	__glXFree(pdepth[i].vids);
+	pdepth[i].vids = pVids;
+	pdepth[i].numVids = numVids;
+    }
+
+    /* Update the X server's visuals */
+    *nvisualp = numMesaVisuals;
+    *visualp = pVisualNew;
+
+    /* Free the old list of the X server's visuals */
+    __glXFree(pVisual);
+
+    /* Clean up temporary allocations */
+    __glXFree(orig_vid);
+    __glXFree(pMergedVisualPriv);
+    __glXFree(pMergedVisualConfigs);
+
+    /* Free the private list created by DDX HW driver */
+    if (visualPrivates) xfree(visualPrivates);
+    visualPrivates = NULL;
+
+    return TRUE;
+}
+
+void __MESA_setVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
+			     void **privates)
+{
+    numConfigs = nconfigs;
+    visualConfigs = configs;
+    visualPrivates = privates;
+}
+
+Bool __MESA_initVisuals(VisualPtr *visualp, DepthPtr *depthp,
+			int *nvisualp, int *ndepthp, int *rootDepthp,
+			VisualID *defaultVisp, unsigned long sizes,
+			int bitsPerRGB)
+{
+    /*
+     * Setup the visuals supported by this particular screen.
+     */
+    return init_visuals(nvisualp, visualp, defaultVisp,
+			*ndepthp, *depthp, *rootDepthp);
+}
+
+static void fixup_visuals(int screen)
+{
+    ScreenPtr pScreen = screenInfo.screens[screen];
+    __MESA_screen *pMScr = &MESAScreens[screen];
+    __GLXvisualConfig *pGLXVis  = pMScr->glx_vis;
+    VisualPtr pVis;
+    int i, j;
+
+    for (i = 0; i < pMScr->num_vis; i++, pGLXVis++) {
+	pVis = pScreen->visuals;
+
+	/* Find a visual that matches the GLX visual's class and size */
+	for (j = 0; j < pScreen->numVisuals; j++, pVis++) {
+	    if (pVis->class == pGLXVis->class &&
+		pVis->nplanes == pGLXVis->bufferSize) {
+
+		/* Fixup the masks */
+		pGLXVis->redMask   = pVis->redMask;
+		pGLXVis->greenMask = pVis->greenMask;
+		pGLXVis->blueMask  = pVis->blueMask;
+
+		/* Recalc the sizes */
+		pGLXVis->redSize   = count_bits(pGLXVis->redMask);
+		pGLXVis->greenSize = count_bits(pGLXVis->greenMask);
+		pGLXVis->blueSize  = count_bits(pGLXVis->blueMask);
+	    }
+	}
+    }
+}
+
+static void init_screen_visuals(int screen)
+{
+    ScreenPtr pScreen = screenInfo.screens[screen];
+    __GLXvisualConfig *pGLXVis = MESAScreens[screen].glx_vis;
+    XMesaVisual *pXMesaVisual;
+    VisualPtr pVis;
+    int *used;
+    int i, j;
+
+    /* Alloc space for the list of XMesa visuals */
+    pXMesaVisual = (XMesaVisual *)__glXMalloc(MESAScreens[screen].num_vis *
+					      sizeof(XMesaVisual));
+
+    used = (int *)__glXMalloc(pScreen->numVisuals * sizeof(int));
+    __glXMemset(used, 0, pScreen->numVisuals * sizeof(int));
+
+    for (i = 0; i < MESAScreens[screen].num_vis; i++, pGLXVis++) {
+
+	pVis = pScreen->visuals;
+	for (j = 0; j < pScreen->numVisuals; j++, pVis++) {
+
+	    if (pVis->class == pGLXVis->class &&
+		pVis->nplanes == pGLXVis->bufferSize &&
+		!used[j]) {
+
+		if (pVis->redMask   == pGLXVis->redMask &&
+		    pVis->greenMask == pGLXVis->greenMask &&
+		    pVis->blueMask  == pGLXVis->blueMask) {
+
+		    /* Create the XMesa visual */
+		    pXMesaVisual[i] =
+			XMesaCreateVisual(pScreen,
+					  pVis,
+					  pGLXVis->rgba,
+					  (pGLXVis->alphaSize > 0),
+					  pGLXVis->doubleBuffer,
+					  pGLXVis->stereo,
+					  GL_TRUE, /* ximage_flag */
+					  pGLXVis->depthSize,
+					  pGLXVis->stencilSize,
+					  pGLXVis->accumRedSize,
+					  pGLXVis->level);
+
+		    /* Set the VisualID */
+		    pGLXVis->vid = pVis->vid;
+
+		    /* Mark this visual used */
+		    used[j] = 1;
+		    break;
+		}
+	    }
+	}
+    }
+
+    __glXFree(used);
+
+    MESAScreens[screen].xm_vis = pXMesaVisual;
+}
+
+Bool __MESA_screenProbe(int screen)
+{
+    /*
+     * Set up the current screen's visuals.
+     */
+    __glDDXScreenInfo.pGlxVisual = MESAScreens[screen].glx_vis;
+    __glDDXScreenInfo.pVisualPriv = MESAScreens[screen].private;
+    __glDDXScreenInfo.numVisuals =
+	__glDDXScreenInfo.numUsableVisuals = MESAScreens[screen].num_vis;
+
+    /*
+     * Set the current screen's createContext routine.  This could be
+     * wrapped by a DDX GLX context creation routine.
+     */
+    __glDDXScreenInfo.createContext = __MESA_createContext;
+
+    /*
+     * The ordering of the rgb compenents might have been changed by the
+     * driver after mi initialized them.
+     */
+    fixup_visuals(screen);
+
+    /*
+     * Find the GLX visuals that are supported by this screen and create
+     * XMesa's visuals.
+     */
+    init_screen_visuals(screen);
+
+    return TRUE;
+}
+
+extern void __MESA_resetExtension(void)
+{
+    int i, j;
+
+    XMesaReset();
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	for (j = 0; j < MESAScreens[i].num_vis; j++) {
+	    XMesaDestroyVisual(MESAScreens[i].xm_vis[j]);
+	}
+	__glXFree(MESAScreens[i].glx_vis);
+	MESAScreens[i].glx_vis = NULL;
+	MESAScreens[i].num_vis = 0;
+    }
+    MESA_CC = NULL;
+}
+
+void __MESA_createBuffer(__GLXdrawablePrivate *glxPriv)
+{
+    DrawablePtr pDraw = glxPriv->pDraw;
+    XMesaVisual xm_vis = find_mesa_visual(pDraw->pScreen->myNum,
+					  glxPriv->pGlxVisual->vid);
+    __GLdrawablePrivate *glPriv = &glxPriv->glPriv;
+    __MESA_buffer buf;
+
+    buf = (__MESA_buffer)__glXMalloc(sizeof(struct __MESA_bufferRec));
+
+    /* Create Mesa's buffers */
+    if (glxPriv->type == DRAWABLE_WINDOW) {
+	buf->xm_buf = (void *)XMesaCreateWindowBuffer(xm_vis,
+						      (WindowPtr)pDraw);
+    } else {
+	buf->xm_buf = (void *)XMesaCreatePixmapBuffer(xm_vis,
+						      (PixmapPtr)pDraw, 0);
+    }
+
+    /* Wrap the front buffer's resize routine */
+    buf->fbresize = glPriv->frontBuffer.resize;
+    glPriv->frontBuffer.resize = __MESA_resizeBuffers;
+
+    /* Wrap the swap buffers routine */
+    buf->fbswap = glxPriv->swapBuffers;
+    glxPriv->swapBuffers = __MESA_swapBuffers;
+
+    /* Save Mesa's private buffer structure */
+    glPriv->private = (void *)buf;
+    glPriv->freePrivate = __MESA_destroyBuffer;
+}
+
+GLboolean __MESA_resizeBuffers(__GLdrawableBuffer *buffer,
+			       GLint x, GLint y,
+			       GLuint width, GLuint height, 
+			       __GLdrawablePrivate *glPriv,
+			       GLuint bufferMask)
+{
+    __MESA_buffer buf = (__MESA_buffer)glPriv->private;
+
+    if (buf->xm_buf && buf->xm_buf->xm_context) {
+	GLcontext *ctx = buf->xm_buf->xm_context->gl_ctx;
+	XMesaForceCurrent(buf->xm_buf->xm_context);
+	(*ctx->CurrentDispatch->ResizeBuffersMESA)();
+        if (MESA_CC)
+           XMesaForceCurrent(MESA_CC->xm_ctx);
+    }
+
+    return (*buf->fbresize)(buffer, x, y, width, height, glPriv, bufferMask);
+}
+
+GLboolean __MESA_swapBuffers(__GLXdrawablePrivate *glxPriv)
+{
+    __MESA_buffer buf = (__MESA_buffer)glxPriv->glPriv.private;
+
+    /*
+    ** Do not call the wrapped swap buffers routine since Mesa has
+    ** already done the swap.
+    */
+    XMesaSwapBuffers(buf->xm_buf);
+
+    return GL_TRUE;
+}
+
+void __MESA_destroyBuffer(__GLdrawablePrivate *glPriv)
+{
+    __MESA_buffer buf = (__MESA_buffer)glPriv->private;
+    __GLXdrawablePrivate *glxPriv = (__GLXdrawablePrivate *)glPriv->other;
+
+    /* Destroy Mesa's buffers */
+    if (buf->xm_buf)
+	XMesaDestroyBuffer(buf->xm_buf);
+
+    /* Unwrap these routines */
+    glxPriv->swapBuffers = buf->fbswap;
+    glPriv->frontBuffer.resize = buf->fbresize;
+
+    __glXFree(glPriv->private);
+    glPriv->private = NULL;
+}
+
+__GLinterface *__MESA_createContext(__GLimports *imports,
+				    __GLcontextModes *modes,
+				    __GLinterface *shareGC)
+{
+    __GLcontext *gl_ctx;
+    XMesaContext m_share = NULL;
+    XMesaVisual xm_vis;
+    __GLXcontext *glxc = (__GLXcontext *)imports->other;
+
+    gl_ctx = (__GLcontext *)__glXMalloc(sizeof(__GLcontext));
+    if (!gl_ctx)
+	return NULL;
+
+    gl_ctx->iface.imports = *imports;
+
+    gl_ctx->iface.exports.destroyContext = __MESA_destroyContext;
+    gl_ctx->iface.exports.loseCurrent = __MESA_loseCurrent;
+    gl_ctx->iface.exports.makeCurrent = __MESA_makeCurrent;
+    gl_ctx->iface.exports.shareContext = __MESA_shareContext;
+    gl_ctx->iface.exports.copyContext = __MESA_copyContext;
+    gl_ctx->iface.exports.forceCurrent = __MESA_forceCurrent;
+    gl_ctx->iface.exports.notifyResize = __MESA_notifyResize;
+    gl_ctx->iface.exports.notifyDestroy = __MESA_notifyDestroy;
+    gl_ctx->iface.exports.notifySwapBuffers = __MESA_notifySwapBuffers;
+    gl_ctx->iface.exports.dispatchExec = __MESA_dispatchExec;
+    gl_ctx->iface.exports.beginDispatchOverride = __MESA_beginDispatchOverride;
+    gl_ctx->iface.exports.endDispatchOverride = __MESA_endDispatchOverride;
+
+    if (shareGC) m_share = ((__GLcontext *)shareGC)->xm_ctx;
+    xm_vis = find_mesa_visual(glxc->pScreen->myNum, glxc->pGlxVisual->vid);
+    if (xm_vis) {
+	gl_ctx->xm_ctx = XMesaCreateContext(xm_vis, m_share);
+    } else {
+	__glXFree(gl_ctx);
+	gl_ctx = NULL;
+    }
+
+    return (__GLinterface *)gl_ctx;
+}
+
+GLboolean __MESA_destroyContext(__GLcontext *gc)
+{
+    XMesaDestroyContext(gc->xm_ctx);
+    __glXFree(gc);
+    return GL_TRUE;
+}
+
+GLboolean __MESA_loseCurrent(__GLcontext *gc)
+{
+    MESA_CC = NULL;
+    __glXLastContext = NULL;
+    return XMesaLoseCurrent(gc->xm_ctx);
+}
+
+GLboolean __MESA_makeCurrent(__GLcontext *gc, __GLdrawablePrivate *glPriv)
+{
+    __MESA_buffer buf = (__MESA_buffer)glPriv->private;
+
+    MESA_CC = gc;
+    return XMesaMakeCurrent(gc->xm_ctx, buf->xm_buf);
+}
+
+GLboolean __MESA_shareContext(__GLcontext *gc, __GLcontext *gcShare)
+{
+    /* NOT_DONE */
+    ErrorF("__MESA_shareContext\n");
+    return GL_FALSE;
+}
+
+GLboolean __MESA_copyContext(__GLcontext *dst, const __GLcontext *src,
+			     GLuint mask)
+{
+    /* NOT_DONE */
+    ErrorF("__MESA_copyContext\n");
+    return GL_FALSE;
+}
+
+GLboolean __MESA_forceCurrent(__GLcontext *gc)
+{
+    MESA_CC = gc;
+    return XMesaForceCurrent(gc->xm_ctx);
+}
+
+GLboolean __MESA_notifyResize(__GLcontext *gc)
+{
+    /* NOT_DONE */
+    ErrorF("__MESA_notifyResize\n");
+    return GL_FALSE;
+}
+
+void __MESA_notifyDestroy(__GLcontext *gc)
+{
+    /* NOT_DONE */
+    ErrorF("__MESA_notifyDestroy\n");
+    return;
+}
+
+void __MESA_notifySwapBuffers(__GLcontext *gc)
+{
+    /* NOT_DONE */
+    ErrorF("__MESA_notifySwapBuffers\n");
+    return;
+}
+
+struct __GLdispatchStateRec *__MESA_dispatchExec(__GLcontext *gc)
+{
+    /* NOT_DONE */
+    ErrorF("__MESA_dispatchExec\n");
+    return NULL;
+}
+
+void __MESA_beginDispatchOverride(__GLcontext *gc)
+{
+    /* NOT_DONE */
+    ErrorF("__MESA_beginDispatchOverride\n");
+    return;
+}
+
+void __MESA_endDispatchOverride(__GLcontext *gc)
+{
+    /* NOT_DONE */
+    ErrorF("__MESA_endDispatchOverride\n");
+    return;
+}
+
+GLint __glEvalComputeK(GLenum target)
+{
+    switch (target) {
+    case GL_MAP1_VERTEX_4:
+    case GL_MAP1_COLOR_4:
+    case GL_MAP1_TEXTURE_COORD_4:
+    case GL_MAP2_VERTEX_4:
+    case GL_MAP2_COLOR_4:
+    case GL_MAP2_TEXTURE_COORD_4:
+	return 4;
+    case GL_MAP1_VERTEX_3:
+    case GL_MAP1_TEXTURE_COORD_3:
+    case GL_MAP1_NORMAL:
+    case GL_MAP2_VERTEX_3:
+    case GL_MAP2_TEXTURE_COORD_3:
+    case GL_MAP2_NORMAL:
+	return 3;
+    case GL_MAP1_TEXTURE_COORD_2:
+    case GL_MAP2_TEXTURE_COORD_2:
+	return 2;
+    case GL_MAP1_TEXTURE_COORD_1:
+    case GL_MAP2_TEXTURE_COORD_1:
+    case GL_MAP1_INDEX:
+    case GL_MAP2_INDEX:
+	return 1;
+    default:
+	return 0;
+    }
+}
+
+GLuint __glFloorLog2(GLuint val)
+{
+    int c = 0;
+
+    while (val > 1) {
+	c++;
+	val >>= 1;
+    }
+    return c;
+}
+
Index: xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c:1.1
--- /dev/null	Sat Jul  1 20:44:37 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c	Fri Jun 30 12:30:29 2000
@@ -0,0 +1,432 @@
+#include <unistd.h>
+#include <sys/mman.h>
+#include "sis_dri.h"
+
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+#include <X11/Xlibint.h>
+#include "context.h"
+#include "macros.h"
+#include "matrix.h"
+#include "mmath.h"
+#include "vbxform.h"
+#include "types.h"
+
+static XMesaContext XMesa = NULL;  /* Current X/Mesa context pointer */
+
+#ifndef SIS_VERBOSE
+int SIS_VERBOSE = 0 
+/*                | VERBOSE_SIS_MEMORY */
+/*                | VERBOSE_SIS_BUFFER */
+;
+#endif
+
+static GLboolean IsDriverInit = GL_FALSE;
+static sisRegion global_regs, global_agp;
+static GLubyte *global_FbBase;
+
+GLboolean XMesaInitDriver (__DRIscreenPrivate * driScrnPriv)
+{
+  SISDRIPtr priv = (SISDRIPtr) driScrnPriv->pDevPriv;
+
+  assert (driScrnPriv->devPrivSize == sizeof (SISDRIRec));
+
+  /* Fixme: in quake3, when context changed, XMesaInitDriver is called
+   *        but XMesaResetDriver isn't. so i must check if regions are
+   *        mapped two times. 
+   *        I can't use .map to know if they are mapped
+   */  
+  if(IsDriverInit){
+    priv->regs = global_regs;
+    priv->agp = global_agp;
+    /* XXX */
+    driScrnPriv->pFB = global_FbBase;
+    return GL_TRUE;   
+  }
+      
+  if (drmMap (driScrnPriv->fd, priv->regs.handle, priv->regs.size,
+	      &priv->regs.map))
+    {
+        return GL_FALSE;
+    }
+
+  if (priv->agp.size)
+    {
+      if (drmMap (driScrnPriv->fd, priv->agp.handle, priv->agp.size,
+	  	  &priv->agp.map))
+	{
+	  priv->agp.size = 0;
+ 	}
+    }
+
+  IsDriverInit = GL_TRUE;
+  global_regs = priv->regs;
+  global_agp = priv->agp;
+  global_FbBase = driScrnPriv->pFB;
+  
+  return GL_TRUE;
+}
+
+void
+XMesaResetDriver (__DRIscreenPrivate * driScrnPriv)
+{
+  SISDRIPtr priv = (SISDRIPtr) driScrnPriv->pDevPriv;
+
+  drmUnmap (priv->regs.map, priv->regs.size);
+  priv->regs.map = 0;
+
+  if (priv->agp.size)
+    {
+      drmUnmap (priv->agp.map, priv->agp.size);
+      priv->agp.map = 0;
+    }
+
+  IsDriverInit = GL_FALSE;
+}
+
+/* from tdfx */
+extern void __driRegisterExtensions(void); /* silence compiler warning */
+
+/* This function is called by libGL.so as soon as libGL.so is loaded.
+ * This is where we'd register new extension functions with the dispatcher.
+ */
+void __driRegisterExtensions(void)
+{
+#if 0
+   /* Example.  Also look in fxdd.c for more details. */
+   {
+      const int _gloffset_FooBarEXT = 555;  /* just an example number! */
+      if (_glapi_add_entrypoint("glFooBarEXT", _gloffset_FooBarEXT)) {
+         void *f = glXGetProcAddressARB("glFooBarEXT");
+         assert(f);
+      }
+   }
+#endif
+}
+
+GLvisual *XMesaCreateVisual(Display *dpy,
+                            __DRIscreenPrivate *driScrnPriv,
+                            const XVisualInfo *visinfo,
+                            const __GLXvisualConfig *config)
+{
+   /* Drivers may change the args to _mesa_create_visual() in order to
+    * setup special visuals.
+    */
+   return _mesa_create_visual( config->rgba,
+                               config->doubleBuffer,
+                               config->stereo,
+                               _mesa_bitcount(visinfo->red_mask),
+                               _mesa_bitcount(visinfo->green_mask),
+                               _mesa_bitcount(visinfo->blue_mask),
+                               config->alphaSize,
+                               0, /* index bits */
+                               config->depthSize,
+                               config->stencilSize,
+                               config->accumRedSize,
+                               config->accumGreenSize,
+                               config->accumBlueSize,
+                               config->accumAlphaSize,
+                               0 /* num samples */ );
+}
+
+GLboolean XMesaCreateContext(Display *dpy, GLvisual *mesaVis,
+                             __DRIcontextPrivate *driContextPriv)
+{
+  XMesaContext c;
+
+  if (SIS_VERBOSE){
+    fprintf(stderr, "XMesaCreateContext\n");
+  }
+
+   c = (XMesaContext) calloc (1, sizeof (struct xmesa_context));
+  if (!c)
+    return GL_FALSE;
+
+  c->xm_visual = (XMesaVisual) calloc (1, sizeof (struct xmesa_visual));  
+  if (!c->xm_visual)
+    return GL_FALSE;
+  c->xm_visual->gl_visual = mesaVis;
+  c->xm_visual->display = dpy;
+  
+  c->gl_ctx = driContextPriv->mesaContext;
+  
+  c->xm_buffer = NULL;
+  c->display = dpy;
+
+  c->gl_ctx->Driver.UpdateState = sis_UpdateState;
+
+  c->driContextPriv = driContextPriv;
+
+  c->gl_ctx->DriverCtx = (void *)c;
+  
+  SiSCreateContext (c);
+  
+  /* Fixme */
+  if (c->gl_ctx->NrPipelineStages)
+    c->gl_ctx->NrPipelineStages =
+      sis_RegisterPipelineStages( c->gl_ctx->PipelineStage,
+				  c->gl_ctx->PipelineStage,
+				  c->gl_ctx->NrPipelineStages);
+
+  driContextPriv->driverPrivate = (void *) c;
+  
+  return GL_TRUE;
+}
+
+void XMesaDestroyContext(__DRIcontextPrivate *driContextPriv)
+{
+  XMesaContext c = (XMesaContext) driContextPriv->driverPrivate;
+
+  SiSDestroyContext (c);
+
+  if (c->xm_buffer)
+    c->xm_buffer->xm_context = NULL;
+
+  if (XMesa == c)
+    XMesa = NULL;
+
+  free(c->xm_visual);
+  free (c);
+}
+
+GLframebuffer *XMesaCreateWindowBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
+{
+  if (mesaVis->RGBAflag){
+    return gl_create_framebuffer (mesaVis, GL_FALSE, GL_FALSE,
+        			  (mesaVis->AccumRedBits) ? GL_TRUE : GL_FALSE, 
+				  GL_FALSE);
+  }
+  else{
+    return gl_create_framebuffer (mesaVis,
+				  (mesaVis->DepthBits) ? GL_TRUE : GL_FALSE,
+				  (mesaVis->StencilBits) ? GL_TRUE : GL_FALSE,
+				  (mesaVis->AccumRedBits) ? GL_TRUE : GL_FALSE, 
+				  GL_FALSE);
+  }
+}
+
+static XMesaBuffer SISCreateWindowBuffer ( Display *dpy,
+                                           __DRIscreenPrivate *driScrnPriv,
+                                           __DRIdrawablePrivate *driDrawPriv,
+                                           GLvisual *mesaVis,
+                                           XMesaContext xmesa)
+{
+  XMesaBuffer b = (XMesaBuffer) calloc (1, sizeof (struct xmesa_buffer));
+
+  if (SIS_VERBOSE&VERBOSE_SIS_BUFFER){
+    fprintf(stderr, "SISCreateWindowBuffer: drawable ID=%lu\n",
+            (DWORD)driDrawPriv);
+  }
+  
+  if (!b)
+    return NULL;
+
+  b->xm_context = NULL;
+
+  b->xm_visual = xmesa->xm_visual;
+  b->display = dpy;
+
+  if (mesaVis->DBflag)
+    {
+      b->db_state = BACK_XIMAGE;
+    }
+  else
+    {
+      b->db_state = 0;
+    }
+
+  b->gl_buffer = driDrawPriv->mesaBuffer;
+
+  b->frontbuffer = driDrawPriv->draw;
+
+  /* set 0 for buffer update */
+  b->width = 0;
+  b->height = 0;
+
+  if (b->backimage)
+    {
+#if 0
+      XMesaDestroyImage (b->backimage);
+#else
+      free(b->backimage);
+#endif
+      b->backimage = NULL;
+    }
+
+#if 0
+  b->backimage = XCreateImage (b->display,
+			       b->xm_visual->visinfo->visual,
+			       GET_VISUAL_DEPTH (b->xm_visual), ZPixmap, 0,
+			       NULL, b->width, b->height, 8, 0);
+#else
+  b->backimage = (XMesaImage *) calloc (1, sizeof (XImage));
+#endif
+
+  b->driDrawPriv = driDrawPriv;
+
+  {
+    sisBufferInfo *buf_info;
+    
+    b->private = calloc (1, sizeof (sisBufferInfo));
+    buf_info = (sisBufferInfo *)(b->private);
+    
+    buf_info->pZClearPacket = &buf_info->zClearPacket;
+    buf_info->pCbClearPacket = &buf_info->cbClearPacket;    
+  }
+  
+  return b;
+}
+
+GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
+{
+  /* not implement yet */
+  return NULL;
+}
+
+static void SISDestroyBuffer (XMesaBuffer b)
+{  
+  if (SIS_VERBOSE&VERBOSE_SIS_BUFFER){
+    fprintf(stderr, "XMesaDestroyBuffer: b=%lu\n", (DWORD)b);
+  }
+  
+  if (b->backimage && b->backimage->data)
+    {
+      sisBufferInfo *priv = (sisBufferInfo *) b->private;
+      
+      sis_free_back_image (b, b->backimage, priv->bbFree);
+#if SIS_STEREO
+      {
+        XMesaContext xmesa = (XMesaContext) b->xm_context;
+        __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+        GLcontext *ctx = xmesa->gl_ctx;
+
+        if(hwcx->stereoEnabled){
+          sis_final_stereo(ctx);
+          hwcx->stereoEnabled = GL_FALSE;
+        }
+      }
+#endif
+    }
+
+  if (b->gl_buffer->DepthBuffer)
+    {
+      sis_free_z_stencil_buffer (b);
+    }
+
+  assert (b->private);
+  free (b->private);
+  b->private = NULL;
+
+  if (b->xm_context)
+    b->xm_context->xm_buffer = NULL;
+
+#if 0
+  XMesaDestroyImage (b->backimage);
+#else
+  free(b->backimage);
+#endif
+
+  /* TODO : if b doesn't exist, do something */
+
+  free (b);
+}
+
+void XMesaSwapBuffers(__DRIdrawablePrivate *driDrawPriv)
+{
+  __GLSiScontext *hwcx;
+  
+  if(!XMesa)
+    return;
+  
+  FLUSH_VB( XMesa->gl_ctx, "swap buffers" );
+
+  hwcx = (__GLSiScontext *) XMesa->private;    
+  (hwcx->SwapBuffers)(XMesa->xm_buffer);
+}
+
+GLboolean XMesaUnbindContext(__DRIcontextPrivate *driContextPriv)
+{
+  /* TODO */
+  return GL_TRUE;
+}
+
+GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
+                           __DRIdrawablePrivate *driDrawPriv,
+                           __DRIdrawablePrivate *driReadPriv)
+{    
+  if (driContextPriv)
+    {
+      XMesaContext c = (XMesaContext) driContextPriv->driverPrivate;      
+      XMesaBuffer b; 
+
+      /* TODO: ??? */
+      if ((c->gl_ctx == gl_get_current_context ()) &&
+          (driContextPriv->driDrawablePriv == driDrawPriv) &&
+	  c->xm_buffer->wasCurrent)
+	{
+	  return GL_TRUE;
+	}
+
+      if (SIS_VERBOSE&VERBOSE_SIS_BUFFER){
+        fprintf(stderr, "XMesaMakeCurrent: c=%lu, b=%lu\n", (DWORD)c, (DWORD)b);
+        fprintf(stderr, "XMesaMakeCurrent: drawable ID=%lu\n", (DWORD)b->frontbuffer);
+        fprintf(stderr, "XMesaMakeCurrent: width=%d, height=%d\n", 
+                b->width, b->height);    
+        {
+          __DRIdrawablePrivate *dPriv = c->driContextPriv->driDrawablePriv;
+          fprintf(stderr, "XMesaMakeCurrent: width=%d, height=%d\n", 
+              dPriv->w, dPriv->h);      
+        }
+      }
+
+      b = SISCreateWindowBuffer(c->display,
+                                driContextPriv->driScreenPriv,
+                                driDrawPriv,
+                                c->gl_ctx->Visual,
+                                c);
+
+      if (c->xm_buffer){
+	/* TODO: ??? */
+	c->xm_buffer->xm_context = NULL;
+        SISDestroyBuffer(c->xm_buffer);
+      }
+
+      b->xm_context = c;
+      c->xm_buffer = b;
+
+      gl_make_current (c->gl_ctx, b->gl_buffer);
+      XMesa = c;
+
+      if(b->width == 0){
+        GLuint width, height;
+        
+        sis_GetBufferSize (c->gl_ctx, &width, &height);        
+      }
+
+      sis_update_drawable_state(c->gl_ctx);
+      
+      if (c->gl_ctx->Viewport.Width == 0)
+	{
+	  /* initialize viewport to window size */
+	  gl_Viewport (c->gl_ctx, 0, 0, b->width, b->height);
+	  c->gl_ctx->Scissor.Width = b->width;
+	  c->gl_ctx->Scissor.Height = b->height;
+	}
+
+      c->xm_buffer->wasCurrent = GL_TRUE;
+    }
+  else
+    {
+      gl_make_current (NULL, NULL);
+      XMesa = NULL;
+    }
+
+  return GL_TRUE;
+}
Index: xc/lib/GL/mesa/src/drv/sis/sis_xmesaP.h
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_xmesaP.h:1.1
--- /dev/null	Sat Jul  1 20:44:37 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_xmesaP.h	Fri Jun 30 12:30:30 2000
@@ -0,0 +1,557 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef XMESAP_H
+#define XMESAP_H
+
+
+#ifdef XFree86Server
+# include "GL/xf86glx.h"
+# include "xf86glx_util.h"
+#else
+# ifdef GLX_DIRECT_RENDERING
+#  include "dri_mesa.h"
+# endif
+# ifdef USE_XSHM
+#  include <X11/extensions/XShm.h>
+# endif
+#endif
+
+#ifdef XFree86Server
+# include "GL/xmesa.h"
+#else
+# include <X11/Xlib.h>
+# include <X11/Xutil.h>
+# include "GL/xmesa_x.h"
+# include "GL/gl.h"
+typedef struct xmesa_context *XMesaContext;
+typedef struct xmesa_visual *XMesaVisual;
+typedef struct xmesa_buffer *XMesaBuffer;
+#endif
+
+#include "types.h"
+#if defined(FX) && !defined(GLX_DIRECT_RENDERING)
+#include "GL/fxmesa.h"
+#include "../FX/fxdrv.h"
+#endif
+
+
+#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
+#  include "xdriP.h"
+#else
+#  define DRI_DRAWABLE_ARG
+#  define DRI_DRAWABLE_PARM
+#  define DRI_CTX_ARG
+#endif
+
+
+/* for PF_8R8G8B24 pixel format */
+typedef struct {
+   GLubyte b;
+   GLubyte g;
+   GLubyte r;
+} bgr_t;
+
+
+/* Function pointer for clearing color buffers */
+typedef void (*clear_func)( GLcontext *ctx,
+                            GLboolean all, GLint x, GLint y,
+                            GLint width, GLint height );
+
+
+/*
+ * "Derived" from gl_visual.  Basically corresponds to an XVisualInfo.
+ */
+struct xmesa_visual {
+   GLvisual *gl_visual;		/* Device independent visual parameters */
+   XMesaDisplay *display;	/* The X11 display */
+#ifdef XFree86Server
+   GLint screen_depth;		/* The depth of the screen */
+#else
+   XVisualInfo *vishandle;	/* The pointer returned by glXChooseVisual */
+#endif
+   XMesaVisualInfo visinfo;	/* X's visual info */
+   GLint BitsPerPixel;		/* True bits per pixel for XImages */
+
+   GLint level;			/* 0=normal, 1=overlay, etc */
+   GLint VisualCaveat;          /* for GLX_EXT_visual_rating extension */
+
+   GLboolean ximage_flag;	/* Use XImage for back buffer (not pixmap)? */
+
+   GLuint dithered_pf;		/* Pixel format when dithering */
+   GLuint undithered_pf;	/* Pixel format when not dithering */
+
+   GLfloat RedGamma;		/* Gamma values, 1.0 is default */
+   GLfloat GreenGamma;
+   GLfloat BlueGamma;
+
+   GLint rmult, gmult, bmult;	/* Range of color values */
+   GLint index_bits;		/* Bits per pixel in CI mode */
+
+   /* For PF_TRUECOLOR */
+   GLint rshift, gshift, bshift;/* Pixel color component shifts */
+   GLubyte Kernel[16];		/* Dither kernel */
+   unsigned long RtoPixel[512];	/* RGB to pixel conversion */
+   unsigned long GtoPixel[512];
+   unsigned long BtoPixel[512];
+   GLubyte PixelToR[256];	/* Pixel to RGB conversion */
+   GLubyte PixelToG[256];
+   GLubyte PixelToB[256];
+
+   /* For PF_HPCR */
+   short       hpcr_rgbTbl[3][256];
+   GLboolean   hpcr_clear_flag;
+   GLubyte     hpcr_clear_ximage_pattern[2][16];
+   XMesaImage *hpcr_clear_ximage;
+   XMesaPixmap hpcr_clear_pixmap;
+
+   /* For PF_1BIT */
+   int bitFlip;
+};
+
+
+
+/*
+ * "Derived" from gl_context.  Basically corresponds to a GLXContext.
+ */
+struct xmesa_context {
+   GLcontext *gl_ctx;		/* the core library context */
+   XMesaVisual xm_visual;	/* Describes the buffers */
+   XMesaBuffer xm_buffer;	/* current draw framebuffer */
+   XMesaBuffer xm_read_buffer;	/* current read framebuffer */
+   GLboolean use_read_buffer;	/* read from the xm_read_buffer/ */
+
+   XMesaDisplay *display;	/* == xm_visual->display */
+   GLboolean swapbytes;		/* Host byte order != display byte order? */
+   GLboolean direct;		/* Direct rendering context? */
+
+   GLuint pixelformat;		/* Current pixel format */
+
+   GLubyte red, green, blue, alpha;	/* current drawing color */
+   unsigned long pixel;			/* current drawing pixel value */
+
+   GLubyte clearcolor[4];		/* current clearing color */
+   unsigned long clearpixel;		/* current clearing pixel value */
+
+#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
+  __DRIcontextPrivate *driContextPriv; /* back pointer to DRI context
+					* used for locking
+					*/
+  void *private;			/* device-specific private context */
+#endif
+};
+
+
+
+/*
+ * "Derived" from gl_buffer.  Basically corresponds to a GLXDrawable.
+ */
+struct xmesa_buffer {
+   GLboolean wasCurrent;	/* was ever the current buffer? */
+   GLframebuffer *gl_buffer;	/* depth, stencil, accum, etc buffers */
+   XMesaVisual xm_visual;	/* the X/Mesa visual */
+
+   XMesaContext xm_context;     /* the context associated with this buffer */
+   XMesaDisplay *display;
+   GLboolean pixmap_flag;	/* is the buffer a Pixmap? */
+   XMesaDrawable frontbuffer;	/* either a window or pixmap */
+   XMesaPixmap backpixmap;	/* back buffer Pixmap */
+   XMesaImage *backimage;	/* back buffer simulated XImage */
+
+   XMesaDrawable buffer;	/* the current buffer, either equal to */
+				/* frontbuffer, backpixmap or XIMAGE (None) */
+
+   XMesaColormap cmap;		/* the X colormap */
+
+   GLint db_state;		/* 0 = single buffered */
+				/* BACK_PIXMAP = use Pixmap for back buffer */
+				/* BACK_XIMAGE = use XImage for back buffer */
+
+#ifndef XFree86Server
+   GLuint shm;			/* X Shared Memory extension status:	*/
+				/*    0 = not available			*/
+				/*    1 = XImage support available	*/
+				/*    2 = Pixmap support available too	*/
+#ifdef USE_XSHM
+   XShmSegmentInfo shminfo;
+#endif
+#endif
+
+   XMesaImage *rowimage;	/* Used for optimized span writing */
+
+   GLuint width, height;	/* size of buffer */
+
+   GLint bottom;		/* used for FLIP macro below */
+   GLubyte *ximage_origin1;	/* used for PIXELADDR1 macro */
+   GLint ximage_width1;
+   GLushort *ximage_origin2;	/* used for PIXELADDR2 macro */
+   GLint ximage_width2;
+   GLubyte *ximage_origin3;	/* used for PIXELADDR3 macro */
+   GLint ximage_width3;
+   GLuint *ximage_origin4;	/* used for PIXELADDR4 macro */
+   GLint ximage_width4;
+
+   XMesaPixmap stipple_pixmap;	/* For polygon stippling */
+   XMesaGC stipple_gc;		/* For polygon stippling */
+
+   XMesaGC gc1;			/* GC for infrequent color changes */
+   XMesaGC gc2;			/* GC for frequent color changes */
+   XMesaGC cleargc;		/* GC for clearing the color buffer */
+
+   /* The following are here instead of in the XMesaVisual
+    * because they depend on the window's colormap.
+    */
+
+   /* For PF_DITHER, PF_LOOKUP, PF_GRAYSCALE */
+   unsigned long color_table[576];	/* RGB -> pixel value */
+
+   /* For PF_DITHER, PF_LOOKUP, PF_GRAYSCALE */
+   GLubyte pixel_to_r[65536];		/* pixel value -> red */
+   GLubyte pixel_to_g[65536];		/* pixel value -> green */
+   GLubyte pixel_to_b[65536];		/* pixel value -> blue */
+
+   /* Used to do XAllocColor/XFreeColors accounting: */
+   int num_alloced;
+   unsigned long alloced_colors[256];
+
+#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
+  __DRIdrawablePrivate *driDrawPriv;	/* back pointer to DRI drawable
+					 * used for direct access to framebuffer
+					 */
+  void *private;			/* device-specific private drawable */
+#endif
+
+#if defined( FX ) && !defined(GLX_DIRECT_RENDERING)
+   /* For 3Dfx Glide only */
+   GLboolean FXisHackUsable;	/* Can we render into window? */
+   GLboolean FXwindowHack;	/* Are we rendering into a window? */
+   fxMesaContext FXctx;
+#endif
+
+   /* functions for clearing the front and back color buffers */
+   clear_func front_clear_func;
+   clear_func back_clear_func;
+
+   struct xmesa_buffer *Next;	/* Linked list pointer: */
+};
+
+
+
+/* Values for xmesa->dest: */
+#define FRONT_PIXMAP	1
+#define BACK_PIXMAP	2
+#define BACK_XIMAGE	4
+
+
+/* Values for xmesa->pixelformat: */
+#define PF_INDEX          1	/* Color Index mode */
+#define PF_TRUECOLOR      2	/* TrueColor or DirectColor, any depth */
+#define PF_TRUEDITHER     3	/* TrueColor with dithering */
+#define PF_8A8B8G8R       4	/* 32-bit TrueColor:  8-A, 8-B, 8-G, 8-R */
+#define PF_8R8G8B         5	/* 32-bit TrueColor:  8-R, 8-G, 8-B bits */
+#define PF_5R6G5B         6	/* 16-bit TrueColor:  5-R, 6-G, 5-B bits */
+#define PF_DITHER         7	/* Color-mapped RGB with dither */
+#define PF_LOOKUP         8	/* Color-mapped RGB without dither */
+#define PF_HPCR           9	/* HP Color Recovery (ad@lms.be 30/08/95) */
+#define PF_1BIT          10	/* monochrome dithering of RGB */
+#define PF_GRAYSCALE     11	/* Grayscale or StaticGray */
+#define PF_8R8G8B24      12	/* 24-bit TrueColor: 8-R, 8-G, 8-B bits */
+#define PF_DITHER_5R6G5B 13	/* 16-bit dithered TrueColor: 5-R, 6-G, 5-B */
+
+
+/*
+ * If pixelformat==PF_TRUECOLOR:
+ */
+#define PACK_TRUECOLOR( PIXEL, R, G, B )	\
+   PIXEL = xmesa->xm_visual->RtoPixel[R]	\
+         | xmesa->xm_visual->GtoPixel[G]	\
+         | xmesa->xm_visual->BtoPixel[B];	\
+
+
+/*
+ * If pixelformat==PF_TRUEDITHER:
+ */
+#define PACK_TRUEDITHER( PIXEL, X, Y, R, G, B )			\
+{								\
+   int d = xmesa->xm_visual->Kernel[((X)&3) | (((Y)&3)<<2)];	\
+   PIXEL = xmesa->xm_visual->RtoPixel[(R)+d]			\
+         | xmesa->xm_visual->GtoPixel[(G)+d]			\
+         | xmesa->xm_visual->BtoPixel[(B)+d];			\
+}
+
+
+
+/*
+ * If pixelformat==PF_8A8B8G8R:
+ */
+#define PACK_8A8B8G8R( R, G, B, A )	\
+	( ((A) << 24) | ((B) << 16) | ((G) << 8) | (R) )
+
+
+/*
+ * Like PACK_8A8B8G8R() but don't use alpha.  This is usually an acceptable
+ * shortcut.
+ */
+#define PACK_8B8G8R( R, G, B )   ( ((B) << 16) | ((G) << 8) | (R) )
+
+
+
+/*
+ * If pixelformat==PF_8R8G8B:
+ */
+#define PACK_8R8G8B( R, G, B)	 ( ((R) << 16) | ((G) << 8) | (B) )
+
+
+/*
+ * If pixelformat==PF_5R6G5B:
+ */
+#define PACK_5R6G5B( R, G, B)	 ( (((R) & 0xf8) << 8) | (((G) & 0xfc) << 3) | ((B) >> 3) )
+
+
+
+
+/*
+ * If pixelformat==PF_DITHER:
+ *
+ * Improved 8-bit RGB dithering code contributed by Bob Mercier
+ * (mercier@hollywood.cinenet.net).  Thanks Bob!
+ */
+#undef _R
+#undef _G
+#undef _B
+#undef _D
+#ifdef DITHER666
+# define _R   6
+# define _G   6
+# define _B   6
+# define _MIX(r,g,b)  (((r)*_G+(g))*_B+(b))
+#else
+# define _R	5
+# define _G	9
+# define _B	5
+# define _MIX(r,g,b)	( ((g)<<6) | ((b)<<3) | (r) )
+#endif
+#define _DX	4
+#define _DY	4
+#define _D	(_DX*_DY)
+
+/*#define _DITH(C,c,d)	(((unsigned)((_D*(C-1)+1)*c+d))/(_D*256))*/
+#define _DITH(C,c,d)	(((unsigned)((_D*(C-1)+1)*c+d)) >> 12)
+
+#define MAXC	256
+static int kernel8[_DY*_DX] = {
+    0 * MAXC,  8 * MAXC,  2 * MAXC, 10 * MAXC,
+   12 * MAXC,  4 * MAXC, 14 * MAXC,  6 * MAXC,
+    3 * MAXC, 11 * MAXC,  1 * MAXC,  9 * MAXC,
+   15 * MAXC,  7 * MAXC, 13 * MAXC,  5 * MAXC,
+};
+/*static int __d;*/
+
+/* Dither for random X,Y */
+#define DITHER_SETUP						\
+	int __d;						\
+	unsigned long *ctable = xmesa->xm_buffer->color_table;
+
+#define DITHER( X, Y, R, G, B )				\
+	(__d = kernel8[(((Y)&3)<<2) | ((X)&3)],		\
+	 ctable[_MIX(_DITH(_R, (R), __d),		\
+		     _DITH(_G, (G), __d),		\
+		     _DITH(_B, (B), __d))])
+
+/* Dither for random X, fixed Y */
+#define XDITHER_SETUP(Y)					\
+	int __d;						\
+	unsigned long *ctable = xmesa->xm_buffer->color_table;	\
+	int *kernel = &kernel8[ ((Y)&3) << 2 ];
+
+#define XDITHER( X, R, G, B )				\
+	(__d = kernel[(X)&3],				\
+	ctable[_MIX(_DITH(_R, (R), __d),		\
+		    _DITH(_G, (G), __d),		\
+		    _DITH(_B, (B), __d))])
+
+
+
+/*
+ * Dithering for flat-shaded triangles.  Precompute all 16 possible
+ * pixel values given the triangle's RGB color.  Contributed by Martin Shenk.
+ */
+static GLushort DitherValues[16];   /* array of (up to) 16-bit pixel values */
+
+#define FLAT_DITHER_SETUP( R, G, B )					\
+	{								\
+	   unsigned long *ctable = xmesa->xm_buffer->color_table;	\
+	   int msdr = (_D*((_R)-1)+1) * (R);				\
+	   int msdg = (_D*((_G)-1)+1) * (G);				\
+	   int msdb = (_D*((_B)-1)+1) * (B);				\
+	   int i;							\
+	   for (i=0;i<16;i++) {						\
+	      int k = kernel8[i];					\
+	      int j = _MIX( (msdr+k)>>12, (msdg+k)>>12, (msdb+k)>>12 );	\
+	      DitherValues[i] = (GLushort) ctable[j];			\
+	   }								\
+        }
+
+#define FLAT_DITHER_ROW_SETUP(Y)					\
+	GLushort *ditherRow = DitherValues + ( ((Y)&3) << 2);
+
+#define FLAT_DITHER(X)  ditherRow[(X)&3]
+
+
+
+/*
+ * If pixelformat==PF_LOOKUP:
+ */
+#define _DITH0(C,c)	(((unsigned)((_D*(C-1)+1)*c)) >> 12)
+
+#define LOOKUP_SETUP						\
+	unsigned long *ctable = xmesa->xm_buffer->color_table
+
+#define LOOKUP( R, G, B )			\
+	ctable[_MIX(_DITH0(_R, (R)),		\
+		    _DITH0(_G, (G)),		\
+		    _DITH0(_B, (B)))]
+
+
+
+/*
+ * If pixelformat==PF_HPCR:
+ *
+ *      HP Color Recovery dithering               (ad@lms.be 30/08/95)
+ *      HP has on it's 8-bit 700-series computers, a feature called
+ *      'Color Recovery'.  This allows near 24-bit output (so they say).
+ *      It is enabled by selecting the 8-bit  TrueColor  visual AND
+ *      corresponding  colormap (see tkInitWindow) AND doing some special
+ *      dither.
+ */
+static const short HPCR_DRGB[3][2][16] = {
+{
+    { 16, -4,  1,-11, 14, -6,  3, -9, 15, -5,  2,-10, 13, -7,  4, -8},
+    {-15,  5,  0, 12,-13,  7, -2, 10,-14,  6, -1, 11,-12,  8, -3,  9} 
+},
+{
+    {-11, 15, -7,  3, -8, 14, -4,  2,-10, 16, -6,  4, -9, 13, -5,  1},
+    { 12,-14,  8, -2,  9,-13,  5, -1, 11,-15,  7, -3, 10,-12,  6,  0} 
+},
+{
+    {  6,-18, 26,-14,  2,-22, 30,-10,  8,-16, 28,-12,  4,-20, 32, -8},
+    { -4, 20,-24, 16,  0, 24,-28, 12, -6, 18,-26, 14, -2, 22,-30, 10} 
+}
+};
+
+#define DITHER_HPCR( X, Y, R, G, B )					   \
+  ( ((xmesa->xm_visual->hpcr_rgbTbl[0][R] + HPCR_DRGB[0][(Y)&1][(X)&15]) & 0xE0)     \
+  |(((xmesa->xm_visual->hpcr_rgbTbl[1][G] + HPCR_DRGB[1][(Y)&1][(X)&15]) & 0xE0)>>3) \
+  | ((xmesa->xm_visual->hpcr_rgbTbl[2][B] + HPCR_DRGB[2][(Y)&1][(X)&15])>>6)	   \
+  )
+
+
+
+/*
+ * If pixelformat==PF_1BIT:
+ */
+static int const kernel1[16] = {
+   0*47,  9*47,  4*47, 12*47,     /* 47 = (255*3)/16 */
+   6*47,  2*47, 14*47,  8*47,
+  10*47,  1*47,  5*47, 11*47,
+   7*47, 13*47,  3*47, 15*47 };
+
+#define SETUP_1BIT  int bitFlip = xmesa->xm_visual->bitFlip
+#define DITHER_1BIT( X, Y, R, G, B )	\
+	(( ((int)(R)+(int)(G)+(int)(B)) > kernel1[(((Y)&3) << 2) | ((X)&3)] ) ^ bitFlip)
+
+
+
+/*
+ * If pixelformat==PF_GRAYSCALE:
+ */
+#define GRAY_RGB( R, G, B )   xmesa->xm_buffer->color_table[((R) + (G) + (B))/3]
+
+
+
+#define XIMAGE None
+
+
+/*
+ * Converts a GL window Y coord to an X window Y coord:
+ */
+#define FLIP(BUFFER, Y)  ((BUFFER)->bottom-(Y))
+
+
+/*
+ * Return the address of a 1, 2 or 4-byte pixel in the back XImage:
+ * X==0 is left, Y==0 is bottom.
+ */
+#define PIXELADDR1( BUFFER, X, Y )  \
+   ( (BUFFER)->ximage_origin1 - (Y) * (BUFFER)->ximage_width1 + (X) )
+
+#define PIXELADDR2( BUFFER, X, Y )  \
+   ( (BUFFER)->ximage_origin2 - (Y) * (BUFFER)->ximage_width2 + (X) )
+
+#define PIXELADDR3( BUFFER, X, Y )  \
+   ( (bgr_t *) ( (BUFFER)->ximage_origin3 - (Y) * (BUFFER)->ximage_width3 + 3 * (X) ))
+
+#define PIXELADDR4( BUFFER, X, Y )  \
+   ( (BUFFER)->ximage_origin4 - (Y) * (BUFFER)->ximage_width4 + (X) )
+
+
+
+/*
+ * External functions:
+ */
+
+extern unsigned long
+xmesa_color_to_pixel( XMesaContext xmesa, GLubyte r, GLubyte g, GLubyte b, GLubyte a,
+                      GLuint pixelFormat );
+
+extern void xmesa_alloc_back_buffer( XMesaBuffer b );
+
+extern void xmesa_update_state( GLcontext *ctx );
+
+extern points_func xmesa_get_points_func( GLcontext *ctx );
+
+extern line_func xmesa_get_line_func( GLcontext *ctx );
+
+extern triangle_func xmesa_get_triangle_func( GLcontext *ctx );
+
+
+/* XXX this is a hack to implement shared display lists with 3Dfx */
+extern XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v,
+					     XMesaWindow w,
+					     XMesaContext c
+					     DRI_DRAWABLE_ARG
+					   );
+
+/*
+ * These are the extra routines required for integration with XFree86.
+ * None of these routines should be user visible. -KEM
+ */
+extern void XMesaSetVisualDisplay( XMesaDisplay *dpy, XMesaVisual v );
+extern GLboolean XMesaForceCurrent(XMesaContext c);
+extern GLboolean XMesaLoseCurrent(XMesaContext c);
+extern void XMesaReset( void );
+
+#endif
Index: xc/lib/GL/mesa/src/drv/sis/sis_xwin.c
diff -u /dev/null xc/lib/GL/mesa/src/drv/sis/sis_xwin.c:1.1
--- /dev/null	Sat Jul  1 20:44:37 2000
+++ xc/lib/GL/mesa/src/drv/sis/sis_xwin.c	Fri Jun 30 12:30:31 2000
@@ -0,0 +1,171 @@
+#include "sis_ctx.h"
+#include "sis_mesa.h"
+
+#ifdef XFree86Server
+
+GLboolean
+sis_get_clip_rects (XMesaContext xmesa, BoxPtr *ppExtents, int *pCount)
+{
+  XMesaDrawable d = xmesa->xm_buffer->frontbuffer;
+
+  if (d->type == DRAWABLE_WINDOW)
+  {
+    RegionPtr pClipList = &((WindowPtr) d)->clipList;
+    RegDataPtr data = pClipList->data;
+
+    if (data)
+      {
+	*ppExtents =
+	  (BoxPtr) ((GLubyte *) (pClipList->data) + sizeof (RegDataRec));
+	*pCount = data->numRects;
+      }
+    else
+      {
+	*ppExtents = &(pClipList->extents);
+	*pCount = 1;
+      }
+  }
+  else{
+    /* Pixmap */
+    /* 
+     * TODO : sis_clear_color_buffer, sis_line_clip, sis_tri_clip don't
+     *        consider this situation and result in page fault
+     */         
+    *ppExtents = NULL;
+    *pCount = 0;
+    return GL_FALSE;    
+  }
+  
+  return GL_TRUE;
+}
+
+void *
+sis_get_drawable_pos (XMesaContext xmesa)
+{
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+  XMesaDrawable d = xmesa->xm_buffer->frontbuffer;
+
+  return GET_FbBase (hwcx) +
+    (d->x) * GET_DEPTH (hwcx) + (d->y) * GET_PITCH (hwcx);
+}
+
+void
+sis_get_drawable_origin (XMesaContext xmesa, GLuint * x, GLuint * y)
+{
+  XMesaDrawable d = xmesa->xm_buffer->frontbuffer;
+
+  *x = d->x;
+  *y = d->y;
+}
+
+void
+sis_get_drawable_size (XMesaContext xmesa, GLuint * w, GLuint * h)
+{
+  XMesaDrawable d = xmesa->xm_buffer->frontbuffer;
+
+  *w = d->width;
+  *h = d->height;
+}
+
+void
+sis_get_drawable_box (XMesaContext xmesa, BoxPtr pBox)
+{
+  XMesaDrawable d = xmesa->xm_buffer->frontbuffer;
+
+  pBox->x1 = d->x;
+  pBox->y1 = d->y;
+  pBox->x2 = d->x + d->width;
+  pBox->y2 = d->y + d->height;
+}
+
+#else
+
+GLboolean
+sis_get_clip_rects (XMesaContext xmesa, BoxPtr * ppExtents, int *pCount)
+{
+  __DRIdrawablePrivate *dPriv = xmesa->driContextPriv->driDrawablePriv;
+
+/*
+  if (!sis_is_window (xmesa))
+    {
+      return GL_FALSE;
+    }
+*/
+
+/*
+  XMESA_VALIDATE_DRAWABLE_INFO (xmesa->display, 
+                                xmesa->driContextPriv->driScreenPriv, 
+                                dPriv);
+*/
+
+  *ppExtents = (BoxPtr) dPriv->pClipRects;
+  *pCount = dPriv->numClipRects;
+
+  return GL_TRUE;
+}
+
+void *
+sis_get_drawable_pos (XMesaContext xmesa)
+{
+  __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private;
+
+  __DRIdrawablePrivate *dPriv = xmesa->driContextPriv->driDrawablePriv;
+
+/*
+  XMESA_VALIDATE_DRAWABLE_INFO (xmesa->display, 
+                                xmesa->driContextPriv->driScreenPriv, 
+                                dPriv);
+*/
+
+  return GET_FbBase (hwcx) + (dPriv->x) * GET_DEPTH (hwcx) +
+    (dPriv->y) * GET_PITCH (hwcx);
+}
+
+void
+sis_get_drawable_origin (XMesaContext xmesa, GLuint * x, GLuint * y)
+{
+  __DRIdrawablePrivate *dPriv = xmesa->driContextPriv->driDrawablePriv;
+
+/*
+  XMESA_VALIDATE_DRAWABLE_INFO (xmesa->display, 
+                                xmesa->driContextPriv->driScreenPriv, 
+                                dPriv);
+*/
+
+  *x = dPriv->x;
+  *y = dPriv->y;
+}
+
+void
+sis_get_drawable_size (XMesaContext xmesa, GLuint * w, GLuint * h)
+{
+  __DRIdrawablePrivate *dPriv = xmesa->driContextPriv->driDrawablePriv;
+
+/*
+  XMESA_VALIDATE_DRAWABLE_INFO (xmesa->display, 
+                                xmesa->driContextPriv->driScreenPriv, 
+                                dPriv);
+*/
+
+  *w = dPriv->w;
+  *h = dPriv->h;
+}
+
+void
+sis_get_drawable_box (XMesaContext xmesa, BoxPtr pBox)
+{
+  __DRIdrawablePrivate *dPriv = xmesa->driContextPriv->driDrawablePriv;
+
+/*
+  XMESA_VALIDATE_DRAWABLE_INFO (xmesa->display, 
+                                xmesa->driContextPriv->driScreenPriv, 
+                                dPriv);
+*/
+
+  pBox->x1 = dPriv->x;
+  pBox->y1 = dPriv->y;
+  pBox->x2 = dPriv->x + dPriv->w;
+  pBox->y2 = dPriv->y + dPriv->h;
+}
+
+#endif
Index: xc/lib/GL/mesa/src/drv/tdfx/Imakefile
diff -u xc/lib/GL/mesa/src/drv/tdfx/Imakefile:1.5 xc/lib/GL/mesa/src/drv/tdfx/Imakefile:1.8
--- xc/lib/GL/mesa/src/drv/tdfx/Imakefile:1.5	Tue Mar  7 06:31:38 2000
+++ xc/lib/GL/mesa/src/drv/tdfx/Imakefile	Sun Jun 25 07:44:27 2000
@@ -79,7 +79,8 @@
 		fxglidew.o fxpipeline.o fxrender.o fxsanity.o fxsetup.o \
 		fxtexman.o fxtrifuncs.o fxvsetup.o
 
-     MESASRCS = ../../accum.c \
+     MESASRCS = ../../aatriangle.c \
+		../../accum.c \
 		../../alpha.c \
 		../../alphabuf.c \
 		../../attrib.c \
@@ -109,7 +110,7 @@
 		../../glthread.c \
 		../../hash.c \
 		../../image.c \
-		../../imaging.o \
+		../../imaging.c \
 		../../light.c \
 		../../lines.c \
 		../../logic.c \
@@ -120,6 +121,7 @@
 		../../pb.c \
 		../../pipeline.c \
 		../../pixel.c \
+		../../pixeltex.c \
 		../../points.c \
 		../../polygon.c \
 		../../quads.c \
@@ -136,6 +138,7 @@
 		../../texobj.c \
 		../../texstate.c \
 		../../texture.c \
+		../../texutil.c \
 		../../translate.c \
 		../../triangle.c \
 		../../varray.c \
@@ -149,10 +152,10 @@
 		../../vertices.c \
 		../../winpos.c \
 		../../xform.c \
-		../../zoom.c \
-		../../X86/common_x86.c
+		../../zoom.c
 
-     MESAOBJS = ../../accum.o \
+     MESAOBJS = ../../aatriangle.o \
+		../../accum.o \
 		../../alpha.o \
 		../../alphabuf.o \
 		../../attrib.o \
@@ -191,6 +194,7 @@
 		../../pb.o \
 		../../pipeline.o \
 		../../pixel.o \
+		../../pixeltex.o \
 		../../points.o \
 		../../polygon.o \
 		../../quads.o \
@@ -207,6 +211,7 @@
 		../../texobj.o \
 		../../texstate.o \
 		../../texture.o \
+		../../texutil.o \
 		../../translate.o \
 		../../triangle.o \
 		../../varray.o \
@@ -239,8 +244,7 @@
 
      MMX_OBJS = ../../X86/mmx_blend.o
 
-XCOMM Disabling 3Dnow code for the time being.
-#if 0
+#if MesaUse3DNow
    3DNOW_SRCS = ../../X86/3dnow.c \
 		../../X86/3dnow_norm_raw.S \
 		../../X86/3dnow_xform_masked1.S \
@@ -270,11 +274,15 @@
 
       ASMSRCS = $(X86_SRCS) $(MMX_SRCS) $(3DNOW_SRCS)
       ASMOBJS = $(X86_OBJS) $(MMX_OBJS) $(3DNOW_OBJS)
+
+         SRCS = $(DRISRCS) $(DRMSRCS) $(TDFXSRCS) $(MESASRCS) $(ASMSRCS)
+         OBJS = $(DRIOBJS) $(DRMOBJS) $(TDFXOBJS) $(MESAOBJS) $(ASMOBJS)
 
-	 SRCS = $(DRISRCS) $(DRMSRCS) $(TDFXSRCS) $(MESASRCS) $(ASMSRCS)
-	 OBJS = $(DRIOBJS) $(DRMOBJS) $(TDFXOBJS) $(MESAOBJS) $(ASMOBJS)
+REQUIREDLIBS = -lglide3x -lm
+#if !GlxBuiltInTdfx
+REQUIREDLIBS += -L../../../.. -lGL
+#endif
 
-REQUIREDLIBS += -lglide3x
 
 #if !GlxUseBuiltInDRIDriver
 #undef DoNormalLib NormalLibGlx
@@ -295,7 +303,7 @@
 ALL_OBJS = $(OBJS)
 ALL_DEPS = DONE
 SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS))
-InstallDynamicModule($(LIBNAME),$(MODULEDIR)/dri,.)
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
 #endif
 
 DependTarget()
Index: xc/lib/GL/mesa/src/drv/tdfx/tdfx_init.h
diff -u xc/lib/GL/mesa/src/drv/tdfx/tdfx_init.h:1.3 xc/lib/GL/mesa/src/drv/tdfx/tdfx_init.h:1.4
--- xc/lib/GL/mesa/src/drv/tdfx/tdfx_init.h:1.3	Tue Feb 22 20:46:50 2000
+++ xc/lib/GL/mesa/src/drv/tdfx/tdfx_init.h	Fri Jun 16 17:03:10 2000
@@ -41,10 +41,9 @@
 #include "dri_tmm.h"
 #include "dri_mesaint.h"
 #include "dri_mesa.h"
-#include "types.h"
-#include "xmesaP.h"
-/*  #include "fxdrv.h" */
+#include "dri_xmesaapi.h"
 
+
 typedef struct {
   drmHandle handle;
   drmSize size;
@@ -98,7 +97,8 @@
 
 extern GLboolean tdfxMapAllRegions(__DRIscreenPrivate *driScrnPriv);
 extern void tdfxUnmapAllRegions(__DRIscreenPrivate *driScrnPriv);
-extern GLboolean tdfxInitHW(XMesaContext c);
+extern GLboolean tdfxInitHW(__DRIdrawablePrivate *driDrawPrivate,
+                            tdfxContextPrivate *cPriv);
 
 extern void XMesaWindowMoved(void);
 extern void XMesaUpdateState(int windowMoved);
@@ -119,8 +119,8 @@
 extern void grDRIInvalidateAll(void);
 extern void grDRIResetSAREA(void);
 
-extern XMesaContext gCC;
-extern tdfxContextPrivate *gCCPriv;
+extern __DRIcontextPrivate *gCC;
+/*000extern tdfxContextPrivate *gCCPriv;*/
 
 /* You can turn this on to find locking conflicts.
 #define DEBUG_LOCKING 
@@ -167,7 +167,7 @@
 #define LOCK_HARDWARE() \
   do { \
     char __ret=0; \
-    __DRIdrawablePrivate *dPriv = gCC->driContextPriv->driDrawablePriv; \
+    __DRIdrawablePrivate *dPriv = gCC->driDrawablePriv; \
     __DRIscreenPrivate *sPriv = dPriv->driScreenPriv; \
     DEBUG_CHECK_LOCK(); \
     DRM_CAS(&sPriv->pSAREA->lock, dPriv->driContextPriv->hHWContext, \
@@ -186,7 +186,7 @@
 /* Unlock the hardware using the global current context */
 #define UNLOCK_HARDWARE() \
   do { \
-    __DRIdrawablePrivate *dPriv = gCC->driContextPriv->driDrawablePriv; \
+    __DRIdrawablePrivate *dPriv = gCC->driDrawablePriv; \
     __DRIscreenPrivate *sPriv = dPriv->driScreenPriv; \
     XMesaSetSAREA(); \
     DRM_UNLOCK(sPriv->fd, &sPriv->pSAREA->lock,  \
@@ -202,24 +202,26 @@
   so it is not self contained and doesn't have the nice single 
   statement semantics of most macros
 */
-#define BEGIN_CLIP_LOOP()	\
-  do {				\
-    __DRIdrawablePrivate *dPriv = gCC->driContextPriv->driDrawablePriv; \
-    int _nc; \
-    LOCK_HARDWARE(); \
-    _nc = dPriv->numClipRects; \
-    while (_nc--) { \
-      if (gCCPriv->needClip) { \
-        gCCPriv->clipMinX=dPriv->pClipRects[_nc].x1; \
-        gCCPriv->clipMaxX=dPriv->pClipRects[_nc].x2; \
-        gCCPriv->clipMinY=dPriv->pClipRects[_nc].y1; \
-        gCCPriv->clipMaxY=dPriv->pClipRects[_nc].y2; \
-        fxSetScissorValues(gCCPriv->glCtx); \
+#define BEGIN_CLIP_LOOP()					\
+  do {								\
+    __DRIdrawablePrivate *dPriv = gCC->driDrawablePriv;		\
+    int _nc;							\
+    LOCK_HARDWARE();						\
+    _nc = dPriv->numClipRects;					\
+    while (_nc--) {						\
+      tdfxContextPrivate *gCCPriv =				\
+                    (tdfxContextPrivate *) gCC->driverPrivate;	\
+      if (gCCPriv->needClip) {					\
+        gCCPriv->clipMinX=dPriv->pClipRects[_nc].x1;		\
+        gCCPriv->clipMaxX=dPriv->pClipRects[_nc].x2;		\
+        gCCPriv->clipMinY=dPriv->pClipRects[_nc].y1;		\
+        gCCPriv->clipMaxY=dPriv->pClipRects[_nc].y2;		\
+        fxSetScissorValues(gCCPriv->glCtx);			\
       }
 
-#define END_CLIP_LOOP() \
-    } \
-    UNLOCK_HARDWARE(); \
+#define END_CLIP_LOOP()		\
+    }				\
+    UNLOCK_HARDWARE();		\
   } while (0)
 
 #endif
Index: xc/lib/GL/mesa/src/drv/tdfx/tdfx_inithw.c
diff -u xc/lib/GL/mesa/src/drv/tdfx/tdfx_inithw.c:1.3 xc/lib/GL/mesa/src/drv/tdfx/tdfx_inithw.c:1.4
--- xc/lib/GL/mesa/src/drv/tdfx/tdfx_inithw.c:1.3	Tue Feb 22 20:46:50 2000
+++ xc/lib/GL/mesa/src/drv/tdfx/tdfx_inithw.c	Fri Jun 16 17:03:10 2000
@@ -36,13 +36,11 @@
 #include "tdfx_init.h"
 #include <glide.h>
 
-GLboolean tdfxInitHW(XMesaContext c)
+GLboolean tdfxInitHW(__DRIdrawablePrivate *driDrawPriv,
+                     tdfxContextPrivate *fxMesa)
 {
   /* KW: Would be nice to make one of these a member of the other.
    */
-  tdfxContextPrivate *cPriv = (tdfxContextPrivate*)c->private;
-  tdfxContextPrivate *fxMesa = cPriv;
-  __DRIdrawablePrivate *driDrawPriv = c->driContextPriv->driDrawablePriv;
   __DRIscreenPrivate *driScrnPriv = driDrawPriv->driScreenPriv;
   tdfxScreenPrivate *sPriv = (tdfxScreenPrivate*)driScrnPriv->private;
 
@@ -50,10 +48,10 @@
   fprintf(stderr, "Debug locking enabled\n");
 #endif
     
-  if (cPriv->initDone) return GL_TRUE;
+  if (fxMesa->initDone) return GL_TRUE;
 
-  cPriv->width=driDrawPriv->w;
-  cPriv->height=driDrawPriv->h;
+  fxMesa->width=driDrawPriv->w;
+  fxMesa->height=driDrawPriv->h;
 
   /* We have to use a light lock here, because we can't do any glide
      operations yet. No use of FX_* functions in this function. */
@@ -70,18 +68,12 @@
     fxMesa->haveTwoTMUs=GL_TRUE;
 
   /* !!! We are forcing these !!! */
-  fxMesa->haveDoubleBuffer=GL_TRUE; 
   fxMesa->haveAlphaBuffer=GL_FALSE; 
-  fxMesa->haveZBuffer=GL_TRUE;
   fxMesa->haveGlobalPaletteTexture=GL_FALSE;
 
   fxMesa->glideContext =  FX_grSstWinOpen_NoLock((FxU32)-1, GR_RESOLUTION_NONE,
 						 GR_REFRESH_NONE,
-#if  FXMESA_USE_ARGB
-						 GR_COLORFORMAT_ARGB,
-#else
 						 GR_COLORFORMAT_ABGR,
-#endif
 						 GR_ORIGIN_LOWER_LEFT, 2, 1);
 
   grDRIResetSAREA();
@@ -95,7 +87,7 @@
 
   fxInitPixelTables(fxMesa, GL_FALSE); /* Load tables of pixel colors */
 
-  cPriv->initDone=GL_TRUE;
+  fxMesa->initDone=GL_TRUE;
   return GL_TRUE;
 
 }
Index: xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c
diff -u xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c:1.5 xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c:1.6
--- xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c:1.5	Thu Mar  2 08:07:37 2000
+++ xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c	Fri Jun 16 17:03:10 2000
@@ -28,7 +28,7 @@
 /*
  * Authors:
  *   Daryll Strauss <daryll@precisioninsight.com>
- *
+ *   Brian E. Paul <brian@precisioninsight.com>
  */
 
 #ifdef GLX_DIRECT_RENDERING
@@ -37,201 +37,199 @@
 #include <glide.h>
 #include "tdfx_init.h"
 #include "context.h"
-#include "vbxform.h"
 #include "matrix.h"
+#include "mmath.h"
+#include "vbxform.h"
 
-XMesaContext        nullCC  = 0;
-XMesaContext        gCC     = 0;
-tdfxContextPrivate *gCCPriv = 0;
 
-static int count_bits(unsigned int n)
-{
-  int bits = 0;
+__DRIcontextPrivate *gCC = 0;
 
-  while (n > 0) {
-    if (n & 1) bits++;
-    n >>= 1;
-  }
-  return bits;
-}
 
-GLboolean XMesaInitDriver(__DRIscreenPrivate *driScrnPriv)
+GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv)
 {
-  tdfxScreenPrivate *gsp;
-
-  /* Allocate the private area */
-  gsp = (tdfxScreenPrivate *)Xmalloc(sizeof(tdfxScreenPrivate));
-  if (!gsp) return GL_FALSE;
-
-  gsp->driScrnPriv = driScrnPriv;
-
-  driScrnPriv->private = (void *)gsp;
+   tdfxScreenPrivate *gsp;
 
-  if (!tdfxMapAllRegions(driScrnPriv)) {
-    Xfree(driScrnPriv->private);
-    return GL_FALSE;
-  }
-
-  return GL_TRUE;
+   /* Check the DRI version */
+   {
+      int major, minor, patch;
+      if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) {
+         if (major != 3 || minor != 0 || patch < 0) {
+            char msg[1000];
+            sprintf(msg, "3dfx DRI driver expected DRI version 3.0.x but got version %d.%d.%d", major, minor, patch);
+            __driMesaMessage(msg);
+            return GL_FALSE;
+         }
+      }
+   }
+
+   /* Check that the DDX driver version is compatible */
+   if (sPriv->ddxMajor != 1 ||
+       sPriv->ddxMinor != 0 ||
+       sPriv->ddxPatch < 0) {
+      char msg[1000];
+      sprintf(msg, "3dfx DRI driver expected DDX driver version 1.0.x but got version %d.%d.%d", sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch);
+      __driMesaMessage(msg);
+      return GL_FALSE;
+   }
+
+   /* Check that the DRM driver version is compatible */
+   if (sPriv->drmMajor != 1 ||
+       sPriv->drmMinor != 0 ||
+       sPriv->drmPatch < 0) {
+      char msg[1000];
+      sprintf(msg, "3dfx DRI driver expected DRM driver version 1.0.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
+      __driMesaMessage(msg);
+      return GL_FALSE;
+   }
+
+   /* Allocate the private area */
+   gsp = (tdfxScreenPrivate *)Xmalloc(sizeof(tdfxScreenPrivate));
+   if (!gsp)
+      return GL_FALSE;
+
+   gsp->driScrnPriv = sPriv;
+
+   sPriv->private = (void *) gsp;
+
+   if (!tdfxMapAllRegions(sPriv)) {
+      Xfree(gsp);
+      sPriv->private = NULL;
+      return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+void XMesaResetDriver(__DRIscreenPrivate *sPriv)
+{
+  tdfxUnmapAllRegions(sPriv);
+  Xfree(sPriv->private);
+  sPriv->private = NULL;
+}
+
+GLvisual *XMesaCreateVisual(Display *dpy,
+                            __DRIscreenPrivate *driScrnPriv,
+                            const XVisualInfo *visinfo,
+                            const __GLXvisualConfig *config)
+{
+   /* Drivers may change the args to _mesa_create_visual() in order to
+    * setup special visuals.
+    */
+   return _mesa_create_visual( config->rgba,
+                               config->doubleBuffer,
+                               config->stereo,
+                               _mesa_bitcount(visinfo->red_mask),
+                               _mesa_bitcount(visinfo->green_mask),
+                               _mesa_bitcount(visinfo->blue_mask),
+                               config->alphaSize,
+                               0, /* index bits */
+                               config->depthSize,
+                               config->stencilSize,
+                               config->accumRedSize,
+                               config->accumGreenSize,
+                               config->accumBlueSize,
+                               config->accumAlphaSize,
+                               0 /* num samples */ );
 }
 
-void XMesaResetDriver(__DRIscreenPrivate *driScrnPriv)
-{
-  tdfxUnmapAllRegions(driScrnPriv);
-  Xfree(driScrnPriv->private);
-}
 
-XMesaVisual XMesaCreateVisual(XMesaDisplay *display,
-			      XMesaVisualInfo visinfo,
-			      GLboolean rgb_flag,
-			      GLboolean alpha_flag,
-			      GLboolean db_flag,
-			      GLboolean stereo_flag,
-			      GLboolean ximage_flag,
-			      GLint depth_size,
-			      GLint stencil_size,
-			      GLint accum_size,
-			      GLint level)
+GLboolean XMesaCreateContext(Display *dpy, GLvisual *mesaVis,
+                             __DRIcontextPrivate *driContextPriv)
 {
-  XMesaVisual v;
-
-  /* Only RGB visuals are supported on the TDFX boards */
-  if (!rgb_flag) return 0;
-
-  v = (XMesaVisual)Xmalloc(sizeof(struct xmesa_visual));
-  if (!v) return 0;
-
-  v->visinfo = (XVisualInfo *)Xmalloc(sizeof(*visinfo));
-  if(!v->visinfo) {
-    Xfree(v);
-    return 0;
-  }
-  memcpy(v->visinfo, visinfo, sizeof(*visinfo));
-
-  v->display = display;
-  v->level = level;
-  
-  v->gl_visual = (GLvisual *)Xmalloc(sizeof(GLvisual));
-  if (!v->gl_visual) {
-    Xfree(v->visinfo);
-    XFree(v);
-    return 0;
-  }
-
-  v->gl_visual->RGBAflag   = rgb_flag;
-  v->gl_visual->DBflag     = db_flag;
-  v->gl_visual->StereoFlag = stereo_flag;
-
-  v->gl_visual->RedBits   = count_bits(visinfo->red_mask);
-  v->gl_visual->GreenBits = count_bits(visinfo->green_mask);
-  v->gl_visual->BlueBits  = count_bits(visinfo->blue_mask);
-  v->gl_visual->AlphaBits = 0; /* Not currently supported */
-
-  v->gl_visual->AccumBits   = accum_size;
-  v->gl_visual->DepthBits   = depth_size;
-  v->gl_visual->StencilBits = stencil_size;
-
-  return v;
-}
-
-void XMesaDestroyVisual(XMesaVisual v)
-{
-  Xfree(v->gl_visual);
-  Xfree(v->visinfo);
-  Xfree(v);
-}
-
-XMesaContext XMesaCreateContext(XMesaVisual v, XMesaContext share_list,
-					__DRIcontextPrivate *driContextPriv)
-{
-  XMesaContext c;
   tdfxContextPrivate *cPriv;
   __DRIscreenPrivate *driScrnPriv = driContextPriv->driScreenPriv;
   tdfxScreenPrivate *sPriv = (tdfxScreenPrivate *)driScrnPriv->private;
   TDFXSAREAPriv *saPriv;
-  GLcontext *shareCtx;
-  int **fifoPtr;
-
-  c = (XMesaContext)Xmalloc(sizeof(struct xmesa_context));
-  if (!c) return 0;
+  /*int **fifoPtr;*/
 
-  c->driContextPriv = driContextPriv;
-  c->xm_visual = v;
-  c->xm_buffer = 0; /* Set by MakeCurrent */
-  c->display = v->display;
-
   cPriv = (tdfxContextPrivate *)Xmalloc(sizeof(tdfxContextPrivate));
   if (!cPriv) {
-    Xfree(c);
-    return NULL;
+    return GL_FALSE;
   }
 
   cPriv->hHWContext = driContextPriv->hHWContext;
   cPriv->tdfxScrnPriv = sPriv;
-  c->private = (void *)cPriv;
+  /* deviceID = 0x05 = Voodoo3 */
+  /* deviceID = 0x09 = Voodoo5 (and Voodoo5?) */
+  cPriv->haveHwStencil = sPriv->deviceID == 0x9 && sPriv->cpp == 4;
+
+  cPriv->glVis=mesaVis;
+  cPriv->glBuffer=gl_create_framebuffer(mesaVis,
+                        GL_FALSE,  /* software depth buffer? */
+                        mesaVis->StencilBits > 0 && !cPriv->haveHwStencil,
+                        mesaVis->AccumRedBits > 0,
+                        GL_FALSE   /* software alpha channel */
+                      );
 
-  cPriv->glVis=v->gl_visual;
-  cPriv->glBuffer=gl_create_framebuffer(v->gl_visual,
-                                        GL_FALSE,  /* software depth buffer? */
-                                        v->gl_visual->StencilBits > 0,
-                                        v->gl_visual->AccumBits > 0,
-                                        v->gl_visual->AlphaBits > 0
-                                        );
-
   cPriv->screen_width=sPriv->width;
   cPriv->screen_height=sPriv->height;
-
   cPriv->new_state = ~0;
 
-  if (share_list)
-    shareCtx=((tdfxContextPrivate*)(share_list->private))->glCtx;
-  else
-    shareCtx=0;
-  cPriv->glCtx=gl_create_context(v->gl_visual, shareCtx, (void*)cPriv, GL_TRUE);
+  cPriv->glCtx = driContextPriv->mesaContext;
   cPriv->initDone=GL_FALSE;
 
-  saPriv=(TDFXSAREAPriv*)((void*)driScrnPriv->pSAREA+sizeof(XF86DRISAREARec));
+  saPriv=(TDFXSAREAPriv*)((char*)driScrnPriv->pSAREA+sizeof(XF86DRISAREARec));
   grDRIOpen(driScrnPriv->pFB, sPriv->regs.map, sPriv->deviceID, 
 	    sPriv->width, sPriv->height, sPriv->mem, sPriv->cpp, sPriv->stride,
 	    sPriv->fifoOffset, sPriv->fifoSize, sPriv->fbOffset,
 	    sPriv->backOffset, sPriv->depthOffset, sPriv->textureOffset, 
 	    sPriv->textureSize, &saPriv->fifoPtr, &saPriv->fifoRead);
+
+  driContextPriv->driverPrivate = (void *) cPriv;
 
-  return c;
+  return GL_TRUE;
 }
 
-void XMesaDestroyContext(XMesaContext c)
+void XMesaDestroyContext(__DRIcontextPrivate *driContextPriv)
 {
-  tdfxContextPrivate *cPriv;
-
-  cPriv=(tdfxContextPrivate*)c->private;
+  tdfxContextPrivate *cPriv = (tdfxContextPrivate *) driContextPriv->driverPrivate;
   if (cPriv) {
-    gl_destroy_context(cPriv->glCtx);
-    gl_destroy_framebuffer(cPriv->glBuffer);
+    XFree(cPriv);
+    driContextPriv->driverPrivate = NULL;
   }
-  if (c==gCC) {
-    gCC=0;
-    gCCPriv=0;
+
+  if (driContextPriv == gCC) {
+    gCC = 0;
   }
 }
 
-XMesaBuffer XMesaCreateWindowBuffer(XMesaVisual v, XMesaWindow w,
-				    __DRIdrawablePrivate *driDrawPriv)
-{
-  return (XMesaBuffer)1;
-}
 
-XMesaBuffer XMesaCreatePixmapBuffer(XMesaVisual v, XMesaPixmap p,
-				    XMesaColormap c, __DRIdrawablePrivate *driDrawPriv)
+GLframebuffer *XMesaCreateWindowBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
 {
-  return (XMesaBuffer)1;
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                GL_FALSE   /* software alpha channel? */
+                                );
 }
+
 
-void XMesaDestroyBuffer(XMesaBuffer b)
+GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy,
+                                        __DRIscreenPrivate *driScrnPriv,
+                                        __DRIdrawablePrivate *driDrawPriv,
+                                        GLvisual *mesaVis)
 {
+#if 0
+   /* Different drivers may have different combinations of hardware and
+    * software ancillary buffers.
+    */
+   return gl_create_framebuffer(mesaVis,
+                                GL_FALSE,  /* software depth buffer? */
+                                mesaVis->StencilBits > 0,
+                                mesaVis->AccumRedBits > 0,
+                                mesaVis->AlphaBits > 0
+                                );
+#else
+   return NULL;  /* not implemented yet */
+#endif
 }
+
 
-void XMesaSwapBuffers(XMesaBuffer b)
+void XMesaSwapBuffers(__DRIdrawablePrivate *driDrawPriv)
 {
   FxI32 result;
 #ifdef STATS
@@ -239,15 +237,20 @@
   extern int texSwaps;
   static int prevStalls=0;
 #endif
+  tdfxContextPrivate *gCCPriv;
+
   /*
   ** NOT_DONE: This assumes buffer is currently bound to a context.
   ** This needs to be able to swap buffers when not currently bound.
   */
-  if (gCC == NULL || gCCPriv == NULL) return;
+  if (gCC == NULL)
+     return;
+
+  gCCPriv = (tdfxContextPrivate *) gCC->driverPrivate;
 
   FLUSH_VB( gCCPriv->glCtx, "swap buffers" );
 
-  if (gCCPriv->haveDoubleBuffer) {
+  if (gCC->mesaContext->Visual->DBflag) {
 #ifdef STATS
     stalls=grFifoGetStalls();
     if (stalls!=prevStalls) {
@@ -261,59 +264,65 @@
 #endif
     FX_grDRIBufferSwap(gCCPriv->swapInterval);
     do {
-      result=FX_grGetInteger(FX_PENDING_BUFFERSWAPS);
-    } while (result>gCCPriv->maxPendingSwapBuffers);
+      result = FX_grGetInteger(FX_PENDING_BUFFERSWAPS);
+    } while (result > gCCPriv->maxPendingSwapBuffers);
     gCCPriv->stats.swapBuffer++;
-  } else {
-    fprintf(stderr, "No double buffer\n");
   }
 }
 
-GLboolean XMesaUnbindContext(XMesaContext c)
+GLboolean XMesaUnbindContext(__DRIcontextPrivate *driContextPriv)
 {
-  if (c && c==gCC && gCCPriv) FX_grGlideGetState((GrState*)gCCPriv->state);
-  return GL_TRUE;
+   if (driContextPriv && driContextPriv == gCC) {
+      tdfxContextPrivate *gCCPriv;
+      gCCPriv = (tdfxContextPrivate *) gCC->driverPrivate;
+      FX_grGlideGetState((GrState*)gCCPriv->state);
+   }
+   return GL_TRUE;
 }
 
-GLboolean XMesaMakeCurrent(XMesaContext c, XMesaBuffer b)
+GLboolean XMesaMakeCurrent(__DRIcontextPrivate *driContextPriv,
+                           __DRIdrawablePrivate *driDrawPriv,
+                           __DRIdrawablePrivate *driReadPriv)
 {
-  __DRIdrawablePrivate *driDrawPriv;
+  if (driContextPriv) {
+    tdfxContextPrivate *gCCPriv;
 
-  if (c) {
-    if (c==gCC) return GL_TRUE;
-    gCC     = c;
-    gCCPriv = (tdfxContextPrivate *)c->private;
+    gCC = driContextPriv;
+    gCCPriv = (tdfxContextPrivate *)driContextPriv->driverPrivate;
 
-    driDrawPriv = gCC->driContextPriv->driDrawablePriv;
     if (!gCCPriv->initDone) {
-      if (!tdfxInitHW(c)) return GL_FALSE;
+      if (!tdfxInitHW(driDrawPriv, gCCPriv))
+        return GL_FALSE;
       gCCPriv->width=0;
       XMesaWindowMoved();
       FX_grGlideGetState((GrState*)gCCPriv->state);
-    } else {
+    }
+    else {
       FX_grSstSelect(gCCPriv->board);
       FX_grGlideSetState((GrState*)gCCPriv->state);
       XMesaWindowMoved();
     }
 
-    gl_make_current(gCCPriv->glCtx, gCCPriv->glBuffer);
+    gl_make_current2(gCCPriv->glCtx, driDrawPriv->mesaBuffer, driReadPriv->mesaBuffer);
+
     fxSetupDDPointers(gCCPriv->glCtx);
     if (!gCCPriv->glCtx->Viewport.Width)
       gl_Viewport(gCCPriv->glCtx, 0, 0, driDrawPriv->w, driDrawPriv->h);
-  } else {
+  }
+  else {
     gl_make_current(0,0);
-    gCC     = NULL;
-    gCCPriv = NULL;
+    gCC = NULL;
   }
   return GL_TRUE;
 }
 
-void
-XMesaWindowMoved() {
-  __DRIdrawablePrivate *dPriv = gCC->driContextPriv->driDrawablePriv;
-  GLcontext *ctx;
-  
-  ctx=gCCPriv->glCtx;
+
+void XMesaWindowMoved(void)
+{
+  __DRIdrawablePrivate *dPriv = gCC->driDrawablePriv;
+  tdfxContextPrivate *gCCPriv = (tdfxContextPrivate *) gCC->driverPrivate;
+  GLcontext *ctx = gCCPriv->glCtx;
+
   grDRIPosition(dPriv->x, dPriv->y, dPriv->w, dPriv->h,
 		dPriv->numClipRects, dPriv->pClipRects);
   gCCPriv->numClipRects=dPriv->numClipRects;
@@ -326,6 +335,7 @@
     gCCPriv->height=dPriv->h;
     gCCPriv->y_delta=gCCPriv->screen_height-gCCPriv->y_offset-gCCPriv->height;
   }
+  gCCPriv->needClip=1;
   switch (dPriv->numClipRects) {
   case 0:
     gCCPriv->clipMinX=dPriv->x;
@@ -344,14 +354,15 @@
     gCCPriv->needClip=0;
     break;
   default:
-    gCCPriv->needClip=1;
   }
 }
 
 /* This is called from within the LOCK_HARDWARE routine */
-void XMesaUpdateState(int windowMoved) {
-  __DRIdrawablePrivate *dPriv = gCC->driContextPriv->driDrawablePriv;
+void XMesaUpdateState(int windowMoved)
+{
+  __DRIdrawablePrivate *dPriv = gCC->driDrawablePriv;
   __DRIscreenPrivate *sPriv = dPriv->driScreenPriv;
+  tdfxContextPrivate *gCCPriv = (tdfxContextPrivate *) gCC->driverPrivate;
   TDFXSAREAPriv *saPriv=(TDFXSAREAPriv*)(((char*)sPriv->pSAREA)+sizeof(XF86DRISAREARec));
 
   /* fprintf(stderr, "In FifoPtr=%d FifoRead=%d\n", saPriv->fifoPtr, saPriv->fifoRead); */
@@ -376,8 +387,9 @@
     XMesaWindowMoved();
 }
 
-void XMesaSetSAREA() {
-  __DRIdrawablePrivate *dPriv = gCC->driContextPriv->driDrawablePriv;
+void XMesaSetSAREA(void)
+{
+  __DRIdrawablePrivate *dPriv = gCC->driDrawablePriv;
   __DRIscreenPrivate *sPriv = dPriv->driScreenPriv;
   TDFXSAREAPriv *saPriv=(TDFXSAREAPriv*)(((char*)sPriv->pSAREA)+sizeof(XF86DRISAREARec));
 
Index: xc/lib/ICE/ICElibint.h
diff -u xc/lib/ICE/ICElibint.h:1.1.1.2 xc/lib/ICE/ICElibint.h:1.3
--- xc/lib/ICE/ICElibint.h:1.1.1.2	Sun Sep 27 00:52:00 1998
+++ xc/lib/ICE/ICElibint.h	Sat Jun 17 11:23:22 2000
@@ -22,6 +22,7 @@
 
 Author: Ralph Mor, X Consortium
 ******************************************************************************/
+/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.3 2000/06/17 18:23:22 dawes Exp $ */
 
 #ifndef _ICELIBINT_H_
 #define _ICELIBINT_H_
@@ -283,20 +284,21 @@
 }
 
 
-#define SKIP_STRING(_pBuf, _swap) \
+#define SKIP_STRING(_pBuf, _swap, _end, _bail) \
 { \
     CARD16 _len; \
     EXTRACT_CARD16 (_pBuf, _swap, _len); \
-    _pBuf += _len; \
-    if (PAD32 (2 + _len)) \
-        _pBuf += PAD32 (2 + _len); \
-}
+    _pBuf += _len + PAD32(2+_len); \
+    if (_pBuf > _end) { \
+	_bail; \
+    } \
+} 
 
-#define SKIP_LISTOF_STRING(_pBuf, _swap, _count) \
+#define SKIP_LISTOF_STRING(_pBuf, _swap, _count, _end, _bail) \
 { \
     int _i; \
     for (_i = 0; _i < _count; _i++) \
-        SKIP_STRING (_pBuf, _swap); \
+        SKIP_STRING (_pBuf, _swap, _end, _bail); \
 }
 
 
Index: xc/lib/ICE/process.c
diff -u xc/lib/ICE/process.c:3.3 xc/lib/ICE/process.c:3.4
--- xc/lib/ICE/process.c:3.3	Sat May 22 23:33:24 1999
+++ xc/lib/ICE/process.c	Sat Jun 17 10:44:18 2000
@@ -22,7 +22,7 @@
 
 Author: Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/lib/ICE/process.c,v 3.3 1999/05/23 06:33:24 dawes Exp $ */
+/* $XFree86: xc/lib/ICE/process.c,v 3.4 2000/06/17 17:44:18 dawes Exp $ */
 
 #include <X11/ICE/ICElib.h>
 #include "ICElibint.h"
@@ -60,7 +60,11 @@
        return (0); \
     }
 
-
+#define BAIL_STRING(_iceConn, _opcode, _pStart) {\
+    _IceErrorBadLength (_iceConn, 0, _opcode, IceFatalToConnection);\
+    IceDisposeCompleteMessage (_iceConn, _pStart);\
+    return (0);\
+}
 
 /*
  * IceProcessMessages:
@@ -816,7 +820,7 @@
     int	 myAuthCount, hisAuthCount;
     int	 found, i, j;
     char *myAuthName, **hisAuthNames;
-    char *pData, *pStart;
+    char *pData, *pStart, *pEnd;
     char *vendor = NULL;
     char *release = NULL;
     int myAuthIndex = 0;
@@ -840,10 +844,18 @@
     }
 
     pData = pStart;
-
-    SKIP_STRING (pData, swap);				       /* vendor */
-    SKIP_STRING (pData, swap);				       /* release */
-    SKIP_LISTOF_STRING (pData, swap, (int) message->authCount);/* auth names */
+    pEnd = pStart + (length << 3);
+    
+    SKIP_STRING (pData, swap, pEnd, 
+		 BAIL_STRING(iceConn, ICE_ConnectionSetup,
+			     pStart));			       /* vendor */
+    SKIP_STRING (pData, swap, pEnd, 
+		 BAIL_STRING(iceConn, ICE_ConnectionSetup,
+			    pStart));	        	       /* release */
+    SKIP_LISTOF_STRING (pData, swap, (int) message->authCount, pEnd, 
+			BAIL_STRING(iceConn, ICE_ConnectionSetup,
+				   pStart));		       /* auth names */
+    
     pData += (message->versionCount * 4);		       /* versions */
 
     CHECK_COMPLETE_SIZE (iceConn, ICE_ConnectionSetup,
@@ -1682,7 +1694,7 @@
 
 {
     iceConnectionReplyMsg 	*message;
-    char 			*pData, *pStart;
+    char 			*pData, *pStart, *pEnd;
     Bool			replyReady;
 
     CHECK_AT_LEAST_SIZE (iceConn, ICE_ConnectionReply,
@@ -1698,9 +1710,14 @@
     }
 
     pData = pStart;
+    pEnd = pStart + (length << 3);
 
-    SKIP_STRING (pData, swap);				     /* vendor */
-    SKIP_STRING (pData, swap);				     /* release */
+    SKIP_STRING (pData, swap, pEnd,
+		 BAIL_STRING (iceConn, ICE_ConnectionReply,
+			      pStart));		    	     /* vendor */
+    SKIP_STRING (pData, swap, pEnd,
+		 BAIL_STRING (iceConn, ICE_ConnectionReply,
+			      pStart));			     /* release */
 
     CHECK_COMPLETE_SIZE (iceConn, ICE_ConnectionReply,
 	length, pData - pStart + SIZEOF (iceConnectionReplyMsg),
@@ -1786,7 +1803,7 @@
     int	 	      	found, i, j;
     char	      	*myAuthName, **hisAuthNames;
     char 	      	*protocolName;
-    char 		*pData, *pStart;
+    char 		*pData, *pStart, *pEnd;
     char 	      	*vendor = NULL;
     char 	      	*release = NULL;
     int  	      	accept_setup_now = 0;
@@ -1821,11 +1838,20 @@
     }
 
     pData = pStart;
+    pEnd = pStart + (length << 3);
 
-    SKIP_STRING (pData, swap);				       /* proto name */
-    SKIP_STRING (pData, swap);				       /* vendor */
-    SKIP_STRING (pData, swap);				       /* release */
-    SKIP_LISTOF_STRING (pData, swap, (int) message->authCount);/* auth names */
+    SKIP_STRING (pData, swap, pEnd,
+		 BAIL_STRING(iceConn, ICE_ProtocolSetup, 
+			     pStart));			       /* proto name */
+    SKIP_STRING (pData, swap, pEnd,
+		 BAIL_STRING(iceConn, ICE_ProtocolSetup, 
+			     pStart));			       /* vendor */
+    SKIP_STRING (pData, swap, pEnd,
+		 BAIL_STRING(iceConn, ICE_ProtocolSetup, 
+			     pStart));			       /* release */
+    SKIP_LISTOF_STRING (pData, swap, (int) message->authCount, pEnd,
+			BAIL_STRING(iceConn, ICE_ProtocolSetup, 
+				    pStart));		       /* auth names */
     pData += (message->versionCount * 4);		       /* versions */
 
     CHECK_COMPLETE_SIZE (iceConn, ICE_ProtocolSetup,
@@ -2167,7 +2193,7 @@
 
 {
     iceProtocolReplyMsg *message;
-    char		*pData, *pStart;
+    char		*pData, *pStart, *pEnd;
     Bool		replyReady;
 
     CHECK_AT_LEAST_SIZE (iceConn, ICE_ProtocolReply,
@@ -2183,9 +2209,14 @@
     }
 
     pData = pStart;
+    pEnd = pStart + (length << 3);
 
-    SKIP_STRING (pData, swap);				     /* vendor */
-    SKIP_STRING (pData, swap);				     /* release */
+    SKIP_STRING (pData, swap, pEnd,
+		 BAIL_STRING(iceConn, ICE_ProtocolReply,
+			     pStart));			     /* vendor */
+    SKIP_STRING (pData, swap, pEnd,
+		 BAIL_STRING(iceConn, ICE_ProtocolReply,
+			     pStart));			     /* release */
 
     CHECK_COMPLETE_SIZE (iceConn, ICE_ProtocolReply,
 	length, pData - pStart + SIZEOF (iceProtocolReplyMsg),
Index: xc/lib/X11/Font.c
diff -u xc/lib/X11/Font.c:1.6 xc/lib/X11/Font.c:1.9
--- xc/lib/X11/Font.c:1.6	Mon Feb 28 19:09:03 2000
+++ xc/lib/X11/Font.c	Tue Jun 13 16:15:47 2000
@@ -28,12 +28,12 @@
 authorization from the X Consortium and the XFree86 Project.
 
 */
-/* $XFree86: xc/lib/X11/Font.c,v 1.6 2000/02/29 03:09:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Font.c,v 1.9 2000/06/13 23:15:47 dawes Exp $ */
 
 #define NEED_REPLIES
 #include "Xlibint.h"
 
-#ifndef MUSTCOPY
+#if defined(XF86BIGFONT) && !defined(MUSTCOPY)
 #define USE_XF86BIGFONT
 #endif
 #ifdef USE_XF86BIGFONT
@@ -83,7 +83,7 @@
 #endif
 );
 
-static void _XF86BigfontFreeFontMetrics(
+void _XF86BigfontFreeFontMetrics(
 #if NeedFunctionPrototypes
     XFontStruct*	/* fs */
 #endif
@@ -387,18 +387,26 @@
     pData->free_private = _XF86BigfontFreeCodes;
     XAddToExtensionList(XEHeadOfExtensionList(dpy_union), pData);
     if (pCodes) {
+	int result;
 
 	/* See if the server supports the XF86BigfontQueryFont request. */
 	xXF86BigfontQueryVersionReply reply;
 	register xXF86BigfontQueryVersionReq *req;
 
+	LockDisplay(dpy);
+
 	GetReq(XF86BigfontQueryVersion, req);
 	req->reqType = pCodes->codes->major_opcode;
 	req->xf86bigfontReqType = X_XF86BigfontQueryVersion;
 
-	if (!(_XReply (dpy, (xReply *) &reply,
+	result = _XReply (dpy, (xReply *) &reply,
 		(SIZEOF(xXF86BigfontQueryVersionReply) - SIZEOF(xReply)) >> 2,
-		xFalse)))
+		xFalse);
+
+	UnlockDisplay(dpy);
+    	SyncHandle();
+
+	if(!result)
 	    goto ignore_extension;
 
 	/* No need to provide backward compatibility with version 1.0. It
@@ -649,7 +657,7 @@
     return fs;
 }
 
-static void
+void
 _XF86BigfontFreeFontMetrics (fs)
     XFontStruct *fs;
 {
Index: xc/lib/X11/FontInfo.c
diff -u xc/lib/X11/FontInfo.c:1.2 xc/lib/X11/FontInfo.c:1.3
--- xc/lib/X11/FontInfo.c:1.2	Sun May  9 03:49:21 1999
+++ xc/lib/X11/FontInfo.c	Tue Jun 13 16:15:47 2000
@@ -20,12 +20,23 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/FontInfo.c,v 1.2 1999/05/09 10:49:21 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FontInfo.c,v 1.3 2000/06/13 23:15:47 dawes Exp $ */
 
 #define NEED_REPLIES
 #include "Xlibint.h"
 
+#if defined(XF86BIGFONT) && !defined(MUSTCOPY)
+#define USE_XF86BIGFONT
+#endif
+#ifdef USE_XF86BIGFONT
+extern void _XF86BigfontFreeFontMetrics(
 #if NeedFunctionPrototypes
+    XFontStruct*	/* fs */
+#endif
+);
+#endif
+
+#if NeedFunctionPrototypes
 char **XListFontsWithInfo(
 register Display *dpy,
 _Xconst char *pattern,  /* null-terminated */
@@ -235,7 +246,11 @@
 	if (info) {
 		for (i = 0; i < actualCount; i++) {
 			if (info[i].per_char)
+#ifdef USE_XF86BIGFONT
+				_XF86BigfontFreeFontMetrics(&info[i]);
+#else
 				Xfree ((char *) info[i].per_char);
+#endif
 			if (info[i].properties)
 				Xfree ((char *) info[i].properties);
 			}
Index: xc/lib/X11/GetProp.c
diff -u xc/lib/X11/GetProp.c:1.2 xc/lib/X11/GetProp.c:1.3
--- xc/lib/X11/GetProp.c:1.2	Sun May  9 03:49:28 1999
+++ xc/lib/X11/GetProp.c	Thu Jun 15 16:59:06 2000
@@ -20,7 +20,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/GetProp.c,v 1.2 1999/05/09 10:49:28 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetProp.c,v 1.3 2000/06/15 23:59:06 keithp Exp $ */
 
 #define NEED_REPLIES
 #include "Xlibint.h"
@@ -72,21 +72,24 @@
        */
 	  case 8:
 	    nbytes = netbytes = reply.nItems;
-	    if ((*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
+	    if (nbytes + 1 > 0 &&
+		(*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
 		_XReadPad (dpy, (char *) *prop, netbytes);
 	    break;
 
 	  case 16:
 	    nbytes = reply.nItems * sizeof (short);
 	    netbytes = reply.nItems << 1;
-	    if ((*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
+	    if (nbytes + 1 > 0 &&
+		(*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
 		_XRead16Pad (dpy, (short *) *prop, netbytes);
 	    break;
 
 	  case 32:
 	    nbytes = reply.nItems * sizeof (long);
 	    netbytes = reply.nItems << 2;
-	    if ((*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
+	    if (nbytes + 1 > 0 &&
+		(*prop = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))
 		_XRead32 (dpy, (long *) *prop, netbytes);
 	    break;
 
Index: xc/lib/X11/Imakefile
diff -u xc/lib/X11/Imakefile:3.29 xc/lib/X11/Imakefile:3.31
--- xc/lib/X11/Imakefile:3.29	Fri Feb 11 18:54:05 2000
+++ xc/lib/X11/Imakefile	Fri Jun 16 18:40:40 2000
@@ -3,7 +3,7 @@
 
 
 
-XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.29 2000/02/12 02:54:05 dawes Exp $
+XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.31 2000/06/17 01:40:40 dawes Exp $
 #define DoNormalLib NormalLibX11
 #define DoSharedLib SharedLibX11
 #define DoExtraLib SharedLibX11
@@ -65,6 +65,9 @@
 #if HasShm
     SHM_DEFINES = -DHAS_SHM
 #endif
+
+    XF86BIGFONT_DEFINES = XF86BigfontExtensionDefines
+
      EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/XErrorDB\"
      KDB_DEFINES = -DKEYSYMDB=\"$(LIBDIR)/XKeysymDB\"
      CMS_DEFINES = -DXCMSDB=\"$(LIBDIR)/Xcms.txt\"
@@ -921,7 +924,8 @@
 SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES))
 SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS))
 SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),-I$(EXTINCSRC) $(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES))
-SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES))
+SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
+SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES))
 SpecialCLibObjectRule(cmsColNm,$(ICONFIGFILES),$(CMS_DEFINES))
 SpecialCLibObjectRule(globals,$(ICONFIGFILES),$(CONN_DEFINES))
 SpecialCLibObjectRule(Context,$(ICONFIGFILES),$(BC_DEFINES))
Index: xc/lib/X11/OpenDis.c
diff -u xc/lib/X11/OpenDis.c:3.5 xc/lib/X11/OpenDis.c:3.7
--- xc/lib/X11/OpenDis.c:3.5	Sun May  9 03:49:52 1999
+++ xc/lib/X11/OpenDis.c	Thu Jun 15 18:50:18 2000
@@ -20,7 +20,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/OpenDis.c,v 3.5 1999/05/09 10:49:52 dawes Exp $ */
+/* $XFree86: xc/lib/X11/OpenDis.c,v 3.7 2000/06/16 01:50:18 dawes Exp $ */
 
 #define NEED_REPLIES
 #define NEED_EVENTS
@@ -380,6 +380,14 @@
 	dpy->max_request_size	= u.setup->maxRequestSize;
 	mask = dpy->resource_mask;
 	dpy->resource_shift	= 0;
+	if (!mask)
+	{
+	    fprintf (stderr, "Xlib: connection to \"%s\" invalid setup\n",
+		     fullname);
+	    OutOfMemory(dpy, setup);
+	    return (NULL);
+	}
+    
 	while (!(mask & 1)) {
 	    dpy->resource_shift++;
 	    mask = mask >> 1;
@@ -399,6 +407,13 @@
   	(void) strncpy(dpy->vendor, u.vendor, vendorlen);
 	dpy->vendor[vendorlen] = '\0';
  	vendorlen = (vendorlen + 3) & ~3;	/* round up */
+/*
+ * validate setup length
+ */
+	if ((int) setuplength - sz_xConnSetup - vendorlen < 0) {
+	    OutOfMemory(dpy, setup);
+	    return (NULL);
+	}
 	memmove (setup, u.vendor + vendorlen,
 		 (int) setuplength - sz_xConnSetup - vendorlen);
  	u.vendor = setup;
@@ -577,6 +592,8 @@
 
 	    if (_XReply (dpy, (xReply *) &reply, 0, xFalse)) {
 		if (reply.format == 8 && reply.propertyType == XA_STRING &&
+		    (reply.nItems + 1 > 0) &&
+		    (reply.nItems <= req->longLength * 4) &&
 		    (dpy->xdefaults = Xmalloc (reply.nItems + 1))) {
 		    _XReadPad (dpy, dpy->xdefaults, reply.nItems);
 		    dpy->xdefaults[reply.nItems] = '\0';
Index: xc/lib/X11/WMProps.c
diff -u xc/lib/X11/WMProps.c:3.2 xc/lib/X11/WMProps.c:3.3
--- xc/lib/X11/WMProps.c:3.2	Sat Oct  3 01:41:24 1998
+++ xc/lib/X11/WMProps.c	Fri Mar 31 12:13:12 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/WMProps.c,v 3.2 1998/10/03 08:41:24 dawes Exp $ */
+/* $XFree86: xc/lib/X11/WMProps.c,v 3.3 2000/03/31 20:13:12 dawes Exp $ */
 
 /***********************************************************
 Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.,
@@ -52,6 +52,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
+#include <X11/Xlocale.h>
 
 #ifdef X_NOT_STDC_ENV
 extern char *getenv();
@@ -83,6 +84,7 @@
     XTextProperty textprop;
     char hostName[256];
     int len = _XGetHostname (hostName, sizeof hostName);
+    char *locale;
 
     /* set names of window and icon */
     if (windowName) XSetWMName (dpy, w, windowName);
@@ -133,5 +135,11 @@
 	}
 	XSetClassHint (dpy, w, classHints);
     }
+    
+    locale = setlocale(LC_CTYPE, (char *)NULL);
+    if (locale)
+        XChangeProperty (dpy, w, XInternAtom(dpy, "WM_LOCALE_NAME", False),
+        XA_STRING, 8, PropModeReplace,
+        (unsigned char *)locale, strlen(locale));
 }
 
Index: xc/lib/X11/X11os2.rsp
diff -u xc/lib/X11/X11os2.rsp:3.6 xc/lib/X11/X11os2.rsp:3.7
--- xc/lib/X11/X11os2.rsp:3.6	Thu Jun  4 09:43:05 1998
+++ xc/lib/X11/X11os2.rsp	Wed Apr  5 11:13:16 2000
@@ -59,7 +59,7 @@
 imThaiFlt.obj imThaiIc.obj imThaiIm.obj imTrX.obj imTrans.obj imTransR.obj+
 lcCT.obj lcCharSet.obj lcConv.obj lcDB.obj lcDefConv.obj lcEuc.obj lcFile.obj+
 lcGenConv.obj lcGeneric.obj lcInit.obj lcJis.obj lcPrTxt.obj lcPubWrap.obj lcPublic.obj+
-lcRM.obj lcSjis.obj lcStd.obj lcTxtPr.obj lcUTF.obj lcUtil.obj lcWrap.obj+
+lcRM.obj lcSjis.obj lcStd.obj lcTxtPr.obj lcUTF.obj lcUTF8.obj lcUtil.obj lcWrap.obj+
 locking.obj mbWMProps.obj mbWrap.obj omDefault.obj omGeneric.obj omImText.obj+
 omText.obj omTextEsc.obj omTextExt.obj omTextPer.obj omXChar.obj uvY.obj+
 XKB.obj XKBAlloc.obj XKBBell.obj XKBBind.obj XKBCompat.obj XKBCtrls.obj+
Index: xc/lib/X11/XErrorDB
diff -u xc/lib/X11/XErrorDB:3.32 xc/lib/X11/XErrorDB:3.33
--- xc/lib/X11/XErrorDB:3.32	Tue Feb 29 10:29:01 2000
+++ xc/lib/X11/XErrorDB	Mon Apr 17 09:29:48 2000
@@ -19,7 +19,7 @@
 ! other dealings in this Software without prior written authorization
 ! from The Open Group.
 !
-! $XFree86: xc/lib/X11/XErrorDB,v 3.32 2000/02/29 18:29:01 dawes Exp $
+! $XFree86: xc/lib/X11/XErrorDB,v 3.33 2000/04/17 16:29:48 eich Exp $
 !
 ! these are used in XGetErrorMessage.
 XlibMessage.XError: X Error of failed request
@@ -603,6 +603,7 @@
 XProtoError.XFree86-Misc.4: XF86MiscBadKbdType
 XProtoError.XFree86-Misc.5: XF86MiscModInDevDisabled
 XProtoError.XFree86-Misc.6: XF86MiscModInDevClientNotLocal
+XProtoError.XFree86-Misc.7: XF86MiscNoModule
 ! XFree86-DGA  -- not an X Consortium standard
 XRequest.XFree86-DGA.0: XDGAQueryVersion
 XRequest.XFree86-DGA.1: XF86DGAGetVideoLL
Index: xc/lib/X11/XKBCvt.c
diff -u xc/lib/X11/XKBCvt.c:3.25 xc/lib/X11/XKBCvt.c:3.26
--- xc/lib/X11/XKBCvt.c:3.25	Fri Feb 18 04:18:50 2000
+++ xc/lib/X11/XKBCvt.c	Mon Jun 12 19:28:28 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.25 2000/02/18 12:18:50 tsi Exp $ */
+/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.26 2000/06/13 02:28:28 dawes Exp $ */
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -114,7 +114,7 @@
 _XimGetLocaleCode (
 #if NeedFunctionPrototypes
     _Xconst char* /* encoding_name */,
-    XPointer* /* pass NULL here */
+    XlcCharSet* /* pass NULL here */
 #endif
 );
 
Index: xc/lib/X11/Ximint.h
diff -u xc/lib/X11/Ximint.h:3.4 xc/lib/X11/Ximint.h:3.5
--- xc/lib/X11/Ximint.h:3.4	Sat Oct  3 01:41:27 1998
+++ xc/lib/X11/Ximint.h	Mon Jun 12 19:28:28 2000
@@ -30,7 +30,7 @@
 			       makoto@sm.sony.co.jp
 
 ******************************************************************/
-/* $XFree86: xc/lib/X11/Ximint.h,v 3.4 1998/10/03 08:41:27 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Ximint.h,v 3.5 2000/06/13 02:28:28 dawes Exp $ */
 
 #ifndef _XIMINT_H
 #define _XIMINT_H
@@ -41,6 +41,12 @@
 #define Public /**/
 #define Private static
 
+#ifdef __STDC__
+#define Const const
+#else
+#define Const /**/
+#endif
+
 typedef struct _Xim	*Xim;
 typedef struct _Xic	*Xic;
 
@@ -53,7 +59,18 @@
 /*
  * XIM dependent data
  */
+
+typedef struct _XimCommonPrivateRec {
+    XlcConv		ctom_conv;
+    XlcConv		ctow_conv;
+    XlcConv		cstomb_conv;
+    XlcConv		cstowc_conv;
+    XlcCharSet		keyboard_charset;
+    unsigned long	locale_code;
+} XimCommonPrivateRec;
+
 typedef union _XIMPrivateRec {
+    XimCommonPrivateRec  common;
     XimLocalPrivateRec   local;
     XimProtoPrivateRec   proto;
 } XIMPrivateRec;
@@ -169,6 +186,13 @@
 /*
  * Global symbols
  */
+
+unsigned long Const * _XimGetLocaleCode (
+#if NeedFunctionPrototypes
+    _Xconst char*	encoding_name,
+    XlcCharSet*		cset_ret
+#endif
+);
 
 extern Bool _XimSetIMResourceList(
 #if NeedFunctionPrototypes
Index: xc/lib/X11/XimintL.h
diff -u xc/lib/X11/XimintL.h:1.1.1.2 xc/lib/X11/XimintL.h:1.3
--- xc/lib/X11/XimintL.h:1.1.1.2	Wed Aug 17 04:50:37 1994
+++ xc/lib/X11/XimintL.h	Wed Jun 14 11:20:33 2000
@@ -32,6 +32,7 @@
 	                          frankyling@hgrd01.enet.dec.com
 
 ******************************************************************/
+/* $XFree86: xc/lib/X11/XimintL.h,v 1.3 2000/06/14 18:20:33 dawes Exp $ */
 
 #ifndef _XIMINTL_H
 #define _XIMINTL_H
@@ -54,10 +55,14 @@
 } DefTree;
 
 typedef struct _XimLocalPrivateRec {
-	XIC			 current_ic;
-	DefTree			*top;
 	XlcConv			 ctom_conv;
 	XlcConv			 ctow_conv;
+	XlcConv			 cstomb_conv;
+	XlcConv			 cstowc_conv;
+	XlcCharSet		 keyboard_charset;
+        unsigned long		 locale_code;
+	XIC			 current_ic;
+	DefTree			*top;
 } XimLocalPrivateRec;
 
 typedef struct _XicThaiPart {
Index: xc/lib/X11/XimintP.h
diff -u xc/lib/X11/XimintP.h:1.1.1.1 xc/lib/X11/XimintP.h:1.3
--- xc/lib/X11/XimintP.h:1.1.1.1	Wed Apr 27 00:11:30 1994
+++ xc/lib/X11/XimintP.h	Wed Jun 14 11:20:33 2000
@@ -35,6 +35,7 @@
                                  miyamoto@jrd.dec.com
 
 ******************************************************************/
+/* $XFree86: xc/lib/X11/XimintP.h,v 1.3 2000/06/14 18:20:33 dawes Exp $ */
 
 #ifndef _XIMINTP_H
 #define _XIMINTP_H
@@ -101,6 +102,13 @@
  * private part of IM
  */
 typedef struct _XimProtoPrivateRec {
+    XlcConv			 ctom_conv;
+    XlcConv			 ctow_conv;
+    XlcConv			 cstomb_conv;
+    XlcConv			 cstowc_conv;
+    XlcCharSet			 keyboard_charset;
+    unsigned long		 locale_code;
+
     Window			 im_window;
     XIMID			 imid;
     CARD16			 unused;
@@ -125,9 +133,6 @@
     CARD16			 protocol_minor_version;
     XrmQuark			*saved_imvalues;
     int				 num_saved_imvalues;
-
-    XlcConv			 ctom_conv;
-    XlcConv			 ctow_conv;
 
     /*
      * transport specific
Index: xc/lib/X11/XlibInt.c
diff -u xc/lib/X11/XlibInt.c:3.19 xc/lib/X11/XlibInt.c:3.22
--- xc/lib/X11/XlibInt.c:3.19	Sat Jan 29 10:58:12 2000
+++ xc/lib/X11/XlibInt.c	Fri Jun 16 17:27:30 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/XlibInt.c,v 3.19 2000/01/29 18:58:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XlibInt.c,v 3.22 2000/06/17 00:27:30 dawes Exp $ */
 
 /*
  *	XlibInt.c - Internal support routines for the C subroutine
@@ -591,7 +591,11 @@
 	if (dpy->flags & XlibDisplayIOError) return;
 #ifdef XTHREADS
 	while (dpy->flags & XlibDisplayWriting) {
-	    ConditionWait(dpy, dpy->lock->writers);
+	    if (dpy->lock) {
+		ConditionWait(dpy, dpy->lock->writers);
+	    } else {
+		_XWaitForWritable (dpy, cv);
+	    }
 	}
 #endif
 	size = todo = dpy->bufptr - dpy->buffer;
@@ -1818,6 +1822,13 @@
 #endif
 	if (len > *lenp)
 	    _XEatData(dpy, len - *lenp);
+    }
+    if (len < SIZEOF(xReply))
+    {
+	_XIOError (dpy);
+	buf += *lenp;
+	*lenp = 0;
+	return buf;
     }
     if (len >= *lenp) {
 	buf += *lenp;
Index: xc/lib/X11/imConv.c
diff -u xc/lib/X11/imConv.c:1.22 xc/lib/X11/imConv.c:1.25
--- xc/lib/X11/imConv.c:1.22	Fri Feb 18 04:18:51 2000
+++ xc/lib/X11/imConv.c	Fri Jun 23 12:50:59 2000
@@ -31,7 +31,7 @@
                                 fujiwara@a80.tech.yk.fujitsu.co.jp
 
 ******************************************************************/
-/* $XFree86: xc/lib/X11/imConv.c,v 1.22 2000/02/18 12:18:51 tsi Exp $ */
+/* $XFree86: xc/lib/X11/imConv.c,v 1.25 2000/06/23 19:50:59 dawes Exp $ */
 
 #define NEED_EVENTS
 #include <stdio.h>
@@ -66,18 +66,18 @@
 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 
 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x990ee, 0x88000, 0x89000, 0x89084, 0x0902e, 0x89000, 0x09080, 0x9908e,
-0x0908e, 0x89080, 0x88000, 0x89080, 0x89080, 0x990ee, 0x89000, 0x89008,
-0x9908e, 0x89080, 0x89084, 0x89084, 0x0908e, 0x89004, 0x89000, 0x99084,
-0x0900c, 0x89000, 0x88000, 0x89080, 0x09000, 0x09084, 0x09000, 0x88000,
-0x88004, 0x9800e, 0x9800e, 0x98008, 0x9800e, 0x98008, 0x98008, 0x88006,
-0x88004, 0x9800e, 0x88004, 0x9800e, 0x88004, 0x9800e, 0x9800e, 0x98004,
-0x90000, 0x88004, 0x88004, 0x98006, 0x9800e, 0x98008, 0x9800e, 0x8800e,
-0x98008, 0x88004, 0x9800e, 0x9800c, 0x9800e, 0x90002, 0x90000, 0x9800e,
-0x88004, 0x9800e, 0x9800e, 0x98008, 0x9800e, 0x98008, 0x98008, 0x88004,
-0x88004, 0x9800e, 0x88004, 0x9800e, 0x88004, 0x9800e, 0x9800e, 0x98004,
-0x90000, 0x88004, 0x88004, 0x98006, 0x9800e, 0x98008, 0x9800e, 0x8800e,
-0x98008, 0x88004, 0x9800e, 0x9800c, 0x9800e, 0x90002, 0x90000, 0x88000
+0xb90ee, 0x88000, 0xa9000, 0xa9084, 0x2902e, 0x89000, 0x29080, 0xb908e,
+0x0908e, 0xa9080, 0x88000, 0xa9080, 0xa9080, 0xb90ee, 0xa9000, 0x89008,
+0xb908e, 0xa9080, 0xa9084, 0xa9084, 0x0908e, 0xa9004, 0xa9000, 0xb9084,
+0x0900c, 0xa9000, 0x88000, 0xa9080, 0x29000, 0x29084, 0x29000, 0x88000,
+0x88004, 0x9800e, 0x9800e, 0x98008, 0xb800e, 0xb8008, 0x98008, 0x88006,
+0x88004, 0xb800e, 0x88004, 0x9800e, 0x88004, 0x9800e, 0x9800e, 0x98004,
+0x90000, 0x88004, 0x88004, 0xb8006, 0x9800e, 0xb8008, 0xb800e, 0xa800e,
+0x98008, 0x88004, 0x9800e, 0x9800c, 0xb800e, 0x90002, 0x90000, 0xb800e,
+0x88004, 0x9800e, 0x9800e, 0x98008, 0xb800e, 0xb8008, 0x98008, 0x88004,
+0x88004, 0xb800e, 0x88004, 0x9800e, 0x88004, 0x9800e, 0x9800e, 0x98004,
+0x90000, 0x88004, 0x88004, 0xb8006, 0x9800e, 0xb8008, 0xb800e, 0xa800e,
+0x98008, 0x88004, 0x9800e, 0x9800c, 0xb800e, 0x90002, 0x90000, 0x88000
 };
 
 /* bit (1<<i) means character is in codeset i */
@@ -91,12 +91,12 @@
 0x1800c, 0x10008, 0x00008, 0x00000, 0x0800c, 0x00000, 0x00000, 0x00008,
 0x0800c, 0x00008, 0x00004, 0x00000, 0x00000, 0x00000, 0x00008, 0x00004,
 0x00000, 0x1800c, 0x1800c, 0x00000, 0x1800c, 0x00000, 0x00000, 0x08004,
-0x10008, 0x1800c, 0x10008, 0x1800c, 0x00000, 0x18008, 0x18008, 0x00000,
-0x00008, 0x00000, 0x00000, 0x18004, 0x1800c, 0x00000, 0x1800c, 0x0800c,
+0x30008, 0x1800c, 0x10008, 0x1800c, 0x00000, 0x18008, 0x18008, 0x00000,
+0x00008, 0x20000, 0x00000, 0x18004, 0x1800c, 0x00000, 0x1800c, 0x0800c,
 0x00000, 0x00000, 0x0800c, 0x00000, 0x0800c, 0x10000, 0x00000, 0x1800c,
 0x00000, 0x1800c, 0x1800c, 0x00000, 0x1800c, 0x00000, 0x00000, 0x08004,
-0x10008, 0x1800c, 0x10008, 0x1800c, 0x00000, 0x1800c, 0x1800c, 0x00000,
-0x00008, 0x00000, 0x00000, 0x18004, 0x1800c, 0x00000, 0x1800c, 0x0800c,
+0x30008, 0x1800c, 0x10008, 0x1800c, 0x00000, 0x1800c, 0x1800c, 0x00000,
+0x00008, 0x20000, 0x00000, 0x18004, 0x1800c, 0x00000, 0x1800c, 0x0800c,
 0x00000, 0x00000, 0x0800c, 0x00000, 0x0800c, 0x10000, 0x00000, 0x0000c
 };
 
@@ -409,7 +409,7 @@
 struct CodesetRec {
     unsigned long locale_code;
     char* locale_name;
-    char* escape_seq;
+    char* charset_name;
 };
 
 #define sLatin1	0L
@@ -438,38 +438,38 @@
 #define sUTF8	0x02000000L
 
 static struct CodesetRec CodesetTable[] = {
-    {sLatin1,	"ISO8859-1",	"\033-A"},
-    {sLatin2,	"ISO8859-2",	"\033-B"},
-    {sLatin3,	"ISO8859-3",	"\033-C"},
-    {sLatin4,	"ISO8859-4",	"\033-D"},
-    {sCyrillic,	"ISO8859-5",	"\033-L"},
-    {sArabic,	"ISO8859-6",	"\033-G"},
-    {sGreek,	"ISO8859-7",	"\033-F"},
-    {sHebrew,	"ISO8859-8",	"\033-H"},
-    {sLatin5,	"ISO8859-9",	"\033-M"},
-    {sLatin6,	"ISO8859-10",	"\033-V"},
-    {sThai,	"TACTIS",	"\033-T"},
-    {sKorean,	"ko.euc",	"\033$(C"},
-    {sThai,	"ISO8859-11",	"\033-T"},
-    {sThai,	"TIS620.2533-1", "\033-T"},
+    {sLatin1,	"ISO8859-1", NULL },
+    {sLatin2,	"ISO8859-2", NULL },
+    {sLatin3,	"ISO8859-3", NULL },
+    {sLatin4,	"ISO8859-4", NULL },
+    {sCyrillic,	"ISO8859-5", NULL },
+    {sArabic,	"ISO8859-6", NULL },
+    {sGreek,	"ISO8859-7", NULL },
+    {sHebrew,	"ISO8859-8", NULL },
+    {sLatin5,	"ISO8859-9", NULL },
+    {sLatin6,	"ISO8859-10",NULL },
+    {sKorean,	"ko.euc",	"KSC5601.1987-0:GL"},
+    {sThai,	"TACTIS",	"TIS620.2533-1:GR" },
+    {sThai,	"ISO8859-11",	"TIS620.2533-1:GR" },
+    {sThai,	"TIS620.2533-1", NULL },
+    {sLatin7,	"ISO8859-13",NULL }, /* Baltic Rim */
 #if 0
-    {sLatin8,	"ISO8859-12",	"\033-?"},/* Celtic, superceded by -14 */
-    {sLatin7,	"ISO8859-13",	"\033-?"},/* Baltic Rim */
-    {sLatin8	"ISO8859-14",	"\033-?"},/* Celtic */
+    {sLatin8,	"ISO8859-12",	""},/* Celtic, superceded by -14 */
+    {sLatin8	"ISO8859-14",	""},/* Celtic */
 #endif
-    {sUTF8,	"UTF-8",	"\033%G"},
+    {sUTF8,	"UTF-8",  "ISO10646-1"},
     /* Non-standard */
-    {sKoi8_r,	"KOI8-R", "\033%/1\200\210koi8-r\002"},
-    {sKoi8_u,	"KOI8-U", "\033%/1\200\211koi8-u\002"},
-    {sLatin9,	"ISO8859-15",	"\033%/1\200\213iso8859-15\002"},/* a.k.a. Latin-0 */
-    {sArmenian,	"ARMSCII-8", "\033%/1\200\210armscii-8\002"},
-    {sGeorgian,	"GEORGIAN-ACADEMY", "\033%/1\200\210georgian-academy\002"},
-    {sGeorgian,	"GEORGIAN-PS", "\033%/1\200\210georgian-ps\002"},
+    {sKoi8_r,	"KOI8-R",      NULL },
+    {sKoi8_u,	"KOI8-U",      NULL },
+    {sLatin9,	"ISO8859-15",  NULL },/* a.k.a. Latin-0 */
+    {sArmenian,	"ARMSCII-8",   NULL },
+    {sGeorgian,	"GEORGIAN-ACADEMY", NULL },
+    {sGeorgian,	"GEORGIAN-PS", NULL },
 	/* TODO find better values for the sLatin1 below */
-    {sLatin1,	"IBM-CP1133", "\033%/1\200\210ibm-cp1133\002"},
-    {sLatin1,	"MULELAO-1", "\033%/1\200\210mulelao-1\002"},
-    {sLatin1,	"VISCII1.1-1", "\033%/1\200\210viscii1.1-1\002"},
-    {sLatin1,	"TCVN-5712", "\033%/1\200\210tcvn-5712\002"},
+    {sLatin1,	"IBM-CP1133",  NULL },
+    {sLatin1,	"MULELAO-1",   NULL },
+    {sLatin1,	"VISCII1.1-1", NULL },
+    {sLatin1,	"TCVN-5712",   NULL },
 
 };
 
@@ -488,11 +488,11 @@
 #if NeedFunctionPrototypes
 _XimGetLocaleCode (
     _Xconst char*	encoding_name,
-    XPointer*		cset_ret)
+    XlcCharSet*		charset_ret)
 #else
-_XimGetLocaleCode (name, cset_ret)
+_XimGetLocaleCode (encoding_name, charset_ret)
     _Xconst char*	encoding_name;
-    XPointer*		cset_ret;
+    XlcCharSet*		charset_ret;
 #endif
 {
     int i;
@@ -507,8 +507,21 @@
         }
     }
   
-    if (cset_ret)
-        *cset_ret = (XPointer) cset;
+    if (charset_ret) {
+    	*charset_ret = NULL;
+    	if (cset->charset_name == NULL) {
+            char *name = Xmalloc(strlen(cset->locale_name) + 4);
+            if (name != NULL) {
+                strcpy(name, cset->locale_name);
+                strcat(name, ":GR");
+                *charset_ret = _XlcGetCharSet(name);
+            }
+        } else {
+            *charset_ret = _XlcGetCharSet(cset->charset_name);
+        }
+        if (*charset_ret == NULL)
+            *charset_ret = _XlcGetCharSet("ISO8859-1:GR");
+    }
     return &(cset->locale_code);
 }
 
@@ -549,7 +562,9 @@
 
     if (locale_code == sUTF8) {
         unsigned int ucs4 = keysym_to_ucs4 (keysym);
-        int count;
+
+        if (!ucs4)
+            return 0;
         if (ucs4 < 0x80)
             count = 1;
         else if (ucs4 < 0x800)
@@ -613,6 +628,8 @@
 		*buf = _Xkoi8_u[keysym & 0x7f];
 	    else
 		*buf = _Xcyrillic[keysym & 0x7f];
+	    if (!buf[0])
+		count = 0;
 	    break;
 	case sGreek:
 	    *buf = _Xgreek[keysym & 0x7f];
@@ -640,6 +657,16 @@
 		*buf = (unsigned char)0xfd;
 	    else if ((locale_code == sX0201) && (keysym == XK_yen))
 		*buf = (unsigned char)0x5c;
+	    else if (locale_code == sLatin7) {
+	        switch (keysym) {
+	        case XK_acute:	*buf = (unsigned char)0xff; break;
+	        case XK_AE:	*buf = (unsigned char)0xaf; break;
+	        case XK_ae:	*buf = (unsigned char)0xbf; break;
+	        case XK_Ooblique: *buf = (unsigned char)0xa8; break;
+	        case XK_oslash:	*buf = (unsigned char)0xb8; break;
+	        default: count = 0;
+                }
+            }
 	    else count = 0;
 	}
     } else if (isLatin1) {
@@ -670,6 +697,28 @@
 	    else if (keysym == XK_zcaron)
 		*buf = (unsigned char)0xb8;
 	    else count = 0;
+	} else if (locale_code == sLatin7) {
+	    switch (keysym) {
+	    case XK_Aogonek:	*buf = (unsigned char)0xc0; break;
+	    case XK_aogonek:	*buf = (unsigned char)0xe0; break;
+	    case XK_Cacute:	*buf = (unsigned char)0xc3; break;
+	    case XK_cacute:	*buf = (unsigned char)0xe3; break;
+	    case XK_Eogonek:	*buf = (unsigned char)0xc6; break;
+	    case XK_eogonek:	*buf = (unsigned char)0xe6; break;
+	    case XK_Zacute:	*buf = (unsigned char)0xca; break;
+	    case XK_zacute:	*buf = (unsigned char)0xea; break;
+	    case XK_Scaron:	*buf = (unsigned char)0xd0; break;
+	    case XK_scaron:	*buf = (unsigned char)0xf0; break;
+	    case XK_Lstroke:	*buf = (unsigned char)0xd9; break;
+	    case XK_lstroke:	*buf = (unsigned char)0xf9; break;
+	    case XK_Sacute:	*buf = (unsigned char)0xda; break;
+	    case XK_sacute:	*buf = (unsigned char)0xfa; break;
+	    case XK_Zabovedot:	*buf = (unsigned char)0xdd; break;
+	    case XK_zabovedot:	*buf = (unsigned char)0xfd; break;
+	    case XK_Zcaron:	*buf = (unsigned char)0xde; break;
+	    case XK_zcaron:	*buf = (unsigned char)0xfe; break;
+            default: count = 0;
+	    }
 	} else count = 0;
     } else if ((keysym >> 8) == sLatin3) {
 	if (locale_code == sLatin5) {
@@ -725,6 +774,37 @@
 	    case XK_uogonek:	*buf = (unsigned char)(keysym & 0xff); break;
 	    default: count = 0;
 	    }
+	} else if (locale_code == sLatin7) {
+	    count = 1;
+	    switch (keysym) {
+ 	    case XK_Emacron:	*buf = (unsigned char)0xc7; break;
+	    case XK_emacron:	*buf = (unsigned char)0xe7; break;
+	    case XK_Gcedilla:	*buf = (unsigned char)0xcc; break;
+	    case XK_gcedilla:	*buf = (unsigned char)0xec; break;
+	    case XK_Rcedilla:	*buf = (unsigned char)0xaa; break;
+	    case XK_rcedilla:	*buf = (unsigned char)0xba; break;
+	    case XK_Imacron:	*buf = (unsigned char)0xce; break;
+	    case XK_imacron:	*buf = (unsigned char)0xee; break;
+	    case XK_Lcedilla:	*buf = (unsigned char)0xcf; break;
+	    case XK_lcedilla:	*buf = (unsigned char)0xef; break;
+	    case XK_Umacron:	*buf = (unsigned char)0xdb; break;
+	    case XK_umacron:	*buf = (unsigned char)0xfb; break;
+ 	    case XK_Amacron:	*buf = (unsigned char)0xc2; break;
+	    case XK_amacron:	*buf = (unsigned char)0xe2; break;
+	    case XK_Kcedilla:	*buf = (unsigned char)0xcd; break;
+	    case XK_kcedilla:	*buf = (unsigned char)0xed; break;
+	    case XK_Iogonek:	*buf = (unsigned char)0xc1; break;
+	    case XK_iogonek:	*buf = (unsigned char)0xe1; break;
+	    case XK_Eabovedot:	*buf = (unsigned char)0xcb; break;
+	    case XK_eabovedot:	*buf = (unsigned char)0xeb; break;
+	    case XK_Ncedilla:	*buf = (unsigned char)0xd2; break;
+	    case XK_ncedilla:	*buf = (unsigned char)0xf2; break;
+	    case XK_Omacron:	*buf = (unsigned char)0xd4; break;
+	    case XK_omacron:	*buf = (unsigned char)0xf4; break;
+	    case XK_Uogonek:	*buf = (unsigned char)0xd8; break;
+	    case XK_uogonek:	*buf = (unsigned char)0xf8; break;
+	    default: count = 0;
+	    }
 	}
     } else if (locale_code == sLatin9 && keysym == XK_EuroSign) {
 	count = 1;
@@ -772,13 +852,11 @@
     KeySym*		keysym;
     XComposeStatus*	status;
 {
-    int count, local_count;
+    int count;
     KeySym symbol;
-    struct CodesetRec *cset;
     Status	dummy;
     Xim	im = (Xim)ic->core.im;
-    XLCd lcd = im->core.lcd;
-    unsigned char local_buf[BUF_SIZE];
+    XimCommonPrivateRec* private = &im->private.common;
     unsigned char look[BUF_SIZE];
 
     /* force a latin-1 lookup for compatibility */
@@ -786,25 +864,7 @@
     if (keysym != NULL) *keysym = symbol;
     if ((nbytes == 0) || (symbol == NoSymbol)) return count;
 
-    _XimGetLocaleCode(XLC_PUBLIC(lcd,encoding_name), (XPointer *) &cset);
-    
-    if ((count == 0 && cset != NULL) || 
-	(count == 1 && (symbol > 0x7f && symbol < 0xff00) && 
-	 cset->locale_code != 0)) {
-	if ((count = _XimGetCharCode(cset->locale_code, symbol,
-                                     look, sizeof look))) {
-	    strcpy((char*) local_buf, cset->escape_seq);
-	    local_count = strlen(cset->escape_seq);
-	    strncpy((char *)(&local_buf[local_count]), (char *)look, count);
-	    local_count += local_count;
-	    local_buf[local_count] = '\0';
-	    if ((count = im->methods->ctstombs(ic->core.im,
-				(char*) local_buf, local_count,
-				(char *)buffer, nbytes, &dummy)) < 0) {
-		count = 0;
-	    }
-	}
-    } else if (count > 1) { /* not ASCII Encoding */
+    if (count > 1) {
 	memcpy(look, (char *)buffer,count);
 	look[count] = '\0';
 	if ((count = im->methods->ctstombs(ic->core.im,
@@ -812,6 +872,28 @@
 				buffer, nbytes, &dummy)) < 0) {
 	    count = 0;
 	}
+    } else if ((count == 0) || 
+	       (count == 1 && (symbol > 0x7f && symbol < 0xff00) && 
+	       private->locale_code != 0)) {
+	if ((count = _XimGetCharCode(private->locale_code, symbol,
+                                     look, sizeof look))) {
+
+            XPointer args[1];
+            unsigned char *from = look;
+            unsigned char *to = (unsigned char*) buffer; 
+            int from_len = count;
+            int to_len = nbytes;
+            args[0] = (XPointer) private->keyboard_charset;
+            
+	    if ((count = _XlcConvert(private->cstomb_conv,
+                                (XPointer*) &from, &from_len,
+                                (XPointer*) &to, &to_len,
+				args, 1 )) != 0) {
+		count = 0;
+	    } else {
+                count = nbytes - to_len;
+	    }
+	}
     }
     /* 
      * we should make sure that if the character is a Latin1 character
@@ -830,13 +912,11 @@
     KeySym*		keysym;
     XComposeStatus*	status;
 {
-    int count, local_count;
+    int count;
     KeySym symbol;
-    struct CodesetRec *cset;
     Status	dummy;
     Xim	im = (Xim)ic->core.im;
-    XLCd lcd = im->core.lcd;
-    unsigned char local_buf[BUF_SIZE];
+    XimCommonPrivateRec* private = &im->private.common;
     unsigned char look[BUF_SIZE];
 
     /* force a latin-1 lookup for compatibility */
@@ -844,29 +924,32 @@
     if (keysym != NULL) *keysym = symbol;
     if ((nbytes == 0) || (symbol == NoSymbol)) return count;
 
-    _XimGetLocaleCode(XLC_PUBLIC(lcd,encoding_name), (XPointer *) &cset);
-    
-    if ((count == 0 && cset != NULL) ||
-	(count == 1 && (symbol > 0x7f && symbol < 0xff00) &&
-	 cset->locale_code != 0)) {
-	if ((count = _XimGetCharCode(cset->locale_code, symbol,
-                                     look, sizeof look))) {
-	    strcpy((char*) local_buf, cset->escape_seq);
-	    local_count = strlen(cset->escape_seq);
-	    strncpy((char *)(&local_buf[local_count]), (char *)look, count);
-	    local_count += count;
-	    local_buf[local_count] = '\0';
-	    if ((count = im->methods->ctstowcs(ic->core.im,
-				(char*) local_buf, local_count,
-				buffer, nbytes, &dummy)) < 0) {
-		count = 0;
-	    }
-	}
-    } else if (count > 1) {
+    if (count > 1) {
 	if ((count = im->methods->ctstowcs(ic->core.im,
 				(char*) look, count, 
 				buffer, nbytes, &dummy)) < 0) {
 	    count = 0;
+	}
+    } else if ((count == 0) ||
+	       (count == 1 && (symbol > 0x7f && symbol < 0xff00) &&
+	       private->locale_code != 0)) {
+	if ((count = _XimGetCharCode(private->locale_code, symbol,
+                                     look, sizeof look))) {
+            XPointer args[1];
+            unsigned char *from = look;
+            wchar_t *to = buffer; 
+            int from_len = count;
+            int to_len = nbytes;
+            args[0] = (XPointer) private->keyboard_charset;
+            
+	    if ((count = _XlcConvert(private->cstowc_conv,
+                                (XPointer*) &from, &from_len,
+                                (XPointer*) &to, &to_len,
+				args, 1 )) != 0) {
+		count = 0;
+	    } else {
+                count = nbytes - to_len;
+	    }
 	}
     } else
 	/* 
Index: xc/lib/X11/imDefIm.c
diff -u xc/lib/X11/imDefIm.c:1.3 xc/lib/X11/imDefIm.c:1.4
--- xc/lib/X11/imDefIm.c:1.3	Sun Aug  1 00:56:52 1999
+++ xc/lib/X11/imDefIm.c	Mon Jun 12 19:28:28 2000
@@ -31,13 +31,14 @@
                                makoto@sm.sony.co.jp
 
 ******************************************************************/
-/* $XFree86: xc/lib/X11/imDefIm.c,v 1.3 1999/08/01 07:56:52 dawes Exp $ */
+/* $XFree86: xc/lib/X11/imDefIm.c,v 1.4 2000/06/13 02:28:28 dawes Exp $ */
 
 #include <X11/Xatom.h>
 #define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPublic.h"
+#include "XlcPubI.h"
 #include "XimTrInt.h"
 #include "Ximint.h"
 
@@ -1036,6 +1037,14 @@
 	_XlcCloseConverter(im->private.proto.ctow_conv);
 	im->private.proto.ctow_conv = NULL;
     }
+    if (im->private.proto.cstomb_conv) {
+	_XlcCloseConverter(im->private.proto.cstomb_conv);
+	im->private.proto.cstomb_conv = NULL;
+    }
+    if (im->private.proto.cstowc_conv) {
+	_XlcCloseConverter(im->private.proto.cstowc_conv);
+	im->private.proto.cstowc_conv = NULL;
+    }
 
 #ifdef XIM_CONNECTABLE
     if (!IS_SERVER_CONNECTED(im) && IS_RECONNECTABLE(im)) {
@@ -1602,6 +1611,8 @@
     int		 len;
     XlcConv	 ctom_conv;
     XlcConv	 ctow_conv;
+    XlcConv	 conv;
+    XimProtoPrivateRec *private = &im->private.proto;
 
     if (idx == (CARD16)XIM_Default_Encoding_IDX) { /* XXX */
 	if (!(ctom_conv = _XlcOpenConverter(lcd,
@@ -1639,8 +1650,19 @@
     } else {
 	return False;
     }
-    im->private.proto.ctom_conv = ctom_conv;
-    im->private.proto.ctow_conv = ctow_conv;
+
+    private->ctom_conv = ctom_conv;
+    private->ctow_conv = ctow_conv;
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNMultiByte)))
+	return False;
+    private->cstomb_conv = conv;
+
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNWideChar)))
+	return False;
+    private->cstowc_conv = conv;
+
+    private->locale_code = * _XimGetLocaleCode(XLC_PUBLIC(lcd,encoding_name),
+                            (XlcCharSet*) &(private->keyboard_charset));
     return True;
 }
 
Index: xc/lib/X11/imInt.c
diff -u xc/lib/X11/imInt.c:3.6 xc/lib/X11/imInt.c:3.8
--- xc/lib/X11/imInt.c:3.6	Sun May  9 03:50:33 1999
+++ xc/lib/X11/imInt.c	Mon Jun 12 19:28:28 2000
@@ -26,7 +26,7 @@
                                fujiwara@a80.tech.yk.fujitsu.co.jp
 
 ******************************************************************/
-/* $XFree86: xc/lib/X11/imInt.c,v 3.6 1999/05/09 10:50:33 dawes Exp $ */
+/* $XFree86: xc/lib/X11/imInt.c,v 3.8 2000/06/13 02:28:28 dawes Exp $ */
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
@@ -183,9 +183,9 @@
     XLCd	   lcd;
 #endif
 {
-    char* begin;
-    char* end;
-    char* ret;
+    char* begin = NULL;
+    char* end = NULL;
+    char* ret = NULL;
     char* ximmodifier = XIMMODIFIER;
 
     if(lcd->core->modifiers != NULL && *lcd->core->modifiers != '\0') {
@@ -194,10 +194,12 @@
 	    end = begin += strlen(ximmodifier);
 	    while (*end && *end != '@')
 		end++;
-	    ret = Xmalloc(end - begin + 2);
+	    ret = Xmalloc(end - begin + 1);
 	    if (ret != NULL) {
-		(void)strncpy(ret, begin, end - begin + 1);
-		ret[end - begin + 1] = '\0';
+		if (begin != NULL && end != NULL) {
+		    (void)strncpy(ret, begin, end - begin);
+		    ret[end - begin] = '\0';
+		}
 	    }
 	    return ret;
 	}
Index: xc/lib/X11/imLcIm.c
diff -u xc/lib/X11/imLcIm.c:1.3 xc/lib/X11/imLcIm.c:1.5
--- xc/lib/X11/imLcIm.c:1.3	Sat Oct  3 01:41:34 1998
+++ xc/lib/X11/imLcIm.c	Wed Jun 14 11:20:33 2000
@@ -32,6 +32,7 @@
 	                          frankyling@hgrd01.enet.dec.com
 
 ******************************************************************/
+/* $XFree86: xc/lib/X11/imLcIm.c,v 1.5 2000/06/14 18:20:33 dawes Exp $ */
 
 #include <stdio.h>
 /*
@@ -43,6 +44,7 @@
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPublic.h"
+#include "XlcPubI.h"
 #include "Ximint.h"
 #include <ctype.h>
 
@@ -120,6 +122,22 @@
 	Xfree(im->core.im_name);
 	im->core.im_name = NULL;
     }
+    if (im->private.local.ctom_conv) {
+	_XlcCloseConverter(im->private.local.ctom_conv);
+        im->private.local.ctom_conv = NULL;
+    }
+    if (im->private.local.ctow_conv) {
+	_XlcCloseConverter(im->private.local.ctow_conv);
+	im->private.local.ctow_conv = NULL;
+    }
+    if (im->private.local.cstomb_conv) {
+	_XlcCloseConverter(im->private.local.cstomb_conv);
+        im->private.local.cstomb_conv = NULL;
+    }
+    if (im->private.local.cstowc_conv) {
+	_XlcCloseConverter(im->private.local.cstowc_conv);
+	im->private.local.cstowc_conv = NULL;
+    }
     return;
 }
 
@@ -204,9 +222,9 @@
     Xim			 im;
 {
     XLCd		 lcd = im->core.lcd;
-    XlcConv		 ctom_conv;
-    XlcConv		 ctow_conv;
+    XlcConv		 conv;
     XimDefIMValues	 im_values;
+    XimLocalPrivateRec*  private = &im->private.local;
 
     _XimInitialResourceInfo();
     if(_XimSetIMResourceList(&im->core.im_resources,
@@ -228,47 +246,32 @@
     _XimSetCurrentIMValues(im, &im_values);
 
     _XimCreateDefaultTree(im);
+
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNMultiByte)))
+	goto Open_Error;
+    private->ctom_conv = conv;
 
-    if (!(ctom_conv = _XlcOpenConverter(lcd,
-					XlcNCompoundText, lcd, XlcNMultiByte)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNWideChar)))
 	goto Open_Error;
-    if (!(ctow_conv = _XlcOpenConverter(lcd,
-					XlcNCompoundText, lcd, XlcNWideChar)))
+    private->ctow_conv = conv;
+
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNMultiByte)))
+	goto Open_Error;
+    private->cstomb_conv = conv;
+
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNWideChar)))
 	goto Open_Error;
+    private->cstowc_conv = conv;
 
+    private->locale_code = * _XimGetLocaleCode(XLC_PUBLIC(lcd,encoding_name),
+                            (XlcCharSet*) &(private->keyboard_charset));
+
     im->methods = &Xim_im_local_methods;
-    im->private.local.current_ic = (XIC)NULL;
-    im->private.local.ctom_conv = ctom_conv;
-    im->private.local.ctow_conv = ctow_conv;
+    private->current_ic = (XIC)NULL;
 
     return(True);
 
 Open_Error :
-    if (im->core.im_resources) {
-	Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if (im->core.ic_resources) {
-	Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
-    if (im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if (im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    if (im->core.styles) {
-	Xfree(im->core.styles);
-	im->core.styles = NULL;
-    }
-    if (im->private.local.ctom_conv) {
-	_XlcCloseConverter(im->private.local.ctom_conv);
-    }
-    if (im->private.local.ctow_conv) {
-	_XlcCloseConverter(im->private.local.ctow_conv);
-    }
+    _XimLocalIMFree(im);
     return(False);
 }
Index: xc/lib/X11/imThaiIm.c
diff -u xc/lib/X11/imThaiIm.c:1.1.1.3 xc/lib/X11/imThaiIm.c:1.3
--- xc/lib/X11/imThaiIm.c:1.1.1.3	Wed Jan 24 03:05:55 1996
+++ xc/lib/X11/imThaiIm.c	Wed Jun 14 11:20:33 2000
@@ -32,6 +32,7 @@
 	                          frankyling@hgrd01.enet.dec.com
 
 ******************************************************************/
+/* $XFree86: xc/lib/X11/imThaiIm.c,v 1.3 2000/06/14 18:20:33 dawes Exp $ */
 
 #include <stdio.h>
 #include <X11/Xlib.h>
@@ -41,6 +42,7 @@
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPublic.h"
+#include "XlcPubI.h"
 #include "Ximint.h"
 
 Private XIMMethodsRec      Xim_im_thai_methods = {
@@ -72,9 +74,9 @@
     Xim		 im;
 {
     XLCd		 lcd = im->core.lcd;
-    XlcConv		 ctom_conv;
-    XlcConv		 ctow_conv;
+    XlcConv		 conv;
     XimDefIMValues	 im_values;
+    XimLocalPrivateRec*  private = &im->private.local;
 
     _XimInitialResourceInfo();
     if(_XimSetIMResourceList(&im->core.im_resources,
@@ -95,47 +97,32 @@
     }
     _XimSetCurrentIMValues(im, &im_values);
 
-    if (!(ctom_conv = _XlcOpenConverter(lcd,
-					XlcNCompoundText, lcd, XlcNMultiByte)))
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNMultiByte)))
 	goto Open_Error;
-    if (!(ctow_conv = _XlcOpenConverter(lcd,
-					XlcNCompoundText, lcd, XlcNWideChar)))
+    private->ctom_conv = conv;
+
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCompoundText, lcd, XlcNWideChar)))
+	goto Open_Error;
+    private->ctow_conv = conv;
+    
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNMultiByte)))
 	goto Open_Error;
+    private->cstomb_conv = conv;
+
+    if (!(conv = _XlcOpenConverter(lcd,	XlcNCharSet, lcd, XlcNWideChar)))
+	goto Open_Error;
+    private->cstowc_conv = conv;
+
+    private->locale_code = * _XimGetLocaleCode(XLC_PUBLIC(lcd,encoding_name),
+                            (XlcCharSet*) &(private->keyboard_charset));
 
     im->methods = &Xim_im_thai_methods;
-    im->private.local.current_ic = (XIC)NULL;
-    im->private.local.ctom_conv = ctom_conv;
-    im->private.local.ctow_conv = ctow_conv;
+    private->current_ic = (XIC)NULL;
 
     return(True);
 
 Open_Error :
-    if (im->core.im_resources) {
-	Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if (im->core.ic_resources) {
-	Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
-    if (im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if (im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    if (im->core.styles) {
-	Xfree(im->core.styles);
-	im->core.styles = NULL;
-    }
-    if (im->private.local.ctom_conv) {
-	_XlcCloseConverter(im->private.local.ctom_conv);
-    }
-    if (im->private.local.ctow_conv) {
-	_XlcCloseConverter(im->private.local.ctow_conv);
-    }
+    _XimThaiIMFree(im);
     return(False);
 }
 
@@ -174,6 +161,22 @@
     if(im->core.im_name) {
 	Xfree(im->core.im_name);
 	im->core.im_name = NULL;
+    }
+    if (im->private.local.ctom_conv) {
+	_XlcCloseConverter(im->private.local.ctom_conv);
+	im->private.local.ctom_conv = NULL;
+    }
+    if (im->private.local.ctow_conv) {
+	_XlcCloseConverter(im->private.local.ctow_conv);
+	im->private.local.ctow_conv = NULL;
+    }
+    if (im->private.local.cstomb_conv) {
+	_XlcCloseConverter(im->private.local.cstomb_conv);
+	im->private.local.cstomb_conv = NULL;
+    }
+    if (im->private.local.cstowc_conv) {
+	_XlcCloseConverter(im->private.local.cstowc_conv);
+	im->private.local.cstowc_conv = NULL;
     }
     return;
 }
Index: xc/lib/X11/lcCT.c
diff -u xc/lib/X11/lcCT.c:3.16 xc/lib/X11/lcCT.c:3.17
--- xc/lib/X11/lcCT.c:3.16	Fri Feb 25 10:27:54 2000
+++ xc/lib/X11/lcCT.c	Thu May 18 09:29:51 2000
@@ -36,7 +36,7 @@
  *  Modifier: Ivan Pascal     The XFree86 Project
  *  Modifier: Bruno Haible    The XFree86 Project
  */
-/* $XFree86: xc/lib/X11/lcCT.c,v 3.16 2000/02/25 18:27:54 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcCT.c,v 3.17 2000/05/18 16:29:51 dawes Exp $ */
 
 #include "Xlibint.h"
 #include "XlcPubI.h"
@@ -568,11 +568,13 @@
 
     while (ctext_len > 0 && buf_len > 0) {
         ch = *ctptr;
+#ifdef notdef
         if (ch == XctCSI) {
             /* do nothing except skip sequence if not recognized */
             if (_XlcParseCT(&ctptr, &ctext_len, NULL))
                 continue;
         }
+#endif
         if (ch == XctESC) {
             ret = _XlcCheckCTSequence(state, &ctptr, &ctext_len);
             if (ret == resOK || ret == resNotInList)
@@ -675,23 +677,27 @@
             ct_len -= length;
         }
     }
-    min_ch = 0x20;
-    max_ch = 0x7f;
-
-    if (charset->set_size == 94) {
-        max_ch--;
-    if (charset->char_size > 1 || side == XlcGR)
-        min_ch++;
+    if (charset->set_size) {
+        min_ch = 0x20;
+        max_ch = 0x7f;
+
+        if (charset->set_size == 94) {
+            max_ch--;
+        if (charset->char_size > 1 || side == XlcGR)
+            min_ch++;
+        }
     }
 
     while (csstr_len > 0 && ct_len > 0) {
-        ch = *((unsigned char *) csptr) & 0x7f;
-        if (ch < min_ch || ch > max_ch)
-            if (ch != 0x00 && ch != 0x09 && ch != 0x0a && ch != 0x1b) {
-                csptr++;
-                csstr_len--;
-                continue;	/* XXX */
-            }
+        if (charset->set_size) {
+            ch = *((unsigned char *) csptr) & 0x7f;
+            if (ch < min_ch || ch > max_ch)
+                if (ch != 0x00 && ch != 0x09 && ch != 0x0a && ch != 0x1b) {
+                    csptr++;
+                    csstr_len--;
+                    continue;	/* XXX */
+                }
+        }
 
         if (side == XlcGL)
             *ctptr++ = *csptr++ & 0x7f;
Index: xc/lib/X11/lcUTF8.c
diff -u xc/lib/X11/lcUTF8.c:1.2 xc/lib/X11/lcUTF8.c:1.5
--- xc/lib/X11/lcUTF8.c:1.2	Mon Feb 28 19:09:04 2000
+++ xc/lib/X11/lcUTF8.c	Fri Jun 30 11:27:00 2000
@@ -24,7 +24,7 @@
 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.2 2000/02/29 03:09:04 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.5 2000/06/30 18:27:00 dawes Exp $ */
 
 /*
  * This file contains:
@@ -120,7 +120,8 @@
  */
 
 typedef wchar_t original_wchar_t;
-#define wchar_t unsigned int
+typedef unsigned int local_wchar_t;
+#define wchar_t local_wchar_t
 #define conv_t XlcConv
 
 typedef struct _Utf8ConvRec {
@@ -142,12 +143,13 @@
  * int xxx_cstowc (XlcConv conv, wchar_t *pwc, unsigned char const *s, int n)
  * converts the byte sequence starting at s to a wide character. Up to n bytes
  * are available at s. n is >= 1.
- * Result is number of bytes consumed, or -1 if invalid, or 0 if n too small.
+ * Result is number of bytes consumed (if a wide character was read),
+ * or 0 if invalid, or -1 if n too small.
  *
  * int xxx_wctocs (XlcConv conv, unsigned char *r, wchar_t wc, int n)
  * converts the wide character wc to the character set xxx, and stores the
  * result beginning at r. Up to n bytes may be written at r. n is >= 1.
- * Result is number of bytes written, or -1 if invalid, or 0 if n too small.
+ * Result is number of bytes written, or 0 if invalid, or -1 if n too small.
  */
 
 /* Return code if invalid. (xxx_mbtowc, xxx_wctomb) */
@@ -164,6 +166,7 @@
  * when the current locale is not an UTF-8 locale.
  */
 
+#include "lcUniConv/utf8.h"
 #ifdef notused
 #include "lcUniConv/ascii.h"
 #endif
@@ -177,6 +180,7 @@
 #include "lcUniConv/iso8859_8.h"
 #include "lcUniConv/iso8859_9.h"
 #include "lcUniConv/iso8859_10.h"
+#include "lcUniConv/iso8859_13.h"
 #include "lcUniConv/iso8859_14.h"
 #include "lcUniConv/iso8859_15.h"
 #include "lcUniConv/iso8859_16.h"
@@ -206,6 +210,12 @@
 #endif
 
 static Utf8ConvRec all_charsets[] = {
+    /* The ISO10646-1/UTF-8 entry occurs twice, once at the beginning
+       (for lookup speed), once at the end (as a fallback).  */
+    { "ISO10646-1", NULLQUARK,
+	utf8_mbtowc, utf8_wctomb
+    },
+
     { "ISO8859-1", NULLQUARK,
 	iso8859_1_mbtowc, iso8859_1_wctomb
     },
@@ -236,6 +246,9 @@
     { "ISO8859-10", NULLQUARK,
 	iso8859_10_mbtowc, iso8859_10_wctomb
     },
+    { "ISO8859-13", NULLQUARK,
+	iso8859_13_mbtowc, iso8859_13_wctomb
+    },
     { "ISO8859-14", NULLQUARK,
 	iso8859_14_mbtowc, iso8859_14_wctomb
     },
@@ -295,6 +308,12 @@
 	big5_mbtowc, big5_wctomb
     },
 #endif
+
+    /* The ISO10646-1/UTF-8 entry occurs twice, once at the beginning
+       (for lookup speed), once at the end (as a fallback).  */
+    { "ISO10646-1", NULLQUARK,
+	utf8_mbtowc, utf8_wctomb
+    },
 };
 
 #define all_charsets_count (sizeof(all_charsets)/sizeof(all_charsets[0]))
@@ -315,119 +334,6 @@
 	    init_all_charsets();					\
     } while (0)
 
-/*
- * UTF-8 itself
- */
-
-static int
-utf8_cstowc(pwc, src, n)
-    wchar_t *pwc;
-    unsigned char const *src;
-    int n;
-{
-    unsigned char c = src[0];
-
-    if (c < 0x80) {
-	*pwc = c;
-	return 1;
-    } else if (c < 0xc2) {
-	return -1;
-    } else if (c < 0xe0) {
-	if (n < 2)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x1f) << 6)
-	       | (wchar_t) (src[1] ^ 0x80);
-	return 2;
-    } else if (c < 0xf0) {
-	if (n < 3)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40 && (src[2] ^ 0x80) < 0x40
-              && (c >= 0xe1 || src[1] >= 0xa0)))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x0f) << 12)
-	       | ((wchar_t) (src[1] ^ 0x80) << 6)
-	       | (wchar_t) (src[2] ^ 0x80);
-	return 3;
-    } else if (c < 0xf8 && sizeof(wchar_t)*8 >= 32) {
-	if (n < 4)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40 && (src[2] ^ 0x80) < 0x40
-	      && (src[3] ^ 0x80) < 0x40
-              && (c >= 0xf1 || src[1] >= 0x90)))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x07) << 18)
-	       | ((wchar_t) (src[1] ^ 0x80) << 12)
-	       | ((wchar_t) (src[2] ^ 0x80) << 6)
-	       | (wchar_t) (src[3] ^ 0x80);
-	return 4;
-    } else if (c < 0xfc && sizeof(wchar_t)*8 >= 32) {
-	if (n < 5)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40 && (src[2] ^ 0x80) < 0x40
-	      && (src[3] ^ 0x80) < 0x40 && (src[4] ^ 0x80) < 0x40
-              && (c >= 0xf9 || src[1] >= 0x88)))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x03) << 24)
-	       | ((wchar_t) (src[1] ^ 0x80) << 18)
-	       | ((wchar_t) (src[2] ^ 0x80) << 12)
-	       | ((wchar_t) (src[3] ^ 0x80) << 6)
-	       | (wchar_t) (src[4] ^ 0x80);
-	return 5;
-    } else if (c < 0xfe && sizeof(wchar_t)*8 >= 32) {
-	if (n < 6)
-	    return 0;
-	if (!((src[1] ^ 0x80) < 0x40 && (src[2] ^ 0x80) < 0x40
-	      && (src[3] ^ 0x80) < 0x40 && (src[4] ^ 0x80) < 0x40
-	      && (src[5] ^ 0x80) < 0x40
-              && (c >= 0xfd || src[1] >= 0x84)))
-	    return -1;
-	*pwc = ((wchar_t) (c & 0x01) << 30)
-	       | ((wchar_t) (src[1] ^ 0x80) << 24)
-	       | ((wchar_t) (src[2] ^ 0x80) << 18)
-	       | ((wchar_t) (src[3] ^ 0x80) << 12)
-	       | ((wchar_t) (src[4] ^ 0x80) << 6)
-	       | (wchar_t) (src[5] ^ 0x80);
-	return 6;
-    } else
-	return -1;
-}
-
-static int
-utf8_wctocs(r, wc, n)
-    unsigned char *r;
-    wchar_t wc;
-    int n; /* n == 0 is acceptable */
-{
-    int count;
-    if ((unsigned int) wc < 0x80)
-	count = 1;
-    else if ((unsigned int) wc < 0x800)
-	count = 2;
-    else if ((unsigned int) wc < 0x10000)
-	count = 3;
-    else if ((unsigned int) wc < 0x200000)
-	count = 4;
-    else if ((unsigned int) wc < 0x4000000)
-	count = 5;
-    else if ((unsigned int) wc <= 0x7fffffff)
-	count = 6;
-    else
-	return -1;
-    if (n < count)
-	return 0;
-    switch (count) { /* note: code falls through cases! */
-	case 6: r[5] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x4000000;
-	case 5: r[4] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x200000;
-	case 4: r[3] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x10000;
-	case 3: r[2] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x800;
-	case 2: r[1] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0xc0;
-	case 1: r[0] = wc;
-    }
-    return count;
-}
-
 /* from XlcNCharSet to XlcNUtf8String */
 
 static int
@@ -460,7 +366,7 @@
     name = charset->encoding_name;
     /* not charset->name because the latter has a ":GL"/":GR" suffix */
 
-    for (convptr = all_charsets, i = all_charsets_count; i > 0; convptr++, i--)
+    for (convptr = all_charsets, i = all_charsets_count-1; i > 0; convptr++, i--)
 	if (!strcmp(convptr->name, name))
 	    break;
     if (i == 0)
@@ -478,17 +384,17 @@
 	int count;
 
 	consumed = convptr->cstowc(conv, &wc, src, srcend-src);
-	if (consumed < 0)
+	if (consumed == RET_ILSEQ)
 	    return -1;
-	if (consumed == 0)
+	if (consumed == RET_TOOFEW(0))
 	    break;
 
-	count = utf8_wctocs(dst, wc, dstend-dst);
-	if (count == 0)
+	count = utf8_wctomb(NULL, dst, wc, dstend-dst);
+	if (count == RET_TOOSMALL)
 	    break;
-	if (count < 0) {
-	    count = utf8_wctocs(dst, BAD_WCHAR, dstend-dst);
-	    if (count == 0)
+	if (count == RET_ILSEQ) {
+	    count = utf8_wctomb(NULL, dst, BAD_WCHAR, dstend-dst);
+	    if (count == RET_TOOSMALL)
 		break;
 	    unconv_num++;
 	}
@@ -547,8 +453,8 @@
     charset_num = 0;
     for (i = 0; i < codeset_num; i++)
 	charset_num += codeset_list[i]->num_charsets;
-    if (charset_num > all_charsets_count)
-	charset_num = all_charsets_count;
+    if (charset_num > all_charsets_count-1)
+	charset_num = all_charsets_count-1;
     preferred = (Utf8Conv *) Xmalloc((charset_num + 1) * sizeof(Utf8Conv));
     if (preferred == (Utf8Conv *) NULL) {
 	Xfree((char *) conv);
@@ -568,7 +474,7 @@
 		    break;
 	    if (k < 0) {
 		/* Look it up in all_charsets[]. */
-		for (k = 0; k < all_charsets_count; k++)
+		for (k = 0; k < all_charsets_count-1; k++)
 		    if (!strcmp(all_charsets[k].name, name)) {
 			/* Add it to the preferred set. */
 			preferred[charset_num++] = &all_charsets[k];
@@ -612,28 +518,28 @@
     Utf8Conv convptr;
     int i;
 
-    while (*preferred != (Utf8Conv) NULL) {
+    for (; *preferred != (Utf8Conv) NULL; preferred++) {
 	convptr = *preferred;
 	count = convptr->wctocs(conv, r, wc, n);
-	if (count == 0)
-	    return 0;
-	if (count > 0) {
+	if (count == RET_TOOSMALL)
+	    return RET_TOOSMALL;
+	if (count != RET_ILSEQ) {
 	    *charsetp = convptr;
 	    *sidep = (*r < 0x80 ? XlcGL : XlcGR);
 	    return count;
 	}
     }
-    for (convptr = all_charsets, i = all_charsets_count; i > 0; convptr++, i--) {
+    for (convptr = all_charsets+1, i = all_charsets_count-1; i > 0; convptr++, i--) {
 	count = convptr->wctocs(conv, r, wc, n);
-	if (count == 0)
-	    return 0;
-	if (count > 0) {
+	if (count == RET_TOOSMALL)
+	    return RET_TOOSMALL;
+	if (count != RET_ILSEQ) {
 	    *charsetp = convptr;
 	    *sidep = (*r < 0x80 ? XlcGL : XlcGR);
 	    return count;
 	}
     }
-    return -1;
+    return RET_ILSEQ;
 }
 
 static int
@@ -671,19 +577,19 @@
 	int consumed;
 	int count;
 
-	consumed = utf8_cstowc(&wc, src, srcend-src);
-	if (consumed == 0)
+	consumed = utf8_mbtowc(NULL, &wc, src, srcend-src);
+	if (consumed == RET_TOOFEW(0))
 	    break;
-	if (consumed < 0) {
+	if (consumed == RET_ILSEQ) {
 	    src++;
 	    unconv_num++;
 	    continue;
 	}
 
 	count = charset_wctocs(preferred_charsets, &chosen_charset, &chosen_side, conv, dst, wc, dstend-dst);
-	if (count == 0)
+	if (count == RET_TOOSMALL)
 	    break;
-	if (count < 0) {
+	if (count == RET_ILSEQ) {
 	    src += consumed;
 	    unconv_num++;
 	    continue;
@@ -774,19 +680,19 @@
 	int consumed;
 	int count;
 
-	consumed = utf8_cstowc(&wc, src, srcend-src);
-	if (consumed == 0)
+	consumed = utf8_mbtowc(NULL, &wc, src, srcend-src);
+	if (consumed == RET_TOOFEW(0))
 	    break;
-	if (consumed < 0) {
+	if (consumed == RET_ILSEQ) {
 	    src++;
 	    unconv_num++;
 	    continue;
 	}
 
 	count = charset_wctocs(preferred_charsets, &chosen_charset, &chosen_side, conv, dst, wc, dstend-dst);
-	if (count == 0)
+	if (count == RET_TOOSMALL)
 	    break;
-	if (count < 0) {
+	if (count == RET_ILSEQ) {
 	    src += consumed;
 	    unconv_num++;
 	    continue;
@@ -873,12 +779,12 @@
 	wchar_t wc;
 	int consumed;
 
-	consumed = utf8_cstowc(&wc, src, srcend-src);
-	if (consumed == 0)
+	consumed = utf8_mbtowc(NULL, &wc, src, srcend-src);
+	if (consumed == RET_TOOFEW(0))
 	    break;
 	if (dst == dstend)
 	    break;
-	if (consumed < 0) {
+	if (consumed == RET_ILSEQ) {
 	    consumed = 1;
 	    c = BAD_CHAR;
 	    unconv_num++;
@@ -943,8 +849,8 @@
     dstend = dst + *to_left;
 
     while (src < srcend) {
-	int count = utf8_wctocs(dst, *src, dstend-dst);
-	if (count == 0)
+	int count = utf8_wctomb(NULL, dst, *src, dstend-dst);
+	if (count == RET_TOOSMALL)
 	    break;
 	dst += count;
 	src++;
@@ -1023,13 +929,17 @@
     unconv_num = 0;
 
     while (src < srcend && dst < dstend) {
-	int consumed = utf8_cstowc(dst, src, srcend-src);
-	if (consumed < 0) {
+	local_wchar_t wc;
+	int consumed = utf8_mbtowc(NULL, &wc, src, srcend-src);
+	if (consumed == RET_TOOFEW(0))
+	    break;
+	if (consumed == RET_ILSEQ) {
 	    src++;
 	    *dst = BAD_WCHAR;
 	    unconv_num++;
 	} else {
 	    src += consumed;
+	    *dst = wc;
 	}
 	dst++;
     }
@@ -1086,12 +996,12 @@
     unconv_num = 0;
 
     while (src < srcend) {
-	int count = utf8_wctocs(dst, *src, dstend-dst);
-	if (count == 0)
+	int count = utf8_wctomb(NULL, dst, *src, dstend-dst);
+	if (count == RET_TOOSMALL)
 	    break;
-	if (count < 0) {
-	    count = utf8_wctocs(dst, BAD_WCHAR, dstend-dst);
-	    if (count == 0)
+	if (count == RET_ILSEQ) {
+	    count = utf8_wctomb(NULL, dst, BAD_WCHAR, dstend-dst);
+	    if (count == RET_TOOSMALL)
 		break;
 	    unconv_num++;
 	}
@@ -1266,10 +1176,11 @@
 	return -1;
 
     charset = (XlcCharSet) args[0];
-    name = charset->name;
+    name = charset->encoding_name;
+    /* not charset->name because the latter has a ":GL"/":GR" suffix */
 
-    for (convptr = all_charsets, i = all_charsets_count; i > 0; convptr++, i--)
-	if (!strcmp(convptr->name, name)) /* FIXME: charset->side */
+    for (convptr = all_charsets, i = all_charsets_count-1; i > 0; convptr++, i--)
+	if (!strcmp(convptr->name, name))
 	    break;
     if (i == 0)
 	return -1;
@@ -1285,9 +1196,9 @@
 	int consumed;
 
 	consumed = convptr->cstowc(conv, &wc, src, srcend-src);
-	if (consumed < 0)
+	if (consumed == RET_ILSEQ)
 	    return -1;
-	if (consumed == 0)
+	if (consumed == RET_TOOFEW(0))
 	    break;
 
 	*dst++ = wc;
@@ -1356,9 +1267,9 @@
 	int count;
 
 	count = charset_wctocs(preferred_charsets, &chosen_charset, &chosen_side, conv, dst, wc, dstend-dst);
-	if (count == 0)
+	if (count == RET_TOOSMALL)
 	    break;
-	if (count < 0) {
+	if (count == RET_ILSEQ) {
 	    src++;
 	    unconv_num++;
 	    continue;
@@ -1449,9 +1360,9 @@
 	int count;
 
 	count = charset_wctocs(preferred_charsets, &chosen_charset, &chosen_side, conv, dst, wc, dstend-dst);
-	if (count == 0)
+	if (count == RET_TOOSMALL)
 	    break;
-	if (count < 0) {
+	if (count == RET_ILSEQ) {
 	    src++;
 	    unconv_num++;
 	    continue;
Index: xc/lib/X11/lcUniConv/iso8859_13.h
diff -u /dev/null xc/lib/X11/lcUniConv/iso8859_13.h:1.1
--- /dev/null	Sat Jul  1 20:44:45 2000
+++ xc/lib/X11/lcUniConv/iso8859_13.h	Fri Jun 23 12:50:59 2000
@@ -0,0 +1,91 @@
+/* $XFree86: xc/lib/X11/lcUniConv/iso8859_13.h,v 1.1 2000/06/23 19:50:59 dawes Exp $ */
+
+/*
+ * ISO-8859-13
+ */
+
+static const unsigned short iso8859_13_2uni[96] = {
+  /* 0xa0 */
+  0x00a0, 0x201d, 0x00a2, 0x00a3, 0x00a4, 0x201e, 0x00a6, 0x00a7,
+  0x00d8, 0x00a9, 0x0156, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00c6,
+  /* 0xb0 */
+  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x201c, 0x00b5, 0x00b6, 0x00b7,
+  0x00f8, 0x00b9, 0x0157, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00e6,
+  /* 0xc0 */
+  0x0104, 0x012e, 0x0100, 0x0106, 0x00c4, 0x00c5, 0x0118, 0x0112,
+  0x010c, 0x00c9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012a, 0x013b,
+  /* 0xd0 */
+  0x0160, 0x0143, 0x0145, 0x00d3, 0x014c, 0x00d5, 0x00d6, 0x00d7,
+  0x0172, 0x0141, 0x015a, 0x016a, 0x00dc, 0x017b, 0x017d, 0x00df,
+  /* 0xe0 */
+  0x0105, 0x012f, 0x0101, 0x0107, 0x00e4, 0x00e5, 0x0119, 0x0113,
+  0x010d, 0x00e9, 0x017a, 0x0117, 0x0123, 0x0137, 0x012b, 0x013c,
+  /* 0xf0 */
+  0x0161, 0x0144, 0x0146, 0x00f3, 0x014d, 0x00f5, 0x00f6, 0x00f7,
+  0x0173, 0x0142, 0x015b, 0x016b, 0x00fc, 0x017c, 0x017e, 0x2019,
+};
+
+static int
+iso8859_13_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
+{
+  unsigned char c = *s;
+  if (c < 0xa0)
+    *pwc = (wchar_t) c;
+  else
+    *pwc = (wchar_t) iso8859_13_2uni[c-0xa0];
+  return 1;
+}
+
+static const unsigned char iso8859_13_page00[224] = {
+  0xa0, 0x00, 0xa2, 0xa3, 0xa4, 0x00, 0xa6, 0xa7, /* 0xa0-0xa7 */
+  0x00, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0x00, /* 0xa8-0xaf */
+  0xb0, 0xb1, 0xb2, 0xb3, 0x00, 0xb5, 0xb6, 0xb7, /* 0xb0-0xb7 */
+  0x00, 0xb9, 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0x00, /* 0xb8-0xbf */
+  0x00, 0x00, 0x00, 0x00, 0xc4, 0xc5, 0xaf, 0x00, /* 0xc0-0xc7 */
+  0x00, 0xc9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
+  0x00, 0x00, 0x00, 0xd3, 0x00, 0xd5, 0xd6, 0xd7, /* 0xd0-0xd7 */
+  0xa8, 0x00, 0x00, 0x00, 0xdc, 0x00, 0x00, 0xdf, /* 0xd8-0xdf */
+  0x00, 0x00, 0x00, 0x00, 0xe4, 0xe5, 0xbf, 0x00, /* 0xe0-0xe7 */
+  0x00, 0xe9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
+  0x00, 0x00, 0x00, 0xf3, 0x00, 0xf5, 0xf6, 0xf7, /* 0xf0-0xf7 */
+  0xb8, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, /* 0xf8-0xff */
+  /* 0x0100 */
+  0xc2, 0xe2, 0x00, 0x00, 0xc0, 0xe0, 0xc3, 0xe3, /* 0x00-0x07 */
+  0x00, 0x00, 0x00, 0x00, 0xc8, 0xe8, 0x00, 0x00, /* 0x08-0x0f */
+  0x00, 0x00, 0xc7, 0xe7, 0x00, 0x00, 0xcb, 0xeb, /* 0x10-0x17 */
+  0xc6, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
+  0x00, 0x00, 0xcc, 0xec, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
+  0x00, 0x00, 0xce, 0xee, 0x00, 0x00, 0xc1, 0xe1, /* 0x28-0x2f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcd, 0xed, /* 0x30-0x37 */
+  0x00, 0x00, 0x00, 0xcf, 0xef, 0x00, 0x00, 0x00, /* 0x38-0x3f */
+  0x00, 0xd9, 0xf9, 0xd1, 0xf1, 0xd2, 0xf2, 0x00, /* 0x40-0x47 */
+  0x00, 0x00, 0x00, 0x00, 0xd4, 0xf4, 0x00, 0x00, /* 0x48-0x4f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xba, /* 0x50-0x57 */
+  0x00, 0x00, 0xda, 0xfa, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
+  0xd0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
+  0x00, 0x00, 0xdb, 0xfb, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
+  0x00, 0x00, 0xd8, 0xf8, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
+  0x00, 0xca, 0xea, 0xdd, 0xfd, 0xde, 0xfe, 0x00, /* 0x78-0x7f */
+};
+static const unsigned char iso8859_13_page20[8] = {
+  0x00, 0xff, 0x00, 0x00, 0xb4, 0xa1, 0xa5, 0x00, /* 0x18-0x1f */
+};
+
+static int
+iso8859_13_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n)
+{
+  unsigned char c = 0;
+  if (wc < 0x00a0) {
+    *r = wc;
+    return 1;
+  }
+  else if (wc >= 0x00a0 && wc < 0x0180)
+    c = iso8859_13_page00[wc-0x00a0];
+  else if (wc >= 0x2018 && wc < 0x2020)
+    c = iso8859_13_page20[wc-0x2018];
+  if (c != 0) {
+    *r = c;
+    return 1;
+  }
+  return RET_ILSEQ;
+}
Index: xc/lib/X11/lcUniConv/utf8.h
diff -u /dev/null xc/lib/X11/lcUniConv/utf8.h:1.1
--- /dev/null	Sat Jul  1 20:44:45 2000
+++ xc/lib/X11/lcUniConv/utf8.h	Fri Jun 23 16:13:19 2000
@@ -0,0 +1,110 @@
+/* $XFree86: xc/lib/X11/lcUniConv/utf8.h,v 1.1 2000/06/23 23:13:19 dawes Exp $ */
+
+/*
+ * UTF-8
+ */
+
+/* Specification: RFC 2279 */
+
+static int
+utf8_mbtowc (conv_t conv, wchar_t *pwc, const unsigned char *s, int n)
+{
+  unsigned char c = s[0];
+
+  if (c < 0x80) {
+    *pwc = c;
+    return 1;
+  } else if (c < 0xc2) {
+    return RET_ILSEQ;
+  } else if (c < 0xe0) {
+    if (n < 2)
+      return RET_TOOFEW(0);
+    if (!((s[1] ^ 0x80) < 0x40))
+      return RET_ILSEQ;
+    *pwc = ((wchar_t) (c & 0x1f) << 6)
+           | (wchar_t) (s[1] ^ 0x80);
+    return 2;
+  } else if (c < 0xf0) {
+    if (n < 3)
+      return RET_TOOFEW(0);
+    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+          && (c >= 0xe1 || s[1] >= 0xa0)))
+      return RET_ILSEQ;
+    *pwc = ((wchar_t) (c & 0x0f) << 12)
+           | ((wchar_t) (s[1] ^ 0x80) << 6)
+           | (wchar_t) (s[2] ^ 0x80);
+    return 3;
+  } else if (c < 0xf8 && sizeof(wchar_t)*8 >= 32) {
+    if (n < 4)
+      return RET_TOOFEW(0);
+    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+          && (s[3] ^ 0x80) < 0x40
+          && (c >= 0xf1 || s[1] >= 0x90)))
+      return RET_ILSEQ;
+    *pwc = ((wchar_t) (c & 0x07) << 18)
+           | ((wchar_t) (s[1] ^ 0x80) << 12)
+           | ((wchar_t) (s[2] ^ 0x80) << 6)
+           | (wchar_t) (s[3] ^ 0x80);
+    return 4;
+  } else if (c < 0xfc && sizeof(wchar_t)*8 >= 32) {
+    if (n < 5)
+      return RET_TOOFEW(0);
+    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+          && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+          && (c >= 0xf9 || s[1] >= 0x88)))
+      return RET_ILSEQ;
+    *pwc = ((wchar_t) (c & 0x03) << 24)
+           | ((wchar_t) (s[1] ^ 0x80) << 18)
+           | ((wchar_t) (s[2] ^ 0x80) << 12)
+           | ((wchar_t) (s[3] ^ 0x80) << 6)
+           | (wchar_t) (s[4] ^ 0x80);
+    return 5;
+  } else if (c < 0xfe && sizeof(wchar_t)*8 >= 32) {
+    if (n < 6)
+      return RET_TOOFEW(0);
+    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+          && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+          && (s[5] ^ 0x80) < 0x40
+          && (c >= 0xfd || s[1] >= 0x84)))
+      return RET_ILSEQ;
+    *pwc = ((wchar_t) (c & 0x01) << 30)
+           | ((wchar_t) (s[1] ^ 0x80) << 24)
+           | ((wchar_t) (s[2] ^ 0x80) << 18)
+           | ((wchar_t) (s[3] ^ 0x80) << 12)
+           | ((wchar_t) (s[4] ^ 0x80) << 6)
+           | (wchar_t) (s[5] ^ 0x80);
+    return 6;
+  } else
+    return RET_ILSEQ;
+}
+
+static int
+utf8_wctomb (conv_t conv, unsigned char *r, wchar_t wc, int n) /* n == 0 is acceptable */
+{
+  int count;
+  if (wc < 0x80)
+    count = 1;
+  else if (wc < 0x800)
+    count = 2;
+  else if (wc < 0x10000)
+    count = 3;
+  else if (wc < 0x200000)
+    count = 4;
+  else if (wc < 0x4000000)
+    count = 5;
+  else if (wc <= 0x7fffffff)
+    count = 6;
+  else
+    return RET_ILSEQ;
+  if (n < count)
+    return RET_TOOSMALL;
+  switch (count) { /* note: code falls through cases! */
+    case 6: r[5] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x4000000;
+    case 5: r[4] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x200000;
+    case 4: r[3] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x10000;
+    case 3: r[2] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0x800;
+    case 2: r[1] = 0x80 | (wc & 0x3f); wc = wc >> 6; wc |= 0xc0;
+    case 1: r[0] = wc;
+  }
+  return count;
+}
Index: xc/lib/Xau/AuGetAddr.c
diff -u xc/lib/Xau/AuGetAddr.c:1.2 xc/lib/Xau/AuGetAddr.c:1.3
--- xc/lib/Xau/AuGetAddr.c:1.2	Sun May  9 03:51:33 1999
+++ xc/lib/Xau/AuGetAddr.c	Tue Jun 13 17:16:06 2000
@@ -21,7 +21,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.2 1999/05/09 10:51:33 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.3 2000/06/14 00:16:06 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
@@ -91,10 +91,8 @@
 	/*
 	 * Match when:
 	 *   either family or entry->family are FamilyWild or
-	 *    family and entry->family are the same
-	 *  and
-	 *   either address or entry->address are empty or
-	 *    address and entry->address are the same
+	 *    family and entry->family are the same and
+	 *     address and entry->address are the same
 	 *  and
 	 *   either number or entry->number are empty or
 	 *    number and entry->number are the same
Index: xc/lib/Xau/AuGetBest.c
diff -u xc/lib/Xau/AuGetBest.c:1.2 xc/lib/Xau/AuGetBest.c:1.3
--- xc/lib/Xau/AuGetBest.c:1.2	Sun May  9 03:51:33 1999
+++ xc/lib/Xau/AuGetBest.c	Tue Jun 13 17:16:06 2000
@@ -21,7 +21,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.2 1999/05/09 10:51:33 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.3 2000/06/14 00:16:06 dawes Exp $ */
 
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
@@ -125,16 +125,14 @@
 	/*
 	 * Match when:
 	 *   either family or entry->family are FamilyWild or
-	 *    family and entry->family are the same
+	 *    family and entry->family are the same and
+	 *     address and entry->address are the same
 	 *  and
-	 *   either address or entry->address are empty or
-	 *    address and entry->address are the same
-	 *  and
 	 *   either number or entry->number are empty or
 	 *    number and entry->number are the same
 	 *  and
-	 *   name matches one of the specified names, or no names
-	 *    were specified
+	 *   either name or entry->name are empty or
+	 *    name and entry->name are the same
 	 */
 
 	if ((family == FamilyWild || entry->family == FamilyWild ||
Index: xc/lib/Xaw/AsciiSrc.c
diff -u xc/lib/Xaw/AsciiSrc.c:1.23 xc/lib/Xaw/AsciiSrc.c:1.24
--- xc/lib/Xaw/AsciiSrc.c:1.23	Sun Sep 26 23:29:10 1999
+++ xc/lib/Xaw/AsciiSrc.c	Tue Jun 13 16:15:48 2000
@@ -22,7 +22,7 @@
 
 */
 
-/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.23 1999/09/27 06:29:10 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.24 2000/06/13 23:15:48 dawes Exp $ */
 
 /*
  * AsciiSrc.c - AsciiSrc object. (For use with the text widget).
@@ -355,10 +355,7 @@
     AsciiSrcObject src = (AsciiSrcObject)w;
     XawTextPosition count, start;
     Piece *piece;
-#if 0	/* #ifndef OLDXAW 
-	 * this code is correct, but adds an unnecessary overhead to the
-	 * current implementation
-	 */
+#ifndef OLDXAW 
     XawTextAnchor *anchor;
     XawTextEntity *entity;
     XawTextPosition offset, end = pos + length;
Index: xc/lib/Xaw/Dialog.c
diff -u xc/lib/Xaw/Dialog.c:1.5 xc/lib/Xaw/Dialog.c:1.6
--- xc/lib/Xaw/Dialog.c:1.5	Sun Jun  6 01:47:55 1999
+++ xc/lib/Xaw/Dialog.c	Tue Jun 13 16:15:48 2000
@@ -42,7 +42,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.5 1999/06/06 08:47:55 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.6 2000/06/13 23:15:48 dawes Exp $ */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
@@ -362,7 +362,12 @@
 	    XtSetArg(a[0], XtNstring, &s);
 	    XtGetValues(src->dialog.valueW, a, 1);
 	    *((char **)args[i].value) = s;
-    }
+	}
+	else if (streq(args[i].name, XtNlabel)) {
+	    XtSetArg(a[0], XtNlabel, &s);
+	    XtGetValues(src->dialog.labelW, a, 1);
+	    *((char **)args[i].value) = s;
+	}
 }
 
 /*
Index: xc/lib/Xaw/Imakefile
diff -u xc/lib/Xaw/Imakefile:1.8 xc/lib/Xaw/Imakefile:1.9
--- xc/lib/Xaw/Imakefile:1.8	Sun Jun 27 07:07:33 1999
+++ xc/lib/Xaw/Imakefile	Thu May 18 09:29:52 2000
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/87 1996/09/28 16:43:34 rws $
-XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.8 1999/06/27 14:07:33 dawes Exp $
+XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.9 2000/05/18 16:29:52 dawes Exp $
 #define DoNormalLib NormalLibXaw
 #define DoSharedLib SharedLibXaw
 #define DoExtraLib SharedLibXaw
@@ -15,7 +15,7 @@
 REQUIREDLIBS = SharedXawReqs
 #endif
 
-DEFINES = XawI18nDefines
+DEFINES = XawI18nDefines -DPROJECT_ROOT=\"ProjectRoot\"
 
        LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
 
Index: xc/lib/Xaw/List.c
diff -u xc/lib/Xaw/List.c:1.14 xc/lib/Xaw/List.c:1.15
--- xc/lib/Xaw/List.c:1.14	Fri Feb 25 15:20:46 2000
+++ xc/lib/Xaw/List.c	Tue Apr  4 15:36:42 2000
@@ -19,7 +19,7 @@
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */
-/* $XFree86: xc/lib/Xaw/List.c,v 1.14 2000/02/25 23:20:46 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/List.c,v 1.15 2000/04/04 22:36:42 dawes Exp $ */
 
 /*
  * List.c - List widget
@@ -681,7 +681,7 @@
     ListWidget lw = (ListWidget)w;
     XFontSetExtents *ext  = XExtentsOfFontSet(lw->list.fontset);
 
-    if (!XtIsRealized(w))
+    if (!XtIsRealized(w) || item > lw->list.nitems)
       return;
 
     if (lw->list.vertical_cols) {
@@ -1126,7 +1126,7 @@
 	redraw = True;
     }
 
-    if (cl->list.list != nl->list.list)
+    if (cl->list.list != nl->list.list || cl->list.nitems != nl->list.nitems)
 	nl->list.is_highlighted = nl->list.highlight = NO_HIGHLIGHT;
 
     if (cl->core.sensitive != nl->core.sensitive
Index: xc/lib/Xaw/Pixmap.c
diff -u xc/lib/Xaw/Pixmap.c:3.13 xc/lib/Xaw/Pixmap.c:3.14
--- xc/lib/Xaw/Pixmap.c:3.13	Sun Jul 11 01:49:14 1999
+++ xc/lib/Xaw/Pixmap.c	Thu May 18 09:29:52 2000
@@ -25,7 +25,7 @@
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.13 1999/07/11 08:49:14 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.14 2000/05/18 16:29:52 dawes Exp $ */
 
 #include <string.h>
 #include <stdio.h>
@@ -645,8 +645,12 @@
     qsort(x_cache->elems, x_cache->num_elems, sizeof(XtPointer), qcmp_x_cache);
 }
 
+#ifndef PROJECT_ROOT
+#define PROJECT_ROOT	"/usr/X11R6"
+#endif
+
 static char *pixmap_path =
-   "%H/%T/%N:/usr/X11R6/include/X11/%T/%N:/usr/include/X11/%T/%N:%N";
+   "%H/%T/%N:%P/include/X11/%T/%N:/usr/X11R6/include/X11/%T/%N:/usr/include/X11/%T/%N:%N";
 
 static Bool
 BitmapLoader(XawParams *params, Screen *screen, Colormap colormap, int depth,
@@ -665,6 +669,7 @@
     {'H',   NULL},
     {'N',   NULL},
     {'T',   "bitmaps"},
+    {'P',   PROJECT_ROOT},
   };
   char *filename;
 
@@ -882,6 +887,7 @@
     {'H',   NULL},
     {'N',   NULL},
     {'T',   "pixmaps"},
+    {'P',   PROJECT_ROOT},
   };
   char *filename;
 
Index: xc/lib/Xaw/Text.c
diff -u xc/lib/Xaw/Text.c:3.34 xc/lib/Xaw/Text.c:3.35
--- xc/lib/Xaw/Text.c:3.34	Sat Aug 21 06:47:35 1999
+++ xc/lib/Xaw/Text.c	Tue Jun 13 16:15:48 2000
@@ -70,7 +70,7 @@
  * XFree86 Project.
  */
 
-/* $XFree86: xc/lib/Xaw/Text.c,v 3.34 1999/08/21 13:47:35 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Text.c,v 3.35 2000/06/13 23:15:48 dawes Exp $ */
 
 #include <stdio.h>
 #include <X11/IntrinsicP.h>
@@ -830,8 +830,10 @@
 
     XtDestroyWidget(vbar);
     ctx->text.vbar = NULL;
-    PositionHScrollBar(ctx);
-    TextSinkResize(ctx->text.sink);
+    if (!ctx->core.being_destroyed) {
+	PositionHScrollBar(ctx);
+	TextSinkResize(ctx->text.sink);
+    }
 }
 
 static void
@@ -886,7 +888,8 @@
 
     XtDestroyWidget(hbar);
     ctx->text.hbar = NULL;
-    TextSinkResize(ctx->text.sink);
+    if (!ctx->core.being_destroyed)
+	TextSinkResize(ctx->text.sink);
 }
 
 /*ARGSUSED*/
@@ -1791,7 +1794,9 @@
     XawTextSinkFindPosition(ctx->text.sink, lt->position,
 			    from_x, x1 - from_x,
 			    False, &left, &width, &height);
-    if (x2 >= lt->textWidth - from_x)
+    if (line == ctx->text.lt.lines)
+	right = -1;
+    else if (x2 >= lt->textWidth - from_x)
 	right = lt[1].position - 1;
     else {
 	from_x += width;
@@ -1800,7 +1805,7 @@
 				False, &right, &width, &height);
     }
 
-    if (right + 1 <= lt[1].position)
+    if ((right < 0) || (right + 1 <= lt[1].position))
 	++right;
 
     /* Mark text interval to be repainted */
Index: xc/lib/Xaw/TextPop.c
diff -u xc/lib/Xaw/TextPop.c:1.15 xc/lib/Xaw/TextPop.c:1.16
--- xc/lib/Xaw/TextPop.c:1.15	Sat Aug 28 02:00:27 1999
+++ xc/lib/Xaw/TextPop.c	Thu May 18 09:29:52 2000
@@ -22,7 +22,7 @@
 
 */
 
-/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.15 1999/08/28 09:00:27 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.16 2000/05/18 16:29:52 dawes Exp $ */
 
 /*
  * This file is broken up into three sections one dealing with
@@ -1095,6 +1095,8 @@
 		return (True);
 	    }
 	}
+	else
+	    ctx->text.insertPos = ipos;
 	count++;
     }
 
Index: xc/lib/Xaw/TextSink.c
diff -u xc/lib/Xaw/TextSink.c:1.14 xc/lib/Xaw/TextSink.c:1.15
--- xc/lib/Xaw/TextSink.c:1.14	Sat Aug 28 02:00:27 1999
+++ xc/lib/Xaw/TextSink.c	Thu Jun 15 13:49:58 2000
@@ -20,7 +20,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.14 1999/08/28 09:00:27 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.15 2000/06/15 20:49:58 dawes Exp $ */
 
 /*
  * Author:  Chris Peterson, MIT X Consortium.
@@ -1150,7 +1150,7 @@
 XawTextProperty *
 _XawTextSinkGetProperty(XawTextPropertyList *list, XrmQuark property)
 {
-    if (property != NULLQUARK && list) {
+    if (property != NULLQUARK && list && list->properties) {
 	XawTextProperty **ptr = (XawTextProperty**)
 	    bsearch((void*)property, list->properties, list->num_properties,
 		    sizeof(XawTextProperty*), bcmp_qident);
@@ -1482,13 +1482,14 @@
 			       Colormap colormap, int depth)
 {
     XrmQuark qname = XrmStringToQuark(name);
-    XawTextPropertyList **ptr = (XawTextPropertyList**)
-	bsearch((void*)qname, prop_lists, num_prop_lists,
-		sizeof(XawTextPropertyList*), bcmp_qident);
+    XawTextPropertyList **ptr = NULL;
     XawTextPropertyList *propl, *prev = NULL;
     XawTextProperty *def_prop = NULL;
     String str, tok, tmp;
 
+    if (prop_lists) ptr = (XawTextPropertyList**)
+	bsearch((void*)qname, prop_lists, num_prop_lists,
+		sizeof(XawTextPropertyList*), bcmp_qident);
     if (ptr) {
 	propl = *ptr;
 	while (propl) {
@@ -1718,7 +1719,8 @@
     name = (String)(fromVal[0].addr);
 
     if (w) {
-	XawTextPropertyList **ptr = (XawTextPropertyList**)
+	XawTextPropertyList **ptr = NULL;
+	if (prop_lists) ptr = (XawTextPropertyList**)
 	    bsearch((void*)XrmStringToQuark(name), prop_lists, num_prop_lists,
 		    sizeof(XawTextPropertyList*), bcmp_qident);
 
Index: xc/lib/Xaw/TextSrc.c
diff -u xc/lib/Xaw/TextSrc.c:1.23 xc/lib/Xaw/TextSrc.c:1.24
--- xc/lib/Xaw/TextSrc.c:1.23	Sun Sep 26 23:29:11 1999
+++ xc/lib/Xaw/TextSrc.c	Fri Mar 31 14:55:18 2000
@@ -21,7 +21,7 @@
 
 */
 
-/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.23 1999/09/27 06:29:11 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.24 2000/03/31 22:55:18 dawes Exp $ */
 
 /*
  * Author:  Chris Peterson, MIT X Consortium.
@@ -1755,7 +1755,6 @@
 		       XawTextPosition position, Cardinal length,
 		       XrmQuark property)
 {
-    TextSrcObject src = (TextSrcObject)w;
     XawTextAnchor *next, *anchor = _XawTextSourceFindAnchor(w, position);
     XawTextEntity *entity, *eprev;
 
@@ -1840,11 +1839,10 @@
 void
 XawTextSourceClearEntities(Widget w, XawTextPosition left, XawTextPosition right)
 {
-    TextSrcObject src = (TextSrcObject)w;
     XawTextAnchor *anchor = XawTextSourceFindAnchor(w, left);
     XawTextEntity *entity, *eprev, *enext;
     XawTextPosition offset;
-    int i, length;
+    int length;
 
     while (anchor && anchor->entities == NULL)
 	anchor = XawTextSourceRemoveAnchor(w, anchor);
@@ -1881,11 +1879,11 @@
 	    XtFree((XtPointer)entity);
 	    anchor->cache = NULL;
 	    if (entity == anchor->entities) {
+		eprev = NULL;
 		if ((anchor->entities = enext) == NULL) {
 		    if ((anchor = XawTextSourceRemoveAnchor(w, anchor)) == NULL)
 			return;
 		    entity = anchor->entities;
-		    eprev = NULL;
 		}
 		else
 		    entity = enext;
@@ -1941,7 +1939,6 @@
 XawTextAnchor *
 _XawTextSourceFindAnchor(Widget w, XawTextPosition position)
 {
-    TextSrcObject src = (TextSrcObject)w;
     XawTextAnchor *anchor;
 
     anchor = XawTextSourceFindAnchor(w, position);
Index: xc/lib/Xaw/TextTr.c
diff -u xc/lib/Xaw/TextTr.c:3.13 xc/lib/Xaw/TextTr.c:3.14
--- xc/lib/Xaw/TextTr.c:3.13	Sun Jun  6 01:48:18 1999
+++ xc/lib/Xaw/TextTr.c	Tue Jun 13 16:15:48 2000
@@ -21,7 +21,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.13 1999/06/06 08:48:18 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.14 2000/06/13 23:15:48 dawes Exp $ */
 
 /* INTERNATIONALIZATION:
 
@@ -84,10 +84,10 @@
 "m<Key>Y:"		"kill-ring-yank()\n"
 #endif
 "m<Key>Z:"		"scroll-one-line-down()\n"
-"~s m<Key>D:"		"kill-word(alnum)\n"
-"s m<Key>D:"		"delete-next-word(alnum)\n"
-"~s m<Key>H:"		"backward-kill-word(alnum)\n"
-"s m<Key>H:"		"delete-previous-word(alnum)\n"
+"~s m<Key>d:"		"kill-word(alnum)\n"
+"s m<Key>d:"		"delete-next-word(alnum)\n"
+"~s m<Key>h:"		"backward-kill-word(alnum)\n"
+"s m<Key>h:"		"delete-previous-word(alnum)\n"
 ":m<Key>\\<:"		"beginning-of-file()\n"
 ":m<Key>\\>:"		"end-of-file()\n"
 ":m<Key>]:"		"forward-paragraph()\n"
Index: xc/lib/Xaw/Tip.c
diff -u xc/lib/Xaw/Tip.c:1.4 xc/lib/Xaw/Tip.c:1.5
--- xc/lib/Xaw/Tip.c:1.4	Sun Jul 11 01:49:16 1999
+++ xc/lib/Xaw/Tip.c	Thu May 18 09:29:53 2000
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/lib/Xaw/Tip.c,v 1.4 1999/07/11 08:49:16 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/Tip.c,v 1.5 2000/05/18 16:29:53 dawes Exp $ */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
@@ -405,15 +405,19 @@
 
 	height = ext->max_ink_extent.height;
 	if ((nl = index(label, '\n')) != NULL) {
-	    while (nl) {
+	    /*CONSTCOND*/
+	    while (True) {
 		int w = XmbTextEscapement(fset, label, (int)(nl - label));
 
 		if (w > width)
 		    width = w;
+		if (*nl == '\0')
+		    break;
 		label = nl + 1;
 		if (*label)
 		    height += ext->max_ink_extent.height;
-		nl = index(label, '\n');
+		if ((nl = index(label, '\n')) == NULL)
+		    nl = index(label, '\0');
 	    }
 	}
 	else
@@ -422,16 +426,20 @@
     else {
 	height = fs->max_bounds.ascent + fs->max_bounds.descent;
 	if ((nl = index(label, '\n')) != NULL) {
-	    while (nl) {
+	    /*CONSTCOND*/
+	    while (True) {
 		int w = info->tip->tip.encoding ?
 		    XTextWidth16(fs, (XChar2b*)label, (int)(nl - label) >> 1) :
 		    XTextWidth(fs, label, (int)(nl - label));
 		if (w > width)
 		    width = w;
+		if (*nl == '\0')
+		    break;
 		label = nl + 1;
 		if (*label)
 		    height += fs->max_bounds.ascent + fs->max_bounds.descent;
-		nl = index(label, '\n');
+		if ((nl = index(label, '\n')) == NULL)
+		    nl = index(label, '\0');
 	    }
 	}
 	else
@@ -544,9 +552,6 @@
 TipTimeoutCallback(XtPointer closure, XtIntervalId *id)
 {
     XawTipInfo *info = (XawTipInfo*)closure;
-    String label = info->tip->tip.label;
-    Boolean international = info->tip->tip.international;
-    unsigned char encoding = info->tip->tip.encoding;
     Arg args[3];
 
     info->tip->tip.label = NULL;
@@ -558,10 +563,7 @@
     XtGetValues(info->widget, args, 3);
 
     if (info->tip->tip.label) {
-	if (label != info->tip->tip.label ||
-	    international != info->tip->tip.international ||
-	    encoding != info->tip->tip.encoding)
-	    TipLayout(info);
+	TipLayout(info);
 	TipPosition(info);
 	XMapRaised(XtDisplay((Widget)info->tip), XtWindow((Widget)info->tip));
 	XtAddGrab(XtParent((Widget)info->tip), True, True);
Index: xc/lib/Xaw/XawIm.c
diff -u xc/lib/Xaw/XawIm.c:1.9 xc/lib/Xaw/XawIm.c:1.10
--- xc/lib/Xaw/XawIm.c:1.9	Sat Mar 20 23:34:32 1999
+++ xc/lib/Xaw/XawIm.c	Tue Jun 13 16:15:48 2000
@@ -48,7 +48,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.9 1999/03/21 07:34:32 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.10 2000/06/13 23:15:48 dawes Exp $ */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
@@ -382,12 +382,12 @@
     /*
      * Close Input Method
      */
-    CloseIM(ve);
     if (!XFindContext(XDisplayOfIM(ve->im.xim), (Window)ve->im.xim, errContext,
 		      (XPointer*)&contextErrData)) {
 	if (contextErrData) XtFree((char *)contextErrData);
     }
     XDeleteContext(XDisplayOfIM(ve->im.xim), (Window)ve->im.xim, errContext);
+    CloseIM(ve);
     ve->im.xim = NULL;
 
     /*
Index: xc/lib/Xaw/Xawos2.def
diff -u xc/lib/Xaw/Xawos2.def:3.7 xc/lib/Xaw/Xawos2.def:3.8
--- xc/lib/Xaw/Xawos2.def:3.7	Thu Apr 29 02:13:30 1999
+++ xc/lib/Xaw/Xawos2.def	Wed Apr  5 11:13:17 2000
@@ -1,5 +1,5 @@
 LIBRARY Xaw INITINSTANCE TERMINSTANCE
-DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xaw/Xawos2.def,v 3.7 1999/04/29 09:13:30 dawes Exp $"
+DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xaw/Xawos2.def,v 3.8 2000/04/05 18:13:17 dawes Exp $"
 CODE
 	PRELOAD
 DATA
@@ -191,3 +191,15 @@
 ;        _XawDefaultTextTranslations4 @ 189
         _XawDefaultTextTranslations @ 190
 	_XawTextSrcUndo @ 191
+	tipClassRec @ 192
+	tipWidgetClass @ 193
+	XawTipEnable @ 194
+	XawTipDisable @ 195
+	XawTextSinkConvertPropertyList @ 196
+	XawTextGetSink @ 197
+	XawTextSourceClearEntities @ 198
+	XawTextSourceFindAnchor @ 199
+	XawTextSourcePrevAnchor @ 200
+	XawTextSourceNextAnchor @ 201
+	XawTextSourceAnchorAndEntity @ 202
+	XawTextSourceAddEntity @ 203
Index: xc/lib/Xaw/Xawos2.rsp
diff -u xc/lib/Xaw/Xawos2.rsp:3.5 xc/lib/Xaw/Xawos2.rsp:3.6
--- xc/lib/Xaw/Xawos2.rsp:3.5	Thu Apr 29 02:13:30 1999
+++ xc/lib/Xaw/Xawos2.rsp	Wed Apr  5 11:13:17 2000
@@ -3,7 +3,8 @@
 Label.obj List.obj MenuButton.obj MultiSink.obj MultiSrc.obj OS.obj Paned.obj+
 Panner.obj Pixmap.obj Porthole.obj Repeater.obj Scrollbar.obj Simple.obj+
 SimpleMenu.obj Sme.obj SmeBSB.obj SmeLine.obj StripChart.obj Text.obj+
-TextAction.obj TextPop.obj TextSink.obj TextSrc.obj TextTr.obj Toggle.obj+
-Tree.obj Vendor.obj Viewport.obj XawI18n.obj XawIm.obj XawInit.obj /NOI /NOL /NOD /BAT
+TextAction.obj TextPop.obj TextSink.obj TextSrc.obj TextTr.obj Tip.obj+
+Toggle.obj Tree.obj Vendor.obj Viewport.obj XawI18n.obj XawIm.obj+
+XawInit.obj +/NOI /NOL /NOD /BAT
 Xaw.dll
 Xaw.map
Index: xc/lib/Xaw6/Xaw6os2.def
diff -u /dev/null xc/lib/Xaw6/Xaw6os2.def:1.1
--- /dev/null	Sat Jul  1 20:44:48 2000
+++ xc/lib/Xaw6/Xaw6os2.def	Wed Apr  5 11:13:18 2000
@@ -0,0 +1,205 @@
+LIBRARY Xaw6 INITINSTANCE TERMINSTANCE
+DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xaw6/Xaw6os2.def,v 1.1 2000/04/05 18:13:18 dawes Exp $"
+CODE
+	PRELOAD
+DATA
+	MULTIPLE NONSHARED
+STACKSIZE 32768
+EXPORTS
+	XawAsciiSourceFreeString  @ 1
+	XawAsciiSave  @ 2
+	XawAsciiSaveAsFile  @ 3
+	XawAsciiSourceChanged  @ 4
+	XawDialogAddButton  @ 5
+	XawDialogGetValueString  @ 6
+	XawFormDoLayout  @ 7	
+	XawListChange  @ 8
+	XawListUnhighlight  @ 9
+	XawListHighlight  @ 10
+	XawListShowCurrent  @ 11
+	XawPanedSetMinMax  @ 13
+	XawPanedGetMinMax  @ 14
+	XawPanedSetRefigureMode  @ 15
+	XawPanedGetNumSub  @ 16
+	XawScrollbarSetThumb  @ 18
+	XawSimpleMenuAddGlobalActions  @ 19
+	XawSimpleMenuGetActiveEntry  @ 20
+	XawSimpleMenuClearActiveEntry  @ 21
+	XawTextDisplay  @ 22
+	XawTextEnableRedisplay  @ 23
+	XawTextDisableRedisplay  @ 24
+	XawTextSetSelectionArray  @ 25
+	XawTextGetSelectionPos  @ 26
+	XawTextSetSource  @ 27
+	XawTextReplace  @ 28
+	XawTextTopPosition  @ 29
+	XawTextSetInsertionPoint  @ 30
+	XawTextGetInsertionPoint  @ 31
+	XawTextUnsetSelection  @ 32
+	XawTextSetSelection  @ 33
+	XawTextInvalidate  @ 34
+	XawTextGetSource  @ 35
+	XawTextSearch  @ 36
+	XawTextDisplayCaret  @ 37
+	XawTextSinkDisplayText  @ 38
+	XawTextSinkInsertCursor  @ 39
+	XawTextSinkClearToBackground  @ 40
+	XawTextSinkFindPosition  @ 41
+	XawTextSinkFindDistance  @ 42
+	XawTextSinkResolve  @ 43
+	XawTextSinkMaxLines  @ 44
+	XawTextSinkMaxHeight  @ 45
+	XawTextSinkSetTabs  @ 46
+	XawTextSinkGetCursorBounds  @ 47
+	XawTextSourceRead  @ 48
+	XawTextSourceReplace  @ 49
+	XawTextSourceScan  @ 50
+	XawTextSourceSearch  @ 51
+	XawTextSourceConvertSelection  @ 52
+	XawTextSourceSetSelection  @ 53
+	XawToggleChangeRadioGroup  @ 54
+	XawToggleGetCurrent  @ 55
+	XawToggleSetCurrent  @ 56
+	XawToggleUnsetCurrent  @ 57
+	XawTreeForceLayout  @ 58
+	XawViewportSetLocation	@ 59
+	XawViewportSetCoordinates  @ 60
+	_XawMultiSinkPosToXY  @ 61
+	_XawMultiSave  @ 62
+	_XawMultiSaveAsFile  @ 63
+	_XawMultiSourceFreeString  @ 64
+	_XawTextFormat  @ 65
+	_XawTextBuildLineTable	@ 66
+	_XawTextGetSTRING  @ 67
+	_XawTextSaltAwaySelection  @ 68
+	_XawTextPosToXY  @ 69
+	_XawTextWCToMB  @ 70
+	_XawTextMBToWC  @ 71
+	_Xaw_atowc  @ 72
+	_XawImResizeVendorShell  @ 73
+	_XawImGetShellHeight  @ 74
+	_XawImRealize  @ 75
+	_XawImInitialize  @ 76
+	_XawImReconnect  @ 77
+	_XawImRegister  @ 78
+	_XawImUnregister  @ 79
+	_XawImSetValues  @ 80
+	_XawImSetFocusValues  @ 82
+	_XawImUnsetFocus  @ 84
+	_XawImWcLookupString  @ 85
+	_XawImGetImAreaHeight  @ 86
+	_XawImCallVendorShellExtResize  @ 87
+	_XawImDestroy  @ 88
+	_XawTextZapSelection  @ 89
+	_XawTextInsertFileAction  @ 90
+	_XawTextInsertFile  @ 91
+	_XawTextDoSearchAction  @ 92
+	_XawTextPopdownSearchAction  @ 93
+	_XawTextSearch  @ 94
+	_XawTextDoReplaceAction  @ 95
+	_XawTextSetField  @ 96
+	asciiSrcObjectClass  @ 100
+	asciiSrcClassRec  @ 101
+	dialogWidgetClass  @ 102
+	dialogClassRec  @ 103
+	formWidgetClass  @ 104
+	formClassRec  @ 105
+	listWidgetClass  @ 106
+	listClassRec  @ 107
+	multiSinkObjectClass  @ 108
+	multiSinkClassRec  @ 109
+	multiSrcObjectClass  @ 110
+	multiSrcClassRec  @ 111
+	panedWidgetClass  @ 112
+	panedClassRec  @ 113
+	scrollbarWidgetClass  @ 114
+	scrollbarClassRec  @ 115
+	simpleMenuWidgetClass  @ 116
+	simpleMenuClassRec   @ 117
+	FMT8BIT  @ 118
+	XawFmt8Bit  @ 119
+	XawFmtWide  @ 120
+	_XawTextActionsTable  @ 121
+	_XawTextActionsTableCount  @ 122
+	textWidgetClass  @ 123
+	textClassRec  @ 124
+	textSinkObjectClass @ 125
+	textSinkClassRec  @ 126
+	toggleWidgetClass  @ 127
+	toggleClassRec  @ 128
+	treeWidgetClass @ 129
+	treeClassRec  @ 130
+	viewportWidgetClass  @ 131
+	viewportClassRec  @ 132
+	menuButtonClassRec @ 133
+	menuButtonWidgetClass @ 134
+	smeBSBClassRec @ 135
+	smeBSBObjectClass @ 136
+	smeLineClassRec @ 137
+	smeLineObjectClass @ 138
+	labelClassRec @ 139
+	labelWidgetClass @ 140
+	commandClassRec @ 141
+	commandWidgetClass @ 142
+	boxClassRec @ 143
+	boxWidgetClass @ 144
+	simpleClassRec @ 145
+	simpleWidgetClass @ 146
+	XawInitializeWidgetSet @ 147
+	asciiTextClassRec @ 148
+	asciiTextWidgetClass @ 149
+	portholeClassRec @ 150
+	portholeWidgetClass @ 151
+	pannerClassRec @ 152
+	pannerWidgetClass @ 153
+	textSrcClassRec @ 154
+	textSrcObjectClass @ 155
+	gripWidgetClass @ 156
+	XawWidgetArray @ 157
+	XawWidgetCount @ 158
+	XawPanedAllowResize @ 159
+	_XawTextNeedsUpdating @ 160
+        _XawTextGetText @ 161
+        _XawTextSetScrollBars @ 162
+        _XawTextVScroll @ 163
+        _XawTextReplace @ 164
+        _XawTextClearAndCenterDisplay @ 165
+        _XawTextCheckResize @ 166
+        _XawTextSelectionList @ 167
+        _XawTextSetSelection @ 168
+        _XawTextAlterSelection @ 169
+        _XawTextPrepareToUpdate @ 170
+        _XawTextShowPosition @ 171
+        _XawTextExecuteUpdate @ 172
+        XawVendorShellExtResize @ 173
+	asciiSinkClassRec @ 174
+	asciiSinkObjectClass @ 175
+        gripClassRec @ 176
+        vPanedWidgetClass @ 177
+        repeaterClassRec @ 178
+        repeaterWidgetClass @ 179
+        smeClassRec @ 180
+        smeObjectClass @ 181
+        stripChartClassRec @ 182
+        stripChartWidgetClass @ 183
+;        _XawDefaultTextTranslations1 @ 184
+;        _XawDefaultTextTranslations2 @ 185
+;        _XawDefaultTextTranslations3 @ 186
+;        vendorShellClassRec @ 187
+	_XawVendorShellClassRec @ 187
+;        vendorShellWidgetClass @ 188
+;        _XawDefaultTextTranslations4 @ 189
+        _XawDefaultTextTranslations @ 190
+;newAW	_XawTextSrcUndo @ 191
+;newAW	tipClassRec @ 192
+;newAW	tipWidgetClass @ 193
+;newAW	XawTipEnable @ 194
+;newAW	XawTipDisable @ 195
+;	XawTextSinkConvertPropertyList @ 196
+;	XawTextGetSink @ 197
+;	XawTextSourceClearEntities @ 198
+;	XawTextSourceFindAnchor @ 199
+;	XawTextSourcePrevAnchor @ 200
+;	XawTextSourceNextAnchor @ 201
+;	XawTextSourceAnchorAndEntity @ 202
+;	XawTextSourceAddEntity @ 203
Index: xc/lib/Xaw6/Xaw6os2.rsp
diff -u /dev/null xc/lib/Xaw6/Xaw6os2.rsp:1.1
--- /dev/null	Sat Jul  1 20:44:48 2000
+++ xc/lib/Xaw6/Xaw6os2.rsp	Wed Apr  5 11:13:18 2000
@@ -0,0 +1,10 @@
+Actions.obj AllWidgets.obj AsciiSink.obj AsciiSrc.obj AsciiText.obj Box.obj+
+Command.obj Converters.obj Dialog.obj DisplayList.obj Form.obj Grip.obj+
+Label.obj List.obj MenuButton.obj MultiSink.obj MultiSrc.obj OS.obj Paned.obj+
+Panner.obj Pixmap.obj Porthole.obj Repeater.obj Scrollbar.obj Simple.obj+
+SimpleMenu.obj Sme.obj SmeBSB.obj SmeLine.obj StripChart.obj Text.obj+
+TextAction.obj TextPop.obj TextSink.obj TextSrc.obj TextTr.obj+
+Toggle.obj Tree.obj Vendor.obj Viewport.obj XawI18n.obj XawIm.obj+
+XawInit.obj +/NOI /NOL /NOD /BAT
+Xaw6.dll
+Xaw6.map
Index: xc/lib/Xdmcp/Fill.c
diff -u xc/lib/Xdmcp/Fill.c:3.5 xc/lib/Xdmcp/Fill.c:3.6
--- xc/lib/Xdmcp/Fill.c:3.5	Sat Oct  3 01:42:51 1998
+++ xc/lib/Xdmcp/Fill.c	Thu May 11 11:14:10 2000
@@ -23,7 +23,7 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.5 1998/10/03 08:42:51 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.6 2000/05/11 18:14:10 tsi Exp $ */
 
 #ifdef WIN32
 #define _WILLWINSOCK_
@@ -88,7 +88,7 @@
     *fromlen = dataunit.addr.len;
 #else
     buffer->count = recvfrom (fd, (char*)buffer->data, buffer->size, 0,
-			      (struct sockaddr *)from, fromlen);
+			      (struct sockaddr *)from, (void *)fromlen);
 #endif
     if (buffer->count < 6) {
 	buffer->count = 0;
Index: xc/lib/Xext/Xextos2.def
diff -u xc/lib/Xext/Xextos2.def:3.8 xc/lib/Xext/Xextos2.def:3.9
--- xc/lib/Xext/Xextos2.def:3.8	Thu Apr 29 02:13:31 1999
+++ xc/lib/Xext/Xextos2.def	Wed Apr  5 11:13:18 2000
@@ -1,5 +1,5 @@
 LIBRARY XEXT
-DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xext/Xextos2.def,v 3.8 1999/04/29 09:13:31 dawes Exp $"
+DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xext/Xextos2.def,v 3.9 2000/04/05 18:13:18 dawes Exp $"
 CODE
 	PRELOAD
 DATA
@@ -118,12 +118,12 @@
 	XcupGetReservedColormapEntries @ 110
 	XcupQueryVersion @ 111
 	XcupStoreColors @ 112
-	XPanoramiXQueryVersion @ 113
-	XPanoramiXAllocInfo @ 114
-	XPanoramiXGetScreenCount @ 115
-	XPanoramiXGetScreenSize @ 116
-	XPanoramiXGetState @ 117
-	XPanoramiXQueryExtension @ 118
+;	XPanoramiXQueryVersion @ 113
+;	XPanoramiXAllocInfo @ 114
+;	XPanoramiXGetScreenCount @ 115
+;	XPanoramiXGetScreenSize @ 116
+;	XPanoramiXGetState @ 117
+;	XPanoramiXQueryExtension @ 118
 	DPMSQueryExtension @ 119
 	DPMSGetVersion @ 120
 	DPMSCapable @ 121
Index: xc/lib/Xext/Xextos2.rsp
diff -u xc/lib/Xext/Xextos2.rsp:3.6 xc/lib/Xext/Xextos2.rsp:3.7
--- xc/lib/Xext/Xextos2.rsp:3.6	Thu Apr 29 02:13:31 1999
+++ xc/lib/Xext/Xextos2.rsp	Wed Apr  5 11:13:19 2000
@@ -1,5 +1,5 @@
-XMultibuf.obj XPanoramiX.obj XSecurity.obj XShape.obj XShm.obj XSync.obj+
-XTestExt1.obj Xcup.obj Xdbe.obj extutil.obj globals.obj MITMisc.obj+
-XAppgroup.obj XLbx.obj DPMS.obj XEVI.obj /NOI /NOL /NOD /BAT
+DPMS.obj MITMisc.obj XAppgroup.obj XEVI.obj XLbx.obj XMultibuf.obj+
+XSecurity.obj XShape.obj XShm.obj XSync.obj XTestExt1.obj Xcup.obj+
+Xdbe.obj extutil.obj globals.obj /NOI /NOL /NOD /BAT
 Xext.dll
 Xext.map
Index: xc/lib/Xss/Imakefile
diff -u xc/lib/Xss/Imakefile:3.1 xc/lib/Xss/Imakefile:3.2
--- xc/lib/Xss/Imakefile:3.1	Sun Dec 20 03:57:06 1998
+++ xc/lib/Xss/Imakefile	Thu Jun 15 13:49:58 2000
@@ -1,11 +1,11 @@
-XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3.1 1998/12/20 11:57:06 dawes Exp $
+XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3.2 2000/06/15 20:49:58 dawes Exp $
 #define DoNormalLib NormalLibXss
 #define DoSharedLib SharedLibXss
 #define DoExtraLib SharedLibXss
 #define DoDebugLib DebugLibXss
 #define DoProfileLib ProfileLibXss
 #define LibName Xss
-#define SoRev SOSSREV
+#define SoRev SOXSSREV
 #define LibHeaders NO
 
 #include <Threads.tmpl>
Index: xc/lib/Xt/Intrinsic.c
diff -u xc/lib/Xt/Intrinsic.c:3.13 xc/lib/Xt/Intrinsic.c:3.14
--- xc/lib/Xt/Intrinsic.c:3.13	Sat Oct  3 02:06:54 1998
+++ xc/lib/Xt/Intrinsic.c	Wed Apr  5 11:13:19 2000
@@ -32,7 +32,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.13 1998/10/03 09:06:54 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.14 2000/04/05 18:13:19 dawes Exp $ */
 
 /*
 
@@ -1342,7 +1342,7 @@
 static char *implementation_default_path()
 #endif
 {
-#ifdef WIN32
+#if defined(WIN32) || defined(__EMX__)
     /* if you know how to pass % thru the compiler let me know */
     static char xfilesearchpath[] = XFILESEARCHPATHDEFAULT;
     static Bool fixed;
Index: xc/lib/Xv/Xv.c
diff -u xc/lib/Xv/Xv.c:1.12 xc/lib/Xv/Xv.c:1.14
--- xc/lib/Xv/Xv.c:1.12	Fri Mar  3 12:51:09 2000
+++ xc/lib/Xv/Xv.c	Thu May 25 13:47:39 2000
@@ -21,7 +21,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xv/Xv.c,v 1.12 2000/03/03 20:51:09 mvojkovi Exp $ */
+/* $XFree86: xc/lib/Xv/Xv.c,v 1.14 2000/05/25 20:47:39 mvojkovi Exp $ */
 /*
 ** File: 
 **
@@ -50,29 +50,58 @@
 **
 */
 
+#include <stdio.h>
 #include "Xvlibint.h"
+#include "Xext.h"
 #include "extutil.h"
 #include "XShm.h"
 
-static XExtCodes *_XvCodes;
-static Bool (* _XvOldWireToEventVideo)();
-static Bool (* _XvOldWireToEventPort)();
-static char *(* _XvOldErrorString)();
-
-static Bool _XvWireToEvent();
-static char *_XvErrorString();
-
-#define	PREAMBLE(stat) \
-  LockDisplay(dpy); \
-  if ((!_XvCodes) && (!_XvInitExtension(dpy))) \
-    { \
-      UnlockDisplay(dpy); SyncHandle(); return (stat); \
-    }
-
-#define POSTAMBLE \
-  UnlockDisplay(dpy); \
-  SyncHandle()
+static XExtensionInfo _xv_info_data;
+static XExtensionInfo *xv_info = &_xv_info_data;
+static char *xv_extension_name = XvName;
+
+#define XvCheckExtension(dpy, i, val) \
+  XextCheckExtension(dpy, i, xv_extension_name, val)
+
+static char *xv_error_string();
+static int xv_close_display();
+static Bool xv_wire_to_event();
+
+static XExtensionHooks xv_extension_hooks = {
+    NULL,                               /* create_gc */
+    NULL,                               /* copy_gc */
+    NULL,                               /* flush_gc */
+    NULL,                               /* free_gc */
+    NULL,                               /* create_font */
+    NULL,                               /* free_font */
+    xv_close_display,                   /* close_display */
+    xv_wire_to_event,                   /* wire_to_event */
+    NULL,                               /* event_to_wire */
+    NULL,                               /* error */
+    xv_error_string                     /* error_string */
+};
 
+
+static char *xv_error_list[] = 
+{
+   "BadPort",	    /* XvBadPort     */
+   "BadEncoding",   /* XvBadEncoding */
+   "BadControl"     /* XvBadControl  */
+};
+
+static XEXT_GENERATE_CLOSE_DISPLAY (xv_close_display, xv_info)
+
+
+static XEXT_GENERATE_FIND_DISPLAY (xv_find_display, xv_info, 
+                                   xv_extension_name, 
+                                   &xv_extension_hooks,
+				   XvNumEvents, NULL)
+     
+
+static XEXT_GENERATE_ERROR_STRING (xv_error_string, xv_extension_name,
+                                   XvNumErrors, xv_error_list)
+
+
 int
 XvQueryExtension(
      Display *dpy,
@@ -82,28 +111,30 @@
      unsigned int *p_eventBase,
      unsigned int *p_errorBase
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvQueryExtensionReq *req;
   xvQueryExtensionReply rep;
 
-  PREAMBLE(XvBadExtension);
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  XvGetReq(QueryExtension, req);
+  LockDisplay(dpy);
 
-  /* READ THE REPLY */
+  XvGetReq(QueryExtension, req);
 
-  if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) 
-    {
-      POSTAMBLE;
-      return(XvBadExtension);
-    }
+  if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+     UnlockDisplay(dpy);
+     SyncHandle();
+     return XvBadExtension;
+  }
 
   *p_version = rep.version;
   *p_revision = rep.revision;
-  *p_requestBase = _XvCodes->major_opcode;
-  *p_eventBase = _XvCodes->first_event;
-  *p_errorBase = _XvCodes->first_error;
+  *p_requestBase = info->codes->major_opcode;
+  *p_eventBase = info->codes->first_event;
+  *p_errorBase = info->codes->first_error;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -115,6 +146,7 @@
      unsigned int *p_nAdaptors,
      XvAdaptorInfo **p_pAdaptors
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvQueryAdaptorsReq *req;
   xvQueryAdaptorsReply rep;
   int size,ii,jj;
@@ -130,25 +162,27 @@
       xvFormat *pf;
     } u;
   
-  PREAMBLE(XvBadExtension);
+  XvCheckExtension(dpy, info, XvBadExtension);
+
+  LockDisplay(dpy);
 
   XvGetReq(QueryAdaptors, req);
   req->window = window;
 
   /* READ THE REPLY */
 
-  if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) 
-    {
-      POSTAMBLE;
+  if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) {
+      UnlockDisplay(dpy);
+      SyncHandle();
       return(XvBadReply);
-    }
+  }
 
   size = rep.length << 2;
-  if ( (buffer = (char *)Xmalloc ((unsigned) size)) == NULL)
-    {
-      POSTAMBLE;
+  if ( (buffer = (char *)Xmalloc ((unsigned) size)) == NULL) {
+      UnlockDisplay(dpy);
+      SyncHandle();
       return(XvBadAlloc);
-    }
+  }
   _XRead (dpy, buffer, size);
 
   u.buffer = buffer;
@@ -156,26 +190,24 @@
   /* GET INPUT ADAPTORS */
 
   size = rep.num_adaptors*sizeof(XvAdaptorInfo);
-  if ((pas=(XvAdaptorInfo *)Xmalloc(size))==NULL)
-    {
+  if ((pas=(XvAdaptorInfo *)Xmalloc(size))==NULL) {
       Xfree(buffer);
-      POSTAMBLE;
+      UnlockDisplay(dpy);
+      SyncHandle();
       return(XvBadAlloc);
-    }
+  }
 
   /* INIT ADAPTOR FIELDS */
 
   pa = pas;
-  for (ii=0; ii<rep.num_adaptors; ii++)
-    {
+  for (ii=0; ii<rep.num_adaptors; ii++) {
       pa->num_adaptors = 0;
       pa->name = (char *)NULL;
       pa->formats = (XvFormat *)NULL;
-    }
+  }
 
   pa = pas;
-  for (ii=0; ii<rep.num_adaptors; ii++)
-    {
+  for (ii=0; ii<rep.num_adaptors; ii++) {
       pa->type = u.pa->type;
       pa->base_id = u.pa->base_id;
       pa->num_ports = u.pa->num_ports;
@@ -191,7 +223,8 @@
 	{
 	  XvFreeAdaptorInfo(pas);
 	  Xfree(buffer);
-	  POSTAMBLE;
+          UnlockDisplay(dpy);
+          SyncHandle();
 	  return(XvBadAlloc);
 	}
       (void)strncpy(name, u.string, size);
@@ -203,34 +236,34 @@
       /* GET FORMATS */
 
       size = pa->num_formats*sizeof(XvFormat);
-      if ((pfs=(XvFormat *)Xmalloc(size))==NULL)
-	{
+      if ((pfs=(XvFormat *)Xmalloc(size))==NULL) {
 	  XvFreeAdaptorInfo(pas);
 	  Xfree(buffer);
-	  POSTAMBLE;
+          UnlockDisplay(dpy);
+          SyncHandle();
 	  return(XvBadAlloc);
-	}
+      }
 
       pf = pfs;
-      for (jj=0; jj<pa->num_formats; jj++)
-	{
+      for (jj=0; jj<pa->num_formats; jj++) {
 	  pf->depth = u.pf->depth;
 	  pf->visual_id = u.pf->visual;
 	  pf++;
 	  
 	  u.buffer += (sz_xvFormat + 3) & ~3;
-	}
+      }
 
       pa->formats = pfs;
 
       pa++;
 
-    }
+  }
 
   *p_nAdaptors = rep.num_adaptors;
   *p_pAdaptors = pas;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return (Success);
 }
@@ -269,6 +302,7 @@
      unsigned int *p_nEncodings,
      XvEncodingInfo **p_pEncodings
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvQueryEncodingsReq *req;
   xvQueryEncodingsReply rep;
   int size, jj;
@@ -282,25 +316,27 @@
       xvEncodingInfo *pe;
     } u;
   
-  PREAMBLE(XvBadExtension);
+  XvCheckExtension(dpy, info, XvBadExtension);
+
+  LockDisplay(dpy);
 
   XvGetReq(QueryEncodings, req);
   req->port = port;
 
   /* READ THE REPLY */
 
-  if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) 
-    {
-      POSTAMBLE;
+  if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) {
+      UnlockDisplay(dpy);
+      SyncHandle();
       return(XvBadReply);
-    }
+  }
 
   size = rep.length << 2;
-  if ( (buffer = (char *)Xmalloc ((unsigned) size)) == NULL)
-    {
-      POSTAMBLE;
+  if ( (buffer = (char *)Xmalloc ((unsigned) size)) == NULL) {
+      UnlockDisplay(dpy);
+      SyncHandle();
       return(XvBadAlloc);
-    }
+  }
   _XRead (dpy, buffer, size);
 
   u.buffer = buffer;
@@ -308,26 +344,24 @@
   /* GET ENCODINGS */
 
   size = rep.num_encodings*sizeof(XvEncodingInfo);
-  if ( (pes = (XvEncodingInfo *)Xmalloc(size)) == NULL)
-    {
+  if ( (pes = (XvEncodingInfo *)Xmalloc(size)) == NULL) {
       Xfree(buffer);
-      POSTAMBLE;
+      UnlockDisplay(dpy);
+      SyncHandle();
       return(XvBadAlloc);
-    }
+  }
 
   /* INITIALIZE THE ENCODING POINTER */
 
   pe = pes;
-  for (jj=0; jj<rep.num_encodings; jj++)
-    {
+  for (jj=0; jj<rep.num_encodings; jj++) {
       pe->name = (char *)NULL;
       pe->num_encodings = 0;
       pe++;
-    }
+  }
 
   pe = pes;
-  for (jj=0; jj<rep.num_encodings; jj++)
-    {
+  for (jj=0; jj<rep.num_encodings; jj++) {
       pe->encoding_id = u.pe->encoding;
       pe->width = u.pe->width;
       pe->height = u.pe->height;
@@ -338,25 +372,25 @@
       size = u.pe->name_size;
       u.buffer += (sz_xvEncodingInfo + 3) & ~3;
 
-      if ( (name = (char *)Xmalloc(size+1)) == NULL)
-	{
+      if ( (name = (char *)Xmalloc(size+1)) == NULL) {
 	  Xfree(buffer);
-	  POSTAMBLE;
+          UnlockDisplay(dpy);
+          SyncHandle();
 	  return(XvBadAlloc);
-	}
+      }
       strncpy(name, u.string, size);
       name[size] = '\0';
       pe->name = name;
       pe++;
 
       u.buffer += (size + 3) & ~3;
-
-    }
+  }
 
   *p_nEncodings = rep.num_encodings;
   *p_pEncodings = pes;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return (Success);
 }
@@ -372,13 +406,11 @@
 
   pe = pEncodings;
 
-  for (ii=0; ii<pEncodings->num_encodings; ii++, pe++)
-    {
+  for (ii=0; ii<pEncodings->num_encodings; ii++, pe++) {
       if (pe->name) Xfree(pe->name);
-    }
+  }
 
   Xfree(pEncodings);
-
 }
 
 int
@@ -392,9 +424,12 @@
      int dx, int dy,
      unsigned int dw, unsigned int dh
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvPutVideoReq *req;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
   
   FlushGC(dpy, gc);
 
@@ -412,7 +447,8 @@
   req->drw_w = dw;
   req->drw_h = dh;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -428,9 +464,12 @@
      int dx, int dy,
      unsigned int dw, unsigned int dh
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvPutStillReq *req;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
 
   FlushGC(dpy, gc);
 
@@ -447,7 +486,8 @@
   req->drw_w = dw;
   req->drw_h = dh;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -463,10 +503,13 @@
      int dx, int dy,
      unsigned int dw, unsigned int dh
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvGetVideoReq *req;
 
-  PREAMBLE(XvBadExtension);
+  XvCheckExtension(dpy, info, XvBadExtension);
 
+  LockDisplay(dpy);
+
   FlushGC(dpy, gc);
 
   XvGetReq(GetVideo, req);
@@ -482,7 +525,8 @@
   req->drw_w = dw;
   req->drw_h = dh;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -498,9 +542,12 @@
      int dx, int dy,
      unsigned int dw, unsigned int dh
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvGetStillReq *req;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
 
   FlushGC(dpy, gc);
 
@@ -517,7 +564,8 @@
   req->drw_w = dw;
   req->drw_h = dh;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -528,15 +576,19 @@
      XvPortID port,
      Drawable draw
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvStopVideoReq *req;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
 
   XvGetReq(StopVideo, req);
   req->port = port;
   req->drawable = draw;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -547,12 +599,15 @@
      XvPortID port,
      Time time
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   int result;
   xvGrabPortReply rep;
   xvGrabPortReq *req;
 
-  PREAMBLE(XvBadExtension);
+  XvCheckExtension(dpy, info, XvBadExtension);
 
+  LockDisplay(dpy);
+
   XvGetReq(GrabPort, req);
   req->port = port;
   req->time = time;
@@ -562,7 +617,8 @@
 
   result = rep.result;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return result;
 }
@@ -573,15 +629,19 @@
      XvPortID port,
      Time time
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvUngrabPortReq *req;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
 
   XvGetReq(UngrabPort, req);
   req->port = port;
   req->time = time;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -592,15 +652,19 @@
      Drawable drawable,
      Bool onoff
 ){
-  register xvSelectVideoNotifyReq *req;
+  XExtDisplayInfo *info = xv_find_display(dpy);
+  xvSelectVideoNotifyReq *req;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
 
   XvGetReq(SelectVideoNotify, req);
   req->drawable = drawable;
   req->onoff = onoff;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -611,51 +675,64 @@
      XvPortID port,
      Bool onoff
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvSelectPortNotifyReq *req;
 
-  PREAMBLE(XvBadExtension);
+  XvCheckExtension(dpy, info, XvBadExtension);
 
+  LockDisplay(dpy);
+
   XvGetReq(SelectPortNotify, req);
   req->port = port;
   req->onoff = onoff;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
 
 int
-XvSetPortAttribute (dpy, port, attribute, value)
-     register Display *dpy;
-     XvPortID port;
-     Atom attribute;
-     int value;
+XvSetPortAttribute (
+     Display *dpy,
+     XvPortID port,
+     Atom attribute,
+     int value
+)
 {
-  register xvSetPortAttributeReq *req;
+  XExtDisplayInfo *info = xv_find_display(dpy);
+  xvSetPortAttributeReq *req;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
 
   XvGetReq(SetPortAttribute, req);
   req->port = port;
   req->attribute = attribute;
   req->value = value;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return (Success);
 }
 
 int
-XvGetPortAttribute (dpy, port, attribute, p_value)
-     register Display *dpy;
-     XvPortID port;
-     Atom attribute;
-     int *p_value;
+XvGetPortAttribute (
+     Display *dpy,
+     XvPortID port,
+     Atom attribute,
+     int *p_value
+)
 {
-  register xvGetPortAttributeReq *req;
+  XExtDisplayInfo *info = xv_find_display(dpy);
+  xvGetPortAttributeReq *req;
   xvGetPortAttributeReply rep;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
 
   XvGetReq(GetPortAttribute, req);
   req->port = port;
@@ -663,33 +740,40 @@
 
   /* READ THE REPLY */
 
-  if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) 
-    {
-      POSTAMBLE;
+  if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) {
+      UnlockDisplay(dpy);
+      SyncHandle();
       return(XvBadReply);
-    }
+  }
 
   *p_value = rep.value;
   
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return (Success);
 }
 
 int
-XvQueryBestSize(dpy, port, motion, vid_w, vid_h, drw_w, drw_h, 
-		p_actual_width, p_actual_height)
-     register Display *dpy;
-     XvPortID port;
-     Bool motion;
-     unsigned int vid_w, vid_h;
-     unsigned int drw_w, drw_h;
-     unsigned int *p_actual_width, *p_actual_height;
+XvQueryBestSize(
+     Display *dpy,
+     XvPortID port,
+     Bool motion,
+     unsigned int vid_w, 
+     unsigned int vid_h,
+     unsigned int drw_w, 
+     unsigned int drw_h,
+     unsigned int *p_actual_width, 
+     unsigned int *p_actual_height
+)
 {
-  register xvQueryBestSizeReq *req;
+  XExtDisplayInfo *info = xv_find_display(dpy);
+  xvQueryBestSizeReq *req;
   xvQueryBestSizeReply rep;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
 
   XvGetReq(QueryBestSize, req);
   req->port = port;
@@ -701,16 +785,17 @@
 
   /* READ THE REPLY */
 
-  if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) 
-    {
-      POSTAMBLE;
+  if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) {
+      UnlockDisplay(dpy);
+      SyncHandle();
       return(XvBadReply);
-    }
+  }
 
   *p_actual_width = rep.actual_width;
   *p_actual_height = rep.actual_height;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return (Success);
 }
@@ -719,13 +804,16 @@
 XvAttribute* 
 XvQueryPortAttributes(Display *dpy, XvPortID port, int *num)
 {
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvQueryPortAttributesReq *req;
   xvQueryPortAttributesReply rep;
   XvAttribute *ret = NULL;
 
   *num = 0;
+
+  XvCheckExtension(dpy, info, NULL);
 
-  PREAMBLE(NULL);
+  LockDisplay(dpy);
 
   XvGetReq(QueryPortAttributes, req);
   req->port = port;
@@ -733,7 +821,8 @@
   /* READ THE REPLY */
 
   if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) {
-      POSTAMBLE;
+      UnlockDisplay(dpy);
+      SyncHandle();
       return ret;
   }
 
@@ -759,7 +848,8 @@
 	_XEatData(dpy, rep.length << 2);
   }
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return ret;
 }
@@ -769,21 +859,25 @@
    XvPortID 	port,
    int 		*num
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvListImageFormatsReq *req;
   xvListImageFormatsReply rep;
   XvImageFormatValues *ret = NULL;
 
   *num = 0;
 
-  PREAMBLE(NULL);
+  XvCheckExtension(dpy, info, NULL);
 
+  LockDisplay(dpy);
+
   XvGetReq(ListImageFormats, req);
   req->port = port;
 
   /* READ THE REPLY */
 
   if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) {
-      POSTAMBLE;
+      UnlockDisplay(dpy);
+      SyncHandle();
       return NULL;
   }
 
@@ -824,7 +918,8 @@
 	_XEatData(dpy, rep.length << 2);
   }
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return ret;
 }
@@ -837,11 +932,14 @@
    int width, 
    int height 
 ) {
+   XExtDisplayInfo *info = xv_find_display(dpy);
    xvQueryImageAttributesReq *req;
    xvQueryImageAttributesReply rep;
    XvImage *ret = NULL;
+
+   XvCheckExtension(dpy, info, NULL);
 
-   PREAMBLE(NULL);
+   LockDisplay(dpy);
 
    XvGetReq(QueryImageAttributes, req);
    req->id = id;
@@ -852,11 +950,12 @@
    /* READ THE REPLY */
 
    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-      POSTAMBLE;
+       UnlockDisplay(dpy);
+       SyncHandle();
       return NULL;
    }
 
-   if(ret = (XvImage*)Xmalloc(sizeof(XvImage) + (rep.num_planes << 3))) {
+   if((ret = (XvImage*)Xmalloc(sizeof(XvImage) + (rep.num_planes << 3)))) {
 	ret->id = id;
 	ret->width = rep.width;
 	ret->height = rep.height;
@@ -871,7 +970,8 @@
    } else
 	_XEatData(dpy, rep.length << 2);
 
-   POSTAMBLE;
+   UnlockDisplay(dpy);
+   SyncHandle();
 
    return ret;
 }
@@ -909,13 +1009,14 @@
    unsigned int dest_w,
    unsigned int dest_h
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   xvPutImageReq *req;
+  int len;
 
-  PREAMBLE(XvBadExtension);
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  if(image->data_size > (dpy->max_request_size << 2)) /* FixMe */
-	return BadAlloc;
-  
+  LockDisplay(dpy);
+
   FlushGC(dpy, gc);
 
   XvGetReq(PutImage, req);
@@ -934,15 +1035,18 @@
   req->drw_h = dest_h;
   req->width = image->width;
   req->height = image->height;
-  req->length += (image->data_size + 3) >> 2;
+
+  len = (image->data_size + 3) >> 2;
+  SetReqLen(req, len, len);
 
   /* Yes it's kindof lame that we are sending the whole thing,
      but for video all of it may be needed even if displaying
      only a subsection, and I don't want to go through the 
      trouble of creating subregions to send */
-  _XSend(dpy, (char *)image->data, image->data_size);
+  Data(dpy, (char *)image->data, image->data_size);
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
@@ -963,10 +1067,13 @@
    unsigned int dest_h,
    Bool send_event
 ){
+  XExtDisplayInfo *info = xv_find_display(dpy);
   XShmSegmentInfo *shminfo = (XShmSegmentInfo *)image->obdata;
   xvShmPutImageReq *req;
+
+  XvCheckExtension(dpy, info, XvBadExtension);
 
-  PREAMBLE(XvBadExtension);
+  LockDisplay(dpy);
   
   FlushGC(dpy, gc);
 
@@ -990,23 +1097,25 @@
   req->height = image->height;
   req->send_event = send_event;
 
-  POSTAMBLE;
+  UnlockDisplay(dpy);
+  SyncHandle();
 
   return Success;
 }
 
 
-
-
-
 static Bool
-_XvWireToEvent(Display *dpy, XEvent *host, xEvent *wire)
+xv_wire_to_event(Display *dpy, XEvent *host, xEvent *wire)
 {
+  XExtDisplayInfo *info = xv_find_display(dpy);
   XvEvent *re    = (XvEvent *)host;
   xvEvent *event = (xvEvent *)wire;
 
-  if (event->u.u.type == _XvCodes->first_event+XvVideoNotify)
-    {
+  XvCheckExtension(dpy, info, False);
+
+  switch((event->u.u.type & 0x7F) - info->codes->first_event)
+  {
+    case XvVideoNotify:
       re->xvvideo.type = event->u.u.type & 0x7f;
       re->xvvideo.serial = 
 	_XSetLastRequestRead(dpy, (xGenericReply *)event);
@@ -1016,13 +1125,8 @@
       re->xvvideo.reason = event->u.videoNotify.reason;
       re->xvvideo.drawable = event->u.videoNotify.drawable;
       re->xvvideo.port_id = event->u.videoNotify.port;
-      if (_XvOldWireToEventVideo) 
-	{
-	  (void)(* _XvOldWireToEventVideo)(dpy, re, event);
-	}
-    }
-  else if (event->u.u.type == _XvCodes->first_event+XvPortNotify)
-    {
+      break;
+    case XvPortNotify:
       re->xvport.type = event->u.u.type & 0x7f;
       re->xvport.serial = 
 	_XSetLastRequestRead(dpy, (xGenericReply *)event);
@@ -1032,71 +1136,12 @@
       re->xvport.port_id = event->u.portNotify.port;
       re->xvport.attribute = event->u.portNotify.attribute;
       re->xvport.value = event->u.portNotify.value;
-      if (_XvOldWireToEventPort) 
-	{
-	  (void)(* _XvOldWireToEventPort)(dpy, re, event);
-	}
-    }
-  else
-    {
-      return (False);
-    }
+      break;
+    default:
+      return False; 
+  }
 
   return (True);
 }
 
-Bool
-_XvInitExtension(Display *dpy)
-{
-  if (!(_XvCodes = XInitExtension (dpy, XvName)))
-    {
-      return False;
-    }
-
-  _XvOldWireToEventVideo = 
-    XESetWireToEvent(dpy,
-		     _XvCodes->first_event + XvVideoNotify, 
-		     _XvWireToEvent);
-
-  _XvOldWireToEventPort = 
-    XESetWireToEvent(dpy, 
-		     _XvCodes->first_event + XvPortNotify, 
-		     _XvWireToEvent);
-
-  _XvOldErrorString = XESetErrorString(dpy, _XvCodes->extension, 
-				       _XvErrorString);
-
-  return True;
-}
-
-static char *
-_XvErrorString(
-     Display *dpy,
-     int code,
-     XExtCodes *ecodes,
-     char *buffer,
-     int size
-){
 
-  if (size < strlen("Encoding") + 1)
-    {
-      if (_XvOldErrorString) 
-	return (* _XvOldErrorString)(dpy, code, ecodes, buffer, size);
-    }
-
-  if (code - ecodes->first_error == XvBadPort)
-    {
-      strcpy(buffer, "Port");
-    }
-  else if (code - ecodes->first_error == XvBadEncoding)
-    {
-      strcpy(buffer, "Encoding");
-    }
-  else
-    {
-      if (_XvOldErrorString) 
-	return (* _XvOldErrorString)(dpy, code, ecodes, buffer, size);
-    }
-
-  return (char *)NULL;
-}
Index: xc/lib/Xv/Xvlibint.h
diff -u xc/lib/Xv/Xvlibint.h:1.2 xc/lib/Xv/Xvlibint.h:1.4
--- xc/lib/Xv/Xvlibint.h:1.2	Fri Jul 24 23:56:51 1998
+++ xc/lib/Xv/Xvlibint.h	Wed Jun  7 15:02:57 2000
@@ -21,6 +21,8 @@
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.4 2000/06/07 22:02:57 tsi Exp $ */
+
 #ifndef XVLIBINT_H
 #define XVLIBINT_H
 /*
@@ -51,7 +53,7 @@
 	if ((dpy->bufptr + SIZEOF(xv##name##Req)) > dpy->bufmax)\
 		_XFlush(dpy);\
 	req = (xv##name##Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = _XvCodes->major_opcode;\
+	req->reqType = info->codes->major_opcode;\
         req->xvReqType = xv_##name; \
         req->length = (SIZEOF(xv##name##Req))>>2;\
 	dpy->bufptr += SIZEOF(xv##name##Req);\
@@ -63,35 +65,10 @@
 	if ((dpy->bufptr + SIZEOF(xv/**/name/**/Req)) > dpy->bufmax)\
 		_XFlush(dpy);\
 	req = (xv/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = _XvCodes->major_opcode;\
+	req->reqType = info->codes->major_opcode;\
 	req->xvReqType = xv_/**/name;\
 	req->length = (SIZEOF(xv/**/name/**/Req))>>2;\
 	dpy->bufptr += SIZEOF(xv/**/name/**/Req);\
-	dpy->request++
-#endif
-
-
-#if defined(__STDC__) && !defined(UNIXCPP)
-#define XvGetReqExtra(name, n, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(xv##name##Req) + n) > dpy->bufmax)\
-		_XFlush(dpy);\
-	req = (xv##name##Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = _XvCodes->major_opcode;\
-	req->xvReqType = xv_##name;\
-	req->length = (SIZEOF(xv##name##Req) + n)>>2;\
-	dpy->bufptr += SIZEOF(xv##name##Req) + n;\
-	dpy->request++
-#else
-#define XvGetReqExtra(name, n, req) \
-        WORD64ALIGN\
-	if ((dpy->bufptr + SIZEOF(xv/**/name/**/Req) + n) > dpy->bufmax)\
-		_XFlush(dpy);\
-	req = (xv/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
-	req->reqType = _XvCodes->major_opcode;\
-	req->xvReqType = xv_/**/name;\
-	req->length = (SIZEOF(xv/**/name/**/Req) + n)>>2;\
-	dpy->bufptr += SIZEOF(xv/**/name/**/Req) + n;\
 	dpy->request++
 #endif
 
Index: xc/lib/Xxf86dga/XF86DGA2.c
diff -u xc/lib/Xxf86dga/XF86DGA2.c:1.13 xc/lib/Xxf86dga/XF86DGA2.c:1.14
--- xc/lib/Xxf86dga/XF86DGA2.c:1.13	Tue Nov 30 10:06:19 1999
+++ xc/lib/Xxf86dga/XF86DGA2.c	Mon May 22 21:47:35 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.13 1999/11/30 18:06:19 mvojkovi Exp $ */
+/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.14 2000/05/23 04:47:35 dawes Exp $ */
 /*
 
 Copyright (c) 1995  Jon Tombs
@@ -906,7 +906,9 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
-    if ((pMap->fd = open(DEV_MEM, O_RDWR)) < 0)
+    if (!name)
+	    name = DEV_MEM;
+    if ((pMap->fd = open(name, O_RDWR)) < 0)
 	return False;
     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, 
 			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
Index: xc/lib/dps/DPSCAPClient.h
diff -u xc/lib/dps/DPSCAPClient.h:1.1 xc/lib/dps/DPSCAPClient.h:1.2
--- xc/lib/dps/DPSCAPClient.h:1.1	Sat Feb 12 16:12:51 2000
+++ xc/lib/dps/DPSCAPClient.h	Thu May 18 16:46:12 2000
@@ -100,43 +100,40 @@
 
 /* === PUBLIC PROCS === */
 
-extern int CSDPSInit(/* Display *dpy, int *numberType, char **floatingName */);
+extern int CSDPSInit(Display * /* dpy */, int * /* numberType */, char ** /* floatingName */);
 
-extern XExtData **CSDPSHeadOfDpyExt(/* Display *dpy */);
+extern XExtData **CSDPSHeadOfDpyExt(Display * /* dpy */);
 
 /* === SUPPORT PROCS === */
 
-extern void DPSCAPChangeGC(/* Display *agent, GC gc, unsigned long valuemask, XGCValues *values */);
+extern void DPSCAPChangeGC(Display * /* agent */, GC /* gc */, unsigned long /* valuemask */, XGCValues * /* values */);
 
-extern DPSCAPData DPSCAPCreate(/* Display *dpy, *agent */);
+extern DPSCAPData DPSCAPCreate(Display * /* dpy */, Display * /* agent */);
 
-extern int DPSCAPDestroy(/* DPSCAPData my */);
+extern int DPSCAPDestroy(XExtData * /* extData */);
 
-extern XExtData * DPSCAPOpenAgent(/* Display *dpy, char *trueDisplayName */);
+extern XExtData * DPSCAPOpenAgent(Display * /* dpy */, char * /* trueDisplayName */);
 
-extern void DPSCAPRead(/* DPSCAPData my, char *buf, unsigned len, DPSCAPIOFlags includePad */);
+extern void DPSCAPRead(DPSCAPData /* my */, char * /* buf */, unsigned /* len */, DPSCAPIOFlags /* includePad */);
 
-extern void DPSCAPStartUp();
+extern void DPSCAPStartUp(void);
 
-extern void DPSCAPWrite(/* DPSCAPData my, char *buf, unsigned len, DPSCAPIOFlags writePad, bufMode */);
+extern void DPSCAPWrite(Display * /* my */, char * /* buf */, unsigned /* len */, DPSCAPIOFlags /* writePad */, DPSCAPIOFlags /* bufMode */);
 
 /* ext callback hooks */
 
-extern int DPSCAPCloseDisplayProc(/* Display *dpy, XExtCodes *codes */);
+extern int DPSCAPCloseDisplayProc(Display * /* dpy */, XExtCodes * /* codes */);
 
-extern int DPSCAPGrabServerProc(/* Display *dpy, XExtCodes *codes */);
+extern int DPSCAPGrabServerProc(Display * /* dpy */, XExtCodes * /* codes */);
 
-extern int DPSCAPUngrabServerProc(/* Display *dpy, XExtCodes *codes */);
+extern int DPSCAPUngrabServerProc(Display * /* dpy */, XExtCodes * /* codes */);
 
-extern void DPSCAPCloseAgent(/* Display *agent */);
+extern void DPSCAPCloseAgent(Display * /* agent */);
 
-/* === NEW HOOKS INTO XLIB === */
+extern int DPSCAPCopyGCProc(Display * /* dpy */, GC /* gc */, XExtCodes * /* codes */);
 
-#ifdef XXX
-extern int (*XESetGrabServer(/* Display *dpy, int extension, int (*proc)() */))();
+extern int DPSCAPFreeGCProc(Display * /* pdpy */, GC /* gc */, XExtCodes * /* codes */);
 
-extern int (*XESetUngrabServer(/* Display *dpy, int extension, int (*proc)() */))();
-#endif /* XXX */
+extern int DPSCAPFlushGCProc(Display * /* dpy */, GC /* gc */, XExtCodes * /* codes */);
 
 #endif /* DPSCAPCLIENT_H */
-
Index: xc/lib/dps/Imakefile
diff -u xc/lib/dps/Imakefile:1.7 xc/lib/dps/Imakefile:1.12
--- xc/lib/dps/Imakefile:1.7	Wed Feb 23 21:36:39 2000
+++ xc/lib/dps/Imakefile	Tue May 23 12:32:52 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/dps/Imakefile,v 1.7 2000/02/24 05:36:39 tsi Exp $
+XCOMM $XFree86: xc/lib/dps/Imakefile,v 1.12 2000/05/23 19:32:52 dawes Exp $
 
 #define DoNormalLib NormalLibDps
 #define DoSharedLib SharedLibDps
@@ -9,6 +9,10 @@
 #define SoRev SODPSREV
 #define IncSubdir DPS
 
+#ifdef SharedDPSReqs
+REQUIREDLIBS = SharedDPSReqs
+#endif
+
 XCOMM  The Client Library uses definitions just like Xlib for network
 XCOMM  capabilities, such as TCPCONN, UNIXCONN, and DNETCONN.  See
 XCOMM  csconndi.c and csopendi.c
@@ -25,9 +29,7 @@
             SED = sed
             AWK = awk
            SORT = sort
-      PSWRAPSRC = $(TOP)/config/pswrap
-         PSWRAP = $(PSWRAPSRC)/pswrap
-
+         PSWRAP = PsWrap
 
 COMMONOBJECTFILES = \
 	dpsclient.o\
@@ -188,56 +190,13 @@
     psopstack.c\
     psXops.c\
     psl2ops.c
+
+all :: $(HEADERS)
 
-DPSOPSANSIHEADERFILES = \
-    dpsclrops.ah\
-    dpsctrlops.ah\
-    dpsctxtops.ah\
-    dpsdataops.ah\
-    dpsfontops.ah\
-    dpsgsttops.ah\
-    dpsioops.ah\
-    dpsmathops.ah\
-    dpsmtrxops.ah\
-    dpsmiscops.ah\
-    dpsopstack.ah\
-    dpspntops.ah\
-    dpspathops.ah\
-    dpssysops.ah\
-    dpswinops.ah\
-    dpsXops.ah\
-    dpsl2ops.ah
-
-PSOPSANSIHEADERFILES = \
-    psclrops.ah\
-    psctrlops.ah\
-    psctxtops.ah\
-    psdataops.ah\
-    psfontops.ah\
-    psgsttops.ah\
-    psioops.ah\
-    psmathops.ah\
-    psmtrxops.ah\
-    psmiscops.ah\
-    pspntops.ah\
-    pspathops.ah\
-    pssysops.ah\
-    pswinops.ah\
-    psopstack.ah\
-    psXops.ah\
-    psl2ops.ah
-
-includes:: $(DPSOPSCFILES) $(PSOPSCFILES)
-
-$(DPSOPSCFILES) $(PSOPSCFILES): $(PSWRAP)
-
-XCOMM Unless you have a completely and thoroughly ANSI-C environment, dont run
-XCOMM pswrap on the singleops with -a (ANSI C).  Many of the procedures have 
-XCOMM float arguments, and if you run pswrap with -a these become really and 
-XCOMM truly floats instead of the doubles they are automatically promoted 
-XCOMM to under non-ANSI C.  The resulting library cannot be linked with 
-XCOMM code compiled with a non-ANSI C compiler.
+includes :: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
 
+$(DPSOPSCFILES) $(PSOPSCFILES): ProgramTargetName($(PSWRAP))
+
 SRCS = \
 	${COMMONSOURCEFILES} \
 	${XSOURCEFILES} \
@@ -253,21 +212,17 @@
 	${PSOPSOBJECTS}
 
 DERIVED_FILES = $(DPSOPSHEADERFILES) $(PSOPSHEADERFILES) \
-		$(DPSOPSANSIHEADERFILES) $(PSOPSANSIHEADERFILES) \
 		$(DPSOPSCFILES) $(PSOPSCFILES)
 
 #include <Library.tmpl>
 
-.SUFFIXES: .psw .ah .h
+.SUFFIXES: .psw .h
 
 .psw.c : ProgramTargetName($(PSWRAP))
-	RunProgram(PSWRAP,-o $*.c -h $*.h $<)
-
-.psw.ah : ProgramTargetName($(PSWRAP))
-	RunProgram(PSWRAP,-a -h $*.ah $< > /dev/null)
+	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
 
 .psw.h : ProgramTargetName($(PSWRAP))
-	RunProgram(PSWRAP,-h $*.h $< > /dev/null)
+	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
 
 ProgramTargetName($(PSWRAP)):
 	@echo "checking $@ over in $(PSWRAPSRC) first..."; \
@@ -276,45 +231,53 @@
 
 HEADERS = psops.h dpsops.h
 
-all :: $(HEADERS)
 depend :: $(HEADERS)
+depend :: $(DPSOPSCFILES) $(PSOPSCFILES)
 
-psops.h : $(PSOPSHEADERFILES) $(PSOPSANSIHEADERFILES)
-	$(RM) $@
+#ifndef OS2Architecture
+psops.h : $(PSOPSHEADERFILES)
+	RemoveFile($@)
 	${CAT} $(PSOPSHEADERFILES) |\
 	    ${SED} -e '/^$$/D' -e '/#/D' -e '/^\//D'\
 	        -e '/^   gener/D' -e '/^.\//D' |\
 	    ${SORT} > .sort
 	${AWK} '/;/ {print; printf("\n");}' .sort > .ttt
-	${CAT} $(PSOPSANSIHEADERFILES) |\
-	    ${SED} -e '/^$$/D' -e '/#/D' -e '/^\//D'\
-	        -e '/^   gener/D' -e '/^.\//D'\
-		-e 's/float \([a-zA-Z][a-zA-Z0-9]*[,\)]\)/double \1/g' |\
-	    ${SORT} > .sort
-	${AWK} '/;/ {print; printf("\n");}' .sort > .attt
-	${CAT} psname.txt header.txt psifdef.txt .ttt else.txt .attt\
-		psendif.txt > psops.h
-	${RM} .sort .ttt .attt
+	${CAT} psname.txt header.txt psifdef.txt .ttt psendif.txt > psops.h
+	RemoveFiles(.sort .ttt .attt)
 
-dpsops.h : $(DPSOPSHEADERFILES) $(DPSOPSANSIHEADERFILES)
-	$(RM) $@
+dpsops.h : psops.h $(DPSOPSHEADERFILES)
+	RemoveFile($@)
 	${CAT} $(DPSOPSHEADERFILES) |\
 	    ${SED} -e '/^$$/D' -e '/#/D' -e '/^\//D'\
 	        -e '/^   gener/D' -e '/^.\//D' |\
 	    ${SORT} > .sort
 	${AWK} '/;/ {print; printf("\n");}' .sort > .ttt
-	${CAT} $(DPSOPSANSIHEADERFILES) |\
-	    ${SED} -e '/^$$/D' -e '/#/D' -e '/^\//D'\
-	        -e '/^   gener/D' -e '/^.\//D'\
-		-e 's/float \([a-zA-Z][a-zA-Z0-9]*[,\)]\)/double \1/g' |\
-	    ${SORT} > .sort
-	${AWK} '/;/ {print; printf("\n");}' .sort > .attt
-	${CAT} dpsname.txt header.txt dpsifdef.txt .ttt else.txt .attt\
-		dpsendif.txt > dpsops.h
-	${RM} .sort .ttt .attt
+	${CAT} dpsname.txt header.txt dpsifdef.txt .ttt dpsendif.txt > dpsops.h
+	RemoveFiles(.sort .ttt .attt)
 
 clean ::
 	${RM} $(DERIVED_FILES) .sort .ttt .att psops.h dpsops.h *%
 
 DependTarget()
+#else
+
+BuildIncludes($(HEADERS),IncSubdir,..)
+
+psops.h : $(PSOPSHEADERFILES)
+	.\genheader
+	RemoveFile($@)
+	$(CAT) psops.h.os2 >psops.h
+
+dpsops.h : psops.h $(DPSOPSHEADERFILES)
+	.\genheader
+	RemoveFile($@)
+	$(CAT) dpsops.h.os2 >dpsops.h
+
+clean::
+	RemoveFiles($(DPSOPSHEADERFILES) $(PSOPSHEADERFILES))
+	RemoveFiles($(DPSOPSCFILES) $(PSOPSCFILES))
+	RemoveFiles(.sort .ttt .att psops.h dpsops.h)
+
+depend::
 
+#endif
Index: xc/lib/dps/XDPS.c
diff -u xc/lib/dps/XDPS.c:1.1 xc/lib/dps/XDPS.c:1.2
--- xc/lib/dps/XDPS.c:1.1	Sat Feb 12 16:12:52 2000
+++ xc/lib/dps/XDPS.c	Thu May 18 16:46:12 2000
@@ -42,18 +42,24 @@
 #include <stdio.h>
 /* Include this first so that Xasync.h, included from Xlibint.h, can find
    the definition of NOFILE */
+#include <stdlib.h>
 #include <sys/param.h>
 #include <X11/Xlibint.h>
-#include "cslibint.h"
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+
 #include "DPS/XDPS.h"
 #include "DPS/XDPSproto.h"
 #include "DPS/XDPSlib.h"
 #include "DPS/dpsNXargs.h"
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
+
+#include "cslibint.h"
 #include "dpsassert.h"
 #include "DPSCAPClient.h"
 
+#include "publictypes.h"
+#include "dpsXpriv.h"
+
 /* === DEFINITIONS === */
 
 #ifndef _NFILE
@@ -70,7 +76,7 @@
 
 /* === TYPES === */
 
-typedef Status (*PSCMProc)();
+typedef Status (*PSCMProc)(Display *, XEvent *, xEvent *);
 
 typedef struct {
     char passEvents;
@@ -82,7 +88,7 @@
 /* For now DPSDisplayFlags is no larger than a pointer.  Revisit this if the
    structure grows. */
 
-typedef int (*GenericProcPtrReturnsInt)();
+typedef int (*GenericProcPtrReturnsInt)(Display *);
 
 typedef struct _t_DPSCAPPausedContextData {
     struct _t_DPSCAPPausedContextData *next;
@@ -97,11 +103,11 @@
 } DPSCAPAgentArgs;
 
 typedef struct {
-    int (*Flush)();
-    int (*Read)();
-    int (*ReadPad)();
-    Status (*Reply)();
-    int (*Send)();
+    void (*Flush)(Display *);
+    int (*Read)(Display*, char*, long);
+    void (*ReadPad)(Display*, char*, long);
+    Status (*Reply)(Display*, xReply*, int, Bool);
+    void (*Send)(Display*, _Xconst char*, long);
 } XDPSLIOProcs;
 
 /* === GLOBALS === */
@@ -144,13 +150,12 @@
 static nextDpy = 0;
 #endif /* VMS */
 
-static void DPSCAPInitGC();
-static Bool DPSCAPResumeWithIX();
-static Status DPSCAPClientMessageProc();
-static int DPSCAPAfterProc();    
-static unsigned int DPSCAPSetPause();
-static Bool DPSCAPResumeContext();
-static Bool WaitForSyncProc();
+static void DPSCAPInitGC(Display *dpy, Display *agent, GC gc);
+static Status DPSCAPClientMessageProc(Display *dpy, XEvent *re, xEvent *event);
+static int DPSCAPAfterProc(Display *xdpy);
+static unsigned int DPSCAPSetPause(Display *xdpy, ContextXID cxid);
+static Bool DPSCAPResumeContext(Display *xdpy, ContextXID cxid);
+static Bool WaitForSyncProc(Display *xdpy, XEvent *event, char *arg);
 
 static XDPSLIOProcs xlProcs = {  /* Use these for DPS/X extension */
     _XFlush,
@@ -174,7 +179,7 @@
 
 /* === PRIVATE PROCS === */
 
-static int Punt()
+static int Punt(void)
 {
     DPSFatalProc(NULL, "Extension has not been initialized");
     exit(1);
@@ -183,7 +188,7 @@
 #ifdef VMS
 /* This is a terribly inefficient way to find a per-display index, but we
    need it till we get dpy->fd fixed in VMS%%%%%*/
-static int FindDpyNum(dpy)
+static int FindDpyNum(Display *dpy)
 {
 int i;
 for (i=0; dpys[i] != dpy ; i++)
@@ -205,68 +210,54 @@
 
 /* ARGSUSED */
 void
-XDPSLSetTextEventHandler(dpy, proc)
-    Display *dpy;
-    XDPSLEventHandler proc;
+XDPSLSetTextEventHandler(Display *dpy, XDPSLEventHandler proc)
 {
     TextProc = proc;
 }
 
 /* ARGSUSED */
 void
-XDPSLCallOutputEventHandler(dpy, event)
-    Display *dpy;
-    XEvent *event;
+XDPSLCallOutputEventHandler(Display *dpy, XEvent *event)
 {
     (*TextProc)(event);
 }
 
 void
-XDPSLSetStatusEventHandler(dpy, proc)
-    Display *dpy;
-    XDPSLEventHandler proc;
+XDPSLSetStatusEventHandler(Display *dpy, XDPSLEventHandler proc)
 {
     StatusProc[DPY_NUMBER(dpy)] = proc;
 }
 
 void
-XDPSLCallStatusEventHandler(dpy, event)
-    Display *dpy;
-    XEvent *event;
+XDPSLCallStatusEventHandler(Display *dpy, XEvent *event)
 {
     (*(StatusProc[DPY_NUMBER(dpy)]))(event);
 }
 
 /* Added for L2-DPS/PROTO 9 */
 void
-XDPSLSetReadyEventHandler(dpy, proc)
-    Display *dpy;
-    XDPSLEventHandler proc;
+XDPSLSetReadyEventHandler(Display *dpy, XDPSLEventHandler proc)
 {
     ReadyProc[DPY_NUMBER(dpy)] = proc;
 }
 
 /* Added for L2-DPS/PROTO 9 */
 void
-XDPSLCallReadyEventHandler(dpy, event)
-    Display *dpy;
-    XEvent *event;
+XDPSLCallReadyEventHandler(Display *dpy, XEvent *event)
 {
     (*(ReadyProc[DPY_NUMBER(dpy)]))(event);
 }
 
 /* Added for L2-DPS/PROTO 9 */
 int
-XDPSLGetVersion(dpy)
-    Display *dpy;
+XDPSLGetVersion(Display *dpy)
 {
     return(version[DPY_NUMBER(dpy)]);
 }
 /* See CSDPS additions for XDPSLSetVersion */
 
 void
-XDPSLInitDisplayFlags(dpy)
-    Display *dpy;
+XDPSLInitDisplayFlags(Display *dpy)
 {
     int d = DPY_NUMBER(dpy);
     displayFlags[d].wrapWaiting = False;
@@ -277,20 +268,15 @@
        contexts, which is a Good Thing */
 }
 
-XExtCodes *XDPSLGetCodes(dpy)
-    Display *dpy;
+XExtCodes *XDPSLGetCodes(Display *dpy)
 {
     return Codes[DPY_NUMBER(dpy)];
 }
 
 /* ARGSUSED */
 static int
-CloseDisplayProc(dpy, codes)
-Display *dpy;
-XExtCodes *codes;
+CloseDisplayProc(Display *dpy, XExtCodes *codes)
 {
-    extern void XDPSPrivZapDpy();
-    
     /* This proc is for native DPS/X only, not CSDPS */
     Codes[DPY_NUMBER(dpy)] = NULL;
     /* Clear list */
@@ -299,43 +285,35 @@
     dpys[DPY_NUMBER(dpy)] = NULL;
  /*%%%%Temp till we fix dpy->fd*/
 #endif /* VMS */
+    return 0;	/* return-value is ignored */
 }
 
 Bool
-XDPSLGetPassEventsFlag(dpy)
-    Display *dpy;
+XDPSLGetPassEventsFlag(Display *dpy)
 {
     return displayFlags[DPY_NUMBER(dpy)].passEvents;
 }
 
 void
-XDPSLSetPassEventsFlag(dpy, flag)
-    Display *dpy;
-    Bool flag;
+XDPSLSetPassEventsFlag(Display *dpy, Bool flag)
 {
     displayFlags[DPY_NUMBER(dpy)].passEvents = flag;
 }
 
 Bool
-XDPSLGetWrapWaitingFlag(dpy)
-    Display *dpy;
+XDPSLGetWrapWaitingFlag(Display *dpy)
 {
     return displayFlags[DPY_NUMBER(dpy)].wrapWaiting;
 }
 
 void
-XDPSLSetWrapWaitingFlag(dpy, flag)
-    Display *dpy;
-    Bool flag;
+XDPSLSetWrapWaitingFlag(Display *dpy, Bool flag)
 {
     displayFlags[DPY_NUMBER(dpy)].wrapWaiting = flag;
 }
 
 static Status 
-ConvertOutputEvent(dpy, ce, we)
-    Display *dpy;
-    XEvent *ce;
-    xEvent *we;
+ConvertOutputEvent(Display *dpy, XEvent *ce, xEvent *we)
 {
     register PSOutputEvent *wireevent = (PSOutputEvent *) we;
     register XDPSLOutputEvent *clientevent = (XDPSLOutputEvent *) ce;
@@ -356,10 +334,7 @@
 }
 
 static Status 
-ConvertStatusEvent(dpy, ce, we)
-    Display *dpy;
-    XEvent *ce;
-    xEvent *we;
+ConvertStatusEvent(Display *dpy, XEvent *ce, xEvent *we)
 {
     register PSStatusEvent *wireevent = (PSStatusEvent *) we;
     register XDPSLStatusEvent *clientevent = (XDPSLStatusEvent *) ce;
@@ -380,10 +355,7 @@
 
 /* Added for L2-DPS/PROTO 9 */
 static Status
-ConvertReadyEvent(dpy, ce, we)
-    Display *dpy;
-    XEvent *ce;
-    xEvent *we;
+ConvertReadyEvent(Display *dpy, XEvent *ce, xEvent *we)
 {
     register PSReadyEvent *wireevent = (PSReadyEvent *) we;
     register XDPSLReadyEvent *clientevent = (XDPSLReadyEvent *) ce;
@@ -409,11 +381,7 @@
 /* ARGSUSED */
 
 static int
-CatchBadMatch(dpy, err, codes, ret_code)
-    Display *dpy;
-    xError *err;
-    XExtCodes *codes;
-    int *ret_code;
+CatchBadMatch(Display *dpy, xError *err, XExtCodes *codes, int *ret_code)
 {
     if (err->errorCode == BadMatch)
         {
@@ -429,10 +397,10 @@
 
 
 int
-XDPSLInit(dpy, numberType, floatingName)
-    Display *dpy;
-    int *numberType;		/* RETURN */
-    char **floatingName;	/* RETURN: CALLER MUST NOT MODIFY OR FREE! */
+XDPSLInit(
+    Display *dpy,
+    int *numberType,		/* RETURN */
+    char **floatingName)	/* RETURN: CALLER MUST NOT MODIFY OR FREE! */
 {
     XExtCodes *codes = (XExtCodes *)NULL;
     register xPSInitReq *req;
@@ -442,8 +410,7 @@
     
     {
         char *ddt;
-        extern char *getenv();
-        
+
         if ((ddt = getenv("DPSNXOVER")) != NULL) {
             gForceCSDPS = (*ddt == 't' || *ddt == 'T');
             if (gForceCSDPS)
@@ -496,7 +463,7 @@
        the client has a later (higher) version of
        the protocol than the server */
     {
-    int (*oldErrorProc)();
+    int (*oldErrorProc)(Display*, xError*, XExtCodes*, int*);
     int libVersion;
     Bool doneIt;
     
@@ -567,9 +534,10 @@
 
 
 
-static void CopyColorMapsIntoCreateContextReq(req, colorcube, grayramp)
-    xPSCreateContextReq *req;
-    XStandardColormap *colorcube, *grayramp;
+static void CopyColorMapsIntoCreateContextReq(
+    xPSCreateContextReq *req,
+    XStandardColormap *colorcube,
+    XStandardColormap *grayramp)
 {
     req->cmap = 0;
     if (colorcube != NULL) {
@@ -611,19 +579,18 @@
 
 /* ARGSUSED */
 ContextXID
-XDPSLCreateContextAndSpace(xdpy, draw, gc, x, y, eventMask, grayRamp,
-			   colorCube, actual, cpsid, sxid,
-			   secure)
-    register Display *xdpy;
-    Drawable draw;
-    GC gc;
-    int x, y;
-    unsigned int eventMask;
-    XStandardColormap *grayRamp,*colorCube;
-    unsigned int actual;
-    ContextPSID *cpsid;		/* RETURN */
-    SpaceXID *sxid;		/* RETURN */
-    Bool secure;                /* Added for L2-DPS/PROTO 9 */
+XDPSLCreateContextAndSpace(
+    register Display *xdpy,
+    Drawable draw,
+    GC gc,
+    int x, int y,
+    unsigned int eventMask,
+    XStandardColormap *grayRamp,
+    XStandardColormap *colorCube,
+    unsigned int actual,
+    ContextPSID *cpsid,		/* RETURN */
+    SpaceXID *sxid,		/* RETURN */
+    Bool secure)                /* Added for L2-DPS/PROTO 9 */
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -653,6 +620,7 @@
 
     switch (index)
 	{
+	default:
 	case 0: /* Both are default */
 	    XDPSGetDefaultColorMaps(xdpy, (Screen *) NULL, draw,
 				    &defColorcube, &defGrayramp);
@@ -730,19 +698,18 @@
 
 /* ARGSUSED */
 ContextXID
-XDPSLCreateContext(xdpy, sxid, draw, gc, x, y, eventMask, grayRamp,
-		   colorCube, actual, cpsid,
-		   secure)
-    register Display *xdpy;
-    SpaceXID sxid;
-    Drawable draw;
-    GC gc;
-    int x, y;
-    unsigned int eventMask;
-    XStandardColormap *grayRamp,*colorCube;
-    unsigned int actual;
-    ContextPSID *cpsid;		/* RETURN */
-    Bool secure;                /* L2-DPS/PROTO 9 addition */
+XDPSLCreateContext(
+    register Display *xdpy,
+    SpaceXID sxid,
+    Drawable draw,
+    GC gc,
+    int x, int y,
+    unsigned int eventMask,
+    XStandardColormap *grayRamp,
+    XStandardColormap *colorCube,
+    unsigned int actual,
+    ContextPSID *cpsid,		/* RETURN */
+    Bool secure)                /* L2-DPS/PROTO 9 addition */
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -771,6 +738,7 @@
 
     switch (index)
 	{
+	default:
 	case 0: /* Both are default */
 	    XDPSGetDefaultColorMaps(xdpy, (Screen *) NULL, draw,
 				    &defColorcube, &defGrayramp);
@@ -845,8 +813,7 @@
 }
 
 SpaceXID
-XDPSLCreateSpace(xdpy)
-    register Display *xdpy;
+XDPSLCreateSpace(Display *xdpy)
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -879,11 +846,7 @@
 #define COALESCEGIVEINPUT
 
 void
-XDPSLGiveInput(xdpy, cxid, data, length)
-register Display *xdpy;
-ContextXID cxid;
-char *data;
-int length;
+XDPSLGiveInput(Display *xdpy, ContextXID cxid, char *data, int length)
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -994,9 +957,7 @@
 
 
 int
-XDPSLGetStatus(xdpy, cxid)
-    register Display *xdpy;
-    ContextXID cxid;
+XDPSLGetStatus(Display *xdpy, ContextXID cxid)
 {
     int dpyix;
     Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1036,9 +997,7 @@
 }
 
 void
-XDPSLDestroySpace( xdpy, sxid )
-    Display *xdpy;
-    SpaceXID sxid;
+XDPSLDestroySpace(Display *xdpy, SpaceXID sxid)
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1072,9 +1031,7 @@
 
 
 void
-XDPSLReset( xdpy, cxid )
-    Display *xdpy; 
-    ContextXID cxid; 
+XDPSLReset(Display *xdpy, ContextXID cxid) 
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1107,10 +1064,10 @@
 }
 
 void
-XDPSLNotifyContext( xdpy, cxid, ntype )
-    Display *xdpy; 
-    ContextXID cxid; 
-    int ntype;		  /* should this be an enum?? %%% */
+XDPSLNotifyContext(
+    Display *xdpy, 
+    ContextXID cxid, 
+    int ntype)		  /* should this be an enum?? %%% */
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1151,10 +1108,10 @@
 
 
 ContextXID
-XDPSLCreateContextFromID( xdpy, cpsid, sxid )
-    Display *xdpy; 
-    ContextPSID cpsid; 
-    SpaceXID *sxid;		/* RETURN */
+XDPSLCreateContextFromID(
+    Display *xdpy, 
+    ContextPSID cpsid, 
+    SpaceXID *sxid)		/* RETURN */
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1196,11 +1153,11 @@
 /* Returns 1 on success, 0 on failure (cpsid not a valid context). */
 
 Status
-XDPSLIDFromContext( xdpy, cpsid, cxid, sxid )
-    Display *xdpy; 
-    ContextPSID cpsid; 
-    ContextXID *cxid;			/* RETURN */
-    SpaceXID *sxid;			/* RETURN */
+XDPSLIDFromContext(
+    Display *xdpy,
+    ContextPSID cpsid, 
+    ContextXID *cxid,			/* RETURN */
+    SpaceXID *sxid)			/* RETURN */
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1239,9 +1196,7 @@
 
 
 ContextPSID
-XDPSLContextFromXID( xdpy, cxid )
-    Display *xdpy; 
-    ContextXID cxid; 
+XDPSLContextFromXID(Display *xdpy, ContextXID cxid)
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1278,10 +1233,12 @@
 
 
 void
-XDPSLSetStatusMask( xdpy, cxid, enableMask, disableMask, nextMask )
-    Display *xdpy;
-    ContextXID cxid;
-    unsigned int enableMask, disableMask, nextMask;
+XDPSLSetStatusMask(
+    Display *xdpy,
+    ContextXID cxid,
+    unsigned int enableMask,
+    unsigned int disableMask,
+    unsigned int nextMask)
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1344,11 +1301,8 @@
 without express or implied warranty.
 
 */  
-
-_XReadPad (xdpy, data, size)
-	register Display *dpy;
-	register char *data;
-	register long size;
+void
+_XReadPad (Display *dpy, char *data, long size)
 {
 	static int padlength[4] = {0,3,2,1};
 	register long bytes_read;
@@ -1367,10 +1321,10 @@
 /* _____________ LEVEL 2 DPS/PROTOCOL 9 ADDITIONS _____________ */
 
 void
-XDPSLNotifyWhenReady( xdpy, cxid, val )
-    Display *xdpy;
-    ContextXID cxid;
-    int val[4];
+XDPSLNotifyWhenReady(
+    Display *xdpy,
+    ContextXID cxid,
+    int val[4])
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1422,9 +1376,7 @@
 }
 
 XDPSLPSErrors
-XDPSLTestErrorCode(dpy, ecode)
-    Display *dpy;
-    int ecode;
+XDPSLTestErrorCode(Display *dpy, int ecode)
 {
     XExtCodes *c = XDPSLGetCodes(dpy);
 
@@ -1449,54 +1401,44 @@
 /* === NEW HOOKS INTO XDPS === */
 
 void
-XDPSLSetVersion(dpy, ver)
-    Display *dpy;
-    unsigned ver;
+XDPSLSetVersion(Display *dpy, unsigned ver)
 {
     version[DPY_NUMBER(dpy)] = ver;
 }
 
 void
-XDPSLSetCodes(dpy, codes)
-    Display *dpy;
-    XExtCodes *codes;
+XDPSLSetCodes(Display *dpy, XExtCodes *codes)
 {
     Codes[DPY_NUMBER(dpy)] = codes;
 }
 
 Display *
-XDPSLGetShunt(dpy_in)
-    register Display *dpy_in;
+XDPSLGetShunt(Display *dpy_in)
 {
     return(ShuntMap[DPY_NUMBER(dpy_in)]);
 }
 
 void
-XDPSLSetShunt(dpy_in, dpy_out)
-    Display *dpy_in, *dpy_out;
+XDPSLSetShunt(Display *dpy_in, Display *dpy_out)
 {
     ShuntMap[DPY_NUMBER(dpy_in)] = dpy_out;
 }
 
 int
-XDPSLGetSyncMask(dpy)
-    Display *dpy;
+XDPSLGetSyncMask(Display *dpy)
 {
     return (int)displayFlags[DPY_NUMBER(dpy)].syncMask;
 }
 
 void
-XDPSLSetSyncMask(dpy, mask)
-    Display *dpy;
-    int mask;
+XDPSLSetSyncMask(Display *dpy, int mask)
 {
     displayFlags[DPY_NUMBER(dpy)].syncMask = (char)mask;
     gForceFlush = (mask & DPSCAP_SYNCMASK_RECONCILE);
 }
 
 void
-XDPSLFlush(xdpy)
-    register Display *xdpy;
+XDPSLFlush(Display *xdpy)
 {
     register Display *dpy = ShuntMap[DPY_NUMBER(xdpy)];
 
@@ -1506,14 +1448,11 @@
 }
 
 void
-XDPSLSyncGCClip(xdpy, gc)
-    register Display *xdpy;
-    register GC gc;
+XDPSLSyncGCClip(Display *xdpy, GC gc)
 {
     register unsigned long oldDirty;
     register int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
-    extern int gNXSyncGCMode;
 
     /* We DON'T want to notice all gc changes, just the clip */
     oldDirty = gc->dirty;
@@ -1536,18 +1475,14 @@
 
 #ifdef VMS
 void
-XDPSLSetDisplay(dpy)
-    Display *dpy;
+XDPSLSetDisplay(Display *dpy)
 {
     dpys[DPY_NUMBER(dpy)] = dpy;
 }
 #endif /* VMS */
 
 char *
-XDPSLSetAgentName(dpy, name, deflt)
-    Display *dpy;
-    char *name;
-    int deflt;
+XDPSLSetAgentName(Display *dpy, char *name, int deflt)
 {
     char *old;
     
@@ -1568,8 +1503,7 @@
 
 
 void
-XDPSLSetClientMessageHandler(dpy)
-    Display *dpy;
+XDPSLSetClientMessageHandler(Display *dpy)
 {
     if (dpy == NULL) return;
     ClientMsgProc[DPY_NUMBER(dpy)] = XESetWireToEvent(
@@ -1579,8 +1513,7 @@
 }
 
 void
-XDPSLSetAfterProc(xdpy)
-    Display *xdpy;
+XDPSLSetAfterProc(Display *xdpy)
 {
     if (xdpy == NULL) return;
     AfterProcs[DPY_NUMBER(xdpy)] = (GenericProcPtrReturnsInt)
@@ -1590,9 +1523,7 @@
 
 
 CSDPSFakeEventTypes
-XDPSLGetCSDPSFakeEventType(dpy, event)
-    Display *dpy;
-    XEvent *event;
+XDPSLGetCSDPSFakeEventType(Display *dpy, XEvent *event)
 {
     XExtCodes *codes = Codes[DPY_NUMBER(dpy)];
     XExtData *extData;
@@ -1621,10 +1552,10 @@
 }
 
 Bool
-XDPSLDispatchCSDPSFakeEvent(dpy, event, t)
-    Display *dpy;
-    XEvent *event;
-    CSDPSFakeEventTypes t;
+XDPSLDispatchCSDPSFakeEvent(
+    Display *dpy,
+    XEvent *event,
+    CSDPSFakeEventTypes t)
 {
     register XDPSLOutputEvent *oce;
     register DPSCAPOutputEvent *oev;
@@ -1697,14 +1628,14 @@
     return(True);
 }
 
-extern struct _t_DPSContextRec *XDPSContextFromXID();
+extern struct _t_DPSContextRec *XDPSContextFromXID(Display *, ContextXID);
 
 void
-XDPSLGetCSDPSStatus(xdpy, event, ret_ctxt, ret_status)
-    Display *xdpy;
-    XEvent *event;
-    void **ret_ctxt;
-    int *ret_status;
+XDPSLGetCSDPSStatus(
+    Display *xdpy,
+    XEvent *event,
+    void **ret_ctxt,
+    int *ret_status)
 {
     register DPSCAPStatusEvent *sev;
 
@@ -1718,11 +1649,11 @@
 }
 
 void
-XDPSLGetCSDPSReady(xdpy, event, ret_ctxt, ret_val)
-    Display *xdpy;
-    XEvent *event;
-    void **ret_ctxt;
-    int *ret_val;
+XDPSLGetCSDPSReady(
+    Display *xdpy,
+    XEvent *event,
+    void **ret_ctxt,
+    int *ret_val)
 {
     /* Assert: event is ClientMessage with typePSReady */
    
@@ -1739,12 +1670,12 @@
 }
 
 void
-XDPSLCAPNotify(xdpy, cxid, ntype, data, extra)
-    Display *xdpy; 
-    ContextXID cxid; 
-    unsigned int ntype;		  /* should this be an enum?? %%% */
-    unsigned int data;
-    unsigned int extra;
+XDPSLCAPNotify(
+    Display *xdpy, 
+    ContextXID cxid, 
+    unsigned int ntype,		  /* should this be an enum?? %%% */
+    unsigned int data,
+    unsigned int extra)
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -1778,8 +1709,7 @@
 }
 
 void
-XDPSLSync(xdpy)
-    Display *xdpy;
+XDPSLSync(Display *xdpy)
 {
     register Display *dpy = ShuntMap[DPY_NUMBER(xdpy)];
     
@@ -1828,9 +1758,7 @@
 }
 
 void
-XDPSLReconcileRequests(xdpy, cxid)
-    Display *xdpy;
-    ContextXID cxid;
+XDPSLReconcileRequests(Display *xdpy, ContextXID cxid)
 {
     int dpyix;
     unsigned int seqnum;
@@ -1862,9 +1790,7 @@
 }
 
 Status
-XDPSLSetAgentArg(xdpy, arg, val)
-    Display *xdpy;
-    int arg, val;
+XDPSLSetAgentArg(Display *xdpy, int arg, int val)
 {
     int dpyix;
     register Display *dpy = ShuntMap[dpyix = DPY_NUMBER(xdpy)];
@@ -2039,10 +1965,10 @@
 /* === PRIVATE CSDPS PROCS === */
 
 static Status
-DPSCAPClientMessageProc(dpy, re, event)
-    Display *dpy;
-    XEvent *re;
-    register xEvent *event;
+DPSCAPClientMessageProc(
+    Display *dpy,
+    XEvent *re,
+    xEvent *event)
 {
     register XDPSLOutputEvent *oce;
     register DPSCAPOutputEvent *oev;
@@ -2159,9 +2085,7 @@
 
 
 static void
-DPSCAPInitGC(dpy, agent, gc)
-    Display *dpy, *agent;
-    GC gc;
+DPSCAPInitGC(Display *dpy, Display *agent, GC gc)
 {
     XGCValues values;
     unsigned long valuemask = DPSGCBITS & ~(GCClipMask);
@@ -2179,16 +2103,13 @@
 /* ARGSUSED */
 
 static Bool
-WaitForSyncProc(xdpy, event, arg)
-    Display *xdpy;
-    XEvent *event;
-    char *arg;
+WaitForSyncProc(Display *xdpy, XEvent *event, char *arg)
 {
     DPSCAPData my = (DPSCAPData)arg;
     
     if ((event->type & 0x7F) == ClientMessage 
 	&& event->xclient.message_type == my->typeSync
-	&& event->xclient.data.l[0] == my->saveseq) {
+	&& event->xclient.data.l[0] == (long) my->saveseq) {
       return(True);
     } else {
       return(False);
@@ -2197,8 +2118,7 @@
 
 
 static int
-DPSCAPAfterProc(xdpy)
-    Display *xdpy;
+DPSCAPAfterProc(Display *xdpy)
 {
     register Display *dpy = ShuntMap[DPY_NUMBER(xdpy)];
     GenericProcPtrReturnsInt proc;
@@ -2220,9 +2140,7 @@
 
 
 static unsigned int
-DPSCAPSetPause(xdpy, cxid)
-    register Display *xdpy;
-    register ContextXID cxid;
+DPSCAPSetPause(Display *xdpy, ContextXID cxid)
 {
     register DPSCAPPausedContextData *slot;
     int dpyix;
@@ -2273,9 +2191,7 @@
 }
 
 static Bool
-DPSCAPResumeContext(xdpy, cxid)
-    register Display *xdpy;
-    register ContextXID cxid;
+DPSCAPResumeContext(Display *xdpy, ContextXID cxid)
 {
     register DPSCAPPausedContextData *slot;
     unsigned int ret;
@@ -2322,9 +2238,3 @@
     /* Fall thru */
     return(False);
 }
-
-
-
-
-
-
Index: xc/lib/dps/Xlibnet.h
diff -u xc/lib/dps/Xlibnet.h:1.3 xc/lib/dps/Xlibnet.h:1.5
--- xc/lib/dps/Xlibnet.h:1.3	Mon Feb 21 12:12:03 2000
+++ xc/lib/dps/Xlibnet.h	Thu May 18 16:46:12 2000
@@ -13,7 +13,7 @@
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 */
-/* $XFree86: xc/lib/dps/Xlibnet.h,v 1.3 2000/02/21 20:12:03 dawes Exp $ */
+/* $XFree86: xc/lib/dps/Xlibnet.h,v 1.5 2000/05/18 23:46:12 dawes Exp $ */
 /*
  * Xlibnet.h - Xlib networking include files for UNIX Systems.
  */
@@ -91,7 +91,11 @@
 #ifdef NOFILE
 #define OPEN_MAX NOFILE
 #else
+#if !defined(__EMX__) && !defined(__QNX__)
 #define OPEN_MAX NOFILES_MAX
+#else
+#define OPEN_MAX 256
+#endif
 #endif
 #endif
 #endif
@@ -221,6 +225,7 @@
  *
  * #define _XANYSET(src) (src[0] || src[1] || src[2] || src[3] || src[4] ...)
  */
+extern int N_XANYSET(unsigned long *);
 #endif
 
 /*
Index: xc/lib/dps/csconndi.c
diff -u xc/lib/dps/csconndi.c:1.2 xc/lib/dps/csconndi.c:1.3
--- xc/lib/dps/csconndi.c:1.2	Tue Feb 15 06:51:21 2000
+++ xc/lib/dps/csconndi.c	Thu May 18 16:46:12 2000
@@ -47,7 +47,7 @@
  *  
  * Author:  Adobe Systems Incorporated and MIT X Consortium
  */
-/* $XFree86: xc/lib/dps/csconndi.c,v 1.2 2000/02/15 14:51:21 dawes Exp $ */
+/* $XFree86: xc/lib/dps/csconndi.c,v 1.3 2000/05/18 23:46:12 dawes Exp $ */
 
 #if defined(sun) && !defined(SVR4)
 #define memmove(t,f,c) bcopy(f,t,c)
@@ -80,6 +80,7 @@
 
 #include "DPSCAPproto.h"
 #include "cslibint.h"
+#include "dpsassert.h"
 
 #if defined(hpux) || defined(AIXV3)
 #define SELECT_TYPE int *
@@ -88,7 +89,6 @@
 #endif
 
 #ifndef _XANYSET
-extern int N_XANYSET();
 #define _XANYSET N_XANYSET
 #endif /* _XANYSET */
 
@@ -96,26 +96,26 @@
 #define X_CONNECTION_RETRIES 5
 #endif
 
+#define CONN_PARAMS char *, int , int , int *, int *, char **
+
 #ifdef DNETCONN
-static int MakeDECnetConnection();
+static int MakeDECnetConnection(CONN_PARAMS);
 #endif
 #ifdef UNIXCONN
-static int MakeUNIXSocketConnection();
+static int MakeUNIXSocketConnection(CONN_PARAMS);
 #endif
 #ifdef TCPCONN
-static int MakeTCPConnection();
+static int MakeTCPConnection(CONN_PARAMS);
 #endif
 #ifdef STREAMSCONN
-extern int _XMakeStreamsConnection();
+extern int _XMakeStreamsConnection(CONN_PARAMS);
 #endif
 
 /* This global controls the size of the output socket buffer.  Zero
    means to use the system default size. */
 int gNXSndBufSize = 0;
 
-static char *copystring (src, len)
-    char *src;
-    int len;
+static char *copystring (char *src, int len)
 {
     char *dst = Xmalloc (len + 1);
 
@@ -146,23 +146,22 @@
  */
  
 int 
-DPSCAPConnect(display_name, fullnamep, dpynump,
-		      familyp, saddrlenp, saddrp)
-    char *display_name;
-    char **fullnamep;			/* RETURN */
-    int *dpynump;			/* RETURN */
-    int *familyp;			/* RETURN */
-    int *saddrlenp;			/* RETURN */
-    char **saddrp;			/* RETURN, freed by caller */
+DPSCAPConnect(
+    char *display_name,
+    char **fullnamep,			/* RETURN */
+    int *dpynump,			/* RETURN */
+    int *familyp,			/* RETURN */
+    int *saddrlenp,			/* RETURN */
+    char **saddrp)			/* RETURN, freed by caller */
 {
     char *lastp, *p;			/* char pointers */
     char *phostname = NULL;		/* start of host of display */
     char *pdpynum = NULL;		/* start of dpynum of display */
     char *pscrnum = NULL;		/* start of screen of display */
     Bool dnet = False;			/* if true, then DECnet format */
-    int iagent;			/* required display number */
+    int iagent;				/* required display number */
     int iscreen = 0;			/* optional screen number */
-    int (*connfunc)();			/* method to create connection */
+    int (*connfunc)(CONN_PARAMS);	/* method to create connection */
     int fd = -1;			/* file descriptor to return */
     int len;				/* length tmp variable */
 
@@ -492,14 +491,13 @@
 #endif
 #endif
 
-static int MakeUNIXSocketConnection (phostname, iagent, retries,
-				     familyp, saddrlenp, saddrp)
-    char *phostname;
-    int iagent;
-    int retries;
-    int *familyp;			/* RETURN */
-    int *saddrlenp;			/* RETURN */
-    char **saddrp;			/* RETURN */
+static int MakeUNIXSocketConnection (
+    char *phostname,
+    int iagent,
+    int retries,
+    int *familyp,			/* RETURN */
+    int *saddrlenp,			/* RETURN */
+    char **saddrp)			/* RETURN */
 {
     struct sockaddr_un unaddr;		/* UNIX socket data block */
     struct sockaddr *addr;		/* generic socket pointer */
@@ -547,14 +545,13 @@
 
 
 #ifdef TCPCONN
-static int MakeTCPConnection (phostname, iagent, retries,
-			      familyp, saddrlenp, saddrp)
-    char *phostname;
-    int iagent;
-    int retries;
-    int *familyp;			/* RETURN */
-    int *saddrlenp;			/* RETURN */
-    char **saddrp;			/* RETURN */
+static int MakeTCPConnection (
+    char *phostname,
+    int iagent,
+    int retries,
+    int *familyp,			/* RETURN */
+    int *saddrlenp,			/* RETURN */
+    char **saddrp)			/* RETURN */
 {
     char hostnamebuf[256];		/* tmp space */
     unsigned long hostinetaddr;		/* result of inet_addr of arpa addr */
@@ -712,11 +709,8 @@
 /* 
  * Disconnect from server.
  */
-
-int N_XDisconnectDisplay (server)
-
-    int server;
 
+int N_XDisconnectDisplay (int server)
 {
     (void) close(server);
     return 0;
@@ -732,8 +726,7 @@
  * 2) if the connection can be read, must enqueue events and handle errors,
  * until the connection is writable.
  */
-void N_XWaitForWritable(dpy)
-    Display *dpy;
+void N_XWaitForWritable(Display *dpy)
 {
     unsigned long r_mask[MSKCNT];
     unsigned long w_mask[MSKCNT];
@@ -783,7 +776,7 @@
 		if (ev->u.u.type == X_Error)
 		    _XError (dpy, (xError *) ev);
 		else		/* it's an event packet; die */
-		    DPSFatalProc(NULL, "N_XWaitForWritable read bogus X event");
+		    DPSFatalProc((DPSContext)0, "N_XWaitForWritable read bogus X event");
 	    }
 	    ENDITERATE
 	}
@@ -793,8 +786,7 @@
 }
 
 
-N_XWaitForReadable(dpy)
-  Display *dpy;
+void N_XWaitForReadable(Display *dpy)
 {
     unsigned long r_mask[MSKCNT];
     int result;
@@ -812,10 +804,11 @@
 
 static int padlength[4] = {0, 3, 2, 1};	 /* make sure auth is multiple of 4 */
 
-_XSendClientPrefix (dpy, client, auth_proto, auth_string)
-     Display *dpy;
-     xConnClientPrefix *client;		/* contains count for auth_* */
-     char *auth_proto, *auth_string;	/* NOT null-terminated */
+_XSendClientPrefix (
+     Display *dpy,
+     xConnClientPrefix *client,		/* contains count for auth_* */
+     char *auth_proto,			/* NOT null-terminated */
+     char char *auth_string)		/* NOT null-terminated */
 {
     int auth_length = client->nbytesAuthProto;
     int auth_strlen = client->nbytesAuthString;
Index: xc/lib/dps/csfindNX.c
diff -u xc/lib/dps/csfindNX.c:1.3 xc/lib/dps/csfindNX.c:1.4
--- xc/lib/dps/csfindNX.c:1.3	Fri Feb 18 04:18:53 2000
+++ xc/lib/dps/csfindNX.c	Thu May 18 16:46:12 2000
@@ -35,26 +35,29 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
-/* $XFree86: xc/lib/dps/csfindNX.c,v 1.3 2000/02/18 12:18:53 tsi Exp $ */
+/* $XFree86: xc/lib/dps/csfindNX.c,v 1.4 2000/05/18 23:46:12 dawes Exp $ */
 
 #include <sys/param.h>				/* for MAXHOSTNAMELEN */
 #include <stdlib.h>
+#include <unistd.h>		/* getuid() */
 #include <string.h>
 #include <pwd.h>
+
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xlibint.h>
 #include <X11/Xatom.h>
 #include <X11/Xresource.h>
+
 #include "csfindNX.h"
 #include "dpsNXprops.h"
 #include "Xlibnet.h"
 #include "DPS/dpsXclient.h"
 #include "DPS/dpsNXargs.h"
 #include <DPS/XDPSlib.h>
-#include "cslibint.h"
 
-extern char *getenv();
+#include "dpsassert.h"
+#include "cslibint.h"
 
 /* ---Defines--- */
 
@@ -81,27 +84,28 @@
 unsigned char gXDPSNXErrorCode;
 extern int gNXSndBufSize;  /* Output buffer size, zero means default */
 
-static char *getHomeDir();
+static char *getHomeDir(char *);
 
 /* ---Private Functions--- */
 
 static int
-TmpErrorHandler(dpy, err)
-     Display *dpy;
-     XErrorEvent *err;
+TmpErrorHandler(
+     Display *dpy,
+     XErrorEvent *err)
 {
   gXDPSNXErrorCode = err->error_code;
+  return 0;
 }
 
 
 static int
-GetProperty(dpy, w, prop, type, nitems, data)
-     Display *dpy;
-     Window w;
-     Atom prop;
-     Atom type;
-     int *nitems;		/* IN: if non-null then RETURN val */
-     char **data;		/* RETURN */
+GetProperty(
+     Display *dpy,
+     Window w,
+     Atom prop,
+     Atom type,
+     unsigned long *nitems,	/* IN: if non-null then RETURN val */
+     char **data)		/* RETURN */
 {
   long largest_len = ((((unsigned long) -1) >> 1) / 4);
   Atom actual_type;
@@ -135,15 +139,15 @@
   dpy (ie. it assumes that the caller has done an XGrabServer).
   */
 static AgentIdList
-GetAgentIdList(dpy, nAgents)
-     Display *dpy;
-     unsigned long *nAgents;	/* RETURN: number of agents in list */
+GetAgentIdList(
+     Display *dpy,
+     unsigned long *nAgents)	/* RETURN: number of agents in list */
 {
   Atom serverListAtom = XInternAtom(dpy, XDPSNX_BILLBOARD_PROP, True);
   Window  *agents = NULL;
   AgentIdList agentList = NULL;
-  int (*oldErrorHandler)() = (int (*)())NULL; /* the current error handler */
-  int i, current;
+  int (*oldErrorHandler)(Display *, XErrorEvent *) = 0; /* the current error handler */
+  unsigned long i, current;
 
   if (serverListAtom == None) { /* Servers registered on dpy */
     goto failed;
@@ -167,7 +171,7 @@
   for (i=0; i < *nAgents; i++) {
     unsigned long len;
     int *agentWillingness;
-    int k;
+    unsigned long k;
 
     for (k=0; k < i; k++) /* Search for duplicate ids */
       if (agents[i] == agents[k]) { /* uh oh... */
@@ -184,7 +188,7 @@
 	agents[i] = None;
 	gXDPSNXErrorCode = None;
       } else {
-	int j = 0;
+	unsigned long j = 0;
 	
 	/* insert the agents into agentList in "most to least willing" order */
 	while ((j < current) && (agentList[j].willingness > *agentWillingness))
@@ -227,17 +231,17 @@
 
 
 static int
-XDPSNXOnDisplay(dpy, licenseMethod, host, transport, port)
-     Display *dpy;
-     char *licenseMethod;
-     char **host;
-     int *transport;
-     int *port;
+XDPSNXOnDisplay(
+     Display *dpy,
+     char *licenseMethod,
+     char **host,
+     int *transport,
+     int *port)
 {
-  int nAgents = 0;
+  unsigned long nAgents = 0;
   AgentIdList agentList = NULL;
   Bool match = False;
-  int i = 0;
+  unsigned long i = 0;
   int status = !Success;
 
 #ifdef DPSLNKL
@@ -282,7 +286,7 @@
 	Atom *licenseMethods = NULL;
 	unsigned long nMethods;
 	unsigned long remaining;
-	int j;
+	unsigned long j;
 	
 	if (GetProperty(dpy, agentList[i].id,
 			XInternAtom(dpy, XDPSNX_LICENSE_METHOD_PROP, True),
@@ -349,11 +353,11 @@
 
 
 static int
-ParseAgentString(string, hostname, transport, port)
-     char *string;
-     char **hostname;		/* RETURN */
-     int *transport;		/* RETURN */
-     int *port;			/* RETURN */
+ParseAgentString(
+     char *string,
+     char **hostname,		/* RETURN */
+     int *transport,		/* RETURN */
+     int *port)			/* RETURN */
 {
   int dnet = 0;
   Bool transportSpecified = False;
@@ -409,23 +413,23 @@
     /* identify protocol */
     if (dnet)
       *transport = XDPSNX_TRANS_DECNET;
-    else if (transportSpecified)
+    else if (transportSpecified) {
       if (strcmp(namebuf, "unix") == 0)
         *transport = XDPSNX_TRANS_UNIX;
       else 			/* assume tcp */
         *transport = XDPSNX_TRANS_TCP;
-    else 
+    } else 
       *transport = XDPSNX_TRANS_TCP;
   }
   return(Success);
 }
 
 static int
-FindXDPSNXInXrmDatabase(dpy, host, transport, port)
-     Display *dpy;
-     char **host;
-     int *transport;
-     int *port;
+FindXDPSNXInXrmDatabase(
+     Display *dpy,
+     char **host,
+     int *transport,
+     int *port)
 {
   XrmDatabase rDB = NULL;	/* for merged database */
   XrmDatabase serverDB, applicationDB;
@@ -476,8 +480,7 @@
 
 
 static char *
-getHomeDir(dest)
-     char *dest;
+getHomeDir(char *dest)
 {
   register char *ptr;
 
@@ -507,12 +510,12 @@
 int gForceLaunchHack = 0;   /* Undocumented way to force autolaunch */
 
 XDPSNXFindNXResult
-XDPSNXFindNX(dpy, licenseMethod, host, transport, port)
-     Display *dpy;
-     char *licenseMethod;
-     char **host;
-     int *transport;
-     int *port;
+XDPSNXFindNX(
+     Display *dpy,
+     char *licenseMethod,
+     char **host,
+     int *transport,
+     int *port)
 {
   char *agentenv;
   
@@ -545,9 +548,7 @@
 
 
 Status
-XDPSNXSetClientArg(arg, value)
-     int arg;
-     void *value;
+XDPSNXSetClientArg(int arg, void *value)
 {
   Display *dpy;
   
@@ -616,9 +617,7 @@
 
 
 void
-XDPSGetNXArg(arg, value)
-     int arg;
-     void **value;
+XDPSGetNXArg(int arg, void **value)
 {
   static char agentBuffer[255];
   
Index: xc/lib/dps/csfindNX.h
diff -u xc/lib/dps/csfindNX.h:1.1 xc/lib/dps/csfindNX.h:1.2
--- xc/lib/dps/csfindNX.h:1.1	Sat Feb 12 16:12:53 2000
+++ xc/lib/dps/csfindNX.h	Thu May 18 16:46:12 2000
@@ -44,13 +44,6 @@
 
 #define XDPSNX_DEFAULT_EXEC_NAME "dpsnx.agent"
 
-
-#ifndef _NO_PROTO
-#define ARGS(list) list
-#else
-#define ARGS(list) ()
-#endif
-
 /* ---TYPES--- */
 
 typedef enum {
@@ -63,12 +56,12 @@
 /* ---Functions--- */
 
 extern XDPSNXFindNXResult
-XDPSNXFindNX ARGS((
+XDPSNXFindNX (
 		   Display *dpy, /* Display client wants to attach to */
 		   char *licenseMethod,     /* license method client speaks */
 		   char **host,	           /* RETURN: Agent host name */
 		   int *transport,         /* RETURN: Agent transport */
-		   int *port));	           /* RETURN: Agent's port    */
+		   int *port);	           /* RETURN: Agent's port    */
      /*
       * Find an agent for this client that will service display dpy.
       * The licenseMethod arg. specifies the type of licensing that the client
@@ -83,9 +76,9 @@
 
 
 extern void
-XDPSGetNXArg ARGS((
+XDPSGetNXArg (
 		   int arg,	        /* Argument to be retrieved */
-		   void **value));	   /* value of the argument */
+		   void **value);	   /* value of the argument */
      /*
        Gets the value of the given argument.  Returns the value in val.  If the
        value will fit in val (ie, a Bool) then the value is placed there,
Index: xc/lib/dps/cslibext.c
diff -u xc/lib/dps/cslibext.c:1.1 xc/lib/dps/cslibext.c:1.2
--- xc/lib/dps/cslibext.c:1.1	Sat Feb 12 16:12:54 2000
+++ xc/lib/dps/cslibext.c	Thu May 18 16:46:12 2000
@@ -1,9 +1,9 @@
 /*
  *  cslibext.c -- DPSCAP client Xlib extension hookup
- *		 
+ *
  * (c) Copyright 1991-1994 Adobe Systems Incorporated.
  * All rights reserved.
- * 
+ *
  * Permission to use, copy, modify, distribute, and sublicense this software
  * and its documentation for any purpose and without fee is hereby granted,
  * provided that the above copyright notices appear in all copies and that
@@ -18,7 +18,7 @@
  * PostScript system.  Proper trademark attribution to reflect Adobe's
  * ownership of the trademark shall be given whenever any such reference to
  * the Display PostScript system is made.
- * 
+ *
  * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
  * ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
  * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
@@ -29,10 +29,10 @@
  * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT
  * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
- * 
+ *
  * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
  * Incorporated which may be registered in certain jurisdictions
- * 
+ *
  * Author:  Adobe Systems Incorporated
  */
 
@@ -52,6 +52,9 @@
 #include "dpsassert.h"
 #include <DPS/XDPSlib.h>
 
+#include "publictypes.h"
+#include "dpsXpriv.h"
+
 /* === DEFINES === */
 
 #define DPSNXSYNCGCMODE_FLUSH	0
@@ -76,11 +79,21 @@
 
 /* === PUBLIC PROCS === */
 
+#ifdef MAHALO
+static int
+DPSCAPFlushAfterProc(Display *agent)
+{
+    LockDisplay(agent);
+    N_XFlush(agent);
+    UnlockDisplay(agent);
+}
+#endif
+
 int
-CSDPSInit(dpy, numberType, floatingName)
-    Display *dpy;
-    int *numberType;		/* RETURN */
-    char **floatingName;	/* RETURN */
+CSDPSInit(
+    Display *dpy,
+    int *numberType,		/* RETURN */
+    char **floatingName)	/* RETURN */
 {
     register Display *agent;
     register xCAPConnReplyPrefix *p;
@@ -97,21 +110,19 @@
     int rest;
     Window clientWindow;
     char fullDisplayName[MAXHOSTNAMELEN+10];
-    int DPSCAPCopyGCProc(), DPSCAPFreeGCProc(), DPSCAPFlushGCProc();
-    extern char * getenv();
-    
+
     if (gCSDPS == NULL)
         DPSCAPStartUp();
-	
+
     /* To fix dps-nx #68, Motif too slow on HP */
-    if (c = getenv("DPSNXGCMODE"))
+    if ((c = getenv("DPSNXGCMODE")) != 0)
         {
 	gNXSyncGCMode = atoi(c);
 	if (gNXSyncGCMode < DPSNXSYNCGCMODE_FLUSH
 	  || gNXSyncGCMode > DPSNXSYNCGCMODE_DELAYED)
 	    gNXSyncGCMode = DPSNXSYNCGCMODE_DEFAULT;
 	}
-	
+
     /* We may have already called this routine via XDPSExtensionPresent,
        so don't do it again! */
 
@@ -120,7 +131,7 @@
         && agent != dpy
 	&& codes->major_opcode == DPSXOPCODEBASE)
         return(DPSCAPSUCCESS);
-    
+
     /* Try to create a window for ClientMessage communication */
 
     clientWindow = XCreateSimpleWindow(
@@ -133,7 +144,7 @@
       WhitePixel(dpy, DefaultScreen(dpy)));
     if (clientWindow == None)
         return(DPSCAPFAILED);
-        
+
     /* Try to open a connection to an agent */
 
     if ((extData = DPSCAPOpenAgent(dpy, fullDisplayName)) == NULL)
@@ -141,7 +152,7 @@
         XDestroyWindow(dpy, clientWindow);
         return(DPSCAPFAILED);
         }
-        
+
     /* DPSCAPOpenAgent only partially fills in extData, so finish it */
 
     codes = XAddExtension(dpy);
@@ -154,7 +165,7 @@
     my->codes = codes;
     agent = my->agent;
     /* +++ Is this all we have to do here? */
-    
+
     /* Send opening handshake */
 
     indian = 1;
@@ -174,7 +185,7 @@
     setup.screen = 0;
     setup.reserved = 0;
     setup.clientWindow = clientWindow;
-    
+
 #ifndef DPSLNKL
     DPSCAPWrite(agent, (char *)&setup, sizeof(xCAPConnSetupReq), dpscap_nopad,dpscap_insert);
     DPSCAPWrite(agent, fullDisplayName, setup.displayStringLength, dpscap_pad, dpscap_append);
@@ -192,7 +203,7 @@
 
     p = (xCAPConnReplyPrefix *)&reply.good;
     N_XRead(agent, (char *)p, (long)sizeof(xCAPConnReplyPrefix));
-skip_read:    
+skip_read:
     if (!p->success)
         {
 	char mbuf[512];
@@ -219,19 +230,19 @@
         XDestroyWindow(dpy, clientWindow);
         return(DPSCAPFAILED);
         }
-    
+
     /* read the rest of the fixed length reply */
     c = (char *)&reply.good.serverVersion;
     rest = sizeof(xCAPConnSuccess) - sizeof(xCAPConnReplyPrefix);
     N_XRead(agent, c, rest);
-    
+
     /* verify */
-    
+
     if (reply.good.serverVersion < DPSPROTOCOLVERSION)
         {
 	/* Fine, we downgrade the client */
 	char qbuf[256];
-	sprintf(qbuf, "NX: server version %d older than expected %d, client will downgrade", reply.good.serverVersion, DPSPROTOCOLVERSION);
+	sprintf(qbuf, "NX: server version %ld older than expected %d, client will downgrade", reply.good.serverVersion, DPSPROTOCOLVERSION);
 	DPSWarnProc(NULL, qbuf);
 	}
     my->dpscapVersion = reply.good.dpscapVersion;
@@ -250,12 +261,12 @@
         return(DPSCAPFAILED);
 #endif
 	}
-        
+
     if (numberType)
         *numberType = reply.good.preferredNumberFormat;
-    
+
     /* read additional data */
-    
+
     c = (char *)Xmalloc(reply.good.floatingNameLength + 1);
     N_XReadPad(agent, c, reply.good.floatingNameLength);
     c[reply.good.floatingNameLength] = 0;
@@ -265,7 +276,7 @@
 	Xfree(c);
 
     /* set library extension data */
-    
+
     XDPSLSetVersion(agent, reply.good.serverVersion);
     XDPSLSetVersion(dpy, reply.good.serverVersion);
     XDPSLSetShunt(dpy, agent);
@@ -284,22 +295,18 @@
     (void) XESetFreeGC(dpy, codes->extension, DPSCAPFreeGCProc);
     (void) XESetFlushGC(dpy, codes->extension, DPSCAPFlushGCProc);
     XDPSLSetClientMessageHandler(dpy);
-    
+
     /* Chain my data on global list */
-    
+
     my->next = gCSDPS->head;
     gCSDPS->head = my;
-    
+
 #ifdef MAHALO
     /* Set function that is called after every Xlib protocol proc */
     XDPSLSetAfterProc(dpy);
 
     /* All CSDPS protocol is auto-flushed */
-    {
-    static int DPSCAPFlushAfterProc();
-    
     (void) XSetAfterFunction(agent, DPSCAPFlushAfterProc);
-    }
 #endif /* MAHALO */
 
     /* set agent arguments, if needed */
@@ -312,8 +319,8 @@
 
 
 XExtData **
-CSDPSHeadOfDpyExt(dpy)
-   Display *dpy;
+CSDPSHeadOfDpyExt(
+   Display *dpy)
 {
    XEDataObject object;
 
@@ -322,9 +329,9 @@
 }
 
 void
-XDPSSyncGCClip(dpy, gc)
-    register Display *dpy;
-    register GC gc;
+XDPSSyncGCClip(
+    register Display *dpy,
+    register GC gc)
 {
     /* The primary utility of this function is for DPS NX correctness,
        but it also helps DPS/X do less work in tracking GC changes. */
@@ -332,13 +339,13 @@
 }
 
 void
-XDPSReconcileRequests(ctxt)
-    register DPSContext ctxt;
+XDPSReconcileRequests(
+    register DPSContext ctxt)
 {
     Display *dpy;
     register ContextXID cxid;
     register DPSContext curCtxt;
-    
+
     for (curCtxt = ctxt; curCtxt; curCtxt = curCtxt->chainChild)
         {
 	cxid = XDPSXIDFromContext(&dpy, curCtxt);
@@ -349,9 +356,9 @@
 }
 
 Status
-XDPSNXSetAgentArg(dpy, arg, val)
-    Display *dpy;
-    int arg, val;
+XDPSNXSetAgentArg(
+    Display *dpy,
+    int arg, int val)
 {
     if (!dpy || arg >= 0 || arg < AGENTLASTARG)
         return(!Success);
@@ -361,9 +368,9 @@
 
 /* New for DPS NX 2.0 */
 void
-XDPSFlushGC(dpy, gc)
-    Display *dpy;
-    GC gc;
+XDPSFlushGC(
+    Display *dpy,
+    GC gc)
 {
     if (dpy && gc)
         XDPSLFlushGC(dpy, gc);
@@ -372,11 +379,11 @@
 /* === SUPPORT PROCS === */
 
 void
-DPSCAPChangeGC(agent, gc, valuemask, values)
-    register Display *agent;
-    GC gc;
-    unsigned long valuemask;
-    XGCValues *values;
+DPSCAPChangeGC(
+    register Display *agent,
+    GC gc,
+    unsigned long valuemask,
+    XGCValues *values)
 {
     register xChangeGCReq *req;
     register _XExtension *ext;
@@ -389,7 +396,7 @@
     /* +++ HACK!  Hide the gc->rects flag in arc_mode */
     valuemask |= GCArcMode;
     valuemask &= (1L << (GCLastBit + 1)) - 1;
-    
+
     /* Stupid macro insists on Display being called 'dpy' */
     {
     Display *dpy = agent;
@@ -414,17 +421,17 @@
 without express or implied warranty.
 */
     /* Warning!  This code assumes that "unsigned int" is 32-bits wide */
- 
+
     unsigned int vals[32];
     register unsigned int *value = vals;
     long nvalues;
     register XGCValues *gv = values;
     register unsigned long dirty = gc->dirty;
- 
+
     /*
      * Note: The order of these tests are critical; the order must be the
      * same as the GC mask bits in the word.
-     */  
+     */
     if (dirty & GCFunction)          *value++ = gv->function;
     if (dirty & GCPlaneMask)         *value++ = gv->plane_mask;
     if (dirty & GCForeground)        *value++ = gv->foreground;
@@ -449,19 +456,19 @@
     if (dirty & GCDashList)          *value++ = gv->dashes;
     /* +++ HACK!  Hide gc->rects flag in GCArcMode */
     if (dirty & GCArcMode)           *value++ = gc->rects;
-    
+
     req->length += (nvalues = value - vals);
- 
+
     /*
      * note: Data is a macro that uses its arguments multiple
      * times, so "nvalues" is changed in a separate assignment
      * statement
      */
- 
+
     nvalues <<= 2;
     Data32 (agent, (long *) vals, nvalues);
     }
-      
+
     gc->dirty = oldDirty;
 
     /* ASSERT: SyncHandle called by caller */
@@ -469,11 +476,11 @@
 
 
 DPSCAPData
-DPSCAPCreate(dpy, agent)
-    Display *dpy, *agent;
+DPSCAPCreate(
+    Display *dpy, Display *agent)
 {
     register DPSCAPData my = (DPSCAPData)Xcalloc(1, sizeof(DPSCAPDataRec));
-    
+
     if (my == (DPSCAPData)NULL) return(NULL);
     my->dpy = dpy;
     my->agent = agent;
@@ -513,8 +520,8 @@
 }
 
 int
-DPSCAPDestroy(extData)
-    XExtData *extData;
+DPSCAPDestroy(
+    XExtData *extData)
 {
     register DPSCAPData my = (DPSCAPData) extData->private_data;
     register DPSCAPData n;
@@ -537,7 +544,7 @@
 }
 
 void
-DPSCAPStartUp()
+DPSCAPStartUp(void)
 {
     gCSDPS = (DPSCAPGlobals)Xcalloc(1, sizeof(DPSCAPGlobalsRec));
 }
@@ -546,16 +553,16 @@
 static unsigned char padAdd[] = {0, 3, 2, 1};
 
 void
-DPSCAPWrite(agent, buf, len, writePad, bufMode)
-    register Display *agent;
-    char *buf;
-    register unsigned len;
-    register DPSCAPIOFlags writePad;
-    DPSCAPIOFlags bufMode;
+DPSCAPWrite(
+    Display *agent,
+    char *buf,
+    unsigned len,
+    DPSCAPIOFlags writePad,
+    DPSCAPIOFlags bufMode)
 {
     int pad = padAdd[len & 3];
     unsigned fullLen = (writePad == dpscap_pad) ? len + pad  : len;
-    
+
     if (agent->bufptr + fullLen > agent->bufmax)
         N_XFlush(agent);
     if (agent->max_request_size && fullLen > agent->max_request_size)
@@ -582,9 +589,9 @@
 /* === EXT CALLBACK HOOKS === */
 
 int
-DPSCAPCloseDisplayProc(dpy, codes)
-    Display *dpy;
-    XExtCodes *codes;
+DPSCAPCloseDisplayProc(
+    Display *dpy,
+    XExtCodes *codes)
 {
 #ifdef CSDPS
     fprintf(stderr, "NX: Closing agent \"%s\"\n", dpy->display_name);
@@ -603,10 +610,10 @@
 
 
 int
-DPSCAPCopyGCProc(dpy, gc, codes)
-    Display *dpy;
-    GC gc;
-    XExtCodes *codes;
+DPSCAPCopyGCProc(
+    Display *dpy,
+    GC gc,
+    XExtCodes *codes)
 {
     XGCValues values;
     DPSCAPData my;
@@ -621,7 +628,7 @@
 
     /* We change the GC unconditionally, since friggin' XCopyGC
        clears the dirty bits of the values that are copied! */
-       
+
     DPSAssertWarn(XGetGCValues(dpy, gc, DPSGCBITS & ~(GCClipMask), &values),
 	NULL, "DPS NX: XGetGCValues returned False\n");
     values.clip_mask = gc->values.clip_mask;
@@ -636,10 +643,10 @@
 }
 
 int
-DPSCAPFreeGCProc(pdpy, gc, codes)
-    Display *pdpy;
-    GC gc;
-    XExtCodes *codes;
+DPSCAPFreeGCProc(
+    Display *pdpy,
+    GC gc,
+    XExtCodes *codes)
 {
     register xCAPNotifyReq *req;
     DPSCAPData my;
@@ -647,21 +654,21 @@
     XExtData *extData = XFindOnExtensionList(
       CSDPSHeadOfDpyExt(dpy),
       codes->extension);
-    
+
     if (extData)
         my = (DPSCAPData) extData->private_data;
     else
         return(0);
-        
+
     /* Notify the agent that the client deleted a GC.  Let the
        agent figure out if it cares. */
-       
+
     /* ASSERT: called from within LockDisplay section */
-    
+
     dpy = my->agent;
     if (dpy == (Display *)NULL || dpy == pdpy)
         return(0);
-	
+
     /* May need to sync changes to GC */
     if (gNXSyncGCMode == DPSNXSYNCGCMODE_DELAYED)
         XDPSLSync(pdpy);
@@ -686,7 +693,7 @@
 	}
     else
         XDPSLSync(pdpy);
-    
+
     /* ASSERT: SynchHandle called by caller */
     return(1);
 }
@@ -697,16 +704,16 @@
 #endif /* CSDPSDEBUG */
 
 int
-DPSCAPFlushGCProc(dpy, gc, codes)
-    Display *dpy;
-    GC gc;
-    XExtCodes *codes;
+DPSCAPFlushGCProc(
+    Display *dpy,
+    GC gc,
+    XExtCodes *codes)
 {
     XGCValues values;
     DPSCAPData my;
     XExtData *extData;
     unsigned long int dirty;
-    
+
     /* When GC is created, it is flushed with no dirty bits set,
        so we have to notice that situation. */
 
@@ -746,14 +753,4 @@
         ++gcCountFlushedClean;
 #endif /* CSDPSDEBUG */
     return(1);
-}
-
-
-static int
-DPSCAPFlushAfterProc(agent)
-    Display *agent;
-{
-    LockDisplay(agent);
-    N_XFlush(agent);
-    UnlockDisplay(agent);
 }
Index: xc/lib/dps/cslibint.c
diff -u xc/lib/dps/cslibint.c:1.3 xc/lib/dps/cslibint.c:1.4
--- xc/lib/dps/cslibint.c:1.3	Mon Feb 21 10:05:34 2000
+++ xc/lib/dps/cslibint.c	Thu May 18 16:46:12 2000
@@ -47,7 +47,7 @@
  *  
  * Author:  Adobe Systems Incorporated and MIT X Consortium
  */
-/* $XFree86: xc/lib/dps/cslibint.c,v 1.3 2000/02/21 18:05:34 dawes Exp $ */
+/* $XFree86: xc/lib/dps/cslibint.c,v 1.4 2000/05/18 23:46:12 dawes Exp $ */
 
 /*
  *	XlibInternal.c - Internal support routines for the C subroutine
@@ -61,8 +61,11 @@
 #include "Xlibnet.h"
 #include <stdio.h>
 
-static void _EatData32();
+#include "dpsassert.h"
+#include "cslibint.h"
 
+static void _EatData32 (Display *dpy, unsigned long n);
+
 /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
  * systems are broken and return EWOULDBLOCK when they should return EAGAIN
  */
@@ -119,16 +122,15 @@
  * action is taken.  This routine correctly handles incremental writes.
  * This routine may have to be reworked if int < long.
  */
-N_XFlush (dpy)
-	register Display *dpy;
+void N_XFlush (Display *dpy)
 {
 	register long size, todo;
 	register int write_stat;
 	register char *bufindex;
 	
-	if (!dpy) return 0;
+	if (!dpy) return;
 
-	if (dpy->flags & XlibDisplayIOError) return 0;
+	if (dpy->flags & XlibDisplayIOError) return;
 
 	size = todo = dpy->bufptr - dpy->buffer;
 	bufindex = dpy->bufptr = dpy->buffer;
@@ -164,15 +166,12 @@
 	    }
 	}
 	dpy->last_req = (char *)&_dummy_request;
-	return 0;
 }
 
 #ifdef NEEDFORNX
 
 int
-_XEventsQueued (dpy, mode)
-    register Display *dpy;
-    int mode;
+_XEventsQueued (Display *dpy, int mode)
 {
 	register int len;
 	int pend;
@@ -248,8 +247,7 @@
 /* _XReadEvents - Flush the output queue,
  * then read as many events as possible (but at least 1) and enqueue them
  */
-_XReadEvents(dpy)
-	register Display *dpy;
+void _XReadEvents(Display *dpy)
 {
 	char buf[BUFSIZE];
 	long pend_not_register; /* because can't "&" a register variable */
@@ -303,10 +301,7 @@
  * N_XRead - Read bytes from the socket taking into account incomplete
  * reads.  This routine may have to be reworked if int < long.
  */
-N_XRead (dpy, data, size)
-	register Display *dpy;
-	register char *data;
-	register long size;
+int N_XRead (Display *dpy, char *data, long size)
 {
 	register long bytes_read;
 
@@ -359,11 +354,7 @@
  *            into a long (64 bits on a CRAY computer).
  * 
  */
-static _doXRead32 (dpy, data, size, packbuffer)
-        register Display *dpy;
-        register long *data;
-        register long size;
-	register char *packbuffer;
+static void _doXRead32 (Display *dpy, long *data, long size, char *packbuffer)
 {
  long *lpack,*lp;
  long mask32 = 0x00000000ffffffff;
@@ -386,10 +377,7 @@
         }
 }
 
-_XRead32 (dpy, data, len)
-    Display *dpy;
-    long *data;
-    long len;
+void _XRead32 (Display *dpy, long *data, long len)
 {
     char packbuffer[PACKBUFFERSIZE];
     unsigned nunits = PACKBUFFERSIZE >> 2;
@@ -407,11 +395,7 @@
  *            into a long (64 bits on a CRAY computer).
  *
  */
-static _doXRead16 (dpy, data, size, packbuffer)
-        register Display *dpy;
-        register short *data;
-        register long size;
-	char *packbuffer;
+static void _doXRead16 (Display *dpy, short *data, long size, char *packbuffer)
 {
 	long *lpack,*lp;
 	long mask16 = 0x000000000000ffff;
@@ -434,10 +418,7 @@
         }
 }
 
-_XRead16 (dpy, data, len)
-    Display *dpy;
-    short *data;
-    long len;
+void _XRead16 (Display *dpy, short *data, long len)
 {
     char packbuffer[PACKBUFFERSIZE];
     unsigned nunits = PACKBUFFERSIZE >> 1;
@@ -448,10 +429,7 @@
     if (len) _doXRead16 (dpy, data, len, packbuffer);
 }
 
-_XRead16Pad (dpy, data, size)
-    Display *dpy;
-    short *data;
-    long size;
+void _XRead16Pad (Display *dpy, short *data, long size)
 {
     int slop = (size & 3);
     short slopbuf[3];
@@ -469,17 +447,14 @@
  * reads.  If the number of bytes is not 0 mod 32, read additional pad
  * bytes. This routine may have to be reworked if int < long.
  */
-N_XReadPad (dpy, data, size)
-    	register Display *dpy;	
-	register char *data;
-	register long size;
+void N_XReadPad (Display *dpy, char *data, long size)
 {
     	register long bytes_read;
 	struct iovec iov[2];
 	char pad[3];
 
-        if (!dpy) return 0;
-	if ((dpy->flags & XlibDisplayIOError) || size == 0) return 0;
+        if (!dpy) return;
+	if ((dpy->flags & XlibDisplayIOError) || size == 0) return;
 	iov[0].iov_len = (int)size;
 	iov[0].iov_base = data;
 	/* 
@@ -525,7 +500,6 @@
 		    _XIOError(dpy);
 		}
 	    }
-	return 0;
 }
 
 /*
@@ -533,10 +507,7 @@
  * transmission is used, if size is not 0 mod 4, extra bytes are transmitted.
  * This routine may have to be reworked if int < long;
  */
-N_XSend (dpy, data, size)
-	register Display *dpy;
-	char *data;
-	register long size;
+void N_XSend (Display *dpy, _Xconst char *data, long size)
 {
 	struct iovec iov[3];
 	static char pad[3] = {0, 0, 0};
@@ -548,7 +519,7 @@
 	long total = dpybufsize + size + padsize;
 	long todo = total;
 
-	if (dpy->flags & XlibDisplayIOError) return 0;
+	if (dpy->flags & XlibDisplayIOError) return;
 
 	/*
 	 * There are 3 pieces that may need to be written out:
@@ -594,7 +565,7 @@
 	    }
 
 	    InsertIOV (dpy->buffer, dpybufsize)
-	    InsertIOV (data, size)
+	    InsertIOV ((char *)data, size)
 	    InsertIOV (pad, padsize)
     
 	    errno = 0;
@@ -622,7 +593,7 @@
 
 	dpy->bufptr = dpy->buffer;
 	dpy->last_req = (char *) & _dummy_request;
-	return 0;
+	return;
 }
 
 #ifdef NEEDFORNX
@@ -631,8 +602,7 @@
  * can roll his own and instatantiate it if he wants, but must
  * follow the rules.
  */
-XID _XAllocID(dpy)
-register Display *dpy;
+XID _XAllocID(Display *dpy)
 {
    XID id;
 
@@ -660,9 +630,7 @@
  */
 
 unsigned long
-_XSetLastRequestRead(dpy, rep)
-    register Display *dpy;
-    register xGenericReply *rep;
+_XSetLastRequestRead(Display *dpy, xGenericReply *rep)
 {
     register unsigned long	newseq, lastseq;
 
@@ -700,11 +668,11 @@
  * specified rep.  Mean while we must handle error and event packets that
  * we may encounter.
  */
-Status N_XReply (dpy, rep, extra, discard)
-    register Display *dpy;
-    register xReply *rep;
-    int extra;		/* number of 32-bit words expected after the reply */
-    Bool discard;	/* should I discard data following "extra" words? */
+Status N_XReply (
+    Display *dpy,
+    xReply *rep,
+    int extra,		/* number of 32-bit words expected after the reply */
+    Bool discard)	/* should I discard data following "extra" words? */
 {
     /* Pull out the serial number now, so that (currently illegal) requests
      * generated by an error handler don't confuse us.
@@ -732,7 +700,7 @@
 		       _EatData32 (dpy, rep->generic.length);
 		    return (1);
 		    }
-		if (extra == rep->generic.length) {
+		if ((unsigned) extra == rep->generic.length) {
 		    /* 
 		     * Read the extra data into storage immediately following
 		     * the GenericReply structure. 
@@ -741,7 +709,7 @@
 			    ((long)extra) << 2);
 		    return (1);
 		    }
-		if (extra < rep->generic.length) {
+		if ((unsigned) extra < rep->generic.length) {
 		    /* Actual reply is longer than "extra" */
 		    N_XRead (dpy, (char *) (NEXTPTR(rep,xReply)),
 			    ((long)extra) << 2);
@@ -796,9 +764,7 @@
 /* Read and discard "n" 8-bit bytes of data */
 
 static void
-N_XEatData (dpy, n)
-    Display *dpy;
-    register unsigned long n;
+N_XEatData (Display *dpy, unsigned long n)
 {
 #define SCRATCHSIZE 2048
     char buf[SCRATCHSIZE];
@@ -814,9 +780,7 @@
 
 /* Read and discard "n" 32-bit words. */
 
-static void _EatData32 (dpy, n)
-    Display *dpy;
-    unsigned long n;
+static void _EatData32 (Display *dpy, unsigned long n)
 {
     N_XEatData (dpy, n << 2);
 }
@@ -828,9 +792,7 @@
  * note that no squishing of move events in V11, since there
  * is pointer motion hints....
  */
-_XEnq (dpy, event)
-	register Display *dpy;
-	register xEvent *event;
+void _XEnq (Display *dpy, xEvent *event)
 {
 	register _XQEvent *qelt;
 
@@ -866,28 +828,28 @@
 
 /*ARGSUSED*/
 Bool
-N_XUnknownWireEvent(dpy, re, event)
-register Display *dpy;	/* pointer to display structure */
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
+N_XUnknownWireEvent(
+	Display *dpy,	/* pointer to display structure */
+	XEvent *re,	/* pointer to where event should be reformatted */
+	xEvent *event)	/* wire protocol event */
 {
         char mbuf[256];
 	
-	sprintf(mbuf, "NX: unhandled wire event %d, agent = %x", re->type, dpy);
+	sprintf(mbuf, "NX: unhandled wire event %d, agent = %lx", re->type, (long)dpy);
 	DPSWarnProc(NULL, mbuf);
 	return(False);
 }
 
 /*ARGSUSED*/
 Status
-N_XUnknownNativeEvent(dpy, re, event)
-register Display *dpy;	/* pointer to display structure */
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
+N_XUnknownNativeEvent(
+	Display *dpy,	/* pointer to display structure */
+	XEvent *re,	/* pointer to where event should be reformatted */
+	xEvent *event)	/* wire protocol event */
 {
         char mbuf[256];
 	
-	sprintf(mbuf, "NX: unhandled native event %d, agent = %x", re->type, dpy);
+	sprintf(mbuf, "NX: unhandled native event %d, agent = %lx", re->type, (long)dpy);
 	DPSWarnProc(NULL, mbuf);
 	return(0);
 }
@@ -897,10 +859,10 @@
  * reformat a wire event into an XEvent structure of the right type.
  */
 Bool
-_XWireToEvent(dpy, re, event)
-register Display *dpy;	/* pointer to display structure */
-register XEvent *re;	/* pointer to where event should be reformatted */
-register xEvent *event;	/* wire protocol event */
+_XWireToEvent(
+	Display *dpy,	/* pointer to display structure */
+	XEvent *re,	/* pointer to where event should be reformatted */
+	xEvent *event)	/* wire protocol event */
 {
 
 	re->type = event->u.u.type & 0x7f;
@@ -1269,8 +1231,7 @@
 
 #ifndef USL_SHARELIB
 
-static char *_SysErrorMsg (n)
-    int n;
+static char *_SysErrorMsg (int n)
 {
     extern char *sys_errlist[];
     extern int sys_nerr;
@@ -1286,8 +1247,7 @@
  * _XDefaultIOError - Default fatal system error reporting routine.  Called 
  * when an X internal system error is encountered.
  */
-_XDefaultIOError (dpy)
-	Display *dpy;
+_XDefaultIOError (Display *dpy)
 {
 	(void) fprintf (stderr, 
 	 "XIO:  fatal IO error %d (%s) on X server \"%s\"\r\n",
@@ -1305,10 +1265,7 @@
 }
 
 
-static int _XPrintDefaultError (dpy, event, fp)
-    Display *dpy;
-    XErrorEvent *event;
-    FILE *fp;
+static int _XPrintDefaultError (Display *dpy, XErrorEvent *event, FILE *fp)
 {
     char buffer[BUFSIZ];
     char mesg[BUFSIZ];
@@ -1416,9 +1373,7 @@
     return 1;
 }
 
-int _XDefaultError(dpy, event)
-	Display *dpy;
-	XErrorEvent *event;
+int _XDefaultError(Display *dpy, XErrorEvent *event)
 {
     if (_XPrintDefaultError (dpy, event, stderr) == 0) return 0;
     exit(1);
@@ -1426,10 +1381,7 @@
 }
 
 /*ARGSUSED*/
-Bool _XDefaultWireError(display, he, we)
-    Display     *display;
-    XErrorEvent *he;
-    xError      *we;
+Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we)
 {
     return True;
 }
@@ -1437,9 +1389,7 @@
 /*
  * _XError - prepare to upcall user protocol error handler
  */
-int _XError (dpy, rep)
-    Display *dpy;
-    xError *rep;
+int _XError (Display *dpy, xError *rep)
 {
     /* 
      * X_Error packet encountered!  We need to unpack the error before
@@ -1467,8 +1417,7 @@
 /*
  * _XIOError - call user connection error handler and exit
  */
-int _XIOError (dpy)
-    Display *dpy;
+int _XIOError (Display *dpy)
 {
     dpy->flags |= XlibDisplayIOError;
     if (_XIOErrorFunction != NULL)
@@ -1484,9 +1433,7 @@
  * Xlib routine for scratch space.  It is reallocated from the same place
  * each time, unless the library needs a large scratch space.
  */
-char *_XAllocScratch (dpy, nbytes)
-	register Display *dpy;
-	unsigned long nbytes;
+char *_XAllocScratch (Display *dpy, unsigned long nbytes)
 {
 	if (nbytes > dpy->scratch_length) {
 	    if (dpy->scratch_buffer) Xfree (dpy->scratch_buffer);
@@ -1500,9 +1447,7 @@
 /*
  * Given a visual id, find the visual structure for this id on this display.
  */
-Visual *_XVIDtoVisual (dpy, id)
-	Display *dpy;
-	VisualID id;
+Visual *_XVIDtoVisual (Display *dpy, VisualID id)
 {
 	register int i, j, k;
 	register Screen *sp;
@@ -1522,20 +1467,13 @@
 	return (NULL);
 }
 
-#if NeedFunctionPrototypes
-XFree (void *data)
-#else
-XFree (data)
-	char *data;
-#endif
+void XFree (void *data)
 {
 	Xfree (data);
 }
 
 #ifdef _XNEEDBCOPYFUNC
-void _Xbcopy(b1, b2, length)
-    register char *b1, *b2;
-    register length;
+void _Xbcopy(char *b1, char *b2, length)
 {
     if (b1 < b2) {
 	b2 += length;
@@ -1551,10 +1489,7 @@
 
 #endif /* NEEDFORNX */
 
-void NXProcData (dpy, data, len)
-	Display *dpy;
-	char *data;
-	long len;
+void NXProcData (Display *dpy, char *data, long len)
 {
 	if (dpy->bufptr + (len) <= dpy->bufmax) {
 		bcopy(data, dpy->bufptr, (int)len);
@@ -1580,11 +1515,8 @@
  * "len" is the length in bytes of the data.
  */
 
-static doData16(dpy, data, len, packbuffer)
-    register Display *dpy;
-    short *data;
-    unsigned len;
-    char *packbuffer;
+static void
+doData16(Display *dpy, short *data, unsigned len, char *packbuffer)
 {
     long *lp,*lpack;
     long i, nwords,bits;
@@ -1613,10 +1545,8 @@
         Data(dpy, packbuffer, len);
 }
 
-Data16 (dpy, data, len)
-    Display *dpy;
-    short *data;
-    unsigned len;
+void
+Data16 (Display *dpy, short *data, unsigned len)
 {
     char packbuffer[PACKBUFFERSIZE];
     unsigned nunits = PACKBUFFERSIZE >> 1;
@@ -1635,11 +1565,7 @@
  * "len" is the length in bytes of the data.
  */
 
-static doData32 (dpy, data, len, packbuffer)
-    register Display *dpy;
-    long *data;
-    unsigned len;
-    char *packbuffer;
+static doData32 (Display *dpy, long *data, unsigned len, char *packbuffer)
 {
     long *lp,*lpack;
     long i,bits,nwords;
@@ -1666,10 +1592,7 @@
         Data(dpy, packbuffer, len);
 }
 
-Data32 (dpy, data, len)
-    Display *dpy;
-    long *data;
-    unsigned len;
+Data32 (Display *dpy, long *data, unsigned len)
 {
     char packbuffer[PACKBUFFERSIZE];
     unsigned nunits = PACKBUFFERSIZE >> 2;
@@ -1689,7 +1612,7 @@
  * _XFreeQ - free the queue of events, called by XCloseDisplay
  */
 
-void _XFreeQ ()
+void _XFreeQ (void)
 {
     register _XQEvent *qelt = _qfree;
   
@@ -1719,9 +1642,7 @@
 /*
  * N_XGetHostname - similar to gethostname but allows special processing.
  */
-int N_XGetHostname (buf, maxlen)
-    char *buf;
-    int maxlen;
+int N_XGetHostname (char *buf, int maxlen)
 {
     int len;
 
@@ -1747,9 +1668,7 @@
  * _XScreenOfWindow - get the Screen of a given window
  */
 
-Screen *_XScreenOfWindow (dpy, w)
-    Display *dpy;
-    Window w;
+Screen *_XScreenOfWindow (Display *dpy, Window w)
 {
     register int i;
     Window root;
@@ -1773,8 +1692,8 @@
 /*
  * This is a macro if MSKCNT <= 4
  */
-N_XANYSET(src)
-    long	*src;
+int
+N_XANYSET(unsigned long *src)
 {
     int i;
 
@@ -1792,10 +1711,7 @@
  */
 #include <sys/socket.h>
 
-int _XReadV (fd, iov, iovcnt)
-int fd;
-struct iovec *iov;
-int iovcnt;
+int _XReadV (int fd, struct iovec *iov, int iovcnt)
 {
 	struct msghdr hdr;
 
@@ -1809,10 +1725,7 @@
 	return (recvmsg (fd, &hdr, 0));
 }
 
-int _XWriteV (fd, iov, iovcnt)
-int fd;
-struct iovec *iov;
-int iovcnt;
+int _XWriteV (int fd, struct iovec *iov, int iovcnt)
 {
 	struct msghdr hdr;
 
@@ -1834,10 +1747,7 @@
  */
 #include <sys/uio.h>
 
-int _XReadV (fd, iov, iovcnt)
-int fd;
-struct iovec *iov;
-int iovcnt;
+int _XReadV (int fd, struct iovec *iov, int iovcnt)
 {
     int i, len, total;
     char *base;
@@ -1911,10 +1821,7 @@
 
 
 int
-_XReadV (fd, v, n)
-    int		fd;
-    struct iovec v[];
-    int		n;
+_XReadV (int fd, struct iovec v[], int n)
 {
 	int i, rc, len, size = 0;
 	char * buf = workarea;
@@ -1955,10 +1862,7 @@
 }
 
 int
-_XWriteV (fd, v, n)
-    int fd;
-    struct iovec v[];
-    int n;
+_XWriteV (int fd, struct iovec v[], int n)
 {
 	int i, rc, len, size = 0;
 	char * buf = workarea;
Index: xc/lib/dps/cslibint.h
diff -u xc/lib/dps/cslibint.h:1.1 xc/lib/dps/cslibint.h:1.2
--- xc/lib/dps/cslibint.h:1.1	Sat Feb 12 16:12:54 2000
+++ xc/lib/dps/cslibint.h	Thu May 18 16:46:13 2000
@@ -59,6 +59,9 @@
 #ifndef _CSLIBINT_H
 #define _CSLIBINT_H
 
+#include <X11/Xlibint.h>
+#include <X11/Xutil.h>
+
 /* For SYSV, no gethostname, so fake it */
 #include <sys/param.h>
 #ifndef MAXHOSTNAMELEN
@@ -263,29 +266,30 @@
 #define Data32(dpy, data, len) NXProcData((dpy), (char *)(data), (len))
 #endif /* not WORD64 */
 
+extern int gNXSyncGCMode;
 
 /* extension hooks */
-
-extern void NXProcData();
-extern void N_XEatData();		/* swallow data from server */
-extern int N_XDisconnectDisplay();
-extern int N_XGetHostname();
-extern Status N_XUnknownNativeEvent();
-extern Bool N_XUnknownWireEvent();
-
-#if 0
-extern int _XFlush();
-extern int _XRead();
-extern int _XReadPad();
-extern Status _XReply();
-extern int _XSend();
-#endif
 
-extern int N_XFlush();
-extern int N_XRead();
-extern int N_XReadPad();
-extern Status N_XReply();
-extern int N_XSend();
+extern Bool N_XUnknownWireEvent(Display *, XEvent *, xEvent *);
+extern Status N_XReply(Display *, xReply *, int, Bool);
+extern Status N_XUnknownNativeEvent(Display *, XEvent *, xEvent *);
+extern int DPSCAPConnect( char *, char **, int *, int *, int *, char **);
+extern int N_XDisconnectDisplay(int);
+extern int N_XGetHostname (char *, int);
+extern int N_XRead(Display*, char *, long);
+extern void NXProcData (Display *, char *, long);
+extern void N_XFlush(Display *);
+extern void N_XReadPad(Display*, char *, long);
+extern void N_XSend(Display *, _Xconst char *, long);
+extern void N_XWaitForReadable(Display *);
+extern void N_XWaitForWritable(Display *);
+
+extern void XDPSGetDefaultColorMaps(
+    Display *dpy,
+    Screen *screen,
+    Drawable drawable,
+    XStandardColormap *colorCube,
+    XStandardColormap *grayRamp);
 
 #endif /* _CSLIBINT_H */
 
Index: xc/lib/dps/csopendi.c
diff -u xc/lib/dps/csopendi.c:1.1 xc/lib/dps/csopendi.c:1.2
--- xc/lib/dps/csopendi.c:1.1	Sat Feb 12 16:12:55 2000
+++ xc/lib/dps/csopendi.c	Thu May 18 16:46:13 2000
@@ -47,6 +47,7 @@
  * Author:  Adobe Systems Incorporated and MIT X Consortium
  */
  
+#include <stdlib.h>
 #include <stdio.h>
 #include <sys/param.h>		/* for MAXHOSTNAMELEN */
 #define NEED_EVENTS
@@ -68,10 +69,14 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
 #include "DPSCAPClient.h"
+#include <DPS/dpsXclient.h>
 #include <DPS/dpsNXargs.h>
+#include "dpsassert.h"
 #include "dpsNXprops.h"
 #include "csfindNX.h"
+#include "csstartNX.h"
 
 #ifdef DPSLNKL
 #include "dpslnkl.inc"
@@ -92,12 +97,11 @@
 static char *xauth_name = NULL;	 /* NULL means use default mechanism */
 static int xauth_datalen = 0;
 static char *xauth_data = NULL;	 /* NULL means get default data */
+
+static void OutOfMemory (Display *);
 
-static OutOfMemory();
 #ifdef XXX
-void XSetAuthorization (name, namelen, data, datalen)
-    int namelen, datalen;		/* lengths of name and data */
-    char *name, *data;			/* NULL or arbitrary array of bytes */
+void XSetAuthorization (char *name, int namelen, char *data, int datalen)
 {
     char *tmpname, *tmpdata;
 
@@ -143,9 +147,7 @@
  * the newly created Display back to the caller.
  */
 XExtData * 
-DPSCAPOpenAgent(dpy, trueDisplayName)
-	register Display *dpy;
-	char *trueDisplayName;
+DPSCAPOpenAgent(Display *dpy, char *trueDisplayName)
 {
 	register Display *agent;
 	char *agentHost = (char *)NULL;
@@ -163,8 +165,6 @@
 	int transport, port;
 	XExtData *ext;
 	DPSCAPData my;
-	extern int _XConnectDisplay();
-	extern char *getenv();
 	char hostname[MAXHOSTNAMELEN];
 
 /*
@@ -465,11 +465,10 @@
 /* OutOfMemory is called if malloc fails.  XOpenDisplay returns NULL
    after this returns. */
 
-static OutOfMemory (dpy)
-    Display *dpy;
-    {
+static void OutOfMemory (Display *dpy)
+{
     DPSCAPCloseAgent(dpy);
-    }
+}
 
 #ifdef NEEDFORNX
 /* XFreeDisplayStructure frees all the storage associated with a 
@@ -482,8 +481,7 @@
  */
 
 static void
-_XFreeDisplayStructure(dpy)
-	register Display *dpy;
+_XFreeDisplayStructure(register Display *dpy)
 {
 	if (dpy->screens) {
 	    register int i;
@@ -558,8 +556,7 @@
 
 
 void
-DPSCAPCloseAgent(agent)
-    Display *agent;
+DPSCAPCloseAgent(Display *agent)
 {
     if (!agent) return;
     N_XDisconnectDisplay(agent->fd);
Index: xc/lib/dps/csstartNX.c
diff -u xc/lib/dps/csstartNX.c:1.1 xc/lib/dps/csstartNX.c:1.3
--- xc/lib/dps/csstartNX.c:1.1	Sat Feb 12 16:12:55 2000
+++ xc/lib/dps/csstartNX.c	Thu May 18 16:46:13 2000
@@ -44,8 +44,12 @@
 #include <sys/socket.h>
 #include <errno.h>
 #include <X11/Xos.h>
+
 #include "DPSCAPproto.h"
 #include "Xlibnet.h"            /* New for R5, delete for R4 */
+#include "dpsassert.h"
+#include "csfindNX.h"
+#include "csstartNX.h"
 
 /* ---Defines--- */
 
@@ -72,7 +76,7 @@
 /* ---Private Functions--- */
 
 static int
-TryTCP()
+TryTCP(void)
 {
     struct sockaddr_in insock;
     int request;
@@ -86,7 +90,7 @@
        to it doesn't exist in the services list it will seg. fault...
        * sigh *  */
     if ((serventInfo = getservbyname(DPS_NX_SERV_NAME,
-    					(char *) NULL)) != NULL)
+    					(char *) 0)) != 0)
         if (strcmp("tcp", serventInfo->s_proto) == 0) {
 	  startPort = ntohs(serventInfo->s_port);
 	}
@@ -156,8 +160,7 @@
 /* ---Functions--- */
 
 int
-XDPSNXRecommendPort(transport)
-    int transport;
+XDPSNXRecommendPort(int transport)
 {
     int ret;
     
@@ -175,8 +178,7 @@
 }
 
 int
-StartXDPSNX(additionalArgs)
-     char **additionalArgs;
+StartXDPSNX(char **additionalArgs)
 {
   char **args, **cpp;
   pid_t childPid;
@@ -186,30 +188,32 @@
   char *execObj, **execArgs;
 
   (void) XDPSGetNXArg(XDPSNX_EXEC_FILE, (void **) &execObj);
-  if (execObj == NULL) return (!Success);
+  if (execObj == 0) return (!Success);
 
   /* Create the argv list for the execl() call */
   (void) XDPSGetNXArg(XDPSNX_EXEC_ARGS, (void **) &execArgs);
-  if (execArgs != NULL)
-    for(cpp = execArgs; *cpp != NULL; cpp++, argc++); /* count args. */
-  if (additionalArgs != NULL)	/* add on the add-on args. */
-    for(cpp = additionalArgs; *cpp != NULL; cpp++, argc++); 
+  if (execArgs != 0)
+    for(cpp = execArgs; *cpp != 0; cpp++, argc++); /* count args. */
+  if (additionalArgs != 0)	/* add on the add-on args. */
+    for(cpp = additionalArgs; *cpp != 0; cpp++, argc++); 
 
   args = (char **) Xmalloc(sizeof(char *) * (argc+1));
-  if (args == NULL)
+  if (args == 0)
     return(!Success);
-  args[argc] = NULL;		/* cap end of args */
+  args[argc] = 0;		/* cap end of args */
   args[i++] = execObj;
-  if (additionalArgs != NULL)
-    for(cpp = additionalArgs; *cpp != NULL; cpp++, i++) args[i] = *cpp;
-  if (execArgs != NULL)
-    for(cpp = execArgs; *cpp != NULL; cpp++, i++) args[i] = *cpp;
+  if (additionalArgs != 0)
+    for(cpp = additionalArgs; *cpp != 0; cpp++, i++) args[i] = *cpp;
+  if (execArgs != 0)
+    for(cpp = execArgs; *cpp != 0; cpp++, i++) args[i] = *cpp;
 
   /* now try to start up the agent... */
   if ((childPid = fork()) != -1) {
     if (childPid == 0) {	/* Child process */
+#ifndef __EMX__
       if (setsid() < 0)
         DPSWarnProc(NULL, "Agent unable to create session.  Continuing...\n");
+#endif
 
       /* Try to start the agent */
       if (execvp(args[0], args) < 0) { /* Error!! */
@@ -230,7 +234,6 @@
   } else {			/* Error in fork */
     status = !Success;
   }
-  if (args != NULL) (void) XFree(args);
+  if (args != 0) (void) XFree(args);
   return(status);
 }
-
Index: xc/lib/dps/csstartNX.h
diff -u xc/lib/dps/csstartNX.h:1.1 xc/lib/dps/csstartNX.h:1.2
--- xc/lib/dps/csstartNX.h:1.1	Sat Feb 12 16:12:55 2000
+++ xc/lib/dps/csstartNX.h	Thu May 18 16:46:13 2000
@@ -41,12 +41,6 @@
 
 #include <X11/Xlib.h>
 
-#ifndef _NO_PROTO
-#define ARGS(list) (list)
-#else
-#define ARGS(list) ()
-#endif
-
 /* ---Globals--- */
 
 extern Bool gStartXDPSNXIsPresent;
@@ -57,8 +51,7 @@
 
 /* ---Functions--- */
 
-extern int
-StartXDPSNX ARGS((char **additionalArgs));
+extern int StartXDPSNX (char **additionalArgs);
      /*
       * StartXDPSNX attempts to fork and exec the object file specified by
       * the DPSSetNXArg argument "DPSNXEXEC".  It passes as arguments to the
@@ -69,5 +62,6 @@
       * started correctly.  Otherwise it returns !Success
       */
 
+extern int XDPSNXRecommendPort(int transport);
 
 #endif	/* CSSTARTNX_H */
Index: xc/lib/dps/dpsXclient.c
diff -u xc/lib/dps/dpsXclient.c:1.1 xc/lib/dps/dpsXclient.c:1.2
--- xc/lib/dps/dpsXclient.c:1.1	Sat Feb 12 16:12:56 2000
+++ xc/lib/dps/dpsXclient.c	Thu May 18 16:46:13 2000
@@ -36,6 +36,9 @@
  * Author:  Adobe Systems Incorporated
  */
 
+#include <stdlib.h>
+#include <unistd.h>	/* sleep() */
+#include <stdio.h>
 #include <ctype.h>
 
 #ifdef VMS
@@ -58,16 +61,15 @@
 
 #include "dpsXpriv.h"
 #include "DPS/dpsXclient.h"
-#define Atom PSWAtom
 
 #include "dpsdict.h"
 #include "DPS/dpsexcept.h"
 
 #include "dpsXint.h"
 
-static DPSPrivContext FindPrivContext (dpy, cid)
-  Display  *dpy;
-  long int cid;
+static DPSPrivContext FindPrivContext (
+  Display  *	dpy,
+  long int	cid)
 {
   DPSPrivSpace ss;
   DPSPrivContext cc;
@@ -79,18 +81,19 @@
   return (NIL);
 }
 
-DPSContext XDPSFindContext (dpy, cid)
-  Display  *dpy;
-  int cid;
+DPSContext XDPSFindContext (
+  Display  *	dpy,
+  int		cid)
 {
   return ((DPSContext) FindPrivContext (dpy, cid));
 }
 
-DPSContext DPSContextFromContextID(ctxt, contextID, textProc, errorProc)
-  DPSContext ctxt;
-  int contextID;
-  DPSTextProc textProc;
-  DPSErrorProc errorProc; {
+DPSContext DPSContextFromContextID(
+  DPSContext ctxt,
+  int contextID,
+  DPSTextProc textProc,
+  DPSErrorProc errorProc)
+{
   DPSPrivSpace ss;
   Display *dpy = ((XDPSPrivContext) ((DPSPrivContext) ctxt)->wh)->dpy;
   DPSPrivContext c, cc = FindPrivContext (dpy, contextID);
@@ -130,10 +133,10 @@
     (XDPSPrivContext) c->wh, (DPSContext)c, c->cid, ss->sid, DPSclientPrintProc);
 
   return (DPSContext)c;
-  }
+}
 
-boolean DPSPrivateCheckWait(ctxt)
-    DPSContext ctxt;
+boolean DPSPrivateCheckWait(
+    DPSContext ctxt)
 {
     DPSPrivContext cc = (DPSPrivContext) ctxt;
 
@@ -142,31 +145,32 @@
 	if (cc->errorProc != NIL) {
 	    (*cc->errorProc) (ctxt, cc->zombie ? dps_err_deadContext :
 			                         dps_err_invalidAccess,
-			      (char *) ctxt, 0);
+			      (unsigned long) ctxt, 0);
 	}
 	return true;
     }
     return false;
 }
 
-static void procFlushContext(ctxt)
-  DPSContext ctxt; {
+static void procFlushContext(
+  DPSContext ctxt)
+{
   DPSPrivContext c = (DPSPrivContext) ctxt;
   XDPSLFlush (((XDPSPrivContext) c->wh)->dpy);
   if (ctxt->chainChild != NIL) DPSFlushContext(ctxt->chainChild);
-  }
+}
 
 /* ARGSUSED */
-static Bool FindDPSEvent(dpy, event, arg)
-  Display *dpy;
-  XEvent *event;
-  char *arg;
+static Bool FindDPSEvent(
+  Display *dpy,
+  XEvent *event,
+  char *arg)
 {
   return XDPSIsDPSEvent(event);
 }
 
-static void procAwaitReturnValues(ctxt)
-  DPSContext ctxt; {
+static void procAwaitReturnValues(DPSContext ctxt)
+{
   DPSPrivContext c = (DPSPrivContext)ctxt;
  
   XDPSPrivContext xwh = (XDPSPrivContext) c->wh;
@@ -209,7 +213,7 @@
 	c->resultTable = NIL;
 	c->resultTableLength = 0;
 	if (c->errorProc != NIL)
-	  (*c->errorProc) (ctxt, dps_err_deadContext, (char *) c, 0);
+	  (*c->errorProc) (ctxt, dps_err_deadContext, (unsigned long) c, 0);
 	XDPSLSetWrapWaitingFlag(xwh->dpy, False);
 	E_RTRN_VOID;
 	}
@@ -240,12 +244,13 @@
 
   if (((DPSPrivSpace)(c->space))->lastNameIndex < c->lastNameIndex)
     ((DPSPrivSpace)(c->space))->lastNameIndex = c->lastNameIndex;
-  }
+}
 
-void DPSinnerProcWriteData(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+void DPSinnerProcWriteData(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   DPSPrivContext c = (DPSPrivContext) ctxt;
   
   /* ASSERT: safe to call with chain */
@@ -253,10 +258,10 @@
   /* No local buffering */
   DPSSendPostScript ((XDPSPrivContext) c->wh, DPSclientPrintProc,
 		     c->cid, buf, count, NIL);
-  } /* DPSinnerProcWriteData */
+} /* DPSinnerProcWriteData */
 
-static void procResetContext(ctxt)
-  DPSContext ctxt; {
+static void procResetContext(DPSContext ctxt)
+{
   DPSPrivContext c = (DPSPrivContext) ctxt;
   int currStatus;
   register XDPSPrivContext xwh = (XDPSPrivContext) c->wh;
@@ -314,10 +319,9 @@
     }
   
   c->eofReceived = false;
-  }
+}
 
-void DPSPrivateDestroyContext(ctxt)
-    DPSContext ctxt;
+void DPSPrivateDestroyContext(DPSContext ctxt)
 {
   DPSPrivContext c = (DPSPrivContext)ctxt;
   DPSPrivSpace s = (DPSPrivSpace) c->space;
@@ -330,8 +334,7 @@
   if (c->wh != s->wh) free(c->wh);
 }
 
-void DPSPrivateDestroySpace(space)
-    DPSSpace space;
+void DPSPrivateDestroySpace(DPSSpace space)
 {
     DPSPrivSpace ss = (DPSPrivSpace) space;
 
@@ -341,32 +344,31 @@
     free (ss->wh);
 }
 
-boolean DPSCheckShared(ctxt)
-  DPSPrivContext ctxt; 
+boolean DPSCheckShared(DPSPrivContext ctxt)
 {
   return ctxt->creator == false && ctxt->resultTable != NIL;
   /* let procAwaitReturnValues generate error */
 }
 
 /* ARGSUSED */
-void DPSServicePostScript(returnControl)
-  boolean (*returnControl)(); {
-  } /* DPSServicePostScript */
+void DPSServicePostScript(boolean (*returnControl)(void))
+{
+} /* DPSServicePostScript */
 
-DPSHandleBogusError(ctxt, prefix, suffix)
-  DPSContext ctxt;
-  char *prefix, *suffix;
+void DPSHandleBogusError(DPSContext ctxt, char *prefix, char *suffix)
 {
     char *buf = "bogus error output from context";
     DPSDefaultPrivateHandler(ctxt, dps_err_warning,
 			     (long unsigned int)buf, 0, prefix, suffix);
 }
 
-void DPSDefaultPrivateHandler(ctxt, errorCode, arg1, arg2, prefix, suffix)
-  DPSContext ctxt;
-  DPSErrorCode errorCode;
-  long unsigned int arg1, arg2; 
-  char *prefix, *suffix;
+void DPSDefaultPrivateHandler(
+  DPSContext ctxt,
+  DPSErrorCode errorCode,
+  long unsigned int arg1,
+  long unsigned int arg2,
+  char *prefix,
+  char *suffix)
 {
 
   DPSTextProc textProc = DPSGetCurrentTextBackstop();
@@ -447,15 +449,12 @@
   }
 }
 
-void DPSInitPrivateSpaceFields(s)
-    DPSPrivSpace s;
+void DPSInitPrivateSpaceFields(DPSPrivSpace s)
 {
     s->creator = true;
 }
 
-void DPSInitPrivateContextFields(c, s)
-    DPSPrivContext c;
-    DPSPrivSpace s;
+void DPSInitPrivateContextFields(DPSPrivContext c, DPSPrivSpace s)
 {
     c->creator = true;
     c->zombie = false;
@@ -465,9 +464,7 @@
     }
 }
 
-void  DPSInitPrivateTextContextFields(c, s)
-    DPSPrivContext c;
-    DPSPrivSpace s;
+void  DPSInitPrivateTextContextFields(DPSPrivContext c, DPSPrivSpace s)
 {
     c->creator = true;
     c->zombie = false;
@@ -478,12 +475,12 @@
   
 long int DPSLastUserObjectIndex = 0;
 
-long int DPSNewUserObjectIndex ()
+long int DPSNewUserObjectIndex (void)
 {
   return (DPSLastUserObjectIndex++);
 }
 
-void XDPSSetProcs ()
+void XDPSSetProcs (void)
 {
   DPSCheckInitClientGlobals ();
   if (!textCtxProcs)
@@ -509,24 +506,22 @@
   XDPSconvProcs->WriteNumString = textCtxProcs->WriteNumString;
 }
 
-void DPSInitPrivateContextProcs(p)
-    DPSProcs p;
+void DPSInitPrivateContextProcs(DPSProcs p)
 {
     p->FlushContext = procFlushContext;
     p->ResetContext = procResetContext;
     p->AwaitReturnValues = procAwaitReturnValues;
 }
 
-DPSContext XDPSCreateSimpleContext (dpy, draw, gc, x, y,
-					   textProc, errorProc, space)
-  Display	*dpy;
-  Drawable	draw;
-  GC		gc;
-  int		x;
-  int		y;
-  DPSTextProc	textProc;
-  DPSErrorProc	errorProc;
-  DPSSpace	space;
+DPSContext XDPSCreateSimpleContext (
+  Display	*dpy,
+  Drawable	draw,
+  GC		gc,
+  int		x,
+  int		y,
+  DPSTextProc	textProc,
+  DPSErrorProc	errorProc,
+  DPSSpace	space)
 {
   XDPSPrivContext xwh = XDPSCreatePrivContextRec (dpy, draw, gc, x, y,
   						  0, DefaultStdCMap,
@@ -545,20 +540,19 @@
 }
 
 
-DPSContext XDPSCreateContext (dpy, draw, gc, x, y, eventmask, grayramp,
-				     ccube, actual, textProc, errorProc, space)
-  Display		*dpy;
-  Drawable		draw;
-  GC			gc;
-  int			x;
-  int			y;
-  unsigned int		eventmask;
-  XStandardColormap	*grayramp;
-  XStandardColormap	*ccube;
-  int			actual;
-  DPSTextProc		textProc;
-  DPSErrorProc		errorProc;
-  DPSSpace	space;
+DPSContext XDPSCreateContext (
+  Display		*dpy,
+  Drawable		draw,
+  GC			gc,
+  int			x,
+  int			y,
+  unsigned int		eventmask,
+  XStandardColormap	*grayramp,
+  XStandardColormap	*ccube,
+  int			actual,
+  DPSTextProc		textProc,
+  DPSErrorProc		errorProc,
+  DPSSpace		space)
 {
   XDPSPrivContext xwh = XDPSCreatePrivContextRec (dpy, draw, gc, x, y,
   						  eventmask, grayramp,
@@ -576,20 +570,19 @@
     }
 }
 
-DPSContext XDPSCreateSecureContext (dpy, draw, gc, x, y, eventmask, grayramp,
-				     ccube, actual, textProc, errorProc, space)
-  Display		*dpy;
-  Drawable		draw;
-  GC			gc;
-  int			x;
-  int			y;
-  unsigned int		eventmask;
-  XStandardColormap	*grayramp;
-  XStandardColormap	*ccube;
-  int			actual;
-  DPSTextProc		textProc;
-  DPSErrorProc		errorProc;
-  DPSSpace	space;
+DPSContext XDPSCreateSecureContext (
+  Display		*dpy,
+  Drawable		draw,
+  GC			gc,
+  int			x,
+  int			y,
+  unsigned int		eventmask,
+  XStandardColormap	*grayramp,
+  XStandardColormap	*ccube,
+  int			actual,
+  DPSTextProc		textProc,
+  DPSErrorProc		errorProc,
+  DPSSpace		space)
 {
   XDPSPrivContext xwh = XDPSCreatePrivContextRec (dpy, draw, gc, x, y,
   						  eventmask, grayramp,
@@ -645,7 +638,7 @@
 
   s = spaces;
   while (s != NIL)
-    if (s->sid == sxid && ((XDPSPrivContext) s->wh)->dpy == dpy)
+    if ((SpaceXID)s->sid == sxid && ((XDPSPrivContext) s->wh)->dpy == dpy)
       break;
     else
       s = s->next;
@@ -701,8 +694,8 @@
 	DPSSafeSetLastNameIndex(ctxt);
 	if (cc->errorProc != NIL)
 	  (*cc->errorProc) (ctxt, dps_err_encodingCheck,
-			    (char *) newNameEncoding,
-			    (char *) newProgEncoding);
+			    (unsigned long) newNameEncoding,
+			    (unsigned long) newProgEncoding);
 	return;
 	}
       if (ctxt->procs == textCtxProcs)
@@ -734,7 +727,7 @@
 
   s = spaces;
   while (s != NIL)
-    if (s->sid == sid && ((XDPSPrivContext) s->wh)->dpy == dpy)
+    if ((SpaceXID)s->sid == sid && ((XDPSPrivContext) s->wh)->dpy == dpy)
       break;
     else
       s = s->next;
@@ -832,7 +825,7 @@
   DPSPrivSpace  ss;
   
   for (ss = spaces;  ss != NIL;  ss = ss->next)
-    if (ss->sid == sxid && ((XDPSPrivContext) ss->wh)->dpy == dpy)
+    if ((SpaceXID)ss->sid == sxid && ((XDPSPrivContext) ss->wh)->dpy == dpy)
       return ((DPSSpace) ss);
 
   return (NIL);
@@ -936,9 +929,9 @@
 
 
 
-void DPSWarnProc(ctxt, msg)
-    DPSContext ctxt;
-    char *msg;
+void DPSWarnProc(
+    DPSContext ctxt,
+    char *msg)
 {
     DPSErrorProc ep;
 
@@ -948,9 +941,9 @@
     (*ep)(ctxt, dps_err_warning, (long unsigned int)msg, 0);
 }
 
-void DPSFatalProc(ctxt, msg)
-    DPSContext ctxt;
-    char *msg;
+void DPSFatalProc(
+    DPSContext ctxt,
+    char *msg)
 {
     DPSErrorProc ep;
 
@@ -960,22 +953,23 @@
     (*ep)(ctxt, dps_err_fatal, (long unsigned int)msg, 0);
 }
 
-void DPSCantHappen() {
-  static locked = 0;
+void DPSCantHappen(void)
+{
+  static int locked = 0;
   char *msg = "assertion failure or DPSCantHappen";
   if (locked > 0) abort();
   ++locked;
   DPSFatalProc((DPSContext)NULL, msg);
   /* Fatal proc shouldn't return, but client can override and do anything. */
   --locked;
-  }
+}
 
 
 /* Procedures for delayed event dispatching */
 
-DPSEventDelivery XDPSSetEventDelivery(dpy, newMode)
-    Display *dpy;
-    DPSEventDelivery newMode;
+DPSEventDelivery XDPSSetEventDelivery(
+    Display *dpy,
+    DPSEventDelivery newMode)
 {
     Bool old = XDPSLGetPassEventsFlag(dpy);
 
@@ -986,16 +980,18 @@
 	case dps_event_internal_dispatch:
 	    XDPSLSetPassEventsFlag(dpy, False);
 	    break;
+	default:
+	    break;
     }
 
     if (old) return dps_event_pass_through;
     else return dps_event_internal_dispatch;
 }
 
-Bool XDPSIsStatusEvent(event, ctxt, status)
-    XEvent *event;
-    DPSContext *ctxt;
-    int *status;
+Bool XDPSIsStatusEvent(
+    XEvent *event,
+    DPSContext *ctxt,
+    int *status)
 {
     Display *d = event->xany.display;
     XExtCodes *c = XDPSLGetCodes(d);
@@ -1022,8 +1018,8 @@
     return True;
 }
 
-Bool XDPSIsOutputEvent(event)
-    XEvent *event;
+Bool XDPSIsOutputEvent(
+    XEvent *event)
 {
     Display *d = event->xany.display;
     XExtCodes *c = XDPSLGetCodes(d);
@@ -1044,8 +1040,8 @@
     return event->type == c->first_event + PSEVENTOUTPUT;
 }
 
-Bool XDPSIsDPSEvent(event)
-    XEvent *event;
+Bool XDPSIsDPSEvent(
+    XEvent *event)
 {
     Display *d = event->xany.display;
     XExtCodes *c = XDPSLGetCodes(d);
@@ -1065,8 +1061,8 @@
 	   event->type <  c->first_event + NPSEVENTS;
 }
 
-Bool XDPSDispatchEvent(event)
-    XEvent *event;
+Bool XDPSDispatchEvent(
+    XEvent *event)
 {
     Display *d = event->xany.display;
     XExtCodes *c = XDPSLGetCodes(d);
@@ -1094,10 +1090,10 @@
 }
 
 /* L2-DPS/PROTO 9 addition */
-Bool XDPSIsReadyEvent(event, ctxt, val)
-    XEvent *event;
-    DPSContext *ctxt;
-    int *val;
+Bool XDPSIsReadyEvent(
+    XEvent *event,
+    DPSContext *ctxt,
+    int *val)
 {
     Display *d = event->xany.display;
     XExtCodes *c = XDPSLGetCodes(d);
@@ -1129,8 +1125,8 @@
     return True;
 }
 
-int XDPSGetProtocolVersion(dpy)
-    Display *dpy;
+int XDPSGetProtocolVersion(
+    Display *dpy)
 {
     return XDPSLGetVersion(dpy);
 }
Index: xc/lib/dps/dpsXcmu.c
diff -u xc/lib/dps/dpsXcmu.c:1.1 xc/lib/dps/dpsXcmu.c:1.2
--- xc/lib/dps/dpsXcmu.c:1.1	Sat Feb 12 16:12:58 2000
+++ xc/lib/dps/dpsXcmu.c	Thu May 18 16:46:13 2000
@@ -64,7 +64,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <pwd.h>
+
 #include "dpsassert.h"
+#include "cslibint.h"
 
 /* Defines for standard colormap routines */
 
@@ -89,46 +91,48 @@
 
 static DpyRec *dpyRec = NULL;
 static DpyRec *curDpyRec;
-static DpyRec *FindDpyRec();
+static DpyRec *FindDpyRec(Display *);
 
 typedef struct {
     unsigned long *pixels;
     int npixels;
 } PixelRec;
 
-static XVisualInfo *PickCorrectVisual();
-static Status contiguous();
-static void ColorValuesFromMask();
-static long NumColors();
-static void CreateDefaultsDb();
-static void GetHomeDir();
-static void FindStaticColorCube();
-static Bool CheckCube();
-static int FindRampSize();
-static void SetRamp();
-static void GetDatabaseValues();
-static void AllocateColorCube();
-static void AllocateGrayRamp();
-static Bool AllocateColormap();
-static Bool AllocateColor();
-static Bool CubicCube();
-static void DefineProperty();
-static void FindStaticGrayRamp();
-static void ShrinkMapToFit();
-static void UseGrayDiagonal();
-static void UseGrayCorners();
-static Bool GetColorCubeFromProperty();
-static Bool GetGrayRampFromProperty();
+static Bool AllocateColor(Display *, Colormap, XColor *);
+static Bool AllocateColormap(Display *, XStandardColormap *, XVisualInfo *, int *, PixelRec *, int *, int *, unsigned long);
+static Bool CheckCube(XColor *, XColor *, XStandardColormap *);
+static Bool CubicCube(XStandardColormap *);
+static Bool GetColorCubeFromProperty(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap **, int *);
+static Bool GetGrayRampFromProperty(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap **, int *);
+static Status XDPSCreateStandardColormaps(Display *, Drawable, Visual *, int, int, int, int, XStandardColormap *, XStandardColormap *, Bool);
+static Status contiguous(unsigned long *, int, int *, unsigned long, int *, int *);
+static XVisualInfo *PickCorrectVisual(Display *, XVisualInfo *, int, Colormap);
+static int FindRampSize(XColor *, XColor *);
+static long NumColors(char *, char *, char *);
+static void AllocateColorCube(Display *, XVisualInfo *, XStandardColormap *, PixelRec *);
+static void AllocateGrayRamp(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap *, PixelRec *);
+static void ColorValuesFromMask(unsigned long, unsigned long *, unsigned long *);
+static void CreateDefaultsDb(Display *);
+static void DefineProperty(Display *, XStandardColormap *, XVisualInfo *, XStandardColormap *, int, Atom);
+static void FindStaticColorCube(Display *, XVisualInfo *, XStandardColormap *);
+static void FindStaticGrayRamp(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap *);
+static void GetDatabaseValues(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap *);
+static void GetHomeDir(char *);
+static void SetRamp(XColor *, XColor *, int, int *, unsigned long *);
+static void ShrinkMapToFit(XStandardColormap *, int *, XVisualInfo *);
+static void UseGrayCorners(XStandardColormap *, XStandardColormap *);
+static void UseGrayDiagonal(XStandardColormap *, XStandardColormap *);
 
 #define SCALE 65535
 #undef ABS
 #define ABS(x) ((x) < 0 ? -(x) : (x))
 
-void XDPSGetDefaultColorMaps(dpy, screen, drawable, colorCube, grayRamp)
-    Display *dpy;
-    Screen *screen;
-    Drawable drawable;
-    XStandardColormap *colorCube, *grayRamp;
+void XDPSGetDefaultColorMaps(
+    Display *dpy,
+    Screen *screen,
+    Drawable drawable,
+    XStandardColormap *colorCube,
+    XStandardColormap *grayRamp)
 {
     Window root;
     Visual *visual;
@@ -164,20 +168,20 @@
 				       0, 0, 0, 0, colorCube, grayRamp, True);
 }
 
-Status XDPSCreateStandardColormaps(dpy, drawable, visual, reds, greens,
-				   blues, grays, colorCube, grayRamp, retain)
-    Display *dpy;
-    Drawable drawable;
-    Visual *visual;
-    int reds, greens, blues, grays;
-    XStandardColormap *colorCube, *grayRamp;
-    Bool retain;
+static Status XDPSCreateStandardColormaps(
+    Display *dpy,
+    Drawable drawable,
+    Visual *visual,
+    int reds, int greens, int blues, int grays,
+    XStandardColormap *colorCube,
+    XStandardColormap *grayRamp,
+    Bool retain)
 {
     XVisualInfo vtemp, *vinfo;
     int nvis;
     XStandardColormap *propCube = NULL, *propRamp = NULL;
     int nPropCube = 0, nPropRamp = 0;
-    Bool gotCube, gotRamp;
+    Bool gotCube = False, gotRamp;
     PixelRec pixels;
 
     if (grayRamp == NULL) return 0;
@@ -326,8 +330,7 @@
     return 1;
 }
 
-static DpyRec *FindDpyRec(dpy)
-    Display *dpy;
+static DpyRec *FindDpyRec(Display *dpy)
 {
     DpyRec *d;
 
@@ -344,11 +347,11 @@
     return d;
 }
 
-static XVisualInfo *PickCorrectVisual(dpy, vlist, n, cmap)
-    Display *dpy;
-    XVisualInfo *vlist;
-    int n;
-    Colormap cmap;
+static XVisualInfo *PickCorrectVisual(
+    Display *dpy,
+    XVisualInfo *vlist,
+    int n,
+    Colormap cmap)
 {
     register int i;
     register int screen_number;
@@ -375,8 +378,8 @@
 	}
 	return NULL;	/* Visual does not match colormap */
     } else {
-	unsigned int maxdepth = 0;
-	XVisualInfo *v;
+	int maxdepth = 0;
+	XVisualInfo *v = 0;
 
 	for (i = 0; i < n; i++, vlist++) {
 	    if (vlist->depth > maxdepth) {
@@ -391,43 +394,43 @@
 /* Do some rudimentary checking of the properties to avoid obviously bad ones.
    How did they get there, anyway? */
 
-static Bool ValidCube(c, vinfo)
-    XStandardColormap *c;
-    XVisualInfo *vinfo;
+static Bool ValidCube(
+    XStandardColormap *c,
+    XVisualInfo *vinfo)
 {
-    int max = 1 << vinfo->depth;
-    int pixel;
+    unsigned long max = 1 << vinfo->depth;
+    unsigned long pixel;
 
     if (c->red_max < 1 || c->green_max < 1 || c->blue_max < 1) return False;
-    if (c->base_pixel < 0 || c->base_pixel > max) return False;
+    if (c->base_pixel > max) return False;
     pixel = (c->red_max * c->red_mult + c->green_max * c->green_mult +
 	     c->blue_max * c->blue_mult + c->base_pixel) & 0xFFFFFFFF;
-    if (pixel < 0 || pixel > max) return False;
+    if (pixel > max) return False;
 
     return True;
 }
 
-static Bool ValidRamp(c, vinfo)
-    XStandardColormap *c;
-    XVisualInfo *vinfo;
+static Bool ValidRamp(
+    XStandardColormap *c,
+    XVisualInfo *vinfo)
 {
-    int max = 1 << vinfo->depth;
-    int pixel;
+    unsigned long max = 1 << vinfo->depth;
+    unsigned long pixel;
 
     if (c->red_max < 1) return False;
-    if (c->base_pixel < 0 || c->base_pixel > max) return False;
+    if (c->base_pixel > max) return False;
     pixel = (c->red_max * c->red_mult + c->base_pixel) & 0xFFFFFFFF;
-    if (pixel < 0 || pixel > max) return False;
+    if (pixel > max) return False;
 
     return True;
 }
 
-static Bool GetColorCubeFromProperty(dpy, vinfo, colorCube, cube, ncube)
-    Display *dpy;
-    XVisualInfo *vinfo;
-    XStandardColormap *colorCube;
-    XStandardColormap **cube;
-    int *ncube;
+static Bool GetColorCubeFromProperty(
+    Display *dpy,
+    XVisualInfo *vinfo,
+    XStandardColormap *colorCube,
+    XStandardColormap **cube,
+    int *ncube)
 {
     int gotCube;
     int i;
@@ -461,12 +464,12 @@
     return gotCube;
 }
 
-static Bool GetGrayRampFromProperty(dpy, vinfo, grayRamp, ramp, nramp)
-    Display *dpy;
-    XVisualInfo *vinfo;
-    XStandardColormap *grayRamp;
-    XStandardColormap **ramp;
-    int *nramp;
+static Bool GetGrayRampFromProperty(
+    Display *dpy,
+    XVisualInfo *vinfo,
+    XStandardColormap *grayRamp,
+    XStandardColormap **ramp,
+    int *nramp)
 {
     int gotRamp;
     int i;
@@ -500,17 +503,19 @@
     return gotRamp;
 }
 
-static void GetDatabaseValues(dpy, vinfo, colorCube, grayRamp)
-    Display *dpy;
-    XVisualInfo *vinfo;
-    XStandardColormap *colorCube, *grayRamp;
+static void GetDatabaseValues(
+    Display *dpy,
+    XVisualInfo *vinfo,
+    XStandardColormap *colorCube,
+    XStandardColormap *grayRamp)
 {
     char *class, *depth;
     char namePrefix[40], classPrefix[40];
-    int max;
+    unsigned long max;
     XStandardColormap fakeCube;
 
     switch (vinfo->class) {
+	default:
         case StaticGray:  class = "StaticGray."; break;
         case GrayScale:   class = "GrayScale."; break;
         case StaticColor: class = "StaticColor."; break;
@@ -632,25 +637,20 @@
     }
 }
 
-static Bool CubicCube(cube)
-    XStandardColormap *cube;
+static Bool CubicCube(XStandardColormap *cube)
 {
     return cube->red_max == cube->green_max && cube->red_max ==
 	    cube->blue_max;
 }
 
-static void UseGrayDiagonal(cube, ramp)
-    XStandardColormap *cube, *ramp;
+static void UseGrayDiagonal(XStandardColormap *cube, XStandardColormap *ramp)
 {
     ramp->red_max = cube->red_max;
-    ramp->red_mult = ABS(cube->red_mult) + ABS(cube->green_mult) +
-	    ABS(cube->blue_mult);
-    if (cube->red_mult < 0) ramp->red_mult *= -1;
+    ramp->red_mult = cube->red_mult + cube->green_mult + cube->blue_mult;
     ramp->base_pixel = cube->base_pixel;
 }
 
-static void UseGrayCorners(cube, ramp)
-    XStandardColormap *cube, *ramp;
+static void UseGrayCorners(XStandardColormap *cube, XStandardColormap *ramp)
 {
     ramp->red_max = 1;
     ramp->red_mult = (cube->red_max + 1) * (cube->green_max + 1) *
@@ -659,10 +659,10 @@
     ramp->base_pixel = cube->base_pixel;
 }
 
-static void ColorValuesFromMask(mask, maxColor, mult)
-    unsigned long	mask;
-    unsigned long	*maxColor;
-    int			*mult;
+static void ColorValuesFromMask(
+    unsigned long	mask,
+    unsigned long	*maxColor,
+    unsigned long	*mult)
 {
     *mult = 1;
     while ((mask & 1) == 0) {
@@ -752,8 +752,7 @@
 
 static XrmDatabase defaultDB = NULL;
 
-static void CreateDefaultsDb(dpy)
-    Display *dpy;
+static void CreateDefaultsDb(Display *dpy)
 {
     char home[256], *dpyDefaults;
 
@@ -773,8 +772,7 @@
     }
 }
 
-static void GetHomeDir(buf)
-    char *buf;
+static void GetHomeDir(char *buf)
 {
 #ifndef X_NOT_POSIX
      uid_t uid;
@@ -813,8 +811,7 @@
      return;
 }
 
-static long NumColors(namePrefix, classPrefix, color)
-    char *namePrefix, *classPrefix, *color;
+static long NumColors(char *namePrefix, char *classPrefix, char *color)
 {
     char name[40], class[40];
     XrmValue rtnValue;
@@ -855,10 +852,10 @@
    a color cube.  Check pairs of black and white cells trying to find
    a cube between them and take the first one you find. */
 
-static void FindStaticColorCube(dpy, vinfo, colorCube)
-    Display *dpy;
-    XVisualInfo *vinfo;
-    XStandardColormap *colorCube;
+static void FindStaticColorCube(
+    Display *dpy,
+    XVisualInfo *vinfo,
+    XStandardColormap *colorCube)
 {
     XColor *ramp, *black, *white, *altBlack, *altWhite;
     int i, entries;
@@ -920,11 +917,12 @@
 	(((color)->green >> 8) == (g) * SMALLSCALE) && \
 	(((color)->blue >> 8) == (b) * SMALLSCALE))
 
-static Bool CheckCube(black, white, cube)
-    XColor *black, *white;
-    XStandardColormap *cube;
+static Bool CheckCube(
+    XColor *black,
+    XColor *white,
+    XStandardColormap *cube)
 {
-    int r, g, b, c, m, y, k, w;
+    int r = 0, g = 0, b = 0, c = 0, m = 0, y = 0, k, w;
     XColor *color;
     unsigned int found = 0;
     int small, middle, large;
@@ -1082,13 +1080,15 @@
    white and black.  If there is a color cube, also check its diagonal and
    use its corners if we need to */
 
-static void FindStaticGrayRamp(dpy, vinfo, grayRamp, colorCube)
-    Display *dpy;
-    XVisualInfo *vinfo;
-    XStandardColormap *grayRamp, *colorCube;
+static void FindStaticGrayRamp(
+    Display *dpy,
+    XVisualInfo *vinfo,
+    XStandardColormap *grayRamp,
+    XStandardColormap *colorCube)
 {
     XColor *ramp, *black, *white, *altBlack, *altWhite;
-    int i, r0, r1, r2, r3, size, entries, redMult, base;
+    int i, r0, r1, r2, r3, size, entries, redMult;
+    unsigned long base;
 
     entries = 1 << vinfo->depth;
     ramp = (XColor *) calloc(entries, sizeof(XColor));
@@ -1149,8 +1149,7 @@
     free(ramp);
 }
 
-static int FindRampSize(black, white)
-    XColor *black, *white;
+static int FindRampSize(XColor *black, XColor *white)
 {
     XColor *c;
     int r;
@@ -1175,11 +1174,12 @@
     return size;
 }
 
-static void SetRamp(black, white, size, mult, base)
-    XColor *black, *white;
-    int size;
-    int *mult;
-    unsigned long *base;
+static void SetRamp(
+    XColor *black,
+    XColor *white,
+    int size,
+    int *mult,
+    unsigned long *base)
 {
     *base = black->pixel;
     *mult = (white - black) / size;
@@ -1187,8 +1187,7 @@
 
 #define lowbit(x) ((x) & (~(x) + 1))
 
-static int shiftdown(x)
-    register unsigned long x;
+static unsigned long shiftdown(unsigned long x)
 {
     while ((x & 1) == 00) {
 	x = x >> 1;
@@ -1196,13 +1195,14 @@
     return x;
 }
 
-static void AllocateColorCube(dpy, vinfo, colorCube, pixels)
-    Display *dpy;
-    XVisualInfo *vinfo;
-    XStandardColormap *colorCube;
-    PixelRec *pixels;
+static void AllocateColorCube(
+    Display *dpy,
+    XVisualInfo *vinfo,
+    XStandardColormap *colorCube,
+    PixelRec *pixels)
 {
-    int count, first, remain, n, i;
+    int count, first, remain, n, j;
+    unsigned long i;
     Colormap cmap = colorCube->colormap;
     unsigned long delta;
     XColor color;
@@ -1254,7 +1254,7 @@
     color.flags = DoRed | DoGreen | DoBlue;
 
     /* Define colors */
-    for (n = 0, i = 0; i < count; ++i, n += delta) {
+    for (n = 0, j = 0; j < count; ++j, n += delta) {
 	color.pixel = n + pixels->pixels[first];
 	if (vinfo->class == PseudoColor) {
 #define calc(i, max, mult) ((((i / colorCube->mult) % \
@@ -1265,7 +1265,7 @@
 #undef calc
 	} else {
 	    color.red = color.green = color.blue =
-		    (i * SCALE) / colorCube->red_max;
+		    (j * SCALE) / colorCube->red_max;
 	}
 	if (!AllocateColor(dpy, cmap, &color)) {
 	    XFreeColors(dpy, cmap, pixels->pixels, count+first+remain, 0);
@@ -1278,17 +1278,18 @@
 
     /* Smush down unused pixels, if any */
 
-    for (i = 0; i < remain; i++) {
-	pixels->pixels[first+i] = pixels->pixels[first+count+i];
+    for (j = 0; j < remain; j++) {
+	pixels->pixels[first+j] = pixels->pixels[first+count+j];
     }
     pixels->npixels -= count;
 }
 
-static void AllocateGrayRamp(dpy, vinfo, grayRamp, colorCube, pixels)
-    Display *dpy;
-    XVisualInfo *vinfo;
-    XStandardColormap *grayRamp, *colorCube;
-    PixelRec *pixels;
+static void AllocateGrayRamp(
+    Display *dpy,
+    XVisualInfo *vinfo,
+    XStandardColormap *grayRamp,
+    XStandardColormap *colorCube,
+    PixelRec *pixels)
 {
     int count, first, remain, n, i;
     Colormap cmap = grayRamp->colormap;
@@ -1366,10 +1367,7 @@
     pixels->npixels -= count;
 }
 
-#ifdef __STDC__
-
-static int compare(a1, a2)
-    const void	*a1, *a2;
+static int compare(const void *a1, const void *a2)
 {
     register unsigned long *e1 = (unsigned long *) a1,
 			   *e2 = (unsigned long *) a2;
@@ -1378,28 +1376,15 @@
     if (*e1 > *e2)	return 1;
     return 0;
 }
-
-#else /* __STDC__ */
-
-static int compare(e1, e2)
-    register unsigned long	*e1, *e2;
-{
-    if (*e1 < *e2)	return -1;
-    if (*e1 > *e2)	return 1;
-    return 0;
-}
 
-#endif /* __STDC__ */
-
-static Bool AllocateColormap(dpy, map, vinfo, count, pixels,
-			     first, remain, delta)
-    Display *dpy;
-    XStandardColormap *map;
-    XVisualInfo *vinfo;
-    int *count;
-    PixelRec *pixels;
-    int *first, *remain;
-    unsigned long delta;
+static Bool AllocateColormap(
+    Display *dpy,
+    XStandardColormap *map,
+    XVisualInfo *vinfo,
+    int *count,
+    PixelRec *pixels,
+    int *first, int *remain,
+    unsigned long delta)
 {
     Colormap cmap = map->colormap;
     int npixels, ok, i;
@@ -1412,7 +1397,7 @@
 	if (ok) success = True;
 	else {
 	    int total;
-	    int top, mid;
+	    int top, mid = 0;
 
 	    /* If it's a gray ramp or direct color we need at least 2;
 	       others 8 */
@@ -1471,15 +1456,15 @@
     return success;
 }
 
-static Bool contiguous(pixels, npixels, ncolors, delta, first, rem)
-    unsigned long	pixels[];	/* specifies allocated pixels */
-    int			npixels;	/* specifies count of alloc'd pixels */
-    int			*ncolors;	/* specifies needed sequence length
+static Bool contiguous(
+    unsigned long	pixels[],	/* specifies allocated pixels */
+    int			npixels,	/* specifies count of alloc'd pixels */
+    int			*ncolors,	/* specifies needed sequence length
 					   If not available, returns max 
 					   available contiguous sequence */
-    unsigned long	delta;
-    int			*first;		/* returns first index of sequence */
-    int			*rem;		/* returns first index after sequence,
+    unsigned long	delta,
+    int			*first,		/* returns first index of sequence */
+    int			*rem)		/* returns first index after sequence,
 					 * or 0, if none follow */
 {
     register int i = 1;		/* walking index into the pixel array */
@@ -1512,10 +1497,10 @@
     } return True;
 }
 
-static Bool AllocateColor(dpy, cmap, color, n)
-    Display *dpy;
-    Colormap cmap;
-    XColor *color;
+static Bool AllocateColor(
+    Display *dpy,
+    Colormap cmap,
+    XColor *color)
 {
     unsigned long pix = color->pixel;
     XColor request;
@@ -1544,10 +1529,10 @@
     return True;
 }
 
-static void ShrinkMapToFit(map, space, vinfo)
-    XStandardColormap *map;
-    int *space;
-    XVisualInfo *vinfo;
+static void ShrinkMapToFit(
+    XStandardColormap *map,
+    int *space,
+    XVisualInfo *vinfo)
 {
     if (map->blue_max == 0) map->red_max = *space - 1;
     else if (vinfo->class == DirectColor) {
@@ -1578,13 +1563,13 @@
     }
 }
 
-static void DefineProperty(dpy, map, vinfo, prop, nProp, atom)
-    Display *dpy;
-    XStandardColormap *map;
-    XVisualInfo *vinfo;
-    XStandardColormap *prop;
-    int nProp;
-    Atom atom;
+static void DefineProperty(
+    Display *dpy,
+    XStandardColormap *map,
+    XVisualInfo *vinfo,
+    XStandardColormap *prop,
+    int nProp,
+    Atom atom)
 {
     XStandardColormap *copy;
     int i;
Index: xc/lib/dps/dpsXint.h
diff -u xc/lib/dps/dpsXint.h:1.1 xc/lib/dps/dpsXint.h:1.2
--- xc/lib/dps/dpsXint.h:1.1	Sat Feb 12 16:12:59 2000
+++ xc/lib/dps/dpsXint.h	Thu May 18 16:46:13 2000
@@ -39,6 +39,9 @@
 #ifndef DPSXINT_H
 #define DPSXINT_H
 
+#include <X11/X.h>
+#include <DPS/dpsXclient.h>
+
 /* The first part of this structure is generic; the last part is
    implementation-specific. */
 
@@ -48,8 +51,8 @@
   DPSProgramEncoding programEncoding;
   DPSNameEncoding nameEncoding;
   DPSProcs procs;
-  void (*textProc)();
-  void (*errorProc)();
+  DPSTextProc textProc;
+  DPSErrorProc errorProc;
   DPSResults resultTable;
   unsigned int resultTableLength;
   struct _t_DPSContextRec *chainParent, *chainChild;
@@ -63,16 +66,16 @@
   char *buf, *outBuf, *objBuf;
   integer nBufChars, nOutBufChars, nObjBufChars;
   DPSNumFormat numFormat;
-  boolean resyncing;	/* Error has occured and waiting ResetContext */
+  boolean resyncing;	/* Error has occurred and waiting ResetContext */
   int *numstringOffsets;	/* see comment below */
 
 /* Everthing after this is XDPS-specific */
 
   boolean creator;	/* Did this app. create the context? */
   int statusFromEvent;  /* Latest status reported by an event during reset. */
-  void (*statusProc)();
+  XDPSStatusProc statusProc;
   boolean zombie;    /* To avoid DPSAwaitReturnValues */
-  void (*readyProc)();
+  XDPSReadyProc readyProc;
 } DPSPrivContextRec, *DPSPrivContext;
 
 /* The numstringOffsets field lists offsets of encoded number strings in
Index: xc/lib/dps/dpsXpriv.c
diff -u xc/lib/dps/dpsXpriv.c:1.2 xc/lib/dps/dpsXpriv.c:1.3
--- xc/lib/dps/dpsXpriv.c:1.2	Mon Feb 21 10:05:35 2000
+++ xc/lib/dps/dpsXpriv.c	Thu May 18 16:46:13 2000
@@ -35,8 +35,9 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
-/* $XFree86: xc/lib/dps/dpsXpriv.c,v 1.2 2000/02/21 18:05:35 dawes Exp $ */
+/* $XFree86: xc/lib/dps/dpsXpriv.c,v 1.3 2000/05/18 23:46:13 dawes Exp $ */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 
@@ -108,8 +109,8 @@
 
 
 
-static PRegstDPY IsRegistered (dpy)
-  register Display	*dpy;
+static PRegstDPY IsRegistered (
+  register Display	*dpy)
 {
   register PRegstDPY	rdpy;
   
@@ -120,8 +121,8 @@
 }
 
 
-void XDPSPrivZapDpy(dpy)
-  register Display *dpy;
+void XDPSPrivZapDpy(
+  register Display *dpy)
 {
   register PRegstDPY rdpy, prev = NIL;
   
@@ -139,30 +140,30 @@
 
 
 /* ARGSUSED */
-static int UsuallyFalse (dpy, event, arg)
-  Display *dpy;
-  XEvent  *event;
-  char    *arg;
+static int UsuallyFalse (
+  Display *dpy,
+  XEvent  *event,
+  char    *arg)
 {
   return((event->type & 0x7F) == X_Error);
 }
 
-void XDPSForceEvents (dpy)
-  Display *dpy;
+void XDPSForceEvents (
+  Display *dpy)
 {
   XEvent event;
   
   while (XCheckIfEvent (dpy, &event, UsuallyFalse, (char *) NULL)) {
-      int (*proc)() = XSetErrorHandler(NULL);
+      int (*proc)(Display *, XErrorEvent *) = XSetErrorHandler(NULL);
       (void) XSetErrorHandler(proc);
-      if (proc != (int (*)())NULL && event.type < 256)
+      if (proc != 0 && event.type < 256)
 	      (void)(*proc)(dpy, &event.xerror);
   }
 }
 
 
-static void OutputEventHandler (event)
-  register XDPSLOutputEvent *event;
+static void OutputEventHandler (
+  register XDPSLOutputEvent *event)
 {
   PRegstDPY rdpy;
   register DPSContext ctxt;
@@ -181,8 +182,8 @@
 }
 
 
-static int BlockForEvent (dpy)
-    Display *dpy;
+static int BlockForEvent (
+    Display *dpy)
 {
     long readfds;
   
@@ -223,10 +224,10 @@
 }
 
 
-void XDPSSetContextEncoding (ctxt, progEncoding, nameEncoding)
-  DPSContext	     ctxt; 
-  DPSProgramEncoding progEncoding; 
-  DPSNameEncoding    nameEncoding; 
+void XDPSSetContextEncoding (
+  DPSContext	     ctxt,
+  DPSProgramEncoding progEncoding,
+  DPSNameEncoding    nameEncoding) 
 {
   /* This routine should not be called if ctxt is a text context */
   
@@ -236,7 +237,7 @@
     {
     if (ctxt->errorProc != NIL) 
       (*ctxt->errorProc) (ctxt, dps_err_encodingCheck,
-			  (char *) nameEncoding, (char *) progEncoding);
+			  nameEncoding, progEncoding);
     return;
     }
   else if (progEncoding == dps_ascii || progEncoding == dps_encodedTokens ||
@@ -266,9 +267,9 @@
 }
 
 /* ARGSUSED */
-void DPSInitClient(textProc, releaseProc)
-  DPSTextProc	textProc;
-  void		(*releaseProc) ();
+void DPSInitClient(
+  DPSTextProc	textProc,
+  void		(*releaseProc) (char *, char *))
 {
   DPSAssert (releaseProc != NIL);
   XDPSSetProcs ();
@@ -277,8 +278,8 @@
 }
 
 
-DPSNumFormat XDPSNumFormat (dpy)
-  Display *dpy;
+DPSNumFormat XDPSNumFormat (
+  Display *dpy)
 {
   PRegstDPY	rdpy;
   
@@ -288,19 +289,17 @@
     return ((rdpy->ctxtTokenType < DPS_HI_NATIVE) ? dps_ieee : dps_native);
 }
 
-XDPSPrivContext XDPSCreatePrivContextRec (dpy, drawable, gc, x, y,
-						 eventmask, grayramp, ccube,
-						 actual, secure)
-  Display		*dpy;
-  Drawable		drawable;
-  GC			gc;
-  int			x;
-  int			y;
-  unsigned int		eventmask;
-  XStandardColormap	*grayramp;
-  XStandardColormap	*ccube;
-  int			actual;
-  int			secure;
+XDPSPrivContext XDPSCreatePrivContextRec (
+  Display		*dpy,
+  Drawable		drawable,
+  GC			gc,
+  int			x,
+  int			y,
+  unsigned int		eventmask,
+  XStandardColormap	*grayramp,
+  XStandardColormap	*ccube,
+  int			actual,
+  int			secure)
 {
   int			event_base;
   int			token_type;		/* From server. */
@@ -317,8 +316,8 @@
 	(rdpy = (PRegstDPY) calloc (sizeof (RegstDPYRec), 1)))
       {
       XDPSLSetTextEventHandler (dpy, (XDPSLEventHandler) OutputEventHandler);
-      XDPSLSetStatusEventHandler (dpy, XDPSStatusEventHandler);
-      XDPSLSetReadyEventHandler (dpy, XDPSReadyEventHandler);
+      XDPSLSetStatusEventHandler (dpy, (XDPSLEventHandler) XDPSStatusEventHandler);
+      XDPSLSetReadyEventHandler (dpy, (XDPSLEventHandler) XDPSReadyEventHandler);
       XDPSLInitDisplayFlags(dpy);
       rdpy->dpy = dpy;
       rdpy->firstEvent = event_base;
@@ -362,14 +361,13 @@
 }
 
 
-DPSNumFormat DPSCreatePrivContext (wh, ctxt, cidP, sxidP,
-					newSpace, printProc)
-  XDPSPrivContext	wh;
-  DPSContext		ctxt;
-  ContextPSID		*cidP;
-  SpaceXID		*sxidP;
-  boolean		newSpace;
-  DPSClientPrintProc	printProc;
+DPSNumFormat DPSCreatePrivContext (
+  XDPSPrivContext	wh,
+  DPSContext		ctxt,
+  ContextPSID		*cidP,
+  SpaceXID		*sxidP,
+  boolean		newSpace,
+  DPSClientPrintProc	printProc)
 {
   PRegstDPY		rdpy;
   
@@ -404,12 +402,12 @@
 }
 
 
-void DPSIncludePrivContext (wh, ctxt, cid, sxid, printProc)
-  XDPSPrivContext	wh;
-  DPSContext		ctxt;
-  ContextPSID		cid;
-  SpaceXID		sxid;
-  DPSClientPrintProc	printProc;
+void DPSIncludePrivContext (
+  XDPSPrivContext	wh,
+  DPSContext		ctxt,
+  ContextPSID		cid,
+  SpaceXID		sxid,
+  DPSClientPrintProc	printProc)
 {
   XDPSPrivContext	newWh;
   SpaceXID		space;
@@ -445,14 +443,13 @@
 }
 
 /* ARGSUSED */
-void DPSSendPostScript (wh, printProc, cid,
-				    buffer, count, returnControl)
-  register XDPSPrivContext	wh;
-  DPSClientPrintProc		printProc;
-  ContextPSID			cid;
-  char				*buffer;
-  long int			count;
-  boolean			(*returnControl)();
+void DPSSendPostScript (
+  register XDPSPrivContext	wh,
+  DPSClientPrintProc		printProc,
+  ContextPSID			cid,
+  char				*buffer,
+  long int			count,
+  boolean			(*returnControl)(void))
 {
     boolean blocking = buffer == NIL;
 
@@ -466,7 +463,7 @@
 	    XDPSLFlush (wh->dpy);
 	    if (BlockForEvent (wh->dpy) < 0 && wh->ctxt->errorProc != NIL) {
 		(*(wh->ctxt->errorProc)) (wh->ctxt, dps_err_closedDisplay,
-					  (char *) ConnectionNumber(wh->dpy),
+					  ConnectionNumber(wh->dpy),
 					  0);
 	    }
 	}
@@ -476,54 +473,54 @@
 
 
 /* ARGSUSED */
-void DPSSendInterrupt (wh, cid, printProc)
-  XDPSPrivContext	wh;
-  ContextPSID		cid;
-  DPSClientPrintProc	printProc;
+void DPSSendInterrupt (
+  XDPSPrivContext	wh,
+  ContextPSID		cid,
+  DPSClientPrintProc	printProc)
 {
   XDPSLNotifyContext (wh->dpy, wh->cxid, PSINTERRUPT);
 }
 
 
 /* ARGSUSED */
-void DPSSendEOF (wh, cid, printProc)
-  XDPSPrivContext	wh;
-  ContextPSID		cid;
-  DPSClientPrintProc	printProc;
+void DPSSendEOF (
+  XDPSPrivContext	wh,
+  ContextPSID		cid,
+  DPSClientPrintProc	printProc)
 {
   XDPSLReset (wh->dpy, wh->cxid);
 }
 
 
 /* ARGSUSED */
-void DPSSendTerminate (wh, cid, printProc)
-  XDPSPrivContext	wh;
-  ContextPSID		cid;
-  DPSClientPrintProc	printProc;
+void DPSSendTerminate (
+  XDPSPrivContext	wh,
+  ContextPSID		cid,
+  DPSClientPrintProc	printProc)
 {
   XDPSLNotifyContext (wh->dpy, wh->cxid, PSKILL);
 }
 
 
-void XDPSSendUnfreeze (dpy, cxid)
-  Display    *dpy;
-  ContextXID cxid;
+void XDPSSendUnfreeze (
+  Display    *dpy,
+  ContextXID cxid)
 {
   XDPSLNotifyContext (dpy, cxid, PSUNFREEZE);
 }
 
 
 /* ARGSUSED */
-void DPSSendDestroySpace(wh, sxid, printProc)
-  XDPSPrivContext	wh;
-  SpaceXID		sxid;
-  DPSClientPrintProc	printProc;
+void DPSSendDestroySpace(
+  XDPSPrivContext	wh,
+  SpaceXID		sxid,
+  DPSClientPrintProc	printProc)
 {
   XDPSLDestroySpace (wh->dpy, sxid);
 }
 
 
-void DPSOutOfMemory ()
+void DPSOutOfMemory (void)
 {
   DPSFatalProc(NULL, "DPS Client Library Error:  Out of memory.\n");
   exit (1);
Index: xc/lib/dps/dpsXpriv.h
diff -u xc/lib/dps/dpsXpriv.h:1.1 xc/lib/dps/dpsXpriv.h:1.2
--- xc/lib/dps/dpsXpriv.h:1.1	Sat Feb 12 16:13:03 2000
+++ xc/lib/dps/dpsXpriv.h	Thu May 18 16:46:13 2000
@@ -48,9 +48,12 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif /* VMS */
+
+#include <DPS/XDPSlib.h>
 #include "DPS/dpsclient.h"
 #include "dpsprivate.h"
 #include "DPS/dpsXclient.h"
+#include "publictypes.h"
 
 /* typedefs */
 
@@ -82,57 +85,103 @@
 extern int	XDPSQuitBlocking;
 
 
-extern XDPSPrivContext XDPSCreatePrivContextRec (/*
-  Display	    *dpy,
-  Drawable	    drawable,
-  GC		    gc,
-  int		    x,
-  int		    y,
-  unsigned int	    eventmask,
-  XStandardColormap grayramp,
-  XStandardColormap ccube,
-  int		    actual,
-  int		    secure 	L2-DPS/PROTO 9 */);
+extern XDPSPrivContext XDPSCreatePrivContextRec (
+  Display	    * /* dpy */,
+  Drawable	      /* drawable */,
+  GC		      /* gc */,
+  int		      /* x */,
+  int		      /* y */,
+  unsigned int	      /* eventmask */,
+  XStandardColormap * /* grayramp */,
+  XStandardColormap * /* ccube */,
+  int		      /* actual */,
+  int		      /* secure */);
   
   /* See if dpy supports the DPS extension.  If not, return NULL.  If so,
      it sets up a private context object that is used for creating
      contexts and spaces. */
 
+extern DPSNumFormat DPSCreatePrivContext(
+  XDPSPrivContext	/* wh */,
+  DPSContext		/* ctxt */,
+  ContextPSID *		/* cidP */,
+  SpaceXID *		/* sxidP */,
+  boolean		/* newSpace */,
+  DPSClientPrintProc	/* printProc */);
+  /* returns -1 if server can't create the context */
+
+extern void DPSIncludePrivContext(
+  XDPSPrivContext	/* wh */,
+  DPSContext		/* ctxt */,
+  ContextPSID		/* cid */,
+  SpaceXID		/* sxid */,
+  DPSClientPrintProc	/* printProc */);
+
+extern void DPSSendPostScript(
+  XDPSPrivContext	/* wh */,
+  DPSClientPrintProc	/* printProc */,
+  ContextPSID		/* cid */,
+  char			* /* buffer */,
+  long int		/* count */,
+  boolean		(* /* returnControl */)(void));
+
+extern void DPSSendInterrupt(
+  XDPSPrivContext	/* wh */,
+  ContextPSID		/* cid */,
+  DPSClientPrintProc	/* printProc */);
+
+extern void DPSSendEOF(
+  XDPSPrivContext	/* wh */,
+  ContextPSID		/* cid */,
+  DPSClientPrintProc	/* printProc */);
+
+extern void DPSSendTerminate(
+  XDPSPrivContext	/* wh */,
+  ContextPSID		/* cid */,
+  DPSClientPrintProc	/* printProc */);
+
+extern void XDPSPrivZapDpy(
+  Display *		/* dpy */);
 
-extern DPSNumFormat XDPSNumFormat (/* Display *dpy */);
+extern DPSNumFormat XDPSNumFormat (Display * /* dpy */);
 
   /* Determine the number format for server over the "dpy" connection. */
 
-extern void XDPSSetProcs ();
+extern void XDPSSetProcs (void);
 
   /* Set pointers to raw and conversion context procs. */
 
-extern void XDPSSetContextEncoding ( /*
-  DPSContext ctxt,
-  DPSProgramEncoding progEncoding,
-  DPSNameEncoding nameEncoding */);
+extern void XDPSSetContextEncoding (
+  DPSContext /* ctxt */,
+  DPSProgramEncoding /* progEncoding */,
+  DPSNameEncoding /* nameEncoding */);
   
   /* Sets context's program and name encodings to new values. */
 
-extern void XDPSStatusEventHandler (/* XDPSLStatusEvent *event */);
+extern void XDPSStatusEventHandler (XDPSLStatusEvent * /* event */);
 
   /* Is registered with Xlib and is called when a dps status event is
      received.  It determines what context the event belongs to and,
      if that context has a status event handler, calls its handler
      passing it the status type. */
 
-extern void XDPSReadyEventHandler (/* XDPSLReadyEvent *event */);
+extern void XDPSReadyEventHandler (XDPSLReadyEvent * /* event */);
 
   /* Is registered with Xlib and is called when a dps ready event is
      received.  It determines what context the event belongs to and,
      if that context has a status event handler, calls its handler
      passing it the ready data. */
 
-extern void XDPSForceEvents (/* Display *dpy */);
+extern void XDPSForceEvents (Display * /* dpy */);
 
   /* Forces processing of events that are pending over the 'dpy'
      connection.  This causes DPS events to be handled by their handlers. */
+
+extern void XDPSSendUnfreeze (Display * /* dpy */, ContextXID /* cxid */);
 
-extern void XDPSSendUnfreeze (/* Display *dpy, ContextXID cxid */);
+extern void DPSSendDestroySpace(
+		XDPSPrivContext /* wh */,
+		SpaceXID /* sxid */,
+		DPSClientPrintProc /* printProc */);
 
 #endif /* DPSXPRIVATE_H */
Index: xc/lib/dps/dpsXtdisp.c
diff -u xc/lib/dps/dpsXtdisp.c:1.1 xc/lib/dps/dpsXtdisp.c:1.2
--- xc/lib/dps/dpsXtdisp.c:1.1	Sat Feb 12 16:13:04 2000
+++ xc/lib/dps/dpsXtdisp.c	Thu May 18 16:46:13 2000
@@ -42,8 +42,7 @@
 
 #include "dpsassert.h"
 
-void XDPSSetXtEventDispatching(dpy)
-    Display *dpy;
+void XDPSSetXtEventDispatching(Display *dpy)
 {
     DPSFatalProc(NULL, "Attempt to use XDPSSetXtEventDispatching with pre-R6 Intrinsics\n");
     exit(1);
@@ -62,8 +61,7 @@
 
 static DpyProcRec *dpyProcList = NULL;
 
-static Boolean NXDispatcher(event)
-    XEvent *event;
+static Boolean NXDispatcher(XEvent *event)
 {
     DpyProcRec *d;
 
@@ -75,8 +73,7 @@
     else return False;
 }
 	
-void XDPSSetXtEventDispatching(dpy)
-    Display *dpy;
+void XDPSSetXtEventDispatching(Display *dpy)
 {
     int codes;
     XExtCodes *c;
Index: xc/lib/dps/dpsabbrev.c
diff -u xc/lib/dps/dpsabbrev.c:1.1 xc/lib/dps/dpsabbrev.c:1.2
--- xc/lib/dps/dpsabbrev.c:1.1	Sat Feb 12 16:13:04 2000
+++ xc/lib/dps/dpsabbrev.c	Thu May 18 16:46:13 2000
@@ -326,24 +326,20 @@
     -1,	/* 211 */
 };
 
-void DPSFetchAbbrevList(list, count)
-    DPSAbbrevRec **list;
-    int *count;
+void DPSFetchAbbrevList(DPSAbbrevRec **list, int *count)
 {
     *list = abbrev;
     *count = sizeof(abbrev) / sizeof(abbrev[0]);
 }
 
-char *DPSGetSysnameAbbrev(n)
-    int n;
+char *DPSGetSysnameAbbrev(int n)
 {
-    if (n > sizeof(abbrevPtr) / sizeof(abbrevPtr[0])) return NULL;
+    if ((unsigned) n > sizeof(abbrevPtr) / sizeof(abbrevPtr[0])) return NULL;
     if (abbrevPtr[n] == -1) return NULL;
     return abbrev[abbrevPtr[n]].abbrev;
 }
 
-char *DPSGetOperatorAbbrev(op)
-    char *op;
+char *DPSGetOperatorAbbrev(char *op)
 {
     int min, max, n;
     int res;
Index: xc/lib/dps/dpsassert.h
diff -u xc/lib/dps/dpsassert.h:1.1 xc/lib/dps/dpsassert.h:1.2
--- xc/lib/dps/dpsassert.h:1.1	Sat Feb 12 16:13:05 2000
+++ xc/lib/dps/dpsassert.h	Thu May 18 16:46:13 2000
@@ -39,12 +39,14 @@
 #ifndef DPSASSERT_H
 #define DPSASSERT_H
 
+#include "DPS/dpsclient.h"
+
 #define DPSAssertWarn(cndtn, cntxt, mssg)\
-	if (!(cndtn)) DPSWarnProc((cntxt),(mssg))
+	if (!(cndtn)) DPSWarnProc((DPSContext)(cntxt),(mssg))
 
-extern void DPSWarnProc();
-extern void DPSFatalProc();
-extern void DPSCantHappen();
+extern void DPSWarnProc(DPSContext ctxt, char *msg);
+extern void DPSFatalProc(DPSContext ctxt, char *msg);
+extern void DPSCantHappen(void);
 
 #define DPSAssert(condition) \
   if (! (condition)) DPSCantHappen();
Index: xc/lib/dps/dpsclient.c
diff -u xc/lib/dps/dpsclient.c:1.1 xc/lib/dps/dpsclient.c:1.2
--- xc/lib/dps/dpsclient.c:1.1	Sat Feb 12 16:13:05 2000
+++ xc/lib/dps/dpsclient.c	Thu May 18 16:46:13 2000
@@ -36,9 +36,11 @@
  * Author:  Adobe Systems Incorporated
  */
 
+#include <stdlib.h>
+#include <stdio.h>
 #include <ctype.h>
 
-#include "publictypes.h"
+#include "dpsXpriv.h"
 #include "DPS/dpsclient.h"
 #include "dpsprivate.h"
 #include "dpsdict.h"
@@ -129,51 +131,56 @@
   
 Globals DPSglobals = NULL;
 
-char *DPScalloc(e, n) integer e, n; {
+char *DPScalloc(integer e, integer n)
+{
   char *p;
   while (!(p = (char *)calloc(e, n))) {
     DPSOutOfMemory();
     }
   return p;
-  }
+}
 
 
 
-void DPSSafeSetLastNameIndex(ctxt) DPSContext ctxt; {
+void DPSSafeSetLastNameIndex(DPSContext ctxt)
+{
   /* we're about to call the error handler, so roll back the
      lastNameIndex to the last known valid index */
   DPSCheckInitClientGlobals();
   if (ctxt != dummyCtx && ctxt->space != NIL)
     ((DPSPrivContext)ctxt)->lastNameIndex = ((DPSPrivSpace)(ctxt->space))->lastNameIndex;
-  }
+}
 
-void DPSCheckInitClientGlobals() {
+void DPSCheckInitClientGlobals(void)
+{
   if (!DPSglobals) {
     DPSglobals = (Globals)DPScalloc(sizeof(GlobalsRec), 1);
     globLastNameIndex = -1;
     }
-  }
+}
 
 /**************************************************************/
 /* Procedures that support the DPSCreateContext context procs */
 /**************************************************************/
 
 /* ARGSUSED */
-static void ReleaseInput(unused, buffer)
-  char *unused; char *buffer; {
+static void ReleaseInput(
+  char *unused, char *buffer)
+{
   ContextBuffer cb = (ContextBuffer)buffer;
   if (cb == NIL) return;
   cb->next = contextBuffers;
   contextBuffers = cb;
   queuedBuffers--;
-  }
+}
 
 /* ARGSUSED */
-static void StuffResultVal(ctxt, result, tag, obj)
-  DPSContext ctxt;
-  DPSResults result;
-  integer tag;
-  DPSBinObj obj; {
+static void StuffResultVal(
+  DPSContext ctxt,
+  DPSResults result,
+  integer tag,
+  DPSBinObj obj)
+{
 
   integer type = obj->attributedType & ~DPS_EXEC;
   integer nObjs = 1;
@@ -185,7 +192,7 @@
     if (result->count == -1 && nObjs != 1) {
       DPSSafeSetLastNameIndex(ctxt);
       if (ctxt->errorProc != NIL)
-	(*ctxt->errorProc)(ctxt, dps_err_resultTypeCheck, (char *)obj, 0);
+	(*ctxt->errorProc)(ctxt, dps_err_resultTypeCheck, (long unsigned)obj, 0);
       return;
       }
     obj = (DPSBinObj) ((char *)obj + obj->val.arrayVal);
@@ -274,7 +281,7 @@
 	if (nObjs != 1) {
 	  DPSSafeSetLastNameIndex(ctxt);
 	  if (ctxt->errorProc != NIL)
-	    (*ctxt->errorProc)(ctxt, dps_err_resultTypeCheck, (char *)obj, 0);
+	    (*ctxt->errorProc)(ctxt, dps_err_resultTypeCheck, (long unsigned)obj, 0);
 	  }
 	else if (type == DPS_STRING) {
 	  if (result->count == -1) {
@@ -307,13 +314,13 @@
       default:
 	DPSSafeSetLastNameIndex(ctxt);
 	if (ctxt->errorProc != NIL)
-	  (*ctxt->errorProc)(ctxt, dps_err_resultTypeCheck, (char *)obj, 0);
+	  (*ctxt->errorProc)(ctxt, dps_err_resultTypeCheck, (long unsigned)obj, 0);
       } /* switch (result->type) */
 
     if (bump == 0) {
       DPSSafeSetLastNameIndex(ctxt);
       if (ctxt->errorProc != NIL)
-	(*ctxt->errorProc)(ctxt, dps_err_resultTypeCheck, (char *)obj, 0);
+	(*ctxt->errorProc)(ctxt, dps_err_resultTypeCheck, (long unsigned)obj, 0);
       return;
       }
     if (result->count != -1) {
@@ -324,13 +331,13 @@
     nObjs--;
     } while (nObjs > 0); /* do */
 
-  } /* StuffResultVal */
+} /* StuffResultVal */
 
 
-static void NumFormatFromTokenType(t, numFormat)
-  unsigned char t;
-  DPSNumFormat *numFormat; {
-  
+static void NumFormatFromTokenType(
+  unsigned char t,
+  DPSNumFormat *numFormat)
+{
   switch (t) {
     case DPS_HI_IEEE:
       *numFormat = dps_ieee;
@@ -346,7 +353,7 @@
       break;
     default: DPSCantHappen();
     }
-  }
+}
  
 
 #if !IEEEFLOAT
@@ -355,7 +362,8 @@
   integer nObjs;
   DPSBinObj currObj;
   char *base;
-  unsigned char tokenType; {
+  unsigned char tokenType;
+{
   DPSNumFormat numFormat;
   
   NumFormatFromTokenType(tokenType, &numFormat);
@@ -387,30 +395,32 @@
       } /* end switch */
     ++currObj;
     } /* end while */
-  }
+}
 #endif /* !IEEEFLOAT */
   
-boolean DPSKnownContext(ctxt) DPSContext ctxt; {
+boolean DPSKnownContext(DPSContext ctxt)
+{
   DPSPrivContext cc, c = (DPSPrivContext) ctxt;
   DPSPrivSpace ss;
   for (ss = spaces; ss != NIL; ss = ss->next)
     for (cc = ss->firstContext; cc != NIL; cc = cc->next)
       if (cc == c) return true;
   return false;
-  }
+}
 
-boolean DPSKnownSpace(space) DPSSpace space; {
+boolean DPSKnownSpace(DPSSpace space)
+{
   DPSPrivSpace ss, s = (DPSPrivSpace) space;
   for (ss = spaces; ss != NIL; ss = ss->next)
     if (ss == s) return true;
   return false;
-  }
+}
 
-void DPSclientPrintProc (ctxt, buf, nch)
-  DPSContext ctxt;
-  char	     *buf;
-  integer    nch;
-  {
+void DPSclientPrintProc (
+  DPSContext ctxt,
+  char	     *buf,
+  unsigned    nch)
+{
   DPSPrivContext cc = (DPSPrivContext) ctxt;
 
 #define DPS_SEQ_MIN 2
@@ -431,8 +441,8 @@
     }
   while (nch > 0) {
     char *oldBuf = NIL;
-    integer oldNch = 0;
-    integer n;
+    unsigned oldNch = 0;
+    unsigned n;
     if (cc->objBuf) { /* we're buffering */
       unsigned long int m;
       char *b = cc->objBuf + cc->nObjBufChars;
@@ -446,7 +456,7 @@
       b = cc->objBuf;
       minSize = (*(b+1) == 0) ? DPS_EXT_HEADER_SIZE : DPS_HEADER_SIZE;
       if (cc->nObjBufChars < minSize) {
-	if (nch + cc->nObjBufChars < minSize) {
+	if (nch + cc->nObjBufChars < (unsigned) minSize) {
 	  os_bcopy(buf, b + cc->nObjBufChars, nch);
 	  cc->nObjBufChars += nch;
 	  return;
@@ -471,7 +481,7 @@
       /* here with m = BOS total length in bytes, b = cc->objBuf */
       cc->objBuf = (char *)realloc(b, m);
 
-      if (nch < m - cc->nObjBufChars) {
+      if (nch + cc->nObjBufChars < m) {
 	os_bcopy(buf, cc->objBuf + cc->nObjBufChars, nch);
 	cc->nObjBufChars += nch;
 	return;
@@ -509,9 +519,9 @@
       DPSExtendedBinObjSeq bos;
       DPSExtendedBinObjSeqRec bosRec;
       DPSBinObj firstObj;
-      integer t;
+      unsigned t;
       unsigned long int m;
-      integer minSize;
+      unsigned minSize;
       
       if (nch < DPS_SEQ_MIN) {
 	/* gotta buffer it */
@@ -579,7 +589,7 @@
 	DPSSafeSetLastNameIndex((DPSContext)cc);
 	DURING
 	  if (cc->errorProc != NIL)
-	    (*cc->errorProc)((DPSContext)cc, dps_err_ps, buf, m);
+	    (*cc->errorProc)((DPSContext)cc, dps_err_ps, (unsigned long)buf, m);
 	HANDLER
 	  if (oldBuf) free(buf);
 	  RERAISE;
@@ -589,7 +599,7 @@
 	if (!cc->resultTable || t > cc->resultTableLength) {
 	  if (cc->chainParent == NIL && cc->errorProc != NIL) {
 	    DPSSafeSetLastNameIndex((DPSContext)cc);
-	    (*cc->errorProc)((DPSContext)cc, dps_err_resultTagCheck, buf, m);
+	    (*cc->errorProc)((DPSContext)cc, dps_err_resultTagCheck, (unsigned long)buf, m);
 	    }
 	  }
 	else if (t == cc->resultTableLength) {
@@ -618,9 +628,8 @@
 /**************************************/
 
 
-static void procWaitContext(ctxt)
-  DPSContext ctxt; {
-
+static void procWaitContext(DPSContext ctxt)
+{
   typedef struct {
     unsigned char tokenType;
     unsigned char topLevelCount;
@@ -646,10 +655,10 @@
   ctxt->resultTableLength = 0;  /* same value as termination tag */
   DPSBinObjSeqWrite(ctxt, (char *) &dpsF,sizeof(DPSQ));
   DPSAwaitReturnValues(ctxt);
-  }
+}
 
-static void procUpdateNameMap(ctxt)
-  DPSContext ctxt; {
+static void procUpdateNameMap(DPSContext ctxt)
+{
   integer i;
   DPSPrivContext c = (DPSPrivContext) ctxt;
   DPSPrivSpace s = (DPSPrivSpace) ctxt->space;
@@ -672,47 +681,51 @@
   }
 }
 
-static void procWriteData(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+static void procWriteData(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   /* safe to call with chain */
   DPSinnerProcWriteData(ctxt, buf, count);
   if (ctxt->chainChild != NIL) DPSWriteData(ctxt->chainChild, buf, count);
-  }
+}
 
-static void procBinObjSeqWrite(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+static void procBinObjSeqWrite(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   if (((DPSPrivContext)ctxt)->lastNameIndex < globLastNameIndex) DPSUpdateNameMap(ctxt);
   DPSinnerProcWriteData(ctxt, buf, count);
   if (ctxt->chainChild != NIL) DPSBinObjSeqWrite(ctxt->chainChild, buf, count);
-  }
+}
 
-static void procWriteStringChars(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+static void procWriteStringChars(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   DPSinnerProcWriteData(ctxt, buf, count);
   if (ctxt->chainChild != NIL) DPSWriteStringChars(ctxt->chainChild, buf, count);
-  }
+}
 
-static void procWritePostScript(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+static void procWritePostScript(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   DPSinnerProcWriteData(ctxt, buf, count);
   if (ctxt->chainChild != NIL) DPSWritePostScript(ctxt->chainChild, buf, count);
-  }
+}
 
-static void innerProcWriteNumstring(ctxt, type, data, size, scale, writeProc)
-    DPSContext ctxt;
-    DPSDefinedType type;
-    char *data;
-    unsigned int size;
-    int scale;
-    void (*writeProc)();
+static void innerProcWriteNumstring(
+    DPSContext ctxt,
+    DPSDefinedType type,
+    char *data,
+    unsigned int size,
+    int scale,
+    void (*writeProc)(DPSContext, char *, unsigned))
 {
     unsigned char HNumHeader[4];
     register int i;
@@ -738,6 +751,9 @@
 	    HNumHeader[1] = 48 + ((DPS_DEF_TOKENTYPE % 2) * 128)
                 + ((DPS_DEF_TOKENTYPE >= 130) ? 1 : 0);
 	    break;
+
+	default:
+	    break;
     }
 
     HNumHeader[(DPS_DEF_TOKENTYPE % 2) ? 2 : 3] = (unsigned char) size;
@@ -751,7 +767,7 @@
 		(*writeProc)(ctxt, (char *) data, size * 4);
 	    } else {
 		while (size > 0) {
-		    for (i = 0; i < NBUFSIZE && i < size; i++) {
+		    for (i = 0; i < NBUFSIZE && (unsigned) i < size; i++) {
 			ibuf[i] = ((long *) data)[i];
 		    }
 		    (*writeProc)(ctxt, (char *) ibuf,
@@ -771,25 +787,29 @@
 
 	case dps_tFloat:
 	    (*writeProc)(ctxt, (char *) data, size * sizeof(float));
+
+	default:
+	    break;
     }
 } /* innerProcWriteNumstring */
 
-static void procWriteNumstring(ctxt, type, data, size, scale)
-    DPSContext ctxt;
-    DPSDefinedType type;
-    char *data;
-    unsigned int size;
-    int scale;
+static void procWriteNumstring(
+    DPSContext ctxt,
+    DPSDefinedType type,
+    char *data,
+    unsigned int size,
+    int scale)
 {
   innerProcWriteNumstring(ctxt, type, data, size, scale, DPSinnerProcWriteData);
   if (ctxt->chainChild != NIL) DPSWriteNumString(ctxt->chainChild, type, data, size, scale);
-  }
+}
 
-static void writeTypedObjectArray(ctxt, type, array, length)
-  DPSContext ctxt;
-  DPSDefinedType type;
-  char *array;
-  unsigned int length; {
+static void writeTypedObjectArray(
+  DPSContext ctxt,
+  DPSDefinedType type,
+  char *array,
+  unsigned int length)
+{
 
 #define DPSMAX_SEQ 10		 
   unsigned int i;
@@ -951,10 +971,10 @@
 
     default:;
     }
-  } /* writeTypedObjectArray */
+} /* writeTypedObjectArray */
 
-static void procDestroyContext(ctxt)
-  DPSContext ctxt; {
+static void procDestroyContext(DPSContext ctxt)
+{
   DPSPrivContext c = (DPSPrivContext)ctxt, cc, prev;
   DPSPrivSpace ss = (DPSPrivSpace)(c->space);
 
@@ -985,9 +1005,10 @@
  
   DPSPrivateDestroyContext(ctxt);
   free(c);
-  }
+}
 
-static void procDestroySpace(space) DPSSpace space; {
+static void procDestroySpace(DPSSpace space)
+{
   DPSPrivSpace ns, prevS, ss = (DPSPrivSpace)space;
   integer sid = ss->sid;
 
@@ -1007,14 +1028,14 @@
   
   DPSPrivateDestroySpace(space);
   free(ss);
-  }
+}
 
-static void procInterrupt(ctxt)
-  DPSContext ctxt; {
+static void procInterrupt(DPSContext ctxt)
+{
   DPSPrivContext c = (DPSPrivContext)ctxt;
-  DPSSendInterrupt(c->wh, c->cid, DPSclientPrintProc);
+  DPSSendInterrupt((XDPSPrivContext)c->wh, c->cid, DPSclientPrintProc);
   if (ctxt->chainChild != NIL) DPSInterruptContext(ctxt->chainChild);
-  }
+}
 
 
 /****************************************************************/
@@ -1024,15 +1045,17 @@
 /* precondition: (c >= 129 && c <= 159), which means that c is the
    first byte of either a binary token or a binary object sequence */
 
-static boolean IsBinaryToken(c) unsigned char c; {
+static boolean IsBinaryToken(unsigned char c)
+{
   return (c != DPS_HI_IEEE && c != DPS_LO_IEEE
 	  && c != DPS_HI_NATIVE && c != DPS_LO_NATIVE);
-  }
+}
 
 /* returns the number of initial bytes of a given goody that are
    required to figure out how many bytes are needed for the entire goody */
    
-static integer GetHdrNBytes(t) unsigned char *t; {
+static unsigned GetHdrNBytes(unsigned char *t)
+{
   if (!IsBinaryToken(*t)) {
     if (*(++t) == 0) return DPS_EXT_HEADER_SIZE;
     else return DPS_HEADER_SIZE;
@@ -1050,12 +1073,13 @@
       if (*t > 149 && *t < 160) return(1); /* unassigned */
       else return(1);
     }
-  }
+}
 
 
-static void WriteHomogeneousArrayAsASCII(ctxt, buf)
-  DPSContext ctxt;
-  register unsigned char *buf; {
+static void WriteHomogeneousArrayAsASCII(
+  DPSContext ctxt,
+  register unsigned char *buf)
+{
   Swap32Rec n32;
   Swap16Rec n16;
   register unsigned char *b;
@@ -1118,12 +1142,13 @@
 	  }
   else DPSCantHappen();
       DPSPrintf(ctxt, "\n] ");
-  } /* WriteHomogeneousArrayAsASCII */
+} /* WriteHomogeneousArrayAsASCII */
 
 /* returns the number of bytes needed for the entire goody. buf points
    to enough initial bytes of the goody to figure this out (see above). */
    
-static integer GetNBytes(buf) register unsigned char *buf; {
+static integer GetNBytes(register unsigned char *buf)
+{
   unsigned short int nBytes;
   register unsigned char *r = (unsigned char *)&nBytes;
   
@@ -1215,18 +1240,16 @@
       default: nBytes = 1; /* unassigned */
       }
   return(nBytes);
-  }
+}
   
-static void WriteSeqAsAscii(ctxt, base, currObj, nObjs, tokenType,
-			    numstringOffsets)
-  DPSContext ctxt;
-  char *base;
-  DPSBinObj currObj;
-  unsigned int nObjs; 
-  unsigned char tokenType;
-  int *numstringOffsets;
+static void WriteSeqAsAscii(
+  DPSContext ctxt,
+  char *base,
+  DPSBinObj currObj,
+  unsigned int nObjs,
+  unsigned char tokenType,
+  int *numstringOffsets)
 {
-
   integer nLineObjs = 0;
   DPSNumFormat numFormat;
   float f;
@@ -1275,7 +1298,7 @@
 	DPSPrintf(ctxt, "%g ", f);
 	break;
       case DPS_NAME: {
-	char *p;
+	char *p = 0;
 	integer index;
 	
 	index = currObj->val.nameVal;
@@ -1368,12 +1391,13 @@
 
     DPSPrintf(ctxt, "\n");
 
-  } /* WriteSeqAsAscii */
+} /* WriteSeqAsAscii */
 
-static void ConvertAndWriteSeqAsData(ctxt, bosBuf, pass)
-  DPSContext ctxt;
-  char *bosBuf;
-  int pass; {
+static void ConvertAndWriteSeqAsData(
+  DPSContext ctxt,
+  char *bosBuf,
+  int pass)
+{
   DPSPrivContext cc = (DPSPrivContext) ctxt;
   DPSExtendedBinObjSeq bos;
   DPSExtendedBinObjSeqRec bosRec;
@@ -1452,7 +1476,7 @@
 
     if (type == DPS_STRING && newObj.length > 0) {
       /* keep track of where strings start */
-      firstCharOffset = (newObj.val.stringVal < firstCharOffset)
+      firstCharOffset = ((unsigned) newObj.val.stringVal < firstCharOffset)
 	? newObj.val.stringVal : firstCharOffset;
       }
     if (type == DPS_NAME) {
@@ -1476,7 +1500,7 @@
 	  }
       else { /* name is already a string */
 	  /* keep track of where strings start */
-	  firstCharOffset = (newObj.val.nameVal < firstCharOffset)
+	  firstCharOffset = ((unsigned) newObj.val.nameVal < firstCharOffset)
 	    ? newObj.val.nameVal : firstCharOffset;
 	}
       } /* end if type == DPS_NAME */
@@ -1532,7 +1556,7 @@
     default:;
     }
     
-  } /* ConvertAndWriteSeqAsData */
+} /* ConvertAndWriteSeqAsData */
 
 #define MIN16 -32768
 #define MAX16 32767
@@ -1541,10 +1565,11 @@
    if all of the array elements are "integers", or all are "reals".
    Will return -1 for any other case. */
    
-static integer TestHomogeneous(aryObj, length, numFormat)
-  DPSBinObj aryObj;
-  unsigned short length; 
-  DPSNumFormat numFormat; {
+static integer TestHomogeneous(
+  DPSBinObj aryObj,
+  unsigned short length,
+  DPSNumFormat numFormat)
+{
   integer tmp, r = -1;
   
   while (length--) {
@@ -1581,16 +1606,15 @@
     ++aryObj;
     }
   return(r);
-  } /* TestHomogeneous */
+} /* TestHomogeneous */
 
-static void WriteSeqAsTokens(ctxt, base, currObj, nObjs, tokenType,
-			     numstringOffsets)
-  DPSContext ctxt;
-  char *base;
-  DPSBinObj currObj;
-  unsigned int nObjs; 
-  unsigned char tokenType;
-  int *numstringOffsets;
+static void WriteSeqAsTokens(
+  DPSContext ctxt,
+  char *base,
+  DPSBinObj currObj,
+  unsigned int nObjs,
+  unsigned char tokenType,
+  int *numstringOffsets)
 {
   int nLineObjs = 0;
   DPSNumFormat numFormat;
@@ -1652,7 +1676,7 @@
 	DPSWriteData(ctxt, (char *) &currObj->val.realVal, 4);
 	break;
       case DPS_NAME: {
-	char *p;
+	char *p = 0;
 	integer index = currObj->val.nameVal;
 	
 	length = currObj->length;
@@ -1767,11 +1791,12 @@
     } /* end while */
 
     DPSPrintf(ctxt, "\n");
-  } /* WriteSeqAsTokens */
+} /* WriteSeqAsTokens */
 
-static void WriteTokenAsAscii(ctxt, buf)
-  DPSContext ctxt;
-  register unsigned char *buf; {
+static void WriteTokenAsAscii(
+  DPSContext ctxt,
+  register unsigned char *buf)
+{
   Swap32Rec n32;
   Swap16Rec n16;
   register unsigned char *b;
@@ -1803,7 +1828,7 @@
       break;
     case 137: {  /* 16 or 32-bit fixed */
 	unsigned char r = *buf++;
-	float f;
+	float f = 0.0;
 	boolean hi = (r < 128);
 	
 	if (!hi) r -= 128;
@@ -1907,11 +1932,9 @@
       DPSPrintf(ctxt, "%s ", DPSSysNames[*buf]);
       break;
     case 147:	/* literal user name index */
-      if ((int) *buf > globLastNameIndex) /* +++ */;
       DPSPrintf(ctxt, "/%s ", DPSNameFromIndex(*buf));
       break;
     case 148:	/* executable user name index */
-      if ((int) *buf > globLastNameIndex) /* +++ */;
       DPSPrintf(ctxt, "%s ", DPSNameFromIndex(*buf));
       break;
     case 149: {  /* homogeneous number array */
@@ -1920,17 +1943,17 @@
       }
     default:; /* unassigned */
     }
-  } /* WriteTokenAsAscii */
+} /* WriteTokenAsAscii */
   
 
 /* WriteEntireGoody converts an entire binary token or binary object
    sequence as specified by ctxt's encoding parameters. Write the
    converted bytes via DPSWriteData.  buf points to the complete goody. */
    
-static void WriteEntireGoody(ctxt, buf, numstringOffsets)
-  DPSContext ctxt;
-  unsigned char *buf;
-  int *numstringOffsets;
+static void WriteEntireGoody(
+  DPSContext ctxt,
+  unsigned char *buf,
+  int *numstringOffsets)
 {
 
   DPSExtendedBinObjSeq bos = (DPSExtendedBinObjSeq) buf;
@@ -1961,16 +1984,16 @@
     case dps_binObjSeq:
       if (ctxt->nameEncoding == dps_strings) {
 	  /* takes three passes to do conversions */
-	  ConvertAndWriteSeqAsData(ctxt, (unsigned char *) buf, 0);
-	  ConvertAndWriteSeqAsData(ctxt, (unsigned char *) buf, 1);
-	  ConvertAndWriteSeqAsData(ctxt, (unsigned char *) buf, 2);
+	  ConvertAndWriteSeqAsData(ctxt, (char *) buf, 0);
+	  ConvertAndWriteSeqAsData(ctxt, (char *) buf, 1);
+	  ConvertAndWriteSeqAsData(ctxt, (char *) buf, 2);
 	}
       else if (bos->tokenType != DPS_DEF_TOKENTYPE
 	       || cc->numFormat != DPSDefaultNumFormat) {
 	  /* first pass just writes modified seqHead */
-	  ConvertAndWriteSeqAsData(ctxt, (unsigned char *) buf, 0);
+	  ConvertAndWriteSeqAsData(ctxt, (char *) buf, 0);
 	  /* second pass converts numbers and writes the sequence */
-	  ConvertAndWriteSeqAsData(ctxt, (unsigned char *) buf, 1);
+	  ConvertAndWriteSeqAsData(ctxt, (char *) buf, 1);
 	}
       else DPSWriteData(ctxt, (char *) buf, bos->length);
       break;
@@ -2000,37 +2023,41 @@
 /* Context procs for DPSCreateTextContext */
 /**************************************/
 
-static void textWriteData(ctxt, buf, nch)
-  DPSContext ctxt; char *buf; unsigned int nch; {
+static void textWriteData(DPSContext ctxt, char *buf, unsigned int nch)
+{
   (*ctxt->textProc)(ctxt, buf, nch);
   if (ctxt->chainChild != NIL) DPSWriteData(ctxt->chainChild, buf, nch);
-  }
+}
 
-static void textFlushContext(ctxt) DPSContext ctxt; {
+static void textFlushContext(DPSContext ctxt)
+{
   if (ctxt->chainChild != NIL) DPSFlushContext(ctxt->chainChild);
-  }
+}
 
-static void textInterruptContext(ctxt) DPSContext ctxt; {
+static void textInterruptContext(DPSContext ctxt)
+{
   if (ctxt->chainChild != NIL) DPSInterruptContext(ctxt->chainChild);
-  }
+}
 
-static void textDestroyContext(ctxt) DPSContext ctxt; {
+static void textDestroyContext(DPSContext ctxt)
+{
   DPSPrivContext c = (DPSPrivContext)ctxt;
 
   DPSUnchainContext(ctxt);
 
   free(c);
-  }
+}
 
-static void textInnerWritePostScript(ctxt, buf, nch)
-  DPSContext ctxt; char *buf; unsigned int nch; {
+static void textInnerWritePostScript(
+  DPSContext ctxt, char *buf, unsigned int nch)
+{
   DPSPrivContext cc = (DPSPrivContext)ctxt;
   while (nch > 0) {
     char *oldBuf = NIL;
     integer oldNch = 0;
-    integer n;
+    unsigned n;
     if (cc->outBuf) { /* we're buffering */
-      integer m;
+      unsigned m;
       integer bst;
       if (!IsBinaryToken(cc->outBuf[0]) && cc->nOutBufChars < DPS_SEQ_MIN) {
 	char *tb = cc->outBuf + cc->nOutBufChars;
@@ -2044,7 +2071,7 @@
 	/* # bytes needed to determine size */
       if (cc->nOutBufChars < bst) {
 	char *b = cc->outBuf;
-	if (nch + cc->nOutBufChars < bst) {
+	if (nch + cc->nOutBufChars < (unsigned) bst) {
 	  os_bcopy(buf, cc->outBuf + cc->nOutBufChars, nch);
 	  cc->nOutBufChars += nch;
 	  return;
@@ -2061,7 +2088,7 @@
       else m = GetNBytes((unsigned char *) cc->outBuf);
 
       /* here with size of entire goody in m and outBuf set up */
-      if (nch < m - cc->nOutBufChars) {
+      if (nch + cc->nOutBufChars < m) {
 	os_bcopy(buf, cc->outBuf + cc->nOutBufChars, nch);
 	cc->nOutBufChars += nch;
 	return;
@@ -2100,7 +2127,7 @@
 
     if (nch != 0) {
       /* here with the next binary object sequence or encoded token */
-      integer m;
+      unsigned m = 0;
       integer bst;
       if (!IsBinaryToken(buf[0]) && nch < DPS_SEQ_MIN) {
 	/* gotta buffer it */
@@ -2111,10 +2138,10 @@
 	return;
 	}
       bst = GetHdrNBytes((unsigned char *) buf);
-      if (nch < bst || nch < (m = GetNBytes((unsigned char *) buf))) {
+      if (nch < (unsigned)bst || nch < (m = GetNBytes((unsigned char *) buf))) {
 	/* gotta buffer it */
 	DPSAssertWarn(!oldBuf, cc, "problem converting binary token/sequence (oldBuf)");
-	if (nch < bst) {
+	if (nch < (unsigned) bst) {
 	  cc->outBuf = (char *)DPScalloc(bst, 1);
 	  }
 	else {
@@ -2150,10 +2177,11 @@
 	}
       } /* if (nch != 0) */
     } /* while (nch > 0) */
-  } /* textInnerWritePostScript */
+} /* textInnerWritePostScript */
 
-static void textWritePostScript(ctxt, buf, nch)
-  DPSContext ctxt; char *buf; unsigned int nch; {
+static void textWritePostScript(
+  DPSContext ctxt, char *buf, unsigned int nch)
+{
   DPSContext children = ctxt->chainChild;
   /* disconnect temporarily so that high level procs can
      be called safely */
@@ -2168,13 +2196,14 @@
     ctxt->chainChild = children;
     DPSWritePostScript(ctxt->chainChild, buf, nch);
     }
-  }
+}
 
-static void textWriteStringChars(ctxt, buf, nch)
-  DPSContext ctxt; char *buf; unsigned int nch; {
+static void textWriteStringChars(
+  DPSContext ctxt, char *buf, unsigned int nch)
+{
   DPSContext children = ctxt->chainChild;
 
-  if (DPSCheckShared(ctxt)) return;
+  if (DPSCheckShared((DPSPrivContext)ctxt)) return;
   /* disconnect temporarily so that high level procs can
      be called safely */
   if (children != NIL) ctxt->chainChild = NIL;
@@ -2188,14 +2217,15 @@
     ctxt->chainChild = children;
     DPSWriteStringChars(ctxt->chainChild, buf, nch);
     }
-  }
+}
 
-static void textBinObjSeqWrite(ctxt, buf, nch)
-  DPSContext ctxt; char *buf; unsigned int nch; {
+static void textBinObjSeqWrite(
+  DPSContext ctxt, char *buf, unsigned int nch)
+{
   DPSContext children = ctxt->chainChild;
   DPSPrivContext c = (DPSPrivContext) ctxt;
 
-  if (DPSCheckShared(ctxt)) return;
+  if (DPSCheckShared(c)) return;
   if (c->lastNameIndex < globLastNameIndex)
     DPSUpdateNameMap(ctxt);
   /* disconnect temporarily so that high level procs can
@@ -2211,14 +2241,14 @@
     ctxt->chainChild = children;
     DPSBinObjSeqWrite(ctxt->chainChild, buf, nch);
     }
-  }
+}
 
-static void textWriteNumstring(ctxt, type, data, size, scale)
-    DPSContext ctxt;
-    DPSDefinedType type;
-    char *data;
-    unsigned int size;
-    int scale;
+static void textWriteNumstring(
+    DPSContext ctxt,
+    DPSDefinedType type,
+    char *data,
+    unsigned int size,
+    int scale)
 {
     DPSPrivContext cc = (DPSPrivContext) ctxt;
 #define BUFFER_GROW 10
@@ -2252,20 +2282,22 @@
 /********************************************/
 /* Public procs for dealing with user names */
 
-char *DPSNameFromIndex(index) long int index; {
+char *DPSNameFromIndex(long int index)
+{
   if (DPSglobals == NIL || index < 0 || index > globLastNameIndex
       || userNameDict == NIL)
     return NIL;
   return (char *) userNames[index];
-  }
+}
 
-void DPSMapNames(ctxt, nNames, names, indices)
-  DPSContext ctxt;
-  unsigned int nNames;
-  char **names;
-  int **indices; {
-  integer i;
-  char *last;
+void DPSMapNames(
+  DPSContext ctxt,
+  unsigned int nNames,
+  char **names,
+  int **indices)
+{
+  unsigned i;
+  char *last = names[0];
 
   DPSCheckInitClientGlobals();
 
@@ -2282,7 +2314,6 @@
     char *n = names[i];
     DPSContext c;
     
-    if (i == 0) last = names[0];
     if (n == NIL)
       n = last;
     else
@@ -2290,7 +2321,7 @@
     DPSAssert(n != NIL);
     if (strlen(n) > 128) {
       DPSSafeSetLastNameIndex(ctxt);
-      (*ctxt->errorProc)(ctxt, dps_err_nameTooLong, n, strlen(n));
+      (*ctxt->errorProc)(ctxt, dps_err_nameTooLong, (unsigned long) n, strlen(n));
       return;
       }
     j = DPSWDictLookup(userNameDict, n);
@@ -2325,15 +2356,16 @@
 	((DPSPrivContext)c)->lastNameIndex = globLastNameIndex;
       }
     } /* for */
-  }
+}
      
 /**********************/
 /* Other public procs */
 
-void DPSDefaultErrorProc(ctxt, errorCode, arg1, arg2)
-  DPSContext ctxt;
-  DPSErrorCode errorCode;
-  long unsigned int arg1, arg2; {
+void DPSDefaultErrorProc(
+  DPSContext ctxt,
+  DPSErrorCode errorCode,
+  long unsigned int arg1, long unsigned int arg2)
+{
 
   DPSTextProc textProc = DPSGetCurrentTextBackstop();
   
@@ -2400,7 +2432,7 @@
     case dps_err_invalidContext:
       if (textProc != NIL) {
 	char m[100];
-	(void) sprintf(m, "%s%s%d%s", prefix, contextinfix, arg1, suffix);
+	(void) sprintf(m, "%s%s%ld%s", prefix, contextinfix, arg1, suffix);
 	(*textProc)(ctxt, m, strlen(m));
 	}
       break;
@@ -2424,10 +2456,9 @@
 	DPSDefaultPrivateHandler(ctxt, errorCode, arg1, arg2, prefix, suffix);
 	break;
     }
-  } /* DPSDefaultErrorProc */
+} /* DPSDefaultErrorProc */
 
-void DPSCheckRaiseError(c)
-    DPSContext c;
+void DPSCheckRaiseError(DPSContext c)
 {
     DPSPrivContext cc = (DPSPrivContext) c;
     if (cc != NULL && cc->resyncing) {
@@ -2442,16 +2473,18 @@
 
 /* dps_err_invalidAccess is now defined for all clients. */
 
-static void textAwaitReturnValues(ctxt) DPSContext ctxt; {
+static void textAwaitReturnValues(DPSContext ctxt)
+{
   (*ctxt->errorProc)(ctxt, dps_err_invalidAccess, 0, 0);
-  }
+}
 
-static void Noop() {
-  }
+static void Noop(void)
+{
+}
   
-DPSContext DPSCreateTextContext(textProc, errorProc)
-  DPSTextProc textProc; DPSErrorProc errorProc;
-  {
+DPSContext DPSCreateTextContext(
+  DPSTextProc textProc, DPSErrorProc errorProc)
+{
   DPSPrivContext c;
 
   if (DPSInitialize () != 0) return((DPSContext) NIL);
@@ -2478,7 +2511,7 @@
     {
     textSpace = (DPSPrivSpace) DPScalloc(sizeof (DPSPrivSpaceRec), 1);
     textSpace->procs = (DPSSpaceProcs) DPScalloc(sizeof (DPSSpaceProcsRec), 1);
-    textSpace->procs->DestroySpace = Noop;
+    textSpace->procs->DestroySpace = (DPSSpaceProc) Noop;
     textSpace->lastNameIndex = -1;
     DPSInitPrivateSpaceFields(textSpace);
     }
@@ -2486,28 +2519,29 @@
 
   DPSInitPrivateTextContextFields(c, textSpace);
   return (DPSContext)c;
-  } /* DPSCreateTextContext */
+} /* DPSCreateTextContext */
 
 
-static DPSContext CreateDummyContext() {
+static DPSContext CreateDummyContext(void)
+{
   DPSPrivContext c;
 
   DPSCheckInitClientGlobals();
   if (!dummyCtxProcs) {
     dummyCtxProcs = (DPSProcs)DPScalloc(sizeof(DPSProcsRec), 1);
-    dummyCtxProcs->BinObjSeqWrite = Noop;
-    dummyCtxProcs->WriteTypedObjectArray = Noop;
-    dummyCtxProcs->WriteStringChars = Noop;
-    dummyCtxProcs->WritePostScript = Noop;
-    dummyCtxProcs->WriteData = Noop;
-    dummyCtxProcs->FlushContext = Noop;
-    dummyCtxProcs->ResetContext = Noop;
-    dummyCtxProcs->WaitContext = Noop;
-    dummyCtxProcs->UpdateNameMap = Noop;
-    dummyCtxProcs->AwaitReturnValues = Noop;
-    dummyCtxProcs->Interrupt = Noop;
-    dummyCtxProcs->DestroyContext = Noop;
-    dummyCtxProcs->WriteNumString = Noop;
+    dummyCtxProcs->BinObjSeqWrite = (DPSContextBufProc) Noop;
+    dummyCtxProcs->WriteTypedObjectArray = (DPSContextTypedArrayProc) Noop;
+    dummyCtxProcs->WriteStringChars = (DPSContextBufProc) Noop;
+    dummyCtxProcs->WritePostScript = (DPSContextBufProc) Noop;
+    dummyCtxProcs->WriteData = (DPSContextBufProc) Noop;
+    dummyCtxProcs->FlushContext = (DPSContextProc) Noop;
+    dummyCtxProcs->ResetContext = (DPSContextProc) Noop;
+    dummyCtxProcs->WaitContext = (DPSContextProc) Noop;
+    dummyCtxProcs->UpdateNameMap = (DPSContextProc) Noop;
+    dummyCtxProcs->AwaitReturnValues = (DPSContextProc) Noop;
+    dummyCtxProcs->Interrupt = (DPSContextProc) Noop;
+    dummyCtxProcs->DestroyContext = (DPSContextProc) Noop;
+    dummyCtxProcs->WriteNumString = (DPSWriteNumStringProc) Noop;
     }
 
   c = (DPSPrivContext)DPScalloc(sizeof(DPSPrivContextRec), 1);
@@ -2519,39 +2553,43 @@
   c->numstringOffsets = NULL;
 
   return (DPSContext)c;
-  } /* CreateDummyContext */
+} /* CreateDummyContext */
 
-void DPSSetTextBackstop(textProc)
-  DPSTextProc textProc; {
+void DPSSetTextBackstop(DPSTextProc textProc)
+{
   DPSCheckInitClientGlobals();
   if (!dummyCtx) dummyCtx = CreateDummyContext();
   dummyCtx->textProc = textProc;
-  }
+}
 
-DPSTextProc DPSGetCurrentTextBackstop() {
+DPSTextProc DPSGetCurrentTextBackstop(void)
+{
   DPSCheckInitClientGlobals();
   if (dummyCtx == NIL) return NIL;
   else return dummyCtx->textProc;
-  }
+}
 
-void DPSSetErrorBackstop(errorProc)
-  DPSErrorProc errorProc; {
+void DPSSetErrorBackstop(DPSErrorProc errorProc)
+{
   DPSCheckInitClientGlobals();
   if (!dummyCtx) dummyCtx = CreateDummyContext();
   dummyCtx->errorProc = errorProc;
-  }
+}
 
-DPSErrorProc DPSGetCurrentErrorBackstop() {
+DPSErrorProc DPSGetCurrentErrorBackstop(void)
+{
   DPSCheckInitClientGlobals();
   if (dummyCtx == NIL) return NIL;
   else return dummyCtx->errorProc;
-  }
+}
 
-static void NoteInitFailure() {
+static void NoteInitFailure(DPSContext ctxt, char *buf, long unsigned length)
+{
   initFailed = -1;
-  }
+}
 
-int DPSInitialize() {
+int DPSInitialize(void)
+{
   DPSCheckInitClientGlobals();
   if (!clientStarted) {
     clientStarted = true;
@@ -2560,14 +2598,14 @@
     /* textProc will not be used unless DPS initialization fails */
     }
   return initFailed;
-  }
+}
 
-DPSContext DPSCreateContext(wh, textProc, errorProc, space)
-  char *wh;
-  DPSTextProc textProc;
-  DPSErrorProc errorProc;
-  DPSSpace space;
-  {
+DPSContext DPSCreateContext(
+  char *wh,
+  DPSTextProc textProc,
+  DPSErrorProc errorProc,
+  DPSSpace space)
+{
   
   DPSPrivSpace ss;
   DPSPrivContext c;
@@ -2583,7 +2621,7 @@
     ctxProcs->WriteData = procWriteData;
     ctxProcs->UpdateNameMap = procUpdateNameMap;
     ctxProcs->Interrupt = procInterrupt;
-    ctxProcs->WriteNumString = procWriteNumstring;
+    ctxProcs->WriteNumString = (DPSWriteNumStringProc) procWriteNumstring;
     }
   if (!spaceProcs) {
     spaceProcs = (DPSSpaceProcs)DPScalloc(sizeof(DPSSpaceProcsRec), 1);
@@ -2622,7 +2660,10 @@
   DPSInitPrivateContextFields(c, ss);
 
   c->numFormat = DPSCreatePrivContext(
-	wh, (DPSContext)c, &c->cid, &ss->sid,
+	(XDPSPrivContext)wh,
+	(DPSContext)c,
+	(ContextPSID *)&c->cid,
+	(SpaceXID *)&ss->sid,
 	(space == NIL), DPSclientPrintProc);
   if (c->numFormat ==  (DPSNumFormat) -1)
     { /* can't create the context */
@@ -2635,16 +2676,17 @@
     return NIL;
     }
   else return (DPSContext)c;
-  } /* DPSCreateContext */
+} /* DPSCreateContext */
 
-char *DPSSetWh(ctxt, newWh) 
-  DPSContext ctxt;
-  char *newWh; {
+char *DPSSetWh(
+  DPSContext ctxt,
+  char *newWh)
+{
   DPSPrivContext cc = (DPSPrivContext) ctxt;
   char *tmp = cc->wh;
   cc->wh = newWh;
   return(tmp);
-  }
+}
 
 /*
    The chainParent field is non-NIL if this context automatically receives
@@ -2653,7 +2695,8 @@
    The chainChild field is non-NIL if this context automatically sends along
    to the referenced (child) context a copy of any PostScript code received.
 */
-int DPSChainContext(parent, child) DPSContext parent, child; {
+int DPSChainContext(DPSContext parent, DPSContext child)
+{
   DPSContext cc = child->chainChild;
 
   if (child->chainParent != NIL)
@@ -2673,9 +2716,10 @@
     (void) DPSChainContext(child, cc);
     }
   return 0;
-  }
+}
 
-void DPSUnchainContext(ctxt) DPSContext ctxt; {
+void DPSUnchainContext(DPSContext ctxt)
+{
   DPSContext p = ctxt->chainParent;
   DPSContext c = ctxt->chainChild;
 
@@ -2689,95 +2733,103 @@
     c->chainParent = p;
     ctxt->chainChild = NIL;
     }
-  }
+}
 
 /****************/
 /* Veneer procs */
 
-void DPSAwaitReturnValues(ctxt)
-  DPSContext ctxt; {
+void DPSAwaitReturnValues(DPSContext ctxt)
+{
   (*(ctxt)->procs->AwaitReturnValues)((ctxt));
-  }
+}
 
-void DPSDestroyContext(ctxt)
-  DPSContext ctxt; {
+void DPSDestroyContext(DPSContext ctxt)
+{
   (*(ctxt)->procs->DestroyContext)((ctxt));
-  }
+}
 
-void DPSDestroySpace(spc)
-  DPSSpace spc; {
+void DPSDestroySpace(DPSSpace spc)
+{
   (*(spc)->procs->DestroySpace)((spc));
-  }
+}
 
-void DPSFlushContext(ctxt)
-  DPSContext ctxt; {
+void DPSFlushContext(DPSContext ctxt)
+{
   (*(ctxt)->procs->FlushContext)((ctxt));
-  }
+}
 
-DPSContext DPSGetCurrentContext() { return DPSGlobalContext; }
+DPSContext DPSGetCurrentContext(void) { return DPSGlobalContext; }
 
-void DPSInterruptContext(ctxt)
-  DPSContext ctxt; {
+void DPSInterruptContext(DPSContext ctxt)
+{
   (*(ctxt)->procs->Interrupt)((ctxt));
-  }
+}
 
-DPSContext DPSPrivCurrentContext() { return DPSGlobalContext; }
+DPSContext DPSPrivCurrentContext(void) { return DPSGlobalContext; }
 
-void DPSResetContext(ctxt)
-  DPSContext ctxt; {
+void DPSResetContext(DPSContext ctxt)
+{
   (*(ctxt)->procs->ResetContext)((ctxt));
-  }
+}
 
-void DPSSetResultTable(ctxt, tbl, len)
-  register DPSContext ctxt;
-  DPSResults tbl;
-  unsigned int len; {
+void DPSSetResultTable(
+  register DPSContext ctxt,
+  DPSResults tbl,
+  unsigned int len)
+{
   (ctxt)->resultTable = (tbl);
   (ctxt)->resultTableLength = (len);
-  }
+}
 
-void DPSSetContext(ctxt)
-  DPSContext ctxt; {
+void DPSSetContext(
+  DPSContext ctxt)
+{
   DPSGlobalContext = ctxt;
-  }
+}
 
-void DPSUpdateNameMap(ctxt)
-  DPSContext ctxt; {
+void DPSUpdateNameMap(
+  DPSContext ctxt)
+{
   (*(ctxt)->procs->UpdateNameMap)((ctxt));
-  }
+}
 
-void DPSWaitContext(ctxt)
-  DPSContext ctxt; {
+void DPSWaitContext(
+  DPSContext ctxt)
+{
   (*(ctxt)->procs->WaitContext)(ctxt);
- }
+}
 
-void DPSBinObjSeqWrite(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+void DPSBinObjSeqWrite(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   (*(ctxt)->procs->BinObjSeqWrite)((ctxt), (buf), (count));
-  }
+}
 
-void DPSWriteData(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+void DPSWriteData(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   (*(ctxt)->procs->WriteData)((ctxt), (buf), (count));
-  }
+}
 
-void DPSWritePostScript(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+void DPSWritePostScript(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   (*(ctxt)->procs->WritePostScript)((ctxt), (buf), (count));
-  }
+}
 
-void DPSWriteStringChars(ctxt, buf, count)
-  DPSContext ctxt;
-  char *buf;
-  unsigned int count; {
+void DPSWriteStringChars(
+  DPSContext ctxt,
+  char *buf,
+  unsigned int count)
+{
   (*(ctxt)->procs->WriteStringChars)((ctxt), (buf), (count));
-  }
+}
 
 void DPSWriteNumString(ctxt, type, data, size, scale)
     DPSContext ctxt;
@@ -2797,8 +2849,7 @@
   (*(ctxt)->procs->WriteTypedObjectArray)((ctxt), (type), (array), (length));
   }
   
-void DPSInitCommonTextContextProcs(p)
-    DPSProcs p;
+void DPSInitCommonTextContextProcs(DPSProcs p)
 {
     p->BinObjSeqWrite = textBinObjSeqWrite;
     p->WriteTypedObjectArray = writeTypedObjectArray;
@@ -2806,17 +2857,16 @@
     p->WritePostScript = textWritePostScript;
     p->WriteData = textWriteData;
     p->FlushContext = textFlushContext;
-    p->ResetContext = Noop;
-    p->WaitContext = Noop;
+    p->ResetContext = (DPSContextProc) Noop;
+    p->WaitContext = (DPSContextProc) Noop;
     p->UpdateNameMap = procUpdateNameMap;
     p->AwaitReturnValues = textAwaitReturnValues;
     p->Interrupt = textInterruptContext;
     p->DestroyContext = textDestroyContext;
-    p->WriteNumString = textWriteNumstring;
+    p->WriteNumString = (DPSWriteNumStringProc) textWriteNumstring;
 }
 
-void DPSInitCommonContextProcs(p)
-    DPSProcs p;
+void DPSInitCommonContextProcs(DPSProcs p)
 {
     p->BinObjSeqWrite = procBinObjSeqWrite;
     p->WriteTypedObjectArray = writeTypedObjectArray;
@@ -2827,11 +2877,10 @@
     p->WriteData = procWriteData;
     p->UpdateNameMap = procUpdateNameMap;
     p->Interrupt = procInterrupt;
-    p->WriteNumString = procWriteNumstring;
+    p->WriteNumString = (DPSWriteNumStringProc) procWriteNumstring;
 }
 
-void DPSInitCommonSpaceProcs(p)
-    DPSSpaceProcs p;
+void DPSInitCommonSpaceProcs(DPSSpaceProcs p)
 {
     p->DestroySpace = procDestroySpace;
 }
@@ -2901,7 +2950,7 @@
     return rret;
 }
 
-int DPSGenerateExtensionRecID()
+int DPSGenerateExtensionRecID(void)
 {
     static int id = 1;
 
Index: xc/lib/dps/dpsdict.c
diff -u xc/lib/dps/dpsdict.c:1.1 xc/lib/dps/dpsdict.c:1.2
--- xc/lib/dps/dpsdict.c:1.1	Sat Feb 12 16:13:07 2000
+++ xc/lib/dps/dpsdict.c	Thu May 18 16:46:13 2000
@@ -40,8 +40,9 @@
 /* Imports */
 /***********/
 
-#include "dpsdict.h"
+#include <stdlib.h>
 
+#include "dpsint.h"
 
 /********************/
 /* Types */
@@ -65,18 +66,18 @@
 /* Procedure Declarations */
 /**************************/
 
-extern char *DPScalloc();
-
 /* Creates and returns a new dictionary. nEntries is a hint. */
-PSWDict DPSCreatePSWDict(nEntries) integer nEntries; {
+PSWDict DPSCreatePSWDict(integer nEntries)
+{
   PSWDict d = (PSWDict)DPScalloc(sizeof(PSWDictRec), 1);
   d->nEntries = nEntries;
   d->entries = (Entry *)DPScalloc(sizeof(EntryRec), d->nEntries);
   return d;
-  }
+}
 
 /* Destroys a dictionary */
-void DPSDestroyPSWDict(dict) PSWDict dict; {
+void DPSDestroyPSWDict(PSWDict dict)
+{
   integer links = dict->nEntries;
   Entry   next;
   Entry   prev;
@@ -94,26 +95,27 @@
     }
   free(dict->entries);
   free(dict);
-  }
+}
 
-static integer Hash(name, nEntries) char *name; integer nEntries; {
+static integer Hash(char *name, integer nEntries)
+{
   register integer val = 0;
   while (*name) val += *name++;
   if (val < 0) val = -val;
   return (val % nEntries);
-  }
+}
 
-static Entry Probe(d, x, name) PSWDict d; integer x; char *name; {
+static Entry Probe(PSWDict d, integer x, char *name)
+{
   register Entry e;
   for (e = (d->entries)[x]; e != NIL; e = e->next) {
     if (strcmp(name, e->name) == 0) break;
     }
   return e;
-  }
+}
 
-static Entry PrevProbe(prev, d, x, name)
-  Entry *prev; PSWDict d; integer x; char *name;
-  {
+static Entry PrevProbe(Entry *prev, PSWDict d, integer x, char *name)
+{
   register Entry e;
   *prev = NIL;
   for (e = (d->entries)[x]; e != NIL; e = e->next) {
@@ -121,21 +123,21 @@
     *prev = e;
     }
   return e;
-  }
+}
 
 /* -1 => not found */
-PSWDictValue DPSWDictLookup(dict, name) PSWDict dict; char *name; {
+PSWDictValue DPSWDictLookup(PSWDict dict, char *name)
+{
   Entry e;
   e = Probe(dict, Hash(name, dict->nEntries), name);
   if (e == NIL) return -1;
   return e->value;
-  }
+}
 
 /*  0 => normal return (not found)
    -1 => found. If found, value is replaced. */
-PSWDictValue DPSWDictEnter(dict, name, value)
-  PSWDict dict; char *name; PSWDictValue value;
-  {
+PSWDictValue DPSWDictEnter(PSWDict dict, char *name, PSWDictValue value)
+{
   Entry e;
   integer x = Hash(name, dict->nEntries);
   e = Probe(dict, x, name);
@@ -148,10 +150,11 @@
   e->value = value;
   e->name = name; /* MakeAtom(name); */
   return 0;
-  }
+}
 
 /* -1 => not found. If found, value is returned. */
-PSWDictValue DPSWDictRemove(dict, name) PSWDict dict; char *name; {
+PSWDictValue DPSWDictRemove(PSWDict dict, char *name)
+{
   Entry e, prev;
   PSWDictValue value;
   integer x = Hash(name, dict->nEntries);
@@ -162,9 +165,10 @@
   if (prev == NIL) (dict->entries)[x] = e->next; else prev->next = e->next;
   free(e);
   return value;
-  }
+}
 
-Atom DPSMakeAtom(name) char *name; {
+Atom DPSMakeAtom(char *name)
+{
   Entry e;
   integer x = Hash(name, 511);
   char *newname;
@@ -179,6 +183,5 @@
     strcpy(newname, name);
     e->name = newname;
     }
-  return e->name;
-  }
-
+  return (Atom) e->name;
+}
Index: xc/lib/dps/dpsdict.h
diff -u xc/lib/dps/dpsdict.h:1.1 xc/lib/dps/dpsdict.h:1.2
--- xc/lib/dps/dpsdict.h:1.1	Sat Feb 12 16:13:07 2000
+++ xc/lib/dps/dpsdict.h	Thu May 18 16:46:13 2000
@@ -39,13 +39,14 @@
 #ifndef	PSWDICT_H
 #define	PSWDICT_H
 
+#include <X11/X.h>
+
 #include "publictypes.h"
 
 typedef struct _PSWDictRec *PSWDict;
 /* Opaque designator for a dictionary */
 
 typedef int PSWDictValue; /* non-negative */
-typedef char *Atom;
 
 /* PROCEDURES */
 
@@ -53,25 +54,25 @@
    None of the name parameters are handed off, i.e. the caller is
    responsible for managing their storage. */
 
-extern PSWDict DPSCreatePSWDict(/* integer nEntries */);
+extern PSWDict DPSCreatePSWDict(integer /* nEntries */);
 /* nEntries is a hint. Creates and returns a new dictionary */
 
-extern void DPSDestroyPSWDict(/* PSWDict dict */);
+extern void DPSDestroyPSWDict(PSWDict /* dict */);
 /* Destroys a dictionary */
 
-extern PSWDictValue DPSWDictLookup(/* PSWDict dict; char *name */);
+extern PSWDictValue DPSWDictLookup(PSWDict /* dict */, char * /* name */);
 /* -1 => not found. */
 
 extern PSWDictValue DPSWDictEnter
-  (/* PSWDict dict; char *name; PSWDictValue value; */);
+  (PSWDict /* dict */, char * /* name */, PSWDictValue /* value */);
 /*  0 => normal return (not found)
    -1 => found. If found, the old value gets replaced with the new one.
     caller must ensure continuing validity of name. */
 
-extern PSWDictValue DPSWDictRemove(/* PSWDict dict; char *name */);
+extern PSWDictValue DPSWDictRemove(PSWDict /* dict */, char * /* name */);
 /* -1 => not found. If found, value is returned. */
 
-extern Atom DPSMakeAtom(/* char *name */);
+extern Atom DPSMakeAtom(char * /* name */);
 /* name characters are copied. */
 
 #endif /* PSWDICT_H */
Index: xc/lib/dps/dpsendif.txt
diff -u xc/lib/dps/dpsendif.txt:1.1 xc/lib/dps/dpsendif.txt:1.2
--- xc/lib/dps/dpsendif.txt:1.1	Sat Feb 12 16:13:07 2000
+++ xc/lib/dps/dpsendif.txt	Thu May 18 16:46:13 2000
@@ -2,6 +2,4 @@
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 #endif /* DPSOPS_H */
Index: xc/lib/dps/dpsifdef.txt
diff -u xc/lib/dps/dpsifdef.txt:1.1 xc/lib/dps/dpsifdef.txt:1.2
--- xc/lib/dps/dpsifdef.txt:1.1	Sat Feb 12 16:13:08 2000
+++ xc/lib/dps/dpsifdef.txt	Thu May 18 16:46:13 2000
@@ -1,5 +1,7 @@
 #ifndef DPSOPS_H
 #define DPSOPS_H
 
-#ifdef _NO_PROTO
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
 
Index: xc/lib/dps/dpsint.h
diff -u xc/lib/dps/dpsint.h:1.1 xc/lib/dps/dpsint.h:1.2
--- xc/lib/dps/dpsint.h:1.1	Sat Feb 12 16:13:09 2000
+++ xc/lib/dps/dpsint.h	Thu May 18 16:46:13 2000
@@ -39,8 +39,15 @@
 #ifndef DPSINT_H
 #define DPSINT_H
 
+#include <DPS/dpsXclient.h>
+
+#include "publictypes.h"
 #include "dpsassert.h"
 
+#include "dpsprivate.h"
+#include "dpsXint.h"
+#include "dpsdict.h"
+
 typedef struct _t_ContextBufferRec {
   struct _t_ContextBufferRec *next;
   } ContextBufferRec, *ContextBuffer;
@@ -77,28 +84,42 @@
 #define initFailed DPSglobals->ginitFailed
 #define globLastNameIndex DPSglobals->gglobLastNameIndex
 #define textSpace DPSglobals->gTextSpace
-
-extern void DPSclientPrintProc();
-extern void DPSinnerProcWriteData();
-extern void DPSSafeSetLastNameIndex();
-extern void DPSCheckInitClientGlobals();
-extern boolean DPSPrivateCheckWait();
-extern void DPSPrivateDestroyContext();
-extern void DPSPrivateDestroySpace();
-extern boolean DPSCheckShared();
-
-extern void DPSDefaultPrivateHandler();
-
-extern DPSContext DPSCreateContext();
-
-extern void DPSInitCommonTextContextProcs();
-
-extern void DPSInitCommonContextProcs();
-extern void DPSInitPrivateContextProcs();
-extern void DPSInitPrivateContextFields();
-extern void DPSInitPrivateTextContextFields();
 
-extern void DPSInitCommonSpaceProcs();
-extern void DPSInitPrivateSpaceFields();
+extern boolean DPSCheckShared(DPSPrivContext ctxt);
+extern boolean DPSKnownContext(DPSContext ctxt);
+extern boolean DPSKnownSpace(DPSSpace space);
+extern boolean DPSPrivateCheckWait(DPSContext ctxt);
+extern void DPSCheckInitClientGlobals(void);
+extern void DPSPrivateDestroyContext(DPSContext ctxt);
+extern void DPSPrivateDestroySpace(DPSSpace space);
+extern void DPSSafeSetLastNameIndex(DPSContext ctxt);
+extern void DPSclientPrintProc(DPSContext ctxt, char *buf, unsigned nch);
+extern void DPSinnerProcWriteData(DPSContext ctxt, char *buf, unsigned int count);
+
+extern void DPSDefaultPrivateHandler(
+  DPSContext ctxt,
+  DPSErrorCode errorCode,
+  long unsigned int arg1,
+  long unsigned int arg2,
+  char *prefix,
+  char *suffix);
+
+extern char *DPScalloc(integer e, integer n);
+
+extern DPSContext DPSCreateContext(
+  char *wh,
+  DPSTextProc textProc,
+  DPSErrorProc errorProc,
+  DPSSpace space);
+
+extern void DPSHandleBogusError(DPSContext ctxt, char *prefix, char *suffix);
+extern void DPSInitCommonContextProcs(DPSProcs p);
+extern void DPSInitCommonSpaceProcs(DPSSpaceProcs p);
+extern void DPSInitCommonTextContextProcs(DPSProcs p);
+extern void DPSInitPrivateContextFields(DPSPrivContext c, DPSPrivSpace s);
+extern void DPSInitPrivateContextProcs(DPSProcs p);
+extern void DPSInitPrivateSpaceFields(DPSPrivSpace s);
+extern void DPSInitPrivateTextContextFields(DPSPrivContext c, DPSPrivSpace s);
+extern void DPSServicePostScript(boolean (*returnControl)(void));
 
 #endif /* DPSINT_H */
Index: xc/lib/dps/dpsops.h.os2
diff -u /dev/null xc/lib/dps/dpsops.h.os2:1.1
--- /dev/null	Sat Jul  1 20:44:54 2000
+++ xc/lib/dps/dpsops.h.os2	Wed Apr  5 11:13:21 2000
@@ -0,0 +1,1601 @@
+/*
+ * dpsops.h
+ */
+
+/*
+ * (c) Copyright 1988-1994 Adobe Systems Incorporated.
+ * All rights reserved.
+ * 
+ * Permission to use, copy, modify, distribute, and sublicense this software
+ * and its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notices appear in all copies and that
+ * both those copyright notices and this permission notice appear in
+ * supporting documentation and that the name of Adobe Systems Incorporated
+ * not be used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  No trademark license
+ * to use the Adobe trademarks is hereby granted.  If the Adobe trademark
+ * "Display PostScript"(tm) is used to describe this software, its
+ * functionality or for any other purpose, such use shall be limited to a
+ * statement that this software works in conjunction with the Display
+ * PostScript system.  Proper trademark attribution to reflect Adobe's
+ * ownership of the trademark shall be given whenever any such reference to
+ * the Display PostScript system is made.
+ * 
+ * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
+ * ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
+ * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON- INFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL ADOBE BE LIABLE
+ * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT
+ * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
+ * 
+ * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
+ * Incorporated which may be registered in certain jurisdictions
+ * 
+ * Author:  Adobe Systems Incorporated
+ */
+#ifndef DPSOPS_H
+#define DPSOPS_H
+
+#ifdef _NO_PROTO
+
+extern void DPSFontDirectory( /* DPSContext ctxt; */ );
+
+extern void DPSGlobalFontDirectory( /* DPSContext ctxt; */ );
+
+extern void DPSISOLatin1Encoding( /* DPSContext ctxt; */ );
+
+extern void DPSSharedFontDirectory( /* DPSContext ctxt; */ );
+
+extern void DPSStandardEncoding( /* DPSContext ctxt; */ );
+
+extern void DPSUserObjects( /* DPSContext ctxt; */ );
+
+extern void DPSabs( /* DPSContext ctxt; */ );
+
+extern void DPSadd( /* DPSContext ctxt; */ );
+
+extern void DPSaload( /* DPSContext ctxt; */ );
+
+extern void DPSanchorsearch( /* DPSContext ctxt; int *truth; */ );
+
+extern void DPSand( /* DPSContext ctxt; */ );
+
+extern void DPSarc( /* DPSContext ctxt; float x, y, r, angle1, angle2; */ );
+
+extern void DPSarcn( /* DPSContext ctxt; float x, y, r, angle1, angle2; */ );
+
+extern void DPSarct( /* DPSContext ctxt; float x1, y1, x2, y2, r; */ );
+
+extern void DPSarcto( /* DPSContext ctxt; float x1, y1, x2, y2, r; float *xt1, *yt1, *xt2, *yt2; */ );
+
+extern void DPSarray( /* DPSContext ctxt; int len; */ );
+
+extern void DPSashow( /* DPSContext ctxt; float x, y; char *s; */ );
+
+extern void DPSastore( /* DPSContext ctxt; */ );
+
+extern void DPSatan( /* DPSContext ctxt; */ );
+
+extern void DPSawidthshow( /* DPSContext ctxt; float cx, cy; int c; float ax, ay; char *s; */ );
+
+extern void DPSbanddevice( /* DPSContext ctxt; */ );
+
+extern void DPSbegin( /* DPSContext ctxt; */ );
+
+extern void DPSbind( /* DPSContext ctxt; */ );
+
+extern void DPSbitshift( /* DPSContext ctxt; int shift; */ );
+
+extern void DPSbytesavailable( /* DPSContext ctxt; int *n; */ );
+
+extern void DPScachestatus( /* DPSContext ctxt; */ );
+
+extern void DPSceiling( /* DPSContext ctxt; */ );
+
+extern void DPScharpath( /* DPSContext ctxt; char *s; int b; */ );
+
+extern void DPSclear( /* DPSContext ctxt; */ );
+
+extern void DPScleardictstack( /* DPSContext ctxt; */ );
+
+extern void DPScleartomark( /* DPSContext ctxt; */ );
+
+extern void DPSclientXready( /* DPSContext ctxt; int i0, i1, i2, i3; */ );
+
+extern void DPSclientsync( /* DPSContext ctxt; */ );
+
+extern void DPSclip( /* DPSContext ctxt; */ );
+
+extern void DPSclippath( /* DPSContext ctxt; */ );
+
+extern void DPSclosefile( /* DPSContext ctxt; */ );
+
+extern void DPSclosepath( /* DPSContext ctxt; */ );
+
+extern void DPScolorimage( /* DPSContext ctxt; */ );
+
+extern void DPSconcat( /* DPSContext ctxt; float m[]; */ );
+
+extern void DPSconcatmatrix( /* DPSContext ctxt; */ );
+
+extern void DPScondition( /* DPSContext ctxt; */ );
+
+extern void DPScopy( /* DPSContext ctxt; int n; */ );
+
+extern void DPScopypage( /* DPSContext ctxt; */ );
+
+extern void DPScos( /* DPSContext ctxt; */ );
+
+extern void DPScount( /* DPSContext ctxt; int *n; */ );
+
+extern void DPScountdictstack( /* DPSContext ctxt; int *n; */ );
+
+extern void DPScountexecstack( /* DPSContext ctxt; int *n; */ );
+
+extern void DPScounttomark( /* DPSContext ctxt; int *n; */ );
+
+extern void DPScshow( /* DPSContext ctxt; char *s; */ );
+
+extern void DPScurrentXdrawingfunction( /* DPSContext ctxt; int *function; */ );
+
+extern void DPScurrentXgcdrawable( /* DPSContext ctxt; int *gc, *draw, *x, *y; */ );
+
+extern void DPScurrentXgcdrawablecolor( /* DPSContext ctxt; int *gc, *draw, *x, *y, colorInfo[]; */ );
+
+extern void DPScurrentXoffset( /* DPSContext ctxt; int *x, *y; */ );
+
+extern void DPScurrentblackgeneration( /* DPSContext ctxt; */ );
+
+extern void DPScurrentcacheparams( /* DPSContext ctxt; */ );
+
+extern void DPScurrentcmykcolor( /* DPSContext ctxt; float *c, *m, *y, *k; */ );
+
+extern void DPScurrentcolor( /* DPSContext ctxt; */ );
+
+extern void DPScurrentcolorrendering( /* DPSContext ctxt; */ );
+
+extern void DPScurrentcolorscreen( /* DPSContext ctxt; */ );
+
+extern void DPScurrentcolorspace( /* DPSContext ctxt; */ );
+
+extern void DPScurrentcolortransfer( /* DPSContext ctxt; */ );
+
+extern void DPScurrentcontext( /* DPSContext ctxt; int *cid; */ );
+
+extern void DPScurrentdash( /* DPSContext ctxt; */ );
+
+extern void DPScurrentdevparams( /* DPSContext ctxt; char *dev; */ );
+
+extern void DPScurrentdict( /* DPSContext ctxt; */ );
+
+extern void DPScurrentfile( /* DPSContext ctxt; */ );
+
+extern void DPScurrentflat( /* DPSContext ctxt; float *flatness; */ );
+
+extern void DPScurrentfont( /* DPSContext ctxt; */ );
+
+extern void DPScurrentglobal( /* DPSContext ctxt; int *b; */ );
+
+extern void DPScurrentgray( /* DPSContext ctxt; float *gray; */ );
+
+extern void DPScurrentgstate( /* DPSContext ctxt; int gst; */ );
+
+extern void DPScurrenthalftone( /* DPSContext ctxt; */ );
+
+extern void DPScurrenthalftonephase( /* DPSContext ctxt; float *x, *y; */ );
+
+extern void DPScurrenthsbcolor( /* DPSContext ctxt; float *h, *s, *b; */ );
+
+extern void DPScurrentlinecap( /* DPSContext ctxt; int *linecap; */ );
+
+extern void DPScurrentlinejoin( /* DPSContext ctxt; int *linejoin; */ );
+
+extern void DPScurrentlinewidth( /* DPSContext ctxt; float *width; */ );
+
+extern void DPScurrentmatrix( /* DPSContext ctxt; */ );
+
+extern void DPScurrentmiterlimit( /* DPSContext ctxt; float *limit; */ );
+
+extern void DPScurrentobjectformat( /* DPSContext ctxt; int *code; */ );
+
+extern void DPScurrentoverprint( /* DPSContext ctxt; int *b; */ );
+
+extern void DPScurrentpacking( /* DPSContext ctxt; int *b; */ );
+
+extern void DPScurrentpagedevice( /* DPSContext ctxt; */ );
+
+extern void DPScurrentpoint( /* DPSContext ctxt; float *x, *y; */ );
+
+extern void DPScurrentrgbcolor( /* DPSContext ctxt; float *r, *g, *b; */ );
+
+extern void DPScurrentscreen( /* DPSContext ctxt; */ );
+
+extern void DPScurrentshared( /* DPSContext ctxt; int *b; */ );
+
+extern void DPScurrentstrokeadjust( /* DPSContext ctxt; int *b; */ );
+
+extern void DPScurrentsystemparams( /* DPSContext ctxt; */ );
+
+extern void DPScurrenttransfer( /* DPSContext ctxt; */ );
+
+extern void DPScurrentundercolorremoval( /* DPSContext ctxt; */ );
+
+extern void DPScurrentuserparams( /* DPSContext ctxt; */ );
+
+extern void DPScurveto( /* DPSContext ctxt; float x1, y1, x2, y2, x3, y3; */ );
+
+extern void DPScvi( /* DPSContext ctxt; */ );
+
+extern void DPScvlit( /* DPSContext ctxt; */ );
+
+extern void DPScvn( /* DPSContext ctxt; */ );
+
+extern void DPScvr( /* DPSContext ctxt; */ );
+
+extern void DPScvrs( /* DPSContext ctxt; */ );
+
+extern void DPScvs( /* DPSContext ctxt; */ );
+
+extern void DPScvx( /* DPSContext ctxt; */ );
+
+extern void DPSdef( /* DPSContext ctxt; */ );
+
+extern void DPSdefaultmatrix( /* DPSContext ctxt; */ );
+
+extern void DPSdefinefont( /* DPSContext ctxt; */ );
+
+extern void DPSdefineresource( /* DPSContext ctxt; char *category; */ );
+
+extern void DPSdefineusername( /* DPSContext ctxt; int i; char *username; */ );
+
+extern void DPSdefineuserobject( /* DPSContext ctxt; */ );
+
+extern void DPSdeletefile( /* DPSContext ctxt; char *filename; */ );
+
+extern void DPSdetach( /* DPSContext ctxt; */ );
+
+extern void DPSdeviceinfo( /* DPSContext ctxt; */ );
+
+extern void DPSdict( /* DPSContext ctxt; int len; */ );
+
+extern void DPSdictstack( /* DPSContext ctxt; */ );
+
+extern void DPSdiv( /* DPSContext ctxt; */ );
+
+extern void DPSdtransform( /* DPSContext ctxt; float x1, y1; float *x2, *y2; */ );
+
+extern void DPSdup( /* DPSContext ctxt; */ );
+
+extern void DPSecho( /* DPSContext ctxt; int b; */ );
+
+extern void DPSend( /* DPSContext ctxt; */ );
+
+extern void DPSeoclip( /* DPSContext ctxt; */ );
+
+extern void DPSeofill( /* DPSContext ctxt; */ );
+
+extern void DPSeoviewclip( /* DPSContext ctxt; */ );
+
+extern void DPSeq( /* DPSContext ctxt; */ );
+
+extern void DPSequals( /* DPSContext ctxt; */ );
+
+extern void DPSequalsequals( /* DPSContext ctxt; */ );
+
+extern void DPSerasepage( /* DPSContext ctxt; */ );
+
+extern void DPSerrordict( /* DPSContext ctxt; */ );
+
+extern void DPSexch( /* DPSContext ctxt; */ );
+
+extern void DPSexec( /* DPSContext ctxt; */ );
+
+extern void DPSexecform( /* DPSContext ctxt; */ );
+
+extern void DPSexecstack( /* DPSContext ctxt; */ );
+
+extern void DPSexecuserobject( /* DPSContext ctxt; int userObjIndex; */ );
+
+extern void DPSexecuteonly( /* DPSContext ctxt; */ );
+
+extern void DPSexit( /* DPSContext ctxt; */ );
+
+extern void DPSexp( /* DPSContext ctxt; */ );
+
+extern void DPSfalse( /* DPSContext ctxt; */ );
+
+extern void DPSfile( /* DPSContext ctxt; char *name, *access; */ );
+
+extern void DPSfilenameforall( /* DPSContext ctxt; */ );
+
+extern void DPSfileposition( /* DPSContext ctxt; int *pos; */ );
+
+extern void DPSfill( /* DPSContext ctxt; */ );
+
+extern void DPSfilter( /* DPSContext ctxt; */ );
+
+extern void DPSfindencoding( /* DPSContext ctxt; char *key; */ );
+
+extern void DPSfindfont( /* DPSContext ctxt; char *name; */ );
+
+extern void DPSfindresource( /* DPSContext ctxt; char *key, *category; */ );
+
+extern void DPSflattenpath( /* DPSContext ctxt; */ );
+
+extern void DPSfloor( /* DPSContext ctxt; */ );
+
+extern void DPSflush( /* DPSContext ctxt; */ );
+
+extern void DPSflushfile( /* DPSContext ctxt; */ );
+
+extern void DPSfor( /* DPSContext ctxt; */ );
+
+extern void DPSforall( /* DPSContext ctxt; */ );
+
+extern void DPSfork( /* DPSContext ctxt; */ );
+
+extern void DPSframedevice( /* DPSContext ctxt; */ );
+
+extern void DPSgcheck( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSge( /* DPSContext ctxt; */ );
+
+extern void DPSget( /* DPSContext ctxt; */ );
+
+extern void DPSgetboolean( /* DPSContext ctxt; int *it; */ );
+
+extern void DPSgetchararray( /* DPSContext ctxt; int size; char s[]; */ );
+
+extern void DPSgetfloat( /* DPSContext ctxt; float *it; */ );
+
+extern void DPSgetfloatarray( /* DPSContext ctxt; int size; float a[]; */ );
+
+extern void DPSgetint( /* DPSContext ctxt; int *it; */ );
+
+extern void DPSgetintarray( /* DPSContext ctxt; int size; int a[]; */ );
+
+extern void DPSgetinterval( /* DPSContext ctxt; */ );
+
+extern void DPSgetstring( /* DPSContext ctxt; char *s; */ );
+
+extern void DPSglobaldict( /* DPSContext ctxt; */ );
+
+extern void DPSglyphshow( /* DPSContext ctxt; char *name; */ );
+
+extern void DPSgrestore( /* DPSContext ctxt; */ );
+
+extern void DPSgrestoreall( /* DPSContext ctxt; */ );
+
+extern void DPSgsave( /* DPSContext ctxt; */ );
+
+extern void DPSgstate( /* DPSContext ctxt; */ );
+
+extern void DPSgt( /* DPSContext ctxt; */ );
+
+extern void DPSidentmatrix( /* DPSContext ctxt; */ );
+
+extern void DPSidiv( /* DPSContext ctxt; */ );
+
+extern void DPSidtransform( /* DPSContext ctxt; float x1, y1; float *x2, *y2; */ );
+
+extern void DPSif( /* DPSContext ctxt; */ );
+
+extern void DPSifelse( /* DPSContext ctxt; */ );
+
+extern void DPSimage( /* DPSContext ctxt; */ );
+
+extern void DPSimagemask( /* DPSContext ctxt; */ );
+
+extern void DPSindex( /* DPSContext ctxt; int i; */ );
+
+extern void DPSineofill( /* DPSContext ctxt; float x, y; int *b; */ );
+
+extern void DPSinfill( /* DPSContext ctxt; float x, y; int *b; */ );
+
+extern void DPSinitclip( /* DPSContext ctxt; */ );
+
+extern void DPSinitgraphics( /* DPSContext ctxt; */ );
+
+extern void DPSinitmatrix( /* DPSContext ctxt; */ );
+
+extern void DPSinitviewclip( /* DPSContext ctxt; */ );
+
+extern void DPSinstroke( /* DPSContext ctxt; float x, y; int *b; */ );
+
+extern void DPSinueofill( /* DPSContext ctxt; float x, y; char nums[]; int n; char ops[]; int l; int *b; */ );
+
+extern void DPSinufill( /* DPSContext ctxt; float x, y; char nums[]; int n; char ops[]; int l; int *b; */ );
+
+extern void DPSinustroke( /* DPSContext ctxt; float x, y; char nums[]; int n; char ops[]; int l; int *b; */ );
+
+extern void DPSinvertmatrix( /* DPSContext ctxt; */ );
+
+extern void DPSitransform( /* DPSContext ctxt; float x1, y1; float *x2, *y2; */ );
+
+extern void DPSjoin( /* DPSContext ctxt; */ );
+
+extern void DPSknown( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSkshow( /* DPSContext ctxt; char *s; */ );
+
+extern void DPSlanguagelevel( /* DPSContext ctxt; int *n; */ );
+
+extern void DPSle( /* DPSContext ctxt; */ );
+
+extern void DPSleftbracket( /* DPSContext ctxt; */ );
+
+extern void DPSleftleft( /* DPSContext ctxt; */ );
+
+extern void DPSlength( /* DPSContext ctxt; int *len; */ );
+
+extern void DPSlineto( /* DPSContext ctxt; float x, y; */ );
+
+extern void DPSln( /* DPSContext ctxt; */ );
+
+extern void DPSload( /* DPSContext ctxt; */ );
+
+extern void DPSlock( /* DPSContext ctxt; */ );
+
+extern void DPSlog( /* DPSContext ctxt; */ );
+
+extern void DPSloop( /* DPSContext ctxt; */ );
+
+extern void DPSlt( /* DPSContext ctxt; */ );
+
+extern void DPSmakefont( /* DPSContext ctxt; */ );
+
+extern void DPSmakepattern( /* DPSContext ctxt; */ );
+
+extern void DPSmark( /* DPSContext ctxt; */ );
+
+extern void DPSmatrix( /* DPSContext ctxt; */ );
+
+extern void DPSmaxlength( /* DPSContext ctxt; int *len; */ );
+
+extern void DPSmod( /* DPSContext ctxt; */ );
+
+extern void DPSmonitor( /* DPSContext ctxt; */ );
+
+extern void DPSmoveto( /* DPSContext ctxt; float x, y; */ );
+
+extern void DPSmul( /* DPSContext ctxt; */ );
+
+extern void DPSne( /* DPSContext ctxt; */ );
+
+extern void DPSneg( /* DPSContext ctxt; */ );
+
+extern void DPSnewpath( /* DPSContext ctxt; */ );
+
+extern void DPSnoaccess( /* DPSContext ctxt; */ );
+
+extern void DPSnot( /* DPSContext ctxt; */ );
+
+extern void DPSnotify( /* DPSContext ctxt; */ );
+
+extern void DPSnull( /* DPSContext ctxt; */ );
+
+extern void DPSnulldevice( /* DPSContext ctxt; */ );
+
+extern void DPSor( /* DPSContext ctxt; */ );
+
+extern void DPSpackedarray( /* DPSContext ctxt; */ );
+
+extern void DPSpathbbox( /* DPSContext ctxt; float *llx, *lly, *urx, *ury; */ );
+
+extern void DPSpathforall( /* DPSContext ctxt; */ );
+
+extern void DPSpop( /* DPSContext ctxt; */ );
+
+extern void DPSprint( /* DPSContext ctxt; */ );
+
+extern void DPSprintobject( /* DPSContext ctxt; int tag; */ );
+
+extern void DPSproduct( /* DPSContext ctxt; */ );
+
+extern void DPSprompt( /* DPSContext ctxt; */ );
+
+extern void DPSpstack( /* DPSContext ctxt; */ );
+
+extern void DPSput( /* DPSContext ctxt; */ );
+
+extern void DPSputinterval( /* DPSContext ctxt; */ );
+
+extern void DPSquit( /* DPSContext ctxt; */ );
+
+extern void DPSrand( /* DPSContext ctxt; */ );
+
+extern void DPSrcheck( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSrcurveto( /* DPSContext ctxt; float x1, y1, x2, y2, x3, y3; */ );
+
+extern void DPSread( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSreadhexstring( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSreadline( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSreadonly( /* DPSContext ctxt; */ );
+
+extern void DPSreadstring( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSrealtime( /* DPSContext ctxt; int *i; */ );
+
+extern void DPSrectclip( /* DPSContext ctxt; float x, y, w, h; */ );
+
+extern void DPSrectfill( /* DPSContext ctxt; float x, y, w, h; */ );
+
+extern void DPSrectstroke( /* DPSContext ctxt; float x, y, w, h; */ );
+
+extern void DPSrectviewclip( /* DPSContext ctxt; float x, y, w, h; */ );
+
+extern void DPSrenamefile( /* DPSContext ctxt; char *oldname, *newname; */ );
+
+extern void DPSrenderbands( /* DPSContext ctxt; */ );
+
+extern void DPSrepeat( /* DPSContext ctxt; */ );
+
+extern void DPSresetfile( /* DPSContext ctxt; */ );
+
+extern void DPSresourceforall( /* DPSContext ctxt; char *category; */ );
+
+extern void DPSresourcestatus( /* DPSContext ctxt; char *key, *category; int *b; */ );
+
+extern void DPSrestore( /* DPSContext ctxt; */ );
+
+extern void DPSreversepath( /* DPSContext ctxt; */ );
+
+extern void DPSrevision( /* DPSContext ctxt; int *n; */ );
+
+extern void DPSrightbracket( /* DPSContext ctxt; */ );
+
+extern void DPSrightright( /* DPSContext ctxt; */ );
+
+extern void DPSrlineto( /* DPSContext ctxt; float x, y; */ );
+
+extern void DPSrmoveto( /* DPSContext ctxt; float x, y; */ );
+
+extern void DPSroll( /* DPSContext ctxt; int n, j; */ );
+
+extern void DPSrootfont( /* DPSContext ctxt; */ );
+
+extern void DPSrotate( /* DPSContext ctxt; float angle; */ );
+
+extern void DPSround( /* DPSContext ctxt; */ );
+
+extern void DPSrrand( /* DPSContext ctxt; */ );
+
+extern void DPSrun( /* DPSContext ctxt; char *filename; */ );
+
+extern void DPSsave( /* DPSContext ctxt; */ );
+
+extern void DPSscale( /* DPSContext ctxt; float x, y; */ );
+
+extern void DPSscalefont( /* DPSContext ctxt; float size; */ );
+
+extern void DPSscheck( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSsearch( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSselectfont( /* DPSContext ctxt; char *name; float scale; */ );
+
+extern void DPSsendboolean( /* DPSContext ctxt; int it; */ );
+
+extern void DPSsendchararray( /* DPSContext ctxt; char s[]; int size; */ );
+
+extern void DPSsendfloat( /* DPSContext ctxt; float it; */ );
+
+extern void DPSsendfloatarray( /* DPSContext ctxt; float a[]; int size; */ );
+
+extern void DPSsendint( /* DPSContext ctxt; int it; */ );
+
+extern void DPSsendintarray( /* DPSContext ctxt; int a[]; int size; */ );
+
+extern void DPSsendstring( /* DPSContext ctxt; char *s; */ );
+
+extern void DPSserialnumber( /* DPSContext ctxt; int *n; */ );
+
+extern void DPSsetXdrawingfunction( /* DPSContext ctxt; int function; */ );
+
+extern void DPSsetXgcdrawable( /* DPSContext ctxt; int gc, draw, x, y; */ );
+
+extern void DPSsetXgcdrawablecolor( /* DPSContext ctxt; int gc, draw, x, y, colorInfo[]; */ );
+
+extern void DPSsetXoffset( /* DPSContext ctxt; int x, y; */ );
+
+extern void DPSsetXrgbactual( /* DPSContext ctxt; float r, g, b; int *success; */ );
+
+extern void DPSsetbbox( /* DPSContext ctxt; float llx, lly, urx, ury; */ );
+
+extern void DPSsetblackgeneration( /* DPSContext ctxt; */ );
+
+extern void DPSsetcachedevice( /* DPSContext ctxt; float wx, wy, llx, lly, urx, ury; */ );
+
+extern void DPSsetcachelimit( /* DPSContext ctxt; int n; */ );
+
+extern void DPSsetcacheparams( /* DPSContext ctxt; */ );
+
+extern void DPSsetcharwidth( /* DPSContext ctxt; float wx, wy; */ );
+
+extern void DPSsetcmykcolor( /* DPSContext ctxt; float c, m, y, k; */ );
+
+extern void DPSsetcolor( /* DPSContext ctxt; */ );
+
+extern void DPSsetcolorrendering( /* DPSContext ctxt; */ );
+
+extern void DPSsetcolorscreen( /* DPSContext ctxt; */ );
+
+extern void DPSsetcolorspace( /* DPSContext ctxt; */ );
+
+extern void DPSsetcolortransfer( /* DPSContext ctxt; */ );
+
+extern void DPSsetdash( /* DPSContext ctxt; float pat[]; int size; float offset; */ );
+
+extern void DPSsetdevparams( /* DPSContext ctxt; */ );
+
+extern void DPSsetfileposition( /* DPSContext ctxt; int pos; */ );
+
+extern void DPSsetflat( /* DPSContext ctxt; float flatness; */ );
+
+extern void DPSsetfont( /* DPSContext ctxt; int f; */ );
+
+extern void DPSsetglobal( /* DPSContext ctxt; int b; */ );
+
+extern void DPSsetgray( /* DPSContext ctxt; float gray; */ );
+
+extern void DPSsetgstate( /* DPSContext ctxt; int gst; */ );
+
+extern void DPSsethalftone( /* DPSContext ctxt; */ );
+
+extern void DPSsethalftonephase( /* DPSContext ctxt; float x, y; */ );
+
+extern void DPSsethsbcolor( /* DPSContext ctxt; float h, s, b; */ );
+
+extern void DPSsetlinecap( /* DPSContext ctxt; int linecap; */ );
+
+extern void DPSsetlinejoin( /* DPSContext ctxt; int linejoin; */ );
+
+extern void DPSsetlinewidth( /* DPSContext ctxt; float width; */ );
+
+extern void DPSsetmatrix( /* DPSContext ctxt; */ );
+
+extern void DPSsetmiterlimit( /* DPSContext ctxt; float limit; */ );
+
+extern void DPSsetobjectformat( /* DPSContext ctxt; int code; */ );
+
+extern void DPSsetoverprint( /* DPSContext ctxt; int b; */ );
+
+extern void DPSsetpacking( /* DPSContext ctxt; int b; */ );
+
+extern void DPSsetpagedevice( /* DPSContext ctxt; */ );
+
+extern void DPSsetpattern( /* DPSContext ctxt; */ );
+
+extern void DPSsetrgbcolor( /* DPSContext ctxt; float r, g, b; */ );
+
+extern void DPSsetscreen( /* DPSContext ctxt; */ );
+
+extern void DPSsetshared( /* DPSContext ctxt; int b; */ );
+
+extern void DPSsetstrokeadjust( /* DPSContext ctxt; int b; */ );
+
+extern void DPSsetsystemparams( /* DPSContext ctxt; */ );
+
+extern void DPSsettransfer( /* DPSContext ctxt; */ );
+
+extern void DPSsetucacheparams( /* DPSContext ctxt; */ );
+
+extern void DPSsetundercolorremoval( /* DPSContext ctxt; */ );
+
+extern void DPSsetuserparams( /* DPSContext ctxt; */ );
+
+extern void DPSsetvmthreshold( /* DPSContext ctxt; int i; */ );
+
+extern void DPSshareddict( /* DPSContext ctxt; */ );
+
+extern void DPSshow( /* DPSContext ctxt; char *s; */ );
+
+extern void DPSshowpage( /* DPSContext ctxt; */ );
+
+extern void DPSsin( /* DPSContext ctxt; */ );
+
+extern void DPSsqrt( /* DPSContext ctxt; */ );
+
+extern void DPSsrand( /* DPSContext ctxt; */ );
+
+extern void DPSstack( /* DPSContext ctxt; */ );
+
+extern void DPSstart( /* DPSContext ctxt; */ );
+
+extern void DPSstartjob( /* DPSContext ctxt; int b; char *password; */ );
+
+extern void DPSstatus( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSstatusdict( /* DPSContext ctxt; */ );
+
+extern void DPSstop( /* DPSContext ctxt; */ );
+
+extern void DPSstopped( /* DPSContext ctxt; */ );
+
+extern void DPSstore( /* DPSContext ctxt; */ );
+
+extern void DPSstring( /* DPSContext ctxt; int len; */ );
+
+extern void DPSstringwidth( /* DPSContext ctxt; char *s; float *xp, *yp; */ );
+
+extern void DPSstroke( /* DPSContext ctxt; */ );
+
+extern void DPSstrokepath( /* DPSContext ctxt; */ );
+
+extern void DPSsub( /* DPSContext ctxt; */ );
+
+extern void DPSsystemdict( /* DPSContext ctxt; */ );
+
+extern void DPStoken( /* DPSContext ctxt; int *b; */ );
+
+extern void DPStransform( /* DPSContext ctxt; float x1, y1; float *x2, *y2; */ );
+
+extern void DPStranslate( /* DPSContext ctxt; float x, y; */ );
+
+extern void DPStrue( /* DPSContext ctxt; */ );
+
+extern void DPStruncate( /* DPSContext ctxt; */ );
+
+extern void DPStype( /* DPSContext ctxt; */ );
+
+extern void DPSuappend( /* DPSContext ctxt; char nums[]; int n; char ops[]; int l; */ );
+
+extern void DPSucache( /* DPSContext ctxt; */ );
+
+extern void DPSucachestatus( /* DPSContext ctxt; */ );
+
+extern void DPSueofill( /* DPSContext ctxt; char nums[]; int n; char ops[]; int l; */ );
+
+extern void DPSufill( /* DPSContext ctxt; char nums[]; int n; char ops[]; int l; */ );
+
+extern void DPSundef( /* DPSContext ctxt; char *name; */ );
+
+extern void DPSundefinefont( /* DPSContext ctxt; char *name; */ );
+
+extern void DPSundefineresource( /* DPSContext ctxt; char *key, *category; */ );
+
+extern void DPSundefineuserobject( /* DPSContext ctxt; int userObjIndex; */ );
+
+extern void DPSupath( /* DPSContext ctxt; int b; */ );
+
+extern void DPSuserdict( /* DPSContext ctxt; */ );
+
+extern void DPSusertime( /* DPSContext ctxt; int *milliseconds; */ );
+
+extern void DPSustroke( /* DPSContext ctxt; char nums[]; int n; char ops[]; int l; */ );
+
+extern void DPSustrokepath( /* DPSContext ctxt; char nums[]; int n; char ops[]; int l; */ );
+
+extern void DPSversion( /* DPSContext ctxt; int bufsize; char buf[]; */ );
+
+extern void DPSviewclip( /* DPSContext ctxt; */ );
+
+extern void DPSviewclippath( /* DPSContext ctxt; */ );
+
+extern void DPSvmreclaim( /* DPSContext ctxt; int code; */ );
+
+extern void DPSvmstatus( /* DPSContext ctxt; int *level, *used, *maximum; */ );
+
+extern void DPSwait( /* DPSContext ctxt; */ );
+
+extern void DPSwcheck( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSwhere( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSwidthshow( /* DPSContext ctxt; float x, y; int c; char *s; */ );
+
+extern void DPSwrite( /* DPSContext ctxt; */ );
+
+extern void DPSwritehexstring( /* DPSContext ctxt; */ );
+
+extern void DPSwriteobject( /* DPSContext ctxt; int tag; */ );
+
+extern void DPSwritestring( /* DPSContext ctxt; */ );
+
+extern void DPSwtranslation( /* DPSContext ctxt; float *x, *y; */ );
+
+extern void DPSxcheck( /* DPSContext ctxt; int *b; */ );
+
+extern void DPSxor( /* DPSContext ctxt; */ );
+
+extern void DPSxshow( /* DPSContext ctxt; char *s; float numarray[]; int size; */ );
+
+extern void DPSxyshow( /* DPSContext ctxt; char *s; float numarray[]; int size; */ );
+
+extern void DPSyield( /* DPSContext ctxt; */ );
+
+extern void DPSyshow( /* DPSContext ctxt; char *s; float numarray[]; int size; */ );
+
+#else /* _NO_PROTO */
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern void DPSFontDirectory(DPSContext ctxt);
+
+extern void DPSGlobalFontDirectory(DPSContext ctxt);
+
+extern void DPSISOLatin1Encoding(DPSContext ctxt);
+
+extern void DPSSharedFontDirectory(DPSContext ctxt);
+
+extern void DPSStandardEncoding(DPSContext ctxt);
+
+extern void DPSUserObjects(DPSContext ctxt);
+
+extern void DPSabs(DPSContext ctxt);
+
+extern void DPSadd(DPSContext ctxt);
+
+extern void DPSaload(DPSContext ctxt);
+
+extern void DPSanchorsearch(DPSContext ctxt, int *truth);
+
+extern void DPSand(DPSContext ctxt);
+
+extern void DPSarc(DPSContext ctxt, float x, float y, float r, float angle1, float angle2);
+
+extern void DPSarcn(DPSContext ctxt, float x, float y, float r, float angle1, float angle2);
+
+extern void DPSarct(DPSContext ctxt, float x1, float y1, float x2, float y2, float r);
+
+extern void DPSarcto(DPSContext ctxt, float x1, float y1, float x2, float y2, float r, float *xt1, float *yt1, float *xt2, float *yt2);
+
+extern void DPSarray(DPSContext ctxt, int len);
+
+extern void DPSashow(DPSContext ctxt, float x, float y, const char *s);
+
+extern void DPSastore(DPSContext ctxt);
+
+extern void DPSatan(DPSContext ctxt);
+
+extern void DPSawidthshow(DPSContext ctxt, float cx, float cy, int c, float ax, float ay, const char *s);
+
+extern void DPSbanddevice(DPSContext ctxt);
+
+extern void DPSbegin(DPSContext ctxt);
+
+extern void DPSbind(DPSContext ctxt);
+
+extern void DPSbitshift(DPSContext ctxt, int shift);
+
+extern void DPSbytesavailable(DPSContext ctxt, int *n);
+
+extern void DPScachestatus(DPSContext ctxt);
+
+extern void DPSceiling(DPSContext ctxt);
+
+extern void DPScharpath(DPSContext ctxt, const char *s, int b);
+
+extern void DPSclear(DPSContext ctxt);
+
+extern void DPScleardictstack(DPSContext ctxt);
+
+extern void DPScleartomark(DPSContext ctxt);
+
+extern void DPSclientXready(DPSContext ctxt, int i0, int i1, int i2, int i3);
+
+extern void DPSclientsync(DPSContext ctxt);
+
+extern void DPSclip(DPSContext ctxt);
+
+extern void DPSclippath(DPSContext ctxt);
+
+extern void DPSclosefile(DPSContext ctxt);
+
+extern void DPSclosepath(DPSContext ctxt);
+
+extern void DPScolorimage(DPSContext ctxt);
+
+extern void DPSconcat(DPSContext ctxt, const float m[]);
+
+extern void DPSconcatmatrix(DPSContext ctxt);
+
+extern void DPScondition(DPSContext ctxt);
+
+extern void DPScopy(DPSContext ctxt, int n);
+
+extern void DPScopypage(DPSContext ctxt);
+
+extern void DPScos(DPSContext ctxt);
+
+extern void DPScount(DPSContext ctxt, int *n);
+
+extern void DPScountdictstack(DPSContext ctxt, int *n);
+
+extern void DPScountexecstack(DPSContext ctxt, int *n);
+
+extern void DPScounttomark(DPSContext ctxt, int *n);
+
+extern void DPScshow(DPSContext ctxt, const char *s);
+
+extern void DPScurrentXdrawingfunction(DPSContext ctxt, int *function);
+
+extern void DPScurrentXgcdrawable(DPSContext ctxt, int *gc, int *draw, int *x, int *y);
+
+extern void DPScurrentXgcdrawablecolor(DPSContext ctxt, int *gc, int *draw, int *x, int *y, int colorInfo[]);
+
+extern void DPScurrentXoffset(DPSContext ctxt, int *x, int *y);
+
+extern void DPScurrentblackgeneration(DPSContext ctxt);
+
+extern void DPScurrentcacheparams(DPSContext ctxt);
+
+extern void DPScurrentcmykcolor(DPSContext ctxt, float *c, float *m, float *y, float *k);
+
+extern void DPScurrentcolor(DPSContext ctxt);
+
+extern void DPScurrentcolorrendering(DPSContext ctxt);
+
+extern void DPScurrentcolorscreen(DPSContext ctxt);
+
+extern void DPScurrentcolorspace(DPSContext ctxt);
+
+extern void DPScurrentcolortransfer(DPSContext ctxt);
+
+extern void DPScurrentcontext(DPSContext ctxt, int *cid);
+
+extern void DPScurrentdash(DPSContext ctxt);
+
+extern void DPScurrentdevparams(DPSContext ctxt, const char *dev);
+
+extern void DPScurrentdict(DPSContext ctxt);
+
+extern void DPScurrentfile(DPSContext ctxt);
+
+extern void DPScurrentflat(DPSContext ctxt, float *flatness);
+
+extern void DPScurrentfont(DPSContext ctxt);
+
+extern void DPScurrentglobal(DPSContext ctxt, int *b);
+
+extern void DPScurrentgray(DPSContext ctxt, float *gray);
+
+extern void DPScurrentgstate(DPSContext ctxt, int gst);
+
+extern void DPScurrenthalftone(DPSContext ctxt);
+
+extern void DPScurrenthalftonephase(DPSContext ctxt, float *x, float *y);
+
+extern void DPScurrenthsbcolor(DPSContext ctxt, float *h, float *s, float *b);
+
+extern void DPScurrentlinecap(DPSContext ctxt, int *linecap);
+
+extern void DPScurrentlinejoin(DPSContext ctxt, int *linejoin);
+
+extern void DPScurrentlinewidth(DPSContext ctxt, float *width);
+
+extern void DPScurrentmatrix(DPSContext ctxt);
+
+extern void DPScurrentmiterlimit(DPSContext ctxt, float *limit);
+
+extern void DPScurrentobjectformat(DPSContext ctxt, int *code);
+
+extern void DPScurrentoverprint(DPSContext ctxt, int *b);
+
+extern void DPScurrentpacking(DPSContext ctxt, int *b);
+
+extern void DPScurrentpagedevice(DPSContext ctxt);
+
+extern void DPScurrentpoint(DPSContext ctxt, float *x, float *y);
+
+extern void DPScurrentrgbcolor(DPSContext ctxt, float *r, float *g, float *b);
+
+extern void DPScurrentscreen(DPSContext ctxt);
+
+extern void DPScurrentshared(DPSContext ctxt, int *b);
+
+extern void DPScurrentstrokeadjust(DPSContext ctxt, int *b);
+
+extern void DPScurrentsystemparams(DPSContext ctxt);
+
+extern void DPScurrenttransfer(DPSContext ctxt);
+
+extern void DPScurrentundercolorremoval(DPSContext ctxt);
+
+extern void DPScurrentuserparams(DPSContext ctxt);
+
+extern void DPScurveto(DPSContext ctxt, float x1, float y1, float x2, float y2, float x3, float y3);
+
+extern void DPScvi(DPSContext ctxt);
+
+extern void DPScvlit(DPSContext ctxt);
+
+extern void DPScvn(DPSContext ctxt);
+
+extern void DPScvr(DPSContext ctxt);
+
+extern void DPScvrs(DPSContext ctxt);
+
+extern void DPScvs(DPSContext ctxt);
+
+extern void DPScvx(DPSContext ctxt);
+
+extern void DPSdef(DPSContext ctxt);
+
+extern void DPSdefaultmatrix(DPSContext ctxt);
+
+extern void DPSdefinefont(DPSContext ctxt);
+
+extern void DPSdefineresource(DPSContext ctxt, const char *category);
+
+extern void DPSdefineusername(DPSContext ctxt, int i, const char *username);
+
+extern void DPSdefineuserobject(DPSContext ctxt);
+
+extern void DPSdeletefile(DPSContext ctxt, const char *filename);
+
+extern void DPSdetach(DPSContext ctxt);
+
+extern void DPSdeviceinfo(DPSContext ctxt);
+
+extern void DPSdict(DPSContext ctxt, int len);
+
+extern void DPSdictstack(DPSContext ctxt);
+
+extern void DPSdiv(DPSContext ctxt);
+
+extern void DPSdtransform(DPSContext ctxt, float x1, float y1, float *x2, float *y2);
+
+extern void DPSdup(DPSContext ctxt);
+
+extern void DPSecho(DPSContext ctxt, int b);
+
+extern void DPSend(DPSContext ctxt);
+
+extern void DPSeoclip(DPSContext ctxt);
+
+extern void DPSeofill(DPSContext ctxt);
+
+extern void DPSeoviewclip(DPSContext ctxt);
+
+extern void DPSeq(DPSContext ctxt);
+
+extern void DPSequals(DPSContext ctxt);
+
+extern void DPSequalsequals(DPSContext ctxt);
+
+extern void DPSerasepage(DPSContext ctxt);
+
+extern void DPSerrordict(DPSContext ctxt);
+
+extern void DPSexch(DPSContext ctxt);
+
+extern void DPSexec(DPSContext ctxt);
+
+extern void DPSexecform(DPSContext ctxt);
+
+extern void DPSexecstack(DPSContext ctxt);
+
+extern void DPSexecuserobject(DPSContext ctxt, int userObjIndex);
+
+extern void DPSexecuteonly(DPSContext ctxt);
+
+extern void DPSexit(DPSContext ctxt);
+
+extern void DPSexp(DPSContext ctxt);
+
+extern void DPSfalse(DPSContext ctxt);
+
+extern void DPSfile(DPSContext ctxt, const char *name, const char *access);
+
+extern void DPSfilenameforall(DPSContext ctxt);
+
+extern void DPSfileposition(DPSContext ctxt, int *pos);
+
+extern void DPSfill(DPSContext ctxt);
+
+extern void DPSfilter(DPSContext ctxt);
+
+extern void DPSfindencoding(DPSContext ctxt, const char *key);
+
+extern void DPSfindfont(DPSContext ctxt, const char *name);
+
+extern void DPSfindresource(DPSContext ctxt, const char *key, const char *category);
+
+extern void DPSflattenpath(DPSContext ctxt);
+
+extern void DPSfloor(DPSContext ctxt);
+
+extern void DPSflush(DPSContext ctxt);
+
+extern void DPSflushfile(DPSContext ctxt);
+
+extern void DPSfor(DPSContext ctxt);
+
+extern void DPSforall(DPSContext ctxt);
+
+extern void DPSfork(DPSContext ctxt);
+
+extern void DPSframedevice(DPSContext ctxt);
+
+extern void DPSgcheck(DPSContext ctxt, int *b);
+
+extern void DPSge(DPSContext ctxt);
+
+extern void DPSget(DPSContext ctxt);
+
+extern void DPSgetboolean(DPSContext ctxt, int *it);
+
+extern void DPSgetchararray(DPSContext ctxt, int size, char s[]);
+
+extern void DPSgetfloat(DPSContext ctxt, float *it);
+
+extern void DPSgetfloatarray(DPSContext ctxt, int size, float a[]);
+
+extern void DPSgetint(DPSContext ctxt, int *it);
+
+extern void DPSgetintarray(DPSContext ctxt, int size, int a[]);
+
+extern void DPSgetinterval(DPSContext ctxt);
+
+extern void DPSgetstring(DPSContext ctxt, char *s);
+
+extern void DPSglobaldict(DPSContext ctxt);
+
+extern void DPSglyphshow(DPSContext ctxt, const char *name);
+
+extern void DPSgrestore(DPSContext ctxt);
+
+extern void DPSgrestoreall(DPSContext ctxt);
+
+extern void DPSgsave(DPSContext ctxt);
+
+extern void DPSgstate(DPSContext ctxt);
+
+extern void DPSgt(DPSContext ctxt);
+
+extern void DPSidentmatrix(DPSContext ctxt);
+
+extern void DPSidiv(DPSContext ctxt);
+
+extern void DPSidtransform(DPSContext ctxt, float x1, float y1, float *x2, float *y2);
+
+extern void DPSif(DPSContext ctxt);
+
+extern void DPSifelse(DPSContext ctxt);
+
+extern void DPSimage(DPSContext ctxt);
+
+extern void DPSimagemask(DPSContext ctxt);
+
+extern void DPSindex(DPSContext ctxt, int i);
+
+extern void DPSineofill(DPSContext ctxt, float x, float y, int *b);
+
+extern void DPSinfill(DPSContext ctxt, float x, float y, int *b);
+
+extern void DPSinitclip(DPSContext ctxt);
+
+extern void DPSinitgraphics(DPSContext ctxt);
+
+extern void DPSinitmatrix(DPSContext ctxt);
+
+extern void DPSinitviewclip(DPSContext ctxt);
+
+extern void DPSinstroke(DPSContext ctxt, float x, float y, int *b);
+
+extern void DPSinueofill(DPSContext ctxt, float x, float y, const char nums[], int n, const char ops[], int l, int *b);
+
+extern void DPSinufill(DPSContext ctxt, float x, float y, const char nums[], int n, const char ops[], int l, int *b);
+
+extern void DPSinustroke(DPSContext ctxt, float x, float y, const char nums[], int n, const char ops[], int l, int *b);
+
+extern void DPSinvertmatrix(DPSContext ctxt);
+
+extern void DPSitransform(DPSContext ctxt, float x1, float y1, float *x2, float *y2);
+
+extern void DPSjoin(DPSContext ctxt);
+
+extern void DPSknown(DPSContext ctxt, int *b);
+
+extern void DPSkshow(DPSContext ctxt, const char *s);
+
+extern void DPSlanguagelevel(DPSContext ctxt, int *n);
+
+extern void DPSle(DPSContext ctxt);
+
+extern void DPSleftbracket(DPSContext ctxt);
+
+extern void DPSleftleft(DPSContext ctxt);
+
+extern void DPSlength(DPSContext ctxt, int *len);
+
+extern void DPSlineto(DPSContext ctxt, float x, float y);
+
+extern void DPSln(DPSContext ctxt);
+
+extern void DPSload(DPSContext ctxt);
+
+extern void DPSlock(DPSContext ctxt);
+
+extern void DPSlog(DPSContext ctxt);
+
+extern void DPSloop(DPSContext ctxt);
+
+extern void DPSlt(DPSContext ctxt);
+
+extern void DPSmakefont(DPSContext ctxt);
+
+extern void DPSmakepattern(DPSContext ctxt);
+
+extern void DPSmark(DPSContext ctxt);
+
+extern void DPSmatrix(DPSContext ctxt);
+
+extern void DPSmaxlength(DPSContext ctxt, int *len);
+
+extern void DPSmod(DPSContext ctxt);
+
+extern void DPSmonitor(DPSContext ctxt);
+
+extern void DPSmoveto(DPSContext ctxt, float x, float y);
+
+extern void DPSmul(DPSContext ctxt);
+
+extern void DPSne(DPSContext ctxt);
+
+extern void DPSneg(DPSContext ctxt);
+
+extern void DPSnewpath(DPSContext ctxt);
+
+extern void DPSnoaccess(DPSContext ctxt);
+
+extern void DPSnot(DPSContext ctxt);
+
+extern void DPSnotify(DPSContext ctxt);
+
+extern void DPSnull(DPSContext ctxt);
+
+extern void DPSnulldevice(DPSContext ctxt);
+
+extern void DPSor(DPSContext ctxt);
+
+extern void DPSpackedarray(DPSContext ctxt);
+
+extern void DPSpathbbox(DPSContext ctxt, float *llx, float *lly, float *urx, float *ury);
+
+extern void DPSpathforall(DPSContext ctxt);
+
+extern void DPSpop(DPSContext ctxt);
+
+extern void DPSprint(DPSContext ctxt);
+
+extern void DPSprintobject(DPSContext ctxt, int tag);
+
+extern void DPSproduct(DPSContext ctxt);
+
+extern void DPSprompt(DPSContext ctxt);
+
+extern void DPSpstack(DPSContext ctxt);
+
+extern void DPSput(DPSContext ctxt);
+
+extern void DPSputinterval(DPSContext ctxt);
+
+extern void DPSquit(DPSContext ctxt);
+
+extern void DPSrand(DPSContext ctxt);
+
+extern void DPSrcheck(DPSContext ctxt, int *b);
+
+extern void DPSrcurveto(DPSContext ctxt, float x1, float y1, float x2, float y2, float x3, float y3);
+
+extern void DPSread(DPSContext ctxt, int *b);
+
+extern void DPSreadhexstring(DPSContext ctxt, int *b);
+
+extern void DPSreadline(DPSContext ctxt, int *b);
+
+extern void DPSreadonly(DPSContext ctxt);
+
+extern void DPSreadstring(DPSContext ctxt, int *b);
+
+extern void DPSrealtime(DPSContext ctxt, int *i);
+
+extern void DPSrectclip(DPSContext ctxt, float x, float y, float w, float h);
+
+extern void DPSrectfill(DPSContext ctxt, float x, float y, float w, float h);
+
+extern void DPSrectstroke(DPSContext ctxt, float x, float y, float w, float h);
+
+extern void DPSrectviewclip(DPSContext ctxt, float x, float y, float w, float h);
+
+extern void DPSrenamefile(DPSContext ctxt, const char *oldname, const char *newname);
+
+extern void DPSrenderbands(DPSContext ctxt);
+
+extern void DPSrepeat(DPSContext ctxt);
+
+extern void DPSresetfile(DPSContext ctxt);
+
+extern void DPSresourceforall(DPSContext ctxt, const char *category);
+
+extern void DPSresourcestatus(DPSContext ctxt, const char *key, const char *category, int *b);
+
+extern void DPSrestore(DPSContext ctxt);
+
+extern void DPSreversepath(DPSContext ctxt);
+
+extern void DPSrevision(DPSContext ctxt, int *n);
+
+extern void DPSrightbracket(DPSContext ctxt);
+
+extern void DPSrightright(DPSContext ctxt);
+
+extern void DPSrlineto(DPSContext ctxt, float x, float y);
+
+extern void DPSrmoveto(DPSContext ctxt, float x, float y);
+
+extern void DPSroll(DPSContext ctxt, int n, int j);
+
+extern void DPSrootfont(DPSContext ctxt);
+
+extern void DPSrotate(DPSContext ctxt, float angle);
+
+extern void DPSround(DPSContext ctxt);
+
+extern void DPSrrand(DPSContext ctxt);
+
+extern void DPSrun(DPSContext ctxt, const char *filename);
+
+extern void DPSsave(DPSContext ctxt);
+
+extern void DPSscale(DPSContext ctxt, float x, float y);
+
+extern void DPSscalefont(DPSContext ctxt, float size);
+
+extern void DPSscheck(DPSContext ctxt, int *b);
+
+extern void DPSsearch(DPSContext ctxt, int *b);
+
+extern void DPSselectfont(DPSContext ctxt, const char *name, float scale);
+
+extern void DPSsendboolean(DPSContext ctxt, int it);
+
+extern void DPSsendchararray(DPSContext ctxt, const char s[], int size);
+
+extern void DPSsendfloat(DPSContext ctxt, float it);
+
+extern void DPSsendfloatarray(DPSContext ctxt, const float a[], int size);
+
+extern void DPSsendint(DPSContext ctxt, int it);
+
+extern void DPSsendintarray(DPSContext ctxt, const int a[], int size);
+
+extern void DPSsendstring(DPSContext ctxt, const char *s);
+
+extern void DPSserialnumber(DPSContext ctxt, int *n);
+
+extern void DPSsetXdrawingfunction(DPSContext ctxt, int function);
+
+extern void DPSsetXgcdrawable(DPSContext ctxt, int gc, int draw, int x, int y);
+
+extern void DPSsetXgcdrawablecolor(DPSContext ctxt, int gc, int draw, int x, int y, const int colorInfo[]);
+
+extern void DPSsetXoffset(DPSContext ctxt, int x, int y);
+
+extern void DPSsetXrgbactual(DPSContext ctxt, float r, float g, float b, int *success);
+
+extern void DPSsetbbox(DPSContext ctxt, float llx, float lly, float urx, float ury);
+
+extern void DPSsetblackgeneration(DPSContext ctxt);
+
+extern void DPSsetcachedevice(DPSContext ctxt, float wx, float wy, float llx, float lly, float urx, float ury);
+
+extern void DPSsetcachelimit(DPSContext ctxt, int n);
+
+extern void DPSsetcacheparams(DPSContext ctxt);
+
+extern void DPSsetcharwidth(DPSContext ctxt, float wx, float wy);
+
+extern void DPSsetcmykcolor(DPSContext ctxt, float c, float m, float y, float k);
+
+extern void DPSsetcolor(DPSContext ctxt);
+
+extern void DPSsetcolorrendering(DPSContext ctxt);
+
+extern void DPSsetcolorscreen(DPSContext ctxt);
+
+extern void DPSsetcolorspace(DPSContext ctxt);
+
+extern void DPSsetcolortransfer(DPSContext ctxt);
+
+extern void DPSsetdash(DPSContext ctxt, const float pat[], int size, float offset);
+
+extern void DPSsetdevparams(DPSContext ctxt);
+
+extern void DPSsetfileposition(DPSContext ctxt, int pos);
+
+extern void DPSsetflat(DPSContext ctxt, float flatness);
+
+extern void DPSsetfont(DPSContext ctxt, int f);
+
+extern void DPSsetglobal(DPSContext ctxt, int b);
+
+extern void DPSsetgray(DPSContext ctxt, float gray);
+
+extern void DPSsetgstate(DPSContext ctxt, int gst);
+
+extern void DPSsethalftone(DPSContext ctxt);
+
+extern void DPSsethalftonephase(DPSContext ctxt, float x, float y);
+
+extern void DPSsethsbcolor(DPSContext ctxt, float h, float s, float b);
+
+extern void DPSsetlinecap(DPSContext ctxt, int linecap);
+
+extern void DPSsetlinejoin(DPSContext ctxt, int linejoin);
+
+extern void DPSsetlinewidth(DPSContext ctxt, float width);
+
+extern void DPSsetmatrix(DPSContext ctxt);
+
+extern void DPSsetmiterlimit(DPSContext ctxt, float limit);
+
+extern void DPSsetobjectformat(DPSContext ctxt, int code);
+
+extern void DPSsetoverprint(DPSContext ctxt, int b);
+
+extern void DPSsetpacking(DPSContext ctxt, int b);
+
+extern void DPSsetpagedevice(DPSContext ctxt);
+
+extern void DPSsetpattern(DPSContext ctxt);
+
+extern void DPSsetrgbcolor(DPSContext ctxt, float r, float g, float b);
+
+extern void DPSsetscreen(DPSContext ctxt);
+
+extern void DPSsetshared(DPSContext ctxt, int b);
+
+extern void DPSsetstrokeadjust(DPSContext ctxt, int b);
+
+extern void DPSsetsystemparams(DPSContext ctxt);
+
+extern void DPSsettransfer(DPSContext ctxt);
+
+extern void DPSsetucacheparams(DPSContext ctxt);
+
+extern void DPSsetundercolorremoval(DPSContext ctxt);
+
+extern void DPSsetuserparams(DPSContext ctxt);
+
+extern void DPSsetvmthreshold(DPSContext ctxt, int i);
+
+extern void DPSshareddict(DPSContext ctxt);
+
+extern void DPSshow(DPSContext ctxt, const char *s);
+
+extern void DPSshowpage(DPSContext ctxt);
+
+extern void DPSsin(DPSContext ctxt);
+
+extern void DPSsqrt(DPSContext ctxt);
+
+extern void DPSsrand(DPSContext ctxt);
+
+extern void DPSstack(DPSContext ctxt);
+
+extern void DPSstart(DPSContext ctxt);
+
+extern void DPSstartjob(DPSContext ctxt, int b, const char *password);
+
+extern void DPSstatus(DPSContext ctxt, int *b);
+
+extern void DPSstatusdict(DPSContext ctxt);
+
+extern void DPSstop(DPSContext ctxt);
+
+extern void DPSstopped(DPSContext ctxt);
+
+extern void DPSstore(DPSContext ctxt);
+
+extern void DPSstring(DPSContext ctxt, int len);
+
+extern void DPSstringwidth(DPSContext ctxt, const char *s, float *xp, float *yp);
+
+extern void DPSstroke(DPSContext ctxt);
+
+extern void DPSstrokepath(DPSContext ctxt);
+
+extern void DPSsub(DPSContext ctxt);
+
+extern void DPSsystemdict(DPSContext ctxt);
+
+extern void DPStoken(DPSContext ctxt, int *b);
+
+extern void DPStransform(DPSContext ctxt, float x1, float y1, float *x2, float *y2);
+
+extern void DPStranslate(DPSContext ctxt, float x, float y);
+
+extern void DPStrue(DPSContext ctxt);
+
+extern void DPStruncate(DPSContext ctxt);
+
+extern void DPStype(DPSContext ctxt);
+
+extern void DPSuappend(DPSContext ctxt, const char nums[], int n, const char ops[], int l);
+
+extern void DPSucache(DPSContext ctxt);
+
+extern void DPSucachestatus(DPSContext ctxt);
+
+extern void DPSueofill(DPSContext ctxt, const char nums[], int n, const char ops[], int l);
+
+extern void DPSufill(DPSContext ctxt, const char nums[], int n, const char ops[], int l);
+
+extern void DPSundef(DPSContext ctxt, const char *name);
+
+extern void DPSundefinefont(DPSContext ctxt, const char *name);
+
+extern void DPSundefineresource(DPSContext ctxt, const char *key, const char *category);
+
+extern void DPSundefineuserobject(DPSContext ctxt, int userObjIndex);
+
+extern void DPSupath(DPSContext ctxt, int b);
+
+extern void DPSuserdict(DPSContext ctxt);
+
+extern void DPSusertime(DPSContext ctxt, int *milliseconds);
+
+extern void DPSustroke(DPSContext ctxt, const char nums[], int n, const char ops[], int l);
+
+extern void DPSustrokepath(DPSContext ctxt, const char nums[], int n, const char ops[], int l);
+
+extern void DPSversion(DPSContext ctxt, int bufsize, char buf[]);
+
+extern void DPSviewclip(DPSContext ctxt);
+
+extern void DPSviewclippath(DPSContext ctxt);
+
+extern void DPSvmreclaim(DPSContext ctxt, int code);
+
+extern void DPSvmstatus(DPSContext ctxt, int *level, int *used, int *maximum);
+
+extern void DPSwait(DPSContext ctxt);
+
+extern void DPSwcheck(DPSContext ctxt, int *b);
+
+extern void DPSwhere(DPSContext ctxt, int *b);
+
+extern void DPSwidthshow(DPSContext ctxt, float x, float y, int c, const char *s);
+
+extern void DPSwrite(DPSContext ctxt);
+
+extern void DPSwritehexstring(DPSContext ctxt);
+
+extern void DPSwriteobject(DPSContext ctxt, int tag);
+
+extern void DPSwritestring(DPSContext ctxt);
+
+extern void DPSwtranslation(DPSContext ctxt, float *x, float *y);
+
+extern void DPSxcheck(DPSContext ctxt, int *b);
+
+extern void DPSxor(DPSContext ctxt);
+
+extern void DPSxshow(DPSContext ctxt, const char *s, const float numarray[], int size);
+
+extern void DPSxyshow(DPSContext ctxt, const char *s, const float numarray[], int size);
+
+extern void DPSyield(DPSContext ctxt);
+
+extern void DPSyshow(DPSContext ctxt, const char *s, const float numarray[], int size);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif /* _NO_PROTO */
+
+#endif /* DPSOPS_H */
Index: xc/lib/dps/dpsos2.def
diff -u /dev/null xc/lib/dps/dpsos2.def:1.1
--- /dev/null	Sat Jul  1 20:44:54 2000
+++ xc/lib/dps/dpsos2.def	Wed Apr  5 11:13:21 2000
@@ -0,0 +1,854 @@
+LIBRARY dps 
+DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/dps/dpsos2.def,v 1.1 2000/04/05 18:13:21 dawes Exp $"
+CODE
+	PRELOAD
+DATA
+	MULTIPLE NONSHARED
+STACKSIZE 131072
+EXPORTS
+	CSDPSInit	@ 1 
+	CSDPSHeadOfDpyExt	@ 2
+	DPSCAPChangeGC	@ 3
+	DPSCAPCreate	@ 4 
+	DPSCAPDestroy	@ 5 
+	DPSCAPOpenAgent	@ 6 
+	DPSCAPStartUp	@ 8 
+	DPSCAPWrite	@ 9 
+	DPSCAPCloseDisplayProc	@ 10
+	DPSCAPCloseAgent	@ 13
+	DPSclientsync	@ 14
+	DPScurrentXgcdrawable	@ 15
+	DPScurrentXgcdrawablecolor	@ 16
+	DPScurrentXoffset	@ 17
+	DPSsetXgcdrawable	@ 18
+	DPSsetXgcdrawablecolor	@ 19
+	DPSsetXoffset	@ 20
+	DPSsetXrgbactual	@ 21
+	DPSclientXready	@ 22
+	DPSsetXdrawingfunction	@ 23
+	DPScurrentXdrawingfunction	@ 24
+	DPSWarnProc	@ 25
+	DPSFatalProc	@ 26
+	DPSCantHappen	@ 27
+	DPScolorimage	@ 28
+	DPScurrentblackgeneration	@ 29
+	DPScurrentcmykcolor	@ 30
+	DPScurrentcolorscreen	@ 31
+	DPScurrentcolortransfer	@ 32
+	DPScurrentundercolorremoval	@ 33
+	DPSsetblackgeneration	@ 34
+	DPSsetcmykcolor	@ 35
+	DPSsetcolorscreen	@ 36
+	DPSsetcolortransfer	@ 37
+	DPSsetundercolorremoval	@ 38
+	DPSeq	@ 39
+	DPSexit	@ 40
+	DPSfalse	@ 41
+	DPSfor	@ 42
+	DPSforall	@ 43
+	DPSge	@ 44
+	DPSgt	@ 45
+	DPSif	@ 46
+	DPSifelse	@ 47
+	DPSle	@ 48
+	DPSloop	@ 49
+	DPSlt	@ 50
+	DPSne	@ 51
+	DPSnot	@ 52
+	DPSor	@ 53
+	DPSrepeat	@ 54
+	DPSstop	@ 55
+	DPSstopped	@ 56
+	DPStrue	@ 57
+	DPSUserObjects	@ 58
+	DPScondition	@ 59
+	DPScurrentcontext	@ 60
+	DPScurrentobjectformat	@ 61
+	DPSdefineusername	@ 62
+	DPSdefineuserobject	@ 63
+	DPSdetach	@ 64
+	DPSexecuserobject	@ 65
+	DPSfork	@ 66
+	DPSjoin	@ 67
+	DPSlock	@ 68
+	DPSmonitor	@ 69
+	DPSnotify	@ 70
+	DPSsetobjectformat	@ 71
+	DPSsetvmthreshold	@ 72
+	DPSundefineuserobject	@ 73
+	DPSwait	@ 74
+	DPSyield	@ 75
+	DPSaload	@ 76
+	DPSanchorsearch	@ 77
+	DPSarray	@ 78
+	DPSastore	@ 79
+	DPSbegin	@ 80
+	DPSclear	@ 81
+	DPScleartomark	@ 82
+	DPScopy	@ 83
+	DPScount	@ 84
+	DPScounttomark	@ 85
+	DPScvi	@ 86
+	DPScvlit	@ 87
+	DPScvn	@ 88
+	DPScvr	@ 89
+	DPScvrs	@ 90
+	DPScvs	@ 91
+	DPScvx	@ 92
+	DPSdef	@ 93
+	DPSdict	@ 94
+	DPSdictstack	@ 95
+	DPSdup	@ 96
+	DPSend	@ 97
+	DPSexch	@ 98
+	DPSexecstack	@ 99
+	DPSexecuteonly	@ 100
+	DPSget	@ 101
+	DPSgetinterval	@ 102
+	DPSindex	@ 103
+	DPSknown	@ 104
+	DPSlength	@ 105
+	DPSload	@ 106
+	DPSmark	@ 107
+	DPSmatrix	@ 108
+	DPSmaxlength	@ 109
+	DPSnoaccess	@ 110
+	DPSnull	@ 111
+	DPSpackedarray	@ 112
+	DPSpop	@ 113
+	DPSput	@ 114
+	DPSputinterval	@ 115
+	DPSrcheck	@ 116
+	DPSreadonly	@ 117
+	DPSroll	@ 118
+	DPSscheck	@ 119
+	DPSsearch	@ 120
+	DPSshareddict	@ 121
+	DPSstatusdict	@ 122
+	DPSstore	@ 123
+	DPSstring	@ 124
+	DPSstringwidth	@ 125
+	DPSsystemdict	@ 126
+	DPSuserdict	@ 127
+	DPSwcheck	@ 128
+	DPSwhere	@ 129
+	DPSxcheck	@ 130
+	DPSCreatePSWDict	@ 131
+	DPSDestroyPSWDict	@ 132
+	DPSWDictLookup	@ 133
+	DPSWDictEnter	@ 134
+	DPSWDictRemove	@ 135
+	DPSMakeAtom	@ 136
+	DPSFontDirectory	@ 137
+	DPSISOLatin1Encoding	@ 138
+	DPSSharedFontDirectory	@ 139
+	DPSStandardEncoding	@ 140
+	DPScachestatus	@ 141
+	DPScurrentcacheparams	@ 142
+	DPScurrentfont	@ 143
+	DPSdefinefont	@ 144
+	DPSfindfont	@ 145
+	DPSmakefont	@ 146
+	DPSscalefont	@ 147
+	DPSselectfont	@ 148
+	DPSsetcachedevice	@ 149
+	DPSsetcachelimit	@ 150
+	DPSsetcacheparams	@ 151
+	DPSsetcharwidth	@ 152
+	DPSsetfont	@ 153
+	DPSundefinefont	@ 154
+	DPSconcat	@ 155
+	DPScurrentdash	@ 156
+	DPScurrentflat	@ 157
+	DPScurrentgray	@ 158
+	DPScurrentgstate	@ 159
+	DPScurrenthalftone	@ 160
+	DPScurrenthalftonephase	@ 161
+	DPScurrenthsbcolor	@ 162
+	DPScurrentlinecap	@ 163
+	DPScurrentlinejoin	@ 164
+	DPScurrentlinewidth	@ 165
+	DPScurrentmatrix	@ 166
+	DPScurrentmiterlimit	@ 167
+	DPScurrentpoint	@ 168
+	DPScurrentrgbcolor	@ 169
+	DPScurrentscreen	@ 170
+	DPScurrentstrokeadjust	@ 171
+	DPScurrenttransfer	@ 172
+	DPSdefaultmatrix	@ 173
+	DPSgrestore	@ 174
+	DPSgrestoreall	@ 175
+	DPSgsave	@ 176
+	DPSgstate	@ 177
+	DPSinitgraphics	@ 178
+	DPSinitmatrix	@ 179
+	DPSrotate	@ 180
+	DPSscale	@ 181
+	DPSsetdash	@ 182
+	DPSsetflat	@ 183
+	DPSsetgray	@ 184
+	DPSsetgstate	@ 185
+	DPSsethalftone	@ 186
+	DPSsethalftonephase	@ 187
+	DPSsethsbcolor	@ 188
+	DPSsetlinecap	@ 189
+	DPSsetlinejoin	@ 190
+	DPSsetlinewidth	@ 191
+	DPSsetmatrix	@ 192
+	DPSsetmiterlimit	@ 193
+	DPSsetrgbcolor	@ 194
+	DPSsetscreen	@ 195
+	DPSsetstrokeadjust	@ 196
+	DPSsettransfer	@ 197
+	DPStranslate	@ 198
+	DPSclientPrintProc	@ 199
+	DPSinnerProcWriteData	@ 200
+	DPSSafeSetLastNameIndex	@ 201
+	DPSCheckInitClientGlobals	@ 202
+	DPSPrivateCheckWait	@ 203
+	DPSPrivateDestroyContext	@ 204
+	DPSPrivateDestroySpace	@ 205
+	DPSCheckShared	@ 206
+	DPSDefaultPrivateHandler	@ 207
+	DPSCreateContext	@ 208
+	DPSInitCommonTextContextProcs	@ 209
+	DPSInitCommonContextProcs	@ 210
+	DPSInitPrivateContextProcs	@ 211
+	DPSInitPrivateContextFields	@ 212
+	DPSInitPrivateTextContextFields	@ 213
+	DPSInitCommonSpaceProcs	@ 214
+	DPSInitPrivateSpaceFields	@ 215
+	DPSequals	@ 216
+	DPSequalsequals	@ 217
+	DPSbytesavailable	@ 218
+	DPSclosefile	@ 219
+	DPScurrentfile	@ 220
+	DPSdeletefile	@ 221
+	DPSecho	@ 222
+	DPSfile	@ 223
+	DPSfilenameforall	@ 224
+	DPSfileposition	@ 225
+	DPSflush	@ 226
+	DPSflushfile	@ 227
+	DPSprint	@ 228
+	DPSprintobject	@ 229
+	DPSpstack	@ 230
+	DPSread	@ 231
+	DPSreadhexstring	@ 232
+	DPSreadline	@ 233
+	DPSreadstring	@ 234
+	DPSrenamefile	@ 235
+	DPSresetfile	@ 236
+	DPSsetfileposition	@ 237
+	DPSstack	@ 238
+	DPSstatus	@ 239
+	DPStoken	@ 240
+	DPSwrite	@ 241
+	DPSwritehexstring	@ 242
+	DPSwriteobject	@ 243
+	DPSwritestring	@ 244
+	DPSleftbracket	@ 245
+	DPSrightbracket	@ 246
+	DPSleftleft	@ 247
+	DPSrightright	@ 248
+	DPScshow	@ 249
+	DPScurrentcolor	@ 250
+	DPScurrentcolorrendering	@ 251
+	DPScurrentcolorspace	@ 252
+	DPScurrentdevparams	@ 253
+	DPScurrentglobal	@ 254
+	DPScurrentoverprint	@ 255
+	DPScurrentpagedevice	@ 256
+	DPScurrentsystemparams	@ 257
+	DPScurrentuserparams	@ 258
+	DPSdefineresource	@ 259
+	DPSexecform	@ 260
+	DPSfilter	@ 261
+	DPSfindencoding	@ 262
+	DPSfindresource	@ 263
+	DPSgcheck	@ 264
+	DPSglobaldict	@ 265
+	DPSGlobalFontDirectory	@ 266
+	DPSglyphshow	@ 267
+	DPSlanguagelevel	@ 268
+	DPSmakepattern	@ 269
+	DPSproduct	@ 270
+	DPSresourceforall	@ 271
+	DPSresourcestatus	@ 272
+	DPSrevision	@ 273
+	DPSrootfont	@ 274
+	DPSserialnumber	@ 275
+	DPSsetcolor	@ 276
+	DPSsetcolorrendering	@ 277
+	DPSsetcolorspace	@ 278
+	DPSsetdevparams	@ 279
+	DPSsetglobal	@ 280
+	DPSsetoverprint	@ 281
+	DPSsetpagedevice	@ 282
+	DPSsetpattern	@ 283
+	DPSsetsystemparams	@ 284
+	DPSsetuserparams	@ 285
+	DPSstartjob	@ 286
+	DPSundefineresource	@ 287
+	DPSabs	@ 288
+	DPSadd	@ 289
+	DPSand	@ 290
+	DPSatan	@ 291
+	DPSbitshift	@ 292
+	DPSceiling	@ 293
+	DPScos	@ 294
+	DPSdiv	@ 295
+	DPSexp	@ 296
+	DPSfloor	@ 297
+	DPSidiv	@ 298
+	DPSln	@ 299
+	DPSlog	@ 300
+	DPSmod	@ 301
+	DPSmul	@ 302
+	DPSneg	@ 303
+	DPSround	@ 304
+	DPSsin	@ 305
+	DPSsqrt	@ 306
+	DPSsub	@ 307
+	DPStruncate	@ 308
+	DPSxor	@ 309
+	DPSbanddevice	@ 310
+	DPSframedevice	@ 311
+	DPSnulldevice	@ 312
+	DPSrenderbands	@ 313
+	DPSconcatmatrix	@ 314
+	DPSdtransform	@ 315
+	DPSidentmatrix	@ 316
+	DPSidtransform	@ 317
+	DPSinvertmatrix	@ 318
+	DPSitransform	@ 319
+	DPStransform	@ 320
+	DPSgetboolean	@ 321
+	DPSgetchararray	@ 322
+	DPSgetfloat	@ 323
+	DPSgetfloatarray	@ 324
+	DPSgetint	@ 325
+	DPSgetintarray	@ 326
+	DPSgetstring	@ 327
+	DPSsendboolean	@ 328
+	DPSsendchararray	@ 329
+	DPSsendfloat	@ 330
+	DPSsendfloatarray	@ 331
+	DPSsendint	@ 332
+	DPSsendintarray	@ 333
+	DPSsendstring	@ 334
+	DPSarc	@ 335
+	DPSarcn	@ 336
+	DPSarct	@ 337
+	DPSarcto	@ 338
+	DPScharpath	@ 339
+	DPSclip	@ 340
+	DPSclippath	@ 341
+	DPSclosepath	@ 342
+	DPScurveto	@ 343
+	DPSeoclip	@ 344
+	DPSeoviewclip	@ 345
+	DPSflattenpath	@ 346
+	DPSinitclip	@ 347
+	DPSinitviewclip	@ 348
+	DPSlineto	@ 349
+	DPSmoveto	@ 350
+	DPSnewpath	@ 351
+	DPSpathbbox	@ 352
+	DPSpathforall	@ 353
+	DPSrcurveto	@ 354
+	DPSrectclip	@ 355
+	DPSrectviewclip	@ 356
+	DPSreversepath	@ 357
+	DPSrlineto	@ 358
+	DPSrmoveto	@ 359
+	DPSsetbbox	@ 360
+	DPSsetucacheparams	@ 361
+	DPSuappend	@ 362
+	DPSucache	@ 363
+	DPSucachestatus	@ 364
+	DPSupath	@ 365
+	DPSviewclip	@ 366
+	DPSviewclippath	@ 367
+	DPSashow	@ 368
+	DPSawidthshow	@ 369
+	DPScopypage	@ 370
+	DPSeofill	@ 371
+	DPSerasepage	@ 372
+	DPSfill	@ 373
+	DPSimage	@ 374
+	DPSimagemask	@ 375
+	DPSkshow	@ 376
+	DPSrectfill	@ 377
+	DPSrectstroke	@ 378
+	DPSshow	@ 379
+	DPSshowpage	@ 380
+	DPSstroke	@ 381
+	DPSstrokepath	@ 382
+	DPSueofill	@ 383
+	DPSufill	@ 384
+	DPSustroke	@ 385
+	DPSustrokepath	@ 386
+	DPSwidthshow	@ 387
+	DPSxshow	@ 388
+	DPSxyshow	@ 389
+	DPSyshow	@ 390
+	DPSInitClient	@ 391
+	DPSIncludePrivContext	@ 392
+	DPSSendPostScript	@ 393
+	DPSSendInterrupt	@ 394
+	DPSSendEOF	@ 395
+	DPSSendTerminate	@ 396
+	DPSSendDestroySpace	@ 397
+	DPSCheckRaiseError	@ 399
+	DPSInitSysNames	@ 400
+	DPSSetWh	@ 401
+	DPSOutOfMemory	@ 402
+	DPSbind	@ 403
+	DPScleardictstack	@ 404
+	DPScountdictstack	@ 405
+	DPScountexecstack	@ 406
+	DPScurrentdict	@ 407
+	DPScurrentpacking	@ 408
+	DPScurrentshared	@ 409
+	DPSdeviceinfo	@ 410
+	DPSerrordict	@ 411
+	DPSexec	@ 412
+	DPSprompt	@ 413
+	DPSquit	@ 414
+	DPSrand	@ 415
+	DPSrealtime	@ 416
+	DPSrestore	@ 417
+	DPSrrand	@ 418
+	DPSrun	@ 419
+	DPSsave	@ 420
+	DPSsetpacking	@ 421
+	DPSsetshared	@ 422
+	DPSsrand	@ 423
+	DPSstart	@ 424
+	DPStype	@ 425
+	DPSundef	@ 426
+	DPSusertime	@ 427
+	DPSversion	@ 428
+	DPSvmreclaim	@ 429
+	DPSvmstatus	@ 430
+	DPSineofill	@ 431
+	DPSinfill	@ 432
+	DPSinstroke	@ 433
+	DPSinueofill	@ 434
+	DPSinufill	@ 435
+	DPSinustroke	@ 436
+	DPSwtranslation	@ 437
+	PSclientsync	@ 438
+	PScurrentXgcdrawable	@ 439
+	PScurrentXgcdrawablecolor	@ 440
+	PScurrentXoffset	@ 441
+	PSsetXgcdrawable	@ 442
+	PSsetXgcdrawablecolor	@ 443
+	PSsetXoffset	@ 444
+	PSsetXrgbactual	@ 445
+	PSclientXready	@ 446
+	PSsetXdrawingfunction	@ 447
+	PScurrentXdrawingfunction	@ 448
+	PScolorimage	@ 449
+	PScurrentblackgeneration	@ 450
+	PScurrentcmykcolor	@ 451
+	PScurrentcolorscreen	@ 452
+	PScurrentcolortransfer	@ 453
+	PScurrentundercolorremoval	@ 454
+	PSsetblackgeneration	@ 455
+	PSsetcmykcolor	@ 456
+	PSsetcolorscreen	@ 457
+	PSsetcolortransfer	@ 458
+	PSsetundercolorremoval	@ 459
+	PSeq	@ 460
+	PSexit	@ 461
+	PSfalse	@ 462
+	PSfor	@ 463
+	PSforall	@ 464
+	PSge	@ 465
+	PSgt	@ 466
+	PSif	@ 467
+	PSifelse	@ 468
+	PSle	@ 469
+	PSloop	@ 470
+	PSlt	@ 471
+	PSne	@ 472
+	PSnot	@ 473
+	PSor	@ 474
+	PSrepeat	@ 475
+	PSstop	@ 476
+	PSstopped	@ 477
+	PStrue	@ 478
+	PSUserObjects	@ 479
+	PScondition	@ 480
+	PScurrentcontext	@ 481
+	PScurrentobjectformat	@ 482
+	PSdefineusername	@ 483
+	PSdefineuserobject	@ 484
+	PSdetach	@ 485
+	PSexecuserobject	@ 486
+	PSfork	@ 487
+	PSjoin	@ 488
+	PSlock	@ 489
+	PSmonitor	@ 490
+	PSnotify	@ 491
+	PSsetobjectformat	@ 492
+	PSsetvmthreshold	@ 493
+	PSundefineuserobject	@ 494
+	PSwait	@ 495
+	PSyield	@ 496
+	PSaload	@ 497
+	PSanchorsearch	@ 498
+	PSarray	@ 499
+	PSastore	@ 500
+	PSbegin	@ 501
+	PSclear	@ 502
+	PScleartomark	@ 503
+	PScopy	@ 504
+	PScount	@ 505
+	PScounttomark	@ 506
+	PScvi	@ 507
+	PScvlit	@ 508
+	PScvn	@ 509
+	PScvr	@ 510
+	PScvrs	@ 511
+	PScvs	@ 512
+	PScvx	@ 513
+	PSdef	@ 514
+	PSdict	@ 515
+	PSdictstack	@ 516
+	PSdup	@ 517
+	PSend	@ 518
+	PSexch	@ 519
+	PSexecstack	@ 520
+	PSexecuteonly	@ 521
+	PSget	@ 522
+	PSgetinterval	@ 523
+	PSindex	@ 524
+	PSknown	@ 525
+	PSlength	@ 526
+	PSload	@ 527
+	PSmark	@ 528
+	PSmatrix	@ 529
+	PSmaxlength	@ 530
+	PSnoaccess	@ 531
+	PSnull	@ 532
+	PSpackedarray	@ 533
+	PSpop	@ 534
+	PSput	@ 535
+	PSputinterval	@ 536
+	PSrcheck	@ 537
+	PSreadonly	@ 538
+	PSroll	@ 539
+	PSscheck	@ 540
+	PSsearch	@ 541
+	PSshareddict	@ 542
+	PSstatusdict	@ 543
+	PSstore	@ 544
+	PSstring	@ 545
+	PSstringwidth	@ 546
+	PSsystemdict	@ 547
+	PSuserdict	@ 548
+	PSwcheck	@ 549
+	PSwhere	@ 550
+	PSxcheck	@ 551
+	PSFontDirectory	@ 552
+	PSISOLatin1Encoding	@ 553
+	PSSharedFontDirectory	@ 554
+	PSStandardEncoding	@ 555
+	PScachestatus	@ 556
+	PScurrentcacheparams	@ 557
+	PScurrentfont	@ 558
+	PSdefinefont	@ 559
+	PSfindfont	@ 560
+	PSmakefont	@ 561
+	PSscalefont	@ 562
+	PSselectfont	@ 563
+	PSsetcachedevice	@ 564
+	PSsetcachelimit	@ 565
+	PSsetcacheparams	@ 566
+	PSsetcharwidth	@ 567
+	PSsetfont	@ 568
+	PSundefinefont	@ 569
+	PSconcat	@ 570
+	PScurrentdash	@ 571
+	PScurrentflat	@ 572
+	PScurrentgray	@ 573
+	PScurrentgstate	@ 574
+	PScurrenthalftone	@ 575
+	PScurrenthalftonephase	@ 576
+	PScurrenthsbcolor	@ 577
+	PScurrentlinecap	@ 578
+	PScurrentlinejoin	@ 579
+	PScurrentlinewidth	@ 580
+	PScurrentmatrix	@ 581
+	PScurrentmiterlimit	@ 582
+	PScurrentpoint	@ 583
+	PScurrentrgbcolor	@ 584
+	PScurrentscreen	@ 585
+	PScurrentstrokeadjust	@ 586
+	PScurrenttransfer	@ 587
+	PSdefaultmatrix	@ 588
+	PSgrestore	@ 589
+	PSgrestoreall	@ 590
+	PSgsave	@ 591
+	PSgstate	@ 592
+	PSinitgraphics	@ 593
+	PSinitmatrix	@ 594
+	PSrotate	@ 595
+	PSscale	@ 596
+	PSsetdash	@ 597
+	PSsetflat	@ 598
+	PSsetgray	@ 599
+	PSsetgstate	@ 600
+	PSsethalftone	@ 601
+	PSsethalftonephase	@ 602
+	PSsethsbcolor	@ 603
+	PSsetlinecap	@ 604
+	PSsetlinejoin	@ 605
+	PSsetlinewidth	@ 606
+	PSsetmatrix	@ 607
+	PSsetmiterlimit	@ 608
+	PSsetrgbcolor	@ 609
+	PSsetscreen	@ 610
+	PSsetstrokeadjust	@ 611
+	PSsettransfer	@ 612
+	PStranslate	@ 613
+	PSequals	@ 614
+	PSequalsequals	@ 615
+	PSbytesavailable	@ 616
+	PSclosefile	@ 617
+	PScurrentfile	@ 618
+	PSdeletefile	@ 619
+	PSecho	@ 620
+	PSfile	@ 621
+	PSfilenameforall	@ 622
+	PSfileposition	@ 623
+	PSflush	@ 624
+	PSflushfile	@ 625
+	PSprint	@ 626
+	PSprintobject	@ 627
+	PSpstack	@ 628
+	PSread	@ 629
+	PSreadhexstring	@ 630
+	PSreadline	@ 631
+	PSreadstring	@ 632
+	PSrenamefile	@ 633
+	PSresetfile	@ 634
+	PSsetfileposition	@ 635
+	PSstack	@ 636
+	PSstatus	@ 637
+	PStoken	@ 638
+	PSwrite	@ 639
+	PSwritehexstring	@ 640
+	PSwriteobject	@ 641
+	PSwritestring	@ 642
+	PSleftbracket	@ 643
+	PSrightbracket	@ 644
+	PSleftleft	@ 645
+	PSrightright	@ 646
+	PScshow	@ 647
+	PScurrentcolor	@ 648
+	PScurrentcolorrendering	@ 649
+	PScurrentcolorspace	@ 650
+	PScurrentdevparams	@ 651
+	PScurrentglobal	@ 652
+	PScurrentoverprint	@ 653
+	PScurrentpagedevice	@ 654
+	PScurrentsystemparams	@ 655
+	PScurrentuserparams	@ 656
+	PSdefineresource	@ 657
+	PSexecform	@ 658
+	PSfilter	@ 659
+	PSfindencoding	@ 660
+	PSfindresource	@ 661
+	PSgcheck	@ 662
+	PSglobaldict	@ 663
+	PSGlobalFontDirectory	@ 664
+	PSglyphshow	@ 665
+	PSlanguagelevel	@ 666
+	PSmakepattern	@ 667
+	PSproduct	@ 668
+	PSresourceforall	@ 669
+	PSresourcestatus	@ 670
+	PSrevision	@ 671
+	PSrootfont	@ 672
+	PSserialnumber	@ 673
+	PSsetcolor	@ 674
+	PSsetcolorrendering	@ 675
+	PSsetcolorspace	@ 676
+	PSsetdevparams	@ 677
+	PSsetglobal	@ 678
+	PSsetoverprint	@ 679
+	PSsetpagedevice	@ 680
+	PSsetpattern	@ 681
+	PSsetsystemparams	@ 682
+	PSsetuserparams	@ 683
+	PSstartjob	@ 684
+	PSundefineresource	@ 685
+	PSabs	@ 686
+	PSadd	@ 687
+	PSand	@ 688
+	PSatan	@ 689
+	PSbitshift	@ 690
+	PSceiling	@ 691
+	PScos	@ 692
+	PSdiv	@ 693
+	PSexp	@ 694
+	PSfloor	@ 695
+	PSidiv	@ 696
+	PSln	@ 697
+	PSlog	@ 698
+	PSmod	@ 699
+	PSmul	@ 700
+	PSneg	@ 701
+	PSround	@ 702
+	PSsin	@ 703
+	PSsqrt	@ 704
+	PSsub	@ 705
+	PStruncate	@ 706
+	PSxor	@ 707
+	PSbanddevice	@ 708
+	PSframedevice	@ 709
+	PSnulldevice	@ 710
+	PSrenderbands	@ 711
+	PSconcatmatrix	@ 712
+	PSdtransform	@ 713
+	PSidentmatrix	@ 714
+	PSidtransform	@ 715
+	PSinvertmatrix	@ 716
+	PSitransform	@ 717
+	PStransform	@ 718
+	PSgetboolean	@ 719
+	PSgetchararray	@ 720
+	PSgetfloat	@ 721
+	PSgetfloatarray	@ 722
+	PSgetint	@ 723
+	PSgetintarray	@ 724
+	PSgetstring	@ 725
+	PSsendboolean	@ 726
+	PSsendchararray	@ 727
+	PSsendfloat	@ 728
+	PSsendfloatarray	@ 729
+	PSsendint	@ 730
+	PSsendintarray	@ 731
+	PSsendstring	@ 732
+	PSarc	@ 733
+	PSarcn	@ 734
+	PSarct	@ 735
+	PSarcto	@ 736
+	PScharpath	@ 737
+	PSclip	@ 738
+	PSclippath	@ 739
+	PSclosepath	@ 740
+	PScurveto	@ 741
+	PSeoclip	@ 742
+	PSeoviewclip	@ 743
+	PSflattenpath	@ 744
+	PSinitclip	@ 745
+	PSinitviewclip	@ 746
+	PSlineto	@ 747
+	PSmoveto	@ 748
+	PSnewpath	@ 749
+	PSpathbbox	@ 750
+	PSpathforall	@ 751
+	PSrcurveto	@ 752
+	PSrectclip	@ 753
+	PSrectviewclip	@ 754
+	PSreversepath	@ 755
+	PSrlineto	@ 756
+	PSrmoveto	@ 757
+	PSsetbbox	@ 758
+	PSsetucacheparams	@ 759
+	PSuappend	@ 760
+	PSucache	@ 761
+	PSucachestatus	@ 762
+	PSupath	@ 763
+	PSviewclip	@ 764
+	PSviewclippath	@ 765
+	PSashow	@ 766
+	PSawidthshow	@ 767
+	PScopypage	@ 768
+	PSeofill	@ 769
+	PSerasepage	@ 770
+	PSfill	@ 771
+	PSimage	@ 772
+	PSimagemask	@ 773
+	PSkshow	@ 774
+	PSrectfill	@ 775
+	PSrectstroke	@ 776
+	PSshow	@ 777
+	PSshowpage	@ 778
+	PSstroke	@ 779
+	PSstrokepath	@ 780
+	PSueofill	@ 781
+	PSufill	@ 782
+	PSustroke	@ 783
+	PSustrokepath	@ 784
+	PSwidthshow	@ 785
+	PSxshow	@ 786
+	PSxyshow	@ 787
+	PSyshow	@ 788
+	PSbind	@ 789
+	PScleardictstack	@ 790
+	PScountdictstack	@ 791
+	PScountexecstack	@ 792
+	PScurrentdict	@ 793
+	PScurrentpacking	@ 794
+	PScurrentshared	@ 795
+	PSdeviceinfo	@ 796
+	PSerrordict	@ 797
+	PSexec	@ 798
+	PSprompt	@ 799
+	PSquit	@ 800
+	PSrand	@ 801
+	PSrealtime	@ 802
+	PSrestore	@ 803
+	PSrrand	@ 804
+	PSrun	@ 805
+	PSsave	@ 806
+	PSsetpacking	@ 807
+	PSsetshared	@ 808
+	PSsrand	@ 809
+	PSstart	@ 810
+	PStype	@ 811
+	PSundef	@ 812
+	PSusertime	@ 813
+	PSversion	@ 814
+	PSvmreclaim	@ 815
+	PSvmstatus	@ 816
+	PSineofill	@ 817
+	PSinfill	@ 818
+	PSinstroke	@ 819
+	PSinueofill	@ 820
+	PSinufill	@ 821
+	PSinustroke	@ 822
+	PSwtranslation	@ 823
+	XDPSLInit	@824
+	DPSWriteStringChars @ 825
+	XDPSUnfreezeContext @ 826
+	DPSGetCurrentContext @ 827
+	DPSAwaitReturnValues @ 828
+	DPSNewUserObjectIndex @ 829
+	XDPSGetContextStatus @ 830
+	XDPSRegisterStatusProc @ 831
+	DPSDefaultTextBackstop @ 832
+	DPSMapNames @ 833
+	XDPSGetDefaultColorMaps @ 834
+	XDPSCreateSimpleContext @ 835
+	DPSGenerateExtensionRecID @ 836
+	DPSWaitContext @ 837
+	DPSAddContextExtensionRec @ 838
+	DPSGetContextExtensionRec @ 839
+	DPSChainContext @ 840
+	DPSDestroySpace @ 841
+	DPSUnchainContext @ 842
+	DPSBinObjSeqWrite @ 843
+	DPSSetResultTable @ 844
+	XDPSSetStatusMask @ 845
+	XDPSXIDFromContext @ 846
+	DPSWritePostScript @ 847
+	DPSRemoveContextExtensionRec @ 848
+	DPSDefaultErrorProc @ 849
+	DPSCreateTextContext @ 850
Index: xc/lib/dps/dpsos2.rsp
diff -u /dev/null xc/lib/dps/dpsos2.rsp:1.1
--- /dev/null	Sat Jul  1 20:44:54 2000
+++ xc/lib/dps/dpsos2.rsp	Wed Apr  5 11:13:21 2000
@@ -0,0 +1,13 @@
+XDPS.obj csconndi.obj csfindNX.obj cslibext.obj cslibint.obj csopendi.obj+
+csstartNX.obj dpsXclient.obj dpsXcmu.obj dpsXops.obj dpsXpriv.obj+
+dpsXtdisp.obj dpsabbrev.obj dpsclient.obj dpsclrops.obj dpsctrlops.obj+
+dpsctxtops.obj dpsdataops.obj dpsdict.obj dpsexcept.obj dpsfontops.obj+
+dpsgsttops.obj dpsioops.obj dpsl2ops.obj dpsmathops.obj dpsmiscops.obj+
+dpsmtrxops.obj dpsopstack.obj dpspathops.obj dpspntops.obj dpsprintf.obj+
+dpssysnames.obj dpssysops.obj dpswinops.obj psXops.obj psclrops.obj+
+psctrlops.obj psctxtops.obj psdataops.obj psfontops.obj psgsttops.obj+
+psioops.obj psl2ops.obj psmathops.obj psmiscops.obj psmtrxops.obj+
+psopstack.obj pspathops.obj pspntops.obj pssysops.obj pswinops.obj+
+/NOI /NOL /NOD /BAT
+dps.dll
+dps.map
Index: xc/lib/dps/dpsprintf.c
diff -u xc/lib/dps/dpsprintf.c:1.1 xc/lib/dps/dpsprintf.c:1.2
--- xc/lib/dps/dpsprintf.c:1.1	Sat Feb 12 16:13:11 2000
+++ xc/lib/dps/dpsprintf.c	Thu May 18 16:46:14 2000
@@ -36,6 +36,8 @@
  * Author:  Adobe Systems Incorporated
  */
 
+#include <stdio.h>
+
 #include "publictypes.h"
 #include "DPS/dpsclient.h"
 
@@ -43,39 +45,6 @@
 extern void DPSdoprint();
 #endif /* USE_DOPRINT */
 
-#ifdef _NO_PROTO
-#include <varargs.h>
-
-void DPSPrintf(va_alist)
-    va_dcl
-{
-    va_list args;
-    DPSContext ctxt;
-    char *fmt;
-
-#ifdef VAXC
-    va_start_1(args, sizeof(DPSContext) + sizeof(char *));
-#else /* VAXC */
-    va_start(args);
-#endif /* VAXC */
-
-    ctxt = (DPSContext) va_arg(args, DPSContext);
-    fmt = va_arg(args, char *);
-
-#ifdef USE_DOPRINT
-    DPSdoprint(ctxt, fmt, &args);
-#else /* USE_DOPRINT */
-    {
-	char buffer[10000];
-	vsprintf(buffer, fmt, args);
-	DPSWritePostScript(ctxt, buffer, strlen(buffer));
-    }
-#endif /* USE_DOPRINT */
-    va_end(args);
-}
-
-#else /* _NO_PROTO */
-
 #include <stdarg.h>
 
 void DPSPrintf(DPSContext ctxt, char *fmt, ...)
@@ -99,5 +68,3 @@
 #endif /* USE_DOPRINT */
     va_end(args);
 }
-
-#endif /* _NO_PROTO */
Index: xc/lib/dps/dpsprivate.h
diff -u xc/lib/dps/dpsprivate.h:1.1 xc/lib/dps/dpsprivate.h:1.2
--- xc/lib/dps/dpsprivate.h:1.1	Sat Feb 12 16:13:12 2000
+++ xc/lib/dps/dpsprivate.h	Thu May 18 16:46:14 2000
@@ -40,6 +40,7 @@
 #define	DPSPRIVATE_H
 
 #include "DPS/dpsconfig.h"
+#include "DPS/dpsclient.h"
 
 typedef enum {
   dps_hiFirst, dps_loFirst
@@ -49,19 +50,17 @@
   dps_ieee, dps_native
   } DPSNumFormat;
 
-typedef void (*DPSClientPrintProc)(/*
-  ContextID cid;
-  unsigned char *buf;
-  unsigned int count; */);
+typedef void (*DPSClientPrintProc)(
+  DPSContext		/* cid */,
+  char *		/* buf */,
+  unsigned int		/* count */);
   /* Call-back procedure to handle output from the PostScript server for
      context with id 'cid'. Passed to DPSServicePostScript.
     'buf' contains 'count' bytes. */
 
 extern void DPSInitClient(
-  /* DPSTextProc textProc;
-     procedure (*bufReleaseProc)(PSContext context; char *buffer);
-   */
-   );
+  DPSTextProc		textProc,
+  void			(* /* releaseProc */) (char *, char *));
 /* Initialize the environment-specific parts of the client library */
 
 #ifndef DPSDefaultProgramEncoding
@@ -88,51 +87,7 @@
 #define DPSDefaultNameEncoding dps_indexed
 #endif /* not DPSDefaultNameEncoding */
 
-extern DPSNumFormat DPSCreatePrivContext(
-  /* void *wh;
-   * DPSContext ctxt;
-   * long int *cidP, *sidP;
-   * boolean newSpace;
-   * DPSClientPrintProc printProc;
-   */
-  );
-  /* returns -1 if server can't create the context */
-
-extern void DPSIncludePrivContext(
-  /* void *wh;
-   * DPSContext ctxt;
-   * long int cid, sid;
-   * DPSClientPrintProc printProc;
-   */
-  );
-
-extern void DPSSendPostScript(
- /*   void *wh; DPSClientPrintProc printProc;
-  *   ContextID cID; char *buffer; long int count;
-  *   boolean (*returnControl)();
-  */
- );
-
-extern void DPSSendInterrupt(
-  /* void *wh; ContextID cID; DPSClientPrintProc printProc; */
-  );
-
-extern void DPSSendEOF(
-  /* void *wh; ContextID cID; DPSClientPrintProc printProc; */
-  );
-
-extern void DPSSendTerminate(
-  /* void *wh; ContextID cID; DPSClientPrintProc printProc; */
-  );
-
-extern void DPSSendDestroySpace(
-  /* void *wh; SpaceID sid; DPSClientPrintProc printProc; */
-  );
-  
-extern void DPSReportInvalid(/* ContextID cID; */);
-  /* Called by the implementation of dpsprivate.h. Implemented by dpsclient.c */
-
-extern void DPSCheckRaiseError(/* DPSContext c; */);
+extern void DPSCheckRaiseError(DPSContext c);
   /* Checks the resynching flag in a DPSPrivContext and raises an exception
      if true */
 
@@ -148,12 +103,13 @@
      DPSSysNamesAux[index - DPS_FIRST_AUX_SYSNAME] is the string
      for an uncommon system name. */
 
-extern void DPSInitSysNames();
+extern int DPSInitialize(void);
+extern void DPSInitSysNames(void);
 
-extern char *DPSSetWh(/* DPSContext ctxt; char *newWh */);
+extern char *DPSSetWh(DPSContext /* ctxt */, char * /* newWh */);
   /* set new window handle, returns old window handle */
 
-extern void DPSOutOfMemory();
+extern void DPSOutOfMemory(void);
   /*
      This is called by the DPS software when it cannot allocate any more
      storage from the heap (e.g., when malloc returns NIL).
Index: xc/lib/dps/genheader.cmd
diff -u /dev/null xc/lib/dps/genheader.cmd:1.2
--- /dev/null	Sat Jul  1 20:44:54 2000
+++ xc/lib/dps/genheader.cmd	Thu May 18 16:46:14 2000
@@ -0,0 +1,14 @@
+REM 
+/* OS/2 generate header files */
+/* $XFree86: xc/lib/dps/genheader.cmd,v 1.2 2000/05/18 23:46:14 dawes Exp $ */
+cat psclrops.h psctrlops.h psctxtops.h psdataops.h psfontops.h psgsttops.h psioops.h psmathops.h psmtrxops.h psmiscops.h pspntops.h pspathops.h pssysops.h pswinops.h psopstack.h psXops.h psl2ops.h >.ph
+sed -e "/^$$/D" -e "/#/D" -e "/^\//D" -e "/^   gener/D" -e "/^.\//D" .ph | sort >.sort
+awk "/;/ {print;printf(\"\n\");}" .sort >.ttt
+cat psname.txt header.txt psifdef.txt .ttt psendif.txt > psops.h.os2
+rm .ph .sort .ttt
+
+cat dpsclrops.h dpsctrlops.h dpsctxtops.h dpsdataops.h dpsfontops.h dpsgsttops.h dpsioops.h dpsmathops.h dpsmtrxops.h dpsmiscops.h dpspntops.h dpspathops.h dpssysops.h dpswinops.h dpsopstack.h dpsXops.h dpsl2ops.h >.ph
+sed -e "/^$$/D" -e "/#/D" -e "/^\//D" -e "/^   gener/D" -e "/^.\//D" .ph | sort >.sort
+awk "/;/ {print;printf(\"\n\");}" .sort >.ttt
+cat dpsname.txt header.txt dpsifdef.txt .ttt dpsendif.txt > dpsops.h.os2
+rm .ph .sort .ttt
Index: xc/lib/dps/psXops.psw
diff -u xc/lib/dps/psXops.psw:1.1 xc/lib/dps/psXops.psw:1.2
--- xc/lib/dps/psXops.psw:1.1	Sat Feb 12 16:13:15 2000
+++ xc/lib/dps/psXops.psw	Wed Jun  7 15:02:57 2000
@@ -34,6 +34,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dps/psXops.psw,v 1.2 2000/06/07 22:02:57 tsi Exp $ */
 
 defineps PSclientsync()
 	clientsync
@@ -59,7 +60,7 @@
 	gc draw x y colorInfo setXgcdrawablecolor
 endps
 
-defineps PSsetXoffset(short x, y)
+defineps PSsetXoffset(int x, y)
 	x y setXoffset
 endps
 
Index: xc/lib/dps/psendif.txt
diff -u xc/lib/dps/psendif.txt:1.1 xc/lib/dps/psendif.txt:1.2
--- xc/lib/dps/psendif.txt:1.1	Sat Feb 12 16:13:17 2000
+++ xc/lib/dps/psendif.txt	Thu May 18 16:46:14 2000
@@ -1,7 +1,6 @@
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-
-#endif /* _NO_PROTO */
 
 #endif /* PSOPS_H */
Index: xc/lib/dps/psifdef.txt
diff -u xc/lib/dps/psifdef.txt:1.1 xc/lib/dps/psifdef.txt:1.2
--- xc/lib/dps/psifdef.txt:1.1	Sat Feb 12 16:13:19 2000
+++ xc/lib/dps/psifdef.txt	Thu May 18 16:46:14 2000
@@ -1,5 +1,7 @@
 #ifndef PSOPS_H
 #define PSOPS_H
 
-#ifdef _NO_PROTO
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
 
Index: xc/lib/dps/psops.h.os2
diff -u /dev/null xc/lib/dps/psops.h.os2:1.2
--- /dev/null	Sat Jul  1 20:44:54 2000
+++ xc/lib/dps/psops.h.os2	Wed Jun  7 15:02:57 2000
@@ -0,0 +1,1602 @@
+/*
+ * psops.h
+ */
+/*
+ * (c) Copyright 1988-1994 Adobe Systems Incorporated.
+ * All rights reserved.
+ * 
+ * Permission to use, copy, modify, distribute, and sublicense this software
+ * and its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notices appear in all copies and that
+ * both those copyright notices and this permission notice appear in
+ * supporting documentation and that the name of Adobe Systems Incorporated
+ * not be used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  No trademark license
+ * to use the Adobe trademarks is hereby granted.  If the Adobe trademark
+ * "Display PostScript"(tm) is used to describe this software, its
+ * functionality or for any other purpose, such use shall be limited to a
+ * statement that this software works in conjunction with the Display
+ * PostScript system.  Proper trademark attribution to reflect Adobe's
+ * ownership of the trademark shall be given whenever any such reference to
+ * the Display PostScript system is made.
+ * 
+ * ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
+ * ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
+ * ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON- INFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL ADOBE BE LIABLE
+ * TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT
+ * PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE SOFTWARE.
+ * 
+ * Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
+ * Incorporated which may be registered in certain jurisdictions
+ * 
+ * Author:  Adobe Systems Incorporated
+ */
+/* $XFree86: xc/lib/dps/psops.h.os2,v 1.2 2000/06/07 22:02:57 tsi Exp $ */
+
+#ifndef PSOPS_H
+#define PSOPS_H
+
+#ifdef _NO_PROTO
+
+extern void PSFontDirectory();
+
+extern void PSGlobalFontDirectory();
+
+extern void PSISOLatin1Encoding();
+
+extern void PSSharedFontDirectory();
+
+extern void PSStandardEncoding();
+
+extern void PSUserObjects();
+
+extern void PSabs();
+
+extern void PSadd();
+
+extern void PSaload();
+
+extern void PSanchorsearch( /* int *truth; */ );
+
+extern void PSand();
+
+extern void PSarc( /* float x, y, r, angle1, angle2; */ );
+
+extern void PSarcn( /* float x, y, r, angle1, angle2; */ );
+
+extern void PSarct( /* float x1, y1, x2, y2, r; */ );
+
+extern void PSarcto( /* float x1, y1, x2, y2, r; float *xt1, *yt1, *xt2, *yt2; */ );
+
+extern void PSarray( /* int len; */ );
+
+extern void PSashow( /* float x, y; char *s; */ );
+
+extern void PSastore();
+
+extern void PSatan();
+
+extern void PSawidthshow( /* float cx, cy; int c; float ax, ay; char *s; */ );
+
+extern void PSbanddevice();
+
+extern void PSbegin();
+
+extern void PSbind();
+
+extern void PSbitshift( /* int shift; */ );
+
+extern void PSbytesavailable( /* int *n; */ );
+
+extern void PScachestatus();
+
+extern void PSceiling();
+
+extern void PScharpath( /* char *s; int b; */ );
+
+extern void PSclear();
+
+extern void PScleardictstack();
+
+extern void PScleartomark();
+
+extern void PSclientXready( /* int i0, i1, i2, i3; */ );
+
+extern void PSclientsync();
+
+extern void PSclip();
+
+extern void PSclippath();
+
+extern void PSclosefile();
+
+extern void PSclosepath();
+
+extern void PScolorimage();
+
+extern void PSconcat( /* float m[]; */ );
+
+extern void PSconcatmatrix();
+
+extern void PScondition();
+
+extern void PScopy( /* int n; */ );
+
+extern void PScopypage();
+
+extern void PScos();
+
+extern void PScount( /* int *n; */ );
+
+extern void PScountdictstack( /* int *n; */ );
+
+extern void PScountexecstack( /* int *n; */ );
+
+extern void PScounttomark( /* int *n; */ );
+
+extern void PScshow( /* char *s; */ );
+
+extern void PScurrentXdrawingfunction( /* int *function; */ );
+
+extern void PScurrentXgcdrawable( /* int *gc, *draw, *x, *y; */ );
+
+extern void PScurrentXgcdrawablecolor( /* int *gc, *draw, *x, *y, colorInfo[]; */ );
+
+extern void PScurrentXoffset( /* int *x, *y; */ );
+
+extern void PScurrentblackgeneration();
+
+extern void PScurrentcacheparams();
+
+extern void PScurrentcmykcolor( /* float *c, *m, *y, *k; */ );
+
+extern void PScurrentcolor();
+
+extern void PScurrentcolorrendering();
+
+extern void PScurrentcolorscreen();
+
+extern void PScurrentcolorspace();
+
+extern void PScurrentcolortransfer();
+
+extern void PScurrentcontext( /* int *cid; */ );
+
+extern void PScurrentdash();
+
+extern void PScurrentdevparams( /* char *dev; */ );
+
+extern void PScurrentdict();
+
+extern void PScurrentfile();
+
+extern void PScurrentflat( /* float *flatness; */ );
+
+extern void PScurrentfont();
+
+extern void PScurrentglobal( /* int *b; */ );
+
+extern void PScurrentgray( /* float *gray; */ );
+
+extern void PScurrentgstate( /* int gst; */ );
+
+extern void PScurrenthalftone();
+
+extern void PScurrenthalftonephase( /* float *x, *y; */ );
+
+extern void PScurrenthsbcolor( /* float *h, *s, *b; */ );
+
+extern void PScurrentlinecap( /* int *linecap; */ );
+
+extern void PScurrentlinejoin( /* int *linejoin; */ );
+
+extern void PScurrentlinewidth( /* float *width; */ );
+
+extern void PScurrentmatrix();
+
+extern void PScurrentmiterlimit( /* float *limit; */ );
+
+extern void PScurrentobjectformat( /* int *code; */ );
+
+extern void PScurrentoverprint( /* int *b; */ );
+
+extern void PScurrentpacking( /* int *b; */ );
+
+extern void PScurrentpagedevice();
+
+extern void PScurrentpoint( /* float *x, *y; */ );
+
+extern void PScurrentrgbcolor( /* float *r, *g, *b; */ );
+
+extern void PScurrentscreen();
+
+extern void PScurrentshared( /* int *b; */ );
+
+extern void PScurrentstrokeadjust( /* int *b; */ );
+
+extern void PScurrentsystemparams();
+
+extern void PScurrenttransfer();
+
+extern void PScurrentundercolorremoval();
+
+extern void PScurrentuserparams();
+
+extern void PScurveto( /* float x1, y1, x2, y2, x3, y3; */ );
+
+extern void PScvi();
+
+extern void PScvlit();
+
+extern void PScvn();
+
+extern void PScvr();
+
+extern void PScvrs();
+
+extern void PScvs();
+
+extern void PScvx();
+
+extern void PSdef();
+
+extern void PSdefaultmatrix();
+
+extern void PSdefinefont();
+
+extern void PSdefineresource( /* char *category; */ );
+
+extern void PSdefineusername( /* int i; char *username; */ );
+
+extern void PSdefineuserobject();
+
+extern void PSdeletefile( /* char *filename; */ );
+
+extern void PSdetach();
+
+extern void PSdeviceinfo();
+
+extern void PSdict( /* int len; */ );
+
+extern void PSdictstack();
+
+extern void PSdiv();
+
+extern void PSdtransform( /* float x1, y1; float *x2, *y2; */ );
+
+extern void PSdup();
+
+extern void PSecho( /* int b; */ );
+
+extern void PSend();
+
+extern void PSeoclip();
+
+extern void PSeofill();
+
+extern void PSeoviewclip();
+
+extern void PSeq();
+
+extern void PSequals();
+
+extern void PSequalsequals();
+
+extern void PSerasepage();
+
+extern void PSerrordict();
+
+extern void PSexch();
+
+extern void PSexec();
+
+extern void PSexecform();
+
+extern void PSexecstack();
+
+extern void PSexecuserobject( /* int userObjIndex; */ );
+
+extern void PSexecuteonly();
+
+extern void PSexit();
+
+extern void PSexp();
+
+extern void PSfalse();
+
+extern void PSfile( /* char *name, *access; */ );
+
+extern void PSfilenameforall();
+
+extern void PSfileposition( /* int *pos; */ );
+
+extern void PSfill();
+
+extern void PSfilter();
+
+extern void PSfindencoding( /* char *key; */ );
+
+extern void PSfindfont( /* char *name; */ );
+
+extern void PSfindresource( /* char *key, *category; */ );
+
+extern void PSflattenpath();
+
+extern void PSfloor();
+
+extern void PSflush();
+
+extern void PSflushfile();
+
+extern void PSfor();
+
+extern void PSforall();
+
+extern void PSfork();
+
+extern void PSframedevice();
+
+extern void PSgcheck( /* int *b; */ );
+
+extern void PSge();
+
+extern void PSget();
+
+extern void PSgetboolean( /* int *it; */ );
+
+extern void PSgetchararray( /* int size; char s[]; */ );
+
+extern void PSgetfloat( /* float *it; */ );
+
+extern void PSgetfloatarray( /* int size; float a[]; */ );
+
+extern void PSgetint( /* int *it; */ );
+
+extern void PSgetintarray( /* int size; int a[]; */ );
+
+extern void PSgetinterval();
+
+extern void PSgetstring( /* char *s; */ );
+
+extern void PSglobaldict();
+
+extern void PSglyphshow( /* char *name; */ );
+
+extern void PSgrestore();
+
+extern void PSgrestoreall();
+
+extern void PSgsave();
+
+extern void PSgstate();
+
+extern void PSgt();
+
+extern void PSidentmatrix();
+
+extern void PSidiv();
+
+extern void PSidtransform( /* float x1, y1; float *x2, *y2; */ );
+
+extern void PSif();
+
+extern void PSifelse();
+
+extern void PSimage();
+
+extern void PSimagemask();
+
+extern void PSindex( /* int i; */ );
+
+extern void PSineofill( /* float x, y; int *b; */ );
+
+extern void PSinfill( /* float x, y; int *b; */ );
+
+extern void PSinitclip();
+
+extern void PSinitgraphics();
+
+extern void PSinitmatrix();
+
+extern void PSinitviewclip();
+
+extern void PSinstroke( /* float x, y; int *b; */ );
+
+extern void PSinueofill( /* float x, y; char nums[]; int n; char ops[]; int l; int *b; */ );
+
+extern void PSinufill( /* float x, y; char nums[]; int n; char ops[]; int l; int *b; */ );
+
+extern void PSinustroke( /* float x, y; char nums[]; int n; char ops[]; int l; int *b; */ );
+
+extern void PSinvertmatrix();
+
+extern void PSitransform( /* float x1, y1; float *x2, *y2; */ );
+
+extern void PSjoin();
+
+extern void PSknown( /* int *b; */ );
+
+extern void PSkshow( /* char *s; */ );
+
+extern void PSlanguagelevel( /* int *n; */ );
+
+extern void PSle();
+
+extern void PSleftbracket();
+
+extern void PSleftleft();
+
+extern void PSlength( /* int *len; */ );
+
+extern void PSlineto( /* float x, y; */ );
+
+extern void PSln();
+
+extern void PSload();
+
+extern void PSlock();
+
+extern void PSlog();
+
+extern void PSloop();
+
+extern void PSlt();
+
+extern void PSmakefont();
+
+extern void PSmakepattern();
+
+extern void PSmark();
+
+extern void PSmatrix();
+
+extern void PSmaxlength( /* int *len; */ );
+
+extern void PSmod();
+
+extern void PSmonitor();
+
+extern void PSmoveto( /* float x, y; */ );
+
+extern void PSmul();
+
+extern void PSne();
+
+extern void PSneg();
+
+extern void PSnewpath();
+
+extern void PSnoaccess();
+
+extern void PSnot();
+
+extern void PSnotify();
+
+extern void PSnull();
+
+extern void PSnulldevice();
+
+extern void PSor();
+
+extern void PSpackedarray();
+
+extern void PSpathbbox( /* float *llx, *lly, *urx, *ury; */ );
+
+extern void PSpathforall();
+
+extern void PSpop();
+
+extern void PSprint();
+
+extern void PSprintobject( /* int tag; */ );
+
+extern void PSproduct();
+
+extern void PSprompt();
+
+extern void PSpstack();
+
+extern void PSput();
+
+extern void PSputinterval();
+
+extern void PSquit();
+
+extern void PSrand();
+
+extern void PSrcheck( /* int *b; */ );
+
+extern void PSrcurveto( /* float x1, y1, x2, y2, x3, y3; */ );
+
+extern void PSread( /* int *b; */ );
+
+extern void PSreadhexstring( /* int *b; */ );
+
+extern void PSreadline( /* int *b; */ );
+
+extern void PSreadonly();
+
+extern void PSreadstring( /* int *b; */ );
+
+extern void PSrealtime( /* int *i; */ );
+
+extern void PSrectclip( /* float x, y, w, h; */ );
+
+extern void PSrectfill( /* float x, y, w, h; */ );
+
+extern void PSrectstroke( /* float x, y, w, h; */ );
+
+extern void PSrectviewclip( /* float x, y, w, h; */ );
+
+extern void PSrenamefile( /* char *oldname, *newname; */ );
+
+extern void PSrenderbands();
+
+extern void PSrepeat();
+
+extern void PSresetfile();
+
+extern void PSresourceforall( /* char *category; */ );
+
+extern void PSresourcestatus( /* char *key, *category; int *b; */ );
+
+extern void PSrestore();
+
+extern void PSreversepath();
+
+extern void PSrevision( /* int *n; */ );
+
+extern void PSrightbracket();
+
+extern void PSrightright();
+
+extern void PSrlineto( /* float x, y; */ );
+
+extern void PSrmoveto( /* float x, y; */ );
+
+extern void PSroll( /* int n, j; */ );
+
+extern void PSrootfont();
+
+extern void PSrotate( /* float angle; */ );
+
+extern void PSround();
+
+extern void PSrrand();
+
+extern void PSrun( /* char *filename; */ );
+
+extern void PSsave();
+
+extern void PSscale( /* float x, y; */ );
+
+extern void PSscalefont( /* float size; */ );
+
+extern void PSscheck( /* int *b; */ );
+
+extern void PSsearch( /* int *b; */ );
+
+extern void PSselectfont( /* char *name; float scale; */ );
+
+extern void PSsendboolean( /* int it; */ );
+
+extern void PSsendchararray( /* char s[]; int size; */ );
+
+extern void PSsendfloat( /* float it; */ );
+
+extern void PSsendfloatarray( /* float a[]; int size; */ );
+
+extern void PSsendint( /* int it; */ );
+
+extern void PSsendintarray( /* int a[]; int size; */ );
+
+extern void PSsendstring( /* char *s; */ );
+
+extern void PSserialnumber( /* int *n; */ );
+
+extern void PSsetXdrawingfunction( /* int function; */ );
+
+extern void PSsetXgcdrawable( /* int gc, draw, x, y; */ );
+
+extern void PSsetXgcdrawablecolor( /* int gc, draw, x, y, colorInfo[]; */ );
+
+extern void PSsetXoffset( /* int x, y; */ );
+
+extern void PSsetXrgbactual( /* float r, g, b; int *success; */ );
+
+extern void PSsetbbox( /* float llx, lly, urx, ury; */ );
+
+extern void PSsetblackgeneration();
+
+extern void PSsetcachedevice( /* float wx, wy, llx, lly, urx, ury; */ );
+
+extern void PSsetcachelimit( /* int n; */ );
+
+extern void PSsetcacheparams();
+
+extern void PSsetcharwidth( /* float wx, wy; */ );
+
+extern void PSsetcmykcolor( /* float c, m, y, k; */ );
+
+extern void PSsetcolor();
+
+extern void PSsetcolorrendering();
+
+extern void PSsetcolorscreen();
+
+extern void PSsetcolorspace();
+
+extern void PSsetcolortransfer();
+
+extern void PSsetdash( /* float pat[]; int size; float offset; */ );
+
+extern void PSsetdevparams();
+
+extern void PSsetfileposition( /* int pos; */ );
+
+extern void PSsetflat( /* float flatness; */ );
+
+extern void PSsetfont( /* int f; */ );
+
+extern void PSsetglobal( /* int b; */ );
+
+extern void PSsetgray( /* float gray; */ );
+
+extern void PSsetgstate( /* int gst; */ );
+
+extern void PSsethalftone();
+
+extern void PSsethalftonephase( /* float x, y; */ );
+
+extern void PSsethsbcolor( /* float h, s, b; */ );
+
+extern void PSsetlinecap( /* int linecap; */ );
+
+extern void PSsetlinejoin( /* int linejoin; */ );
+
+extern void PSsetlinewidth( /* float width; */ );
+
+extern void PSsetmatrix();
+
+extern void PSsetmiterlimit( /* float limit; */ );
+
+extern void PSsetobjectformat( /* int code; */ );
+
+extern void PSsetoverprint( /* int b; */ );
+
+extern void PSsetpacking( /* int b; */ );
+
+extern void PSsetpagedevice();
+
+extern void PSsetpattern();
+
+extern void PSsetrgbcolor( /* float r, g, b; */ );
+
+extern void PSsetscreen();
+
+extern void PSsetshared( /* int b; */ );
+
+extern void PSsetstrokeadjust( /* int b; */ );
+
+extern void PSsetsystemparams();
+
+extern void PSsettransfer();
+
+extern void PSsetucacheparams();
+
+extern void PSsetundercolorremoval();
+
+extern void PSsetuserparams();
+
+extern void PSsetvmthreshold( /* int i; */ );
+
+extern void PSshareddict();
+
+extern void PSshow( /* char *s; */ );
+
+extern void PSshowpage();
+
+extern void PSsin();
+
+extern void PSsqrt();
+
+extern void PSsrand();
+
+extern void PSstack();
+
+extern void PSstart();
+
+extern void PSstartjob( /* int b; char *password; */ );
+
+extern void PSstatus( /* int *b; */ );
+
+extern void PSstatusdict();
+
+extern void PSstop();
+
+extern void PSstopped();
+
+extern void PSstore();
+
+extern void PSstring( /* int len; */ );
+
+extern void PSstringwidth( /* char *s; float *xp, *yp; */ );
+
+extern void PSstroke();
+
+extern void PSstrokepath();
+
+extern void PSsub();
+
+extern void PSsystemdict();
+
+extern void PStoken( /* int *b; */ );
+
+extern void PStransform( /* float x1, y1; float *x2, *y2; */ );
+
+extern void PStranslate( /* float x, y; */ );
+
+extern void PStrue();
+
+extern void PStruncate();
+
+extern void PStype();
+
+extern void PSuappend( /* char nums[]; int n; char ops[]; int l; */ );
+
+extern void PSucache();
+
+extern void PSucachestatus();
+
+extern void PSueofill( /* char nums[]; int n; char ops[]; int l; */ );
+
+extern void PSufill( /* char nums[]; int n; char ops[]; int l; */ );
+
+extern void PSundef( /* char *name; */ );
+
+extern void PSundefinefont( /* char *name; */ );
+
+extern void PSundefineresource( /* char *key, *category; */ );
+
+extern void PSundefineuserobject( /* int userObjIndex; */ );
+
+extern void PSupath( /* int b; */ );
+
+extern void PSuserdict();
+
+extern void PSusertime( /* int *milliseconds; */ );
+
+extern void PSustroke( /* char nums[]; int n; char ops[]; int l; */ );
+
+extern void PSustrokepath( /* char nums[]; int n; char ops[]; int l; */ );
+
+extern void PSversion( /* int bufsize; char buf[]; */ );
+
+extern void PSviewclip();
+
+extern void PSviewclippath();
+
+extern void PSvmreclaim( /* int code; */ );
+
+extern void PSvmstatus( /* int *level, *used, *maximum; */ );
+
+extern void PSwait();
+
+extern void PSwcheck( /* int *b; */ );
+
+extern void PSwhere( /* int *b; */ );
+
+extern void PSwidthshow( /* float x, y; int c; char *s; */ );
+
+extern void PSwrite();
+
+extern void PSwritehexstring();
+
+extern void PSwriteobject( /* int tag; */ );
+
+extern void PSwritestring();
+
+extern void PSwtranslation( /* float *x, *y; */ );
+
+extern void PSxcheck( /* int *b; */ );
+
+extern void PSxor();
+
+extern void PSxshow( /* char *s; float numarray[]; int size; */ );
+
+extern void PSxyshow( /* char *s; float numarray[]; int size; */ );
+
+extern void PSyield();
+
+extern void PSyshow( /* char *s; float numarray[]; int size; */ );
+
+#else /* _NO_PROTO */
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern void PSFontDirectory( void );
+
+extern void PSGlobalFontDirectory( void );
+
+extern void PSISOLatin1Encoding( void );
+
+extern void PSSharedFontDirectory( void );
+
+extern void PSStandardEncoding( void );
+
+extern void PSUserObjects( void );
+
+extern void PSabs( void );
+
+extern void PSadd( void );
+
+extern void PSaload( void );
+
+extern void PSanchorsearch(int *truth);
+
+extern void PSand( void );
+
+extern void PSarc(float x, float y, float r, float angle1, float angle2);
+
+extern void PSarcn(float x, float y, float r, float angle1, float angle2);
+
+extern void PSarct(float x1, float y1, float x2, float y2, float r);
+
+extern void PSarcto(float x1, float y1, float x2, float y2, float r, float *xt1, float *yt1, float *xt2, float *yt2);
+
+extern void PSarray(int len);
+
+extern void PSashow(float x, float y, const char *s);
+
+extern void PSastore( void );
+
+extern void PSatan( void );
+
+extern void PSawidthshow(float cx, float cy, int c, float ax, float ay, const char *s);
+
+extern void PSbanddevice( void );
+
+extern void PSbegin( void );
+
+extern void PSbind( void );
+
+extern void PSbitshift(int shift);
+
+extern void PSbytesavailable(int *n);
+
+extern void PScachestatus( void );
+
+extern void PSceiling( void );
+
+extern void PScharpath(const char *s, int b);
+
+extern void PSclear( void );
+
+extern void PScleardictstack( void );
+
+extern void PScleartomark( void );
+
+extern void PSclientXready(int i0, int i1, int i2, int i3);
+
+extern void PSclientsync( void );
+
+extern void PSclip( void );
+
+extern void PSclippath( void );
+
+extern void PSclosefile( void );
+
+extern void PSclosepath( void );
+
+extern void PScolorimage( void );
+
+extern void PSconcat(const float m[]);
+
+extern void PSconcatmatrix( void );
+
+extern void PScondition( void );
+
+extern void PScopy(int n);
+
+extern void PScopypage( void );
+
+extern void PScos( void );
+
+extern void PScount(int *n);
+
+extern void PScountdictstack(int *n);
+
+extern void PScountexecstack(int *n);
+
+extern void PScounttomark(int *n);
+
+extern void PScshow(const char *s);
+
+extern void PScurrentXdrawingfunction(int *function);
+
+extern void PScurrentXgcdrawable(int *gc, int *draw, int *x, int *y);
+
+extern void PScurrentXgcdrawablecolor(int *gc, int *draw, int *x, int *y, int colorInfo[]);
+
+extern void PScurrentXoffset(int *x, int *y);
+
+extern void PScurrentblackgeneration( void );
+
+extern void PScurrentcacheparams( void );
+
+extern void PScurrentcmykcolor(float *c, float *m, float *y, float *k);
+
+extern void PScurrentcolor( void );
+
+extern void PScurrentcolorrendering( void );
+
+extern void PScurrentcolorscreen( void );
+
+extern void PScurrentcolorspace( void );
+
+extern void PScurrentcolortransfer( void );
+
+extern void PScurrentcontext(int *cid);
+
+extern void PScurrentdash( void );
+
+extern void PScurrentdevparams(const char *dev);
+
+extern void PScurrentdict( void );
+
+extern void PScurrentfile( void );
+
+extern void PScurrentflat(float *flatness);
+
+extern void PScurrentfont( void );
+
+extern void PScurrentglobal(int *b);
+
+extern void PScurrentgray(float *gray);
+
+extern void PScurrentgstate(int gst);
+
+extern void PScurrenthalftone( void );
+
+extern void PScurrenthalftonephase(float *x, float *y);
+
+extern void PScurrenthsbcolor(float *h, float *s, float *b);
+
+extern void PScurrentlinecap(int *linecap);
+
+extern void PScurrentlinejoin(int *linejoin);
+
+extern void PScurrentlinewidth(float *width);
+
+extern void PScurrentmatrix( void );
+
+extern void PScurrentmiterlimit(float *limit);
+
+extern void PScurrentobjectformat(int *code);
+
+extern void PScurrentoverprint(int *b);
+
+extern void PScurrentpacking(int *b);
+
+extern void PScurrentpagedevice( void );
+
+extern void PScurrentpoint(float *x, float *y);
+
+extern void PScurrentrgbcolor(float *r, float *g, float *b);
+
+extern void PScurrentscreen( void );
+
+extern void PScurrentshared(int *b);
+
+extern void PScurrentstrokeadjust(int *b);
+
+extern void PScurrentsystemparams( void );
+
+extern void PScurrenttransfer( void );
+
+extern void PScurrentundercolorremoval( void );
+
+extern void PScurrentuserparams( void );
+
+extern void PScurveto(float x1, float y1, float x2, float y2, float x3, float y3);
+
+extern void PScvi( void );
+
+extern void PScvlit( void );
+
+extern void PScvn( void );
+
+extern void PScvr( void );
+
+extern void PScvrs( void );
+
+extern void PScvs( void );
+
+extern void PScvx( void );
+
+extern void PSdef( void );
+
+extern void PSdefaultmatrix( void );
+
+extern void PSdefinefont( void );
+
+extern void PSdefineresource(const char *category);
+
+extern void PSdefineusername(int i, const char *username);
+
+extern void PSdefineuserobject( void );
+
+extern void PSdeletefile(const char *filename);
+
+extern void PSdetach( void );
+
+extern void PSdeviceinfo( void );
+
+extern void PSdict(int len);
+
+extern void PSdictstack( void );
+
+extern void PSdiv( void );
+
+extern void PSdtransform(float x1, float y1, float *x2, float *y2);
+
+extern void PSdup( void );
+
+extern void PSecho(int b);
+
+extern void PSend( void );
+
+extern void PSeoclip( void );
+
+extern void PSeofill( void );
+
+extern void PSeoviewclip( void );
+
+extern void PSeq( void );
+
+extern void PSequals( void );
+
+extern void PSequalsequals( void );
+
+extern void PSerasepage( void );
+
+extern void PSerrordict( void );
+
+extern void PSexch( void );
+
+extern void PSexec( void );
+
+extern void PSexecform( void );
+
+extern void PSexecstack( void );
+
+extern void PSexecuserobject(int userObjIndex);
+
+extern void PSexecuteonly( void );
+
+extern void PSexit( void );
+
+extern void PSexp( void );
+
+extern void PSfalse( void );
+
+extern void PSfile(const char *name, const char *access);
+
+extern void PSfilenameforall( void );
+
+extern void PSfileposition(int *pos);
+
+extern void PSfill( void );
+
+extern void PSfilter( void );
+
+extern void PSfindencoding(const char *key);
+
+extern void PSfindfont(const char *name);
+
+extern void PSfindresource(const char *key, const char *category);
+
+extern void PSflattenpath( void );
+
+extern void PSfloor( void );
+
+extern void PSflush( void );
+
+extern void PSflushfile( void );
+
+extern void PSfor( void );
+
+extern void PSforall( void );
+
+extern void PSfork( void );
+
+extern void PSframedevice( void );
+
+extern void PSgcheck(int *b);
+
+extern void PSge( void );
+
+extern void PSget( void );
+
+extern void PSgetboolean(int *it);
+
+extern void PSgetchararray(int size, char s[]);
+
+extern void PSgetfloat(float *it);
+
+extern void PSgetfloatarray(int size, float a[]);
+
+extern void PSgetint(int *it);
+
+extern void PSgetintarray(int size, int a[]);
+
+extern void PSgetinterval( void );
+
+extern void PSgetstring(char *s);
+
+extern void PSglobaldict( void );
+
+extern void PSglyphshow(const char *name);
+
+extern void PSgrestore( void );
+
+extern void PSgrestoreall( void );
+
+extern void PSgsave( void );
+
+extern void PSgstate( void );
+
+extern void PSgt( void );
+
+extern void PSidentmatrix( void );
+
+extern void PSidiv( void );
+
+extern void PSidtransform(float x1, float y1, float *x2, float *y2);
+
+extern void PSif( void );
+
+extern void PSifelse( void );
+
+extern void PSimage( void );
+
+extern void PSimagemask( void );
+
+extern void PSindex(int i);
+
+extern void PSineofill(float x, float y, int *b);
+
+extern void PSinfill(float x, float y, int *b);
+
+extern void PSinitclip( void );
+
+extern void PSinitgraphics( void );
+
+extern void PSinitmatrix( void );
+
+extern void PSinitviewclip( void );
+
+extern void PSinstroke(float x, float y, int *b);
+
+extern void PSinueofill(float x, float y, const char nums[], int n, const char ops[], int l, int *b);
+
+extern void PSinufill(float x, float y, const char nums[], int n, const char ops[], int l, int *b);
+
+extern void PSinustroke(float x, float y, const char nums[], int n, const char ops[], int l, int *b);
+
+extern void PSinvertmatrix( void );
+
+extern void PSitransform(float x1, float y1, float *x2, float *y2);
+
+extern void PSjoin( void );
+
+extern void PSknown(int *b);
+
+extern void PSkshow(const char *s);
+
+extern void PSlanguagelevel(int *n);
+
+extern void PSle( void );
+
+extern void PSleftbracket( void );
+
+extern void PSleftleft( void );
+
+extern void PSlength(int *len);
+
+extern void PSlineto(float x, float y);
+
+extern void PSln( void );
+
+extern void PSload( void );
+
+extern void PSlock( void );
+
+extern void PSlog( void );
+
+extern void PSloop( void );
+
+extern void PSlt( void );
+
+extern void PSmakefont( void );
+
+extern void PSmakepattern( void );
+
+extern void PSmark( void );
+
+extern void PSmatrix( void );
+
+extern void PSmaxlength(int *len);
+
+extern void PSmod( void );
+
+extern void PSmonitor( void );
+
+extern void PSmoveto(float x, float y);
+
+extern void PSmul( void );
+
+extern void PSne( void );
+
+extern void PSneg( void );
+
+extern void PSnewpath( void );
+
+extern void PSnoaccess( void );
+
+extern void PSnot( void );
+
+extern void PSnotify( void );
+
+extern void PSnull( void );
+
+extern void PSnulldevice( void );
+
+extern void PSor( void );
+
+extern void PSpackedarray( void );
+
+extern void PSpathbbox(float *llx, float *lly, float *urx, float *ury);
+
+extern void PSpathforall( void );
+
+extern void PSpop( void );
+
+extern void PSprint( void );
+
+extern void PSprintobject(int tag);
+
+extern void PSproduct( void );
+
+extern void PSprompt( void );
+
+extern void PSpstack( void );
+
+extern void PSput( void );
+
+extern void PSputinterval( void );
+
+extern void PSquit( void );
+
+extern void PSrand( void );
+
+extern void PSrcheck(int *b);
+
+extern void PSrcurveto(float x1, float y1, float x2, float y2, float x3, float y3);
+
+extern void PSread(int *b);
+
+extern void PSreadhexstring(int *b);
+
+extern void PSreadline(int *b);
+
+extern void PSreadonly( void );
+
+extern void PSreadstring(int *b);
+
+extern void PSrealtime(int *i);
+
+extern void PSrectclip(float x, float y, float w, float h);
+
+extern void PSrectfill(float x, float y, float w, float h);
+
+extern void PSrectstroke(float x, float y, float w, float h);
+
+extern void PSrectviewclip(float x, float y, float w, float h);
+
+extern void PSrenamefile(const char *oldname, const char *newname);
+
+extern void PSrenderbands( void );
+
+extern void PSrepeat( void );
+
+extern void PSresetfile( void );
+
+extern void PSresourceforall(const char *category);
+
+extern void PSresourcestatus(const char *key, const char *category, int *b);
+
+extern void PSrestore( void );
+
+extern void PSreversepath( void );
+
+extern void PSrevision(int *n);
+
+extern void PSrightbracket( void );
+
+extern void PSrightright( void );
+
+extern void PSrlineto(float x, float y);
+
+extern void PSrmoveto(float x, float y);
+
+extern void PSroll(int n, int j);
+
+extern void PSrootfont( void );
+
+extern void PSrotate(float angle);
+
+extern void PSround( void );
+
+extern void PSrrand( void );
+
+extern void PSrun(const char *filename);
+
+extern void PSsave( void );
+
+extern void PSscale(float x, float y);
+
+extern void PSscalefont(float size);
+
+extern void PSscheck(int *b);
+
+extern void PSsearch(int *b);
+
+extern void PSselectfont(const char *name, float scale);
+
+extern void PSsendboolean(int it);
+
+extern void PSsendchararray(const char s[], int size);
+
+extern void PSsendfloat(float it);
+
+extern void PSsendfloatarray(const float a[], int size);
+
+extern void PSsendint(int it);
+
+extern void PSsendintarray(const int a[], int size);
+
+extern void PSsendstring(const char *s);
+
+extern void PSserialnumber(int *n);
+
+extern void PSsetXdrawingfunction(int function);
+
+extern void PSsetXgcdrawable(int gc, int draw, int x, int y);
+
+extern void PSsetXgcdrawablecolor(int gc, int draw, int x, int y, const int colorInfo[]);
+
+extern void PSsetXoffset(int x, int y);
+
+extern void PSsetXrgbactual(float r, float g, float b, int *success);
+
+extern void PSsetbbox(float llx, float lly, float urx, float ury);
+
+extern void PSsetblackgeneration( void );
+
+extern void PSsetcachedevice(float wx, float wy, float llx, float lly, float urx, float ury);
+
+extern void PSsetcachelimit(int n);
+
+extern void PSsetcacheparams( void );
+
+extern void PSsetcharwidth(float wx, float wy);
+
+extern void PSsetcmykcolor(float c, float m, float y, float k);
+
+extern void PSsetcolor( void );
+
+extern void PSsetcolorrendering( void );
+
+extern void PSsetcolorscreen( void );
+
+extern void PSsetcolorspace( void );
+
+extern void PSsetcolortransfer( void );
+
+extern void PSsetdash(const float pat[], int size, float offset);
+
+extern void PSsetdevparams( void );
+
+extern void PSsetfileposition(int pos);
+
+extern void PSsetflat(float flatness);
+
+extern void PSsetfont(int f);
+
+extern void PSsetglobal(int b);
+
+extern void PSsetgray(float gray);
+
+extern void PSsetgstate(int gst);
+
+extern void PSsethalftone( void );
+
+extern void PSsethalftonephase(float x, float y);
+
+extern void PSsethsbcolor(float h, float s, float b);
+
+extern void PSsetlinecap(int linecap);
+
+extern void PSsetlinejoin(int linejoin);
+
+extern void PSsetlinewidth(float width);
+
+extern void PSsetmatrix( void );
+
+extern void PSsetmiterlimit(float limit);
+
+extern void PSsetobjectformat(int code);
+
+extern void PSsetoverprint(int b);
+
+extern void PSsetpacking(int b);
+
+extern void PSsetpagedevice( void );
+
+extern void PSsetpattern( void );
+
+extern void PSsetrgbcolor(float r, float g, float b);
+
+extern void PSsetscreen( void );
+
+extern void PSsetshared(int b);
+
+extern void PSsetstrokeadjust(int b);
+
+extern void PSsetsystemparams( void );
+
+extern void PSsettransfer( void );
+
+extern void PSsetucacheparams( void );
+
+extern void PSsetundercolorremoval( void );
+
+extern void PSsetuserparams( void );
+
+extern void PSsetvmthreshold(int i);
+
+extern void PSshareddict( void );
+
+extern void PSshow(const char *s);
+
+extern void PSshowpage( void );
+
+extern void PSsin( void );
+
+extern void PSsqrt( void );
+
+extern void PSsrand( void );
+
+extern void PSstack( void );
+
+extern void PSstart( void );
+
+extern void PSstartjob(int b, const char *password);
+
+extern void PSstatus(int *b);
+
+extern void PSstatusdict( void );
+
+extern void PSstop( void );
+
+extern void PSstopped( void );
+
+extern void PSstore( void );
+
+extern void PSstring(int len);
+
+extern void PSstringwidth(const char *s, float *xp, float *yp);
+
+extern void PSstroke( void );
+
+extern void PSstrokepath( void );
+
+extern void PSsub( void );
+
+extern void PSsystemdict( void );
+
+extern void PStoken(int *b);
+
+extern void PStransform(float x1, float y1, float *x2, float *y2);
+
+extern void PStranslate(float x, float y);
+
+extern void PStrue( void );
+
+extern void PStruncate( void );
+
+extern void PStype( void );
+
+extern void PSuappend(const char nums[], int n, const char ops[], int l);
+
+extern void PSucache( void );
+
+extern void PSucachestatus( void );
+
+extern void PSueofill(const char nums[], int n, const char ops[], int l);
+
+extern void PSufill(const char nums[], int n, const char ops[], int l);
+
+extern void PSundef(const char *name);
+
+extern void PSundefinefont(const char *name);
+
+extern void PSundefineresource(const char *key, const char *category);
+
+extern void PSundefineuserobject(int userObjIndex);
+
+extern void PSupath(int b);
+
+extern void PSuserdict( void );
+
+extern void PSusertime(int *milliseconds);
+
+extern void PSustroke(const char nums[], int n, const char ops[], int l);
+
+extern void PSustrokepath(const char nums[], int n, const char ops[], int l);
+
+extern void PSversion(int bufsize, char buf[]);
+
+extern void PSviewclip( void );
+
+extern void PSviewclippath( void );
+
+extern void PSvmreclaim(int code);
+
+extern void PSvmstatus(int *level, int *used, int *maximum);
+
+extern void PSwait( void );
+
+extern void PSwcheck(int *b);
+
+extern void PSwhere(int *b);
+
+extern void PSwidthshow(float x, float y, int c, const char *s);
+
+extern void PSwrite( void );
+
+extern void PSwritehexstring( void );
+
+extern void PSwriteobject(int tag);
+
+extern void PSwritestring( void );
+
+extern void PSwtranslation(float *x, float *y);
+
+extern void PSxcheck(int *b);
+
+extern void PSxor( void );
+
+extern void PSxshow(const char *s, const float numarray[], int size);
+
+extern void PSxyshow(const char *s, const float numarray[], int size);
+
+extern void PSyield( void );
+
+extern void PSyshow(const char *s, const float numarray[], int size);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif /* _NO_PROTO */
+
+#endif /* PSOPS_H */
Index: xc/lib/dps/publictypes.h
diff -u xc/lib/dps/publictypes.h:1.1 xc/lib/dps/publictypes.h:1.2
--- xc/lib/dps/publictypes.h:1.1	Sat Feb 12 16:13:27 2000
+++ xc/lib/dps/publictypes.h	Wed Jun  7 15:02:58 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dps/publictypes.h,v 1.2 2000/06/07 22:02:58 tsi Exp $ */
 
 #ifndef	PUBLICTYPES_H
 #define	PUBLICTYPES_H
@@ -46,7 +47,9 @@
 
 /* Inline Functions */
 
+#undef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
+#undef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))
 
 /* Declarative Sugar */
Index: xc/lib/dpstk/ColorSB.c
diff -u xc/lib/dpstk/ColorSB.c:1.1 xc/lib/dpstk/ColorSB.c:1.2
--- xc/lib/dpstk/ColorSB.c:1.1	Sat Feb 12 16:13:29 2000
+++ xc/lib/dpstk/ColorSB.c	Wed Jun  7 15:02:58 2000
@@ -35,7 +35,12 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/ColorSB.c,v 1.2 2000/06/07 22:02:58 tsi Exp $ */
 
+#ifndef X_NOT_POSIX
+#include <unistd.h>
+#endif
+
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/ShellP.h>
@@ -61,9 +66,10 @@
 #include <Xm/RowColumn.h>
 #include <Xm/Frame.h>
 #include <Xm/MessageB.h>
-#include "DPS/dpsXclient.h"
+
+#include <DPS/dpsXclient.h>
 #include "dpsXcommonI.h"
-#include "DPS/dpsXshare.h"
+#include <DPS/dpsXshare.h>
 #include "eyedrop16.xbm"
 #include "eyedropmask16.xbm"
 #include "eyedrop32.xbm"
@@ -75,7 +81,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <pwd.h>
-#include "DPS/ColorSBP.h"
+#include <DPS/ColorSBP.h>
 
 #define PATH_BUF_SIZE 1024
 
@@ -234,24 +240,55 @@
 	Offset(value_changed_callback), XtRCallback, (XtPointer) NULL}
 };
 
-static void ClassInitialize(), ClassPartInitialize(), Initialize(), Destroy(),
-	ChangeManaged(), Realize(), Resize(), GetColor();
-static Boolean SetValues(), SetColor();
-static XtGeometryResult GeometryManager();
-
-static void CreateChildren(), UpdateColorSpaces(), FillPatch(),
-	SetBackground();
-static void SetSliders(), SetRGBValues(), SetCMYKValues(), SetHSBValues(),
-	SetGrayValues(), ChangeLabel(), SetColorSpace(), SetRendering();
-static void FormResize(), EyedropPointer(), PatchPress(), PatchRelease(),
-	DrawDock(), DockPress(), DrawPalette(),
-	PalettePress(), InitializeDock(), SaveDockContents();
-static void SetRGBCallback(), SetCMYKCallback(),
-	SetHSBCallback(), SetGrayCallback(),
-	Slider1Callback(), Slider2Callback(),
-	Slider3Callback(), Slider4Callback(),
-	FillPatchCallback(), DrawDockCallback(), DrawPaletteCallback(),
-	DoEyedropCallback(), OKCallback(), ApplyCallback();
+static Boolean SetColor         (Widget w, CSBColorSpace space, double c1, double c2, double c3, double c4, Bool setSpace);
+static Boolean SetValues        (Widget old, Widget req, Widget new, ArgList args, Cardinal *num_args);
+static XtGeometryResult GeometryManager (Widget w, XtWidgetGeometry *desired, XtWidgetGeometry *allowed);
+static void ChangeLabel         (Widget label, double n);
+static void ChangeManaged       (Widget w);
+static void ClassInitialize     (void);
+static void ClassPartInitialize (WidgetClass widget_class);
+static void CreateChildren      (ColorSelectionBoxWidget csb);
+static void Destroy             (Widget widget);
+static void DrawDock            (ColorSelectionBoxWidget csb);
+static void DrawPalette         (ColorSelectionBoxWidget csb);
+static void FillPatch           (ColorSelectionBoxWidget csb);
+static void GetColor            (Widget w, CSBColorSpace space, float *c1, float *c2, float *c3, float *c4);
+static void Initialize          (Widget request, Widget new, ArgList args, Cardinal *num_args);
+static void InitializeDock      (ColorSelectionBoxWidget csb);
+static void Realize             (Widget w, XtValueMask *mask, XSetWindowAttributes *attr);
+static void Resize              (Widget widget);
+static void SaveDockContents    (ColorSelectionBoxWidget csb);
+static void SetBackground       (ColorSelectionBoxWidget csb);
+static void SetCMYKValues       (ColorSelectionBoxWidget csb);
+static void SetColorSpace       (ColorSelectionBoxWidget csb);
+static void SetGrayValues       (ColorSelectionBoxWidget csb);
+static void SetHSBValues        (ColorSelectionBoxWidget csb);
+static void SetRGBValues        (ColorSelectionBoxWidget csb);
+static void SetRendering        (ColorSelectionBoxWidget csb);
+static void SetSliders          (ColorSelectionBoxWidget csb);
+static void UpdateColorSpaces   (ColorSelectionBoxWidget csb, CSBColorSpace masterSpace);
+
+static void DockPress           (Widget w, XtPointer data, XEvent *event, Boolean *goOn);
+static void EyedropPointer      (Widget w, XtPointer data, XEvent *event, Boolean *goOn);
+static void FormResize          (Widget w, XtPointer data, XEvent *event, Boolean *goOn);
+static void PalettePress        (Widget w, XtPointer data, XEvent *event, Boolean *goOn);
+static void PatchPress          (Widget w, XtPointer data, XEvent *event, Boolean *goOn);
+static void PatchRelease        (Widget w, XtPointer data, XEvent *event, Boolean *goOn);
+
+static void ApplyCallback       (Widget w, XtPointer clientData, XtPointer callData);
+static void DoEyedropCallback   (Widget w, XtPointer clientData, XtPointer callData);
+static void DrawDockCallback    (Widget w, XtPointer clientData, XtPointer callData);
+static void DrawPaletteCallback (Widget w, XtPointer clientData, XtPointer callData);
+static void FillPatchCallback   (Widget w, XtPointer clientData, XtPointer callData);
+static void OKCallback          (Widget w, XtPointer clientData, XtPointer callData);
+static void SetCMYKCallback     (Widget w, XtPointer clientData, XtPointer callData);
+static void SetGrayCallback     (Widget w, XtPointer clientData, XtPointer callData);
+static void SetHSBCallback      (Widget w, XtPointer clientData, XtPointer callData);
+static void SetRGBCallback      (Widget w, XtPointer clientData, XtPointer callData);
+static void Slider1Callback     (Widget w, XtPointer clientData, XtPointer callData);
+static void Slider2Callback     (Widget w, XtPointer clientData, XtPointer callData);
+static void Slider3Callback     (Widget w, XtPointer clientData, XtPointer callData);
+static void Slider4Callback     (Widget w, XtPointer clientData, XtPointer callData);
 
 ColorSelectionBoxClassRec colorSelectionBoxClassRec = {
     /* Core class part */
@@ -328,9 +365,7 @@
 WidgetClass colorSelectionBoxWidgetClass =
 	(WidgetClass) &colorSelectionBoxClassRec;
 
-static XmString CreateSharedCS(str, w)
-    String str;
-    Widget w;
+static XmString CreateSharedCS(String str, Widget w)
 {
     XrmValue src, dst;
     XmString result;
@@ -346,9 +381,7 @@
     } else return NULL;
 }
  
-static Boolean LowerCase(from, to, size)
-    register String from, to;
-    int size;
+static Boolean LowerCase(String from, String to, int size)
 {
     register char ch;
     register int i;
@@ -364,12 +397,13 @@
 
 /* ARGSUSED */
 
-static Boolean CvtStringToColorSpace(dpy, args, num_args, from, to, data)
-    Display *dpy;
-    XrmValuePtr args;
-    Cardinal *num_args;
-    XrmValuePtr from, to;
-    XtPointer *data;
+static Boolean CvtStringToColorSpace(
+    Display *dpy,
+    XrmValuePtr args,
+    Cardinal *num_args,
+    XrmValuePtr from,
+    XrmValuePtr to,
+    XtPointer *data)
 {
 #define LOWER_SIZE 5
     char lower[LOWER_SIZE];	/* Lower cased string value */
@@ -414,12 +448,13 @@
 
 /* ARGSUSED */
 
-static Boolean CvtStringToRenderingType(dpy, args, num_args, from, to, data)
-    Display *dpy;
-    XrmValuePtr args;
-    Cardinal *num_args;
-    XrmValuePtr from, to;
-    XtPointer *data;
+static Boolean CvtStringToRenderingType(
+    Display *dpy,
+    XrmValuePtr args,
+    Cardinal *num_args,
+    XrmValuePtr from,
+    XrmValuePtr to,
+    XtPointer *data)
 {
 #define LOWER_SIZE 5
     char lower[LOWER_SIZE];	/* Lower cased string value */
@@ -460,7 +495,7 @@
 #undef LOWER_SIZE
 }
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
     /* Register converters */
 
@@ -474,8 +509,7 @@
 
 /* ARGSUSED */
 
-static void ClassPartInitialize(widget_class)
-    WidgetClass widget_class;
+static void ClassPartInitialize(WidgetClass widget_class)
 {
     register ColorSelectionBoxWidgetClass wc =
 	    (ColorSelectionBoxWidgetClass) widget_class;
@@ -490,10 +524,10 @@
     }
 }
 
-static void ToUserSpace(csb, xWidth, xHeight, uWidth, uHeight)
-    ColorSelectionBoxWidget csb;
-    int xWidth, xHeight;
-    float *uWidth, *uHeight;
+static void ToUserSpace(
+    ColorSelectionBoxWidget csb,
+    int xWidth, int xHeight,
+    float *uWidth, float *uHeight)
 {
     register float *i = csb->csb.itransform;
 
@@ -501,8 +535,7 @@
     *uHeight= i[1] * xWidth - i[3] * xHeight + i[5];
 }
 
-static void ColorizeRGB(csb)
-    ColorSelectionBoxWidget csb;
+static void ColorizeRGB(ColorSelectionBoxWidget csb)
 {
     Dimension height, width;
     int depth, steps;
@@ -561,8 +594,7 @@
 		  XtNbackgroundPixmap, csb->csb.blue_pixmap, NULL);
 }
 
-static void ColorizeCMYK(csb)
-    ColorSelectionBoxWidget csb;
+static void ColorizeCMYK(ColorSelectionBoxWidget csb)
 {
     Dimension height, width;
     int depth, steps;
@@ -634,8 +666,7 @@
 		  csb->csb.black_pixmap, NULL);
 }
 
-static void ColorizeHSB(csb)
-    ColorSelectionBoxWidget csb;
+static void ColorizeHSB(ColorSelectionBoxWidget csb)
 {
     Dimension height, width;
     int depth, steps;
@@ -694,8 +725,7 @@
 		  csb->csb.bright_pixmap, NULL);
 }
 
-static void ColorizeGray(csb)
-    ColorSelectionBoxWidget csb;
+static void ColorizeGray(ColorSelectionBoxWidget csb)
 {
     Dimension height, width;
     int depth, steps;
@@ -732,8 +762,7 @@
 		  csb->csb.gray_pixmap, NULL);
 }
 
-static void ColorizeSliders(csb)
-    ColorSelectionBoxWidget csb;
+static void ColorizeSliders(ColorSelectionBoxWidget csb)
 {
     if (!XtIsRealized(csb)) return;
 
@@ -755,11 +784,11 @@
 
 /* ARGSUSED */
 
-static void FormResize(w, data, event, goOn)
-    Widget w;
-    XtPointer data;
-    XEvent *event;
-    Boolean *goOn;
+static void FormResize(
+    Widget w,
+    XtPointer data,
+    XEvent *event,
+    Boolean *goOn)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) data;
     
@@ -784,9 +813,9 @@
     }
 }
 
-static void FillCallbackRec(csb, rec)
-    ColorSelectionBoxWidget csb;
-    CSBCallbackRec *rec;
+static void FillCallbackRec(
+    ColorSelectionBoxWidget csb,
+    CSBCallbackRec *rec)
 {
     rec->current_space = csb->csb.current_space;
     rec->red = csb->csb.current_color.red;
@@ -804,9 +833,9 @@
 
 /* ARGSUSED */
 
-static void OKCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void OKCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     CSBCallbackRec rec;
@@ -822,9 +851,9 @@
 
 /* ARGSUSED */
 
-static void ApplyCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void ApplyCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     CSBCallbackRec rec;
@@ -840,9 +869,9 @@
 
 /* ARGSUSED */
 
-static void ResetCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void ResetCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     CSBCallbackRec rec;
@@ -858,9 +887,9 @@
 
 /* ARGSUSED */
 
-static void CancelCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void CancelCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     CSBCallbackRec rec;
@@ -877,8 +906,7 @@
 
 /* ARGSUSED */
 
-static void DoValueChangedCallback(csb)
-    ColorSelectionBoxWidget csb;
+static void DoValueChangedCallback(ColorSelectionBoxWidget csb)
 {
     CSBCallbackRec rec;
 
@@ -890,18 +918,16 @@
 
 /* ARGSUSED */
 
-static void ChangeLabelCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void ChangeLabelCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     XmScaleCallbackStruct *scaleData = (XmScaleCallbackStruct *) callData;
 
     ChangeLabel((Widget) clientData, ((float) scaleData->value) / 100.0);
 }
 
-static void ChangeLabel(label, n)
-    Widget label;
-    float n;
+static void ChangeLabel(Widget label, double n)
 {
     char buf[10];
 
@@ -909,8 +935,7 @@
     XtVaSetValues(label, XmNlabelString, CS(buf, label), NULL);
 }
 
-static void CreateModelMenu(parent, csb)
-    Widget parent, csb;
+static void CreateModelMenu(Widget parent, Widget csb)
 {
     Widget kids[4];
 
@@ -937,9 +962,9 @@
 
 /* ARGSUSED */
 
-static void SetRenderingCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void SetRenderingCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     RenderingRec *r = (RenderingRec *) clientData;
 
@@ -947,9 +972,7 @@
     FillPatch(r->csb);
 }
 
-static void CreateDisplayMenu(parent, csb)
-    Widget parent;
-    ColorSelectionBoxWidget csb;
+static void CreateDisplayMenu(Widget parent, ColorSelectionBoxWidget csb)
 {
     Widget kids[3];
     RenderingRec *r;
@@ -985,9 +1008,9 @@
 
 /* ARGSUSED */
 
-static void SetPaletteCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void SetPaletteCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     PaletteRec *p = (PaletteRec *) clientData;
 
@@ -1002,9 +1025,7 @@
     DrawPalette(p->csb);
 }
 
-static void CreatePaletteMenu(parent, csb)
-    Widget parent;
-    ColorSelectionBoxWidget csb;
+static void CreatePaletteMenu(Widget parent, ColorSelectionBoxWidget csb)
 {
     Widget w, managed[PALETTE_MAX];
     int j, k;
@@ -1033,8 +1054,7 @@
     if (j != 0) XtManageChildren(managed, j);
 }
 
-static void CreateChildren(csb)
-    ColorSelectionBoxWidget csb;
+static void CreateChildren(ColorSelectionBoxWidget csb)
 {
     int i;
     Arg args[20];
@@ -1365,8 +1385,7 @@
 			 False, PatchRelease, (XtPointer) csb);
 }
 
-static void NoBackgroundPixel(csb)
-    ColorSelectionBoxWidget csb;
+static void NoBackgroundPixel(ColorSelectionBoxWidget csb)
 {
     Widget w, message;
 
@@ -1391,9 +1410,7 @@
 
 /* labelString is changed by this */
 
-static void ParseLabels(labelString, labels, n)
-    String labelString;
-    register String labels[4];
+static void ParseLabels(String labelString, String labels[4], int n)
 {
     register char *ch;
     int i;
@@ -1408,9 +1425,7 @@
     for (i = n; i < 4; i++) labels[i] = NULL;
 }
 
-static void SetLabels(csb, labels)
-    ColorSelectionBoxWidget csb;
-    String *labels;
+static void SetLabels(ColorSelectionBoxWidget csb, String *labels)
 {
     Widget w = (Widget) csb;
     int i;
@@ -1423,22 +1438,17 @@
     }
 }
 
-static void MapChildren(children, n)
-    Widget *children;
-    int n;
+static void MapChildren(Widget *children, int n)
 {
     XtManageChildren(children, n);
 }
 
-static void UnmapChildren(children, n)
-    Widget *children;
-    int n;
+static void UnmapChildren(Widget *children, int n)
 {
     XtUnmanageChildren(children, n);
 }
 
-static void SetSliders(csb)
-    ColorSelectionBoxWidget csb;
+static void SetSliders(ColorSelectionBoxWidget csb)
 {
     switch(csb->csb.current_space) {
 	case CSBSpaceRGB:		SetRGBValues(csb);	break;
@@ -1448,8 +1458,7 @@
     }
 }
 
-static void SetRGBValues(csb)
-    ColorSelectionBoxWidget csb;
+static void SetRGBValues(ColorSelectionBoxWidget csb)
 {
     XmScaleSetValue(csb->csb.slider_child[0],
 		    TO_PCT(csb->csb.current_color.red));
@@ -1464,9 +1473,9 @@
 
 /* ARGSUSED */
 
-static void SetRGBCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void SetRGBCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     Widget rgb;
@@ -1505,8 +1514,7 @@
     FillPatch(csb);
 }
 
-static void SetCMYKValues(csb)
-    ColorSelectionBoxWidget csb;
+static void SetCMYKValues(ColorSelectionBoxWidget csb)
 {
     XmScaleSetValue(csb->csb.slider_child[0],
 		    TO_PCT(csb->csb.current_color.cyan));
@@ -1524,9 +1532,9 @@
 
 /* ARGSUSED */
 
-static void SetCMYKCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void SetCMYKCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     Widget cmyk;
@@ -1560,8 +1568,7 @@
     FillPatch(csb);
 }
 
-static void SetHSBValues(csb)
-    ColorSelectionBoxWidget csb;
+static void SetHSBValues(ColorSelectionBoxWidget csb)
 {
     XmScaleSetValue(csb->csb.slider_child[0],
 		    TO_PCT(csb->csb.current_color.hue));
@@ -1576,9 +1583,9 @@
 
 /* ARGSUSED */
 
-static void SetHSBCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void SetHSBCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     Widget hsb;
@@ -1617,8 +1624,7 @@
     FillPatch(csb);
 }
 
-static void SetGrayValues(csb)
-    ColorSelectionBoxWidget csb;
+static void SetGrayValues(ColorSelectionBoxWidget csb)
 {
     XmScaleSetValue(csb->csb.slider_child[0],
 		    TO_PCT(csb->csb.current_color.gray));
@@ -1627,9 +1633,9 @@
 
 /* ARGSUSED */
 
-static void SetGrayCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void SetGrayCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     Widget gray;
@@ -1662,8 +1668,7 @@
     FillPatch(csb);
 }
 
-static void RGBToCMYK(csb)
-    ColorSelectionBoxWidget csb;
+static void RGBToCMYK(ColorSelectionBoxWidget csb)
 {
     csb->csb.current_color.cyan = 1.0 - csb->csb.current_color.red;
     csb->csb.current_color.magenta = 1.0 - csb->csb.current_color.green;
@@ -1671,16 +1676,14 @@
     csb->csb.current_color.black = 0.0;
 }
 
-static void RGBToGray(csb)
-    ColorSelectionBoxWidget csb;
+static void RGBToGray(ColorSelectionBoxWidget csb)
 {
     csb->csb.current_color.gray = .3 * csb->csb.current_color.red +
 	    .59 * csb->csb.current_color.green +
 	    .11 * csb->csb.current_color.blue;
 }
 
-static void HSBToRGB(csb)
-    ColorSelectionBoxWidget csb;
+static void HSBToRGB(ColorSelectionBoxWidget csb)
 {
     double r, g, bl;
     double h, s, b;
@@ -1703,6 +1706,7 @@
 	k = b * (1.0 - (s * (1.0 - f)));
 
 	switch(i) {
+	    default:
 	    case 0:     r = b;		g = k;		bl = m;		break;
 	    case 1:	r = n;		g = b;		bl = m;		break;
 	    case 2:	r = m;		g = b;		bl = k;		break;
@@ -1717,8 +1721,7 @@
     csb->csb.current_color.blue = bl;
 }
 
-static void RGBToHSB(csb)
-    ColorSelectionBoxWidget csb;
+static void RGBToHSB(ColorSelectionBoxWidget csb)
 {
     double hue, sat, value;
     double diff, x, r, g, b;
@@ -1752,9 +1755,9 @@
     csb->csb.current_color.brightness = value;
 }
 
-static void UpdateColorSpaces(csb, masterSpace)
-    ColorSelectionBoxWidget csb;
-    CSBColorSpace masterSpace;
+static void UpdateColorSpaces(
+    ColorSelectionBoxWidget csb,
+    CSBColorSpace masterSpace)
 {
     switch (masterSpace) {
 	case CSBSpaceRGB:
@@ -1800,9 +1803,9 @@
 
 /* ARGSUSED */
 
-static void Slider1Callback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void Slider1Callback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     XmScaleCallbackStruct *scaleData = (XmScaleCallbackStruct *) callData;
@@ -1829,9 +1832,9 @@
 
 /* ARGSUSED */
 
-static void Slider2Callback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void Slider2Callback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     XmScaleCallbackStruct *scaleData = (XmScaleCallbackStruct *) callData;
@@ -1846,6 +1849,8 @@
 	case CSBSpaceHSB:
 	    csb->csb.current_color.saturation = scaleData->value / 100.0;
 	    break;
+	case CSBSpaceGray:
+	    break;
     }
 
     UpdateColorSpaces(csb, csb->csb.current_space);
@@ -1855,9 +1860,9 @@
 
 /* ARGSUSED */
 
-static void Slider3Callback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void Slider3Callback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     XmScaleCallbackStruct *scaleData = (XmScaleCallbackStruct *) callData;
@@ -1872,6 +1877,8 @@
 	case CSBSpaceHSB:
 	    csb->csb.current_color.brightness = scaleData->value / 100.0;
 	    break;
+	case CSBSpaceGray:
+	    break;
     }
 
     UpdateColorSpaces(csb, csb->csb.current_space);
@@ -1881,9 +1888,9 @@
 
 /* ARGSUSED */
 
-static void Slider4Callback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void Slider4Callback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     XmScaleCallbackStruct *scaleData = (XmScaleCallbackStruct *) callData;
@@ -1895,8 +1902,7 @@
     FillPatch(csb);
 }
 
-static void FillPatch(csb)
-    ColorSelectionBoxWidget csb;
+static void FillPatch(ColorSelectionBoxWidget csb)
 {
     Colormap c;
     XColor xc;
@@ -1937,9 +1943,9 @@
 
 /* ARGSUSED */
 
-static void FillPatchCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void FillPatchCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     Dimension height, width;
@@ -1994,8 +2000,7 @@
 Corporation, Maynard, Massachusetts, and the Massachusetts Institute of
 Technology, Cambridge, Massachusetts. */
 
-static String GetRootDirName(buf)
-     String buf;
+static String GetRootDirName(String buf)
 {
 #ifndef X_NOT_POSIX
      uid_t uid;
@@ -2011,8 +2016,9 @@
 
      if (ptr == NULL) {
         if (!(ptr = getenv("HOME"))) {
-            if (ptr = getenv("USER")) pw = getpwnam(ptr);
-            else {
+            if ((ptr = getenv("USER")) != 0) {
+		pw = getpwnam(ptr);
+            } else {
                 uid = getuid();
                 pw = getpwuid(uid);
             }
@@ -2034,8 +2040,7 @@
      return buf;
 }
 
-static void AllocateDock(csb)
-    ColorSelectionBoxWidget csb;
+static void AllocateDock(ColorSelectionBoxWidget csb)
 {
     int entry;
 
@@ -2054,8 +2059,7 @@
     }
 }
 
-static void InitializeDock(csb)
-    ColorSelectionBoxWidget csb;
+static void InitializeDock(ColorSelectionBoxWidget csb)
 {
     String dockEnv;
     char homeDir[PATH_BUF_SIZE];
@@ -2106,8 +2110,7 @@
 #undef CHECK
 }
 
-static void SaveDockContents(csb)
-    ColorSelectionBoxWidget csb;
+static void SaveDockContents(ColorSelectionBoxWidget csb)
 {
     String dockEnv;
     char homeDir[PATH_BUF_SIZE];
@@ -2144,9 +2147,9 @@
 
 /* ARGSUSED */
 
-static void DrawDockCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void DrawDockCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
 
@@ -2155,8 +2158,7 @@
     DrawDock(csb);
 }
 
-static void DrawDock(csb)
-    ColorSelectionBoxWidget csb;
+static void DrawDock(ColorSelectionBoxWidget csb)
 {
     Dimension height;
     float w, h;
@@ -2194,10 +2196,11 @@
     if (!didAny) _DPSCShowFillMe(csb->csb.context, csb->csb.fill_me);
 }
 
-static void StoreColorInDock(csb, x_offset, y_offset, dockHeight)
-    ColorSelectionBoxWidget csb;
-    int x_offset, y_offset;
-    Dimension dockHeight;
+static void StoreColorInDock(
+    ColorSelectionBoxWidget csb,
+    int x_offset,
+    int y_offset,
+    Dimension dockHeight)
 {
     int i, lines, row, col;
 
@@ -2219,11 +2222,11 @@
 
 /* ARGSUSED */
 
-static void DockPress(w, data, event, goOn)
-    Widget w;
-    XtPointer data;
-    XEvent *event;
-    Boolean *goOn;
+static void DockPress(
+    Widget w,
+    XtPointer data,
+    XEvent *event,
+    Boolean *goOn)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) data;
     Dimension height;
@@ -2250,8 +2253,7 @@
     SetSliders(csb);
 }
 
-static void InitializePalettes(csb)
-    ColorSelectionBoxWidget csb;
+static void InitializePalettes(ColorSelectionBoxWidget csb)
 {
     int k;
 
@@ -2265,8 +2267,7 @@
     }
 }
 
-static void InvalidatePalette(csb)
-    ColorSelectionBoxWidget csb;
+static void InvalidatePalette(ColorSelectionBoxWidget csb)
 {
     int len;
     char *buf;
@@ -2288,10 +2289,11 @@
     XtVaSetValues(w, XtVaTypedArg, XmNlabelString, XtRString, buf, len, NULL);
 }
 
-static void DoPalette(csb, pixelWidth, w, h)
-    ColorSelectionBoxWidget csb;
-    Dimension pixelWidth;
-    float w, h;
+static void DoPalette(
+    ColorSelectionBoxWidget csb,
+    Dimension pixelWidth,
+    float w,
+    float h)
 {
     char whichFunc[25];
     int steps;
@@ -2357,8 +2359,7 @@
     }
 }
 
-static void DrawPalette(csb)
-    ColorSelectionBoxWidget csb;
+static void DrawPalette(ColorSelectionBoxWidget csb)
 {
     DrawPaletteCallback(csb->csb.palette_child,
 			(XtPointer) csb, (XtPointer) NULL);
@@ -2366,9 +2367,9 @@
 
 /* ARGSUSED */
 
-static void DrawPaletteCallback(wid, clientData, callData)
-    Widget wid;
-    XtPointer clientData, callData;
+static void DrawPaletteCallback(
+    Widget wid,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     Dimension width, height;
@@ -2403,11 +2404,11 @@
 
 /* ARGSUSED */
 
-static void PalettePress(w, data, event, goOn)
-    Widget w;
-    XtPointer data;
-    XEvent *event;
-    Boolean *goOn;
+static void PalettePress(
+    Widget w,
+    XtPointer data,
+    XEvent *event,
+    Boolean *goOn)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) data;
     Dimension width;
@@ -2520,9 +2521,9 @@
 
 /* ARGSUSED */
 
-static void DoEyedropCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void DoEyedropCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) clientData;
     Pixmap eyedropBitmap, eyedropMaskBitmap;
@@ -2598,11 +2599,11 @@
 
 /* ARGSUSED */
 
-static void EyedropPointer(w, data, event, goOn)
-    Widget w;
-    XtPointer data;
-    XEvent *event;
-    Boolean *goOn;
+static void EyedropPointer(
+    Widget w,
+    XtPointer data,
+    XEvent *event,
+    Boolean *goOn)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) data;
     XColor fg, black;
@@ -2612,7 +2613,7 @@
     XWindowAttributes att;
     XImage *image;
     Pixel pixel;
-    Colormap colormap;
+    Colormap colormap = 0;
     Display *dpy = XtDisplay(w);
 
     if (!csb->csb.eyedrop_grabbed) return;
@@ -2679,11 +2680,11 @@
 
 /* ARGSUSED */
 
-static void PatchPress(w, data, event, goOn)
-    Widget w;
-    XtPointer data;
-    XEvent *event;
-    Boolean *goOn;
+static void PatchPress(
+    Widget w,
+    XtPointer data,
+    XEvent *event,
+    Boolean *goOn)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) data;
     Pixmap squareBitmap, squareMaskBitmap;
@@ -2724,11 +2725,11 @@
 
 /* ARGSUSED */
 
-static void PatchRelease(w, data, event, goOn)
-    Widget w;
-    XtPointer data;
-    XEvent *event;
-    Boolean *goOn;
+static void PatchRelease(
+    Widget w,
+    XtPointer data,
+    XEvent *event,
+    Boolean *goOn)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) data;
     Dimension width, height;
@@ -2752,9 +2753,9 @@
     }
 }
 
-static void GetVisualInfo(csb, visual)
-    ColorSelectionBoxWidget csb;
-    Visual **visual;
+static void GetVisualInfo(
+    ColorSelectionBoxWidget csb,
+    Visual **visual)
 {
     Widget w = (Widget) csb;
     XVisualInfo *vip, viproto;
@@ -2780,8 +2781,7 @@
     if (n > 0) XFree((char *) vip);
 }
 
-static void SetBackground(csb)
-    ColorSelectionBoxWidget csb;
+static void SetBackground(ColorSelectionBoxWidget csb)
 {
     Colormap c;
     XColor xc;
@@ -2834,10 +2834,10 @@
 
 /* ARGSUSED */
 
-static void Initialize(request, new, args, num_args)
-    Widget request, new;
-    ArgList args;
-    Cardinal *num_args;
+static void Initialize(
+    Widget request, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) new;
     Bool inited;
@@ -2929,8 +2929,7 @@
     SetRendering(csb);
 }
 
-static void Destroy(widget)
-    Widget widget;
+static void Destroy(Widget widget)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) widget;
     Display *dpy = XtDisplay(csb);
@@ -2991,8 +2990,7 @@
     if (csb->csb.gray_pixmap != None) XFreePixmap(dpy, csb->csb.gray_pixmap);
 }
 
-static void ChangeManaged(w)
-    Widget w;
+static void ChangeManaged(Widget w)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) w;
 
@@ -3002,9 +3000,9 @@
 
 /* ARGSUSED */
 
-static XtGeometryResult GeometryManager(w, desired, allowed)
-    Widget w;
-    XtWidgetGeometry *desired, *allowed;
+static XtGeometryResult GeometryManager(
+    Widget w,
+    XtWidgetGeometry *desired, XtWidgetGeometry *allowed)
 {
 #define WANTS(flag) (desired->request_mode & flag)
 
@@ -3022,8 +3020,7 @@
 #undef WANTS
 }
 
-static void SetColorSpace(csb)
-    ColorSelectionBoxWidget csb;
+static void SetColorSpace(ColorSelectionBoxWidget csb)
 {
     switch(csb->csb.current_space) {
 	case CSBSpaceRGB:	
@@ -3044,18 +3041,18 @@
     }
 }
 
-static void SetRendering(csb)
-    ColorSelectionBoxWidget csb;
+static void SetRendering(ColorSelectionBoxWidget csb)
 {
     Widget w;
 
     switch(csb->csb.current_rendering) {
-	case CSBDisplayX:
-	    w = XtNameToWidget((Widget) csb, "*displayX");
-	    break;
+	default:
 	case CSBDisplayDPS:
 	    w = XtNameToWidget((Widget) csb, "*displayDPS");
 	    break;
+	case CSBDisplayX:
+	    w = XtNameToWidget((Widget) csb, "*displayX");
+	    break;
 	case CSBDisplayBoth:
 	    w = XtNameToWidget((Widget) csb, "*displayBoth");
 	    break;
@@ -3067,8 +3064,7 @@
     }
 }
 
-static void SetPalette(csb)
-    ColorSelectionBoxWidget csb;
+static void SetPalette(ColorSelectionBoxWidget csb)
 {
     Widget w;
     char buf[10];
@@ -3082,9 +3078,9 @@
     DrawPalette(csb);
 }
 
-static void SetBaseGState(csb, visual)
-    ColorSelectionBoxWidget csb;
-    Visual *visual;
+static void SetBaseGState(
+    ColorSelectionBoxWidget csb,
+    Visual *visual)
 {
     XStandardColormap colorCube, grayRamp;
     int match;
@@ -3121,16 +3117,16 @@
 
 /* ARGSUSED */
 
-static Boolean SetValues(old, req, new, args, num_args)
-    Widget old, req, new;
-    ArgList args;
-    Cardinal *num_args;
+static Boolean SetValues(
+    Widget old, Widget req, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     ColorSelectionBoxWidget oldcsb = (ColorSelectionBoxWidget) old;
     ColorSelectionBoxWidget newcsb = (ColorSelectionBoxWidget) new;
     Bool inited;
     char buf[10];
-    Widget w;
+    Widget w = 0;
     int i;
 
 #define NE(field) newcsb->csb.field != oldcsb->csb.field
@@ -3266,10 +3262,10 @@
 #undef NE
 }
 
-static void Realize(w, mask, attr)
-    Widget w;
-    XtValueMask *mask;
-    XSetWindowAttributes *attr;
+static void Realize(
+    Widget w,
+    XtValueMask *mask,
+    XSetWindowAttributes *attr)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) w;
     Visual *v;
@@ -3283,19 +3279,18 @@
     _DPSCGetInvCTM(csb->csb.context, csb->csb.itransform);
 }
 
-static void Resize(widget)
-    Widget widget;
+static void Resize(Widget widget)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) widget;
 
     XtResizeWidget(csb->csb.form_child, csb->core.width, csb->core.height, 0);
 }
 
-static Boolean SetColor(w, space, c1, c2, c3, c4, setSpace)
-    Widget w;
-    CSBColorSpace space;
-    double c1, c2, c3, c4;
-    Bool setSpace;
+static Boolean SetColor(
+    Widget w,
+    CSBColorSpace space,
+    double c1, double c2, double c3, double c4,
+    Bool setSpace)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) w;
 #define CHECK(c) if ((c) > 1.0 || (c) < 0.0) return False;
@@ -3339,11 +3334,11 @@
 #undef CHECK
 }
 
-Boolean CSBSetColor(w, space, c1, c2, c3, c4, setSpace)
-    Widget w;
-    CSBColorSpace space;
-    double c1, c2, c3, c4;
-    Bool setSpace;
+Boolean CSBSetColor(
+    Widget w,
+    CSBColorSpace space,
+    double c1, double c2, double c3, double c4,
+    Bool setSpace)
 {
     XtCheckSubclass(w, colorSelectionBoxWidgetClass, NULL);
 
@@ -3351,10 +3346,10 @@
 	    csb_class.set_color) (w, space, c1, c2, c3, c4, setSpace);
 }
 
-static void GetColor(w, space, c1, c2, c3, c4)
-    Widget w;
-    CSBColorSpace space;
-    float *c1, *c2, *c3, *c4;
+static void GetColor(
+    Widget w,
+    CSBColorSpace space,
+    float *c1, float *c2, float *c3, float *c4)
 {
     ColorSelectionBoxWidget csb = (ColorSelectionBoxWidget) w;
 
@@ -3381,10 +3376,10 @@
     }
 }
 
-void CSBGetColor(w, space, c1, c2, c3, c4)
-    Widget w;
-    CSBColorSpace space;
-    float *c1, *c2, *c3, *c4;
+void CSBGetColor(
+    Widget w,
+    CSBColorSpace space,
+    float *c1, float *c2, float *c3, float *c4)
 {
     XtCheckSubclass(w, colorSelectionBoxWidgetClass, NULL);
 
Index: xc/lib/dpstk/DPSScrollW.c
diff -u xc/lib/dpstk/DPSScrollW.c:1.1 xc/lib/dpstk/DPSScrollW.c:1.2
--- xc/lib/dpstk/DPSScrollW.c:1.1	Sat Feb 12 16:13:30 2000
+++ xc/lib/dpstk/DPSScrollW.c	Wed Jun  7 15:02:59 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/DPSScrollW.c,v 1.2 2000/06/07 22:02:59 tsi Exp $ */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
@@ -54,12 +55,13 @@
 #include <Xm/DrawingA.h>
 #include <Xm/ScrolledW.h>
 #include <Xm/ScrollBar.h>
-#include "DPS/dpsXclient.h"
+
+#include <DPS/dpsXclient.h>
 #include "dpsXcommonI.h"
-#include "DPS/dpsXshare.h"
+#include <DPS/dpsXshare.h>
 #include "DSWwraps.h"
 #include <stdio.h>
-#include "DPS/DPSScrollWP.h"
+#include <DPS/DPSScrollWP.h>
 
 #undef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -148,30 +150,51 @@
     {XtNresizeCallback, XtCCallback, XtRCallback, sizeof(XtCallbackList),
 	Offset(resize_callback), XtRCallback, (XtPointer) NULL},
 };
-
-static void ClassPartInitialize(), Initialize(), Destroy(),
-	Realize(), Resize();
-static Boolean SetValues();
-static XtGeometryResult GeometryManager(), QueryGeometry();
-
-static void SetScale(), ScrollPoint(), ScrollBy(), ScrollTo(),
-	SetScaleAndScroll(), ConvertXToPS(), ConvertPSToX(),
-	AddToDirtyArea(), StartFeedbackDrawing(), EndFeedbackDrawing(),
-	SetFeedbackDirtyArea(), FinishPendingDrawing(),
-	AbortPendingDrawing(), GetDrawingInfo(), UpdateDrawing(),
-	GetScrollInfo();
-
-static Boolean TakeFeedbackPixmap(), GiveFeedbackPixmap();
-
-static void ConvertToX(), ConvertToPS(), ConvertToOrigPS(),
-	AddRectsToPending(), AddExposureToPending(), 
-	AddUserSpaceRectsToPending(),
-	CopyRectsToCurrentDrawing(), CallFeedbackCallback(),
-	CopyRectsToDirtyArea(), AddRectsToDirtyArea(), FinishDrawing(),
-	CheckFeedbackPixmap(), CopyToFeedbackPixmap();
 
-static void DrawingAreaExpose(), DrawingAreaGraphicsExpose(), ScrollMoved(),
-	HScrollCallback(), VScrollCallback();
+static Boolean GiveFeedbackPixmap(Widget w, Pixmap p, int width, int height, int depth, Screen *screen);
+static Boolean SetValues(Widget old, Widget req, Widget new, ArgList args, Cardinal *num_args);
+static Boolean TakeFeedbackPixmap(Widget w, Pixmap *p, int *width, int *height, int *depth, Screen **screen);
+static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *desired, XtWidgetGeometry *allowed);
+static XtGeometryResult QueryGeometry(Widget w, XtWidgetGeometry *desired, XtWidgetGeometry *allowed);
+static void AbortPendingDrawing(Widget w);
+static void AddExposureToPending(DPSScrolledWindowWidget dsw, XExposeEvent *ev);
+static void AddRectsToDirtyArea(DPSScrolledWindowWidget dsw, float *newRect, int n);
+static void AddRectsToPending(DPSScrolledWindowWidget dsw, int *newRect, int n);
+static void AddToDirtyArea(Widget w, float *rect, long n);
+static void AddUserSpaceRectsToPending(DPSScrolledWindowWidget dsw, float *newRect, int n);
+static void CallFeedbackCallback(DPSScrolledWindowWidget dsw, float *r, int n);
+static void CheckFeedbackPixmap(DPSScrolledWindowWidget dsw);
+static void ClassPartInitialize(WidgetClass widget_class);
+static void ConvertPSToX(Widget w, double psX, double psY, int *xX, int *xY);
+static void ConvertToOrigPS(DPSScrolledWindowWidget dsw, int xX, int xY, float *psX, float *psY);
+static void ConvertToPS(DPSScrolledWindowWidget dsw, float xX, float xY, float *psX, float *psY);
+static void ConvertToX(DPSScrolledWindowWidget dsw, float psX, float psY, int *xX, int *xY);
+static void ConvertXToPS(Widget w, long xX, long xY, float *psX, float *psY);
+static void CopyRectsToCurrentDrawing(DPSScrolledWindowWidget dsw, float *newRect, int n);
+static void CopyRectsToDirtyArea(DPSScrolledWindowWidget dsw, float *newRect, int n);
+static void CopyToFeedbackPixmap(DPSScrolledWindowWidget dsw, float *rects, int n);
+static void Destroy(Widget widget);
+static void DrawingAreaExpose(Widget w, XtPointer clientData, XtPointer callData);
+static void DrawingAreaGraphicsExpose(Widget w, XtPointer clientData, XEvent *event, Boolean *goOn);
+static void EndFeedbackDrawing(Widget w, int restore);
+static void FinishDrawing(DPSScrolledWindowWidget dsw);
+static void FinishPendingDrawing(Widget w);
+static void GetDrawingInfo(Widget w, DSWDrawableType *type, Drawable *drawable, DPSGState *gstate, DPSContext *context);
+static void GetScrollInfo(Widget w, int *h_value, int *h_size, int *h_max, int *v_value, int *v_size, int *v_max);
+static void HScrollCallback(Widget w, XtPointer clientData, XtPointer callData);
+static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args);
+static void Realize(Widget w, XtValueMask *mask, XSetWindowAttributes *attr);
+static void Resize(Widget w);
+static void ScrollBy(Widget w, long dx, long dy);
+static void ScrollMoved(DPSScrolledWindowWidget dsw);
+static void ScrollPoint(Widget w, double psX, double psY, long xX, long xY);
+static void ScrollTo(Widget w, long x, long y);
+static void SetFeedbackDirtyArea(Widget w, float *rects, int count, XtPointer continue_feedback_data);
+static void SetScale(Widget w, double scale, long fixedX, long fixedY);
+static void SetScaleAndScroll(Widget w, double scale, double psX, double psY, long xX, long xY);
+static void StartFeedbackDrawing(Widget w, XtPointer start_feedback_data);
+static void UpdateDrawing(Widget w, float *rects, int count);
+static void VScrollCallback(Widget w, XtPointer clientData, XtPointer callData);
 
 DPSScrolledWindowClassRec dpsScrolledWindowClassRec = {
     /* Core class part */
@@ -266,9 +289,7 @@
 
 /***** UTILITY FUNCTIONS *****/
 
-static void PrintRectList(r, num_r)
-    float *r;
-    short num_r;
+static void PrintRectList(float *r, short num_r)
 {
     int i;
 
@@ -282,11 +303,11 @@
 /* Make sure the list pointed to by r can hold n more rectangles.  Always
    grow by at least min_grow */
 
-static void GrowRectList(r, r_size, num_r, n, min_grow)
-    float **r;
-    short *r_size;
-    short num_r;
-    int n, min_grow;
+static void GrowRectList(
+    float **r,
+    short *r_size,
+    short num_r,
+    int n, int min_grow)
 {
     if (*r_size < num_r + n) {
 	if (min_grow > 1 && num_r + n - *r_size < min_grow) {
@@ -296,11 +317,11 @@
     }
 }
 
-static void GrowIntRectList(r, r_size, num_r, n, min_grow)
-    int **r;
-    short *r_size;
-    short num_r;
-    int n, min_grow;
+static void GrowIntRectList(
+    int **r,
+    short *r_size,
+    short num_r,
+    int n, int min_grow)
 {
     if (*r_size < num_r + n) {
 	if (min_grow > 1 && num_r + n - *r_size < min_grow) {
@@ -310,8 +331,7 @@
     }
 }
 
-static Boolean Intersects(r1, r2)
-    float *r1, *r2;
+static Boolean Intersects(float *r1, float *r2)
 {
     if (RIGHT(r1) <= LEFT(r2)) return False;
     if (RIGHT(r2) <= LEFT(r1)) return False;
@@ -323,8 +343,7 @@
 
 /* Subtract sub from src, putting result into dst.  Return rectangle count */
 
-static int Subtract(src, sub, dst)
-    float *src, *sub, *dst;
+static int Subtract(float *src, float *sub, float *dst)
 {
     int n = 0;
 
@@ -372,8 +391,7 @@
     return n;
 }
 
-static void Copy(src, dst)
-    float *src, *dst;
+static void Copy(float *src, float *dst)
 {
     LEFT(dst) = LEFT(src);
     BOTTOM(dst) = BOTTOM(src);
@@ -381,8 +399,7 @@
     HEIGHT(dst) = HEIGHT(src);
 }
 
-static void Intersection(r1, r2, dst)
-    float *r1, *r2, *dst;
+static void Intersection(float *r1, float *r2, float *dst)
 {
     LEFT(dst) = MAX(LEFT(r1), LEFT(r2));
     BOTTOM(dst) = MAX(BOTTOM(r1), BOTTOM(r2));
@@ -398,12 +415,12 @@
 
 /* Replace the rectangle list in src with src minus sub */
 
-static void SubtractRects(src, src_size, num_src, sub, num_sub)
-    float **src;
-    short *src_size;
-    short *num_src;
-    float *sub;
-    int num_sub;
+static void SubtractRects(
+    float **src,
+    short *src_size,
+    short *num_src,
+    float *sub,
+    int num_sub)
 {
     short num_rbuf;
     float *r;
@@ -447,12 +464,12 @@
 
 /* Replace list r1 with the intersection of r1 and r2 */
 
-static void IntersectRects(r1, r1_size, num_r1, r2, num_r2)
-    float **r1;
-    short *r1_size;
-    short *num_r1;
-    float *r2;
-    int num_r2;
+static void IntersectRects(
+    float **r1,
+    short *r1_size,
+    short *num_r1,
+    float *r2,
+    int num_r2)
 {
     short num_rbuf = 0;
     float *r;
@@ -479,9 +496,7 @@
     *num_r1 = num_rbuf;
 }
 
-static void SimplifyRects(rect, num)
-    float *rect;
-    register short *num;
+static void SimplifyRects(float *rect, short *num)
 {
     int i, j, k;
     float *r, *r1;
@@ -513,9 +528,7 @@
     }
 }
 
-static void ComputeOffsets(dsw, dx, dy)
-    DPSScrolledWindowWidget dsw;
-    int *dx, *dy;
+static void ComputeOffsets(DPSScrolledWindowWidget dsw, int *dx, int *dy)
 {
     if (dsw->sw.doing_feedback && dsw->sw.feedback_pixmap != None) {
 	*dx = *dy = 0;
@@ -527,8 +540,7 @@
     }
 }
 
-static void ClassPartInitialize(widget_class)
-    WidgetClass widget_class;
+static void ClassPartInitialize(WidgetClass widget_class)
 {
     register DPSScrolledWindowWidgetClass wc =
 	    (DPSScrolledWindowWidgetClass) widget_class;
@@ -599,8 +611,7 @@
     }
 }
 
-static void CreateChildren(dsw)
-    DPSScrolledWindowWidget dsw;
+static void CreateChildren(DPSScrolledWindowWidget dsw)
 {
     Widget w;
 
@@ -648,10 +659,7 @@
 
 /* ARGSUSED */
 
-static void Initialize(request, new, args, num_args)
-    Widget request, new;
-    ArgList args;
-    Cardinal *num_args;
+static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) new;
     XGCValues gcVal;
@@ -730,8 +738,7 @@
 			       &gcVal);
 }
 
-static void Destroy(widget)
-    Widget widget;
+static void Destroy(Widget widget)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) widget;
 
@@ -769,8 +776,7 @@
     XtReleaseGC(widget, dsw->sw.no_ge_gc);
 }
 
-static void SetOriginAndGetTransform(dsw)
-    DPSScrolledWindowWidget dsw;
+static void SetOriginAndGetTransform(DPSScrolledWindowWidget dsw)
 {
     float psX, psY;
 
@@ -781,8 +787,7 @@
 				   &dsw->sw.x_offset, &dsw->sw.y_offset);
 }
 
-static void SetPixmapOrigin(dsw)
-    DPSScrolledWindowWidget dsw;
+static void SetPixmapOrigin(DPSScrolledWindowWidget dsw)
 {
     float psX, psY;
 
@@ -791,8 +796,7 @@
 		    dsw->sw.origin_x, dsw->sw.origin_y);
 }
 
-static void SetPixmapOffset(dsw)
-    DPSScrolledWindowWidget dsw;
+static void SetPixmapOffset(DPSScrolledWindowWidget dsw)
 {
     int ox, oy;
 
@@ -807,11 +811,9 @@
 }
 
 static Boolean pixmapError;
-static int (*oldHandler)();
+static int (*oldHandler)(Display *, XErrorEvent *);
 
-static int PixmapHandler(dpy, error)
-    Display *dpy;
-    XErrorEvent *error;
+static int PixmapHandler(Display *dpy, XErrorEvent *error)
 {
     if (error->error_code == BadAlloc &&
         error->request_code == X_CreatePixmap) {
@@ -820,23 +822,22 @@
     } else return (*oldHandler) (dpy, error);
 }
 
-static Pixmap AllocPixmap(dsw, w, h)
-    DPSScrolledWindowWidget dsw;
-    unsigned int w, h;
+static Pixmap AllocPixmap(DPSScrolledWindowWidget dsw, unsigned w, unsigned h)
 {
     Pixmap p;
     unsigned int dBytes;
     Widget wid = dsw->sw.drawing_area;
+    unsigned area = (w * h);
 
     if (dsw->sw.pixmap_limit > 0) {
-	if (w * h > dsw->sw.pixmap_limit) return None;
-    } else if (dsw->sw.pixmap_limit < 0 &&
-	       w * h > dsw->sw.unscaled_width * dsw->sw.unscaled_height &&
-	       w * h > wid->core.width * wid->core.height) return None;
+	if (area > (unsigned)dsw->sw.pixmap_limit) return None;
+    } else if (dsw->sw.pixmap_limit < 0
+       && area > (unsigned)(dsw->sw.unscaled_width * dsw->sw.unscaled_height)
+       && area > (unsigned)(wid->core.width * wid->core.height)) return None;
 
     if (dsw->sw.absolute_pixmap_limit > 0) {
 	dBytes = (wid->core.depth + 7) / 8;	/* Convert into bytes */
-	if (w * h * dBytes > dsw->sw.absolute_pixmap_limit * 1024) {
+	if (area * dBytes > (unsigned)dsw->sw.absolute_pixmap_limit * 1024) {
 	    return None;
 	}
     }
@@ -852,8 +853,7 @@
     else return p;
 }
 
-static void CreateBackingPixmap(dsw)
-    DPSScrolledWindowWidget dsw;
+static void CreateBackingPixmap(DPSScrolledWindowWidget dsw)
 {
     Pixmap p;
 
@@ -884,8 +884,7 @@
     if (p == None) dsw->sw.pixmap_width = dsw->sw.pixmap_height = 0;
 }
 
-static void FreeBackingPixmap(dsw)
-    DPSScrolledWindowWidget dsw;
+static void FreeBackingPixmap(DPSScrolledWindowWidget dsw)
 {
     if (dsw->sw.backing_pixmap == None) return;
     XFreePixmap(XtDisplay(dsw), dsw->sw.backing_pixmap);
@@ -895,13 +894,13 @@
     XDPSFreeContextGState(dsw->sw.context, dsw->sw.backing_gstate);
 }    
 
-static void SetDrawingAreaPosition(dsw, ix, iy, vx, vy, setOrigin)
-    DPSScrolledWindowWidget dsw;
-    float ix;
-    float iy;
-    int vx;
-    int vy;
-    Boolean setOrigin;
+static void SetDrawingAreaPosition(
+    DPSScrolledWindowWidget dsw,
+    float ix,
+    float iy,
+    int vx,
+    int vy,
+    Boolean setOrigin)
 {
     int xoff, yoff;
     int hSize, vSize;
@@ -986,9 +985,9 @@
     }
 }
 
-static void DrawBackground(dsw, which)
-    DPSScrolledWindowWidget dsw;
-    DSWDrawableType which;
+static void DrawBackground(
+    DPSScrolledWindowWidget dsw,
+    DSWDrawableType which)
 {
     DSWExposeCallbackRec e;
 
@@ -1038,9 +1037,9 @@
     DPSinitviewclip(dsw->sw.context);
 }
 
-static void ClipToDrawingSize(dsw, which)
-    DPSScrolledWindowWidget dsw;
-    DSWDrawableType which;
+static void ClipToDrawingSize(
+    DPSScrolledWindowWidget dsw,
+    DSWDrawableType which)
 {
     int i;
     float r[4];
@@ -1091,11 +1090,11 @@
     }
 }    
 
-static DSWResults ClipAndDraw(dsw, which, howMuch, first)
-    DPSScrolledWindowWidget dsw;
-    DSWDrawableType which;
-    DSWDirections howMuch;
-    Boolean first;
+static DSWResults ClipAndDraw(
+    DPSScrolledWindowWidget dsw,
+    DSWDrawableType which,
+    DSWDirections howMuch,
+    Boolean first)
 {
     DSWExposeCallbackRec e;
 
@@ -1157,9 +1156,9 @@
     return e.results;
 }
 
-static void SplitExposeEvent(dsw, ev)
-    DPSScrolledWindowWidget dsw;
-    XExposeEvent *ev;
+static void SplitExposeEvent(
+    DPSScrolledWindowWidget dsw,
+    XExposeEvent *ev)
 {
     float *r;
     float llx, lly, urx, ury;
@@ -1212,10 +1211,10 @@
 
 /* ARGSUSED */
 
-static Bool CheckWatchProgressEvent(dpy, e, arg)
-    Display *dpy;
-    XEvent *e;
-    char *arg;
+static Bool CheckWatchProgressEvent(
+    Display *dpy,
+    XEvent *e,
+    char *arg)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) arg;
     
@@ -1225,8 +1224,8 @@
 	    e->type == Expose);
 }
 
-static void CopyWindowToBackingPixmap(dsw)
-    DPSScrolledWindowWidget dsw;
+static void CopyWindowToBackingPixmap(
+    DPSScrolledWindowWidget dsw)
 {
     int llx, lly, urx, ury;
     XEvent e;
@@ -1285,8 +1284,8 @@
 /* Subtract the window area from the dirty area, and make the
    result be the new current drawing list */
 
-static void SetCurrentDrawingToBackground(dsw)
-    DPSScrolledWindowWidget dsw;
+static void SetCurrentDrawingToBackground(
+    DPSScrolledWindowWidget dsw)
 {
     int i;
     float r[4];
@@ -1309,8 +1308,7 @@
     dsw->sw.num_current_drawing = dsw->sw.num_dirty_areas;
 }
 
-static void CopyPendingExpose(dsw)
-    DPSScrolledWindowWidget dsw;
+static void CopyPendingExpose(DPSScrolledWindowWidget dsw)
 {
     int dx, dy;
     int i;
@@ -1329,10 +1327,10 @@
     dsw->sw.num_pending_expose = dsw->sw.num_pending_dirty = 0;
 }
 
-static void UpdateWindowFromBackingPixmap(dsw, rects, n)
-    DPSScrolledWindowWidget dsw;
-    float *rects;
-    int n;
+static void UpdateWindowFromBackingPixmap(
+    DPSScrolledWindowWidget dsw,
+    float *rects,
+    int n)
 {
     int dx, dy;
     int llx, lly, urx, ury;
@@ -1353,10 +1351,10 @@
     }
 }
 
-static void UpdateWindowFromFeedbackPixmap(dsw, rects, n)
-    DPSScrolledWindowWidget dsw;
-    float *rects;
-    int n;
+static void UpdateWindowFromFeedbackPixmap(
+    DPSScrolledWindowWidget dsw,
+    float *rects,
+    int n)
 {
     int llx, lly, urx, ury;
     int i;
@@ -1376,8 +1374,7 @@
 /* This is the heart of the drawing code; it does one piece of drawing.
    It can be called either directly or as a work procedure */
 
-static Boolean DoDrawing(clientData)
-    XtPointer clientData;
+static Boolean DoDrawing(XtPointer clientData)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) clientData;
     DSWResults results;
@@ -1459,8 +1456,7 @@
     } else return False;
 }
 
-static void StartDrawing(dsw)
-    DPSScrolledWindowWidget dsw;
+static void StartDrawing(DPSScrolledWindowWidget dsw)
 {
     float r[4];
 
@@ -1504,8 +1500,7 @@
     }
 }
 
-static void RedisplaySliver(dsw, deltaX, deltaY)
-    DPSScrolledWindowWidget dsw;
+static void RedisplaySliver(DPSScrolledWindowWidget dsw, int deltaX, int deltaY)
 {
     float r[8];
     int xr[8];
@@ -1608,8 +1603,7 @@
     StartDrawing(dsw);
 }
 
-static void SetUpInitialPixmap(dsw)
-    DPSScrolledWindowWidget dsw;
+static void SetUpInitialPixmap(DPSScrolledWindowWidget dsw)
 {
     float *r = dsw->sw.dirty_areas;
     int llx, lly, urx, ury;
@@ -1658,17 +1652,14 @@
 
 /* ARGSUSED */
 
-static void TimerStart(clientData, id)
-    XtPointer clientData;
-    XtIntervalId *id;
+static void TimerStart(XtPointer clientData, XtIntervalId *id)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) clientData;
 
     if (dsw->sw.drawing_stage == DSWStart) StartDrawing(dsw);
 }
 
-static void SetUpInitialInformation(dsw)
-    DPSScrolledWindowWidget dsw;
+static void SetUpInitialInformation(DPSScrolledWindowWidget dsw)
 {
     int i;
     float llx, lly, urx, ury;
@@ -1770,10 +1761,10 @@
     }
 }
 
-static void Realize(w, mask, attr)
-    Widget w;
-    XtValueMask *mask;
-    XSetWindowAttributes *attr;
+static void Realize(
+    Widget w,
+    XtValueMask *mask,
+    XSetWindowAttributes *attr)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     DSWSetupCallbackRec setup;
@@ -1795,8 +1786,7 @@
     SetUpInitialInformation(dsw);
 }
 
-static void AbortOrFinish(dsw)
-    DPSScrolledWindowWidget dsw;
+static void AbortOrFinish(DPSScrolledWindowWidget dsw)
 {
     DSWResults results;
     DSWDrawableType which;
@@ -1876,8 +1866,7 @@
     return;
 }
 
-static void AbortDrawing(dsw)
-    DPSScrolledWindowWidget dsw;
+static void AbortDrawing(DPSScrolledWindowWidget dsw)
 {
     DSWDrawableType which;
 
@@ -1908,8 +1897,7 @@
     dsw->sw.num_pending_expose = dsw->sw.num_pending_dirty = 0;
 }
 
-static void FinishDrawing(dsw)
-    DPSScrolledWindowWidget dsw;
+static void FinishDrawing(DPSScrolledWindowWidget dsw)
 {
     DSWDrawableType which;
     
@@ -1965,9 +1953,9 @@
     dsw->sw.num_dirty_areas = 0;
 }
 
-static void DoScroll(dsw, deltaX, deltaY)
-    DPSScrolledWindowWidget dsw;
-    int deltaX, deltaY;
+static void DoScroll(
+    DPSScrolledWindowWidget dsw,
+    int deltaX, int deltaY)
 {
     /* Set the PS origin in the X window to the new settings of 
        the scrollbars */
@@ -1992,9 +1980,9 @@
     dsw->sw.scroll_y += deltaY;
 }
 
-static void ShiftPendingExpose(dsw, deltaX, deltaY)
-    DPSScrolledWindowWidget dsw;
-    int deltaX, deltaY;
+static void ShiftPendingExpose(
+    DPSScrolledWindowWidget dsw,
+    int deltaX, int deltaY)
 {
     int i;
     int *r;
@@ -2006,9 +1994,9 @@
     }
 }
 
-static void HScrollCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void HScrollCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) clientData;
     XmScrollBarCallbackStruct *sb = (XmScrollBarCallbackStruct *) callData;
@@ -2019,9 +2007,9 @@
     }
 }
 
-static void VScrollCallback(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void VScrollCallback(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) clientData;
     XmScrollBarCallbackStruct *sb = (XmScrollBarCallbackStruct *) callData;
@@ -2034,8 +2022,7 @@
 
 /* ARGSUSED */
 
-static void ScrollMoved(dsw)
-    DPSScrolledWindowWidget dsw;
+static void ScrollMoved(DPSScrolledWindowWidget dsw)
 {
     int deltaX, deltaY;
 
@@ -2147,9 +2134,9 @@
     }
 }
 
-static void AddExposureToPending(dsw, ev)
-    DPSScrolledWindowWidget dsw;
-    XExposeEvent *ev;
+static void AddExposureToPending(
+    DPSScrolledWindowWidget dsw,
+    XExposeEvent *ev)
 {
     float *f;
     int *i;
@@ -2178,10 +2165,10 @@
     dsw->sw.num_pending_expose++;
 }
 
-static void AddRectsToPending(dsw, newRect, n)
-    DPSScrolledWindowWidget dsw;
-    int *newRect;
-    int n;
+static void AddRectsToPending(
+    DPSScrolledWindowWidget dsw,
+    int *newRect,
+    int n)
 {
     int *r;
     int i;
@@ -2210,10 +2197,10 @@
     dsw->sw.num_pending_expose += n;
 }
 
-static void AddUserSpaceRectsToPending(dsw, newRect, n)
-    DPSScrolledWindowWidget dsw;
-    float *newRect;
-    int n;
+static void AddUserSpaceRectsToPending(
+    DPSScrolledWindowWidget dsw,
+    float *newRect,
+    int n)
 {
     int *r;
     int i;
@@ -2242,10 +2229,10 @@
     }
 }
 
-static void CopyRectsToCurrentDrawing(dsw, newRect, n)
-    DPSScrolledWindowWidget dsw;
-    float *newRect;
-    int n;
+static void CopyRectsToCurrentDrawing(
+    DPSScrolledWindowWidget dsw,
+    float *newRect,
+    int n)
 {
     float *r;
     int i;
@@ -2258,10 +2245,10 @@
     dsw->sw.num_current_drawing = n;
 }
 
-static void CopyRectsToDirtyArea(dsw, newRect, n)
-    DPSScrolledWindowWidget dsw;
-    float *newRect;
-    int n;
+static void CopyRectsToDirtyArea(
+    DPSScrolledWindowWidget dsw,
+    float *newRect,
+    int n)
 {
     float *r;
     int i;
@@ -2273,10 +2260,10 @@
     dsw->sw.num_dirty_areas = n;
 }
 
-static void AddRectsToDirtyArea(dsw, newRect, n)
-    DPSScrolledWindowWidget dsw;
-    float *newRect;
-    int n;
+static void AddRectsToDirtyArea(
+    DPSScrolledWindowWidget dsw,
+    float *newRect,
+    int n)
 {
     float *r;
     int i;
@@ -2289,10 +2276,10 @@
     dsw->sw.num_dirty_areas += n;
 }
 
-static void CopyRectsToPrevDirtyArea(dsw, newRect, n)
-    DPSScrolledWindowWidget dsw;
-    float *newRect;
-    int n;
+static void CopyRectsToPrevDirtyArea(
+    DPSScrolledWindowWidget dsw,
+    float *newRect,
+    int n)
 {
     float *r;
     int i;
@@ -2307,11 +2294,11 @@
 
 /* ARGSUSED */
 
-static void DrawingAreaGraphicsExpose(w, clientData, event, goOn)
-    Widget w;
-    XtPointer clientData;
-    XEvent *event;
-    Boolean *goOn;
+static void DrawingAreaGraphicsExpose(
+    Widget w,
+    XtPointer clientData,
+    XEvent *event,
+    Boolean *goOn)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) clientData;
     XExposeEvent *ev = (XExposeEvent *) event;
@@ -2334,8 +2321,7 @@
     }
 }
 
-static Boolean MoreExposes(w)
-    Widget w;
+static Boolean MoreExposes(Widget w)
 {
     XEvent event;
 
@@ -2349,9 +2335,9 @@
     return False;
 }
 
-static void DrawingAreaExpose(w, clientData, callData)
-    Widget w;
-    XtPointer clientData, callData;
+static void DrawingAreaExpose(
+    Widget w,
+    XtPointer clientData, XtPointer callData)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) clientData;
     XmDrawingAreaCallbackStruct *d = (XmDrawingAreaCallbackStruct *) callData;
@@ -2427,8 +2413,7 @@
     }
 }	      
 
-static void Resize(w)
-    Widget w;
+static void Resize(Widget w)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     DSWResizeCallbackRec r;
@@ -2547,8 +2532,7 @@
     }
 }
 
-static void CheckFeedbackPixmap(dsw)
-    DPSScrolledWindowWidget dsw;
+static void CheckFeedbackPixmap(DPSScrolledWindowWidget dsw)
 {
     if (dsw->sw.feedback_pixmap != None &&
 	(dsw->sw.feedback_width < (int) dsw->sw.drawing_area->core.width ||
@@ -2574,8 +2558,7 @@
     }
 }
 
-static void UpdateGStates(dsw)
-    DPSScrolledWindowWidget dsw;
+static void UpdateGStates(DPSScrolledWindowWidget dsw)
 {
     /* Create graphics states for the window and backing pixmap in
        the new context */
@@ -2598,8 +2581,7 @@
     }
 }
 
-static void CheckPixmapSize(dsw)
-    DPSScrolledWindowWidget dsw;
+static void CheckPixmapSize(DPSScrolledWindowWidget dsw)
 {
     Boolean freeIt = False;
     int w = dsw->sw.pixmap_width, h = dsw->sw.pixmap_height;
@@ -2616,7 +2598,7 @@
 
     if (dsw->sw.absolute_pixmap_limit > 0) {
 	dBytes = (wid->core.depth + 7) / 8;	  /* Convert into bytes */
-	if (w * h * dBytes > dsw->sw.absolute_pixmap_limit * 1024) {
+	if (w * h * dBytes > (unsigned)dsw->sw.absolute_pixmap_limit * 1024) {
 	    freeIt = True;
 	}
     }
@@ -2629,8 +2611,7 @@
     }
 }
 
-static void ResizeArea(dsw)
-    DPSScrolledWindowWidget dsw;
+static void ResizeArea(DPSScrolledWindowWidget dsw)
 {
     AbortDrawing(dsw);
 
@@ -2661,8 +2642,7 @@
     SetUpInitialInformation(dsw);
 }
 
-static void ClearDirtyAreas(dsw)
-    DPSScrolledWindowWidget dsw;
+static void ClearDirtyAreas(DPSScrolledWindowWidget dsw)
 {
     int i;
     float *r;
@@ -2677,8 +2657,7 @@
     }
 }
 
-static void HandleFeedbackPixmapChange(dsw)
-    DPSScrolledWindowWidget dsw;
+static void HandleFeedbackPixmapChange(DPSScrolledWindowWidget dsw)
 {
     if (!dsw->sw.use_feedback_pixmap) {
 	/* Get rid of one if we have it */
@@ -2722,10 +2701,10 @@
 
 /* ARGSUSED */
 
-static Boolean SetValues(old, req, new, args, num_args)
-    Widget old, req, new;
-    ArgList args;
-    Cardinal *num_args;
+static Boolean SetValues(
+    Widget old, Widget req, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     DPSScrolledWindowWidget olddsw = (DPSScrolledWindowWidget) old;
     DPSScrolledWindowWidget newdsw = (DPSScrolledWindowWidget) new;
@@ -2830,17 +2809,17 @@
 #undef DONT_CHANGE
 }
 
-static XtGeometryResult GeometryManager(w, desired, allowed)
-    Widget w;
-    XtWidgetGeometry *desired, *allowed;
+static XtGeometryResult GeometryManager(
+    Widget w,
+    XtWidgetGeometry *desired, XtWidgetGeometry *allowed)
 {
     /* Pass geometry requests up to our parent */
     return XtMakeGeometryRequest(XtParent(w), desired, allowed);
 }
 
-static XtGeometryResult QueryGeometry(w, desired, allowed)
-    Widget w;
-    XtWidgetGeometry *desired, *allowed;
+static XtGeometryResult QueryGeometry(
+    Widget w,
+    XtWidgetGeometry *desired, XtWidgetGeometry *allowed)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
 
@@ -2848,10 +2827,10 @@
     return XtQueryGeometry(dsw->sw.scrolled_window, desired, allowed);
 }
 
-static void CopyToFeedbackPixmap(dsw, rects, n)
-    DPSScrolledWindowWidget dsw;
-    float *rects;
-    int n;
+static void CopyToFeedbackPixmap(
+    DPSScrolledWindowWidget dsw,
+    float *rects,
+    int n)
 {
     int llx, lly, urx, ury;
     int dx, dy;
@@ -2871,10 +2850,10 @@
     }
 }
 
-static void CallFeedbackCallback(dsw, r, n)
-    DPSScrolledWindowWidget dsw;
-    float *r;
-    int n;
+static void CallFeedbackCallback(
+    DPSScrolledWindowWidget dsw,
+    float *r,
+    int n)
 {
     DSWFeedbackCallbackRec f;
 
@@ -2900,10 +2879,10 @@
     DPSWaitContext(dsw->sw.context);
 }
 
-static void SetScale(w, scale, fixedX, fixedY)
-    Widget w;
-    double scale;
-    long fixedX, fixedY;
+static void SetScale(
+    Widget w,
+    double scale,
+    long fixedX, long fixedY)
 {
     float psX, psY;
 
@@ -2912,10 +2891,10 @@
     SetScaleAndScroll(w, scale, psX, psY, fixedX, fixedY);
 }
 
-void DSWSetScale(w, scale, fixedX, fixedY)
-    Widget w;
-    double scale;
-    long fixedX, fixedY;
+void DSWSetScale(
+    Widget w,
+    double scale,
+    long fixedX, long fixedY)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -2923,10 +2902,10 @@
      sw_class.set_scale) (w, scale, fixedX, fixedY);
 }
 
-static void ScrollPoint(w, psX, psY, xX, xY)
-    Widget w;
-    double psX, psY;
-    long xX, xY;
+static void ScrollPoint(
+    Widget w,
+    double psX, double psY,
+    long xX, long xY)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
 
@@ -2943,10 +2922,10 @@
     }
 }
 
-void DSWScrollPoint(w, psX, psY, xX, xY)
-    Widget w;
-    double psX, psY;
-    long xX, xY;
+void DSWScrollPoint(
+    Widget w,
+    double psX, double psY,
+    long xX, long xY)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -2954,9 +2933,7 @@
      sw_class.scroll_point) (w, psX, psY, xX, xY);
 }
 
-static void ScrollBy(w, dx, dy)
-    Widget w;
-    long dx, dy;
+static void ScrollBy(Widget w, long dx, long dy)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     int value;
@@ -2995,9 +2972,7 @@
     }
 }
 
-void DSWScrollBy(w, dx, dy)
-    Widget w;
-    long dx, dy;
+void DSWScrollBy(Widget w, long dx, long dy)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3005,9 +2980,7 @@
      sw_class.scroll_by) (w, dx, dy);
 }
 
-static void ScrollTo(w, x, y)
-    Widget w;
-    long x, y;
+static void ScrollTo(Widget w, long x, long y)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     int max, size;
@@ -3034,9 +3007,7 @@
     }
 }
 
-void DSWScrollTo(w, x, y)
-    Widget w;
-    long x, y;
+void DSWScrollTo(Widget w, long x, long y)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3044,11 +3015,11 @@
      sw_class.scroll_to) (w, x, y);
 }
 
-static void SetScaleAndScroll(w, scale, psX, psY, xX, xY)
-    Widget w;
-    double scale;
-    double psX, psY;
-    long xX, xY;
+static void SetScaleAndScroll(
+    Widget w,
+    double scale,
+    double psX, double psY,
+    long xX, long xY)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     Arg arg;
@@ -3070,11 +3041,11 @@
     XtSetValues(w, &arg, 1);
 }
 
-void DSWSetScaleAndScroll(w, scale, psX, psY, xX, xY)
-    Widget w;
-    double scale;
-    double psX, psY;
-    long xX, xY;
+void DSWSetScaleAndScroll(
+    Widget w,
+    double scale,
+    double psX, double psY,
+    long xX, long xY)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3082,18 +3053,18 @@
      sw_class.set_scale_and_scroll) (w, scale, psX, psY, xX, xY);
 }
 
-static void ConvertXToPS(w, xX, xY, psX, psY)
-    Widget w;
-    long xX, xY;
-    float *psX, *psY;
+static void ConvertXToPS(
+    Widget w,
+    long xX, long xY,
+    float *psX, float *psY)
 {
     ConvertToPS((DPSScrolledWindowWidget) w, (float) xX, (float) xY, psX, psY);
 }
 
-void DSWConvertXToPS(w, xX, xY, psX, psY)
-    Widget w;
-    long xX, xY;
-    float *psX, *psY;
+void DSWConvertXToPS(
+    Widget w,
+    long xX, long xY,
+    float *psX, float *psY)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3101,18 +3072,18 @@
      sw_class.convert_x_to_ps) (w, xX, xY, psX, psY);
 }
 
-static void ConvertPSToX(w, psX, psY, xX, xY)
-    Widget w;
-    double psX, psY;
-    int *xX, *xY;
+static void ConvertPSToX(
+    Widget w,
+    double psX, double psY,
+    int *xX, int *xY)
 {
     ConvertToX((DPSScrolledWindowWidget) w, psX, psY, xX, xY);
 }
 
-void DSWConvertPSToX(w, psX, psY, xX, xY)
-    Widget w;
-    double psX, psY;
-    int *xX, *xY;
+void DSWConvertPSToX(
+    Widget w,
+    double psX, double psY,
+    int *xX, int *xY)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3120,10 +3091,10 @@
      sw_class.convert_ps_to_x) (w, psX, psY, xX, xY);
 }
 
-static void AddToDirtyArea(w, rect, n)
-    Widget w;
-    float *rect;
-    long n;
+static void AddToDirtyArea(
+    Widget w,
+    float *rect,
+    long n)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
 
@@ -3136,10 +3107,10 @@
     XtVaSetValues(w, XtNdirtyAreas, rect, XtNnumDirtyAreas, n, NULL);
 }
 
-void DSWAddToDirtyArea(w, rect, n)
-    Widget w;
-    float *rect;
-    long n;
+void DSWAddToDirtyArea(
+    Widget w,
+    float *rect,
+    long n)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3147,11 +3118,11 @@
      sw_class.add_to_dirty_area) (w, rect, n);
 }
 
-static Boolean TakeFeedbackPixmap(w, p, width, height, depth, screen)
-    Widget w;
-    Pixmap *p;
-    int *width, *height, *depth;
-    Screen **screen;
+static Boolean TakeFeedbackPixmap(
+    Widget w,
+    Pixmap *p,
+    int *width, int *height, int *depth,
+    Screen **screen)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     
@@ -3174,11 +3145,11 @@
     return True;
 }
 
-Boolean DSWTakeFeedbackPixmap(w, p, width, height, depth, screen)
-    Widget w;
-    Pixmap *p;
-    int *width, *height, *depth;
-    Screen **screen;
+Boolean DSWTakeFeedbackPixmap(
+    Widget w,
+    Pixmap *p,
+    int *width, int *height, int *depth,
+    Screen **screen)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3187,9 +3158,9 @@
 					    depth, screen);
 }
 
-static void StartFeedbackDrawing(w, start_feedback_data)
-    Widget w;
-    XtPointer start_feedback_data;
+static void StartFeedbackDrawing(
+    Widget w,
+    XtPointer start_feedback_data)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     float *r;
@@ -3223,9 +3194,9 @@
     dsw->sw.start_feedback_data = start_feedback_data;
 }
 
-void DSWStartFeedbackDrawing(w, start_feedback_data)
-    Widget w;
-    XtPointer start_feedback_data;
+void DSWStartFeedbackDrawing(
+    Widget w,
+    XtPointer start_feedback_data)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3233,9 +3204,9 @@
      sw_class.start_feedback_drawing) (w, start_feedback_data);
 }
 
-static void EndFeedbackDrawing(w, restore)
-    Widget w;
-    Boolean restore;
+static void EndFeedbackDrawing(
+    Widget w,
+    int restore)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
 
@@ -3255,9 +3226,9 @@
     dsw->sw.doing_feedback = dsw->sw.feedback_displayed = False;
 }
 
-void DSWEndFeedbackDrawing(w, restore)
-    Widget w;
-    Bool restore;
+void DSWEndFeedbackDrawing(
+    Widget w,
+    Bool restore)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3265,11 +3236,11 @@
      sw_class.end_feedback_drawing) (w, restore);
 }
 
-static void SetFeedbackDirtyArea(w, rects, count, continue_feedback_data)
-    Widget w;
-    float *rects;
-    int count;
-    XtPointer continue_feedback_data;
+static void SetFeedbackDirtyArea(
+    Widget w,
+    float *rects,
+    int count,
+    XtPointer continue_feedback_data)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     int i;
@@ -3318,11 +3289,11 @@
     dsw->sw.feedback_displayed = True;
 }
 
-void DSWSetFeedbackDirtyArea(w, rects, count, continue_feedback_data)
-    Widget w;
-    float *rects;
-    int count;
-    XtPointer continue_feedback_data;
+void DSWSetFeedbackDirtyArea(
+    Widget w,
+    float *rects,
+    int count,
+    XtPointer continue_feedback_data)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3331,14 +3302,12 @@
 					continue_feedback_data);
 }
 
-static void FinishPendingDrawing(w)
-    Widget w;
+static void FinishPendingDrawing(Widget w)
 {
     FinishDrawing((DPSScrolledWindowWidget) w);
 }
 
-void DSWFinishPendingDrawing(w)
-    Widget w;
+void DSWFinishPendingDrawing(Widget w)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3346,14 +3315,12 @@
      sw_class.finish_pending_drawing) (w);
 }
 
-static void AbortPendingDrawing(w)
-    Widget w;
+static void AbortPendingDrawing(Widget w)
 {
     AbortDrawing((DPSScrolledWindowWidget) w);
 }
 
-void DSWAbortPendingDrawing(w)
-    Widget w;
+void DSWAbortPendingDrawing(Widget w)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3361,10 +3328,10 @@
      sw_class.abort_pending_drawing) (w);
 }
 
-static void UpdateDrawing(w, rects, count)
-    Widget w;
-    float *rects;
-    int count;
+static void UpdateDrawing(
+    Widget w,
+    float *rects,
+    int count)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     int i;
@@ -3389,10 +3356,10 @@
     }
 }
 
-void DSWUpdateDrawing(w, rects, count)
-    Widget w;
-    float *rects;
-    int count;
+void DSWUpdateDrawing(
+    Widget w,
+    float *rects,
+    int count)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3400,9 +3367,9 @@
      sw_class.update_drawing) (w, rects, count);
 }
 
-static void GetScrollInfo(w, h_value, h_size, h_max, v_value, v_size, v_max)
-    Widget w;
-    int *h_value, *h_size, *h_max, *v_value, *v_size, *v_max;
+static void GetScrollInfo(
+    Widget w,
+    int *h_value, int *h_size, int *h_max, int *v_value, int *v_size, int *v_max)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
 
@@ -3414,9 +3381,9 @@
     if (v_max != NULL) *v_max = dsw->sw.scroll_v_max;
 }
 
-void DSWGetScrollInfo(w, h_value, h_size, h_max, v_value, v_size, v_max)
-    Widget w;
-    int *h_value, *h_size, *h_max, *v_value, *v_size, *v_max;
+void DSWGetScrollInfo(
+    Widget w,
+    int *h_value, int *h_size, int *h_max, int *v_value, int *v_size, int *v_max)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3425,12 +3392,12 @@
 				v_value, v_size, v_max);
 }
 
-static void GetDrawingInfo(w, type, drawable, gstate, context)
-    Widget w;
-    DSWDrawableType *type;
-    Drawable *drawable;
-    DPSGState *gstate;
-    DPSContext *context;
+static void GetDrawingInfo(
+    Widget w,
+    DSWDrawableType *type,
+    Drawable *drawable,
+    DPSGState *gstate,
+    DPSContext *context)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
 
@@ -3446,12 +3413,12 @@
     *context = dsw->sw.context;
 }
 
-void DSWGetDrawingInfo(w, type, drawable, gstate, context)
-    Widget w;
-    DSWDrawableType *type;
-    Drawable *drawable;
-    DPSGState *gstate;
-    DPSContext *context;
+void DSWGetDrawingInfo(
+    Widget w,
+    DSWDrawableType *type,
+    Drawable *drawable,
+    DPSGState *gstate,
+    DPSContext *context)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3459,17 +3426,17 @@
      sw_class.get_drawing_info) (w, type, drawable, gstate, context);
 }
 
-static Boolean GiveFeedbackPixmap(w, p, width, height, depth, screen)
-    Widget w;
-    Pixmap p;
-    int width, height, depth;
-    Screen *screen;
+static Boolean GiveFeedbackPixmap(
+    Widget w,
+    Pixmap p,
+    int width, int height, int depth,
+    Screen *screen)
 {
     DPSScrolledWindowWidget dsw = (DPSScrolledWindowWidget) w;
     
-    if (depth != dsw->sw.drawing_area->core.depth ||
-	screen != dsw->core.screen ||
-	dsw->sw.feedback_pixmap != None) return False;
+    if ((unsigned) depth != dsw->sw.drawing_area->core.depth
+     || screen != dsw->core.screen
+     || dsw->sw.feedback_pixmap != None) return False;
 
     dsw->sw.feedback_pixmap = p;
     dsw->sw.feedback_width = width;
@@ -3478,11 +3445,11 @@
     return True;
 }
 
-Boolean DSWGiveFeedbackPixmap(w, p, width, height, depth, screen)
-    Widget w;
-    Pixmap p;
-    int width, height, depth;
-    Screen *screen;
+Boolean DSWGiveFeedbackPixmap(
+    Widget w,
+    Pixmap p,
+    int width, int height, int depth,
+    Screen *screen)
 {
     XtCheckSubclass(w, dpsScrolledWindowWidgetClass, NULL);
 
@@ -3491,10 +3458,12 @@
 					    depth, screen);
 }
 
-static void ConvertToX(dsw, psX, psY, xX, xY)
-    DPSScrolledWindowWidget dsw;
-    float psX, psY;
-    int *xX, *xY;
+static void ConvertToX(
+    DPSScrolledWindowWidget dsw,
+    float psX,
+    float psY,
+    int *xX,
+    int *xY)
 {
     *xX = dsw->sw.ctm[0] * psX + dsw->sw.ctm[2] * psY + dsw->sw.ctm[4] +
 	    dsw->sw.x_offset + 0.5;
@@ -3502,10 +3471,10 @@
 	    dsw->sw.y_offset + 0.5;
 }
 
-static void ConvertToPS(dsw, xX, xY, psX, psY)
-    DPSScrolledWindowWidget dsw;
-    float xX, xY;
-    float *psX, *psY;
+static void ConvertToPS(
+    DPSScrolledWindowWidget dsw,
+    float xX, float xY,
+    float *psX, float *psY)
 {
     xX -= dsw->sw.x_offset;
     xY -= dsw->sw.y_offset;
@@ -3516,10 +3485,10 @@
 	    dsw->sw.inv_ctm[5];
 }
 
-static void ConvertToOrigPS(dsw, xX, xY, psX, psY)
-    DPSScrolledWindowWidget dsw;
-    int xX, xY;
-    float *psX, *psY;
+static void ConvertToOrigPS(
+    DPSScrolledWindowWidget dsw,
+    int xX, int xY,
+    float *psX, float *psY)
 {
     xX -= dsw->sw.x_offset;
     xY -= dsw->sw.y_offset;
Index: xc/lib/dpstk/FontCreato.c
diff -u xc/lib/dpstk/FontCreato.c:1.1 xc/lib/dpstk/FontCreato.c:1.2
--- xc/lib/dpstk/FontCreato.c:1.1	Sat Feb 12 16:13:32 2000
+++ xc/lib/dpstk/FontCreato.c	Wed Jun  7 15:02:59 2000
@@ -35,7 +35,11 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/FontCreato.c,v 1.2 2000/06/07 22:02:59 tsi Exp $ */
 
+#include <stdio.h>
+#include <ctype.h>
+
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/ShellP.h>
@@ -106,10 +110,13 @@
 
 /* Forward declarations */
 
-static void ClassInitialize(), Initialize(), Destroy(),
-	ChangeManaged(), Resize();
-static Boolean SetValues();
-static XtGeometryResult GeometryManager();
+static Boolean SetValues(Widget old, Widget req, Widget new, ArgList args, Cardinal *num_args);
+static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *desired, XtWidgetGeometry *allowed);
+static void ChangeManaged(Widget w);
+static void ClassInitialize(void);
+static void Destroy(Widget widget);
+static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args);
+static void Resize(Widget widget);
 
 FontCreatorClassRec fontCreatorClassRec = {
     /* Core class part */
@@ -184,7 +191,7 @@
 WidgetClass fontCreatorWidgetClass =
 	(WidgetClass) &fontCreatorClassRec;
  
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
     XtInitializeWidgetClass(fontSelectionBoxWidgetClass);
 
@@ -194,9 +201,9 @@
 
 /* ARGSUSED */
 
-static void ResizePreview(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ResizePreview(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     Dimension height;
     Cardinal depth;
@@ -220,8 +227,7 @@
     XDPSUpdateContextGState(fc->creator.fsb->fsb.context, fc->creator.gstate);
 }
 
-static void DrawMM(fc)
-    FontCreatorWidget fc;
+static void DrawMM(FontCreatorWidget fc)
 {
     int i, j;
     String str;
@@ -280,9 +286,9 @@
 
 /* ARGSUSED */
 
-static void DrawMMCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void DrawMMCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
 
@@ -291,9 +297,9 @@
 
 /* ARGSUSED */
 
-static void ExposeCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ExposeCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
     XmDrawingAreaCallbackStruct *dac =
@@ -314,8 +320,7 @@
     DrawMM(fc);
 }
 
-static void SetUpBlendList(fc)
-    FontCreatorWidget fc;
+static void SetUpBlendList(FontCreatorWidget fc)
 {
     XmString *CSblends;
     int count, i;
@@ -349,10 +354,7 @@
     if (f->blend_count != 0) XtFree((XtPointer) CSblends);
 }
 
-static void CalcCarryValues(fc, oldf, carry_values)
-    FontCreatorWidget fc;
-    FontRec *oldf;
-    int *carry_values;
+static void CalcCarryValues(FontCreatorWidget fc, FontRec *oldf, int *carry_values)
 {
     FontRec *f = fc->creator.font;
     BlendDataRec *bd = f->blend_data, *oldbd = oldf->blend_data;
@@ -370,15 +372,12 @@
     }
 }
 
-static void SetUpAxisLabels(fc, oldf, carry_values)
-    FontCreatorWidget fc;
-    FontRec *oldf;
-    int *carry_values;
+static void SetUpAxisLabels(FontCreatorWidget fc, FontRec *oldf, int *carry_values)
 {
     int i;
     char buf[20];
     XmString cs;
-    BlendDataRec *bd = fc->creator.font->blend_data, *oldbd;
+    BlendDataRec *bd = fc->creator.font->blend_data, *oldbd = 0;
     char *value;
 
     if (oldf != NULL) oldbd = oldf->blend_data;
@@ -426,8 +425,7 @@
     }
 }
 
-static void ManageAxes(fc)
-    FontCreatorWidget fc;
+static void ManageAxes(FontCreatorWidget fc)
 {
     Widget w[5*MAX_AXES];
     int i, j;
@@ -460,8 +458,7 @@
     fc->creator.managed_axes = fc->creator.font->blend_data->num_axes;
 }
 
-static void SetScaleValues(fc)
-    FontCreatorWidget fc;
+static void SetScaleValues(FontCreatorWidget fc)
 {
     int val;
     char buf[32];
@@ -476,9 +473,7 @@
     }
 }
 
-static void SetUpAxes(fc, oldf)
-    FontCreatorWidget fc;
-    FontRec *oldf;
+static void SetUpAxes(FontCreatorWidget fc, FontRec *oldf)
 {
     int carry_values[MAX_AXES];
 
@@ -490,9 +485,9 @@
 
 /* ARGSUSED */
 
-static void FaceSelect(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void FaceSelect(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     XmListCallbackStruct *listCB = (XmListCallbackStruct *) callData;
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
@@ -521,9 +516,7 @@
     DrawMM(fc);
 }
 
-static void HandleSelectedBlend(fc, n)
-    FontCreatorWidget fc;
-    int n;
+static void HandleSelectedBlend(FontCreatorWidget fc, int n)
 {
     BlendDataRec *bd = fc->creator.font->blend_data;
     BlendRec *b;
@@ -547,9 +540,9 @@
 
 /* ARGSUSED */
 
-static void BlendSelect(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void BlendSelect(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     XmListCallbackStruct *listCB = (XmListCallbackStruct *) callData;
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
@@ -563,9 +556,9 @@
 
 /* ARGSUSED */
 
-static void SetValue(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SetValue(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     XmScaleCallbackStruct *scaleData = (XmScaleCallbackStruct *) callData;
     Widget text = (Widget) clientData;
@@ -577,9 +570,9 @@
 
 /* ARGSUSED */
 
-static void SetScale(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SetScale(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     Widget scale = (Widget) clientData;
     char *value;
@@ -601,16 +594,14 @@
 
 /* ARGSUSED */
 
-static void DeleteMessage(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void DeleteMessage(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     XtDestroyWidget(widget);
 }
 
-static void PutUpDialog(fc, name)
-    FontCreatorWidget fc;
-    char *name;
+static void PutUpDialog(FontCreatorWidget fc, char *name)
 {
     Widget message, w;
 
@@ -624,34 +615,27 @@
     XtManageChild(message);
 }
 
-static void NoName(fc)
-    FontCreatorWidget fc;
+static void NoName(FontCreatorWidget fc)
 {
     PutUpDialog(fc, "noNameMessage");
 }
 
-static void UsedName(fc)
-    FontCreatorWidget fc;
+static void UsedName(FontCreatorWidget fc)
 {
     PutUpDialog(fc, "usedNameMessage");
 }
 
-static void SomeUsedName(fc)
-    FontCreatorWidget fc;
+static void SomeUsedName(FontCreatorWidget fc)
 {
     PutUpDialog(fc, "someUsedNameMessage");
 }
 
-static void NoSuchName(fc)
-    FontCreatorWidget fc;
+static void NoSuchName(FontCreatorWidget fc)
 {
     PutUpDialog(fc, "noSuchNameMessage");
 }
 
-static Boolean DoAdd(fc, f, name)
-    FontCreatorWidget fc;
-    FontRec *f;
-    String name;
+static Boolean DoAdd(FontCreatorWidget fc, FontRec *f, String name)
 {
     char *spaceName;
     BlendRec *b, *newb, **last;
@@ -699,9 +683,9 @@
 
 /* ARGSUSED */
 
-static void AddCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void AddCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
     char *value;
@@ -731,10 +715,7 @@
     } else if (DoAdd(fc, fc->creator.font, value)) UsedName(fc);
 }
 
-static Boolean DoReplace(fc, f, name)
-    FontCreatorWidget fc;
-    FontRec *f;
-    String name;
+static Boolean DoReplace(FontCreatorWidget fc, FontRec *f, String name)
 {
     BlendDataRec *bd = f->blend_data;
     BlendRec *b;
@@ -760,9 +741,9 @@
 
 /* ARGSUSED */
 
-static void ReplaceCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ReplaceCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
     char *value;
@@ -792,10 +773,7 @@
     } else if (DoReplace(fc, fc->creator.font, value)) NoSuchName(fc);
 }
 
-static Boolean DoDelete(fc, f, name)
-    FontCreatorWidget fc;
-    FontRec *f;
-    String name;
+static Boolean DoDelete(FontCreatorWidget fc, FontRec *f, String name)
 {
     BlendDataRec *bd = f->blend_data;
     BlendRec *b, *oldb;
@@ -823,9 +801,9 @@
 
 /* ARGSUSED */
 
-static void DeleteCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void DeleteCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
     char *value;
@@ -851,9 +829,9 @@
 
 /* ARGSUSED */
 
-static void UnmanageOptions(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void UnmanageOptions(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
 
@@ -862,9 +840,9 @@
 
 /* ARGSUSED */
 
-static void ShowOptions(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ShowOptions(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
 
@@ -873,9 +851,9 @@
 
 /* ARGSUSED */
 
-static void GenerateCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void GenerateCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
     BlendDataRec *bd = fc->creator.font->blend_data;
@@ -902,9 +880,9 @@
 
 /* ARGSUSED */
 
-static void DismissCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void DismissCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
 
@@ -914,9 +892,9 @@
 
 /* ARGSUSED */
 
-static void SizeChanged(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SizeChanged(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     String value;
     FontCreatorWidget fc = (FontCreatorWidget) clientData;
@@ -963,9 +941,9 @@
 
 /* ARGSUSED */
 
-static void SizeSelect(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SizeSelect(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     String value;
     Widget option;
@@ -988,9 +966,9 @@
 
 /* ARGSUSED */
 
-static void TextVerify(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void TextVerify(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     XmTextVerifyPtr v = (XmTextVerifyPtr) callData;
     char ch, *cp;
@@ -1028,9 +1006,9 @@
 
 /* ARGSUSED */
 
-static void SetSize(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SetSize(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     char buf[20];
     char *ch;
@@ -1046,10 +1024,7 @@
 
 /* This makes sure the selected item is visible */
 
-static void ListSelectPos(w, pos, notify)
-    Widget w;
-    int pos;
-    Boolean notify;
+static void ListSelectPos(Widget w, int pos, Boolean notify)
 {
     int topPos, items, visible;
 
@@ -1067,9 +1042,9 @@
     XtVaSetValues(w, XmNtopItemPosition, topPos, NULL);
 }
 
-static void CreateSizeMenu(fc, destroyOldChildren)
-    FontCreatorWidget fc;
-    Boolean destroyOldChildren;
+static void CreateSizeMenu(
+    FontCreatorWidget fc,
+    Boolean destroyOldChildren)
 {
     Arg args[20];
     int i, j;
@@ -1085,7 +1060,7 @@
 		      XtNnumChildren, &num_children, NULL);
 	
 	/* Don't destroy first child ("other") */
-	for (j = 1; j < num_children; j++) XtDestroyWidget(children[j]);
+	for (j = 1; (Cardinal)j < num_children; j++) XtDestroyWidget(children[j]);
 
 	sizes = (Widget *) XtMalloc((fc->creator.size_count+1) *
 				    sizeof(Widget));
@@ -1117,8 +1092,7 @@
     XtFree((char *) sizes);
 }
 
-static void CreateChildren(fc)
-    FontCreatorWidget fc;
+static void CreateChildren(FontCreatorWidget fc)
 {
     Arg args[20];
     int i, j;
@@ -1419,10 +1393,10 @@
 
 /* ARGSUSED */
 
-static void Initialize(request, new, args, num_args)
-    Widget request, new;
-    ArgList args;
-    Cardinal *num_args;
+static void Initialize(
+    Widget request, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     FontCreatorWidget fc = (FontCreatorWidget) new;
 
@@ -1468,11 +1442,9 @@
 		  XmNvalueChangedCallback, SizeChanged, (XtPointer) fc);
 }
 
-static void SelectBlend(fc, cur_b)
-    FontCreatorWidget fc;
-    BlendRec *cur_b;
+static void SelectBlend(FontCreatorWidget fc, BlendRec *cur_b)
 {
-    int i, cur;
+    int i, cur = 0;
     BlendRec *b;
     int *selectList, selectCount;
 
@@ -1495,9 +1467,7 @@
     HandleSelectedBlend(fc, cur);
 }
 
-void _FSBSetCreatorFamily(w, ff)
-    Widget w;
-    FontFamilyRec *ff;
+void _FSBSetCreatorFamily(Widget w, FontFamilyRec *ff)
 {
     FontCreatorWidget fc = (FontCreatorWidget) w;
     int i, count = 0, cur = 1;
@@ -1555,8 +1525,7 @@
     DrawMM(fc);
 }
     
-static void Destroy(widget)
-    Widget widget;
+static void Destroy(Widget widget)
 {
     FontCreatorWidget fc = (FontCreatorWidget) widget;
 
@@ -1566,8 +1535,7 @@
     }
 }
 
-static void Resize(widget)
-    Widget widget;
+static void Resize(Widget widget)
 {
     FontCreatorWidget fc = (FontCreatorWidget) widget;
 
@@ -1576,10 +1544,10 @@
 
 /* ARGSUSED */
 
-static Boolean SetValues(old, req, new, args, num_args)
-    Widget old, req, new;
-    ArgList args;
-    Cardinal *num_args;
+static Boolean SetValues(
+    Widget old, Widget req, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     FontCreatorWidget oldfc = (FontCreatorWidget) old;
     FontCreatorWidget newfc = (FontCreatorWidget) new;
@@ -1613,9 +1581,9 @@
 
 /* ARGSUSED */
 
-static XtGeometryResult GeometryManager(w, desired, allowed)
-    Widget w;
-    XtWidgetGeometry *desired, *allowed;
+static XtGeometryResult GeometryManager(
+    Widget w,
+    XtWidgetGeometry *desired, XtWidgetGeometry *allowed)
 {
 #define WANTS(flag) (desired->request_mode & flag)
 
@@ -1633,8 +1601,7 @@
 #undef WANTS
 }
 
-static void ChangeManaged(w)
-    Widget w;
+static void ChangeManaged(Widget w)
 {
     FontCreatorWidget fc = (FontCreatorWidget) w;
 
Index: xc/lib/dpstk/FontSB.c
diff -u xc/lib/dpstk/FontSB.c:1.1 xc/lib/dpstk/FontSB.c:1.2
--- xc/lib/dpstk/FontSB.c:1.1	Sat Feb 12 16:13:33 2000
+++ xc/lib/dpstk/FontSB.c	Wed Jun  7 15:02:59 2000
@@ -35,8 +35,10 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/FontSB.c,v 1.2 2000/06/07 22:02:59 tsi Exp $ */
 
 #include <stdlib.h>
+#include <unistd.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <math.h>
@@ -66,14 +68,14 @@
 #include <Xm/MessageB.h>
 #include <DPS/dpsXclient.h>
 #include "dpsXcommonI.h"
-#include "DPS/dpsXcommon.h"
-#include "DPS/dpsXshare.h"
+#include <DPS/dpsXcommon.h>
+#include <DPS/dpsXshare.h>
 #include <DPS/PSres.h>
-#include "DPS/FontSBP.h"
+#include <DPS/FontSBP.h>
 #include "FSBwraps.h"
 #include "FontSBI.h"
-#include "DPS/FontSample.h"
-#include "DPS/FontCreato.h"
+#include <DPS/FontSample.h>
+#include <DPS/FontCreato.h>
 #include <pwd.h>
 
 #define PATH_BUF_SIZE 1024
@@ -241,20 +243,40 @@
 
 /* Forward declarations */
 
-static void ClassInitialize(), ClassPartInitialize(), Initialize(), Destroy(),
-	ChangeManaged(), Resize(),
-	SetFontName(), SetFontFamilyFace(), SetFontSize(), RefreshFontList(),
-	GetFamilyList(), GetFaceList(), UndefUnusedFonts(),
-	FontNameToFamilyFace(), FontFamilyFaceToName(),
-	GetTextDimensions(), WriteBlends(), ReadBlends(),
-	SetFontFamilyFaceBlend(), FontNameToFamilyFaceBlend(),
-	FontFamilyFaceBlendToName(), GetBlendList(),
-	GetBlendInfo(), FreeFontRec(), DisplayFontFamilies(),
-	SetUpCurrentSelections();
-static Boolean SetValues(), DownloadFontName(), MatchFontFace(),
-	Verify(), ChangeBlends();
-static XtGeometryResult GeometryManager();
-static String FindAFM(), FindFontFile();
+static Boolean ChangeBlends(Widget w, String base_name, String blend_name, FSBBlendAction action, int *axis_values, float *axis_percents);
+static Boolean DownloadFontName(Widget w, String name);
+static Boolean MatchFontFace(Widget w, String old_face, String new_family, String *new_face);
+static Boolean SetValues(Widget old, Widget req, Widget new, ArgList args, Cardinal *num_args);
+static Boolean Verify(FontSelectionBoxWidget fsb, FSBValidateCallbackRec *cb, String afm, Boolean doIt);
+static String FindAFM(Widget w, String name);
+static String FindFontFile(Widget w, String name);
+static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *desired, XtWidgetGeometry *allowed);
+static void ChangeManaged(Widget w);
+static void ClassInitialize(void);
+static void ClassPartInitialize(WidgetClass widget_class);
+static void Destroy(Widget widget);
+static void DisplayFontFamilies(FontSelectionBoxWidget fsb);
+static void FontFamilyFaceBlendToName(Widget w, String family, String face, String blend, String *font_name);
+static void FontFamilyFaceToName(Widget w, String family, String face, String *font_name);
+static void FontNameToFamilyFace(Widget w, String font_name, String *family, String *face);
+static void FontNameToFamilyFaceBlend(Widget w, String font_name, String *family, String *face, String *blend);
+static void FreeFontRec(FontRec *f);
+static void GetBlendInfo(Widget w, String name, int *num_axes_return, int *num_designs_return, String **axis_names_return, float **blend_positions_return, int **blend_map_count_return, int **blend_design_coords_return, float **blend_normalized_coords_return);
+static void GetBlendList(Widget w, String name, int *count_return, String **blend_return, String **font_name_return, float **axis_values_return);
+static void GetFaceList(Widget w, String family, int *count, String **face_list, String **font_list);
+static void GetFamilyList(Widget w, int *count, String **list);
+static void GetTextDimensions(Widget w, String text, String font, double size, double x, double y, float *dx, float *dy, float *left, float *right, float *top, float *bottom);
+static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args);
+static void ReadBlends(FontSelectionBoxWidget fsb);
+static void RefreshFontList(Widget w);
+static void Resize(Widget widget);
+static void SetFontFamilyFace(Widget w, String family, String face, Bool family_multiple, Bool face_multiple);
+static void SetFontFamilyFaceBlend(Widget w, String family, String face, String blend, Bool family_multiple, Bool face_multiple);
+static void SetFontName(Widget w, String name, Bool name_multiple);
+static void SetFontSize(Widget w, double size, Bool size_multiple);
+static void SetUpCurrentSelections(FontSelectionBoxWidget fsb);
+static void UndefUnusedFonts(Widget w);
+static void WriteBlends(FontSelectionBoxWidget fsb);
 
 FontSelectionBoxClassRec fontSelectionBoxClassRec = {
     /* Core class part */
@@ -351,12 +373,13 @@
 
 /* ARGSUSED */
 
-static Boolean CvtStringToFloatList(dpy, args, num_args, from, to, data)
-    Display *dpy;
-    XrmValuePtr args;
-    Cardinal *num_args;
-    XrmValuePtr from, to;
-    XtPointer *data;
+static Boolean CvtStringToFloatList(
+    Display *dpy,
+    XrmValuePtr args,
+    Cardinal *num_args,
+    XrmValuePtr from,
+    XrmValuePtr to,
+    XtPointer *data)
 {
     register int i, count = 1;
     register char *ch, *start = from->addr;
@@ -403,12 +426,12 @@
 
 /* ARGSUSED */
 
-static void FloatListDestructor(app, to, converter_data, args, num_args)
-    XtAppContext app;
-    XrmValuePtr to;
-    XtPointer converter_data;
-    XrmValuePtr args;
-    Cardinal *num_args;
+static void FloatListDestructor(
+    XtAppContext app,
+    XrmValuePtr to,
+    XtPointer converter_data,
+    XrmValuePtr args,
+    Cardinal *num_args)
 {
     float *list = (float *) to->addr;
 
@@ -416,9 +439,7 @@
     XtFree((XtPointer) list);
 }
 
-XmString _FSBCreateSharedCS(str, w)
-    String str;
-    Widget w;
+XmString _FSBCreateSharedCS(String str, Widget w)
 {
     XrmValue src, dst;
     XmString result;
@@ -434,10 +455,7 @@
     } else return NULL;
 }
  
-static Boolean ScanFloat(src, f, past)
-    char *src;
-    float *f;
-    char **past;
+static Boolean ScanFloat(char *src, float *f, char **past)
 {
     char buf[20], *ch;
     int countDecimals;
@@ -458,10 +476,7 @@
     return True;
 }
 
-static Boolean ScanInt(src, i, past)
-    char *src;
-    int *i;
-    char **past;
+static Boolean ScanInt(char *src, int *i, char **past)
 {
     char buf[20], *ch;
 
@@ -474,7 +489,7 @@
     return True;
 }
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
     /* Register a converter for string to int list */
 
@@ -485,8 +500,7 @@
     CSempty = UnsharedCS("");
 }
 
-static void ClassPartInitialize(widget_class)
-    WidgetClass widget_class;
+static void ClassPartInitialize(WidgetClass widget_class)
 {
     register FontSelectionBoxWidgetClass wc =
 	    (FontSelectionBoxWidgetClass) widget_class;
@@ -590,10 +604,9 @@
 
 /* I wish we didn't have to do this! */
 
-static void MungeFontNames(name, family, fullname, weight,
-			   familyReturn, fullnameReturn, faceReturn)
-    String name, family, fullname, weight;
-    String *familyReturn, *fullnameReturn, *faceReturn;
+static void MungeFontNames(
+    String name, String family, String fullname, String weight,
+    String *familyReturn, String *fullnameReturn, String *faceReturn)
 {
     register char *src, *dst, prev;
     char buf[256];
@@ -785,8 +798,7 @@
 
 #define STEMPELINDEX 7
 
-static Boolean CreateSortKey(family, key)
-    register String family, key;
+static Boolean CreateSortKey(String family, String key)
 {
     char newkey[256];
     int len = strlen(family);
@@ -822,8 +834,7 @@
 
 #define SKIP_SPACE(buf) while (*buf == ' ' || *buf == '\t') buf++;
 
-static int CountAxes(buf)
-    char *buf;
+static int CountAxes(char *buf)
 {
     int count = 0;
 
@@ -838,10 +849,10 @@
     return count;
 }
 
-static Boolean ParseBlendPositions(buf, blendPos, axes, designs)
-    char *buf;
-    float *blendPos;
-    int *axes, *designs;
+static Boolean ParseBlendPositions(
+    char *buf,
+    float *blendPos,
+    int *axes, int *designs)
 {
     int i, j = 0;
     float f;
@@ -865,13 +876,12 @@
     return False;
 }
 
-static Boolean ParseBlendMap(buf, breakCount, blendBreak,
-			     blendBreakValue, axes)
-    char *buf;
-    int *breakCount;
-    int *blendBreak;
-    float *blendBreakValue;
-    int *axes;
+static Boolean ParseBlendMap(
+    char *buf,
+    int *breakCount,
+    int *blendBreak,
+    float *blendBreakValue,
+    int *axes)
 {
     int i, j = 0;
     int n;
@@ -917,10 +927,10 @@
     return False;
 }
 
-static Boolean ParseAxisNames(axes, buf, names)
-    int axes;
-    char *buf;
-    char *names[];
+static Boolean ParseAxisNames(
+    int axes,
+    char *buf,
+    char *names[])
 {
     int i = 0;
 
@@ -940,15 +950,16 @@
 }	
 #undef SKIP_SPACE
 
-static void GetPSFontInfo(fsb, name, axes, designs, axisNames,
-			  blendPos, breakCount,
-			  blendBreak, blendBreakValue)
-    FontSelectionBoxWidget fsb;
-    char *name;
-    int *axes, *designs;
-    char *axisNames;
-    int *breakCount, *blendBreak;
-    float *blendBreakValue, *blendPos;
+static void GetPSFontInfo(
+    FontSelectionBoxWidget fsb,
+    char *name,
+    int *axes,
+    int *designs,
+    char *axisNames,
+    float *blendPos,
+    int *breakCount,
+    int *blendBreak,
+    float *blendBreakValue)
 {
     int entries;
     char **names, **data;
@@ -993,12 +1004,11 @@
     }
 }
 
-static void AddFontRecord(fsb, serverNum, name, family,
-			  fullname, weight, resident)
-    FontSelectionBoxWidget fsb;
-    int serverNum;
-    String name, family, fullname, weight;
-    Boolean resident;
+static void AddFontRecord(
+    FontSelectionBoxWidget fsb,
+    int serverNum,
+    String name, String family, String fullname, String weight,
+    Boolean resident)
 {
     FontFamilyRec *ff;
     FontRec *f;
@@ -1143,8 +1153,7 @@
     ff->font_count++;
 }
 
-static void SortFontNames(ff)
-    FontFamilyRec *ff;
+static void SortFontNames(FontFamilyRec *ff)
 {
     FontRec *f, *highest, **prev, **highestPrev;
     FontRec *newFontList = NULL;
@@ -1168,8 +1177,7 @@
     ff->fonts = newFontList;
 }
 
-static void SortFontFamilies(fsb)
-    FontSelectionBoxWidget fsb;
+static void SortFontFamilies(FontSelectionBoxWidget fsb)
 {
     FontFamilyRec *ff, *highest, **prev, **highestPrev;
     FontFamilyRec *newFamilyList = NULL;
@@ -1196,9 +1204,9 @@
     fsb->fsb.known_families = newFamilyList;
 }
 
-static void AddFamily(fsb, family, fonts, weight, fullname, name)
-    FontSelectionBoxWidget fsb;
-    char *family, *fonts, *weight, *fullname, *name;
+static void AddFamily(
+    FontSelectionBoxWidget fsb,
+    char *family, char *fonts, char *weight, char *fullname, char *name)
 {
     int j;
     char *ch;
@@ -1236,8 +1244,7 @@
     }
 }
 
-static void GetFontNames(fsb)
-    FontSelectionBoxWidget fsb;
+static void GetFontNames(FontSelectionBoxWidget fsb)
 {
     int i;
     char name[256], family[256], fullname[256], weight[256];
@@ -1280,20 +1287,17 @@
     ReadBlends(fsb);
 }
 
-static void SensitizeReset(fsb)
-    FontSelectionBoxWidget fsb;
+static void SensitizeReset(FontSelectionBoxWidget fsb)
 {
     XtSetSensitive(fsb->fsb.reset_button_child, True);
 }
 
-static void DesensitizeReset(fsb)
-    FontSelectionBoxWidget fsb;
+static void DesensitizeReset(FontSelectionBoxWidget fsb)
 {
     XtSetSensitive(fsb->fsb.reset_button_child, False);
 }
 
-static void ManageFamilyMultiple(fsb)
-    FontSelectionBoxWidget fsb;
+static void ManageFamilyMultiple(FontSelectionBoxWidget fsb)
 {
     XtManageChild(fsb->fsb.family_multiple_label_child);
 
@@ -1301,8 +1305,7 @@
 		  XmNtopWidget, fsb->fsb.family_multiple_label_child, NULL);
 }
 
-static void ManageFaceMultiple(fsb)
-    FontSelectionBoxWidget fsb;
+static void ManageFaceMultiple(FontSelectionBoxWidget fsb)
 {
     XtManageChild(fsb->fsb.face_multiple_label_child);
 
@@ -1310,8 +1313,7 @@
 		  XmNtopWidget, fsb->fsb.face_multiple_label_child, NULL);
 }
 
-static void ManageMultipleMaster(fsb)
-    FontSelectionBoxWidget fsb;
+static void ManageMultipleMaster(FontSelectionBoxWidget fsb)
 {
     XtManageChild(fsb->fsb.multiple_master_button_child);
 
@@ -1320,14 +1322,12 @@
 		  NULL);
 }
 
-static void ManageSizeMultiple(fsb)
-    FontSelectionBoxWidget fsb;
+static void ManageSizeMultiple(FontSelectionBoxWidget fsb)
 {
     XtManageChild(fsb->fsb.size_multiple_label_child);
 }
 
-static void UnmanageFamilyMultiple(fsb)
-    FontSelectionBoxWidget fsb;
+static void UnmanageFamilyMultiple(FontSelectionBoxWidget fsb)
 {
     XtVaSetValues(XtParent(fsb->fsb.family_scrolled_list_child),
 		  XmNtopWidget, fsb->fsb.family_label_child, NULL);
@@ -1335,8 +1335,7 @@
     XtUnmanageChild(fsb->fsb.family_multiple_label_child);
 }
 
-static void UnmanageFaceMultiple(fsb)
-    FontSelectionBoxWidget fsb;
+static void UnmanageFaceMultiple(FontSelectionBoxWidget fsb)
 {
     XtVaSetValues(XtParent(fsb->fsb.face_scrolled_list_child),
 		  XmNtopWidget, fsb->fsb.face_label_child, NULL);
@@ -1344,8 +1343,7 @@
     XtUnmanageChild(fsb->fsb.face_multiple_label_child);
 }
 
-static void UnmanageMultipleMaster(fsb)
-    FontSelectionBoxWidget fsb;
+static void UnmanageMultipleMaster(FontSelectionBoxWidget fsb)
 {
     XtUnmanageChild(fsb->fsb.multiple_master_button_child);
 
@@ -1353,19 +1351,18 @@
 		  XmNbottomWidget, fsb->fsb.size_text_field_child, NULL);
 }
 
-static void UnmanageSizeMultiple(fsb)
-    FontSelectionBoxWidget fsb;
+static void UnmanageSizeMultiple(FontSelectionBoxWidget fsb)
 {
     XtUnmanageChild(fsb->fsb.size_multiple_label_child);
 }
 
 /* Callbacks for subwidgets */
 
-static Boolean DownloadFont(fsb, name, ctxt, make_shared)
-    FontSelectionBoxWidget fsb;
-    String name;
-    DPSContext ctxt;
-    Boolean make_shared;
+static Boolean DownloadFont(
+    FontSelectionBoxWidget fsb,
+    String name,
+    DPSContext ctxt,
+    Boolean make_shared)
 {
     int count;
     char **names, **files;
@@ -1423,14 +1420,15 @@
 #undef BUFLEN
 }
 
-static void UndefSomeUnusedFonts(fsb, all)
-    FontSelectionBoxWidget fsb;
-    Boolean all;
+static void UndefSomeUnusedFonts(
+    FontSelectionBoxWidget fsb,
+    Boolean all)
 {
     FontRec *f, *nextf, **start;
     int i;
 
-    if (!all && fsb->fsb.pending_delete_count < fsb->fsb.max_pending_deletes) {
+    if (!all
+     && (Cardinal)fsb->fsb.pending_delete_count < fsb->fsb.max_pending_deletes) {
 	return;
     }
 
@@ -1438,7 +1436,7 @@
     else {
 	/* Skip to the end of the ones we're keeping */
 	f = fsb->fsb.pending_delete_font;
-	for (i = 1; f != NULL && i < fsb->fsb.max_pending_deletes; i++) {
+	for (i = 1; f != NULL && (Cardinal)i < fsb->fsb.max_pending_deletes; i++) {
 	    f = f->pending_delete_next;
 	}
 	if (f == NULL) return;
@@ -1462,17 +1460,16 @@
     }
 }
 
-static void UndefUnusedFonts(w)
-    Widget w;
+static void UndefUnusedFonts(Widget w)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
 
     UndefSomeUnusedFonts(fsb, True);
 }
 
-Boolean _FSBDownloadFontIfNecessary(f, fsb)
-    FontRec *f;
-    FontSelectionBoxWidget fsb;
+Boolean _FSBDownloadFontIfNecessary(
+    FontRec *f,
+    FontSelectionBoxWidget fsb)
 {
     Boolean shared;
 
@@ -1505,9 +1502,9 @@
     return True;
 }
 
-static void DoPreview(fsb, override)
-    FontSelectionBoxWidget fsb;
-    Boolean override;
+static void DoPreview(
+    FontSelectionBoxWidget fsb,
+    Boolean override)
 {
     int i, n;
     int *selectList, selectCount;
@@ -1606,8 +1603,7 @@
     }
 }
 
-static void DoValueChangedCallback(fsb)
-    FontSelectionBoxWidget fsb;
+static void DoValueChangedCallback(FontSelectionBoxWidget fsb)
 {
     String afm = NULL;
     FSBValidateCallbackRec cb;
@@ -1624,8 +1620,7 @@
     XtCallCallbackList((Widget) fsb, fsb->fsb.value_changed_callback, &cb);
 }
 
-static void ValueChanged(fsb)
-    FontSelectionBoxWidget fsb;
+static void ValueChanged(FontSelectionBoxWidget fsb)
 {
     if (fsb->fsb.auto_preview) DoPreview(fsb, False);
     DoValueChangedCallback(fsb);
@@ -1633,9 +1628,9 @@
 
 /* ARGSUSED */
 
-static void PreviewText(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void PreviewText(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
     XmAnyCallbackStruct *cb = (XmAnyCallbackStruct *) callData;
@@ -1657,9 +1652,9 @@
 
 /* ARGSUSED */
 
-static void PreviewCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void PreviewCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
@@ -1668,17 +1663,16 @@
 
 /* ARGSUSED */
 
-static void DismissSamplerCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void DismissSamplerCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
     fsb->fsb.show_sampler = False;
 }
 
-static void ShowSampler(fsb)
-    FontSelectionBoxWidget fsb;
+static void ShowSampler(FontSelectionBoxWidget fsb)
 {
     int i;
     Arg args[2];
@@ -1714,8 +1708,7 @@
     fsb->fsb.show_sampler = True;
 }
 
-static void ShowCreator(fsb)
-    FontSelectionBoxWidget fsb;
+static void ShowCreator(FontSelectionBoxWidget fsb)
 {
     int i;
     Arg args[2];
@@ -1752,9 +1745,9 @@
 
 /* ARGSUSED */
 
-static void ShowCreatorCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ShowCreatorCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
@@ -1763,9 +1756,9 @@
 
 /* ARGSUSED */
 
-static void ShowSamplerCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ShowSamplerCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
@@ -1774,9 +1767,9 @@
 
 /* ARGSUSED */
 
-static void PreviewDoubleClick(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void PreviewDoubleClick(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
@@ -1785,9 +1778,9 @@
 
 /* ARGSUSED */
 
-static void ResizePreview(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ResizePreview(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     Dimension height;
     Cardinal depth;
@@ -1810,10 +1803,10 @@
     XDPSUpdateContextGState(fsb->fsb.context, fsb->fsb.gstate);
 }
 
-static String FindAFMRecursive(w, name, recur)
-    Widget w;
-    String name;
-    Boolean recur;
+static String FindAFMRecursive(
+    Widget w,
+    String name,
+    Boolean recur)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     int count;
@@ -1844,17 +1837,15 @@
     return ret;
 }
 
-static String FindAFM(w, name)
-    Widget w;
-    String name;
+static String FindAFM(Widget w, String name)
 {
     return FindAFMRecursive(w, name, True);
 }
 
-static String FindFontFileRecursive(w, name, recur)
-    Widget w;
-    String name;
-    Boolean recur;
+static String FindFontFileRecursive(
+    Widget w,
+    String name,
+    Boolean recur)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     int count;
@@ -1885,18 +1876,16 @@
     return ret;
 }
 
-static String FindFontFile(w, name)
-    Widget w;
-    String name;
+static String FindFontFile(Widget w, String name)
 {
     return FindFontFileRecursive(w, name, True);
 }
 
-static Boolean Verify(fsb, cb, afm, doIt)
-    FontSelectionBoxWidget fsb;
-    FSBValidateCallbackRec *cb;
-    String afm;
-    Boolean doIt;
+static Boolean Verify(
+    FontSelectionBoxWidget fsb,
+    FSBValidateCallbackRec *cb,
+    String afm,
+    Boolean doIt)
 {
     char *chSize;
     int i;
@@ -1971,10 +1960,10 @@
     return cb->doit;
 }
 
-static Boolean VerifyAndCallback(fsb, reason, callback)
-    FontSelectionBoxWidget fsb;
-    FSBCallbackReason reason;
-    XtCallbackList callback;
+static Boolean VerifyAndCallback(
+    FontSelectionBoxWidget fsb,
+    FSBCallbackReason reason,
+    XtCallbackList callback)
 {
     String afm = NULL;
     FSBValidateCallbackRec cb;
@@ -2025,7 +2014,7 @@
 	if (fsb->fsb.make_fonts_shared) {
 	    fsb->fsb.currently_previewed = NULL;
 	}
-	UndefUnusedFonts(fsb);
+	UndefUnusedFonts((Widget)fsb);
 	fsb->fsb.currently_previewed = fsave;
 	face = fsb->fsb.currently_selected_face;
 	if (face != NULL && !face->resident) {
@@ -2046,9 +2035,9 @@
 
 /* ARGSUSED */
 
-static void OKCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void OKCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
@@ -2061,9 +2050,9 @@
 
 /* ARGSUSED */
 
-static void ApplyCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ApplyCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
@@ -2072,9 +2061,9 @@
     DesensitizeReset(fsb);
 }
 
-static void ResetFSB(fsb, reason)
-    FontSelectionBoxWidget fsb;
-    FSBCallbackReason reason;
+static void ResetFSB(
+    FontSelectionBoxWidget fsb,
+    FSBCallbackReason reason)
 {
     FSBCallbackRec cb;
     int i;
@@ -2082,7 +2071,7 @@
     fsb->fsb.currently_previewed = NULL;
     fsb->fsb.currently_previewed_size = fsb->fsb.currently_selected_size = 0.0;
     SetUpCurrentSelections(fsb);
-    if (fsb->fsb.undef_unused_fonts) UndefUnusedFonts(fsb);
+    if (fsb->fsb.undef_unused_fonts) UndefUnusedFonts((Widget)fsb);
 
     cb.reason = reason;
     if (fsb->fsb.font_family_multiple) {
@@ -2148,9 +2137,9 @@
 
 /* ARGSUSED */
 
-static void ResetCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ResetCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
@@ -2160,9 +2149,9 @@
 
 /* ARGSUSED */
 
-static void CancelCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void CancelCallback(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
 
@@ -2183,9 +2172,9 @@
 
 /* ARGSUSED */
 
-static void SizeSelect(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SizeSelect(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     String value;
     Widget option;
@@ -2219,9 +2208,9 @@
 
 /* ARGSUSED */
 
-static void TextVerify(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void TextVerify(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     int i;
     XmTextVerifyPtr v = (XmTextVerifyPtr) callData;
@@ -2270,9 +2259,9 @@
 
 /* ARGSUSED */
 
-static void SetSize(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SetSize(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     char buf[20];
     char *ch;
@@ -2296,10 +2285,10 @@
 
 /* This makes sure the selected item is visible */
 
-static void ListSelectPos(w, pos, notify)
-    Widget w;
-    int pos;
-    Boolean notify;
+static void ListSelectPos(
+    Widget w,
+    int pos,
+    Boolean notify)
 {
     int topPos, items, visible;
 
@@ -2320,8 +2309,7 @@
 Corporation, Maynard, Massachusetts, and the Massachusetts Institute of
 Technology, Cambridge, Massachusetts. */
 
-static String GetRootDirName(buf)
-     String buf;
+static String GetRootDirName(String buf)
 {
 #ifndef X_NOT_POSIX
      uid_t uid;
@@ -2360,11 +2348,11 @@
      return buf;
 }
 
-static void WriteBlendLine(f, family, face, blend, name, axes, p)
-    FILE *f;
-    String family, face, blend, name;
-    int axes;
-    float *p;
+static void WriteBlendLine(
+    FILE *f,
+    String family, String face, String blend, String name,
+    int axes,
+    float *p)
 {
     register char *ch;
     int i;
@@ -2396,8 +2384,7 @@
     (void) putc('\n', f);
 }
 
-static void WriteBlends(fsb)
-    FontSelectionBoxWidget fsb;
+static void WriteBlends(FontSelectionBoxWidget fsb)
 {
     FontFamilyRec *ff;
     FontRec *f;
@@ -2437,9 +2424,9 @@
     fsb->fsb.blends_changed = False;
 }
 
-static Boolean ParseBlendLine(buf, family, face, blend, name, p)
-    String buf, family, face, blend, name;
-    float *p;
+static Boolean ParseBlendLine(
+    String buf, String family, String face, String blend, String name,
+    float *p)
 {
     char *src, *dst;
     int i;
@@ -2492,8 +2479,7 @@
     return True;
 }
 
-static void ReadBlends(fsb)
-    FontSelectionBoxWidget fsb;
+static void ReadBlends(FontSelectionBoxWidget fsb)
 {
     String blendEnv;
     char homeDir[PATH_BUF_SIZE];
@@ -2504,7 +2490,7 @@
     char *cfamily, *cface;
     float p[MAX_AXES];
     FontRec *f;
-    FontFamilyRec *ff;
+    FontFamilyRec *ff = 0;
     BlendRec *b, *newb, **lastb;
     char *spaceBlend;	    
     char *lastFamily = NULL;
@@ -2574,9 +2560,9 @@
     }
 }
 
-static void SetUpFaceList(fsb, ff)
-    FontSelectionBoxWidget fsb;
-    FontFamilyRec *ff;
+static void SetUpFaceList(
+    FontSelectionBoxWidget fsb,
+    FontFamilyRec *ff)
 {
     FontRec *f;
     BlendRec *b;
@@ -2614,18 +2600,18 @@
 
 /* ARGSUSED */
 
-static void DeleteMessage(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void DeleteMessage(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     XtDestroyWidget(widget);
 }
 
-static void FlushFont(fsb, font)
-    FontSelectionBoxWidget fsb;
-    FontRec *font;
+static void FlushFont(
+    FontSelectionBoxWidget fsb,
+    FontRec *font)
 {
-    FontRec *f, *f1;
+    FontRec *f = 0, *f1;
     FontFamilyRec *ff, *ff1;
     Boolean previewedFamily = False;
 
@@ -2693,17 +2679,17 @@
     }
 }
 
-extern void _FSBFlushFont(fsb, font)
-    FontSelectionBoxWidget fsb;
-    FontRec *font;
+void _FSBFlushFont(
+    FontSelectionBoxWidget fsb,
+    FontRec *font)
 {
     if (font == fsb->fsb.currently_previewed) _FSBBogusFont(fsb, font);
     else FlushFont(fsb, font);
 }
 
-extern void _FSBBogusFont(fsb, font)
-    FontSelectionBoxWidget fsb;
-    FontRec *font;
+void _FSBBogusFont(
+    FontSelectionBoxWidget fsb,
+    FontRec *font)
 {
     Widget message, w;
 
@@ -2721,9 +2707,9 @@
     FlushFont(fsb, font);
 }
 
-void _FSBSetUpFaceList(fsb, redisplay)
-    FontSelectionBoxWidget fsb;
-    Bool redisplay;
+void _FSBSetUpFaceList(
+    FontSelectionBoxWidget fsb,
+    Bool redisplay)
 {
     FontRec *f;
     BlendRec *b;
@@ -2774,9 +2760,9 @@
 
 static String extraNormalFaces[] = {"Demi", "Semibold", NULL};
 
-static int MatchFaceName(rec, gaveUp)
-    FSBFaceSelectCallbackRec *rec;
-    Boolean *gaveUp;
+static int MatchFaceName(
+    FSBFaceSelectCallbackRec *rec,
+    Boolean *gaveUp)
 {
     int i, j, k, face;
 #define PIECEMAX 10
@@ -2955,9 +2941,9 @@
     return 0;
 }
 
-static void GetInitialFace(fsb, ff)
-    FontSelectionBoxWidget fsb;
-    FontFamilyRec *ff;
+static void GetInitialFace(
+    FontSelectionBoxWidget fsb,
+    FontFamilyRec *ff)
 {
     FSBFaceSelectCallbackRec rec;
     String *faces;
@@ -3002,9 +2988,9 @@
 
 /* ARGSUSED */
 
-static void FamilySelect(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void FamilySelect(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     XmListCallbackStruct *listCB = (XmListCallbackStruct *) callData;
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
@@ -3029,9 +3015,9 @@
 
 /* ARGSUSED */
 
-static void FaceSelect(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void FaceSelect(
+    Widget widget,
+    XtPointer clientData, XtPointer callData)
 {
     XmListCallbackStruct *listCB = (XmListCallbackStruct *) callData;
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) clientData;
@@ -3068,9 +3054,9 @@
     ValueChanged(fsb);
 }
 
-static void CreateSizeMenu(fsb, destroyOldChildren)
-    FontSelectionBoxWidget fsb;
-    Boolean destroyOldChildren;
+static void CreateSizeMenu(
+    FontSelectionBoxWidget fsb,
+    Boolean destroyOldChildren)
 {
     Arg args[20];
     int i, j;
@@ -3086,7 +3072,7 @@
 		      XtNnumChildren, &num_children, NULL);
 
 	/* Don't destroy first child ("other") */
-	for (j = 1; j < num_children; j++) XtDestroyWidget(children[j]);
+	for (j = 1; (Cardinal)j < num_children; j++) XtDestroyWidget(children[j]);
 
 	sizes = (Widget *) XtMalloc((fsb->fsb.size_count+1) * sizeof(Widget));
 	sizes[0] = children[0];
@@ -3114,8 +3100,7 @@
     XtFree((char *) sizes);
 }
 
-static void CreateChildren(fsb)
-    FontSelectionBoxWidget fsb;
+static void CreateChildren(FontSelectionBoxWidget fsb)
 {
     Arg args[20];
     int i;
@@ -3358,8 +3343,7 @@
     XtSetValues(form, args, i);
 }
 
-static void DisplayFontFamilies(fsb)
-    FontSelectionBoxWidget fsb;
+static void DisplayFontFamilies(FontSelectionBoxWidget fsb)
 {
     FontFamilyRec *ff;
     XmString *CSlist, *str;
@@ -3378,8 +3362,7 @@
     XtFree((char *) CSlist);
 }
 
-static void SetUpCurrentFontFromName(fsb)
-    FontSelectionBoxWidget fsb;
+static void SetUpCurrentFontFromName(FontSelectionBoxWidget fsb)
 {
     FontFamilyRec *ff;
     FontRec *f;
@@ -3466,8 +3449,7 @@
     XmListAddItem(fsb->fsb.face_scrolled_list_child, CSempty, 1);
 }
 
-static void SetUpCurrentFontFromFamilyFace(fsb)
-    FontSelectionBoxWidget fsb;
+static void SetUpCurrentFontFromFamilyFace(FontSelectionBoxWidget fsb)
 {
     FontFamilyRec *ff;
     FontRec *f;
@@ -3560,15 +3542,13 @@
     if (f == NULL && !fsb->fsb.font_face_multiple) GetInitialFace(fsb, ff);
 }
 
-static void SetUpCurrentFont(fsb)
-    FontSelectionBoxWidget fsb;
+static void SetUpCurrentFont(FontSelectionBoxWidget fsb)
 {
     if (fsb->fsb.use_font_name) SetUpCurrentFontFromName(fsb);
     else SetUpCurrentFontFromFamilyFace(fsb);
 }
 
-static void SetUpCurrentSize(fsb)
-    FontSelectionBoxWidget fsb;
+static void SetUpCurrentSize(FontSelectionBoxWidget fsb)
 {
     char buf[20];
 
@@ -3590,8 +3570,7 @@
     changingSize = False;
 }
 
-static void SetUpCurrentSelections(fsb)
-    FontSelectionBoxWidget fsb;
+static void SetUpCurrentSelections(FontSelectionBoxWidget fsb)
 {
     SetUpCurrentFont(fsb);
     SetUpCurrentSize(fsb);
@@ -3601,10 +3580,10 @@
 
 /* ARGSUSED */
 
-static void Initialize(request, new, args, num_args)
-    Widget request, new;
-    ArgList args;
-    Cardinal *num_args;
+static void Initialize(
+    Widget request, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) new;
     Bool inited;
@@ -3704,8 +3683,7 @@
     if (fsb->fsb.show_sampler) ShowSampler(fsb);
 }
 
-static void FreeFontRec(f)
-    FontRec *f;
+static void FreeFontRec(FontRec *f)
 {
     BlendDataRec *bd;
     BlendRec *b, *next_b;
@@ -3724,8 +3702,8 @@
     XtFree(f->full_name);
 }
 
-static void FreeFontLists(fsb)
-    FontSelectionBoxWidget fsb;
+static void FreeFontLists(
+    FontSelectionBoxWidget fsb)
 {
     FontFamilyRec *ff, *next_ff;
     FontRec *f, *next_f;
@@ -3746,8 +3724,7 @@
     fsb->fsb.known_families = NULL;
 }
 
-static void Destroy(widget)
-    Widget widget;
+static void Destroy(Widget widget)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) widget;
 
@@ -3766,8 +3743,7 @@
     FreeFontLists(fsb);
 }
 
-static void Resize(widget)
-    Widget widget;
+static void Resize(Widget widget)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) widget;
 
@@ -3776,10 +3752,10 @@
 
 /* ARGSUSED */
 
-static Boolean SetValues(old, req, new, args, num_args)
-    Widget old, req, new;
-    ArgList args;
-    Cardinal *num_args;
+static Boolean SetValues(
+    Widget old, Widget req, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     FontSelectionBoxWidget oldfsb = (FontSelectionBoxWidget) old;
     FontSelectionBoxWidget newfsb = (FontSelectionBoxWidget) new;
@@ -3878,7 +3854,7 @@
     }	
 
     if (refreshLists) {
-	UndefUnusedFonts(newfsb);
+	UndefUnusedFonts((Widget)newfsb);
 	newfsb->fsb.pending_delete_font = NULL;
 	newfsb->fsb.pending_delete_count = 0;
 	FreeFontLists(newfsb);
@@ -3934,9 +3910,9 @@
 
 /* ARGSUSED */
 
-static XtGeometryResult GeometryManager(w, desired, allowed)
-    Widget w;
-    XtWidgetGeometry *desired, *allowed;
+static XtGeometryResult GeometryManager(
+    Widget w,
+    XtWidgetGeometry *desired, XtWidgetGeometry *allowed)
 {
 #define WANTS(flag) (desired->request_mode & flag)
 
@@ -3954,8 +3930,7 @@
 #undef WANTS
 }
 
-static void ChangeManaged(w)
-    Widget w;
+static void ChangeManaged(Widget w)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
 
@@ -3963,19 +3938,19 @@
     w->core.height = fsb->composite.children[0]->core.height;
 }
 
-static void SetFontName(w, name, name_multiple)
-    Widget w;
-    String name;
-    Bool name_multiple;
+static void SetFontName(
+    Widget w,
+    String name,
+    Bool name_multiple)
 {
     XtVaSetValues(w, XtNfontName, name, XtNuseFontName, True,
 		  XtNfontNameMultiple, name_multiple, NULL);
 }
 
-void FSBSetFontName(w, name, name_multiple)
-    Widget w;
-    String name;
-    Bool name_multiple;
+void FSBSetFontName(
+    Widget w,
+    String name,
+    Bool name_multiple)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -3983,10 +3958,10 @@
 	    (w, name, name_multiple);
 }
 
-static void SetFontFamilyFace(w, family, face, family_multiple, face_multiple)
-    Widget w;
-    String family, face;
-    Bool family_multiple, face_multiple;
+static void SetFontFamilyFace(
+    Widget w,
+    String family, String face,
+    Bool family_multiple, Bool face_multiple)
 {
     XtVaSetValues(w, XtNfontFamily, family, XtNfontFace, face,
 		  XtNuseFontName, False,
@@ -3994,10 +3969,10 @@
 		  XtNfontFaceMultiple, face_multiple, NULL);
 }
 
-void FSBSetFontFamilyFace(w, family, face, family_multiple, face_multiple)
-    Widget w;
-    String family, face;
-    Bool family_multiple, face_multiple;
+void FSBSetFontFamilyFace(
+    Widget w,
+    String family, String face,
+    Bool family_multiple, Bool face_multiple)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4006,10 +3981,10 @@
 	    (w, family, face, family_multiple, face_multiple);
 }
 
-static void SetFontSize(w, size, size_multiple)
-    Widget w;
-    double size;
-    Bool size_multiple;
+static void SetFontSize(
+    Widget w,
+    double size,
+    Bool size_multiple)
 {
     int i;
     Arg args[2];
@@ -4029,10 +4004,10 @@
     XtSetValues(w, args, i);
 }
 
-void FSBSetFontSize(w, size, size_multiple)
-    Widget w;
-    double size;
-    Bool size_multiple;
+void FSBSetFontSize(
+    Widget w,
+    double size,
+    Bool size_multiple)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4040,12 +4015,11 @@
 	    (w, size, size_multiple);
 }
 
-static void RefreshFontList(w)
-    Widget w;
+static void RefreshFontList(Widget w)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
 
-    UndefUnusedFonts(fsb);
+    UndefUnusedFonts((Widget)fsb);
     fsb->fsb.pending_delete_font = NULL;
     fsb->fsb.pending_delete_count = 0;
     FreeFontLists(fsb);
@@ -4055,8 +4029,8 @@
     SetUpCurrentSelections(fsb);
 }
 
-void FSBRefreshFontList(w)
-    Widget w;
+void FSBRefreshFontList(
+    Widget w)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4064,10 +4038,10 @@
        XtClass(w))->fsb_class.refresh_font_list) (w);
 }
 
-static void GetFamilyList(w, count, list)
-    Widget w;
-    int *count;
-    String **list;
+static void GetFamilyList(
+    Widget w,
+    int *count,
+    String **list)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     String *buf;
@@ -4081,10 +4055,10 @@
     }
 }
 
-void FSBGetFamilyList(w, count, list)
-    Widget w;
-    int *count;
-    String **list;
+void FSBGetFamilyList(
+    Widget w,
+    int *count,
+    String **list)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4092,11 +4066,11 @@
        XtClass(w))->fsb_class.get_family_list) (w, count, list);
 }
 
-static void GetFaceList(w, family, count, face_list, font_list)
-    Widget w;
-    String family;
-    int *count;
-    String **face_list, **font_list;
+static void GetFaceList(
+    Widget w,
+    String family,
+    int *count,
+    String **face_list, String **font_list)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     String *buf1, *buf2;
@@ -4124,11 +4098,11 @@
     }
 }
 
-void FSBGetFaceList(w, family, count_return, face_list, font_list)
-    Widget w;
-    String family;
-    int *count_return;
-    String **face_list, **font_list;
+void FSBGetFaceList(
+    Widget w,
+    String family,
+    int *count_return,
+    String **face_list, String **font_list)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4137,8 +4111,8 @@
 					      face_list, font_list);
 }
 
-void FSBUndefineUnusedFonts(w)
-    Widget w;
+void FSBUndefineUnusedFonts(
+    Widget w)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4146,9 +4120,7 @@
        XtClass(w))->fsb_class.undef_unused_fonts) (w);
 }
 
-static Boolean DownloadFontName(w, name)
-    Widget w;
-    String name;
+static Boolean DownloadFontName(Widget w, String name)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     FontFamilyRec *ff;
@@ -4180,9 +4152,9 @@
 			fsb->fsb.make_fonts_shared);
 }
 
-Boolean FSBDownloadFontName(w, name)
-    Widget w;
-    String name;
+Boolean FSBDownloadFontName(
+    Widget w,
+    String name)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4191,10 +4163,10 @@
        XtClass(w))->fsb_class.download_font_name) (w, name);
 }
 
-static Boolean MatchFontFace(w, old_face, new_family, new_face)
-    Widget w;
-    String old_face, new_family;
-    String *new_face;
+static Boolean MatchFontFace(
+    Widget w,
+    String old_face, String new_family,
+    String *new_face)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     FSBFaceSelectCallbackRec rec;
@@ -4229,10 +4201,10 @@
     return !retVal;
 }
 
-Boolean FSBMatchFontFace(w, old_face, new_family, new_face)
-    Widget w;
-    String old_face, new_family;
-    String *new_face;
+Boolean FSBMatchFontFace(
+    Widget w,
+    String old_face, String new_family,
+    String *new_face)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4241,10 +4213,10 @@
 						new_family, new_face);
 }
 
-static void FontNameToFamilyFaceBlend(w, font_name, family, face, blend)
-    Widget w;
-    String font_name;
-    String *family, *face, *blend;
+static void FontNameToFamilyFaceBlend(
+    Widget w,
+    String font_name,
+    String *family, String *face, String *blend)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     FontFamilyRec *ff;
@@ -4278,20 +4250,20 @@
     *blend = NULL;
 }
 
-static void FontNameToFamilyFace(w, font_name, family, face)
-    Widget w;
-    String font_name;
-    String *family, *face;
+static void FontNameToFamilyFace(
+    Widget w,
+    String font_name,
+    String *family, String *face)
 {
     String blend;
 
     FontNameToFamilyFaceBlend(w, font_name, family, face, &blend);
 }
 
-void FSBFontNameToFamilyFace(w, font_name, family, face)
-    Widget w;
-    String font_name;
-    String *family, *face;
+void FSBFontNameToFamilyFace(
+    Widget w,
+    String font_name,
+    String *family, String *face)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4300,10 +4272,10 @@
 							 family, face);
 }
 
-static void FontFamilyFaceBlendToName(w, family, face, blend, font_name)
-    Widget w;
-    String family, face, blend;
-    String *font_name;
+static void FontFamilyFaceBlendToName(
+    Widget w,
+    String family, String face, String blend,
+    String *font_name)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     FontFamilyRec *ff;
@@ -4347,18 +4319,18 @@
     *font_name = NULL;
 }
 
-static void FontFamilyFaceToName(w, family, face, font_name)
-    Widget w;
-    String family, face;
-    String *font_name;
+static void FontFamilyFaceToName(
+    Widget w,
+    String family, String face,
+    String *font_name)
 {
     FontFamilyFaceBlendToName(w, family, face, NULL, font_name);
 }
 
-void FSBFontFamilyFaceToName(w, family, face, font_name)
-    Widget w;
-    String family, face;
-    String *font_name;
+void FSBFontFamilyFaceToName(
+    Widget w,
+    String family, String face,
+    String *font_name)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4367,9 +4339,9 @@
 							 font_name);
 }
 
-String FSBFindAFM(w, font_name)
-    Widget w;
-    String font_name;
+String FSBFindAFM(
+    Widget w,
+    String font_name)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4377,9 +4349,9 @@
 	    fsb_class.find_afm) (w, font_name);
 }
 
-String FSBFindFontFile(w, font_name)
-    Widget w;
-    String font_name;
+String FSBFindFontFile(
+    Widget w,
+    String font_name)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4387,12 +4359,11 @@
 	    fsb_class.find_font_file) (w, font_name);
 }
 
-static void GetTextDimensions(w, text, font, size, x, y, dx, dy,
-			      left, right, top, bottom)
-    Widget w;
-    String text, font;
-    double size, x, y;
-    float *dx, *dy, *left, *right, *top, *bottom;
+static void GetTextDimensions(
+    Widget w,
+    String text, String font,
+    double size, double x, double y,
+    float *dx, float *dy, float *left, float *right, float *top, float *bottom)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     int bogusFont;
@@ -4401,12 +4372,11 @@
 			   dx, dy, left, right, top, bottom, &bogusFont);
 }
 
-void FSBGetTextDimensions(w, text, font, size, x, y, dx, dy,
-			  left, right, top, bottom)
-    Widget w;
-    String text, font;
-    double size, x, y;
-    float *dx, *dy, *left, *right, *top, *bottom;
+void FSBGetTextDimensions(
+    Widget w,
+    String text, String font,
+    double size, double x, double y,
+    float *dx, float *dy, float *left, float *right, float *top, float *bottom)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4415,11 +4385,13 @@
 					dx, dy, left, right, top, bottom);
 }
 
-static void SetFontFamilyFaceBlend(w, family, face, blend,
-				   family_multiple, face_multiple)
-    Widget w;
-    String family, face, blend;
-    Bool family_multiple, face_multiple;
+static void SetFontFamilyFaceBlend(
+    Widget w,
+    String family,
+    String face,
+    String blend,
+    Bool family_multiple,
+    Bool face_multiple)
 {
     XtVaSetValues(w, XtNfontFamily, family, XtNfontFace, face,
 		  XtNfontBlend, blend, XtNuseFontName, False,
@@ -4427,11 +4399,13 @@
 		  XtNfontFaceMultiple, face_multiple, NULL);
 }
 
-void FSBSetFontFamilyFaceBlend(w, font_family, font_face, font_blend,
-			       font_family_multiple, font_face_multiple)
-    Widget w;
-    String font_family, font_face, font_blend;
-    Bool font_family_multiple, font_face_multiple;
+void FSBSetFontFamilyFaceBlend(
+    Widget w,
+    String font_family,
+    String font_face,
+    String font_blend,
+    Bool font_family_multiple,
+    Bool font_face_multiple)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4442,10 +4416,12 @@
 					       font_face_multiple);
 }
 
-void FSBFontNameToFamilyFaceBlend(w, font_name, family, face, blend)
-    Widget w;
-    String font_name;
-    String *family, *face, *blend;
+void FSBFontNameToFamilyFaceBlend(
+    Widget w,
+    String font_name,
+    String *family,
+    String *face,
+    String *blend)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4454,10 +4430,12 @@
 						   face, blend);
 }
     
-void FSBFontFamilyFaceBlendToName(w, family, face, blend, font_name)
-    Widget w;
-    String family, face, blend;
-    String *font_name;
+void FSBFontFamilyFaceBlendToName(
+    Widget w,
+    String family,
+    String face,
+    String blend,
+    String *font_name)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4466,13 +4444,13 @@
 						   blend, font_name);
 }
 
-static void GetBlendList(w, name, count_return, blend_return,
-			 font_name_return, axis_values_return)
-    Widget w;
-    String name;
-    int *count_return;
-    String **blend_return, **font_name_return;
-    float **axis_values_return;
+static void GetBlendList(
+    Widget w,
+    String name,
+    int *count_return,
+    String **blend_return,
+    String **font_name_return,
+    float **axis_values_return)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     String *buf1, *buf2;
@@ -4511,13 +4489,13 @@
     }
 }
 
-void FSBGetBlendList(w, name, count_return, blend_return,
-		     font_name_return, axis_values_return)
-    Widget w;
-    String name;
-    int *count_return;
-    String **blend_return, **font_name_return;
-    float **axis_values_return;
+void FSBGetBlendList(
+    Widget w,
+    String name,
+    int *count_return,
+    String **blend_return,
+    String **font_name_return,
+    float **axis_values_return)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4526,17 +4504,16 @@
 				   font_name_return, axis_values_return);
 }
 
-static void GetBlendInfo(w, name, num_axes_return, num_designs_return,
-			 axis_names_return, blend_positions_return,
-			 blend_map_count_return, blend_design_coords_return,
-			 blend_normalized_coords_return)
-    Widget w;
-    String name;
-    int *num_axes_return, *num_designs_return;
-    String **axis_names_return;
-    float **blend_positions_return;
-    int **blend_map_count_return, **blend_design_coords_return;
-    float **blend_normalized_coords_return;
+static void GetBlendInfo(
+    Widget w,
+    String name,
+    int *num_axes_return,
+    int *num_designs_return,
+    String **axis_names_return,
+    float **blend_positions_return,
+    int **blend_map_count_return,
+    int **blend_design_coords_return,
+    float **blend_normalized_coords_return)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     FontFamilyRec *ff;
@@ -4605,17 +4582,16 @@
     }
 }
 
-void FSBGetBlendInfo(w, name, num_axes_return, num_designs_return,
-		     axis_names_return, blend_positions_return,
-		     blend_map_count_return, blend_design_coords_return,
-		     blend_normalized_coords_return)
-    Widget w;
-    String name;
-    int *num_axes_return, *num_designs_return;
-    String **axis_names_return;
-    float **blend_positions_return;
-    int **blend_map_count_return, **blend_design_coords_return;
-    float **blend_normalized_coords_return;
+void FSBGetBlendInfo(
+    Widget w,
+    String name,
+    int *num_axes_return,
+    int *num_designs_return,
+    String **axis_names_return,
+    float **blend_positions_return,
+    int **blend_map_count_return,
+    int **blend_design_coords_return,
+    float **blend_normalized_coords_return)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4628,13 +4604,13 @@
 				   blend_normalized_coords_return);
 }
 
-static Boolean ChangeBlends(w, base_name, blend_name, action, axis_values,
-			axis_percents)
-    Widget w;
-    String base_name, blend_name;
-    FSBBlendAction action;
-    int *axis_values;
-    float *axis_percents;
+static Boolean ChangeBlends(
+    Widget w,
+    String base_name,
+    String blend_name,
+    FSBBlendAction action,
+    int *axis_values,
+    float *axis_percents)
 {
     FontSelectionBoxWidget fsb = (FontSelectionBoxWidget) w;
     FontFamilyRec *ff;
@@ -4743,13 +4719,13 @@
     return True;
 }
 
-Boolean FSBChangeBlends(w, base_name, blend_name, action, axis_values,
-			axis_percents)
-    Widget w;
-    String base_name, blend_name;
-    FSBBlendAction action;
-    int *axis_values;
-    float *axis_percents;
+Boolean FSBChangeBlends(
+    Widget w,
+    String base_name,
+    String blend_name,
+    FSBBlendAction action,
+    int *axis_values,
+    float *axis_percents)
 {
     XtCheckSubclass(w, fontSelectionBoxWidgetClass, NULL);
 
@@ -4758,9 +4734,9 @@
 				    axis_values, axis_percents);
 }
 
-void _FSBSetCurrentFont(fsb, name)
-    FontSelectionBoxWidget fsb;
-    String name;
+void _FSBSetCurrentFont(
+    FontSelectionBoxWidget fsb,
+    String name)
 {
     FontFamilyRec *ff;
     FontRec *f;
@@ -4806,10 +4782,10 @@
     DoPreview(fsb, False);
 }
 
-float _FSBNormalize(val, bd, i)
-    int val;
-    BlendDataRec *bd;
-    int i;
+float _FSBNormalize(
+    int val,
+    BlendDataRec *bd,
+    int i)
 {
     int j;
     int lessBreak, moreBreak;
@@ -4887,10 +4863,10 @@
 	    (moreBreak - lessBreak) + lessBreak + 0.5;
 }
 
-String _FSBGenFontName(name, val, bd)
-    String name;
-    int *val;
-    BlendDataRec *bd;
+String _FSBGenFontName(
+    String name,
+    int *val,
+    BlendDataRec *bd)
 {
     char nameBuf[256];
     int i;
@@ -4906,4 +4882,3 @@
 
     return Canonical(nameBuf);
 }
-
Index: xc/lib/dpstk/FontSBI.h
diff -u xc/lib/dpstk/FontSBI.h:1.1 xc/lib/dpstk/FontSBI.h:1.2
--- xc/lib/dpstk/FontSBI.h:1.1	Sat Feb 12 16:13:33 2000
+++ xc/lib/dpstk/FontSBI.h	Wed Jun  7 15:03:00 2000
@@ -35,26 +35,11 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/FontSBI.h,v 1.2 2000/06/07 22:03:00 tsi Exp $ */
 
 #ifndef _FontSelectionBoxI_H
 #define _FontSelectionBoxI_H
 
-#ifdef _NO_PROTO
-
-extern Widget _FSBCreateFontSampler();
-extern Boolean _FSBDownloadFontIfNecessary();
-extern XmString _FSBCreateSharedCS();
-extern void _FSBSetCreatorFamily();
-extern void _FSBSetUpFaceList();
-extern void _FSBBogusFont();
-extern void _FSBFlushFont();
-extern void _FSBSetCurrentFont();
-extern float _FSBNormalize();
-extern int _FSBUnnormalize();
-extern String _FSBGenFontName();
-
-#else /* _NO_PROTO */
-
 extern Widget _FSBCreateFontSampler(FontSelectionBoxWidget fsb);
 extern Boolean _FSBDownloadFontIfNecessary(FontRec *f,
 					FontSelectionBoxWidget fsb);
@@ -67,8 +52,6 @@
 extern float _FSBNormalize(int val, BlendDataRec *bd, int i);
 extern int _FSBUnnormalize(double val, BlendDataRec *bd, int i);
 extern String _FSBGenFontName(String name, int *val, BlendDataRec *bd);
-
-#endif /* _NO_PROTO */
 
 #endif /* _FontSelectionBoxI_H */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
Index: xc/lib/dpstk/FontSample.c
diff -u xc/lib/dpstk/FontSample.c:1.1 xc/lib/dpstk/FontSample.c:1.2
--- xc/lib/dpstk/FontSample.c:1.1	Sat Feb 12 16:13:34 2000
+++ xc/lib/dpstk/FontSample.c	Wed Jun  7 15:03:00 2000
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/FontSample.c,v 1.2 2000/06/07 22:03:00 tsi Exp $ */
 
 #include <ctype.h>
 #include <stdio.h>
@@ -70,12 +71,12 @@
 #include <Xm/RowColumn.h>
 #include <DPS/dpsXclient.h>
 #include <DPS/dpsops.h>
-#include "DPS/dpsXcommon.h"
-#include "DPS/dpsXshare.h"
-#include "DPS/FontSBP.h"
+#include <DPS/dpsXcommon.h>
+#include <DPS/dpsXshare.h>
+#include <DPS/FontSBP.h>
 #include "FSBwraps.h"
 #include "FontSBI.h"
-#include "DPS/FontSamplP.h"
+#include <DPS/FontSamplP.h>
 
 #if 0
 /* This is not in Xos.h for some reason */
@@ -103,8 +104,10 @@
 #define SAMPLER_DEFAULT_SIZE 24.0
 #endif /* SAMPLER_DEFAULT_SIZE */
 
-static Boolean DisplayAllWorkProc(), DisplaySelectedWorkProc(),
-	DisplaySelectedFamilyWorkProc(), DisplayFilteredWorkProc();
+static Boolean DisplayAllWorkProc(XtPointer client_data);
+static Boolean DisplaySelectedWorkProc(XtPointer client_data);
+static Boolean DisplaySelectedFamilyWorkProc(XtPointer client_data);
+static Boolean DisplayFilteredWorkProc(XtPointer client_data);
 
 #define Offset(field) XtOffsetOf(FontSamplerRec, sampler.field)
 
@@ -186,10 +189,16 @@
 
 /* Forward declarations */
 
-static void ClassInitialize(), ClassPartInitialize(), Initialize(), Destroy(),
-	ChangeManaged(), Resize(), ClickAction(), Cancel();
-static Boolean SetValues();
-static XtGeometryResult GeometryManager();
+static Boolean SetValues(Widget old, Widget req, Widget new, ArgList args, Cardinal *num_args);
+static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *desired, XtWidgetGeometry *allowed);
+static void Cancel(Widget w);
+static void ChangeManaged(Widget w);
+static void ClassInitialize(void);
+static void ClassPartInitialize(WidgetClass widget_class);
+static void ClickAction(Widget widget, XEvent *event, String *params, Cardinal *num_params);
+static void Destroy(Widget widget);
+static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args);
+static void Resize(Widget widget);
 
 static XtActionsRec actions[] = {
     {"FSBClickAction", ClickAction}
@@ -269,15 +278,19 @@
 WidgetClass fontSamplerWidgetClass =
 	(WidgetClass) &fontSamplerClassRec;
 
-typedef Boolean (*MatchProc)();
+struct _FilterRec;
 
-typedef struct {
+typedef Boolean (*MatchProc)(String name, struct _FilterRec *filter);
+
+typedef struct _FilterRec {
     char *name;
     char *particles[9];
     MatchProc special;
 } FilterRec;
 
-static Boolean MatchRoman(), MatchMedium(), MatchBlack();
+static Boolean MatchRoman(String name, FilterRec *filter);
+static Boolean MatchMedium(String name, FilterRec *filter);
+static Boolean MatchBlack(String name, FilterRec *filter);
 
 FilterRec filters[] = {
     {"roman",		{"Roman", NULL}, MatchRoman},
@@ -316,15 +329,12 @@
 
 static int class_indices[] = {TYPE_FILTERS, WIDTH_FILTERS, WEIGHT_FILTERS, -1};
 
-static void ShowLabel(s, string)
-    FontSamplerWidget s;
-    XmString string;
+static void ShowLabel(FontSamplerWidget s, XmString string)
 {
     XtVaSetValues(s->sampler.font_label_child, XmNlabelString, string, NULL);
 }
 
-static void UnhighlightFont(s)
-    FontSamplerWidget s;
+static void UnhighlightFont(FontSamplerWidget s)
 {
     DisplayedFontRec *d = s->sampler.highlighted_font;
 
@@ -334,8 +344,7 @@
 	      d->l-1, d->t-1);
 }
 
-static void HighlightFont(s)
-    FontSamplerWidget s;
+static void HighlightFont(FontSamplerWidget s)
 {
     DisplayedFontRec *d = s->sampler.highlighted_font;
     FontRec *f = d->font;
@@ -356,11 +365,11 @@
 
 /* ARGSUSED */
 
-static void ClickAction(widget, event, params, num_params)
-    Widget widget;
-    XEvent *event;
-    String *params;
-    Cardinal *num_params;
+static void ClickAction(
+    Widget widget,
+    XEvent *event,
+    String *params,
+    Cardinal *num_params)
 {
     XButtonEvent *b = (XButtonEvent *) event;
     DisplayedFontRec *f;
@@ -400,9 +409,11 @@
     }
 }
     
-static void UpdateDisplayedFontRecs(info, newHeight, oldHeight, newWidth)
-    DisplayRecord *info;
-    Position newHeight, oldHeight, newWidth;
+static void UpdateDisplayedFontRecs(
+    DisplayRecord *info,
+    Position newHeight,
+    Position oldHeight,
+    Position newWidth)
 {
     float *m = info->sampler->sampler.invctm;
     float h, w;
@@ -425,11 +436,11 @@
 
 /* ARGSUSED */
 
-static void ResizeEventHandler(widget, clientData, event, continueToDispatch)
-    Widget widget;
-    XtPointer clientData;
-    XEvent *event;
-    Boolean *continueToDispatch;
+static void ResizeEventHandler(
+    Widget widget,
+    XtPointer clientData,
+    XEvent *event,
+    Boolean *continueToDispatch)
 {
     Dimension clip_width, clip_height, new_width, new_height,
 	    area_width, area_height;
@@ -504,13 +515,12 @@
     }
 }
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
     XtInitializeWidgetClass(fontSelectionBoxWidgetClass);
 }
 
-static void ClassPartInitialize(widget_class)
-    WidgetClass widget_class;
+static void ClassPartInitialize(WidgetClass widget_class)
 {
     register FontSamplerWidgetClass wc =
 	    (FontSamplerWidgetClass) widget_class;
@@ -522,8 +532,7 @@
     }
 }
 
-static void FreeDisplayInfo(info)
-    DisplayRecord *info;
+static void FreeDisplayInfo(DisplayRecord *info)
 {
     DisplayedFontRec *f;
     DisplayedTextRec *t;
@@ -548,17 +557,14 @@
     XtFree((char *) info);
 }
 
-static Boolean IsSet(widget)
-    Widget widget;
+static Boolean IsSet(Widget widget)
 {
     return XmToggleButtonGadgetGetState(widget);
 }
 
 /* ARGSUSED */
 
-static void DisplayCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void DisplayCallback(Widget widget, XtPointer clientData, XtPointer callData)
 {
     XtAppContext app;
     float h, w;
@@ -666,8 +672,7 @@
     }
 }
 
-static void FinishUpDisplaying(s)
-    FontSamplerWidget s;
+static void FinishUpDisplaying(FontSamplerWidget s)
 {
     XtSetSensitive(s->sampler.stop_button_child, False);
     s->sampler.current_display_proc = None;
@@ -675,9 +680,7 @@
 
 /* ARGSUSED */
 
-static void FilterCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void FilterCallback(Widget widget, XtPointer clientData, XtPointer callData)
 {
     FontSamplerWidget s = (FontSamplerWidget) clientData;
     
@@ -696,9 +699,7 @@
 
 /* ARGSUSED */
 
-static void TextCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void TextCallback(Widget widget, XtPointer clientData, XtPointer callData)
 {
     FontSamplerWidget s = (FontSamplerWidget) clientData;
     DisplayedTextRec *t;
@@ -717,9 +718,7 @@
 
 /* ARGSUSED */
 
-static void StopCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void StopCallback(Widget widget, XtPointer clientData, XtPointer callData)
 {
     FontSamplerWidget s = (FontSamplerWidget) clientData;
 
@@ -731,9 +730,7 @@
 
 /* ARGSUSED */
 
-static void DismissCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void DismissCallback(Widget widget, XtPointer clientData, XtPointer callData)
 {
     FontSamplerWidget s = (FontSamplerWidget) clientData;
 
@@ -749,9 +746,7 @@
 
 /* ARGSUSED */
 
-static void PopdownCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void PopdownCallback(Widget widget, XtPointer clientData, XtPointer callData)
 {
     FontSamplerWidget s =
 	    (FontSamplerWidget)
@@ -764,9 +759,7 @@
 
 /* ARGSUSED */
 
-static void ExposeCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ExposeCallback(Widget widget, XtPointer clientData, XtPointer callData)
 {
     XmDrawingAreaCallbackStruct *da = (XmDrawingAreaCallbackStruct *) callData;
     XExposeEvent *ev = (XExposeEvent *) da->event;
@@ -782,9 +775,7 @@
 
 /* ARGSUSED */
 
-static void ClearCallback(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void ClearCallback(Widget widget, XtPointer clientData, XtPointer callData)
 {
     int j;
     FontSamplerWidget s = (FontSamplerWidget) clientData;
@@ -801,9 +792,7 @@
 
 /* ARGSUSED */
 
-static void SizeSelect(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SizeSelect(Widget widget, XtPointer clientData, XtPointer callData)
 {
     FontSamplerWidget s = (FontSamplerWidget) clientData;
     String value;
@@ -847,9 +836,7 @@
 
 /* ARGSUSED */
 
-static void TextVerify(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void TextVerify(Widget widget, XtPointer clientData, XtPointer callData)
 {
     int i;
     XmTextVerifyPtr v = (XmTextVerifyPtr) callData;
@@ -887,9 +874,7 @@
 
 /* ARGSUSED */
 
-static void SetSize(widget, clientData, callData)
-    Widget widget;
-    XtPointer clientData, callData;
+static void SetSize(Widget widget, XtPointer clientData, XtPointer callData)
 {
     char buf[20], *ch;
     FontSamplerWidget s = (FontSamplerWidget) clientData;
@@ -902,9 +887,7 @@
     changingSize = False;
 }
 
-static void CreateSizeMenu(s, destroyOldChildren)
-    FontSamplerWidget s;
-    Boolean destroyOldChildren;
+static void CreateSizeMenu(FontSamplerWidget s, Boolean destroyOldChildren)
 {
     Arg args[20];
     int i, j;
@@ -920,7 +903,7 @@
 		    XtNnumChildren, &num_children, NULL);
 
 	/* Don't destroy first child ("other") */
-	for (j = 1; j < num_children; j++) XtDestroyWidget(children[j]);
+	for (j = 1; (Cardinal)j < num_children; j++) XtDestroyWidget(children[j]);
 
 	sizes = (Widget *) XtMalloc((s->sampler.size_count+1) *
 				    sizeof(Widget));
@@ -949,8 +932,7 @@
     XtFree((char *) sizes);
 }
 
-static void CreateFilters(s)
-    FontSamplerWidget s;
+static void CreateFilters(FontSamplerWidget s)
 {
     FilterRec *f;
     int i;
@@ -980,8 +962,7 @@
     }
 }
 
-static void CreateChildren(s)
-    FontSamplerWidget s;
+static void CreateChildren(FontSamplerWidget s)
 {
     Arg args[20];
     int i;
@@ -1221,10 +1202,10 @@
 
 /* ARGSUSED */
 
-static void Initialize(request, new, args, num_args)
-    Widget request, new;
-    ArgList args;
-    Cardinal *num_args;
+static void Initialize(
+    Widget request, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     FontSamplerWidget sampler = (FontSamplerWidget) new;
 
@@ -1268,8 +1249,7 @@
     CreateChildren(sampler);
 }
 
-static void AdvanceInfoToNextFont(info)
-    DisplayRecord *info;
+static void AdvanceInfoToNextFont(DisplayRecord *info)
 {	
     if (info->current_font->blend_data != NULL) {
 	if (info->current_blend == NULL) {
@@ -1288,8 +1268,7 @@
     }
 }
 
-static Boolean ShowFont(info)
-    DisplayRecord *info;
+static Boolean ShowFont(DisplayRecord *info)
 {
     float width, left, right, top, bottom;
     FontRec *f = info->current_font;
@@ -1389,8 +1368,7 @@
     return True;
 }
 
-static Boolean DisplayAllWorkProc(client_data)
-    XtPointer client_data;
+static Boolean DisplayAllWorkProc(XtPointer client_data)
 {
     DisplayRecord *info = (DisplayRecord *) client_data;
     FontSamplerWidget s = info->sampler;
@@ -1417,8 +1395,7 @@
     return False;
 }
 
-static Boolean DisplaySelectedWorkProc(client_data)
-    XtPointer client_data;
+static Boolean DisplaySelectedWorkProc(XtPointer client_data)
 {
     DisplayRecord *info = (DisplayRecord *) client_data;
     FontSamplerWidget s = info->sampler;
@@ -1435,8 +1412,7 @@
     return True;
 }
 
-static Boolean DisplaySelectedFamilyWorkProc(client_data)
-    XtPointer client_data;
+static Boolean DisplaySelectedFamilyWorkProc(XtPointer client_data)
 {
     DisplayRecord *info = (DisplayRecord *) client_data;
     FontSamplerWidget s = info->sampler;
@@ -1474,9 +1450,7 @@
 
 /* ARGSUSED */
 
-static Boolean MatchRoman(name, filter)
-    String name;
-    FilterRec *filter;
+static Boolean MatchRoman(String name, FilterRec *filter)
 {
     FilterRec *f;
     char *ch, **search, *start;
@@ -1500,9 +1474,7 @@
     return True;
 }
 
-static Boolean MatchMedium(name, filter)
-    String name;
-    FilterRec *filter;
+static Boolean MatchMedium(String name, FilterRec *filter)
 {
     FilterRec *f;
     char *ch, **search, *start;
@@ -1539,9 +1511,7 @@
     return True;
 }
 
-static Boolean MatchBlack(name, filter)
-    String name;
-    FilterRec *filter;
+static Boolean MatchBlack(String name, FilterRec *filter)
 {
     char *ch, **search, *start;
     int len;
@@ -1574,8 +1544,7 @@
     return False;
 }
 
-static void UpdateFilters(s)
-    FontSamplerWidget s;
+static void UpdateFilters(FontSamplerWidget s)
 {
     int i;
 
@@ -1589,10 +1558,10 @@
 	    XmTextFieldGetString(s->sampler.filter_text_child);
 }
 
-static Boolean FontMatchesFilters(font, blend, s)
-    FontRec *font;
-    BlendRec *blend;
-    FontSamplerWidget s;
+static Boolean FontMatchesFilters(
+    FontRec *font,
+    BlendRec *blend,
+    FontSamplerWidget s)
 {
     int *cl, i;
     FilterRec *f;
@@ -1661,8 +1630,7 @@
     return (ch != NULL);
 }
 
-static Boolean DisplayFilteredWorkProc(client_data)
-    XtPointer client_data;
+static Boolean DisplayFilteredWorkProc(XtPointer client_data)
 {
     DisplayRecord *info = (DisplayRecord *) client_data;
     FontSamplerWidget s = info->sampler;
@@ -1692,8 +1660,7 @@
     return False;
 }
 
-static void Destroy(widget)
-    Widget widget;
+static void Destroy(Widget widget)
 {
     FontSamplerWidget s = (FontSamplerWidget) widget;
 
@@ -1714,8 +1681,7 @@
     XtFree((char *) s->sampler.filter_flags);
 }
 
-static void Resize(widget)
-    Widget widget;
+static void Resize(Widget widget)
 {
     FontSamplerWidget s = (FontSamplerWidget) widget;
 
@@ -1724,9 +1690,9 @@
 
 /* ARGSUSED */
 
-static XtGeometryResult GeometryManager(w, desired, allowed)
-    Widget w;
-    XtWidgetGeometry *desired, *allowed;
+static XtGeometryResult GeometryManager(
+    Widget w,
+    XtWidgetGeometry *desired, XtWidgetGeometry *allowed)
 {
 #define WANTS(flag) (desired->request_mode & flag)
 
@@ -1744,8 +1710,7 @@
 #undef WANTS
 }
 
-static void ChangeManaged(w)
-    Widget w;
+static void ChangeManaged(Widget w)
 {
     FontSamplerWidget s = (FontSamplerWidget) w;
 
@@ -1755,10 +1720,10 @@
 
 /* ARGSUSED */
 
-static Boolean SetValues(old, req, new, args, num_args)
-    Widget old, req, new;
-    ArgList args;
-    Cardinal *num_args;
+static Boolean SetValues(
+    Widget old, Widget req, Widget new,
+    ArgList args,
+    Cardinal *num_args)
 {
     FontSamplerWidget olds = (FontSamplerWidget) old;
     FontSamplerWidget news = (FontSamplerWidget) new;
@@ -1814,8 +1779,7 @@
 #undef NE
 }
 
-static void Cancel(w)
-    Widget w;
+static void Cancel(Widget w)
 {
     FontSamplerWidget s = (FontSamplerWidget) w;
 
@@ -1824,8 +1788,7 @@
     }
 }    
 
-void FSBCancelSampler(w)
-    Widget w;
+void FSBCancelSampler(Widget w)
 {
     XtCheckSubclass(w, fontSamplerWidgetClass, NULL);
 
@@ -1833,8 +1796,7 @@
 }
 
 #ifdef NO_STRSTR_AVAILABLE
-String strstr(s1, s2)
-    register String s1, s2;
+String strstr(String s1, String s2)
 {
     register int len1, len2;
 
Index: xc/lib/dpstk/Imakefile
diff -u xc/lib/dpstk/Imakefile:1.3 xc/lib/dpstk/Imakefile:1.6
--- xc/lib/dpstk/Imakefile:1.3	Mon Feb 14 17:07:59 2000
+++ xc/lib/dpstk/Imakefile	Wed Jun  7 15:03:00 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/dpstk/Imakefile,v 1.3 2000/02/15 01:07:59 dawes Exp $
+XCOMM $XFree86: xc/lib/dpstk/Imakefile,v 1.6 2000/06/07 22:03:00 tsi Exp $
 
 #define DoNormalLib NormalLibDpsTk
 #define DoSharedLib SharedLibDpsTk
@@ -9,7 +9,11 @@
 #define SoRev SODPSTKREV
 #define LibHeaders NO
 
-        PSWRAP = $(TOP)/config/pswrap/pswrap
+#ifdef SharedDPSTKReqs
+REQUIREDLIBS = SharedDPSTKReqs
+#endif
+
+        PSWRAP = PsWrap
 
 #if HasMotif
 MOTIFSRCS = FSBwraps.c FontSample.c FontSB.c FontCreato.c \
@@ -45,7 +49,7 @@
 .SUFFIXES: .psw
 
 .psw.c :
-	RunProgram(PSWRAP,-o $*.c -h $*.h $<)
+	RunProgram(PSWRAP,-o $*.c -a -f $*.h -h $*.h $<)
 
 includes:: $(SRCS)
 
Index: xc/lib/dpstk/XDPSpreview.c
diff -u xc/lib/dpstk/XDPSpreview.c:1.1 xc/lib/dpstk/XDPSpreview.c:1.2
--- xc/lib/dpstk/XDPSpreview.c:1.1	Sat Feb 12 16:13:35 2000
+++ xc/lib/dpstk/XDPSpreview.c	Wed Jun  7 15:03:01 2000
@@ -35,17 +35,21 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/XDPSpreview.c,v 1.2 2000/06/07 22:03:01 tsi Exp $ */
 
 #include <X11/Xlib.h>
 #include <DPS/dpsXclient.h>
 #include <DPS/XDPSlib.h>
 #include <DPS/psops.h>
 #include <stdio.h>
+#include <stdlib.h>
+
 #ifndef NeXT
 #include <unistd.h>
 #endif
-#include "DPS/dpsXshare.h"
-#include "DPS/dpsXpreview.h"
+
+#include <DPS/dpsXshare.h>
+#include <DPS/dpsXpreview.h>
 #include "XDPSpwraps.h"
 #include "dpsXcommonI.h"
 #include <math.h>
@@ -60,19 +64,25 @@
 #define BEGINDOCUMENTLEN 15	/* Length of "%%BeginDocument" */
 #define BEGINBINARYLEN 14	/* Length of "%%BeginBinary:" */
 
-static int ParseFileForBBox();
-static void FillPixmapWithGray();
+static int ParseFileForBBox(FILE *file, XRectangle *bb);
+static void FillPixmapWithGray(
+    Screen *screen,
+    Drawable dest,
+    XRectangle *bbox,
+    int xOffset, int yOffset,
+    double pixelsPerPoint,
+    Bool createMask);
 
 static XDPSRewindFunction rewindFunction = XDPSFileRewindFunc;
 static DPSPointer rewindClientData = NULL;
 static XDPSGetsFunction getsFunction = XDPSFileGetsFunc;
 static DPSPointer getsClientData = NULL;
 
-int XDPSSetFileFunctions(rewindFunc, rewindData, getsFunc, getsData)
-    XDPSRewindFunction rewindFunc;
-    DPSPointer rewindData;
-    XDPSGetsFunction getsFunc;
-    DPSPointer getsData;
+int XDPSSetFileFunctions(
+    XDPSRewindFunction rewindFunc,
+    DPSPointer rewindData,
+    XDPSGetsFunction getsFunc,
+    DPSPointer getsData)
 {
     if (rewindFunc != NULL) {
 	rewindFunction = rewindFunc;
@@ -82,31 +92,24 @@
 	getsFunction = getsFunc;
 	getsClientData = getsData;
     }
+    return 0;
 }
 
 /* ARGSUSED */
 
-void XDPSFileRewindFunc(f, data)
-    FILE *f;
-    DPSPointer data;
+void XDPSFileRewindFunc(FILE *f, DPSPointer data)
 {
     rewind(f);
 }
 
 /* ARGSUSED */
 
-char *XDPSFileGetsFunc(buf, n, f, data)
-    char *buf;
-    int n;
-    FILE *f;
-    DPSPointer data;
+char *XDPSFileGetsFunc(char *buf, int n, FILE *f, DPSPointer data)
 {
     return fgets(buf, n, f);
 }
 
-void XDPSEmbeddedEPSFRewindFunc(f, data)
-    FILE *f;
-    DPSPointer data;
+void XDPSEmbeddedEPSFRewindFunc(FILE *f, DPSPointer data)
 {
     XDPSPosition *p = (XDPSPosition *) data;
 
@@ -121,14 +124,11 @@
 
 static Bool imaging = False;
 
-char *XDPSEmbeddedGetsFunc(buf, n, f, data)
-    char *buf;
-    int n;
-    FILE *f;
-    DPSPointer data;
+char *XDPSEmbeddedGetsFunc(char *buf, int n, FILE *f, DPSPointer data)
 {
     XDPSPosition *p = (XDPSPosition *) data;
-    int count, len;
+    int count;
+    unsigned len;
 
     if (fgets(buf, n, f) == NULL) {
 	if (imaging) p->startPos = -1;
@@ -162,22 +162,21 @@
 	}
     }
 
-    if (len == n-1 && buf[n-1] != '\n') p->continuedLine = True;
+    if ((int)len == n-1 && buf[n-1] != '\n') p->continuedLine = True;
     else p->continuedLine = False;
 
     return buf;
 }
 
-int XDPSCreatePixmapForEPSF(context, screen, epsf, depth, 
-			    pixelsPerPoint, pixmap, pixelSize, bbox)
-    DPSContext context;
-    Screen *screen;
-    FILE *epsf;
-    int depth;
-    double pixelsPerPoint;
-    Pixmap *pixmap;
-    XRectangle *pixelSize;
-    XRectangle *bbox;
+int XDPSCreatePixmapForEPSF(
+    DPSContext context,
+    Screen *screen,
+    FILE *epsf,
+    int depth,
+    double pixelsPerPoint,
+    Pixmap *pixmap,
+    XRectangle *pixelSize,
+    XRectangle *bbox)
 {
     Pixmap p;
     int width, height;
@@ -217,9 +216,7 @@
     else return dps_status_no_extension;
 }
 
-static int ParseFileForBBox(file, bb)
-    FILE *file;
-    XRectangle *bb;
+static int ParseFileForBBox(FILE *file, XRectangle *bb)
 {
 #define BBOXLEN 14		/* Length of "%%BoundingBox:" */
 #define BUFLEN 256
@@ -232,7 +229,7 @@
     int nestingLevel = 0;
     unsigned long binaryCount = 0;
     Bool continuedLine = False;
-    int len;
+    unsigned len;
 
     while (1) {
        if ((*getsFunction)(buf, BUFLEN, file, getsClientData) == NULL) {
@@ -305,8 +302,7 @@
 
 #define mmPerPoint (25.4/72.0)
 
-double XDPSPixelsPerPoint(screen)
-    Screen *screen;
+double XDPSPixelsPerPoint(Screen *screen)
 {
     return (float) WidthOfScreen(screen) * mmPerPoint /
 	    (float) WidthMMOfScreen(screen);
@@ -314,9 +310,7 @@
 
 static int timeStart = 200, maxDoubles = 3;
 
-void XDPSSetImagingTimeout(timeout, max)
-    int timeout;
-    int max;
+void XDPSSetImagingTimeout(int timeout, int max)
 {
     timeStart = timeout;
     maxDoubles = max;
@@ -333,12 +327,12 @@
 
 static StatusInfo *StatusList;
 
-static void SetUpStatusVariables(context, cookie, doneFlag, startReq, oldProc)
-    DPSContext context;
-    DPSPointer cookie;
-    Bool *doneFlag;
-    unsigned long startReq;
-    XDPSStatusProc oldProc;
+static void SetUpStatusVariables(
+    DPSContext context,
+    DPSPointer cookie,
+    Bool *doneFlag,
+    unsigned long startReq,
+    XDPSStatusProc oldProc)
 {
     StatusInfo *info = (StatusInfo *) malloc(sizeof(StatusInfo));
 
@@ -354,9 +348,9 @@
     StatusList = info;
 }
 
-static void SetEndReqNum(context, endReq)
-    DPSContext context;
-    unsigned long endReq;
+static void SetEndReqNum(
+    DPSContext context,
+    unsigned long endReq)
 {
     StatusInfo *info = StatusList;
 
@@ -364,9 +358,9 @@
     if (info != NULL) info->endReqNum = endReq;
 }
 
-static void HandlePreviewStatus(context, status)
-    DPSContext context;
-    int status;
+static void HandlePreviewStatus(
+    DPSContext context,
+    int status)
 {
     unsigned long serial;
     Display *dpy;
@@ -391,9 +385,9 @@
     if (status == PSFROZEN) *info->doneFlag = True;
 }
 
-static int FinishUp(context, cookie)
-    DPSContext context;
-    DPSPointer cookie;
+static int FinishUp(
+    DPSContext context,
+    DPSPointer cookie)
 {
     static char restorebuf[] =
 	    "\n$Adobe$DPS$Lib$Dict /EPSFsave get restore grestore\n";
@@ -424,9 +418,9 @@
     else return dps_status_success;
 }
 
-int XDPSCheckImagingResults(context, screen)
-    DPSContext context;
-    Screen *screen;
+int XDPSCheckImagingResults(
+    DPSContext context,
+    Screen *screen)
 {
     StatusInfo *info = StatusList;
     int status;
@@ -446,8 +440,7 @@
     return FinishUp(context, info->cookie);
 }
 
-static void msleep(ms)
-    int ms;
+static void msleep(int ms)
 {
     struct timeval incr;
 
@@ -457,23 +450,19 @@
 		   (SELECT_TYPE) NULL, &incr);
 }
 
-int XDPSImageFileIntoDrawable(context, screen, dest, file,
-			      drawableHeight, drawableDepth,
-			      bbox, xOffset, yOffset,
-			      pixelsPerPoint,
-			      clear, createMask, waitForCompletion, doneFlag)
-    DPSContext context;
-    Screen *screen;
-    Drawable dest;
-    FILE *file;
-    int drawableHeight;
-    int drawableDepth;
-    XRectangle *bbox;
-    int xOffset, yOffset;
-    double pixelsPerPoint;
-    Bool clear, createMask;
-    Bool waitForCompletion;
-    Bool *doneFlag;
+int XDPSImageFileIntoDrawable(
+    DPSContext context,
+    Screen *screen,
+    Drawable dest,
+    FILE *file,
+    int drawableHeight,
+    int drawableDepth,
+    XRectangle *bbox,
+    int xOffset, int yOffset,
+    double pixelsPerPoint,
+    Bool clear, Bool createMask,
+    Bool waitForCompletion,
+    Bool *doneFlag)
 {
 #define BUFSIZE 256
 #define EXECLEN 6
@@ -490,7 +479,7 @@
     int doublings;
     int ms;
     XDPSStatusProc oldProc;
-    unsigned long startReqNum, endReqNum;
+    unsigned long startReqNum = 0, endReqNum;
 
     if (screen == NULL || dest == None || 
 	drawableHeight <= 0 || drawableDepth <= 0 ||
@@ -602,15 +591,13 @@
 #undef BUFSIZE
 }
 
-static void FillPixmapWithGray(screen, dest, bbox, xOffset, yOffset,
-			       pixelsPerPoint,
-			       createMask)
-    Screen *screen;
-    Drawable dest;
-    XRectangle *bbox;
-    int xOffset, yOffset;
-    double pixelsPerPoint;
-    Bool createMask;
+static void FillPixmapWithGray(
+    Screen *screen,
+    Drawable dest,
+    XRectangle *bbox,
+    int xOffset, int yOffset,
+    double pixelsPerPoint,
+    Bool createMask)
 {
     int width, height, x, y;
     GC gc;
Index: xc/lib/dpstk/XDPSshare.c
diff -u xc/lib/dpstk/XDPSshare.c:1.1 xc/lib/dpstk/XDPSshare.c:1.2
--- xc/lib/dpstk/XDPSshare.c:1.1	Sat Feb 12 16:13:37 2000
+++ xc/lib/dpstk/XDPSshare.c	Wed Jun  7 15:03:01 2000
@@ -35,15 +35,20 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/XDPSshare.c,v 1.2 2000/06/07 22:03:01 tsi Exp $ */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <X11/Xlib.h>
+
 #include <DPS/dpsXclient.h>
 #include <DPS/dpsops.h>
 #include <DPS/XDPSlib.h>
-#include "DPS/dpsXshare.h"
+#include <DPS/dpsXshare.h>
+
 #include "XDPSswraps.h"
 #include "dpsXcommonI.h"
-#include <stdio.h>
 
 static int extensionId = 0;
 
@@ -53,9 +58,6 @@
    Lookup...Info looks for an info entry and creates one if not found.
 */
 
-void _DPSSSetContextParameters(), _DPSSSetContextDrawable(),
-	_DPSSInstallDPSlibDict();
-
 typedef struct _ContextInfoRec {
     int extensionId;
     DPSContextExtensionRec next;
@@ -83,10 +85,9 @@
 
 static DisplayInfo displayList = NULL;
 
-static DisplayInfo FindDisplayInfo(), LookupDisplayInfo();
+static DisplayInfo LookupDisplayInfo(Display *display);
 
-static ContextInfo AllocContextInfo(context)
-    DPSContext context;
+static ContextInfo AllocContextInfo(DPSContext context)
 {
     ContextInfo c = (ContextInfo) calloc(1, sizeof(ContextInfoRec));
 
@@ -98,16 +99,14 @@
     return c;
 }
 
-static ContextInfo FindContextInfo(context)
-    DPSContext context;
+static ContextInfo FindContextInfo(DPSContext context)
 {
     if (extensionId == 0) extensionId = DPSGenerateExtensionRecID();
 
     return (ContextInfo) DPSGetContextExtensionRec(context, extensionId);
 }
 
-static ContextInfo RemoveContextInfo(context)
-    DPSContext context;
+static ContextInfo RemoveContextInfo(DPSContext context)
 {
     return (ContextInfo) DPSRemoveContextExtensionRec(context,
 						      extensionId);
@@ -115,9 +114,9 @@
 
 /* May only be called for a display in the display list. */
 
-static ContextInfo LookupContext(display, context)
-    Display *display;
-    DPSContext context;
+static ContextInfo LookupContext(
+    Display *display,
+    DPSContext context)
 {
     ContextInfo c = FindContextInfo(context);
 
@@ -130,9 +129,9 @@
     return c;
 }
 
-static DisplayInfo AllocDisplayInfo(display, context)
-    Display *display;
-    DPSContext context;
+static DisplayInfo AllocDisplayInfo(
+    Display *display,
+    DPSContext context)
 {
     DisplayInfo d = (DisplayInfo) malloc(sizeof(DisplayInfoRec));
     register int i;
@@ -157,8 +156,7 @@
     return d;
 }
 
-static DisplayInfo FindDisplayInfo(display)
-    Display *display;
+static DisplayInfo FindDisplayInfo(Display *display)
 {
     DisplayInfo d = displayList;
 
@@ -166,8 +164,7 @@
     return d;
 }
 
-static DisplayInfo LookupDisplayInfo(display)
-    Display *display;
+static DisplayInfo LookupDisplayInfo(Display *display)
 {
     DisplayInfo d = FindDisplayInfo(display);
 
@@ -176,9 +173,7 @@
     return d;
 }
 
-int _XDPSSetComponentInitialized(context, bit)
-    DPSContext context;
-    unsigned long bit;
+int _XDPSSetComponentInitialized(DPSContext context, unsigned long bit)
 {
     ContextInfo c = FindContextInfo(context);
 
@@ -187,10 +182,10 @@
     return dps_status_success;
 }
 
-int _XDPSTestComponentInitialized(context, bit, result)
-    DPSContext context;
-    unsigned long bit;
-    Bool *result;
+int _XDPSTestComponentInitialized(
+    DPSContext context,
+    unsigned long bit,
+    Bool *result)
 {
     ContextInfo c = FindContextInfo(context);
 
@@ -202,10 +197,10 @@
     return dps_status_success;
 }
 
-int XDPSSetContextDepth(context, screen, depth)
-    DPSContext context;
-    Screen *screen;
-    int depth;
+int XDPSSetContextDepth(
+    DPSContext context,
+    Screen *screen,
+    int depth)
 {
     return XDPSSetContextParameters(context, screen, depth, None, 0,
 				    (XDPSStandardColormap *) NULL,
@@ -213,38 +208,35 @@
 				    XDPSContextScreenDepth);
 }
 
-int XDPSSetContextDrawable(context, drawable, height)
-    DPSContext context;
-    Drawable drawable;
-    int height;
+int XDPSSetContextDrawable(
+    DPSContext context,
+    Drawable drawable,
+    int height)
 {
     if (drawable != None && height <= 0) return dps_status_illegal_value;
     _DPSSSetContextDrawable(context, drawable, height);
     return dps_status_success;
 }
 
-int XDPSSetContextRGBMap(context, map)
-    DPSContext context;
-    XDPSStandardColormap *map;
+int XDPSSetContextRGBMap(
+    DPSContext context,
+    XDPSStandardColormap *map)
 {
     return XDPSSetContextParameters(context, (Screen *) NULL, 0, None, 0,
 				    map, (XDPSStandardColormap *) NULL,
 				    XDPSContextRGBMap);
 }
 
-int XDPSSetContextGrayMap(context, map)
-    DPSContext context;
-    XDPSStandardColormap *map;
+int XDPSSetContextGrayMap(
+    DPSContext context,
+    XDPSStandardColormap *map)
 {
     return XDPSSetContextParameters(context, (Screen *) NULL, 0, None, 0,
 				    map, (XDPSStandardColormap *) NULL,
 				    XDPSContextGrayMap);
 }
 
-static GC DisplayInfoSharedGC(d, screen, depth)
-    DisplayInfo d;
-    Screen *screen;
-    int depth;
+static GC DisplayInfoSharedGC(DisplayInfo d, Screen *screen, int depth)
 {
     int s = XScreenNumberOfScreen(screen);
     register int i;
@@ -274,16 +266,15 @@
     return d->gcForDepth[s][i];
 }
 
-int XDPSSetContextParameters(context, screen, depth, drawable, height,
-			     rgbMap, grayMap, flags)
-    DPSContext context;
-    Screen *screen;
-    int depth;
-    Drawable drawable;
-    int height;
-    XDPSStandardColormap *rgbMap;
-    XDPSStandardColormap *grayMap;
-    unsigned int flags;
+int XDPSSetContextParameters(
+    DPSContext context,
+    Screen *screen,
+    int depth,
+    Drawable drawable,
+    int height,
+    XDPSStandardColormap *rgbMap,
+    XDPSStandardColormap *grayMap,
+    unsigned int flags)
 {
     ContextInfo c = FindContextInfo(context);
     Bool doDepth = False, doDrawable = False, doRGB = False, doGray = False;
@@ -293,8 +284,16 @@
     GContext gctx = None;
     DisplayInfo d;
     Display *dpy;
-    int rgb_base_pixel, red_max, red_mult, green_max, green_mult,
-	    blue_max, blue_mult, gray_base_pixel, gray_max, gray_mult;
+    int rgb_base_pixel = 0;
+    int red_max = 0;
+    int red_mult = 0;
+    int green_max = 0;
+    int green_mult = 0;
+    int blue_max = 0;
+    int blue_mult = 0;
+    int gray_base_pixel = 0;
+    int gray_max = 0;
+    int gray_mult = 0;
     
     if (c == NULL) return dps_status_unregistered_context;
     d = c->displayInfo;
@@ -375,17 +374,16 @@
     return dps_status_success;
 }
 
-int XDPSPushContextParameters(context, screen, depth, drawable, height,
-			      rgbMap, grayMap, flags, pushCookieReturn)
-    DPSContext context;
-    Screen *screen;
-    int depth;
-    Drawable drawable;
-    int height;
-    XDPSStandardColormap *rgbMap;
-    XDPSStandardColormap *grayMap;
-    unsigned int flags;
-    DPSPointer *pushCookieReturn;
+int XDPSPushContextParameters(
+    DPSContext context,
+    Screen *screen,
+    int depth,
+    Drawable drawable,
+    int height,
+    XDPSStandardColormap *rgbMap,
+    XDPSStandardColormap *grayMap,
+    unsigned int flags,
+    DPSPointer *pushCookieReturn)
 {
     ContextInfo c = FindContextInfo(context);
     int status;
@@ -401,8 +399,7 @@
     return status;
 }
 
-int XDPSPopContextParameters(pushCookie)
-    DPSPointer pushCookie;
+int XDPSPopContextParameters(DPSPointer pushCookie)
 {
     DPSContext context = (DPSContext) pushCookie;
     ContextInfo c = FindContextInfo(context);
@@ -414,9 +411,7 @@
     return dps_status_success;
 }
     
-int XDPSCaptureContextGState(context, gsReturn)
-    DPSContext context;
-    DPSGState *gsReturn;
+int XDPSCaptureContextGState(DPSContext context, DPSGState *gsReturn)
 {
     *gsReturn = DPSNewUserObjectIndex();
     /* We want to keep 0 as an unassigned value */
@@ -427,37 +422,33 @@
     return dps_status_success;
 }
 
-int XDPSUpdateContextGState(context, gs)
-    DPSContext context;
-    DPSGState gs;
+int XDPSUpdateContextGState(DPSContext context, DPSGState gs)
 {
     _DPSSUpdateGState(context, gs);
 
     return dps_status_success;
 }
 
-int XDPSFreeContextGState(context, gs)
-    DPSContext context;
-    DPSGState gs;
+int XDPSFreeContextGState(DPSContext context, DPSGState gs)
 {
     _DPSSUndefineUserObject(context, gs);
 
     return dps_status_success;
 }
 
-int XDPSSetContextGState(context, gs)
-    DPSContext context;
-    DPSGState gs;
+int XDPSSetContextGState(
+    DPSContext context,
+    DPSGState gs)
 {
     _DPSSRestoreGState(context, gs);
 
     return dps_status_success;
 }
 
-int XDPSPushContextGState(context, gs, pushCookieReturn)
-    DPSContext context;
-    DPSGState gs;
-    DPSPointer *pushCookieReturn;
+int XDPSPushContextGState(
+    DPSContext context,
+    DPSGState gs,
+    DPSPointer *pushCookieReturn)
 {
     int status;
 
@@ -468,8 +459,7 @@
     return status;
 }
 
-int XDPSPopContextGState(pushCookie)
-    DPSPointer pushCookie;
+int XDPSPopContextGState(DPSPointer pushCookie)
 {
     DPSContext context = (DPSContext) pushCookie;
 
@@ -477,9 +467,7 @@
     return dps_status_success;
 }
 
-void XDPSRegisterContext(context, makeSharedContext)
-    DPSContext context;
-    Bool makeSharedContext;
+void XDPSRegisterContext(DPSContext context, Bool makeSharedContext)
 {
     Display *display;
     Bool inited;
@@ -504,8 +492,7 @@
     }
 }
 
-DPSContext XDPSGetSharedContext(display)
-    Display *display;
+DPSContext XDPSGetSharedContext(Display *display)
 {
     DisplayInfo d = LookupDisplayInfo(display);
     ContextInfo c;
@@ -538,8 +525,7 @@
     return context;
 }
 
-void XDPSDestroySharedContext(context)
-    DPSContext context;
+void XDPSDestroySharedContext(DPSContext context)
 {
     ContextInfo c = RemoveContextInfo(context);
 
@@ -553,8 +539,7 @@
     free((char *) c);
 }
 
-void XDPSUnregisterContext(context)
-    DPSContext context;
+void XDPSUnregisterContext(DPSContext context)
 {
     ContextInfo c = RemoveContextInfo(context);
 
@@ -567,8 +552,7 @@
     free((char *) c);
 }
 
-void XDPSFreeDisplayInfo(display)
-    Display *display;
+void XDPSFreeDisplayInfo(Display *display)
 {
     DisplayInfo *dp = &displayList;
     DisplayInfo d;
@@ -601,9 +585,7 @@
     free((char *) d);
 }
 
-int XDPSChainTextContext(context, enable)
-    DPSContext context;
-    Bool enable;
+int XDPSChainTextContext(DPSContext context, Bool enable)
 {
     ContextInfo c = FindContextInfo(context);
 
@@ -631,8 +613,7 @@
     return dps_status_success;
 }
 
-Bool XDPSExtensionPresent(display)
-    Display *display;
+Bool XDPSExtensionPresent(Display *display)
 {
     DisplayInfo d = LookupDisplayInfo(display);
 
@@ -649,25 +630,22 @@
     return (d->extensionPresent == ext_yes);
 }
 
-int PSDefineAsUserObj()
+int PSDefineAsUserObj(void)
 {
     return DPSDefineAsUserObj(DPSGetCurrentContext());
 }
 
-void PSRedefineUserObj(uo)
-    int uo;
+void PSRedefineUserObj(int uo)
 {
     DPSRedefineUserObj(DPSGetCurrentContext(), uo);
 }
 
-void PSUndefineUserObj(uo)
-    int uo;
+void PSUndefineUserObj(int uo)
 {
     DPSUndefineUserObj(DPSGetCurrentContext(), uo);
 }
 
-int DPSDefineAsUserObj(ctxt)
-    DPSContext ctxt;
+int DPSDefineAsUserObj(DPSContext ctxt)
 {
     int out = DPSNewUserObjectIndex();
     /* We want to keep 0 as an unassigned value */
@@ -677,29 +655,22 @@
     return out;
 }
 
-void DPSRedefineUserObj(ctxt, uo)
-    DPSContext ctxt;
-    int uo;
+void DPSRedefineUserObj(DPSContext ctxt, int uo)
 {
     _DPSSDefineUserObject(ctxt, uo);
 }
 
-void DPSUndefineUserObj(ctxt, uo)
-    DPSContext ctxt;
-    int uo;
+void DPSUndefineUserObj(DPSContext ctxt, int uo)
 {
     _DPSSUndefineUserObject(ctxt, uo);
 }
 
-int PSReserveUserObjIndices(number)
-    int number;
+int PSReserveUserObjIndices(int number)
 {
     return DPSReserveUserObjIndices(DPSGetCurrentContext(), number);
 }
 
-int DPSReserveUserObjIndices(ctxt, number)
-    DPSContext ctxt;
-    int number;
+int DPSReserveUserObjIndices(DPSContext ctxt, int number)
 {
     int out = DPSNewUserObjectIndex();
 
@@ -711,15 +682,12 @@
     return out;
 }
 
-void PSReturnUserObjIndices(start, number)
-    int start, number;
+void PSReturnUserObjIndices(int start, int number)
 {
     DPSReturnUserObjIndices(DPSGetCurrentContext(), start, number);
 }
 
-void DPSReturnUserObjIndices(ctxt, start, number)
-    DPSContext ctxt;
-    int start, number;
+void DPSReturnUserObjIndices(DPSContext ctxt, int start, int number)
 {
     /* Nothing left any more */
 }
@@ -730,10 +698,10 @@
 /*
  * XListDepths - return info from connection setup
  */
-int *XListDepths (dpy, scrnum, countp)
-    Display *dpy;
-    int scrnum;
-    int *countp;
+int *XListDepths (
+    Display *dpy,
+    int scrnum,
+    int *countp)
 {
     Screen *scr;
     int count;
Index: xc/lib/dpstk/XDPSuserpath.c
diff -u xc/lib/dpstk/XDPSuserpath.c:1.1 xc/lib/dpstk/XDPSuserpath.c:1.2
--- xc/lib/dpstk/XDPSuserpath.c:1.1	Sat Feb 12 16:13:39 2000
+++ xc/lib/dpstk/XDPSuserpath.c	Wed Jun  7 15:03:01 2000
@@ -35,10 +35,11 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/lib/dpstk/XDPSuserpath.c,v 1.2 2000/06/07 22:03:01 tsi Exp $ */
 
 #include <DPS/dpsXclient.h>
 #include <DPS/dpsops.h>
-#include "DPS/dpsXuserpath.h"
+#include <DPS/dpsXuserpath.h>
 
 typedef struct _t_NumStrHeader {
     unsigned char type;
Index: xc/lib/dpstk/dpstkos2.def
diff -u /dev/null xc/lib/dpstk/dpstkos2.def:1.1
--- /dev/null	Sat Jul  1 20:44:55 2000
+++ xc/lib/dpstk/dpstkos2.def	Wed Apr  5 11:13:23 2000
@@ -0,0 +1,69 @@
+LIBRARY DPSTK
+DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/dpstk/dpstkos2.def,v 1.1 2000/04/05 18:13:23 dawes Exp $"
+CODE
+	PRELOAD
+DATA
+	MULTIPLE NONSHARED
+STACKSIZE 32768
+EXPORTS
+	XDPSSetFileFunctions @ 1
+	XDPSFileRewindFunc @ 2
+	XDPSFileGetsFunc @ 3
+	XDPSEmbeddedEPSFRewindFunc @ 4
+	XDPSEmbeddedGetsFunc @ 5
+	XDPSCreatePixmapForEPSF @ 6
+	XDPSPixelsPerPoint @ 7
+	XDPSSetImagingTimeout @ 8
+	XDPSCheckImagingResults @ 9
+	XDPSImageFileIntoDrawable  10
+	_DPSPSetMatrix @ 11
+	_DPSPClearArea @ 12
+	_DPSPSetMaskTransfer @ 13
+	_DPSPDefineExecFunction @ 14
+	_DPSPSaveBeforeExec @ 15
+	_DPSPCheckForError @ 16
+	_XDPSSetComponentInitialized @ 17
+	_XDPSTestComponentInitialized @ 18
+	XDPSSetContextDepth @ 19
+	XDPSSetContextDrawable @ 20
+	XDPSSetContextRGBMap @ 21
+	XDPSSetContextGrayMap @ 22
+	XDPSSetContextParameters @ 23
+	XDPSPushContextParameters @ 24
+	XDPSPopContextParameters @ 25
+	XDPSCaptureContextGState @ 26
+	XDPSUpdateContextGState @ 27
+	XDPSFreeContextGState @ 28
+	XDPSSetContextGState @ 29
+	XDPSPushContextGState @ 30
+	XDPSPopContextGState @ 31
+	XDPSRegisterContext @ 32
+	XDPSGetSharedContext @ 33
+	XDPSDestroySharedContext @ 34
+	XDPSUnregisterContext @ 35
+	XDPSFreeDisplayInfo @ 36
+	XDPSChainTextContext @ 37
+	XDPSExtensionPresent @ 38
+	PSDefineAsUserObj @ 39
+	PSRedefineUserObj @ 40
+	PSUndefineUserObj @ 41
+	DPSDefineAsUserObj @ 42
+	DPSRedefineUserObj @ 43
+	DPSUndefineUserObj @ 44
+	PSReserveUserObjIndices @ 45
+	DPSReserveUserObjIndices @ 46
+	PSReturnUserObjIndices @ 47
+	DPSReturnUserObjIndices @ 48
+	_DPSSSetContextParameters @ 49
+	_DPSSSetContextDrawable @ 50
+	_DPSSInstallDPSlibDict @ 51
+	_DPSSCaptureGState @ 52
+	_DPSSUpdateGState @ 53
+	_DPSSRestoreGState @ 54
+	_DPSSDefineUserObject @ 55
+	_DPSSUndefineUserObject @ 56
+	PSDoUserPath @ 57
+	DPSDoUserPath @ 58
+	PSHitUserPath @ 59
+	DPSHitUserPath @ 60
+	
Index: xc/lib/dpstk/dpstkos2.rsp
diff -u /dev/null xc/lib/dpstk/dpstkos2.rsp:1.1
--- /dev/null	Sat Jul  1 20:44:55 2000
+++ xc/lib/dpstk/dpstkos2.rsp	Wed Apr  5 11:13:23 2000
@@ -0,0 +1,4 @@
+XDPSpreview.obj XDPSpwraps.obj XDPSshare.obj XDPSswraps.obj+ 
+XDPSuserpath.obj /NOI /NOL /NOD /BAT
+dpstk.dll
+dpstk.map
Index: xc/lib/font/FreeType/ftenc.c
diff -u xc/lib/font/FreeType/ftenc.c:1.14 xc/lib/font/FreeType/ftenc.c:1.16
--- xc/lib/font/FreeType/ftenc.c:1.14	Tue Oct 12 21:20:49 1999
+++ xc/lib/font/FreeType/ftenc.c	Thu Apr  6 08:27:23 2000
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.14 1999/10/13 04:20:49 dawes Exp $ */
+/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.16 2000/04/06 15:27:23 dawes Exp $ */
 
 /* 
 Copyright (c) 1998 by Juliusz Chroboczek
@@ -23,13 +23,16 @@
 */
 
 /* TrueType-dependent encoding code */
-#include <string.h>
-
 #include "fontmisc.h"		/* defines xalloc and friends */
 #include "fontenc.h"
 #include "ttconfig.h"
 #include "freetype.h"
 #include "ft.h"
+#ifndef FONTMODULE
+#include <string.h>
+#else
+#include "xf86_ansic.h"
+#endif
 
 
 static int find_cmap(int, int, int, TT_Face, TT_CharMap *);
Index: xc/lib/font/FreeType/ftfuncs.c
diff -u xc/lib/font/FreeType/ftfuncs.c:1.13 xc/lib/font/FreeType/ftfuncs.c:1.14
--- xc/lib/font/FreeType/ftfuncs.c:1.13	Fri Feb 25 10:27:59 2000
+++ xc/lib/font/FreeType/ftfuncs.c	Wed Apr  5 11:13:24 2000
@@ -21,9 +21,13 @@
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.13 2000/02/25 18:27:59 dawes Exp $ */
+/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.14 2000/04/05 18:13:24 dawes Exp $ */
 
+#ifndef FONT_MODULE
 #include <string.h>
+#else
+#include "xf86_ansic.h"
+#endif
 
 #include "fontmisc.h"
 #include "fntfilst.h"
Index: xc/lib/font/Speedo/sperr.c
diff -u xc/lib/font/Speedo/sperr.c:1.2 xc/lib/font/Speedo/sperr.c:1.3
--- xc/lib/font/Speedo/sperr.c:1.2	Sat Feb  6 22:18:19 1999
+++ xc/lib/font/Speedo/sperr.c	Wed Apr  5 11:13:24 2000
@@ -48,11 +48,13 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.2 1999/02/07 06:18:19 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.3 2000/04/05 18:13:24 dawes Exp $ */
 
 #include	"spint.h"
 
+#ifndef FONT_MODULE
 #include <stdarg.h>
+#endif
 
 void
 SpeedoErr(char *str, ...)
Index: xc/lib/font/Type1/regions.c
diff -u xc/lib/font/Type1/regions.c:3.3 xc/lib/font/Type1/regions.c:3.4
--- xc/lib/font/Type1/regions.c:3.3	Sat Aug 21 22:35:43 1999
+++ xc/lib/font/Type1/regions.c	Fri Apr 28 11:19:20 2000
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/regions.c,v 3.3 1999/08/22 05:35:43 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/regions.c,v 3.4 2000/04/28 18:19:20 eich Exp $ */
  /* REGIONS  CWEB         V0023 LOTS                                 */
 /*
 :h1 id=regions.REGIONS Module - Regions Operator Handler
@@ -134,7 +134,7 @@
  
 /*SHARED LINE(S) ORIGINATED HERE*/
 /*
-:h4."INFINITY" - A Constant Region Structure of Infinite Extent
+:h4."TT_INFINITY" - A Constant Region Structure of Infinite Extent
  
 Infinity is the complement of a null area:
 Note - removed the refcount = 1 init, replaced with references = 2 3-26-91 PNM
@@ -146,7 +146,7 @@
                            NULL, NULL,
                            0, 0, 0, 0, 0, NULL, NULL,
                            NULL, 0, NULL, NULL };
-struct region *INFINITY = &infinity;
+struct region *TT_INFINITY = &infinity;
  
 /*
 :h4."EmptyRegion" - A Region Structure with Zero Area
Index: xc/lib/font/Type1/regions.h
diff -u xc/lib/font/Type1/regions.h:1.4 xc/lib/font/Type1/regions.h:1.5
--- xc/lib/font/Type1/regions.h:1.4	Sat Aug 21 06:47:46 1999
+++ xc/lib/font/Type1/regions.h	Fri Apr 28 11:19:20 2000
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/regions.h,v 1.4 1999/08/21 13:47:46 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/regions.h,v 1.5 2000/04/28 18:19:20 eich Exp $ */
 /*SHARED*/
  
 #define   Interior(p,rule)        t1_Interior(p,rule)
@@ -45,7 +45,7 @@
 int t1_Overlap();             /* returns a Boolean; TRUE if regions overlap   */
 #endif
 
-#define   INFINITY    t1_Infinity
+#define   TT_INFINITY    t1_Infinity
  
 /*END SHARED*/
 /*SHARED*/
Index: xc/lib/font/bitmap/bdfutils.c
diff -u xc/lib/font/bitmap/bdfutils.c:1.5 xc/lib/font/bitmap/bdfutils.c:1.6
--- xc/lib/font/bitmap/bdfutils.c:1.5	Sat Jul 17 01:55:11 1999
+++ xc/lib/font/bitmap/bdfutils.c	Wed Apr  5 11:13:25 2000
@@ -45,11 +45,12 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.5 1999/07/17 08:55:11 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.6 2000/04/05 18:13:25 dawes Exp $ */
 
 #ifndef FONTMODULE
 #include <ctype.h>
 #include <stdio.h>
+#include <stdarg.h>
 #endif
 
 #include "fntfilst.h"
@@ -57,11 +58,6 @@
 /* use bitmap structure */
 #include "bitmap.h"
 #include "bdfint.h"
-#if NeedVarargsPrototypes
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 int bdfFileLineNum;
 
Index: xc/lib/lbxutil/delta/lbxdelta.c
diff -u xc/lib/lbxutil/delta/lbxdelta.c:1.3 xc/lib/lbxutil/delta/lbxdelta.c:1.5
--- xc/lib/lbxutil/delta/lbxdelta.c:1.3	Tue Mar  2 03:49:23 1999
+++ xc/lib/lbxutil/delta/lbxdelta.c	Wed Jun  7 15:03:02 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Dale Tonogai, Network Computing Devices
  */
-/* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.3 1999/03/02 11:49:23 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.5 2000/06/07 22:03:02 tsi Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -48,15 +48,14 @@
  * Allocate data structures needed for doing Delta compaction
  */
 int
-LBXInitDeltaCache(pcache, nDeltas, maxDeltasize)
-    LBXDeltasPtr	pcache;
-    int			nDeltas;
-    int			maxDeltasize;
+LBXInitDeltaCache(LBXDeltasPtr	pcache,
+		  int		nDeltas,
+		  int		maxDeltasize)
 {
     int			i;
     unsigned char	*mem;
 
-    if (pcache->nDeltas = nDeltas) {
+    if ((pcache->nDeltas = nDeltas)) {
 	pcache->maxDeltasize = maxDeltasize;
 	if ((pcache->deltas = (LBXDeltaElemPtr)
 	    xalloc(pcache->nDeltas * sizeof(LBXDeltaElemRec) +
@@ -82,20 +81,18 @@
  * Free data structures used for doing Delta compaction
  */
 void
-LBXFreeDeltaCache(pcache)
-    LBXDeltasPtr pcache;
+LBXFreeDeltaCache(LBXDeltasPtr pcache)
 {
     if (pcache->nDeltas && pcache->deltas)
 	xfree(pcache->deltas);
 }
 
 static int 
-BytesDiff(ptr1, ptr2, n, maxn)
-    register char *ptr1, *ptr2;
-    register int  n;
-    register int  maxn;
+BytesDiff(unsigned char *ptr1, unsigned char *ptr2,
+	  int  n,
+	  int  maxn)
 {
-    register int  result = 0;
+    int  result = 0;
 
     while (n--)
 	if (*(ptr1++) != *(ptr2++))
@@ -110,12 +107,11 @@
  * messages have greater than maxdiff differences, return -1.
  */
 int
-LBXDeltaMinDiffs(pcache, inmsg, inmsglen, maxdiff, pindex)
-    LBXDeltasPtr	pcache;
-    unsigned char	*inmsg;
-    int			inmsglen;
-    int			maxdiff;
-    int			*pindex;
+LBXDeltaMinDiffs(LBXDeltasPtr	pcache,
+		 unsigned char	*inmsg,
+		 int		inmsglen,
+		 int		maxdiff,
+		 int		*pindex)
 {
     int			i, j, k, l = maxdiff + 1;
     int		   	m;
@@ -150,18 +146,17 @@
  * Delta compact a given message
  */
 void
-LBXEncodeDelta(pcache, inmsg, ndiff, index, buf)
-    LBXDeltasPtr	pcache;
-    unsigned char	*inmsg;
-    int			ndiff;
-    int			index;
-    unsigned char	*buf;
+LBXEncodeDelta(LBXDeltasPtr	pcache,
+	       unsigned char	*inmsg,
+	       int		ndiff,
+	       int		index,
+	       unsigned char	*buf)
 {
-    register int	i, off, diff;
+    int			i, off, diff;
     xLbxDiffItem	*deltas = (xLbxDiffItem *)buf;
 
     for (off = i = 0; i < ndiff; off++) {
-	if (diff = inmsg[off] - pcache->deltas[index].buf[off]) {
+	if ((diff = inmsg[off] - pcache->deltas[index].buf[off])) {
 	    deltas[i].offset = off;
 	    deltas[i++].diff = diff;
 	}
@@ -172,12 +167,11 @@
  * Uncompact a message
  */
 int
-LBXDecodeDelta(pcache, deltas, ndiff, index, buf)
-    LBXDeltasPtr	pcache;
-    xLbxDiffItem	*deltas;
-    int			ndiff;
-    int			index;
-    unsigned char	**buf;
+LBXDecodeDelta(LBXDeltasPtr	pcache,
+	       xLbxDiffItem	*deltas,
+	       int		ndiff,
+	       int		index,
+	       unsigned char	**buf)
 {
     int			i;
     int			newindex = pcache->nextDelta;
@@ -225,10 +219,9 @@
  * Add a message to the outgoing delta cache
  */
 void
-LBXAddDeltaOut(pcache, inmsg, inmsglen)
-    LBXDeltasPtr	pcache;
-    unsigned char	*inmsg;
-    int			inmsglen;
+LBXAddDeltaOut(LBXDeltasPtr	pcache,
+	       unsigned char	*inmsg,
+	       int		inmsglen)
 {
     memcpy(pcache->deltas[pcache->nextDelta].buf, inmsg, inmsglen);
     pcache->deltas[pcache->nextDelta].length = inmsglen;
@@ -241,10 +234,9 @@
  * Add a message to the incoming delta cache
  */
 void
-LBXAddDeltaIn(pcache, inmsg, inmsglen)
-    LBXDeltasPtr	pcache;
-    unsigned char	*inmsg;
-    int			inmsglen;
+LBXAddDeltaIn(LBXDeltasPtr	pcache,
+	      unsigned char	*inmsg,
+	      int		inmsglen)
 {
     memcpy(pcache->deltas[pcache->nextDelta].buf, inmsg, inmsglen);
     pcache->deltas[pcache->nextDelta].length = inmsglen;
Index: xc/lib/lbxutil/image/dfaxg42d.c
diff -u xc/lib/lbxutil/image/dfaxg42d.c:1.3 xc/lib/lbxutil/image/dfaxg42d.c:1.4
--- xc/lib/lbxutil/image/dfaxg42d.c:1.3	Sun Dec 20 03:57:16 1998
+++ xc/lib/lbxutil/image/dfaxg42d.c	Thu May 18 16:46:16 2000
@@ -22,7 +22,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/dfaxg42d.c,v 1.3 1998/12/20 11:57:16 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/image/dfaxg42d.c,v 1.4 2000/05/18 23:46:16 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xfuncproto.h>
@@ -45,10 +45,8 @@
  */
 
 static unsigned char
-fetchByte (inbuf)
+fetchByte (unsigned char **inbuf)
 
-unsigned char **inbuf;
-
 {
     unsigned char byte = **inbuf;
     (*inbuf)++;
@@ -61,9 +59,7 @@
  */
 
 static int
-decode_white_run (inbuf)
-
-unsigned char **inbuf;
+decode_white_run (unsigned char **inbuf)
 
 {
     short state = sp_bit;
@@ -100,10 +96,8 @@
  */
 
 static int
-decode_black_run (inbuf)
+decode_black_run (unsigned char **inbuf)
 
-unsigned char **inbuf;
-
 {
     short state = sp_bit + 8;
     short action;
@@ -140,9 +134,7 @@
  */
 
 static int
-decode_uncomp_code (inbuf)
-
-unsigned char **inbuf;
+decode_uncomp_code (unsigned char **inbuf)
 
 {
     short code;
@@ -164,11 +156,9 @@
  */
 
 static void
-fillspan (cp, x, count)
+fillspan (char *cp,
+	  int x, int count)
 
-register char *cp;
-register int x, count;
-
 {
     static unsigned char masks[] =
         { 0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };
@@ -208,9 +198,7 @@
  */
 
 static int
-nextbit (inbuf)
-
-unsigned char **inbuf;
+nextbit (unsigned char **inbuf)
 
 {
     static unsigned char bitMask[8] =
@@ -230,13 +218,11 @@
 
 
 static int
-DecodeFaxG42D (inbuf, refline, pixels_per_line, outbuf)
+DecodeFaxG42D (unsigned char **inbuf,
+	       unsigned char *refline,
+	       int pixels_per_line,
+	       unsigned char *outbuf)
 
-unsigned char **inbuf;
-unsigned char *refline;
-int pixels_per_line;
-unsigned char *outbuf;
-
 {
     int a0 = -1;
     int b1, b2;
@@ -388,15 +374,12 @@
 
 
 int
-LbxImageDecodeFaxG42D (inbuf, outbuf, image_bytes, pixels_per_line,
-		       padded_bytes_per_scanline, reverse_bits)
-
-unsigned char *inbuf;
-unsigned char *outbuf;
-int image_bytes;
-int pixels_per_line;
-int padded_bytes_per_scanline;
-int reverse_bits;
+LbxImageDecodeFaxG42D (unsigned char *inbuf,
+		       unsigned char *outbuf,
+		       int image_bytes,
+		       int pixels_per_line,
+		       int padded_bytes_per_scanline,
+		       int reverse_bits)
 
 {
     int bytes_per_scanline = ROUNDUP8 (pixels_per_line);
Index: xc/lib/lbxutil/image/dpackbits.c
diff -u xc/lib/lbxutil/image/dpackbits.c:1.2 xc/lib/lbxutil/image/dpackbits.c:1.3
--- xc/lib/lbxutil/image/dpackbits.c:1.2	Sun Dec 20 03:57:16 1998
+++ xc/lib/lbxutil/image/dpackbits.c	Thu May 18 16:46:16 2000
@@ -22,7 +22,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/dpackbits.c,v 1.2 1998/12/20 11:57:16 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/image/dpackbits.c,v 1.3 2000/05/18 23:46:16 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xfuncproto.h>
@@ -35,12 +35,10 @@
  */
 
 static void
-DecodePackBits (inbuf, numPixels, outbuf)
+DecodePackBits (char **inbuf,
+		int numPixels,
+		char *outbuf)
 
-char **inbuf;
-int numPixels;
-char *outbuf;
-
 {
     register char *inptr = *inbuf;
     register int n, b;
@@ -81,18 +79,15 @@
 
 
 int
-LbxImageDecodePackBits (inbuf, outbuf, num_scan_lines, scan_line_size)
-
-char *inbuf;
-char *outbuf;
-int num_scan_lines;
-int scan_line_size;
+LbxImageDecodePackBits (char *inbuf,
+			char *outbuf,
+			int num_scan_lines,
+			int scan_line_size)
 
 {
     char *outbuf_start = outbuf;
     int padded_scan_line_size = (scan_line_size % 4) ?
 	scan_line_size + (4 - scan_line_size % 4) : scan_line_size;
-    int scan_line = 0;
 
     while (num_scan_lines > 0)
     {
Index: xc/lib/lbxutil/image/efaxg42d.c
diff -u xc/lib/lbxutil/image/efaxg42d.c:1.2 xc/lib/lbxutil/image/efaxg42d.c:1.3
--- xc/lib/lbxutil/image/efaxg42d.c:1.2	Sun Dec 20 03:57:16 1998
+++ xc/lib/lbxutil/image/efaxg42d.c	Thu May 18 16:46:16 2000
@@ -22,7 +22,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/lbxutil/image/efaxg42d.c,v 1.2 1998/12/20 11:57:16 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/image/efaxg42d.c,v 1.3 2000/05/18 23:46:16 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xfuncproto.h>
@@ -68,10 +68,8 @@
  */
 
 static int
-flushbits (outbuf)
+flushbits (Buffer *outbuf)
 
-Buffer *outbuf;
-
 {
     if (outbuf->bytesLeft > 0)
     {
@@ -94,11 +92,9 @@
  */
 
 static int
-putbits (bits, length, outbuf)
-
-unsigned int bits;
-unsigned int length;
-Buffer *outbuf;
+putbits (unsigned int bits,
+	 unsigned int length,
+	 Buffer *outbuf)
 
 {
     static int mask[9] =
@@ -130,11 +126,9 @@
  */
 
 static int
-putcode (te, outbuf)
+putcode (tableentry *te,
+	 Buffer *outbuf)
 
-tableentry *te;
-Buffer *outbuf;
-
 {
     return (putbits (te->code, te->length, outbuf));
 }
@@ -147,12 +141,10 @@
  */
 
 static int
-putspan (span, tab, outbuf)
-
-int span;
-tableentry *tab;
-Buffer *outbuf;
-
+putspan (int span,
+	 tableentry *tab,
+	 Buffer *outbuf)
+	 
 {
     while (span >= 2624)
     {
@@ -181,12 +173,10 @@
 #define	PIXEL(buf,ix)	((((buf)[(ix)>>3]) >> (7-((ix)&7))) & 1)
 
 static int
-EncodeFaxG42D (inbuf, refline, bits, outbuf)
-
-unsigned char *inbuf;
-unsigned char *refline;
-int bits;
-Buffer *outbuf;
+EncodeFaxG42D (unsigned char *inbuf,
+	       unsigned char *refline,
+	       int bits,
+	       Buffer *outbuf)
 
 {
     short white = 1;
@@ -259,17 +249,14 @@
 
 
 int
-LbxImageEncodeFaxG42D (inbuf, outbuf, outbufSize, image_bytes, pixels_per_line,
-		       padded_bytes_per_scanline, reverse_bits, bytesCompressed)
-
-unsigned char *inbuf;
-unsigned char *outbuf;
-int outbufSize;
-int image_bytes;
-int pixels_per_line;
-int padded_bytes_per_scanline;
-int reverse_bits;
-int *bytesCompressed;
+LbxImageEncodeFaxG42D (unsigned char *inbuf,
+		       unsigned char *outbuf,
+		       int outbufSize,
+		       int image_bytes,
+		       int pixels_per_line,
+		       int padded_bytes_per_scanline,
+		       int reverse_bits,
+		       int *bytesCompressed)
 
 {
     int bytes_per_scanline = ROUNDUP8 (pixels_per_line);
Index: xc/lib/lbxutil/image/epackbits.c
diff -u xc/lib/lbxutil/image/epackbits.c:1.1.1.1 xc/lib/lbxutil/image/epackbits.c:1.2
--- xc/lib/lbxutil/image/epackbits.c:1.1.1.1	Sat Dec 21 19:29:25 1996
+++ xc/lib/lbxutil/image/epackbits.c	Thu May 18 16:46:16 2000
@@ -44,20 +44,17 @@
     
 
 static int
-EncodePackBits (inbuf, numPixels, outbuf, bytesLeft)
+EncodePackBits (char *inbuf,
+		int numPixels,
+		char **outbuf,
+		int *bytesLeft)
 
-char *inbuf;
-int numPixels;
-char **outbuf;
-int *bytesLeft;
-
 {
     register int pixelsLeft = numPixels;
     register char *outptr = *outbuf;
     register char *lastliteral;
     register int n, b;
     enum { BASE, LITERAL, RUN, LITERAL_RUN } state;
-    int slop;
 
     state = BASE;
     lastliteral = 0;
@@ -176,17 +173,14 @@
 
 
 int
-LbxImageEncodePackBits (inbuf, outbuf, outbufSize, format, depth,
-    num_scan_lines, scan_line_size, bytesCompressed)
-
-char *inbuf;
-char *outbuf;
-int outbufSize;
-int format;
-int depth;
-int num_scan_lines;
-int scan_line_size;
-int *bytesCompressed;
+LbxImageEncodePackBits (char *inbuf,
+			char *outbuf,
+			int outbufSize,
+			int format,
+			int depth,
+			int num_scan_lines,
+			int scan_line_size,
+			int *bytesCompressed)
 
 {
     char *outbuf_start = outbuf;
Index: xc/lib/lbxutil/image/lbxfax.h
diff -u xc/lib/lbxutil/image/lbxfax.h:1.1.1.1 xc/lib/lbxutil/image/lbxfax.h:1.2
--- xc/lib/lbxutil/image/lbxfax.h:1.1.1.1	Sat Dec 21 19:29:25 1996
+++ xc/lib/lbxutil/image/lbxfax.h	Thu May 18 16:46:16 2000
@@ -47,3 +47,7 @@
 
 extern tableentry TIFFFaxWhiteCodes[];
 extern tableentry TIFFFaxBlackCodes[];
+
+/* misc.c */
+extern int LbxImageFindDiff ( unsigned char *cp, int bs, int be, int color );
+extern void LbxReverseBits ( unsigned char *cp, int n );
Index: xc/lib/lbxutil/image/misc.c
diff -u xc/lib/lbxutil/image/misc.c:1.1.1.1 xc/lib/lbxutil/image/misc.c:1.2
--- xc/lib/lbxutil/image/misc.c:1.1.1.1	Sat Dec 21 19:29:25 1996
+++ xc/lib/lbxutil/image/misc.c	Thu May 18 16:46:16 2000
@@ -28,6 +28,8 @@
  * by the LBX server and proxy.
  */
 
+#include "lbxfax.h"
+
 static unsigned char zeroruns[256] = {
     8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,	/* 0x00 - 0x0f */
     3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,	/* 0x10 - 0x1f */
@@ -111,16 +113,14 @@
  */
 
 static int
-findspan (bpp, bs, be, tab)
-
-unsigned char **bpp;
-int bs, be;
-register unsigned char *tab;
+findspan (unsigned char **bpp,
+	  int bs, int be,
+	  unsigned char *tab)
 
 {
-    register unsigned char *bp = *bpp;
-    register int bits = be - bs;
-    register int n, span;
+    unsigned char *bp = *bpp;
+    int bits = be - bs;
+    int n, span;
 
     /*
      * Check partial byte on lhs.
@@ -179,11 +179,9 @@
  */
 
 int
-LbxImageFindDiff (cp, bs, be, color)
+LbxImageFindDiff (unsigned char *cp,
+		  int bs, int be, int color)
 
-unsigned char *cp;
-int bs, be, color;
-
 {
     cp += bs >> 3;			/* adjust byte offset */
     return (bs + findspan (&cp, bs, be, color ? oneruns : zeroruns));
@@ -192,10 +190,9 @@
 
 
 
-LbxReverseBits (cp, n)
-
-register unsigned char *cp;
-register int n;
+void
+LbxReverseBits (unsigned char *cp, 
+		int n)
 
 {
     for (; n > 8; n -= 8)
Index: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c
diff -u xc/lib/lbxutil/lbx_zlib/lbx_zlib.c:1.5 xc/lib/lbxutil/lbx_zlib/lbx_zlib.c:1.6
--- xc/lib/lbxutil/lbx_zlib/lbx_zlib.c:1.5	Sun Dec 20 03:57:19 1998
+++ xc/lib/lbxutil/lbx_zlib/lbx_zlib.c	Thu May 18 16:46:17 2000
@@ -46,7 +46,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
  */
-/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.5 1998/12/20 11:57:19 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.6 2000/05/18 23:46:17 dawes Exp $ */
 
 #ifdef WIN32
 #define _WILLWINSOCK_
@@ -58,7 +58,6 @@
 #ifdef X_NOT_STDC_ENV
 extern int errno;
 #endif
-#include "lbxzlib.h"
 #include <sys/types.h>
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/param.h>
@@ -66,8 +65,7 @@
 #include "lbxbufstr.h"
 #include "lbx_zlib.h"
 #include "os.h"
-
-void ZlibFree();
+#include "lbxzlib.h"
 
 unsigned long stream_out_compressed;
 unsigned long stream_out_uncompressed;
@@ -91,10 +89,11 @@
     struct iovec	    iovbuf[2];
 };
 
+void ZlibFree(struct ZlibInfo *comp);
+
 static int
-init_compress(priv, level)
-    struct compress_private *priv;	/* local pointer to private data */
-    int level;				/* compression level */
+init_compress(struct compress_private *priv,/* local pointer to private data */
+	      int level)	/* compression level */
 {
     priv->cp_outputcount = 0;
 
@@ -115,8 +114,7 @@
 }
 
 static int
-init_decompress(priv)
-    struct compress_private *priv;	/* local pointer to private data */
+init_decompress(struct compress_private *priv)/* local pointer to private data */
 {
     priv->cp_outputcount = 0;
 
@@ -147,10 +145,8 @@
 
 
 static void
-do_compress (priv, flush)
-
-struct compress_private *priv;
-int flush;
+do_compress (struct compress_private *priv,
+	     int flush)
 
 {
     priv->stream.next_in = priv->cp_inputbuf;
@@ -167,9 +163,7 @@
 
 
 static void
-do_decompress (priv)
-
-struct compress_private *priv;
+do_decompress (struct compress_private *priv)
 
 {
     priv->stream.next_in = priv->cp_inputbuf;
@@ -187,8 +181,7 @@
 }
 
 static int
-GetNewPacket(comp)
-    struct ZlibInfo *comp;
+GetNewPacket(struct ZlibInfo *comp)
 {
     register struct compress_private *priv = &comp->decompress_state;
     int				     len;
@@ -218,8 +211,7 @@
 }
 
 static int
-NewPacketAvail(comp)
-    struct ZlibInfo *comp;
+NewPacketAvail(struct ZlibInfo *comp)
 {
     register struct compress_private *priv = &comp->decompress_state;
     char 			     *pkt;
@@ -231,7 +223,7 @@
 	priv->cp_packet = NULL;
     }
 
-    if (pkt = BYTES_AVAIL(&comp->inbuf, ZLIB_PACKET_HDRLEN)) {
+    if ((pkt = BYTES_AVAIL(&comp->inbuf, ZLIB_PACKET_HDRLEN))) {
 	len = ZLIB_GET_DATALEN(pkt);
 	if (BYTES_AVAIL(&comp->inbuf, len + ZLIB_PACKET_HDRLEN))
 	    return TRUE;
@@ -241,10 +233,9 @@
 }
 
 static int
-PlainWrite(comp, buffer, buflen)
-    struct ZlibInfo *comp;
-    unsigned char  *buffer;
-    int            buflen;
+PlainWrite(struct ZlibInfo *comp,
+	   unsigned char  *buffer,
+	   int            buflen)
 {
     int		   retval;
     int		   lenleft = buflen;
@@ -253,7 +244,7 @@
 	register struct iovec *iov = comp->iovbuf;
 	while (lenleft) {
 	    int outlen, written;
-	    if (outlen = iov[1].iov_len) {
+	    if ((outlen = iov[1].iov_len)) {
 		iov[1].iov_base = (caddr_t) buffer;
 	    }
 	    else {
@@ -297,13 +288,10 @@
  * Initialize ZLIB compressor
  */
 void *
-ZlibInit(fd, level)
-    int fd;
-    int level;		/* compression level */
+ZlibInit(int fd,
+	 int level)		/* compression level */
 {
-    register struct compress_private *priv;
     struct ZlibInfo		     *comp;
-    int				     Hsize;
     int				     ret1, ret2;
 
     if ((comp = (struct ZlibInfo *)Xalloc(sizeof(struct ZlibInfo))) == NULL)
@@ -335,8 +323,7 @@
 }
 
 void
-ZlibFree(comp)
-    struct ZlibInfo *comp;
+ZlibFree(struct ZlibInfo *comp)
 {
     if (!comp)
 	return;
@@ -353,7 +340,7 @@
 }
 
 int
-ZlibFlush(fd)
+ZlibFlush(int fd)
 {
     struct ZlibInfo *comp = per_fd[fd];
     struct compress_private *priv = &comp->compress_state;
@@ -373,10 +360,9 @@
 }
 
 int
-ZlibStuffInput(fd,buffer,buflen)
-    int		    fd;
-    unsigned char   *buffer;
-    int		    buflen;
+ZlibStuffInput(int fd,
+	       unsigned char *buffer,
+	       int buflen)
 {
     struct ZlibInfo	    *comp = per_fd[fd];
 
@@ -386,24 +372,21 @@
 }
 
 void
-ZlibCompressOn(fd)
-    int fd;
+ZlibCompressOn(int fd)
 {
     per_fd[fd]->compress_off = FALSE;
 }
 
 void
-ZlibCompressOff(fd)
-    int fd;
+ZlibCompressOff(int fd)
 {
     per_fd[fd]->compress_off = TRUE;
 }
 
 int
-ZlibWriteV(fd, iov, iovcnt)
-    int		   fd;
-    struct iovec   *iov;
-    int		   iovcnt;
+ZlibWriteV(int		   fd,
+	   struct iovec   *iov,
+	   int		   iovcnt)
 {
     int	i;
     int	total = 0;
@@ -425,10 +408,9 @@
 }
 
 int
-ZlibWrite(fd, buffer, buflen)
-    int		   fd;
-    unsigned char  *buffer;
-    int            buflen;
+ZlibWrite(int		   fd,
+	  unsigned char  *buffer,
+	  int            buflen)
 {
     struct ZlibInfo	    *comp = per_fd[fd];
     struct compress_private *priv = &comp->compress_state;
@@ -474,10 +456,9 @@
 }
 
 int
-ZlibRead(fd, buffer, buflen)
-    int		   fd;
-    unsigned char  *buffer;
-    int		   buflen;
+ZlibRead(int		fd,
+	 unsigned char  *buffer,
+	 int		buflen)
 {
     struct ZlibInfo	    *comp = per_fd[fd];
     struct compress_private *priv = &comp->decompress_state;
@@ -550,8 +531,7 @@
 }
 
 int
-ZlibInputAvail(fd)
-    int	fd;
+ZlibInputAvail(int fd)
 {
     struct ZlibInfo	    *comp = per_fd[fd];
     struct compress_private *priv = &comp->decompress_state;
Index: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h
diff -u xc/lib/lbxutil/lbx_zlib/lbx_zlib.h:1.5 xc/lib/lbxutil/lbx_zlib/lbx_zlib.h:1.7
--- xc/lib/lbxutil/lbx_zlib/lbx_zlib.h:1.5	Sat Mar 13 19:21:20 1999
+++ xc/lib/lbxutil/lbx_zlib/lbx_zlib.h	Wed Jun  7 15:03:02 2000
@@ -46,7 +46,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
  */
-/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.5 1999/03/14 03:21:20 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.7 2000/06/07 22:03:02 tsi Exp $ */
 
 #include "zlib.h"
 #include "Xfuncproto.h"
@@ -110,20 +110,15 @@
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #endif
 
-void
-FreeInput(
-#if NeedFunctionPrototypes
-    ZlibBufferPtr	/* inbuf */,
-    int			/* len */
-#endif
-);
 
-int
-GetInputPtr(
-#if NeedFunctionPrototypes
-    int			/* fd */,
-    ZlibBufferPtr	/* inbuf */,
-    int			/* reqlen */,
-    unsigned char **	/* ppkt */
-#endif
-);
+/* lbx_zlib_io.c */
+extern int InitZlibBuffer ( ZlibBufferPtr b, int size );
+extern void FreeZlibBuffer ( ZlibBufferPtr b );
+extern int GetInputPtr ( int fd, ZlibBufferPtr inbuf, int reqlen, 
+			 unsigned char **ppkt );
+extern int StuffInput ( ZlibBufferPtr inbuf, unsigned char *pkt, int reqlen );
+extern void FreeInput ( ZlibBufferPtr inbuf, int len );
+extern char * ReserveOutBuf ( ZlibBufferPtr outbuf, int outlen );
+extern void CommitOutBuf ( ZlibBufferPtr outbuf, int outlen );
+extern int FlushOutBuf ( int fd, ZlibBufferPtr outbuf );
+extern int FlushIovBuf ( int fd, struct iovec *iovbuf );
Index: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c
diff -u xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c:1.9 xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c:1.10
--- xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c:1.9	Sat Mar 13 19:21:20 1999
+++ xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c	Wed Jun  7 15:03:02 2000
@@ -22,7 +22,7 @@
  *
  * Author:  Dale Tonogai, Network Computing Devices
  */
-/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v 1.9 1999/03/14 03:21:20 dawes Exp $ */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v 1.10 2000/06/07 22:03:02 tsi Exp $ */
 
 #ifdef WIN32
 #define _WILLWINSOCK_
@@ -150,7 +150,7 @@
 int
 StuffInput(inbuf, pkt, reqlen)
     ZlibBufferPtr inbuf;
-    char	 *pkt;
+    unsigned char *pkt;
     int		 reqlen;
 {
     int		 readbytes;
Index: xc/lib/lbxutil/lbx_zlib/reqstats.c
diff -u xc/lib/lbxutil/lbx_zlib/reqstats.c:1.1.1.2 xc/lib/lbxutil/lbx_zlib/reqstats.c:1.3
--- xc/lib/lbxutil/lbx_zlib/reqstats.c:1.1.1.2	Sun Sep 27 00:59:25 1998
+++ xc/lib/lbxutil/lbx_zlib/reqstats.c	Tue Jun 27 14:26:33 2000
@@ -23,6 +23,7 @@
 from The Open Group.
 
 */
+/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.c,v 1.3 2000/06/27 21:26:33 tsi Exp $ */
 
 #ifdef LBXREQSTATS
 
@@ -49,7 +50,7 @@
 struct ReqStats CoreRequestStats[128];
 struct ReqStats LbxRequestStats[LbxNumberReqs];
 
-void LbxPrintReqStats ();
+static void LbxPrintReqStats (int);
 
 char *X_ReqNames[128] = {
     0,				    /*  0  */
@@ -227,7 +228,8 @@
 
 
 
-InitLbxReqStats ()
+void
+InitLbxReqStats (void)
 
 {
     bzero (CoreRequestStats, 128 * sizeof (struct ReqStats));
@@ -236,12 +238,11 @@
     signal (SIGUSR1, LbxPrintReqStats);
 }
 
-
-PrintStatsTable (table, count, reqNames)
 
-struct ReqStats *table;
-int count;
-char **reqNames;
+static void
+PrintStatsTable (struct ReqStats *table,
+		 int count,
+		 char **reqNames)
 
 {
     int i;
@@ -284,14 +285,12 @@
 	check_sum_in_compressed += table[i].comp_bytes;
     }
 }
-
 
-PrintDeltaStats (table, count, reqNames)
+static void
+PrintDeltaStats (struct ReqStats *table,
+		 int count,
+		 char **reqNames)
 
-struct ReqStats *table;
-int count;
-char **reqNames;
-
 {
     int i;
 
@@ -306,11 +305,9 @@
     }
 }
 
-
-void
-LbxPrintReqStats (dummy)
 
-int dummy;
+static void
+LbxPrintReqStats (int dummy)
 
 {
     unsigned long total;
@@ -363,9 +360,8 @@
 }
 
 
-do_decompress_with_stats (priv)
-
-struct compress_private *priv;
+void
+do_decompress_with_stats (struct compress_private *priv)
 
 {
     int incount = priv->cp_inputbufend - priv->cp_inputbuf;
@@ -492,13 +488,9 @@
     priv->cp_inputbuf = priv->stream.next_in;
     priv->cp_outputbuf = priv->stream.next_out;
 }
-
-#else /* LBXREQSTATS */
 
-_LbxEmptyFunction ()
+#else
 
-{
-    ;
-}
+static char ANSICCanBeSoBloatingAtTimes = 1;
 
 #endif /* LBXREQSTATS */
Index: xc/lib/psres/psresos2.def
diff -u /dev/null xc/lib/psres/psresos2.def:1.1
--- /dev/null	Sat Jul  1 20:45:06 2000
+++ xc/lib/psres/psresos2.def	Wed Apr  5 11:13:25 2000
@@ -0,0 +1,29 @@
+LIBRARY psres
+DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/psres/psresos2.def,v 1.1 2000/04/05 18:13:25 dawes Exp $"
+CODE
+	PRELOAD
+DATA
+	MULTIPLE NONSHARED
+STACKSIZE 32768
+EXPORTS
+	CheckPSResourceTime @ 1
+	EnumeratePSResourceFiles @ 2
+	FreePSResourceStorage @ 3
+	InSavedList @ 4
+	ListPSResourceFiles @ 5
+	ListPSResourceTypes @ 6
+	PSResEncoding @ 7
+	PSResFileWarningHandler @ 8
+	PSResFontAFM @ 9
+	PSResFontBDF @ 10
+	PSResFontBDFSizes @ 11
+	PSResFontFamily @ 12
+	PSResFontOutline @ 13
+	PSResFontPrebuilt @ 14 
+	PSResForm @ 15
+	PSResFree @ 16
+	PSResMalloc @ 17
+	PSResPattern @ 18
+	PSResProcSet @ 19
+	PSResRealloc @ 20
+	SetPSResourcePolicy @ 21
Index: xc/lib/psres/psresos2.rsp
diff -u /dev/null xc/lib/psres/psresos2.rsp:1.1
--- /dev/null	Sat Jul  1 20:45:06 2000
+++ xc/lib/psres/psresos2.rsp	Wed Apr  5 11:13:26 2000
@@ -0,0 +1,3 @@
+PSres.obj /NOI /NOL /NOD /BAT
+psres.dll
+psres.map
Index: xc/lib/xkbfile/XKBconfig.h
diff -u xc/lib/xkbfile/XKBconfig.h:3.1 xc/lib/xkbfile/XKBconfig.h:3.4
--- xc/lib/xkbfile/XKBconfig.h:3.1	Sun Dec 22 22:03:57 1996
+++ xc/lib/xkbfile/XKBconfig.h	Mon Jun 19 08:00:44 2000
@@ -27,6 +27,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
+/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.4 2000/06/19 15:00:44 tsi Exp $ */
 
 
 typedef struct _XkbConfigRtrn	*XkbConfigRtrnPtr;
@@ -93,6 +94,7 @@
 #define	XkbCF_AccessXTimeoutOptsOn	(1L<<7)
 #define	XkbCF_AccessXTimeoutOptsOff	(1L<<8)
 #define	XkbCF_GroupsWrap		(1L<<9)
+#define	XkbCF_InitialOpts		(1L<<10)
 
 typedef struct _XkbConfigRtrn {
 	unsigned		defined;
@@ -119,9 +121,14 @@
 	char *			symbols;
 	char *			types;
 	char *			compat;
+
 	Bool			replace_initial_ctrls;
 	unsigned long		initial_ctrls;
 	unsigned long		initial_ctrls_clear;
+
+	Bool			replace_initial_opts;
+	unsigned short		initial_opts;
+	unsigned short		initial_opts_clear;
 
 	XkbConfigModInfoRec	initial_mods;
 	XkbConfigModInfoRec	internal_mods;
Index: xc/lib/xkbfile/xkbconfig.c
diff -u xc/lib/xkbfile/xkbconfig.c:3.2 xc/lib/xkbfile/xkbconfig.c:3.4
--- xc/lib/xkbfile/xkbconfig.c:3.2	Sun Dec 29 05:43:39 1996
+++ xc/lib/xkbfile/xkbconfig.c	Wed Jun 14 11:20:33 2000
@@ -24,6 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
+/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.4 2000/06/14 18:20:33 dawes Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
@@ -274,6 +275,7 @@
 #define	_XkbCF_InternalMods		35
 
 #define	_XkbCF_GroupsWrap		36
+#define	_XkbCF_InitialFeedback		37
 
 static Bool
 #if NeedFunctionPrototypes
@@ -343,6 +345,10 @@
 	*opts_rtrn= XkbAX_IndicatorFBMask;
     else if (_XkbStrCaseCmp(name,"stickykeys")==0)
 	*opts_rtrn= XkbAX_StickyKeysFBMask;
+    else if (_XkbStrCaseCmp(name,"twokeys")==0)
+	*opts_rtrn= XkbAX_TwoKeysMask;
+    else if (_XkbStrCaseCmp(name,"latchtolock")==0)
+	*opts_rtrn= XkbAX_LatchToLockMask;
     else if (_XkbStrCaseCmp(name,"slowkeysrelease")==0)
 	*opts_rtrn= XkbAX_SKReleaseFBMask;
     else if (_XkbStrCaseCmp(name,"slowkeysreject")==0)
@@ -524,9 +530,9 @@
 XkbCFScanResultRec	val;
 char **			str;
 int			merge;
-unsigned long *		ctrls;
-unsigned short *	opts;
-int *			pival;
+unsigned long *		ctrls, ctrls_mask;
+unsigned short *	opts, opts_mask;
+int *			pival, sign;
 int			onoff;
 XkbConfigUnboundModPtr	last;
 unsigned		what;
@@ -611,7 +617,6 @@
 	    break;
 	case _XkbCF_InitialCtrls:
 	    rtrn->defined|= XkbCF_InitialCtrls;
-	    opts= NULL;
 	    ctrls= NULL;
 	    if (tok==XkbCF_PlusEquals)
 		ctrls= &rtrn->initial_ctrls;
@@ -636,9 +641,10 @@
 		    rtrn->error= XkbCF_ExpectedControl;
 		    return False;
 		}
-		if (!AddCtrlByName(rtrn,val.str,ctrls)) {
+		if (!AddCtrlByName(rtrn,val.str,&ctrls_mask)) {
 		    return False;
 		}
+		*ctrls |= ctrls_mask;
 		tok= XkbCFScan(file,&val,rtrn);
 		if ((tok!=XkbCF_EOL)&&(tok!=XkbCF_EOF)&&(tok!=XkbCF_Semi)) {
 		    if (tok!=XkbCF_Plus) {
@@ -651,18 +657,6 @@
 	    break;
 	case _XkbCF_AccessXTimeoutCtrlsOn:
 	case _XkbCF_AccessXTimeoutCtrlsOff:
-	case _XkbCF_AccessXTimeoutOptsOff:
-	case _XkbCF_AccessXTimeoutOptsOn:
-	    if (field->field_id==_XkbCF_AccessXTimeoutOptsOff)
-		field->field_id= _XkbCF_AccessXTimeoutCtrlsOff;
-	    else if (field->field_id==_XkbCF_AccessXTimeoutCtrlsOn)
-		field->field_id= _XkbCF_AccessXTimeoutCtrlsOn;
-
-	    if (field->field_id==_XkbCF_AccessXTimeoutCtrlsOff)
-		rtrn->defined|= XkbCF_AccessXTimeoutCtrlsOff;
-	    else if (field->field_id==_XkbCF_AccessXTimeoutCtrlsOn)
-		rtrn->defined|= XkbCF_AccessXTimeoutCtrlsOn;
-
 	    opts= NULL;
 	    if (tok==XkbCF_MinusEquals) {
 		ctrls= &rtrn->axt_ctrls_ignore;
@@ -697,9 +691,10 @@
 		    rtrn->error= XkbCF_ExpectedControl;
 		    return False;
 		}
-		if (!AddCtrlByName(rtrn,val.str,ctrls)) {
-		    if (!AddAXTimeoutOptByName(rtrn,val.str,opts))
+		if (!AddCtrlByName(rtrn,val.str,&ctrls_mask)) {
+		    if (!AddAXTimeoutOptByName(rtrn,val.str,&opts_mask))
 			return False;
+		    *opts |= opts_mask;
 		    if (field->field_id==_XkbCF_AccessXTimeoutCtrlsOff) {
 			rtrn->defined|= XkbCF_AccessXTimeoutOptsOff;
 			if (rtrn->replace_axt_ctrls_off)
@@ -711,6 +706,8 @@
 			    rtrn->replace_axt_opts_on= True;
 		    }
 		}
+		else
+		    *ctrls |= ctrls_mask;
 		tok= XkbCFScan(file,&val,rtrn);
 		if ((tok!=XkbCF_EOL)&&(tok!=XkbCF_EOF)&&(tok!=XkbCF_Semi)) {
 		    if (tok!=XkbCF_Plus) {
@@ -721,6 +718,92 @@
 		}
 	    }
 	    break;
+	case _XkbCF_InitialFeedback:
+	    rtrn->defined|= XkbCF_InitialOpts;
+	    opts= NULL;
+	    if (tok==XkbCF_PlusEquals)
+		opts= &rtrn->initial_opts;
+	    else if (tok==XkbCF_MinusEquals)
+		opts= &rtrn->initial_opts_clear;
+	    else if (tok==XkbCF_Equals) {
+		opts= &rtrn->initial_opts;
+		rtrn->replace_initial_opts= True;
+		*opts= 0;
+	    }
+	    else {
+		rtrn->error= XkbCF_MissingEquals;
+		goto BAILOUT;
+	    }
+	    tok= XkbCFScan(file,&val,rtrn);
+	    if ((tok==XkbCF_EOL)||(tok==XkbCF_Semi)||(tok==XkbCF_EOF)) {
+		rtrn->error= XkbCF_ExpectedAXOption;
+		return False;
+	    }
+	    while ((tok!=XkbCF_EOL)&&(tok!=XkbCF_Semi)&&(tok!=XkbCF_EOF)) {
+		if ((tok!=XkbCF_Ident)&&(tok!=XkbCF_String)) {
+		    rtrn->error= XkbCF_ExpectedAXOption;
+		    return False;
+		}
+		if (!AddAXTimeoutOptByName(rtrn,val.str,&opts_mask)) {
+		    return False;
+		}
+		*opts |= opts_mask;
+		tok= XkbCFScan(file,&val,rtrn);
+		if ((tok!=XkbCF_EOL)&&(tok!=XkbCF_EOF)&&(tok!=XkbCF_Semi)) {
+		    if (tok!=XkbCF_Plus) {
+			rtrn->error= XkbCF_ExpectedOperator;
+			return False;
+		    }
+		    tok= XkbCFScan(file,&val,rtrn);
+		}
+	    }
+	    break;
+	case _XkbCF_AccessXTimeoutOptsOff:
+	case _XkbCF_AccessXTimeoutOptsOn:
+	    opts= NULL;
+	    if (tok==XkbCF_MinusEquals)
+		opts= &rtrn->axt_opts_ignore;
+	    else if ((tok==XkbCF_PlusEquals)||(tok==XkbCF_Equals)) {
+		if (field->field_id==_XkbCF_AccessXTimeoutOptsOff) {
+		    opts= &rtrn->axt_opts_off;
+		    if (tok==XkbCF_Equals)
+			rtrn->replace_axt_opts_off= True;
+		}
+		else {
+		    opts= &rtrn->axt_opts_on;
+		    if (tok==XkbCF_Equals)
+			rtrn->replace_axt_opts_on= True;
+		}
+		*opts = 0;
+	    }
+	    else {
+		rtrn->error= XkbCF_MissingEquals;
+		goto BAILOUT;
+	    }
+	    tok= XkbCFScan(file,&val,rtrn);
+	    if ((tok==XkbCF_EOL)||(tok==XkbCF_Semi)||(tok==XkbCF_EOF)) {
+		rtrn->error= XkbCF_ExpectedControl;
+		return False;
+	    }
+	    while ((tok!=XkbCF_EOL)&&(tok!=XkbCF_Semi)&&(tok!=XkbCF_EOF)) {
+		if ((tok!=XkbCF_Ident)&&(tok!=XkbCF_String)) {
+		    rtrn->error= XkbCF_ExpectedControl;
+		    return False;
+		}
+		if (!AddAXTimeoutOptByName(rtrn,val.str,&opts_mask))
+		    return False;
+		*opts |= opts_mask;
+
+		tok= XkbCFScan(file,&val,rtrn);
+		if ((tok!=XkbCF_EOL)&&(tok!=XkbCF_EOF)&&(tok!=XkbCF_Semi)) {
+		    if (tok!=XkbCF_Plus) {
+			rtrn->error= XkbCF_ExpectedOperator;
+			return False;
+		    }
+		    tok= XkbCFScan(file,&val,rtrn);
+		}
+	    }
+	    break;
 	case _XkbCF_ClickVolume:	
 	    if (!pival) {
 		pival= &rtrn->click_volume;
@@ -772,6 +855,13 @@
 		goto BAILOUT;
 	    }
 	    tok= XkbCFScan(file,&val,rtrn);
+	    if (tok == XkbCF_Minus && field->field_id == _XkbCF_MouseKeysCurve) {
+		/* This can be a negative value */
+		tok = XkbCFScan(file,&val,rtrn);
+		sign = -1;
+	    }
+	    else
+		sign = 1;
 	    if (tok!=XkbCF_Integer) {
 		Bool ok= False;
 		if ((onoff)&&(tok==XkbCF_Ident)&&(val.str!=NULL)) {
@@ -789,7 +879,7 @@
 		    goto BAILOUT;
 		}
 	    }
-	    *pival= val.ival;
+	    *pival= val.ival * sign;
 	    rtrn->defined|= XkbCF_AccessXTimeout;
 	    tok= XkbCFScan(file,&val,rtrn);
 	    if ((tok!=XkbCF_EOL)&&(tok!=XkbCF_Semi)&&(tok!=XkbCF_EOF)) {
@@ -1120,13 +1210,18 @@
 	{ "axtctrlson",	_XkbCF_AccessXTimeoutCtrlsOn },
 	{ "accessxtimeoutctrlsoff",_XkbCF_AccessXTimeoutCtrlsOff },
 	{ "axtctrlsoff",_XkbCF_AccessXTimeoutCtrlsOff },
+	{ "accessxtimeoutfeedbackon", _XkbCF_AccessXTimeoutOptsOn },
+	{ "axtfeedbackon", _XkbCF_AccessXTimeoutOptsOn },
+	{ "accessxtimeoutfeedbackoff", _XkbCF_AccessXTimeoutOptsOff },
+	{ "axtfeedbackoff", _XkbCF_AccessXTimeoutOptsOff },
 	{ "ignorelockmods",_XkbCF_IgnoreLockMods },
 	{ "ignorelockmodifiers",_XkbCF_IgnoreLockMods },
 	{ "ignoregrouplock",_XkbCF_IgnoreGroupLock },
 	{ "internalmods",_XkbCF_InternalMods },
 	{ "internalmodifiers",_XkbCF_InternalMods },
 	{ "outofrangegroups",_XkbCF_GroupsWrap },
-	{ "groups", _XkbCF_GroupsWrap }
+	{ "groups", _XkbCF_GroupsWrap },
+	{ "feedback", _XkbCF_InitialFeedback },
 };
 #define	_XkbCFNumDfltFields (sizeof(_XkbCFDfltFields)/sizeof(XkbConfigFieldRec))
 
@@ -1344,6 +1439,7 @@
     return False;
 }
 
+/*ARGSUSED*/
 void
 #if NeedFunctionPrototypes
 XkbCFReportError(FILE *file,char *name,int error,int line)
@@ -1387,8 +1483,14 @@
 	default:
 	    msg= "unknown error on line %d"; break;
     }
+#ifndef XKB_IN_SERVER
     fprintf(file,msg,line);
     if (name)	fprintf(file," of %s\n",name);
     else	fprintf(file,"\n");
+#else
+    ErrorF(msg,line);
+    if (name)	ErrorF(" of %s\n",name);
+    else	ErrorF("\n");
+#endif
     return;
 }
Index: xc/lib/xtrans/Xtranssock.c
diff -u xc/lib/xtrans/Xtranssock.c:3.45 xc/lib/xtrans/Xtranssock.c:3.47
--- xc/lib/xtrans/Xtranssock.c:3.45	Sun Dec 26 16:39:29 1999
+++ xc/lib/xtrans/Xtranssock.c	Thu May 11 11:14:10 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.45 1999/12/27 00:39:29 robin Exp $ */
+/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.47 2000/05/11 18:14:10 tsi Exp $ */
 
 /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
  *
@@ -302,7 +302,8 @@
 
     PRMSG (3,"SocketINETGetAddr(%x)\n", ciptr, 0, 0);
 
-    if (getsockname (ciptr->fd,(struct sockaddr *) &sockname, &namelen) < 0)
+    if (getsockname (ciptr->fd,(struct sockaddr *) &sockname,
+		     (void *)&namelen) < 0)
     {
 	PRMSG (1,"SocketINETGetAddr: getsockname() failed: %d\n",
 	    EGET(),0, 0);
@@ -347,7 +348,8 @@
 
     PRMSG (3,"SocketINETGetPeerAddr(%x)\n", ciptr, 0, 0);
 
-    if (getpeername (ciptr->fd, (struct sockaddr *) &sockname, &namelen) < 0)
+    if (getpeername (ciptr->fd, (struct sockaddr *) &sockname,
+		     (void *)&namelen) < 0)
     {
 	PRMSG (1,"SocketINETGetPeerAddr: getpeername() failed: %d\n",
 	    EGET(), 0, 0);
@@ -714,7 +716,7 @@
     return -1;
 }
 
-
+#ifdef UNIXCONN
 static int
 set_sun_path(const char *port, const char *upath, char *path)
 {
@@ -735,6 +737,7 @@
     }
     return 0;
 }
+#endif
 
 #ifdef TRANS_SERVER
 
@@ -1089,7 +1092,7 @@
     }
 
     if ((newciptr->fd = accept (ciptr->fd,
-	(struct sockaddr *) &sockname, &namelen)) < 0)
+	(struct sockaddr *) &sockname, (void *)&namelen)) < 0)
     {
 	PRMSG (1, "SocketINETAccept: accept() failed\n", 0, 0, 0);
 	xfree (newciptr);
@@ -1169,7 +1172,7 @@
     }
 
     if ((newciptr->fd = accept (ciptr->fd,
-	(struct sockaddr *) &sockname, &namelen)) < 0)
+	(struct sockaddr *) &sockname, (void *)&namelen)) < 0)
     {
 	PRMSG (1, "SocketUNIXAccept: accept() failed\n", 0, 0, 0);
 	xfree (newciptr);
Index: xc/lib/xtrans/Xtransutil.c
diff -u xc/lib/xtrans/Xtransutil.c:3.14 xc/lib/xtrans/Xtransutil.c:3.15
--- xc/lib/xtrans/Xtransutil.c:3.14	Sun Jun 20 01:41:24 1999
+++ xc/lib/xtrans/Xtransutil.c	Wed Apr  5 11:13:27 2000
@@ -22,7 +22,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.14 1999/06/20 08:41:24 dawes Exp $ */
+/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.15 2000/04/05 18:13:27 dawes Exp $ */
 
 /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
  *
@@ -143,13 +143,13 @@
     }
 #endif /* defined(DNETCONN) */
 
-#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
+#if defined(UNIXCONN) || defined(LOCALCONN)
     case AF_UNIX:
     {
 	*familyp=FamilyLocal;
 	break;
     }
-#endif /* defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)*/
+#endif /* defined(UNIXCONN) || defined(LOCALCONN) */
 
 #if defined(AMRPCCONN)
     case AF_AMOEBA:
@@ -233,7 +233,7 @@
 
     switch (family)
     {
-#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
+#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN)
     case AF_UNIX:
     {
 	struct sockaddr_un *saddr = (struct sockaddr_un *) addr;
@@ -243,8 +243,7 @@
 	    hostnamebuf, saddr->sun_path);
 	break;
     }
-#endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
-*/
+#endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) */
 
 #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
     case AF_INET:
@@ -317,15 +316,14 @@
     switch (family)
     {
     case AF_UNSPEC:
-#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
+#if defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN)
     case AF_UNIX:
     {
 	if (gethostname (addrbuf, sizeof (addrbuf)) == 0)
 	    addr = addrbuf;
 	break;
     }
-#endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
-*/
+#endif /* defined(UNIXCONN) || defined(STREAMSCONN) || defined(LOCALCONN) */
 
 #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
     case AF_INET:
Index: xc/nls/locale.alias
diff -u xc/nls/locale.alias:1.21 xc/nls/locale.alias:1.24
--- xc/nls/locale.alias:1.21	Sat Feb 12 22:15:29 2000
+++ xc/nls/locale.alias	Tue Apr  4 12:24:45 2000
@@ -5,7 +5,7 @@
 XCOMM	The first word is the alias name (simplified locale name)
 XCOMM	the second word is full locale name.
 XCOMM
-XCOMM	$XFree86: xc/nls/locale.alias,v 1.21 2000/02/13 06:15:29 dawes Exp $
+XCOMM	$XFree86: xc/nls/locale.alias,v 1.24 2000/04/04 19:24:45 dawes Exp $
 XCOMM
 #ifdef R63_COMPAT
 XCOMM These entries are in the old format (no ':')
@@ -44,6 +44,7 @@
 cs_CS.ISO8859-2					cs_CZ.ISO8859-2
 cs_CZ						cs_CZ.ISO8859-2
 cs_CZ.iso88592					cs_CZ.ISO8859-2
+cs_CZ.ISO_8859-2				cs_CZ.ISO8859-2
 XCOMM cz is old name for cs, should be deleted in the future:
 cz						cs_CZ.ISO8859-2
 cz_CZ						cs_CZ.ISO8859-2
@@ -323,6 +324,7 @@
 lt						lt_LT.ISO8859-4
 lt_LT						lt_LT.ISO8859-4
 lt_LT.iso88594					lt_LT.ISO8859-4
+lt_LT.ISO_8859-4				lt_LT.ISO8859-4
 lt_LT.iso885915					lt_LT.ISO8859-15
 lv						lv_LV.ISO8859-4
 lv_LV						lv_LV.ISO8859-4
@@ -461,7 +463,7 @@
 chinese-s					zh_CN.eucCN
 chinese-t					zh_TW.eucTW
 croatian					hr_HR.ISO8859-2
-czech						cs_CS.ISO8859-2
+czech						cs_CZ.ISO8859-2
 danish.iso88591					da_DK.ISO8859-1
 dutch.iso88591					nl_BE.ISO8859-1
 english.iso88591				en_EN.ISO8859-1
@@ -546,6 +548,7 @@
 cs_CS.ISO8859-2:				cs_CZ.ISO8859-2
 cs_CZ:						cs_CZ.ISO8859-2
 cs_CZ.iso88592:					cs_CZ.ISO8859-2
+cs_CZ.ISO_8859-2:				cs_CZ.ISO8859-2
 XCOMM cz is old name for cs, should be deleted in the future:
 cz:						cs_CZ.ISO8859-2
 cz_CZ:						cs_CZ.ISO8859-2
@@ -819,6 +822,7 @@
 lt:						lt_LT.ISO8859-4
 lt_LT:						lt_LT.ISO8859-4
 lt_LT.iso88594:					lt_LT.ISO8859-4
+lt_LT.ISO_8859-4:				lt_LT.ISO8859-4
 lt_LT.iso885915:				lt_LT.ISO8859-15
 lv:						lv_LV.ISO8859-4
 lv_LV:						lv_LV.ISO8859-4
@@ -957,7 +961,7 @@
 chinese-s:					zh_CN.eucCN
 chinese-t:					zh_TW.eucTW
 croatian:					hr_HR.ISO8859-2
-czech:						cs_CS.ISO8859-2
+czech:						cs_CZ.ISO8859-2
 danish.iso88591:				da_DK.ISO8859-1
 dutch.iso88591:					nl_BE.ISO8859-1
 english.iso88591:				en_EN.ISO8859-1
Index: xc/nls/Compose/Imakefile
diff -u xc/nls/Compose/Imakefile:1.8 xc/nls/Compose/Imakefile:1.9
--- xc/nls/Compose/Imakefile:1.8	Sat Aug 28 02:00:33 1999
+++ xc/nls/Compose/Imakefile	Thu Mar 16 13:59:40 2000
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/9 1998/06/29 09:17:20 kaleb $
-XCOMM $XFree86: xc/nls/Compose/Imakefile,v 1.8 1999/08/28 09:00:33 dawes Exp $
+XCOMM $XFree86: xc/nls/Compose/Imakefile,v 1.9 2000/03/16 21:59:40 dawes Exp $
 
 #ifndef Win32Architecture
 #ifndef OS2Architecture
@@ -31,6 +31,9 @@
 ComposeTarget(georgian-academy)
 ComposeTarget(georgian-ps)
 ComposeTarget(ibm-cp1133)
+ComposeTarget(iso8859-1)
+ComposeTarget(iso8859-2)
+ComposeTarget(iso8859-3)
 ComposeTarget(iso8859-4)
 ComposeTarget(iso8859-5)
 ComposeTarget(iso8859-6)
Index: xc/nls/Compose/iso8859-1
diff -u xc/nls/Compose/iso8859-1:1.3 xc/nls/Compose/iso8859-1:1.4
--- xc/nls/Compose/iso8859-1:1.3	Fri Oct  2 01:13:56 1998
+++ xc/nls/Compose/iso8859-1	Tue Jun 13 16:15:49 2000
@@ -2,6 +2,9 @@
 #
 # ISO 8859-1 (Latin1) Compose Sequence
 #
+#
+# $XFree86: xc/nls/Compose/iso8859-1,v 1.4 2000/06/13 23:15:49 dawes Exp $
+#
 # Sequence Definition
 #
 # <Multi_key> Means <Compose>
@@ -212,6 +215,8 @@
 <Multi_key> <a> <asterisk>		: "\345"	aring
 <Multi_key> <asterisk> <a>		: "\345"	aring
 <Multi_key> <a> <e>			: "\346"	ae
+<Multi_key> <acute> <C>                 : "\307"        Ccedilla
+<Multi_key> <acute> <c>                 : "\347"        ccedilla
 <Multi_key> <C> <comma>			: "\307"	Ccedilla
 <Multi_key> <comma> <C>			: "\307"	Ccedilla
 <Multi_key> <c> <comma>			: "\347"	ccedilla
@@ -379,6 +384,7 @@
 <dead_tilde> <space>			: "~"	asciitilde
 <dead_grave> <space>			: "`"	grave
 <dead_acute> <space>			: "'"	apostrophe
+<dead_doubleacute> <space>		: "\""	quotedbl
 <dead_circumflex> <0>			: "\260"	degree
 <dead_circumflex> <1>			: "\271"	onesuperior
 <dead_circumflex> <2>			: "\262"	twosuperior
@@ -435,14 +441,24 @@
 <dead_grave> <U>			: "\331"	Ugrave
 <dead_acute> <U>			: "\332"	Uacute
 <dead_circumflex> <U>			: "\333"	Ucircumflex
+<dead_doubleacute> <U>			: "\334"	Udiaeresis
 <dead_diaeresis> <U>			: "\334"	Udiaeresis
 <dead_grave> <u>			: "\371"	ugrave
 <dead_acute> <u>			: "\372"	uacute
 <dead_circumflex> <u>			: "\373"	ucircumflex
+<dead_doubleacute> <u>			: "\374"	udiaeresis
 <dead_diaeresis> <u>			: "\374"	udiaeresis
 <dead_acute> <Y>			: "\335"	Yacute
 <dead_acute> <y>			: "\375"	yacute
 <dead_diaeresis> <y>			: "\377"	ydiaeresis
+<dead_acute> <C>                        : "\307"        Ccedilla
+<dead_acute> <c>                        : "\347"        ccedilla
+<dead_acute> <dead_acute>               : "'"           apostrophe
+<dead_grave> <dead_grave>               : "`"           grave
+<dead_diaeresis> <space>                : "\""          quotedbl
+<dead_diaeresis> <dead_diaeresis>       : "\""          quotedbl
+<dead_tilde> <dead_tilde>               : "~"           asciitilde
+<dead_circumflex> <dead_circumflex>     : "^"           asciicircum
 #
 # Ctrl<T> Means <Compose>
 # Special Character
Index: xc/util/memleak/fmalloc.c
diff -u xc/util/memleak/fmalloc.c:3.6 xc/util/memleak/fmalloc.c:3.8
--- xc/util/memleak/fmalloc.c:3.6	Fri Feb 11 19:40:07 2000
+++ xc/util/memleak/fmalloc.c	Wed Jun 14 18:26:22 2000
@@ -22,7 +22,7 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/util/memleak/fmalloc.c,v 3.6 2000/02/12 03:40:07 dawes Exp $ */
+/* $XFree86: xc/util/memleak/fmalloc.c,v 3.8 2000/06/15 01:26:22 dawes Exp $ */
 
 
 /*
@@ -157,6 +157,7 @@
 unsigned long	FindLeakFreeBreakpoint = ~0;
 unsigned long	FindLeakTime;
 int		FindLeakCheckAlways = 0;
+int		FindLeakValidateAlways = 0;
 
 static void MarkActiveBlock ();
 static int  tree_insert (), tree_delete ();
@@ -550,6 +551,11 @@
 	endOfStaticMemory = (mem *) sbrk(0);
     if (FindLeakCheckAlways)
 	CheckMemory ();
+    else if (FindLeakValidateAlways)
+    {
+	ValidateActiveMemory ();
+	ValidateFreedMemory ();
+    }
     size = RoundUp(desiredsize);
     totalsize = TotalSize (size);
 
@@ -631,6 +637,11 @@
     AddFreedBlock (h);
     if (FindLeakCheckAlways)
 	CheckMemory ();
+    else if (FindLeakValidateAlways)
+    {
+	ValidateActiveMemory ();
+	ValidateFreedMemory ();
+    }
 }
 
 char *
@@ -645,6 +656,8 @@
     new = malloc (desiredsize);
     if (!new)
 	return NULL;
+    if (!old)
+	return new;
     SEARCH(activeMemory, h, old);
     if (!h)
     {
Index: xc/doc/man/GL/glx/Imakefile
diff -u xc/doc/man/GL/glx/Imakefile:1.3 xc/doc/man/GL/glx/Imakefile:1.4
--- xc/doc/man/GL/glx/Imakefile:1.3	Sun Mar  7 06:23:30 1999
+++ xc/doc/man/GL/glx/Imakefile	Tue Mar 21 11:57:01 2000
@@ -15,28 +15,38 @@
 XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc.
 XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
 XCOMM
-XCOMM $XFree86: xc/doc/man/GL/glx/Imakefile,v 1.3 1999/03/07 14:23:30 dawes Exp $
+XCOMM $XFree86: xc/doc/man/GL/glx/Imakefile,v 1.4 2000/03/21 19:57:01 dawes Exp $
 
 MANDIR = $(LIBMANDIR)
 MANSUFFIX = $(LIBMANSUFFIX)
 MSUFF = man
 
-MAN_PAGES = \
-glXChooseVisual.$(MSUFF)          glXCopyContext.$(MSUFF)           \
-glXCreateContext.$(MSUFF)         glXCreateGLXPixmap.$(MSUFF)       \
-glXDestroyContext.$(MSUFF)        glXDestroyGLXPixmap.$(MSUFF)      \
-glXFreeContextEXT.$(MSUFF)        glXGetClientString.$(MSUFF)       \
-glXGetConfig.$(MSUFF)             glXGetContextIDEXT.$(MSUFF)       \
-glXGetCurrentContext.$(MSUFF)     glXGetCurrentDisplay.$(MSUFF)     \
-glXGetCurrentDrawable.$(MSUFF)    glXImportContextEXT.$(MSUFF)      \
-glXIntro.$(MSUFF)                 glXIsDirect.$(MSUFF)              \
-glXMakeCurrent.$(MSUFF)           glXQueryContextInfoEXT.$(MSUFF)   \
-glXQueryExtension.$(MSUFF)        glXQueryExtensionsString.$(MSUFF) \
-glXQueryServerString.$(MSUFF)     glXQueryVersion.$(MSUFF)          \
-glXSwapBuffers.$(MSUFF)           glXUseXFont.$(MSUFF)              \
-glXWaitGL.$(MSUFF)                glXWaitX.$(MSUFF)                 
-
-InstallMultipleMan($(MAN_PAGES),$(LIBMANDIR))
+InstallManPage(glXChooseVisual,$(MANDIR))
+InstallManPage(glXCopyContext,$(MANDIR))
+InstallManPage(glXCreateContext,$(MANDIR))
+InstallManPage(glXCreateGLXPixmap,$(MANDIR))
+InstallManPage(glXDestroyContext,$(MANDIR))
+InstallManPage(glXDestroyGLXPixmap,$(MANDIR))
+InstallManPage(glXFreeContextEXT,$(MANDIR))
+InstallManPage(glXGetClientString,$(MANDIR))
+InstallManPage(glXGetConfig,$(MANDIR))
+InstallManPage(glXGetContextIDEXT,$(MANDIR))
+InstallManPage(glXGetCurrentContext,$(MANDIR))
+InstallManPage(glXGetCurrentDisplay,$(MANDIR))
+InstallManPage(glXGetCurrentDrawable,$(MANDIR))
+InstallManPage(glXImportContextEXT,$(MANDIR))
+InstallManPage(glXIntro,$(MANDIR))
+InstallManPage(glXIsDirect,$(MANDIR))
+InstallManPage(glXMakeCurrent,$(MANDIR))
+InstallManPage(glXQueryContextInfoEXT,$(MANDIR))
+InstallManPage(glXQueryExtension,$(MANDIR))
+InstallManPage(glXQueryExtensionsString,$(MANDIR))
+InstallManPage(glXQueryServerString,$(MANDIR))
+InstallManPage(glXQueryVersion,$(MANDIR))
+InstallManPage(glXSwapBuffers,$(MANDIR))
+InstallManPage(glXUseXFont,$(MANDIR))
+InstallManPage(glXWaitGL,$(MANDIR))
+InstallManPage(glXWaitX,$(MANDIR))
 
 LinkFile(glXChooseVisual.$(MSUFF), xchoosevisual.3gl)
 LinkFile(glXCopyContext.$(MSUFF), xcopycontext.3gl)
Index: xc/doc/man/GL/glx/xchoosevisual.3gl
diff -u xc/doc/man/GL/glx/xchoosevisual.3gl:1.1 xc/doc/man/GL/glx/xchoosevisual.3gl:1.2
--- xc/doc/man/GL/glx/xchoosevisual.3gl:1.1	Sun Feb 28 18:14:01 1999
+++ xc/doc/man/GL/glx/xchoosevisual.3gl	Tue Mar 21 15:17:11 2000
@@ -8,7 +8,7 @@
 .ds Xs 58988 14 xchoosevisual.gl
 .TH GLXCHOOSEVISUAL
 .SH NAME
-.B "glXChooseVisual
+glXChooseVisual
 \- return a visual that matches specified attributes
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xcopycontext.3gl
diff -u xc/doc/man/GL/glx/xcopycontext.3gl:1.1 xc/doc/man/GL/glx/xcopycontext.3gl:1.2
--- xc/doc/man/GL/glx/xcopycontext.3gl:1.1	Sun Feb 28 18:14:01 1999
+++ xc/doc/man/GL/glx/xcopycontext.3gl	Tue Mar 21 15:17:12 2000
@@ -8,7 +8,7 @@
 .ds Xs 49166 6 xcopycontext.gl
 .TH GLXCOPYCONTEXT
 .SH NAME
-.B "glXCopyContext
+glXCopyContext
 \- copy state from one rendering context to another
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xcreatecontext.3gl
diff -u xc/doc/man/GL/glx/xcreatecontext.3gl:1.1 xc/doc/man/GL/glx/xcreatecontext.3gl:1.2
--- xc/doc/man/GL/glx/xcreatecontext.3gl:1.1	Sun Feb 28 18:14:01 1999
+++ xc/doc/man/GL/glx/xcreatecontext.3gl	Tue Mar 21 15:17:12 2000
@@ -8,7 +8,7 @@
 .ds Xs 16965 8 xcreatecontext.gl
 .TH GLXCREATECONTEXT
 .SH NAME
-.B "glXCreateContext
+glXCreateContext
 \- create a new GLX rendering context
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xcreateglxpixmap.3gl
diff -u xc/doc/man/GL/glx/xcreateglxpixmap.3gl:1.1 xc/doc/man/GL/glx/xcreateglxpixmap.3gl:1.2
--- xc/doc/man/GL/glx/xcreateglxpixmap.3gl:1.1	Sun Feb 28 18:14:01 1999
+++ xc/doc/man/GL/glx/xcreateglxpixmap.3gl	Tue Mar 21 15:17:12 2000
@@ -8,7 +8,7 @@
 .ds Xs 62493 5 xcreateglxpixmap.gl
 .TH GLXCREATEGLXPIXMAP
 .SH NAME
-.B "glXCreateGLXPixmap
+glXCreateGLXPixmap
 \- create an off-screen GLX rendering area
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xdestroycontext.3gl
diff -u xc/doc/man/GL/glx/xdestroycontext.3gl:1.1 xc/doc/man/GL/glx/xdestroycontext.3gl:1.2
--- xc/doc/man/GL/glx/xdestroycontext.3gl:1.1	Sun Feb 28 18:14:02 1999
+++ xc/doc/man/GL/glx/xdestroycontext.3gl	Tue Mar 21 15:17:12 2000
@@ -8,7 +8,7 @@
 .ds Xs 5532 2 xdestroycontext.gl
 .TH GLXDESTROYCONTEXT
 .SH NAME
-.B "glXDestroyContext
+glXDestroyContext
 \- destroy a GLX context
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xdestroyglxpixmap.3gl
diff -u xc/doc/man/GL/glx/xdestroyglxpixmap.3gl:1.1 xc/doc/man/GL/glx/xdestroyglxpixmap.3gl:1.2
--- xc/doc/man/GL/glx/xdestroyglxpixmap.3gl:1.1	Sun Feb 28 18:14:02 1999
+++ xc/doc/man/GL/glx/xdestroyglxpixmap.3gl	Tue Mar 21 15:17:12 2000
@@ -8,7 +8,7 @@
 .ds Xs 2275 2 xdestroyglxpixmap.gl
 .TH GLXDESTROYGLXPIXMAP
 .SH NAME
-.B "glXDestroyGLXPixmap
+glXDestroyGLXPixmap
 \- destroy a GLX pixmap
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xfreecontextext.3gl
diff -u xc/doc/man/GL/glx/xfreecontextext.3gl:1.1 xc/doc/man/GL/glx/xfreecontextext.3gl:1.2
--- xc/doc/man/GL/glx/xfreecontextext.3gl:1.1	Sun Feb 28 18:14:02 1999
+++ xc/doc/man/GL/glx/xfreecontextext.3gl	Tue Mar 21 15:17:13 2000
@@ -8,7 +8,7 @@
 .ds Xs 37853 3 xfreecontextext.gl
 .TH GLXFREECONTEXTEXT
 .SH NAME
-.B "glXFreeContextEXT
+glXFreeContextEXT
 \- free client-side memory for imported context
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xgetclientstring.3gl
diff -u xc/doc/man/GL/glx/xgetclientstring.3gl:1.1 xc/doc/man/GL/glx/xgetclientstring.3gl:1.2
--- xc/doc/man/GL/glx/xgetclientstring.3gl:1.1	Sun Feb 28 18:14:02 1999
+++ xc/doc/man/GL/glx/xgetclientstring.3gl	Tue Mar 21 15:17:13 2000
@@ -8,7 +8,7 @@
 .ds Xs 29851 4 xgetclientstring.gl
 .TH GLXGETCLIENTSTRING
 .SH NAME
-.B "glXGetClientString
+glXGetClientString
 \- return a string describing the client
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xgetconfig.3gl
diff -u xc/doc/man/GL/glx/xgetconfig.3gl:1.1 xc/doc/man/GL/glx/xgetconfig.3gl:1.2
--- xc/doc/man/GL/glx/xgetconfig.3gl:1.1	Sun Feb 28 18:14:03 1999
+++ xc/doc/man/GL/glx/xgetconfig.3gl	Tue Mar 21 15:17:13 2000
@@ -8,7 +8,7 @@
 .ds Xs 60987 10 xgetconfig.gl
 .TH GLXGETCONFIG
 .SH NAME
-.B "glXGetConfig
+glXGetConfig
 \- return information about GLX visuals
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xgetcontextidext.3gl
diff -u xc/doc/man/GL/glx/xgetcontextidext.3gl:1.1 xc/doc/man/GL/glx/xgetcontextidext.3gl:1.2
--- xc/doc/man/GL/glx/xgetcontextidext.3gl:1.1	Sun Feb 28 18:14:03 1999
+++ xc/doc/man/GL/glx/xgetcontextidext.3gl	Tue Mar 21 15:17:13 2000
@@ -8,7 +8,7 @@
 .ds Xs 25633 3 xgetcontextidext.gl
 .TH GLXGETCONTEXTIDEXT
 .SH NAME
-.B "glXGetContextIDEXT
+glXGetContextIDEXT
 \- get the XID for a context.
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xgetcurrentcontext.3gl
diff -u xc/doc/man/GL/glx/xgetcurrentcontext.3gl:1.1 xc/doc/man/GL/glx/xgetcurrentcontext.3gl:1.2
--- xc/doc/man/GL/glx/xgetcurrentcontext.3gl:1.1	Sun Feb 28 18:14:03 1999
+++ xc/doc/man/GL/glx/xgetcurrentcontext.3gl	Tue Mar 21 15:17:14 2000
@@ -7,7 +7,7 @@
 .ds Xs 49308 2 xgetcurrentcontext.gl
 .TH GLXGETCURRENTCONTEXT
 .SH NAME
-.B "glXGetCurrentContext
+glXGetCurrentContext
 \- return the current context
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xgetcurrentdisplay.3gl
diff -u xc/doc/man/GL/glx/xgetcurrentdisplay.3gl:1.1 xc/doc/man/GL/glx/xgetcurrentdisplay.3gl:1.2
--- xc/doc/man/GL/glx/xgetcurrentdisplay.3gl:1.1	Sun Feb 28 18:14:03 1999
+++ xc/doc/man/GL/glx/xgetcurrentdisplay.3gl	Tue Mar 21 15:17:14 2000
@@ -8,7 +8,7 @@
 .ds Xs 59497 2 xgetcurrentdisplay.gl
 .TH GLXGETCURRENTDISPLAY
 .SH NAME
-.B "glXGetCurrentDisplay
+glXGetCurrentDisplay
 \- get display for current context
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xgetcurrentdrawable.3gl
diff -u xc/doc/man/GL/glx/xgetcurrentdrawable.3gl:1.1 xc/doc/man/GL/glx/xgetcurrentdrawable.3gl:1.2
--- xc/doc/man/GL/glx/xgetcurrentdrawable.3gl:1.1	Sun Feb 28 18:14:03 1999
+++ xc/doc/man/GL/glx/xgetcurrentdrawable.3gl	Tue Mar 21 15:17:14 2000
@@ -7,7 +7,7 @@
 .ds Xs 49921 2 xgetcurrentdrawable.gl
 .TH GLXGETCURRENTDRAWABLE
 .SH NAME
-.B "glXGetCurrentDrawable
+glXGetCurrentDrawable
 \- return the current drawable
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/ximportcontextext.3gl
diff -u xc/doc/man/GL/glx/ximportcontextext.3gl:1.1 xc/doc/man/GL/glx/ximportcontextext.3gl:1.2
--- xc/doc/man/GL/glx/ximportcontextext.3gl:1.1	Sun Feb 28 18:14:04 1999
+++ xc/doc/man/GL/glx/ximportcontextext.3gl	Tue Mar 21 15:17:14 2000
@@ -8,7 +8,7 @@
 .ds Xs 38402 4 ximportcontextext.gl
 .TH GLXIMPORTCONTEXTEXT
 .SH NAME
-.B "glXImportContextEXT
+glXImportContextEXT
 \- import another process's indirect rendering context.
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xintro.3gl
diff -u xc/doc/man/GL/glx/xintro.3gl:1.1 xc/doc/man/GL/glx/xintro.3gl:1.2
--- xc/doc/man/GL/glx/xintro.3gl:1.1	Sun Feb 28 18:14:04 1999
+++ xc/doc/man/GL/glx/xintro.3gl	Tue Mar 21 15:17:14 2000
@@ -8,7 +8,7 @@
 .ds Xs 32008 15 xintro.gl
 .TH GLXINTRO
 .SH NAME
-.B "glXIntro
+glXIntro
 \- Introduction to OpenGL in the X window system
 
 .SH OVERVIEW
Index: xc/doc/man/GL/glx/xisdirect.3gl
diff -u xc/doc/man/GL/glx/xisdirect.3gl:1.1 xc/doc/man/GL/glx/xisdirect.3gl:1.2
--- xc/doc/man/GL/glx/xisdirect.3gl:1.1	Sun Feb 28 18:14:04 1999
+++ xc/doc/man/GL/glx/xisdirect.3gl	Tue Mar 21 15:17:15 2000
@@ -8,7 +8,7 @@
 .ds Xs 12384 2 xisdirect.gl
 .TH GLXISDIRECT
 .SH NAME
-.B "glXIsDirect
+glXIsDirect
 \- indicate whether direct rendering is enabled
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xmakecurrent.3gl
diff -u xc/doc/man/GL/glx/xmakecurrent.3gl:1.1 xc/doc/man/GL/glx/xmakecurrent.3gl:1.2
--- xc/doc/man/GL/glx/xmakecurrent.3gl:1.1	Sun Feb 28 18:14:04 1999
+++ xc/doc/man/GL/glx/xmakecurrent.3gl	Tue Mar 21 15:17:15 2000
@@ -8,7 +8,7 @@
 .ds Xs 28564 7 xmakecurrent.gl
 .TH GLXMAKECURRENT
 .SH NAME
-.B "glXMakeCurrent
+glXMakeCurrent
 \- attach a GLX context to a window or a GLX pixmap
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xquerycontextinfoext.3gl
diff -u xc/doc/man/GL/glx/xquerycontextinfoext.3gl:1.1 xc/doc/man/GL/glx/xquerycontextinfoext.3gl:1.2
--- xc/doc/man/GL/glx/xquerycontextinfoext.3gl:1.1	Sun Feb 28 18:14:05 1999
+++ xc/doc/man/GL/glx/xquerycontextinfoext.3gl	Tue Mar 21 15:17:15 2000
@@ -8,7 +8,7 @@
 .ds Xs 51469 3 xquerycontextinfoext.gl
 .TH GLXQUERYCONTEXTINFOEXT
 .SH NAME
-.B "glXQueryContextInfoEXT
+glXQueryContextInfoEXT
 \- query context information
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xqueryextension.3gl
diff -u xc/doc/man/GL/glx/xqueryextension.3gl:1.1 xc/doc/man/GL/glx/xqueryextension.3gl:1.2
--- xc/doc/man/GL/glx/xqueryextension.3gl:1.1	Sun Feb 28 18:14:05 1999
+++ xc/doc/man/GL/glx/xqueryextension.3gl	Tue Mar 21 15:17:15 2000
@@ -8,7 +8,7 @@
 .ds Xs 25267 2 xqueryextension.gl
 .TH GLXQUERYEXTENSION
 .SH NAME
-.B "glXQueryExtension
+glXQueryExtension
 \- indicate whether the GLX extension is supported
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xqueryextensionsstring.3gl
diff -u xc/doc/man/GL/glx/xqueryextensionsstring.3gl:1.1 xc/doc/man/GL/glx/xqueryextensionsstring.3gl:1.2
--- xc/doc/man/GL/glx/xqueryextensionsstring.3gl:1.1	Sun Feb 28 18:14:05 1999
+++ xc/doc/man/GL/glx/xqueryextensionsstring.3gl	Tue Mar 21 15:17:15 2000
@@ -8,7 +8,7 @@
 .ds Xs 26309 3 xqueryextensionsstring.gl
 .TH GLXQUERYEXTENSIONSSTRING
 .SH NAME
-.B "glXQueryExtensionsString
+glXQueryExtensionsString
 \- return list of supported extensions
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xqueryserverstring.3gl
diff -u xc/doc/man/GL/glx/xqueryserverstring.3gl:1.1 xc/doc/man/GL/glx/xqueryserverstring.3gl:1.2
--- xc/doc/man/GL/glx/xqueryserverstring.3gl:1.1	Sun Feb 28 18:14:05 1999
+++ xc/doc/man/GL/glx/xqueryserverstring.3gl	Tue Mar 21 15:17:16 2000
@@ -8,7 +8,7 @@
 .ds Xs 52600 3 xqueryserverstring.gl
 .TH GLXQUERYSERVERSTRING
 .SH NAME
-.B "glXQueryServerString
+glXQueryServerString
 \- return string describing the server
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xqueryversion.3gl
diff -u xc/doc/man/GL/glx/xqueryversion.3gl:1.1 xc/doc/man/GL/glx/xqueryversion.3gl:1.2
--- xc/doc/man/GL/glx/xqueryversion.3gl:1.1	Sun Feb 28 18:14:06 1999
+++ xc/doc/man/GL/glx/xqueryversion.3gl	Tue Mar 21 15:17:16 2000
@@ -8,7 +8,7 @@
 .ds Xs 36423 3 xqueryversion.gl
 .TH GLXQUERYVERSION
 .SH NAME
-.B "glXQueryVersion
+glXQueryVersion
 \- return the version numbers of the GLX extension
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xswapbuffers.3gl
diff -u xc/doc/man/GL/glx/xswapbuffers.3gl:1.1 xc/doc/man/GL/glx/xswapbuffers.3gl:1.2
--- xc/doc/man/GL/glx/xswapbuffers.3gl:1.1	Sun Feb 28 18:14:06 1999
+++ xc/doc/man/GL/glx/xswapbuffers.3gl	Tue Mar 21 15:17:16 2000
@@ -8,7 +8,7 @@
 .ds Xs 58040 5 xswapbuffers.gl
 .TH GLXSWAPBUFFERS
 .SH NAME
-.B "glXSwapBuffers
+glXSwapBuffers
 \- exchange front and back buffers
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xusexfont.3gl
diff -u xc/doc/man/GL/glx/xusexfont.3gl:1.1 xc/doc/man/GL/glx/xusexfont.3gl:1.2
--- xc/doc/man/GL/glx/xusexfont.3gl:1.1	Sun Feb 28 18:14:06 1999
+++ xc/doc/man/GL/glx/xusexfont.3gl	Tue Mar 21 15:17:16 2000
@@ -8,7 +8,7 @@
 .ds Xs 55673 5 xusexfont.gl
 .TH GLXUSEXFONT
 .SH NAME
-.B "glXUseXFont
+glXUseXFont
 \- create bitmap display lists from an X font
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xwaitgl.3gl
diff -u xc/doc/man/GL/glx/xwaitgl.3gl:1.1 xc/doc/man/GL/glx/xwaitgl.3gl:1.2
--- xc/doc/man/GL/glx/xwaitgl.3gl:1.1	Sun Feb 28 18:14:06 1999
+++ xc/doc/man/GL/glx/xwaitgl.3gl	Tue Mar 21 15:17:17 2000
@@ -8,7 +8,7 @@
 .ds Xs 20224 2 xwaitgl.gl
 .TH GLXWAITGL
 .SH NAME
-.B "glXWaitGL
+glXWaitGL
 \- complete GL execution prior to subsequent X calls
 
 .SH C SPECIFICATION
Index: xc/doc/man/GL/glx/xwaitx.3gl
diff -u xc/doc/man/GL/glx/xwaitx.3gl:1.1 xc/doc/man/GL/glx/xwaitx.3gl:1.2
--- xc/doc/man/GL/glx/xwaitx.3gl:1.1	Sun Feb 28 18:14:06 1999
+++ xc/doc/man/GL/glx/xwaitx.3gl	Tue Mar 21 15:17:17 2000
@@ -8,7 +8,7 @@
 .ds Xs 20029 2 xwaitx.gl
 .TH GLXWAITX
 .SH NAME
-.B "glXWaitX
+glXWaitX
 \- complete X execution prior to subsequent GL calls
 
 .SH C SPECIFICATION
Index: xc/doc/man/Xv/Xv.man
diff -u xc/doc/man/Xv/Xv.man:1.4 xc/doc/man/Xv/Xv.man:1.5
--- xc/doc/man/Xv/Xv.man:1.4	Tue Mar  2 03:49:13 1999
+++ xc/doc/man/Xv/Xv.man	Tue Mar 21 15:17:19 2000
@@ -1,8 +1,8 @@
 .TH Xv 3X
 .\"
-.\" $XFree86: xc/doc/man/Xv/Xv.man,v 1.4 1999/03/02 11:49:13 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/Xv.man,v 1.5 2000/03/21 23:17:19 dawes Exp $
 .SH Name
-Xv --- X Window System video extension
+Xv \- X Window System video extension
 .SH Description
 The Xv extension provides support for video adaptors attached to an X
 display.  It takes the approach that a display may have one or more
Index: xc/doc/man/Xv/XvGetPortAttribute.man
diff -u xc/doc/man/Xv/XvGetPortAttribute.man:1.4 xc/doc/man/Xv/XvGetPortAttribute.man:1.5
--- xc/doc/man/Xv/XvGetPortAttribute.man:1.4	Tue Mar  2 03:49:14 1999
+++ xc/doc/man/Xv/XvGetPortAttribute.man	Tue Mar 21 15:17:20 2000
@@ -1,5 +1,5 @@
 .TH XvGetPortAttribute 3X
-.\" $XFree86: xc/doc/man/Xv/XvGetPortAttribute.man,v 1.4 1999/03/02 11:49:14 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvGetPortAttribute.man,v 1.5 2000/03/21 23:17:20 dawes Exp $
 .SH Name
 XvGetPortAttribute \- return current port attribute value
 .\"
@@ -48,24 +48,24 @@
 below to return a matching Atom.
 .bp
 .PP
-.\".TS
-.\"tab(@);
-.\"lfHB lfHB lfHB
-.\"lfR  lfR  lfR .
-.\"_
-.\".PP
-.\".sp 4p
-.\"Attribute String@Type@Default
-.\".sp 6p
-.\"_
-.\".sp 6p
-.\""XV_ENCODING"@XvEncodingID@Server dependent
-.\""XV_HUE"@[-1000...1000]@0
-.\""XV_SATURATION"@[-1000...1000]@0
-.\""XV_BRIGHTNESS"@[-1000...1000]@0
-.\""XV_CONTRAST"@[-1000...1000]@0
-.\".sp 6p
-.\".TE
+.\" .TS
+.\" tab(@);
+.\" lfHB lfHB lfHB
+.\" lfR  lfR  lfR .
+.\" _
+.\" .PP
+.\" .sp 4p
+.\" Attribute String@Type@Default
+.\" .sp 6p
+.\" _
+.\" .sp 6p
+.\" "XV_ENCODING"@XvEncodingID@Server dependent
+.\" "XV_HUE"@[-1000...1000]@0
+.\" "XV_SATURATION"@[-1000...1000]@0
+.\" "XV_BRIGHTNESS"@[-1000...1000]@0
+.\" "XV_CONTRAST"@[-1000...1000]@0
+.\" .sp 6p
+.\" .TE
 .nf
 Attribute String        Type             Default
 
@@ -74,7 +74,7 @@
 "XV_SATURATION"         [-1000...1000]   0
 "XV_BRIGHTNESS"         [-1000...1000]   0
 "XV_CONTRAST"           [-1000...1000]   0
-.TE
+.fi
 .SH Returned Values
 .IP [Success] 8
 Returned if XvGetPortAttribute(3X) completed successfully.
Index: xc/doc/man/Xv/XvQueryEncodings.man
diff -u xc/doc/man/Xv/XvQueryEncodings.man:1.4 xc/doc/man/Xv/XvQueryEncodings.man:1.5
--- xc/doc/man/Xv/XvQueryEncodings.man:1.4	Tue Mar  2 03:49:17 1999
+++ xc/doc/man/Xv/XvQueryEncodings.man	Tue Mar 21 15:17:20 2000
@@ -1,5 +1,5 @@
-.TH XvQueryEncodings
-.\" $XFree86: xc/doc/man/Xv/XvQueryEncodings.man,v 1.4 1999/03/02 11:49:17 dawes Exp $
+.TH XvQueryEncodings 3X
+.\" $XFree86: xc/doc/man/Xv/XvQueryEncodings.man,v 1.5 2000/03/21 23:17:20 dawes Exp $
 .SH Name
 XvQueryEncodings \- return list of encodings for an adaptor
 .\"
Index: xc/doc/man/Xv/XvSetPortAttribute.man
diff -u xc/doc/man/Xv/XvSetPortAttribute.man:1.4 xc/doc/man/Xv/XvSetPortAttribute.man:1.5
--- xc/doc/man/Xv/XvSetPortAttribute.man:1.4	Tue Mar  2 03:49:17 1999
+++ xc/doc/man/Xv/XvSetPortAttribute.man	Tue Mar 21 15:17:21 2000
@@ -1,5 +1,5 @@
 .TH XvSetPortAttribute 3X 
-.\" $XFree86: xc/doc/man/Xv/XvSetPortAttribute.man,v 1.4 1999/03/02 11:49:17 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvSetPortAttribute.man,v 1.5 2000/03/21 23:17:21 dawes Exp $
 .SH Name
 XvSetPortAttribute \- sets an attribute of a video port 
 .\"
@@ -39,24 +39,24 @@
 to specified values.  This request supports the following values:
 .bp
 .PP
-.\".TS
-.\"tab(@);
-.\"lfHB lfHB lfHB
-.\"lfR  lfR  lfR .
-.\"_
-.\".PP
-.\".sp 4p
-.\"Attribute String@Type@Default
-.\".sp 6p
-.\"_
-.\".sp 6p
-.\""XV_ENCODING"@XvEncodingID@Server dependent
-.\""XV_HUE"@[-1000...1000]@0
-.\""XV_SATURATION"@[-1000...1000]@0
-.\""XV_BRIGHTNESS"@[-1000...1000]@0
-.\""XV_CONTRAST"@[-1000...1000]@0
-.\".sp 6p
-.\".TE
+.\" .TS
+.\" tab(@);
+.\" lfHB lfHB lfHB
+.\" lfR  lfR  lfR .
+.\" _
+.\" .PP
+.\" .sp 4p
+.\" Attribute String@Type@Default
+.\" .sp 6p
+.\" _
+.\" .sp 6p
+.\" "XV_ENCODING"@XvEncodingID@Server dependent
+.\" "XV_HUE"@[-1000...1000]@0
+.\" "XV_SATURATION"@[-1000...1000]@0
+.\" "XV_BRIGHTNESS"@[-1000...1000]@0
+.\" "XV_CONTRAST"@[-1000...1000]@0
+.\" .sp 6p
+.\" .TE
 .nf
 Attribute String        Type             Default
 
@@ -65,7 +65,7 @@
 "XV_SATURATION"         [-1000...1000]   0
 "XV_BRIGHTNESS"         [-1000...1000]   0
 "XV_CONTRAST"           [-1000...1000]   0
-.TE
+.fi
 .PP
 The supplied encoding must be one of the encodings listed for the
 adaptor, otherwise an Encoding error results.
Index: xc/doc/man/general/Imakefile
diff -u xc/doc/man/general/Imakefile:1.5 xc/doc/man/general/Imakefile:1.6
--- xc/doc/man/general/Imakefile:1.5	Sun Mar 21 05:21:25 1999
+++ xc/doc/man/general/Imakefile	Thu Jun 15 13:49:57 2000
@@ -1,15 +1,17 @@
 XCOMM $TOG: Imakefile /main/7 1997/12/16 11:12:34 barstow $
-XCOMM $XFree86: xc/doc/man/general/Imakefile,v 1.5 1999/03/21 13:21:25 dawes Exp $
+XCOMM $XFree86: xc/doc/man/general/Imakefile,v 1.6 2000/06/15 20:49:57 dawes Exp $
 
 MANDIR = $(MISCMANDIR)
 MANSUFFIX = $(MISCMANSUFFIX)
 
 CppManTarget(X,NullParameter)
+CppManTarget(Consortium,NullParameter)
 CppManTarget(Standards,NullParameter)
 CppManTarget(XProjectTeam,NullParameter)
 CppManTarget(security,NullParameter)
 
 InstallManPage(X,$(MANDIR))
+InstallManPageLong(Consortium,$(MANDIR),XConsortium)
 InstallManPageLong(Standards,$(MANDIR),XStandards)
 InstallManPageLong(XProjectTeam,$(MANDIR),XProjectTeam)
 InstallManPageLong(security,$(MANDIR),Xsecurity)
Index: xc/doc/man/general/Standards.cpp
diff -u xc/doc/man/general/Standards.cpp:1.1 xc/doc/man/general/Standards.cpp:1.2
--- xc/doc/man/general/Standards.cpp:1.1	Sat Nov 15 22:17:28 1997
+++ xc/doc/man/general/Standards.cpp	Thu Jun 22 15:34:33 2000
@@ -1,4 +1,4 @@
-.\" $TOG: Standards.cpp /main/26 1997/10/13 14:20:48 kaleb $
+.\" $TOG: Standards.cpp /main/28 1998/02/02 16:32:53 barstow $
 .\" Copyright (c) 1993, 1994, 1996  X Consortium
 .\" 
 .\" Permission is hereby granted, free of charge, to any person obtaining
@@ -25,72 +25,85 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.TH XSTANDARDS __miscmansuffix__ "Release 6.3" "X Version 11"
+.TH XSTANDARDS __miscmansuffix__ "Release 6.4" "X Version 11"
 .SH NAME
-XStandards \- X Consortium Standards
+XStandards \- X Consortium Standards and X Project Team Specifications
 .SH SYNOPSIS
 The major goal of the X Consortium was to promote cooperation within the
 computer industry in the creation of standard software interfaces at
-all layers
-in the X Window System environment.  The status of various standards, and
-the software in the X11R6.3 distribution, is explained below.
+all layers in the X Window System environment.  
+The X Consortium produced standards - documents which
+defined network protocols, programming interfaces, and
+other aspects of the X environment.  These standards
+continue to exist in The Open Group's X Project Team
+releases.  The X Project Team produces specifications.
+Like X Consortium Standards, these are documents
+which define network protocols, programming interfaces,
+and other aspects of the X environment.  Under the aegis
+of The Open Group, X Consortium standards, X Project
+Team specifications, and other specifications are the
+basis for portions of The Open Group's various CAE
+specifications.
+.PP
+The status of various standards, specifications, and
+the software in the X11R6.4 distribution, is explained below.
 .SH STANDARDS
 The following documents are X Consortium standards:
 .nf
 
 X Window System Protocol
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Robert W. Scheifler
 
 Xlib \- C Language X Interface
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 James Gettys, Robert W. Scheifler, Ron Newman
 
 X Toolkit Intrinsics \- C Language Interface
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Joel McCormack, Paul Asente, Ralph R. Swick, Donna Converse
 
 Bitmap Distribution Format
 Version 2.1
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 
 Inter-Client Communication Conventions Manual
 Version 2.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 David Rosenthal, Stuart W. Marks
 
 Compound Text Encoding
 Version 1.1
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Robert W. Scheifler
 
 X Logical Font Description Conventions
 Version 1.5
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Jim Flowers, Stephen Gildea
 
 X Display Manager Control Protocol
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Keith Packard
 
 X11 Nonrectangular Window Shape Extension
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Keith Packard
 
 X11 Input Extension Protocol Specification
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 George Sachs, Mark Patrick
 
 X11 Input Extension Library Specification
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Mark Patrick, George Sachs
 
 The X Font Service Protocol
 Version 2.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Jim Fulton
 
 PEX Protocol Specification
@@ -103,37 +116,37 @@
 
 Inter-Client Exchange (ICE) Protocol
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Robert Scheifler, Jordan Brown
 
 Inter-Client Exchange (ICE) Library
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Ralph Mor
 
 X Session Management Protocol
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Mike Wexler
 
 X Session Management Library
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Ralph Mor
 
 The Input Method Protocol
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Masahiko Narita, Hideki Hiura
 
 X Synchronization Extension
 Version 3.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Tim Glauert, Dave Carver, Jim Gettys, David P. Wiggins
 
 X Image Extension, Protocol Reference Manual
 Version 5.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Bob Shelley
 
 XTEST Extension
@@ -142,12 +155,12 @@
 
 Big Requests Extension
 Version 2.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Bob Scheifler
 
 XC-MISC Extension
 Version 1.1
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Bob Scheifler, Dave Wiggins
 
 Double Buffer Extension
@@ -163,43 +176,59 @@
 Martha Zimet, Stephen Gildea
 
 X Keyboard Extension Protocol
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Erik Fortune
 
 X Keyboard Extension Library
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Amber J. Benson, Gary Aitken, Erik Fortune, Donna Converse,
 George Sachs, and Will Walker
 
 X Print Extension Protocol
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 
 X Print Extension Library
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 
 X Application Group Extension Protocol and Library
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Kaleb Keithley
 
 X Security Extension Protocol and Library
 Version 4.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Dave Wiggins
 
 X Proxy Manager Protocol
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Ralph Swick
 
 LBX Extension Protocol and Library
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Keith Packard, Dave Lemke, Donna Converse, Ralph Mor, Ray Tice
 
 Remote Execution MIME Type
 Version 1.0
-X Version 11, Release 6.3
+X Version 11, Release 6.4
 Arnaud Le Hors
 .fi
+.SH SPECIFICATIONS
+The following documents are X Project Team specifications:
+.nf
+
+Colormap Utilization Policy and Extension
+Version 1.0
+Kaleb Keithley
+
+Extended Visual Information Extension
+Version 1.0
+Peter Daifuku
+
+X Display Power Management (DPMS) Extension Protocol and Library
+Version 1.0
+Rob Lembree
+
 .SH "DRAFT STANDARDS"
 The following documents are currently draft standards of the X Consortium.
 .nf
@@ -384,15 +413,39 @@
 <X11/extensions/lbxstr.h>
 <X11/extensions/lbxzlib.h>
 .fi
+.PP
+The following include files are part of the Colormap Utilization 
+Policy and Extention specification.
+.PP
+.nf
+<X11/extensions/Xcup.h>
+<X11/extensions/Xcupstr.h>
+.fi
+.PP
+The following include files are part of the Extended Visual
+Information specification.
+.PP
+.nf
+<X11/extensions/XEVI.h>
+<X11/extensions/XEVIstr.h>
+.fi
+.PP
+The following include files are part of the X Display Management
+Signaling Extension specification.
+.PP
+.nf
+<X11/extensions/dpms.h>
+<X11/extensions/dpmsstr.h>
+.fi
 
 .SH "NON STANDARDS"
-The X11R6.3 distribution contains \fIsample\fP implementations, not
+The X11R6.4 distribution contains \fIsample\fP implementations, not
 \fIreference\fP implementations.  Although much of the code is believed
 to be correct, the code should be assumed to be in error wherever it
 conflicts with the specification.
 .PP
 The only X Consortium standards are the ones listed above.
-No other documents, include files, or software in X11R6.3 carry special
+No other documents, include files, or software in X11R6.4 carry special
 status within the X Consortium.  For example, none of the following
 are standards:
 internal interfaces of the sample server;
@@ -402,8 +455,8 @@
 the Xau library;
 the RGB database;
 the X Locale database;
-the fonts distributed with X11R6.3;
-the applications distributed with X11R6.3;
+the fonts distributed with X11R6.4;
+the applications distributed with X11R6.4;
 the include files <X11/XWDFile.h>, <X11/Xfuncproto.h>, <X11/Xfuncs.h>,
 <X11/Xosdefs.h>, <X11/Xos.h>, <X11/Xos_r.h>, <X11/Xwinsock.h>, and 
 <X11/Xthreads.h>;
Index: xc/doc/man/general/X.cpp
diff -u xc/doc/man/general/X.cpp:1.1 xc/doc/man/general/X.cpp:1.2
--- xc/doc/man/general/X.cpp:1.1	Sat Nov 15 22:17:29 1997
+++ xc/doc/man/general/X.cpp	Wed Mar 22 13:23:34 2000
@@ -1038,9 +1038,9 @@
 .SH "SEE ALSO"
 .PP
 .\" introductions
-XConsortium(1),
-XStandards(1),
-Xsecurity(1),
+XProjectTeam(__miscmansuffix__),
+XStandards(__miscmansuffix__),
+Xsecurity(__miscmansuffix__),
 .\" clients, utilities, and demos
 
 appres(1), bdftopcf(1), bitmap(1), editres(1), fsinfo(1),
Index: xc/doc/man/general/security.cpp
diff -u xc/doc/man/general/security.cpp:1.1 xc/doc/man/general/security.cpp:1.2
--- xc/doc/man/general/security.cpp:1.1	Sat Nov 15 22:17:29 1997
+++ xc/doc/man/general/security.cpp	Wed Mar 22 13:23:35 2000
@@ -230,4 +230,4 @@
 .SH FILES
 \&.Xauthority
 .SH "SEE ALSO"
-X(1), xdm(1), xauth(1), xhost(1), xinit(1), Xserver(1)
+X(__miscmansuffix__), xdm(1), xauth(1), xhost(1), xinit(1), Xserver(1)
Index: xc/doc/specs/Xt/appF
diff -u xc/doc/specs/Xt/appF:1.1 xc/doc/specs/Xt/appF:1.2
--- xc/doc/specs/Xt/appF:1.1	Sat Nov 15 22:17:31 1997
+++ xc/doc/specs/Xt/appF	Thu Jun 22 17:44:35 2000
@@ -1,5 +1,4 @@
-
-.\" $TOG: appF /main/1 1997/10/27 17:15:11 barstow $
+.\" $TOG: appF /main/2 1998/01/13 14:38:05 kaleb $
 .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994
 .\" X Consortium
 .\" 
@@ -50,7 +49,7 @@
 .sp 2
 .LP
 .XS
-\fBAppendix B \- Resource Configuration Management\fP
+\fBAppendix F \(em Resource Configuration Management\fP
 .XE
 Setting and changing resources in X applications can be difficult for
 both the application programmer and the end user.  \fBResource
Index: xc/doc/specs/Xv/Imakefile
diff -u xc/doc/specs/Xv/Imakefile:1.1 xc/doc/specs/Xv/Imakefile:1.2
--- xc/doc/specs/Xv/Imakefile:1.1	Thu Mar  2 09:52:59 2000
+++ xc/doc/specs/Xv/Imakefile	Thu Mar  9 14:10:07 2000
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/doc/specs/Xv/Imakefile,v 1.1 2000/03/02 17:52:59 dawes Exp $
+XCOMM $XFree86: xc/doc/specs/Xv/Imakefile,v 1.2 2000/03/09 22:10:07 dawes Exp $
 
-InstallDoc(xv-protocol-v2,xv-protocol.txt)
+InstallDoc(xv-protocol-v2,xv-protocol-v2.txt)
 
Index: xc/doc/specs/programs/Imakefile
diff -u xc/doc/specs/programs/Imakefile:1.1.1.2 xc/doc/specs/programs/Imakefile:1.2
--- xc/doc/specs/programs/Imakefile:1.1.1.2	Fri Feb  9 21:59:17 1996
+++ xc/doc/specs/programs/Imakefile	Thu Jun 15 13:49:57 2000
@@ -1,8 +1,18 @@
 XCOMM $XConsortium: Imakefile /main/10 1996/02/08 01:54:18 gildea $
+XCOMM $XFree86: xc/doc/specs/programs/Imakefile,v 1.2 2000/06/15 20:49:57 dawes Exp $
 
 /* does not include manual pages under util (not X programs)
    or any of the library function manual pages under doc/man */
 
+#ifdef XFree86Version
+XFREE86_MANUALS = \
+  $(TOP)/programs/Xserver/hw/XFree86/XFree86.man \
+  $(TOP)/programs/Xserver/hw/XFree86/XF86Config.man \
+  $(TOP)/programs/Xserver/hw/XFree86/xf86config/xf86conf.man \
+  $(TOP)/programs/Xserver/hw/XFree86/xf86cfg/xf86cfg.man \
+  $(TOP)/programs/Xserver/hw/XFree86/SuperProbe/SuperProbe.man
+#endif
+
 MANUALS = \
   $(TOP)/doc/man/general/X.man \
   $(TOP)/doc/man/general/Standards.man \
@@ -48,14 +58,8 @@
   $(TOP)/programs/Xserver/hw/dec/ws/Xdec.man \
   $(TOP)/programs/xdm/xdm.man \
   $(TOP)/programs/xdpyinfo/xdpyinfo.man \
-  $(TOP)/programs/Xserver/hw/xfree86/XF86Conf.man \
-  $(TOP)/programs/Xserver/hw/xfree86/XF86_Acc.man \
-  $(TOP)/programs/Xserver/hw/xfree86/XF86_Mono.man \
-  $(TOP)/programs/Xserver/hw/xfree86/XF86_SVGA.man \
-  $(TOP)/programs/Xserver/hw/xfree86/XF86_VGA16.man \
-  $(TOP)/programs/Xserver/hw/xfree86/xf86config/xf86conf.man \
+  $(XFREE86_MANUALS) \
   $(TOP)/programs/xfd/xfd.man \
-  $(TOP)/programs/Xserver/hw/xfree86/XFree86.man \
   $(TOP)/programs/xfs/xfs.man \
   $(TOP)/programs/xhost/xhost.man \
   $(TOP)/programs/Xserver/hw/hp/Xhp.man \
Index: xc/doc/specs/xterm/ctlseqs.ms
diff -u xc/doc/specs/xterm/ctlseqs.ms:3.36 xc/doc/specs/xterm/ctlseqs.ms:3.38
--- xc/doc/specs/xterm/ctlseqs.ms:3.36	Fri Mar  3 12:02:05 2000
+++ xc/doc/specs/xterm/ctlseqs.ms	Tue Jun 13 17:16:05 2000
@@ -1,10 +1,10 @@
 .\"#! troff -ms $1		-*- Nroff -*-
 .\" "Xterm Control Sequences" document
 .\" $XConsortium: ctlseqs.ms,v 1.16 94/12/28 20:45:48 gildea Exp $
-.\" $XFree86: xc/doc/specs/xterm/ctlseqs.ms,v 3.36 2000/03/03 20:02:05 dawes Exp $
+.\" $XFree86: xc/doc/specs/xterm/ctlseqs.ms,v 3.38 2000/06/14 00:16:05 dawes Exp $
 .\"
 .\"
-.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey <dickey@clark.net>
+.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey
 .\"
 .\"                         All Rights Reserved
 .\"
@@ -64,7 +64,7 @@
 .\" Originally written by Edward Moy, University of California,
 .\" Berkeley, edmoy@violet.berkeley.edu, for the X.V10R4 xterm.
 .\" The X Consortium staff has since updated it for X11.
-.\" Updated by Thomas Dickey <dickey@clark.net> for XFree86 3.2.
+.\" Updated by Thomas E. Dickey for XFree86 3.2 - XFree86 4.0
 .\"
 .\" Run this file through troff and use the -ms macro package.
 .\"
@@ -925,6 +925,7 @@
   \*(Ps = \*6\*1 \(-> VT100
   \*(Ps = \*6\*2 \(-> VT200
   \*(Ps = \*6\*3 \(-> VT300
+.br
 Valid values for the second parameter:
   \*(Ps = \*0 \(-> 8-bit controls
   \*(Ps = \*1 \(-> 7-bit controls (always set for VT100)
@@ -1234,6 +1235,9 @@
 .TE
 For example, shift-F5 would be sent as
 \*(Cs\*1\*5\*;\*2\*(c~
+
+If the \fBalwaysUseMods\fP resource is set, the Meta modifier also is
+recognized, making parameters 9 through 16.
 .SH
 VT220-Style Function Keys
 .LP
Index: xc/extras/Mesa/include/GL/gl.h
diff -u xc/extras/Mesa/include/GL/gl.h:1.3 xc/extras/Mesa/include/GL/gl.h:1.4
--- xc/extras/Mesa/include/GL/gl.h:1.3	Thu Mar  2 08:06:56 2000
+++ xc/extras/Mesa/include/GL/gl.h	Fri Jun 16 17:02:04 2000
@@ -32,113 +32,57 @@
 #endif
 
 
+/**********************************************************************
+ * Begin system-specific stuff.
+ */
 #if defined(__BEOS__)
 #include <stdlib.h>     /* to get some BeOS-isms */
 #endif
 
-
 #if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
 #define OPENSTEP
 #endif
 
-
-/*
- * XXX move as many of these pragma's and MS Windows-isms into
- * the new src/glheader.h file.
- */
-
 #if defined(_WIN32) && !defined(__WIN32__)
-#	define __WIN32__
+#define __WIN32__
 #endif
 
-#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
-#  pragma warning( disable : 4068 ) /* unknown pragma */
-#  pragma warning( disable : 4710 ) /* function 'foo' not inlined */
-#  pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
-#  pragma warning( disable : 4127 ) /* conditional expression is constant */
-#  if defined(MESA_MINWARN)
-#    pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
-#    pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
-#    pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
-#    pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
-#    pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
-#  endif
+#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__))
 #  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #    define GLAPI __declspec(dllexport)
-#    define WGLAPI __declspec(dllexport)
 #  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
 #    define GLAPI __declspec(dllimport)
-#    define WGLAPI __declspec(dllimport)
 #  else /* for use with static link lib build of Win32 edition only */
 #    define GLAPI extern
-#    define WGLAPI __declspec(dllimport)
 #  endif /* _STATIC_MESA support */
 #  define GLAPIENTRY __stdcall
-#  define GLAPIENTRYP __stdcall *
-#  define GLCALLBACK __stdcall
-#  define GLCALLBACKP __stdcall *
-#  if defined(__CYGWIN32__)
-#    define GLCALLBACKPCAST *
-#  else
-#    define GLCALLBACKPCAST __stdcall *
-#  endif
-#  define GLWINAPI __stdcall
-#  define GLWINAPIV __cdecl
 #else
 /* non-Windows compilation */
 #  define GLAPI extern
 #  define GLAPIENTRY
-#  define GLAPIENTRYP *
-#  define GLCALLBACK
-#  define GLCALLBACKP *
-#  define GLCALLBACKPCAST *
-#  define GLWINAPI
-#  define GLWINAPIV
-#endif /* WIN32 / CYGWIN32 bracket */
-
-/* compatability guard so we don't need to change client code */
-
-#if defined(_WIN32) && !defined(_WINDEF_) && !defined(OPENSTEP)
-#	define CALLBACK GLCALLBACK
-typedef int (GLAPIENTRY *PROC)();
-typedef void *HGLRC;
-typedef void *HDC;
-typedef unsigned long COLORREF;
-#endif
+#endif /* WIN32 / CYGWIN bracket */
 
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(OPENSTEP)
-#	define WGL_FONT_LINES      0
-#	define WGL_FONT_POLYGONS   1
-#	ifdef UNICODE
-#		define wglUseFontBitmaps  wglUseFontBitmapsW
-#		define wglUseFontOutlines  wglUseFontOutlinesW
-#	else
-#		define wglUseFontBitmaps  wglUseFontBitmapsA
-#		define wglUseFontOutlines  wglUseFontOutlinesA
-#	endif /* !UNICODE */
-typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
-typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
-typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
 #include <gl/mesa_wgl.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import on
 #endif
+/*
+ * End system-specific stuff.
+ **********************************************************************/
 
 
-#ifdef macintosh
-	#pragma enumsalwaysint on
-	#if PRAGMA_IMPORT_SUPPORTED
-	#pragma import on
-	#endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 
 
 #define GL_VERSION_1_1   1
 #define GL_VERSION_1_2   1
-#define GL_HAS_GLEXT     1
 
 
 
@@ -1778,14 +1722,93 @@
 
 
 
-
 /*
- * XXX these extensions may eventually be moved into glext.h
+ * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
  */
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB				0x84C0
+#define GL_TEXTURE1_ARB				0x84C1
+#define GL_TEXTURE2_ARB				0x84C2
+#define GL_TEXTURE3_ARB				0x84C3
+#define GL_TEXTURE4_ARB				0x84C4
+#define GL_TEXTURE5_ARB				0x84C5
+#define GL_TEXTURE6_ARB				0x84C6
+#define GL_TEXTURE7_ARB				0x84C7
+#define GL_TEXTURE8_ARB				0x84C8
+#define GL_TEXTURE9_ARB				0x84C9
+#define GL_TEXTURE10_ARB			0x84CA
+#define GL_TEXTURE11_ARB			0x84CB
+#define GL_TEXTURE12_ARB			0x84CC
+#define GL_TEXTURE13_ARB			0x84CD
+#define GL_TEXTURE14_ARB			0x84CE
+#define GL_TEXTURE15_ARB			0x84CF
+#define GL_TEXTURE16_ARB			0x84D0
+#define GL_TEXTURE17_ARB			0x84D1
+#define GL_TEXTURE18_ARB			0x84D2
+#define GL_TEXTURE19_ARB			0x84D3
+#define GL_TEXTURE20_ARB			0x84D4
+#define GL_TEXTURE21_ARB			0x84D5
+#define GL_TEXTURE22_ARB			0x84D6
+#define GL_TEXTURE23_ARB			0x84D7
+#define GL_TEXTURE24_ARB			0x84D8
+#define GL_TEXTURE25_ARB			0x84D9
+#define GL_TEXTURE26_ARB			0x84DA
+#define GL_TEXTURE27_ARB			0x84DB
+#define GL_TEXTURE28_ARB			0x84DC
+#define GL_TEXTURE29_ARB			0x84DD
+#define GL_TEXTURE30_ARB			0x84DE
+#define GL_TEXTURE31_ARB			0x84DF
+#define GL_ACTIVE_TEXTURE_ARB			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB		0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
 
+GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
+GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
+GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
+GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
+GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
+
+#endif /* GL_ARB_multitexture */
+
+
 
+
+#if defined(GL_GLEXT_LEGACY)
+
+
 /*
- * GL_EXT_abgr (number 1)
+ * 1. GL_EXT_abgr
  */
 #ifndef GL_EXT_abgr
 #define GL_EXT_abgr 1
@@ -1797,7 +1820,7 @@
 
 
 /*
- * GL_EXT_blend_color (number 2)
+ * 2. GL_EXT_blend_color
  */
 #ifndef GL_EXT_blend_color
 #define GL_EXT_blend_color 1
@@ -1815,7 +1838,7 @@
 
 
 /*
- * GL_EXT_polygon_offset (number 3)
+ * 3. GL_EXT_polygon_offset
  */
 #ifndef GL_EXT_polygon_offset
 #define GL_EXT_polygon_offset 1
@@ -1831,7 +1854,7 @@
 
 
 /*
- * GL_EXT_texture3D (number 6)
+ * 6. GL_EXT_texture3D
  */
 #ifndef GL_EXT_texture3D
 #define GL_EXT_texture3D 1
@@ -1858,7 +1881,7 @@
 
 
 /*
- * GL_EXT_texture_object (number 20)
+ * 20. GL_EXT_texture_object
  */
 #ifndef GL_EXT_texture_object
 #define GL_EXT_texture_object 1
@@ -1885,7 +1908,7 @@
 
 
 /*
- * GL_EXT_rescale_normal (number 27)
+ * 27. GL_EXT_rescale_normal
  */
 #ifndef GL_EXT_rescale_normal
 #define GL_EXT_rescale_normal 1
@@ -1897,7 +1920,7 @@
 
 
 /*
- * GL_EXT_vertex_array (number 30)
+ * 30. GL_EXT_vertex_array
  */
 #ifndef GL_EXT_vertex_array
 #define GL_EXT_vertex_array 1
@@ -1958,7 +1981,7 @@
 
 
 /*
- * GL_SGIS_texture_edge_clamp (number 35)
+ * 35. GL_SGIS_texture_edge_clamp
  */
 #ifndef GL_SGIS_texture_edge_clamp
 #define GL_SGIS_texture_edge_clamp 1
@@ -1970,7 +1993,7 @@
 
 
 /*
- * GL_EXT_blend_minmax (number 37)
+ * 37. GL_EXT_blend_minmax
  */
 #ifndef GL_EXT_blend_minmax
 #define GL_EXT_blend_minmax 1
@@ -1987,7 +2010,7 @@
 
 
 /*
- * GL_EXT_blend_subtract (number 38) (requires GL_EXT_blend_max )
+ * 38. GL_EXT_blend_subtract (requires GL_EXT_blend_max )
  */
 #ifndef GL_EXT_blend_subtract
 #define GL_EXT_blend_subtract 1
@@ -2000,7 +2023,7 @@
 
 
 /*
- * GL_EXT_blend_logic_op (number 39)
+ * 39. GL_EXT_blend_logic_op
  */
 #ifndef GL_EXT_blend_logic_op
 #define GL_EXT_blend_logic_op 1
@@ -2012,7 +2035,7 @@
 
 
 /*
- * GL_EXT_point_parameters (number 54)
+ * 54. GL_EXT_point_parameters
  */
 #ifndef GL_EXT_point_parameters
 #define GL_EXT_point_parameters 1
@@ -2024,47 +2047,15 @@
 
 GLAPI void GLAPIENTRY glPointParameterfEXT( GLenum pname, GLfloat param );
 GLAPI void GLAPIENTRY glPointParameterfvEXT( GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glPointParameterfSGIS(GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glPointParameterfvSGIS(GLenum pname, const GLfloat *params);
 
 #endif /* GL_EXT_point_parameters */
 
 
 
-/*
- * GL_PGI_misc_hints (number 77)
- */
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI		107000
-#define GL_STRICT_DEPTHFUNC_HINT_PGI		107030
-#define GL_STRICT_LIGHTING_HINT_PGI		107031
-#define GL_STRICT_SCISSOR_HINT_PGI		107032
-#define GL_FULL_STIPPLE_HINT_PGI		107033
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI	107011
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI		107012
-#define GL_CONSERVE_MEMORY_HINT_PGI		107005
-#define GL_RECLAIM_MEMORY_HINT_PGI		107006
-#define GL_ALWAYS_FAST_HINT_PGI			107020
-#define GL_ALWAYS_SOFT_HINT_PGI			107021
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI		107022
-#define GL_ALLOW_DRAW_WIN_HINT_PGI		107023
-#define GL_ALLOW_DRAW_FRG_HINT_PGI		107024
-#define GL_ALLOW_DRAW_SPN_HINT_PGI		107024
-#define GL_ALLOW_DRAW_MEM_HINT_PGI		107025
-#define GL_CLIP_NEAR_HINT_PGI			107040
-#define GL_CLIP_FAR_HINT_PGI			107041
-#define GL_WIDE_LINE_HINT_PGI		  	107042
-#define GL_BACK_NORMALS_HINT_PGI		107043
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI		107010
-
-GLAPI void GLAPIENTRY glHintPGI(GLenum target, GLint mode);
-
-#endif /* GL_PGI_misc_hints */
-
-
-
 /*
- * GL_EXT_paletted_texture (number 78)
+ * 78. GL_EXT_paletted_texture
  */
 #ifndef GL_EXT_paletted_texture
 #define GL_EXT_paletted_texture 1
@@ -2101,19 +2092,19 @@
 
 
 /*
- * GL_EXT_clip_volume_hint (number 79)
+ * 79. GL_EXT_clip_volume_hint
  */
 #ifndef GL_EXT_clip_volume_hint
 #define GL_EXT_clip_volume_hint 1
 
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT	0x80F
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT	0x80F0
 
 #endif /* GL_EXT_clip_volume_hint */
 
 
 
 /*
- * GL_EXT_compiled_vertex_array (number 97)
+ * 97. GL_EXT_compiled_vertex_array
  */
 #ifndef GL_EXT_compiled_vertex_array
 #define GL_EXT_compiled_vertex_array 1
@@ -2126,10 +2117,20 @@
 
 #endif /* GL_EXT_compiled_vertex_array */
 
+/*
+ * 137. GL_HP_occlusion_test
+ */
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+
+#define GL_OCCLUSION_TEST_HP                    0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP             0x8166
 
+#endif /* GL_HP_occlusion_test */
 
+
 /*
- * GL_EXT_shared_texture_palette (number 141) (req's GL_EXT_paletted_texture)
+ * 141. GL_EXT_shared_texture_palette (req's GL_EXT_paletted_texture)
  */
 #ifndef GL_EXT_shared_texture_palette
 #define GL_EXT_shared_texture_palette 1
@@ -2141,7 +2142,7 @@
 
 
 /*
- * GL_EXT_stencil_wrap (number 176)
+ * 176. GL_EXT_stencil_wrap
  */
 #ifndef GL_EXT_stencil_wrap
 #define GL_EXT_stencil_wrap 1
@@ -2154,25 +2155,8 @@
 
 
 /*
- * GL_EXT_blend_func_separate (EXT number 173) (aka GL_INGR_blend_func_separate)
+ * 179. GL_NV_texgen_reflection
  */
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-
-#define GL_BLEND_DST_RGB_EXT			0x80C8
-#define GL_BLEND_SRC_RGB_EXT			0x80C9
-#define GL_BLEND_DST_ALPHA_EXT			0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT			0x80CB
-
-GLAPI void GLAPIENTRY glBlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha );
-
-#endif /* GL_EXT_blend_func_separate */
-
-
-
-/*
- * GL_NV_texgen_reflection (number 179)
- */
 #ifndef GL_NV_texgen_reflection
 #define GL_NV_texgen_reflection 1
 
@@ -2184,7 +2168,7 @@
 
 
 /*
- * GL_EXT_texture_env_add (number 185)
+ * 185. GL_EXT_texture_env_add
  */
 #ifndef GL_EXT_texture_env_add
 #define GL_EXT_texture_env_add 1
@@ -2195,89 +2179,10 @@
 
 
 
-/*
- * GL_ARB_multitexture (ARB 0)
- */
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-
-#define GL_TEXTURE0_ARB				0x84C0
-#define GL_TEXTURE1_ARB				0x84C1
-#define GL_TEXTURE2_ARB				0x84C2
-#define GL_TEXTURE3_ARB				0x84C3
-#define GL_TEXTURE4_ARB				0x84C4
-#define GL_TEXTURE5_ARB				0x84C5
-#define GL_TEXTURE6_ARB				0x84C6
-#define GL_TEXTURE7_ARB				0x84C7
-#define GL_TEXTURE8_ARB				0x84C8
-#define GL_TEXTURE9_ARB				0x84C9
-#define GL_TEXTURE10_ARB			0x84CA
-#define GL_TEXTURE11_ARB			0x84CB
-#define GL_TEXTURE12_ARB			0x84CC
-#define GL_TEXTURE13_ARB			0x84CD
-#define GL_TEXTURE14_ARB			0x84CE
-#define GL_TEXTURE15_ARB			0x84CF
-#define GL_TEXTURE16_ARB			0x84D0
-#define GL_TEXTURE17_ARB			0x84D1
-#define GL_TEXTURE18_ARB			0x84D2
-#define GL_TEXTURE19_ARB			0x84D3
-#define GL_TEXTURE20_ARB			0x84D4
-#define GL_TEXTURE21_ARB			0x84D5
-#define GL_TEXTURE22_ARB			0x84D6
-#define GL_TEXTURE23_ARB			0x84D7
-#define GL_TEXTURE24_ARB			0x84D8
-#define GL_TEXTURE25_ARB			0x84D9
-#define GL_TEXTURE26_ARB			0x84DA
-#define GL_TEXTURE27_ARB			0x84DB
-#define GL_TEXTURE28_ARB			0x84DC
-#define GL_TEXTURE29_ARB			0x84DD
-#define GL_TEXTURE30_ARB			0x84DE
-#define GL_TEXTURE31_ARB			0x84DF
-#define GL_ACTIVE_TEXTURE_ARB			0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB		0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
-
-GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
-GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
-GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
-GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
-GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
-GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
-GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
-GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
-GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
-GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
-GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
-GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
-GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
-GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
-GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
-GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
-
-#endif /* GL_ARB_multitexture */
-
 
 
 /*
- * GL_MESA_window_pos (197)
+ * 197. GL_MESA_window_pos
  */
 #ifndef GL_MESA_window_pos
 #define GL_MESA_window_pos 1
@@ -2312,7 +2217,7 @@
 
 
 /*
- * GL_MESA_resize_bufffers (196)
+ * 196. GL_MESA_resize_bufffers
  */
 #ifndef GL_MESA_resize_bufffers
 #define GL_MESA_resize_buffers 1
@@ -2322,52 +2227,27 @@
 #endif /* GL_MESA_resize_bufffers */
 
 
+#else  /* GL_GLEXT_LEGACY */
 
-/*
- * GL_ARB_tranpose_matrix (ARB 2)
- */
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB		0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB		0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB			0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB			0x84E6
-
-GLAPI void GLAPIENTRY glLoadTransposeMatrixdARB( const GLdouble m[16] );
-GLAPI void GLAPIENTRY glLoadTransposeMatrixfARB( const GLfloat m[16] );
-GLAPI void GLAPIENTRY glMultTransposeMatrixdARB( const GLdouble m[16] );
-GLAPI void GLAPIENTRY glMultTransposeMatrixfARB( const GLfloat m[16] );
+#include <GL/glext.h>
 
-#endif /* GL_ARB_tranpose_matrix */
+#endif  /* GL_GLEXT_LEGACY */
 
 
 
-/*
- * GL_ARB_multisample (ARB 4)
+/**********************************************************************
+ * Begin system-specific stuff
  */
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-
-GLAPI void GLAPIENTRY glSampleCoverageARB(GLclampf value, GLboolean invert);
-
-GLAPI void GLAPIENTRY glSamplePassARB(GLenum pass);
-
-#endif /* GL_ARB_multisample */
-
-
-
 #if defined(__BEOS__) || defined(__QUICKDRAW__)
 #pragma export off
 #endif
-
 
-#ifdef macintosh
-	#pragma enumsalwaysint reset
-	#if PRAGMA_IMPORT_SUPPORTED
-	#pragma import off
-	#endif
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import off
 #endif
+/*
+ * End system-specific stuff
+ **********************************************************************/
 
 
 #ifdef __cplusplus
Index: xc/extras/Mesa/include/GL/glext.h
diff -u xc/extras/Mesa/include/GL/glext.h:1.1 xc/extras/Mesa/include/GL/glext.h:1.2
--- xc/extras/Mesa/include/GL/glext.h:1.1	Thu Mar  2 08:06:57 2000
+++ xc/extras/Mesa/include/GL/glext.h	Fri Jun 16 17:02:05 2000
@@ -1,258 +1,1754 @@
 #ifndef __glext_h_
 #define __glext_h_
 
-
-/*
- * XXX Many extensions need to be added yet.
- * XXX Some token values aren't known (grep for ?)
- * XXX This file may be automatically generated in the future.
- */
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 #endif
 
-#ifndef GLAPI
-#define GLAPI extern
+#ifndef APIENTRY
+#define APIENTRY
 #endif
 
-#ifdef GLAPIENTRY
-#define APIENTRY GLAPIENTRY
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+#define GL_GLEXT_VERSION 6
+
+#ifndef GL_VERSION_1_2
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
 #endif
 
-#ifndef APIENTRY
-#define APIENTRY
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
 #endif
 
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#endif
 
-#define GL_GLEXT_VERSION_EXT 1
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif
 
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB         0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
 
-/*
- * 1. GL_EXT_abgr
- */
 #ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
+#define GL_ABGR_EXT                       0x8000
+#endif
 
-#define GL_ABGR_EXT				0x8000
+#ifndef GL_EXT_blend_color
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+#endif
 
-#endif /* GL_EXT_abgr */
+#ifndef GL_EXT_polygon_offset
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+#endif
 
+#ifndef GL_EXT_texture
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif
 
+#ifndef GL_EXT_texture3D
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+#endif
 
-/*
- * 2. GL_EXT_blend_color
- */
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
+#ifndef GL_SGIS_texture_filter4
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+#endif
 
-#define GL_CONSTANT_COLOR_EXT			0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT		0x8002
-#define GL_CONSTANT_ALPHA_EXT			0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT		0x8004
-#define GL_BLEND_COLOR_EXT			0x8005
+#ifndef GL_EXT_subtexture
+#endif
 
-GLAPI void APIENTRY glBlendColorEXT(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#ifndef GL_EXT_copy_texture
+#endif
 
-typedef void (APIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#ifndef GL_EXT_histogram
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+#endif
 
-#endif /* GL_EXT_blend_color */
+#ifndef GL_EXT_convolution
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+#endif
 
+#ifndef GL_SGI_color_matrix
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif
 
+#ifndef GL_SGI_color_table
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+#endif
 
-/*
- * 3. GL_EXT_polygon_offset
- */
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
+#ifndef GL_SGIS_pixel_texture
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+#endif
 
-#define GL_POLYGON_OFFSET_EXT			0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT		0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT		0x8039
+#ifndef GL_SGIX_pixel_texture
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+#endif
 
-GLAPI void APIENTRY glPolygonOffsetEXT(GLfloat factor, GLfloat bias);
+#ifndef GL_SGIS_texture4D
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+#endif
 
-typedef void (APIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#ifndef GL_SGI_texture_color_table
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif
 
-#endif /* GL_EXT_polygon_offset */
+#ifndef GL_EXT_cmyka
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif
 
+#ifndef GL_EXT_texture_object
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+#endif
 
+#ifndef GL_SGIS_detail_texture
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+#endif
 
-/*
- * 6. GL_EXT_texture3D
- */
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
+#ifndef GL_SGIS_sharpen_texture
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+#endif
 
-#define GL_PACK_SKIP_IMAGES_EXT			0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT		0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT		0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT		0x806E
-#define GL_TEXTURE_3D_EXT			0x806F
-#define GL_PROXY_TEXTURE_3D_EXT			0x8070
-#define GL_TEXTURE_DEPTH_EXT			0x8071
-#define GL_TEXTURE_WRAP_R_EXT			0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT		0x8073
-#define GL_TEXTURE_3D_BINDING_EXT		0x806A
-
-GLAPI void APIENTRY glTexImage3DEXT(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage3DEXT(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifndef GL_EXT_packed_pixels
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif
 
-typedef void (APIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifndef GL_SGIS_texture_lod
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_BLEND_EQUATION_EXT             0x8009
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_INTERLACE_SGIX                 0x8094
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif
+
+#ifndef GL_SGIS_texture_select
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif
+
+#ifndef GL_INGR_palette_buffer
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif
+
+#ifndef GL_EXT_color_subtable
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_LIST_PRIORITY_SGIX             0x8182
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif
+
+#ifndef GL_EXT_index_texture
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+/* reuse GL_FRAGMENT_DEPTH_EXT */
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif
+
+#ifndef GL_INTEL_texture_scissor
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE3_RGB_EXT                0x8583
+#define GL_SOURCE4_RGB_EXT                0x8584
+#define GL_SOURCE5_RGB_EXT                0x8585
+#define GL_SOURCE6_RGB_EXT                0x8586
+#define GL_SOURCE7_RGB_EXT                0x8587
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_SOURCE3_ALPHA_EXT              0x858B
+#define GL_SOURCE4_ALPHA_EXT              0x858C
+#define GL_SOURCE5_ALPHA_EXT              0x858D
+#define GL_SOURCE6_ALPHA_EXT              0x858E
+#define GL_SOURCE7_ALPHA_EXT              0x858F
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND3_RGB_EXT               0x8593
+#define GL_OPERAND4_RGB_EXT               0x8594
+#define GL_OPERAND5_RGB_EXT               0x8595
+#define GL_OPERAND6_RGB_EXT               0x8596
+#define GL_OPERAND7_RGB_EXT               0x8597
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#define GL_OPERAND3_ALPHA_EXT             0x859B
+#define GL_OPERAND4_ALPHA_EXT             0x859C
+#define GL_OPERAND5_ALPHA_EXT             0x859D
+#define GL_OPERAND6_ALPHA_EXT             0x859E
+#define GL_OPERAND7_ALPHA_EXT             0x859F
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_FOG_SCALE_SGIX                 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_RESTART_SUN                    0x01
+#define GL_REPLACE_MIDDLE_SUN             0x02
+#define GL_REPLACE_OLDEST_SUN             0x03
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+#endif
+
+#ifndef GL_SUN_vertex
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
+#define GL_MODELVIEW_MATRIX1_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+/* reuse GL_TEXTURE0_ARB */
+/* reuse GL_TEXTURE1_ARB */
+/* reuse GL_ZERO */
+/* reuse GL_NONE */
+/* reuse GL_FOG */
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+/* reuse GL_EYE_PLANE */
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif
+
+#ifndef GL_NV_blend_square
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#endif
+
+#ifndef GL_MESA_window_pos
+#endif
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_CULL_VERTEX_IBM                103050
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif
+
+#ifndef GL_SGI_depth_pass_instrument
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif
 
-#endif /* GL_EXT_texture3D */
+#ifndef GL_SGIX_resample
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif
 
+#ifndef GL_SGIS_point_line_texgen
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+#endif
 
+
+/*************************************************************/
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
+extern void APIENTRY glBlendEquation (GLenum);
+extern void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+extern void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
+extern void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
+extern void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
+extern void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
+extern void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
+extern void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
+extern void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
+extern void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
+extern void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
+extern void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
+extern void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+extern void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
+extern void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+extern void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+extern void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
+extern void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
+extern void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
+extern void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
+extern void APIENTRY glResetHistogram (GLenum);
+extern void APIENTRY glResetMinmax (GLenum);
+extern void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRY * PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRY * PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRY * PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRY * PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRY * PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRY * PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRY * PFNGLRESETMINMAXPROC) (GLenum target);
+typedef void (APIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glActiveTextureARB (GLenum);
+extern void APIENTRY glClientActiveTextureARB (GLenum);
+extern void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
+extern void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
+extern void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
+extern void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
+extern void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
+extern void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
+extern void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
+extern void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
+extern void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
+extern void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
+extern void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
+extern void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
+extern void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
+extern void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
+extern void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
+extern void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
+extern void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
+extern void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
+extern void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
+extern void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
+extern void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
+extern void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
+extern void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
+extern void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+extern void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
+extern void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
+extern void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
+extern void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
+extern void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
+extern void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
+extern void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
+extern void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
+extern void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
+extern void APIENTRY glSamplePassARB (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRY * PFNGLSAMPLEPASSARBPROC) (GLenum pass);
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+extern void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+extern void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+extern void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+extern void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+extern void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+extern void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, void *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#endif
 
-/*
- * 7. GL_SGI_texture_filter4
- */
-#ifndef GL_SGI_texture_filter4
-#define GL_SGI_texture_filter4 1
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#endif
 
-#define GL_FILTER4_SGIS			?
-#define GL_TEXTURE_FILTER4_SIZE_SGIS	?
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
 
-GLAPI void APIENTRY glGetTexFilterFuncSGIS(GLenum target, GLenum filter, GLfloat *weights);
-GLAPI void APIENTRY glTexFilterFuncSGIS(GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#ifndef GL_EXT_subtexture
+/*#define GL_EXT_subtexture 1*/
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
 
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
 typedef void (APIENTRY * PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
 
-#endif /* GL_SGI_texture_filter4 */
-
-
-
-/*
- * 9. GL_EXT_subtexture
- */
 #ifndef GL_EXT_subtexture
 #define GL_EXT_subtexture 1
-
-GLAPI void APIENTRY glCopyTexSubImage1DEXT(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glTexSubImage1DEXT(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glTexSubImage2DEXT(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-
-typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
 typedef void (APIENTRY * PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
 
-#endif /* GL_EXT_subtexture */
-
-
-
-/*
- * 10. GL_EXT_copy_texture
- */
 #ifndef GL_EXT_copy_texture
 #define GL_EXT_copy_texture 1
-
-GLAPI void APIENTRY glCopyTexImage1DEXT(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI void APIENTRY glCopyTexImage2DEXT(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+extern void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+extern void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
+extern void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+extern void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
 typedef void (APIENTRY * PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
 typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
 
-#endif /* GL_EXT_copy_texture */
-
-
-
-/*
- * 11. GL_EXT_histogram
- */
 #ifndef GL_EXT_histogram
 #define GL_EXT_histogram 1
-
-#define GL_HISTOGRAM_EXT			0x8024
-#define GL_PROXY_HISTOGRAM_EXT			0x8025
-#define GL_HISTOGRAM_WIDTH_EXT			0x8026
-#define GL_HISTOGRAM_FORMAT_EXT			0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT		0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT		0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT		0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT		0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT		0x802C
-#define GL_HISTOGRAM_SINK_EXT			0x802D
-
-GLAPI void APIENTRY glGetHistogramEXT(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT(GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetHistogramParameterivEXT(GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetMinmaxEXT(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT(GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT(GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glHistogramEXT(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glMinmaxEXT(GLenum target, GLenum internalformat, GLboolean sink);
-GLAPI void APIENTRY glResetHistogramEXT(GLenum target);
-GLAPI void APIENTRY glResetMinmaxEXT(GLenum target);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
+extern void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
+extern void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
+extern void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
+extern void APIENTRY glResetHistogramEXT (GLenum);
+extern void APIENTRY glResetMinmaxEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
 typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
 typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
+typedef void (APIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
 typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
 typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
 typedef void (APIENTRY * PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
 typedef void (APIENTRY * PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
 typedef void (APIENTRY * PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
 typedef void (APIENTRY * PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#endif
 
-#endif /* GL_EXT_histogram */
-
-
-
-/*
- * 12. GL_EXT_convolution
- */
 #ifndef GL_EXT_convolution
 #define GL_EXT_convolution 1
-
-#define GL_CONVOLUTION_1D_EXT			0x8010
-#define GL_CONVOLUTION_2D_EXT			0x8011
-#define GL_SEPARABLE_2D_EXT			0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT		0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT		0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT		0x8015
-#define GL_REDUCE_EXT				0x8016
-#define GL_CONVOLUTION_FORMAT_EXT		0x8017
-#define GL_CONVOLUTION_WIDTH_EXT		0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT		0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT		0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT		0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT	0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT	0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT	0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT	0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT	0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT	0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT	0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT	0x8023
-
-GLAPI void APIENTRY glConvolutionFilter1DEXT(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionFilter2DEXT(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-GLAPI void APIENTRY glConvolutionParameterfEXT(GLenum target, GLenum pname, GLfloat params);
-GLAPI void APIENTRY glConvolutionParameterfvEXT(GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glConvolutionParameteriEXT(GLenum target, GLenum pname, GLint params);
-GLAPI void APIENTRY glConvolutionParameterivEXT(GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetConvolutionFilterEXT(GLenum target, GLenum format, GLenum type, GLvoid *image);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT(GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT(GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetSeparableFilterEXT(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-GLAPI void APIENTRY glSeparableFilter2DEXT(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
+extern void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
+extern void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
+extern void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
+extern void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
+extern void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+extern void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
+extern void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+extern void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
 typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
 typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
@@ -266,332 +1762,149 @@
 typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
 typedef void (APIENTRY * PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
 typedef void (APIENTRY * PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-
-#endif /* GL_EXT_convolution */
-
-
-
-/*
- * 13. GL_SGI_color_matrix
- */
-#ifndef GL_SGI_color_matrix
-#define GL_SGI_color_matrix 1
-
-#define GL_COLOR_MATRIX_SGI			0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI		0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI	0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI	0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI	0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI	0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI	0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI	0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI	0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI	0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI	0x80BB
-
-#endif /* GL_SGI_color_matrix */
-
+#endif
 
+#ifndef GL_EXT_color_matrix
+#define GL_EXT_color_matrix 1
+#endif
 
-/*
- * 14. GL_SGI_color_table
- */
 #ifndef GL_SGI_color_table
 #define GL_SGI_color_table 1
-
-#define COLOR_TABLE_SGI				0x80D0
-#define POST_CONVOLUTION_COLOR_TABLE_SGI	0x80D1
-#define POST_COLOR_MATRIX_COLOR_TABLE_SGI	0x80D2
-#define PROXY_COLOR_TABLE_SGI			0x80D3
-#define PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI	0x80D4
-#define PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI	0x80D5
-#define COLOR_TABLE_SCALE_SGI			0x80D6
-#define COLOR_TABLE_BIAS_SGI			0x80D7
-#define COLOR_TABLE_FORMAT_SGI			0x80D8
-#define COLOR_TABLE_WIDTH_SGI			0x80D9
-#define COLOR_TABLE_RED_SIZE_SGI		0x80DA
-#define COLOR_TABLE_GREEN_SIZE_SGI		0x80DB
-#define COLOR_TABLE_BLUE_SIZE_SGI		0x80DC
-#define COLOR_TABLE_ALPHA_SIZE_SGI		0x80DD
-#define COLOR_TABLE_LUMINANCE_SIZE_SGI		0x80DE
-#define COLOR_TABLE_INTENSITY_SIZE_SGI		0x80DF
-
-GLAPI void APIENTRY glColorTableParameterfvSGI(GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glColorTableParameterivSGI(GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glColorTableSGI(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-GLAPI void APIENTRY glCopyColorTableSGI(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI(GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetColorTableParameterivSGI(GLenum target, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetColorTableSGI(GLenum target, GLenum format, GLenum type, GLvoid *table);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
+extern void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
+extern void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
+extern void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
 typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
 typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
 typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
 typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-
-#endif /* GL_SGI_color_table */
-
-
+#endif
 
-/*
- * ?. GL_SGIX_pixel_texture
- */
 #ifndef GL_SGIX_pixel_texture
 #define GL_SGIX_pixel_texture 1
-
-GLAPI void APIENTRY glPixelTexGenSGIX(GLenum mode);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glPixelTexGenSGIX (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#endif
 
-#endif /* GL_SGIX_pixel_texture */
-
-
-
-/*
- * 15. GL_SGIS_pixel_texture
- */
 #ifndef GL_SGIS_pixel_texture
 #define GL_SGIS_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
+extern void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
+extern void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
+extern void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
+extern void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
+extern void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#endif
 
-#define GL_PIXEL_TEXTURE_SGIS			?
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS	?
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS	?
-#define GL_PIXEL_GROUP_COLOR_SGIS		?
-
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS(GLenum target, GLfloat value);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value);
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS(GLenum target, GLint value);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS(GLenum target, const GLint *value);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS(GLenum target, GLint *value);
-
-typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum target, GLfloat value);
-typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum target, const GLfloat *value);
-typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum target, GLint value);
-typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum target, const GLint *value);
-typedef void (APIENTRY * PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum target, GLfloat *value);
-typedef void (APIENTRY * PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum target, GLint *value);
-
-#endif /* GL_SGIS_pixel_texture */
-
-
-
-/*
- * 16. GL_SGIS_texture4D
- */
 #ifndef GL_SGIS_texture4D
 #define GL_SGIS_texture4D 1
-
-#define GL_PACK_SKIP_VOLUMES_SGIS	?
-#define GL_PACK_IMAGE_DEPTH_SGIS	?
-#define GL_UNPACK_SKIP_VOLUMES_SGIS	?
-#define GL_UNPACK_IMAGE_DEPTH_SGIS	?
-#define GL_TEXTURE_4D_SGIS		?
-#define GL_PROXY_TEXTURE_4D_SGIS	?
-#define GL_TEXTURE_4DSIZE_SGIS		?
-#define GL_TEXTURE_WRAP_Q_SGIS		?
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS	?
-#define GL_TEXTURE_4D_BINDING_SGIS	?
-
-GLAPI void APIENTRY glTexImage4DSGIS(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void *pixels);
-GLAPI void APIENTRY glTexSubImage4DSGIS(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLenum format, GLenum type, const void *pixels);
-
-typedef void (APIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void *pixels);
-typedef void (APIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLenum format, GLenum type, const void *pixels);
-
-#endif /* GL_SGIS_texture4D */
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
 
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#endif
 
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#endif
 
-/*
- * 20. GL_EXT_texture_object
- */
 #ifndef GL_EXT_texture_object
 #define GL_EXT_texture_object 1
-
-#define GL_TEXTURE_PRIORITY_EXT			0x8066
-#define GL_TEXTURE_RESIDENT_EXT			0x8067
-#define GL_TEXTURE_1D_BINDING_EXT		0x8068
-#define GL_TEXTURE_2D_BINDING_EXT		0x8069
-
-GLAPI void APIENTRY glGenTexturesEXT(GLsizei n, GLuint *textures);
-GLAPI void APIENTRY glDeleteTexturesEXT(GLsizei n, const GLuint *textures);
-GLAPI void APIENTRY glBindTextureEXT(GLenum target, GLuint texture);
-GLAPI void APIENTRY glPrioritizeTexturesEXT(GLsizei n, const GLuint *textures, const GLclampf *priorities);
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT(GLsizei n, const GLuint *textures, GLboolean *residences);
-GLAPI GLboolean APIENTRY glIsTextureEXT(GLuint texture);
-
-typedef void (APIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef void (APIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#ifdef GL_GLEXT_PROTOTYPES
+extern GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
+extern void APIENTRY glBindTextureEXT (GLenum, GLuint);
+extern void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
+extern void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
+extern GLboolean APIENTRY glIsTextureEXT (GLuint);
+extern void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef GLboolean (APIENTRY * PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
 typedef GLboolean (APIENTRY * PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
 
-#endif /* GL_EXT_texture_object */
-
-
-
-/*
- * 21. GL_SGIS_detail_texture
- */
 #ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture
-
-#define GL_DETAIL_TEXTURE_2D_SGIS		0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS	0x8096
-#define GL_LINEAR_DETAIL_SGIS			0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS		0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS		0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS		0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS		0x809B
-
-GLAPI void APIENTRY glDetailTexFuncSGIS(GLenum target, GLsizei n, const GLfloat *points);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS(GLenum target, GLfloat *points);
-
+#define GL_SGIS_detail_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+extern void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
 typedef void (APIENTRY * PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
 
-#endif /* GL_SGIS_detail_texture */
-
-
-
-/*
- * 22. GL_SGIS_sharpen_texture
- */
 #ifndef GL_SGIS_sharpen_texture
 #define GL_SGIS_sharpen_texture 1
-
-#define GL_LINEAR_SHARPEN_SGIS			0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS		0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS		0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS	0x80B0
-
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS(GLenum target, GLfloat *points);
-GLAPI void APIENTRY glSharpenTexFuncSGIS(GLenum target, GLsizei n, const GLfloat *points);
-
-typedef void (APIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+extern void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
 
-#endif /* GL_SGIS_sharpen_texture */
-
-
-
-/*
- * 23. GL_EXT_packed_pixels
- */
 #ifndef GL_EXT_packed_pixels
 #define GL_EXT_packed_pixels 1
-
-#define GL_UNSIGNED_BYTE_3_3_2_EXT		0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT		0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT		0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT		0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT		0x8036
-
-#endif /* GL_EXT_packed_pixels */
-
-
+#endif
 
-/*
- * 25. GL_SGIS_multisample
- */
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#endif
 
 #ifndef GL_SGIS_multisample
 #define GL_SGIS_multisample 1
-
-#define GL_MULTISAMPLE_SGIS			0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS		0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS		0x809F
-#define GL_SAMPLE_MASK_SGIS			0x80A0
-#define GL_MULTISAMPLE_BIT_EXT			0x20000000
-#define GL_1PASS_SGIS				0x80A1
-#define GL_2PASS_0_SGIS				0x80A2
-#define GL_2PASS_1_SGIS				0x80A3
-#define GL_4PASS_0_SGIS				0x80A4
-#define GL_4PASS_1_SGIS				0x80A5
-#define GL_4PASS_2_SGIS				0x80A6
-#define GL_4PASS_3_SGIS				0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS			0x80A8
-#define GL_SAMPLES_SGIS				0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS		0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS		0x80AB
-#define GL_SAMPLE_PATTERN_SGIS			0x80AC
-
-GLAPI void APIENTRY glSampleMaskSGIS(GLclampf value, GLboolean invert);
-GLAPI void APIENTRY glSamplePatternSGIS(GLenum pattern);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
+extern void APIENTRY glSamplePatternSGIS (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
 typedef void (APIENTRY * PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#endif
 
-#endif /* GL_SGIS_multisample */
-
-
-
-/*
- * 27. GL_EXT_rescale_normal
- */
 #ifndef GL_EXT_rescale_normal
 #define GL_EXT_rescale_normal 1
+#endif
 
-#define GL_RESCALE_NORMAL_EXT			0x803A
-
-#endif /* GL_EXT_rescale_normal */
-
-
-
-/*
- * 30. GL_EXT_vertex_array
- */
 #ifndef GL_EXT_vertex_array
 #define GL_EXT_vertex_array 1
-
-#define GL_VERTEX_ARRAY_EXT			0x8074
-#define GL_NORMAL_ARRAY_EXT			0x8075
-#define GL_COLOR_ARRAY_EXT			0x8076
-#define GL_INDEX_ARRAY_EXT			0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT		0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT			0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT		0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT		0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT		0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT		0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT		0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT		0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT		0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT			0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT			0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT		0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT		0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT			0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT		0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT		0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT		0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT		0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT	0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT	0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT		0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT		0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT		0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT		0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT		0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT		0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT	0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT		0x8093
-
-GLAPI void APIENTRY glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr);
-GLAPI void APIENTRY glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr);
-GLAPI void APIENTRY glColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr);
-GLAPI void APIENTRY glIndexPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr);
-GLAPI void APIENTRY glTexCoordPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr);
-GLAPI void APIENTRY glEdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
-GLAPI void APIENTRY glGetPointervEXT(GLenum pname, void **params);
-GLAPI void APIENTRY glArrayElementEXT(GLint i);
-GLAPI void APIENTRY glDrawArraysEXT(GLenum mode, GLint first, GLsizei count);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glArrayElementEXT (GLint);
+extern void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+extern void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
+extern void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
+extern void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
+extern void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+extern void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+extern void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+extern void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLARRAYELEMENTEXTPROC) (GLint i);
 typedef void (APIENTRY * PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
 typedef void (APIENTRY * PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
@@ -601,1019 +1914,1007 @@
 typedef void (APIENTRY * PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
 typedef void (APIENTRY * PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
 typedef void (APIENTRY * PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif
 
-#endif /* GL_EXT_vertex_array */
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#endif
 
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#endif
 
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#endif
 
-/*
- * 35. GL_SGIS_texture_edge_clamp
- */
 #ifndef GL_SGIS_texture_edge_clamp
 #define GL_SGIS_texture_edge_clamp 1
-
-#define GL_CLAMP_TO_EDGE_SGIS			0x812F
-
-#endif /* GL_SGIS_texture_edge_clamp */
-
+#endif
 
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#endif
 
-/*
- * 37. GL_EXT_blend_minmax
- */
 #ifndef GL_EXT_blend_minmax
 #define GL_EXT_blend_minmax 1
-
-#define GL_FUNC_ADD_EXT				0x8006
-#define GL_MIN_EXT				0x8007
-#define GL_MAX_EXT				0x8008
-#define GL_BLEND_EQUATION_EXT			0x8009
-
-GLAPI void APIENTRY glBlendEquationEXT(GLenum mode);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glBlendEquationEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#endif
 
-#endif /* GL_EXT_blend_minmax */
-
-
-
-/*
- * 38. GL_EXT_blend_subtract (requires GL_EXT_blend_max)
- */
 #ifndef GL_EXT_blend_subtract
 #define GL_EXT_blend_subtract 1
+#endif
 
-#define GL_FUNC_SUBTRACT_EXT			0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT		0x800B
-
-#endif /* GL_EXT_blend_subtract */
-
-
-
-/*
- * 39. GL_EXT_blend_logic_op
- */
 #ifndef GL_EXT_blend_logic_op
 #define GL_EXT_blend_logic_op 1
-
-/* No new tokens or functions */
+#endif
 
-#endif /* GL_EXT_blend_logic_op */
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#endif
 
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#endif
 
+#ifndef GL_SGIX_texture_select
+#define GL_SGIX_texture_select 1
+#endif
 
-/*
- * 52. GL_SGIX_sprite
- */
 #ifndef GL_SGIX_sprite
 #define GL_SGIX_sprite 1
-
-#define GL_SPRITE_SGIX				0x8148
-#define GL_SPRITE_MODE_SGIX			0x8149
-#define GL_SPRITE_AXIS_SGIX			0x814A
-#define GL_SPRITE_TRANSLATION_SGIX		0x814B
-#define GL_SPRITE_AXIAL_SGIX			0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX		0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX		0x814E
-
-GLAPI void APIENTRY glSpriteParameterfSGIX(GLenum pname, GLfloat param);
-GLAPI void APIENTRY glSpriteParameterfvSGIX(GLenum pname, const GLfloat *param);
-GLAPI void APIENTRY glSpriteParameteriSGIX(GLenum pname, GLint param);
-GLAPI void APIENTRY glSpriteParameterivSGIX(GLenum pname, const GLint *param);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
+extern void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
+extern void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
+extern void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
 typedef void (APIENTRY * PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *param);
-
-#endif /* GL_SGIX_sprite */
-
+typedef void (APIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#endif
 
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#endif
 
-/*
- * 54. GL_EXT_point_parameters
- */
 #ifndef GL_EXT_point_parameters
 #define GL_EXT_point_parameters 1
-
-#define GL_POINT_SIZE_MIN_EXT			0x8126
-#define GL_POINT_SIZE_MAX_EXT			0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT	0x8128
-#define GL_DISTANCE_ATTENUATION_EXT		0x8129
-
-GLAPI void APIENTRY glPointParameterfEXT(GLenum pname, GLfloat param);
-GLAPI void APIENTRY glPointParameterfvEXT(GLenum pname, const GLfloat *params);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
+extern void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
+extern void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
+extern void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
 typedef void (APIENTRY * PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRY * PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#endif
 
-#endif /* GL_EXT_point_parameters */
-
-
-
-/*
- * 55. GL_SGIX_instruments
- */
 #ifndef GL_SGIX_instruments
 #define GL_SGIX_instruments 1
-
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX	0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX		0x8181
-
-GLAPI GLint APIENTRY glGetInstrumentsSGIX(void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX(GLsizei size, GLint *buf);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX(GLint *markerp);
-GLAPI void APIENTRY glReadInstrumentsSGIX(GLint marker);
-GLAPI void APIENTRY glStartInstrumentsSGIX(void);
-GLAPI void APIENTRY glStopInstrumentsSGIX(GLint marker);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern GLint APIENTRY glGetInstrumentsSGIX (void);
+extern void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
+extern GLint APIENTRY glPollInstrumentsSGIX (GLint *);
+extern void APIENTRY glReadInstrumentsSGIX (GLint);
+extern void APIENTRY glStartInstrumentsSGIX (void);
+extern void APIENTRY glStopInstrumentsSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef GLint (APIENTRY * PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRY * PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buf);
-typedef GLint (APIENTRY * PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *markerp);
+typedef void (APIENTRY * PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRY * PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
 typedef void (APIENTRY * PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
 typedef void (APIENTRY * PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
 typedef void (APIENTRY * PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-
 #endif
 
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#endif
 
-/*
- * 57. GL_SGIX_framezoom
- */
 #ifndef GL_SGIX_framezoom
 #define GL_SGIX_framezoom 1
-
-#define GL_FRAMEZOOM_SGIX			0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX		0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX		0x818D
-
-GLAPI void APIENTRY glFrameZoomSGIX(GLint factor);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glFrameZoomSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#endif
 
-#endif /* GL_SGIX_framezoom */
-
-
-
-/*
- * 58. GL_SGIX_tag_sample_buffer
- */
 #ifndef GL_SGIX_tag_sample_buffer
 #define GL_SGIX_tag_sample_buffer 1
-
-GLAPI void APIENTRY glTagSampleBufferSGIX(void);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTagSampleBufferSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#endif
 
-#endif /* GL_SGIX_tag_sample_buffer */
-
-
-
-/*
- * 60. GL_SGIX_reference_plane
- */
 #ifndef GL_SGIX_reference_plane
 #define GL_SGIX_reference_plane 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glReferencePlaneSGIX (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#endif
 
-#define GL_REFERENCE_PLANE_SGIX			0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX	0x817E
-
-GLAPI void APIENTRY glReferencePlaneSGIX(const GLdouble *plane);
-
-typedef void (APIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *plane);
-
-#endif /* GL_SGIX_reference_plane */
-
-
-
-/*
- * 61. GL_SGIX_flush_raster
- */
 #ifndef GL_SGIX_flush_raster
 #define GL_SGIX_flush_raster 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glFlushRasterSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void);
+#endif
 
-GLAPI void APIENTRY glFlushRasterSGIX(void);
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#endif
 
-typedef void (APIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void);
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
+extern void APIENTRY glGetFogFuncSGIS (const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRY * PFNGLGETFOGFUNCSGISPROC) (const GLfloat *points);
+#endif
 
-#endif /* GL_SGIX_flush_raster */
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#endif
 
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
+extern void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
+extern void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
+extern void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
+extern void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
+extern void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
 
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#endif
 
-/*
- * 74. GL_EXT_color_subtable
- */
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#endif
 
 #ifndef GL_EXT_color_subtable
 #define GL_EXT_color_subtable 1
-
-GLAPI void APIENTRY glColorSubTableEXT(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
-GLAPI void APIENTRY glCopyColorSubTableEXT(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-
-typedef void (APIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
 typedef void (APIENTRY * PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-
 #endif
 
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#endif
 
-/*
- * 77. GL_PGI_misc_hints
- */
 #ifndef GL_PGI_misc_hints
 #define GL_PGI_misc_hints 1
-
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI		107000
-#define GL_STRICT_DEPTHFUNC_HINT_PGI		107030
-#define GL_STRICT_LIGHTING_HINT_PGI		107031
-#define GL_STRICT_SCISSOR_HINT_PGI		107032
-#define GL_FULL_STIPPLE_HINT_PGI		107033
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI	107011
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI		107012
-#define GL_CONSERVE_MEMORY_HINT_PGI		107005
-#define GL_RECLAIM_MEMORY_HINT_PGI		107006
-#define GL_ALWAYS_FAST_HINT_PGI			107020
-#define GL_ALWAYS_SOFT_HINT_PGI			107021
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI		107022
-#define GL_ALLOW_DRAW_WIN_HINT_PGI		107023
-#define GL_ALLOW_DRAW_FRG_HINT_PGI		107024
-#define GL_ALLOW_DRAW_SPN_HINT_PGI		107024
-#define GL_ALLOW_DRAW_MEM_HINT_PGI		107025
-#define GL_CLIP_NEAR_HINT_PGI			107040
-#define GL_CLIP_FAR_HINT_PGI			107041
-#define GL_WIDE_LINE_HINT_PGI		  	107042
-#define GL_BACK_NORMALS_HINT_PGI		107043
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI		107010
-
-GLAPI void APIENTRY glHintPGI(GLenum target, GLint mode);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glHintPGI (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#endif
 
-#endif /* GL_PGI_misc_hints */
-
-
-
-/*
- * 78. GL_EXT_paletted_texture
- */
 #ifndef GL_EXT_paletted_texture
 #define GL_EXT_paletted_texture 1
-
-#define GL_TABLE_TOO_LARGE_EXT			0x8031
-#define GL_COLOR_TABLE_FORMAT_EXT		0x80D8
-#define GL_COLOR_TABLE_WIDTH_EXT		0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_EXT		0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_EXT		0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_EXT		0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_EXT	 	0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_EXT	0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_EXT	0x80DF
-#define GL_TEXTURE_INDEX_SIZE_EXT		0x80ED
-#define GL_COLOR_INDEX1_EXT			0x80E2
-#define GL_COLOR_INDEX2_EXT			0x80E3
-#define GL_COLOR_INDEX4_EXT			0x80E4
-#define GL_COLOR_INDEX8_EXT			0x80E5
-#define GL_COLOR_INDEX12_EXT			0x80E6
-#define GL_COLOR_INDEX16_EXT			0x80E7
-
-GLAPI void APIENTRY glColorTableEXT(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-GLAPI void APIENTRY glColorSubTableEXT(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-GLAPI void APIENTRY glGetColorTableEXT(GLenum target, GLenum format, GLenum type, GLvoid *table);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT(GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetColorTableParameterivEXT(GLenum target, GLenum pname, GLint *params);
-
-typedef void (APIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+extern void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
+extern void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
+extern void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
 typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
 
-#endif /* GL_EXT_paletted_texture */
-
-
-
-/*
- * 79. GL_EXT_clip_volume_hint
- */
 #ifndef GL_EXT_clip_volume_hint
 #define GL_EXT_clip_volume_hint 1
+#endif
 
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT	0x80F
-
-#endif /* GL_EXT_clip_volume_hint */
-
-
-
-/*
- * 80. GL_SGIX_list_priority
- */
 #ifndef GL_SGIX_list_priority
 #define GL_SGIX_list_priority 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
+extern void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
+extern void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
+extern void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
+extern void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
+extern void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRY * PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRY * PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#endif
 
-#define GL_LIST_PRIORITY_SGIX			0x8182
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#endif
 
-GLAPI void APIENTRY glGetListParameterfvSGIX(GLuint list, GLenum name, GLfloat *param);
-GLAPI void APIENTRY glGetListParameterivSGIX(GLuint list, GLenum name, GLint *param);
-GLAPI void APIENTRY glListParameterfSGIX(GLuint list, GLenum name, GLfloat param);
-GLAPI void APIENTRY glListParameterfvSGIX(GLuint list, GLenum name, const GLfloat *param);
-GLAPI void APIENTRY glListParameteriSGIX(GLuint list, GLenum name, GLint param);
-GLAPI void APIENTRY glListParameterivSGIX(GLuint list, GLenum name, const GLint *param);
-
-typedef void (APIENTRY * PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum name, GLfloat *param);
-typedef void (APIENTRY * PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum name, GLint *param);
-typedef void (APIENTRY * PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum name, GLfloat param);
-typedef void (APIENTRY * PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum name, const GLfloat *param);
-typedef void (APIENTRY * PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum name, GLint param);
-typedef void (APIENTRY * PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum name, const GLint *param);
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#endif
 
-#endif /* GL_SGIX_list_priority */
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#endif
 
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#endif
 
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif
 
-/*
- * 94. GL_EXT_index_material
- */
 #ifndef GL_EXT_index_material
 #define GL_EXT_index_material 1
-
-#define GL_INDEX_MATERIAL_EXT			?
-#define GL_INDEX_MATERIAL_PARAMETER_EXT		?
-#define GL_INDEX_MATERIAL_FACE_EXT		?
-
-GLAPI void APIENTRY glIndexMaterialEXT(GLenum face, GLenum mode);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
 
-#endif /* GL_EXT_index_material */
-
-
-
-/*
- * 95. GL_EXT_index_func
- */
 #ifndef GL_EXT_index_func
 #define GL_EXT_index_func 1
-
-#define GL_INDEX_TEST_EXT		?
-#define GL_INDEX_TEST_FUNC_EXT		?
-#define GL_INDEX_TEST_REF_EXT		?
-
-GLAPI void APIENTRY glIndexFuncEXT(GLenum func, GLfloat ref);
-
-typedef void (APIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLfloat ref);
-
-#endif /* GL_EXT_index_func */
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#endif
 
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#endif
 
-/*
- * 97. GL_EXT_compiled_vertex_array
- */
 #ifndef GL_EXT_compiled_vertex_array
 #define GL_EXT_compiled_vertex_array 1
-
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT		0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT		0x81A9
-
-GLAPI void APIENTRY glLockArraysEXT(GLint first, GLsizei count);
-GLAPI void APIENTRY glUnlockArraysEXT(void);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glLockArraysEXT (GLint, GLsizei);
+extern void APIENTRY glUnlockArraysEXT (void);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
 typedef void (APIENTRY * PFNGLUNLOCKARRAYSEXTPROC) (void);
+#endif
 
-#endif /* GL_EXT_compiled_vertex_array */
-
-
-
-/*
- * 98. GL_EXT_cull_vertex
- */
 #ifndef GL_EXT_cull_vertex
 #define GL_EXT_cull_vertex 1
-
-#define GL_CULL_VERTEX_EXT			0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT		0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT	0x81AC
-
-GLAPI void APIENTRY glCullParameterdvEXT(GLenum pname, const GLdouble *params);
-GLAPI void APIENTRY glCullParameterfvEXT(GLenum pname, const GLfloat *params);
-
-typedef void (APIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble* params);
-typedef void (APIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat* params);
-
-#endif /* GL_EXT_cull_vertex */
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
+extern void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#endif
 
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#endif
 
-/*
- * 102. GL_SGIX_fragment_lighting
- */
 #ifndef GL_SGIX_fragment_lighting
 #define GL_SGIX_fragment_lighting 1
-
-GLAPI void APIENTRY glFragmentColorMaterialSGIX(GLenum face, GLenum mode);
-GLAPI void APIENTRY glFragmentLightfSGIX(GLenum light, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentLightfvSGIX(GLenum light, GLenum pname, const GLfloat * params);
-GLAPI void APIENTRY glFragmentLightiSGIX(GLenum light, GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentLightivSGIX(GLenum light, GLenum pname, const GLint * params);
-GLAPI void APIENTRY glFragmentLightModelfSGIX(GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX(GLenum pname, const GLfloat * params);
-GLAPI void APIENTRY glFragmentLightModeliSGIX(GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentLightModelivSGIX(GLenum pname, const GLint * params);
-GLAPI void APIENTRY glFragmentMaterialfSGIX(GLenum face, GLenum pname, GLfloat param);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX(GLenum face, GLenum pname, const GLfloat * params);
-GLAPI void APIENTRY glFragmentMaterialiSGIX(GLenum face, GLenum pname, GLint param);
-GLAPI void APIENTRY glFragmentMaterialivSGIX(GLenum face, GLenum pname, const GLint * params);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX(GLenum light, GLenum pname, GLfloat * params);
-GLAPI void APIENTRY glGetFragmentLightivSGIX(GLenum light, GLenum pname, GLint * params);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX(GLenum face, GLenum pname, GLfloat * params);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX(GLenum face, GLenum pname, GLint * params);
-GLAPI void APIENTRY glLightEnviSGIX(GLenum pname, GLint param);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
+extern void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
+extern void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
+extern void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
+extern void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
+extern void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
+extern void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
+extern void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
+extern void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
+extern void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
+extern void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
+extern void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
+extern void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
+extern void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
+extern void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
+extern void APIENTRY glLightEnviSGIX (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
 typedef void (APIENTRY * PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat * params);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
 typedef void (APIENTRY * PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint * params);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
 typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat * params);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
 typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint * params);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
 typedef void (APIENTRY * PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat * params);
+typedef void (APIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
 typedef void (APIENTRY * PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint * params);
-typedef void (APIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat * params);
-typedef void (APIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint * params);
-typedef void (APIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat * params);
-typedef void (APIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint * params);
+typedef void (APIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
 typedef void (APIENTRY * PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#endif
 
-#endif /* GL_SGIX_fragment_lighting */
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#endif
 
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#endif
 
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif
 
-/*
- * 129. GL_EXT_bgra
- */
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glApplyTextureEXT (GLenum);
+extern void APIENTRY glTextureLightEXT (GLenum);
+extern void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRY * PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#endif
+
 #ifndef GL_EXT_bgra
 #define GL_EXT_bgra 1
+#endif
 
-#define GL_BGR_EXT				0x80E0
-#define GL_BGRA_EXT				0x80E1
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
+extern void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
+extern void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
+extern void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRY * PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRY * PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRY * PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+#endif
 
-#endif /* GL_EXT_bgra */
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#endif
 
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
+extern void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
+extern void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
+extern void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+#endif
 
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif
 
-/*
- * 141. GL_EXT_shared_texture_palette (req's GL_EXT_paletted_texture)
- */
 #ifndef GL_EXT_shared_texture_palette
 #define GL_EXT_shared_texture_palette 1
+#endif
 
-#define GL_SHARED_TEXTURE_PALETTE_EXT		0x81FB
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#endif
 
-#endif /* GL_EXT_shared_texture_palette */
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
+extern void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
+extern void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
+extern void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
+extern void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
+extern void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
+extern void APIENTRY glSecondaryColor3ivEXT (const GLint *);
+extern void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
+extern void APIENTRY glSecondaryColor3svEXT (const GLshort *);
+extern void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
+extern void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
+extern void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
+extern void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
+extern void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
+extern void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
+extern void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRY * PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+#endif
 
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTextureNormalEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#endif
 
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
+extern void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif
 
-/*
- * 149. GL_EXT_fog_coord
- */
 #ifndef GL_EXT_fog_coord
 #define GL_EXT_fog_coord 1
-
-#define GL_FOG_COORDINATE_SOURCE_EXT		0x8450
-#define GL_FOG_COORDINATE_EXT			0x8451
-#define GL_FRAGMENT_DEPTH_EXT			0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT		0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT	0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT	0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT	0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT		0x8457
-
-GLAPI void APIENTRY glFogCoordfEXT(GLfloat coord);
-GLAPI void APIENTRY glFogCoordfvEXT(const GLfloat * coord);
-GLAPI void APIENTRY glFogCoorddEXT(GLdouble coord);
-GLAPI void APIENTRY glFogCoorddvEXT(const GLdouble * coord);
-GLAPI void APIENTRY glFogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid * pointer);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glFogCoordfEXT (GLfloat);
+extern void APIENTRY glFogCoordfvEXT (const GLfloat *);
+extern void APIENTRY glFogCoorddEXT (GLdouble);
+extern void APIENTRY glFogCoorddvEXT (const GLdouble *);
+extern void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat * coord);
+typedef void (APIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
 typedef void (APIENTRY * PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble * coord);
-typedef void (APIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid * pointer);
-
+typedef void (APIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
 #endif
 
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#endif
 
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
+extern void APIENTRY glTangent3bvEXT (const GLbyte *);
+extern void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
+extern void APIENTRY glTangent3dvEXT (const GLdouble *);
+extern void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glTangent3fvEXT (const GLfloat *);
+extern void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
+extern void APIENTRY glTangent3ivEXT (const GLint *);
+extern void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
+extern void APIENTRY glTangent3svEXT (const GLshort *);
+extern void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
+extern void APIENTRY glBinormal3bvEXT (const GLbyte *);
+extern void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
+extern void APIENTRY glBinormal3dvEXT (const GLdouble *);
+extern void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glBinormal3fvEXT (const GLfloat *);
+extern void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
+extern void APIENTRY glBinormal3ivEXT (const GLint *);
+extern void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
+extern void APIENTRY glBinormal3svEXT (const GLshort *);
+extern void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
+extern void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRY * PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRY * PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRY * PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRY * PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRY * PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRY * PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRY * PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRY * PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRY * PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRY * PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRY * PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRY * PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRY * PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRY * PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRY * PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRY * PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRY * PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRY * PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRY * PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRY * PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRY * PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
 
-/*
- * 158. GL_EXT_texture_env_combine
- */
 #ifndef GL_EXT_texture_env_combine
 #define GL_EXT_texture_env_combine 1
+#endif
 
-#define GL_COMBINE_EXT				0x8570
-#define GL_COMBINE_RGB_EXT			0x8571
-#define GL_COMBINE_ALPHA_EXT			0x8572
-#define GL_RGB_SCALE_EXT			0x8573
-#define GL_ADD_SIGNED_EXT			0x8574
-#define GL_INTERPOLATE_EXT			0x8575
-#define GL_CONSTANT_EXT				0x8576
-#define GL_PRIMARY_COLOR_EXT			0x8577
-#define GL_PREVIOUS_EXT				0x8578
-#define GL_SOURCE0_RGB_EXT			0x8580
-#define GL_SOURCE1_RGB_EXT			0x8581
-#define GL_SOURCE2_RGB_EXT			0x8582
-#define GL_SOURCE0_ALPHA_EXT			0x8588
-#define GL_SOURCE1_ALPHA_EXT			0x8589
-#define GL_SOURCE2_ALPHA_EXT			0x858A
-#define GL_OPERAND0_RGB_EXT			0x8590
-#define GL_OPERAND1_RGB_EXT			0x8591
-#define GL_OPERAND2_RGB_EXT			0x8592
-#define GL_OPERAND0_ALPHA_EXT			0x8598
-#define GL_OPERAND1_ALPHA_EXT			0x8599
-#define GL_OPERAND2_ALPHA_EXT			0x859A
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#endif
 
-#endif /* GL_EXT_texture_env_combine */
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#endif
 
+#ifndef GL_SGIX_fog_scale
+#define GL_SGIX_fog_scale 1
+#endif
 
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glFinishTextureSUNX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLFINISHTEXTURESUNXPROC) (void);
+#endif
 
-/*
- * 173. GL_EXT_blend_func_separate
- */
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
+extern void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
+extern void APIENTRY glGlobalAlphaFactoriSUN (GLint);
+extern void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
+extern void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
+extern void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
+extern void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
+extern void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#endif
 
-#define GL_BLEND_DST_RGB_EXT			0x80C8
-#define GL_BLEND_SRC_RGB_EXT			0x80C9
-#define GL_BLEND_DST_ALPHA_EXT			0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT			0x80CB
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glReplacementCodeuiSUN (GLuint);
+extern void APIENTRY glReplacementCodeusSUN (GLushort);
+extern void APIENTRY glReplacementCodeubSUN (GLubyte);
+extern void APIENTRY glReplacementCodeuivSUN (const GLuint *);
+extern void APIENTRY glReplacementCodeusvSUN (const GLushort *);
+extern void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
+extern void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif
 
-GLAPI void APIENTRY glBlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
+extern void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
+extern void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
+extern void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+extern void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+extern void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
+extern void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
+extern void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
+extern void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glReplacementCodeuiVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLenum *, const GLfloat *);
+extern void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLenum, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLenum *, const GLubyte *, const GLfloat *);
+extern void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *);
+extern void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRY * PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRY * PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRY * PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRY * PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLenum rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *v);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLenum rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLenum *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLenum rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
 
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-
-#endif /* GL_EXT_blend_func_separate */
-
-
-
-/*
- * 173. GL_INGR_blend_func_separate
- */
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-
-#define GL_BLEND_DST_RGB_INGR			0x80C8
-#define GL_BLEND_SRC_RGB_INGR			0x80C9
-#define GL_BLEND_DST_ALPHA_INGR			0x80CA
-#define GL_BLEND_SRC_ALPHA_INGR			0x80CB
-
-GLAPI void APIENTRY glBlendFuncSeparateINGR(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-
-typedef void (APIENTRY * PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-
-#endif /* GL_INGR_blend_func_separate */
+#endif
 
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#endif
 
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#endif
 
-/*
- * 176. GL_EXT_stencil_wrap
- */
 #ifndef GL_EXT_stencil_wrap
 #define GL_EXT_stencil_wrap 1
-
-#define GL_INCR_WRAP_EXT			0x8507
-#define GL_DECR_WRAP_EXT			0x8508
-
-#endif /* GL_EXT_stencil_wrap */
-
+#endif
 
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#endif
 
-/*
- * 179. GL_NV_texgen_reflection
- */
 #ifndef GL_NV_texgen_reflection
 #define GL_NV_texgen_reflection 1
-
-#define GL_NORMAL_MAP_NV			0x8511
-#define GL_REFLECTION_MAP_NV			0x8512
-
-#endif /* GL_NV_texgen_reflection */
-
+#endif
 
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#endif
 
-/*
- * 185. GL_EXT_texture_env_add
- */
 #ifndef GL_EXT_texture_env_add
 #define GL_EXT_texture_env_add 1
-
-/* No new tokens or functions */
-
-#endif /* GL_EXT_texture_env_add */
-
-
-
-/*
- * ??. GL_WIN_swap_hint
- */
-#ifndef GL_WIN_swap_hint
-#define GL_WIN_swap_hint 1
-
-GLAPI void APIENTRY glAddSwapHintRectWIN(GLint x, GLint y, GLsizei width, GLsizei height);
-
-typedef void (APIENTRY * PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
-
-#endif /* GL_WIN_swap_hint */
+#endif
 
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#endif
 
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
 
-/*
- * 188. GL_EXT_vertex_weighting
- */
 #ifndef GL_EXT_vertex_weighting
 #define GL_EXT_vertex_weighting 1
-
-#define GL_VERTEX_WEIGHTING_EXT			0x8509
-#define GL_MODELVIEW0_EXT			0x1700
-#define GL_MODELVIEW1_EXT			0x850a
-#define GL_CURRENT_VERTEX_WEIGHT_EXT		0x850b
-#define GL_VERTEX_WEIGHT_ARRAY_EXT		0x850c
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT		0x850d
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT		0x850e
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT	0x850f
-#define GL_MODELVIEW0_STACK_DEPTH_EXT		0x0BA3
-#define GL_MODELVIEW1_STACK_DEPTH_EXT		0x8502
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT	0x8510
-
-GLAPI void APIENTRY glVertexWeightfEXT(GLfloat weight);
-GLAPI void APIENTRY glVertexWeightfvEXT(const GLfloat *weight);
-GLAPI void APIENTRY glVertexWeightPointerEXT(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glVertexWeightfEXT (GLfloat);
+extern void APIENTRY glVertexWeightfvEXT (const GLfloat *);
+extern void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
 typedef void (APIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-
+typedef void (APIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
 #endif
 
-
-
-/*
- * 189. GL_NV_light_max_exponent
- */
 #ifndef GL_NV_light_max_exponent
 #define GL_NV_light_max_exponent 1
-
-#define GL_MAX_SHININESS_NV			0x8507
-#define GL_MAX_SPOT_EXPONENT_NV			0x8508
-
 #endif
 
-
-
-/*
- * 190. GL_NV_vertex_array_range
- */
 #ifndef GL_NV_vertex_array_range
 #define GL_NV_vertex_array_range 1
-
-/* TOKENS? */
-
-GLAPI void APIENTRY glFlushVertexArrayRangeNV(void);
-GLAPI void APIENTRY glVertexArrayRangeNV(GLsizei size, const GLvoid * pointer);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glFlushVertexArrayRangeNV (void);
+extern void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-
+typedef void (APIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei size, const GLvoid *pointer);
 #endif
 
-
-
-/*
- * 191. GL_NV_register_combiners
- */
 #ifndef GL_NV_register_combiners
 #define GL_NV_register_combiners 1
-
-/* TOKENS? */
-
-#ifdef VMS
-/*VMS only allows externals of maximal 31 characters! */
-#define glGetCombinerOutputParameterfvNV glGetCombinerOutputParameterfvN
-#define glGetCombinerOutputParameterivNV glGetCombinerOutputParameterivN
-#define glGetFinalCombinerInputParameterfvNV glGetFnlCmbinerInpParameterfvNV
-#define glGetFinalCombinerInputParameterivNV glGetFnlCmbinerInpParameterivNV
-#endif
-
-GLAPI void APIENTRY glCombinerParameterfvNV(GLenum pname, const GLfloat * params);
-GLAPI void APIENTRY glCombinerParameterfNV(GLenum pname, GLfloat param);
-GLAPI void APIENTRY glCombinerParameterivNV(GLenum pname, const GLint * params);
-GLAPI void APIENTRY glCombinerParameteriNV(GLenum pname, GLint param);
-GLAPI void APIENTRY glCombinerInputNV(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-GLAPI void APIENTRY glCombinerOutputNV(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-GLAPI void APIENTRY glFinalCombinerInputNV(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV(GLenum stage, GLenum portion, GLenum pname, GLfloat * params);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV(GLenum stage, GLenum portion, GLenum pname, GLint * params);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV(GLenum variable, GLenum pname, GLfloat * params);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV(GLenum variable, GLenum pname, GLint * params);
-
-typedef void (APIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei size, const GLvoid * pointer);
-typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat * params);
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
+extern void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
+extern void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
+extern void APIENTRY glCombinerParameteriNV (GLenum, GLint);
+extern void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
+extern void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
+extern void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
+extern void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
+extern void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
+extern void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
+extern void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
 typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint * params);
+typedef void (APIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
 typedef void (APIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
 typedef void (APIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
 typedef void (APIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
 typedef void (APIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params);
-typedef void (APIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params);
-typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat * params);
-typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint * params);
-typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat * params);
-typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint * params);
-
-#endif /* GL_NV_register_combiners */
-
-
+typedef void (APIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#endif
 
-/*
- * 192. GL_NV_fog_distance
- */
 #ifndef GL_NV_fog_distance
 #define GL_NV_fog_distance 1
-
-#define GL_FOG_DISTANCE_MODE_NV			0x855a
-#define GL_EYE_RADIAL_NV			0x855b
-#define GL_EYE_PLANE_ABSOLUTE_NV		0x855c
-
-#endif /* GL_NV_fog_distance*/
-
+#endif
 
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#endif
 
-/*
- * 194. GL_NV_blend_square
- */
 #ifndef GL_NV_blend_square
 #define GL_NV_blend_square 1
+#endif
 
-/* no tokens or functions */
-
-#endif /* GL_NV_blend_square */
-
-
-
-/*
- * 195. GL_NV_texture_env_combine4
- */
 #ifndef GL_NV_texture_env_combine4
 #define GL_NV_texture_env_combine4 1
+#endif
 
-#define GL_COMBINE4_NV				0x8503
-#define GL_SOURCE3_RGB_NV			0x8583
-#define GL_SOURCE3_ALPHA_NV			0x858B
-#define GL_OPERAND3_RGB_NV			0x8593
-#define GL_OPERAND3_ALPHA_NV			0x859B
-
-#endif /* GL_NV_texture_env_combine4 */
-
-
-
-/*
- * 196. GL_MESA_resize_bufffers
- */
 #ifndef GL_MESA_resize_buffers
 #define GL_MESA_resize_buffers 1
-
-GLAPI void APIENTRY glResizeBuffersMESA(void);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glResizeBuffersMESA (void);
+#endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRY * PFNGLRESIZEBUFFERSMESAPROC) (void);
+#endif
 
-#endif /* GL_MESA_resize_bufffers */
-
-
-
-/*
- * 197. GL_MESA_window_pos
- */
 #ifndef GL_MESA_window_pos
 #define GL_MESA_window_pos 1
-
-GLAPI void APIENTRY glWindowPos2iMESA(GLint x, GLint y);
-GLAPI void APIENTRY glWindowPos2sMESA(GLshort x, GLshort y);
-GLAPI void APIENTRY glWindowPos2fMESA(GLfloat x, GLfloat y);
-GLAPI void APIENTRY glWindowPos2dMESA(GLdouble x, GLdouble y);
-GLAPI void APIENTRY glWindowPos2ivMESA(const GLint *p);
-GLAPI void APIENTRY glWindowPos2svMESA(const GLshort *p);
-GLAPI void APIENTRY glWindowPos2fvMESA(const GLfloat *p);
-GLAPI void APIENTRY glWindowPos2dvMESA(const GLdouble *p);
-GLAPI void APIENTRY glWindowPos3iMESA(GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glWindowPos3sMESA(GLshort x, GLshort y, GLshort z);
-GLAPI void APIENTRY glWindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z);
-GLAPI void APIENTRY glWindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z);
-GLAPI void APIENTRY glWindowPos3ivMESA(const GLint *p);
-GLAPI void APIENTRY glWindowPos3svMESA(const GLshort *p);
-GLAPI void APIENTRY glWindowPos3fvMESA(const GLfloat *p);
-GLAPI void APIENTRY glWindowPos3dvMESA(const GLdouble *p);
-GLAPI void APIENTRY glWindowPos4iMESA(GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glWindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI void APIENTRY glWindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI void APIENTRY glWindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI void APIENTRY glWindowPos4ivMESA(const GLint *p);
-GLAPI void APIENTRY glWindowPos4svMESA(const GLshort *p);
-GLAPI void APIENTRY glWindowPos4fvMESA(const GLfloat *p);
-GLAPI void APIENTRY glWindowPos4dvMESA(const GLdouble *p);
-
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
+extern void APIENTRY glWindowPos2dvMESA (const GLdouble *);
+extern void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
+extern void APIENTRY glWindowPos2fvMESA (const GLfloat *);
+extern void APIENTRY glWindowPos2iMESA (GLint, GLint);
+extern void APIENTRY glWindowPos2ivMESA (const GLint *);
+extern void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
+extern void APIENTRY glWindowPos2svMESA (const GLshort *);
+extern void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
+extern void APIENTRY glWindowPos3dvMESA (const GLdouble *);
+extern void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glWindowPos3fvMESA (const GLfloat *);
+extern void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
+extern void APIENTRY glWindowPos3ivMESA (const GLint *);
+extern void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
+extern void APIENTRY glWindowPos3svMESA (const GLshort *);
+extern void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
+extern void APIENTRY glWindowPos4dvMESA (const GLdouble *);
+extern void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
+extern void APIENTRY glWindowPos4fvMESA (const GLfloat *);
+extern void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
+extern void APIENTRY glWindowPos4ivMESA (const GLint *);
+extern void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
+extern void APIENTRY glWindowPos4svMESA (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
 typedef void (APIENTRY * PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
 typedef void (APIENTRY * PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *p);
+typedef void (APIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
 typedef void (APIENTRY * PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
 typedef void (APIENTRY * PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
 typedef void (APIENTRY * PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *p);
-typedef void (APIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *p);
-
-#endif /* GL_MESA_window_pos */
-
-
+typedef void (APIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRY * PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#endif
 
-/*
- * ARB 0. GL_ARB_multitexture
- */
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#endif
 
-#define GL_TEXTURE0_ARB				0x84C0
-#define GL_TEXTURE1_ARB				0x84C1
-#define GL_TEXTURE2_ARB				0x84C2
-#define GL_TEXTURE3_ARB				0x84C3
-#define GL_TEXTURE4_ARB				0x84C4
-#define GL_TEXTURE5_ARB				0x84C5
-#define GL_TEXTURE6_ARB				0x84C6
-#define GL_TEXTURE7_ARB				0x84C7
-#define GL_TEXTURE8_ARB				0x84C8
-#define GL_TEXTURE9_ARB				0x84C9
-#define GL_TEXTURE10_ARB			0x84CA
-#define GL_TEXTURE11_ARB			0x84CB
-#define GL_TEXTURE12_ARB			0x84CC
-#define GL_TEXTURE13_ARB			0x84CD
-#define GL_TEXTURE14_ARB			0x84CE
-#define GL_TEXTURE15_ARB			0x84CF
-#define GL_TEXTURE16_ARB			0x84D0
-#define GL_TEXTURE17_ARB			0x84D1
-#define GL_TEXTURE18_ARB			0x84D2
-#define GL_TEXTURE19_ARB			0x84D3
-#define GL_TEXTURE20_ARB			0x84D4
-#define GL_TEXTURE21_ARB			0x84D5
-#define GL_TEXTURE22_ARB			0x84D6
-#define GL_TEXTURE23_ARB			0x84D7
-#define GL_TEXTURE24_ARB			0x84D8
-#define GL_TEXTURE25_ARB			0x84D9
-#define GL_TEXTURE26_ARB			0x84DA
-#define GL_TEXTURE27_ARB			0x84DB
-#define GL_TEXTURE28_ARB			0x84DC
-#define GL_TEXTURE29_ARB			0x84DD
-#define GL_TEXTURE30_ARB			0x84DE
-#define GL_TEXTURE31_ARB			0x84DF
-#define GL_ACTIVE_TEXTURE_ARB			0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB		0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
-
-GLAPI void APIENTRY glActiveTextureARB(GLenum texture);
-GLAPI void APIENTRY glClientActiveTextureARB(GLenum texture);
-GLAPI void APIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
-GLAPI void APIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
-GLAPI void APIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
-GLAPI void APIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
-GLAPI void APIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
-GLAPI void APIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
-GLAPI void APIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
-GLAPI void APIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
-GLAPI void APIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
-GLAPI void APIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
-GLAPI void APIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
-GLAPI void APIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
-GLAPI void APIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
-GLAPI void APIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void APIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
-GLAPI void APIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void APIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
-GLAPI void APIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
-GLAPI void APIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
-GLAPI void APIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void APIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glMultiModeDrawArraysIBM (GLenum, const GLint *, const GLsizei *, GLsizei, GLint);
+extern void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* *, GLsizei, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, GLint modestride);
+#endif
 
-typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+extern void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+extern void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
+extern void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+extern void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+extern void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+extern void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+extern void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+typedef void (APIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif
 
-#endif /* GL_ARB_multitexture */
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#endif
 
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#endif
 
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif
 
-/*
- * ARB 2. GL_ARB_tranpose_matrix
- */
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif
 
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB		0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB		0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB			0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB			0x84E6
-
-GLAPI void APIENTRY glLoadTransposeMatrixdARB( const GLdouble m[16] );
-GLAPI void APIENTRY glLoadTransposeMatrixfARB( const GLfloat m[16] );
-GLAPI void APIENTRY glMultTransposeMatrixdARB( const GLdouble m[16] );
-GLAPI void APIENTRY glMultTransposeMatrixfARB( const GLfloat m[16] );
-
-typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) ( const GLdouble m[16] );
-typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) ( const GLfloat m[16] );
-typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) ( const GLdouble m[16] );
-typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) ( const GLfloat m[16] );
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#endif
 
-#endif /* GL_ARB_tranpose_matrix */
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#endif
 
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTbufferMask3DFX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#endif
 
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
+extern void APIENTRY glSamplePatternEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRY * PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#endif
 
-/*
- * ARB 4. GL_ARB_multisample
- */
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
+#ifndef GL_SGI_vertex_preclip
+#define GL_SGI_vertex_preclip 1
+#endif
 
-GLAPI void APIENTRY glSamplePassARB(GLenum pass);
-GLAPI void APIENTRY glSampleCoverageARB(GLclampf value, GLboolean invert);
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#endif
 
-typedef void (APIENTRY * PFNGLSAMPLEPASSARBPROC) (GLenum pass);
-typedef void (APIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#endif
 
-#endif /* GL_ARB_multisample */
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#endif
 
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#ifdef GL_GLEXT_PROTOTYPES
+extern void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRY * PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
 
 
 #ifdef __cplusplus
 }
 #endif
 
-
-#endif /* __glext_h_ */
+#endif
Index: xc/extras/Mesa/include/GL/glx.h
diff -u xc/extras/Mesa/include/GL/glx.h:1.3 xc/extras/Mesa/include/GL/glx.h:removed
--- xc/extras/Mesa/include/GL/glx.h:1.3	Thu Mar  2 08:06:57 2000
+++ xc/extras/Mesa/include/GL/glx.h	Sat Jul  1 20:46:08 2000
@@ -1,350 +0,0 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-
-#ifndef GLX_H
-#define GLX_H
-
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include "GL/gl.h"
-#ifdef MESA
-#include "GL/xmesa.h"
-#endif
-
-
-#if defined(USE_MGL_NAMESPACE)
-#include "glx_mangle.h"
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define GLX_VERSION_1_1		1
-#define GLX_VERSION_1_2		1
-#define GLX_VERSION_1_3		1
-
-#define GLX_EXTENSION_NAME   "GLX"
-
-
-
-/*
- * Tokens for glXChooseVisual and glXGetConfig:
- */
-#define GLX_USE_GL		1
-#define GLX_BUFFER_SIZE		2
-#define GLX_LEVEL		3
-#define GLX_RGBA		4
-#define GLX_DOUBLEBUFFER	5
-#define GLX_STEREO		6
-#define GLX_AUX_BUFFERS		7
-#define GLX_RED_SIZE		8
-#define GLX_GREEN_SIZE		9
-#define GLX_BLUE_SIZE		10
-#define GLX_ALPHA_SIZE		11
-#define GLX_DEPTH_SIZE		12
-#define GLX_STENCIL_SIZE	13
-#define GLX_ACCUM_RED_SIZE	14
-#define GLX_ACCUM_GREEN_SIZE	15
-#define GLX_ACCUM_BLUE_SIZE	16
-#define GLX_ACCUM_ALPHA_SIZE	17
-
-
-/*
- * Error codes returned by glXGetConfig:
- */
-#define GLX_BAD_SCREEN		1
-#define GLX_BAD_ATTRIBUTE	2
-#define GLX_NO_EXTENSION	3
-#define GLX_BAD_VISUAL		4
-#define GLX_BAD_CONTEXT		5
-#define GLX_BAD_VALUE       	6
-#define GLX_BAD_ENUM		7
-
-
-/*
- * GLX 1.1 and later:
- */
-#define GLX_VENDOR		1
-#define GLX_VERSION		2
-#define GLX_EXTENSIONS 		3
-
-
-/*
- * GLX 1.3 and later:
- * XXX don't know the values of some of these enums!
- * XXX some 1.3 enums may be missing!
- */
-#define GLX_CONFIG_CAVEAT		?
-#define GLX_DONT_CARE			?
-#define GLX_SLOW_CONFIG			?
-#define GLX_NON_CONFORMANT_CONFIG	?
-#define GLX_X_VISUAL_TYPE		0x22
-#define GLX_TRANSPARENT_TYPE		0x23
-#define GLX_TRANSPARENT_INDEX_VALUE	0x24
-#define GLX_TRANSPARENT_RED_VALUE	0x25
-#define GLX_TRANSPARENT_GREEN_VALUE	0x26
-#define GLX_TRANSPARENT_BLUE_VALUE	0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE	0x28
-#define GLX_MAX_PBUFFER_WIDTH		?
-#define GLX_MAX_PBUFFER_HEIGHT		?
-#define GLX_MAX_PBUFFER_PIXELS		?
-#define GLX_PRESERVED_CONTENTS		?
-#define GLX_LARGEST_BUFFER		?
-#define GLX_DRAWABLE_TYPE		?
-#define GLX_FBCONFIG_ID			?
-#define GLX_VISUAL_ID			?
-#define GLX_WINDOW_BIT			?
-#define GLX_PIXMAP_BIT			?
-#define GLX_PBUFFER_BIT			?
-#define GLX_AUX_BUFFERS_BIT		?
-#define GLX_FRONT_LEFT_BUFFER_BIT	?
-#define GLX_FRONT_RIGHT_BUFFER_BIT	?
-#define GLX_BACK_LEFT_BUFFER_BIT	?
-#define GLX_BACK_RIGHT_BUFFER_BIT	?
-#define GLX_AUX_BUFFERS_BIT		?
-#define GLX_DEPTH_BUFFER_BIT		?
-#define GLX_STENCIL_BUFFER_BIT		?
-#define GLX_ACCUM_BUFFER_BIT		?
-#define GLX_RENDER_TYPE			?
-#define GLX_DRAWABLE_TYPE		?
-#define GLX_X_RENDERABLE		?
-#define GLX_NONE			0x8000
-#define GLX_TRUE_COLOR			0x8002
-#define GLX_DIRECT_COLOR		0x8003
-#define GLX_PSEUDO_COLOR		0x8004
-#define GLX_STATIC_COLOR		0x8005
-#define GLX_GRAY_SCALE			0x8006
-#define GLX_STATIC_GRAY			0x8007
-#define GLX_TRANSPARENT_INDEX		0x8009
-#define GLX_COLOR_INDEX_TYPE		?
-#define GLX_COLOR_INDEX_BIT		?
-#define GLX_SCREEN			?
-#define GLX_PBUFFER_CLOBBER_MASK	?
-#define GLX_DAMAGED			?
-#define GLX_SAVED			?
-#define GLX_WINDOW			?
-#define GLX_PBUFFER			?
-
-
-/*
- * GLX_EXT_visual_info extension
- */
-#define GLX_X_VISUAL_TYPE_EXT		0x22
-#define GLX_TRANSPARENT_TYPE_EXT	0x23
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT	0x24
-#define GLX_TRANSPARENT_RED_VALUE_EXT	0x25
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT	0x26
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT	0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT	0x28
-
-
-/*
- * GLX_visual_info extension
- */
-#define GLX_TRUE_COLOR_EXT		0x8002
-#define GLX_DIRECT_COLOR_EXT		0x8003
-#define GLX_PSEUDO_COLOR_EXT		0x8004
-#define GLX_STATIC_COLOR_EXT		0x8005
-#define GLX_GRAY_SCALE_EXT		0x8006
-#define GLX_STATIC_GRAY_EXT		0x8007
-#define GLX_NONE_EXT			0x8000
-#define GLX_TRANSPARENT_RGB_EXT		0x8008
-#define GLX_TRANSPARENT_INDEX_EXT	0x8009
-
-
-/*
- * Compile-time extension tests
- */
-#define GLX_EXT_visual_info		1
-#define GLX_MESA_pixmap_colormap	1
-#define GLX_MESA_release_buffers	1
-#define GLX_MESA_copy_sub_buffer	1
-#define GLX_MESA_set_3dfx_mode		1
-#define GLX_SGI_video_sync		1
-#define GLX_ARB_get_proc_address	1
-
-
-
-#ifdef MESA
-   typedef XMesaContext GLXContext;
-   typedef Pixmap GLXPixmap;
-   typedef Drawable GLXDrawable;
-#else
-   typedef void * GLXContext;
-   typedef XID GLXPixmap;
-   typedef XID GLXDrawable;
-   /* GLX 1.3 and later */
-   typedef XID GLXFBConfigID;
-   typedef XID GLXPfuffer;
-   typedef XID GLXWindow;
-   typedef XID GLXPbuffer;
-   typedef XID GLXFBConfig;
-#endif
-typedef XID GLXContextID;
-
-
-
-extern XVisualInfo* glXChooseVisual( Display *dpy, int screen,
-				     int *attribList );
-
-extern GLXContext glXCreateContext( Display *dpy, XVisualInfo *vis,
-				    GLXContext shareList, Bool direct );
-
-extern void glXDestroyContext( Display *dpy, GLXContext ctx );
-
-extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
-			    GLXContext ctx);
-
-extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
-			    unsigned long mask );
-
-extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );
-
-extern GLXPixmap glXCreateGLXPixmap( Display *dpy, XVisualInfo *visual,
-				     Pixmap pixmap );
-
-extern void glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap );
-
-extern Bool glXQueryExtension( Display *dpy, int *errorb, int *event );
-
-extern Bool glXQueryVersion( Display *dpy, int *maj, int *min );
-
-extern Bool glXIsDirect( Display *dpy, GLXContext ctx );
-
-extern int glXGetConfig( Display *dpy, XVisualInfo *visual,
-			 int attrib, int *value );
-
-extern GLXContext glXGetCurrentContext( void );
-
-extern GLXDrawable glXGetCurrentDrawable( void );
-
-extern void glXWaitGL( void );
-
-extern void glXWaitX( void );
-
-extern void glXUseXFont( Font font, int first, int count, int list );
-
-
-
-/* GLX 1.1 and later */
-extern const char *glXQueryExtensionsString( Display *dpy, int screen );
-
-extern const char *glXQueryServerString( Display *dpy, int screen, int name );
-
-extern const char *glXGetClientString( Display *dpy, int name );
-
-
-/* GLX 1.2 and later */
-extern Display *glXGetCurrentDisplay( void );
-
-
-/* GLX 1.3 and later */
-extern GLXFBConfig glXChooseFBConfig( Display *dpy, int screen,
-                                      const int *attribList, int *nitems );
-
-extern int glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
-                                 int attribute, int *value );
-
-extern XVisualInfo *glXGetVisualFromFBConfig( Display *dpy,
-                                              GLXFBConfig config );
-
-extern GLXWindow glXCreateWindow( Display *dpy, GLXFBConfig config,
-                                  Window win, const int *attribList );
-
-extern void glXDestroyWindow( Display *dpy, GLXWindow window );
-
-extern GLXPixmap glXCreatePixmap( Display *dpy, GLXFBConfig config,
-                                  Pixmap pixmap, const int *attribList );
-
-extern void glXDestroyPixmap( Display *dpy, GLXPixmap pixmap );
-
-extern GLXPbuffer glXCreatePbuffer( Display *dpy, GLXFBConfig config,
-                                    const int *attribList );
-
-extern void glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
-
-extern void glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
-                              unsigned int *value );
-
-extern GLXContext glXCreateNewContext( Display *dpy, GLXFBConfig config,
-                                       int renderType, GLXContext shareList,
-                                       Bool direct );
-
-extern Bool glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
-                                   GLXDrawable read, GLXContext ctx );
-
-extern GLXDrawable glXGetCurrentReadDrawable( void );
-
-extern int glXQueryContext( Display *dpy, GLXContext ctx, int attribute,
-                            int *value );
-
-extern void glXSelectEvent( Display *dpy, GLXDrawable drawable,
-                            unsigned long mask );
-
-extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
-                                 unsigned long *mask );
-
-
-
-/* GLX_MESA_pixmap_colormap */
-extern GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
-                                         Pixmap pixmap, Colormap cmap );
-
-
-/* GLX_MESA_release_buffers */
-extern Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
-
-
-/* GLX_MESA_copy_sub_buffer */
-extern void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
-                                  int x, int y, int width, int height );
-
-
-/* GLX_MESA_set_3dfx_mode */
-extern GLboolean glXSet3DfxModeMESA( GLint mode );
-
-
-/* GLX_SGI_video_sync */
-extern int glXGetVideoSyncSGI(unsigned int *count);
-extern int glXWaitVideoSyncSGI(int divisor, int remainder,
-                               unsigned int *count);
-
-
-/* GLX_ARB_get_proc_address */
-extern void (*glXGetProcAddressARB(const GLubyte *procName))();
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Index: xc/extras/Mesa/include/GL/osmesa.h
diff -u /dev/null xc/extras/Mesa/include/GL/osmesa.h:1.1
--- /dev/null	Sat Jul  1 20:46:08 2000
+++ xc/extras/Mesa/include/GL/osmesa.h	Fri Jun 16 17:02:05 2000
@@ -0,0 +1,246 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Mesa Off-Screen rendering interface.
+ *
+ * This is an operating system and window system independent interface to
+ * Mesa which allows one to render images into a client-supplied buffer in
+ * main memory.  Such images may manipulated or saved in whatever way the
+ * client wants.
+ *
+ * These are the API functions:
+ *   OSMesaCreateContext - create a new Off-Screen Mesa rendering context
+ *   OSMesaMakeCurrent - bind an OSMesaContext to a client's image buffer
+ *                       and make the specified context the current one.
+ *   OSMesaDestroyContext - destroy an OSMesaContext
+ *   OSMesaGetCurrentContext - return thread's current context ID
+ *   OSMesaPixelStore - controls how pixels are stored in image buffer
+ *   OSMesaGetIntegerv - return OSMesa state parameters
+ *
+ *
+ * The limits on the width and height of an image buffer are MAX_WIDTH and
+ * MAX_HEIGHT as defined in Mesa/src/config.h.  Defaults are 1280 and 1024.
+ * You can increase them as needed but beware that many temporary arrays in
+ * Mesa are dimensioned by MAX_WIDTH or MAX_HEIGHT.
+ */
+
+
+#ifndef OSMESA_H
+#define OSMESA_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include "GL/gl.h"
+
+
+#define OSMESA_MAJOR_VERSION 3
+#define OSMESA_MINOR_VERSION 3
+
+
+
+/*
+ * Values for the format parameter of OSMesaCreateContext()
+ * New in version 2.0.
+ */
+#define OSMESA_COLOR_INDEX	GL_COLOR_INDEX
+#define OSMESA_RGBA		GL_RGBA
+#define OSMESA_BGRA		0x1
+#define OSMESA_ARGB		0x2
+#define OSMESA_RGB		GL_RGB
+#define OSMESA_BGR		0x4
+
+
+/*
+ * OSMesaPixelStore() parameters:
+ * New in version 2.0.
+ */
+#define OSMESA_ROW_LENGTH	0x10
+#define OSMESA_Y_UP		0x11
+
+
+/*
+ * Accepted by OSMesaGetIntegerv:
+ */
+#define OSMESA_WIDTH		0x20
+#define OSMESA_HEIGHT		0x21
+#define OSMESA_FORMAT		0x22
+#define OSMESA_TYPE		0x23
+
+
+typedef struct osmesa_context *OSMesaContext;
+
+
+#if defined(__BEOS__) || defined(__QUICKDRAW__)
+#pragma export on
+#endif
+
+
+/*
+ * Create an Off-Screen Mesa rendering context.  The only attribute needed is
+ * an RGBA vs Color-Index mode flag.
+ *
+ * Input:  format - one of OSMESA_COLOR_INDEX, OSMESA_RGBA, OSMESA_BGRA,
+ *                  OSMESA_ARGB, OSMESA_RGB, or OSMESA_BGR.
+ *         sharelist - specifies another OSMesaContext with which to share
+ *                     display lists.  NULL indicates no sharing.
+ * Return:  an OSMesaContext or 0 if error
+ */
+GLAPI OSMesaContext GLAPIENTRY OSMesaCreateContext( GLenum format,
+                                                    OSMesaContext sharelist );
+
+
+
+
+/*
+ * Destroy an Off-Screen Mesa rendering context.
+ *
+ * Input:  ctx - the context to destroy
+ */
+GLAPI void GLAPIENTRY OSMesaDestroyContext( OSMesaContext ctx );
+
+
+
+/*
+ * Bind an OSMesaContext to an image buffer.  The image buffer is just a
+ * block of memory which the client provides.  Its size must be at least
+ * as large as width*height*sizeof(type).  Its address should be a multiple
+ * of 4 if using RGBA mode.
+ *
+ * Image data is stored in the order of glDrawPixels:  row-major order
+ * with the lower-left image pixel stored in the first array position
+ * (ie. bottom-to-top).
+ *
+ * Since the only type initially supported is GL_UNSIGNED_BYTE, if the
+ * context is in RGBA mode, each pixel will be stored as a 4-byte RGBA
+ * value.  If the context is in color indexed mode, each pixel will be
+ * stored as a 1-byte value.
+ *
+ * If the context's viewport hasn't been initialized yet, it will now be
+ * initialized to (0,0,width,height).
+ *
+ * Input:  ctx - the rendering context
+ *         buffer - the image buffer memory
+ *         type - data type for pixel components, only GL_UNSIGNED_BYTE
+ *                supported now
+ *         width, height - size of image buffer in pixels, at least 1
+ * Return:  GL_TRUE if success, GL_FALSE if error because of invalid ctx,
+ *          invalid buffer address, type!=GL_UNSIGNED_BYTE, width<1, height<1,
+ *          width>internal limit or height>internal limit.
+ */
+GLAPI GLboolean GLAPIENTRY OSMesaMakeCurrent( OSMesaContext ctx,
+                                              void *buffer, GLenum type,
+                                              GLsizei width, GLsizei height );
+
+
+
+
+/*
+ * Return the current Off-Screen Mesa rendering context handle.
+ */
+GLAPI OSMesaContext GLAPIENTRY OSMesaGetCurrentContext( void );
+
+
+
+/*
+ * Set pixel store/packing parameters for the current context.
+ * This is similar to glPixelStore.
+ * Input:  pname - OSMESA_ROW_LENGTH
+ *                    specify actual pixels per row in image buffer
+ *                    0 = same as image width (default)
+ *                 OSMESA_Y_UP
+ *                    zero = Y coordinates increase downward
+ *                    non-zero = Y coordinates increase upward (default)
+ *         value - the value for the parameter pname
+ *
+ * New in version 2.0.
+ */
+GLAPI void GLAPIENTRY OSMesaPixelStore( GLint pname, GLint value );
+
+
+
+/*
+ * Return an integer value like glGetIntegerv.
+ * Input:  pname -
+ *                 OSMESA_WIDTH  return current image width
+ *                 OSMESA_HEIGHT  return current image height
+ *                 OSMESA_FORMAT  return image format
+ *                 OSMESA_TYPE  return color component data type
+ *                 OSMESA_ROW_LENGTH return row length in pixels
+ *                 OSMESA_Y_UP returns 1 or 0 to indicate Y axis direction
+ *         value - pointer to integer in which to return result.
+ */
+GLAPI void GLAPIENTRY OSMesaGetIntegerv( GLint pname, GLint *value );
+
+
+
+/*
+ * Return the depth buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          bytesPerValue - bytes per depth value (2 or 4)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ *
+ * New in Mesa 2.4.
+ */
+GLAPI GLboolean GLAPIENTRY OSMesaGetDepthBuffer( OSMesaContext c,
+                                                 GLint *width, GLint *height,
+                                                 GLint *bytesPerValue,
+                                                 void **buffer );
+
+
+/*
+ * Return the color buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          format - buffer format (OSMESA_FORMAT)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ *
+ * New in Mesa 3.3.
+ */
+GLAPI GLboolean GLAPIENTRY OSMesaGetColorBuffer( OSMesaContext c,
+                                                 GLint *width, GLint *height,
+                                                 GLint *format,
+                                                 void **buffer );
+
+
+#if defined(__BEOS__) || defined(__QUICKDRAW__)
+#pragma export off
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
Index: xc/extras/Mesa/include/GL/xmesa.h
diff -u xc/extras/Mesa/include/GL/xmesa.h:1.2 xc/extras/Mesa/include/GL/xmesa.h:1.3
--- xc/extras/Mesa/include/GL/xmesa.h:1.2	Mon Feb 14 23:12:00 2000
+++ xc/extras/Mesa/include/GL/xmesa.h	Fri Jun 16 17:02:05 2000
@@ -78,10 +78,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include "xmesa_x.h"
-#ifdef GLX_DIRECT_RENDERING
-#include "dri_mesa.h"
 #endif
-#endif
 #include "GL/gl.h"
 
 #ifdef AMIWIN
@@ -116,18 +113,6 @@
 
 typedef struct xmesa_buffer *XMesaBuffer;
 
-#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
-/*
- * Initialize the XMesa driver.
- */
-extern GLboolean XMesaInitDriver( __DRIscreenPrivate *driScrnPriv );
-
-/*
- * Reset the XMesa driver when the X server resets.
- */
-extern void XMesaResetDriver( __DRIscreenPrivate *driScrnPriv );
-#endif
-
 
 
 /*
@@ -140,24 +125,35 @@
  *         db_flag - GL_TRUE = double-buffered,
  *                   GL_FALSE = single buffered
  *         stereo_flag - stereo visual?
- *         depth_size - requested bits/depth values, or zero
- *         stencil_size - requested bits/stencil values, or zero
- *         accum_size - requested bits/component values, or zero
  *         ximage_flag - GL_TRUE = use an XImage for back buffer,
  *                       GL_FALSE = use an off-screen pixmap for back buffer
+ *         depth_size - requested bits/depth values, or zero
+ *         stencil_size - requested bits/stencil values, or zero
+ *         accum_red_size - requested bits/red accum values, or zero
+ *         accum_green_size - requested bits/green accum values, or zero
+ *         accum_blue_size - requested bits/blue accum values, or zero
+ *         accum_alpha_size - requested bits/alpha accum values, or zero
+ *         num_samples - number of samples/pixel if multisampling, or zero
+ *         level - visual level, usually 0
+ *         visualCaveat - ala the GLX extension, usually GLX_NONE_EXT
  * Return;  a new XMesaVisual or 0 if error.
  */
 extern XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
-				      XMesaVisualInfo visinfo,
-				      GLboolean rgb_flag,
-				      GLboolean alpha_flag,
-				      GLboolean db_flag,
-				      GLboolean stereo_flag,
-				      GLboolean ximage_flag,
-				      GLint depth_size,
-				      GLint stencil_size,
-				      GLint accum_size,
-				      GLint level );
+                                      XMesaVisualInfo visinfo,
+                                      GLboolean rgb_flag,
+                                      GLboolean alpha_flag,
+                                      GLboolean db_flag,
+                                      GLboolean stereo_flag,
+                                      GLboolean ximage_flag,
+                                      GLint depth_size,
+                                      GLint stencil_size,
+                                      GLint accum_red_size,
+                                      GLint accum_green_size,
+                                      GLint accum_blue_size,
+                                      GLint accum_alpha_size,
+                                      GLint num_samples,
+                                      GLint level,
+                                      GLint visualCaveat );
 
 /*
  * Destroy an XMesaVisual, but not the associated XVisualInfo.
@@ -175,11 +171,7 @@
  * Return:  an XMesaContext or NULL if error.
  */
 extern XMesaContext XMesaCreateContext( XMesaVisual v,
-					XMesaContext share_list
-#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
-					, __DRIcontextPrivate *driContextPriv
-#endif
-				      );
+					XMesaContext share_list );
 
 
 /*
@@ -191,12 +183,7 @@
 /*
  * Create an XMesaBuffer from an X window.
  */
-extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v,
-					    XMesaWindow w
-#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
-					    , __DRIdrawablePrivate *driDrawPriv
-#endif
-					  );
+extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, XMesaWindow w );
 
 
 /*
@@ -204,11 +191,7 @@
  */
 extern XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v,
 					    XMesaPixmap p,
-					    XMesaColormap cmap
-#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
-					    , __DRIdrawablePrivate *driDrawPriv
-#endif
-					  );
+					    XMesaColormap cmap );
 
 
 /*
Index: xc/extras/Mesa/src/aatriangle.c
diff -u /dev/null xc/extras/Mesa/src/aatriangle.c:1.1
--- /dev/null	Sat Jul  1 20:46:08 2000
+++ xc/extras/Mesa/src/aatriangle.c	Fri Jun 16 17:02:06 2000
@@ -0,0 +1,421 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Antialiased Triangle rasterizers
+ */
+
+
+#ifdef PC_HEADER
+#include "all.h"
+#else
+#include "glheader.h"
+#include "aatriangle.h"
+#include "span.h"
+#include "types.h"
+#include "vb.h"
+#endif
+
+
+/*
+ * Compute coefficients of a plane using the X,Y coords of the v0, v1, v2
+ * vertices and the given Z values.
+ */
+static INLINE void
+compute_plane(const GLfloat v0[], const GLfloat v1[], const GLfloat v2[],
+              GLfloat z0, GLfloat z1, GLfloat z2, GLfloat plane[4])
+{
+   const GLfloat px = v1[0] - v0[0];
+   const GLfloat py = v1[1] - v0[1];
+   const GLfloat pz = z1 - z0;
+
+   const GLfloat qx = v2[0] - v0[0];
+   const GLfloat qy = v2[1] - v0[1];
+   const GLfloat qz = z2 - z0;
+
+   const GLfloat a = py * qz - pz * qy;
+   const GLfloat b = pz * qx - px * qz;
+   const GLfloat c = px * qy - py * qx;
+   const GLfloat d = -(a * v0[0] + b * v0[1] + c * z0);
+
+   plane[0] = a;
+   plane[1] = b;
+   plane[2] = c;
+   plane[3] = d;
+}
+
+
+/*
+ * Compute coefficients of a plane with a constant Z value.
+ */
+static INLINE void
+constant_plane(GLfloat value, GLfloat plane[4])
+{
+   plane[0] = 0.0;
+   plane[1] = 0.0;
+   plane[2] = -1.0;
+   plane[3] = value;
+}
+
+#define CONSTANT_PLANE(VALUE, PLANE)	\
+do {					\
+   PLANE[0] = 0.0F;			\
+   PLANE[1] = 0.0F;			\
+   PLANE[2] = -1.0F;			\
+   PLANE[3] = VALUE;			\
+} while (0)
+
+
+
+/*
+ * Solve plane equation for Z at (X,Y).
+ */
+static INLINE GLfloat
+solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
+   return z;
+}
+
+
+#define SOLVE_PLANE(X, Y, PLANE) \
+   ((PLANE[3] + PLANE[0] * (X) + PLANE[1] * (Y)) / -PLANE[2])
+
+
+/*
+ * Return 1 / solve_plane().
+ */
+static INLINE GLfloat
+solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   GLfloat z = -plane[2] / (plane[3] + plane[0] * x + plane[1] * y);
+   return z;
+}
+
+
+
+/*
+ * Solve plane and return clamped GLubyte value.
+ */
+static INLINE GLubyte
+solve_plane_0_255(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2] + 0.5F;
+   if (z < 0.0F)
+      return 0;
+   else if (z > 255.0F)
+      return 255;
+   return (GLubyte) (GLint) z;
+}
+
+
+
+/*
+ * Compute how much (area) of the given pixel is inside the triangle.
+ * Vertices MUST be specified in counter-clockwise order.
+ * Return:  coverage in [0, 1].
+ */
+static GLfloat
+compute_coveragef(const GLfloat v0[3], const GLfloat v1[3],
+                  const GLfloat v2[3], GLint winx, GLint winy)
+{
+   static const GLfloat samples[16][2] = {
+      /* start with the four corners */
+      { 0.00, 0.00 },
+      { 0.75, 0.00 },
+      { 0.00, 0.75 },
+      { 0.75, 0.75 },
+      /* continue with interior samples */
+      { 0.25, 0.00 },
+      { 0.50, 0.00 },
+      { 0.00, 0.25 },
+      { 0.25, 0.25 },
+      { 0.50, 0.25 },
+      { 0.75, 0.25 },
+      { 0.00, 0.50 },
+      { 0.25, 0.50 },
+      { 0.50, 0.50 },
+      { 0.75, 0.50 },
+      { 0.25, 0.75 },
+      { 0.50, 0.75 }
+   };
+   const GLfloat x = (GLfloat) winx;
+   const GLfloat y = (GLfloat) winy;
+   const GLfloat dx0 = v1[0] - v0[0];
+   const GLfloat dy0 = v1[1] - v0[1];
+   const GLfloat dx1 = v2[0] - v1[0];
+   const GLfloat dy1 = v2[1] - v1[1];
+   const GLfloat dx2 = v0[0] - v2[0];
+   const GLfloat dy2 = v0[1] - v2[1];
+   GLint stop = 4, i;
+   GLfloat insideCount = 16.0F;
+
+#ifdef DEBUG
+   {
+      const GLfloat area = dx0 * dy1 - dx1 * dy0;
+      assert(area >= 0.0);
+   }
+#endif
+
+   for (i = 0; i < stop; i++) {
+      const GLfloat sx = x + samples[i][0];
+      const GLfloat sy = y + samples[i][1];
+      const GLfloat fx0 = sx - v0[0];
+      const GLfloat fy0 = sy - v0[1];
+      const GLfloat fx1 = sx - v1[0];
+      const GLfloat fy1 = sy - v1[1];
+      const GLfloat fx2 = sx - v2[0];
+      const GLfloat fy2 = sy - v2[1];
+      /* cross product determines if sample is inside or outside each edge */
+      GLfloat cross0 = (dx0 * fy0 - dy0 * fx0);
+      GLfloat cross1 = (dx1 * fy1 - dy1 * fx1);
+      GLfloat cross2 = (dx2 * fy2 - dy2 * fx2);
+      /* Check if the sample is exactly on an edge.  If so, let cross be a
+       * positive or negative value depending on the direction of the edge.
+       */
+      if (cross0 == 0.0F)
+         cross0 = dx0 + dy0;
+      if (cross1 == 0.0F)
+         cross1 = dx1 + dy1;
+      if (cross2 == 0.0F)
+         cross2 = dx2 + dy2;
+      if (cross0 < 0.0F || cross1 < 0.0F || cross2 < 0.0F) {
+         /* point is outside triangle */
+         insideCount -= 1.0F;
+         stop = 16;
+      }
+   }
+   if (stop == 4)
+      return 1.0F;
+   else
+      return insideCount * (1.0F / 16.0F);
+}
+
+
+
+/*
+ * Compute how much (area) of the given pixel is inside the triangle.
+ * Vertices MUST be specified in counter-clockwise order.
+ * Return:  coverage in [0, 15].
+ */
+static GLint
+compute_coveragei(const GLfloat v0[3], const GLfloat v1[3],
+                  const GLfloat v2[3], GLint winx, GLint winy)
+{
+   /* NOTE: 15 samples instead of 16.
+    * A better sample distribution could be used.
+    */
+   static const GLfloat samples[15][2] = {
+      /* start with the four corners */
+      { 0.00, 0.00 },
+      { 0.75, 0.00 },
+      { 0.00, 0.75 },
+      { 0.75, 0.75 },
+      /* continue with interior samples */
+      { 0.25, 0.00 },
+      { 0.50, 0.00 },
+      { 0.00, 0.25 },
+      { 0.25, 0.25 },
+      { 0.50, 0.25 },
+      { 0.75, 0.25 },
+      { 0.00, 0.50 },
+      { 0.25, 0.50 },
+      /*{ 0.50, 0.50 },*/
+      { 0.75, 0.50 },
+      { 0.25, 0.75 },
+      { 0.50, 0.75 }
+   };
+   const GLfloat x = (GLfloat) winx;
+   const GLfloat y = (GLfloat) winy;
+   const GLfloat dx0 = v1[0] - v0[0];
+   const GLfloat dy0 = v1[1] - v0[1];
+   const GLfloat dx1 = v2[0] - v1[0];
+   const GLfloat dy1 = v2[1] - v1[1];
+   const GLfloat dx2 = v0[0] - v2[0];
+   const GLfloat dy2 = v0[1] - v2[1];
+   GLint stop = 4, i;
+   GLint insideCount = 15;
+
+#ifdef DEBUG
+   {
+      const GLfloat area = dx0 * dy1 - dx1 * dy0;
+      assert(area >= 0.0);
+   }
+#endif
+
+   for (i = 0; i < stop; i++) {
+      const GLfloat sx = x + samples[i][0];
+      const GLfloat sy = y + samples[i][1];
+      const GLfloat fx0 = sx - v0[0];
+      const GLfloat fy0 = sy - v0[1];
+      const GLfloat fx1 = sx - v1[0];
+      const GLfloat fy1 = sy - v1[1];
+      const GLfloat fx2 = sx - v2[0];
+      const GLfloat fy2 = sy - v2[1];
+      /* cross product determines if sample is inside or outside each edge */
+      GLfloat cross0 = (dx0 * fy0 - dy0 * fx0);
+      GLfloat cross1 = (dx1 * fy1 - dy1 * fx1);
+      GLfloat cross2 = (dx2 * fy2 - dy2 * fx2);
+      /* Check if the sample is exactly on an edge.  If so, let cross be a
+       * positive or negative value depending on the direction of the edge.
+       */
+      if (cross0 == 0.0F)
+         cross0 = dx0 + dy0;
+      if (cross1 == 0.0F)
+         cross1 = dx1 + dy1;
+      if (cross2 == 0.0F)
+         cross2 = dx2 + dy2;
+      if (cross0 < 0.0F || cross1 < 0.0F || cross2 < 0.0F) {
+         /* point is outside triangle */
+         insideCount--;
+         stop = 15;
+      }
+   }
+   if (stop == 4)
+      return 15;
+   else
+      return insideCount;
+}
+
+
+
+static void
+rgba_aa_tri(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv)
+{
+#define DO_Z
+#define DO_RGBA
+#include "aatritemp.h"
+}
+
+
+static void
+index_aa_tri(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv)
+{
+#define DO_Z
+#define DO_INDEX
+#include "aatritemp.h"
+}
+
+
+/*
+ * Compute mipmap level of detail.
+ */
+static INLINE GLfloat
+compute_lambda(const GLfloat sPlane[4], const GLfloat tPlane[4],
+               GLfloat invQ, GLfloat width, GLfloat height)
+{
+   GLfloat dudx = sPlane[0] / sPlane[2] * invQ * width;
+   GLfloat dudy = sPlane[1] / sPlane[2] * invQ * width;
+   GLfloat dvdx = tPlane[0] / tPlane[2] * invQ * height;
+   GLfloat dvdy = tPlane[1] / tPlane[2] * invQ * height;
+   GLfloat r1 = dudx * dudx + dudy * dudy;
+   GLfloat r2 = dvdx * dvdx + dvdy * dvdy;
+   GLfloat rho2 = r1 + r2;
+   /* return log base 2 of rho */
+   return log(rho2) * 1.442695 * 0.5;       /* 1.442695 = 1/log(2) */
+}
+
+
+static void
+tex_aa_tri(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv)
+{
+#define DO_Z
+#define DO_RGBA
+#define DO_STUV0
+#include "aatritemp.h"
+}
+
+
+static void
+spec_tex_aa_tri(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv)
+{
+#define DO_Z
+#define DO_RGBA
+#define DO_STUV0
+#define DO_SPEC
+#include "aatritemp.h"
+}
+
+
+static void
+multitex_aa_tri(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv)
+{
+#define DO_Z
+#define DO_RGBA
+#define DO_STUV0
+#define DO_STUV1
+#include "aatritemp.h"
+}
+
+static void
+spec_multitex_aa_tri(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv)
+{
+#define DO_Z
+#define DO_RGBA
+#define DO_STUV0
+#define DO_STUV1
+#define DO_SPEC
+#include "aatritemp.h"
+}
+
+
+/*
+ * Examine GL state and set ctx->Driver.TriangleFunc to an
+ * appropriate antialiased triangle rasterizer function.
+ */
+void
+_mesa_set_aa_triangle_function(GLcontext *ctx)
+{
+   ASSERT(ctx->Polygon.SmoothFlag);
+   if (ctx->Texture.ReallyEnabled) {
+      if (ctx->Light.Enabled &&
+          ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) {
+         if (ctx->Texture.ReallyEnabled >= TEXTURE1_1D) {
+            ctx->Driver.TriangleFunc = spec_multitex_aa_tri;
+         }
+         else {
+            ctx->Driver.TriangleFunc = spec_tex_aa_tri;
+         }
+      }
+      else {
+         if (ctx->Texture.ReallyEnabled >= TEXTURE1_1D) {
+            ctx->Driver.TriangleFunc = multitex_aa_tri;
+         }
+         else {
+            ctx->Driver.TriangleFunc = tex_aa_tri;
+         }
+      }
+   }
+   else {
+      if (ctx->Visual->RGBAflag) {
+         ctx->Driver.TriangleFunc = rgba_aa_tri;
+      }
+      else {
+         ctx->Driver.TriangleFunc = index_aa_tri;
+      }
+   }
+   ASSERT(ctx->Driver.TriangleFunc);
+}
Index: xc/extras/Mesa/src/aatriangle.h
diff -u /dev/null xc/extras/Mesa/src/aatriangle.h:1.1
--- /dev/null	Sat Jul  1 20:46:08 2000
+++ xc/extras/Mesa/src/aatriangle.h	Fri Jun 16 17:02:06 2000
@@ -0,0 +1,38 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef AATRIANGLE_H
+#define AATRIANGLE_H
+
+
+#include "types.h"
+
+
+extern void
+_mesa_set_aa_triangle_function(GLcontext *ctx);
+
+
+#endif
Index: xc/extras/Mesa/src/aatritemp.h
diff -u /dev/null xc/extras/Mesa/src/aatritemp.h:1.1
--- /dev/null	Sat Jul  1 20:46:08 2000
+++ xc/extras/Mesa/src/aatritemp.h	Fri Jun 16 17:02:06 2000
@@ -0,0 +1,490 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Antialiased Triangle Rasterizer Template
+ *
+ * This file is #include'd to generate custom AA triangle rasterizers.
+ * NOTE: this code hasn't been optimized yet.  That'll come after it
+ * works correctly.
+ *
+ * The following macros may be defined to indicate what auxillary information
+ * must be copmuted across the triangle:
+ *    DO_Z      - if defined, compute Z values
+ *    DO_RGBA   - if defined, compute RGBA values
+ *    DO_INDEX  - if defined, compute color index values
+ *    DO_SPEC   - if defined, compute specular RGB values
+ *    DO_STUV0  - if defined, compute unit 0 STRQ texcoords
+ *    DO_STUV1  - if defined, compute unit 1 STRQ texcoords
+ */
+
+/*void triangle( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv )*/
+{
+   const struct vertex_buffer *VB = ctx->VB;
+   const GLfloat *p0 = VB->Win.data[v0];
+   const GLfloat *p1 = VB->Win.data[v1];
+   const GLfloat *p2 = VB->Win.data[v2];
+   GLint vMin, vMid, vMax;
+   GLint iyMin, iyMax;
+   GLfloat yMin, yMax;
+   GLboolean ltor;
+   GLfloat majDx, majDy;
+#ifdef DO_Z
+   GLfloat zPlane[4];                                       /* Z (depth) */
+   GLdepth z[MAX_WIDTH];
+#endif
+#ifdef DO_RGBA
+   GLfloat rPlane[4], gPlane[4], bPlane[4], aPlane[4];      /* color */
+   GLubyte rgba[MAX_WIDTH][4];
+#endif
+#ifdef DO_INDEX
+   GLfloat iPlane[4];                                       /* color index */
+   GLuint index[MAX_WIDTH];
+#endif
+#ifdef DO_SPEC
+   GLfloat srPlane[4], sgPlane[4], sbPlane[4];              /* spec color */
+   GLubyte spec[MAX_WIDTH][4];
+#endif
+#ifdef DO_STUV0
+   GLfloat s0Plane[4], t0Plane[4], u0Plane[4], v0Plane[4];  /* texture 0 */
+   GLfloat width0, height0;
+   GLfloat s[MAX_TEXTURE_UNITS][MAX_WIDTH];
+   GLfloat t[MAX_TEXTURE_UNITS][MAX_WIDTH];
+   GLfloat u[MAX_TEXTURE_UNITS][MAX_WIDTH];
+   GLfloat lambda[MAX_TEXTURE_UNITS][MAX_WIDTH];
+#endif
+#ifdef DO_STUV1
+   GLfloat s1Plane[4], t1Plane[4], u1Plane[4], v1Plane[4];  /* texture 1 */
+   GLfloat width1, height1;
+#endif
+   GLfloat bf = ctx->backface_sign;
+
+   /* determine bottom to top order of vertices */
+   {
+      GLfloat y0 = VB->Win.data[v0][1];
+      GLfloat y1 = VB->Win.data[v1][1];
+      GLfloat y2 = VB->Win.data[v2][1];
+      if (y0 <= y1) {
+	 if (y1 <= y2) {
+	    vMin = v0;   vMid = v1;   vMax = v2;   /* y0<=y1<=y2 */
+	 }
+	 else if (y2 <= y0) {
+	    vMin = v2;   vMid = v0;   vMax = v1;   /* y2<=y0<=y1 */
+	 }
+	 else {
+	    vMin = v0;   vMid = v2;   vMax = v1;  bf = -bf; /* y0<=y2<=y1 */
+	 }
+      }
+      else {
+	 if (y0 <= y2) {
+	    vMin = v1;   vMid = v0;   vMax = v2;  bf = -bf; /* y1<=y0<=y2 */
+	 }
+	 else if (y2 <= y1) {
+	    vMin = v2;   vMid = v1;   vMax = v0;  bf = -bf; /* y2<=y1<=y0 */
+	 }
+	 else {
+	    vMin = v1;   vMid = v2;   vMax = v0;   /* y1<=y2<=y0 */
+	 }
+      }
+   }
+
+   majDx = VB->Win.data[vMax][0] - VB->Win.data[vMin][0];
+   majDy = VB->Win.data[vMax][1] - VB->Win.data[vMin][1];
+
+   {
+      const GLfloat botDx = VB->Win.data[vMid][0] - VB->Win.data[vMin][0];
+      const GLfloat botDy = VB->Win.data[vMid][1] - VB->Win.data[vMin][1];
+      const GLfloat area = majDx * botDy - botDx * majDy;
+      ltor = (GLboolean) (area < 0.0F);
+      /* Do backface culling */
+      if (area * bf < 0 || area * area < .0025)
+	 return;
+   }
+
+#ifndef DO_OCCLUSION_TEST
+   ctx->OcclusionResult = GL_TRUE;
+#endif
+
+   /* plane setup */
+#ifdef DO_Z
+   compute_plane(p0, p1, p2, p0[2], p1[2], p2[2], zPlane);
+#endif
+#ifdef DO_RGBA
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      GLubyte (*rgba)[4] = VB->ColorPtr->data;
+      compute_plane(p0, p1, p2, rgba[v0][0], rgba[v1][0], rgba[v2][0], rPlane);
+      compute_plane(p0, p1, p2, rgba[v0][1], rgba[v1][1], rgba[v2][1], gPlane);
+      compute_plane(p0, p1, p2, rgba[v0][2], rgba[v1][2], rgba[v2][2], bPlane);
+      compute_plane(p0, p1, p2, rgba[v0][3], rgba[v1][3], rgba[v2][3], aPlane);
+   }
+   else {
+      constant_plane(VB->ColorPtr->data[pv][RCOMP], rPlane);
+      constant_plane(VB->ColorPtr->data[pv][GCOMP], gPlane);
+      constant_plane(VB->ColorPtr->data[pv][BCOMP], bPlane);
+      constant_plane(VB->ColorPtr->data[pv][ACOMP], aPlane);
+   }
+#endif
+#ifdef DO_INDEX
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      compute_plane(p0, p1, p2, VB->IndexPtr->data[v0],
+                    VB->IndexPtr->data[v1], VB->IndexPtr->data[v2], iPlane);
+   }
+   else {
+      constant_plane(VB->IndexPtr->data[pv], iPlane);
+   }
+#endif
+#ifdef DO_SPEC
+   {
+      GLubyte (*spec)[4] = VB->Specular;
+      compute_plane(p0, p1, p2, spec[v0][0], spec[v1][0], spec[v2][0],srPlane);
+      compute_plane(p0, p1, p2, spec[v0][1], spec[v1][1], spec[v2][1],sgPlane);
+      compute_plane(p0, p1, p2, spec[v0][2], spec[v1][2], spec[v2][2],sbPlane);
+   }
+#endif
+#ifdef DO_STUV0
+   {
+      const struct gl_texture_object *obj = ctx->Texture.Unit[0].Current;
+      const struct gl_texture_image *texImage = obj->Image[obj->BaseLevel];
+      const GLint tSize = 3;
+      const GLfloat invW0 = VB->Win.data[v0][3];
+      const GLfloat invW1 = VB->Win.data[v1][3];
+      const GLfloat invW2 = VB->Win.data[v2][3];
+      GLfloat (*texCoord)[4] = VB->TexCoordPtr[0]->data;
+      const GLfloat s0 = texCoord[v0][0] * invW0;
+      const GLfloat s1 = texCoord[v1][0] * invW1;
+      const GLfloat s2 = texCoord[v2][0] * invW2;
+      const GLfloat t0 = (tSize > 1) ? texCoord[v0][1] * invW0 : 0.0F;
+      const GLfloat t1 = (tSize > 1) ? texCoord[v1][1] * invW1 : 0.0F;
+      const GLfloat t2 = (tSize > 1) ? texCoord[v2][1] * invW2 : 0.0F;
+      const GLfloat r0 = (tSize > 2) ? texCoord[v0][2] * invW0 : 0.0F;
+      const GLfloat r1 = (tSize > 2) ? texCoord[v1][2] * invW1 : 0.0F;
+      const GLfloat r2 = (tSize > 2) ? texCoord[v2][2] * invW2 : 0.0F;
+      const GLfloat q0 = (tSize > 3) ? texCoord[v0][3] * invW0 : invW0;
+      const GLfloat q1 = (tSize > 3) ? texCoord[v1][3] * invW1 : invW1;
+      const GLfloat q2 = (tSize > 3) ? texCoord[v2][3] * invW2 : invW2;
+      compute_plane(p0, p1, p2, s0, s1, s2, s0Plane);
+      compute_plane(p0, p1, p2, t0, t1, t2, t0Plane);
+      compute_plane(p0, p1, p2, r0, r1, r2, u0Plane);
+      compute_plane(p0, p1, p2, q0, q1, q2, v0Plane);
+      width0 = (GLfloat) texImage->Width;
+      height0 = (GLfloat) texImage->Height;
+   }
+#endif
+#ifdef DO_STUV1
+   {
+      const struct gl_texture_object *obj = ctx->Texture.Unit[1].Current;
+      const struct gl_texture_image *texImage = obj->Image[obj->BaseLevel];
+      const GLint tSize = VB->TexCoordPtr[1]->size;
+      const GLfloat invW0 = VB->Win.data[v0][3];
+      const GLfloat invW1 = VB->Win.data[v1][3];
+      const GLfloat invW2 = VB->Win.data[v2][3];
+      GLfloat (*texCoord)[4] = VB->TexCoordPtr[1]->data;
+      const GLfloat s0 = texCoord[v0][0] * invW0;
+      const GLfloat s1 = texCoord[v1][0] * invW1;
+      const GLfloat s2 = texCoord[v2][0] * invW2;
+      const GLfloat t0 = (tSize > 1) ? texCoord[v0][1] * invW0 : 0.0F;
+      const GLfloat t1 = (tSize > 1) ? texCoord[v1][1] * invW1 : 0.0F;
+      const GLfloat t2 = (tSize > 1) ? texCoord[v2][1] * invW2 : 0.0F;
+      const GLfloat r0 = (tSize > 2) ? texCoord[v0][2] * invW0 : 0.0F;
+      const GLfloat r1 = (tSize > 2) ? texCoord[v1][2] * invW1 : 0.0F;
+      const GLfloat r2 = (tSize > 2) ? texCoord[v2][2] * invW2 : 0.0F;
+      const GLfloat q0 = (tSize > 3) ? texCoord[v0][3] * invW0 : invW0;
+      const GLfloat q1 = (tSize > 3) ? texCoord[v1][3] * invW1 : invW1;
+      const GLfloat q2 = (tSize > 3) ? texCoord[v2][3] * invW2 : invW2;
+      compute_plane(p0, p1, p2, s0, s1, s2, s1Plane);
+      compute_plane(p0, p1, p2, t0, t1, t2, t1Plane);
+      compute_plane(p0, p1, p2, r0, r1, r2, u1Plane);
+      compute_plane(p0, p1, p2, q0, q1, q2, v1Plane);
+      width1 = (GLfloat) texImage->Width;
+      height1 = (GLfloat) texImage->Height;
+   }
+#endif
+
+   yMin = VB->Win.data[vMin][1];
+   yMax = VB->Win.data[vMax][1];
+   iyMin = (int) yMin;
+   iyMax = (int) yMax + 1;
+
+   if (ltor) {
+      /* scan left to right */
+      const float *pMin = VB->Win.data[vMin];
+      const float *pMid = VB->Win.data[vMid];
+      const float *pMax = VB->Win.data[vMax];
+      const float dxdy = majDx / majDy;
+      const float xAdj = dxdy < 0.0F ? -dxdy : 0.0F;
+      float x = VB->Win.data[vMin][0] - (yMin - iyMin) * dxdy;
+      int iy;
+      for (iy = iyMin; iy < iyMax; iy++, x += dxdy) {
+         GLint ix, startX = (GLint) (x - xAdj);
+         GLuint count, n;
+         GLfloat coverage = 0.0F;
+         /* skip over fragments with zero coverage */
+         while (startX < MAX_WIDTH) {
+            coverage = compute_coveragef(pMin, pMid, pMax, startX, iy);
+            if (coverage > 0.0F)
+               break;
+            startX++;
+         }
+
+         /* enter interior of triangle */
+         ix = startX;
+         count = 0;
+         while (coverage > 0.0F) {
+#ifdef DO_Z
+            z[count] = (GLdepth) solve_plane(ix, iy, zPlane);
+#endif
+#ifdef DO_RGBA
+            rgba[count][RCOMP] = solve_plane_0_255(ix, iy, rPlane);
+            rgba[count][GCOMP] = solve_plane_0_255(ix, iy, gPlane);
+            rgba[count][BCOMP] = solve_plane_0_255(ix, iy, bPlane);
+            rgba[count][ACOMP] = (GLubyte) (solve_plane_0_255(ix, iy, aPlane) * coverage);
+#endif
+#ifdef DO_INDEX
+            {
+               GLint frac = compute_coveragei(pMin, pMid, pMax, ix, iy);
+               GLint indx = (GLint) solve_plane(ix, iy, iPlane);
+               index[count] = (indx & ~0xf) | frac;
+            }
+#endif
+#ifdef DO_SPEC
+            spec[count][RCOMP] = solve_plane_0_255(ix, iy, srPlane);
+            spec[count][GCOMP] = solve_plane_0_255(ix, iy, sgPlane);
+            spec[count][BCOMP] = solve_plane_0_255(ix, iy, sbPlane);
+#endif
+#ifdef DO_STUV0
+            {
+               GLfloat invQ = solve_plane_recip(ix, iy, v0Plane);
+               s[0][count] = solve_plane(ix, iy, s0Plane) * invQ;
+               t[0][count] = solve_plane(ix, iy, t0Plane) * invQ;
+               u[0][count] = solve_plane(ix, iy, u0Plane) * invQ;
+               lambda[0][count] = compute_lambda(s0Plane, t0Plane, invQ,
+                                                 width0, height0);
+            }
+#endif
+#ifdef DO_STUV1
+            {
+               GLfloat invQ = solve_plane_recip(ix, iy, v1Plane);
+               s[1][count] = solve_plane(ix, iy, s1Plane) * invQ;
+               t[1][count] = solve_plane(ix, iy, t1Plane) * invQ;
+               u[1][count] = solve_plane(ix, iy, u1Plane) * invQ;
+               lambda[1][count] = compute_lambda(s1Plane, t1Plane, invQ,
+                                                 width1, height1);
+            }
+#endif
+            ix++;
+            count++;
+            coverage = compute_coveragef(pMin, pMid, pMax, ix, iy);
+         }
+
+         n = (GLuint) ix - (GLuint) startX;
+#ifdef DO_STUV1
+#  ifdef DO_SPEC
+         gl_write_multitexture_span(ctx, 2, n, startX, iy, z,
+                                    (const GLfloat (*)[MAX_WIDTH]) s,
+                                    (const GLfloat (*)[MAX_WIDTH]) t,
+                                    (const GLfloat (*)[MAX_WIDTH]) u,
+                                    (GLfloat (*)[MAX_WIDTH]) lambda,
+                                    rgba, (const GLubyte (*)[4]) spec,
+                                    GL_POLYGON);
+#  else
+         gl_write_multitexture_span(ctx, 2, n, startX, iy, z,
+                                    (const GLfloat (*)[MAX_WIDTH]) s,
+                                    (const GLfloat (*)[MAX_WIDTH]) t,
+                                    (const GLfloat (*)[MAX_WIDTH]) u,
+                                    lambda, rgba, NULL, GL_POLYGON);
+#  endif
+#elif defined(DO_STUV0)
+#  ifdef DO_SPEC
+         gl_write_texture_span(ctx, n, startX, iy, z,
+                               s[0], t[0], u[0], lambda[0], rgba,
+                               (const GLubyte (*)[4]) spec, GL_POLYGON);
+#  else
+         gl_write_texture_span(ctx, n, startX, iy, z,
+                               s[0], t[0], u[0], lambda[0],
+                               rgba, NULL, GL_POLYGON);
+#  endif
+#elif defined(DO_RGBA)
+         gl_write_rgba_span(ctx, n, startX, iy, z, rgba, GL_POLYGON);
+#elif defined(DO_INDEX)
+         gl_write_index_span(ctx, n, startX, iy, z, index, GL_POLYGON);
+#endif
+      }
+   }
+   else {
+      /* scan right to left */
+      const GLfloat *pMin = VB->Win.data[vMin];
+      const GLfloat *pMid = VB->Win.data[vMid];
+      const GLfloat *pMax = VB->Win.data[vMax];
+      const GLfloat dxdy = majDx / majDy;
+      const GLfloat xAdj = dxdy > 0 ? dxdy : 0.0F;
+      GLfloat x = VB->Win.data[vMin][0] - (yMin - iyMin) * dxdy;
+      GLint iy;
+      for (iy = iyMin; iy < iyMax; iy++, x += dxdy) {
+         GLint ix, left, startX = (GLint) (x + xAdj);
+         GLuint count, n;
+         GLfloat coverage = 0.0F;
+         /* skip fragments with zero coverage */
+         while (startX >= 0) {
+            coverage = compute_coveragef(pMin, pMax, pMid, startX, iy);
+            if (coverage > 0.0F)
+               break;
+            startX--;
+         }
+
+         /* enter interior of triangle */
+         ix = startX;
+         count = 0;
+         while (coverage > 0.0F) {
+#ifdef DO_Z
+            z[ix] = (GLdepth) solve_plane(ix, iy, zPlane);
+#endif
+#ifdef DO_RGBA
+            rgba[ix][RCOMP] = solve_plane_0_255(ix, iy, rPlane);
+            rgba[ix][GCOMP] = solve_plane_0_255(ix, iy, gPlane);
+            rgba[ix][BCOMP] = solve_plane_0_255(ix, iy, bPlane);
+            rgba[ix][ACOMP] = (GLubyte) (solve_plane_0_255(ix, iy, aPlane) * coverage);
+#endif
+#ifdef DO_INDEX
+            {
+               GLint frac = compute_coveragei(pMin, pMax, pMid, ix, iy);
+               GLint indx = (GLint) solve_plane(ix, iy, iPlane);
+               index[ix] = (indx & ~0xf) | frac;
+            }
+#endif
+#ifdef DO_SPEC
+            spec[ix][RCOMP] = solve_plane_0_255(ix, iy, srPlane);
+            spec[ix][GCOMP] = solve_plane_0_255(ix, iy, sgPlane);
+            spec[ix][BCOMP] = solve_plane_0_255(ix, iy, sbPlane);
+#endif
+#ifdef DO_STUV0
+            {
+               GLfloat invQ = solve_plane_recip(ix, iy, v0Plane);
+               s[0][ix] = solve_plane(ix, iy, s0Plane) * invQ;
+               t[0][ix] = solve_plane(ix, iy, t0Plane) * invQ;
+               u[0][ix] = solve_plane(ix, iy, u0Plane) * invQ;
+               lambda[0][ix] = compute_lambda(s0Plane, t0Plane, invQ,
+                                              width0, height0);
+            }
+#endif
+#ifdef DO_STUV1
+            {
+               GLfloat invQ = solve_plane_recip(ix, iy, v1Plane);
+               s[1][ix] = solve_plane(ix, iy, s1Plane) * invQ;
+               t[1][ix] = solve_plane(ix, iy, t1Plane) * invQ;
+               u[1][ix] = solve_plane(ix, iy, u1Plane) * invQ;
+               lambda[1][ix] = compute_lambda(s1Plane, t1Plane, invQ,
+                                              width1, height1);
+            }
+#endif
+            ix--;
+            count++;
+            coverage = compute_coveragef(pMin, pMax, pMid, ix, iy);
+         }
+
+         n = (GLuint) startX - (GLuint) ix;
+         left = ix + 1;
+#ifdef DO_STUV1
+         {
+            int j;
+            for (j = 0; j < n; j++) {
+               s[0][j] = s[0][j + left];
+               t[0][j] = t[0][j + left];
+               u[0][j] = u[0][j + left];
+               s[1][j] = s[1][j + left];
+               t[1][j] = t[1][j + left];
+               u[1][j] = u[1][j + left];
+               lambda[0][j] = lambda[0][j + left];
+               lambda[1][j] = lambda[1][j + left];
+            }
+         }
+#  ifdef DO_SPEC
+         gl_write_multitexture_span(ctx, 2, n, left, iy, z + left,
+                                    (const GLfloat (*)[MAX_WIDTH]) s,
+                                    (const GLfloat (*)[MAX_WIDTH]) t,
+                                    (const GLfloat (*)[MAX_WIDTH]) u,
+                                    lambda, rgba + left,
+                                    (const GLubyte (*)[4]) (spec + left),
+                                    GL_POLYGON);
+#  else
+         gl_write_multitexture_span(ctx, 2, n, left, iy, z + left,
+                                    (const GLfloat (*)[MAX_WIDTH]) s,
+                                    (const GLfloat (*)[MAX_WIDTH]) t,
+                                    (const GLfloat (*)[MAX_WIDTH]) u,
+                                    lambda,
+                                    rgba + left, NULL, GL_POLYGON);
+#  endif
+#elif defined(DO_STUV0)
+#  ifdef DO_SPEC
+         gl_write_texture_span(ctx, n, left, iy, z + left,
+                               s[0] + left, t[0] + left, u[0] + left,
+                               lambda[0] + left, rgba + left,
+                               (const GLubyte (*)[4]) (spec + left),
+                               GL_POLYGON);
+#  else
+         gl_write_texture_span(ctx, n, left, iy, z + left,
+                               s[0] + left, t[0] + left,
+                               u[0] + left, lambda[0] + left,
+                               rgba + left, NULL, GL_POLYGON);
+#  endif
+#elif defined(DO_RGBA)
+         gl_write_rgba_span(ctx, n, left, iy, z + left,
+                            rgba + left, GL_POLYGON);
+#elif defined(DO_INDEX)
+         gl_write_index_span(ctx, n, left, iy, z + left,
+                             index + left, GL_POLYGON);
+#endif
+      }
+   }
+}
+
+
+#ifdef DO_Z
+#undef DO_Z
+#endif
+
+#ifdef DO_RGBA
+#undef DO_RGBA
+#endif
+
+#ifdef DO_INDEX
+#undef DO_INDEX
+#endif
+
+#ifdef DO_SPEC
+#undef DO_SPEC
+#endif
+
+#ifdef DO_STUV0
+#undef DO_STUV0
+#endif
+
+#ifdef DO_STUV1
+#undef DO_STUV1
+#endif
+
+#ifdef DO_OCCLUSION_TEST
+#undef DO_OCCLUSION_TEST
+#endif
Index: xc/extras/Mesa/src/accum.c
diff -u xc/extras/Mesa/src/accum.c:1.3 xc/extras/Mesa/src/accum.c:1.5
--- xc/extras/Mesa/src/accum.c:1.3	Mon Feb 14 23:12:00 2000
+++ xc/extras/Mesa/src/accum.c	Mon Jun 19 22:08:17 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -144,7 +144,7 @@
    
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glAccum");
 
-   if (ctx->Visual->AccumBits == 0 || ctx->DrawBuffer != ctx->ReadBuffer) {
+   if (ctx->Visual->AccumRedBits == 0 || ctx->DrawBuffer != ctx->ReadBuffer) {
       gl_error(ctx, GL_INVALID_OPERATION, "glAccum");
       return;
    }
@@ -187,7 +187,7 @@
 
    switch (op) {
       case GL_ADD:
-         {
+         if (value != 0.0F) {
 	    const GLaccum intVal = (GLaccum) (value * acc_scale);
 	    GLuint j;
             /* Leave optimized accum buffer mode */
@@ -205,7 +205,7 @@
 	 break;
 
       case GL_MULT:
-	 {
+         if (value != 1.0F) {
 	    GLuint j;
             /* Leave optimized accum buffer mode */
             if (ctx->IntegerAccumMode)
@@ -222,6 +222,9 @@
 	 break;
 
       case GL_ACCUM:
+         if (value == 0.0F)
+            return;
+
          (*ctx->Driver.SetReadBuffer)( ctx, ctx->ReadBuffer,
                                        ctx->Pixel.DriverReadBuffer );
 
@@ -350,7 +353,7 @@
             static GLchan multTable[32768];
             static GLfloat prevMult = 0.0;
             GLuint j;
-            const GLint max = 256 / mult;
+            const GLint max = (GLint) (256 / mult);
             if (mult != prevMult) {
                assert(max <= 32768);
                for (j = 0; j < max; j++)
@@ -374,7 +377,7 @@
                   rgba[i][ACOMP] = multTable[acc[i4+3]];
                }
                if (ctx->Color.SWmasking) {
-                  gl_mask_rgba_span( ctx, width, xpos, ypos, rgba );
+                  _mesa_mask_rgba_span( ctx, width, xpos, ypos, rgba );
                }
                (*ctx->Driver.WriteRGBASpan)( ctx, width, xpos, ypos, 
                                              (const GLubyte (*)[4])rgba, NULL );
@@ -401,7 +404,7 @@
                   rgba[i][ACOMP] = CLAMP( a, 0, iChanMax );
                }
                if (ctx->Color.SWmasking) {
-                  gl_mask_rgba_span( ctx, width, xpos, ypos, rgba );
+                  _mesa_mask_rgba_span( ctx, width, xpos, ypos, rgba );
                }
                (*ctx->Driver.WriteRGBASpan)( ctx, width, xpos, ypos, 
                                              (const GLubyte (*)[4])rgba, NULL );
@@ -426,7 +429,7 @@
    GLuint buffersize;
    GLfloat acc_scale;
 
-   if (ctx->Visual->AccumBits==0) {
+   if (ctx->Visual->AccumRedBits==0) {
       /* No accumulation buffer! */
       return;
    }
@@ -486,7 +489,7 @@
 	     ctx->Accum.ClearColor[2]==0.0 &&
 	     ctx->Accum.ClearColor[3]==0.0) {
 	    /* Black */
-	    MEMSET( ctx->DrawBuffer->Accum, 0, buffersize * 4 * sizeof(GLaccum) );
+	    BZERO( ctx->DrawBuffer->Accum, buffersize * 4 * sizeof(GLaccum) );
 	 }
 	 else {
 	    /* Not black */
Index: xc/extras/Mesa/src/all.h
diff -u xc/extras/Mesa/src/all.h:1.3 xc/extras/Mesa/src/all.h:1.4
--- xc/extras/Mesa/src/all.h:1.3	Mon Feb 14 23:12:01 2000
+++ xc/extras/Mesa/src/all.h	Fri Jun 16 17:02:07 2000
@@ -45,6 +45,7 @@
 #endif
 
 #include "glheader.h"
+#include "aatriangle.h"
 #include "accum.h"
 #include "alpha.h"
 #include "alphabuf.h"
Index: xc/extras/Mesa/src/alphabuf.c
diff -u xc/extras/Mesa/src/alphabuf.c:1.3 xc/extras/Mesa/src/alphabuf.c:1.4
--- xc/extras/Mesa/src/alphabuf.c:1.3	Mon Feb 14 23:12:01 2000
+++ xc/extras/Mesa/src/alphabuf.c	Fri Jun 16 17:02:07 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -60,7 +60,7 @@
 {
    GLint bytes = buf->Width * buf->Height * sizeof(GLubyte);
 
-   ASSERT(ctx->Visual->SoftwareAlpha);
+   ASSERT(ctx->DrawBuffer->UseSoftwareAlphaBuffers);
 
    if (buf->FrontLeftAlpha) {
       FREE( buf->FrontLeftAlpha );
@@ -122,7 +122,8 @@
 /*
  * Allocate a new front and back alpha buffer.
  */
-void gl_alloc_alpha_buffers( GLcontext *ctx )
+void
+_mesa_alloc_alpha_buffers( GLcontext *ctx )
 {
    alloc_alpha_buffers( ctx, ctx->DrawBuffer );
    if (ctx->ReadBuffer != ctx->DrawBuffer) {
@@ -134,12 +135,13 @@
 /*
  * Clear all the alpha buffers
  */
-void gl_clear_alpha_buffers( GLcontext *ctx )
+void
+_mesa_clear_alpha_buffers( GLcontext *ctx )
 {
    const GLubyte aclear = (GLint) (ctx->Color.ClearColor[3] * 255.0F);
    GLuint bufferBit;
 
-   ASSERT(ctx->Visual->SoftwareAlpha);
+   ASSERT(ctx->DrawBuffer->UseSoftwareAlphaBuffers);
    ASSERT(ctx->Color.ColorMask[ACOMP]);
 
    /* loop over four possible alpha buffers */
@@ -183,8 +185,9 @@
 
 
 
-void gl_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                          CONST GLubyte rgba[][4], const GLubyte mask[] )
+void
+_mesa_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        CONST GLubyte rgba[][4], const GLubyte mask[] )
 {
    GLubyte *aptr = ALPHA_DRAW_ADDR( x, y );
    GLuint i;
@@ -205,8 +208,9 @@
 }
 
 
-void gl_write_mono_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                               GLubyte alpha, const GLubyte mask[] )
+void
+_mesa_write_mono_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                             GLubyte alpha, const GLubyte mask[] )
 {
    GLubyte *aptr = ALPHA_DRAW_ADDR( x, y );
    GLuint i;
@@ -227,9 +231,10 @@
 }
 
 
-void gl_write_alpha_pixels( GLcontext *ctx,
-                            GLuint n, const GLint x[], const GLint y[],
-                            CONST GLubyte rgba[][4], const GLubyte mask[] )
+void
+_mesa_write_alpha_pixels( GLcontext *ctx,
+                          GLuint n, const GLint x[], const GLint y[],
+                          CONST GLubyte rgba[][4], const GLubyte mask[] )
 {
    GLuint i;
 
@@ -250,9 +255,10 @@
 }
 
 
-void gl_write_mono_alpha_pixels( GLcontext *ctx,
-                                 GLuint n, const GLint x[], const GLint y[],
-                                 GLubyte alpha, const GLubyte mask[] )
+void
+_mesa_write_mono_alpha_pixels( GLcontext *ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+                               GLubyte alpha, const GLubyte mask[] )
 {
    GLuint i;
 
@@ -274,8 +280,9 @@
 
 
 
-void gl_read_alpha_span( GLcontext *ctx,
-                         GLuint n, GLint x, GLint y, GLubyte rgba[][4] )
+void
+_mesa_read_alpha_span( GLcontext *ctx,
+                       GLuint n, GLint x, GLint y, GLubyte rgba[][4] )
 {
    GLubyte *aptr = ALPHA_READ_ADDR( x, y );
    GLuint i;
@@ -285,9 +292,10 @@
 }
 
 
-void gl_read_alpha_pixels( GLcontext *ctx,
-                           GLuint n, const GLint x[], const GLint y[],
-                           GLubyte rgba[][4], const GLubyte mask[] )
+void
+_mesa_read_alpha_pixels( GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLubyte rgba[][4], const GLubyte mask[] )
 {
    GLuint i;
    for (i=0;i<n;i++) {
Index: xc/extras/Mesa/src/alphabuf.h
diff -u xc/extras/Mesa/src/alphabuf.h:1.3 xc/extras/Mesa/src/alphabuf.h:1.4
--- xc/extras/Mesa/src/alphabuf.h:1.3	Mon Feb 14 23:12:02 2000
+++ xc/extras/Mesa/src/alphabuf.h	Fri Jun 16 17:02:07 2000
@@ -31,42 +31,49 @@
 #include "types.h"
 
 
-extern void gl_alloc_alpha_buffers( GLcontext *ctx );
+extern void
+_mesa_alloc_alpha_buffers( GLcontext *ctx );
 
 
-extern void gl_clear_alpha_buffers( GLcontext *ctx );
+extern void
+_mesa_clear_alpha_buffers( GLcontext *ctx );
 
 
-extern void gl_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                                 CONST GLubyte rgba[][4], const GLubyte mask[] );
+extern void
+_mesa_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        CONST GLubyte rgba[][4], const GLubyte mask[] );
 
 
-extern void gl_write_mono_alpha_span( GLcontext *ctx,
-                                      GLuint n, GLint x, GLint y,
-                                      GLubyte alpha, const GLubyte mask[] );
+extern void
+_mesa_write_mono_alpha_span( GLcontext *ctx,
+                             GLuint n, GLint x, GLint y,
+                             GLubyte alpha, const GLubyte mask[] );
 
 
 
-extern void gl_write_alpha_pixels( GLcontext* ctx,
-                                   GLuint n, const GLint x[], const GLint y[],
-                                   CONST GLubyte rgba[][4],
-                                   const GLubyte mask[] );
+extern void
+_mesa_write_alpha_pixels( GLcontext* ctx,
+                          GLuint n, const GLint x[], const GLint y[],
+                          CONST GLubyte rgba[][4],
+                          const GLubyte mask[] );
 
 
-extern void gl_write_mono_alpha_pixels( GLcontext* ctx,
-                                        GLuint n, const GLint x[],
-                                        const GLint y[], GLubyte alpha,
-                                        const GLubyte mask[] );
+extern void
+_mesa_write_mono_alpha_pixels( GLcontext* ctx,
+                               GLuint n, const GLint x[],
+                               const GLint y[], GLubyte alpha,
+                               const GLubyte mask[] );
 
 
-extern void gl_read_alpha_span( GLcontext* ctx,
-                                GLuint n, GLint x, GLint y,
-                                GLubyte rgba[][4] );
+extern void
+_mesa_read_alpha_span( GLcontext* ctx,
+                       GLuint n, GLint x, GLint y, GLubyte rgba[][4] );
 
 
-extern void gl_read_alpha_pixels( GLcontext* ctx,
-                                  GLuint n, const GLint x[], const GLint y[],
-                                  GLubyte rgba[][4], const GLubyte mask[] );
+extern void
+_mesa_read_alpha_pixels( GLcontext* ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLubyte rgba[][4], const GLubyte mask[] );
 
 
 #endif
Index: xc/extras/Mesa/src/attrib.c
diff -u xc/extras/Mesa/src/attrib.c:1.3 xc/extras/Mesa/src/attrib.c:1.4
--- xc/extras/Mesa/src/attrib.c:1.3	Mon Feb 14 23:12:02 2000
+++ xc/extras/Mesa/src/attrib.c	Fri Jun 16 17:02:07 2000
@@ -103,7 +103,7 @@
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPushAttrib");
 
    if (MESA_VERBOSE&VERBOSE_API)
-      fprintf(stderr, "glPushAttrib %x\n", mask);
+      fprintf(stderr, "glPushAttrib %x\n", (int)mask);
 
    if (ctx->AttribStackDepth>=MAX_ATTRIB_STACK_DEPTH) {
       gl_error( ctx, GL_STACK_OVERFLOW, "glPushAttrib" );
@@ -166,6 +166,9 @@
          attr->ClipPlane[i] = ctx->Transform.ClipEnabled[i];
       }
       attr->ColorMaterial = ctx->Light.ColorMaterialEnabled;
+      attr->Convolution1D = ctx->Pixel.Convolution1DEnabled;
+      attr->Convolution2D = ctx->Pixel.Convolution2DEnabled;
+      attr->Separable2D = ctx->Pixel.Separable2DEnabled;
       attr->CullFace = ctx->Polygon.CullFlag;
       attr->DepthTest = ctx->Depth.Test;
       attr->Dither = ctx->Color.DitherFlag;
@@ -176,6 +179,8 @@
       attr->Lighting = ctx->Light.Enabled;
       attr->LineSmooth = ctx->Line.SmoothFlag;
       attr->LineStipple = ctx->Line.StippleFlag;
+      attr->Histogram = ctx->Pixel.HistogramEnabled;
+      attr->MinMax = ctx->Pixel.MinMaxEnabled;
       attr->IndexLogicOp = ctx->Color.IndexLogicOpEnabled;
       attr->ColorLogicOp = ctx->Color.ColorLogicOpEnabled;
       attr->Map1Color4 = ctx->Eval.Map1Color4;
@@ -197,6 +202,7 @@
       attr->Map2Vertex3 = ctx->Eval.Map2Vertex3;
       attr->Map2Vertex4 = ctx->Eval.Map2Vertex4;
       attr->Normalize = ctx->Transform.Normalize;
+      attr->PixelTexture = ctx->Pixel.PixelTextureEnabled;
       attr->PointSmooth = ctx->Point.SmoothFlag;
       attr->PolygonOffsetPoint = ctx->Polygon.OffsetPoint;
       attr->PolygonOffsetLine = ctx->Polygon.OffsetLine;
@@ -422,21 +428,43 @@
                GLubyte oldAlphaRef = ctx->Color.AlphaRef;
                GLenum oldBlendSrc = ctx->Color.BlendSrcRGB;
                GLenum oldBlendDst = ctx->Color.BlendDstRGB;
+	       GLenum oldLogicOp = ctx->Color.LogicOp;
                MEMCPY( &ctx->Color, attr->data,
                        sizeof(struct gl_colorbuffer_attrib) );
                if (ctx->Color.DrawBuffer != oldDrawBuffer) {
                   _mesa_DrawBuffer( ctx->Color.DrawBuffer);
                }
-               if ((ctx->Color.AlphaFunc != oldAlphaFunc ||
-                    ctx->Color.AlphaRef != oldAlphaRef) &&
-                   ctx->Driver.AlphaFunc)
-                  (*ctx->Driver.AlphaFunc)( ctx, ctx->Color.AlphaFunc,
-                                            ctx->Color.AlphaRef / 255.0F);
                if ((ctx->Color.BlendSrcRGB != oldBlendSrc ||
-                    ctx->Color.BlendSrcRGB != oldBlendDst) &&
+                    ctx->Color.BlendDstRGB != oldBlendDst) &&
                    ctx->Driver.BlendFunc)
                   (*ctx->Driver.BlendFunc)( ctx, ctx->Color.BlendSrcRGB,
                                             ctx->Color.BlendDstRGB);
+	       if (ctx->Color.LogicOp != oldLogicOp &&
+		   ctx->Driver.LogicOpcode) {
+		  ctx->Driver.LogicOpcode( ctx, ctx->Color.LogicOp );
+               }
+               if (ctx->Visual->RGBAflag) {
+                  GLubyte r = (GLint) (ctx->Color.ClearColor[0] * 255.0F);
+                  GLubyte g = (GLint) (ctx->Color.ClearColor[1] * 255.0F);
+                  GLubyte b = (GLint) (ctx->Color.ClearColor[2] * 255.0F);
+                  GLubyte a = (GLint) (ctx->Color.ClearColor[3] * 255.0F);
+                  (*ctx->Driver.ClearColor)( ctx, r, g, b, a );
+                  if ((ctx->Color.AlphaFunc != oldAlphaFunc ||
+                       ctx->Color.AlphaRef != oldAlphaRef) &&
+                      ctx->Driver.AlphaFunc)
+                     (*ctx->Driver.AlphaFunc)( ctx, ctx->Color.AlphaFunc,
+                                               ctx->Color.AlphaRef / 255.0F);
+                  if (ctx->Driver.ColorMask) {
+                     (*ctx->Driver.ColorMask)(ctx,
+                                              ctx->Color.ColorMask[0],
+                                              ctx->Color.ColorMask[1],
+                                              ctx->Color.ColorMask[2],
+                                              ctx->Color.ColorMask[3]);
+                  }
+               }
+               else {
+                  (*ctx->Driver.ClearIndex)( ctx, ctx->Color.ClearIndex);
+               }
             }
             break;
          case GL_CURRENT_BIT:
@@ -482,6 +510,9 @@
                TEST_AND_UPDATE(ctx->Polygon.CullFlag, enable->CullFace, GL_CULL_FACE);
                TEST_AND_UPDATE(ctx->Depth.Test, enable->DepthTest, GL_DEPTH_TEST);
                TEST_AND_UPDATE(ctx->Color.DitherFlag, enable->Dither, GL_DITHER);
+               TEST_AND_UPDATE(ctx->Pixel.Convolution1DEnabled, enable->Convolution1D, GL_CONVOLUTION_1D);
+               TEST_AND_UPDATE(ctx->Pixel.Convolution2DEnabled, enable->Convolution2D, GL_CONVOLUTION_2D);
+               TEST_AND_UPDATE(ctx->Pixel.Separable2DEnabled, enable->Separable2D, GL_SEPARABLE_2D);
                TEST_AND_UPDATE(ctx->Fog.Enabled, enable->Fog, GL_FOG);
                TEST_AND_UPDATE(ctx->Light.Enabled, enable->Lighting, GL_LIGHTING);
                TEST_AND_UPDATE(ctx->Line.SmoothFlag, enable->LineSmooth, GL_LINE_SMOOTH);
@@ -508,6 +539,7 @@
                TEST_AND_UPDATE(ctx->Eval.Map2Vertex4, enable->Map2Vertex4, GL_MAP2_VERTEX_4);
                TEST_AND_UPDATE(ctx->Transform.Normalize, enable->Normalize, GL_NORMALIZE);
                TEST_AND_UPDATE(ctx->Transform.RescaleNormals, enable->RescaleNormals, GL_RESCALE_NORMAL_EXT);
+               TEST_AND_UPDATE(ctx->Pixel.PixelTextureEnabled, enable->PixelTexture, GL_POINT_SMOOTH);
                TEST_AND_UPDATE(ctx->Point.SmoothFlag, enable->PointSmooth, GL_POINT_SMOOTH);
                TEST_AND_UPDATE(ctx->Polygon.OffsetPoint, enable->PolygonOffsetPoint, GL_POLYGON_OFFSET_POINT);
                TEST_AND_UPDATE(ctx->Polygon.OffsetLine, enable->PolygonOffsetLine, GL_POLYGON_OFFSET_LINE);
@@ -634,6 +666,11 @@
                (*ctx->Driver.Enable)( ctx, GL_LINE_SMOOTH, ctx->Line.SmoothFlag );
                (*ctx->Driver.Enable)( ctx, GL_LINE_STIPPLE, ctx->Line.StippleFlag );
             }
+            if (ctx->Driver.LineStipple)
+               (*ctx->Driver.LineStipple)(ctx, ctx->Line.StippleFactor,
+                                          ctx->Line.StipplePattern);
+            if (ctx->Driver.LineWidth)
+               (*ctx->Driver.LineWidth)(ctx, ctx->Line.Width);
             break;
          case GL_LIST_BIT:
             MEMCPY( &ctx->List, attr->data, sizeof(struct gl_list_attrib) );
@@ -670,6 +707,8 @@
             break;
 	 case GL_POLYGON_STIPPLE_BIT:
 	    MEMCPY( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );
+	    if (ctx->Driver.PolygonStipple) 
+	       ctx->Driver.PolygonStipple( ctx, (const GLubyte *) attr->data );
 	    break;
          case GL_SCISSOR_BIT:
             MEMCPY( &ctx->Scissor, attr->data,
Index: xc/extras/Mesa/src/bitmap.c
diff -u xc/extras/Mesa/src/bitmap.c:1.4 xc/extras/Mesa/src/bitmap.c:1.5
--- xc/extras/Mesa/src/bitmap.c:1.4	Thu Mar  2 08:06:59 2000
+++ xc/extras/Mesa/src/bitmap.c	Fri Jun 16 17:02:07 2000
@@ -53,7 +53,7 @@
 {
    struct pixel_buffer *PB = ctx->PB;
    GLint row, col;
-   GLint pz;
+   GLdepth fragZ;
 
    ASSERT(ctx->RenderMode == GL_RENDER);
 
@@ -68,16 +68,16 @@
       g = (GLint) (ctx->Current.RasterColor[1] * 255.0F);
       b = (GLint) (ctx->Current.RasterColor[2] * 255.0F);
       a = (GLint) (ctx->Current.RasterColor[3] * 255.0F);
-      PB_SET_COLOR( ctx, PB, r, g, b, a );
+      PB_SET_COLOR( PB, r, g, b, a );
    }
    else {
-      PB_SET_INDEX( ctx, PB, ctx->Current.RasterIndex );
+      PB_SET_INDEX( PB, ctx->Current.RasterIndex );
    }
 
-   pz = (GLint) ( ctx->Current.RasterPos[2] * DEPTH_SCALE );
+   fragZ = (GLdepth) ( ctx->Current.RasterPos[2] * ctx->Visual->DepthMaxF);
 
    for (row=0; row<height; row++) {
-      const GLubyte *src = (const GLubyte *) gl_pixel_addr_in_image( unpack,
+      const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
                  bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
 
       if (unpack->LsbFirst) {
@@ -85,7 +85,7 @@
          GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
          for (col=0; col<width; col++) {
             if (*src & mask) {
-               PB_WRITE_PIXEL( PB, px+col, py+row, pz );
+               PB_WRITE_PIXEL( PB, px+col, py+row, fragZ );
             }
             if (mask == 128U) {
                src++;
@@ -107,7 +107,7 @@
          GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
          for (col=0; col<width; col++) {
             if (*src & mask) {
-               PB_WRITE_PIXEL( PB, px+col, py+row, pz );
+               PB_WRITE_PIXEL( PB, px+col, py+row, fragZ );
             }
             if (mask == 1U) {
                src++;
@@ -166,6 +166,8 @@
          if (ctx->PB->primitive!=GL_BITMAP) {   /* A.W. 1.1.2000 */
             gl_reduced_prim_change( ctx, GL_BITMAP );
          }
+
+         ctx->OcclusionResult = GL_TRUE;
 
          if (ctx->Driver.Bitmap) {
             /* let device driver try to render the bitmap */
Index: xc/extras/Mesa/src/blend.c
diff -u xc/extras/Mesa/src/blend.c:1.4 xc/extras/Mesa/src/blend.c:1.5
--- xc/extras/Mesa/src/blend.c:1.4	Thu Mar  2 08:07:00 2000
+++ xc/extras/Mesa/src/blend.c	Fri Jun 16 17:02:07 2000
@@ -52,6 +52,13 @@
 	      gl_lookup_enum_by_nr(dfactor));
 
    switch (sfactor) {
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+         if (!ctx->Extensions.HaveBlendSquare) {
+            gl_error( ctx, GL_INVALID_ENUM, "glBlendFunc(sfactor)" );
+            return;
+         }
+         /* fall-through */
       case GL_ZERO:
       case GL_ONE:
       case GL_DST_COLOR:
@@ -73,6 +80,13 @@
    }
 
    switch (dfactor) {
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+         if (!ctx->Extensions.HaveBlendSquare) {
+            gl_error( ctx, GL_INVALID_ENUM, "glBlendFunc(dfactor)" );
+            return;
+         }
+         /* fall-through */
       case GL_ZERO:
       case GL_ONE:
       case GL_SRC_COLOR:
@@ -117,6 +131,13 @@
 	      gl_lookup_enum_by_nr(dfactorA));
 
    switch (sfactorRGB) {
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+         if (!ctx->Extensions.HaveBlendSquare) {
+            gl_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorRGB)");
+            return;
+         }
+         /* fall-through */
       case GL_ZERO:
       case GL_ONE:
       case GL_DST_COLOR:
@@ -133,11 +154,18 @@
          ctx->Color.BlendSrcRGB = sfactorRGB;
          break;
       default:
-         gl_error( ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorRGB)" );
+         gl_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorRGB)");
          return;
    }
 
    switch (dfactorRGB) {
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+         if (!ctx->Extensions.HaveBlendSquare) {
+            gl_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(dfactorRGB)");
+            return;
+         }
+         /* fall-through */
       case GL_ZERO:
       case GL_ONE:
       case GL_SRC_COLOR:
@@ -153,11 +181,18 @@
          ctx->Color.BlendDstRGB = dfactorRGB;
          break;
       default:
-         gl_error( ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(dfactorRGB)" );
+         gl_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(dfactorRGB)");
          return;
    }
 
    switch (sfactorA) {
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+         if (!ctx->Extensions.HaveBlendSquare) {
+            gl_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorA)");
+            return;
+         }
+         /* fall-through */
       case GL_ZERO:
       case GL_ONE:
       case GL_DST_COLOR:
@@ -174,11 +209,18 @@
          ctx->Color.BlendSrcA = sfactorA;
          break;
       default:
-         gl_error( ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorA)" );
+         gl_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorA)");
          return;
    }
 
    switch (dfactorA) {
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+         if (!ctx->Extensions.HaveBlendSquare) {
+            gl_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(dfactorA)");
+            return;
+         }
+         /* fall-through */
       case GL_ZERO:
       case GL_ONE:
       case GL_SRC_COLOR:
@@ -220,7 +262,6 @@
       fprintf(stderr, "glBlendEquation %s\n",
 	      gl_lookup_enum_by_nr(mode));
 
-
    switch (mode) {
       case GL_MIN_EXT:
       case GL_MAX_EXT:
@@ -509,6 +550,16 @@
             case GL_ONE_MINUS_CONSTANT_ALPHA:
                sR = sG = sB = 1.0F - ctx->Color.BlendColor[3];
                break;
+            case GL_SRC_COLOR: /* GL_NV_blend_square */
+               sR = (GLfloat) Rs * rscale;
+               sG = (GLfloat) Gs * gscale;
+               sB = (GLfloat) Bs * bscale;
+               break;
+            case GL_ONE_MINUS_SRC_COLOR: /* GL_NV_blend_square */
+               sR = 1.0F - (GLfloat) Rs * rscale;
+               sG = 1.0F - (GLfloat) Gs * gscale;
+               sB = 1.0F - (GLfloat) Bs * bscale;
+               break;
             default:
                /* this should never happen */
                gl_problem(ctx, "Bad blend source RGB factor in do_blend");
@@ -556,6 +607,12 @@
             case GL_ONE_MINUS_CONSTANT_ALPHA:
                sA = 1.0F - ctx->Color.BlendColor[3];
                break;
+            case GL_SRC_COLOR: /* GL_NV_blend_square */
+               sA = (GLfloat) As * ascale;
+               break;
+            case GL_ONE_MINUS_SRC_COLOR: /* GL_NV_blend_square */
+               sA = 1.0F - (GLfloat) As * ascale;
+               break;
             default:
                /* this should never happen */
                sA = 0.0F;
@@ -608,6 +665,16 @@
             case GL_ONE_MINUS_CONSTANT_ALPHA:
                dR = dG = dB = 1.0F - ctx->Color.BlendColor[3] * ascale;
                break;
+            case GL_DST_COLOR: /* GL_NV_blend_square */
+               dR = (GLfloat) Rd * rscale;
+               dG = (GLfloat) Gd * gscale;
+               dB = (GLfloat) Bd * bscale;
+               break;
+            case GL_ONE_MINUS_DST_COLOR: /* GL_NV_blend_square */
+               dR = 1.0F - (GLfloat) Rd * rscale;
+               dG = 1.0F - (GLfloat) Gd * gscale;
+               dB = 1.0F - (GLfloat) Bd * bscale;
+               break;
             default:
                /* this should never happen */
                dR = dG = dB = 0.0F;
@@ -652,6 +719,12 @@
             case GL_ONE_MINUS_CONSTANT_ALPHA:
                dA = 1.0F - ctx->Color.BlendColor[3] * ascale;
                break;
+            case GL_DST_COLOR: /* GL_NV_blend_square */
+               dA = (GLfloat) Ad * ascale;
+               break;
+            case GL_ONE_MINUS_DST_COLOR: /* GL_NV_blend_square */
+               dA = 1.0F - (GLfloat) Ad * ascale;
+               break;
             default:
                /* this should never happen */
                dA = 0.0F;
@@ -825,7 +898,7 @@
    /* Read pixels from current color buffer */
    (*ctx->Driver.ReadRGBAPixels)( ctx, n, x, y, dest, mask );
    if (ctx->RasterMask & ALPHABUF_BIT) {
-      gl_read_alpha_pixels( ctx, n, x, y, dest, mask );
+      _mesa_read_alpha_pixels( ctx, n, x, y, dest, mask );
    }
 
    if (!ctx->Color.BlendFunc)
Index: xc/extras/Mesa/src/buffers.c
diff -u xc/extras/Mesa/src/buffers.c:1.1 xc/extras/Mesa/src/buffers.c:1.2
--- xc/extras/Mesa/src/buffers.c:1.1	Tue Feb 15 06:50:51 2000
+++ xc/extras/Mesa/src/buffers.c	Fri Jun 16 17:02:07 2000
@@ -109,7 +109,7 @@
             rgba[j][BCOMP] = b;
             rgba[j][ACOMP] = a;
          }
-         gl_mask_rgba_span( ctx, width, x, y + i, rgba );
+         _mesa_mask_rgba_span( ctx, width, x, y + i, rgba );
          (*ctx->Driver.WriteRGBASpan)( ctx, width, x, y + i,
 				       (CONST GLubyte (*)[4])rgba, NULL );
       }
@@ -124,7 +124,7 @@
          for (j=0;j<width;j++) {
             span[j] = ctx->Color.ClearIndex;
          }
-         gl_mask_index_span( ctx, width, x, y + i, span );
+         _mesa_mask_index_span( ctx, width, x, y + i, span );
          (*ctx->Driver.WriteCI32Span)( ctx, width, x, y + i, span, mask );
       }
    }
@@ -290,16 +290,17 @@
 
       /* do software clearing here */
       if (newMask) {
-         if (newMask & ctx->Color.DrawDestMask)   clear_color_buffers( ctx );
-         if (newMask & GL_DEPTH_BUFFER_BIT)    _mesa_clear_depth_buffer( ctx );
-         if (newMask & GL_ACCUM_BUFFER_BIT)    _mesa_clear_accum_buffer( ctx );
-         if (newMask & GL_STENCIL_BUFFER_BIT)  gl_clear_stencil_buffer( ctx );
+         if (newMask & ctx->Color.DrawDestMask)   clear_color_buffers(ctx);
+         if (newMask & GL_DEPTH_BUFFER_BIT)    _mesa_clear_depth_buffer(ctx);
+         if (newMask & GL_ACCUM_BUFFER_BIT)    _mesa_clear_accum_buffer(ctx);
+         if (newMask & GL_STENCIL_BUFFER_BIT)  _mesa_clear_stencil_buffer(ctx);
       }
 
       /* clear software-based alpha buffer(s) */
-      if ( (mask & GL_COLOR_BUFFER_BIT) && ctx->Visual->SoftwareAlpha
+      if ( (mask & GL_COLOR_BUFFER_BIT)
+           && ctx->DrawBuffer->UseSoftwareAlphaBuffers
            && ctx->Color.ColorMask[RCOMP]) {
-         gl_clear_alpha_buffers( ctx );
+         _mesa_clear_alpha_buffers( ctx );
       }
 
 #ifdef PROFILE
@@ -427,7 +428,7 @@
    /*
     * Set current alpha buffer pointer
     */
-   if (ctx->Visual->SoftwareAlpha) {
+   if (ctx->DrawBuffer->UseSoftwareAlphaBuffers) {
       if (ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT)
          ctx->DrawBuffer->Alpha = ctx->DrawBuffer->FrontLeftAlpha;
       else if (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT)
@@ -552,12 +553,12 @@
       _mesa_alloc_depth_buffer( ctx );
    }
    if (ctx->DrawBuffer->UseSoftwareStencilBuffer) {
-      gl_alloc_stencil_buffer( ctx );
+      _mesa_alloc_stencil_buffer( ctx );
    }
    if (ctx->DrawBuffer->UseSoftwareAccumBuffer) {
       _mesa_alloc_accum_buffer( ctx );
    }
-   if (ctx->Visual->SoftwareAlpha) {
-      gl_alloc_alpha_buffers( ctx );
+   if (ctx->DrawBuffer->UseSoftwareAlphaBuffers) {
+      _mesa_alloc_alpha_buffers( ctx );
    }
 }
Index: xc/extras/Mesa/src/clip.c
diff -u xc/extras/Mesa/src/clip.c:1.3 xc/extras/Mesa/src/clip.c:1.4
--- xc/extras/Mesa/src/clip.c:1.3	Mon Feb 14 23:12:04 2000
+++ xc/extras/Mesa/src/clip.c	Fri Jun 16 17:02:07 2000
@@ -41,6 +41,15 @@
 
 
 
+#define CLIP_RGBA0    0x1
+#define CLIP_RGBA1    0x2
+#define CLIP_TEX0     0x4
+#define CLIP_TEX1     0x8
+#define CLIP_INDEX0   0x10
+#define CLIP_INDEX1   0x20
+#define CLIP_FOG_COORD 0x40
+
+
 /* Linear interpolation between A and B: */
 #define LINTERP( T, A, B )   ( (A) + (T) * ( (B) - (A) ) )
 
@@ -56,17 +65,8 @@
    }								\
 } while(0)
    
-
-
-
-#define CLIP_RGBA0    0x1
-#define CLIP_RGBA1    0x2
-#define CLIP_TEX0     0x4
-#define CLIP_TEX1     0x8
-#define CLIP_INDEX0   0x10
-#define CLIP_INDEX1   0x20
 
-static clip_interp_func clip_interp_tab[0x40]; 
+static clip_interp_func clip_interp_tab[0x80]; 
 
 #define IND 0
 #define NAME clip_nil
@@ -112,9 +112,53 @@
 #define NAME clipINDEX0_INDEX1
 #include "interp_tmp.h"
 
+#define IND (CLIP_FOG_COORD)
+#define NAME clip_FOG
+#include "interp_tmp.h"
 
+#define IND (CLIP_RGBA0|CLIP_FOG_COORD)
+#define NAME clipRGBA0_FOG
+#include "interp_tmp.h"
 
+#define IND (CLIP_RGBA0|CLIP_RGBA1|CLIP_FOG_COORD)
+#define NAME clipRGBA0_RGBA1_FOG
+#include "interp_tmp.h"
+
+#define IND (CLIP_TEX0|CLIP_RGBA0|CLIP_FOG_COORD)
+#define NAME clipTEX0_RGBA0_FOG
+#include "interp_tmp.h"
 
+#define IND (CLIP_TEX0|CLIP_RGBA0|CLIP_RGBA1|CLIP_FOG_COORD)
+#define NAME clipTEX0_RGBA0_RGBA1_FOG
+#include "interp_tmp.h"
+
+#define IND (CLIP_TEX1|CLIP_TEX0|CLIP_RGBA0|CLIP_FOG_COORD)
+#define NAME clipTEX1_TEX0_RGBA0_FOG
+#include "interp_tmp.h"
+
+#define IND (CLIP_TEX0|CLIP_FOG_COORD)
+#define NAME clipTEX0_FOG
+#include "interp_tmp.h"
+
+#define IND (CLIP_TEX1|CLIP_TEX0|CLIP_FOG_COORD)
+#define NAME clipTEX1_TEX0_FOG
+#include "interp_tmp.h"
+
+#define IND (CLIP_TEX1|CLIP_TEX0|CLIP_RGBA0|CLIP_RGBA1|CLIP_FOG_COORD)
+#define NAME clipTEX1_TEX0_RGBA0_RGBA1_FOG
+#include "interp_tmp.h"
+
+#define IND (CLIP_INDEX0|CLIP_FOG_COORD)
+#define NAME clipINDEX0_FOG
+#include "interp_tmp.h"
+
+#define IND (CLIP_INDEX0|CLIP_INDEX1|CLIP_FOG_COORD)
+#define NAME clipINDEX0_INDEX1_FOG
+#include "interp_tmp.h"
+
+
+
+
 /**********************************************************************/
 /*                     Get/Set User clip-planes.                      */
 /**********************************************************************/
@@ -257,10 +301,12 @@
 
 
 
-#if defined(__i386__)
+#if 0
 #define NEGATIVE(x) ((*(int *)&x)<0)
+#define DIFFERENT_SIGNS(a,b) ((a*b) < 0)
 #else
 #define NEGATIVE(x) (x < 0)
+#define DIFFERENT_SIGNS(a,b) ((a*b) < 0)
 #endif
 
 
@@ -330,13 +376,10 @@
 
    if (ctx->Visual->RGBAflag) 
    {
-      if (ctx->Light.ShadeModel==GL_SMOOTH) 
-      {
-	 mask |= CLIP_RGBA0;
+      mask |= CLIP_RGBA0;
       
-	 if (ctx->TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_SEPERATE_SPECULAR))
-	    mask |= CLIP_RGBA1;
-      }
+      if (ctx->TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_SEPERATE_SPECULAR))
+         mask |= CLIP_RGBA1;
 
       if (ctx->Texture.ReallyEnabled & 0xf0)
 	 mask |= CLIP_TEX1|CLIP_TEX0;
@@ -352,6 +395,8 @@
 	 mask |= CLIP_INDEX1;
    }
 
+   if (ctx->FogMode == FOG_FRAGMENT && (ctx->TriangleCaps & DD_CLIP_FOG_COORD))
+      mask |= CLIP_FOG_COORD;
    
    ctx->ClipInterpFunc = clip_interp_tab[mask];
    ctx->poly_clip_tab = gl_poly_clip_tab[0];
@@ -447,11 +492,22 @@
    clip_interp_tab[CLIP_TEX1|CLIP_TEX0|CLIP_RGBA0] = clipTEX1_TEX0_RGBA0;
    clip_interp_tab[CLIP_TEX1|CLIP_TEX0|CLIP_RGBA0|CLIP_RGBA1] = 
       clipTEX1_TEX0_RGBA0_RGBA1;
-
    clip_interp_tab[CLIP_TEX0] = clipTEX0;
    clip_interp_tab[CLIP_TEX1|CLIP_TEX0] = clipTEX1_TEX0;
-
    clip_interp_tab[CLIP_INDEX0] = clipINDEX0;
    clip_interp_tab[CLIP_INDEX0|CLIP_INDEX1] = clipINDEX0_INDEX1;
+
+   clip_interp_tab[CLIP_FOG_COORD] = clip_FOG;
+   clip_interp_tab[CLIP_RGBA0|CLIP_FOG_COORD] = clipRGBA0_FOG;
+   clip_interp_tab[CLIP_RGBA0|CLIP_RGBA1|CLIP_FOG_COORD] = clipRGBA0_RGBA1_FOG;
+   clip_interp_tab[CLIP_TEX0|CLIP_RGBA0|CLIP_FOG_COORD] = clipTEX0_RGBA0_FOG;
+   clip_interp_tab[CLIP_TEX0|CLIP_RGBA0|CLIP_RGBA1|CLIP_FOG_COORD] = clipTEX0_RGBA0_RGBA1_FOG;
+   clip_interp_tab[CLIP_TEX1|CLIP_TEX0|CLIP_RGBA0|CLIP_FOG_COORD] = clipTEX1_TEX0_RGBA0_FOG;
+   clip_interp_tab[CLIP_TEX1|CLIP_TEX0|CLIP_RGBA0|CLIP_RGBA1|CLIP_FOG_COORD] = 
+      clipTEX1_TEX0_RGBA0_RGBA1_FOG;
+   clip_interp_tab[CLIP_TEX0|CLIP_FOG_COORD] = clipTEX0_FOG;
+   clip_interp_tab[CLIP_TEX1|CLIP_TEX0|CLIP_FOG_COORD] = clipTEX1_TEX0_FOG;
+   clip_interp_tab[CLIP_INDEX0|CLIP_FOG_COORD] = clipINDEX0_FOG;
+   clip_interp_tab[CLIP_INDEX0|CLIP_INDEX1|CLIP_FOG_COORD] = clipINDEX0_INDEX1_FOG;
 }
 
Index: xc/extras/Mesa/src/clip_funcs.h
diff -u xc/extras/Mesa/src/clip_funcs.h:1.3 xc/extras/Mesa/src/clip_funcs.h:1.4
--- xc/extras/Mesa/src/clip_funcs.h:1.3	Mon Feb 14 23:12:04 2000
+++ xc/extras/Mesa/src/clip_funcs.h	Fri Jun 16 17:02:07 2000
@@ -41,7 +41,6 @@
 				  GLubyte mask )
 {
    GLfloat (*coord)[4] = VB->ClipPtr->data;
-   GLfloat t, dx, dy, dz, dw, neww;
    GLuint ii = *i, jj = *j;
    GLuint vlist[2];
    GLuint n;
@@ -50,31 +49,29 @@
 
 /*
  * We use 6 instances of this code to clip agains the 6 planes.
- * For each plane, we define the OUTSIDE and COMPUTE_INTERSECTION
- * macros apprpriately.
  */
-#define GENERAL_CLIP					\
-   if (mask & PLANE) {					\
-      GLuint flagI = INSIDE( ii );			\
-      GLuint flagJ = INSIDE( jj );			\
-							\
-      if (!(flagI|flagJ))				\
-	 return 0;					\
-							\
-      if (flagI ^ flagJ) {				\
-	 COMPUTE_INTERSECTION( jj, ii, vb_free );	\
-	 interp( VB, vb_free, t, jj, ii);		\
-							\
-	 if (flagI) {					\
-            VB->ClipMask[jj] |= PLANE;			\
-	    jj = vb_free;				\
-	 } else {					\
-            VB->ClipMask[ii] |= PLANE;			\
-	    ii = vb_free;				\
-	 }						\
-							\
-         VB->ClipMask[vb_free++] = 0;			\
-      }							\
+#define GENERAL_CLIP							\
+   if (mask & PLANE) {							\
+      GLfloat dpI = CLIP_DOTPROD( ii );					\
+      GLfloat dpJ = CLIP_DOTPROD( jj );					\
+									\
+      if (DIFFERENT_SIGNS(dpI, dpJ)) {					\
+	 GLfloat t = dpI / (dpI - dpJ);					\
+	 INTERP_SZ( t, VB->ClipPtr->data, vb_free, ii, jj, SIZE );	\
+	 interp( VB, vb_free, t, ii, jj);				\
+									\
+	 if (NEGATIVE(dpJ)) {						\
+            VB->ClipMask[jj] |= PLANE;					\
+	    jj = vb_free;						\
+            VB->ClipMask[vb_free++] = 0;				\
+	 } else {							\
+            VB->ClipMask[ii] |= PLANE;					\
+	    ii = vb_free;						\
+            VB->ClipMask[vb_free++] = 0;				\
+	 }								\
+      }									\
+      else if (NEGATIVE(dpI))						\
+	 return 0;							\
    }
 
 #include "general_clip.h"
@@ -142,65 +139,78 @@
    GLfloat (*coord)[4] = VB->ClipPtr->data;
    GLuint vlist2[VB_SIZE-VB_MAX];
    GLuint *inlist = vlist, *outlist = vlist2;
-   GLdouble dx, dy, dz, dw, t = 0, neww;
    GLuint i;
    GLuint vb_free = VB->FirstFree;
+   GLubyte *clipmask = VB->ClipMask;
    clip_interp_func interp = VB->ctx->ClipInterpFunc;
 
    if (mask & CLIP_ALL_BITS) {
 
 #define GENERAL_CLIP							\
    if (mask & PLANE) {							\
-      GLuint prevj = inlist[n-1];					\
-      GLuint prevflag = INSIDE(prevj);					\
+      GLuint idxPrev = inlist[0];					\
+      GLfloat dpPrev = CLIP_DOTPROD(idxPrev);				\
       GLuint outcount = 0;						\
-      GLuint ef_state = 3;						\
       GLuint i;								\
 									\
+      inlist[n] = inlist[0];						\
+									\
+      for (i = 1; i < n+1; i++) {					\
+	 GLuint idx = inlist[i];					\
+	 GLfloat dp = CLIP_DOTPROD(idx);				\
+									\
+	 clipmask[idxPrev] |= (PLANE&CLIP_ALL_BITS);			\
 									\
-      for (i = 0; i < n; i++) {						\
-	 GLuint j = inlist[i];						\
-	 GLuint flag = INSIDE(j);					\
-									\
-	 if (flag ^ prevflag) {						\
-	    if (flag) {							\
-	       /* Coming back in					\
+	 if (!NEGATIVE(dpPrev)) {					\
+	    outlist[outcount++] = idxPrev;				\
+ 	    clipmask[idxPrev] &= ~(PLANE&CLIP_ALL_BITS);		\
+	 }								\
+									\
+	 if (DIFFERENT_SIGNS(dp, dpPrev)) {				\
+	    if (NEGATIVE(dp)) { 					\
+	       /* Coming back in.  Avoid division by zero as we know    \
+		* dp != dpPrev from DIFFERENT_SIGNS, above.		\
 		*/							\
-	       COMPUTE_INTERSECTION( j, prevj, vb_free );		\
-	       interp( VB, vb_free, t, j, prevj );			\
+	       GLfloat t = dp / (dp - dpPrev);				\
+               INTERP_SZ( t, VB->ClipPtr->data, vb_free,		\
+			  idx, idxPrev, SIZE );				\
+	       interp( VB, vb_free, t, idx, idxPrev );			\
 									\
 	       if (IND&CLIP_TAB_EDGEFLAG)				\
 		  VB->EdgeFlagPtr->data[vb_free] =			\
-		     VB->EdgeFlagPtr->data[prevj] & ef_state;		\
-									\
-									\
+		     VB->EdgeFlagPtr->data[idxPrev];			\
 	    } else {							\
 	       /* Going out of bounds					\
 		*/							\
-	       COMPUTE_INTERSECTION( prevj, j, vb_free );		\
-	       interp( VB, vb_free, t, prevj, j );			\
+	       GLfloat t = dpPrev / (dpPrev - dp);			\
+               INTERP_SZ( t, VB->ClipPtr->data, vb_free, 		\
+			  idxPrev, idx, SIZE );				\
+	       interp( VB, vb_free, t, idxPrev, idx );			\
 									\
 	       if (IND&CLIP_TAB_EDGEFLAG)				\
-		  VB->EdgeFlagPtr->data[vb_free] = 1;			\
+		  VB->EdgeFlagPtr->data[vb_free] = 3;			\
 	    }								\
 									\
+	    if (IND&CLIP_TAB_EDGEFLAG) {				\
+	       /* Demote trailing edge to internal edge.		\
+		*/							\
+	       if (outcount &&						\
+		   (VB->EdgeFlagPtr->data[outlist[outcount-1]] & 0x2))	\
+		  VB->EdgeFlagPtr->data[outlist[outcount-1]] = 1;	\
+	    }								\
+									\
 	    outlist[outcount++] = vb_free;				\
-            VB->ClipMask[vb_free++] = 0;				\
+	    clipmask[vb_free++] = 0;					\
 	 }								\
 									\
-	 if (flag) {							\
-	    outlist[outcount++] = j;					\
-	 } else {							\
-            VB->ClipMask[j] |= (PLANE&CLIP_ALL_BITS); /* don't setup */	\
-         }								\
-	 prevj = j;							\
-	 prevflag = flag;						\
-	 ef_state = 1;							\
+	 idxPrev = idx;							\
+	 dpPrev = dp;							\
       }									\
 									\
       if (outcount < 3)							\
 	 return 0;							\
-      else {								\
+									\
+      {									\
 	 GLuint *tmp = inlist;						\
 	 inlist = outlist;						\
 	 outlist = tmp;							\
@@ -340,49 +350,60 @@
 	 register float d = ctx->Transform.ClipUserPlane[p][3];
 
 	 /* initialize prev to be last in the input list */
-	 GLuint prevj = inlist[n - 1];
+	 GLuint prevj = inlist[0];
 	 GLfloat dpJ = d*W(prevj) + c*Z(prevj) + b*Y(prevj) + a*X(prevj);
 	 GLuint flagJ = INSIDE(dpJ);
 	 GLuint outcount = 0;
 	 GLuint curri;
+
+	 inlist[n] = inlist[0];
+
 
-         for (curri=0;curri<n;curri++) {
+         for (curri=1;curri<n+1;curri++) {
 	    GLuint currj = inlist[curri];
 	    GLfloat dpI = d*W(currj) + c*Z(currj) + b*Y(currj) + a*X(currj);
             GLuint flagI = INSIDE(dpI);
 
+	    if (flagJ) {
+	       outlist[outcount++] = prevj;
+	    } else {
+	       VB->ClipMask[prevj] |= CLIP_USER_BIT;
+	    }
+
 	    if (flagI ^ flagJ) {
 	       GLfloat t;
 	       GLuint in;
 	       GLuint out;
-
+		  
 	       if (flagI) {
 		  out = prevj;
-                  in = currj;
-                  t = dpI/(dpI-dpJ);
+		  in = currj;
+		  t = dpI/(dpI-dpJ);
 
-		  if (IND&CLIP_TAB_EDGEFLAG)
-		     VB->EdgeFlagPtr->data[vb_free] =
-			VB->EdgeFlagPtr->data[prevj];
+		  if (IND&CLIP_TAB_EDGEFLAG) 
+		     VB->EdgeFlagPtr->data[vb_free] = 
+  			VB->EdgeFlagPtr->data[prevj];		  
 	       } else {
 		  in = prevj;
-                  out = currj;
-                  t = dpJ/(dpJ-dpI);
+		  out = currj;
+		  t = dpJ/(dpJ-dpI);
 
-		  if (IND&CLIP_TAB_EDGEFLAG)
-		     VB->EdgeFlagPtr->data[vb_free] = 1;
+		  if (IND&CLIP_TAB_EDGEFLAG) 
+		     VB->EdgeFlagPtr->data[vb_free] = 3;
 	       }		  
+
+	       if (IND&CLIP_TAB_EDGEFLAG) {		  
+		  /* Demote trailing edge to internal edge.
+		   */
+		  if (outcount && 
+		      (VB->EdgeFlagPtr->data[outlist[outcount-1]] & 0x2))
+		     VB->EdgeFlagPtr->data[outlist[outcount-1]] = 1;
+	       }
 	       
 	       INTERP_SZ( t, coord, vb_free, in, out, SIZE );
 	       interp( VB, vb_free, t, in, out);
 	       outlist[outcount++] = vb_free;
 	       VB->ClipMask[vb_free++] = 0;
-            }
-
-	    if (flagI) {
-	       outlist[outcount++] = currj;
-	    } else {
-	       VB->ClipMask[currj] |= CLIP_USER_BIT;
 	    }
 
 	    prevj = currj;
Index: xc/extras/Mesa/src/colortab.c
diff -u xc/extras/Mesa/src/colortab.c:1.4 xc/extras/Mesa/src/colortab.c:1.5
--- xc/extras/Mesa/src/colortab.c:1.4	Thu Mar  2 08:07:01 2000
+++ xc/extras/Mesa/src/colortab.c	Fri Jun 16 17:02:07 2000
@@ -32,28 +32,20 @@
 #include "context.h"
 #include "image.h"
 #include "macros.h"
+#include "mem.h"
+#include "mmath.h"
+#include "span.h"
 #endif
 
 
 
 /*
- * Return GL_TRUE if k is a power of two, else return GL_FALSE.
+ * Given an internalFormat token passed to glColorTable,
+ * return the corresponding base format.
+ * Return -1 if invalid token.
  */
-static GLboolean
-power_of_two( GLint k )
-{
-   GLint i, m = 1;
-   for (i=0; i<32; i++) {
-      if (k == m)
-         return GL_TRUE;
-      m = m << 1;
-   }
-   return GL_FALSE;
-}
-
-
 static GLint
-decode_internal_format( GLint format )
+base_colortab_format( GLenum format )
 {
    switch (format) {
       case GL_ALPHA:
@@ -62,14 +54,12 @@
       case GL_ALPHA12:
       case GL_ALPHA16:
          return GL_ALPHA;
-      case 1:
       case GL_LUMINANCE:
       case GL_LUMINANCE4:
       case GL_LUMINANCE8:
       case GL_LUMINANCE12:
       case GL_LUMINANCE16:
          return GL_LUMINANCE;
-      case 2:
       case GL_LUMINANCE_ALPHA:
       case GL_LUMINANCE4_ALPHA4:
       case GL_LUMINANCE6_ALPHA2:
@@ -84,7 +74,6 @@
       case GL_INTENSITY12:
       case GL_INTENSITY16:
          return GL_INTENSITY;
-      case 3:
       case GL_RGB:
       case GL_R3_G3_B2:
       case GL_RGB4:
@@ -94,7 +83,6 @@
       case GL_RGB12:
       case GL_RGB16:
          return GL_RGB;
-      case 4:
       case GL_RGBA:
       case GL_RGBA2:
       case GL_RGBA4:
@@ -110,97 +98,333 @@
 }
 
 
+void
+_mesa_init_colortable( struct gl_color_table *p )
+{
+   p->TableType = GL_UNSIGNED_BYTE;
+   /* allocate a width=1 table by default */
+   p->Table = CALLOC(4 * sizeof(GLubyte));
+   if (p->Table) {
+      GLubyte *t = (GLubyte *) p->Table;
+      t[0] = 255;
+      t[1] = 255;
+      t[2] = 255;
+      t[3] = 255;
+   }
+   p->Size = 1;
+   p->IntFormat = GL_RGBA;
+   p->Format = GL_RGBA;
+   p->RedSize = 8;
+   p->GreenSize = 8;
+   p->BlueSize = 8;
+   p->AlphaSize = 8;
+   p->IntensitySize = 0;
+   p->LuminanceSize = 0;
+}
+
+
+
+void
+_mesa_free_colortable_data( struct gl_color_table *p )
+{
+   if (p->Table) {
+      FREE(p->Table);
+      p->Table = NULL;
+   }
+}
+
+
+/*
+ * Examine table's format and set the component sizes accordingly.
+ */
+static void
+set_component_sizes( struct gl_color_table *table )
+{
+   switch (table->Format) {
+      case GL_ALPHA:
+         table->RedSize = 0;
+         table->GreenSize = 0;
+         table->BlueSize = 0;
+         table->AlphaSize = 8;
+         table->IntensitySize = 0;
+         table->LuminanceSize = 0;
+         break;
+      case GL_LUMINANCE:
+         table->RedSize = 0;
+         table->GreenSize = 0;
+         table->BlueSize = 0;
+         table->AlphaSize = 0;
+         table->IntensitySize = 0;
+         table->LuminanceSize = 8;
+         break;
+      case GL_LUMINANCE_ALPHA:
+         table->RedSize = 0;
+         table->GreenSize = 0;
+         table->BlueSize = 0;
+         table->AlphaSize = 8;
+         table->IntensitySize = 0;
+         table->LuminanceSize = 8;
+         break;
+      case GL_INTENSITY:
+         table->RedSize = 0;
+         table->GreenSize = 0;
+         table->BlueSize = 0;
+         table->AlphaSize = 0;
+         table->IntensitySize = 8;
+         table->LuminanceSize = 0;
+         break;
+      case GL_RGB:
+         table->RedSize = 8;
+         table->GreenSize = 8;
+         table->BlueSize = 8;
+         table->AlphaSize = 0;
+         table->IntensitySize = 0;
+         table->LuminanceSize = 0;
+         break;
+      case GL_RGBA:
+         table->RedSize = 8;
+         table->GreenSize = 8;
+         table->BlueSize = 8;
+         table->AlphaSize = 8;
+         table->IntensitySize = 0;
+         table->LuminanceSize = 0;
+         break;
+      default:
+         gl_problem(NULL, "unexpected format in set_component_sizes");
+   }
+}
+
+
+
 void 
 _mesa_ColorTable( GLenum target, GLenum internalFormat,
                   GLsizei width, GLenum format, GLenum type,
-                  const GLvoid *table )
+                  const GLvoid *data )
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_texture_object *texObj;
-   struct gl_color_table *palette;
+   struct gl_texture_object *texObj = NULL;
+   struct gl_color_table *table = NULL;
    GLboolean proxy = GL_FALSE;
+   GLint baseFormat;
+   GLfloat rScale = 1.0, gScale = 1.0, bScale = 1.0, aScale = 1.0;
+   GLfloat rBias  = 0.0, gBias  = 0.0, bBias  = 0.0, aBias  = 0.0;
+   GLboolean floatTable = GL_FALSE;
+   GLint comps;
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorTable");
 
    switch (target) {
       case GL_TEXTURE_1D:
          texObj = texUnit->CurrentD[1];
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          break;
       case GL_TEXTURE_2D:
          texObj = texUnit->CurrentD[2];
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          break;
       case GL_TEXTURE_3D:
          texObj = texUnit->CurrentD[3];
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          break;
       case GL_PROXY_TEXTURE_1D:
          texObj = ctx->Texture.Proxy1D;
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          proxy = GL_TRUE;
          break;
       case GL_PROXY_TEXTURE_2D:
          texObj = ctx->Texture.Proxy2D;
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          proxy = GL_TRUE;
          break;
       case GL_PROXY_TEXTURE_3D:
          texObj = ctx->Texture.Proxy3D;
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          proxy = GL_TRUE;
          break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
-         texObj = NULL;
-         palette = &ctx->Texture.Palette;
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         floatTable = GL_TRUE;
+         rScale = ctx->Pixel.ColorTableScale[0];
+         gScale = ctx->Pixel.ColorTableScale[1];
+         bScale = ctx->Pixel.ColorTableScale[2];
+         aScale = ctx->Pixel.ColorTableScale[3];
+         rBias = ctx->Pixel.ColorTableBias[0];
+         gBias = ctx->Pixel.ColorTableBias[1];
+         bBias = ctx->Pixel.ColorTableBias[2];
+         aBias = ctx->Pixel.ColorTableBias[3];
          break;
+      case GL_PROXY_COLOR_TABLE:
+         table = &ctx->ProxyColorTable;
+         proxy = GL_TRUE;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
+         floatTable = GL_TRUE;
+         rScale = ctx->Pixel.PCCTscale[0];
+         gScale = ctx->Pixel.PCCTscale[1];
+         bScale = ctx->Pixel.PCCTscale[2];
+         aScale = ctx->Pixel.PCCTscale[3];
+         rBias = ctx->Pixel.PCCTbias[0];
+         gBias = ctx->Pixel.PCCTbias[1];
+         bBias = ctx->Pixel.PCCTbias[2];
+         aBias = ctx->Pixel.PCCTbias[3];
+         break;
+      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->ProxyPostConvolutionColorTable;
+         proxy = GL_TRUE;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         floatTable = GL_TRUE;
+         rScale = ctx->Pixel.PCMCTscale[0];
+         gScale = ctx->Pixel.PCMCTscale[1];
+         bScale = ctx->Pixel.PCMCTscale[2];
+         aScale = ctx->Pixel.PCMCTscale[3];
+         rBias = ctx->Pixel.PCMCTbias[0];
+         gBias = ctx->Pixel.PCMCTbias[1];
+         bBias = ctx->Pixel.PCMCTbias[2];
+         aBias = ctx->Pixel.PCMCTbias[3];
+         break;
+      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->ProxyPostColorMatrixColorTable;
+         proxy = GL_TRUE;
+         break;
       default:
          gl_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
          return;
    }
 
-   assert(palette);
+   assert(table);
 
-   if (!gl_is_legal_format_and_type(format, type)) {
+   if (!_mesa_is_legal_format_and_type(format, type)) {
       gl_error(ctx, GL_INVALID_ENUM, "glColorTable(format or type)");
       return;
    }
 
-   if (decode_internal_format(internalFormat) < 0) {
-      gl_error( ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)" );
+   baseFormat = base_colortab_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)");
       return;
    }
 
-   if (width < 1 || width > MAX_TEXTURE_PALETTE_SIZE || !power_of_two(width)) {
-      gl_error(ctx, GL_INVALID_VALUE, "glColorTable(width)");
+   if (width < 1 || width > ctx->Const.MaxColorTableSize
+       || _mesa_bitcount(width) != 1) {
+      if (width > ctx->Const.MaxColorTableSize)
+         gl_error(ctx, GL_TABLE_TOO_LARGE, "glColorTable(width)");
+      else
+         gl_error(ctx, GL_INVALID_VALUE, "glColorTable(width)");
       if (proxy) {
-         palette->Size = 0;
-         palette->IntFormat = (GLenum) 0;
-         palette->Format = (GLenum) 0;
+         table->Size = 0;
+         table->IntFormat = (GLenum) 0;
+         table->Format = (GLenum) 0;
       }
       return;
    }
 
-   palette->Size = width;
-   palette->IntFormat = internalFormat;
-   palette->Format = (GLenum) decode_internal_format(internalFormat);
+   table->Size = width;
+   table->IntFormat = internalFormat;
+   table->Format = (GLenum) baseFormat;
+   set_component_sizes(table);
+
+   comps = _mesa_components_in_format(table->Format);
+   assert(comps > 0);  /* error should have been caught sooner */
+
    if (!proxy) {
-      _mesa_unpack_ubyte_color_span(ctx, width, palette->Format,
-                                    palette->Table,  /* dest */
-                                    format, type, table,
-                                    &ctx->Unpack, GL_FALSE);
-   }
-   if (texObj) {
-      /* per-texture object palette */
-      if (ctx->Driver.UpdateTexturePalette) {
-         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
+      /* free old table, if any */
+      if (table->Table) {
+         FREE(table->Table);
       }
-   }
-   else {
-      /* shared texture palette */
+      if (floatTable) {
+         GLubyte tableUB[MAX_COLOR_TABLE_SIZE * 4];
+         GLfloat *tableF;
+         GLuint i;
+
+         _mesa_unpack_ubyte_color_span(ctx, width, table->Format,
+                                       tableUB,  /* dest */
+                                       format, type, data,
+                                       &ctx->Unpack, GL_TRUE);
+
+         table->TableType = GL_FLOAT;
+         table->Table = MALLOC(comps * width * sizeof(GLfloat));
+         if (!table->Table) {
+            gl_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");
+            return;
+         }
+
+         /* Apply scale and bias and convert GLubyte values to GLfloats
+          * in [0, 1].  Store results in the tableF[].
+          */
+         rScale /= 255.0;
+         gScale /= 255.0;
+         bScale /= 255.0;
+         aScale /= 255.0;
+         tableF = (GLfloat *) table->Table;
+
+         switch (table->Format) {
+            case GL_INTENSITY:
+               for (i = 0; i < width; i++) {
+                  tableF[i] = tableUB[i] * rScale + rBias;
+               }
+               break;
+            case GL_LUMINANCE:
+               for (i = 0; i < width; i++) {
+                  tableF[i] = tableUB[i] * rScale + rBias;
+               }
+               break;
+            case GL_ALPHA:
+               for (i = 0; i < width; i++) {
+                  tableF[i] = tableUB[i] * aScale + aBias;
+               }
+               break;
+            case GL_LUMINANCE_ALPHA:
+               for (i = 0; i < width; i++) {
+                  tableF[i*2+0] = tableUB[i*2+0] * rScale + rBias;
+                  tableF[i*2+1] = tableUB[i*2+1] * aScale + aBias;
+               }
+               break;
+            case GL_RGB:
+               for (i = 0; i < width; i++) {
+                  tableF[i*3+0] = tableUB[i*3+0] * rScale + rBias;
+                  tableF[i*3+1] = tableUB[i*3+1] * gScale + gBias;
+                  tableF[i*3+2] = tableUB[i*3+2] * bScale + bBias;
+               }
+               break;
+            case GL_RGBA:
+               for (i = 0; i < width; i++) {
+                  tableF[i*4+0] = tableUB[i*4+0] * rScale + rBias;
+                  tableF[i*4+1] = tableUB[i*4+1] * gScale + gBias;
+                  tableF[i*4+2] = tableUB[i*4+2] * bScale + bBias;
+                  tableF[i*4+3] = tableUB[i*4+3] * aScale + aBias;
+               }
+               break;
+            default:
+               gl_problem(ctx, "Bad format in _mesa_ColorTable");
+               return;
+         }
+      }
+      else {
+         /* store GLubyte table */
+         table->TableType = GL_UNSIGNED_BYTE;
+         table->Table = MALLOC(comps * width * sizeof(GLubyte));
+         if (!table->Table) {
+            gl_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");
+            return;
+         }
+         _mesa_unpack_ubyte_color_span(ctx, width, table->Format,
+                                       table->Table,  /* dest */
+                                       format, type, data,
+                                       &ctx->Unpack, GL_TRUE);
+      } /* floatTable */
+   } /* proxy */
+
+   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
+      /* texture object palette, texObj==NULL means the shared palette */
       if (ctx->Driver.UpdateTexturePalette) {
-         (*ctx->Driver.UpdateTexturePalette)( ctx, NULL );
+         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
       }
    }
 }
@@ -210,42 +434,49 @@
 void
 _mesa_ColorSubTable( GLenum target, GLsizei start,
                      GLsizei count, GLenum format, GLenum type,
-                     const GLvoid *table )
+                     const GLvoid *data )
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_texture_object *texObj;
-   struct gl_color_table *palette;
+   struct gl_texture_object *texObj = NULL;
+   struct gl_color_table *table = NULL;
    GLint comps;
-   GLubyte *dest;
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorSubTable");
 
    switch (target) {
       case GL_TEXTURE_1D:
          texObj = texUnit->CurrentD[1];
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          break;
       case GL_TEXTURE_2D:
          texObj = texUnit->CurrentD[2];
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          break;
       case GL_TEXTURE_3D:
          texObj = texUnit->CurrentD[3];
-         palette = &texObj->Palette;
+         table = &texObj->Palette;
          break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
-         texObj = NULL;
-         palette = &ctx->Texture.Palette;
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
          break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         break;
       default:
          gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
          return;
    }
 
-   assert(palette);
+   assert(table);
 
-   if (!gl_is_legal_format_and_type(format, type)) {
+   if (!_mesa_is_legal_format_and_type(format, type)) {
       gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(format or type)");
       return;
    }
@@ -255,196 +486,619 @@
       return;
    }
 
-   comps = gl_components_in_format(format);
-   assert(comps > 0);  /* error should be caught sooner */
+   comps = _mesa_components_in_format(table->Format);
+   assert(comps > 0);  /* error should have been caught sooner */
 
-   if (start + count > palette->Size) {
+   if (start + count > table->Size) {
       gl_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");
       return;
    }
-   dest = palette->Table + start * comps * sizeof(GLubyte);
-   _mesa_unpack_ubyte_color_span(ctx, count, palette->Format, dest,
-                                 format, type, table,
-                                 &ctx->Unpack, GL_FALSE);
 
-   if (texObj) {
-      /* per-texture object palette */
-      if (ctx->Driver.UpdateTexturePalette) {
-         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
-      }
+   if (!table->Table) {
+      gl_error(ctx, GL_OUT_OF_MEMORY, "glColorSubTable");
+      return;
    }
+
+   if (table->TableType == GL_UNSIGNED_BYTE) {
+      GLubyte *dest = (GLubyte *) table->Table + start * comps * sizeof(GLubyte);
+      _mesa_unpack_ubyte_color_span(ctx, count, table->Format, dest,
+                                    format, type, data, &ctx->Unpack, GL_TRUE);
+   }
    else {
-      /* shared texture palette */
+      GLfloat *dest = (GLfloat *) table->Table + start * comps * sizeof(GLfloat);
+      ASSERT(table->TableType == GL_FLOAT);
+      _mesa_unpack_float_color_span(ctx, count, table->Format, dest,
+                                    format, type, data, &ctx->Unpack,
+                                    GL_FALSE, GL_TRUE);
+   }
+
+   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
+      /* per-texture object palette */
       if (ctx->Driver.UpdateTexturePalette) {
-         (*ctx->Driver.UpdateTexturePalette)( ctx, NULL );
+         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
       }
    }
 }
 
 
 
+/* XXX not tested */
 void
+_mesa_CopyColorTable(GLenum target, GLenum internalformat,
+                     GLint x, GLint y, GLsizei width)
+{
+   GLubyte data[MAX_WIDTH][4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyColorTable");
+
+   /* Select buffer to read from */
+   (*ctx->Driver.SetReadBuffer)( ctx, ctx->ReadBuffer,
+                                 ctx->Pixel.DriverReadBuffer );
+
+   if (width > MAX_WIDTH)
+      width = MAX_WIDTH;
+
+   /* read the data from framebuffer */
+   gl_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y, data );
+
+   /* Restore reading from draw buffer (the default) */
+   (*ctx->Driver.SetReadBuffer)( ctx, ctx->DrawBuffer,
+                                 ctx->Color.DriverDrawBuffer );
+
+   _mesa_ColorTable(target, internalformat, width,
+                    GL_RGBA, GL_UNSIGNED_BYTE, data);
+}
+
+
+
+/* XXX not tested */
+void
+_mesa_CopyColorSubTable(GLenum target, GLsizei start,
+                        GLint x, GLint y, GLsizei width)
+{
+   GLubyte data[MAX_WIDTH][4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyColorSubTable");
+
+   /* Select buffer to read from */
+   (*ctx->Driver.SetReadBuffer)( ctx, ctx->ReadBuffer,
+                                 ctx->Pixel.DriverReadBuffer );
+
+   if (width > MAX_WIDTH)
+      width = MAX_WIDTH;
+
+   /* read the data from framebuffer */
+   gl_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y, data );
+
+   /* Restore reading from draw buffer (the default) */
+   (*ctx->Driver.SetReadBuffer)( ctx, ctx->DrawBuffer,
+                                 ctx->Color.DriverDrawBuffer );
+
+   _mesa_ColorSubTable(target, start, width, GL_RGBA, GL_UNSIGNED_BYTE, data);
+}
+
+
+
+void
 _mesa_GetColorTable( GLenum target, GLenum format,
-                     GLenum type, GLvoid *table )
+                     GLenum type, GLvoid *data )
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_color_table *palette;
-   GLubyte rgba[MAX_TEXTURE_PALETTE_SIZE][4];
+   struct gl_color_table *table = NULL;
+   GLubyte rgba[MAX_COLOR_TABLE_SIZE][4];
    GLint i;
 
    ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTable");
 
    switch (target) {
       case GL_TEXTURE_1D:
-         palette = &texUnit->CurrentD[1]->Palette;
+         table = &texUnit->CurrentD[1]->Palette;
          break;
       case GL_TEXTURE_2D:
-         palette = &texUnit->CurrentD[2]->Palette;
+         table = &texUnit->CurrentD[2]->Palette;
          break;
       case GL_TEXTURE_3D:
-         palette = &texUnit->CurrentD[3]->Palette;
+         table = &texUnit->CurrentD[3]->Palette;
          break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
-         palette = &ctx->Texture.Palette;
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
          break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         break;
       default:
          gl_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
          return;
    }
 
-   assert(palette);
+   assert(table);
 
-   switch (palette->Format) {
+   switch (table->Format) {
       case GL_ALPHA:
-         for (i = 0; i < palette->Size; i++) {
-            rgba[i][RCOMP] = 0;
-            rgba[i][GCOMP] = 0;
-            rgba[i][BCOMP] = 0;
-            rgba[i][ACOMP] = palette->Table[i];
+         if (table->TableType == GL_FLOAT) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = 0;
+               rgba[i][GCOMP] = 0;
+               rgba[i][BCOMP] = 0;
+               rgba[i][ACOMP] = (GLint) (tableF[i] * 255.0F);
+            }
+         }
+         else {
+            const GLubyte *tableUB = (const GLubyte *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = 0;
+               rgba[i][GCOMP] = 0;
+               rgba[i][BCOMP] = 0;
+               rgba[i][ACOMP] = tableUB[i];
+            }
          }
          break;
       case GL_LUMINANCE:
-         for (i = 0; i < palette->Size; i++) {
-            rgba[i][RCOMP] = palette->Table[i];
-            rgba[i][GCOMP] = palette->Table[i];
-            rgba[i][BCOMP] = palette->Table[i];
-            rgba[i][ACOMP] = 255;
+         if (table->TableType == GL_FLOAT) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = (GLint) (tableF[i] * 255.0F);
+               rgba[i][GCOMP] = (GLint) (tableF[i] * 255.0F);
+               rgba[i][BCOMP] = (GLint) (tableF[i] * 255.0F);
+               rgba[i][ACOMP] = 255;
+            }
+         }
+         else {
+            const GLubyte *tableUB = (const GLubyte *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i];
+               rgba[i][GCOMP] = tableUB[i];
+               rgba[i][BCOMP] = tableUB[i];
+               rgba[i][ACOMP] = 255;
+            }
          }
          break;
       case GL_LUMINANCE_ALPHA:
-         for (i = 0; i < palette->Size; i++) {
-            rgba[i][RCOMP] = palette->Table[i*2+0];
-            rgba[i][GCOMP] = palette->Table[i*2+0];
-            rgba[i][BCOMP] = palette->Table[i*2+0];
-            rgba[i][ACOMP] = palette->Table[i*2+1];
+         if (table->TableType == GL_FLOAT) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = (GLint) (tableF[i*2+0] * 255.0F);
+               rgba[i][GCOMP] = (GLint) (tableF[i*2+0] * 255.0F);
+               rgba[i][BCOMP] = (GLint) (tableF[i*2+0] * 255.0F);
+               rgba[i][ACOMP] = (GLint) (tableF[i*2+1] * 255.0F);
+            }
          }
+         else {
+            const GLubyte *tableUB = (const GLubyte *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i*2+0];
+               rgba[i][GCOMP] = tableUB[i*2+0];
+               rgba[i][BCOMP] = tableUB[i*2+0];
+               rgba[i][ACOMP] = tableUB[i*2+1];
+            }
+         }
          break;
       case GL_INTENSITY:
-         for (i = 0; i < palette->Size; i++) {
-            rgba[i][RCOMP] = palette->Table[i];
-            rgba[i][GCOMP] = palette->Table[i];
-            rgba[i][BCOMP] = palette->Table[i];
-            rgba[i][ACOMP] = 255;
+         if (table->TableType == GL_FLOAT) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = (GLint) (tableF[i] * 255.0F);
+               rgba[i][GCOMP] = (GLint) (tableF[i] * 255.0F);
+               rgba[i][BCOMP] = (GLint) (tableF[i] * 255.0F);
+               rgba[i][ACOMP] = (GLint) (tableF[i] * 255.0F);
+            }
+         }
+         else {
+            const GLubyte *tableUB = (const GLubyte *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i];
+               rgba[i][GCOMP] = tableUB[i];
+               rgba[i][BCOMP] = tableUB[i];
+               rgba[i][ACOMP] = tableUB[i];
+            }
          }
          break;
       case GL_RGB:
-         for (i = 0; i < palette->Size; i++) {
-            rgba[i][RCOMP] = palette->Table[i*3+0];
-            rgba[i][GCOMP] = palette->Table[i*3+1];
-            rgba[i][BCOMP] = palette->Table[i*3+2];
-            rgba[i][ACOMP] = 255;
+         if (table->TableType == GL_FLOAT) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = (GLint) (tableF[i*3+0] * 255.0F);
+               rgba[i][GCOMP] = (GLint) (tableF[i*3+1] * 255.0F);
+               rgba[i][BCOMP] = (GLint) (tableF[i*3+2] * 255.0F);
+               rgba[i][ACOMP] = 255;
+            }
+         }
+         else {
+            const GLubyte *tableUB = (const GLubyte *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i*3+0];
+               rgba[i][GCOMP] = tableUB[i*3+1];
+               rgba[i][BCOMP] = tableUB[i*3+2];
+               rgba[i][ACOMP] = 255;
+            }
          }
          break;
       case GL_RGBA:
-         for (i = 0; i < palette->Size; i++) {
-            rgba[i][RCOMP] = palette->Table[i*4+0];
-            rgba[i][GCOMP] = palette->Table[i*4+1];
-            rgba[i][BCOMP] = palette->Table[i*4+2];
-            rgba[i][ACOMP] = palette->Table[i*4+3];
+         if (table->TableType == GL_FLOAT) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = (GLint) (tableF[i*4+0] * 255.0F);
+               rgba[i][GCOMP] = (GLint) (tableF[i*4+1] * 255.0F);
+               rgba[i][BCOMP] = (GLint) (tableF[i*4+2] * 255.0F);
+               rgba[i][ACOMP] = (GLint) (tableF[i*4+3] * 255.0F);
+            }
          }
+         else {
+            const GLubyte *tableUB = (const GLubyte *) table->Table;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i*4+0];
+               rgba[i][GCOMP] = tableUB[i*4+1];
+               rgba[i][BCOMP] = tableUB[i*4+2];
+               rgba[i][ACOMP] = tableUB[i*4+3];
+            }
+         }
          break;
       default:
-         gl_problem(ctx, "bad palette format in glGetColorTable");
+         gl_problem(ctx, "bad table format in glGetColorTable");
          return;
    }
+
+   _mesa_pack_rgba_span(ctx, table->Size, (const GLubyte (*)[]) rgba,
+                        format, type, data, &ctx->Pack, GL_FALSE);
+}
+
 
-   gl_pack_rgba_span(ctx, palette->Size, (const GLubyte (*)[]) rgba,
-                     format, type, table, &ctx->Pack, GL_FALSE);
+
+void
+_mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx, "glColorTableParameterfv");
 
-   (void) format;
-   (void) type;
-   (void) table;
+   switch (target) {
+      case GL_COLOR_TABLE_SGI:
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            ctx->Pixel.ColorTableScale[0] = params[0];
+            ctx->Pixel.ColorTableScale[1] = params[1];
+            ctx->Pixel.ColorTableScale[2] = params[2];
+            ctx->Pixel.ColorTableScale[3] = params[3];
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            ctx->Pixel.ColorTableBias[0] = params[0];
+            ctx->Pixel.ColorTableBias[1] = params[1];
+            ctx->Pixel.ColorTableBias[2] = params[2];
+            ctx->Pixel.ColorTableBias[3] = params[3];
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
+            return;
+         }
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            ctx->Pixel.PCCTscale[0] = params[0];
+            ctx->Pixel.PCCTscale[1] = params[1];
+            ctx->Pixel.PCCTscale[2] = params[2];
+            ctx->Pixel.PCCTscale[3] = params[3];
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            ctx->Pixel.PCCTbias[0] = params[0];
+            ctx->Pixel.PCCTbias[1] = params[1];
+            ctx->Pixel.PCCTbias[2] = params[2];
+            ctx->Pixel.PCCTbias[3] = params[3];
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
+            return;
+         }
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            ctx->Pixel.PCMCTscale[0] = params[0];
+            ctx->Pixel.PCMCTscale[1] = params[1];
+            ctx->Pixel.PCMCTscale[2] = params[2];
+            ctx->Pixel.PCMCTscale[3] = params[3];
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            ctx->Pixel.PCMCTbias[0] = params[0];
+            ctx->Pixel.PCMCTbias[1] = params[1];
+            ctx->Pixel.PCMCTbias[2] = params[2];
+            ctx->Pixel.PCMCTbias[3] = params[3];
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
+            return;
+         }
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");
+         return;
+   }
 }
 
 
 
 void
-_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
+_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-   GLint iparams[10];
-   _mesa_GetColorTableParameteriv( target, pname, iparams );
-   *params = (GLfloat) iparams[0];
+   GLfloat fparams[4];
+   if (pname == GL_COLOR_TABLE_SGI ||
+       pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
+       pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI) {
+      /* four values */
+      fparams[0] = (GLfloat) params[0];
+      fparams[1] = (GLfloat) params[1];
+      fparams[2] = (GLfloat) params[2];
+      fparams[3] = (GLfloat) params[3];
+   }
+   else {
+      /* one values */
+      fparams[0] = (GLfloat) params[0];
+   }
+   _mesa_ColorTableParameterfv(target, pname, fparams);
 }
 
 
 
 void
-_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
+_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_color_table *palette;
+   struct gl_color_table *table = NULL;
 
-   ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableParameter");
+   ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableParameterfv");
 
    switch (target) {
       case GL_TEXTURE_1D:
-         palette = &texUnit->CurrentD[1]->Palette;
+         table = &texUnit->CurrentD[1]->Palette;
          break;
       case GL_TEXTURE_2D:
-         palette = &texUnit->CurrentD[2]->Palette;
+         table = &texUnit->CurrentD[2]->Palette;
          break;
       case GL_TEXTURE_3D:
-         palette = &texUnit->CurrentD[3]->Palette;
+         table = &texUnit->CurrentD[3]->Palette;
+         break;
+      case GL_PROXY_TEXTURE_1D:
+         table = &ctx->Texture.Proxy1D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_2D:
+         table = &ctx->Texture.Proxy2D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_3D:
+         table = &ctx->Texture.Proxy3D->Palette;
          break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
-         palette = &ctx->Texture.Palette;
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = ctx->Pixel.ColorTableScale[0];
+            params[1] = ctx->Pixel.ColorTableScale[1];
+            params[2] = ctx->Pixel.ColorTableScale[2];
+            params[3] = ctx->Pixel.ColorTableScale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = ctx->Pixel.ColorTableBias[0];
+            params[1] = ctx->Pixel.ColorTableBias[1];
+            params[2] = ctx->Pixel.ColorTableBias[2];
+            params[3] = ctx->Pixel.ColorTableBias[3];
+            return;
+         }
          break;
+      case GL_PROXY_COLOR_TABLE:
+         table = &ctx->ProxyColorTable;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = ctx->Pixel.PCCTscale[0];
+            params[1] = ctx->Pixel.PCCTscale[1];
+            params[2] = ctx->Pixel.PCCTscale[2];
+            params[3] = ctx->Pixel.PCCTscale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = ctx->Pixel.PCCTbias[0];
+            params[1] = ctx->Pixel.PCCTbias[1];
+            params[2] = ctx->Pixel.PCCTbias[2];
+            params[3] = ctx->Pixel.PCCTbias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->ProxyPostConvolutionColorTable;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = ctx->Pixel.PCMCTscale[0];
+            params[1] = ctx->Pixel.PCMCTscale[1];
+            params[2] = ctx->Pixel.PCMCTscale[2];
+            params[3] = ctx->Pixel.PCMCTscale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = ctx->Pixel.PCMCTbias[0];
+            params[1] = ctx->Pixel.PCMCTbias[1];
+            params[2] = ctx->Pixel.PCMCTbias[2];
+            params[3] = ctx->Pixel.PCMCTbias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->ProxyPostColorMatrixColorTable;
+         break;
       default:
-         gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
+         gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(target)");
          return;
    }
 
+   assert(table);
+
    switch (pname) {
       case GL_COLOR_TABLE_FORMAT:
-         *params = palette->IntFormat;
+         *params = table->IntFormat;
          break;
       case GL_COLOR_TABLE_WIDTH:
-         *params = palette->Size;
+         *params = table->Size;
          break;
       case GL_COLOR_TABLE_RED_SIZE:
-         *params = 8;
+         *params = table->RedSize;
          break;
       case GL_COLOR_TABLE_GREEN_SIZE:
-         *params = 8;
+         *params = table->GreenSize;
          break;
       case GL_COLOR_TABLE_BLUE_SIZE:
-         *params = 8;
+         *params = table->BlueSize;
          break;
       case GL_COLOR_TABLE_ALPHA_SIZE:
-         *params = 8;
+         *params = table->AlphaSize;
          break;
       case GL_COLOR_TABLE_LUMINANCE_SIZE:
-         *params = 8;
+         *params = table->LuminanceSize;
          break;
       case GL_COLOR_TABLE_INTENSITY_SIZE:
-         *params = 8;
+         *params = table->IntensitySize;
          break;
       default:
-         gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter" );
+         gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(pname)" );
          return;
    }
 }
 
 
+
+void
+_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_color_table *table = NULL;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableParameteriv");
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         table = &texUnit->CurrentD[1]->Palette;
+         break;
+      case GL_TEXTURE_2D:
+         table = &texUnit->CurrentD[2]->Palette;
+         break;
+      case GL_TEXTURE_3D:
+         table = &texUnit->CurrentD[3]->Palette;
+         break;
+      case GL_PROXY_TEXTURE_1D:
+         table = &ctx->Texture.Proxy1D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_2D:
+         table = &ctx->Texture.Proxy2D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_3D:
+         table = &ctx->Texture.Proxy3D->Palette;
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = (GLint) ctx->Pixel.ColorTableScale[0];
+            params[1] = (GLint) ctx->Pixel.ColorTableScale[1];
+            params[2] = (GLint) ctx->Pixel.ColorTableScale[2];
+            params[3] = (GLint) ctx->Pixel.ColorTableScale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = (GLint) ctx->Pixel.ColorTableBias[0];
+            params[1] = (GLint) ctx->Pixel.ColorTableBias[1];
+            params[2] = (GLint) ctx->Pixel.ColorTableBias[2];
+            params[3] = (GLint) ctx->Pixel.ColorTableBias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_COLOR_TABLE:
+         table = &ctx->ProxyColorTable;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = (GLint) ctx->Pixel.PCCTscale[0];
+            params[1] = (GLint) ctx->Pixel.PCCTscale[1];
+            params[2] = (GLint) ctx->Pixel.PCCTscale[2];
+            params[3] = (GLint) ctx->Pixel.PCCTscale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = (GLint) ctx->Pixel.PCCTbias[0];
+            params[1] = (GLint) ctx->Pixel.PCCTbias[1];
+            params[2] = (GLint) ctx->Pixel.PCCTbias[2];
+            params[3] = (GLint) ctx->Pixel.PCCTbias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->ProxyPostConvolutionColorTable;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = (GLint) ctx->Pixel.PCMCTscale[0];
+            params[1] = (GLint) ctx->Pixel.PCMCTscale[1];
+            params[2] = (GLint) ctx->Pixel.PCMCTscale[2];
+            params[3] = (GLint) ctx->Pixel.PCMCTscale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = (GLint) ctx->Pixel.PCMCTbias[0];
+            params[1] = (GLint) ctx->Pixel.PCMCTbias[1];
+            params[2] = (GLint) ctx->Pixel.PCMCTbias[2];
+            params[3] = (GLint) ctx->Pixel.PCMCTbias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->ProxyPostColorMatrixColorTable;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(target)");
+         return;
+   }
+
+   assert(table);
+
+   switch (pname) {
+      case GL_COLOR_TABLE_FORMAT:
+         *params = table->IntFormat;
+         break;
+      case GL_COLOR_TABLE_WIDTH:
+         *params = table->Size;
+         break;
+      case GL_COLOR_TABLE_RED_SIZE:
+         *params = table->RedSize;
+         break;
+      case GL_COLOR_TABLE_GREEN_SIZE:
+         *params = table->GreenSize;
+         break;
+      case GL_COLOR_TABLE_BLUE_SIZE:
+         *params = table->BlueSize;
+         break;
+      case GL_COLOR_TABLE_ALPHA_SIZE:
+         *params = table->AlphaSize;
+         break;
+      case GL_COLOR_TABLE_LUMINANCE_SIZE:
+         *params = table->LuminanceSize;
+         break;
+      case GL_COLOR_TABLE_INTENSITY_SIZE:
+         *params = table->IntensitySize;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(pname)" );
+         return;
+   }
+}
Index: xc/extras/Mesa/src/colortab.h
diff -u xc/extras/Mesa/src/colortab.h:1.4 xc/extras/Mesa/src/colortab.h:1.5
--- xc/extras/Mesa/src/colortab.h:1.4	Thu Mar  2 08:07:02 2000
+++ xc/extras/Mesa/src/colortab.h	Fri Jun 16 17:02:07 2000
@@ -32,21 +32,52 @@
 
 
 extern void
+_mesa_init_colortable( struct gl_color_table *p );
+
+extern void
+_mesa_free_colortable_data( struct gl_color_table *p );
+
+
+extern void
 _mesa_ColorTable( GLenum target, GLenum internalformat,
                   GLsizei width, GLenum format, GLenum type,
                   const GLvoid *table );
 
+
 extern void
 _mesa_ColorSubTable( GLenum target, GLsizei start,
                      GLsizei count, GLenum format, GLenum type,
                      const GLvoid *table );
 
+
 extern void
+_mesa_CopyColorSubTable(GLenum target, GLsizei start,
+                        GLint x, GLint y, GLsizei width);
+
+
+extern void
+_mesa_CopyColorTable(GLenum target, GLenum internalformat,
+                     GLint x, GLint y, GLsizei width);
+
+
+extern void
 _mesa_GetColorTable( GLenum target, GLenum format,
                      GLenum type, GLvoid *table );
 
+
+extern void
+_mesa_ColorTableParameterfv(GLenum target, GLenum pname,
+                            const GLfloat *params);
+
+
 extern void
+_mesa_ColorTableParameteriv(GLenum target, GLenum pname,
+                            const GLint *params);
+
+
+extern void
 _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
+
 
 extern void
 _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
Index: xc/extras/Mesa/src/config.h
diff -u xc/extras/Mesa/src/config.h:1.4 xc/extras/Mesa/src/config.h:1.5
--- xc/extras/Mesa/src/config.h:1.4	Thu Mar  2 08:07:03 2000
+++ xc/extras/Mesa/src/config.h	Fri Jun 16 17:02:07 2000
@@ -51,6 +51,9 @@
 /* Maximum texture matrix stack depth: */
 #define MAX_TEXTURE_STACK_DEPTH 10
 
+/* Maximum color matrix stack depth: */
+#define MAX_COLOR_STACK_DEPTH 4
+
 /* Maximum attribute stack depth: */
 #define MAX_ATTRIB_STACK_DEPTH 16
 
@@ -92,8 +95,8 @@
 #define MAX_LINE_WIDTH 10.0
 #define LINE_WIDTH_GRANULARITY 0.1
 
-/* Max texture palette size */
-#define MAX_TEXTURE_PALETTE_SIZE 256
+/* Max texture palette / color table size */
+#define MAX_COLOR_TABLE_SIZE 256
 
 /* Number of texture levels */
 #define MAX_TEXTURE_LEVELS 12
@@ -111,6 +114,16 @@
 /* Subpixel precision for antialiasing, window coordinate snapping */
 #define SUB_PIXEL_BITS 4
 
+/* Size of histogram tables */
+#define HISTOGRAM_TABLE_SIZE 256
+
+/* Max convolution filter sizes */
+#define MAX_CONVOLUTION_WIDTH 5
+#define MAX_CONVOLUTION_HEIGHT 5
+
+/* GL_ARB_texture_compression */
+#define MAX_COMPRESSED_TEXTURE_FORMATS 25
+
 
 
 /*
@@ -125,26 +138,12 @@
 
 
 /*
- * Bits per depth buffer value:  16 or 32
+ * Bits per depth buffer value:  16 or 32 (GLushort or GLuint)
+ * gl_create_visual() can select any depth in [0, 32].
  */
-#ifdef MESAD3D
-   /* Mesa / Direct3D driver only */
-   extern float g_DepthScale, g_MaxDepth;
-#  define DEPTH_BITS 	32
-#  define DEPTH_SCALE 	g_DepthScale
-#  define MAX_DEPTH 	g_MaxDepth
-#else
-#  define DEPTH_BITS 16
-#  if DEPTH_BITS==16
-#     define MAX_DEPTH 0xffff
-#     define DEPTH_SCALE 65535.0F
-#  elif DEPTH_BITS==32
-#     define MAX_DEPTH 0x3fffffff
-#     define DEPTH_SCALE ((GLfloat) MAX_DEPTH)
-#  else
-#     error "illegal number of depth bits"
-#  endif
-#endif
+#define DEFAULT_SOFTWARE_DEPTH_BITS 16
+#define DEFAULT_SOFTWARE_DEPTH_TYPE GLushort
+
 
 
 /*
@@ -190,7 +189,7 @@
  * VB_MAX vertices.  (This only happens when mixed primitives are
  * sharing the vb).  
  */
-#define VB_MAX_CLIPPED_VERTS (2 * (6 + MAX_CLIP_PLANES))
+#define VB_MAX_CLIPPED_VERTS ((2 * (6 + MAX_CLIP_PLANES))+1)
 #define VB_SIZE  (VB_MAX + VB_MAX_CLIPPED_VERTS)
 
 
Index: xc/extras/Mesa/src/context.c
diff -u xc/extras/Mesa/src/context.c:1.3 xc/extras/Mesa/src/context.c:1.4
--- xc/extras/Mesa/src/context.c:1.3	Mon Feb 14 23:12:06 2000
+++ xc/extras/Mesa/src/context.c	Fri Jun 16 17:02:08 2000
@@ -31,6 +31,7 @@
 #include "accum.h"
 #include "alphabuf.h"
 #include "clip.h"
+#include "colortab.h"
 #include "context.h"
 #include "cva.h"
 #include "depth.h"
@@ -85,164 +86,6 @@
 #endif
 
 
-
-
-/**********************************************************************/
-/*****                   Profiling functions                      *****/
-/**********************************************************************/
-
-#ifdef PROFILE
-
-#include <sys/times.h>
-#include <sys/param.h>
-
-
-/*
- * Return system time in seconds.
- * NOTE:  this implementation may not be very portable!
- */
-GLdouble gl_time( void )
-{
-   static GLdouble prev_time = 0.0;
-   static GLdouble time;
-   struct tms tm;
-   clock_t clk;
-
-   clk = times(&tm);
-
-#ifdef CLK_TCK
-   time = (double)clk / (double)CLK_TCK;
-#else
-   time = (double)clk / (double)HZ;
-#endif
-
-   if (time>prev_time) {
-      prev_time = time;
-      return time;
-   }
-   else {
-      return prev_time;
-   }
-}
-
-/*
- * Reset the timing/profiling counters
- */
-static void init_timings( GLcontext *ctx )
-{
-   ctx->BeginEndCount = 0;
-   ctx->BeginEndTime = 0.0;
-   ctx->VertexCount = 0;
-   ctx->VertexTime = 0.0;
-   ctx->PointCount = 0;
-   ctx->PointTime = 0.0;
-   ctx->LineCount = 0;
-   ctx->LineTime = 0.0;
-   ctx->PolygonCount = 0;
-   ctx->PolygonTime = 0.0;
-   ctx->ClearCount = 0;
-   ctx->ClearTime = 0.0;
-   ctx->SwapCount = 0;
-   ctx->SwapTime = 0.0;
-}
-
-
-/*
- * Print the accumulated timing/profiling data.
- */
-static void print_timings( GLcontext *ctx )
-{
-   GLdouble beginendrate;
-   GLdouble vertexrate;
-   GLdouble pointrate;
-   GLdouble linerate;
-   GLdouble polygonrate;
-   GLdouble overhead;
-   GLdouble clearrate;
-   GLdouble swaprate;
-   GLdouble avgvertices;
-
-   if (ctx->BeginEndTime>0.0) {
-      beginendrate = ctx->BeginEndCount / ctx->BeginEndTime;
-   }
-   else {
-      beginendrate = 0.0;
-   }
-   if (ctx->VertexTime>0.0) {
-      vertexrate = ctx->VertexCount / ctx->VertexTime;
-   }
-   else {
-      vertexrate = 0.0;
-   }
-   if (ctx->PointTime>0.0) {
-      pointrate = ctx->PointCount / ctx->PointTime;
-   }
-   else {
-      pointrate = 0.0;
-   }
-   if (ctx->LineTime>0.0) {
-      linerate = ctx->LineCount / ctx->LineTime;
-   }
-   else {
-      linerate = 0.0;
-   }
-   if (ctx->PolygonTime>0.0) {
-      polygonrate = ctx->PolygonCount / ctx->PolygonTime;
-   }
-   else {
-      polygonrate = 0.0;
-   }
-   if (ctx->ClearTime>0.0) {
-      clearrate = ctx->ClearCount / ctx->ClearTime;
-   }
-   else {
-      clearrate = 0.0;
-   }
-   if (ctx->SwapTime>0.0) {
-      swaprate = ctx->SwapCount / ctx->SwapTime;
-   }
-   else {
-      swaprate = 0.0;
-   }
-
-   if (ctx->BeginEndCount>0) {
-      avgvertices = (GLdouble) ctx->VertexCount / (GLdouble) ctx->BeginEndCount;
-   }
-   else {
-      avgvertices = 0.0;
-   }
-
-   overhead = ctx->BeginEndTime - ctx->VertexTime - ctx->PointTime
-              - ctx->LineTime - ctx->PolygonTime;
-
-
-   printf("                          Count   Time (s)    Rate (/s) \n");
-   printf("--------------------------------------------------------\n");
-   printf("glBegin/glEnd           %7d  %8.3f   %10.3f\n",
-          ctx->BeginEndCount, ctx->BeginEndTime, beginendrate);
-   printf("  vertexes transformed  %7d  %8.3f   %10.3f\n",
-          ctx->VertexCount, ctx->VertexTime, vertexrate );
-   printf("  points rasterized     %7d  %8.3f   %10.3f\n",
-          ctx->PointCount, ctx->PointTime, pointrate );
-   printf("  lines rasterized      %7d  %8.3f   %10.3f\n",
-          ctx->LineCount, ctx->LineTime, linerate );
-   printf("  polygons rasterized   %7d  %8.3f   %10.3f\n",
-          ctx->PolygonCount, ctx->PolygonTime, polygonrate );
-   printf("  overhead                       %8.3f\n", overhead );
-   printf("glClear                 %7d  %8.3f   %10.3f\n",
-          ctx->ClearCount, ctx->ClearTime, clearrate );
-   printf("SwapBuffers             %7d  %8.3f   %10.3f\n",
-          ctx->SwapCount, ctx->SwapTime, swaprate );
-   printf("\n");
-
-   printf("Average number of vertices per begin/end: %8.3f\n", avgvertices );
-}
-#endif
-
-
-
-
-
 /**********************************************************************/
 /***** GL Visual allocation/destruction                           *****/
 /**********************************************************************/
@@ -251,50 +94,103 @@
 /*
  * Allocate a new GLvisual object.
  * Input:  rgbFlag - GL_TRUE=RGB(A) mode, GL_FALSE=Color Index mode
- *         alphaFlag - alloc software alpha buffers?
  *         dbFlag - double buffering?
  *         stereoFlag - stereo buffer?
- *         depthFits - requested minimum bits per depth buffer value
- *         stencilFits - requested minimum bits per stencil buffer value
- *         accumFits - requested minimum bits per accum buffer component
- *         indexFits - number of bits per pixel if rgbFlag==GL_FALSE
- *         red/green/blue/alphaFits - number of bits per color component
- *                                     in frame buffer for RGB(A) mode.
+ *         depthBits - requested bits per depth buffer value
+ *                     Any value in [0, 32] is acceptable but the actual
+ *                     depth type will be GLushort or GLuint as needed.
+ *         stencilBits - requested minimum bits per stencil buffer value
+ *         accumBits - requested minimum bits per accum buffer component
+ *         indexBits - number of bits per pixel if rgbFlag==GL_FALSE
+ *         red/green/blue/alphaBits - number of bits per color component
+ *                                    in frame buffer for RGB(A) mode.
+ *                                    We always use 8 in core Mesa though.
  * Return:  pointer to new GLvisual or NULL if requested parameters can't
  *          be met.
  */
-GLvisual *gl_create_visual( GLboolean rgbFlag,
-                            GLboolean alphaFlag,
-                            GLboolean dbFlag,
-                            GLboolean stereoFlag,
-                            GLint depthBits,
-                            GLint stencilBits,
-                            GLint accumBits,
-                            GLint indexBits,
-                            GLint redBits,
-                            GLint greenBits,
-                            GLint blueBits,
-                            GLint alphaBits )
-{
-   GLvisual *vis;
+GLvisual *
+_mesa_create_visual( GLboolean rgbFlag,
+                     GLboolean dbFlag,
+                     GLboolean stereoFlag,
+                     GLint redBits,
+                     GLint greenBits,
+                     GLint blueBits,
+                     GLint alphaBits,
+                     GLint indexBits,
+                     GLint depthBits,
+                     GLint stencilBits,
+                     GLint accumRedBits,
+                     GLint accumGreenBits,
+                     GLint accumBlueBits,
+                     GLint accumAlphaBits,
+                     GLint numSamples )
+{
+   GLvisual *vis = (GLvisual *) CALLOC( sizeof(GLvisual) );
+   if (vis) {
+      if (!_mesa_initialize_visual(vis, rgbFlag, dbFlag, stereoFlag,
+                                   redBits, greenBits, blueBits, alphaBits,
+                                   indexBits, depthBits, stencilBits,
+                                   accumRedBits, accumGreenBits,
+                                   accumBlueBits, accumAlphaBits,
+                                   numSamples )) {
+         FREE(vis);
+         return NULL;
+      }
+   }
+   return vis;
+}
 
-   if (depthBits > (GLint) (8*sizeof(GLdepth))) {
-      /* can't meet depth buffer requirements */
-      return NULL;
+
+/*
+ * Initialize the fields of the given GLvisual.
+ * Input:  see _mesa_create_visual() above.
+ * Return: GL_TRUE = success
+ *         GL_FALSE = failure.
+ */
+GLboolean
+_mesa_initialize_visual( GLvisual *vis,
+                         GLboolean rgbFlag,
+                         GLboolean dbFlag,
+                         GLboolean stereoFlag,
+                         GLint redBits,
+                         GLint greenBits,
+                         GLint blueBits,
+                         GLint alphaBits,
+                         GLint indexBits,
+                         GLint depthBits,
+                         GLint stencilBits,
+                         GLint accumRedBits,
+                         GLint accumGreenBits,
+                         GLint accumBlueBits,
+                         GLint accumAlphaBits,
+                         GLint numSamples )
+{
+   assert(vis);
+
+   /* This is to catch bad values from device drivers not updated for
+    * Mesa 3.3.  Some device drivers just passed 1.  That's a REALLY
+    * bad value now (a 1-bit depth buffer!?!).
+    */
+   assert(depthBits == 0 || depthBits > 1);
+
+   if (depthBits < 0 || depthBits > 32) {
+      return GL_FALSE;
    }
-   if (stencilBits > (GLint) (8*sizeof(GLstencil))) {
-      /* can't meet stencil buffer requirements */
-      return NULL;
+   if (stencilBits < 0 || stencilBits > (GLint) (8 * sizeof(GLstencil))) {
+      return GL_FALSE;
    }
-   if (accumBits > (GLint) (8*sizeof(GLaccum))) {
-      /* can't meet accum buffer requirements */
-      return NULL;
+   if (accumRedBits < 0 || accumRedBits > (GLint) (8 * sizeof(GLaccum))) {
+      return GL_FALSE;
    }
-
-   vis = (GLvisual *) CALLOC( sizeof(GLvisual) );
-   if (!vis) {
-      return NULL;
+   if (accumGreenBits < 0 || accumGreenBits > (GLint) (8 * sizeof(GLaccum))) {
+      return GL_FALSE;
    }
+   if (accumBlueBits < 0 || accumBlueBits > (GLint) (8 * sizeof(GLaccum))) {
+      return GL_FALSE;
+   }
+   if (accumAlphaBits < 0 || accumAlphaBits > (GLint) (8 * sizeof(GLaccum))) {
+      return GL_FALSE;
+   }
 
    vis->RGBAflag   = rgbFlag;
    vis->DBflag     = dbFlag;
@@ -302,23 +198,75 @@
    vis->RedBits    = redBits;
    vis->GreenBits  = greenBits;
    vis->BlueBits   = blueBits;
-   vis->AlphaBits  = alphaFlag ? 8*sizeof(GLubyte) : alphaBits;
+   vis->AlphaBits  = alphaBits;
 
-   vis->IndexBits   = indexBits;
-   vis->DepthBits   = (depthBits>0) ? 8*sizeof(GLdepth) : 0;
-   vis->AccumBits   = (accumBits>0) ? 8*sizeof(GLaccum) : 0;
-   vis->StencilBits = (stencilBits>0) ? 8*sizeof(GLstencil) : 0;
+   vis->IndexBits      = indexBits;
+   vis->DepthBits      = depthBits;
+   vis->AccumRedBits   = (accumRedBits > 0) ? (8 * sizeof(GLaccum)) : 0;
+   vis->AccumGreenBits = (accumGreenBits > 0) ? (8 * sizeof(GLaccum)) : 0;
+   vis->AccumBlueBits  = (accumBlueBits > 0) ? (8 * sizeof(GLaccum)) : 0;
+   vis->AccumAlphaBits = (accumAlphaBits > 0) ? (8 * sizeof(GLaccum)) : 0;
+   vis->StencilBits    = (stencilBits > 0) ? (8 * sizeof(GLstencil)) : 0;
+
+   if (depthBits == 0) {
+      /* Special case.  Even if we don't have a depth buffer we need
+       * good values for DepthMax for Z vertex transformation purposes.
+       */
+      vis->DepthMax = 1;
+      vis->DepthMaxF = 1.0F;
+   }
+   else if (depthBits < 32) {
+      vis->DepthMax = (1 << depthBits) - 1;
+      vis->DepthMaxF = (GLfloat) vis->DepthMax;
+   }
+   else {
+      /* Special case since shift values greater than or equal to the
+       * number of bits in the left hand expression's type are
+       * undefined.
+       */
+      vis->DepthMax = 0xffffffff;
+      vis->DepthMaxF = (GLfloat) vis->DepthMax;
+   }
+
+   return GL_TRUE;
+}
 
-   vis->SoftwareAlpha = alphaFlag;
 
-   return vis;
+/* This function should no longer be used. Use _mesa_create_visual() instead */
+GLvisual *
+gl_create_visual( GLboolean rgbFlag,
+                  GLboolean alphaFlag,
+                  GLboolean dbFlag,
+                  GLboolean stereoFlag,
+                  GLint depthBits,
+                  GLint stencilBits,
+                  GLint accumBits,
+                  GLint indexBits,
+                  GLint redBits,
+                  GLint greenBits,
+                  GLint blueBits,
+                  GLint alphaBits )
+{
+   (void) alphaFlag;
+   return _mesa_create_visual(rgbFlag, dbFlag, stereoFlag,
+                              redBits, greenBits, blueBits, alphaBits,
+                              indexBits, depthBits, stencilBits,
+                              accumBits, accumBits, accumBits, accumBits, 0);
 }
 
 
+void
+_mesa_destroy_visual( GLvisual *vis )
+{
+   FREE(vis);
+}
+
 
-void gl_destroy_visual( GLvisual *vis )
+/* obsolete */
+void
+gl_destroy_visual( GLvisual *vis )
 {
-   FREE( vis );
+   _mesa_destroy_visual(vis);
 }
 
 
@@ -340,19 +288,39 @@
 
  * Return:  pointer to new GLframebuffer struct or NULL if error.
  */
-GLframebuffer *gl_create_framebuffer( GLvisual *visual,
-                                      GLboolean softwareDepth,
-                                      GLboolean softwareStencil,
-                                      GLboolean softwareAccum,
-                                      GLboolean softwareAlpha )
+GLframebuffer *
+gl_create_framebuffer( GLvisual *visual,
+                       GLboolean softwareDepth,
+                       GLboolean softwareStencil,
+                       GLboolean softwareAccum,
+                       GLboolean softwareAlpha )
 {
-   GLframebuffer *buffer;
-
-   buffer = CALLOC_STRUCT(gl_frame_buffer);
-   if (!buffer) {
-      return NULL;
+   GLframebuffer *buffer = CALLOC_STRUCT(gl_frame_buffer);
+   assert(visual);
+   if (buffer) {
+      _mesa_initialize_framebuffer(buffer, visual,
+                                   softwareDepth, softwareStencil,
+                                   softwareAccum, softwareAlpha );
    }
+   return buffer;
+}
+
 
+/*
+ * Initialize a GLframebuffer object.
+ * Input:  See gl_create_framebuffer() above.
+ */
+void
+_mesa_initialize_framebuffer( GLframebuffer *buffer,
+                              GLvisual *visual,
+                              GLboolean softwareDepth,
+                              GLboolean softwareStencil,
+                              GLboolean softwareAccum,
+                              GLboolean softwareAlpha )
+{
+   assert(buffer);
+   assert(visual);
+
    /* sanity checks */
    if (softwareDepth ) {
       assert(visual->DepthBits > 0);
@@ -362,7 +330,9 @@
    }
    if (softwareAccum) {
       assert(visual->RGBAflag);
-      assert(visual->AccumBits > 0);
+      assert(visual->AccumRedBits > 0);
+      assert(visual->AccumGreenBits > 0);
+      assert(visual->AccumBlueBits > 0);
    }
    if (softwareAlpha) {
       assert(visual->RGBAflag);
@@ -374,20 +344,18 @@
    buffer->UseSoftwareStencilBuffer = softwareStencil;
    buffer->UseSoftwareAccumBuffer = softwareAccum;
    buffer->UseSoftwareAlphaBuffers = softwareAlpha;
-
-   return buffer;
 }
 
 
-
 /*
  * Free a framebuffer struct and its buffers.
  */
-void gl_destroy_framebuffer( GLframebuffer *buffer )
+void
+gl_destroy_framebuffer( GLframebuffer *buffer )
 {
    if (buffer) {
-      if (buffer->Depth) {
-         FREE( buffer->Depth );
+      if (buffer->DepthBuffer) {
+         FREE( buffer->DepthBuffer );
       }
       if (buffer->Accum) {
          FREE( buffer->Accum );
@@ -424,7 +392,8 @@
 /*
  * This function just calls all the various one-time-init functions in Mesa.
  */
-static void one_time_init( void )
+static void
+one_time_init( void )
 {
    static GLboolean alreadyCalled = GL_FALSE;
    _glthread_LOCK_MUTEX(OneTimeLock);
@@ -440,7 +409,7 @@
       gl_init_clip();
       gl_init_eval();
       _mesa_init_fog();
-      gl_init_math();
+      _mesa_init_math();
       gl_init_lists();
       gl_init_shade();
       gl_init_texture();
@@ -471,7 +440,8 @@
 /*
  * Allocate and initialize a shared context state structure.
  */
-static struct gl_shared_state *alloc_shared_state( void )
+static struct gl_shared_state *
+alloc_shared_state( void )
 {
    GLuint d;
    struct gl_shared_state *ss;
@@ -496,6 +466,14 @@
       ss->DefaultD[d]->RefCount++; /* don't free if not in use */
    }
 
+   ss->DefaultCubeMap = gl_alloc_texture_object(ss, 0, 6);
+   if (!ss->DefaultCubeMap) {
+      outOfMemory = GL_TRUE;
+   }
+   else {
+      ss->DefaultCubeMap->RefCount++;
+   }
+
    if (!ss->DisplayList || !ss->TexObjects || outOfMemory) {
       /* Ran out of memory at some point.  Free everything and return NULL */
       if (ss->DisplayList)
@@ -508,6 +486,8 @@
          gl_free_texture_object(ss, ss->DefaultD[2]);
       if (ss->DefaultD[3])
          gl_free_texture_object(ss, ss->DefaultD[3]);
+      if (ss->DefaultCubeMap)
+         gl_free_texture_object(ss, ss->DefaultCubeMap);
       FREE(ss);
       return NULL;
    }
@@ -520,7 +500,8 @@
 /*
  * Deallocate a shared state context and all children structures.
  */
-static void free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
+static void
+free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
 {
    /* Free display lists */
    while (1) {
@@ -553,7 +534,8 @@
  * Initialize the nth light.  Note that the defaults for light 0 are
  * different than the other lights.
  */
-static void init_light( struct gl_light *l, GLuint n )
+static void
+init_light( struct gl_light *l, GLuint n )
 {
    make_empty_list( l );
 
@@ -580,7 +562,8 @@
 
 
 
-static void init_lightmodel( struct gl_lightmodel *lm )
+static void
+init_lightmodel( struct gl_lightmodel *lm )
 {
    ASSIGN_4V( lm->Ambient, 0.2, 0.2, 0.2, 1.0 );
    lm->LocalViewer = GL_FALSE;
@@ -589,7 +572,8 @@
 }
 
 
-static void init_material( struct gl_material *m )
+static void
+init_material( struct gl_material *m )
 {
    ASSIGN_4V( m->Ambient,  0.2, 0.2, 0.2, 1.0 );
    ASSIGN_4V( m->Diffuse,  0.8, 0.8, 0.8, 1.0 );
@@ -603,7 +587,8 @@
 
 
 
-static void init_texture_unit( GLcontext *ctx, GLuint unit )
+static void
+init_texture_unit( GLcontext *ctx, GLuint unit )
 {
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
 
@@ -627,10 +612,12 @@
    texUnit->CurrentD[1] = ctx->Shared->DefaultD[1];
    texUnit->CurrentD[2] = ctx->Shared->DefaultD[2];
    texUnit->CurrentD[3] = ctx->Shared->DefaultD[3];
+   texUnit->CurrentCubeMap = ctx->Shared->DefaultCubeMap;
 }
 
 
-static void init_fallback_arrays( GLcontext *ctx )
+static void
+init_fallback_arrays( GLcontext *ctx )
 {
    struct gl_client_array *cl;
    GLuint i;
@@ -680,7 +667,8 @@
 
 
 /* Initialize a 1-D evaluator map */
-static void init_1d_map( struct gl_1d_map *map, int n, const float *initial )
+static void
+init_1d_map( struct gl_1d_map *map, int n, const float *initial )
 {
    map->Order = 1;
    map->u1 = 0.0;
@@ -695,7 +683,8 @@
 
 
 /* Initialize a 2-D evaluator map */
-static void init_2d_map( struct gl_2d_map *map, int n, const float *initial )
+static void
+init_2d_map( struct gl_2d_map *map, int n, const float *initial )
 {
    map->Uorder = 1;
    map->Vorder = 1;
@@ -712,22 +701,11 @@
 }
 
 
-static void init_color_table( struct gl_color_table *p )
-{
-   p->Table[0] = 255;
-   p->Table[1] = 255;
-   p->Table[2] = 255;
-   p->Table[3] = 255;
-   p->Size = 1;
-   p->IntFormat = GL_RGBA;
-   p->Format = GL_RGBA;
-}
-
-
 /*
  * Initialize the attribute groups in a GLcontext.
  */
-static void init_attrib_groups( GLcontext *ctx )
+static void
+init_attrib_groups( GLcontext *ctx )
 {
    GLuint i, j;
 
@@ -736,6 +714,7 @@
    /* Constants, may be overriden by device drivers */
    ctx->Const.MaxTextureLevels = MAX_TEXTURE_LEVELS;
    ctx->Const.MaxTextureSize = 1 << (MAX_TEXTURE_LEVELS - 1);
+   ctx->Const.MaxCubeTextureSize = ctx->Const.MaxTextureSize;
    ctx->Const.MaxTextureUnits = MAX_TEXTURE_UNITS;
    ctx->Const.MaxArrayLockSize = MAX_ARRAY_LOCK_SIZE;
    ctx->Const.SubPixelBits = SUB_PIXEL_BITS;
@@ -750,13 +729,17 @@
    ctx->Const.MaxLineWidthAA = MAX_LINE_WIDTH;
    ctx->Const.LineWidthGranularity = LINE_WIDTH_GRANULARITY;
    ctx->Const.NumAuxBuffers = NUM_AUX_BUFFERS;
+   ctx->Const.MaxColorTableSize = MAX_COLOR_TABLE_SIZE;
+   ctx->Const.MaxConvolutionWidth = MAX_CONVOLUTION_WIDTH;
+   ctx->Const.MaxConvolutionHeight = MAX_CONVOLUTION_HEIGHT;
+   ctx->Const.NumCompressedTextureFormats = 0;
 
    /* Modelview matrix */
    gl_matrix_ctr( &ctx->ModelView );
    gl_matrix_alloc_inv( &ctx->ModelView );
 
    ctx->ModelViewStackDepth = 0;
-   for (i = 0 ; i < MAX_MODELVIEW_STACK_DEPTH ; i++) {
+   for (i = 0; i < MAX_MODELVIEW_STACK_DEPTH - 1; i++) {
       gl_matrix_ctr( &ctx->ModelViewStack[i] );
       gl_matrix_alloc_inv( &ctx->ModelViewStack[i] );
    }
@@ -773,7 +756,7 @@
    ctx->NearFarStack[0][0] = 1.0; /* These values seem weird by make */
    ctx->NearFarStack[0][1] = 0.0; /* sense mathematically. */
 
-   for (i = 0 ; i < MAX_PROJECTION_STACK_DEPTH ; i++) {
+   for (i = 0; i < MAX_PROJECTION_STACK_DEPTH - 1; i++) {
       gl_matrix_ctr( &ctx->ProjectionStack[i] );
       gl_matrix_alloc_inv( &ctx->ProjectionStack[i] );
    }
@@ -782,11 +765,18 @@
    for (i=0; i<MAX_TEXTURE_UNITS; i++) {
       gl_matrix_ctr( &ctx->TextureMatrix[i] );
       ctx->TextureStackDepth[i] = 0;
-      for (j = 0 ; j < MAX_TEXTURE_STACK_DEPTH ; j++) {
+      for (j = 0; j < MAX_TEXTURE_STACK_DEPTH - 1; j++) {
          ctx->TextureStack[i][j].inv = 0;
       }
    }
 
+   /* Color matrix */
+   gl_matrix_ctr(&ctx->ColorMatrix);
+   ctx->ColorStackDepth = 0;
+   for (j = 0; j < MAX_COLOR_STACK_DEPTH - 1; j++) {
+      gl_matrix_ctr(&ctx->ColorStack[j]);
+   }
+
    /* Accumulate buffer group */
    ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 );
 
@@ -845,6 +835,7 @@
    ctx->Depth.Clear = 1.0;
    ctx->Depth.Func = GL_LESS;
    ctx->Depth.Mask = GL_TRUE;
+   ctx->Depth.OcclusionTest = GL_FALSE;
 
    /* Evaluators group */
    ctx->Eval.Map1Color4 = GL_FALSE;
@@ -920,12 +911,39 @@
    ctx->Hint.LineSmooth = GL_DONT_CARE;
    ctx->Hint.PolygonSmooth = GL_DONT_CARE;
    ctx->Hint.Fog = GL_DONT_CARE;
-
    ctx->Hint.AllowDrawWin = GL_TRUE;
-   ctx->Hint.AllowDrawSpn = GL_TRUE;
+   ctx->Hint.AllowDrawFrg = GL_TRUE;
    ctx->Hint.AllowDrawMem = GL_TRUE;
    ctx->Hint.StrictLighting = GL_TRUE;
+   ctx->Hint.ClipVolumeClipping = GL_DONT_CARE;
+   ctx->Hint.TextureCompression = GL_DONT_CARE;
+
+   /* Histogram group */
+   ctx->Histogram.Width = 0;
+   ctx->Histogram.Format = GL_RGBA;
+   ctx->Histogram.Sink = GL_FALSE;
+   ctx->Histogram.RedSize       = 0xffffffff;
+   ctx->Histogram.GreenSize     = 0xffffffff;
+   ctx->Histogram.BlueSize      = 0xffffffff;
+   ctx->Histogram.AlphaSize     = 0xffffffff;
+   ctx->Histogram.LuminanceSize = 0xffffffff;
+   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
+      ctx->Histogram.Count[i][0] = 0;
+      ctx->Histogram.Count[i][1] = 0;
+      ctx->Histogram.Count[i][2] = 0;
+      ctx->Histogram.Count[i][3] = 0;
+   }
+
+   /* Min/Max group */
+   ctx->MinMax.Format = GL_RGBA;
+   ctx->MinMax.Sink = GL_FALSE;
+   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
+   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
+   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
+   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
+
 
+
    /* Pipeline */
    gl_pipeline_init( ctx );
    gl_cva_init( ctx );
@@ -1022,6 +1040,29 @@
    ctx->Pixel.MapGtoG[0] = 0.0;
    ctx->Pixel.MapBtoB[0] = 0.0;
    ctx->Pixel.MapAtoA[0] = 0.0;
+   ctx->Pixel.HistogramEnabled = GL_FALSE;
+   ctx->Pixel.MinMaxEnabled = GL_FALSE;
+   ctx->Pixel.PixelTextureEnabled = GL_FALSE;
+   ctx->Pixel.FragmentRgbSource = GL_PIXEL_GROUP_COLOR_SGIS;
+   ctx->Pixel.FragmentAlphaSource = GL_PIXEL_GROUP_COLOR_SGIS;
+   ASSIGN_4V(ctx->Pixel.PostColorMatrixScale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.PostColorMatrixBias, 0.0, 0.0, 0.0, 0.0);
+   ASSIGN_4V(ctx->Pixel.ColorTableScale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.ColorTableBias, 0.0, 0.0, 0.0, 0.0);
+   ctx->Pixel.ColorTableEnabled = GL_FALSE;
+   ctx->Pixel.PostConvolutionColorTableEnabled = GL_FALSE;
+   ctx->Pixel.PostColorMatrixColorTableEnabled = GL_FALSE;
+   ctx->Pixel.Convolution1DEnabled = GL_FALSE;
+   ctx->Pixel.Convolution2DEnabled = GL_FALSE;
+   ctx->Pixel.Separable2DEnabled = GL_FALSE;
+   for (i = 0; i < 3; i++) {
+      ASSIGN_4V(ctx->Pixel.ConvolutionBorderColor[i], 0.0, 0.0, 0.0, 0.0);
+      ctx->Pixel.ConvolutionBorderMode[i] = GL_REDUCE;
+      ASSIGN_4V(ctx->Pixel.ConvolutionFilterScale[i], 1.0, 1.0, 1.0, 1.0);
+      ASSIGN_4V(ctx->Pixel.ConvolutionFilterBias[i], 0.0, 0.0, 0.0, 0.0);
+   }
+   ASSIGN_4V(ctx->Pixel.PostConvolutionScale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.PostConvolutionBias, 0.0, 0.0, 0.0, 0.0);
 
    /* Point group */
    ctx->Point.SmoothFlag = GL_FALSE;
@@ -1077,7 +1118,7 @@
    ctx->Texture.Enabled = 0;
    for (i=0; i<MAX_TEXTURE_UNITS; i++)
       init_texture_unit( ctx, i );
-   init_color_table(&ctx->Texture.Palette);
+   _mesa_init_colortable(&ctx->Texture.Palette);
 
    /* Transformation group */
    ctx->Transform.MatrixMode = GL_MODELVIEW;
@@ -1100,8 +1141,8 @@
 
 #define Sz 10
 #define Tz 14
-   ctx->Viewport.WindowMap.m[Sz] = 0.5 * DEPTH_SCALE;
-   ctx->Viewport.WindowMap.m[Tz] = 0.5 * DEPTH_SCALE;
+   ctx->Viewport.WindowMap.m[Sz] = 0.5 * ctx->Visual->DepthMaxF;
+   ctx->Viewport.WindowMap.m[Tz] = 0.5 * ctx->Visual->DepthMaxF;
 #undef Sz
 #undef Tz
 
@@ -1185,6 +1226,23 @@
    ctx->AttribStackDepth = 0;
    ctx->ClientAttribStackDepth = 0;
 
+   /* Display list */
+   ctx->CallDepth = 0;
+   ctx->ExecuteFlag = GL_TRUE;
+   ctx->CompileFlag = GL_FALSE;
+   ctx->CurrentListPtr = NULL;
+   ctx->CurrentBlock = NULL;
+   ctx->CurrentListNum = 0;
+   ctx->CurrentPos = 0;
+
+   /* Color tables */
+   _mesa_init_colortable(&ctx->ColorTable);
+   _mesa_init_colortable(&ctx->ProxyColorTable);
+   _mesa_init_colortable(&ctx->PostConvolutionColorTable);
+   _mesa_init_colortable(&ctx->ProxyPostConvolutionColorTable);
+   _mesa_init_colortable(&ctx->PostColorMatrixColorTable);
+   _mesa_init_colortable(&ctx->ProxyPostColorMatrixColorTable);
+
    /* Miscellaneous */
    ctx->NewState = NEW_ALL;
    ctx->RenderMode = GL_RENDER;
@@ -1196,18 +1254,11 @@
    ctx->NeedEyeNormals = GL_FALSE;
    ctx->vb_proj_matrix = &ctx->ModelProjectMatrix;
 
-   /* Display list */
-   ctx->CallDepth = 0;
-   ctx->ExecuteFlag = GL_TRUE;
-   ctx->CompileFlag = GL_FALSE;
-   ctx->CurrentListPtr = NULL;
-   ctx->CurrentBlock = NULL;
-   ctx->CurrentListNum = 0;
-   ctx->CurrentPos = 0;
-
    ctx->ErrorValue = (GLenum) GL_NO_ERROR;
 
    ctx->CatchSignals = GL_TRUE;
+   ctx->OcclusionResult = GL_FALSE;
+   ctx->OcclusionResultSaved = GL_FALSE;
 
    /* For debug/development only */
    ctx->NoRaster = getenv("MESA_NO_RASTER") ? GL_TRUE : GL_FALSE;
@@ -1231,7 +1282,8 @@
  * the allocations clean up and return GL_FALSE.
  * Return:  GL_TRUE=success, GL_FALSE=failure
  */
-static GLboolean alloc_proxy_textures( GLcontext *ctx )
+static GLboolean
+alloc_proxy_textures( GLcontext *ctx )
 {
    GLboolean out_of_memory;
    GLint i;
@@ -1256,9 +1308,9 @@
 
    out_of_memory = GL_FALSE;
    for (i=0;i<MAX_TEXTURE_LEVELS;i++) {
-      ctx->Texture.Proxy1D->Image[i] = gl_alloc_texture_image();
-      ctx->Texture.Proxy2D->Image[i] = gl_alloc_texture_image();
-      ctx->Texture.Proxy3D->Image[i] = gl_alloc_texture_image();
+      ctx->Texture.Proxy1D->Image[i] = _mesa_alloc_texture_image();
+      ctx->Texture.Proxy2D->Image[i] = _mesa_alloc_texture_image();
+      ctx->Texture.Proxy3D->Image[i] = _mesa_alloc_texture_image();
       if (!ctx->Texture.Proxy1D->Image[i]
           || !ctx->Texture.Proxy2D->Image[i]
           || !ctx->Texture.Proxy3D->Image[i]) {
@@ -1268,13 +1320,13 @@
    if (out_of_memory) {
       for (i=0;i<MAX_TEXTURE_LEVELS;i++) {
          if (ctx->Texture.Proxy1D->Image[i]) {
-            gl_free_texture_image(ctx->Texture.Proxy1D->Image[i]);
+            _mesa_free_texture_image(ctx->Texture.Proxy1D->Image[i]);
          }
          if (ctx->Texture.Proxy2D->Image[i]) {
-            gl_free_texture_image(ctx->Texture.Proxy2D->Image[i]);
+            _mesa_free_texture_image(ctx->Texture.Proxy2D->Image[i]);
          }
          if (ctx->Texture.Proxy3D->Image[i]) {
-            gl_free_texture_image(ctx->Texture.Proxy3D->Image[i]);
+            _mesa_free_texture_image(ctx->Texture.Proxy3D->Image[i]);
          }
       }
       gl_free_texture_object(NULL, ctx->Texture.Proxy1D);
@@ -1292,12 +1344,15 @@
 /*
  * Initialize a GLcontext struct.
  */
-GLboolean gl_initialize_context_data( GLcontext *ctx,
-                                      GLvisual *visual,
-                                      GLcontext *share_list,
-                                      void *driver_ctx,
-                                      GLboolean direct )
+GLboolean
+_mesa_initialize_context( GLcontext *ctx,
+                          GLvisual *visual,
+                          GLcontext *share_list,
+                          void *driver_ctx,
+                          GLboolean direct )
 {
+   GLuint dispatchSize;
+
    (void) direct;  /* not used */
 
    /* misc one-time initializations */
@@ -1360,10 +1415,6 @@
       ctx->Pixel.DriverReadBuffer = GL_FRONT_LEFT;
    }
 
-#ifdef PROFILE
-   init_timings( ctx );
-#endif
-
    if (!alloc_proxy_textures(ctx)) {
       free_shared_state(ctx, ctx->Shared);
       FREE(ctx->VB);
@@ -1372,9 +1423,27 @@
       return GL_FALSE;
    }
 
+   /* register the most recent extension functions with libGL */
+   _glapi_add_entrypoint("glTbufferMask3DFX", 553);
+   _glapi_add_entrypoint("glCompressedTexImage3DARB", 554);
+   _glapi_add_entrypoint("glCompressedTexImage2DARB", 555);
+   _glapi_add_entrypoint("glCompressedTexImage1DARB", 556);
+   _glapi_add_entrypoint("glCompressedTexSubImage3DARB", 557);
+   _glapi_add_entrypoint("glCompressedTexSubImage2DARB", 558);
+   _glapi_add_entrypoint("glCompressedTexSubImage1DARB", 559);
+   _glapi_add_entrypoint("glGetCompressedTexImageARB", 560);
+
+   /* Find the larger of Mesa's dispatch table and libGL's dispatch table.
+    * In practice, this'll be the same for stand-alone Mesa.  But for DRI
+    * Mesa we do this to accomodate different versions of libGL and various
+    * DRI drivers.
+    */
+   dispatchSize = MAX2(_glapi_get_dispatch_table_size(),
+                       sizeof(struct _glapi_table) / sizeof(void *));
+
    /* setup API dispatch tables */
-   ctx->Exec = CALLOC(_glapi_get_dispatch_table_size() * sizeof(void *));
-   ctx->Save = CALLOC(_glapi_get_dispatch_table_size() * sizeof(void *));
+   ctx->Exec = (struct _glapi_table *) CALLOC(dispatchSize * sizeof(void*));
+   ctx->Save = (struct _glapi_table *) CALLOC(dispatchSize * sizeof(void*));
    if (!ctx->Exec || !ctx->Save) {
       free_shared_state(ctx, ctx->Shared);
       FREE(ctx->VB);
@@ -1383,8 +1452,8 @@
          FREE(ctx->Exec);
       FREE(ctx);
    }
-   _mesa_init_exec_table( ctx->Exec );
-   _mesa_init_dlist_table( ctx->Save );
+   _mesa_init_exec_table(ctx->Exec, dispatchSize);
+   _mesa_init_dlist_table(ctx->Save, dispatchSize);
    ctx->CurrentDispatch = ctx->Exec;
 
    return GL_TRUE;
@@ -1399,18 +1468,18 @@
  *         driver_ctx - pointer to device driver's context state struct
  * Return:  pointer to a new gl_context struct or NULL if error.
  */
-GLcontext *gl_create_context( GLvisual *visual,
-                              GLcontext *share_list,
-                              void *driver_ctx,
-                              GLboolean direct )
+GLcontext *
+gl_create_context( GLvisual *visual,
+                   GLcontext *share_list,
+                   void *driver_ctx,
+                   GLboolean direct )
 {
    GLcontext *ctx = (GLcontext *) CALLOC( sizeof(GLcontext) );
    if (!ctx) {
       return NULL;
    }
 
-   if (gl_initialize_context_data(ctx, visual, share_list,
-                                  driver_ctx, direct)) {
+   if (_mesa_initialize_context(ctx, visual, share_list, driver_ctx, direct)) {
       return ctx;
    }
    else {
@@ -1425,34 +1494,35 @@
  * Free the data associated with the given context.
  * But don't free() the GLcontext struct itself!
  */
-void gl_free_context_data( GLcontext *ctx )
+void
+gl_free_context_data( GLcontext *ctx )
 {
-   GLuint i;
    struct gl_shine_tab *s, *tmps;
+   GLuint i, j;
 
    /* if we're destroying the current context, unbind it first */
    if (ctx == gl_get_current_context()) {
       gl_make_current(NULL, NULL);
    }
 
-#ifdef PROFILE
-   if (getenv("MESA_PROFILE")) {
-      print_timings( ctx );
-   }
-#endif
-
    gl_matrix_dtr( &ctx->ModelView );
-   for (i = 0 ; i < MAX_MODELVIEW_STACK_DEPTH ; i++) {
+   for (i = 0; i < MAX_MODELVIEW_STACK_DEPTH - 1; i++) {
       gl_matrix_dtr( &ctx->ModelViewStack[i] );
    }
    gl_matrix_dtr( &ctx->ProjectionMatrix );
-   for (i = 0 ; i < MAX_PROJECTION_STACK_DEPTH ; i++) {
+   for (i = 0; i < MAX_PROJECTION_STACK_DEPTH - 1; i++) {
       gl_matrix_dtr( &ctx->ProjectionStack[i] );
    }
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
+      gl_matrix_dtr( &ctx->TextureMatrix[i] );
+      for (j = 0; j < MAX_TEXTURE_STACK_DEPTH - 1; j++) {
+         gl_matrix_dtr( &ctx->TextureStack[i][j] );
+      }
+   }
 
    FREE( ctx->PB );
 
-   if(ctx->input != ctx->VB->IM)
+   if (ctx->input != ctx->VB->IM)
       gl_immediate_free( ctx->input );
 
    gl_vb_free( ctx->VB );
@@ -1515,6 +1585,11 @@
    if (ctx->EvalMap.Map2Texture4.Points)
       FREE( ctx->EvalMap.Map2Texture4.Points );
 
+   _mesa_free_colortable_data( &ctx->ColorTable );
+   _mesa_free_colortable_data( &ctx->PostConvolutionColorTable );
+   _mesa_free_colortable_data( &ctx->PostColorMatrixColorTable );
+   _mesa_free_colortable_data( &ctx->Texture.Palette );
+
    /* Free cache of immediate buffers. */
    while (ctx->nr_im_queued-- > 0) {
       struct immediate * next = ctx->freed_im_queue->next;
@@ -1532,7 +1607,8 @@
 /*
  * Destroy a GLcontext structure.
  */
-void gl_destroy_context( GLcontext *ctx )
+void
+gl_destroy_context( GLcontext *ctx )
 {
    if (ctx) {
       gl_free_context_data(ctx);
@@ -1546,7 +1622,8 @@
  * Called by the driver after both the context and driver are fully
  * initialized.  Currently just reads the config file.
  */
-void gl_context_initialize( GLcontext *ctx )
+void
+gl_context_initialize( GLcontext *ctx )
 {
    gl_read_config_file( ctx );
 }
@@ -1559,7 +1636,8 @@
  *         dst - destination context
  *         mask - bitwise OR of GL_*_BIT flags
  */
-void gl_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
+void
+gl_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
 {
    if (mask & GL_ACCUM_BUFFER_BIT) {
       MEMCPY( &dst->Accum, &src->Accum, sizeof(struct gl_accum_attrib) );
@@ -1767,7 +1845,7 @@
 void gl_problem( const GLcontext *ctx, const char *s )
 {
    fprintf( stderr, "Mesa implementation error: %s\n", s );
-   fprintf( stderr, "Report to mesa-bugs@mesa3d.org\n" );
+   fprintf( stderr, "Report to Mesa bug database at www.mesa3d.org\n" );
    (void) ctx;
 }
 
Index: xc/extras/Mesa/src/context.h
diff -u xc/extras/Mesa/src/context.h:1.3 xc/extras/Mesa/src/context.h:1.4
--- xc/extras/Mesa/src/context.h:1.3	Mon Feb 14 23:12:06 2000
+++ xc/extras/Mesa/src/context.h	Fri Jun 16 17:02:08 2000
@@ -56,34 +56,86 @@
  * the colorbuffer, depth buffer, stencil buffer and accum buffer which will
  * be used by the GL context and framebuffer.
  */
-extern GLvisual *gl_create_visual( GLboolean rgbFlag,
-                                   GLboolean alphaFlag,
-                                   GLboolean dbFlag,
-                                   GLboolean stereoFlag,
-                                   GLint depthBits,
-                                   GLint stencilBits,
-                                   GLint accumBits,
-                                   GLint indexBits,
-                                   GLint redBits,
-                                   GLint greenBits,
-                                   GLint blueBits,
-                                   GLint alphaBits );
+extern GLvisual *
+_mesa_create_visual( GLboolean rgbFlag,
+                     GLboolean dbFlag,
+                     GLboolean stereoFlag,
+                     GLint redBits,
+                     GLint greenBits,
+                     GLint blueBits,
+                     GLint alphaBits,
+                     GLint indexBits,
+                     GLint depthBits,
+                     GLint stencilBits,
+                     GLint accumRedBits,
+                     GLint accumGreenBits,
+                     GLint accumBlueBits,
+                     GLint accumAlphaBits,
+                     GLint numSamples );
+
+extern GLboolean
+_mesa_initialize_visual( GLvisual *v,
+                         GLboolean rgbFlag,
+                         GLboolean dbFlag,
+                         GLboolean stereoFlag,
+                         GLint redBits,
+                         GLint greenBits,
+                         GLint blueBits,
+                         GLint alphaBits,
+                         GLint indexBits,
+                         GLint depthBits,
+                         GLint stencilBits,
+                         GLint accumRedBits,
+                         GLint accumGreenBits,
+                         GLint accumBlueBits,
+                         GLint accumAlphaBits,
+                         GLint numSamples );
+
+/* this function is obsolete */
+extern GLvisual *
+gl_create_visual( GLboolean rgbFlag,
+                  GLboolean alphaFlag,
+                  GLboolean dbFlag,
+                  GLboolean stereoFlag,
+                  GLint depthBits,
+                  GLint stencilBits,
+                  GLint accumBits,
+                  GLint indexBits,
+                  GLint redBits,
+                  GLint greenBits,
+                  GLint blueBits,
+                  GLint alphaBits );
 
-extern void gl_destroy_visual( GLvisual *vis );
 
+extern void
+_mesa_destroy_visual( GLvisual *vis );
+
+/*obsolete */ extern void gl_destroy_visual( GLvisual *vis );
+
+
 
 /*
  * Create/destroy a GLframebuffer.  A GLframebuffer is like a GLX drawable.
  * It bundles up the depth buffer, stencil buffer and accum buffers into a
  * single entity.
  */
-extern GLframebuffer *gl_create_framebuffer( GLvisual *visual,
-                                             GLboolean softwareDepth,
-                                             GLboolean softwareStencil,
-                                             GLboolean softwareAccum,
-                                             GLboolean softwareAlpha );
+extern GLframebuffer *
+gl_create_framebuffer( GLvisual *visual,
+                       GLboolean softwareDepth,
+                       GLboolean softwareStencil,
+                       GLboolean softwareAccum,
+                       GLboolean softwareAlpha );
 
-extern void gl_destroy_framebuffer( GLframebuffer *buffer );
+extern void
+_mesa_initialize_framebuffer( GLframebuffer *fb,
+                              GLvisual *visual,
+                              GLboolean softwareDepth,
+                              GLboolean softwareStencil,
+                              GLboolean softwareAccum,
+                              GLboolean softwareAlpha );
+
+extern void
+gl_destroy_framebuffer( GLframebuffer *buffer );
 
 
 
@@ -91,36 +143,46 @@
  * Create/destroy a GLcontext.  A GLcontext is like a GLX context.  It
  * contains the rendering state.
  */
-extern GLcontext *gl_create_context( GLvisual *visual,
-                                     GLcontext *share_list,
-                                     void *driver_ctx,
-                                     GLboolean direct);
+extern GLcontext *
+gl_create_context( GLvisual *visual,
+                   GLcontext *share_list,
+                   void *driver_ctx,
+                   GLboolean direct);
+
+extern GLboolean
+_mesa_initialize_context( GLcontext *ctx,
+                          GLvisual *visual,
+                          GLcontext *share_list,
+                          void *driver_ctx,
+                          GLboolean direct );
 
-extern GLboolean gl_initialize_context_data( GLcontext *ctx,
-                                             GLvisual *visual,
-                                             GLcontext *share_list,
-                                             void *driver_ctx,
-                                             GLboolean direct );
+extern void
+gl_free_context_data( GLcontext *ctx );
 
-extern void gl_free_context_data( GLcontext *ctx );
+extern void
+gl_destroy_context( GLcontext *ctx );
 
-extern void gl_destroy_context( GLcontext *ctx );
 
+extern void
+gl_context_initialize( GLcontext *ctx );
 
-extern void gl_context_initialize( GLcontext *ctx );
 
+extern void
+gl_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
 
-extern void gl_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
 
+extern void
+gl_make_current( GLcontext *ctx, GLframebuffer *buffer );
 
-extern void gl_make_current( GLcontext *ctx, GLframebuffer *buffer );
 
+extern void
+gl_make_current2( GLcontext *ctx, GLframebuffer *drawBuffer,
+                  GLframebuffer *readBuffer );
 
-extern void gl_make_current2( GLcontext *ctx, GLframebuffer *drawBuffer,
-                              GLframebuffer *readBuffer );
 
+extern GLcontext *
+gl_get_current_context(void);
 
-extern GLcontext *gl_get_current_context(void);
 
 
 /*
@@ -141,7 +203,7 @@
 
 extern struct immediate *_mesa_CurrentInput;
 
-#define GET_CURRENT_CONTEXT(C)  GLcontext *C = _glapi_Context
+#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_Context
 
 #define GET_IMMEDIATE struct immediate *IM = _mesa_CurrentInput
 
@@ -168,35 +230,26 @@
  * Miscellaneous
  */
 
-extern void gl_problem( const GLcontext *ctx, const char *s );
-
-extern void gl_warning( const GLcontext *ctx, const char *s );
-
-extern void gl_error( GLcontext *ctx, GLenum error, const char *s );
-
-extern void gl_compile_error( GLcontext *ctx, GLenum error, const char *s );
-
+extern void
+gl_problem( const GLcontext *ctx, const char *s );
 
+extern void
+gl_warning( const GLcontext *ctx, const char *s );
 
 extern void
-_mesa_Finish( void );
+gl_error( GLcontext *ctx, GLenum error, const char *s );
 
 extern void
-_mesa_Flush( void );
+gl_compile_error( GLcontext *ctx, GLenum error, const char *s );
 
 
 
 extern void
-_mesa_init_no_op_table(struct _glapi_table *exec);
+_mesa_Finish( void );
 
 extern void
-_mesa_init_exec_table(struct _glapi_table *exec);
-
-
+_mesa_Flush( void );
 
-#ifdef PROFILE
-extern GLdouble gl_time( void );
-#endif
 
 
 #endif
Index: xc/extras/Mesa/src/copypix.c
diff -u xc/extras/Mesa/src/copypix.c:1.3 xc/extras/Mesa/src/copypix.c:1.4
--- xc/extras/Mesa/src/copypix.c:1.3	Mon Feb 14 23:12:06 2000
+++ xc/extras/Mesa/src/copypix.c	Fri Jun 16 17:02:08 2000
@@ -32,13 +32,16 @@
 #include "copypix.h"
 #include "depth.h"
 #include "feedback.h"
+#include "imaging.h"
 #include "macros.h"
 #include "mem.h"
 #include "mmath.h"
 #include "pixel.h"
+#include "pixeltex.h"
 #include "span.h"
 #include "state.h"
 #include "stencil.h"
+#include "texture.h"
 #include "types.h"
 #include "zoom.h"
 #endif
@@ -83,6 +86,7 @@
    GLubyte *saveReadAlpha;
    const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
    GLint overlapping;
+   GLboolean applyTransferOps;
 
    /* Determine if copy should be done bottom-to-top or top-to-bottom */
    if (srcy < desty) {
@@ -103,7 +107,7 @@
 
    if (ctx->Depth.Test || ctx->Fog.Enabled) {
       /* fill in array of z values */
-      GLint z = (GLint) (ctx->Current.RasterPos[2] * DEPTH_SCALE);
+      GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->Visual->DepthMax);
       for (i=0;i<width;i++) {
          zspan[i] = z;
       }
@@ -156,6 +160,15 @@
       p = NULL;
    }
 
+   applyTransferOps = ctx->Pixel.ScaleOrBiasRGBA ||
+                      ctx->Pixel.MapColorFlag ||
+                      ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+                      ctx->Pixel.ScaleOrBiasRGBApcm ||
+                      ctx->Pixel.ColorTableEnabled ||
+                      ctx->Pixel.PostColorMatrixColorTableEnabled ||
+                      ctx->Pixel.MinMaxEnabled ||
+                      ctx->Pixel.HistogramEnabled;
+
    for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
       if (overlapping) {
          MEMCPY(rgba, p, width * sizeof(GLubyte) * 4);
@@ -188,12 +201,70 @@
          ctx->ReadBuffer->Alpha = saveReadAlpha;
       }
 
-      if (ctx->Pixel.ScaleOrBiasRGBA) {
-         gl_scale_and_bias_rgba( ctx, width, rgba );
+      if (applyTransferOps) {
+         const GLfloat scale = (1.0F / 255.0F);
+         GLfloat rgbaFloat[MAX_WIDTH][4];
+         GLuint k;
+         /* convert ubyte to float */
+         for (k = 0; k < width; k++) {
+            rgbaFloat[k][RCOMP] = (GLfloat) rgba[k][RCOMP] * scale;
+            rgbaFloat[k][GCOMP] = (GLfloat) rgba[k][GCOMP] * scale;
+            rgbaFloat[k][BCOMP] = (GLfloat) rgba[k][BCOMP] * scale;
+            rgbaFloat[k][ACOMP] = (GLfloat) rgba[k][ACOMP] * scale;
+         }
+         /* scale & bias */
+         if (ctx->Pixel.ScaleOrBiasRGBA) {
+            _mesa_scale_and_bias_rgba(ctx, width, rgbaFloat);
+         }
+         /* color map lookup */
+         if (ctx->Pixel.MapColorFlag) {
+            _mesa_map_rgba(ctx, width, rgbaFloat);
+         }
+         /* GL_COLOR_TABLE lookup */
+         if (ctx->Pixel.ColorTableEnabled) {
+            _mesa_lookup_rgba(&ctx->ColorTable, width, rgbaFloat);
+         }
+         /* color matrix */
+         if (ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+             ctx->Pixel.ScaleOrBiasRGBApcm) {
+            _mesa_transform_rgba(ctx, width, rgbaFloat);
+         }
+         /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+         if (ctx->Pixel.PostColorMatrixColorTableEnabled) {
+            _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, width, rgbaFloat);
+         }
+         /* update histogram count */
+         if (ctx->Pixel.HistogramEnabled) {
+            _mesa_update_histogram(ctx, width, (CONST GLfloat (*)[4]) rgbaFloat);
+         }
+         /* update min/max */
+         if (ctx->Pixel.MinMaxEnabled) {
+            _mesa_update_minmax(ctx, width, (CONST GLfloat (*)[4]) rgbaFloat);
+         }
+         /* clamp to [0,1] and convert float back to ubyte */
+         for (k = 0; k < width; k++) {
+            GLint r = (GLint) (rgbaFloat[k][RCOMP] * 255.0F);
+            GLint g = (GLint) (rgbaFloat[k][GCOMP] * 255.0F);
+            GLint b = (GLint) (rgbaFloat[k][BCOMP] * 255.0F);
+            GLint a = (GLint) (rgbaFloat[k][ACOMP] * 255.0F);
+            rgba[k][RCOMP] = (GLubyte) CLAMP(r, 0, 255);
+            rgba[k][GCOMP] = (GLubyte) CLAMP(g, 0, 255);
+            rgba[k][BCOMP] = (GLubyte) CLAMP(b, 0, 255);
+            rgba[k][ACOMP] = (GLubyte) CLAMP(a, 0, 255);
+         }
       }
-      if (ctx->Pixel.MapColorFlag) {
-         gl_map_rgba( ctx, width, rgba );
+
+      if (ctx->Texture.ReallyEnabled && ctx->Pixel.PixelTextureEnabled) {
+         GLfloat s[MAX_WIDTH], t[MAX_WIDTH], r[MAX_WIDTH], q[MAX_WIDTH];
+         GLuint unit;
+         /* XXX not sure how multitexture is supposed to work here */
+         for (unit = 0; unit < MAX_TEXTURE_UNITS; unit++) {
+            _mesa_pixeltexgen(ctx, width, (const GLubyte (*)[4]) rgba,
+                              s, t, r, q);
+            gl_texture_pixels(ctx, unit, width, s, t, r, NULL, rgba);
+         }
       }
+
       if (quick_draw && dy >= 0 && dy < ctx->DrawBuffer->Height) {
          (*ctx->Driver.WriteRGBASpan)( ctx, width, destx, dy, 
 				       (const GLubyte (*)[4])rgba, NULL );
@@ -244,7 +315,7 @@
 
    if (ctx->Depth.Test || ctx->Fog.Enabled) {
       /* fill in array of z values */
-      GLint z = (GLint) (ctx->Current.RasterPos[2] * DEPTH_SCALE);
+      GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->Visual->DepthMax);
       for (i=0;i<width;i++) {
          zspan[i] = z;
       }
@@ -298,10 +369,10 @@
       }
 
       if (shift_or_offset) {
-         gl_shift_and_offset_ci( ctx, width, indexes );
+         _mesa_shift_and_offset_ci( ctx, width, indexes );
       }
       if (ctx->Pixel.MapColorFlag) {
-         gl_map_ci( ctx, width, indexes );
+         _mesa_map_ci( ctx, width, indexes );
       }
 
       if (zoom) {
@@ -335,7 +406,7 @@
    const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
    GLint overlapping;
 
-   if (!ctx->ReadBuffer->Depth || !ctx->DrawBuffer->Depth) {
+   if (!ctx->ReadBuffer->DepthBuffer || !ctx->DrawBuffer->DepthBuffer) {
       gl_error( ctx, GL_INVALID_OPERATION, "glCopyPixels" );
       return;
    }
@@ -401,7 +472,7 @@
 
       for (i = 0; i < width; i++) {
          GLfloat d = depth[i] * ctx->Pixel.DepthScale + ctx->Pixel.DepthBias;
-         zspan[i] = (GLint) (CLAMP( d, 0.0F, 1.0F ) * DEPTH_SCALE);
+         zspan[i] = (GLdepth) (CLAMP(d, 0.0F, 1.0F) * ctx->Visual->DepthMax);
       }
 
       if (ctx->Visual->RGBAflag) {
@@ -473,7 +544,7 @@
       }
       p = psten;
       for (j = 0; j < height; j++, ssy += stepy) {
-         gl_read_stencil_span( ctx, width, srcx, ssy, p );
+         _mesa_read_stencil_span( ctx, width, srcx, ssy, p );
          p += width;
       }
       p = psten;
@@ -491,21 +562,21 @@
          p += width;
       }
       else {
-         gl_read_stencil_span( ctx, width, srcx, sy, stencil );
+         _mesa_read_stencil_span( ctx, width, srcx, sy, stencil );
       }
 
       if (shift_or_offset) {
-         gl_shift_and_offset_stencil( ctx, width, stencil );
+         _mesa_shift_and_offset_stencil( ctx, width, stencil );
       }
       if (ctx->Pixel.MapStencilFlag) {
-         gl_map_stencil( ctx, width, stencil );
+         _mesa_map_stencil( ctx, width, stencil );
       }
 
       if (zoom) {
          gl_write_zoomed_stencil_span( ctx, width, destx, dy, stencil, desty );
       }
       else {
-         gl_write_stencil_span( ctx, width, destx, dy, stencil );
+         _mesa_write_stencil_span( ctx, width, destx, dy, stencil );
       }
    }
 
@@ -541,6 +612,14 @@
       }
       destx = (GLint) (ctx->Current.RasterPos[0] + 0.5F);
       desty = (GLint) (ctx->Current.RasterPos[1] + 0.5F);
+
+      ctx->OcclusionResult = GL_TRUE;
+
+      if (ctx->Driver.CopyPixels &&
+          (*ctx->Driver.CopyPixels)( ctx, srcx, srcy, width, height,
+                                     destx, desty, type )) {
+         return;
+      }
 
       if (type == GL_COLOR && ctx->Visual->RGBAflag) {
          copy_rgba_pixels( ctx, srcx, srcy, width, height, destx, desty );
Index: xc/extras/Mesa/src/dd.h
diff -u xc/extras/Mesa/src/dd.h:1.4 xc/extras/Mesa/src/dd.h:1.5
--- xc/extras/Mesa/src/dd.h:1.4	Thu Mar  2 08:07:03 2000
+++ xc/extras/Mesa/src/dd.h	Fri Jun 16 17:02:08 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -390,6 +390,8 @@
    /***
     *** For supporting hardware Z buffers:
     *** Either ALL or NONE of these functions must be implemented!
+    *** NOTE that Each depth value is a 32-bit GLuint.  If the depth
+    *** buffer is less than 32 bits deep then the extra upperbits are zero.
     ***/
 
    void (*WriteDepthSpan)( GLcontext *ctx, GLuint n, GLint x, GLint y,
@@ -431,13 +433,11 @@
     * Else, only write stencil[i] if mask[i] is non-zero.
     */
 
-
    void (*ReadStencilSpan)( GLcontext *ctx, GLuint n, GLint x, GLint y,
                             GLstencil stencil[] );
    /* Read a horizontal span of stencil values from the stencil buffer.
     */
 
-
    void (*WriteStencilPixels)( GLcontext *ctx, GLuint n,
                                const GLint x[], const GLint y[],
                                const GLstencil stencil[],
@@ -454,18 +454,10 @@
     */
   
 
-
    /***
-    *** Accelerated point, line, polygon, glDrawPixels and glBitmap functions:
+    *** glDraw/Read/CopyPixels and glBitmap functions:
     ***/
 
-   points_func   PointsFunc;
-   line_func     LineFunc;
-   triangle_func TriangleFunc;
-   quad_func     QuadFunc;
-   rect_func     RectFunc;    
-   
-
    GLboolean (*DrawPixels)( GLcontext *ctx,
                             GLint x, GLint y, GLsizei width, GLsizei height,
                             GLenum format, GLenum type,
@@ -477,6 +469,25 @@
     * must do the job.
     */
 
+   GLboolean (*ReadPixels)( GLcontext *ctx,
+                            GLint x, GLint y, GLsizei width, GLsizei height,
+                            GLenum format, GLenum type,
+                            const struct gl_pixelstore_attrib *unpack,
+                            GLvoid *dest );
+   /* Called by glReadPixels.
+    * Return GL_TRUE if operation completed, else return GL_FALSE.
+    * This function must respect all glPixelTransfer settings.
+    */
+
+   GLboolean (*CopyPixels)( GLcontext *ctx,
+                            GLint srcx, GLint srcy,
+                            GLsizei width, GLsizei height,
+                            GLint dstx, GLint dsty, GLenum type );
+   /* Do a glCopyPixels.  Return GL_TRUE if operation completed, else
+    * return GL_FALSE.  This function must respect all rasterization
+    * state, glPixelTransfer, glPixelZoom, etc.
+    */
+
    GLboolean (*Bitmap)( GLcontext *ctx,
                         GLint x, GLint y, GLsizei width, GLsizei height,
                         const struct gl_pixelstore_attrib *unpack,
@@ -484,78 +495,17 @@
    /* This is called by glBitmap.  Works the same as DrawPixels, above.
     */
 
-   void (*RenderStart)( GLcontext *ctx );
-   void (*RenderFinish)( GLcontext *ctx );
-    /* KW: These replace Begin and End, and have more relaxed semantics.
-     * They are called prior-to and after one or more vb flush, and are
-     * thus decoupled from the gl_begin/gl_end pairs, which are possibly 
-     * more frequent.  If a begin/end pair covers >1 vertex buffer, these
-     * are called at most once for the pair. (a bit broken at present)
-     */
-
-   void (*RasterSetup)( struct vertex_buffer *VB, GLuint start, GLuint end );
-   /* This function, if not NULL, is called whenever new window coordinates
-    * are put in the vertex buffer.  The vertices in question are those n
-    * such that start <= n < end.
-    * The device driver can convert the window coords to its own specialized
-    * format.  The 3Dfx driver uses this.
-    *
-    * Note: Deprecated in favour of RegisterPipelineStages, below.
-    */
-
-
-   render_func *RenderVBClippedTab;
-   render_func *RenderVBCulledTab;
-   render_func *RenderVBRawTab;
-   /* These function tables allow the device driver to rasterize an
-    * entire begin/end group of primitives at once.  See the
-    * gl_render_vb() function in vbrender.c for more details.  
-    */
-
-
-   void (*ReducedPrimitiveChange)( GLcontext *ctx, GLenum primitive );
-   /* If registered, this will be called when rendering transitions between
-    * points, lines and triangles.  It is not called on transitions between 
-    * primtives such as GL_TRIANGLES and GL_TRIANGLE_STRIPS, or between
-    * triangles and quads or triangles and polygons.
-    */
 
-   GLuint TriangleCaps;
-   /* Holds a list of the reasons why we might normally want to call
-    * render_triangle, but which are in fact implemented by the
-    * driver.  The FX driver sets this to DD_TRI_CULL, and will soon
-    * implement DD_TRI_OFFSET.
-    */
-
-
-   GLboolean (*MultipassFunc)( struct vertex_buffer *VB, GLuint passno );
-   /* Driver may request additional render passes by returning GL_TRUE
-    * when this function is called.  This function will be called
-    * after the first pass, and passes will be made until the function
-    * returns GL_FALSE.  If no function is registered, only one pass
-    * is made.  
-    * 
-    * This function will be first invoked with passno == 1.
-    */
-
    /***
     *** Texture mapping functions:
     ***/
 
-   void (*TexEnv)( GLcontext *ctx, GLenum pname, const GLfloat *param );
-   /*
-    * Called whenever glTexEnv*() is called.
-    * Pname will be one of GL_TEXTURE_ENV_MODE or GL_TEXTURE_ENV_COLOR.
-    * If pname is GL_TEXTURE_ENV_MODE then param will be one
-    * of GL_MODULATE, GL_BLEND, GL_DECAL, or GL_REPLACE.
-    */
-
    void (*TexImage)( GLcontext *ctx, GLenum target,
                      struct gl_texture_object *tObj, GLint level,
                      GLint internalFormat,
                      const struct gl_texture_image *image );
-   /*
-    * Called whenever a texture object's image is changed.
+   /* XXX this function is obsolete */
+   /* Called whenever a texture object's image is changed.
     *    texObject is the number of the texture object being changed.
     *    level indicates the mipmap level.
     *    internalFormat is the format in which the texture is to be stored.
@@ -569,70 +519,310 @@
                         GLsizei width, GLsizei height,
                         GLint internalFormat,
                         const struct gl_texture_image *image );
-   /*
-    * Called from glTexSubImage() to define a sub-region of a texture.
+   /* XXX this function is obsolete */
+   /* Called from glTexSubImage() to define a sub-region of a texture.
+    */
+
+
+   GLboolean (*TexImage1D)( GLcontext *ctx, GLenum target, GLint level,
+                            GLenum format, GLenum type, const GLvoid *pixels,
+                            const struct gl_pixelstore_attrib *packing,
+                            struct gl_texture_object *texObj,
+                            struct gl_texture_image *texImage,
+                            GLboolean *retainInternalCopy );
+   GLboolean (*TexImage2D)( GLcontext *ctx, GLenum target, GLint level,
+                            GLenum format, GLenum type, const GLvoid *pixels,
+                            const struct gl_pixelstore_attrib *packing,
+                            struct gl_texture_object *texObj,
+                            struct gl_texture_image *texImage,
+                            GLboolean *retainInternalCopy );
+   GLboolean (*TexImage3D)( GLcontext *ctx, GLenum target, GLint level,
+                            GLenum format, GLenum type, const GLvoid *pixels,
+                            const struct gl_pixelstore_attrib *packing,
+                            struct gl_texture_object *texObj,
+                            struct gl_texture_image *texImage,
+                            GLboolean *retainInternalCopy );
+   /* Called by glTexImage1/2/3D.
+    * Will not be called if any glPixelTransfer operations are enabled.
+    * Arguments:
+    *   <target>, <level>, <format>, <type> and <pixels> are user specified.
+    *   <packing> indicates the image packing of pixels.
+    *   <texObj> is the target texture object.
+    *   <texImage> is the target texture image.  It will have the texture
+    *      width, height, depth, border and internalFormat information.
+    *   <retainInternalCopy> is returned by this function and indicates whether
+    *      core Mesa should keep an internal copy of the texture image.
+    * Return GL_TRUE if operation completed, return GL_FALSE if core Mesa
+    * should do the job.  If GL_FALSE is returned, this function will be
+    * called a second time after the texture image has been unpacked into
+    * GLubytes.  It may be easier for the driver to handle then.
+    */
+
+   GLboolean (*TexSubImage1D)( GLcontext *ctx, GLenum target, GLint level,
+                               GLint xoffset, GLsizei width,
+                               GLenum format, GLenum type,
+                               const GLvoid *pixels,
+                               const struct gl_pixelstore_attrib *packing,
+                               struct gl_texture_object *texObj,
+                               struct gl_texture_image *texImage );
+   GLboolean (*TexSubImage2D)( GLcontext *ctx, GLenum target, GLint level,
+                               GLint xoffset, GLint yoffset,
+                               GLsizei width, GLsizei height,
+                               GLenum format, GLenum type,
+                               const GLvoid *pixels,
+                               const struct gl_pixelstore_attrib *packing,
+                               struct gl_texture_object *texObj,
+                               struct gl_texture_image *texImage );
+   GLboolean (*TexSubImage3D)( GLcontext *ctx, GLenum target, GLint level,
+                               GLint xoffset, GLint yoffset, GLint zoffset,
+                               GLsizei width, GLsizei height, GLint depth,
+                               GLenum format, GLenum type,
+                               const GLvoid *pixels,
+                               const struct gl_pixelstore_attrib *packing,
+                               struct gl_texture_object *texObj,
+                               struct gl_texture_image *texImage );
+   /* Called by glTexSubImage1/2/3D.
+    * Will not be called if any glPixelTransfer operations are enabled.
+    * Arguments:
+    *   <target>, <level>, <xoffset>, <yoffset>, <zoffset>, <width>, <height>,
+    *      <depth>, <format>, <type> and <pixels> are user specified.
+    *   <packing> indicates the image packing of pixels.
+    *   <texObj> is the target texture object.
+    *   <texImage> is the target texture image.  It will have the texture
+    *      width, height, border and internalFormat information.
+    * Return GL_TRUE if operation completed, return GL_FALSE if core Mesa
+    * should do the job.  If GL_FALSE is returned, then TexImage1/2/3D will
+    * be called with the complete texture image.
+    */
+      
+   GLboolean (*CopyTexImage1D)( GLcontext *ctx, GLenum target, GLint level,
+                                GLenum internalFormat, GLint x, GLint y,
+                                GLsizei width, GLint border );
+   GLboolean (*CopyTexImage2D)( GLcontext *ctx, GLenum target, GLint level,
+                                GLenum internalFormat, GLint x, GLint y,
+                                GLsizei width, GLsizei height, GLint border );
+   /* Called by glCopyTexImage1D and glCopyTexImage2D.
+    * Will not be called if any glPixelTransfer operations are enabled.
+    * Return GL_TRUE if operation completed, return GL_FALSE if core Mesa
+    * should do the job.
+    */
+
+   GLboolean (*CopyTexSubImage1D)( GLcontext *ctx, GLenum target, GLint level,
+                                   GLint xoffset,
+                                   GLint x, GLint y, GLsizei width );
+   GLboolean (*CopyTexSubImage2D)( GLcontext *ctx, GLenum target, GLint level,
+                                   GLint xoffset, GLint yoffset,
+                                   GLint x, GLint y,
+                                   GLsizei width, GLsizei height );
+   GLboolean (*CopyTexSubImage3D)( GLcontext *ctx, GLenum target, GLint level,
+                                   GLint xoffset, GLint yoffset, GLint zoffset,
+                                   GLint x, GLint y,
+                                   GLsizei width, GLsizei height );
+   /* Called by glCopyTexSubImage1/2/3D.
+    * Will not be called if any glPixelTransfer operations are enabled.
+    * Return GL_TRUE if operation completed, return GL_FALSE if core Mesa
+    * should do the job.
+    */
+
+   GLvoid *(*GetTexImage)( GLcontext *ctx, GLenum target, GLint level,
+                           const struct gl_texture_object *texObj,
+                           GLenum *formatOut, GLenum *typeOut,
+                           GLboolean *freeImageOut );
+   /* Called by glGetTexImage or by core Mesa when a texture image
+    * is needed for software fallback rendering.
+    * Return the address of the texture image or NULL if failure.
+    * The image must be tightly packed (i.e. row stride = image width)
+    * Return the image's format and type in formatOut and typeOut.
+    * The format and type must be values which are accepted by glTexImage.
+    * Set the freeImageOut flag if the returned image should be deallocated
+    * with FREE() when finished.
+    * The size of the image can be deduced from the target and level.
+    * Core Mesa will perform any image format/type conversions that are needed.
+    */
+
+   GLboolean (*CompressedTexImage1D)( GLcontext *ctx, GLenum target,
+                                      GLint level, const GLvoid *data,
+                                      struct gl_texture_object *texObj,
+                                      struct gl_texture_image *texImage,
+                                      GLboolean *retainInternalCopy);
+   GLboolean (*CompressedTexImage2D)( GLcontext *ctx, GLenum target,
+                                      GLint level, const GLvoid *data,
+                                      struct gl_texture_object *texObj,
+                                      struct gl_texture_image *texImage,
+                                      GLboolean *retainInternalCopy);
+   GLboolean (*CompressedTexImage3D)( GLcontext *ctx, GLenum target,
+                                      GLint level, const GLvoid *data,
+                                      struct gl_texture_object *texObj,
+                                      struct gl_texture_image *texImage,
+                                      GLboolean *retainInternalCopy);
+   /* Called by glCompressedTexImage1/2/3D.
+    * Arguments:
+    *   <target>, <level>, <internalFormat>, <data> are user specified.
+    *   <texObj> is the target texture object.
+    *   <texImage> is the target texture image.  It will have the texture
+    *      width, height, depth, border and internalFormat information.
+    *   <retainInternalCopy> is returned by this function and indicates whether
+    *      core Mesa should keep an internal copy of the texture image.
+    * Return GL_TRUE if operation completed, return GL_FALSE if core Mesa
+    * should do the job.
+    */
+
+   GLboolean (*CompressedTexSubImage1D)( GLcontext *ctx, GLenum target,
+                                         GLint level, GLint xoffset,
+                                         GLsizei width, GLenum format,
+                                         GLsizei imageSize, const GLvoid *data,
+                                         struct gl_texture_object *texObj,
+                                         struct gl_texture_image *texImage );
+   GLboolean (*CompressedTexSubImage2D)( GLcontext *ctx, GLenum target,
+                                         GLint level, GLint xoffset,
+                                         GLint yoffset, GLsizei width,
+                                         GLint height, GLenum format,
+                                         GLsizei imageSize, const GLvoid *data,
+                                         struct gl_texture_object *texObj,
+                                         struct gl_texture_image *texImage );
+   GLboolean (*CompressedTexSubImage3D)( GLcontext *ctx, GLenum target,
+                                         GLint level, GLint xoffset,
+                                         GLint yoffset, GLint zoffset,
+                                         GLsizei width, GLint height,
+                                         GLint depth, GLenum format,
+                                         GLsizei imageSize, const GLvoid *data,
+                                         struct gl_texture_object *texObj,
+                                         struct gl_texture_image *texImage );
+   /* Called by glCompressedTexSubImage1/2/3D.
+    * Arguments:
+    *   <target>, <level>, <x/z/zoffset>, <width>, <height>, <depth>,
+    *      <imageSize>, and <data> are user specified.
+    *   <texObj> is the target texture object.
+    *   <texImage> is the target texture image.  It will have the texture
+    *      width, height, depth, border and internalFormat information.
+    * Return GL_TRUE if operation completed, return GL_FALSE if core Mesa
+    * should do the job.
+    */
+
+   void (*GetCompressedTexImage)( GLcontext *ctx, GLenum target,
+                                  GLint lod, void *image,
+                                  const struct gl_texture_object *texObj,
+                                  struct gl_texture_image *texImage );
+   /* Called by glGetCompressedTexImageARB.
+    * <target>, <lod>, <image> are specified by user.
+    * <texObj> is the source texture object.
+    * <texImage> is the source texture image.
+    */
+
+   void (*TexEnv)( GLcontext *ctx, GLenum target, GLenum pname,
+                   const GLfloat *param );
+   /* Called by glTexEnv*().
     */
 
    void (*TexParameter)( GLcontext *ctx, GLenum target,
-                         struct gl_texture_object *tObj,
+                         struct gl_texture_object *texObj,
                          GLenum pname, const GLfloat *params );
-   /*
-    * Called whenever glTexParameter*() is called.
-    *    target is GL_TEXTURE_1D or GL_TEXTURE_2D
-    *    texObject is the texture object to modify
-    *    pname is one of GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER,
-    *       GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, or GL_TEXTURE_BORDER_COLOR.
-    *    params is dependant on pname.  See man glTexParameter.
+   /* Called by glTexParameter*().
+    *    <target> is user specified
+    *    <texObj> the texture object to modify
+    *    <pname> is one of GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER,
+    *       GL_TEXTURE_WRAP_[STR], or GL_TEXTURE_BORDER_COLOR.
+    *    <params> is user specified.
     */
 
    void (*BindTexture)( GLcontext *ctx, GLenum target,
                         struct gl_texture_object *tObj );
-   /*
-    * Called whenever glBindTexture() is called.  This specifies which
-    * texture is to be the current one.  No dirty flags will be set.
+   /* Called by glBindTexture().
     */
 
    void (*DeleteTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
-   /*
-    * Called when a texture object is about to be deallocated.  Driver
+   /* Called when a texture object is about to be deallocated.  Driver
     * should free anything attached to the DriverData pointers.
     */
 
-   void (*UpdateTexturePalette)( GLcontext *ctx,
-                                 struct gl_texture_object *tObj );
-   /*
-    * Called when the texture's color lookup table is changed.
-    * If tObj is NULL then the shared texture palette ctx->Texture.Palette
-    * was changed.
+   GLboolean (*IsTextureResident)( GLcontext *ctx, 
+                                   struct gl_texture_object *t );
+   /* Called by glAreTextureResident().
     */
 
-   void (*UseGlobalTexturePalette)( GLcontext *ctx, GLboolean state );
-   /*
-    * Called via glEnable/Disable(GL_SHARED_TEXTURE_PALETTE_EXT)
+   void (*PrioritizeTexture)( GLcontext *ctx,  struct gl_texture_object *t,
+                              GLclampf priority );
+   /* Called by glPrioritizeTextures().
     */
 
    void (*ActiveTexture)( GLcontext *ctx, GLuint texUnitNumber );
-   /*
-    * Called by glActiveTextureARB to set current texture unit.
+   /* Called by glActiveTextureARB to set current texture unit.
+    */
+
+   void (*UpdateTexturePalette)( GLcontext *ctx,
+                                 struct gl_texture_object *tObj );
+   /* Called when the texture's color lookup table is changed.
+    * If tObj is NULL then the shared texture palette ctx->Texture.Palette
+    * is to be updated.
     */
 
 
-   GLboolean (*IsTextureResident)( GLcontext *ctx, 
-				   struct gl_texture_object *t );
-   /*
-    * Allows the driver to implement the AreTexturesResident tests without
-    * knowing about Mesa's internal hash tables for textures.
+
+   /***
+    *** Accelerated point, line, polygon, glDrawPixels and glBitmap functions:
+    ***/
+
+   points_func   PointsFunc;
+   line_func     LineFunc;
+   triangle_func TriangleFunc;
+   quad_func     QuadFunc;
+   rect_func     RectFunc;    
+   
+
+   /***
+    *** Transformation/Rendering functions
+    ***/
+
+   void (*RenderStart)( GLcontext *ctx );
+   void (*RenderFinish)( GLcontext *ctx );
+    /* KW: These replace Begin and End, and have more relaxed semantics.
+     * They are called prior-to and after one or more vb flush, and are
+     * thus decoupled from the gl_begin/gl_end pairs, which are possibly 
+     * more frequent.  If a begin/end pair covers >1 vertex buffer, these
+     * are called at most once for the pair. (a bit broken at present)
+     */
+
+   void (*RasterSetup)( struct vertex_buffer *VB, GLuint start, GLuint end );
+   /* This function, if not NULL, is called whenever new window coordinates
+    * are put in the vertex buffer.  The vertices in question are those n
+    * such that start <= n < end.
+    * The device driver can convert the window coords to its own specialized
+    * format.  The 3Dfx driver uses this.
+    *
+    * Note: Deprecated in favour of RegisterPipelineStages, below.
     */
 
-   void (*PrioritizeTexture)( GLcontext *ctx, 
-			      struct gl_texture_object *t,
-			      GLclampf priority );
-   /*
-    * Notify driver of priority change for a texture.
+   render_func *RenderVBClippedTab;
+   render_func *RenderVBCulledTab;
+   render_func *RenderVBRawTab;
+   /* These function tables allow the device driver to rasterize an
+    * entire begin/end group of primitives at once.  See the
+    * gl_render_vb() function in vbrender.c for more details.  
     */
 
+   void (*ReducedPrimitiveChange)( GLcontext *ctx, GLenum primitive );
+   /* If registered, this will be called when rendering transitions between
+    * points, lines and triangles.  It is not called on transitions between 
+    * primtives such as GL_TRIANGLES and GL_TRIANGLE_STRIPS, or between
+    * triangles and quads or triangles and polygons.
+    */
 
+   GLuint TriangleCaps;
+   /* Holds a list of the reasons why we might normally want to call
+    * render_triangle, but which are in fact implemented by the
+    * driver.  The FX driver sets this to DD_TRI_CULL, and will soon
+    * implement DD_TRI_OFFSET.
+    */
 
+   GLboolean (*MultipassFunc)( struct vertex_buffer *VB, GLuint passno );
+   /* Driver may request additional render passes by returning GL_TRUE
+    * when this function is called.  This function will be called
+    * after the first pass, and passes will be made until the function
+    * returns GL_FALSE.  If no function is registered, only one pass
+    * is made.  
+    * 
+    * This function will be first invoked with passno == 1.
+    */
 
    /***
     *** NEW in Mesa 3.x
@@ -704,7 +894,11 @@
    void (*Lightfv)(GLcontext *ctx, GLenum light,
 		   GLenum pname, const GLfloat *params, GLint nparams );
    void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params);
+   void (*LineStipple)(GLcontext *ctx, GLint factor, GLushort pattern );
+   void (*LineWidth)(GLcontext *ctx, GLfloat width);
+   void (*LogicOpcode)(GLcontext *ctx, GLenum opcode);
    void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode);
+   void (*PolygonStipple)(GLcontext *ctx, const GLubyte *mask );
    void (*Scissor)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
    void (*ShadeModel)(GLcontext *ctx, GLenum mode);
    void (*ClearStencil)(GLcontext *ctx, GLint s);
Index: xc/extras/Mesa/src/ddsample.c
diff -u xc/extras/Mesa/src/ddsample.c:1.3 xc/extras/Mesa/src/ddsample.c:1.4
--- xc/extras/Mesa/src/ddsample.c:1.3	Mon Feb 14 23:12:08 2000
+++ xc/extras/Mesa/src/ddsample.c	Fri Jun 16 17:02:08 2000
@@ -51,7 +51,14 @@
  * the core Mesa library.
  */
 
+/*
+ * XXX XXX
+ * THIS FILE IS VERY OUT OF DATE!  LOOK AT OSmesa/osmesa.c FOR A BETTER
+ * EXAMPLE DRIVER!
+ */
+
 
+
 #ifdef PC_HEADER
 #include "all.h"
 #else
@@ -239,11 +246,21 @@
 
 
 
+/*
+ * Set the current reading buffer.
+ */
+static void set_read_buffer( GLcontext *ctx, GLframebuffer *bufer,
+                             GLenum mode )
+{
+   struct foo_mesa_context *foo = (struct foo_mesa_context *) ctx->DriverCtx;
+   setup_DD_pointers( ctx );
+}
+
+
 /*
- * Set the current drawing/reading buffer, return GL_TRUE or GL_FALSE
- * for success/failure.
+ * Set the destination/draw buffer.
  */
-static GLboolean set_buffer( GLcontext *ctx, GLenum mode )
+static GLboolean set_draw_buffer( GLcontext *ctx, GLenum mode )
 {
    struct foo_mesa_context *foo = (struct foo_mesa_context *) ctx->DriverCtx;
    setup_DD_pointers( ctx );
@@ -311,8 +328,8 @@
    for (i=first;i<=last;i++) {
       if (VB->ClipMask[i]==0) {
          int x, y;
-         x =       (GLint) VB->Win[i][0];
-         y = FLIP( (GLint) VB->Win[i][1] );
+         x =       (GLint) VB->Win.data[i][0];
+         y = FLIP( (GLint) VB->Win.data[i][1] );
          WriteRGBAPixel( x, y, VB->ColorPtr->data[i] );
       }
    }
@@ -332,10 +349,10 @@
 
    pixel = VB->ColorPtr->data[pv];
 
-   x0 =       (int) VB->Win[v0][0];
-   y0 = FLIP( (int) VB->Win[v0][1] );
-   x1 =       (int) VB->Win[v1][0];
-   y1 = FLIP( (int) VB->Win[v1][1] );
+   x0 =       (int) VB->Win.data[v0][0];
+   y0 = FLIP( (int) VB->Win.data[v0][1] );
+   x1 =       (int) VB->Win.data[v1][0];
+   y1 = FLIP( (int) VB->Win.data[v1][1] );
 
    /* Draw line from (x0,y0) to (x1,y1) with current pixel color/index */
 }
@@ -615,7 +632,8 @@
    ctx->Driver.Index = set_index;
    ctx->Driver.Color = set_color;
 
-   ctx->Driver.SetBuffer = set_buffer;
+   ctx->Driver.SetDrawBuffer = set_draw_buffer;
+   ctx->Driver.SetReadBuffer = set_read_buffer;
    ctx->Driver.GetBufferSize = get_buffer_size;
 
    ctx->Driver.PointsFunc = fast_points_function;
@@ -730,7 +748,11 @@
       return NULL;
    }
 
-   b->gl_buffer = gl_create_framebuffer( visual->gl_visual );
+   b->gl_buffer = gl_create_framebuffer( visual->gl_visual,
+                                         visual->gl_visual->DepthBits > 0,
+                                         visual->gl_visual->StencilBits > 0,
+                                         visual->gl_visual->AccumBits > 0,
+                                         visual->gl_visual->AlphaBits > 0 );
    b->the_window = your_window_id;
 
    /* other stuff */
@@ -769,7 +791,7 @@
 
 
    /* and then, finally let the context examine your initializations */
-   gl_context_initialize( c->gl_ctx );
+   _mesa_initialize_context( c->gl_ctx );
 
 
    return c;
Index: xc/extras/Mesa/src/depth.c
diff -u xc/extras/Mesa/src/depth.c:1.3 xc/extras/Mesa/src/depth.c:1.4
--- xc/extras/Mesa/src/depth.c:1.3	Mon Feb 14 23:12:09 2000
+++ xc/extras/Mesa/src/depth.c	Fri Jun 16 17:02:08 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -124,23 +124,546 @@
 
 
 /**********************************************************************/
+/*****                           Misc                             *****/
+/**********************************************************************/
+
+/*
+ * Return address of depth buffer value for given window coord.
+ */
+GLvoid *
+_mesa_zbuffer_address(GLcontext *ctx, GLint x, GLint y)
+{
+   if (ctx->Visual->DepthBits <= 16)
+      return (GLushort *) ctx->DrawBuffer->DepthBuffer + ctx->DrawBuffer->Width * y + x;
+   else
+      return (GLuint *) ctx->DrawBuffer->DepthBuffer + ctx->DrawBuffer->Width * y + x;
+}
+
+
+#define Z_ADDRESS16( CTX, X, Y )				\
+            ( ((GLushort *) (CTX)->DrawBuffer->DepthBuffer)	\
+              + (CTX)->DrawBuffer->Width * (Y) + (X) )
+
+#define Z_ADDRESS32( CTX, X, Y )				\
+            ( ((GLuint *) (CTX)->DrawBuffer->DepthBuffer)	\
+              + (CTX)->DrawBuffer->Width * (Y) + (X) )
+
+
+
+/**********************************************************************/
 /*****                   Depth Testing Functions                  *****/
 /**********************************************************************/
 
 
+/*
+ * Do depth test for an array of fragments.  This is used both for
+ * software and hardware Z buffers.
+ * Input:  zbuffer - array of z values in the zbuffer
+ *         z - array of fragment z values
+ * Return:  number of fragments which pass the test.
+ */
+static GLuint
+depth_test_span16( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                   GLushort zbuffer[], const GLdepth z[], GLubyte mask[] )
+{
+   GLuint passed = 0;
+
+   /* switch cases ordered from most frequent to less frequent */
+   switch (ctx->Depth.Func) {
+      case GL_LESS:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  zbuffer[i] = z[i];
+		  passed++;
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer or mask */
+	    passed = n;
+	 }
+	 break;
+      case GL_NEVER:
+         BZERO(mask, n * sizeof(GLubyte));
+	 break;
+      default:
+         gl_problem(ctx, "Bad depth func in depth_test_span16");
+   }
+
+   return passed;
+}
+
+
+static GLuint
+depth_test_span32( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                   GLuint zbuffer[], const GLdepth z[], GLubyte mask[] )
+{
+   GLuint passed = 0;
+
+   /* switch cases ordered from most frequent to less frequent */
+   switch (ctx->Depth.Func) {
+      case GL_LESS:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  zbuffer[i] = z[i];
+		  passed++;
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer or mask */
+	    passed = n;
+	 }
+	 break;
+      case GL_NEVER:
+         BZERO(mask, n * sizeof(GLubyte));
+	 break;
+      default:
+         gl_problem(ctx, "Bad depth func in depth_test_span32");
+   }
+
+   return passed;
+}
+
+
+
 /*
- * Do depth test for an array of fragments.  This is used both for
- * software and hardware Z buffers.
- * Input:  zbuffer - array of z values in the zbuffer
- *         z - array of fragment z values
- * Return:  number of fragments which pass the test.
+ * Apply depth test to span of fragments.  Hardware or software z buffer.
  */
-static GLuint
-depth_test_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                 GLdepth zbuffer[], const GLdepth z[], GLubyte mask[] )
+GLuint
+_mesa_depth_test_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       const GLdepth z[], GLubyte mask[] )
 {
-   GLuint passed = 0;
+   if (ctx->Driver.ReadDepthSpan) {
+      /* hardware-based depth buffer */
+      GLdepth zbuffer[MAX_WIDTH];
+      GLuint passed;
+      (*ctx->Driver.ReadDepthSpan)(ctx, n, x, y, zbuffer);
+      passed = depth_test_span32(ctx, n, x, y, zbuffer, z, mask);
+      assert(ctx->Driver.WriteDepthSpan);
+      (*ctx->Driver.WriteDepthSpan)(ctx, n, x, y, zbuffer, mask);
+      return passed;
+   }
+   else {
+      /* software depth buffer */
+      if (ctx->Visual->DepthBits <= 16) {
+         GLushort *zptr = (GLushort *) Z_ADDRESS16(ctx, x, y);
+         GLuint passed = depth_test_span16(ctx, n, x, y, zptr, z, mask);
+         return passed;
+      }
+      else {
+         GLuint *zptr = (GLuint *) Z_ADDRESS32(ctx, x, y);
+         GLuint passed = depth_test_span32(ctx, n, x, y, zptr, z, mask);
+         return passed;
+      }
+   }
+}
+
+
 
+
+/*
+ * Do depth testing for an array of fragments using software Z buffer.
+ */
+static void
+software_depth_test_pixels16( GLcontext *ctx, GLuint n,
+                              const GLint x[], const GLint y[],
+                              const GLdepth z[], GLubyte mask[] )
+{
    /* switch cases ordered from most frequent to less frequent */
    switch (ctx->Depth.Func) {
       case GL_LESS:
@@ -149,10 +672,10 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] < zbuffer[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] < *zptr) {
 		     /* pass */
-		     zbuffer[i] = z[i];
-		     passed++;
+		     *zptr = z[i];
 		  }
 		  else {
 		     /* fail */
@@ -166,11 +689,12 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] < zbuffer[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] < *zptr) {
 		     /* pass */
-		     passed++;
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -178,16 +702,18 @@
 	 }
 	 break;
       case GL_LEQUAL:
-	 if (ctx->Depth.Mask) {
+         if (ctx->Depth.Mask) {
 	    /* Update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] <= zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] <= *zptr) {
+		     /* pass */
+		     *zptr = z[i];
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -196,13 +722,14 @@
 	 else {
 	    /* Don't update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] <= zbuffer[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] <= *zptr) {
 		     /* pass */
-		     passed++;
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -210,16 +737,18 @@
 	 }
 	 break;
       case GL_GEQUAL:
-	 if (ctx->Depth.Mask) {
+         if (ctx->Depth.Mask) {
 	    /* Update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] >= zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] >= *zptr) {
+		     /* pass */
+		     *zptr = z[i];
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -228,13 +757,14 @@
 	 else {
 	    /* Don't update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] >= zbuffer[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] >= *zptr) {
 		     /* pass */
-		     passed++;
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -242,16 +772,18 @@
 	 }
 	 break;
       case GL_GREATER:
-	 if (ctx->Depth.Mask) {
+         if (ctx->Depth.Mask) {
 	    /* Update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] > zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] > *zptr) {
+		     /* pass */
+		     *zptr = z[i];
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -260,13 +792,14 @@
 	 else {
 	    /* Don't update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] > zbuffer[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] > *zptr) {
 		     /* pass */
-		     passed++;
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -274,16 +807,18 @@
 	 }
 	 break;
       case GL_NOTEQUAL:
-	 if (ctx->Depth.Mask) {
+         if (ctx->Depth.Mask) {
 	    /* Update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] != zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] != *zptr) {
+		     /* pass */
+		     *zptr = z[i];
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -292,13 +827,14 @@
 	 else {
 	    /* Don't update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] != zbuffer[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] != *zptr) {
 		     /* pass */
-		     passed++;
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -306,16 +842,18 @@
 	 }
 	 break;
       case GL_EQUAL:
-	 if (ctx->Depth.Mask) {
+         if (ctx->Depth.Mask) {
 	    /* Update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] == zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] == *zptr) {
+		     /* pass */
+		     *zptr = z[i];
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -324,13 +862,14 @@
 	 else {
 	    /* Don't update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  if (z[i] == zbuffer[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] == *zptr) {
 		     /* pass */
-		     passed++;
 		  }
 		  else {
+		     /* fail */
 		     mask[i] = 0;
 		  }
 	       }
@@ -341,72 +880,35 @@
 	 if (ctx->Depth.Mask) {
 	    /* Update Z buffer */
             GLuint i;
-	    for (i=0;i<n;i++) {
+	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  zbuffer[i] = z[i];
-		  passed++;
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  *zptr = z[i];
 	       }
 	    }
 	 }
 	 else {
 	    /* Don't update Z buffer or mask */
-	    passed = n;
 	 }
 	 break;
       case GL_NEVER:
-         MEMSET(mask, 0, n * sizeof(GLubyte));
+	 /* depth test never passes */
+         BZERO(mask, n * sizeof(GLubyte));
 	 break;
       default:
-         gl_problem(ctx, "Bad depth func in depth_test_span");
-   }
-
-   return passed;
-}
-
-
-
-/*
- * Apply depth test to span of fragments.  Hardware or software z buffer.
- */
-GLuint
-_mesa_depth_test_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                       const GLdepth z[], GLubyte mask[] )
-{
-   GLdepth zbuffer[MAX_WIDTH];
-   GLdepth *zptr;
-   GLuint passed;
-
-   if (ctx->Driver.ReadDepthSpan) {
-      /* read depth values out of hardware Z buffer */
-      (*ctx->Driver.ReadDepthSpan)(ctx, n, x, y, zbuffer);
-      zptr = zbuffer;
-   }
-   else {
-      /* test against software depth buffer values */
-      zptr = Z_ADDRESS( ctx, x, y );
-   }
-
-   passed = depth_test_span( ctx, n, x, y, zptr, z, mask );
-
-   if (ctx->Driver.WriteDepthSpan) {
-      /* write updated depth values into hardware Z buffer */
-      assert(zptr == zbuffer);
-      (*ctx->Driver.WriteDepthSpan)(ctx, n, x, y, zbuffer, mask);
+         gl_problem(ctx, "Bad depth func in software_depth_test_pixels");
    }
-
-   return passed;
 }
 
 
 
-
 /*
  * Do depth testing for an array of fragments using software Z buffer.
  */
 static void
-software_depth_test_pixels( GLcontext *ctx, GLuint n,
-                            const GLint x[], const GLint y[],
-                            const GLdepth z[], GLubyte mask[] )
+software_depth_test_pixels32( GLcontext *ctx, GLuint n,
+                              const GLint x[], const GLint y[],
+                              const GLdepth z[], GLubyte mask[] )
 {
    /* switch cases ordered from most frequent to less frequent */
    switch (ctx->Depth.Func) {
@@ -416,7 +918,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] < *zptr) {
 		     /* pass */
 		     *zptr = z[i];
@@ -433,7 +935,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] < *zptr) {
 		     /* pass */
 		  }
@@ -451,7 +953,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] <= *zptr) {
 		     /* pass */
 		     *zptr = z[i];
@@ -468,7 +970,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] <= *zptr) {
 		     /* pass */
 		  }
@@ -486,7 +988,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] >= *zptr) {
 		     /* pass */
 		     *zptr = z[i];
@@ -503,7 +1005,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] >= *zptr) {
 		     /* pass */
 		  }
@@ -521,7 +1023,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] > *zptr) {
 		     /* pass */
 		     *zptr = z[i];
@@ -538,7 +1040,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] > *zptr) {
 		     /* pass */
 		  }
@@ -556,7 +1058,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] != *zptr) {
 		     /* pass */
 		     *zptr = z[i];
@@ -573,7 +1075,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] != *zptr) {
 		     /* pass */
 		  }
@@ -591,7 +1093,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] == *zptr) {
 		     /* pass */
 		     *zptr = z[i];
@@ -608,7 +1110,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  if (z[i] == *zptr) {
 		     /* pass */
 		  }
@@ -626,7 +1128,7 @@
             GLuint i;
 	    for (i=0; i<n; i++) {
 	       if (mask[i]) {
-		  GLdepth *zptr = Z_ADDRESS(ctx,x[i],y[i]);
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
 		  *zptr = z[i];
 	       }
 	    }
@@ -637,7 +1139,7 @@
 	 break;
       case GL_NEVER:
 	 /* depth test never passes */
-         MEMSET(mask, 0, n * sizeof(GLubyte));
+         BZERO(mask, n * sizeof(GLubyte));
 	 break;
       default:
          gl_problem(ctx, "Bad depth func in software_depth_test_pixels");
@@ -871,7 +1373,7 @@
 	 break;
       case GL_NEVER:
 	 /* depth test never passes */
-         MEMSET(mask, 0, n * sizeof(GLubyte));
+         BZERO(mask, n * sizeof(GLubyte));
 	 break;
       default:
          gl_problem(ctx, "Bad depth func in hardware_depth_test_pixels");
@@ -894,11 +1396,14 @@
 
       /* update hardware Z buffer with new values */
       assert(ctx->Driver.WriteDepthPixels);
-      (*ctx->Driver.WriteDepthPixels)(ctx, n, x, y, z, mask );
+      (*ctx->Driver.WriteDepthPixels)(ctx, n, x, y, zbuffer, mask );
    }
    else {
       /* software depth testing */
-      software_depth_test_pixels(ctx, n, x, y, z, mask);
+      if (ctx->Visual->DepthBits <= 16)
+         software_depth_test_pixels16(ctx, n, x, y, z, mask);
+      else
+         software_depth_test_pixels32(ctx, n, x, y, z, mask);
    }
 }
 
@@ -912,6 +1417,74 @@
 
 
 /*
+ * Read a span of depth values from the depth buffer.
+ * This function does clipping before calling the device driver function.
+ */
+void
+_mesa_read_depth_span( GLcontext *ctx,
+                       GLint n, GLint x, GLint y, GLdepth depth[] )
+{
+   if (y < 0 || y >= ctx->DrawBuffer->Height ||
+       x + (GLint) n <= 0 || x >= ctx->DrawBuffer->Width) {
+      /* span is completely outside framebuffer */
+      GLint i;
+      for (i = 0; i < n; i++)
+         depth[i] = 0;
+      return;
+   }
+
+   if (x < 0) {
+      GLint dx = -x;
+      GLint i;
+      for (i = 0; i < dx; i++)
+         depth[i] = 0;
+      x = 0;
+      n -= dx;
+      depth += dx;
+   }
+   if (x + n > ctx->DrawBuffer->Width) {
+      GLint dx = x + n - ctx->DrawBuffer->Width;
+      GLint i;
+      for (i = 0; i < dx; i++)
+         depth[n - i - 1] = 0;
+      n -= dx;
+   }
+   if (n <= 0) {
+      return;
+   }
+
+   if (ctx->DrawBuffer->DepthBuffer) {
+      /* read from software depth buffer */
+      if (ctx->Visual->DepthBits <= 16) {
+         const GLushort *zptr = Z_ADDRESS16( ctx, x, y );
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            depth[i] = zptr[i];
+         }
+      }
+      else {
+         const GLuint *zptr = Z_ADDRESS32( ctx, x, y );
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            depth[i] = zptr[i];
+         }
+      }
+   }
+   else if (ctx->Driver.ReadDepthSpan) {
+      /* read from hardware depth buffer */
+      (*ctx->Driver.ReadDepthSpan)( ctx, n, x, y, depth );
+   }
+   else {
+      /* no depth buffer */
+      BZERO(depth, n * sizeof(GLfloat));
+   }
+
+}
+
+
+
+
+/*
  * Return a span of depth values from the depth buffer as floats in [0,1].
  * This is used for both hardware and software depth buffers.
  * Input:  n - how many pixels
@@ -919,17 +1492,54 @@
  * Output:  depth - the array of depth values
  */
 void
-_mesa_read_depth_span_float( GLcontext* ctx,
-                             GLuint n, GLint x, GLint y, GLfloat depth[] )
+_mesa_read_depth_span_float( GLcontext *ctx,
+                             GLint n, GLint x, GLint y, GLfloat depth[] )
 {
-   const GLfloat scale = 1.0F / DEPTH_SCALE;
+   const GLfloat scale = 1.0F / ctx->Visual->DepthMaxF;
+
+   if (y < 0 || y >= ctx->DrawBuffer->Height ||
+       x + (GLint) n <= 0 || x >= ctx->DrawBuffer->Width) {
+      /* span is completely outside framebuffer */
+      GLint i;
+      for (i = 0; i < n; i++)
+         depth[i] = 0.0F;
+      return;
+   }
+
+   if (x < 0) {
+      GLint dx = -x;
+      GLint i;
+      for (i = 0; i < dx; i++)
+         depth[i] = 0.0F;
+      n -= dx;
+      x = 0;
+   }
+   if (x + n > ctx->DrawBuffer->Width) {
+      GLint dx = x + n - ctx->DrawBuffer->Width;
+      GLint i;
+      for (i = 0; i < dx; i++)
+         depth[n - i - 1] = 0.0F;
+      n -= dx;
+   }
+   if (n <= 0) {
+      return;
+   }
 
-   if (ctx->DrawBuffer->Depth) {
+   if (ctx->DrawBuffer->DepthBuffer) {
       /* read from software depth buffer */
-      const GLdepth *zptr = Z_ADDRESS( ctx, x, y );
-      GLuint i;
-      for (i = 0; i < n; i++) {
-	 depth[i] = (GLfloat) zptr[i] * scale;
+      if (ctx->Visual->DepthBits <= 16) {
+         const GLushort *zptr = Z_ADDRESS16( ctx, x, y );
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            depth[i] = (GLfloat) zptr[i] * scale;
+         }
+      }
+      else {
+         const GLuint *zptr = Z_ADDRESS32( ctx, x, y );
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            depth[i] = (GLfloat) zptr[i] * scale;
+         }
       }
    }
    else if (ctx->Driver.ReadDepthSpan) {
@@ -944,7 +1554,7 @@
    }
    else {
       /* no depth buffer */
-      MEMSET(depth, 0, n * sizeof(GLfloat));
+      BZERO(depth, n * sizeof(GLfloat));
    }
 }
 
@@ -962,20 +1572,28 @@
  * This function is only called through Driver.alloc_depth_buffer.
  */
 void
-_mesa_alloc_depth_buffer( GLcontext* ctx )
+_mesa_alloc_depth_buffer( GLcontext *ctx )
 {
    /* deallocate current depth buffer if present */
    if (ctx->DrawBuffer->UseSoftwareDepthBuffer) {
-      if (ctx->DrawBuffer->Depth) {
-         FREE(ctx->DrawBuffer->Depth);
-         ctx->DrawBuffer->Depth = NULL;
+      GLint bytesPerValue;
+
+      if (ctx->DrawBuffer->DepthBuffer) {
+         FREE(ctx->DrawBuffer->DepthBuffer);
+         ctx->DrawBuffer->DepthBuffer = NULL;
       }
 
       /* allocate new depth buffer, but don't initialize it */
-      ctx->DrawBuffer->Depth = (GLdepth *) MALLOC( ctx->DrawBuffer->Width
-                                                   * ctx->DrawBuffer->Height
-                                                   * sizeof(GLdepth) );
-      if (!ctx->DrawBuffer->Depth) {
+      if (ctx->Visual->DepthBits <= 16)
+         bytesPerValue = sizeof(GLushort);
+      else
+         bytesPerValue = sizeof(GLuint);
+
+      ctx->DrawBuffer->DepthBuffer = MALLOC( ctx->DrawBuffer->Width
+                                             * ctx->DrawBuffer->Height
+                                             * bytesPerValue );
+
+      if (!ctx->DrawBuffer->DepthBuffer) {
          /* out of memory */
          ctx->Depth.Test = GL_FALSE;
          ctx->NewState |= NEW_RASTER_OPS;
@@ -993,11 +1611,11 @@
  * This function is only called through Driver.clear_depth_buffer.
  */
 void
-_mesa_clear_depth_buffer( GLcontext* ctx )
+_mesa_clear_depth_buffer( GLcontext *ctx )
 {
-   GLdepth clear_value = (GLdepth) (ctx->Depth.Clear * DEPTH_SCALE);
-   
-   if (ctx->Visual->DepthBits==0 || !ctx->DrawBuffer->Depth || !ctx->Depth.Mask) {
+   if (ctx->Visual->DepthBits == 0
+       || !ctx->DrawBuffer->DepthBuffer
+       || !ctx->Depth.Mask) {
       /* no depth buffer, or writing to it is disabled */
       return;
    }
@@ -1008,41 +1626,97 @@
 
    if (ctx->Scissor.Enabled) {
       /* only clear scissor region */
-      GLint y;
-      for (y=ctx->DrawBuffer->Ymin; y<=ctx->DrawBuffer->Ymax; y++) {
-         GLdepth *d = Z_ADDRESS( ctx, ctx->DrawBuffer->Xmin, y );
-         GLint n = ctx->DrawBuffer->Xmax - ctx->DrawBuffer->Xmin + 1;
-         do {
-            *d++ = clear_value;
-            n--;
-         } while (n);
+      if (ctx->Visual->DepthBits <= 16) {
+         const GLushort clearValue = (GLushort) (ctx->Depth.Clear * ctx->Visual->DepthMax);
+         const GLint rows = ctx->DrawBuffer->Ymax - ctx->DrawBuffer->Ymin + 1;
+         const GLint width = ctx->DrawBuffer->Width;
+         GLushort *dRow = (GLushort *) ctx->DrawBuffer->DepthBuffer
+            + ctx->DrawBuffer->Ymin * width + ctx->DrawBuffer->Xmin;
+         GLint i, j;
+         for (i = 0; i < rows; i++) {
+            for (j = 0; j < width; j++) {
+               dRow[j] = clearValue;
+            }
+            dRow += width;
+         }
+      }
+      else {
+         const GLuint clearValue = (GLuint) (ctx->Depth.Clear * ctx->Visual->DepthMax);
+         const GLint rows = ctx->DrawBuffer->Ymax - ctx->DrawBuffer->Ymin + 1;
+         const GLint width = ctx->DrawBuffer->Width;
+         GLuint *dRow = (GLuint *) ctx->DrawBuffer->DepthBuffer
+            + ctx->DrawBuffer->Ymin * width + ctx->DrawBuffer->Xmin;
+         GLint i, j;
+         for (i = 0; i < rows; i++) {
+            for (j = 0; j < width; j++) {
+               dRow[j] = clearValue;
+            }
+            dRow += width;
+         }
       }
    }
    else {
       /* clear whole buffer */
-      if (sizeof(GLdepth)==2 && (clear_value&0xff)==(clear_value>>8)) {
-         /* lower and upper bytes of clear_value are same, use MEMSET */
-         MEMSET( ctx->DrawBuffer->Depth, clear_value & 0xff,
-                 2*ctx->DrawBuffer->Width * ctx->DrawBuffer->Height);
+      if (ctx->Visual->DepthBits <= 16) {
+         const GLushort clearValue = (GLushort) (ctx->Depth.Clear * ctx->Visual->DepthMax);
+         if ((clearValue & 0xff) == (clearValue >> 8)) {
+            if (clearValue == 0) {
+               BZERO(ctx->DrawBuffer->DepthBuffer,
+                     2*ctx->DrawBuffer->Width*ctx->DrawBuffer->Height);
+            }
+            else {
+               /* lower and upper bytes of clear_value are same, use MEMSET */
+               MEMSET( ctx->DrawBuffer->DepthBuffer, clearValue & 0xff,
+                       2 * ctx->DrawBuffer->Width * ctx->DrawBuffer->Height);
+            }
+         }
+         else {
+            GLushort *d = (GLushort *) ctx->DrawBuffer->DepthBuffer;
+            GLint n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
+            while (n >= 16) {
+               d[0] = clearValue;    d[1] = clearValue;
+               d[2] = clearValue;    d[3] = clearValue;
+               d[4] = clearValue;    d[5] = clearValue;
+               d[6] = clearValue;    d[7] = clearValue;
+               d[8] = clearValue;    d[9] = clearValue;
+               d[10] = clearValue;   d[11] = clearValue;
+               d[12] = clearValue;   d[13] = clearValue;
+               d[14] = clearValue;   d[15] = clearValue;
+               d += 16;
+               n -= 16;
+            }
+            while (n > 0) {
+               *d++ = clearValue;
+               n--;
+            }
+         }
       }
       else {
-         GLdepth *d = ctx->DrawBuffer->Depth;
-         GLint n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
-         while (n>=16) {
-            d[0] = clear_value;    d[1] = clear_value;
-            d[2] = clear_value;    d[3] = clear_value;
-            d[4] = clear_value;    d[5] = clear_value;
-            d[6] = clear_value;    d[7] = clear_value;
-            d[8] = clear_value;    d[9] = clear_value;
-            d[10] = clear_value;   d[11] = clear_value;
-            d[12] = clear_value;   d[13] = clear_value;
-            d[14] = clear_value;   d[15] = clear_value;
-            d += 16;
-            n -= 16;
+         /* >16 bit depth buffer */
+         const GLuint clearValue = (GLuint) (ctx->Depth.Clear * ctx->Visual->DepthMax);
+         if (clearValue == 0) {
+            BZERO(ctx->DrawBuffer->DepthBuffer,
+                ctx->DrawBuffer->Width*ctx->DrawBuffer->Height*sizeof(GLuint));
          }
-         while (n>0) {
-            *d++ = clear_value;
-            n--;
+         else {
+            GLint n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
+            GLuint *d = (GLuint *) ctx->DrawBuffer->DepthBuffer;
+            while (n >= 16) {
+               d[0] = clearValue;    d[1] = clearValue;
+               d[2] = clearValue;    d[3] = clearValue;
+               d[4] = clearValue;    d[5] = clearValue;
+               d[6] = clearValue;    d[7] = clearValue;
+               d[8] = clearValue;    d[9] = clearValue;
+               d[10] = clearValue;   d[11] = clearValue;
+               d[12] = clearValue;   d[13] = clearValue;
+               d[14] = clearValue;   d[15] = clearValue;
+               d += 16;
+               n -= 16;
+            }
+            while (n > 0) {
+               *d++ = clearValue;
+               n--;
+            }
          }
       }
    }
Index: xc/extras/Mesa/src/depth.h
diff -u xc/extras/Mesa/src/depth.h:1.3 xc/extras/Mesa/src/depth.h:1.4
--- xc/extras/Mesa/src/depth.h:1.3	Mon Feb 14 23:12:09 2000
+++ xc/extras/Mesa/src/depth.h	Fri Jun 16 17:02:08 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -48,14 +48,12 @@
 
 
 
-
 /*
- * Return the address of the Z-buffer value for window coordinate (x,y):
+ * Internal functions
  */
-#define Z_ADDRESS( CTX, X, Y )  \
-            ((CTX)->DrawBuffer->Depth + (CTX)->DrawBuffer->Width * (Y) + (X))
-
 
+extern GLvoid *
+_mesa_zbuffer_address(GLcontext *ctx, GLint x, GLint y);
 
 
 extern GLuint
@@ -68,8 +66,13 @@
                          const GLdepth z[], GLubyte mask[] );
 
 
+extern void
+_mesa_read_depth_span( GLcontext *ctx,
+                       GLint n, GLint x, GLint y, GLdepth depth[] );
+
+
 extern void
-_mesa_read_depth_span_float( GLcontext *ctx, GLuint n, GLint x, GLint y,
+_mesa_read_depth_span_float( GLcontext *ctx, GLint n, GLint x, GLint y,
                              GLfloat depth[] );
 
 
Index: xc/extras/Mesa/src/dlist.c
diff -u xc/extras/Mesa/src/dlist.c:1.4 xc/extras/Mesa/src/dlist.c:1.5
--- xc/extras/Mesa/src/dlist.c:1.4	Thu Mar  2 08:07:04 2000
+++ xc/extras/Mesa/src/dlist.c	Fri Jun 16 17:02:08 2000
@@ -58,6 +58,7 @@
 #include "mem.h"
 #include "pipeline.h"
 #include "pixel.h"
+#include "pixeltex.h"
 #include "points.h"
 #include "polygon.h"
 #include "readpix.h"
@@ -140,7 +141,17 @@
 	OPCODE_COLOR_MASK,
 	OPCODE_COLOR_MATERIAL,
 	OPCODE_COLOR_TABLE,
+	OPCODE_COLOR_TABLE_PARAMETER_FV,
+	OPCODE_COLOR_TABLE_PARAMETER_IV,
 	OPCODE_COLOR_SUB_TABLE,
+        OPCODE_CONVOLUTION_FILTER_1D,
+        OPCODE_CONVOLUTION_FILTER_2D,
+        OPCODE_CONVOLUTION_PARAMETER_I,
+        OPCODE_CONVOLUTION_PARAMETER_IV,
+        OPCODE_CONVOLUTION_PARAMETER_F,
+        OPCODE_CONVOLUTION_PARAMETER_FV,
+        OPCODE_COPY_COLOR_SUB_TABLE,
+        OPCODE_COPY_COLOR_TABLE,
 	OPCODE_COPY_PIXELS,
         OPCODE_COPY_TEX_IMAGE1D,
         OPCODE_COPY_TEX_IMAGE2D,
@@ -166,6 +177,7 @@
 	OPCODE_FRUSTUM,
 	OPCODE_HINT,
 	OPCODE_HINT_PGI,
+	OPCODE_HISTOGRAM,
 	OPCODE_INDEX_MASK,
 	OPCODE_INIT_NAMES,
 	OPCODE_LIGHT,
@@ -182,6 +194,7 @@
 	OPCODE_MAPGRID1,
 	OPCODE_MAPGRID2,
 	OPCODE_MATRIX_MODE,
+        OPCODE_MIN_MAX,
 	OPCODE_MULT_MATRIX,
 	OPCODE_ORTHO,
 	OPCODE_PASSTHROUGH,
@@ -203,6 +216,8 @@
 	OPCODE_RASTER_POS,
 	OPCODE_RECTF,
 	OPCODE_READ_BUFFER,
+        OPCODE_RESET_HISTOGRAM,
+        OPCODE_RESET_MIN_MAX,
         OPCODE_SCALE,
 	OPCODE_SCISSOR,
 	OPCODE_SELECT_TEXTURE_SGIS,
@@ -226,6 +241,16 @@
         /* GL_ARB_multitexture */
         OPCODE_ACTIVE_TEXTURE,
         OPCODE_CLIENT_ACTIVE_TEXTURE,
+        /* GL_SGIX/SGIS_pixel_texture */
+        OPCODE_PIXEL_TEXGEN_SGIX,
+        OPCODE_PIXEL_TEXGEN_PARAMETER_SGIS,
+        /* GL_ARB_texture_compression */
+        OPCODE_COMPRESSED_TEX_IMAGE_1D,
+        OPCODE_COMPRESSED_TEX_IMAGE_2D,
+        OPCODE_COMPRESSED_TEX_IMAGE_3D,
+        OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D,
+        OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D,
+        OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D,
 	/* The following three are meta instructions */
 	OPCODE_ERROR,	        /* raise compiled-in error */
 	OPCODE_VERTEX_CASSETTE,	/* render prebuilt vertex buffer */
@@ -365,6 +390,14 @@
             FREE( n[6].data );
             n += InstSize[n[0].opcode];
             break;
+         case OPCODE_CONVOLUTION_FILTER_1D:
+            FREE( n[6].data );
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_CONVOLUTION_FILTER_2D:
+            FREE( n[7].data );
+            n += InstSize[n[0].opcode];
+            break;
          case OPCODE_POLYGON_STIPPLE:
             FREE( n[1].data );
 	    n += InstSize[n[0].opcode];
@@ -393,6 +426,30 @@
             FREE(n[11].data);
             n += InstSize[n[0].opcode];
             break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_1D:
+            FREE(n[7].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_2D:
+            FREE(n[8].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_3D:
+            FREE(n[9].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D:
+            FREE(n[7].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D:
+            FREE(n[9].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D:
+            FREE(n[11].data);
+            n += InstSize[n[0].opcode];
+            break;
 	 case OPCODE_CONTINUE:
 	    n = (Node *) n[1].next;
 	    FREE( block );
@@ -500,8 +557,18 @@
       InstSize[OPCODE_COLOR_MASK] = 5;
       InstSize[OPCODE_COLOR_MATERIAL] = 3;
       InstSize[OPCODE_COLOR_TABLE] = 7;
+      InstSize[OPCODE_COLOR_TABLE_PARAMETER_FV] = 7;
+      InstSize[OPCODE_COLOR_TABLE_PARAMETER_IV] = 7;
       InstSize[OPCODE_COLOR_SUB_TABLE] = 7;
+      InstSize[OPCODE_CONVOLUTION_FILTER_1D] = 7;
+      InstSize[OPCODE_CONVOLUTION_FILTER_2D] = 8;
+      InstSize[OPCODE_CONVOLUTION_PARAMETER_I] = 4;
+      InstSize[OPCODE_CONVOLUTION_PARAMETER_IV] = 7;
+      InstSize[OPCODE_CONVOLUTION_PARAMETER_F] = 4;
+      InstSize[OPCODE_CONVOLUTION_PARAMETER_FV] = 7;
       InstSize[OPCODE_COPY_PIXELS] = 6;
+      InstSize[OPCODE_COPY_COLOR_SUB_TABLE] = 6;
+      InstSize[OPCODE_COPY_COLOR_TABLE] = 6;
       InstSize[OPCODE_COPY_TEX_IMAGE1D] = 8;
       InstSize[OPCODE_COPY_TEX_IMAGE2D] = 9;
       InstSize[OPCODE_COPY_TEX_SUB_IMAGE1D] = 7;
@@ -526,6 +593,7 @@
       InstSize[OPCODE_FRUSTUM] = 7;
       InstSize[OPCODE_HINT] = 3;
       InstSize[OPCODE_HINT_PGI] = 3;
+      InstSize[OPCODE_HISTOGRAM] = 5;
       InstSize[OPCODE_INDEX_MASK] = 2;
       InstSize[OPCODE_INIT_NAMES] = 1;
       InstSize[OPCODE_LIGHT] = 7;
@@ -542,6 +610,7 @@
       InstSize[OPCODE_MAPGRID1] = 4;
       InstSize[OPCODE_MAPGRID2] = 7;
       InstSize[OPCODE_MATRIX_MODE] = 2;
+      InstSize[OPCODE_MIN_MAX] = 4;
       InstSize[OPCODE_MULT_MATRIX] = 17;
       InstSize[OPCODE_ORTHO] = 7;
       InstSize[OPCODE_PASSTHROUGH] = 2;
@@ -563,6 +632,8 @@
       InstSize[OPCODE_RASTER_POS] = 5;
       InstSize[OPCODE_RECTF] = 5;
       InstSize[OPCODE_READ_BUFFER] = 2;
+      InstSize[OPCODE_RESET_HISTOGRAM] = 2;
+      InstSize[OPCODE_RESET_MIN_MAX] = 2;
       InstSize[OPCODE_SCALE] = 4;
       InstSize[OPCODE_SCISSOR] = 5;
       InstSize[OPCODE_STENCIL_FUNC] = 4;
@@ -585,6 +656,16 @@
       InstSize[OPCODE_ERROR] = 3;
       InstSize[OPCODE_VERTEX_CASSETTE] = 9;
       InstSize[OPCODE_END_OF_LIST] = 1;
+      /* GL_SGIX/SGIS_pixel_texture */
+      InstSize[OPCODE_PIXEL_TEXGEN_SGIX] = 2;
+      InstSize[OPCODE_PIXEL_TEXGEN_PARAMETER_SGIS] = 3;
+      /* GL_ARB_texture_compression */
+      InstSize[OPCODE_COMPRESSED_TEX_IMAGE_1D] = 8;
+      InstSize[OPCODE_COMPRESSED_TEX_IMAGE_2D] = 9;
+      InstSize[OPCODE_COMPRESSED_TEX_IMAGE_3D] = 10;
+      InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D] = 8;
+      InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D] = 10;
+      InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D] = 12;
       /* GL_ARB_multitexture */
       InstSize[OPCODE_ACTIVE_TEXTURE] = 2;
       InstSize[OPCODE_CLIENT_ACTIVE_TEXTURE] = 2;
@@ -976,6 +1057,66 @@
 }
 
 
+
+static void
+save_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx, "glColorTableParameterfv");
+   FLUSH_VB(ctx, "dlist");
+
+   n = alloc_instruction( ctx, OPCODE_COLOR_TABLE_PARAMETER_FV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].f = params[0];
+      if (pname == GL_COLOR_TABLE_SGI ||
+          pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
+          pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI) {
+         n[4].f = params[1];
+         n[5].f = params[2];
+         n[6].f = params[3];
+      }
+   }
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ColorTableParameterfv)( target, pname, params );
+   }
+}
+
+
+static void
+save_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx, "glColorTableParameterfv");
+   FLUSH_VB(ctx, "dlist");
+
+   n = alloc_instruction( ctx, OPCODE_COLOR_TABLE_PARAMETER_IV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].i = params[0];
+      if (pname == GL_COLOR_TABLE_SGI ||
+          pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
+          pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI) {
+         n[4].i = params[1];
+         n[5].i = params[2];
+         n[6].i = params[3];
+      }
+   }
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ColorTableParameteriv)( target, pname, params );
+   }
+}
+
+
+
 static void save_ColorSubTable( GLenum target, GLsizei start, GLsizei count,
                                 GLenum format, GLenum type,
                                 const GLvoid *table)
@@ -1003,6 +1144,199 @@
 }
 
 
+static void
+save_CopyColorSubTable(GLenum target, GLsizei start,
+                       GLint x, GLint y, GLsizei width)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_COPY_COLOR_SUB_TABLE, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = start;
+      n[3].i = x;
+      n[4].i = y;
+      n[5].i = width;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyColorSubTable)(target, start, x, y, width);
+   }
+}
+
+
+static void
+save_CopyColorTable(GLenum target, GLenum internalformat,
+                    GLint x, GLint y, GLsizei width)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_COPY_COLOR_TABLE, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = internalformat;
+      n[3].i = x;
+      n[4].i = y;
+      n[5].i = width;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyColorTable)(target, internalformat, x, y, width);
+   }
+}
+
+
+static void
+save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width,
+                         GLenum format, GLenum type, const GLvoid *filter)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type, filter,
+                                      &ctx->Unpack);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_CONVOLUTION_FILTER_1D, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = internalFormat;
+      n[3].i = width;
+      n[4].e = format;
+      n[5].e = type;
+      n[6].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionFilter1D)( target, internalFormat, width,
+                                         format, type, filter );
+   }
+}
+
+
+static void
+save_ConvolutionFilter2D(GLenum target, GLenum internalFormat,
+                         GLsizei width, GLsizei height, GLenum format,
+                         GLenum type, const GLvoid *filter)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = _mesa_unpack_image(width, height, 1, format, type, filter,
+                                      &ctx->Unpack);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_CONVOLUTION_FILTER_2D, 7 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = internalFormat;
+      n[3].i = width;
+      n[4].i = height;
+      n[5].e = format;
+      n[6].e = type;
+      n[7].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionFilter2D)( target, internalFormat, width, height,
+                                         format, type, filter );
+   }
+}
+
+
+static void
+save_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_CONVOLUTION_PARAMETER_I, 3 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].i = param;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionParameteri)( target, pname, param );
+   }
+}
+
+
+static void
+save_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_CONVOLUTION_PARAMETER_IV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].i = params[0];
+      if (pname == GL_CONVOLUTION_BORDER_COLOR ||
+          pname == GL_CONVOLUTION_FILTER_SCALE ||
+          pname == GL_CONVOLUTION_FILTER_BIAS) {
+         n[4].i = params[1];
+         n[5].i = params[2];
+         n[6].i = params[3];
+      }
+      else {
+         n[4].i = n[5].i = n[6].i = 0;
+      }
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionParameteriv)( target, pname, params );
+   }
+}
+
+
+static void
+save_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_CONVOLUTION_PARAMETER_F, 3 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].f = param;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionParameterf)( target, pname, param );
+   }
+}
+
+
+static void
+save_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_CONVOLUTION_PARAMETER_IV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].f = params[0];
+      if (pname == GL_CONVOLUTION_BORDER_COLOR ||
+          pname == GL_CONVOLUTION_FILTER_SCALE ||
+          pname == GL_CONVOLUTION_FILTER_BIAS) {
+         n[4].f = params[1];
+         n[5].f = params[2];
+         n[6].f = params[3];
+      }
+      else {
+         n[4].f = n[5].f = n[6].f = 0.0F;
+      }
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionParameterfv)( target, pname, params );
+   }
+}
+
 
 static void save_CopyPixels( GLint x, GLint y,
                              GLsizei width, GLsizei height, GLenum type )
@@ -1455,6 +1789,26 @@
 }
 
 
+static void
+save_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_HISTOGRAM, 4 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = width;
+      n[3].e = internalFormat;
+      n[4].b = sink;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Histogram)( target, width, internalFormat, sink );
+   }
+}
+
+
 static void save_IndexMask( GLuint mask )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -1928,6 +2282,25 @@
 }
 
 
+static void
+save_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_MIN_MAX, 3 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = internalFormat;
+      n[3].b = sink;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Minmax)( target, internalFormat, sink );
+   }
+}
+
+
 static void save_MultMatrixf( const GLfloat *m )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -2176,7 +2549,8 @@
 
 static void save_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
 {
-   save_PolygonOffset(factor, DEPTH_SCALE * bias);
+   GET_CURRENT_CONTEXT(ctx);
+   save_PolygonOffset(factor, ctx->Visual->DepthMaxF * bias);
 }
 
 
@@ -2491,6 +2865,38 @@
 }
 
 
+static void
+save_ResetHistogram(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_RESET_HISTOGRAM, 1 );
+   if (n) {
+      n[1].e = target;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ResetHistogram)( target );
+   }
+}
+
+
+static void
+save_ResetMinmax(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_RESET_MIN_MAX, 1 );
+   if (n) {
+      n[1].e = target;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ResetMinmax)( target );
+   }
+}
+
+
 static void save_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
 {
    GLfloat m[16];
@@ -2842,7 +3248,7 @@
 
 
 static void save_TexImage3D( GLenum target,
-                             GLint level, GLint components,
+                             GLint level, GLint internalFormat,
                              GLsizei width, GLsizei height, GLsizei depth,
                              GLint border,
                              GLenum format, GLenum type,
@@ -2851,7 +3257,7 @@
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_3D) {
       /* don't compile, execute immediately */
-      (*ctx->Exec->TexImage3D)( target, level, components, width,
+      (*ctx->Exec->TexImage3D)( target, level, internalFormat, width,
                                height, depth, border, format, type, pixels );
    }
    else {
@@ -2863,7 +3269,7 @@
       if (n) {
          n[1].e = target;
          n[2].i = level;
-         n[3].i = components;
+         n[3].i = internalFormat;
          n[4].i = (GLint) width;
          n[5].i = (GLint) height;
          n[6].i = (GLint) depth; 
@@ -2876,7 +3282,7 @@
          FREE(image);
       }
       if (ctx->ExecuteFlag) {
-         (*ctx->Exec->TexImage3D)( target, level, components, width,
+         (*ctx->Exec->TexImage3D)( target, level, internalFormat, width,
                                 height, depth, border, format, type, pixels );
       }
    }
@@ -3190,6 +3596,8 @@
 
 
 
+/* GL_ARB_transpose_matrix */
+
 static void save_LoadTransposeMatrixdARB( const GLdouble m[16] )
 {
    GLdouble tm[16];
@@ -3222,12 +3630,319 @@
 }
 
 
-
-void gl_compile_cassette( GLcontext *ctx )
+static void save_PixelTexGenSGIX(GLenum mode)
 {
-   Node *n = alloc_instruction( ctx, OPCODE_VERTEX_CASSETTE, 8 );
-   struct immediate *im = ctx->input;   
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_PIXEL_TEXGEN_SGIX, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PixelTexGenSGIX)( mode );
+   }
+}
+
+
+/* GL_ARB_texture_compression */
+static void
+save_CompressedTexImage1DARB(GLenum target, GLint level,
+                             GLenum internalFormat, GLsizei width,
+                             GLint border, GLsizei imageSize,
+                             const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_1D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat,
+                                            width, border, imageSize, data);
+   }
+   else {
+      Node *n;
+      GLvoid *image;
+      FLUSH_VB(ctx, "dlist");
+      /* make copy of image */
+      image = MALLOC(imageSize);
+      if (!image) {
+         gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1DARB");
+         return;
+      }
+      MEMCPY(image, data, imageSize);
+      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 8 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].e = internalFormat;
+         n[4].i = (GLint) width;
+         n[5].i = border;
+         n[6].i = imageSize;
+         n[7].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat,
+                                               width, border, imageSize, data);
+      }
+   }
+}
+
+
+static void
+save_CompressedTexImage2DARB(GLenum target, GLint level,
+                             GLenum internalFormat, GLsizei width,
+                             GLsizei height, GLint border, GLsizei imageSize,
+                             const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_2D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat,
+                                       width, height, border, imageSize, data);
+   }
+   else {
+      Node *n;
+      GLvoid *image;
+      FLUSH_VB(ctx, "dlist");
+      /* make copy of image */
+      image = MALLOC(imageSize);
+      if (!image) {
+         gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
+         return;
+      }
+      MEMCPY(image, data, imageSize);
+      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 9 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].e = internalFormat;
+         n[4].i = (GLint) width;
+         n[5].i = (GLint) height;
+         n[6].i = border;
+         n[7].i = imageSize;
+         n[8].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat,
+                                      width, height, border, imageSize, data);
+      }
+   }
+}
+
+
+static void
+save_CompressedTexImage3DARB(GLenum target, GLint level,
+                             GLenum internalFormat, GLsizei width,
+                             GLsizei height, GLsizei depth, GLint border,
+                             GLsizei imageSize, const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_3D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat,
+                                width, height, depth, border, imageSize, data);
+   }
+   else {
+      Node *n;
+      GLvoid *image;
+      FLUSH_VB(ctx, "dlist");
+      /* make copy of image */
+      image = MALLOC(imageSize);
+      if (!image) {
+         gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3DARB");
+         return;
+      }
+      MEMCPY(image, data, imageSize);
+      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 10 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].e = internalFormat;
+         n[4].i = (GLint) width;
+         n[5].i = (GLint) height;
+         n[6].i = (GLint) depth;
+         n[7].i = border;
+         n[8].i = imageSize;
+         n[9].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat,
+                                width, height, depth, border, imageSize, data);
+      }
+   }
+}
+
+
+static void
+save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+                                GLsizei width, GLenum format,
+                                GLsizei imageSize, const GLvoid *data)
+{
+   Node *n;
+   GLvoid *image;
+
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VB(ctx, "dlist");
+
+   /* make copy of image */
+   image = MALLOC(imageSize);
+   if (!image) {
+      gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage1DARB");
+      return;
+   }
+   MEMCPY(image, data, imageSize);
+   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 8 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = (GLint) width;
+      n[5].e = format;
+      n[6].i = imageSize;
+      n[7].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CompressedTexSubImage1DARB)(target, level, xoffset,
+                                               width, format, imageSize, data);
+   }
+}
+
+
+static void
+save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+                                GLint yoffset, GLsizei width, GLsizei height,
+                                GLenum format, GLsizei imageSize,
+                                const GLvoid *data)
+{
+   Node *n;
+   GLvoid *image;
+
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VB(ctx, "dlist");
+
+   /* make copy of image */
+   image = MALLOC(imageSize);
+   if (!image) {
+      gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage2DARB");
+      return;
+   }
+   MEMCPY(image, data, imageSize);
+   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 10 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = yoffset;
+      n[5].i = (GLint) width;
+      n[6].i = (GLint) height;
+      n[7].e = format;
+      n[8].i = imageSize;
+      n[9].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CompressedTexSubImage2DARB)(target, level, xoffset, yoffset,
+                                       width, height, format, imageSize, data);
+   }
+}
 
+
+static void
+save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+                                GLint yoffset, GLint zoffset, GLsizei width,
+                                GLsizei height, GLsizei depth, GLenum format,
+                                GLsizei imageSize, const GLvoid *data)
+{
+   Node *n;
+   GLvoid *image;
+
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VB(ctx, "dlist");
+
+   /* make copy of image */
+   image = MALLOC(imageSize);
+   if (!image) {
+      gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage3DARB");
+      return;
+   }
+   MEMCPY(image, data, imageSize);
+   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 12 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = yoffset;
+      n[5].i = zoffset;
+      n[6].i = (GLint) width;
+      n[7].i = (GLint) height;
+      n[8].i = (GLint) depth;
+      n[9].e = format;
+      n[10].i = imageSize;
+      n[11].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CompressedTexSubImage3DARB)(target, level, xoffset, yoffset,
+                       zoffset, width, height, depth, format, imageSize, data);
+   }
+}
+
+
+/* GL_SGIS_pixel_texture */
+
+static void save_PixelTexGenParameteriSGIS(GLenum target, GLint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   FLUSH_VB(ctx, "dlist");
+   n = alloc_instruction( ctx, OPCODE_PIXEL_TEXGEN_PARAMETER_SGIS, 2 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = value;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PixelTexGenParameteriSGIS)( target, value );
+   }
+}
+
+
+static void save_PixelTexGenParameterfSGIS(GLenum target, GLfloat value)
+{
+   save_PixelTexGenParameteriSGIS(target, (GLint) value);
+}
+
+
+static void save_PixelTexGenParameterivSGIS(GLenum target, const GLint *value)
+{
+   save_PixelTexGenParameteriSGIS(target, *value);
+}
+
+
+static void save_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value)
+{
+   save_PixelTexGenParameteriSGIS(target, (GLint) *value);
+}
+
+void gl_compile_cassette( GLcontext *ctx )
+{
+   Node *n = alloc_instruction( ctx, OPCODE_VERTEX_CASSETTE, 8 );
+   struct immediate *im = ctx->input;   
+
    if (!n) 
       return;
    
@@ -3364,10 +4079,12 @@
 		(MESA_VERBOSE & VERBOSE_IMMEDIATE))
 	       gl_print_cassette( (struct immediate *) n[1].data );
 
-	    if (0)
-	       fprintf(stderr, "Run cassette %d, rows %d..%d, beginstate %x\n",
+	    if (MESA_VERBOSE & VERBOSE_DISPLAY_LIST) {
+	       fprintf(stderr, "Run cassette %d, rows %d..%d, beginstate %x ",
 		       IM->id,
 		       IM->Start, IM->Count, IM->BeginState);
+	       gl_print_vert_flags("orflag", IM->OrFlag);
+	    }
 
 	    gl_fixup_cassette( ctx, (struct immediate *) n[1].data ); 
 	    gl_execute_cassette( ctx, (struct immediate *) n[1].data ); 
@@ -3387,7 +4104,7 @@
                struct gl_pixelstore_attrib save = ctx->Unpack;
                ctx->Unpack = _mesa_native_packing;
                (*ctx->Exec->Bitmap)( (GLsizei) n[1].i, (GLsizei) n[2].i,
-                                n[3].f, n[4].f, n[5].f, n[6].f, n[7].data );
+                 n[3].f, n[4].f, n[5].f, n[6].f, (const GLubyte *) n[7].data );
                ctx->Unpack = save;  /* restore */
             }
 	    break;
@@ -3458,6 +4175,26 @@
                ctx->Unpack = save;  /* restore */
             }
             break;
+         case OPCODE_COLOR_TABLE_PARAMETER_FV:
+            {
+               GLfloat params[4];
+               params[0] = n[3].f;
+               params[1] = n[4].f;
+               params[2] = n[5].f;
+               params[3] = n[6].f;
+               (*ctx->Exec->ColorTableParameterfv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_COLOR_TABLE_PARAMETER_IV:
+            {
+               GLint params[4];
+               params[0] = n[3].i;
+               params[1] = n[4].i;
+               params[2] = n[5].i;
+               params[3] = n[6].i;
+               (*ctx->Exec->ColorTableParameteriv)( n[1].e, n[2].e, params );
+            }
+            break;
          case OPCODE_COLOR_SUB_TABLE:
             {
                struct gl_pixelstore_attrib save = ctx->Unpack;
@@ -3467,6 +4204,58 @@
                ctx->Unpack = save;  /* restore */
             }
             break;
+         case OPCODE_CONVOLUTION_FILTER_1D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->ConvolutionFilter1D)( n[1].e, n[2].i, n[3].i,
+                                                  n[4].e, n[5].e, n[6].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_CONVOLUTION_FILTER_2D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->ConvolutionFilter2D)( n[1].e, n[2].i, n[3].i,
+                                       n[4].i, n[5].e, n[6].e, n[7].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_CONVOLUTION_PARAMETER_I:
+            (*ctx->Exec->ConvolutionParameteri)( n[1].e, n[2].e, n[3].i );
+            break;
+         case OPCODE_CONVOLUTION_PARAMETER_IV:
+            {
+               GLint params[4];
+               params[0] = n[3].i;
+               params[1] = n[4].i;
+               params[2] = n[5].i;
+               params[3] = n[6].i;
+               (*ctx->Exec->ConvolutionParameteriv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_CONVOLUTION_PARAMETER_F:
+            (*ctx->Exec->ConvolutionParameterf)( n[1].e, n[2].e, n[3].f );
+            break;
+         case OPCODE_CONVOLUTION_PARAMETER_FV:
+            {
+               GLfloat params[4];
+               params[0] = n[3].f;
+               params[1] = n[4].f;
+               params[2] = n[5].f;
+               params[3] = n[6].f;
+               (*ctx->Exec->ConvolutionParameterfv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_COPY_COLOR_SUB_TABLE:
+            (*ctx->Exec->CopyColorSubTable)( n[1].e, n[2].i,
+                                             n[3].i, n[4].i, n[5].i );
+            break;
+         case OPCODE_COPY_COLOR_TABLE:
+            (*ctx->Exec->CopyColorSubTable)( n[1].e, n[2].i,
+                                             n[3].i, n[4].i, n[5].i );
+            break;
 	 case OPCODE_COPY_PIXELS:
 	    (*ctx->Exec->CopyPixels)( n[1].i, n[2].i,
 			   (GLsizei) n[3].i, (GLsizei) n[4].i, n[5].e );
@@ -3549,6 +4338,9 @@
 	 case OPCODE_HINT_PGI:
 	    (*ctx->Exec->HintPGI)( n[1].e, n[2].i );
 	    break;
+	 case OPCODE_HISTOGRAM:
+	    (*ctx->Exec->Histogram)( n[1].e, n[2].i, n[3].e, n[4].b );
+	    break;
 	 case OPCODE_INDEX_MASK:
 	    (*ctx->Exec->IndexMask)( n[1].ui );
 	    break;
@@ -3642,6 +4434,9 @@
          case OPCODE_MATRIX_MODE:
             (*ctx->Exec->MatrixMode)( n[1].e );
             break;
+         case OPCODE_MIN_MAX:
+            (*ctx->Exec->Minmax)(n[1].e, n[2].e, n[3].b);
+            break;
 	 case OPCODE_MULT_MATRIX:
 	    if (sizeof(Node)==sizeof(GLfloat)) {
 	       (*ctx->Exec->MultMatrixf)( &n[1].f );
@@ -3721,6 +4516,12 @@
          case OPCODE_RECTF:
             (*ctx->Exec->Rectf)( n[1].f, n[2].f, n[3].f, n[4].f );
             break;
+         case OPCODE_RESET_HISTOGRAM:
+            (*ctx->Exec->ResetHistogram)( n[1].e );
+            break;
+         case OPCODE_RESET_MIN_MAX:
+            (*ctx->Exec->ResetMinmax)( n[1].e );
+            break;
          case OPCODE_SCALE:
             (*ctx->Exec->Scalef)( n[1].f, n[2].f, n[3].f );
             break;
@@ -3867,6 +4668,37 @@
          case OPCODE_CLIENT_ACTIVE_TEXTURE:  /* GL_ARB_multitexture */
             (*ctx->Exec->ClientActiveTextureARB)( n[1].e );
             break;
+         case OPCODE_PIXEL_TEXGEN_SGIX:  /* GL_SGIX_pixel_texture */
+            (*ctx->Exec->PixelTexGenSGIX)( n[1].e );
+            break;
+         case OPCODE_PIXEL_TEXGEN_PARAMETER_SGIS:  /* GL_SGIS_pixel_texture */
+            (*ctx->Exec->PixelTexGenParameteriSGIS)( n[1].e, n[2].i );
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_1D: /* GL_ARB_texture_compression */
+            (*ctx->Exec->CompressedTexImage1DARB)(n[1].e, n[2].i, n[3].e,
+                                            n[4].i, n[5].i, n[6].i, n[7].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */
+            (*ctx->Exec->CompressedTexImage2DARB)(n[1].e, n[2].i, n[3].e,
+                                    n[4].i, n[5].i, n[6].i, n[7].i, n[8].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */
+            (*ctx->Exec->CompressedTexImage3DARB)(n[1].e, n[2].i, n[3].e,
+                            n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */
+            (*ctx->Exec->CompressedTexSubImage1DARB)(n[1].e, n[2].i, n[3].i,
+                                            n[4].i, n[5].e, n[6].i, n[7].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: /* GL_ARB_texture_compress */
+            (*ctx->Exec->CompressedTexSubImage2DARB)(n[1].e, n[2].i, n[3].i,
+                            n[4].i, n[5].i, n[6].i, n[7].e, n[8].i, n[9].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: /* GL_ARB_texture_compress */
+            (*ctx->Exec->CompressedTexSubImage3DARB)(n[1].e, n[2].i, n[3].i,
+                                        n[4].i, n[5].i, n[6].i, n[7].i, n[8].i,
+                                        n[9].e, n[10].i, n[11].data);
+            break;
 	 case OPCODE_CONTINUE:
 	    n = (Node *) n[1].next;
 	    break;
@@ -3953,6 +4785,11 @@
       return 0;
    }
 
+   /*
+    * Make this an atomic operation
+    */
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
    base = _mesa_HashFindFreeKeyBlock(ctx->Shared->DisplayList, range);
    if (base) {
       /* reserve the list IDs by with empty/dummy lists */
@@ -3961,6 +4798,9 @@
          _mesa_HashInsert(ctx->Shared->DisplayList, base+i, make_empty_list());
       }
    }
+
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
    return base;
 }
 
@@ -4149,13 +4989,13 @@
 
 
 /*
- * Assign all the pointers in 'table' to point to Mesa's display list
+ * Assign all the pointers in <table> to point to Mesa's display list
  * building functions.
  */
 void
-_mesa_init_dlist_table( struct _glapi_table *table )
+_mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
 {
-   _mesa_init_no_op_table(table);
+   _mesa_init_no_op_table(table, tableSize);
 
    /* GL 1.0 */
    table->Accum = save_Accum;
@@ -4507,18 +5347,18 @@
    /* Not all are supported */
    table->BlendColor = save_BlendColor;
    table->BlendEquation = save_BlendEquation;
-   table->ColorSubTable = _mesa_ColorSubTable;
-   table->ColorTable = _mesa_ColorTable;
-   table->ColorTableParameterfv = _mesa_ColorTableParameterfv;
-   table->ColorTableParameteriv = _mesa_ColorTableParameteriv;
-   table->ConvolutionFilter1D = _mesa_ConvolutionFilter1D;
-   table->ConvolutionFilter2D = _mesa_ConvolutionFilter2D;
-   table->ConvolutionParameterf = _mesa_ConvolutionParameterf;
-   table->ConvolutionParameterfv = _mesa_ConvolutionParameterfv;
-   table->ConvolutionParameteri = _mesa_ConvolutionParameteri;
-   table->ConvolutionParameteriv = _mesa_ConvolutionParameteriv;
-   table->CopyColorSubTable = _mesa_CopyColorSubTable;
-   table->CopyColorTable = _mesa_CopyColorTable;
+   table->ColorSubTable = save_ColorSubTable;
+   table->ColorTable = save_ColorTable;
+   table->ColorTableParameterfv = save_ColorTableParameterfv;
+   table->ColorTableParameteriv = save_ColorTableParameteriv;
+   table->ConvolutionFilter1D = save_ConvolutionFilter1D;
+   table->ConvolutionFilter2D = save_ConvolutionFilter2D;
+   table->ConvolutionParameterf = save_ConvolutionParameterf;
+   table->ConvolutionParameterfv = save_ConvolutionParameterfv;
+   table->ConvolutionParameteri = save_ConvolutionParameteri;
+   table->ConvolutionParameteriv = save_ConvolutionParameteriv;
+   table->CopyColorSubTable = save_CopyColorSubTable;
+   table->CopyColorTable = save_CopyColorTable;
    table->CopyConvolutionFilter1D = _mesa_CopyConvolutionFilter1D;
    table->CopyConvolutionFilter2D = _mesa_CopyConvolutionFilter2D;
    table->GetColorTable = _mesa_GetColorTable;
@@ -4534,51 +5374,70 @@
    table->GetMinmaxParameterfv = _mesa_GetMinmaxParameterfv;
    table->GetMinmaxParameteriv = _mesa_GetMinmaxParameteriv;
    table->GetSeparableFilter = _mesa_GetSeparableFilter;
-   table->Histogram = _mesa_Histogram;
-   table->Minmax = _mesa_Minmax;
-   table->ResetHistogram = _mesa_ResetHistogram;
-   table->ResetMinmax = _mesa_ResetMinmax;
+   table->Histogram = save_Histogram;
+   table->Minmax = save_Minmax;
+   table->ResetHistogram = save_ResetHistogram;
+   table->ResetMinmax = save_ResetMinmax;
    table->SeparableFilter2D = _mesa_SeparableFilter2D;
+
+   /* 2. GL_EXT_blend_color */
+#if 0 
+   table->BlendColorEXT = save_BlendColorEXT;
+#endif
+
+   /* 3. GL_EXT_polygon_offset */
+   table->PolygonOffsetEXT = save_PolygonOffsetEXT;
 
-   /* GL_EXT_texture3d */
+   /* 6. GL_EXT_texture3d */
 #if 0
    table->CopyTexSubImage3DEXT = save_CopyTexSubImage3D;
    table->TexImage3DEXT = save_TexImage3DEXT;
    table->TexSubImage3DEXT = save_TexSubImage3D;
 #endif
 
-   /* GL_EXT_paletted_texture */
+   /* 15. GL_SGIX_pixel_texture */
+   table->PixelTexGenSGIX = save_PixelTexGenSGIX;
+
+   /* 15. GL_SGIS_pixel_texture */
+   table->PixelTexGenParameteriSGIS = save_PixelTexGenParameteriSGIS;
+   table->PixelTexGenParameterfSGIS = save_PixelTexGenParameterfSGIS;
+   table->PixelTexGenParameterivSGIS = save_PixelTexGenParameterivSGIS;
+   table->PixelTexGenParameterfvSGIS = save_PixelTexGenParameterfvSGIS;
+   table->GetPixelTexGenParameterivSGIS = _mesa_GetPixelTexGenParameterivSGIS;
+   table->GetPixelTexGenParameterfvSGIS = _mesa_GetPixelTexGenParameterfvSGIS;
+
+   /* 30. GL_EXT_vertex_array */
+   table->ColorPointerEXT = _mesa_ColorPointerEXT;
+   table->EdgeFlagPointerEXT = _mesa_EdgeFlagPointerEXT;
+   table->IndexPointerEXT = _mesa_IndexPointerEXT;
+   table->NormalPointerEXT = _mesa_NormalPointerEXT;
+   table->TexCoordPointerEXT = _mesa_TexCoordPointerEXT;
+   table->VertexPointerEXT = _mesa_VertexPointerEXT;
+
+   /* 37. GL_EXT_blend_minmax */
 #if 0
-   table->ColorTableEXT = save_ColorTable;
-   table->ColorSubTableEXT = save_ColorSubTable;
+   table->BlendEquationEXT = save_BlendEquationEXT;
 #endif
-   table->GetColorTableEXT = _mesa_GetColorTable;
-   table->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv;
-   table->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv;
 
-   /* GL_EXT_compiled_vertex_array */
-   table->LockArraysEXT = _mesa_LockArraysEXT;
-   table->UnlockArraysEXT = _mesa_UnlockArraysEXT;
-
-   /* GL_EXT_point_parameters */
+   /* 54. GL_EXT_point_parameters */
    table->PointParameterfEXT = save_PointParameterfEXT;
    table->PointParameterfvEXT = save_PointParameterfvEXT;
 
-   /* GL_PGI_misc_hints */
+   /* 77. GL_PGI_misc_hints */
    table->HintPGI = save_HintPGI;
-
-   /* GL_EXT_polygon_offset */
-   table->PolygonOffsetEXT = save_PolygonOffsetEXT;
 
-   /* GL_EXT_blend_minmax */
+   /* 78. GL_EXT_paletted_texture */
 #if 0
-   table->BlendEquationEXT = save_BlendEquationEXT;
+   table->ColorTableEXT = save_ColorTable;
+   table->ColorSubTableEXT = save_ColorSubTable;
 #endif
+   table->GetColorTableEXT = _mesa_GetColorTable;
+   table->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv;
+   table->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv;
 
-   /* GL_EXT_blend_color */
-#if 0 
-   table->BlendColorEXT = save_BlendColorEXT;
-#endif
+   /* 97. GL_EXT_compiled_vertex_array */
+   table->LockArraysEXT = _mesa_LockArraysEXT;
+   table->UnlockArraysEXT = _mesa_UnlockArraysEXT;
 
    /* GL_ARB_multitexture */
    table->ActiveTextureARB = save_ActiveTextureARB;
@@ -4654,6 +5513,14 @@
    table->MultTransposeMatrixdARB = save_MultTransposeMatrixdARB;
    table->MultTransposeMatrixfARB = save_MultTransposeMatrixfARB;
 
+   /* ARB 12. GL_ARB_texture_compression */
+   table->CompressedTexImage3DARB = save_CompressedTexImage3DARB;
+   table->CompressedTexImage2DARB = save_CompressedTexImage2DARB;
+   table->CompressedTexImage1DARB = save_CompressedTexImage1DARB;
+   table->CompressedTexSubImage3DARB = save_CompressedTexSubImage3DARB;
+   table->CompressedTexSubImage2DARB = save_CompressedTexSubImage2DARB;
+   table->CompressedTexSubImage1DARB = save_CompressedTexSubImage1DARB;
+   table->GetCompressedTexImageARB = _mesa_GetCompressedTexImageARB;
 }
 
 
@@ -4705,6 +5572,16 @@
             fprintf(f,"CallList %d + offset %u = %u\n", (int) n[1].ui,
                     ctx->List.ListBase, ctx->List.ListBase + n[1].ui );
             break;
+         case OPCODE_COLOR_TABLE_PARAMETER_FV:
+            fprintf(f,"ColorTableParameterfv %s %s %f %f %f %f\n",
+                    enum_string(n[1].e), enum_string(n[2].e),
+                    n[3].f, n[4].f, n[5].f, n[6].f);
+            break;
+         case OPCODE_COLOR_TABLE_PARAMETER_IV:
+            fprintf(f,"ColorTableParameteriv %s %s %d %d %d %d\n",
+                    enum_string(n[1].e), enum_string(n[2].e),
+                    n[3].i, n[4].i, n[5].i, n[6].i);
+            break;
 	 case OPCODE_DISABLE:
             fprintf(f,"Disable %s\n", enum_string(n[1].e));
 	    break;
@@ -4788,6 +5665,7 @@
 		    ((struct immediate *) n[1].data)->id,
 		    n[2].ui,
 		    n[3].ui);
+	    gl_print_cassette( (struct immediate *) n[1].data );
 	    break;
 	 case OPCODE_CONTINUE:
             fprintf(f,"DISPLAY-LIST-CONTINUE\n");
Index: xc/extras/Mesa/src/dlist.h
diff -u xc/extras/Mesa/src/dlist.h:1.3 xc/extras/Mesa/src/dlist.h:1.4
--- xc/extras/Mesa/src/dlist.h:1.3	Mon Feb 14 23:12:10 2000
+++ xc/extras/Mesa/src/dlist.h	Fri Jun 16 17:02:09 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,13 @@
  */
 
 
-
-
-
 #ifndef DLIST_H
 #define DLIST_H
 
 
 #include "types.h"
 
+
 struct display_list {
    union node *nodes;	
    GLuint OrFlag;
@@ -65,9 +63,8 @@
 extern void _mesa_ListBase( GLuint base );
 
 extern void _mesa_NewList( GLuint list, GLenum mode );
-
-extern void _mesa_init_dlist_table( struct _glapi_table *table );
 
+extern void _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize );
 
 extern void gl_compile_cassette( GLcontext *ctx );
 
Index: xc/extras/Mesa/src/drawpix.c
diff -u xc/extras/Mesa/src/drawpix.c:1.3 xc/extras/Mesa/src/drawpix.c:1.4
--- xc/extras/Mesa/src/drawpix.c:1.3	Mon Feb 14 23:12:11 2000
+++ xc/extras/Mesa/src/drawpix.c	Fri Jun 16 17:02:09 2000
@@ -33,11 +33,14 @@
 #include "feedback.h"
 #include "image.h"
 #include "macros.h"
+#include "mem.h"
 #include "mmath.h"
 #include "pixel.h"
+#include "pixeltex.h"
 #include "span.h"
 #include "state.h"
 #include "stencil.h"
+#include "texture.h"
 #include "types.h"
 #include "zoom.h"
 #endif
@@ -112,24 +115,17 @@
       return GL_TRUE;
    }
 
-   if (ctx->NewState) {
-      gl_update_state(ctx);
-   }
-
-   /* see if device driver can do the drawpix */
-   if (ctx->Driver.DrawPixels
-       && (*ctx->Driver.DrawPixels)(ctx, x, y, width, height, format, type,
-                                    unpack, pixels)) {
-      return GL_TRUE;
-   }
-
    if ((ctx->RasterMask&(~(SCISSOR_BIT|WINCLIP_BIT)))==0
-       && ctx->Pixel.RedBias==0.0 && ctx->Pixel.RedScale==1.0
-       && ctx->Pixel.GreenBias==0.0 && ctx->Pixel.GreenScale==1.0
-       && ctx->Pixel.BlueBias==0.0 && ctx->Pixel.BlueScale==1.0
-       && ctx->Pixel.AlphaBias==0.0 && ctx->Pixel.AlphaScale==1.0
+       && !ctx->Pixel.ScaleOrBiasRGBA
+       && !ctx->Pixel.ScaleOrBiasRGBApcm
+       && ctx->ColorMatrix.type == MATRIX_IDENTITY
+       && !ctx->Pixel.ColorTableEnabled
+       && !ctx->Pixel.PostColorMatrixColorTableEnabled
+       && !ctx->Pixel.MinMaxEnabled
+       && !ctx->Pixel.HistogramEnabled
        && ctx->Pixel.IndexShift==0 && ctx->Pixel.IndexOffset==0
        && ctx->Pixel.MapColorFlag==0
+       && ctx->Texture.ReallyEnabled == 0
        && unpack->Alignment==1
        && !unpack->SwapBytes
        && !unpack->LsbFirst) {
@@ -180,7 +176,7 @@
       }
       else {
          /* setup array of fragment Z value to pass to zoom function */
-         GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * DEPTH_SCALE);
+         GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->Visual->DepthMaxF);
          GLint i;
          assert(drawWidth < MAX_WIDTH);
          for (i=0; i<drawWidth; i++)
@@ -347,7 +343,7 @@
                GLint row;
                for (row=0; row<drawHeight; row++) {
                   assert(drawWidth < MAX_WIDTH);
-                  gl_map_ci8_to_rgba(ctx, drawWidth, src, rgba);
+                  _mesa_map_ci8_to_rgba(ctx, drawWidth, src, rgba);
                   (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
                                                (const GLubyte (*)[4])rgba, 
 					       NULL);
@@ -361,7 +357,7 @@
                GLint row;
                for (row=0; row<drawHeight; row++) {
                   assert(drawWidth < MAX_WIDTH);
-                  gl_map_ci8_to_rgba(ctx, drawWidth, src, rgba);
+                  _mesa_map_ci8_to_rgba(ctx, drawWidth, src, rgba);
                   gl_write_zoomed_rgba_span(ctx, drawWidth, destX, destY,
                                             zSpan, (void *) rgba, zoomY0);
                   src += rowLength;
@@ -418,7 +414,7 @@
 
    /* Fragment depth values */
    if (ctx->Depth.Test || ctx->Fog.Enabled) {
-      GLdepth zval = (GLdepth) (ctx->Current.RasterPos[2] * DEPTH_SCALE);
+      GLdepth zval = (GLdepth) (ctx->Current.RasterPos[2] * ctx->Visual->DepthMaxF);
       GLint i;
       for (i = 0; i < drawWidth; i++) {
 	 zspan[i] = zval;
@@ -430,7 +426,7 @@
     */
    for (row = 0; row < height; row++, y++) {
       GLuint indexes[MAX_WIDTH];
-      const GLvoid *source = gl_pixel_addr_in_image(&ctx->Unpack,
+      const GLvoid *source = _mesa_image_address(&ctx->Unpack,
                     pixels, width, height, GL_COLOR_INDEX, type, 0, row, 0);
       _mesa_unpack_index_span(ctx, drawWidth, GL_UNSIGNED_INT, indexes,
                               type, source, &ctx->Unpack, GL_TRUE);
@@ -455,6 +451,7 @@
                      GLenum type, const GLvoid *pixels )
 {
    const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
+   const GLboolean shift_or_offset = ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset;
    const GLint desty = y;
    GLint row, drawWidth;
 
@@ -476,17 +473,23 @@
       GLstencil values[MAX_WIDTH];
       GLenum destType = (sizeof(GLstencil) == sizeof(GLubyte))
                       ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
-      const GLvoid *source = gl_pixel_addr_in_image(&ctx->Unpack,
+      const GLvoid *source = _mesa_image_address(&ctx->Unpack,
                     pixels, width, height, GL_COLOR_INDEX, type, 0, row, 0);
       _mesa_unpack_index_span(ctx, drawWidth, destType, values,
-                              type, source, &ctx->Unpack, GL_TRUE);
+                              type, source, &ctx->Unpack, GL_FALSE);
+      if (shift_or_offset) {
+         _mesa_shift_and_offset_stencil( ctx, drawWidth, values );
+      }
+      if (ctx->Pixel.MapStencilFlag) {
+         _mesa_map_stencil( ctx, drawWidth, values );
+      }
 
       if (zoom) {
          gl_write_zoomed_stencil_span( ctx, (GLuint) drawWidth, x, y,
                                        values, desty );
       }
       else {
-         gl_write_stencil_span( ctx, (GLuint) drawWidth, x, y, values );
+         _mesa_write_stencil_span( ctx, (GLuint) drawWidth, x, y, values );
       }
    }
 }
@@ -545,30 +548,23 @@
       /* Special case: directly write 16-bit depth values */
       GLint row;
       for (row = 0; row < height; row++, y++) {
-         const GLdepth *zptr = gl_pixel_addr_in_image(&ctx->Unpack,
+         GLdepth zspan[MAX_WIDTH];
+         const GLushort *zptr = _mesa_image_address(&ctx->Unpack,
                 pixels, width, height, GL_DEPTH_COMPONENT, type, 0, row, 0);
-         gl_write_rgba_span( ctx, width, x, y, zptr, rgba, GL_BITMAP );
+         GLint i;
+         for (i = 0; i < width; i++)
+            zspan[i] = zptr[i];
+         gl_write_rgba_span( ctx, width, x, y, zspan, rgba, GL_BITMAP );
       }
    }
-   else if (type==GL_UNSIGNED_INT && sizeof(GLdepth)==sizeof(GLuint)
+   else if (type==GL_UNSIGNED_INT && ctx->Visual->DepthBits == 32
        && !bias_or_scale && !zoom && ctx->Visual->RGBAflag) {
       /* Special case: directly write 32-bit depth values */
-      GLint i, row;
-      /* Compute shift value to scale 32-bit uints down to depth values. */
-      GLuint shift = 0;
-      GLuint max = MAX_DEPTH;
-      while ((max & 0x80000000) == 0) {
-         max = max << 1;
-         shift++;
-      }
+      GLint row;
       for (row = 0; row < height; row++, y++) {
-         GLdepth zspan[MAX_WIDTH];
-         const GLdepth *zptr = gl_pixel_addr_in_image(&ctx->Unpack,
+         const GLuint *zptr = _mesa_image_address(&ctx->Unpack,
                 pixels, width, height, GL_DEPTH_COMPONENT, type, 0, row, 0);
-         for (i=0;i<width;i++) {
-            zspan[i] = zptr[i] >> shift;
-         }
-         gl_write_rgba_span( ctx, width, x, y, zspan, rgba, GL_BITMAP );
+         gl_write_rgba_span( ctx, width, x, y, zptr, rgba, GL_BITMAP );
       }
    }
    else {
@@ -576,7 +572,7 @@
       GLint row;
       for (row = 0; row < height; row++, y++) {
          GLdepth zspan[MAX_WIDTH];
-         const GLvoid *src = gl_pixel_addr_in_image(&ctx->Unpack,
+         const GLvoid *src = _mesa_image_address(&ctx->Unpack,
                 pixels, width, height, GL_DEPTH_COMPONENT, type, 0, row, 0);
          _mesa_unpack_depth_span( ctx, drawWidth, zspan, type, src,
                                   &ctx->Unpack, GL_TRUE );
@@ -625,7 +621,7 @@
    /* Fragment depth values */
    if (ctx->Depth.Test || ctx->Fog.Enabled) {
       /* fill in array of z values */
-      GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * DEPTH_SCALE);
+      GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->Visual->DepthMaxF);
       GLint i;
       for (i=0;i<width;i++) {
 	 zspan[i] = z;
@@ -652,11 +648,24 @@
       if (width > MAX_WIDTH)
          width = MAX_WIDTH;
       for (row = 0; row < height; row++, y++) {
-         const GLvoid *source = gl_pixel_addr_in_image(unpack,
+         const GLvoid *source = _mesa_image_address(unpack,
                   pixels, width, height, format, type, 0, row, 0);
          _mesa_unpack_ubyte_color_span(ctx, width, GL_RGBA, (void*) rgba,
                    format, type, source, unpack, GL_TRUE);
+         if (ctx->Pixel.MinMaxEnabled && ctx->MinMax.Sink)
+            continue;
 
+         if (ctx->Texture.ReallyEnabled && ctx->Pixel.PixelTextureEnabled) {
+            GLfloat s[MAX_WIDTH], t[MAX_WIDTH], r[MAX_WIDTH], q[MAX_WIDTH];
+            GLuint unit;
+            /* XXX not sure how multitexture is supposed to work here */
+            for (unit = 0; unit < MAX_TEXTURE_UNITS; unit++) {
+               _mesa_pixeltexgen(ctx, width, (const GLubyte (*)[4]) rgba,
+                                 s, t, r, q);
+               gl_texture_pixels(ctx, unit, width, s, t, r, NULL, rgba);
+            }
+         }
+
          if (quickDraw) {
             (*ctx->Driver.WriteRGBASpan)( ctx, width, x, y,
                                           (CONST GLubyte (*)[]) rgba, NULL);
@@ -690,8 +699,21 @@
 	 return;
       }
 
+      if (ctx->NewState) {
+         gl_update_state(ctx);
+      }
+
       x = (GLint) (ctx->Current.RasterPos[0] + 0.5F);
       y = (GLint) (ctx->Current.RasterPos[1] + 0.5F);
+
+      ctx->OcclusionResult = GL_TRUE;
+
+      /* see if device driver can do the drawpix */
+      if (ctx->Driver.DrawPixels
+          && (*ctx->Driver.DrawPixels)(ctx, x, y, width, height, format, type,
+                                       &ctx->Unpack, pixels)) {
+         return;
+      }
 
       switch (format) {
 	 case GL_STENCIL_INDEX:
Index: xc/extras/Mesa/src/enable.c
diff -u xc/extras/Mesa/src/enable.c:1.3 xc/extras/Mesa/src/enable.c:1.4
--- xc/extras/Mesa/src/enable.c:1.3	Mon Feb 14 23:12:11 2000
+++ xc/extras/Mesa/src/enable.c	Fri Jun 16 17:02:09 2000
@@ -153,6 +153,9 @@
             ctx->NewState |= NEW_FOG|NEW_RASTER_OPS;
          }
 	 break;
+      case GL_HISTOGRAM:
+         ctx->Pixel.HistogramEnabled = state;
+         break;
       case GL_LIGHT0:
       case GL_LIGHT1:
       case GL_LIGHT2:
@@ -191,6 +194,7 @@
       case GL_LINE_SMOOTH:
 	 if (ctx->Line.SmoothFlag!=state) {
             ctx->Line.SmoothFlag = state;
+	    ctx->TriangleCaps ^= DD_LINE_SMOOTH;
             ctx->NewState |= NEW_RASTER_OPS;
          }
 	 break;
@@ -267,6 +271,9 @@
       case GL_MAP2_VERTEX_4:
 	 ctx->Eval.Map2Vertex4 = state;
 	 break;
+      case GL_MINMAX:
+         ctx->Pixel.MinMaxEnabled = state;
+         break;
       case GL_NORMALIZE:
 	 if (ctx->Transform.Normalize != state) {
 	    ctx->Transform.Normalize = state;
@@ -327,8 +334,6 @@
 	 break;
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          ctx->Texture.SharedPalette = state;
-         if (ctx->Driver.UseGlobalTexturePalette)
-            (*ctx->Driver.UseGlobalTexturePalette)( ctx, state );
          break;
       case GL_STENCIL_TEST:
 	 if (state && ctx->Visual->StencilBits==0) {
@@ -452,6 +457,81 @@
          ctx->Array.EdgeFlag.Enabled = state;
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            ctx->Depth.OcclusionTest = state;
+            if (state)
+               ctx->OcclusionResult = ctx->OcclusionResultSaved;
+            else
+               ctx->OcclusionResultSaved = ctx->OcclusionResult;
+            ctx->NewState |= NEW_RASTER_OPS;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, state ? "glEnable": "glDisable" );
+            return;
+         }
+         break;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         ctx->Pixel.PixelTextureEnabled = state;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         ctx->Pixel.PixelTextureEnabled = state;
+         break;
+
+      /* GL_SGI_color_table */
+      case GL_COLOR_TABLE_SGI:
+         ctx->Pixel.ColorTableEnabled = state;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         ctx->Pixel.PostConvolutionColorTableEnabled = state;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         ctx->Pixel.PostColorMatrixColorTableEnabled = state;
+         break;
+
+      /* GL_EXT_convolution */
+      case GL_CONVOLUTION_1D:
+         ctx->Pixel.Convolution1DEnabled = state;
+         break;
+      case GL_CONVOLUTION_2D:
+         ctx->Pixel.Convolution2DEnabled = state;
+         break;
+      case GL_SEPARABLE_2D:
+         ctx->Pixel.Separable2DEnabled = state;
+         break;
+
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap) {
+            if (ctx->Visual->RGBAflag) {
+               const GLuint curr = ctx->Texture.CurrentUnit;
+               const GLuint flag = TEXTURE0_CUBE << (curr * 4);
+               struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
+               ctx->NewState |= NEW_TEXTURE_ENABLE;
+               if (state) {
+                  texUnit->Enabled |= TEXTURE0_CUBE;
+                  ctx->Enabled |= flag;
+               }
+               else {
+                  texUnit->Enabled &= ~TEXTURE0_CUBE;
+                  ctx->Enabled &= ~flag;
+               }
+            }
+         }
+         else {
+            if (state)
+               gl_error(ctx, GL_INVALID_ENUM, "glEnable");
+            else
+               gl_error(ctx, GL_INVALID_ENUM, "glDisable");
+            return;
+         }
+	 break;
+
       default:
 	 if (state) {
 	    gl_error( ctx, GL_INVALID_ENUM, "glEnable" );
@@ -516,6 +596,8 @@
 	 return ctx->Color.DitherFlag;
       case GL_FOG:
 	 return ctx->Fog.Enabled;
+      case GL_HISTOGRAM:
+         return ctx->Pixel.HistogramEnabled;
       case GL_LIGHTING:
          return ctx->Light.Enabled;
       case GL_LIGHT0:
@@ -571,6 +653,8 @@
 	 return ctx->Eval.Map2Vertex3;
       case GL_MAP2_VERTEX_4:
 	 return ctx->Eval.Map2Vertex4;
+      case GL_MINMAX:
+         return ctx->Pixel.MinMaxEnabled;
       case GL_NORMALIZE:
 	 return ctx->Transform.Normalize;
       case GL_POINT_SMOOTH:
@@ -645,6 +729,52 @@
          return ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled;
       case GL_EDGE_FLAG_ARRAY:
          return ctx->Array.EdgeFlag.Enabled;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            return ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glIsEnabled" );
+            return GL_FALSE;
+         }
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         return ctx->Pixel.PixelTextureEnabled;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         return ctx->Pixel.PixelTextureEnabled;
+
+      /* GL_SGI_color_table */
+      case GL_COLOR_TABLE_SGI:
+         return ctx->Pixel.ColorTableEnabled;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         return ctx->Pixel.PostConvolutionColorTableEnabled;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         return ctx->Pixel.PostColorMatrixColorTableEnabled;
+
+      /* GL_EXT_convolution */
+      case GL_CONVOLUTION_1D:
+         return ctx->Pixel.Convolution1DEnabled;
+      case GL_CONVOLUTION_2D:
+         return ctx->Pixel.Convolution2DEnabled;
+      case GL_SEPARABLE_2D:
+         return ctx->Pixel.Separable2DEnabled;
+
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap) {
+            const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->Enabled & TEXTURE0_CUBE) ? GL_TRUE : GL_FALSE;
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glIsEnabled");
+            return GL_FALSE;
+         }
+
       default:
 	 gl_error( ctx, GL_INVALID_ENUM, "glIsEnabled" );
 	 return GL_FALSE;
Index: xc/extras/Mesa/src/enums.c
diff -u xc/extras/Mesa/src/enums.c:1.3 xc/extras/Mesa/src/enums.c:1.4
--- xc/extras/Mesa/src/enums.c:1.3	Mon Feb 14 23:12:12 2000
+++ xc/extras/Mesa/src/enums.c	Fri Jun 16 17:02:09 2000
@@ -768,6 +768,12 @@
    { "GL_CLIENT_ACTIVE_TEXTURE_ARB", 0x84E1 },
    { "GL_MAX_TEXTURE_UNITS_ARB", 0x84E2 },
 
+   { "GL_OCCLUSION_TEST_HP", 0x8165 },
+   { "GL_OCCLUSION_TEST_RESULT_HP", 0x8166 },
+
+   { "GL_TEXTURE_FILTER_CONTROL_EXT", 0x8500 },
+   { "GL_TEXTUER_LOD_BIAS_EXT", 0x8501 },
+
    { "GL_NORMAL_MAP_NV", 0x8511 },
    { "GL_REFLECTION_MAP_NV", 0x8512 },
 
Index: xc/extras/Mesa/src/extensions.c
diff -u xc/extras/Mesa/src/extensions.c:1.4 xc/extras/Mesa/src/extensions.c:1.5
--- xc/extras/Mesa/src/extensions.c:1.4	Thu Mar  2 08:07:05 2000
+++ xc/extras/Mesa/src/extensions.c	Fri Jun 16 17:02:09 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -40,7 +40,7 @@
 
 struct extension {
    struct extension *next, *prev;
-   int enabled;
+   GLint enabled;
    char name[MAX_EXT_NAMELEN+1];
    void (*notify)( GLcontext *, GLboolean ); 
 };
@@ -48,36 +48,71 @@
 
 
 static struct { int enabled; const char *name; } default_extensions[] = {
+   { DEFAULT_OFF,    "GL_ARB_imaging" },  /* in progress */
+   { DEFAULT_ON,     "GL_ARB_multitexture" },
+   { DEFAULT_OFF,    "GL_ARB_texture_compression" },  /* in progress */
+   { DEFAULT_OFF,    "GL_ARB_texture_cube_map" },  /* in progress */
+   { ALWAYS_ENABLED, "GL_ARB_tranpose_matrix" },
+   { ALWAYS_ENABLED, "GL_EXT_abgr" },
    { DEFAULT_ON,     "GL_EXT_blend_color" },
-   { DEFAULT_OFF,    "ARB_imaging" },
-   { DEFAULT_ON,     "GL_EXT_blend_minmax" },
+   { DEFAULT_ON,     "GL_EXT_blend_func_separate" },
    { DEFAULT_ON,     "GL_EXT_blend_logic_op" },
+   { DEFAULT_ON,     "GL_EXT_blend_minmax" },
    { DEFAULT_ON,     "GL_EXT_blend_subtract" },
+   { DEFAULT_ON,     "GL_EXT_clip_volume_hint" },
+   { DEFAULT_OFF,    "GL_EXT_convolution" },  /* in progress */
+   { DEFAULT_ON,     "GL_EXT_compiled_vertex_array" },
+   { DEFAULT_ON,     "GL_EXT_histogram" },
+   { DEFAULT_ON,     "GL_EXT_packed_pixels" },
    { DEFAULT_ON,     "GL_EXT_paletted_texture" },
    { DEFAULT_ON,     "GL_EXT_point_parameters" },
    { ALWAYS_ENABLED, "GL_EXT_polygon_offset" },
-   { ALWAYS_ENABLED, "GL_EXT_vertex_array" },
-   { ALWAYS_ENABLED, "GL_EXT_texture_object" },
-   { DEFAULT_ON,     "GL_EXT_texture3D" },
-   { ALWAYS_ENABLED, "GL_MESA_window_pos" },
-   { ALWAYS_ENABLED, "GL_MESA_resize_buffers" },
-   { ALWAYS_ENABLED, "GL_EXT_shared_texture_palette" },
    { ALWAYS_ENABLED, "GL_EXT_rescale_normal" },
-   { ALWAYS_ENABLED, "GL_EXT_abgr" },
-   { ALWAYS_ENABLED, "GL_SGIS_texture_edge_clamp" },
+   { DEFAULT_ON,     "GL_EXT_shared_texture_palette" },
    { ALWAYS_ENABLED, "GL_EXT_stencil_wrap" },
+   { DEFAULT_ON,     "GL_EXT_texture3D" },
+   { DEFAULT_OFF,    "GL_EXT_texture_compression_s3tc" },
+   { DEFAULT_OFF,    "GL_EXT_texture_env" },
+   { DEFAULT_ON,     "GL_EXT_texture_env_add" },
+   { ALWAYS_ENABLED, "GL_EXT_texture_object" },
+   { DEFAULT_ON,     "GL_EXT_texture_lod_bias" },
+   { ALWAYS_ENABLED, "GL_EXT_vertex_array" },
+   { DEFAULT_OFF,    "GL_EXT_vertex_array_set" },
+   { DEFAULT_OFF,    "GL_HP_occlusion_test" },
    { DEFAULT_ON,     "GL_INGR_blend_func_separate" },
-   { DEFAULT_ON,     "GL_ARB_multitexture" },
+   { ALWAYS_ENABLED, "GL_MESA_window_pos" },
+   { ALWAYS_ENABLED, "GL_MESA_resize_buffers" },
+   { DEFAULT_OFF,    "GL_NV_blend_square" },
    { ALWAYS_ENABLED, "GL_NV_texgen_reflection" },
    { DEFAULT_ON,     "GL_PGI_misc_hints" },
-   { DEFAULT_ON,     "GL_EXT_compiled_vertex_array" },
-   { DEFAULT_OFF,    "GL_EXT_vertex_array_set" },
-   { DEFAULT_ON,     "GL_EXT_clip_volume_hint" },
-   { DEFAULT_ON,     "GL_EXT_texture_env_add" },
-   { ALWAYS_ENABLED, "GL_ARB_tranpose_matrix" },
+   { DEFAULT_ON,     "GL_SGI_color_matrix" },
+   { DEFAULT_ON,     "GL_SGI_color_table" },
+   { DEFAULT_ON,     "GL_SGIS_pixel_texture" },
+   { DEFAULT_ON,     "GL_SGIS_texture_edge_clamp" },
+   { DEFAULT_ON,     "GL_SGIX_pixel_texture" },
+   { DEFAULT_OFF,    "GL_3DFX_texture_compression_FXT1" }
 };
 
 
+/*
+ * Update the boolean convenience flags in the Extensions struct.
+ */
+static void
+update_extension_flags( GLcontext *ctx )
+{
+   /* Update flags */
+   ctx->Extensions.HaveTextureEnvAdd = gl_extension_is_enabled(ctx, "GL_EXT_texture_env_add");
+   ctx->Extensions.HaveTextureLodBias = gl_extension_is_enabled(ctx, "GL_EXT_texture_lod_bias");
+   ctx->Extensions.HaveHpOcclusionTest = gl_extension_is_enabled(ctx, "GL_HP_occlusion_test");
+   ctx->Extensions.HaveTextureCubeMap = gl_extension_is_enabled(ctx, "GL_ARB_texture_cube_map");
+   ctx->Extensions.HaveTextureCompression = gl_extension_is_enabled(ctx, "GL_ARB_texture_compression");
+   ctx->Extensions.HaveTextureCompressionS3TC = gl_extension_is_enabled(ctx, "GL_EXT_texture_compression_s3tc");
+   ctx->Extensions.HaveTextureCompressionFXT1 = gl_extension_is_enabled(ctx, "GL_3DFX_texture_compression_FXT1");
+   ctx->Extensions.HaveBlendSquare = gl_extension_is_enabled(ctx, "GL_NV_blend_square");
+}
+
+
+
 int gl_extensions_add( GLcontext *ctx, 
 		       int state, 
 		       const char *name, 
@@ -99,21 +134,26 @@
 }
 
 
-static int set_extension( GLcontext *ctx, const char *name, GLuint state )
+/*
+ * Either enable or disable the named extension.
+ */
+static int set_extension( GLcontext *ctx, const char *name, GLint state )
 {
    struct extension *i;
    foreach( i, ctx->Extensions.ext_list ) 
       if (strncmp(i->name, name, MAX_EXT_NAMELEN) == 0) 
 	 break;
 
-   if (i == ctx->Extensions.ext_list) return 1;
+   if (i == ctx->Extensions.ext_list)
+      return 1;
 
-   if (i->enabled && !(i->enabled & ALWAYS_ENABLED))
-   {
+   if (!(i->enabled & ALWAYS_ENABLED)) {
       if (i->notify) i->notify( ctx, state );      
       i->enabled = state;
    }
 
+   update_extension_flags(ctx);
+
    return 0;
 }   
 
@@ -187,6 +227,7 @@
 			 default_extensions[i].name,
 			 0 );
    }
+   update_extension_flags(ctx);
 }
 
 
Index: xc/extras/Mesa/src/extensions.h
diff -u xc/extras/Mesa/src/extensions.h:1.3 xc/extras/Mesa/src/extensions.h:1.4
--- xc/extras/Mesa/src/extensions.h:1.3	Mon Feb 14 23:12:13 2000
+++ xc/extras/Mesa/src/extensions.h	Fri Jun 16 17:02:09 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,15 +36,15 @@
 
 /* Return 0 on success.
  */
-extern int gl_extensions_add( struct gl_context *ctx, int state, 
+extern int gl_extensions_add( GLcontext *ctx, int state, 
 			      const char *name, void (*notify)( void ) );
 
-extern int gl_extensions_enable( struct gl_context *ctx, const char *name );
-extern int gl_extensions_disable( struct gl_context *ctx, const char *name );
+extern int gl_extensions_enable( GLcontext *ctx, const char *name );
+extern int gl_extensions_disable( GLcontext *ctx, const char *name );
 extern GLboolean gl_extension_is_enabled( GLcontext *ctx, const char *name);
-extern void gl_extensions_dtr( struct gl_context *ctx );
-extern void gl_extensions_ctr( struct gl_context *ctx );
-extern const char *gl_extensions_get_string( struct gl_context *ctx );
+extern void gl_extensions_dtr( GLcontext *ctx );
+extern void gl_extensions_ctr( GLcontext *ctx );
+extern const char *gl_extensions_get_string( GLcontext *ctx );
 
 #endif
 
Index: xc/extras/Mesa/src/feedback.c
diff -u xc/extras/Mesa/src/feedback.c:1.3 xc/extras/Mesa/src/feedback.c:1.4
--- xc/extras/Mesa/src/feedback.c:1.3	Mon Feb 14 23:12:13 2000
+++ xc/extras/Mesa/src/feedback.c	Fri Jun 16 17:02:09 2000
@@ -167,7 +167,7 @@
 
    win[0] = VB->Win.data[v][0];
    win[1] = VB->Win.data[v][1];
-   win[2] = VB->Win.data[v][2] / DEPTH_SCALE;
+   win[2] = VB->Win.data[v][2] / ctx->Visual->DepthMaxF;
    win[3] = 1.0 / VB->Win.data[v][3];
 
    if (ctx->Light.ShadeModel == GL_SMOOTH)
@@ -298,12 +298,13 @@
 void gl_select_triangle( GLcontext *ctx,
 			 GLuint v0, GLuint v1, GLuint v2, GLuint pv )
 {
-   struct vertex_buffer *VB = ctx->VB;
+   const struct vertex_buffer *VB = ctx->VB;
 
    if (gl_cull_triangle( ctx, v0, v1, v2, 0 )) {
-      gl_update_hitflag( ctx, VB->Win.data[v0][2] / DEPTH_SCALE );
-      gl_update_hitflag( ctx, VB->Win.data[v1][2] / DEPTH_SCALE );
-      gl_update_hitflag( ctx, VB->Win.data[v2][2] / DEPTH_SCALE );
+      const GLfloat zs = 1.0F / ctx->Visual->DepthMaxF;
+      gl_update_hitflag( ctx, VB->Win.data[v0][2] * zs );
+      gl_update_hitflag( ctx, VB->Win.data[v1][2] * zs );
+      gl_update_hitflag( ctx, VB->Win.data[v2][2] * zs );
    }
 }
 
@@ -311,21 +312,22 @@
 void gl_select_line( GLcontext *ctx,
 		     GLuint v0, GLuint v1, GLuint pv )
 {
-   struct vertex_buffer *VB = ctx->VB;
-
-   gl_update_hitflag( ctx, VB->Win.data[v0][2] / DEPTH_SCALE );
-   gl_update_hitflag( ctx, VB->Win.data[v1][2] / DEPTH_SCALE );
+   const struct vertex_buffer *VB = ctx->VB;
+   const GLfloat zs = 1.0F / ctx->Visual->DepthMaxF;
+   gl_update_hitflag( ctx, VB->Win.data[v0][2] * zs );
+   gl_update_hitflag( ctx, VB->Win.data[v1][2] * zs );
 }
 
 
 void gl_select_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
+   const GLfloat zs = 1.0F / ctx->Visual->DepthMaxF;
    GLuint i;
 
    for (i=first;i<=last;i++) {
       if (VB->ClipMask[i]==0) {
-         gl_update_hitflag( ctx, VB->Win.data[i][2] / DEPTH_SCALE);
+         gl_update_hitflag( ctx, VB->Win.data[i][2] * zs );
       }
    }
 }
Index: xc/extras/Mesa/src/fixed.h
diff -u xc/extras/Mesa/src/fixed.h:1.3 xc/extras/Mesa/src/fixed.h:1.4
--- xc/extras/Mesa/src/fixed.h:1.3	Mon Feb 14 23:12:14 2000
+++ xc/extras/Mesa/src/fixed.h	Fri Jun 16 17:02:09 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,6 @@
  */
 
 
-
-
-
 #ifndef FIXED_H
 #define FIXED_H
 
@@ -50,15 +47,6 @@
 #define FixedToFloat(X) ((X) * 0.00048828125f)
 #define PosFloatToFixed(X)      FloatToFixed(X)
 #define SignedFloatToFixed(X)   FloatToFixed(X)
-
-
-#if DEPTH_BITS==16
-/* use fixed-point interpolation */
-#define FixedToDepth(I) ((I) >> FIXED_SHIFT)
-#else
-/* don't really use fixed-point */
-#define FixedToDepth(I) (I)
-#endif
 
 
 #endif
Index: xc/extras/Mesa/src/fog.c
diff -u xc/extras/Mesa/src/fog.c:1.4 xc/extras/Mesa/src/fog.c:1.6
--- xc/extras/Mesa/src/fog.c:1.4	Mon Feb 14 23:12:14 2000
+++ xc/extras/Mesa/src/fog.c	Fri Jun 16 17:02:09 2000
@@ -33,6 +33,7 @@
 #include "macros.h"
 #include "mmath.h"
 #include "types.h"
+#include "xform.h"
 #endif
 
 
@@ -84,6 +85,8 @@
    GET_CURRENT_CONTEXT(ctx);
    GLenum m;
 
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glFog");
+
    switch (pname) {
       case GL_FOG_MODE:
          m = (GLenum) (GLint) *params;
@@ -105,23 +108,9 @@
 	 }
 	 break;
       case GL_FOG_START:
-#if 0
-         /* Prior to OpenGL 1.1, this was an error */
-         if (*params<0.0F) {
-            gl_error( ctx, GL_INVALID_VALUE, "glFog(GL_FOG_START)" );
-            return;
-         }
-#endif
 	 ctx->Fog.Start = *params;
 	 break;
       case GL_FOG_END:
-#if 0
-         /* Prior to OpenGL 1.1, this was an error */
-         if (*params<0.0F) {
-            gl_error( ctx, GL_INVALID_VALUE, "glFog(GL_FOG_END)" );
-            return;
-         }
-#endif
 	 ctx->Fog.End = *params;
 	 break;
       case GL_FOG_INDEX:
@@ -149,9 +138,13 @@
 typedef void (*fog_func)( struct vertex_buffer *VB, GLuint side, 
 			  GLubyte flag );
 
+typedef void (*fog_coord_func)( struct vertex_buffer *VB, 
+				const GLvector4f *from,
+				GLubyte flag );
 
 static fog_func fog_ci_tab[2];
 static fog_func fog_rgba_tab[2];
+static fog_coord_func make_fog_coord_tab[2];
 
 /*
  * Compute the fogged color for an array of vertices.
@@ -208,6 +201,71 @@
       }
    }
 }
+
+
+static void check_fog_coords( GLcontext *ctx, struct gl_pipeline_stage *d )
+{
+   d->type = 0;
+
+   if (ctx->FogMode==FOG_FRAGMENT)
+   {
+      d->type = PIPE_IMMEDIATE|PIPE_PRECALC;
+      d->inputs = VERT_OBJ_ANY;
+      d->outputs = VERT_FOG_COORD;
+   }
+}
+
+
+static void gl_make_fog_coords( struct vertex_buffer *VB )
+{
+   GLcontext *ctx = VB->ctx;
+
+   /* If full eye coords weren't required, just calculate the eye Z
+    * values.  
+    */
+   if (!ctx->NeedEyeCoords) {
+      GLfloat *m = ctx->ModelView.m;
+      GLfloat plane[4];
+
+      plane[0] = m[2];
+      plane[1] = m[6];
+      plane[2] = m[10];
+      plane[3] = m[14];
+
+      gl_dotprod_tab[0][VB->ObjPtr->size](&VB->Eye,
+					  2, /* fill z coordinates */
+					  VB->ObjPtr,
+					  plane,
+					  0 );
+
+      make_fog_coord_tab[0]( VB, &VB->Eye, 0 );
+   }
+   else
+   {
+      make_fog_coord_tab[0]( VB, VB->EyePtr, 0 );
+   }
+}
+
+
+/* Drivers that want fog coordinates in VB->Spec[0] alpha, can substitute this
+ * stage for the default PIPE_OP_FOG pipeline stage.
+ */
+struct gl_pipeline_stage gl_fog_coord_stage = {
+   "build fog coordinates",
+   PIPE_OP_FOG,
+   PIPE_PRECALC|PIPE_IMMEDIATE,
+   0,
+   NEW_FOG,
+   NEW_LIGHTING|NEW_RASTER_OPS|NEW_FOG|NEW_MODELVIEW,
+   0, 0,
+   0, 0, 0,
+   check_fog_coords,
+   gl_make_fog_coords 
+};
+
+
+
+
 
 /*
  * Apply fog to an array of RGBA pixels.
Index: xc/extras/Mesa/src/fog.h
diff -u xc/extras/Mesa/src/fog.h:1.3 xc/extras/Mesa/src/fog.h:1.4
--- xc/extras/Mesa/src/fog.h:1.3	Mon Feb 14 23:12:14 2000
+++ xc/extras/Mesa/src/fog.h	Fri Jun 16 17:02:10 2000
@@ -31,6 +31,9 @@
 #include "types.h"
 
 
+extern struct gl_pipeline_stage gl_fog_coord_stage;
+
+
 extern void
 _mesa_Fogf(GLenum pname, GLfloat param);
 
Index: xc/extras/Mesa/src/fog_tmp.h
diff -u xc/extras/Mesa/src/fog_tmp.h:1.3 xc/extras/Mesa/src/fog_tmp.h:1.4
--- xc/extras/Mesa/src/fog_tmp.h:1.3	Mon Feb 14 23:12:14 2000
+++ xc/extras/Mesa/src/fog_tmp.h	Fri Jun 16 17:02:10 2000
@@ -23,6 +23,177 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+/* For 3.2: Add a helper function for drivers to do fog coordinate
+ * calculation.  Not called from standard pipelines.  
+ */
+static void TAG(make_fog_coord)( struct vertex_buffer *VB,
+				 const GLvector4f *eye,
+				 GLubyte flag)
+{
+   const GLcontext *ctx = VB->ctx;
+   GLfloat end  = ctx->Fog.End;
+   GLubyte *cullmask = VB->CullMask + VB->Start;
+   GLfloat *v = eye->start;
+   GLuint stride = eye->stride;
+   GLuint n = VB->Count - VB->Start;
+   GLubyte (*out)[4];		
+   GLfloat d;
+   GLuint i;
+
+   (void) cullmask;
+   (void) flag;
+
+   /* Use specular alpha (front side) as fog coordinate.
+    */
+   out = VB->Spec[0] + VB->Start;
+
+   if (VB->EyePtr->size > 2) {
+      switch (ctx->Fog.Mode) {
+      case GL_LINEAR:
+	 d = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
+	 for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {
+	    CULLCHECK {
+	       GLfloat f = (end - ABSF(v[2])) * d;
+	       FLOAT_COLOR_TO_UBYTE_COLOR(out[i][3], f);
+	    }
+	 }
+	 break;
+      case GL_EXP:
+	 d = -ctx->Fog.Density;
+	 for ( i = 0 ; i < n ; i++, STRIDE_F(v,stride)) {
+	    CULLCHECK {
+	       GLfloat f = exp( d*ABSF(v[2]) ); /* already clamped */ 
+	       FLOAT_COLOR_TO_UBYTE_COLOR(out[i][3], f);
+	    }
+	 }
+	 break;
+      case GL_EXP2:
+	 d = -(ctx->Fog.Density*ctx->Fog.Density);
+	 for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {
+	    CULLCHECK {
+	       GLfloat z = v[2];
+	       GLfloat f = exp( d*z*z ); /* already clamped */
+	       FLOAT_COLOR_TO_UBYTE_COLOR(out[i][3], f);
+	    }
+	 }
+	 break;
+      default:
+	 gl_problem(ctx, "Bad fog mode in make_fog_coord");
+	 return;
+      }
+   }
+   else 
+   {
+      GLubyte r = 255;
+
+      if (ctx->Fog.Mode == GL_LINEAR) {
+	 GLfloat f = 1.0 - ctx->Fog.End / (ctx->Fog.End - ctx->Fog.Start);
+	 CLAMP_FLOAT_COLOR( f );
+	 FLOAT_COLOR_TO_UBYTE_COLOR(r, f);
+      } 
+
+      for (i = 0 ; i < n ; i++) 
+	 out[i][3] = r;
+   }
+}
+
+
+
+
+
+#if 0
+/* TODO : use fog coordinates as intermediate step in all fog
+ * calculations.
+ */
+
+static void TAG(fog_rgba_vertices)( struct vertex_buffer *VB,
+				    GLuint side,
+				    GLubyte flag)
+{
+   const GLcontext *ctx = VB->ctx;
+   const GLubyte rFog = ctx->Fog.ByteColor[0];
+   const GLubyte gFog = ctx->Fog.ByteColor[1];
+   const GLubyte bFog = ctx->Fog.ByteColor[2];
+   GLfloat end  = ctx->Fog.End;
+   GLubyte *cullmask = VB->CullMask + VB->Start;
+   GLubyte (*fcoord)[4] = VB->SpecPtr[0]->start;
+   GLuint stride = VB->SpecPtr[0]->stride;
+   GLuint n = VB->Count - VB->Start;
+   GLubyte *in;
+   GLuint in_stride;
+   GLubyte (*out)[4];
+   GLfloat d,t;
+   GLuint i;
+
+   (void) cullmask;
+   (void) flag;
+
+   /* Get correct source and destination for fogged colors.
+    */
+   in_stride = VB->Color[side]->stride;
+   in = VB->Color[side]->start;
+   VB->Color[side] = VB->FoggedColor[side];
+   VB->ColorPtr = VB->Color[0];
+   out = (GLubyte (*)[4])VB->Color[side]->start;
+
+   FLOAT_COLOR_TO_UBYTE_COLOR( rFog, ctx->Fog.Color[0] );
+
+   for ( i = 0 ; i < n ; i++, STRIDE_F(spec, sp_stride), in += in_stride) {
+      CULLCHECK {
+	 GLint fc = (GLint) spec[3], ifc = 255 - fc;
+	 
+	 out[i][0] = (fc * in[0] + ifc * rFog) >> 8;
+	 out[i][1] = (fc * in[1] + ifc * gFog) >> 8;
+	 out[i][2] = (fc * in[2] + ifc * bFog) >> 8;
+      }
+   }
+}
+
+
+
+static void TAG(fog_ci_vertices)( struct vertex_buffer *VB,
+				  GLuint side,
+				  GLubyte flag )
+{
+   GLcontext *ctx = VB->ctx;
+
+   GLubyte *cullmask = VB->CullMask + VB->Start;
+  
+   GLfloat *v = VB->EyePtr->start;
+   GLuint stride = VB->EyePtr->stride;
+   GLuint vertex_size = VB->EyePtr->size;
+   GLuint n = VB->EyePtr->count;
+
+   GLuint *in;
+   GLuint in_stride;
+   GLuint *out;
+   GLuint i;
+
+   (void) flag;
+   (void) cullmask;
+
+
+   in = VB->Index[side]->start;
+   in_stride = VB->Index[side]->stride;
+   VB->IndexPtr = VB->FoggedIndex[side];
+   out = VB->IndexPtr->start;
+
+
+   /* NOTE: the use of casts generates better/faster code for MIPS */
+   for ( i = 0; i < n ; i++, STRIDE_F(v,stride), STRIDE_UI(in,in_stride))
+      CULLCHECK {
+      GLfloat f = (fogend - ABSF(v[2])) * d;
+      f = CLAMP( f, 0.0, 1.0 );
+      *out = (GLint) ((GLfloat)(GLint) *in + (1.0F-f) * fogindex);
+   }
+}
+
+#endif
+
+
+
+
+
 
 
 static void TAG(fog_rgba_vertices)( struct vertex_buffer *VB,
@@ -254,6 +425,7 @@
 {
    fog_ci_tab[IDX] = TAG(fog_ci_vertices);
    fog_rgba_tab[IDX] = TAG(fog_rgba_vertices);
+   make_fog_coord_tab[IDX] = TAG(make_fog_coord);
 }
 
 #undef TAG
Index: xc/extras/Mesa/src/general_clip.h
diff -u xc/extras/Mesa/src/general_clip.h:1.3 xc/extras/Mesa/src/general_clip.h:1.4
--- xc/extras/Mesa/src/general_clip.h:1.3	Mon Feb 14 23:12:15 2000
+++ xc/extras/Mesa/src/general_clip.h	Fri Jun 16 17:02:10 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,144 +28,56 @@
  */
 
 
+#define PLANE CLIP_RIGHT_BIT
+#define CLIP_DOTPROD(K) (- X(K) + W(K))
 
-/*
- * Clip against +X
- *
- * The if conditions are known at compile time.
- */
-#define PLANE          (CLIP_RIGHT_BIT)
-#define INSIDE(K)      (X(K) <= W(K))
-#define COMPUTE_INTERSECTION( in, out, new )		\
-        dx = X(out)-X(in);				\
-        dw = W(out)-W(in);                      	\
-        t = (X(in)-W(in)) / (dw-dx);			\
-	neww = W(in) + t * dw;				\
-	X(new) = neww;					\
-	Y(new) = Y(in) + t * (Y(out) - Y(in));		\
-	if (SIZE>=3) coord[new][2] = Z(in) + t * (Z(out) - Z(in)); 		\
-	if (SIZE==4) coord[new][3] = neww;
-
    GENERAL_CLIP
 
-#undef INSIDE
+#undef CLIP_DOTPROD
 #undef PLANE
-#undef COMPUTE_INTERSECTION
 
 
-/*
- * Clip against -X
- */
-#define PLANE          (CLIP_LEFT_BIT)
-#define INSIDE(K)       (X(K) >= -W(K))
-#define COMPUTE_INTERSECTION( in, out, new )		\
-        dx = X(out)-X(in);                      	\
-        dw = W(out)-W(in);                      	\
-        t = -(X(in)+W(in)) / (dw+dx);           	\
-	neww = W(in) + t * dw;				\
-        X(new) = -neww;					\
-        Y(new) = Y(in) + t * (Y(out) - Y(in));		\
-        if (SIZE>=3) coord[new][2] = Z(in) + t * (Z(out) - Z(in));		\
-        if (SIZE==4) coord[new][3] = neww;
+#define PLANE CLIP_LEFT_BIT
+#define CLIP_DOTPROD(K) (X(K) + W(K))
 
    GENERAL_CLIP
 
-#undef INSIDE
+#undef CLIP_DOTPROD
 #undef PLANE
-#undef COMPUTE_INTERSECTION
 
+#define PLANE CLIP_TOP_BIT
+#define CLIP_DOTPROD(K) (- Y(K) + W(K))
 
-/*
- * Clip against +Y
- */
-#define PLANE          (CLIP_TOP_BIT)
-#define INSIDE(K)       (Y(K) <= W(K))
-#define COMPUTE_INTERSECTION( in, out, new )		\
-        dy = Y(out)-Y(in);                      	\
-        dw = W(out)-W(in);                      	\
-        t = (Y(in)-W(in)) / (dw-dy);            	\
-	neww = W(in) + t * dw; 				\
-        X(new) = X(in) + t * (X(out) - X(in));		\
-        Y(new) = neww;					\
-        if (SIZE>=3) coord[new][2] = Z(in) + t * (Z(out) - Z(in));		\
-        if (SIZE==4) coord[new][3] = neww;
-
    GENERAL_CLIP
 
-#undef INSIDE
+#undef CLIP_DOTPROD
 #undef PLANE
-#undef COMPUTE_INTERSECTION
-
 
-/*
- * Clip against -Y
- */
-#define PLANE          (CLIP_BOTTOM_BIT)
-#define INSIDE(K)       (Y(K) >= -W(K))
-#define COMPUTE_INTERSECTION( in, out, new )		\
-        dy = Y(out)-Y(in);                      	\
-        dw = W(out)-W(in);                      	\
-        t = -(Y(in)+W(in)) / (dw+dy);           	\
-	neww = W(in) + t * dw;				\
-        X(new) = X(in) + t * (X(out) - X(in));		\
-        Y(new) = -neww;					\
-        if (SIZE>=3) coord[new][2] = Z(in) + t * (Z(out) - Z(in));		\
-        if (SIZE==4) coord[new][3] = neww;
+#define PLANE CLIP_BOTTOM_BIT
+#define CLIP_DOTPROD(K) (Y(K) + W(K))
 
    GENERAL_CLIP
 
-#undef INSIDE
+#undef CLIP_DOTPROD
 #undef PLANE
-#undef COMPUTE_INTERSECTION
 
+#define PLANE CLIP_FAR_BIT
+#define CLIP_DOTPROD(K) (- Z(K) + W(K))
 
+   if (SIZE >= 3) { 
+      GENERAL_CLIP
+   }
 
-/*
- * Clip against +Z
- */
-#define PLANE          (CLIP_FAR_BIT)
-#define INSIDE(K)       (Z(K) <= W(K))
-#define COMPUTE_INTERSECTION( in, out, new )		\
-	   dz = Z(out)-Z(in);				\
-	   dw = W(out)-W(in);				\
-	   t = (Z(in)-W(in)) / (dw-dz);			\
-	   neww = W(in) + t * dw;			\
-	   X(new) = X(in) + t * (X(out) - X(in));	\
-	   Y(new) = Y(in) + t * (Y(out) - Y(in));	\
-	   coord[new][2] = neww;				\
-	   if (SIZE==4) coord[new][3] = neww;
-
-  if (SIZE>=3) { 
-   GENERAL_CLIP
-  }
-
-#undef INSIDE
+#undef CLIP_DOTPROD
 #undef PLANE
-#undef COMPUTE_INTERSECTION
 
+#define PLANE CLIP_NEAR_BIT
+#define CLIP_DOTPROD(K) (Z(K) + W(K))
 
-/*
- * Clip against -Z
- */
-#define PLANE          (CLIP_NEAR_BIT)
-#define INSIDE(K)       (Z(K) >= -W(K))
-#define COMPUTE_INTERSECTION( in, out, new )	\
-        dz = Z(out)-Z(in);			\
-        dw = W(out)-W(in);			\
-        t = -(Z(in)+W(in)) / (dw+dz);		\
-	neww = W(in) + t * dw;			\
-        X(new) = X(in) + t * (X(out) - X(in));	\
-        Y(new) = Y(in) + t * (Y(out) - Y(in));	\
-        coord[new][2] = -neww;				\
-        if (SIZE==4) coord[new][3] = neww; 
-
-  if (SIZE>=3) { 
-   GENERAL_CLIP
-  }
+   if (SIZE >=3 ) { 
+      GENERAL_CLIP
+   }
 
-#undef INSIDE
+#undef CLIP_DOTPROD
 #undef PLANE
-#undef COMPUTE_INTERSECTION
 #undef GENERAL_CLIP
-
-
Index: xc/extras/Mesa/src/get.c
diff -u xc/extras/Mesa/src/get.c:1.4 xc/extras/Mesa/src/get.c:1.5
--- xc/extras/Mesa/src/get.c:1.4	Thu Mar  2 08:07:05 2000
+++ xc/extras/Mesa/src/get.c	Fri Jun 16 17:02:10 2000
@@ -57,7 +57,29 @@
 #endif
 
 
+static GLenum
+pixel_texgen_mode(const GLcontext *ctx)
+{
+   if (ctx->Pixel.FragmentRgbSource == GL_CURRENT_RASTER_POSITION) {
+      if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_POSITION) {
+         return GL_RGBA;
+      }
+      else {
+         return GL_RGB;
+      }
+   }
+   else {
+      if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_POSITION) {
+         return GL_ALPHA;
+      }
+      else {
+         return GL_NONE;
+      }
+   }
+}
 
+
+
 void
 _mesa_GetBooleanv( GLenum pname, GLboolean *params )
 {
@@ -74,10 +96,16 @@
 
    switch (pname) {
       case GL_ACCUM_RED_BITS:
+         *params = INT_TO_BOOL(ctx->Visual->AccumRedBits);
+         break;
       case GL_ACCUM_GREEN_BITS:
+         *params = INT_TO_BOOL(ctx->Visual->AccumGreenBits);
+         break;
       case GL_ACCUM_BLUE_BITS:
+         *params = INT_TO_BOOL(ctx->Visual->AccumBlueBits);
+         break;
       case GL_ACCUM_ALPHA_BITS:
-         *params = INT_TO_BOOL(ctx->Visual->AccumBits);
+         *params = INT_TO_BOOL(ctx->Visual->AccumAlphaBits);
          break;
       case GL_ACCUM_CLEAR_VALUE:
          params[0] = FLOAT_TO_BOOL(ctx->Accum.ClearColor[0]);
@@ -318,6 +346,9 @@
       case GL_GREEN_SCALE:
          *params = FLOAT_TO_BOOL(ctx->Pixel.GreenScale);
 	 break;
+      case GL_HISTOGRAM:
+         *params = ctx->Pixel.HistogramEnabled;
+	 break;
       case GL_INDEX_BITS:
          *params = INT_TO_BOOL( ctx->Visual->IndexBits );
 	 break;
@@ -539,6 +570,9 @@
 	 params[0] = INT_TO_BOOL(MAX_WIDTH);
 	 params[1] = INT_TO_BOOL(MAX_HEIGHT);
 	 break;
+      case GL_MINMAX:
+         *params = ctx->Pixel.MinMaxEnabled;
+         break;
       case GL_MODELVIEW_MATRIX:
 	 for (i=0;i<16;i++) {
 	    params[i] = FLOAT_TO_BOOL(ctx->ModelView.m[i]);
@@ -611,7 +645,7 @@
 	 *params = INT_TO_BOOL(ctx->Pixel.MapStoSsize);
 	 break;
       case GL_POINT_SIZE:
-	 *params = FLOAT_TO_BOOL(ctx->Point.Size );
+	 *params = FLOAT_TO_BOOL(ctx->Point.UserSize);
 	 break;
       case GL_POINT_SIZE_GRANULARITY:
 	 *params = FLOAT_TO_BOOL(ctx->Const.PointSizeGranularity );
@@ -747,13 +781,13 @@
 	 *params = INT_TO_BOOL(ctx->Const.SubPixelBits);
 	 break;
       case GL_TEXTURE_1D:
-         *params = _mesa_IsEnabled(GL_TEXTURE_1D );
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D);
 	 break;
       case GL_TEXTURE_2D:
-         *params = _mesa_IsEnabled(GL_TEXTURE_2D );
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D);
 	 break;
       case GL_TEXTURE_3D:
-         *params = _mesa_IsEnabled(GL_TEXTURE_3D );
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D);
 	 break;
       case GL_TEXTURE_BINDING_1D:
          *params = INT_TO_BOOL(textureUnit->CurrentD[1]->Name);
@@ -763,7 +797,7 @@
           break;
       case GL_TEXTURE_BINDING_3D:
          *params = INT_TO_BOOL(textureUnit->CurrentD[3]->Name);
-          break;
+         break;
       case GL_TEXTURE_ENV_COLOR:
          {
             params[0] = FLOAT_TO_BOOL(textureUnit->EnvColor[0]);
@@ -908,6 +942,7 @@
          *params = INT_TO_BOOL(ctx->Array.EdgeFlag.Stride);
          break;
 
+      /* GL_ARB_multitexture */
       case GL_MAX_TEXTURE_UNITS_ARB:
          *params = ctx->Const.MaxTextureUnits;
          break;
@@ -918,6 +953,51 @@
          *params = INT_TO_BOOL(GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
          break;
 
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+         return;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = INT_TO_BOOL(textureUnit->CurrentCubeMap->Name);
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+         return;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = INT_TO_BOOL(ctx->Const.MaxCubeTextureSize);
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = INT_TO_BOOL(ctx->Hint.TextureCompression);
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = INT_TO_BOOL(ctx->Const.NumCompressedTextureFormats);
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            GLuint i;
+            for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++)
+               params[i] = INT_TO_BOOL(ctx->Const.CompressedTextureFormats[i]);
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+         break;
+
       /* GL_PGI_misc_hints */
       case GL_STRICT_DEPTHFUNC_HINT_PGI:
 	 *params = ENUM_TO_BOOL(GL_NICEST);
@@ -934,12 +1014,12 @@
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawSpn == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawSpn == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -948,8 +1028,8 @@
       case GL_ALLOW_DRAW_WIN_HINT_PGI:
 	 *params = (GLboolean) ctx->Hint.AllowDrawWin;
 	 break;
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
-	 *params = (GLboolean) ctx->Hint.AllowDrawSpn;
+      case GL_ALLOW_DRAW_FRG_HINT_PGI:
+	 *params = (GLboolean) ctx->Hint.AllowDrawFrg;
 	 break;
       case GL_ALLOW_DRAW_MEM_HINT_PGI:
 	 *params = (GLboolean) ctx->Hint.AllowDrawMem;
@@ -978,7 +1058,14 @@
 
       /* GL_ARB_transpose_matrix */
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
-         /* don't have a color matrix */
+         {
+            GLfloat tm[16];
+            GLuint i;
+            gl_matrix_transposef(tm, ctx->ColorMatrix.m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
          break;
       case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
          {
@@ -1011,8 +1098,124 @@
          }
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+         }
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            if (ctx->Depth.OcclusionTest)
+               *params = ctx->OcclusionResult;
+            else
+               *params = ctx->OcclusionResultSaved;
+            /* reset flag now */
+            ctx->OcclusionResult = GL_FALSE;
+            ctx->OcclusionResultSaved = GL_FALSE;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+         }
+         return;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLboolean) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+	    params[i] = FLOAT_TO_BOOL(ctx->ColorMatrix.m[i]);
+	 }
+	 break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = INT_TO_BOOL(ctx->ColorStackDepth + 1);
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = FLOAT_TO_BOOL(MAX_COLOR_STACK_DEPTH);
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[3]);
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[3]);
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_MAX_CONVOLUTION_WIDTH:
+         *params = INT_TO_BOOL(ctx->Const.MaxConvolutionWidth);
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         *params = INT_TO_BOOL(ctx->Const.MaxConvolutionHeight);
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[3]);
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[2]);
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
       default:
-	 printf("invalid enum: %x\n", pname);
          gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
    }
 }
@@ -1036,10 +1239,16 @@
 
    switch (pname) {
       case GL_ACCUM_RED_BITS:
+         *params = (GLdouble) ctx->Visual->AccumRedBits;
+         break;
       case GL_ACCUM_GREEN_BITS:
+         *params = (GLdouble) ctx->Visual->AccumGreenBits;
+         break;
       case GL_ACCUM_BLUE_BITS:
+         *params = (GLdouble) ctx->Visual->AccumBlueBits;
+         break;
       case GL_ACCUM_ALPHA_BITS:
-         *params = (GLdouble) ctx->Visual->AccumBits;
+         *params = (GLdouble) ctx->Visual->AccumAlphaBits;
          break;
       case GL_ACCUM_CLEAR_VALUE:
          params[0] = (GLdouble) ctx->Accum.ClearColor[0];
@@ -1280,6 +1489,9 @@
       case GL_GREEN_SCALE:
          *params = (GLdouble) ctx->Pixel.GreenScale;
          break;
+      case GL_HISTOGRAM:
+         *params = (GLdouble) ctx->Pixel.HistogramEnabled;
+	 break;
       case GL_INDEX_BITS:
          *params = (GLdouble) ctx->Visual->IndexBits;
 	 break;
@@ -1501,6 +1713,9 @@
          params[0] = (GLdouble) MAX_WIDTH;
          params[1] = (GLdouble) MAX_HEIGHT;
          break;
+      case GL_MINMAX:
+         *params = (GLdouble) ctx->Pixel.MinMaxEnabled;
+         break;
       case GL_MODELVIEW_MATRIX:
 	 for (i=0;i<16;i++) {
 	    params[i] = (GLdouble) ctx->ModelView.m[i];
@@ -1573,7 +1788,7 @@
 	 *params = (GLdouble) ctx->Pixel.MapStoSsize;
 	 break;
       case GL_POINT_SIZE:
-         *params = (GLdouble) ctx->Point.Size;
+         *params = (GLdouble) ctx->Point.UserSize;
          break;
       case GL_POINT_SIZE_GRANULARITY:
 	 *params = (GLdouble) ctx->Const.PointSizeGranularity;
@@ -1870,6 +2085,7 @@
          *params = 0.0;
          break;
 
+      /* GL_ARB_multitexture */
       case GL_MAX_TEXTURE_UNITS_ARB:
          *params = (GLdouble) ctx->Const.MaxTextureUnits;
          break;
@@ -1880,6 +2096,50 @@
          *params = (GLdouble) (GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
          break;
 
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = (GLdouble) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+         return;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = (GLdouble) textureUnit->CurrentCubeMap->Name;
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+         return;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = (GLdouble) ctx->Const.MaxCubeTextureSize;
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+         return;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = (GLdouble) ctx->Hint.TextureCompression;
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = (GLdouble) ctx->Const.NumCompressedTextureFormats;
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            GLuint i;
+            for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++)
+               params[i] = (GLdouble) ctx->Const.CompressedTextureFormats[i];
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+         break;
 
       /* GL_PGI_misc_hints */
       case GL_STRICT_DEPTHFUNC_HINT_PGI:
@@ -1897,12 +2157,12 @@
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawSpn == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawSpn == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -1911,8 +2171,8 @@
       case GL_ALLOW_DRAW_WIN_HINT_PGI:
 	 *params = (GLdouble) ctx->Hint.AllowDrawWin;
 	 break;
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
-	 *params = (GLdouble) ctx->Hint.AllowDrawSpn;
+      case GL_ALLOW_DRAW_FRG_HINT_PGI:
+	 *params = (GLdouble) ctx->Hint.AllowDrawFrg;
 	 break;
       case GL_ALLOW_DRAW_MEM_HINT_PGI:
 	 *params = (GLdouble) ctx->Hint.AllowDrawMem;
@@ -1941,7 +2201,14 @@
 
       /* GL_ARB_transpose_matrix */
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
-         /* don't have a color matrix */
+         {
+            GLfloat tm[16];
+            GLuint i;
+            gl_matrix_transposef(tm, ctx->ColorMatrix.m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
          break;
       case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
          {
@@ -1974,8 +2241,124 @@
          }
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLdouble) ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+         }
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            if (ctx->Depth.OcclusionTest)
+               *params = (GLdouble) ctx->OcclusionResult;
+            else
+               *params = (GLdouble) ctx->OcclusionResultSaved;
+            /* reset flag now */
+            ctx->OcclusionResult = GL_FALSE;
+            ctx->OcclusionResultSaved = GL_FALSE;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+         }
+         return;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = (GLdouble) ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = (GLdouble) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLdouble) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+	    params[i] = (GLdouble) ctx->ColorMatrix.m[i];
+	 }
+	 break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLdouble) (ctx->ColorStackDepth + 1);
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLdouble) MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[3];
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[3];
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_MAX_CONVOLUTION_WIDTH:
+         *params = (GLdouble) ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         *params = (GLdouble) ctx->Const.MaxConvolutionHeight;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
       default:
-	 printf("invalid enum: %x\n", pname);
          gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
    }
 }
@@ -1999,10 +2382,16 @@
 
    switch (pname) {
       case GL_ACCUM_RED_BITS:
+         *params = (GLfloat) ctx->Visual->AccumRedBits;
+         break;
       case GL_ACCUM_GREEN_BITS:
+         *params = (GLfloat) ctx->Visual->AccumGreenBits;
+         break;
       case GL_ACCUM_BLUE_BITS:
+         *params = (GLfloat) ctx->Visual->AccumBlueBits;
+         break;
       case GL_ACCUM_ALPHA_BITS:
-         *params = (GLfloat) ctx->Visual->AccumBits;
+         *params = (GLfloat) ctx->Visual->AccumAlphaBits;
          break;
       case GL_ACCUM_CLEAR_VALUE:
          params[0] = ctx->Accum.ClearColor[0];
@@ -2240,6 +2629,9 @@
       case GL_GREEN_SCALE:
          *params = (GLfloat) ctx->Pixel.GreenScale;
          break;
+      case GL_HISTOGRAM:
+         *params = (GLfloat) ctx->Pixel.HistogramEnabled;
+	 break;
       case GL_INDEX_BITS:
          *params = (GLfloat) ctx->Visual->IndexBits;
 	 break;
@@ -2461,6 +2853,9 @@
          params[0] = (GLfloat) MAX_WIDTH;
          params[1] = (GLfloat) MAX_HEIGHT;
          break;
+      case GL_MINMAX:
+         *params = (GLfloat) ctx->Pixel.MinMaxEnabled;
+         break;
       case GL_MODELVIEW_MATRIX:
 	 for (i=0;i<16;i++) {
 	    params[i] = ctx->ModelView.m[i];
@@ -2533,7 +2928,7 @@
 	 *params = (GLfloat) ctx->Pixel.MapStoSsize;
 	 break;
       case GL_POINT_SIZE:
-         *params = (GLfloat) ctx->Point.Size;
+         *params = (GLfloat) ctx->Point.UserSize;
          break;
       case GL_POINT_SIZE_GRANULARITY:
 	 *params = (GLfloat) ctx->Const.PointSizeGranularity;
@@ -2832,6 +3227,7 @@
          *params = 0.0;
          break;
 
+      /* GL_ARB_multitexture */
       case GL_MAX_TEXTURE_UNITS_ARB:
          *params = (GLfloat) ctx->Const.MaxTextureUnits;
          break;
@@ -2842,6 +3238,51 @@
          *params = (GLfloat) (GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
          break;
 
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+         return;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = (GLfloat) textureUnit->CurrentCubeMap->Name;
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+         return;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = (GLfloat) ctx->Const.MaxCubeTextureSize;
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+         return;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = (GLfloat) ctx->Hint.TextureCompression;
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = (GLfloat) ctx->Const.NumCompressedTextureFormats;
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            GLuint i;
+            for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++)
+               params[i] = (GLfloat) ctx->Const.CompressedTextureFormats[i];
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+         break;
+
       /* GL_PGI_misc_hints */
       case GL_STRICT_DEPTHFUNC_HINT_PGI:
 	 *params = ENUM_TO_FLOAT(GL_NICEST);
@@ -2858,12 +3299,12 @@
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawSpn == GL_FALSE && 
+			      ctx->Hint.AllowDrawFrg == GL_FALSE && 
 			      ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-			      ctx->Hint.AllowDrawSpn == GL_TRUE && 
+			      ctx->Hint.AllowDrawFrg == GL_TRUE && 
 			      ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -2872,8 +3313,8 @@
       case GL_ALLOW_DRAW_WIN_HINT_PGI:
 	 *params = (GLfloat) ctx->Hint.AllowDrawWin;
 	 break;
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
-	 *params = (GLfloat) ctx->Hint.AllowDrawSpn;
+      case GL_ALLOW_DRAW_FRG_HINT_PGI:
+	 *params = (GLfloat) ctx->Hint.AllowDrawFrg;
 	 break;
       case GL_ALLOW_DRAW_MEM_HINT_PGI:
 	 *params = (GLfloat) ctx->Hint.AllowDrawMem;
@@ -2902,7 +3343,7 @@
 
       /* GL_ARB_transpose_matrix */
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
-         /* don't have a color matrix */
+         gl_matrix_transposef(params, ctx->ColorMatrix.m);
          break;
       case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
          gl_matrix_transposef(params, ctx->ModelView.m);
@@ -2914,8 +3355,124 @@
          gl_matrix_transposef(params, ctx->TextureMatrix[texTransformUnit].m);
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLfloat) ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+         }
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            if (ctx->Depth.OcclusionTest)
+               *params = (GLfloat) ctx->OcclusionResult;
+            else
+               *params = (GLfloat) ctx->OcclusionResultSaved;
+            /* reset flag now */
+            ctx->OcclusionResult = GL_FALSE;
+            ctx->OcclusionResultSaved = GL_FALSE;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+         }
+         return;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = (GLfloat) ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = (GLfloat) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLfloat) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+	    params[i] = ctx->ColorMatrix.m[i];
+	 }
+	 break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLfloat) (ctx->ColorStackDepth + 1);
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLfloat) MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[3];
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[3];
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_MAX_CONVOLUTION_WIDTH:
+         *params = (GLfloat) ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         *params = (GLfloat) ctx->Const.MaxConvolutionHeight;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         *params = ctx->Pixel.PostConvolutionScale[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         *params = ctx->Pixel.PostConvolutionScale[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         *params = ctx->Pixel.PostConvolutionScale[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         *params = ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         *params = ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         *params = ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         *params = ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         *params = ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
       default:
-	 printf("invalid enum: %x\n", pname);
          gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
    }
 }
@@ -2939,10 +3496,16 @@
 
    switch (pname) {
       case GL_ACCUM_RED_BITS:
+         *params = (GLint) ctx->Visual->AccumRedBits;
+         break;
       case GL_ACCUM_GREEN_BITS:
+         *params = (GLint) ctx->Visual->AccumGreenBits;
+         break;
       case GL_ACCUM_BLUE_BITS:
+         *params = (GLint) ctx->Visual->AccumBlueBits;
+         break;
       case GL_ACCUM_ALPHA_BITS:
-         *params = (GLint) ctx->Visual->AccumBits;
+         *params = (GLint) ctx->Visual->AccumAlphaBits;
          break;
       case GL_ACCUM_CLEAR_VALUE:
          params[0] = FLOAT_TO_INT( ctx->Accum.ClearColor[0] );
@@ -3184,6 +3747,9 @@
       case GL_GREEN_SCALE:
          *params = (GLint) ctx->Pixel.GreenScale;
          break;
+      case GL_HISTOGRAM:
+         *params = (GLint) ctx->Pixel.HistogramEnabled;
+	 break;
       case GL_INDEX_BITS:
          *params = (GLint) ctx->Visual->IndexBits;
          break;
@@ -3405,6 +3971,9 @@
          params[0] = (GLint) MAX_WIDTH;
          params[1] = (GLint) MAX_HEIGHT;
          break;
+      case GL_MINMAX:
+         *params = (GLint) ctx->Pixel.MinMaxEnabled;
+         break;
       case GL_MODELVIEW_MATRIX:
 	 for (i=0;i<16;i++) {
 	    params[i] = (GLint) ctx->ModelView.m[i];
@@ -3477,7 +4046,7 @@
 	 *params = ctx->Pixel.MapStoSsize;
 	 break;
       case GL_POINT_SIZE:
-         *params = (GLint) ctx->Point.Size;
+         *params = (GLint) ctx->Point.UserSize;
          break;
       case GL_POINT_SIZE_GRANULARITY:
 	 *params = (GLint) ctx->Const.PointSizeGranularity;
@@ -3774,6 +4343,7 @@
          *params = 0;
          break;
 
+      /* GL_ARB_multitexture */
       case GL_MAX_TEXTURE_UNITS_ARB:
          *params = ctx->Const.MaxTextureUnits;
          break;
@@ -3784,6 +4354,51 @@
          *params = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;
          break;
 
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = (GLint) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+         return;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = textureUnit->CurrentCubeMap->Name;
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+         return;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            *params = ctx->Const.MaxCubeTextureSize;
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+         return;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = (GLint) ctx->Hint.TextureCompression;
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = (GLint) ctx->Const.NumCompressedTextureFormats;
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            GLuint i;
+            for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++)
+               params[i] = (GLint) ctx->Const.CompressedTextureFormats[i];
+         }
+         else
+            gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+         break;
+
       /* GL_PGI_misc_hints */
       case GL_STRICT_DEPTHFUNC_HINT_PGI:
 	 *params = (GL_NICEST);
@@ -3793,19 +4408,19 @@
 	 break;
       case GL_STRICT_SCISSOR_HINT_PGI:
       case GL_FULL_STIPPLE_HINT_PGI:
-	 *params = (GL_TRUE);
+	 *params = GL_TRUE;
 	 break;
       case GL_CONSERVE_MEMORY_HINT_PGI:
-	 *params = (GL_FALSE);
+	 *params = GL_FALSE;
 	 break;
       case GL_ALWAYS_FAST_HINT_PGI:
 	 *params = (ctx->Hint.AllowDrawWin == GL_TRUE &&
-		    ctx->Hint.AllowDrawSpn == GL_FALSE && 
+		    ctx->Hint.AllowDrawFrg == GL_FALSE && 
 		    ctx->Hint.AllowDrawMem == GL_FALSE);
 	 break;
       case GL_ALWAYS_SOFT_HINT_PGI:
 	 *params =  (ctx->Hint.AllowDrawWin == GL_TRUE &&
-		     ctx->Hint.AllowDrawSpn == GL_TRUE && 
+		     ctx->Hint.AllowDrawFrg == GL_TRUE && 
 		     ctx->Hint.AllowDrawMem == GL_TRUE);
 	 break;
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -3814,8 +4429,8 @@
       case GL_ALLOW_DRAW_WIN_HINT_PGI:
 	 *params = ctx->Hint.AllowDrawWin;
 	 break;
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
-	 *params = ctx->Hint.AllowDrawSpn;
+      case GL_ALLOW_DRAW_FRG_HINT_PGI:
+	 *params = ctx->Hint.AllowDrawFrg;
 	 break;
       case GL_ALLOW_DRAW_MEM_HINT_PGI:
 	 *params = ctx->Hint.AllowDrawMem;
@@ -3828,7 +4443,7 @@
 	 *params = GL_DONT_CARE;
 	 break;
       case GL_BACK_NORMALS_HINT_PGI:
-	 *params = (GL_TRUE);
+	 *params = GL_TRUE;
 	 break;
       case GL_NATIVE_GRAPHICS_HANDLE_PGI:
 	 *params = 0;
@@ -3844,7 +4459,14 @@
 	 
       /* GL_ARB_transpose_matrix */
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
-         /* don't have a color matrix */
+         {
+            GLfloat tm[16];
+            GLuint i;
+            gl_matrix_transposef(tm, ctx->ColorMatrix.m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
          break;
       case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
          {
@@ -3877,8 +4499,124 @@
          }
          break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            *params = (GLint) ctx->Depth.OcclusionTest;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+         }
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         if (ctx->Extensions.HaveHpOcclusionTest) {
+            if (ctx->Depth.OcclusionTest)
+               *params = (GLint) ctx->OcclusionResult;
+            else
+               *params = (GLint) ctx->OcclusionResultSaved;
+            /* reset flag now */
+            ctx->OcclusionResult = GL_FALSE;
+            ctx->OcclusionResultSaved = GL_FALSE;
+         }
+         else {
+            gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+         }
+         return;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = (GLint) ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = (GLint) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLint) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+	    params[i] = (GLint) ctx->ColorMatrix.m[i];
+	 }
+	 break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = ctx->ColorStackDepth + 1;
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[3];
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[3];
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_MAX_CONVOLUTION_WIDTH:
+         *params = ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         *params = ctx->Const.MaxConvolutionHeight;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = (GLint) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = (GLint) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = (GLint) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
       default:
-	 printf("invalid enum: %x\n", pname);
          gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
    }
 }
Index: xc/extras/Mesa/src/glapi.c
diff -u xc/extras/Mesa/src/glapi.c:1.6 xc/extras/Mesa/src/glapi.c:1.7
--- xc/extras/Mesa/src/glapi.c:1.6	Thu Mar  2 08:07:06 2000
+++ xc/extras/Mesa/src/glapi.c	Fri Jun 16 17:02:10 2000
@@ -72,6 +72,18 @@
 static GLuint MaxDispatchOffset = sizeof(struct _glapi_table) / sizeof(void *) - 1;
 static GLboolean GetSizeCalled = GL_FALSE;
 
+/* strdup is actually not a standard ANSI C or POSIX routine
+   Irix will not define it if ANSI mode is in effect. */
+static char *str_dup(const char *str)
+{
+   char *copy;
+   copy = (char*) malloc(strlen(str) + 1);
+   if (!copy)
+      return NULL;
+   strcpy(copy, str);
+   return copy;
+}
+
 
 
 /*
@@ -222,366 +234,24 @@
 }
 
 
-struct name_address_offset {
-   const char *Name;
-   GLvoid *Address;
-   GLuint Offset;
-};
-
-static struct name_address_offset static_functions[1000];
-
-
-
-/*
- * Return dispatch table offset of the named static (built-in) function.
- * Return -1 if function not found.
- */
-static GLint
-get_static_proc_offset(const char *funcName)
-{
-   GLuint i;
-   for (i = 0; static_functions[i].Name; i++) {
-      if (strcmp(static_functions[i].Name, funcName) == 0) {
-         return static_functions[i].Offset;
-      }
-   }
-   return -1;
-}
-
-
-/*
- * Return dispatch function address the named static (built-in) function.
- * Return NULL if function not found.
- */
-static GLvoid *
-get_static_proc_address(const char *funcName)
-{
-   GLint i = get_static_proc_offset(funcName);
-   if (i >= 0)
-      return static_functions[i].Address;
-   else
-      return NULL;
-}
-
-
-
-/**********************************************************************
- * Extension function management.
- */
-
-
-#define MAX_EXTENSION_FUNCS 1000
-
-static struct name_address_offset ExtEntryTable[MAX_EXTENSION_FUNCS];
-static GLuint NumExtEntryPoints = 0;
-
-
-
-/*
- * Generate a dispatch function (entrypoint) which jumps through
- * the given slot number (offset) in the current dispatch table.
- * We need assembly language in order to accomplish this.
- */
-static void *
-generate_entrypoint(GLuint functionOffset)
-{
-#if defined(USE_X86_ASM)
-   /*
-    * This x86 code contributed by Josh Vanderhoof.
-    *
-    *  0:   a1 10 32 54 76          movl   __glapi_Dispatch,%eax
-    *       00 01 02 03 04
-    *  5:   85 c0                   testl  %eax,%eax
-    *       05 06
-    *  7:   74 06                   je     f <entrypoint+0xf>
-    *       07 08
-    *  9:   ff a0 10 32 54 76       jmp    *0x76543210(%eax)
-    *       09 0a 0b 0c 0d 0e
-    *  f:   e8 fc ff ff ff          call   __glapi_get_dispatch
-    *       0f 10 11 12 13
-    * 14:   ff a0 10 32 54 76       jmp    *0x76543210(%eax)
-    *       14 15 16 17 18 19
-    */
-   static const unsigned char temp[] = {
-      0xa1, 0x00, 0x00, 0x00, 0x00,
-      0x85, 0xc0,
-      0x74, 0x06,
-      0xff, 0xa0, 0x00, 0x00, 0x00, 0x00,
-      0xe8, 0x00, 0x00, 0x00, 0x00,
-      0xff, 0xa0, 0x00, 0x00, 0x00, 0x00
-   };
-   unsigned char *code = malloc(sizeof(temp));
-   unsigned int next_insn;
-   if (code) {
-      memcpy(code, temp, sizeof(temp));
-
-      *(unsigned int *)(code + 0x01) = (unsigned int)&_glapi_Dispatch;
-      *(unsigned int *)(code + 0x0b) = (unsigned int)functionOffset * 4;
-      next_insn = (unsigned int)(code + 0x14);
-      *(unsigned int *)(code + 0x10) = (unsigned int)_glapi_get_dispatch - next_insn;
-      *(unsigned int *)(code + 0x16) = (unsigned int)functionOffset * 4;
-   }
-   return code;
-#else
-   return NULL;
-#endif
-}
-
-
-
-/*
- * Add a new extension function entrypoint.
- * Return: GL_TRUE = success or GL_FALSE = failure
- */
-GLboolean
-_glapi_add_entrypoint(const char *funcName, GLuint offset)
-{
-   /* Make sure we don't try to add a new entrypoint after someone
-    * has already called _glapi_get_dispatch_table_size()!  If that's
-    * happened the caller's information will now be out of date.
-    */
-   assert(!GetSizeCalled);
-
-   /* first check if the named function is already statically present */
-   {
-      GLint index = get_static_proc_offset(funcName);
-      if (index >= 0) {
-         return (GLboolean) (index == offset);  /* bad offset! */
-      }
-   }
-
-   {
-      /* make sure this offset/name pair is legal */
-      const char *name = _glapi_get_proc_name(offset);
-      if (name && strcmp(name, funcName) != 0)
-         return GL_FALSE;  /* bad name! */
-   }
-
-   {
-      /* be sure index and name match known data */
-      GLuint i;
-      for (i = 0; i < NumExtEntryPoints; i++) {
-         if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
-            /* function already registered with api */
-            if (ExtEntryTable[i].Offset == offset) {
-               return GL_TRUE;  /* offsets match */
-            }
-            else {
-               return GL_FALSE;  /* bad offset! */
-            }
-         }
-      }
-
-      /* make sure we have space */
-      if (NumExtEntryPoints >= MAX_EXTENSION_FUNCS) {
-         return GL_FALSE;
-      }
-      else {
-         void *entrypoint = generate_entrypoint(offset);
-         if (!entrypoint)
-            return GL_FALSE;
-
-         ExtEntryTable[NumExtEntryPoints].Name = strdup(funcName);
-         ExtEntryTable[NumExtEntryPoints].Offset = offset;
-         ExtEntryTable[NumExtEntryPoints].Address = entrypoint;
-         NumExtEntryPoints++;
-
-         if (offset > MaxDispatchOffset)
-            MaxDispatchOffset = offset;
-
-         return GL_TRUE;  /* success */
-      }
-   }
-
-   /* should never get here, but play it safe */
-   return GL_FALSE;
-}
-
-
-
-#if 0000 /* prototype code for dynamic extension slot allocation */
-
-static int NextFreeOffset = 409; /*XXX*/
-#define MAX_DISPATCH_TABLE_SIZE 1000
-
-/*
- * Dynamically allocate a dispatch slot for an extension entrypoint
- * and generate the assembly language dispatch stub.
- * Return the dispatch offset for the function or -1 if no room or error.
- */
-GLint
-_glapi_add_entrypoint2(const char *funcName)
-{
-   int offset;
-
-   /* first see if extension func is already known */
-   offset = _glapi_get_proc_offset(funcName);
-   if (offset >= 0)
-      return offset;
-
-   if (NumExtEntryPoints < MAX_EXTENSION_FUNCS
-       && NextFreeOffset < MAX_DISPATCH_TABLE_SIZE) {
-      void *entryPoint;
-      offset = NextFreeOffset;
-      entryPoint = generate_entrypoint(offset);
-      if (entryPoint) {
-         NextFreeOffset++;
-         ExtEntryTable[NumExtEntryPoints].Name = strdup(funcName);
-         ExtEntryTable[NumExtEntryPoints].Offset = offset;
-         ExtEntryTable[NumExtEntryPoints].Address = entryPoint;
-         NumExtEntryPoints++;
-         return offset;
-      }
-   }
-   return -1;
-}
-
-#endif
-
-
-
 /*
- * Return offset of entrypoint for named function within dispatch table.
+ * For each entry in static_functions[] which use this function
+ * we should implement a dispatch function in glapitemp.h and
+ * in glapinoop.c
  */
-GLint
-_glapi_get_proc_offset(const char *funcName)
+static int NotImplemented(void)
 {
-   /* search extension functions first */
-   GLint i;
-   for (i = 0; i < NumExtEntryPoints; i++) {
-      if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
-         return ExtEntryTable[i].Offset;
-      }
-   }
-
-   /* search static functions */
-   return get_static_proc_offset(funcName);
+   return 0;
 }
 
-
-
-/*
- * Return entrypoint for named function.
- */
-const GLvoid *
-_glapi_get_proc_address(const char *funcName)
-{
-   /* search extension functions first */
-   GLint i;
-   for (i = 0; i < NumExtEntryPoints; i++) {
-      if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
-         return ExtEntryTable[i].Address;
-      }
-   }
 
-   /* search static functions */
-   return get_static_proc_address(funcName);
-}
+struct name_address_offset {
+   const char *Name;
+   GLvoid *Address;
+   GLuint Offset;
+};
 
 
-
-
-/*
- * Return the name of the function at the given dispatch offset.
- * This is only intended for debugging.
- */
-const char *
-_glapi_get_proc_name(GLuint offset)
-{
-   const GLuint n = sizeof(static_functions) / sizeof(struct name_address_offset);
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      if (static_functions[i].Offset == offset)
-         return static_functions[i].Name;
-   }
-
-   /* search added extension functions */
-   for (i = 0; i < NumExtEntryPoints; i++) {
-      if (ExtEntryTable[i].Offset == offset) {
-         return ExtEntryTable[i].Name;
-      }
-   }
-   return NULL;
-}
-
-
-
-/*
- * Make sure there are no NULL pointers in the given dispatch table.
- * Intented for debugging purposes.
- */
-void
-_glapi_check_table(const struct _glapi_table *table)
-{
-   const GLuint entries = _glapi_get_dispatch_table_size();
-   const void **tab = (const void **) table;
-   GLuint i;
-   for (i = 1; i < entries; i++) {
-      assert(tab[i]);
-   }
-
-#ifdef DEBUG
-   /* Do some spot checks to be sure that the dispatch table
-    * slots are assigned correctly.
-    */
-   {
-      GLuint BeginOffset = _glapi_get_proc_offset("glBegin");
-      char *BeginFunc = (char*) &table->Begin;
-      GLuint offset = (BeginFunc - (char *) table) / sizeof(void *);
-      assert(BeginOffset == _gloffset_Begin);
-      assert(BeginOffset == offset);
-   }
-   {
-      GLuint viewportOffset = _glapi_get_proc_offset("glViewport");
-      char *viewportFunc = (char*) &table->Viewport;
-      GLuint offset = (viewportFunc - (char *) table) / sizeof(void *);
-      assert(viewportOffset == _gloffset_Viewport);
-      assert(viewportOffset == offset);
-   }
-   {
-      GLuint VertexPointerOffset = _glapi_get_proc_offset("glVertexPointer");
-      char *VertexPointerFunc = (char*) &table->VertexPointer;
-      GLuint offset = (VertexPointerFunc - (char *) table) / sizeof(void *);
-      assert(VertexPointerOffset == _gloffset_VertexPointer);
-      assert(VertexPointerOffset == offset);
-   }
-   {
-      GLuint ResetMinMaxOffset = _glapi_get_proc_offset("glResetMinmax");
-      char *ResetMinMaxFunc = (char*) &table->ResetMinmax;
-      GLuint offset = (ResetMinMaxFunc - (char *) table) / sizeof(void *);
-      assert(ResetMinMaxOffset == _gloffset_ResetMinmax);
-      assert(ResetMinMaxOffset == offset);
-   }
-   {
-      GLuint blendColorOffset = _glapi_get_proc_offset("glBlendColor");
-      char *blendColorFunc = (char*) &table->BlendColor;
-      GLuint offset = (blendColorFunc - (char *) table) / sizeof(void *);
-      assert(blendColorOffset == _gloffset_BlendColor);
-      assert(blendColorOffset == offset);
-   }
-   {
-      GLuint istextureOffset = _glapi_get_proc_offset("glIsTextureEXT");
-      char *istextureFunc = (char*) &table->IsTextureEXT;
-      GLuint offset = (istextureFunc - (char *) table) / sizeof(void *);
-      assert(istextureOffset == _gloffset_IsTextureEXT);
-      assert(istextureOffset == offset);
-   }
-#endif
-}
-
-
-/*
- * For each entry in static_functions[] which use this function
- * we should implement a dispatch function in glapitemp.h and
- * in glapinoop.c
- */
-static int NotImplemented(void)
-{
-   return 0;
-}
-
-
-
 static struct name_address_offset static_functions[] = {
 	/* GL 1.1 */
         { "glNewList", (GLvoid *) glNewList, _gloffset_NewList },
@@ -923,7 +593,7 @@
         { "glPushClientAttrib", (GLvoid *) glPushClientAttrib, _gloffset_PushClientAttrib },
 	/* 1.2 */
 #ifdef GL_VERSION_1_2
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
 #define NAME(X) NotImplemented
 #endif
@@ -967,9 +637,9 @@
 	{ "glCopyTexSubImage3D", (GLvoid *) NAME(glCopyTexSubImage3D), _gloffset_CopyTexSubImage3D },
 #undef NAME
 
-	/* GL_ARB_multitexture */
+	/* ARB 1. GL_ARB_multitexture */
 #ifdef GL_ARB_multitexture
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
 #define NAME(X) NotImplemented
 #endif
@@ -1009,9 +679,9 @@
 	{ "glMultiTexCoord4svARB", (GLvoid *) NAME(glMultiTexCoord4svARB), _gloffset_MultiTexCoord4svARB },
 #undef NAME
 
-	/* GL_ARB_transpose_matrix */
+	/* ARB 3. GL_ARB_transpose_matrix */
 #ifdef GL_ARB_transpose_matrix
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
 #define NAME(X) NotImplemented
 #endif
@@ -1021,504 +691,1107 @@
 	{ "glMultTransposeMatrixfARB", (GLvoid *) NAME(glMultTransposeMatrixfARB), _gloffset_MultTransposeMatrixfARB },
 #undef NAME
 
-        /* GL_ARB_multisample */
+        /* ARB 5. GL_ARB_multisample */
 #ifdef GL_ARB_multisample
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-        { "glSampleCoverageARB", (GLvoid *) NAME(glSampleCoverageARB), _gloffset_SampleCoverageARB },
-        { "glSamplePassARB", (GLvoid *) NAME(glSamplePassARB), _gloffset_SamplePassARB },
+        { "glSamplePassARB", NAME(glSamplePassARB), _gloffset_SamplePassARB },
+        { "glSampleCoverageARB", NAME(glSampleCoverageARB), _gloffset_SampleCoverageARB },
 #undef NAME
 
+        /* ARB 12. GL_ARB_texture_compression */
+#if 000
+#if defined(GL_ARB_texture_compression) && defined(_gloffset_CompressedTexImage3DARB)
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+        { "glCompressedTexImage3DARB", NAME(glCompressedTexImage3DARB), _gloffset_CompressedTexImage3DARB },
+        { "glCompressedTexImage2DARB", NAME(glCompressedTexImage2DARB), _gloffset_CompressedTexImage2DARB },
+        { "glCompressedTexImage1DARB", NAME(glCompressedTexImage1DARB), _gloffset_CompressedTexImage1DARB },
+        { "glCompressedTexSubImage3DARB", NAME(glCompressedTexSubImage3DARB), _gloffset_CompressedTexSubImage3DARB },
+        { "glCompressedTexSubImage2DARB", NAME(glCompressedTexSubImage2DARB), _gloffset_CompressedTexSubImage2DARB },
+        { "glCompressedTexSubImage1DARB", NAME(glCompressedTexSubImage1DARB), _gloffset_CompressedTexSubImage1DARB },
+        { "glGetCompressedTexImageARB", NAME(glGetCompressedTexImageARB), _gloffset_GetCompressedTexImageARB },
+#undef NAME
+#endif
+
 	/* 2. GL_EXT_blend_color */
 #ifdef GL_EXT_blend_color
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glBlendColorEXT", (GLvoid *) NAME(glBlendColorEXT), _gloffset_BlendColor },
+	{ "glBlendColorEXT", NAME(glBlendColorEXT), _gloffset_BlendColor },
 #undef NAME
 
 	/* 3. GL_EXT_polygon_offset */
 #ifdef GL_EXT_polygon_offset
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glPolygonOffsetEXT", (GLvoid *) NAME(glPolygonOffsetEXT), _gloffset_PolygonOffsetEXT },
+	{ "glPolygonOffsetEXT", NAME(glPolygonOffsetEXT), _gloffset_PolygonOffsetEXT },
 #undef NAME
 
 	/* 6. GL_EXT_texture3D */
 #ifdef GL_EXT_texture3D
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glCopyTexSubImage3DEXT", (GLvoid *) NAME(glCopyTexSubImage3DEXT), _gloffset_CopyTexSubImage3D },
-	{ "glTexImage3DEXT", (GLvoid *) NAME(glTexImage3DEXT), _gloffset_TexImage3D },
-	{ "glTexSubImage3DEXT", (GLvoid *) NAME(glTexSubImage3DEXT), _gloffset_TexSubImage3D },
+	{ "glCopyTexSubImage3DEXT", NAME(glCopyTexSubImage3DEXT), _gloffset_CopyTexSubImage3D },
+	{ "glTexImage3DEXT", NAME(glTexImage3DEXT), _gloffset_TexImage3D },
+	{ "glTexSubImage3DEXT", NAME(glTexSubImage3DEXT), _gloffset_TexSubImage3D },
 #undef NAME
 
 	/* 7. GL_SGI_texture_filter4 */
 #ifdef GL_SGI_texture_filter4
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glGetTexFilterFuncSGIS", (GLvoid *) NAME(glGetTexFilterFuncSGIS), _gloffset_GetTexFilterFuncSGIS },
-	{ "glTexFilterFuncSGIS", (GLvoid *) NAME(glTexFilterFuncSGIS), _gloffset_TexFilterFuncSGIS },
+	{ "glGetTexFilterFuncSGIS", NAME(glGetTexFilterFuncSGIS), _gloffset_GetTexFilterFuncSGIS },
+	{ "glTexFilterFuncSGIS", NAME(glTexFilterFuncSGIS), _gloffset_TexFilterFuncSGIS },
 #undef NAME
 
 	/* 9. GL_EXT_subtexture */
 #ifdef GL_EXT_subtexture
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glTexSubImage1DEXT", (GLvoid *) NAME(glTexSubImage1DEXT), _gloffset_TexSubImage1D },
-	{ "glTexSubImage2DEXT", (GLvoid *) NAME(glTexSubImage2DEXT), _gloffset_TexSubImage2D },
+	{ "glTexSubImage1DEXT", NAME(glTexSubImage1DEXT), _gloffset_TexSubImage1D },
+	{ "glTexSubImage2DEXT", NAME(glTexSubImage2DEXT), _gloffset_TexSubImage2D },
 #undef NAME
 
 	/* 10. GL_EXT_copy_texture */
 #ifdef GL_EXT_copy_texture
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glCopyTexImage1DEXT", (GLvoid *) NAME(glCopyTexImage1DEXT), _gloffset_CopyTexImage1D },
-	{ "glCopyTexImage2DEXT", (GLvoid *) NAME(glCopyTexImage2DEXT), _gloffset_CopyTexImage2D },
-	{ "glCopyTexSubImage1DEXT", (GLvoid *) NAME(glCopyTexSubImage1DEXT), _gloffset_CopyTexSubImage1D },
-	{ "glCopyTexSubImage2DEXT", (GLvoid *) NAME(glCopyTexSubImage2DEXT), _gloffset_CopyTexSubImage2D },
+	{ "glCopyTexImage1DEXT", NAME(glCopyTexImage1DEXT), _gloffset_CopyTexImage1D },
+	{ "glCopyTexImage2DEXT", NAME(glCopyTexImage2DEXT), _gloffset_CopyTexImage2D },
+	{ "glCopyTexSubImage1DEXT", NAME(glCopyTexSubImage1DEXT), _gloffset_CopyTexSubImage1D },
+	{ "glCopyTexSubImage2DEXT", NAME(glCopyTexSubImage2DEXT), _gloffset_CopyTexSubImage2D },
 #undef NAME
                               
 	/* 11. GL_EXT_histogram */
 #ifdef GL_EXT_histogram
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glGetHistogramEXT", (GLvoid *) NAME(glGetHistogramEXT), _gloffset_GetHistogramEXT },
-	{ "glGetHistogramParameterfvEXT", (GLvoid *) NAME(glGetHistogramParameterfvEXT), _gloffset_GetHistogramParameterfvEXT },
-	{ "glGetHistogramParameterivEXT", (GLvoid *) NAME(glGetHistogramParameterivEXT), _gloffset_GetHistogramParameterivEXT },
-	{ "glGetMinmaxEXT", (GLvoid *) NAME(glGetMinmaxEXT), _gloffset_GetMinmaxEXT },
-	{ "glGetMinmaxParameterfvEXT", (GLvoid *) NAME(glGetMinmaxParameterfvEXT), _gloffset_GetMinmaxParameterfvEXT },
-	{ "glGetMinmaxParameterivEXT", (GLvoid *) NAME(glGetMinmaxParameterivEXT), _gloffset_GetMinmaxParameterivEXT },
-	{ "glHistogramEXT", (GLvoid *) NAME(glHistogramEXT), _gloffset_Histogram },
-	{ "glMinmaxEXT", (GLvoid *) NAME(glMinmaxEXT), _gloffset_Minmax },
-	{ "glResetHistogramEXT", (GLvoid *) NAME(glResetHistogramEXT), _gloffset_ResetHistogram },
-	{ "glResetMinmaxEXT", (GLvoid *) NAME(glResetMinmaxEXT), _gloffset_ResetMinmax },
+	{ "glGetHistogramEXT", NAME(glGetHistogramEXT), _gloffset_GetHistogramEXT },
+	{ "glGetHistogramParameterfvEXT", NAME(glGetHistogramParameterfvEXT), _gloffset_GetHistogramParameterfvEXT },
+	{ "glGetHistogramParameterivEXT", NAME(glGetHistogramParameterivEXT), _gloffset_GetHistogramParameterivEXT },
+	{ "glGetMinmaxEXT", NAME(glGetMinmaxEXT), _gloffset_GetMinmaxEXT },
+	{ "glGetMinmaxParameterfvEXT", NAME(glGetMinmaxParameterfvEXT), _gloffset_GetMinmaxParameterfvEXT },
+	{ "glGetMinmaxParameterivEXT", NAME(glGetMinmaxParameterivEXT), _gloffset_GetMinmaxParameterivEXT },
+	{ "glHistogramEXT", NAME(glHistogramEXT), _gloffset_Histogram },
+	{ "glMinmaxEXT", NAME(glMinmaxEXT), _gloffset_Minmax },
+	{ "glResetHistogramEXT", NAME(glResetHistogramEXT), _gloffset_ResetHistogram },
+	{ "glResetMinmaxEXT", NAME(glResetMinmaxEXT), _gloffset_ResetMinmax },
 #undef NAME
 
 	/* 12. GL_EXT_convolution */
 #ifdef GL_EXT_convolution
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glConvolutionFilter1DEXT", (GLvoid *) NAME(glConvolutionFilter1DEXT), _gloffset_ConvolutionFilter1D },
-	{ "glConvolutionFilter2DEXT", (GLvoid *) NAME(glConvolutionFilter2DEXT), _gloffset_ConvolutionFilter2D },
-	{ "glConvolutionParameterfEXT", (GLvoid *) NAME(glConvolutionParameterfEXT), _gloffset_ConvolutionParameterf },
-	{ "glConvolutionParameterfvEXT", (GLvoid *) NAME(glConvolutionParameterfvEXT), _gloffset_ConvolutionParameterfv },
-	{ "glConvolutionParameteriEXT", (GLvoid *) NAME(glConvolutionParameteriEXT), _gloffset_ConvolutionParameteri },
-	{ "glConvolutionParameterivEXT", (GLvoid *) NAME(glConvolutionParameterivEXT), _gloffset_ConvolutionParameteriv },
-	{ "glCopyConvolutionFilter1DEXT", (GLvoid *) NAME(glCopyConvolutionFilter1DEXT), _gloffset_CopyConvolutionFilter1D },
-	{ "glCopyConvolutionFilter2DEXT", (GLvoid *) NAME(glCopyConvolutionFilter2DEXT), _gloffset_CopyConvolutionFilter2D },
-	{ "glGetConvolutionFilterEXT", (GLvoid *) NAME(glGetConvolutionFilterEXT), _gloffset_GetConvolutionFilterEXT },
-	{ "glGetConvolutionParameterivEXT", (GLvoid *) NAME(glGetConvolutionParameterivEXT), _gloffset_GetConvolutionParameterivEXT },
-	{ "glGetConvolutionParameterfvEXT", (GLvoid *) NAME(glGetConvolutionParameterfvEXT), _gloffset_GetConvolutionParameterfvEXT },
-	{ "glGetSeparableFilterEXT", (GLvoid *) NAME(glGetSeparableFilterEXT), _gloffset_GetSeparableFilterEXT },
-	{ "glSeparableFilter2DEXT", (GLvoid *) NAME(glSeparableFilter2DEXT), _gloffset_SeparableFilter2D },
+	{ "glConvolutionFilter1DEXT", NAME(glConvolutionFilter1DEXT), _gloffset_ConvolutionFilter1D },
+	{ "glConvolutionFilter2DEXT", NAME(glConvolutionFilter2DEXT), _gloffset_ConvolutionFilter2D },
+	{ "glConvolutionParameterfEXT", NAME(glConvolutionParameterfEXT), _gloffset_ConvolutionParameterf },
+	{ "glConvolutionParameterfvEXT", NAME(glConvolutionParameterfvEXT), _gloffset_ConvolutionParameterfv },
+	{ "glConvolutionParameteriEXT", NAME(glConvolutionParameteriEXT), _gloffset_ConvolutionParameteri },
+	{ "glConvolutionParameterivEXT", NAME(glConvolutionParameterivEXT), _gloffset_ConvolutionParameteriv },
+	{ "glCopyConvolutionFilter1DEXT", NAME(glCopyConvolutionFilter1DEXT), _gloffset_CopyConvolutionFilter1D },
+	{ "glCopyConvolutionFilter2DEXT", NAME(glCopyConvolutionFilter2DEXT), _gloffset_CopyConvolutionFilter2D },
+	{ "glGetConvolutionFilterEXT", NAME(glGetConvolutionFilterEXT), _gloffset_GetConvolutionFilterEXT },
+	{ "glGetConvolutionParameterivEXT", NAME(glGetConvolutionParameterivEXT), _gloffset_GetConvolutionParameterivEXT },
+	{ "glGetConvolutionParameterfvEXT", NAME(glGetConvolutionParameterfvEXT), _gloffset_GetConvolutionParameterfvEXT },
+	{ "glGetSeparableFilterEXT", NAME(glGetSeparableFilterEXT), _gloffset_GetSeparableFilterEXT },
+	{ "glSeparableFilter2DEXT", NAME(glSeparableFilter2DEXT), _gloffset_SeparableFilter2D },
 #undef NAME
                     
 	/* 14. GL_SGI_color_table */
 #ifdef GL_SGI_color_table
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glColorTableSGI", (GLvoid *) NAME(glColorTableSGI), _gloffset_ColorTable },
-	{ "glColorTableParameterfvSGI", (GLvoid *) NAME(glColorTableParameterfvSGI), _gloffset_ColorTableParameterfv },
-	{ "glColorTableParameterivSGI", (GLvoid *) NAME(glColorTableParameterivSGI), _gloffset_ColorTableParameteriv },
-	{ "glCopyColorTableSGI", (GLvoid *) NAME(glCopyColorTableSGI), _gloffset_CopyColorTable },
-	{ "glGetColorTableSGI", (GLvoid *) NAME(glGetColorTableSGI), _gloffset_GetColorTableSGI },
-	{ "glGetColorTableParameterfvSGI", (GLvoid *) NAME(glGetColorTableParameterfvSGI), _gloffset_GetColorTableParameterfvSGI },
-	{ "glGetColorTableParameterivSGI", (GLvoid *) NAME(glGetColorTableParameterivSGI), _gloffset_GetColorTableParameterivSGI },
+	{ "glColorTableSGI", NAME(glColorTableSGI), _gloffset_ColorTable },
+	{ "glColorTableParameterfvSGI", NAME(glColorTableParameterfvSGI), _gloffset_ColorTableParameterfv },
+	{ "glColorTableParameterivSGI", NAME(glColorTableParameterivSGI), _gloffset_ColorTableParameteriv },
+	{ "glCopyColorTableSGI", NAME(glCopyColorTableSGI), _gloffset_CopyColorTable },
+	{ "glGetColorTableSGI", NAME(glGetColorTableSGI), _gloffset_GetColorTableSGI },
+	{ "glGetColorTableParameterfvSGI", NAME(glGetColorTableParameterfvSGI), _gloffset_GetColorTableParameterfvSGI },
+	{ "glGetColorTableParameterivSGI", NAME(glGetColorTableParameterivSGI), _gloffset_GetColorTableParameterivSGI },
 #undef NAME
 
 	/* 15. GL_SGIS_pixel_texture */
 #ifdef GL_SGIS_pixel_texture
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glPixelTexGenParameterfSGIS", (GLvoid *) NAME(glPixelTexGenParameterfSGIS), _gloffset_PixelTexGenParameterfSGIS },
-	{ "glPixelTexGenParameteriSGIS", (GLvoid *) NAME(glPixelTexGenParameteriSGIS), _gloffset_PixelTexGenParameteriSGIS },
-	{ "glGetPixelTexGenParameterfvSGIS", (GLvoid *) NAME(glGetPixelTexGenParameterfvSGIS), _gloffset_GetPixelTexGenParameterfvSGIS },
-	{ "glGetPixelTexGenParameterivSGIS", (GLvoid *) NAME(glGetPixelTexGenParameterivSGIS), _gloffset_GetPixelTexGenParameterivSGIS },
+	{ "glPixelTexGenParameterfSGIS", NAME(glPixelTexGenParameterfSGIS), _gloffset_PixelTexGenParameterfSGIS },
+	{ "glPixelTexGenParameteriSGIS", NAME(glPixelTexGenParameteriSGIS), _gloffset_PixelTexGenParameteriSGIS },
+	{ "glGetPixelTexGenParameterfvSGIS", NAME(glGetPixelTexGenParameterfvSGIS), _gloffset_GetPixelTexGenParameterfvSGIS },
+	{ "glGetPixelTexGenParameterivSGIS", NAME(glGetPixelTexGenParameterivSGIS), _gloffset_GetPixelTexGenParameterivSGIS },
 #undef NAME
 
 	/* 16. GL_SGIS_texture4D */
 #ifdef  GL_SGIS_texture4D
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glTexImage4DSGIS", (GLvoid *) NAME(glTexImage4DSGIS), _gloffset_TexImage4DSGIS },
-	{ "glTexSubImage4DSGIS", (GLvoid *) NAME(glTexSubImage4DSGIS), _gloffset_TexSubImage4DSGIS },
+	{ "glTexImage4DSGIS", NAME(glTexImage4DSGIS), _gloffset_TexImage4DSGIS },
+	{ "glTexSubImage4DSGIS", NAME(glTexSubImage4DSGIS), _gloffset_TexSubImage4DSGIS },
 #undef NAME
 
 	/* 20. GL_EXT_texture_object */
 #ifdef GL_EXT_texture_object
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glAreTexturesResidentEXT", (GLvoid *) NAME(glAreTexturesResidentEXT), _gloffset_AreTexturesResidentEXT },
-	{ "glBindTextureEXT", (GLvoid *) NAME(glBindTextureEXT), _gloffset_BindTexture },
-	{ "glDeleteTexturesEXT", (GLvoid *) NAME(glDeleteTexturesEXT), _gloffset_DeleteTextures },
-	{ "glGenTexturesEXT", (GLvoid *) NAME(glGenTexturesEXT), _gloffset_GenTexturesEXT },
-	{ "glIsTextureEXT", (GLvoid *) NAME(glIsTextureEXT), _gloffset_IsTextureEXT },
-	{ "glPrioritizeTexturesEXT", (GLvoid *) NAME(glPrioritizeTexturesEXT), _gloffset_PrioritizeTextures },
+	{ "glAreTexturesResidentEXT", NAME(glAreTexturesResidentEXT), _gloffset_AreTexturesResidentEXT },
+	{ "glBindTextureEXT", NAME(glBindTextureEXT), _gloffset_BindTexture },
+	{ "glDeleteTexturesEXT", NAME(glDeleteTexturesEXT), _gloffset_DeleteTextures },
+	{ "glGenTexturesEXT", NAME(glGenTexturesEXT), _gloffset_GenTexturesEXT },
+	{ "glIsTextureEXT", NAME(glIsTextureEXT), _gloffset_IsTextureEXT },
+	{ "glPrioritizeTexturesEXT", NAME(glPrioritizeTexturesEXT), _gloffset_PrioritizeTextures },
 #undef NAME
 
 	/* 21. GL_SGIS_detail_texture */
 #ifdef GL_SGIS_detail_texture
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glDetailTexFuncSGIS", (GLvoid *) NAME(glDetailTexFuncSGIS), _gloffset_DetailTexFuncSGIS },
-	{ "glGetDetailTexFuncSGIS", (GLvoid *) NAME(glGetDetailTexFuncSGIS), _gloffset_GetDetailTexFuncSGIS },
+	{ "glDetailTexFuncSGIS", NAME(glDetailTexFuncSGIS), _gloffset_DetailTexFuncSGIS },
+	{ "glGetDetailTexFuncSGIS", NAME(glGetDetailTexFuncSGIS), _gloffset_GetDetailTexFuncSGIS },
 #undef NAME
 
 	/* 22. GL_SGIS_sharpen_texture */
 #ifdef GL_SGIS_sharpen_texture
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glGetSharpenTexFuncSGIS", (GLvoid *) NAME(glGetSharpenTexFuncSGIS), _gloffset_GetSharpenTexFuncSGIS },
-	{ "glSharpenTexFuncSGIS", (GLvoid *) NAME(glSharpenTexFuncSGIS), _gloffset_SharpenTexFuncSGIS },
+	{ "glGetSharpenTexFuncSGIS", NAME(glGetSharpenTexFuncSGIS), _gloffset_GetSharpenTexFuncSGIS },
+	{ "glSharpenTexFuncSGIS", NAME(glSharpenTexFuncSGIS), _gloffset_SharpenTexFuncSGIS },
 #undef NAME
 
 	/* 25. GL_SGIS_multisample */
 #ifdef GL_SGIS_multisample
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glSampleMaskSGIS", (GLvoid *) NAME(glSampleMaskSGIS), _gloffset_SampleMaskSGIS },
-	{ "glSamplePatternSGIS", (GLvoid *) NAME(glSamplePatternSGIS), _gloffset_SamplePatternSGIS },
+	{ "glSampleMaskSGIS", NAME(glSampleMaskSGIS), _gloffset_SampleMaskSGIS },
+	{ "glSamplePatternSGIS", NAME(glSamplePatternSGIS), _gloffset_SamplePatternSGIS },
 #undef NAME
 
 	/* 30. GL_EXT_vertex_array */
 #ifdef GL_EXT_vertex_array
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glArrayElementEXT", (GLvoid *) NAME(glArrayElementEXT), _gloffset_ArrayElement },
-	{ "glColorPointerEXT", (GLvoid *) NAME(glColorPointerEXT), _gloffset_ColorPointerEXT },
-	{ "glDrawArraysEXT", (GLvoid *) NAME(glDrawArraysEXT), _gloffset_DrawArrays },
-	{ "glEdgeFlagPointerEXT", (GLvoid *) NAME(glEdgeFlagPointerEXT), _gloffset_EdgeFlagPointerEXT },
-	{ "glGetPointervEXT", (GLvoid *) NAME(glGetPointervEXT), _gloffset_GetPointerv },
-	{ "glIndexPointerEXT", (GLvoid *) NAME(glIndexPointerEXT), _gloffset_IndexPointerEXT },
-	{ "glNormalPointerEXT", (GLvoid *) NAME(glNormalPointerEXT), _gloffset_NormalPointerEXT },
-	{ "glTexCoordPointerEXT", (GLvoid *) NAME(glTexCoordPointerEXT), _gloffset_TexCoordPointerEXT },
-	{ "glVertexPointerEXT", (GLvoid *) NAME(glVertexPointerEXT), _gloffset_VertexPointerEXT },
+	{ "glArrayElementEXT", NAME(glArrayElementEXT), _gloffset_ArrayElement },
+	{ "glColorPointerEXT", NAME(glColorPointerEXT), _gloffset_ColorPointerEXT },
+	{ "glDrawArraysEXT", NAME(glDrawArraysEXT), _gloffset_DrawArrays },
+	{ "glEdgeFlagPointerEXT", NAME(glEdgeFlagPointerEXT), _gloffset_EdgeFlagPointerEXT },
+	{ "glGetPointervEXT", NAME(glGetPointervEXT), _gloffset_GetPointerv },
+	{ "glIndexPointerEXT", NAME(glIndexPointerEXT), _gloffset_IndexPointerEXT },
+	{ "glNormalPointerEXT", NAME(glNormalPointerEXT), _gloffset_NormalPointerEXT },
+	{ "glTexCoordPointerEXT", NAME(glTexCoordPointerEXT), _gloffset_TexCoordPointerEXT },
+	{ "glVertexPointerEXT", NAME(glVertexPointerEXT), _gloffset_VertexPointerEXT },
 #undef NAME
 
 	/* 37. GL_EXT_blend_minmax */
 #ifdef GL_EXT_blend_minmax
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glBlendEquationEXT", (GLvoid *) NAME(glBlendEquationEXT), _gloffset_BlendEquation },
+	{ "glBlendEquationEXT", NAME(glBlendEquationEXT), _gloffset_BlendEquation },
 #undef NAME
 
 	/* 52. GL_SGIX_sprite */
 #ifdef GL_SGIX_sprite
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glSpriteParameterfSGIX", (GLvoid *) NAME(glSpriteParameterfSGIX), _gloffset_SpriteParameterfSGIX },
-	{ "glSpriteParameterfvSGIX", (GLvoid *) NAME(glSpriteParameterfvSGIX), _gloffset_SpriteParameterfvSGIX },
-	{ "glSpriteParameteriSGIX", (GLvoid *) NAME(glSpriteParameteriSGIX), _gloffset_SpriteParameteriSGIX },
-	{ "glSpriteParameterivSGIX", (GLvoid *) NAME(glSpriteParameterivSGIX), _gloffset_SpriteParameterivSGIX },
+	{ "glSpriteParameterfSGIX", NAME(glSpriteParameterfSGIX), _gloffset_SpriteParameterfSGIX },
+	{ "glSpriteParameterfvSGIX", NAME(glSpriteParameterfvSGIX), _gloffset_SpriteParameterfvSGIX },
+	{ "glSpriteParameteriSGIX", NAME(glSpriteParameteriSGIX), _gloffset_SpriteParameteriSGIX },
+	{ "glSpriteParameterivSGIX", NAME(glSpriteParameterivSGIX), _gloffset_SpriteParameterivSGIX },
 #undef NAME
 
 	/* 54. GL_EXT_point_parameters */
 #ifdef GL_EXT_point_parameters
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glPointParameterfEXT", (GLvoid *) NAME(glPointParameterfEXT), _gloffset_PointParameterfEXT },
-	{ "glPointParameterfvEXT", (GLvoid *) NAME(glPointParameterfvEXT), _gloffset_PointParameterfvEXT },
+	{ "glPointParameterfEXT", NAME(glPointParameterfEXT), _gloffset_PointParameterfEXT },
+	{ "glPointParameterfvEXT", NAME(glPointParameterfvEXT), _gloffset_PointParameterfvEXT },
+	{ "glPointParameterfSGIS", NAME(glPointParameterfSGIS), _gloffset_PointParameterfEXT },
+	{ "glPointParameterfvSGIS", NAME(glPointParameterfvSGIS), _gloffset_PointParameterfvEXT },
 #undef NAME
 
 	/* 55. GL_SGIX_instruments */
 #ifdef GL_SGIX_instruments
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glInstrumentsBufferSGIX", (GLvoid *) NAME(glInstrumentsBufferSGIX), _gloffset_InstrumentsBufferSGIX },
-	{ "glStartInstrumentsSGIX", (GLvoid *) NAME(glStartInstrumentsSGIX), _gloffset_StartInstrumentsSGIX },
-	{ "glStopInstrumentsSGIX", (GLvoid *) NAME(glStopInstrumentsSGIX), _gloffset_StopInstrumentsSGIX },
-	{ "glReadInstrumentsSGIX", (GLvoid *) NAME(glReadInstrumentsSGIX), _gloffset_ReadInstrumentsSGIX },
-	{ "glPollInstrumentsSGIX", (GLvoid *) NAME(glPollInstrumentsSGIX), _gloffset_PollInstrumentsSGIX },
-	{ "glGetInstrumentsSGIX", (GLvoid *) NAME(glGetInstrumentsSGIX), _gloffset_GetInstrumentsSGIX },
+	{ "glInstrumentsBufferSGIX", NAME(glInstrumentsBufferSGIX), _gloffset_InstrumentsBufferSGIX },
+	{ "glStartInstrumentsSGIX", NAME(glStartInstrumentsSGIX), _gloffset_StartInstrumentsSGIX },
+	{ "glStopInstrumentsSGIX", NAME(glStopInstrumentsSGIX), _gloffset_StopInstrumentsSGIX },
+	{ "glReadInstrumentsSGIX", NAME(glReadInstrumentsSGIX), _gloffset_ReadInstrumentsSGIX },
+	{ "glPollInstrumentsSGIX", NAME(glPollInstrumentsSGIX), _gloffset_PollInstrumentsSGIX },
+	{ "glGetInstrumentsSGIX", NAME(glGetInstrumentsSGIX), _gloffset_GetInstrumentsSGIX },
 #undef NAME
 
 	/* 57. GL_SGIX_framezoom */
 #ifdef GL_SGIX_framezoom
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glFrameZoomSGIX", (GLvoid *) NAME(glFrameZoomSGIX), _gloffset_FrameZoomSGIX },
+	{ "glFrameZoomSGIX", NAME(glFrameZoomSGIX), _gloffset_FrameZoomSGIX },
 #undef NAME
 
         /* 58. GL_SGIX_tag_sample_buffer */
 #ifdef GL_SGIX_tag_sample_buffer
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glTagSampleBufferSGIX", (GLvoid *) NAME(glTagSampleBufferSGIX), _gloffset_TagSampleBufferSGIX },
+	{ "glTagSampleBufferSGIX", NAME(glTagSampleBufferSGIX), _gloffset_TagSampleBufferSGIX },
 #undef NAME
 
 	/* 60. GL_SGIX_reference_plane */
 #ifdef GL_SGIX_reference_plane
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glReferencePlaneSGIX", (GLvoid *) NAME(glReferencePlaneSGIX), _gloffset_ReferencePlaneSGIX },
+	{ "glReferencePlaneSGIX", NAME(glReferencePlaneSGIX), _gloffset_ReferencePlaneSGIX },
 #undef NAME
 
 	/* 61. GL_SGIX_flush_raster */
 #ifdef GL_SGIX_flush_raster
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glFlushRasterSGIX", (GLvoid *) NAME(glFlushRasterSGIX), _gloffset_FlushRasterSGIX },
+	{ "glFlushRasterSGIX", NAME(glFlushRasterSGIX), _gloffset_FlushRasterSGIX },
 #undef NAME
 
 	/* 66. GL_HP_image_transform */
 #if 0
 #ifdef GL_HP_image_transform
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glGetImageTransformParameterfvHP", (GLvoid *) NAME(glGetImageTransformParameterfvHP), _gloffset_GetImageTransformParameterfvHP },
-	{ "glGetImageTransformParameterivHP", (GLvoid *) NAME(glGetImageTransformParameterivHP), _gloffset_GetImageTransformParameterivHP },
-	{ "glImageTransformParameterfHP", (GLvoid *) NAME(glImageTransformParameterfHP), _gloffset_ImageTransformParameterfHP },
-	{ "glImageTransformParameterfvHP", (GLvoid *) NAME(glImageTransformParameterfvHP), _gloffset_ImageTransformParameterfvHP },
-	{ "glImageTransformParameteriHP", (GLvoid *) NAME(glImageTransformParameteriHP), _gloffset_ImageTransformParameteriHP },
-	{ "glImageTransformParameterivHP", (GLvoid *) NAME(glImageTransformParameterivHP), _gloffset_ImageTransformParameterivHP },
+	{ "glGetImageTransformParameterfvHP", NAME(glGetImageTransformParameterfvHP), _gloffset_GetImageTransformParameterfvHP },
+	{ "glGetImageTransformParameterivHP", NAME(glGetImageTransformParameterivHP), _gloffset_GetImageTransformParameterivHP },
+	{ "glImageTransformParameterfHP", NAME(glImageTransformParameterfHP), _gloffset_ImageTransformParameterfHP },
+	{ "glImageTransformParameterfvHP", NAME(glImageTransformParameterfvHP), _gloffset_ImageTransformParameterfvHP },
+	{ "glImageTransformParameteriHP", NAME(glImageTransformParameteriHP), _gloffset_ImageTransformParameteriHP },
+	{ "glImageTransformParameterivHP", NAME(glImageTransformParameterivHP), _gloffset_ImageTransformParameterivHP },
 #undef NAME
 #endif
 
 	/* 74. GL_EXT_color_subtable */
 #ifdef GL_EXT_color_subtable
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glColorSubTableEXT", (GLvoid *) NAME(glColorSubTableEXT), _gloffset_ColorSubTable },
-	{ "glCopyColorSubTableEXT", (GLvoid *) NAME(glCopyColorSubTableEXT), _gloffset_CopyColorSubTable },
+	{ "glColorSubTableEXT", NAME(glColorSubTableEXT), _gloffset_ColorSubTable },
+	{ "glCopyColorSubTableEXT", NAME(glCopyColorSubTableEXT), _gloffset_CopyColorSubTable },
 #undef NAME
 
 	/* 77. GL_PGI_misc_hints */
 #ifdef GL_PGI_misc_hints
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glHintPGI", (GLvoid *) NAME(glHintPGI), _gloffset_HintPGI },
+	{ "glHintPGI", NAME(glHintPGI), _gloffset_HintPGI },
 #undef NAME
 
 	/* 78. GL_EXT_paletted_texture */
 #ifdef GL_EXT_paletted_texture
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glColorTableEXT", (GLvoid *) NAME(glColorTableEXT), _gloffset_ColorTable },
-	{ "glGetColorTableEXT", (GLvoid *) NAME(glGetColorTableEXT), _gloffset_GetColorTable },
-	{ "glGetColorTableParameterfvEXT", (GLvoid *) NAME(glGetColorTableParameterfvEXT), _gloffset_GetColorTableParameterfv },
-	{ "glGetColorTableParameterivEXT", (GLvoid *) NAME(glGetColorTableParameterivEXT), _gloffset_GetColorTableParameteriv },
+	{ "glColorTableEXT", NAME(glColorTableEXT), _gloffset_ColorTable },
+	{ "glGetColorTableEXT", NAME(glGetColorTableEXT), _gloffset_GetColorTable },
+	{ "glGetColorTableParameterfvEXT", NAME(glGetColorTableParameterfvEXT), _gloffset_GetColorTableParameterfv },
+	{ "glGetColorTableParameterivEXT", NAME(glGetColorTableParameterivEXT), _gloffset_GetColorTableParameteriv },
 #undef NAME
 
 	/* 80. GL_SGIX_list_priority */
 #ifdef GL_SGIX_list_priority
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glGetListParameterfvSGIX", (GLvoid *) NAME(glGetListParameterfvSGIX), _gloffset_GetListParameterfvSGIX },
-	{ "glGetListParameterivSGIX", (GLvoid *) NAME(glGetListParameterivSGIX), _gloffset_GetListParameterivSGIX },
-	{ "glListParameterfSGIX", (GLvoid *) NAME(glListParameterfSGIX), _gloffset_ListParameterfSGIX },
-	{ "glListParameterfvSGIX", (GLvoid *) NAME(glListParameterfvSGIX), _gloffset_ListParameterfvSGIX },
-	{ "glListParameteriSGIX", (GLvoid *) NAME(glListParameteriSGIX), _gloffset_ListParameteriSGIX },
-	{ "glListParameterivSGIX", (GLvoid *) NAME(glListParameterivSGIX), _gloffset_ListParameterivSGIX },
+	{ "glGetListParameterfvSGIX", NAME(glGetListParameterfvSGIX), _gloffset_GetListParameterfvSGIX },
+	{ "glGetListParameterivSGIX", NAME(glGetListParameterivSGIX), _gloffset_GetListParameterivSGIX },
+	{ "glListParameterfSGIX", NAME(glListParameterfSGIX), _gloffset_ListParameterfSGIX },
+	{ "glListParameterfvSGIX", NAME(glListParameterfvSGIX), _gloffset_ListParameterfvSGIX },
+	{ "glListParameteriSGIX", NAME(glListParameteriSGIX), _gloffset_ListParameteriSGIX },
+	{ "glListParameterivSGIX", NAME(glListParameterivSGIX), _gloffset_ListParameterivSGIX },
 #undef NAME
 
 	/* 94. GL_EXT_index_material */
 #ifdef GL_EXT_index_material
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glIndexMaterialEXT", (GLvoid *) NAME(glIndexMaterialEXT), _gloffset_IndexMaterialEXT },
+	{ "glIndexMaterialEXT", NAME(glIndexMaterialEXT), _gloffset_IndexMaterialEXT },
 #undef NAME
 
 	/* 95. GL_EXT_index_func */
 #ifdef GL_EXT_index_func
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glIndexFuncEXT", (GLvoid *) NAME(glIndexFuncEXT), _gloffset_IndexFuncEXT },
+	{ "glIndexFuncEXT", NAME(glIndexFuncEXT), _gloffset_IndexFuncEXT },
 #undef NAME
 
 	/* 97. GL_EXT_compiled_vertex_array */
 #ifdef GL_EXT_compiled_vertex_array
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glLockArraysEXT", (GLvoid *) NAME(glLockArraysEXT), _gloffset_LockArraysEXT },
-	{ "glUnlockArraysEXT", (GLvoid *) NAME(glUnlockArraysEXT), _gloffset_UnlockArraysEXT },
+	{ "glLockArraysEXT", NAME(glLockArraysEXT), _gloffset_LockArraysEXT },
+	{ "glUnlockArraysEXT", NAME(glUnlockArraysEXT), _gloffset_UnlockArraysEXT },
 #undef NAME
 
 	/* 98. GL_EXT_cull_vertex */
 #ifdef GL_EXT_cull_vertex
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glCullParameterfvEXT", (GLvoid *) NAME(glCullParameterfvEXT), _gloffset_CullParameterfvEXT },
-	{ "glCullParameterdvEXT", (GLvoid *) NAME(glCullParameterdvEXT), _gloffset_CullParameterdvEXT },
+	{ "glCullParameterfvEXT", NAME(glCullParameterfvEXT), _gloffset_CullParameterfvEXT },
+	{ "glCullParameterdvEXT", NAME(glCullParameterdvEXT), _gloffset_CullParameterdvEXT },
 #undef NAME
 
         /* 102. GL_SGIX_fragment_lighting */
 #ifdef GL_SGIX_fragment_lighting
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+	{ "glFragmentColorMaterialSGIX", NAME(glFragmentColorMaterialSGIX), _gloffset_FragmentColorMaterialSGIX },
+	{ "glFragmentLightfSGIX", NAME(glFragmentLightfSGIX), _gloffset_FragmentLightfSGIX },
+	{ "glFragmentLightfvSGIX", NAME(glFragmentLightfvSGIX), _gloffset_FragmentLightfvSGIX },
+	{ "glFragmentLightiSGIX", NAME(glFragmentLightiSGIX), _gloffset_FragmentLightiSGIX },
+	{ "glFragmentLightivSGIX", NAME(glFragmentLightivSGIX), _gloffset_FragmentLightivSGIX },
+	{ "glFragmentLightModelfSGIX", NAME(glFragmentLightModelfSGIX), _gloffset_FragmentLightModelfSGIX },
+	{ "glFragmentLightModelfvSGIX", NAME(glFragmentLightModelfvSGIX), _gloffset_FragmentLightModelfvSGIX },
+	{ "glFragmentLightModeliSGIX", NAME(glFragmentLightModeliSGIX), _gloffset_FragmentLightModeliSGIX },
+	{ "glFragmentLightModelivSGIX", NAME(glFragmentLightModelivSGIX), _gloffset_FragmentLightModelivSGIX },
+	{ "glFragmentMaterialfSGIX", NAME(glFragmentMaterialfSGIX), _gloffset_FragmentMaterialfSGIX },
+	{ "glFragmentMaterialfvSGIX", NAME(glFragmentMaterialfvSGIX), _gloffset_FragmentMaterialfvSGIX },
+	{ "glFragmentMaterialiSGIX", NAME(glFragmentMaterialiSGIX), _gloffset_FragmentMaterialiSGIX },
+	{ "glFragmentMaterialivSGIX", NAME(glFragmentMaterialivSGIX), _gloffset_FragmentMaterialivSGIX },
+	{ "glGetFragmentLightfvSGIX", NAME(glGetFragmentLightfvSGIX), _gloffset_GetFragmentLightfvSGIX },
+	{ "glGetFragmentLightivSGIX", NAME(glGetFragmentLightivSGIX), _gloffset_GetFragmentLightivSGIX },
+	{ "glGetFragmentMaterialfvSGIX", NAME(glGetFragmentMaterialfvSGIX), _gloffset_GetFragmentMaterialfvSGIX },
+	{ "glGetFragmentMaterialivSGIX", NAME(glGetFragmentMaterialivSGIX), _gloffset_GetFragmentMaterialivSGIX },
+	{ "glLightEnviSGIX", NAME(glLightEnviSGIX), _gloffset_LightEnviSGIX },
+#undef NAME
+
+        /* 112. GL_EXT_draw_range_elements */
+#if 000
+#ifdef GL_EXT_draw_range_elements
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+        { "glDrawRangeElementsEXT", NAME(glDrawRangeElementsEXT), _gloffset_DrawRangeElementsEXT },
+#undef NAME
+#endif
+
+        /* 117. GL_EXT_light_texture */
+#if 000
+#ifdef GL_EXT_light_texture
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+        { "glApplyTextureEXT", NAME(glApplyTextureEXT), _gloffset_ApplyTextureEXT },
+        { "glTextureLightEXT", NAME(glTextureLightEXT), _gloffset_TextureLightEXT },
+        { "glTextureMaterialEXT", NAME(glTextureMaterialEXT), _gloffset_TextureMaterialEXT },
+#undef NAME
+
+        /* 135. GL_INTEL_texture_scissor */
+#ifdef GL_INTEL_texture_scissor
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+        { "glTexScissorINTEL", NAME(glTexScissorINTEL), _gloffset_TexScissorINTEL },
+        { "glTexScissorFuncINTEL", NAME(glTexScissorFuncINTEL), _gloffset_glTexScissorFuncINTEL },
+#undef NAME
+
+        /* 136. GL_INTEL_parallel_arrays */
+#ifdef GL_INTEL_parallel_arrays
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glFragmentColorMaterialSGIX", (GLvoid *) NAME(glFragmentColorMaterialSGIX), _gloffset_FragmentColorMaterialSGIX },
-	{ "glFragmentLightfSGIX", (GLvoid *) NAME(glFragmentLightfSGIX), _gloffset_FragmentLightfSGIX },
-	{ "glFragmentLightfvSGIX", (GLvoid *) NAME(glFragmentLightfvSGIX), _gloffset_FragmentLightfvSGIX },
-	{ "glFragmentLightiSGIX", (GLvoid *) NAME(glFragmentLightiSGIX), _gloffset_FragmentLightiSGIX },
-	{ "glFragmentLightivSGIX", (GLvoid *) NAME(glFragmentLightivSGIX), _gloffset_FragmentLightivSGIX },
-	{ "glFragmentLightModelfSGIX", (GLvoid *) NAME(glFragmentLightModelfSGIX), _gloffset_FragmentLightModelfSGIX },
-	{ "glFragmentLightModelfvSGIX", (GLvoid *) NAME(glFragmentLightModelfvSGIX), _gloffset_FragmentLightModelfvSGIX },
-	{ "glFragmentLightModeliSGIX", (GLvoid *) NAME(glFragmentLightModeliSGIX), _gloffset_FragmentLightModeliSGIX },
-	{ "glFragmentLightModelivSGIX", (GLvoid *) NAME(glFragmentLightModelivSGIX), _gloffset_FragmentLightModelivSGIX },
-	{ "glFragmentMaterialfSGIX", (GLvoid *) NAME(glFragmentMaterialfSGIX), _gloffset_FragmentMaterialfSGIX },
-	{ "glFragmentMaterialfvSGIX", (GLvoid *) NAME(glFragmentMaterialfvSGIX), _gloffset_FragmentMaterialfvSGIX },
-	{ "glFragmentMaterialiSGIX", (GLvoid *) NAME(glFragmentMaterialiSGIX), _gloffset_FragmentMaterialiSGIX },
-	{ "glFragmentMaterialivSGIX", (GLvoid *) NAME(glFragmentMaterialivSGIX), _gloffset_FragmentMaterialivSGIX },
-	{ "glGetFragmentLightfvSGIX", (GLvoid *) NAME(glGetFragmentLightfvSGIX), _gloffset_GetFragmentLightfvSGIX },
-	{ "glGetFragmentLightivSGIX", (GLvoid *) NAME(glGetFragmentLightivSGIX), _gloffset_GetFragmentLightivSGIX },
-	{ "glGetFragmentMaterialfvSGIX", (GLvoid *) NAME(glGetFragmentMaterialfvSGIX), _gloffset_GetFragmentMaterialfvSGIX },
-	{ "glGetFragmentMaterialivSGIX", (GLvoid *) NAME(glGetFragmentMaterialivSGIX), _gloffset_GetFragmentMaterialivSGIX },
-	{ "glLightEnviSGIX", (GLvoid *) NAME(glLightEnviSGIX), _gloffset_LightEnviSGIX },
+        { "glVertexPointervINTEL", NAME(glVertexPointervINTEL), _gloffset_VertexPointervINTEL },
+        { "glNormalPointervINTEL", NAME(glNormalPointervINTEL), _gloffset_NormalPointervINTEL },
+        { "glColorPointervINTEL", NAME(glColorPointervINTEL), _gloffset_ColorPointervINTEL },
+        { "glTexCoordPointervINTEL", NAME(glTexCoordPointervINTEL), _gloffset_glxCoordPointervINTEL },
 #undef NAME
+#endif
+
+        /* 138. GL_EXT_pixel_transform */
+#if 000
+#ifdef GL_EXT_pixel_transform
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+        { "glPixelTransformParameteriEXT", NAME(glPixelTransformParameteriEXT), _gloffset_PixelTransformParameteriEXT },
+        { "glPixelTransformParameterfEXT", NAME(glPixelTransformParameterfEXT), _gloffset_PixelTransformParameterfEXT },
+        { "glPixelTransformParameterivEXT", NAME(glPixelTransformParameterivEXT), _gloffset_PixelTransformParameterivEXT },
+        { "glPixelTransformParameterfvEXT", NAME(glPixelTransformParameterfvEXT), _gloffset_PixelTransformParameterfvEXT },
+        { "glGetPixelTransformParameterivEXT", NAME(glGetPixelTransformParameterivEXT), _gloffset_GetPixelTransformParameterivEXT },
+        { "glGetPixelTransformParameterfvEXT", NAME(glGetPixelTransformParameterfvEXT), _gloffset_GetPixelTransformParameterfvEXT },
+#undef NAME
+
+        /* 145. GL_EXT_secondary_color */
+#ifdef GL_EXT_secondary_color
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+        { "glSecondaryColor3bEXT", NAME(glSecondaryColor3bEXT), _gloffset_SecondaryColor3bEXT },
+        { "glSecondaryColor3dEXT", NAME(glSecondaryColor3dEXT), _gloffset_SecondaryColor3dEXT },
+        { "glSecondaryColor3fEXT", NAME(glSecondaryColor3fEXT), _gloffset_SecondaryColor3fEXT },
+        { "glSecondaryColor3iEXT", NAME(glSecondaryColor3iEXT), _gloffset_SecondaryColor3iEXT },
+        { "glSecondaryColor3sEXT", NAME(glSecondaryColor3sEXT), _gloffset_SecondaryColor3sEXT },
+        { "glSecondaryColor3ubEXT", NAME(glSecondaryColor3ubEXT), _gloffset_SecondaryColor3ubEXT },
+        { "glSecondaryColor3uiEXT", NAME(glSecondaryColor3uiEXT), _gloffset_SecondaryColor3uiEXT },
+        { "glSecondaryColor3usEXT", NAME(glSecondaryColor3usEXT), _gloffset_SecondaryColor3usEXT },
+        { "glSecondaryColor4bEXT", NAME(glSecondaryColor4bEXT), _gloffset_SecondaryColor4bEXT },
+        { "glSecondaryColor4dEXT", NAME(glSecondaryColor4dEXT), _gloffset_SecondaryColor4dEXT },
+        { "glSecondaryColor4fEXT", NAME(glSecondaryColor4fEXT), _gloffset_SecondaryColor4fEXT },
+        { "glSecondaryColor4iEXT", NAME(glSecondaryColor4iEXT), _gloffset_SecondaryColor4iEXT },
+        { "glSecondaryColor4sEXT", NAME(glSecondaryColor4sEXT), _gloffset_SecondaryColor4sEXT },
+        { "glSecondaryColor4ubEXT", NAME(glSecondaryColor4ubEXT), _gloffset_SecondaryColor4ubEXT },
+        { "glSecondaryColor4uiEXT", NAME(glSecondaryColor4uiEXT), _gloffset_SecondaryColor4uiEXT },
+        { "glSecondaryColor4usEXT", NAME(glSecondaryColor4usEXT), _gloffset_SecondaryColor4usEXT },
+        { "glSecondaryColor3bvEXT", NAME(glSecondaryColor3bvEXT), _gloffset_SecondaryColor3bvEXT },
+	{ "glSecondaryColor3dvEXT", NAME(glSecondaryColor3dvEXT), _gloffset_SecondaryColor3dvEXT },
+	{ "glSecondaryColor3fvEXT", NAME(glSecondaryColor3fvEXT), _gloffset_SecondaryColor3fvEXT },
+	{ "glSecondaryColor3ivEXT", NAME(glSecondaryColor3ivEXT), _gloffset_SecondaryColor3ivEXT },
+	{ "glSecondaryColor3svEXT", NAME(glSecondaryColor3svEXT), _gloffset_SecondaryColor3svEXT },
+	{ "glSecondaryColor3ubvEXT", NAME(glSecondaryColor3ubvEXT), _gloffset_SecondaryColor3ubvEXT },
+	{ "glSecondaryColor3uivEXT", NAME(glSecondaryColor3uivEXT), _gloffset_SecondaryColor3uivEXT },
+	{ "glSecondaryColor3usvEXT", NAME(glSecondaryColor3usvEXT), _gloffset_SecondaryColor3usvEXT },
+	{ "glSecondaryColor4bvEXT", NAME(glSecondaryColor4bvEXT), _gloffset_SecondaryColor4bvEXT },
+	{ "glSecondaryColor4dvEXT", NAME(glSecondaryColor4dvEXT), _gloffset_SecondaryColor4dvEXT },
+	{ "glSecondaryColor4fvEXT", NAME(glSecondaryColor4fvEXT), _gloffset_SecondaryColor4fvEXT },
+	{ "glSecondaryColor4ivEXT", NAME(glSecondaryColor4ivEXT), _gloffset_SecondaryColor4ivEXT },
+	{ "glSecondaryColor4svEXT", NAME(glSecondaryColor4svEXT), _gloffset_SecondaryColor4svEXT },
+	{ "glSecondaryColor4ubvEXT", NAME(glSecondaryColor4ubvEXT), _gloffset_SecondaryColor4ubvEXT },
+	{ "glSecondaryColor4uivEXT", NAME(glSecondaryColor4uivEXT), _gloffset_SecondaryColor4uivEXT },
+	{ "glSecondaryColor4usvEXT", NAME(glSecondaryColor4usvEXT), _gloffset_SecondaryColor4usvEXT },
+	{ "glSecondaryColorPointerEXT", NAME(glSecondaryColorPointerEXT), _gloffset_SecondaryColorPointerEXT },
+#undef NAME
+
+	/* 147. GL_EXT_texture_perturb_normal */
+#ifdef GL_EXT_texture_perturb_normal
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+	{ "glTextureNormalEXT", NAME(glTextureNormalEXT), _gloffset_TextureNormalEXT },
+#undef NAME
+
+	/* 148. GL_EXT_multi_draw_arrays */
+#ifdef GL_EXT_multi_draw_arrays
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+	{ "glMultiDrawArraysEXT", NAME(glMultiDrawArraysEXT), _gloffset_MultiDrawArraysEXT },
+#undef NAME
+#endif
 
 	/* 149. GL_EXT_fog_coord */
 #ifdef GL_EXT_fog_coord
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glFogCoordfEXT", (GLvoid *) NAME(glFogCoordfEXT), _gloffset_FogCoordfEXT },
-	{ "glFogCoordfvEXT", (GLvoid *) NAME(glFogCoordfvEXT), _gloffset_FogCoordfvEXT },
-	{ "glFogCoorddEXT", (GLvoid *) NAME(glFogCoorddEXT), _gloffset_FogCoorddEXT },
-	{ "glFogCoorddEXT", (GLvoid *) NAME(glFogCoorddEXT), _gloffset_FogCoorddEXT },
-	{ "glFogCoordPointerEXT", (GLvoid *) NAME(glFogCoordPointerEXT), _gloffset_FogCoordPointerEXT },
+	{ "glFogCoordfEXT", NAME(glFogCoordfEXT), _gloffset_FogCoordfEXT },
+	{ "glFogCoordfvEXT", NAME(glFogCoordfvEXT), _gloffset_FogCoordfvEXT },
+	{ "glFogCoorddEXT", NAME(glFogCoorddEXT), _gloffset_FogCoorddEXT },
+	{ "glFogCoorddEXT", NAME(glFogCoorddEXT), _gloffset_FogCoorddEXT },
+	{ "glFogCoordPointerEXT", NAME(glFogCoordPointerEXT), _gloffset_FogCoordPointerEXT },
+#undef NAME
+
+#if 000
+	/* 156. GL_EXT_coordinate_frame */
+#ifdef GL_EXT_coordinate_frame
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+	{ "glTangent3bEXT", NAME(glTangent3bEXT), _gloffset_Tangent3bEXT },
+	{ "glTangent3dEXT", NAME(glTangent3dEXT), _gloffset_Tangent3dEXT },
+	{ "glTangent3fEXT", NAME(glTangent3fEXT), _gloffset_Tangent3fEXT },
+	{ "glTangent3iEXT", NAME(glTangent3iEXT), _gloffset_Tangent3iEXT },
+	{ "glTangent3sEXT", NAME(glTangent3sEXT), _gloffset_Tangent3sEXT },
+	{ "glTangent3bvEXT", NAME(glTangent3bvEXT), _gloffset_Tangent3bvEXT },
+	{ "glTangent3dvEXT", NAME(glTangent3dvEXT), _gloffset_Tangent3dvEXT },
+	{ "glTangent3fvEXT", NAME(glTangent3fvEXT), _gloffset_Tangent3fvEXT },
+	{ "glTangent3ivEXT", NAME(glTangent3ivEXT), _gloffset_Tangent3ivEXT },
+	{ "glTangent3svEXT", NAME(glTangent3svEXT), _gloffset_Tangent3svEXT },
+	{ "glBinormal3bEXT", NAME(glBinormal3bEXT), _gloffset_Binormal3bEXT },
+	{ "glBinormal3dEXT", NAME(glBinormal3dEXT), _gloffset_Binormal3dEXT },
+	{ "glBinormal3fEXT", NAME(glBinormal3fEXT), _gloffset_Binormal3fEXT },
+	{ "glBinormal3iEXT", NAME(glBinormal3iEXT), _gloffset_Binormal3iEXT },
+	{ "glBinormal3sEXT", NAME(glBinormal3sEXT), _gloffset_Binormal3sEXT },
+	{ "glBinormal3bvEXT", NAME(glBinormal3bvEXT), _gloffset_Binormal3bvEXT },
+	{ "glBinormal3dvEXT", NAME(glBinormal3dvEXT), _gloffset_Binormal3dvEXT },
+	{ "glBinormal3fvEXT", NAME(glBinormal3fvEXT), _gloffset_Binormal3fvEXT },
+	{ "glBinormal3ivEXT", NAME(glBinormal3ivEXT), _gloffset_Binormal3ivEXT },
+	{ "glBinormal3svEXT", NAME(glBinormal3svEXT), _gloffset_Binormal3svEXT },
+	{ "glTangentPointerEXT", NAME(glTangentPointerEXT), _gloffset_TangentPointerEXT },
+	{ "glBinormalPointerEXT", NAME(glBinormalPointerEXT), _gloffset_BinormalPointerEXT },
+#undef NAME
+
+	/* 164. GL_SUN_global_alpha */
+#ifdef GL_SUN_global_alpha
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+	{ "glGlobalAlphaFactorbSUN", NAME(glGlobalAlphaFactorbSUN), _gloffset_GlobalAlphaFactorbSUN },
+	{ "glGlobalAlphaFactorsSUN", NAME(glGlobalAlphaFactorsSUN), _gloffset_GlobalAlphaFactorsSUN },
+	{ "glGlobalAlphaFactoriSUN", NAME(glGlobalAlphaFactoriSUN), _gloffset_GlobalAlphaFactoriSUN },
+	{ "glGlobalAlphaFactorfSUN", NAME(glGlobalAlphaFactorfSUN), _gloffset_GlobalAlphaFactorfSUN },
+	{ "glGlobalAlphaFactordSUN", NAME(glGlobalAlphaFactordSUN), _gloffset_GlobalAlphaFactordSUN },
+	{ "glGlobalAlphaFactorubSUN", NAME(glGlobalAlphaFactorubSUN), _gloffset_GlobalAlphaFactorubSUN },
+	{ "glGlobalAlphaFactorusSUN", NAME(glGlobalAlphaFactorusSUN), _gloffset_GlobalAlphaFactorusSUN },
+	{ "glGlobalAlphaFactoruiSUN", NAME(glGlobalAlphaFactoruiSUN), _gloffset_GlobalAlphaFactoruiSUN },
+#undef NAME
+
+	/* 165. GL_SUN_triangle_list */
+#ifdef GL_SUN_triangle_list
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+	{ "glReplacementCodeuiSUN", NAME(glReplacementCodeuiSUN), _gloffset_ReplacementCodeuiSUN },
+	{ "glReplacementCodeusSUN", NAME(glReplacementCodeusSUN), _gloffset_ReplacementCodeusSUN },
+	{ "glReplacementCodeubSUN", NAME(glReplacementCodeubSUN), _gloffset_ReplacementCodeubSUN },
+	{ "glReplacementCodeuivSUN", NAME(glReplacementCodeuivSUN), _gloffset_ReplacementCodeuivSUN },
+	{ "glReplacementCodeusvSUN", NAME(glReplacementCodeusvSUN), _gloffset_ReplacementCodeusvSUN },
+	{ "glReplacementCodeubvSUN", NAME(glReplacementCodeubvSUN), _gloffset_ReplacementCodeubvSUN },
+	{ "glReplacementCodePointerSUN", NAME(glReplacementCodePointerSUN), _gloffset_ReplacementCodePointerSUN },
+#undef NAME
+
+	/* 166. GL_SUN_vertex */
+#ifdef GL_SUN_vertex
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+	{ "glColor4ubVertex2fSUN", NAME(glColor4ubVertex2fSUN), _gloffset_Color4ubVertex2fSUN },
+	{ "glColor4ubVertex2fvSUN", NAME(glColor4ubVertex2fvSUN), _gloffset_Color4ubVertex2fvSUN },
+	{ "glColor4ubVertex3fSUN", NAME(glColor4ubVertex3fSUN), _gloffset_Color4ubVertex3fSUN },
+	{ "glColor4ubVertex3fvSUN", NAME(glColor4ubVertex3fvSUN), _gloffset_Color4ubVertex3fvSUN },
+	{ "glColor3fVertex3fSUN", NAME(glColor3fVertex3fSUN), _gloffset_Color3fVertex3fSUN },
+	{ "glColor3fVertex3fvSUN", NAME(glColor3fVertex3fvSUN), _gloffset_Color3fVertex3fvSUN },
+	{ "glNormal3fVertex3fSUN", NAME(glNormal3fVertex3fSUN), _gloffset_Normal3fVertex3fSUN },
+	{ "glNormal3fVertex3fvSUN", NAME(glNormal3fVertex3fvSUN), _gloffset_Normal3fVertex3fvSUN },
+	{ "glColor4fNormal3fVertex3fSUN", NAME(glColor4fNormal3fVertex3fSUN), _gloffset_Color4fNormal3fVertex3fSUN },
+	{ "glColor4fNormal3fVertex3fvSUN", NAME(glColor4fNormal3fVertex3fvSUN), _gloffset_Color4fNormal3fVertex3fvSUN },
+	{ "glTexCoord2fVertex3fSUN", NAME(glTexCoord2fVertex3fSUN), _gloffset_TexCoord2fVertex3fSUN },
+	{ "glTexCoord2fVertex3fvSUN", NAME(glTexCoord2fVertex3fvSUN), _gloffset_TexCoord2fVertex3fvSUN },
+	{ "glTexCoord4fVertex4fSUN", NAME(glTexCoord4fVertex4fSUN), _gloffset_TexCoord4fVertex4fSUN },
+	{ "glTexCoord4fVertex4fvSUN", NAME(glTexCoord4fVertex4fvSUN), _gloffset_TexCoord4fVertex4fvSUN },
+	{ "glTexCoord2fColor4ubVertex3fSUN", NAME(glTexCoord2fColor4ubVertex3fSUN), _gloffset_TexCoord2fColor4ubVertex3fSUN },
+	{ "glTexCoord2fColor4ubVertex3fvSUN", NAME(glTexCoord2fColor4ubVertex3fvSUN), _gloffset_TexCoord2fColor4ubVertex3fvSUN },
+	{ "glTexCoord2fColor3fVertex3fSUN", NAME(glTexCoord2fColor3fVertex3fSUN), _gloffset_TexCoord2fColor3fVertex3fSUN },
+	{ "glTexCoord2fColor3fVertex3fvSUN", NAME(glTexCoord2fColor3fVertex3fvSUN), _gloffset_TexCoord2fColor3fVertex3fvSUN },
+	{ "glTexCoord2fNormal3fVertex3fSUN", NAME(glTexCoord2fNormal3fVertex3fSUN), _gloffset_TexCoord2fNormal3fVertex3fSUN },
+	{ "glTexCoord2fNormal3fVertex3fvSUN", NAME(glTexCoord2fNormal3fVertex3fvSUN), _gloffset_TexCoord2fNormal3fVertex3fvSUN },
+	{ "glTexCoord2fColor4fNormal3fVertex3fSUN", NAME(glTexCoord2fColor4fNormal3fVertex3fSUN), _gloffset_TexCoord2fColor4fNormal3fVertex3fSUN },
+	{ "glTexCoord2fColor4fNormal3fVertex3fvSUN", NAME(glTexCoord2fColor4fNormal3fVertex3fvSUN), _gloffset_TexCoord2fColor4fNormal3fVertex3fvSUN },
+	{ "glTexCoord4fColor4fNormal3fVertex4fSUN", NAME(glTexCoord4fColor4fNormal3fVertex4fSUN), _gloffset_TexCoord4fColor4fNormal3fVertex4fSUN },
+	{ "glTexCoord4fColor4fNormal3fVertex4fvSUN", NAME(glTexCoord4fColor4fNormal3fVertex4fvSUN), _gloffset_TexCoord4fColor4fNormal3fVertex4fvSUN },
+	{ "glReplacementCodeuiVertex3fSUN", NAME(glReplacementCodeuiVertex3fSUN), _gloffset_ReplacementCodeuiVertex3fSUN },
+	{ "glReplacementCodeuiVertex3fvSUN", NAME(glReplacementCodeuiVertex3fvSUN), _gloffset_ReplacementCodeuiVertex3fvSUN },
+	{ "glReplacementCodeuiColor4ubVertex3fSUN", NAME(glReplacementCodeuiColor4ubVertex3fSUN), _gloffset_ReplacementCodeuiColor4ubVertex3fSUN },
+	{ "glReplacementCodeuiColor4ubVertex3fvSUN", NAME(glReplacementCodeuiColor4ubVertex3fvSUN), _gloffset_ReplacementCodeuiColor4ubVertex3fvSUN },
+	{ "glReplacementCodeuiColor3fVertex3fSUN", NAME(glReplacementCodeuiColor3fVertex3fSUN), _gloffset_ReplacementCodeuiColor3fVertex3fSUN },
+	{ "glReplacementCodeuiColor3fVertex3fvSUN", NAME(glReplacementCodeuiColor3fVertex3fvSUN), _gloffset_ReplacementCodeuiColor3fVertex3fvSUN },
+	{ "glReplacementCodeuiNormal3fVertex3fSUN", NAME(glReplacementCodeuiNormal3fVertex3fSUN), _gloffset_ReplacementCodeuiNormal3fVertex3fSUN },
+	{ "glReplacementCodeuiNormal3fVertex3fvSUN", NAME(glReplacementCodeuiNormal3fVertex3fvSUN), _gloffset_ReplacementCodeuiNormal3fVertex3fvSUN },
+	{ "glReplacementCodeuiColor4fNormal3fVertex3fSUN", NAME(glReplacementCodeuiColor4fNormal3fVertex3fSUN), _gloffset_ReplacementCodeuiColor4fNormal3fVertex3fSUN },
+	{ "glReplacementCodeuiColor4fNormal3fVertex3fvSUN", NAME(glReplacementCodeuiColor4fNormal3fVertex3fvSUN), _gloffset_ReplacementCodeuiColor4fNormal3fVertex3fvSUN },
+	{ "glReplacementCodeuiTexCoord2fVertex3fSUN", NAME(glReplacementCodeuiTexCoord2fVertex3fSUN), _gloffset_ReplacementCodeuiTexCoord2fVertex3fSUN },
+	{ "glReplacementCodeuiTexCoord2fVertex3fvSUN", NAME(glReplacementCodeuiTexCoord2fVertex3fvSUN), _gloffset_ReplacementCodeuiTexCoord2fVertex3fvSUN },
+	{ "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN", NAME(glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN), _gloffset_ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN },
+	{ "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN", NAME(glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN), _gloffset_ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN },
+	{ "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN", NAME(glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN), _gloffset_ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN },
+	{ "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN", NAME(glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN), _gloffset_ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN },
 #undef NAME
+#endif
 
 	/* 173. GL_EXT/INGR_blend_func_separate */
 #ifdef GL_EXT_blend_func_separate
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glBlendFuncSeparateEXT", (GLvoid *) NAME(glBlendFuncSeparateEXT), _gloffset_BlendFuncSeparateEXT },
-	{ "glBlendFuncSeparateINGR", (GLvoid *) NAME(glBlendFuncSeparateEXT), _gloffset_BlendFuncSeparateEXT },
+	{ "glBlendFuncSeparateEXT", NAME(glBlendFuncSeparateEXT), _gloffset_BlendFuncSeparateEXT },
+	{ "glBlendFuncSeparateINGR", NAME(glBlendFuncSeparateEXT), _gloffset_BlendFuncSeparateEXT },
 #undef NAME
 
 	/* 188. GL_EXT_vertex_weighting */
 #ifdef GL_EXT_vertex_weighting
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glVertexWeightfEXT", (GLvoid *) NAME(glVertexWeightfEXT), _gloffset_VertexWeightfEXT },
-	{ "glVertexWeightfvEXT", (GLvoid *) NAME(glVertexWeightfvEXT), _gloffset_VertexWeightfvEXT },
-	{ "glVertexWeightPointerEXT", (GLvoid *) NAME(glVertexWeightPointerEXT), _gloffset_VertexWeightPointerEXT },
+	{ "glVertexWeightfEXT", NAME(glVertexWeightfEXT), _gloffset_VertexWeightfEXT },
+	{ "glVertexWeightfvEXT", NAME(glVertexWeightfvEXT), _gloffset_VertexWeightfvEXT },
+	{ "glVertexWeightPointerEXT", NAME(glVertexWeightPointerEXT), _gloffset_VertexWeightPointerEXT },
 #undef NAME
 
         /* 190. GL_NV_vertex_array_range */
 #ifdef GL_NV_vertex_array_range
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glFlushVertexArrayRangeNV", (GLvoid *) NAME(glFlushVertexArrayRangeNV), _gloffset_FlushVertexArrayRangeNV },
-	{ "glVertexArrayRangeNV", (GLvoid *) NAME(glVertexArrayRangeNV), _gloffset_VertexArrayRangeNV },
+	{ "glFlushVertexArrayRangeNV", NAME(glFlushVertexArrayRangeNV), _gloffset_FlushVertexArrayRangeNV },
+	{ "glVertexArrayRangeNV", NAME(glVertexArrayRangeNV), _gloffset_VertexArrayRangeNV },
 #undef NAME
 
 	/* 191. GL_NV_register_combiners */
 #ifdef GL_NV_register_combiners
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glCombinerParameterfvNV", (GLvoid *) NAME(glCombinerParameterfvNV), _gloffset_CombinerParameterfvNV },
-	{ "glCombinerParameterfNV", (GLvoid *) NAME(glCombinerParameterfNV), _gloffset_CombinerParameterfNV },
-	{ "glCombinerParameterivNV", (GLvoid *) NAME(glCombinerParameterivNV), _gloffset_CombinerParameterivNV },
-	{ "glCombinerParameteriNV", (GLvoid *) NAME(glCombinerParameteriNV), _gloffset_CombinerParameteriNV },
-	{ "glCombinerInputNV", (GLvoid *) NAME(glCombinerInputNV), _gloffset_CombinerInputNV },
-	{ "glCombinerOutputNV", (GLvoid *) NAME(glCombinerOutputNV), _gloffset_CombinerOutputNV },
-	{ "glFinalCombinerInputNV", (GLvoid *) NAME(glFinalCombinerInputNV), _gloffset_FinalCombinerInputNV },
-	{ "glGetCombinerInputParameterfvNV", (GLvoid *) NAME(glGetCombinerInputParameterfvNV), _gloffset_GetCombinerInputParameterfvNV },
-	{ "glGetCombinerInputParameterivNV", (GLvoid *) NAME(glGetCombinerInputParameterivNV), _gloffset_GetCombinerInputParameterivNV },
-	{ "glGetCombinerOutputParameterfvNV", (GLvoid *) NAME(glGetCombinerOutputParameterfvNV), _gloffset_GetCombinerOutputParameterfvNV },
-	{ "glGetCombinerOutputParameterivNV", (GLvoid *) NAME(glGetCombinerOutputParameterivNV), _gloffset_GetCombinerOutputParameterivNV },
-	{ "glGetFinalCombinerInputParameterfvNV", (GLvoid *) NAME(glGetFinalCombinerInputParameterfvNV), _gloffset_GetFinalCombinerInputParameterfvNV },
-	{ "glGetFinalCombinerInputParameterivNV", (GLvoid *) NAME(glGetFinalCombinerInputParameterivNV), _gloffset_GetFinalCombinerInputParameterivNV },
+	{ "glCombinerParameterfvNV", NAME(glCombinerParameterfvNV), _gloffset_CombinerParameterfvNV },
+	{ "glCombinerParameterfNV", NAME(glCombinerParameterfNV), _gloffset_CombinerParameterfNV },
+	{ "glCombinerParameterivNV", NAME(glCombinerParameterivNV), _gloffset_CombinerParameterivNV },
+	{ "glCombinerParameteriNV", NAME(glCombinerParameteriNV), _gloffset_CombinerParameteriNV },
+	{ "glCombinerInputNV", NAME(glCombinerInputNV), _gloffset_CombinerInputNV },
+	{ "glCombinerOutputNV", NAME(glCombinerOutputNV), _gloffset_CombinerOutputNV },
+	{ "glFinalCombinerInputNV", NAME(glFinalCombinerInputNV), _gloffset_FinalCombinerInputNV },
+	{ "glGetCombinerInputParameterfvNV", NAME(glGetCombinerInputParameterfvNV), _gloffset_GetCombinerInputParameterfvNV },
+	{ "glGetCombinerInputParameterivNV", NAME(glGetCombinerInputParameterivNV), _gloffset_GetCombinerInputParameterivNV },
+	{ "glGetCombinerOutputParameterfvNV", NAME(glGetCombinerOutputParameterfvNV), _gloffset_GetCombinerOutputParameterfvNV },
+	{ "glGetCombinerOutputParameterivNV", NAME(glGetCombinerOutputParameterivNV), _gloffset_GetCombinerOutputParameterivNV },
+	{ "glGetFinalCombinerInputParameterfvNV", NAME(glGetFinalCombinerInputParameterfvNV), _gloffset_GetFinalCombinerInputParameterfvNV },
+	{ "glGetFinalCombinerInputParameterivNV", NAME(glGetFinalCombinerInputParameterivNV), _gloffset_GetFinalCombinerInputParameterivNV },
 #undef NAME
 
 	/* 196. GL_MESA_resize_buffers */
 #ifdef MESA_resize_buffers
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glResizeBuffersMESA", (GLvoid *) NAME(glResizeBuffersMESA), _gloffset_ResizeBuffersMESA },
+	{ "glResizeBuffersMESA", NAME(glResizeBuffersMESA), _gloffset_ResizeBuffersMESA },
 #undef NAME
 
 	/* 197. GL_MESA_window_pos */
 #ifdef MESA_window_pos
-#define NAME(X) X
+#define NAME(X) (GLvoid *) X
 #else
-#define NAME(X) NotImplemented
+#define NAME(X) (GLvoid *) NotImplemented
 #endif
-	{ "glWindowPos4fMESA", (GLvoid *) NAME(glWindowPos4fMESA), _gloffset_WindowPos4fMESA },
+	{ "glWindowPos4fMESA", NAME(glWindowPos4fMESA), _gloffset_WindowPos4fMESA },
 #undef NAME
 
+        /* 209. WGL_EXT_multisample */
+#ifdef WGL_EXT_multisample
+#define NAME(X) (GLvoid *) X
+#else
+#define NAME(X) (GLvoid *) NotImplemented
+#endif
+        { "glSampleMaskEXT", NAME(glSampleMaskEXT), _gloffset_SampleMaskSGIS },
+        { "glSamplePatternEXT", NAME(glSamplePatternEXT), _gloffset_SamplePatternSGIS },
+#undef NAME
 
 	{ NULL, NULL }  /* end of list marker */
 };
+
+
+
+/*
+ * Return dispatch table offset of the named static (built-in) function.
+ * Return -1 if function not found.
+ */
+static GLint
+get_static_proc_offset(const char *funcName)
+{
+   GLuint i;
+   for (i = 0; static_functions[i].Name; i++) {
+      if (strcmp(static_functions[i].Name, funcName) == 0) {
+         return static_functions[i].Offset;
+      }
+   }
+   return -1;
+}
+
+
+/*
+ * Return dispatch function address the named static (built-in) function.
+ * Return NULL if function not found.
+ */
+static GLvoid *
+get_static_proc_address(const char *funcName)
+{
+   GLint i = get_static_proc_offset(funcName);
+   if (i >= 0)
+      return static_functions[i].Address;
+   else
+      return NULL;
+}
+
+
+
+/**********************************************************************
+ * Extension function management.
+ */
+
+
+#define MAX_EXTENSION_FUNCS 1000
+
+static struct name_address_offset ExtEntryTable[MAX_EXTENSION_FUNCS];
+static GLuint NumExtEntryPoints = 0;
+
+
+
+/*
+ * Generate a dispatch function (entrypoint) which jumps through
+ * the given slot number (offset) in the current dispatch table.
+ * We need assembly language in order to accomplish this.
+ */
+static void *
+generate_entrypoint(GLuint functionOffset)
+{
+#if defined(USE_X86_ASM)
+   /*
+    * This x86 code contributed by Josh Vanderhoof.
+    *
+    *  0:   a1 10 32 54 76          movl   __glapi_Dispatch,%eax
+    *       00 01 02 03 04
+    *  5:   85 c0                   testl  %eax,%eax
+    *       05 06
+    *  7:   74 06                   je     f <entrypoint+0xf>
+    *       07 08
+    *  9:   ff a0 10 32 54 76       jmp    *0x76543210(%eax)
+    *       09 0a 0b 0c 0d 0e
+    *  f:   e8 fc ff ff ff          call   __glapi_get_dispatch
+    *       0f 10 11 12 13
+    * 14:   ff a0 10 32 54 76       jmp    *0x76543210(%eax)
+    *       14 15 16 17 18 19
+    */
+   static const unsigned char temp[] = {
+      0xa1, 0x00, 0x00, 0x00, 0x00,
+      0x85, 0xc0,
+      0x74, 0x06,
+      0xff, 0xa0, 0x00, 0x00, 0x00, 0x00,
+      0xe8, 0x00, 0x00, 0x00, 0x00,
+      0xff, 0xa0, 0x00, 0x00, 0x00, 0x00
+   };
+   unsigned char *code = malloc(sizeof(temp));
+   unsigned int next_insn;
+   if (code) {
+      memcpy(code, temp, sizeof(temp));
+
+      *(unsigned int *)(code + 0x01) = (unsigned int)&_glapi_Dispatch;
+      *(unsigned int *)(code + 0x0b) = (unsigned int)functionOffset * 4;
+      next_insn = (unsigned int)(code + 0x14);
+      *(unsigned int *)(code + 0x10) = (unsigned int)_glapi_get_dispatch - next_insn;
+      *(unsigned int *)(code + 0x16) = (unsigned int)functionOffset * 4;
+   }
+   return code;
+#else
+   return NULL;
+#endif
+}
+
+
+
+/*
+ * Add a new extension function entrypoint.
+ * Return: GL_TRUE = success or GL_FALSE = failure
+ */
+GLboolean
+_glapi_add_entrypoint(const char *funcName, GLuint offset)
+{
+   /* first check if the named function is already statically present */
+   {
+      GLint index = get_static_proc_offset(funcName);
+      if (index >= 0) {
+         return (GLboolean) (index == offset);  /* bad offset! */
+      }
+   }
+
+   {
+      /* make sure this offset/name pair is legal */
+      const char *name = _glapi_get_proc_name(offset);
+      if (name && strcmp(name, funcName) != 0)
+         return GL_FALSE;  /* bad name! */
+   }
+
+   {
+      /* be sure index and name match known data */
+      GLuint i;
+      for (i = 0; i < NumExtEntryPoints; i++) {
+         if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
+            /* function already registered with api */
+            if (ExtEntryTable[i].Offset == offset) {
+               return GL_TRUE;  /* offsets match */
+            }
+            else {
+               return GL_FALSE;  /* bad offset! */
+            }
+         }
+      }
+
+      /* Make sure we don't try to add a new entrypoint after someone
+       * has already called _glapi_get_dispatch_table_size()!  If that's
+       * happened the caller's information would become out of date.
+       */
+      if (GetSizeCalled)
+         return GL_FALSE;
+
+      /* make sure we have space */
+      if (NumExtEntryPoints >= MAX_EXTENSION_FUNCS) {
+         return GL_FALSE;
+      }
+      else {
+         void *entrypoint = generate_entrypoint(offset);
+         if (!entrypoint)
+            return GL_FALSE;
+
+         ExtEntryTable[NumExtEntryPoints].Name = str_dup(funcName);
+         ExtEntryTable[NumExtEntryPoints].Offset = offset;
+         ExtEntryTable[NumExtEntryPoints].Address = entrypoint;
+         NumExtEntryPoints++;
+
+         if (offset > MaxDispatchOffset)
+            MaxDispatchOffset = offset;
+
+         return GL_TRUE;  /* success */
+      }
+   }
+
+   /* should never get here, but play it safe */
+   return GL_FALSE;
+}
+
+
+
+#if 0000 /* prototype code for dynamic extension slot allocation */
+
+static int NextFreeOffset = 409; /*XXX*/
+#define MAX_DISPATCH_TABLE_SIZE 1000
+
+/*
+ * Dynamically allocate a dispatch slot for an extension entrypoint
+ * and generate the assembly language dispatch stub.
+ * Return the dispatch offset for the function or -1 if no room or error.
+ */
+GLint
+_glapi_add_entrypoint2(const char *funcName)
+{
+   int offset;
+
+   /* first see if extension func is already known */
+   offset = _glapi_get_proc_offset(funcName);
+   if (offset >= 0)
+      return offset;
+
+   if (NumExtEntryPoints < MAX_EXTENSION_FUNCS
+       && NextFreeOffset < MAX_DISPATCH_TABLE_SIZE) {
+      void *entryPoint;
+      offset = NextFreeOffset;
+      entryPoint = generate_entrypoint(offset);
+      if (entryPoint) {
+         NextFreeOffset++;
+         ExtEntryTable[NumExtEntryPoints].Name = str_dup(funcName);
+         ExtEntryTable[NumExtEntryPoints].Offset = offset;
+         ExtEntryTable[NumExtEntryPoints].Address = entryPoint;
+         NumExtEntryPoints++;
+         return offset;
+      }
+   }
+   return -1;
+}
+
+#endif
+
+
+
+/*
+ * Return offset of entrypoint for named function within dispatch table.
+ */
+GLint
+_glapi_get_proc_offset(const char *funcName)
+{
+   /* search extension functions first */
+   GLint i;
+   for (i = 0; i < NumExtEntryPoints; i++) {
+      if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
+         return ExtEntryTable[i].Offset;
+      }
+   }
+
+   /* search static functions */
+   return get_static_proc_offset(funcName);
+}
+
+
+
+/*
+ * Return entrypoint for named function.
+ */
+const GLvoid *
+_glapi_get_proc_address(const char *funcName)
+{
+   /* search extension functions first */
+   GLint i;
+   for (i = 0; i < NumExtEntryPoints; i++) {
+      if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
+         return ExtEntryTable[i].Address;
+      }
+   }
+
+   /* search static functions */
+   return get_static_proc_address(funcName);
+}
+
+
+
+
+/*
+ * Return the name of the function at the given dispatch offset.
+ * This is only intended for debugging.
+ */
+const char *
+_glapi_get_proc_name(GLuint offset)
+{
+   const GLuint n = sizeof(static_functions) / sizeof(struct name_address_offset);
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      if (static_functions[i].Offset == offset)
+         return static_functions[i].Name;
+   }
+
+   /* search added extension functions */
+   for (i = 0; i < NumExtEntryPoints; i++) {
+      if (ExtEntryTable[i].Offset == offset) {
+         return ExtEntryTable[i].Name;
+      }
+   }
+   return NULL;
+}
+
+
+
+/*
+ * Make sure there are no NULL pointers in the given dispatch table.
+ * Intented for debugging purposes.
+ */
+void
+_glapi_check_table(const struct _glapi_table *table)
+{
+   const GLuint entries = _glapi_get_dispatch_table_size();
+   const void **tab = (const void **) table;
+   GLuint i;
+   for (i = 1; i < entries; i++) {
+      assert(tab[i]);
+   }
+
+#ifdef DEBUG
+   /* Do some spot checks to be sure that the dispatch table
+    * slots are assigned correctly.
+    */
+   {
+      GLuint BeginOffset = _glapi_get_proc_offset("glBegin");
+      char *BeginFunc = (char*) &table->Begin;
+      GLuint offset = (BeginFunc - (char *) table) / sizeof(void *);
+      assert(BeginOffset == _gloffset_Begin);
+      assert(BeginOffset == offset);
+   }
+   {
+      GLuint viewportOffset = _glapi_get_proc_offset("glViewport");
+      char *viewportFunc = (char*) &table->Viewport;
+      GLuint offset = (viewportFunc - (char *) table) / sizeof(void *);
+      assert(viewportOffset == _gloffset_Viewport);
+      assert(viewportOffset == offset);
+   }
+   {
+      GLuint VertexPointerOffset = _glapi_get_proc_offset("glVertexPointer");
+      char *VertexPointerFunc = (char*) &table->VertexPointer;
+      GLuint offset = (VertexPointerFunc - (char *) table) / sizeof(void *);
+      assert(VertexPointerOffset == _gloffset_VertexPointer);
+      assert(VertexPointerOffset == offset);
+   }
+   {
+      GLuint ResetMinMaxOffset = _glapi_get_proc_offset("glResetMinmax");
+      char *ResetMinMaxFunc = (char*) &table->ResetMinmax;
+      GLuint offset = (ResetMinMaxFunc - (char *) table) / sizeof(void *);
+      assert(ResetMinMaxOffset == _gloffset_ResetMinmax);
+      assert(ResetMinMaxOffset == offset);
+   }
+   {
+      GLuint blendColorOffset = _glapi_get_proc_offset("glBlendColor");
+      char *blendColorFunc = (char*) &table->BlendColor;
+      GLuint offset = (blendColorFunc - (char *) table) / sizeof(void *);
+      assert(blendColorOffset == _gloffset_BlendColor);
+      assert(blendColorOffset == offset);
+   }
+   {
+      GLuint istextureOffset = _glapi_get_proc_offset("glIsTextureEXT");
+      char *istextureFunc = (char*) &table->IsTextureEXT;
+      GLuint offset = (istextureFunc - (char *) table) / sizeof(void *);
+      assert(istextureOffset == _gloffset_IsTextureEXT);
+      assert(istextureOffset == offset);
+   }
+#endif
+}
+
+
+
 
Index: xc/extras/Mesa/src/glapinoop.c
diff -u xc/extras/Mesa/src/glapinoop.c:1.6 xc/extras/Mesa/src/glapinoop.c:1.7
--- xc/extras/Mesa/src/glapinoop.c:1.6	Thu Mar  2 08:07:07 2000
+++ xc/extras/Mesa/src/glapinoop.c	Fri Jun 16 17:02:11 2000
@@ -684,7 +684,7 @@
    (void *) NoOpFogCoordfEXT,
    (void *) NoOpFogCoordfvEXT,
    (void *) NoOpFogCoorddEXT,
-   (void *) NoOpFogCoorddEXT,
+   (void *) NoOpFogCoorddvEXT,
    (void *) NoOpFogCoordPointerEXT,
    /* GL_EXT_color_table */
    (void *) NoOpGetColorTableEXT,
Index: xc/extras/Mesa/src/glapioffsets.h
diff -u xc/extras/Mesa/src/glapioffsets.h:1.3 xc/extras/Mesa/src/glapioffsets.h:1.4
--- xc/extras/Mesa/src/glapioffsets.h:1.3	Thu Mar  2 08:07:08 2000
+++ xc/extras/Mesa/src/glapioffsets.h	Fri Jun 16 17:02:11 2000
@@ -1,4 +1,4 @@
-/* DO NOT EDIT - This file generated automatically */
+/* DO NOT EDIT - This file generated automatically by gloffsets.py script */
 #ifndef _GLAPI_OFFSETS_H_
 #define _GLAPI_OFFSETS_H_
 
@@ -555,5 +555,13 @@
 #define _gloffset_GetColorTableEXT 550
 #define _gloffset_GetColorTableParameterivEXT 551
 #define _gloffset_GetColorTableParameterfvEXT 552
+#define _gloffset_TbufferMask3DFX 553
+#define _gloffset_CompressedTexImage3DARB 554
+#define _gloffset_CompressedTexImage2DARB 555
+#define _gloffset_CompressedTexImage1DARB 556
+#define _gloffset_CompressedTexSubImage3DARB 557
+#define _gloffset_CompressedTexSubImage2DARB 558
+#define _gloffset_CompressedTexSubImage1DARB 559
+#define _gloffset_GetCompressedTexImageARB 560
 
 #endif
Index: xc/extras/Mesa/src/glapitable.h
diff -u xc/extras/Mesa/src/glapitable.h:1.3 xc/extras/Mesa/src/glapitable.h:1.4
--- xc/extras/Mesa/src/glapitable.h:1.3	Thu Mar  2 08:07:09 2000
+++ xc/extras/Mesa/src/glapitable.h	Fri Jun 16 17:02:11 2000
@@ -1,4 +1,4 @@
-/* DO NOT EDIT - This file generated automatically */
+/* DO NOT EDIT - This file generated automatically with gltable.py script */
 #ifndef _GLAPI_TABLE_H_
 #define _GLAPI_TABLE_H_
 
@@ -443,7 +443,7 @@
    void (*PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 434 */
    void (*GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 435 */
    void (*GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 436 */
-   void (*TexImage4DSGIS)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 437 */
+   void (*TexImage4DSGIS)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 437 */
    void (*TexSubImage4DSGIS)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid * pixels); /* 438 */
    GLboolean (*AreTexturesResidentEXT)(GLsizei n, const GLenum * textures, GLboolean * residences); /* 439 */
    void (*GenTexturesEXT)(GLsizei n, GLenum * textures); /* 440 */
@@ -559,6 +559,14 @@
    void (*GetColorTableEXT)(GLenum target, GLenum format, GLenum type, GLvoid * data); /* 550 */
    void (*GetColorTableParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 551 */
    void (*GetColorTableParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params); /* 552 */
+   void (*TbufferMask3DFX)(GLuint mask); /* 553 */
+   void (*CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 554 */
+   void (*CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 555 */
+   void (*CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 556 */
+   void (*CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 557 */
+   void (*CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 558 */
+   void (*CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 559 */
+   void (*GetCompressedTexImageARB)(GLenum target, GLint level, void * img); /* 560 */
 };
 
 #endif
Index: xc/extras/Mesa/src/glapitemp.h
diff -u xc/extras/Mesa/src/glapitemp.h:1.3 xc/extras/Mesa/src/glapitemp.h:1.4
--- xc/extras/Mesa/src/glapitemp.h:1.3	Thu Mar  2 08:07:10 2000
+++ xc/extras/Mesa/src/glapitemp.h	Fri Jun 16 17:02:11 2000
@@ -1978,180 +1978,6 @@
 
 
 
-/* ARB 0. GL_ARB_multitexture */
-
-KEYWORD1 void KEYWORD2 NAME(ActiveTextureARB)(GLenum texture)
-{
-   DISPATCH(ActiveTextureARB, (texture), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(ClientActiveTextureARB)(GLenum texture)
-{
-   DISPATCH(ClientActiveTextureARB, (texture), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dARB)(GLenum target, GLdouble s)
-{
-   DISPATCH(MultiTexCoord1dARB, (target, s), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dvARB)(GLenum target, const GLdouble *v)
-{
-   DISPATCH(MultiTexCoord1dvARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fARB)(GLenum target, GLfloat s)
-{
-   DISPATCH(MultiTexCoord1fARB, (target, s), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fvARB)(GLenum target, const GLfloat *v)
-{
-   DISPATCH(MultiTexCoord1fvARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1iARB)(GLenum target, GLint s)
-{
-   DISPATCH(MultiTexCoord1iARB, (target, s), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1ivARB)(GLenum target, const GLint *v)
-{
-   DISPATCH(MultiTexCoord1ivARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1sARB)(GLenum target, GLshort s)
-{
-   DISPATCH(MultiTexCoord1sARB, (target, s), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1svARB)(GLenum target, const GLshort *v)
-{
-   DISPATCH(MultiTexCoord1svARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dARB)(GLenum target, GLdouble s, GLdouble t)
-{
-   DISPATCH(MultiTexCoord2dARB, (target, s, t), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dvARB)(GLenum target, const GLdouble *v)
-{
-   DISPATCH(MultiTexCoord2dvARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fARB)(GLenum target, GLfloat s, GLfloat t)
-{
-   DISPATCH(MultiTexCoord2fARB, (target, s, t), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fvARB)(GLenum target, const GLfloat *v)
-{
-   DISPATCH(MultiTexCoord2fvARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2iARB)(GLenum target, GLint s, GLint t)
-{
-   DISPATCH(MultiTexCoord2iARB, (target, s, t), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2ivARB)(GLenum target, const GLint *v)
-{
-   DISPATCH(MultiTexCoord2ivARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2sARB)(GLenum target, GLshort s, GLshort t)
-{
-   DISPATCH(MultiTexCoord2sARB, (target, s, t), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2svARB)(GLenum target, const GLshort *v)
-{
-   DISPATCH(MultiTexCoord2svARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r)
-{
-   DISPATCH(MultiTexCoord3dARB, (target, s, t, r), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dvARB)(GLenum target, const GLdouble *v)
-{
-   DISPATCH(MultiTexCoord3dvARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r)
-{
-   DISPATCH(MultiTexCoord3fARB, (target, s, t, r), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fvARB)(GLenum target, const GLfloat *v)
-{
-   DISPATCH(MultiTexCoord3fvARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3iARB)(GLenum target, GLint s, GLint t, GLint r)
-{
-   DISPATCH(MultiTexCoord3iARB, (target, s, t, r), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3ivARB)(GLenum target, const GLint *v)
-{
-   DISPATCH(MultiTexCoord3ivARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3sARB)(GLenum target, GLshort s, GLshort t, GLshort r)
-{
-   DISPATCH(MultiTexCoord3sARB, (target, s, t, r), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3svARB)(GLenum target, const GLshort *v)
-{
-   DISPATCH(MultiTexCoord3svARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
-{
-   DISPATCH(MultiTexCoord4dARB, (target, s, t, r, q), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dvARB)(GLenum target, const GLdouble *v)
-{
-   DISPATCH(MultiTexCoord4dvARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
-{
-   DISPATCH(MultiTexCoord4fARB, (target, s, t, r, q), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fvARB)(GLenum target, const GLfloat *v)
-{
-   DISPATCH(MultiTexCoord4fvARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4iARB)(GLenum target, GLint s, GLint t, GLint r, GLint q)
-{
-   DISPATCH(MultiTexCoord4iARB, (target, s, t, r, q), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4ivARB)(GLenum target, const GLint *v)
-{
-   DISPATCH(MultiTexCoord4ivARB, (target, v), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4sARB)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
-{
-   DISPATCH(MultiTexCoord4sARB, (target, s, t, r, q), (F, ";"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4svARB)(GLenum target, const GLshort *v)
-{
-   DISPATCH(MultiTexCoord4svARB, (target, v), (F, ";"));
-}
-
-
-
 /***
  *** Extension functions
  ***/
@@ -2448,7 +2274,7 @@
 
 /* 16. GL_SGIS_texture4D */
 
-KEYWORD1 void KEYWORD2 NAME(TexImage4DSGIS)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void *pixels)
+KEYWORD1 void KEYWORD2 NAME(TexImage4DSGIS)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void *pixels)
 {
    DISPATCH(TexImage4DSGIS, (target, level, internalFormat, width, height, depth, extent, border, format, type, pixels), (F, ";"));
 }
@@ -2537,32 +2363,32 @@
 
 KEYWORD1 void KEYWORD2 NAME(VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(VertexPointer, (size, type, stride, ptr), (F, ";"));
+   DISPATCH(VertexPointerEXT, (size, type, stride, count, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(NormalPointer, (type, stride, ptr), (F, ";"));
+   DISPATCH(NormalPointerEXT, (type, stride, count, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(ColorPointer, (size, type, stride, ptr), (F, ";"));
+   DISPATCH(ColorPointerEXT, (size, type, stride, count, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(IndexPointer, (type, stride, ptr), (F, ";"));
+   DISPATCH(IndexPointerEXT, (type, stride, count, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(ColorPointer, (size, type, stride, ptr), (F, ";"));
+   DISPATCH(ColorPointerEXT, (size, type, stride, count, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean *ptr)
 {
-   DISPATCH(EdgeFlagPointer, (stride, ptr), (F, ";"));
+   DISPATCH(EdgeFlagPointerEXT, (stride, count, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetPointervEXT)(GLenum pname, void **params)
@@ -2624,8 +2450,18 @@
    DISPATCH(PointParameterfvEXT, (target, param), (F, ";"));
 }
 
+KEYWORD1 void KEYWORD2 NAME(PointParameterfSGIS)(GLenum target, GLfloat param)
+{
+   DISPATCH(PointParameterfEXT, (target, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterfvSGIS)(GLenum target, const GLfloat *param)
+{
+   DISPATCH(PointParameterfvEXT, (target, param), (F, ";"));
+}
 
 
+
 /* 55. GL_SGIX_instruments */
 KEYWORD1 GLint KEYWORD2 NAME(GetInstrumentsSGIX)(void)
 {
@@ -2816,7 +2652,6 @@
 
 
 /* 97. GL_EXT_compiled_vertex_array */
-
 KEYWORD1 void KEYWORD2 NAME(LockArraysEXT)(GLint first, GLsizei count)
 {
    DISPATCH(LockArraysEXT, (first, count), (F, ";"));
@@ -2829,12 +2664,12 @@
 
 
 /* 98. GL_EXT_cull_vertex */
-KEYWORD1 void KEYWORD2 NAME(CullParameterfvEXT)(GLenum pname, const GLfloat *params)
+KEYWORD1 void KEYWORD2 NAME(CullParameterfvEXT)(GLenum pname, GLfloat *params)
 {
    DISPATCH(CullParameterfvEXT, (pname, params), (F, ";"));
 }
 
-KEYWORD1 void KEYWORD2 NAME(CullParameterdvEXT)(GLenum pname, const GLdouble *params)
+KEYWORD1 void KEYWORD2 NAME(CullParameterdvEXT)(GLenum pname, GLdouble *params)
 {
    DISPATCH(CullParameterdvEXT, (pname, params), (F, ";"));
 }
@@ -2933,6 +2768,112 @@
 }
 
 
+/* 112. GL_EXT_draw_range_elements */
+KEYWORD1 void KEYWORD2 NAME(DrawRangeElementsEXT)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
+{
+   DISPATCH(DrawRangeElements, (mode, start, end, count, type, indices), (F, "glDrawRangeElementsEXT(0x%x, %u %u %d 0x%x %p);", mode, start, end, count, type, indices));
+}
+
+
+/* 117. GL_EXT_light_texture */
+#if 00
+KEYWORD1 void KEYWORD2 NAME(ApplyTextureEXT)(GLenum mode)
+{
+   DISPATCH(ApplyTextureEXT, (mode), (F, "glApplyTextureEXT(0x%x);", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TextureLightEXT)(GLenum pname)
+{
+   DISPATCH(TextureLightEXT, (pname), (F, "glTextureLightEXT(0x%x);", pname));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TextureMaterialEXT)(GLenum face, GLenum mode)
+{
+   DISPATCH(TextureMaterialEXT, (face, mode), (F, "glTextureMaterialEXT(0x%x, 0x%x);", face, mode));
+}
+#endif
+
+
+
+/* 135. GL_INTEL_texture_scissor */
+#if 00
+KEYWORD1 void KEYWORD2 NAME(TexScissorINTEL)(GLenum target, GLclampf tlow, GLclampf thigh)
+{
+   DISPATCH(TexScissorINTEL, (target, tlow, thigh), (F, "glTexScissorINTEL(0x%x %g %g);", target, tlow, thigh));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexScissorFuncINTEL)(GLenum target, GLenum lfunc, GLenum hfunc)
+{
+   DISPATCH(TexScissorFuncINTEL, (target, lfunc, hfunc), (F, "glTexScissorFuncINTEL(0x%x 0x%x 0x%x);", target, tlow, thigh));
+}
+#endif
+
+
+
+/* 136. GL_INTEL_parallel_arrays */
+#if 00
+KEYWORD1 void KEYWORD2 NAME(VertexPointervINTEL)(GLint size, GLenum type, const void ** pointer)
+{
+   DISPATCH(VertexPointervINTEL, (size, type, pointer), (F, "glVertexPointervINTEL(%d, 0x%x, %p);", size, type, pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(NormalPointervINTEL)(GLenum type, const void** pointer)
+{
+   DISPATCH(NormalPointervINTEL, (size, pointer), (F, "glNormalPointervINTEL(%d, %p);", size, pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorPointervINTEL)(GLint size, GLenum type, const void** pointer)
+{
+   DISPATCH(ColorPointervINTEL, (size, type, pointer), (F, "glColorPointervINTEL(%d, 0x%x, %p);", size, type, pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoordPointervINTEL)(GLint size, GLenum type, const void** pointer)
+{
+   DISPATCH(TexCoordPointervINTEL, (size, type, pointer), (F, "glTexCoordPointervINTEL(%d, 0x%x, %p);", size, type, pointer));
+}
+#endif
+
+
+/* 138. GL_EXT_pixel_transform */
+#if 0
+KEYWORD1 void KEYWORD2 NAME(PixelTransformParameteriEXT)(GLenum target, GLenum pname, const GLint param)
+{
+   DISPATCH(PixelTransformParameteriEXT, (target, pname, param), (F, "glPixelTransformParameteriEXT(0x%x, 0x%x, %d);", target, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTransformParameterfEXT)(GLenum target, GLenum pname, const GLfloat param)
+{
+   DISPATCH(PixelTransformParameterfEXT, (target, pname, param), (F, "glPixelTransformParameterfEXT(0x%x, 0x%x, %f);", target, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTransformParameterivEXT)(GLenum target, GLenum pname, const GLint *params)
+{
+   DISPATCH(PixelTransformParameterivEXT, (target, pname, params), (F, "glPixelTransformParameterivEXT(0x%x, 0x%x, %p);", target, pname, params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTransformParameterfvEXT)(GLenum target, GLenum pname, const GLfloat *params)
+{
+   DISPATCH(PixelTransformParameterfvEXT, (target, pname, params), (F, "glPixelTransformParameterfvEXT(0x%x, 0x%x, %p);", target, pname, params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelTransformParameterivEXT)(GLenum target, GLenum pname, const GLint *params)
+{
+   DISPATCH(GetPixelTransformParameterivEXT, (target, pname, params), (F, "glGetPixelTransformParameterivEXT(0x%x, 0x%x, %p);", target, pname, params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelTransformParameterfvEXT)(GLenum target, GLenum pname, const GLfloat *params)
+{
+   DISPATCH(GetPixelTransformParameterfvEXT, (target, pname, params), (F, "glGetPixelTransformParameterfvEXT(0x%x, 0x%x, %p);", target, pname, params));
+}
+#endif
+
+
+
+/* 145. GL_EXT_secondary_color */
+/* XXX todo */
+
+
+
 /* 149. GL_EXT_fog_coord */
 KEYWORD1 void KEYWORD2 NAME(FogCoordfEXT)(GLfloat coord)
 {
@@ -3080,7 +3021,6 @@
 
 
 /* 197. GL_MESA_window_pos */
-
 KEYWORD1 void KEYWORD2 NAME(WindowPos2iMESA)(GLint x, GLint y)
 {
    DISPATCH(WindowPos2iMESA, (x, y), (F, ";"));
@@ -3202,8 +3142,201 @@
 }
 
 
+/* 208. GL_3DFX_tbuffer */
+KEYWORD1 void KEYWORD2 NAME(TbufferMask3DFX)(GLuint mask)
+{
+   DISPATCH(TbufferMask3DFX, (mask), (F, "glTbufferMask3DFX(0x%x);", mask));
+}
+
+
+/* 209. WGL_EXT_multisample */
+
+KEYWORD1 void KEYWORD2 NAME(SampleMaskEXT)(GLclampf value, GLboolean invert)
+{
+   DISPATCH(SampleMaskSGIS, (value, invert), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplePatternEXT)(GLenum pattern)
+{
+   DISPATCH(SamplePatternSGIS, (pattern), (F, ";"));
+}
+
+
+/* ARB 1. GL_ARB_multitexture */
+
+KEYWORD1 void KEYWORD2 NAME(ActiveTextureARB)(GLenum texture)
+{
+   DISPATCH(ActiveTextureARB, (texture), (F, ";"));
+}
 
-/* ARB 2. GL_ARB_transpose_matrix */
+KEYWORD1 void KEYWORD2 NAME(ClientActiveTextureARB)(GLenum texture)
+{
+   DISPATCH(ClientActiveTextureARB, (texture), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dARB)(GLenum target, GLdouble s)
+{
+   DISPATCH(MultiTexCoord1dARB, (target, s), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dvARB)(GLenum target, const GLdouble *v)
+{
+   DISPATCH(MultiTexCoord1dvARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fARB)(GLenum target, GLfloat s)
+{
+   DISPATCH(MultiTexCoord1fARB, (target, s), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fvARB)(GLenum target, const GLfloat *v)
+{
+   DISPATCH(MultiTexCoord1fvARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1iARB)(GLenum target, GLint s)
+{
+   DISPATCH(MultiTexCoord1iARB, (target, s), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1ivARB)(GLenum target, const GLint *v)
+{
+   DISPATCH(MultiTexCoord1ivARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1sARB)(GLenum target, GLshort s)
+{
+   DISPATCH(MultiTexCoord1sARB, (target, s), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1svARB)(GLenum target, const GLshort *v)
+{
+   DISPATCH(MultiTexCoord1svARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dARB)(GLenum target, GLdouble s, GLdouble t)
+{
+   DISPATCH(MultiTexCoord2dARB, (target, s, t), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dvARB)(GLenum target, const GLdouble *v)
+{
+   DISPATCH(MultiTexCoord2dvARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fARB)(GLenum target, GLfloat s, GLfloat t)
+{
+   DISPATCH(MultiTexCoord2fARB, (target, s, t), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fvARB)(GLenum target, const GLfloat *v)
+{
+   DISPATCH(MultiTexCoord2fvARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2iARB)(GLenum target, GLint s, GLint t)
+{
+   DISPATCH(MultiTexCoord2iARB, (target, s, t), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2ivARB)(GLenum target, const GLint *v)
+{
+   DISPATCH(MultiTexCoord2ivARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2sARB)(GLenum target, GLshort s, GLshort t)
+{
+   DISPATCH(MultiTexCoord2sARB, (target, s, t), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2svARB)(GLenum target, const GLshort *v)
+{
+   DISPATCH(MultiTexCoord2svARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r)
+{
+   DISPATCH(MultiTexCoord3dARB, (target, s, t, r), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dvARB)(GLenum target, const GLdouble *v)
+{
+   DISPATCH(MultiTexCoord3dvARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r)
+{
+   DISPATCH(MultiTexCoord3fARB, (target, s, t, r), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fvARB)(GLenum target, const GLfloat *v)
+{
+   DISPATCH(MultiTexCoord3fvARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3iARB)(GLenum target, GLint s, GLint t, GLint r)
+{
+   DISPATCH(MultiTexCoord3iARB, (target, s, t, r), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3ivARB)(GLenum target, const GLint *v)
+{
+   DISPATCH(MultiTexCoord3ivARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3sARB)(GLenum target, GLshort s, GLshort t, GLshort r)
+{
+   DISPATCH(MultiTexCoord3sARB, (target, s, t, r), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3svARB)(GLenum target, const GLshort *v)
+{
+   DISPATCH(MultiTexCoord3svARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
+{
+   DISPATCH(MultiTexCoord4dARB, (target, s, t, r, q), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dvARB)(GLenum target, const GLdouble *v)
+{
+   DISPATCH(MultiTexCoord4dvARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
+{
+   DISPATCH(MultiTexCoord4fARB, (target, s, t, r, q), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fvARB)(GLenum target, const GLfloat *v)
+{
+   DISPATCH(MultiTexCoord4fvARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4iARB)(GLenum target, GLint s, GLint t, GLint r, GLint q)
+{
+   DISPATCH(MultiTexCoord4iARB, (target, s, t, r, q), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4ivARB)(GLenum target, const GLint *v)
+{
+   DISPATCH(MultiTexCoord4ivARB, (target, v), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4sARB)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
+{
+   DISPATCH(MultiTexCoord4sARB, (target, s, t, r, q), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4svARB)(GLenum target, const GLshort *v)
+{
+   DISPATCH(MultiTexCoord4svARB, (target, v), (F, ";"));
+}
+
+
+
+/* ARB 3. GL_ARB_transpose_matrix */
 KEYWORD1 void KEYWORD2 NAME(LoadTransposeMatrixdARB)(const GLdouble m[16])
 {
    DISPATCH(LoadTransposeMatrixdARB, (m), (F, "glLoadTransposeMatrixARB(%p);", m));
@@ -3224,17 +3357,55 @@
    DISPATCH(MultTransposeMatrixfARB, (m), (F, "glLoadTransposeMatrixfARB(%p)", m));
 }
 
+
 
-/* ARB 4. GL_ARB_multisample */
+/* ARB 5. GL_ARB_multisample */
 KEYWORD1 void KEYWORD2 NAME(SampleCoverageARB)(GLclampf value, GLboolean invert)
 {
    DISPATCH(SampleCoverageARB, (value, invert), (F, "glSampleCoverageARB(%f, %d);", value, invert));
 }
 
-
 KEYWORD1 void KEYWORD2 NAME(SamplePassARB)(GLenum pass)
 {
    DISPATCH(SamplePassARB, (pass), (F, "glSamplePassARB(0x%x);", pass));
+}
+
+
+
+/* ARB 12. GL_ARB_texture_compression */
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
+{
+   DISPATCH(CompressedTexImage3DARB, (target, level, internalformat, width, height, depth, border, imageSize, data), (F, "glCompressedTexImage3DARB();"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
+{
+   DISPATCH(CompressedTexImage2DARB, (target, level, internalformat, width, height, border, imageSize, data), (F, "glCompressedTexImage2DARB();"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
+{
+   DISPATCH(CompressedTexImage1DARB, (target, level, internalformat, width, border, imageSize, data), (F, "glCompressedTexImage1DARB();"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
+{
+   DISPATCH(CompressedTexSubImage3DARB, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data), (F, "glCompressedTexSubImage3DARB();"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
+{
+   DISPATCH(CompressedTexSubImage2DARB, (target, level, xoffset, yoffset, width, height, format, imageSize, data), (F, "glCompressedTexSubImage2DARB();"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
+{
+   DISPATCH(CompressedTexSubImage1DARB, (target, level, xoffset, width, format, imageSize, data), (F, "glCompressedTexSubImage1DARB();"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetCompressedTexImageARB)(GLenum target, GLint lod, GLvoid *img)
+{
+   DISPATCH(GetCompressedTexImageARB, (target, lod, img), (F, "glGetCompressedTexImageARB();"));
 }
 
 
Index: xc/extras/Mesa/src/glext_proto.h
diff -u /dev/null xc/extras/Mesa/src/glext_proto.h:1.1
--- /dev/null	Sat Jul  1 20:46:10 2000
+++ xc/extras/Mesa/src/glext_proto.h	Fri Jun 16 17:02:11 2000
@@ -0,0 +1,1757 @@
+#ifndef __glext_proto_h_
+#define __glext_proto_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN32)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+
+/*************************************************************/
+
+/* OpenGL ABI for Linux version number */
+#define GLEXT_VERSION_EXT 5
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_ACTIVE_TEXTURES_ARB        0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_IMAGE_SIZE_ARB         0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#define GL_ABGR_EXT                       0x8000
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_BLEND_EQUATION_EXT             0x8009
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#define GL_INTERLACE_SGIX                 0x8094
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#define GL_LIST_PRIORITY_SGIX             0x8182
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+/* reuse GL_FRAGMENT_DEPTH_EXT */
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE3_RGB_EXT                0x8583
+#define GL_SOURCE4_RGB_EXT                0x8584
+#define GL_SOURCE5_RGB_EXT                0x8585
+#define GL_SOURCE6_RGB_EXT                0x8586
+#define GL_SOURCE7_RGB_EXT                0x8587
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_SOURCE3_ALPHA_EXT              0x858B
+#define GL_SOURCE4_ALPHA_EXT              0x858C
+#define GL_SOURCE5_ALPHA_EXT              0x858D
+#define GL_SOURCE6_ALPHA_EXT              0x858E
+#define GL_SOURCE7_ALPHA_EXT              0x858F
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND3_RGB_EXT               0x8593
+#define GL_OPERAND4_RGB_EXT               0x8594
+#define GL_OPERAND5_RGB_EXT               0x8595
+#define GL_OPERAND6_RGB_EXT               0x8596
+#define GL_OPERAND7_RGB_EXT               0x8597
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#define GL_OPERAND3_ALPHA_EXT             0x859B
+#define GL_OPERAND4_ALPHA_EXT             0x859C
+#define GL_OPERAND5_ALPHA_EXT             0x859D
+#define GL_OPERAND6_ALPHA_EXT             0x859E
+#define GL_OPERAND7_ALPHA_EXT             0x859F
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#define GL_FOG_SCALE_SGIX                 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+#define GL_RESTART_SUN                    0x01
+#define GL_REPLACE_MIDDLE_SUN             0x02
+#define GL_REPLACE_OLDEST_SUN             0x03
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#define GL_INTERLACE_READ_INGR            0x8568
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#define GL_WRAP_BORDER_SUN                0x81D4
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
+#define GL_MODELVIEW_MATRIX1_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+/* reuse GL_TEXTURE0_ARB */
+/* reuse GL_TEXTURE1_ARB */
+/* reuse GL_ZERO */
+/* reuse GL_NONE */
+/* reuse GL_FOG */
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+/* reuse GL_EYE_PLANE */
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#define GL_CULL_VERTEX_IBM                103050
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+
+
+/*************************************************************/
+
+extern void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
+typedef void (APIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+extern void APIENTRY glBlendEquation (GLenum);
+typedef void (APIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode);
+extern void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+extern void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+extern void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+extern void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+extern void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+extern void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+extern void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+extern void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+extern void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+extern void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+extern void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+extern void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+extern void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+extern void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+typedef void (APIENTRY * PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+extern void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+typedef void (APIENTRY * PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+extern void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+extern void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+extern void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
+typedef void (APIENTRY * PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+extern void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
+typedef void (APIENTRY * PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+extern void APIENTRY glResetHistogram (GLenum);
+typedef void (APIENTRY * PFNGLRESETHISTOGRAMPROC) (GLenum target);
+extern void APIENTRY glResetMinmax (GLenum);
+typedef void (APIENTRY * PFNGLRESETMINMAXPROC) (GLenum target);
+extern void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+extern void APIENTRY glActiveTextureARB (GLenum);
+typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+extern void APIENTRY glClientActiveTextureARB (GLenum);
+typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+extern void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+extern void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+extern void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+extern void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+extern void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+extern void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+extern void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+extern void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+extern void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+extern void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+extern void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+extern void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+extern void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+extern void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+extern void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+extern void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+extern void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+extern void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+extern void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+extern void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+extern void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+extern void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+extern void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+extern void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+extern void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+extern void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+extern void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+extern void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+extern void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+extern void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+extern void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+extern void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
+typedef void (APIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+extern void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
+typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+extern void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
+typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+extern void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
+typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+extern void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
+typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+extern void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
+typedef void (APIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+extern void APIENTRY glSamplePassARB (GLenum);
+typedef void (APIENTRY * PFNGLSAMPLEPASSARBPROC) (GLenum pass);
+extern void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+extern void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+extern void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+extern void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+extern void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+extern void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+extern void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, void *);
+typedef void (APIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
+extern void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
+typedef void (APIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+extern void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+extern void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+extern void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
+typedef void (APIENTRY * PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+extern void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+typedef void (APIENTRY * PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+extern void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+typedef void (APIENTRY * PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+extern void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+extern void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+extern void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+extern void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+extern void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+extern void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
+typedef void (APIENTRY * PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+extern void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
+typedef void (APIENTRY * PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+extern void APIENTRY glResetHistogramEXT (GLenum);
+typedef void (APIENTRY * PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+extern void APIENTRY glResetMinmaxEXT (GLenum);
+typedef void (APIENTRY * PFNGLRESETMINMAXEXTPROC) (GLenum target);
+extern void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+extern void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+extern void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+extern void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+extern void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+extern void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+extern void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+extern void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+typedef void (APIENTRY * PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+extern void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+typedef void (APIENTRY * PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+extern void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+extern void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+extern void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+extern void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glPixelTexGenSGIX (GLenum);
+typedef void (APIENTRY * PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+extern void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
+typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+extern void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+extern void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+extern void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+extern void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+extern void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+extern void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+extern GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
+typedef GLboolean (APIENTRY * PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+extern void APIENTRY glBindTextureEXT (GLenum, GLuint);
+typedef void (APIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+extern void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
+typedef void (APIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+extern void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
+typedef void (APIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+extern GLboolean APIENTRY glIsTextureEXT (GLuint);
+typedef GLboolean (APIENTRY * PFNGLISTEXTUREEXTPROC) (GLuint texture);
+extern void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
+typedef void (APIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+extern void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+typedef void (APIENTRY * PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+extern void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+extern void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+typedef void (APIENTRY * PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+extern void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+extern void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
+typedef void (APIENTRY * PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+extern void APIENTRY glSamplePatternSGIS (GLenum);
+typedef void (APIENTRY * PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+extern void APIENTRY glArrayElementEXT (GLint);
+typedef void (APIENTRY * PFNGLARRAYELEMENTEXTPROC) (GLint i);
+extern void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+extern void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
+typedef void (APIENTRY * PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+extern void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
+typedef void (APIENTRY * PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+extern void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
+typedef void (APIENTRY * PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+extern void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+extern void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+extern void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+extern void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+extern void APIENTRY glBlendEquationEXT (GLenum);
+typedef void (APIENTRY * PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+extern void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+extern void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+extern void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
+typedef void (APIENTRY * PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+extern void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+extern void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+extern void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+extern void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+extern void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+extern GLint APIENTRY glGetInstrumentsSGIX (void);
+typedef GLint (APIENTRY * PFNGLGETINSTRUMENTSSGIXPROC) (void);
+extern void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
+typedef void (APIENTRY * PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+extern GLint APIENTRY glPollInstrumentsSGIX (GLint *);
+typedef GLint (APIENTRY * PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+extern void APIENTRY glReadInstrumentsSGIX (GLint);
+typedef void (APIENTRY * PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+extern void APIENTRY glStartInstrumentsSGIX (void);
+typedef void (APIENTRY * PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+extern void APIENTRY glStopInstrumentsSGIX (GLint);
+typedef void (APIENTRY * PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+extern void APIENTRY glFrameZoomSGIX (GLint);
+typedef void (APIENTRY * PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+extern void APIENTRY glTagSampleBufferSGIX (void);
+typedef void (APIENTRY * PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+extern void APIENTRY glReferencePlaneSGIX (const GLdouble *);
+typedef void (APIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+extern void APIENTRY glFlushRasterSGIX (void);
+typedef void (APIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void);
+extern void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
+typedef void (APIENTRY * PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+extern void APIENTRY glGetFogFuncSGIS (const GLfloat *);
+typedef void (APIENTRY * PFNGLGETFOGFUNCSGISPROC) (const GLfloat *points);
+extern void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
+typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+extern void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+extern void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+extern void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
+typedef void (APIENTRY * PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+extern void APIENTRY glHintPGI (GLenum, GLint);
+typedef void (APIENTRY * PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+extern void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+extern void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
+extern void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+extern void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+extern void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+extern void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
+typedef void (APIENTRY * PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+extern void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+extern void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
+typedef void (APIENTRY * PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+extern void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
+typedef void (APIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+extern void APIENTRY glLockArraysEXT (GLint, GLsizei);
+typedef void (APIENTRY * PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+extern void APIENTRY glUnlockArraysEXT (void);
+typedef void (APIENTRY * PFNGLUNLOCKARRAYSEXTPROC) (void);
+extern void APIENTRY glCullParameterdvEXT (GLenum, const GLdouble *);
+typedef void (APIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, const GLdouble *params);
+extern void APIENTRY glCullParameterfvEXT (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+extern void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
+typedef void (APIENTRY * PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+extern void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+extern void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+extern void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+extern void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+extern void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+extern void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+extern void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+extern void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+extern void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+extern void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+extern void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
+typedef void (APIENTRY * PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+extern void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+extern void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+extern void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+extern void APIENTRY glLightEnviSGIX (GLenum, GLint);
+typedef void (APIENTRY * PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+extern void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+typedef void (APIENTRY * PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+extern void APIENTRY glApplyTextureEXT (GLenum);
+typedef void (APIENTRY * PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+extern void APIENTRY glTextureLightEXT (GLenum);
+typedef void (APIENTRY * PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+extern void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
+typedef void (APIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+extern void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
+typedef void (APIENTRY * PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+extern void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
+typedef void (APIENTRY * PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
+extern void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
+typedef void (APIENTRY * PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+extern void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
+typedef void (APIENTRY * PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+extern void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
+typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+extern void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+extern void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+extern void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+extern void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+extern void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+extern void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+extern void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+extern void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+extern void APIENTRY glSecondaryColor3ivEXT (const GLint *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+extern void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+extern void APIENTRY glSecondaryColor3svEXT (const GLshort *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+extern void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+extern void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+extern void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+extern void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+extern void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+extern void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+extern void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, GLvoid *);
+typedef void (APIENTRY * PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+extern void APIENTRY glTextureNormalEXT (GLenum);
+typedef void (APIENTRY * PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+extern void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
+typedef void (APIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+extern void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+typedef void (APIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+extern void APIENTRY glFogCoordfEXT (GLfloat);
+typedef void (APIENTRY * PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+extern void APIENTRY glFogCoordfvEXT (const GLfloat *);
+typedef void (APIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+extern void APIENTRY glFogCoorddEXT (GLdouble);
+typedef void (APIENTRY * PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+extern void APIENTRY glFogCoorddvEXT (const GLdouble *);
+typedef void (APIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+extern void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glTangent3b (GLbyte, GLbyte, GLbyte);
+typedef void (APIENTRY * PFNGLTANGENT3BPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+extern void APIENTRY glTangent3bv (const GLbyte *);
+typedef void (APIENTRY * PFNGLTANGENT3BVPROC) (const GLbyte *v);
+extern void APIENTRY glTangent3d (GLdouble, GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLTANGENT3DPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+extern void APIENTRY glTangent3dv (const GLdouble *);
+typedef void (APIENTRY * PFNGLTANGENT3DVPROC) (const GLdouble *v);
+extern void APIENTRY glTangent3f (GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLTANGENT3FPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+extern void APIENTRY glTangent3fv (const GLfloat *);
+typedef void (APIENTRY * PFNGLTANGENT3FVPROC) (const GLfloat *v);
+extern void APIENTRY glTangent3i (GLint, GLint, GLint);
+typedef void (APIENTRY * PFNGLTANGENT3IPROC) (GLint tx, GLint ty, GLint tz);
+extern void APIENTRY glTangent3iv (const GLint *);
+typedef void (APIENTRY * PFNGLTANGENT3IVPROC) (const GLint *v);
+extern void APIENTRY glTangent3s (GLshort, GLshort, GLshort);
+typedef void (APIENTRY * PFNGLTANGENT3SPROC) (GLshort tx, GLshort ty, GLshort tz);
+extern void APIENTRY glTangent3sv (const GLshort *);
+typedef void (APIENTRY * PFNGLTANGENT3SVPROC) (const GLshort *v);
+extern void APIENTRY glBinormal3b (GLbyte, GLbyte, GLbyte);
+typedef void (APIENTRY * PFNGLBINORMAL3BPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+extern void APIENTRY glBinormal3bv (const GLbyte *);
+typedef void (APIENTRY * PFNGLBINORMAL3BVPROC) (const GLbyte *v);
+extern void APIENTRY glBinormal3d (GLdouble, GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLBINORMAL3DPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+extern void APIENTRY glBinormal3dv (const GLdouble *);
+typedef void (APIENTRY * PFNGLBINORMAL3DVPROC) (const GLdouble *v);
+extern void APIENTRY glBinormal3f (GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLBINORMAL3FPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+extern void APIENTRY glBinormal3fv (const GLfloat *);
+typedef void (APIENTRY * PFNGLBINORMAL3FVPROC) (const GLfloat *v);
+extern void APIENTRY glBinormal3i (GLint, GLint, GLint);
+typedef void (APIENTRY * PFNGLBINORMAL3IPROC) (GLint bx, GLint by, GLint bz);
+extern void APIENTRY glBinormal3iv (const GLint *);
+typedef void (APIENTRY * PFNGLBINORMAL3IVPROC) (const GLint *v);
+extern void APIENTRY glBinormal3s (GLshort, GLshort, GLshort);
+typedef void (APIENTRY * PFNGLBINORMAL3SPROC) (GLshort bx, GLshort by, GLshort bz);
+extern void APIENTRY glBinormal3sv (const GLshort *);
+typedef void (APIENTRY * PFNGLBINORMAL3SVPROC) (const GLshort *v);
+extern void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glFinishTextureSUNX (void);
+typedef void (APIENTRY * PFNGLFINISHTEXTURESUNXPROC) (void);
+extern void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+extern void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+extern void APIENTRY glGlobalAlphaFactoriSUN (GLint);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+extern void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+extern void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+extern void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+extern void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+extern void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
+typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+extern void APIENTRY glReplacementCodeuiSUN (GLuint);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+extern void APIENTRY glReplacementCodeusSUN (GLushort);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+extern void APIENTRY glReplacementCodeubSUN (GLubyte);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+extern void APIENTRY glReplacementCodeuivSUN (const GLuint *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+extern void APIENTRY glReplacementCodeusvSUN (const GLushort *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+extern void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+extern void APIENTRY glReplacementCodePointer (GLenum, GLsizei, const GLvoid* *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
+extern void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+extern void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
+typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+extern void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
+typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+extern void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+extern void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+extern void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+extern void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+extern void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+extern void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+extern void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+extern void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glReplacementCodeuiVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLenum rc, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLenum *, const GLfloat *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *v);
+extern void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLenum, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLenum rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLenum *, const GLubyte *, const GLfloat *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLenum *rc, const GLubyte *c, const GLfloat *v);
+extern void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLenum rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *c, const GLfloat *v);
+extern void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *v);
+extern void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+extern void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
+typedef void (APIENTRY * PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+extern void APIENTRY glVertexWeightfEXT (GLfloat);
+typedef void (APIENTRY * PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+extern void APIENTRY glVertexWeightfvEXT (const GLfloat *);
+typedef void (APIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+extern void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glFlushVertexArrayRangeNV (void);
+typedef void (APIENTRY * PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+extern void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
+typedef void (APIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei size, const GLvoid *pointer);
+extern void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
+typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+extern void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
+typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+extern void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
+typedef void (APIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+extern void APIENTRY glCombinerParameteriNV (GLenum, GLint);
+typedef void (APIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+extern void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
+typedef void (APIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+extern void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
+typedef void (APIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+extern void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
+typedef void (APIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+extern void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+extern void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+extern void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
+typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
+typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+extern void APIENTRY glResizeBuffersMESA (void);
+typedef void (APIENTRY * PFNGLRESIZEBUFFERSMESAPROC) (void);
+extern void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+extern void APIENTRY glWindowPos2dvMESA (const GLdouble *);
+typedef void (APIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+extern void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+extern void APIENTRY glWindowPos2fvMESA (const GLfloat *);
+typedef void (APIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+extern void APIENTRY glWindowPos2iMESA (GLint, GLint);
+typedef void (APIENTRY * PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+extern void APIENTRY glWindowPos2ivMESA (const GLint *);
+typedef void (APIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+extern void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
+typedef void (APIENTRY * PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+extern void APIENTRY glWindowPos2svMESA (const GLshort *);
+typedef void (APIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+extern void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+extern void APIENTRY glWindowPos3dvMESA (const GLdouble *);
+typedef void (APIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+extern void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glWindowPos3fvMESA (const GLfloat *);
+typedef void (APIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+extern void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
+typedef void (APIENTRY * PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+extern void APIENTRY glWindowPos3ivMESA (const GLint *);
+typedef void (APIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+extern void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
+typedef void (APIENTRY * PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+extern void APIENTRY glWindowPos3svMESA (const GLshort *);
+typedef void (APIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+extern void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
+typedef void (APIENTRY * PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+extern void APIENTRY glWindowPos4dvMESA (const GLdouble *);
+typedef void (APIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+extern void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
+typedef void (APIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+extern void APIENTRY glWindowPos4fvMESA (const GLfloat *);
+typedef void (APIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+extern void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
+typedef void (APIENTRY * PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+extern void APIENTRY glWindowPos4ivMESA (const GLint *);
+typedef void (APIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+extern void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
+typedef void (APIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+extern void APIENTRY glWindowPos4svMESA (const GLshort *);
+typedef void (APIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+extern void APIENTRY glMultiModeDrawArraysIBM (GLenum, const GLint *, const GLsizei *, GLsizei, GLint);
+typedef void (APIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+extern void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* *, GLsizei, GLint);
+typedef void (APIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, GLint modestride);
+extern void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+typedef void (APIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+extern void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+typedef void (APIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+extern void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
+typedef void (APIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+extern void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+typedef void (APIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+extern void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+typedef void (APIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+extern void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+typedef void (APIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+extern void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+typedef void (APIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+extern void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+typedef void (APIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+extern void APIENTRY glTbufferMask3DFX (GLuint);
+typedef void (APIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+extern void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
+typedef void (APIENTRY * PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+extern void APIENTRY glSamplePatternEXT (GLenum);
+typedef void (APIENTRY * PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Index: xc/extras/Mesa/src/glheader.h
diff -u xc/extras/Mesa/src/glheader.h:1.4 xc/extras/Mesa/src/glheader.h:1.6
--- xc/extras/Mesa/src/glheader.h:1.4	Thu Mar  2 08:07:10 2000
+++ xc/extras/Mesa/src/glheader.h	Fri Jun 16 17:02:12 2000
@@ -51,7 +51,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#if defined(__linux__) && defined(__i386__) 
+#include <fpu_control.h>
 #endif
+#endif
 #include <float.h>
 
 
@@ -59,14 +62,108 @@
 #include "conf.h"
 #endif
 
-#include "GL/gl.h"
-#include "GL/glext.h"
+
 
 
 /*
  * Put compiler/OS/assembly pragmas and macros here to avoid
  * cluttering other source files.
  */
+
+
+
+/*
+ * XXX move as many of these pragma's and MS Windows-isms into
+ * the new src/glheader.h file.
+ */
+
+#if defined(_WIN32) && !defined(__WIN32__)
+#	define __WIN32__
+#endif
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__))
+#  pragma warning( disable : 4068 ) /* unknown pragma */
+#  pragma warning( disable : 4710 ) /* function 'foo' not inlined */
+#  pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
+#  pragma warning( disable : 4127 ) /* conditional expression is constant */
+#  if defined(MESA_MINWARN)
+#    pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
+#    pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
+#    pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
+#    pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
+#    pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#  endif
+#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#    define GLAPI __declspec(dllexport)
+#    define WGLAPI __declspec(dllexport)
+#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#    define WGLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#    define WGLAPI __declspec(dllimport)
+#  endif /* _STATIC_MESA support */
+#  define GLAPIENTRY __stdcall
+#  define GLAPIENTRYP __stdcall *
+#  define GLCALLBACK __stdcall
+#  define GLCALLBACKP __stdcall *
+#  if defined(__CYGWIN__)
+#    define GLCALLBACKPCAST *
+#  else
+#    define GLCALLBACKPCAST __stdcall *
+#  endif
+#  define GLWINAPI __stdcall
+#  define GLWINAPIV __cdecl
+#else
+/* non-Windows compilation */
+#  define GLAPI extern
+#  define GLAPIENTRY
+#  define GLAPIENTRYP *
+#  define GLCALLBACK
+#  define GLCALLBACKP *
+#  define GLCALLBACKPCAST *
+#  define GLWINAPI
+#  define GLWINAPIV
+#endif /* WIN32 / CYGWIN bracket */
+
+/* compatability guard so we don't need to change client code */
+
+#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP)
+#if 0
+#	define CALLBACK GLCALLBACK
+#endif
+typedef int (GLAPIENTRY *PROC)();
+typedef void *HGLRC;
+typedef void *HDC;
+typedef unsigned long COLORREF;
+#endif
+
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
+#	define WGL_FONT_LINES      0
+#	define WGL_FONT_POLYGONS   1
+#ifndef _GNU_H_WINDOWS32_FUNCTIONS
+#	ifdef UNICODE
+#		define wglUseFontBitmaps  wglUseFontBitmapsW
+#		define wglUseFontOutlines  wglUseFontOutlinesW
+#	else
+#		define wglUseFontBitmaps  wglUseFontBitmapsA
+#		define wglUseFontOutlines  wglUseFontOutlinesA
+#	endif /* !UNICODE */
+#endif /* _GNU_H_WINDOWS32_FUNCTIONS */
+typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
+typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
+typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
+#include <gl/mesa_wgl.h>
+#endif
+
+
+
+
+/* Make sure we include glext.h */
+#define GL_GLEXT_PROTOTYPES
+#include "GL/gl.h"
+#include "GL/glext.h"
+
 
 
 /* Disable unreachable code warnings for Watcom C++ */
Index: xc/extras/Mesa/src/hash.c
diff -u xc/extras/Mesa/src/hash.c:1.3 xc/extras/Mesa/src/hash.c:1.4
--- xc/extras/Mesa/src/hash.c:1.3	Mon Feb 14 23:12:19 2000
+++ xc/extras/Mesa/src/hash.c	Fri Jun 16 17:02:12 2000
@@ -202,17 +202,21 @@
 
 /*
  * Return the key of the "first" entry in the hash table.
- * By calling this function until zero is returned we can get
- * the keys of all entries in the table.
+ * This is used in the course of deleting all display lists when
+ * a context is destroyed.
  */
-GLuint _mesa_HashFirstEntry(const struct _mesa_HashTable *table)
+GLuint _mesa_HashFirstEntry(struct _mesa_HashTable *table)
 {
    GLuint pos;
    assert(table);
+   _glthread_LOCK_MUTEX(table->Mutex);
    for (pos=0; pos < TABLE_SIZE; pos++) {
-      if (table->Table[pos])
+      if (table->Table[pos]) {
+         _glthread_UNLOCK_MUTEX(table->Mutex);
          return table->Table[pos]->Key;
+      }
    }
+   _glthread_UNLOCK_MUTEX(table->Mutex);
    return 0;
 }
 
@@ -242,11 +246,13 @@
  *         numKeys - number of keys needed
  * Return:  starting key of free block or 0 if failure
  */
-GLuint _mesa_HashFindFreeKeyBlock(const struct _mesa_HashTable *table, GLuint numKeys)
+GLuint _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
 {
    GLuint maxKey = ~((GLuint) 0);
+   _glthread_LOCK_MUTEX(table->Mutex);
    if (maxKey - numKeys > table->MaxKey) {
       /* the quick solution */
+      _glthread_UNLOCK_MUTEX(table->Mutex);
       return table->MaxKey + 1;
    }
    else {
@@ -264,11 +270,13 @@
 	    /* this key not in use, check if we've found enough */
 	    freeCount++;
 	    if (freeCount == numKeys) {
+               _glthread_UNLOCK_MUTEX(table->Mutex);
 	       return freeStart;
 	    }
 	 }
       }
       /* cannot allocate a block of numKeys consecutive keys */
+      _glthread_UNLOCK_MUTEX(table->Mutex);
       return 0;
    }
 }
Index: xc/extras/Mesa/src/hash.h
diff -u xc/extras/Mesa/src/hash.h:1.3 xc/extras/Mesa/src/hash.h:1.4
--- xc/extras/Mesa/src/hash.h:1.3	Mon Feb 14 23:12:19 2000
+++ xc/extras/Mesa/src/hash.h	Fri Jun 16 17:02:12 2000
@@ -45,11 +45,11 @@
 
 extern void _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key);
 
-extern GLuint _mesa_HashFirstEntry(const struct _mesa_HashTable *table);
+extern GLuint _mesa_HashFirstEntry(struct _mesa_HashTable *table);
 
 extern void _mesa_HashPrint(const struct _mesa_HashTable *table);
 
-extern GLuint _mesa_HashFindFreeKeyBlock(const struct _mesa_HashTable *table, GLuint numKeys);
+extern GLuint _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys);
 
 
 #endif
Index: xc/extras/Mesa/src/hint.c
diff -u xc/extras/Mesa/src/hint.c:1.1 xc/extras/Mesa/src/hint.c:1.2
--- xc/extras/Mesa/src/hint.c:1.1	Tue Feb 15 06:50:51 2000
+++ xc/extras/Mesa/src/hint.c	Fri Jun 16 17:02:12 2000
@@ -52,78 +52,94 @@
    if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glHint %s %d\n", gl_lookup_enum_by_nr(target), mode);
 
+   if (mode != GL_NICEST && mode != GL_FASTEST && mode != GL_DONT_CARE) {
+      gl_error(ctx, GL_INVALID_ENUM, "glHint(mode)");
+      return GL_FALSE;
+   }
+
    switch (target) {
-   case GL_FOG_HINT:
-      ctx->Hint.Fog = mode;
-      break;
-   case GL_LINE_SMOOTH_HINT:
-      ctx->Hint.LineSmooth = mode;
-      break;
-   case GL_PERSPECTIVE_CORRECTION_HINT:
-      ctx->Hint.PerspectiveCorrection = mode;
-      break;
-   case GL_POINT_SMOOTH_HINT:
-      ctx->Hint.PointSmooth = mode;
-      break;
-   case GL_POLYGON_SMOOTH_HINT:
-      ctx->Hint.PolygonSmooth = mode;
-      break;
-   case GL_PREFER_DOUBLEBUFFER_HINT_PGI:
-   case GL_STRICT_DEPTHFUNC_HINT_PGI:
-      break;
-   case GL_STRICT_LIGHTING_HINT_PGI:
-      ctx->Hint.StrictLighting = mode;
-      break;
-   case GL_STRICT_SCISSOR_HINT_PGI:
-   case GL_FULL_STIPPLE_HINT_PGI:
-   case GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI:
-   case GL_NATIVE_GRAPHICS_END_HINT_PGI:
-   case GL_CONSERVE_MEMORY_HINT_PGI:
-   case GL_RECLAIM_MEMORY_HINT_PGI:
-      break;
-   case GL_ALWAYS_FAST_HINT_PGI:
-      if (mode) {
-	 ctx->Hint.AllowDrawWin = GL_TRUE;
-	 ctx->Hint.AllowDrawSpn = GL_FALSE;
-	 ctx->Hint.AllowDrawMem = GL_FALSE;
-      } else {
-	 ctx->Hint.AllowDrawWin = GL_TRUE;
-	 ctx->Hint.AllowDrawSpn = GL_TRUE;
-	 ctx->Hint.AllowDrawMem = GL_TRUE;
-      } 
-      break;
-   case GL_ALWAYS_SOFT_HINT_PGI:
-      ctx->Hint.AllowDrawWin = GL_TRUE;
-      ctx->Hint.AllowDrawSpn = GL_TRUE;
-      ctx->Hint.AllowDrawMem = GL_TRUE;
-      break;
-   case GL_ALLOW_DRAW_OBJ_HINT_PGI:
-      break;
-   case GL_ALLOW_DRAW_WIN_HINT_PGI:
-      ctx->Hint.AllowDrawWin = mode;
-      break;
-   case GL_ALLOW_DRAW_SPN_HINT_PGI:
-      ctx->Hint.AllowDrawSpn = mode;
-      break;
-   case GL_ALLOW_DRAW_MEM_HINT_PGI:
-      ctx->Hint.AllowDrawMem = mode;
-      break;
-   case GL_CLIP_NEAR_HINT_PGI:
-   case GL_CLIP_FAR_HINT_PGI:
-   case GL_WIDE_LINE_HINT_PGI:
-   case GL_BACK_NORMALS_HINT_PGI:
-   case GL_NATIVE_GRAPHICS_HANDLE_PGI:
-      break;
+      case GL_FOG_HINT:
+         ctx->Hint.Fog = mode;
+         break;
+      case GL_LINE_SMOOTH_HINT:
+         ctx->Hint.LineSmooth = mode;
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+         ctx->Hint.PerspectiveCorrection = mode;
+         break;
+      case GL_POINT_SMOOTH_HINT:
+         ctx->Hint.PointSmooth = mode;
+         break;
+      case GL_POLYGON_SMOOTH_HINT:
+         ctx->Hint.PolygonSmooth = mode;
+         break;
+      case GL_PREFER_DOUBLEBUFFER_HINT_PGI:
+      case GL_STRICT_DEPTHFUNC_HINT_PGI:
+         break;
+      case GL_STRICT_LIGHTING_HINT_PGI:
+         ctx->Hint.StrictLighting = mode;
+         break;
+      case GL_STRICT_SCISSOR_HINT_PGI:
+      case GL_FULL_STIPPLE_HINT_PGI:
+      case GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI:
+      case GL_NATIVE_GRAPHICS_END_HINT_PGI:
+      case GL_CONSERVE_MEMORY_HINT_PGI:
+      case GL_RECLAIM_MEMORY_HINT_PGI:
+         break;
+      case GL_ALWAYS_FAST_HINT_PGI:
+         if (mode) {
+            ctx->Hint.AllowDrawWin = GL_TRUE;
+            ctx->Hint.AllowDrawFrg = GL_FALSE;
+            ctx->Hint.AllowDrawMem = GL_FALSE;
+         } else {
+            ctx->Hint.AllowDrawWin = GL_TRUE;
+            ctx->Hint.AllowDrawFrg = GL_TRUE;
+            ctx->Hint.AllowDrawMem = GL_TRUE;
+         } 
+         break;
+      case GL_ALWAYS_SOFT_HINT_PGI:
+         ctx->Hint.AllowDrawWin = GL_TRUE;
+         ctx->Hint.AllowDrawFrg = GL_TRUE;
+         ctx->Hint.AllowDrawMem = GL_TRUE;
+         break;
+      case GL_ALLOW_DRAW_OBJ_HINT_PGI:
+         break;
+      case GL_ALLOW_DRAW_WIN_HINT_PGI:
+         ctx->Hint.AllowDrawWin = mode;
+         break;
+      case GL_ALLOW_DRAW_FRG_HINT_PGI:
+         ctx->Hint.AllowDrawFrg = mode;
+         break;
+      case GL_ALLOW_DRAW_MEM_HINT_PGI:
+         ctx->Hint.AllowDrawMem = mode;
+         break;
+      case GL_CLIP_NEAR_HINT_PGI:
+      case GL_CLIP_FAR_HINT_PGI:
+      case GL_WIDE_LINE_HINT_PGI:
+      case GL_BACK_NORMALS_HINT_PGI:
+      case GL_NATIVE_GRAPHICS_HANDLE_PGI:
+         break;
 
       /* GL_EXT_clip_volume_hint */
-   case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
-      ctx->Hint.ClipVolumeClipping = mode;
-      break;
-
-   default:
-      gl_error( ctx, GL_INVALID_ENUM, "glHint(target)" );
-      return GL_FALSE;
+      case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
+         ctx->Hint.ClipVolumeClipping = mode;
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            ctx->Hint.TextureCompression = mode;
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glHint(target)");
+         }
+         break;
+
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glHint(target)");
+         return GL_FALSE;
    }
+
    ctx->NewState |= NEW_ALL;   /* just to be safe */
 
    if (ctx->Driver.Hint) {
@@ -143,6 +159,11 @@
    if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glHintPGI %s %d\n", gl_lookup_enum_by_nr(target), mode);
 
+   if (mode != GL_NICEST && mode != GL_FASTEST && mode != GL_DONT_CARE) {
+      gl_error(ctx, GL_INVALID_ENUM, "glHintPGI(mode)");
+      return;
+   }
+
    switch (target) {
       case GL_PREFER_DOUBLEBUFFER_HINT_PGI:
       case GL_STRICT_DEPTHFUNC_HINT_PGI:
@@ -157,7 +178,7 @@
       case GL_ALWAYS_SOFT_HINT_PGI:
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
       case GL_ALLOW_DRAW_WIN_HINT_PGI:
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
+      case GL_ALLOW_DRAW_FRG_HINT_PGI:
       case GL_ALLOW_DRAW_MEM_HINT_PGI:
       case GL_CLIP_NEAR_HINT_PGI:
       case GL_CLIP_FAR_HINT_PGI:
Index: xc/extras/Mesa/src/image.c
diff -u xc/extras/Mesa/src/image.c:1.4 xc/extras/Mesa/src/image.c:1.5
--- xc/extras/Mesa/src/image.c:1.4	Thu Mar  2 08:07:11 2000
+++ xc/extras/Mesa/src/image.c	Fri Jun 16 17:02:12 2000
@@ -30,6 +30,7 @@
 #include "glheader.h"
 #include "context.h"
 #include "image.h"
+#include "imaging.h"
 #include "macros.h"
 #include "mem.h"
 #include "mmath.h"
@@ -46,7 +47,7 @@
  * from within display lists we have to be sure to set the current
  * unpacking params to these values!
  */
-struct gl_pixelstore_attrib _mesa_native_packing = {
+const struct gl_pixelstore_attrib _mesa_native_packing = {
    1,            /* Alignment */
    0,            /* RowLength */
    0,            /* SkipPixels */
@@ -62,7 +63,8 @@
 /*
  * Flip the 8 bits in each byte of the given array.
  */
-void gl_flip_bytes( GLubyte *p, GLuint n )
+static void
+flip_bytes( GLubyte *p, GLuint n )
 {
    register GLuint i, a, b;
 
@@ -84,7 +86,8 @@
 /*
  * Flip the order of the 2 bytes in each word in the given array.
  */
-void gl_swap2( GLushort *p, GLuint n )
+void
+_mesa_swap2( GLushort *p, GLuint n )
 {
    register GLuint i;
 
@@ -98,7 +101,8 @@
 /*
  * Flip the order of the 4 bytes in each word in the given array.
  */
-void gl_swap4( GLuint *p, GLuint n )
+void
+_mesa_swap4( GLuint *p, GLuint n )
 {
    register GLuint i, a, b;
 
@@ -120,7 +124,7 @@
  * Return 0 if GL_BITMAP.
  * Return -1 if invalid type enum.
  */
-GLint gl_sizeof_type( GLenum type )
+GLint _mesa_sizeof_type( GLenum type )
 {
    switch (type) {
       case GL_BITMAP:
@@ -146,10 +150,10 @@
 
 
 /*
- * Same as gl_sizeof_packed_type() but we also accept the
+ * Same as _mesa_sizeof_packed_type() but we also accept the
  * packed pixel format datatypes.
  */
-GLint gl_sizeof_packed_type( GLenum type )
+GLint _mesa_sizeof_packed_type( GLenum type )
 {
    switch (type) {
       case GL_BITMAP:
@@ -203,7 +207,7 @@
  * Return the number of components in a GL enum pixel type.
  * Return -1 if bad format.
  */
-GLint gl_components_in_format( GLenum format )
+GLint _mesa_components_in_format( GLenum format )
 {
    switch (format) {
       case GL_COLOR_INDEX:
@@ -220,6 +224,7 @@
       case GL_BLUE:
       case GL_ALPHA:
       case GL_LUMINANCE:
+      case GL_INTENSITY:
          return 1;
       case GL_LUMINANCE_ALPHA:
 	 return 2;
@@ -243,9 +248,9 @@
  * Return bytes per pixel for given format and type
  * Return -1 if bad format or type.
  */
-GLint gl_bytes_per_pixel( GLenum format, GLenum type )
+GLint _mesa_bytes_per_pixel( GLenum format, GLenum type )
 {
-   GLint comps = gl_components_in_format( format );
+   GLint comps = _mesa_components_in_format( format );
    if (comps < 0)
       return -1;
 
@@ -301,7 +306,8 @@
  * Test if the given pixel format and type are legal.
  * Return GL_TRUE for legal, GL_FALSE for illegal.
  */
-GLboolean gl_is_legal_format_and_type( GLenum format, GLenum type )
+GLboolean
+_mesa_is_legal_format_and_type( GLenum format, GLenum type )
 {
    switch (format) {
       case GL_COLOR_INDEX:
@@ -399,10 +405,11 @@
  *         row, column - location of pixel in the image
  * Return:  address of pixel at (image,row,column) in image or NULL if error.
  */
-GLvoid *gl_pixel_addr_in_image( const struct gl_pixelstore_attrib *packing,
-                                const GLvoid *image, GLsizei width,
-                                GLsizei height, GLenum format, GLenum type,
-                                GLint img, GLint row, GLint column )
+GLvoid *
+_mesa_image_address( const struct gl_pixelstore_attrib *packing,
+                     const GLvoid *image, GLsizei width,
+                     GLsizei height, GLenum format, GLenum type,
+                     GLint img, GLint row, GLint column )
 {
    GLint alignment;        /* 1, 2 or 4 */
    GLint pixels_per_row;
@@ -437,13 +444,13 @@
       GLint bytes_per_image;
 
       /* Compute bytes per component */
-      bytes_per_comp = gl_sizeof_packed_type( type );
+      bytes_per_comp = _mesa_sizeof_packed_type( type );
       if (bytes_per_comp<0) {
          return NULL;
       }
 
       /* Compute number of components per pixel */
-      comp_per_pixel = gl_components_in_format( format );
+      comp_per_pixel = _mesa_components_in_format( format );
       if (comp_per_pixel<0 && type != GL_BITMAP) {
          return NULL;
       }
@@ -462,7 +469,7 @@
       /* Non-BITMAP data */
       GLint bytes_per_pixel, bytes_per_row, remainder, bytes_per_image;
 
-      bytes_per_pixel = gl_bytes_per_pixel( format, type );
+      bytes_per_pixel = _mesa_bytes_per_pixel( format, type );
 
       /* The pixel type and format should have been error checked earlier */
       assert(bytes_per_pixel > 0);
@@ -489,25 +496,69 @@
 
 
 /*
- * Unpack a 32x32 pixel polygon stipple from user memory using the
- * current pixel unpack settings.
+ * Compute the stride between image rows (in bytes) for the given
+ * pixel packing parameters and image width, format and type.
  */
-void gl_unpack_polygon_stipple( const GLcontext *ctx,
-                                const GLubyte *pattern, GLuint dest[32] )
+GLint
+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
+                        GLint width, GLenum format, GLenum type )
 {
-   GLint i;
-   for (i = 0; i < 32; i++) {
-      GLubyte *src = (GLubyte *) gl_pixel_addr_in_image( &ctx->Unpack, pattern,
-                                  32, 32, GL_COLOR_INDEX, GL_BITMAP, 0, i, 0 );
-      dest[i] = (src[0] << 24)
-              | (src[1] << 16)
-              | (src[2] <<  8)
-              | (src[3]      );
+   ASSERT(packing);
+   if (type == GL_BITMAP) {
+      /* BITMAP data */
+      if (packing->RowLength == 0) {
+         GLint bytes = (width + 7) / 8;
+         return bytes;
+      }
+      else {
+         GLint bytes = (packing->RowLength + 7) / 8;
+         return bytes;
+      }
    }
+   else {
+      /* Non-BITMAP data */
+      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
+      GLint bytesPerRow, remainder;
+      if (bytesPerPixel <= 0)
+         return -1;  /* error */
+      if (packing->RowLength == 0) {
+         bytesPerRow = bytesPerPixel * width;
+      }
+      else {
+         bytesPerRow = bytesPerPixel * packing->RowLength;
+      }
+      remainder = bytesPerRow % packing->Alignment;
+      if (remainder > 0)
+         bytesPerRow += (packing->Alignment - remainder);
+      return bytesPerRow;
+   }
+}
+
+
 
-   /* Bit flipping within each byte */
-   if (ctx->Unpack.LsbFirst) {
-      gl_flip_bytes( (GLubyte *) dest, 32 * 4 );
+/*
+ * Unpack a 32x32 pixel polygon stipple from user memory using the
+ * current pixel unpack settings.
+ */
+void
+_mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],
+                              const struct gl_pixelstore_attrib *unpacking )
+{
+   GLubyte *ptrn = (GLubyte *) _mesa_unpack_bitmap( 32, 32, pattern, unpacking );
+   if (ptrn) {
+      /* Convert pattern from GLubytes to GLuints and handle big/little
+       * endian differences
+       */
+      GLubyte *p = ptrn;
+      GLint i;
+      for (i = 0; i < 32; i++) {
+         dest[i] = (p[0] << 24)
+                 | (p[1] << 16)
+                 | (p[2] <<  8)
+                 | (p[3]      );
+         p += 4;
+      }
+      FREE(ptrn);
    }
 }
 
@@ -517,24 +568,23 @@
  * Pack polygon stipple into user memory given current pixel packing
  * settings.
  */
-void gl_pack_polygon_stipple( const GLcontext *ctx,
-                              const GLuint pattern[32],
-                              GLubyte *dest )
+void
+_mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest,
+                            const struct gl_pixelstore_attrib *packing )
 {
+   /* Convert pattern from GLuints to GLubytes to handle big/little
+    * endian differences.
+    */
+   GLubyte ptrn[32*4];
    GLint i;
    for (i = 0; i < 32; i++) {
-      GLubyte *dst = (GLubyte *) gl_pixel_addr_in_image( &ctx->Pack, dest,
-                                  32, 32, GL_COLOR_INDEX, GL_BITMAP, 0, i, 0 );
-      dst[0] = (pattern[i] >> 24) & 0xff;
-      dst[1] = (pattern[i] >> 16) & 0xff;
-      dst[2] = (pattern[i] >>  8) & 0xff;
-      dst[3] = (pattern[i]      ) & 0xff;
-
-      /* Bit flipping within each byte */
-      if (ctx->Pack.LsbFirst) {
-         gl_flip_bytes( (GLubyte *) dst, 4 );
-      }
+      ptrn[i * 4 + 0] = (GLubyte) ((pattern[i] >> 24) & 0xff);
+      ptrn[i * 4 + 1] = (GLubyte) ((pattern[i] >> 16) & 0xff);
+      ptrn[i * 4 + 2] = (GLubyte) ((pattern[i] >> 8 ) & 0xff);
+      ptrn[i * 4 + 3] = (GLubyte) ((pattern[i]      ) & 0xff);
    }
+
+   _mesa_pack_bitmap(32, 32, ptrn, dest, packing);
 }
 
 
@@ -554,66 +604,100 @@
  *         packing - pixel packing parameters
  *         applyTransferOps - apply scale/bias/lookup-table ops?
  */
-void gl_pack_rgba_span( const GLcontext *ctx,
-                        GLuint n, CONST GLubyte rgba[][4],
-                        GLenum format, GLenum type, GLvoid *destination,
-                        const struct gl_pixelstore_attrib *packing,
-                        GLboolean applyTransferOps )
+void
+_mesa_pack_rgba_span( GLcontext *ctx,
+                      GLuint n, CONST GLubyte srcRgba[][4],
+                      GLenum format, GLenum type, GLvoid *destination,
+                      const struct gl_pixelstore_attrib *packing,
+                      GLboolean applyTransferOps )
 {
-   applyTransferOps &= (ctx->Pixel.ScaleOrBiasRGBA || ctx->Pixel.MapColorFlag);
+   applyTransferOps &= (ctx->Pixel.ScaleOrBiasRGBA ||
+                        ctx->Pixel.MapColorFlag ||
+                        ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+                        ctx->Pixel.ScaleOrBiasRGBApcm ||
+                        ctx->Pixel.ColorTableEnabled ||
+                        ctx->Pixel.PostColorMatrixColorTableEnabled ||
+                        ctx->Pixel.MinMaxEnabled ||
+                        ctx->Pixel.HistogramEnabled);
 
    /* Test for optimized case first */
    if (!applyTransferOps && format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
       /* common simple case */
-      MEMCPY( destination, rgba, n * 4 * sizeof(GLubyte) );
+      MEMCPY( destination, srcRgba, n * 4 * sizeof(GLubyte) );
    }
    else if (!applyTransferOps && format == GL_RGB && type == GL_UNSIGNED_BYTE) {
       /* common simple case */
       GLint i;
       GLubyte *dest = (GLubyte *) destination;
       for (i = 0; i < n; i++) {
-         dest[0] = rgba[i][RCOMP];
-         dest[1] = rgba[i][GCOMP];
-         dest[2] = rgba[i][BCOMP];
+         dest[0] = srcRgba[i][RCOMP];
+         dest[1] = srcRgba[i][GCOMP];
+         dest[2] = srcRgba[i][BCOMP];
          dest += 3;
       }
    }
    else {
       /* general solution */
-      GLfloat red[MAX_WIDTH], green[MAX_WIDTH], blue[MAX_WIDTH];
-      GLfloat alpha[MAX_WIDTH], luminance[MAX_WIDTH];
+      GLfloat rgba[MAX_WIDTH][4], luminance[MAX_WIDTH];
       const GLfloat rscale = 1.0F / 255.0F;
       const GLfloat gscale = 1.0F / 255.0F;
       const GLfloat bscale = 1.0F / 255.0F;
       const GLfloat ascale = 1.0F / 255.0F;
-      const GLint comps = gl_components_in_format(format);
+      const GLint comps = _mesa_components_in_format(format);
       GLuint i;
 
       assert(n <= MAX_WIDTH);
 
       /* convert color components to floating point */
       for (i=0;i<n;i++) {
-         red[i]   = rgba[i][RCOMP] * rscale;
-         green[i] = rgba[i][GCOMP] * gscale;
-         blue[i]  = rgba[i][BCOMP] * bscale;
-         alpha[i] = rgba[i][ACOMP] * ascale;
+         rgba[i][RCOMP] = srcRgba[i][RCOMP] * rscale;
+         rgba[i][GCOMP] = srcRgba[i][GCOMP] * gscale;
+         rgba[i][BCOMP] = srcRgba[i][BCOMP] * bscale;
+         rgba[i][ACOMP] = srcRgba[i][ACOMP] * ascale;
       }
 
       /*
        * Apply scale, bias and lookup-tables if enabled.
        */
       if (applyTransferOps) {
+         /* scale & bias */
          if (ctx->Pixel.ScaleOrBiasRGBA) {
-            gl_scale_and_bias_color( ctx, n, red, green, blue, alpha );
+            _mesa_scale_and_bias_rgba( ctx, n, rgba );
          }
+         /* color map lookup */
          if (ctx->Pixel.MapColorFlag) {
-            gl_map_color( ctx, n, red, green, blue, alpha );
+            _mesa_map_rgba( ctx, n, rgba );
+         }
+         /* GL_COLOR_TABLE lookup */
+         if (ctx->Pixel.ColorTableEnabled) {
+            _mesa_lookup_rgba(&ctx->ColorTable, n, rgba);
+         }
+         /* XXX convolution here */
+         /* XXX post-convolution color table look-up here */
+         /* color matrix */
+         if (ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+             ctx->Pixel.ScaleOrBiasRGBApcm) {
+            _mesa_transform_rgba(ctx, n, rgba);
+         }
+         /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+         if (ctx->Pixel.PostColorMatrixColorTableEnabled) {
+            _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, n, rgba);
+         }
+         /* update histogram count */
+         if (ctx->Pixel.HistogramEnabled) {
+            _mesa_update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+         /* XXX min/max here */
+         if (ctx->Pixel.MinMaxEnabled) {
+            _mesa_update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
+            if (ctx->MinMax.Sink)
+               return;
          }
       }
 
       if (format==GL_LUMINANCE || format==GL_LUMINANCE_ALPHA) {
          for (i=0;i<n;i++) {
-            GLfloat sum = red[i] + green[i] + blue[i];
+            GLfloat sum = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
             luminance[i] = CLAMP( sum, 0.0F, 1.0F );
          }
       }
@@ -628,19 +712,19 @@
                switch (format) {
                   case GL_RED:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_UBYTE(red[i]);
+                        dst[i] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
                      break;
                   case GL_GREEN:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_UBYTE(green[i]);
+                        dst[i] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
                      break;
                   case GL_BLUE:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_UBYTE(blue[i]);
+                        dst[i] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
                      break;
                   case GL_ALPHA:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_UBYTE(alpha[i]);
+                        dst[i] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
                      break;
                   case GL_LUMINANCE:
                      for (i=0;i<n;i++)
@@ -649,49 +733,49 @@
                   case GL_LUMINANCE_ALPHA:
                      for (i=0;i<n;i++) {
                         dst[i*2+0] = FLOAT_TO_UBYTE(luminance[i]);
-                        dst[i*2+1] = FLOAT_TO_UBYTE(alpha[i]);
+                        dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_RGB:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_UBYTE(red[i]);
-                        dst[i*3+1] = FLOAT_TO_UBYTE(green[i]);
-                        dst[i*3+2] = FLOAT_TO_UBYTE(blue[i]);
+                        dst[i*3+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                        dst[i*3+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
                      }
                      break;
                   case GL_RGBA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_UBYTE(red[i]);
-                        dst[i*4+1] = FLOAT_TO_UBYTE(green[i]);
-                        dst[i*4+2] = FLOAT_TO_UBYTE(blue[i]);
-                        dst[i*4+3] = FLOAT_TO_UBYTE(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                        dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                        dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_BGR:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_UBYTE(blue[i]);
-                        dst[i*3+1] = FLOAT_TO_UBYTE(green[i]);
-                        dst[i*3+2] = FLOAT_TO_UBYTE(red[i]);
+                        dst[i*3+0] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                        dst[i*3+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
                      }
                      break;
                   case GL_BGRA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_UBYTE(blue[i]);
-                        dst[i*4+1] = FLOAT_TO_UBYTE(green[i]);
-                        dst[i*4+2] = FLOAT_TO_UBYTE(red[i]);
-                        dst[i*4+3] = FLOAT_TO_UBYTE(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                        dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                        dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_ABGR_EXT:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_UBYTE(alpha[i]);
-                        dst[i*4+1] = FLOAT_TO_UBYTE(blue[i]);
-                        dst[i*4+2] = FLOAT_TO_UBYTE(green[i]);
-                        dst[i*4+3] = FLOAT_TO_UBYTE(red[i]);
+                        dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
+                        dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                        dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                        dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
                      }
                      break;
                   default:
-                     gl_problem(ctx, "bad format in gl_pack_rgba_span\n");
+                     gl_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
                }
 	    }
 	    break;
@@ -701,19 +785,19 @@
                switch (format) {
                   case GL_RED:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_BYTE(red[i]);
+                        dst[i] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
                      break;
                   case GL_GREEN:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_BYTE(green[i]);
+                        dst[i] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
                      break;
                   case GL_BLUE:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_BYTE(blue[i]);
+                        dst[i] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
                      break;
                   case GL_ALPHA:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_BYTE(alpha[i]);
+                        dst[i] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
                      break;
                   case GL_LUMINANCE:
                      for (i=0;i<n;i++)
@@ -722,48 +806,48 @@
                   case GL_LUMINANCE_ALPHA:
                      for (i=0;i<n;i++) {
                         dst[i*2+0] = FLOAT_TO_BYTE(luminance[i]);
-                        dst[i*2+1] = FLOAT_TO_BYTE(alpha[i]);
+                        dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_RGB:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_BYTE(red[i]);
-                        dst[i*3+1] = FLOAT_TO_BYTE(green[i]);
-                        dst[i*3+2] = FLOAT_TO_BYTE(blue[i]);
+                        dst[i*3+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                        dst[i*3+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
                      }
                      break;
                   case GL_RGBA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_BYTE(red[i]);
-                        dst[i*4+1] = FLOAT_TO_BYTE(green[i]);
-                        dst[i*4+2] = FLOAT_TO_BYTE(blue[i]);
-                        dst[i*4+3] = FLOAT_TO_BYTE(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                        dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                        dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_BGR:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_BYTE(blue[i]);
-                        dst[i*3+1] = FLOAT_TO_BYTE(green[i]);
-                        dst[i*3+2] = FLOAT_TO_BYTE(red[i]);
+                        dst[i*3+0] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                        dst[i*3+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
                      }
                      break;
                   case GL_BGRA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_BYTE(blue[i]);
-                        dst[i*4+1] = FLOAT_TO_BYTE(green[i]);
-                        dst[i*4+2] = FLOAT_TO_BYTE(red[i]);
-                        dst[i*4+3] = FLOAT_TO_BYTE(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                        dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                        dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
                      }
                   case GL_ABGR_EXT:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_BYTE(alpha[i]);
-                        dst[i*4+1] = FLOAT_TO_BYTE(blue[i]);
-                        dst[i*4+2] = FLOAT_TO_BYTE(green[i]);
-                        dst[i*4+3] = FLOAT_TO_BYTE(red[i]);
+                        dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
+                        dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                        dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                        dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
                      }
                      break;
                   default:
-                     gl_problem(ctx, "bad format in gl_pack_rgba_span\n");
+                     gl_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
                }
             }
 	    break;
@@ -773,19 +857,19 @@
                switch (format) {
                   case GL_RED:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_USHORT(red[i]);
+                        dst[i] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
                      break;
                   case GL_GREEN:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_USHORT(green[i]);
+                        dst[i] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
                      break;
                   case GL_BLUE:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_USHORT(blue[i]);
+                        dst[i] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
                      break;
                   case GL_ALPHA:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_USHORT(alpha[i]);
+                        dst[i] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
                      break;
                   case GL_LUMINANCE:
                      for (i=0;i<n;i++)
@@ -794,52 +878,52 @@
                   case GL_LUMINANCE_ALPHA:
                      for (i=0;i<n;i++) {
                         dst[i*2+0] = FLOAT_TO_USHORT(luminance[i]);
-                        dst[i*2+1] = FLOAT_TO_USHORT(alpha[i]);
+                        dst[i*2+1] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_RGB:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_USHORT(red[i]);
-                        dst[i*3+1] = FLOAT_TO_USHORT(green[i]);
-                        dst[i*3+2] = FLOAT_TO_USHORT(blue[i]);
+                        dst[i*3+0] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                        dst[i*3+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
                      }
                      break;
                   case GL_RGBA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_USHORT(red[i]);
-                        dst[i*4+1] = FLOAT_TO_USHORT(green[i]);
-                        dst[i*4+2] = FLOAT_TO_USHORT(blue[i]);
-                        dst[i*4+3] = FLOAT_TO_USHORT(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                        dst[i*4+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                        dst[i*4+3] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_BGR:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_USHORT(blue[i]);
-                        dst[i*3+1] = FLOAT_TO_USHORT(green[i]);
-                        dst[i*3+2] = FLOAT_TO_USHORT(red[i]);
+                        dst[i*3+0] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                        dst[i*3+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
                      }
                      break;
                   case GL_BGRA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_USHORT(blue[i]);
-                        dst[i*4+1] = FLOAT_TO_USHORT(green[i]);
-                        dst[i*4+2] = FLOAT_TO_USHORT(red[i]);
-                        dst[i*4+3] = FLOAT_TO_USHORT(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                        dst[i*4+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                        dst[i*4+3] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_ABGR_EXT:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_USHORT(alpha[i]);
-                        dst[i*4+1] = FLOAT_TO_USHORT(blue[i]);
-                        dst[i*4+2] = FLOAT_TO_USHORT(green[i]);
-                        dst[i*4+3] = FLOAT_TO_USHORT(red[i]);
+                        dst[i*4+0] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
+                        dst[i*4+1] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                        dst[i*4+2] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                        dst[i*4+3] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
                      }
                      break;
                   default:
-                     gl_problem(ctx, "bad format in gl_pack_rgba_span\n");
+                     gl_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
                }
                if (packing->SwapBytes) {
-                  gl_swap2( (GLushort *) dst, n * comps);
+                  _mesa_swap2( (GLushort *) dst, n * comps);
                }
             }
 	    break;
@@ -849,19 +933,19 @@
                switch (format) {
                   case GL_RED:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_SHORT(red[i]);
+                        dst[i] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
                      break;
                   case GL_GREEN:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_SHORT(green[i]);
+                        dst[i] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
                      break;
                   case GL_BLUE:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_SHORT(blue[i]);
+                        dst[i] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
                      break;
                   case GL_ALPHA:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_SHORT(alpha[i]);
+                        dst[i] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
                      break;
                   case GL_LUMINANCE:
                      for (i=0;i<n;i++)
@@ -870,51 +954,51 @@
                   case GL_LUMINANCE_ALPHA:
                      for (i=0;i<n;i++) {
                         dst[i*2+0] = FLOAT_TO_SHORT(luminance[i]);
-                        dst[i*2+1] = FLOAT_TO_SHORT(alpha[i]);
+                        dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_RGB:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_SHORT(red[i]);
-                        dst[i*3+1] = FLOAT_TO_SHORT(green[i]);
-                        dst[i*3+2] = FLOAT_TO_SHORT(blue[i]);
+                        dst[i*3+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                        dst[i*3+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
                      }
                      break;
                   case GL_RGBA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_SHORT(red[i]);
-                        dst[i*4+1] = FLOAT_TO_SHORT(green[i]);
-                        dst[i*4+2] = FLOAT_TO_SHORT(blue[i]);
-                        dst[i*4+3] = FLOAT_TO_SHORT(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                        dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                        dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_BGR:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_SHORT(blue[i]);
-                        dst[i*3+1] = FLOAT_TO_SHORT(green[i]);
-                        dst[i*3+2] = FLOAT_TO_SHORT(red[i]);
+                        dst[i*3+0] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                        dst[i*3+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
                      }
                      break;
                   case GL_BGRA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_SHORT(blue[i]);
-                        dst[i*4+1] = FLOAT_TO_SHORT(green[i]);
-                        dst[i*4+2] = FLOAT_TO_SHORT(red[i]);
-                        dst[i*4+3] = FLOAT_TO_SHORT(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                        dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                        dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
                      }
                   case GL_ABGR_EXT:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_SHORT(alpha[i]);
-                        dst[i*4+1] = FLOAT_TO_SHORT(blue[i]);
-                        dst[i*4+2] = FLOAT_TO_SHORT(green[i]);
-                        dst[i*4+3] = FLOAT_TO_SHORT(red[i]);
+                        dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
+                        dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                        dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                        dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
                      }
                      break;
                   default:
-                     gl_problem(ctx, "bad format in gl_pack_rgba_span\n");
+                     gl_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
                }
                if (packing->SwapBytes) {
-                  gl_swap2( (GLushort *) dst, n * comps );
+                  _mesa_swap2( (GLushort *) dst, n * comps );
                }
             }
 	    break;
@@ -924,19 +1008,19 @@
                switch (format) {
                   case GL_RED:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_UINT(red[i]);
+                        dst[i] = FLOAT_TO_UINT(rgba[i][RCOMP]);
                      break;
                   case GL_GREEN:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_UINT(green[i]);
+                        dst[i] = FLOAT_TO_UINT(rgba[i][GCOMP]);
                      break;
                   case GL_BLUE:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_UINT(blue[i]);
+                        dst[i] = FLOAT_TO_UINT(rgba[i][BCOMP]);
                      break;
                   case GL_ALPHA:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_UINT(alpha[i]);
+                        dst[i] = FLOAT_TO_UINT(rgba[i][ACOMP]);
                      break;
                   case GL_LUMINANCE:
                      for (i=0;i<n;i++)
@@ -945,52 +1029,52 @@
                   case GL_LUMINANCE_ALPHA:
                      for (i=0;i<n;i++) {
                         dst[i*2+0] = FLOAT_TO_UINT(luminance[i]);
-                        dst[i*2+1] = FLOAT_TO_UINT(alpha[i]);
+                        dst[i*2+1] = FLOAT_TO_UINT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_RGB:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_UINT(red[i]);
-                        dst[i*3+1] = FLOAT_TO_UINT(green[i]);
-                        dst[i*3+2] = FLOAT_TO_UINT(blue[i]);
+                        dst[i*3+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                        dst[i*3+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_UINT(rgba[i][BCOMP]);
                      }
                      break;
                   case GL_RGBA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_UINT(red[i]);
-                        dst[i*4+1] = FLOAT_TO_UINT(green[i]);
-                        dst[i*4+2] = FLOAT_TO_UINT(blue[i]);
-                        dst[i*4+3] = FLOAT_TO_UINT(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                        dst[i*4+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                        dst[i*4+3] = FLOAT_TO_UINT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_BGR:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_UINT(blue[i]);
-                        dst[i*3+1] = FLOAT_TO_UINT(green[i]);
-                        dst[i*3+2] = FLOAT_TO_UINT(red[i]);
+                        dst[i*3+0] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                        dst[i*3+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_UINT(rgba[i][RCOMP]);
                      }
                      break;
                   case GL_BGRA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_UINT(blue[i]);
-                        dst[i*4+1] = FLOAT_TO_UINT(green[i]);
-                        dst[i*4+2] = FLOAT_TO_UINT(red[i]);
-                        dst[i*4+3] = FLOAT_TO_UINT(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                        dst[i*4+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                        dst[i*4+3] = FLOAT_TO_UINT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_ABGR_EXT:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_UINT(alpha[i]);
-                        dst[i*4+1] = FLOAT_TO_UINT(blue[i]);
-                        dst[i*4+2] = FLOAT_TO_UINT(green[i]);
-                        dst[i*4+3] = FLOAT_TO_UINT(red[i]);
+                        dst[i*4+0] = FLOAT_TO_UINT(rgba[i][ACOMP]);
+                        dst[i*4+1] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                        dst[i*4+2] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                        dst[i*4+3] = FLOAT_TO_UINT(rgba[i][RCOMP]);
                      }
                      break;
                   default:
-                     gl_problem(ctx, "bad format in gl_pack_rgba_span\n");
+                     gl_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
                }
                if (packing->SwapBytes) {
-                  gl_swap4( (GLuint *) dst, n * comps );
+                  _mesa_swap4( (GLuint *) dst, n * comps );
                }
             }
 	    break;
@@ -1000,19 +1084,19 @@
                switch (format) {
                   case GL_RED:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_INT(red[i]);
+                        dst[i] = FLOAT_TO_INT(rgba[i][RCOMP]);
                      break;
                   case GL_GREEN:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_INT(green[i]);
+                        dst[i] = FLOAT_TO_INT(rgba[i][GCOMP]);
                      break;
                   case GL_BLUE:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_INT(blue[i]);
+                        dst[i] = FLOAT_TO_INT(rgba[i][BCOMP]);
                      break;
                   case GL_ALPHA:
                      for (i=0;i<n;i++)
-                        dst[i] = FLOAT_TO_INT(alpha[i]);
+                        dst[i] = FLOAT_TO_INT(rgba[i][ACOMP]);
                      break;
                   case GL_LUMINANCE:
                      for (i=0;i<n;i++)
@@ -1021,52 +1105,52 @@
                   case GL_LUMINANCE_ALPHA:
                      for (i=0;i<n;i++) {
                         dst[i*2+0] = FLOAT_TO_INT(luminance[i]);
-                        dst[i*2+1] = FLOAT_TO_INT(alpha[i]);
+                        dst[i*2+1] = FLOAT_TO_INT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_RGB:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_INT(red[i]);
-                        dst[i*3+1] = FLOAT_TO_INT(green[i]);
-                        dst[i*3+2] = FLOAT_TO_INT(blue[i]);
+                        dst[i*3+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                        dst[i*3+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_INT(rgba[i][BCOMP]);
                      }
                      break;
                   case GL_RGBA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_INT(red[i]);
-                        dst[i*4+1] = FLOAT_TO_INT(green[i]);
-                        dst[i*4+2] = FLOAT_TO_INT(blue[i]);
-                        dst[i*4+3] = FLOAT_TO_INT(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                        dst[i*4+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                        dst[i*4+3] = FLOAT_TO_INT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_BGR:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = FLOAT_TO_INT(blue[i]);
-                        dst[i*3+1] = FLOAT_TO_INT(green[i]);
-                        dst[i*3+2] = FLOAT_TO_INT(red[i]);
+                        dst[i*3+0] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                        dst[i*3+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                        dst[i*3+2] = FLOAT_TO_INT(rgba[i][RCOMP]);
                      }
                      break;
                   case GL_BGRA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_INT(blue[i]);
-                        dst[i*4+1] = FLOAT_TO_INT(green[i]);
-                        dst[i*4+2] = FLOAT_TO_INT(red[i]);
-                        dst[i*4+3] = FLOAT_TO_INT(alpha[i]);
+                        dst[i*4+0] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                        dst[i*4+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                        dst[i*4+2] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                        dst[i*4+3] = FLOAT_TO_INT(rgba[i][ACOMP]);
                      }
                      break;
                   case GL_ABGR_EXT:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = FLOAT_TO_INT(alpha[i]);
-                        dst[i*4+1] = FLOAT_TO_INT(blue[i]);
-                        dst[i*4+2] = FLOAT_TO_INT(green[i]);
-                        dst[i*4+3] = FLOAT_TO_INT(red[i]);
+                        dst[i*4+0] = FLOAT_TO_INT(rgba[i][ACOMP]);
+                        dst[i*4+1] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                        dst[i*4+2] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                        dst[i*4+3] = FLOAT_TO_INT(rgba[i][RCOMP]);
                      }
                      break;
                   default:
-                     gl_problem(ctx, "bad format in gl_pack_rgba_span\n");
+                     gl_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
                }
 	       if (packing->SwapBytes) {
-		  gl_swap4( (GLuint *) dst, n * comps );
+		  _mesa_swap4( (GLuint *) dst, n * comps );
 	       }
 	    }
 	    break;
@@ -1076,19 +1160,19 @@
                switch (format) {
                   case GL_RED:
                      for (i=0;i<n;i++)
-                        dst[i] = red[i];
+                        dst[i] = rgba[i][RCOMP];
                      break;
                   case GL_GREEN:
                      for (i=0;i<n;i++)
-                        dst[i] = green[i];
+                        dst[i] = rgba[i][GCOMP];
                      break;
                   case GL_BLUE:
                      for (i=0;i<n;i++)
-                        dst[i] = blue[i];
+                        dst[i] = rgba[i][BCOMP];
                      break;
                   case GL_ALPHA:
                      for (i=0;i<n;i++)
-                        dst[i] = alpha[i];
+                        dst[i] = rgba[i][ACOMP];
                      break;
                   case GL_LUMINANCE:
                      for (i=0;i<n;i++)
@@ -1097,52 +1181,52 @@
                   case GL_LUMINANCE_ALPHA:
                      for (i=0;i<n;i++) {
                         dst[i*2+0] = luminance[i];
-                        dst[i*2+1] = alpha[i];
+                        dst[i*2+1] = rgba[i][ACOMP];
                      }
                      break;
                   case GL_RGB:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = red[i];
-                        dst[i*3+1] = green[i];
-                        dst[i*3+2] = blue[i];
+                        dst[i*3+0] = rgba[i][RCOMP];
+                        dst[i*3+1] = rgba[i][GCOMP];
+                        dst[i*3+2] = rgba[i][BCOMP];
                      }
                      break;
                   case GL_RGBA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = red[i];
-                        dst[i*4+1] = green[i];
-                        dst[i*4+2] = blue[i];
-                        dst[i*4+3] = alpha[i];
+                        dst[i*4+0] = rgba[i][RCOMP];
+                        dst[i*4+1] = rgba[i][GCOMP];
+                        dst[i*4+2] = rgba[i][BCOMP];
+                        dst[i*4+3] = rgba[i][ACOMP];
                      }
                      break;
                   case GL_BGR:
                      for (i=0;i<n;i++) {
-                        dst[i*3+0] = blue[i];
-                        dst[i*3+1] = green[i];
-                        dst[i*3+2] = red[i];
+                        dst[i*3+0] = rgba[i][BCOMP];
+                        dst[i*3+1] = rgba[i][GCOMP];
+                        dst[i*3+2] = rgba[i][RCOMP];
                      }
                      break;
                   case GL_BGRA:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = blue[i];
-                        dst[i*4+1] = green[i];
-                        dst[i*4+2] = red[i];
-                        dst[i*4+3] = alpha[i];
+                        dst[i*4+0] = rgba[i][BCOMP];
+                        dst[i*4+1] = rgba[i][GCOMP];
+                        dst[i*4+2] = rgba[i][RCOMP];
+                        dst[i*4+3] = rgba[i][ACOMP];
                      }
                      break;
                   case GL_ABGR_EXT:
                      for (i=0;i<n;i++) {
-                        dst[i*4+0] = alpha[i];
-                        dst[i*4+1] = blue[i];
-                        dst[i*4+2] = green[i];
-                        dst[i*4+3] = red[i];
+                        dst[i*4+0] = rgba[i][ACOMP];
+                        dst[i*4+1] = rgba[i][BCOMP];
+                        dst[i*4+2] = rgba[i][GCOMP];
+                        dst[i*4+3] = rgba[i][RCOMP];
                      }
                      break;
                   default:
-                     gl_problem(ctx, "bad format in gl_pack_rgba_span\n");
+                     gl_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
                }
 	       if (packing->SwapBytes) {
-		  gl_swap4( (GLuint *) dst, n * comps );
+		  _mesa_swap4( (GLuint *) dst, n * comps );
 	       }
 	    }
 	    break;
@@ -1150,9 +1234,9 @@
             if (format == GL_RGB) {
                GLubyte *dst = (GLubyte *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLint) (red[i]   * 7.0F)) << 5)
-                         | (((GLint) (green[i] * 7.0F)) << 2)
-                         | (((GLint) (blue[i]  * 3.0F))     );
+                  dst[i] = (((GLint) (rgba[i][RCOMP] * 7.0F)) << 5)
+                         | (((GLint) (rgba[i][GCOMP] * 7.0F)) << 2)
+                         | (((GLint) (rgba[i][BCOMP] * 3.0F))     );
                }
             }
             break;
@@ -1160,9 +1244,9 @@
             if (format == GL_RGB) {
                GLubyte *dst = (GLubyte *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLint) (red[i]   * 7.0F))     )
-                         | (((GLint) (green[i] * 7.0F)) << 3)
-                         | (((GLint) (blue[i]  * 3.0F)) << 5);
+                  dst[i] = (((GLint) (rgba[i][RCOMP] * 7.0F))     )
+                         | (((GLint) (rgba[i][GCOMP] * 7.0F)) << 3)
+                         | (((GLint) (rgba[i][BCOMP] * 3.0F)) << 5);
                }
             }
             break;
@@ -1170,9 +1254,9 @@
             if (format == GL_RGB) {
                GLushort *dst = (GLushort *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLint) (red[i]   * 31.0F)) << 11)
-                         | (((GLint) (green[i] * 63.0F)) <<  5)
-                         | (((GLint) (blue[i]  * 31.0F))      );
+                  dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) << 11)
+                         | (((GLint) (rgba[i][GCOMP] * 63.0F)) <<  5)
+                         | (((GLint) (rgba[i][BCOMP] * 31.0F))      );
                }
             }
             break;
@@ -1180,9 +1264,9 @@
             if (format == GL_RGB) {
                GLushort *dst = (GLushort *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLint) (red[i]   * 31.0F))      )
-                         | (((GLint) (green[i] * 63.0F)) <<  5)
-                         | (((GLint) (blue[i]  * 31.0F)) << 11);
+                  dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F))      )
+                         | (((GLint) (rgba[i][GCOMP] * 63.0F)) <<  5)
+                         | (((GLint) (rgba[i][BCOMP] * 31.0F)) << 11);
                }
             }
             break;
@@ -1190,10 +1274,10 @@
             if (format == GL_RGB) {
                GLushort *dst = (GLushort *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLint) (red[i]   * 15.0F)) << 12)
-                         | (((GLint) (green[i] * 15.0F)) <<  8)
-                         | (((GLint) (blue[i]  * 15.0F)) <<  4)
-                         | (((GLint) (alpha[i] * 15.0F))      );
+                  dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F)) << 12)
+                         | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  8)
+                         | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  4)
+                         | (((GLint) (rgba[i][ACOMP] * 15.0F))      );
                }
             }
             break;
@@ -1201,10 +1285,10 @@
             if (format == GL_RGB) {
                GLushort *dst = (GLushort *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLint) (red[i]   * 15.0F))      )
-                         | (((GLint) (green[i] * 15.0F)) <<  4)
-                         | (((GLint) (blue[i]  * 15.0F)) <<  8)
-                         | (((GLint) (alpha[i] * 15.0F)) << 12);
+                  dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F))      )
+                         | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  4)
+                         | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  8)
+                         | (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12);
                }
             }
             break;
@@ -1212,10 +1296,10 @@
             if (format == GL_RGB) {
                GLushort *dst = (GLushort *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLint) (red[i]   * 31.0F)) << 11)
-                         | (((GLint) (green[i] * 31.0F)) <<  6)
-                         | (((GLint) (blue[i]  * 31.0F)) <<  1)
-                         | (((GLint) (alpha[i] *  1.0F))      );
+                  dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) << 11)
+                         | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  6)
+                         | (((GLint) (rgba[i][BCOMP] * 31.0F)) <<  1)
+                         | (((GLint) (rgba[i][ACOMP] *  1.0F))      );
                }
             }
             break;
@@ -1223,10 +1307,10 @@
             if (format == GL_RGB) {
                GLushort *dst = (GLushort *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLint) (red[i]   * 31.0F))      )
-                         | (((GLint) (green[i] * 31.0F)) <<  5)
-                         | (((GLint) (blue[i]  * 31.0F)) << 10)
-                         | (((GLint) (alpha[i] *  1.0F)) << 15);
+                  dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F))      )
+                         | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  5)
+                         | (((GLint) (rgba[i][BCOMP] * 31.0F)) << 10)
+                         | (((GLint) (rgba[i][ACOMP] *  1.0F)) << 15);
                }
             }
             break;
@@ -1234,28 +1318,28 @@
             if (format == GL_RGBA) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (red[i]   * 255.0F)) << 24)
-                         | (((GLuint) (green[i] * 255.0F)) << 16)
-                         | (((GLuint) (blue[i]  * 255.0F)) <<  8)
-                         | (((GLuint) (alpha[i] * 255.0F))      );
+                  dst[i] = (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 24)
+                         | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
+                         | (((GLuint) (rgba[i][BCOMP] * 255.0F)) <<  8)
+                         | (((GLuint) (rgba[i][ACOMP] * 255.0F))      );
                }
             }
             else if (format == GL_BGRA) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (blue[i]  * 255.0F)) << 24)
-                         | (((GLuint) (green[i] * 255.0F)) << 16)
-                         | (((GLuint) (red[i]   * 255.0F)) <<  8)
-                         | (((GLuint) (alpha[i] * 255.0F))      );
+                  dst[i] = (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 24)
+                         | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
+                         | (((GLuint) (rgba[i][RCOMP] * 255.0F)) <<  8)
+                         | (((GLuint) (rgba[i][ACOMP] * 255.0F))      );
                }
             }
             else if (format == GL_ABGR_EXT) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (alpha[i] * 255.0F)) << 24)
-                         | (((GLuint) (blue[i]  * 255.0F)) << 16)
-                         | (((GLuint) (green[i] * 255.0F)) <<  8)
-                         | (((GLuint) (red[i]   * 255.0F))      );
+                  dst[i] = (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24)
+                         | (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 16)
+                         | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
+                         | (((GLuint) (rgba[i][RCOMP] * 255.0F))      );
                }
             }
             break;
@@ -1263,28 +1347,28 @@
             if (format == GL_RGBA) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (red[i]   * 255.0F))      )
-                         | (((GLuint) (green[i] * 255.0F)) <<  8)
-                         | (((GLuint) (blue[i]  * 255.0F)) << 16)
-                         | (((GLuint) (alpha[i] * 255.0F)) << 24);
+                  dst[i] = (((GLuint) (rgba[i][RCOMP] * 255.0F))      )
+                         | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
+                         | (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 16)
+                         | (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24);
                }
             }
             else if (format == GL_BGRA) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (blue[i]  * 255.0F))      )
-                         | (((GLuint) (green[i] * 255.0F)) <<  8)
-                         | (((GLuint) (red[i]   * 255.0F)) << 16)
-                         | (((GLuint) (alpha[i] * 255.0F)) << 24);
+                  dst[i] = (((GLuint) (rgba[i][BCOMP] * 255.0F))      )
+                         | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
+                         | (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 16)
+                         | (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24);
                }
             }
             else if (format == GL_ABGR_EXT) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (alpha[i] * 255.0F))      )
-                         | (((GLuint) (blue[i]  * 255.0F)) <<  8)
-                         | (((GLuint) (green[i] * 255.0F)) << 16)
-                         | (((GLuint) (red[i]   * 255.0F)) << 24);
+                  dst[i] = (((GLuint) (rgba[i][ACOMP] * 255.0F))      )
+                         | (((GLuint) (rgba[i][BCOMP] * 255.0F)) <<  8)
+                         | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
+                         | (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 24);
                }
             }
             break;
@@ -1292,28 +1376,28 @@
             if (format == GL_RGBA) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (red[i]   * 1023.0F)) << 22)
-                         | (((GLuint) (green[i] * 1023.0F)) << 12)
-                         | (((GLuint) (blue[i]  * 1023.0F)) <<  2)
-                         | (((GLuint) (alpha[i] *    3.0F))      );
+                  dst[i] = (((GLuint) (rgba[i][RCOMP] * 1023.0F)) << 22)
+                         | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 12)
+                         | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) <<  2)
+                         | (((GLuint) (rgba[i][ACOMP] *    3.0F))      );
                }
             }
             else if (format == GL_BGRA) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (blue[i]  * 1023.0F)) << 22)
-                         | (((GLuint) (green[i] * 1023.0F)) << 12)
-                         | (((GLuint) (red[i]   * 1023.0F)) <<  2)
-                         | (((GLuint) (alpha[i] *    3.0F))      );
+                  dst[i] = (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 22)
+                         | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 12)
+                         | (((GLuint) (rgba[i][RCOMP] * 1023.0F)) <<  2)
+                         | (((GLuint) (rgba[i][ACOMP] *    3.0F))      );
                }
             }
             else if (format == GL_ABGR_EXT) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (alpha[i] * 1023.0F)) << 22)
-                         | (((GLuint) (blue[i]  * 1023.0F)) << 12)
-                         | (((GLuint) (green[i] * 1023.0F)) <<  2)
-                         | (((GLuint) (red[i]   *    3.0F))      );
+                  dst[i] = (((GLuint) (rgba[i][ACOMP] * 1023.0F)) << 22)
+                         | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 12)
+                         | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) <<  2)
+                         | (((GLuint) (rgba[i][RCOMP] *    3.0F))      );
                }
             }
             break;
@@ -1321,38 +1405,39 @@
             if (format == GL_RGBA) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (red[i]   * 1023.0F))      )
-                         | (((GLuint) (green[i] * 1023.0F)) << 10)
-                         | (((GLuint) (blue[i]  * 1023.0F)) << 20)
-                         | (((GLuint) (alpha[i] *    3.0F)) << 30);
+                  dst[i] = (((GLuint) (rgba[i][RCOMP] * 1023.0F))      )
+                         | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 10)
+                         | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 20)
+                         | (((GLuint) (rgba[i][ACOMP] *    3.0F)) << 30);
                }
             }
             else if (format == GL_BGRA) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (blue[i]  * 1023.0F))      )
-                         | (((GLuint) (green[i] * 1023.0F)) << 10)
-                         | (((GLuint) (red[i]   * 1023.0F)) << 20)
-                         | (((GLuint) (alpha[i] *    3.0F)) << 30);
+                  dst[i] = (((GLuint) (rgba[i][BCOMP] * 1023.0F))      )
+                         | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 10)
+                         | (((GLuint) (rgba[i][RCOMP] * 1023.0F)) << 20)
+                         | (((GLuint) (rgba[i][ACOMP] *    3.0F)) << 30);
                }
             }
             else if (format == GL_ABGR_EXT) {
                GLuint *dst = (GLuint *) destination;
                for (i=0;i<n;i++) {
-                  dst[i] = (((GLuint) (alpha[i] * 1023.0F))      )
-                         | (((GLuint) (blue[i]  * 1023.0F)) << 10)
-                         | (((GLuint) (green[i] * 1023.0F)) << 20)
-                         | (((GLuint) (red[i]   *    3.0F)) << 30);
+                  dst[i] = (((GLuint) (rgba[i][ACOMP] * 1023.0F))      )
+                         | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 10)
+                         | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 20)
+                         | (((GLuint) (rgba[i][RCOMP] *    3.0F)) << 30);
                }
             }
             break;
          default:
-            gl_problem( ctx, "bad type in gl_pack_rgba_span" );
+            gl_problem( ctx, "bad type in _mesa_pack_rgba_span" );
       }
    }
 }
 
 
+
 #define SWAP2BYTE(VALUE)			\
    {						\
       GLubyte *bytes = (GLubyte *) &(VALUE);	\
@@ -1515,12 +1600,12 @@
                for (i = 0; i < n; i++) {
                   GLfloat value = s[i];
                   SWAP4BYTE(value);
-                  indexes[i] = value;
+                  indexes[i] = (GLuint) value;
                }
             }
             else {
                for (i = 0; i < n; i++)
-                  indexes[i] = s[i];
+                  indexes[i] = (GLuint) s[i];
             }
          }
          break;
@@ -2056,7 +2141,7 @@
  * XXX perhaps expand this to process whole images someday.
  */
 void
-_mesa_unpack_ubyte_color_span( const GLcontext *ctx,
+_mesa_unpack_ubyte_color_span( GLcontext *ctx,
                                GLuint n, GLenum dstFormat, GLubyte dest[],
                                GLenum srcFormat, GLenum srcType,
                                const GLvoid *source,
@@ -2106,12 +2191,17 @@
           srcType == GL_UNSIGNED_INT_10_10_10_2 ||
           srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
 
-   /* this is intended for RGBA mode */
+   /* this is intended for RGBA mode only */
    assert(ctx->Visual->RGBAflag);
 
    applyTransferOps &= (ctx->Pixel.ScaleOrBiasRGBA ||
                         ctx->Pixel.MapColorFlag ||
-                        ctx->Pixel.MapColorFlag);
+                        ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+                        ctx->Pixel.ScaleOrBiasRGBApcm ||
+                        ctx->Pixel.ColorTableEnabled ||
+                        ctx->Pixel.PostColorMatrixColorTableEnabled ||
+                        ctx->Pixel.MinMaxEnabled ||
+                        ctx->Pixel.HistogramEnabled);
 
    /* Try simple cases first */
    if (!applyTransferOps && srcType == GL_UNSIGNED_BYTE) {
@@ -2155,7 +2245,7 @@
          }
       }
       else if (dstFormat == srcFormat) {
-         GLint comps = gl_components_in_format(srcFormat);
+         GLint comps = _mesa_components_in_format(srcFormat);
          assert(comps > 0);
          MEMCPY( dest, source, n * comps * sizeof(GLubyte) );
          return;
@@ -2163,14 +2253,14 @@
    }
 
 
+   /* general solution begins here */
    {
-      /* general solution */
       GLfloat rgba[MAX_WIDTH][4];
       GLint dstComponents;
       GLint dstRedIndex, dstGreenIndex, dstBlueIndex, dstAlphaIndex;
       GLint dstLuminanceIndex, dstIntensityIndex;
 
-      dstComponents = gl_components_in_format( dstFormat );
+      dstComponents = _mesa_components_in_format( dstFormat );
       /* source & dest image formats should have been error checked by now */
       assert(dstComponents > 0);
 
@@ -2182,33 +2272,27 @@
          GLuint indexes[MAX_WIDTH];
          extract_uint_indexes(n, indexes, srcFormat, srcType, source,
                               unpacking);
-
-         /* shift and offset indexes */
-         gl_shift_and_offset_ci(ctx, n, indexes);
 
-         if (dstFormat == GL_COLOR_INDEX) {
-            if (applyTransferOps) {
-               if (ctx->Pixel.MapColorFlag) {
-                  /* Apply lookup table */
-                  gl_map_ci(ctx, n, indexes);
-               }
-
-               if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset) {
-
-               }
+         if (applyTransferOps) {
+            if (ctx->Pixel.MapColorFlag) {
+               _mesa_map_ci(ctx, n, indexes);
+            }
+            if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset) {
+               _mesa_shift_and_offset_ci(ctx, n, indexes);
             }
+         }
 
+         if (dstFormat == GL_COLOR_INDEX) {
             /* convert to GLubyte and return */
-            {
-               GLuint i;
-               for (i = 0; i < n; i++) {
-                  dest[i] = (GLubyte) (indexes[i] & 0xff);
-               }
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dest[i] = (GLubyte) (indexes[i] & 0xff);
             }
+            return;
          }
          else {
             /* Convert indexes to RGBA */
-            gl_map_ci_to_rgba_float(ctx, n, indexes, rgba);
+            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);
          }
       }
       else {
@@ -2217,23 +2301,41 @@
 
          if (applyTransferOps) {
             /* scale and bias colors */
-            gl_scale_and_bias_rgba_float(ctx, n, rgba);
-
-            /* color table lookup */
+            if (ctx->Pixel.ScaleOrBiasRGBA) {
+               _mesa_scale_and_bias_rgba(ctx, n, rgba);
+            }
+            /* color map lookup */
             if (ctx->Pixel.MapColorFlag) {
-               gl_map_rgba_float(ctx, n, rgba);
+               _mesa_map_rgba(ctx, n, rgba);
             }
          }
       }
-
-
-      /*
-       * XXX This is where more color table lookups, convolution,
-       * histograms, minmax, color matrix, etc would take place if
-       * implemented.
-       * See figure 3.7 in the OpenGL 1.2 specification for more info.
-       */
 
+      if (applyTransferOps) {
+         /* GL_COLOR_TABLE lookup */
+         if (ctx->Pixel.ColorTableEnabled) {
+            _mesa_lookup_rgba(&ctx->ColorTable, n, rgba);
+         }
+         /* XXX convolution here */
+         /* XXX post-convolution color table look-up here */
+         /* color matrix transform */
+         if (ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+             ctx->Pixel.ScaleOrBiasRGBApcm) {
+            _mesa_transform_rgba(ctx, n, rgba);
+         }
+         /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+         if (ctx->Pixel.PostColorMatrixColorTableEnabled) {
+            _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, n, rgba);
+         }
+         /* update histogram count */
+         if (ctx->Pixel.HistogramEnabled) {
+            _mesa_update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+         /* XXX min/max here */
+         if (ctx->Pixel.MinMaxEnabled) {
+            _mesa_update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+      }
 
       /* clamp to [0,1] */
       {
@@ -2353,6 +2455,270 @@
 }
 
 
+void
+_mesa_unpack_float_color_span( GLcontext *ctx,
+                               GLuint n, GLenum dstFormat, GLfloat dest[],
+                               GLenum srcFormat, GLenum srcType,
+                               const GLvoid *source,
+                               const struct gl_pixelstore_attrib *unpacking,
+                               GLboolean applyTransferOps, GLboolean clamp )
+{
+   ASSERT(dstFormat == GL_ALPHA ||
+          dstFormat == GL_LUMINANCE || 
+          dstFormat == GL_LUMINANCE_ALPHA ||
+          dstFormat == GL_INTENSITY ||
+          dstFormat == GL_RGB ||
+          dstFormat == GL_RGBA ||
+          dstFormat == GL_COLOR_INDEX);
+
+   ASSERT(srcFormat == GL_RED ||
+          srcFormat == GL_GREEN ||
+          srcFormat == GL_BLUE ||
+          srcFormat == GL_ALPHA ||
+          srcFormat == GL_LUMINANCE ||
+          srcFormat == GL_LUMINANCE_ALPHA ||
+          srcFormat == GL_INTENSITY ||
+          srcFormat == GL_RGB ||
+          srcFormat == GL_BGR ||
+          srcFormat == GL_RGBA ||
+          srcFormat == GL_BGRA ||
+          srcFormat == GL_ABGR_EXT ||
+          srcFormat == GL_COLOR_INDEX);
+
+   ASSERT(srcType == GL_BITMAP ||
+          srcType == GL_UNSIGNED_BYTE ||
+          srcType == GL_BYTE ||
+          srcType == GL_UNSIGNED_SHORT ||
+          srcType == GL_SHORT ||
+          srcType == GL_UNSIGNED_INT ||
+          srcType == GL_INT ||
+          srcType == GL_FLOAT ||
+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
+
+   /* this is intended for RGBA mode only */
+   assert(ctx->Visual->RGBAflag);
+
+   applyTransferOps &= (ctx->Pixel.ScaleOrBiasRGBA ||
+                        ctx->Pixel.MapColorFlag ||
+                        ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+                        ctx->Pixel.ScaleOrBiasRGBApcm ||
+                        ctx->Pixel.ColorTableEnabled ||
+                        ctx->Pixel.PostColorMatrixColorTableEnabled ||
+                        ctx->Pixel.MinMaxEnabled ||
+                        ctx->Pixel.HistogramEnabled);
+
+   /* general solution, no special cases, yet */
+   {
+      GLfloat rgba[MAX_WIDTH][4];
+      GLint dstComponents;
+      GLint dstRedIndex, dstGreenIndex, dstBlueIndex, dstAlphaIndex;
+      GLint dstLuminanceIndex, dstIntensityIndex;
+
+      dstComponents = _mesa_components_in_format( dstFormat );
+      /* source & dest image formats should have been error checked by now */
+      assert(dstComponents > 0);
+
+      /*
+       * Extract image data and convert to RGBA floats
+       */
+      assert(n <= MAX_WIDTH);
+      if (srcFormat == GL_COLOR_INDEX) {
+         GLuint indexes[MAX_WIDTH];
+         extract_uint_indexes(n, indexes, srcFormat, srcType, source,
+                              unpacking);
+
+         if (applyTransferOps) {
+            if (ctx->Pixel.MapColorFlag) {
+               _mesa_map_ci(ctx, n, indexes);
+            }
+            if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset) {
+               _mesa_shift_and_offset_ci(ctx, n, indexes);
+            }
+         }
+
+         if (dstFormat == GL_COLOR_INDEX) {
+            /* convert to GLubyte and return */
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dest[i] = (GLubyte) (indexes[i] & 0xff);
+            }
+            return;
+         }
+         else {
+            /* Convert indexes to RGBA */
+            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);
+         }
+      }
+      else {
+         extract_float_rgba(n, rgba, srcFormat, srcType, source,
+                            unpacking->SwapBytes);
+
+         if (applyTransferOps) {
+            /* scale and bias colors */
+            if (ctx->Pixel.ScaleOrBiasRGBA) {
+               _mesa_scale_and_bias_rgba(ctx, n, rgba);
+            }
+            /* color map lookup */
+            if (ctx->Pixel.MapColorFlag) {
+               _mesa_map_rgba(ctx, n, rgba);
+            }
+         }
+      }
+
+      if (applyTransferOps) {
+         /* GL_COLOR_TABLE lookup */
+         if (ctx->Pixel.ColorTableEnabled) {
+            _mesa_lookup_rgba(&ctx->ColorTable, n, rgba);
+         }
+         /* XXX convolution here */
+         /* XXX post-convolution color table look-up here */
+         /* color matrix transform */
+         if (ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+             ctx->Pixel.ScaleOrBiasRGBApcm) {
+            _mesa_transform_rgba(ctx, n, rgba);
+         }
+         /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+         if (ctx->Pixel.PostColorMatrixColorTableEnabled) {
+            _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, n, rgba);
+         }
+         /* update histogram count */
+         if (ctx->Pixel.HistogramEnabled) {
+            _mesa_update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+         /* XXX min/max here */
+         if (ctx->Pixel.MinMaxEnabled) {
+            _mesa_update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+      }
+
+      /* clamp to [0,1] */
+      if (clamp) {
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
+            rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
+            rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
+            rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
+         }
+      }
+
+      /* Now determine which color channels we need to produce.
+       * And determine the dest index (offset) within each color tuple.
+       */
+      switch (dstFormat) {
+         case GL_ALPHA:
+            dstAlphaIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
+            dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         case GL_LUMINANCE: 
+            dstLuminanceIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
+            dstIntensityIndex = -1;
+            break;
+         case GL_LUMINANCE_ALPHA:
+            dstLuminanceIndex = 0;
+            dstAlphaIndex = 1;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
+            dstIntensityIndex = -1;
+            break;
+         case GL_INTENSITY:
+            dstIntensityIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
+            dstLuminanceIndex = -1;
+            break;
+         case GL_RGB:
+            dstRedIndex = 0;
+            dstGreenIndex = 1;
+            dstBlueIndex = 2;
+            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         case GL_RGBA:
+            dstRedIndex = 0;
+            dstGreenIndex = 1;
+            dstBlueIndex = 2;
+            dstAlphaIndex = 3;
+            dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         default:
+            gl_problem(ctx, "bad dstFormat in _mesa_unpack_float_span()");
+            return;
+      }
+
+      /* Now pack results in teh requested dstFormat */
+      if (dstRedIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[dstRedIndex] = rgba[i][RCOMP];
+            dst += dstComponents;
+         }
+      }
+
+      if (dstGreenIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[dstGreenIndex] = rgba[i][GCOMP];
+            dst += dstComponents;
+         }
+      }
+
+      if (dstBlueIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[dstBlueIndex] = rgba[i][BCOMP];
+            dst += dstComponents;
+         }
+      }
+
+      if (dstAlphaIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[dstAlphaIndex] = rgba[i][ACOMP];
+            dst += dstComponents;
+         }
+      }
+
+      if (dstIntensityIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         assert(dstIntensityIndex == 0);
+         assert(dstComponents == 1);
+         for (i = 0; i < n; i++) {
+            /* Intensity comes from red channel */
+            dst[i] = rgba[i][RCOMP];
+         }
+      }
+
+      if (dstLuminanceIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         assert(dstLuminanceIndex == 0);
+         for (i = 0; i < n; i++) {
+            /* Luminance comes from red channel */
+            dst[0] = rgba[i][RCOMP];
+            dst += dstComponents;
+         }
+      }
+   }
+}
+
+
+
 
 /*
  * Unpack a row of color index data from a client buffer according to
@@ -2415,12 +2781,11 @@
       if (applyTransferOps) {
          if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset) {
             /* shift and offset indexes */
-            gl_shift_and_offset_ci(ctx, n, indexes);
+            _mesa_shift_and_offset_ci(ctx, n, indexes);
          }
-
          if (ctx->Pixel.MapColorFlag) {
             /* Apply lookup table */
-            gl_map_ci(ctx, n, indexes);
+            _mesa_map_ci(ctx, n, indexes);
          }
       }
 
@@ -2515,7 +2880,7 @@
       if (applyTransferOps) {
          if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset) {
             /* shift and offset indexes */
-            gl_shift_and_offset_ci(ctx, n, indexes);
+            _mesa_shift_and_offset_ci(ctx, n, indexes);
          }
 
          if (ctx->Pixel.MapStencilFlag) {
@@ -2643,9 +3008,10 @@
 
    /* clamp depth values to [0,1] and convert from floats to integers */
    {
+      const GLfloat zs = ctx->Visual->DepthMaxF;
       GLuint i;
       for (i = 0; i < n; i++) {
-         dest[i] = (GLdepth) (CLAMP(depth[i], 0.0F, 1.0F) * DEPTH_SCALE);
+         dest[i] = (GLdepth) (CLAMP(depth[i], 0.0F, 1.0F) * zs);
       }
    }
 
@@ -2679,8 +3045,8 @@
       compsPerRow = 0;
    }
    else {
-      const GLint bytesPerPixel = gl_bytes_per_pixel(format, type);
-      const GLint components = gl_components_in_format(format);
+      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
+      const GLint components = _mesa_components_in_format(format);
       GLint bytesPerComp;
       if (bytesPerPixel <= 0 || components <= 0)
          return NULL;   /* bad format or type.  generate error later */
@@ -2703,18 +3069,18 @@
       dst = destBuffer;
       for (img = 0; img < depth; img++) {
          for (row = 0; row < height; row++) {
-            const GLvoid *src = gl_pixel_addr_in_image(unpack, pixels,
+            const GLvoid *src = _mesa_image_address(unpack, pixels,
                                width, height, format, type, img, row, 0);
             MEMCPY(dst, src, bytesPerRow);
             /* byte flipping/swapping */
             if (flipBytes) {
-               gl_flip_bytes((GLubyte *) dst, bytesPerRow);
+               flip_bytes((GLubyte *) dst, bytesPerRow);
             }
             else if (swap2) {
-               gl_swap2((GLushort*) dst, compsPerRow);
+               _mesa_swap2((GLushort*) dst, compsPerRow);
             }
             else if (swap4) {
-               gl_swap4((GLuint*) dst, compsPerRow);
+               _mesa_swap4((GLuint*) dst, compsPerRow);
             }
             dst += bytesPerRow;
          }
@@ -2748,9 +3114,9 @@
    width_in_bytes = CEILING( width, 8 );
    dst = buffer;
    for (row = 0; row < height; row++) {
-      GLubyte *src = gl_pixel_addr_in_image( packing, pixels, width, height,
-                                             GL_COLOR_INDEX, GL_BITMAP,
-                                             0, row, 0 );
+      GLubyte *src = _mesa_image_address( packing, pixels, width, height,
+                                          GL_COLOR_INDEX, GL_BITMAP,
+                                          0, row, 0 );
       if (!src) {
          FREE(buffer);
          return NULL;
@@ -2759,7 +3125,7 @@
       if (packing->SkipPixels == 0) {
          MEMCPY( dst, src, width_in_bytes );
          if (packing->LsbFirst) {
-            gl_flip_bytes( dst, width_in_bytes );
+            flip_bytes( dst, width_in_bytes );
          }
       }
       else {
@@ -2824,4 +3190,95 @@
    }
 
    return buffer;
+}
+
+
+/*
+ * Pack bitmap data.
+ */
+void
+_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
+                   GLubyte *dest, const struct gl_pixelstore_attrib *packing )
+{
+   GLint row, width_in_bytes;
+   const GLubyte *src;
+
+   if (!source)
+      return;
+
+   width_in_bytes = CEILING( width, 8 );
+   src = source;
+   for (row = 0; row < height; row++) {
+      GLubyte *dst = _mesa_image_address( packing, dest, width, height,
+                                          GL_COLOR_INDEX, GL_BITMAP,
+                                          0, row, 0 );
+      if (!dst)
+         return;
+
+      if (packing->SkipPixels == 0) {
+         MEMCPY( dst, src, width_in_bytes );
+         if (packing->LsbFirst) {
+            flip_bytes( dst, width_in_bytes );
+         }
+      }
+      else {
+         /* handling SkipPixels is a bit tricky (no pun intended!) */
+         GLint i;
+         if (packing->LsbFirst) {
+            GLubyte srcMask = 1 << (packing->SkipPixels & 0x7);
+            GLubyte dstMask = 128;
+            const GLubyte *s = src;
+            GLubyte *d = dst;
+            *d = 0;
+            for (i = 0; i < width; i++) {
+               if (*s & srcMask) {
+                  *d |= dstMask;
+               }
+               if (srcMask == 128) {
+                  srcMask = 1;
+                  s++;
+               }
+               else {
+                  srcMask = srcMask << 1;
+               }
+               if (dstMask == 1) {
+                  dstMask = 128;
+                  d++;
+                  *d = 0;
+               }
+               else {
+                  dstMask = dstMask >> 1;
+               }
+            }
+         }
+         else {
+            GLubyte srcMask = 128 >> (packing->SkipPixels & 0x7);
+            GLubyte dstMask = 128;
+            const GLubyte *s = src;
+            GLubyte *d = dst;
+            *d = 0;
+            for (i = 0; i < width; i++) {
+               if (*s & srcMask) {
+                  *d |= dstMask;
+               }
+               if (srcMask == 1) {
+                  srcMask = 128;
+                  s++;
+               }
+               else {
+                  srcMask = srcMask >> 1;
+               }
+               if (dstMask == 1) {
+                  dstMask = 128;
+                  d++;
+                  *d = 0;
+               }
+               else {
+                  dstMask = dstMask >> 1;
+               }
+            }
+         }
+      }
+      src += width_in_bytes;
+   }
 }
Index: xc/extras/Mesa/src/image.h
diff -u xc/extras/Mesa/src/image.h:1.3 xc/extras/Mesa/src/image.h:1.4
--- xc/extras/Mesa/src/image.h:1.3	Mon Feb 14 23:12:20 2000
+++ xc/extras/Mesa/src/image.h	Fri Jun 16 17:02:12 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,57 +31,63 @@
 #include "types.h"
 
 
-extern struct gl_pixelstore_attrib _mesa_native_packing;
+extern const struct gl_pixelstore_attrib _mesa_native_packing;
 
 
-extern void gl_flip_bytes( GLubyte *p, GLuint n );
+extern void
+_mesa_swap2( GLushort *p, GLuint n );
 
+extern void
+_mesa_swap4( GLuint *p, GLuint n );
 
-extern void gl_swap2( GLushort *p, GLuint n );
+extern GLint
+_mesa_sizeof_type( GLenum type );
 
-extern void gl_swap4( GLuint *p, GLuint n );
+extern GLint
+_mesa_sizeof_packed_type( GLenum type );
 
+extern GLint
+_mesa_components_in_format( GLenum format );
 
-extern GLint gl_sizeof_type( GLenum type );
+extern GLint
+_mesa_bytes_per_pixel( GLenum format, GLenum type );
 
-extern GLint gl_sizeof_packed_type( GLenum type );
+extern GLboolean
+_mesa_is_legal_format_and_type( GLenum format, GLenum type );
 
-extern GLint gl_components_in_format( GLenum format );
 
-extern GLint gl_bytes_per_pixel( GLenum format, GLenum type );
+extern GLvoid *
+_mesa_image_address( const struct gl_pixelstore_attrib *packing,
+                     const GLvoid *image, GLsizei width,
+                     GLsizei height, GLenum format, GLenum type,
+                     GLint img, GLint row, GLint column );
 
-extern GLboolean gl_is_legal_format_and_type( GLenum format, GLenum type );
 
+extern GLint
+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
+                        GLint width, GLenum format, GLenum type );
 
-extern GLvoid *
-gl_pixel_addr_in_image( const struct gl_pixelstore_attrib *packing,
-                        const GLvoid *image, GLsizei width,
-                        GLsizei height, GLenum format, GLenum type,
-                        GLint img, GLint row, GLint column );
 
-
 extern void
-gl_unpack_polygon_stipple( const GLcontext *ctx,
-                           const GLubyte *pattern,
-                           GLuint dest[32] );
+_mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],
+                              const struct gl_pixelstore_attrib *unpacking );
 
 
 extern void
-gl_pack_polygon_stipple( const GLcontext *ctx,
-                         const GLuint pattern[32],
-                         GLubyte *dest );
+_mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest,
+                            const struct gl_pixelstore_attrib *packing );
 
 
 extern void
-gl_pack_rgba_span( const GLcontext *ctx,
-                   GLuint n, CONST GLubyte rgba[][4],
-                   GLenum format, GLenum type, GLvoid *dest,
-                   const struct gl_pixelstore_attrib *packing,
-                   GLboolean applyTransferOps );
+_mesa_pack_rgba_span( GLcontext *ctx,
+                      GLuint n, CONST GLubyte rgba[][4],
+                      GLenum format, GLenum type, GLvoid *dest,
+                      const struct gl_pixelstore_attrib *packing,
+                      GLboolean applyTransferOps );
 
 
 extern void
-_mesa_unpack_ubyte_color_span( const GLcontext *ctx,
+_mesa_unpack_ubyte_color_span( GLcontext *ctx,
                                GLuint n, GLenum dstFormat, GLubyte dest[],
                                GLenum srcFormat, GLenum srcType,
                                const GLvoid *source,
@@ -90,6 +96,15 @@
 
 
 extern void
+_mesa_unpack_float_color_span( GLcontext *ctx,
+                               GLuint n, GLenum dstFormat, GLfloat dest[],
+                               GLenum srcFormat, GLenum srcType,
+                               const GLvoid *source,
+                               const struct gl_pixelstore_attrib *unpacking,
+                               GLboolean applyTransferOps, GLboolean clamp );
+
+
+extern void
 _mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest,
                          GLenum srcType, const GLvoid *source,
@@ -121,6 +136,10 @@
 extern GLvoid *
 _mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,
                      const struct gl_pixelstore_attrib *packing );
+
+extern void
+_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
+                   GLubyte *dest, const struct gl_pixelstore_attrib *packing );
 
 
 #endif
Index: xc/extras/Mesa/src/imaging.c
diff -u xc/extras/Mesa/src/imaging.c:1.3 xc/extras/Mesa/src/imaging.c:1.4
--- xc/extras/Mesa/src/imaging.c:1.3	Thu Mar  2 08:07:11 2000
+++ xc/extras/Mesa/src/imaging.c	Fri Jun 16 17:02:13 2000
@@ -24,327 +24,1594 @@
  */
 
 
-/* Stub functions for GL_ARB_imaging subset */
+/*
+ * Histogram, Min/max and convolution for GL_ARB_imaging subset
+ *
+ */
 
 
 #ifdef PC_HEADER
 #include "all.h"
 #else
 #include "glheader.h"
+#include "context.h"
+#include "image.h"
 #include "imaging.h"
+#include "mmath.h"
+#include "span.h"
 #endif
 
 
 
-#define WARNING(MSG)  fprintf(stderr,"Mesa warning: GL_ARB_imaging functions not implemented\n")
+/**********************************************************************/
+/****                  Histogram and Min/max                      *****/
+/**********************************************************************/
+
+
+static void
+pack_histogram( GLcontext *ctx,
+                GLuint n, CONST GLuint rgba[][4],
+                GLenum format, GLenum type, GLvoid *destination,
+                const struct gl_pixelstore_attrib *packing )
+{
+   const GLint comps = _mesa_components_in_format(format);
+   GLuint luminance[MAX_WIDTH];
+
+   if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         luminance[i] = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
+      }
+   }
+
+#define PACK_MACRO(TYPE)					\
+   {								\
+      GLuint i;							\
+      switch (format) {						\
+         case GL_RED:						\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) rgba[i][RCOMP];			\
+            break;						\
+         case GL_GREEN:						\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) rgba[i][GCOMP];			\
+            break;						\
+         case GL_BLUE:						\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) rgba[i][BCOMP];			\
+            break;						\
+         case GL_ALPHA:						\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) rgba[i][ACOMP];			\
+            break;						\
+         case GL_LUMINANCE:					\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) luminance[i];			\
+            break;						\
+         case GL_LUMINANCE_ALPHA:				\
+            for (i=0;i<n;i++) {					\
+               dst[i*2+0] = (TYPE) luminance[i];		\
+               dst[i*2+1] = (TYPE) rgba[i][ACOMP];		\
+            }							\
+            break;						\
+         case GL_RGB:						\
+            for (i=0;i<n;i++) {					\
+               dst[i*3+0] = (TYPE) rgba[i][RCOMP];		\
+               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*3+2] = (TYPE) rgba[i][BCOMP];		\
+            }							\
+            break;						\
+         case GL_RGBA:						\
+            for (i=0;i<n;i++) {					\
+               dst[i*4+0] = (TYPE) rgba[i][RCOMP];		\
+               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*4+2] = (TYPE) rgba[i][BCOMP];		\
+               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
+            }							\
+            break;						\
+         case GL_BGR:						\
+            for (i=0;i<n;i++) {					\
+               dst[i*3+0] = (TYPE) rgba[i][BCOMP];		\
+               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*3+2] = (TYPE) rgba[i][RCOMP];		\
+            }							\
+            break;						\
+         case GL_BGRA:						\
+            for (i=0;i<n;i++) {					\
+               dst[i*4+0] = (TYPE) rgba[i][BCOMP];		\
+               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*4+2] = (TYPE) rgba[i][RCOMP];		\
+               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
+            }							\
+            break;						\
+         case GL_ABGR_EXT:					\
+            for (i=0;i<n;i++) {					\
+               dst[i*4+0] = (TYPE) rgba[i][ACOMP];		\
+               dst[i*4+1] = (TYPE) rgba[i][BCOMP];		\
+               dst[i*4+2] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*4+3] = (TYPE) rgba[i][RCOMP];		\
+            }							\
+            break;						\
+         default:						\
+            gl_problem(ctx, "bad format in pack_histogram");	\
+      }								\
+   }
+
+   switch (type) {
+      case GL_UNSIGNED_BYTE:
+         {
+            GLubyte *dst = (GLubyte *) destination;
+            PACK_MACRO(GLubyte);
+         }
+         break;
+      case GL_BYTE:
+         {
+            GLbyte *dst = (GLbyte *) destination;
+            PACK_MACRO(GLbyte);
+         }
+         break;
+      case GL_UNSIGNED_SHORT:
+         {
+            GLushort *dst = (GLushort *) destination;
+            PACK_MACRO(GLushort);
+            if (packing->SwapBytes) {
+               _mesa_swap2(dst, n * comps);
+            }
+         }
+         break;
+      case GL_SHORT:
+         {
+            GLshort *dst = (GLshort *) destination;
+            PACK_MACRO(GLshort);
+            if (packing->SwapBytes) {
+               _mesa_swap2((GLushort *) dst, n * comps);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT:
+         {
+            GLuint *dst = (GLuint *) destination;
+            PACK_MACRO(GLuint);
+            if (packing->SwapBytes) {
+               _mesa_swap4(dst, n * comps);
+            }
+         }
+         break;
+      case GL_INT:
+         {
+            GLint *dst = (GLint *) destination;
+            PACK_MACRO(GLint);
+            if (packing->SwapBytes) {
+               _mesa_swap4((GLuint *) dst, n * comps);
+            }
+         }
+         break;
+      case GL_FLOAT:
+         {
+            GLfloat *dst = (GLfloat *) destination;
+            PACK_MACRO(GLfloat);
+            if (packing->SwapBytes) {
+               _mesa_swap4((GLuint *) dst, n * comps);
+            }
+         }
+         break;
+      default:
+         gl_problem(ctx, "Bad type in pack_histogram");
+   }
+
+#undef PACK_MACRO
+}
+
+
+
+static void
+pack_minmax( GLcontext *ctx, CONST GLfloat minmax[2][4],
+             GLenum format, GLenum type, GLvoid *destination,
+             const struct gl_pixelstore_attrib *packing )
+{
+   const GLint comps = _mesa_components_in_format(format);
+   GLuint luminance[2];
+
+   if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
+      luminance[0] = minmax[0][RCOMP] + minmax[0][GCOMP] + minmax[0][BCOMP];
+      luminance[1] = minmax[1][RCOMP] + minmax[1][GCOMP] + minmax[1][BCOMP];
+   }
+
+#define PACK_MACRO(TYPE, CONVERSION)				\
+   {								\
+      GLuint i;							\
+      switch (format) {						\
+         case GL_RED:						\
+            for (i=0;i<2;i++)					\
+               dst[i] = CONVERSION (minmax[i][RCOMP]);		\
+            break;						\
+         case GL_GREEN:						\
+            for (i=0;i<2;i++)					\
+               dst[i] = CONVERSION (minmax[i][GCOMP]);		\
+            break;						\
+         case GL_BLUE:						\
+            for (i=0;i<2;i++)					\
+               dst[i] = CONVERSION (minmax[i][BCOMP]);		\
+            break;						\
+         case GL_ALPHA:						\
+            for (i=0;i<2;i++)					\
+               dst[i] = CONVERSION (minmax[i][ACOMP]);		\
+            break;						\
+         case GL_LUMINANCE:					\
+            for (i=0;i<2;i++)					\
+               dst[i] = CONVERSION (luminance[i]);		\
+            break;						\
+         case GL_LUMINANCE_ALPHA:				\
+            for (i=0;i<2;i++) {					\
+               dst[i*2+0] = CONVERSION (luminance[i]);		\
+               dst[i*2+1] = CONVERSION (minmax[i][ACOMP]);	\
+            }							\
+            break;						\
+         case GL_RGB:						\
+            for (i=0;i<2;i++) {					\
+               dst[i*3+0] = CONVERSION (minmax[i][RCOMP]);	\
+               dst[i*3+1] = CONVERSION (minmax[i][GCOMP]);	\
+               dst[i*3+2] = CONVERSION (minmax[i][BCOMP]);	\
+            }							\
+            break;						\
+         case GL_RGBA:						\
+            for (i=0;i<2;i++) {					\
+               dst[i*4+0] = CONVERSION (minmax[i][RCOMP]);	\
+               dst[i*4+1] = CONVERSION (minmax[i][GCOMP]);	\
+               dst[i*4+2] = CONVERSION (minmax[i][BCOMP]);	\
+               dst[i*4+3] = CONVERSION (minmax[i][ACOMP]);	\
+            }							\
+            break;						\
+         case GL_BGR:						\
+            for (i=0;i<2;i++) {					\
+               dst[i*3+0] = CONVERSION (minmax[i][BCOMP]);	\
+               dst[i*3+1] = CONVERSION (minmax[i][GCOMP]);	\
+               dst[i*3+2] = CONVERSION (minmax[i][RCOMP]);	\
+            }							\
+            break;						\
+         case GL_BGRA:						\
+            for (i=0;i<2;i++) {					\
+               dst[i*4+0] = CONVERSION (minmax[i][BCOMP]);	\
+               dst[i*4+1] = CONVERSION (minmax[i][GCOMP]);	\
+               dst[i*4+2] = CONVERSION (minmax[i][RCOMP]);	\
+               dst[i*4+3] = CONVERSION (minmax[i][ACOMP]);	\
+            }							\
+            break;						\
+         case GL_ABGR_EXT:					\
+            for (i=0;i<2;i++) {					\
+               dst[i*4+0] = CONVERSION (minmax[i][ACOMP]);	\
+               dst[i*4+1] = CONVERSION (minmax[i][BCOMP]);	\
+               dst[i*4+2] = CONVERSION (minmax[i][GCOMP]);	\
+               dst[i*4+3] = CONVERSION (minmax[i][RCOMP]);	\
+            }							\
+            break;						\
+         default:						\
+            gl_problem(ctx, "bad format in pack_minmax");	\
+      }								\
+   }
+
+   switch (type) {
+      case GL_UNSIGNED_BYTE:
+         {
+            GLubyte *dst = (GLubyte *) destination;
+            PACK_MACRO(GLubyte, FLOAT_TO_UBYTE);
+         }
+         break;
+      case GL_BYTE:
+         {
+            GLbyte *dst = (GLbyte *) destination;
+            PACK_MACRO(GLbyte, FLOAT_TO_BYTE);
+         }
+         break;
+      case GL_UNSIGNED_SHORT:
+         {
+            GLushort *dst = (GLushort *) destination;
+            PACK_MACRO(GLushort, FLOAT_TO_USHORT);
+            if (packing->SwapBytes) {
+               _mesa_swap2(dst, 2 * comps);
+            }
+         }
+         break;
+      case GL_SHORT:
+         {
+            GLshort *dst = (GLshort *) destination;
+            PACK_MACRO(GLshort, FLOAT_TO_SHORT);
+            if (packing->SwapBytes) {
+               _mesa_swap2((GLushort *) dst, 2 * comps);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT:
+         {
+            GLuint *dst = (GLuint *) destination;
+            PACK_MACRO(GLuint, FLOAT_TO_UINT);
+            if (packing->SwapBytes) {
+               _mesa_swap4(dst, 2 * comps);
+            }
+         }
+         break;
+      case GL_INT:
+         {
+            GLint *dst = (GLint *) destination;
+            PACK_MACRO(GLint, FLOAT_TO_INT);
+            if (packing->SwapBytes) {
+               _mesa_swap4((GLuint *) dst, 2 * comps);
+            }
+         }
+         break;
+      case GL_FLOAT:
+         {
+            GLfloat *dst = (GLfloat *) destination;
+            PACK_MACRO(GLfloat, (GLfloat));
+            if (packing->SwapBytes) {
+               _mesa_swap4((GLuint *) dst, 2 * comps);
+            }
+         }
+         break;
+      default:
+         gl_problem(ctx, "Bad type in pack_minmax");
+   }
+
+#undef PACK_MACRO
+}
+
+
+/*
+ * Given an internalFormat token passed to glHistogram or glMinMax,
+ * return the corresponding base format.
+ * Return -1 if invalid token.
+ */
+static GLint
+base_histogram_format( GLenum format )
+{
+   switch (format) {
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+         return GL_ALPHA;
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+         return GL_LUMINANCE;
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+         return GL_LUMINANCE_ALPHA;
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+         return GL_RGB;
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return GL_RGBA;
+      default:
+         return -1;  /* error */
+   }
+}
+
+
+/*
+ * Given an internalFormat token passed to glConvolutionFilter
+ * or glSeparableFilter, return the corresponding base format.
+ * Return -1 if invalid token.
+ */
+static GLint
+base_filter_format( GLenum format )
+{
+   switch (format) {
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+         return GL_ALPHA;
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+         return GL_LUMINANCE;
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+         return GL_LUMINANCE_ALPHA;
+      case GL_INTENSITY:
+      case GL_INTENSITY4:
+      case GL_INTENSITY8:
+      case GL_INTENSITY12:
+      case GL_INTENSITY16:
+         return GL_INTENSITY;
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+         return GL_RGB;
+      case 4:
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return GL_RGBA;
+      default:
+         return -1;  /* error */
+   }
+}
+
+
+void
+_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetHistogram");
+
+   if (target != GL_MINMAX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetMinmax(target)");
+      return;
+   }
+
+   if (format != GL_RED &&
+       format != GL_GREEN &&
+       format != GL_BLUE &&
+       format != GL_ALPHA &&
+       format != GL_RGB &&
+       format != GL_RGBA &&
+       format != GL_ABGR_EXT &&
+       format != GL_LUMINANCE &&
+       format != GL_LUMINANCE_ALPHA) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetMinmax(format)");
+      return;
+   }
+
+   if (type != GL_UNSIGNED_BYTE &&
+       type != GL_BYTE &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_INT &&
+       type != GL_FLOAT) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetMinmax(type)");
+      return;
+   }
+
+   if (!values)
+      return;
+
+   {
+      GLfloat minmax[2][4];
+      minmax[0][RCOMP] = CLAMP(ctx->MinMax.Min[RCOMP], 0.0F, 1.0F);
+      minmax[0][GCOMP] = CLAMP(ctx->MinMax.Min[GCOMP], 0.0F, 1.0F);
+      minmax[0][BCOMP] = CLAMP(ctx->MinMax.Min[BCOMP], 0.0F, 1.0F);
+      minmax[0][ACOMP] = CLAMP(ctx->MinMax.Min[ACOMP], 0.0F, 1.0F);
+      minmax[1][RCOMP] = CLAMP(ctx->MinMax.Max[RCOMP], 0.0F, 1.0F);
+      minmax[1][GCOMP] = CLAMP(ctx->MinMax.Max[GCOMP], 0.0F, 1.0F);
+      minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F);
+      minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F);
+      pack_minmax(ctx, (CONST GLfloat (*)[4]) minmax,
+                  format, type, values, &ctx->Pack);
+   }
+
+   if (reset) {
+      _mesa_ResetMinmax(GL_MINMAX);
+   }
+}
+
+
+void
+_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetHistogram");
+
+   if (target != GL_HISTOGRAM) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetHistogram(target)");
+      return;
+   }
+
+   if (format != GL_RED &&
+       format != GL_GREEN &&
+       format != GL_BLUE &&
+       format != GL_ALPHA &&
+       format != GL_RGB &&
+       format != GL_RGBA &&
+       format != GL_ABGR_EXT &&
+       format != GL_LUMINANCE &&
+       format != GL_LUMINANCE_ALPHA) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetHistogram(format)");
+      return;
+   }
+
+   if (type != GL_UNSIGNED_BYTE &&
+       type != GL_BYTE &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_INT &&
+       type != GL_FLOAT) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetHistogram(type)");
+      return;
+   }
+
+   if (!values)
+      return;
+
+   pack_histogram(ctx, ctx->Histogram.Width,
+                  (CONST GLuint (*)[4]) ctx->Histogram.Count,
+                  format, type, values, &ctx->Pack);
+
+   if (reset) {
+      GLuint i;
+      for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
+         ctx->Histogram.Count[i][0] = 0;
+         ctx->Histogram.Count[i][1] = 0;
+         ctx->Histogram.Count[i][2] = 0;
+         ctx->Histogram.Count[i][3] = 0;
+      }
+   }
+}
+
+
+void
+_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetHistogramParameterfv");
+
+   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(target)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_HISTOGRAM_WIDTH:
+         *params = (GLfloat) ctx->Histogram.Width;
+         break;
+      case GL_HISTOGRAM_FORMAT:
+         *params = (GLfloat) ctx->Histogram.Format;
+         break;
+      case GL_HISTOGRAM_RED_SIZE:
+         *params = (GLfloat) ctx->Histogram.RedSize;
+         break;
+      case GL_HISTOGRAM_GREEN_SIZE:
+         *params = (GLfloat) ctx->Histogram.GreenSize;
+         break;
+      case GL_HISTOGRAM_BLUE_SIZE:
+         *params = (GLfloat) ctx->Histogram.BlueSize;
+         break;
+      case GL_HISTOGRAM_ALPHA_SIZE:
+         *params = (GLfloat) ctx->Histogram.AlphaSize;
+         break;
+      case GL_HISTOGRAM_LUMINANCE_SIZE:
+         *params = (GLfloat) ctx->Histogram.LuminanceSize;
+         break;
+      case GL_HISTOGRAM_SINK:
+         *params = (GLfloat) ctx->Histogram.Sink;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(pname)");
+   }
+}
+
+
+void
+_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetHistogramParameteriv");
+
+   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(target)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_HISTOGRAM_WIDTH:
+         *params = (GLint) ctx->Histogram.Width;
+         break;
+      case GL_HISTOGRAM_FORMAT:
+         *params = (GLint) ctx->Histogram.Format;
+         break;
+      case GL_HISTOGRAM_RED_SIZE:
+         *params = (GLint) ctx->Histogram.RedSize;
+         break;
+      case GL_HISTOGRAM_GREEN_SIZE:
+         *params = (GLint) ctx->Histogram.GreenSize;
+         break;
+      case GL_HISTOGRAM_BLUE_SIZE:
+         *params = (GLint) ctx->Histogram.BlueSize;
+         break;
+      case GL_HISTOGRAM_ALPHA_SIZE:
+         *params = (GLint) ctx->Histogram.AlphaSize;
+         break;
+      case GL_HISTOGRAM_LUMINANCE_SIZE:
+         *params = (GLint) ctx->Histogram.LuminanceSize;
+         break;
+      case GL_HISTOGRAM_SINK:
+         *params = (GLint) ctx->Histogram.Sink;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(pname)");
+   }
+}
+
+
+void
+_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetMinmaxParameterfv");
+
+   if (target != GL_MINMAX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameterfv(target)");
+      return;
+   }
+   if (pname == GL_MINMAX_FORMAT) {
+      *params = (GLfloat) ctx->MinMax.Format;
+   }
+   else if (pname == GL_MINMAX_SINK) {
+      *params = (GLfloat) ctx->MinMax.Sink;
+   }
+   else {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameterfv(pname)");
+   }
+}
+
+
+void
+_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetMinmaxParameteriv");
+
+   if (target != GL_MINMAX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameteriv(target)");
+      return;
+   }
+   if (pname == GL_MINMAX_FORMAT) {
+      *params = (GLint) ctx->MinMax.Format;
+   }
+   else if (pname == GL_MINMAX_SINK) {
+      *params = (GLint) ctx->MinMax.Sink;
+   }
+   else {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameteriv(pname)");
+   }
+}
+
+
+void
+_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
+{
+   GLuint i;
+   GLboolean error = GL_FALSE;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glHistogram");
+
+   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
+      gl_error(ctx, GL_INVALID_ENUM, "glHistogram(target)");
+      return;
+   }
+
+   if (width < 0 || width > HISTOGRAM_TABLE_SIZE) {
+      if (target == GL_PROXY_HISTOGRAM) {
+         error = GL_TRUE;
+      }
+      else {
+         if (width < 0)
+            gl_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
+         else
+            gl_error(ctx, GL_TABLE_TOO_LARGE, "glHistogram(width)");
+         return;
+      }
+   }
+
+   if (width != 0 && _mesa_bitcount(width) != 1) {
+      if (target == GL_PROXY_HISTOGRAM) {
+         error = GL_TRUE;
+      }
+      else {
+         gl_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
+         return;
+      }
+   }
+
+   if (base_histogram_format(internalFormat) < 0) {
+      if (target == GL_PROXY_HISTOGRAM) {
+         error = GL_TRUE;
+      }
+      else {
+         gl_error(ctx, GL_INVALID_ENUM, "glHistogram(internalFormat)");
+         return;
+      }
+   }
+
+   /* reset histograms */
+   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
+      ctx->Histogram.Count[i][0] = 0;
+      ctx->Histogram.Count[i][1] = 0;
+      ctx->Histogram.Count[i][2] = 0;
+      ctx->Histogram.Count[i][3] = 0;
+   }
+
+   if (error) {
+      ctx->Histogram.Width = 0;
+      ctx->Histogram.Format = 0;
+      ctx->Histogram.RedSize       = 0;
+      ctx->Histogram.GreenSize     = 0;
+      ctx->Histogram.BlueSize      = 0;
+      ctx->Histogram.AlphaSize     = 0;
+      ctx->Histogram.LuminanceSize = 0;
+   }
+   else {
+      ctx->Histogram.Width = width;
+      ctx->Histogram.Format = internalFormat;
+      ctx->Histogram.Sink = sink;
+      ctx->Histogram.RedSize       = 0xffffffff;
+      ctx->Histogram.GreenSize     = 0xffffffff;
+      ctx->Histogram.BlueSize      = 0xffffffff;
+      ctx->Histogram.AlphaSize     = 0xffffffff;
+      ctx->Histogram.LuminanceSize = 0xffffffff;
+   }
+}
+
+
+void
+_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glMinmax");
+
+   if (target != GL_MINMAX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glMinMax(target)");
+      return;
+   }
+
+   if (base_histogram_format(internalFormat) < 0) {
+      gl_error(ctx, GL_INVALID_ENUM, "glMinMax(internalFormat)");
+      return;
+   }
+
+   ctx->MinMax.Sink = sink;
+}
+
+
+void
+_mesa_ResetHistogram(GLenum target)
+{
+   GLuint i;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glResetHistogram");
+
+   if (target != GL_HISTOGRAM) {
+      gl_error(ctx, GL_INVALID_ENUM, "glResetHistogram(target)");
+      return;
+   }
+
+   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
+      ctx->Histogram.Count[i][0] = 0;
+      ctx->Histogram.Count[i][1] = 0;
+      ctx->Histogram.Count[i][2] = 0;
+      ctx->Histogram.Count[i][3] = 0;
+   }
+}
+
+
+void
+_mesa_ResetMinmax(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glResetMinmax");
+
+   if (target != GL_MINMAX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glResetMinMax(target)");
+      return;
+   }
+
+   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
+   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
+   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
+   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
+}
+
+
+
+/*
+ * Update the min/max values from an array of fragment colors.
+ */
+void
+_mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
+{
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      /* update mins */
+      if (rgba[i][RCOMP] < ctx->MinMax.Min[RCOMP])
+         ctx->MinMax.Min[RCOMP] = rgba[i][RCOMP];
+      if (rgba[i][GCOMP] < ctx->MinMax.Min[GCOMP])
+         ctx->MinMax.Min[GCOMP] = rgba[i][GCOMP];
+      if (rgba[i][BCOMP] < ctx->MinMax.Min[BCOMP])
+         ctx->MinMax.Min[BCOMP] = rgba[i][BCOMP];
+      if (rgba[i][ACOMP] < ctx->MinMax.Min[ACOMP])
+         ctx->MinMax.Min[ACOMP] = rgba[i][ACOMP];
+
+      /* update maxs */
+      if (rgba[i][RCOMP] > ctx->MinMax.Max[RCOMP])
+         ctx->MinMax.Max[RCOMP] = rgba[i][RCOMP];
+      if (rgba[i][GCOMP] > ctx->MinMax.Max[GCOMP])
+         ctx->MinMax.Max[GCOMP] = rgba[i][GCOMP];
+      if (rgba[i][BCOMP] > ctx->MinMax.Max[BCOMP])
+         ctx->MinMax.Max[BCOMP] = rgba[i][BCOMP];
+      if (rgba[i][ACOMP] > ctx->MinMax.Max[ACOMP])
+         ctx->MinMax.Max[ACOMP] = rgba[i][ACOMP];
+   }
+}
+
+
+/*
+ * Update the histogram values from an array of fragment colors.
+ */
+void
+_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
+{
+   const GLint max = ctx->Histogram.Width - 1;
+   GLfloat w = (GLfloat) max;
+   GLuint i;
+
+   if (ctx->Histogram.Width == 0)
+      return;
+   
+   for (i = 0; i < n; i++) {
+      GLint ri = (GLint) (rgba[i][RCOMP] * w + 0.5F);
+      GLint gi = (GLint) (rgba[i][GCOMP] * w + 0.5F);
+      GLint bi = (GLint) (rgba[i][BCOMP] * w + 0.5F);
+      GLint ai = (GLint) (rgba[i][ACOMP] * w + 0.5F);
+      ri = CLAMP(ri, 0, max);
+      gi = CLAMP(gi, 0, max);
+      bi = CLAMP(bi, 0, max);
+      ai = CLAMP(ai, 0, max);
+      ctx->Histogram.Count[ri][RCOMP]++;
+      ctx->Histogram.Count[gi][GCOMP]++;
+      ctx->Histogram.Count[bi][BCOMP]++;
+      ctx->Histogram.Count[ai][ACOMP]++;
+   }
+}
+
+
+
+/**********************************************************************/
+/****                        Convolution                          *****/
+/**********************************************************************/
+
+void
+_mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
+{
+   GLenum baseFormat;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glConvolutionFilter1D");
+
+   if (target != GL_CONVOLUTION_1D) {
+      gl_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      gl_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter1D(width)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       type == GL_BITMAP) {
+      gl_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(format or type)");
+      return;
+   }
+
+   ctx->Convolution1D.Format = format;
+   ctx->Convolution1D.InternalFormat = internalFormat;
+   ctx->Convolution1D.Width = width;
+   ctx->Convolution1D.Height = 1;
+
+   /* unpack filter image and apply scale and bias */
+   _mesa_unpack_float_color_span(ctx, width, GL_RGBA,
+                                 ctx->Convolution1D.Filter,
+                                 format, type, image, &ctx->Unpack,
+                                 GL_FALSE, GL_FALSE);
+   {
+      const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[0];
+      const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[0];
+      GLint i;
+      for (i = 0; i < width; i++) {
+         GLfloat r = ctx->Convolution1D.Filter[i * 4 + 0];
+         GLfloat g = ctx->Convolution1D.Filter[i * 4 + 1];
+         GLfloat b = ctx->Convolution1D.Filter[i * 4 + 2];
+         GLfloat a = ctx->Convolution1D.Filter[i * 4 + 3];
+         r = r * scale[0] + bias[0];
+         g = g * scale[1] + bias[1];
+         b = b * scale[2] + bias[2];
+         a = a * scale[3] + bias[3];
+         ctx->Convolution1D.Filter[i * 4 + 0] = r;
+         ctx->Convolution1D.Filter[i * 4 + 1] = g;
+         ctx->Convolution1D.Filter[i * 4 + 2] = b;
+         ctx->Convolution1D.Filter[i * 4 + 3] = a;
+      }
+   }
+}
+
+
+void
+_mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
+{
+   GLenum baseFormat;
+   GLint i, components;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glConvolutionFilter2D");
+
+   if (target != GL_CONVOLUTION_2D) {
+      gl_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      gl_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter2D(width)");
+      return;
+   }
+   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
+      gl_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter2D(height)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       type == GL_BITMAP) {
+      gl_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(format or type)");
+      return;
+   }
+
+   components = _mesa_components_in_format(format);
+   assert(components > 0);  /* this should have been caught earlier */
+
+   ctx->Convolution2D.Format = format;
+   ctx->Convolution2D.InternalFormat = internalFormat;
+   ctx->Convolution2D.Width = width;
+   ctx->Convolution2D.Height = height;
+
+   /* unpack filter image and apply scale and bias */
+   for (i = 0; i < height; i++) {
+      const GLvoid *src = _mesa_image_address(&ctx->Unpack, image, width,
+                                              height, format, type, 0, i, 0);
+      GLfloat *dst = ctx->Convolution2D.Filter + i * width * components;
+      _mesa_unpack_float_color_span(ctx, width, GL_RGBA, dst,
+                                    format, type, src, &ctx->Unpack,
+                                    GL_FALSE, GL_FALSE);
+   }
+
+   {
+      const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[1];
+      const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[1];
+      for (i = 0; i < width * height * 4; i++) {
+         GLfloat r = ctx->Convolution2D.Filter[i * 4 + 0];
+         GLfloat g = ctx->Convolution2D.Filter[i * 4 + 1];
+         GLfloat b = ctx->Convolution2D.Filter[i * 4 + 2];
+         GLfloat a = ctx->Convolution2D.Filter[i * 4 + 3];
+         r = r * scale[0] + bias[0];
+         g = g * scale[1] + bias[1];
+         b = b * scale[2] + bias[2];
+         a = a * scale[3] + bias[3];
+         ctx->Convolution2D.Filter[i * 4 + 0] = r;
+         ctx->Convolution2D.Filter[i * 4 + 1] = g;
+         ctx->Convolution2D.Filter[i * 4 + 2] = b;
+         ctx->Convolution2D.Filter[i * 4 + 3] = a;
+      }
+   }
+}
+
+
+void
+_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint c;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glConvolutionParameterf");
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_MODE:
+         if (param == (GLfloat) GL_REDUCE ||
+             param == (GLfloat) GL_CONSTANT_BORDER ||
+             param == (GLfloat) GL_REPLICATE_BORDER) {
+            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) param;
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(params)");
+            return;
+         }
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(pname)");
+         return;
+   }
+}
+
+
+void
+_mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_convolution_attrib *conv;
+   GLuint c;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glConvolutionParameterfv");
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         conv = &ctx->Convolution1D;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         conv = &ctx->Convolution2D;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         conv = &ctx->Separable2D;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+         COPY_4V(ctx->Pixel.ConvolutionBorderColor[c], params);
+         break;
+      case GL_CONVOLUTION_BORDER_MODE:
+         if (params[0] == (GLfloat) GL_REDUCE ||
+             params[0] == (GLfloat) GL_CONSTANT_BORDER ||
+             params[0] == (GLfloat) GL_REPLICATE_BORDER) {
+            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) params[0];
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(params)");
+            return;
+         }
+         break;
+      case GL_CONVOLUTION_FILTER_SCALE:
+         COPY_4V(ctx->Pixel.ConvolutionFilterScale[c], params);
+         break;
+      case GL_CONVOLUTION_FILTER_BIAS:
+         COPY_4V(ctx->Pixel.ConvolutionFilterBias[c], params);
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(pname)");
+         return;
+   }
+}
+
+
+void
+_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint c;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glConvolutionParameteri");
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_MODE:
+         if (param == (GLint) GL_REDUCE ||
+             param == (GLint) GL_CONSTANT_BORDER ||
+             param == (GLint) GL_REPLICATE_BORDER) {
+            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) param;
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(params)");
+            return;
+         }
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(pname)");
+         return;
+   }
+}
+
+
+void
+_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_convolution_attrib *conv;
+   GLuint c;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glConvolutionParameteriv");
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         conv = &ctx->Convolution1D;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         conv = &ctx->Convolution2D;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         conv = &ctx->Separable2D;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+	 ctx->Pixel.ConvolutionBorderColor[c][0] = INT_TO_FLOAT(params[0]);
+	 ctx->Pixel.ConvolutionBorderColor[c][1] = INT_TO_FLOAT(params[1]);
+	 ctx->Pixel.ConvolutionBorderColor[c][2] = INT_TO_FLOAT(params[2]);
+	 ctx->Pixel.ConvolutionBorderColor[c][3] = INT_TO_FLOAT(params[3]);
+         break;
+      case GL_CONVOLUTION_BORDER_MODE:
+         if (params[0] == (GLint) GL_REDUCE ||
+             params[0] == (GLint) GL_CONSTANT_BORDER ||
+             params[0] == (GLint) GL_REPLICATE_BORDER) {
+            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) params[0];
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(params)");
+            return;
+         }
+         break;
+      case GL_CONVOLUTION_FILTER_SCALE:
+         COPY_4V(ctx->Pixel.ConvolutionFilterScale[c], params);
+         break;
+      case GL_CONVOLUTION_FILTER_BIAS:
+         COPY_4V(ctx->Pixel.ConvolutionFilterBias[c], params);
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(pname)");
+         return;
+   }
+}
+
+
+void
+_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width)
+{
+   GLenum baseFormat;
+   GLfloat rgba[MAX_CONVOLUTION_WIDTH][4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyConvolutionFilter1D");
+
+   if (target != GL_CONVOLUTION_1D) {
+      gl_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      gl_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter1D(width)");
+      return;
+   }
+
+   /* read pixels from framebuffer */
+   gl_read_rgba_span(ctx, ctx->ReadBuffer, width, x, y, (GLubyte (*)[4]) rgba);
+
+   /* store as convolution filter */
+   _mesa_ConvolutionFilter1D(target, internalFormat, width,
+                             GL_RGBA, GL_UNSIGNED_BYTE, rgba);
+}
+
+
+void
+_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   GLenum baseFormat;
+   GLint i;
+   struct gl_pixelstore_attrib packSave;
+   GLfloat rgba[MAX_CONVOLUTION_HEIGHT][MAX_CONVOLUTION_WIDTH][4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyConvolutionFilter2D");
+
+   if (target != GL_CONVOLUTION_2D) {
+      gl_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      gl_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter2D(width)");
+      return;
+   }
+   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
+      gl_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter2D(height)");
+      return;
+   }
+
+   /* read pixels from framebuffer */
+   for (i = 0; i < height; i++) {
+      gl_read_rgba_span(ctx, ctx->ReadBuffer, width, x, y + i,
+                        (GLubyte (*)[4]) rgba[i]);
+   }
+
+   /*
+    * store as convolution filter
+    */
+   packSave = ctx->Unpack;  /* save pixel packing params */
+
+   ctx->Unpack.Alignment = 1;
+   ctx->Unpack.RowLength = MAX_CONVOLUTION_WIDTH;
+   ctx->Unpack.SkipPixels = 0;
+   ctx->Unpack.SkipRows = 0;
+   ctx->Unpack.ImageHeight = 0;
+   ctx->Unpack.SkipImages = 0;
+   ctx->Unpack.SwapBytes = GL_FALSE;
+   ctx->Unpack.LsbFirst = GL_FALSE;
+
+   _mesa_ConvolutionFilter2D(target, internalFormat, width, height,
+                             GL_RGBA, GL_UNSIGNED_BYTE, rgba);
+
+   ctx->Unpack = packSave;  /* restore pixel packing params */
+}
+
+
+void
+_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetConvolutionFilter");
+
+   if (target != GL_CONVOLUTION_1D && target != GL_CONVOLUTION_2D) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(target)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       type == GL_BITMAP) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(format or type)");
+      return;
+   }
 
-
-
-#if 0
-void _mesa_BlendColor(GLclampf r, GLclampf g, GLclampf b, GLclampf a)
-{
-   (void) r;
-   (void) g;
-   (void) b;
-   (void) a;
-   WARNING("glBlendColor");
-}
-
-void _mesa_BlendEquation(GLenum eq)
-{
-   (void) eq;
-   WARNING("glBlendEquation");
-}
-
-void _mesa_ColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
-{
-   (void) target;
-   (void) start;
-   (void) count;
-   (void) format;
-   (void) type;
-   (void) data;
-   WARNING("glColorSubTable");
-}
-
-void _mesa_ColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
-{
-   (void) target;
-   (void) internalformat;
-   (void) width;
-   (void) format;
-   (void) type;
-   (void) table;
-   WARNING("glColorTable");
-}
-#endif
-
-void _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glColorTableParameterfv");
-}
-
-void _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glColorTableParameteriv");
-}
-
-
-void _mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
-{
-   (void) target;
-   (void) internalformat;
-   (void) width;
-   (void) format;
-   (void) type;
-   (void) image;
-   WARNING("glConvolutionFilter1D");
-}
-
-void _mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
-{
-   (void) target;
-   (void) internalformat;
-   (void) width;
-   (void) height;
-   (void) format;
-   (void) type;
    (void) image;
-   WARNING("glConvolutionFilter2D");
+   /* XXX store image */
 }
 
-void _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glConvolutionParameterf");
-}
 
-void _mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+void
+_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glConvolutionParameterfv");
-}
+   GET_CURRENT_CONTEXT(ctx);
+   const struct gl_convolution_attrib *conv;
+   GLuint c;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetConvolutionParameterfv");
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         conv = &ctx->Convolution1D;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         conv = &ctx->Convolution2D;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         conv = &ctx->Separable2D;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+         COPY_4V(params, ctx->Pixel.ConvolutionBorderColor[c]);
+         break;
+      case GL_CONVOLUTION_BORDER_MODE:
+         *params = (GLfloat) ctx->Pixel.ConvolutionBorderMode[c];
+         break;
+      case GL_CONVOLUTION_FILTER_SCALE:
+         COPY_4V(params, ctx->Pixel.ConvolutionFilterScale[c]);
+         break;
+      case GL_CONVOLUTION_FILTER_BIAS:
+         COPY_4V(params, ctx->Pixel.ConvolutionFilterBias[c]);
+         break;
+      case GL_CONVOLUTION_FORMAT:
+         *params = (GLfloat) conv->Format;
+         break;
+      case GL_CONVOLUTION_WIDTH:
+         *params = (GLfloat) conv->Width;
+         break;
+      case GL_CONVOLUTION_HEIGHT:
+         *params = (GLfloat) conv->Height;
+         break;
+      case GL_MAX_CONVOLUTION_WIDTH:
+         *params = (GLfloat) ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         *params = (GLfloat) ctx->Const.MaxConvolutionHeight;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv(pname)");
+         return;
+   }
+}
+
+
+void
+_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const struct gl_convolution_attrib *conv;
+   GLuint c;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetConvolutionParameteriv");
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         conv = &ctx->Convolution1D;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         conv = &ctx->Convolution2D;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         conv = &ctx->Separable2D;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+         params[0] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][0]);
+         params[1] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][1]);
+         params[2] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][2]);
+         params[3] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][3]);
+         break;
+      case GL_CONVOLUTION_BORDER_MODE:
+         *params = (GLint) ctx->Pixel.ConvolutionBorderMode;
+         break;
+      case GL_CONVOLUTION_FILTER_SCALE:
+         params[0] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][0];
+         params[1] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][1];
+         params[2] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][2];
+         params[3] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][3];
+         break;
+      case GL_CONVOLUTION_FILTER_BIAS:
+         params[0] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][0];
+         params[1] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][1];
+         params[2] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][2];
+         params[3] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][3];
+         break;
+      case GL_CONVOLUTION_FORMAT:
+         *params = (GLint) conv->Format;
+         break;
+      case GL_CONVOLUTION_WIDTH:
+         *params = (GLint) conv->Width;
+         break;
+      case GL_CONVOLUTION_HEIGHT:
+         *params = (GLint) conv->Height;
+         break;
+      case GL_MAX_CONVOLUTION_WIDTH:
+         *params = (GLint) ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         *params = (GLint) ctx->Const.MaxConvolutionHeight;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv(pname)");
+         return;
+   }
+}
+
+
+void
+_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetSeparableFilter");
+
+   if (target != GL_SEPARABLE_2D) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetSeparableFilter(target)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       type == GL_BITMAP) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(format or type)");
+      return;
+   }
 
-void _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glConvolutionParameteri");
-}
-
-void _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glConvolutionParameteriv");
-}
-
-void _mesa_CopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
-{
-   (void) target;
-   (void) start;
-   (void) x;
-   (void) y;
-   (void) width;
-   WARNING("glCopyColorSubTable");
-}
-
-void _mesa_CopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
-{
-   (void) target;
-   (void) internalformat;
-   (void) x;
-   (void) y;
-   (void) width;
-   WARNING("glCopyColorTable");
-}
-
-void _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
-{
-   (void) target;
-   (void) internalformat;
-   (void) x;
-   (void) y;
-   (void) width;
-   WARNING("glCopyConvolutionFilter1D");
-}
-
-void _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   (void) target;
-   (void) internalformat;
-   (void) x;
-   (void) y;
-   (void) width;
-   (void) height;
-   WARNING("glCopyConvolutionFilter2D");
-}
-
-#if 0
-void _mesa_GetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
-{
-   (void) target;
-   (void) format;
-   (void) type;
-   (void) table;
-   WARNING("glGetColorTable");
-}
-
-void _mesa_GetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glGetColorTableParameterfv");
-}
-
-void _mesa_GetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glGetColorTableParameteriv");
-}
-#endif
-
-void _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
-{
-   (void) target;
-   (void) format;
-   (void) type;
-   (void) image;
-   WARNING("glGetConvolutionFilter");
-}
-
-void _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glGetConvolutionParameterfv");
-}
-
-void _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glGetConvolutionParameteriv");
-}
-
-void _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values)
-{
-   (void) target;
-   (void) reset;
-   (void) format;
-   (void) types;
-   (void) values;
-   WARNING("glGetMinmax");
-}
-
-void _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
-{
-   (void) target;
-   (void) reset;
-   (void) format;
-   (void) type;
-   (void) values;
-   WARNING("glGetHistogram");
-}
-
-void _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glGetHistogramParameterfv");
-}
-
-void _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glGetHistogramParameteriv");
-}
-
-void _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glGetMinmaxParameterfv");
-}
-
-void _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   (void) target;
-   (void) pname;
-   (void) params;
-   WARNING("glGetMinmaxParameteriv");
-}
-
-void _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
-{
-   (void) target;
-   (void) format;
-   (void) type;
    (void) row;
    (void) column;
    (void) span;
-   WARNING("glGetSeperableFilter");
 }
 
-void _mesa_Histogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
-{
-   (void) target;
-   (void) width;
-   (void) internalformat;
-   (void) sink;
-   WARNING("glHistogram");
-}
-
-void _mesa_Minmax(GLenum target, GLenum internalformat, GLboolean sink)
-{
-   (void) target;
-   (void) internalformat;
-   (void) sink;
-   WARNING("glMinmax");
-}
-
-void _mesa_ResetHistogram(GLenum target)
-{
-   (void) target;
-   WARNING("glResetHistogram");
-}
 
-void _mesa_ResetMinmax(GLenum target)
+void
+_mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-   (void) target;
-   WARNING("glResetMinmax");
+   const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
+   GLenum baseFormat;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glSeparableFilter2D");
+
+   if (target != GL_SEPARABLE_2D) {
+      gl_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      gl_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      gl_error(ctx, GL_INVALID_VALUE, "glSeparableFilter2D(width)");
+      return;
+   }
+   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
+      gl_error(ctx, GL_INVALID_VALUE, "glSeparableFilter2D(height)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       type == GL_BITMAP) {
+      gl_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(format or type)");
+      return;
+   }
+
+   ctx->Separable2D.Format = format;
+   ctx->Separable2D.InternalFormat = internalFormat;
+   ctx->Separable2D.Width = width;
+   ctx->Separable2D.Height = height;
+
+   /* unpack row filter */
+   _mesa_unpack_float_color_span(ctx, width, GL_RGBA,
+                                 ctx->Separable2D.Filter,
+                                 format, type, row, &ctx->Unpack,
+                                 GL_FALSE, GL_FALSE);
+   {
+      const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[2];
+      const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[2];
+      GLint i;
+      for (i = 0; i < width; i++) {
+         GLfloat r = ctx->Separable2D.Filter[i * 4 + 0];
+         GLfloat g = ctx->Separable2D.Filter[i * 4 + 1];
+         GLfloat b = ctx->Separable2D.Filter[i * 4 + 2];
+         GLfloat a = ctx->Separable2D.Filter[i * 4 + 3];
+         r = r * scale[0] + bias[0];
+         g = g * scale[1] + bias[1];
+         b = b * scale[2] + bias[2];
+         a = a * scale[3] + bias[3];
+         ctx->Separable2D.Filter[i * 4 + 0] = r;
+         ctx->Separable2D.Filter[i * 4 + 1] = g;
+         ctx->Separable2D.Filter[i * 4 + 2] = b;
+         ctx->Separable2D.Filter[i * 4 + 3] = a;
+      }
+   }
+
+   /* unpack column filter */
+   _mesa_unpack_float_color_span(ctx, width, GL_RGBA,
+                                 &ctx->Separable2D.Filter[colStart],
+                                 format, type, column, &ctx->Unpack,
+                                 GL_FALSE, GL_FALSE);
+   {
+      const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[2];
+      const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[2];
+      GLint i;
+      for (i = 0; i < width; i++) {
+         GLfloat r = ctx->Separable2D.Filter[i * 4 + 0 + colStart];
+         GLfloat g = ctx->Separable2D.Filter[i * 4 + 1 + colStart];
+         GLfloat b = ctx->Separable2D.Filter[i * 4 + 2 + colStart];
+         GLfloat a = ctx->Separable2D.Filter[i * 4 + 3 + colStart];
+         r = r * scale[0] + bias[0];
+         g = g * scale[1] + bias[1];
+         b = b * scale[2] + bias[2];
+         a = a * scale[3] + bias[3];
+         ctx->Separable2D.Filter[i * 4 + 0 + colStart] = r;
+         ctx->Separable2D.Filter[i * 4 + 1 + colStart] = g;
+         ctx->Separable2D.Filter[i * 4 + 2 + colStart] = b;
+         ctx->Separable2D.Filter[i * 4 + 3 + colStart] = a;
+      }
+   }
 }
 
-void _mesa_SeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
-{
-   (void) target;
-   (void) internalformat;
-   (void) width;
-   (void) height;
-   (void) format;
-   (void) type;
-   (void) row;
-   (void) column;
-   WARNING("glSeparableFilter2D");
-}
Index: xc/extras/Mesa/src/imaging.h
diff -u xc/extras/Mesa/src/imaging.h:1.3 xc/extras/Mesa/src/imaging.h:1.4
--- xc/extras/Mesa/src/imaging.h:1.3	Thu Mar  2 08:07:12 2000
+++ xc/extras/Mesa/src/imaging.h	Fri Jun 16 17:02:13 2000
@@ -32,25 +32,11 @@
 #include "all.h"
 #else
 #include "glheader.h"
+#include "types.h"
 #endif
 
 
 
-#if 0
-extern void _mesa_BlendColor(GLclampf r, GLclampf g, GLclampf b, GLclampf a);
-
-extern void _mesa_BlendEquation(GLenum eq);
-
-extern void _mesa_ColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-
-extern void _mesa_ColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-#endif
-
-extern void _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
-
-extern void _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
-
-
 extern void _mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
 
 extern void _mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
@@ -63,22 +49,10 @@
 
 extern void _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params);
 
-extern void _mesa_CopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-
-extern void _mesa_CopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-
 extern void _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
 
 extern void _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
 
-#if 0
-extern void _mesa_GetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table);
-
-extern void _mesa_GetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params);
-
-extern void _mesa_GetColorTableParameteriv(GLenum target, GLenum pname, GLint *params);
-#endif
-
 extern void _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image);
 
 extern void _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params);
@@ -108,5 +82,13 @@
 extern void _mesa_ResetMinmax(GLenum target);
 
 extern void _mesa_SeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+
+
+extern void
+_mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
+
+extern void
+_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
+
 
 #endif
Index: xc/extras/Mesa/src/interp_tmp.h
diff -u xc/extras/Mesa/src/interp_tmp.h:1.3 xc/extras/Mesa/src/interp_tmp.h:1.4
--- xc/extras/Mesa/src/interp_tmp.h:1.3	Mon Feb 14 23:12:21 2000
+++ xc/extras/Mesa/src/interp_tmp.h	Fri Jun 16 17:02:13 2000
@@ -23,14 +23,43 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#define INTERP_UBYTE( out, t, a, b ) {			\
+      GLfloat fa = UBYTE_COLOR_TO_FLOAT_COLOR(a);	\
+      GLfloat fb = UBYTE_COLOR_TO_FLOAT_COLOR(b);	\
+      GLfloat fo = LINTERP(t, fa, fb);			\
+      FLOAT_COLOR_TO_UBYTE_COLOR(out, fo);		\
+}
+
+#if 1
+
+#define INTERP_RGBA(nr, t, out, a, b) {			\
+   int i;						\
+   for (i = 0; i < nr; i++) {				\
+      GLfloat fa = UBYTE_COLOR_TO_FLOAT_COLOR(a[i]);	\
+      GLfloat fb = UBYTE_COLOR_TO_FLOAT_COLOR(b[i]);	\
+      GLfloat fo = LINTERP(t, fa, fb);			\
+      FLOAT_COLOR_TO_UBYTE_COLOR(out[i], fo);		\
+   }							\
+}
+#else
+
+#define INTERP_RGBA(nr, t, out, a, b) {				\
+   int n;							\
+   const GLuint ti = FloatToInt(t*256.0F);			\
+   const GLubyte *Ib = (const GLubyte *)&a[0];			\
+   const GLubyte *Jb = (const GLubyte *)&b[0];			\
+   GLubyte *Ob = (GLubyte *)&out[0];				\
+								\
+   for (n = 0 ; n < nr ; n++)					\
+      Ob[n] = (GLubyte) (Ib[n] + ((ti * (Jb[n] - Ib[n]))/256));	\
+}
+#endif
+
+
 
 static void NAME( struct vertex_buffer *VB,
 		  GLuint dst, GLfloat t, GLuint in, GLuint out )
 {
-#if (IND & CLIP_RGBA0)
-   GLfloat col[3][4];
-#endif
-
    (void) VB;
    (void) dst;
    (void) t;
@@ -38,35 +67,43 @@
    (void) out;
 
 #if (IND & CLIP_RGBA0)
-   UBYTE_RGBA_TO_FLOAT_RGBA(col[1], VB->Color[0]->data[in]);
-   UBYTE_RGBA_TO_FLOAT_RGBA(col[2], VB->Color[0]->data[out]);
-   INTERP_SZ( t, col, 0, 1, 2, 4 );
-   FLOAT_RGBA_TO_UBYTE_RGBA(VB->Color[0]->data[dst], col[0]);
+   INTERP_RGBA( 4, t, 
+		VB->Color[0]->data[dst], 
+		VB->Color[0]->data[in],
+		VB->Color[0]->data[out] );
 #endif
 
 #if (IND & CLIP_RGBA1)
    if (VB->ctx->TriangleCaps & DD_TRI_LIGHT_TWOSIDE) {
-      UBYTE_RGBA_TO_FLOAT_RGBA(col[1], VB->Color[1]->data[in]);
-      UBYTE_RGBA_TO_FLOAT_RGBA(col[2], VB->Color[1]->data[out]);
-      INTERP_SZ( t, col, 0, 1, 2, 4 );
-      FLOAT_RGBA_TO_UBYTE_RGBA(VB->Color[1]->data[dst], col[0]);
+      INTERP_RGBA( 4, t, 
+		   VB->Color[1]->data[dst], 
+		   VB->Color[1]->data[in],
+		   VB->Color[1]->data[out] );
    }
 
    if (VB->ctx->TriangleCaps & DD_SEPERATE_SPECULAR) 
    {
-      UBYTE_RGBA_TO_FLOAT_RGBA(col[1], VB->Spec[0][in]);
-      UBYTE_RGBA_TO_FLOAT_RGBA(col[2], VB->Spec[0][out]);
-      INTERP_SZ( t, col, 0, 1, 2, 4 );
-      FLOAT_RGBA_TO_UBYTE_RGBA(VB->Spec[0][dst], col[0]);
+      INTERP_RGBA( 3, t, 
+		   VB->Spec[0][dst], 
+		   VB->Spec[0][in],
+		   VB->Spec[0][out] );
 
       if (VB->ctx->TriangleCaps & DD_TRI_LIGHT_TWOSIDE) {
-	 UBYTE_RGBA_TO_FLOAT_RGBA(col[1], VB->Spec[1][in]);
-	 UBYTE_RGBA_TO_FLOAT_RGBA(col[2], VB->Spec[1][out]);
-	 INTERP_SZ( t, col, 0, 1, 2, 4 );
-	 FLOAT_RGBA_TO_UBYTE_RGBA(VB->Spec[1][dst], col[0]);
+	 INTERP_RGBA( 3, t, 
+		      VB->Spec[1][dst], 
+		      VB->Spec[1][in],
+		      VB->Spec[1][out] );
       }
    }      
 #endif
+
+#if (IND & CLIP_FOG_COORD)
+   {
+      GLubyte a = VB->Spec[0][in][3], b = VB->Spec[0][out][3];
+      INTERP_UBYTE( VB->Spec[0][dst][3], t, a, b );
+   }
+#endif
+
 
 #if (IND & CLIP_INDEX0)
    VB->IndexPtr->data[dst] = (GLuint) (GLint) 
Index: xc/extras/Mesa/src/lines.c
diff -u xc/extras/Mesa/src/lines.c:1.3 xc/extras/Mesa/src/lines.c:1.4
--- xc/extras/Mesa/src/lines.c:1.3	Mon Feb 14 23:12:24 2000
+++ xc/extras/Mesa/src/lines.c	Fri Jun 16 17:02:13 2000
@@ -57,6 +57,8 @@
       ctx->TriangleCaps &= ~DD_LINE_WIDTH;
       if (width != 1.0) ctx->TriangleCaps |= DD_LINE_WIDTH;
       ctx->NewState |= NEW_RASTER_OPS;
+      if (ctx->Driver.LineWidth)
+         (*ctx->Driver.LineWidth)(ctx, width);
    }
 }
 
@@ -70,6 +72,9 @@
    ctx->Line.StippleFactor = CLAMP( factor, 1, 256 );
    ctx->Line.StipplePattern = pattern;
    ctx->NewState |= NEW_RASTER_OPS;
+
+   if (ctx->Driver.LineStipple)
+      ctx->Driver.LineStipple( ctx, factor, pattern );
 }
 
 
@@ -110,22 +115,13 @@
 static void flat_ci_line( GLcontext *ctx,
                           GLuint vert0, GLuint vert1, GLuint pvert )
 {
-   GLint count;
-   GLint *pbx = ctx->PB->x;
-   GLint *pby = ctx->PB->y;
-   PB_SET_INDEX( ctx, ctx->PB, ctx->VB->IndexPtr->data[pvert] );
-   count = ctx->PB->count;
+   PB_SET_INDEX( ctx->PB, ctx->VB->IndexPtr->data[pvert] );
 
 #define INTERP_XY 1
+#define PLOT(X,Y)  PB_WRITE_PIXEL(ctx->PB, X, Y, 0);
 
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	count++;
-
 #include "linetemp.h"
 
-   ctx->PB->count = count;
    gl_flush_pb(ctx);
 }
 
@@ -135,25 +131,14 @@
 static void flat_ci_z_line( GLcontext *ctx,
                             GLuint vert0, GLuint vert1, GLuint pvert )
 {
-   GLint count;
-   GLint *pbx = ctx->PB->x;
-   GLint *pby = ctx->PB->y;
-   GLdepth *pbz = ctx->PB->z;
-   PB_SET_INDEX( ctx, ctx->PB, ctx->VB->IndexPtr->data[pvert] );
-   count = ctx->PB->count;
+   PB_SET_INDEX( ctx->PB, ctx->VB->IndexPtr->data[pvert] );
 
 #define INTERP_XY 1
 #define INTERP_Z 1
+#define PLOT(X,Y)  PB_WRITE_PIXEL(ctx->PB, X, Y, Z);
 
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	pbz[count] = Z;		\
-	count++;
-
 #include "linetemp.h"
 
-   ctx->PB->count = count;
    gl_flush_pb(ctx);
 }
 
@@ -163,23 +148,14 @@
 static void flat_rgba_line( GLcontext *ctx,
                             GLuint vert0, GLuint vert1, GLuint pvert )
 {
-   GLint count;
-   GLint *pbx = ctx->PB->x;
-   GLint *pby = ctx->PB->y;
-   GLubyte *color = ctx->VB->ColorPtr->data[pvert];
-   PB_SET_COLOR( ctx, ctx->PB, color[0], color[1], color[2], color[3] );
-   count = ctx->PB->count;
+   const GLubyte *color = ctx->VB->ColorPtr->data[pvert];
+   PB_SET_COLOR( ctx->PB, color[0], color[1], color[2], color[3] );
 
 #define INTERP_XY 1
-
-#define PLOT(X,Y)		\
-	pbx[count] = X;		\
-	pby[count] = Y;		\
-	count++;
+#define PLOT(X,Y)   PB_WRITE_PIXEL(ctx->PB, X, Y, 0);
 
 #include "linetemp.h"
 
-   ctx->PB->count = count;
    gl_flush_pb(ctx);
 }
 
@@ -189,26 +165,15 @@
 static void flat_rgba_z_line( GLcontext *ctx,
                               GLuint vert0, GLuint vert1, GLuint pvert )
 {
-   GLint count;
-   GLint *pbx = ctx->PB->x;
-   GLint *pby = ctx->PB->y;
-   GLdepth *pbz = ctx->PB->z;
-   GLubyte *color = ctx->VB->ColorPtr->data[pvert];
-   PB_SET_COLOR( ctx, ctx->PB, color[0], color[1], color[2], color[3] );
-   count = ctx->PB->count;
+   const GLubyte *color = ctx->VB->ColorPtr->data[pvert];
+   PB_SET_COLOR( ctx->PB, color[0], color[1], color[2], color[3] );
 
 #define INTERP_XY 1
 #define INTERP_Z 1
-
-#define PLOT(X,Y)	\
-	pbx[count] = X;	\
-	pby[count] = Y;	\
-	pbz[count] = Z;	\
-	count++;
+#define PLOT(X,Y)   PB_WRITE_PIXEL(ctx->PB, X, Y, Z);
 
 #include "linetemp.h"
 
-   ctx->PB->count = count;
    gl_flush_pb(ctx);
 }
 
@@ -221,9 +186,11 @@
    GLint count = ctx->PB->count;
    GLint *pbx = ctx->PB->x;
    GLint *pby = ctx->PB->y;
-   GLuint *pbi = ctx->PB->i;
+   GLuint *pbi = ctx->PB->index;
    (void) pvert;
 
+   ctx->PB->mono = GL_FALSE;
+
 #define INTERP_XY 1
 #define INTERP_INDEX 1
 
@@ -249,9 +216,11 @@
    GLint *pbx = ctx->PB->x;
    GLint *pby = ctx->PB->y;
    GLdepth *pbz = ctx->PB->z;
-   GLuint *pbi = ctx->PB->i;
+   GLuint *pbi = ctx->PB->index;
    (void) pvert;
 
+   ctx->PB->mono = GL_FALSE;
+
 #define INTERP_XY 1
 #define INTERP_Z 1
 #define INTERP_INDEX 1
@@ -281,6 +250,8 @@
    GLubyte (*pbrgba)[4] = ctx->PB->rgba;
    (void) pvert;
 
+   ctx->PB->mono = GL_FALSE;
+
 #define INTERP_XY 1
 #define INTERP_RGB 1
 #define INTERP_ALPHA 1
@@ -313,6 +284,8 @@
    GLubyte (*pbrgba)[4] = ctx->PB->rgba;
    (void) pvert;
 
+   ctx->PB->mono = GL_FALSE;
+
 #define INTERP_XY 1
 #define INTERP_Z 1
 #define INTERP_RGB 1
@@ -352,9 +325,11 @@
    GLint *pbx = ctx->PB->x;
    GLint *pby = ctx->PB->y;
    GLdepth *pbz = ctx->PB->z;
-   GLuint *pbi = ctx->PB->i;
+   GLuint *pbi = ctx->PB->index;
    (void) pvert;
 
+   ctx->PB->mono = GL_FALSE;
+
    if (ctx->Line.StippleFlag) {
       /* stippled */
 #define INTERP_XY 1
@@ -424,7 +399,7 @@
    GLint *pbx = ctx->PB->x;
    GLint *pby = ctx->PB->y;
    GLdepth *pbz = ctx->PB->z;
-   PB_SET_INDEX( ctx, ctx->PB, ctx->VB->IndexPtr->data[pvert] );
+   PB_SET_INDEX( ctx->PB, ctx->VB->IndexPtr->data[pvert] );
    count = ctx->PB->count;
 
    if (ctx->Line.StippleFlag) {
@@ -492,6 +467,8 @@
    GLubyte (*pbrgba)[4] = ctx->PB->rgba;
    (void) pvert;
 
+   ctx->PB->mono = GL_FALSE;
+
    if (ctx->Line.StippleFlag) {
       /* stippled */
 #define INTERP_XY 1
@@ -584,7 +561,7 @@
    GLint *pby = ctx->PB->y;
    GLdepth *pbz = ctx->PB->z;
    GLubyte *color = ctx->VB->ColorPtr->data[pvert];
-   PB_SET_COLOR( ctx, ctx->PB, color[0], color[1], color[2], color[3] );
+   PB_SET_COLOR( ctx->PB, color[0], color[1], color[2], color[3] );
    count = ctx->PB->count;
 
    if (ctx->Line.StippleFlag) {
@@ -653,7 +630,7 @@
    GLfloat *pbt = ctx->PB->t[0];
    GLfloat *pbu = ctx->PB->u[0];
    GLubyte *color = ctx->VB->ColorPtr->data[pv];
-   PB_SET_COLOR( ctx, ctx->PB, color[0], color[1], color[2], color[3] );
+   PB_SET_COLOR( ctx->PB, color[0], color[1], color[2], color[3] );
    count = ctx->PB->count;
 
    if (ctx->Line.StippleFlag) {
@@ -716,6 +693,8 @@
    GLubyte (*pbrgba)[4] = ctx->PB->rgba;
    (void) pvert;
 
+   ctx->PB->mono = GL_FALSE;
+
    if (ctx->Line.StippleFlag) {
       /* stippled */
 #define INTERP_XY 1
@@ -793,6 +772,8 @@
    GLubyte (*pbspec)[3] = ctx->PB->spec;
    (void) pvert;
 
+   ctx->PB->mono = GL_FALSE;
+
    if (ctx->Line.StippleFlag) {
       /* stippled */
 #define INTERP_XY 1
@@ -1023,8 +1004,7 @@
       else {
 	 if (ctx->Light.ShadeModel==GL_SMOOTH) {
 	    /* Width==1, non-stippled, smooth-shaded */
-            if (ctx->Depth.Test
-	        || (ctx->Fog.Enabled && ctx->Hint.Fog==GL_NICEST)) {
+            if (ctx->Depth.Test || ctx->FogMode == FOG_FRAGMENT) {
                if (rgbmode)
                   ctx->Driver.LineFunc = smooth_rgba_z_line;
                else
@@ -1039,8 +1019,7 @@
 	 }
          else {
 	    /* Width==1, non-stippled, flat-shaded */
-            if (ctx->Depth.Test
-                || (ctx->Fog.Enabled && ctx->Hint.Fog==GL_NICEST)) {
+            if (ctx->Depth.Test || ctx->FogMode == FOG_FRAGMENT) {
                if (rgbmode)
                   ctx->Driver.LineFunc = flat_rgba_z_line;
                else
Index: xc/extras/Mesa/src/linetemp.h
diff -u xc/extras/Mesa/src/linetemp.h:1.7 xc/extras/Mesa/src/linetemp.h:1.8
--- xc/extras/Mesa/src/linetemp.h:1.7	Fri Feb 18 04:18:44 2000
+++ xc/extras/Mesa/src/linetemp.h	Fri Jun 16 17:02:13 2000
@@ -22,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/linetemp.h,v 1.7 2000/02/18 12:18:44 tsi Exp $ */
+/* $XFree86: xc/extras/Mesa/src/linetemp.h,v 1.8 2000/06/17 00:02:13 martin Exp $ */
 
 /*
  * Line Rasterizer Template
@@ -51,6 +51,10 @@
  *    PIXEL_ADDRESS(X,Y)  - returns the address of pixel at (X,Y) where
  *                          Y==0 at bottom of screen and increases upward.
  *
+ * Similarly, for direct depth buffer access, this type is used for depth
+ * buffer addressing:
+ *    DEPTH_TYPE          - either GLushort or GLuint
+ *
  * Optionally, one may provide one-time setup code
  *    SETUP_CODE    - code which is to be executed once per line
  *
@@ -84,8 +88,14 @@
    GLint xstep, ystep;
 #endif
 #ifdef INTERP_Z
-   GLint z0, z1, dz, zPtrXstep, zPtrYstep;
-   GLdepth *zPtr;
+   GLint z0, z1, dz;
+   const GLint depthBits = ctx->Visual->DepthBits;
+   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
+#  define FixedToDepth(F)  ((F) >> fixedToDepthShift)
+#  ifdef DEPTH_TYPE
+     GLint zPtrXstep, zPtrYstep;
+     DEPTH_TYPE *zPtr;
+#  endif
 #endif
 #ifdef INTERP_RGB
    GLfixed r0 = IntToFixed(VB->ColorPtr->data[vert0][0]);
@@ -109,7 +119,7 @@
 #endif
 #ifdef INTERP_INDEX
    GLint i0 = VB->IndexPtr->data[vert0] << 8;
-   GLint di = (GLint) (VB->IndexPtr->data[vert1] << 8)-i0;
+   GLint di = (GLint) (VB->IndexPtr->data[vert1] << 8) - i0;
 #endif
 #ifdef INTERP_ST
    GLfixed s0 = FloatToFixed(VB->TexCoord[vert0][0] * S_SCALE);
@@ -209,14 +219,17 @@
 #endif
 
 #ifdef INTERP_Z
-   zPtr = Z_ADDRESS(ctx,x0,y0);
-#  if DEPTH_BITS==16
+#  ifdef DEPTH_TYPE
+     zPtr = (DEPTH_TYPE *) _mesa_zbuffer_address(ctx, x0, y0);
+#  endif
+   if (depthBits <= 16) {
       z0 = FloatToFixed(VB->Win.data[vert0][2]);
       z1 = FloatToFixed(VB->Win.data[vert1][2]);
-#  else
+   }
+   else {
       z0 = (int) VB->Win.data[vert0][2];
       z1 = (int) VB->Win.data[vert1][2];
-#  endif
+   }
 #endif
 #ifdef PIXEL_ADDRESS
    pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0);
@@ -227,8 +240,8 @@
 #ifdef INTERP_XY
       xstep = -1;
 #endif
-#ifdef INTERP_Z
-      zPtrXstep = -((GLint)sizeof(GLdepth));
+#if defined(INTERP_Z) && defined(DEPTH_TYPE)
+      zPtrXstep = -((GLint)sizeof(DEPTH_TYPE));
 #endif
 #ifdef PIXEL_ADDRESS
       pixelXstep = -((GLint)sizeof(PIXEL_TYPE));
@@ -238,8 +251,8 @@
 #ifdef INTERP_XY
       xstep = 1;
 #endif
-#ifdef INTERP_Z
-      zPtrXstep = ((GLint)sizeof(GLdepth));
+#if defined(INTERP_Z) && defined(DEPTH_TYPE)
+      zPtrXstep = ((GLint)sizeof(DEPTH_TYPE));
 #endif
 #ifdef PIXEL_ADDRESS
       pixelXstep = ((GLint)sizeof(PIXEL_TYPE));
@@ -251,8 +264,8 @@
 #ifdef INTERP_XY
       ystep = -1;
 #endif
-#ifdef INTERP_Z
-      zPtrYstep = -ctx->DrawBuffer->Width * ((GLint)sizeof(GLdepth));
+#if defined(INTERP_Z) && defined(DEPTH_TYPE)
+      zPtrYstep = -ctx->DrawBuffer->Width * ((GLint)sizeof(DEPTH_TYPE));
 #endif
 #ifdef PIXEL_ADDRESS
       pixelYstep = BYTES_PER_ROW;
@@ -262,8 +275,8 @@
 #ifdef INTERP_XY
       ystep = 1;
 #endif
-#ifdef INTERP_Z
-      zPtrYstep = ctx->DrawBuffer->Width * ((GLint)sizeof(GLdepth));
+#if defined(INTERP_Z) && defined(DEPTH_TYPE)
+      zPtrYstep = ctx->DrawBuffer->Width * ((GLint)sizeof(DEPTH_TYPE));
 #endif
 #ifdef PIXEL_ADDRESS
       pixelYstep = -(BYTES_PER_ROW);
@@ -328,11 +341,7 @@
          if (ctx->Line.StipplePattern & m) {
 #endif
 #ifdef INTERP_Z
-#  if DEPTH_BITS==16
-            GLdepth Z = FixedToInt(z0);
-#  else
-            GLdepth Z = z0;
-#  endif
+            GLdepth Z = FixedToDepth(z0);
 #endif
 #ifdef INTERP_INDEX
             GLint I = i0 >> 8;
@@ -371,7 +380,9 @@
          x0 += xstep;
 #endif
 #ifdef INTERP_Z
-         zPtr = (GLdepth *) ((GLubyte*) zPtr + zPtrXstep);
+#  ifdef DEPTH_TYPE
+         zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep);
+#  endif
          z0 += dz;
 #endif
 #ifdef INTERP_RGB
@@ -417,8 +428,8 @@
 #ifdef INTERP_XY
             y0 += ystep;
 #endif
-#ifdef INTERP_Z
-            zPtr = (GLdepth *) ((GLubyte*) zPtr + zPtrYstep);
+#if defined(INTERP_Z) && defined(DEPTH_TYPE)
+            zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep);
 #endif
 #ifdef PIXEL_ADDRESS
             pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelYstep);
@@ -480,11 +491,7 @@
          if (ctx->Line.StipplePattern & m) {
 #endif
 #ifdef INTERP_Z
-#  if DEPTH_BITS==16
-            GLdepth Z = FixedToInt(z0);
-#  else
-            GLdepth Z = z0;
-#  endif
+            GLdepth Z = FixedToDepth(z0);
 #endif
 #ifdef INTERP_INDEX
             GLint I = i0 >> 8;
@@ -523,7 +530,9 @@
          y0 += ystep;
 #endif
 #ifdef INTERP_Z
-         zPtr = (GLdepth *) ((GLubyte*) zPtr + zPtrYstep);
+#  ifdef DEPTH_TYPE
+         zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep);
+#  endif
          z0 += dz;
 #endif
 #ifdef INTERP_RGB
@@ -569,8 +578,8 @@
 #ifdef INTERP_XY
             x0 += xstep;
 #endif
-#ifdef INTERP_Z
-            zPtr = (GLdepth *) ((GLubyte*) zPtr + zPtrXstep);
+#if defined(INTERP_Z) && defined(DEPTH_TYPE)
+            zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep);
 #endif
 #ifdef PIXEL_ADDRESS
             pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelXstep);
@@ -592,6 +601,7 @@
 #undef INTERP_INDEX
 #undef PIXEL_ADDRESS
 #undef PIXEL_TYPE
+#undef DEPTH_TYPE
 #undef BYTES_PER_ROW
 #undef SETUP_CODE
 #undef PLOT
@@ -600,3 +610,4 @@
 #undef CLIP_HACK
 #undef STIPPLE
 #undef WIDE
+#undef FixedToDepth
Index: xc/extras/Mesa/src/lnaatemp.h
diff -u xc/extras/Mesa/src/lnaatemp.h:1.7 xc/extras/Mesa/src/lnaatemp.h:1.10
--- xc/extras/Mesa/src/lnaatemp.h:1.7	Fri Feb 18 04:18:45 2000
+++ xc/extras/Mesa/src/lnaatemp.h	Wed Jun 21 13:18:13 2000
@@ -22,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/lnaatemp.h,v 1.7 2000/02/18 12:18:45 tsi Exp $ */
+/* $XFree86: xc/extras/Mesa/src/lnaatemp.h,v 1.10 2000/06/21 20:18:13 tsi Exp $ */
 
 /*
  * Antialiased Line Rasterizer Template
@@ -61,6 +61,9 @@
    GLint dy = y1 - y0;
    GLint xStep, yStep;
    GLint z0, z1;
+   const GLint depthBits = ctx->Visual->DepthBits;
+   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
+#define FixedToDepth(F)  ((F) >> fixedToDepthShift)
 #ifdef INTERP_RGBA
    GLfixed fr, fg, fb, fa;      /* fixed-pt RGBA */
    GLfixed dfr, dfg, dfb, dfa;  /* fixed-pt RGBA deltas */
@@ -97,13 +100,16 @@
    if (dx == 0 && dy == 0)
       return;
 
-#if DEPTH_BITS==16
-   z0 = FloatToFixed(VB->Win.data[vert0][2]);
-   z1 = FloatToFixed(VB->Win.data[vert1][2]);
-#else
-   z0 = (int) VB->Win.data[vert0][2];
-   z1 = (int) VB->Win.data[vert1][2];
-#endif
+   ctx->PB->mono = GL_FALSE;
+
+   if (depthBits <= 16) {
+      z0 = FloatToFixed(VB->Win.data[vert0][2]);
+      z1 = FloatToFixed(VB->Win.data[vert1][2]);
+   }
+   else {
+      z0 = (int) VB->Win.data[vert0][2];
+      z1 = (int) VB->Win.data[vert1][2];
+   }
 
 #ifdef INTERP_STUV0
    if (VB->TexCoordPtr[0]->size > 2) {
@@ -193,10 +199,9 @@
       GLint i;
       GLint x = x0;
       GLfloat y = VB->Win.data[vert0][1];
-      GLfloat yStep = (VB->Win.data[vert1][1] - y) / (GLfloat) dx;
-      GLint dz = (z1 - z0) / dx;
-      GLfloat invDx = 1.0F / dx;
-      (void) invDx;
+      const GLfloat invDx = 1.0F / dx;
+      GLfloat yStep = (VB->Win.data[vert1][1] - y) * invDx;
+      GLint dz = (GLint) ((z1 - z0) * invDx);
 #ifdef INTERP_RGBA
       if (ctx->Light.ShadeModel == GL_SMOOTH) {
          dfr = (IntToFixed(VB->ColorPtr->data[vert1][0]) - fr) * invDx;
@@ -224,6 +229,12 @@
       dhu1 *= invDx;
       dhv1 *= invDx;
 #endif
+#ifdef INTERP_INDEX
+      if (ctx->Light.ShadeModel == GL_SMOOTH) {
+         dfi = (IntToFixed(VB->IndexPtr->data[vert1]) - fi) * invDx;
+      }
+#endif
+
       for (i = 0; i < dx; i++) {
          if (solid || (ctx->Line.StipplePattern & (1 << ((ctx->StippleCounter/ctx->Line.StippleFactor) & 0xf)))) {
 
@@ -247,12 +258,8 @@
 #ifdef INTERP_INDEX
             GLuint index = FixedToInt(fi) & 0xfffffff0;
             GLuint coverage;
-#endif
-#if DEPTH_BITS==16
-            GLdepth z = FixedToInt(z0);
-#else
-            GLdepth z = z0;
 #endif
+            GLdepth z = FixedToDepth(z0);
             ASSERT(yBoti <= yTopi);
 
             {
@@ -343,10 +350,9 @@
       GLint i;
       GLint y = y0;
       GLfloat x = VB->Win.data[vert0][0];
-      GLfloat xStep = (VB->Win.data[vert1][0] - x) / (GLfloat) dy;
-      GLint dz = (z1 - z0) / dy;
-      GLfloat invDy = 1.0F / dy;
-      (void) invDy;
+      const GLfloat invDy = 1.0F / dy;
+      GLfloat xStep = (VB->Win.data[vert1][0] - x) * invDy;
+      GLint dz = (GLint) ((z1 - z0) * invDy);
 #ifdef INTERP_RGBA
       if (ctx->Light.ShadeModel == GL_SMOOTH) {
          dfr = (IntToFixed(VB->ColorPtr->data[vert1][0]) - fr) * invDy;
@@ -376,7 +382,7 @@
 #endif
 #ifdef INTERP_INDEX
       if (ctx->Light.ShadeModel == GL_SMOOTH) {
-         dfi = (IntToFixed(VB->IndexPtr->data[vert1]) - fi) / dy;
+         dfi = (IntToFixed(VB->IndexPtr->data[vert1]) - fi) * invDy;
       }
 #endif
       for (i = 0; i < dy; i++) {
@@ -401,12 +407,8 @@
 #ifdef INTERP_INDEX
             GLuint index = FixedToInt(fi) & 0xfffffff0;
             GLuint coverage;
-#endif
-#if DEPTH_BITS==16
-            GLdepth z = FixedToInt(z0);
-#else
-            GLdepth z = z0;
 #endif
+            GLdepth z = FixedToDepth(z0);
 
             ASSERT(xLefti < xRight);
 
Index: xc/extras/Mesa/src/logic.c
diff -u xc/extras/Mesa/src/logic.c:1.3 xc/extras/Mesa/src/logic.c:1.4
--- xc/extras/Mesa/src/logic.c:1.3	Mon Feb 14 23:12:25 2000
+++ xc/extras/Mesa/src/logic.c	Fri Jun 16 17:02:13 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -68,6 +68,9 @@
          gl_error( ctx, GL_INVALID_ENUM, "glLogicOp" );
 	 return;
    }
+   
+   if (ctx->Driver.LogicOpcode)
+      ctx->Driver.LogicOpcode( ctx, opcode );
 }
 
 
@@ -200,8 +203,9 @@
  * Apply the current logic operator to a span of CI pixels.  This is only
  * used if the device driver can't do logic ops.
  */
-void gl_logicop_ci_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                         GLuint index[], const GLubyte mask[] )
+void
+_mesa_logicop_ci_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       GLuint index[], const GLubyte mask[] )
 {
    GLuint dest[MAX_WIDTH];
    /* Read dest values from frame buffer */
@@ -215,9 +219,10 @@
  * Apply the current logic operator to an array of CI pixels.  This is only
  * used if the device driver can't do logic ops.
  */
-void gl_logicop_ci_pixels( GLcontext *ctx,
-                           GLuint n, const GLint x[], const GLint y[],
-                           GLuint index[], const GLubyte mask[] )
+void
+_mesa_logicop_ci_pixels( GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLuint index[], const GLubyte mask[] )
 {
    GLuint dest[PB_SIZE];
    /* Read dest values from frame buffer */
@@ -364,9 +369,10 @@
  * Apply the current logic operator to a span of RGBA pixels.
  * This is only used if the device driver can't do logic ops.
  */
-void gl_logicop_rgba_span( GLcontext *ctx,
-                           GLuint n, GLint x, GLint y,
-                           GLubyte rgba[][4], const GLubyte mask[] )
+void
+_mesa_logicop_rgba_span( GLcontext *ctx,
+                         GLuint n, GLint x, GLint y,
+                         GLubyte rgba[][4], const GLubyte mask[] )
 {
    GLubyte dest[MAX_WIDTH][4];
    gl_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
@@ -379,14 +385,15 @@
  * Apply the current logic operator to an array of RGBA pixels.
  * This is only used if the device driver can't do logic ops.
  */
-void gl_logicop_rgba_pixels( GLcontext *ctx,
-                             GLuint n, const GLint x[], const GLint y[],
-                             GLubyte rgba[][4], const GLubyte mask[] )
+void
+_mesa_logicop_rgba_pixels( GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLubyte rgba[][4], const GLubyte mask[] )
 {
    GLubyte dest[PB_SIZE][4];
    (*ctx->Driver.ReadRGBAPixels)( ctx, n, x, y, dest, mask );
    if (ctx->RasterMask & ALPHABUF_BIT) {
-      gl_read_alpha_pixels( ctx, n, x, y, dest, mask );
+      _mesa_read_alpha_pixels( ctx, n, x, y, dest, mask );
    }
    rgba_logicop( ctx, n, mask, (GLuint *) rgba, (const GLuint *) dest );
 }
Index: xc/extras/Mesa/src/logic.h
diff -u xc/extras/Mesa/src/logic.h:1.3 xc/extras/Mesa/src/logic.h:1.4
--- xc/extras/Mesa/src/logic.h:1.3	Mon Feb 14 23:12:25 2000
+++ xc/extras/Mesa/src/logic.h	Fri Jun 16 17:02:13 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -35,24 +35,27 @@
 _mesa_LogicOp( GLenum opcode );
 
 
-extern void gl_logicop_ci_span( GLcontext *ctx,
-                                GLuint n, GLint x, GLint y, GLuint index[],
-                                const GLubyte mask[] );
+extern void 
+_mesa_logicop_ci_span( GLcontext *ctx,
+                       GLuint n, GLint x, GLint y, GLuint index[],
+                       const GLubyte mask[] );
 
 
-extern void gl_logicop_ci_pixels( GLcontext *ctx,
-                                  GLuint n, const GLint x[], const GLint y[],
-                                  GLuint index[], const GLubyte mask[] );
+extern void
+_mesa_logicop_ci_pixels( GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLuint index[], const GLubyte mask[] );
 
 
-extern void gl_logicop_rgba_span( GLcontext *ctx,
-                                  GLuint n, GLint x, GLint y,
-                                  GLubyte rgba[][4], const GLubyte mask[] );
+extern void
+_mesa_logicop_rgba_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         GLubyte rgba[][4], const GLubyte mask[] );
 
 
-extern void gl_logicop_rgba_pixels( GLcontext *ctx,
-                                    GLuint n, const GLint x[], const GLint y[],
-                                    GLubyte rgba[][4], const GLubyte mask[] );
+extern void
+_mesa_logicop_rgba_pixels( GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLubyte rgba[][4], const GLubyte mask[] );
 
 
 #endif
Index: xc/extras/Mesa/src/masking.c
diff -u xc/extras/Mesa/src/masking.c:1.3 xc/extras/Mesa/src/masking.c:1.4
--- xc/extras/Mesa/src/masking.c:1.3	Mon Feb 14 23:12:26 2000
+++ xc/extras/Mesa/src/masking.c	Fri Jun 16 17:02:13 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -83,8 +83,9 @@
 /*
  * Apply glColorMask to a span of RGBA pixels.
  */
-void gl_mask_rgba_span( GLcontext *ctx,
-                        GLuint n, GLint x, GLint y, GLubyte rgba[][4] )
+void
+_mesa_mask_rgba_span( GLcontext *ctx,
+                      GLuint n, GLint x, GLint y, GLubyte rgba[][4] )
 {
    GLubyte dest[MAX_WIDTH][4];
    GLuint srcMask = *((GLuint*)ctx->Color.ColorMask);
@@ -105,9 +106,10 @@
 /*
  * Apply glColorMask to an array of RGBA pixels.
  */
-void gl_mask_rgba_pixels( GLcontext *ctx,
-                          GLuint n, const GLint x[], const GLint y[],
-                          GLubyte rgba[][4], const GLubyte mask[] )
+void
+_mesa_mask_rgba_pixels( GLcontext *ctx,
+                        GLuint n, const GLint x[], const GLint y[],
+                        GLubyte rgba[][4], const GLubyte mask[] )
 {
    GLubyte dest[PB_SIZE][4];
    GLuint srcMask = *((GLuint*)ctx->Color.ColorMask);
@@ -118,7 +120,7 @@
 
    (*ctx->Driver.ReadRGBAPixels)( ctx, n, x, y, dest, mask );
    if (ctx->RasterMask & ALPHABUF_BIT) {
-      gl_read_alpha_pixels( ctx, n, x, y, dest, mask );
+      _mesa_read_alpha_pixels( ctx, n, x, y, dest, mask );
    }
 
    for (i=0; i<n; i++) {
@@ -131,8 +133,9 @@
 /*
  * Apply glIndexMask to a span of CI pixels.
  */
-void gl_mask_index_span( GLcontext *ctx,
-                         GLuint n, GLint x, GLint y, GLuint index[] )
+void
+_mesa_mask_index_span( GLcontext *ctx,
+                       GLuint n, GLint x, GLint y, GLuint index[] )
 {
    GLuint i;
    GLuint fbindexes[MAX_WIDTH];
@@ -153,9 +156,10 @@
 /*
  * Apply glIndexMask to an array of CI pixels.
  */
-void gl_mask_index_pixels( GLcontext *ctx,
-                           GLuint n, const GLint x[], const GLint y[],
-                           GLuint index[], const GLubyte mask[] )
+void
+_mesa_mask_index_pixels( GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLuint index[], const GLubyte mask[] )
 {
    GLuint i;
    GLuint fbindexes[PB_SIZE];
Index: xc/extras/Mesa/src/masking.h
diff -u xc/extras/Mesa/src/masking.h:1.3 xc/extras/Mesa/src/masking.h:1.4
--- xc/extras/Mesa/src/masking.h:1.3	Mon Feb 14 23:12:26 2000
+++ xc/extras/Mesa/src/masking.h	Fri Jun 16 17:02:13 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,35 +43,39 @@
 /*
  * Implement glColorMask for a span of RGBA pixels.
  */
-extern void gl_mask_rgba_span( GLcontext *ctx,
-                               GLuint n, GLint x, GLint y,
-                               GLubyte rgba[][4] );
+extern void
+_mesa_mask_rgba_span( GLcontext *ctx,
+                      GLuint n, GLint x, GLint y,
+                      GLubyte rgba[][4] );
 
 
 
 /*
  * Implement glColorMask for an array of RGBA pixels.
  */
-extern void gl_mask_rgba_pixels( GLcontext *ctx,
-                                 GLuint n, const GLint x[], const GLint y[],
-                                 GLubyte rgba[][4], const GLubyte mask[] );
+extern void
+_mesa_mask_rgba_pixels( GLcontext *ctx,
+                        GLuint n, const GLint x[], const GLint y[],
+                        GLubyte rgba[][4], const GLubyte mask[] );
 
 
 
 /*
  * Implement glIndexMask for a span of CI pixels.
  */
-extern void gl_mask_index_span( GLcontext *ctx,
-                                GLuint n, GLint x, GLint y, GLuint index[] );
+extern void
+_mesa_mask_index_span( GLcontext *ctx,
+                       GLuint n, GLint x, GLint y, GLuint index[] );
 
 
 
 /*
  * Implement glIndexMask for an array of CI pixels.
  */
-extern void gl_mask_index_pixels( GLcontext *ctx,
-                                  GLuint n, const GLint x[], const GLint y[],
-                                  GLuint index[], const GLubyte mask[] );
+extern void
+_mesa_mask_index_pixels( GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLuint index[], const GLubyte mask[] );
 
 
 
Index: xc/extras/Mesa/src/matrix.c
diff -u xc/extras/Mesa/src/matrix.c:1.4 xc/extras/Mesa/src/matrix.c:1.5
--- xc/extras/Mesa/src/matrix.c:1.4	Thu Mar  2 08:07:12 2000
+++ xc/extras/Mesa/src/matrix.c	Fri Jun 16 17:02:13 2000
@@ -930,6 +930,10 @@
 	 mat = &ctx->TextureMatrix[ctx->Texture.CurrentTransformUnit];	\
 	 flags |= NEW_TEXTURE_MATRIX;					\
 	 break;								\
+      case GL_COLOR:							\
+	 mat = &ctx->ColorMatrix;					\
+	 flags |= NEW_COLOR_MATRIX;					\
+	 break;								\
       default:								\
          gl_problem(ctx, where);					\
    }									\
@@ -1036,6 +1040,7 @@
       case GL_MODELVIEW:
       case GL_PROJECTION:
       case GL_TEXTURE:
+      case GL_COLOR:
          ctx->Transform.MatrixMode = mode;
          break;
       default:
@@ -1089,6 +1094,14 @@
 			    &ctx->TextureMatrix[t] );
          }
          break;
+      case GL_COLOR:
+         if (ctx->ColorStackDepth >= MAX_COLOR_STACK_DEPTH - 1) {
+            gl_error( ctx,  GL_STACK_OVERFLOW, "glPushMatrix");
+            return;
+         }
+         gl_matrix_copy( &ctx->ColorStack[ctx->ColorStackDepth++],
+                         &ctx->ColorMatrix );
+         break;
       default:
          gl_problem(ctx, "Bad matrix mode in gl_PushMatrix");
    }
@@ -1146,6 +1159,14 @@
 			   &ctx->TextureStack[t][--ctx->TextureStackDepth[t]]);
          }
          break;
+      case GL_COLOR:
+         if (ctx->ColorStackDepth==0) {
+            gl_error( ctx,  GL_STACK_UNDERFLOW, "glPopMatrix");
+            return;
+         }
+         gl_matrix_copy(&ctx->ColorMatrix,
+                        &ctx->ColorStack[--ctx->ColorStackDepth]);
+         break;
       default:
          gl_problem(ctx, "Bad matrix mode in gl_PopMatrix");
    }
@@ -1459,8 +1480,8 @@
    ctx->Viewport.WindowMap.m[MAT_TX] = ctx->Viewport.WindowMap.m[MAT_SX] + x;
    ctx->Viewport.WindowMap.m[MAT_SY] = (GLfloat) height / 2.0F;
    ctx->Viewport.WindowMap.m[MAT_TY] = ctx->Viewport.WindowMap.m[MAT_SY] + y;
-   ctx->Viewport.WindowMap.m[MAT_SZ] = 0.5 * DEPTH_SCALE;
-   ctx->Viewport.WindowMap.m[MAT_TZ] = 0.5 * DEPTH_SCALE;
+   ctx->Viewport.WindowMap.m[MAT_SZ] = 0.5 * ctx->Visual->DepthMaxF;
+   ctx->Viewport.WindowMap.m[MAT_TZ] = 0.5 * ctx->Visual->DepthMaxF;
 
    ctx->Viewport.WindowMap.flags = MAT_FLAG_GENERAL_SCALE|MAT_FLAG_TRANSLATION;
    ctx->Viewport.WindowMap.type = MATRIX_3D_NO_ROT;
@@ -1517,8 +1538,8 @@
 
    ctx->Viewport.Near = n;
    ctx->Viewport.Far = f;
-   ctx->Viewport.WindowMap.m[MAT_SZ] = DEPTH_SCALE * ((f - n) / 2.0);
-   ctx->Viewport.WindowMap.m[MAT_TZ] = DEPTH_SCALE * ((f - n) / 2.0 + n);
+   ctx->Viewport.WindowMap.m[MAT_SZ] = ctx->Visual->DepthMaxF * ((f - n) / 2.0);
+   ctx->Viewport.WindowMap.m[MAT_TZ] = ctx->Visual->DepthMaxF * ((f - n) / 2.0 + n);
 
    ctx->ModelProjectWinMatrixUptodate = GL_FALSE;
 
Index: xc/extras/Mesa/src/mem.h
diff -u xc/extras/Mesa/src/mem.h:1.2 xc/extras/Mesa/src/mem.h:1.3
--- xc/extras/Mesa/src/mem.h:1.2	Mon Feb 14 23:12:27 2000
+++ xc/extras/Mesa/src/mem.h	Fri Jun 16 17:02:14 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -34,12 +34,14 @@
 /*
  * Memory allocation
  */
-#ifdef DEBUG
-
-/* call Mesa memory functions */
 extern void *_mesa_malloc(size_t bytes);
 extern void *_mesa_calloc(size_t bytes);
 extern void _mesa_free(void *ptr);
+
+
+#ifdef DEBUG
+
+/* call Mesa memory functions */
 #define MALLOC(BYTES)      _mesa_malloc(BYTES)
 #define CALLOC(BYTES)      _mesa_calloc(BYTES)
 #define MALLOC_STRUCT(T)   (struct T *) _mesa_malloc(sizeof(struct T))
@@ -77,6 +79,15 @@
 	memset( (void *) (DST), (int) (VAL), (size_t) (N) )
 #endif
 
+
+/* On some systems we might want to use bzero() (but is bzero portable?) */
+#if defined(__FreeBSD__)
+#define BZERO( ADDR, N ) \
+	bzero( (void *) (ADDR), (size_t) (N) )
+#else
+#define BZERO( ADDR, N ) \
+	memset( (void *) (ADDR), 0, (size_t) (N) )
+#endif
 
 
 /* MACs and BeOS don't support static larger than 32kb, so... */
Index: xc/extras/Mesa/src/mmath.c
diff -u xc/extras/Mesa/src/mmath.c:1.3 xc/extras/Mesa/src/mmath.c:1.4
--- xc/extras/Mesa/src/mmath.c:1.3	Mon Feb 14 23:12:27 2000
+++ xc/extras/Mesa/src/mmath.c	Fri Jun 16 17:02:14 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -140,7 +140,8 @@
 /*
  * Initialize tables, etc for fast math functions.
  */
-void gl_init_math(void)
+void
+_mesa_init_math(void)
 {
    static GLboolean initialized = GL_FALSE;
 
@@ -150,5 +151,37 @@
 
       initialized = GL_TRUE;
       in_fast_math = 0;
+
+#if defined(_FPU_GETCW) && defined(_FPU_SETCW)
+      {
+         const char *debug = getenv("MESA_DEBUG");
+         if (debug && strcmp(debug, "FP")==0) {
+            /* die on FP exceptions */
+            fpu_control_t mask;
+            _FPU_GETCW(mask);
+            mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM
+                      | _FPU_MASK_OM | _FPU_MASK_UM);
+            _FPU_SETCW(mask);
+         }
+      }
+#endif
    }
 }
+
+
+
+/*
+ * Return number of bits set in given GLuint.
+ */
+GLuint
+_mesa_bitcount(GLuint n)
+{
+   GLuint bits;
+   for (bits = 0; n > 0; n = n >> 1) {
+      if (n & 1) {
+         bits++;
+      }
+   }
+   return bits;
+}
+
Index: xc/extras/Mesa/src/mmath.h
diff -u xc/extras/Mesa/src/mmath.h:1.4 xc/extras/Mesa/src/mmath.h:1.5
--- xc/extras/Mesa/src/mmath.h:1.4	Fri Mar  3 10:30:08 2000
+++ xc/extras/Mesa/src/mmath.h	Fri Jun 16 17:02:14 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/mmath.h,v 1.4 2000/03/03 18:30:08 tsi Exp $ */
+/* $XFree86: xc/extras/Mesa/src/mmath.h,v 1.5 2000/06/17 00:02:14 martin Exp $ */
 
 /*
  * Faster arithmetic functions.  If the FAST_MATH preprocessor symbol is
@@ -47,10 +47,7 @@
  * In the worst case, we force the compiler to use a memory access to
  * truncate the float, by specifying the 'volatile' keyword.
  */
-#if defined(__linux__) && defined(__i386__) && !defined(IN_MODULE)
-/*
- * A libc interface is needed for this...
- */
+#if defined(__linux__) && defined(__i386__) 
 #include <fpu_control.h>
 
 #if !defined(_FPU_SETCW)
@@ -82,6 +79,7 @@
    }
 #endif
 
+
 /* Put it back how the application had it.
  */
 #define END_FAST_MATH(x)			\
@@ -89,6 +87,7 @@
       _FPU_SETCW( x );				\
    }
 
+
 #define HAVE_FAST_MATH
 
 #elif defined(__WATCOMC__) && !defined(NO_FAST_MATH) 
@@ -329,8 +328,14 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(b[2],f[2]);	\
 } while(0)
 
+
+
+extern void
+_mesa_init_math(void);
+
 
-extern void gl_init_math(void);
+extern GLuint
+_mesa_bitcount(GLuint n);
 
 
 #endif
Index: xc/extras/Mesa/src/norm_tmp.h
diff -u xc/extras/Mesa/src/norm_tmp.h:1.3 xc/extras/Mesa/src/norm_tmp.h:1.4
--- xc/extras/Mesa/src/norm_tmp.h:1.3	Mon Feb 14 23:12:28 2000
+++ xc/extras/Mesa/src/norm_tmp.h	Fri Jun 16 17:02:14 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,12 +28,13 @@
  */
 
 
-static void _XFORMAPI TAG(transform_normalize_normals)( const GLmatrix *mat,
-					      GLfloat scale,
-					      const GLvector3f *in,
-					      const GLfloat *lengths,
-					      const GLubyte mask[],
-					      GLvector3f *dest )
+static void _XFORMAPI
+TAG(transform_normalize_normals)( const GLmatrix *mat,
+                                  GLfloat scale,
+                                  const GLvector3f *in,
+                                  const GLfloat *lengths,
+                                  const GLubyte mask[],
+                                  GLvector3f *dest )
 {
    GLuint i;  
    const GLfloat *from = in->start;
@@ -71,8 +72,8 @@
 	    }
 	 }
       }
-   } else {
-      
+   }
+   else {
       /* scale has been snapped to 1.0 if it is close.
        */
       if (scale != 1.0) {
@@ -102,12 +103,14 @@
    dest->count = in->count;
 }
 
-static void _XFORMAPI TAG(transform_normalize_normals_no_rot)( const GLmatrix *mat,
-						     GLfloat scale,
-						     const GLvector3f *in,
-						     const GLfloat *lengths,
-						     const GLubyte mask[],
-						     GLvector3f *dest )
+
+static void _XFORMAPI
+TAG(transform_normalize_normals_no_rot)( const GLmatrix *mat,
+                                         GLfloat scale,
+                                         const GLvector3f *in,
+                                         const GLfloat *lengths,
+                                         const GLubyte mask[],
+                                         GLvector3f *dest )
 {
    GLuint i;  
    const GLfloat *from = in->start;
@@ -144,7 +147,8 @@
 	    }
 	 }
       }
-   } else {
+   }
+   else {
       /* scale has been snapped to 1.0 if it is close.
        */
       if (scale != 1.0) {
@@ -175,12 +179,13 @@
 }
 
 
-static void _XFORMAPI TAG(transform_rescale_normals_no_rot)( const GLmatrix *mat,
-						   GLfloat scale,
-						   const GLvector3f *in,
-						   const GLfloat *lengths,
-						   const GLubyte mask[],
-						   GLvector3f *dest )
+static void _XFORMAPI
+TAG(transform_rescale_normals_no_rot)( const GLmatrix *mat,
+                                       GLfloat scale,
+                                       const GLvector3f *in,
+                                       const GLfloat *lengths,
+                                       const GLubyte mask[],
+                                       GLvector3f *dest )
 {
    GLuint i;  
    const GLfloat *from = in->start;
@@ -204,12 +209,13 @@
    dest->count = in->count;
 }
 
-static void _XFORMAPI TAG(transform_rescale_normals)( const GLmatrix *mat,
-					    GLfloat scale,
-					    const GLvector3f *in,
-					    const GLfloat *lengths,
-					    const GLubyte mask[],
-					    GLvector3f *dest )
+static void _XFORMAPI
+TAG(transform_rescale_normals)( const GLmatrix *mat,
+                                GLfloat scale,
+                                const GLvector3f *in,
+                                const GLfloat *lengths,
+                                const GLubyte mask[],
+                                GLvector3f *dest )
 {
    GLuint i;  
    const GLfloat *from = in->start;
@@ -237,12 +243,13 @@
 }
 
 
-static void _XFORMAPI TAG(transform_normals_no_rot)(const GLmatrix *mat,
-					  GLfloat scale,
-					  const GLvector3f *in,
-					  const GLfloat *lengths,
-					  const GLubyte mask[],
-					  GLvector3f *dest )
+static void _XFORMAPI
+TAG(transform_normals_no_rot)(const GLmatrix *mat,
+                              GLfloat scale,
+                              const GLvector3f *in,
+                              const GLfloat *lengths,
+                              const GLubyte mask[],
+                              GLvector3f *dest )
 {
    GLuint i;  
    const GLfloat *from = in->start;
@@ -266,13 +273,15 @@
    }
    dest->count = in->count;
 }
+
 
-static void _XFORMAPI TAG(transform_normals)( const GLmatrix *mat,
-				    GLfloat scale,
-				    const GLvector3f *in,
-				    const GLfloat *lengths,
-				    const GLubyte mask[],
-				    GLvector3f *dest )
+static void _XFORMAPI
+TAG(transform_normals)( const GLmatrix *mat,
+                        GLfloat scale,
+                        const GLvector3f *in,
+                        const GLfloat *lengths,
+                        const GLubyte mask[],
+                        GLvector3f *dest )
 {
    GLuint i;  
    const GLfloat *from = in->start;
@@ -298,12 +307,13 @@
 }
 
 
-static void _XFORMAPI TAG(normalize_normals)( const GLmatrix *mat,
-				    GLfloat scale,
-				    const GLvector3f *in,
-				    const GLfloat *lengths,
-				    const GLubyte mask[],
-				    GLvector3f *dest )
+static void _XFORMAPI
+TAG(normalize_normals)( const GLmatrix *mat,
+                        GLfloat scale,
+                        const GLvector3f *in,
+                        const GLfloat *lengths,
+                        const GLubyte mask[],
+                        GLvector3f *dest )
 {
    GLuint i;  
    const GLfloat *from = in->start;
@@ -347,12 +357,13 @@
 }
 
 
-static void _XFORMAPI TAG(rescale_normals)( const GLmatrix *mat,
-				  GLfloat scale,
-				  const GLvector3f *in,
-				  const GLfloat *lengths,
-				  const GLubyte mask[],
-				  GLvector3f *dest )
+static void _XFORMAPI
+TAG(rescale_normals)( const GLmatrix *mat,
+                      GLfloat scale,
+                      const GLvector3f *in,
+                      const GLfloat *lengths,
+                      const GLubyte mask[],
+                      GLvector3f *dest )
 {
    GLuint i;  
    const GLfloat *from = in->start;
@@ -372,7 +383,8 @@
 }
 
 
-static void _XFORMAPI TAG(init_c_norm_transform)( void )
+static void _XFORMAPI
+TAG(init_c_norm_transform)( void )
 {
    gl_normal_tab[NORM_TRANSFORM_NO_ROT][IDX] = 
       TAG(transform_normals_no_rot);
@@ -397,5 +409,4 @@
 
    gl_normal_tab[NORM_NORMALIZE][IDX] = 
       TAG(normalize_normals);
-
 }
Index: xc/extras/Mesa/src/pb.c
diff -u xc/extras/Mesa/src/pb.c:1.3 xc/extras/Mesa/src/pb.c:1.4
--- xc/extras/Mesa/src/pb.c:1.3	Mon Feb 14 23:12:29 2000
+++ xc/extras/Mesa/src/pb.c	Fri Jun 16 17:02:14 2000
@@ -69,10 +69,11 @@
       int i, j;
       /* set non-zero fields */
       pb->primitive = GL_BITMAP;
+      pb->mono = GL_TRUE;
+
       /* Set all lambda values to 0.0 since we don't do mipmapping for
        * points or lines and want to use the level 0 texture image.
        */
-
       for (j=0;j<MAX_TEXTURE_UNITS;j++) {
          for (i=0; i<PB_SIZE; i++) {
             pb->lambda[j][i] = 0.0;
@@ -115,10 +116,10 @@
          /* make copy of incoming indexes */
          MEMCPY( indexTmp, indexes, n * sizeof(GLuint) );
          if (ctx->Color.SWLogicOpEnabled) {
-            gl_logicop_ci_pixels( ctx, n, x, y, indexTmp, mask );
+            _mesa_logicop_ci_pixels( ctx, n, x, y, indexTmp, mask );
          }
          if (ctx->Color.SWmasking) {
-            gl_mask_index_pixels( ctx, n, x, y, indexTmp, mask );
+            _mesa_mask_index_pixels( ctx, n, x, y, indexTmp, mask );
          }
          (*ctx->Driver.WriteCI32Pixels)( ctx, n, x, y, indexTmp, mask );
       }
@@ -170,20 +171,20 @@
          MEMCPY( rgbaTmp, rgba, 4 * n * sizeof(GLubyte) );
 
          if (ctx->Color.SWLogicOpEnabled) {
-            gl_logicop_rgba_pixels( ctx, n, x, y, rgbaTmp, mask );
+            _mesa_logicop_rgba_pixels( ctx, n, x, y, rgbaTmp, mask );
          }
          else if (ctx->Color.BlendEnabled) {
             _mesa_blend_pixels( ctx, n, x, y, rgbaTmp, mask );
          }
          if (ctx->Color.SWmasking) {
-            gl_mask_rgba_pixels( ctx, n, x, y, rgbaTmp, mask );
+            _mesa_mask_rgba_pixels( ctx, n, x, y, rgbaTmp, mask );
          }
 
          (*ctx->Driver.WriteRGBAPixels)( ctx, n, x, y, 
 					 (const GLubyte (*)[4])rgbaTmp, mask );
          if (ctx->RasterMask & ALPHABUF_BIT) {
-            gl_write_alpha_pixels( ctx, n, x, y, 
-				   (const GLubyte (*)[4])rgbaTmp, mask );
+            _mesa_write_alpha_pixels( ctx, n, x, y, 
+                                      (const GLubyte (*)[4])rgbaTmp, mask );
          }
       }
    }
@@ -221,10 +222,13 @@
  */
 void gl_flush_pb( GLcontext *ctx )
 {
-   struct pixel_buffer* PB = ctx->PB;
+   /* Pixel colors may be changed if any of these raster ops enabled */
+   const GLuint modBits = FOG_BIT | TEXTURE_BIT | BLEND_BIT |
+                          MASKING_BIT | LOGIC_OP_BIT;
+   struct pixel_buffer *PB = ctx->PB;
    GLubyte mask[PB_SIZE];
 
-   if (PB->count==0)
+   if (PB->count == 0)
       goto CleanUp;
 
    /* initialize mask array and clip pixels simultaneously */
@@ -245,19 +249,9 @@
       /*
        * RGBA COLOR PIXELS
        */
-      if (PB->mono && ctx->MutablePixels) {
-	 /* Copy mono color to all pixels */
-         GLuint i;
-         for (i=0; i<PB->count; i++) {
-            PB->rgba[i][RCOMP] = PB->color[RCOMP];
-            PB->rgba[i][GCOMP] = PB->color[GCOMP];
-            PB->rgba[i][BCOMP] = PB->color[BCOMP];
-            PB->rgba[i][ACOMP] = PB->color[ACOMP];
-         }
-      }
 
       /* If each pixel can be of a different color... */
-      if (ctx->MutablePixels || !PB->mono) {
+      if ((ctx->RasterMask & modBits) || !PB->mono) {
 
 	 if (ctx->Texture.ReallyEnabled) {
             int texUnit;
@@ -292,7 +286,7 @@
 
 	 if (ctx->Stencil.Enabled) {
 	    /* first stencil test */
-	    if (gl_stencil_and_depth_test_pixels(ctx, PB->count,
+	    if (_mesa_stencil_and_ztest_pixels(ctx, PB->count,
                                        PB->x, PB->y, PB->z, mask) == 0) {
 	       goto CleanUp;
 	    }
@@ -311,21 +305,21 @@
             /* normal case: write to exactly one buffer */
 
             if (ctx->Color.SWLogicOpEnabled) {
-               gl_logicop_rgba_pixels( ctx, PB->count, PB->x, PB->y,
-                                       PB->rgba, mask);
+               _mesa_logicop_rgba_pixels( ctx, PB->count, PB->x, PB->y,
+                                          PB->rgba, mask);
             }
             else if (ctx->Color.BlendEnabled) {
                _mesa_blend_pixels( ctx, PB->count, PB->x, PB->y, PB->rgba, mask);
             }
             if (ctx->Color.SWmasking) {
-               gl_mask_rgba_pixels(ctx, PB->count, PB->x, PB->y, PB->rgba, mask);
+               _mesa_mask_rgba_pixels(ctx, PB->count, PB->x, PB->y, PB->rgba, mask);
             }
 
             (*ctx->Driver.WriteRGBAPixels)( ctx, PB->count, PB->x, PB->y,
                                             (const GLubyte (*)[4]) PB->rgba,
 					    mask );
             if (ctx->RasterMask & ALPHABUF_BIT) {
-               gl_write_alpha_pixels( ctx, PB->count, PB->x, PB->y, 
+               _mesa_write_alpha_pixels( ctx, PB->count, PB->x, PB->y, 
 				      (const GLubyte (*)[4]) PB->rgba, mask );
             }
          }
@@ -344,7 +338,7 @@
 
 	 if (ctx->Stencil.Enabled) {
 	    /* first stencil test */
-	    if (gl_stencil_and_depth_test_pixels(ctx, PB->count,
+	    if (_mesa_stencil_and_ztest_pixels(ctx, PB->count,
                                        PB->x, PB->y, PB->z, mask) == 0) {
 	       goto CleanUp;
 	    }
@@ -360,30 +354,21 @@
 
          if (ctx->RasterMask & MULTI_DRAW_BIT) {
             /* Copy mono color to all pixels */
-            GLuint i;
-            for (i=0; i<PB->count; i++) {
-               PB->rgba[i][RCOMP] = PB->color[RCOMP];
-               PB->rgba[i][GCOMP] = PB->color[GCOMP];
-               PB->rgba[i][BCOMP] = PB->color[BCOMP];
-               PB->rgba[i][ACOMP] = PB->color[ACOMP];
-            }
             multi_write_rgba_pixels( ctx, PB->count, PB->x, PB->y,
                                      (const GLubyte (*)[4]) PB->rgba, mask );
          }
          else {
             /* normal case: write to exactly one buffer */
-
-            GLubyte red, green, blue, alpha;
-            red   = PB->color[RCOMP];
-            green = PB->color[GCOMP];
-            blue  = PB->color[BCOMP];
-            alpha = PB->color[ACOMP];
+            GLubyte red   = PB->currentColor[RCOMP];
+            GLubyte green = PB->currentColor[GCOMP];
+            GLubyte blue  = PB->currentColor[BCOMP];
+            GLubyte alpha = PB->currentColor[ACOMP];
 	    (*ctx->Driver.Color)( ctx, red, green, blue, alpha );
 
             (*ctx->Driver.WriteMonoRGBAPixels)( ctx, PB->count, PB->x, PB->y, mask );
             if (ctx->RasterMask & ALPHABUF_BIT) {
-               gl_write_mono_alpha_pixels( ctx, PB->count, PB->x, PB->y,
-                                           PB->color[ACOMP], mask );
+               _mesa_write_mono_alpha_pixels( ctx, PB->count, PB->x, PB->y,
+                                              PB->currentColor[ACOMP], mask );
             }
          }
          /*** ALL DONE ***/
@@ -395,28 +380,18 @@
        */
 
       /* If we may be writting pixels with different indexes... */
-      if (PB->mono && ctx->MutablePixels) {
-	 /* copy index to all pixels */
-         GLuint n = PB->count, indx = PB->index;
-         GLuint *pbindex = PB->i;
-         do {
-	    *pbindex++ = indx;
-            n--;
-	 } while (n);
-      }
+      if ((ctx->RasterMask & modBits) || !PB->mono) {
 
-      if (ctx->MutablePixels || !PB->mono) {
-
 	 if (ctx->Fog.Enabled
              && (ctx->Hint.Fog==GL_NICEST || PB->primitive==GL_BITMAP)) {
-	    _mesa_fog_ci_pixels( ctx, PB->count, PB->z, PB->i );
+	    _mesa_fog_ci_pixels( ctx, PB->count, PB->z, PB->index );
 	 }
 
          /* Scissoring already done above */
 
 	 if (ctx->Stencil.Enabled) {
 	    /* first stencil test */
-	    if (gl_stencil_and_depth_test_pixels(ctx, PB->count,
+	    if (_mesa_stencil_and_ztest_pixels(ctx, PB->count,
                                        PB->x, PB->y, PB->z, mask) == 0) {
 	       goto CleanUp;
 	    }
@@ -427,20 +402,20 @@
 	 }
 
          if (ctx->RasterMask & MULTI_DRAW_BIT) {
-            multi_write_index_pixels( ctx, PB->count, PB->x, PB->y, PB->i, mask );
+            multi_write_index_pixels( ctx, PB->count, PB->x, PB->y, PB->index, mask );
          }
          else {
             /* normal case: write to exactly one buffer */
 
             if (ctx->Color.SWLogicOpEnabled) {
-               gl_logicop_ci_pixels( ctx, PB->count, PB->x, PB->y, PB->i, mask );
+               _mesa_logicop_ci_pixels( ctx, PB->count, PB->x, PB->y, PB->index, mask );
             }
             if (ctx->Color.SWmasking) {
-               gl_mask_index_pixels( ctx, PB->count, PB->x, PB->y, PB->i, mask );
+               _mesa_mask_index_pixels( ctx, PB->count, PB->x, PB->y, PB->index, mask );
             }
 
             (*ctx->Driver.WriteCI32Pixels)( ctx, PB->count, PB->x, PB->y,
-                                            PB->i, mask );
+                                            PB->index, mask );
          }
 
          /*** ALL DONE ***/
@@ -452,7 +427,7 @@
 
 	 if (ctx->Stencil.Enabled) {
 	    /* first stencil test */
-	    if (gl_stencil_and_depth_test_pixels(ctx, PB->count,
+	    if (_mesa_stencil_and_ztest_pixels(ctx, PB->count,
                                        PB->x, PB->y, PB->z, mask) == 0) {
 	       goto CleanUp;
 	    }
@@ -463,19 +438,12 @@
 	 }
          
          if (ctx->RasterMask & MULTI_DRAW_BIT) {
-            GLuint n = PB->count, indx = PB->index;
-            GLuint *pbindex = PB->i;
-            do {
-               *pbindex++ = indx;
-               n--;
-            } while (n);
-
-            multi_write_index_pixels( ctx, PB->count, PB->x, PB->y, PB->i, mask );
+            multi_write_index_pixels( ctx, PB->count, PB->x, PB->y, PB->index, mask );
          }
          else {
             /* normal case: write to exactly one buffer */
 
-            (*ctx->Driver.Index)( ctx, PB->index );
+            (*ctx->Driver.Index)( ctx, PB->currentIndex );
             (*ctx->Driver.WriteMonoCIPixels)( ctx, PB->count, PB->x, PB->y, mask );
          }
       }
@@ -483,6 +451,7 @@
 
 CleanUp:
    PB->count = 0;
+   PB->mono = GL_TRUE;
 }
 
 
Index: xc/extras/Mesa/src/pb.h
diff -u xc/extras/Mesa/src/pb.h:1.3 xc/extras/Mesa/src/pb.h:1.4
--- xc/extras/Mesa/src/pb.h:1.3	Mon Feb 14 23:12:29 2000
+++ xc/extras/Mesa/src/pb.h	Fri Jun 16 17:02:14 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,9 +24,6 @@
  */
 
 
-
-
-
 #ifndef PB_H
 #define PB_H
 
@@ -34,7 +31,6 @@
 #include "types.h"
 
 
-
 /*
  * Pixel buffer size, must be larger than MAX_WIDTH.
  */
@@ -42,160 +38,197 @@
 
 
 struct pixel_buffer {
-	GLint x[PB_SIZE];         /* X window coord in [0,MAX_WIDTH) */
-	GLint y[PB_SIZE];         /* Y window coord in [0,MAX_HEIGHT) */
-	GLdepth z[PB_SIZE];       /* Z window coord in [0,MAX_DEPTH] */
-	GLubyte rgba[PB_SIZE][4]; /* Colors */
-	GLubyte spec[PB_SIZE][3]; /* Separate specular colors */
-	GLuint i[PB_SIZE];        /* Index */
-	GLfloat s[MAX_TEXTURE_UNITS][PB_SIZE];	/* Texture S coordinates */
-	GLfloat t[MAX_TEXTURE_UNITS][PB_SIZE];	/* Texture T coordinates */
-	GLfloat u[MAX_TEXTURE_UNITS][PB_SIZE];	/* Texture R coordinates */
-	GLfloat lambda[MAX_TEXTURE_UNITS][PB_SIZE];/* Texture lambda values */
-	GLint color[4];		/* Mono color, integers! */
-	GLuint index;		/* Mono index */
-	GLuint count;		/* Number of pixels in buffer */
-	GLboolean mono;		/* Same color or index for all pixels? */
-	GLenum primitive;	/* GL_POINT, GL_LINE, GL_POLYGON or GL_BITMAP*/
+   GLenum primitive;           /* GL_POINT, GL_LINE, GL_POLYGON or GL_BITMAP */
+   GLubyte currentColor[4];    /* Current color, for subsequent pixels */
+   GLuint currentIndex;        /* Current index, for subsequent pixels */
+   GLuint count;               /* Number of pixels in buffer */
+   GLboolean mono;             /* Same color or index for all pixels? */
+
+   GLint x[PB_SIZE];           /* X window coord in [0,MAX_WIDTH) */
+   GLint y[PB_SIZE];           /* Y window coord in [0,MAX_HEIGHT) */
+   GLdepth z[PB_SIZE];         /* Z window coord in [0,Visual.MaxDepth] */
+   GLubyte rgba[PB_SIZE][4];   /* Colors */
+   GLubyte spec[PB_SIZE][3];   /* Separate specular colors */
+   GLuint index[PB_SIZE];      /* Color indexes */
+   GLfloat s[MAX_TEXTURE_UNITS][PB_SIZE];	/* Texture S coordinates */
+   GLfloat t[MAX_TEXTURE_UNITS][PB_SIZE];	/* Texture T coordinates */
+   GLfloat u[MAX_TEXTURE_UNITS][PB_SIZE];	/* Texture R coordinates */
+   GLfloat lambda[MAX_TEXTURE_UNITS][PB_SIZE];  /* Texture lambda values */
 };
 
 
 
-
-
 /*
  * Set the color used for all subsequent pixels in the buffer.
  */
-#define PB_SET_COLOR( CTX, PB, R, G, B, A )			\
-	if ((PB)->color[RCOMP]!=(R) || (PB)->color[GCOMP]!=(G)	\
-	 || (PB)->color[BCOMP]!=(B) || (PB)->color[ACOMP]!=(A)	\
-	 || !(PB)->mono) {					\
-		gl_flush_pb( ctx );				\
-	}								\
-	(PB)->color[RCOMP] = R;					\
-	(PB)->color[GCOMP] = G;					\
-	(PB)->color[BCOMP] = B;					\
-	(PB)->color[ACOMP] = A;					\
-	(PB)->mono = GL_TRUE;
+#define PB_SET_COLOR( PB, R, G, B, A )		\
+do {						\
+   if ((PB)->count > 0)				\
+      (PB)->mono = GL_FALSE;			\
+   (PB)->currentColor[RCOMP] = (R);		\
+   (PB)->currentColor[GCOMP] = (G);		\
+   (PB)->currentColor[BCOMP] = (B);		\
+   (PB)->currentColor[ACOMP] = (A);		\
+} while (0)
 
 
 /*
  * Set the color index used for all subsequent pixels in the buffer.
  */
-#define PB_SET_INDEX( CTX, PB, I )		\
-	if ((PB)->index!=(I) || !(PB)->mono) {	\
-		gl_flush_pb( CTX );		\
-	}					\
-	(PB)->index = I;			\
-	(PB)->mono = GL_TRUE;
+#define PB_SET_INDEX( PB, I )			\
+do {						\
+   if ((PB)->count > 0)				\
+      (PB)->mono = GL_FALSE;			\
+   (PB)->currentIndex = (I);			\
+} while (0)
 
 
 /*
  * "write" a pixel using current color or index
  */
-#define PB_WRITE_PIXEL( PB, X, Y, Z )		\
-	(PB)->x[(PB)->count] = X;		\
-	(PB)->y[(PB)->count] = Y;		\
-	(PB)->z[(PB)->count] = Z;		\
-	(PB)->count++;
+#define PB_WRITE_PIXEL( PB, X, Y, Z )			\
+do {							\
+   GLuint count = (PB)->count;				\
+   (PB)->x[count] = X;					\
+   (PB)->y[count] = Y;					\
+   (PB)->z[count] = Z;					\
+   COPY_4UBV((PB)->rgba[count], (PB)->currentColor);	\
+   (PB)->index[count] = (PB)->currentIndex;		\
+   (PB)->count++;					\
+} while (0)
+
+
+/*
+   (PB)->rgba[count][0] = (PB)->currentColor[0];	\
+   (PB)->rgba[count][1] = (PB)->currentColor[1];	\
+   (PB)->rgba[count][2] = (PB)->currentColor[2];	\
+   (PB)->rgba[count][3] = (PB)->currentColor[3];	\
+
+*/
 
 
 /*
  * "write" an RGBA pixel
  */
 #define PB_WRITE_RGBA_PIXEL( PB, X, Y, Z, R, G, B, A )	\
-	(PB)->x[(PB)->count] = X;			\
-	(PB)->y[(PB)->count] = Y;			\
-	(PB)->z[(PB)->count] = Z;			\
-	(PB)->rgba[(PB)->count][RCOMP] = R;		\
-	(PB)->rgba[(PB)->count][GCOMP] = G;		\
-	(PB)->rgba[(PB)->count][BCOMP] = B;		\
-	(PB)->rgba[(PB)->count][ACOMP] = A;		\
-	(PB)->count++;
+do {							\
+   GLuint count = (PB)->count;				\
+   (PB)->x[count] = X;					\
+   (PB)->y[count] = Y;					\
+   (PB)->z[count] = Z;					\
+   (PB)->rgba[count][RCOMP] = R;			\
+   (PB)->rgba[count][GCOMP] = G;			\
+   (PB)->rgba[count][BCOMP] = B;			\
+   (PB)->rgba[count][ACOMP] = A;			\
+   (PB)->mono = GL_FALSE;				\
+   (PB)->count++;					\
+} while (0)
+
 
 /*
  * "write" a color-index pixel
  */
 #define PB_WRITE_CI_PIXEL( PB, X, Y, Z, I )	\
-	(PB)->x[(PB)->count] = X;		\
-	(PB)->y[(PB)->count] = Y;		\
-	(PB)->z[(PB)->count] = Z;		\
-	(PB)->i[(PB)->count] = I;		\
-	(PB)->count++;
+do {						\
+   GLuint count = (PB)->count;			\
+   (PB)->x[count] = X;				\
+   (PB)->y[count] = Y;				\
+   (PB)->z[count] = Z;				\
+   (PB)->index[count] = I;			\
+   (PB)->mono = GL_FALSE;			\
+   (PB)->count++;				\
+} while (0)
+
 
 
 /*
  * "write" an RGBA pixel with texture coordinates
  */
 #define PB_WRITE_TEX_PIXEL( PB, X, Y, Z, R, G, B, A, S, T, U )	\
-	(PB)->x[(PB)->count] = X;				\
-	(PB)->y[(PB)->count] = Y;				\
-	(PB)->z[(PB)->count] = Z;				\
-	(PB)->rgba[(PB)->count][RCOMP] = R;			\
-	(PB)->rgba[(PB)->count][GCOMP] = G;			\
-	(PB)->rgba[(PB)->count][BCOMP] = B;			\
-	(PB)->rgba[(PB)->count][ACOMP] = A;			\
-	(PB)->s[0][(PB)->count] = S;				\
-	(PB)->t[0][(PB)->count] = T;				\
-	(PB)->u[0][(PB)->count] = U;				\
-	(PB)->count++;
+do {							\
+   GLuint count = (PB)->count;				\
+   (PB)->x[count] = X;					\
+   (PB)->y[count] = Y;					\
+   (PB)->z[count] = Z;					\
+   (PB)->rgba[count][RCOMP] = R;			\
+   (PB)->rgba[count][GCOMP] = G;			\
+   (PB)->rgba[count][BCOMP] = B;			\
+   (PB)->rgba[count][ACOMP] = A;			\
+   (PB)->s[0][count] = S;				\
+   (PB)->t[0][count] = T;				\
+   (PB)->u[0][count] = U;				\
+   (PB)->mono = GL_FALSE;				\
+   (PB)->count++;					\
+} while (0)
 
+
 /*
  * "write" an RGBA pixel with multiple texture coordinates
  */
-#define PB_WRITE_MULTITEX_PIXEL( PB, X, Y, Z, R, G, B, A, S, T, U, S1, T1, U1 )	\
-	(PB)->x[(PB)->count] = X;				\
-	(PB)->y[(PB)->count] = Y;				\
-	(PB)->z[(PB)->count] = Z;				\
-	(PB)->rgba[(PB)->count][RCOMP] = R;			\
-	(PB)->rgba[(PB)->count][GCOMP] = G;			\
-	(PB)->rgba[(PB)->count][BCOMP] = B;			\
-	(PB)->rgba[(PB)->count][ACOMP] = A;			\
-	(PB)->s[0][(PB)->count] = S;				\
-	(PB)->t[0][(PB)->count] = T;				\
-	(PB)->u[0][(PB)->count] = U;				\
-	(PB)->s[1][(PB)->count] = S1;				\
-	(PB)->t[1][(PB)->count] = T1;				\
-	(PB)->u[1][(PB)->count] = U1;				\
-	(PB)->count++;
+#define PB_WRITE_MULTITEX_PIXEL( PB, X, Y, Z, R, G, B, A, S0, T0, U0, S1, T1, U1 )	\
+do {							\
+   GLuint count = (PB)->count;				\
+   (PB)->x[count] = X;					\
+   (PB)->y[count] = Y;					\
+   (PB)->z[count] = Z;					\
+   (PB)->rgba[count][RCOMP] = R;			\
+   (PB)->rgba[count][GCOMP] = G;			\
+   (PB)->rgba[count][BCOMP] = B;			\
+   (PB)->rgba[count][ACOMP] = A;			\
+   (PB)->s[0][count] = S0;				\
+   (PB)->t[0][count] = T0;				\
+   (PB)->u[0][count] = U0;				\
+   (PB)->s[1][count] = S1;				\
+   (PB)->t[1][count] = T1;				\
+   (PB)->u[1][count] = U1;				\
+   (PB)->mono = GL_FALSE;				\
+   (PB)->count++;					\
+} while (0)
+
 
 /*
  * "write" an RGBA pixel with multiple texture coordinates and specular color
  */
 #define PB_WRITE_MULTITEX_SPEC_PIXEL( PB, X, Y, Z, R, G, B, A,	\
-			SR, SG, SB, S, T, U, S1, T1, U1 )	\
-	(PB)->x[(PB)->count] = X;				\
-	(PB)->y[(PB)->count] = Y;				\
-	(PB)->z[(PB)->count] = Z;				\
-	(PB)->rgba[(PB)->count][RCOMP] = R;			\
-	(PB)->rgba[(PB)->count][GCOMP] = G;			\
-	(PB)->rgba[(PB)->count][BCOMP] = B;			\
-	(PB)->rgba[(PB)->count][ACOMP] = A;			\
-	(PB)->spec[(PB)->count][RCOMP] = SR;			\
-	(PB)->spec[(PB)->count][GCOMP] = SG;			\
-	(PB)->spec[(PB)->count][BCOMP] = SB;			\
-	(PB)->s[0][(PB)->count] = S;				\
-	(PB)->t[0][(PB)->count] = T;				\
-	(PB)->u[0][(PB)->count] = U;				\
-	(PB)->s[1][(PB)->count] = S1;				\
-	(PB)->t[1][(PB)->count] = T1;				\
-	(PB)->u[1][(PB)->count] = U1;				\
-	(PB)->count++;
+			SR, SG, SB, S0, T0, U0, S1, T1, U1 )	\
+do {								\
+   GLuint count = (PB)->count;					\
+   (PB)->x[count] = X;						\
+   (PB)->y[count] = Y;						\
+   (PB)->z[count] = Z;						\
+   (PB)->rgba[count][RCOMP] = R;				\
+   (PB)->rgba[count][GCOMP] = G;				\
+   (PB)->rgba[count][BCOMP] = B;				\
+   (PB)->rgba[count][ACOMP] = A;				\
+   (PB)->spec[count][RCOMP] = SR;				\
+   (PB)->spec[count][GCOMP] = SG;				\
+   (PB)->spec[count][BCOMP] = SB;				\
+   (PB)->s[0][count] = S0;					\
+   (PB)->t[0][count] = T0;					\
+   (PB)->u[0][count] = U0;					\
+   (PB)->s[1][count] = S1;					\
+   (PB)->t[1][count] = T1;					\
+   (PB)->u[1][count] = U1;					\
+   (PB)->mono = GL_FALSE;					\
+   (PB)->count++;						\
+} while (0)
 
 
 
 /*
  * Call this function at least every MAX_WIDTH pixels:
  */
-#define PB_CHECK_FLUSH( CTX, PB )		\
-do {						\
-	if ((PB)->count>=PB_SIZE-MAX_WIDTH) {	\
-	   gl_flush_pb( CTX );			\
-	}					\
+#define PB_CHECK_FLUSH( CTX, PB )			\
+do {							\
+   if ((PB)->count >= PB_SIZE - MAX_WIDTH) {		\
+      gl_flush_pb( CTX );				\
+   }							\
 } while(0)
 
+
 extern struct pixel_buffer *gl_alloc_pb(void);
 
 extern void gl_flush_pb( GLcontext *ctx );
+
 
 #endif
Index: xc/extras/Mesa/src/pipeline.c
diff -u xc/extras/Mesa/src/pipeline.c:1.3 xc/extras/Mesa/src/pipeline.c:1.4
--- xc/extras/Mesa/src/pipeline.c:1.3	Mon Feb 14 23:12:29 2000
+++ xc/extras/Mesa/src/pipeline.c	Mon Jun 19 22:08:17 2000
@@ -439,9 +439,10 @@
 	 flags |= VERT_INDEX;
 
       if (ctx->Texture.Enabled & 0xf) {
+/* XXX this should also check that the texture is RGBA.  What about Unit[1]?
 	 if (ctx->Texture.Unit[0].EnvMode == GL_REPLACE)
 	    flags &= ~VERT_RGBA;
-
+*/
 	 flags |= VERT_TEX0_ANY;
       }
 
Index: xc/extras/Mesa/src/pixel.c
diff -u xc/extras/Mesa/src/pixel.c:1.3 xc/extras/Mesa/src/pixel.c:1.4
--- xc/extras/Mesa/src/pixel.c:1.3	Mon Feb 14 23:12:30 2000
+++ xc/extras/Mesa/src/pixel.c	Fri Jun 16 17:02:14 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,11 +24,6 @@
  */
 
 
-/*
- * glPixelStore, glPixelTransfer, glPixelMap, glPixelZoom, etc.
- */
-
-
 #ifdef PC_HEADER
 #include "all.h"
 #else
@@ -561,6 +556,54 @@
       case GL_DEPTH_BIAS:
          ctx->Pixel.DepthBias = param;
 	 break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE:
+         ctx->Pixel.PostColorMatrixScale[0] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS:
+         ctx->Pixel.PostColorMatrixBias[0] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE:
+         ctx->Pixel.PostColorMatrixScale[1] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS:
+         ctx->Pixel.PostColorMatrixBias[1] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE:
+         ctx->Pixel.PostColorMatrixScale[2] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS:
+         ctx->Pixel.PostColorMatrixBias[2] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE:
+         ctx->Pixel.PostColorMatrixScale[3] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS:
+         ctx->Pixel.PostColorMatrixBias[3] = param;
+	 break;
+      case GL_POST_CONVOLUTION_RED_SCALE:
+         ctx->Pixel.PostConvolutionScale[0] = param;
+	 break;
+      case GL_POST_CONVOLUTION_RED_BIAS:
+         ctx->Pixel.PostConvolutionBias[0] = param;
+	 break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE:
+         ctx->Pixel.PostConvolutionScale[1] = param;
+	 break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS:
+         ctx->Pixel.PostConvolutionBias[1] = param;
+	 break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE:
+         ctx->Pixel.PostConvolutionScale[2] = param;
+	 break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS:
+         ctx->Pixel.PostConvolutionBias[2] = param;
+	 break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE:
+         ctx->Pixel.PostConvolutionScale[2] = param;
+	 break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS:
+         ctx->Pixel.PostConvolutionBias[2] = param;
+	 break;
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glPixelTransfer(pname)" );
          return;
@@ -575,6 +618,20 @@
    else {
       ctx->Pixel.ScaleOrBiasRGBA = GL_FALSE;
    }
+
+   if (ctx->Pixel.PostColorMatrixScale[0] != 1.0F ||
+       ctx->Pixel.PostColorMatrixBias[0]  != 0.0F ||
+       ctx->Pixel.PostColorMatrixScale[1] != 1.0F ||
+       ctx->Pixel.PostColorMatrixBias[1]  != 0.0F ||
+       ctx->Pixel.PostColorMatrixScale[2] != 1.0F ||
+       ctx->Pixel.PostColorMatrixBias[2]  != 0.0F ||
+       ctx->Pixel.PostColorMatrixScale[3] != 1.0F ||
+       ctx->Pixel.PostColorMatrixBias[3]  != 0.0F) {
+      ctx->Pixel.ScaleOrBiasRGBApcm = GL_TRUE;
+   }
+   else {
+      ctx->Pixel.ScaleOrBiasRGBApcm = GL_FALSE;
+   }
 }
 
 
@@ -585,61 +642,17 @@
 }
 
 
-
 
-/*
- * Pixel processing functions
- */
-
-
-/*
- * Apply scale and bias factors to an array of RGBA pixels.
- */
-void gl_scale_and_bias_color( const GLcontext *ctx, GLuint n,
-                              GLfloat red[], GLfloat green[],
-                              GLfloat blue[], GLfloat alpha[] )
-{
-   GLuint i;
-   for (i=0;i<n;i++) {
-      GLfloat r = red[i]   * ctx->Pixel.RedScale   + ctx->Pixel.RedBias;
-      GLfloat g = green[i] * ctx->Pixel.GreenScale + ctx->Pixel.GreenBias;
-      GLfloat b = blue[i]  * ctx->Pixel.BlueScale  + ctx->Pixel.BlueBias;
-      GLfloat a = alpha[i] * ctx->Pixel.AlphaScale + ctx->Pixel.AlphaBias;
-      red[i]   = CLAMP( r, 0.0F, 1.0F );
-      green[i] = CLAMP( g, 0.0F, 1.0F );
-      blue[i]  = CLAMP( b, 0.0F, 1.0F );
-      alpha[i] = CLAMP( a, 0.0F, 1.0F );
-   }
-}
-
-
-/*
- * Apply scale and bias factors to an array of RGBA pixels.
- */
-void gl_scale_and_bias_rgba( const GLcontext *ctx, GLuint n, GLubyte rgba[][4] )
-{
-   GLfloat rbias = ctx->Pixel.RedBias   * 255.0F;
-   GLfloat gbias = ctx->Pixel.GreenBias * 255.0F;
-   GLfloat bbias = ctx->Pixel.BlueBias  * 255.0F;
-   GLfloat abias = ctx->Pixel.AlphaBias * 255.0F;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      GLint r = (GLint) (rgba[i][RCOMP] * ctx->Pixel.RedScale   + rbias);
-      GLint g = (GLint) (rgba[i][GCOMP] * ctx->Pixel.GreenScale + gbias);
-      GLint b = (GLint) (rgba[i][BCOMP] * ctx->Pixel.BlueScale  + bbias);
-      GLint a = (GLint) (rgba[i][ACOMP] * ctx->Pixel.AlphaScale + abias);
-      rgba[i][RCOMP] = CLAMP( r, 0, 255 );
-      rgba[i][GCOMP] = CLAMP( g, 0, 255 );
-      rgba[i][BCOMP] = CLAMP( b, 0, 255 );
-      rgba[i][ACOMP] = CLAMP( a, 0, 255 );
-   }
-}
+/**********************************************************************/
+/*****                  Pixel processing functions               ******/
+/**********************************************************************/
 
 
 /*
  * Apply scale and bias factors to an array of RGBA pixels.
  */
-void gl_scale_and_bias_rgba_float( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
+void
+_mesa_scale_and_bias_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4])
 {
    if (ctx->Pixel.RedScale != 1.0 || ctx->Pixel.RedBias != 0.0) {
       const GLfloat scale = ctx->Pixel.RedScale;
@@ -677,32 +690,10 @@
 
 
 /*
- * Apply pixel mapping to an array of RGBA pixels.
- */
-void gl_map_rgba( const GLcontext *ctx, GLuint n, GLubyte rgba[][4] )
-{
-   GLfloat rscale = (ctx->Pixel.MapRtoRsize - 1) / 255.0F;
-   GLfloat gscale = (ctx->Pixel.MapGtoGsize - 1) / 255.0F;
-   GLfloat bscale = (ctx->Pixel.MapBtoBsize - 1) / 255.0F;
-   GLfloat ascale = (ctx->Pixel.MapAtoAsize - 1) / 255.0F;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      GLint ir = (GLint) (rgba[i][RCOMP] * rscale);
-      GLint ig = (GLint) (rgba[i][GCOMP] * gscale);
-      GLint ib = (GLint) (rgba[i][BCOMP] * bscale);
-      GLint ia = (GLint) (rgba[i][ACOMP] * ascale);
-      rgba[i][RCOMP] = (GLint) (ctx->Pixel.MapRtoR[ir] * 255.0F);
-      rgba[i][GCOMP] = (GLint) (ctx->Pixel.MapGtoG[ig] * 255.0F);
-      rgba[i][BCOMP] = (GLint) (ctx->Pixel.MapBtoB[ib] * 255.0F);
-      rgba[i][ACOMP] = (GLint) (ctx->Pixel.MapAtoA[ia] * 255.0F);
-   }
-}
-
-
-/*
  * Apply pixel mapping to an array of floating point RGBA pixels.
  */
-void gl_map_rgba_float( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
+void
+_mesa_map_rgba( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
 {
    const GLfloat rscale = ctx->Pixel.MapRtoRsize - 1;
    const GLfloat gscale = ctx->Pixel.MapGtoGsize - 1;
@@ -723,31 +714,220 @@
 
 
 /*
- * Apply pixel mapping to an array of RGBA pixels.
+ * Apply the color matrix and post color matrix scaling and biasing.
  */
-void gl_map_color( const GLcontext *ctx, GLuint n,
-                   GLfloat red[], GLfloat green[],
-                   GLfloat blue[], GLfloat alpha[] )
-{
-   GLfloat rscale = ctx->Pixel.MapRtoRsize - 1;
-   GLfloat gscale = ctx->Pixel.MapGtoGsize - 1;
-   GLfloat bscale = ctx->Pixel.MapBtoBsize - 1;
-   GLfloat ascale = ctx->Pixel.MapAtoAsize - 1;
+void
+_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4])
+{
+   const GLfloat rs = ctx->Pixel.PostColorMatrixScale[0];
+   const GLfloat rb = ctx->Pixel.PostColorMatrixBias[0];
+   const GLfloat gs = ctx->Pixel.PostColorMatrixScale[1];
+   const GLfloat gb = ctx->Pixel.PostColorMatrixBias[1];
+   const GLfloat bs = ctx->Pixel.PostColorMatrixScale[2];
+   const GLfloat bb = ctx->Pixel.PostColorMatrixBias[2];
+   const GLfloat as = ctx->Pixel.PostColorMatrixScale[3];
+   const GLfloat ab = ctx->Pixel.PostColorMatrixBias[3];
+   const GLfloat *m = ctx->ColorMatrix.m;
    GLuint i;
-   for (i=0;i<n;i++) {
-      red[i]   = ctx->Pixel.MapRtoR[ (GLint) (red[i]   * rscale + 0.5F) ];
-      green[i] = ctx->Pixel.MapGtoG[ (GLint) (green[i] * gscale + 0.5F) ];
-      blue[i]  = ctx->Pixel.MapBtoB[ (GLint) (blue[i]  * bscale + 0.5F) ];
-      alpha[i] = ctx->Pixel.MapAtoA[ (GLint) (alpha[i] * ascale + 0.5F) ];
+   for (i = 0; i < n; i++) {
+      const GLfloat r = rgba[i][RCOMP];
+      const GLfloat g = rgba[i][GCOMP];
+      const GLfloat b = rgba[i][BCOMP];
+      const GLfloat a = rgba[i][ACOMP];
+      rgba[i][RCOMP] = (m[0] * r + m[4] * g + m[ 8] * b + m[12] * a) * rs + rb;
+      rgba[i][GCOMP] = (m[1] * r + m[5] * g + m[ 9] * b + m[13] * a) * gs + gb;
+      rgba[i][BCOMP] = (m[2] * r + m[6] * g + m[10] * b + m[14] * a) * bs + bb;
+      rgba[i][ACOMP] = (m[3] * r + m[7] * g + m[11] * b + m[15] * a) * as + ab;
    }
 }
 
 
+/*
+ * Apply a color table lookup to an array of colors.
+ */
+void
+_mesa_lookup_rgba(const struct gl_color_table *table,
+                  GLuint n, GLfloat rgba[][4])
+{
+   ASSERT(table->TableType == GL_FLOAT);
+   if (!table->Table)
+      return;
 
+   switch (table->Format) {
+      case GL_INTENSITY:
+         /* replace RGBA with I */
+         if (table->TableType == GL_UNSIGNED_BYTE) {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLubyte *lut = (const GLubyte *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLfloat c = lut[j] * (1.0F / 255.0F);
+               rgba[i][RCOMP] = rgba[i][GCOMP] =
+                  rgba[i][BCOMP] = rgba[i][ACOMP] = c;
+            }
+
+         }
+         else {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLfloat c = lut[j];
+               rgba[i][RCOMP] = rgba[i][GCOMP] =
+                  rgba[i][BCOMP] = rgba[i][ACOMP] = c;
+            }
+         }
+         break;
+      case GL_LUMINANCE:
+         /* replace RGB with L */
+         if (table->TableType == GL_UNSIGNED_BYTE) {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLubyte *lut = (const GLubyte *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLfloat c = lut[j] * (1.0F / 255.0F);
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = c;
+            }
+         }
+         else {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLfloat c = lut[j];
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = c;
+            }
+         }
+         break;
+      case GL_ALPHA:
+         /* replace A with A */
+         if (table->TableType == GL_UNSIGNED_BYTE) {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLubyte *lut = (const GLubyte *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
+               rgba[i][ACOMP] = lut[j] * (1.0F / 255.0F);
+            }
+         }
+         else  {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
+               rgba[i][ACOMP] = lut[j];
+            }
+         }
+         break;
+      case GL_LUMINANCE_ALPHA:
+         /* replace RGBA with LLLA */
+         if (table->TableType == GL_UNSIGNED_BYTE) {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLubyte *lut = (const GLubyte *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jL = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLint jA = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
+               GLfloat luminance = lut[jL * 2 + 0] * (1.0F / 255.0F);
+               GLfloat alpha     = lut[jA * 2 + 1] * (1.0F / 255.0F);
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = luminance;
+               rgba[i][ACOMP] = alpha;;
+            }
+         }
+         else {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jL = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLint jA = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
+               GLfloat luminance = lut[jL * 2 + 0];
+               GLfloat alpha     = lut[jA * 2 + 1];
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = luminance;
+               rgba[i][ACOMP] = alpha;;
+            }
+         }
+         break;
+      case GL_RGB:
+         /* replace RGB with RGB */
+         if (table->TableType == GL_UNSIGNED_BYTE) {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLubyte *lut = (const GLubyte *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLint jG = (GLint) (rgba[i][GCOMP] * scale + 0.5F);
+               GLint jB = (GLint) (rgba[i][BCOMP] * scale + 0.5F);
+               rgba[i][RCOMP] = lut[jR * 3 + 0] * (1.0F / 255.0F);
+               rgba[i][GCOMP] = lut[jG * 3 + 1] * (1.0F / 255.0F);
+               rgba[i][BCOMP] = lut[jB * 3 + 2] * (1.0F / 255.0F);
+            }
+         }
+         else {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLint jG = (GLint) (rgba[i][GCOMP] * scale + 0.5F);
+               GLint jB = (GLint) (rgba[i][BCOMP] * scale + 0.5F);
+               rgba[i][RCOMP] = lut[jR * 3 + 0];
+               rgba[i][GCOMP] = lut[jG * 3 + 1];
+               rgba[i][BCOMP] = lut[jB * 3 + 2];
+            }
+         }
+         break;
+      case GL_RGBA:
+         /* replace RGBA with RGBA */
+         if (table->TableType == GL_UNSIGNED_BYTE) {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLubyte *lut = (const GLubyte *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLint jG = (GLint) (rgba[i][GCOMP] * scale + 0.5F);
+               GLint jB = (GLint) (rgba[i][BCOMP] * scale + 0.5F);
+               GLint jA = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
+               rgba[i][RCOMP] = lut[jR * 4 + 0] * (1.0F / 255.0F);
+               rgba[i][GCOMP] = lut[jG * 4 + 1] * (1.0F / 255.0F);
+               rgba[i][BCOMP] = lut[jB * 4 + 2] * (1.0F / 255.0F);
+               rgba[i][ACOMP] = lut[jA * 4 + 3] * (1.0F / 255.0F);
+            }
+         }
+         else {
+            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
+               GLint jG = (GLint) (rgba[i][GCOMP] * scale + 0.5F);
+               GLint jB = (GLint) (rgba[i][BCOMP] * scale + 0.5F);
+               GLint jA = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
+               rgba[i][RCOMP] = lut[jR * 4 + 0];
+               rgba[i][GCOMP] = lut[jG * 4 + 1];
+               rgba[i][BCOMP] = lut[jB * 4 + 2];
+               rgba[i][ACOMP] = lut[jA * 4 + 3];
+            }
+         }
+         break;
+      default:
+         gl_problem(NULL, "Bad format in _mesa_lookup_rgba");
+         return;
+   }
+}
+
+
+
 /*
  * Apply color index shift and offset to an array of pixels.
  */
-void gl_shift_and_offset_ci( const GLcontext *ctx, GLuint n, GLuint indexes[] )
+void
+_mesa_shift_and_offset_ci( const GLcontext *ctx, GLuint n, GLuint indexes[] )
 {
    GLint shift = ctx->Pixel.IndexShift;
    GLint offset = ctx->Pixel.IndexOffset;
@@ -774,7 +954,8 @@
 /*
  * Apply color index mapping to color indexes.
  */
-void gl_map_ci( const GLcontext *ctx, GLuint n, GLuint index[] )
+void
+_mesa_map_ci( const GLcontext *ctx, GLuint n, GLuint index[] )
 {
    GLuint mask = ctx->Pixel.MapItoIsize - 1;
    GLuint i;
@@ -787,8 +968,9 @@
 /*
  * Map color indexes to rgba values.
  */
-void gl_map_ci_to_rgba( const GLcontext *ctx, GLuint n, const GLuint index[],
-                        GLubyte rgba[][4] )
+void
+_mesa_map_ci_to_rgba_ubyte( const GLcontext *ctx, GLuint n,
+                            const GLuint index[], GLubyte rgba[][4] )
 {
    GLuint rmask = ctx->Pixel.MapItoRsize - 1;
    GLuint gmask = ctx->Pixel.MapItoGsize - 1;
@@ -811,8 +993,9 @@
 /*
  * Map color indexes to float rgba values.
  */
-void gl_map_ci_to_rgba_float( const GLcontext *ctx, GLuint n, const GLuint index[],
-                              GLfloat rgba[][4] )
+void
+_mesa_map_ci_to_rgba( const GLcontext *ctx, GLuint n,
+                      const GLuint index[], GLfloat rgba[][4] )
 {
    GLuint rmask = ctx->Pixel.MapItoRsize - 1;
    GLuint gmask = ctx->Pixel.MapItoGsize - 1;
@@ -835,8 +1018,9 @@
 /*
  * Map 8-bit color indexes to rgb values.
  */
-void gl_map_ci8_to_rgba( const GLcontext *ctx, GLuint n, const GLubyte index[],
-                         GLubyte rgba[][4] )
+void
+_mesa_map_ci8_to_rgba( const GLcontext *ctx, GLuint n, const GLubyte index[],
+                       GLubyte rgba[][4] )
 {
    GLuint rmask = ctx->Pixel.MapItoRsize - 1;
    GLuint gmask = ctx->Pixel.MapItoGsize - 1;
@@ -856,27 +1040,9 @@
 }
 
 
-void gl_map_ci_to_color( const GLcontext *ctx, GLuint n, const GLuint index[],
-                         GLfloat r[], GLfloat g[],
-                         GLfloat b[], GLfloat a[] )
-{
-   GLuint rmask = ctx->Pixel.MapItoRsize - 1;
-   GLuint gmask = ctx->Pixel.MapItoGsize - 1;
-   GLuint bmask = ctx->Pixel.MapItoBsize - 1;
-   GLuint amask = ctx->Pixel.MapItoAsize - 1;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      r[i] = ctx->Pixel.MapItoR[index[i] & rmask];
-      g[i] = ctx->Pixel.MapItoG[index[i] & gmask];
-      b[i] = ctx->Pixel.MapItoB[index[i] & bmask];
-      a[i] = ctx->Pixel.MapItoA[index[i] & amask];
-   }
-}
-
-
-
-void gl_shift_and_offset_stencil( const GLcontext *ctx, GLuint n,
-                                  GLstencil stencil[] )
+void
+_mesa_shift_and_offset_stencil( const GLcontext *ctx, GLuint n,
+                                GLstencil stencil[] )
 {
    GLuint i;
    GLint shift = ctx->Pixel.IndexShift;
@@ -901,8 +1067,8 @@
 }
 
 
-
-void gl_map_stencil( const GLcontext *ctx, GLuint n, GLstencil stencil[] )
+void
+_mesa_map_stencil( const GLcontext *ctx, GLuint n, GLstencil stencil[] )
 {
    GLuint mask = ctx->Pixel.MapStoSsize - 1;
    GLuint i;
@@ -910,4 +1076,3 @@
       stencil[i] = ctx->Pixel.MapStoS[ stencil[i] & mask ];
    }
 }
-
Index: xc/extras/Mesa/src/pixel.h
diff -u xc/extras/Mesa/src/pixel.h:1.3 xc/extras/Mesa/src/pixel.h:1.4
--- xc/extras/Mesa/src/pixel.h:1.3	Mon Feb 14 23:12:30 2000
+++ xc/extras/Mesa/src/pixel.h	Fri Jun 16 17:02:14 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -75,64 +75,56 @@
  * Pixel processing functions
  */
 
-extern void gl_scale_and_bias_color( const GLcontext *ctx, GLuint n,
-                                     GLfloat red[], GLfloat green[],
-                                     GLfloat blue[], GLfloat alpha[] );
-
-
-extern void gl_scale_and_bias_rgba( const GLcontext *ctx, GLuint n,
-                                    GLubyte rgba[][4] );
-
-
-extern void gl_scale_and_bias_rgba_float( const GLcontext *ctx, GLuint n,
-                                          GLfloat rgba[][4] );
-
-
-extern void gl_map_rgba( const GLcontext *ctx, GLuint n, GLubyte rgba[][4] );
+extern void
+_mesa_scale_and_bias_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
 
 
-extern void gl_map_rgba_float( const GLcontext *ctx, GLuint n,
-                               GLfloat rgba[][4] );
+extern void
+_mesa_map_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
 
 
-extern void gl_map_color( const GLcontext *ctx, GLuint n,
-                          GLfloat red[], GLfloat green[],
-                          GLfloat blue[], GLfloat alpha[] );
+extern void
+_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
 
 
-extern void gl_shift_and_offset_ci( const GLcontext *ctx, GLuint n,
-                                    GLuint indexes[] );
+extern void
+_mesa_lookup_rgba(const struct gl_color_table *table,
+                  GLuint n, GLfloat rgba[][4]);
 
 
-extern void gl_map_ci( const GLcontext *ctx, GLuint n, GLuint index[] );
+extern void
+_mesa_shift_and_offset_ci(const GLcontext *ctx, GLuint n,
+                          GLuint indexes[]);
 
 
-extern void gl_map_ci_to_rgba( const GLcontext *ctx,
-                               GLuint n, const GLuint index[],
-                               GLubyte rgba[][4] );
+extern void
+_mesa_map_ci(const GLcontext *ctx, GLuint n, GLuint index[]);
 
 
-extern void gl_map_ci_to_rgba_float( const GLcontext *ctx,
-                                     GLuint n, const GLuint index[],
-                                     GLfloat rgba[][4] );
+extern void
+_mesa_map_ci_to_rgba_ubyte(const GLcontext *ctx,
+                           GLuint n, const GLuint index[],
+                           GLubyte rgba[][4]);
 
 
-extern void gl_map_ci8_to_rgba( const GLcontext *ctx,
-                                GLuint n, const GLubyte index[],
-                                GLubyte rgba[][4] );
+extern void
+_mesa_map_ci_to_rgba(const GLcontext *ctx,
+                     GLuint n, const GLuint index[], GLfloat rgba[][4]);
 
 
-extern void gl_map_ci_to_color( const GLcontext *ctx,
-                                GLuint n, const GLuint index[],
-                                GLfloat r[], GLfloat g[],
-                                GLfloat b[], GLfloat a[] );
+extern void
+_mesa_map_ci8_to_rgba(const GLcontext *ctx,
+                      GLuint n, const GLubyte index[],
+                      GLubyte rgba[][4]);
 
 
-extern void gl_shift_and_offset_stencil( const GLcontext *ctx, GLuint n,
-                                         GLstencil indexes[] );
+extern void
+_mesa_shift_and_offset_stencil(const GLcontext *ctx, GLuint n,
+                               GLstencil indexes[]);
 
 
-extern void gl_map_stencil( const GLcontext *ctx, GLuint n, GLstencil index[] );
+extern void
+_mesa_map_stencil(const GLcontext *ctx, GLuint n, GLstencil index[]);
 
 
 #endif
Index: xc/extras/Mesa/src/pixeltex.c
diff -u /dev/null xc/extras/Mesa/src/pixeltex.c:1.1
--- /dev/null	Sat Jul  1 20:46:11 2000
+++ xc/extras/Mesa/src/pixeltex.c	Fri Jun 16 17:02:14 2000
@@ -0,0 +1,204 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This file implements both the GL_SGIX_pixel_texture and
+ * GL_SIGS_pixel_texture extensions. Luckily, they pretty much
+ * overlap in functionality so we use the same state variables
+ * and execution code for both.
+ */
+
+
+#ifdef PC_HEADER
+#include "all.h"
+#else
+#include "glheader.h"
+#include "context.h"
+#include "pixeltex.h"
+#endif
+
+
+void
+_mesa_PixelTexGenSGIX(GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPixelTexGenSGIX");
+
+   switch (mode) {
+      case GL_NONE:
+         ctx->Pixel.FragmentRgbSource = GL_PIXEL_GROUP_COLOR_SGIS;
+         ctx->Pixel.FragmentAlphaSource = GL_PIXEL_GROUP_COLOR_SGIS;
+         break;
+      case GL_ALPHA:
+         ctx->Pixel.FragmentRgbSource = GL_PIXEL_GROUP_COLOR_SGIS;
+         ctx->Pixel.FragmentAlphaSource = GL_CURRENT_RASTER_COLOR;
+         break;
+      case GL_RGB:
+         ctx->Pixel.FragmentRgbSource = GL_CURRENT_RASTER_COLOR;
+         ctx->Pixel.FragmentAlphaSource = GL_PIXEL_GROUP_COLOR_SGIS;
+         break;
+      case GL_RGBA:
+         ctx->Pixel.FragmentRgbSource = GL_CURRENT_RASTER_COLOR;
+         ctx->Pixel.FragmentAlphaSource = GL_CURRENT_RASTER_COLOR;
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glPixelTexGenSGIX(mode)");
+         return;
+   }
+}
+
+
+void
+_mesa_PixelTexGenParameterfSGIS(GLenum target, GLfloat value)
+{
+   _mesa_PixelTexGenParameteriSGIS(target, (GLint) value);
+}
+
+
+void
+_mesa_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value)
+{
+   _mesa_PixelTexGenParameteriSGIS(target, (GLint) *value);
+}
+
+
+void
+_mesa_PixelTexGenParameteriSGIS(GLenum target, GLint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPixelTexGenParameterSGIS");
+
+   if (value != GL_CURRENT_RASTER_COLOR && value != GL_PIXEL_GROUP_COLOR_SGIS) {
+      gl_error(ctx, GL_INVALID_ENUM, "glPixelTexGenParameterSGIS(value)");
+      return;
+   }
+
+   if (target == GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS) {
+      ctx->Pixel.FragmentRgbSource = (GLenum) value;
+   }
+   else if (target == GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS) {
+      ctx->Pixel.FragmentAlphaSource = (GLenum) value;
+   }
+   else {
+      gl_error(ctx, GL_INVALID_ENUM, "glPixelTexGenParameterSGIS(target)");
+   }
+}
+
+
+void
+_mesa_PixelTexGenParameterivSGIS(GLenum target, const GLint *value)
+{
+  _mesa_PixelTexGenParameteriSGIS(target, *value);
+}
+
+
+void
+_mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetPixelTexGenParameterfvSGIS");
+
+   if (target == GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS) {
+      *value = (GLfloat) ctx->Pixel.FragmentRgbSource;
+   }
+   else if (target == GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS) {
+      *value = (GLfloat) ctx->Pixel.FragmentAlphaSource;
+   }
+   else {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetPixelTexGenParameterfvSGIS(target)");
+   }
+}
+
+
+void
+_mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetPixelTexGenParameterivSGIS");
+
+   if (target == GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS) {
+      *value = (GLint) ctx->Pixel.FragmentRgbSource;
+   }
+   else if (target == GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS) {
+      *value = (GLint) ctx->Pixel.FragmentAlphaSource;
+   }
+   else {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetPixelTexGenParameterivSGIS(target)");
+   }
+}
+
+
+
+/*
+ * Convert RGBA values into strq texture coordinates.
+ */
+void
+_mesa_pixeltexgen(GLcontext *ctx, GLuint n, const GLubyte rgba[][4],
+                  GLfloat s[], GLfloat t[], GLfloat r[], GLfloat q[])
+{
+   static GLboolean firstCall = GL_TRUE;
+   static GLfloat byteToFloat[256];
+
+   if (firstCall) {
+      GLuint i;
+      for (i = 0; i < 256; i++) {
+         byteToFloat[i] = i / 255.0F;
+      }
+      firstCall = GL_FALSE;
+   }
+
+   if (ctx->Pixel.FragmentRgbSource == GL_CURRENT_RASTER_COLOR) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         s[i] = ctx->Current.RasterColor[RCOMP];
+         t[i] = ctx->Current.RasterColor[GCOMP];
+         r[i] = ctx->Current.RasterColor[BCOMP];
+      }
+   }
+   else {
+      GLuint i;
+      ASSERT(ctx->Pixel.FragmentRgbSource == GL_PIXEL_GROUP_COLOR_SGIS);
+      for (i = 0; i < n; i++) {
+         s[i] = byteToFloat[rgba[i][RCOMP]];
+         t[i] = byteToFloat[rgba[i][GCOMP]];
+         r[i] = byteToFloat[rgba[i][BCOMP]];
+      }
+   }
+
+   if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_COLOR) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         q[i] = ctx->Current.RasterColor[ACOMP];
+      }
+   }
+   else {
+      GLuint i;
+      ASSERT(ctx->Pixel.FragmentAlphaSource == GL_PIXEL_GROUP_COLOR_SGIS);
+      for (i = 0; i < n; i++) {
+         q[i] = byteToFloat[rgba[i][ACOMP]];
+      }
+   }
+}
Index: xc/extras/Mesa/src/pixeltex.h
diff -u /dev/null xc/extras/Mesa/src/pixeltex.h:1.1
--- /dev/null	Sat Jul  1 20:46:11 2000
+++ xc/extras/Mesa/src/pixeltex.h	Fri Jun 16 17:02:15 2000
@@ -0,0 +1,69 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright noti_mesa_PixelTexGenParameterfvce and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef PIXELTEX_H
+#define PIXELTEX_H
+
+
+extern void
+_mesa_PixelTexGenSGIX(GLenum mode);
+
+extern void
+_mesa_PixelTexGenParameterfSGIS(GLenum target, GLfloat value);
+
+#ifdef VMS
+#define _mesa_PixelTexGenParameterfvSGIS _mesa_PixelTexGenParameterfv
+#endif
+extern void
+_mesa_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value);
+
+extern void
+_mesa_PixelTexGenParameteriSGIS(GLenum target, GLint value);
+
+#ifdef VMS
+#define _mesa_PixelTexGenParameterivSGIS _mesa_PixelTexGenParameteriv
+#endif
+extern void
+_mesa_PixelTexGenParameterivSGIS(GLenum target, const GLint *value);
+
+#ifdef VMS
+#define _mesa_GetPixelTexGenParameterfvSGIS _mesa_GetPixelTexGenParameterfv
+#endif
+extern void
+_mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value);
+
+#ifdef VMS
+#define _mesa_GetPixelTexGenParameterivSGIS _mesa_GetPixelTexGenParameteriv
+#endif
+extern void
+_mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value);
+
+extern void
+_mesa_pixeltexgen(GLcontext *ctx, GLuint n, const GLubyte rgba[][4],
+                  GLfloat s[], GLfloat t[], GLfloat r[], GLfloat q[]);
+
+
+#endif
Index: xc/extras/Mesa/src/points.c
diff -u xc/extras/Mesa/src/points.c:1.3 xc/extras/Mesa/src/points.c:1.4
--- xc/extras/Mesa/src/points.c:1.3	Mon Feb 14 23:12:30 2000
+++ xc/extras/Mesa/src/points.c	Fri Jun 16 17:02:15 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -53,10 +53,12 @@
       return;
    }
 
-   if (ctx->Point.Size != size) {
-      ctx->Point.Size = size;
+   if (ctx->Point.UserSize != size) {
+      ctx->Point.UserSize = size;
+      ctx->Point.Size = CLAMP(size, ctx->Const.MinPointSize, ctx->Const.MaxPointSize);
       ctx->TriangleCaps &= ~DD_POINT_SIZE;
-      if (size != 1.0) ctx->TriangleCaps |= DD_POINT_SIZE;
+      if (size != 1.0)
+         ctx->TriangleCaps |= DD_POINT_SIZE;
       ctx->NewState |= NEW_RASTER_OPS;
    }
 }
@@ -145,20 +147,21 @@
 /*
  * CI points with size == 1.0
  */
-static void size1_ci_points( GLcontext *ctx, GLuint first, GLuint last )
+static void
+size1_ci_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
    GLfloat *win;
    GLint *pbx = PB->x, *pby = PB->y;
    GLdepth *pbz = PB->z;
-   GLuint *pbi = PB->i;
+   GLuint *pbi = PB->index;
    GLuint pbcount = PB->count;
    GLuint i;
 
    win = &VB->Win.data[first][0];
-   for (i=first;i<=last;i++) {
-      if (VB->ClipMask[i]==0) {
+   for (i = first; i <= last; i++) {
+      if (VB->ClipMask[i] == 0) {
          pbx[pbcount] = (GLint)  win[0];
          pby[pbcount] = (GLint)  win[1];
          pbz[pbcount] = (GLint) (win[2] + ctx->PointZoffset);
@@ -176,14 +179,15 @@
 /*
  * RGBA points with size == 1.0
  */
-static void size1_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
+static void
+size1_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
    GLuint i;
 
-   for (i=first;i<=last;i++) {
-      if (VB->ClipMask[i]==0) {
+   for (i = first; i <= last; i++) {
+      if (VB->ClipMask[i] == 0) {
          GLint x, y, z;
          GLint red, green, blue, alpha;
 
@@ -199,7 +203,7 @@
          PB_WRITE_RGBA_PIXEL( PB, x, y, z, red, green, blue, alpha );
       }
    }
-   PB_CHECK_FLUSH(ctx,PB);
+   PB_CHECK_FLUSH(ctx, PB);
 }
 
 
@@ -207,23 +211,23 @@
 /*
  * General CI points.
  */
-static void general_ci_points( GLcontext *ctx, GLuint first, GLuint last )
+static void
+general_ci_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
-   GLuint i;
-   GLint isize = (GLint) (CLAMP(ctx->Point.Size,MIN_POINT_SIZE,MAX_POINT_SIZE) + 0.5F);
+   const GLint isize = (GLint) (ctx->Point.Size + 0.5F);
    GLint radius = isize >> 1;
+   GLuint i;
 
-   for (i=first;i<=last;i++) {
-      if (VB->ClipMask[i]==0) {
-         GLint x, y, z;
+   for (i = first; i <= last; i++) {
+      if (VB->ClipMask[i] == 0) {
          GLint x0, x1, y0, y1;
          GLint ix, iy;
 
-         x = (GLint)  VB->Win.data[i][0];
-         y = (GLint)  VB->Win.data[i][1];
-         z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+         GLint x = (GLint)  VB->Win.data[i][0];
+         GLint y = (GLint)  VB->Win.data[i][1];
+         GLint z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
 
          if (isize & 1) {
             /* odd size */
@@ -240,10 +244,10 @@
             y1 = y0 + isize - 1;
          }
 
-         PB_SET_INDEX( ctx, PB, VB->IndexPtr->data[i] );
+         PB_SET_INDEX( PB, VB->IndexPtr->data[i] );
 
-         for (iy=y0;iy<=y1;iy++) {
-            for (ix=x0;ix<=x1;ix++) {
+         for (iy = y0; iy <= y1; iy++) {
+            for (ix = x0; ix <= x1; ix++) {
                PB_WRITE_PIXEL( PB, ix, iy, z );
             }
          }
@@ -256,23 +260,23 @@
 /*
  * General RGBA points.
  */
-static void general_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
+static void
+general_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
-   GLuint i;
-   GLint isize = (GLint) (CLAMP(ctx->Point.Size,MIN_POINT_SIZE,MAX_POINT_SIZE) + 0.5F);
+   GLint isize = (GLint) (ctx->Point.Size + 0.5F);
    GLint radius = isize >> 1;
+   GLuint i;
 
-   for (i=first;i<=last;i++) {
-      if (VB->ClipMask[i]==0) {
-         GLint x, y, z;
+   for (i = first; i <= last; i++) {
+      if (VB->ClipMask[i] == 0) {
          GLint x0, x1, y0, y1;
          GLint ix, iy;
 
-         x = (GLint)  VB->Win.data[i][0];
-         y = (GLint)  VB->Win.data[i][1];
-         z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+         GLint x = (GLint)  VB->Win.data[i][0];
+         GLint y = (GLint)  VB->Win.data[i][1];
+         GLint z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
 
          if (isize & 1) {
             /* odd size */
@@ -289,14 +293,14 @@
             y1 = y0 + isize - 1;
          }
 
-         PB_SET_COLOR( ctx, PB,
+         PB_SET_COLOR( PB,
                        VB->ColorPtr->data[i][0],
                        VB->ColorPtr->data[i][1],
                        VB->ColorPtr->data[i][2],
                        VB->ColorPtr->data[i][3] );
 
-         for (iy=y0;iy<=y1;iy++) {
-            for (ix=x0;ix<=x1;ix++) {
+         for (iy = y0; iy <= y1; iy++) {
+            for (ix = x0; ix <= x1; ix++) {
                PB_WRITE_PIXEL( PB, ix, iy, z );
             }
          }
@@ -311,28 +315,26 @@
 /*
  * Textured RGBA points.
  */
-static void textured_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
+static void
+textured_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
    GLuint i;
 
-   for (i=first;i<=last;i++) {
-      if (VB->ClipMask[i]==0) {
-         GLint x, y, z;
+   for (i = first; i <= last; i++) {
+      if (VB->ClipMask[i] == 0) {
          GLint x0, x1, y0, y1;
-         GLint ix, iy;
-         GLint isize, radius;
+         GLint ix, iy, radius;
          GLint red, green, blue, alpha;
          GLfloat s, t, u;
 
-         x = (GLint)  VB->Win.data[i][0];
-         y = (GLint)  VB->Win.data[i][1];
-         z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+         GLint x = (GLint)  VB->Win.data[i][0];
+         GLint y = (GLint)  VB->Win.data[i][1];
+         GLint z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+         GLint isize = (GLint) (ctx->Point.Size + 0.5F);
 
-         isize = (GLint)
-                   (CLAMP(ctx->Point.Size,MIN_POINT_SIZE,MAX_POINT_SIZE) + 0.5F);
-         if (isize<1) {
+         if (isize < 1) {
             isize = 1;
          }
          radius = isize >> 1;
@@ -388,12 +390,12 @@
          PB_SET_COLOR( red, green, blue, alpha );
 */
 
-         for (iy=y0;iy<=y1;iy++) {
-            for (ix=x0;ix<=x1;ix++) {
+         for (iy = y0; iy <= y1; iy++) {
+            for (ix = x0; ix <= x1; ix++) {
                PB_WRITE_TEX_PIXEL( PB, ix, iy, z, red, green, blue, alpha, s, t, u );
             }
          }
-         PB_CHECK_FLUSH(ctx,PB);
+         PB_CHECK_FLUSH(ctx, PB);
       }
    }
 }
@@ -402,29 +404,28 @@
 /*
  * Multitextured RGBA points.
  */
-static void multitextured_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
+static void
+multitextured_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
    GLuint i;
 
-   for (i=first;i<=last;i++) {
-      if (VB->ClipMask[i]==0) {
-         GLint x, y, z;
+   for (i = first; i <= last; i++) {
+      if (VB->ClipMask[i] == 0) {
          GLint x0, x1, y0, y1;
          GLint ix, iy;
-         GLint isize, radius;
+         GLint radius;
          GLint red, green, blue, alpha;
          GLfloat s, t, u;
          GLfloat s1, t1, u1;
 
-         x = (GLint)  VB->Win.data[i][0];
-         y = (GLint)  VB->Win.data[i][1];
-         z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+         GLint x = (GLint)  VB->Win.data[i][0];
+         GLint y = (GLint)  VB->Win.data[i][1];
+         GLint z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+         GLint isize = (GLint) (ctx->Point.Size + 0.5F);
 
-         isize = (GLint)
-                   (CLAMP(ctx->Point.Size,MIN_POINT_SIZE,MAX_POINT_SIZE) + 0.5F);
-         if (isize<1) {
+         if (isize < 1) {
             isize = 1;
          }
          radius = isize >> 1;
@@ -505,10 +506,11 @@
 
          for (iy=y0;iy<=y1;iy++) {
             for (ix=x0;ix<=x1;ix++) {
-               PB_WRITE_MULTITEX_PIXEL( PB, ix, iy, z, red, green, blue, alpha, s, t, u, s1, t1, u1 );
+               PB_WRITE_MULTITEX_PIXEL( PB, ix, iy, z, red, green, blue, alpha,
+                                        s, t, u, s1, t1, u1 );
             }
          }
-         PB_CHECK_FLUSH(ctx,PB);
+         PB_CHECK_FLUSH(ctx, PB);
       }
    }
 }
@@ -519,35 +521,32 @@
 /*
  * Antialiased points with or without texture mapping.
  */
-static void antialiased_rgba_points( GLcontext *ctx,
-                                     GLuint first, GLuint last )
+static void
+antialiased_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
+   const GLfloat radius = ctx->Point.Size * 0.5F;
+   const GLfloat rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */
+   const GLfloat rmax = radius + 0.7071F;
+   const GLfloat rmin2 = rmin * rmin;
+   const GLfloat rmax2 = rmax * rmax;
+   const GLfloat cscale = 256.0F / (rmax2 - rmin2);
    GLuint i;
-   GLfloat radius, rmin, rmax, rmin2, rmax2, cscale;
-
-   radius = CLAMP( ctx->Point.Size, MIN_POINT_SIZE, MAX_POINT_SIZE ) * 0.5F;
-   rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */
-   rmax = radius + 0.7071F;
-   rmin2 = rmin*rmin;
-   rmax2 = rmax*rmax;
-   cscale = 256.0F / (rmax2-rmin2);
 
    if (ctx->Texture.ReallyEnabled) {
-      for (i=first;i<=last;i++) {
-         if (VB->ClipMask[i]==0) {
-            GLint xmin, ymin, xmax, ymax;
-            GLint x, y, z;
+      for (i = first; i <= last; i++) {
+         if (VB->ClipMask[i] == 0) {
+            GLint x, y;
             GLint red, green, blue, alpha;
             GLfloat s, t, u;
             GLfloat s1, t1, u1;
 
-            xmin = (GLint) (VB->Win.data[i][0] - radius);
-            xmax = (GLint) (VB->Win.data[i][0] + radius);
-            ymin = (GLint) (VB->Win.data[i][1] - radius);
-            ymax = (GLint) (VB->Win.data[i][1] + radius);
-            z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+            GLint xmin = (GLint) (VB->Win.data[i][0] - radius);
+            GLint xmax = (GLint) (VB->Win.data[i][0] + radius);
+            GLint ymin = (GLint) (VB->Win.data[i][1] - radius);
+            GLint ymax = (GLint) (VB->Win.data[i][1] + radius);
+            GLint z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
 
             red   = VB->ColorPtr->data[i][0];
             green = VB->ColorPtr->data[i][1];
@@ -690,7 +689,8 @@
 /*
  * Null rasterizer for measuring transformation speed.
  */
-static void null_points( GLcontext *ctx, GLuint first, GLuint last )
+static void
+null_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    (void) ctx;
    (void) first;
@@ -704,35 +704,36 @@
 /* Calculates the distance attenuation formula of a vector of points in
  * eye space coordinates 
  */
-static void dist3(GLfloat *out, GLuint first, GLuint last,
-		  const GLcontext *ctx, const GLvector4f *v)
+static void
+dist3(GLfloat *out, GLuint first, GLuint last,
+      const GLcontext *ctx, const GLvector4f *v)
 {
    GLuint stride = v->stride;
-   GLfloat *p = VEC_ELT(v, GLfloat, first);
+   const GLfloat *p = VEC_ELT(v, GLfloat, first);
    GLuint i;
 
-   for (i = first ; i <= last ; i++, STRIDE_F(p, stride) )
-   {
+   for (i = first ; i <= last ; i++, STRIDE_F(p, stride) ) {
       GLfloat dist = GL_SQRT(p[0]*p[0]+p[1]*p[1]+p[2]*p[2]);
-      out[i] = 1/(ctx->Point.Params[0]+ 
-		  dist * (ctx->Point.Params[1] +
-			  dist * ctx->Point.Params[2]));
+      out[i] = 1.0F / (ctx->Point.Params[0] +
+                       dist * (ctx->Point.Params[1] +
+                               dist * ctx->Point.Params[2]));
    }
 }
+
 
-static void dist2(GLfloat *out, GLuint first, GLuint last,
-		  const GLcontext *ctx, const GLvector4f *v)
+static void
+dist2(GLfloat *out, GLuint first, GLuint last,
+      const GLcontext *ctx, const GLvector4f *v)
 {
    GLuint stride = v->stride;
-   GLfloat *p = VEC_ELT(v, GLfloat, first);
+   const GLfloat *p = VEC_ELT(v, GLfloat, first);
    GLuint i;
 
-   for (i = first ; i <= last ; i++, STRIDE_F(p, stride) )
-   {
+   for (i = first ; i <= last ; i++, STRIDE_F(p, stride) ) {
       GLfloat dist = GL_SQRT(p[0]*p[0]+p[1]*p[1]);
-      out[i] = 1/(ctx->Point.Params[0]+ 
-		  dist * (ctx->Point.Params[1] +
-			  dist * ctx->Point.Params[2]));
+      out[i] = 1.0F / (ctx->Point.Params[0] +
+                       dist * (ctx->Point.Params[1] +
+                               dist * ctx->Point.Params[2]));
    }
 }
 
@@ -750,8 +751,9 @@
 };
 
 
-static void clip_dist(GLfloat *out, GLuint first, GLuint last,
-		      const GLcontext *ctx, GLvector4f *clip)
+static void
+clip_dist(GLfloat *out, GLuint first, GLuint last,
+          const GLcontext *ctx, GLvector4f *clip)
 {
    /* this is never called */
    gl_problem(NULL, "clip_dist() called - dead code!\n");
@@ -782,15 +784,14 @@
 /*
  * Distance Attenuated General CI points.
  */
-static void dist_atten_general_ci_points( GLcontext *ctx, GLuint first, 
-					GLuint last )
+static void
+dist_atten_general_ci_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
-   GLuint i;
-   GLfloat psize,dsize;
    GLfloat dist[VB_SIZE];
-   psize=CLAMP(ctx->Point.Size,MIN_POINT_SIZE,MAX_POINT_SIZE);
+   const GLfloat psize = ctx->Point.Size;
+   GLuint i;
 
    if (ctx->NeedEyeCoords)
       (eye_dist_tab[VB->EyePtr->size])( dist, first, last, ctx, VB->EyePtr );
@@ -799,21 +800,20 @@
 
    for (i=first;i<=last;i++) {
       if (VB->ClipMask[i]==0) {
-         GLint x, y, z;
          GLint x0, x1, y0, y1;
          GLint ix, iy;
          GLint isize, radius;
+         GLint x = (GLint)  VB->Win.data[i][0];
+         GLint y = (GLint)  VB->Win.data[i][1];
+         GLint z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+         GLfloat dsize = psize * dist[i];
 
-         x = (GLint)  VB->Win.data[i][0];
-         y = (GLint)  VB->Win.data[i][1];
-         z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
-
-         dsize=psize*dist[i];
-         if(dsize>=ctx->Point.Threshold) {
-            isize=(GLint) (MIN2(dsize,ctx->Point.MaxSize)+0.5F);
-         } else {
-            isize=(GLint) (MAX2(ctx->Point.Threshold,ctx->Point.MinSize)+0.5F);
+         if (dsize >= ctx->Point.Threshold) {
+            isize = (GLint) (MIN2(dsize, ctx->Point.MaxSize) + 0.5F);
          }
+         else {
+            isize = (GLint) (MAX2(ctx->Point.Threshold, ctx->Point.MinSize) + 0.5F);
+         }
          radius = isize >> 1;
 
          if (isize & 1) {
@@ -831,7 +831,7 @@
             y1 = y0 + isize - 1;
          }
 
-         PB_SET_INDEX( ctx, PB, VB->IndexPtr->data[i] );
+         PB_SET_INDEX( PB, VB->IndexPtr->data[i] );
 
          for (iy=y0;iy<=y1;iy++) {
             for (ix=x0;ix<=x1;ix++) {
@@ -846,16 +846,14 @@
 /*
  * Distance Attenuated General RGBA points.
  */
-static void dist_atten_general_rgba_points( GLcontext *ctx, GLuint first, 
-				GLuint last )
+static void
+dist_atten_general_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
-   GLuint i;
-   GLubyte alpha;
-   GLfloat psize,dsize;
    GLfloat dist[VB_SIZE];
-   psize=CLAMP(ctx->Point.Size,MIN_POINT_SIZE,MAX_POINT_SIZE);
+   const GLfloat psize = ctx->Point.Size;
+   GLuint i;
 
    if (ctx->NeedEyeCoords)
       (eye_dist_tab[VB->EyePtr->size])( dist, first, last, ctx, VB->EyePtr );
@@ -864,15 +862,15 @@
 
    for (i=first;i<=last;i++) {
       if (VB->ClipMask[i]==0) {
-         GLint x, y, z;
          GLint x0, x1, y0, y1;
          GLint ix, iy;
          GLint isize, radius;
+         GLint x = (GLint)  VB->Win.data[i][0];
+         GLint y = (GLint)  VB->Win.data[i][1];
+         GLint z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+         GLfloat dsize=psize*dist[i];
+         GLubyte alpha;
 
-         x = (GLint)  VB->Win.data[i][0];
-         y = (GLint)  VB->Win.data[i][1];
-         z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
-         dsize=psize*dist[i];
          if (dsize >= ctx->Point.Threshold) {
             isize = (GLint) (MIN2(dsize,ctx->Point.MaxSize)+0.5F);
             alpha = VB->ColorPtr->data[i][3];
@@ -899,7 +897,7 @@
             y1 = y0 + isize - 1;
          }
 
-         PB_SET_COLOR( ctx, PB,
+         PB_SET_COLOR( PB,
                        VB->ColorPtr->data[i][0],
                        VB->ColorPtr->data[i][1],
                        VB->ColorPtr->data[i][2],
@@ -918,15 +916,14 @@
 /*
  *  Distance Attenuated Textured RGBA points.
  */
-static void dist_atten_textured_rgba_points( GLcontext *ctx, GLuint first, 
-					GLuint last )
+static void
+dist_atten_textured_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
-   GLuint i;
-   GLfloat psize,dsize;
    GLfloat dist[VB_SIZE];
-   psize=CLAMP(ctx->Point.Size,MIN_POINT_SIZE,MAX_POINT_SIZE);
+   const GLfloat psize = ctx->Point.Size;
+   GLuint i;
 
    if (ctx->NeedEyeCoords)
       (eye_dist_tab[VB->EyePtr->size])( dist, first, last, ctx, VB->EyePtr );
@@ -935,7 +932,6 @@
 
    for (i=first;i<=last;i++) {
       if (VB->ClipMask[i]==0) {
-         GLint x, y, z;
          GLint x0, x1, y0, y1;
          GLint ix, iy;
          GLint isize, radius;
@@ -943,21 +939,22 @@
          GLfloat s, t, u;
          GLfloat s1, t1, u1;
 
-         x = (GLint)  VB->Win.data[i][0];
-         y = (GLint)  VB->Win.data[i][1];
-         z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
-
-         dsize=psize*dist[i];
-         if(dsize>=ctx->Point.Threshold) {
-            isize=(GLint) (MIN2(dsize,ctx->Point.MaxSize)+0.5F);
-            alpha=VB->ColorPtr->data[i][3];
-         } else {
-            isize=(GLint) (MAX2(ctx->Point.Threshold,ctx->Point.MinSize)+0.5F);
-            dsize/=ctx->Point.Threshold;
-            alpha = (GLint) (VB->ColorPtr->data[i][3]* (dsize*dsize));
+         GLint x = (GLint)  VB->Win.data[i][0];
+         GLint y = (GLint)  VB->Win.data[i][1];
+         GLint z = (GLint) (VB->Win.data[i][2] + ctx->PointZoffset);
+
+         GLfloat dsize = psize*dist[i];
+         if(dsize >= ctx->Point.Threshold) {
+            isize = (GLint) (MIN2(dsize, ctx->Point.MaxSize) + 0.5F);
+            alpha = VB->ColorPtr->data[i][3];
          }
+         else {
+            isize = (GLint) (MAX2(ctx->Point.Threshold, ctx->Point.MinSize) + 0.5F);
+            dsize /= ctx->Point.Threshold;
+            alpha = (GLint) (VB->ColorPtr->data[i][3] * (dsize * dsize));
+         }
 
-         if (isize<1) {
+         if (isize < 1) {
             isize = 1;
          }
          radius = isize >> 1;
@@ -1066,16 +1063,14 @@
 /*
  * Distance Attenuated Antialiased points with or without texture mapping.
  */
-static void dist_atten_antialiased_rgba_points( GLcontext *ctx,
-                                     GLuint first, GLuint last )
+static void
+dist_atten_antialiased_rgba_points( GLcontext *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = ctx->VB;
    struct pixel_buffer *PB = ctx->PB;
-   GLuint i;
-   GLfloat radius, rmin, rmax, rmin2, rmax2, cscale;
-   GLfloat psize,dsize,alphaf;
    GLfloat dist[VB_SIZE];
-   psize=CLAMP(ctx->Point.Size,MIN_POINT_SIZE,MAX_POINT_SIZE);
+   const GLfloat psize = ctx->Point.Size;
+   GLuint i;
 
    if (ctx->NeedEyeCoords)
       (eye_dist_tab[VB->EyePtr->size])( dist, first, last, ctx, VB->EyePtr );
@@ -1085,20 +1080,22 @@
    if (ctx->Texture.ReallyEnabled) {
       for (i=first;i<=last;i++) {
          if (VB->ClipMask[i]==0) {
+            GLfloat radius, rmin, rmax, rmin2, rmax2, cscale, alphaf;
             GLint xmin, ymin, xmax, ymax;
             GLint x, y, z;
             GLint red, green, blue, alpha;
             GLfloat s, t, u;
             GLfloat s1, t1, u1;
+            GLfloat dsize = psize * dist[i];
 
-            dsize=psize*dist[i];
-            if(dsize>=ctx->Point.Threshold) {
-               radius=(MIN2(dsize,ctx->Point.MaxSize)*0.5F);
-               alphaf=1.0;
-            } else {
-               radius=(MAX2(ctx->Point.Threshold,ctx->Point.MinSize)*0.5F);
-               dsize/=ctx->Point.Threshold;
-               alphaf=(dsize*dsize);
+            if (dsize >= ctx->Point.Threshold) {
+               radius = MIN2(dsize, ctx->Point.MaxSize) * 0.5F;
+               alphaf = 1.0F;
+            }
+            else {
+               radius = (MAX2(ctx->Point.Threshold, ctx->Point.MinSize) * 0.5F);
+               dsize /= ctx->Point.Threshold;
+               alphaf = (dsize*dsize);
             }
             rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */
             rmax = radius + 0.7071F;
@@ -1180,23 +1177,25 @@
 	       }
 	    }
 
-            for (y=ymin;y<=ymax;y++) {
-               for (x=xmin;x<=xmax;x++) {
+            for (y = ymin; y <= ymax; y++) {
+               for (x = xmin; x <= xmax; x++) {
                   GLfloat dx = x/*+0.5F*/ - VB->Win.data[i][0];
                   GLfloat dy = y/*+0.5F*/ - VB->Win.data[i][1];
                   GLfloat dist2 = dx*dx + dy*dy;
-                  if (dist2<rmax2) {
+                  if (dist2 < rmax2) {
                      alpha = VB->ColorPtr->data[i][3];
-                     if (dist2>=rmin2) {
-                        GLint coverage = (GLint) (256.0F-(dist2-rmin2)*cscale);
+                     if (dist2 >= rmin2) {
+                        GLint coverage = (GLint) (256.0F - (dist2 - rmin2) * cscale);
                         /* coverage is in [0,256] */
                         alpha = (alpha * coverage) >> 8;
                      }
                      alpha = (GLint) (alpha * alphaf);
                      if (ctx->Texture.ReallyEnabled >= TEXTURE1_1D) {
-                        PB_WRITE_MULTITEX_PIXEL( PB, x,y,z, red, green, blue, alpha, s, t, u, s1, t1, u1 );
+                        PB_WRITE_MULTITEX_PIXEL( PB, x,y,z, red, green, blue,
+                                                 alpha, s, t, u, s1, t1, u1 );
                      } else {
-                        PB_WRITE_TEX_PIXEL( PB, x,y,z, red, green, blue, alpha, s, t, u );
+                        PB_WRITE_TEX_PIXEL( PB, x,y,z, red, green, blue, alpha,
+                                            s, t, u );
                      }
                   }
                }
@@ -1207,26 +1206,28 @@
    }
    else {
       /* Not texture mapped */
-      for (i=first;i<=last;i++) {
-         if (VB->ClipMask[i]==0) {
+      for (i = first; i <= last; i++) {
+         if (VB->ClipMask[i] == 0) {
+            GLfloat radius, rmin, rmax, rmin2, rmax2, cscale, alphaf;
             GLint xmin, ymin, xmax, ymax;
             GLint x, y, z;
             GLint red, green, blue, alpha;
+            GLfloat dsize = psize * dist[i];
 
-            dsize=psize*dist[i];
-            if(dsize>=ctx->Point.Threshold) {
-               radius=(MIN2(dsize,ctx->Point.MaxSize)*0.5F);
-               alphaf=1.0;
-            } else {
-               radius=(MAX2(ctx->Point.Threshold,ctx->Point.MinSize)*0.5F);
-               dsize/=ctx->Point.Threshold;
-               alphaf=(dsize*dsize);
+            if (dsize >= ctx->Point.Threshold) {
+               radius = MIN2(dsize, ctx->Point.MaxSize) * 0.5F;
+               alphaf = 1.0F;
             }
+            else {
+               radius = (MAX2(ctx->Point.Threshold, ctx->Point.MinSize) * 0.5F);
+               dsize /= ctx->Point.Threshold;
+               alphaf = dsize * dsize;
+            }
             rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */
             rmax = radius + 0.7071F;
-            rmin2 = rmin*rmin;
-            rmax2 = rmax*rmax;
-            cscale = 256.0F / (rmax2-rmin2);
+            rmin2 = rmin * rmin;
+            rmax2 = rmax * rmax;
+            cscale = 256.0F / (rmax2 - rmin2);
 
             xmin = (GLint) (VB->Win.data[i][0] - radius);
             xmax = (GLint) (VB->Win.data[i][0] + radius);
@@ -1238,21 +1239,20 @@
             green = VB->ColorPtr->data[i][1];
             blue  = VB->ColorPtr->data[i][2];
 
-            for (y=ymin;y<=ymax;y++) {
-               for (x=xmin;x<=xmax;x++) {
+            for (y = ymin; y <= ymax; y++) {
+               for (x = xmin; x <= xmax; x++) {
                   GLfloat dx = x/*+0.5F*/ - VB->Win.data[i][0];
                   GLfloat dy = y/*+0.5F*/ - VB->Win.data[i][1];
-                  GLfloat dist2 = dx*dx + dy*dy;
-                  if (dist2<rmax2) {
+                  GLfloat dist2 = dx * dx + dy * dy;
+                  if (dist2 < rmax2) {
 		     alpha = VB->ColorPtr->data[i][3];
-                     if (dist2>=rmin2) {
-                        GLint coverage = (GLint) (256.0F-(dist2-rmin2)*cscale);
+                     if (dist2 >= rmin2) {
+                        GLint coverage = (GLint) (256.0F - (dist2 - rmin2) * cscale);
                         /* coverage is in [0,256] */
                         alpha = (alpha * coverage) >> 8;
                      }
                      alpha = (GLint) (alpha * alphaf);
-                     PB_WRITE_RGBA_PIXEL( PB, x, y, z, red, green, blue, alpha )
-			;
+                     PB_WRITE_RGBA_PIXEL(PB, x, y, z, red, green, blue, alpha);
                   }
                }
             }
@@ -1263,6 +1263,43 @@
 }
 
 
+#ifdef DEBUG
+void
+_mesa_print_points_function(GLcontext *ctx)
+{
+   printf("Point Func == ");
+   if (ctx->Driver.PointsFunc == size1_ci_points)
+      printf("size1_ci_points\n");
+   else if (ctx->Driver.PointsFunc == size1_rgba_points)
+      printf("size1_rgba_points\n");
+   else if (ctx->Driver.PointsFunc == general_ci_points)
+      printf("general_ci_points\n");
+   else if (ctx->Driver.PointsFunc == general_rgba_points)
+      printf("general_rgba_points\n");
+   else if (ctx->Driver.PointsFunc == textured_rgba_points)
+      printf("textured_rgba_points\n");
+   else if (ctx->Driver.PointsFunc == multitextured_rgba_points)
+      printf("multitextured_rgba_points\n");
+   else if (ctx->Driver.PointsFunc == antialiased_rgba_points)
+      printf("antialiased_rgba_points\n");
+   else if (ctx->Driver.PointsFunc == null_points)
+      printf("null_points\n");
+   else if (ctx->Driver.PointsFunc == dist_atten_general_ci_points)
+      printf("dist_atten_general_ci_points\n");
+   else if (ctx->Driver.PointsFunc == dist_atten_general_rgba_points)
+      printf("dist_atten_general_rgba_points\n");
+   else if (ctx->Driver.PointsFunc == dist_atten_textured_rgba_points)
+      printf("dist_atten_textured_rgba_points\n");
+   else if (ctx->Driver.PointsFunc == dist_atten_antialiased_rgba_points)
+      printf("dist_atten_antialiased_rgba_points\n");
+   else if (!ctx->Driver.PointsFunc)
+      printf("NULL\n");
+   else
+      printf("Driver func %p\n", ctx->Driver.PointsFunc);
+}
+#endif
+
+
 /*
  * Examine the current context to determine which point drawing function
  * should be used.
@@ -1331,5 +1368,6 @@
       ctx->Driver.PointsFunc = gl_select_points;
    }
 
+   /*_mesa_print_points_function(ctx);*/
 }
 
Index: xc/extras/Mesa/src/polygon.c
diff -u xc/extras/Mesa/src/polygon.c:1.3 xc/extras/Mesa/src/polygon.c:1.4
--- xc/extras/Mesa/src/polygon.c:1.3	Mon Feb 14 23:12:31 2000
+++ xc/extras/Mesa/src/polygon.c	Fri Jun 16 17:02:15 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -131,24 +131,23 @@
 
 
 
-/*
- * NOTE:  stipple pattern has already been unpacked.
- */
 void
-_mesa_PolygonStipple( const GLubyte *mask )
+_mesa_PolygonStipple( const GLubyte *pattern )
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLuint *pattern = (GLuint *) mask;  /* XXX verify */
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPolygonStipple");
 
    if (MESA_VERBOSE&VERBOSE_API)
       fprintf(stderr, "glPolygonStipple\n");
 
-   MEMCPY( ctx->PolygonStipple, pattern, 32 * 4 );
+   _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
 
    if (ctx->Polygon.StippleFlag) {
       ctx->NewState |= NEW_RASTER_OPS;
    }
+   
+   if (ctx->Driver.PolygonStipple)
+      ctx->Driver.PolygonStipple( ctx, (const GLubyte *) ctx->PolygonStipple );
 }
 
 
@@ -162,7 +161,7 @@
    if (MESA_VERBOSE&VERBOSE_API)
       fprintf(stderr, "glGetPolygonStipple\n");
 
-   gl_pack_polygon_stipple( ctx, ctx->PolygonStipple, dest );
+   _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
 }
 
 
@@ -181,9 +180,11 @@
 }
 
 
+
 void
 _mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
 {
-   _mesa_PolygonOffset(factor, bias * DEPTH_SCALE );
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPolygonOffsetEXT");
+   _mesa_PolygonOffset(factor, bias * ctx->Visual->DepthMaxF );
 }
-
Index: xc/extras/Mesa/src/rastpos.c
diff -u xc/extras/Mesa/src/rastpos.c:1.3 xc/extras/Mesa/src/rastpos.c:1.4
--- xc/extras/Mesa/src/rastpos.c:1.3	Mon Feb 14 23:12:31 2000
+++ xc/extras/Mesa/src/rastpos.c	Fri Jun 16 17:02:15 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -131,7 +131,7 @@
    ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport.WindowMap.m[MAT_SY] + 
 				ctx->Viewport.WindowMap.m[MAT_TY]);
    ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport.WindowMap.m[MAT_SZ] + 
-				ctx->Viewport.WindowMap.m[MAT_TZ]) / DEPTH_SCALE;
+				ctx->Viewport.WindowMap.m[MAT_TZ]) / ctx->Visual->DepthMaxF;
    ctx->Current.RasterPos[3] = clip[3];
    ctx->Current.RasterPosValid = GL_TRUE;
 
Index: xc/extras/Mesa/src/readpix.c
diff -u xc/extras/Mesa/src/readpix.c:1.3 xc/extras/Mesa/src/readpix.c:1.4
--- xc/extras/Mesa/src/readpix.c:1.3	Mon Feb 14 23:12:32 2000
+++ xc/extras/Mesa/src/readpix.c	Fri Jun 16 17:02:15 2000
@@ -75,14 +75,14 @@
       (*ctx->Driver.ReadCI32Span)( ctx, readWidth, x, y, index );
 
       if (ctx->Pixel.IndexShift!=0 || ctx->Pixel.IndexOffset!=0) {
-         gl_shift_and_offset_ci( ctx, readWidth, index);
+         _mesa_shift_and_offset_ci( ctx, readWidth, index);
       }
 
       if (ctx->Pixel.MapColorFlag) {
-         gl_map_ci(ctx, readWidth, index);
+         _mesa_map_ci(ctx, readWidth, index);
       }
 
-      dest = gl_pixel_addr_in_image(packing, pixels,
+      dest = _mesa_image_address(packing, pixels,
                          width, height, GL_COLOR_INDEX, type, 0, j, 0);
 
       switch (type) {
@@ -109,7 +109,7 @@
 		  dst[i] = (GLushort) index[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap2( (GLushort *) dst, readWidth );
+		  _mesa_swap2( (GLushort *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -120,7 +120,7 @@
 		  dst[i] = (GLshort) index[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap2( (GLushort *) dst, readWidth );
+		  _mesa_swap2( (GLushort *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -131,7 +131,7 @@
 		  dst[i] = (GLuint) index[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap4( (GLuint *) dst, readWidth );
+		  _mesa_swap4( (GLuint *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -142,7 +142,7 @@
 		  dst[i] = (GLint) index[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap4( (GLuint *) dst, readWidth );
+		  _mesa_swap4( (GLuint *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -153,7 +153,7 @@
 		  dst[i] = (GLfloat) index[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap4( (GLuint *) dst, readWidth );
+		  _mesa_swap4( (GLuint *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -199,36 +199,30 @@
 
    bias_or_scale = ctx->Pixel.DepthBias!=0.0 || ctx->Pixel.DepthScale!=1.0;
 
-   if (type==GL_UNSIGNED_SHORT && sizeof(GLdepth)==sizeof(GLushort)
+   if (type==GL_UNSIGNED_SHORT && ctx->Visual->DepthBits == 16
        && !bias_or_scale && !packing->SwapBytes) {
       /* Special case: directly read 16-bit unsigned depth values. */
       for (j=0;j<height;j++,y++) {
-         GLushort *dst = (GLushort*) gl_pixel_addr_in_image( packing, pixels,
+         GLdepth depth[MAX_WIDTH];
+         GLushort *dst = (GLushort*) _mesa_image_address( packing, pixels,
                          width, height, GL_DEPTH_COMPONENT, type, 0, j, 0 );
-         (*ctx->Driver.ReadDepthSpan)( ctx, width, x, y, (GLdepth*) dst);
+         GLint i;
+         _mesa_read_depth_span(ctx, width, x, y, depth);
+         for (i = 0; i < width; i++)
+            dst[i] = depth[i];
       }
    }
-   else if (type==GL_UNSIGNED_INT && sizeof(GLdepth)==sizeof(GLuint)
+   else if (type==GL_UNSIGNED_INT && ctx->Visual->DepthBits == 32
             && !bias_or_scale && !packing->SwapBytes) {
       /* Special case: directly read 32-bit unsigned depth values. */
-      /* Compute shift value to scale depth values up to 32-bit uints. */
-      GLuint shift = 0;
-      GLuint max = MAX_DEPTH;
-      while ((max&0x80000000)==0) {
-         max = max << 1;
-         shift++;
-      }
       for (j=0;j<height;j++,y++) {
-         GLuint *dst = (GLuint *) gl_pixel_addr_in_image( packing, pixels,
+         GLdepth *dst = (GLdepth *) _mesa_image_address( packing, pixels,
                          width, height, GL_DEPTH_COMPONENT, type, 0, j, 0 );
-         (*ctx->Driver.ReadDepthSpan)( ctx, width, x, y, (GLdepth*) dst);
-         for (i=0;i<width;i++) {
-            dst[i] = dst[i] << shift;
-         }
+         _mesa_read_depth_span(ctx, width, x, y, dst);
       }
    }
    else {
-      /* General case (slow) */
+      /* General case (slower) */
       for (j=0;j<height;j++,y++) {
          GLfloat depth[MAX_WIDTH];
          GLvoid *dest;
@@ -243,7 +237,7 @@
             }
          }
 
-         dest = gl_pixel_addr_in_image(packing, pixels,
+         dest = _mesa_image_address(packing, pixels,
                          width, height, GL_DEPTH_COMPONENT, type, 0, j, 0);
 
          switch (type) {
@@ -270,7 +264,7 @@
                      dst[i] = FLOAT_TO_USHORT( depth[i] );
                   }
                   if (packing->SwapBytes) {
-                     gl_swap2( (GLushort *) dst, readWidth );
+                     _mesa_swap2( (GLushort *) dst, readWidth );
                   }
                }
                break;
@@ -281,7 +275,7 @@
                      dst[i] = FLOAT_TO_SHORT( depth[i] );
                   }
                   if (packing->SwapBytes) {
-                     gl_swap2( (GLushort *) dst, readWidth );
+                     _mesa_swap2( (GLushort *) dst, readWidth );
                   }
                }
                break;
@@ -292,7 +286,7 @@
                      dst[i] = FLOAT_TO_UINT( depth[i] );
                   }
                   if (packing->SwapBytes) {
-                     gl_swap4( (GLuint *) dst, readWidth );
+                     _mesa_swap4( (GLuint *) dst, readWidth );
                   }
                }
                break;
@@ -303,7 +297,7 @@
                      dst[i] = FLOAT_TO_INT( depth[i] );
                   }
                   if (packing->SwapBytes) {
-                     gl_swap4( (GLuint *) dst, readWidth );
+                     _mesa_swap4( (GLuint *) dst, readWidth );
                   }
                }
                break;
@@ -314,7 +308,7 @@
                      dst[i] = depth[i];
                   }
                   if (packing->SwapBytes) {
-                     gl_swap4( (GLuint *) dst, readWidth );
+                     _mesa_swap4( (GLuint *) dst, readWidth );
                   }
                }
                break;
@@ -364,17 +358,17 @@
       GLvoid *dest;
       GLstencil stencil[MAX_WIDTH];
 
-      gl_read_stencil_span( ctx, readWidth, x, y, stencil );
+      _mesa_read_stencil_span( ctx, readWidth, x, y, stencil );
 
       if (shift_or_offset) {
-         gl_shift_and_offset_stencil( ctx, readWidth, stencil );
+         _mesa_shift_and_offset_stencil( ctx, readWidth, stencil );
       }
 
       if (ctx->Pixel.MapStencilFlag) {
-         gl_map_stencil( ctx, readWidth, stencil );
+         _mesa_map_stencil( ctx, readWidth, stencil );
       }
 
-      dest = gl_pixel_addr_in_image( packing, pixels,
+      dest = _mesa_image_address( packing, pixels,
                           width, height, GL_STENCIL_INDEX, type, 0, j, 0 );
 
       switch (type) {
@@ -407,7 +401,7 @@
 		  dst[i] = (GLushort) stencil[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap2( (GLushort *) dst, readWidth );
+		  _mesa_swap2( (GLushort *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -418,7 +412,7 @@
 		  dst[i] = (GLshort) stencil[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap2( (GLushort *) dst, readWidth );
+		  _mesa_swap2( (GLushort *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -429,7 +423,7 @@
 		  dst[i] = (GLuint) stencil[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap4( (GLuint *) dst, readWidth );
+		  _mesa_swap4( (GLuint *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -440,7 +434,7 @@
 		  *dst++ = (GLint) stencil[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap4( (GLuint *) dst, readWidth );
+		  _mesa_swap4( (GLuint *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -451,7 +445,7 @@
 		  dst[i] = (GLfloat) stencil[i];
 	       }
 	       if (packing->SwapBytes) {
-		  gl_swap4( (GLuint *) dst, readWidth );
+		  _mesa_swap4( (GLuint *) dst, readWidth );
 	       }
 	    }
 	    break;
@@ -506,8 +500,19 @@
                        GLvoid *pixels,
                        const struct gl_pixelstore_attrib *packing )
 {
-   /* can't do scale, bias or mapping */
-   if (ctx->Pixel.ScaleOrBiasRGBA || ctx->Pixel.MapColorFlag)
+   GLboolean applyTransferOps;
+
+   applyTransferOps = ctx->Pixel.ScaleOrBiasRGBA ||
+                      ctx->Pixel.MapColorFlag ||
+                      ctx->ColorMatrix.type != MATRIX_IDENTITY ||
+                      ctx->Pixel.ScaleOrBiasRGBApcm ||
+                      ctx->Pixel.ColorTableEnabled ||
+                      ctx->Pixel.PostColorMatrixColorTableEnabled ||
+                      ctx->Pixel.MinMaxEnabled ||
+                      ctx->Pixel.HistogramEnabled;
+
+   /* can't do scale, bias, mapping, etc */
+   if (applyTransferOps)
        return GL_FALSE;
 
    /* can't do fancy pixel packing */
@@ -564,9 +569,9 @@
          for (row=0; row<readHeight; row++) {
             (*ctx->Driver.ReadRGBASpan)(ctx, readWidth, srcX, srcY,
                                         (GLubyte (*)[4]) dest);
-            if (ctx->Visual->SoftwareAlpha) {
-               gl_read_alpha_span(ctx, readWidth, srcX, srcY,
-                                  (GLubyte (*)[4]) dest);
+            if (ctx->DrawBuffer->UseSoftwareAlphaBuffers) {
+               _mesa_read_alpha_span(ctx, readWidth, srcX, srcY,
+                                     (GLubyte (*)[4]) dest);
             }
             dest += rowLength * 4;
             srcY++;
@@ -633,7 +638,7 @@
          return;
    }
 
-   if (!gl_is_legal_format_and_type(format, type)) {
+   if (!_mesa_is_legal_format_and_type(format, type)) {
       gl_error(ctx, GL_INVALID_OPERATION, "glReadPixels(format or type)");
       return;
    }
@@ -646,14 +651,15 @@
 
          gl_read_rgba_span( ctx, ctx->ReadBuffer, readWidth, x, y, rgba );
 
-         dest = gl_pixel_addr_in_image( packing, pixels, width, height,
-                                        format, type, 0, j, 0);
+         dest = _mesa_image_address( packing, pixels, width, height,
+                                     format, type, 0, j, 0);
 
-         gl_pack_rgba_span( ctx, readWidth, (const GLubyte (*)[4]) rgba,
-                            format, type, dest, packing, GL_TRUE );
+         _mesa_pack_rgba_span( ctx, readWidth, (const GLubyte (*)[4]) rgba,
+                               format, type, dest, packing, GL_TRUE );
       }
    }
    else {
+      /* Convert color index pixels to RGBA */
       GLint j;
       for (j=0;j<height;j++,y++) {
          GLubyte rgba[MAX_WIDTH][4];
@@ -663,16 +669,16 @@
 	 (*ctx->Driver.ReadCI32Span)( ctx, readWidth, x, y, index );
 
 	 if (ctx->Pixel.IndexShift!=0 || ctx->Pixel.IndexOffset!=0) {
-            gl_map_ci( ctx, readWidth, index );
+            _mesa_map_ci( ctx, readWidth, index );
 	 }
 
-         gl_map_ci_to_rgba(ctx, readWidth, index, rgba );
+         _mesa_map_ci_to_rgba_ubyte(ctx, readWidth, index, rgba );
 
-         dest = gl_pixel_addr_in_image( packing, pixels, width, height,
-                                        format, type, 0, j, 0);
+         dest = _mesa_image_address( packing, pixels, width, height,
+                                     format, type, 0, j, 0);
 
-         gl_pack_rgba_span( ctx, readWidth, (const GLubyte (*)[4]) rgba,
-                            format, type, dest, packing, GL_TRUE );
+         _mesa_pack_rgba_span( ctx, readWidth, (const GLubyte (*)[4]) rgba,
+                               format, type, dest, packing, GL_TRUE );
       }
    }
 
@@ -693,15 +699,20 @@
       return;
    }
 
+   if (ctx->Driver.ReadPixels &&
+       (*ctx->Driver.ReadPixels)(ctx, x, y, width, height,
+                                 format, type, &ctx->Pack, pixels))
+      return;
+
    switch (format) {
       case GL_COLOR_INDEX:
-         read_index_pixels( ctx, x, y, width, height, type, pixels, &ctx->Pack );
+         read_index_pixels(ctx, x, y, width, height, type, pixels, &ctx->Pack);
 	 break;
       case GL_STENCIL_INDEX:
-	 read_stencil_pixels( ctx, x, y, width, height, type, pixels, &ctx->Pack );
+	 read_stencil_pixels(ctx, x,y, width,height, type, pixels, &ctx->Pack);
          break;
       case GL_DEPTH_COMPONENT:
-	 read_depth_pixels( ctx, x, y, width, height, type, pixels, &ctx->Pack );
+	 read_depth_pixels(ctx, x, y, width, height, type, pixels, &ctx->Pack);
 	 break;
       case GL_RED:
       case GL_GREEN:
@@ -714,7 +725,8 @@
       case GL_BGR:
       case GL_BGRA:
       case GL_ABGR_EXT:
-         read_rgba_pixels( ctx, x, y, width, height, format, type, pixels, &ctx->Pack );
+         read_rgba_pixels(ctx, x, y, width, height,
+                          format, type, pixels, &ctx->Pack);
 	 break;
       default:
 	 gl_error( ctx, GL_INVALID_ENUM, "glReadPixels(format)" );
Index: xc/extras/Mesa/src/render_tmp.h
diff -u xc/extras/Mesa/src/render_tmp.h:1.3 xc/extras/Mesa/src/render_tmp.h:1.4
--- xc/extras/Mesa/src/render_tmp.h:1.3	Mon Feb 14 23:12:33 2000
+++ xc/extras/Mesa/src/render_tmp.h	Fri Jun 16 17:02:15 2000
@@ -38,9 +38,15 @@
 #ifndef NEED_EDGEFLAG_SETUP
 #define NEED_EDGEFLAG_SETUP 0
 #define EDGEFLAG_TRI(a,b,c,d,e)
+#define EDGEFLAG_POLY_TRI_PRE(a,b,c,d)
+#define EDGEFLAG_POLY_TRI_POST(a,b,c,d)
 #define EDGEFLAG_QUAD(a,b,c,d,e)
 #endif
 
+#ifndef RESET_STIPPLE
+#define RESET_STIPPLE
+#endif
+
 
 static void TAG(render_vb_points)( struct vertex_buffer *VB,
 				   GLuint start,
@@ -49,6 +55,8 @@
 {
    LOCAL_VARS;
    (void) parity;
+   VB->ctx->OcclusionResult = GL_TRUE;
+
    INIT(GL_POINTS);
    RENDER_POINTS( start, count );
    POSTFIX;
@@ -60,14 +68,14 @@
 				  GLuint parity )
 {
    GLuint j;
-   GLuint *stipplecounter = &VB->ctx->StippleCounter;
    LOCAL_VARS;
    (void) parity;
+   VB->ctx->OcclusionResult = GL_TRUE;
 
    INIT(GL_LINES);
    for (j=start+1; j<count; j+=2 ) {
       RENDER_LINE( j-1, j );
-      *stipplecounter = 0;
+      RESET_STIPPLE;
    }
    POSTFIX;
 }
@@ -81,13 +89,16 @@
    GLuint j;
    LOCAL_VARS;
    (void) parity;
+   VB->ctx->OcclusionResult = GL_TRUE;
 
    INIT(GL_LINES);
    for (j=start+1; j<count; j++ ) {
       RENDER_LINE( j-1, j );
+   }   
+
+   if (VB->Flag[count] & VERT_END) {
+      RESET_STIPPLE;
    }
-   
-   VB->ctx->StippleCounter = 0;	
    POSTFIX;
 }
 
@@ -100,6 +111,7 @@
    GLuint i = start < VB->Start ? VB->Start : start + 1;	 
    LOCAL_VARS;
    (void) parity;
+   VB->ctx->OcclusionResult = GL_TRUE;
 
    INIT(GL_LINES);
    for ( ; i < count ; i++) {
@@ -108,9 +120,9 @@
 
    if (VB->Flag[count] & VERT_END) {
       RENDER_LINE( i-1, start );
-   }   
+      RESET_STIPPLE;
+   }
 
-   VB->ctx->StippleCounter = 0;
    POSTFIX;
 }
 
@@ -127,6 +139,7 @@
    INIT(GL_POLYGON);
    for (j=start+2; j<count; j+=3) {
       RENDER_TRI( j-2, j-1, j, j, 0 );
+      RESET_STIPPLE;
    }
    POSTFIX;
 }
@@ -146,6 +159,7 @@
       for (j=start+2;j<count;j++,parity^=1) {
 	 EDGEFLAG_TRI( j-2, j-1, j, j, parity );
 	 RENDER_TRI( j-2, j-1, j, j, parity );
+	 RESET_STIPPLE;
       }
    } else {
       for (j=start+2;j<count;j++,parity^=1) {
@@ -169,6 +183,7 @@
       for (j=start+2;j<count;j++) {
 	 EDGEFLAG_TRI( start, j-1, j, j, 0 );
 	 RENDER_TRI( start, j-1, j, j, 0 );
+	 RESET_STIPPLE;
       }
    } else {
       for (j=start+2;j<count;j++) {
@@ -189,9 +204,19 @@
    LOCAL_VARS;
    (void) parity;
    INIT(GL_POLYGON);
-   for (j=start+2;j<count;j++) {
-      RENDER_TRI( start, j-1, j, start, 0 );
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2;j<count;j++) {
+	 EDGEFLAG_POLY_TRI_PRE( start, j-1, j, start );
+	 RENDER_TRI( start, j-1, j, start, 0 );
+	 EDGEFLAG_POLY_TRI_POST( start, j-1, j, start );
+      }
+   }
+   else {
+      for (j=start+2;j<count;j++) {
+	 RENDER_TRI( start, j-1, j, start, 0 );
+      }
    }
+   RESET_STIPPLE;
    POSTFIX;
 }
 
@@ -207,6 +232,7 @@
    INIT(GL_POLYGON);
    for (j=start+3; j<count; j+=4) {
       RENDER_QUAD( j-3, j-2, j-1, j, j );
+      RESET_STIPPLE;
    }
    POSTFIX;
 }
@@ -224,6 +250,7 @@
       for (j=start+3;j<count;j+=2) {
 	 EDGEFLAG_QUAD( j-3, j-2, j, j-1, j );
 	 RENDER_QUAD( j-3, j-2, j, j-1, j );
+	 RESET_STIPPLE;
       }
    } else {
       for (j=start+3;j<count;j+=2) {
@@ -273,6 +300,7 @@
 #undef LOCAL_VARS
 #undef INIT
 #undef POSTFIX
+#undef RESET_STIPPLE
 #endif
 
 #ifndef PRESERVE_TAG
Index: xc/extras/Mesa/src/shade_tmp.h
diff -u xc/extras/Mesa/src/shade_tmp.h:1.3 xc/extras/Mesa/src/shade_tmp.h:1.4
--- xc/extras/Mesa/src/shade_tmp.h:1.3	Mon Feb 14 23:12:34 2000
+++ xc/extras/Mesa/src/shade_tmp.h	Fri Jun 16 17:02:15 2000
@@ -553,8 +553,7 @@
 	    COPY_3V(sum[0], base[0]);
 	    if (NR_SIDES == 2)  COPY_3V(sum[1], base[1]);
 
-	    if (0)
-/*  	       if (ctx->Light.ShadeModel == GL_SMOOTH) */
+	    if (MESA_VERBOSE&VERBOSE_LIGHTING)
 	       fprintf(stderr, "light normal %d/%d, %f %f %f\n",
 		       j, VB->Start, normal[0], normal[1], normal[2]);
 
Index: xc/extras/Mesa/src/span.c
diff -u xc/extras/Mesa/src/span.c:1.4 xc/extras/Mesa/src/span.c:1.5
--- xc/extras/Mesa/src/span.c:1.4	Thu Mar  2 08:07:13 2000
+++ xc/extras/Mesa/src/span.c	Fri Jun 16 17:02:15 2000
@@ -148,10 +148,10 @@
          /* make copy of incoming indexes */
          MEMCPY( indexTmp, indexes, n * sizeof(GLuint) );
          if (ctx->Color.SWLogicOpEnabled) {
-            gl_logicop_ci_span( ctx, n, x, y, indexTmp, mask );
+            _mesa_logicop_ci_span( ctx, n, x, y, indexTmp, mask );
          }
          if (ctx->Color.SWmasking) {
-            gl_mask_index_span( ctx, n, x, y, indexTmp );
+            _mesa_mask_index_span( ctx, n, x, y, indexTmp );
          }
          (*ctx->Driver.WriteCI32Span)( ctx, n, x, y, indexTmp, mask );
       }
@@ -176,6 +176,7 @@
                           GLuint n, GLint x, GLint y, const GLdepth z[],
 			  GLuint indexIn[], GLenum primitive )
 {
+   const GLuint modBits = FOG_BIT | BLEND_BIT | MASKING_BIT | LOGIC_OP_BIT;
    GLubyte mask[MAX_WIDTH];
    GLuint indexBackup[MAX_WIDTH];
    GLuint *index;  /* points to indexIn or indexBackup */
@@ -189,7 +190,7 @@
       }
    }
 
-   if ((primitive==GL_BITMAP && ctx->MutablePixels)
+   if ((primitive==GL_BITMAP && (ctx->RasterMask & modBits))
        || (ctx->RasterMask & MULTI_DRAW_BIT)) {
       /* Make copy of color indexes */
       MEMCPY( indexBackup, indexIn, n * sizeof(GLuint) );
@@ -218,7 +219,7 @@
 
    if (ctx->Stencil.Enabled) {
       /* first stencil test */
-      if (gl_stencil_and_depth_test_span(ctx, n, x, y, z, mask) == GL_FALSE) {
+      if (_mesa_stencil_and_ztest_span(ctx, n, x, y, z, mask) == GL_FALSE) {
 	 return;
       }
    }
@@ -227,6 +228,9 @@
       if (_mesa_depth_test_span( ctx, n, x, y, z, mask )==0)  return;
    }
 
+   /* if we get here, something passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
    if (ctx->RasterMask & MULTI_DRAW_BIT) {
       /* draw to zero or two or more buffers */
       multi_write_index_span( ctx, n, x, y, index, mask );
@@ -234,10 +238,10 @@
    else {
       /* normal situation: draw to exactly one buffer */
       if (ctx->Color.SWLogicOpEnabled) {
-         gl_logicop_ci_span( ctx, n, x, y, index, mask );
+         _mesa_logicop_ci_span( ctx, n, x, y, index, mask );
       }
       if (ctx->Color.SWmasking) {
-         gl_mask_index_span( ctx, n, x, y, index );
+         _mesa_mask_index_span( ctx, n, x, y, index );
       }
 
       /* write pixels */
@@ -278,7 +282,7 @@
 
    if (ctx->Stencil.Enabled) {
       /* first stencil test */
-      if (gl_stencil_and_depth_test_span(ctx, n, x, y, z, mask) == GL_FALSE) {
+      if (_mesa_stencil_and_ztest_span(ctx, n, x, y, z, mask) == GL_FALSE) {
 	 return;
       }
    }
@@ -287,6 +291,9 @@
       if (_mesa_depth_test_span( ctx, n, x, y, z, mask )==0)  return;
    }
 
+   /* if we get here, something passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
    if (ctx->Color.DrawBuffer == GL_NONE) {
       /* write no pixels */
       return;
@@ -305,11 +312,11 @@
       }
 
       if (ctx->Color.SWLogicOpEnabled) {
-	 gl_logicop_ci_span( ctx, n, x, y, indexes, mask );
+	 _mesa_logicop_ci_span( ctx, n, x, y, indexes, mask );
       }
 
       if (ctx->Color.SWmasking) {
-         gl_mask_index_span( ctx, n, x, y, indexes );
+         _mesa_mask_index_span( ctx, n, x, y, indexes );
       }
 
       if (ctx->RasterMask & MULTI_DRAW_BIT) {
@@ -319,10 +326,10 @@
       else {
          /* normal situation: draw to exactly one buffer */
          if (ctx->Color.SWLogicOpEnabled) {
-            gl_logicop_ci_span( ctx, n, x, y, indexes, mask );
+            _mesa_logicop_ci_span( ctx, n, x, y, indexes, mask );
          }
          if (ctx->Color.SWmasking) {
-            gl_mask_index_span( ctx, n, x, y, indexes );
+            _mesa_mask_index_span( ctx, n, x, y, indexes );
          }
          (*ctx->Driver.WriteCI32Span)( ctx, n, x, y, indexes, mask );
       }
@@ -386,20 +393,20 @@
          MEMCPY( rgbaTmp, rgba, 4 * n * sizeof(GLubyte) );
 
          if (ctx->Color.SWLogicOpEnabled) {
-            gl_logicop_rgba_span( ctx, n, x, y, rgbaTmp, mask );
+            _mesa_logicop_rgba_span( ctx, n, x, y, rgbaTmp, mask );
          }
          else if (ctx->Color.BlendEnabled) {
             _mesa_blend_span( ctx, n, x, y, rgbaTmp, mask );
          }
          if (ctx->Color.SWmasking) {
-            gl_mask_rgba_span( ctx, n, x, y, rgbaTmp );
+            _mesa_mask_rgba_span( ctx, n, x, y, rgbaTmp );
          }
 
          (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, 
 				       (const GLubyte (*)[4]) rgbaTmp, mask );
          if (ctx->RasterMask & ALPHABUF_BIT) {
-            gl_write_alpha_span( ctx, n, x, y, 
-				 (const GLubyte (*)[4])rgbaTmp, mask );
+            _mesa_write_alpha_span( ctx, n, x, y, 
+                                    (const GLubyte (*)[4])rgbaTmp, mask );
          }
       }
    }
@@ -415,6 +422,8 @@
                          GLubyte rgbaIn[][4],
                          GLenum primitive )
 {
+   const GLuint modBits = FOG_BIT | BLEND_BIT | MASKING_BIT |
+                          LOGIC_OP_BIT | TEXTURE_BIT;
    GLubyte mask[MAX_WIDTH];
    GLboolean write_all = GL_TRUE;
    GLubyte rgbaBackup[MAX_WIDTH][4];
@@ -431,7 +440,7 @@
       write_all = GL_FALSE;
    }
 
-   if ((primitive==GL_BITMAP && ctx->MutablePixels)
+   if ((primitive==GL_BITMAP && (ctx->RasterMask & modBits))
        || (ctx->RasterMask & MULTI_DRAW_BIT)) {
       /* must make a copy of the colors since they may be modified */
       MEMCPY( rgbaBackup, rgbaIn, 4 * n * sizeof(GLubyte) );
@@ -470,7 +479,7 @@
 
    if (ctx->Stencil.Enabled) {
       /* first stencil test */
-      if (gl_stencil_and_depth_test_span(ctx, n, x, y, z, mask) == GL_FALSE) {
+      if (_mesa_stencil_and_ztest_span(ctx, n, x, y, z, mask) == GL_FALSE) {
 	 return;
       }
       write_all = GL_FALSE;
@@ -486,6 +495,9 @@
       }
    }
 
+   /* if we get here, something passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
    if (ctx->RasterMask & MULTI_DRAW_BIT) {
       multi_write_rgba_span( ctx, n, x, y,
 			     (const GLubyte (*)[4]) rgba, 
@@ -495,7 +507,7 @@
       /* normal: write to exactly one buffer */
       /* logic op or blending */
       if (ctx->Color.SWLogicOpEnabled) {
-         gl_logicop_rgba_span( ctx, n, x, y, rgba, mask );
+         _mesa_logicop_rgba_span( ctx, n, x, y, rgba, mask );
       }
       else if (ctx->Color.BlendEnabled) {
          _mesa_blend_span( ctx, n, x, y, rgba, mask );
@@ -503,7 +515,7 @@
 
       /* Color component masking */
       if (ctx->Color.SWmasking) {
-         gl_mask_rgba_span( ctx, n, x, y, rgba );
+         _mesa_mask_rgba_span( ctx, n, x, y, rgba );
       }
 
       /* write pixels */
@@ -512,9 +524,9 @@
 				    write_all ? Null : mask );
 
       if (ctx->RasterMask & ALPHABUF_BIT) {
-         gl_write_alpha_span( ctx, n, x, y, 
-			      (const GLubyte (*)[4]) rgba, 
-			      write_all ? Null : mask );
+         _mesa_write_alpha_span( ctx, n, x, y, 
+                                 (const GLubyte (*)[4]) rgba, 
+                                 write_all ? Null : mask );
       }
 
    }
@@ -580,7 +592,7 @@
 
    if (ctx->Stencil.Enabled) {
       /* first stencil test */
-      if (gl_stencil_and_depth_test_span(ctx, n, x, y, z, mask) == GL_FALSE) {
+      if (_mesa_stencil_and_ztest_span(ctx, n, x, y, z, mask) == GL_FALSE) {
 	 return;
       }
       write_all = GL_FALSE;
@@ -596,6 +608,9 @@
       }
    }
 
+   /* if we get here, something passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
    if (ctx->Color.DrawBuffer == GL_NONE) {
       /* write no pixels */
       return;
@@ -617,7 +632,7 @@
       else {
          /* normal: write to exactly one buffer */
          if (ctx->Color.SWLogicOpEnabled) {
-            gl_logicop_rgba_span( ctx, n, x, y, rgba, mask );
+            _mesa_logicop_rgba_span( ctx, n, x, y, rgba, mask );
          }
          else if (ctx->Color.BlendEnabled) {
             _mesa_blend_span( ctx, n, x, y, rgba, mask );
@@ -625,7 +640,7 @@
 
          /* Color component masking */
          if (ctx->Color.SWmasking) {
-            gl_mask_rgba_span( ctx, n, x, y, rgba );
+            _mesa_mask_rgba_span( ctx, n, x, y, rgba );
          }
 
          /* write pixels */
@@ -633,9 +648,9 @@
 				       (const GLubyte (*)[4]) rgba, 
 				       write_all ? Null : mask );
          if (ctx->RasterMask & ALPHABUF_BIT) {
-            gl_write_alpha_span( ctx, n, x, y, 
-				 (const GLubyte (*)[4]) rgba, 
-				 write_all ? Null : mask );
+            _mesa_write_alpha_span( ctx, n, x, y, 
+                                    (const GLubyte (*)[4]) rgba, 
+                                    write_all ? Null : mask );
          }
       }
    }
@@ -658,8 +673,8 @@
       else {
          (*ctx->Driver.WriteMonoRGBASpan)( ctx, n, x, y, mask );
          if (ctx->RasterMask & ALPHABUF_BIT) {
-            gl_write_mono_alpha_span( ctx, n, x, y, (GLubyte) color[ACOMP],
-                                      write_all ? Null : mask );
+            _mesa_write_mono_alpha_span( ctx, n, x, y, (GLubyte) color[ACOMP],
+                                         write_all ? Null : mask );
          }
       }
    }
@@ -724,7 +739,7 @@
 
    if (primitive==GL_BITMAP || (ctx->RasterMask & MULTI_DRAW_BIT)) {
       /* must make a copy of the colors since they may be modified */
-      MEMCPY(rgbaBackup, rgbaIn, 4 * sizeof(GLubyte));
+      MEMCPY(rgbaBackup, rgbaIn, 4 * n * sizeof(GLubyte));
       rgba = rgbaBackup;
    }
    else {
@@ -732,7 +747,7 @@
    }
 
    /* Texture */
-   ASSERT(ctx->Texture.Enabled);
+   ASSERT(ctx->Texture.ReallyEnabled);
    gl_texture_pixels( ctx, 0, n, s, t, u, lambda, rgba );
 
    /* Add base and specular colors */
@@ -769,7 +784,7 @@
 
    if (ctx->Stencil.Enabled) {
       /* first stencil test */
-      if (gl_stencil_and_depth_test_span(ctx, n, x, y, z, mask) == GL_FALSE) {
+      if (_mesa_stencil_and_ztest_span(ctx, n, x, y, z, mask) == GL_FALSE) {
 	 return;
       }
       write_all = GL_FALSE;
@@ -785,6 +800,9 @@
       }
    }
 
+   /* if we get here, something passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
    if (ctx->RasterMask & MULTI_DRAW_BIT) {
       multi_write_rgba_span( ctx, n, x, y, (const GLubyte (*)[4])rgba, 
 			     write_all ? Null : mask );
@@ -792,20 +810,20 @@
    else {
       /* normal: write to exactly one buffer */
       if (ctx->Color.SWLogicOpEnabled) {
-         gl_logicop_rgba_span( ctx, n, x, y, rgba, mask );
+         _mesa_logicop_rgba_span( ctx, n, x, y, rgba, mask );
       }
       else  if (ctx->Color.BlendEnabled) {
          _mesa_blend_span( ctx, n, x, y, rgba, mask );
       }
       if (ctx->Color.SWmasking) {
-         gl_mask_rgba_span( ctx, n, x, y, rgba );
+         _mesa_mask_rgba_span( ctx, n, x, y, rgba );
       }
 
       (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, (const GLubyte (*)[4])rgba,
 				    write_all ? Null : mask );
       if (ctx->RasterMask & ALPHABUF_BIT) {
-         gl_write_alpha_span( ctx, n, x, y, (const GLubyte (*)[4]) rgba, 
-			      write_all ? Null : mask );
+         _mesa_write_alpha_span( ctx, n, x, y, (const GLubyte (*)[4]) rgba, 
+                                 write_all ? Null : mask );
       }
    }
 }
@@ -848,7 +866,7 @@
 
    if (primitive==GL_BITMAP || (ctx->RasterMask & MULTI_DRAW_BIT)) {
       /* must make a copy of the colors since they may be modified */
-      MEMCPY(rgbaBackup, rgbaIn, 4 * sizeof(GLubyte));
+      MEMCPY(rgbaBackup, rgbaIn, 4 * n * sizeof(GLubyte));
       rgba = rgbaBackup;
    }
    else {
@@ -856,7 +874,7 @@
    }
 
    /* Texture */
-   ASSERT(ctx->Texture.Enabled);
+   ASSERT(ctx->Texture.ReallyEnabled);
    ASSERT(texUnits <= MAX_TEXTURE_UNITS);
    for (i=0;i<texUnits;i++) {
       gl_texture_pixels( ctx, i, n, s[i], t[i], u[i], lambda[i], rgba );
@@ -896,7 +914,7 @@
 
    if (ctx->Stencil.Enabled) {
       /* first stencil test */
-      if (gl_stencil_and_depth_test_span(ctx, n, x, y, z, mask) == GL_FALSE) {
+      if (_mesa_stencil_and_ztest_span(ctx, n, x, y, z, mask) == GL_FALSE) {
 	 return;
       }
       write_all = GL_FALSE;
@@ -912,26 +930,30 @@
       }
    }
 
+   /* if we get here, something passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
    if (ctx->RasterMask & MULTI_DRAW_BIT) {
-      multi_write_rgba_span( ctx, n, x, y, (const GLubyte (*)[4]) rgba, write_all ? Null : mask );
+      multi_write_rgba_span( ctx, n, x, y, (const GLubyte (*)[4]) rgba,
+                             write_all ? Null : mask );
    }
    else {
       /* normal: write to exactly one buffer */
 
       if (ctx->Color.SWLogicOpEnabled) {
-         gl_logicop_rgba_span( ctx, n, x, y, rgba, mask );
+         _mesa_logicop_rgba_span( ctx, n, x, y, rgba, mask );
       }
       else  if (ctx->Color.BlendEnabled) {
          _mesa_blend_span( ctx, n, x, y, rgba, mask );
       }
       if (ctx->Color.SWmasking) {
-         gl_mask_rgba_span( ctx, n, x, y, rgba );
+         _mesa_mask_rgba_span( ctx, n, x, y, rgba );
       }
 
       (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, (const GLubyte (*)[4])rgba, write_all ? Null : mask );
       if (ctx->RasterMask & ALPHABUF_BIT) {
-         gl_write_alpha_span( ctx, n, x, y, (const GLubyte (*)[4])rgba,
-			      write_all ? Null : mask );
+         _mesa_write_alpha_span( ctx, n, x, y, (const GLubyte (*)[4])rgba,
+                                 write_all ? Null : mask );
       }
    }
 }
@@ -950,7 +972,7 @@
        || x + (GLint) n < 0 || x >= buffer->Width) {
       /* completely above, below, or right */
       /* XXX maybe leave undefined? */
-      MEMSET( rgba, 0, 4 * n * sizeof(GLubyte));
+      BZERO(rgba, 4 * n * sizeof(GLubyte));
    }
    else {
       GLint skip, length;
@@ -982,8 +1004,8 @@
       }
 
       (*ctx->Driver.ReadRGBASpan)( ctx, length, x + skip, y, rgba + skip );
-      if (ctx->Visual->SoftwareAlpha) {
-         gl_read_alpha_span( ctx, length, x + skip, y, rgba + skip );
+      if (buffer->UseSoftwareAlphaBuffers) {
+         _mesa_read_alpha_span( ctx, length, x + skip, y, rgba + skip );
       }
    }
 }
@@ -1001,7 +1023,7 @@
    if (y < 0 || y >= buffer->Height
        || x + (GLint) n < 0 || x >= buffer->Width) {
       /* completely above, below, or right */
-      MEMSET(indx, 0, n * sizeof(GLuint));
+      BZERO(indx, n * sizeof(GLuint));
    }
    else {
       GLint skip, length;
Index: xc/extras/Mesa/src/stages.c
diff -u xc/extras/Mesa/src/stages.c:1.3 xc/extras/Mesa/src/stages.c:1.4
--- xc/extras/Mesa/src/stages.c:1.3	Mon Feb 14 23:12:35 2000
+++ xc/extras/Mesa/src/stages.c	Fri Jun 16 17:02:15 2000
@@ -419,15 +419,17 @@
       gl_make_normal_cullmask( VB );
    }
 
-   (ctx->NormalTransform[tmp])(&ctx->ModelView,
-			       ctx->vb_rescale_factor,
-			       VB->NormalPtr,
-			       (VB->NormalLengthPtr ?
-				VB->NormalLengthPtr + VB->Start : 0),
-			       VB->NormCullStart,
-			       VB->store.Normal);
+   if (ctx->NormalTransform) {
+      (ctx->NormalTransform[tmp])(&ctx->ModelView,
+				  ctx->vb_rescale_factor,
+				  VB->NormalPtr,
+				  (VB->NormalLengthPtr ?
+				   VB->NormalLengthPtr + VB->Start : 0),
+				  VB->NormCullStart,
+				  VB->store.Normal);
 
-   VB->NormalPtr = VB->store.Normal;
+      VB->NormalPtr = VB->store.Normal;
+   }
 }
 
 
@@ -511,7 +513,7 @@
 {
    d->type = 0;
 
-   if (ctx->Fog.Enabled && ctx->FogMode==FOG_VERTEX)
+   if (ctx->FogMode==FOG_VERTEX)
    {
       GLuint flags;
 
@@ -705,7 +707,7 @@
      PIPE_OP_NORM_XFORM,
      PIPE_PRECALC|PIPE_IMMEDIATE,
      0,
-     NEW_LIGHTING|NEW_FOG|NEW_TEXTURING,	/* state change (recheck) */
+     NEW_LIGHTING|NEW_FOG|NEW_TEXTURING|NEW_NORMAL_TRANSFORM,	/* state change (recheck) */
      NEW_NORMAL_TRANSFORM,	/* cva state change (recalc) */
      0, 0,
      DYN_STATE,
@@ -784,8 +786,8 @@
      PIPE_OP_RAST_SETUP_0|PIPE_OP_RAST_SETUP_1,
      PIPE_PRECALC|PIPE_IMMEDIATE,
      0,
-     NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON,
-     NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON,
+     NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON|NEW_TEXTURE_ENV,
+     NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON|NEW_TEXTURE_ENV,
      0, 0,
      DYN_STATE,
      check_full_setup,
Index: xc/extras/Mesa/src/state.c
diff -u xc/extras/Mesa/src/state.c:1.2 xc/extras/Mesa/src/state.c:1.3
--- xc/extras/Mesa/src/state.c:1.2	Thu Mar  2 08:07:14 2000
+++ xc/extras/Mesa/src/state.c	Fri Jun 16 17:02:15 2000
@@ -63,6 +63,7 @@
 #include "mmath.h"
 #include "pipeline.h"
 #include "pixel.h"
+#include "pixeltex.h"
 #include "points.h"
 #include "polygon.h"
 #include "quads.h"
@@ -97,20 +98,17 @@
 }
 
 
+/*
+ * Set all pointers in the given dispatch table to point to a
+ * generic no-op function.
+ */
 void
-_mesa_init_no_op_table(struct _glapi_table *table)
+_mesa_init_no_op_table(struct _glapi_table *table, GLuint tableSize)
 {
-   /* Check to be sure the dispatcher's table is at least as big as Mesa's. */
-   const GLuint size = sizeof(struct _glapi_table) / sizeof(void *);
-   assert(_glapi_get_dispatch_table_size() >= size);
-
-   {
-      const GLuint n = _glapi_get_dispatch_table_size();
-      GLuint i;
-      void **dispatch = (void **) table;
-      for (i = 0; i < n; i++) {
-         dispatch[i] = (void *) generic_noop;
-      }
+   GLuint i;
+   void **dispatch = (void **) table;
+   for (i = 0; i < tableSize; i++) {
+      dispatch[i] = (void *) generic_noop;
    }
 }
 
@@ -120,10 +118,10 @@
  * immediate-mode commands.
  */
 void
-_mesa_init_exec_table(struct _glapi_table *exec)
+_mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
 {
    /* first initialize all dispatch slots to no-op */
-   _mesa_init_no_op_table(exec);
+   _mesa_init_no_op_table(exec, tableSize);
 
    /* load the dispatch slots we understand */
    exec->Accum = _mesa_Accum;
@@ -471,7 +469,6 @@
    exec->TexImage3D = _mesa_TexImage3D;
    exec->TexSubImage3D = _mesa_TexSubImage3D;
 
-
    /* OpenGL 1.2  GL_ARB_imaging */
    exec->BlendColor = _mesa_BlendColor;
    exec->BlendEquation = _mesa_BlendEquation;
@@ -507,16 +504,63 @@
    exec->ResetHistogram = _mesa_ResetHistogram;
    exec->ResetMinmax = _mesa_ResetMinmax;
    exec->SeparableFilter2D = _mesa_SeparableFilter2D;
+
+   /* 2. GL_EXT_blend_color */
+#if 0
+   exec->BlendColorEXT = _mesa_BlendColorEXT;
+#endif
+
+   /* 3. GL_EXT_polygon_offset */
+   exec->PolygonOffsetEXT = _mesa_PolygonOffsetEXT;
 
-   /* GL_EXT_texture3d */
+   /* 6. GL_EXT_texture3d */
 #if 0
    exec->CopyTexSubImage3DEXT = _mesa_CopyTexSubImage3D;
    exec->TexImage3DEXT = _mesa_TexImage3DEXT;
    exec->TexSubImage3DEXT = _mesa_TexSubImage3D;
 #endif
 
-   /* GL_EXT_paletted_texture */
+   /* 11. GL_EXT_histogram */
+   exec->GetHistogramEXT = _mesa_GetHistogram;
+   exec->GetHistogramParameterfvEXT = _mesa_GetHistogramParameterfv;
+   exec->GetHistogramParameterivEXT = _mesa_GetHistogramParameteriv;
+   exec->GetMinmaxEXT = _mesa_GetMinmax;
+   exec->GetMinmaxParameterfvEXT = _mesa_GetMinmaxParameterfv;
+   exec->GetMinmaxParameterivEXT = _mesa_GetMinmaxParameteriv;
+
+   /* ?. GL_SGIX_pixel_texture */
+   exec->PixelTexGenSGIX = _mesa_PixelTexGenSGIX;
+
+   /* 15. GL_SGIS_pixel_texture */
+   exec->PixelTexGenParameteriSGIS = _mesa_PixelTexGenParameteriSGIS;
+   exec->PixelTexGenParameterivSGIS = _mesa_PixelTexGenParameterivSGIS;
+   exec->PixelTexGenParameterfSGIS = _mesa_PixelTexGenParameterfSGIS;
+   exec->PixelTexGenParameterfvSGIS = _mesa_PixelTexGenParameterfvSGIS;
+   exec->GetPixelTexGenParameterivSGIS = _mesa_GetPixelTexGenParameterivSGIS;
+   exec->GetPixelTexGenParameterfvSGIS = _mesa_GetPixelTexGenParameterfvSGIS;
+
+   /* 30. GL_EXT_vertex_array */
+   exec->ColorPointerEXT = _mesa_ColorPointerEXT;
+   exec->EdgeFlagPointerEXT = _mesa_EdgeFlagPointerEXT;
+   exec->IndexPointerEXT = _mesa_IndexPointerEXT;
+   exec->NormalPointerEXT = _mesa_NormalPointerEXT;
+   exec->TexCoordPointerEXT = _mesa_TexCoordPointerEXT;
+   exec->VertexPointerEXT = _mesa_VertexPointerEXT;
+
+   /* 37. GL_EXT_blend_minmax */
 #if 0
+   exec->BlendEquationEXT = _mesa_BlendEquationEXT;
+#endif
+
+   /* 54. GL_EXT_point_parameters */
+   exec->PointParameterfEXT = _mesa_PointParameterfEXT;
+   exec->PointParameterfvEXT = _mesa_PointParameterfvEXT;
+
+   /* 77. GL_PGI_misc_hints */
+   exec->HintPGI = _mesa_HintPGI;
+
+   /* 78. GL_EXT_paletted_texture */
+#if 0
    exec->ColorTableEXT = _mesa_ColorTableEXT;
    exec->ColorSubTableEXT = _mesa_ColorSubTableEXT;
 #endif
@@ -524,31 +568,43 @@
    exec->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv;
    exec->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv;
 
-   /* GL_EXT_compiled_vertex_array */
+   /* 97. GL_EXT_compiled_vertex_array */
    exec->LockArraysEXT = _mesa_LockArraysEXT;
    exec->UnlockArraysEXT = _mesa_UnlockArraysEXT;
-
-   /* GL_EXT_point_parameters */
-   exec->PointParameterfEXT = _mesa_PointParameterfEXT;
-   exec->PointParameterfvEXT = _mesa_PointParameterfvEXT;
 
-   /* GL_PGI_misc_hints */
-   exec->HintPGI = _mesa_HintPGI;
-
-   /* GL_EXT_polygon_offset */
-   exec->PolygonOffsetEXT = _mesa_PolygonOffsetEXT;
+   /* 173. GL_INGR_blend_func_separate */
+   exec->BlendFuncSeparateEXT = _mesa_BlendFuncSeparateEXT;
 
-   /* GL_EXT_blend_minmax */
-#if 0
-   exec->BlendEquationEXT = _mesa_BlendEquationEXT;
-#endif
+   /* 196. GL_MESA_resize_buffers */
+   exec->ResizeBuffersMESA = _mesa_ResizeBuffersMESA;
 
-   /* GL_EXT_blend_color */
-#if 0
-   exec->BlendColorEXT = _mesa_BlendColorEXT;
-#endif
+   /* 197. GL_MESA_window_pos */
+   exec->WindowPos2dMESA = _mesa_WindowPos2dMESA;
+   exec->WindowPos2dvMESA = _mesa_WindowPos2dvMESA;
+   exec->WindowPos2fMESA = _mesa_WindowPos2fMESA;
+   exec->WindowPos2fvMESA = _mesa_WindowPos2fvMESA;
+   exec->WindowPos2iMESA = _mesa_WindowPos2iMESA;
+   exec->WindowPos2ivMESA = _mesa_WindowPos2ivMESA;
+   exec->WindowPos2sMESA = _mesa_WindowPos2sMESA;
+   exec->WindowPos2svMESA = _mesa_WindowPos2svMESA;
+   exec->WindowPos3dMESA = _mesa_WindowPos3dMESA;
+   exec->WindowPos3dvMESA = _mesa_WindowPos3dvMESA;
+   exec->WindowPos3fMESA = _mesa_WindowPos3fMESA;
+   exec->WindowPos3fvMESA = _mesa_WindowPos3fvMESA;
+   exec->WindowPos3iMESA = _mesa_WindowPos3iMESA;
+   exec->WindowPos3ivMESA = _mesa_WindowPos3ivMESA;
+   exec->WindowPos3sMESA = _mesa_WindowPos3sMESA;
+   exec->WindowPos3svMESA = _mesa_WindowPos3svMESA;
+   exec->WindowPos4dMESA = _mesa_WindowPos4dMESA;
+   exec->WindowPos4dvMESA = _mesa_WindowPos4dvMESA;
+   exec->WindowPos4fMESA = _mesa_WindowPos4fMESA;
+   exec->WindowPos4fvMESA = _mesa_WindowPos4fvMESA;
+   exec->WindowPos4iMESA = _mesa_WindowPos4iMESA;
+   exec->WindowPos4ivMESA = _mesa_WindowPos4ivMESA;
+   exec->WindowPos4sMESA = _mesa_WindowPos4sMESA;
+   exec->WindowPos4svMESA = _mesa_WindowPos4svMESA;
 
-   /* GL_ARB_multitexture */
+   /* ARB 1. GL_ARB_multitexture */
    exec->ActiveTextureARB = _mesa_ActiveTextureARB;
    exec->ClientActiveTextureARB = _mesa_ClientActiveTextureARB;
    exec->MultiTexCoord1dARB = _mesa_MultiTexCoord1dARB;
@@ -583,47 +639,26 @@
    exec->MultiTexCoord4ivARB = _mesa_MultiTexCoord4ivARB;
    exec->MultiTexCoord4sARB = _mesa_MultiTexCoord4sARB;
    exec->MultiTexCoord4svARB = _mesa_MultiTexCoord4svARB;
-
-   /* GL_INGR_blend_func_separate */
-   exec->BlendFuncSeparateEXT = _mesa_BlendFuncSeparateEXT;
-
-   /* GL_MESA_window_pos */
-   exec->WindowPos2dMESA = _mesa_WindowPos2dMESA;
-   exec->WindowPos2dvMESA = _mesa_WindowPos2dvMESA;
-   exec->WindowPos2fMESA = _mesa_WindowPos2fMESA;
-   exec->WindowPos2fvMESA = _mesa_WindowPos2fvMESA;
-   exec->WindowPos2iMESA = _mesa_WindowPos2iMESA;
-   exec->WindowPos2ivMESA = _mesa_WindowPos2ivMESA;
-   exec->WindowPos2sMESA = _mesa_WindowPos2sMESA;
-   exec->WindowPos2svMESA = _mesa_WindowPos2svMESA;
-   exec->WindowPos3dMESA = _mesa_WindowPos3dMESA;
-   exec->WindowPos3dvMESA = _mesa_WindowPos3dvMESA;
-   exec->WindowPos3fMESA = _mesa_WindowPos3fMESA;
-   exec->WindowPos3fvMESA = _mesa_WindowPos3fvMESA;
-   exec->WindowPos3iMESA = _mesa_WindowPos3iMESA;
-   exec->WindowPos3ivMESA = _mesa_WindowPos3ivMESA;
-   exec->WindowPos3sMESA = _mesa_WindowPos3sMESA;
-   exec->WindowPos3svMESA = _mesa_WindowPos3svMESA;
-   exec->WindowPos4dMESA = _mesa_WindowPos4dMESA;
-   exec->WindowPos4dvMESA = _mesa_WindowPos4dvMESA;
-   exec->WindowPos4fMESA = _mesa_WindowPos4fMESA;
-   exec->WindowPos4fvMESA = _mesa_WindowPos4fvMESA;
-   exec->WindowPos4iMESA = _mesa_WindowPos4iMESA;
-   exec->WindowPos4ivMESA = _mesa_WindowPos4ivMESA;
-   exec->WindowPos4sMESA = _mesa_WindowPos4sMESA;
-   exec->WindowPos4svMESA = _mesa_WindowPos4svMESA;
 
-   /* GL_MESA_resize_buffers */
-   exec->ResizeBuffersMESA = _mesa_ResizeBuffersMESA;
-
-   /* GL_ARB_transpose_matrix */
+   /* ARB 3. GL_ARB_transpose_matrix */
    exec->LoadTransposeMatrixdARB = _mesa_LoadTransposeMatrixdARB;
    exec->LoadTransposeMatrixfARB = _mesa_LoadTransposeMatrixfARB;
    exec->MultTransposeMatrixdARB = _mesa_MultTransposeMatrixdARB;
    exec->MultTransposeMatrixfARB = _mesa_MultTransposeMatrixfARB;
+
+   /* ARB 12. GL_ARB_texture_compression */
+   exec->CompressedTexImage3DARB = _mesa_CompressedTexImage3DARB;
+   exec->CompressedTexImage2DARB = _mesa_CompressedTexImage2DARB;
+   exec->CompressedTexImage1DARB = _mesa_CompressedTexImage1DARB;
+   exec->CompressedTexSubImage3DARB = _mesa_CompressedTexSubImage3DARB;
+   exec->CompressedTexSubImage2DARB = _mesa_CompressedTexSubImage2DARB;
+   exec->CompressedTexSubImage1DARB = _mesa_CompressedTexSubImage1DARB;
+   exec->GetCompressedTexImageARB = _mesa_GetCompressedTexImageARB;
+
 }
 
 
+
 /**********************************************************************/
 /*****                   State update logic                       *****/
 /**********************************************************************/
@@ -778,8 +813,10 @@
    if (ctx->Scissor.Enabled)		ctx->RasterMask |= SCISSOR_BIT;
    if (ctx->Stencil.Enabled)		ctx->RasterMask |= STENCIL_BIT;
    if (ctx->Color.SWmasking)		ctx->RasterMask |= MASKING_BIT;
+   if (ctx->Texture.ReallyEnabled)	ctx->RasterMask |= TEXTURE_BIT;
 
-   if (ctx->Visual->SoftwareAlpha && ctx->Color.ColorMask[ACOMP]
+   if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
+       && ctx->Color.ColorMask[ACOMP]
        && ctx->Color.DrawBuffer != GL_NONE)
       ctx->RasterMask |= ALPHABUF_BIT;
 
@@ -790,11 +827,14 @@
       ctx->RasterMask |= WINCLIP_BIT;
    }
 
+   if (ctx->Depth.OcclusionTest)
+      ctx->RasterMask |= OCCLUSION_BIT;
+
+
    /* If we're not drawing to exactly one color buffer set the
     * MULTI_DRAW_BIT flag.  Also set it if we're drawing to no
     * buffers or the RGBA or CI mask disables all writes.
     */
-
    ctx->TriangleCaps &= ~DD_MULTIDRAW;
 
    if (ctx->Color.MultiDrawBuffer) {
@@ -898,8 +938,7 @@
       ctx->Enabled &= ~(ENABLE_TEXMAT0|ENABLE_TEXMAT1);
 
       for (i=0; i < MAX_TEXTURE_UNITS; i++) {
-	 if (ctx->TextureMatrix[i].flags & MAT_DIRTY_ALL_OVER)
-	 {
+	 if (ctx->TextureMatrix[i].flags & MAT_DIRTY_ALL_OVER) {
 	    gl_matrix_analyze( &ctx->TextureMatrix[i] );
 	    ctx->TextureMatrix[i].flags &= ~MAT_DIRTY_DEPENDENTS;
 
@@ -913,7 +952,7 @@
    if (ctx->NewState & (NEW_TEXTURING | NEW_TEXTURE_ENABLE)) {
       ctx->Texture.NeedNormals = GL_FALSE;
       gl_update_dirty_texobjs(ctx);
-      ctx->Enabled &= ~(ENABLE_TEXGEN0|ENABLE_TEXGEN1);
+      ctx->Enabled &= ~(ENABLE_TEXGEN0 | ENABLE_TEXGEN1);
       ctx->Texture.ReallyEnabled = 0;
 
       for (i=0; i < MAX_TEXTURE_UNITS; i++) {
@@ -921,19 +960,17 @@
 	    gl_update_texture_unit( ctx, &ctx->Texture.Unit[i] );
 
 	    ctx->Texture.ReallyEnabled |=
-	       ctx->Texture.Unit[i].ReallyEnabled<<(i*4);
+	       ctx->Texture.Unit[i].ReallyEnabled << (i * 4);
 
 	    if (ctx->Texture.Unit[i].GenFlags != 0) {
 	       ctx->Enabled |= ENABLE_TEXGEN0 << i;
 
-	       if (ctx->Texture.Unit[i].GenFlags & TEXGEN_NEED_NORMALS)
-	       {
+	       if (ctx->Texture.Unit[i].GenFlags & TEXGEN_NEED_NORMALS) {
 		  ctx->Texture.NeedNormals = GL_TRUE;
 		  ctx->Texture.NeedEyeCoords = GL_TRUE;
 	       }
 
-	       if (ctx->Texture.Unit[i].GenFlags & TEXGEN_NEED_EYE_COORD)
-	       {
+	       if (ctx->Texture.Unit[i].GenFlags & TEXGEN_NEED_EYE_COORD) {
 		  ctx->Texture.NeedEyeCoords = GL_TRUE;
 	       }
 	    }
@@ -943,11 +980,10 @@
       ctx->Texture.Enabled = ctx->Enabled & ENABLE_TEX_ANY;
       ctx->NeedNormals = (ctx->Light.Enabled || ctx->Texture.NeedNormals);
    }
-
-   if (ctx->NewState & (NEW_RASTER_OPS | NEW_LIGHTING | NEW_FOG)) {
 
+   if (ctx->NewState & (NEW_RASTER_OPS | NEW_LIGHTING | NEW_FOG | NEW_TEXTURE_ENABLE)) {
 
-      if (ctx->NewState & NEW_RASTER_OPS) {
+      if (ctx->NewState & (NEW_RASTER_OPS | NEW_TEXTURE_ENABLE)) {
 	 update_pixel_logic(ctx);
 	 update_pixel_masking(ctx);
 	 update_fog_mode(ctx);
@@ -956,20 +992,7 @@
 	    (*ctx->Driver.Dither)( ctx, ctx->Color.DitherFlag );
 	 }
 
-	 /* Check if incoming colors can be modified during rasterization */
-	 if (ctx->Fog.Enabled ||
-	     ctx->Texture.Enabled ||
-	     ctx->Color.BlendEnabled ||
-	     ctx->Color.SWmasking ||
-	     ctx->Color.SWLogicOpEnabled) {
-	    ctx->MutablePixels = GL_TRUE;
-	 }
-	 else {
-	    ctx->MutablePixels = GL_FALSE;
-	 }
-
 	 /* update scissor region */
-
 	 ctx->DrawBuffer->Xmin = 0;
 	 ctx->DrawBuffer->Ymin = 0;
 	 ctx->DrawBuffer->Xmax = ctx->DrawBuffer->Width-1;
@@ -1130,6 +1153,10 @@
 
       gl_calculate_model_project_matrix( ctx );
       ctx->ModelProjectWinMatrixUptodate = 0;
+   }
+
+   if (ctx->NewState & NEW_COLOR_MATRIX) {
+      gl_matrix_analyze( &ctx->ColorMatrix );
    }
 
    /* Figure out whether we can light in object space or not.  If we
Index: xc/extras/Mesa/src/state.h
diff -u xc/extras/Mesa/src/state.h:1.1 xc/extras/Mesa/src/state.h:1.2
--- xc/extras/Mesa/src/state.h:1.1	Tue Feb 15 06:50:52 2000
+++ xc/extras/Mesa/src/state.h	Fri Jun 16 17:02:16 2000
@@ -30,6 +30,13 @@
 #include "types.h"
 
 
+extern void
+_mesa_init_no_op_table(struct _glapi_table *exec, GLuint tableSize);
+
+extern void
+_mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize);
+
+
 extern void gl_update_state( GLcontext *ctx );
 
 
Index: xc/extras/Mesa/src/stencil.c
diff -u xc/extras/Mesa/src/stencil.c:1.3 xc/extras/Mesa/src/stencil.c:1.4
--- xc/extras/Mesa/src/stencil.c:1.3	Mon Feb 14 23:12:35 2000
+++ xc/extras/Mesa/src/stencil.c	Fri Jun 16 17:02:16 2000
@@ -541,9 +541,9 @@
  * 
  */
 static GLboolean
-stencil_and_depth_test_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                             const GLdepth z[], GLstencil stencil[],
-                             GLubyte mask[] )
+stencil_and_ztest_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        const GLdepth z[], GLstencil stencil[],
+                        GLubyte mask[] )
 {
    ASSERT(ctx->Stencil.Enabled);
    ASSERT(n <= PB_SIZE);
@@ -624,8 +624,8 @@
  * 
  */
 GLboolean
-gl_stencil_and_depth_test_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                                const GLdepth z[], GLubyte mask[] )
+_mesa_stencil_and_ztest_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                              const GLdepth z[], GLubyte mask[] )
 {
    GLstencil stencilRow[MAX_WIDTH];
    GLstencil *stencil;
@@ -647,7 +647,7 @@
    }
 
    /* do all the stencil/depth testing/updating */
-   result = stencil_and_depth_test_span( ctx, n, x, y, z, stencil, mask );
+   result = stencil_and_ztest_span( ctx, n, x, y, z, stencil, mask );
 
    if (ctx->Driver.WriteStencilSpan) {
       /* Write updated stencil values into hardware stencil buffer */
@@ -1016,7 +1016,7 @@
  * This is used both for software and hardware stencil buffers.
  *
  * The comments in this function are a bit sparse but the code is
- * almost identical to stencil_and_depth_test_span(), which is well
+ * almost identical to stencil_and_ztest_span(), which is well
  * commented.
  * 
  * Input:  n - number of pixels in the array
@@ -1028,9 +1028,9 @@
  *         GL_FALSE - one or more fragments passed the testing
  */
 GLboolean
-gl_stencil_and_depth_test_pixels( GLcontext *ctx,
-                                  GLuint n, const GLint x[], const GLint y[],
-                                  const GLdepth z[], GLubyte mask[] )
+_mesa_stencil_and_ztest_pixels( GLcontext *ctx,
+                                GLuint n, const GLint x[], const GLint y[],
+                                const GLdepth z[], GLubyte mask[] )
 {
    ASSERT(ctx->Stencil.Enabled);
    ASSERT(n <= PB_SIZE);
@@ -1129,24 +1129,44 @@
  *         x,y - location of first pixel
  * Output:  stencil - the array of stencil values
  */
-void gl_read_stencil_span( GLcontext *ctx,
-                           GLint n, GLint x, GLint y, GLstencil stencil[] )
+void
+_mesa_read_stencil_span( GLcontext *ctx,
+                         GLint n, GLint x, GLint y, GLstencil stencil[] )
 {
+   if (y < 0 || y >= ctx->DrawBuffer->Height ||
+       x + n <= 0 || x >= ctx->DrawBuffer->Width) {
+      /* span is completely outside framebuffer */
+      return; /* undefined values OK */
+   }
+
+   if (x < 0) {
+      GLint dx = -x;
+      x = 0;
+      n -= dx;
+      stencil += dx;
+   }
+   if (x + n > ctx->DrawBuffer->Width) {
+      GLint dx = x + n - ctx->DrawBuffer->Width;
+      n -= dx;
+   }
+   if (n <= 0) {
+      return;
+   }
+
+
    ASSERT(n >= 0);
-   if (ctx->DrawBuffer->Stencil) {
-      if (ctx->Driver.ReadStencilSpan) {
-         (*ctx->Driver.ReadStencilSpan)( ctx, (GLuint) n, x, y, stencil );
-      }
-      else {
-         const GLstencil *s = STENCIL_ADDRESS( x, y );
+   if (ctx->Driver.ReadStencilSpan) {
+      (*ctx->Driver.ReadStencilSpan)( ctx, (GLuint) n, x, y, stencil );
+   }
+   else if (ctx->DrawBuffer->Stencil) {
+      const GLstencil *s = STENCIL_ADDRESS( x, y );
 #if STENCIL_BITS == 8
-         MEMCPY( stencil, s, n * sizeof(GLstencil) );
+      MEMCPY( stencil, s, n * sizeof(GLstencil) );
 #else
-         GLuint i;
-         for (i=0;i<n;i++)
-            stencil[i] = s[i];
+      GLuint i;
+      for (i=0;i<n;i++)
+         stencil[i] = s[i];
 #endif
-      }
    }
 }
 
@@ -1159,41 +1179,42 @@
  *         x, y - location of first pixel
  *         stencil - the array of stencil values
  */
-void gl_write_stencil_span( GLcontext *ctx,
-                            GLint n, GLint x, GLint y,
-			    const GLstencil stencil[] )
+void
+_mesa_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+                          const GLstencil stencil[] )
 {
-   ASSERT(n >= 0);
-   if (ctx->DrawBuffer->Stencil) {
-      /* do clipping */
-      if (y < ctx->DrawBuffer->Ymin || y > ctx->DrawBuffer->Ymax)
-         return;
-      if (x < ctx->DrawBuffer->Xmin) {
-         GLint diff = ctx->DrawBuffer->Xmin - x;
-         n -= diff;
-         stencil += diff;
-         x = ctx->DrawBuffer->Xmin;
-      }
-      if (x + n > ctx->DrawBuffer->Xmax) {
-         GLint diff = x + n - ctx->DrawBuffer->Xmax;
-         n -= diff;
-      }
-
-      ASSERT( n >= 0);
+   if (y < 0 || y >= ctx->DrawBuffer->Height ||
+       x + n <= 0 || x >= ctx->DrawBuffer->Width) {
+      /* span is completely outside framebuffer */
+      return; /* undefined values OK */
+   }
+
+   if (x < 0) {
+      GLint dx = -x;
+      x = 0;
+      n -= dx;
+      stencil += dx;
+   }
+   if (x + n > ctx->DrawBuffer->Width) {
+      GLint dx = x + n - ctx->DrawBuffer->Width;
+      n -= dx;
+   }
+   if (n <= 0) {
+      return;
+   }
 
-      if (ctx->Driver.WriteStencilSpan) {
-         (*ctx->Driver.WriteStencilSpan)( ctx, n, x, y, stencil, NULL );
-      }
-      else {
-         GLstencil *s = STENCIL_ADDRESS( x, y );
+   if (ctx->Driver.WriteStencilSpan) {
+      (*ctx->Driver.WriteStencilSpan)( ctx, n, x, y, stencil, NULL );
+   }
+   else if (ctx->DrawBuffer->Stencil) {
+      GLstencil *s = STENCIL_ADDRESS( x, y );
 #if STENCIL_BITS == 8
-         MEMCPY( s, stencil, n * sizeof(GLstencil) );
+      MEMCPY( s, stencil, n * sizeof(GLstencil) );
 #else
-         GLuint i;
-         for (i=0;i<n;i++)
-            s[i] = stencil[i];
+      GLuint i;
+      for (i=0;i<n;i++)
+         s[i] = stencil[i];
 #endif
-      }
    }
 }
 
@@ -1203,7 +1224,8 @@
  * Allocate a new stencil buffer.  If there's an old one it will be
  * deallocated first.  The new stencil buffer will be uninitialized.
  */
-void gl_alloc_stencil_buffer( GLcontext *ctx )
+void
+_mesa_alloc_stencil_buffer( GLcontext *ctx )
 {
    GLuint buffersize = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
 
@@ -1218,7 +1240,7 @@
    if (!ctx->DrawBuffer->Stencil) {
       /* out of memory */
       _mesa_set_enable( ctx, GL_STENCIL_TEST, GL_FALSE );
-      gl_error( ctx, GL_OUT_OF_MEMORY, "gl_alloc_stencil_buffer" );
+      gl_error( ctx, GL_OUT_OF_MEMORY, "_mesa_alloc_stencil_buffer" );
    }
 }
 
@@ -1390,7 +1412,8 @@
 /*
  * Clear the stencil buffer.
  */
-void gl_clear_stencil_buffer( GLcontext *ctx )
+void
+_mesa_clear_stencil_buffer( GLcontext *ctx )
 {
    if (ctx->Driver.WriteStencilSpan) {
       ASSERT(ctx->Driver.ReadStencilSpan);
Index: xc/extras/Mesa/src/stencil.h
diff -u xc/extras/Mesa/src/stencil.h:1.3 xc/extras/Mesa/src/stencil.h:1.4
--- xc/extras/Mesa/src/stencil.h:1.3	Mon Feb 14 23:12:35 2000
+++ xc/extras/Mesa/src/stencil.h	Fri Jun 16 17:02:16 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -49,33 +49,31 @@
 
 
 extern GLboolean
-gl_stencil_and_depth_test_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                                const GLdepth z[], GLubyte mask[] );
+_mesa_stencil_and_ztest_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                              const GLdepth z[], GLubyte mask[] );
 
-#ifdef VMS /* VMS allows externals of 31 characters maximum */
-#define gl_stencil_and_depth_test_pixels gl_stencil_and_depth_test_pixel
-#endif
 extern GLboolean
-gl_stencil_and_depth_test_pixels( GLcontext *ctx, GLuint n,
-                                  const GLint x[], const GLint y[],
-                                  const GLdepth z[], GLubyte mask[] );
-
+_mesa_stencil_and_ztest_pixels( GLcontext *ctx, GLuint n,
+                                const GLint x[], const GLint y[],
+                                const GLdepth z[], GLubyte mask[] );
 
 
 extern void
-gl_read_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
-                      GLstencil stencil[] );
+_mesa_read_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+                         GLstencil stencil[] );
 
 
 extern void
-gl_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
-                       const GLstencil stencil[] );
+_mesa_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+                          const GLstencil stencil[] );
 
 
-extern void gl_alloc_stencil_buffer( GLcontext *ctx );
+extern void
+_mesa_alloc_stencil_buffer( GLcontext *ctx );
 
 
-extern void gl_clear_stencil_buffer( GLcontext *ctx );
+extern void
+_mesa_clear_stencil_buffer( GLcontext *ctx );
 
 
 #endif
Index: xc/extras/Mesa/src/teximage.c
diff -u xc/extras/Mesa/src/teximage.c:1.5 xc/extras/Mesa/src/teximage.c:1.7
--- xc/extras/Mesa/src/teximage.c:1.5	Thu Mar  2 08:07:14 2000
+++ xc/extras/Mesa/src/teximage.c	Mon Jun 19 22:08:17 2000
@@ -49,7 +49,58 @@
  */
 
 
+#ifdef DEBUG
+static void PrintTexture(const struct gl_texture_image *img)
+{
+  int i, j, c;
+  GLubyte *data = img->Data;
+
+  if (!data) {
+     printf("No texture data\n");
+     return;
+  }
+
+  switch (img->Format) {
+     case GL_ALPHA:
+     case GL_LUMINANCE:
+     case GL_INTENSITY:
+     case GL_COLOR_INDEX:
+        c = 1;
+        break;
+     case GL_LUMINANCE_ALPHA:
+        c = 2;
+        break;
+     case GL_RGB:
+        c = 3;
+        break;
+     case GL_RGBA:
+        c = 4;
+        break;
+     default:
+        gl_problem(NULL, "error in PrintTexture\n");
+        return;
+  }
+
+
+  for (i = 0; i < img->Height; i++) {
+    for (j = 0; j < img->Width; j++) {
+      if (c==1)
+        printf("%02x  ", data[0]);
+      else if (c==2)
+        printf("%02x%02x  ", data[0], data[1]);
+      else if (c==3)
+        printf("%02x%02x%02x  ", data[0], data[1], data[2]);
+      else if (c==4)
+        printf("%02x%02x%02x%02x  ", data[0], data[1], data[2], data[3]);
+      data += c;
+    }
+    printf("\n");
+  }
+}
+#endif
 
+
+
 /*
  * Compute log base 2 of n.
  * If n isn't an exact power of two return -1.
@@ -85,16 +136,24 @@
  * GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA.
  * Return -1 if invalid enum.
  */
-static GLint
-decode_internal_format( GLint format )
+GLint
+_mesa_base_tex_format( GLcontext *ctx, GLint format )
 {
    switch (format) {
+      case GL_COMPRESSED_ALPHA_ARB:
+         if (ctx && !ctx->Extensions.HaveTextureCompression)
+            return -1;
+         /* fall-through */
       case GL_ALPHA:
       case GL_ALPHA4:
       case GL_ALPHA8:
       case GL_ALPHA12:
       case GL_ALPHA16:
          return GL_ALPHA;
+      case GL_COMPRESSED_LUMINANCE_ARB:
+         if (ctx && !ctx->Extensions.HaveTextureCompression)
+            return -1;
+         /* fall-through */
       case 1:
       case GL_LUMINANCE:
       case GL_LUMINANCE4:
@@ -102,6 +161,10 @@
       case GL_LUMINANCE12:
       case GL_LUMINANCE16:
          return GL_LUMINANCE;
+      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+         if (ctx && !ctx->Extensions.HaveTextureCompression)
+            return -1;
+         /* fall-through */
       case 2:
       case GL_LUMINANCE_ALPHA:
       case GL_LUMINANCE4_ALPHA4:
@@ -111,12 +174,31 @@
       case GL_LUMINANCE12_ALPHA12:
       case GL_LUMINANCE16_ALPHA16:
          return GL_LUMINANCE_ALPHA;
+      case GL_COMPRESSED_INTENSITY_ARB:
+         if (ctx && !ctx->Extensions.HaveTextureCompression)
+            return -1;
+         /* fall-through */
       case GL_INTENSITY:
       case GL_INTENSITY4:
       case GL_INTENSITY8:
       case GL_INTENSITY12:
       case GL_INTENSITY16:
          return GL_INTENSITY;
+      case GL_COMPRESSED_RGB_ARB:
+         if (ctx && ctx->Extensions.HaveTextureCompression)
+            return GL_RGB;
+         else
+            return -1;
+      case GL_COMPRESSED_RGB_FXT1_3DFX:
+         if (ctx && ctx->Extensions.HaveTextureCompressionFXT1)
+            return GL_RGB;
+         else
+            return -1;
+      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+         if (ctx && ctx->Extensions.HaveTextureCompressionS3TC)
+            return GL_RGB;
+         else
+            return -1;
       case 3:
       case GL_RGB:
       case GL_R3_G3_B2:
@@ -127,6 +209,23 @@
       case GL_RGB12:
       case GL_RGB16:
          return GL_RGB;
+      case GL_COMPRESSED_RGBA_ARB:
+         if (ctx && ctx->Extensions.HaveTextureCompression)
+            return GL_RGBA;
+         else
+            return -1;
+      case GL_COMPRESSED_RGBA_FXT1_3DFX:
+         if (ctx && ctx->Extensions.HaveTextureCompressionFXT1)
+            return GL_RGBA;
+         else
+            return -1;
+      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+         if (ctx && ctx->Extensions.HaveTextureCompressionS3TC)
+            return GL_RGBA;
+         else
+            return -1;
       case 4:
       case GL_RGBA:
       case GL_RGBA2:
@@ -223,24 +322,31 @@
    }
 }
 
-
-
-struct gl_texture_image *
-gl_alloc_texture_image( void )
-{
-   return CALLOC_STRUCT(gl_texture_image);
-}
-
 
-
-void
-gl_free_texture_image( struct gl_texture_image *teximage )
+/*
+ * Return GL_TRUE if internalFormat is a compressed format, return GL_FALSE
+ * otherwise.
+ */
+static GLboolean
+is_compressed_format(GLenum internalFormat)
 {
-   if (teximage->Data) {
-      FREE( teximage->Data );
-      teximage->Data = NULL;
+   switch (internalFormat) {
+      case GL_COMPRESSED_ALPHA_ARB:
+      case GL_COMPRESSED_LUMINANCE_ARB:
+      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+      case GL_COMPRESSED_INTENSITY_ARB:
+      case GL_COMPRESSED_RGB_ARB:
+      case GL_COMPRESSED_RGBA_ARB:
+      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      case GL_COMPRESSED_RGB_FXT1_3DFX:
+      case GL_COMPRESSED_RGBA_FXT1_3DFX:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
    }
-   FREE( teximage );
 }
 
 
@@ -354,6 +460,217 @@
 }
 
 
+static void
+set_tex_image(struct gl_texture_object *tObj,
+              GLenum target, GLint level,
+              struct gl_texture_image *texImage)
+{
+   ASSERT(tObj);
+   ASSERT(texImage);
+   switch (target) {
+      case GL_TEXTURE_2D:
+         tObj->Image[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+         tObj->Image[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+         tObj->NegX[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+         tObj->PosY[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+         tObj->NegY[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+         tObj->PosZ[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+         tObj->NegZ[level] = texImage;
+         return;
+      default:
+         gl_problem(NULL, "bad target in set_tex_image()");
+         return;
+   }
+}
+
+
+/*
+ * Return new gl_texture_image struct with all fields initialized to zero.
+ */
+struct gl_texture_image *
+_mesa_alloc_texture_image( void )
+{
+   return CALLOC_STRUCT(gl_texture_image);
+}
+
+
+
+/*
+ * Initialize most fields of a gl_texture_image struct.
+ */
+static void
+init_texture_image( struct gl_texture_image *img,
+                    GLsizei width, GLsizei height, GLsizei depth,
+                    GLint border, GLenum internalFormat )
+{
+   ASSERT(img);
+   ASSERT(!img->Data);
+   img->Format = (GLenum) _mesa_base_tex_format(NULL, internalFormat);
+   set_teximage_component_sizes( img );
+   img->IntFormat = (GLenum) internalFormat;
+   img->Border = border;
+   img->Width = width;
+   img->Height = height;
+   img->Depth = depth;
+   img->WidthLog2 = logbase2(width - 2 * border);
+   if (height == 1)  /* 1-D texture */
+      img->HeightLog2 = 0;
+   else
+      img->HeightLog2 = logbase2(height - 2 * border);
+   if (depth == 1)   /* 2-D texture */
+      img->DepthLog2 = 0;
+   else
+      img->DepthLog2 = logbase2(depth - 2 * border);
+   img->Width2 = 1 << img->WidthLog2;
+   img->Height2 = 1 << img->HeightLog2;
+   img->Depth2 = 1 << img->DepthLog2;
+   img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2);
+   img->IsCompressed = is_compressed_format(internalFormat);
+}
+
+
+
+void
+_mesa_free_texture_image( struct gl_texture_image *teximage )
+{
+   if (teximage->Data) {
+      FREE( teximage->Data );
+      teximage->Data = NULL;
+   }
+   FREE( teximage );
+}
+
+
+
+/*
+ * Return number of bytes of storage needed to store a compressed texture
+ * image.
+ */
+GLuint
+_mesa_compressed_image_size(GLenum internalFormat,
+                            GLint width, GLint height, GLint depth)
+{
+   return 0;
+}
+
+
+
+/*
+ * Given a texture unit and a texture target, return the corresponding
+ * texture object.
+ */
+struct gl_texture_object *
+_mesa_select_tex_object(GLcontext *ctx, struct gl_texture_unit *texUnit,
+                        GLenum target)
+{
+   switch (target) {
+      case GL_TEXTURE_1D:
+         return texUnit->CurrentD[1];
+      case GL_PROXY_TEXTURE_1D:
+         return ctx->Texture.Proxy1D;
+      case GL_TEXTURE_2D:
+         return texUnit->CurrentD[2];
+      case GL_PROXY_TEXTURE_2D:
+         return ctx->Texture.Proxy2D;
+      case GL_TEXTURE_3D:
+         return texUnit->CurrentD[3];
+      case GL_PROXY_TEXTURE_3D:
+         return ctx->Texture.Proxy3D;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+         return ctx->Extensions.HaveTextureCubeMap
+                ? texUnit->CurrentCubeMap : NULL;
+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+         return ctx->Extensions.HaveTextureCubeMap
+                ? ctx->Texture.ProxyCubeMap : NULL;
+      default:
+         gl_problem(NULL, "bad target in _mesa_select_tex_object()");
+         return NULL;
+   }
+}
+
+
+/*
+ * Return the texture image struct which corresponds to target and level
+ * for the given texture unit.
+ */
+struct gl_texture_image *
+_mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+                       GLenum target, GLint level)
+{
+   ASSERT(texUnit);
+   switch (target) {
+      case GL_TEXTURE_1D:
+         return texUnit->CurrentD[1]->Image[level];
+      case GL_PROXY_TEXTURE_1D:
+         return ctx->Texture.Proxy1D->Image[level];
+      case GL_TEXTURE_2D:
+         return texUnit->CurrentD[2]->Image[level];
+      case GL_PROXY_TEXTURE_2D:
+         return ctx->Texture.Proxy2D->Image[level];
+      case GL_TEXTURE_3D:
+         return texUnit->CurrentD[3]->Image[level];
+      case GL_PROXY_TEXTURE_3D:
+         return ctx->Texture.Proxy3D->Image[level];
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            return texUnit->CurrentCubeMap->Image[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            return texUnit->CurrentCubeMap->NegX[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            return texUnit->CurrentCubeMap->PosY[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            return texUnit->CurrentCubeMap->NegY[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            return texUnit->CurrentCubeMap->PosZ[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            return texUnit->CurrentCubeMap->NegZ[level];
+         else
+            return NULL;
+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap)
+            return ctx->Texture.ProxyCubeMap->Image[level];
+         else
+            return NULL;
+      default:
+         gl_problem(ctx, "bad target in _mesa_select_tex_image()");
+         return NULL;
+   }
+}
+
+
+
 /* Need this to prevent an out-of-bounds memory access when using
  * X86 optimized code.
  */
@@ -366,68 +683,45 @@
 
 
 /*
- * This is called by glTexImage[123]D in order to build a gl_texture_image
- * object given the client's parameters and image data.
- * 
- * NOTES: Width, height and depth should include the border.
- *        All texture image parameters should have already been error checked.
+ * Called by glTexImage[123]D.  Fill in a texture image with data given
+ * by the client.  All pixel transfer and unpack modes are handled here.
+ * NOTE: All texture image parameters should have already been error checked.
  */
-static struct gl_texture_image *
-make_texture_image( GLcontext *ctx, GLint internalFormat,
-                    GLint width, GLint height, GLint depth, GLint border,
+static void
+make_texture_image( GLcontext *ctx,
+                    struct gl_texture_image *texImage,
                     GLenum srcFormat, GLenum srcType, const GLvoid *pixels,
                     const struct gl_pixelstore_attrib *unpacking)
 {
    GLint components, numPixels;
-   struct gl_texture_image *texImage;
-
-   assert(width > 0);
-   assert(height > 0);
-   assert(depth > 0);
-   assert(border == 0 || border == 1);
-   assert(pixels);
-   assert(unpacking);
-
-
-   /*
-    * Allocate and initialize the texture_image struct
-    */
-   texImage = gl_alloc_texture_image();
-   if (!texImage)
-      return NULL;
-
-   texImage->Format = (GLenum) decode_internal_format(internalFormat);
-   set_teximage_component_sizes( texImage );
-   texImage->IntFormat = (GLenum) internalFormat;
-   texImage->Border = border;
-   texImage->Width = width;
-   texImage->Height = height;
-   texImage->Depth = depth;
-   texImage->WidthLog2 = logbase2(width - 2 * border);
-   if (height == 1)  /* 1-D texture */
-      texImage->HeightLog2 = 0;
-   else
-      texImage->HeightLog2 = logbase2(height - 2 * border);
-   if (depth == 1)   /* 2-D texture */
-      texImage->DepthLog2 = 0;
-   else
-      texImage->DepthLog2 = logbase2(depth - 2 * border);
-   texImage->Width2 = 1 << texImage->WidthLog2;
-   texImage->Height2 = 1 << texImage->HeightLog2;
-   texImage->Depth2 = 1 << texImage->DepthLog2;
-   texImage->MaxLog2 = MAX2(texImage->WidthLog2, texImage->HeightLog2);
+   GLint internalFormat, width, height, depth, border;
 
+   ASSERT(ctx);
+   ASSERT(texImage);
+   ASSERT(!texImage->Data);
+   ASSERT(pixels);
+   ASSERT(unpacking);
+
+   internalFormat = texImage->IntFormat;
+   width = texImage->Width;
+   height = texImage->Height;
+   depth = texImage->Depth;
+   border = texImage->Border;
    components = components_in_intformat(internalFormat);
-   numPixels = texImage->Width * texImage->Height * texImage->Depth;
 
-   texImage->Data = (GLubyte *) MALLOC(numPixels * components + EXTRA_BYTE);
+   ASSERT(width > 0);
+   ASSERT(height > 0);
+   ASSERT(depth > 0);
+   ASSERT(border == 0 || border == 1);
+   ASSERT(pixels);
+   ASSERT(unpacking);
+   ASSERT(components);
 
-   if (!texImage->Data) {
-      /* out of memory */
-      gl_free_texture_image(texImage);
-      return NULL;
-   }
+   numPixels = width * height * depth;
 
+   texImage->Data = (GLubyte *) MALLOC(numPixels * components + EXTRA_BYTE);
+   if (!texImage->Data)
+      return;      /* out of memory */
 
    /*
     * OK, the texture image struct has been initialized and the texture
@@ -441,15 +735,18 @@
        && !ctx->Pixel.IndexOffset && !ctx->Pixel.IndexShift
        && srcType == GL_UNSIGNED_BYTE && depth == 1) {
 
-      if (srcFormat == internalFormat) {
+      if (srcFormat == internalFormat ||
+          (srcFormat == GL_LUMINANCE && internalFormat == 1) ||
+          (srcFormat == GL_LUMINANCE_ALPHA && internalFormat == 2) ||
+          (srcFormat == GL_RGB && internalFormat == 3) ||
+          (srcFormat == GL_RGBA && internalFormat == 4)) {
          /* This will cover the common GL_RGB, GL_RGBA, GL_ALPHA,
           * GL_LUMINANCE_ALPHA, etc. texture formats.
           */
-         const GLubyte *src = gl_pixel_addr_in_image(unpacking,
-                pixels, width, height, srcFormat, srcType, 0, 0, 0);
-         const GLubyte *src1 = gl_pixel_addr_in_image(unpacking,
-                pixels, width, height, srcFormat, srcType, 0, 1, 0);
-         const GLint srcStride = src1 - src;
+         const GLubyte *src = (const GLubyte *) _mesa_image_address(
+            unpacking, pixels, width, height, srcFormat, srcType, 0, 0, 0);
+         const GLint srcStride = _mesa_image_row_stride(unpacking, width,
+                                                        srcFormat, srcType);
          GLubyte *dst = texImage->Data;
          GLint dstBytesPerRow = width * components * sizeof(GLubyte);
          if (srcStride == dstBytesPerRow) {
@@ -463,15 +760,14 @@
                dst += dstBytesPerRow;
             }
          }
-         return texImage;  /* all done */
+         return;  /* all done */
       }
       else if (srcFormat == GL_RGBA && internalFormat == GL_RGB) {
          /* commonly used by Quake */
-         const GLubyte *src = gl_pixel_addr_in_image(unpacking,
-                pixels, width, height, srcFormat, srcType, 0, 0, 0);
-         const GLubyte *src1 = gl_pixel_addr_in_image(unpacking,
-                pixels, width, height, srcFormat, srcType, 0, 1, 0);
-         const GLint srcStride = src1 - src;
+         const GLubyte *src = (const GLubyte *) _mesa_image_address(
+            unpacking, pixels, width, height, srcFormat, srcType, 0, 0, 0);
+         const GLint srcStride = _mesa_image_row_stride(unpacking, width,
+                                                        srcFormat, srcType);
          GLubyte *dst = texImage->Data;
          GLint i, j;
          for (i = 0; i < height; i++) {
@@ -484,7 +780,7 @@
             }
             src += srcStride;
          }
-         return texImage;  /* all done */
+         return;  /* all done */
       }
    }      
 
@@ -500,7 +796,7 @@
       GLint img, row;
       for (img = 0; img < depth; img++) {
          for (row = 0; row < height; row++) {
-            const GLvoid *source = gl_pixel_addr_in_image(unpacking,
+            const GLvoid *source = _mesa_image_address(unpacking,
                 pixels, width, height, srcFormat, srcType, img, row, 0);
             _mesa_unpack_index_span(ctx, width, dstType, dest,
                                     srcType, source, unpacking, GL_TRUE);
@@ -516,7 +812,7 @@
       GLint img, row;
       for (img = 0; img < depth; img++) {
          for (row = 0; row < height; row++) {
-            const GLvoid *source = gl_pixel_addr_in_image(unpacking,
+            const GLvoid *source = _mesa_image_address(unpacking,
                    pixels, width, height, srcFormat, srcType, img, row, 0);
             _mesa_unpack_ubyte_color_span(ctx, width, dstFormat, dest,
                    srcFormat, srcType, source, unpacking, GL_TRUE);
@@ -524,8 +820,6 @@
          }
       }
    }
-
-   return texImage;   /* All done! */
 }
 
 
@@ -533,48 +827,19 @@
 /*
  * glTexImage[123]D can accept a NULL image pointer.  In this case we
  * create a texture image with unspecified image contents per the OpenGL
- * spec.
+ * spec.  This function creates an empty image for the given texture image.
  */
-static struct gl_texture_image *
-make_null_texture( GLcontext *ctx, GLenum internalFormat,
-                   GLsizei width, GLsizei height, GLsizei depth, GLint border )
+static void
+make_null_texture( struct gl_texture_image *texImage )
 {
    GLint components;
-   struct gl_texture_image *texImage;
    GLint numPixels;
-   (void) ctx;
-
-   /*internalFormat = decode_internal_format(internalFormat);*/
-   components = components_in_intformat(internalFormat);
-   numPixels = width * height * depth;
-
-   texImage = gl_alloc_texture_image();
-   if (!texImage)
-      return NULL;
 
-   texImage->Format = (GLenum) decode_internal_format(internalFormat);
-   set_teximage_component_sizes( texImage );
-   texImage->IntFormat = internalFormat;
-   texImage->Border = border;
-   texImage->Width = width;
-   texImage->Height = height;
-   texImage->Depth = depth;
-   texImage->WidthLog2 = logbase2(width - 2*border);
-   if (height==1)  /* 1-D texture */
-      texImage->HeightLog2 = 0;
-   else
-      texImage->HeightLog2 = logbase2(height - 2*border);
-   if (depth==1)   /* 2-D texture */
-      texImage->DepthLog2 = 0;
-   else
-      texImage->DepthLog2 = logbase2(depth - 2*border);
-   texImage->Width2 = 1 << texImage->WidthLog2;
-   texImage->Height2 = 1 << texImage->HeightLog2;
-   texImage->Depth2 = 1 << texImage->DepthLog2;
-   texImage->MaxLog2 = MAX2( texImage->WidthLog2, texImage->HeightLog2 );
+   ASSERT(texImage);
+   ASSERT(!texImage->Data);
 
-   /* XXX should we really allocate memory for the image or let it be NULL? */
-   /*texImage->Data = NULL;*/
+   components = components_in_intformat(texImage->IntFormat);
+   numPixels = texImage->Width * texImage->Height * texImage->Depth;
 
    texImage->Data = (GLubyte *) MALLOC( numPixels * components + EXTRA_BYTE );
 
@@ -597,9 +862,9 @@
 
       GLubyte *imgPtr = texImage->Data;
       GLint i, j, k;
-      for (i=0;i<height;i++) {
+      for (i = 0; i < texImage->Height; i++) {
          GLint srcRow = 7 - i % 8;
-         for (j=0;j<width;j++) {
+         for (j = 0; j < texImage->Width; j++) {
             GLint srcCol = j % 32;
             GLint texel = (message[srcRow][srcCol]=='X') ? 255 : 70;
             for (k=0;k<components;k++) {
@@ -608,8 +873,6 @@
          }
       }
    }
-
-   return texImage;
 }
 
 
@@ -640,7 +903,10 @@
    }
    else if (dimensions == 2) {
       isProxy = (GLboolean) (target == GL_PROXY_TEXTURE_2D);
-      if (target != GL_TEXTURE_2D && !isProxy) {
+      if (target != GL_TEXTURE_2D && !isProxy &&
+          !(ctx->Extensions.HaveTextureCubeMap &&
+            target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+            target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)) {
           gl_error( ctx, GL_INVALID_ENUM, "glTexImage2D(target)" );
           return GL_TRUE;
       }
@@ -658,7 +924,7 @@
    }
 
    /* Border */
-   if (border!=0 && border!=1) {
+   if (border != 0 && border != 1) {
       if (!isProxy) {
          char message[100];
          sprintf(message, "glTexImage%dD(border)", dimensions);
@@ -691,6 +957,17 @@
       }
    }
 
+   /* For cube map, width must equal height */
+   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
+      if (width != height) {
+         if (!isProxy) {
+            gl_error(ctx, GL_INVALID_VALUE, "glTexImage2D(width != height)");
+         }
+         return GL_TRUE;
+      }
+   }
+
    /* Depth */
    if (dimensions >= 3) {
       if (depth < 2 * border || depth > 2 + ctx->Const.MaxTextureSize
@@ -703,7 +980,7 @@
    }
 
    /* Level */
-   if (level<0 || level>=ctx->Const.MaxTextureLevels) {
+   if (level < 0 || level >= ctx->Const.MaxTextureLevels) {
       if (!isProxy) {
          char message[100];
          sprintf(message, "glTexImage%dD(level)", dimensions);
@@ -712,7 +989,7 @@
       return GL_TRUE;
    }
 
-   iformat = decode_internal_format( internalFormat );
+   iformat = _mesa_base_tex_format( ctx, internalFormat );
    if (iformat < 0) {
       if (!isProxy) {
          char message[100];
@@ -722,16 +999,18 @@
       return GL_TRUE;
    }
 
-   if (!gl_is_legal_format_and_type( format, type )) {
-      /* Yes, generate GL_INVALID_OPERATION, not GL_INVALID_ENUM, if there
-       * is a type/format mismatch.  See 1.2 spec page 94, sec 3.6.4.
-       */
-      if (!isProxy) {
-         char message[100];
-         sprintf(message, "glTexImage%dD(format or type)", dimensions);
-         gl_error(ctx, GL_INVALID_OPERATION, message);
+   if (!is_compressed_format(internalFormat)) {
+      if (!_mesa_is_legal_format_and_type( format, type )) {
+         /* Yes, generate GL_INVALID_OPERATION, not GL_INVALID_ENUM, if there
+          * is a type/format mismatch.  See 1.2 spec page 94, sec 3.6.4.
+          */
+         if (!isProxy) {
+            char message[100];
+            sprintf(message, "glTexImage%dD(format or type)", dimensions);
+            gl_error(ctx, GL_INVALID_OPERATION, message);
+         }
+         return GL_TRUE;
       }
-      return GL_TRUE;
    }
 
    /* if we get here, the parameters are OK */
@@ -763,7 +1042,15 @@
       }
    }
    else if (dimensions == 2) {
-      if (target != GL_TEXTURE_2D) {
+      if (ctx->Extensions.HaveTextureCubeMap) {
+         if ((target < GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB ||
+              target > GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) &&
+             target != GL_TEXTURE_2D) {
+            gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
+            return GL_TRUE;
+         }
+      }
+      else if (target != GL_TEXTURE_2D) {
          gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
          return GL_TRUE;
       }
@@ -838,11 +1125,13 @@
       }
    }
 
-   if (!gl_is_legal_format_and_type(format, type)) {
-      char message[100];
-      sprintf(message, "glTexSubImage%dD(format or type)", dimensions);
-      gl_error(ctx, GL_INVALID_ENUM, message);
-      return GL_TRUE;
+   if (!is_compressed_format(destTex->IntFormat)) {
+      if (!_mesa_is_legal_format_and_type(format, type)) {
+         char message[100];
+         sprintf(message, "glTexSubImage%dD(format or type)", dimensions);
+         gl_error(ctx, GL_INVALID_ENUM, message);
+         return GL_TRUE;
+      }
    }
 
    return GL_FALSE;
@@ -860,19 +1149,26 @@
                          GLint width, GLint height, GLint border )
 {
    GLint iformat;
-
-   if (target != GL_TEXTURE_1D && target != GL_TEXTURE_2D) {
-      gl_error( ctx, GL_INVALID_ENUM, "glCopyTexImage1/2D(target)" );
-      return GL_TRUE;
-   }
 
-   if (dimensions == 1 && target != GL_TEXTURE_1D) {
-      gl_error( ctx, GL_INVALID_ENUM, "glCopyTexImage1D(target)" );
-      return GL_TRUE;
+   if (dimensions == 1) {
+      if (target != GL_TEXTURE_1D) {
+         gl_error( ctx, GL_INVALID_ENUM, "glCopyTexImage1D(target)" );
+         return GL_TRUE;
+      }
    }
-   else if (dimensions == 2 && target != GL_TEXTURE_2D) {
-      gl_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
-      return GL_TRUE;
+   else if (dimensions == 2) {
+      if (ctx->Extensions.HaveTextureCubeMap) {
+         if ((target < GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB ||
+              target > GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) &&
+             target != GL_TEXTURE_2D) {
+            gl_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
+            return GL_TRUE;
+         }
+      }
+      else if (target != GL_TEXTURE_2D) {
+         gl_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
+         return GL_TRUE;
+      }
    }
 
    /* Border */
@@ -903,6 +1199,15 @@
       }
    }
 
+   /* For cube map, width must equal height */
+   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
+      if (width != height) {
+         gl_error(ctx, GL_INVALID_VALUE, "glCopyTexImage2D(width != height)");
+         return GL_TRUE;
+      }
+   }
+
    /* Level */
    if (level<0 || level>=ctx->Const.MaxTextureLevels) {
       char message[100];
@@ -911,7 +1216,7 @@
       return GL_TRUE;
    }
 
-   iformat = decode_internal_format( internalFormat );
+   iformat = _mesa_base_tex_format( ctx, internalFormat );
    if (iformat < 0) {
       char message[100];
       sprintf(message, "glCopyTexImage%dD(internalFormat)", dimensions);
@@ -933,17 +1238,31 @@
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
    struct gl_texture_image *teximage;
 
-   if (dimensions == 1 && target != GL_TEXTURE_1D) {
-      gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage1D(target)" );
-      return GL_TRUE;
+   if (dimensions == 1) {
+      if (target != GL_TEXTURE_1D) {
+         gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage1D(target)" );
+         return GL_TRUE;
+      }
    }
-   else if (dimensions == 2 && target != GL_TEXTURE_2D) {
-      gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
-      return GL_TRUE;
+   else if (dimensions == 2) {
+      if (ctx->Extensions.HaveTextureCubeMap) {
+         if ((target < GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB ||
+              target > GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) &&
+             target != GL_TEXTURE_2D) {
+            gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
+            return GL_TRUE;
+         }
+      }
+      else if (target != GL_TEXTURE_2D) {
+         gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
+         return GL_TRUE;
+      }
    }
-   else if (dimensions == 3 && target != GL_TEXTURE_3D) {
-      gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage3D(target)" );
-      return GL_TRUE;
+   else if (dimensions == 3) {
+      if (target != GL_TEXTURE_3D) {
+         gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage3D(target)" );
+         return GL_TRUE;
+      }
    }
 
    if (level < 0 || level >= ctx->Const.MaxTextureLevels) {
@@ -1028,66 +1347,100 @@
  * Called from the API.  Note that width includes the border.
  */
 void
-_mesa_TexImage1D( GLenum target, GLint level, GLint internalformat,
+_mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
                   GLsizei width, GLint border, GLenum format,
                   GLenum type, const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexImage1D");
 
    if (target==GL_TEXTURE_1D) {
-      struct gl_texture_image *teximage;
-      if (texture_error_check( ctx, target, level, internalformat,
-                               format, type, 1, width, 1, 1, border )) {
-         /* error in texture image was detected */
-         return;
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 1, width, 1, 1, border)) {
+         return;   /* error in texture image was detected */
       }
 
-      /* free current texture image, if any */
-      if (texUnit->CurrentD[1]->Image[level]) {
-         gl_free_texture_image( texUnit->CurrentD[1]->Image[level] );
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = texUnit->CurrentD[1];
+      texImage = texObj->Image[level];
+
+      if (!texImage) {
+         texImage = _mesa_alloc_texture_image();
+         texObj->Image[level] = texImage;
+         if (!texImage) {
+            gl_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D");
+            return;
+         }
+      }
+      else if (texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
       }
 
-      /* make new texture from source image */
+      /* setup the teximage struct's fields */
+      init_texture_image(texImage, width, 1, 1, border, internalFormat);
+
+      /* process the texture image */
       if (pixels) {
-         teximage = make_texture_image(ctx, internalformat, width, 1, 1,
-                              border, format, type, pixels, &ctx->Unpack);
+         GLboolean retain = GL_TRUE;
+         GLboolean success = GL_FALSE;
+         if (!ctx->Pixel.MapColorFlag && !ctx->Pixel.ScaleOrBiasRGBA
+             && ctx->Driver.TexImage1D) {
+            /* let device driver try to use raw image */
+            success = (*ctx->Driver.TexImage1D)( ctx, target, level, format,
+                                                 type, pixels, &ctx->Unpack,
+                                                 texObj, texImage, &retain);
+         }
+         if (retain || !success) {
+            /* make internal copy of the texture image */
+            make_texture_image(ctx, texImage, format, type,
+                               pixels, &ctx->Unpack);
+            if (!success && ctx->Driver.TexImage1D) {
+               /* let device driver try to use unpacked image */
+               (*ctx->Driver.TexImage1D)( ctx, target, level, texImage->Format,
+                                          GL_UNSIGNED_BYTE, texImage->Data,
+                                          &_mesa_native_packing,
+                                          texObj, texImage, &retain);
+            }
+         }
+         if (!retain && texImage->Data) {
+            FREE(texImage->Data);
+            texImage->Data = NULL;
+         }
       }
       else {
-         teximage = make_null_texture(ctx, (GLenum) internalformat,
-                                      width, 1, 1, border);
+         make_null_texture(texImage);
+         if (ctx->Driver.TexImage1D) {
+            GLboolean retain;
+            (*ctx->Driver.TexImage1D)( ctx, target, level, texImage->Format,
+                                       GL_UNSIGNED_BYTE, texImage->Data,
+                                       &_mesa_native_packing,
+                                       texObj, texImage, &retain);
+         }
       }
 
-      /* install new texture image */
-      texUnit->CurrentD[1]->Image[level] = teximage;
-      gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[1] );
+      /* state update */
+      gl_put_texobj_on_dirty_list( ctx, texObj );
       ctx->NewState |= NEW_TEXTURING;
-
-      /* tell driver about change */
-      if (ctx->Driver.TexImage) {
-         (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D,
-                                  texUnit->CurrentD[1],
-                                  level, internalformat, teximage );
-      }
    }
    else if (target==GL_PROXY_TEXTURE_1D) {
       /* Proxy texture: check for errors and update proxy state */
-      if (texture_error_check( ctx, target, level, internalformat,
-                               format, type, 1, width, 1, 1, border )) {
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 1, width, 1, 1, border)) {
+         /* if error, clear all proxy texture image parameters */
          if (level>=0 && level<ctx->Const.MaxTextureLevels) {
             MEMSET( ctx->Texture.Proxy1D->Image[level], 0,
                     sizeof(struct gl_texture_image) );
          }
       }
       else {
-         ctx->Texture.Proxy1D->Image[level]->Format = (GLenum) format;
-         set_teximage_component_sizes( ctx->Texture.Proxy1D->Image[level] );
-         ctx->Texture.Proxy1D->Image[level]->IntFormat = (GLenum) internalformat;
-         ctx->Texture.Proxy1D->Image[level]->Border = border;
-         ctx->Texture.Proxy1D->Image[level]->Width = width;
-         ctx->Texture.Proxy1D->Image[level]->Height = 1;
-         ctx->Texture.Proxy1D->Image[level]->Depth = 1;
+         /* if no error, update proxy texture image parameters */
+         init_texture_image(ctx->Texture.Proxy1D->Image[level],
+                            width, 1, 1, border, internalFormat);
       }
    }
    else {
@@ -1098,67 +1451,114 @@
 
 
 void
-_mesa_TexImage2D( GLenum target, GLint level, GLint internalformat,
+_mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
                   GLsizei width, GLsizei height, GLint border,
                   GLenum format, GLenum type,
                   const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexImage2D");
 
-   if (target==GL_TEXTURE_2D) {
-      struct gl_texture_image *teximage;
-      if (texture_error_check( ctx, target, level, internalformat,
-                               format, type, 2, width, height, 1, border )) {
-         /* error in texture image was detected */
-         return;
+   if (target==GL_TEXTURE_2D ||
+       (ctx->Extensions.HaveTextureCubeMap &&
+        target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+        target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 2, width, height, 1, border)) {
+         return;   /* error in texture image was detected */
       }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = _mesa_select_tex_object(ctx, texUnit, target);
+      texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
 
-      /* free current texture image, if any */
-      if (texUnit->CurrentD[2]->Image[level]) {
-         gl_free_texture_image( texUnit->CurrentD[2]->Image[level] );
+      if (!texImage) {
+         texImage = _mesa_alloc_texture_image();
+         set_tex_image(texObj, target, level, texImage);
+         /*texObj->Image[level] = texImage;*/
+         if (!texImage) {
+            gl_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+            return;
+         }
+      }
+      else if (texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
       }
 
-      /* make new texture from source image */
+      /* setup the teximage struct's fields */
+      init_texture_image(texImage, width, height, 1, border, internalFormat);
+
+      /* process the texture image */
       if (pixels) {
-         teximage = make_texture_image(ctx, internalformat, width, height, 1,
-                                  border, format, type, pixels, &ctx->Unpack);
+         GLboolean retain = GL_TRUE;
+         GLboolean success = GL_FALSE;
+         if (!ctx->Pixel.MapColorFlag && !ctx->Pixel.ScaleOrBiasRGBA
+             && ctx->Driver.TexImage2D) {
+            /* let device driver try to use raw image */
+            success = (*ctx->Driver.TexImage2D)( ctx, target, level, format,
+                                                 type, pixels, &ctx->Unpack,
+                                                 texObj, texImage, &retain);
+         }
+         if (retain || !success) {
+            /* make internal copy of the texture image */
+            make_texture_image(ctx, texImage, format, type,
+                               pixels, &ctx->Unpack);
+            if (!success && ctx->Driver.TexImage2D) {
+               /* let device driver try to use unpacked image */
+               (*ctx->Driver.TexImage2D)( ctx, target, level, texImage->Format,
+                                          GL_UNSIGNED_BYTE, texImage->Data,
+                                          &_mesa_native_packing,
+                                          texObj, texImage, &retain);
+            }
+         }
+         if (!retain && texImage->Data) {
+            FREE(texImage->Data);
+            texImage->Data = NULL;
+         }
       }
       else {
-         teximage = make_null_texture(ctx, (GLenum) internalformat,
-                                      width, height, 1, border);
+         make_null_texture(texImage);
+         if (ctx->Driver.TexImage2D) {
+            GLboolean retain;
+            (*ctx->Driver.TexImage2D)( ctx, target, level, texImage->Format,
+                                       GL_UNSIGNED_BYTE, texImage->Data,
+                                       &_mesa_native_packing,
+                                       texObj, texImage, &retain);
+         }
       }
 
-      /* install new texture image */
-      texUnit->CurrentD[2]->Image[level] = teximage;
-      gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[2] );
-      ctx->NewState |= NEW_TEXTURING;
-
-      /* tell driver about change */
+#define OLD_DD_TEXTURE
+#ifdef OLD_DD_TEXTURE
+      /* XXX this will be removed in the future */
       if (ctx->Driver.TexImage) {
-         (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D,
-                                  texUnit->CurrentD[2],
-                                  level, internalformat, teximage );
+         (*ctx->Driver.TexImage)( ctx, target, texObj, level, internalFormat,
+                                  texImage );
       }
+#endif
+
+      /* state update */
+      gl_put_texobj_on_dirty_list( ctx, texObj );
+      ctx->NewState |= NEW_TEXTURING;
    }
    else if (target==GL_PROXY_TEXTURE_2D) {
       /* Proxy texture: check for errors and update proxy state */
-      if (texture_error_check( ctx, target, level, internalformat,
-                               format, type, 2, width, height, 1, border )) {
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 2, width, height, 1, border)) {
+         /* if error, clear all proxy texture image parameters */
          if (level>=0 && level<ctx->Const.MaxTextureLevels) {
             MEMSET( ctx->Texture.Proxy2D->Image[level], 0,
                     sizeof(struct gl_texture_image) );
          }
       }
       else {
-         ctx->Texture.Proxy2D->Image[level]->Format = (GLenum) format;
-         set_teximage_component_sizes( ctx->Texture.Proxy2D->Image[level] );
-         ctx->Texture.Proxy2D->Image[level]->IntFormat = (GLenum) internalformat;
-         ctx->Texture.Proxy2D->Image[level]->Border = border;
-         ctx->Texture.Proxy2D->Image[level]->Width = width;
-         ctx->Texture.Proxy2D->Image[level]->Height = height;
-         ctx->Texture.Proxy2D->Image[level]->Depth = 1;
+         /* if no error, update proxy texture image parameters */
+         init_texture_image(ctx->Texture.Proxy1D->Image[level],
+                            width, height, 1, border, internalFormat);
       }
    }
    else {
@@ -1174,69 +1574,101 @@
  * Note that width and height include the border.
  */
 void
-_mesa_TexImage3D( GLenum target, GLint level, GLint internalformat,
+_mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
                   GLsizei width, GLsizei height, GLsizei depth,
                   GLint border, GLenum format, GLenum type,
                   const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexImage3DEXT");
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexImage3D");
 
    if (target==GL_TEXTURE_3D_EXT) {
-      struct gl_texture_image *teximage;
-      if (texture_error_check( ctx, target, level, internalformat,
-                               format, type, 3, width, height, depth,
-                               border )) {
-         /* error in texture image was detected */
-         return;
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 3, width, height, depth, border)) {
+         return;   /* error in texture image was detected */
       }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = texUnit->CurrentD[3];
+      texImage = texObj->Image[level];
 
-      /* free current texture image, if any */
-      if (texUnit->CurrentD[3]->Image[level]) {
-         gl_free_texture_image( texUnit->CurrentD[3]->Image[level] );
+      if (!texImage) {
+         texImage = _mesa_alloc_texture_image();
+         texObj->Image[level] = texImage;
+         if (!texImage) {
+            gl_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D");
+            return;
+         }
       }
+      else if (texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
+      }
+
+      /* setup the teximage struct's fields */
+      init_texture_image(texImage, width, height, depth,
+                         border, internalFormat);
 
-      /* make new texture from source image */
+      /* process the texture image */
       if (pixels) {
-         teximage = make_texture_image(ctx, internalformat, width, height,
-                       depth, border, format, type, pixels, &ctx->Unpack);
+         GLboolean retain = GL_TRUE;
+         GLboolean success = GL_FALSE;
+         if (!ctx->Pixel.MapColorFlag && !ctx->Pixel.ScaleOrBiasRGBA
+             && ctx->Driver.TexImage3D) {
+            /* let device driver try to use raw image */
+            success = (*ctx->Driver.TexImage3D)( ctx, target, level, format,
+                                                 type, pixels, &ctx->Unpack,
+                                                 texObj, texImage, &retain);
+         }
+         if (retain || !success) {
+            /* make internal copy of the texture image */
+            make_texture_image(ctx, texImage, format, type,
+                               pixels, &ctx->Unpack);
+            if (!success && ctx->Driver.TexImage3D) {
+               /* let device driver try to use unpacked image */
+               (*ctx->Driver.TexImage3D)( ctx, target, level, texImage->Format,
+                                          GL_UNSIGNED_BYTE, texImage->Data,
+                                          &_mesa_native_packing,
+                                          texObj, texImage, &retain);
+            }
+         }
+         if (!retain && texImage->Data) {
+            FREE(texImage->Data);
+            texImage->Data = NULL;
+         }
       }
       else {
-         teximage = make_null_texture(ctx, (GLenum) internalformat,
-                                      width, height, depth, border);
+         make_null_texture(texImage);
+         if (ctx->Driver.TexImage3D) {
+            GLboolean retain;
+            (*ctx->Driver.TexImage3D)( ctx, target, level, texImage->Format,
+                                       GL_UNSIGNED_BYTE, texImage->Data,
+                                       &_mesa_native_packing,
+                                       texObj, texImage, &retain);
+         }
       }
 
-      /* install new texture image */
-      texUnit->CurrentD[3]->Image[level] = teximage;
-      gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[3] );
+      /* state update */
+      gl_put_texobj_on_dirty_list( ctx, texObj );
       ctx->NewState |= NEW_TEXTURING;
-
-      /* tell driver about change */
-      if (ctx->Driver.TexImage) {
-         (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT,
-                                  texUnit->CurrentD[3],
-                                  level, internalformat, teximage );
-      }
    }
-   else if (target==GL_PROXY_TEXTURE_3D_EXT) {
+   else if (target==GL_PROXY_TEXTURE_3D) {
       /* Proxy texture: check for errors and update proxy state */
-      if (texture_error_check( ctx, target, level, internalformat,
-                               format, type, 3, width, height, depth,
-                               border )) {
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 3, width, height, depth, border)) {
+         /* if error, clear all proxy texture image parameters */
          if (level>=0 && level<ctx->Const.MaxTextureLevels) {
             MEMSET( ctx->Texture.Proxy3D->Image[level], 0,
                     sizeof(struct gl_texture_image) );
          }
       }
       else {
-         ctx->Texture.Proxy3D->Image[level]->Format = (GLenum) format;
-         set_teximage_component_sizes( ctx->Texture.Proxy3D->Image[level] );
-         ctx->Texture.Proxy3D->Image[level]->IntFormat = (GLenum) internalformat;
-         ctx->Texture.Proxy3D->Image[level]->Border = border;
-         ctx->Texture.Proxy3D->Image[level]->Width = width;
-         ctx->Texture.Proxy3D->Image[level]->Height = height;
-         ctx->Texture.Proxy3D->Image[level]->Depth  = depth;
+         /* if no error, update proxy texture image parameters */
+         init_texture_image(ctx->Texture.Proxy1D->Image[level],
+                            width, height, depth, border, internalFormat);
       }
    }
    else {
@@ -1247,23 +1679,115 @@
 
 
 void
-_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
+_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
                      GLsizei width, GLsizei height, GLsizei depth,
                      GLint border, GLenum format, GLenum type,
                      const GLvoid *pixels )
 {
-   _mesa_TexImage3D(target, level, (GLint) internalformat, width, height,
+   _mesa_TexImage3D(target, level, (GLint) internalFormat, width, height,
                     depth, border, format, type, pixels);
 }
 
 
-
-void
+/*
+ * Fetch a texture image from the device driver.
+ * Store the results in the given texture object at the given mipmap level.
+ */
+void
+_mesa_get_teximage_from_driver( GLcontext *ctx, GLenum target, GLint level,
+                                const struct gl_texture_object *texObj )
+{
+   GLvoid *image;
+   GLenum imgFormat, imgType;
+   GLboolean freeImage;
+   struct gl_texture_image *texImage;
+   GLint destComponents, numPixels, srcBytesPerTexel;
+
+   if (!ctx->Driver.GetTexImage)
+      return;
+
+   image = (*ctx->Driver.GetTexImage)( ctx, target, level, texObj,
+                                       &imgFormat, &imgType, &freeImage);
+   if (!image)
+      return;
+
+   texImage = texObj->Image[level];
+   ASSERT(texImage);
+   if (!texImage)
+      return;
+
+   destComponents = components_in_intformat(texImage->Format);
+   assert(destComponents > 0);
+   numPixels = texImage->Width * texImage->Height * texImage->Depth;
+   assert(numPixels > 0);
+   srcBytesPerTexel = _mesa_bytes_per_pixel(imgFormat, imgType);
+   assert(srcBytesPerTexel > 0);
+
+   if (!texImage->Data) {
+      /* Allocate memory for the texture image data */
+      texImage->Data = (GLubyte *) MALLOC(numPixels * destComponents + EXTRA_BYTE);
+   }
+
+   if (imgFormat == texImage->Format && imgType == GL_UNSIGNED_BYTE) {
+      /* We got lucky!  The driver's format and type match Mesa's format. */
+      if (texImage->Data) {
+         MEMCPY(texImage->Data, image, numPixels * destComponents);
+      }
+   }
+   else {
+      /* Convert the texture image from the driver's format to Mesa's
+       * internal format.
+       */
+      const GLint width = texImage->Width;
+      const GLint height = texImage->Height;
+      const GLint depth = texImage->Depth;
+      const GLint destBytesPerRow = width * destComponents * sizeof(GLchan);
+      const GLint srcBytesPerRow = width * srcBytesPerTexel;
+      const GLenum dstType = GL_UNSIGNED_BYTE;
+      const GLenum dstFormat = texImage->Format;
+      const GLubyte *srcPtr = (const GLubyte *) image;
+      GLubyte *destPtr = texImage->Data;
+
+      if (texImage->Format == GL_COLOR_INDEX) {
+         /* color index texture */
+         GLint img, row;
+         assert(imgFormat == GL_COLOR_INDEX);
+         for (img = 0; img < depth; img++) {
+            for (row = 0; row < height; row++) {
+               _mesa_unpack_index_span(ctx, width, dstType, destPtr,
+                             imgType, srcPtr, &_mesa_native_packing, GL_FALSE);
+               destPtr += destBytesPerRow;
+               srcPtr += srcBytesPerRow;
+            }
+         }
+      }
+      else {
+         /* color texture */
+         GLint img, row;
+         for (img = 0; img < depth; img++) {
+            for (row = 0; row < height; row++) {
+               _mesa_unpack_ubyte_color_span(ctx, width, dstFormat, destPtr,
+                  imgFormat, imgType, srcPtr, &_mesa_native_packing, GL_FALSE);
+               destPtr += destBytesPerRow;
+               srcPtr += srcBytesPerRow;
+            }
+         }
+      }
+   }
+
+   if (freeImage)
+      FREE(image);
+}
+
+
+void
 _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
                    GLenum type, GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
    const struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLboolean discardImage;
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexImage");
 
@@ -1272,51 +1796,91 @@
       return;
    }
 
-   if (gl_sizeof_type(type) <= 0) {
+   if (_mesa_sizeof_type(type) <= 0) {
       gl_error( ctx, GL_INVALID_ENUM, "glGetTexImage(type)" );
       return;
    }
 
-   if (gl_components_in_format(format) <= 0) {
+   if (_mesa_components_in_format(format) <= 0) {
       gl_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );
       return;
    }
 
    if (!pixels)
-      return;  /* XXX generate an error??? */
+      return;
 
    switch (target) {
       case GL_TEXTURE_1D:
          texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[1];
+         texImage = texObj->Image[level];
          break;
       case GL_TEXTURE_2D:
          texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[2];
+         texImage = texObj->Image[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->Image[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->NegX[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->PosY[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->NegY[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->PosZ[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->NegZ[level];
          break;
       case GL_TEXTURE_3D:
          texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[3];
+         texImage = texObj->Image[level];
          break;
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glGetTexImage(target)" );
          return;
    }
 
-   if (texObj->Image[level] && texObj->Image[level]->Data) {
-      const struct gl_texture_image *texImage = texObj->Image[level];
+   if (!texImage) {
+      /* invalid mipmap level */
+      return;
+   }
+
+   if (!texImage->Data) {
+      /* try to get the texture image from the device driver */
+      _mesa_get_teximage_from_driver(ctx, target, level, texObj);
+      discardImage = GL_TRUE;
+   }
+   else {
+      discardImage = GL_FALSE;
+   }
+
+   if (texImage->Data) {
       GLint width = texImage->Width;
       GLint height = texImage->Height;
       GLint row;
 
       for (row = 0; row < height; row++) {
          /* compute destination address in client memory */
-         GLvoid *dest = gl_pixel_addr_in_image( &ctx->Unpack, pixels,
+         GLvoid *dest = _mesa_image_address( &ctx->Unpack, pixels,
                                                 width, height,
                                                 format, type, 0, row, 0);
 
          assert(dest);
          if (texImage->Format == GL_RGBA) {
             const GLubyte *src = texImage->Data + row * width * 4 * sizeof(GLubyte);
-            gl_pack_rgba_span( ctx, width, (void *) src, format, type, dest,
-                               &ctx->Pack, GL_TRUE );
+            _mesa_pack_rgba_span( ctx, width, (CONST GLubyte (*)[4]) src,
+                                  format, type, dest, &ctx->Pack, GL_TRUE );
          }
          else {
             /* fetch RGBA row from texture image then pack it in client mem */
@@ -1379,10 +1943,16 @@
                default:
                   gl_problem( ctx, "bad format in gl_GetTexImage" );
             }
-            gl_pack_rgba_span( ctx, width, (const GLubyte (*)[4])rgba,
-                               format, type, dest, &ctx->Pack, GL_TRUE );
+            _mesa_pack_rgba_span( ctx, width, (const GLubyte (*)[4])rgba,
+                                  format, type, dest, &ctx->Pack, GL_TRUE );
          }
       }
+
+      /* if we got the teximage from the device driver we'll discard it now */
+      if (discardImage) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
+      }
    }
 }
 
@@ -1395,65 +1965,78 @@
                      const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_texture_image *destTex;
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLboolean success = GL_FALSE;
 
    if (subtexture_error_check(ctx, 1, target, level, xoffset, 0, 0,
                               width, 1, 1, format, type)) {
-      /* error was detected */
-      return;
+      return;   /* error was detected */
    }
 
-   destTex = texUnit->CurrentD[1]->Image[level];
-   assert(destTex);
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = texUnit->CurrentD[1];
+   texImage = texObj->Image[level];
+   assert(texImage);
 
    if (width == 0 || !pixels)
       return;  /* no-op, not an error */
 
 
-   /*
-    * Replace the texture subimage
-    */
-   {
-      const GLint texComponents = components_in_intformat(destTex->Format);
-      const GLenum texFormat = destTex->Format;
-      const GLint xoffsetb = xoffset + destTex->Border;
-      GLubyte *dst = destTex->Data + xoffsetb * texComponents;
+   if (!ctx->Pixel.MapColorFlag && !ctx->Pixel.ScaleOrBiasRGBA
+       && ctx->Driver.TexSubImage1D) {
+      success = (*ctx->Driver.TexSubImage1D)( ctx, target, level, xoffset,
+                                              width, format, type, pixels,
+                                              &ctx->Unpack, texObj, texImage );
+   }
+   if (!success) {
+      /* XXX if Driver.TexSubImage1D, unpack image and try again? */
+
+      const GLint texComponents = components_in_intformat(texImage->Format);
+      const GLenum texFormat = texImage->Format;
+      const GLint xoffsetb = xoffset + texImage->Border;
+      GLboolean retain = GL_TRUE;
+      if (!texImage->Data) {
+         _mesa_get_teximage_from_driver( ctx, target, level, texObj );
+         if (!texImage->Data) {
+            make_null_texture(texImage);
+         }
+         if (!texImage->Data)
+            return;  /* we're really out of luck! */
+      }
+
       if (texFormat == GL_COLOR_INDEX) {
          /* color index texture */
-         const GLvoid *src = gl_pixel_addr_in_image(&ctx->Unpack, pixels,
-                                  width, 1, format, type, 0, 0, 0);
+         GLubyte *dst = texImage->Data + xoffsetb * texComponents;
+         const GLvoid *src = _mesa_image_address(&ctx->Unpack, pixels, width,
+                                                 1, format, type, 0, 0, 0);
          _mesa_unpack_index_span(ctx, width, GL_UNSIGNED_BYTE, dst,
-                                    type, src, &ctx->Unpack, GL_TRUE);
+                                 type, src, &ctx->Unpack, GL_TRUE);
       }
       else {
          /* color texture */
-         const GLvoid *src = gl_pixel_addr_in_image(&ctx->Unpack, pixels,
-                                  width, 1, format, type, 0, 0, 0);
-         _mesa_unpack_ubyte_color_span(ctx, width, texFormat, dst,
-                              format, type, src, &ctx->Unpack, GL_TRUE);
+         GLubyte *dst = texImage->Data + xoffsetb * texComponents;
+         const GLvoid *src = _mesa_image_address(&ctx->Unpack, pixels, width,
+                                                 1, format, type, 0, 0, 0);
+         _mesa_unpack_ubyte_color_span(ctx, width, texFormat, dst, format,
+                                       type, src, &ctx->Unpack, GL_TRUE);
       }
-   }
 
-   gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[1] );
+      if (ctx->Driver.TexImage1D) {
+         (*ctx->Driver.TexImage1D)( ctx, target, level, texImage->Format,
+                                    GL_UNSIGNED_BYTE, texImage->Data,
+                                    &_mesa_native_packing, texObj, texImage,
+                                    &retain );
+      }
 
-   /*
-    * Inform device driver of texture image change.
-    */
-   if (ctx->Driver.TexSubImage) {
-      (*ctx->Driver.TexSubImage)(ctx, GL_TEXTURE_1D, texUnit->CurrentD[1],
-                                 level, xoffset, 0, width, 1,
-                                 texUnit->CurrentD[1]->Image[level]->IntFormat,
-                                 destTex );
-   }
-   else {
-      if (ctx->Driver.TexImage) {
-         (*ctx->Driver.TexImage)(ctx, GL_TEXTURE_1D, texUnit->CurrentD[1],
-                                 level,
-                                 texUnit->CurrentD[1]->Image[level]->IntFormat,
-                                 destTex );
+      if (!retain && texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
       }
    }
+
+   /*gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[1] );*/
 }
 
 
@@ -1465,76 +2048,104 @@
                      const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_texture_image *destTex;
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLboolean success = GL_FALSE;
 
    if (subtexture_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
                               width, height, 1, format, type)) {
-      /* error was detected */
-      return;
+      return;   /* error was detected */
    }
 
-   destTex = texUnit->CurrentD[2]->Image[level];
-   assert(destTex);
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = texObj->Image[level];
+   assert(texImage);
 
    if (width == 0 || height == 0 || !pixels)
       return;  /* no-op, not an error */
 
+   if (!ctx->Pixel.MapColorFlag && !ctx->Pixel.ScaleOrBiasRGBA
+       && ctx->Driver.TexSubImage2D) {
+      success = (*ctx->Driver.TexSubImage2D)( ctx, target, level, xoffset,
+                                     yoffset, width, height, format, type,
+                                     pixels, &ctx->Unpack, texObj, texImage );
+   }
+   if (!success) {
+      /* XXX if Driver.TexSubImage2D, unpack image and try again? */
+
+      const GLint texComponents = components_in_intformat(texImage->Format);
+      const GLenum texFormat = texImage->Format;
+      const GLint xoffsetb = xoffset + texImage->Border;
+      const GLint yoffsetb = yoffset + texImage->Border;
+      const GLint srcStride = _mesa_image_row_stride(&ctx->Unpack, width,
+                                                     format, type);
+      const GLint dstStride = texImage->Width * texComponents *sizeof(GLubyte);
+      GLboolean retain = GL_TRUE;
+
+      if (!texImage->Data) {
+         _mesa_get_teximage_from_driver( ctx, target, level, texObj );
+         if (!texImage->Data) {
+            make_null_texture(texImage);
+         }
+         if (!texImage->Data)
+            return;  /* we're really out of luck! */
+      }
 
-   /*
-    * Replace the texture subimage
-    */
-   {
-      const GLint texComponents = components_in_intformat(destTex->Format);
-      const GLenum texFormat = destTex->Format;
-      const GLint xoffsetb = xoffset + destTex->Border;
-      const GLint yoffsetb = yoffset + destTex->Border;
-      GLubyte *dst = destTex->Data
-                   + (yoffsetb * destTex->Width + xoffsetb) * texComponents;
       if (texFormat == GL_COLOR_INDEX) {
          /* color index texture */
-         const GLint stride = destTex->Width * sizeof(GLubyte);
+         GLubyte *dst = texImage->Data
+                    + (yoffsetb * texImage->Width + xoffsetb) * texComponents;
+         const GLubyte *src = _mesa_image_address(&ctx->Unpack, pixels,
+                                     width, height, format, type, 0, 0, 0);
          GLint row;
          for (row = 0; row < height; row++) {
-            const GLvoid *src = gl_pixel_addr_in_image(&ctx->Unpack, pixels,
-                                     width, height, format, type, 0, row, 0);
-            _mesa_unpack_index_span(ctx, width, GL_UNSIGNED_BYTE, dst,
-                                    type, src, &ctx->Unpack, GL_TRUE);
-            dst += stride;
+            _mesa_unpack_index_span(ctx, width, GL_UNSIGNED_BYTE, dst, type,
+                                 (const GLvoid *) src, &ctx->Unpack, GL_TRUE);
+            src += srcStride;
+            dst += dstStride;
          }
       }
       else {
          /* color texture */
-         const GLint stride = destTex->Width * texComponents * sizeof(GLubyte);
+         GLubyte *dst = texImage->Data
+                    + (yoffsetb * texImage->Width + xoffsetb) * texComponents;
+         const GLubyte *src = _mesa_image_address(&ctx->Unpack, pixels,
+                                     width, height, format, type, 0, 0, 0);
          GLint row;
          for (row = 0; row < height; row++) {
-            const GLvoid *src = gl_pixel_addr_in_image(&ctx->Unpack, pixels,
-                                     width, height, format, type, 0, row, 0);
-            _mesa_unpack_ubyte_color_span(ctx, width, texFormat, dst,
-                                 format, type, src, &ctx->Unpack, GL_TRUE);
-            dst += stride;
+            _mesa_unpack_ubyte_color_span(ctx, width, texFormat, dst, format,
+                           type, (const GLvoid *) src, &ctx->Unpack, GL_TRUE);
+            src += srcStride;
+            dst += dstStride;
          }
       }
-   }
-
-   gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[2] );
 
-   /*
-    * Inform device driver of texture image change.
-    */
-   if (ctx->Driver.TexSubImage) {
-      (*ctx->Driver.TexSubImage)(ctx, GL_TEXTURE_2D, texUnit->CurrentD[2],
-                                 level, xoffset, yoffset, width, height,
-                                 texUnit->CurrentD[2]->Image[level]->IntFormat,
-                                 destTex );
-   }
-   else {
-      if (ctx->Driver.TexImage) {
-         (*ctx->Driver.TexImage)(ctx, GL_TEXTURE_2D, texUnit->CurrentD[2],
-                                 level,
-                                 texUnit->CurrentD[2]->Image[level]->IntFormat,
-                                 destTex );
+      if (ctx->Driver.TexImage2D) {
+         (*ctx->Driver.TexImage2D)(ctx, target, level, texImage->Format,
+                                   GL_UNSIGNED_BYTE, texImage->Data,
+                                   &_mesa_native_packing, texObj, texImage,
+                                   &retain);
+      }
+
+      if (!retain && texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
+      }
+
+#ifdef OLD_DD_TEXTURE
+      /* XXX this will be removed in the future */
+      if (ctx->Driver.TexSubImage) {
+         (*ctx->Driver.TexSubImage)(ctx, target, texObj, level,
+                                    xoffset, yoffset, width, height,
+                                    texImage->IntFormat, texImage);
+      }
+      else if (ctx->Driver.TexImage) {
+         (*ctx->Driver.TexImage)(ctx, GL_TEXTURE_2D, texObj,
+                                 level, texImage->IntFormat, texImage );
       }
+#endif
    }
 }
 
@@ -1548,71 +2159,90 @@
                      const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_texture_image *destTex;
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLboolean success = GL_FALSE;
 
    if (subtexture_error_check(ctx, 3, target, level, xoffset, yoffset, zoffset,
                               width, height, depth, format, type)) {
-      /* error was detected */
-      return;
+      return;   /* error was detected */
    }
 
-   destTex = texUnit->CurrentD[3]->Image[level];
-   assert(destTex);
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = texUnit->CurrentD[3];
+   texImage = texObj->Image[level];
+   assert(texImage);
 
    if (width == 0 || height == 0 || height == 0 || !pixels)
       return;  /* no-op, not an error */
 
-   /*
-    * Replace the texture subimage
-    */
-   {
-      const GLint texComponents = components_in_intformat(destTex->Format);
-      const GLenum texFormat = destTex->Format;
-      const GLint xoffsetb = xoffset + destTex->Border;
-      const GLint yoffsetb = yoffset + destTex->Border;
-      const GLint zoffsetb = zoffset + destTex->Border;
-      GLint dstRectArea = destTex->Width * destTex->Height;
-      GLubyte *dst = destTex->Data 
-            + (zoffsetb * dstRectArea +  yoffsetb * destTex->Width + xoffsetb)
-            * texComponents;
+   if (!ctx->Pixel.MapColorFlag && !ctx->Pixel.ScaleOrBiasRGBA
+       && ctx->Driver.TexSubImage3D) {
+      success = (*ctx->Driver.TexSubImage3D)( ctx, target, level, xoffset,
+                                yoffset, zoffset, width, height, depth, format,
+                                type, pixels, &ctx->Unpack, texObj, texImage );
+   }
+   if (!success) {
+      /* XXX if Driver.TexSubImage3D, unpack image and try again? */
+
+      const GLint texComponents = components_in_intformat(texImage->Format);
+      const GLenum texFormat = texImage->Format;
+      const GLint xoffsetb = xoffset + texImage->Border;
+      const GLint yoffsetb = yoffset + texImage->Border;
+      const GLint zoffsetb = zoffset + texImage->Border;
+      const GLint texWidth = texImage->Width;
+      const GLint dstRectArea = texWidth * texImage->Height;
+      const GLint srcStride = _mesa_image_row_stride(&ctx->Unpack,
+                                                     width, format, type);
+      const GLint dstStride = texWidth * texComponents * sizeof(GLubyte);
+      GLboolean retain = GL_TRUE;
 
       if (texFormat == GL_COLOR_INDEX) {
          /* color index texture */
-         const GLint stride = destTex->Width * sizeof(GLubyte);
          GLint img, row;
          for (img = 0; img < depth; img++) {
+            const GLubyte *src = _mesa_image_address(&ctx->Unpack, pixels,
+                                    width, height, format, type, img, 0, 0);
+            GLubyte *dst = texImage->Data + ((zoffsetb + img) * dstRectArea
+                     + yoffsetb * texWidth + xoffsetb) * texComponents;
             for (row = 0; row < height; row++) {
-               const GLvoid *src = gl_pixel_addr_in_image(&ctx->Unpack, pixels,
-                                    width, height, format, type, img, row, 0);
                _mesa_unpack_index_span(ctx, width, GL_UNSIGNED_BYTE, dst,
-                                       type, src, &ctx->Unpack, GL_TRUE);
-               dst += stride;
+                         type, (const GLvoid *) src, &ctx->Unpack, GL_TRUE);
+               src += srcStride;
+               dst += dstStride;
             }
          }
       }
       else {
          /* color texture */
-         const GLint stride = destTex->Width * texComponents * sizeof(GLubyte);
          GLint img, row;
          for (img = 0; img < depth; img++) {
+            const GLubyte *src = _mesa_image_address(&ctx->Unpack, pixels,
+                                     width, height, format, type, img, 0, 0);
+            GLubyte *dst = texImage->Data + ((zoffsetb + img) * dstRectArea
+                     + yoffsetb * texWidth + xoffsetb) * texComponents;
             for (row = 0; row < height; row++) {
-               const GLvoid *src = gl_pixel_addr_in_image(&ctx->Unpack, pixels,
-                                     width, height, format, type, img, row, 0);
                _mesa_unpack_ubyte_color_span(ctx, width, texFormat, dst,
-                                    format, type, src, &ctx->Unpack, GL_TRUE);
-               dst += stride;
+                   format, type, (const GLvoid *) src, &ctx->Unpack, GL_TRUE);
+               src += srcStride;
+               dst += dstStride;
             }
          }
       }
-   }
 
-   gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[1] );
+      if (ctx->Driver.TexImage3D) {
+         (*ctx->Driver.TexImage3D)(ctx, target, level, texImage->Format,
+                                   GL_UNSIGNED_BYTE, texImage->Data,
+                                   &_mesa_native_packing, texObj, texImage,
+                                   &retain);
+      }
 
-   /*
-    * Inform device driver of texture image change.
-    */
-   /* XXX todo */
+      if (!retain && texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
+      }
+   }
 }
 
 
@@ -1632,7 +2262,7 @@
    GLint stride, i;
    GLubyte *image, *dst;
 
-   image = MALLOC(width * height * 4 * sizeof(GLubyte));
+   image = (GLubyte *) MALLOC(width * height * 4 * sizeof(GLubyte));
    if (!image)
       return NULL;
 
@@ -1640,6 +2270,8 @@
    (*ctx->Driver.SetReadBuffer)( ctx, ctx->ReadBuffer,
                                  ctx->Pixel.DriverReadBuffer );
 
+   /* XXX TODO we have to apply pixel transfer ops here! */
+
    dst = image;
    stride = width * 4 * sizeof(GLubyte);
    for (i = 0; i < height; i++) {
@@ -1666,15 +2298,31 @@
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexImage1D");
 
-   if (!copytexture_error_check(ctx, 1, target, level, internalFormat,
-                               width, 1, border)) {
+   if (copytexture_error_check(ctx, 1, target, level, internalFormat,
+                               width, 1, border))
+      return;
+
+   if (ctx->Pixel.MapColorFlag || ctx->Pixel.ScaleOrBiasRGBA
+       || !ctx->Driver.CopyTexImage1D 
+       || !(*ctx->Driver.CopyTexImage1D)(ctx, target, level,
+                         internalFormat, x, y, width, border))
+   {
+      struct gl_pixelstore_attrib unpackSave;
+
+      /* get image from framebuffer */
       GLubyte *image  = read_color_image( ctx, x, y, width, 1 );
       if (!image) {
          gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexImage1D" );
          return;
       }
+
+      /* call glTexImage1D to redefine the texture */
+      unpackSave = ctx->Unpack;
+      ctx->Unpack = _mesa_native_packing;
       (*ctx->Exec->TexImage1D)( target, level, internalFormat, width,
-                     border, GL_RGBA, GL_UNSIGNED_BYTE, image );
+                                border, GL_RGBA, GL_UNSIGNED_BYTE, image );
+      ctx->Unpack = unpackSave;
+
       FREE(image);
    }
 }
@@ -1689,78 +2337,37 @@
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexImage2D");
 
-   if (!copytexture_error_check(ctx, 2, target, level, internalFormat,
-                               width, height, border)) {
+   if (copytexture_error_check(ctx, 2, target, level, internalFormat,
+                               width, height, border))
+      return;
+
+   if (ctx->Pixel.MapColorFlag || ctx->Pixel.ScaleOrBiasRGBA
+       || !ctx->Driver.CopyTexImage2D
+       || !(*ctx->Driver.CopyTexImage2D)(ctx, target, level,
+                         internalFormat, x, y, width, height, border))
+   {
+      struct gl_pixelstore_attrib unpackSave;
+
+      /* get image from framebuffer */
       GLubyte *image  = read_color_image( ctx, x, y, width, height );
       if (!image) {
          gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexImage2D" );
          return;
       }
-      (ctx->Exec->TexImage2D)( target, level, internalFormat, width,
-                         height, border, GL_RGBA, GL_UNSIGNED_BYTE, image );
-      FREE(image);
-   }
-}
-
-
-
-/*
- * Do the work of glCopyTexSubImage[123]D.
- */
-static void
-copy_tex_sub_image( GLcontext *ctx, struct gl_texture_image *dest,
-                    GLint width, GLint height,
-                    GLint srcx, GLint srcy,
-                    GLint dstx, GLint dsty, GLint dstz )
-{
-   static struct gl_pixelstore_attrib packing = {
-      1,            /* Alignment */
-      0,            /* RowLength */
-      0,            /* SkipPixels */
-      0,            /* SkipRows */
-      0,            /* ImageHeight */
-      0,            /* SkipImages */
-      GL_FALSE,     /* SwapBytes */
-      GL_FALSE      /* LsbFirst */
-   };
-
-   GLint i;
-   GLint format, components, rectarea;
-   GLint texwidth, texheight, zoffset;
-
-   /* dst[xyz] may be negative if we have a texture border! */
-   dstx += dest->Border;
-   dsty += dest->Border;
-   dstz += dest->Border;
-   texwidth = dest->Width;
-   texheight = dest->Height;
-   rectarea = texwidth * texheight;
-   zoffset = dstz * rectarea; 
-   format = dest->Format;
-   components = components_in_intformat( format );
 
-   /* Select buffer to read from */
-   (*ctx->Driver.SetReadBuffer)( ctx, ctx->ReadBuffer,
-                                 ctx->Pixel.DriverReadBuffer );
+      /* call glTexImage2D to redefine the texture */
+      unpackSave = ctx->Unpack;
+      ctx->Unpack = _mesa_native_packing;
+      (ctx->Exec->TexImage2D)( target, level, internalFormat, width,
+                      height, border, GL_RGBA, GL_UNSIGNED_BYTE, image );
+      ctx->Unpack = unpackSave;
 
-   for (i = 0;i < height; i++) {
-      GLubyte rgba[MAX_WIDTH][4];
-      GLubyte *dst;
-      gl_read_rgba_span( ctx, ctx->ReadBuffer, width, srcx, srcy + i, rgba );
-      dst = dest->Data + ( zoffset + (dsty+i) * texwidth + dstx) * components;
-      _mesa_unpack_ubyte_color_span(ctx, width, format, dst,
-                                    GL_RGBA, GL_UNSIGNED_BYTE, rgba,
-                                    &packing, GL_TRUE);
+      FREE(image);
    }
-
-   /* Read from draw buffer (the default) */
-   (*ctx->Driver.SetReadBuffer)( ctx, ctx->DrawBuffer,
-                                 ctx->Color.DriverDrawBuffer );
 }
 
 
 
-
 void
 _mesa_CopyTexSubImage1D( GLenum target, GLint level,
                          GLint xoffset, GLint x, GLint y, GLsizei width )
@@ -1768,22 +2375,38 @@
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexSubImage1D");
 
-   if (!copytexsubimage_error_check(ctx, 1, target, level,
-                    xoffset, 0, 0, width, 1)) {
+   if (copytexsubimage_error_check(ctx, 1, target, level,
+                                   xoffset, 0, 0, width, 1))
+      return;
+
+   if (ctx->Pixel.MapColorFlag || ctx->Pixel.ScaleOrBiasRGBA
+       || !ctx->Driver.CopyTexSubImage1D
+       || !(*ctx->Driver.CopyTexSubImage1D)(ctx, target, level,
+                                            xoffset, x, y, width)) {
       struct gl_texture_unit *texUnit;
       struct gl_texture_image *teximage;
+      struct gl_pixelstore_attrib unpackSave;
+      GLubyte *image;
+
       texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
       teximage = texUnit->CurrentD[1]->Image[level];
       assert(teximage);
-      if (teximage->Data) {
-         copy_tex_sub_image(ctx, teximage, width, 1, x, y, xoffset, 0, 0);
-	 /* tell driver about the change */
-	 if (ctx->Driver.TexImage) {
-	   (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D,
-                                    texUnit->CurrentD[1],
-				    level, teximage->IntFormat, teximage );
-	 }
+
+      /* get image from frame buffer */
+      image = read_color_image(ctx, x, y, width, 1);
+      if (!image) {
+         gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage2D" );
+         return;
       }
+      
+      /* now call glTexSubImage1D to do the real work */
+      unpackSave = ctx->Unpack;
+      ctx->Unpack = _mesa_native_packing;
+      _mesa_TexSubImage1D(target, level, xoffset, width,
+                          GL_RGBA, GL_UNSIGNED_BYTE, image);
+      ctx->Unpack = unpackSave;
+
+      FREE(image);
    }
 }
 
@@ -1796,24 +2419,39 @@
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexSubImage2D");
+
+   if (copytexsubimage_error_check(ctx, 2, target, level,
+                                   xoffset, yoffset, 0, width, height))
+      return;
 
-   if (!copytexsubimage_error_check(ctx, 2, target, level,
-                    xoffset, yoffset, 0, width, height)) {
+   if (ctx->Pixel.MapColorFlag || ctx->Pixel.ScaleOrBiasRGBA
+       || !ctx->Driver.CopyTexSubImage2D
+       || !(*ctx->Driver.CopyTexSubImage2D)(ctx, target, level,
+                                xoffset, yoffset, x, y, width, height )) {
       struct gl_texture_unit *texUnit;
       struct gl_texture_image *teximage;
+      struct gl_pixelstore_attrib unpackSave;
+      GLubyte *image;
+
       texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
       teximage = texUnit->CurrentD[2]->Image[level];
       assert(teximage);
-      if (teximage->Data) {
-         copy_tex_sub_image(ctx, teximage, width, height,
-                            x, y, xoffset, yoffset, 0);
-	 /* tell driver about the change */
-	 if (ctx->Driver.TexImage) {
-	   (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D,
-                                    texUnit->CurrentD[2],
-				    level, teximage->IntFormat, teximage );
-	 }
+
+      /* get image from frame buffer */
+      image = read_color_image(ctx, x, y, width, height);
+      if (!image) {
+         gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage2D" );
+         return;
       }
+
+      /* now call glTexSubImage2D to do the real work */
+      unpackSave = ctx->Unpack;
+      ctx->Unpack = _mesa_native_packing;
+      _mesa_TexSubImage2D(target, level, xoffset, yoffset, width, height,
+                          GL_RGBA, GL_UNSIGNED_BYTE, image);
+      ctx->Unpack = unpackSave;
+      
+      FREE(image);
    }
 }
 
@@ -1827,23 +2465,525 @@
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexSubImage3D");
 
-   if (!copytexsubimage_error_check(ctx, 3, target, level,
-                    xoffset, yoffset, zoffset, width, height)) {
+   if (copytexsubimage_error_check(ctx, 3, target, level,
+                    xoffset, yoffset, zoffset, width, height))
+      return;
+
+   if (ctx->Pixel.MapColorFlag || ctx->Pixel.ScaleOrBiasRGBA
+       || !ctx->Driver.CopyTexSubImage3D
+       || !(*ctx->Driver.CopyTexSubImage3D)(ctx, target, level,
+                     xoffset, yoffset, zoffset, x, y, width, height )) {
       struct gl_texture_unit *texUnit;
       struct gl_texture_image *teximage;
+      struct gl_pixelstore_attrib unpackSave;
+      GLubyte *image;
+
       texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
       teximage = texUnit->CurrentD[3]->Image[level];
       assert(teximage);
-      if (teximage->Data) {
-         copy_tex_sub_image(ctx, teximage, width, height, 
-                            x, y, xoffset, yoffset, zoffset);
-	 /* tell driver about the change */
-	 if (ctx->Driver.TexImage) {
-	   (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D,
-                                    texUnit->CurrentD[3],
-				    level, teximage->IntFormat, teximage );
-	 }
+
+      /* get image from frame buffer */
+      image = read_color_image(ctx, x, y, width, height);
+      if (!image) {
+         gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage2D" );
+         return;
       }
+
+      /* now call glTexSubImage2D to do the real work */
+      unpackSave = ctx->Unpack;
+      ctx->Unpack = _mesa_native_packing;
+      _mesa_TexSubImage3D(target, level, xoffset, yoffset, zoffset,
+                          width, height, 1, GL_RGBA, GL_UNSIGNED_BYTE, image);
+      ctx->Unpack = unpackSave;
+      
+      FREE(image);
    }
 }
 
+
+
+void
+_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
+                              GLenum internalFormat, GLsizei width,
+                              GLint border, GLsizei imageSize,
+                              const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCompressedTexImage1DARB");
+
+   if (target == GL_TEXTURE_1D) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              GL_NONE, GL_NONE, 1, width, 1, 1, border)) {
+         return;   /* error in texture image was detected */
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = texUnit->CurrentD[1];
+      texImage = texObj->Image[level];
+
+      if (!texImage) {
+         texImage = _mesa_alloc_texture_image();
+         texObj->Image[level] = texImage;
+         if (!texImage) {
+            gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1DARB");
+            return;
+         }
+      }
+      else if (texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
+      }
+
+      /* setup the teximage struct's fields */
+      init_texture_image(texImage, width, 1, 1, border, internalFormat);
+
+      /* process the texture image */
+      if (data) {
+         GLboolean retain = GL_TRUE;
+         GLboolean success = GL_FALSE;
+         if (ctx->Driver.CompressedTexImage1D) {
+            success = (*ctx->Driver.CompressedTexImage1D)( ctx, target, level,
+                                              data, texObj, texImage, &retain);
+         }
+         if (retain || !success) {
+            /* make internal copy of the texture image */
+            GLuint imageSize = _mesa_compressed_image_size(internalFormat,
+                                                           width, 1, 1);
+            texImage->Data = MALLOC(imageSize);
+            if (texImage->Data) {
+               MEMCPY(texImage->Data, data, imageSize);
+            }
+         }
+         if (!retain && texImage->Data) {
+            FREE(texImage->Data);
+            texImage->Data = NULL;
+         }
+      }
+      else {
+         make_null_texture(texImage);
+         if (ctx->Driver.CompressedTexImage1D) {
+            GLboolean retain;
+            (*ctx->Driver.CompressedTexImage1D)( ctx, target, level,
+                                    texImage->Data, texObj, texImage, &retain);
+         }
+      }
+
+      /* state update */
+      gl_put_texobj_on_dirty_list( ctx, texObj );
+      ctx->NewState |= NEW_TEXTURING;
+   }
+   else if (target == GL_PROXY_TEXTURE_1D) {
+      /* Proxy texture: check for errors and update proxy state */
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              GL_NONE, GL_NONE, 1, width, 1, 1, border)) {
+         /* if error, clear all proxy texture image parameters */
+         if (level>=0 && level<ctx->Const.MaxTextureLevels) {
+            MEMSET( ctx->Texture.Proxy1D->Image[level], 0,
+                    sizeof(struct gl_texture_image) );
+         }
+      }
+      else {
+         /* if no error, update proxy texture image parameters */
+         init_texture_image(ctx->Texture.Proxy1D->Image[level],
+                            width, 1, 1, border, internalFormat);
+      }
+   }
+   else {
+      gl_error( ctx, GL_INVALID_ENUM, "glCompressedTexImage1DARB(target)" );
+      return;
+   }
+}
+
+
+void
+_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
+                              GLenum internalFormat, GLsizei width,
+                              GLsizei height, GLint border, GLsizei imageSize,
+                              const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCompressedTexImage2DARB");
+
+   if (target==GL_TEXTURE_2D ||
+       (ctx->Extensions.HaveTextureCubeMap &&
+        target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+        target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              GL_NONE, GL_NONE, 1, width, height, 1, border)) {
+         return;   /* error in texture image was detected */
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = texUnit->CurrentD[2];
+      texImage = texObj->Image[level];
+
+      if (!texImage) {
+         texImage = _mesa_alloc_texture_image();
+         texObj->Image[level] = texImage;
+         if (!texImage) {
+            gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
+            return;
+         }
+      }
+      else if (texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
+      }
+
+      /* setup the teximage struct's fields */
+      init_texture_image(texImage, width, height, 1, border, internalFormat);
+
+      /* process the texture image */
+      if (data) {
+         GLboolean retain = GL_TRUE;
+         GLboolean success = GL_FALSE;
+         if (ctx->Driver.CompressedTexImage2D) {
+            success = (*ctx->Driver.CompressedTexImage2D)( ctx, target, level,
+                                              data, texObj, texImage, &retain);
+         }
+         if (retain || !success) {
+            /* make internal copy of the texture image */
+            GLuint imageSize = _mesa_compressed_image_size(internalFormat,
+                                                           width, height, 1);
+            texImage->Data = MALLOC(imageSize);
+            if (texImage->Data) {
+               MEMCPY(texImage->Data, data, imageSize);
+            }
+         }
+         if (!retain && texImage->Data) {
+            FREE(texImage->Data);
+            texImage->Data = NULL;
+         }
+      }
+      else {
+         make_null_texture(texImage);
+         if (ctx->Driver.CompressedTexImage2D) {
+            GLboolean retain;
+            (*ctx->Driver.CompressedTexImage2D)( ctx, target, level,
+                                    texImage->Data, texObj, texImage, &retain);
+         }
+      }
+
+      /* state update */
+      gl_put_texobj_on_dirty_list( ctx, texObj );
+      ctx->NewState |= NEW_TEXTURING;
+   }
+   else if (target == GL_PROXY_TEXTURE_2D) {
+      /* Proxy texture: check for errors and update proxy state */
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              GL_NONE, GL_NONE, 1, width, 1, 1, border)) {
+         /* if error, clear all proxy texture image parameters */
+         if (level>=0 && level<ctx->Const.MaxTextureLevels) {
+            MEMSET( ctx->Texture.Proxy2D->Image[level], 0,
+                    sizeof(struct gl_texture_image) );
+         }
+      }
+      else {
+         /* if no error, update proxy texture image parameters */
+         init_texture_image(ctx->Texture.Proxy2D->Image[level],
+                            width, 1, 1, border, internalFormat);
+      }
+   }
+   else {
+      gl_error( ctx, GL_INVALID_ENUM, "glCompressedTexImage2DARB(target)" );
+      return;
+   }
+}
+
+
+void
+_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
+                              GLenum internalFormat, GLsizei width,
+                              GLsizei height, GLsizei depth, GLint border,
+                              GLsizei imageSize, const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCompressedTexImage3DARB");
+
+   if (target == GL_TEXTURE_3D) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+
+      if (texture_error_check(ctx, target, level, internalFormat,
+                          GL_NONE, GL_NONE, 1, width, height, depth, border)) {
+         return;   /* error in texture image was detected */
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = texUnit->CurrentD[3];
+      texImage = texObj->Image[level];
+
+      if (!texImage) {
+         texImage = _mesa_alloc_texture_image();
+         texObj->Image[level] = texImage;
+         if (!texImage) {
+            gl_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3DARB");
+            return;
+         }
+      }
+      else if (texImage->Data) {
+         FREE(texImage->Data);
+         texImage->Data = NULL;
+      }
+
+      /* setup the teximage struct's fields */
+      init_texture_image(texImage, width, height, depth, border, internalFormat);
+
+      /* process the texture image */
+      if (data) {
+         GLboolean retain = GL_TRUE;
+         GLboolean success = GL_FALSE;
+         if (ctx->Driver.CompressedTexImage3D) {
+            success = (*ctx->Driver.CompressedTexImage3D)( ctx, target, level,
+                                              data, texObj, texImage, &retain);
+         }
+         if (retain || !success) {
+            /* make internal copy of the texture image */
+            GLuint imageSize = _mesa_compressed_image_size(internalFormat,
+                                                         width, height, depth);
+            texImage->Data = MALLOC(imageSize);
+            if (texImage->Data) {
+               MEMCPY(texImage->Data, data, imageSize);
+            }
+         }
+         if (!retain && texImage->Data) {
+            FREE(texImage->Data);
+            texImage->Data = NULL;
+         }
+      }
+      else {
+         make_null_texture(texImage);
+         if (ctx->Driver.CompressedTexImage3D) {
+            GLboolean retain;
+            (*ctx->Driver.CompressedTexImage3D)( ctx, target, level,
+                                    texImage->Data, texObj, texImage, &retain);
+         }
+      }
+
+      /* state update */
+      gl_put_texobj_on_dirty_list( ctx, texObj );
+      ctx->NewState |= NEW_TEXTURING;
+   }
+   else if (target == GL_PROXY_TEXTURE_3D) {
+      /* Proxy texture: check for errors and update proxy state */
+      if (texture_error_check(ctx, target, level, internalFormat,
+                          GL_NONE, GL_NONE, 1, width, height, depth, border)) {
+         /* if error, clear all proxy texture image parameters */
+         if (level>=0 && level<ctx->Const.MaxTextureLevels) {
+            MEMSET( ctx->Texture.Proxy3D->Image[level], 0,
+                    sizeof(struct gl_texture_image) );
+         }
+      }
+      else {
+         /* if no error, update proxy texture image parameters */
+         init_texture_image(ctx->Texture.Proxy3D->Image[level],
+                            width, 1, 1, border, internalFormat);
+      }
+   }
+   else {
+      gl_error( ctx, GL_INVALID_ENUM, "glCompressedTexImage3DARB(target)" );
+      return;
+   }
+}
+
+
+void
+_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLsizei width, GLenum format,
+                                 GLsizei imageSize, const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLboolean success = GL_FALSE;
+
+   if (subtexture_error_check(ctx, 1, target, level, xoffset, 0, 0,
+                              width, 1, 1, format, GL_NONE)) {
+      return;   /* error was detected */
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = texObj->Image[level];
+   assert(texImage);
+
+   if (width == 0 || !data)
+      return;  /* no-op, not an error */
+
+   if (ctx->Driver.CompressedTexSubImage1D) {
+      success = (*ctx->Driver.CompressedTexSubImage1D)(ctx, target, level,
+                   xoffset, width, format, imageSize, data, texObj, texImage);
+   }
+   if (!success) {
+      /* XXX what else can we do? */
+      gl_problem(ctx, "glCompressedTexSubImage1DARB failed!");
+      return;
+   }
+
+}
+
+
+void
+_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLint yoffset, GLsizei width, GLsizei height,
+                                 GLenum format, GLsizei imageSize,
+                                 const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLboolean success = GL_FALSE;
+
+   if (subtexture_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
+                              width, height, 1, format, GL_NONE)) {
+      return;   /* error was detected */
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = texObj->Image[level];
+   assert(texImage);
+
+   if (width == 0 || height == 0 || !data)
+      return;  /* no-op, not an error */
+
+   if (ctx->Driver.CompressedTexSubImage2D) {
+      success = (*ctx->Driver.CompressedTexSubImage2D)(ctx, target, level,
+                                       xoffset, yoffset, width, height, format,
+                                       imageSize, data, texObj, texImage);
+   }
+   if (!success) {
+      /* XXX what else can we do? */
+      gl_problem(ctx, "glCompressedTexSubImage2DARB failed!");
+      return;
+   }
+}
+
+
+void
+_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLint yoffset, GLint zoffset, GLsizei width,
+                                 GLsizei height, GLsizei depth, GLenum format,
+                                 GLsizei imageSize, const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLboolean success = GL_FALSE;
+
+   if (subtexture_error_check(ctx, 3, target, level, xoffset, yoffset, zoffset,
+                              width, height, depth, format, GL_NONE)) {
+      return;   /* error was detected */
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = texObj->Image[level];
+   assert(texImage);
+
+   if (width == 0 || height == 0 || depth == 0 || !data)
+      return;  /* no-op, not an error */
+
+   if (ctx->Driver.CompressedTexSubImage3D) {
+      success = (*ctx->Driver.CompressedTexSubImage3D)(ctx, target, level,
+                               xoffset, yoffset, zoffset, width, height, depth,
+                               format, imageSize, data, texObj, texImage);
+   }
+   if (!success) {
+      /* XXX what else can we do? */
+      gl_problem(ctx, "glCompressedTexSubImage3DARB failed!");
+      return;
+   }
+}
+
+
+void
+_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetCompressedTexImageARB");
+
+   if (level < 0 || level >= ctx->Const.MaxTextureLevels) {
+      gl_error( ctx, GL_INVALID_VALUE, "glGetCompressedTexImageARB(level)" );
+      return;
+   }
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[1];
+         texImage = texObj->Image[level];
+         break;
+      case GL_TEXTURE_2D:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[2];
+         texImage = texObj->Image[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->Image[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->NegX[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->PosY[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->NegY[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->PosZ[level];
+         break;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap;
+         texImage = texObj->NegZ[level];
+         break;
+      case GL_TEXTURE_3D:
+         texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[3];
+         texImage = texObj->Image[level];
+         break;
+      default:
+         gl_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB(target)");
+         return;
+   }
+
+   if (!texImage) {
+      /* invalid mipmap level */
+      gl_error(ctx, GL_INVALID_VALUE, "glGetCompressedTexImageARB(level)");
+      return;
+   }
+
+   if (!texImage->IsCompressed) {
+      gl_error(ctx, GL_INVALID_OPERATION, "glGetCompressedTexImageARB");
+      return;
+   }
+
+   if (!img)
+      return;
+
+   if (ctx->Driver.GetCompressedTexImage) {
+      (*ctx->Driver.GetCompressedTexImage)(ctx, target, level, img, texObj,
+                                           texImage);
+   }
+   else {
+      gl_problem(ctx, "Driver doesn't implement GetCompressedTexImage");
+   }
+}
Index: xc/extras/Mesa/src/teximage.h
diff -u xc/extras/Mesa/src/teximage.h:1.3 xc/extras/Mesa/src/teximage.h:1.4
--- xc/extras/Mesa/src/teximage.h:1.3	Mon Feb 14 23:12:36 2000
+++ xc/extras/Mesa/src/teximage.h	Fri Jun 16 17:02:17 2000
@@ -34,13 +34,36 @@
 /*** Internal functions ***/
 
 
+extern GLint
+_mesa_base_tex_format( GLcontext *ctx, GLint format );
+
+
 extern struct gl_texture_image *
-gl_alloc_texture_image( void );
+_mesa_alloc_texture_image( void );
 
 
 extern void
-gl_free_texture_image( struct gl_texture_image *teximage );
+_mesa_free_texture_image( struct gl_texture_image *teximage );
+
+
+extern GLuint
+_mesa_compressed_image_size(GLenum internalFormat,
+                            GLint width, GLint height, GLint depth);
+
+
+extern struct gl_texture_object *
+_mesa_select_tex_object(GLcontext *ctx, struct gl_texture_unit *texUnit,
+                        GLenum target);
+
 
+extern struct gl_texture_image *
+_mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+                       GLenum target, GLint level);
+
+
+extern void
+_mesa_get_teximage_from_driver( GLcontext *ctx, GLenum target, GLint level,
+                                const struct gl_texture_object *texObj );
 
 
 /*** API entry point functions ***/
@@ -125,6 +148,52 @@
 _mesa_CopyTexSubImage3D( GLenum target, GLint level,
                          GLint xoffset, GLint yoffset, GLint zoffset,
                          GLint x, GLint y, GLsizei width, GLsizei height );
+
+
+
+extern void
+_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
+                              GLenum internalformat, GLsizei width,
+                              GLint border, GLsizei imageSize,
+                              const GLvoid *data);
+
+extern void
+_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
+                              GLenum internalformat, GLsizei width,
+                              GLsizei height, GLint border, GLsizei imageSize,
+                              const GLvoid *data);
+
+extern void
+_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
+                              GLenum internalformat, GLsizei width,
+                              GLsizei height, GLsizei depth, GLint border,
+                              GLsizei imageSize, const GLvoid *data);
+
+#ifdef VMS
+#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR
+#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR
+#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR
+#endif
+extern void
+_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLsizei width, GLenum format,
+                                 GLsizei imageSize, const GLvoid *data);
+
+extern void
+_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLint yoffset, GLsizei width, GLsizei height,
+                                 GLenum format, GLsizei imageSize,
+                                 const GLvoid *data);
+
+extern void
+_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLint yoffset, GLint zoffset, GLsizei width,
+                                 GLsizei height, GLsizei depth, GLenum format,
+                                 GLsizei imageSize, const GLvoid *data);
+
+extern void
+_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
+
 
 #endif
 
Index: xc/extras/Mesa/src/texobj.c
diff -u xc/extras/Mesa/src/texobj.c:1.3 xc/extras/Mesa/src/texobj.c:1.4
--- xc/extras/Mesa/src/texobj.c:1.3	Mon Feb 14 23:12:36 2000
+++ xc/extras/Mesa/src/texobj.c	Fri Jun 16 17:02:17 2000
@@ -28,6 +28,7 @@
 #include "all.h"
 #else
 #include "glheader.h"
+#include "colortab.h"
 #include "context.h"
 #include "enums.h"
 #include "hash.h"
@@ -46,7 +47,7 @@
  * table.
  * Input:  shared - the shared GL state structure to contain the texture object
  *         name - integer name for the texture object
- *         dimensions - either 1, 2 or 3
+ *         dimensions - either 1, 2, 3 or 6 (cube map)
  * Return:  pointer to new texture object
  */
 struct gl_texture_object *
@@ -55,7 +56,7 @@
 {
    struct gl_texture_object *obj;
 
-   ASSERT(dimensions <= 3);
+   ASSERT(dimensions <= 3 || dimensions == 6);
 
    obj = CALLOC_STRUCT(gl_texture_object);
 
@@ -73,13 +74,7 @@
       obj->BaseLevel = 0;
       obj->MaxLevel = 1000;
       obj->MinMagThresh = 0.0F;
-      obj->Palette.Table[0] = 255;
-      obj->Palette.Table[1] = 255;
-      obj->Palette.Table[2] = 255;
-      obj->Palette.Table[3] = 255;
-      obj->Palette.Size = 1;
-      obj->Palette.IntFormat = GL_RGBA;
-      obj->Palette.Format = GL_RGBA;
+      _mesa_init_colortable(&obj->Palette);
 
       /* insert into linked list */
       if (shared) {
@@ -143,12 +138,14 @@
       _mesa_HashRemove(shared->TexObjects, t->Name);
    }
 
-   /* free texture image */
+   _mesa_free_colortable_data(&t->Palette);
+
+   /* free texture images */
    {
       GLuint i;
       for (i=0;i<MAX_TEXTURE_LEVELS;i++) {
          if (t->Image[i]) {
-            gl_free_texture_image( t->Image[i] );
+            _mesa_free_texture_image( t->Image[i] );
          }
       }
    }
@@ -162,26 +159,32 @@
  * Examine a texture object to determine if it is complete or not.
  * The t->Complete flag will be set to GL_TRUE or GL_FALSE accordingly.
  */
-void gl_test_texture_object_completeness( const GLcontext *ctx, struct gl_texture_object *t )
+void
+_mesa_test_texobj_completeness( const GLcontext *ctx,
+                                struct gl_texture_object *t )
 {
+   const GLint baseLevel = t->BaseLevel;
+
    t->Complete = GL_TRUE;  /* be optimistic */
 
    /* Always need level zero image */
-   if (!t->Image[0] || !t->Image[0]->Data) {
+   if (!t->Image[baseLevel]) {
       t->Complete = GL_FALSE;
       return;
    }
 
    /* Compute number of mipmap levels */
-   if (t->Dimensions==1) {
-      t->P = t->Image[0]->WidthLog2;
-   }
-   else if (t->Dimensions==2) {
-      t->P = MAX2(t->Image[0]->WidthLog2, t->Image[0]->HeightLog2);
+   if (t->Dimensions == 1) {
+      t->P = t->Image[baseLevel]->WidthLog2;
    }
-   else if (t->Dimensions==3) {
-      GLint max = MAX2(t->Image[0]->WidthLog2, t->Image[0]->HeightLog2);
-      max = MAX2(max, (GLint)(t->Image[0]->DepthLog2));
+   else if (t->Dimensions == 2 || t->Dimensions == 6) {
+      t->P = MAX2(t->Image[baseLevel]->WidthLog2,
+                  t->Image[baseLevel]->HeightLog2);
+   }
+   else if (t->Dimensions == 3) {
+      GLint max = MAX2(t->Image[baseLevel]->WidthLog2,
+                       t->Image[baseLevel]->HeightLog2);
+      max = MAX2(max, (GLint)(t->Image[baseLevel]->DepthLog2));
       t->P = max;
    }
 
@@ -189,12 +192,36 @@
    t->M = (GLfloat) (MIN2(t->MaxLevel, t->P) - t->BaseLevel);
 
 
-   if (t->MinFilter!=GL_NEAREST && t->MinFilter!=GL_LINEAR) {
+   if (t->Dimensions == 6) {
+      /* make sure all six level 0 images are same size */
+      const GLint w = t->Image[baseLevel]->Width2;
+      const GLint h = t->Image[baseLevel]->Height2;
+      if (!t->NegX[baseLevel] ||
+          t->NegX[baseLevel]->Width2 != w ||
+          t->NegX[baseLevel]->Height2 != h ||
+          !t->PosY[baseLevel] ||
+          t->PosY[baseLevel]->Width2 != w ||
+          t->PosY[baseLevel]->Height2 != h ||
+          !t->NegY[baseLevel] ||
+          t->NegY[baseLevel]->Width2 != w ||
+          t->NegY[baseLevel]->Height2 != h ||
+          !t->PosZ[baseLevel] ||
+          t->PosZ[baseLevel]->Width2 != w ||
+          t->PosZ[baseLevel]->Height2 != h ||
+          !t->NegZ[baseLevel] ||
+          t->NegZ[baseLevel]->Width2 != w ||
+          t->NegZ[baseLevel]->Height2 != h) {
+         t->Complete = GL_FALSE;
+         return;
+      }
+   }
+
+   if (t->MinFilter != GL_NEAREST && t->MinFilter != GL_LINEAR) {
       /*
        * Mipmapping: determine if we have a complete set of mipmaps
        */
       GLint i;
-      GLint minLevel = t->BaseLevel;
+      GLint minLevel = baseLevel;
       GLint maxLevel = MIN2(t->P, ctx->Const.MaxTextureLevels-1);
       maxLevel = MIN2(maxLevel, t->MaxLevel);
 
@@ -206,15 +233,11 @@
       /* Test dimension-independent attributes */
       for (i = minLevel; i <= maxLevel; i++) {
          if (t->Image[i]) {
-            if (!t->Image[i]->Data) {
-               t->Complete = GL_FALSE;
-               return;
-            }
-            if (t->Image[i]->Format != t->Image[0]->Format) {
+            if (t->Image[i]->Format != t->Image[baseLevel]->Format) {
                t->Complete = GL_FALSE;
                return;
             }
-            if (t->Image[i]->Border != t->Image[0]->Border) {
+            if (t->Image[i]->Border != t->Image[baseLevel]->Border) {
                t->Complete = GL_FALSE;
                return;
             }
@@ -222,11 +245,11 @@
       }
 
       /* Test things which depend on number of texture image dimensions */
-      if (t->Dimensions==1) {
+      if (t->Dimensions == 1) {
          /* Test 1-D mipmaps */
-         GLuint width = t->Image[0]->Width2;
-         for (i=1; i<ctx->Const.MaxTextureLevels; i++) {
-            if (width>1) {
+         GLuint width = t->Image[baseLevel]->Width2;
+         for (i = baseLevel + 1; i < ctx->Const.MaxTextureLevels; i++) {
+            if (width > 1) {
                width /= 2;
             }
             if (i >= minLevel && i <= maxLevel) {
@@ -234,29 +257,25 @@
                   t->Complete = GL_FALSE;
                   return;
                }
-               if (!t->Image[i]->Data) {
-                  t->Complete = GL_FALSE;
-                  return;
-               }
                if (t->Image[i]->Width2 != width ) {
                   t->Complete = GL_FALSE;
                   return;
                }
             }
-            if (width==1) {
+            if (width == 1) {
                return;  /* found smallest needed mipmap, all done! */
             }
          }
       }
-      else if (t->Dimensions==2) {
+      else if (t->Dimensions == 2) {
          /* Test 2-D mipmaps */
-         GLuint width = t->Image[0]->Width2;
-         GLuint height = t->Image[0]->Height2;
-         for (i=1; i<ctx->Const.MaxTextureLevels; i++) {
-            if (width>1) {
+         GLuint width = t->Image[baseLevel]->Width2;
+         GLuint height = t->Image[baseLevel]->Height2;
+         for (i = baseLevel + 1; i < ctx->Const.MaxTextureLevels; i++) {
+            if (width > 1) {
                width /= 2;
             }
-            if (height>1) {
+            if (height > 1) {
                height /= 2;
             }
             if (i >= minLevel && i <= maxLevel) {
@@ -278,19 +297,19 @@
             }
          }
       }
-      else if (t->Dimensions==3) {
+      else if (t->Dimensions == 3) {
          /* Test 3-D mipmaps */
-         GLuint width = t->Image[0]->Width2;
-         GLuint height = t->Image[0]->Height2;
-         GLuint depth = t->Image[0]->Depth2;
-	 for (i=1; i<ctx->Const.MaxTextureLevels; i++) {
-            if (width>1) {
+         GLuint width = t->Image[baseLevel]->Width2;
+         GLuint height = t->Image[baseLevel]->Height2;
+         GLuint depth = t->Image[baseLevel]->Depth2;
+	 for (i = baseLevel + 1; i < ctx->Const.MaxTextureLevels; i++) {
+            if (width > 1) {
                width /= 2;
             }
-            if (height>1) {
+            if (height > 1) {
                height /= 2;
             }
-            if (depth>1) {
+            if (depth > 1) {
                depth /= 2;
             }
             if (i >= minLevel && i <= maxLevel) {
@@ -310,8 +329,42 @@
                   t->Complete = GL_FALSE;
                   return;
                }
+            }
+            if (width == 1 && height == 1 && depth == 1) {
+               return;  /* found smallest needed mipmap, all done! */
+            }
+         }
+      }
+      else if (t->Dimensions == 6) {
+         /* make sure 6 cube faces are consistant */
+         GLuint width = t->Image[baseLevel]->Width2;
+         GLuint height = t->Image[baseLevel]->Height2;
+	 for (i = baseLevel + 1; i < ctx->Const.MaxTextureLevels; i++) {
+            if (width > 1) {
+               width /= 2;
+            }
+            if (height > 1) {
+               height /= 2;
+            }
+            if (i >= minLevel && i <= maxLevel) {
+               /* check that we have images defined */
+               if (!t->Image[i] || !t->NegX[i] ||
+                   !t->PosY[i]  || !t->NegY[i] ||
+                   !t->PosZ[i]  || !t->NegZ[i]) {
+                  t->Complete = GL_FALSE;
+                  return;
+               }
+               /* check that all six images have same size */
+               if (t->NegX[i]->Width2!=width || t->NegX[i]->Height2!=height ||
+                   t->PosY[i]->Width2!=width || t->PosY[i]->Height2!=height ||
+                   t->NegY[i]->Width2!=width || t->NegY[i]->Height2!=height ||
+                   t->PosZ[i]->Width2!=width || t->PosZ[i]->Height2!=height ||
+                   t->NegZ[i]->Width2!=width || t->NegZ[i]->Height2!=height) {
+                  t->Complete = GL_FALSE;
+                  return;
+               }
             }
-            if (width==1 && height==1 && depth==1) {
+            if (width == 1 && height == 1) {
                return;  /* found smallest needed mipmap, all done! */
             }
          }
@@ -324,6 +377,8 @@
 }
 
 
+_glthread_DECLARE_STATIC_MUTEX(GenTexturesLock);
+
 
 /*
  * Execute glGenTextures
@@ -341,6 +396,12 @@
       return;
    }
 
+
+   /*
+    * This must be atomic (generation and allocation of texture IDs)
+    */
+   _glthread_LOCK_MUTEX(GenTexturesLock);
+
    first = _mesa_HashFindFreeKeyBlock(ctx->Shared->TexObjects, n);
 
    /* Return the texture names */
@@ -354,6 +415,8 @@
       GLuint dims = 0;
       (void) gl_alloc_texture_object(ctx->Shared, name, dims);
    }
+
+   _glthread_UNLOCK_MUTEX(GenTexturesLock);
 }
 
 
@@ -429,25 +492,37 @@
    switch (target) {
       case GL_TEXTURE_1D:
          dim = 1;
+         oldTexObj = texUnit->CurrentD[1];
          break;
       case GL_TEXTURE_2D:
          dim = 2;
+         oldTexObj = texUnit->CurrentD[2];
          break;
       case GL_TEXTURE_3D:
          dim = 3;
+         oldTexObj = texUnit->CurrentD[3];
          break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap) {
+            dim = 6;
+            oldTexObj = texUnit->CurrentCubeMap;
+            break;
+         }
+         /* fallthrough */
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
          return;
    }
 
-   oldTexObj = texUnit->CurrentD[dim];
-
    if (oldTexObj->Name == texName)
       return;
 
-   if (texName == 0) 
-      newTexObj = ctx->Shared->DefaultD[dim];
+   if (texName == 0) {
+      if (target == GL_TEXTURE_CUBE_MAP_ARB)
+         newTexObj = ctx->Shared->DefaultCubeMap;
+      else
+         newTexObj = ctx->Shared->DefaultD[dim];
+   }
    else {
       struct _mesa_HashTable *hash = ctx->Shared->TexObjects;
       newTexObj = (struct gl_texture_object *) _mesa_HashLookup(hash, texName);
@@ -467,7 +542,22 @@
 
    newTexObj->RefCount++;
 
-   texUnit->CurrentD[dim] = newTexObj;
+   switch (target) {
+      case GL_TEXTURE_1D:
+         texUnit->CurrentD[1] = newTexObj;
+         break;
+      case GL_TEXTURE_2D:
+         texUnit->CurrentD[2] = newTexObj;
+         break;
+      case GL_TEXTURE_3D:
+         texUnit->CurrentD[3] = newTexObj;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         texUnit->CurrentCubeMap = newTexObj;
+         break;
+      default:
+         gl_problem(ctx, "bad target in BindTexture");
+   }
 
    /* If we've changed the CurrentD[123] texture object then update the
     * ctx->Texture.Current pointer to point to the new texture object.
Index: xc/extras/Mesa/src/texobj.h
diff -u xc/extras/Mesa/src/texobj.h:1.3 xc/extras/Mesa/src/texobj.h:1.4
--- xc/extras/Mesa/src/texobj.h:1.3	Mon Feb 14 23:12:37 2000
+++ xc/extras/Mesa/src/texobj.h	Fri Jun 16 17:02:17 2000
@@ -31,9 +31,6 @@
 #include "types.h"
 
 
-#ifdef VMS
-#define gl_test_texture_object_completeness gl_test_texture_object_complete
-#endif
 
 /*
  * Internal functions
@@ -48,7 +45,9 @@
                                     struct gl_texture_object *t );
 
 
-extern void gl_test_texture_object_completeness( const GLcontext *ctx, struct gl_texture_object *t );
+extern void
+_mesa_test_texobj_completeness( const GLcontext *ctx,
+                                struct gl_texture_object *t );
 
 
 /*
Index: xc/extras/Mesa/src/texstate.c
diff -u xc/extras/Mesa/src/texstate.c:1.3 xc/extras/Mesa/src/texstate.c:1.4
--- xc/extras/Mesa/src/texstate.c:1.3	Mon Feb 14 23:12:37 2000
+++ xc/extras/Mesa/src/texstate.c	Fri Jun 16 17:02:17 2000
@@ -34,6 +34,7 @@
 #include "macros.h"
 #include "matrix.h"
 #include "texobj.h"
+#include "teximage.h"
 #include "texstate.h"
 #include "texture.h"
 #include "types.h"
@@ -68,35 +69,24 @@
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexEnv");
 
-   if (target!=GL_TEXTURE_ENV) {
-      gl_error( ctx, GL_INVALID_ENUM, "glTexEnv(target)" );
-      return;
-   }
+   if (target==GL_TEXTURE_ENV) {
 
-   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
-      fprintf(stderr, "glTexEnv %s %s %.1f(%s) ...\n",  
-	      gl_lookup_enum_by_nr(target),
-	      gl_lookup_enum_by_nr(pname),
-	      *param,
-	      gl_lookup_enum_by_nr((GLenum) (GLint) *param));
-
-
-   if (pname==GL_TEXTURE_ENV_MODE) {
-      GLenum mode = (GLenum) (GLint) *param;
-      switch (mode) {
-         case GL_ADD:
-            if (!gl_extension_is_enabled(ctx, "GL_EXT_texture_env_add")) {
-               gl_error(ctx, GL_INVALID_ENUM, "glTexEnv(param)");
-               return;
-            }
-            /* FALL-THROUGH */
-         case GL_MODULATE:
-         case GL_BLEND:
-         case GL_DECAL:
-         case GL_REPLACE:
+      if (pname==GL_TEXTURE_ENV_MODE) {
+	 GLenum mode = (GLenum) (GLint) *param;
+	 switch (mode) {
+	 case GL_ADD:
+	    if (!ctx->Extensions.HaveTextureEnvAdd) {
+	       gl_error(ctx, GL_INVALID_ENUM, "glTexEnv(param)");
+	       return;
+	    }
+	    /* FALL-THROUGH */
+	 case GL_MODULATE:
+	 case GL_BLEND:
+	 case GL_DECAL:
+	 case GL_REPLACE:
 	    /* A small optimization for drivers */ 
 	    if (texUnit->EnvMode == mode)
-               return;
+	       return;
 
 	    if (MESA_VERBOSE & (VERBOSE_STATE|VERBOSE_TEXTURE))
 	       fprintf(stderr, "glTexEnv: old mode %s, new mode %s\n",
@@ -109,23 +99,53 @@
 	 default:
 	    gl_error( ctx, GL_INVALID_VALUE, "glTexEnv(param)" );
 	    return;
+	 }
       }
+      else if (pname==GL_TEXTURE_ENV_COLOR) {
+	 texUnit->EnvColor[0] = CLAMP( param[0], 0.0F, 1.0F );
+	 texUnit->EnvColor[1] = CLAMP( param[1], 0.0F, 1.0F );
+	 texUnit->EnvColor[2] = CLAMP( param[2], 0.0F, 1.0F );
+	 texUnit->EnvColor[3] = CLAMP( param[3], 0.0F, 1.0F );
+      }
+      else {
+	 gl_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
+	 return;
+      }
+
    }
-   else if (pname==GL_TEXTURE_ENV_COLOR) {
-      texUnit->EnvColor[0] = CLAMP( param[0], 0.0F, 1.0F );
-      texUnit->EnvColor[1] = CLAMP( param[1], 0.0F, 1.0F );
-      texUnit->EnvColor[2] = CLAMP( param[2], 0.0F, 1.0F );
-      texUnit->EnvColor[3] = CLAMP( param[3], 0.0F, 1.0F );
+   else if (target==GL_TEXTURE_FILTER_CONTROL_EXT) {
+
+      if (!ctx->Extensions.HaveTextureLodBias) {
+	 gl_error( ctx, GL_INVALID_ENUM, "glTexEnv(param)" );
+	 return;
+      }
+
+      if (pname==GL_TEXTURE_LOD_BIAS_EXT) {
+	 texUnit->LodBias = param[0];
+      }
+      else {
+	 gl_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
+	 return;
+      }
+
    }
    else {
-      gl_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
+      gl_error( ctx, GL_INVALID_ENUM, "glTexEnv(target)" );
       return;
    }
 
+   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
+      fprintf(stderr, "glTexEnv %s %s %.1f(%s) ...\n",  
+	      gl_lookup_enum_by_nr(target),
+	      gl_lookup_enum_by_nr(pname),
+	      *param,
+	      gl_lookup_enum_by_nr((GLenum) (GLint) *param));
+
    /* Tell device driver about the new texture environment */
    if (ctx->Driver.TexEnv) {
-      (*ctx->Driver.TexEnv)( ctx, pname, param );
+      (*ctx->Driver.TexEnv)( ctx, target, pname, param );
    }
+
 }
 
 
@@ -253,6 +273,12 @@
       case GL_TEXTURE_3D_EXT:
          texObj = texUnit->CurrentD[3];
          break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.HaveTextureCubeMap) {
+            texObj = texUnit->CurrentCubeMap;
+            break;
+         }
+         /* fallthrough */
       default:
          gl_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
          return;
@@ -405,6 +431,28 @@
 }
 
 
+static GLuint
+tex_image_dimensions(GLcontext *ctx, GLenum target)
+{
+   switch (target) {
+      case GL_TEXTURE_1D:
+      case GL_PROXY_TEXTURE_1D:
+         return 1;
+      case GL_TEXTURE_2D:
+      case GL_PROXY_TEXTURE_2D:
+         return 2;
+      case GL_TEXTURE_3D:
+      case GL_PROXY_TEXTURE_3D:
+         return 3;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+         return ctx->Extensions.HaveTextureCubeMap ? 2 : 0;
+      default:
+         gl_problem(ctx, "bad target in _mesa_tex_target_dimensions()");
+         return 0;
+   }
+}
+
 
 void
 _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
@@ -414,6 +462,7 @@
    const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
    const struct gl_texture_image *img = NULL;
    GLuint dimensions;
+   GLboolean isProxy;
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexLevelParameter");
 
@@ -422,36 +471,13 @@
       return;
    }
 
-   switch (target) {
-      case GL_TEXTURE_1D:
-         img = texUnit->CurrentD[1]->Image[level];
-         dimensions = 1;
-         break;
-      case GL_TEXTURE_2D:
-         img = texUnit->CurrentD[2]->Image[level];
-         dimensions = 2;
-         break;
-      case GL_TEXTURE_3D:
-         img = texUnit->CurrentD[3]->Image[level];
-         dimensions = 3; 
-        break;
-      case GL_PROXY_TEXTURE_1D:
-         img = ctx->Texture.Proxy1D->Image[level];
-         dimensions = 1;
-         break;
-      case GL_PROXY_TEXTURE_2D:
-         img = ctx->Texture.Proxy2D->Image[level];
-         dimensions = 2;
-         break;
-      case GL_PROXY_TEXTURE_3D:
-         img = ctx->Texture.Proxy3D->Image[level];
-         dimensions = 3;
-         break;
-      default:
-	 gl_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(target)");
-         return;
+   dimensions = tex_image_dimensions(ctx, target);  /* 1, 2 or 3 */
+   if (dimensions == 0) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(target)");
+      return;
    }
 
+   img = _mesa_select_tex_image(ctx, texUnit, target, level);
    if (!img) {
       if (pname == GL_TEXTURE_COMPONENTS)
          *params = 1;
@@ -460,6 +486,11 @@
       return;
    }
 
+   isProxy = (target == GL_PROXY_TEXTURE_1D) ||
+             (target == GL_PROXY_TEXTURE_2D) ||
+             (target == GL_PROXY_TEXTURE_3D) ||
+             (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB);
+
    switch (pname) {
       case GL_TEXTURE_WIDTH:
          *params = img->Width;
@@ -509,9 +540,31 @@
       case GL_TEXTURE_INDEX_SIZE_EXT:
          *params = img->IndexBits;
          return;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            if (img->IsCompressed && !isProxy)
+               *params = img->CompressedSize;
+            else
+               gl_error(ctx, GL_INVALID_OPERATION,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(pname)");
+         }
+         return;
+      case GL_TEXTURE_COMPRESSED_ARB:
+         if (ctx->Extensions.HaveTextureCompression) {
+            *params = (GLint) img->IsCompressed;
+         }
+         else {
+            gl_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(pname)");
+         }
+         return;
+
       default:
-         gl_error( ctx, GL_INVALID_ENUM,
-                   "glGetTexLevelParameter[if]v(pname)" );
+         gl_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(pname)");
    }
 }
 
@@ -526,19 +579,10 @@
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexParameterfv");
 
-   switch (target) {
-      case GL_TEXTURE_1D:
-         obj = texUnit->CurrentD[1];
-         break;
-      case GL_TEXTURE_2D:
-         obj = texUnit->CurrentD[2];
-         break;
-      case GL_TEXTURE_3D_EXT:
-         obj = texUnit->CurrentD[3];
-         break;
-      default:
-         gl_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(target)");
-         return;
+   obj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!obj) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(target)");
+      return;
    }
 
    switch (pname) {
@@ -596,19 +640,10 @@
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexParameteriv");
 
-   switch (target) {
-      case GL_TEXTURE_1D:
-         obj = texUnit->CurrentD[1];
-         break;
-      case GL_TEXTURE_2D:
-         obj = texUnit->CurrentD[2];
-         break;
-      case GL_TEXTURE_3D_EXT:
-         obj = texUnit->CurrentD[3];
-         break;
-      default:
-         gl_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(target)");
-         return;
+   obj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!obj) {
+      gl_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(target)");
+      return;
    }
 
    switch (pname) {
@@ -737,30 +772,30 @@
       case GL_T:
          if (pname==GL_TEXTURE_GEN_MODE) {
 	    GLenum mode = (GLenum) (GLint) *params;
-	    switch(mode) {
-	    case GL_OBJECT_LINEAR:
-	       texUnit->GenModeT = GL_OBJECT_LINEAR;
-	       texUnit->GenBitT = TEXGEN_OBJ_LINEAR;
-	       break;
-	    case GL_EYE_LINEAR:
-	       texUnit->GenModeT = GL_EYE_LINEAR;
-	       texUnit->GenBitT = TEXGEN_EYE_LINEAR;
-	       break;
-	    case GL_REFLECTION_MAP_NV:
-	       texUnit->GenModeT = GL_REFLECTION_MAP_NV;
-	       texUnit->GenBitT = TEXGEN_REFLECTION_MAP_NV;
-	       break;
-	    case GL_NORMAL_MAP_NV:
-	       texUnit->GenModeT = GL_NORMAL_MAP_NV;
-	       texUnit->GenBitT = TEXGEN_NORMAL_MAP_NV;
-	       break;
-	    case GL_SPHERE_MAP:
-	       texUnit->GenModeT = GL_SPHERE_MAP;
-	       texUnit->GenBitT = TEXGEN_SPHERE_MAP;
-	       break;
-	    default:
-	       gl_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
-	       return;
+	    switch (mode) {
+               case GL_OBJECT_LINEAR:
+                  texUnit->GenModeT = GL_OBJECT_LINEAR;
+                  texUnit->GenBitT = TEXGEN_OBJ_LINEAR;
+                  break;
+               case GL_EYE_LINEAR:
+                  texUnit->GenModeT = GL_EYE_LINEAR;
+                  texUnit->GenBitT = TEXGEN_EYE_LINEAR;
+                  break;
+               case GL_REFLECTION_MAP_NV:
+                  texUnit->GenModeT = GL_REFLECTION_MAP_NV;
+                  texUnit->GenBitT = TEXGEN_REFLECTION_MAP_NV;
+                  break;
+               case GL_NORMAL_MAP_NV:
+                  texUnit->GenModeT = GL_NORMAL_MAP_NV;
+                  texUnit->GenBitT = TEXGEN_NORMAL_MAP_NV;
+                  break;
+               case GL_SPHERE_MAP:
+                  texUnit->GenModeT = GL_SPHERE_MAP;
+                  texUnit->GenBitT = TEXGEN_SPHERE_MAP;
+                  break;
+               default:
+                  gl_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+                  return;
 	    }
 	 }
 	 else if (pname==GL_OBJECT_PLANE) {
@@ -927,7 +962,7 @@
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexGendv");
 
-   switch( coord ) {
+   switch (coord) {
       case GL_S:
          if (pname==GL_TEXTURE_GEN_MODE) {
             params[0] = ENUM_TO_DOUBLE(texUnit->GenModeS);
@@ -1005,7 +1040,7 @@
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexGenfv");
 
-   switch( coord ) {
+   switch (coord) {
       case GL_S:
          if (pname==GL_TEXTURE_GEN_MODE) {
             params[0] = ENUM_TO_FLOAT(texUnit->GenModeS);
@@ -1083,7 +1118,7 @@
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexGeniv");
 
-   switch( coord ) {
+   switch (coord) {
       case GL_S:
          if (pname==GL_TEXTURE_GEN_MODE) {
             params[0] = texUnit->GenModeS;
@@ -1289,8 +1324,8 @@
    struct gl_texture_object *t, *next;
    for (t = ctx->Shared->DirtyTexObjList; t; t = next) {
       next = t->NextDirty;
-      gl_test_texture_object_completeness(ctx, t);
-      gl_set_texture_sampler(t);
+      _mesa_test_texobj_completeness(ctx, t);
+      _mesa_set_texture_sampler(t);
       t->NextDirty = NULL;
       t->Dirty = GL_FALSE;
    }
Index: xc/extras/Mesa/src/texture.c
diff -u xc/extras/Mesa/src/texture.c:1.4 xc/extras/Mesa/src/texture.c:1.5
--- xc/extras/Mesa/src/texture.c:1.4	Mon Feb 21 10:05:32 2000
+++ xc/extras/Mesa/src/texture.c	Fri Jun 16 17:02:17 2000
@@ -32,6 +32,7 @@
 #include "macros.h"
 #include "mmath.h"
 #include "pb.h"
+#include "teximage.h"
 #include "texture.h"
 #include "types.h"
 #include "xform.h"
@@ -144,7 +145,12 @@
 {
    (void) ctx;
 
-   if ((texUnit->Enabled & TEXTURE0_3D) && texUnit->CurrentD[3]->Complete) {
+   if ((texUnit->Enabled & TEXTURE0_CUBE) && texUnit->CurrentCubeMap->Complete) {
+      texUnit->ReallyEnabled = TEXTURE0_CUBE;
+      texUnit->Current = texUnit->CurrentCubeMap;
+      texUnit->CurrentDimension = 6;
+   }
+   else if ((texUnit->Enabled & TEXTURE0_3D) && texUnit->CurrentD[3]->Complete) {
       texUnit->ReallyEnabled = TEXTURE0_3D;
       texUnit->Current = texUnit->CurrentD[3];
       texUnit->CurrentDimension = 3;
@@ -162,6 +168,10 @@
    else {
       if (MESA_VERBOSE & VERBOSE_TEXTURE) {
 	 switch (texUnit->Enabled) {
+	 case TEXTURE0_CUBE:
+	    fprintf(stderr, "Using incomplete cube texture %u\n",
+		    texUnit->CurrentCubeMap->Name);
+	    break;
 	 case TEXTURE0_3D:
 	    fprintf(stderr, "Using incomplete 3d texture %u\n",
 		    texUnit->CurrentD[3]->Name);
@@ -245,11 +255,13 @@
    GLenum format;
 
    if (ctx->Texture.SharedPalette) {
-      palette = ctx->Texture.Palette.Table;
+      ASSERT(ctx->Texture.Palette.TableType == GL_UNSIGNED_BYTE);
+      palette = (const GLubyte *) ctx->Texture.Palette.Table;
       format = ctx->Texture.Palette.Format;
    }
    else {
-      palette = tObj->Palette.Table;
+      ASSERT(tObj->Palette.TableType == GL_UNSIGNED_BYTE);
+      palette = (const GLubyte *) tObj->Palette.Table;
       format = tObj->Palette.Format;
    }
 
@@ -532,10 +544,10 @@
    }
 
    {
-      GLfloat a = myFrac(u);
+      const GLfloat a = myFrac(u);
       /* compute sample weights in fixed point in [0,WEIGHT_SCALE] */
-      GLint w0 = (GLint) ((1.0F-a) * WEIGHT_SCALE + 0.5F);
-      GLint w1 = (GLint) (      a  * WEIGHT_SCALE + 0.5F);
+      const GLint w0 = (GLint) ((1.0F-a) * WEIGHT_SCALE + 0.5F);
+      const GLint w1 = (GLint) (      a  * WEIGHT_SCALE + 0.5F);
 
       GLubyte t0[4], t1[4];  /* texels */
 
@@ -614,7 +626,7 @@
    }
    else {
       GLubyte t0[4], t1[4];
-      GLfloat f = myFrac(lambda);
+      const GLfloat f = myFrac(lambda);
       sample_1d_nearest( tObj, tObj->Image[level  ], s, t0 );
       sample_1d_nearest( tObj, tObj->Image[level+1], s, t1 );
       rgba[RCOMP] = (GLubyte) (GLint) ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
@@ -643,7 +655,7 @@
    }
    else {
       GLubyte t0[4], t1[4];
-      GLfloat f = myFrac(lambda);
+      const GLfloat f = myFrac(lambda);
       sample_1d_linear( tObj, tObj->Image[level  ], s, t0 );
       sample_1d_linear( tObj, tObj->Image[level+1], s, t1 );
       rgba[RCOMP] = (GLubyte) (GLint) ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
@@ -906,13 +918,13 @@
    }
 
    {
-      GLfloat a = myFrac(u);
-      GLfloat b = myFrac(v);
+      const GLfloat a = myFrac(u);
+      const GLfloat b = myFrac(v);
       /* compute sample weights in fixed point in [0,WEIGHT_SCALE] */
-      GLint w00 = (GLint) ((1.0F-a)*(1.0F-b) * WEIGHT_SCALE + 0.5F);
-      GLint w10 = (GLint) (      a *(1.0F-b) * WEIGHT_SCALE + 0.5F);
-      GLint w01 = (GLint) ((1.0F-a)*      b  * WEIGHT_SCALE + 0.5F);
-      GLint w11 = (GLint) (      a *      b  * WEIGHT_SCALE + 0.5F);
+      const GLint w00 = (GLint) ((1.0F-a)*(1.0F-b) * WEIGHT_SCALE + 0.5F);
+      const GLint w10 = (GLint) (      a *(1.0F-b) * WEIGHT_SCALE + 0.5F);
+      const GLint w01 = (GLint) ((1.0F-a)*      b  * WEIGHT_SCALE + 0.5F);
+      const GLint w11 = (GLint) (      a *      b  * WEIGHT_SCALE + 0.5F);
       GLubyte t00[4];
       GLubyte t10[4];
       GLubyte t01[4];
@@ -1008,7 +1020,7 @@
    }
    else {
       GLubyte t0[4], t1[4];  /* texels */
-      GLfloat f = myFrac(lambda);
+      const GLfloat f = myFrac(lambda);
       sample_2d_nearest( tObj, tObj->Image[level  ], s, t, t0 );
       sample_2d_nearest( tObj, tObj->Image[level+1], s, t, t1 );
       rgba[RCOMP] = (GLubyte) (GLint) ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
@@ -1037,7 +1049,7 @@
    }
    else {
       GLubyte t0[4], t1[4];  /* texels */
-      GLfloat f = myFrac(lambda);
+      const GLfloat f = myFrac(lambda);
       sample_2d_linear( tObj, tObj->Image[level  ], s, t, t0 );
       sample_2d_linear( tObj, tObj->Image[level+1], s, t, t1 );
       rgba[RCOMP] = (GLubyte) (GLint) ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
@@ -1385,9 +1397,9 @@
    }
 
    {
-      GLfloat a = myFrac(u);
-      GLfloat b = myFrac(v);
-      GLfloat c = myFrac(w);
+      const GLfloat a = myFrac(u);
+      const GLfloat b = myFrac(v);
+      const GLfloat c = myFrac(w);
       /* compute sample weights in fixed point in [0,WEIGHT_SCALE] */
       GLint w000 = (GLint) ((1.0F-a)*(1.0F-b)*(1.0F-c) * WEIGHT_SCALE + 0.5F);
       GLint w100 = (GLint) (      a *(1.0F-b)*(1.0F-c) * WEIGHT_SCALE + 0.5F);
@@ -1525,7 +1537,7 @@
    }
    else {
       GLubyte t0[4], t1[4];  /* texels */
-      GLfloat f = myFrac(lambda);
+      const GLfloat f = myFrac(lambda);
       sample_3d_nearest( tObj, tObj->Image[level  ], s, t, r, t0 );
       sample_3d_nearest( tObj, tObj->Image[level+1], s, t, r, t1 );
       rgba[RCOMP] = (GLubyte) (GLint) ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
@@ -1553,7 +1565,7 @@
    }
    else {
       GLubyte t0[4], t1[4];  /* texels */
-      GLfloat f = myFrac(lambda);
+      const GLfloat f = myFrac(lambda);
       sample_3d_linear( tObj, tObj->Image[level  ], s, t, r, t0 );
       sample_3d_linear( tObj, tObj->Image[level+1], s, t, r, t1 );
       rgba[RCOMP] = (GLubyte) (GLint) ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
@@ -1648,7 +1660,188 @@
 }
 
 
+/**********************************************************************/
+/*                Texture Cube Map Sampling Functions                 */
+/**********************************************************************/
 
+static struct gl_texture_image *
+choose_cube_face(const struct gl_texture_object *texObj,
+                 const GLfloat texcoord[4],
+                 GLint level,
+                 GLfloat *newS, GLfloat *newT)
+{
+/*
+      major axis
+      direction     target                             sc     tc    ma
+      ----------    -------------------------------    ---    ---   ---
+       +rx          TEXTURE_CUBE_MAP_POSITIVE_X_EXT    -rz    -ry   rx
+       -rx          TEXTURE_CUBE_MAP_NEGATIVE_X_EXT    +rz    -ry   rx
+       +ry          TEXTURE_CUBE_MAP_POSITIVE_Y_EXT    +rx    +rz   ry
+       -ry          TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT    +rx    -rz   ry
+       +rz          TEXTURE_CUBE_MAP_POSITIVE_Z_EXT    +rx    -ry   rz
+       -rz          TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT    -rx    -ry   rz
+*/
+   struct gl_texture_image *texImg;
+   const GLfloat rx = texcoord[0], ry = texcoord[1], rz = texcoord[2];
+   const GLfloat arx = ABSF(rx),   ary = ABSF(ry),   arz = ABSF(rz);
+   GLfloat sc, tc, ma;
+
+   if (arx > ary && arx > arz) {
+      if (rx >= 0.0F) {
+         texImg = texObj->Image[level];
+         sc = -rz;
+         tc = -ry;
+         ma = arx;
+      }
+      else {
+         texImg = texObj->NegX[level];
+         sc = rz;
+         tc = -ry;
+         ma = arx;
+      }
+   }
+   else if (ary > arx && ary > arz) {
+      if (ry >= 0.0F) {
+         texImg = texObj->PosY[level];
+         sc = rx;
+         tc = rz;
+         ma = ary;
+      }
+      else {
+         texImg = texObj->NegY[level];
+         sc = rx;
+         tc = -rz;
+         ma = ary;
+      }
+   }
+   else {
+      if (rz > 0.0F) {
+         texImg = texObj->PosZ[level];
+         sc = rx;
+         tc = -ry;
+         ma = arz;
+      }
+      else {
+         texImg = texObj->NegZ[level];
+         sc = -rx;
+         tc = -ry;
+         ma = arz;
+      }
+   }
+
+   *newS = ( sc / ma + 1.0F ) * 0.5F;
+   *newT = ( tc / ma + 1.0F ) * 0.5F;
+   return texImg;
+}
+
+
+static void
+sample_nearest_cube(const struct gl_texture_object *tObj, GLuint n,
+                    const GLfloat s[], const GLfloat t[],
+                    const GLfloat u[], const GLfloat lambda[],
+                    GLubyte rgba[][4])
+{
+   GLuint i;
+   (void) lambda;
+   for (i = 0; i < n; i++) {
+      struct gl_texture_image *image;
+      GLfloat newS, newT;
+      GLfloat coord[4];
+      coord[0] = s[i];
+      coord[1] = t[i];
+      coord[2] = u[i];
+      image = choose_cube_face(tObj, coord, 0, &newS, &newT);
+      sample_2d_nearest( tObj, image, newS, newT, rgba[i] );
+   }
+}
+
+static void
+sample_linear_cube(const struct gl_texture_object *tObj, GLuint n,
+                   const GLfloat s[], const GLfloat t[],
+                   const GLfloat u[], const GLfloat lambda[],
+                   GLubyte rgba[][4])
+{
+   GLuint i;
+   (void) lambda;
+   for (i = 0; i < n; i++) {
+      struct gl_texture_image *image;
+      GLfloat newS, newT;
+      GLfloat coord[4];
+      coord[0] = s[i];
+      coord[1] = t[i];
+      coord[2] = u[i];
+      image = choose_cube_face(tObj, coord, 0, &newS, &newT);
+      sample_2d_linear( tObj, image, newS, newT, rgba[i] );
+   }
+}
+
+static void
+sample_lambda_cube(const struct gl_texture_object *tObj, GLuint n,
+                   const GLfloat s[], const GLfloat t[],
+                   const GLfloat u[], const GLfloat lambda[],
+                   GLubyte rgba[][4])
+{
+   GLuint i;
+
+   for (i = 0; i < n; i++) {
+      struct gl_texture_image *image;
+      GLfloat newS, newT;
+      GLfloat coord[4];
+      coord[0] = s[i];
+      coord[1] = t[i];
+      coord[2] = u[i];
+      image = choose_cube_face(tObj, coord, 0, &newS, &newT);
+
+      if (lambda[i] > tObj->MinMagThresh) {
+         /* minification */
+         switch (tObj->MinFilter) {
+            case GL_NEAREST:
+               sample_2d_nearest( tObj, image, newS, newT, rgba[i] );
+               break;
+            case GL_LINEAR:
+               sample_2d_linear( tObj, image, newS, newT, rgba[i] );
+               break;
+            case GL_NEAREST_MIPMAP_NEAREST:
+               /*
+               sample_3d_nearest_mipmap_nearest( tObj, s[i], t[i], u[i], lambda[i], rgba[i] );
+               */
+               break;
+            case GL_LINEAR_MIPMAP_NEAREST:
+               /*
+               sample_3d_linear_mipmap_nearest( tObj, s[i], t[i], u[i], lambda[i], rgba[i] );
+               */
+               break;
+            case GL_NEAREST_MIPMAP_LINEAR:
+               /*
+               sample_3d_nearest_mipmap_linear( tObj, s[i], t[i], u[i], lambda[i], rgba[i] );
+               */
+               break;
+            case GL_LINEAR_MIPMAP_LINEAR:
+               /*
+               sample_3d_linear_mipmap_linear( tObj, s[i], t[i], u[i], lambda[i], rgba[i] );
+               */
+               break;
+            default:
+               gl_problem(NULL, "Bad min filter in sample_lambda_cube");
+         }
+      }
+      else {
+         /* magnification */
+         switch (tObj->MagFilter) {
+            case GL_NEAREST:
+               sample_2d_nearest( tObj, image, newS, newT, rgba[i] );
+               break;
+            case GL_LINEAR:
+               sample_2d_linear( tObj, image, newS, newT, rgba[i] );
+               break;
+            default:
+               gl_problem(NULL, "Bad mag filter in sample_lambda_cube");
+         }
+      }
+   }
+}
+
+
 /**********************************************************************/
 /*                       Texture Sampling Setup                       */
 /**********************************************************************/
@@ -1657,7 +1850,8 @@
 /*
  * Setup the texture sampling function for this texture object.
  */
-void gl_set_texture_sampler( struct gl_texture_object *t )
+void
+_mesa_set_texture_sampler( struct gl_texture_object *t )
 {
    if (!t->Complete) {
       t->SampleFunc = NULL;
@@ -1723,8 +1917,20 @@
                t->SampleFunc = sample_nearest_3d;
             }
             break;
+         case 6: /* cube map */
+            if (needLambda) {
+               t->SampleFunc = sample_lambda_cube;
+            }
+            else if (t->MinFilter==GL_LINEAR) {
+               t->SampleFunc = sample_linear_cube;
+            }
+            else {
+               ASSERT(t->MinFilter==GL_NEAREST);
+               t->SampleFunc = sample_nearest_cube;
+            }
+            break;
          default:
-            gl_problem(NULL, "invalid dimensions in gl_set_texture_sampler");
+            gl_problem(NULL, "invalid dimensions in _mesa_set_texture_sampler");
       }
    }
 }
@@ -1750,15 +1956,18 @@
                            GLuint n,
                            GLubyte rgba[][4], CONST GLubyte texel[][4] )
 {
+   GLint baseLevel;
    GLuint i;
    GLint Rc, Gc, Bc, Ac;
    GLenum format;
 
    ASSERT(texUnit);
    ASSERT(texUnit->Current);
-   ASSERT(texUnit->Current->Image[0]);
+
+   baseLevel = texUnit->Current->BaseLevel;
+   ASSERT(texUnit->Current->Image[baseLevel]);
 
-   format = texUnit->Current->Image[0]->Format;
+   format = texUnit->Current->Image[baseLevel]->Format;
 
 /*
  * Use (A*(B+1)) >> 8 as a fast approximation of (A*B)/255 for A
@@ -2092,12 +2301,18 @@
                         const GLfloat r[], GLfloat lambda[],
                         GLubyte rgba[][4] )
 {
-   GLuint mask = (TEXTURE0_1D | TEXTURE0_2D | TEXTURE0_3D) << (texUnit * 4);
+   GLuint mask = (TEXTURE0_1D | TEXTURE0_2D | TEXTURE0_3D | TEXTURE0_CUBE) << (texUnit * 4);
    if (ctx->Texture.Enabled & mask) {
       const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
       if (textureUnit->Current && textureUnit->Current->SampleFunc) {
-
          GLubyte texel[PB_SIZE][4];
+	 if (textureUnit->LodBias != 0.0F) {
+	    /* apply LOD bias, but don't clamp yet */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       lambda[i] += textureUnit->LodBias;
+	    }
+	 }
 
          if (textureUnit->Current->MinLod != -1000.0
              || textureUnit->Current->MaxLod != 1000.0) {
@@ -2108,6 +2323,45 @@
             for (i=0;i<n;i++) {
                GLfloat l = lambda[i];
                lambda[i] = CLAMP(l, min, max);
+            }
+         }
+
+         /* fetch texture images from device driver, if needed */
+         {
+            static const GLenum targets[] = {
+               GL_TEXTURE_1D,
+               GL_TEXTURE_2D,
+               GL_TEXTURE_3D,
+               GL_TEXTURE_CUBE_MAP_ARB,
+               GL_TEXTURE_CUBE_MAP_ARB,
+               GL_TEXTURE_CUBE_MAP_ARB
+            };
+            struct gl_texture_object *texObj = textureUnit->Current;
+            GLboolean needLambda = (texObj->MinFilter != texObj->MagFilter);
+            GLenum target = targets[texObj->Dimensions - 1];
+            if (needLambda) {
+               GLint level;
+               /* Get images for all mipmap levels.  We might not need them
+                * all but this is easier.  We're on a (slow) software path
+                * anyway.
+                */
+               for (level = 0; level <= texObj->P; level++) {
+                  struct gl_texture_image *texImg = texObj->Image[level];
+                  if (texImg && !texImg->Data) {
+                     _mesa_get_teximage_from_driver(ctx, target, level, texObj);
+                     if (!texImg->Data)
+                        return;  /* out of memory */
+                  }
+               }
+            }
+            else {
+               GLint level = texObj->BaseLevel;
+               struct gl_texture_image *texImg = texObj->Image[level];
+               if (texImg && !texImg->Data) {
+                  _mesa_get_teximage_from_driver(ctx, target, level, texObj);
+                  if (!texImg->Data)
+                     return;  /* out of memory */
+               }
             }
          }
 
Index: xc/extras/Mesa/src/texture.h
diff -u xc/extras/Mesa/src/texture.h:1.3 xc/extras/Mesa/src/texture.h:1.4
--- xc/extras/Mesa/src/texture.h:1.3	Mon Feb 14 23:12:38 2000
+++ xc/extras/Mesa/src/texture.h	Fri Jun 16 17:02:17 2000
@@ -34,7 +34,8 @@
 #include "types.h"
 
 
-extern void gl_set_texture_sampler( struct gl_texture_object *t );
+extern void
+_mesa_set_texture_sampler( struct gl_texture_object *t );
 
 extern void gl_init_texture( void );
 
Index: xc/extras/Mesa/src/texutil.c
diff -u /dev/null xc/extras/Mesa/src/texutil.c:1.1
--- /dev/null	Sat Jul  1 20:46:13 2000
+++ xc/extras/Mesa/src/texutil.c	Fri Jun 16 17:02:17 2000
@@ -0,0 +1,1565 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifdef PC_HEADER
+#include "all.h"
+#else
+#include "glheader.h"
+#include "context.h"
+#include "image.h"
+#include "mem.h"
+#include "texutil.h"
+#include "types.h"
+#endif
+
+
+/*
+ * Texture utilities which may be useful to device drivers.
+ * See the texutil.h for the list of supported internal formats.
+ * It's expected that new formats will be added for new hardware.
+ */
+
+
+/*
+ * If the system is little endian and can do 4-byte word stores on
+ * non 4-byte-aligned addresses then we can use this optimization.
+ */
+#if defined(__i386__)
+#define DO_32BIT_STORES000
+#endif
+
+
+
+/*
+ * Convert texture image data into one a specific internal format.
+ * Input:
+ *   dstFormat - the destination internal format
+ *   dstWidth, dstHeight - the destination image size
+ *   dstImage - pointer to destination image buffer
+ *   dstRowStride - bytes to jump between image rows
+ *   srcWidth, srcHeight - size of texture image
+ *   srcFormat, srcType - format and datatype of source image
+ *   srcImage - pointer to user's texture image
+ *   packing - describes how user's texture image is packed.
+ * Return: pointer to resulting image data or NULL if error or out of memory
+ *   or NULL if we can't process the given image format/type/internalFormat
+ *   combination.
+ *
+ * Supported type conversions:
+ *   srcFormat           srcType                          dstFormat
+ *   GL_INTENSITY        GL_UNSIGNED_BYTE                 MESA_I8
+ *   GL_LUMINANCE        GL_UNSIGNED_BYTE                 MESA_L8
+ *   GL_ALPHA            GL_UNSIGNED_BYTE                 MESA_A8
+ *   GL_COLOR_INDEX      GL_UNSIGNED_BYTE                 MESA_C8
+ *   GL_LUMINANCE_ALPHA  GL_UNSIGNED_BYTE                 MESA_A8_L8
+ *   GL_RGB              GL_UNSIGNED_BYTE                 MESA_R5_G6_B5
+ *   GL_RGB              GL_UNSIGNED_SHORT_5_6_5          MESA_R5_G6_B5
+ *   GL_RGBA             GL_UNSIGNED_BYTE                 MESA_A4_R4_G4_B4
+ *   GL_BGRA             GL_UNSIGNED_SHORT_4_4_4_4_REV    MESA_A4_R4_G4_B4
+ *   GL_BGRA             GL_UNSIGHED_SHORT_1_5_5_5_REV    MESA_A1_R5_G5_B5
+ *   GL_BGRA             GL_UNSIGNED_INT_8_8_8_8_REV      MESA_A8_R8_G8_B8
+ *   more to be added for new drivers...
+ *
+ * Notes:
+ *   Some hardware only supports texture images of specific aspect ratios.
+ *   This code will do power-of-two image up-scaling if that's needed.
+ *
+ *
+ */
+GLboolean
+_mesa_convert_teximage(MesaIntTexFormat dstFormat,
+                       GLint dstWidth, GLint dstHeight, GLvoid *dstImage,
+                       GLint dstRowStride,
+                       GLint srcWidth, GLint srcHeight,
+                       GLenum srcFormat, GLenum srcType,
+                       const GLvoid *srcImage,
+                       const struct gl_pixelstore_attrib *packing)
+{
+   const GLint wScale = dstWidth / srcWidth;   /* must be power of two */
+   const GLint hScale = dstHeight / srcHeight; /* must be power of two */
+   ASSERT(dstWidth >= srcWidth);
+   ASSERT(dstHeight >= srcHeight);
+   ASSERT(dstImage);
+   ASSERT(srcImage);
+   ASSERT(packing);
+
+   switch (dstFormat) {
+      case MESA_I8:
+      case MESA_L8:
+      case MESA_A8:
+      case MESA_C8:
+         if (srcType != GL_UNSIGNED_BYTE ||
+             ((srcFormat != GL_INTENSITY) &&
+              (srcFormat != GL_LUMINANCE) &&
+              (srcFormat != GL_ALPHA) &&
+              (srcFormat != GL_COLOR_INDEX))) {
+            /* bad internal format / srcFormat combination */
+            return GL_FALSE;
+         }
+         else {
+            /* store as 8-bit texels */
+            if (wScale == 1 && hScale == 1) {
+               /* no scaling needed - fast case */
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+               GLubyte *dst = (GLubyte *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  MEMCPY(dst, src, dstWidth * sizeof(GLubyte));
+                  dst += dstRowStride;
+                  src += srcStride;
+               }
+            }
+            else {
+               /* must rescale image */
+               GLubyte *dst = (GLubyte *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst += dstRowStride;
+               }
+            }
+         }
+         break;
+
+      case MESA_A8_L8:
+         if (srcType != GL_UNSIGNED_BYTE || srcFormat != GL_LUMINANCE_ALPHA) {
+            return GL_FALSE;
+         }
+         else {
+            /* store as 16-bit texels */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row, col;
+               for (row = 0; row < dstHeight; row++) {
+                  for (col = 0; col < dstWidth; col++) {
+                     GLubyte luminance = src[col * 2 + 0];
+                     GLubyte alpha = src[col * 2 + 1];
+                     dst[col] = ((GLushort) alpha << 8) | luminance;
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+                  src += srcStride;
+               }
+            }
+            else {
+               /* must rescale */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row, col;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+                  for (col = 0; col < dstWidth; col++) {
+                     GLint srcCol = col / wScale;
+                     GLubyte luminance = src[srcCol * 2 + 0];
+                     GLubyte alpha = src[srcCol * 2 + 1];
+                     dst[col] = ((GLushort) alpha << 8) | luminance;
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+                  src += srcStride;
+               }
+            }
+         }
+         break;
+
+      case MESA_R5_G6_B5:
+         if (srcFormat == GL_RGB && srcType == GL_UNSIGNED_SHORT_5_6_5) {
+            /* special, optimized case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  MEMCPY(dst, src, dstWidth * sizeof(GLushort));
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLushort *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGB && srcType == GL_UNSIGNED_BYTE) {
+            /* general case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+#ifdef DO_32BIT_STORES
+               GLuint *dst = (GLuint *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint col, col3;
+                  GLint halfDstWidth = dstWidth >> 1;
+                  for (col = col3 = 0; col < halfDstWidth; col++, col3 += 6) {
+                     GLubyte r0 = src[col3 + 0];
+                     GLubyte g0 = src[col3 + 1];
+                     GLubyte b0 = src[col3 + 2];
+                     GLubyte r1 = src[col3 + 3];
+                     GLubyte g1 = src[col3 + 4];
+                     GLubyte b1 = src[col3 + 5];
+                     GLuint d0 = ((r0 & 0xf8) << 8)
+                               | ((g0 & 0xfc) << 3)
+                               | ((b0 & 0xf8) >> 3);
+                     GLuint d1 = ((r1 & 0xf8) << 8)
+                               | ((g1 & 0xfc) << 3)
+                               | ((b1 & 0xf8) >> 3);
+                     dst[col] = (d1 << 16) | d0;
+                  }
+                  src += srcStride;
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+#else /* 16-bit stores */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint col, col3;
+                  for (col = col3 = 0; col < dstWidth; col++, col3 += 3) {
+                     GLubyte r = src[col3 + 0];
+                     GLubyte g = src[col3 + 1];
+                     GLubyte b = src[col3 + 2];
+                     dst[col] = ((r & 0xf8) << 8)
+                              | ((g & 0xfc) << 3)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+#endif
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     GLint col3 = (col / wScale) * 3;
+                     GLubyte r = src[col3 + 0];
+                     GLubyte g = src[col3 + 1];
+                     GLubyte b = src[col3 + 2];
+                     dst[col] = ((r & 0xf8) << 8)
+                              | ((g & 0xfc) << 3)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) {
+            /* general case (used by Quake3) */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+#ifdef DO_32BIT_STORES
+               GLuint *dst = dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint col, col4;
+                  GLint halfDstWidth = dstWidth >> 1;
+                  for (col = col4 = 0; col < halfDstWidth; col++, col4 += 8) {
+                     GLubyte r0 = src[col4 + 0];
+                     GLubyte g0 = src[col4 + 1];
+                     GLubyte b0 = src[col4 + 2];
+                     GLubyte r1 = src[col4 + 4];
+                     GLubyte g1 = src[col4 + 5];
+                     GLubyte b1 = src[col4 + 6];
+                     GLuint d0 = ((r0 & 0xf8) << 8)
+                               | ((g0 & 0xfc) << 3)
+                               | ((b0 & 0xf8) >> 3);
+                     GLuint d1 = ((r1 & 0xf8) << 8)
+                               | ((g1 & 0xfc) << 3)
+                               | ((b1 & 0xf8) >> 3);
+                     dst[col] = (d1 << 16) | d0;
+                  }
+                  src += srcStride;
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+#else /* 16-bit stores */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint col, col4;
+                  for (col = col4 = 0; col < dstWidth; col++, col4 += 4) {
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     dst[col] = ((r & 0xf8) << 8)
+                              | ((g & 0xfc) << 3)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+#endif
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     GLint col4 = (col / wScale) * 4;
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     dst[col] = ((r & 0xf8) << 8)
+                              | ((g & 0xfc) << 3)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else {
+            /* can't handle this srcFormat/srcType combination */
+            return GL_FALSE;
+         }
+         break;
+
+      case MESA_A4_R4_G4_B4:
+         /* store as 16-bit texels (GR_TEXFMT_ARGB_4444) */
+         if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV){
+            /* special, optimized case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  MEMCPY(dst, src, dstWidth * sizeof(GLushort));
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLushort *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) {
+            /* general case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+#ifdef DO_32BIT_STORES
+               GLuint *dst = dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint col, col4;
+                  GLint halfDstWidth = dstWidth >> 1;
+                  for (col = col4 = 0; col < halfDstWidth; col++, col4 += 8) {
+                     GLubyte r0 = src[col4 + 0];
+                     GLubyte g0 = src[col4 + 1];
+                     GLubyte b0 = src[col4 + 2];
+                     GLubyte a0 = src[col4 + 3];
+                     GLubyte r1 = src[col4 + 4];
+                     GLubyte g1 = src[col4 + 5];
+                     GLubyte b1 = src[col4 + 6];
+                     GLubyte a1 = src[col4 + 7];
+                     GLuint d0 = ((a0 & 0xf0) << 8)
+                               | ((r0 & 0xf0) << 4)
+                               | ((g0 & 0xf0)     )
+                               | ((b0 & 0xf0) >> 4);
+                     GLuint d1 = ((a1 & 0xf0) << 8)
+                               | ((r1 & 0xf0) << 4)
+                               | ((g1 & 0xf0)     )
+                               | ((b1 & 0xf0) >> 4);
+                     dst[col] = (d1 << 16) | d0;
+                  }
+                  src += srcStride;
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+#else /* 16-bit stores */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint col, col4;
+                  for (col = col4 = 0; col < dstWidth; col++, col4 += 4) {
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = ((a & 0xf0) << 8)
+                              | ((r & 0xf0) << 4)
+                              | ((g & 0xf0)     )
+                              | ((b & 0xf0) >> 4);
+                  }
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+#endif
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     GLint col4 = (col / wScale) * 4;
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = ((a & 0xf0) << 8)
+                              | ((r & 0xf0) << 4)
+                              | ((g & 0xf0)     )
+                              | ((b & 0xf0) >> 4);
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else {
+            /* can't handle this format/srcType combination */
+            return GL_FALSE;
+         }
+         break;
+
+      case MESA_A1_R5_G5_B5:
+         /* store as 16-bit texels (GR_TEXFMT_ARGB_1555) */
+         if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV){
+            /* special, optimized case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  MEMCPY(dst, src, dstWidth * sizeof(GLushort));
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLushort *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) {
+            /* general case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint col, col4;
+                  for (col = col4 = 0; col < dstWidth; col++, col4 += 4) {
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = ((a & 0x80) << 8)
+                              | ((r & 0xf8) << 7)
+                              | ((g & 0xf8) << 2)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     GLint col4 = (col / wScale) * 4;
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = ((a & 0x80) << 8)
+                              | ((r & 0xf8) << 7)
+                              | ((g & 0xf8) << 2)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else {
+            /* can't handle this source format/type combination */
+            return GL_FALSE;
+         }
+         break;
+
+      case MESA_A8_R8_G8_B8:
+         /* 32-bit texels */
+         if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_INT_8_8_8_8_REV){
+            /* special, optimized case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+               GLuint *dst = dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  MEMCPY(dst, src, dstWidth * sizeof(GLuint));
+                  src += srcStride;
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLuint *dst = dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLuint *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) {
+            /* general case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 srcWidth, srcFormat, srcType);
+               GLuint *dst = dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint col, col4;
+                  for (col = col4 = 0; col < dstWidth; col++, col4 += 4) {
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = (a << 24) | (r << 16) | (g << 8) | b;
+                  }
+                  src += srcStride;
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLuint *dst = dstImage;
+               GLint row;
+               for (row = 0; row < dstHeight; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < dstWidth; col++) {
+                     GLint col4 = (col / wScale) * 4;
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = (a << 24) | (r << 16) | (g << 8) | b;
+                  }
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else {
+            /* can't handle this source format/type combination */
+            return GL_FALSE;
+         }
+         break;
+
+
+      default:
+         /* unexpected internal format! */
+         return GL_FALSE;
+   }
+   return GL_TRUE;
+}
+
+
+
+/*
+ * Replace a subregion of a texture image with new data.
+ * Input:
+ *   dstFormat - destination image format
+ *   dstXoffset, dstYoffset - destination for new subregion
+ *   dstWidth, dstHeight - total size of dest image
+ *   dstImage - pointer to dest image
+ *   dstRowStride - bytes to jump between image rows
+ *   width, height - size of region to copy/replace
+ *   srcWidth, srcHeight - size of the corresponding gl_texture_image
+ *   srcFormat, srcType - source image format and datatype
+ *   srcImage - source image
+ *   packing - source image packing information.
+ * Return:  GL_TRUE or GL_FALSE for success, failure
+ *
+ * Notes:
+ *   Like _mesa_convert_teximage(), we can do power-of-two image scaling
+ *   to accomodate hardware with texture image aspect ratio constraints.
+ *   dstWidth / srcWidth is used to compute the horizontal scaling factor and
+ *   dstHeight / srcHeight is used to compute the vertical scaling factor.
+ */
+GLboolean
+_mesa_convert_texsubimage(MesaIntTexFormat dstFormat,
+                          GLint dstXoffset, GLint dstYoffset,
+                          GLint dstWidth, GLint dstHeight, GLvoid *dstImage,
+                          GLint dstRowStride,
+                          GLint width, GLint height,
+                          GLint srcWidth, GLint srcHeight,
+                          GLenum srcFormat, GLenum srcType,
+                          const GLvoid *srcImage,
+                          const struct gl_pixelstore_attrib *packing)
+{
+   const GLint wScale = dstWidth / srcWidth;   /* must be power of two */
+   const GLint hScale = dstHeight / srcHeight; /* must be power of two */
+   ASSERT(dstWidth >= srcWidth);
+   ASSERT(dstHeight >= srcHeight);
+   ASSERT(dstImage);
+   ASSERT(srcImage);
+   ASSERT(packing);
+
+   width *= wScale;
+   height *= hScale;
+   dstXoffset *= wScale;
+   dstYoffset *= hScale;
+
+   /* XXX hscale != 1 and wscale != 1 not tested!!!! */
+   
+   switch (dstFormat) {
+      case MESA_I8:
+      case MESA_L8:
+      case MESA_A8:
+      case MESA_C8:
+         if (srcType != GL_UNSIGNED_BYTE ||
+             ((srcFormat != GL_INTENSITY) &&
+              (srcFormat != GL_LUMINANCE) &&
+              (srcFormat != GL_ALPHA) &&
+              (srcFormat != GL_COLOR_INDEX))) {
+            /* bad internal format / srcFormat combination */
+            return GL_FALSE;
+         }
+         else {
+            /* store as 8-bit texels */
+            if (wScale == 1 && hScale == 1) {
+               /* no scaling needed - fast case */
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                  width, srcFormat, srcType);
+               GLubyte *dst = (GLubyte *) dstImage
+                            + dstYoffset * dstRowStride + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  MEMCPY(dst, src, width * sizeof(GLubyte));
+                  dst += dstRowStride;
+                  src += srcStride;
+               }
+            }
+            else {
+               /* must rescale image */
+               GLubyte *dst = (GLubyte *) dstImage
+                            + dstYoffset * dstRowStride + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst += dstRowStride;
+               }
+            }
+         }
+         break;
+
+      case MESA_A8_L8:
+         if (srcType != GL_UNSIGNED_BYTE || srcFormat != GL_LUMINANCE_ALPHA) {
+            return GL_FALSE;
+         }
+         else {
+            /* store as 16-bit texels */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row, col;
+               for (row = 0; row < height; row++) {
+                  for (col = 0; col < width; col++) {
+                     GLubyte luminance = src[col * 2 + 0];
+                     GLubyte alpha = src[col * 2 + 1];
+                     dst[col] = ((GLushort) alpha << 8) | luminance;
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+                  src += srcStride;
+               }
+            }
+            else {
+               /* must rescale */
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row, col;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+                  for (col = 0; col < width; col++) {
+                     GLint srcCol = col / wScale;
+                     GLubyte luminance = src[srcCol * 2 + 0];
+                     GLubyte alpha = src[srcCol * 2 + 1];
+                     dst[col] = ((GLushort) alpha << 8) | luminance;
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+                  src += srcStride;
+               }
+            }
+         }
+         break;
+
+      case MESA_R5_G6_B5:
+         if (srcFormat == GL_RGB && srcType == GL_UNSIGNED_SHORT_5_6_5) {
+            /* special, optimized case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  MEMCPY(dst, src, width * sizeof(GLushort));
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLushort *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGB && srcType == GL_UNSIGNED_BYTE) {
+            /* general case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint col, col3;
+                  for (col = col3 = 0; col < width; col++, col3 += 3) {
+                     GLubyte r = src[col3 + 0];
+                     GLubyte g = src[col3 + 1];
+                     GLubyte b = src[col3 + 2];
+                     dst[col] = ((r & 0xf8) << 8)
+                              | ((g & 0xfc) << 3)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     GLint col3 = (col / wScale) * 3;
+                     GLubyte r = src[col3 + 0];
+                     GLubyte g = src[col3 + 1];
+                     GLubyte b = src[col3 + 2];
+                     dst[col] = ((r & 0xf8) << 8)
+                              | ((g & 0xfc) << 3)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) {
+            /* general case (used by Quake3) */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint col, col4;
+                  for (col = col4 = 0; col < width; col++, col4 += 4) {
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     dst[col] = ((r & 0xf8) << 8)
+                              | ((g & 0xfc) << 3)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     GLint col4 = (col / wScale) * 4;
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     dst[col] = ((r & 0xf8) << 8)
+                              | ((g & 0xfc) << 3)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else {
+            /* can't handle this srcFormat/srcType combination */
+            return GL_FALSE;
+         }
+         break;
+
+      case MESA_A4_R4_G4_B4:
+         /* store as 16-bit texels (GR_TEXFMT_ARGB_4444) */
+         if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV){
+            /* special, optimized case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  MEMCPY(dst, src, width * sizeof(GLushort));
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLushort *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) {
+            /* general case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint col, col4;
+                  for (col = col4 = 0; col < width; col++, col4 += 4) {
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = ((a & 0xf0) << 8)
+                              | ((r & 0xf0) << 4)
+                              | ((g & 0xf0)     )
+                              | ((b & 0xf0) >> 4);
+                  }
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     GLint col4 = (col / wScale) * 4;
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = ((a & 0xf0) << 8)
+                              | ((r & 0xf0) << 4)
+                              | ((g & 0xf0)     )
+                              | ((b & 0xf0) >> 4);
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else {
+            /* can't handle this format/srcType combination */
+            return GL_FALSE;
+         }
+         break;
+
+      case MESA_A1_R5_G5_B5:
+         /* store as 16-bit texels (GR_TEXFMT_ARGB_1555) */
+         if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV){
+            /* special, optimized case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  MEMCPY(dst, src, width * sizeof(GLushort));
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLushort *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) {
+            /* general case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint col, col4;
+                  for (col = col4 = 0; col < width; col++, col4 += 4) {
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = ((a & 0x80) << 8)
+                              | ((r & 0xf8) << 7)
+                              | ((g & 0xf8) << 2)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  src += srcStride;
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLushort *dst = (GLushort *) ((GLubyte *) dstImage
+                             + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     GLint col4 = (col / wScale) * 4;
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = ((a & 0x80) << 8)
+                              | ((r & 0xf8) << 7)
+                              | ((g & 0xf8) << 2)
+                              | ((b & 0xf8) >> 3);
+                  }
+                  dst = (GLushort *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else {
+            /* can't handle this source format/type combination */
+            return GL_FALSE;
+         }
+         break;
+
+      case MESA_A8_R8_G8_B8:
+         /* 32-bit texels */
+         if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_INT_8_8_8_8_REV){
+            /* special, optimized case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLuint *dst = (GLuint *) ((GLubyte *) dstImage
+                           + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  MEMCPY(dst, src, width * sizeof(GLuint));
+                  src += srcStride;
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLuint *dst = (GLuint *) ((GLubyte *) dstImage
+                           + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLuint *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     dst[col] = src[col / wScale];
+                  }
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else if (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) {
+            /* general case */
+            if (wScale == 1 && hScale == 1) {
+               const GLubyte *src = _mesa_image_address(packing, srcImage,
+                             srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
+               const GLint srcStride = _mesa_image_row_stride(packing,
+                                                 width, srcFormat, srcType);
+               GLuint *dst = (GLuint *) ((GLubyte *) dstImage
+                           + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint col, col4;
+                  for (col = col4 = 0; col < width; col++, col4 += 4) {
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = (a << 24) | (r << 16) | (g << 8) | b;
+                  }
+                  src += srcStride;
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+            else {
+               /* must rescale image */
+               GLuint *dst = (GLuint *) ((GLubyte *) dstImage
+                           + dstYoffset * dstRowStride) + dstXoffset;
+               GLint row;
+               for (row = 0; row < height; row++) {
+                  GLint srcRow = row / hScale;
+                  const GLubyte *src = _mesa_image_address(packing, srcImage,
+                        srcWidth, srcHeight, srcFormat, srcType, 0, srcRow, 0);
+                  GLint col;
+                  for (col = 0; col < width; col++) {
+                     GLint col4 = (col / wScale) * 4;
+                     GLubyte r = src[col4 + 0];
+                     GLubyte g = src[col4 + 1];
+                     GLubyte b = src[col4 + 2];
+                     GLubyte a = src[col4 + 3];
+                     dst[col] = (a << 24) | (r << 16) | (g << 8) | b;
+                  }
+                  dst = (GLuint *) ((GLubyte *) dst + dstRowStride);
+               }
+            }
+         }
+         else {
+            /* can't handle this source format/type combination */
+            return GL_FALSE;
+         }
+         break;
+
+
+      default:
+         /* unexpected internal format! */
+         return GL_FALSE;
+   }
+   return GL_TRUE;
+}
+
+
+
+
+/*
+ * Used to convert 16-bit texels into GLubyte color components.
+ */
+static GLubyte R5G6B5toRed[0xffff];
+static GLubyte R5G6B5toGreen[0xffff];
+static GLubyte R5G6B5toBlue[0xffff];
+
+static GLubyte A4R4G4B4toRed[0xffff];
+static GLubyte A4R4G4B4toGreen[0xffff];
+static GLubyte A4R4G4B4toBlue[0xffff];
+static GLubyte A4R4G4B4toAlpha[0xffff];
+
+static GLubyte A1R5G5B5toRed[0xffff];
+static GLubyte A1R5G5B5toGreen[0xffff];
+static GLubyte A1R5G5B5toBlue[0xffff];
+static GLubyte A1R5G5B5toAlpha[0xffff];
+
+static void
+generate_lookup_tables(void)
+{
+   GLint i;
+   for (i = 0; i <= 0xffff; i++) {
+      GLint r = (i >> 8) & 0xf8;
+      GLint g = (i >> 3) & 0xfc;
+      GLint b = (i << 3) & 0xf8;
+      r = r * 255 / 0xf8;
+      g = g * 255 / 0xfc;
+      b = b * 255 / 0xf8;
+      R5G6B5toRed[i]   = r;
+      R5G6B5toGreen[i] = g;
+      R5G6B5toBlue[i]  = b;
+   }
+
+   for (i = 0; i <= 0xffff; i++) {
+      GLint r = (i >>  8) & 0xf;
+      GLint g = (i >>  4) & 0xf;
+      GLint b = (i      ) & 0xf;
+      GLint a = (i >> 12) & 0xf;
+      r = r * 255 / 0xf;
+      g = g * 255 / 0xf;
+      b = b * 255 / 0xf;
+      a = a * 255 / 0xf;
+      A4R4G4B4toRed[i]   = r;
+      A4R4G4B4toGreen[i] = g;
+      A4R4G4B4toBlue[i]  = b;
+      A4R4G4B4toAlpha[i] = a;
+   }
+
+   for (i = 0; i <= 0xffff; i++) {
+      GLint r = (i >> 10) & 0xf8;
+      GLint g = (i >>  5) & 0xf8;
+      GLint b = (i      ) & 0xf8;
+      GLint a = (i >> 15) & 0x1;
+      r = r * 255 / 0xf8;
+      g = g * 255 / 0xf8;
+      b = b * 255 / 0xf8;
+      a = a * 255;
+      A1R5G5B5toRed[i]   = r;
+      A1R5G5B5toGreen[i] = g;
+      A1R5G5B5toBlue[i]  = b;
+      A1R5G5B5toAlpha[i] = a;
+   }
+}
+
+
+
+/*
+ * Convert a texture image from an internal format to one of Mesa's
+ * core internal formats.  This is likely to be used by glGetTexImage
+ * and for fetching texture images when falling back to software rendering.
+ *
+ * Input:
+ *   srcFormat - source image format
+ *   srcWidth, srcHeight - source image size
+ *   srcImage - source image pointer
+ *   srcRowStride - bytes to jump between image rows
+ *   dstWidth, dstHeight - size of dest image
+ *   dstFormat - format of dest image (must be one of Mesa's IntFormat values)
+ *   dstImage - pointer to dest image
+ * Notes:
+ *   This function will do power of two image down-scaling to accomodate
+ *   drivers with limited texture image aspect ratios.
+ *   The implicit dest data type is GL_UNSIGNED_BYTE.
+ */
+void
+_mesa_unconvert_teximage(MesaIntTexFormat srcFormat,
+                         GLint srcWidth, GLint srcHeight,
+                         const GLvoid *srcImage, GLint srcRowStride,
+                         GLint dstWidth, GLint dstHeight,
+                         GLenum dstFormat, GLubyte *dstImage)
+{
+   static GLboolean firstCall = GL_TRUE;
+   const GLint wScale = srcWidth / dstWidth;   /* must be power of two */
+   const GLint hScale = srcHeight / dstHeight; /* must be power of two */
+   ASSERT(srcWidth >= dstWidth);
+   ASSERT(srcHeight >= dstHeight);
+   ASSERT(dstImage);
+   ASSERT(srcImage);
+
+   if (firstCall) {
+      generate_lookup_tables();
+      firstCall = GL_FALSE;
+   }
+
+   switch (srcFormat) {
+      case MESA_I8:
+      case MESA_L8:
+      case MESA_A8:
+      case MESA_C8:
+#ifdef DEBUG
+         if (srcFormat == MESA_I8) {
+            ASSERT(dstFormat == GL_INTENSITY);
+         }
+         else if (srcFormat == MESA_L8) {
+            ASSERT(dstFormat == GL_LUMINANCE);
+         }
+         else if (srcFormat == MESA_A8) {
+            ASSERT(dstFormat == GL_ALPHA);
+         }
+         else if (srcFormat == MESA_C8) {
+            ASSERT(dstFormat == GL_COLOR_INDEX);
+         }
+#endif
+         if (wScale == 1 && hScale == 1) {
+            /* easy! */
+            MEMCPY(dstImage, srcImage, dstWidth * dstHeight * sizeof(GLubyte));
+         }
+         else {
+            /* rescale */
+            const GLubyte *src8 = (const GLubyte *) srcImage;
+            GLint row, col;
+            for (row = 0; row < dstHeight; row++) {
+               GLint srcRow = row * hScale;
+               for (col = 0; col < dstWidth; col++) {
+                  GLint srcCol = col * wScale;
+                  *dstImage++ = src8[srcRow * srcWidth + srcCol];
+               }
+            }
+         }
+         break;
+      case MESA_A8_L8:
+         ASSERT(dstFormat == GL_LUMINANCE_ALPHA);
+         if (wScale == 1 && hScale == 1) {
+            GLint i, n = dstWidth * dstHeight;
+            const GLushort *texel = (const GLushort *) srcImage;
+            for (i = 0; i < n; i++) {
+               const GLushort tex = *texel++;
+               *dstImage++ = (tex & 0xff); /* luminance */
+               *dstImage++ = (tex >> 8);   /* alpha */
+            }
+         }
+         else {
+            /* rescale */
+            const GLushort *src16 = (const GLushort *) srcImage;
+            GLint row, col;
+            for (row = 0; row < dstHeight; row++) {
+               GLint srcRow = row * hScale;
+               for (col = 0; col < dstWidth; col++) {
+                  GLint srcCol = col * wScale;
+                  const GLushort tex = src16[srcRow * srcWidth + srcCol];
+                  *dstImage++ = (tex & 0xff); /* luminance */
+                  *dstImage++ = (tex >> 8);   /* alpha */
+               }
+            }
+         }
+         break;
+      case MESA_R5_G6_B5:
+         ASSERT(dstFormat == GL_RGB);
+         if (wScale == 1 && hScale == 1) {
+            GLint i, n = dstWidth * dstHeight;
+            const GLushort *texel = (const GLushort *) srcImage;
+            for (i = 0; i < n; i++) {
+               const GLushort tex = *texel++;
+               *dstImage++ = R5G6B5toRed[tex];
+               *dstImage++ = R5G6B5toGreen[tex];
+               *dstImage++ = R5G6B5toBlue[tex];
+            }
+         }
+         else {
+            /* rescale */
+            const GLushort *src16 = (const GLushort *) srcImage;
+            GLint row, col;
+            for (row = 0; row < dstHeight; row++) {
+               GLint srcRow = row * hScale;
+               for (col = 0; col < dstWidth; col++) {
+                  GLint srcCol = col * wScale;
+                  const GLushort tex = src16[srcRow * srcWidth + srcCol];
+                  *dstImage++ = R5G6B5toRed[tex];
+                  *dstImage++ = R5G6B5toGreen[tex];
+                  *dstImage++ = R5G6B5toBlue[tex];
+               }
+            }
+         }
+         break;
+      case MESA_A4_R4_G4_B4:
+         ASSERT(dstFormat == GL_RGBA);
+         if (wScale == 1 && hScale == 1) {
+            GLint i, n = dstWidth * dstHeight;
+            const GLushort *texel = (const GLushort *) srcImage;
+            for (i = 0; i < n; i++) {
+               const GLushort tex = *texel++;
+               *dstImage++ = A4R4G4B4toRed[tex];
+               *dstImage++ = A4R4G4B4toGreen[tex];
+               *dstImage++ = A4R4G4B4toBlue[tex];
+               *dstImage++ = A4R4G4B4toAlpha[tex];
+            }
+         }
+         else {
+            /* rescale */
+            const GLushort *src16 = (const GLushort *) srcImage;
+            GLint row, col;
+            for (row = 0; row < dstHeight; row++) {
+               GLint srcRow = row * hScale;
+               for (col = 0; col < dstWidth; col++) {
+                  GLint srcCol = col * wScale;
+                  const GLushort tex = src16[srcRow * srcWidth + srcCol];
+                  *dstImage++ = A4R4G4B4toRed[tex];
+                  *dstImage++ = A4R4G4B4toGreen[tex];
+                  *dstImage++ = A4R4G4B4toBlue[tex];
+                  *dstImage++ = A4R4G4B4toAlpha[tex];
+               }
+            }
+         }
+         break;
+      case MESA_A1_R5_G5_B5:
+         ASSERT(dstFormat == GL_RGBA);
+         if (wScale == 1 && hScale == 1) {
+            GLint i, n = dstWidth * dstHeight;
+            const GLushort *texel = (const GLushort *) srcImage;
+            for (i = 0; i < n; i++) {
+               const GLushort tex = *texel++;
+               *dstImage++ = A1R5G5B5toRed[tex];
+               *dstImage++ = A1R5G5B5toGreen[tex];
+               *dstImage++ = A1R5G5B5toBlue[tex];
+               *dstImage++ = A1R5G5B5toAlpha[tex];
+            }
+         }
+         else {
+            /* rescale */
+            const GLushort *src16 = (const GLushort *) srcImage;
+            GLint row, col;
+            for (row = 0; row < dstHeight; row++) {
+               GLint srcRow = row * hScale;
+               for (col = 0; col < dstWidth; col++) {
+                  GLint srcCol = col * wScale;
+                  const GLushort tex = src16[srcRow * srcWidth + srcCol];
+                  *dstImage++ = A1R5G5B5toRed[tex];
+                  *dstImage++ = A1R5G5B5toGreen[tex];
+                  *dstImage++ = A1R5G5B5toBlue[tex];
+                  *dstImage++ = A1R5G5B5toAlpha[tex];
+               }
+            }
+         }
+         break;
+      case MESA_A8_R8_G8_B8:
+         ASSERT(dstFormat == GL_RGBA);
+         if (wScale == 1 && hScale == 1) {
+            GLint i, n = dstWidth * dstHeight;
+            const GLuint *texel = (const GLuint *) srcImage;
+            for (i = 0; i < n; i++) {
+               const GLuint tex = *texel++;
+               *dstImage++ = (tex >> 16) & 0xff; /* R */
+               *dstImage++ = (tex >>  8) & 0xff; /* G */
+               *dstImage++ = (tex      ) & 0xff; /* B */
+               *dstImage++ = (tex >> 24) & 0xff; /* A */
+            }
+         }
+         else {
+            /* rescale */
+            const GLuint *src = (const GLuint *) srcImage;
+            GLint row, col;
+            for (row = 0; row < dstHeight; row++) {
+               GLint srcRow = row * hScale;
+               for (col = 0; col < dstWidth; col++) {
+                  GLint srcCol = col * wScale;
+                  const GLuint tex = src[srcRow * srcWidth + srcCol];
+                  *dstImage++ = (tex >> 16) & 0xff; /* R */
+                  *dstImage++ = (tex >>  8) & 0xff; /* G */
+                  *dstImage++ = (tex      ) & 0xff; /* B */
+                  *dstImage++ = (tex >> 24) & 0xff; /* A */
+               }
+            }
+         }
+         break;
+      default:
+         gl_problem(NULL, "bad srcFormat in _mesa_uncovert_teximage()");
+   }
+}
+
+
+
+/*
+ * Given an internal Mesa driver texture format, fill in the component
+ * bit sizes in the given texture image struct.
+ */
+void
+_mesa_set_teximage_component_sizes(MesaIntTexFormat mesaFormat,
+                                   struct gl_texture_image *texImage)
+{
+   static const GLint bitSizes [][8] = {
+      /* format            R  G  B  A  I  L  C */
+      { MESA_I8,           0, 0, 0, 0, 8, 0, 0 },
+      { MESA_L8,           0, 0, 0, 0, 0, 8, 0 },
+      { MESA_A8,           0, 0, 0, 8, 0, 0, 0 },
+      { MESA_C8,           0, 0, 0, 0, 0, 0, 8 },
+      { MESA_A8_L8,        0, 0, 0, 8, 0, 8, 0 },
+      { MESA_R5_G6_B5,     5, 6, 5, 0, 0, 0, 0 },
+      { MESA_A4_R4_G4_B4,  4, 4, 4, 4, 0, 0, 0 },
+      { MESA_A1_R5_G5_B5,  5, 5, 5, 1, 0, 0, 0 },
+      { MESA_A8_R8_G8_B8,  8, 8, 8, 8, 0, 0, 0 },
+      { -1,                0, 0, 0, 0, 0, 0, 0 }
+   };
+   GLint i;
+   for (i = 0; i < bitSizes[i][0] >= 0; i++) {
+      if (bitSizes[i][0] == mesaFormat) {
+         texImage->RedBits       = bitSizes[i][1];
+         texImage->GreenBits     = bitSizes[i][2];
+         texImage->BlueBits      = bitSizes[i][3];
+         texImage->AlphaBits     = bitSizes[i][4];
+         texImage->IntensityBits = bitSizes[i][5];
+         texImage->LuminanceBits = bitSizes[i][6];
+         texImage->IndexBits     = bitSizes[i][7];
+         return;
+      }
+   }
+   gl_problem(NULL, "bad format in _mesa_set_teximage_component_sizes");
+}
Index: xc/extras/Mesa/src/texutil.h
diff -u /dev/null xc/extras/Mesa/src/texutil.h:1.1
--- /dev/null	Sat Jul  1 20:46:13 2000
+++ xc/extras/Mesa/src/texutil.h	Fri Jun 16 17:02:18 2000
@@ -0,0 +1,88 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXUTIL_H
+#define TEXUTIL_H
+
+
+#include "types.h"
+
+
+
+                           /* msb <------ TEXEL BITS -----------> lsb */
+typedef enum {             /* ---- ---- ---- ---- ---- ---- ---- ---- */
+   MESA_I8,                /*                               IIII IIII */
+   MESA_L8,                /*                               LLLL LLLL */
+   MESA_A8,                /*                               AAAA AAAA */
+   MESA_C8,                /*                               CCCC CCCC */
+   MESA_A8_L8,             /*                     AAAA AAAA LLLL LLLL */
+   MESA_R5_G6_B5,          /*                     RRRR RGGG GGGB BBBB */
+   MESA_A4_R4_G4_B4,       /*                     AAAA RRRR GGGG BBBB */
+   MESA_A1_R5_G5_B5,       /*                     ARRR RRGG GGGB BBBB */
+   MESA_A8_R8_G8_B8        /* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
+} MesaIntTexFormat;
+
+
+
+
+extern GLboolean
+_mesa_convert_teximage(MesaIntTexFormat dstFormat,
+                       GLint dstWidth, GLint dstHeight, GLvoid *dstImage,
+                       GLint dstRowStride,
+                       GLint srcWidth, GLint srcHeight,
+                       GLenum srcFormat, GLenum srcType,
+                       const GLvoid *srcImage,
+                       const struct gl_pixelstore_attrib *packing);
+
+
+
+extern GLboolean
+_mesa_convert_texsubimage(MesaIntTexFormat dstFormat,
+                          GLint dstXoffset, GLint dstYoffset,
+                          GLint dstWidth, GLint dstHeight, GLvoid *dstImage,
+                          GLint dstRowStride,
+                          GLint width, GLint height,
+                          GLint srcWidth, GLint srcHeight,
+                          GLenum srcFormat, GLenum srcType,
+                          const GLvoid *srcImage,
+                          const struct gl_pixelstore_attrib *packing);
+
+
+extern void
+_mesa_unconvert_teximage(MesaIntTexFormat srcFormat,
+                         GLint srcWidth, GLint srcHeight,
+                         const GLvoid *srcImage, GLint srcRowStride,
+                         GLint dstWidth, GLint dstHeight,
+                         GLenum dstFormat, GLubyte *dstImage);
+
+
+extern void
+_mesa_set_teximage_component_sizes(MesaIntTexFormat mesaFormat,
+                                   struct gl_texture_image *texImage);
+
+
+#endif
+
Index: xc/extras/Mesa/src/triangle.c
diff -u xc/extras/Mesa/src/triangle.c:1.4 xc/extras/Mesa/src/triangle.c:1.5
--- xc/extras/Mesa/src/triangle.c:1.4	Thu Mar  2 08:07:15 2000
+++ xc/extras/Mesa/src/triangle.c	Fri Jun 16 17:02:18 2000
@@ -35,6 +35,7 @@
 #include "all.h"
 #else
 #include "glheader.h"
+#include "aatriangle.h"
 #include "context.h"
 #include "depth.h"
 #include "feedback.h"
@@ -77,7 +78,6 @@
                               GLuint v0, GLuint v1, GLuint v2, GLuint pv )
 {
 #define INTERP_Z 1
-
 #define SETUP_CODE				\
    GLuint index = VB->IndexPtr->data[pv];	\
    if (1) {					\
@@ -143,6 +143,7 @@
                                 GLuint v0, GLuint v1, GLuint v2, GLuint pv )
 {
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 
 #define SETUP_CODE				\
    if (1) {					\
@@ -185,6 +186,7 @@
 {
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INTERP_ALPHA 1
 
@@ -276,6 +278,7 @@
                                         GLuint v2, GLuint pv )
 {
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_INT_ST 1
 #define S_SCALE twidth
 #define T_SCALE theight
@@ -335,6 +338,7 @@
 				      GLuint v2, GLuint pv )
 {
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INTERP_ALPHA 1
 #define INTERP_INT_ST 1
@@ -611,16 +615,19 @@
  * Render an perspective corrected RGB/RGBA textured triangle.
  * The Q (aka V in Mesa) coordinate must be zero such that the divide
  * by interpolated Q/W comes out right.
- *
- * XXX (May 15, 1999) this function not used for now because repeating
- * of negative texture coords not handled correctly!!!
  */
-#if 000
 static void persp_textured_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
 				     GLuint v2, GLuint pv )
 {
+/* The BIAS value is used to shift negative values into positive values.
+ * Without this, negative texture values don't GL_REPEAT correctly at just
+ * below zero.  We're not going to worry about texture coords less than -BIAS.
+ * Only seems to be a problem with GL_NEAREST filtering.
+ */
+#define BIAS 4096.0F
 
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INTERP_ALPHA 1
 #define INTERP_STUV 1
@@ -681,8 +688,8 @@
 #define SPAN1(DO_TEX,COMP)                                 \
         for (i=0;i<n;i++) {                                \
            GLfloat invQ = 1.0f / vv;                       \
-           GLint s = (int)(SS * invQ) & smask;             \
-           GLint t = (int)(TT * invQ) & tmask;             \
+           GLint s = (int)(SS * invQ + BIAS) & smask;      \
+           GLint t = (int)(TT * invQ + BIAS) & tmask;      \
            GLint pos = COMP * ((t << twidth_log2) + s);    \
            GLubyte *tex00 = texture + pos;                 \
 	   zspan[i] = FixedToDepth(ffz);                   \
@@ -837,8 +844,8 @@
 #include "tritemp.h"
 #undef SPAN1
 #undef SPAN2
+#undef BIAS
 }
-#endif
 
 
 
@@ -852,6 +859,7 @@
                                        GLuint v2, GLuint pv )
 {
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INTERP_ALPHA 1
 #define INTERP_STUV 1
@@ -936,6 +944,7 @@
                                              GLubyte spec[MAX_WIDTH][4] )
 {
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INTERP_SPEC 1
 #define INTERP_ALPHA 1
@@ -1021,7 +1030,7 @@
 /*
  * Compute the lambda value for a fragment. (texture level of detail)
  */
-static GLfloat
+static INLINE GLfloat
 compute_lambda( GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
                 GLfloat invQ, GLfloat width, GLfloat height ) 
 {
@@ -1051,6 +1060,7 @@
                                        GLfloat u[MAX_WIDTH] )
 {
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INTERP_ALPHA 1
 #define INTERP_STUV 1
@@ -1146,6 +1156,7 @@
                                             GLfloat u[MAX_WIDTH] )
 {
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INTERP_SPEC 1
 #define INTERP_ALPHA 1
@@ -1255,6 +1266,7 @@
 {
    GLubyte rgba[MAX_WIDTH][4];
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INTERP_ALPHA 1
 #define INTERP_STUV 1
@@ -1416,6 +1428,35 @@
 }
 
 
+
+static void occlusion_zless_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                      GLuint v2, GLuint pv )
+{
+   (void)pv;
+   if (ctx->OcclusionResult) {
+      return;
+   }
+
+#define DO_OCCLUSION_TEST
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INNER_LOOP( LEFT, RIGHT, Y )		\
+   {						\
+      GLint i, len = RIGHT-LEFT;		\
+      for (i=0;i<len;i++) {			\
+	 GLdepth z = FixedToDepth(ffz);		\
+	 if (z < zRow[i]) {			\
+	    ctx->OcclusionResult = GL_TRUE;	\
+	    return;				\
+	 }					\
+	 ffz += fdzdx;				\
+      }						\
+   }
+#include "tritemp.h"
+}
+
+
+
 /*
  * Null rasterizer for measuring transformation speed.
  */
@@ -1453,12 +1494,36 @@
       }
       if (ctx->Driver.TriangleFunc) {
          /* Device driver will draw triangles. */
+         dputs("Driver triangle");
 	 return;
       }
 
+      if (ctx->Polygon.SmoothFlag) {
+         _mesa_set_aa_triangle_function(ctx);
+         ASSERT(ctx->Driver.TriangleFunc);
+         return;
+      }
+
+      if (ctx->Depth.OcclusionTest &&
+          ctx->Depth.Mask == GL_FALSE &&
+          ctx->Depth.Func == GL_LESS &&
+          !ctx->Stencil.Enabled) {
+         if ((ctx->Visual->RGBAflag &&
+              ctx->Color.ColorMask[0] == 0 && 
+              ctx->Color.ColorMask[1] == 0 && 
+              ctx->Color.ColorMask[2] == 0 &&
+              ctx->Color.ColorMask[3] == 0)
+             ||
+             (!ctx->Visual->RGBAflag && ctx->Color.IndexMask == 0)) {
+            dputs("occlusion_test_triangle");
+            ctx->Driver.TriangleFunc = occlusion_zless_triangle;
+            return;
+         }
+      }
+
       if (ctx->Texture.ReallyEnabled) {
          /* Ugh, we do a _lot_ of tests to pick the best textured tri func */
-	 int format, filter;
+	 GLint format, filter;
 	 const struct gl_texture_object *current2Dtex = ctx->Texture.Unit[0].CurrentD[2];
          const struct gl_texture_image *image;
          /* First see if we can used an optimized 2-D texture function */
@@ -1504,8 +1569,7 @@
 	       }
 	    }
 	    else {
-	       /*ctx->Driver.TriangleFunc = persp_textured_triangle;*/
-               ctx->Driver.TriangleFunc = general_textured_triangle;
+	       ctx->Driver.TriangleFunc = persp_textured_triangle;
 	       dputs("persp_textured_triangle");
 	    }
 	 }
@@ -1553,17 +1617,25 @@
       else {
 	 if (ctx->Light.ShadeModel==GL_SMOOTH) {
 	    /* smooth shaded, no texturing, stippled or some raster ops */
-            if (rgbmode)
+            if (rgbmode) {
+               dputs("smooth_rgba_triangle");
                ctx->Driver.TriangleFunc = smooth_rgba_triangle;
-            else
+            }
+            else {
+               dputs("smooth_ci_triangle");
                ctx->Driver.TriangleFunc = smooth_ci_triangle;
+            }
 	 }
 	 else {
 	    /* flat shaded, no texturing, stippled or some raster ops */
-            if (rgbmode)
+            if (rgbmode) {
+               dputs("flat_rgba_triangle");
                ctx->Driver.TriangleFunc = flat_rgba_triangle;
-            else
+            }
+            else {
+               dputs("flat_ci_triangle");
                ctx->Driver.TriangleFunc = flat_ci_triangle;
+            }
 	 }
       }
    }
Index: xc/extras/Mesa/src/tritemp.h
diff -u xc/extras/Mesa/src/tritemp.h:1.7 xc/extras/Mesa/src/tritemp.h:1.8
--- xc/extras/Mesa/src/tritemp.h:1.7	Fri Feb 18 04:18:46 2000
+++ xc/extras/Mesa/src/tritemp.h	Fri Jun 16 17:02:18 2000
@@ -22,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/tritemp.h,v 1.7 2000/02/18 12:18:46 tsi Exp $ */
+/* $XFree86: xc/extras/Mesa/src/tritemp.h,v 1.8 2000/06/17 00:02:18 martin Exp $ */
 
 /*
  * Triangle Rasterizer Template
@@ -50,6 +50,10 @@
  *    PIXEL_ADDRESS(X,Y)  - returns the address of pixel at (X,Y) where
  *                          Y==0 at bottom of screen and increases upward.
  *
+ * Similarly, for direct depth buffer access, this type is used for depth
+ * buffer addressing:
+ *    DEPTH_TYPE          - either GLushort or GLuint
+ *
  * Optionally, one may provide one-time setup code per triangle:
  *    SETUP_CODE    - code which is to be executed once per triangle
  * 
@@ -82,6 +86,12 @@
 	GLfixed fx0;	/* fixed pt X of lower endpoint */
    } EdgeT;
 
+#ifdef INTERP_Z
+   const GLint depthBits = ctx->Visual->DepthBits;
+   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
+   const GLfloat maxDepth = ctx->Visual->DepthMaxF;
+#define FixedToDepth(F)  ((F) >> fixedToDepthShift)
+#endif
    const struct vertex_buffer *VB = ctx->VB;
    EdgeT eMaj, eTop, eBot;
    GLfloat oneOverArea;
@@ -142,6 +152,10 @@
       oneOverArea = 1.0F / area;
    }
 
+#ifndef DO_OCCLUSION_TEST
+   ctx->OcclusionResult = GL_TRUE;
+#endif
+
    /* Edge setup.  For a triangle strip these could be reused... */
    {
       /* fixed point Y coordinates */
@@ -273,7 +287,7 @@
          eMaj_dz = VB->Win.data[vMax][2] - VB->Win.data[vMin][2];
          eBot_dz = VB->Win.data[vMid][2] - VB->Win.data[vMin][2];
          dzdx = oneOverArea * (eMaj_dz * eBot.dy - eMaj.dy * eBot_dz);
-         if (dzdx>DEPTH_SCALE || dzdx<-DEPTH_SCALE) {
+         if (dzdx > maxDepth || dzdx < -maxDepth) {
             /* probably a sliver triangle */
             dzdx = 0.0;
             dzdy = 0.0;
@@ -281,11 +295,10 @@
          else {
             dzdy = oneOverArea * (eMaj.dx * eBot_dz - eMaj_dz * eBot.dx);
          }
-#if DEPTH_BITS==16
-         fdzdx = SignedFloatToFixed(dzdx);
-#else
-         fdzdx = (GLint) dzdx;
-#endif
+         if (depthBits <= 16)
+            fdzdx = SignedFloatToFixed(dzdx);
+         else
+            fdzdx = (GLint) dzdx;
       }
 #endif
 #ifdef INTERP_RGB
@@ -555,8 +568,10 @@
          int dPRowOuter, dPRowInner;  /* offset in bytes */
 #endif
 #ifdef INTERP_Z
-         GLdepth *zRow;
+#  ifdef DEPTH_TYPE
+         DEPTH_TYPE *zRow;
          int dZRowOuter, dZRowInner;  /* offset in bytes */
+#  endif
          GLfixed fz, fdzOuter, fdzInner;
 #endif
 #ifdef INTERP_RGB
@@ -676,24 +691,25 @@
 
 #ifdef INTERP_Z
                {
-                  GLfloat z0, tmp;
-                  z0 = VB->Win.data[vLower][2] + ctx->PolygonZoffset;
-#if DEPTH_BITS==16
-                  /* interpolate fixed-pt values */
-                  tmp = (z0 * FIXED_SCALE + dzdx * adjx + dzdy * adjy) + FIXED_HALF;
-                  if (tmp < MAX_GLUINT/2)
-                     fz = (GLfixed) tmp;
-                  else
-                     fz = MAX_GLUINT/2;
-                  fdzOuter = SignedFloatToFixed(dzdy + dxOuter * dzdx);
-#else
-                  (void) tmp;
-                  /* interpolate depth values exactly */
-                  fz = (GLint) (z0 + dzdx*FixedToFloat(adjx) + dzdy*FixedToFloat(adjy));
-                  fdzOuter = (GLint) (dzdy + dxOuter * dzdx);
-#endif
-                  zRow = Z_ADDRESS( ctx, FixedToInt(fxLeftEdge), iy );
-                  dZRowOuter = (ctx->DrawBuffer->Width + idxOuter) * sizeof(GLdepth);
+                  GLfloat z0 = VB->Win.data[vLower][2] + ctx->PolygonZoffset;
+                  if (depthBits <= 16) {
+                     /* interpolate fixed-pt values */
+                     GLfloat tmp = (z0 * FIXED_SCALE + dzdx * adjx + dzdy * adjy) + FIXED_HALF;
+                     if (tmp < MAX_GLUINT / 2)
+                        fz = (GLfixed) tmp;
+                     else
+                        fz = MAX_GLUINT / 2;
+                     fdzOuter = SignedFloatToFixed(dzdy + dxOuter * dzdx);
+                  }
+                  else {
+                     /* interpolate depth values exactly */
+                     fz = (GLint) (z0 + dzdx*FixedToFloat(adjx) + dzdy*FixedToFloat(adjy));
+                     fdzOuter = (GLint) (dzdy + dxOuter * dzdx);
+                  }
+#  ifdef DEPTH_TYPE
+                  zRow = (DEPTH_TYPE *) _mesa_zbuffer_address(ctx, FixedToInt(fxLeftEdge), iy);
+                  dZRowOuter = (ctx->DrawBuffer->Width + idxOuter) * sizeof(DEPTH_TYPE);
+#  endif
                }
 #endif
 #ifdef INTERP_RGB
@@ -838,7 +854,9 @@
             dPRowInner = dPRowOuter + sizeof(PIXEL_TYPE);
 #endif
 #ifdef INTERP_Z
-            dZRowInner = dZRowOuter + sizeof(GLdepth);
+#  ifdef DEPTH_TYPE
+            dZRowInner = dZRowOuter + sizeof(DEPTH_TYPE);
+#  endif
             fdzInner = fdzOuter + fdzdx;
 #endif
 #ifdef INTERP_RGB
@@ -879,7 +897,6 @@
                /* ff = fixed-pt fragment */
 #ifdef INTERP_Z
                GLfixed ffz = fz;
-               /*GLdepth *zp = zRow;*/
 #endif
 #ifdef INTERP_RGB
                GLfixed ffr = fr,  ffg = fg,  ffb = fb;
@@ -963,10 +980,12 @@
                if (fError >= 0) {
                   fError -= FIXED_ONE;
 #ifdef PIXEL_ADDRESS
-                  pRow = (PIXEL_TYPE*) ((GLubyte*)pRow + dPRowOuter);
+                  pRow = (PIXEL_TYPE *) ((GLubyte*)pRow + dPRowOuter);
 #endif
 #ifdef INTERP_Z
-                  zRow = (GLdepth*) ((GLubyte*)zRow + dZRowOuter);
+#  ifdef DEPTH_TYPE
+                  zRow = (DEPTH_TYPE *) ((GLubyte*)zRow + dZRowOuter);
+#  endif
                   fz += fdzOuter;
 #endif
 #ifdef INTERP_RGB
@@ -999,10 +1018,12 @@
                }
                else {
 #ifdef PIXEL_ADDRESS
-                  pRow = (PIXEL_TYPE*) ((GLubyte*)pRow + dPRowInner);
+                  pRow = (PIXEL_TYPE *) ((GLubyte*)pRow + dPRowInner);
 #endif
 #ifdef INTERP_Z
-                  zRow = (GLdepth*) ((GLubyte*)zRow + dZRowInner);
+#  ifdef DEPTH_TYPE
+                  zRow = (DEPTH_TYPE *) ((GLubyte*)zRow + dZRowInner);
+#  endif
                   fz += fdzInner;
 #endif
 #ifdef INTERP_RGB
@@ -1059,3 +1080,7 @@
 
 #undef S_SCALE
 #undef T_SCALE
+
+#undef FixedToDepth
+
+#undef DO_OCCLUSION_TEST
Index: xc/extras/Mesa/src/types.h
diff -u xc/extras/Mesa/src/types.h:1.4 xc/extras/Mesa/src/types.h:1.5
--- xc/extras/Mesa/src/types.h:1.4	Thu Mar  2 08:07:16 2000
+++ xc/extras/Mesa/src/types.h	Fri Jun 16 17:02:18 2000
@@ -31,7 +31,6 @@
 
 #include "glheader.h"
 #include "config.h"
-#include "extensions.h"
 #include "fixed.h"
 #include "glapitable.h"
 #include "glthread.h"
@@ -82,13 +81,7 @@
 /*
  * Depth buffer data type:
  */
-#if DEPTH_BITS==16
-   typedef GLushort GLdepth;
-#elif DEPTH_BITS==32
-   typedef GLint GLdepth;
-#else
-#  error "illegal number of depth bits"
-#endif
+typedef GLuint GLdepth;  /* Must be 32-bits! */
 
 
 
@@ -182,42 +175,52 @@
 
 /* Texture image record */
 struct gl_texture_image {
-	GLenum Format;		/* GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA,
+   GLenum Format;		/* GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA,
 				 * GL_INTENSITY, GL_RGB, GL_RGBA, or
 				 * GL_COLOR_INDEX only
 				 */
-	GLenum IntFormat;	/* Internal format as given by the user */
-        GLubyte RedBits;	/* Bits per texel component              */
-        GLubyte GreenBits;	/*   These are initialized by Mesa but   */
-        GLubyte BlueBits;	/*   may be reassigned by the device     */
-        GLubyte AlphaBits;	/*   driver to indicate the true texture */
-        GLubyte IntensityBits;	/*   color resolution.                   */
-        GLubyte LuminanceBits;
-        GLubyte IndexBits;
-	GLuint Border;		/* 0 or 1 */
-	GLuint Width;		/* = 2^WidthLog2 + 2*Border */
-	GLuint Height;		/* = 2^HeightLog2 + 2*Border */
-	GLuint Depth;		/* = 2^DepthLog2 + 2*Border */
-	GLuint Width2;		/* = Width - 2*Border */
-	GLuint Height2;		/* = Height - 2*Border */
-	GLuint Depth2;		/* = Depth - 2*Border */
-	GLuint WidthLog2;	/* = log2(Width2) */
-	GLuint HeightLog2;	/* = log2(Height2) */
-	GLuint DepthLog2;	/* = log2(Depth2) */
-	GLuint MaxLog2;		/* = MAX(WidthLog2, HeightLog2) */
-	GLubyte *Data;		/* Image data as unsigned bytes */
+   GLenum IntFormat;		/* Internal format as given by the user */
+   GLubyte RedBits;		/* Bits per texel component              */
+   GLubyte GreenBits;		/*   These are initialized by Mesa but   */
+   GLubyte BlueBits;		/*   may be reassigned by the device     */
+   GLubyte AlphaBits;		/*   driver to indicate the true texture */
+   GLubyte IntensityBits;	/*   color resolution.                   */
+   GLubyte LuminanceBits;
+   GLubyte IndexBits;
+   GLuint Border;		/* 0 or 1 */
+   GLuint Width;		/* = 2^WidthLog2 + 2*Border */
+   GLuint Height;		/* = 2^HeightLog2 + 2*Border */
+   GLuint Depth;		/* = 2^DepthLog2 + 2*Border */
+   GLuint Width2;		/* = Width - 2*Border */
+   GLuint Height2;		/* = Height - 2*Border */
+   GLuint Depth2;		/* = Depth - 2*Border */
+   GLuint WidthLog2;		/* = log2(Width2) */
+   GLuint HeightLog2;		/* = log2(Height2) */
+   GLuint DepthLog2;		/* = log2(Depth2) */
+   GLuint MaxLog2;		/* = MAX(WidthLog2, HeightLog2) */
+   GLubyte *Data;		/* Image data as unsigned bytes */
 
-	/* For device driver: */
-	void *DriverData;	/* Arbitrary device driver data */
+   GLboolean IsCompressed;	/* GL_ARB_texture_compression */
+   GLuint CompressedSize;	/* GL_ARB_texture_compression */
+
+   /* For device driver: */
+   void *DriverData;		/* Arbitrary device driver data */
 };
 
 
 /* Data structure for color tables */
 struct gl_color_table {
-	GLubyte Table[4 * MAX_TEXTURE_PALETTE_SIZE];
-	GLuint Size;           /* number of entries (rows) in table */
-	GLenum Format;
-	GLenum IntFormat;
+   GLvoid *Table;
+   GLenum TableType;      /* GL_UNSIGNED_BYTE or GL_FLOAT */
+   GLuint Size;           /* number of entries (rows) in table */
+   GLenum Format;
+   GLenum IntFormat;
+   GLint RedSize;
+   GLint GreenSize;
+   GLint BlueSize;
+   GLint AlphaSize;
+   GLint LuminanceSize;
+   GLint IntensitySize;
 };
 
 
@@ -261,47 +264,47 @@
 #define SHINE_TABLE_SIZE 256
 
 struct gl_light {
-        struct gl_light *next;	        /* double linked list with sentinel */
-        struct gl_light *prev;
+   struct gl_light *next;	        /* double linked list with sentinel */
+   struct gl_light *prev;
 
-	GLfloat Ambient[4];		/* ambient color */
-	GLfloat Diffuse[4];		/* diffuse color */
-	GLfloat Specular[4];		/* specular color */
-	GLfloat EyePosition[4];		/* position in eye coordinates */
-	GLfloat EyeDirection[4];	/* spotlight dir in eye coordinates */
-	GLfloat SpotExponent;
-	GLfloat SpotCutoff;		/* in degress */
-        GLfloat CosCutoff;		/* = MAX(0, cos(SpotCutoff)) */
-	GLfloat ConstantAttenuation;
-	GLfloat LinearAttenuation;
-	GLfloat QuadraticAttenuation;
-	GLboolean Enabled;		/* On/off flag */
-
-	/* Derived fields */
-        GLuint Flags;		/* State */
-
-	GLfloat Position[4];		/* position in eye/obj coordinates */
-	GLfloat VP_inf_norm[3];		/* Norm direction to infinite light */
-	GLfloat h_inf_norm[3];		/* Norm( VP_inf_norm + <0,0,1> ) */
-        GLfloat NormDirection[4];	/* normalized spotlight direction */
-        GLfloat VP_inf_spot_attenuation; 
-
-        GLfloat SpotExpTable[EXP_TABLE_SIZE][2];  /* to replace a pow() call */
-	GLfloat MatAmbient[2][3];	/* material ambient * light ambient */
-	GLfloat MatDiffuse[2][3];	/* material diffuse * light diffuse */
-	GLfloat MatSpecular[2][3];	/* material spec * light specular */
-	GLfloat dli;			/* CI diffuse light intensity */
-	GLfloat sli;			/* CI specular light intensity */
-        GLboolean IsMatSpecular[2];
+   GLfloat Ambient[4];		/* ambient color */
+   GLfloat Diffuse[4];		/* diffuse color */
+   GLfloat Specular[4];		/* specular color */
+   GLfloat EyePosition[4];	/* position in eye coordinates */
+   GLfloat EyeDirection[4];	/* spotlight dir in eye coordinates */
+   GLfloat SpotExponent;
+   GLfloat SpotCutoff;		/* in degress */
+   GLfloat CosCutoff;		/* = MAX(0, cos(SpotCutoff)) */
+   GLfloat ConstantAttenuation;
+   GLfloat LinearAttenuation;
+   GLfloat QuadraticAttenuation;
+   GLboolean Enabled;		/* On/off flag */
+
+   /* Derived fields */
+   GLuint Flags;		/* State */
+
+   GLfloat Position[4];		/* position in eye/obj coordinates */
+   GLfloat VP_inf_norm[3];	/* Norm direction to infinite light */
+   GLfloat h_inf_norm[3];	/* Norm( VP_inf_norm + <0,0,1> ) */
+   GLfloat NormDirection[4];	/* normalized spotlight direction */
+   GLfloat VP_inf_spot_attenuation; 
+
+   GLfloat SpotExpTable[EXP_TABLE_SIZE][2];  /* to replace a pow() call */
+   GLfloat MatAmbient[2][3];	/* material ambient * light ambient */
+   GLfloat MatDiffuse[2][3];	/* material diffuse * light diffuse */
+   GLfloat MatSpecular[2][3];	/* material spec * light specular */
+   GLfloat dli;			/* CI diffuse light intensity */
+   GLfloat sli;			/* CI specular light intensity */
+   GLboolean IsMatSpecular[2];
 };
 
 
 struct gl_lightmodel {
-	GLfloat Ambient[4];		/* ambient color */
-	GLboolean LocalViewer;		/* Local (or infinite) view point? */
-	GLboolean TwoSide;		/* Two (or one) sided lighting? */
-	GLenum ColorControl;		/* either GL_SINGLE_COLOR */
-					/* or GL_SEPARATE_SPECULAR_COLOR */
+   GLfloat Ambient[4];		/* ambient color */
+   GLboolean LocalViewer;	/* Local (or infinite) view point? */
+   GLboolean TwoSide;		/* Two (or one) sided lighting? */
+   GLenum ColorControl;		/* either GL_SINGLE_COLOR */
+				/* or GL_SEPARATE_SPECULAR_COLOR */
 };
 
 
@@ -313,7 +316,7 @@
 
 
 struct gl_accum_attrib {
-	GLfloat ClearColor[4];	/* Accumulation buffer clear color */
+   GLfloat ClearColor[4];	/* Accumulation buffer clear color */
 };
 
 
@@ -327,180 +330,220 @@
 
 
 struct gl_colorbuffer_attrib {
-	GLuint ClearIndex;		/* Index to use for glClear */
-	GLfloat ClearColor[4];		/* Color to use for glClear */
+   GLuint ClearIndex;			/* Index to use for glClear */
+   GLfloat ClearColor[4];		/* Color to use for glClear */
 
-	GLuint IndexMask;		/* Color index write mask */
-	GLubyte ColorMask[4];		/* Each flag is 0xff or 0x0 */
-        GLboolean SWmasking;		/* Do color/CI masking in software? */
-
-	GLenum DrawBuffer;		/* Which buffer to draw into */
-	GLenum DriverDrawBuffer;	/* Current device driver dest buffer */
-	GLboolean MultiDrawBuffer;	/* Drawing to mutliple buffers? */
-        GLubyte DrawDestMask;		/* bitwise-OR of bitflags above */
-
-	/* alpha testing */
-	GLboolean AlphaEnabled;		/* Alpha test enabled flag */
-	GLenum AlphaFunc;		/* Alpha test function */
-	GLubyte AlphaRef;		/* Alpha ref value in range [0,255] */
-
-	/* blending */
-	GLboolean BlendEnabled;		/* Blending enabled flag */
-	GLenum BlendSrcRGB;		/* Blending source operator */
-	GLenum BlendDstRGB;		/* Blending destination operator */
-	GLenum BlendSrcA;		/* GL_INGR_blend_func_separate */
-	GLenum BlendDstA;		/* GL_INGR_blend_func_separate */
-	GLenum BlendEquation;
-	GLfloat BlendColor[4];
-	blend_func BlendFunc;		/* Points to C blending function */
-
-	/* logic op */
-	GLenum LogicOp;			/* Logic operator */
-	GLboolean IndexLogicOpEnabled;	/* Color index logic op enabled flag */
-	GLboolean ColorLogicOpEnabled;	/* RGBA logic op enabled flag */
-	GLboolean SWLogicOpEnabled;	/* Do logic ops in software? */
+   GLuint IndexMask;			/* Color index write mask */
+   GLubyte ColorMask[4];		/* Each flag is 0xff or 0x0 */
+   GLboolean SWmasking;			/* Do color/CI masking in software? */
+
+   GLenum DrawBuffer;			/* Which buffer to draw into */
+   GLenum DriverDrawBuffer;		/* Current device driver dest buffer */
+   GLboolean MultiDrawBuffer;		/* Drawing to mutliple buffers? */
+   GLubyte DrawDestMask;		/* bitwise-OR of bitflags above */
+
+   /* alpha testing */
+   GLboolean AlphaEnabled;		/* Alpha test enabled flag */
+   GLenum AlphaFunc;			/* Alpha test function */
+   GLubyte AlphaRef;			/* Alpha ref value in range [0,255] */
+
+   /* blending */
+   GLboolean BlendEnabled;		/* Blending enabled flag */
+   GLenum BlendSrcRGB;			/* Blending source operator */
+   GLenum BlendDstRGB;			/* Blending destination operator */
+   GLenum BlendSrcA;			/* GL_INGR_blend_func_separate */
+   GLenum BlendDstA;			/* GL_INGR_blend_func_separate */
+   GLenum BlendEquation;
+   GLfloat BlendColor[4];
+   blend_func BlendFunc;		/* Points to C blending function */
+
+   /* logic op */
+   GLenum LogicOp;			/* Logic operator */
+   GLboolean IndexLogicOpEnabled;	/* Color index logic op enabled flag */
+   GLboolean ColorLogicOpEnabled;	/* RGBA logic op enabled flag */
+   GLboolean SWLogicOpEnabled;		/* Do logic ops in software? */
 
-	GLboolean DitherFlag;		/* Dither enable flag */
+   GLboolean DitherFlag;		/* Dither enable flag */
 };
 
 
 struct gl_current_attrib {
-	/* KW: These values valid only when the VB is flushed.  
-	 */
-	GLuint Flag;		                /* Contains size information */
-	GLfloat Normal[3];
-	GLubyte ByteColor[4];			/* Current RGBA color */
-	GLuint Index;				/* Current color index */
-	GLboolean EdgeFlag;			/* Current edge flag */
-	GLfloat Texcoord[MAX_TEXTURE_UNITS][4];	/* Current texture coords */
-	GLenum Primitive;	                /* Prim or GL_POLYGON+1 */
+   /* KW: These values valid only when the VB is flushed.  
+    */
+   GLuint Flag;		                	/* Contains size information */
+   GLfloat Normal[3];
+   GLubyte ByteColor[4];			/* Current RGBA color */
+   GLuint Index;				/* Current color index */
+   GLboolean EdgeFlag;				/* Current edge flag */
+   GLfloat Texcoord[MAX_TEXTURE_UNITS][4];	/* Current texture coords */
+   GLenum Primitive;		                /* Prim or GL_POLYGON+1 */
 	
-	/* KW: No change to these values.
-	 */
-	GLfloat RasterPos[4];			/* Current raster position */
-	GLfloat RasterDistance;			/* Current raster distance */
-	GLfloat RasterColor[4];			/* Current raster color */
-	GLuint  RasterIndex;			/* Current raster index */
-	GLfloat *RasterTexCoord;		/* Current raster texcoord*/
-	GLfloat RasterMultiTexCoord[MAX_TEXTURE_UNITS][4];
-	GLboolean RasterPosValid;		/* Raster po valid flag */
+   /* KW: No change to these values.
+    */
+   GLfloat RasterPos[4];			/* Current raster position */
+   GLfloat RasterDistance;			/* Current raster distance */
+   GLfloat RasterColor[4];			/* Current raster color */
+   GLuint  RasterIndex;				/* Current raster index */
+   GLfloat *RasterTexCoord;			/* Current raster texcoord*/
+   GLfloat RasterMultiTexCoord[MAX_TEXTURE_UNITS][4];
+   GLboolean RasterPosValid;			/* Raster po valid flag */
 };
 
 
 struct gl_depthbuffer_attrib {
-	GLenum Func;		/* Function for depth buffer compare */
-	GLfloat Clear;		/* Value to clear depth buffer to */
-	GLboolean Test;		/* Depth buffering enabled flag */
-	GLboolean Mask;		/* Depth buffer writable? */
+   GLenum Func;			/* Function for depth buffer compare */
+   GLfloat Clear;		/* Value to clear depth buffer to */
+   GLboolean Test;		/* Depth buffering enabled flag */
+   GLboolean Mask;		/* Depth buffer writable? */
+   GLboolean OcclusionTest;	/* GL_HP_occlusion_test */
 };
 
 
 struct gl_enable_attrib {
-	GLboolean AlphaTest;
-	GLboolean AutoNormal;
-	GLboolean Blend;
-	GLboolean ClipPlane[MAX_CLIP_PLANES];
-	GLboolean ColorMaterial;
-	GLboolean CullFace;
-	GLboolean DepthTest;
-	GLboolean Dither;
-	GLboolean Fog;
-	GLboolean Light[MAX_LIGHTS];
-	GLboolean Lighting;
-	GLboolean LineSmooth;
-	GLboolean LineStipple;
-	GLboolean IndexLogicOp;
-	GLboolean ColorLogicOp;
-	GLboolean Map1Color4;
-	GLboolean Map1Index;
-	GLboolean Map1Normal;
-	GLboolean Map1TextureCoord1;
-	GLboolean Map1TextureCoord2;
-	GLboolean Map1TextureCoord3;
-	GLboolean Map1TextureCoord4;
-	GLboolean Map1Vertex3;
-	GLboolean Map1Vertex4;
-	GLboolean Map2Color4;
-	GLboolean Map2Index;
-	GLboolean Map2Normal;
-	GLboolean Map2TextureCoord1;
-	GLboolean Map2TextureCoord2;
-	GLboolean Map2TextureCoord3;
-	GLboolean Map2TextureCoord4;
-	GLboolean Map2Vertex3;
-	GLboolean Map2Vertex4;
-	GLboolean Normalize;
-	GLboolean PointSmooth;
-	GLboolean PolygonOffsetPoint;
-	GLboolean PolygonOffsetLine;
-	GLboolean PolygonOffsetFill;
-	GLboolean PolygonSmooth;
-	GLboolean PolygonStipple;
-	GLboolean RescaleNormals;
-	GLboolean Scissor;
-	GLboolean Stencil;
-	GLuint Texture;
-	GLuint TexGen[MAX_TEXTURE_UNITS];
+   GLboolean AlphaTest;
+   GLboolean AutoNormal;
+   GLboolean Blend;
+   GLboolean ClipPlane[MAX_CLIP_PLANES];
+   GLboolean ColorMaterial;
+   GLboolean Convolution1D;
+   GLboolean Convolution2D;
+   GLboolean Separable2D;
+   GLboolean CullFace;
+   GLboolean DepthTest;
+   GLboolean Dither;
+   GLboolean Fog;
+   GLboolean Histogram;
+   GLboolean Light[MAX_LIGHTS];
+   GLboolean Lighting;
+   GLboolean LineSmooth;
+   GLboolean LineStipple;
+   GLboolean IndexLogicOp;
+   GLboolean ColorLogicOp;
+   GLboolean Map1Color4;
+   GLboolean Map1Index;
+   GLboolean Map1Normal;
+   GLboolean Map1TextureCoord1;
+   GLboolean Map1TextureCoord2;
+   GLboolean Map1TextureCoord3;
+   GLboolean Map1TextureCoord4;
+   GLboolean Map1Vertex3;
+   GLboolean Map1Vertex4;
+   GLboolean Map2Color4;
+   GLboolean Map2Index;
+   GLboolean Map2Normal;
+   GLboolean Map2TextureCoord1;
+   GLboolean Map2TextureCoord2;
+   GLboolean Map2TextureCoord3;
+   GLboolean Map2TextureCoord4;
+   GLboolean Map2Vertex3;
+   GLboolean Map2Vertex4;
+   GLboolean MinMax;
+   GLboolean Normalize;
+   GLboolean PixelTexture;
+   GLboolean PointSmooth;
+   GLboolean PolygonOffsetPoint;
+   GLboolean PolygonOffsetLine;
+   GLboolean PolygonOffsetFill;
+   GLboolean PolygonSmooth;
+   GLboolean PolygonStipple;
+   GLboolean RescaleNormals;
+   GLboolean Scissor;
+   GLboolean Stencil;
+   GLuint Texture;
+   GLuint TexGen[MAX_TEXTURE_UNITS];
 };
 
 
 struct gl_eval_attrib {
-	/* Enable bits */
-	GLboolean Map1Color4;
-	GLboolean Map1Index;
-	GLboolean Map1Normal;
-	GLboolean Map1TextureCoord1;
-	GLboolean Map1TextureCoord2;
-	GLboolean Map1TextureCoord3;
-	GLboolean Map1TextureCoord4;
-	GLboolean Map1Vertex3;
-	GLboolean Map1Vertex4;
-	GLboolean Map2Color4;
-	GLboolean Map2Index;
-	GLboolean Map2Normal;
-	GLboolean Map2TextureCoord1;
-	GLboolean Map2TextureCoord2;
-	GLboolean Map2TextureCoord3;
-	GLboolean Map2TextureCoord4;
-	GLboolean Map2Vertex3;
-	GLboolean Map2Vertex4;
-	GLboolean AutoNormal;
-	/* Map Grid endpoints and divisions and calculated du values */
-	GLint MapGrid1un;
-	GLfloat MapGrid1u1, MapGrid1u2, MapGrid1du;
-	GLint MapGrid2un, MapGrid2vn;
-	GLfloat MapGrid2u1, MapGrid2u2, MapGrid2du;
-	GLfloat MapGrid2v1, MapGrid2v2, MapGrid2dv;
+   /* Enable bits */
+   GLboolean Map1Color4;
+   GLboolean Map1Index;
+   GLboolean Map1Normal;
+   GLboolean Map1TextureCoord1;
+   GLboolean Map1TextureCoord2;
+   GLboolean Map1TextureCoord3;
+   GLboolean Map1TextureCoord4;
+   GLboolean Map1Vertex3;
+   GLboolean Map1Vertex4;
+   GLboolean Map2Color4;
+   GLboolean Map2Index;
+   GLboolean Map2Normal;
+   GLboolean Map2TextureCoord1;
+   GLboolean Map2TextureCoord2;
+   GLboolean Map2TextureCoord3;
+   GLboolean Map2TextureCoord4;
+   GLboolean Map2Vertex3;
+   GLboolean Map2Vertex4;
+   GLboolean AutoNormal;
+   /* Map Grid endpoints and divisions and calculated du values */
+   GLint MapGrid1un;
+   GLfloat MapGrid1u1, MapGrid1u2, MapGrid1du;
+   GLint MapGrid2un, MapGrid2vn;
+   GLfloat MapGrid2u1, MapGrid2u2, MapGrid2du;
+   GLfloat MapGrid2v1, MapGrid2v2, MapGrid2dv;
 };
 
 
 struct gl_fog_attrib {
-	GLboolean Enabled;		/* Fog enabled flag */
-	GLfloat Color[4];		/* Fog color */
-	GLfloat Density;		/* Density >= 0.0 */
-	GLfloat Start;			/* Start distance in eye coords */
-	GLfloat End;			/* End distance in eye coords */
-	GLfloat Index;			/* Fog index */
-	GLenum Mode;			/* Fog mode */
+   GLboolean Enabled;		/* Fog enabled flag */
+   GLfloat Color[4];		/* Fog color */
+   GLfloat Density;		/* Density >= 0.0 */
+   GLfloat Start;		/* Start distance in eye coords */
+   GLfloat End;			/* End distance in eye coords */
+   GLfloat Index;		/* Fog index */
+   GLenum Mode;			/* Fog mode */
 };
 
 
 struct gl_hint_attrib {
-	/* always one of GL_FASTEST, GL_NICEST, or GL_DONT_CARE */
-	GLenum PerspectiveCorrection;
-	GLenum PointSmooth;
-	GLenum LineSmooth;
-	GLenum PolygonSmooth;
-	GLenum Fog;
-
-	/* GL_PGI_misc_hints */
-	GLenum AllowDrawWin;
-	GLenum AllowDrawSpn;
-	GLenum AllowDrawMem;
-	GLenum StrictLighting;
+   /* always one of GL_FASTEST, GL_NICEST, or GL_DONT_CARE */
+   GLenum PerspectiveCorrection;
+   GLenum PointSmooth;
+   GLenum LineSmooth;
+   GLenum PolygonSmooth;
+   GLenum Fog;
+
+   /* GL_PGI_misc_hints */
+   GLenum AllowDrawWin;
+   GLenum AllowDrawFrg;
+   GLenum AllowDrawMem;
+   GLenum StrictLighting;
+
+   /* GL_EXT_clip_volume_hint */
+   GLenum ClipVolumeClipping;
+
+   /* GL_ARB_texture_compression */
+   GLenum TextureCompression;
+};
+
+
+struct gl_histogram_attrib {
+   GLuint Width;
+   GLint Format;
+   GLboolean Sink;
+   GLuint RedSize;
+   GLuint GreenSize;
+   GLuint BlueSize;
+   GLuint AlphaSize;
+   GLuint LuminanceSize;
+   GLuint Count[HISTOGRAM_TABLE_SIZE][4];
+};
 
-	/* GL_EXT_clip_volume_hint */
-	GLenum ClipVolumeClipping;
+
+struct gl_minmax_attrib {
+   GLenum Format;
+   GLboolean Sink;
+   GLfloat Min[4], Max[4];   /* RGBA */
+};
+
+
+struct gl_convolution_attrib {
+   /* XXX not done yet */
+   GLenum Format;
+   GLenum InternalFormat;
+   GLuint Width;
+   GLuint Height;
+   GLfloat Filter[MAX_CONVOLUTION_WIDTH * MAX_CONVOLUTION_HEIGHT * 4];
 };
 
 
@@ -534,109 +577,139 @@
 #define LIGHT_NEED_VERTICES (LIGHT_POSITIONAL|LIGHT_LOCAL_VIEWER)
 
 struct gl_line_attrib {
-	GLboolean SmoothFlag;		/* GL_LINE_SMOOTH enabled? */
-	GLboolean StippleFlag;		/* GL_LINE_STIPPLE enabled? */
-	GLushort StipplePattern;	/* Stipple pattern */
-	GLint StippleFactor;		/* Stipple repeat factor */
-	GLfloat Width;			/* Line width */
+   GLboolean SmoothFlag;	/* GL_LINE_SMOOTH enabled? */
+   GLboolean StippleFlag;	/* GL_LINE_STIPPLE enabled? */
+   GLushort StipplePattern;	/* Stipple pattern */
+   GLint StippleFactor;		/* Stipple repeat factor */
+   GLfloat Width;		/* Line width */
 };
 
 
 struct gl_list_attrib {
-	GLuint ListBase;
+   GLuint ListBase;
 };
 
 
 struct gl_pixel_attrib {
-	GLenum ReadBuffer;		/* src buffer for glRead/CopyPixels */
-	GLenum DriverReadBuffer;	/* Driver's current source buffer */
-	GLfloat RedBias, RedScale;
-	GLfloat GreenBias, GreenScale;
-	GLfloat BlueBias, BlueScale;
-	GLfloat AlphaBias, AlphaScale;
-	GLboolean ScaleOrBiasRGBA;
-	GLfloat DepthBias, DepthScale;
-	GLint IndexShift, IndexOffset;
-	GLboolean MapColorFlag;
-	GLboolean MapStencilFlag;
-	GLfloat ZoomX;			/* Pixel zoom X factor */
-	GLfloat ZoomY;			/* Pixel zoom Y factor */
-	GLint MapStoSsize;		/* Size of each pixel map */
-	GLint MapItoIsize;
-	GLint MapItoRsize;
-	GLint MapItoGsize;
-	GLint MapItoBsize;
-	GLint MapItoAsize;
-	GLint MapRtoRsize;
-	GLint MapGtoGsize;
-	GLint MapBtoBsize;
-	GLint MapAtoAsize;
-	GLint MapStoS[MAX_PIXEL_MAP_TABLE];	/* Pixel map tables */
-	GLint MapItoI[MAX_PIXEL_MAP_TABLE];
-	GLfloat MapItoR[MAX_PIXEL_MAP_TABLE];
-	GLfloat MapItoG[MAX_PIXEL_MAP_TABLE];
-	GLfloat MapItoB[MAX_PIXEL_MAP_TABLE];
-	GLfloat MapItoA[MAX_PIXEL_MAP_TABLE];
-	GLubyte MapItoR8[MAX_PIXEL_MAP_TABLE];  /* converted to 8-bit color */
-	GLubyte MapItoG8[MAX_PIXEL_MAP_TABLE];
-	GLubyte MapItoB8[MAX_PIXEL_MAP_TABLE];
-	GLubyte MapItoA8[MAX_PIXEL_MAP_TABLE];
-	GLfloat MapRtoR[MAX_PIXEL_MAP_TABLE];
-	GLfloat MapGtoG[MAX_PIXEL_MAP_TABLE];
-	GLfloat MapBtoB[MAX_PIXEL_MAP_TABLE];
-	GLfloat MapAtoA[MAX_PIXEL_MAP_TABLE];
+   GLenum ReadBuffer;		/* src buffer for glRead/CopyPixels */
+   GLenum DriverReadBuffer;	/* Driver's current source buffer */
+   GLfloat RedBias, RedScale;
+   GLfloat GreenBias, GreenScale;
+   GLfloat BlueBias, BlueScale;
+   GLfloat AlphaBias, AlphaScale;
+   GLboolean ScaleOrBiasRGBA;
+   GLfloat DepthBias, DepthScale;
+   GLint IndexShift, IndexOffset;
+   GLboolean MapColorFlag;
+   GLboolean MapStencilFlag;
+   GLfloat ZoomX, ZoomY;
+   GLint MapStoSsize;		/* Size of each pixel map */
+   GLint MapItoIsize;
+   GLint MapItoRsize;
+   GLint MapItoGsize;
+   GLint MapItoBsize;
+   GLint MapItoAsize;
+   GLint MapRtoRsize;
+   GLint MapGtoGsize;
+   GLint MapBtoBsize;
+   GLint MapAtoAsize;
+   GLint MapStoS[MAX_PIXEL_MAP_TABLE];	/* Pixel map tables */
+   GLint MapItoI[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoR[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoG[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoB[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoA[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoR8[MAX_PIXEL_MAP_TABLE];  /* converted to 8-bit color */
+   GLubyte MapItoG8[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoB8[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoA8[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapRtoR[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapGtoG[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapBtoB[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapAtoA[MAX_PIXEL_MAP_TABLE];
+   /* GL_EXT_histogram */
+   GLboolean HistogramEnabled;
+   GLboolean MinMaxEnabled;
+   /* GL_SGIS_pixel_texture */
+   GLboolean PixelTextureEnabled;
+   GLenum FragmentRgbSource;
+   GLenum FragmentAlphaSource;
+   /* GL_SGI_color_matrix */
+   GLfloat PostColorMatrixScale[4];  /* RGBA */
+   GLfloat PostColorMatrixBias[4];   /* RGBA */
+   GLboolean ScaleOrBiasRGBApcm;
+   /* GL_SGI_color_table */
+   GLfloat ColorTableScale[4];
+   GLfloat ColorTableBias[4];
+   GLboolean ColorTableEnabled;
+   GLfloat PCCTscale[4];
+   GLfloat PCCTbias[4];
+   GLboolean PostConvolutionColorTableEnabled;
+   GLfloat PCMCTscale[4];
+   GLfloat PCMCTbias[4];
+   GLboolean PostColorMatrixColorTableEnabled;
+   /* Convolution */
+   GLboolean Convolution1DEnabled;
+   GLboolean Convolution2DEnabled;
+   GLboolean Separable2DEnabled;
+   GLfloat ConvolutionBorderColor[3][4];
+   GLenum ConvolutionBorderMode[3];
+   GLfloat ConvolutionFilterScale[3][4];
+   GLfloat ConvolutionFilterBias[3][4];
+   GLfloat PostConvolutionScale[4];  /* RGBA */
+   GLfloat PostConvolutionBias[4];   /* RGBA */
 };
 
 
 struct gl_point_attrib {
-	GLboolean SmoothFlag;	/* True if GL_POINT_SMOOTH is enabled */
-	GLfloat Size;		/* Point size */
-	GLfloat Params[3];	/* Point Parameters EXT distance atenuation 
-				   factors by default = {1,0,0} */ 
-	GLfloat MinSize;	/* Default 0.0 always >=0 */
-	GLfloat MaxSize;	/* Default MAX_POINT_SIZE */
-	GLfloat Threshold;	/* Default 1.0 */ 
-	GLboolean Attenuated;
+   GLboolean SmoothFlag;/* True if GL_POINT_SMOOTH is enabled */
+   GLfloat UserSize;	/* User-specified point size */
+   GLfloat Size;	/* Point size actually used */
+   GLfloat Params[3];	/* Point Parameters EXT distance atenuation 
+			   factors by default = {1,0,0} */ 
+   GLfloat MinSize;	/* Default 0.0 always >=0 */
+   GLfloat MaxSize;	/* Default MAX_POINT_SIZE */
+   GLfloat Threshold;	/* Default 1.0 */ 
+   GLboolean Attenuated;
 };
 
 
 struct gl_polygon_attrib {
-	GLenum FrontFace;	/* Either GL_CW or GL_CCW */
-	GLenum FrontMode;	/* Either GL_POINT, GL_LINE or GL_FILL */
-	GLenum BackMode;	/* Either GL_POINT, GL_LINE or GL_FILL */
-	GLboolean FrontBit;	/*  */
-	GLboolean Unfilled;	/* True if back or front mode is not GL_FILL */
-	GLboolean CullFlag;	/* Culling on/off flag */
-        GLubyte CullBits;	/* Used for cull testing */
-	GLboolean SmoothFlag;	/* True if GL_POLYGON_SMOOTH is enabled */
-	GLboolean StippleFlag;	/* True if GL_POLYGON_STIPPLE is enabled */
-	GLenum CullFaceMode;	/* Culling mode GL_FRONT or GL_BACK */
-        GLfloat OffsetFactor;	/* Polygon offset factor */
-        GLfloat OffsetUnits;	/* Polygon offset units */
-        GLboolean OffsetPoint;	/* Offset in GL_POINT mode? */
-        GLboolean OffsetLine;	/* Offset in GL_LINE mode? */
-        GLboolean OffsetFill;	/* Offset in GL_FILL mode? */
-
+   GLenum FrontFace;		/* Either GL_CW or GL_CCW */
+   GLenum FrontMode;		/* Either GL_POINT, GL_LINE or GL_FILL */
+   GLenum BackMode;		/* Either GL_POINT, GL_LINE or GL_FILL */
+   GLboolean FrontBit;		/*  */
+   GLboolean Unfilled;		/* True if back or front mode is not GL_FILL */
+   GLboolean CullFlag;		/* Culling on/off flag */
+   GLubyte CullBits;		/* Used for cull testing */
+   GLboolean SmoothFlag;	/* True if GL_POLYGON_SMOOTH is enabled */
+   GLboolean StippleFlag;	/* True if GL_POLYGON_STIPPLE is enabled */
+   GLenum CullFaceMode;		/* Culling mode GL_FRONT or GL_BACK */
+   GLfloat OffsetFactor;	/* Polygon offset factor */
+   GLfloat OffsetUnits;		/* Polygon offset units */
+   GLboolean OffsetPoint;	/* Offset in GL_POINT mode? */
+   GLboolean OffsetLine;	/* Offset in GL_LINE mode? */
+   GLboolean OffsetFill;	/* Offset in GL_FILL mode? */
 };
 
 
 struct gl_scissor_attrib {
-	GLboolean Enabled;		/* Scissor test enabled? */
-	GLint X, Y;			/* Lower left corner of box */
-	GLsizei Width, Height;		/* Size of box */
+   GLboolean Enabled;		/* Scissor test enabled? */
+   GLint X, Y;			/* Lower left corner of box */
+   GLsizei Width, Height;		/* Size of box */
 };
 
 
 struct gl_stencil_attrib {
-	GLboolean Enabled;		/* Enabled flag */
-	GLenum Function;		/* Stencil function */
-	GLenum FailFunc;		/* Fail function */
-	GLenum ZPassFunc;		/* Depth buffer pass function */
-	GLenum ZFailFunc;		/* Depth buffer fail function */
-	GLstencil Ref;			/* Reference value */
-	GLstencil ValueMask;		/* Value mask */
-	GLstencil Clear;		/* Clear value */
-	GLstencil WriteMask;		/* Write mask */
+   GLboolean Enabled;		/* Enabled flag */
+   GLenum Function;		/* Stencil function */
+   GLenum FailFunc;		/* Fail function */
+   GLenum ZPassFunc;		/* Depth buffer pass function */
+   GLenum ZFailFunc;		/* Depth buffer fail function */
+   GLstencil Ref;			/* Reference value */
+   GLstencil ValueMask;		/* Value mask */
+   GLstencil Clear;		/* Clear value */
+   GLstencil WriteMask;		/* Write mask */
 };
 
 
@@ -647,14 +720,16 @@
 #define Q_BIT 8
 
 /* Texture Enabled flags */
-#define TEXTURE0_1D S_BIT     /* Texture unit 0 (default) */
-#define TEXTURE0_2D T_BIT
-#define TEXTURE0_3D R_BIT
-#define TEXTURE0_ANY (TEXTURE0_1D | TEXTURE0_2D | TEXTURE0_3D)
-#define TEXTURE1_1D (S_BIT<<4)    /* Texture unit 1 */
-#define TEXTURE1_2D (T_BIT<<4)
-#define TEXTURE1_3D (R_BIT<<4)
-#define TEXTURE1_ANY (TEXTURE1_1D | TEXTURE1_2D | TEXTURE1_3D)
+#define TEXTURE0_1D   0x1     /* Texture unit 0 (default) */
+#define TEXTURE0_2D   0x2
+#define TEXTURE0_3D   0x4
+#define TEXTURE0_CUBE 0x8
+#define TEXTURE0_ANY  (TEXTURE0_1D | TEXTURE0_2D | TEXTURE0_3D | TEXTURE0_CUBE)
+#define TEXTURE1_1D   (TEXTURE0_1D << 4)    /* Texture unit 1 */
+#define TEXTURE1_2D   (TEXTURE0_2D << 4)
+#define TEXTURE1_3D   (TEXTURE0_3D << 4)
+#define TEXTURE1_CUBE (TEXTURE0_CUBE << 4)
+#define TEXTURE1_ANY  (TEXTURE1_1D | TEXTURE1_2D | TEXTURE1_3D | TEXTURE1_CUBE)
 
 /* Bitmap versions of the GL_ constants.
  */
@@ -706,37 +781,45 @@
 
 /* Texture object record */
 struct gl_texture_object {
-        _glthread_Mutex Mutex;		/* for thread safety */
-	GLint RefCount;			/* reference count */
-	GLuint Name;			/* an unsigned integer */
-	GLuint Dimensions;		/* 1 or 2 or 3 */
-	GLfloat Priority;		/* in [0,1] */
-	GLubyte BorderColor[4];		/* as integers in [0,255] */
-	GLenum WrapS;			/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
-	GLenum WrapT;			/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
-	GLenum WrapR;			/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
-	GLenum MinFilter;		/* minification filter */
-	GLenum MagFilter;		/* magnification filter */
-	GLfloat MinLod;			/* OpenGL 1.2 */
-	GLfloat MaxLod;			/* OpenGL 1.2 */
-	GLint BaseLevel;		/* OpenGL 1.2 */
-	GLint MaxLevel;			/* OpenGL 1.2 */
-	GLint P;			/* Highest mipmap level */
-	GLfloat M;			/* = MIN(MaxLevel, P) - BaseLevel */
-	GLfloat MinMagThresh;		/* min/mag threshold */
-	struct gl_texture_image *Image[MAX_TEXTURE_LEVELS];
-
-	/* GL_EXT_paletted_texture */
-        struct gl_color_table Palette;
-
-	/* For device driver: */
-	GLboolean Dirty;	/* Is this texture object in dirty list? */
-	void *DriverData;	/* Arbitrary device driver data */
-
-	GLboolean Complete;		/* Complete set of images? */
-	TextureSampleFunc SampleFunc;	/* The texel sampling function */
-	struct gl_texture_object *Next;		/* Next in linked list */
-	struct gl_texture_object *NextDirty;	/* Next in dirty linked list */
+   _glthread_Mutex Mutex;	/* for thread safety */
+   GLint RefCount;		/* reference count */
+   GLuint Name;			/* an unsigned integer */
+   GLuint Dimensions;		/* 1 or 2 or 3 */
+   GLfloat Priority;		/* in [0,1] */
+   GLubyte BorderColor[4];	/* as integers in [0,255] */
+   GLenum WrapS;		/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
+   GLenum WrapT;		/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
+   GLenum WrapR;		/* GL_CLAMP, REPEAT or CLAMP_TO_EDGE */
+   GLenum MinFilter;		/* minification filter */
+   GLenum MagFilter;		/* magnification filter */
+   GLfloat MinLod;		/* OpenGL 1.2 */
+   GLfloat MaxLod;		/* OpenGL 1.2 */
+   GLint BaseLevel;		/* OpenGL 1.2 */
+   GLint MaxLevel;		/* OpenGL 1.2 */
+   GLint P;			/* Highest mipmap level */
+   GLfloat M;			/* = MIN(MaxLevel, P) - BaseLevel */
+   GLfloat MinMagThresh;	/* min/mag threshold */
+   struct gl_texture_image *Image[MAX_TEXTURE_LEVELS];
+
+   /* Texture cube faces */
+   /* Image[] is alias for *PosX[MAX_TEXTURE_LEVELS]; */
+   struct gl_texture_image *NegX[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *PosY[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *NegY[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *PosZ[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *NegZ[MAX_TEXTURE_LEVELS];
+
+   /* GL_EXT_paletted_texture */
+   struct gl_color_table Palette;
+
+   /* For device driver: */
+   GLboolean Dirty;	/* Is this texture object in dirty list? */
+   void *DriverData;	/* Arbitrary device driver data */
+
+   GLboolean Complete;			/* Complete set of images? */
+   TextureSampleFunc SampleFunc;	/* The texel sampling function */
+   struct gl_texture_object *Next;	/* Next in linked list */
+   struct gl_texture_object *NextDirty;	/* Next in dirty linked list */
 };
 
 
@@ -745,69 +828,73 @@
  * Texture units are new with the multitexture extension.
  */
 struct gl_texture_unit {
-	GLuint Enabled;
-	GLuint ReallyEnabled;
+   GLuint Enabled;
+   GLuint ReallyEnabled;
 
-	GLenum EnvMode;		/* GL_MODULATE, GL_DECAL, GL_BLEND */
-	GLenum LastEnvMode;
+   GLenum EnvMode;		/* GL_MODULATE, GL_DECAL, GL_BLEND */
+   GLenum LastEnvMode;
 
-	GLfloat EnvColor[4];
-	GLuint TexGenEnabled;	/* Bitwise-OR of [STRQ]_BIT values */
-	GLenum GenModeS;	/* Tex coord generation mode, either */
-	GLenum GenModeT;	/*	GL_OBJECT_LINEAR, or */
-	GLenum GenModeR;	/*	GL_EYE_LINEAR, or    */
-	GLenum GenModeQ;	/*      GL_SPHERE_MAP        */
-	GLuint GenBitS;
-	GLuint GenBitT;
-	GLuint GenBitR;
-	GLuint GenBitQ;
-	GLuint GenFlags;	/* bitwise or of GenBit[STRQ] */
-	GLfloat ObjectPlaneS[4];
-	GLfloat ObjectPlaneT[4];
-	GLfloat ObjectPlaneR[4];
-	GLfloat ObjectPlaneQ[4];
-	GLfloat EyePlaneS[4];
-	GLfloat EyePlaneT[4];
-	GLfloat EyePlaneR[4];
-	GLfloat EyePlaneQ[4];
-	texgen_func *func;	/* points to array of func pointers */
-	GLubyte Holes;		/* elements not generated by texgen */
-	GLuint  TexgenSize;	/* size of element generated */
-	GLboolean AnyTransform;	/* texgen or non-identity matrix */
-
-	struct gl_texture_object *CurrentD[4];
-	struct gl_texture_object *Current;
-	GLuint CurrentDimension;
-
-	struct gl_texture_object Saved1D;  /* only used by glPush/PopAttrib */
-	struct gl_texture_object Saved2D;
-	struct gl_texture_object Saved3D;
+   GLfloat EnvColor[4];
+   GLuint TexGenEnabled;	/* Bitwise-OR of [STRQ]_BIT values */
+   GLenum GenModeS;		/* Tex coord generation mode, either */
+   GLenum GenModeT;		/*	GL_OBJECT_LINEAR, or */
+   GLenum GenModeR;		/*	GL_EYE_LINEAR, or    */
+   GLenum GenModeQ;		/*      GL_SPHERE_MAP        */
+   GLuint GenBitS;
+   GLuint GenBitT;
+   GLuint GenBitR;
+   GLuint GenBitQ;
+   GLuint GenFlags;		/* bitwise or of GenBit[STRQ] */
+   GLfloat ObjectPlaneS[4];
+   GLfloat ObjectPlaneT[4];
+   GLfloat ObjectPlaneR[4];
+   GLfloat ObjectPlaneQ[4];
+   GLfloat EyePlaneS[4];
+   GLfloat EyePlaneT[4];
+   GLfloat EyePlaneR[4];
+   GLfloat EyePlaneQ[4];
+   texgen_func *func;		/* points to array of func pointers */
+   GLubyte Holes;		/* elements not generated by texgen */
+   GLuint  TexgenSize;		/* size of element generated */
+   GLboolean AnyTransform;	/* texgen or non-identity matrix */
+   GLfloat LodBias;		/* for biasing mipmap levels */
+
+   struct gl_texture_object *CurrentD[4];
+   struct gl_texture_object *CurrentCubeMap; /* GL_ARB_texture_cube_map */
+
+   struct gl_texture_object *Current;
+   GLuint CurrentDimension;
+
+   struct gl_texture_object Saved1D;  /* only used by glPush/PopAttrib */
+   struct gl_texture_object Saved2D;
+   struct gl_texture_object Saved3D;
 };
 
 
 struct gl_texture_attrib {
-	/* multitexture */
-	GLuint CurrentUnit;			/* Current texture unit */
-	GLuint CurrentTransformUnit;		/* Current texture xform unit */
-
-	/* Bitwise-OR of TEXTURE_XD values */
-	GLuint Enabled;		/* Enabled by the user */
-	GLuint ReallyEnabled;	/* Really enabled (w.r.t. completeness, etc) */
+   /* multitexture */
+   GLuint CurrentUnit;			/* Current texture unit */
+   GLuint CurrentTransformUnit;		/* Current texture xform unit */
+
+   /* Bitwise-OR of TEXTURE_XD values */
+   GLuint Enabled;		/* Enabled by the user */
+   GLuint ReallyEnabled;	/* Really enabled (w.r.t. completeness, etc) */
 	
-	GLuint LastEnabled;	/* Decide whether enabled has really changed */
+   GLuint LastEnabled;	/* Decide whether enabled has really changed */
 
-	GLboolean NeedNormals;
-	GLboolean NeedEyeCoords;
+   GLboolean NeedNormals;
+   GLboolean NeedEyeCoords;
 
-	struct gl_texture_unit Unit[MAX_TEXTURE_UNITS];
+   struct gl_texture_unit Unit[MAX_TEXTURE_UNITS];
 	
-	struct gl_texture_object *Proxy1D;
-	struct gl_texture_object *Proxy2D;
-	struct gl_texture_object *Proxy3D;
-
-	/* GL_EXT_shared_texture_palette */
-        GLboolean SharedPalette;
-        struct gl_color_table Palette;
+   struct gl_texture_object *Proxy1D;
+   struct gl_texture_object *Proxy2D;
+   struct gl_texture_object *Proxy3D;
+   struct gl_texture_object *ProxyCubeMap;
+
+   /* GL_EXT_shared_texture_palette */
+   GLboolean SharedPalette;
+   struct gl_color_table Palette;
 };
 
 
@@ -815,29 +902,29 @@
 /* KW: Renamed ClipEquation to avoid having 'ClipClipEquation'
  */
 struct gl_transform_attrib {
-	GLenum MatrixMode;			/* Matrix mode */
-	GLfloat EyeUserPlane[MAX_CLIP_PLANES][4];
-	GLfloat ClipUserPlane[MAX_CLIP_PLANES][4]; /* derived */
-	GLboolean ClipEnabled[MAX_CLIP_PLANES];
-	GLubyte   AnyClip;			/* How many ClipEnabled? */
-	GLboolean Normalize;			/* Normalize all normals? */
-	GLboolean RescaleNormals;		/* GL_EXT_rescale_normal */
+   GLenum MatrixMode;				/* Matrix mode */
+   GLfloat EyeUserPlane[MAX_CLIP_PLANES][4];
+   GLfloat ClipUserPlane[MAX_CLIP_PLANES][4];	/* derived */
+   GLboolean ClipEnabled[MAX_CLIP_PLANES];
+   GLubyte   AnyClip;				/* How many ClipEnabled? */
+   GLboolean Normalize;				/* Normalize all normals? */
+   GLboolean RescaleNormals;			/* GL_EXT_rescale_normal */
 };
 
 
 struct gl_viewport_attrib {
-	GLint X, Y;		/* position */
-	GLsizei Width, Height;	/* size */
-	GLfloat Near, Far;	/* Depth buffer range */
-        GLmatrix WindowMap;	/* Mapping transformation as a matrix. */
+   GLint X, Y;			/* position */
+   GLsizei Width, Height;	/* size */
+   GLfloat Near, Far;		/* Depth buffer range */
+   GLmatrix WindowMap;		/* Mapping transformation as a matrix. */
 };
 
 
 /* For the attribute stack: */
 struct gl_attrib_node {
-	GLbitfield kind;
-	void *data;
-	struct gl_attrib_node *next;
+   GLbitfield kind;
+   void *data;
+   struct gl_attrib_node *next;
 };
 
 
@@ -846,14 +933,14 @@
  * Client pixel packing/unpacking attributes
  */
 struct gl_pixelstore_attrib {
-	GLint Alignment;
-	GLint RowLength;
-	GLint SkipPixels;
-	GLint SkipRows;
-	GLint ImageHeight;     /* for GL_EXT_texture3D */
-	GLint SkipImages;      /* for GL_EXT_texture3D */
-	GLboolean SwapBytes;
-	GLboolean LsbFirst;
+   GLint Alignment;
+   GLint RowLength;
+   GLint SkipPixels;
+   GLint SkipRows;
+   GLint ImageHeight;     /* for GL_EXT_texture3D */
+   GLint SkipImages;      /* for GL_EXT_texture3D */
+   GLboolean SwapBytes;
+   GLboolean LsbFirst;
 };
 
 
@@ -944,37 +1031,37 @@
 
 
 struct gl_array_attrib {
-	struct gl_client_array Vertex;	     /* client data descriptors */
-	struct gl_client_array Normal;
-	struct gl_client_array Color;
-	struct gl_client_array Index;
-	struct gl_client_array TexCoord[MAX_TEXTURE_UNITS];
-	struct gl_client_array EdgeFlag;
-
-	trans_4f_func  VertexFunc;       /* conversion functions */
-	trans_3f_func  NormalFunc;  
-	trans_4ub_func ColorFunc;   
-	trans_1ui_func IndexFunc;
-	trans_4f_func  TexCoordFunc[MAX_TEXTURE_UNITS];
-	trans_1ub_func EdgeFlagFunc;
-
-	trans_elt_4f_func  VertexEltFunc; /* array elt conversion functions */
-	trans_elt_3f_func  NormalEltFunc;  
-	trans_elt_4ub_func ColorEltFunc;   
-	trans_elt_1ui_func IndexEltFunc;
-	trans_elt_4f_func  TexCoordEltFunc[MAX_TEXTURE_UNITS];
-	trans_elt_1ub_func EdgeFlagEltFunc;
+   struct gl_client_array Vertex;	     /* client data descriptors */
+   struct gl_client_array Normal;
+   struct gl_client_array Color;
+   struct gl_client_array Index;
+   struct gl_client_array TexCoord[MAX_TEXTURE_UNITS];
+   struct gl_client_array EdgeFlag;
+
+   trans_4f_func  VertexFunc;       /* conversion functions */
+   trans_3f_func  NormalFunc;  
+   trans_4ub_func ColorFunc;   
+   trans_1ui_func IndexFunc;
+   trans_4f_func  TexCoordFunc[MAX_TEXTURE_UNITS];
+   trans_1ub_func EdgeFlagFunc;
+
+   trans_elt_4f_func  VertexEltFunc; /* array elt conversion functions */
+   trans_elt_3f_func  NormalEltFunc;  
+   trans_elt_4ub_func ColorEltFunc;   
+   trans_elt_1ui_func IndexEltFunc;
+   trans_elt_4f_func  TexCoordEltFunc[MAX_TEXTURE_UNITS];
+   trans_elt_1ub_func EdgeFlagEltFunc;
 
-	GLint TexCoordInterleaveFactor;
-	GLint ActiveTexture;		/* Client Active Texture */
+   GLint TexCoordInterleaveFactor;
+   GLint ActiveTexture;		/* Client Active Texture */
 
-	GLuint LockFirst;
-	GLuint LockCount;
+   GLuint LockFirst;
+   GLuint LockCount;
 	
-	GLuint Flag[VB_SIZE];	/* crock */
-      	GLuint Flags;
-	GLuint Summary;		/* Like flags, but no size information */
-	GLuint NewArrayState;	/* Tracks which arrays have been changed. */
+   GLuint Flag[VB_SIZE];	/* crock */
+   GLuint Flags;
+   GLuint Summary;		/* Like flags, but no size information */
+   GLuint NewArrayState;	/* Tracks which arrays have been changed. */
 };
 
 
@@ -982,11 +1069,11 @@
  * arrays (with zero StrideB).
  */
 struct gl_fallback_arrays {
-	struct gl_client_array Normal;
-	struct gl_client_array Color;
-	struct gl_client_array Index;
-	struct gl_client_array TexCoord[MAX_TEXTURE_UNITS];
-	struct gl_client_array EdgeFlag;
+   struct gl_client_array Normal;
+   struct gl_client_array Color;
+   struct gl_client_array Index;
+   struct gl_client_array TexCoord[MAX_TEXTURE_UNITS];
+   struct gl_client_array EdgeFlag;
 };
 
 #define MAX_PIPELINE_STAGES     30
@@ -1010,10 +1097,10 @@
  * point/line/tri primitives.
  */
 struct gl_prim_state {
-	GLuint v0, v1;
-	GLboolean draw;
-	GLboolean finish_loop;	/* not used... */
-	struct gl_prim_state *next;
+   GLuint v0, v1;
+   GLboolean draw;
+   GLboolean finish_loop;	/* not used... */
+   struct gl_prim_state *next;
 };
 
 
@@ -1021,88 +1108,88 @@
 typedef void (*ctx_func)( GLcontext * );
 
 struct gl_pipeline_stage {
-	const char *name;
-	GLuint ops;		     /* PIPE_OP flags */
-	GLuint type;		     /* PIPE flags */
-	GLuint special;		     /* PIPE flags - force update_inputs() */
-	GLuint state_change;	     /* state flags - trigger update_inputs() */
-	GLuint cva_state_change;     /* state flags - recalc cva buffer */
-	GLuint elt_forbidden_inputs; /* VERT flags - force a pipeline recalc */
-	GLuint pre_forbidden_inputs; /* VERT flags - force a pipeline recalc */
-	GLuint active;		     /* PIPE flags */
-	GLuint inputs;		     /* VERT flags */
-	GLuint outputs;		     /* VERT flags */
-	void (*check)( GLcontext *ctx, struct gl_pipeline_stage * );
-	void (*run)( struct vertex_buffer *VB );
+   const char *name;
+   GLuint ops;			/* PIPE_OP flags */
+   GLuint type;			/* PIPE flags */
+   GLuint special;		/* PIPE flags - force update_inputs() */
+   GLuint state_change;	        /* state flags - trigger update_inputs() */
+   GLuint cva_state_change;          /* state flags - recalc cva buffer */
+   GLuint elt_forbidden_inputs;      /* VERT flags - force a pipeline recalc */
+   GLuint pre_forbidden_inputs;	     /* VERT flags - force a pipeline recalc */
+   GLuint active;		     /* PIPE flags */
+   GLuint inputs;		     /* VERT flags */
+   GLuint outputs;		     /* VERT flags */
+   void (*check)( GLcontext *ctx, struct gl_pipeline_stage * );
+   void (*run)( struct vertex_buffer *VB );
 };
 
 
 struct gl_pipeline {
-	GLuint state_change;	 /* state changes which require recalc */
-	GLuint cva_state_change; /* ... which require re-run */
-	GLuint forbidden_inputs; /* inputs which require recalc */
-	GLuint ops;		 /* what gets done in this pipe */
-	GLuint changed_ops;
-	GLuint inputs;
-	GLuint outputs;
-	GLuint new_inputs;
-	GLuint new_outputs;
-	GLuint fallback;
-	GLuint type;
-	GLuint pipeline_valid:1;
-	GLuint data_valid:1;
-	GLuint copy_transformed_data:1;
-	GLuint replay_copied_vertices:1;
-	GLuint new_state;	 /* state changes since last recalc */
-	struct gl_pipeline_stage *stages[MAX_PIPELINE_STAGES];
+   GLuint state_change;		/* state changes which require recalc */
+   GLuint cva_state_change;	/* ... which require re-run */
+   GLuint forbidden_inputs;	/* inputs which require recalc */
+   GLuint ops;			/* what gets done in this pipe */
+   GLuint changed_ops;
+   GLuint inputs;
+   GLuint outputs;
+   GLuint new_inputs;
+   GLuint new_outputs;
+   GLuint fallback;
+   GLuint type;
+   GLuint pipeline_valid:1;
+   GLuint data_valid:1;
+   GLuint copy_transformed_data:1;
+   GLuint replay_copied_vertices:1;
+   GLuint new_state;		/* state changes since last recalc */
+   struct gl_pipeline_stage *stages[MAX_PIPELINE_STAGES];
 };
 
 
 struct gl_cva {
-	struct gl_pipeline pre;
-	struct gl_pipeline elt;
+   struct gl_pipeline pre;
+   struct gl_pipeline elt;
 	
-	struct gl_client_array Elt;
-	trans_1ui_func EltFunc;
+   struct gl_client_array Elt;
+   trans_1ui_func EltFunc;
 
-	struct vertex_buffer *VB;
-	struct vertex_arrays v;
-	struct vertex_data store;
-
-	GLuint elt_count;
-	GLenum elt_mode;
-	GLuint elt_size;
-
-	GLuint forbidden_inputs;
-	GLuint orflag;
-	GLuint merge;
-
-	GLuint lock_changed;
-	GLuint last_orflag;
-	GLuint last_array_flags;
-	GLuint last_array_new_state;
+   struct vertex_buffer *VB;
+   struct vertex_arrays v;
+   struct vertex_data store;
+
+   GLuint elt_count;
+   GLenum elt_mode;
+   GLuint elt_size;
+
+   GLuint forbidden_inputs;
+   GLuint orflag;
+   GLuint merge;
+
+   GLuint lock_changed;
+   GLuint last_orflag;
+   GLuint last_array_flags;
+   GLuint last_array_new_state;
 };
 
 
 struct gl_feedback {
-	GLenum Type;
-	GLuint Mask;
-	GLfloat *Buffer;
-	GLuint BufferSize;
-	GLuint Count;
+   GLenum Type;
+   GLuint Mask;
+   GLfloat *Buffer;
+   GLuint BufferSize;
+   GLuint Count;
 };
 
 
 
 struct gl_selection {
-	GLuint *Buffer;
-	GLuint BufferSize;	/* size of SelectBuffer */
-	GLuint BufferCount;	/* number of values in SelectBuffer */
-	GLuint Hits;		/* number of records in SelectBuffer */
-	GLuint NameStackDepth;
-	GLuint NameStack[MAX_NAME_STACK_DEPTH];
-	GLboolean HitFlag;
-	GLfloat HitMinZ, HitMaxZ;
+   GLuint *Buffer;
+   GLuint BufferSize;	/* size of SelectBuffer */
+   GLuint BufferCount;	/* number of values in SelectBuffer */
+   GLuint Hits;		/* number of records in SelectBuffer */
+   GLuint NameStackDepth;
+   GLuint NameStack[MAX_NAME_STACK_DEPTH];
+   GLboolean HitFlag;
+   GLfloat HitMinZ, HitMaxZ;
 };
 
 
@@ -1111,9 +1198,9 @@
  * 1-D Evaluator control points
  */
 struct gl_1d_map {
-	GLuint Order;		/* Number of control points */
-	GLfloat u1, u2, du;	/* u1, u2, 1.0/(u2-u1) */
-	GLfloat *Points;	/* Points to contiguous control points */
+   GLuint Order;	/* Number of control points */
+   GLfloat u1, u2, du;	/* u1, u2, 1.0/(u2-u1) */
+   GLfloat *Points;	/* Points to contiguous control points */
 };
 	
 
@@ -1121,11 +1208,11 @@
  * 2-D Evaluator control points
  */
 struct gl_2d_map {
-	GLuint Uorder;		/* Number of control points in U dimension */
-	GLuint Vorder;		/* Number of control points in V dimension */
-	GLfloat u1, u2, du;
-	GLfloat v1, v2, dv;
-	GLfloat *Points;	/* Points to contiguous control points */
+   GLuint Uorder;		/* Number of control points in U dimension */
+   GLuint Vorder;		/* Number of control points in V dimension */
+   GLfloat u1, u2, du;
+   GLfloat v1, v2, dv;
+   GLfloat *Points;		/* Points to contiguous control points */
 };
 
 
@@ -1133,27 +1220,27 @@
  * All evalutator control points
  */
 struct gl_evaluators {
-	/* 1-D maps */
-	struct gl_1d_map Map1Vertex3;
-	struct gl_1d_map Map1Vertex4;
-	struct gl_1d_map Map1Index;
-	struct gl_1d_map Map1Color4;
-	struct gl_1d_map Map1Normal;
-	struct gl_1d_map Map1Texture1;
-	struct gl_1d_map Map1Texture2;
-	struct gl_1d_map Map1Texture3;
-	struct gl_1d_map Map1Texture4;
-
-	/* 2-D maps */
-	struct gl_2d_map Map2Vertex3;
-	struct gl_2d_map Map2Vertex4;
-	struct gl_2d_map Map2Index;
-	struct gl_2d_map Map2Color4;
-	struct gl_2d_map Map2Normal;
-	struct gl_2d_map Map2Texture1;
-	struct gl_2d_map Map2Texture2;
-	struct gl_2d_map Map2Texture3;
-	struct gl_2d_map Map2Texture4;
+   /* 1-D maps */
+   struct gl_1d_map Map1Vertex3;
+   struct gl_1d_map Map1Vertex4;
+   struct gl_1d_map Map1Index;
+   struct gl_1d_map Map1Color4;
+   struct gl_1d_map Map1Normal;
+   struct gl_1d_map Map1Texture1;
+   struct gl_1d_map Map1Texture2;
+   struct gl_1d_map Map1Texture3;
+   struct gl_1d_map Map1Texture4;
+
+   /* 2-D maps */
+   struct gl_2d_map Map2Vertex3;
+   struct gl_2d_map Map2Vertex4;
+   struct gl_2d_map Map2Index;
+   struct gl_2d_map Map2Color4;
+   struct gl_2d_map Map2Normal;
+   struct gl_2d_map Map2Texture1;
+   struct gl_2d_map Map2Texture2;
+   struct gl_2d_map Map2Texture3;
+   struct gl_2d_map Map2Texture4;
 };
 
 
@@ -1171,6 +1258,7 @@
 
    /* Default texture objects (shared by all multi-texture units) */
    struct gl_texture_object *DefaultD[4];
+   struct gl_texture_object *DefaultCubeMap;
 };
 
 
@@ -1192,11 +1280,16 @@
 
    GLint IndexBits;		/* Bits/pixel if in color index mode */
 
-   GLint AccumBits;		/* Number of bits per color channel, or 0 */
+   GLint AccumRedBits;		/* Number of bits in red accum channel */
+   GLint AccumGreenBits;	/* Number of bits in green accum channel */
+   GLint AccumBlueBits;		/* Number of bits in blue accum channel */
+   GLint AccumAlphaBits;	/* Number of bits in alpha accum channel */
    GLint DepthBits;		/* Number of bits in depth buffer, or 0 */
    GLint StencilBits;		/* Number of bits in stencil buffer, or 0 */
+   GLint NumSamples;            /* Samples/pixel for multisampling */
 
-   GLboolean SoftwareAlpha;	/* Implement software alpha buffer? */
+   GLuint DepthMax;		/* Max depth buffer value */
+   GLfloat DepthMaxF;		/* Float max depth buffer value */
 };
 
 
@@ -1218,7 +1311,7 @@
    GLboolean UseSoftwareAlphaBuffers;
 
    /* Software depth (aka Z) buffer */
-   GLdepth *Depth;		/* array [Width*Height] of GLdepth values */
+   GLvoid *DepthBuffer;		/* array [Width*Height] of GLushort or GLuint*/
 
    /* Software stencil buffer */
    GLstencil *Stencil;		/* array [Width*Height] of GLstencil values */
@@ -1234,7 +1327,7 @@
    GLubyte *Alpha;		/* Points to current alpha buffer */
 
    /* Drawing bounds: intersection of window size and scissor box */
-   GLint Xmin, Xmax, Ymin, Ymax;
+   GLint Xmin, Xmax, Ymin, Ymax;  /* [Xmin,Xmax] X [Ymin,Ymax] */
 };
 
 
@@ -1243,6 +1336,7 @@
  */
 struct gl_constants {
    GLint MaxTextureSize;
+   GLint MaxCubeTextureSize;
    GLint MaxTextureLevels;
    GLuint MaxTextureUnits;
    GLuint MaxArrayLockSize;
@@ -1254,6 +1348,11 @@
    GLfloat MinLineWidthAA, MaxLineWidthAA;	/* antialiased */
    GLfloat LineWidthGranularity;
    GLuint NumAuxBuffers;
+   GLuint MaxColorTableSize;
+   GLuint MaxConvolutionWidth;
+   GLuint MaxConvolutionHeight;
+   GLuint NumCompressedTextureFormats;	/* GL_ARB_texture_compression */
+   GLenum CompressedTextureFormats[MAX_COMPRESSED_TEXTURE_FORMATS];
 };
 
 
@@ -1264,6 +1363,15 @@
 struct gl_extensions {
    char *ext_string;
    struct extension *ext_list;
+   /* flags to quickly test if certain extensions are available */
+   GLboolean HaveTextureEnvAdd;
+   GLboolean HaveTextureLodBias;
+   GLboolean HaveHpOcclusionTest;
+   GLboolean HaveTextureCubeMap;
+   GLboolean HaveTextureCompression;
+   GLboolean HaveTextureCompressionS3TC;
+   GLboolean HaveTextureCompressionFXT1;
+   GLboolean HaveBlendSquare;
 };
 
 
@@ -1282,6 +1390,9 @@
 #define WINCLIP_BIT		0x200	/* Clip pixels/primitives to window */
 #define MULTI_DRAW_BIT		0x400	/* Write to more than one color- */
                                         /* buffer or no buffers. */
+#define OCCLUSION_BIT           0x800   /* GL_HP_occlusion_test enabled */
+#define TEXTURE_BIT		0x1000	/* Texturing really enabled */
+
 
 /*
  * Bits to indicate what state has to be updated (NewState)
@@ -1304,6 +1415,7 @@
 #define NEW_NORMAL_TRANSFORM    0x8000
 #define NEW_VIEWPORT            0x10000
 #define NEW_TEXTURE_ENABLE      0x20000
+#define NEW_COLOR_MATRIX        0x40000
 #define NEW_ALL		        ~0
 
 
@@ -1338,7 +1450,10 @@
 #define DD_TRI_CULL_FRONT_BACK      0x400000 /* not supported by most drivers */
 #define DD_Z_NEVER                  0x800000 
 #define DD_STENCIL                  0x1000000 
+#define DD_CLIP_FOG_COORD           0x2000000
 
+
+
 #define DD_SW_SETUP           (DD_TRI_CULL|		\
                                DD_TRI_CULL_FRONT_BACK|	\
                                DD_TRI_OFFSET|		\
@@ -1540,7 +1655,8 @@
 #define VERT_EVAL_C2         0x2000000  /*    - or just use 3 bits */
 #define VERT_EVAL_P1         0x4000000  /*  */
 #define VERT_EVAL_P2         0x8000000  /*  */
-#define VERT_FLOAT_RGBA      0x10000000	/* allow partial support for this */
+#define VERT_SPEC_RGB        0x10000000	
+#define VERT_FOG_COORD       0x20000000	/* internal use only, currently */
 
 #define VERT_EYE             VERT_BEGIN /* for pipeline management & cva */
 #define VERT_WIN             VERT_END   /* some overlaps can be tolerated */
@@ -1591,7 +1707,7 @@
 #define VERT_DATA          (VERT_TEX0_ANY|VERT_TEX1_ANY|VERT_RGBA| \
 			    VERT_INDEX|VERT_EDGE|VERT_NORM| \
 	                    VERT_OBJ_ANY|VERT_MATERIAL|VERT_ELT| \
-	                    VERT_EVAL_ANY)
+	                    VERT_EVAL_ANY|VERT_FOG_COORD)
 
 
 #define VERT_TO_PIPE      (~VERT_END_VB)
@@ -1626,233 +1742,232 @@
  */
 
 struct gl_context {
-	/* State possibly shared with other contexts in the address space */
-	struct gl_shared_state *Shared;
+   /* State possibly shared with other contexts in the address space */
+   struct gl_shared_state *Shared;
 
-	/* API function pointer tables */
-	struct _glapi_table *Save;	/* Display list save funcs */
-	struct _glapi_table *Exec;	/* Execute funcs */
-        struct _glapi_table *CurrentDispatch;  /* == Save or Exec !! */
-
-        GLvisual *Visual;
-        GLframebuffer *DrawBuffer;	/* buffer for writing */
-        GLframebuffer *ReadBuffer;	/* buffer for reading */
+   /* API function pointer tables */
+   struct _glapi_table *Save;	/* Display list save funcs */
+   struct _glapi_table *Exec;	/* Execute funcs */
+   struct _glapi_table *CurrentDispatch;  /* == Save or Exec !! */
+
+   GLvisual *Visual;
+   GLframebuffer *DrawBuffer;	/* buffer for writing */
+   GLframebuffer *ReadBuffer;	/* buffer for reading */
 
-	/* Driver function pointer table */
-	struct dd_function_table Driver;
+   /* Driver function pointer table */
+   struct dd_function_table Driver;
 	
-        triangle_func TriangleFunc; /* driver or indirect triangle func */
-        quad_func     QuadFunc;
-        triangle_func ClippedTriangleFunc;
-	clip_poly_func *poly_clip_tab;
-	clip_line_func *line_clip_tab;
-
-	void *DriverCtx;	/* Points to device driver context/state */
-	void *DriverMgrCtx;	/* Points to device driver manager (optional)*/
-
-	/* Core/Driver constants */
-	struct gl_constants Const;
-
-	/* Modelview matrix and stack */
-	GLmatrix ModelView;           /* current matrix, not stored on stack */
-	GLuint ModelViewStackDepth;
-	GLmatrix ModelViewStack[MAX_MODELVIEW_STACK_DEPTH - 1];
-
-	/* Projection matrix and stack */
-	GLmatrix ProjectionMatrix;    /* current matrix, not stored on stack */
-	GLuint ProjectionStackDepth;
-	GLmatrix ProjectionStack[MAX_PROJECTION_STACK_DEPTH - 1];
-	GLfloat NearFarStack[MAX_PROJECTION_STACK_DEPTH - 1][2];
-
-        /* Combined modelview and projection matrix */
-        GLmatrix ModelProjectMatrix;
-
-        /* Combined modelview, projection and window matrix */
-        GLmatrix ModelProjectWinMatrix;
-        GLboolean ModelProjectWinMatrixUptodate;
-
-	/* Texture matrix and stack */
-	GLmatrix TextureMatrix[MAX_TEXTURE_UNITS];
-	GLuint TextureStackDepth[MAX_TEXTURE_UNITS];
-	GLmatrix TextureStack[MAX_TEXTURE_UNITS][MAX_TEXTURE_STACK_DEPTH - 1];
-
-	/* Display lists */
-	GLuint CallDepth;	/* Current recursion calling depth */
-	GLboolean ExecuteFlag;	/* Execute GL commands? */
-	GLboolean CompileFlag;	/* Compile GL commands into display list? */
-	GLboolean CompileCVAFlag;
-	Node *CurrentListPtr;	/* Head of list being compiled */
-	GLuint CurrentListNum;	/* Number of the list being compiled */
-	Node *CurrentBlock;	/* Pointer to current block of nodes */
-	GLuint CurrentPos;	/* Index into current block of nodes */
-
-	/* Extensions */
-	struct gl_extensions Extensions;
-
-
-	/* Pipeline stages - shared between the two pipelines,
-	 * which live in CVA.
-	 */
-	struct gl_pipeline_stage PipelineStage[MAX_PIPELINE_STAGES];
-	GLuint NrPipelineStages;
-
-	/* Cva */
-	struct gl_cva CVA;
-
-	/* Renderer attribute stack */
-	GLuint AttribStackDepth;
-	struct gl_attrib_node *AttribStack[MAX_ATTRIB_STACK_DEPTH];
-
-	/* Renderer attribute groups */
-	struct gl_accum_attrib		Accum;
-	struct gl_colorbuffer_attrib	Color;
-	struct gl_current_attrib	Current;
-	struct gl_depthbuffer_attrib	Depth;
-	struct gl_eval_attrib		Eval;
-	struct gl_fog_attrib		Fog;
-	struct gl_hint_attrib		Hint;
-	struct gl_light_attrib		Light;
-	struct gl_line_attrib		Line;
-	struct gl_list_attrib		List;
-	struct gl_pixel_attrib		Pixel;
-	struct gl_point_attrib		Point;
-	struct gl_polygon_attrib	Polygon;
-	GLuint PolygonStipple[32];
-	struct gl_scissor_attrib	Scissor;
-	struct gl_stencil_attrib	Stencil;
-	struct gl_texture_attrib	Texture;
-	struct gl_transform_attrib	Transform;
-	struct gl_viewport_attrib	Viewport;
-
-	/* Client attribute stack */
-	GLuint ClientAttribStackDepth;
-	struct gl_attrib_node *ClientAttribStack[MAX_CLIENT_ATTRIB_STACK_DEPTH];
-
-	/* Client attribute groups */
-	struct gl_array_attrib		Array;	/* Vertex arrays */
-	struct gl_pixelstore_attrib	Pack;	/* Pixel packing */
-	struct gl_pixelstore_attrib	Unpack;	/* Pixel unpacking */
-
-	struct gl_evaluators EvalMap;	/* All evaluators */
-	struct gl_feedback Feedback;	/* Feedback */
-	struct gl_selection Select;	/* Selection */
-
-	/* Optimized Accumulation buffer info */
-	GLboolean IntegerAccumMode;	/* Storing unscaled integers? */
-	GLfloat IntegerAccumScaler;	/* Implicit scale factor */
-
-
-	struct gl_fallback_arrays Fallback; 
-
-	GLenum ErrorValue;		/* Last error code */
-
-	/* Miscellaneous */
-        GLuint NewState;        /* bitwise OR of NEW_* flags */
-	GLuint Enabled;         /* bitwise or of ENABLE_* flags */
-	GLenum RenderMode;	/* either GL_RENDER, GL_SELECT, GL_FEEDBACK */
-	GLuint StippleCounter;	/* Line stipple counter */
-	GLuint RasterMask;	/* OR of rasterization flags */
-	GLuint TriangleCaps;      /* OR of DD_* flags */
-	GLuint IndirectTriangles; /* TriangleCaps not handled by the driver */
-	GLfloat PolygonZoffset;	/* Z offset for GL_FILL polygons */
-	GLfloat LineZoffset;	/* Z offset for GL_LINE polygons */
-	GLfloat PointZoffset;	/* Z offset for GL_POINT polygons */
-	GLboolean NeedNormals;	/* Are vertex normal vectors needed? */
-        GLboolean MutablePixels;/* Can rasterization change pixel's color? */
-        GLboolean MonoPixels;   /* Are all pixels likely to be same color? */
-	GLuint FogMode;         /* FOG_OFF, FOG_VERTEX or FOG_FRAGMENT */
-
-	GLboolean DoViewportMapping;
-
-
-        GLuint RenderFlags;	/* Active inputs to render stage */
-
-	GLuint RequireWriteableFlags; /* What can the driver/clipping tolerate? */
-
-	/* Points to function which interpolates colors, etc when clipping */
-	clip_interp_func ClipInterpFunc;
-	GLuint ClipTabMask;
-
-        normal_func *NormalTransform; 
-
-	/* Current shading function */
-        GLuint shade_func_flags;
-
-        GLfloat EyeZDir[3];
-        GLfloat rescale_factor;
-
-	GLfloat vb_rescale_factor;
-	GLmatrix *vb_proj_matrix;
-
-	GLubyte   AllowVertexCull; /* To be set by the geometry driver */
-        GLboolean NeedEyeCoords;
-        GLboolean NeedEyeNormals;
-        GLboolean NeedClipCoords;
-
-	GLfloat backface_sign;
-
-        /* Destination of immediate mode commands */
-        struct immediate *input;
-
-
-	/* Cache of unused immediate structs
-	 */
-	struct immediate *freed_im_queue;
-	GLuint nr_im_queued;
-
-        /* The vertex buffer being used by this context.
-	 */
-        struct vertex_buffer *VB;
+   triangle_func TriangleFunc; /* driver or indirect triangle func */
+   quad_func     QuadFunc;
+   triangle_func ClippedTriangleFunc;
+   clip_poly_func *poly_clip_tab;
+   clip_line_func *line_clip_tab;
+
+   void *DriverCtx;	/* Points to device driver context/state */
+   void *DriverMgrCtx;	/* Points to device driver manager (optional)*/
+
+   /* Core/Driver constants */
+   struct gl_constants Const;
+
+   /* Modelview matrix and stack */
+   GLmatrix ModelView;           /* current matrix, not stored on stack */
+   GLuint ModelViewStackDepth;
+   GLmatrix ModelViewStack[MAX_MODELVIEW_STACK_DEPTH - 1];
+
+   /* Projection matrix and stack */
+   GLmatrix ProjectionMatrix;    /* current matrix, not stored on stack */
+   GLuint ProjectionStackDepth;
+   GLmatrix ProjectionStack[MAX_PROJECTION_STACK_DEPTH - 1];
+   GLfloat NearFarStack[MAX_PROJECTION_STACK_DEPTH - 1][2];
+
+   /* Combined modelview and projection matrix */
+   GLmatrix ModelProjectMatrix;
+
+   /* Combined modelview, projection and window matrix */
+   GLmatrix ModelProjectWinMatrix;
+   GLboolean ModelProjectWinMatrixUptodate;
+
+   /* Texture matrix and stack */
+   GLmatrix TextureMatrix[MAX_TEXTURE_UNITS];
+   GLuint TextureStackDepth[MAX_TEXTURE_UNITS];
+   GLmatrix TextureStack[MAX_TEXTURE_UNITS][MAX_TEXTURE_STACK_DEPTH - 1];
+
+   /* Color matrix and stack */
+   GLmatrix ColorMatrix;
+   GLuint ColorStackDepth;
+   GLmatrix ColorStack[MAX_COLOR_STACK_DEPTH - 1];
+
+   /* Display lists */
+   GLuint CallDepth;		/* Current recursion calling depth */
+   GLboolean ExecuteFlag;	/* Execute GL commands? */
+   GLboolean CompileFlag;	/* Compile GL commands into display list? */
+   GLboolean CompileCVAFlag;
+   Node *CurrentListPtr;	/* Head of list being compiled */
+   GLuint CurrentListNum;	/* Number of the list being compiled */
+   Node *CurrentBlock;		/* Pointer to current block of nodes */
+   GLuint CurrentPos;		/* Index into current block of nodes */
+
+   /* Extensions */
+   struct gl_extensions Extensions;
+
+
+   /* Pipeline stages - shared between the two pipelines,
+    * which live in CVA.
+    */
+   struct gl_pipeline_stage PipelineStage[MAX_PIPELINE_STAGES];
+   GLuint NrPipelineStages;
+
+   /* Cva */
+   struct gl_cva CVA;
+
+   /* Renderer attribute stack */
+   GLuint AttribStackDepth;
+   struct gl_attrib_node *AttribStack[MAX_ATTRIB_STACK_DEPTH];
+
+   /* Renderer attribute groups */
+   struct gl_accum_attrib		Accum;
+   struct gl_colorbuffer_attrib	Color;
+   struct gl_current_attrib	Current;
+   struct gl_depthbuffer_attrib	Depth;
+   struct gl_eval_attrib		Eval;
+   struct gl_fog_attrib		Fog;
+   struct gl_hint_attrib		Hint;
+   struct gl_light_attrib		Light;
+   struct gl_line_attrib		Line;
+   struct gl_list_attrib		List;
+   struct gl_pixel_attrib		Pixel;
+   struct gl_point_attrib		Point;
+   struct gl_polygon_attrib	Polygon;
+   GLuint PolygonStipple[32];
+   struct gl_scissor_attrib	Scissor;
+   struct gl_stencil_attrib	Stencil;
+   struct gl_texture_attrib	Texture;
+   struct gl_transform_attrib	Transform;
+   struct gl_viewport_attrib	Viewport;
+
+   /* Other attribute groups */
+   struct gl_histogram_attrib	Histogram;
+   struct gl_minmax_attrib		MinMax;
+   struct gl_convolution_attrib    Convolution1D;
+   struct gl_convolution_attrib    Convolution2D;
+   struct gl_convolution_attrib    Separable2D;
+
+   /* Client attribute stack */
+   GLuint ClientAttribStackDepth;
+   struct gl_attrib_node *ClientAttribStack[MAX_CLIENT_ATTRIB_STACK_DEPTH];
+
+   /* Client attribute groups */
+   struct gl_array_attrib		Array;	/* Vertex arrays */
+   struct gl_pixelstore_attrib	Pack;	/* Pixel packing */
+   struct gl_pixelstore_attrib	Unpack;	/* Pixel unpacking */
+
+   struct gl_evaluators EvalMap;	/* All evaluators */
+   struct gl_feedback Feedback;	/* Feedback */
+   struct gl_selection Select;	/* Selection */
+
+   struct gl_color_table ColorTable;       /* Pre-convolution */
+   struct gl_color_table ProxyColorTable;  /* Pre-convolution */
+   struct gl_color_table PostConvolutionColorTable;
+   struct gl_color_table ProxyPostConvolutionColorTable;
+   struct gl_color_table PostColorMatrixColorTable;
+   struct gl_color_table ProxyPostColorMatrixColorTable;
+
+   /* Optimized Accumulation buffer info */
+   GLboolean IntegerAccumMode;	/* Storing unscaled integers? */
+   GLfloat IntegerAccumScaler;	/* Implicit scale factor */
+
+   struct gl_fallback_arrays Fallback; 
+
+   GLenum ErrorValue;		/* Last error code */
+
+   /* Miscellaneous */
+   GLuint NewState;        /* bitwise OR of NEW_* flags */
+   GLuint Enabled;         /* bitwise or of ENABLE_* flags */
+   GLenum RenderMode;	/* either GL_RENDER, GL_SELECT, GL_FEEDBACK */
+   GLuint StippleCounter;	/* Line stipple counter */
+   GLuint RasterMask;	/* OR of rasterization flags */
+   GLuint TriangleCaps;      /* OR of DD_* flags */
+   GLuint IndirectTriangles; /* TriangleCaps not handled by the driver */
+   GLfloat PolygonZoffset;	/* Z offset for GL_FILL polygons */
+   GLfloat LineZoffset;	/* Z offset for GL_LINE polygons */
+   GLfloat PointZoffset;	/* Z offset for GL_POINT polygons */
+   GLboolean NeedNormals;	/* Are vertex normal vectors needed? */
+   GLuint FogMode;         /* FOG_OFF, FOG_VERTEX or FOG_FRAGMENT */
+
+   GLboolean DoViewportMapping;
+
+   GLuint RenderFlags;	/* Active inputs to render stage */
+
+   GLuint RequireWriteableFlags; /* What can the driver/clipping tolerate? */
+
+   /* Points to function which interpolates colors, etc when clipping */
+   clip_interp_func ClipInterpFunc;
+   GLuint ClipTabMask;
+
+   normal_func *NormalTransform; 
+
+   /* Current shading function */
+   GLuint shade_func_flags;
+
+   GLfloat EyeZDir[3];
+   GLfloat rescale_factor;
+
+   GLfloat vb_rescale_factor;
+   GLmatrix *vb_proj_matrix;
+
+   GLubyte   AllowVertexCull; /* To be set by the geometry driver */
+   GLboolean NeedEyeCoords;
+   GLboolean NeedEyeNormals;
+   GLboolean NeedClipCoords;
+
+   GLfloat backface_sign;
+
+   GLboolean OcclusionResult;  /* GL_HP_occlusion_test */
+   GLboolean OcclusionResultSaved;  /* GL_HP_occlusion_test */
+
+   /* Destination of immediate mode commands */
+   struct immediate *input;
+
+
+   /* Cache of unused immediate structs
+    */
+   struct immediate *freed_im_queue;
+   GLuint nr_im_queued;
+
+   /* The vertex buffer being used by this context.
+    */
+   struct vertex_buffer *VB;
    
-        /* The pixel buffer being used by this context */
-        struct pixel_buffer* PB;
+   /* The pixel buffer being used by this context */
+   struct pixel_buffer* PB;
 
-        struct gl_shine_tab *ShineTable[4];  /* Active shine tables */
-        struct gl_shine_tab *ShineTabList;   /* Mru list of inactive shine tables */
+   struct gl_shine_tab *ShineTable[4];  /* Active shine tables */
+   struct gl_shine_tab *ShineTabList;   /* Mru list of inactive shine tables */
 
-
-#ifdef PROFILE
-        /* Performance measurements */
-        GLuint BeginEndCount;	/* number of glBegin/glEnd pairs */
-        GLdouble BeginEndTime;	/* seconds spent between glBegin/glEnd */
-        GLuint VertexCount;	/* number of vertices processed */
-        GLdouble VertexTime;	/* total time in seconds */
-        GLuint PointCount;	/* number of points rendered */
-        GLdouble PointTime;	/* total time in seconds */
-        GLuint LineCount;	/* number of lines rendered */
-        GLdouble LineTime;	/* total time in seconds */
-        GLuint PolygonCount;	/* number of polygons rendered */
-        GLdouble PolygonTime;	/* total time in seconds */
-        GLuint ClearCount;	/* number of glClear calls */
-        GLdouble ClearTime;	/* seconds spent in glClear */
-        GLuint SwapCount;	/* number of swap-buffer calls */
-        GLdouble SwapTime;	/* seconds spent in swap-buffers */
-#endif
-
-
-        /* Should 3Dfx Glide driver catch signals? */
-        GLboolean CatchSignals;
+   /* Should 3Dfx Glide driver catch signals? */
+   GLboolean CatchSignals;
         
-        /* For debugging/development only */
-        GLboolean NoRaster;
-        GLboolean FirstTimeCurrent;
+   /* For debugging/development only */
+   GLboolean NoRaster;
+   GLboolean FirstTimeCurrent;
 
-        /* Dither disable via MESA_NO_DITHER env var */
-        GLboolean NoDither;
+   /* Dither disable via MESA_NO_DITHER env var */
+   GLboolean NoDither;
 };
 
 
-#ifndef MESA_DEBUG
+#ifdef MESA_DEBUG
+extern int MESA_VERBOSE; 
+extern int MESA_DEBUG_FLAGS;
+#else
 # define MESA_VERBOSE 0
 # define MESA_DEBUG_FLAGS 0
 # ifndef NDEBUG
 #  define NDEBUG
 # endif
-#else
-extern int MESA_VERBOSE; 
-extern int MESA_DEBUG_FLAGS;
 #endif
 
+
 enum _verbose {
 	VERBOSE_VARRAY          = 0x1,
 	VERBOSE_TEXTURE         = 0x2,
@@ -1863,7 +1978,8 @@
 	VERBOSE_API             = 0x40,
 	VERBOSE_TRIANGLE_CHECKS = 0x80,
 	VERBOSE_CULL            = 0x100,
-	VERBOSE_DISPLAY_LIST    = 0x200
+	VERBOSE_DISPLAY_LIST    = 0x200,
+	VERBOSE_LIGHTING        = 0x400
 }; 
 
 
Index: xc/extras/Mesa/src/varray.c
diff -u xc/extras/Mesa/src/varray.c:1.3 xc/extras/Mesa/src/varray.c:1.4
--- xc/extras/Mesa/src/varray.c:1.3	Mon Feb 14 23:12:40 2000
+++ xc/extras/Mesa/src/varray.c	Fri Jun 16 17:02:18 2000
@@ -1,7 +1,7 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
  * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
@@ -369,6 +369,64 @@
 #endif
 
 
+
+void
+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
+                       GLsizei count, const GLvoid *ptr)
+{
+   (void) count;
+   printf("glVertexPointerEXT %p\n", ptr);
+   _mesa_VertexPointer(size, type, stride, ptr);
+}
+
+
+void
+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                       const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_NormalPointer(type, stride, ptr);
+}
+
+
+void
+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_ColorPointer(size, type, stride, ptr);
+}
+
+
+void
+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_IndexPointer(type, stride, ptr);
+}
+
+
+void
+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
+                         GLsizei count, const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_TexCoordPointer(size, type, stride, ptr);
+}
+
+
+void
+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)
+{
+   (void) count;
+   _mesa_EdgeFlagPointer(stride, ptr);
+}
+
+
+
+
+
 /* KW: Batch function to exec all the array elements in the input
  *     buffer prior to transform.  Done only the first time a vertex
  *     buffer is executed or compiled.
@@ -680,6 +738,7 @@
 
 	 VB->NextPrimitive[VB->CopyStart] = VB->Count;
 	 VB->Primitive[VB->CopyStart] = mode;
+	 ctx->Array.Flag[count] |= VERT_END_VB;
 
          /* Transform and render.
 	  */
@@ -815,7 +874,7 @@
       return;
    }
 
-   if (mode > GL_POLYGON) {
+   if (mode < 0 || mode > GL_POLYGON) {
       gl_error( ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );
       return;
    }
Index: xc/extras/Mesa/src/varray.h
diff -u xc/extras/Mesa/src/varray.h:1.3 xc/extras/Mesa/src/varray.h:1.4
--- xc/extras/Mesa/src/varray.h:1.3	Mon Feb 14 23:12:40 2000
+++ xc/extras/Mesa/src/varray.h	Fri Jun 16 17:02:18 2000
@@ -1,7 +1,7 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
  * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
@@ -55,6 +55,38 @@
 
 extern void
 _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);
+
+
+extern void
+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
+                       GLsizei count, const GLvoid *ptr);
+
+
+extern void
+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                       const GLvoid *ptr);
+
+
+extern void
+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr);
+
+
+extern void
+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr);
+
+
+extern void
+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
+                         GLsizei count, const GLvoid *ptr);
+
+
+extern void
+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
+
+
+
 
 
 extern void
Index: xc/extras/Mesa/src/vb.c
diff -u xc/extras/Mesa/src/vb.c:1.3 xc/extras/Mesa/src/vb.c:1.4
--- xc/extras/Mesa/src/vb.c:1.3	Mon Feb 14 23:12:40 2000
+++ xc/extras/Mesa/src/vb.c	Fri Jun 16 17:02:18 2000
@@ -271,7 +271,11 @@
    IM->Start = VB_START;	
    IM->Material = 0;
    IM->MaterialMask = 0;
-
+#ifdef VMS
+   for (j=0; j<VB_SIZE ; j++ )
+     IM->Normal[j][0] = IM->Normal[j][1] = IM->Normal[j][2] = 0.0;
+#endif
+   
    if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
       fprintf(stderr, "alloc immediate %d\n", id);
 
Index: xc/extras/Mesa/src/vbcull.c
diff -u xc/extras/Mesa/src/vbcull.c:1.3 xc/extras/Mesa/src/vbcull.c:1.4
--- xc/extras/Mesa/src/vbcull.c:1.3	Mon Feb 14 23:12:41 2000
+++ xc/extras/Mesa/src/vbcull.c	Fri Jun 16 17:02:18 2000
@@ -546,11 +546,6 @@
    return 0;
 }
 
-
-
-
-
-
 static void gl_fast_copy_noop( struct vertex_buffer *VB,
 			       GLuint start, GLuint count,
 			       GLuint ovf)
@@ -802,7 +797,7 @@
 GLuint gl_cull_vb( struct vertex_buffer *VB )
 {
    const GLcontext *ctx = VB->ctx;
-   GLuint i, next, prim, n;
+   GLuint i, next, prim = 0xffffffff, n;
    GLfloat (*proj)[4] = VB->Projected->data;
    GLuint *in_prim = VB->Primitive;
    GLuint *out_prim = VB->IM->Primitive;
Index: xc/extras/Mesa/src/vbcull.h
diff -u xc/extras/Mesa/src/vbcull.h:1.3 xc/extras/Mesa/src/vbcull.h:1.4
--- xc/extras/Mesa/src/vbcull.h:1.3	Mon Feb 14 23:12:41 2000
+++ xc/extras/Mesa/src/vbcull.h	Fri Jun 16 17:02:18 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,8 +24,6 @@
  */
 
 
-
-
 #ifndef VCULL_H
 #define VCULL_H
 
@@ -38,6 +36,7 @@
 extern GLuint gl_cull_vb( struct vertex_buffer *VB );
 
 extern void gl_dont_cull_vb( struct vertex_buffer *VB );
+
 extern void gl_fast_copy_vb( struct vertex_buffer *VB );
 
 extern void gl_make_normal_cullmask( struct vertex_buffer *VB );
Index: xc/extras/Mesa/src/vbfill.c
diff -u xc/extras/Mesa/src/vbfill.c:1.3 xc/extras/Mesa/src/vbfill.c:1.4
--- xc/extras/Mesa/src/vbfill.c:1.3	Mon Feb 14 23:12:41 2000
+++ xc/extras/Mesa/src/vbfill.c	Fri Jun 16 17:02:18 2000
@@ -57,7 +57,7 @@
 
 
 void
-_mesa_Begin(GLenum mode )
+_mesa_Begin( GLenum mode )
 {
    GET_CURRENT_CONTEXT(ctx);
 
@@ -70,7 +70,8 @@
 }
 
 
-void gl_Begin( GLcontext *ctx, GLenum p )
+void
+gl_Begin( GLcontext *ctx, GLenum p )
 {
    struct immediate *IM = ctx->input;
    GLuint inflags, state;
@@ -172,7 +173,8 @@
 }
 
 
-void gl_End( GLcontext *ctx )
+void
+gl_End( GLcontext *ctx )
 {
    struct immediate *IM = ctx->input;
    GLuint state = IM->BeginState;
@@ -221,7 +223,7 @@
  * to implement that mechanism to get good performance from
  * color-material and vertex arrays.  
  */
-#define COLOR( IM, r,g,b,a )			\
+#define COLOR( IM, r, g, b, a )			\
 {						\
    GLuint count = IM->Count;			\
    IM->Flag[count] |= VERT_RGBA;		\
@@ -231,28 +233,6 @@
    IM->Color[count][3] = a;			\
 }
 
-#if 0
-#define COLOR4F( IM, r,g,b,a )				\
-{							\
-   GLuint count = IM->Count;				\
-   IM->Flag[count] |= VERT_RGBA | VERT_FLOAT_RGBA;	\
-   IM->FloatColor[count][0] = r;			\
-   IM->FloatColor[count][1] = g;			\
-   IM->FloatColor[count][2] = b;			\
-   IM->FloatColor[count][3] = a;			\
-}
-#else
-#define COLOR4F(IM, r, g, b, a)			\
-{						\
-   GLubyte col[4];				\
-   FLOAT_COLOR_TO_UBYTE_COLOR(col[0], r);	\
-   FLOAT_COLOR_TO_UBYTE_COLOR(col[1], g);	\
-   FLOAT_COLOR_TO_UBYTE_COLOR(col[2], b);	\
-   FLOAT_COLOR_TO_UBYTE_COLOR(col[3], a);	\
-   COLORV( IM, col );				\
-}
-#endif
-
 #define COLORV( IM, v )				\
 {						\
    GLuint count = IM->Count;			\
@@ -262,19 +242,16 @@
 
 
 void
-_mesa_Color3b(GLbyte red, GLbyte green, GLbyte blue )
+_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue )
 {
    GET_IMMEDIATE;
-   COLOR( IM, 
-	  BYTE_TO_UBYTE(red), 
-	  BYTE_TO_UBYTE(green),
-	  BYTE_TO_UBYTE(blue),
-	  255 );
+   COLOR( IM, BYTE_TO_UBYTE(red), BYTE_TO_UBYTE(green),
+          BYTE_TO_UBYTE(blue), 255 );
 }
 
 
 void
-_mesa_Color3d(GLdouble red, GLdouble green, GLdouble blue )
+_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue )
 {
    GLubyte col[4];
    GLfloat r = red;
@@ -286,13 +263,11 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(col[2], b);
    col[3] = 255;
    COLORV( IM, col );
-
-/*     COLOR4F( IM, red, green, blue, 1.0 ); */
 }
 
 
 void
-_mesa_Color3f(GLfloat red, GLfloat green, GLfloat blue )
+_mesa_Color3f( GLfloat red, GLfloat green, GLfloat blue )
 {
    GLubyte col[4];
    GET_IMMEDIATE;
@@ -301,35 +276,29 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(col[2], blue);
    col[3] = 255;
    COLORV( IM, col );
-
-/*     COLOR4F( IM, red, green, blue, 1.0 ); */
 }
 
 
 void
-_mesa_Color3i(GLint red, GLint green, GLint blue )
+_mesa_Color3i( GLint red, GLint green, GLint blue )
 {
    GET_IMMEDIATE;
-   COLOR( IM, INT_TO_UBYTE(red), 
-	  INT_TO_UBYTE(green),
-	  INT_TO_UBYTE(blue),
-	  255);
+   COLOR( IM, INT_TO_UBYTE(red), INT_TO_UBYTE(green),
+	  INT_TO_UBYTE(blue), 255);
 }
 
 
 void
-_mesa_Color3s(GLshort red, GLshort green, GLshort blue )
+_mesa_Color3s( GLshort red, GLshort green, GLshort blue )
 {
    GET_IMMEDIATE;
-   COLOR( IM, SHORT_TO_UBYTE(red), 
-	  SHORT_TO_UBYTE(green),
-	  SHORT_TO_UBYTE(blue),
-	  255);
+   COLOR( IM, SHORT_TO_UBYTE(red), SHORT_TO_UBYTE(green),
+	  SHORT_TO_UBYTE(blue), 255);
 }
 
 
 void
-_mesa_Color3ub(GLubyte red, GLubyte green, GLubyte blue )
+_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue )
 {
    GET_IMMEDIATE;
    COLOR( IM, red, green, blue, 255 );
@@ -337,28 +306,25 @@
 
 
 void
-_mesa_Color3ui(GLuint red, GLuint green, GLuint blue )
+_mesa_Color3ui( GLuint red, GLuint green, GLuint blue )
 {
    GET_IMMEDIATE;
-   COLOR( IM, UINT_TO_UBYTE(red),
-	  UINT_TO_UBYTE(green),
-	  UINT_TO_UBYTE(blue),
-	  255 );
+   COLOR( IM, UINT_TO_UBYTE(red), UINT_TO_UBYTE(green),
+	  UINT_TO_UBYTE(blue), 255 );
 }
 
 
 void
-_mesa_Color3us(GLushort red, GLushort green, GLushort blue )
+_mesa_Color3us( GLushort red, GLushort green, GLushort blue )
 {
    GET_IMMEDIATE;
    COLOR( IM, USHORT_TO_UBYTE(red), USHORT_TO_UBYTE(green),
-	  USHORT_TO_UBYTE(blue),
-	  255 );
+	  USHORT_TO_UBYTE(blue), 255 );
 }
 
 
 void
-_mesa_Color4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha )
+_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha )
 {
    GET_IMMEDIATE;
    COLOR( IM, BYTE_TO_UBYTE(red), BYTE_TO_UBYTE(green),
@@ -367,7 +333,7 @@
 
 
 void
-_mesa_Color4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha )
+_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha )
 {
    GLubyte col[4];
    GLfloat r = red;
@@ -380,13 +346,11 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(col[2], b);
    FLOAT_COLOR_TO_UBYTE_COLOR(col[3], a);
    COLORV( IM, col );
-
-/*     COLOR4F( IM, red, green, blue, alpha ); */
 }
 
 
 void
-_mesa_Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
+_mesa_Color4f( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
 {
    GLubyte col[4];
    GET_IMMEDIATE;
@@ -395,13 +359,11 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(col[2], blue);
    FLOAT_COLOR_TO_UBYTE_COLOR(col[3], alpha);
    COLORV( IM, col );
-
-/*     COLOR4F( IM, red, green, blue, alpha ); */
 }
 
 
 void
-_mesa_Color4i(GLint red, GLint green, GLint blue, GLint alpha )
+_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha )
 {
    GET_IMMEDIATE;
    COLOR( IM, INT_TO_UBYTE(red), INT_TO_UBYTE(green),
@@ -410,7 +372,7 @@
 
 
 void
-_mesa_Color4s(GLshort red, GLshort green, GLshort blue, GLshort alpha )
+_mesa_Color4s( GLshort red, GLshort green, GLshort blue, GLshort alpha )
 {
    GET_IMMEDIATE;
    COLOR( IM, SHORT_TO_UBYTE(red), SHORT_TO_UBYTE(green),
@@ -418,14 +380,14 @@
 }
 
 void
-_mesa_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
+_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
 {
    GET_IMMEDIATE;
    COLOR( IM, red, green, blue, alpha );
 }
 
 void
-_mesa_Color4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha )
+_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha )
 {
    GET_IMMEDIATE;
    COLOR( IM, UINT_TO_UBYTE(red), UINT_TO_UBYTE(green),
@@ -433,7 +395,7 @@
 }
 
 void
-_mesa_Color4us(GLushort red, GLushort green, GLushort blue, GLushort alpha )
+_mesa_Color4us( GLushort red, GLushort green, GLushort blue, GLushort alpha )
 {
    GET_IMMEDIATE;
    COLOR( IM, USHORT_TO_UBYTE(red), USHORT_TO_UBYTE(green),
@@ -442,7 +404,7 @@
 
 
 void
-_mesa_Color3bv(const GLbyte *v )
+_mesa_Color3bv( const GLbyte *v )
 {
    GET_IMMEDIATE;
    COLOR( IM, BYTE_TO_UBYTE(v[0]), BYTE_TO_UBYTE(v[1]),
@@ -451,7 +413,7 @@
 
 
 void
-_mesa_Color3dv(const GLdouble *v )
+_mesa_Color3dv( const GLdouble *v )
 {
    GLubyte col[4];
    GLfloat r = v[0];
@@ -463,13 +425,11 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(col[2], b);
    col[3]= 255;
    COLORV( IM, col );
-
-/*     COLOR4F( IM, v[0], v[1], v[2], v[3] ); */
 }
 
 
 void
-_mesa_Color3fv(const GLfloat *v )
+_mesa_Color3fv( const GLfloat *v )
 {
    GLubyte col[4];
    GET_IMMEDIATE;
@@ -478,13 +438,11 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(col[2], v[2]);
    col[3] = 255;
    COLORV( IM, col );
-
-/*     COLOR4F( IM, v[0], v[1], v[2], v[3] ); */
 }
 
 
 void
-_mesa_Color3iv(const GLint *v )
+_mesa_Color3iv( const GLint *v )
 {
    GET_IMMEDIATE;
    COLOR( IM, INT_TO_UBYTE(v[0]), INT_TO_UBYTE(v[1]),
@@ -493,7 +451,7 @@
 
 
 void
-_mesa_Color3sv(const GLshort *v )
+_mesa_Color3sv( const GLshort *v )
 {
    GET_IMMEDIATE;
    COLOR( IM, SHORT_TO_UBYTE(v[0]), SHORT_TO_UBYTE(v[1]),
@@ -502,7 +460,7 @@
 
 
 void
-_mesa_Color3ubv(const GLubyte *v )
+_mesa_Color3ubv( const GLubyte *v )
 {
    GET_IMMEDIATE;
    COLOR( IM, v[0], v[1], v[2], 255 );
@@ -510,7 +468,7 @@
 
 
 void
-_mesa_Color3uiv(const GLuint *v )
+_mesa_Color3uiv( const GLuint *v )
 {
    GET_IMMEDIATE;
    COLOR( IM, UINT_TO_UBYTE(v[0]), UINT_TO_UBYTE(v[1]),
@@ -519,7 +477,7 @@
 
 
 void
-_mesa_Color3usv(const GLushort *v )
+_mesa_Color3usv( const GLushort *v )
 {
    GET_IMMEDIATE;
    COLOR( IM, USHORT_TO_UBYTE(v[0]), USHORT_TO_UBYTE(v[1]),
@@ -529,7 +487,7 @@
 
 
 void
-_mesa_Color4bv(const GLbyte *v )
+_mesa_Color4bv( const GLbyte *v )
 {
    GET_IMMEDIATE;
    COLOR( IM, BYTE_TO_UBYTE(v[0]), BYTE_TO_UBYTE(v[1]),
@@ -538,7 +496,7 @@
 
 
 void
-_mesa_Color4dv(const GLdouble *v )
+_mesa_Color4dv( const GLdouble *v )
 {
    GLubyte col[4];
    GLfloat r = v[0];
@@ -551,13 +509,11 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(col[2], b);
    FLOAT_COLOR_TO_UBYTE_COLOR(col[3], a);
    COLORV( IM, col );
-
-/*     COLOR4F( IM, v[0], v[1], v[2], v[3] ); */
 }
 
 
 void
-_mesa_Color4fv(const GLfloat *v )
+_mesa_Color4fv( const GLfloat *v )
 {
    GLubyte col[4];
    GET_IMMEDIATE;
@@ -566,13 +522,11 @@
    FLOAT_COLOR_TO_UBYTE_COLOR(col[2], v[2]);
    FLOAT_COLOR_TO_UBYTE_COLOR(col[3], v[3]);
    COLORV( IM, col );
-
-/*     COLOR4F( IM, v[0], v[1], v[2], v[3] ); */
 }
 
 
 void
-_mesa_Color4iv(const GLint *v )
+_mesa_Color4iv( const GLint *v )
 {
    GET_IMMEDIATE;
    COLOR( IM, INT_TO_UBYTE(v[0]), INT_TO_UBYTE(v[1]),
@@ -581,7 +535,7 @@
 
 
 void
-_mesa_Color4sv(const GLshort *v)
+_mesa_Color4sv( const GLshort *v)
 {
    GET_IMMEDIATE;
    COLOR( IM, SHORT_TO_UBYTE(v[0]), SHORT_TO_UBYTE(v[1]),
@@ -590,7 +544,7 @@
 
 
 void
-_mesa_Color4ubv(const GLubyte *v)
+_mesa_Color4ubv( const GLubyte *v)
 {
    GET_IMMEDIATE;
    COLORV( IM, v );
@@ -598,7 +552,7 @@
 
 
 void
-_mesa_Color4uiv(const GLuint *v)
+_mesa_Color4uiv( const GLuint *v)
 {
    GET_IMMEDIATE;
    COLOR( IM, UINT_TO_UBYTE(v[0]), UINT_TO_UBYTE(v[1]),
@@ -607,7 +561,7 @@
 
 
 void
-_mesa_Color4usv(const GLushort *v)
+_mesa_Color4usv( const GLushort *v)
 {
    GET_IMMEDIATE;
    COLOR( IM, USHORT_TO_UBYTE(v[0]), USHORT_TO_UBYTE(v[1]),
@@ -653,7 +607,7 @@
 void
 _mesa_Indexd( GLdouble c )
 {
-   INDEX( (GLuint) (GLint) c );
+   INDEX( ( GLuint) (GLint) c );
 }
 
 
@@ -728,7 +682,7 @@
  *     call.  The Flag member allows the identification of missing
  *     (ie shared) normals.
  */
-#define NORMAL( x,y,z )				\
+#define NORMAL( x, y, z )			\
 {						\
    GLuint count;				\
    GLfloat *normal;				\
@@ -1137,7 +1091,8 @@
 
 /* Internal use:
  */
-void gl_Vertex2f( GLcontext *ctx, GLfloat x, GLfloat y )
+void
+gl_Vertex2f( GLcontext *ctx, GLfloat x, GLfloat y )
 {
    struct immediate *im = ctx->input;
    VERTEX2( im, x, y );
@@ -1329,9 +1284,10 @@
 
 
 /* KW: Do the check here so that we only have to do a single range
- *     test.  The possible compliance problem with this is that 
- *     we will throw out error-producing calls when compiling
- *     display lists.  There are ways around this if need be.
+ *     test.  The possible compliance problem with this is that we
+ *     will throw out error-producing calls when compiling display
+ *     lists.  The solution is to do dispatch on gl_error to call
+ *     gl_save_error if compiling.
  */
 
 
@@ -1344,7 +1300,8 @@
       texSet = target - GL_TEXTURE0_ARB;				\
    }									\
    else {								\
-      gl_error(IM->backref, GL_INVALID_ENUM, "glMultiTexCoord(target)");	\
+      gl_error(IM->backref, GL_INVALID_ENUM, 				\
+               "glMultiTexCoord(target)");				\
       return;								\
    }
 
Index: xc/extras/Mesa/src/vbfill.h
diff -u xc/extras/Mesa/src/vbfill.h:1.3 xc/extras/Mesa/src/vbfill.h:1.4
--- xc/extras/Mesa/src/vbfill.h:1.3	Mon Feb 14 23:12:41 2000
+++ xc/extras/Mesa/src/vbfill.h	Fri Jun 16 17:02:19 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
Index: xc/extras/Mesa/src/vbrender.c
diff -u xc/extras/Mesa/src/vbrender.c:1.3 xc/extras/Mesa/src/vbrender.c:1.4
--- xc/extras/Mesa/src/vbrender.c:1.3	Mon Feb 14 23:12:42 2000
+++ xc/extras/Mesa/src/vbrender.c	Fri Jun 16 17:02:19 2000
@@ -164,7 +164,7 @@
 	 j1 = vlist[i+1];
 	
 	 if (edge_ptr[j0] & 0x1) {
-	    edge_ptr[j0] &= ~1;
+	    edge_ptr[j0] &= ~0x1;
 	    (*ctx->Driver.LineFunc)( ctx, j0, j1, pv );
 	 }
       }
@@ -174,7 +174,7 @@
       j1 = vlist[0];
 
       if (edge_ptr[j0] & 0x2) {
-	 edge_ptr[j0] &= ~2;
+	 edge_ptr[j0] &= ~0x2;
 	 (*ctx->Driver.LineFunc)( ctx, j0, j1, pv );
       }
    }
@@ -219,7 +219,9 @@
 						GLuint pv )
 {
    struct vertex_buffer *VB = ctx->VB;
-   GLubyte mask = (GLubyte) (VB->ClipMask[v1] | VB->ClipMask[v2] | VB->ClipMask[v3]);
+   GLubyte mask = (GLubyte) (VB->ClipMask[v1] | 
+			     VB->ClipMask[v2] | 
+			     VB->ClipMask[v3]);
    GLuint vlist[VB_MAX_CLIPPED_VERTS];
    GLuint i, n;
 
@@ -233,12 +235,43 @@
 
    ASSIGN_3V(vlist, v1, v2, v3 );
    n = (ctx->poly_clip_tab[VB->ClipPtr->size])( VB, 3, vlist, mask );
-      
+
    for (i=2;i<n;i++) 
       ctx->TriangleFunc( ctx, *vlist, vlist[i-1], vlist[i], pv ); 
 }
 
 
+static INLINE void gl_render_clipped_quad2( GLcontext *ctx, 
+					    GLuint v1, GLuint v2, GLuint v3,
+					    GLuint v4,
+					    GLuint pv )
+{
+   struct vertex_buffer *VB = ctx->VB;
+   GLubyte mask = (GLubyte) (VB->ClipMask[v1] | 
+			     VB->ClipMask[v2] | 
+			     VB->ClipMask[v3] |
+			     VB->ClipMask[v4]);
+   GLuint vlist[VB_MAX_CLIPPED_VERTS];
+   GLuint i, n;
+
+   if (!mask) {
+      ctx->QuadFunc( ctx, v1, v2, v3, v4, pv ); 
+      return;
+   }
+
+   if (CLIP_ALL_BITS & VB->ClipMask[v1] & 
+       VB->ClipMask[v2] & VB->ClipMask[v3] &
+       VB->ClipMask[v4]) 
+      return;
+
+   ASSIGN_4V(vlist, v1, v2, v3, v4 );
+   n = (ctx->poly_clip_tab[VB->ClipPtr->size])( VB, 4, vlist, mask );
+
+   for (i=2;i<n;i++) 
+      ctx->TriangleFunc( ctx, *vlist, vlist[i-1], vlist[i], pv ); 
+}
+
+
 /* Implements triangle_rendering when (IndirectTriangles & DD_SW_SETUP)
  * is non-zero.
  */
@@ -309,16 +342,14 @@
    GLfloat fy = win[v3][1] - win[v1][1];
    GLfloat c = ex*fy-ey*fx;
    GLuint facing;
-   GLuint tricaps;
+   GLuint tricaps = ctx->IndirectTriangles;
 
    if (c * ctx->backface_sign > 0)
       return;
 
    facing = (c<0.0F) ^ (ctx->Polygon.FrontFace==GL_CW);
-   tricaps = ctx->IndirectTriangles;
-   (void) tricaps;  /* not needed? */
 
-   if (ctx->IndirectTriangles & DD_TRI_OFFSET) {
+   if (tricaps & DD_TRI_OFFSET) {
       GLfloat ez = win[v2][2] - win[v0][2];
       GLfloat fz = win[v3][2] - win[v1][2];
       GLfloat a = ey*fz-ez*fy;
@@ -327,7 +358,7 @@
    }
 
 
-   if (ctx->IndirectTriangles & DD_TRI_LIGHT_TWOSIDE) {
+   if (tricaps & DD_TRI_LIGHT_TWOSIDE) {
       VB->Specular = VB->Spec[facing];
       VB->ColorPtr = VB->Color[facing];
       VB->IndexPtr = VB->Index[facing];
@@ -335,7 +366,7 @@
 
 
    /* Render the quad! */
-   if (ctx->IndirectTriangles & DD_TRI_UNFILLED) {
+   if (tricaps & DD_TRI_UNFILLED) {
       GLuint vlist[4];
       vlist[0] = v0;
       vlist[1] = v1;
@@ -373,9 +404,7 @@
 
 #define EDGEFLAG_TRI( i2, i1, i, pv, parity)	\
 do {						\
-  GLuint e1=i1, e0=i;				\
-  if (parity) { GLuint t=e1; e1=e0; e0=t; }	\
-  eflag[i2] = eflag[e1] = 1; eflag[e0] = 2;	\
+  eflag[i2] = eflag[i1] = 1; eflag[i] = 2;	\
 } while (0)
 
 #define EDGEFLAG_QUAD( i3, i2, i1, i, pv)		\
@@ -384,6 +413,21 @@
 } while (0)
 
 
+#define EDGEFLAG_POLY_TRI_PRE( i2, i1, i, pv)	\
+do {						\
+  eflag[i1] |= (eflag[i1] >> 2) & 1; 		\
+  eflag[i] |= (eflag[i] >> 2) & 2;		\
+} while (0)
+
+#define EDGEFLAG_POLY_TRI_POST( i2, i1, i, pv)	\
+do {						\
+  eflag[i2] = 0; 		\
+  eflag[i1] &= ~(4|1); 		\
+  eflag[i] &= ~(8|2);		\
+} while (0)
+
+
+
 /* Culled and possibly clipped primitives.
  */
 #define RENDER_POINTS( start, count )			\
@@ -455,10 +499,12 @@
     const GLubyte *cullmask = VB->CullMask;	\
     GLuint vlist[VB_SIZE];			\
     GLubyte *eflag = VB->EdgeFlagPtr->data;    	\
-    (void) vlist; (void) eflag;
+    GLuint *stipplecounter = &VB->ctx->StippleCounter; \
+    (void) vlist; (void) eflag; (void) stipplecounter;
 
 #define TAG(x) x##_cull
 #define INIT(x)  FLUSH_PRIM(x)
+#define RESET_STIPPLE *stipplecounter = 0
 #include "render_tmp.h"
 
 
@@ -492,9 +538,11 @@
 #define LOCAL_VARS  				\
     GLcontext *ctx = VB->ctx;			\
     GLubyte *eflag = VB->EdgeFlagPtr->data;	\
-    (void) eflag;
+    GLuint *stipplecounter = &VB->ctx->StippleCounter; \
+    (void) eflag; (void) stipplecounter;
 
 #define INIT(x)  FLUSH_PRIM(x);
+#define RESET_STIPPLE *stipplecounter = 0
 #include "render_tmp.h"
 
 
@@ -510,24 +558,27 @@
 
 #define RENDER_TRI( i2, i1, i, pv, parity)	\
 do {						\
-  GLuint e1=i1, e0=i;				\
-  if (parity) { GLuint t=e1; e1=e0; e0=t; }	\
-  gl_render_clipped_triangle2(ctx,i2,e1,e0,pv);	\
+  GLuint e2=i2, e1=i1;				\
+  if (parity) { GLuint t=e2; e2=e1; e1=t; }	\
+  gl_render_clipped_triangle2(ctx,e2,e1,i,pv);	\
 } while (0)
 
 #define RENDER_QUAD( i3, i2, i1, i, pv)		\
 do {						\
-  gl_render_clipped_triangle2(ctx,i3,i2,i1,pv);	\
-  gl_render_clipped_triangle2(ctx,i3,i1,i,pv);	\
+  gl_render_clipped_quad2(ctx,i3,i2,i1,i,pv);	\
 } while (0)
 
 
 #define LOCAL_VARS  				\
     GLcontext *ctx = VB->ctx;			\
     GLubyte *eflag = VB->EdgeFlagPtr->data;	\
-    (void) eflag;
+    GLuint *stipplecounter = &VB->ctx->StippleCounter; \
+    (void) eflag; (void) stipplecounter;
+
 #define INIT(x)  FLUSH_PRIM(x);
 #define TAG(x) x##_clipped
+#define RESET_STIPPLE *stipplecounter = 0
+
 #include "render_tmp.h"
 
 /* Bits:
@@ -566,24 +617,25 @@
    switch (prim) {
    case GL_TRIANGLES:
       for (i = 0 ; i < n-2 ; i+=3) {
-	 if (flag[i])   flag[i]   = 0x5;
-	 if (flag[i+1]) flag[i+1] = 0x5;
-	 if (flag[i+2]) flag[i+2] = 0x6;
+	 if (flag[i])   flag[i]   = 0x1;
+	 if (flag[i+1]) flag[i+1] = 0x1;
+	 if (flag[i+2]) flag[i+2] = 0x3;
       }
       break;
    case GL_QUADS:
       for (i = 0 ; i < n-3 ; i+=4) {
-	 if (flag[i])   flag[i]   = 0x5;
-	 if (flag[i+1]) flag[i+1] = 0x5;
-	 if (flag[i+2]) flag[i+2] = 0x5;
-	 if (flag[i+3]) flag[i+3] = 0x6;
+	 if (flag[i])   flag[i]   = 0x1;
+	 if (flag[i+1]) flag[i+1] = 0x1;
+	 if (flag[i+2]) flag[i+2] = 0x1;
+	 if (flag[i+3]) flag[i+3] = 0x3;
       }
       break;
    case GL_POLYGON:
-      for (i = 0 ; i < n-1 ; i++) {
-	 if (flag[i]) flag[i] = 0x5;
+      if (flag[0]) flag[0] = 0x1;
+      for (i = 1 ; i < n-1 ; i++) {
+	 if (flag[i]) flag[i] = 0x1<<2;
       }
-      if (flag[i]) flag[i] = 0x6;
+      if (flag[i]) flag[i] = 0x3<<2;
       break;
    default:
       break;
@@ -667,12 +719,12 @@
    if (ctx->PB->count > 0) 
       gl_flush_pb(ctx);	
 
-   ctx->PB->count = 0;				
-   ctx->PB->mono = GL_FALSE;			
-   ctx->PB->primitive = prim;			
+   if (ctx->PB->primitive != prim) {
+      ctx->PB->primitive = prim;			
 
-   if (ctx->Driver.ReducedPrimitiveChange)
-      ctx->Driver.ReducedPrimitiveChange( ctx, prim );
+      if (ctx->Driver.ReducedPrimitiveChange)
+	 ctx->Driver.ReducedPrimitiveChange( ctx, prim );
+   }
 }
 
 
Index: xc/extras/Mesa/src/vbxform.c
diff -u xc/extras/Mesa/src/vbxform.c:1.3 xc/extras/Mesa/src/vbxform.c:1.4
--- xc/extras/Mesa/src/vbxform.c:1.3	Mon Feb 14 23:12:43 2000
+++ xc/extras/Mesa/src/vbxform.c	Fri Jun 16 17:02:19 2000
@@ -359,13 +359,23 @@
 static void
 find_last_3f( float data[][3], GLuint flag[], GLuint match, GLuint count )
 {
-   GLuint i = count;
+   int i = count;
 
-   for (;;) 
+   do {
       if ((flag[--i] & match) != 0) {
 	 COPY_3V(data[count], data[i]);	 
 	 return;      
       }
+   } while (i >= 0);
+
+   /* To reach this point excercises a bug that seems only to exist on
+    * dec alpha installations.  I want to leave this print statement
+    * enabled on the 3.3 branch so that we are reminded to track down
+    * the problem.
+    */
+   fprintf(stderr, 
+	   "didn't find VERT_NORM in find_last_3f"
+	   "(Dec alpha problem?)\n");
 }
 
 static void
@@ -599,10 +609,17 @@
       }
 
       if (fixup & VERT_NORM) {
+	 /* Only eval cannot use the Flag member to find valid normals:
+	  */
 	 if (IM->OrFlag & VERT_EVAL_ANY)
 	    fixup_3f( IM->Normal, IM->Flag, start, VERT_NORM );
-	 else if (!(IM->Flag[IM->LastData] & VERT_NORM)) 
- 	    find_last_3f( IM->Normal, IM->Flag, VERT_NORM, IM->LastData );
+	 else {
+	    /* Copy-to-current requires a valid normal in the last slot:
+	     */
+	    if ((IM->OrFlag & VERT_NORM) &&
+		!(IM->Flag[IM->LastData] & VERT_NORM)) 
+	       find_last_3f( IM->Normal, IM->Flag, VERT_NORM, IM->LastData );
+	 }
       }
    }
 
Index: xc/extras/Mesa/src/zoom.c
diff -u xc/extras/Mesa/src/zoom.c:1.3 xc/extras/Mesa/src/zoom.c:1.4
--- xc/extras/Mesa/src/zoom.c:1.3	Mon Feb 14 23:12:45 2000
+++ xc/extras/Mesa/src/zoom.c	Fri Jun 16 17:02:19 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -402,6 +402,6 @@
 
    /* write the span */
    for (r=r0; r<r1; r++) {
-      gl_write_stencil_span( ctx, m, x+skipcol, r, zstencil );
+      _mesa_write_stencil_span( ctx, m, x+skipcol, r, zstencil );
    }
 }
Index: xc/extras/Mesa/src/zoom.h
diff -u xc/extras/Mesa/src/zoom.h:1.3 xc/extras/Mesa/src/zoom.h:1.4
--- xc/extras/Mesa/src/zoom.h:1.3	Mon Feb 14 23:12:45 2000
+++ xc/extras/Mesa/src/zoom.h	Fri Jun 16 17:02:19 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
Index: xc/extras/Mesa/src/FX/fxapi.c
diff -u xc/extras/Mesa/src/FX/fxapi.c:1.3 xc/extras/Mesa/src/FX/fxapi.c:1.4
--- xc/extras/Mesa/src/FX/fxapi.c:1.3	Mon Feb 14 23:13:04 2000
+++ xc/extras/Mesa/src/FX/fxapi.c	Fri Jun 16 17:02:33 2000
@@ -623,7 +623,7 @@
 #if defined(FX)
 #include "fxdrv.h"
 
-fxMesaContext fxMesaCurrentCtx=NULL;
+static fxMesaContext fxMesaCurrentCtx=NULL;
 
 /*
  * Status of 3Dfx hardware initialization
@@ -694,22 +694,11 @@
 
 
 /*
- * The extension GL_FXMESA_global_texture_lod_bias
- */
-void GLAPIENTRY glGlobalTextureLODBiasFXMESA(GLfloat biasVal)
-{
-  grTexLodBiasValue(GR_TMU0,biasVal);
-
-  if(fxMesaCurrentCtx->haveTwoTMUs)
-    grTexLodBiasValue(GR_TMU1,biasVal);
-}
-
-
-/*
  * The 3Dfx Global Palette extension for GLQuake.
  * More a trick than a real extesion, use the shared global
  * palette extension. 
  */
+extern void GLAPIENTRY gl3DfxSetPaletteEXT(GLuint *pal); /* silence warning */
 void GLAPIENTRY gl3DfxSetPaletteEXT(GLuint *pal)
 {
   fxMesaContext fxMesa =fxMesaCurrentCtx;
@@ -866,6 +855,8 @@
    GLcontext *ctx = 0;
    /*FX_GrContext_t glideContext = 0;*/
    char *errorstr;
+   GLboolean useBGR;
+   char *system = NULL;
 
    if (MESA_VERBOSE&VERBOSE_DRIVER) {
       fprintf(stderr,"fxmesa: fxMesaCreateContext() Start\n");
@@ -890,8 +881,10 @@
       case FXMESA_DEPTH_SIZE:
 	 i++;
 	 depthSize=attribList[i];
-	 if(depthSize)
+	 if(depthSize) {
 	    aux=1;
+            depthSize = 16;
+         }
 	 break;
       case FXMESA_STENCIL_SIZE:
 	 i++;
@@ -923,11 +916,8 @@
    /* A workaround for Linux GLQuake */
    if(depthSize && alphaBuffer)
       alphaBuffer=0;
-
-   if(verbose)
-      fprintf(stderr,"Mesa fx Voodoo Device Driver v0.30\nWritten by David Bucciarelli (davibu@tin.it.it)\n");
 
-   if((type=fxQueryHardware()) < 0) {
+   if ((type=fxQueryHardware()) < 0) {
       fprintf(stderr,"fx Driver: ERROR no Voodoo1/2 Graphics or Voodoo Rush !\n");
       return NULL;
    }
@@ -950,10 +940,8 @@
    else
       fxMesa->haveTwoTMUs=GL_FALSE;
 
-   fxMesa->haveDoubleBuffer=doubleBuffer;
    fxMesa->haveAlphaBuffer=alphaBuffer;
    fxMesa->haveGlobalPaletteTexture=GL_FALSE;
-   fxMesa->haveZBuffer=depthSize ? 1 : 0;
    fxMesa->verbose=verbose;
    fxMesa->board=glbCurrentBoard;
 
@@ -971,29 +959,84 @@
       goto errorhandler;
    }
 
-   /* Pixel tables are use during pixel read-back */
+   /*
+    * Pixel tables are use during pixel read-back
+    * Either initialize them for RGB or BGR order.
+    */
 #if FXMESA_USE_ARGB 
-   fxInitPixelTables(fxMesa, GL_FALSE); /* Force RGB pixel order */	
+   useBGR = GL_FALSE; /* Force RGB pixel order */       
+   system = "FXMESA_USE_ARGB";
 #else
    if (glbHWConfig.SSTs[glbCurrentBoard].type == GR_SSTTYPE_VOODOO) {
-      /* jk991130 - GROSS HACK!!! - Voodoo 3s don't use BGR!!
-       * the only way to tell if it's a Voodoo 3 at this stage of the
-       * ballgame (no Glide 3.x for linux *yet*) is to query the # of TMUs
+      /* jk991130 - Voodoo 3s don't use BGR. Query the # of TMUs
        * as Voodoo3s have 2 TMUs on board, Banshee has only 1
-       * Thanks to Joseph Kain for that one
+       * bk000413 - another suggestion from Joseph Kain is using
+       *  VendorID 0x121a for all 3dfx boards
+       *   DeviceID VG  1/V2  2/VB  3/V3  5
+       * For now we cehck for known BGR devices, and presume
+       *  everything else to be a V3/RGB.
        */
-      if (glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig.nTexelfx == 2) {
-         fxInitPixelTables(fxMesa, GL_FALSE); /* use RGB pixel order (Voodoo3) */
+      GrVoodooConfig_t *voodoo;
+      voodoo = &glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig;
+
+      if (voodoo->nTexelfx == 1) {
+         /* Voodoo1 or Banshee */
+         useBGR = GL_TRUE;
+         system = "Voodoo1";
+      }
+      else if (voodoo->nTexelfx == 2 &&
+               voodoo->fbiRev == 260 &&
+               voodoo->tmuConfig[0].tmuRev == 4 &&
+               (voodoo->tmuConfig[0].tmuRam == 2 ||
+                voodoo->tmuConfig[0].tmuRam == 4)) {
+         /* Voodoo 2 */
+         useBGR = GL_TRUE;
+         system = "Voodoo2";
+      }
+      else if (voodoo->nTexelfx == 2 &&
+               voodoo->fbiRev == 2 &&
+               voodoo->tmuConfig[0].tmuRev == 1 &&
+               voodoo->tmuConfig[0].tmuRam == 4) {
+         /* Quantum3D Obsidian 50/100 */
+         useBGR = GL_TRUE;
+         system = "Quantum3D Obsidian";
+      }
+      else 
+         /* Brian
+          *       (voodoo->nTexelfx == 2 &&
+          *        voodoo->fbiRev == 0 &&
+          *        voodoo->tmuConfig[0].tmuRev == 148441048 &&
+          *        voodoo->tmuConfig[0].tmuRam == 3)
+          * Bernd 
+          *       (voodoo->nTexelfx == 2 &&
+          *        voodoo->fbiRev ==  69634 &&
+          *        voodoo->tmuConfig[0].tmuRev == 69634 &&
+          *        voodoo->tmuConfig[0].tmuRam == 2 )
+          */
+      {
+         /* Presumed Voodoo3 */
+         useBGR =  GL_FALSE;
+         system = "Voodoo3";
       }
-      else {
-         fxInitPixelTables(fxMesa, GL_TRUE); /* use BGR pixel order on Voodoo1/2 */
+      if (getenv("MESA_FX_INFO")) { 
+        printf("Voodoo: Texelfx: %d / FBI Rev.: %d / TMU Rev.: %d / TMU RAM: %d\n",
+               voodoo->nTexelfx,
+               voodoo->fbiRev,
+               voodoo->tmuConfig[0].tmuRev,
+               voodoo->tmuConfig[0].tmuRam );
       }
    }
    else {
-      fxInitPixelTables(fxMesa, GL_FALSE); /* use RGB pixel order otherwise */
+      useBGR = GL_FALSE; /* use RGB pixel order otherwise */
+      system = "non-voodoo";
    }
-#endif
+#endif /*FXMESA_USE_ARGB*/
+
+   if (getenv("MESA_FX_INFO")) 
+      printf("Voodoo pixel order: %s (%s)\n", useBGR ? "BGR" : "RGB", system);
 
+   fxInitPixelTables(fxMesa, useBGR);
+
    fxMesa->width=FX_grSstScreenWidth();
    fxMesa->height=FX_grSstScreenHeight();
 
@@ -1011,7 +1054,7 @@
    fxMesa->needClip = 0;
 
    if(verbose)
-      fprintf(stderr,"Glide screen size: %dx%d\n",
+      fprintf(stderr,"Voodoo Glide screen size: %dx%d\n",
               (int)FX_grSstScreenWidth(),(int)FX_grSstScreenHeight());
 
    fxMesa->glVis=gl_create_visual(GL_TRUE,     /* RGB mode */
@@ -1046,7 +1089,7 @@
    fxMesa->glBuffer=gl_create_framebuffer(fxMesa->glVis,
                                           GL_FALSE,  /* no software depth */
                                           fxMesa->glVis->StencilBits > 0,
-                                          fxMesa->glVis->AccumBits > 0,
+                                          fxMesa->glVis->AccumRedBits > 0,
                                           fxMesa->glVis->AlphaBits > 0 );
    if (!fxMesa->glBuffer) {
       errorstr = "gl_create_framebuffer";
@@ -1221,6 +1264,25 @@
 }
 
 
+#if 0
+static void QueryCounters(void)
+{
+   static GLuint prevPassed = 0;
+   static GLuint prevFailed = 0;
+   GLuint failed, passed;
+   GrSstPerfStats_t st;
+
+   FX_grSstPerfStats(&st);
+   failed = st.zFuncFail - st.aFuncFail - st.chromaFail;
+   passed = st.pixelsIn - failed;
+   printf("failed: %d  passed: %d\n", failed - prevFailed, passed - prevPassed);
+
+   prevPassed = passed;
+   prevFailed = failed;
+}
+#endif
+
+
 /*
  * Swap front/back buffers for current context if double buffered.
  */
@@ -1233,7 +1295,7 @@
   if(fxMesaCurrentCtx) {
    FLUSH_VB( fxMesaCurrentCtx->glCtx, "swap buffers" );
 
-    if(fxMesaCurrentCtx->haveDoubleBuffer) {
+    if (fxMesaCurrentCtx->glVis->DBflag) {
 
       grBufferSwap(fxMesaCurrentCtx->swapInterval);
 
@@ -1263,40 +1325,45 @@
     fprintf(stderr,"fxmesa: fxQueryHardware() Start\n");
   }
 
-  if(!glbGlideInitialized) {
+  if (!glbGlideInitialized) {
     grGlideInit();
-    if(FX_grSstQueryHardware(&glbHWConfig)) {
+    if (FX_grSstQueryHardware(&glbHWConfig)) {
       grSstSelect(glbCurrentBoard);
-      glb3DfxPresent=1;
+      glb3DfxPresent = 1;
 
-      if(getenv("MESA_FX_INFO")) {
+      if (getenv("MESA_FX_INFO")) {
         char buf[80];
                         
         FX_grGlideGetVersion(buf);
-        fprintf(stderr,"Using Glide V%s\n","");
-        fprintf(stderr,"Number of boards: %d\n",glbHWConfig.num_sst);
+        fprintf(stderr, "Voodoo Using Glide V%s\n", buf);
+        fprintf(stderr, "Voodoo Number of boards: %d\n", glbHWConfig.num_sst);
 
-        if(glbHWConfig.SSTs[glbCurrentBoard].type==GR_SSTTYPE_VOODOO) {
-          fprintf(stderr,"Framebuffer RAM: %d\n",
-                  glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig.sliDetect ?
-                  (glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig.fbRam*2) :
-                  glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig.fbRam);
-          fprintf(stderr,"Number of TMUs: %d\n",
-                  glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig.nTexelfx);
-          fprintf(stderr,"SLI detected: %d\n",
-                  glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig.sliDetect);
-        } else if(glbHWConfig.SSTs[glbCurrentBoard].type==GR_SSTTYPE_SST96) {
-          fprintf(stderr,"Framebuffer RAM: %d\n",
-                  glbHWConfig.SSTs[glbCurrentBoard].sstBoard.SST96Config.fbRam);
-          fprintf(stderr,"Number of TMUs: %d\n",
-                  glbHWConfig.SSTs[glbCurrentBoard].sstBoard.SST96Config.nTexelfx);
+        if (glbHWConfig.SSTs[glbCurrentBoard].type == GR_SSTTYPE_VOODOO) {
+          GrVoodooConfig_t *voodoo;
+          voodoo = &glbHWConfig.SSTs[glbCurrentBoard].sstBoard.VoodooConfig;
+
+          fprintf(stderr, "Voodoo Framebuffer RAM: %d\n",
+            voodoo->sliDetect ? (voodoo->fbRam*2) : voodoo->fbRam);
+          fprintf(stderr, "Voodoo Number of TMUs: %d\n", voodoo->nTexelfx);
+          fprintf(stderr, "Voodoo fbRam: %d\n", voodoo->fbRam);
+          fprintf(stderr, "Voodoo fbiRev: %d\n", voodoo->fbiRev);
+
+          fprintf(stderr,"Voodoo SLI detected: %d\n", voodoo->sliDetect);
+        }
+        else if (glbHWConfig.SSTs[glbCurrentBoard].type == GR_SSTTYPE_SST96) {
+          GrSst96Config_t *sst96;
+          sst96 = &glbHWConfig.SSTs[glbCurrentBoard].sstBoard.SST96Config;
+          fprintf(stderr, "Voodoo Framebuffer RAM: %d\n", sst96->fbRam);
+          fprintf(stderr, "Voodoo Number of TMUs: %d\n", sst96->nTexelfx);
         }
 
       }
-    } else
-      glb3DfxPresent=0;
+    }
+    else {
+      glb3DfxPresent = 0;
+    }
 
-    glbGlideInitialized=1;
+    glbGlideInitialized = 1;
 
 #if defined(__WIN32__)
     onexit((_onexit_t)cleangraphics);
@@ -1308,17 +1375,11 @@
 #endif
   }
 
-  if(!glb3DfxPresent) {
-    if (MESA_VERBOSE&VERBOSE_DRIVER) {
-      fprintf(stderr,"fxmesa: fxQueryHardware() End (-1)\n");
-    }
-    return(-1);
-  }
-
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxQueryHardware() End (voodooo)\n");
   }
-  return(glbHWConfig.SSTs[glbCurrentBoard].type);
+
+  return glbHWConfig.SSTs[glbCurrentBoard].type;
 }
 
 
@@ -1327,8 +1388,8 @@
  */
 void GLAPIENTRY fxCloseHardware(void)
 {
-  if(glbGlideInitialized) {
-    if(getenv("MESA_FX_INFO")) {
+  if (glbGlideInitialized) {
+    if (getenv("MESA_FX_INFO")) {
       GrSstPerfStats_t          st;
 
       FX_grSstPerfStats(&st);
@@ -1340,9 +1401,9 @@
       fprintf(stderr,"  # pixels drawn (including buffer clears and LFB writes): %u\n",(unsigned)st.pixelsOut);
     }
 
-    if(glbTotNumCtx==0) {
+    if (glbTotNumCtx == 0) {
       grGlideShutdown();
-      glbGlideInitialized=0;
+      glbGlideInitialized = 0;
     }
   }
 }
@@ -1354,7 +1415,7 @@
 /*
  * Need this to provide at least one external definition.
  */
-
+extern int gl_fx_dummy_function_api(void);
 int gl_fx_dummy_function_api(void)
 {
   return 0;
Index: xc/extras/Mesa/src/FX/fxdd.c
diff -u xc/extras/Mesa/src/FX/fxdd.c:1.4 xc/extras/Mesa/src/FX/fxdd.c:1.6
--- xc/extras/Mesa/src/FX/fxdd.c:1.4	Thu Mar  2 08:07:20 2000
+++ xc/extras/Mesa/src/FX/fxdd.c	Mon Jun 19 22:08:17 2000
@@ -52,6 +52,7 @@
 
 #if defined(FX)
 
+#include <dlfcn.h>
 #include "image.h"
 #include "types.h"
 #include "fxdrv.h"
@@ -102,34 +103,20 @@
 /*****                 Miscellaneous functions                    *****/
 /**********************************************************************/
 
-/* Enalbe/Disable dithering */
-static void fxDDDither(GLcontext *ctx, GLboolean enable)
-{
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-    fprintf(stderr,"fxmesa: fxDDDither()\n");
-  }
 
-  if (enable) {
-    FX_grDitherMode(GR_DITHER_4x4);
-  } else {
-    FX_grDitherMode(GR_DITHER_DISABLE);
-  }
-}
-
-
 /* Return buffer size information */
 static void fxDDBufferSize(GLcontext *ctx, GLuint *width, GLuint *height)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDBufferSize(...) Start\n");
   }
 
-  *width=fxMesa->width;
-  *height=fxMesa->height;
+  *width = fxMesa->width;
+  *height = fxMesa->height;
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDBufferSize(...) End\n");
   }
 }
@@ -139,15 +126,13 @@
 static void fxDDSetColor(GLcontext *ctx, GLubyte red, GLubyte green,
                          GLubyte blue, GLubyte alpha )
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
   GLubyte col[4];
   ASSIGN_4V( col, red, green, blue, alpha );
-  
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDSetColor(%d,%d,%d,%d)\n",red,green,blue,alpha);
   }
-
-  fxMesa->color=FXCOLOR4(col);
+  fxMesa->color = FXCOLOR4(col);
 }
 
 
@@ -155,19 +140,14 @@
 static void fxDDClearColor(GLcontext *ctx, GLubyte red, GLubyte green,
                            GLubyte blue, GLubyte alpha )
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
   GLubyte col[4];
-
-
-
   ASSIGN_4V( col, red, green, blue, 255 );
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDClearColor(%d,%d,%d,%d)\n",red,green,blue,alpha);
   }
- 
-  fxMesa->clearC=FXCOLOR4( col );
-  fxMesa->clearA=alpha;
+  fxMesa->clearC = FXCOLOR4( col );
+  fxMesa->clearA = alpha;
 }
 
 
@@ -177,8 +157,18 @@
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
-  const FxU16 clearD = (FxU16) (ctx->Depth.Clear * 0xffff);
-  GLbitfield softwareMask = mask & (DD_STENCIL_BIT | DD_ACCUM_BIT);
+  const FxU32 clearD = (FxU32) (ctx->Depth.Clear * fxMesa->depthClear);
+  const FxU32 clearS = (FxU32) (ctx->Stencil.Clear);
+  GLbitfield softwareMask = mask & (DD_ACCUM_BIT);
+
+  /* we can't clear accum buffers */
+  mask &= ~(DD_ACCUM_BIT);
+
+  if ((mask & DD_STENCIL_BIT) && !fxMesa->haveHwStencil) {
+    /* software stencil buffer */
+    mask &= ~(DD_STENCIL_BIT);
+    softwareMask |= DD_STENCIL_BIT;
+  }
 
   if (MESA_VERBOSE & VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDClear(%d,%d,%d,%d)\n", (int) x, (int) y,
@@ -186,21 +176,40 @@
   }
 
   if (colorMask != 0xffffffff) {
-    /* do color buffer clears in software */
+    /* do masked color buffer clears in software */
     softwareMask |= (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT));
     mask &= ~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT);
   }
 
+
+  /* disable stencil ops if enabled (it screws up clearing) */
+  if (fxMesa->haveHwStencil) {
+    if (ctx->Stencil.Enabled)
+      FX_grDisable(GR_STENCIL_MODE_EXT);
+
+    if (mask & DD_STENCIL_BIT) {
+      FX_grStencilMask(0xff);
+      /* set stencil ref value = desired clear value */
+      FX_grStencilFunc(GR_CMP_ALWAYS, ctx->Stencil.Clear, 0xff);
+    }
+    else {
+      FX_grStencilMask(0x00);
+    }
+  }
+
   /*
    * This could probably be done fancier but doing each possible case
    * explicitly is less error prone.
    */
-  switch (mask) {
+  switch (mask & ~DD_STENCIL_BIT) {
     case DD_BACK_LEFT_BIT | DD_DEPTH_BIT:
       /* back buffer & depth */
       FX_grDepthMask(FXTRUE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       if (!ctx->Depth.Mask) {
         FX_grDepthMask(FXFALSE);
       }
@@ -211,75 +220,114 @@
        * This is a work-around/
        */
       /* clear depth */
+      FX_grDepthMask(FXTRUE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
       FX_grColorMask(FXFALSE,FXFALSE);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       /* clear front */
       FX_grColorMask(FXTRUE, ctx->Color.ColorMask[ACOMP] && fxMesa->haveAlphaBuffer);
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       break;
     case DD_BACK_LEFT_BIT:
       /* back buffer only */
       FX_grDepthMask(FXFALSE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
-      if (!ctx->Depth.Mask) {
-        FX_grDepthMask(FXFALSE);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (ctx->Depth.Mask) {
+        FX_grDepthMask(FXTRUE);
       }
       break;
     case DD_FRONT_LEFT_BIT:
       /* front buffer only */
       FX_grDepthMask(FXFALSE);
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
-      if (!ctx->Depth.Mask) {
-        FX_grDepthMask(FXFALSE);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (ctx->Depth.Mask) {
+        FX_grDepthMask(FXTRUE);
       }
       break;
     case DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT:
       /* front and back */
       FX_grDepthMask(FXFALSE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
-      if (!ctx->Depth.Mask) {
-        FX_grDepthMask(FXFALSE);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (ctx->Depth.Mask) {
+        FX_grDepthMask(FXTRUE);
       }
       break;
     case DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT | DD_DEPTH_BIT:
       /* clear front */
       FX_grDepthMask(FXFALSE);
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       /* clear back and depth */
       FX_grDepthMask(FXTRUE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       if (!ctx->Depth.Mask) {
         FX_grDepthMask(FXFALSE);
       }
       break;
     case DD_DEPTH_BIT:
       /* just the depth buffer */
+      FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
       FX_grColorMask(FXFALSE,FXFALSE);
-      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA,
-                       (FxU16)(ctx->Depth.Clear*0xffff));
+      FX_grDepthMask(FXTRUE);
+      if (mask & DD_STENCIL_BIT)
+        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
+      else
+        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       FX_grColorMask(FXTRUE, ctx->Color.ColorMask[ACOMP] && fxMesa->haveAlphaBuffer);
+      if (ctx->Color.DrawDestMask & FRONT_LEFT_BIT)
+        FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
       break;
     default:
       /* error */
       ;
   }
 
+  if (fxMesa->haveHwStencil && ctx->Stencil.Enabled) {
+    /* restore stencil state to as it was before the clear */
+    FX_grEnable(GR_STENCIL_MODE_EXT);
+    FX_grStencilMask(ctx->Stencil.WriteMask);
+    FX_grStencilFunc(ctx->Stencil.Function - GL_NEVER,
+                     ctx->Stencil.Ref, ctx->Stencil.ValueMask);
+  }
+
   return softwareMask;
 }
 
 
 /* Set the buffer used for drawing */
 /* XXX support for separate read/draw buffers hasn't been tested */
-static GLboolean fxDDSetDrawBuffer(GLcontext *ctx, GLenum mode )
+static GLboolean fxDDSetDrawBuffer(GLcontext *ctx, GLenum mode)
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
 
@@ -297,6 +345,10 @@
     FX_grRenderBuffer(fxMesa->currentFB);
     return GL_TRUE;
   }
+  else if (mode == GL_NONE) {
+    FX_grColorMask(FXFALSE,FXFALSE);
+    return GL_TRUE;
+  }
   else {
     return GL_FALSE;
   }
@@ -326,6 +378,58 @@
 }
 
 
+/*
+ * These functions just set new-state flags.  The exact state
+ * values will be evaluated later.
+ */
+static void
+fxDDStencilFunc(GLcontext *ctx, GLenum func, GLint ref, GLuint mask)
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  (void) func;  (void) ref;  (void) mask;
+  fxMesa->new_state |= FX_NEW_STENCIL;
+  ctx->Driver.RenderStart = fxSetupFXUnits;
+}
+
+static void
+fxDDStencilMask(GLcontext *ctx, GLuint mask)
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  (void) mask;
+  fxMesa->new_state |= FX_NEW_STENCIL;
+  ctx->Driver.RenderStart = fxSetupFXUnits;
+}
+
+static void
+fxDDStencilOp(GLcontext *ctx, GLenum sfail, GLenum zfail, GLenum zpass)
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  (void) sfail;  (void) zfail;  (void) zpass;
+  fxMesa->new_state |= FX_NEW_STENCIL;
+  ctx->Driver.RenderStart = fxSetupFXUnits;
+}
+
+static void
+fxDDDepthFunc(GLcontext *ctx, GLenum func)
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  (void) func;
+  fxMesa->new_state |= FX_NEW_DEPTH;
+  ctx->Driver.RenderStart = fxSetupFXUnits;
+}
+
+static void
+fxDDDepthMask(GLcontext *ctx, GLboolean mask)
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  (void) mask;
+  fxMesa->new_state |= FX_NEW_DEPTH;
+  ctx->Driver.RenderStart = fxSetupFXUnits;
+}
+
+
+
+
 #ifdef XF86DRI
 /* test if window coord (px,py) is visible */
 static GLboolean inClipRects(fxMesaContext fxMesa, int px, int py)
@@ -341,11 +445,13 @@
 }
 #endif
 
+
 
-static GLboolean fxDDDrawBitMap(GLcontext *ctx, GLint px, GLint py,
-                                GLsizei width, GLsizei height,
-                                const struct gl_pixelstore_attrib *unpack,
-                                const GLubyte *bitmap)
+static GLboolean
+bitmap_R5G6B5(GLcontext *ctx, GLint px, GLint py,
+              GLsizei width, GLsizei height,
+              const struct gl_pixelstore_attrib *unpack,
+              const GLubyte *bitmap)
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GrLfbInfo_t info;
@@ -462,8 +568,182 @@
                   + (winY - py) * dstStride
                   + (winX + px);
 
+    for (row = 0; row < height; row++) {
+      const GLubyte *src = (const GLubyte *) _mesa_image_address( finalUnpack,
+                 bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
+      if (finalUnpack->LsbFirst) {
+        /* least significan bit first */
+        GLubyte mask = 1U << (finalUnpack->SkipPixels & 0x7);
+        GLint col;
+        for (col=0; col<width; col++) {
+          if (*src & mask) {
+            if (INSIDE(fxMesa, winX + px + col, winY - py - row))
+              dst[col] = color;
+          }
+          if (mask == 128U) {
+            src++;
+            mask = 1U;
+          }
+          else {
+            mask = mask << 1;
+          }
+        }
+        if (mask != 1)
+          src++;
+      }
+      else {
+        /* most significan bit first */
+        GLubyte mask = 128U >> (finalUnpack->SkipPixels & 0x7);
+        GLint col;
+        for (col=0; col<width; col++) {
+          if (*src & mask) {
+            if (INSIDE(fxMesa, winX + px + col, winY - py - row))
+              dst[col] = color;
+          }
+          if (mask == 1U) {
+            src++;
+            mask = 128U;
+          }
+          else {
+            mask = mask >> 1;
+          }
+        }
+        if (mask != 128)
+          src++;
+      }
+      dst -= dstStride;
+    }
+  }
+
+#undef INSIDE
+
+  FX_grLfbUnlock(GR_LFB_WRITE_ONLY,fxMesa->currentFB);
+  return GL_TRUE;
+}
+
+
+static GLboolean
+bitmap_R8G8B8A8(GLcontext *ctx, GLint px, GLint py,
+                GLsizei width, GLsizei height,
+                const struct gl_pixelstore_attrib *unpack,
+                const GLubyte *bitmap)
+{
+  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
+  GrLfbInfo_t info;
+  GrLfbWriteMode_t mode;
+  /*FxU16 color;*/
+  GLuint color;
+  const struct gl_pixelstore_attrib *finalUnpack;
+  struct gl_pixelstore_attrib scissoredUnpack;
+
+  /* check if there's any raster operations enabled which we can't handle */
+  if (ctx->RasterMask & (ALPHATEST_BIT |
+                         BLEND_BIT |
+                         DEPTH_BIT |
+                         FOG_BIT |
+                         LOGIC_OP_BIT |
+                         SCISSOR_BIT |
+                         STENCIL_BIT |
+                         MASKING_BIT |
+                         ALPHABUF_BIT |
+                         MULTI_DRAW_BIT))
+    return GL_FALSE;
+
+  if (ctx->Scissor.Enabled) {
+    /* This is a bit tricky, but by carefully adjusting the px, py,
+     * width, height, skipPixels and skipRows values we can do
+     * scissoring without special code in the rendering loop.
+     */
+
+    /* we'll construct a new pixelstore struct */
+    finalUnpack = &scissoredUnpack;
+    scissoredUnpack = *unpack;
+    if (scissoredUnpack.RowLength == 0)
+      scissoredUnpack.RowLength = width;
+
+    /* clip left */
+    if (px < ctx->Scissor.X) {
+      scissoredUnpack.SkipPixels += (ctx->Scissor.X - px);
+      width -= (ctx->Scissor.X - px);
+      px = ctx->Scissor.X;
+    }
+    /* clip right */
+    if (px + width >= ctx->Scissor.X + ctx->Scissor.Width) {
+      width -= (px + width - (ctx->Scissor.X + ctx->Scissor.Width));
+    }
+    /* clip bottom */
+    if (py < ctx->Scissor.Y) {
+      scissoredUnpack.SkipRows += (ctx->Scissor.Y - py);
+      height -= (ctx->Scissor.Y - py);
+      py = ctx->Scissor.Y;
+    }
+    /* clip top */
+    if (py + height >= ctx->Scissor.Y + ctx->Scissor.Height) {
+      height -= (py + height - (ctx->Scissor.Y + ctx->Scissor.Height));
+    }
+
+    if (width <= 0 || height <= 0)
+      return GL_TRUE;  /* totally scissored away */
+  }  
+  else {
+    finalUnpack = unpack;
+  }
+
+  /* compute pixel value */
+  {
+    GLint r = (GLint) (ctx->Current.RasterColor[0] * 255.0f);
+    GLint g = (GLint) (ctx->Current.RasterColor[1] * 255.0f);
+    GLint b = (GLint) (ctx->Current.RasterColor[2] * 255.0f);
+    GLint a = (GLint) (ctx->Current.RasterColor[3] * 255.0f);
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+      color = PACK_BGRA32(r, g, b, a);
+    else
+      color = PACK_RGBA32(r, g, b, a);
+  }
+
+  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+    mode = GR_LFBWRITEMODE_8888;
+  else
+    mode = GR_LFBWRITEMODE_888;
+
+  info.size = sizeof(info);
+  if (!FX_grLfbLock(GR_LFB_WRITE_ONLY,
+                    fxMesa->currentFB,
+                    mode,
+                    GR_ORIGIN_UPPER_LEFT,
+                    FXFALSE,
+                    &info)) {
+#ifndef FX_SILENT
+    fprintf(stderr,"fx Driver: error locking the linear frame buffer\n");
+#endif
+    return GL_TRUE;
+  }
+
+#ifdef XF86DRI
+#define INSIDE(c, x, y) inClipRects((c), (x), (y))
+#else
+#define INSIDE(c, x, y) (1)
+#endif
+
+  {
+    const GLint winX = fxMesa->x_offset;
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    GLint dstStride;
+    GLuint *dst;
+    GLint row;
+
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      dstStride = fxMesa->screen_width;
+      dst = (GLuint *) info.lfbPtr + (winY - py) * dstStride + (winX + px);
+    }
+    else {
+      dstStride = info.strideInBytes / 4;
+      dst = (GLuint *) info.lfbPtr + (winY - py) * dstStride + (winX + px);
+    }
+
+    /* compute dest address of bottom-left pixel in bitmap */
     for (row = 0; row < height; row++) {
-      const GLubyte *src = (const GLubyte *) gl_pixel_addr_in_image( finalUnpack,
+      const GLubyte *src = (const GLubyte *) _mesa_image_address( finalUnpack,
                  bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
       if (finalUnpack->LsbFirst) {
         /* least significan bit first */
@@ -515,6 +795,129 @@
   return GL_TRUE;
 }
 
+
+static GLboolean
+readpixels_R5G6B5( GLcontext *ctx, GLint x, GLint y,
+                   GLsizei width, GLsizei height,
+                   GLenum format, GLenum type,
+                   const struct gl_pixelstore_attrib *packing,
+                   GLvoid *dstImage )
+{
+  if (ctx->Pixel.ScaleOrBiasRGBA || ctx->Pixel.MapColorFlag) {
+    return GL_FALSE;  /* can't do this */
+  }
+  else {
+    fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
+    GrLfbInfo_t info;
+    GLboolean result = GL_FALSE;
+
+    BEGIN_BOARD_LOCK();
+    info.size=sizeof(info);
+    if (grLfbLock(GR_LFB_READ_ONLY,
+                  fxMesa->currentFB,
+                  GR_LFBWRITEMODE_ANY,
+                  GR_ORIGIN_UPPER_LEFT,
+                  FXFALSE,
+                  &info)) {
+      const GLint winX = fxMesa->x_offset;
+      const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+#ifdef XF86DRI
+      const GLint srcStride = (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+                          ? (fxMesa->screen_width) : (info.strideInBytes / 2);
+#else
+      const GLint srcStride = info.strideInBytes / 2; /* stride in GLushorts */
+#endif
+      const GLushort *src = (const GLushort *) info.lfbPtr
+                          + (winY - y) * srcStride + (winX + x);
+      GLubyte *dst = (GLubyte *) _mesa_image_address(packing, dstImage,
+                                         width, height, format, type, 0, 0, 0);
+      GLint dstStride = _mesa_image_row_stride(packing, width, format, type);
+
+      if (format == GL_RGB && type == GL_UNSIGNED_BYTE) {
+        /* convert 5R6G5B into 8R8G8B */
+        GLint row, col;
+        const GLint halfWidth = width >> 1;
+        const GLint extraPixel = (width & 1);
+        for (row = 0; row < height; row++) {
+          GLubyte *d = dst;
+          for (col = 0; col < halfWidth; col++) {
+            const GLuint pixel = ((const GLuint *) src)[col];
+            const GLint pixel0 = pixel & 0xffff;
+            const GLint pixel1 = pixel >> 16;
+            *d++ = FX_PixelToR[pixel0];
+            *d++ = FX_PixelToG[pixel0];
+            *d++ = FX_PixelToB[pixel0];
+            *d++ = FX_PixelToR[pixel1];
+            *d++ = FX_PixelToG[pixel1];
+            *d++ = FX_PixelToB[pixel1];
+          }
+          if (extraPixel) {
+            GLushort pixel = src[width-1];
+            *d++ = FX_PixelToR[pixel];
+            *d++ = FX_PixelToG[pixel];
+            *d++ = FX_PixelToB[pixel];
+          }
+          dst += dstStride;
+          src -= srcStride;
+        }
+        result = GL_TRUE;
+      }
+      else if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
+        /* convert 5R6G5B into 8R8G8B8A */
+        GLint row, col;
+        const GLint halfWidth = width >> 1;
+        const GLint extraPixel = (width & 1);
+        for (row = 0; row < height; row++) {
+          GLubyte *d = dst;
+          for (col = 0; col < halfWidth; col++) {
+            const GLuint pixel = ((const GLuint *) src)[col];
+            const GLint pixel0 = pixel & 0xffff;
+            const GLint pixel1 = pixel >> 16;
+            *d++ = FX_PixelToR[pixel0];
+            *d++ = FX_PixelToG[pixel0];
+            *d++ = FX_PixelToB[pixel0];
+            *d++ = 255;
+            *d++ = FX_PixelToR[pixel1];
+            *d++ = FX_PixelToG[pixel1];
+            *d++ = FX_PixelToB[pixel1];
+            *d++ = 255;
+          }
+          if (extraPixel) {
+            const GLushort pixel = src[width-1];
+            *d++ = FX_PixelToR[pixel];
+            *d++ = FX_PixelToG[pixel];
+            *d++ = FX_PixelToB[pixel];
+            *d++ = 255;
+          }
+          dst += dstStride;
+          src -= srcStride;
+        }
+        result = GL_TRUE;
+      }
+      else if (format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5) {
+        /* directly memcpy 5R6G5B pixels into client's buffer */
+        const GLint widthInBytes = width * 2;
+        GLint row;
+        for (row = 0; row < height; row++) {
+          MEMCPY(dst, src, widthInBytes);
+          dst += dstStride;
+          src -= srcStride;
+        }
+        result = GL_TRUE;
+      }
+      else {
+        result = GL_FALSE;
+      }
+
+      grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+    }
+    END_BOARD_LOCK();
+    return result;
+  }
+}
+
+
+
 static void fxDDFinish(GLcontext *ctx)
 {
   FX_grFlush();
@@ -568,7 +971,7 @@
           }
         }
         /* now make the GL_RENDERER string */
-        sprintf(buffer, "Mesa DRI %s 20000224", hardware);
+        sprintf(buffer, "Mesa DRI %s 20000616", hardware);
         return buffer;
       }
     case GL_VENDOR:
@@ -625,6 +1028,19 @@
 
 int fxDDInitFxMesaContext( fxMesaContext fxMesa )
 {
+  /* Get Glide3vn function pointers */
+  {
+    void *handle;
+    handle = dlopen(NULL, RTLD_NOW | RTLD_GLOBAL);
+    if (!handle)
+      return 0;
+    grStencilFuncPtr = dlsym(handle, "grStencilFunc");
+    grStencilMaskPtr = dlsym(handle, "grStencilMask");
+    grStencilOpPtr = dlsym(handle, "grStencilOp");
+    grBufferClearExtPtr = dlsym(handle, "grBufferClearExt");
+    /* call dlclose()? */
+  }
+
   
    FX_setupGrVertexLayout();
    
@@ -651,6 +1067,8 @@
    else
       fxMesa->verbose=GL_FALSE;
 
+   fxMesa->depthClear = FX_grGetInteger(FX_ZDEPTH_MAX);
+
    fxMesa->color=0xffffffff;
    fxMesa->clearC=0;
    fxMesa->clearA=0;
@@ -661,7 +1079,6 @@
    fxMesa->stats.memTexUpload=0;
 
    fxMesa->tmuSrc=FX_TMU_NONE;
-   fxMesa->lastUnitsMode=FX_UM_NONE;
    fxTMInit(fxMesa);
 
    /* FX units setup */
@@ -676,16 +1093,19 @@
    fxMesa->unitsState.blendSrcFuncAlpha=GR_BLEND_ONE;
    fxMesa->unitsState.blendDstFuncAlpha=GR_BLEND_ZERO;
 
+   /*
    fxMesa->unitsState.depthTestEnabled	=GL_FALSE;
    fxMesa->unitsState.depthMask		=GL_TRUE;
    fxMesa->unitsState.depthTestFunc	=GR_CMP_LESS;
+   */
 
    FX_grColorMask(FXTRUE, fxMesa->haveAlphaBuffer ? FXTRUE : FXFALSE);
-   if(fxMesa->haveDoubleBuffer) {
-      fxMesa->currentFB=GR_BUFFER_BACKBUFFER;
+   if (fxMesa->glVis->DBflag) {
+      fxMesa->currentFB = GR_BUFFER_BACKBUFFER;
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-   } else {
-      fxMesa->currentFB=GR_BUFFER_FRONTBUFFER;
+   }
+   else {
+      fxMesa->currentFB = GR_BUFFER_FRONTBUFFER;
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
    }
   
@@ -701,7 +1121,7 @@
       return 0;
    }
 
-   if(fxMesa->haveZBuffer)
+   if (fxMesa->glVis->DepthBits > 0)
       FX_grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
     
 #if (!FXMESA_USE_ARGB)
@@ -714,7 +1134,7 @@
    fxMesa->glCtx->Const.MaxTextureUnits=fxMesa->emulateTwoTMUs ? 2 : 1;
    fxMesa->glCtx->NewState|=NEW_DRVSTATE1;
    fxMesa->new_state = NEW_ALL;
-  
+
    fxDDSetupInit();
    fxDDCvaInit();
    fxDDClipInit();
@@ -744,6 +1164,10 @@
 	 fxMesa->glCtx->PipelineStage,
 	 fxMesa->glCtx->NrPipelineStages);
 
+   /* this little bit ensures that all Glide state gets initialized */
+   fxMesa->new_state = NEW_ALL;
+   fxMesa->glCtx->Driver.RenderStart = fxSetupFXUnits;
+
    /* Run the config file */
    gl_context_initialize( fxMesa->glCtx );
 
@@ -768,10 +1192,8 @@
    gl_extensions_disable(ctx, "GL_EXT_blend_minmax");
    gl_extensions_disable(ctx, "GL_EXT_blend_subtract");
    gl_extensions_disable(ctx, "GL_EXT_blend_color");
-   gl_extensions_disable(ctx, "GL_EXT_paletted_texture");
 
    gl_extensions_add(ctx, DEFAULT_ON, "3DFX_set_global_palette", 0);
-   gl_extensions_add(ctx, DEFAULT_ON, "GL_FXMESA_global_texture_lod_bias", 0);
    
    if (!fxMesa->haveTwoTMUs)
       gl_extensions_disable(ctx, "GL_EXT_texture_env_add");
@@ -816,8 +1238,7 @@
   if (!ctx->Hint.AllowDrawMem)
      return GL_TRUE;		/* you'll take it and like it */
 
-  if((ctx->RasterMask & STENCIL_BIT) ||
-     ((ctx->Color.BlendEnabled) && (ctx->Color.BlendEquation!=GL_FUNC_ADD_EXT)) ||
+  if(((ctx->Color.BlendEnabled) && (ctx->Color.BlendEquation!=GL_FUNC_ADD_EXT)) ||
      ((ctx->Color.ColorLogicOpEnabled) && (ctx->Color.LogicOp!=GL_COPY)) ||
      (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) ||
      (!((ctx->Color.ColorMask[RCOMP]==ctx->Color.ColorMask[GCOMP]) &&
@@ -838,17 +1259,26 @@
       return GL_FALSE;
     }
 
-    if((ctx->Texture.ReallyEnabled & TEXTURE0_2D) &&
-       (ctx->Texture.Unit[0].EnvMode==GL_BLEND)) {
-      return GL_FALSE;
+    if (ctx->Texture.ReallyEnabled & TEXTURE0_2D) {
+      if (ctx->Texture.Unit[0].EnvMode == GL_BLEND &&
+	  (ctx->Texture.ReallyEnabled & TEXTURE1_2D ||
+	   ctx->Texture.Unit[0].EnvColor[0] != 0 ||
+	   ctx->Texture.Unit[0].EnvColor[1] != 0 ||
+	   ctx->Texture.Unit[0].EnvColor[2] != 0 ||
+	   ctx->Texture.Unit[0].EnvColor[3] != 1)) {
+        return GL_FALSE;
+      }
+      if (ctx->Texture.Unit[0].Current->Image[0]->Border > 0)
+        return GL_FALSE;
     }
 
-    if((ctx->Texture.ReallyEnabled & TEXTURE1_2D) &&
-       (ctx->Texture.Unit[1].EnvMode==GL_BLEND)) {
-      return GL_FALSE;
+    if (ctx->Texture.ReallyEnabled & TEXTURE1_2D) {
+      if (ctx->Texture.Unit[1].EnvMode == GL_BLEND)
+        return GL_FALSE;
+      if (ctx->Texture.Unit[0].Current->Image[0]->Border > 0)
+        return GL_FALSE;
     }
 
-
     if (MESA_VERBOSE & (VERBOSE_DRIVER|VERBOSE_TEXTURE))
        fprintf(stderr, "fxMesa: fxIsInHardware, envmode is %s/%s\n",
 	       gl_lookup_enum_by_nr(ctx->Texture.Unit[0].EnvMode),
@@ -892,6 +1322,9 @@
     }
   }
 
+  if (ctx->Stencil.Enabled && !fxMesa->haveHwStencil)
+    return GL_FALSE;
+
   return GL_TRUE;
 }
 
@@ -943,58 +1376,68 @@
   }
 }
 
+
 void fxSetupDDPointers(GLcontext *ctx)
 {
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-    fprintf(stderr,"fxmesa: fxSetupDDPointers()\n");
-  }
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
 
-  ctx->Driver.UpdateState=fxDDUpdateDDPointers;
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxSetupDDPointers()\n");
+  }
+  ctx->Driver.UpdateState = fxDDUpdateDDPointers;
+  ctx->Driver.ClearIndex = NULL;
+  ctx->Driver.ClearColor = fxDDClearColor;
+  ctx->Driver.Clear = fxDDClear;
+  ctx->Driver.Index = NULL;
+  ctx->Driver.Color = fxDDSetColor;
+  ctx->Driver.SetDrawBuffer = fxDDSetDrawBuffer;
+  ctx->Driver.SetReadBuffer = fxDDSetReadBuffer;
+  ctx->Driver.GetBufferSize = fxDDBufferSize;
+  ctx->Driver.Finish = fxDDFinish;
+  ctx->Driver.Flush = NULL;
+  ctx->Driver.GetString = fxDDGetString;
+  ctx->Driver.NearFar = fxDDSetNearFar;
+  ctx->Driver.GetParameteri = fxDDGetParameteri;
 
   ctx->Driver.WriteDepthSpan=fxDDWriteDepthSpan;
   ctx->Driver.WriteDepthPixels=fxDDWriteDepthPixels;
   ctx->Driver.ReadDepthSpan=fxDDReadDepthSpan;
   ctx->Driver.ReadDepthPixels=fxDDReadDepthPixels;
          
-  ctx->Driver.GetString=fxDDGetString;
-
-  ctx->Driver.Dither=fxDDDither;
-
-  ctx->Driver.NearFar=fxDDSetNearFar;
-
-  ctx->Driver.GetParameteri=fxDDGetParameteri;
-
-  ctx->Driver.ClearIndex=NULL;
-  ctx->Driver.ClearColor=fxDDClearColor;
-  ctx->Driver.Clear=fxDDClear;
-
-  ctx->Driver.Index=NULL;
-  ctx->Driver.Color=fxDDSetColor;
-
-  ctx->Driver.SetDrawBuffer=fxDDSetDrawBuffer;
-  ctx->Driver.SetReadBuffer=fxDDSetReadBuffer;
-  ctx->Driver.GetBufferSize=fxDDBufferSize;
-
-  ctx->Driver.Bitmap=fxDDDrawBitMap;
-  ctx->Driver.DrawPixels=NULL;
-
-  ctx->Driver.Finish=fxDDFinish;
-  ctx->Driver.Flush=NULL;
+  if (ctx->Visual->RedBits == 8 &&
+      ctx->Visual->GreenBits == 8 &&
+      ctx->Visual->BlueBits == 8 &&
+      ctx->Visual->AlphaBits == 8) {
+    ctx->Driver.Bitmap = bitmap_R8G8B8A8;
+    ctx->Driver.DrawPixels = NULL;
+    ctx->Driver.ReadPixels = NULL;
+  }
+  else {
+    ctx->Driver.Bitmap = bitmap_R5G6B5;
+    ctx->Driver.DrawPixels = NULL;
+    ctx->Driver.ReadPixels = readpixels_R5G6B5;
+  }
 
   ctx->Driver.RenderStart=NULL;
   ctx->Driver.RenderFinish=NULL;
 
+  ctx->Driver.TexImage2D = fxDDTexImage2D;
+  ctx->Driver.TexSubImage2D = fxDDTexSubImage2D;
+  ctx->Driver.GetTexImage = fxDDGetTexImage;
   ctx->Driver.TexEnv=fxDDTexEnv;
-  ctx->Driver.TexImage=fxDDTexImg;
-  ctx->Driver.TexSubImage=fxDDTexSubImg;
   ctx->Driver.TexParameter=fxDDTexParam;
   ctx->Driver.BindTexture=fxDDTexBind;
   ctx->Driver.DeleteTexture=fxDDTexDel;
   ctx->Driver.UpdateTexturePalette=fxDDTexPalette;
-  ctx->Driver.UseGlobalTexturePalette=fxDDTexUseGlbPalette;
 
   ctx->Driver.RectFunc=NULL;
 
+  if (fxMesa->haveHwStencil) {
+    ctx->Driver.StencilFunc = fxDDStencilFunc;
+    ctx->Driver.StencilMask = fxDDStencilMask;
+    ctx->Driver.StencilOp   = fxDDStencilOp;
+  }
+
   ctx->Driver.AlphaFunc=fxDDAlphaFunc;
   ctx->Driver.BlendFunc=fxDDBlendFunc;
   ctx->Driver.DepthFunc=fxDDDepthFunc;
@@ -1029,6 +1472,7 @@
   FX_CONTEXT(ctx)->render_index = 1; /* force an update */
   fxDDUpdateDDPointers(ctx);
 }
+
 
 
 #else
Index: xc/extras/Mesa/src/FX/fxddspan.c
diff -u xc/extras/Mesa/src/FX/fxddspan.c:1.3 xc/extras/Mesa/src/FX/fxddspan.c:1.4
--- xc/extras/Mesa/src/FX/fxddspan.c:1.3	Mon Feb 14 23:13:06 2000
+++ xc/extras/Mesa/src/FX/fxddspan.c	Fri Jun 16 17:02:33 2000
@@ -46,33 +46,193 @@
 /* fxdd.c - 3Dfx VooDoo Mesa span and pixel functions */
 
 
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
+#include "fxdrv.h"
 
-#if defined(FX)
 
-#include "fxdrv.h"
 
-#ifdef _MSC_VER
-#ifdef _WIN32
-#pragma warning( disable : 4090 4022 )
-/* 4101 : "different 'const' qualifier"
- * 4022 : "pointer mistmatch for actual parameter 'n'
+/*
+ * Examine the cliprects to generate an array of flags to indicate
+ * which pixels in a span are visible.  Note: (x,y) is a screen
+ * coordinate.
  */
-#endif
-#endif
+static void
+generate_vismask(const fxMesaContext fxMesa, GLint x, GLint y, GLint n,
+                 GLubyte vismask[])
+{
+   GLboolean initialized = GL_FALSE;
+   GLint i, j;
+
+   /* turn on flags for all visible pixels */
+   for (i = 0; i < fxMesa->numClipRects; i++) {
+      const XF86DRIClipRectPtr rect = &fxMesa->pClipRects[i];
+
+      if (y >= rect->y1 && y < rect->y2) {
+         if (x >= rect->x1 && x + n <= rect->x2) {
+            /* common case, whole span inside cliprect */
+            MEMSET(vismask, 1, n);
+            return;
+         }
+         if (x < rect->x2 && x + n >= rect->x1) {
+            /* some of the span is inside the rect */
+            GLint start, end;
+            if (!initialized) {
+               MEMSET(vismask, 0, n);
+               initialized = GL_TRUE;
+            }
+            if (x < rect->x1)
+               start = rect->x1 - x;
+            else
+               start = 0;
+            if (x + n > rect->x2)
+               end = rect->x2 - x;
+            else
+               end = n;
+            assert(start >= 0);
+            assert(end <= n);
+            for (j = start; j < end; j++)
+               vismask[j] = 1;
+         }
+      }
+   }
+}
 
 
-#if !defined(FXMESA_USE_ARGB) 
+/*
+ * Examine cliprects and determine if the given screen pixel is visible.
+ */
+static GLboolean
+visible_pixel(const fxMesaContext fxMesa, int scrX, int scrY)
+{
+   int i;
+   for (i = 0; i < fxMesa->numClipRects; i++) {
+      const XF86DRIClipRectPtr rect = &fxMesa->pClipRects[i];
+      if (scrX >= rect->x1 &&
+          scrX <  rect->x2 &&
+          scrY >= rect->y1 &&
+          scrY <  rect->y2)
+        return GL_TRUE;
+   }
+   return GL_FALSE;
+}
 
 
-#if defined(FX_GLIDE3) && defined(XF86DRI)
 
+typedef enum { FBS_READ, FBS_WRITE } FBS_DIRECTION;
+/*
+ *     Read or write a single span from the frame buffer.
+ *     Input Parameters:
+ *         fxMesa:                The context
+ *         target_buffer:         Which buffer to read from.
+ *         xpos, ypos:            Starting Coordinates.
+ *         xlength:               Length of the span.
+ *         data_size:             Size of data elements: 1, 2, or 4.
+ *         buffer:                Pointer to the buffer to read
+ *                                to or write from.  This needs
+ *                                to be turned into a pointer.
+ *         direction:             Read or Write.
+ */
+static void
+rw_fb_span(fxMesaContext fxMesa,
+           GrBuffer_t    target_buffer,
+           FxU32         xpos,
+           FxU32         ypos,
+           FxU32         xlength,
+           FxU32         data_size,
+           void         *buffer,
+           FBS_DIRECTION direction)
+{
+  GrLfbInfo_t info;
+  BEGIN_BOARD_LOCK();
+  info.size=sizeof(info);
+
+  if (grLfbLock(direction == FBS_READ ? GR_LFB_READ_ONLY : GR_LFB_WRITE_ONLY,
+                target_buffer,
+                GR_LFBWRITEMODE_ANY,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winX = fxMesa->x_offset;
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+#ifdef XF86DRI
+    /* stride in data elements */
+    const GLint srcStride =
+      (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+        ? (fxMesa->screen_width)
+        : (info.strideInBytes / data_size);
+#else
+    /* stride in data elements */
+    const GLint srcStride = info.strideInBytes / data_size;
+#endif
+    GLushort *data16 = (GLushort *) info.lfbPtr
+      + (winY - ypos) * srcStride
+      + (winX + xpos);
+    GLubyte *target16 = (GLubyte *)  buffer;
+    GLubyte *data8    = (GLubyte *)  data16;
+    GLubyte *target8  = (GLubyte *)  buffer;
+    GLuint  *data32   = (GLuint *)   data16;
+    GLuint  *target32 = (GLuint *)  buffer;
+    GLuint i, j;
+
+    for (i = j = 0; i < xlength; i += 1, j += 1) {
+      switch (data_size) {
+      case 1:
+        switch (direction) {
+        case FBS_READ:
+          *target8++ = *data8++;
+          break;
+        case FBS_WRITE:
+          *data8++ = *target8++;
+          break;
+        }
+        break;
+      case 2:
+        switch (direction) {
+        case FBS_READ:
+          *target16++ = *data16++;
+          break;
+        case FBS_WRITE:
+          *data16++ = *target16++;
+          break;
+        }
+        break;
+      case 4:
+        switch (direction) {
+        case FBS_READ:
+          *target32++ = *data32++;
+          break;
+        case FBS_WRITE:
+          *data32++ = *target32++;
+          break;
+        }
+        break;
+      }
+    }
+    grLfbUnlock(direction == FBS_READ ? GR_LFB_READ_ONLY : GR_LFB_WRITE_ONLY,
+                target_buffer);
+  }
+  END_BOARD_LOCK();
+}
+           
+static FxBool
+fb_point_is_clipped(fxMesaContext fxMesa,
+                    FxU32 dst_x, FxU32 dst_y)
+{
+  int i;
+  for (i=0; i<fxMesa->numClipRects; i++) {
+    if ((dst_x>=fxMesa->pClipRects[i].x1) && 
+        (dst_x<fxMesa->pClipRects[i].x2) &&
+        (dst_y>=fxMesa->pClipRects[i].y1) && 
+        (dst_y<fxMesa->pClipRects[i].y2)) {
+      return GL_FALSE;
+    }
+  }
+  return GL_TRUE;
+}
+
 static FxBool writeRegionClipped(fxMesaContext fxMesa, GrBuffer_t dst_buffer,
-			  FxU32 dst_x, FxU32 dst_y, GrLfbSrcFmt_t src_format,
-			  FxU32 src_width, FxU32 src_height, FxI32 src_stride,
-			  void *src_data)
+				 FxU32 dst_x, FxU32 dst_y, GrLfbSrcFmt_t src_format,
+				 FxU32 src_width, FxU32 src_height, FxI32 src_stride,
+				 void *src_data)
 {
   int i, x, w, srcElt;
   void *data;
@@ -80,12 +240,12 @@
   if (src_width==1 && src_height==1) { /* Easy case writing a point */
     for (i=0; i<fxMesa->numClipRects; i++) {
       if ((dst_x>=fxMesa->pClipRects[i].x1) && 
-	  (dst_x<fxMesa->pClipRects[i].x2) &&
-	  (dst_y>=fxMesa->pClipRects[i].y1) && 
-	  (dst_y<fxMesa->pClipRects[i].y2)) {
-	FX_grLfbWriteRegion(dst_buffer, dst_x, dst_y, src_format,
-			    1, 1, src_stride, src_data);
-	return GL_TRUE;
+          (dst_x<fxMesa->pClipRects[i].x2) &&
+          (dst_y>=fxMesa->pClipRects[i].y1) && 
+          (dst_y<fxMesa->pClipRects[i].y2)) {
+        FX_grLfbWriteRegion(dst_buffer, dst_x, dst_y, src_format,
+                            1, 1, src_stride, src_data);
+        return GL_TRUE;
       }
     }
   } else if (src_height==1) { /* Writing a span */
@@ -97,20 +257,20 @@
     }
     for (i=0; i<fxMesa->numClipRects; i++) {
       if (dst_y>=fxMesa->pClipRects[i].y1 && dst_y<fxMesa->pClipRects[i].y2) {
-	if (dst_x<fxMesa->pClipRects[i].x1) {
-	  x=fxMesa->pClipRects[i].x1;
-	  data=((char*)src_data)+srcElt*(dst_x-x);
-	  w=src_width-(x-dst_x);
-	} else {
-	  x=dst_x;
-	  data=src_data;
-	  w=src_width;
-	}
-	if (x+w>fxMesa->pClipRects[i].x2) {
-	  w=fxMesa->pClipRects[i].x2-x;
-	}
-	FX_grLfbWriteRegion(dst_buffer, x, dst_y, src_format, w, 1,
-			    src_stride, data);
+        if (dst_x<fxMesa->pClipRects[i].x1) {
+          x=fxMesa->pClipRects[i].x1;
+          data=((char*)src_data)+srcElt*(x - dst_x);
+          w=src_width-(x-dst_x);
+        } else {
+          x=dst_x;
+          data=src_data;
+          w=src_width;
+        }
+        if (x+w>fxMesa->pClipRects[i].x2) {
+          w=fxMesa->pClipRects[i].x2-x;
+        }
+        FX_grLfbWriteRegion(dst_buffer, x, dst_y, src_format, w, 1,
+                            src_stride, data);
       }
     }
   } else { /* Punt on the case of arbitrary rectangles */
@@ -119,88 +279,42 @@
   return GL_TRUE;
 }
 
-#else
 
-#define writeRegionClipped(fxm,dst_buffer,dst_x,dst_y,src_format,src_width,src_height,src_stride,src_data)		\
-  FX_grLfbWriteRegion(dst_buffer,dst_x,dst_y,src_format,src_width,src_height,src_stride,src_data)
 
-#endif
-
-
 /* KW: Rearranged the args in the call to grLfbWriteRegion().
  */
-#define LFB_WRITE_SPAN_MESA(dst_buffer,		\
-			    dst_x,		\
-			    dst_y,		\
-			    src_width,		\
-			    src_stride,		\
-			    src_data)		\
-  writeRegionClipped(fxMesa, dst_buffer,	\
-		   dst_x,			\
-		   dst_y,			\
-		   GR_LFB_SRC_FMT_8888,		\
-		   src_width,			\
-		   1,				\
-		   src_stride,			\
-		   src_data)			\
-
-
-#else /* !defined(FXMESA_USE_RGBA) */
-
-#define writeRegionClipped(fxm,dst_buffer,dst_x,dst_y,src_format,src_width,src_height,src_stride,src_data)		\
-  FX_grLfbWriteRegion(dst_buffer,dst_x,dst_y,src_format,src_width,src_height,src_stride,src_data)
-
-
-#define MESACOLOR_TO_ARGB(c) (				\
-             ( ((unsigned int)(c[ACOMP]))<<24 ) |	\
-             ( ((unsigned int)(c[RCOMP]))<<16 ) |	\
-             ( ((unsigned int)(c[GCOMP]))<<8 )  |	\
-             (  (unsigned int)(c[BCOMP])) )
-  
-inline void LFB_WRITE_SPAN_MESA(GrBuffer_t dst_buffer, 
-			 FxU32 dst_x, 
-			 FxU32 dst_y, 
-			 FxU32 src_width,
-			 FxI32 src_stride, 
-			 void *src_data )
-{
-   /* Covert to ARGB */
-   GLubyte (*rgba)[4] = src_data;
-   GLuint argb[MAX_WIDTH];
-   int i;
-   
-   for (i = 0; i < src_width; i++)
-   {
-      argb[i] = MESACOLOR_TO_ARGB(rgba[i]);
-   }
-   writeRegionClipped( /*fxMesa,*/ NULL, dst_buffer,
-		       dst_x,
-		       dst_y,
-		       GR_LFB_SRC_FMT_8888,
-		       src_width,
-		       1,
-		       src_stride,
-		       (void*)argb);
-}
- 
-#endif /* !defined(FXMESA_USE_RGBA) */
+#define LFB_WRITE_SPAN_MESA(dst_buffer,         \
+                            dst_x,              \
+                            dst_y,              \
+                            src_width,          \
+                            src_stride,         \
+                            src_data)           \
+  writeRegionClipped(fxMesa, dst_buffer,        \
+                   dst_x,                       \
+                   dst_y,                       \
+                   GR_LFB_SRC_FMT_8888,         \
+                   src_width,                   \
+                   1,                           \
+                   src_stride,                  \
+                   src_data)                    \
+
 
 
-/************************************************************************/
-/*****                    Span functions                            *****/
-/************************************************************************/
 
+/*
+ * 16bpp span/pixel functions
+ */
 
-static void fxDDWriteRGBASpan(const GLcontext *ctx, 
-                              GLuint n, GLint x, GLint y,
-                              const GLubyte rgba[][4], const GLubyte mask[])
+static void
+write_R5G6B5_rgba_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       const GLubyte rgba[][4], const GLubyte mask[])
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GLuint i;
   GLint bottom=fxMesa->height+fxMesa->y_offset-1; 
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteRGBASpan(...)\n");
+    fprintf(stderr,"fxmesa: fxDDWriteRGBASpan(...)\n");
   }
 
   x+=fxMesa->x_offset;
@@ -213,7 +327,7 @@
       } else {
         if (span > 0) {
           LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x+i-span, bottom-y,
-                           /* GR_LFB_SRC_FMT_8888,*/ span, /*1,*/ 0, (void *) rgba[i-span] );
+			       /* GR_LFB_SRC_FMT_8888,*/ span, /*1,*/ 0, (void *) rgba[i-span] );
           span = 0;
         }
       }
@@ -221,16 +335,16 @@
 
     if (span > 0)
       LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x+n-span, bottom-y,
-                        /* GR_LFB_SRC_FMT_8888, */ span, /*1,*/ 0, (void *) rgba[n-span] );
+			   /* GR_LFB_SRC_FMT_8888, */ span, /*1,*/ 0, (void *) rgba[n-span] );
   } else
     LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x, bottom-y,/* GR_LFB_SRC_FMT_8888,*/
-                      n,/* 1,*/ 0, (void *) rgba );
+			 n,/* 1,*/ 0, (void *) rgba );
 }
 
 
-static void fxDDWriteRGBSpan(const GLcontext *ctx, 
-                             GLuint n, GLint x, GLint y,
-                             const GLubyte rgb[][3], const GLubyte mask[])
+static void
+write_R5G6B5_rgb_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                      const GLubyte rgb[][3], const GLubyte mask[])
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GLuint i;
@@ -238,7 +352,7 @@
   GLubyte rgba[MAX_WIDTH][4];
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteRGBSpan()\n");
+    fprintf(stderr,"fxmesa: fxDDWriteRGBSpan()\n");
   }
 
   x+=fxMesa->x_offset;
@@ -255,7 +369,7 @@
       } else {
         if (span > 0) {
           LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x+i-span, bottom-y,
-                            /*GR_LFB_SRC_FMT_8888,*/ span,/* 1,*/ 0, (void *) rgba );
+			       /*GR_LFB_SRC_FMT_8888,*/ span,/* 1,*/ 0, (void *) rgba );
           span = 0;
         }
       }
@@ -263,7 +377,7 @@
 
     if (span > 0)
       LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x+n-span, bottom-y,
-                        /*GR_LFB_SRC_FMT_8888,*/ span,/* 1,*/ 0, (void *) rgba );
+			   /*GR_LFB_SRC_FMT_8888,*/ span,/* 1,*/ 0, (void *) rgba );
   } else {
     for (i=0;i<n;i++) {
       rgba[i][RCOMP]=rgb[i][0];
@@ -273,14 +387,14 @@
     }
 
     LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x, bottom-y,/* GR_LFB_SRC_FMT_8888,*/
-                      n,/* 1,*/ 0, (void *) rgba );
+			 n,/* 1,*/ 0, (void *) rgba );
   }
 }
 
 
-static void fxDDWriteMonoRGBASpan(const GLcontext *ctx, 
-                                  GLuint n, GLint x, GLint y,
-                                  const GLubyte mask[])
+static void
+write_R5G6B5_mono_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       const GLubyte mask[])
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GLuint i;
@@ -288,7 +402,7 @@
   GLuint data[MAX_WIDTH];
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteMonoRGBASpan(...)\n");
+    fprintf(stderr,"fxmesa: fxDDWriteMonoRGBASpan(...)\n");
   }
 
   x+=fxMesa->x_offset;
@@ -302,8 +416,8 @@
       } else {
         if (span > 0) {
           writeRegionClipped(fxMesa,  fxMesa->currentFB, x+i-span, bottom-y,
-                            GR_LFB_SRC_FMT_8888, span, 1, 0,
-                            (void *) data );
+			     GR_LFB_SRC_FMT_8888, span, 1, 0,
+			     (void *) data );
           span = 0;
         }
       }
@@ -311,95 +425,129 @@
 
     if (span > 0)
       writeRegionClipped(fxMesa,  fxMesa->currentFB, x+n-span, bottom-y,
-                        GR_LFB_SRC_FMT_8888, span, 1, 0,
-                        (void *) data );
+			 GR_LFB_SRC_FMT_8888, span, 1, 0,
+			 (void *) data );
   } else {
     for (i=0;i<n;i++) {
       data[i]=(GLuint) fxMesa->color;
     }
 
     writeRegionClipped(fxMesa,  fxMesa->currentFB, x, bottom-y, GR_LFB_SRC_FMT_8888,
-                      n, 1, 0, (void *) data );
+		       n, 1, 0, (void *) data );
   }
 }
 
 
-static void fxDDReadRGBASpan(const GLcontext *ctx, 
-                             GLuint n, GLint x, GLint y, GLubyte rgba[][4])
+/*
+ * Read a span of 16-bit RGB pixels.  Note, we don't worry about cliprects
+ * since OpenGL says obscured pixels have undefined values.
+ */
+static void
+read_R5G6B5_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                 GLubyte rgba[][4])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLushort data[MAX_WIDTH];
-  GLuint i;
-  GLint bottom=fxMesa->height+fxMesa->y_offset-1;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadRGBASpan(...)\n");
-  }
-
-  assert(n < MAX_WIDTH);
-
-  x+=fxMesa->x_offset;
-  FX_grLfbReadRegion( fxMesa->currentFB, x, bottom-y, n, 1, 0, data);
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbInfo_t info;
+  BEGIN_BOARD_LOCK();
+  info.size=sizeof(info);
+  if (grLfbLock(GR_LFB_READ_ONLY,
+                fxMesa->currentFB,
+                GR_LFBWRITEMODE_ANY,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winX = fxMesa->x_offset;
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+#ifdef XF86DRI
+    const GLint srcStride = (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+      ? (fxMesa->screen_width) : (info.strideInBytes / 2);
+#else
+    const GLint srcStride = info.strideInBytes / 2; /* stride in GLushorts */
+#endif
+    const GLushort *data16 = (const GLushort *) info.lfbPtr
+      + (winY - y) * srcStride
+      + (winX + x);
+    const GLuint *data32 = (const GLuint *) data16;
+    GLuint i, j;
+    GLuint extraPixel = (n & 1);
+    n -= extraPixel;
+    for (i = j = 0; i < n; i += 2, j++) {
+      GLuint pixel = data32[j];
+      GLuint pixel0 = pixel & 0xffff;
+      GLuint pixel1 = pixel >> 16;
+      rgba[i][RCOMP] = FX_PixelToR[pixel0];
+      rgba[i][GCOMP] = FX_PixelToG[pixel0];
+      rgba[i][BCOMP] = FX_PixelToB[pixel0];
+      rgba[i][ACOMP] = 255;
+      rgba[i+1][RCOMP] = FX_PixelToR[pixel1];
+      rgba[i+1][GCOMP] = FX_PixelToG[pixel1];
+      rgba[i+1][BCOMP] = FX_PixelToB[pixel1];
+      rgba[i+1][ACOMP] = 255;
+    }
+    if (extraPixel) {
+      GLushort pixel = data16[n];
+      rgba[n][RCOMP] = FX_PixelToR[pixel];
+      rgba[n][GCOMP] = FX_PixelToG[pixel];
+      rgba[n][BCOMP] = FX_PixelToB[pixel];
+      rgba[n][ACOMP] = 255;
+    }
 
-  for (i=0;i<n;i++) {
-    GLushort pixel = data[i];
-    rgba[i][RCOMP] = FX_PixelToR[pixel];
-    rgba[i][GCOMP] = FX_PixelToG[pixel];
-    rgba[i][BCOMP] = FX_PixelToB[pixel];
-    rgba[i][ACOMP] = 255;
+    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
   }
+  END_BOARD_LOCK();
 }
 
-/************************************************************************/
-/*****                    Pixel functions                           *****/
-/************************************************************************/
 
-static void fxDDWriteRGBAPixels(const GLcontext *ctx,
-                                GLuint n, const GLint x[], const GLint y[],
-                                CONST GLubyte rgba[][4], const GLubyte mask[])
+static void
+write_R5G6B5_pixels(const GLcontext *ctx,
+                    GLuint n, const GLint x[], const GLint y[],
+                    CONST GLubyte rgba[][4], const GLubyte mask[])
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GLuint i;
   GLint bottom=fxMesa->height+fxMesa->y_offset-1;
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteRGBAPixels(...)\n");
+    fprintf(stderr,"fxmesa: fxDDWriteRGBAPixels(...)\n");
   }
 
   for(i=0;i<n;i++)
     if(mask[i])
-       LFB_WRITE_SPAN_MESA(fxMesa->currentFB, x[i]+fxMesa->x_offset, bottom-y[i],
-                       1, 1, (void *)rgba[i]);
+      LFB_WRITE_SPAN_MESA(fxMesa->currentFB, x[i]+fxMesa->x_offset, bottom-y[i],
+			  1, 1, (void *)rgba[i]);
 }
+
 
-static void fxDDWriteMonoRGBAPixels(const GLcontext *ctx,
-                                    GLuint n, const GLint x[], const GLint y[],
-                                    const GLubyte mask[])
+static void
+write_R5G6B5_mono_pixels(const GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         const GLubyte mask[])
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GLuint i;
   GLint bottom=fxMesa->height+fxMesa->y_offset-1;
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteMonoRGBAPixels(...)\n");
+    fprintf(stderr,"fxmesa: fxDDWriteMonoRGBAPixels(...)\n");
   }
 
   for(i=0;i<n;i++)
     if(mask[i])
       writeRegionClipped(fxMesa, fxMesa->currentFB,x[i]+fxMesa->x_offset,bottom-y[i],
-                       GR_LFB_SRC_FMT_8888,1,1,0,(void *) &fxMesa->color);
+			 GR_LFB_SRC_FMT_8888,1,1,0,(void *) &fxMesa->color);
 }
 
-static void fxDDReadRGBAPixels(const GLcontext *ctx,
-                               GLuint n, const GLint x[], const GLint y[],
-                               GLubyte rgba[][4], const GLubyte mask[])
+static void
+read_R5G6B5_pixels(const GLcontext *ctx,
+                   GLuint n, const GLint x[], const GLint y[],
+                   GLubyte rgba[][4], const GLubyte mask[])
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GLuint i;
-  GLint bottom=fxMesa->y_delta-1;
+  GLint bottom=fxMesa->height+fxMesa->y_offset-1;
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadRGBAPixels(...)\n");
+    fprintf(stderr,"fxmesa: fxDDReadRGBAPixels(...)\n");
   }
 
   for(i=0;i<n;i++) {
@@ -414,20 +562,664 @@
   }
 }
 
+
+/*
+ * 24bpp span/pixel functions
+ */
+
+static void
+write_R8G8B8_rgb_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                      const GLubyte rgb[][3], const GLubyte mask[])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbWriteMode_t mode;
+  GrLfbInfo_t info;
+
+  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+    mode = GR_LFBWRITEMODE_888;
+  else
+    mode = GR_LFBWRITEMODE_888;
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_WRITE_ONLY,
+                fxMesa->currentFB,
+                mode,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    const GLint winX = fxMesa->x_offset;
+    const GLint scrX = winX + x;
+    const GLint scrY = winY - y;
+
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      /*GLint dstStride = fxMesa->screen_width * 3;*/
+      GLint dstStride = info.strideInBytes / 1;
+      GLubyte *dst = (GLubyte *) info.lfbPtr
+                   + (winY - y) * dstStride + (winX + x) * 1;
+      GLuint *dst32 = (GLuint *) dst;
+      GLubyte visMask[MAX_WIDTH];
+      GLuint i;
+      generate_vismask(fxMesa, scrX, scrY, n, visMask);
+      for (i = 0; i < n; i++) {
+        if (visMask[i] && (!mask || mask[i])) {
+          dst32[i] = PACK_BGRA32(rgb[i][0], rgb[i][1], rgb[i][2], 255);
+        }
+      }
+    }
+    else {
+      /* back buffer */
+      GLint dstStride = info.strideInBytes;
+      GLubyte *dst = (GLubyte *) info.lfbPtr
+                   + (winY - y) * dstStride + (winX + x) * 4;
+      GLuint *dst32 = (GLuint *) dst;
+      if (mask) {
+        GLuint i;
+        for (i = 0; i < n; i++) {
+          if (mask[i]) {
+            dst32[i] = PACK_RGBA32(rgb[i][0], rgb[i][1], rgb[i][2], 255);
+          }
+        }
+      }
+      else {
+        GLuint i;
+        for (i = 0; i < n; i++) {
+          dst32[i] = PACK_RGBA32(rgb[i][2], rgb[i][1], rgb[i][0], 255);
+        }
+      }
+    }
+    grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+  }
+  END_BOARD_LOCK();
+}
+
+
+
+static void
+write_R8G8B8_rgba_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       const GLubyte rgba[][4], const GLubyte mask[])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbWriteMode_t mode;
+  GrLfbInfo_t info;
+
+  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+    mode = GR_LFBWRITEMODE_8888;
+  else
+    mode = GR_LFBWRITEMODE_888 /*565*/;
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_WRITE_ONLY,
+                fxMesa->currentFB,
+                mode,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    const GLint winX = fxMesa->x_offset;
+    const GLint scrX = winX + x;
+    const GLint scrY = winY - y;
+
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      /* XXX have to do cliprect clipping! */
+      GLint dstStride = fxMesa->screen_width * 4;
+      GLubyte *dst = (GLubyte *) info.lfbPtr
+                   + (winY - y) * dstStride + (winX + x) * 4;
+      GLuint *dst32 = (GLuint *) dst;
+      GLubyte visMask[MAX_WIDTH];
+      GLuint i;
+      generate_vismask(fxMesa, scrX, scrY, n, visMask);
+      for (i = 0; i < n; i++) {
+        if (visMask[i] && (!mask || mask[i])) {
+          dst32[i] = PACK_BGRA32(rgba[i][0], rgba[i][1], rgba[i][2], rgba[i][3]);
+        }
+      }
+    }
+    else {
+      /* back buffer */
+      GLint dstStride = info.strideInBytes;
+      GLubyte *dst = (GLubyte *) info.lfbPtr
+                   + (winY - y) * dstStride + (winX + x) * 4;
+      if (mask) {
+        const GLuint *src32 = (const GLuint *) rgba;
+        GLuint *dst32 = (GLuint *) dst;
+        GLuint i;
+        for (i = 0; i < n; i++) {
+          if (mask[i]) {
+            dst32[i] = src32[i];
+          }
+        }
+      }
+      else {
+        /* no mask, write all pixels */
+        MEMCPY(dst, rgba, 4 * n);
+      }
+    }
+    grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+  }
+  END_BOARD_LOCK();
+}
+
+
+static void
+write_R8G8B8_mono_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       const GLubyte mask[])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GLubyte rgba[MAX_WIDTH][4];
+  GLuint *data = (GLuint *) rgba;
+  GLuint i;
+
+  /* XXX this is a simple-minded implementation but good enough for now */
+  for (i = 0; i < n; i++) {
+    data[i] = (GLuint) fxMesa->color;
+  }
+  write_R8G8B8_rgba_span(ctx, n, x, y, (const GLubyte (*)[4]) rgba, mask);
+}
+
+
+static void
+read_R8G8B8_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                 GLubyte rgba[][4])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbWriteMode_t mode;
+  GrLfbInfo_t info;
+
+  if (1 || fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+    mode = GR_LFBWRITEMODE_8888;
+  }
+  else {
+    mode = GR_LFBWRITEMODE_565; /*888*/ /*565*/;
+  }
 
-/************************************************************************/
-/*****                    Depth functions                           *****/
-/************************************************************************/
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_READ_ONLY,
+                fxMesa->currentFB,
+                mode, /*GR_LFBWRITEMODE_ANY,*/
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    const GLint winX = fxMesa->x_offset;
+
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      GLint srcStride = fxMesa->screen_width * 4;
+      const GLubyte *src = (const GLubyte *) info.lfbPtr
+                         + (winY - y) * srcStride + (winX + x) * 4;
+      GLuint i;
+      for (i = 0; i < n; i++) {
+        rgba[i][0] = src[i * 4 + 2];
+        rgba[i][1] = src[i * 4 + 1];
+        rgba[i][2] = src[i * 4 + 0];
+        rgba[i][3] = src[i * 4 + 3];
+      }
+    }
+    else {
+      /* back buffer */
+      GLint srcStride = /*info.strideInBytes;*/ 8192 / 2;  /* XXX a hack! */
+      const GLubyte *src = (const GLubyte *) info.lfbPtr
+                         + (winY - y) * srcStride + (winX + x) * 4;
+      GLuint i;
+      for (i = 0; i < n; i++) {
+        rgba[i][0] = src[i * 4 + 2];
+        rgba[i][1] = src[i * 4 + 1];
+        rgba[i][2] = src[i * 4 + 0];
+        rgba[i][3] = src[i * 4 + 3];
+      }
+    }
+    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+  }
+  END_BOARD_LOCK();
+}
+
+
+static void
+write_R8G8B8_pixels(const GLcontext *ctx,
+                    GLuint n, const GLint x[], const GLint y[],
+                    CONST GLubyte rgba[][4], const GLubyte mask[])
+{
+#if 00
+  GLuint i;
+  for (i = 0; i < n; i++) {
+    write_R8G8B8_rgba_span(ctx, 1, x[i], y[i], rgba + i, mask + i);
+  }
+
+#else
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbWriteMode_t mode;
+  GrLfbInfo_t info;
+
+  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+    mode = GR_LFBWRITEMODE_8888;
+  else
+    mode = GR_LFBWRITEMODE_888 /*565*/;
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_WRITE_ONLY,
+                fxMesa->currentFB,
+                mode,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+        const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+        const GLint winX = fxMesa->x_offset;
+        const GLint scrX = winX + x[i];
+        const GLint scrY = winY - y[i];
+        if (mask[i] && visible_pixel(fxMesa, scrX, scrY)) {
+          GLint dstStride = fxMesa->screen_width * 4;
+          GLubyte *dst = (GLubyte *) info.lfbPtr + scrY * dstStride + scrX * 4;
+          GLuint *dst32 = (GLuint *) dst;
+          *dst32 = PACK_BGRA32(rgba[i][0], rgba[i][1],
+                               rgba[i][2], rgba[i][3]);
+        }
+      }
+    }
+    else {
+      /* back buffer */
+      GLuint i;
+      for (i = 0; i < n; i++) {
+        const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+        const GLint winX = fxMesa->x_offset;
+        const GLint scrX = winX + x[i];
+        const GLint scrY = winY - y[i];
+        if (mask[i] && visible_pixel(fxMesa, scrX, scrY)) {
+          GLint dstStride = info.strideInBytes;
+          GLubyte *dst = (GLubyte *) info.lfbPtr + scrY * dstStride + scrX * 4;
+          GLuint *dst32 = (GLuint *) dst;
+          const GLuint *src32 = (const GLuint *) rgba;
+          *dst32 = src32[i];
+        }
+      }
+    }
+    grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+  }
+  END_BOARD_LOCK();
+#endif
+}
 
+
+static void
+write_R8G8B8_mono_pixels(const GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         const GLubyte mask[])
+{
+}
+
+
+static void
+read_R8G8B8_pixels(const GLcontext *ctx,
+                   GLuint n, const GLint x[], const GLint y[],
+                   GLubyte rgba[][4], const GLubyte mask[])
+{
+  printf("read_R8G8B8_pixels %d\n", n);
+}
+
+
+
+/*
+ * 32bpp span/pixel functions
+ */
+
+static void
+write_R8G8B8A8_rgb_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        const GLubyte rgb[][3], const GLubyte mask[])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbWriteMode_t mode;
+  GrLfbInfo_t info;
+
+  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+    mode = GR_LFBWRITEMODE_8888;
+  else
+    mode = GR_LFBWRITEMODE_888 /*565*/;
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_WRITE_ONLY,
+                fxMesa->currentFB,
+                mode,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    const GLint winX = fxMesa->x_offset;
+    const GLint scrX = winX + x;
+    const GLint scrY = winY - y;
+
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      GLint dstStride = fxMesa->screen_width * 4;
+      GLubyte * dst = (GLubyte *) info.lfbPtr
+                    + (winY - y) * dstStride + (winX + x) * 4;
+      GLuint *dst32 = (GLuint *) dst;
+      GLubyte visMask[MAX_WIDTH];
+      GLuint i;
+      generate_vismask(fxMesa, scrX, scrY, n, visMask);
+      for (i = 0; i < n; i++) {
+        if (visMask[i] && (!mask || mask[i])) {
+          dst32[i] = PACK_BGRA32(rgb[i][0], rgb[i][1], rgb[i][2], 255);
+        }
+      }
+    }
+    else {
+      /* back buffer */
+      GLint dstStride = info.strideInBytes;
+      GLubyte *dst = (GLubyte *) info.lfbPtr
+                   + (winY - y) * dstStride + (winX + x) * 4;
+      if (mask) {
+        GLuint *dst32 = (GLuint *) dst;
+        GLuint i;
+        for (i = 0; i < n; i++) {
+          if (mask[i]) {
+            dst32[i] = PACK_RGBA32(rgb[i][0], rgb[i][1], rgb[i][2], 255);
+          }
+        }
+      }
+      else {
+        GLuint *dst32 = (GLuint *) dst;
+        GLuint i;
+        for (i = 0; i < n; i++) {
+          dst32[i] = PACK_RGBA32(rgb[i][0], rgb[i][1], rgb[i][2], 255);
+        }
+      }
+    }
+    grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+  }
+  END_BOARD_LOCK();
+}
+
+
+/*
+ *XXX test of grLfbWriteRegion in 32bpp mode.  Doesn't seem to work!
+ */
+#if 0
+static void
+write_R8G8B8A8_rgb_span2(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        const GLubyte rgb[][3], const GLubyte mask[])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1; 
+  GLint x2 = fxMesa->x_offset +x;
+  GLint y2 = bottom - y;
+
+  FX_grLfbWriteRegion(fxMesa->currentFB, x2, y2, GR_LFB_SRC_FMT_888,
+                      n, 1, 0, rgb);
+}
+#endif
+
+
+static void
+write_R8G8B8A8_rgba_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         const GLubyte rgba[][4], const GLubyte mask[])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbWriteMode_t mode;
+  GrLfbInfo_t info;
+
+  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+    mode = GR_LFBWRITEMODE_8888;
+  else
+    mode = GR_LFBWRITEMODE_888 /*565*/;
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_WRITE_ONLY,
+                fxMesa->currentFB,
+                mode,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    const GLint winX = fxMesa->x_offset;
+    const GLint scrX = winX + x;
+    const GLint scrY = winY - y;
+
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      GLint dstStride = fxMesa->screen_width * 4;
+      GLubyte *dst = (GLubyte *) info.lfbPtr
+                   + (winY - y) * dstStride + (winX + x) * 4;
+      GLuint *dst32 = (GLuint *) dst;
+      GLubyte visMask[MAX_WIDTH];
+      GLuint i;
+      generate_vismask(fxMesa, scrX, scrY, n, visMask);
+      for (i = 0; i < n; i++) {
+        if (visMask[i] && (!mask || mask[i])) {
+          dst32[i] = PACK_BGRA32(rgba[i][0], rgba[i][1], rgba[i][2], rgba[i][3]);
+        }
+      }
+    }
+    else {
+      /* back buffer */
+      GLint dstStride = 8192; /* XXX a hack  info.strideInBytes; */
+      GLubyte *dst = (GLubyte *) info.lfbPtr
+                   + (winY - y) * dstStride + (winX + x) * 4;
+      if (mask) {
+        const GLuint *src32 = (const GLuint *) rgba;
+        GLuint *dst32 = (GLuint *) dst;
+        GLuint i;
+        for (i = 0; i < n; i++) {
+          if (mask[i]) {
+            dst32[i] = src32[i];
+          }
+        }
+      }
+      else {
+        /* no mask, write all pixels */
+        MEMCPY(dst, rgba, 4 * n);
+      }
+    }
+    grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+  }
+  else {
+    info.strideInBytes = -1;
+  }
+  END_BOARD_LOCK();
+}
+
+
+static void
+write_R8G8B8A8_mono_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         const GLubyte mask[])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GLubyte rgba[MAX_WIDTH][4];
+  GLuint *data = (GLuint *) rgba;
+  GLuint i;
+
+  /* XXX this is a simple-minded implementation but good enough for now */
+  for (i = 0; i < n; i++) {
+    data[i] = (GLuint) fxMesa->color;
+  }
+  write_R8G8B8A8_rgba_span(ctx, n, x, y, (const GLubyte (*)[4]) rgba, mask);
+}
+
+
+static void
+read_R8G8B8A8_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                   GLubyte rgba[][4])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbWriteMode_t mode;
+  GrLfbInfo_t info;
+
+  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+    mode = GR_LFBWRITEMODE_8888;
+  }
+  else {
+    mode = GR_LFBWRITEMODE_8888; /*565;*/
+  }
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_READ_ONLY,
+                fxMesa->currentFB,
+                mode,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    const GLint winX = fxMesa->x_offset;
+
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      GLint srcStride = fxMesa->screen_width;
+      const GLuint *src32 = (const GLuint *) info.lfbPtr
+                          + (winY - y) * srcStride + (winX + x);
+      GLuint i;
+      for (i = 0; i < n; i++) {
+        const GLuint p = src32[i];
+        rgba[i][0] = (p >> 16) & 0xff;
+        rgba[i][1] = (p >>  8) & 0xff;
+        rgba[i][2] = (p >>  0) & 0xff;
+        rgba[i][3] = (p >> 24) & 0xff;
+      }
+    }
+    else {
+      /* back buffer */
+      GLint srcStride = 1024;  /* XXX a hack */
+      const GLuint *src32 = (const GLuint *) info.lfbPtr
+                          + (winY - y) * srcStride + (winX + x);
+      GLuint i;
+      for (i = 0; i < n; i++) {
+        GLuint p = src32[i];
+        rgba[i][0] = (p >> 16) & 0xff;
+        rgba[i][1] = (p >>  8) & 0xff;
+        rgba[i][2] = (p >>  0) & 0xff;
+        rgba[i][3] = (p >> 24) & 0xff;
+      }
+    }
+    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+  }
+  else
+    info.strideInBytes = -1;
+  END_BOARD_LOCK();
+}
+
+
+static void
+write_R8G8B8A8_pixels(const GLcontext *ctx,
+                      GLuint n, const GLint x[], const GLint y[],
+                      CONST GLubyte rgba[][4], const GLubyte mask[])
+{
+#if 00
+  GLuint i;
+  for (i = 0; i < n; i++) {
+    write_R8G8B8A8_rgba_span(ctx, 1, x[i], y[i], rgba + i, mask + i);
+  }
+
+#else
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbWriteMode_t mode;
+  GrLfbInfo_t info;
+
+  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
+    mode = GR_LFBWRITEMODE_8888;
+  else
+    mode = GR_LFBWRITEMODE_888 /*565*/;
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_WRITE_ONLY,
+                fxMesa->currentFB,
+                mode,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+        const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+        const GLint winX = fxMesa->x_offset;
+        const GLint scrX = winX + x[i];
+        const GLint scrY = winY - y[i];
+        if (mask[i] && visible_pixel(fxMesa, scrX, scrY)) {
+          GLint dstStride = fxMesa->screen_width * 4;
+          GLubyte *dst = (GLubyte *) info.lfbPtr + scrY * dstStride + scrX * 4;
+          GLuint *dst32 = (GLuint *) dst;
+          *dst32 = PACK_BGRA32(rgba[i][0], rgba[i][1],
+                               rgba[i][2], rgba[i][3]);
+        }
+      }
+    }
+    else {
+      /* back buffer */
+      GLuint i;
+      for (i = 0; i < n; i++) {
+        const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+        const GLint winX = fxMesa->x_offset;
+        const GLint scrX = winX + x[i];
+        const GLint scrY = winY - y[i];
+        if (mask[i] && visible_pixel(fxMesa, scrX, scrY)) {
+          GLint dstStride = info.strideInBytes;
+          GLubyte *dst = (GLubyte *) info.lfbPtr + scrY * dstStride + scrX * 4;
+          GLuint *dst32 = (GLuint *) dst;
+          const GLuint *src32 = (const GLuint *) rgba;
+          *dst32 = src32[i];
+        }
+      }
+    }
+    grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+  }
+  END_BOARD_LOCK();
+#endif
+}
+
+
+static void
+write_R8G8B8A8_mono_pixels(const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           const GLubyte mask[])
+{
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx; 
+  GLuint i;
+  GLuint color = fxMesa->color;
+  for (i = 0; i < n; i++) {
+    if (mask[i]) {
+      write_R8G8B8A8_rgba_span(ctx, 1, x[i], y[i],
+                               (const GLubyte (*)[4]) &color, mask + i);
+    }
+  }
+}
+
+
+
+static void
+read_R8G8B8A8_pixels(const GLcontext *ctx,
+                     GLuint n, const GLint x[], const GLint y[],
+                     GLubyte rgba[][4], const GLubyte mask[])
+{
+  GLuint i;
+  for (i = 0; i < n; i++) {
+    if (mask[i]) {
+      read_R8G8B8A8_span(ctx, 1, x[i], y[i], rgba + i);
+    }
+  }
+  printf("read_R8G8B8A8_pixels %d\n", n);
+}
+
+
+
+/*
+ * Depth buffer read/write functions.
+ */
+
 void fxDDWriteDepthSpan(GLcontext *ctx,
                         GLuint n, GLint x, GLint y, const GLdepth depth[],
                         const GLubyte mask[])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLint bottom=fxMesa->height+fxMesa->y_offset-1;
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1;
+  GLuint depth_size = fxMesa->glVis->DepthBits;
+  GLuint stencil_size = fxMesa->glVis->StencilBits;
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadDepthSpanInt(...)\n");
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxDDWriteDepthSpan(...)\n");
   }
 
   x += fxMesa->x_offset;
@@ -436,14 +1228,77 @@
     GLint i;
     for (i = 0; i < n; i++) {
       if (mask[i]) {
-        writeRegionClipped(fxMesa, GR_BUFFER_AUXBUFFER, x + i, bottom-y,
-                           GR_LFB_SRC_FMT_ZA16, 1, 1, 0, (void *) &depth[i]);
+	GLshort d16;
+	GLuint d32;
+	switch (depth_size) {
+	case 16:
+	  d16 = depth[i];
+	  writeRegionClipped(fxMesa, GR_BUFFER_AUXBUFFER, x + i, bottom - y,
+			     GR_LFB_SRC_FMT_ZA16, 1, 1, 0, (void *) &d16);
+	  break;
+	case 32:
+	  if (!fb_point_is_clipped(fxMesa, x+i, bottom-y)) {
+	    if (stencil_size > 0) {
+	      rw_fb_span(fxMesa,
+			 GR_BUFFER_AUXBUFFER,
+			 x + i, bottom - y,
+			 1,
+			 sizeof(GLdepth),
+			 &d32,
+			 FBS_READ);
+	      d32 = depth[i] & 0xFF000000;
+	      break;
+	    } else {
+	      d32 = depth[i];
+	    }
+	    rw_fb_span(fxMesa,
+		       GR_BUFFER_AUXBUFFER,
+		       x + i, bottom - y,
+		       1,
+		       sizeof(GLdepth),
+		       &d32,
+		       FBS_WRITE);
+	  }
+	}
       }
     }
-  }
-  else {
-    writeRegionClipped(fxMesa, GR_BUFFER_AUXBUFFER, x, bottom-y,
-                       GR_LFB_SRC_FMT_ZA16, n, 1, 0, (void *) depth);
+  } else {
+    GLushort depth16[MAX_WIDTH];
+    GLint i;
+    GLuint d32;
+    switch (depth_size) {
+    case 16:
+      for (i = 0; i < n; i++) {
+	depth16[i] = depth[i];
+      }
+      writeRegionClipped(fxMesa, GR_BUFFER_AUXBUFFER, x, bottom - y,
+			 GR_LFB_SRC_FMT_ZA16, n, 1, 0, (void *) depth16);
+      break;
+    case 32:
+      for (i = 0; i < n; i++) {
+	if (fb_point_is_clipped(fxMesa, x+i, bottom-y)) {
+	  if (stencil_size > 0) {
+	    rw_fb_span(fxMesa,
+		       GR_BUFFER_AUXBUFFER,
+		       x + i, bottom - y,
+		       1,
+		       sizeof(GLdepth),
+		       &d32,
+		       FBS_READ);
+	    d32 = (d32 & 0xFF0000) | (depth[i] & 0x00FFFFFF);
+	  } else {
+	    d32 = depth[i];
+	  }
+	  rw_fb_span(fxMesa,
+		     GR_BUFFER_AUXBUFFER,
+		     x + i, bottom - y,
+		     1,
+		     sizeof(GLdepth),
+		     &d32,
+		     FBS_WRITE);
+	}
+      }	   
+    }
   }
 }
 
@@ -451,15 +1306,39 @@
 void fxDDReadDepthSpan(GLcontext *ctx,
                        GLuint n, GLint x, GLint y, GLdepth depth[])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLint bottom=fxMesa->height+fxMesa->y_offset-1;
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1;
+  GLushort depth16[MAX_WIDTH];
+  GLuint i;
+  GLuint depth_size = fxMesa->glVis->DepthBits;
+  GLuint stencil_size = fxMesa->glVis->StencilBits;
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadDepthSpanInt(...)\n");
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxDDReadDepthSpan(...)\n");
   }
 
-  x+=fxMesa->x_offset;
-  FX_grLfbReadRegion(GR_BUFFER_AUXBUFFER,x,bottom-y,n,1,0,depth);
+  x += fxMesa->x_offset;
+  switch (depth_size) {
+  case 16:
+    FX_grLfbReadRegion(GR_BUFFER_AUXBUFFER, x, bottom - y, n, 1, 0, depth16);
+    for (i = 0; i < n; i++) {
+      depth[i] = depth16[i];
+    }
+    break;
+  case 32:
+    rw_fb_span(fxMesa,
+	       GR_BUFFER_AUXBUFFER,
+	       x, bottom - y,
+	       n,
+	       sizeof(GLdepth),
+	       depth,
+	       FBS_READ);
+    if (stencil_size > 0) {
+      for (i = 0; i < n; i++) {
+	depth[i] &= 0xFFFFFF;
+      }
+    }
+  }
 }
 
 
@@ -468,20 +1347,56 @@
                           GLuint n, const GLint x[], const GLint y[],
                           const GLdepth depth[], const GLubyte mask[])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLint bottom=fxMesa->height+fxMesa->y_offset-1;
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1;
   GLuint i;
+  GLuint d32;
+  GLuint depth_size = fxMesa->glVis->DepthBits;
+  GLuint stencil_size = fxMesa->glVis->StencilBits;
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadDepthSpanInt(...)\n");
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxDDWriteDepthPixels(...)\n");
   }
 
   for (i = 0; i < n; i++) {
     if (mask[i]) {
       int xpos = x[i] + fxMesa->x_offset;
       int ypos = bottom - y[i];
-      writeRegionClipped(fxMesa, GR_BUFFER_AUXBUFFER, xpos, ypos,
-                         GR_LFB_SRC_FMT_ZA16, 1, 1, 0, (void *) &depth[i]);
+      GLushort d16 = depth[i];
+      switch (depth_size) {
+      case 16:
+	writeRegionClipped(fxMesa, GR_BUFFER_AUXBUFFER, xpos, ypos,
+			   GR_LFB_SRC_FMT_ZA16, 1, 1, 0,
+			   (void *) &d16);
+	break;
+      case 32:
+        if (!fb_point_is_clipped(fxMesa, xpos, ypos)) {
+          if (stencil_size > 0) {
+	    /*
+	     * Should I sign extend this?  I don't
+	     * believe so, since GLdepth is unsigned.
+	     */
+            rw_fb_span(fxMesa,
+                       GR_BUFFER_AUXBUFFER,
+                       xpos, ypos,
+                       1,
+                       sizeof(GLdepth),
+                       &d32,
+                       FBS_READ);
+            d32 = (d32 &~ 0xFF000000) | (depth[i] & 0x00FFFFFF);
+          } else {
+            d32 = depth[i];
+          }
+          rw_fb_span(fxMesa,
+                     GR_BUFFER_AUXBUFFER,
+                     xpos, ypos,
+                     1,
+                     sizeof(GLdepth),
+                     &d32,
+                     FBS_WRITE);
+        }
+        break;
+      }
     }
   }
 }
@@ -490,60 +1405,421 @@
 void fxDDReadDepthPixels(GLcontext *ctx, GLuint n,
                          const GLint x[], const GLint y[], GLdepth depth[])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLint bottom=fxMesa->height+fxMesa->y_offset-1;
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1;
   GLuint i;
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadDepthSpanInt(...)\n");
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxDDReadDepthPixels(...)\n");
   }
 
-
   for (i = 0; i < n; i++) {
     int xpos = x[i] + fxMesa->x_offset;
     int ypos = bottom - y[i];
-    FX_grLfbReadRegion(GR_BUFFER_AUXBUFFER,xpos,ypos,1,1,0,&depth[i]);
+    GLushort d16;
+    GLuint d32;
+    GLuint depth_size = fxMesa->glVis->DepthBits;
+    GLuint stencil_size = fxMesa->glVis->StencilBits;
+    
+    assert((depth_size == 16) || (depth_size == 24) || (depth_size == 32));
+    switch (depth_size) {
+    case 16:
+      FX_grLfbReadRegion(GR_BUFFER_AUXBUFFER, xpos, ypos, 1, 1, 0, &d16);
+      depth[i] = d16;
+      break;
+    case 24:
+    case 32:
+      rw_fb_span(fxMesa,
+		 GR_BUFFER_AUXBUFFER,
+		 xpos, ypos,
+		 1,
+		 depth_size/8,
+		 &d32,
+		 FBS_READ);
+      /*
+       * Get rid of the stencil bits.  Should I sign
+       * extend this?  I don't believe so, since GLdepth
+       * is unsigned.
+       */
+      if (stencil_size > 0) {
+	d32 &= 0xFFFFFF;
+      }
+      depth[i] = d32;
+      break;
+    default:
+      assert(0);
+    }
   }
 }
 
 
+/*
+ * Stencil buffer read/write functions.
+ */
 
+#define DEPTH_VALUE_TO_STENCIL_VALUE(d)         (((d) >> 24) & 0xFF)
+#define STENCIL_VALUE_TO_DEPTH_VALUE(s,d) \
+        ((((s) & 0xFF) << 24) | ((d) & 0xFFFFFF))
+#define ASSEMBLE_STENCIL_VALUE(os, ns, mask) \
+        (((os) &~ (mask)) | ((ns) & (mask)))
 
-/************************************************************************/
+#if 00
+/*
+ * Read a horizontal span of stencil values from the stencil buffer.
+ */
+void
+fxDDReadStencilSpan( GLcontext *ctx,
+                     GLuint n,
+                     GLint x,
+                     GLint y,
+                     GLstencil stencil[] )
+{
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1;
+  GLuint i;
+  int xpos = x + fxMesa->x_offset;
+  int ypos = bottom - y;
 
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxDDReadStencilSpan(...)\n");
+  }
 
-void fxSetupDDSpanPointers(GLcontext *ctx)
+  for (i = 0; i < n; i++, ypos += 1) {
+    GLuint d;
+    rw_fb_span(fxMesa,
+	       GR_BUFFER_AUXBUFFER,
+	       xpos, ypos,
+	       1,
+	       sizeof(GLdepth),
+	       &d,
+	       FBS_READ);
+    stencil[i] = DEPTH_VALUE_TO_STENCIL_VALUE(d);
+  }
+}
+
+/*
+ * Write a horizontal span of stencil values into the stencil buffer.
+ * If mask is NULL, write all stencil values.
+ * Else, only write stencil[i] if mask[i] is non-zero.
+ */
+void
+fxDDWriteStencilSpan( GLcontext *ctx,
+                      GLuint n,
+                      GLint x,
+                      GLint y,
+                      const GLstencil stencil[],
+                      const GLubyte mask[] )
 {
-  ctx->Driver.WriteRGBASpan       =fxDDWriteRGBASpan;
-  ctx->Driver.WriteRGBSpan        =fxDDWriteRGBSpan;
-  ctx->Driver.WriteMonoRGBASpan   =fxDDWriteMonoRGBASpan;
-  ctx->Driver.WriteRGBAPixels     =fxDDWriteRGBAPixels;
-  ctx->Driver.WriteMonoRGBAPixels =fxDDWriteMonoRGBAPixels;
-
-  ctx->Driver.WriteCI8Span        =NULL;
-  ctx->Driver.WriteCI32Span       =NULL;
-  ctx->Driver.WriteMonoCISpan     =NULL;
-  ctx->Driver.WriteCI32Pixels     =NULL;
-  ctx->Driver.WriteMonoCIPixels   =NULL;
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1;
+  GLuint i;
+  int xpos = x + fxMesa->x_offset;
+  int ypos = bottom - y;
 
-  ctx->Driver.ReadRGBASpan        =fxDDReadRGBASpan;
-  ctx->Driver.ReadRGBAPixels      =fxDDReadRGBAPixels;
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxDDWriteStencilSpan(...)\n");
+  }
 
-  ctx->Driver.ReadCI32Span        =NULL;
-  ctx->Driver.ReadCI32Pixels      =NULL;
+  for (i = 0; i < n; i++, ypos += 1) {
+    GLdepth d;
+    GLstencil ns;
+    rw_fb_span(fxMesa,
+	       GR_BUFFER_AUXBUFFER,
+	       xpos, ypos,
+	       1,
+	       sizeof(GLdepth),
+	       &d,
+	       FBS_READ);
+   /*
+    * Find the old stencil value, and strip off the bits
+    * we are going to write.
+    */
+    ns = ASSEMBLE_STENCIL_VALUE(DEPTH_VALUE_TO_STENCIL_VALUE(d),
+                                stencil[i],
+                                mask[i]);
+   /*
+    * Now, assemble the new StenDepth value, with the old
+    * depth value, the old stencil value in the bits
+    * where mask is 0, and the new stencil value in the bits
+    * where mask is 1.
+    */
+    d = STENCIL_VALUE_TO_DEPTH_VALUE(ns, d);
+    rw_fb_span(fxMesa,
+	       GR_BUFFER_AUXBUFFER,
+	       xpos, ypos,
+	       1,
+	       sizeof(GLdepth),
+	       &d,
+	       FBS_WRITE);
+  }
 }
 
+/* Write an array of stencil values into the stencil buffer.
+ * If mask is NULL, write all stencil values.
+ * Else, only write stencil[i] if mask[i] is non-zero.
+ */
+void
+fxDDReadStencilPixels( GLcontext *ctx,
+                       GLuint n,
+                       const GLint x[],
+                       const GLint y[],
+                       GLstencil stencil[])
+{
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1;
+  GLuint i;
 
-#else
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxDDReadStencilPixels(...)\n");
+  }
 
+  for (i = 0; i < n; i++) {
+    int xpos = x[i] + fxMesa->x_offset;
+    int ypos = bottom - y[i];
+    GLuint d;
+    rw_fb_span(fxMesa,
+               GR_BUFFER_AUXBUFFER,
+	       xpos, ypos,
+	       1,
+	       sizeof(GLdepth),
+	       &d,
+	       FBS_READ);
+    stencil[i] = DEPTH_VALUE_TO_STENCIL_VALUE(d);
+  }
+}
 
 /*
- * Need this to provide at least one external definition.
+ * Read an array of stencil values from the stencil buffer.
  */
+void
+fxDDWriteStencilPixels( GLcontext *ctx,
+                        GLuint n,
+                        const GLint x[],
+                        const GLint y[],
+                        const GLstencil stencil[],
+			const GLstencil mask[])
+{
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
+  GLint bottom = fxMesa->height + fxMesa->y_offset - 1;
+  GLuint i;
+
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxmesa: fxDDWriteStencilPixels(...)\n");
+  }
+
+  for (i = 0; i < n; i++) {
+    int xpos = x[i] + fxMesa->x_offset;
+    int ypos = bottom - y[i];
+    GLuint d;
+    rw_fb_span(fxMesa,
+               GR_BUFFER_AUXBUFFER,
+	       xpos, ypos,
+	       1,
+	       sizeof(GLdepth),
+	       &d,
+	       FBS_READ);
+    d = STENCIL_VALUE_TO_DEPTH_VALUE(stencil[i], d);
+    rw_fb_span(fxMesa,
+               GR_BUFFER_AUXBUFFER,
+	       xpos, ypos,
+	       1,
+	       sizeof(GLdepth),
+	       &d,
+	       FBS_WRITE);
+  }
+}
+#endif /* disable fxddStencil* funcs */
+
+
+#define EXTRACT_S_FROM_ZS(zs) (((zs) >> 24) & 0xFF)
+#define EXTRACT_Z_FROM_ZS(zs) ((zs) & 0xffffff)
+#define BUILD_ZS(z, s)  (((s) << 24) | (z))
+
+static void write_stencil_span(GLcontext *ctx, GLuint n, GLint x, GLint y,
+                               const GLstencil stencil[],
+                               const GLubyte mask[] )
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbInfo_t info;
+  int s;
+  void *d;
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_WRITE_ONLY,
+                GR_BUFFER_AUXBUFFER,
+                GR_LFBWRITEMODE_Z32,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    const GLint winX = fxMesa->x_offset;
+    const GLint scrX = winX + x;
+    const GLint scrY = winY - y;
+
+    GLint dstStride = info.strideInBytes;
+    GLubyte *dst = (GLubyte *) info.lfbPtr
+                   + (winY - y) * dstStride + (winX + x) * 4;
+    GLuint *dst32 = (GLuint *) dst;
+    GLubyte visMask[MAX_WIDTH];
+    GLuint i;
+    generate_vismask(fxMesa, scrX, scrY, n, visMask);
+    s = dstStride;
+    d = dst32;
+    for (i = 0; i < n; i++) {
+      if (visMask[i] && (!mask || mask[i])) {
+        GLuint zs = dst32[i];
+        GLuint z = EXTRACT_Z_FROM_ZS(zs);
+        zs = BUILD_ZS(z, stencil[i]);
+        dst32[i] = /*zs;*/ stencil[i];
+      }
+    }
+    grLfbUnlock(GR_LFB_WRITE_ONLY, GR_BUFFER_AUXBUFFER);
+  }
+  else {
+    s = -1;
+    d = 0;
+  }
+  END_BOARD_LOCK();
+  /*
+  printf("write stencil span %d %p\n", s, d);
+  printf("info: size=%d lfbPtr=%p stride=%x writeMode=%x origin=%x\n",
+    info.size, info.lfbPtr, info.strideInBytes, info.writeMode, info.origin);
+  */
+}
+
+
+static void
+read_stencil_span(GLcontext *ctx, GLuint n, GLint x, GLint y,
+                  GLstencil stencil[])
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  GrLfbInfo_t info;
+  /*
+  int s;
+  void *d;
+  */
+
+  BEGIN_BOARD_LOCK();
+  info.size = sizeof(info);
+  if (grLfbLock(GR_LFB_READ_ONLY,
+                GR_BUFFER_AUXBUFFER,
+                GR_LFBWRITEMODE_Z32,
+                GR_ORIGIN_UPPER_LEFT,
+                FXFALSE,
+                &info)) {
+    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
+    const GLint winX = fxMesa->x_offset;
+    GLint srcStride = /*info.strideInBytes;*/ 8192 ;  /* XXX a hack! */
+    const GLubyte *src = (const GLubyte *) info.lfbPtr
+                       + (winY - y) * srcStride + (winX + x) * 4;
+    const GLuint *src32 = (const GLuint *) src;
+    GLuint i;
+    /*
+    s = srcStride;
+    d = src32;
+    */
+    for (i = 0; i < n; i++) {
+      stencil[i] = EXTRACT_S_FROM_ZS(src32[i]);
+    }
+    grLfbUnlock(GR_LFB_READ_ONLY, GR_BUFFER_AUXBUFFER);
+  }
+  END_BOARD_LOCK();
+  /*
+  printf("read stencil span %d %p\n", s, d);
+  printf("info: size=%d lfbPtr=%p stride=%x writeMode=%x origin=%x\n",
+    info.size, info.lfbPtr, info.strideInBytes, info.writeMode, info.origin);
+  */
+}
+
+
+static void
+write_stencil_pixels( GLcontext *ctx, GLuint n,
+                      const GLint x[], const GLint y[],
+                      const GLstencil stencil[], const GLubyte mask[])
+{
+  /* XXX optimize this */
+  GLuint i;
+  for (i = 0; i < n; i++) {
+    if (mask[i]) {
+      write_stencil_span(ctx, 1, x[i], y[i], stencil + i, mask + i);
+    }
+  }
+}
+
 
-int gl_fx_dummy_function_span(void)
+static void
+read_stencil_pixels(GLcontext *ctx, GLuint n, const GLint x[], const GLint y[],
+                    GLstencil stencil[])
 {
-  return 0;
+  /* XXX optimize this */
+  GLuint i;
+  for (i = 0; i < n; i++) {
+    read_stencil_span(ctx, 1, x[i], y[i], stencil + i);
+  }
 }
 
-#endif  /* FX */
+
+
+void fxSetupDDSpanPointers(GLcontext *ctx)
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+  if (ctx->Visual->RedBits   == 5 &&
+      ctx->Visual->GreenBits == 6 &&
+      ctx->Visual->BlueBits  == 5 &&
+      ctx->Visual->AlphaBits == 0) {
+    /* 16bpp mode */
+    ctx->Driver.WriteRGBASpan       = write_R5G6B5_rgba_span;
+    ctx->Driver.WriteRGBSpan        = write_R5G6B5_rgb_span;
+    ctx->Driver.WriteMonoRGBASpan   = write_R5G6B5_mono_span;
+    ctx->Driver.WriteRGBAPixels     = write_R5G6B5_pixels;
+    ctx->Driver.WriteMonoRGBAPixels = write_R5G6B5_mono_pixels;
+    ctx->Driver.ReadRGBASpan        = read_R5G6B5_span;
+    ctx->Driver.ReadRGBAPixels      = read_R5G6B5_pixels;
+  }
+  else if (ctx->Visual->RedBits   == 8 &&
+           ctx->Visual->GreenBits == 8 &&
+           ctx->Visual->BlueBits  == 8 &&
+           ctx->Visual->AlphaBits == 0) {
+    /* 24bpp mode */
+    ctx->Driver.WriteRGBASpan       = write_R8G8B8_rgba_span;
+    ctx->Driver.WriteRGBSpan        = write_R8G8B8_rgb_span;
+    ctx->Driver.WriteMonoRGBASpan   = write_R8G8B8_mono_span;
+    ctx->Driver.WriteRGBAPixels     = write_R8G8B8_pixels;
+    ctx->Driver.WriteMonoRGBAPixels = write_R8G8B8_mono_pixels;
+    ctx->Driver.ReadRGBASpan        = read_R8G8B8_span;
+    ctx->Driver.ReadRGBAPixels      = read_R8G8B8_pixels;
+  }
+  else if (ctx->Visual->RedBits   == 8 &&
+           ctx->Visual->GreenBits == 8 &&
+           ctx->Visual->BlueBits  == 8 &&
+           ctx->Visual->AlphaBits == 8) {
+    /* 32bpp mode */
+    ctx->Driver.WriteRGBASpan       = write_R8G8B8A8_rgba_span;
+    ctx->Driver.WriteRGBSpan        = write_R8G8B8A8_rgb_span;
+    ctx->Driver.WriteMonoRGBASpan   = write_R8G8B8A8_mono_span;
+    ctx->Driver.WriteRGBAPixels     = write_R8G8B8A8_pixels;
+    ctx->Driver.WriteMonoRGBAPixels = write_R8G8B8A8_mono_pixels;
+    ctx->Driver.ReadRGBASpan        = read_R8G8B8A8_span;
+    ctx->Driver.ReadRGBAPixels      = read_R8G8B8A8_pixels;
+  }
+  else {
+    abort();
+  }
+
+  if (fxMesa->haveHwStencil) {
+    ctx->Driver.WriteStencilSpan    = write_stencil_span;
+    ctx->Driver.ReadStencilSpan     = read_stencil_span;
+    ctx->Driver.WriteStencilPixels  = write_stencil_pixels;
+    ctx->Driver.ReadStencilPixels   = read_stencil_pixels;
+  }
+
+  ctx->Driver.WriteCI8Span        = NULL;
+  ctx->Driver.WriteCI32Span       = NULL;
+  ctx->Driver.WriteMonoCISpan     = NULL;
+  ctx->Driver.WriteCI32Pixels     = NULL;
+  ctx->Driver.WriteMonoCIPixels   = NULL;
+  ctx->Driver.ReadCI32Span        = NULL;
+  ctx->Driver.ReadCI32Pixels      = NULL;
+}
Index: xc/extras/Mesa/src/FX/fxddtex.c
diff -u xc/extras/Mesa/src/FX/fxddtex.c:1.3 xc/extras/Mesa/src/FX/fxddtex.c:1.5
--- xc/extras/Mesa/src/FX/fxddtex.c:1.3	Mon Feb 14 23:13:06 2000
+++ xc/extras/Mesa/src/FX/fxddtex.c	Mon Jun 19 22:08:17 2000
@@ -50,7 +50,10 @@
 #if defined(FX)
 
 #include "fxdrv.h"
+#include "image.h"
+#include "texutil.h"
 
+
 void fxPrintTextureData(tfxTexInfo *ti)
 {
   fprintf(stderr, "Texture Data:\n");
@@ -63,17 +66,18 @@
   } else
     fprintf(stderr, "\tName: UNNAMED\n");
   fprintf(stderr, "\tLast used: %d\n", ti->lastTimeUsed);
-  fprintf(stderr, "\tTMU: %d\n", ti->whichTMU);
+  fprintf(stderr, "\tTMU: %ld\n", ti->whichTMU);
   fprintf(stderr, "\t%s\n", (ti->isInTM)?"In TMU":"Not in TMU");
   if (ti->tm[0]) 
-    fprintf(stderr, "\tMem0: %x-%x\n", ti->tm[0]->startAddr, 
-	    ti->tm[0]->endAddr);
+    fprintf(stderr, "\tMem0: %x-%x\n", (unsigned) ti->tm[0]->startAddr, 
+	    (unsigned) ti->tm[0]->endAddr);
   if (ti->tm[1]) 
-    fprintf(stderr, "\tMem1: %x-%x\n", ti->tm[1]->startAddr, 
-	    ti->tm[1]->endAddr);
+    fprintf(stderr, "\tMem1: %x-%x\n", (unsigned) ti->tm[1]->startAddr, 
+	    (unsigned) ti->tm[1]->endAddr);
   fprintf(stderr, "\tMipmaps: %d-%d\n", ti->minLevel, ti->maxLevel);
-  fprintf(stderr, "\tFilters: min %d min %d\n", ti->minFilt, ti->maxFilt);
-  fprintf(stderr, "\tClamps: s %d t %d\n", ti->sClamp, ti->tClamp);
+  fprintf(stderr, "\tFilters: min %d min %d\n",
+          (int) ti->minFilt, (int) ti->maxFilt);
+  fprintf(stderr, "\tClamps: s %d t %d\n", (int) ti->sClamp, (int) ti->tClamp);
   fprintf(stderr, "\tScales: s %f t %f\n", ti->sScale, ti->tScale);
   fprintf(stderr, "\tInt Scales: s %d t %d\n", 
 	  ti->int_sScale/0x800000, ti->int_tScale/0x800000);
@@ -86,14 +90,14 @@
 /*************************** Texture Mapping ****************************/
 /************************************************************************/
 
-void fxTexInvalidate(GLcontext *ctx, struct gl_texture_object *tObj)
+static void fxTexInvalidate(GLcontext *ctx, struct gl_texture_object *tObj)
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   tfxTexInfo *ti;
 
-  fxTMMoveOutTM(fxMesa,tObj); /* TO DO: SLOW but easy to write */
-
   ti=fxTMGetTexInfo(tObj);
+  if (ti->isInTM)   fxTMMoveOutTM(fxMesa,tObj); /* TO DO: SLOW but easy to write */
+
   ti->validated=GL_FALSE;
   fxMesa->new_state|=FX_NEW_TEXTURING;
   ctx->Driver.RenderStart = fxSetupFXUnits;
@@ -128,7 +132,6 @@
   ti->LODblend=FXFALSE;
 
   for(i=0;i<MAX_TEXTURE_LEVELS;i++) {
-    ti->mipmapLevel[i].used=GL_FALSE;
     ti->mipmapLevel[i].data=NULL;
   }
 
@@ -160,7 +163,7 @@
   ctx->Driver.RenderStart = fxSetupFXUnits;
 }
 
-void fxDDTexEnv(GLcontext *ctx, GLenum pname, const GLfloat *param)
+void fxDDTexEnv(GLcontext *ctx, GLenum target, GLenum pname, const GLfloat *param)
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
 
@@ -171,6 +174,16 @@
 	 fprintf(stderr,"fxmesa: texenv(%x)\n",pname);
    }
 
+   /* apply any lod biasing right now */
+   if (pname==GL_TEXTURE_LOD_BIAS_EXT) {
+     FX_grTexLodBiasValue(GR_TMU0,*param);
+
+     if(fxMesa->haveTwoTMUs) {
+       FX_grTexLodBiasValue(GR_TMU1,*param);
+     }
+
+   }
+
    fxMesa->new_state|=FX_NEW_TEXTURING;
    ctx->Driver.RenderStart = fxSetupFXUnits;
 }
@@ -312,124 +325,154 @@
 
 void fxDDTexDel(GLcontext *ctx, struct gl_texture_object *tObj)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  tfxTexInfo *ti=fxTMGetTexInfo(tObj);
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  tfxTexInfo *ti = fxTMGetTexInfo(tObj);
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDTexDel(%d,%x)\n",tObj->Name,(GLuint)ti);
+  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+     fprintf(stderr, "fxmesa: fxDDTexDel(%d,%p)\n", tObj->Name, ti);
   }
 
-  if(!ti)
+  if (!ti)
     return;
 
-  fxTMFreeTexture(fxMesa,tObj);
+  fxTMFreeTexture(fxMesa, tObj);
 
   FREE(ti);
-  tObj->DriverData=NULL;
+  tObj->DriverData = NULL;
 
-  ctx->NewState|=NEW_TEXTURING;
+  ctx->NewState |= NEW_TEXTURING;
 }
 
-void fxDDTexPalette(GLcontext *ctx, struct gl_texture_object *tObj)
-{
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  int i;
-  FxU32 r,g,b,a;
-  tfxTexInfo *ti;
-
-  if(tObj) {  
-     if (MESA_VERBOSE&VERBOSE_DRIVER) {
-	fprintf(stderr,"fxmesa: fxDDTexPalette(%d,%x)\n",tObj->Name,(GLuint)tObj->DriverData);
-     }
-
-    if(tObj->Palette.Format!=GL_RGBA) {
-#ifndef FX_SILENT
-      fprintf(stderr,"fx Driver: unsupported palette format in texpalette()\n");
-#endif
-      return;
-    }
 
-    if(tObj->Palette.Size>256) {
-#ifndef FX_SILENT
-      fprintf(stderr,"fx Driver: unsupported palette size in texpalette()\n");
-#endif
-      return;
-    }
 
-    if (!tObj->DriverData)
-      tObj->DriverData=fxAllocTexObjData(fxMesa);
-  
-    ti=fxTMGetTexInfo(tObj);
+/*
+ * Convert a gl_color_table texture palette to Glide's format.
+ */
+static void
+convertPalette(FxU32 data[256], const struct gl_color_table *table)
+{
+  const GLubyte *tableUB = (const GLubyte *) table->Table;
+  GLint width = table->Size;
+  FxU32 r, g, b, a;
+  GLint i;
+
+  ASSERT(table->TableType == GL_UNSIGNED_BYTE);
+
+  switch (table->Format) {
+    case GL_INTENSITY:
+      for (i = 0; i < width; i++) {
+        r = tableUB[i];
+        g = tableUB[i];
+        b = tableUB[i];
+        a = tableUB[i];
+        data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      break;
+    case GL_LUMINANCE:
+      for (i = 0; i < width; i++) {
+        r = tableUB[i];
+        g = tableUB[i];
+        b = tableUB[i];
+        a = 255;
+        data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      break;
+    case GL_ALPHA:
+      for (i = 0; i < width; i++) {
+        r = g = b = 255;
+        a = tableUB[i];
+        data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      break;
+    case GL_LUMINANCE_ALPHA:
+      for (i = 0; i < width; i++) {
+        r = g = b = tableUB[i*2+0];
+        a = tableUB[i*2+1];
+        data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      break;
+    case GL_RGB:
+      for (i = 0; i < width; i++) {
+        r = tableUB[i*3+0];
+        g = tableUB[i*3+1];
+        b = tableUB[i*3+2];
+        a = 255;
+        data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      break;
+    case GL_RGBA:
+      for (i = 0; i < width; i++) {
+        r = tableUB[i*4+0];
+        g = tableUB[i*4+1];
+        b = tableUB[i*4+2];
+        a = tableUB[i*4+3];
+        data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      break;
+  }
+}
 
-    for(i=0;i<tObj->Palette.Size;i++) {
-      r=tObj->Palette.Table[i*4];
-      g=tObj->Palette.Table[i*4+1];
-      b=tObj->Palette.Table[i*4+2];
-      a=tObj->Palette.Table[i*4+3];
-      ti->palette.data[i]=(a<<24)|(r<<16)|(g<<8)|b;
-    }
 
-    fxTexInvalidate(ctx,tObj);
-  } else {
-     if (MESA_VERBOSE&VERBOSE_DRIVER) {
-	fprintf(stderr,"fxmesa: fxDDTexPalette(global)\n");
-     }
-    if(ctx->Texture.Palette.Format!=GL_RGBA) {
-#ifndef FX_SILENT
-      fprintf(stderr,"fx Driver: unsupported palette format in texpalette()\n");
-#endif
-      return;
-    }
+void fxDDTexPalette(GLcontext *ctx, struct gl_texture_object *tObj)
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
 
-    if(ctx->Texture.Palette.Size>256) {
-#ifndef FX_SILENT
-      fprintf(stderr,"fx Driver: unsupported palette size in texpalette()\n");
-#endif
-      return;
+  if (tObj) {
+    /* per-texture palette */
+    tfxTexInfo *ti;
+    if (MESA_VERBOSE & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxmesa: fxDDTexPalette(%d,%x)\n",
+              tObj->Name, (GLuint) tObj->DriverData);
     }
-
-    for(i=0;i<ctx->Texture.Palette.Size;i++) {
-      r=ctx->Texture.Palette.Table[i*4];
-      g=ctx->Texture.Palette.Table[i*4+1];
-      b=ctx->Texture.Palette.Table[i*4+2];
-      a=ctx->Texture.Palette.Table[i*4+3];
-      fxMesa->glbPalette.data[i]=(a<<24)|(r<<16)|(g<<8)|b;
+    if (!tObj->DriverData)
+      tObj->DriverData = fxAllocTexObjData(fxMesa);
+    ti = fxTMGetTexInfo(tObj);
+    convertPalette(ti->palette.data, &tObj->Palette);
+    fxTexInvalidate(ctx, tObj);
+  }
+  else {
+    /* global texture palette */
+    if (MESA_VERBOSE & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxmesa: fxDDTexPalette(global)\n");
     }
-
-    fxMesa->new_state|=FX_NEW_TEXTURING;
+    convertPalette(fxMesa->glbPalette.data, &ctx->Texture.Palette);
+    fxMesa->new_state |= FX_NEW_TEXTURING;
     ctx->Driver.RenderStart = fxSetupFXUnits;
   }
 }
 
+
 void fxDDTexUseGlbPalette(GLcontext *ctx, GLboolean state)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
      fprintf(stderr,"fxmesa: fxDDTexUseGlbPalette(%d)\n",state);
   }
 
-  if(state) {
-    fxMesa->haveGlobalPaletteTexture=1;
+  if (state) {
+    fxMesa->haveGlobalPaletteTexture = 1;
 
-    FX_grTexDownloadTable(GR_TMU0,GR_TEXTABLE_PALETTE,&(fxMesa->glbPalette));
+    FX_grTexDownloadTable(GR_TMU0,GR_TEXTABLE_PALETTE, &(fxMesa->glbPalette));
     if (fxMesa->haveTwoTMUs)
-       FX_grTexDownloadTable(GR_TMU1,GR_TEXTABLE_PALETTE,&(fxMesa->glbPalette));
-  } else {
-    fxMesa->haveGlobalPaletteTexture=0;
+       FX_grTexDownloadTable(GR_TMU1, GR_TEXTABLE_PALETTE, &(fxMesa->glbPalette));
+  }
+  else {
+    fxMesa->haveGlobalPaletteTexture = 0;
 
-    if((ctx->Texture.Unit[0].Current==ctx->Texture.Unit[0].CurrentD[2]) &&
-       (ctx->Texture.Unit[0].Current!=NULL)) {
-      struct gl_texture_object *tObj=ctx->Texture.Unit[0].Current;
+    if ((ctx->Texture.Unit[0].Current == ctx->Texture.Unit[0].CurrentD[2]) &&
+        (ctx->Texture.Unit[0].Current != NULL)) {
+      struct gl_texture_object *tObj = ctx->Texture.Unit[0].Current;
 
       if (!tObj->DriverData)
-        tObj->DriverData=fxAllocTexObjData(fxMesa);
+        tObj->DriverData = fxAllocTexObjData(fxMesa);
   
-      fxTexInvalidate(ctx,tObj);
+      fxTexInvalidate(ctx, tObj);
     }
   }
 }
 
+
 static int logbase2(int n)
 {
   GLint i = 1;
@@ -453,209 +496,68 @@
 
 /* Need different versions for different cpus.
  */
-#define INT_TRICK(l2) (0x800000 * l2)
-
-
-int fxTexGetInfo(int w, int h, GrLOD_t *lodlevel, GrAspectRatio_t *ar,
+#define INT_TRICK(l2) (0x800000 * (l2))
+int fxTexGetInfo(int w, int h, GrLOD_t *lodlevel, 
+		 GrAspectRatio_t *aspectratio,
                  float *sscale, float *tscale,
                  int *i_sscale, int *i_tscale,
                  int *wscale, int *hscale)
 {
+  int logw, logh, ar, l, is, it, ws, hs;
+  float s, t;
 
-  static GrLOD_t lod[9]={GR_LOD_256,GR_LOD_128,GR_LOD_64,GR_LOD_32,
-                         GR_LOD_16,GR_LOD_8,GR_LOD_4,GR_LOD_2,GR_LOD_1};
-
-  int logw,logh,ws,hs;
-  GrLOD_t l;
-  GrAspectRatio_t aspectratio;
-  float s,t;
-  int is,it;
-
   logw=logbase2(w);
   logh=logbase2(h);
-
-  switch(logw-logh) {
-  case 0:
-    aspectratio=GR_ASPECT_1x1;
-    l=lod[8-logw];
-    s=t=256.0f;
-    is=it=INT_TRICK(8);
-    ws=hs=1;
-    break;
-  case 1:
-    aspectratio=GR_ASPECT_2x1;
-    l=lod[8-logw];
-    s=256.0f;
-    t=128.0f;
-    is=INT_TRICK(8);it=INT_TRICK(7);
-    ws=1;
-    hs=1;
-    break;
-  case 2:
-    aspectratio=GR_ASPECT_4x1;
-    l=lod[8-logw];
-    s=256.0f;
-    t=64.0f;
-    is=INT_TRICK(8);it=INT_TRICK(6);
-    ws=1;
-    hs=1;
-    break;
-  case 3:
-    aspectratio=GR_ASPECT_8x1;
-    l=lod[8-logw];
-    s=256.0f;
-    t=32.0f;
-    is=INT_TRICK(8);it=INT_TRICK(5);
-    ws=1;
-    hs=1;
-    break;
-  case 4:
-    aspectratio=GR_ASPECT_8x1;
-    l=lod[8-logw];
-    s=256.0f;
-    t=32.0f;
-    is=INT_TRICK(8);it=INT_TRICK(5);
-    ws=1;
-    hs=2;
-    break;
-  case 5:
-    aspectratio=GR_ASPECT_8x1;
-    l=lod[8-logw];
-    s=256.0f;
-    t=32.0f;
-    is=INT_TRICK(8);it=INT_TRICK(5);
-    ws=1;
-    hs=4;
-    break;
-  case 6:
-    aspectratio=GR_ASPECT_8x1;
-    l=lod[8-logw];
-    s=256.0f;
-    t=32.0f;
-    is=INT_TRICK(8);it=INT_TRICK(5);
-    ws=1;
-    hs=8;
-    break;
-  case 7:
-    aspectratio=GR_ASPECT_8x1;
-    l=lod[8-logw];
-    s=256.0f;
-    t=32.0f;
-    is=INT_TRICK(8);it=INT_TRICK(5);
-    ws=1;
-    hs=16;
-    break;
-  case 8:
-    aspectratio=GR_ASPECT_8x1;
-    l=lod[8-logw];
-    s=256.0f;
-    t=32.0f;
-    is=INT_TRICK(8);it=INT_TRICK(5);
-    ws=1;
-    hs=32;
-    break;
-  case -1:
-    aspectratio=GR_ASPECT_1x2;
-    l=lod[8-logh];
-    s=128.0f;
-    t=256.0f;
-    is=INT_TRICK(7);it=INT_TRICK(8);
-    ws=1;
-    hs=1;
-    break;
-  case -2:
-    aspectratio=GR_ASPECT_1x4;
-    l=lod[8-logh];
-    s=64.0f;
-    t=256.0f;
-    is=INT_TRICK(6);it=INT_TRICK(8);
-    ws=1;
-    hs=1;
-    break;
-  case -3:
-    aspectratio=GR_ASPECT_1x8;
-    l=lod[8-logh];
-    s=32.0f;
-    t=256.0f;
-    is=INT_TRICK(5);it=INT_TRICK(8);
-    ws=1;
-    hs=1;
-    break;
-  case -4:
-    aspectratio=GR_ASPECT_1x8;
-    l=lod[8-logh];
-    s=32.0f;
-    t=256.0f;
-    is=INT_TRICK(5);it=INT_TRICK(8);
-    ws=2;
-    hs=1;
-    break;
-  case -5:
-    aspectratio=GR_ASPECT_1x8;
-    l=lod[8-logh];
-    s=32.0f;
-    t=256.0f;
-    is=INT_TRICK(5);it=INT_TRICK(8);
-    ws=4;
-    hs=1;
-    break;
-  case -6:
-    aspectratio=GR_ASPECT_1x8;
-    l=lod[8-logh];
-    s=32.0f;
-    t=256.0f;
-    is=INT_TRICK(5);it=INT_TRICK(8);
-    ws=8;
-    hs=1;
-    break;
-  case -7:
-    aspectratio=GR_ASPECT_1x8;
-    l=lod[8-logh];
-    s=32.0f;
-    t=256.0f;
-    is=INT_TRICK(5);it=INT_TRICK(8);
-    ws=16;
-    hs=1;
-    break;
-  case -8:
-    aspectratio=GR_ASPECT_1x8;
-    l=lod[8-logh];
-    s=32.0f;
-    t=256.0f;
-    is=INT_TRICK(5);it=INT_TRICK(8);
-    ws=32;
-    hs=1;
-    break;
-  default:
-    return 0;
-    break;
-  }
-
-  if(lodlevel)
-    (*lodlevel)=l;
-
-  if(ar)
-    (*ar)=aspectratio;
-
-  if(sscale)
-    (*sscale)=s;
-
-  if(tscale)
-    (*tscale)=t;
-
-  if(wscale)
-    (*wscale)=ws;
-
-  if(hscale)
-    (*hscale)=hs;
-
-  if (i_sscale)
-     *i_sscale = is;
-
-  if (i_tscale)
-     *i_tscale = it;
-
-
+  ar=logw-logh;
+  /* Hardware only allows a maximum aspect ratio of 8x1, so handle
+     |ar|>3 by scaling the image and using an 8x1 aspect ratio */
+  if (ar>=0) {
+    l=logw;
+    s=256.0;
+    is=INT_TRICK(8);
+    ws=1;
+    if (ar<3) {
+      t=256>>ar;
+      it=INT_TRICK(8-ar);
+      hs=1;
+    } else {
+      t=32.0;
+      it=INT_TRICK(5);
+      hs=1<<(ar-3);
+    }
+  } else {
+    l=logh;
+    t=256.0;
+    it=INT_TRICK(8);
+    hs=1;
+    if (-ar<3) {
+      s=256>>-ar;
+      is=INT_TRICK(8+ar);
+      ws=1;
+    } else {
+      s=32.0;
+      is=INT_TRICK(5);
+      ws=1<<(-ar-3);
+    }
+  }
+  if (ar<-3) ar=-3;
+  if (ar>3) ar=3;
+
+  /* The above numbers are calculated sensibly and work for Glide3, but
+     we change them to the whacky glide2 values if needed. */
+#ifdef FX_GLIDE3
+  if (lodlevel) *lodlevel=l;
+  if (aspectratio) *aspectratio=ar;
+#else
+  if (lodlevel) *lodlevel=8-l;
+  if (aspectratio) *aspectratio=3-ar;
+#endif
+  if (sscale) *sscale=s;
+  if (tscale) *tscale=t;
+  if (wscale) *wscale=ws;
+  if (hscale) *hscale=hs;
+  if (i_sscale) *i_sscale = is;
+  if (i_tscale) *i_tscale = it;
   return 1;
 }
 
@@ -666,752 +568,509 @@
 void fxTexGetFormat(GLenum glformat, GrTextureFormat_t *tfmt, GLint *ifmt)
 {
   switch(glformat) {
-  case 1:
-  case GL_LUMINANCE:
-  case GL_LUMINANCE4:
-  case GL_LUMINANCE8:
-  case GL_LUMINANCE12:
-  case GL_LUMINANCE16:
-    if(tfmt)
-      (*tfmt)=GR_TEXFMT_INTENSITY_8;
-    if(ifmt)
-      (*ifmt)=GL_LUMINANCE;
-    break;
-  case 2:
-  case GL_LUMINANCE_ALPHA:
-  case GL_LUMINANCE4_ALPHA4:
-  case GL_LUMINANCE6_ALPHA2:
-  case GL_LUMINANCE8_ALPHA8:
-  case GL_LUMINANCE12_ALPHA4:
-  case GL_LUMINANCE12_ALPHA12:
-  case GL_LUMINANCE16_ALPHA16:
-    if(tfmt)
-      (*tfmt)=GR_TEXFMT_ALPHA_INTENSITY_88;
-    if(ifmt)
-      (*ifmt)=GL_LUMINANCE_ALPHA;
-    break;
-  case GL_INTENSITY:
-  case GL_INTENSITY4:
-  case GL_INTENSITY8:
-  case GL_INTENSITY12:
-  case GL_INTENSITY16:
-    if(tfmt)
-      (*tfmt)=GR_TEXFMT_ALPHA_8;
-    if(ifmt)
-      (*ifmt)=GL_INTENSITY;
-    break;
-  case GL_ALPHA:
-  case GL_ALPHA4:
-  case GL_ALPHA8:
-  case GL_ALPHA12:
-  case GL_ALPHA16:
-    if(tfmt)
-      (*tfmt)=GR_TEXFMT_ALPHA_8;
-    if(ifmt)
-      (*ifmt)=GL_ALPHA;
-    break;
-  case 3:
-  case GL_RGB:
-  case GL_R3_G3_B2:
-  case GL_RGB4:
-  case GL_RGB5:
-  case GL_RGB8:
-  case GL_RGB10:
-  case GL_RGB12:
-  case GL_RGB16:
-    if(tfmt)
-      (*tfmt)=GR_TEXFMT_RGB_565;
-    if(ifmt)
-      (*ifmt)=GL_RGB;
-    break;
-  case 4:
-  case GL_RGBA:
-  case GL_RGBA2:
-  case GL_RGBA4:
-  case GL_RGBA8:
-  case GL_RGB10_A2:
-  case GL_RGBA12:
-  case GL_RGBA16:
-    if(tfmt)
-      (*tfmt)=GR_TEXFMT_ARGB_4444;
-    if(ifmt)
-      (*ifmt)=GL_RGBA;
-    break;
-  case GL_RGB5_A1:
-     if(tfmt)
-       (*tfmt)=GR_TEXFMT_ARGB_1555;
-     if(ifmt)
-       (*ifmt)=GL_RGBA;
-     break;
-  case GL_COLOR_INDEX:
-  case GL_COLOR_INDEX1_EXT:
-  case GL_COLOR_INDEX2_EXT:
-  case GL_COLOR_INDEX4_EXT:
-  case GL_COLOR_INDEX8_EXT:
-  case GL_COLOR_INDEX12_EXT:
-  case GL_COLOR_INDEX16_EXT:
-    if(tfmt)
-      (*tfmt)=GR_TEXFMT_P_8;
-    if(ifmt)
-      (*ifmt)=GL_RGBA;
-    break;
-  default:
-    fprintf(stderr,"fx Driver: unsupported internalFormat in fxTexGetFormat()\n");
-    fxCloseHardware();
-    exit(-1);
-    break;
+    case 1:
+    case GL_LUMINANCE:
+    case GL_LUMINANCE4:
+    case GL_LUMINANCE8:
+    case GL_LUMINANCE12:
+    case GL_LUMINANCE16:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_INTENSITY_8;
+      if(ifmt)
+        (*ifmt)=GL_LUMINANCE;
+      break;
+    case 2:
+    case GL_LUMINANCE_ALPHA:
+    case GL_LUMINANCE4_ALPHA4:
+    case GL_LUMINANCE6_ALPHA2:
+    case GL_LUMINANCE8_ALPHA8:
+    case GL_LUMINANCE12_ALPHA4:
+    case GL_LUMINANCE12_ALPHA12:
+    case GL_LUMINANCE16_ALPHA16:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_ALPHA_INTENSITY_88;
+      if(ifmt)
+        (*ifmt)=GL_LUMINANCE_ALPHA;
+      break;
+    case GL_INTENSITY:
+    case GL_INTENSITY4:
+    case GL_INTENSITY8:
+    case GL_INTENSITY12:
+    case GL_INTENSITY16:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_ALPHA_8;
+      if(ifmt)
+        (*ifmt)=GL_INTENSITY;
+      break;
+    case GL_ALPHA:
+    case GL_ALPHA4:
+    case GL_ALPHA8:
+    case GL_ALPHA12:
+    case GL_ALPHA16:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_ALPHA_8;
+      if(ifmt)
+        (*ifmt)=GL_ALPHA;
+      break;
+    case 3:
+    case GL_RGB:
+    case GL_R3_G3_B2:
+    case GL_RGB4:
+    case GL_RGB5:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_RGB_565;
+      if(ifmt)
+        (*ifmt)=GL_RGB;
+      break;
+    case GL_RGB8:
+    case GL_RGB10:
+    case GL_RGB12:
+    case GL_RGB16:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_ARGB_8888;
+      if(ifmt)
+        (*ifmt)=GL_RGB;
+      break;
+    case 4:
+    case GL_RGBA:
+    case GL_RGBA2:
+    case GL_RGBA4:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_ARGB_4444;
+      if(ifmt)
+        (*ifmt)=GL_RGBA;
+      break;
+    case GL_RGBA8:
+    case GL_RGB10_A2:
+    case GL_RGBA12:
+    case GL_RGBA16:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_ARGB_8888;
+      if(ifmt)
+        (*ifmt)=GL_RGBA;
+      break;
+    case GL_RGB5_A1:
+       if(tfmt)
+         (*tfmt)=GR_TEXFMT_ARGB_1555;
+       if(ifmt)
+         (*ifmt)=GL_RGBA;
+       break;
+    case GL_COLOR_INDEX:
+    case GL_COLOR_INDEX1_EXT:
+    case GL_COLOR_INDEX2_EXT:
+    case GL_COLOR_INDEX4_EXT:
+    case GL_COLOR_INDEX8_EXT:
+    case GL_COLOR_INDEX12_EXT:
+    case GL_COLOR_INDEX16_EXT:
+      if(tfmt)
+        (*tfmt)=GR_TEXFMT_P_8;
+      if(ifmt)
+        (*ifmt)=GL_RGBA;   /* XXX why is this RGBA? */
+      break;
+    default:
+      fprintf(stderr,
+              "fx Driver: unsupported internalFormat in fxTexGetFormat()\n");
+      fxCloseHardware();
+      exit(-1);
+      break;
   }
 }
 
-static int fxIsTexSupported(GLenum target, GLint internalFormat,
-                            const struct gl_texture_image *image)
+static GLboolean fxIsTexSupported(GLenum target, GLint internalFormat,
+                                  const struct gl_texture_image *image)
 {
-  if(target!=GL_TEXTURE_2D)
-    return GL_FALSE;
-
-  switch(internalFormat) {
-  case GL_INTENSITY:
-  case GL_INTENSITY4:
-  case GL_INTENSITY8:
-  case GL_INTENSITY12:
-  case GL_INTENSITY16:
-  case 1:
-  case GL_LUMINANCE:
-  case GL_LUMINANCE4:
-  case GL_LUMINANCE8:
-  case GL_LUMINANCE12:
-  case GL_LUMINANCE16:
-  case 2:
-  case GL_LUMINANCE_ALPHA:
-  case GL_LUMINANCE4_ALPHA4:
-  case GL_LUMINANCE6_ALPHA2:
-  case GL_LUMINANCE8_ALPHA8:
-  case GL_LUMINANCE12_ALPHA4:
-  case GL_LUMINANCE12_ALPHA12:
-  case GL_LUMINANCE16_ALPHA16:
-  case GL_ALPHA:
-  case GL_ALPHA4:
-  case GL_ALPHA8:
-  case GL_ALPHA12:
-  case GL_ALPHA16:
-  case 3:
-  case GL_RGB:
-  case GL_R3_G3_B2:
-  case GL_RGB4:
-  case GL_RGB5:
-  case GL_RGB8:
-  case GL_RGB10:
-  case GL_RGB12:
-  case GL_RGB16:
-  case 4:
-  case GL_RGBA:
-  case GL_RGBA2:
-  case GL_RGBA4:
-  case GL_RGB5_A1:
-  case GL_RGBA8:
-  case GL_RGB10_A2:
-  case GL_RGBA12:
-  case GL_RGBA16:
-  case GL_COLOR_INDEX:
-  case GL_COLOR_INDEX1_EXT:
-  case GL_COLOR_INDEX2_EXT:
-  case GL_COLOR_INDEX4_EXT:
-  case GL_COLOR_INDEX8_EXT:
-  case GL_COLOR_INDEX12_EXT:
-  case GL_COLOR_INDEX16_EXT:
-    break;
-  default:
-    return GL_FALSE;
-  }
-
-  if(image->Width>256)
+  if(target != GL_TEXTURE_2D)
     return GL_FALSE;
 
-  if(image->Height>256)
-    return GL_FALSE;
-
   if(!fxTexGetInfo(image->Width,image->Height,NULL,NULL,NULL,NULL,NULL,NULL,
 		   NULL,NULL))
     return GL_FALSE;
 
+  if (image->Border > 0)
+    return GL_FALSE;
+
   return GL_TRUE;
 }
 
-static void fxTexBuildImageMap(const struct gl_texture_image *image,
-                               GLint internalFormat, unsigned short **dest,
-                               GLboolean *istranslate)
-{
-  unsigned short *src;
-  unsigned char *data;
-  int x,y,w,h,wscale,hscale,idx;
-
-  fxTexGetInfo(image->Width,image->Height,NULL,NULL,NULL,NULL,NULL,NULL,
-	       &wscale,&hscale);
-  w=image->Width*wscale;
-  h=image->Height*hscale;
-
-  data=image->Data;
-  switch(internalFormat) {
-  case GL_INTENSITY:
-  case GL_INTENSITY4:
-  case GL_INTENSITY8:
-  case GL_INTENSITY12:
-  case GL_INTENSITY16:
-  case 1:
-  case GL_LUMINANCE:
-  case GL_LUMINANCE4:
-  case GL_LUMINANCE8:
-  case GL_LUMINANCE12:
-  case GL_LUMINANCE16:
-  case GL_ALPHA:
-  case GL_ALPHA4:
-  case GL_ALPHA8:
-  case GL_ALPHA12:
-  case GL_ALPHA16:
-  case GL_COLOR_INDEX:
-  case GL_COLOR_INDEX1_EXT:
-  case GL_COLOR_INDEX2_EXT:
-  case GL_COLOR_INDEX4_EXT:
-  case GL_COLOR_INDEX8_EXT:
-  case GL_COLOR_INDEX12_EXT:
-  case GL_COLOR_INDEX16_EXT:
-    /* Optimized for GLQuake */
-
-    if(wscale==hscale==1) {
-      (*istranslate)=GL_FALSE;
 
-      (*dest)=(unsigned short *)data;
-    } else {
-      unsigned char *srcb;
+/**********************************************************************/
+/**** NEW TEXTURE IMAGE FUNCTIONS                                  ****/
+/**********************************************************************/
+
+GLboolean fxDDTexImage2D(GLcontext *ctx, GLenum target, GLint level,
+                         GLenum format, GLenum type, const GLvoid *pixels,
+                         const struct gl_pixelstore_attrib *packing,
+                         struct gl_texture_object *texObj,
+                         struct gl_texture_image *texImage,
+                         GLboolean *retainInternalCopy)
+{
+  fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
 
-      (*istranslate)=GL_TRUE;
+  if (target != GL_TEXTURE_2D)
+    return GL_FALSE;
 
-      if(!(*dest)) {
-        if(!((*dest)=src=(unsigned short *)MALLOC(sizeof(unsigned char)*w*h))) {
-          fprintf(stderr,"fx Driver: out of memory !\n");
-          fxCloseHardware();
-          exit(-1);
-        }
-      } else
-        src=(*dest);
-
-      srcb=(unsigned char *)src;
-
-      for(y=0;y<h;y++)
-        for(x=0;x<w;x++) {
-          idx=(x/wscale+(y/hscale)*(w/wscale));
-          srcb[x+y*w]=data[idx];
-        }
-    }
-    break;
-  case 2:
-  case GL_LUMINANCE_ALPHA:
-  case GL_LUMINANCE4_ALPHA4:
-  case GL_LUMINANCE6_ALPHA2:
-  case GL_LUMINANCE8_ALPHA8:
-  case GL_LUMINANCE12_ALPHA4:
-  case GL_LUMINANCE12_ALPHA12:
-  case GL_LUMINANCE16_ALPHA16:
-    (*istranslate)=GL_TRUE;
-
-    if(!(*dest)) {
-      if(!((*dest)=src=(unsigned short *)MALLOC(sizeof(unsigned short)*w*h))) {
-        fprintf(stderr,"fx Driver: out of memory !\n");
-        fxCloseHardware();
-        exit(-1);
-      }
-    } else
-      src=(*dest);
+  if (!texObj->DriverData)
+    texObj->DriverData = fxAllocTexObjData(fxMesa);
 
-    if(wscale==hscale==1) {
-      int i=0;
-      int lenght=h*w;
-      unsigned short a,l;
-
-      while(i++<lenght) {
-        l=*data++;
-        a=*data++;
+  if (fxIsTexSupported(target, texImage->IntFormat, texImage)) {
+    GrTextureFormat_t gldformat;
+    tfxTexInfo *ti = fxTMGetTexInfo(texObj);
+    tfxMipMapLevel *mml = &ti->mipmapLevel[level];
+    GLint dstWidth, dstHeight, wScale, hScale, texelSize, dstStride;
+    MesaIntTexFormat intFormat;
 
-        *src++=(a << 8) | l;
-      }
-    } else {
-      unsigned short a,l;
+    fxTexGetFormat(texImage->IntFormat, &gldformat, NULL);
 
-      for(y=0;y<h;y++)
-        for(x=0;x<w;x++) {
-          idx=(x/wscale+(y/hscale)*(w/wscale))*2;
-          l=data[idx];
-          a=data[idx+1];
+    fxTexGetInfo(texImage->Width, texImage->Height, NULL,NULL,NULL,NULL,
+                 NULL,NULL, &wScale, &hScale);
+    
+    dstWidth = texImage->Width * wScale;
+    dstHeight = texImage->Height * hScale;
 
-          src[x+y*w]=(a << 8) | l;
-        }
+    switch (texImage->IntFormat) {
+      case GL_INTENSITY:
+      case GL_INTENSITY4:
+      case GL_INTENSITY8:
+      case GL_INTENSITY12:
+      case GL_INTENSITY16:
+        texelSize = 1;
+        intFormat = MESA_I8;
+        break;
+      case 1:
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+        texelSize = 1;
+        intFormat = MESA_L8;
+        break;
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+        texelSize = 1;
+        intFormat = MESA_A8;
+        break;
+      case GL_COLOR_INDEX:
+      case GL_COLOR_INDEX1_EXT:
+      case GL_COLOR_INDEX2_EXT:
+      case GL_COLOR_INDEX4_EXT:
+      case GL_COLOR_INDEX8_EXT:
+      case GL_COLOR_INDEX12_EXT:
+      case GL_COLOR_INDEX16_EXT:
+        texelSize = 1;
+        intFormat = MESA_C8;
+        break;
+      case 2:
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+        texelSize = 2;
+        intFormat = MESA_A8_L8;
+        break;
+      case 3:
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+        texelSize = 2;
+        intFormat = MESA_R5_G6_B5;
+        break;
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+        texelSize = 4;
+        intFormat = MESA_A8_R8_G8_B8;
+        break;
+      case 4:
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+        texelSize = 2;
+        intFormat = MESA_A4_R4_G4_B4;
+        break;
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+        texelSize = 4;
+        intFormat = MESA_A8_R8_G8_B8;
+        break;
+      case GL_RGB5_A1:
+        texelSize = 2;
+        intFormat = MESA_A1_R5_G5_B5;
+        break;
+      default:
+        gl_problem(NULL, "tdfx driver: texbuildimagemap() bad format");
+        return GL_FALSE;
+    }
+
+    _mesa_set_teximage_component_sizes(intFormat, texImage);
+
+    /*printf("teximage:\n");*/
+    /* allocate new storage for texture image, if needed */
+    if (!mml->data || mml->glideFormat != gldformat ||
+        mml->width != dstWidth || mml->height != dstHeight) {
+      if (mml->data)
+        FREE(mml->data);
+      mml->data = MALLOC(dstWidth * dstHeight * texelSize);
+      if (!mml->data)
+        return GL_FALSE;
+      mml->texelSize = texelSize;
+      mml->glideFormat = gldformat;
+      mml->width = dstWidth;
+      mml->height = dstHeight;
+      fxTexInvalidate(ctx, texObj);
+    }
+
+    dstStride = dstWidth * texelSize;
+
+    /* store the texture image */
+    if (!_mesa_convert_teximage(intFormat, dstWidth, dstHeight, mml->data,
+                                dstStride,
+                                texImage->Width, texImage->Height,
+                                format, type, pixels, packing)) {
+      return GL_FALSE;
     }
-    break;
-  case 3:
-  case GL_RGB:
-  case GL_R3_G3_B2:
-  case GL_RGB4:
-  case GL_RGB5:
-  case GL_RGB8:
-  case GL_RGB10:
-  case GL_RGB12:
-  case GL_RGB16:
-    (*istranslate)=GL_TRUE;
-
-    if(!(*dest)) {
-      if(!((*dest)=src=(unsigned short *)MALLOC(sizeof(unsigned short)*w*h))) {
-        fprintf(stderr,"fx Driver: out of memory !\n");
-        fxCloseHardware();
-        exit(-1);
-      }
-    } else
-      src=(*dest);
-
-    if(wscale==hscale==1) {
-      int i=0;
-      int lenght=h*w;
-      unsigned int r,g,b;
-
-      while(i++<lenght) {
-        r=*data++;
-        g=*data++;
-        b=*data++;
-
-        *src++=((0xf8 & r) << (11-3))  |
-          ((0xfc & g) << (5-3+1))      |
-          ((0xf8 & b) >> 3); 
-      }
-    } else {
-      unsigned int r,g,b;
-
-      for(y=0;y<h;y++)
-        for(x=0;x<w;x++) {
-          idx=(x/wscale+(y/hscale)*(w/wscale))*3;
-          r=data[idx];
-          g=data[idx+1];
-          b=data[idx+2];
-
-          src[x+y*w]=((0xf8 & r) << (11-3))  |
-            ((0xfc & g) << (5-3+1))      |
-            ((0xf8 & b) >> 3); 
-        }
+    
+    if (ti->validated && ti->isInTM) {
+      /*printf("reloadmipmaplevels\n");*/
+      fxTMReloadMipMapLevel(fxMesa, texObj, level);
     }
-    break;
-  case 4:
-  case GL_RGBA:
-  case GL_RGBA2:
-  case GL_RGBA4:
-  case GL_RGBA8:
-  case GL_RGB10_A2:
-  case GL_RGBA12:
-  case GL_RGBA16:
-    (*istranslate)=GL_TRUE;
-
-    if(!(*dest)) {
-      if(!((*dest)=src=(unsigned short *)MALLOC(sizeof(unsigned short)*w*h))) {
-        fprintf(stderr,"fx Driver: out of memory !\n");
-        fxCloseHardware();
-        exit(-1);
-      }
-    } else
-      src=(*dest);
-
-    if(wscale==hscale==1) {
-      int i=0;
-      int lenght=h*w;
-      unsigned int r,g,b,a;
-
-      while(i++<lenght) {
-        r=*data++;
-        g=*data++;
-        b=*data++;
-        a=*data++;
-
-        *src++=((0xf0 & a) << 8) |
-          ((0xf0 & r) << 4)      |
-          (0xf0 & g)             |
-          ((0xf0 & b) >> 4);
-      }
-    } else {
-      unsigned int r,g,b,a;
-
-      for(y=0;y<h;y++)
-        for(x=0;x<w;x++) {
-          idx=(x/wscale+(y/hscale)*(w/wscale))*4;
-          r=data[idx];
-          g=data[idx+1];
-          b=data[idx+2];
-          a=data[idx+3];
-
-          src[x+y*w]=((0xf0 & a) << 8) |
-            ((0xf0 & r) << 4)      |
-            (0xf0 & g)             |
-            ((0xf0 & b) >> 4);
-        }
+    else {
+      /*printf("invalidate2\n");*/
+      fxTexInvalidate(ctx,texObj);
     }
-    break;
-  case GL_RGB5_A1:
-    (*istranslate)=GL_TRUE;
-
-    if(!(*dest)) {
-      if(!((*dest)=src=(unsigned short *)malloc(sizeof(unsigned short)*w*h))) {
-        fprintf(stderr,"fx Driver: out of memory !\n");
-        fxCloseHardware();
-        exit(-1);
-      }
-    } else
-      src=(*dest);
 
-    if(wscale==hscale==1) {
-      int i=0;
-      int lenght=h*w;
-      unsigned  r,g,b,a;
-
-      while(i++<lenght) {
-        r=*data++;
-        g=*data++;
-        b=*data++;
-        a=*data++;
-        *src++=((0x80 & a) << 8) |
-          ((0xf8 & r) << 7)      |
-          ((0xf8 & g) << 2)      |
-          ((0xf8 & b) >> 3);
-      }
-    } else {
-      unsigned r,g,b,a;
-
-      for(y=0;y<h;y++)
-        for(x=0;x<w;x++) {
-          idx=(x/wscale+(y/hscale)*(w/wscale))*4;
-          r=data[idx];
-          g=data[idx+1];
-          b=data[idx+2];
-          a=data[idx+3];
-
-          src[x+y*w]=((0x80 & a) << 8) |
-          ((0xf8 & r) << 7)      |
-          ((0xf8 & g) << 2)      |
-          ((0xf8 & b) >> 3);
-        }
-    }
-    break;
-  default:
-    fprintf(stderr,"fx Driver: wrong internalFormat in texbuildimagemap()\n");
-    fxCloseHardware();
-    exit(-1);
-    break;
+    *retainInternalCopy = GL_FALSE;
+    return GL_TRUE;
   }
+  else {
+    gl_problem(NULL, "fx Driver: unsupported texture in fxDDTexImg()\n");
+    return GL_FALSE;
+  }
 }
+
 
-void fxDDTexImg(GLcontext *ctx, GLenum target,
-                struct gl_texture_object *tObj, GLint level, GLint internalFormat,
-                const struct gl_texture_image *image)
+GLboolean fxDDTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
+                            GLint xoffset, GLint yoffset,
+                            GLsizei width, GLsizei height,
+                            GLenum format, GLenum type, const GLvoid *pixels,
+                            const struct gl_pixelstore_attrib *packing,
+                            struct gl_texture_object *texObj,
+                            struct gl_texture_image *texImage)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
+  fxMesaContext fxMesa = (fxMesaContext) ctx->DriverCtx;
   tfxTexInfo *ti;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,
-	     "fxmesa: (%d) fxDDTexImg(...,level=%d,target=%d,format=%x,width=%d,height=%d...)\n",
-	     tObj->Name, level, target, internalFormat, image->Width,
-	     image->Height);
-  }
-
-  if(target!=GL_TEXTURE_2D)
-    return;
-
-  if (!tObj->DriverData)
-    tObj->DriverData=fxAllocTexObjData(fxMesa);
-
-  ti=fxTMGetTexInfo(tObj);
+  GLint wscale, hscale, dstStride;
+  tfxMipMapLevel *mml;
+  GLboolean result;
 
-  if(fxIsTexSupported(target,internalFormat,image)) {
-    GrTextureFormat_t gldformat;
-    tfxMipMapLevel *mml=&ti->mipmapLevel[level];
+  if (target != GL_TEXTURE_2D)
+    return GL_FALSE;
 
-    fxTexGetFormat(internalFormat,&gldformat,NULL);
-    
-    if(mml->used) {
-      if((mml->glideFormat==gldformat) &&
-         (mml->width==image->Width) &&
-         (mml->height==image->Height)) {
-        fxTexBuildImageMap(image,internalFormat,&(mml->data),
-                           &(mml->translated));
-
-        if(ti->validated && ti->isInTM)
-          fxTMReloadMipMapLevel(fxMesa,tObj,level);
-        else
-          fxTexInvalidate(ctx,tObj);
+  if (!texObj->DriverData)
+    return GL_FALSE;
 
-        return;
-      } else {
-        if(mml->translated)
-          FREE(mml->data);
-        mml->data=NULL;
-      }
-    }
+  ti = fxTMGetTexInfo(texObj);
+  mml = &ti->mipmapLevel[level];
 
-    mml->glideFormat=gldformat;
-    mml->width=image->Width;
-    mml->height=image->Height;
-    mml->used=GL_TRUE;
+  fxTexGetInfo( texImage->Width, texImage->Height, NULL,NULL,NULL,NULL,
+                NULL,NULL, &wscale, &hscale);
 
-    fxTexBuildImageMap(image,internalFormat,&(mml->data),
-                       &(mml->translated));
+  assert(mml->data);  /* must have an existing texture image! */
 
-    fxTexInvalidate(ctx,tObj);
+  switch (mml->glideFormat) {
+    case GR_TEXFMT_INTENSITY_8:
+      dstStride = mml->width;
+      result = _mesa_convert_texsubimage(MESA_I8, xoffset, yoffset,
+                                         mml->width, mml->height, mml->data,
+                                         dstStride, width, height,
+                                         texImage->Width, texImage->Height,
+                                         format, type, pixels, packing);
+      break;
+    case GR_TEXFMT_ALPHA_8:
+      dstStride = mml->width;
+      result = _mesa_convert_texsubimage(MESA_A8, xoffset, yoffset,
+                                         mml->width, mml->height, mml->data,
+                                         dstStride, width, height,
+                                         texImage->Width, texImage->Height,
+                                         format, type, pixels, packing);
+      break;
+    case GR_TEXFMT_P_8:
+      dstStride = mml->width;
+      result = _mesa_convert_texsubimage(MESA_C8, xoffset, yoffset,
+                                         mml->width, mml->height, mml->data,
+                                         dstStride, width, height,
+                                         texImage->Width, texImage->Height,
+                                         format, type, pixels, packing);
+      break;
+    case GR_TEXFMT_ALPHA_INTENSITY_88:
+      dstStride = mml->width * 2;
+      result = _mesa_convert_texsubimage(MESA_A8_L8, xoffset, yoffset,
+                                         mml->width, mml->height, mml->data,
+                                         dstStride, width, height,
+                                         texImage->Width, texImage->Height,
+                                         format, type, pixels, packing);
+      break;
+    case GR_TEXFMT_RGB_565:
+      dstStride = mml->width * 2;
+      result = _mesa_convert_texsubimage(MESA_R5_G6_B5, xoffset, yoffset,
+                                         mml->width, mml->height, mml->data,
+                                         dstStride, width, height,
+                                         texImage->Width, texImage->Height,
+                                         format, type, pixels, packing);
+      break;
+    case GR_TEXFMT_ARGB_4444:
+      dstStride = mml->width * 2;
+      result = _mesa_convert_texsubimage(MESA_A4_R4_G4_B4, xoffset, yoffset,
+                                         mml->width, mml->height, mml->data,
+                                         dstStride, width, height,
+                                         texImage->Width, texImage->Height,
+                                         format, type, pixels, packing);
+      break;
+    case GR_TEXFMT_ARGB_8888:
+      dstStride = mml->width * 4;
+      result = _mesa_convert_texsubimage(MESA_A8_R8_G8_B8, xoffset, yoffset,
+                                         mml->width, mml->height, mml->data,
+                                         dstStride, width, height,
+                                         texImage->Width, texImage->Height,
+                                         format, type, pixels, packing);
+      break;
+    case GR_TEXFMT_ARGB_1555:
+      dstStride = mml->width * 2;
+      result = _mesa_convert_texsubimage(MESA_A1_R5_G5_B5, xoffset, yoffset,
+                                         mml->width, mml->height, mml->data,
+                                         dstStride, width, height,
+                                         texImage->Width, texImage->Height,
+                                         format, type, pixels, packing);
+      break;
+    default:
+      gl_problem(NULL, "tdfx driver: fxTexBuildSubImageMap() bad format");
+      result = GL_FALSE;
   }
-#ifndef FX_SILENT
-  else
-    fprintf(stderr,"fx Driver: unsupported texture in fxDDTexImg()\n");
-#endif
-}
-
-static void fxTexBuildSubImageMap(const struct gl_texture_image *image,
-                                  GLint internalFormat,
-                                  GLint xoffset, GLint yoffset, GLint width, GLint height,
-                                  unsigned short *destimg)
-{
-  fxTexGetInfo(image->Width,image->Height,NULL,NULL,NULL,NULL,NULL,NULL,
-	       NULL,NULL);
-
-  switch(internalFormat) {
-  case GL_INTENSITY:
-  case GL_INTENSITY4:
-  case GL_INTENSITY8:
-  case GL_INTENSITY12:
-  case GL_INTENSITY16:
-  case 1:
-  case GL_LUMINANCE:
-  case GL_LUMINANCE4:
-  case GL_LUMINANCE8:
-  case GL_LUMINANCE12:
-  case GL_LUMINANCE16:
-  case GL_ALPHA:
-  case GL_ALPHA4:
-  case GL_ALPHA8:
-  case GL_ALPHA12:
-  case GL_ALPHA16:
-  case GL_COLOR_INDEX:
-  case GL_COLOR_INDEX1_EXT:
-  case GL_COLOR_INDEX2_EXT:
-  case GL_COLOR_INDEX4_EXT:
-  case GL_COLOR_INDEX8_EXT:
-  case GL_COLOR_INDEX12_EXT:
-  case GL_COLOR_INDEX16_EXT:
-    {
-
-      int y;
-      unsigned char *bsrc,*bdst;
-
-      bsrc=(unsigned char *)(image->Data+(yoffset*image->Width+xoffset));
-      bdst=((unsigned char *)destimg)+(yoffset*image->Width+xoffset);
-    
-      for(y=0;y<height;y++) {
-        MEMCPY(bdst,bsrc,width);
-        bsrc += image->Width;
-        bdst += image->Width;
-      }
-    }
-    break;
-  case 2:
-  case GL_LUMINANCE_ALPHA:
-  case GL_LUMINANCE4_ALPHA4:
-  case GL_LUMINANCE6_ALPHA2:
-  case GL_LUMINANCE8_ALPHA8:
-  case GL_LUMINANCE12_ALPHA4:
-  case GL_LUMINANCE12_ALPHA12:
-  case GL_LUMINANCE16_ALPHA16:
-    {
-      int x,y;
-      unsigned char *src;
-      unsigned short *dst,a,l;
-      int simgw,dimgw;
-
-      src=(unsigned char *)(image->Data+(yoffset*image->Width+xoffset)*2);
-      dst=destimg+(yoffset*image->Width+xoffset);
-    
-      simgw=(image->Width-width)*2;
-      dimgw=image->Width-width;
-      for(y=0;y<height;y++) {
-        for(x=0;x<width;x++) {
-          l=*src++;
-          a=*src++;
-          *dst++=(a << 8) | l;
-        }
 
-        src += simgw;
-        dst += dimgw;
-      }
-    }
-    break;
-  case 3:
-  case GL_RGB:
-  case GL_R3_G3_B2:
-  case GL_RGB4:
-  case GL_RGB5:
-  case GL_RGB8:
-  case GL_RGB10:
-  case GL_RGB12:
-  case GL_RGB16:
-    {
-      int x,y;
-      unsigned char *src;
-      unsigned short *dst,r,g,b;
-      int simgw,dimgw;
-
-      src=(unsigned char *)(image->Data+(yoffset*image->Width+xoffset)*3);
-      dst=destimg+(yoffset*image->Width+xoffset);
-    
-      simgw=(image->Width-width)*3;
-      dimgw=image->Width-width;
-      for(y=0;y<height;y++) {
-        for(x=0;x<width;x++) {
-          r=*src++;
-          g=*src++;
-          b=*src++;
-          *dst++=((0xf8 & r) << (11-3))  |
-            ((0xfc & g) << (5-3+1))      |
-            ((0xf8 & b) >> 3); 
-        }
-
-        src += simgw;
-        dst += dimgw;
-      }
-    }
-    break;
-  case 4:
-  case GL_RGBA:
-  case GL_RGBA2:
-  case GL_RGBA4:
-  case GL_RGBA8:
-  case GL_RGB10_A2:
-  case GL_RGBA12:
-  case GL_RGBA16:
-    {
-      int x,y;
-      unsigned char *src;
-      unsigned short *dst,r,g,b,a;
-      int simgw,dimgw;
+  if (!result) {
+    return GL_FALSE;
+  }
 
-      src=(unsigned char *)(image->Data+(yoffset*image->Width+xoffset)*4);
-      dst=destimg+(yoffset*image->Width+xoffset);
-    
-      simgw=(image->Width-width)*4;
-      dimgw=image->Width-width;
-      for(y=0;y<height;y++) {
-        for(x=0;x<width;x++) {
-          r=*src++;
-          g=*src++;
-          b=*src++;
-          a=*src++;
-          *dst++=((0xf0 & a) << 8) |
-            ((0xf0 & r) << 4)      |
-            (0xf0 & g)             |
-            ((0xf0 & b) >> 4);
-        }
+  if (ti->validated && ti->isInTM)
+    /* Don't use this, it's very broken.  Download whole image for now.
+      fxTMReloadSubMipMapLevel(fxMesa, texObj, level, yoffset, height);
+    */
+    fxTMReloadMipMapLevel(fxMesa, texObj, level);
+  else
+    fxTexInvalidate(ctx, texObj);
 
-        src += simgw;
-        dst += dimgw;
-      }
-    }
-    break;
-  case GL_RGB5_A1:
-    {
-      int x,y;
-      unsigned char *src;
-      unsigned short *dst,r,g,b,a;
-      int simgw,dimgw;
+  return GL_TRUE;
+}
 
-      src=(unsigned char *)(image->Data+(yoffset*image->Width+xoffset)*4);
-      dst=destimg+(yoffset*image->Width+xoffset);
-    
-      simgw=(image->Width-width)*4;
-      dimgw=image->Width-width;
-      for(y=0;y<height;y++) {
-        for(x=0;x<width;x++) {
-          r=*src++;
-          g=*src++;
-          b=*src++;
-          a=*src++;
-          *dst++=
-          ((0x80 & a) << 8) |
-          ((0xf8 & r) << 7)      |
-          ((0xf8 & g) << 2)      |
-          ((0xf8 & b) >> 3);
-        }
 
-        src += simgw;
-        dst += dimgw;
-      }
+static void PrintTexture(int w, int h, int c, const GLubyte *data)
+{
+  int i, j;
+  for (i = 0; i < h; i++) {
+    for (j = 0; j < w; j++) {
+      if (c==2)
+        printf("%02x %02x  ", data[0], data[1]);
+      else if (c==3)
+        printf("%02x %02x %02x  ", data[0], data[1], data[2]);
+      data += c;
     }
-    break; 
-  default:
-    fprintf(stderr,"fx Driver: wrong internalFormat in fxTexBuildSubImageMap()\n");
-    fxCloseHardware();
-    exit(-1);
-    break;
+    printf("\n");
   }
 }
- 
+
 
-void fxDDTexSubImg(GLcontext *ctx, GLenum target,
-                   struct gl_texture_object *tObj, GLint level,
-                   GLint xoffset, GLint yoffset, GLint width, GLint height,
-                   GLint internalFormat, const struct gl_texture_image *image)
+GLvoid *fxDDGetTexImage(GLcontext *ctx, GLenum target, GLint level,
+                        const struct gl_texture_object *texObj,
+                        GLenum *formatOut, GLenum *typeOut,
+                        GLboolean *freeImageOut )
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   tfxTexInfo *ti;
-  GrTextureFormat_t gldformat;
-  int wscale,hscale;
   tfxMipMapLevel *mml;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,
-	     "fxmesa: (%d) fxDDTexSubImg(level=%d,target=%d,format=%x,width=%d,height=%d)\n",
-	     tObj->Name, level, target, internalFormat, image->Width,
-	     image->Height);
-  }
 
-  if(target!=GL_TEXTURE_2D)
-    return;
+  if (target != GL_TEXTURE_2D)
+    return NULL;
 
-  if (!tObj->DriverData)
-    return;
+  if (!texObj->DriverData)
+    return NULL;
 
-  ti=fxTMGetTexInfo(tObj);
-  mml=&ti->mipmapLevel[level];
-
-  fxTexGetFormat(internalFormat,&gldformat,NULL);
-
-  if(mml->glideFormat!=gldformat) {
-     if (MESA_VERBOSE&VERBOSE_DRIVER) {
-	fprintf(stderr,"fxmesa:  ti->info.format!=format in fxDDTexSubImg()\n");
-     }
-    fxDDTexImg(ctx,target,tObj,level,internalFormat,image);
-
-    return;
+  ti = fxTMGetTexInfo(texObj);
+  mml = &ti->mipmapLevel[level];
+  if (mml->data) {
+    MesaIntTexFormat mesaFormat;
+    GLenum glFormat;
+    struct gl_texture_image *texImage = texObj->Image[level];
+    GLint srcStride;
+
+    GLubyte *data = (GLubyte *) MALLOC(texImage->Width * texImage->Height * 4);
+    if (!data)
+      return NULL;
+
+    switch (mml->glideFormat) {
+      case GR_TEXFMT_INTENSITY_8:
+        mesaFormat = MESA_I8;
+        glFormat = GL_INTENSITY;
+        srcStride = mml->width;
+        break;
+      case GR_TEXFMT_ALPHA_INTENSITY_88:
+        mesaFormat = MESA_A8_L8;
+        glFormat = GL_LUMINANCE_ALPHA;
+        srcStride = mml->width;
+        break;
+      case GR_TEXFMT_ALPHA_8:
+        mesaFormat = MESA_A8;
+        glFormat = GL_ALPHA;
+        srcStride = mml->width;
+        break;
+      case GR_TEXFMT_RGB_565:
+        mesaFormat = MESA_R5_G6_B5;
+        glFormat = GL_RGB;
+        srcStride = mml->width * 2;
+        break;
+      case GR_TEXFMT_ARGB_8888:
+        mesaFormat = MESA_A8_R8_G8_B8;
+        glFormat = GL_RGBA;
+        srcStride = mml->width * 4;
+        break;
+      case GR_TEXFMT_ARGB_4444:
+        mesaFormat = MESA_A4_R4_G4_B4;
+        glFormat = GL_RGBA;
+        srcStride = mml->width * 2;
+        break;
+      case GR_TEXFMT_ARGB_1555:
+        mesaFormat = MESA_A1_R5_G5_B5;
+        glFormat = GL_RGBA;
+        srcStride = mml->width * 2;
+        break;
+      case GR_TEXFMT_P_8:
+        mesaFormat = MESA_C8;
+        glFormat = GL_COLOR_INDEX;
+        srcStride = mml->width;
+        break;
+      default:
+        gl_problem(NULL, "Bad glideFormat in fxDDGetTexImage");
+        return NULL;
+    }
+    _mesa_unconvert_teximage(mesaFormat, mml->width, mml->height, mml->data,
+                             srcStride, texImage->Width, texImage->Height,
+                             glFormat, data);
+    *formatOut = glFormat;
+    *typeOut = GL_UNSIGNED_BYTE;
+    *freeImageOut = GL_TRUE;
+    return data;
   }
-
-  fxTexGetInfo(image->Width,image->Height,NULL,NULL,NULL,NULL,NULL,NULL,&wscale,&hscale);
-
-  if((wscale!=1) || (hscale!=1)) {
-     if (MESA_VERBOSE&VERBOSE_DRIVER) {
-	fprintf(stderr,"fxmesa:  (wscale!=1) || (hscale!=1) in fxDDTexSubImg()\n");
-     }
-    fxDDTexImg(ctx,target,tObj,level,internalFormat,image);
-
-    return;
+  else {
+    return NULL;
   }
-
-  if(mml->translated)
-    fxTexBuildSubImageMap(image,internalFormat,xoffset,yoffset,
-                          width,height,mml->data);
-
-  if(ti->validated && ti->isInTM)
-    fxTMReloadSubMipMapLevel(fxMesa,tObj,level,yoffset,height);
-  else
-    fxTexInvalidate(ctx,tObj);
 }
 
 
Index: xc/extras/Mesa/src/FX/fxdrv.h
diff -u xc/extras/Mesa/src/FX/fxdrv.h:1.4 xc/extras/Mesa/src/FX/fxdrv.h:1.5
--- xc/extras/Mesa/src/FX/fxdrv.h:1.4	Thu Mar  2 08:07:21 2000
+++ xc/extras/Mesa/src/FX/fxdrv.h	Fri Jun 16 17:02:34 2000
@@ -50,14 +50,10 @@
  * you turn debugging on/off from the debugger.
  */
 
-#ifndef XFree86Server
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <assert.h>
-#else 
+#ifdef XFree86Server
 #include "GL/xf86glx.h"
+#else 
+#include "glheader.h"
 #endif
 
 
@@ -87,8 +83,8 @@
 
 
 
-#if defined(MESA_DEBUG) && 0
 extern void fx_sanity_triangle( GrVertex *, GrVertex *, GrVertex * );
+#if defined(MESA_DEBUG) && 0
 #define grDrawTriangle fx_sanity_triangle
 #endif
 
@@ -166,6 +162,7 @@
 #endif
 #endif
 
+
 #define FX_VB_COLOR(fxm, color)				\
   do {							\
     if (sizeof(GLint) == 4*sizeof(GLubyte)) {		\
@@ -187,9 +184,9 @@
 }
 
 #if FX_USE_PARGB
-#define GOURAUD2(v, c) {																\
-  GLubyte *col = c;  																	\
-  v->argb=MESACOLOR2PARGB(col);															\
+#define GOURAUD2(v, c) {			\
+  GLubyte *col = c;  				\
+  v->argb=MESACOLOR2PARGB(col);			\
 }
 #else
 #define GOURAUD2(v, c) {			\
@@ -230,13 +227,13 @@
 #define FX_UM_E0_MODULATE           0x00000002
 #define FX_UM_E0_DECAL              0x00000004
 #define FX_UM_E0_BLEND              0x00000008
-#define FX_UM_E0_ADD				0x00000010
+#define FX_UM_E0_ADD		    0x00000010
 
 #define FX_UM_E1_REPLACE            0x00000020
 #define FX_UM_E1_MODULATE           0x00000040
 #define FX_UM_E1_DECAL              0x00000080
 #define FX_UM_E1_BLEND              0x00000100
-#define FX_UM_E1_ADD				0x00000200
+#define FX_UM_E1_ADD		    0x00000200
 
 #define FX_UM_E_ENVMODE             0x000003ff
 
@@ -261,6 +258,20 @@
 #define FX_UM_ALPHA_ITERATED        0x04000000
 #define FX_UM_ALPHA_CONSTANT        0x08000000
 
+
+#define PACK_BGRA32(R, G, B, A)  \
+    ( (((GLuint) (R)) << 16) | \
+      (((GLuint) (G)) <<  8) | \
+      (((GLuint) (B))      ) | \
+      (((GLuint) (A)) << 24) )
+
+#define PACK_RGBA32(R, G, B, A)  \
+    ( (((GLuint) (R))      ) | \
+      (((GLuint) (G)) <<  8) | \
+      (((GLuint) (B)) << 16) | \
+      (((GLuint) (A)) << 24) )
+
+
 typedef void (*tfxRenderVBFunc)(GLcontext *);
 
 /*
@@ -272,11 +283,10 @@
 } MemRange;
 
 typedef struct {
-  GLsizei width, height;
-  GLint glideFormat;
-
-  unsigned short *data;
-  GLboolean translated, used;
+  GLsizei width, height;              /* image size */
+  GLint texelSize;		      /* How many bytes to a texel */
+  GrTextureFormat_t glideFormat;      /* Glide image format */
+  unsigned short *data;               /* Glide-formated texture image */
 } tfxMipMapLevel;
 
 typedef struct tfxTexInfo_t {
@@ -345,27 +355,20 @@
 
 typedef struct {
   /* Alpha test */
-
   GLboolean alphaTestEnabled;
   GrCmpFnc_t alphaTestFunc;
   GrAlpha_t alphaTestRefValue;
 
   /* Blend function */
-
   GLboolean blendEnabled;
   GrAlphaBlendFnc_t blendSrcFuncRGB;
   GrAlphaBlendFnc_t blendDstFuncRGB;
   GrAlphaBlendFnc_t blendSrcFuncAlpha;
   GrAlphaBlendFnc_t blendDstFuncAlpha;
-
-  /* Depth test */
-
-  GLboolean depthTestEnabled;
-  GLboolean depthMask;
-  GrCmpFnc_t depthTestFunc;
 } tfxUnitsState;
 
 
+
 /* Flags for render_index.
  */
 #define FX_OFFSET             0x1
@@ -386,6 +389,7 @@
 #define FX_NEW_SCISSOR        0x20
 #define FX_NEW_COLOR_MASK     0x40
 #define FX_NEW_CULL           0x80
+#define FX_NEW_STENCIL        0x100
 
 /* FX struct stored in VB->driver_data.
  */
@@ -427,8 +431,6 @@
 
 
 struct tfxMesaContext {
-  GuTexPalette glbPalette;
-
   GLcontext *glCtx;              /* the core Mesa context */
   GLvisual *glVis;               /* describes the color buffer */
   GLframebuffer *glBuffer;       /* the ancillary buffers */
@@ -439,6 +441,7 @@
   GrBuffer_t currentFB;
 
   GLboolean bgrOrder;
+  GLuint depthClear;
   GrColor_t color;
   GrColor_t clearC;
   GrAlpha_t clearA;
@@ -448,6 +451,8 @@
   tfxUnitsState unitsState;
   tfxUnitsState restoreUnitsState; /* saved during multipass */
 
+  GuTexPalette glbPalette;
+
   GLuint tmu_source[FX_NUM_TMU];
   GLuint tex_dest[MAX_TEXTURE_UNITS];
   GLuint setupindex;
@@ -471,7 +476,6 @@
 
   GLuint texBindNumber;
   GLint tmuSrc;
-  GLuint lastUnitsMode;
   GLuint freeTexMem[FX_NUM_TMU];
   MemRange *tmPool;
   MemRange *tmFree[FX_NUM_TMU];
@@ -506,8 +510,7 @@
   GLboolean haveTwoTMUs;	/* True if we really have 2 tmu's  */
   GLboolean emulateTwoTMUs;	/* True if we present 2 tmu's to mesa.  */
   GLboolean haveAlphaBuffer;
-  GLboolean haveZBuffer;
-  GLboolean haveDoubleBuffer;
+  GLboolean haveHwStencil;
   GLboolean haveGlobalPaletteTexture;
   GLint swapInterval;
   GLint maxPendingSwapBuffers;
@@ -534,6 +537,7 @@
 extern GrHwConfiguration glbHWConfig;
 extern int glbCurrentBoard;
 
+extern void fxPrintSetupFlags( const char *msg, GLuint flags );
 extern void fxSetupFXUnits(GLcontext *);
 extern void fxSetupDDPointers(GLcontext *);
 extern void fxDDSetNearFar(GLcontext *, GLfloat, GLfloat);
@@ -567,24 +571,34 @@
 extern void fxSetupDDSpanPointers(GLcontext *);
 
 extern void fxPrintTextureData(tfxTexInfo *ti);
-extern void fxDDTexEnv(GLcontext *, GLenum, const GLfloat *);
-extern void fxDDTexImg(GLcontext *, GLenum, struct gl_texture_object *,
-		       GLint, GLint, const struct gl_texture_image *);
+extern GLboolean fxDDTexImage2D(GLcontext *ctx, GLenum target, GLint level,
+                              GLenum format, GLenum type, const GLvoid *pixels,
+                              const struct gl_pixelstore_attrib *packing,
+                              struct gl_texture_object *texObj,
+                              struct gl_texture_image *texImage,
+                              GLboolean *retainInternalCopy);
+extern GLboolean fxDDTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
+                              GLint xoffset, GLint yoffset,
+                              GLsizei width, GLsizei height,
+                              GLenum format, GLenum type, const GLvoid *pixels,
+                              const struct gl_pixelstore_attrib *packing,
+                              struct gl_texture_object *texObj,
+                              struct gl_texture_image *texImage);
+extern GLvoid *fxDDGetTexImage(GLcontext *ctx, GLenum target, GLint level,
+                               const struct gl_texture_object *texObj,
+                               GLenum *formatOut, GLenum *typeOut,
+                               GLboolean *freeImageOut );
+extern void fxDDTexEnv(GLcontext *, GLenum, GLenum, const GLfloat *);
 extern void fxDDTexParam(GLcontext *, GLenum, struct gl_texture_object *,
 			 GLenum, const GLfloat *);
 extern void fxDDTexBind(GLcontext *, GLenum, struct gl_texture_object *);
 extern void fxDDTexDel(GLcontext *, struct gl_texture_object *);
 extern void fxDDTexPalette(GLcontext *, struct gl_texture_object *);
-extern void fxDDTexuseGlbPalette(GLcontext *, GLboolean);
-extern void fxDDTexSubImg(GLcontext *, GLenum, struct gl_texture_object *, GLint,
-			  GLint, GLint, GLint, GLint, GLint, const struct gl_texture_image *);
 extern void fxDDTexUseGlbPalette(GLcontext *, GLboolean);
 
 extern void fxDDEnable(GLcontext *, GLenum, GLboolean);
 extern void fxDDAlphaFunc(GLcontext *, GLenum, GLclampf);
 extern void fxDDBlendFunc(GLcontext *, GLenum, GLenum);
-extern void fxDDDepthMask(GLcontext *, GLboolean);
-extern void fxDDDepthFunc(GLcontext *, GLenum);
 
 extern void fxDDRegisterVB( struct vertex_buffer *VB );
 extern void fxDDUnregisterVB( struct vertex_buffer *VB );
@@ -619,6 +633,7 @@
 #define fxTMGetTexInfo(o) ((tfxTexInfo*)((o)->DriverData))
 extern void fxTMInit(fxMesaContext ctx);
 extern void fxTMClose(fxMesaContext ctx);
+extern void fxTMRestoreTextures_NoLock(fxMesaContext ctx);
 extern void fxTMMoveInTM(fxMesaContext, struct gl_texture_object *, GLint);
 extern void fxTMMoveOutTM(fxMesaContext, struct gl_texture_object *);
 #define fxTMMoveOutTM_NoLock fxTMMoveOutTM
Index: xc/extras/Mesa/src/FX/fxglidew.c
diff -u xc/extras/Mesa/src/FX/fxglidew.c:1.3 xc/extras/Mesa/src/FX/fxglidew.c:1.4
--- xc/extras/Mesa/src/FX/fxglidew.c:1.3	Thu Mar  2 08:07:21 2000
+++ xc/extras/Mesa/src/FX/fxglidew.c	Fri Jun 16 17:02:34 2000
@@ -55,6 +55,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+
+grStencilFunc_t grStencilFuncPtr = NULL;
+grStencilMask_t grStencilMaskPtr = NULL;
+grStencilOp_t grStencilOpPtr = NULL;
+grBufferClearExt_t grBufferClearExtPtr = NULL;
+
+
 FxI32 FX_grGetInteger_NoLock(FxU32 pname)
 {
 #if !defined(FX_GLIDE3)
@@ -71,6 +78,8 @@
     case FX_TEXTURE_ALIGN:
         /* This is a guess from reading the glide3 docs */
         return 8;
+    case FX_ZDEPTH_MAX:
+      return 0xFFFF;
     default:
        if (MESA_VERBOSE&VERBOSE_DRIVER) {
           fprintf(stderr,"Wrong parameter in FX_grGetInteger!\n");
@@ -90,6 +99,12 @@
      case FX_TEXTURE_ALIGN:
        grname = pname;
        break;
+     case FX_ZDEPTH_MAX: {
+       int zvals[2];
+
+       grGet(GR_ZDEPTH_MIN_MAX, 8, zvals);
+       return zvals[0];
+     }
      default:
        if (MESA_VERBOSE&VERBOSE_DRIVER) {
           fprintf(stderr,"Wrong parameter in FX_grGetInteger!\n");
@@ -154,7 +169,17 @@
 FxBool FX_grSstControl(FxU32 code)
 {
 #if defined(FX_GLIDE3)
-  (void) code;
+  /* The glide 3 sources call for grEnable/grDisable to be called in exchange
+   * for grSstControl. */
+  switch(code) {
+    case GR_CONTROL_ACTIVATE:
+      grEnable(GR_PASSTHRU);
+      break;
+    case GR_CONTROL_DEACTIVATE:
+      grDisable(GR_PASSTHRU);
+      break;
+  }
+  /* Appearently GR_CONTROL_RESIZE can be ignored. */
   return 1;  /* OK? */
 #else
   FxU32 result;
@@ -225,12 +250,12 @@
 
 void FX_grSstPerfStats(GrSstPerfStats_t *st)
 {
-  /* ToDo */
-  st->pixelsIn = 0;
-  st->chromaFail = 0;
-  st->zFuncFail = 0;
-  st->aFuncFail = 0;
-  st->pixelsOut = 0;
+  FxI32 n;
+  grGet(GR_STATS_PIXELS_IN, 4, &n);              st->pixelsIn = n;
+  grGet(GR_STATS_PIXELS_CHROMA_FAIL, 4, &n);     st->chromaFail = n;
+  grGet(GR_STATS_PIXELS_DEPTHFUNC_FAIL, 4, &n);  st->zFuncFail = n;
+  grGet(GR_STATS_PIXELS_AFUNC_FAIL, 4, &n);      st->aFuncFail = n;
+  grGet(GR_STATS_PIXELS_OUT, 4, &n);             st->pixelsOut = n;
 }
 
 void FX_grAADrawLine(GrVertex *a,GrVertex *b)
@@ -385,6 +410,10 @@
    return i;
 } 
 
+
+#endif  /* FX_GLIDE3 */
+
+/* It appears to me that this function is needed either way. */
 FX_GrContext_t FX_grSstWinOpen( FxU32                hWnd,
                                 GrScreenResolution_t screen_resolution,
                                 GrScreenRefresh_t    refresh_rate,
@@ -403,6 +432,7 @@
                      nColBuffers,
                      nAuxBuffers );
    
+   /*
    fprintf(stderr, 
            "grSstWinOpen( win %d res %d ref %d fmt %d\n"
            "              org %d ncol %d naux %d )\n"
@@ -415,13 +445,13 @@
            nColBuffers,
            nAuxBuffers,
            i);
+   */
    END_BOARD_LOCK();
    return i;
 }
 
 
 
-#endif 
 #else
 
 /*
Index: xc/extras/Mesa/src/FX/fxglidew.h
diff -u xc/extras/Mesa/src/FX/fxglidew.h:1.3 xc/extras/Mesa/src/FX/fxglidew.h:1.4
--- xc/extras/Mesa/src/FX/fxglidew.h:1.3	Thu Mar  2 08:07:22 2000
+++ xc/extras/Mesa/src/FX/fxglidew.h	Fri Jun 16 17:02:34 2000
@@ -47,7 +47,51 @@
 #define __FX_GLIDE_WARPER__
 
 #include <glide.h>
+#include <g3ext.h>
 
+/*
+ * These are glide extension definitions.  These are not
+ * defined in glide.h.  They should really be defined in
+ * g3ext.h, but they are not.
+ */
+#if 0
+FX_ENTRY void FX_CALL 
+grStencilFunc(GrCmpFnc_t fnc, GrStencil_t ref, GrStencil_t mask);
+
+FX_ENTRY void FX_CALL 
+grStencilMask(GrStencil_t write_mask);
+
+FX_ENTRY void FX_CALL 
+grStencilOp(
+            GrStencilOp_t stencil_fail,
+            GrStencilOp_t depth_fail,
+            GrStencilOp_t depth_pass);
+
+FX_ENTRY void FX_CALL 
+grBufferClearExt(
+              GrColor_t color,
+              GrAlpha_t alpha,
+              FxU32     depth,
+              GrStencil_t stencil);
+#endif
+
+
+typedef void (*grStencilFunc_t)(GrCmpFnc_t fnc, GrStencil_t ref, GrStencil_t mask);
+typedef void (*grStencilMask_t)(GrStencil_t write_mask);
+typedef void (*grStencilOp_t)(GrStencilOp_t stencil_fail, GrStencilOp_t depth_fail, GrStencilOp_t depth_pass);
+typedef void (*grBufferClearExt_t)(GrColor_t color, GrAlpha_t alpha, FxU32 depth, GrStencil_t stencil);
+
+extern grStencilFunc_t grStencilFuncPtr;
+extern grStencilMask_t grStencilMaskPtr;
+extern grStencilOp_t grStencilOpPtr;
+extern grBufferClearExt_t grBufferClearExtPtr;
+
+
+FX_ENTRY void FX_CALL
+grEnable(GrEnableMode_t mode);
+
+FX_ENTRY void FX_CALL
+grEnable(GrEnableMode_t mode);
 /* 
  * General context: 
  */
@@ -74,12 +118,13 @@
 	#define FX_PENDING_BUFFERSWAPS          GR_PENDING_BUFFERSWAPS
 	#define FX_TEXTURE_ALIGN		GR_TEXTURE_ALIGN
 #endif
+#define FX_ZDEPTH_MAX 0x100
 
 /*
  * Genral warper functions for Glide2/Glide3:
  */ 
-extern FxI32 FX_grGetInteger(FxU32 pname);
 extern FxI32 FX_grGetInteger_NoLock(FxU32 pname);
+extern FxI32 FX_grGetInteger(FxU32 pname);
 
 /*
  * Glide2 emulation on Glide3:
@@ -253,7 +298,6 @@
 
 #endif
 
-
 /*
  * Glide2 functions for Glide3
  */
@@ -567,6 +611,55 @@
     END_CLIP_LOOP();			\
   } while (0)
 
+#define FX_grBufferClearExt(c, a, d, s)	\
+  do {					\
+    BEGIN_CLIP_LOOP();			\
+    (*grBufferClearExtPtr)(c, a, d, s);	\
+    END_CLIP_LOOP();			\
+  } while (0)
+
+/*
+ * Enable/Disable
+ */
+#define FX_grEnable(m)                   \
+  do {				         \
+    BEGIN_BOARD_LOCK();		         \
+    grEnable(m);                         \
+    END_BOARD_LOCK();		         \
+  } while (0)
+
+#define FX_grDisable(m)                  \
+  do {				         \
+    BEGIN_BOARD_LOCK();		         \
+    grDisable(m);                        \
+    END_BOARD_LOCK();		         \
+  } while (0)
+
+/*
+ * Stencil operations.
+ */
+#define FX_grStencilFunc(fnc, ref, mask) \
+  do {				         \
+    BEGIN_BOARD_LOCK();		         \
+    (*grStencilFuncPtr)((fnc), (ref), (mask)); \
+    END_BOARD_LOCK();		         \
+  } while (0)
+
+#define FX_grStencilMask(write_mask)     \
+  do {				         \
+    BEGIN_BOARD_LOCK();		         \
+    (*grStencilMaskPtr)(write_mask);           \
+    END_BOARD_LOCK();		         \
+  } while (0)
+
+
+#define FX_grStencilOp(stencil_fail, depth_fail, depth_pass) \
+  do {				                             \
+    BEGIN_BOARD_LOCK();		                             \
+    (*grStencilOpPtr)((stencil_fail), (depth_fail), (depth_pass)); \
+    END_BOARD_LOCK();		                             \
+  } while (0)
+
 #define FX_grDepthMask(m)	\
   do {				\
     BEGIN_BOARD_LOCK();		\
@@ -821,9 +914,18 @@
 
 #define FX_grGlideShutdown()		\
   do {					\
-    BEGIN_CLIP_LOOP();			\
+    BEGIN_BOARD_LOCK();			\
     grGlideShutdown();			\
-    END_CLIP_LOOP();			\
+    END_BOARD_LOCK();			\
+  } while (0)
+
+#define FX_grTexLodBiasValue_NoLock(t, v) grTexLodBiasValue(t, v)
+
+#define FX_grTexLodBiasValue(t, v)	\
+  do {					\
+    BEGIN_BOARD_LOCK();			\
+    grTexLodBiasValue(t, v);	\
+    END_BOARD_LOCK();			\
   } while (0)
 
 #define FX_grGlideInit_NoLock grGlideInit
Index: xc/extras/Mesa/src/FX/fxpipeline.c
diff -u xc/extras/Mesa/src/FX/fxpipeline.c:1.2 xc/extras/Mesa/src/FX/fxpipeline.c:1.3
--- xc/extras/Mesa/src/FX/fxpipeline.c:1.2	Mon Feb 14 23:13:07 2000
+++ xc/extras/Mesa/src/FX/fxpipeline.c	Fri Jun 16 17:02:34 2000
@@ -104,7 +104,7 @@
    GLcontext *ctx = VB->ctx;
    fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
 
-   if ((fxMesa->render_index & ~FX_FLAT) ||
+   if ((fxMesa->render_index != 0) ||
        ((ctx->Texture.ReallyEnabled & 0xf) && VB->TexCoordPtr[0]->size>2) ||
        ((ctx->Texture.ReallyEnabled & 0xf0) && VB->TexCoordPtr[1]->size>2))
       gl_render_vb( VB );
@@ -281,12 +281,13 @@
 
 
 
+/* unused?
 void fxDDOptimizeEltPipeline( GLcontext *ctx, struct gl_pipeline *pipe )
 {
    (void) ctx;
    (void) pipe;
 }
-
+*/
 
 #else
 
Index: xc/extras/Mesa/src/FX/fxrender.c
diff -u xc/extras/Mesa/src/FX/fxrender.c:1.2 xc/extras/Mesa/src/FX/fxrender.c:1.3
--- xc/extras/Mesa/src/FX/fxrender.c:1.2	Mon Feb 14 23:13:08 2000
+++ xc/extras/Mesa/src/FX/fxrender.c	Fri Jun 16 17:02:34 2000
@@ -722,8 +722,8 @@
     return null_tables;  
 
   switch (fxMesa->render_index) {
-  case FX_FLAT:
-    return fxDDRenderVBFlat_tables;
+/*    case FX_FLAT: */
+/*      return fxDDRenderVBFlat_tables; */
   case 0:
     return fxDDRenderVBSmooth_tables; 
   default:
Index: xc/extras/Mesa/src/FX/fxsetup.c
diff -u xc/extras/Mesa/src/FX/fxsetup.c:1.4 xc/extras/Mesa/src/FX/fxsetup.c:1.6
--- xc/extras/Mesa/src/FX/fxsetup.c:1.4	Thu Mar  2 08:07:22 2000
+++ xc/extras/Mesa/src/FX/fxsetup.c	Mon Jun 19 22:08:18 2000
@@ -62,16 +62,11 @@
 static void fxSetupDoubleTMU_NoLock(fxMesaContext fxMesa, 
 			     struct gl_texture_object *tObj0,
 			     struct gl_texture_object *tObj1);
-static void fxSetupTexture_NoLock(GLcontext *ctx);
-static void fxSetupTexture(GLcontext *ctx);
-static void fxSetupBlend(GLcontext *ctx);
-static void fxSetupDepthTest(GLcontext *ctx);
-static void fxSetupScissor(GLcontext *ctx);
-static void fxSetupCull(GLcontext *ctx);
 static void gl_print_fx_state_flags( const char *msg, GLuint flags);
-static GLboolean fxMultipassBlend(struct vertex_buffer *, GLuint);
 static GLboolean fxMultipassTexture( struct vertex_buffer *, GLuint );
 
+
+
 static void fxTexValidate(GLcontext *ctx, struct gl_texture_object *tObj)
 {
   tfxTexInfo *ti=fxTMGetTexInfo(tObj);
@@ -183,7 +178,7 @@
   GLuint envmode=0;
   GLuint ifmt=0;
 
-  if((ctx->Light.ShadeModel==GL_SMOOTH) ||
+  if((ctx->Light.ShadeModel==GL_SMOOTH) || 1 ||
      (ctx->Point.SmoothFlag) ||
      (ctx->Line.SmoothFlag) ||
      (ctx->Polygon.SmoothFlag))
@@ -191,11 +186,13 @@
   else
     unitsmode|=FX_UM_ALPHA_CONSTANT;
 
-  if(ctx->Light.ShadeModel==GL_SMOOTH)
+  if(ctx->Light.ShadeModel==GL_SMOOTH || 1)
     unitsmode|=FX_UM_COLOR_ITERATED;
   else
     unitsmode|=FX_UM_COLOR_CONSTANT;
 
+
+
   /* 
      OpenGL Feeds Texture 0 into Texture 1
      Glide Feeds Texture 1 into Texture 0
@@ -476,11 +473,6 @@
   else
     unitsmode=fxGetTexSetConfiguration(ctx,NULL,tObj);
 
-  if(fxMesa->lastUnitsMode==unitsmode)
-    return;
-
-  fxMesa->lastUnitsMode=unitsmode;
-
   fxMesa->stw_hint_state = 0;
   FX_grHints_NoLock(GR_HINT_STWHINT,0);
 
@@ -555,9 +547,8 @@
 			       FXTRUE);
     ctx->Driver.MultipassFunc = fxMultipassBlend;
 #else
-#ifndef FX_SILENT
-    fprintf(stderr,"fx Driver: GL_BLEND not yet supported\n");
-#endif
+    if (MESA_VERBOSE&VERBOSE_DRIVER)
+      fprintf(stderr,"fx Driver: GL_BLEND not yet supported\n");
 #endif    
     break;
   case GL_REPLACE:
@@ -588,9 +579,9 @@
 			       FXFALSE);
     break;
   default:
-#ifndef FX_SILENT
-    fprintf(stderr,"fx Driver: %x Texture.EnvMode not yet supported\n",ctx->Texture.Unit[textureset].EnvMode);
-#endif
+    if (MESA_VERBOSE&VERBOSE_DRIVER)
+      fprintf(stderr, "fx Driver: %x Texture.EnvMode not yet supported\n",
+	      ctx->Texture.Unit[textureset].EnvMode);
     break;
   }
 
@@ -599,7 +590,8 @@
   }
 }
 
-static void fxSetupTextureSingleTMU(GLcontext *ctx, GLuint textureset) {
+static void fxSetupTextureSingleTMU(GLcontext *ctx, GLuint textureset)
+{
   BEGIN_BOARD_LOCK();
   fxSetupTextureSingleTMU_NoLock(ctx, textureset);
   END_BOARD_LOCK();
@@ -764,11 +756,6 @@
 
   unitsmode=fxGetTexSetConfiguration(ctx,tObj0,tObj1);
 
-  if(fxMesa->lastUnitsMode==unitsmode)
-    return;
-
-  fxMesa->lastUnitsMode=unitsmode;
-
   fxMesa->stw_hint_state |= GR_STWHINT_ST_DIFF_TMU1;
   FX_grHints_NoLock(GR_HINT_STWHINT, fxMesa->stw_hint_state);
 
@@ -1030,7 +1017,7 @@
      fprintf(stderr,"fxmesa: fxSetupTextureNone(...)\n");
   }
 
-  if((ctx->Light.ShadeModel==GL_SMOOTH) ||
+  if((ctx->Light.ShadeModel==GL_SMOOTH) || 1 ||
      (ctx->Point.SmoothFlag) ||
      (ctx->Line.SmoothFlag) ||
      (ctx->Polygon.SmoothFlag))
@@ -1038,7 +1025,7 @@
   else
     locala=GR_COMBINE_LOCAL_CONSTANT;
   
-  if(ctx->Light.ShadeModel==GL_SMOOTH)
+  if(ctx->Light.ShadeModel==GL_SMOOTH || 1)
     localc=GR_COMBINE_LOCAL_ITERATED;
   else
     localc=GR_COMBINE_LOCAL_CONSTANT;
@@ -1054,8 +1041,6 @@
 			   localc,
 			   GR_COMBINE_OTHER_NONE,
 			   FXFALSE);
-
-  fxMesa->lastUnitsMode=FX_UM_NONE;
 }
 
 /************************************************************************/
@@ -1106,7 +1091,8 @@
   }
 }
 
-static void fxSetupTexture(GLcontext *ctx) {
+static void fxSetupTexture(GLcontext *ctx)
+{
   BEGIN_BOARD_LOCK();
   fxSetupTexture_NoLock(ctx);
   END_BOARD_LOCK();
@@ -1239,15 +1225,19 @@
 
 static void fxSetupBlend(GLcontext *ctx)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  tfxUnitsState *us=&fxMesa->unitsState;
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  tfxUnitsState *us = &fxMesa->unitsState;
 
-  if(us->blendEnabled)
-     FX_grAlphaBlendFunction(us->blendSrcFuncRGB,us->blendDstFuncRGB,
-			  us->blendSrcFuncAlpha,us->blendDstFuncAlpha);
+  assert(us->blendEnabled == ctx->Color.BlendEnabled);
+
+  if (us->blendEnabled)
+     FX_grAlphaBlendFunction(us->blendSrcFuncRGB, us->blendDstFuncRGB,
+                             us->blendSrcFuncAlpha, us->blendDstFuncAlpha);
   else
-     FX_grAlphaBlendFunction(GR_BLEND_ONE,GR_BLEND_ZERO,GR_BLEND_ONE,GR_BLEND_ZERO);
+     FX_grAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO, 
+                             GR_BLEND_ONE, GR_BLEND_ZERO);
 }
+
   
 /************************************************************************/
 /************************** Alpha Test SetUp ****************************/
@@ -1255,8 +1245,8 @@
 
 void fxDDAlphaFunc(GLcontext *ctx, GLenum func, GLclampf ref)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  tfxUnitsState *us=&fxMesa->unitsState;
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  tfxUnitsState *us = &fxMesa->unitsState;
   GrCmpFnc_t newfunc;
 
   switch(func) {
@@ -1316,81 +1306,121 @@
      FX_grAlphaTestFunction(GR_CMP_ALWAYS);
 }
 
-/************************************************************************/
-/************************** Depth Test SetUp ****************************/
-/************************************************************************/
 
-void fxDDDepthFunc(GLcontext *ctx, GLenum func)
+/*
+ * Evaluate all depth-test state and make the Glide calls.
+ */
+static void
+fxSetupDepthTest(GLcontext *ctx)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  tfxUnitsState *us=&fxMesa->unitsState;
-  GrCmpFnc_t dfunc;
-
-  switch(func) {
-  case GL_NEVER:
-    dfunc=GR_CMP_NEVER;
-    break;
-  case GL_LESS:
-    dfunc=GR_CMP_LESS;
-    break;
-  case GL_GEQUAL:
-    dfunc=GR_CMP_GEQUAL;
-    break;
-  case GL_LEQUAL:
-    dfunc=GR_CMP_LEQUAL;
-    break;
-  case GL_GREATER:
-    dfunc=GR_CMP_GREATER;
-    break;
-  case GL_NOTEQUAL:
-    dfunc=GR_CMP_NOTEQUAL;
-    break;
-  case GL_EQUAL:
-    dfunc=GR_CMP_EQUAL;
-    break;
-  case GL_ALWAYS:
-    dfunc=GR_CMP_ALWAYS;
-    break;
-  default:
-    fprintf(stderr,"fx Driver: internal error in fxDDDepthFunc()\n");
-    fxCloseHardware();
-    exit(-1);
-    break;
+  if (ctx->Depth.Test) {
+    GrCmpFnc_t dfunc;
+    switch (ctx->Depth.Func) {
+      case GL_NEVER:
+        dfunc = GR_CMP_NEVER;
+        break;
+      case GL_LESS:
+        dfunc = GR_CMP_LESS;
+        break;
+      case GL_GEQUAL:
+        dfunc = GR_CMP_GEQUAL;
+        break;
+      case GL_LEQUAL:
+        dfunc = GR_CMP_LEQUAL;
+        break;
+      case GL_GREATER:
+        dfunc = GR_CMP_GREATER;
+        break;
+      case GL_NOTEQUAL:
+        dfunc = GR_CMP_NOTEQUAL;
+        break;
+      case GL_EQUAL:
+        dfunc = GR_CMP_EQUAL;
+        break;
+      case GL_ALWAYS:
+        dfunc = GR_CMP_ALWAYS;
+        break;
+      default:
+        gl_problem(ctx, "bad depth mode in fxSetupDepthTest");
+        dfunc = GR_CMP_ALWAYS;
+    }
+    FX_grDepthBufferFunction(dfunc);
+    FX_grDepthMask(ctx->Depth.Mask);
   }
-
-  if(dfunc!=us->depthTestFunc) {
-    us->depthTestFunc=dfunc;
-    fxMesa->new_state |= FX_NEW_DEPTH;
-    ctx->Driver.RenderStart = fxSetupFXUnits;
+  else {
+    /* depth test always passes, don't update Z buffer */
+    FX_grDepthBufferFunction(GR_CMP_ALWAYS);
+    FX_grDepthMask(FXFALSE);
   }
-
 }
 
-void fxDDDepthMask(GLcontext *ctx, GLboolean flag)
-{
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  tfxUnitsState *us=&fxMesa->unitsState;
 
-  if(flag!=us->depthMask) {
-    us->depthMask=flag;
-    fxMesa->new_state |= FX_NEW_DEPTH;
-    ctx->Driver.RenderStart = fxSetupFXUnits;
+/*
+ * Evaluate all stencil state and make the Glide calls.
+ */
+static GrStencil_t
+fxConvertGLStencilOp(GLenum op)
+{
+  switch (op) {
+    case GL_KEEP:
+      return GR_STENCILOP_KEEP;
+    case GL_ZERO:
+      return GR_STENCILOP_ZERO;
+    case GL_REPLACE:
+      return GR_STENCILOP_REPLACE;
+    case GL_INCR:
+      return GR_STENCILOP_INCR_CLAMP;
+    case GL_DECR:
+      return GR_STENCILOP_DECR_CLAMP;
+    case GL_INVERT:
+      return GR_STENCILOP_INVERT;
+    default:
+      gl_problem(NULL, "bad stencil op in fxConvertGLStencilOp");
   }
+  return GR_STENCILOP_KEEP;  /* never get, silence compiler warning */
 }
 
-static void fxSetupDepthTest(GLcontext *ctx)
+/*
+ * This function is called just before any rendering is done.
+ * It will validate the stencil parameters.
+ */
+static void
+fxSetupStencilTest(GLcontext *ctx)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  tfxUnitsState *us=&fxMesa->unitsState;
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  if (fxMesa->haveHwStencil) {
+    if (ctx->Stencil.Enabled) {
+      GrStencil_t sfail = fxConvertGLStencilOp(ctx->Stencil.FailFunc);
+      GrStencil_t zfail = fxConvertGLStencilOp(ctx->Stencil.ZFailFunc);
+      GrStencil_t zpass = fxConvertGLStencilOp(ctx->Stencil.ZPassFunc);
+      FX_grStencilOp(sfail, zfail, zpass);
+      FX_grStencilFunc(ctx->Stencil.Function - GL_NEVER,
+                       ctx->Stencil.Ref, ctx->Stencil.ValueMask);
+      FX_grStencilMask(ctx->Stencil.WriteMask);
+      FX_grEnable(GR_STENCIL_MODE_EXT);
+    }
+    else {
+      FX_grDisable(GR_STENCIL_MODE_EXT);
+    }
+  }
+}
 
-  if(us->depthTestEnabled)
-     FX_grDepthBufferFunction(us->depthTestFunc);
-  else
-     FX_grDepthBufferFunction(GR_CMP_ALWAYS);
 
-  FX_grDepthMask(us->depthMask);
+/*
+ * Set the state so that stencil is either enabled or disabled.
+ * This is called from Mesa only.  Glide is invoked at
+ * setup time, not now.
+ */
+static void
+fxDDEnableStencil(GLcontext *ctx, GLboolean state)
+{
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  (void) state;
+  fxMesa->new_state |= FX_NEW_STENCIL;
+  ctx->Driver.RenderStart = fxSetupFXUnits;
 }
 
+
 /************************************************************************/
 /**************************** Color Mask SetUp **************************/
 /************************************************************************/
@@ -1410,14 +1440,20 @@
 {
   fxMesaContext fxMesa = FX_CONTEXT(ctx);
 
-  FX_grColorMask(ctx->Color.ColorMask[RCOMP] ||
-	      ctx->Color.ColorMask[GCOMP] ||
-	      ctx->Color.ColorMask[BCOMP],
-	      ctx->Color.ColorMask[ACOMP] && fxMesa->haveAlphaBuffer);
+  if (ctx->Color.DrawBuffer == GL_NONE) {
+    FX_grColorMask(FXFALSE, FXFALSE);
+  }
+  else {
+    FX_grColorMask(ctx->Color.ColorMask[RCOMP] ||
+                   ctx->Color.ColorMask[GCOMP] ||
+                   ctx->Color.ColorMask[BCOMP],
+                   ctx->Color.ColorMask[ACOMP] && fxMesa->haveAlphaBuffer);
+  }
 }
 
 
 
+
 /************************************************************************/
 /**************************** Fog Mode SetUp ****************************/
 /************************************************************************/
@@ -1582,59 +1618,71 @@
 
 void fxDDEnable(GLcontext *ctx, GLenum cap, GLboolean state)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  tfxUnitsState *us=&fxMesa->unitsState;
+  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  tfxUnitsState *us = &fxMesa->unitsState;
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDEnable(...)\n");
+    fprintf(stderr,"fxmesa: fxDDEnable(...)\n");
   }
 
   switch(cap) {
-  case GL_ALPHA_TEST:
-    if(state!=us->alphaTestEnabled) {
-      us->alphaTestEnabled=state;
-      fxMesa->new_state |= FX_NEW_ALPHA;
+    case GL_ALPHA_TEST:
+      if(state!=us->alphaTestEnabled) {
+        us->alphaTestEnabled=state;
+        fxMesa->new_state |= FX_NEW_ALPHA;
+        ctx->Driver.RenderStart = fxSetupFXUnits;
+      }
+      break;
+    case GL_BLEND:
+      if(state!=us->blendEnabled) {
+        us->blendEnabled=state;
+        fxMesa->new_state |= FX_NEW_BLEND;
+        ctx->Driver.RenderStart = fxSetupFXUnits;
+      }
+      break;
+    case GL_DEPTH_TEST:
+      fxMesa->new_state |= FX_NEW_DEPTH;
       ctx->Driver.RenderStart = fxSetupFXUnits;
-    }
-    break;
-  case GL_BLEND:
-    if(state!=us->blendEnabled) {
-      us->blendEnabled=state;
-      fxMesa->new_state |= FX_NEW_BLEND;
+      break;
+    case GL_DITHER:
+      if (state)
+        FX_grDitherMode(GR_DITHER_4x4);
+      else
+        FX_grDitherMode(GR_DITHER_DISABLE);
+      break;
+    case GL_SCISSOR_TEST:
+      fxMesa->new_state |= FX_NEW_SCISSOR;
       ctx->Driver.RenderStart = fxSetupFXUnits;
-    }
-    break;
-  case GL_DEPTH_TEST:
-    if(state!=us->depthTestEnabled) {
-      us->depthTestEnabled=state;
-      fxMesa->new_state |= FX_NEW_DEPTH;
+      break;
+    case GL_SHARED_TEXTURE_PALETTE_EXT:
+      fxDDTexUseGlbPalette(ctx, state);
+      break;
+    case GL_FOG:
+      fxMesa->new_state |= FX_NEW_FOG;
       ctx->Driver.RenderStart = fxSetupFXUnits;
-    }
-    break;
-  case GL_SCISSOR_TEST:
-     fxMesa->new_state |= FX_NEW_SCISSOR;
-     ctx->Driver.RenderStart = fxSetupFXUnits;
-     break;
-  case GL_FOG:
-     fxMesa->new_state |= FX_NEW_FOG;
-     ctx->Driver.RenderStart = fxSetupFXUnits;
-     break;
-  case GL_CULL_FACE:
-     fxMesa->new_state |= FX_NEW_CULL;
-     ctx->Driver.RenderStart = fxSetupFXUnits;
-     break;
-  case GL_LINE_SMOOTH:
-  case GL_POINT_SMOOTH:
-  case GL_POLYGON_SMOOTH:
-  case GL_TEXTURE_2D:
+      break;
+    case GL_CULL_FACE:
+      fxMesa->new_state |= FX_NEW_CULL;
+      ctx->Driver.RenderStart = fxSetupFXUnits;
+      break;
+    case GL_LINE_SMOOTH:
+    case GL_LINE_STIPPLE:
+    case GL_POINT_SMOOTH:
+    case GL_POLYGON_SMOOTH:
+    case GL_TEXTURE_2D:
       fxMesa->new_state |= FX_NEW_TEXTURING;
       ctx->Driver.RenderStart = fxSetupFXUnits;
       break;
-  default:
-    ;  /* XXX no-op??? */
+    case GL_STENCIL_TEST:
+      fxMesa->new_state |= FX_NEW_STENCIL;
+      ctx->Driver.RenderStart = fxSetupFXUnits;
+      break;
+    default:
+      ;  /* no-op */
   }    
 }
 
+
 #if 0
 /*
   Multipass to do GL_BLEND texture functions
@@ -1663,11 +1711,17 @@
       }
       fxDDDepthMask(ctx, FALSE);
     }
+   /*
+    * Disable stencil as well.
+    */
+    if (ctx->Stencil.Enabled) {
+      fxDDEnableStencil(ctx, GL_FALSE);
+    } 
     /* Enable Cc*Ct mode */
-    /* ??? Set the Constant Color ??? */
+    /* XXX Set the Constant Color ? */
     fxDDEnable(ctx, GL_BLEND, GL_TRUE);
-    fxDDBlendFunc(ctx, ???, ???);
-    fxSetupTextureSingleTMU(ctx, ???);
+    fxDDBlendFunc(ctx, XXX, XXX);
+    fxSetupTextureSingleTMU(ctx, XXX);
     fxSetupBlend(ctx);
     fxSetupDepthTest(ctx);
     break;
@@ -1675,10 +1729,11 @@
   case 2:
     /* Reset everything back to normal */
     fxMesa->unitsState = fxMesa->restoreUnitsState;
-    fxMesa->setupdone &= ???;
-    fxSetupTextureSingleTMU(ctx, ???);
+    fxMesa->setupdone &= XXX;
+    fxSetupTextureSingleTMU(ctx, XXX);
     fxSetupBlend(ctx);
     fxSetupDepthTest(ctx);
+    fxSetupStencilText(ctx);
     break;
   }
 
@@ -1724,13 +1779,15 @@
 	 case GL_ALWAYS:
 	    break;
 	 default:
-	    fxDDDepthFunc( ctx, GL_EQUAL );
+            /*fxDDDepthFunc( ctx, GL_EQUAL );*/
+            FX_grDepthBufferFunction(GR_CMP_EQUAL);
 	    break;
 	 }
 
-	 fxDDDepthMask( ctx, GL_FALSE ); 
+	 /*fxDDDepthMask( ctx, GL_FALSE ); */
+         FX_grDepthMask(FXFALSE);
       }
-      
+      fxDDEnableStencil(ctx, GL_FALSE);
       if (ctx->Texture.Unit[1].EnvMode == GL_MODULATE) {
 	 fxDDEnable( ctx, GL_BLEND, GL_TRUE );
 	 fxDDBlendFunc( ctx, GL_DST_COLOR, GL_ZERO );
@@ -1750,6 +1807,7 @@
       fxSetupTextureSingleTMU( ctx, 0 ); 
       fxSetupBlend( ctx );
       fxSetupDepthTest( ctx );
+      fxSetupStencilTest( ctx );
       break;
    }
 
@@ -1807,10 +1865,13 @@
 
      if (newstate & FX_NEW_ALPHA)
 	fxSetupAlphaTest(ctx);
-     
+
      if (newstate & FX_NEW_DEPTH)
 	fxSetupDepthTest(ctx);
 
+     if (newstate & FX_NEW_STENCIL)
+       fxSetupStencilTest(ctx);
+
      if (newstate & FX_NEW_FOG)
 	fxSetupFog(ctx);
 
@@ -1822,13 +1883,10 @@
 
      if (newstate & FX_NEW_CULL)
 	fxSetupCull(ctx);     
-
      fxMesa->new_state = 0;
 /*       ctx->Driver.RenderStart = 0; */
   }
 }
-
-
 
 #else
 
Index: xc/extras/Mesa/src/FX/fxtexman.c
diff -u xc/extras/Mesa/src/FX/fxtexman.c:1.3 xc/extras/Mesa/src/FX/fxtexman.c:1.4
--- xc/extras/Mesa/src/FX/fxtexman.c:1.3	Mon Feb 14 23:13:09 2000
+++ xc/extras/Mesa/src/FX/fxtexman.c	Fri Jun 16 17:02:34 2000
@@ -146,10 +146,10 @@
   end=FX_grTexMaxAddress(tmu);
 
   if(fxMesa->verbose) {
-    fprintf(stderr,"%s configuration:",(tmu==FX_TMU0) ? "TMU0" : "TMU1");
-    fprintf(stderr,"  Lower texture memory address (%u)\n",(unsigned int)start);
-    fprintf(stderr,"  Higher texture memory address (%u)\n",(unsigned int)end);
-    fprintf(stderr,"  Splitting Texture memory in 2b blocks:\n");
+    fprintf(stderr,"Voodoo %s configuration:",(tmu==FX_TMU0) ? "TMU0" : "TMU1");
+    fprintf(stderr,"Voodoo  Lower texture memory address (%u)\n",(unsigned int)start);
+    fprintf(stderr,"Voodoo  Higher texture memory address (%u)\n",(unsigned int)end);
+    fprintf(stderr,"Voodoo  Splitting Texture memory in 2b blocks:\n");
   }
 
   fxMesa->freeTexMem[tmu]=end-start;
@@ -162,7 +162,7 @@
     else blockend=blockstart+FX_2MB_SPLIT;
 
     if(fxMesa->verbose)
-      fprintf(stderr,"    %07u-%07u\n",
+      fprintf(stderr,"Voodoo    %07u-%07u\n",
 	      (unsigned int)blockstart,(unsigned int)blockend);
 
     tmn=fxTMNewRangeNode(fxMesa, blockstart, blockend);
@@ -545,12 +545,8 @@
   fxTexGetInfo(ti->mipmapLevel[0].width, ti->mipmapLevel[0].height,
 	       &lodlevel, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-  if((ti->info.format==GR_TEXFMT_INTENSITY_8) ||
-     (ti->info.format==GR_TEXFMT_P_8) ||
-     (ti->info.format==GR_TEXFMT_ALPHA_8))
-    data=ti->mipmapLevel[level].data+((yoffset*ti->mipmapLevel[level].width)>>1);
-  else
-    data=ti->mipmapLevel[level].data+yoffset*ti->mipmapLevel[level].width;
+  data=ti->mipmapLevel[level].data +
+    yoffset*ti->mipmapLevel[level].width*ti->mipmapLevel[level].texelSize;
 
   switch(tmu) {
   case FX_TMU0:
@@ -651,12 +647,11 @@
 
   fxTMMoveOutTM(fxMesa, tObj);
 
-  for(i=0; i<MAX_TEXTURE_LEVELS; i++) {
-    if (ti->mipmapLevel[i].used &&
-	ti->mipmapLevel[i].translated)
+  for (i=0; i<MAX_TEXTURE_LEVELS; i++) {
+    if (ti->mipmapLevel[i].data) {
       FREE(ti->mipmapLevel[i].data);
-
-    (void)ti->mipmapLevel[i].data;
+      ti->mipmapLevel[i].data = NULL;
+    }
   }
   switch (ti->whichTMU) {
   case FX_TMU0:
Index: xc/extras/Mesa/src/FX/fxtrifuncs.c
diff -u xc/extras/Mesa/src/FX/fxtrifuncs.c:1.3 xc/extras/Mesa/src/FX/fxtrifuncs.c:1.4
--- xc/extras/Mesa/src/FX/fxtrifuncs.c:1.3	Mon Feb 14 23:13:09 2000
+++ xc/extras/Mesa/src/FX/fxtrifuncs.c	Fri Jun 16 17:02:34 2000
@@ -363,6 +363,7 @@
  * Need this to provide at least one external definition.
  */
 
+extern int gl_fx_dummy_function_tris(void);
 int gl_fx_dummy_function_tris(void)
 {
   return 0;
Index: xc/extras/Mesa/src/FX/fxtritmp.h
diff -u xc/extras/Mesa/src/FX/fxtritmp.h:1.2 xc/extras/Mesa/src/FX/fxtritmp.h:1.3
--- xc/extras/Mesa/src/FX/fxtritmp.h:1.2	Mon Feb 14 23:13:10 2000
+++ xc/extras/Mesa/src/FX/fxtritmp.h	Fri Jun 16 17:02:34 2000
@@ -66,7 +66,9 @@
 	 GLuint facing = (c<0.0) ^ ctx->Polygon.FrontBit;
 	 GLubyte (*color)[4] = VB->Color[facing]->data;
 	 if (IND & FX_FLAT) {
-	    FX_VB_COLOR(fxMesa, color[pv]);
+	    GOURAUD2(v1,color[pv]); 
+	    GOURAUD2(v2,color[pv]); 
+	    GOURAUD2(v3,color[pv]); 
 	 } else {
 	    GOURAUD2(v1,color[e1]); 
 	    GOURAUD2(v2,color[e2]); 
@@ -103,7 +105,9 @@
    }
    else if (IND & FX_FLAT) {
       GLubyte (*color)[4] = VB->Color[0]->data;
-      FX_VB_COLOR(fxMesa, color[pv]);
+      GOURAUD2(v1,color[pv]); 
+      GOURAUD2(v2,color[pv]); 
+      GOURAUD2(v3,color[pv]); 
    }
 
    if (IND & FX_FRONT_BACK) {
@@ -168,7 +172,10 @@
 	 GLuint facing = (c<0.0) ^ ctx->Polygon.FrontBit;
 	 GLubyte (*color)[4] = VB->Color[facing]->data;
 	 if (IND & FX_FLAT) {
-	    FX_VB_COLOR(fxMesa, color[pv]);
+	    GOURAUD2(v1,color[pv]); 
+	    GOURAUD2(v2,color[pv]); 
+	    GOURAUD2(v3,color[pv]); 
+	    GOURAUD2(v4,color[pv]); 
 	 } else {
 	    GOURAUD2(v1,color[e1]); 
 	    GOURAUD2(v2,color[e2]); 
@@ -206,7 +213,10 @@
    }
    else if (IND & FX_FLAT) {
       GLubyte (*color)[4] = VB->Color[0]->data;
-      FX_VB_COLOR(fxMesa, color[pv]);
+      GOURAUD2(v1,color[pv]); 
+      GOURAUD2(v2,color[pv]); 
+      GOURAUD2(v3,color[pv]); 
+      GOURAUD2(v4,color[pv]); 
    }
 
    if (IND & FX_FRONT_BACK) {
@@ -249,9 +259,10 @@
    }   
 }
 
-#define DRAW_LINE(tmp0, tmp1, width)	\
-  do {					\
-    GrVertex verts[4];			\
+#define DRAW_LINE(tmp0, tmp1, width)		\
+  do {						\
+    const float xoff = 0.125, yoff = 0.125;	\
+    GrVertex verts[4];				\
     float dx, dy, wx, wy;		\
 					\
     dx = tmp0->x - tmp1->x;		\
@@ -270,17 +281,17 @@
    verts[2] = *tmp1;			\
    verts[3] = *tmp1;			\
 					\
-   verts[0].x = tmp0->x - wx;		\
-   verts[0].y = tmp0->y - wy;		\
+   verts[0].x = tmp0->x - wx + xoff;	\
+   verts[0].y = tmp0->y - wy + yoff;	\
 					\
-   verts[1].x = tmp0->x + wx;		\
-   verts[1].y = tmp0->y + wy;		\
+   verts[1].x = tmp0->x + wx + xoff;	\
+   verts[1].y = tmp0->y + wy + yoff;	\
 					\
-   verts[2].x = tmp1->x + wx;		\
-   verts[2].y = tmp1->y + wy;		\
+   verts[2].x = tmp1->x + wx + xoff;	\
+   verts[2].y = tmp1->y + wy + yoff;	\
 					\
-   verts[3].x = tmp1->x - wx;		\
-   verts[3].y = tmp1->y - wy;		\
+   verts[3].x = tmp1->x - wx + xoff;	\
+   verts[3].y = tmp1->y - wy + yoff;	\
 	 				\
    FX_grDrawPolygonVertexList(4, verts); \
   } while (0)
@@ -291,28 +302,20 @@
    fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
    struct vertex_buffer *VB=ctx->VB;
    fxVertex *gWin = FX_DRIVER_DATA(VB)->verts;
-   GLubyte (* const color)[4] = VB->Color[0]->data;
+   GLubyte (* const color)[4] = VB->ColorPtr->data;
    GrVertex *v1 = (GrVertex *)gWin[e1].f; 
    GrVertex *v2 = (GrVertex *)gWin[e2].f;
    GLfloat w = ctx->Line.Width*.5;
 
-   if (IND & FX_FLAT) 
-   {
-      FX_VB_COLOR(fxMesa, color[pv]);
-      if (IND & FX_ANTIALIAS)
-#if FX_USE_PARGB
-      {
-        GLuint v1argb = v1->argb;
-        GLuint v2argb = v2->argb;
-	v1->argb = (color[pv][ACOMP] << 24) | (v1argb & 0x00FFFFFF);
-	v2->argb = (color[pv][ACOMP] << 24) | (v2argb & 0x00FFFFFF);
-      }
-#else
-	v1->a = v2->a = UBYTE_COLOR_TO_FLOAT_255_COLOR(color[pv][3]);
-#endif 
+   if (IND & FX_FLAT) {
+      v1->r = v2->r = UBYTE_COLOR_TO_FLOAT_255_COLOR(color[pv][0]);
+      v1->g = v2->g = UBYTE_COLOR_TO_FLOAT_255_COLOR(color[pv][1]);
+      v1->b = v2->b = UBYTE_COLOR_TO_FLOAT_255_COLOR(color[pv][2]);
+      v1->a = v2->a = UBYTE_COLOR_TO_FLOAT_255_COLOR(color[pv][3]);
    } 
    else if (IND & FX_TWOSIDE) 
    {
+      /* XXX use signed area of the polygon to determine front/back color choice */
       GOURAUD2(v1,color[e1]); 
       GOURAUD2(v2,color[e2]); 
    }
@@ -331,8 +334,7 @@
    else
       DRAW_LINE(v1,v2,w);
 
-   if (IND & FX_FRONT_BACK) 
-   {
+   if (IND & FX_FRONT_BACK) {
       FX_grColorMask(ctx->Color.ColorMask[RCOMP] ||
 		  ctx->Color.ColorMask[GCOMP] ||
 		  ctx->Color.ColorMask[BCOMP],
Index: xc/extras/Mesa/src/FX/fxvs_tmp.h
diff -u xc/extras/Mesa/src/FX/fxvs_tmp.h:1.2 xc/extras/Mesa/src/FX/fxvs_tmp.h:1.3
--- xc/extras/Mesa/src/FX/fxvs_tmp.h:1.2	Mon Feb 14 23:13:10 2000
+++ xc/extras/Mesa/src/FX/fxvs_tmp.h	Fri Jun 16 17:02:34 2000
@@ -142,10 +142,39 @@
 	       DO_SETUP;
 	    }
 	 }
-      } else 
+      }
+      else {
 	 for (;v!=vend;v+=16 INCR) {
 	    DO_SETUP;
 	 }
+      }
+
+      if (ctx->FogMode == FOG_FRAGMENT && ctx->ProjectionMatrix.m[15] != 0.0F) {
+        /* need to compute W values for fogging purposes */
+        const GLfloat m10 = ctx->ProjectionMatrix.m[10];
+        const GLfloat m14 = ctx->ProjectionMatrix.m[14];
+        const GLfloat v10 = ctx->Viewport.WindowMap.m[10];
+        const GLfloat v14 = ctx->Viewport.WindowMap.m[14];
+        GLfloat *v = gWin[start].f;
+        GLfloat *win = VB->Win.data[start]; 
+        if (VB->ClipOrMask) {
+           GLubyte *clipmask = &VB->ClipMask[start];
+           for (;v!=vend;v+=16,clipmask++, win+=4) {
+              if (*clipmask == 0) {
+                GLfloat zNDC = (win[2] - v14) / v10;
+                GLfloat zEye = (zNDC - m14) / m10;
+                v[OOWCOORD] = -1.0F / zEye;
+              }
+           }
+        }
+        else {
+           for (;v!=vend;v+=16, win+=4) {
+             GLfloat zNDC = (win[2] - v14) / v10;
+             GLfloat zEye = (zNDC - m14) / m10;
+             v[OOWCOORD] = -1.0F / zEye;
+           }
+        }
+      }
 
       /* rare - I hope */
       FIXUP;
Index: xc/extras/Mesa/src/FX/fxvsetup.c
diff -u xc/extras/Mesa/src/FX/fxvsetup.c:1.3 xc/extras/Mesa/src/FX/fxvsetup.c:1.5
--- xc/extras/Mesa/src/FX/fxvsetup.c:1.3	Mon Feb 14 23:13:10 2000
+++ xc/extras/Mesa/src/FX/fxvsetup.c	Mon Jun 19 22:08:18 2000
@@ -304,9 +304,10 @@
 
    if ((ctx->Texture.ReallyEnabled & (TEXTURE0_2D|TEXTURE0_3D)) == TEXTURE0_2D) 
    {
+      /* This doesn't work for non-RGBA textures
       if (ctx->Texture.Unit[0].EnvMode == GL_REPLACE) 
 	 setupindex &= ~SETUP_RGBA;
-
+      */
       setupindex |= SETUP_TMU0|SETUP_W;
    }
 
@@ -341,16 +342,19 @@
    GLcontext *ctx = VB->ctx;
    FX_DRIVER_DATA(VB)->last_vert = FX_DRIVER_DATA(VB)->verts + VB->Count;
 
+#if 0 /* leaving this out fixes the Heretic2 stray polygon bug */
    if ((ctx->IndirectTriangles & DD_SW_RASTERIZE) == DD_SW_RASTERIZE) {
       fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
       fxMesa->setupdone = 0;
       return;
    }
-      
+#endif
+
    if (VB->Type == VB_CVA_PRECALC) 
       fxDDPartialRasterSetup( VB );
-   else 
+   else if (ctx->Driver.RasterSetup) /* NULL if in feedback/selection mode */
       ctx->Driver.RasterSetup( VB, VB->CopyStart, VB->Count );
+
 }
 
 
Index: xc/extras/Mesa/src/OSmesa/osmesa.c
diff -u /dev/null xc/extras/Mesa/src/OSmesa/osmesa.c:1.1
--- /dev/null	Sat Jul  1 20:46:14 2000
+++ xc/extras/Mesa/src/OSmesa/osmesa.c	Fri Jun 16 17:02:38 2000
@@ -0,0 +1,1637 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Off-Screen Mesa rendering / Rendering into client memory space
+ *
+ * Note on thread safety:  this driver is thread safe.  All
+ * functions are reentrant.  The notion of current context is
+ * managed by the core gl_make_current() and gl_get_current_context()
+ * functions.  Those functions are thread-safe.
+ */
+
+
+#ifdef PC_HEADER
+#include "all.h"
+#else
+#include "glheader.h"
+#include "GL/osmesa.h"
+#include "context.h"
+#include "depth.h"
+#include "mem.h"
+#include "matrix.h"
+#include "types.h"
+#include "vb.h"
+#include "extensions.h"
+#endif
+
+
+/*
+ * This is the OS/Mesa context struct.
+ * Notice how it includes a GLcontext.  By doing this we're mimicking
+ * C++ inheritance/derivation.
+ * Later, we can cast a GLcontext pointer into an OSMesaContext pointer
+ * or vice versa.
+ */
+struct osmesa_context {
+   GLcontext gl_ctx;		/* The core GL/Mesa context */
+   GLvisual *gl_visual;		/* Describes the buffers */
+   GLframebuffer *gl_buffer;	/* Depth, stencil, accum, etc buffers */
+   GLenum format;		/* either GL_RGBA or GL_COLOR_INDEX */
+   void *buffer;		/* the image buffer */
+   GLint width, height;		/* size of image buffer */
+   GLuint pixel;		/* current color index or RGBA pixel value */
+   GLuint clearpixel;		/* pixel for clearing the color buffer */
+   GLint rowlength;		/* number of pixels per row */
+   GLint userRowLength;		/* user-specified number of pixels per row */
+   GLint rshift, gshift;	/* bit shifts for RGBA formats */
+   GLint bshift, ashift;
+   GLint rind, gind, bind;	/* index offsets for RGBA formats */
+   void *rowaddr[MAX_HEIGHT];	/* address of first pixel in each image row */
+   GLboolean yup;		/* TRUE  -> Y increases upward */
+				/* FALSE -> Y increases downward */
+};
+
+
+
+/* A forward declaration: */
+static void osmesa_update_state( GLcontext *ctx );
+
+
+
+/**********************************************************************/
+/*****                    Public Functions                        *****/
+/**********************************************************************/
+
+
+/*
+ * Create an Off-Screen Mesa rendering context.  The only attribute needed is
+ * an RGBA vs Color-Index mode flag.
+ *
+ * Input:  format - either GL_RGBA or GL_COLOR_INDEX
+ *         sharelist - specifies another OSMesaContext with which to share
+ *                     display lists.  NULL indicates no sharing.
+ * Return:  an OSMesaContext or 0 if error
+ */
+OSMesaContext GLAPIENTRY
+OSMesaCreateContext( GLenum format, OSMesaContext sharelist )
+{
+   OSMesaContext osmesa;
+   GLint rshift, gshift, bshift, ashift;
+   GLint rind, gind, bind;
+   GLint indexBits, alphaBits;
+   GLboolean rgbmode;
+   GLboolean swalpha;
+   GLuint i4 = 1;
+   GLubyte *i1 = (GLubyte *) &i4;
+   GLint little_endian = *i1;
+
+   swalpha = GL_FALSE;
+   rind = gind = bind = 0;
+   if (format==OSMESA_COLOR_INDEX) {
+      indexBits = 8;
+      rshift = gshift = bshift = ashift = 0;
+      rgbmode = GL_FALSE;
+   }
+   else if (format==OSMESA_RGBA) {
+      indexBits = 0;
+      alphaBits = 8;
+      if (little_endian) {
+         rshift = 0;
+         gshift = 8;
+         bshift = 16;
+         ashift = 24;
+      }
+      else {
+         rshift = 24;
+         gshift = 16;
+         bshift = 8;
+         ashift = 0;
+      }
+      rgbmode = GL_TRUE;
+   }
+   else if (format==OSMESA_BGRA) {
+      indexBits = 0;
+      alphaBits = 8;
+      if (little_endian) {
+         ashift = 0;
+         rshift = 8;
+         gshift = 16;
+         bshift = 24;
+      }
+      else {
+         bshift = 24;
+         gshift = 16;
+         rshift = 8;
+         ashift = 0;
+      }
+      rgbmode = GL_TRUE;
+   }
+   else if (format==OSMESA_ARGB) {
+      indexBits = 0;
+      alphaBits = 8;
+      if (little_endian) {
+         bshift = 0;
+         gshift = 8;
+         rshift = 16;
+         ashift = 24;
+      }
+      else {
+         ashift = 24;
+         rshift = 16;
+         gshift = 8;
+         bshift = 0;
+      }
+      rgbmode = GL_TRUE;
+   }
+   else if (format==OSMESA_RGB) {
+      indexBits = 0;
+      alphaBits = 0;
+      bshift = 0;
+      gshift = 8;
+      rshift = 16;
+      ashift = 24;
+      bind = 2;
+      gind = 1;
+      rind = 0;
+      rgbmode = GL_TRUE;
+      swalpha = GL_TRUE;
+   }
+   else if (format==OSMESA_BGR) {
+      indexBits = 0;
+      alphaBits = 0;
+      bshift = 0;
+      gshift = 8;
+      rshift = 16;
+      ashift = 24;
+      bind = 0;
+      gind = 1;
+      rind = 2;
+      rgbmode = GL_TRUE;
+      swalpha = GL_TRUE;
+   }
+   else {
+      return NULL;
+   }
+
+
+   osmesa = (OSMesaContext) CALLOC_STRUCT(osmesa_context);
+   if (osmesa) {
+      osmesa->gl_visual = gl_create_visual( rgbmode,
+                                            swalpha,    /* software alpha */
+                                            GL_FALSE,	/* double buffer */
+                                            GL_FALSE,	/* stereo */
+                                            DEFAULT_SOFTWARE_DEPTH_BITS,
+                                            STENCIL_BITS,
+                                            rgbmode ? ACCUM_BITS : 0,
+                                            indexBits,
+                                            8, 8, 8, alphaBits );
+      if (!osmesa->gl_visual) {
+         FREE(osmesa);
+         return NULL;
+      }
+
+      if (!_mesa_initialize_context(&osmesa->gl_ctx,
+                                    osmesa->gl_visual,
+                                    sharelist ? &sharelist->gl_ctx
+                                              : (GLcontext *) NULL,
+                                    (void *) osmesa, GL_TRUE )) {
+         _mesa_destroy_visual( osmesa->gl_visual );
+         FREE(osmesa);
+         return NULL;
+      }
+      gl_extensions_enable(&(osmesa->gl_ctx),"GL_HP_occlusion_test");
+      gl_extensions_enable(&(osmesa->gl_ctx), "GL_ARB_texture_cube_map");
+
+      osmesa->gl_buffer = gl_create_framebuffer( osmesa->gl_visual,
+                                           osmesa->gl_visual->DepthBits > 0,
+                                           osmesa->gl_visual->StencilBits > 0,
+                                           osmesa->gl_visual->AccumRedBits > 0,
+                                           osmesa->gl_visual->AlphaBits > 0 );
+
+      if (!osmesa->gl_buffer) {
+         gl_destroy_visual( osmesa->gl_visual );
+         gl_free_context_data( &osmesa->gl_ctx );
+         FREE(osmesa);
+         return NULL;
+      }
+      osmesa->format = format;
+      osmesa->buffer = NULL;
+      osmesa->width = 0;
+      osmesa->height = 0;
+      osmesa->pixel = 0;
+      osmesa->clearpixel = 0;
+      osmesa->userRowLength = 0;
+      osmesa->rowlength = 0;
+      osmesa->yup = GL_TRUE;
+      osmesa->rshift = rshift;
+      osmesa->gshift = gshift;
+      osmesa->bshift = bshift;
+      osmesa->ashift = ashift;
+      osmesa->rind = rind;
+      osmesa->gind = gind;
+      osmesa->bind = bind;
+   }
+   return osmesa;
+}
+
+
+
+/*
+ * Destroy an Off-Screen Mesa rendering context.
+ *
+ * Input:  ctx - the context to destroy
+ */
+void GLAPIENTRY OSMesaDestroyContext( OSMesaContext ctx )
+{
+   if (ctx) {
+      gl_destroy_visual( ctx->gl_visual );
+      gl_destroy_framebuffer( ctx->gl_buffer );
+      gl_free_context_data( &ctx->gl_ctx );
+      FREE( ctx );
+   }
+}
+
+
+
+/*
+ * Recompute the values of the context's rowaddr array.
+ */
+static void compute_row_addresses( OSMesaContext ctx )
+{
+   GLint i;
+
+   if (ctx->yup) {
+      /* Y=0 is bottom line of window */
+      if (ctx->format==OSMESA_COLOR_INDEX) {
+         /* 1-byte CI mode */
+         GLubyte *origin = (GLubyte *) ctx->buffer;
+         for (i=0;i<MAX_HEIGHT;i++) {
+            ctx->rowaddr[i] = origin + i * ctx->rowlength;
+         }
+      }
+      else {
+         if ((ctx->format==OSMESA_RGB) || (ctx->format==OSMESA_BGR)) {
+            /* 3-byte RGB mode */
+            GLubyte *origin = (GLubyte *) ctx->buffer;
+            for (i=0;i<MAX_HEIGHT;i++) {
+               ctx->rowaddr[i] = origin + (i * (ctx->rowlength*3));
+            }
+         } else {
+            /* 4-byte RGBA mode */
+            GLuint *origin = (GLuint *) ctx->buffer;
+            for (i=0;i<MAX_HEIGHT;i++) {
+               ctx->rowaddr[i] = origin + i * ctx->rowlength;
+            }
+         }
+      }
+   }
+   else {
+      /* Y=0 is top line of window */
+      if (ctx->format==OSMESA_COLOR_INDEX) {
+         /* 1-byte CI mode */
+         GLubyte *origin = (GLubyte *) ctx->buffer;
+         for (i=0;i<MAX_HEIGHT;i++) {
+            ctx->rowaddr[i] = origin + (ctx->height-i-1) * ctx->rowlength;
+         }
+      }
+      else {
+         if ((ctx->format==OSMESA_RGB) || (ctx->format==OSMESA_BGR)) {
+            /* 3-byte RGB mode */
+            GLubyte *origin = (GLubyte *) ctx->buffer;
+            for (i=0;i<MAX_HEIGHT;i++) {
+               ctx->rowaddr[i] = origin + ((ctx->height-i-1) * (ctx->rowlength*3));
+            }
+         } else {
+            /* 4-byte RGBA mode */
+            GLuint *origin = (GLuint *) ctx->buffer;
+            for (i=0;i<MAX_HEIGHT;i++) {
+               ctx->rowaddr[i] = origin + (ctx->height-i-1) * ctx->rowlength;
+            }
+         }
+      }
+   }
+}
+
+
+/*
+ * Bind an OSMesaContext to an image buffer.  The image buffer is just a
+ * block of memory which the client provides.  Its size must be at least
+ * as large as width*height*sizeof(type).  Its address should be a multiple
+ * of 4 if using RGBA mode.
+ *
+ * Image data is stored in the order of glDrawPixels:  row-major order
+ * with the lower-left image pixel stored in the first array position
+ * (ie. bottom-to-top).
+ *
+ * Since the only type initially supported is GL_UNSIGNED_BYTE, if the
+ * context is in RGBA mode, each pixel will be stored as a 4-byte RGBA
+ * value.  If the context is in color indexed mode, each pixel will be
+ * stored as a 1-byte value.
+ *
+ * If the context's viewport hasn't been initialized yet, it will now be
+ * initialized to (0,0,width,height).
+ *
+ * Input:  ctx - the rendering context
+ *         buffer - the image buffer memory
+ *         type - data type for pixel components, only GL_UNSIGNED_BYTE
+ *                supported now
+ *         width, height - size of image buffer in pixels, at least 1
+ * Return:  GL_TRUE if success, GL_FALSE if error because of invalid ctx,
+ *          invalid buffer address, type!=GL_UNSIGNED_BYTE, width<1, height<1,
+ *          width>internal limit or height>internal limit.
+ */
+GLboolean GLAPIENTRY
+OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type,
+                   GLsizei width, GLsizei height )
+{
+   if (!ctx || !buffer || type!=GL_UNSIGNED_BYTE
+       || width<1 || height<1 || width>MAX_WIDTH || height>MAX_HEIGHT) {
+      return GL_FALSE;
+   }
+
+   osmesa_update_state( &ctx->gl_ctx );
+   gl_make_current( &ctx->gl_ctx, ctx->gl_buffer );
+
+   ctx->buffer = buffer;
+   ctx->width = width;
+   ctx->height = height;
+   if (ctx->userRowLength)
+      ctx->rowlength = ctx->userRowLength;
+   else
+      ctx->rowlength = width;
+
+   compute_row_addresses( ctx );
+
+   /* init viewport */
+   if (ctx->gl_ctx.Viewport.Width==0) {
+      /* initialize viewport and scissor box to buffer size */
+      _mesa_Viewport( 0, 0, width, height );
+      ctx->gl_ctx.Scissor.Width = width;
+      ctx->gl_ctx.Scissor.Height = height;
+   }
+
+   return GL_TRUE;
+}
+
+
+
+OSMesaContext GLAPIENTRY OSMesaGetCurrentContext( void )
+{
+   GLcontext *ctx = gl_get_current_context();
+   if (ctx)
+      return (OSMesaContext) ctx;
+   else
+      return NULL;
+}
+
+
+
+void GLAPIENTRY OSMesaPixelStore( GLint pname, GLint value )
+{
+   OSMesaContext ctx = OSMesaGetCurrentContext();
+
+   switch (pname) {
+      case OSMESA_ROW_LENGTH:
+         if (value<0) {
+            gl_error( &ctx->gl_ctx, GL_INVALID_VALUE,
+                      "OSMesaPixelStore(value)" );
+            return;
+         }
+         ctx->userRowLength = value;
+         ctx->rowlength = value;
+         break;
+      case OSMESA_Y_UP:
+         ctx->yup = value ? GL_TRUE : GL_FALSE;
+         break;
+      default:
+         gl_error( &ctx->gl_ctx, GL_INVALID_ENUM, "OSMesaPixelStore(pname)" );
+         return;
+   }
+
+   compute_row_addresses( ctx );
+}
+
+
+void GLAPIENTRY OSMesaGetIntegerv( GLint pname, GLint *value )
+{
+   OSMesaContext ctx = OSMesaGetCurrentContext();
+
+   switch (pname) {
+      case OSMESA_WIDTH:
+         *value = ctx->width;
+         return;
+      case OSMESA_HEIGHT:
+         *value = ctx->height;
+         return;
+      case OSMESA_FORMAT:
+         *value = ctx->format;
+         return;
+      case OSMESA_TYPE:
+         *value = GL_UNSIGNED_BYTE;
+         return;
+      case OSMESA_ROW_LENGTH:
+         *value = ctx->rowlength;
+         return;
+      case OSMESA_Y_UP:
+         *value = ctx->yup;
+         return;
+      default:
+         gl_error(&ctx->gl_ctx, GL_INVALID_ENUM, "OSMesaGetIntergerv(pname)");
+         return;
+   }
+}
+
+/*
+ * Return the depth buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          bytesPerValue - bytes per depth value (2 or 4)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ */
+GLboolean GLAPIENTRY
+OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint *height,
+                      GLint *bytesPerValue, void **buffer )
+{
+   if ((!c->gl_buffer) || (!c->gl_buffer->DepthBuffer)) {
+      *width = 0;
+      *height = 0;
+      *bytesPerValue = 0;
+      *buffer = 0;
+      return GL_FALSE;
+   }
+   else {
+      *width = c->gl_buffer->Width;
+      *height = c->gl_buffer->Height;
+      *bytesPerValue = sizeof(GLdepth);
+      *buffer = c->gl_buffer->DepthBuffer;
+      return GL_TRUE;
+   }
+}
+
+/*
+ * Return the color buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          format - the pixel format (OSMESA_FORMAT)
+ *          buffer - pointer to color buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ */
+GLboolean GLAPIENTRY
+OSMesaGetColorBuffer( OSMesaContext c, GLint *width,
+                      GLint *height, GLint *format, void **buffer )
+{
+   if (!c->buffer) {
+      *width = 0;
+      *height = 0;
+      *format = 0;
+      *buffer = 0;
+      return GL_FALSE;
+   }
+   else {
+      *width = c->width;
+      *height = c->height;
+      *format = c->format;
+      *buffer = c->buffer;
+      return GL_TRUE;
+   }
+}
+
+/**********************************************************************/
+/*** Device Driver Functions                                        ***/
+/**********************************************************************/
+
+
+/*
+ * Useful macros:
+ */
+#define PACK_RGBA(R,G,B,A)  (  ((R) << osmesa->rshift) \
+                             | ((G) << osmesa->gshift) \
+                             | ((B) << osmesa->bshift) \
+                             | ((A) << osmesa->ashift) )
+
+#define PACK_RGBA2(R,G,B,A)  (  ((R) << rshift) \
+                              | ((G) << gshift) \
+                              | ((B) << bshift) \
+                              | ((A) << ashift) )
+
+#define UNPACK_RED(P)      (((P) >> osmesa->rshift) & 0xff)
+#define UNPACK_GREEN(P)    (((P) >> osmesa->gshift) & 0xff)
+#define UNPACK_BLUE(P)     (((P) >> osmesa->bshift) & 0xff)
+#define UNPACK_ALPHA(P)    (((P) >> osmesa->ashift) & 0xff)
+
+#define PIXELADDR1(X,Y)  ((GLubyte *) osmesa->rowaddr[Y] + (X))
+#define PIXELADDR3(X,Y)  ((GLubyte *) osmesa->rowaddr[Y] + ((X)*3))
+#define PIXELADDR4(X,Y)  ((GLuint *)  osmesa->rowaddr[Y] + (X))
+
+
+
+
+static GLboolean set_draw_buffer( GLcontext *ctx, GLenum mode )
+{
+   (void) ctx;
+   if (mode==GL_FRONT_LEFT) {
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
+   }
+}
+
+
+static void set_read_buffer( GLcontext *ctx, GLframebuffer *buffer, GLenum mode )
+{
+   /* separate read buffer not supported */
+   ASSERT(buffer == ctx->DrawBuffer);
+   ASSERT(mode == GL_FRONT_LEFT);
+}
+
+
+static void clear_index( GLcontext *ctx, GLuint index )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   osmesa->clearpixel = index;
+}
+
+
+
+static void clear_color( GLcontext *ctx,
+                         GLubyte r, GLubyte g, GLubyte b, GLubyte a )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   osmesa->clearpixel = PACK_RGBA( r, g, b, a );
+}
+
+
+
+static GLbitfield clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
+                         GLint x, GLint y, GLint width, GLint height )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   const GLuint *colorMask = (GLuint *) &ctx->Color.ColorMask;
+
+   /* we can't handle color or index masking */
+   if (*colorMask != 0xffffffff || ctx->Color.IndexMask != 0xffffffff)
+      return mask;
+
+   /* sanity check - we only have a front-left buffer */
+   ASSERT((mask & (DD_FRONT_RIGHT_BIT | DD_BACK_LEFT_BIT | DD_BACK_RIGHT_BIT)) == 0);
+
+   if (mask & DD_FRONT_LEFT_BIT) {
+      if (osmesa->format==OSMESA_COLOR_INDEX) {
+         if (all) {
+            /* Clear whole CI buffer */
+            MEMSET(osmesa->buffer, osmesa->clearpixel,
+                   osmesa->rowlength * osmesa->height);
+         }
+         else {
+            /* Clear part of CI buffer */
+            GLint i, j;
+            for (i=0;i<height;i++) {
+               GLubyte *ptr1 = PIXELADDR1( x, (y+i) );
+               for (j=0;j<width;j++) {
+                  *ptr1++ = osmesa->clearpixel;
+               }
+            }
+         }
+      }
+      else if ((osmesa->format==OSMESA_RGB)||(osmesa->format==OSMESA_BGR)) {
+         GLubyte rval = UNPACK_RED(osmesa->clearpixel);
+         GLubyte gval = UNPACK_GREEN(osmesa->clearpixel);
+         GLubyte bval = UNPACK_BLUE(osmesa->clearpixel);
+         GLint   rind = osmesa->rind;
+         GLint   gind = osmesa->gind;
+         GLint   bind = osmesa->bind;
+         if (all) {
+            GLuint  i, n;
+            GLubyte *ptr3 = (GLubyte *) osmesa->buffer;
+            /* Clear whole RGB buffer */
+            n = osmesa->rowlength * osmesa->height;
+            for (i=0;i<n;i++) {
+               ptr3[rind] = rval;
+               ptr3[gind] = gval;
+               ptr3[bind] = bval;
+               ptr3 += 3;
+            }
+         }
+         else {
+            /* Clear part of RGB buffer */
+            GLint i, j;
+            for (i=0;i<height;i++) {
+               GLubyte *ptr3 = PIXELADDR3( x, (y+i) );
+               for (j=0;j<width;j++) {
+                  ptr3[rind] = rval;
+                  ptr3[gind] = gval;
+                  ptr3[bind] = bval;
+                  ptr3 += 3;
+               }
+            }
+         }
+      }
+      else {
+         if (all) {
+            /* Clear whole RGBA buffer */
+            GLuint i, n, *ptr4;
+            n = osmesa->rowlength * osmesa->height;
+            ptr4 = (GLuint *) osmesa->buffer;
+            if (osmesa->clearpixel) {
+               for (i=0;i<n;i++) {
+                  *ptr4++ = osmesa->clearpixel;
+               }
+            }
+            else {
+               BZERO(ptr4, n * sizeof(GLuint));
+            }
+         }
+         else {
+            /* Clear part of RGBA buffer */
+            GLint i, j;
+            for (i=0;i<height;i++) {
+               GLuint *ptr4 = PIXELADDR4( x, (y+i) );
+               for (j=0;j<width;j++) {
+                  *ptr4++ = osmesa->clearpixel;
+               }
+            }
+         }
+      }
+   }
+   /* have Mesa clear all other buffers */
+   return mask & (~DD_FRONT_LEFT_BIT);
+}
+
+
+
+static void set_index( GLcontext *ctx, GLuint index )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   osmesa->pixel = index;
+}
+
+
+
+static void set_color( GLcontext *ctx,
+                       GLubyte r, GLubyte g, GLubyte b, GLubyte a )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   osmesa->pixel = PACK_RGBA( r, g, b, a );
+}
+
+
+
+static void buffer_size( GLcontext *ctx, GLuint *width, GLuint *height )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   *width = osmesa->width;
+   *height = osmesa->height;
+}
+
+
+/**********************************************************************/
+/*****        Read/write spans/arrays of RGBA pixels              *****/
+/**********************************************************************/
+
+/* Write RGBA pixels to an RGBA (or permuted) buffer. */
+static void write_rgba_span( const GLcontext *ctx,
+                             GLuint n, GLint x, GLint y,
+                             CONST GLubyte rgba[][4], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint *ptr4 = PIXELADDR4( x, y );
+   GLuint i;
+   GLint rshift = osmesa->rshift;
+   GLint gshift = osmesa->gshift;
+   GLint bshift = osmesa->bshift;
+   GLint ashift = osmesa->ashift;
+   if (mask) {
+      for (i=0;i<n;i++,ptr4++) {
+         if (mask[i]) {
+            *ptr4 = PACK_RGBA2( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP] );
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,ptr4++) {
+         *ptr4 = PACK_RGBA2( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP] );
+      }
+   }
+}
+
+
+/* Write RGBA pixels to an RGBA buffer.  This is the fastest span-writer. */
+static void write_rgba_span_rgba( const GLcontext *ctx,
+                                  GLuint n, GLint x, GLint y,
+                                  CONST GLubyte rgba[][4],
+                                  const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint *ptr4 = PIXELADDR4( x, y );
+   const GLuint *rgba4 = (const GLuint *) rgba;
+   GLuint i;
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr4[i] = rgba4[i];
+         }
+      }
+   }
+   else {
+      MEMCPY( ptr4, rgba4, n * 4 );
+   }
+}
+
+
+/* Write RGB pixels to an RGBA (or permuted) buffer. */
+static void write_rgb_span( const GLcontext *ctx,
+                            GLuint n, GLint x, GLint y,
+                            CONST GLubyte rgb[][3], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint *ptr4 = PIXELADDR4( x, y );
+   GLuint i;
+   GLint rshift = osmesa->rshift;
+   GLint gshift = osmesa->gshift;
+   GLint bshift = osmesa->bshift;
+   GLint ashift = osmesa->ashift;
+   if (mask) {
+      for (i=0;i<n;i++,ptr4++) {
+         if (mask[i]) {
+            *ptr4 = PACK_RGBA2( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP], 255 );
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,ptr4++) {
+         *ptr4 = PACK_RGBA2( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP], 255);
+      }
+   }
+}
+
+
+
+static void write_monocolor_span( const GLcontext *ctx,
+                                  GLuint n, GLint x, GLint y,
+				  const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint *ptr4 = PIXELADDR4(x,y);
+   GLuint i;
+   for (i=0;i<n;i++,ptr4++) {
+      if (mask[i]) {
+         *ptr4 = osmesa->pixel;
+      }
+   }
+}
+
+
+
+static void write_rgba_pixels( const GLcontext *ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+                               CONST GLubyte rgba[][4], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   GLint rshift = osmesa->rshift;
+   GLint gshift = osmesa->gshift;
+   GLint bshift = osmesa->bshift;
+   GLint ashift = osmesa->ashift;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLuint *ptr4 = PIXELADDR4(x[i],y[i]);
+         *ptr4 = PACK_RGBA2( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP] );
+      }
+   }
+}
+
+
+
+static void write_monocolor_pixels( const GLcontext *ctx,
+                                    GLuint n, const GLint x[], const GLint y[],
+				    const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLuint *ptr4 = PIXELADDR4(x[i],y[i]);
+         *ptr4 = osmesa->pixel;
+      }
+   }
+}
+
+
+static void read_rgba_span( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                             GLubyte rgba[][4] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   GLuint *ptr4 = PIXELADDR4(x,y);
+   for (i=0;i<n;i++) {
+      GLuint pixel = *ptr4++;
+      rgba[i][RCOMP] = UNPACK_RED(pixel);
+      rgba[i][GCOMP] = UNPACK_GREEN(pixel);
+      rgba[i][BCOMP] = UNPACK_BLUE(pixel);
+      rgba[i][ACOMP] = UNPACK_ALPHA(pixel);
+   }
+}
+
+
+/* Read RGBA pixels from an RGBA buffer */
+static void read_rgba_span_rgba( const GLcontext *ctx,
+                                 GLuint n, GLint x, GLint y,
+                                 GLubyte rgba[][4] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint *ptr4 = PIXELADDR4(x,y);
+   MEMCPY( rgba, ptr4, n * 4 * sizeof(GLubyte) );
+}
+
+
+static void read_rgba_pixels( const GLcontext *ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+			       GLubyte rgba[][4], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLuint *ptr4 = PIXELADDR4(x[i],y[i]);
+         GLuint pixel = *ptr4;
+         rgba[i][RCOMP] = UNPACK_RED(pixel);
+         rgba[i][GCOMP] = UNPACK_GREEN(pixel);
+         rgba[i][BCOMP] = UNPACK_BLUE(pixel);
+         rgba[i][ACOMP] = UNPACK_ALPHA(pixel);
+      }
+   }
+}
+
+/**********************************************************************/
+/*****                3 byte RGB pixel support funcs              *****/
+/**********************************************************************/
+
+/* Write RGBA pixels to an RGB or BGR buffer. */
+static void write_rgba_span3( const GLcontext *ctx,
+                              GLuint n, GLint x, GLint y,
+                              CONST GLubyte rgba[][4], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLubyte *ptr3 = PIXELADDR3( x, y);
+   GLuint i;
+   GLint rind = osmesa->rind;
+   GLint gind = osmesa->gind;
+   GLint bind = osmesa->bind;
+   if (mask) {
+      for (i=0;i<n;i++,ptr3+=3) {
+         if (mask[i]) {
+            ptr3[rind] = rgba[i][RCOMP];
+            ptr3[gind] = rgba[i][GCOMP];
+            ptr3[bind] = rgba[i][BCOMP];
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,ptr3+=3) {
+         ptr3[rind] = rgba[i][RCOMP];
+         ptr3[gind] = rgba[i][GCOMP];
+         ptr3[bind] = rgba[i][BCOMP];
+      }
+   }
+}
+
+/* Write RGB pixels to an RGB or BGR buffer. */
+static void write_rgb_span3( const GLcontext *ctx,
+                             GLuint n, GLint x, GLint y,
+                             CONST GLubyte rgb[][3], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLubyte *ptr3 = PIXELADDR3( x, y);
+   GLuint i;
+   GLint rind = osmesa->rind;
+   GLint gind = osmesa->gind;
+   GLint bind = osmesa->bind;
+   if (mask) {
+      for (i=0;i<n;i++,ptr3+=3) {
+         if (mask[i]) {
+            ptr3[rind] = rgb[i][RCOMP];
+            ptr3[gind] = rgb[i][GCOMP];
+            ptr3[bind] = rgb[i][BCOMP];
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,ptr3+=3) {
+         ptr3[rind] = rgb[i][RCOMP];
+         ptr3[gind] = rgb[i][GCOMP];
+         ptr3[bind] = rgb[i][BCOMP];
+      }
+   }
+}
+
+
+static void write_monocolor_span3( const GLcontext *ctx,
+                                  GLuint n, GLint x, GLint y,
+				  const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+
+   GLubyte rval = UNPACK_RED(osmesa->pixel);
+   GLubyte gval = UNPACK_GREEN(osmesa->pixel);
+   GLubyte bval = UNPACK_BLUE(osmesa->pixel);
+   GLint   rind = osmesa->rind;
+   GLint   gind = osmesa->gind;
+   GLint   bind = osmesa->bind;
+   GLubyte *ptr3 = PIXELADDR3( x, y);
+   GLuint i;
+   for (i=0;i<n;i++,ptr3+=3) {
+      if (mask[i]) {
+         ptr3[rind] = rval;
+         ptr3[gind] = gval;
+         ptr3[bind] = bval;
+      }
+   }
+}
+
+static void write_rgba_pixels3( const GLcontext *ctx,
+                                GLuint n, const GLint x[], const GLint y[],
+                                CONST GLubyte rgba[][4], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   GLint rind = osmesa->rind;
+   GLint gind = osmesa->gind;
+   GLint bind = osmesa->bind;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLubyte *ptr3 = PIXELADDR3(x[i],y[i]);
+         ptr3[rind] = rgba[i][RCOMP];
+         ptr3[gind] = rgba[i][GCOMP];
+         ptr3[bind] = rgba[i][BCOMP];
+      }
+   }
+}
+
+static void write_monocolor_pixels3( const GLcontext *ctx,
+                                    GLuint n, const GLint x[], const GLint y[],
+				    const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   GLint rind = osmesa->rind;
+   GLint gind = osmesa->gind;
+   GLint bind = osmesa->bind;
+   GLubyte rval = UNPACK_RED(osmesa->pixel);
+   GLubyte gval = UNPACK_GREEN(osmesa->pixel);
+   GLubyte bval = UNPACK_BLUE(osmesa->pixel);
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLubyte *ptr3 = PIXELADDR3(x[i],y[i]);
+         ptr3[rind] = rval;
+         ptr3[gind] = gval;
+         ptr3[bind] = bval;
+      }
+   }
+}
+
+static void read_rgba_span3( const GLcontext *ctx,
+                             GLuint n, GLint x, GLint y,
+                             GLubyte rgba[][4] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   GLint rind = osmesa->rind;
+   GLint gind = osmesa->gind;
+   GLint bind = osmesa->bind;
+   const GLubyte *ptr3 = PIXELADDR3( x, y);
+   for (i=0;i<n;i++,ptr3+=3) {
+      rgba[i][RCOMP] = ptr3[rind];
+      rgba[i][GCOMP] = ptr3[gind];
+      rgba[i][BCOMP] = ptr3[bind];
+      rgba[i][ACOMP] = 0;
+   }
+}
+
+static void read_rgba_pixels3( const GLcontext *ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+			       GLubyte rgba[][4], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   GLint rind = osmesa->rind;
+   GLint gind = osmesa->gind;
+   GLint bind = osmesa->bind;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         const GLubyte *ptr3 = PIXELADDR3(x[i],y[i]);
+         rgba[i][RCOMP] = ptr3[rind];
+         rgba[i][GCOMP] = ptr3[gind];
+         rgba[i][BCOMP] = ptr3[bind];
+         rgba[i][ACOMP] = 0;
+      }
+   }
+}
+
+
+/**********************************************************************/
+/*****        Read/write spans/arrays of CI pixels                *****/
+/**********************************************************************/
+
+/* Write 32-bit color index to buffer */
+static void write_index32_span( const GLcontext *ctx,
+                                GLuint n, GLint x, GLint y,
+                                const GLuint index[], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLubyte *ptr1 = PIXELADDR1(x,y);
+   GLuint i;
+   if (mask) {
+      for (i=0;i<n;i++,ptr1++) {
+         if (mask[i]) {
+            *ptr1 = (GLubyte) index[i];
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,ptr1++) {
+         *ptr1 = (GLubyte) index[i];
+      }
+   }
+}
+
+
+/* Write 8-bit color index to buffer */
+static void write_index8_span( const GLcontext *ctx,
+                               GLuint n, GLint x, GLint y,
+                               const GLubyte index[], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLubyte *ptr1 = PIXELADDR1(x,y);
+   GLuint i;
+   if (mask) {
+      for (i=0;i<n;i++,ptr1++) {
+         if (mask[i]) {
+            *ptr1 = (GLubyte) index[i];
+         }
+      }
+   }
+   else {
+      MEMCPY( ptr1, index, n );
+   }
+}
+
+
+static void write_monoindex_span( const GLcontext *ctx,
+                                  GLuint n, GLint x, GLint y,
+				  const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLubyte *ptr1 = PIXELADDR1(x,y);
+   GLuint i;
+   for (i=0;i<n;i++,ptr1++) {
+      if (mask[i]) {
+         *ptr1 = (GLubyte) osmesa->pixel;
+      }
+   }
+}
+
+
+static void write_index_pixels( const GLcontext *ctx,
+                                GLuint n, const GLint x[], const GLint y[],
+			        const GLuint index[], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLubyte *ptr1 = PIXELADDR1(x[i],y[i]);
+         *ptr1 = (GLubyte) index[i];
+      }
+   }
+}
+
+
+static void write_monoindex_pixels( const GLcontext *ctx,
+                                    GLuint n, const GLint x[], const GLint y[],
+				    const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLubyte *ptr1 = PIXELADDR1(x[i],y[i]);
+         *ptr1 = (GLubyte) osmesa->pixel;
+      }
+   }
+}
+
+
+static void read_index_span( const GLcontext *ctx,
+                             GLuint n, GLint x, GLint y, GLuint index[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   const GLubyte *ptr1 = PIXELADDR1(x,y);
+   for (i=0;i<n;i++,ptr1++) {
+      index[i] = (GLuint) *ptr1;
+   }
+}
+
+
+static void read_index_pixels( const GLcontext *ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+			       GLuint index[], const GLubyte mask[] )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i] ) {
+         const GLubyte *ptr1 = PIXELADDR1(x[i],y[i]);
+         index[i] = (GLuint) *ptr1;
+      }
+   }
+}
+
+
+
+/**********************************************************************/
+/*****                   Optimized line rendering                 *****/
+/**********************************************************************/
+
+
+/*
+ * Draw a flat-shaded, RGB line into an osmesa buffer.
+ */
+static void flat_rgba_line( GLcontext *ctx,
+                            GLuint vert0, GLuint vert1, GLuint pvert )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLubyte *color = ctx->VB->ColorPtr->data[pvert];
+   unsigned long pixel = PACK_RGBA( color[0], color[1], color[2], color[3] );
+
+#define INTERP_XY 1
+#define CLIP_HACK 1
+#define PLOT(X,Y) { GLuint *ptr4 = PIXELADDR4(X,Y); *ptr4 = pixel; }
+
+#ifdef WIN32
+#include "..\linetemp.h"
+#else
+#include "linetemp.h"
+#endif
+}
+
+
+/*
+ * Draw a flat-shaded, Z-less, RGB line into an osmesa buffer.
+ */
+static void flat_rgba_z_line( GLcontext *ctx,
+                              GLuint vert0, GLuint vert1, GLuint pvert )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLubyte *color = ctx->VB->ColorPtr->data[pvert];
+   unsigned long pixel = PACK_RGBA( color[0], color[1], color[2], color[3] );
+
+#define INTERP_XY 1
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define CLIP_HACK 1
+#define PLOT(X,Y)				\
+	if (Z < *zPtr) {			\
+	   GLuint *ptr4 = PIXELADDR4(X,Y);	\
+	   *ptr4 = pixel;			\
+	   *zPtr = Z;				\
+	}
+
+#ifdef WIN32
+#include "..\linetemp.h"
+#else
+#include "linetemp.h"
+#endif
+}
+
+
+/*
+ * Draw a flat-shaded, alpha-blended, RGB line into an osmesa buffer.
+ */
+static void flat_blend_rgba_line( GLcontext *ctx,
+                                  GLuint vert0, GLuint vert1, GLuint pvert )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   struct vertex_buffer *VB = ctx->VB;
+   GLint rshift = osmesa->rshift;
+   GLint gshift = osmesa->gshift;
+   GLint bshift = osmesa->bshift;
+   GLint avalue = VB->ColorPtr->data[pvert][3];
+   GLint msavalue = 255 - avalue;
+   GLint rvalue = VB->ColorPtr->data[pvert][0]*avalue;
+   GLint gvalue = VB->ColorPtr->data[pvert][1]*avalue;
+   GLint bvalue = VB->ColorPtr->data[pvert][2]*avalue;
+
+#define INTERP_XY 1
+#define CLIP_HACK 1
+#define PLOT(X,Y)					\
+   { GLuint *ptr4 = PIXELADDR4(X,Y);			\
+     GLuint  pixel = 0;					\
+     pixel |=((((((*ptr4) >> rshift) & 0xff)*msavalue+rvalue)>>8) << rshift);\
+     pixel |=((((((*ptr4) >> gshift) & 0xff)*msavalue+gvalue)>>8) << gshift);\
+     pixel |=((((((*ptr4) >> bshift) & 0xff)*msavalue+bvalue)>>8) << bshift);\
+     *ptr4 = pixel;					\
+   }
+
+#ifdef WIN32
+#include "..\linetemp.h"
+#else
+#include "linetemp.h"
+#endif
+}
+
+
+/*
+ * Draw a flat-shaded, Z-less, alpha-blended, RGB line into an osmesa buffer.
+ */
+static void flat_blend_rgba_z_line( GLcontext *ctx,
+                                   GLuint vert0, GLuint vert1, GLuint pvert )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   struct vertex_buffer *VB = ctx->VB;
+   GLint rshift = osmesa->rshift;
+   GLint gshift = osmesa->gshift;
+   GLint bshift = osmesa->bshift;
+   GLint avalue = VB->ColorPtr->data[pvert][3];
+   GLint msavalue = 256 - avalue;
+   GLint rvalue = VB->ColorPtr->data[pvert][0]*avalue;
+   GLint gvalue = VB->ColorPtr->data[pvert][1]*avalue;
+   GLint bvalue = VB->ColorPtr->data[pvert][2]*avalue;
+
+#define INTERP_XY 1
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define CLIP_HACK 1
+#define PLOT(X,Y)							\
+	if (Z < *zPtr) {						\
+	   GLuint *ptr4 = PIXELADDR4(X,Y);				\
+	   GLuint  pixel = 0;						\
+	   pixel |=((((((*ptr4) >> rshift) & 0xff)*msavalue+rvalue)>>8) << rshift);	\
+	   pixel |=((((((*ptr4) >> gshift) & 0xff)*msavalue+gvalue)>>8) << gshift);	\
+	   pixel |=((((((*ptr4) >> bshift) & 0xff)*msavalue+bvalue)>>8) << bshift);	\
+	   *ptr4 = pixel; 						\
+	}
+
+#ifdef WIN32
+#include "..\linetemp.h"
+#else
+#include "linetemp.h"
+#endif
+}
+
+
+/*
+ * Draw a flat-shaded, Z-less, alpha-blended, RGB line into an osmesa buffer.
+ */
+static void flat_blend_rgba_z_line_write( GLcontext *ctx,
+                                   GLuint vert0, GLuint vert1, GLuint pvert )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   struct vertex_buffer *VB = ctx->VB;
+   GLint rshift = osmesa->rshift;
+   GLint gshift = osmesa->gshift;
+   GLint bshift = osmesa->bshift;
+   GLint avalue = VB->ColorPtr->data[pvert][3];
+   GLint msavalue = 256 - avalue;
+   GLint rvalue = VB->ColorPtr->data[pvert][0]*avalue;
+   GLint gvalue = VB->ColorPtr->data[pvert][1]*avalue;
+   GLint bvalue = VB->ColorPtr->data[pvert][2]*avalue;
+
+#define INTERP_XY 1
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define CLIP_HACK 1
+#define PLOT(X,Y)							\
+	if (Z < *zPtr) {						\
+	   GLuint *ptr4 = PIXELADDR4(X,Y);				\
+	   GLuint  pixel = 0;						\
+	   pixel |=((((((*ptr4) >> rshift) & 0xff)*msavalue+rvalue)>>8) << rshift);	\
+	   pixel |=((((((*ptr4) >> gshift) & 0xff)*msavalue+gvalue)>>8) << gshift);	\
+	   pixel |=((((((*ptr4) >> bshift) & 0xff)*msavalue+bvalue)>>8) << bshift);	\
+	   *ptr4 = pixel;						\
+	   *zPtr = Z;							\
+	}
+
+#ifdef WIN32
+#include "..\linetemp.h"
+#else
+#include "linetemp.h"
+#endif
+}
+
+
+/*
+ * Analyze context state to see if we can provide a fast line drawing
+ * function, like those in lines.c.  Otherwise, return NULL.
+ */
+static line_func choose_line_function( GLcontext *ctx )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+
+   if (ctx->Line.SmoothFlag)              return NULL;
+   if (ctx->Texture.Enabled)              return NULL;
+   if (ctx->Light.ShadeModel!=GL_FLAT)    return NULL;
+
+   if (ctx->Line.Width==1.0F
+       && ctx->Line.StippleFlag==GL_FALSE) {
+
+       if (ctx->RasterMask==DEPTH_BIT
+           && ctx->Depth.Func==GL_LESS
+           && ctx->Depth.Mask==GL_TRUE
+           && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS) {
+           switch(osmesa->format) {
+       		case OSMESA_RGBA:
+       		case OSMESA_BGRA:
+       		case OSMESA_ARGB:
+       			return flat_rgba_z_line;
+       		default:
+       			return NULL;
+           }
+       }
+
+       if (ctx->RasterMask==0) {
+           switch(osmesa->format) {
+       		case OSMESA_RGBA:
+       		case OSMESA_BGRA:
+       		case OSMESA_ARGB:
+       			return flat_rgba_line;
+       		default:
+       			return NULL;
+           }
+       }
+
+       if (ctx->RasterMask==(DEPTH_BIT|BLEND_BIT)
+           && ctx->Depth.Func==GL_LESS
+           && ctx->Depth.Mask==GL_TRUE
+           && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS
+           && ctx->Color.BlendSrcRGB==GL_SRC_ALPHA
+           && ctx->Color.BlendDstRGB==GL_ONE_MINUS_SRC_ALPHA
+           && ctx->Color.BlendSrcA==GL_SRC_ALPHA
+           && ctx->Color.BlendDstA==GL_ONE_MINUS_SRC_ALPHA
+           && ctx->Color.BlendEquation==GL_FUNC_ADD_EXT) {
+           switch(osmesa->format) {
+       		case OSMESA_RGBA:
+       		case OSMESA_BGRA:
+       		case OSMESA_ARGB:
+       			return flat_blend_rgba_z_line_write;
+       		default:
+       			return NULL;
+           }
+       }
+
+       if (ctx->RasterMask==(DEPTH_BIT|BLEND_BIT)
+           && ctx->Depth.Func==GL_LESS
+           && ctx->Depth.Mask==GL_FALSE
+           && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS
+           && ctx->Color.BlendSrcRGB==GL_SRC_ALPHA
+           && ctx->Color.BlendDstRGB==GL_ONE_MINUS_SRC_ALPHA
+           && ctx->Color.BlendSrcA==GL_SRC_ALPHA
+           && ctx->Color.BlendDstA==GL_ONE_MINUS_SRC_ALPHA
+           && ctx->Color.BlendEquation==GL_FUNC_ADD_EXT) {
+           switch(osmesa->format) {
+       		case OSMESA_RGBA:
+       		case OSMESA_BGRA:
+       		case OSMESA_ARGB:
+       			return flat_blend_rgba_z_line;
+       		default:
+       			return NULL;
+           }
+       }
+
+       if (ctx->RasterMask==BLEND_BIT
+           && ctx->Color.BlendSrcRGB==GL_SRC_ALPHA
+           && ctx->Color.BlendDstRGB==GL_ONE_MINUS_SRC_ALPHA
+           && ctx->Color.BlendSrcA==GL_SRC_ALPHA
+           && ctx->Color.BlendDstA==GL_ONE_MINUS_SRC_ALPHA
+           && ctx->Color.BlendEquation==GL_FUNC_ADD_EXT) {
+           switch(osmesa->format) {
+       		case OSMESA_RGBA:
+       		case OSMESA_BGRA:
+       		case OSMESA_ARGB:
+       			return flat_blend_rgba_line;
+       		default:
+       			return NULL;
+           }
+       }
+
+   }
+   return NULL;
+}
+
+
+/**********************************************************************/
+/*****                 Optimized triangle rendering               *****/
+/**********************************************************************/
+
+
+/*
+ * Smooth-shaded, z-less triangle, RGBA color.
+ */
+static void smooth_rgba_z_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                    GLuint v2, GLuint pv )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+   GLint rshift = osmesa->rshift;
+   GLint gshift = osmesa->gshift;
+   GLint bshift = osmesa->bshift;
+   GLint ashift = osmesa->ashift;
+   (void) pv;
+
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define INTERP_ALPHA 1
+#define INNER_LOOP( LEFT, RIGHT, Y )				\
+{								\
+   GLint i, len = RIGHT-LEFT;					\
+   GLuint *img = PIXELADDR4(LEFT,Y);   				\
+   for (i=0;i<len;i++,img++) {					\
+      GLdepth z = FixedToDepth(ffz);				\
+      if (z < zRow[i]) {					\
+         *img = PACK_RGBA2( FixedToInt(ffr), FixedToInt(ffg),	\
+		            FixedToInt(ffb), FixedToInt(ffa) );	\
+         zRow[i] = z;						\
+      }								\
+      ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;  ffa += fdadx;\
+      ffz += fdzdx;						\
+   }								\
+}
+#ifdef WIN32
+#include "..\tritemp.h"
+#else
+#include "tritemp.h"
+#endif
+}
+
+
+
+
+/*
+ * Flat-shaded, z-less triangle, RGBA color.
+ */
+static void flat_rgba_z_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                   GLuint v2, GLuint pv )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define SETUP_CODE			\
+   GLubyte r = VB->ColorPtr->data[pv][0];	\
+   GLubyte g = VB->ColorPtr->data[pv][1];	\
+   GLubyte b = VB->ColorPtr->data[pv][2];	\
+   GLubyte a = VB->ColorPtr->data[pv][3];	\
+   GLuint pixel = PACK_RGBA(r,g,b,a);
+
+#define INNER_LOOP( LEFT, RIGHT, Y )	\
+{					\
+   GLint i, len = RIGHT-LEFT;		\
+   GLuint *img = PIXELADDR4(LEFT,Y);   	\
+   for (i=0;i<len;i++,img++) {		\
+      GLdepth z = FixedToDepth(ffz);	\
+      if (z < zRow[i]) {		\
+         *img = pixel;			\
+         zRow[i] = z;			\
+      }					\
+      ffz += fdzdx;			\
+   }					\
+}
+#ifdef WIN32
+#include "..\tritemp.h"
+#else
+#include "tritemp.h"
+#endif
+}
+
+
+
+/*
+ * Return pointer to an accelerated triangle function if possible.
+ */
+static triangle_func choose_triangle_function( GLcontext *ctx )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+
+   if ((osmesa->format==OSMESA_RGB)||(osmesa->format==OSMESA_BGR)) return NULL;
+
+   if (ctx->Polygon.SmoothFlag)     return NULL;
+   if (ctx->Polygon.StippleFlag)    return NULL;
+   if (ctx->Texture.Enabled)        return NULL;
+
+   if (ctx->RasterMask==DEPTH_BIT
+       && ctx->Depth.Func==GL_LESS
+       && ctx->Depth.Mask==GL_TRUE
+       && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS
+       && osmesa->format!=OSMESA_COLOR_INDEX) {
+      if (ctx->Light.ShadeModel==GL_SMOOTH) {
+         return smooth_rgba_z_triangle;
+      }
+      else {
+         return flat_rgba_z_triangle;
+      }
+   }
+   return NULL;
+}
+
+
+
+static const GLubyte *get_string( GLcontext *ctx, GLenum name )
+{
+   (void) ctx;
+   switch (name) {
+      case GL_RENDERER:
+         return (const GLubyte *) "Mesa OffScreen";
+      default:
+         return NULL;
+   }
+}
+
+
+static void osmesa_update_state( GLcontext *ctx )
+{
+   OSMesaContext osmesa = (OSMesaContext) ctx;
+
+   ASSERT((void *) osmesa == (void *) ctx->DriverCtx);
+
+   ctx->Driver.GetString = get_string;
+   ctx->Driver.UpdateState = osmesa_update_state;
+
+   ctx->Driver.SetDrawBuffer = set_draw_buffer;
+   ctx->Driver.SetReadBuffer = set_read_buffer;
+   ctx->Driver.Color = set_color;
+   ctx->Driver.Index = set_index;
+   ctx->Driver.ClearIndex = clear_index;
+   ctx->Driver.ClearColor = clear_color;
+   ctx->Driver.Clear = clear;
+
+   ctx->Driver.GetBufferSize = buffer_size;
+
+   ctx->Driver.PointsFunc = NULL;
+   ctx->Driver.LineFunc = choose_line_function( ctx );
+   ctx->Driver.TriangleFunc = choose_triangle_function( ctx );
+
+
+   /* RGB(A) span/pixel functions */
+   if ((osmesa->format==OSMESA_RGB) || (osmesa->format==OSMESA_BGR)) {
+      /* 3 bytes / pixel in frame buffer */
+      ctx->Driver.WriteRGBASpan = write_rgba_span3;
+      ctx->Driver.WriteRGBSpan = write_rgb_span3;
+      ctx->Driver.WriteRGBAPixels = write_rgba_pixels3;
+      ctx->Driver.WriteMonoRGBASpan = write_monocolor_span3;
+      ctx->Driver.WriteMonoRGBAPixels = write_monocolor_pixels3;
+      ctx->Driver.ReadRGBASpan = read_rgba_span3;
+      ctx->Driver.ReadRGBAPixels = read_rgba_pixels3;
+   }
+   else {
+      /* 4 bytes / pixel in frame buffer */
+      if (osmesa->format==OSMESA_RGBA
+          && RCOMP==0 && GCOMP==1 && BCOMP==2 && ACOMP==3)
+         ctx->Driver.WriteRGBASpan = write_rgba_span_rgba;
+      else
+         ctx->Driver.WriteRGBASpan = write_rgba_span;
+      ctx->Driver.WriteRGBSpan = write_rgb_span;
+      ctx->Driver.WriteRGBAPixels = write_rgba_pixels;
+      ctx->Driver.WriteMonoRGBASpan = write_monocolor_span;
+      ctx->Driver.WriteMonoRGBAPixels = write_monocolor_pixels;
+      if (osmesa->format==OSMESA_RGBA
+          && RCOMP==0 && GCOMP==1 && BCOMP==2 && ACOMP==3)
+         ctx->Driver.ReadRGBASpan = read_rgba_span_rgba;
+      else
+         ctx->Driver.ReadRGBASpan = read_rgba_span;
+      ctx->Driver.ReadRGBAPixels = read_rgba_pixels;
+   }
+
+   /* CI span/pixel functions */
+   ctx->Driver.WriteCI32Span = write_index32_span;
+   ctx->Driver.WriteCI8Span = write_index8_span;
+   ctx->Driver.WriteMonoCISpan = write_monoindex_span;
+   ctx->Driver.WriteCI32Pixels = write_index_pixels;
+   ctx->Driver.WriteMonoCIPixels = write_monoindex_pixels;
+   ctx->Driver.ReadCI32Span = read_index_span;
+   ctx->Driver.ReadCI32Pixels = read_index_pixels;
+}
Index: xc/extras/Mesa/src/X/fakeglx.c
diff -u xc/extras/Mesa/src/X/fakeglx.c:1.4 xc/extras/Mesa/src/X/fakeglx.c:1.5
--- xc/extras/Mesa/src/X/fakeglx.c:1.4	Thu Mar  2 08:07:24 2000
+++ xc/extras/Mesa/src/X/fakeglx.c	Fri Jun 16 17:02:38 2000
@@ -47,7 +47,9 @@
 #include "context.h"
 #include "config.h"
 #include "macros.h"
+#include "mmath.h"
 #include "types.h"
+#include "xfonts.h"
 #include "xmesaP.h"
 
 
@@ -70,6 +72,7 @@
 
 
 /* Silence compiler warnings */
+extern void Fake_glXDummyFunc( void );
 void Fake_glXDummyFunc( void )
 {
    (void) kernel8;
@@ -226,7 +229,9 @@
                  GLboolean rgbFlag, GLboolean alphaFlag, GLboolean dbFlag,
                  GLboolean stereoFlag,
                  GLint depth_size, GLint stencil_size,
-                 GLint accum_size, GLint level )
+                 GLint accumRedSize, GLint accumGreenSize,
+                 GLint accumBlueSize, GLint accumAlphaSize,
+                 GLint level )
 {
    GLboolean ximageFlag = GL_TRUE;
    XMesaVisual xmvis;
@@ -269,7 +274,10 @@
           && (v->gl_visual->AlphaBits > 0) == alphaFlag
           && (v->gl_visual->DepthBits >= depth_size || depth_size == 0)
           && (v->gl_visual->StencilBits >= stencil_size || stencil_size == 0)
-          && (v->gl_visual->AccumBits >= accum_size || accum_size == 0)) {
+          && (v->gl_visual->AccumRedBits >= accumRedSize || accumRedSize == 0)
+          && (v->gl_visual->AccumGreenBits >= accumGreenSize || accumGreenSize == 0)
+          && (v->gl_visual->AccumBlueBits >= accumBlueSize || accumBlueSize == 0)
+          && (v->gl_visual->AccumAlphaBits >= accumAlphaSize || accumAlphaSize == 0)) {
          /* now either compare XVisualInfo pointers or visual IDs */
          if ((!comparePointers && v->visinfo->visualid == vinfo->visualid)
              || (comparePointers && v->vishandle == vinfo)) {
@@ -287,7 +295,10 @@
 
    xmvis = XMesaCreateVisual( dpy, vinfo, rgbFlag, alphaFlag, dbFlag,
                               stereoFlag, ximageFlag,
-                              depth_size, stencil_size, accum_size, level );
+                              depth_size, stencil_size,
+                              accumRedSize, accumBlueSize,
+                              accumBlueSize, accumAlphaSize, 0, level,
+                              GLX_NONE_EXT );
    if (xmvis) {
       VisualTable[NumVisuals] = xmvis;
       NumVisuals++;
@@ -299,6 +310,11 @@
 
 /*
  * Create a GLX visual from a regular XVisualInfo.
+ * This is called when Fake GLX is given an XVisualInfo which wasn't
+ * returned by glXChooseVisual.  Since this is the first time we're
+ * considering this visual we'll take a guess at reasonable values
+ * for depth buffer size, stencil size, accum size, etc.
+ * This is the best we can do with a client-side emulation of GLX.
  */
 static XMesaVisual
 create_glx_visual( Display *dpy, XVisualInfo *visinfo )
@@ -315,7 +331,7 @@
                               GL_FALSE,  /* stereo */
                               0,         /* depth bits */
                               0,         /* stencil bits */
-                              0,         /* accum bits */
+                              0,0,0,0,   /* accum bits */
                               vislevel   /* level */
                             );
    }
@@ -328,9 +344,12 @@
                               GL_FALSE,  /* alpha */
                               GL_TRUE,   /* double */
                               GL_FALSE,  /* stereo */
-                              8*sizeof(GLdepth),
-                              8*sizeof(GLstencil),
-                              8*sizeof(GLaccum),
+                              DEFAULT_SOFTWARE_DEPTH_BITS,
+                              8 * sizeof(GLstencil),
+                              8 * sizeof(GLaccum), /* r */
+                              8 * sizeof(GLaccum), /* g */
+                              8 * sizeof(GLaccum), /* b */
+                              8 * sizeof(GLaccum), /* a */
                               0          /* level */
                             );
    }
@@ -436,21 +455,6 @@
 
 
 /*
- * Return number of bits set in n.
- */
-static int bitcount( unsigned long n )
-{
-   int bits;
-   for (bits=0; n>0; n=n>>1) {
-      if (n&1) {
-         bits++;
-      }
-   }
-   return bits;
-}
-
-
-/*
  * Try to get an X visual which matches the given arguments.
  */
 static XVisualInfo *get_visual( Display *dpy, int scr,
@@ -483,9 +487,9 @@
     * 10 bits per color channel.  Mesa's limited to a max of 8 bits/channel.
     */
    if (vis && depth > 24 && (xclass==TrueColor || xclass==DirectColor)) {
-      if (bitcount(vis->red_mask) <= 8
-          && bitcount(vis->green_mask) <= 8
-          && bitcount(vis->blue_mask) <= 8) {
+      if (_mesa_bitcount((GLuint) vis->red_mask  ) <= 8 &&
+          _mesa_bitcount((GLuint) vis->green_mask) <= 8 &&
+          _mesa_bitcount((GLuint) vis->blue_mask ) <= 8) {
          return vis;
       }
       else {
@@ -860,11 +864,15 @@
    GLboolean stereo_flag = GL_FALSE;
    GLint depth_size = 0;
    GLint stencil_size = 0;
-   GLint accum_size = 0;
+   GLint accumRedSize = 0;
+   GLint accumGreenSize = 0;
+   GLint accumBlueSize = 0;
+   GLint accumAlphaSize = 0;
    int level = 0;
    int visual_type = DONT_CARE;
    int trans_type = DONT_CARE;
    int trans_value = DONT_CARE;
+   GLint caveat = DONT_CARE;
 
    parselist = list;
 
@@ -927,13 +935,31 @@
 	    stencil_size = *parselist++;
 	    break;
 	 case GLX_ACCUM_RED_SIZE:
+	    parselist++;
+            {
+               GLint size = *parselist++;
+               accumRedSize = MAX2( accumRedSize, size );
+            }
+            break;
 	 case GLX_ACCUM_GREEN_SIZE:
+	    parselist++;
+            {
+               GLint size = *parselist++;
+               accumGreenSize = MAX2( accumGreenSize, size );
+            }
+            break;
 	 case GLX_ACCUM_BLUE_SIZE:
+	    parselist++;
+            {
+               GLint size = *parselist++;
+               accumBlueSize = MAX2( accumBlueSize, size );
+            }
+            break;
 	 case GLX_ACCUM_ALPHA_SIZE:
 	    parselist++;
             {
                GLint size = *parselist++;
-               accum_size = MAX2( accum_size, size );
+               accumAlphaSize = MAX2( accumAlphaSize, size );
             }
 	    break;
 
@@ -961,6 +987,14 @@
 	    parselist++;
 	    break;
          
+         /*
+          * GLX_EXT_visual_info extension
+          */
+         case GLX_VISUAL_CAVEAT_EXT:
+            parselist++;
+            caveat = *parselist++; /* ignored for now */
+            break;
+
 	 case None:
 	    break;
 	 default:
@@ -990,7 +1024,7 @@
       else {
          /* Get a color index visual */
          vis = choose_x_visual( dpy, screen, rgb_flag, min_ci, visual_type );
-         accum_size = 0;
+         accumRedSize = accumGreenSize = accumBlueSize = accumAlphaSize = 0;
       }
    }
    else {
@@ -1013,9 +1047,33 @@
    }
 
    if (vis) {
+      /* Note: we're not exactly obeying the glXChooseVisual rules here.
+       * When GLX_DEPTH_SIZE = 1 is specified we're supposed to choose the
+       * largest depth buffer size, which is 32bits/value.  However, we
+       * return 16 to maintain performance with earlier versions of Mesa.
+       */
+      if (depth_size == 1)
+         depth_size = DEFAULT_SOFTWARE_DEPTH_BITS;
+      else if (depth_size > 24)
+         depth_size = 31;
+      else if (depth_size > 16)
+         depth_size = 24;
+      /* we only support one size of stencil and accum buffers. */
+      if (stencil_size > 0)
+         stencil_size = STENCIL_BITS;
+      if (accumRedSize > 0)
+         accumRedSize = ACCUM_BITS;
+      if (accumGreenSize > 0)
+         accumGreenSize = ACCUM_BITS;
+      if (accumBlueSize > 0)
+         accumBlueSize = ACCUM_BITS;
+      if (accumAlphaSize > 0)
+         accumAlphaSize = ACCUM_BITS;
       if (!save_glx_visual( dpy, vis, rgb_flag, alpha_flag, double_flag,
-                            stereo_flag,
-                            depth_size, stencil_size, accum_size, level ))
+                            stereo_flag, depth_size, stencil_size,
+                            accumRedSize, accumGreenSize,
+                            accumBlueSize, accumAlphaSize,
+                            level ))
          return NULL;
    }
 
@@ -1079,7 +1137,7 @@
       }
       if (!drawBuffer) {
          /* drawable must be a new window! */
-         drawBuffer = XMesaCreateWindowBuffer2( xmctx->xm_visual, draw, ctx );
+         drawBuffer = XMesaCreateWindowBuffer2( xmctx->xm_visual, draw, (XMesaContext) ctx );
          if (!drawBuffer) {
             /* Out of memory, or context/drawable depth mismatch */
             return False;
@@ -1096,7 +1154,7 @@
       }
       if (!readBuffer) {
          /* drawable must be a new window! */
-         readBuffer = XMesaCreateWindowBuffer2( xmctx->xm_visual, read, ctx );
+         readBuffer = XMesaCreateWindowBuffer2( xmctx->xm_visual, read, (XMesaContext) ctx );
          if (!readBuffer) {
             /* Out of memory, or context/drawable depth mismatch */
             return False;
@@ -1164,7 +1222,6 @@
 
 
 #ifdef GLX_MESA_pixmap_colormap
-
 static GLXPixmap
 Fake_glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visinfo,
                              Pixmap pixmap, Colormap cmap )
@@ -1187,7 +1244,6 @@
    }
    return b->frontbuffer;
 }
-
 #endif
 
 
@@ -1204,6 +1260,7 @@
 }
 
 
+
 static void
 Fake_glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
                      unsigned long mask )
@@ -1227,6 +1284,7 @@
 }
 
 
+extern void _kw_ungrab_all( Display *dpy );
 void _kw_ungrab_all( Display *dpy )
 {
    XUngrabPointer( dpy, CurrentTime );
@@ -1272,6 +1330,8 @@
 }
 
 
+
+#ifdef GLX_MESA_copy_sub_buffer
 static void
 Fake_glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
                            int x, int y, int width, int height )
@@ -1284,6 +1344,7 @@
       fprintf(stderr, "Mesa Warning: glXCopySubBufferMESA: invalid drawable\n");
    }
 }
+#endif
 
 
 
@@ -1372,15 +1433,16 @@
 	 *value = glxvis->gl_visual->StencilBits;
 	 return 0;
       case GLX_ACCUM_RED_SIZE:
+	 *value = glxvis->gl_visual->AccumRedBits;
+	 return 0;
       case GLX_ACCUM_GREEN_SIZE:
+	 *value = glxvis->gl_visual->AccumGreenBits;
+	 return 0;
       case GLX_ACCUM_BLUE_SIZE:
-	 *value = glxvis->gl_visual->AccumBits;
+	 *value = glxvis->gl_visual->AccumBlueBits;
 	 return 0;
       case GLX_ACCUM_ALPHA_SIZE:
-         if (glxvis->gl_visual->AlphaBits > 0)
-            *value = glxvis->gl_visual->AccumBits;
-         else
-            *value = 0;
+         *value = glxvis->gl_visual->AccumAlphaBits;
 	 return 0;
 
       /*
@@ -1438,6 +1500,17 @@
          return 0;
 
       /*
+       * GLX_EXT_visual_info extension
+       */
+      case GLX_VISUAL_CAVEAT_EXT:
+         /* test for zero, just in case */
+         if (glxvis->VisualCaveat > 0)
+            *value = glxvis->VisualCaveat;
+         else
+            *value = GLX_NONE_EXT;
+         return 0;
+
+      /*
        * Extensions
        */
       default:
@@ -1472,10 +1545,10 @@
 #ifdef FX
    const char *fx = getenv("MESA_GLX_FX");
    if (fx && fx[0] != 'd') {
-      return "GLX_MESA_pixmap_colormap GLX_EXT_visual_info GLX_MESA_release_buffers GLX_MESA_copy_sub_buffer GLX_SGI_video_sync GLX_MESA_set_3dfx_mode GLX_ARB_get_proc_address";
+      return "GLX_MESA_pixmap_colormap GLX_EXT_visual_info GLX_EXT_visual_rating GLX_MESA_release_buffers GLX_MESA_copy_sub_buffer GLX_SGI_video_sync GLX_MESA_set_3dfx_mode GLX_ARB_get_proc_address";
    }
 #endif
-   return "GLX_MESA_pixmap_colormap GLX_EXT_visual_info GLX_MESA_release_buffers GLX_MESA_copy_sub_buffer GLX_SGI_video_sync GLX_ARB_get_proc_address";
+   return "GLX_MESA_pixmap_colormap GLX_EXT_visual_info GLX_EXT_visual_rating GLX_MESA_release_buffers GLX_MESA_copy_sub_buffer GLX_SGI_video_sync GLX_ARB_get_proc_address";
 }
 
 
@@ -1544,7 +1617,7 @@
  * GLX 1.3 and later
  */
 
-static GLXFBConfig
+static GLXFBConfig *
 Fake_glXChooseFBConfig( Display *dpy, int screen,
                         const int *attribList, int *nitems )
 {
@@ -1568,6 +1641,16 @@
 }
 
 
+static GLXFBConfig *
+Fake_glXGetFBConfigs( Display *dpy, int screen, int *nelements )
+{
+   (void) dpy;
+   (void) screen;
+   (void) nelements;
+   return 0;
+}
+
+
 static XVisualInfo *
 Fake_glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config )
 {
@@ -1693,6 +1776,7 @@
 
 
 
+#ifdef GLX_MESA_release_buffers
 /*
  * Release the depth, stencil, accum buffers attached to a GLXDrawable
  * (a window or pixmap) prior to destroying the GLXDrawable.
@@ -1707,18 +1791,20 @@
    }
    return False;
 }
+#endif
 
 
-/*
- * GLX_MESA_set_3dfx_mode
- */
+
+#ifdef GLX_MESA_set_3dfx_mode
 static GLboolean
 Fake_glXSet3DfxModeMESA( GLint mode )
 {
    return XMesaSetFXmode( mode );
 }
+#endif
 
 
+
 /*
  * GLX_SGI_video_sync
  */
@@ -1741,10 +1827,8 @@
 #endif
 
 
-
-extern void Fake_glXUseXFont( Font font, int first, int count, int listbase );
 
-
+extern struct _glxapi_table *_mesa_GetGLXDispatchTable(void);
 struct _glxapi_table *_mesa_GetGLXDispatchTable(void)
 {
    static struct _glxapi_table glx;
@@ -1778,17 +1862,17 @@
    glx.WaitGL = Fake_glXWaitGL;
    glx.WaitX = Fake_glXWaitX;
 
-#ifdef _GLXAPI_VERSION_1_1
+#ifdef GLX_VERSION_1_1
    glx.GetClientString = Fake_glXGetClientString;
    glx.QueryExtensionsString = Fake_glXQueryExtensionsString;
    glx.QueryServerString = Fake_glXQueryServerString;
 #endif
 
-#ifdef _GLXAPI_VERSION_1_2
+#ifdef GLX_VERSION_1_2
    /*glx.GetCurrentDisplay = Fake_glXGetCurrentDisplay;*/
 #endif
 
-#ifdef _GLXAPI_VERSION_1_3
+#ifdef GLX_VERSION_1_3
    glx.ChooseFBConfig = Fake_glXChooseFBConfig;
    glx.CreateNewContext = Fake_glXCreateNewContext;
    glx.CreatePbuffer = Fake_glXCreatePbuffer;
@@ -1799,6 +1883,7 @@
    glx.DestroyWindow = Fake_glXDestroyWindow;
    /*glx.GetCurrentReadDrawable = Fake_glXGetCurrentReadDrawable;*/
    glx.GetFBConfigAttrib = Fake_glXGetFBConfigAttrib;
+   glx.GetFBConfigs = Fake_glXGetFBConfigs;
    glx.GetSelectedEvent = Fake_glXGetSelectedEvent;
    glx.GetVisualFromFBConfig = Fake_glXGetVisualFromFBConfig;
    glx.MakeContextCurrent = Fake_glXMakeContextCurrent;
@@ -1807,24 +1892,24 @@
    glx.SelectEvent = Fake_glXSelectEvent;
 #endif
 
-#ifdef _GLXAPI_SGI_video_sync
+#ifdef GLX_SGI_video_sync
    glx.GetVideoSyncSGI = Fake_glXGetVideoSyncSGI;
    glx.WaitVideoSyncSGI = Fake_glXWaitVideoSyncSGI;
 #endif
 
-#ifdef _GLXAPI_MESA_copy_sub_buffer
+#ifdef GLX_MESA_copy_sub_buffer
    glx.CopySubBufferMESA = Fake_glXCopySubBufferMESA;
 #endif
 
-#ifdef _GLXAPI_MESA_release_buffers
+#ifdef GLX_MESA_release_buffers
    glx.ReleaseBuffersMESA = Fake_glXReleaseBuffersMESA;
 #endif
 
-#ifdef _GLXAPI_MESA_pixmap_colormap
+#ifdef GLX_MESA_pixmap_colormap
    glx.CreateGLXPixmapMESA = Fake_glXCreateGLXPixmapMESA;
 #endif
 
-#ifdef _GLXAPI_MESA_set_3dfx_mode
+#ifdef GLX_MESA_set_3dfx_mode
    glx.Set3DfxModeMESA = Fake_glXSet3DfxModeMESA;
 #endif
 
Index: xc/extras/Mesa/src/X/glxapi.c
diff -u xc/extras/Mesa/src/X/glxapi.c:1.4 xc/extras/Mesa/src/X/glxapi.c:1.5
--- xc/extras/Mesa/src/X/glxapi.c:1.4	Thu Mar  2 08:07:24 2000
+++ xc/extras/Mesa/src/X/glxapi.c	Fri Jun 16 17:02:38 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -168,8 +168,7 @@
 }
 
 
-void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst,
-                    unsigned long mask)
+void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, unsigned long mask)
 {
    struct _glxapi_table *t = get_dispatch(dpy);
    if (!t)
@@ -316,7 +315,7 @@
 
 
 
-#ifdef _GLXAPI_VERSION_1_1
+#ifdef GLX_VERSION_1_1
 
 const char *glXGetClientString(Display *dpy, int name)
 {
@@ -348,7 +347,7 @@
 
 
 
-#ifdef _GLXAPI_VERSION_1_2
+#ifdef GLX_VERSION_1_2
 Display *glXGetCurrentDisplay(void)
 {
    return CurrentDisplay;
@@ -357,9 +356,9 @@
 
 
 
-#ifdef _GLXAPI_VERSION_1_3
+#ifdef GLX_VERSION_1_3
 
-GLXFBConfig glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems)
+GLXFBConfig *glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems)
 {
    struct _glxapi_table *t = get_dispatch(dpy);
    if (!t)
@@ -446,6 +445,14 @@
 }
 
 
+GLXFBConfig *glXGetFBConfigs(Display *dpy, int screen, int *nelements)
+{
+   struct _glxapi_table *t = get_dispatch(dpy);
+   if (!t)
+      return 0;
+   return (t->GetFBConfigs)(dpy, screen, nelements);
+}
+
 void glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask)
 {
    struct _glxapi_table *t = get_dispatch(dpy);
@@ -508,10 +515,10 @@
    (t->SelectEvent)(dpy, drawable, mask);
 }
 
-#endif /* _GLXAPI_VERSION_1_3 */
+#endif /* GLX_VERSION_1_3 */
 
 
-#ifdef _GLXAPI_EXT_import_context
+#ifdef GLX_EXT_import_context
 
 void glXFreeContextEXT(Display *dpy, GLXContext context)
 {
@@ -557,7 +564,7 @@
 #endif
 
 
-#ifdef _GLXAPI_SGI_video_sync
+#ifdef GLX_SGI_video_sync
 
 int glXGetVideoSyncSGI(unsigned int *count)
 {
@@ -579,7 +586,7 @@
 #endif
 
 
-#ifdef _GLXAPI_MESA_copy_sub_buffer
+#ifdef GLX_MESA_copy_sub_buffer
 
 void glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height)
 {
@@ -592,7 +599,7 @@
 #endif
 
 
-#ifdef _GLXAPI_MESA_release_buffers
+#ifdef GLX_MESA_release_buffers
 
 Bool glXReleaseBuffersMESA(Display *dpy, Window w)
 {
@@ -605,7 +612,7 @@
 #endif
 
 
-#ifdef _GLXAPI_MESA_pixmap_colormap
+#ifdef GLX_MESA_pixmap_colormap
 
 GLXPixmap glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colormap cmap)
 {
@@ -618,7 +625,7 @@
 #endif
 
 
-#ifdef _GLXAPI_MESA_set_3dfx_mode
+#ifdef GLX_MESA_set_3dfx_mode
 
 GLboolean glXSet3DfxModeMESA(GLint mode)
 {
@@ -651,22 +658,22 @@
 _glxapi_get_extensions(void)
 {
    static const char *extensions[] = {
-#ifdef _GLXAPI_EXT_import_context
+#ifdef GLX_EXT_import_context
       "GLX_EXT_import_context",
 #endif
-#ifdef _GLXAPI_SGI_video_sync
+#ifdef GLX_SGI_video_sync
       "GLX_SGI_video_sync",
 #endif
-#ifdef _GLXAPI_MESA_copy_sub_buffer
+#ifdef GLX_MESA_copy_sub_buffer
       "GLX_MESA_copy_sub_buffer",
 #endif
-#ifdef _GLXAPI_MESA_release_buffers
+#ifdef GLX_MESA_release_buffers
       "GLX_MESA_release_buffers",
 #endif
-#ifdef _GLXAPI_MESA_pixmap_colormap
+#ifdef GLX_MESA_pixmap_colormap
       "GLX_MESA_pixmap_colormap",
 #endif
-#ifdef _GLXAPI_MESA_set_3dfx_mode
+#ifdef GLX_MESA_set_3dfx_mode
       "GLX_MESA_set_3dfx_mode",
 #endif
       NULL
@@ -732,17 +739,17 @@
    { "glXWaitGL", (GLvoid *) glXWaitGL },
    { "glXWaitX", (GLvoid *) glXWaitX },
 
-#ifdef _GLXAPI_VERSION_1_1
+#ifdef GLX_VERSION_1_1
    { "glXGetClientString", (GLvoid *) glXGetClientString },
    { "glXQueryExtensionsString", (GLvoid *) glXQueryExtensionsString },
    { "glXQueryServerString", (GLvoid *) glXQueryServerString },
 #endif
 
-#ifdef _GLXAPI_VERSION_1_2
+#ifdef GLX_VERSION_1_2
    { "glXGetCurrentDisplay", (GLvoid *) glXGetCurrentDisplay },
 #endif
 
-#ifdef _GLXAPI_VERSION_1_3
+#ifdef GLX_VERSION_1_3
    { "glXChooseFBConfig", (GLvoid *) glXChooseFBConfig },
    { "glXCreateNewContext", (GLvoid *) glXCreateNewContext },
    { "glXCreatePbuffer", (GLvoid *) glXCreatePbuffer },
@@ -761,24 +768,24 @@
    { "glXSelectEvent", (GLvoid *) glXSelectEvent },
 #endif
 
-#ifdef _GLXAPI_SGI_video_sync
+#ifdef GLX_SGI_video_sync
    { "glXGetVideoSyncSGI", (GLvoid *) glXGetVideoSyncSGI },
    { "glXWaitVideoSyncSGI", (GLvoid *) glXWaitVideoSyncSGI },
 #endif
 
-#ifdef _GLXAPI_MESA_copy_sub_buffer
+#ifdef GLX_MESA_copy_sub_buffer
    { "glXCopySubBufferMESA", (GLvoid *) glXCopySubBufferMESA },
 #endif
 
-#ifdef _GLXAPI_MESA_release_buffers
+#ifdef GLX_MESA_release_buffers
    { "glXReleaseBuffersMESA", (GLvoid *) glXReleaseBuffersMESA },
 #endif
 
-#ifdef _GLXAPI_MESA_pixmap_colormap
+#ifdef GLX_MESA_pixmap_colormap
    { "glXCreateGLXPixmapMESA", (GLvoid *) glXCreateGLXPixmapMESA },
 #endif
 
-#ifdef _GLXAPI_MESA_set_3dfx_mode
+#ifdef GLX_MESA_set_3dfx_mode
    { "glXSet3DfxModeMESA", (GLvoid *) glXSet3DfxModeMESA },
 #endif
 
Index: xc/extras/Mesa/src/X/glxapi.h
diff -u xc/extras/Mesa/src/X/glxapi.h:1.3 xc/extras/Mesa/src/X/glxapi.h:1.4
--- xc/extras/Mesa/src/X/glxapi.h:1.3	Thu Mar  2 08:07:24 2000
+++ xc/extras/Mesa/src/X/glxapi.h	Fri Jun 16 17:02:38 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,21 +28,11 @@
 #define _glxapi_h_
 
 
+#define GLX_GLXEXT_LEGACY
+#define GL_GLEXT_PROTOTYPES
 #include "GL/glx.h"
 
 
-#define _GLXAPI_VERSION_1_1  1
-#define _GLXAPI_VERSION_1_2  1
-#define _GLXAPI_VERSION_1_3  1
-
-#define _GLXAPI_EXT_import_context  1
-#define _GLXAPI_SGI_video_sync  1
-#define _GLXAPI_MESA_copy_sub_buffer  1
-#define _GLXAPI_MESA_release_buffers  1
-#define _GLXAPI_MESA_pixmap_colormap  1
-#define _GLXAPI_MESA_set_3dfx_mode  1
-
-
 /*
  * Almost all the GLX API functions get routed through this dispatch table.
  * The exceptions are the glXGetCurrentXXX() functions.
@@ -72,18 +62,18 @@
    void (*WaitGL)(void);
    void (*WaitX)(void);
 
-#ifdef _GLXAPI_VERSION_1_1
+#ifdef GLX_VERSION_1_1
    const char *(*GetClientString)(Display *dpy, int name);
    const char *(*QueryExtensionsString)(Display *dpy, int screen);
    const char *(*QueryServerString)(Display *dpy, int screen, int name);
 #endif
 
-#ifdef _GLXAPI_VERSION_1_2
+#ifdef GLX_VERSION_1_2
    /*Display *(*GetCurrentDisplay)(void);*/
 #endif
 
-#ifdef _GLXAPI_VERSION_1_3
-   GLXFBConfig (*ChooseFBConfig)(Display *dpy, int screen, const int *attribList, int *nitems);
+#ifdef GLX_VERSION_1_3
+   GLXFBConfig *(*ChooseFBConfig)(Display *dpy, int screen, const int *attribList, int *nitems);
    GLXContext (*CreateNewContext)(Display *dpy, GLXFBConfig config, int renderType, GLXContext shareList, Bool direct);
    GLXPbuffer (*CreatePbuffer)(Display *dpy, GLXFBConfig config, const int *attribList);
    GLXPixmap (*CreatePixmap)(Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attribList);
@@ -93,6 +83,7 @@
    void (*DestroyWindow)(Display *dpy, GLXWindow window);
    /*GLXDrawable (*GetCurrentReadDrawable)(void);*/
    int (*GetFBConfigAttrib)(Display *dpy, GLXFBConfig config, int attribute, int *value);
+   GLXFBConfig *(*GetFBConfigs)(Display *dpy, int screen, int *nelements);
    void (*GetSelectedEvent)(Display *dpy, GLXDrawable drawable, unsigned long *mask);
    XVisualInfo *(*GetVisualFromFBConfig)(Display *dpy, GLXFBConfig config);
    Bool (*MakeContextCurrent)(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
@@ -101,7 +92,7 @@
    void (*SelectEvent)(Display *dpy, GLXDrawable drawable, unsigned long mask);
 #endif
 
-#ifdef _GLXAPI_EXT_import_context
+#ifdef GLX_EXT_import_context
    void (*FreeContextEXT)(Display *dpy, GLXContext context);
    GLXContextID (*GetContextIDEXT)(const GLXContext context);
    Display *(*GetCurrentDisplayEXT)(void);
@@ -109,7 +100,7 @@
    int (*QueryContextInfoEXT)(Display *dpy, GLXContext context, int attribute,int *value);
 #endif
 
-#ifdef _GLXAPI_SGI_video_sync
+#ifdef GLX_SGI_video_sync
    int (*GetVideoSyncSGI)(unsigned int *count);
    int (*WaitVideoSyncSGI)(int divisor, int remainder, unsigned int *count);
 #endif
@@ -118,19 +109,19 @@
     * XXX thesa Mesa-specific functions might not belong here
     */
 
-#ifdef _GLXAPI_MESA_copy_sub_buffer
+#ifdef GLX_MESA_copy_sub_buffer
    void (*CopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
 #endif
 
-#ifdef _GLXAPI_MESA_release_buffers
+#ifdef GLX_MESA_release_buffers
    Bool (*ReleaseBuffersMESA)(Display *dpy, Window w);
 #endif
 
-#ifdef _GLXAPI_MESA_pixmap_colormap
+#ifdef GLX_MESA_pixmap_colormap
    GLXPixmap (*CreateGLXPixmapMESA)(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colormap cmap);
 #endif
 
-#ifdef _GLXAPI_MESA_set_3dfx_mode
+#ifdef GLX_MESA_set_3dfx_mode
    GLboolean (*Set3DfxModeMESA)(GLint mode);
 #endif
 
Index: xc/extras/Mesa/src/X/xfonts.c
diff -u xc/extras/Mesa/src/X/xfonts.c:1.3 xc/extras/Mesa/src/X/xfonts.c:1.4
--- xc/extras/Mesa/src/X/xfonts.c:1.3	Mon Feb 14 23:13:14 2000
+++ xc/extras/Mesa/src/X/xfonts.c	Fri Jun 16 17:02:38 2000
@@ -3,7 +3,7 @@
  * Mesa 3-D graphics library
  * Version:  3.3
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,8 +43,10 @@
 #include "GL/xmesa.h"
 #include "context.h"
 #include "mem.h"
+#include "xfonts.h"
 #include "xmesaP.h"
 
+
 /* Some debugging info.  */
 
 #ifdef DEBUG
@@ -372,7 +374,7 @@
       glEndList ();
     }
 
-  free (bm);
+  FREE(bm);
   XFreeFontInfo( NULL, fs, 0 );
   XFreeGC (dpy, gc);
 
@@ -385,6 +387,8 @@
   glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
 }
 
+
+extern void xmesa_xfonts_dummy( void );
 void xmesa_xfonts_dummy( void )
 {
    /* silence unused var warnings */
Index: xc/extras/Mesa/src/X/xfonts.h
diff -u /dev/null xc/extras/Mesa/src/X/xfonts.h:1.1
--- /dev/null	Sat Jul  1 20:46:14 2000
+++ xc/extras/Mesa/src/X/xfonts.h	Fri Jun 16 17:02:39 2000
@@ -0,0 +1,38 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ *
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef XFONTS_H
+#define XFONTS_H
+
+
+#include <X11/Xlib.h>
+
+
+extern void Fake_glXUseXFont( Font font, int first, int count, int listbase );
+
+
+#endif
+
Index: xc/extras/Mesa/src/X/xmesa1.c
diff -u xc/extras/Mesa/src/X/xmesa1.c:1.4 xc/extras/Mesa/src/X/xmesa1.c:1.5
--- xc/extras/Mesa/src/X/xmesa1.c:1.4	Thu Mar  2 08:07:25 2000
+++ xc/extras/Mesa/src/X/xmesa1.c	Fri Jun 16 17:02:39 2000
@@ -64,6 +64,7 @@
 #include "GL/xmesa.h"
 #include "xmesaP.h"
 #include "context.h"
+#include "extensions.h"
 #include "matrix.h"
 #include "mem.h"
 #include "types.h"
@@ -72,6 +73,11 @@
 #endif
 
 
+#ifndef GLX_NONE_EXT
+#define GLX_NONE_EXT 0x8000
+#endif
+
+
 /*
  * Current X/Mesa context pointer:
  */
@@ -418,7 +424,7 @@
 }
 
 
-/* Copy X color table stuff from on XMesaBuffer to another. */
+/* Copy X color table stuff from one XMesaBuffer to another. */
 static void copy_colortable_info(XMesaBuffer dst, const XMesaBuffer src)
 {
    MEMCPY(dst->color_table, src->color_table, sizeof(src->color_table));
@@ -1349,10 +1355,11 @@
 /*
  * Convert an RGBA color to a pixel value.
  */
-unsigned long xmesa_color_to_pixel( XMesaContext xmesa,
-                                    GLubyte r, GLubyte g, GLubyte b, GLubyte a)
+unsigned long
+xmesa_color_to_pixel( XMesaContext xmesa, GLubyte r, GLubyte g, GLubyte b, GLubyte a,
+                      GLuint pixelFormat)
 {
-   switch (xmesa->pixelformat) {
+   switch (pixelFormat) {
       case PF_INDEX:
          return 0;
       case PF_TRUECOLOR:
@@ -1408,21 +1415,29 @@
 
 /*
  * Create a new X/Mesa visual.
- * Input:  display - the X display
- *         visinfo - the XVisualInfo
- *         rgb_flag - TRUE=RGB(A) mode, FALSE=CI mode
- *         alpha_flag - need alpha planes?
- *         db_flag - TRUE=double bufferd, FALSE=single
- *         stereo_flag - true/false
- *         ximage_flag - TRUE=use XImage for back buffer, FALSE=use Pixmap
- *         depth_size - requested min bits per depth buffer value
- *         stencil_size - requested min bits per stencil buffer value
- *         accum_size - requested min bits per accum buffer value (per channel)
- *         level - 0=normal, 1=overaly, -1=underlay, etc.
- * Return:  New XMesaVisual or NULL if something goes wrong
+ * Input:  display - X11 display
+ *         visinfo - an XVisualInfo pointer
+ *         rgb_flag - GL_TRUE = RGB mode,
+ *                    GL_FALSE = color index mode
+ *         alpha_flag - alpha buffer requested?
+ *         db_flag - GL_TRUE = double-buffered,
+ *                   GL_FALSE = single buffered
+ *         stereo_flag - stereo visual?
+ *         ximage_flag - GL_TRUE = use an XImage for back buffer,
+ *                       GL_FALSE = use an off-screen pixmap for back buffer
+ *         depth_size - requested bits/depth values, or zero
+ *         stencil_size - requested bits/stencil values, or zero
+ *         accum_red_size - requested bits/red accum values, or zero
+ *         accum_green_size - requested bits/green accum values, or zero
+ *         accum_blue_size - requested bits/blue accum values, or zero
+ *         accum_alpha_size - requested bits/alpha accum values, or zero
+ *         num_samples - number of samples/pixel if multisampling, or zero
+ *         level - visual level, usually 0
+ *         visualCaveat - ala the GLX extension, usually GLX_NONE_EXT
+ * Return;  a new XMesaVisual or 0 if error.
  */
 XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
-			       XMesaVisualInfo visinfo,
+                               XMesaVisualInfo visinfo,
                                GLboolean rgb_flag,
                                GLboolean alpha_flag,
                                GLboolean db_flag,
@@ -1430,8 +1445,13 @@
                                GLboolean ximage_flag,
                                GLint depth_size,
                                GLint stencil_size,
-                               GLint accum_size,
-                               GLint level )
+                               GLint accum_red_size,
+                               GLint accum_green_size,
+                               GLint accum_blue_size,
+                               GLint accum_alpha_size,
+                               GLint num_samples,
+                               GLint level,
+                               GLint visualCaveat )
 {
    char *gamma;
    XMesaVisual v;
@@ -1506,6 +1526,7 @@
 
    v->ximage_flag = ximage_flag;
    v->level = level;
+   v->VisualCaveat = visualCaveat;
 
    (void) initialize_visual_and_buffer( 0, v, NULL, rgb_flag, 0, 0 );
 
@@ -1532,11 +1553,15 @@
       }
    }
 
-   v->gl_visual = gl_create_visual( rgb_flag, alpha_flag, db_flag, stereo_flag,
-                                    depth_size, stencil_size, accum_size,
-                                    v->index_bits,
-                                    red_bits, green_bits,
-                                    blue_bits, alpha_bits );
+   v->gl_visual = _mesa_create_visual( rgb_flag, db_flag, stereo_flag,
+                                       red_bits, green_bits,
+                                       blue_bits, alpha_bits,
+                                       v->index_bits,
+                                       depth_size,
+                                       stencil_size,
+                                       accum_red_size, accum_green_size,
+                                       accum_blue_size, accum_alpha_size,
+                                       0 );
    if (!v->gl_visual) {
 #ifndef XFree86Server
       FREE(v->visinfo);
@@ -1557,7 +1582,7 @@
 
 void XMesaDestroyVisual( XMesaVisual v )
 {
-   gl_destroy_visual( v->gl_visual );
+   _mesa_destroy_visual( v->gl_visual );
 #ifndef XFree86Server
    FREE(v->visinfo);
 #endif
@@ -1573,9 +1598,7 @@
  *                      lists or NULL if no sharing is wanted.
  * Return:  an XMesaContext or NULL if error.
  */
-XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list
-				 DRI_CTX_ARG
-			       )
+XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
 {
    XMesaContext c;
    GLboolean direct = GL_TRUE; /* XXXX */
@@ -1594,6 +1617,9 @@
       return NULL;
    }
 
+   gl_extensions_enable(c->gl_ctx, "GL_HP_occlusion_test");
+   gl_extensions_enable(c->gl_ctx, "GL_ARB_texture_cube_map");
+
    if (CHECK_BYTE_ORDER(v)) {
       c->swapbytes = GL_FALSE;
    }
@@ -1673,11 +1699,8 @@
  *         c - the context
  * Return:  new XMesaBuffer or NULL if error
  */
-XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v,
-                                      XMesaWindow w,
-                                      XMesaContext c
-				      DRI_DRAWABLE_ARG
-				    )
+XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v, XMesaWindow w,
+                                      XMesaContext c )
 {
 #ifndef XFree86Server
    XWindowAttributes attr;
@@ -1750,7 +1773,7 @@
    b->gl_buffer = gl_create_framebuffer( v->gl_visual,
                                          v->gl_visual->DepthBits > 0,
                                          v->gl_visual->StencilBits > 0,
-                                         v->gl_visual->AccumBits > 0,
+                                         v->gl_visual->AccumRedBits > 0,
                                          v->gl_visual->AlphaBits > 0 );
    if (!b->gl_buffer) {
       free_xmesa_buffer(client, b);
@@ -1778,9 +1801,9 @@
        if (v->gl_visual->DBflag) {
 	 attribs[numAttribs++] = FXMESA_DOUBLEBUFFER;
        }
-       if (v->gl_visual->AccumBits > 0) {
+       if (v->gl_visual->AccumRedBits > 0) {
 	 attribs[numAttribs++] = FXMESA_ACCUM_SIZE;
-	 attribs[numAttribs++] = v->gl_visual->AccumBits;
+	 attribs[numAttribs++] = v->gl_visual->AccumRedBits;
        }
        if (v->gl_visual->StencilBits > 0) {
          attribs[numAttribs++] = FXMESA_STENCIL_SIZE;
@@ -1839,12 +1862,9 @@
 }
 
 
-XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v,
-                                     XMesaWindow w
-				     DRI_DRAWABLE_ARG
-				   )
+XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, XMesaWindow w )
 {
-   return XMesaCreateWindowBuffer2( v, w, NULL DRI_DRAWABLE_PARM );
+   return XMesaCreateWindowBuffer2( v, w, NULL );
 }
 
 
@@ -1857,9 +1877,7 @@
  * Return:  new XMesaBuffer or NULL if error
  */
 XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v,
-				     XMesaPixmap p, XMesaColormap cmap
-				     DRI_DRAWABLE_ARG
-				   )
+				     XMesaPixmap p, XMesaColormap cmap )
 {
    int client = 0;
    XMesaBuffer b = alloc_xmesa_buffer();
@@ -1897,7 +1915,9 @@
    b->gl_buffer = gl_create_framebuffer( v->gl_visual,
                                          v->gl_visual->DepthBits > 0,
                                          v->gl_visual->StencilBits > 0,
-                                         v->gl_visual->AccumBits > 0,
+                                         v->gl_visual->AccumRedBits +
+                                         v->gl_visual->AccumGreenBits +
+                                         v->gl_visual->AccumBlueBits > 0,
                                          v->gl_visual->AlphaBits > 0 );
    if (!b->gl_buffer) {
       free_xmesa_buffer(client, b);
@@ -2041,13 +2061,14 @@
           * can be different for different windows.
           */
          c->pixel = xmesa_color_to_pixel( c, c->red, c->green,
-                                          c->blue, c->alpha );
+                                          c->blue, c->alpha, c->pixelformat );
          XMesaSetForeground( c->display, c->xm_buffer->gc1, c->pixel );
          c->clearpixel = xmesa_color_to_pixel( c,
                                                c->clearcolor[0],
                                                c->clearcolor[1],
                                                c->clearcolor[2],
-                                               c->clearcolor[3] );
+                                               c->clearcolor[3],
+                                               c->xm_visual->undithered_pf);
          XMesaSetForeground(c->display, c->xm_buffer->cleargc, c->clearpixel);
       }
 
@@ -2136,7 +2157,7 @@
    const char *fx = getenv("MESA_GLX_FX");
    if (fx && fx[0] != 'd') {
       GrHwConfiguration hw;
-      if (!grSstQueryHardware(&hw)) {
+      if (!FX_grSstQueryHardware(&hw)) {
          /*fprintf(stderr, "!grSstQueryHardware\n");*/
          return GL_FALSE;
       }
@@ -2147,13 +2168,13 @@
       if (XMesa) {
          if (mode == XMESA_FX_WINDOW) {
 	    if (XMesa->xm_buffer->FXisHackUsable) {
-	       grSstControl(GR_CONTROL_DEACTIVATE);
+	       FX_grSstControl(GR_CONTROL_DEACTIVATE);
 	       XMesa->xm_buffer->FXwindowHack = GL_TRUE;
 	       return GL_TRUE;
 	    }
 	 }
 	 else if (mode == XMESA_FX_FULLSCREEN) {
-	    grSstControl(GR_CONTROL_ACTIVATE);
+	    FX_grSstControl(GR_CONTROL_ACTIVATE);
 	    XMesa->xm_buffer->FXwindowHack = GL_FALSE;
 	    return GL_TRUE;
 	 }
@@ -2253,7 +2274,7 @@
 					       (pixbuf[x] & 0xf800) >> 8,
 					       (pixbuf[x] & 0x07e0) >> 3,
 					       (pixbuf[x] & 0x001f) << 3,
-					       0xff));
+					       0xff, XMesa->pixelformat));
          }
       }
    }
@@ -2435,7 +2456,7 @@
 GLboolean XMesaGetDepthBuffer( XMesaBuffer b, GLint *width, GLint *height,
                                GLint *bytesPerValue, void **buffer )
 {
-   if ((!b->gl_buffer) || (!b->gl_buffer->Depth)) {
+   if ((!b->gl_buffer) || (!b->gl_buffer->DepthBuffer)) {
       *width = 0;
       *height = 0;
       *bytesPerValue = 0;
@@ -2446,7 +2467,7 @@
       *width = b->gl_buffer->Width;
       *height = b->gl_buffer->Height;
       *bytesPerValue = sizeof(GLdepth);
-      *buffer = b->gl_buffer->Depth;
+      *buffer = b->gl_buffer->DepthBuffer;
       return GL_TRUE;
    }
 }
Index: xc/extras/Mesa/src/X/xmesa2.c
diff -u xc/extras/Mesa/src/X/xmesa2.c:1.4 xc/extras/Mesa/src/X/xmesa2.c:1.5
--- xc/extras/Mesa/src/X/xmesa2.c:1.4	Thu Mar  2 08:07:25 2000
+++ xc/extras/Mesa/src/X/xmesa2.c	Fri Jun 16 17:02:39 2000
@@ -36,8 +36,12 @@
 #include "drawpix.h"
 #include "mem.h"
 #include "state.h"
+#include "depth.h"
+#include "macros.h"
+#include "vb.h"
 #include "types.h"
 #include "xmesaP.h"
+#include "extensions.h"
 
 
 
@@ -347,7 +351,8 @@
    xmesa->clearcolor[1] = g;
    xmesa->clearcolor[2] = b;
    xmesa->clearcolor[3] = a;
-   xmesa->clearpixel = xmesa_color_to_pixel( xmesa, r, g, b, a );
+   xmesa->clearpixel = xmesa_color_to_pixel( xmesa, r, g, b, a,
+                                             xmesa->xm_visual->undithered_pf );
    XMesaSetForeground( xmesa->display, xmesa->xm_buffer->cleargc,
                        xmesa->clearpixel );
 }
@@ -430,7 +435,7 @@
    xmesa->green = g;
    xmesa->blue  = b;
    xmesa->alpha = a;
-   xmesa->pixel = xmesa_color_to_pixel( xmesa, r, g, b, a );;
+   xmesa->pixel = xmesa_color_to_pixel( xmesa, r, g, b, a, xmesa->pixelformat );;
    XMesaSetForeground( xmesa->display, xmesa->xm_buffer->gc1, xmesa->pixel );
 }
 
@@ -713,7 +718,7 @@
 }
 
 
-/* Optimized code provided by Nozomi Ytow <nozomi@biol.tsukuba.ac.jp> */
+/* Optimized code provided by Nozomi Ytow <noz@xfree86.org> */
 static void
 clear_24bit_ximage( GLcontext *ctx, GLboolean all,
                     GLint x, GLint y, GLint width, GLint height )
@@ -731,14 +736,31 @@
    }
 
    if (all) {
-      register GLint n = xmesa->xm_buffer->width * xmesa->xm_buffer->height;
-      register bgr_t *ptr3 = (bgr_t *) xmesa->xm_buffer->backimage->data;
       if (r==g && g==b) {
          /* same value for all three components (gray) */
-         MEMSET(ptr3, r, 3 * n);
+         const GLint w3 = xmesa->xm_buffer->width * 3;
+         const GLint h = xmesa->xm_buffer->height;
+         GLint i;
+         for (i = 0; i < h; i++) {
+            bgr_t *ptr3 = PIXELADDR3(xmesa->xm_buffer, 0, i);
+            MEMSET(ptr3, r, w3);
+         }
       }
       else {
          /* the usual case */
+         const GLint w = xmesa->xm_buffer->width;
+         const GLint h = xmesa->xm_buffer->height;
+         GLint i, j;
+         for (i = 0; i < h; i++) {
+            bgr_t *ptr3 = PIXELADDR3(xmesa->xm_buffer, 0, i);
+            for (j = 0; j < w; j++) {
+               ptr3->r = r;
+               ptr3->g = g;
+               ptr3->b = b;
+               ptr3++;
+            }
+         }
+#if 0 /* this code doesn't work for all window widths */
          register GLuint *ptr4 = (GLuint *) ptr3;
          register GLuint px;
          GLuint pixel4[3];
@@ -805,6 +827,7 @@
             case 0:
                break;
          }
+#endif
       }
    }
    else {
@@ -819,6 +842,17 @@
       }
       else {
          /* non-gray clear color */
+         GLint i, j;
+         for (j = 0; j < height; j++) {
+            bgr_t *ptr3 = PIXELADDR3( xmesa->xm_buffer, x, y+j );
+            for (i = 0; i < width; i++) {
+               ptr3->r = r;
+               ptr3->g = g;
+               ptr3->b = b;
+               ptr3++;
+            }
+         }
+#if 0 /* this code might not always (seems ptr3 always == ptr4) */
          GLint j;
          GLuint pixel4[3];
          pixel4[0] = clearPixel | (clearPixel << 24);
@@ -889,6 +923,7 @@
                   break;
             }
          }
+#endif
       }
    }
 }
@@ -2342,9 +2377,24 @@
    }
    else {
       /* draw all pixels */
-      for (i=0;i<n;i++) {
-         ptr[i] = PACK_5R6G5B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+      GLuint *ptr32 = (GLuint *) ptr;
+      GLuint extraPixel = (n & 1);
+      n -= extraPixel;
+      for (i = 0; i < n; i += 2) {
+         GLuint p0, p1;
+         p0 = PACK_5R6G5B(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+         p1 = PACK_5R6G5B(rgba[i+1][RCOMP], rgba[i+1][GCOMP], rgba[i+1][BCOMP]);
+         *ptr32++ = (p1 << 16) | p0;
+      }
+      if (extraPixel) {
+         ptr[n] = PACK_5R6G5B(rgba[n][RCOMP], rgba[n][GCOMP], rgba[n][BCOMP]);
+      }
+#else
+      for (i = 0; i < n; i++) {
+         ptr[i] = PACK_5R6G5B(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
       }
+#endif
    }
 }
 
@@ -2366,9 +2416,24 @@
    }
    else {
       /* draw all pixels */
-      for (i=0;i<n;i++,x++) {
-         PACK_TRUEDITHER( ptr[i], x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+      GLuint *ptr32 = (GLuint *) ptr;
+      GLuint extraPixel = (n & 1);
+      n -= extraPixel;
+      for (i = 0; i < n; i += 2, x += 2) {
+         GLuint p0, p1;
+         PACK_TRUEDITHER( p0, x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         PACK_TRUEDITHER( p1, x+1, y, rgba[i+1][RCOMP], rgba[i+1][GCOMP], rgba[i+1][BCOMP] );
+         *ptr32++ = (p1 << 16) | p0;
+      }
+      if (extraPixel) {
+         PACK_TRUEDITHER( ptr[n], x+n, y, rgba[n][RCOMP], rgba[n][GCOMP], rgba[n][BCOMP]);
       }
+#else
+      for (i = 0; i < n; i++, x++) {
+         PACK_TRUEDITHER( ptr[i], x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+      }
+#endif
    }
 }
 
@@ -2390,9 +2455,24 @@
    }
    else {
       /* draw all pixels */
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+      GLuint *ptr32 = (GLuint *) ptr;
+      GLuint extraPixel = (n & 1);
+      n -= extraPixel;
+      for (i = 0; i < n; i += 2) {
+         GLuint p0, p1;
+         p0 = PACK_5R6G5B(rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+         p1 = PACK_5R6G5B(rgb[i+1][RCOMP], rgb[i+1][GCOMP], rgb[i+1][BCOMP]);
+         *ptr32++ = (p1 << 16) | p0;
+      }
+      if (extraPixel) {
+         ptr[n] = PACK_5R6G5B(rgb[n][RCOMP], rgb[n][GCOMP], rgb[n][BCOMP]);
+      }
+#else
       for (i=0;i<n;i++) {
          ptr[i] = PACK_5R6G5B( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
       }
+#endif
    }
 }
 
@@ -2414,9 +2494,24 @@
    }
    else {
       /* draw all pixels */
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+      GLuint *ptr32 = (GLuint *) ptr;
+      GLuint extraPixel = (n & 1);
+      n -= extraPixel;
+      for (i = 0; i < n; i += 2, x += 2) {
+         GLuint p0, p1;
+         PACK_TRUEDITHER( p0, x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+         PACK_TRUEDITHER( p1, x+1, y, rgb[i+1][RCOMP], rgb[i+1][GCOMP], rgb[i+1][BCOMP] );
+         *ptr32++ = (p1 << 16) | p0;
+      }
+      if (extraPixel) {
+         PACK_TRUEDITHER( ptr[n], x+n, y, rgb[n][RCOMP], rgb[n][GCOMP], rgb[n][BCOMP]);
+      }
+#else
       for (i=0;i<n;i++,x++) {
          PACK_TRUEDITHER( ptr[i], x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
       }
+#endif
    }
 }
 
@@ -4280,7 +4375,6 @@
 {
    const XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    XMesaBuffer source;
-   register GLuint i;
 
    if (xmesa->use_read_buffer)
       source = xmesa->xm_read_buffer;
@@ -4288,10 +4382,11 @@
       source = xmesa->xm_buffer;
 
    if (source->buffer) {
+      /* Read from Pixmap or Window */
       XMesaImage *span = NULL;
       int error;
 #ifdef XFree86Server
-      span = XMesaCreateImage(GET_VISUAL_DEPTH(xmesa->xm_visual), n, 1, NULL);
+      span = XMesaCreateImage(xmesa->xm_visual->BitsPerPixel, n, 1, NULL);
       span->data = (char *)MALLOC(span->height * span->bytes_per_line);
       error = (!span->data);
       (*xmesa->display->GetImage)(source->buffer,
@@ -4307,18 +4402,17 @@
 	 switch (xmesa->pixelformat) {
 	    case PF_TRUECOLOR:
 	    case PF_TRUEDITHER:
-            case PF_5R6G5B:
-            case PF_DITHER_5R6G5B:
                {
+                  const GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+                  const GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+                  const GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
                   unsigned long rMask = GET_REDMASK(xmesa->xm_visual);
                   unsigned long gMask = GET_GREENMASK(xmesa->xm_visual);
                   unsigned long bMask = GET_BLUEMASK(xmesa->xm_visual);
-                  GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
-                  GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
-                  GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
                   GLint rShift = xmesa->xm_visual->rshift;
                   GLint gShift = xmesa->xm_visual->gshift;
                   GLint bShift = xmesa->xm_visual->bshift;
+                  GLuint i;
                   for (i=0;i<n;i++) {
                      unsigned long p;
                      p = XMesaGetPixel( span, i, 0 );
@@ -4329,9 +4423,31 @@
                   }
                }
 	       break;
+            case PF_5R6G5B:
+            case PF_DITHER_5R6G5B:
+               {
+                  const GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+                  const GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+                  const GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     unsigned long p = XMesaGetPixel( span, i, 0 );
+                     /* fast, but not quite accurate
+                     rgba[i][RCOMP] = ((p >> 8) & 0xf8);
+                     rgba[i][GCOMP] = ((p >> 3) & 0xfc);
+                     rgba[i][BCOMP] = ((p << 3) & 0xff);
+                     */
+                     rgba[i][RCOMP] = pixelToR[p >> 11];
+                     rgba[i][GCOMP] = pixelToG[(p >> 5) & 0x3f];
+                     rgba[i][BCOMP] = pixelToB[p & 0x1f];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+	       break;
 	    case PF_8A8B8G8R:
                {
-                  GLuint *ptr4 = (GLuint *) span->data;
+                  const GLuint *ptr4 = (GLuint *) span->data;
+                  GLuint i;
                   for (i=0;i<n;i++) {
                      GLuint p4 = *ptr4++;
                      rgba[i][RCOMP] = (GLubyte) ( p4        & 0xff);
@@ -4343,7 +4459,8 @@
 	       break;
             case PF_8R8G8B:
                {
-                  GLuint *ptr4 = (GLuint *) span->data;
+                  const GLuint *ptr4 = (GLuint *) span->data;
+                  GLuint i;
                   for (i=0;i<n;i++) {
                      GLuint p4 = *ptr4++;
                      rgba[i][RCOMP] = (GLubyte) ((p4 >> 16) & 0xff);
@@ -4355,7 +4472,8 @@
 	       break;
             case PF_8R8G8B24:
                {
-                  bgr_t *ptr3 = (bgr_t *) span->data;
+                  const bgr_t *ptr3 = (bgr_t *) span->data;
+                  GLuint i;
                   for (i=0;i<n;i++) {
                      rgba[i][RCOMP] = ptr3[i].r;
                      rgba[i][GCOMP] = ptr3[i].g;
@@ -4367,6 +4485,7 @@
             case PF_HPCR:
                {
                   GLubyte *ptr1 = (GLubyte *) span->data;
+                  GLuint i;
                   for (i=0;i<n;i++) {
                      GLubyte p = *ptr1++;
                      rgba[i][RCOMP] =  p & 0xE0;
@@ -4384,7 +4503,8 @@
                   GLubyte *gTable = source->pixel_to_g;
                   GLubyte *bTable = source->pixel_to_b;
                   if (GET_VISUAL_DEPTH(xmesa->xm_visual)==8) {
-                     GLubyte *ptr1 = (GLubyte *) span->data;
+                     const GLubyte *ptr1 = (GLubyte *) span->data;
+                     GLuint i;
                      for (i=0;i<n;i++) {
                         unsigned long p = *ptr1++;
                         rgba[i][RCOMP] = rTable[p];
@@ -4394,9 +4514,9 @@
                      }
                   }
                   else {
+                     GLuint i;
                      for (i=0;i<n;i++) {
-                     unsigned long p;
-		     p = XMesaGetPixel( span, i, 0 );
+                        unsigned long p = XMesaGetPixel( span, i, 0 );
                         rgba[i][RCOMP] = rTable[p];
                         rgba[i][GCOMP] = gTable[p];
                         rgba[i][BCOMP] = bTable[p];
@@ -4408,6 +4528,7 @@
 	    case PF_1BIT:
                {
                   int bitFlip = xmesa->xm_visual->bitFlip;
+                  GLuint i;
                   for (i=0;i<n;i++) {
                      unsigned long p;
                      p = XMesaGetPixel( span, i, 0 ) ^ bitFlip;
@@ -4425,6 +4546,7 @@
       }
       else {
 	 /* return black pixels */
+         GLuint i;
 	 for (i=0;i<n;i++) {
 	    rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = rgba[i][ACOMP] = 0;
 	 }
@@ -4434,22 +4556,22 @@
       }
    }
    else if (source->backimage) {
+      /* Read from XImage back buffer */
       switch (xmesa->pixelformat) {
          case PF_TRUECOLOR:
          case PF_TRUEDITHER:
-         case PF_5R6G5B:
-         case PF_DITHER_5R6G5B:
             {
+               const GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+               const GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+               const GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
                unsigned long rMask = GET_REDMASK(xmesa->xm_visual);
                unsigned long gMask = GET_GREENMASK(xmesa->xm_visual);
                unsigned long bMask = GET_BLUEMASK(xmesa->xm_visual);
-               GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
-               GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
-               GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
                GLint rShift = xmesa->xm_visual->rshift;
                GLint gShift = xmesa->xm_visual->gshift;
                GLint bShift = xmesa->xm_visual->bshift;
                XMesaImage *img = source->backimage;
+               GLuint i;
                y = FLIP(source, y);
                for (i=0;i<n;i++) {
                   unsigned long p;
@@ -4461,9 +4583,58 @@
                }
             }
             break;
+         case PF_5R6G5B:
+         case PF_DITHER_5R6G5B:
+            {
+               const GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+               const GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+               const GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
+               const GLushort *ptr2 = PIXELADDR2( source, x, y );
+               const GLuint *ptr4 = (const GLuint *) ptr2;
+               GLuint i;
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+               GLuint extraPixel = (n & 1);
+               n -= extraPixel;
+               for (i = 0; i < n; i += 2) {
+                  const GLuint p = *ptr4++;
+                  const GLuint p0 = p & 0xffff;
+                  const GLuint p1 = p >> 16;
+                  /* fast, but not quite accurate
+                  rgba[i][RCOMP] = ((p >> 8) & 0xf8);
+                  rgba[i][GCOMP] = ((p >> 3) & 0xfc);
+                  rgba[i][BCOMP] = ((p << 3) & 0xff);
+                  */
+                  rgba[i][RCOMP] = pixelToR[p0 >> 11];
+                  rgba[i][GCOMP] = pixelToG[(p0 >> 5) & 0x3f];
+                  rgba[i][BCOMP] = pixelToB[p0 & 0x1f];
+                  rgba[i][ACOMP] = 255;
+                  rgba[i+1][RCOMP] = pixelToR[p1 >> 11];
+                  rgba[i+1][GCOMP] = pixelToG[(p1 >> 5) & 0x3f];
+                  rgba[i+1][BCOMP] = pixelToB[p1 & 0x1f];
+                  rgba[i+1][ACOMP] = 255;
+               }
+               if (extraPixel) {
+                  GLushort p = ptr2[n];
+                  rgba[n][RCOMP] = pixelToR[p >> 11];
+                  rgba[n][GCOMP] = pixelToG[(p >> 5) & 0x3f];
+                  rgba[n][BCOMP] = pixelToB[p & 0x1f];
+                  rgba[n][ACOMP] = 255;
+               }
+#else
+               for (i = 0; i < n; i++) {
+                  const GLushort p = ptr2[i];
+                  rgba[i][RCOMP] = pixelToR[p >> 11];
+                  rgba[i][GCOMP] = pixelToG[(p >> 5) & 0x3f];
+                  rgba[i][BCOMP] = pixelToB[p & 0x1f];
+                  rgba[i][ACOMP] = 255;
+               }
+#endif
+            }
+            break;
 	 case PF_8A8B8G8R:
             {
-               GLuint *ptr4 = PIXELADDR4( source, x, y );
+               const GLuint *ptr4 = PIXELADDR4( source, x, y );
+               GLuint i;
                for (i=0;i<n;i++) {
                   GLuint p4 = *ptr4++;
                   rgba[i][RCOMP] = (GLubyte) ( p4        & 0xff);
@@ -4475,7 +4646,8 @@
 	    break;
 	 case PF_8R8G8B:
             {
-               GLuint *ptr4 = PIXELADDR4( source, x, y );
+               const GLuint *ptr4 = PIXELADDR4( source, x, y );
+               GLuint i;
                for (i=0;i<n;i++) {
                   GLuint p4 = *ptr4++;
                   rgba[i][RCOMP] = (GLubyte) ((p4 >> 16) & 0xff);
@@ -4487,7 +4659,8 @@
 	    break;
 	 case PF_8R8G8B24:
             {
-               bgr_t *ptr3 = PIXELADDR3( source, x, y );
+               const bgr_t *ptr3 = PIXELADDR3( source, x, y );
+               GLuint i;
                for (i=0;i<n;i++) {
                   rgba[i][RCOMP] = ptr3[i].r;
                   rgba[i][GCOMP] = ptr3[i].g;
@@ -4498,7 +4671,8 @@
 	    break;
          case PF_HPCR:
             {
-               GLubyte *ptr1 = PIXELADDR1( source, x, y );
+               const GLubyte *ptr1 = PIXELADDR1( source, x, y );
+               GLuint i;
                for (i=0;i<n;i++) {
                   GLubyte p = *ptr1++;
                   rgba[i][RCOMP] =  p & 0xE0;
@@ -4512,11 +4686,12 @@
 	 case PF_LOOKUP:
 	 case PF_GRAYSCALE:
             {
-               GLubyte *rTable = source->pixel_to_r;
-               GLubyte *gTable = source->pixel_to_g;
-               GLubyte *bTable = source->pixel_to_b;
+               const GLubyte *rTable = source->pixel_to_r;
+               const GLubyte *gTable = source->pixel_to_g;
+               const GLubyte *bTable = source->pixel_to_b;
                if (GET_VISUAL_DEPTH(xmesa->xm_visual)==8) {
                   GLubyte *ptr1 = PIXELADDR1( source, x, y );
+                  GLuint i;
                   for (i=0;i<n;i++) {
                      unsigned long p = *ptr1++;
                      rgba[i][RCOMP] = rTable[p];
@@ -4527,10 +4702,10 @@
                }
                else {
                   XMesaImage *img = source->backimage;
+                  GLuint i;
                   y = FLIP(source, y);
                   for (i=0;i<n;i++,x++) {
-                     unsigned long p;
-		     p = XMesaGetPixel( img, x, y );
+                     unsigned long p = XMesaGetPixel( img, x, y );
                      rgba[i][RCOMP] = rTable[p];
                      rgba[i][GCOMP] = gTable[p];
                      rgba[i][BCOMP] = bTable[p];
@@ -4543,6 +4718,7 @@
             {
                XMesaImage *img = source->backimage;
                int bitFlip = xmesa->xm_visual->bitFlip;
+               GLuint i;
                y = FLIP(source, y);
                for (i=0;i<n;i++,x++) {
                   unsigned long p;
@@ -4934,7 +5110,6 @@
          return NULL;
    }
 }
-
 
 
 static void update_span_funcs( GLcontext *ctx )
Index: xc/extras/Mesa/src/X/xmesa3.c
diff -u xc/extras/Mesa/src/X/xmesa3.c:1.3 xc/extras/Mesa/src/X/xmesa3.c:1.4
--- xc/extras/Mesa/src/X/xmesa3.c:1.3	Mon Feb 14 23:13:16 2000
+++ xc/extras/Mesa/src/X/xmesa3.c	Fri Jun 16 17:02:39 2000
@@ -66,7 +66,7 @@
             register int x, y;
 	    const GLubyte *color = VB->ColorPtr->data[i];
             unsigned long pixel = xmesa_color_to_pixel( xmesa,
-				      color[0], color[1], color[2], color[3] );
+                          color[0], color[1], color[2], color[3], xmesa->pixelformat);
             XMesaSetForeground( dpy, gc, pixel );
             x =                         (GLint) VB->Win.data[i][0];
             y = FLIP( xmesa->xm_buffer, (GLint) VB->Win.data[i][1] );
@@ -131,7 +131,8 @@
    unsigned long pixel;
    if (xmesa->xm_visual->gl_visual->RGBAflag) {
       const GLubyte *color = VB->ColorPtr->data[pv];
-      pixel = xmesa_color_to_pixel( xmesa, color[0], color[1], color[2], color[3] );
+      pixel = xmesa_color_to_pixel( xmesa, color[0], color[1], color[2], color[3],
+                                    xmesa->pixelformat );
    }
    else {
       pixel = VB->IndexPtr->data[pv];
@@ -353,6 +354,7 @@
 
 #define INTERP_XY 1
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define CLIP_HACK 1
 #define PLOT(X,Y)							\
 	if (Z < *zPtr) {						\
@@ -375,6 +377,7 @@
    GLuint pixel = PACK_8B8G8R( color[0], color[1], color[2] );
 
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_TYPE GLuint
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
 #define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
@@ -400,6 +403,7 @@
    GLuint pixel = PACK_8R8G8B( color[0], color[1], color[2] );
 
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_TYPE GLuint
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
 #define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
@@ -424,6 +428,7 @@
    const GLubyte *color = ctx->VB->ColorPtr->data[pv];
 
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_TYPE bgr_t
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
 #define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
@@ -451,6 +456,7 @@
    GLushort pixel = PACK_5R6G5B( color[0], color[1], color[2] );
 
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_TYPE GLushort
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
 #define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
@@ -474,6 +480,7 @@
    const GLubyte *color = ctx->VB->ColorPtr->data[pv];
 
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_TYPE GLushort
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
 #define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
@@ -500,6 +507,7 @@
 
 #define INTERP_XY 1
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_TYPE GLubyte
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
@@ -526,6 +534,7 @@
    pixel = (GLubyte) LOOKUP( color[0], color[1], color[2] );
 
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_TYPE GLubyte
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
@@ -552,6 +561,7 @@
 
 #define INTERP_XY 1
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_TYPE GLubyte
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
@@ -670,6 +680,7 @@
        && ctx->RasterMask==DEPTH_BIT
        && ctx->Depth.Func==GL_LESS
        && ctx->Depth.Mask==GL_TRUE
+       && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS
        && ctx->Line.Width==1.0F) {
       switch (xmesa->pixelformat) {
          case PF_TRUECOLOR:
Index: xc/extras/Mesa/src/X/xmesa4.c
diff -u xc/extras/Mesa/src/X/xmesa4.c:1.3 xc/extras/Mesa/src/X/xmesa4.c:1.4
--- xc/extras/Mesa/src/X/xmesa4.c:1.3	Mon Feb 14 23:13:16 2000
+++ xc/extras/Mesa/src/X/xmesa4.c	Fri Jun 16 17:02:39 2000
@@ -66,8 +66,9 @@
       unsigned long pixel;
       if (xmesa->xm_visual->gl_visual->RGBAflag) {
          pixel = xmesa_color_to_pixel( xmesa,
-                                       VB->ColorPtr->data[pv][0], VB->ColorPtr->data[pv][1],
-                                       VB->ColorPtr->data[pv][2], VB->ColorPtr->data[pv][3] );
+                         VB->ColorPtr->data[pv][0], VB->ColorPtr->data[pv][1],
+                         VB->ColorPtr->data[pv][2], VB->ColorPtr->data[pv][3],
+                         xmesa->pixelformat );
       }
       else {
          pixel = VB->IndexPtr->data[pv];
@@ -97,6 +98,7 @@
    XMesaImage *img = xmesa->xm_buffer->backimage;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INNER_LOOP( LEFT, RIGHT, Y )					\
 {									\
@@ -129,6 +131,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLuint
@@ -161,6 +164,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLuint
@@ -193,6 +197,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE bgr_t
@@ -228,6 +233,7 @@
    XMesaImage *img = xmesa->xm_buffer->backimage;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define INNER_LOOP( LEFT, RIGHT, Y )					\
 {									\
@@ -259,6 +265,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLushort
@@ -267,7 +274,7 @@
 {									\
    GLint i, len = RIGHT-LEFT;						\
    for (i=0;i<len;i++) {						\
-      GLdepth z = FixedToDepth(ffz);					\
+      DEPTH_TYPE z = FixedToDepth(ffz);					\
       if (z < zRow[i]) {						\
          pRow[i] = PACK_5R6G5B( FixedToInt(ffr), FixedToInt(ffg),	\
 				 FixedToInt(ffb) );			\
@@ -291,6 +298,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLushort
@@ -323,6 +331,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLubyte
@@ -357,6 +366,7 @@
    XMesaImage *img = xmesa->xm_buffer->backimage;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLubyte
@@ -390,6 +400,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLubyte
@@ -423,6 +434,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    (void) pv;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLubyte
@@ -455,6 +467,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    XMesaImage *img = xmesa->xm_buffer->backimage;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define SETUP_CODE						\
    unsigned long pixel;						\
    PACK_TRUECOLOR(pixel, VB->ColorPtr->data[pv][0], VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2]);
@@ -483,6 +496,7 @@
 {
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLuint
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
@@ -513,6 +527,7 @@
 {
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLuint
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
@@ -544,6 +559,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    const GLubyte *color = ctx->VB->ColorPtr->data[pv];
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE bgr_t
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
@@ -575,6 +591,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    XMesaImage *img = xmesa->xm_buffer->backimage;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INNER_LOOP( LEFT, RIGHT, Y )					\
 {									\
    GLint i, xx = LEFT, yy = FLIP(xmesa->xm_buffer,Y), len = RIGHT-LEFT;	\
@@ -602,6 +619,7 @@
 {
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLushort
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
@@ -612,7 +630,7 @@
 {							\
    GLint i, len = RIGHT-LEFT;				\
    for (i=0;i<len;i++) {				\
-      GLdepth z = FixedToDepth(ffz);			\
+      DEPTH_TYPE z = FixedToDepth(ffz);			\
       if (z < zRow[i]) {				\
 	 pRow[i] = (PIXEL_TYPE) p;			\
          zRow[i] = z;					\
@@ -633,6 +651,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    const GLubyte *color = ctx->VB->ColorPtr->data[pv];
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLushort
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
@@ -640,7 +659,7 @@
 {								\
    GLint i, len = RIGHT-LEFT;					\
    for (i=0;i<len;i++) {					\
-      GLdepth z = FixedToDepth(ffz);				\
+      DEPTH_TYPE z = FixedToDepth(ffz);				\
       if (z < zRow[i]) {					\
 	 PACK_TRUEDITHER(pRow[i], LEFT+i, Y, color[RCOMP],	\
 			 color[GCOMP], color[BCOMP]);		\
@@ -661,6 +680,7 @@
 {
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLubyte
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
@@ -693,6 +713,7 @@
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
    XMesaImage *img = xmesa->xm_buffer->backimage;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define SETUP_CODE	\
    FLAT_DITHER_SETUP( VB->ColorPtr->data[pv][0], VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2] );
 
@@ -722,6 +743,7 @@
 {
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLubyte
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
@@ -753,6 +775,7 @@
 {
    XMesaContext xmesa = (XMesaContext) ctx->DriverCtx;
 #define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
 #define PIXEL_TYPE GLubyte
 #define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
@@ -1432,6 +1455,7 @@
           && ctx->RasterMask==DEPTH_BIT
           && ctx->Depth.Func==GL_LESS
           && ctx->Depth.Mask==GL_TRUE
+          && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS
           && ctx->Polygon.StippleFlag==GL_FALSE) {
          switch (xmesa->pixelformat) {
             case PF_TRUECOLOR:
@@ -1463,6 +1487,7 @@
           && ctx->RasterMask==DEPTH_BIT
           && ctx->Depth.Func==GL_LESS
           && ctx->Depth.Mask==GL_TRUE
+          && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS
           && ctx->Polygon.StippleFlag==GL_FALSE) {
          switch (xmesa->pixelformat) {
             case PF_TRUECOLOR:
Index: xc/extras/Mesa/src/X/xmesaP.h
diff -u xc/extras/Mesa/src/X/xmesaP.h:1.4 xc/extras/Mesa/src/X/xmesaP.h:1.5
--- xc/extras/Mesa/src/X/xmesaP.h:1.4	Thu Mar  2 08:07:26 2000
+++ xc/extras/Mesa/src/X/xmesaP.h	Fri Jun 16 17:02:39 2000
@@ -85,6 +85,7 @@
    GLint BitsPerPixel;		/* True bits per pixel for XImages */
 
    GLint level;			/* 0=normal, 1=overlay, etc */
+   GLint VisualCaveat;          /* for GLX_EXT_visual_rating extension */
 
    GLboolean ximage_flag;	/* Use XImage for back buffer (not pixmap)? */
 
@@ -510,8 +511,9 @@
  * External functions:
  */
 
-extern unsigned long xmesa_color_to_pixel( XMesaContext xmesa,
-		                  GLubyte r, GLubyte g, GLubyte b, GLubyte a );
+extern unsigned long
+xmesa_color_to_pixel( XMesaContext xmesa, GLubyte r, GLubyte g, GLubyte b, GLubyte a,
+                      GLuint pixelFormat );
 
 extern void xmesa_alloc_back_buffer( XMesaBuffer b );
 
Index: xc/extras/Mesa/src/X86/3dnow.c
diff -u xc/extras/Mesa/src/X86/3dnow.c:1.3 xc/extras/Mesa/src/X86/3dnow.c:1.4
--- xc/extras/Mesa/src/X86/3dnow.c:1.3	Mon Feb 14 23:13:18 2000
+++ xc/extras/Mesa/src/X86/3dnow.c	Fri Jun 16 17:02:40 2000
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -184,5 +184,14 @@
    gl_project_v16 = gl_3dnow_project_vertices;
    gl_project_clipped_v16 = gl_3dnow_project_clipped_vertices;
 } 
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_3dnow_dummy_function(void);
+void _mesa_3dnow_dummy_function(void)
+{
+}
 
 #endif
Index: xc/extras/Mesa/src/X86/3dnow_norm_raw.S
diff -u xc/extras/Mesa/src/X86/3dnow_norm_raw.S:1.1 xc/extras/Mesa/src/X86/3dnow_norm_raw.S:1.2
--- xc/extras/Mesa/src/X86/3dnow_norm_raw.S:1.1	Mon Dec 13 17:32:14 1999
+++ xc/extras/Mesa/src/X86/3dnow_norm_raw.S	Fri Jun 16 17:02:41 2000
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,12 +30,6 @@
 #include "assyntax.h"
 
         SEG_TEXT
-
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
 
 
 
Index: xc/extras/Mesa/src/X86/3dnow_xform_masked1.S
diff -u xc/extras/Mesa/src/X86/3dnow_xform_masked1.S:1.1 xc/extras/Mesa/src/X86/3dnow_xform_masked1.S:1.2
--- xc/extras/Mesa/src/X86/3dnow_xform_masked1.S:1.1	Mon Dec 13 17:32:14 1999
+++ xc/extras/Mesa/src/X86/3dnow_xform_masked1.S	Fri Jun 16 17:02:41 2000
@@ -3,16 +3,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
-
-
-
-
 ALIGNTEXT16
 GLOBL GLNAME(gl_3dnow_transform_points1_general_masked)
 GLNAME( gl_3dnow_transform_points1_general_masked ):
@@ -51,13 +41,13 @@
     MOVQ      ( REGOFF(56, ECX), MM3 )  /* m33           | m32                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPGM_4 ) )
+    JE        ( LLBL(G3TPGM_4) )
 
 
 ALIGNTEXT32
-LLBL( G3TPGM_2 ):
+LLBL(G3TPGM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPGM_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TPGM_3) )      /* skip vertex                        */
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PUNPCKLDQ ( MM4, MM4 )              /* x0            | x0                 */
@@ -73,16 +63,16 @@
 
     MOVQ      ( MM5, REGOFF(8, EDX) )   /* write r3, r2                       */
 
-LLBL( G3TPGM_3 ):
+LLBL(G3TPGM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TPGM_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPGM_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPGM_4 ):
+LLBL(G3TPGM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -128,23 +118,23 @@
 
 ALIGNTEXT32
 
-LLBL( G3TPIM_2 ):
+LLBL(G3TPIM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPIM_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPIM_3)              /* skip vertex                        */ )
 
     MOVD      ( REGIND(EAX), MM0 )      /*               | x0                 */
     MOVD      ( MM0, REGIND(EDX) )      /*               | r0                 */
 
-LLBL( G3TPIM_3 ):
+LLBL(G3TPIM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPIM_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPIM_2)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TPIM_4 ):
+LLBL(G3TPIM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -192,14 +182,14 @@
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2M_4 ) )
+    JE        ( LLBL(G3TP2M_4) )
 
 
 ALIGNTEXT32
 
-LLBL( G3TP2M_2 ):
+LLBL(G3TP2M_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP2M_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TP2M_3) )      /* skip vertex                        */
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PUNPCKLDQ ( MM4, MM4 )              /* x0            | x0                 */
@@ -209,16 +199,16 @@
 
     MOVQ      ( MM4, REGIND(EDX) )      /* write r1, r0                       */
 
-LLBL( G3TP2M_3 ):
+LLBL(G3TP2M_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     INC_L     ( EBP )                   /* next clipmask                      */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TP2M_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2M_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP2M_4 ):
+LLBL(G3TP2M_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -267,14 +257,14 @@
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2NRM_4 ) )
+    JE        ( LLBL(G3TP2NRM_4) )
 
 
 ALIGNTEXT32
 
-LLBL( G3TP2NRM_2 ):
+LLBL(G3TP2NRM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP2NRM_3 )            /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP2NRM_3)            /* skip vertex                        */ )
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PFMUL     ( MM0, MM4 )              /*               | x0*m00             */
@@ -282,16 +272,16 @@
     PFADD     ( MM2, MM4 )              /* m31           | x0*m00+m30         */
     MOVQ      ( MM4, REGIND(EDX) )      /* write r1, r0                       */
 
-LLBL( G3TP2NRM_3 ):
+LLBL(G3TP2NRM_3):
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2NRM_2 )            /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP2NRM_2)            /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP2NRM_4 ):
+LLBL(G3TP2NRM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -342,13 +332,13 @@
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3M_4 ) )
+    JE        ( LLBL(G3TP3M_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP3M_2 ):
+LLBL(G3TP3M_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3M_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP3M_3)              /* skip vertex                        */ )
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PUNPCKLDQ ( MM4, MM4 )              /* x0            | x0                 */
@@ -364,16 +354,16 @@
 
     MOVD      ( MM5, REGOFF(8, EDX) )   /* write r2                           */
 
-LLBL( G3TP3M_3 ):
+LLBL(G3TP3M_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     INC_L     ( EBP )                   /* next clipmask                      */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TP3M_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP3M_2)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP3M_4 ):
+LLBL(G3TP3M_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -423,13 +413,13 @@
 
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3NRM_4 ) )
+    JE        ( LLBL(G3TP3NRM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP3NRM_2 ):
+LLBL(G3TP3NRM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3NRM_3 )            /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP3NRM_3)            /* skip vertex                        */ )
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PFMUL     ( MM0, MM4 )              /*               | x0*m00             */
@@ -439,16 +429,16 @@
 
     MOVD      ( MM3, REGOFF(8, EDX) )   /* write r2                           */
 
-LLBL( G3TP3NRM_3 ):
+LLBL(G3TP3NRM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     INC_L     ( EBP )                   /* next clipmask                      */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TP3NRM_2 )            /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP3NRM_2)            /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP3NRM_4 ):
+LLBL(G3TP3NRM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -496,13 +486,13 @@
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPPM_4 ) )
+    JE        ( LLBL(G3TPPM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TPPM_2 ):
+LLBL(G3TPPM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPPM_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPPM_3)              /* skip vertex                        */ )
 
     MOVD      ( REGIND(EAX), MM4 )      /* 0             | x0                 */
     PFMUL     ( MM0, MM4 )              /* 0             | x0*m00             */
@@ -510,16 +500,16 @@
     MOVQ      ( MM4, REGIND(EDX) )      /* write r1, r0                       */
     MOVQ      ( MM3, REGOFF(8, EDX) )   /* write r2  (=m32), r3 (=0)          */
 
-LLBL( G3TPPM_3 ):
+LLBL(G3TPPM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPPM_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPPM_2)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TPPM_4 ):
+LLBL(G3TPPM_4):
     FEMMS
 
     POP_L     ( EBP )
Index: xc/extras/Mesa/src/X86/3dnow_xform_masked2.S
diff -u xc/extras/Mesa/src/X86/3dnow_xform_masked2.S:1.1 xc/extras/Mesa/src/X86/3dnow_xform_masked2.S:1.2
--- xc/extras/Mesa/src/X86/3dnow_xform_masked2.S:1.1	Mon Dec 13 17:32:16 1999
+++ xc/extras/Mesa/src/X86/3dnow_xform_masked2.S	Fri Jun 16 17:02:41 2000
@@ -2,14 +2,7 @@
 
    SEG_TEXT
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
 
-
-
 ALIGNTEXT16
 GLOBL GLNAME(gl_3dnow_transform_points2_general_masked)
 GLNAME( gl_3dnow_transform_points2_general_masked ):
@@ -64,13 +57,13 @@
     MOVQ      ( REGOFF(56, ECX), MM5 )  /* m33           | m32                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPGM_4 ) )
+    JE        ( LLBL(G3TPGM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TPGM_2 ):
+LLBL(G3TPGM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPGM_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TPGM_3) )      /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM6 )      /* x1            | x0                 */
     MOVQ      ( MM6, MM7 )              /* x1            | x0                 */
@@ -93,16 +86,16 @@
     PFADD     ( MM5, MM6 )              /* x0*...*m13+m33| x0*x02+x1*m12+m32  */
     MOVQ      ( MM6, REGOFF(8, EDX) )   /* write r3, r2                       */
 
-LLBL( G3TPGM_3 ):
+LLBL(G3TPGM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPGM_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPGM_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPGM_4 ):
+LLBL(G3TPGM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -149,23 +142,23 @@
 
 ALIGNTEXT32
 
-LLBL( G3TPIM_2 ):
+LLBL(G3TPIM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPIM_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TPIM_3) )      /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM0 )      /* x1            | x0                 */
     MOVQ      ( MM0, REGIND(EDX) )      /* r1            | r0                 */
 
-LLBL( G3TPIM_3 ):
+LLBL(G3TPIM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPIM_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPIM_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPIM_4 ):
+LLBL(G3TPIM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -214,13 +207,13 @@
 
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2M_4 ) )
+    JE        ( LLBL(G3TP2M_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP2M_2 ):
+LLBL(G3TP2M_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP2M_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TP2M_3) )      /* skip vertex                        */
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     MOVD      ( REGOFF(4, EAX), MM5 )   /*               | x1                 */
@@ -236,16 +229,16 @@
 
     MOVQ      ( MM4, REGIND(EDX) )      /* write r1, r0                       */
 
-LLBL( G3TP2M_3 ):
+LLBL(G3TP2M_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TP2M_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2M_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP2M_4 ):
+LLBL(G3TP2M_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -298,13 +291,13 @@
 
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2NRM_4 ) )
+    JE        ( LLBL(G3TP2NRM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP2NRM_2 ):
+LLBL(G3TP2NRM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP2NRM_3 ) )    /* skip vertex                        */
+    JNZ       ( LLBL(G3TP2NRM_3) )    /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     PFMUL     ( MM0, MM4 )              /* x1*m11        | x0*m00             */
@@ -312,16 +305,16 @@
     PFADD     ( MM2, MM4 )              /* m31           | x0*m00+m30         */
     MOVQ      ( MM4, REGIND(EDX) )      /* write r1, r0                       */
 
-LLBL( G3TP2NRM_3 ):
+LLBL(G3TP2NRM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2NRM_2 )            /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP2NRM_2)            /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP2NRM_4 ):
+LLBL(G3TP2NRM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -385,13 +378,13 @@
     MOVD      ( REGOFF(56, ECX), MM5 )  /*               | m32                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3M_4 ) )
+    JE        ( LLBL(G3TP3M_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP3M_2 ):
+LLBL(G3TP3M_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3M_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TP3M_3) )      /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM6 )      /* x1            | x0                 */
     MOVQ      ( MM6, MM7 )              /* x1            | x0                 */
@@ -413,16 +406,16 @@
     PFADD     ( MM5, MM6 )              /* ***trash***   | x0*x02+x1*m12+m32  */
     MOVD      ( MM6, REGOFF(8, EDX) )   /* write r2                           */
 
-LLBL( G3TP3M_3 ):
+LLBL(G3TP3M_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3M_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP3M_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP3M_4 ):
+LLBL(G3TP3M_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -476,13 +469,13 @@
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3NRM_4 ) )
+    JE        ( LLBL(G3TP3NRM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP3NRM_2 ):
+LLBL(G3TP3NRM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3NRM_3 ) )    /* skip vertex                        */
+    JNZ       ( LLBL(G3TP3NRM_3) )    /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     PFMUL     ( MM0, MM4 )              /* x1*m11        | x0*m00             */
@@ -492,16 +485,16 @@
 
     MOVD      ( MM3, REGOFF(8, EDX) )   /* write r2                           */
 
-LLBL( G3TP3NRM_3 ):
+LLBL(G3TP3NRM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3NRM_2 ) )    /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP3NRM_2) )    /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP3NRM_4 ):
+LLBL(G3TP3NRM_4):
 
     FEMMS
 
@@ -554,14 +547,14 @@
 
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPPM_4 ) )
+    JE        ( LLBL(G3TPPM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TPPM_2 ):
+LLBL(G3TPPM_2):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPPM_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TPPM_3) )      /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     PFMUL     ( MM0, MM4 )              /* x1*m11        | x0*m00             */
@@ -569,16 +562,16 @@
     MOVQ      ( MM4, REGIND(EDX) )      /* write r1, r0                       */
     MOVQ      ( MM3, REGOFF(8, EDX) )   /* write r2  (=m32), r3 (=0)          */
 
-LLBL( G3TPPM_3 ):
+LLBL(G3TPPM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPPM_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPPM_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPPM_4 ):
+LLBL(G3TPPM_4):
     FEMMS
 
     POP_L     ( EBP )
Index: xc/extras/Mesa/src/X86/3dnow_xform_masked3.S
diff -u xc/extras/Mesa/src/X86/3dnow_xform_masked3.S:1.1 xc/extras/Mesa/src/X86/3dnow_xform_masked3.S:1.2
--- xc/extras/Mesa/src/X86/3dnow_xform_masked3.S:1.1	Mon Dec 13 17:32:16 1999
+++ xc/extras/Mesa/src/X86/3dnow_xform_masked3.S	Fri Jun 16 17:02:41 2000
@@ -3,17 +3,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
-
-
-
-
-
 ALIGNTEXT16
 GLOBL GLNAME(gl_3dnow_transform_points3_general_masked)
 GLNAME( gl_3dnow_transform_points3_general_masked ):
@@ -60,7 +49,7 @@
     MOVQ      ( REGOFF(48, ECX), MM3 )  /* m31           | m30                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPGM_6 ) )
+    JE        ( LLBL(G3TPGM_6) )
 
     PUSH_L    ( EBP )
     PUSH_L    ( EAX )
@@ -69,10 +58,10 @@
 
 
 ALIGNTEXT32
-LLBL( G3TPGM_2 ):
+LLBL(G3TPGM_2):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPGM_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPGM_3)          /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVD      ( REGOFF(8, EAX), MM6 )   /*               | x2                 */
@@ -91,14 +80,14 @@
 
     MOVQ      ( MM6, REGIND(EDX) )      /* write r0, r1                       */
 
-LLBL( G3TPGM_3 ):
+LLBL(G3TPGM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPGM_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPGM_2)          /* cnt > 0 ? -> process next vertex   */ )
                                         /* and now the second stripe ...      */
 
     POP_L     ( ESI )                   /* reset counter & pointers           */
@@ -123,9 +112,9 @@
 
 
 ALIGNTEXT32
-LLBL( G3TPGM_4 ):
+LLBL(G3TPGM_4):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPGM_5 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPGM_5)          /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVD      ( REGOFF(8, EAX), MM6 )   /*               | x2                 */
@@ -144,16 +133,16 @@
 
     MOVQ      ( MM6, REGOFF(8, EDX) )   /* write r2, r3                       */
 
-LLBL( G3TPGM_5 ):
+LLBL(G3TPGM_5):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPGM_4 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPGM_4)          /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TPGM_6 ):
+LLBL(G3TPGM_6):
 
     FEMMS
 
@@ -202,10 +191,10 @@
 
 
 ALIGNTEXT32
-LLBL( G3TPIM_2 ):
+LLBL(G3TPIM_2):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPIM_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPIM_3)          /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM0 )      /* x1            | x0                 */
     MOVD      ( REGOFF(8, EAX), MM1 )   /*               | x2                 */
@@ -213,16 +202,16 @@
     MOVQ      ( MM0, REGIND(EDX) )      /* r1            | r0                 */
     MOVD      ( MM1, REGOFF(8, EDX) )   /*               | r2                 */
 
-LLBL( G3TPIM_3 ):
+LLBL(G3TPIM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPIM_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPIM_2)          /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TPIM_4 ):
+LLBL(G3TPIM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -279,14 +268,14 @@
 
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2M_4 ) )
+    JE        ( LLBL(G3TP2M_4) )
 
 
 ALIGNTEXT32
-LLBL( G3TP2M_2 ):
+LLBL(G3TP2M_2):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP2M_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP2M_3)          /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM3 )      /* x1            | x0                 */
     MOVQ      ( MM3, MM4 )              /* x1            | x0                 */
@@ -302,16 +291,16 @@
 
     MOVD      ( MM5, REGOFF(8, EDX) )   /* write r2 (=x2)                     */
 
-LLBL( G3TP2M_3 ):
+LLBL(G3TP2M_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2M_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP2M_2)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP2M_4 ):
+LLBL(G3TP2M_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -363,14 +352,14 @@
 
     MOVQ      ( REGOFF(48, ECX), MM1 )  /* m31           | m30                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2NRM_4 ) )
+    JE        ( LLBL(G3TP2NRM_4) )
 
 
 ALIGNTEXT32
-LLBL( G3TP2NRM_2 ):
+LLBL(G3TP2NRM_2):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP2NRM_3 )            /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP2NRM_3)            /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVD      ( REGOFF(8, EAX), MM5 )   /*               | x2                 */
@@ -381,16 +370,16 @@
     PFADD     ( MM1, MM4 )              /* x1*m11+m31    | x0*m00+m30         */
     MOVQ      ( MM4, REGIND(EDX) )      /* write r0, r1                       */
 
-LLBL( G3TP2NRM_3 ):
+LLBL(G3TP2NRM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2NRM_2 )            /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP2NRM_2)            /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP2NRM_4 ):
+LLBL(G3TP2NRM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -450,7 +439,7 @@
     MOVQ      ( REGOFF(32, ECX), MM2 )  /* m21           | m20                */
     MOVQ      ( REGOFF(48, ECX), MM3 )  /* m31           | m30                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3M_6 ) )
+    JE        ( LLBL(G3TP3M_6) )
 
     PUSH_L    ( EBP )
     PUSH_L    ( EAX )
@@ -459,10 +448,10 @@
 
 
 ALIGNTEXT32
-LLBL( G3TP3M_2 ):
+LLBL(G3TP3M_2):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3M_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP3M_3)              /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( MM4, MM5 )              /* x1            | x0                 */
@@ -481,14 +470,14 @@
 
     MOVQ      ( MM6, REGIND(EDX) )      /* write r0, r1                       */
 
-LLBL( G3TP3M_3 ):
+LLBL(G3TP3M_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3M_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP3M_2)              /* cnt > 0 ? -> process next vertex   */ )
                                         /* and now the second stripe ...      */
     MOVD      ( REGOFF(8, ECX), MM0 )   /*               | m02                */
 
@@ -508,10 +497,10 @@
 
 
 ALIGNTEXT32
-LLBL( G3TP3M_4 ):
+LLBL(G3TP3M_4):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3M_5 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP3M_5)              /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( MM4, MM5 )              /* x1            | x0                 */
@@ -528,16 +517,16 @@
     PFADD     ( MM4, MM6 )              /*               | r2                 */
     MOVD      ( MM6, REGOFF(8, EDX) )   /* write r2                           */
 
-LLBL( G3TP3M_5 ):
+LLBL(G3TP3M_5):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3M_4 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP3M_4)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP3M_6 ):
+LLBL(G3TP3M_6):
     FEMMS
 
     POP_L     ( EBP )
@@ -597,14 +586,14 @@
 
     PUNPCKLDQ ( MM3, MM3 )              /* m32           | m32                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3NRM_4 ) )
+    JE        ( LLBL(G3TP3NRM_4) )
 
 
 ALIGNTEXT32
-LLBL( G3TP3NRM_2 ):
+LLBL(G3TP3NRM_2):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3NRM_3 )            /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP3NRM_3)            /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVD      ( REGOFF(8, EAX), MM5 )   /*               | x2                 */
@@ -618,16 +607,16 @@
     MOVQ      ( MM4, REGIND(EDX) )      /* write r0, r1                       */
     MOVD      ( MM5, REGOFF(8, EDX) )   /* write r2                           */
 
-LLBL( G3TP3NRM_3 ):
+LLBL(G3TP3NRM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3NRM_2 )            /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP3NRM_2)            /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP3NRM_4 ):
+LLBL(G3TP3NRM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -682,14 +671,14 @@
 
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPPM_4 ) )
+    JE        ( LLBL(G3TPPM_4) )
 
 
 ALIGNTEXT32
-LLBL( G3TPPM_2 ):
+LLBL(G3TPPM_2):
 
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPPM_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPPM_3)              /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVD      ( REGOFF(8, EAX), MM5 )   /*               | x2                 */
@@ -712,16 +701,16 @@
     MOVD      ( MM5, REGOFF(8, EDX) )   /* write r2                           */
     MOVD      ( MM6, REGOFF(12, EDX) )  /* write r3                           */
 
-LLBL( G3TPPM_3 ):
+LLBL(G3TPPM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPPM_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPPM_2)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TPPM_4 ):
+LLBL(G3TPPM_4):
     FEMMS
 
     POP_L     ( EBP )
Index: xc/extras/Mesa/src/X86/3dnow_xform_masked4.S
diff -u xc/extras/Mesa/src/X86/3dnow_xform_masked4.S:1.1 xc/extras/Mesa/src/X86/3dnow_xform_masked4.S:1.2
--- xc/extras/Mesa/src/X86/3dnow_xform_masked4.S:1.1	Mon Dec 13 17:32:16 1999
+++ xc/extras/Mesa/src/X86/3dnow_xform_masked4.S	Fri Jun 16 17:02:41 2000
@@ -2,16 +2,6 @@
 
    SEG_TEXT
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
-
-
-
-
 ALIGNTEXT16
 GLOBL GLNAME(gl_3dnow_transform_points4_general_masked)
 GLNAME( gl_3dnow_transform_points4_general_masked ):
@@ -67,7 +57,7 @@
     POR       ( MM7, MM3 )              /* m31           | m21                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPGM_6 ) )
+    JE        ( LLBL(G3TPGM_6) )
 
     PUSH_L    ( EBP )
     PUSH_L    ( EAX )
@@ -76,9 +66,9 @@
 
 ALIGNTEXT32
 
-LLBL( G3TPGM_2 ):
+LLBL(G3TPGM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPGM_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPGM_3)              /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( MM4, MM5 )              /* x1            | x0                 */
@@ -98,14 +88,14 @@
     PFADD     ( MM4, MM6 )              /* r1            | r0                 */
     MOVQ      ( MM6, REGIND(EDX) )      /* write r0, r1                       */
 
-LLBL( G3TPGM_3 ):
+LLBL(G3TPGM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPGM_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPGM_2)              /* cnt > 0 ? -> process next vertex   */ )
                                         /* and now the second stripe ...      */
     MOVD      ( REGOFF(8, ECX), MM0 )   /*               | m02                */
     MOVD      ( REGOFF(24, ECX), MM7 )  /*               | m12                */
@@ -138,9 +128,9 @@
 
 ALIGNTEXT32
 
-LLBL( G3TPGM_4 ):
+LLBL(G3TPGM_4):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPGM_5 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPGM_5)              /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( MM4, MM5 )              /* x1            | x0                 */
@@ -160,16 +150,16 @@
     PFADD     ( MM4, MM6 )              /* r3            | r2                 */
     MOVQ      ( MM6, REGOFF(8, EDX) )   /* write r2, r3                       */
 
-LLBL( G3TPGM_5 ):
+LLBL(G3TPGM_5):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPGM_4 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPGM_4)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TPGM_6 ):
+LLBL(G3TPGM_6):
     FEMMS
 
     POP_L     ( EBP )
@@ -216,9 +206,9 @@
 
 ALIGNTEXT32
 
-LLBL( G3TPIM_2 ):
+LLBL(G3TPIM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPIM_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TPIM_3)              /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM0 )      /* x1            | x0                 */
     MOVQ      ( MM0, REGIND(EDX) )      /* r1            | r0                 */
@@ -226,16 +216,16 @@
     MOVQ      ( REGOFF(8, EAX), MM1 )   /* x3            | x2                 */
     MOVQ      ( MM1, REGOFF(8, EDX) )   /* r3            | r2                 */
 
-LLBL( G3TPIM_3 ):
+LLBL(G3TPIM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPIM_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TPIM_2)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TPIM_4 ):
+LLBL(G3TPIM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -293,13 +283,13 @@
 
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2M_4 ) )
+    JE        ( LLBL(G3TP2M_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP2M_2 ):
+LLBL(G3TP2M_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP2M_3 )              /* skip vertex                        */ )
+    JNZ       ( LLBL(G3TP2M_3)              /* skip vertex                        */ )
 
     MOVQ      ( REGIND(EAX), MM3 )      /* x1            | x0                 */
     MOVQ      ( MM3, MM4 )              /* x1            | x0                 */
@@ -319,16 +309,16 @@
     MOVQ      ( MM3, REGIND(EDX) )      /* write r0, r1                       */
     MOVQ      ( MM5, REGOFF(8, EDX) )   /* write r2, r3                       */
 
-LLBL( G3TP2M_3 ):
+LLBL(G3TP2M_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2M_2 )              /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP2M_2)              /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP2M_4 ):
+LLBL(G3TP2M_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -380,13 +370,13 @@
 
     MOVQ      ( REGOFF(48, ECX), MM1 )  /* m31           | m30                */
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2NRM_4 ) )
+    JE        ( LLBL(G3TP2NRM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP2NRM_2 ):
+LLBL(G3TP2NRM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP2NRM_3 ) )    /* skip vertex                        */
+    JNZ       ( LLBL(G3TP2NRM_3) )    /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( REGOFF(8, EAX), MM5 )   /* x3            | x2                 */
@@ -402,16 +392,16 @@
 
     MOVQ      ( MM5, REGOFF(8, EDX) )   /* write r2, r3                       */
 
-LLBL( G3TP2NRM_3 ):
+LLBL(G3TP2NRM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2NRM_2 )            /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP2NRM_2)            /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP2NRM_4 ):
+LLBL(G3TP2NRM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -478,7 +468,7 @@
     POR       ( MM7, MM3 )              /* m31           | m21                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3M_6 ) )
+    JE        ( LLBL(G3TP3M_6) )
 
     PUSH_L    ( EBP )
     PUSH_L    ( EAX )
@@ -487,9 +477,9 @@
 
 ALIGNTEXT32
 
-LLBL( G3TP3M_2 ):
+LLBL(G3TP3M_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3M_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TP3M_3) )      /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( MM4, MM5 )              /* x1            | x0                 */
@@ -509,14 +499,14 @@
     PFADD     ( MM4, MM6 )              /* r1            | r0                 */
     MOVQ      ( MM6, REGIND(EDX) )      /* write r0, r1                       */
 
-LLBL( G3TP3M_3 ):
+LLBL(G3TP3M_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3M_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP3M_2) )      /* cnt > 0 ? -> process next vertex   */
                                         /* and now the second stripe ...      */
     MOVD      ( REGOFF(8, ECX), MM0 )   /*               | m02                */
     MOVD      ( REGOFF(24, ECX), MM7 )  /*               | m12                */
@@ -538,9 +528,9 @@
 
 ALIGNTEXT32
 
-LLBL( G3TP3M_4 ):
+LLBL(G3TP3M_4):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3M_5 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TP3M_5) )      /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( REGOFF(8, EAX), MM6 )   /* x3            | x2                 */
@@ -554,16 +544,16 @@
     PFACC     ( MM7, MM6 )              /* x3            | x2*m22+x3*m32      */
     MOVQ      ( MM6, REGOFF(8, EDX) )   /* write r2, r3                       */
 
-LLBL( G3TP3M_5 ):
+LLBL(G3TP3M_5):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3M_4 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP3M_4) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP3M_6 ):
+LLBL(G3TP3M_6):
     FEMMS
 
     POP_L     ( EBP )
@@ -623,13 +613,13 @@
     MOVQ      ( REGOFF(48, ECX), MM1 )  /* m31           | m30                */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3NRM_4 ) )
+    JE        ( LLBL(G3TP3NRM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TP3NRM_2 ):
+LLBL(G3TP3NRM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TP3NRM_3 ) )    /* skip vertex                        */
+    JNZ       ( LLBL(G3TP3NRM_3) )    /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( REGOFF(8, EAX), MM5 )   /* x3            | x2                 */
@@ -649,16 +639,16 @@
     MOVQ      ( MM4, REGIND(EDX) )      /* write r0, r1                       */
     MOVQ      ( MM5, REGOFF(8, EDX) )   /* write r2, r3                       */
 
-LLBL( G3TP3NRM_3 ):
+LLBL(G3TP3NRM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3NRM_2 )            /* cnt > 0 ? -> process next vertex   */ )
+    JA        ( LLBL(G3TP3NRM_2)            /* cnt > 0 ? -> process next vertex   */ )
 
-LLBL( G3TP3NRM_4 ):
+LLBL(G3TP3NRM_4):
     FEMMS
 
     POP_L     ( EBP )
@@ -718,13 +708,13 @@
     PUNPCKLDQ ( MM7, MM7 )              /* 0             | 0                  */
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPPM_4 ) )
+    JE        ( LLBL(G3TPPM_4) )
 
 ALIGNTEXT32
 
-LLBL( G3TPPM_2 ):
+LLBL(G3TPPM_2):
     TEST_B    ( BL, REGIND(EBP) )       /* mask [i] != clip flag ??           */
-    JNZ       ( LLBL( G3TPPM_3 ) )      /* skip vertex                        */
+    JNZ       ( LLBL(G3TPPM_3) )      /* skip vertex                        */
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     MOVQ      ( REGOFF(8, EAX), MM5 )   /* x3            | x2                 */
@@ -746,16 +736,16 @@
 
     MOVQ      ( MM6, REGOFF(8, EDX) )   /* write r2, r3                       */
 
-LLBL( G3TPPM_3 ):
+LLBL(G3TPPM_3):
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     INC_L     ( EBP )                   /* next clipmask                      */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPPM_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPPM_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPPM_4 ):
+LLBL(G3TPPM_4):
     FEMMS
 
     POP_L     ( EBP )
Index: xc/extras/Mesa/src/X86/3dnow_xform_raw1.S
diff -u xc/extras/Mesa/src/X86/3dnow_xform_raw1.S:1.1 xc/extras/Mesa/src/X86/3dnow_xform_raw1.S:1.2
--- xc/extras/Mesa/src/X86/3dnow_xform_raw1.S:1.1	Mon Dec 13 17:32:16 1999
+++ xc/extras/Mesa/src/X86/3dnow_xform_raw1.S	Fri Jun 16 17:02:41 2000
@@ -3,15 +3,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
-
-
-
 ALIGNTEXT16
 GLOBL GLNAME(gl_3dnow_transform_points1_general_raw)
 GLNAME(gl_3dnow_transform_points1_general_raw):
@@ -39,7 +30,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPGR_3 ) )
+    JE        ( LLBL(G3TPGR_3) )
 
     MOVQ      ( REGIND(ECX), MM0 )      /* m01           | m00                */
     MOVQ      ( REGOFF(8, ECX), MM1 )   /* m03           | m02                */
@@ -48,7 +39,7 @@
     MOVQ      ( REGOFF(56, ECX), MM3 )  /* m33           | m32                */
 
 ALIGNTEXT32
-LLBL( G3TPGR_2 ):
+LLBL(G3TPGR_2):
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PUNPCKLDQ ( MM4, MM4 )              /* x0            | x0                 */
@@ -68,9 +59,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPGR_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPGR_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPGR_3 ):
+LLBL(G3TPGR_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -110,9 +101,9 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPIR_4 ) )
+    JE        ( LLBL(G3TPIR_4) )
 
-LLBL( G3TPIR_3 ):
+LLBL(G3TPIR_3):
 
     MOVD      ( REGIND(EAX), MM0 )      /*               | x0                 */
     ADD_L     ( EDI, EAX )              /* next vertex                        */
@@ -121,9 +112,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TPIR_3 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPIR_3) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPIR_4 ):
+LLBL(G3TPIR_4):
     FEMMS
 
     POP_L     ( ESI )
@@ -162,14 +153,14 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2R_3 ) )
+    JE        ( LLBL(G3TP2R_3) )
 
     MOVQ      ( REGIND(ECX), MM0 )      /* m01           | m00                */
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
 
 
 ALIGNTEXT32
-LLBL( G3TP2R_2 ):
+LLBL(G3TP2R_2):
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PUNPCKLDQ ( MM4, MM4 )              /* x0            | x0                 */
@@ -183,9 +174,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2R_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2R_2) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP2R_3 ):
+LLBL(G3TP2R_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -225,14 +216,14 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2NRR_3 ) )
+    JE        ( LLBL(G3TP2NRR_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
 
 
 ALIGNTEXT32
-LLBL( G3TP2NRR_2 ):
+LLBL(G3TP2NRR_2):
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     ADD_L     ( EDI, EAX )              /* next vertex                        */
@@ -244,9 +235,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TP2NRR_2 ) )    /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2NRR_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP2NRR_3 ):
+LLBL(G3TP2NRR_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -286,7 +277,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3R_3 ) )
+    JE        ( LLBL(G3TP3R_3) )
 
     MOVQ      ( REGIND(ECX), MM0 )      /* m01           | m00                */
     MOVD      ( REGOFF(8, ECX), MM1 )   /*               | m02                */
@@ -296,7 +287,7 @@
 
 
 ALIGNTEXT32
-LLBL( G3TP3R_2 ):
+LLBL(G3TP3R_2):
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PUNPCKLDQ ( MM4, MM4 )              /* x0            | x0                 */
@@ -316,9 +307,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3R_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP3R_2) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP3R_3 ):
+LLBL(G3TP3R_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -358,7 +349,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3NRR_3 ) )
+    JE        ( LLBL(G3TP3NRR_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
@@ -366,7 +357,7 @@
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
 
 ALIGNTEXT32
-LLBL( G3TP3NRR_2 ):
+LLBL(G3TP3NRR_2):
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     PFMUL     ( MM0, MM4 )              /*               | x0*m00             */
@@ -380,9 +371,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3NRR_2 ) )    /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP3NRR_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP3NRR_3 ):
+LLBL(G3TP3NRR_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -422,13 +413,13 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPPR_3 ) )
+    JE        ( LLBL(G3TPPR_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
 
 ALIGNTEXT32
-LLBL( G3TPPR_2 ):
+LLBL(G3TPPR_2):
     MOVD      ( REGIND(EAX), MM4 )      /* 0             | x0                 */
     PFMUL     ( MM0, MM4 )              /* 0             | x0*m00             */
 
@@ -439,9 +430,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TPPR_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPPR_2) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPPR_3 ):
+LLBL(G3TPPR_3):
     FEMMS
 
     POP_L     ( ESI )
Index: xc/extras/Mesa/src/X86/3dnow_xform_raw2.S
diff -u xc/extras/Mesa/src/X86/3dnow_xform_raw2.S:1.1 xc/extras/Mesa/src/X86/3dnow_xform_raw2.S:1.2
--- xc/extras/Mesa/src/X86/3dnow_xform_raw2.S:1.1	Mon Dec 13 17:32:17 1999
+++ xc/extras/Mesa/src/X86/3dnow_xform_raw2.S	Fri Jun 16 17:02:41 2000
@@ -3,15 +3,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
-
-
-
 ALIGNTEXT16
 GLOBL GLNAME(gl_3dnow_transform_points2_general_raw)
 GLNAME(gl_3dnow_transform_points2_general_raw):
@@ -39,7 +30,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPGR_3 ) )
+    JE        ( LLBL(G3TPGR_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     PUNPCKLDQ ( REGOFF(16, ECX), MM0 )  /* m10           | m00                */
@@ -58,7 +49,7 @@
 
 
 ALIGNTEXT32
-LLBL( G3TPGR_2 ):
+LLBL(G3TPGR_2):
 
     MOVQ      ( REGIND(EAX), MM6 )      /* x1            | x0                 */
     MOVQ      ( MM6, MM7 )              /* x1            | x0                 */
@@ -85,9 +76,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TPGR_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPGR_2) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPGR_3 ):
+LLBL(G3TPGR_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -128,9 +119,9 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPIR_3 ) )
+    JE        ( LLBL(G3TPIR_3) )
 
-LLBL( G3TPIR_3 ):
+LLBL(G3TPIR_3):
     MOVQ      ( REGIND(EAX), MM0 )      /* x1            | x0                 */
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
@@ -138,9 +129,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TPIR_3 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPIR_3) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPIR_4 ):
+LLBL(G3TPIR_4):
     FEMMS
 
     POP_L     ( ESI )
@@ -179,7 +170,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2R_3 ) )
+    JE        ( LLBL(G3TP2R_3) )
 
     MOVQ      ( REGIND(ECX), MM0 )      /* m01           | m00                */
     MOVQ      ( REGOFF(16, ECX), MM1 )  /* m11           | m10                */
@@ -187,7 +178,7 @@
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
 
 ALIGNTEXT32
-LLBL( G3TP2R_2 ):
+LLBL(G3TP2R_2):
 
     MOVD      ( REGIND(EAX), MM4 )      /*               | x0                 */
     MOVD      ( REGOFF(4, EAX), MM5 )   /*               | x1                 */
@@ -207,9 +198,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2R_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2R_2) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP2R_3 ):
+LLBL(G3TP2R_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -248,7 +239,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2NRR_3 ) )
+    JE        ( LLBL(G3TP2NRR_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     PUNPCKLDQ ( REGOFF(20, ECX), MM0 )  /* m11           | m00                */
@@ -256,7 +247,7 @@
     MOVQ      ( REGOFF(48, ECX), MM2 )  /* m31           | m30                */
 
 ALIGNTEXT32
-LLBL( G3TP2NRR_2 ):
+LLBL(G3TP2NRR_2):
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     ADD_L     ( EDI, EAX )              /* next vertex                        */
@@ -268,9 +259,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TP2NRR_2 ) )    /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2NRR_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP2NRR_3 ):
+LLBL(G3TP2NRR_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -310,7 +301,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3R_3 ) )
+    JE        ( LLBL(G3TP3R_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     PUNPCKLDQ ( REGOFF(16, ECX), MM0 )  /* m10           | m00                */
@@ -326,7 +317,7 @@
 
 
 ALIGNTEXT32
-LLBL( G3TP3R_2 ):
+LLBL(G3TP3R_2):
 
     MOVQ      ( REGIND(EAX), MM6 )      /* x1            | x0                 */
     MOVQ      ( MM6, MM7 )              /* x1            | x0                 */
@@ -352,9 +343,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3R_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP3R_2) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP3R_3 ):
+LLBL(G3TP3R_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -393,7 +384,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3NRR_3 ) )
+    JE        ( LLBL(G3TP3NRR_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     PUNPCKLDQ ( REGOFF(20, ECX), MM0 )  /* m11           | m00                */
@@ -403,7 +394,7 @@
 
 
 ALIGNTEXT32
-LLBL( G3TP3NRR_2 ):
+LLBL(G3TP3NRR_2):
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     PFMUL     ( MM0, MM4 )              /* x1*m11        | x0*m00             */
@@ -417,9 +408,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP3NRR_2 ) )    /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP3NRR_2) )      /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TP3NRR_3 ):
+LLBL(G3TP3NRR_3):
     FEMMS
 
     POP_L     ( ESI )
@@ -459,7 +450,7 @@
     FEMMS
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPPR_3 ) )
+    JE        ( LLBL(G3TPPR_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     PUNPCKLDQ ( REGOFF(20, ECX), MM0 )  /* m11           | m00                */
@@ -467,7 +458,7 @@
     MOVD      ( REGOFF(56, ECX), MM3 )  /*               | m32                */
 
 ALIGNTEXT32
-LLBL( G3TPPR_2 ):
+LLBL(G3TPPR_2):
 
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                 */
     PFMUL     ( MM0, MM4 )              /* x1*m11        | x0*m00             */
@@ -479,9 +470,9 @@
     ADD_L     ( CONST(16), EDX )        /* next r                             */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TPPR_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPPR_2) )        /* cnt > 0 ? -> process next vertex   */
 
-LLBL( G3TPPR_3 ):
+LLBL(G3TPPR_3):
     FEMMS
 
     POP_L     ( ESI )
Index: xc/extras/Mesa/src/X86/3dnow_xform_raw3.S
diff -u xc/extras/Mesa/src/X86/3dnow_xform_raw3.S:1.2 xc/extras/Mesa/src/X86/3dnow_xform_raw3.S:1.3
--- xc/extras/Mesa/src/X86/3dnow_xform_raw3.S:1.2	Mon Feb 14 23:13:18 2000
+++ xc/extras/Mesa/src/X86/3dnow_xform_raw3.S	Fri Jun 16 17:02:41 2000
@@ -3,14 +3,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
-
-
 #define  VEC_SIZE_1   1
 #define  VEC_SIZE_2   3
 #define  VEC_SIZE_3   7
@@ -41,7 +33,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPGR_2 ) )
+    JE        ( LLBL(G3TPGR_2) )
 
     PREFETCHW ( REGIND(EDX) )
 
@@ -51,7 +43,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
 ALIGNTEXT32
-LLBL( G3TPGR_1 ):
+LLBL(G3TPGR_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -95,10 +87,10 @@
 
     ADD_L     ( EDI, EAX )              /* next vertex                       */
     DEC_L     ( ESI )                   /* decrement vertex counter          */
-    JA        ( LLBL( G3TPGR_1 ) )      /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TPGR_1) )        /* cnt > 0 ? -> process next vertex  */
 
 ALIGNTEXT32
-LLBL( G3TPGR_2 ):
+LLBL(G3TPGR_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -131,7 +123,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPIR_2 ) )
+    JE        ( LLBL(G3TPIR_2) )
 
     PREFETCHW ( REGIND(EDX) )
 
@@ -139,7 +131,7 @@
     MOVD      ( REGOFF(8, EAX), MM1 )   /*               | x2                */
 
 ALIGNTEXT32
-LLBL( G3TPIR_1 ):
+LLBL(G3TPIR_1):
 
     PREFETCHW ( REGOFF(32, EDX) )
 
@@ -153,10 +145,10 @@
     MOVQ      ( REGIND(EAX), MM0 )      /* x1            | x0                */
 
     MOVD      ( REGOFF(8, EAX), MM1 )   /*               | x2                */
-    JA        ( LLBL( G3TPIR_1 ) )      /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TPIR_1) )        /* cnt > 0 ? -> process next vertex  */
 
 ALIGNTEXT32
-LLBL( G3TPIR_2 ):
+LLBL(G3TPIR_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -188,7 +180,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2R_3 ) )
+    JE        ( LLBL(G3TP2R_3) )
 
     PREFETCH  ( REGIND(EAX) )
 
@@ -207,7 +199,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
 ALIGNTEXT32
-LLBL( G3TP2R_2 ):
+LLBL(G3TP2R_2):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -230,10 +222,10 @@
 
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TP2R_2 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2R_2) )      /* cnt > 0 ? -> process next vertex   */
 
 ALIGNTEXT32
-LLBL( G3TP2R_3 ):
+LLBL(G3TP2R_3):
 
     FEMMS
     POP_L     ( EDI )
@@ -266,7 +258,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2NRR_2 ) )
+    JE        ( LLBL(G3TP2NRR_2) )
 
     PREFETCH  ( REGIND(EAX) )
 
@@ -283,7 +275,7 @@
 
 
 ALIGNTEXT32
-LLBL( G3TP2NRR_1 ):
+LLBL(G3TP2NRR_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -303,10 +295,10 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
     DEC_L     ( ESI )                   /* decrement vertex counter          */
 
-    JA        ( LLBL( G3TP2NRR_1 ) )    /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TP2NRR_1) )      /* cnt > 0 ? -> process next vertex  */
 
 ALIGNTEXT32
-LLBL( G3TP2NRR_2 ):
+LLBL(G3TP2NRR_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -338,7 +330,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3R_2 ) )
+    JE        ( LLBL(G3TP3R_2) )
 
     PREFETCH  ( REGIND(EAX) )
 
@@ -353,7 +345,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
 ALIGNTEXT32
-LLBL( G3TP3R_1 ):
+LLBL(G3TP3R_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -395,10 +387,10 @@
 
     ADD_L     ( EDI, EAX )              /* next vertex                       */
     DEC_L     ( ESI )                   /* decrement vertex counter          */
-    JA        ( LLBL( G3TP3R_1 ) )      /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TP3R_1) )        /* cnt > 0 ? -> process next vertex  */
 
 ALIGNTEXT32
-LLBL( G3TP3R_2 ):
+LLBL(G3TP3R_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -430,7 +422,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3NRR_2 ) )
+    JE        ( LLBL(G3TP3NRR_2) )
 
     PREFETCH  ( REGIND(EAX) )
 
@@ -452,7 +444,7 @@
 
 
 ALIGNTEXT32
-LLBL( G3TP3NRR_1 ):
+LLBL(G3TP3NRR_1):
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
@@ -472,10 +464,10 @@
     MOVQ      ( REGIND(EAX), MM4 )      /* x1            | x0                */
 
     MOVD      ( REGOFF(8, EAX), MM5 )   /*               | x2                */
-    JA        ( LLBL( G3TP3NRR_1 ) )    /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TP3NRR_1) )      /* cnt > 0 ? -> process next vertex  */
 
 ALIGNTEXT32
-LLBL( G3TP3NRR_2 ):
+LLBL(G3TP3NRR_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -507,7 +499,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPPR_2 ) )
+    JE        ( LLBL(G3TPPR_2) )
 
     PREFETCH  ( REGIND(EAX) )
 
@@ -527,7 +519,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
 ALIGNTEXT32
-LLBL( G3TPPR_1 ):
+LLBL(G3TPPR_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -558,10 +550,10 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
     DEC_L     ( ESI )                   /* decrement vertex counter          */
-    JA        ( LLBL( G3TPPR_1 ) )      /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TPPR_1) )        /* cnt > 0 ? -> process next vertex  */
 
 ALIGNTEXT32
-LLBL( G3TPPR_2 ):
+LLBL(G3TPPR_2):
 
     FEMMS
     POP_L     ( EDI )
Index: xc/extras/Mesa/src/X86/3dnow_xform_raw4.S
diff -u xc/extras/Mesa/src/X86/3dnow_xform_raw4.S:1.2 xc/extras/Mesa/src/X86/3dnow_xform_raw4.S:1.3
--- xc/extras/Mesa/src/X86/3dnow_xform_raw4.S:1.2	Mon Feb 14 23:13:19 2000
+++ xc/extras/Mesa/src/X86/3dnow_xform_raw4.S	Fri Jun 16 17:02:41 2000
@@ -3,14 +3,7 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
 
-
-
 #define  VEC_SIZE_1   1
 #define  VEC_SIZE_2   3
 #define  VEC_SIZE_3   7
@@ -41,7 +34,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPGR_2 ) )
+    JE        ( LLBL(G3TPGR_2) )
 
     PREFETCHW ( REGIND(EDX) )
 
@@ -51,7 +44,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
 ALIGNTEXT32
-LLBL( G3TPGR_1 ):
+LLBL(G3TPGR_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -103,11 +96,11 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
     DEC_L     ( ESI )                   /* decrement vertex counter          */
-    JA        ( LLBL( G3TPGR_1 ) )      /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TPGR_1) )        /* cnt > 0 ? -> process next vertex  */
 
 
 ALIGNTEXT32
-LLBL( G3TPGR_2 ):
+LLBL(G3TPGR_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -140,7 +133,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPIR_2 ) )
+    JE        ( LLBL(G3TPIR_2) )
 
     MOVQ      ( REGIND(EAX), MM0 )      /* x1            | x0                 */
     MOVQ      ( REGOFF(8, EAX), MM1 )   /* x3            | x2                 */
@@ -148,7 +141,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
 ALIGNTEXT32
-LLBL( G3TPIR_1 ):
+LLBL(G3TPIR_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -164,10 +157,10 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TPIR_1 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPIR_1) )        /* cnt > 0 ? -> process next vertex   */
 
 ALIGNTEXT32
-LLBL( G3TPIR_2 ):
+LLBL(G3TPIR_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -200,7 +193,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2R_2 ) )
+    JE        ( LLBL(G3TP2R_2) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     PUNPCKLDQ ( REGOFF(16, ECX), MM0 )  /* m10           | m00                */
@@ -216,7 +209,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
 ALIGNTEXT32
-LLBL( G3TP2R_1 ):
+LLBL(G3TP2R_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -244,10 +237,10 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
     DEC_L     ( ESI )                   /* decrement vertex counter           */
-    JA        ( LLBL( G3TP2R_1 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2R_1) )        /* cnt > 0 ? -> process next vertex   */
 
 ALIGNTEXT32
-LLBL( G3TP2R_2 ):
+LLBL(G3TP2R_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -280,7 +273,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP2NRR_3 ) )
+    JE        ( LLBL(G3TP2NRR_3) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00                */
     PUNPCKLDQ ( REGOFF(20, ECX), MM0 )  /* m11           | m00                */
@@ -293,7 +286,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
 ALIGNTEXT32
-LLBL( G3TP2NRR_2 ):
+LLBL(G3TP2NRR_2):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -317,10 +310,10 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TP2NRR_2 ) )    /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TP2NRR_2) )    /* cnt > 0 ? -> process next vertex   */
 
 ALIGNTEXT32
-LLBL( G3TP2NRR_3 ):
+LLBL(G3TP2NRR_3):
 
     FEMMS
     POP_L     ( EDI )
@@ -353,7 +346,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3R_2 ) )
+    JE        ( LLBL(G3TP3R_2) )
 
     MOVD      ( REGOFF(8, ECX), MM6 )   /*               | m2                */
     PUNPCKLDQ ( REGOFF(24, ECX), MM6 )  /* m6            | m2                */
@@ -365,7 +358,7 @@
     MOVQ      ( REGOFF(8, EAX), MM3 )   /* x3            | x2                */
 
 ALIGNTEXT32
-LLBL( G3TP3R_1 ):
+LLBL(G3TP3R_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -411,11 +404,11 @@
     MOVQ      ( REGOFF(8, EAX), MM3 )   /* x3            | x2                */
 
     DEC_L     ( ESI )                   /* decrement vertex counter          */
-    JA        ( LLBL( G3TP3R_1 ) )      /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TP3R_1) )        /* cnt > 0 ? -> process next vertex  */
 
 
 ALIGNTEXT32
-LLBL( G3TP3R_2 ):
+LLBL(G3TP3R_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -448,7 +441,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TP3NRR_2 ) )
+    JE        ( LLBL(G3TP3NRR_2) )
 
     MOVD      ( REGIND(ECX), MM0 )      /*               | m00               */
     PUNPCKLDQ ( REGOFF(20, ECX), MM0 )  /* m11           | m00               */
@@ -465,7 +458,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
 ALIGNTEXT32
-LLBL( G3TP3NRR_1 ):
+LLBL(G3TP3NRR_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -493,10 +486,10 @@
     ADD_L     ( EDI, EAX )              /* next vertex                       */
 
     DEC_L     ( ESI )                   /* decrement vertex counter          */
-    JA        ( LLBL( G3TP3NRR_1 ) )    /* cnt > 0 ? -> process next vertex  */
+    JA        ( LLBL(G3TP3NRR_1) )      /* cnt > 0 ? -> process next vertex  */
 
 ALIGNTEXT32
-LLBL( G3TP3NRR_2 ):
+LLBL(G3TP3NRR_2):
 
     FEMMS
     POP_L     ( EDI )
@@ -528,7 +521,7 @@
     MOV_L     ( REGOFF(4, EAX), EAX )
 
     CMP_L     ( CONST(0), ESI )
-    JE        ( LLBL( G3TPPR_2 ) )
+    JE        ( LLBL(G3TPPR_2) )
 
     PREFETCH  ( REGIND(EAX) )
 
@@ -550,7 +543,7 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
 
 ALIGNTEXT32
-LLBL( G3TPPR_1 ):
+LLBL(G3TPPR_1):
 
     PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
 
@@ -580,10 +573,10 @@
     ADD_L     ( EDI, EAX )              /* next vertex                        */
     DEC_L     ( ESI )                   /* decrement vertex counter           */
 
-    JA        ( LLBL( G3TPPR_1 ) )      /* cnt > 0 ? -> process next vertex   */
+    JA        ( LLBL(G3TPPR_1) )        /* cnt > 0 ? -> process next vertex   */
 
 ALIGNTEXT32
-LLBL( G3TPPR_2 ):
+LLBL(G3TPPR_2):
 
     FEMMS
     POP_L     ( EDI )
Index: xc/extras/Mesa/src/X86/assyntax.h
diff -u xc/extras/Mesa/src/X86/assyntax.h:1.4 xc/extras/Mesa/src/X86/assyntax.h:1.6
--- xc/extras/Mesa/src/X86/assyntax.h:1.4	Thu Mar  2 08:07:27 2000
+++ xc/extras/Mesa/src/X86/assyntax.h	Fri Jun 30 10:15:06 2000
@@ -243,10 +243,7 @@
 #endif /* ACK_ASSEMBLER */
 
 
-#if (defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) \
- || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
- || defined(__FreeBSD__) && __FreeBSD__ >= 3) \
- || (defined(__NetBSD__) && defined(__ELF__))
+#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__)
 #define GLNAME(a)       a
 #else
 #define GLNAME(a)       CONCAT(_,a)
@@ -851,6 +848,8 @@
 #define P_XMM6 	xmm6
 #define P_XMM7 	xmm7
 
+#define	CONCAT(x, y)	x ## y
+
 #if defined(NASM_ASSEMBLER)
 
 #define ST(n) st ## n
@@ -1644,6 +1643,14 @@
 #define UNPCKHPS(a, b)	unpckhps P_ARG2(a, b)
 #define UNPCKLPS(a, b)	unpcklps P_ARG2(a, b)
 #define XORPS(a, b)	xorps P_ARG2(a, b)
+
+
+/* Added by BrianP for FreeBSD (per David Dawes) */
+#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) && !defined(__bsdi__)
+#define LLBL(a) CONCAT(.L,a)
+#else
+#define LLBL(a) a
+#endif
 
 
 #endif /* __ASSYNTAX_H__ */
Index: xc/extras/Mesa/src/X86/common_x86asm.S
diff -u xc/extras/Mesa/src/X86/common_x86asm.S:1.2 xc/extras/Mesa/src/X86/common_x86asm.S:1.3
--- xc/extras/Mesa/src/X86/common_x86asm.S:1.2	Tue Feb  8 09:18:17 2000
+++ xc/extras/Mesa/src/X86/common_x86asm.S	Fri Jun 16 17:02:41 2000
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -35,12 +34,6 @@
 #include "assyntax.h"
 
         SEG_TEXT
-
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
 
 
 #define  GL_CPU_GenuineIntel     CONST(1)
Index: xc/extras/Mesa/src/X86/glapi_x86.S
diff -u xc/extras/Mesa/src/X86/glapi_x86.S:1.3 xc/extras/Mesa/src/X86/glapi_x86.S:1.5
--- xc/extras/Mesa/src/X86/glapi_x86.S:1.3	Thu Mar  2 08:07:28 2000
+++ xc/extras/Mesa/src/X86/glapi_x86.S	Fri Jun 30 10:15:06 2000
@@ -1,46 +1,13 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.3
- *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/*
- * X86-optimized dispatch code contibuted by Josh Vanderhoof
- *
- * This file will be machine-generated from the gl.spec file at some point
- * in the future.
- */
-
-
+/* DO NOT EDIT - This file generated automatically with glx86asm.py script */
 #include "assyntax.h"
 #include "glapioffsets.h"
 
 #ifndef __WIN32__
 
 #if defined(USE_MGL_NAMESPACE)
-#define GL_PREFIX(n) GLNAME(mgl ## n)
+#define GL_PREFIX(n) GLNAME(CONCAT(mgl,n))
 #else
-#define GL_PREFIX(n) GLNAME(gl ## n)
+#define GL_PREFIX(n) GLNAME(CONCAT(gl,n))
 #endif
 
 #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
@@ -51,45 +18,22 @@
 #define GLOBL_FN(x) GLOBL x
 #endif
 
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Accum))
-GL_PREFIX(Accum):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Accum))
-	JMP(GL_OFFSET(_gloffset_Accum))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(AlphaFunc))
-GL_PREFIX(AlphaFunc):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_AlphaFunc))
-	JMP(GL_OFFSET(_gloffset_AlphaFunc))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Begin))
-GL_PREFIX(Begin):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Begin))
-	JMP(GL_OFFSET(_gloffset_Begin))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Bitmap))
-GL_PREFIX(Bitmap):
+GLOBL_FN(GL_PREFIX(NewList))
+GL_PREFIX(NewList):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Bitmap))
-	JMP(GL_OFFSET(_gloffset_Bitmap))
+	JZ(GLNAME(_glapi_fallback_NewList))
+	JMP(GL_OFFSET(_gloffset_NewList))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BlendFunc))
-GL_PREFIX(BlendFunc):
+GLOBL_FN(GL_PREFIX(EndList))
+GL_PREFIX(EndList):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_BlendFunc))
-	JMP(GL_OFFSET(_gloffset_BlendFunc))
+	JZ(GLNAME(_glapi_fallback_EndList))
+	JMP(GL_OFFSET(_gloffset_EndList))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(CallList))
@@ -107,61 +51,45 @@
 	JZ(GLNAME(_glapi_fallback_CallLists))
 	JMP(GL_OFFSET(_gloffset_CallLists))
 
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Clear))
-GL_PREFIX(Clear):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Clear))
-	JMP(GL_OFFSET(_gloffset_Clear))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ClearAccum))
-GL_PREFIX(ClearAccum):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ClearAccum))
-	JMP(GL_OFFSET(_gloffset_ClearAccum))
-
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ClearColor))
-GL_PREFIX(ClearColor):
+GLOBL_FN(GL_PREFIX(DeleteLists))
+GL_PREFIX(DeleteLists):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ClearColor))
-	JMP(GL_OFFSET(_gloffset_ClearColor))
+	JZ(GLNAME(_glapi_fallback_DeleteLists))
+	JMP(GL_OFFSET(_gloffset_DeleteLists))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ClearDepth))
-GL_PREFIX(ClearDepth):
+GLOBL_FN(GL_PREFIX(GenLists))
+GL_PREFIX(GenLists):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ClearDepth))
-	JMP(GL_OFFSET(_gloffset_ClearDepth))
+	JZ(GLNAME(_glapi_fallback_GenLists))
+	JMP(GL_OFFSET(_gloffset_GenLists))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ClearIndex))
-GL_PREFIX(ClearIndex):
+GLOBL_FN(GL_PREFIX(ListBase))
+GL_PREFIX(ListBase):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ClearIndex))
-	JMP(GL_OFFSET(_gloffset_ClearIndex))
+	JZ(GLNAME(_glapi_fallback_ListBase))
+	JMP(GL_OFFSET(_gloffset_ListBase))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ClearStencil))
-GL_PREFIX(ClearStencil):
+GLOBL_FN(GL_PREFIX(Begin))
+GL_PREFIX(Begin):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ClearStencil))
-	JMP(GL_OFFSET(_gloffset_ClearStencil))
+	JZ(GLNAME(_glapi_fallback_Begin))
+	JMP(GL_OFFSET(_gloffset_Begin))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ClipPlane))
-GL_PREFIX(ClipPlane):
+GLOBL_FN(GL_PREFIX(Bitmap))
+GL_PREFIX(Bitmap):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ClipPlane))
-	JMP(GL_OFFSET(_gloffset_ClipPlane))
+	JZ(GLNAME(_glapi_fallback_Bitmap))
+	JMP(GL_OFFSET(_gloffset_Bitmap))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color3b))
@@ -172,6 +100,14 @@
 	JMP(GL_OFFSET(_gloffset_Color3b))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3bv))
+GL_PREFIX(Color3bv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color3bv))
+	JMP(GL_OFFSET(_gloffset_Color3bv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color3d))
 GL_PREFIX(Color3d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -180,6 +116,14 @@
 	JMP(GL_OFFSET(_gloffset_Color3d))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3dv))
+GL_PREFIX(Color3dv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color3dv))
+	JMP(GL_OFFSET(_gloffset_Color3dv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color3f))
 GL_PREFIX(Color3f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -188,6 +132,14 @@
 	JMP(GL_OFFSET(_gloffset_Color3f))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3fv))
+GL_PREFIX(Color3fv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color3fv))
+	JMP(GL_OFFSET(_gloffset_Color3fv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color3i))
 GL_PREFIX(Color3i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -196,6 +148,14 @@
 	JMP(GL_OFFSET(_gloffset_Color3i))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3iv))
+GL_PREFIX(Color3iv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color3iv))
+	JMP(GL_OFFSET(_gloffset_Color3iv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color3s))
 GL_PREFIX(Color3s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -204,6 +164,14 @@
 	JMP(GL_OFFSET(_gloffset_Color3s))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3sv))
+GL_PREFIX(Color3sv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color3sv))
+	JMP(GL_OFFSET(_gloffset_Color3sv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color3ub))
 GL_PREFIX(Color3ub):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -212,6 +180,14 @@
 	JMP(GL_OFFSET(_gloffset_Color3ub))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3ubv))
+GL_PREFIX(Color3ubv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color3ubv))
+	JMP(GL_OFFSET(_gloffset_Color3ubv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color3ui))
 GL_PREFIX(Color3ui):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -220,6 +196,14 @@
 	JMP(GL_OFFSET(_gloffset_Color3ui))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3uiv))
+GL_PREFIX(Color3uiv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color3uiv))
+	JMP(GL_OFFSET(_gloffset_Color3uiv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color3us))
 GL_PREFIX(Color3us):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -228,6 +212,14 @@
 	JMP(GL_OFFSET(_gloffset_Color3us))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3usv))
+GL_PREFIX(Color3usv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color3usv))
+	JMP(GL_OFFSET(_gloffset_Color3usv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color4b))
 GL_PREFIX(Color4b):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -236,6 +228,14 @@
 	JMP(GL_OFFSET(_gloffset_Color4b))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4bv))
+GL_PREFIX(Color4bv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color4bv))
+	JMP(GL_OFFSET(_gloffset_Color4bv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color4d))
 GL_PREFIX(Color4d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -244,6 +244,14 @@
 	JMP(GL_OFFSET(_gloffset_Color4d))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4dv))
+GL_PREFIX(Color4dv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color4dv))
+	JMP(GL_OFFSET(_gloffset_Color4dv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color4f))
 GL_PREFIX(Color4f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -252,6 +260,14 @@
 	JMP(GL_OFFSET(_gloffset_Color4f))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4fv))
+GL_PREFIX(Color4fv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color4fv))
+	JMP(GL_OFFSET(_gloffset_Color4fv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color4i))
 GL_PREFIX(Color4i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -260,6 +276,14 @@
 	JMP(GL_OFFSET(_gloffset_Color4i))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4iv))
+GL_PREFIX(Color4iv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color4iv))
+	JMP(GL_OFFSET(_gloffset_Color4iv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color4s))
 GL_PREFIX(Color4s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -268,6 +292,14 @@
 	JMP(GL_OFFSET(_gloffset_Color4s))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4sv))
+GL_PREFIX(Color4sv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color4sv))
+	JMP(GL_OFFSET(_gloffset_Color4sv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color4ub))
 GL_PREFIX(Color4ub):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -276,6 +308,14 @@
 	JMP(GL_OFFSET(_gloffset_Color4ub))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4ubv))
+GL_PREFIX(Color4ubv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color4ubv))
+	JMP(GL_OFFSET(_gloffset_Color4ubv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color4ui))
 GL_PREFIX(Color4ui):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -284,6 +324,14 @@
 	JMP(GL_OFFSET(_gloffset_Color4ui))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4uiv))
+GL_PREFIX(Color4uiv):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_Color4uiv))
+	JMP(GL_OFFSET(_gloffset_Color4uiv))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Color4us))
 GL_PREFIX(Color4us):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -292,2252 +340,2244 @@
 	JMP(GL_OFFSET(_gloffset_Color4us))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color3bv))
-GL_PREFIX(Color3bv):
+GLOBL_FN(GL_PREFIX(Color4usv))
+GL_PREFIX(Color4usv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color3bv))
-	JMP(GL_OFFSET(_gloffset_Color3bv))
+	JZ(GLNAME(_glapi_fallback_Color4usv))
+	JMP(GL_OFFSET(_gloffset_Color4usv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color3dv))
-GL_PREFIX(Color3dv):
+GLOBL_FN(GL_PREFIX(EdgeFlag))
+GL_PREFIX(EdgeFlag):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color3dv))
-	JMP(GL_OFFSET(_gloffset_Color3dv))
+	JZ(GLNAME(_glapi_fallback_EdgeFlag))
+	JMP(GL_OFFSET(_gloffset_EdgeFlag))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color3fv))
-GL_PREFIX(Color3fv):
+GLOBL_FN(GL_PREFIX(EdgeFlagv))
+GL_PREFIX(EdgeFlagv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color3fv))
-	JMP(GL_OFFSET(_gloffset_Color3fv))
+	JZ(GLNAME(_glapi_fallback_EdgeFlagv))
+	JMP(GL_OFFSET(_gloffset_EdgeFlagv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color3iv))
-GL_PREFIX(Color3iv):
+GLOBL_FN(GL_PREFIX(End))
+GL_PREFIX(End):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color3iv))
-	JMP(GL_OFFSET(_gloffset_Color3iv))
+	JZ(GLNAME(_glapi_fallback_End))
+	JMP(GL_OFFSET(_gloffset_End))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color3sv))
-GL_PREFIX(Color3sv):
+GLOBL_FN(GL_PREFIX(Indexd))
+GL_PREFIX(Indexd):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color3sv))
-	JMP(GL_OFFSET(_gloffset_Color3sv))
+	JZ(GLNAME(_glapi_fallback_Indexd))
+	JMP(GL_OFFSET(_gloffset_Indexd))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color3ubv))
-GL_PREFIX(Color3ubv):
+GLOBL_FN(GL_PREFIX(Indexdv))
+GL_PREFIX(Indexdv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color3ubv))
-	JMP(GL_OFFSET(_gloffset_Color3ubv))
+	JZ(GLNAME(_glapi_fallback_Indexdv))
+	JMP(GL_OFFSET(_gloffset_Indexdv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color3uiv))
-GL_PREFIX(Color3uiv):
+GLOBL_FN(GL_PREFIX(Indexf))
+GL_PREFIX(Indexf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color3uiv))
-	JMP(GL_OFFSET(_gloffset_Color3uiv))
+	JZ(GLNAME(_glapi_fallback_Indexf))
+	JMP(GL_OFFSET(_gloffset_Indexf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color3usv))
-GL_PREFIX(Color3usv):
+GLOBL_FN(GL_PREFIX(Indexfv))
+GL_PREFIX(Indexfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color3usv))
-	JMP(GL_OFFSET(_gloffset_Color3usv))
+	JZ(GLNAME(_glapi_fallback_Indexfv))
+	JMP(GL_OFFSET(_gloffset_Indexfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color4bv))
-GL_PREFIX(Color4bv):
+GLOBL_FN(GL_PREFIX(Indexi))
+GL_PREFIX(Indexi):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color4bv))
-	JMP(GL_OFFSET(_gloffset_Color4bv))
+	JZ(GLNAME(_glapi_fallback_Indexi))
+	JMP(GL_OFFSET(_gloffset_Indexi))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color4dv))
-GL_PREFIX(Color4dv):
+GLOBL_FN(GL_PREFIX(Indexiv))
+GL_PREFIX(Indexiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color4dv))
-	JMP(GL_OFFSET(_gloffset_Color4dv))
+	JZ(GLNAME(_glapi_fallback_Indexiv))
+	JMP(GL_OFFSET(_gloffset_Indexiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color4fv))
-GL_PREFIX(Color4fv):
+GLOBL_FN(GL_PREFIX(Indexs))
+GL_PREFIX(Indexs):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color4fv))
-	JMP(GL_OFFSET(_gloffset_Color4fv))
+	JZ(GLNAME(_glapi_fallback_Indexs))
+	JMP(GL_OFFSET(_gloffset_Indexs))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color4iv))
-GL_PREFIX(Color4iv):
+GLOBL_FN(GL_PREFIX(Indexsv))
+GL_PREFIX(Indexsv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color4iv))
-	JMP(GL_OFFSET(_gloffset_Color4iv))
+	JZ(GLNAME(_glapi_fallback_Indexsv))
+	JMP(GL_OFFSET(_gloffset_Indexsv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color4sv))
-GL_PREFIX(Color4sv):
+GLOBL_FN(GL_PREFIX(Normal3b))
+GL_PREFIX(Normal3b):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color4sv))
-	JMP(GL_OFFSET(_gloffset_Color4sv))
+	JZ(GLNAME(_glapi_fallback_Normal3b))
+	JMP(GL_OFFSET(_gloffset_Normal3b))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color4ubv))
-GL_PREFIX(Color4ubv):
+GLOBL_FN(GL_PREFIX(Normal3bv))
+GL_PREFIX(Normal3bv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color4ubv))
-	JMP(GL_OFFSET(_gloffset_Color4ubv))
+	JZ(GLNAME(_glapi_fallback_Normal3bv))
+	JMP(GL_OFFSET(_gloffset_Normal3bv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color4uiv))
-GL_PREFIX(Color4uiv):
+GLOBL_FN(GL_PREFIX(Normal3d))
+GL_PREFIX(Normal3d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color4uiv))
-	JMP(GL_OFFSET(_gloffset_Color4uiv))
+	JZ(GLNAME(_glapi_fallback_Normal3d))
+	JMP(GL_OFFSET(_gloffset_Normal3d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Color4usv))
-GL_PREFIX(Color4usv):
+GLOBL_FN(GL_PREFIX(Normal3dv))
+GL_PREFIX(Normal3dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Color4usv))
-	JMP(GL_OFFSET(_gloffset_Color4usv))
+	JZ(GLNAME(_glapi_fallback_Normal3dv))
+	JMP(GL_OFFSET(_gloffset_Normal3dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorMask))
-GL_PREFIX(ColorMask):
+GLOBL_FN(GL_PREFIX(Normal3f))
+GL_PREFIX(Normal3f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorMask))
-	JMP(GL_OFFSET(_gloffset_ColorMask))
+	JZ(GLNAME(_glapi_fallback_Normal3f))
+	JMP(GL_OFFSET(_gloffset_Normal3f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorMaterial))
-GL_PREFIX(ColorMaterial):
+GLOBL_FN(GL_PREFIX(Normal3fv))
+GL_PREFIX(Normal3fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorMaterial))
-	JMP(GL_OFFSET(_gloffset_ColorMaterial))
+	JZ(GLNAME(_glapi_fallback_Normal3fv))
+	JMP(GL_OFFSET(_gloffset_Normal3fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CopyPixels))
-GL_PREFIX(CopyPixels):
+GLOBL_FN(GL_PREFIX(Normal3i))
+GL_PREFIX(Normal3i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyPixels))
-	JMP(GL_OFFSET(_gloffset_CopyPixels))
+	JZ(GLNAME(_glapi_fallback_Normal3i))
+	JMP(GL_OFFSET(_gloffset_Normal3i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CullFace))
-GL_PREFIX(CullFace):
+GLOBL_FN(GL_PREFIX(Normal3iv))
+GL_PREFIX(Normal3iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CullFace))
-	JMP(GL_OFFSET(_gloffset_CullFace))
+	JZ(GLNAME(_glapi_fallback_Normal3iv))
+	JMP(GL_OFFSET(_gloffset_Normal3iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DepthFunc))
-GL_PREFIX(DepthFunc):
+GLOBL_FN(GL_PREFIX(Normal3s))
+GL_PREFIX(Normal3s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DepthFunc))
-	JMP(GL_OFFSET(_gloffset_DepthFunc))
+	JZ(GLNAME(_glapi_fallback_Normal3s))
+	JMP(GL_OFFSET(_gloffset_Normal3s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DepthMask))
-GL_PREFIX(DepthMask):
+GLOBL_FN(GL_PREFIX(Normal3sv))
+GL_PREFIX(Normal3sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DepthMask))
-	JMP(GL_OFFSET(_gloffset_DepthMask))
+	JZ(GLNAME(_glapi_fallback_Normal3sv))
+	JMP(GL_OFFSET(_gloffset_Normal3sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DepthRange))
-GL_PREFIX(DepthRange):
+GLOBL_FN(GL_PREFIX(RasterPos2d))
+GL_PREFIX(RasterPos2d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DepthRange))
-	JMP(GL_OFFSET(_gloffset_DepthRange))
+	JZ(GLNAME(_glapi_fallback_RasterPos2d))
+	JMP(GL_OFFSET(_gloffset_RasterPos2d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DeleteLists))
-GL_PREFIX(DeleteLists):
+GLOBL_FN(GL_PREFIX(RasterPos2dv))
+GL_PREFIX(RasterPos2dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DeleteLists))
-	JMP(GL_OFFSET(_gloffset_DeleteLists))
+	JZ(GLNAME(_glapi_fallback_RasterPos2dv))
+	JMP(GL_OFFSET(_gloffset_RasterPos2dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Disable))
-GL_PREFIX(Disable):
+GLOBL_FN(GL_PREFIX(RasterPos2f))
+GL_PREFIX(RasterPos2f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Disable))
-	JMP(GL_OFFSET(_gloffset_Disable))
+	JZ(GLNAME(_glapi_fallback_RasterPos2f))
+	JMP(GL_OFFSET(_gloffset_RasterPos2f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DrawBuffer))
-GL_PREFIX(DrawBuffer):
+GLOBL_FN(GL_PREFIX(RasterPos2fv))
+GL_PREFIX(RasterPos2fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DrawBuffer))
-	JMP(GL_OFFSET(_gloffset_DrawBuffer))
+	JZ(GLNAME(_glapi_fallback_RasterPos2fv))
+	JMP(GL_OFFSET(_gloffset_RasterPos2fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DrawElements))
-GL_PREFIX(DrawElements):
+GLOBL_FN(GL_PREFIX(RasterPos2i))
+GL_PREFIX(RasterPos2i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DrawElements))
-	JMP(GL_OFFSET(_gloffset_DrawElements))
+	JZ(GLNAME(_glapi_fallback_RasterPos2i))
+	JMP(GL_OFFSET(_gloffset_RasterPos2i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DrawPixels))
-GL_PREFIX(DrawPixels):
+GLOBL_FN(GL_PREFIX(RasterPos2iv))
+GL_PREFIX(RasterPos2iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DrawPixels))
-	JMP(GL_OFFSET(_gloffset_DrawPixels))
+	JZ(GLNAME(_glapi_fallback_RasterPos2iv))
+	JMP(GL_OFFSET(_gloffset_RasterPos2iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Enable))
-GL_PREFIX(Enable):
+GLOBL_FN(GL_PREFIX(RasterPos2s))
+GL_PREFIX(RasterPos2s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Enable))
-	JMP(GL_OFFSET(_gloffset_Enable))
+	JZ(GLNAME(_glapi_fallback_RasterPos2s))
+	JMP(GL_OFFSET(_gloffset_RasterPos2s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(End))
-GL_PREFIX(End):
+GLOBL_FN(GL_PREFIX(RasterPos2sv))
+GL_PREFIX(RasterPos2sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_End))
-	JMP(GL_OFFSET(_gloffset_End))
+	JZ(GLNAME(_glapi_fallback_RasterPos2sv))
+	JMP(GL_OFFSET(_gloffset_RasterPos2sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EndList))
-GL_PREFIX(EndList):
+GLOBL_FN(GL_PREFIX(RasterPos3d))
+GL_PREFIX(RasterPos3d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EndList))
-	JMP(GL_OFFSET(_gloffset_EndList))
+	JZ(GLNAME(_glapi_fallback_RasterPos3d))
+	JMP(GL_OFFSET(_gloffset_RasterPos3d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalCoord1d))
-GL_PREFIX(EvalCoord1d):
+GLOBL_FN(GL_PREFIX(RasterPos3dv))
+GL_PREFIX(RasterPos3dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalCoord1d))
-	JMP(GL_OFFSET(_gloffset_EvalCoord1d))
+	JZ(GLNAME(_glapi_fallback_RasterPos3dv))
+	JMP(GL_OFFSET(_gloffset_RasterPos3dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalCoord1f))
-GL_PREFIX(EvalCoord1f):
+GLOBL_FN(GL_PREFIX(RasterPos3f))
+GL_PREFIX(RasterPos3f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalCoord1f))
-	JMP(GL_OFFSET(_gloffset_EvalCoord1f))
+	JZ(GLNAME(_glapi_fallback_RasterPos3f))
+	JMP(GL_OFFSET(_gloffset_RasterPos3f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalCoord1dv))
-GL_PREFIX(EvalCoord1dv):
+GLOBL_FN(GL_PREFIX(RasterPos3fv))
+GL_PREFIX(RasterPos3fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalCoord1dv))
-	JMP(GL_OFFSET(_gloffset_EvalCoord1dv))
+	JZ(GLNAME(_glapi_fallback_RasterPos3fv))
+	JMP(GL_OFFSET(_gloffset_RasterPos3fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalCoord1fv))
-GL_PREFIX(EvalCoord1fv):
+GLOBL_FN(GL_PREFIX(RasterPos3i))
+GL_PREFIX(RasterPos3i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalCoord1fv))
-	JMP(GL_OFFSET(_gloffset_EvalCoord1fv))
+	JZ(GLNAME(_glapi_fallback_RasterPos3i))
+	JMP(GL_OFFSET(_gloffset_RasterPos3i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalCoord2d))
-GL_PREFIX(EvalCoord2d):
+GLOBL_FN(GL_PREFIX(RasterPos3iv))
+GL_PREFIX(RasterPos3iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalCoord2d))
-	JMP(GL_OFFSET(_gloffset_EvalCoord2d))
+	JZ(GLNAME(_glapi_fallback_RasterPos3iv))
+	JMP(GL_OFFSET(_gloffset_RasterPos3iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalCoord2f))
-GL_PREFIX(EvalCoord2f):
+GLOBL_FN(GL_PREFIX(RasterPos3s))
+GL_PREFIX(RasterPos3s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalCoord2f))
-	JMP(GL_OFFSET(_gloffset_EvalCoord2f))
+	JZ(GLNAME(_glapi_fallback_RasterPos3s))
+	JMP(GL_OFFSET(_gloffset_RasterPos3s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalCoord2dv))
-GL_PREFIX(EvalCoord2dv):
+GLOBL_FN(GL_PREFIX(RasterPos3sv))
+GL_PREFIX(RasterPos3sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalCoord2dv))
-	JMP(GL_OFFSET(_gloffset_EvalCoord2dv))
+	JZ(GLNAME(_glapi_fallback_RasterPos3sv))
+	JMP(GL_OFFSET(_gloffset_RasterPos3sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalCoord2fv))
-GL_PREFIX(EvalCoord2fv):
+GLOBL_FN(GL_PREFIX(RasterPos4d))
+GL_PREFIX(RasterPos4d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalCoord2fv))
-	JMP(GL_OFFSET(_gloffset_EvalCoord2fv))
+	JZ(GLNAME(_glapi_fallback_RasterPos4d))
+	JMP(GL_OFFSET(_gloffset_RasterPos4d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalPoint1))
-GL_PREFIX(EvalPoint1):
+GLOBL_FN(GL_PREFIX(RasterPos4dv))
+GL_PREFIX(RasterPos4dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalPoint1))
-	JMP(GL_OFFSET(_gloffset_EvalPoint1))
+	JZ(GLNAME(_glapi_fallback_RasterPos4dv))
+	JMP(GL_OFFSET(_gloffset_RasterPos4dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalPoint2))
-GL_PREFIX(EvalPoint2):
+GLOBL_FN(GL_PREFIX(RasterPos4f))
+GL_PREFIX(RasterPos4f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalPoint2))
-	JMP(GL_OFFSET(_gloffset_EvalPoint2))
+	JZ(GLNAME(_glapi_fallback_RasterPos4f))
+	JMP(GL_OFFSET(_gloffset_RasterPos4f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalMesh1))
-GL_PREFIX(EvalMesh1):
+GLOBL_FN(GL_PREFIX(RasterPos4fv))
+GL_PREFIX(RasterPos4fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalMesh1))
-	JMP(GL_OFFSET(_gloffset_EvalMesh1))
+	JZ(GLNAME(_glapi_fallback_RasterPos4fv))
+	JMP(GL_OFFSET(_gloffset_RasterPos4fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EdgeFlag))
-GL_PREFIX(EdgeFlag):
+GLOBL_FN(GL_PREFIX(RasterPos4i))
+GL_PREFIX(RasterPos4i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EdgeFlag))
-	JMP(GL_OFFSET(_gloffset_EdgeFlag))
+	JZ(GLNAME(_glapi_fallback_RasterPos4i))
+	JMP(GL_OFFSET(_gloffset_RasterPos4i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EdgeFlagv))
-GL_PREFIX(EdgeFlagv):
+GLOBL_FN(GL_PREFIX(RasterPos4iv))
+GL_PREFIX(RasterPos4iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EdgeFlagv))
-	JMP(GL_OFFSET(_gloffset_EdgeFlagv))
+	JZ(GLNAME(_glapi_fallback_RasterPos4iv))
+	JMP(GL_OFFSET(_gloffset_RasterPos4iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EvalMesh2))
-GL_PREFIX(EvalMesh2):
+GLOBL_FN(GL_PREFIX(RasterPos4s))
+GL_PREFIX(RasterPos4s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EvalMesh2))
-	JMP(GL_OFFSET(_gloffset_EvalMesh2))
+	JZ(GLNAME(_glapi_fallback_RasterPos4s))
+	JMP(GL_OFFSET(_gloffset_RasterPos4s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FeedbackBuffer))
-GL_PREFIX(FeedbackBuffer):
+GLOBL_FN(GL_PREFIX(RasterPos4sv))
+GL_PREFIX(RasterPos4sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_FeedbackBuffer))
-	JMP(GL_OFFSET(_gloffset_FeedbackBuffer))
+	JZ(GLNAME(_glapi_fallback_RasterPos4sv))
+	JMP(GL_OFFSET(_gloffset_RasterPos4sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Finish))
-GL_PREFIX(Finish):
+GLOBL_FN(GL_PREFIX(Rectd))
+GL_PREFIX(Rectd):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Finish))
-	JMP(GL_OFFSET(_gloffset_Finish))
+	JZ(GLNAME(_glapi_fallback_Rectd))
+	JMP(GL_OFFSET(_gloffset_Rectd))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Flush))
-GL_PREFIX(Flush):
+GLOBL_FN(GL_PREFIX(Rectdv))
+GL_PREFIX(Rectdv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Flush))
-	JMP(GL_OFFSET(_gloffset_Flush))
+	JZ(GLNAME(_glapi_fallback_Rectdv))
+	JMP(GL_OFFSET(_gloffset_Rectdv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Fogf))
-GL_PREFIX(Fogf):
+GLOBL_FN(GL_PREFIX(Rectf))
+GL_PREFIX(Rectf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Fogf))
-	JMP(GL_OFFSET(_gloffset_Fogf))
+	JZ(GLNAME(_glapi_fallback_Rectf))
+	JMP(GL_OFFSET(_gloffset_Rectf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Fogi))
-GL_PREFIX(Fogi):
+GLOBL_FN(GL_PREFIX(Rectfv))
+GL_PREFIX(Rectfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Fogi))
-	JMP(GL_OFFSET(_gloffset_Fogi))
+	JZ(GLNAME(_glapi_fallback_Rectfv))
+	JMP(GL_OFFSET(_gloffset_Rectfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Fogfv))
-GL_PREFIX(Fogfv):
+GLOBL_FN(GL_PREFIX(Recti))
+GL_PREFIX(Recti):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Fogfv))
-	JMP(GL_OFFSET(_gloffset_Fogfv))
+	JZ(GLNAME(_glapi_fallback_Recti))
+	JMP(GL_OFFSET(_gloffset_Recti))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Fogiv))
-GL_PREFIX(Fogiv):
+GLOBL_FN(GL_PREFIX(Rectiv))
+GL_PREFIX(Rectiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Fogiv))
-	JMP(GL_OFFSET(_gloffset_Fogiv))
+	JZ(GLNAME(_glapi_fallback_Rectiv))
+	JMP(GL_OFFSET(_gloffset_Rectiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FrontFace))
-GL_PREFIX(FrontFace):
+GLOBL_FN(GL_PREFIX(Rects))
+GL_PREFIX(Rects):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_FrontFace))
-	JMP(GL_OFFSET(_gloffset_FrontFace))
+	JZ(GLNAME(_glapi_fallback_Rects))
+	JMP(GL_OFFSET(_gloffset_Rects))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Frustum))
-GL_PREFIX(Frustum):
+GLOBL_FN(GL_PREFIX(Rectsv))
+GL_PREFIX(Rectsv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Frustum))
-	JMP(GL_OFFSET(_gloffset_Frustum))
+	JZ(GLNAME(_glapi_fallback_Rectsv))
+	JMP(GL_OFFSET(_gloffset_Rectsv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GenLists))
-GL_PREFIX(GenLists):
+GLOBL_FN(GL_PREFIX(TexCoord1d))
+GL_PREFIX(TexCoord1d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GenLists))
-	JMP(GL_OFFSET(_gloffset_GenLists))
+	JZ(GLNAME(_glapi_fallback_TexCoord1d))
+	JMP(GL_OFFSET(_gloffset_TexCoord1d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetBooleanv))
-GL_PREFIX(GetBooleanv):
+GLOBL_FN(GL_PREFIX(TexCoord1dv))
+GL_PREFIX(TexCoord1dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetBooleanv))
-	JMP(GL_OFFSET(_gloffset_GetBooleanv))
+	JZ(GLNAME(_glapi_fallback_TexCoord1dv))
+	JMP(GL_OFFSET(_gloffset_TexCoord1dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetClipPlane))
-GL_PREFIX(GetClipPlane):
+GLOBL_FN(GL_PREFIX(TexCoord1f))
+GL_PREFIX(TexCoord1f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetClipPlane))
-	JMP(GL_OFFSET(_gloffset_GetClipPlane))
+	JZ(GLNAME(_glapi_fallback_TexCoord1f))
+	JMP(GL_OFFSET(_gloffset_TexCoord1f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetDoublev))
-GL_PREFIX(GetDoublev):
+GLOBL_FN(GL_PREFIX(TexCoord1fv))
+GL_PREFIX(TexCoord1fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetDoublev))
-	JMP(GL_OFFSET(_gloffset_GetDoublev))
+	JZ(GLNAME(_glapi_fallback_TexCoord1fv))
+	JMP(GL_OFFSET(_gloffset_TexCoord1fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetError))
-GL_PREFIX(GetError):
+GLOBL_FN(GL_PREFIX(TexCoord1i))
+GL_PREFIX(TexCoord1i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetError))
-	JMP(GL_OFFSET(_gloffset_GetError))
+	JZ(GLNAME(_glapi_fallback_TexCoord1i))
+	JMP(GL_OFFSET(_gloffset_TexCoord1i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetFloatv))
-GL_PREFIX(GetFloatv):
+GLOBL_FN(GL_PREFIX(TexCoord1iv))
+GL_PREFIX(TexCoord1iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetFloatv))
-	JMP(GL_OFFSET(_gloffset_GetFloatv))
+	JZ(GLNAME(_glapi_fallback_TexCoord1iv))
+	JMP(GL_OFFSET(_gloffset_TexCoord1iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetIntegerv))
-GL_PREFIX(GetIntegerv):
+GLOBL_FN(GL_PREFIX(TexCoord1s))
+GL_PREFIX(TexCoord1s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetIntegerv))
-	JMP(GL_OFFSET(_gloffset_GetIntegerv))
+	JZ(GLNAME(_glapi_fallback_TexCoord1s))
+	JMP(GL_OFFSET(_gloffset_TexCoord1s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetLightfv))
-GL_PREFIX(GetLightfv):
+GLOBL_FN(GL_PREFIX(TexCoord1sv))
+GL_PREFIX(TexCoord1sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetLightfv))
-	JMP(GL_OFFSET(_gloffset_GetLightfv))
+	JZ(GLNAME(_glapi_fallback_TexCoord1sv))
+	JMP(GL_OFFSET(_gloffset_TexCoord1sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetLightiv))
-GL_PREFIX(GetLightiv):
+GLOBL_FN(GL_PREFIX(TexCoord2d))
+GL_PREFIX(TexCoord2d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetLightiv))
-	JMP(GL_OFFSET(_gloffset_GetLightiv))
+	JZ(GLNAME(_glapi_fallback_TexCoord2d))
+	JMP(GL_OFFSET(_gloffset_TexCoord2d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetMapdv))
-GL_PREFIX(GetMapdv):
+GLOBL_FN(GL_PREFIX(TexCoord2dv))
+GL_PREFIX(TexCoord2dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetMapdv))
-	JMP(GL_OFFSET(_gloffset_GetMapdv))
+	JZ(GLNAME(_glapi_fallback_TexCoord2dv))
+	JMP(GL_OFFSET(_gloffset_TexCoord2dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetMapfv))
-GL_PREFIX(GetMapfv):
+GLOBL_FN(GL_PREFIX(TexCoord2f))
+GL_PREFIX(TexCoord2f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetMapfv))
-	JMP(GL_OFFSET(_gloffset_GetMapfv))
+	JZ(GLNAME(_glapi_fallback_TexCoord2f))
+	JMP(GL_OFFSET(_gloffset_TexCoord2f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetMapiv))
-GL_PREFIX(GetMapiv):
+GLOBL_FN(GL_PREFIX(TexCoord2fv))
+GL_PREFIX(TexCoord2fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetMapiv))
-	JMP(GL_OFFSET(_gloffset_GetMapiv))
+	JZ(GLNAME(_glapi_fallback_TexCoord2fv))
+	JMP(GL_OFFSET(_gloffset_TexCoord2fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetMaterialfv))
-GL_PREFIX(GetMaterialfv):
+GLOBL_FN(GL_PREFIX(TexCoord2i))
+GL_PREFIX(TexCoord2i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetMaterialfv))
-	JMP(GL_OFFSET(_gloffset_GetMaterialfv))
+	JZ(GLNAME(_glapi_fallback_TexCoord2i))
+	JMP(GL_OFFSET(_gloffset_TexCoord2i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetMaterialiv))
-GL_PREFIX(GetMaterialiv):
+GLOBL_FN(GL_PREFIX(TexCoord2iv))
+GL_PREFIX(TexCoord2iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetMaterialiv))
-	JMP(GL_OFFSET(_gloffset_GetMaterialiv))
+	JZ(GLNAME(_glapi_fallback_TexCoord2iv))
+	JMP(GL_OFFSET(_gloffset_TexCoord2iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetPixelMapfv))
-GL_PREFIX(GetPixelMapfv):
+GLOBL_FN(GL_PREFIX(TexCoord2s))
+GL_PREFIX(TexCoord2s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetPixelMapfv))
-	JMP(GL_OFFSET(_gloffset_GetPixelMapfv))
+	JZ(GLNAME(_glapi_fallback_TexCoord2s))
+	JMP(GL_OFFSET(_gloffset_TexCoord2s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetPixelMapuiv))
-GL_PREFIX(GetPixelMapuiv):
+GLOBL_FN(GL_PREFIX(TexCoord2sv))
+GL_PREFIX(TexCoord2sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetPixelMapuiv))
-	JMP(GL_OFFSET(_gloffset_GetPixelMapuiv))
+	JZ(GLNAME(_glapi_fallback_TexCoord2sv))
+	JMP(GL_OFFSET(_gloffset_TexCoord2sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetPixelMapusv))
-GL_PREFIX(GetPixelMapusv):
+GLOBL_FN(GL_PREFIX(TexCoord3d))
+GL_PREFIX(TexCoord3d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetPixelMapusv))
-	JMP(GL_OFFSET(_gloffset_GetPixelMapusv))
+	JZ(GLNAME(_glapi_fallback_TexCoord3d))
+	JMP(GL_OFFSET(_gloffset_TexCoord3d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetPolygonStipple))
-GL_PREFIX(GetPolygonStipple):
+GLOBL_FN(GL_PREFIX(TexCoord3dv))
+GL_PREFIX(TexCoord3dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetPolygonStipple))
-	JMP(GL_OFFSET(_gloffset_GetPolygonStipple))
+	JZ(GLNAME(_glapi_fallback_TexCoord3dv))
+	JMP(GL_OFFSET(_gloffset_TexCoord3dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetString))
-GL_PREFIX(GetString):
+GLOBL_FN(GL_PREFIX(TexCoord3f))
+GL_PREFIX(TexCoord3f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetString))
-	JMP(GL_OFFSET(_gloffset_GetString))
+	JZ(GLNAME(_glapi_fallback_TexCoord3f))
+	JMP(GL_OFFSET(_gloffset_TexCoord3f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexEnvfv))
-GL_PREFIX(GetTexEnvfv):
+GLOBL_FN(GL_PREFIX(TexCoord3fv))
+GL_PREFIX(TexCoord3fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexEnvfv))
-	JMP(GL_OFFSET(_gloffset_GetTexEnvfv))
+	JZ(GLNAME(_glapi_fallback_TexCoord3fv))
+	JMP(GL_OFFSET(_gloffset_TexCoord3fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexEnviv))
-GL_PREFIX(GetTexEnviv):
+GLOBL_FN(GL_PREFIX(TexCoord3i))
+GL_PREFIX(TexCoord3i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexEnviv))
-	JMP(GL_OFFSET(_gloffset_GetTexEnviv))
+	JZ(GLNAME(_glapi_fallback_TexCoord3i))
+	JMP(GL_OFFSET(_gloffset_TexCoord3i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexGeniv))
-GL_PREFIX(GetTexGeniv):
+GLOBL_FN(GL_PREFIX(TexCoord3iv))
+GL_PREFIX(TexCoord3iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexGeniv))
-	JMP(GL_OFFSET(_gloffset_GetTexGeniv))
+	JZ(GLNAME(_glapi_fallback_TexCoord3iv))
+	JMP(GL_OFFSET(_gloffset_TexCoord3iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexGendv))
-GL_PREFIX(GetTexGendv):
+GLOBL_FN(GL_PREFIX(TexCoord3s))
+GL_PREFIX(TexCoord3s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexGendv))
-	JMP(GL_OFFSET(_gloffset_GetTexGendv))
+	JZ(GLNAME(_glapi_fallback_TexCoord3s))
+	JMP(GL_OFFSET(_gloffset_TexCoord3s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexGenfv))
-GL_PREFIX(GetTexGenfv):
+GLOBL_FN(GL_PREFIX(TexCoord3sv))
+GL_PREFIX(TexCoord3sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexGenfv))
-	JMP(GL_OFFSET(_gloffset_GetTexGenfv))
+	JZ(GLNAME(_glapi_fallback_TexCoord3sv))
+	JMP(GL_OFFSET(_gloffset_TexCoord3sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexImage))
-GL_PREFIX(GetTexImage):
+GLOBL_FN(GL_PREFIX(TexCoord4d))
+GL_PREFIX(TexCoord4d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexImage))
-	JMP(GL_OFFSET(_gloffset_GetTexImage))
+	JZ(GLNAME(_glapi_fallback_TexCoord4d))
+	JMP(GL_OFFSET(_gloffset_TexCoord4d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexLevelParameterfv))
-GL_PREFIX(GetTexLevelParameterfv):
+GLOBL_FN(GL_PREFIX(TexCoord4dv))
+GL_PREFIX(TexCoord4dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexLevelParameterfv))
-	JMP(GL_OFFSET(_gloffset_GetTexLevelParameterfv))
+	JZ(GLNAME(_glapi_fallback_TexCoord4dv))
+	JMP(GL_OFFSET(_gloffset_TexCoord4dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexLevelParameteriv))
-GL_PREFIX(GetTexLevelParameteriv):
+GLOBL_FN(GL_PREFIX(TexCoord4f))
+GL_PREFIX(TexCoord4f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexLevelParameteriv))
-	JMP(GL_OFFSET(_gloffset_GetTexLevelParameteriv))
+	JZ(GLNAME(_glapi_fallback_TexCoord4f))
+	JMP(GL_OFFSET(_gloffset_TexCoord4f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexParameterfv))
-GL_PREFIX(GetTexParameterfv):
+GLOBL_FN(GL_PREFIX(TexCoord4fv))
+GL_PREFIX(TexCoord4fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexParameterfv))
-	JMP(GL_OFFSET(_gloffset_GetTexParameterfv))
+	JZ(GLNAME(_glapi_fallback_TexCoord4fv))
+	JMP(GL_OFFSET(_gloffset_TexCoord4fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetTexParameteriv))
-GL_PREFIX(GetTexParameteriv):
+GLOBL_FN(GL_PREFIX(TexCoord4i))
+GL_PREFIX(TexCoord4i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetTexParameteriv))
-	JMP(GL_OFFSET(_gloffset_GetTexParameteriv))
+	JZ(GLNAME(_glapi_fallback_TexCoord4i))
+	JMP(GL_OFFSET(_gloffset_TexCoord4i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Hint))
-GL_PREFIX(Hint):
+GLOBL_FN(GL_PREFIX(TexCoord4iv))
+GL_PREFIX(TexCoord4iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Hint))
-	JMP(GL_OFFSET(_gloffset_Hint))
+	JZ(GLNAME(_glapi_fallback_TexCoord4iv))
+	JMP(GL_OFFSET(_gloffset_TexCoord4iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Indexd))
-GL_PREFIX(Indexd):
+GLOBL_FN(GL_PREFIX(TexCoord4s))
+GL_PREFIX(TexCoord4s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Indexd))
-	JMP(GL_OFFSET(_gloffset_Indexd))
+	JZ(GLNAME(_glapi_fallback_TexCoord4s))
+	JMP(GL_OFFSET(_gloffset_TexCoord4s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Indexdv))
-GL_PREFIX(Indexdv):
+GLOBL_FN(GL_PREFIX(TexCoord4sv))
+GL_PREFIX(TexCoord4sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Indexdv))
-	JMP(GL_OFFSET(_gloffset_Indexdv))
+	JZ(GLNAME(_glapi_fallback_TexCoord4sv))
+	JMP(GL_OFFSET(_gloffset_TexCoord4sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Indexf))
-GL_PREFIX(Indexf):
+GLOBL_FN(GL_PREFIX(Vertex2d))
+GL_PREFIX(Vertex2d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Indexf))
-	JMP(GL_OFFSET(_gloffset_Indexf))
+	JZ(GLNAME(_glapi_fallback_Vertex2d))
+	JMP(GL_OFFSET(_gloffset_Vertex2d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Indexfv))
-GL_PREFIX(Indexfv):
+GLOBL_FN(GL_PREFIX(Vertex2dv))
+GL_PREFIX(Vertex2dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Indexfv))
-	JMP(GL_OFFSET(_gloffset_Indexfv))
+	JZ(GLNAME(_glapi_fallback_Vertex2dv))
+	JMP(GL_OFFSET(_gloffset_Vertex2dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Indexi))
-GL_PREFIX(Indexi):
+GLOBL_FN(GL_PREFIX(Vertex2f))
+GL_PREFIX(Vertex2f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Indexi))
-	JMP(GL_OFFSET(_gloffset_Indexi))
+	JZ(GLNAME(_glapi_fallback_Vertex2f))
+	JMP(GL_OFFSET(_gloffset_Vertex2f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Indexiv))
-GL_PREFIX(Indexiv):
+GLOBL_FN(GL_PREFIX(Vertex2fv))
+GL_PREFIX(Vertex2fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Indexiv))
-	JMP(GL_OFFSET(_gloffset_Indexiv))
+	JZ(GLNAME(_glapi_fallback_Vertex2fv))
+	JMP(GL_OFFSET(_gloffset_Vertex2fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Indexs))
-GL_PREFIX(Indexs):
+GLOBL_FN(GL_PREFIX(Vertex2i))
+GL_PREFIX(Vertex2i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Indexs))
-	JMP(GL_OFFSET(_gloffset_Indexs))
+	JZ(GLNAME(_glapi_fallback_Vertex2i))
+	JMP(GL_OFFSET(_gloffset_Vertex2i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Indexsv))
-GL_PREFIX(Indexsv):
+GLOBL_FN(GL_PREFIX(Vertex2iv))
+GL_PREFIX(Vertex2iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Indexsv))
-	JMP(GL_OFFSET(_gloffset_Indexsv))
+	JZ(GLNAME(_glapi_fallback_Vertex2iv))
+	JMP(GL_OFFSET(_gloffset_Vertex2iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IndexMask))
-GL_PREFIX(IndexMask):
+GLOBL_FN(GL_PREFIX(Vertex2s))
+GL_PREFIX(Vertex2s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_IndexMask))
-	JMP(GL_OFFSET(_gloffset_IndexMask))
+	JZ(GLNAME(_glapi_fallback_Vertex2s))
+	JMP(GL_OFFSET(_gloffset_Vertex2s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(InitNames))
-GL_PREFIX(InitNames):
+GLOBL_FN(GL_PREFIX(Vertex2sv))
+GL_PREFIX(Vertex2sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_InitNames))
-	JMP(GL_OFFSET(_gloffset_InitNames))
+	JZ(GLNAME(_glapi_fallback_Vertex2sv))
+	JMP(GL_OFFSET(_gloffset_Vertex2sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IsEnabled))
-GL_PREFIX(IsEnabled):
+GLOBL_FN(GL_PREFIX(Vertex3d))
+GL_PREFIX(Vertex3d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_IsEnabled))
-	JMP(GL_OFFSET(_gloffset_IsEnabled))
+	JZ(GLNAME(_glapi_fallback_Vertex3d))
+	JMP(GL_OFFSET(_gloffset_Vertex3d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IsList))
-GL_PREFIX(IsList):
+GLOBL_FN(GL_PREFIX(Vertex3dv))
+GL_PREFIX(Vertex3dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_IsList))
-	JMP(GL_OFFSET(_gloffset_IsList))
+	JZ(GLNAME(_glapi_fallback_Vertex3dv))
+	JMP(GL_OFFSET(_gloffset_Vertex3dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Lightf))
-GL_PREFIX(Lightf):
+GLOBL_FN(GL_PREFIX(Vertex3f))
+GL_PREFIX(Vertex3f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Lightf))
-	JMP(GL_OFFSET(_gloffset_Lightf))
+	JZ(GLNAME(_glapi_fallback_Vertex3f))
+	JMP(GL_OFFSET(_gloffset_Vertex3f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Lighti))
-GL_PREFIX(Lighti):
+GLOBL_FN(GL_PREFIX(Vertex3fv))
+GL_PREFIX(Vertex3fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Lighti))
-	JMP(GL_OFFSET(_gloffset_Lighti))
+	JZ(GLNAME(_glapi_fallback_Vertex3fv))
+	JMP(GL_OFFSET(_gloffset_Vertex3fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Lightfv))
-GL_PREFIX(Lightfv):
+GLOBL_FN(GL_PREFIX(Vertex3i))
+GL_PREFIX(Vertex3i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Lightfv))
-	JMP(GL_OFFSET(_gloffset_Lightfv))
+	JZ(GLNAME(_glapi_fallback_Vertex3i))
+	JMP(GL_OFFSET(_gloffset_Vertex3i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Lightiv))
-GL_PREFIX(Lightiv):
+GLOBL_FN(GL_PREFIX(Vertex3iv))
+GL_PREFIX(Vertex3iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Lightiv))
-	JMP(GL_OFFSET(_gloffset_Lightiv))
+	JZ(GLNAME(_glapi_fallback_Vertex3iv))
+	JMP(GL_OFFSET(_gloffset_Vertex3iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LightModelf))
-GL_PREFIX(LightModelf):
+GLOBL_FN(GL_PREFIX(Vertex3s))
+GL_PREFIX(Vertex3s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LightModelf))
-	JMP(GL_OFFSET(_gloffset_LightModelf))
+	JZ(GLNAME(_glapi_fallback_Vertex3s))
+	JMP(GL_OFFSET(_gloffset_Vertex3s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LightModeli))
-GL_PREFIX(LightModeli):
+GLOBL_FN(GL_PREFIX(Vertex3sv))
+GL_PREFIX(Vertex3sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LightModeli))
-	JMP(GL_OFFSET(_gloffset_LightModeli))
+	JZ(GLNAME(_glapi_fallback_Vertex3sv))
+	JMP(GL_OFFSET(_gloffset_Vertex3sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LightModelfv))
-GL_PREFIX(LightModelfv):
+GLOBL_FN(GL_PREFIX(Vertex4d))
+GL_PREFIX(Vertex4d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LightModelfv))
-	JMP(GL_OFFSET(_gloffset_LightModelfv))
+	JZ(GLNAME(_glapi_fallback_Vertex4d))
+	JMP(GL_OFFSET(_gloffset_Vertex4d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LightModeliv))
-GL_PREFIX(LightModeliv):
+GLOBL_FN(GL_PREFIX(Vertex4dv))
+GL_PREFIX(Vertex4dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LightModeliv))
-	JMP(GL_OFFSET(_gloffset_LightModeliv))
+	JZ(GLNAME(_glapi_fallback_Vertex4dv))
+	JMP(GL_OFFSET(_gloffset_Vertex4dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LineWidth))
-GL_PREFIX(LineWidth):
+GLOBL_FN(GL_PREFIX(Vertex4f))
+GL_PREFIX(Vertex4f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LineWidth))
-	JMP(GL_OFFSET(_gloffset_LineWidth))
+	JZ(GLNAME(_glapi_fallback_Vertex4f))
+	JMP(GL_OFFSET(_gloffset_Vertex4f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LineStipple))
-GL_PREFIX(LineStipple):
+GLOBL_FN(GL_PREFIX(Vertex4fv))
+GL_PREFIX(Vertex4fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LineStipple))
-	JMP(GL_OFFSET(_gloffset_LineStipple))
+	JZ(GLNAME(_glapi_fallback_Vertex4fv))
+	JMP(GL_OFFSET(_gloffset_Vertex4fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ListBase))
-GL_PREFIX(ListBase):
+GLOBL_FN(GL_PREFIX(Vertex4i))
+GL_PREFIX(Vertex4i):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ListBase))
-	JMP(GL_OFFSET(_gloffset_ListBase))
+	JZ(GLNAME(_glapi_fallback_Vertex4i))
+	JMP(GL_OFFSET(_gloffset_Vertex4i))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LoadIdentity))
-GL_PREFIX(LoadIdentity):
+GLOBL_FN(GL_PREFIX(Vertex4iv))
+GL_PREFIX(Vertex4iv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LoadIdentity))
-	JMP(GL_OFFSET(_gloffset_LoadIdentity))
+	JZ(GLNAME(_glapi_fallback_Vertex4iv))
+	JMP(GL_OFFSET(_gloffset_Vertex4iv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LoadMatrixd))
-GL_PREFIX(LoadMatrixd):
+GLOBL_FN(GL_PREFIX(Vertex4s))
+GL_PREFIX(Vertex4s):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LoadMatrixd))
-	JMP(GL_OFFSET(_gloffset_LoadMatrixd))
+	JZ(GLNAME(_glapi_fallback_Vertex4s))
+	JMP(GL_OFFSET(_gloffset_Vertex4s))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LoadMatrixf))
-GL_PREFIX(LoadMatrixf):
+GLOBL_FN(GL_PREFIX(Vertex4sv))
+GL_PREFIX(Vertex4sv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LoadMatrixf))
-	JMP(GL_OFFSET(_gloffset_LoadMatrixf))
+	JZ(GLNAME(_glapi_fallback_Vertex4sv))
+	JMP(GL_OFFSET(_gloffset_Vertex4sv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LoadName))
-GL_PREFIX(LoadName):
+GLOBL_FN(GL_PREFIX(ClipPlane))
+GL_PREFIX(ClipPlane):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LoadName))
-	JMP(GL_OFFSET(_gloffset_LoadName))
+	JZ(GLNAME(_glapi_fallback_ClipPlane))
+	JMP(GL_OFFSET(_gloffset_ClipPlane))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LogicOp))
-GL_PREFIX(LogicOp):
+GLOBL_FN(GL_PREFIX(ColorMaterial))
+GL_PREFIX(ColorMaterial):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LogicOp))
-	JMP(GL_OFFSET(_gloffset_LogicOp))
+	JZ(GLNAME(_glapi_fallback_ColorMaterial))
+	JMP(GL_OFFSET(_gloffset_ColorMaterial))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Map1d))
-GL_PREFIX(Map1d):
+GLOBL_FN(GL_PREFIX(CullFace))
+GL_PREFIX(CullFace):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Map1d))
-	JMP(GL_OFFSET(_gloffset_Map1d))
+	JZ(GLNAME(_glapi_fallback_CullFace))
+	JMP(GL_OFFSET(_gloffset_CullFace))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Map1f))
-GL_PREFIX(Map1f):
+GLOBL_FN(GL_PREFIX(Fogf))
+GL_PREFIX(Fogf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Map1f))
-	JMP(GL_OFFSET(_gloffset_Map1f))
+	JZ(GLNAME(_glapi_fallback_Fogf))
+	JMP(GL_OFFSET(_gloffset_Fogf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Map2d))
-GL_PREFIX(Map2d):
+GLOBL_FN(GL_PREFIX(Fogfv))
+GL_PREFIX(Fogfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Map2d))
-	JMP(GL_OFFSET(_gloffset_Map2d))
+	JZ(GLNAME(_glapi_fallback_Fogfv))
+	JMP(GL_OFFSET(_gloffset_Fogfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Map2f))
-GL_PREFIX(Map2f):
+GLOBL_FN(GL_PREFIX(Fogi))
+GL_PREFIX(Fogi):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Map2f))
-	JMP(GL_OFFSET(_gloffset_Map2f))
+	JZ(GLNAME(_glapi_fallback_Fogi))
+	JMP(GL_OFFSET(_gloffset_Fogi))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MapGrid1d))
-GL_PREFIX(MapGrid1d):
+GLOBL_FN(GL_PREFIX(Fogiv))
+GL_PREFIX(Fogiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MapGrid1d))
-	JMP(GL_OFFSET(_gloffset_MapGrid1d))
+	JZ(GLNAME(_glapi_fallback_Fogiv))
+	JMP(GL_OFFSET(_gloffset_Fogiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MapGrid1f))
-GL_PREFIX(MapGrid1f):
+GLOBL_FN(GL_PREFIX(FrontFace))
+GL_PREFIX(FrontFace):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MapGrid1f))
-	JMP(GL_OFFSET(_gloffset_MapGrid1f))
+	JZ(GLNAME(_glapi_fallback_FrontFace))
+	JMP(GL_OFFSET(_gloffset_FrontFace))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MapGrid2d))
-GL_PREFIX(MapGrid2d):
+GLOBL_FN(GL_PREFIX(Hint))
+GL_PREFIX(Hint):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MapGrid2d))
-	JMP(GL_OFFSET(_gloffset_MapGrid2d))
+	JZ(GLNAME(_glapi_fallback_Hint))
+	JMP(GL_OFFSET(_gloffset_Hint))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MapGrid2f))
-GL_PREFIX(MapGrid2f):
+GLOBL_FN(GL_PREFIX(Lightf))
+GL_PREFIX(Lightf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MapGrid2f))
-	JMP(GL_OFFSET(_gloffset_MapGrid2f))
+	JZ(GLNAME(_glapi_fallback_Lightf))
+	JMP(GL_OFFSET(_gloffset_Lightf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Materialf))
-GL_PREFIX(Materialf):
+GLOBL_FN(GL_PREFIX(Lightfv))
+GL_PREFIX(Lightfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Materialf))
-	JMP(GL_OFFSET(_gloffset_Materialf))
+	JZ(GLNAME(_glapi_fallback_Lightfv))
+	JMP(GL_OFFSET(_gloffset_Lightfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Materiali))
-GL_PREFIX(Materiali):
+GLOBL_FN(GL_PREFIX(Lighti))
+GL_PREFIX(Lighti):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Materiali))
-	JMP(GL_OFFSET(_gloffset_Materiali))
+	JZ(GLNAME(_glapi_fallback_Lighti))
+	JMP(GL_OFFSET(_gloffset_Lighti))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Materialfv))
-GL_PREFIX(Materialfv):
+GLOBL_FN(GL_PREFIX(Lightiv))
+GL_PREFIX(Lightiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Materialfv))
-	JMP(GL_OFFSET(_gloffset_Materialfv))
+	JZ(GLNAME(_glapi_fallback_Lightiv))
+	JMP(GL_OFFSET(_gloffset_Lightiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Materialiv))
-GL_PREFIX(Materialiv):
+GLOBL_FN(GL_PREFIX(LightModelf))
+GL_PREFIX(LightModelf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Materialiv))
-	JMP(GL_OFFSET(_gloffset_Materialiv))
+	JZ(GLNAME(_glapi_fallback_LightModelf))
+	JMP(GL_OFFSET(_gloffset_LightModelf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MatrixMode))
-GL_PREFIX(MatrixMode):
+GLOBL_FN(GL_PREFIX(LightModelfv))
+GL_PREFIX(LightModelfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MatrixMode))
-	JMP(GL_OFFSET(_gloffset_MatrixMode))
+	JZ(GLNAME(_glapi_fallback_LightModelfv))
+	JMP(GL_OFFSET(_gloffset_LightModelfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MultMatrixd))
-GL_PREFIX(MultMatrixd):
+GLOBL_FN(GL_PREFIX(LightModeli))
+GL_PREFIX(LightModeli):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MultMatrixd))
-	JMP(GL_OFFSET(_gloffset_MultMatrixd))
+	JZ(GLNAME(_glapi_fallback_LightModeli))
+	JMP(GL_OFFSET(_gloffset_LightModeli))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MultMatrixf))
-GL_PREFIX(MultMatrixf):
+GLOBL_FN(GL_PREFIX(LightModeliv))
+GL_PREFIX(LightModeliv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MultMatrixf))
-	JMP(GL_OFFSET(_gloffset_MultMatrixf))
+	JZ(GLNAME(_glapi_fallback_LightModeliv))
+	JMP(GL_OFFSET(_gloffset_LightModeliv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(NewList))
-GL_PREFIX(NewList):
+GLOBL_FN(GL_PREFIX(LineStipple))
+GL_PREFIX(LineStipple):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_NewList))
-	JMP(GL_OFFSET(_gloffset_NewList))
+	JZ(GLNAME(_glapi_fallback_LineStipple))
+	JMP(GL_OFFSET(_gloffset_LineStipple))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3b))
-GL_PREFIX(Normal3b):
+GLOBL_FN(GL_PREFIX(LineWidth))
+GL_PREFIX(LineWidth):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3b))
-	JMP(GL_OFFSET(_gloffset_Normal3b))
+	JZ(GLNAME(_glapi_fallback_LineWidth))
+	JMP(GL_OFFSET(_gloffset_LineWidth))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3bv))
-GL_PREFIX(Normal3bv):
+GLOBL_FN(GL_PREFIX(Materialf))
+GL_PREFIX(Materialf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3bv))
-	JMP(GL_OFFSET(_gloffset_Normal3bv))
+	JZ(GLNAME(_glapi_fallback_Materialf))
+	JMP(GL_OFFSET(_gloffset_Materialf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3d))
-GL_PREFIX(Normal3d):
+GLOBL_FN(GL_PREFIX(Materialfv))
+GL_PREFIX(Materialfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3d))
-	JMP(GL_OFFSET(_gloffset_Normal3d))
+	JZ(GLNAME(_glapi_fallback_Materialfv))
+	JMP(GL_OFFSET(_gloffset_Materialfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3dv))
-GL_PREFIX(Normal3dv):
+GLOBL_FN(GL_PREFIX(Materiali))
+GL_PREFIX(Materiali):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3dv))
-	JMP(GL_OFFSET(_gloffset_Normal3dv))
+	JZ(GLNAME(_glapi_fallback_Materiali))
+	JMP(GL_OFFSET(_gloffset_Materiali))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3f))
-GL_PREFIX(Normal3f):
+GLOBL_FN(GL_PREFIX(Materialiv))
+GL_PREFIX(Materialiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3f))
-	JMP(GL_OFFSET(_gloffset_Normal3f))
+	JZ(GLNAME(_glapi_fallback_Materialiv))
+	JMP(GL_OFFSET(_gloffset_Materialiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3fv))
-GL_PREFIX(Normal3fv):
+GLOBL_FN(GL_PREFIX(PointSize))
+GL_PREFIX(PointSize):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3fv))
-	JMP(GL_OFFSET(_gloffset_Normal3fv))
+	JZ(GLNAME(_glapi_fallback_PointSize))
+	JMP(GL_OFFSET(_gloffset_PointSize))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3i))
-GL_PREFIX(Normal3i):
+GLOBL_FN(GL_PREFIX(PolygonMode))
+GL_PREFIX(PolygonMode):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3i))
-	JMP(GL_OFFSET(_gloffset_Normal3i))
+	JZ(GLNAME(_glapi_fallback_PolygonMode))
+	JMP(GL_OFFSET(_gloffset_PolygonMode))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3iv))
-GL_PREFIX(Normal3iv):
+GLOBL_FN(GL_PREFIX(PolygonStipple))
+GL_PREFIX(PolygonStipple):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3iv))
-	JMP(GL_OFFSET(_gloffset_Normal3iv))
+	JZ(GLNAME(_glapi_fallback_PolygonStipple))
+	JMP(GL_OFFSET(_gloffset_PolygonStipple))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3s))
-GL_PREFIX(Normal3s):
+GLOBL_FN(GL_PREFIX(Scissor))
+GL_PREFIX(Scissor):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3s))
-	JMP(GL_OFFSET(_gloffset_Normal3s))
+	JZ(GLNAME(_glapi_fallback_Scissor))
+	JMP(GL_OFFSET(_gloffset_Scissor))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Normal3sv))
-GL_PREFIX(Normal3sv):
+GLOBL_FN(GL_PREFIX(ShadeModel))
+GL_PREFIX(ShadeModel):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Normal3sv))
-	JMP(GL_OFFSET(_gloffset_Normal3sv))
+	JZ(GLNAME(_glapi_fallback_ShadeModel))
+	JMP(GL_OFFSET(_gloffset_ShadeModel))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Ortho))
-GL_PREFIX(Ortho):
+GLOBL_FN(GL_PREFIX(TexParameterf))
+GL_PREFIX(TexParameterf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Ortho))
-	JMP(GL_OFFSET(_gloffset_Ortho))
+	JZ(GLNAME(_glapi_fallback_TexParameterf))
+	JMP(GL_OFFSET(_gloffset_TexParameterf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PassThrough))
-GL_PREFIX(PassThrough):
+GLOBL_FN(GL_PREFIX(TexParameterfv))
+GL_PREFIX(TexParameterfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PassThrough))
-	JMP(GL_OFFSET(_gloffset_PassThrough))
+	JZ(GLNAME(_glapi_fallback_TexParameterfv))
+	JMP(GL_OFFSET(_gloffset_TexParameterfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelMapfv))
-GL_PREFIX(PixelMapfv):
+GLOBL_FN(GL_PREFIX(TexParameteri))
+GL_PREFIX(TexParameteri):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelMapfv))
-	JMP(GL_OFFSET(_gloffset_PixelMapfv))
+	JZ(GLNAME(_glapi_fallback_TexParameteri))
+	JMP(GL_OFFSET(_gloffset_TexParameteri))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelMapuiv))
-GL_PREFIX(PixelMapuiv):
+GLOBL_FN(GL_PREFIX(TexParameteriv))
+GL_PREFIX(TexParameteriv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelMapuiv))
-	JMP(GL_OFFSET(_gloffset_PixelMapuiv))
+	JZ(GLNAME(_glapi_fallback_TexParameteriv))
+	JMP(GL_OFFSET(_gloffset_TexParameteriv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelMapusv))
-GL_PREFIX(PixelMapusv):
+GLOBL_FN(GL_PREFIX(TexImage1D))
+GL_PREFIX(TexImage1D):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelMapusv))
-	JMP(GL_OFFSET(_gloffset_PixelMapusv))
+	JZ(GLNAME(_glapi_fallback_TexImage1D))
+	JMP(GL_OFFSET(_gloffset_TexImage1D))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelStoref))
-GL_PREFIX(PixelStoref):
+GLOBL_FN(GL_PREFIX(TexImage2D))
+GL_PREFIX(TexImage2D):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelStoref))
-	JMP(GL_OFFSET(_gloffset_PixelStoref))
+	JZ(GLNAME(_glapi_fallback_TexImage2D))
+	JMP(GL_OFFSET(_gloffset_TexImage2D))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelStorei))
-GL_PREFIX(PixelStorei):
+GLOBL_FN(GL_PREFIX(TexEnvf))
+GL_PREFIX(TexEnvf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelStorei))
-	JMP(GL_OFFSET(_gloffset_PixelStorei))
+	JZ(GLNAME(_glapi_fallback_TexEnvf))
+	JMP(GL_OFFSET(_gloffset_TexEnvf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelTransferf))
-GL_PREFIX(PixelTransferf):
+GLOBL_FN(GL_PREFIX(TexEnvfv))
+GL_PREFIX(TexEnvfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelTransferf))
-	JMP(GL_OFFSET(_gloffset_PixelTransferf))
+	JZ(GLNAME(_glapi_fallback_TexEnvfv))
+	JMP(GL_OFFSET(_gloffset_TexEnvfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelTransferi))
-GL_PREFIX(PixelTransferi):
+GLOBL_FN(GL_PREFIX(TexEnvi))
+GL_PREFIX(TexEnvi):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelTransferi))
-	JMP(GL_OFFSET(_gloffset_PixelTransferi))
+	JZ(GLNAME(_glapi_fallback_TexEnvi))
+	JMP(GL_OFFSET(_gloffset_TexEnvi))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelZoom))
-GL_PREFIX(PixelZoom):
+GLOBL_FN(GL_PREFIX(TexEnviv))
+GL_PREFIX(TexEnviv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelZoom))
-	JMP(GL_OFFSET(_gloffset_PixelZoom))
+	JZ(GLNAME(_glapi_fallback_TexEnviv))
+	JMP(GL_OFFSET(_gloffset_TexEnviv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PointSize))
-GL_PREFIX(PointSize):
+GLOBL_FN(GL_PREFIX(TexGend))
+GL_PREFIX(TexGend):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PointSize))
-	JMP(GL_OFFSET(_gloffset_PointSize))
+	JZ(GLNAME(_glapi_fallback_TexGend))
+	JMP(GL_OFFSET(_gloffset_TexGend))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PolygonMode))
-GL_PREFIX(PolygonMode):
+GLOBL_FN(GL_PREFIX(TexGendv))
+GL_PREFIX(TexGendv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PolygonMode))
-	JMP(GL_OFFSET(_gloffset_PolygonMode))
+	JZ(GLNAME(_glapi_fallback_TexGendv))
+	JMP(GL_OFFSET(_gloffset_TexGendv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PolygonStipple))
-GL_PREFIX(PolygonStipple):
+GLOBL_FN(GL_PREFIX(TexGenf))
+GL_PREFIX(TexGenf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PolygonStipple))
-	JMP(GL_OFFSET(_gloffset_PolygonStipple))
+	JZ(GLNAME(_glapi_fallback_TexGenf))
+	JMP(GL_OFFSET(_gloffset_TexGenf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PopAttrib))
-GL_PREFIX(PopAttrib):
+GLOBL_FN(GL_PREFIX(TexGenfv))
+GL_PREFIX(TexGenfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PopAttrib))
-	JMP(GL_OFFSET(_gloffset_PopAttrib))
+	JZ(GLNAME(_glapi_fallback_TexGenfv))
+	JMP(GL_OFFSET(_gloffset_TexGenfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PopMatrix))
-GL_PREFIX(PopMatrix):
+GLOBL_FN(GL_PREFIX(TexGeni))
+GL_PREFIX(TexGeni):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PopMatrix))
-	JMP(GL_OFFSET(_gloffset_PopMatrix))
+	JZ(GLNAME(_glapi_fallback_TexGeni))
+	JMP(GL_OFFSET(_gloffset_TexGeni))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PopName))
-GL_PREFIX(PopName):
+GLOBL_FN(GL_PREFIX(TexGeniv))
+GL_PREFIX(TexGeniv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PopName))
-	JMP(GL_OFFSET(_gloffset_PopName))
+	JZ(GLNAME(_glapi_fallback_TexGeniv))
+	JMP(GL_OFFSET(_gloffset_TexGeniv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PushAttrib))
-GL_PREFIX(PushAttrib):
+GLOBL_FN(GL_PREFIX(FeedbackBuffer))
+GL_PREFIX(FeedbackBuffer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PushAttrib))
-	JMP(GL_OFFSET(_gloffset_PushAttrib))
+	JZ(GLNAME(_glapi_fallback_FeedbackBuffer))
+	JMP(GL_OFFSET(_gloffset_FeedbackBuffer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PushMatrix))
-GL_PREFIX(PushMatrix):
+GLOBL_FN(GL_PREFIX(SelectBuffer))
+GL_PREFIX(SelectBuffer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PushMatrix))
-	JMP(GL_OFFSET(_gloffset_PushMatrix))
+	JZ(GLNAME(_glapi_fallback_SelectBuffer))
+	JMP(GL_OFFSET(_gloffset_SelectBuffer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PushName))
-GL_PREFIX(PushName):
+GLOBL_FN(GL_PREFIX(RenderMode))
+GL_PREFIX(RenderMode):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PushName))
-	JMP(GL_OFFSET(_gloffset_PushName))
+	JZ(GLNAME(_glapi_fallback_RenderMode))
+	JMP(GL_OFFSET(_gloffset_RenderMode))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos2d))
-GL_PREFIX(RasterPos2d):
+GLOBL_FN(GL_PREFIX(InitNames))
+GL_PREFIX(InitNames):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos2d))
-	JMP(GL_OFFSET(_gloffset_RasterPos2d))
+	JZ(GLNAME(_glapi_fallback_InitNames))
+	JMP(GL_OFFSET(_gloffset_InitNames))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos2f))
-GL_PREFIX(RasterPos2f):
+GLOBL_FN(GL_PREFIX(LoadName))
+GL_PREFIX(LoadName):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos2f))
-	JMP(GL_OFFSET(_gloffset_RasterPos2f))
+	JZ(GLNAME(_glapi_fallback_LoadName))
+	JMP(GL_OFFSET(_gloffset_LoadName))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos2i))
-GL_PREFIX(RasterPos2i):
+GLOBL_FN(GL_PREFIX(PassThrough))
+GL_PREFIX(PassThrough):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos2i))
-	JMP(GL_OFFSET(_gloffset_RasterPos2i))
+	JZ(GLNAME(_glapi_fallback_PassThrough))
+	JMP(GL_OFFSET(_gloffset_PassThrough))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos2s))
-GL_PREFIX(RasterPos2s):
+GLOBL_FN(GL_PREFIX(PopName))
+GL_PREFIX(PopName):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos2s))
-	JMP(GL_OFFSET(_gloffset_RasterPos2s))
+	JZ(GLNAME(_glapi_fallback_PopName))
+	JMP(GL_OFFSET(_gloffset_PopName))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos3d))
-GL_PREFIX(RasterPos3d):
+GLOBL_FN(GL_PREFIX(PushName))
+GL_PREFIX(PushName):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos3d))
-	JMP(GL_OFFSET(_gloffset_RasterPos3d))
+	JZ(GLNAME(_glapi_fallback_PushName))
+	JMP(GL_OFFSET(_gloffset_PushName))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos3f))
-GL_PREFIX(RasterPos3f):
+GLOBL_FN(GL_PREFIX(DrawBuffer))
+GL_PREFIX(DrawBuffer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos3f))
-	JMP(GL_OFFSET(_gloffset_RasterPos3f))
+	JZ(GLNAME(_glapi_fallback_DrawBuffer))
+	JMP(GL_OFFSET(_gloffset_DrawBuffer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos3i))
-GL_PREFIX(RasterPos3i):
+GLOBL_FN(GL_PREFIX(Clear))
+GL_PREFIX(Clear):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos3i))
-	JMP(GL_OFFSET(_gloffset_RasterPos3i))
+	JZ(GLNAME(_glapi_fallback_Clear))
+	JMP(GL_OFFSET(_gloffset_Clear))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos3s))
-GL_PREFIX(RasterPos3s):
+GLOBL_FN(GL_PREFIX(ClearAccum))
+GL_PREFIX(ClearAccum):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos3s))
-	JMP(GL_OFFSET(_gloffset_RasterPos3s))
+	JZ(GLNAME(_glapi_fallback_ClearAccum))
+	JMP(GL_OFFSET(_gloffset_ClearAccum))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos4d))
-GL_PREFIX(RasterPos4d):
+GLOBL_FN(GL_PREFIX(ClearIndex))
+GL_PREFIX(ClearIndex):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos4d))
-	JMP(GL_OFFSET(_gloffset_RasterPos4d))
+	JZ(GLNAME(_glapi_fallback_ClearIndex))
+	JMP(GL_OFFSET(_gloffset_ClearIndex))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos4f))
-GL_PREFIX(RasterPos4f):
+GLOBL_FN(GL_PREFIX(ClearColor))
+GL_PREFIX(ClearColor):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos4f))
-	JMP(GL_OFFSET(_gloffset_RasterPos4f))
+	JZ(GLNAME(_glapi_fallback_ClearColor))
+	JMP(GL_OFFSET(_gloffset_ClearColor))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos4i))
-GL_PREFIX(RasterPos4i):
+GLOBL_FN(GL_PREFIX(ClearStencil))
+GL_PREFIX(ClearStencil):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos4i))
-	JMP(GL_OFFSET(_gloffset_RasterPos4i))
+	JZ(GLNAME(_glapi_fallback_ClearStencil))
+	JMP(GL_OFFSET(_gloffset_ClearStencil))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos4s))
-GL_PREFIX(RasterPos4s):
+GLOBL_FN(GL_PREFIX(ClearDepth))
+GL_PREFIX(ClearDepth):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos4s))
-	JMP(GL_OFFSET(_gloffset_RasterPos4s))
+	JZ(GLNAME(_glapi_fallback_ClearDepth))
+	JMP(GL_OFFSET(_gloffset_ClearDepth))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos2dv))
-GL_PREFIX(RasterPos2dv):
+GLOBL_FN(GL_PREFIX(StencilMask))
+GL_PREFIX(StencilMask):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos2dv))
-	JMP(GL_OFFSET(_gloffset_RasterPos2dv))
+	JZ(GLNAME(_glapi_fallback_StencilMask))
+	JMP(GL_OFFSET(_gloffset_StencilMask))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos2fv))
-GL_PREFIX(RasterPos2fv):
+GLOBL_FN(GL_PREFIX(ColorMask))
+GL_PREFIX(ColorMask):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos2fv))
-	JMP(GL_OFFSET(_gloffset_RasterPos2fv))
+	JZ(GLNAME(_glapi_fallback_ColorMask))
+	JMP(GL_OFFSET(_gloffset_ColorMask))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos2iv))
-GL_PREFIX(RasterPos2iv):
+GLOBL_FN(GL_PREFIX(DepthMask))
+GL_PREFIX(DepthMask):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos2iv))
-	JMP(GL_OFFSET(_gloffset_RasterPos2iv))
+	JZ(GLNAME(_glapi_fallback_DepthMask))
+	JMP(GL_OFFSET(_gloffset_DepthMask))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos2sv))
-GL_PREFIX(RasterPos2sv):
+GLOBL_FN(GL_PREFIX(IndexMask))
+GL_PREFIX(IndexMask):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos2sv))
-	JMP(GL_OFFSET(_gloffset_RasterPos2sv))
+	JZ(GLNAME(_glapi_fallback_IndexMask))
+	JMP(GL_OFFSET(_gloffset_IndexMask))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos3dv))
-GL_PREFIX(RasterPos3dv):
+GLOBL_FN(GL_PREFIX(Accum))
+GL_PREFIX(Accum):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos3dv))
-	JMP(GL_OFFSET(_gloffset_RasterPos3dv))
+	JZ(GLNAME(_glapi_fallback_Accum))
+	JMP(GL_OFFSET(_gloffset_Accum))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos3fv))
-GL_PREFIX(RasterPos3fv):
+GLOBL_FN(GL_PREFIX(Disable))
+GL_PREFIX(Disable):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos3fv))
-	JMP(GL_OFFSET(_gloffset_RasterPos3fv))
+	JZ(GLNAME(_glapi_fallback_Disable))
+	JMP(GL_OFFSET(_gloffset_Disable))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos3iv))
-GL_PREFIX(RasterPos3iv):
+GLOBL_FN(GL_PREFIX(Enable))
+GL_PREFIX(Enable):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos3iv))
-	JMP(GL_OFFSET(_gloffset_RasterPos3iv))
+	JZ(GLNAME(_glapi_fallback_Enable))
+	JMP(GL_OFFSET(_gloffset_Enable))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos3sv))
-GL_PREFIX(RasterPos3sv):
+GLOBL_FN(GL_PREFIX(Finish))
+GL_PREFIX(Finish):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos3sv))
-	JMP(GL_OFFSET(_gloffset_RasterPos3sv))
+	JZ(GLNAME(_glapi_fallback_Finish))
+	JMP(GL_OFFSET(_gloffset_Finish))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos4dv))
-GL_PREFIX(RasterPos4dv):
+GLOBL_FN(GL_PREFIX(Flush))
+GL_PREFIX(Flush):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos4dv))
-	JMP(GL_OFFSET(_gloffset_RasterPos4dv))
+	JZ(GLNAME(_glapi_fallback_Flush))
+	JMP(GL_OFFSET(_gloffset_Flush))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos4fv))
-GL_PREFIX(RasterPos4fv):
+GLOBL_FN(GL_PREFIX(PopAttrib))
+GL_PREFIX(PopAttrib):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos4fv))
-	JMP(GL_OFFSET(_gloffset_RasterPos4fv))
+	JZ(GLNAME(_glapi_fallback_PopAttrib))
+	JMP(GL_OFFSET(_gloffset_PopAttrib))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos4iv))
-GL_PREFIX(RasterPos4iv):
+GLOBL_FN(GL_PREFIX(PushAttrib))
+GL_PREFIX(PushAttrib):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos4iv))
-	JMP(GL_OFFSET(_gloffset_RasterPos4iv))
+	JZ(GLNAME(_glapi_fallback_PushAttrib))
+	JMP(GL_OFFSET(_gloffset_PushAttrib))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RasterPos4sv))
-GL_PREFIX(RasterPos4sv):
+GLOBL_FN(GL_PREFIX(Map1d))
+GL_PREFIX(Map1d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RasterPos4sv))
-	JMP(GL_OFFSET(_gloffset_RasterPos4sv))
+	JZ(GLNAME(_glapi_fallback_Map1d))
+	JMP(GL_OFFSET(_gloffset_Map1d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ReadBuffer))
-GL_PREFIX(ReadBuffer):
+GLOBL_FN(GL_PREFIX(Map1f))
+GL_PREFIX(Map1f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ReadBuffer))
-	JMP(GL_OFFSET(_gloffset_ReadBuffer))
+	JZ(GLNAME(_glapi_fallback_Map1f))
+	JMP(GL_OFFSET(_gloffset_Map1f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ReadPixels))
-GL_PREFIX(ReadPixels):
+GLOBL_FN(GL_PREFIX(Map2d))
+GL_PREFIX(Map2d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ReadPixels))
-	JMP(GL_OFFSET(_gloffset_ReadPixels))
+	JZ(GLNAME(_glapi_fallback_Map2d))
+	JMP(GL_OFFSET(_gloffset_Map2d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rectd))
-GL_PREFIX(Rectd):
+GLOBL_FN(GL_PREFIX(Map2f))
+GL_PREFIX(Map2f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rectd))
-	JMP(GL_OFFSET(_gloffset_Rectd))
+	JZ(GLNAME(_glapi_fallback_Map2f))
+	JMP(GL_OFFSET(_gloffset_Map2f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rectdv))
-GL_PREFIX(Rectdv):
+GLOBL_FN(GL_PREFIX(MapGrid1d))
+GL_PREFIX(MapGrid1d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rectdv))
-	JMP(GL_OFFSET(_gloffset_Rectdv))
+	JZ(GLNAME(_glapi_fallback_MapGrid1d))
+	JMP(GL_OFFSET(_gloffset_MapGrid1d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rectf))
-GL_PREFIX(Rectf):
+GLOBL_FN(GL_PREFIX(MapGrid1f))
+GL_PREFIX(MapGrid1f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rectf))
-	JMP(GL_OFFSET(_gloffset_Rectf))
+	JZ(GLNAME(_glapi_fallback_MapGrid1f))
+	JMP(GL_OFFSET(_gloffset_MapGrid1f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rectfv))
-GL_PREFIX(Rectfv):
+GLOBL_FN(GL_PREFIX(MapGrid2d))
+GL_PREFIX(MapGrid2d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rectfv))
-	JMP(GL_OFFSET(_gloffset_Rectfv))
+	JZ(GLNAME(_glapi_fallback_MapGrid2d))
+	JMP(GL_OFFSET(_gloffset_MapGrid2d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Recti))
-GL_PREFIX(Recti):
+GLOBL_FN(GL_PREFIX(MapGrid2f))
+GL_PREFIX(MapGrid2f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Recti))
-	JMP(GL_OFFSET(_gloffset_Recti))
+	JZ(GLNAME(_glapi_fallback_MapGrid2f))
+	JMP(GL_OFFSET(_gloffset_MapGrid2f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rectiv))
-GL_PREFIX(Rectiv):
+GLOBL_FN(GL_PREFIX(EvalCoord1d))
+GL_PREFIX(EvalCoord1d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rectiv))
-	JMP(GL_OFFSET(_gloffset_Rectiv))
+	JZ(GLNAME(_glapi_fallback_EvalCoord1d))
+	JMP(GL_OFFSET(_gloffset_EvalCoord1d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rects))
-GL_PREFIX(Rects):
+GLOBL_FN(GL_PREFIX(EvalCoord1dv))
+GL_PREFIX(EvalCoord1dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rects))
-	JMP(GL_OFFSET(_gloffset_Rects))
+	JZ(GLNAME(_glapi_fallback_EvalCoord1dv))
+	JMP(GL_OFFSET(_gloffset_EvalCoord1dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rectsv))
-GL_PREFIX(Rectsv):
+GLOBL_FN(GL_PREFIX(EvalCoord1f))
+GL_PREFIX(EvalCoord1f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rectsv))
-	JMP(GL_OFFSET(_gloffset_Rectsv))
+	JZ(GLNAME(_glapi_fallback_EvalCoord1f))
+	JMP(GL_OFFSET(_gloffset_EvalCoord1f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RenderMode))
-GL_PREFIX(RenderMode):
+GLOBL_FN(GL_PREFIX(EvalCoord1fv))
+GL_PREFIX(EvalCoord1fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_RenderMode))
-	JMP(GL_OFFSET(_gloffset_RenderMode))
+	JZ(GLNAME(_glapi_fallback_EvalCoord1fv))
+	JMP(GL_OFFSET(_gloffset_EvalCoord1fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rotated))
-GL_PREFIX(Rotated):
+GLOBL_FN(GL_PREFIX(EvalCoord2d))
+GL_PREFIX(EvalCoord2d):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rotated))
-	JMP(GL_OFFSET(_gloffset_Rotated))
+	JZ(GLNAME(_glapi_fallback_EvalCoord2d))
+	JMP(GL_OFFSET(_gloffset_EvalCoord2d))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Rotatef))
-GL_PREFIX(Rotatef):
+GLOBL_FN(GL_PREFIX(EvalCoord2dv))
+GL_PREFIX(EvalCoord2dv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Rotatef))
-	JMP(GL_OFFSET(_gloffset_Rotatef))
+	JZ(GLNAME(_glapi_fallback_EvalCoord2dv))
+	JMP(GL_OFFSET(_gloffset_EvalCoord2dv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SelectBuffer))
-GL_PREFIX(SelectBuffer):
+GLOBL_FN(GL_PREFIX(EvalCoord2f))
+GL_PREFIX(EvalCoord2f):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SelectBuffer))
-	JMP(GL_OFFSET(_gloffset_SelectBuffer))
+	JZ(GLNAME(_glapi_fallback_EvalCoord2f))
+	JMP(GL_OFFSET(_gloffset_EvalCoord2f))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Scaled))
-GL_PREFIX(Scaled):
+GLOBL_FN(GL_PREFIX(EvalCoord2fv))
+GL_PREFIX(EvalCoord2fv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Scaled))
-	JMP(GL_OFFSET(_gloffset_Scaled))
+	JZ(GLNAME(_glapi_fallback_EvalCoord2fv))
+	JMP(GL_OFFSET(_gloffset_EvalCoord2fv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Scalef))
-GL_PREFIX(Scalef):
+GLOBL_FN(GL_PREFIX(EvalMesh1))
+GL_PREFIX(EvalMesh1):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Scalef))
-	JMP(GL_OFFSET(_gloffset_Scalef))
+	JZ(GLNAME(_glapi_fallback_EvalMesh1))
+	JMP(GL_OFFSET(_gloffset_EvalMesh1))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Scissor))
-GL_PREFIX(Scissor):
+GLOBL_FN(GL_PREFIX(EvalPoint1))
+GL_PREFIX(EvalPoint1):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Scissor))
-	JMP(GL_OFFSET(_gloffset_Scissor))
+	JZ(GLNAME(_glapi_fallback_EvalPoint1))
+	JMP(GL_OFFSET(_gloffset_EvalPoint1))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ShadeModel))
-GL_PREFIX(ShadeModel):
+GLOBL_FN(GL_PREFIX(EvalMesh2))
+GL_PREFIX(EvalMesh2):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ShadeModel))
-	JMP(GL_OFFSET(_gloffset_ShadeModel))
+	JZ(GLNAME(_glapi_fallback_EvalMesh2))
+	JMP(GL_OFFSET(_gloffset_EvalMesh2))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(StencilFunc))
-GL_PREFIX(StencilFunc):
+GLOBL_FN(GL_PREFIX(EvalPoint2))
+GL_PREFIX(EvalPoint2):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_StencilFunc))
-	JMP(GL_OFFSET(_gloffset_StencilFunc))
+	JZ(GLNAME(_glapi_fallback_EvalPoint2))
+	JMP(GL_OFFSET(_gloffset_EvalPoint2))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(StencilMask))
-GL_PREFIX(StencilMask):
+GLOBL_FN(GL_PREFIX(AlphaFunc))
+GL_PREFIX(AlphaFunc):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_StencilMask))
-	JMP(GL_OFFSET(_gloffset_StencilMask))
+	JZ(GLNAME(_glapi_fallback_AlphaFunc))
+	JMP(GL_OFFSET(_gloffset_AlphaFunc))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(StencilOp))
-GL_PREFIX(StencilOp):
+GLOBL_FN(GL_PREFIX(BlendFunc))
+GL_PREFIX(BlendFunc):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_StencilOp))
-	JMP(GL_OFFSET(_gloffset_StencilOp))
+	JZ(GLNAME(_glapi_fallback_BlendFunc))
+	JMP(GL_OFFSET(_gloffset_BlendFunc))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord1d))
-GL_PREFIX(TexCoord1d):
+GLOBL_FN(GL_PREFIX(LogicOp))
+GL_PREFIX(LogicOp):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord1d))
-	JMP(GL_OFFSET(_gloffset_TexCoord1d))
+	JZ(GLNAME(_glapi_fallback_LogicOp))
+	JMP(GL_OFFSET(_gloffset_LogicOp))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord1f))
-GL_PREFIX(TexCoord1f):
+GLOBL_FN(GL_PREFIX(StencilFunc))
+GL_PREFIX(StencilFunc):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord1f))
-	JMP(GL_OFFSET(_gloffset_TexCoord1f))
+	JZ(GLNAME(_glapi_fallback_StencilFunc))
+	JMP(GL_OFFSET(_gloffset_StencilFunc))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord1i))
-GL_PREFIX(TexCoord1i):
+GLOBL_FN(GL_PREFIX(StencilOp))
+GL_PREFIX(StencilOp):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord1i))
-	JMP(GL_OFFSET(_gloffset_TexCoord1i))
+	JZ(GLNAME(_glapi_fallback_StencilOp))
+	JMP(GL_OFFSET(_gloffset_StencilOp))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord1s))
-GL_PREFIX(TexCoord1s):
+GLOBL_FN(GL_PREFIX(DepthFunc))
+GL_PREFIX(DepthFunc):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord1s))
-	JMP(GL_OFFSET(_gloffset_TexCoord1s))
+	JZ(GLNAME(_glapi_fallback_DepthFunc))
+	JMP(GL_OFFSET(_gloffset_DepthFunc))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord2d))
-GL_PREFIX(TexCoord2d):
+GLOBL_FN(GL_PREFIX(PixelZoom))
+GL_PREFIX(PixelZoom):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord2d))
-	JMP(GL_OFFSET(_gloffset_TexCoord2d))
+	JZ(GLNAME(_glapi_fallback_PixelZoom))
+	JMP(GL_OFFSET(_gloffset_PixelZoom))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord2f))
-GL_PREFIX(TexCoord2f):
+GLOBL_FN(GL_PREFIX(PixelTransferf))
+GL_PREFIX(PixelTransferf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord2f))
-	JMP(GL_OFFSET(_gloffset_TexCoord2f))
+	JZ(GLNAME(_glapi_fallback_PixelTransferf))
+	JMP(GL_OFFSET(_gloffset_PixelTransferf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord2s))
-GL_PREFIX(TexCoord2s):
+GLOBL_FN(GL_PREFIX(PixelTransferi))
+GL_PREFIX(PixelTransferi):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord2s))
-	JMP(GL_OFFSET(_gloffset_TexCoord2s))
+	JZ(GLNAME(_glapi_fallback_PixelTransferi))
+	JMP(GL_OFFSET(_gloffset_PixelTransferi))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord2i))
-GL_PREFIX(TexCoord2i):
+GLOBL_FN(GL_PREFIX(PixelStoref))
+GL_PREFIX(PixelStoref):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord2i))
-	JMP(GL_OFFSET(_gloffset_TexCoord2i))
+	JZ(GLNAME(_glapi_fallback_PixelStoref))
+	JMP(GL_OFFSET(_gloffset_PixelStoref))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord3d))
-GL_PREFIX(TexCoord3d):
+GLOBL_FN(GL_PREFIX(PixelStorei))
+GL_PREFIX(PixelStorei):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord3d))
-	JMP(GL_OFFSET(_gloffset_TexCoord3d))
+	JZ(GLNAME(_glapi_fallback_PixelStorei))
+	JMP(GL_OFFSET(_gloffset_PixelStorei))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord3f))
-GL_PREFIX(TexCoord3f):
+GLOBL_FN(GL_PREFIX(PixelMapfv))
+GL_PREFIX(PixelMapfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord3f))
-	JMP(GL_OFFSET(_gloffset_TexCoord3f))
+	JZ(GLNAME(_glapi_fallback_PixelMapfv))
+	JMP(GL_OFFSET(_gloffset_PixelMapfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord3i))
-GL_PREFIX(TexCoord3i):
+GLOBL_FN(GL_PREFIX(PixelMapuiv))
+GL_PREFIX(PixelMapuiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord3i))
-	JMP(GL_OFFSET(_gloffset_TexCoord3i))
+	JZ(GLNAME(_glapi_fallback_PixelMapuiv))
+	JMP(GL_OFFSET(_gloffset_PixelMapuiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord3s))
-GL_PREFIX(TexCoord3s):
+GLOBL_FN(GL_PREFIX(PixelMapusv))
+GL_PREFIX(PixelMapusv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord3s))
-	JMP(GL_OFFSET(_gloffset_TexCoord3s))
+	JZ(GLNAME(_glapi_fallback_PixelMapusv))
+	JMP(GL_OFFSET(_gloffset_PixelMapusv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord4d))
-GL_PREFIX(TexCoord4d):
+GLOBL_FN(GL_PREFIX(ReadBuffer))
+GL_PREFIX(ReadBuffer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord4d))
-	JMP(GL_OFFSET(_gloffset_TexCoord4d))
+	JZ(GLNAME(_glapi_fallback_ReadBuffer))
+	JMP(GL_OFFSET(_gloffset_ReadBuffer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord4f))
-GL_PREFIX(TexCoord4f):
+GLOBL_FN(GL_PREFIX(CopyPixels))
+GL_PREFIX(CopyPixels):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord4f))
-	JMP(GL_OFFSET(_gloffset_TexCoord4f))
+	JZ(GLNAME(_glapi_fallback_CopyPixels))
+	JMP(GL_OFFSET(_gloffset_CopyPixels))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord4i))
-GL_PREFIX(TexCoord4i):
+GLOBL_FN(GL_PREFIX(ReadPixels))
+GL_PREFIX(ReadPixels):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord4i))
-	JMP(GL_OFFSET(_gloffset_TexCoord4i))
+	JZ(GLNAME(_glapi_fallback_ReadPixels))
+	JMP(GL_OFFSET(_gloffset_ReadPixels))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord4s))
-GL_PREFIX(TexCoord4s):
+GLOBL_FN(GL_PREFIX(DrawPixels))
+GL_PREFIX(DrawPixels):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord4s))
-	JMP(GL_OFFSET(_gloffset_TexCoord4s))
+	JZ(GLNAME(_glapi_fallback_DrawPixels))
+	JMP(GL_OFFSET(_gloffset_DrawPixels))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord1dv))
-GL_PREFIX(TexCoord1dv):
+GLOBL_FN(GL_PREFIX(GetBooleanv))
+GL_PREFIX(GetBooleanv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord1dv))
-	JMP(GL_OFFSET(_gloffset_TexCoord1dv))
+	JZ(GLNAME(_glapi_fallback_GetBooleanv))
+	JMP(GL_OFFSET(_gloffset_GetBooleanv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord1fv))
-GL_PREFIX(TexCoord1fv):
+GLOBL_FN(GL_PREFIX(GetClipPlane))
+GL_PREFIX(GetClipPlane):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord1fv))
-	JMP(GL_OFFSET(_gloffset_TexCoord1fv))
+	JZ(GLNAME(_glapi_fallback_GetClipPlane))
+	JMP(GL_OFFSET(_gloffset_GetClipPlane))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord1iv))
-GL_PREFIX(TexCoord1iv):
+GLOBL_FN(GL_PREFIX(GetDoublev))
+GL_PREFIX(GetDoublev):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord1iv))
-	JMP(GL_OFFSET(_gloffset_TexCoord1iv))
+	JZ(GLNAME(_glapi_fallback_GetDoublev))
+	JMP(GL_OFFSET(_gloffset_GetDoublev))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord1sv))
-GL_PREFIX(TexCoord1sv):
+GLOBL_FN(GL_PREFIX(GetError))
+GL_PREFIX(GetError):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord1sv))
-	JMP(GL_OFFSET(_gloffset_TexCoord1sv))
+	JZ(GLNAME(_glapi_fallback_GetError))
+	JMP(GL_OFFSET(_gloffset_GetError))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord2dv))
-GL_PREFIX(TexCoord2dv):
+GLOBL_FN(GL_PREFIX(GetFloatv))
+GL_PREFIX(GetFloatv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord2dv))
-	JMP(GL_OFFSET(_gloffset_TexCoord2dv))
+	JZ(GLNAME(_glapi_fallback_GetFloatv))
+	JMP(GL_OFFSET(_gloffset_GetFloatv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord2fv))
-GL_PREFIX(TexCoord2fv):
+GLOBL_FN(GL_PREFIX(GetIntegerv))
+GL_PREFIX(GetIntegerv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord2fv))
-	JMP(GL_OFFSET(_gloffset_TexCoord2fv))
+	JZ(GLNAME(_glapi_fallback_GetIntegerv))
+	JMP(GL_OFFSET(_gloffset_GetIntegerv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord2iv))
-GL_PREFIX(TexCoord2iv):
+GLOBL_FN(GL_PREFIX(GetLightfv))
+GL_PREFIX(GetLightfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord2iv))
-	JMP(GL_OFFSET(_gloffset_TexCoord2iv))
+	JZ(GLNAME(_glapi_fallback_GetLightfv))
+	JMP(GL_OFFSET(_gloffset_GetLightfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord2sv))
-GL_PREFIX(TexCoord2sv):
+GLOBL_FN(GL_PREFIX(GetLightiv))
+GL_PREFIX(GetLightiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord2sv))
-	JMP(GL_OFFSET(_gloffset_TexCoord2sv))
+	JZ(GLNAME(_glapi_fallback_GetLightiv))
+	JMP(GL_OFFSET(_gloffset_GetLightiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord3dv))
-GL_PREFIX(TexCoord3dv):
+GLOBL_FN(GL_PREFIX(GetMapdv))
+GL_PREFIX(GetMapdv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord3dv))
-	JMP(GL_OFFSET(_gloffset_TexCoord3dv))
+	JZ(GLNAME(_glapi_fallback_GetMapdv))
+	JMP(GL_OFFSET(_gloffset_GetMapdv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord3fv))
-GL_PREFIX(TexCoord3fv):
+GLOBL_FN(GL_PREFIX(GetMapfv))
+GL_PREFIX(GetMapfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord3fv))
-	JMP(GL_OFFSET(_gloffset_TexCoord3fv))
+	JZ(GLNAME(_glapi_fallback_GetMapfv))
+	JMP(GL_OFFSET(_gloffset_GetMapfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord3iv))
-GL_PREFIX(TexCoord3iv):
+GLOBL_FN(GL_PREFIX(GetMapiv))
+GL_PREFIX(GetMapiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord3iv))
-	JMP(GL_OFFSET(_gloffset_TexCoord3iv))
+	JZ(GLNAME(_glapi_fallback_GetMapiv))
+	JMP(GL_OFFSET(_gloffset_GetMapiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord3sv))
-GL_PREFIX(TexCoord3sv):
+GLOBL_FN(GL_PREFIX(GetMaterialfv))
+GL_PREFIX(GetMaterialfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord3sv))
-	JMP(GL_OFFSET(_gloffset_TexCoord3sv))
+	JZ(GLNAME(_glapi_fallback_GetMaterialfv))
+	JMP(GL_OFFSET(_gloffset_GetMaterialfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord4dv))
-GL_PREFIX(TexCoord4dv):
+GLOBL_FN(GL_PREFIX(GetMaterialiv))
+GL_PREFIX(GetMaterialiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord4dv))
-	JMP(GL_OFFSET(_gloffset_TexCoord4dv))
+	JZ(GLNAME(_glapi_fallback_GetMaterialiv))
+	JMP(GL_OFFSET(_gloffset_GetMaterialiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord4fv))
-GL_PREFIX(TexCoord4fv):
+GLOBL_FN(GL_PREFIX(GetPixelMapfv))
+GL_PREFIX(GetPixelMapfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord4fv))
-	JMP(GL_OFFSET(_gloffset_TexCoord4fv))
+	JZ(GLNAME(_glapi_fallback_GetPixelMapfv))
+	JMP(GL_OFFSET(_gloffset_GetPixelMapfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord4iv))
-GL_PREFIX(TexCoord4iv):
+GLOBL_FN(GL_PREFIX(GetPixelMapuiv))
+GL_PREFIX(GetPixelMapuiv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord4iv))
-	JMP(GL_OFFSET(_gloffset_TexCoord4iv))
+	JZ(GLNAME(_glapi_fallback_GetPixelMapuiv))
+	JMP(GL_OFFSET(_gloffset_GetPixelMapuiv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoord4sv))
-GL_PREFIX(TexCoord4sv):
+GLOBL_FN(GL_PREFIX(GetPixelMapusv))
+GL_PREFIX(GetPixelMapusv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoord4sv))
-	JMP(GL_OFFSET(_gloffset_TexCoord4sv))
+	JZ(GLNAME(_glapi_fallback_GetPixelMapusv))
+	JMP(GL_OFFSET(_gloffset_GetPixelMapusv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexGend))
-GL_PREFIX(TexGend):
+GLOBL_FN(GL_PREFIX(GetPolygonStipple))
+GL_PREFIX(GetPolygonStipple):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexGend))
-	JMP(GL_OFFSET(_gloffset_TexGend))
+	JZ(GLNAME(_glapi_fallback_GetPolygonStipple))
+	JMP(GL_OFFSET(_gloffset_GetPolygonStipple))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexGendv))
-GL_PREFIX(TexGendv):
+GLOBL_FN(GL_PREFIX(GetString))
+GL_PREFIX(GetString):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexGendv))
-	JMP(GL_OFFSET(_gloffset_TexGendv))
+	JZ(GLNAME(_glapi_fallback_GetString))
+	JMP(GL_OFFSET(_gloffset_GetString))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexGenf))
-GL_PREFIX(TexGenf):
+GLOBL_FN(GL_PREFIX(GetTexEnvfv))
+GL_PREFIX(GetTexEnvfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexGenf))
-	JMP(GL_OFFSET(_gloffset_TexGenf))
+	JZ(GLNAME(_glapi_fallback_GetTexEnvfv))
+	JMP(GL_OFFSET(_gloffset_GetTexEnvfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexGenfv))
-GL_PREFIX(TexGenfv):
+GLOBL_FN(GL_PREFIX(GetTexEnviv))
+GL_PREFIX(GetTexEnviv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexGenfv))
-	JMP(GL_OFFSET(_gloffset_TexGenfv))
+	JZ(GLNAME(_glapi_fallback_GetTexEnviv))
+	JMP(GL_OFFSET(_gloffset_GetTexEnviv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexGeni))
-GL_PREFIX(TexGeni):
+GLOBL_FN(GL_PREFIX(GetTexGendv))
+GL_PREFIX(GetTexGendv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexGeni))
-	JMP(GL_OFFSET(_gloffset_TexGeni))
+	JZ(GLNAME(_glapi_fallback_GetTexGendv))
+	JMP(GL_OFFSET(_gloffset_GetTexGendv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexGeniv))
-GL_PREFIX(TexGeniv):
+GLOBL_FN(GL_PREFIX(GetTexGenfv))
+GL_PREFIX(GetTexGenfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexGeniv))
-	JMP(GL_OFFSET(_gloffset_TexGeniv))
+	JZ(GLNAME(_glapi_fallback_GetTexGenfv))
+	JMP(GL_OFFSET(_gloffset_GetTexGenfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexEnvf))
-GL_PREFIX(TexEnvf):
+GLOBL_FN(GL_PREFIX(GetTexGeniv))
+GL_PREFIX(GetTexGeniv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexEnvf))
-	JMP(GL_OFFSET(_gloffset_TexEnvf))
+	JZ(GLNAME(_glapi_fallback_GetTexGeniv))
+	JMP(GL_OFFSET(_gloffset_GetTexGeniv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexEnvfv))
-GL_PREFIX(TexEnvfv):
+GLOBL_FN(GL_PREFIX(GetTexImage))
+GL_PREFIX(GetTexImage):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexEnvfv))
-	JMP(GL_OFFSET(_gloffset_TexEnvfv))
+	JZ(GLNAME(_glapi_fallback_GetTexImage))
+	JMP(GL_OFFSET(_gloffset_GetTexImage))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexEnvi))
-GL_PREFIX(TexEnvi):
+GLOBL_FN(GL_PREFIX(GetTexParameterfv))
+GL_PREFIX(GetTexParameterfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexEnvi))
-	JMP(GL_OFFSET(_gloffset_TexEnvi))
+	JZ(GLNAME(_glapi_fallback_GetTexParameterfv))
+	JMP(GL_OFFSET(_gloffset_GetTexParameterfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexEnviv))
-GL_PREFIX(TexEnviv):
+GLOBL_FN(GL_PREFIX(GetTexParameteriv))
+GL_PREFIX(GetTexParameteriv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexEnviv))
-	JMP(GL_OFFSET(_gloffset_TexEnviv))
+	JZ(GLNAME(_glapi_fallback_GetTexParameteriv))
+	JMP(GL_OFFSET(_gloffset_GetTexParameteriv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexImage1D))
-GL_PREFIX(TexImage1D):
+GLOBL_FN(GL_PREFIX(GetTexLevelParameterfv))
+GL_PREFIX(GetTexLevelParameterfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexImage1D))
-	JMP(GL_OFFSET(_gloffset_TexImage1D))
+	JZ(GLNAME(_glapi_fallback_GetTexLevelParameterfv))
+	JMP(GL_OFFSET(_gloffset_GetTexLevelParameterfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexImage2D))
-GL_PREFIX(TexImage2D):
+GLOBL_FN(GL_PREFIX(GetTexLevelParameteriv))
+GL_PREFIX(GetTexLevelParameteriv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexImage2D))
-	JMP(GL_OFFSET(_gloffset_TexImage2D))
+	JZ(GLNAME(_glapi_fallback_GetTexLevelParameteriv))
+	JMP(GL_OFFSET(_gloffset_GetTexLevelParameteriv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexParameterf))
-GL_PREFIX(TexParameterf):
+GLOBL_FN(GL_PREFIX(IsEnabled))
+GL_PREFIX(IsEnabled):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexParameterf))
-	JMP(GL_OFFSET(_gloffset_TexParameterf))
+	JZ(GLNAME(_glapi_fallback_IsEnabled))
+	JMP(GL_OFFSET(_gloffset_IsEnabled))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexParameterfv))
-GL_PREFIX(TexParameterfv):
+GLOBL_FN(GL_PREFIX(IsList))
+GL_PREFIX(IsList):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexParameterfv))
-	JMP(GL_OFFSET(_gloffset_TexParameterfv))
+	JZ(GLNAME(_glapi_fallback_IsList))
+	JMP(GL_OFFSET(_gloffset_IsList))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexParameteri))
-GL_PREFIX(TexParameteri):
+GLOBL_FN(GL_PREFIX(DepthRange))
+GL_PREFIX(DepthRange):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexParameteri))
-	JMP(GL_OFFSET(_gloffset_TexParameteri))
+	JZ(GLNAME(_glapi_fallback_DepthRange))
+	JMP(GL_OFFSET(_gloffset_DepthRange))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexParameteriv))
-GL_PREFIX(TexParameteriv):
+GLOBL_FN(GL_PREFIX(Frustum))
+GL_PREFIX(Frustum):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexParameteriv))
-	JMP(GL_OFFSET(_gloffset_TexParameteriv))
+	JZ(GLNAME(_glapi_fallback_Frustum))
+	JMP(GL_OFFSET(_gloffset_Frustum))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Translated))
-GL_PREFIX(Translated):
+GLOBL_FN(GL_PREFIX(LoadIdentity))
+GL_PREFIX(LoadIdentity):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Translated))
-	JMP(GL_OFFSET(_gloffset_Translated))
+	JZ(GLNAME(_glapi_fallback_LoadIdentity))
+	JMP(GL_OFFSET(_gloffset_LoadIdentity))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Translatef))
-GL_PREFIX(Translatef):
+GLOBL_FN(GL_PREFIX(LoadMatrixf))
+GL_PREFIX(LoadMatrixf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Translatef))
-	JMP(GL_OFFSET(_gloffset_Translatef))
+	JZ(GLNAME(_glapi_fallback_LoadMatrixf))
+	JMP(GL_OFFSET(_gloffset_LoadMatrixf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex2d))
-GL_PREFIX(Vertex2d):
+GLOBL_FN(GL_PREFIX(LoadMatrixd))
+GL_PREFIX(LoadMatrixd):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex2d))
-	JMP(GL_OFFSET(_gloffset_Vertex2d))
+	JZ(GLNAME(_glapi_fallback_LoadMatrixd))
+	JMP(GL_OFFSET(_gloffset_LoadMatrixd))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex2dv))
-GL_PREFIX(Vertex2dv):
+GLOBL_FN(GL_PREFIX(MatrixMode))
+GL_PREFIX(MatrixMode):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex2dv))
-	JMP(GL_OFFSET(_gloffset_Vertex2dv))
+	JZ(GLNAME(_glapi_fallback_MatrixMode))
+	JMP(GL_OFFSET(_gloffset_MatrixMode))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex2f))
-GL_PREFIX(Vertex2f):
+GLOBL_FN(GL_PREFIX(MultMatrixf))
+GL_PREFIX(MultMatrixf):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex2f))
-	JMP(GL_OFFSET(_gloffset_Vertex2f))
+	JZ(GLNAME(_glapi_fallback_MultMatrixf))
+	JMP(GL_OFFSET(_gloffset_MultMatrixf))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex2fv))
-GL_PREFIX(Vertex2fv):
+GLOBL_FN(GL_PREFIX(MultMatrixd))
+GL_PREFIX(MultMatrixd):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex2fv))
-	JMP(GL_OFFSET(_gloffset_Vertex2fv))
+	JZ(GLNAME(_glapi_fallback_MultMatrixd))
+	JMP(GL_OFFSET(_gloffset_MultMatrixd))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex2i))
-GL_PREFIX(Vertex2i):
+GLOBL_FN(GL_PREFIX(Ortho))
+GL_PREFIX(Ortho):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex2i))
-	JMP(GL_OFFSET(_gloffset_Vertex2i))
+	JZ(GLNAME(_glapi_fallback_Ortho))
+	JMP(GL_OFFSET(_gloffset_Ortho))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex2iv))
-GL_PREFIX(Vertex2iv):
+GLOBL_FN(GL_PREFIX(PopMatrix))
+GL_PREFIX(PopMatrix):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex2iv))
-	JMP(GL_OFFSET(_gloffset_Vertex2iv))
+	JZ(GLNAME(_glapi_fallback_PopMatrix))
+	JMP(GL_OFFSET(_gloffset_PopMatrix))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex2s))
-GL_PREFIX(Vertex2s):
+GLOBL_FN(GL_PREFIX(PushMatrix))
+GL_PREFIX(PushMatrix):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex2s))
-	JMP(GL_OFFSET(_gloffset_Vertex2s))
+	JZ(GLNAME(_glapi_fallback_PushMatrix))
+	JMP(GL_OFFSET(_gloffset_PushMatrix))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex2sv))
-GL_PREFIX(Vertex2sv):
+GLOBL_FN(GL_PREFIX(Rotated))
+GL_PREFIX(Rotated):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex2sv))
-	JMP(GL_OFFSET(_gloffset_Vertex2sv))
+	JZ(GLNAME(_glapi_fallback_Rotated))
+	JMP(GL_OFFSET(_gloffset_Rotated))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex3d))
-GL_PREFIX(Vertex3d):
+GLOBL_FN(GL_PREFIX(Rotatef))
+GL_PREFIX(Rotatef):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex3d))
-	JMP(GL_OFFSET(_gloffset_Vertex3d))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex3dv))
-GL_PREFIX(Vertex3dv):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex3dv))
-	JMP(GL_OFFSET(_gloffset_Vertex3dv))
+	JZ(GLNAME(_glapi_fallback_Rotatef))
+	JMP(GL_OFFSET(_gloffset_Rotatef))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex3f))
-GL_PREFIX(Vertex3f):
+GLOBL_FN(GL_PREFIX(Scaled))
+GL_PREFIX(Scaled):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex3f))
-	JMP(GL_OFFSET(_gloffset_Vertex3f))
+	JZ(GLNAME(_glapi_fallback_Scaled))
+	JMP(GL_OFFSET(_gloffset_Scaled))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex3fv))
-GL_PREFIX(Vertex3fv):
+GLOBL_FN(GL_PREFIX(Scalef))
+GL_PREFIX(Scalef):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex3fv))
-	JMP(GL_OFFSET(_gloffset_Vertex3fv))
+	JZ(GLNAME(_glapi_fallback_Scalef))
+	JMP(GL_OFFSET(_gloffset_Scalef))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex3i))
-GL_PREFIX(Vertex3i):
+GLOBL_FN(GL_PREFIX(Translated))
+GL_PREFIX(Translated):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex3i))
-	JMP(GL_OFFSET(_gloffset_Vertex3i))
+	JZ(GLNAME(_glapi_fallback_Translated))
+	JMP(GL_OFFSET(_gloffset_Translated))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex3iv))
-GL_PREFIX(Vertex3iv):
+GLOBL_FN(GL_PREFIX(Translatef))
+GL_PREFIX(Translatef):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex3iv))
-	JMP(GL_OFFSET(_gloffset_Vertex3iv))
+	JZ(GLNAME(_glapi_fallback_Translatef))
+	JMP(GL_OFFSET(_gloffset_Translatef))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex3s))
-GL_PREFIX(Vertex3s):
+GLOBL_FN(GL_PREFIX(Viewport))
+GL_PREFIX(Viewport):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex3s))
-	JMP(GL_OFFSET(_gloffset_Vertex3s))
+	JZ(GLNAME(_glapi_fallback_Viewport))
+	JMP(GL_OFFSET(_gloffset_Viewport))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex3sv))
-GL_PREFIX(Vertex3sv):
+GLOBL_FN(GL_PREFIX(ArrayElement))
+GL_PREFIX(ArrayElement):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex3sv))
-	JMP(GL_OFFSET(_gloffset_Vertex3sv))
+	JZ(GLNAME(_glapi_fallback_ArrayElement))
+	JMP(GL_OFFSET(_gloffset_ArrayElement))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex4d))
-GL_PREFIX(Vertex4d):
+GLOBL_FN(GL_PREFIX(ColorPointer))
+GL_PREFIX(ColorPointer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex4d))
-	JMP(GL_OFFSET(_gloffset_Vertex4d))
+	JZ(GLNAME(_glapi_fallback_ColorPointer))
+	JMP(GL_OFFSET(_gloffset_ColorPointer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex4dv))
-GL_PREFIX(Vertex4dv):
+GLOBL_FN(GL_PREFIX(DisableClientState))
+GL_PREFIX(DisableClientState):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex4dv))
-	JMP(GL_OFFSET(_gloffset_Vertex4dv))
+	JZ(GLNAME(_glapi_fallback_DisableClientState))
+	JMP(GL_OFFSET(_gloffset_DisableClientState))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex4f))
-GL_PREFIX(Vertex4f):
+GLOBL_FN(GL_PREFIX(DrawArrays))
+GL_PREFIX(DrawArrays):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex4f))
-	JMP(GL_OFFSET(_gloffset_Vertex4f))
+	JZ(GLNAME(_glapi_fallback_DrawArrays))
+	JMP(GL_OFFSET(_gloffset_DrawArrays))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex4fv))
-GL_PREFIX(Vertex4fv):
+GLOBL_FN(GL_PREFIX(DrawElements))
+GL_PREFIX(DrawElements):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex4fv))
-	JMP(GL_OFFSET(_gloffset_Vertex4fv))
+	JZ(GLNAME(_glapi_fallback_DrawElements))
+	JMP(GL_OFFSET(_gloffset_DrawElements))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex4i))
-GL_PREFIX(Vertex4i):
+GLOBL_FN(GL_PREFIX(EdgeFlagPointer))
+GL_PREFIX(EdgeFlagPointer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex4i))
-	JMP(GL_OFFSET(_gloffset_Vertex4i))
+	JZ(GLNAME(_glapi_fallback_EdgeFlagPointer))
+	JMP(GL_OFFSET(_gloffset_EdgeFlagPointer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex4iv))
-GL_PREFIX(Vertex4iv):
+GLOBL_FN(GL_PREFIX(EnableClientState))
+GL_PREFIX(EnableClientState):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex4iv))
-	JMP(GL_OFFSET(_gloffset_Vertex4iv))
+	JZ(GLNAME(_glapi_fallback_EnableClientState))
+	JMP(GL_OFFSET(_gloffset_EnableClientState))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex4s))
-GL_PREFIX(Vertex4s):
+GLOBL_FN(GL_PREFIX(GetPointerv))
+GL_PREFIX(GetPointerv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex4s))
-	JMP(GL_OFFSET(_gloffset_Vertex4s))
+	JZ(GLNAME(_glapi_fallback_GetPointerv))
+	JMP(GL_OFFSET(_gloffset_GetPointerv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Vertex4sv))
-GL_PREFIX(Vertex4sv):
+GLOBL_FN(GL_PREFIX(IndexPointer))
+GL_PREFIX(IndexPointer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Vertex4sv))
-	JMP(GL_OFFSET(_gloffset_Vertex4sv))
+	JZ(GLNAME(_glapi_fallback_IndexPointer))
+	JMP(GL_OFFSET(_gloffset_IndexPointer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(Viewport))
-GL_PREFIX(Viewport):
+GLOBL_FN(GL_PREFIX(InterleavedArrays))
+GL_PREFIX(InterleavedArrays):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Viewport))
-	JMP(GL_OFFSET(_gloffset_Viewport))
+	JZ(GLNAME(_glapi_fallback_InterleavedArrays))
+	JMP(GL_OFFSET(_gloffset_InterleavedArrays))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(AreTexturesResident))
-GL_PREFIX(AreTexturesResident):
+GLOBL_FN(GL_PREFIX(NormalPointer))
+GL_PREFIX(NormalPointer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_AreTexturesResident))
-	JMP(GL_OFFSET(_gloffset_AreTexturesResident))
+	JZ(GLNAME(_glapi_fallback_NormalPointer))
+	JMP(GL_OFFSET(_gloffset_NormalPointer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ArrayElement))
-GL_PREFIX(ArrayElement):
+GLOBL_FN(GL_PREFIX(TexCoordPointer))
+GL_PREFIX(TexCoordPointer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ArrayElement))
-	JMP(GL_OFFSET(_gloffset_ArrayElement))
+	JZ(GLNAME(_glapi_fallback_TexCoordPointer))
+	JMP(GL_OFFSET(_gloffset_TexCoordPointer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BindTexture))
-GL_PREFIX(BindTexture):
+GLOBL_FN(GL_PREFIX(VertexPointer))
+GL_PREFIX(VertexPointer):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_BindTexture))
-	JMP(GL_OFFSET(_gloffset_BindTexture))
+	JZ(GLNAME(_glapi_fallback_VertexPointer))
+	JMP(GL_OFFSET(_gloffset_VertexPointer))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorPointer))
-GL_PREFIX(ColorPointer):
+GLOBL_FN(GL_PREFIX(PolygonOffset))
+GL_PREFIX(PolygonOffset):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorPointer))
-	JMP(GL_OFFSET(_gloffset_ColorPointer))
+	JZ(GLNAME(_glapi_fallback_PolygonOffset))
+	JMP(GL_OFFSET(_gloffset_PolygonOffset))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(CopyTexImage1D))
@@ -2572,44 +2612,44 @@
 	JMP(GL_OFFSET(_gloffset_CopyTexSubImage2D))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DeleteTextures))
-GL_PREFIX(DeleteTextures):
+GLOBL_FN(GL_PREFIX(TexSubImage1D))
+GL_PREFIX(TexSubImage1D):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DeleteTextures))
-	JMP(GL_OFFSET(_gloffset_DeleteTextures))
+	JZ(GLNAME(_glapi_fallback_TexSubImage1D))
+	JMP(GL_OFFSET(_gloffset_TexSubImage1D))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DisableClientState))
-GL_PREFIX(DisableClientState):
+GLOBL_FN(GL_PREFIX(TexSubImage2D))
+GL_PREFIX(TexSubImage2D):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DisableClientState))
-	JMP(GL_OFFSET(_gloffset_DisableClientState))
+	JZ(GLNAME(_glapi_fallback_TexSubImage2D))
+	JMP(GL_OFFSET(_gloffset_TexSubImage2D))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DrawArrays))
-GL_PREFIX(DrawArrays):
+GLOBL_FN(GL_PREFIX(AreTexturesResident))
+GL_PREFIX(AreTexturesResident):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DrawArrays))
-	JMP(GL_OFFSET(_gloffset_DrawArrays))
+	JZ(GLNAME(_glapi_fallback_AreTexturesResident))
+	JMP(GL_OFFSET(_gloffset_AreTexturesResident))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EdgeFlagPointer))
-GL_PREFIX(EdgeFlagPointer):
+GLOBL_FN(GL_PREFIX(BindTexture))
+GL_PREFIX(BindTexture):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EdgeFlagPointer))
-	JMP(GL_OFFSET(_gloffset_EdgeFlagPointer))
+	JZ(GLNAME(_glapi_fallback_BindTexture))
+	JMP(GL_OFFSET(_gloffset_BindTexture))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EnableClientState))
-GL_PREFIX(EnableClientState):
+GLOBL_FN(GL_PREFIX(DeleteTextures))
+GL_PREFIX(DeleteTextures):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_EnableClientState))
-	JMP(GL_OFFSET(_gloffset_EnableClientState))
+	JZ(GLNAME(_glapi_fallback_DeleteTextures))
+	JMP(GL_OFFSET(_gloffset_DeleteTextures))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GenTextures))
@@ -2620,20 +2660,20 @@
 	JMP(GL_OFFSET(_gloffset_GenTextures))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetPointerv))
-GL_PREFIX(GetPointerv):
+GLOBL_FN(GL_PREFIX(IsTexture))
+GL_PREFIX(IsTexture):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetPointerv))
-	JMP(GL_OFFSET(_gloffset_GetPointerv))
+	JZ(GLNAME(_glapi_fallback_IsTexture))
+	JMP(GL_OFFSET(_gloffset_IsTexture))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IndexPointer))
-GL_PREFIX(IndexPointer):
+GLOBL_FN(GL_PREFIX(PrioritizeTextures))
+GL_PREFIX(PrioritizeTextures):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_IndexPointer))
-	JMP(GL_OFFSET(_gloffset_IndexPointer))
+	JZ(GLNAME(_glapi_fallback_PrioritizeTextures))
+	JMP(GL_OFFSET(_gloffset_PrioritizeTextures))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Indexub))
@@ -2652,140 +2692,100 @@
 	JMP(GL_OFFSET(_gloffset_Indexubv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(InterleavedArrays))
-GL_PREFIX(InterleavedArrays):
+GLOBL_FN(GL_PREFIX(PopClientAttrib))
+GL_PREFIX(PopClientAttrib):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_InterleavedArrays))
-	JMP(GL_OFFSET(_gloffset_InterleavedArrays))
+	JZ(GLNAME(_glapi_fallback_PopClientAttrib))
+	JMP(GL_OFFSET(_gloffset_PopClientAttrib))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IsTexture))
-GL_PREFIX(IsTexture):
+GLOBL_FN(GL_PREFIX(PushClientAttrib))
+GL_PREFIX(PushClientAttrib):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_IsTexture))
-	JMP(GL_OFFSET(_gloffset_IsTexture))
+	JZ(GLNAME(_glapi_fallback_PushClientAttrib))
+	JMP(GL_OFFSET(_gloffset_PushClientAttrib))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(NormalPointer))
-GL_PREFIX(NormalPointer):
+GLOBL_FN(GL_PREFIX(BlendColor))
+GL_PREFIX(BlendColor):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_NormalPointer))
-	JMP(GL_OFFSET(_gloffset_NormalPointer))
+	JZ(GLNAME(_glapi_fallback_BlendColor))
+	JMP(GL_OFFSET(_gloffset_BlendColor))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PolygonOffset))
-GL_PREFIX(PolygonOffset):
+GLOBL_FN(GL_PREFIX(BlendEquation))
+GL_PREFIX(BlendEquation):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PolygonOffset))
-	JMP(GL_OFFSET(_gloffset_PolygonOffset))
+	JZ(GLNAME(_glapi_fallback_BlendEquation))
+	JMP(GL_OFFSET(_gloffset_BlendEquation))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PopClientAttrib))
-GL_PREFIX(PopClientAttrib):
+GLOBL_FN(GL_PREFIX(DrawRangeElements))
+GL_PREFIX(DrawRangeElements):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PopClientAttrib))
-	JMP(GL_OFFSET(_gloffset_PopClientAttrib))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PrioritizeTextures))
-GL_PREFIX(PrioritizeTextures):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PrioritizeTextures))
-	JMP(GL_OFFSET(_gloffset_PrioritizeTextures))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PushClientAttrib))
-GL_PREFIX(PushClientAttrib):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PushClientAttrib))
-	JMP(GL_OFFSET(_gloffset_PushClientAttrib))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoordPointer))
-GL_PREFIX(TexCoordPointer):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexCoordPointer))
-	JMP(GL_OFFSET(_gloffset_TexCoordPointer))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexSubImage1D))
-GL_PREFIX(TexSubImage1D):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexSubImage1D))
-	JMP(GL_OFFSET(_gloffset_TexSubImage1D))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexSubImage2D))
-GL_PREFIX(TexSubImage2D):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexSubImage2D))
-	JMP(GL_OFFSET(_gloffset_TexSubImage2D))
+	JZ(GLNAME(_glapi_fallback_DrawRangeElements))
+	JMP(GL_OFFSET(_gloffset_DrawRangeElements))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexPointer))
-GL_PREFIX(VertexPointer):
+GLOBL_FN(GL_PREFIX(ColorTable))
+GL_PREFIX(ColorTable):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_VertexPointer))
-	JMP(GL_OFFSET(_gloffset_VertexPointer))
+	JZ(GLNAME(_glapi_fallback_ColorTable))
+	JMP(GL_OFFSET(_gloffset_ColorTable))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CopyTexSubImage3D))
-GL_PREFIX(CopyTexSubImage3D):
+GLOBL_FN(GL_PREFIX(ColorTableParameterfv))
+GL_PREFIX(ColorTableParameterfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyTexSubImage3D))
-	JMP(GL_OFFSET(_gloffset_CopyTexSubImage3D))
+	JZ(GLNAME(_glapi_fallback_ColorTableParameterfv))
+	JMP(GL_OFFSET(_gloffset_ColorTableParameterfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DrawRangeElements))
-GL_PREFIX(DrawRangeElements):
+GLOBL_FN(GL_PREFIX(ColorTableParameteriv))
+GL_PREFIX(ColorTableParameteriv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DrawRangeElements))
-	JMP(GL_OFFSET(_gloffset_DrawRangeElements))
+	JZ(GLNAME(_glapi_fallback_ColorTableParameteriv))
+	JMP(GL_OFFSET(_gloffset_ColorTableParameteriv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexImage3D))
-GL_PREFIX(TexImage3D):
+GLOBL_FN(GL_PREFIX(CopyColorTable))
+GL_PREFIX(CopyColorTable):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexImage3D))
-	JMP(GL_OFFSET(_gloffset_TexImage3D))
+	JZ(GLNAME(_glapi_fallback_CopyColorTable))
+	JMP(GL_OFFSET(_gloffset_CopyColorTable))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexSubImage3D))
-GL_PREFIX(TexSubImage3D):
+GLOBL_FN(GL_PREFIX(GetColorTable))
+GL_PREFIX(GetColorTable):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexSubImage3D))
-	JMP(GL_OFFSET(_gloffset_TexSubImage3D))
+	JZ(GLNAME(_glapi_fallback_GetColorTable))
+	JMP(GL_OFFSET(_gloffset_GetColorTable))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BlendColor))
-GL_PREFIX(BlendColor):
+GLOBL_FN(GL_PREFIX(GetColorTableParameterfv))
+GL_PREFIX(GetColorTableParameterfv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_BlendColor))
-	JMP(GL_OFFSET(_gloffset_BlendColor))
+	JZ(GLNAME(_glapi_fallback_GetColorTableParameterfv))
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameterfv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BlendEquation))
-GL_PREFIX(BlendEquation):
+GLOBL_FN(GL_PREFIX(GetColorTableParameteriv))
+GL_PREFIX(GetColorTableParameteriv):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_BlendEquation))
-	JMP(GL_OFFSET(_gloffset_BlendEquation))
+	JZ(GLNAME(_glapi_fallback_GetColorTableParameteriv))
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameteriv))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ColorSubTable))
@@ -2795,29 +2795,13 @@
 	JZ(GLNAME(_glapi_fallback_ColorSubTable))
 	JMP(GL_OFFSET(_gloffset_ColorSubTable))
 
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorTable))
-GL_PREFIX(ColorTable):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorTable))
-	JMP(GL_OFFSET(_gloffset_ColorTable))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorTableParameterfv))
-GL_PREFIX(ColorTableParameterfv):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorTableParameterfv))
-	JMP(GL_OFFSET(_gloffset_ColorTableParameterfv))
-
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorTableParameteriv))
-GL_PREFIX(ColorTableParameteriv):
+GLOBL_FN(GL_PREFIX(CopyColorSubTable))
+GL_PREFIX(CopyColorSubTable):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorTableParameteriv))
-	JMP(GL_OFFSET(_gloffset_ColorTableParameteriv))
+	JZ(GLNAME(_glapi_fallback_CopyColorSubTable))
+	JMP(GL_OFFSET(_gloffset_CopyColorSubTable))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ConvolutionFilter1D))
@@ -2868,22 +2852,6 @@
 	JMP(GL_OFFSET(_gloffset_ConvolutionParameteriv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CopyColorSubTable))
-GL_PREFIX(CopyColorSubTable):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyColorSubTable))
-	JMP(GL_OFFSET(_gloffset_CopyColorSubTable))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CopyColorTable))
-GL_PREFIX(CopyColorTable):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyColorTable))
-	JMP(GL_OFFSET(_gloffset_CopyColorTable))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(CopyConvolutionFilter1D))
 GL_PREFIX(CopyConvolutionFilter1D):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -2900,30 +2868,6 @@
 	JMP(GL_OFFSET(_gloffset_CopyConvolutionFilter2D))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetColorTable))
-GL_PREFIX(GetColorTable):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetColorTable))
-	JMP(GL_OFFSET(_gloffset_GetColorTable))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetColorTableParameterfv))
-GL_PREFIX(GetColorTableParameterfv):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetColorTableParameterfv))
-	JMP(GL_OFFSET(_gloffset_GetColorTableParameterfv))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetColorTableParameteriv))
-GL_PREFIX(GetColorTableParameteriv):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetColorTableParameteriv))
-	JMP(GL_OFFSET(_gloffset_GetColorTableParameteriv))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetConvolutionFilter))
 GL_PREFIX(GetConvolutionFilter):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -2948,6 +2892,22 @@
 	JMP(GL_OFFSET(_gloffset_GetConvolutionParameteriv))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetSeparableFilter))
+GL_PREFIX(GetSeparableFilter):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_GetSeparableFilter))
+	JMP(GL_OFFSET(_gloffset_GetSeparableFilter))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SeparableFilter2D))
+GL_PREFIX(SeparableFilter2D):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_SeparableFilter2D))
+	JMP(GL_OFFSET(_gloffset_SeparableFilter2D))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetHistogram))
 GL_PREFIX(GetHistogram):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -2996,14 +2956,6 @@
 	JMP(GL_OFFSET(_gloffset_GetMinmaxParameteriv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetSeparableFilter))
-GL_PREFIX(GetSeparableFilter):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetSeparableFilter))
-	JMP(GL_OFFSET(_gloffset_GetSeparableFilter))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(Histogram))
 GL_PREFIX(Histogram):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -3020,6 +2972,14 @@
 	JMP(GL_OFFSET(_gloffset_Minmax))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ResetHistogram))
+GL_PREFIX(ResetHistogram):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_ResetHistogram))
+	JMP(GL_OFFSET(_gloffset_ResetHistogram))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ResetMinmax))
 GL_PREFIX(ResetMinmax):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -3028,20 +2988,28 @@
 	JMP(GL_OFFSET(_gloffset_ResetMinmax))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ResetHistogram))
-GL_PREFIX(ResetHistogram):
+GLOBL_FN(GL_PREFIX(TexImage3D))
+GL_PREFIX(TexImage3D):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ResetHistogram))
-	JMP(GL_OFFSET(_gloffset_ResetHistogram))
+	JZ(GLNAME(_glapi_fallback_TexImage3D))
+	JMP(GL_OFFSET(_gloffset_TexImage3D))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SeparableFilter2D))
-GL_PREFIX(SeparableFilter2D):
+GLOBL_FN(GL_PREFIX(TexSubImage3D))
+GL_PREFIX(TexSubImage3D):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SeparableFilter2D))
-	JMP(GL_OFFSET(_gloffset_SeparableFilter2D))
+	JZ(GLNAME(_glapi_fallback_TexSubImage3D))
+	JMP(GL_OFFSET(_gloffset_TexSubImage3D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage3D))
+GL_PREFIX(CopyTexSubImage3D):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CopyTexSubImage3D))
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage3D))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ActiveTextureARB))
@@ -3316,46 +3284,142 @@
 	JMP(GL_OFFSET(_gloffset_MultiTexCoord4svARB))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BlendColorEXT))
-GL_PREFIX(BlendColorEXT):
+GLOBL_FN(GL_PREFIX(LoadTransposeMatrixfARB))
+GL_PREFIX(LoadTransposeMatrixfARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_BlendColor))
-	JMP(GL_OFFSET(_gloffset_BlendColor))
+	JZ(GLNAME(_glapi_fallback_LoadTransposeMatrixfARB))
+	JMP(GL_OFFSET(_gloffset_LoadTransposeMatrixfARB))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PolygonOffsetEXT))
-GL_PREFIX(PolygonOffsetEXT):
+GLOBL_FN(GL_PREFIX(LoadTransposeMatrixdARB))
+GL_PREFIX(LoadTransposeMatrixdARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PolygonOffsetEXT))
-	JMP(GL_OFFSET(_gloffset_PolygonOffsetEXT))
+	JZ(GLNAME(_glapi_fallback_LoadTransposeMatrixdARB))
+	JMP(GL_OFFSET(_gloffset_LoadTransposeMatrixdARB))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexImage3DEXT))
-GL_PREFIX(TexImage3DEXT):
+GLOBL_FN(GL_PREFIX(MultTransposeMatrixfARB))
+GL_PREFIX(MultTransposeMatrixfARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexImage3D))
-	JMP(GL_OFFSET(_gloffset_TexImage3D))
+	JZ(GLNAME(_glapi_fallback_MultTransposeMatrixfARB))
+	JMP(GL_OFFSET(_gloffset_MultTransposeMatrixfARB))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexSubImage3DEXT))
-GL_PREFIX(TexSubImage3DEXT):
+GLOBL_FN(GL_PREFIX(MultTransposeMatrixdARB))
+GL_PREFIX(MultTransposeMatrixdARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexSubImage3D))
-	JMP(GL_OFFSET(_gloffset_TexSubImage3D))
+	JZ(GLNAME(_glapi_fallback_MultTransposeMatrixdARB))
+	JMP(GL_OFFSET(_gloffset_MultTransposeMatrixdARB))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CopyTexSubImage3DEXT))
-GL_PREFIX(CopyTexSubImage3DEXT):
+GLOBL_FN(GL_PREFIX(SampleCoverageARB))
+GL_PREFIX(SampleCoverageARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyTexSubImage3D))
-	JMP(GL_OFFSET(_gloffset_CopyTexSubImage3D))
+	JZ(GLNAME(_glapi_fallback_SampleCoverageARB))
+	JMP(GL_OFFSET(_gloffset_SampleCoverageARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SamplePassARB))
+GL_PREFIX(SamplePassARB):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_SamplePassARB))
+	JMP(GL_OFFSET(_gloffset_SamplePassARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage3DARB))
+GL_PREFIX(CompressedTexImage3DARB):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CompressedTexImage3DARB))
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage3DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage2DARB))
+GL_PREFIX(CompressedTexImage2DARB):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CompressedTexImage2DARB))
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage2DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage1DARB))
+GL_PREFIX(CompressedTexImage1DARB):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CompressedTexImage1DARB))
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage1DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage3DARB))
+GL_PREFIX(CompressedTexSubImage3DARB):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CompressedTexSubImage3DARB))
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage3DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage2DARB))
+GL_PREFIX(CompressedTexSubImage2DARB):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CompressedTexSubImage2DARB))
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage2DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage1DARB))
+GL_PREFIX(CompressedTexSubImage1DARB):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CompressedTexSubImage1DARB))
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage1DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetCompressedTexImageARB))
+GL_PREFIX(GetCompressedTexImageARB):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_GetCompressedTexImageARB))
+	JMP(GL_OFFSET(_gloffset_GetCompressedTexImageARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendColorEXT))
+GL_PREFIX(BlendColorEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_BlendColorEXT))
+	JMP(GL_OFFSET(_gloffset_BlendColor))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PolygonOffsetEXT))
+GL_PREFIX(PolygonOffsetEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_PolygonOffsetEXT))
+	JMP(GL_OFFSET(_gloffset_PolygonOffsetEXT))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexImage3DEXT))
+GL_PREFIX(TexImage3DEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_TexImage3DEXT))
+	JMP(GL_OFFSET(_gloffset_TexImage3D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexSubImage3DEXT))
+GL_PREFIX(TexSubImage3DEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_TexSubImage3DEXT))
+	JMP(GL_OFFSET(_gloffset_TexSubImage3D))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetTexFilterFuncSGIS))
 GL_PREFIX(GetTexFilterFuncSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -3372,19 +3436,11 @@
 	JMP(GL_OFFSET(_gloffset_TexFilterFuncSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CopyTexSubImage1DEXT))
-GL_PREFIX(CopyTexSubImage1DEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyTexSubImage1D))
-	JMP(GL_OFFSET(_gloffset_CopyTexSubImage1D))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(TexSubImage1DEXT))
 GL_PREFIX(TexSubImage1DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexSubImage1D))
+	JZ(GLNAME(_glapi_fallback_TexSubImage1DEXT))
 	JMP(GL_OFFSET(_gloffset_TexSubImage1D))
 
 ALIGNTEXT16
@@ -3392,7 +3448,7 @@
 GL_PREFIX(TexSubImage2DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexSubImage2D))
+	JZ(GLNAME(_glapi_fallback_TexSubImage2DEXT))
 	JMP(GL_OFFSET(_gloffset_TexSubImage2D))
 
 ALIGNTEXT16
@@ -3400,7 +3456,7 @@
 GL_PREFIX(CopyTexImage1DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyTexImage1D))
+	JZ(GLNAME(_glapi_fallback_CopyTexImage1DEXT))
 	JMP(GL_OFFSET(_gloffset_CopyTexImage1D))
 
 ALIGNTEXT16
@@ -3408,18 +3464,34 @@
 GL_PREFIX(CopyTexImage2DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyTexImage2D))
+	JZ(GLNAME(_glapi_fallback_CopyTexImage2DEXT))
 	JMP(GL_OFFSET(_gloffset_CopyTexImage2D))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage1DEXT))
+GL_PREFIX(CopyTexSubImage1DEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CopyTexSubImage1DEXT))
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage1D))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(CopyTexSubImage2DEXT))
 GL_PREFIX(CopyTexSubImage2DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyTexSubImage2D))
+	JZ(GLNAME(_glapi_fallback_CopyTexSubImage2DEXT))
 	JMP(GL_OFFSET(_gloffset_CopyTexSubImage2D))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage3DEXT))
+GL_PREFIX(CopyTexSubImage3DEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CopyTexSubImage3DEXT))
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage3D))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetHistogramEXT))
 GL_PREFIX(GetHistogramEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -3472,7 +3544,7 @@
 GL_PREFIX(HistogramEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Histogram))
+	JZ(GLNAME(_glapi_fallback_HistogramEXT))
 	JMP(GL_OFFSET(_gloffset_Histogram))
 
 ALIGNTEXT16
@@ -3480,7 +3552,7 @@
 GL_PREFIX(MinmaxEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_Minmax))
+	JZ(GLNAME(_glapi_fallback_MinmaxEXT))
 	JMP(GL_OFFSET(_gloffset_Minmax))
 
 ALIGNTEXT16
@@ -3488,7 +3560,7 @@
 GL_PREFIX(ResetHistogramEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ResetHistogram))
+	JZ(GLNAME(_glapi_fallback_ResetHistogramEXT))
 	JMP(GL_OFFSET(_gloffset_ResetHistogram))
 
 ALIGNTEXT16
@@ -3496,7 +3568,7 @@
 GL_PREFIX(ResetMinmaxEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ResetMinmax))
+	JZ(GLNAME(_glapi_fallback_ResetMinmaxEXT))
 	JMP(GL_OFFSET(_gloffset_ResetMinmax))
 
 ALIGNTEXT16
@@ -3504,7 +3576,7 @@
 GL_PREFIX(ConvolutionFilter1DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ConvolutionFilter1D))
+	JZ(GLNAME(_glapi_fallback_ConvolutionFilter1DEXT))
 	JMP(GL_OFFSET(_gloffset_ConvolutionFilter1D))
 
 ALIGNTEXT16
@@ -3512,7 +3584,7 @@
 GL_PREFIX(ConvolutionFilter2DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ConvolutionFilter2D))
+	JZ(GLNAME(_glapi_fallback_ConvolutionFilter2DEXT))
 	JMP(GL_OFFSET(_gloffset_ConvolutionFilter2D))
 
 ALIGNTEXT16
@@ -3520,7 +3592,7 @@
 GL_PREFIX(ConvolutionParameterfEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ConvolutionParameterf))
+	JZ(GLNAME(_glapi_fallback_ConvolutionParameterfEXT))
 	JMP(GL_OFFSET(_gloffset_ConvolutionParameterf))
 
 ALIGNTEXT16
@@ -3528,7 +3600,7 @@
 GL_PREFIX(ConvolutionParameterfvEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ConvolutionParameterfv))
+	JZ(GLNAME(_glapi_fallback_ConvolutionParameterfvEXT))
 	JMP(GL_OFFSET(_gloffset_ConvolutionParameterfv))
 
 ALIGNTEXT16
@@ -3536,7 +3608,7 @@
 GL_PREFIX(ConvolutionParameteriEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ConvolutionParameteri))
+	JZ(GLNAME(_glapi_fallback_ConvolutionParameteriEXT))
 	JMP(GL_OFFSET(_gloffset_ConvolutionParameteri))
 
 ALIGNTEXT16
@@ -3544,7 +3616,7 @@
 GL_PREFIX(ConvolutionParameterivEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ConvolutionParameteriv))
+	JZ(GLNAME(_glapi_fallback_ConvolutionParameterivEXT))
 	JMP(GL_OFFSET(_gloffset_ConvolutionParameteriv))
 
 ALIGNTEXT16
@@ -3552,7 +3624,7 @@
 GL_PREFIX(CopyConvolutionFilter1DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyConvolutionFilter1D))
+	JZ(GLNAME(_glapi_fallback_CopyConvolutionFilter1DEXT))
 	JMP(GL_OFFSET(_gloffset_CopyConvolutionFilter1D))
 
 ALIGNTEXT16
@@ -3560,7 +3632,7 @@
 GL_PREFIX(CopyConvolutionFilter2DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyConvolutionFilter2D))
+	JZ(GLNAME(_glapi_fallback_CopyConvolutionFilter2DEXT))
 	JMP(GL_OFFSET(_gloffset_CopyConvolutionFilter2D))
 
 ALIGNTEXT16
@@ -3600,15 +3672,23 @@
 GL_PREFIX(SeparableFilter2DEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SeparableFilter2D))
+	JZ(GLNAME(_glapi_fallback_SeparableFilter2DEXT))
 	JMP(GL_OFFSET(_gloffset_SeparableFilter2D))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTableSGI))
+GL_PREFIX(ColorTableSGI):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_ColorTableSGI))
+	JMP(GL_OFFSET(_gloffset_ColorTable))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ColorTableParameterfvSGI))
 GL_PREFIX(ColorTableParameterfvSGI):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorTableParameterfv))
+	JZ(GLNAME(_glapi_fallback_ColorTableParameterfvSGI))
 	JMP(GL_OFFSET(_gloffset_ColorTableParameterfv))
 
 ALIGNTEXT16
@@ -3616,23 +3696,15 @@
 GL_PREFIX(ColorTableParameterivSGI):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorTableParameteriv))
+	JZ(GLNAME(_glapi_fallback_ColorTableParameterivSGI))
 	JMP(GL_OFFSET(_gloffset_ColorTableParameteriv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorTableSGI))
-GL_PREFIX(ColorTableSGI):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorTable))
-	JMP(GL_OFFSET(_gloffset_ColorTable))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(CopyColorTableSGI))
 GL_PREFIX(CopyColorTableSGI):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyColorTable))
+	JZ(GLNAME(_glapi_fallback_CopyColorTableSGI))
 	JMP(GL_OFFSET(_gloffset_CopyColorTable))
 
 ALIGNTEXT16
@@ -3660,461 +3732,252 @@
 	JMP(GL_OFFSET(_gloffset_GetColorTableParameterivSGI))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GenTexturesEXT))
-GL_PREFIX(GenTexturesEXT):
+GLOBL_FN(GL_PREFIX(PixelTexGenSGIX))
+GL_PREFIX(PixelTexGenSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GenTexturesEXT))
-	JMP(GL_OFFSET(_gloffset_GenTexturesEXT))
+	JZ(GLNAME(_glapi_fallback_PixelTexGenSGIX))
+	JMP(GL_OFFSET(_gloffset_PixelTexGenSGIX))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DeleteTexturesEXT))
-GL_PREFIX(DeleteTexturesEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DeleteTextures))
-	JMP(GL_OFFSET(_gloffset_DeleteTextures))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BindTextureEXT))
-GL_PREFIX(BindTextureEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_BindTexture))
-	JMP(GL_OFFSET(_gloffset_BindTexture))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PrioritizeTexturesEXT))
-GL_PREFIX(PrioritizeTexturesEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PrioritizeTextures))
-	JMP(GL_OFFSET(_gloffset_PrioritizeTextures))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(AreTexturesResidentEXT))
-GL_PREFIX(AreTexturesResidentEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_AreTexturesResidentEXT))
-	JMP(GL_OFFSET(_gloffset_AreTexturesResidentEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IsTextureEXT))
-GL_PREFIX(IsTextureEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_IsTextureEXT))
-	JMP(GL_OFFSET(_gloffset_IsTextureEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BlendEquationEXT))
-GL_PREFIX(BlendEquationEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_BlendEquation))
-	JMP(GL_OFFSET(_gloffset_BlendEquation))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexPointerEXT))
-GL_PREFIX(VertexPointerEXT):
-	JMP(GLNAME(_glapi_fallback_VertexPointerEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(NormalPointerEXT))
-GL_PREFIX(NormalPointerEXT):
-	JMP(GLNAME(_glapi_fallback_NormalPointerEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorPointerEXT))
-GL_PREFIX(ColorPointerEXT):
-	JMP(GLNAME(_glapi_fallback_ColorPointerEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IndexPointerEXT))
-GL_PREFIX(IndexPointerEXT):
-	JMP(GLNAME(_glapi_fallback_IndexPointerEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexCoordPointerEXT))
-GL_PREFIX(TexCoordPointerEXT):
-	JMP(GLNAME(_glapi_fallback_TexCoordPointerEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(EdgeFlagPointerEXT))
-GL_PREFIX(EdgeFlagPointerEXT):
-	JMP(GLNAME(_glapi_fallback_EdgeFlagPointerEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetPointervEXT))
-GL_PREFIX(GetPointervEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetPointerv))
-	JMP(GL_OFFSET(_gloffset_GetPointerv))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ArrayElementEXT))
-GL_PREFIX(ArrayElementEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ArrayElement))
-	JMP(GL_OFFSET(_gloffset_ArrayElement))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DrawArraysEXT))
-GL_PREFIX(DrawArraysEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DrawArrays))
-	JMP(GL_OFFSET(_gloffset_DrawArrays))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PointParameterfEXT))
-GL_PREFIX(PointParameterfEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PointParameterfEXT))
-	JMP(GL_OFFSET(_gloffset_PointParameterfEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PointParameterfvEXT))
-GL_PREFIX(PointParameterfvEXT):
+GLOBL_FN(GL_PREFIX(PixelTexGenParameteriSGIS))
+GL_PREFIX(PixelTexGenParameteriSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PointParameterfvEXT))
-	JMP(GL_OFFSET(_gloffset_PointParameterfvEXT))
+	JZ(GLNAME(_glapi_fallback_PixelTexGenParameteriSGIS))
+	JMP(GL_OFFSET(_gloffset_PixelTexGenParameteriSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(HintPGI))
-GL_PREFIX(HintPGI):
+GLOBL_FN(GL_PREFIX(PixelTexGenParameterivSGIS))
+GL_PREFIX(PixelTexGenParameterivSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_HintPGI))
-	JMP(GL_OFFSET(_gloffset_HintPGI))
+	JZ(GLNAME(_glapi_fallback_PixelTexGenParameterivSGIS))
+	JMP(GL_OFFSET(_gloffset_PixelTexGenParameterivSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorTableEXT))
-GL_PREFIX(ColorTableEXT):
+GLOBL_FN(GL_PREFIX(PixelTexGenParameterfSGIS))
+GL_PREFIX(PixelTexGenParameterfSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorTable))
-	JMP(GL_OFFSET(_gloffset_ColorTable))
+	JZ(GLNAME(_glapi_fallback_PixelTexGenParameterfSGIS))
+	JMP(GL_OFFSET(_gloffset_PixelTexGenParameterfSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ColorSubTableEXT))
-GL_PREFIX(ColorSubTableEXT):
+GLOBL_FN(GL_PREFIX(PixelTexGenParameterfvSGIS))
+GL_PREFIX(PixelTexGenParameterfvSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ColorSubTable))
-	JMP(GL_OFFSET(_gloffset_ColorSubTable))
+	JZ(GLNAME(_glapi_fallback_PixelTexGenParameterfvSGIS))
+	JMP(GL_OFFSET(_gloffset_PixelTexGenParameterfvSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetColorTableEXT))
-GL_PREFIX(GetColorTableEXT):
+GLOBL_FN(GL_PREFIX(GetPixelTexGenParameterivSGIS))
+GL_PREFIX(GetPixelTexGenParameterivSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetColorTableEXT))
-	JMP(GL_OFFSET(_gloffset_GetColorTableEXT))
+	JZ(GLNAME(_glapi_fallback_GetPixelTexGenParameterivSGIS))
+	JMP(GL_OFFSET(_gloffset_GetPixelTexGenParameterivSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetColorTableParameterfvEXT))
-GL_PREFIX(GetColorTableParameterfvEXT):
+GLOBL_FN(GL_PREFIX(GetPixelTexGenParameterfvSGIS))
+GL_PREFIX(GetPixelTexGenParameterfvSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetColorTableParameterfvEXT))
-	JMP(GL_OFFSET(_gloffset_GetColorTableParameterfvEXT))
+	JZ(GLNAME(_glapi_fallback_GetPixelTexGenParameterfvSGIS))
+	JMP(GL_OFFSET(_gloffset_GetPixelTexGenParameterfvSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetColorTableParameterivEXT))
-GL_PREFIX(GetColorTableParameterivEXT):
+GLOBL_FN(GL_PREFIX(TexImage4DSGIS))
+GL_PREFIX(TexImage4DSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetColorTableParameterivEXT))
-	JMP(GL_OFFSET(_gloffset_GetColorTableParameterivEXT))
+	JZ(GLNAME(_glapi_fallback_TexImage4DSGIS))
+	JMP(GL_OFFSET(_gloffset_TexImage4DSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LockArraysEXT))
-GL_PREFIX(LockArraysEXT):
+GLOBL_FN(GL_PREFIX(TexSubImage4DSGIS))
+GL_PREFIX(TexSubImage4DSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LockArraysEXT))
-	JMP(GL_OFFSET(_gloffset_LockArraysEXT))
+	JZ(GLNAME(_glapi_fallback_TexSubImage4DSGIS))
+	JMP(GL_OFFSET(_gloffset_TexSubImage4DSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(UnlockArraysEXT))
-GL_PREFIX(UnlockArraysEXT):
+GLOBL_FN(GL_PREFIX(AreTexturesResidentEXT))
+GL_PREFIX(AreTexturesResidentEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_UnlockArraysEXT))
-	JMP(GL_OFFSET(_gloffset_UnlockArraysEXT))
+	JZ(GLNAME(_glapi_fallback_AreTexturesResidentEXT))
+	JMP(GL_OFFSET(_gloffset_AreTexturesResidentEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BlendFuncSeparateINGR))
-GL_PREFIX(BlendFuncSeparateINGR):
+GLOBL_FN(GL_PREFIX(BindTextureEXT))
+GL_PREFIX(BindTextureEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_BlendFuncSeparateEXT))
-	JMP(GL_OFFSET(_gloffset_BlendFuncSeparateEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos2iMESA))
-GL_PREFIX(WindowPos2iMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos2iMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos2sMESA))
-GL_PREFIX(WindowPos2sMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos2sMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos2fMESA))
-GL_PREFIX(WindowPos2fMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos2fMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos2dMESA))
-GL_PREFIX(WindowPos2dMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos2dMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos2ivMESA))
-GL_PREFIX(WindowPos2ivMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos2ivMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos2svMESA))
-GL_PREFIX(WindowPos2svMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos2svMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos2fvMESA))
-GL_PREFIX(WindowPos2fvMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos2fvMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos2dvMESA))
-GL_PREFIX(WindowPos2dvMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos2dvMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos3iMESA))
-GL_PREFIX(WindowPos3iMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos3iMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos3sMESA))
-GL_PREFIX(WindowPos3sMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos3sMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos3fMESA))
-GL_PREFIX(WindowPos3fMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos3fMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos3dMESA))
-GL_PREFIX(WindowPos3dMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos3dMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos3ivMESA))
-GL_PREFIX(WindowPos3ivMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos3ivMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos3svMESA))
-GL_PREFIX(WindowPos3svMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos3svMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos3fvMESA))
-GL_PREFIX(WindowPos3fvMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos3fvMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos3dvMESA))
-GL_PREFIX(WindowPos3dvMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos3dvMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos4iMESA))
-GL_PREFIX(WindowPos4iMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos4iMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos4sMESA))
-GL_PREFIX(WindowPos4sMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos4sMESA))
+	JZ(GLNAME(_glapi_fallback_BindTextureEXT))
+	JMP(GL_OFFSET(_gloffset_BindTexture))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos4fMESA))
-GL_PREFIX(WindowPos4fMESA):
+GLOBL_FN(GL_PREFIX(DeleteTexturesEXT))
+GL_PREFIX(DeleteTexturesEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_WindowPos4fMESA))
-	JMP(GL_OFFSET(_gloffset_WindowPos4fMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos4dMESA))
-GL_PREFIX(WindowPos4dMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos4dMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos4ivMESA))
-GL_PREFIX(WindowPos4ivMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos4ivMESA))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos4svMESA))
-GL_PREFIX(WindowPos4svMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos4svMESA))
+	JZ(GLNAME(_glapi_fallback_DeleteTexturesEXT))
+	JMP(GL_OFFSET(_gloffset_DeleteTextures))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos4fvMESA))
-GL_PREFIX(WindowPos4fvMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos4fvMESA))
+GLOBL_FN(GL_PREFIX(GenTexturesEXT))
+GL_PREFIX(GenTexturesEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_GenTexturesEXT))
+	JMP(GL_OFFSET(_gloffset_GenTexturesEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(WindowPos4dvMESA))
-GL_PREFIX(WindowPos4dvMESA):
-	JMP(GLNAME(_glapi_fallback_WindowPos4dvMESA))
+GLOBL_FN(GL_PREFIX(IsTextureEXT))
+GL_PREFIX(IsTextureEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_IsTextureEXT))
+	JMP(GL_OFFSET(_gloffset_IsTextureEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ResizeBuffersMESA))
-GL_PREFIX(ResizeBuffersMESA):
+GLOBL_FN(GL_PREFIX(PrioritizeTexturesEXT))
+GL_PREFIX(PrioritizeTexturesEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ResizeBuffersMESA))
-	JMP(GL_OFFSET(_gloffset_ResizeBuffersMESA))
+	JZ(GLNAME(_glapi_fallback_PrioritizeTexturesEXT))
+	JMP(GL_OFFSET(_gloffset_PrioritizeTextures))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LoadTransposeMatrixdARB))
-GL_PREFIX(LoadTransposeMatrixdARB):
+GLOBL_FN(GL_PREFIX(DetailTexFuncSGIS))
+GL_PREFIX(DetailTexFuncSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LoadTransposeMatrixdARB))
-	JMP(GL_OFFSET(_gloffset_LoadTransposeMatrixdARB))
+	JZ(GLNAME(_glapi_fallback_DetailTexFuncSGIS))
+	JMP(GL_OFFSET(_gloffset_DetailTexFuncSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(LoadTransposeMatrixfARB))
-GL_PREFIX(LoadTransposeMatrixfARB):
+GLOBL_FN(GL_PREFIX(GetDetailTexFuncSGIS))
+GL_PREFIX(GetDetailTexFuncSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_LoadTransposeMatrixfARB))
-	JMP(GL_OFFSET(_gloffset_LoadTransposeMatrixfARB))
+	JZ(GLNAME(_glapi_fallback_GetDetailTexFuncSGIS))
+	JMP(GL_OFFSET(_gloffset_GetDetailTexFuncSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MultTransposeMatrixdARB))
-GL_PREFIX(MultTransposeMatrixdARB):
+GLOBL_FN(GL_PREFIX(SharpenTexFuncSGIS))
+GL_PREFIX(SharpenTexFuncSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MultTransposeMatrixdARB))
-	JMP(GL_OFFSET(_gloffset_MultTransposeMatrixdARB))
+	JZ(GLNAME(_glapi_fallback_SharpenTexFuncSGIS))
+	JMP(GL_OFFSET(_gloffset_SharpenTexFuncSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(MultTransposeMatrixfARB))
-GL_PREFIX(MultTransposeMatrixfARB):
+GLOBL_FN(GL_PREFIX(GetSharpenTexFuncSGIS))
+GL_PREFIX(GetSharpenTexFuncSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_MultTransposeMatrixfARB))
-	JMP(GL_OFFSET(_gloffset_MultTransposeMatrixfARB))
+	JZ(GLNAME(_glapi_fallback_GetSharpenTexFuncSGIS))
+	JMP(GL_OFFSET(_gloffset_GetSharpenTexFuncSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelTexGenParameterfSGIS))
-GL_PREFIX(PixelTexGenParameterfSGIS):
+GLOBL_FN(GL_PREFIX(SampleMaskSGIS))
+GL_PREFIX(SampleMaskSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelTexGenParameterfSGIS))
-	JMP(GL_OFFSET(_gloffset_PixelTexGenParameterfSGIS))
+	JZ(GLNAME(_glapi_fallback_SampleMaskSGIS))
+	JMP(GL_OFFSET(_gloffset_SampleMaskSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PixelTexGenParameteriSGIS))
-GL_PREFIX(PixelTexGenParameteriSGIS):
+GLOBL_FN(GL_PREFIX(SamplePatternSGIS))
+GL_PREFIX(SamplePatternSGIS):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PixelTexGenParameteriSGIS))
-	JMP(GL_OFFSET(_gloffset_PixelTexGenParameteriSGIS))
+	JZ(GLNAME(_glapi_fallback_SamplePatternSGIS))
+	JMP(GL_OFFSET(_gloffset_SamplePatternSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetPixelTexGenParameterfvSGIS))
-GL_PREFIX(GetPixelTexGenParameterfvSGIS):
+GLOBL_FN(GL_PREFIX(ArrayElementEXT))
+GL_PREFIX(ArrayElementEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetPixelTexGenParameterfvSGIS))
-	JMP(GL_OFFSET(_gloffset_GetPixelTexGenParameterfvSGIS))
+	JZ(GLNAME(_glapi_fallback_ArrayElementEXT))
+	JMP(GL_OFFSET(_gloffset_ArrayElement))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetPixelTexGenParameterivSGIS))
-GL_PREFIX(GetPixelTexGenParameterivSGIS):
+GLOBL_FN(GL_PREFIX(ColorPointerEXT))
+GL_PREFIX(ColorPointerEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetPixelTexGenParameterivSGIS))
-	JMP(GL_OFFSET(_gloffset_GetPixelTexGenParameterivSGIS))
+	JZ(GLNAME(_glapi_fallback_ColorPointerEXT))
+	JMP(GL_OFFSET(_gloffset_ColorPointerEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexImage4DSGIS))
-GL_PREFIX(TexImage4DSGIS):
+GLOBL_FN(GL_PREFIX(DrawArraysEXT))
+GL_PREFIX(DrawArraysEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexImage4DSGIS))
-	JMP(GL_OFFSET(_gloffset_TexImage4DSGIS))
+	JZ(GLNAME(_glapi_fallback_DrawArraysEXT))
+	JMP(GL_OFFSET(_gloffset_DrawArrays))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TexSubImage4DSGIS))
-GL_PREFIX(TexSubImage4DSGIS):
+GLOBL_FN(GL_PREFIX(EdgeFlagPointerEXT))
+GL_PREFIX(EdgeFlagPointerEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TexSubImage4DSGIS))
-	JMP(GL_OFFSET(_gloffset_TexSubImage4DSGIS))
+	JZ(GLNAME(_glapi_fallback_EdgeFlagPointerEXT))
+	JMP(GL_OFFSET(_gloffset_EdgeFlagPointerEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DetailTexFuncSGIS))
-GL_PREFIX(DetailTexFuncSGIS):
+GLOBL_FN(GL_PREFIX(GetPointervEXT))
+GL_PREFIX(GetPointervEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_DetailTexFuncSGIS))
-	JMP(GL_OFFSET(_gloffset_DetailTexFuncSGIS))
+	JZ(GLNAME(_glapi_fallback_GetPointervEXT))
+	JMP(GL_OFFSET(_gloffset_GetPointerv))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetDetailTexFuncSGIS))
-GL_PREFIX(GetDetailTexFuncSGIS):
+GLOBL_FN(GL_PREFIX(IndexPointerEXT))
+GL_PREFIX(IndexPointerEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetDetailTexFuncSGIS))
-	JMP(GL_OFFSET(_gloffset_GetDetailTexFuncSGIS))
+	JZ(GLNAME(_glapi_fallback_IndexPointerEXT))
+	JMP(GL_OFFSET(_gloffset_IndexPointerEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetSharpenTexFuncSGIS))
-GL_PREFIX(GetSharpenTexFuncSGIS):
+GLOBL_FN(GL_PREFIX(NormalPointerEXT))
+GL_PREFIX(NormalPointerEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetSharpenTexFuncSGIS))
-	JMP(GL_OFFSET(_gloffset_GetSharpenTexFuncSGIS))
+	JZ(GLNAME(_glapi_fallback_NormalPointerEXT))
+	JMP(GL_OFFSET(_gloffset_NormalPointerEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SharpenTexFuncSGIS))
-GL_PREFIX(SharpenTexFuncSGIS):
+GLOBL_FN(GL_PREFIX(TexCoordPointerEXT))
+GL_PREFIX(TexCoordPointerEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SharpenTexFuncSGIS))
-	JMP(GL_OFFSET(_gloffset_SharpenTexFuncSGIS))
+	JZ(GLNAME(_glapi_fallback_TexCoordPointerEXT))
+	JMP(GL_OFFSET(_gloffset_TexCoordPointerEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SampleMaskSGIS))
-GL_PREFIX(SampleMaskSGIS):
+GLOBL_FN(GL_PREFIX(VertexPointerEXT))
+GL_PREFIX(VertexPointerEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SampleMaskSGIS))
-	JMP(GL_OFFSET(_gloffset_SampleMaskSGIS))
+	JZ(GLNAME(_glapi_fallback_VertexPointerEXT))
+	JMP(GL_OFFSET(_gloffset_VertexPointerEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SamplePatternSGIS))
-GL_PREFIX(SamplePatternSGIS):
+GLOBL_FN(GL_PREFIX(BlendEquationEXT))
+GL_PREFIX(BlendEquationEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SamplePatternSGIS))
-	JMP(GL_OFFSET(_gloffset_SamplePatternSGIS))
+	JZ(GLNAME(_glapi_fallback_BlendEquationEXT))
+	JMP(GL_OFFSET(_gloffset_BlendEquation))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(SpriteParameterfSGIX))
@@ -4125,14 +3988,6 @@
 	JMP(GL_OFFSET(_gloffset_SpriteParameterfSGIX))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SpriteParameteriSGIX))
-GL_PREFIX(SpriteParameteriSGIX):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SpriteParameteriSGIX))
-	JMP(GL_OFFSET(_gloffset_SpriteParameteriSGIX))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(SpriteParameterfvSGIX))
 GL_PREFIX(SpriteParameterfvSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4141,6 +3996,14 @@
 	JMP(GL_OFFSET(_gloffset_SpriteParameterfvSGIX))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SpriteParameteriSGIX))
+GL_PREFIX(SpriteParameteriSGIX):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_SpriteParameteriSGIX))
+	JMP(GL_OFFSET(_gloffset_SpriteParameteriSGIX))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(SpriteParameterivSGIX))
 GL_PREFIX(SpriteParameterivSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4149,6 +4012,46 @@
 	JMP(GL_OFFSET(_gloffset_SpriteParameterivSGIX))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfEXT))
+GL_PREFIX(PointParameterfEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_PointParameterfEXT))
+	JMP(GL_OFFSET(_gloffset_PointParameterfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfvEXT))
+GL_PREFIX(PointParameterfvEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_PointParameterfvEXT))
+	JMP(GL_OFFSET(_gloffset_PointParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfSGIS))
+GL_PREFIX(PointParameterfSGIS):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_PointParameterfSGIS))
+	JMP(GL_OFFSET(_gloffset_PointParameterfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfvSGIS))
+GL_PREFIX(PointParameterfvSGIS):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_PointParameterfvSGIS))
+	JMP(GL_OFFSET(_gloffset_PointParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetInstrumentsSGIX))
+GL_PREFIX(GetInstrumentsSGIX):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_GetInstrumentsSGIX))
+	JMP(GL_OFFSET(_gloffset_GetInstrumentsSGIX))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(InstrumentsBufferSGIX))
 GL_PREFIX(InstrumentsBufferSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4157,6 +4060,22 @@
 	JMP(GL_OFFSET(_gloffset_InstrumentsBufferSGIX))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PollInstrumentsSGIX))
+GL_PREFIX(PollInstrumentsSGIX):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_PollInstrumentsSGIX))
+	JMP(GL_OFFSET(_gloffset_PollInstrumentsSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ReadInstrumentsSGIX))
+GL_PREFIX(ReadInstrumentsSGIX):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_ReadInstrumentsSGIX))
+	JMP(GL_OFFSET(_gloffset_ReadInstrumentsSGIX))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(StartInstrumentsSGIX))
 GL_PREFIX(StartInstrumentsSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4173,60 +4092,92 @@
 	JMP(GL_OFFSET(_gloffset_StopInstrumentsSGIX))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ReadInstrumentsSGIX))
-GL_PREFIX(ReadInstrumentsSGIX):
+GLOBL_FN(GL_PREFIX(FrameZoomSGIX))
+GL_PREFIX(FrameZoomSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ReadInstrumentsSGIX))
-	JMP(GL_OFFSET(_gloffset_ReadInstrumentsSGIX))
+	JZ(GLNAME(_glapi_fallback_FrameZoomSGIX))
+	JMP(GL_OFFSET(_gloffset_FrameZoomSGIX))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(PollInstrumentsSGIX))
-GL_PREFIX(PollInstrumentsSGIX):
+GLOBL_FN(GL_PREFIX(TagSampleBufferSGIX))
+GL_PREFIX(TagSampleBufferSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_PollInstrumentsSGIX))
-	JMP(GL_OFFSET(_gloffset_PollInstrumentsSGIX))
+	JZ(GLNAME(_glapi_fallback_TagSampleBufferSGIX))
+	JMP(GL_OFFSET(_gloffset_TagSampleBufferSGIX))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetInstrumentsSGIX))
-GL_PREFIX(GetInstrumentsSGIX):
+GLOBL_FN(GL_PREFIX(ReferencePlaneSGIX))
+GL_PREFIX(ReferencePlaneSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_GetInstrumentsSGIX))
-	JMP(GL_OFFSET(_gloffset_GetInstrumentsSGIX))
+	JZ(GLNAME(_glapi_fallback_ReferencePlaneSGIX))
+	JMP(GL_OFFSET(_gloffset_ReferencePlaneSGIX))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FrameZoomSGIX))
-GL_PREFIX(FrameZoomSGIX):
+GLOBL_FN(GL_PREFIX(FlushRasterSGIX))
+GL_PREFIX(FlushRasterSGIX):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_FrameZoomSGIX))
-	JMP(GL_OFFSET(_gloffset_FrameZoomSGIX))
+	JZ(GLNAME(_glapi_fallback_FlushRasterSGIX))
+	JMP(GL_OFFSET(_gloffset_FlushRasterSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorSubTableEXT))
+GL_PREFIX(ColorSubTableEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_ColorSubTableEXT))
+	JMP(GL_OFFSET(_gloffset_ColorSubTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyColorSubTableEXT))
+GL_PREFIX(CopyColorSubTableEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_CopyColorSubTableEXT))
+	JMP(GL_OFFSET(_gloffset_CopyColorSubTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(HintPGI))
+GL_PREFIX(HintPGI):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_HintPGI))
+	JMP(GL_OFFSET(_gloffset_HintPGI))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTableEXT))
+GL_PREFIX(ColorTableEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_ColorTableEXT))
+	JMP(GL_OFFSET(_gloffset_ColorTable))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ReferencePlaneSGIX))
-GL_PREFIX(ReferencePlaneSGIX):
+GLOBL_FN(GL_PREFIX(GetColorTableEXT))
+GL_PREFIX(GetColorTableEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_ReferencePlaneSGIX))
-	JMP(GL_OFFSET(_gloffset_ReferencePlaneSGIX))
+	JZ(GLNAME(_glapi_fallback_GetColorTableEXT))
+	JMP(GL_OFFSET(_gloffset_GetColorTableEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FlushRasterSGIX))
-GL_PREFIX(FlushRasterSGIX):
+GLOBL_FN(GL_PREFIX(GetColorTableParameterivEXT))
+GL_PREFIX(GetColorTableParameterivEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_FlushRasterSGIX))
-	JMP(GL_OFFSET(_gloffset_FlushRasterSGIX))
+	JZ(GLNAME(_glapi_fallback_GetColorTableParameterivEXT))
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameterivEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CopyColorSubTableEXT))
-GL_PREFIX(CopyColorSubTableEXT):
+GLOBL_FN(GL_PREFIX(GetColorTableParameterfvEXT))
+GL_PREFIX(GetColorTableParameterfvEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CopyColorSubTable))
-	JMP(GL_OFFSET(_gloffset_CopyColorSubTable))
+	JZ(GLNAME(_glapi_fallback_GetColorTableParameterfvEXT))
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameterfvEXT))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetListParameterfvSGIX))
@@ -4292,45 +4243,37 @@
 	JZ(GLNAME(_glapi_fallback_IndexFuncEXT))
 	JMP(GL_OFFSET(_gloffset_IndexFuncEXT))
 
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CullParameterdvEXT))
-GL_PREFIX(CullParameterdvEXT):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CullParameterdvEXT))
-	JMP(GL_OFFSET(_gloffset_CullParameterdvEXT))
-
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(CullParameterfvEXT))
-GL_PREFIX(CullParameterfvEXT):
+GLOBL_FN(GL_PREFIX(LockArraysEXT))
+GL_PREFIX(LockArraysEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_CullParameterfvEXT))
-	JMP(GL_OFFSET(_gloffset_CullParameterfvEXT))
+	JZ(GLNAME(_glapi_fallback_LockArraysEXT))
+	JMP(GL_OFFSET(_gloffset_LockArraysEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SampleCoverageARB))
-GL_PREFIX(SampleCoverageARB):
+GLOBL_FN(GL_PREFIX(UnlockArraysEXT))
+GL_PREFIX(UnlockArraysEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SampleCoverageARB))
-	JMP(GL_OFFSET(_gloffset_SampleCoverageARB))
+	JZ(GLNAME(_glapi_fallback_UnlockArraysEXT))
+	JMP(GL_OFFSET(_gloffset_UnlockArraysEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SamplePassARB))
-GL_PREFIX(SamplePassARB):
+GLOBL_FN(GL_PREFIX(CullParameterdvEXT))
+GL_PREFIX(CullParameterdvEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_SamplePassARB))
-	JMP(GL_OFFSET(_gloffset_SamplePassARB))
+	JZ(GLNAME(_glapi_fallback_CullParameterdvEXT))
+	JMP(GL_OFFSET(_gloffset_CullParameterdvEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TagSampleBufferSGIX))
-GL_PREFIX(TagSampleBufferSGIX):
+GLOBL_FN(GL_PREFIX(CullParameterfvEXT))
+GL_PREFIX(CullParameterfvEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
 	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_TagSampleBufferSGIX))
-	JMP(GL_OFFSET(_gloffset_TagSampleBufferSGIX))
+	JZ(GLNAME(_glapi_fallback_CullParameterfvEXT))
+	JMP(GL_OFFSET(_gloffset_CullParameterfvEXT))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(FragmentColorMaterialSGIX))
@@ -4477,6 +4420,14 @@
 	JMP(GL_OFFSET(_gloffset_LightEnviSGIX))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DrawRangeElementsEXT))
+GL_PREFIX(DrawRangeElementsEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_DrawRangeElementsEXT))
+	JMP(GL_OFFSET(_gloffset_DrawRangeElements))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(FogCoordfEXT))
 GL_PREFIX(FogCoordfEXT):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4549,14 +4500,6 @@
 	JMP(GL_OFFSET(_gloffset_VertexWeightPointerEXT))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexArrayRangeNV))
-GL_PREFIX(VertexArrayRangeNV):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	TEST_L(EAX, EAX)
-	JZ(GLNAME(_glapi_fallback_VertexArrayRangeNV))
-	JMP(GL_OFFSET(_gloffset_VertexArrayRangeNV))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(FlushVertexArrayRangeNV))
 GL_PREFIX(FlushVertexArrayRangeNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4565,6 +4508,14 @@
 	JMP(GL_OFFSET(_gloffset_FlushVertexArrayRangeNV))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexArrayRangeNV))
+GL_PREFIX(VertexArrayRangeNV):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_VertexArrayRangeNV))
+	JMP(GL_OFFSET(_gloffset_VertexArrayRangeNV))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(CombinerParameterfvNV))
 GL_PREFIX(CombinerParameterfvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4667,5 +4618,230 @@
 	TEST_L(EAX, EAX)
 	JZ(GLNAME(_glapi_fallback_GetFinalCombinerInputParameterivNV))
 	JMP(GL_OFFSET(_gloffset_GetFinalCombinerInputParameterivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ResizeBuffersMESA))
+GL_PREFIX(ResizeBuffersMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_ResizeBuffersMESA))
+	JMP(GL_OFFSET(_gloffset_ResizeBuffersMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2dMESA))
+GL_PREFIX(WindowPos2dMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos2dMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos2dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2dvMESA))
+GL_PREFIX(WindowPos2dvMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos2dvMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos2dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2fMESA))
+GL_PREFIX(WindowPos2fMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos2fMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos2fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2fvMESA))
+GL_PREFIX(WindowPos2fvMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos2fvMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos2fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2iMESA))
+GL_PREFIX(WindowPos2iMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos2iMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos2iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2ivMESA))
+GL_PREFIX(WindowPos2ivMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos2ivMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos2ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2sMESA))
+GL_PREFIX(WindowPos2sMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos2sMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos2sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2svMESA))
+GL_PREFIX(WindowPos2svMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos2svMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos2svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3dMESA))
+GL_PREFIX(WindowPos3dMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos3dMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos3dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3dvMESA))
+GL_PREFIX(WindowPos3dvMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos3dvMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos3dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3fMESA))
+GL_PREFIX(WindowPos3fMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos3fMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos3fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3fvMESA))
+GL_PREFIX(WindowPos3fvMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos3fvMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos3fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3iMESA))
+GL_PREFIX(WindowPos3iMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos3iMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos3iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3ivMESA))
+GL_PREFIX(WindowPos3ivMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos3ivMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos3ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3sMESA))
+GL_PREFIX(WindowPos3sMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos3sMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos3sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3svMESA))
+GL_PREFIX(WindowPos3svMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos3svMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos3svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4dMESA))
+GL_PREFIX(WindowPos4dMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos4dMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos4dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4dvMESA))
+GL_PREFIX(WindowPos4dvMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos4dvMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos4dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4fMESA))
+GL_PREFIX(WindowPos4fMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos4fMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos4fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4fvMESA))
+GL_PREFIX(WindowPos4fvMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos4fvMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos4fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4iMESA))
+GL_PREFIX(WindowPos4iMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos4iMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos4iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4ivMESA))
+GL_PREFIX(WindowPos4ivMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos4ivMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos4ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4sMESA))
+GL_PREFIX(WindowPos4sMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos4sMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos4sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4svMESA))
+GL_PREFIX(WindowPos4svMESA):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_WindowPos4svMESA))
+	JMP(GL_OFFSET(_gloffset_WindowPos4svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TbufferMask3DFX))
+GL_PREFIX(TbufferMask3DFX):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_TbufferMask3DFX))
+	JMP(GL_OFFSET(_gloffset_TbufferMask3DFX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SampleMaskEXT))
+GL_PREFIX(SampleMaskEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_SampleMaskEXT))
+	JMP(GL_OFFSET(_gloffset_SampleMaskSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SamplePatternEXT))
+GL_PREFIX(SamplePatternEXT):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	TEST_L(EAX, EAX)
+	JZ(GLNAME(_glapi_fallback_SamplePatternEXT))
+	JMP(GL_OFFSET(_gloffset_SamplePatternSGIS))
+
 
 #endif  /* __WIN32__ */
Index: xc/extras/Mesa/src/X86/katmai.c
diff -u xc/extras/Mesa/src/X86/katmai.c:1.1 xc/extras/Mesa/src/X86/katmai.c:1.2
--- xc/extras/Mesa/src/X86/katmai.c:1.1	Tue Feb  8 09:18:18 2000
+++ xc/extras/Mesa/src/X86/katmai.c	Fri Jun 16 17:02:42 2000
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -221,5 +221,15 @@
    /* test, if it works correctly ! */
    gl_project_clipped_v16 = gl_katmai_project_clipped_vertices;
 }
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_katmai_dummy_function(void);
+void _mesa_katmai_dummy_function(void)
+{
+}
+
 
 #endif
Index: xc/extras/Mesa/src/X86/katmai_norm_raw.S
diff -u xc/extras/Mesa/src/X86/katmai_norm_raw.S:1.1 xc/extras/Mesa/src/X86/katmai_norm_raw.S:1.2
--- xc/extras/Mesa/src/X86/katmai_norm_raw.S:1.1	Tue Feb  8 09:18:18 2000
+++ xc/extras/Mesa/src/X86/katmai_norm_raw.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define OFFSET_MAT 4
 #define OFFSET_SCALE 8
 #define OFFSET_IN 12
Index: xc/extras/Mesa/src/X86/katmai_xform_masked1.S
diff -u xc/extras/Mesa/src/X86/katmai_xform_masked1.S:1.1 xc/extras/Mesa/src/X86/katmai_xform_masked1.S:1.2
--- xc/extras/Mesa/src/X86/katmai_xform_masked1.S:1.1	Tue Feb  8 09:18:18 2000
+++ xc/extras/Mesa/src/X86/katmai_xform_masked1.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
@@ -76,7 +70,7 @@
     MOV_B( ARG_FLAG, BL )			/* clip mask flags */
 
     TEST_L( ECX, ECX )				/* count was zero ? */
-    JZ( LLBL( K_GTP1GM_finish ) )		/* yes -> nothing to do. */
+    JZ( LLBL(K_GTP1GM_finish) )			/* yes -> nothing to do. */
 
     MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
     OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
@@ -96,7 +90,7 @@
     MOVUPS( M(12), XMM1 )			/* m15 | m14 | m13 | m12 */
 
 ALIGNTEXT32
-LLBL( K_GTP1GM_top ):
+LLBL(K_GTP1GM_top):
     TEST_B( BL, REGIND(EBP) )
     JNZ( LLBL(K_GTP1GM_skip) )
 	
@@ -160,7 +154,7 @@
     JE( LLBL(K_GTP1IM_finish) )
 
 ALIGNTEXT32
-LLBL( K_GTP1IM_top ):
+LLBL(K_GTP1IM_top):
     TEST_B( BL, REGIND(EBP) )
     JNZ( LLBL(K_GTP1IM_skip) )
 
Index: xc/extras/Mesa/src/X86/katmai_xform_masked2.S
diff -u xc/extras/Mesa/src/X86/katmai_xform_masked2.S:1.1 xc/extras/Mesa/src/X86/katmai_xform_masked2.S:1.2
--- xc/extras/Mesa/src/X86/katmai_xform_masked2.S:1.1	Tue Feb  8 09:18:19 2000
+++ xc/extras/Mesa/src/X86/katmai_xform_masked2.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
@@ -97,7 +91,7 @@
     MOVUPS( M(12), XMM2 )			/* m15 | m14 | m13 | m12 */
 
 ALIGNTEXT32
-LLBL( K_GTP2GM_top ):
+LLBL(K_GTP2GM_top):
     TEST_B( BL, REGIND(EBP) )
     JNZ( LLBL(K_GTP2GM_skip) )
 	
@@ -165,7 +159,7 @@
     JE( LLBL(K_GTP2IM_finish) )
 
 ALIGNTEXT32
-LLBL( K_GTP2IM_top ):
+LLBL(K_GTP2IM_top):
     TEST_B( BL, REGIND(EBP) )
     JNZ( LLBL(K_GTP2IM_skip) )
 	
Index: xc/extras/Mesa/src/X86/katmai_xform_masked3.S
diff -u xc/extras/Mesa/src/X86/katmai_xform_masked3.S:1.1 xc/extras/Mesa/src/X86/katmai_xform_masked3.S:1.2
--- xc/extras/Mesa/src/X86/katmai_xform_masked3.S:1.1	Tue Feb  8 09:18:19 2000
+++ xc/extras/Mesa/src/X86/katmai_xform_masked3.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
@@ -98,7 +92,7 @@
 
 
 ALIGNTEXT32
-LLBL( K_GTPGM_top ):
+LLBL(K_GTPGM_top):
     TEST_B    ( BL, REGIND(EBP) )
     JNZ       ( LLBL(K_GTPGM_skip) )
 
@@ -173,7 +167,7 @@
 
 
 ALIGNTEXT32
-LLBL( K_GTPIM_top ):
+LLBL(K_GTPIM_top):
     TEST_B( BL, REGIND(EBP) )
     JNZ( LLBL(K_GTPIM_skip) )
 
Index: xc/extras/Mesa/src/X86/katmai_xform_masked4.S
diff -u xc/extras/Mesa/src/X86/katmai_xform_masked4.S:1.1 xc/extras/Mesa/src/X86/katmai_xform_masked4.S:1.2
--- xc/extras/Mesa/src/X86/katmai_xform_masked4.S:1.1	Tue Feb  8 09:18:19 2000
+++ xc/extras/Mesa/src/X86/katmai_xform_masked4.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
@@ -76,7 +70,7 @@
 	MOV_B( ARG_FLAG, BL )				/* clip mask flags */
 
 	TEST_L( ECX, ECX )				/* count was zero ? */
-	JZ( LLBL( K_GTP4GM_finish ) )			/* yes -> nothing to do. */
+	JZ( LLBL(K_GTP4GM_finish) )			/* yes -> nothing to do. */
 
 	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )		/* stride */
 	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
@@ -97,7 +91,7 @@
 	MOVUPS( M(12), XMM3 )				/* m15 | m14 | m13 | m12 */
 	
 ALIGNTEXT32
-LLBL( K_GTP4GM_top ):
+LLBL(K_GTP4GM_top):
 	TEST_B( BL, REGIND(EBP) )
 	JNZ( LLBL(K_GTP4GM_skip) )
 	
@@ -177,7 +171,7 @@
 	JE( LLBL(K_GTP4IM_finish) )
 
 ALIGNTEXT16
-LLBL( K_GTP4IM_top ):
+LLBL(K_GTP4IM_top):
 	TEST_B( BL, REGIND(EBP) )
 	JNZ( LLBL(K_GTP4IM_skip) )
 
Index: xc/extras/Mesa/src/X86/katmai_xform_raw1.S
diff -u xc/extras/Mesa/src/X86/katmai_xform_raw1.S:1.1 xc/extras/Mesa/src/X86/katmai_xform_raw1.S:1.2
--- xc/extras/Mesa/src/X86/katmai_xform_raw1.S:1.1	Tue Feb  8 09:18:19 2000
+++ xc/extras/Mesa/src/X86/katmai_xform_raw1.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
@@ -71,7 +65,7 @@
     MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
 
     CMP_L( CONST(0), ECX )			/* count == 0 ? */
-    JE( LLBL( K_GTP1GR_finish ) )		/* yes -> nothing to do. */
+    JE( LLBL(K_GTP1GR_finish) )			/* yes -> nothing to do. */
 
     MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
     OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
@@ -91,7 +85,7 @@
     MOVUPS( M(12), XMM1 )			/* m15 | m14 | m13 | m12 */
 
 ALIGNTEXT32
-LLBL( K_GTP1GR_top ):
+LLBL(K_GTP1GR_top):
     MOVSS( S(0), XMM2 )				/* ox */
     SHUFPS( CONST(0x0), XMM2, XMM2 )		/* ox | ox | ox | ox */
     MULPS( XMM0, XMM2 )				/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */
@@ -145,7 +139,7 @@
 
 
 ALIGNTEXT32
-LLBL( K_GTP1IR_top ):
+LLBL(K_GTP1IR_top):
     MOV_L( S(0), EDX )
     MOV_L( EDX, D(0) )
 	
Index: xc/extras/Mesa/src/X86/katmai_xform_raw2.S
diff -u xc/extras/Mesa/src/X86/katmai_xform_raw2.S:1.1 xc/extras/Mesa/src/X86/katmai_xform_raw2.S:1.2
--- xc/extras/Mesa/src/X86/katmai_xform_raw2.S:1.1	Tue Feb  8 09:18:19 2000
+++ xc/extras/Mesa/src/X86/katmai_xform_raw2.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
@@ -91,7 +85,7 @@
     MOVUPS( M(12), XMM2 )			/* m15 | m14 | m13 | m12 */
 
 ALIGNTEXT32
-LLBL( K_GTP2GR_top ):
+LLBL(K_GTP2GR_top):
     MOVSS( S(0), XMM3 )				/* ox */
     SHUFPS( CONST(0x0), XMM3, XMM3 )		/* ox | ox | ox | ox */
     MULPS( XMM0, XMM3 )				/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */
@@ -149,7 +143,7 @@
 
 
 ALIGNTEXT32
-LLBL( K_GTP2IR_top ):
+LLBL(K_GTP2IR_top):
     MOV_L     ( S(0), EDX )
     MOV_L     ( EDX, D(0) )
     MOV_L     ( S(1), EDX )
Index: xc/extras/Mesa/src/X86/katmai_xform_raw3.S
diff -u xc/extras/Mesa/src/X86/katmai_xform_raw3.S:1.1 xc/extras/Mesa/src/X86/katmai_xform_raw3.S:1.2
--- xc/extras/Mesa/src/X86/katmai_xform_raw3.S:1.1	Tue Feb  8 09:18:20 2000
+++ xc/extras/Mesa/src/X86/katmai_xform_raw3.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
@@ -71,7 +65,7 @@
     MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
 
     CMP_L     ( CONST(0), ECX )			/* count == 0 ? */
-    JE        ( LLBL( K_GTPGR_finish ) )	/* yes -> nothing to do. */
+    JE        ( LLBL(K_GTPGR_finish) )		/* yes -> nothing to do. */
 
     MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
     OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
@@ -94,7 +88,7 @@
 
 
 ALIGNTEXT32
-LLBL( K_GTPGR_top ):
+LLBL(K_GTPGR_top):
     MOVSS     ( REGOFF(0, ESI), XMM4 )		/*    |    |    | ox */
     SHUFPS    ( CONST(0x0), XMM4, XMM4 )	/* ox | ox | ox | ox */
     MOVSS     ( REGOFF(4, ESI), XMM5 )		/*    |    |    | oy */
@@ -158,7 +152,7 @@
 
 
 ALIGNTEXT32
-LLBL( K_GTPIR_top ):
+LLBL(K_GTPIR_top):
     MOVLPS    ( S(0), XMM0 )
     MOVLPS    ( XMM0, D(0) )
     MOVSS     ( S(2), XMM0 )
Index: xc/extras/Mesa/src/X86/katmai_xform_raw4.S
diff -u xc/extras/Mesa/src/X86/katmai_xform_raw4.S:1.1 xc/extras/Mesa/src/X86/katmai_xform_raw4.S:1.2
--- xc/extras/Mesa/src/X86/katmai_xform_raw4.S:1.1	Tue Feb  8 09:18:20 2000
+++ xc/extras/Mesa/src/X86/katmai_xform_raw4.S	Fri Jun 16 17:02:42 2000
@@ -9,12 +9,6 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
@@ -71,7 +65,7 @@
 	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )		/* source count */
 
 	CMP_L( CONST(0), ECX )				/* count == 0 ? */
-	JE( LLBL( K_GTP4GR_finish ) )			/* yes -> nothing to do. */
+	JE( LLBL(K_GTP4GR_finish) )			/* yes -> nothing to do. */
 
 	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )		/* stride */
 	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
@@ -92,7 +86,7 @@
 	MOVUPS( M(12), XMM3 )				/* m15 | m14 | m13 | m12 */
 	
 ALIGNTEXT32
-LLBL( K_GTP4GR_top ):
+LLBL(K_GTP4GR_top):
 	MOVSS( S(0), XMM4 )				/* ox */
 	SHUFPS( CONST(0x0), XMM4, XMM4 )		/* ox | ox | ox | ox */
 	MULPS( XMM0, XMM4 )				/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */
Index: xc/extras/Mesa/src/X86/mmx_blend.S
diff -u xc/extras/Mesa/src/X86/mmx_blend.S:1.1 xc/extras/Mesa/src/X86/mmx_blend.S:1.2
--- xc/extras/Mesa/src/X86/mmx_blend.S:1.1	Mon Dec 13 17:32:18 1999
+++ xc/extras/Mesa/src/X86/mmx_blend.S	Fri Jun 16 17:02:42 2000
@@ -1,13 +1,6 @@
 #include "assyntax.h"
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
-
 SEG_TEXT
 
 
@@ -123,13 +116,13 @@
     ADD_L     ( CONST(4), REGOFF(20, EBP) )
     ADD_L     ( CONST(4), REGOFF(24, EBP) )
     DEC_L     ( REGOFF(12, EBP) )
-LLBL( GMBT_2 ):
+LLBL(GMBT_2):
 
     CMP_L     ( CONST(0), REGOFF(12, EBP) )
     JE        ( LLBL(GMBT_3) )
     MOV_L     ( CONST(0), REGOFF(-28, EBP) )
 ALIGNTEXT4
-LLBL( GMBT_4 ):
+LLBL(GMBT_4):
 
     MOV_L     ( REGOFF(12, EBP), EDX )
     MOV_L     ( EDX, EAX )
@@ -138,7 +131,7 @@
     JB        ( LLBL(GMBT_7) )
     JMP       ( LLBL(GMBT_5) )
 ALIGNTEXT16
-LLBL( GMBT_7 ):
+LLBL(GMBT_7):
 
     MOV_L     ( REGOFF(-28, EBP), EAX )
     LEA_L     ( REGDIS(0,EAX,2), EDX )
@@ -203,19 +196,19 @@
     MOVQ      ( MM4, REGIND(EAX) )
 
 
-LLBL( GMBT_8 ):
+LLBL(GMBT_8):
 
-LLBL( GMBT_6 ):
+LLBL(GMBT_6):
 
     INC_L     ( REGOFF(-28, EBP) )
     JMP       ( LLBL(GMBT_4) )
 ALIGNTEXT16
-LLBL( GMBT_5 ):
+LLBL(GMBT_5):
 
 
     EMMS
 
-LLBL( GMBT_3 ):
+LLBL(GMBT_3):
 
     MOV_L     ( REGOFF(12, EBP), EAX )
     AND_L     ( CONST(1), EAX )
@@ -349,9 +342,9 @@
     LEA_L     ( REGOFF(-1, EAX), EDX )
     MOV_B     ( REGOFF(-32, EBP), AL )
     MOV_B     ( AL, REGIND(EDX) )
-LLBL( GMBT_9 ):
+LLBL(GMBT_9):
 
-LLBL( GMBT_1 ):
+LLBL(GMBT_1):
 
     MOV_L     ( REGOFF(-56, EBP), EBX )
     MOV_L     ( EBP, ESP )
Index: xc/extras/Mesa/src/X86/vertex.S
diff -u xc/extras/Mesa/src/X86/vertex.S:1.1 xc/extras/Mesa/src/X86/vertex.S:1.2
--- xc/extras/Mesa/src/X86/vertex.S:1.1	Mon Dec 13 17:32:19 1999
+++ xc/extras/Mesa/src/X86/vertex.S	Fri Jun 16 17:02:42 2000
@@ -3,12 +3,6 @@
 	
 	SEG_TEXT
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L##a
-#else
-#define LLBL(a) a
-#endif
-
 /*#define MAT_SX 0*/        /*  accessed by REGIND !! */
 #define MAT_SY 20
 #define MAT_SZ 40
Index: xc/extras/Mesa/src/X86/vertex_3dnow.S
diff -u xc/extras/Mesa/src/X86/vertex_3dnow.S:1.1 xc/extras/Mesa/src/X86/vertex_3dnow.S:1.2
--- xc/extras/Mesa/src/X86/vertex_3dnow.S:1.1	Mon Dec 13 17:32:19 1999
+++ xc/extras/Mesa/src/X86/vertex_3dnow.S	Fri Jun 16 17:02:43 2000
@@ -3,15 +3,8 @@
    SEG_TEXT
 
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L##a
-#else
-#define LLBL(a) a
-#endif
 
-
-
-/*#define MAT_SX 0        /*  accessed by REGIND !! */
+/*#define MAT_SX 0         accessed by REGIND !! */
 #define MAT_SY 20
 #define MAT_SZ 40
 #define MAT_TX 48
Index: xc/extras/Mesa/src/X86/vertex_katmai.S
diff -u xc/extras/Mesa/src/X86/vertex_katmai.S:1.1 xc/extras/Mesa/src/X86/vertex_katmai.S:1.2
--- xc/extras/Mesa/src/X86/vertex_katmai.S:1.1	Tue Feb  8 09:18:21 2000
+++ xc/extras/Mesa/src/X86/vertex_katmai.S	Fri Jun 16 17:02:43 2000
@@ -9,13 +9,7 @@
 	
 	SEG_TEXT
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L##a
-#else
-#define LLBL(a) a
-#endif
 
-
 /*
  * void gl_v16_katmai_general_xform (GLfloat *dest,
  *		        	     const GLfloat *m,
@@ -44,7 +38,7 @@
  	MOVUPS( REGOFF(48, ESI), XMM7 )	/* x44, x43, x42, x41 => xmm7 */
 
 ALIGNTEXT32
-LLBL( loop1 ):	
+LLBL(loop1):	
 
  	MOVSS( REGOFF(0, EDX), XMM0 )	/* s1 => xmm0 */
  	SHUFPS( CONST(0x0), XMM0, XMM0 )	/* xmm0 shuffle to other 96 bits */
@@ -104,7 +98,7 @@
 
 	SUB_L( ECX, EDX )			/* last -= first */
 
-LLBL( v16_katmai_pv_loop_start ):
+LLBL(v16_katmai_pv_loop_start):
 	MOVUPS( REGOFF(0, ECX), XMM3 )		/* f[3], f[2], f[1], f[0] */
 
 	MOVSS( REGOFF(12, ECX), XMM2 )		/* -, -, -, f[3] */
@@ -121,7 +115,7 @@
 
 	ADD_L( EAX, ECX )			/* f += stride */
 	SUB_L( EAX, EDX )			/* (last-first)-stride */
-	JA ( LLBL( v16_katmai_pv_loop_start ) )
+	JA ( LLBL(v16_katmai_pv_loop_start) )
 
 	POP_L( EBP )
 	RET
@@ -159,9 +153,9 @@
 	SHUFPS( CONST(0x44), REGOFF(MAT_SZ, EBP), XMM1 )
 						/* -, x33, x22, x11 => xmm1 */
 
-LLBL( v16_katmai_pcv_loop_start ):
+LLBL(v16_katmai_pcv_loop_start):
 	CMP_B ( CONST(0), REGIND(ESI) )		/* clip_mask == 0 ? */
-	JNE( LLBL( v16_katmai_pcv_skip ) )	/* no -> skip ! */
+	JNE( LLBL(v16_katmai_pcv_skip) )	/* no -> skip ! */
 
 	MOVUPS( REGOFF(0, ECX), XMM3 )		/* f[3], f[2], f[1], f[0] */
 
@@ -176,12 +170,12 @@
 	MOVUPS( XMM1, REGOFF(0, ECX) )		/* back to f */
 	MOVSS( XMM2, REGOFF(12, ECX) )		/* 1/f[3] into f[3] ! */
 
-LLBL( v16_katmai_pcv_skip ):
+LLBL(v16_katmai_pcv_skip):
 	ADD_L( EAX, ECX )			/* f += stride */
 	INC_L( ESI )				/* nect ClipMask */
 
 	CMP_L( ECX, EDX )			/* p_first_vertex == p_last_vertex */
-	JNE( LLBL( v16_katmai_pcv_loop_start ) )
+	JNE( LLBL(v16_katmai_pcv_loop_start) )
 						/* no -> go on with next vertex */
 
 	POP_L( ESI )	
Index: xc/extras/Mesa/src/X86/x86.c
diff -u xc/extras/Mesa/src/X86/x86.c:1.3 xc/extras/Mesa/src/X86/x86.c:1.4
--- xc/extras/Mesa/src/X86/x86.c:1.3	Mon Feb 14 23:13:20 2000
+++ xc/extras/Mesa/src/X86/x86.c	Fri Jun 16 17:02:43 2000
@@ -28,17 +28,14 @@
  */
 
 
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
+#include "glheader.h"
 #include "context.h"
 #include "types.h"
 #include "vertices.h"
 #include "xform.h"
 #include "x86.h"
 
+#ifdef USE_X86_ASM
 extern void _ASMAPI gl_v16_x86_cliptest_points4(GLfloat *first_vert,
 					GLfloat *last_vert,
 					GLubyte *or_mask,
@@ -51,7 +48,7 @@
 				     const GLfloat *src,
 				     GLuint src_stride,
 				     GLuint count);
-
+#endif
 
 
 #define XFORM_ARGS 	GLvector4f *to_vec, 		\
@@ -85,8 +82,7 @@
  gl_transform_tab[cma][vsize][MATRIX_3D] 			\
   = gl_##pfx##_transform_points##vsize##_3d_##masked;
 
-void gl_init_x86_asm_transforms( void )
-{
+
 #ifdef USE_X86_ASM
    DECLARE_XFORM_GROUP( x86, 2, raw )
    DECLARE_XFORM_GROUP( x86, 3, raw )
@@ -100,8 +96,12 @@
                                                GLubyte clipMask[],
                                                GLubyte *orMask, 
                                                GLubyte *andMask );
+#endif
+
 
-   
+void gl_init_x86_asm_transforms( void )
+{
+#ifdef USE_X86_ASM
    ASSIGN_XFORM_GROUP( x86, 0, 2, raw )
    ASSIGN_XFORM_GROUP( x86, 0, 3, raw )
    ASSIGN_XFORM_GROUP( x86, 0, 4, raw )
@@ -110,6 +110,7 @@
    ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 3, masked )
    ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 4, masked )
 
+   /* XXX this function has been found to cause FP overflow exceptions */
    gl_clip_tab[4] = gl_x86_cliptest_points4;
 
 #ifdef DEBUG
Index: xc/extras/Mesa/src/X86/x86a.S
diff -u xc/extras/Mesa/src/X86/x86a.S:1.1 xc/extras/Mesa/src/X86/x86a.S:1.2
--- xc/extras/Mesa/src/X86/x86a.S:1.1	Mon Dec 13 17:32:19 1999
+++ xc/extras/Mesa/src/X86/x86a.S	Fri Jun 16 17:02:43 2000
@@ -5,12 +5,6 @@
 #define FP_ONE 1065353216
 #define FP_ZERO 0
 
-#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER)
-#define LLBL(a) .L ## a
-#else
-#define LLBL(a) a
-#endif
-
 #define S(i) 	REGOFF(i * 4, ESI)
 #define D(i) 	REGOFF(i * 4, EDI)
 #define M(i) 	REGOFF(i * 4, EDX)
Index: xc/extras/X-TrueType/xttcconv.c
diff -u xc/extras/X-TrueType/xttcconv.c:1.7 xc/extras/X-TrueType/xttcconv.c:1.8
--- xc/extras/X-TrueType/xttcconv.c:1.7	Tue Feb 29 08:07:13 2000
+++ xc/extras/X-TrueType/xttcconv.c	Thu May 18 16:46:10 2000
@@ -30,7 +30,7 @@
 
 Notice===
  */
-/* $XFree86: xc/extras/X-TrueType/xttcconv.c,v 1.7 2000/02/29 16:07:13 tsi Exp $ */
+/* $XFree86: xc/extras/X-TrueType/xttcconv.c,v 1.8 2000/05/18 23:46:10 dawes Exp $ */
 
 #include "xttversion.h"
 
@@ -505,17 +505,19 @@
 
             {
                 char **l;
-				char **tryItFirst = NULL;
+		char **tryItFirst = NULL;
 
                 for (l=list; *l ; l++) {
-					if(!mystrcasecmp(*l,moduleArg.charSetHints->charsetStdName))
-						tryItFirst = l;
-				}
-
-				if(tryItFirst)
-					l = tryItFirst;
-				else
-					l = list;
+			if(!mystrcasecmp(*l,moduleArg.charSetHints->charsetStdName)) {
+				tryItFirst = l;
+				break;
+			}
+		}
+
+		if(tryItFirst)
+			l = tryItFirst;
+		else
+			l = list;
 			
                 while(*l && !isFound) {
                     /* load and call module */
Index: xc/extras/X-TrueType/xttcconvP.h
diff -u xc/extras/X-TrueType/xttcconvP.h:1.5 xc/extras/X-TrueType/xttcconvP.h:1.6
--- xc/extras/X-TrueType/xttcconvP.h:1.5	Sat Feb 12 21:24:36 2000
+++ xc/extras/X-TrueType/xttcconvP.h	Tue Jun 27 14:26:32 2000
@@ -32,7 +32,7 @@
 
 Notice===
  */
-/* $XFree86: xc/extras/X-TrueType/xttcconvP.h,v 1.5 2000/02/13 05:24:36 dawes Exp $ */
+/* $XFree86: xc/extras/X-TrueType/xttcconvP.h,v 1.6 2000/06/27 21:26:32 tsi Exp $ */
 
 #ifndef _XTTCCONVP_H_
 #define _XTTCCONVP_H_ 1
@@ -134,6 +134,13 @@
         codeDst = altChar;\
 \
     return codeDst;\
+}
+
+#define CODE_CONV_ONE_OCTET_TO_UCS2_ALL(funcName, tableName)\
+ft_char_code_t /* result charCodeDst */\
+funcName(ft_char_code_t codeSrc)\
+{\
+    return tableName[codeSrc];\
 }
 
 /* 2 octet charset to unicode */
Index: xc/extras/X-TrueType/xttfuncs.c
diff -u xc/extras/X-TrueType/xttfuncs.c:1.6 xc/extras/X-TrueType/xttfuncs.c:1.7
--- xc/extras/X-TrueType/xttfuncs.c:1.6	Mon Feb 14 11:20:20 2000
+++ xc/extras/X-TrueType/xttfuncs.c	Thu May 18 16:46:10 2000
@@ -31,7 +31,7 @@
 
 Notice===
 */
-/* $XFree86: xc/extras/X-TrueType/xttfuncs.c,v 1.6 2000/02/14 19:20:20 dawes Exp $ */
+/* $XFree86: xc/extras/X-TrueType/xttfuncs.c,v 1.7 2000/05/18 23:46:10 dawes Exp $ */
 
 #include "xttversion.h"
 
@@ -702,7 +702,7 @@
 
         if ((entry = FontCacheGetEntry()) == NULL) {
             charInfo = &nocharinfo;
-            fprintf(stderr, "can't get cache entry\n");
+            fprintf(stderr, "get_metrics: can't get cache entry\n");
             goto next;
         }
         FC_TT_SETVFUNC(entry);
@@ -790,10 +790,9 @@
             char_width.pixel = char_width.raw = 0;
         get_metrics(ft, c, char_width);
         /* Retry to get it created in get_metrics(). */
-        FontCacheSearchEntry(ft->cache, c, &entry);
-        if (!charInfo) {
+        if (!FontCacheSearchEntry(ft->cache, c, &entry)) {
             charInfo = &nocharinfo;
-            fprintf(stderr, "can't get cache entry\n");
+            fprintf(stderr, "get_glyph: can't get cache entry\n");
             goto next;
         }
     }
Index: xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c
diff -u xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c:1.1.1.2 xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c:1.2
--- xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c:1.1.1.2	Sat Feb 12 21:14:17 2000
+++ xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c	Tue Jun 27 14:26:32 2000
@@ -33,6 +33,7 @@
 Notice===
 
  */
+/* $XFree86: xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c,v 1.2 2000/06/27 21:26:32 tsi Exp $ */
 
 #include "xttversion.h"
 
@@ -81,11 +82,8 @@
     0xfe7c, 0x00f9, 0xfe7e, 0x00fb, 0x00fc, 0x200e, 0x200f, 0x00ff
 };
 
-CODE_CONV_ONE_OCTET_TO_UCS2(cc_cp1256_to_ucs2, /* function name */
-                            tblCp1256ToUcs2, /* table name */
-                            0x00, 0xff, /* begin and end of table */
-                            ALTCHR /* alt char code (on UCS2) */
-                            )
+CODE_CONV_ONE_OCTET_TO_UCS2_ALL(cc_cp1256_to_ucs2, /* function name */
+                                tblCp1256ToUcs2) /* table name */
 
 
 /* end of file */
Index: xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c
diff -u xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c:1.1.1.2 xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c:1.2
--- xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c:1.1.1.2	Sat Feb 12 21:14:18 2000
+++ xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c	Tue Jun 27 14:26:32 2000
@@ -42,6 +42,7 @@
 				Pablo Saratxaga <srtxg@chanae.alphanet.ch>
 
  */
+/* $XFree86: xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c,v 1.2 2000/06/27 21:26:32 tsi Exp $ */
 
 #include "xttversion.h"
 
@@ -91,11 +92,8 @@
 };
 
 
-CODE_CONV_ONE_OCTET_TO_UCS2(cc_xaterm_tophalf_to_ucs2, /* function name */
-                            tblXaterm_TophalfToUcs2, /* table name */
-                            0x00,0xff, /* begin and end of table */
-                            ALTCHR /* alt char code (on UCS2) */
-                            )
+CODE_CONV_ONE_OCTET_TO_UCS2_ALL(cc_xaterm_tophalf_to_ucs2, /* function name */
+                                tblXaterm_TophalfToUcs2) /* table name */
 
 
 /* end of file */
Index: xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c
diff -u xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c:1.1.1.2 xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c:1.2
--- xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c:1.1.1.2	Sat Feb 12 21:14:21 2000
+++ xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c	Tue Jun 27 14:26:32 2000
@@ -46,6 +46,7 @@
     whith -misc-fontspecific instead of -viscii1.1-1 *sigh*)
 
  */
+/* $XFree86: xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c,v 1.2 2000/06/27 21:26:32 tsi Exp $ */
 
 #include "xttversion.h"
 
@@ -165,22 +166,13 @@
 };
 
 
-CODE_CONV_ONE_OCTET_TO_UCS2(cc_cp437_to_ucs2, /* function name */
-                          tblCp437ToUcs2, /* table name */
-			  0x00,0xff, /* begin and end of table */
-                          ALTCHR /* alt char code (on UCS2) */
-                          )
-
-CODE_CONV_ONE_OCTET_TO_UCS2(cc_cp850_to_ucs2, /* function name */
-                          tblCp850ToUcs2, /* table name */
-                          0x00,0xff, /* begin and end of table */
-                          ALTCHR /* alt char code (on UCS2) */
-                          )
-
-CODE_CONV_ONE_OCTET_TO_UCS2(cc_cp1252_to_ucs2, /* function name */
-                          tblCp1252ToUcs2, /* table name */
-                          0x00,0xff, /* begin and end of table */
-                          ALTCHR /* alt char code (on UCS2) */
-                          )
+CODE_CONV_ONE_OCTET_TO_UCS2_ALL(cc_cp437_to_ucs2, /* function name */
+                                tblCp437ToUcs2) /* table name */
+
+CODE_CONV_ONE_OCTET_TO_UCS2_ALL(cc_cp850_to_ucs2, /* function name */
+                                tblCp850ToUcs2) /* table name */
+
+CODE_CONV_ONE_OCTET_TO_UCS2_ALL(cc_cp1252_to_ucs2, /* function name */
+                                tblCp1252ToUcs2) /* table name */
 
 /* end of file */
Index: xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c
diff -u xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c:1.1.1.2 xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c:1.2
--- xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c:1.1.1.2	Sat Feb 12 21:14:33 2000
+++ xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c	Tue Jun 27 14:26:32 2000
@@ -73,6 +73,7 @@
 	a microsoft-symbol encoding table the glyphs will match.  -- srtxg
 
  */
+/* $XFree86: xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c,v 1.2 2000/06/27 21:26:32 tsi Exp $ */
 
 #include "xttversion.h"
 
@@ -180,11 +181,8 @@
 			  tblIso8859_6_8ToUcs2, /* table name */
 			  ALTCHR /* alt char code (on UCS2) */
 			  )
-CODE_CONV_ONE_OCTET_TO_UCS2(cc_iso8859_6_16_to_ucs2, /* function name */
-                          tblIso8859_6_16ToUcs2, /* table name */
-                          0x00,0xff, /* begin and end of table */
-                          ALTCHR /* alt char code (on UCS2) */
-                          )
+CODE_CONV_ONE_OCTET_TO_UCS2_ALL(cc_iso8859_6_16_to_ucs2, /* function name */
+                                tblIso8859_6_16ToUcs2) /* table name */
 CODE_CONV_ISO8859_TO_UCS2(cc_asmo449_to_ucs2, /* function name */
                           tblAsmo449ToUcs2, /* table name */
                           ALTCHR /* alt char code (on UCS2) */
Index: xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c
diff -u xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c:1.1.1.2 xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c:1.2
--- xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c:1.1.1.2	Sat Feb 12 21:14:50 2000
+++ xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c	Tue Jun 27 14:26:33 2000
@@ -39,6 +39,7 @@
     positions (first char is at 0x02) so the table goes from 0x00 to 0xff.
 
  */
+/* $XFree86: xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c,v 1.2 2000/06/27 21:26:33 tsi Exp $ */
 
 #include "xttversion.h"
 
@@ -90,10 +91,7 @@
     0x1ee5, 0x00f9, 0x00fa, 0x0169, 0x1ee7, 0x00fd, 0x1ee3, 0x1eee
 };
 
-CODE_CONV_ONE_OCTET_TO_UCS2(cc_viscii_to_ucs2, /* function name */
-                            tblVisciiToUcs2, /* table name */
-                            0x00,0xff, /* begin and end of table */
-                            ALTCHR /* alt char code (on UCS2) */
-                            )
+CODE_CONV_ONE_OCTET_TO_UCS2_ALL(cc_viscii_to_ucs2, /* function name */
+                                tblVisciiToUcs2) /* table name */
 
 /* end of file */
Index: xc/extras/rman/ANNOUNCE-rman
diff -u /dev/null xc/extras/rman/ANNOUNCE-rman:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:19 2000
+++ xc/extras/rman/ANNOUNCE-rman	Mon Mar 20 16:47:34 2000
@@ -0,0 +1,78 @@
+======================================================================
+
+PolyglotMan (nee RosettaMan) is a filter for UNIX manual pages.  It
+takes as input man pages for a variety of UNIX flavors and produces as
+output a variety of file formats.  Currently PolyglotMan accepts man
+pages from the following flavors of UNIX: Hewlett-Packard HP-UX, AT&T
+System V, SunOS, Sun Solaris, OSF/1, DEC Ultrix, SGI IRIX, Linux, SCO,
+FreeBSD; and produces output for the following formats: printable
+ASCII only (stripping page headers and footers), section and
+subsection headers only, TkMan, [tn]roff, RTF, SGML (soon--I finally
+found a DTD), HTML, MIME, LaTeX, LaTeX 2e, Perl 5's pod.  Previously
+<I>PolyglotMan</I> required pages to be formatted by nroff prior to
+its processing; with version 3.0, it prefers [tn]roff source and
+usually can produce results that are better yet.
+
+PolyglotMan improves upon other man page filters in several ways: (1) its
+analysis recognizes the structural pieces of man pages, enabling high
+quality output, (2) its modular structure permits easy augmentation of
+output formats, (3) it accepts man pages formatted with the variant
+macros of many different flavors of UNIX, and (4) it doesn't require
+modification of or cooperation with any other program.
+
+PolyglotMan is a rewrite of TkMan's man page filter, called bs2tk.  (If
+you haven't heard about TkMan, a hypertext man page browser, you
+should grab it via anonymous ftp from ftp.cs.berkeley.edu:
+/ucb/people/phelps/tkman.tar.Z.)  Whereas bs2tk generated output only for
+TkMan, PolyglotMan generalizes the process so that the analysis can be
+leveraged to new output formats.  A single analysis engine recognizes
+section heads, subsection heads, body text, lists, references to other
+man pages, boldface, italics, bold italics, special characters (like
+bullets), tables (to a degree) and strips out page headers and
+footers.  The engine sends signals to the selected output functions so
+that an enhancement in the engine improves the quality of output of
+all of them.  Output format functions are easy to add, and thus far
+average about about 75 lines of C code each.
+
+A note for HTML consumers:  This filter does real (heuristic) parsing--
+no <PRE>!  Man page references are turned into hypertext links.  The files 
+<URL:ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/sgi-ls.1.html>
+and <URL:ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/ksh.1.html>
+are examples of the quality of output produced entirely automatically
+(no retouching) by PolyglotMan.  These translations were produced by
+PolyglotMan starting with the [tn]roff source (again no retouching).
+Several people have extended World Wide Web servers to format man pages 
+on the fly.  Check the README file in the contrib directory for a list.
+
+
+CHANGES in 3.0
+
+* [tn]roff source preferred for superior results, when roff macros are
+  sufficiently recognized.  Autodetection of source or formatted input.
+* New software license that makes it free for any use
+
+
+CHANGES in 2.5
+
+* SGML output format that adheres to Davenport DocBook v2.3 DTD
+  (NOT READY IN CURRENT VERSION!)
+* MIME output format, for e-mail and Emacs 19.29's enriched mode
+  (Neal Becker)
+* port to Macintosh by Matthias Neeracher
+* list of valid volume names can be given as a parameter (Dag Nygren)
+* updated to LaTeX2e (H. Palme)
+* debugging scaffolding erected (at the end of software's development cycle!)
+
+
+CHANGES in 2.2
+
+* when in SEE ALSO, hyphens would confuse man page-reference finder, 
+  so re-linebreak if necessary to eliminate them (!) (Greg Earle & Uri Guttman)
+
+
+CHANGES in 2.1
+
+* gets() replaced by custom code.  gets() deprecated since it reads until \0, 
+  introducing security problems. (Robert Withrow)
+
+* TkMan module revised for Tk 4.0
Index: xc/extras/rman/CHANGES
diff -u /dev/null xc/extras/rman/CHANGES:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/CHANGES	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,100 @@
+1993
+ 1 Apr	as bs2tk posted to comp.lang.tcl (126 lines)
+ 2	bullets, change bars, copyright symbol
+ 5	boldface, other SGI nicks
+ 7	skip unrecognized escape codes
+10	small caps
+13	underscores considered uppercase so show up in default small caps font
+	screen out Ultrix junk (code getting pretty tangled now)
+14	until Tk text has better tab support, replace tabs by spaces until get to next tab stop (for Ultrix); -t gives tabstop spacing
+20	Solaris support (Larry Tsui)
+ 3 Jun	section subheading parsing (Per-Erik Martin)
+28	hyphenated man pages in SEE ALSO show up correctly in Links (Mike Steele)
+13 Jul	under FILES, fully qualified path names are added to Links, but this taken out immediately because not useful
+14	option to keep changebars on right (Warren Jessop)
+ 5 Aug	search for header, footer dynamically--no need to edit or search large list of patterns
+11	-m kicks in man page formatting beyond nroff backspace kludges
+27	handle double digit numbers better by trying again relative to end of line
+19 Sep	-T gives Tk extras (otherwise ASCII only)
+	-H gives headers only (implies -T off)
+10 Oct	-r reverse compiles to [tn]roff source (as Geoff Collyer's nam and fontch, but leveraging existing analysis so only addition of ~60 lines)  (The code is device-driver obscure now--obfuscated C contest next.)
+13	header and footer optionally available at bottom in Tk view (Marty Leisner)
+19	"reflected" odd and even page headers&footers zapped
+20	keep count of sections and subsections, using smaller font for larger numbers
+ 1 Nov	reverse compiles to Ensemble, except for character ranges
+ 4	started rman rewrite for cleaner support of multiple output targets, including: plain ascii, headers only, TkMan, [nt]roff, Ensemble, SGML, HTML
+ 5	line filtering separated from other logic despite greater sophistication, RosettaMan faster than bs2tk (!)
+28 Dec	man page reference recognition (Michael Harrison)
+
+
+1994
+ 1 Jan	identify descriptive lists by comparing scnt2 with s_avg
+ 3	tail-end table of contents in HTML documents
+ 5	-f <filter> and LaTeX output mode
+24	proof-of-concept RTF output mode
+26	handle man pages that don't have a header on the first page
+28	parse "handwritten" man pages
+22 Feb	alpha version released
+ 6 Mar	various bug fixes
+10	beta version released
+13 Jun	fixed surious generation on <DL>'s (the existence of which pointed out by David Sibley)
+22 Jul	table recognition experiment.  works reasonably well, except for tables with centered headers
+ 3 Aug	allow for off-by-one (and -two) in identification of header and footer
+	fixed problem with recurrent/leftover text with OSF/1 bold bullets (yeesh)
+12 Sep	2.0gamma released
+13	check for *third* header, possibly centered, possibly after blank lines (Charles Anderson)
+	fixed tag ranges for lines following blank lines (just \n) of pages with global indentation (Owen Rees)
+19	fixed two small problems with LaTeX (^ => \^, \bullet => $\bullet$) (Neal Becker)
+24	simple check for erroneously being fed roff source
+26	deal with bold +- as in ksh (ugh)
+30	2.0delta released
+ 9 Oct	special check for OSF to guard against section head interpreted as footer
+ 8 Nov	Perl pod output format (result still needs work, but not much)
+ 7 Dec	2.0epsilon released (last one before final 2.0)
+22	Happy Winter Solstice!  2.0 released
+	deprecated gets() replaced (Robert Withrow)
+25	TkMan module's $w.show => $t, saving about 9% in generated characters
+
+
+1995
+ 1 Jan	experiment with TkMan output to take advantage of my hack to Tk text (i.e., $t insert end "text" => $t insert end "text1" tag1 "text2" tag2 ...); results => output size reduced about 25%, time reduced about 12-15%
+25 Mar	back to old mark command for Tk module
+8 May	hyphens in SEE ALSO section would confuse link-finder, so re-linebreak if necessary(!) (Greg Earle & Uri Guttman)
+ 4 Aug	put formats and options into tables (inspired by Steve Maguire's Writing Solid Code)
+19	-V accepts colon-separated list of valid volume names (Dag Nygren)
+22	MIME output format that's usable in Emacs 19.29 (just three hours at hacking HTML module) (Neal Becker)
+ 9 Sep	nits in HTML and better Solaris code snippets (Drazen Kacar)
+13 Nov	Macintosh port by Matthias Neeracher <neeri@iis.ee.ethz.ch>
+18 Dec	adapted to LaTeX2e, null manRef yields italicized man ref (H. Palme)
+28	allow long option names (Larry Schwimmer)
+
+
+1996
+22 Jan	fixed problem with hyphenation supression and tabs in man page--sheesh! (H. Palme)
+23 May	split TkMan format into Tk and TkMan (which calls Tk)
+25	in TkMan format, initial spaces converted to tabs
+24 Sep	experiment with formatting from source's macros, for better transcription short of full nroff interpreter
+27	commented out Ensemble output format, which nobody used
+ 2 Oct	>4000 lines
+11
+ 8 Nov  released 3.0 alpha.  source code parsing works well for Solaris, SunOS, HP-UX; in generating HTML
+25	recognize URLs (Mic Campanel)
+
+1997
+19 Mar	bug fixes, more special characters (roff expert Larry Jones)
+ 8 Aug  renamed to PolyglotMan
+ 4 Nov	TkMan module: Rebus and NoteMark identification for paragraph lengths and command line options taken over from Tcl (still have search, highlight in Tcl, necessarily) (Chad Loder)
+	>5000 lines, or nearly 40X the lines of code of version 1.0 (which just supported TkMan)
+
+1998
+20 Mar	automatic detection of Tcl/Tk source (within automatic detection of source; already had within formatted)
+	centralize casifying SH and SS for formatted and source
+	group exception table by category
+17 Apr	in source translation, pass along comment lines too
+20	incorporate (RCS) versioning diff's, for HTML
+
+
+Anticipated/Contemplated
+make source translation work on Digital UNIX better--just tweaks now
+fix up other output formats to work well with source parsing
+??-???	SGML/XML output format (DTD found at long last), validated by sgmls/sp
Index: xc/extras/rman/MANIFEST
diff -u /dev/null xc/extras/rman/MANIFEST:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/MANIFEST	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,28 @@
+gcksum crc   length name
+----------   ------ ----
+3783133468 152817 rman.c
+2435527268 1654 getopt.c
+1480364202 71 macish.c
+476345420 3770 ANNOUNCE-rman
+510464631 3311 README-rman
+892917966 4571 Makefile
+236255660 3149 Makefile.mac
+733124117 11877 rman.1
+694318729 13321 rman.html
+1726493852 5810 CHANGES
+3948042252 4732 contrib/README-contrib
+953283015 911 contrib/authried.txt
+641079878 13609 contrib/bennett.txt
+1827405570 1220 contrib/gzip.patch
+4230791356 250 contrib/hman.cgi
+1743159239 359 contrib/hman.ksh
+2919099478 8005 contrib/hman.pl
+1821945783 4978 contrib/http-rman.c
+3091246851 661 contrib/http-rman.html
+2646244070 350 contrib/lewis.pl
+2860919314 2049 contrib/man2html
+3466647040 7531 contrib/rman_html_split
+75383086 2482 contrib/rman_html_split.1
+2032677288 150 contrib/sco-wrapper.sh
+884546947 3806 contrib/sutter.txt
+3112317992 5086 contrib/youki.pl
Index: xc/extras/rman/Makefile
diff -u /dev/null xc/extras/rman/Makefile:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/Makefile	Mon Mar 20 16:47:34 2000
@@ -0,0 +1,166 @@
+#
+# Makefile for PolyglotMan
+#   It's helpful to read the README-rman file first.
+#   You should read over all parts of this file,
+#      down to the "you shouldn't modify" line
+#
+# Tom Phelps (phelps@ACM.org)
+#
+
+
+### you need to localize the paths on these lines
+
+# The executable `rman' is placed in BINDIR.
+# If you're also installing TkMan (available separately--see README-rman),
+#    this must be a directory that's in your bin PATH.
+# MANDIR holds the man page.
+
+BINDIR = /private/share/bin
+#BINDIR = /usr/local/bin
+MANDIR = /home/auspex/h/bair/phelps/man/man1
+#MANDIR = /usr/local/man/man1
+
+
+### if you have GNU gcc v2.x, use these definitions
+
+CC = gcc
+# if you don't have gcc v2.x, try -O for CFLAGS
+CFLAGS = -O2 -finline-functions
+
+### if you just have a standard UNIX, use these instead of GNU.
+### CC must be an ANSI C compiler
+
+#CC = cc
+#CFLAGS = -O
+
+# Solaris and SysV people may need this
+#CFLAGS = -O2 -finline-functions
+
+# For HP-UX
+#CC = cc
+#CFLAGS = -Aa -O
+# HP-UX 10.20
+#CFLAGS = -Ae -O
+
+# DEC Alpha and Ultrix, -std1 needed to conform to ANSI C
+#CC = cc
+#CFLAGS = -std1 -O3 -Olimit 1000
+
+
+# list of valid volume numbers and letters
+# you can also set these at runtime with -V
+VOLLIST = "1:2:3:4:5:6:7:8:9:o:l:n:p"
+# SCO Unix has expanded set of volume letters
+#VOLLIST = "1:2:3:4:5:6:7:8:9:o:l:n:p:C:X:S:L:M:F:G:A:H"
+# SGI and UnixWare 2.0
+#VOLLIST = "1:2:3:4:5:6:7:8:9:o:l:n:p:D"
+
+
+# the printf strings used to set the <TITLE> and
+# to set URL hyperlinks to referenced manual pages
+# can be defined at runtime.  The defaults are defined below.
+# The first %s parameter is the manual page name,
+# the second the volume/section number.
+# you can set these at runtime with -l and -r, respectively
+
+MANTITLEPRINTF = "%s(%s) manual page"
+# relative link to pregenerated file in same directory
+MANREFPRINTF = "%s.%s"
+# on-the-fly through a cgi-bin script
+#MANREFPRINTF = "/cgi-bin/man2html?%s&%s"
+
+
+# # # these lines are probably fine
+
+CP = cp
+# or you can use GNU's cp and backup files that are about to be overwritten
+#CP = cp -b
+RM = rm
+
+
+#--------------------------------------------------
+#
+# you shouldn't modify anything below here
+#
+#--------------------------------------------------
+
+version = 3.0.8
+rman = rman-$(version)
+srcs = rman.c getopt.c macish.c
+objs = rman
+defs = -DVOLLIST='$(VOLLIST)' -DMANTITLEPRINTF='$(MANTITLEPRINTF)' -DMANREFPRINTF='$(MANREFPRINTF)'
+libs = 
+aux = ANNOUNCE-rman README-rman Makefile Makefile.mac rman.1 rman.html CHANGES
+distrib = $(srcs) $(libs) $(aux) contrib
+
+
+all:  rman
+	@echo 'Files made in current directory.'
+	@echo 'You should "make install".'
+
+# everyone but me zaps assertions with the -DNDEBUG flag
+rman: rman.c Makefile
+	$(CC) -DNDEBUG $(defs) -DPOLYGLOTMANVERSION=\"$(version)\" $(CFLAGS) -o rman rman.c
+
+dox: rman.1 ANNOUNCE-rman
+
+ANNOUNCE-rman: Announce-rman
+	sed -e /=========/,/bogusline/p -e d Announce-rman > ANNOUNCE-rman
+
+rman.1: rman.html rman
+	echo '.TH PolyglotMan 1' > rman.1
+	cat ../html/html.dtd rman.html | sgmls | ../html/html2man.pl >> rman.1
+
+debug:
+	$(CC) $(defs) -DDEBUG -DPOLYGLOTMANVERSION=\"debug\" -g -Wall -o rman rman.c
+
+prof:
+	quantify -cache-dir=/home/orodruin/h/bair/phelps/spine/rman/cache $(CC) -DNDEBUG $(defs) -DPOLYGLOTMANVERSION=\"QUANTIFY\" -g -o rman rman.c
+
+install: rman
+#	$(INSTALL) -s rman $(BINDIR)
+	$(RM) -f $(BINDIR)/rman
+	$(CP) rman $(BINDIR)
+	$(RM) -f $(MANDIR)/rman.1
+	$(CP) rman.1 $(MANDIR)
+
+# test version includes assertions
+#	ginstall rman $(BINDIR)/`arch`
+test: rman.c Makefile
+	$(CC) $(defs) -DPOLYGLOTMANVERSION=\"$(version)\" $(CFLAGS) -Wall -ansi -pedantic -o rman rman.c
+	ls -l rman
+	ginstall rman $(BINDIR)
+	rman -v
+	rman --help
+	@echo 'Assertion checks:'
+	rman -f html weirdman/hp-tbl.1 > /dev/null
+	rman -f html weirdman/Pnews.1 > /dev/null
+	nroff -man rman.1 | rman -f html > /dev/null
+
+sww:
+	rm -f rman $(wildcard ~/bin/{sun4,snake,alpha}/rman)
+	rman
+
+clean:
+	rm -f $(objs)
+
+dist: dox
+	rm -rf $(rman)*
+	mkdir $(rman)
+	$(CP) -R $(distrib) $(rman)
+#	expand -4 rman.c > $(rman)/rman.c
+	rm -f $(rman)/contrib/*~
+	@echo 'gcksum crc   length name' > MANIFEST
+	@echo '----------   ------ ----' >> MANIFEST
+	@gcksum $(filter-out contrib, $(filter-out %~, $(distrib) $(wildcard contrib/*))) | gtee -a MANIFEST
+	mv MANIFEST $(rman)
+	gtar chvf $(rman).tar $(rman)
+	compress $(rman).tar
+#	gzip -9v $(rman).tar
+	rm -rf $(rman) ANNOUNCE-rman rman.1
+	@echo "*** Did you remember to ci -l first?"
+
+uu: tar
+	gznew $(rman).tar.Z
+	echo 'uudecode, gunzip (from GNU), untar' > $(rman).tar.gz.uu
+	uuencode $(rman).tar.gz $(rman).tar.gz >> $(rman).tar.gz.uu
Index: xc/extras/rman/Makefile.mac
diff -u /dev/null xc/extras/rman/Makefile.mac:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/Makefile.mac	Mon Mar 20 16:47:34 2000
@@ -0,0 +1,105 @@
+#
+# Makefile for RosettaMan
+#   It's helpful to read the README-rman file first.
+#   You should read over all parts of this file,
+#      down to the "you shouldn't modify" line
+#
+# Tom Phelps (phelps@ACM.org)
+#
+# Mac version: Matthias Neeracher <neeri@iis.ee.ethz.ch>
+#
+
+BINDIR = "{{MPW}}LocalTools:"
+
+version = 2.4
+rman = rman-$(version)
+srcs = rman.c getopt.c macish.c
+defs = -d MANTITLEPRINTF='$(MANTITLEPRINTF)' -d MANREFPRINTF='$(MANREFPRINTF)' \
+		 -d ROSETTAMANVERSION='"$(version)"'
+libs = 
+aux = README-rman Makefile rman.1 rman.html Copyright
+distrib = $(srcs) $(libs) $(aux) contrib
+
+COpt			=	$(defs) -d macintosh -w off -sym on
+C68K			=	MWC68K ${COpt} -mc68020 -model far -mbg on
+CPPC			=	MWCPPC ${COpt} -traceback
+ROptions 	= 	-i :
+Lib68K		=	MWLink68K -xm library -sym on
+LibPPC		=	MWLinkPPC -xm library -sym on
+LOpt			= 	-sym on -w -xm mpwtool
+Link68K		=	MWLink68K ${LOpt} -model far
+LinkPPC		=	MWLinkPPC ${LOpt} 
+
+LibFiles68K	=			"{{MW68KLibraries}}GUSIDispatch.Lib.68K"				\
+							"{{MW68KLibraries}}GUSIMPW.Lib.68K"						\
+							"{{MW68KLibraries}}MPW_Runtime.o.lib"					\
+							"{{MW68KLibraries}}new MPW ANSI (4i/8d) C.68K.Lib"	\
+							"{{MW68KLibraries}}MathLib68K (4i/8d).Lib"			\
+							"{{MW68KLibraries}}MacOS.Lib"								\
+							"{{MW68KLibraries}}GUSI.Lib.68K"							\
+							"{{MW68KLibraries}}CPlusPlus.lib"						\
+							"{{MW68KLibraries}}ToolLibs.o"							\
+							"{{MW68KLibraries}}PLStringFuncs.glue.lib"
+
+LibFilesPPC	=			"{{MWPPCLibraries}}GUSIMPW.Lib.PPC"						\
+							"{{MWPPCLibraries}}GUSI.Lib.PPC"							\
+							"{{MWPPCLibraries}}MWStdCRuntime.Lib"					\
+							"{{MWPPCLibraries}}InterfaceLib"							\
+							"{{MWPPCLibraries}}ANSI (NL) C++.PPC.Lib"				\
+							"{{MWPPCLibraries}}ANSI (NL) C.PPC.Lib"				\
+							"{{MWPPCLibraries}}StdCLib"								\
+							"{{MWPPCLibraries}}MathLib"								\
+							"{{MWPPCLibraries}}PPCToolLibs.o"
+
+# the printf strings used to set the <TITLE> and
+# to set URL hyperlinks to referenced manual pages
+# can be defined at runtime.  The defaults are defined below.
+# The first %s parameter is the manual page name,
+# the second the volume/section number.
+
+MANTITLEPRINTF = "%s(%s) manual page"
+MANREFPRINTF = "http://localhost/cgi-bin/man2html?%s?%s"
+CP = Duplicate -y
+
+OBJ68K		=	$(srcs:s/.c/.c.68K.o/)
+OBJPPC		=	$(srcs:s/.c/.c.PPC.o/)
+
+.SOURCE.o	:	":Obj:"
+
+%.c.68K.o		:	%.c
+	Set Echo 0
+	Set Src68K "{{Src68K}} $<"
+%.c.PPC.o		:	%.c
+	Set Echo 0
+	Set SrcPPC "{{SrcPPC}} $<"
+
+all:  rman
+
+install: all
+	Begin
+		Backup -a -to $(BINDIR) rman 
+	End>"{{TempFolder}}"rman.run
+	"{{TempFolder}}"rman.run
+
+rman: rman.68K rman.PPC
+	Duplicate -y rman.PPC rman
+	Echo 'Include "rman.68K" '¶''CODE'¶'';Include "rman.68K" '¶''DATA'¶'';' ¶
+		| Rez -a -c 'MPS ' -t MPST -o rman
+rman.68K:	Objects68K
+	${Link68K} -o rman.68K :Obj:{${OBJ68K}} ${LibFiles68K}
+rman.PPC:	ObjectsPPC
+	${LinkPPC} -o rman.PPC  :Obj:{${OBJPPC}} ${LibFilesPPC}
+
+Objects68K	:	${OBJ68K}
+	Set Echo 1
+	If "{{Src68K}}" != "" 
+		${C68K} -t -fatext {{Src68K}} -o :Obj:
+	End
+	echo > Objects68K
+	
+ObjectsPPC	:	${OBJPPC}	
+	Set Echo 1
+	If "{{SrcPPC}}" != "" 
+		${CPPC} -t -fatext {{SrcPPC}} -o :Obj:
+	End
+	echo > ObjectsPPC
Index: xc/extras/rman/README-rman
diff -u /dev/null xc/extras/rman/README-rman:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/README-rman	Mon Mar 20 16:47:34 2000
@@ -0,0 +1,69 @@
+*** INSTALLING ***
+
+Set BINDIR in the Makefile to where you keep your binaries and MANDIR
+to where you keep your man pages (in their source form).  (If you're
+using PolyglotMan with TkMan, BINDIR needs to be a component of your
+bin PATH.)  After properly editing the Makefile, type `make install'.
+Thereafter (perhaps after a `rehash') type `rman' to invoke PolyglotMan.
+PolyglotMan requires an ANSI C compiler.  To compile on a Macintosh
+under MPW, use Makefile.mac.
+
+If you send me bug reports and/or suggestions for new features,
+include the version of PolyglotMan (available by typing `rman -v').
+PolyglotMan doesn't parse every aspect of every man page perfectly, but
+if it blows up spectacularly where it doesn't seem like it should, you
+can send me the man page (or a representative man page if it blows up
+on a class of man pages) in BOTH: (1) [tn]roff source form, from
+.../man/manX and (2) formatted form (as formatted by `nroff -man'),
+uuencoded to preserve the control characters, from .../man/catX.
+
+The home location for PolyglotMan is ftp.cs.berkeley.edu:
+/ucb/people/phelps/tcltk/rman.tar.Z (this is a softlink to the latest,
+numbered version).  If you discover a bug and you obtained PolyglotMan
+at some other site, first grab it from this one to see if the problem
+has been fixed.
+
+Be sure to look in the contrib directory for WWW server interfaces,
+a batch converter, and a wrapper for SCO.
+
+--------------------------------------------------
+
+*** NOTES ON CURRENT VERSION ***
+
+Help!  I'm looking for people to help with the following projects.
+(1) Better RTF output format.  The current one works, but could be
+made better.  (2) Extending the macro sets for source recognition.  If
+you write an output format or otherwise improve PolyglotMan, please
+send in your code so that I may share the wealth in future releases.
+(3) Fixing output for various (accented?) characters in the Latin1
+character set.
+
+--------------------------------------------------
+
+
+Copyright (c) 1993-1997 Regents of the University of California
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for educational, research, internal corporate and
+non-profit purposes, without fee, and without a written agreement is
+hereby granted for all cases that do not conflict with the restriction
+in the first sentence of this paragraph, provided that the above
+copyright notice, this paragraph, and the following three paragraphs
+appear in all copies.
+
+Permission to incorporate this software into commercial products may 
+be obtained from the Office of Technology Licensing, 2150 Shattuck 
+Avenue, Suite 510, Berkeley, CA  94704. 
+
+IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY 
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES 
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF 
+THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF 
+SUCH DAMAGE.
+
+THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, 
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE 
+PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF 
+CALIFORNIA HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, 
+ENHANCEMENTS, OR MODIFICATIONS.
Index: xc/extras/rman/getopt.c
diff -u /dev/null xc/extras/rman/getopt.c:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/getopt.c	Mon Mar 20 16:47:34 2000
@@ -0,0 +1,79 @@
+/*
+Newsgroups: mod.std.unix
+Subject: public domain AT&T getopt source
+Date: 3 Nov 85 19:34:15 GMT
+
+Here's something you've all been waiting for:  the AT&T public domain
+source for getopt(3).  It is the code which was given out at the 1985
+UNIFORUM conference in Dallas.  I obtained it by electronic mail
+directly from AT&T.  The people there assure me that it is indeed
+in the public domain.
+*/
+
+/*LINTLIBRARY*/
+
+extern int strlen();
+extern int strcmp();
+extern char *strchr();
+extern int write();
+
+#define NULL	0
+#define EOF	(-1)
+#define ERR(s, c)	if(opterr){\
+	char errbuf[2];\
+	errbuf[0] = c; errbuf[1] = '\n';\
+	(void) write(2, argv[0], (unsigned)strlen(argv[0]));\
+	(void) write(2, s, (unsigned)strlen(s));\
+	(void) write(2, errbuf, 2);}
+
+
+int	opterr = 1;
+int	optind = 1;
+int	optopt;
+char	*optarg;
+
+int
+getopt(argc, argv, opts)
+int	argc;
+char	**argv, *opts;
+{
+	static int sp = 1;
+	register int c;
+	register char *cp;
+
+	if(sp == 1)
+		if(optind >= argc ||
+		   argv[optind][0] != '-' || argv[optind][1] == '\0')
+			return(EOF);
+		else if(strcmp(argv[optind], "--") == NULL) {
+			optind++;
+			return(EOF);
+		}
+	optopt = c = argv[optind][sp];
+	if(c == ':' || (cp=strchr(opts, c)) == NULL) {
+		ERR(": illegal option -- ", c);
+		if(argv[optind][++sp] == '\0') {
+			optind++;
+			sp = 1;
+		}
+		return('?');
+	}
+	if(*++cp == ':') {
+		if(argv[optind][sp+1] != '\0')
+			optarg = &argv[optind++][sp+1];
+		else if(++optind >= argc) {
+			ERR(": option requires an argument -- ", c);
+			sp = 1;
+			return('?');
+		} else
+			optarg = argv[optind++];
+		sp = 1;
+	} else {
+		if(argv[optind][++sp] == '\0') {
+			sp = 1;
+			optind++;
+		}
+		optarg = NULL;
+	}
+	return(c);
+}
Index: xc/extras/rman/macish.c
diff -u /dev/null xc/extras/rman/macish.c:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/macish.c	Mon Mar 20 16:47:34 2000
@@ -0,0 +1,6 @@
+#include <QuickDraw.h>
+
+void InitToolbox()
+{
+	InitGraf(&qd.thePort);
+}
Index: xc/extras/rman/rman.1
diff -u /dev/null xc/extras/rman/rman.1:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/rman.1	Mon Mar 20 16:47:34 2000
@@ -0,0 +1,269 @@
+.TH PolyglotMan 1
+.SH "NAME "
+PolyglotMan, rman - reverse compile man pages from formatted 
+form to a number of source formats 
+.SH "SYNOPSIS "
+rman [ \fIoptions \fR] [ \fIfile \fR] 
+.SH "DESCRIPTION "
+\fIPolyglotMan \fR takes man pages from most of the popular flavors 
+of UNIX and transforms them into any of a number of text source 
+formats. PolyglotMan was formerly known as RosettaMan. The name 
+of the binary is still called \fIrman \fR, for scripts that depend 
+on that name; mnemonically, just think "reverse man". Previously \fI
+PolyglotMan \fR required pages to be formatted by nroff prior 
+to its processing. With version 3.0, it \fIprefers [tn]roff source \fR
+and usually produces results that are better yet. And source 
+processing is the only way to translate tables. Source format 
+translation is not as mature as formatted, however, so try formatted 
+translation as a backup. 
+.PP
+In parsing [tn]roff source, one could implement an arbitrarily 
+large subset of [tn]roff, which I did not and will not do, so 
+the results can be off. I did implement a significant subset 
+of those use in man pages, however, including tbl (but not eqn), 
+if tests, and general macro definitions, so usually the results 
+look great. If they don't, format the page with nroff before 
+sending it to PolyglotMan. If PolyglotMan doesn't recognize a 
+key macro used by a large class of pages, however, e-mail me 
+the source and a uuencoded nroff-formatted page and I'll see 
+what I can do. When running PolyglotMan with man page source 
+that includes or redirects to other [tn]roff source using the .so (source 
+or inclusion) macro, you should be in the parent directory of 
+the page, since pages are written with this assumption. For example, 
+if you are translating /usr/man/man1/ls.1, first cd into /usr/man. 
+.PP
+\fIPolyglotMan \fR accepts man pages from: SunOS, Sun Solaris, 
+Hewlett-Packard HP-UX, AT&T System V, OSF/1 aka Digital UNIX, 
+DEC Ultrix, SGI IRIX, Linux, FreeBSD, SCO. Source processing 
+works for: SunOS, Sun Solaris, Hewlett-Packard HP-UX, AT&T System 
+V, OSF/1 aka Digital UNIX, DEC Ultrix. It can produce printable 
+ASCII-only (control characters stripped), section headers-only, 
+Tk, TkMan, [tn]roff (traditional man page source), SGML, HTML, 
+MIME, LaTeX, LaTeX2e, RTF, Perl 5 POD. A modular architecture 
+permits easy addition of additional output formats. 
+.PP
+The latest version of PolyglotMan is always available from \fI
+ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/rman.tar.Z \fR. 
+.SH "OPTIONS "
+The following options should not be used with any others and 
+exit PolyglotMan without processing any input. 
+.TP 15
+-h|--help 
+Show list of command line options and exit. 
+.TP 15
+-v|--version 
+Show version number and exit. 
+.PP
+\fIYou should specify the filter first, as this sets a number 
+of parameters, and then specify other options. 
+.TP 15
+-f|--filter <ASCII|roff|TkMan|Tk|Sections|HTML|SGML|MIME|LaTeX|LaTeX2e|RTF|POD> 
+Set the output filter. Defaults to ASCII. 
+.TP 15
+-S|--source 
+PolyglotMan tries to automatically determine whether its input 
+is source or formatted; use this option to declare source input. 
+.TP 15
+-F|--format|--formatted 
+PolyglotMan tries to automatically determine whether its input 
+is source or formatted; use this option to declare formatted 
+input. 
+.TP 15
+-l|--title \fIprintf-string \fR
+In HTML mode this sets the <TITLE> of the man pages, given the 
+same parameters as \fI-r \fR. 
+.TP 15
+-r|--reference|--manref \fIprintf-string \fR
+In HTML and SGML modes this sets the URL form by which to retrieve 
+other man pages. The string can use two supplied parameters: 
+the man page name and its section. (See the Examples section.) 
+If the string is null (as if set from a shell by "-r ''"), `-' 
+or `off', then man page references will not be HREFs, just set 
+in italics. If your printf supports XPG3 positions specifier, 
+this can be quite flexible. 
+.TP 15
+-V|--volumes \fI<colon-separated list> \fR
+Set the list of valid volumes to check against when looking for 
+cross-references to other man pages. Defaults to \fI1:2:3:4:5:6:7:8:9:o:l:n:p \fR(volume 
+names can be multicharacter). If an non-whitespace string in 
+the page is immediately followed by a left parenthesis, then 
+one of the valid volumes, and ends with optional other characters 
+and then a right parenthesis--then that string is reported as 
+a reference to another manual page. If this -V string starts 
+with an equals sign, then no optional characters are allowed 
+between the match to the list of valids and the right parenthesis. (This 
+option is needed for SCO UNIX.) 
+.PP
+The following options apply only when formatted pages are given 
+as input. They do not apply or are always handled correctly with 
+the source. 
+.TP 15
+-b|--subsections 
+Try to recognize subsection titles in addition to section titles. 
+This can cause problems on some UNIX flavors. 
+.TP 15
+-K|--nobreak 
+Indicate manual pages don't have page breaks, so don't look for 
+footers and headers around them. (Older nroff -man macros always 
+put in page breaks, but lately some vendors have realized that 
+printout are made through troff, whereas nroff -man is used to 
+format pages for reading on screen, and so have eliminated page 
+breaks.) \fIPolyglotMan \fR usually gets this right even without 
+this flag. 
+.TP 15
+-k|--keep 
+Keep headers and footers, as a canonical report at the end of 
+the page. changeleft 
+Move changebars, such as those found in the Tcl/Tk manual pages, 
+to the left. --> notaggressive 
+\fIDisable \fR aggressive man page parsing. Aggressive manual, 
+which is on by default, page parsing elides headers and footers, 
+identifies sections and more. --> 
+.TP 15
+-n|--name \fIname \fR
+Set name of man page (used in roff format). If the filename is 
+given in the form " \fIname \fR. \fIsection \fR", the name and 
+section are automatically determined. If the page is being parsed 
+from [tn]roff source and it has a .TH line, this information 
+is extracted from that line. 
+.TP 15
+-p|--paragraph 
+paragraph mode toggle. The filter determines whether lines should 
+be linebroken as they were by nroff, or whether lines should 
+be flowed together into paragraphs. Mainly for internal use. 
+.TP 15
+-s|section \fI# \fR
+Set volume (aka section) number of man page (used in roff format). 
+tables 
+Turn on aggressive table parsing. --> 
+.TP 15
+-t|--tabstops \fI# \fR
+For those macros sets that use tabs in place of spaces where 
+possible in order to reduce the number of characters used, set 
+tabstops every \fI# \fR columns. Defaults to 8. 
+.SH "NOTES ON FILTER TYPES "
+.SS "ROFF "
+Some flavors of UNIX ship man page without [tn]roff source, making 
+one's laser printer little more than a laser-powered daisy wheel. 
+This filer tries to intuit the original [tn]roff directives, 
+which can then be recompiled by [tn]roff. 
+.SS "TkMan "
+TkMan, a hypertext man page browser, uses \fIPolyglotMan \fR 
+to show man pages without the (usually) useless headers and footers 
+on each pages. It also collects section and (optionally) subsection 
+heads for direct access from a pulldown menu. TkMan and Tcl/Tk, 
+the toolkit in which it's written, are available via anonymous 
+ftp from \fIftp://ftp.smli.com/pub/tcl/ \fR
+.SS "Tk "
+This option outputs the text in a series of Tcl lists consisting 
+of text-tags pairs, where tag names roughly correspond to HTML. 
+This output can be inserted into a Tk text widget by doing an \fI
+eval <textwidget> insert end <text> \fR. This format should be 
+relatively easily parsible by other programs that want both the 
+text and the tags. Also see ASCII. 
+.SS "ASCII "
+When printed on a line printer, man pages try to produce special 
+text effects by overstriking characters with themselves (to produce 
+bold) and underscores (underlining). Other text processing software, 
+such as text editors, searchers, and indexers, must counteract 
+this. The ASCII filter strips away this formatting. Piping nroff 
+output through \fIcol -b \fR also strips away this formatting, 
+but it leaves behind unsightly page headers and footers. Also 
+see Tk. 
+.SS "Sections "
+Dumps section and (optionally) subsection titles. This might 
+be useful for another program that processes man pages. 
+.SS "HTML "
+With a simple extention to an HTTP server for Mosaic or other 
+World Wide Web browser, \fIPolyglotMan \fR can produce high quality 
+HTML on the fly. Several such extensions and pointers to several 
+others are included in \fIPolyglotMan \fR's \fIcontrib \fR directory. 
+.SS "SGML "
+This is appoaching the Docbook DTD, but I'm hoping that someone 
+that someone with a real interest in this will polish the tags 
+generated. Try it to see how close the tags are now. 
+.SS "MIME "
+MIME (Multipurpose Internet Mail Extensions) as defined by RFC 1563, 
+good for consumption by MIME-aware e-mailers or as Emacs (>=19.29) 
+enriched documents. 
+.SS "LaTeX and LaTeX2e "
+Why not? 
+.SS "RTF "
+Use output on Mac or NeXT or whatever. Maybe take random man 
+pages and integrate with NeXT's documentation system better. 
+Maybe NeXT has own man page macros that do this. 
+.SS "PostScript and FrameMaker "
+To produce PostScript, use \fIgroff \fR or \fIpsroff \fR. To 
+produce FrameMaker MIF, use FrameMaker's builtin filter. In both 
+cases you need \fI[tn]roff \fR source, so if you only have a 
+formatted version of the manual page, use \fIPolyglotMan \fR's 
+roff filter first. 
+.SH "EXAMPLES "
+To convert the \fIformatted \fR man page named \fIls.1 \fR back 
+into [tn]roff source form: 
+.PP
+\fIrman -f roff /usr/local/man/cat1/ls.1 > /usr/local/man/man1/ls.1 \fR
+.br
+.PP
+Long man pages are often compressed to conserve space (compression 
+is especially effective on formatted man pages as many of the 
+characters are spaces). As it is a long man page, it probably 
+has subsections, which we try to separate out (some macro sets 
+don't distinguish subsections well enough for \fIPolyglotMan \fR
+to detect them). Let's convert this to LaTeX format: 
+.br
+.PP
+\fIpcat /usr/catman/a_man/cat1/automount.z | rman -b -n automount -s 1 -f 
+latex > automount.man \fR
+.br
+.PP
+Alternatively, \fIman 1 automount | rman -b -n automount -s 1 -f 
+latex > automount.man \fR
+.br
+.PP
+For HTML/Mosaic users, \fIPolyglotMan \fR can, without modification 
+of the source code, produce HTML links that point to other HTML 
+man pages either pregenerated or generated on the fly. First 
+let's assume pregenerated HTML versions of man pages stored in \fI/usr/man/html \fR. 
+Generate these one-by-one with the following form: 
+.br
+\fIrman -f html -r 'http:/usr/man/html/%s.%s.html' /usr/man/cat1/ls.1 > /usr/man/html/ls.1.html \fR
+.br
+.PP
+If you've extended your HTML client to generate HTML on the fly 
+you should use something like: 
+.br
+\fIrman -f html -r 'http:~/bin/man2html?%s:%s' /usr/man/cat1/ls.1 \fR
+.br
+when generating HTML. 
+.SH "BUGS/INCOMPATIBILITIES "
+\fIPolyglotMan \fR is not perfect in all cases, but it usually 
+does a good job, and in any case reduces the problem of converting 
+man pages to light editing. 
+.PP
+Tables in formatted pages, especially H-P's, aren't handled very 
+well. Be sure to pass in source for the page to recognize tables. 
+.PP
+The man pager \fIwoman \fR applies its own idea of formatting 
+for man pages, which can confuse \fIPolyglotMan \fR. Bypass \fI
+woman \fR by passing the formatted manual page text directly 
+into \fIPolyglotMan \fR. 
+.PP
+The [tn]roff output format uses fB to turn on boldface. If your 
+macro set requires .B, you'll have to a postprocess the \fIPolyglotMan \fR
+output. 
+.SH "SEE ALSO "
+\fItkman(1) \fR, \fIxman(1) \fR, \fIman(1) \fR, \fIman(7) \fR
+or \fIman(5) \fR depending on your flavor of UNIX 
+.SH "AUTHOR "
+PolyglotMan 
+.br
+by Thomas A. Phelps ( \fIphelps@ACM.org \fR) 
+.br
+developed at the 
+.br
+University of California, Berkeley 
+.br
+Computer Science Division 
+.PP
+Manual page last updated on $Date: 1998/07/13 09:47:28 $ 
Index: xc/extras/rman/rman.c
diff -u /dev/null xc/extras/rman/rman.c:1.9
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/rman.c	Tue Jun 13 16:15:47 2000
@@ -0,0 +1,5460 @@
+static char rcsid[] = "Header: /home/cs/phelps/spine/rman/RCS/rman.c,v 1.144 1999/08/10 00:41:55 phelps Exp phelps $";
+
+/*
+   PolyglotMan by Thomas A. Phelps (phelps@ACM.org)
+
+  accept man pages as formatted by (10)
+     Hewlett-Packard HP-UX, AT&T System V, SunOS, Sun Solaris, OSF/1, DEC Ultrix,
+	SGI IRIX, Linux, FreeBSD, SCO
+
+  output as (9)
+     printable ASCII, section headers only, TkMan, [tn]roff, HTML,
+	LaTeX, LaTeX2e, RTF, Perl pod, MIME, and soon SGML
+
+     written March 24, 1993
+	bs2tk transformed into RosettaMan November 4-5, 1993
+     source interpretation added September 24, 1996
+	renamed PolyglotMan due to lawsuit by Rosetta, Inc. August 8, 1997
+*/
+/* $XFree86: xc/extras/rman/rman.c,v 1.9 2000/06/13 23:15:47 dawes Exp $ */
+
+
+/* TO DO ****
+
+   clean up relationship between source and formatted filtering support routines
+
+   output to SGML with Davenport DTD
+
+   don't give SHORTLINE if just finished bullet of bultxt, ended section head, ... other cases?
+   make sure text following bullet is aligned correctly
+
+   output to WinHelp?  don't have specs (anybody interested?)
+   collect header and footer until hit blank line?
+   what to do about tables?   count second gap of spaces & average gap? ==>
+      good idea but tables too variable for this to work
+   internal, outline-like header section for HTML documents?  how to put this *first*?  (can't in single pass)
+   one line look ahead to enable better parsing (item lists, et cetera)
+   alluc (==nonlc) flag, copy curline to last line vector (works well with lookahead cache)
+   ??      collect sundry globals into vectors (i.e., arrays and enum indexes)
+              (if compiler has good constant propagation, then shouldn't slow access)
+   collect scattered globals into vectors (e.g., curline[ispcnt]): array + enum
+      curline, lastline, flags, pending, bufs+lens
+*/
+
+
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <assert.h>
+/* I'm sure I'll need some #ifdef's here to include the right headers */
+/* ... but compiles swell on Solaris, DEC Alpha, HP, SunOS */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifdef Lynx
+extern int optind;
+extern char *optarg;
+#endif
+
+/*** make #define's into consts? => can't because compilers not smart enough ***/
+/* maximum number of tags per line */
+#define MAXTAGS 50*100
+/* BUFSIZ = 1024 on Solaris */
+#define MAXBUF 2*5000
+#define MAXLINES 20000
+#define MAXTOC 500
+#define xputchar(c)		(fcharout? putchar(c): (c))
+#define sputchar(c)		(fcharout? plain[sI++]=(char)c: (char)(c))
+#define stagadd(tag)	tagadd(tag,sI,0)
+enum { c_rsquote='\''/*\x27*/, c_lsquote='`'/*\x60*/, c_dagger='\xa7', c_bullet='\xb7', c_plusminus='\xb1' };
+
+
+/*** tag management ***/
+
+enum tagtype { NOTAG, TITLE, ITALICS, BOLD, SYMBOL, SMALLCAPS, BOLDITALICS, MONO, MANREF };	/* MANREF last */
+struct { enum tagtype type; int first; int last; } tags[MAXTAGS];
+int tagc=0;
+struct { char *text; int type; int line; } toc[MAXTOC];
+int tocc=0;
+
+
+/* characters in this list automatically prefixed by a backslash (set in output format function */
+char *escchars="";
+char *vollist = VOLLIST;
+const char *manvalid = "._-+:";	/* in addition to alphanumerics, valid characters to find in a man page name */
+char *manrefname;
+char *manrefsect;
+
+enum command {
+
+	/*BEGINCHARTAGS,*/
+	CHARTAB='\t',
+	CHARPERIOD='.', CHARLSQUOTE='`', CHARRSQUOTE='\'', CHARGT='>', CHARLT='<',
+	CHARAMP='&', CHARBACKSLASH='\\', CHARDASH='-', CHARHAT='^', CHARVBAR='|',
+ 	CHARNBSP=0xa0,	CHARCENT=0xa2, CHARSECT=0xa7, CHARCOPYR=0xa9, CHARNOT=0xac,
+ 	CHARDAGGER=0xad, CHARREGTM=0xae, CHARDEG=0xb0, CHARPLUSMINUS=0xb1,
+ 	CHARACUTE=0xb4, CHARBULLET=0xb7, CHAR14=0xbc, CHAR12=0xbd, CHAR34=0xbe,
+ 	CHARMUL=0xd7, CHARDIV=0xf7,
+	CHANGEBAR=0x100, CHARLQUOTE, CHARRQUOTE, HR,
+	/*ENDCHARTAGS,*/
+
+	/*BEGINFONTTAGS,*/
+	BEGINBOLD, ENDBOLD, BEGINITALICS, ENDITALICS, BEGINBOLDITALICS, ENDBOLDITALICS,
+	BEGINSC, ENDSC, BEGINY, ENDY, BEGINCODE, ENDCODE, BEGINMANREF, ENDMANREF,
+	FONTSIZE,
+	/*ENDFONTTAGS*/
+
+	/*BEGINLAYOUTTAGS,*/
+	ITAB, BEGINCENTER, ENDCENTER,
+	/*ENDLAYOUTTAGS,*/
+
+	/*BEGINSTRUCTTAGS,*/
+	BEGINDOC, ENDDOC, BEGINCOMMENT, ENDCOMMENT, COMMENTLINE, BEGINBODY, ENDBODY, 
+	BEGINHEADER, ENDHEADER, BEGINFOOTER, ENDFOOTER, BEGINLINE, ENDLINE, SHORTLINE,
+	BEGINSECTION, ENDSECTION, BEGINSUBSECTION, ENDSUBSECTION,
+	BEGINSECTHEAD, ENDSECTHEAD, BEGINSUBSECTHEAD, ENDSUBSECTHEAD,
+	BEGINBULPAIR, ENDBULPAIR, BEGINBULLET, ENDBULLET, BEGINBULTXT, ENDBULTXT,
+	BEGINTABLE, ENDTABLE, BEGINTABLELINE, ENDTABLELINE, BEGINTABLEENTRY, ENDTABLEENTRY,
+	BEGININDENT, ENDINDENT, BEGINCODEBLOCK, ENDCODEBLOCK,
+
+	BEGINDIFFA, ENDDIFFA, BEGINDIFFD, ENDDIFFD
+	/*,*//*ENDSTRUCTTAGS,*/
+};
+
+const char *tcltkOP[] = { "Command-Line Name", "Database Name", "Database Class" };
+
+
+/* characters that need special handling in any output format, *more than just a backslash* */
+/* characters in this list need a corresponding case statement in each output format */
+/*char *trouble="\t.`'><&\\^|-\xa7\xb7\xb1";*/
+const unsigned char trouble[]= { CHARTAB, CHARPERIOD, CHARLSQUOTE, CHARRSQUOTE,
+	CHARGT, CHARLT, CHARAMP, CHARBACKSLASH, CHARDASH, CHARHAT, CHARVBAR, CHARCENT,
+	CHARSECT, CHARCOPYR, CHARNOT, CHARDAGGER, CHARREGTM, CHARDEG, CHARPLUSMINUS,
+	CHARACUTE, CHARBULLET, CHAR14, CHAR12, CHAR34, CHARMUL, CHARDIV,
+	0 };
+
+
+enum command tagbeginend[][2] = {	/* parallel to enum tagtype */
+	{ -1,-1 },
+	{ -1,-1 },
+	{ BEGINITALICS, ENDITALICS },
+	{ BEGINBOLD, ENDBOLD },
+	{ BEGINY, ENDY },
+	{ BEGINSC, ENDSC },
+	{ BEGINBOLDITALICS, ENDBOLDITALICS },
+	{ -1,-1 },
+	{ BEGINMANREF, ENDMANREF }
+};
+
+void (*fn)(enum command) = NULL;
+enum command prevcmd = BEGINDOC;
+
+
+/*** globals ***/
+/* move all flags into an array?
+enum { fSubsX, fLast };
+int flags[fLast];
+*/
+
+int fSource=-1;	/* -1 => not determined yet */
+int fDiff=0;
+FILE *difffd;
+char diffline[MAXBUF];
+char diffline2[MAXBUF];
+char *message = NULL;
+int fontdelta=0;
+int intArg;
+
+int fPara=0;			/* line or paragraph groupings of text */
+int fSubsections=0;	/* extract subsection titles too? */
+int fChangeleft=0;	/* move change bars to left? (-1 => delete them) */
+int fReflow=0;
+int fURL=0;		/* scan for URLs too? */
+#if 0
+int fMan=1;		/* invoke agressive man page filtering? */
+#endif
+int fQS=0;		/* squeeze out spaces (scnt and interword)? */
+int fIQS=0;		/* squeeze out initial spaces (controlled separately from fQS) */
+int fILQS=0;		/* squeeze out spaces for usual indent */
+int fHeadfoot=0;	/* show canonical header and footer at bottom? */
+int falluc=0;
+int itabcnt=0;
+int fQuiet=0;
+int fTclTk=0;
+
+/* patterns observed in section heads that don't conform to first-letter-uppercase-rest-lowercase pattern (stay all uc, or go all lc, or have subsequent uc) */
+int lcexceptionslen = -1;	/* computed by system */
+char *lcexceptions[] = {
+/* new rule: double/all consonants == UC? */
+	/* articles, verbs, conjunctions, prepositions, pronouns */
+	"a", "an", "the", 
+	"am", "are", "is", "were",
+	"and", "or",
+	"by", "for", "from", "in", "into", "it", "of", "on", "to", "with",
+	"that", "this",
+
+	/* terms */
+	"API", "CD", "GUI", "UI", /*I/O=>I/O already*/ "ID", "IDs", "OO",
+	"IOCTLS", "IPC", "RPC",
+
+	/* system names */
+	"AWK", "cvs", "rcs", "GL", "vi", "PGP", "QuickTime", "DDD", "XPG/3",
+	"NFS", "NIS", "NIS+", "AFS", 
+	"UNIX", "SysV", 
+	"XFree86", "ICCCM",
+	"MH", "MIME",
+	"TeX", "LaTeX", "PicTeX",
+	"PostScript", "EPS", "EPSF", "EPSI", 
+	"HTML", "URL", "WWW",
+
+	/* institution names */
+	"ANSI", "CERN", "GNU", "ISO", "NCSA",
+
+	/* Sun-specific */	
+	"MT-Level", "SPARC",
+
+	NULL
+};
+/* what exceptions have you encountered? */
+
+int TabStops=8;
+int hanging=0;		/* location of hanging indent (if ==0, none) */
+enum { NAME, SYNOPSIS, DESCRIPTION, SEEALSO, FILES, AUTHOR, RANDOM };	/* RANDOM last */
+char *sectheadname[] = {
+  "NAME", "SYNOPSIS", "DESCRIPTION:INTRODUCTION", "SEE ALSO:RELATED INFORMATION", "FILES", "AUTHOR:AUTHORS", "RANDOM"
+};
+int sectheadid = RANDOM;
+int oldsectheadid = RANDOM;
+
+int fCodeline=0;
+int fNOHY=0;		/* re-linebreak so no words are hyphenated; not used by TkMan, but gotta keep for people converting formatted text */
+int fNORM=0;		/* normalize?  initial space => tabs, no changebars, exactly one blank line between sections */
+const char TABLEOFCONTENTS[] = "Table of Contents";
+const char HEADERANDFOOTER[] = "Header and Footer";
+char manName[80]="man page";
+char manSect[10]="1";
+const char provenance[] =
+	"manual page source format generated by PolyglotMan v" POLYGLOTMANVERSION;
+const char anonftp[] =
+	"available via anonymous ftp from ftp.cs.berkeley.edu:/ucb/people/phelps/tcltk/rman.tar.Z";
+const char horizontalrule[] = "------------------------------------------------------------";
+
+const int LINEBREAK=70;
+int linelen=0;			/* length of result in plain[] */
+int spcsqz;			/* number of spaces squeezed out */
+int ccnt=0;			/* # of changebars */
+int scnt,scnt2;		/* counts of initial spaces in line */
+int s_sum,s_cnt;
+int bs_sum, bs_cnt;
+int ncnt=0,oncnt=0;		/* count of interline newlines */
+int CurLine=1;
+int AbsLine=1-1;		/* absolute line number */
+int indent=0;			/* global indentation */
+int lindent=0;			/* usual local indent */
+int auxindent=0;		/* aux indent */
+int I;			/* index into line/paragraph */
+int fcharout=1;		/* show text or not */
+char lookahead;
+/*int tabgram[MAXBUF];*/	/* histogram of first character positions */
+char buf[MAXBUF];
+char plain[MAXBUF];		/* current text line with control characters stripped out */
+char hitxt[MAXBUF];		/* highlighted text (available at time of BEGIN<highlight> signal */
+char header[MAXBUF]/*=""*/;		/* complete line */
+char header2[MAXBUF]/*=""*/;		/* SGIs have two lines of headers and footers */
+char header3[MAXBUF]/*=""*/;		/* GNU and some others have a third! */
+char footer[MAXBUF]/*=""*/;
+char footer2[MAXBUF]/*=""*/;
+#define CRUFTS 5
+char *cruft[CRUFTS] = { header, header2, header3, footer, footer2 };
+char *File, *in;		/* File = pointer to full file contents, in = current file pointer */
+char *argv0;
+int finTable=0;
+char tableSep='\0';	/*\t';*/
+/*int fTable=0;
+int fotable=0;*/
+char *tblcellformat;
+int tblcellspan;
+/*int tblspanmax;*/
+int listtype=-1;	/* current list type bogus to begin with */
+enum listtypes { DL, OL, UL };
+
+int fIP=0;
+
+
+
+/*** utility functions ***/
+
+
+/* case insensitive versions of strcmp and strncmp */
+
+static int
+stricmp(const char *s1, const char *s2)
+{
+	assert(s1!=NULL && s2!=NULL);
+	/*strincmp(s1, s2, strlen(s1)+1);*/
+
+	while (tolower(*s1)==tolower(*s2)) {
+		if (*s1=='\0' /*&& *s2=='\0'*/) return 0;
+		s1++; s2++;
+	}
+
+	if (tolower(*s1)<tolower(*s2)) return -1;
+	else return 1;
+}
+
+static int
+lcexceptionscmp(const void *a, const void *b)
+{
+	return stricmp(*(char **)a, *(char **)b);
+}
+
+static int
+strincmp(const char *s1, const char *s2, size_t n)
+{
+	assert(s1!=NULL && s2!=NULL && n>0);
+
+	while (n>0 && tolower(*s1)==tolower(*s2)) {
+		n--; s1++; s2++;
+	}
+	if (n==0) return 0;
+	else if (tolower(*s1)<tolower(*s2)) return -1;
+	else return 1;
+}
+
+/* compare string and a colon-separated list of strings */
+static int
+strcoloncmp2(char *candidate, int end, const char *list, int sen)
+{
+	const char *l = list;
+	char *c,c2;
+
+	assert(candidate!=NULL && list!=NULL);
+	assert(end>=-1 && end<=255);
+	assert(sen==0 || sen==1);
+
+	if (*l==':') l++;	/* tolerate a leading colon */
+
+	/* invariant: c and v point to start of strings to compare */
+	while (*l) {
+		assert(l==list || l[-1]==':');
+		for (c=candidate; *c && *l; c++,l++)
+			if ((sen && *c!=*l) || (!sen && tolower(*c)!=tolower(*l)))
+				break;
+
+		/* if candidate matches a valid one as far as valid goes, it's a keeper */
+		if ((*l=='\0' || *l==':') && (*c==end || end==-1)) {
+		  if (*c=='\b') {
+		    c2 = c[-1];
+		    while (*c=='\b' && c[1]==c2) c+=2;
+		  }
+		  /* no volume qualifiers with digits */
+		  if (!isdigit(*c)) return 1;
+		}
+
+		/* bump to start of next valid */
+		while (*l && *l++!=':') /* nada */;
+	}
+
+	return 0;
+}
+
+static int
+strcoloncmp(char *candidate, int end, const char *list)
+{
+	int sen=1;
+	const char *l = list;
+
+	assert(candidate!=NULL && list!=NULL);
+	assert(end>=-1 && end<=255);
+
+	if (*l=='=') l++; else end=-1;
+	if (*l=='i') { sen=0; l++; }
+
+	return strcoloncmp2(candidate, end, l, sen);
+}
+
+/* strdup not universally available */
+static char *
+mystrdup(const char *p)
+{
+  char *q;
+
+  if (p==NULL) return NULL;
+
+  q = malloc(strlen(p)+1);	/* +1 gives space for \0 that is not reported by strlen */
+  if (q!=NULL) strcpy(q,p);
+  return q;
+}
+
+
+/* given line of text, return "casified" version in place:
+   if word in exceptions list, return exception conversion
+   else uc first letter, lc rest
+*/
+static void
+casify(char *p)
+{
+	char tmpch, *q, **exp;
+	int fuc;
+
+	for (fuc=1; *p; p++) {
+		if (isspace(*p) || strchr("&/",*p)!=NULL) fuc=1;
+		else if (fuc) {
+			/* usually */
+			if (p[1] && isupper(p[1]) /*&& p[2] && isupper(p[2])*/) fuc=0;
+			/* check for exceptions */
+			for (q=p; *q && !isspace(*q); q++) /*nada*/;
+			tmpch = *q; *q='\0';
+			exp = (char **)bsearch(&p, lcexceptions, lcexceptionslen, sizeof(char *), lcexceptionscmp);
+			*q = tmpch;
+			if (exp!=NULL) {
+				for (q=*exp; *q; q++) *p++=*q;
+				fuc = 1;
+			}
+		} else *p=tolower(*p);
+	}
+}
+
+
+/* add an attribute tag to a range of characters */
+
+static void
+tagadd(int /*enum tagtype--abused in source parsing*/ type, int first, int last)
+{
+	assert(type!=NOTAG);
+
+	if (tagc<MAXTAGS) {
+		tags[tagc].type = type;
+		tags[tagc].first = first;
+		tags[tagc].last = last;
+		tagc++;
+	}
+}
+
+
+/*
+   collect all saves to string table one one place, so that
+   if decide to go with string table instead of multiple malloc, it's easy
+   (probably few enough malloc's that more sophistication is unnecessary)
+*/
+
+static void
+tocadd(char *text, enum command type, int line)
+{
+	char *r;
+
+	assert(text!=NULL && strlen(text)>0);
+	assert(type==BEGINSECTION || type==BEGINSUBSECTION);
+
+	if (tocc<MAXTOC) {
+		r = malloc(strlen(text)+1); if (r==NULL) return;
+		strcpy(r,text);
+		toc[tocc].text = r;
+		toc[tocc].type = type;
+		toc[tocc].line = line;
+		tocc++;
+	}
+}
+
+
+
+char *manTitle = MANTITLEPRINTF;
+char *manRef = MANREFPRINTF;
+char *href;
+int fmanRef=1;	/* make 'em links or just show 'em? */
+
+static void
+manrefextract(char *p)
+{
+  char *p0;
+  static char *nonhref = "\">'";
+
+  while (*p==' ') p++;
+  if (strincmp(p,"http",4)==0) {
+	href="%s"; manrefname = p;
+	p+=4;
+	while (*p && !isspace(*p) && !strchr(nonhref,*p)) p++;
+  } else {
+	href = manRef;
+
+	manrefname = p;
+	while (*p && *p!=' ' && *p!='(') p++; *p++='\0';
+	while (*p==' ' || *p=='(') p++; p0=p;
+#ifdef XFree86
+	/* Don't allow a letter after the man section number */
+	p++;
+#else
+	while (*p && *p!=')') p++;
+#endif
+	manrefsect = p0;
+  }
+  *p='\0';
+}
+
+
+
+
+/*
+ * OUTPUT FORMATS
+ *    *** break these out so can selectively include them in the binary ***
+ *    *** does this save significant space? ***
+ */
+
+static void
+formattedonly(void)
+{
+	fprintf(stderr, "The output formats for Tk and TkMan require nroff-formatted input\n");
+	exit(1);
+}
+
+
+/*
+ * DefaultFormat -- in weak OO inheritance, top of hierarchy for everybody
+ */
+static void
+DefaultFormat(enum command cmd)
+{
+  int i;
+  
+  switch (cmd) {
+  case ITAB:
+    for (i=0; i<itabcnt; i++) putchar('\t');
+    break;
+  default:
+    /* nada */
+    break;
+  }
+}
+
+
+/*
+ * DefaultLine -- in weak OO inheritance, top of hierarchy for line-based formats
+ * for output format to "inherit", have "default: DefaultLine(cmd)" and override case statement "methods"
+ */
+
+static void
+DefaultLine(enum command cmd) {
+	switch (cmd) {
+	default:
+	  DefaultFormat(cmd);
+	}
+}
+
+
+/*
+ * DefaultPara -- top of hierarchy for output formats that are formatted by their viewers
+ */
+
+static void
+DefaultPara(enum command cmd)
+{
+	switch (cmd) {
+	default:
+	  DefaultFormat(cmd);
+	}
+}
+
+
+
+/*
+ * Tk -- just emit list of text-tags pairs
+ */
+
+static void
+Tk(enum command cmd)
+{
+	static int skip=0;	/* skip==1 when line has no text */
+	int i;
+
+	if (fSource) formattedonly();
+
+	/* invariant: always ready to insert text */
+
+	switch (cmd) {
+	   case BEGINDOC:
+		I=0; CurLine=1;
+		escchars = "\"[]$";
+		printf(/*$t insert end */ "\"");
+		break;
+	   case ENDDOC:
+		if (fHeadfoot) {
+/*	grr, should have +mark syntax for Tk text widget! -- maybe just just +sect#, +subsect#
+		printf("\\n\\n\" {} \"%s\\n\" {+headfoot h2}\n",HEADERANDFOOTER);
+*/
+			printf("\\n\\n\" {} \"%s\\n\" h2\n",HEADERANDFOOTER);
+			/*printf("$t mark set headfoot %d.0\n",CurLine);*/
+			CurLine++;
+
+			for (i=0; i<CRUFTS; i++) {
+				if (*cruft[i]) {
+					printf(/*$t insert end */"{%s} sc \\n\n",cruft[i]);
+					CurLine++;
+				}
+			}
+		} else printf("\"\n");
+		break;
+
+	   case COMMENTLINE: printf("# "); break;
+
+	   case BEGINLINE:
+		/*I=0; -- need to do this at end of line so set for filterline() */
+		/* nothing to do at start of line except catch up on newlines */
+		for (i=0; i<ncnt; i++) printf("\\n");
+		CurLine+=ncnt;
+		/*if (fSource) for (i=0; i<indent; i++) putchar('\t');*/
+		break;
+	   case ENDLINE:
+		/*if (!fSource) {*/
+		  if (!skip) /*if (ncnt)*/ printf("\\n"); /*else xputchar(' ');*/
+		  skip=0;
+		  CurLine++; I=0;
+		/*
+		} else {
+		  putchar(' '); I++;
+		}
+		*/
+		break;
+
+	   case ENDSECTHEAD:
+		printf("\\n\" h2 \"");
+		tagc=0;
+		skip=1;
+		break;
+	   case ENDSUBSECTHEAD:
+		printf("\\n\" h3 \"");	/* add h3? */
+		tagc=0;
+		skip=1;
+		break;
+	   case HR:			/*printf("\\n%s\\n", horizontalrule); CurLine+=2; I=0;*/ break;
+	   case BEGINTABLEENTRY:
+		/*if (fSource) putchar('\t');*/
+		break;
+	   case BEGINTABLELINE:
+	   case ENDTABLEENTRY:
+		break;
+	   case ENDTABLELINE:
+		printf("\" tt \"");
+		/*tagadd(MONO, 0, I);*/
+		break;
+
+	   case CHANGEBAR:		putchar('|'); I++; break;
+	   case CHARLQUOTE:
+	   case CHARRQUOTE:
+		putchar('\\'); putchar('"'); I++;
+		break;
+	   case CHARLSQUOTE:
+	   case CHARRSQUOTE:
+	   case CHARPERIOD:
+	   case CHARTAB:
+	   case CHARDASH:
+	   case CHARLT:
+	   case CHARGT:
+	   case CHARHAT:
+	   case CHARVBAR:
+	   case CHARAMP:
+	   case CHARPLUSMINUS:
+	   case CHARNBSP:
+ 	   case CHARCENT:
+ 	   case CHARSECT:
+ 	   case CHARCOPYR:
+ 	   case CHARNOT:
+ 	   case CHARREGTM:
+ 	   case CHARDEG:
+ 	   case CHARACUTE:
+ 	   case CHAR14:
+ 	   case CHAR12:
+ 	   case CHAR34:
+ 	   case CHARMUL:
+ 	   case CHARDIV:
+  		putchar(cmd); I++; break;
+ 	   case CHARDAGGER:
+ 		putchar('+'); I++; break;
+	   case CHARBACKSLASH:	printf("\\\\"); I++; break;
+	   case CHARBULLET:		printf("\" {} %c symbol \"",c_bullet); I++; break;
+
+
+	   case BEGINSECTHEAD:
+	   case BEGINSUBSECTHEAD:
+		/*if (fSource && sectheadid!=NAME) { printf("\\n\\n"); CurLine+=2; I=0; }*/
+		tagc=0;	/* section and subsection formatting controlled descriptively */
+		/* no break;*/
+
+	   case BEGINBOLD:
+	   case BEGINITALICS:
+	   case BEGINBOLDITALICS:
+	   case BEGINCODE:
+	   case BEGINY:
+	   case BEGINSC:
+	   case BEGINMANREF:
+		/* end text, begin attributed text */
+		printf("\" {} \"");
+		break;
+
+	   /* rely on the fact that no more than one tag per range of text */
+	   case ENDBOLD:		printf("\" b \""); break;
+	   case ENDITALICS:		printf("\" i \""); break;
+	   case ENDBOLDITALICS:	printf("\" bi \""); break;
+	   case ENDCODE:		printf("\" tt \""); break;
+	   case ENDY:			printf("\" symbol \""); break;
+	   case ENDSC:			printf("\" sc \""); break;
+	   case ENDMANREF:		printf("\" manref \""); break;
+		/* presentation attributes dealt with at end of line */
+
+	   case BEGINBODY:
+		/*if (fSource) { printf("\\n\\n"); CurLine+=2; I=0; }*/
+		break;
+	   case SHORTLINE:
+		/*if (fSource) { printf("\\n"); CurLine++; I=0; }*/
+		break;
+	   case ENDBODY:
+	   case BEGINBULPAIR: case ENDBULPAIR:
+		/*if (fSource) { printf("\\n"); CurLine++; I=0; }*/
+		break;
+	   case BEGINBULTXT:
+		/*if (fSource) putchar('\t');*/
+		break;
+	   case BEGINBULLET: case ENDBULLET:
+	   case ENDBULTXT:
+	   case BEGINSECTION: case ENDSECTION:
+	   case BEGINSUBSECTION: case ENDSUBSECTION:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case BEGINTABLE: case ENDTABLE:
+	   case FONTSIZE:
+	   case BEGININDENT: case ENDINDENT:
+		/* no action */
+		break;
+	   default:
+		DefaultLine(cmd);
+	}
+}
+
+
+/*
+ * TkMan -- Tk format wrapped with commands
+ */
+
+int linetabcnt[MAXLINES];	/* don't want to bother with realloc */
+int clocnt=0, clo[MAXLINES];
+int paracnt=0, para[MAXLINES];
+int rebuscnt=0, rebus[MAXLINES];
+int rebuspatcnt=0, rebuspatlen[25];
+char *rebuspat[25];
+
+static void
+TkMan(enum command cmd)
+{
+	static int lastscnt=-1;
+	static int lastlinelen=-1;
+	static int lastsect=0;
+	/*static int coalese=0;*/
+	static int finflow=0;
+	int i;
+	char c,*p;
+
+	/* invariant: always ready to insert text */
+
+	switch (cmd) {
+	   case BEGINDOC:
+		printf("$t insert end ");	/* opening quote supplied in Tk() below */
+		Tk(cmd);
+		break;
+	   case ENDDOC:
+		Tk(ENDLINE);
+
+		if (fHeadfoot) {
+/*	grr, should have +mark syntax for Tk text widget!
+		printf("\\n\\n\" {} \"%s\\n\" {+headfoot h2}\n", HEADERANDFOOTER);
+*/
+			printf("\\n\\n\" {} \"%s\\n\" h2\n", HEADERANDFOOTER);
+/*			printf("$t mark set headfoot end-2l\n");*/
+			CurLine++;
+
+			for (i=0; i<CRUFTS; i++) {
+				if (*cruft[i]) {
+					printf("$t insert end {%s} sc \\n\n",cruft[i]);
+					CurLine++;
+				}
+			}
+		} else printf("\"\n");
+
+/*
+		printf("$t insert 1.0 {");
+		for (i=0; i<MAXBUF; i++) if (tabgram[i]) printf("%d=%d, ", i, tabgram[i]);
+		printf("\\n\\n}\n");
+*/
+
+		printf("set manx(tabcnts) {"); for (i=1; i<CurLine; i++) printf("%d ", linetabcnt[i]); printf("}\n");
+		printf("set manx(clo) {"); for (i=0; i<clocnt; i++) printf("%d ", clo[i]); printf("}\n");
+		printf("set manx(para) {"); for (i=0; i<paracnt; i++) printf("%d ", para[i]); printf("}\n");
+		printf("set manx(reb) {"); for (i=0; i<rebuscnt; i++) printf("%d ", rebus[i]); printf("}\n");
+
+		break;
+
+	   case BEGINCOMMENT: fcharout=0; break;
+	   case ENDCOMMENT: fcharout=1; break;
+	   case COMMENTLINE: break;
+
+	   case ENDSECTHEAD:
+	   case ENDSUBSECTHEAD:
+		lastsect=1;
+		Tk(cmd);
+		break;
+
+	   case BEGINLINE:
+	     Tk(cmd);
+		linetabcnt[CurLine] = itabcnt;
+		/* old pattern for command line options "^\\|*\[ \t\]+-\[^-\].*\[^ \t\]" */
+		c = plain[0];
+		if (linelen>=2 && ((c=='-' || c=='%' || c=='\\' || c=='$' /**/ /* not much talk of money in man pages so reasonable */) && (isalnum(plain[1]) /*<= plain[1]!='-'*//*no dash*/ || ncnt/*GNU long option*/) && plain[1]!=' ') ) clo[clocnt++] = CurLine;
+		/*
+		   would like to require second letter to be a capital letter to cut down on number of matches,
+		   but command names usually start with lowercase letter
+		   maybe use a uppercase requirement as secondary strategy, but probably not
+		*/
+		if ((ncnt || lastsect) && linelen>0 && scnt>0 && scnt<=5) para[paracnt++] = CurLine;
+		lastsect=0;
+
+
+		/* rebus too, instead of search through whole Tk widget */
+		if (rebuspatcnt && scnt>=5 /* not sect or subsect heads */) {
+			for (p=plain; *p && *p!=' '; p++) /*empty*/;	/* never first word */
+			while (*p) {
+				for (i=0; i<rebuspatcnt; i++) {
+					if (tolower(*p) == tolower(*rebuspat[i]) && strincmp(p, rebuspat[i], rebuspatlen[i])==0) {
+						/* don't interfere with man page refs */
+						for (; *p && !isspace(*p); p++) if (*p=='(') continue;
+						rebus[rebuscnt++] = CurLine;
+						p="";	/* break for outer */
+						break;	/* just locating any line with any rebus, not exact positions */
+					}
+				}
+				/* just check start of words, though doesn't have to be full word (if did, could use strlen rather than strnlen) */
+				while (*p && *p!=' ') p++;
+				while (*p && *p==' ') p++;
+			}
+		}
+
+
+		if (fReflow && !ncnt && (finflow || lastlinelen>50) && (abs(scnt-lastscnt)<=1 || abs(scnt-hanging)<=1)) {
+		  finflow=1;
+		  putchar(' ');
+		} else {
+		  Tk(ENDLINE);
+		  /*if ((CurLine&0x3f)==0x3f) printf("\"\nupdate idletasks\n$t insert end \""); blows up some Tk text buffer, apparently, on long lines*/
+		  if ((CurLine&0x1f)==0x1f) printf("\"\nupdate idletasks\n$t insert end \"");
+		  finflow=0;
+
+		  /*if (fCodeline) printf("CODE");*/
+		}
+		lastlinelen=linelen; lastscnt=scnt;
+		break;
+
+	   case ENDLINE:
+		/* don't call Tk(ENDLINE) */
+		break;
+
+	   default:	/* if not caught above, it's the same as Tk */
+		Tk(cmd);
+	}
+}
+
+
+
+
+/*
+ * ASCII
+ */
+
+static void
+ASCII(enum command cmd)
+{
+	int i;
+
+	switch (cmd) {
+	   case ENDDOC:
+		if (fHeadfoot)	{
+			printf("\n%s\n", HEADERANDFOOTER);
+			for (i=0; i<CRUFTS; i++) if (*cruft[i]) printf("%s\n",cruft[i]);
+		}
+		break;
+	   case CHARRQUOTE:
+	   case CHARLQUOTE:
+		putchar('"');
+		break;
+	   case CHARLSQUOTE:
+		putchar('`');
+		break;
+	   case CHARRSQUOTE:
+	   case CHARACUTE:
+		putchar('\'');
+		break;
+	   case CHARPERIOD:
+	   case CHARTAB:
+	   case CHARDASH:
+	   case CHARLT:
+	   case CHARAMP:
+	   case CHARBACKSLASH:
+	   case CHARGT:
+	   case CHARHAT:
+	   case CHARVBAR:
+	   case CHARNBSP:
+		putchar(cmd); break;
+	   case CHARDAGGER:	putchar('+'); break;
+	   case CHARBULLET:	putchar('*'); break;
+	   case CHARPLUSMINUS: printf("+-"); break;
+	   case CHANGEBAR:	putchar('|'); break;
+ 	   case CHARCENT:	putchar('c'); break;
+ 	   case CHARSECT:	putchar('S'); break;
+ 	   case CHARCOPYR:	printf("(C)"); break;
+ 	   case CHARNOT:	putchar('~'); break;
+ 	   case CHARREGTM:	printf("(R)"); break;
+ 	   case CHARDEG:	putchar('o'); break;
+ 	   case CHAR14:		printf("1/4"); break;
+ 	   case CHAR12:		printf("1/2"); break;
+ 	   case CHAR34:		printf("3/4"); break;
+ 	   case CHARMUL:	putchar('X'); break;
+ 	   case CHARDIV:	putchar('/'); break;
+	   case HR:		printf("\n%s\n", horizontalrule); break;
+
+	   case BEGINLINE:
+		for (i=0; i<ncnt; i++) putchar('\n');
+		break;
+	   case BEGINBODY:
+	   case SHORTLINE:
+		if (!fSource) break;
+	   case ENDLINE:
+		putchar('\n');
+		CurLine++;
+		break;
+
+	   case BEGINDOC:
+	   case ENDBODY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case BEGINSECTION: case ENDSECTION:
+	   case BEGINSECTHEAD: case ENDSECTHEAD:
+	   case BEGINSUBSECTHEAD: case ENDSUBSECTHEAD:
+	   case BEGINBULPAIR: case ENDBULPAIR:
+	   case BEGINBULLET: case ENDBULLET:
+	   case BEGINBULTXT: case ENDBULTXT:
+	   case BEGINSUBSECTION: case ENDSUBSECTION:
+
+	   case BEGINTABLE: case ENDTABLE:
+	   case BEGINTABLELINE: case ENDTABLELINE: case BEGINTABLEENTRY: case ENDTABLEENTRY:
+	   case BEGININDENT: case ENDINDENT:
+	   case FONTSIZE:
+	   case BEGINBOLD: case ENDBOLD:
+	   case BEGINCODE: case ENDCODE:
+	   case BEGINITALICS: case ENDITALICS:
+	   case BEGINMANREF: case ENDMANREF:
+	   case BEGINBOLDITALICS: case ENDBOLDITALICS:
+	   case BEGINY: case ENDY:
+	   case BEGINSC: case ENDSC:
+		/* nothing */
+		break;
+	   default:
+		DefaultLine(cmd);
+	}
+}
+
+
+
+/*
+ * Perl 5 pod ("plain old documentation")
+ */
+
+static void
+pod(enum command cmd)
+{
+	static int curindent=0;
+	int i;
+
+	if (hanging==-1) {
+		if (curindent) hanging=curindent; else hanging=5;
+	}
+
+
+	if (cmd==BEGINBULPAIR) {
+		/* want to have multiply indented text */
+		if (curindent && hanging!=curindent) printf("\n=back\n\n");
+		if (hanging!=curindent) printf("\n=over %d\n\n",hanging);
+		curindent=hanging;
+	} else if (cmd==ENDBULPAIR) {
+		/* nothing--wait until next command */
+	} else if (cmd==BEGINLINE && !scnt) {
+		if (curindent) printf("\n=back\n\n");
+		curindent=0;
+	} else if (cmd==BEGINBODY) {
+		if (curindent) {
+			printf("\n=back\n\n");
+			curindent=0;
+			auxindent=0;
+		}
+	}
+/*
+	   case BEGINBULPAIR:
+		printf("=over %d\n\n", hanging);
+		break;
+	   case ENDBULPAIR:
+		printf("\n=back\n\n");
+		break;
+*/
+	switch (cmd) {
+	   case BEGINDOC: I=0; break;
+
+	   case BEGINCOMMENT: fcharout=0; break;
+	   case ENDCOMMENT: fcharout=1; break;
+	   case COMMENTLINE: break;
+
+	   case CHARRQUOTE:
+	   case CHARLQUOTE:
+		putchar('"');
+		break;
+	   case CHARLSQUOTE:
+		putchar('`');
+		break;
+	   case CHARRSQUOTE:
+	   case CHARACUTE:
+		putchar('\'');
+		break;
+	   case CHARPERIOD:
+	   case CHARTAB:
+	   case CHARDASH:
+	   case CHARLT:
+	   case CHARAMP:
+	   case CHARBACKSLASH:
+	   case CHARGT:
+	   case CHARHAT:
+	   case CHARVBAR:
+	   case CHARNBSP:
+		putchar(cmd); break;
+	   case CHARDAGGER:	putchar('+'); break;
+	   case CHARPLUSMINUS: printf("+-"); break;
+	   case CHANGEBAR:	putchar('|'); break;
+ 	   case CHARCENT:	putchar('c'); break;
+ 	   case CHARSECT:	putchar('S'); break;
+ 	   case CHARCOPYR:	printf("(C)"); break;
+ 	   case CHARNOT:	putchar('~'); break;
+	   case CHARREGTM:	printf("(R)"); break;
+ 	   case CHARDEG:	putchar('o'); break;
+ 	   case CHAR14:	printf("1/4"); break;
+ 	   case CHAR12:	printf("1/2"); break;
+ 	   case CHAR34:	printf("3/4"); break;
+ 	   case CHARMUL:	putchar('X'); break;
+ 	   case CHARDIV:	putchar('/'); break;
+	   case HR:		printf("\n%s\n", horizontalrule); break;
+	   case CHARBULLET:	putchar('*'); break;
+
+	   case BEGINLINE:
+		for (i=0; i<ncnt; i++) putchar('\n');
+		CurLine+=ncnt;
+		break;
+	   case ENDLINE:
+		putchar('\n');
+		CurLine++;
+		I=0;
+		break;
+
+	   case BEGINSECTHEAD:	printf("=head1 "); break;
+	   case BEGINSUBSECTHEAD:	printf("=head2 "); break;
+
+	   case ENDSECTHEAD:
+	   case ENDSUBSECTHEAD:
+		printf("\n");
+		break;
+
+	   case BEGINCODE:
+	   case BEGINBOLD:		printf("B<"); break;
+	   case BEGINITALICS:	printf("I<"); break;
+	   case BEGINMANREF:	printf("L<"); break;
+
+	   case ENDBOLD:
+	   case ENDCODE:
+	   case ENDITALICS:
+	   case ENDMANREF:
+		printf(">");
+		break;
+
+	   case BEGINBULLET:
+		printf("\n=item ");
+		break;
+	   case ENDBULLET:
+		printf("\n\n");
+		fcharout=0;
+		break;
+	   case BEGINBULTXT:
+		fcharout=1;
+		auxindent=hanging;
+		break;
+	   case ENDBULTXT:
+		auxindent=0;
+		break;
+
+
+	   case ENDDOC:
+	   case BEGINBODY: case ENDBODY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case BEGINSECTION: case ENDSECTION:
+	   case BEGINSUBSECTION: case ENDSUBSECTION:
+	   case BEGINBULPAIR: case ENDBULPAIR:
+
+	   case SHORTLINE:
+	   case BEGINTABLE: case ENDTABLE:
+	   case BEGINTABLELINE: case ENDTABLELINE: case BEGINTABLEENTRY: case ENDTABLEENTRY:
+	   case BEGININDENT: case ENDINDENT:
+	   case FONTSIZE:
+	   case BEGINBOLDITALICS: case ENDBOLDITALICS:
+	   case BEGINY: case ENDY:
+	   case BEGINSC: case ENDSC:
+		/* nothing */
+		break;
+	   default:
+		DefaultLine(cmd);
+	}
+}
+
+
+
+static void
+Sections(enum command cmd)
+{
+
+	switch (cmd) {
+	   case ENDSECTHEAD:
+	   case ENDSUBSECTHEAD:
+		putchar('\n');
+	   case BEGINDOC:
+		fcharout=0;
+		break;
+
+	   case BEGINCOMMENT: fcharout=0; break;
+	   case ENDCOMMENT: fcharout=1; break;
+	   case COMMENTLINE: break;
+
+	   case BEGINSUBSECTHEAD:
+		printf("  ");
+		/* no break */
+	   case BEGINSECTHEAD:
+		fcharout=1;
+		break;
+	   case CHARRQUOTE:
+	   case CHARLQUOTE:
+		xputchar('"');
+		break;
+	   case CHARLSQUOTE:
+		xputchar('`');
+		break;
+	   case CHARRSQUOTE:
+	   case CHARACUTE:
+		xputchar('\'');
+		break;
+	   case BEGINTABLE: case ENDTABLE:
+	   case BEGINTABLELINE: case ENDTABLELINE: case BEGINTABLEENTRY: case ENDTABLEENTRY:
+	   case BEGININDENT: case ENDINDENT:
+	   case FONTSIZE:
+		break;
+	   case CHARPERIOD:
+	   case CHARTAB:
+	   case CHARDASH:
+	   case CHARBACKSLASH:
+	   case CHARLT:
+	   case CHARGT:
+	   case CHARHAT:
+	   case CHARVBAR:
+	   case CHARAMP:
+	   case CHARNBSP:
+		xputchar(cmd); break;
+	   case CHARDAGGER:	xputchar('+'); break;
+	   case CHARBULLET:	xputchar('*'); break;
+	   case CHARPLUSMINUS: xputchar('+'); xputchar('-'); break;
+ 	   case CHARCENT:	xputchar('c'); break;
+ 	   case CHARSECT:	xputchar('S'); break;
+	   case CHARCOPYR:	xputchar('('); xputchar('C'); xputchar(')'); break;
+ 	   case CHARNOT:	xputchar('~'); break;
+ 	   case CHARREGTM:	xputchar('('); xputchar('R'); xputchar(')'); break;
+ 	   case CHARDEG:	xputchar('o'); break;
+ 	   case CHAR14:	xputchar('1'); xputchar('/'); xputchar('4'); break;
+ 	   case CHAR12:	xputchar('1'); xputchar('/'); xputchar('2'); break;
+ 	   case CHAR34:	xputchar('3'); xputchar('/'); xputchar('4'); break;
+ 	   case CHARMUL:	xputchar('X'); break;
+ 	   case CHARDIV:	xputchar('/'); break;
+	   case ITAB:		DefaultLine(cmd); break;
+
+
+	   default:
+		/* nothing */
+		break;
+	}
+}
+
+
+
+static void
+Roff(enum command cmd)
+{
+	switch (cmd) {
+	   case BEGINDOC:
+		I=1;
+		printf(".TH %s %s \"generated by PolyglotMan\" UCB\n",manName,manSect);
+		printf(".\\\"  %s,\n",provenance);
+		printf(".\\\"  %s\n",anonftp);
+		CurLine=1;
+		break;
+	   case BEGINBODY:		printf(".LP\n"); break;
+
+	   case BEGINCOMMENT: 
+	   case ENDCOMMENT:
+		break;
+	   case COMMENTLINE: printf("'\\\" "); break;
+
+	   case BEGINSECTHEAD:	printf(".SH "); break;
+	   case BEGINSUBSECTHEAD:printf(".SS "); break;
+	   case BEGINBULPAIR:	printf(".IP "); break;
+	   case SHORTLINE:		printf("\n.br"); break;
+	   case BEGINBOLD:		printf("\\fB"); break;	/* \n.B -- grr! */
+	   case ENDCODE:
+	   case ENDBOLD:		printf("\\fR"); break;	/* putchar('\n'); */
+	   case BEGINITALICS:	printf("\\fI"); break;
+	   case ENDITALICS:		printf("\\fR"); break;
+	   case BEGINCODE:
+	   case BEGINBOLDITALICS:printf("\\f4"); break;
+	   case ENDBOLDITALICS:	printf("\\fR"); break;
+
+	   case CHARLQUOTE:		printf("\\*(rq"); break;
+	   case CHARRQUOTE:		printf("\\*(lq"); break;
+	   case CHARNBSP:		printf("\\|"); break;
+	   case CHARLSQUOTE:	putchar('`');	break;
+	   case CHARRSQUOTE:	putchar('\'');	break;
+	   case CHARPERIOD:		if (I==1) printf("\\&"); putchar('.'); I++; break;
+	   case CHARDASH:		printf("\\-"); break;
+	   case CHARTAB:
+	   case CHARLT:
+	   case CHARGT:
+	   case CHARHAT:
+	   case CHARVBAR:
+	   case CHARAMP:
+		putchar(cmd); break;
+	   case CHARBULLET:		printf("\\(bu"); break;
+	   case CHARDAGGER:		printf("\\(dg"); break;
+	   case CHARPLUSMINUS:	printf("\\(+-"); break;
+	   case CHANGEBAR:		putchar('|'); break;
+ 	   case CHARCENT:		printf("\\(ct"); break;
+ 	   case CHARSECT:		printf("\\(sc"); break;
+ 	   case CHARCOPYR:		printf("\\(co"); break;
+ 	   case CHARNOT:		printf("\\(no"); break;
+ 	   case CHARREGTM:		printf("\\(rg"); break;
+ 	   case CHARDEG:		printf("\\(de"); break;
+ 	   case CHARACUTE:		printf("\\(aa"); break;
+ 	   case CHAR14:		printf("\\(14"); break;
+ 	   case CHAR12:		printf("\\(12"); break;
+ 	   case CHAR34:		printf("\\(34"); break;
+ 	   case CHARMUL:		printf("\\(mu"); break;
+ 	   case CHARDIV:		printf("\\(di"); break;
+	   case HR:			/*printf("\n%s\n", horizontalrule);*/ break;
+	   case CHARBACKSLASH:	printf("\\\\"); break;  /* correct? */
+
+	   case BEGINLINE:
+		/*for (i=0; i<ncnt; i++) putchar('\n');*/
+		break;
+
+	   case BEGINBULLET:	putchar('"'); break;
+	   case ENDBULLET:		printf("\"\n"); break;
+
+	   case ENDLINE:
+		CurLine++;
+		I=1;
+		/* no break */
+	   case ENDSUBSECTHEAD:
+	   case ENDSECTHEAD:
+	   case ENDDOC:
+		putchar('\n');
+		break;
+
+	   case BEGINCODEBLOCK:	printf(".nf\n");
+	   case ENDCODEBLOCK:	printf(".fi\n");
+
+	   case ENDBODY:
+	   case ENDBULPAIR:
+	   case BEGINBULTXT: case ENDBULTXT:
+	   case BEGINSECTION: case ENDSECTION:
+	   case BEGINSUBSECTION: case ENDSUBSECTION:
+	   case BEGINY: case ENDY:
+	   case BEGINSC: case ENDSC:
+	   case BEGINTABLE: case ENDTABLE:
+	   case BEGINTABLELINE: case ENDTABLELINE: case BEGINTABLEENTRY: case ENDTABLEENTRY:
+	   case BEGININDENT: case ENDINDENT:
+	   case FONTSIZE:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case BEGINMANREF: case ENDMANREF:
+		/* nothing */
+		break;
+	   default:
+		DefaultPara(cmd);
+	}
+}
+
+
+/* can't test Ensemble, probably not used, so why take up space? */
+#if 0
+
+/*
+ * Ensemble
+ */
+
+static void
+EnsembleDumpTags(void)
+{
+	int i,tag;
+	int fI=0, fB=0;
+
+	if (!tagc) return;
+
+	/* { */
+	printf("}{}{");		/* } header */
+
+	/* italics */
+	for (i=0; i<tagc; i++) {
+		tag = tags[i].type;
+		if (tag==ITALICS||tag==BOLDITALICS) {
+			if (!fI) {printf("ITALIC=("); fI=1;}
+			printf("(%d,%d,[T])", tags[i].first, tags[i].last);
+		}
+	}
+	if (fI) printf(")");
+
+	/* bold */
+	for (i=0; i<tagc; i++) {
+		tag = tags[i].type;
+		if (tag==BOLD||tag==BOLDITALICS) {
+			if (!fB) {printf(",BOLD=("); fB=1;}
+			printf("(%d,%d,[T])", tags[i].first, tags[i].last);
+		}
+	}
+	if (fB) printf(")");
+
+	/* man ref? */
+/*
+	for (i=0; i<tagc; i++) {
+		tag = tags[i].type;
+		if (tag==MANREF) {
+			if (!fH) {printf(",HYPER=("); fH=1;}
+			printf("(%d,%d,[???])", tags[i].first, tags[i].last);
+		}
+	}
+	if (fH) printf(")");
+*/
+
+	/* { */
+	/* don't put  printf("}");  here as trailer -- controlling function expects to close it */
+
+	tagc=0;
+}
+
+static void
+Ensemble(enum command cmd)
+{
+
+	switch (cmd) {
+	   case BEGINDOC:
+		I=0;
+		printf("DOCUMENT MANPAGE\n<MANPAGE>\n");
+		escchars = "{}\\";
+		break;
+	   case ENDDOC:	printf("</MANPAGE>\n"); break;
+
+	   case BEGINCOMMENT: printf("\n<!--\n"); break;
+	   case ENDCOMMENT: printf("\n-->\n"); break;
+	   case COMMENTLINE: break;
+
+	   case BEGINBODY:
+		printf("<SUBSECTIONBODY><BODY>{");
+		break;
+	   case ENDBODY:
+		CurLine++;
+		EnsembleDumpTags(); printf("}</BODY></SUBSECTIONBODY>\n");
+		tagc=0;
+		break;
+	   case BEGINSECTION:		printf("<SECTION>"); break;
+	   case ENDSECTION:			printf("</SECTION>\n"); break;
+	   case BEGINSECTHEAD:		printf("<SECTHEAD>{"); break;
+	   case ENDSECTHEAD:		tagc=0; I=0; printf("}</SECTHEAD>\n"); break;
+	   case BEGINSUBSECTHEAD:	printf("<SUBSECTHEAD>{"); break;
+	   case ENDSUBSECTHEAD:		tagc=0; I=0; printf("}</SUBSECTHEAD>\n"); break;
+	   case BEGINBULPAIR:
+		printf("<SUBSECTIONBODY><LISTELEMENT>");
+		break;
+	   case ENDBULPAIR:
+		printf("</LISTELEMENT></SUBSECTIONBODY>\n");
+		break;
+	   case BEGINBULLET:		printf("<BULLET>{"); break;
+	   case ENDBULLET:			tagc=0; I=0; printf("}</BULLET>"); break;
+	   case BEGINBULTXT:		printf("<BULLETTEXT>{"); break;
+	   case ENDBULTXT:
+		EnsembleDumpTags();
+		CurLine++;
+		printf("}</BULLETTEXT>");
+		break;
+	   case BEGINSUBSECTION:	printf("<SUBSECTIONBODY><SUBSECTION>\n"); break;
+	   case ENDSUBSECTION:	printf("</SUBSECTION></SUBSECTIONBODY>\n"); break;
+	   case SHORTLINE:		/*poppush(prevcmd);*/ break;
+
+
+	   case CHARRQUOTE:
+	   case CHARLQUOTE:
+		putchar('"'); I++;
+		break;
+	   case CHARLSQUOTE:
+		putchar('\'');
+		break;
+	   case CHARRSQUOTE:
+		putchar('\'');
+		break;
+	   case CHARPERIOD:
+	   case CHARTAB:
+	   case CHARDASH:
+	   case CHARBACKSLASH:
+	   case CHARLT:
+	   case CHARGT:
+	   case CHARHAT:
+	   case CHARVBAR:
+	   case CHARAMP:
+	   case CHARBULLET:
+	   case CHARDAGGER:
+	   case CHARPLUSMINUS:
+	   case CHARNBSP:
+ 	   case CHARCENT:
+ 	   case CHARSECT:
+ 	   case CHARCOPYR:
+ 	   case CHARNOT:
+ 	   case CHARREGTM:
+ 	   case CHARDEG:
+ 	   case CHARACUTE:
+ 	   case CHAR14:
+ 	   case CHAR12:
+ 	   case CHAR34:
+ 	   case CHARMUL:
+ 	   case CHARDIV:
+		putchar(cmd); I++; break;
+
+	   case ENDLINE:		putchar(' '); I++; break;
+	   case HR:			/*printf("\n%s\n", horizontalrule);*/ break;
+	   case CHANGEBAR:
+		/* maybe something later */
+	   case BEGINLINE: 
+	   case BEGINY: case ENDY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case BEGINBOLD: case ENDBOLD:
+	   case BEGINCODE: case ENDCODE:
+	   case BEGINITALICS: case ENDITALICS:
+	   case BEGINBOLDITALICS: case ENDBOLDITALICS:
+	   case BEGINSC: case ENDSC:
+	   case BEGINTABLE: case ENDTABLE:
+	   case BEGINTABLELINE: case ENDTABLELINE: case BEGINTABLEENTRY: case ENDTABLEENTRY:
+	   case BEGININDENT: case ENDINDENT:
+	   case FONTSIZE:
+
+	   case BEGINMANREF:
+	   case ENDMANREF:
+		/* easy strike for hypertext--want to dynamically generate, though */
+		/* nothing */
+		break;
+	   default:
+		DefaultPara(cmd);
+	}
+}
+#endif
+
+
+
+/*
+ * HTML
+ */
+
+static void
+HTML(enum command cmd)
+{
+	static int pre=0;
+	int i;
+	int lasttoc;
+
+	/* always respond to these signals */
+	switch (cmd) {
+	   case CHARNBSP:		printf("&nbsp;"); I++; break;
+	   case CHARTAB:		printf("<tt>&#32;</tt>&nbsp;<tt>&#32;</tt>&nbsp;");		break;
+	  /* old browsers--who uses these?--don't understand symbolic codes */
+	  /*
+ 	   case CHARNBSP:		printf("&#160;"); I++; break;
+ 	   case CHARLQUOTE:		printf("&#171;"); break;
+ 	   case CHARRQUOTE:		printf("&#187;"); break;
+ 	   case CHARTAB:		printf("<tt> </tt>&#160;<tt> </tt>&#160;"); break;
+		*/
+	   case CHARLQUOTE:
+	   case CHARRQUOTE:
+	   case CHARLSQUOTE:
+	   case CHARRSQUOTE:
+	   case CHARPERIOD:
+	   case CHARDASH:
+	   case CHARBACKSLASH:
+	   case CHARVBAR:		/*printf("&brvbar;"); -- broken bar no good */
+	   case CHARHAT:
+		putchar(cmd); break;
+	   case CHARDAGGER:		printf("*"); break;
+	   case CHARBULLET:		printf("&#183;"/*"&middot;"*//*&sect;--middot hardly visible*/); break;
+	   case CHARPLUSMINUS:	printf("&#177;"/*"&plusmn;"*/); break;
+	   case CHARGT:		printf("&gt;"); break;
+	   case CHARLT:		printf("&lt;"); break;
+	   case CHARAMP:		printf("&amp;"); break;
+	   case CHARCENT:		printf("&#162;"); break;	/* translate these to symbolic forms, sometime */
+ 	   case CHARSECT:		printf("&#167;"); break;
+ 	   case CHARCOPYR:		printf("&#169;"); break;
+ 	   case CHARNOT:		printf("&#172;"); break;
+ 	   case CHARREGTM:		printf("&#174;"); break;
+ 	   case CHARDEG:		printf("&#176;"); break;
+ 	   case CHARACUTE:		printf("&#180;"); break;
+ 	   case CHAR14:		printf("&#188;"); break;
+ 	   case CHAR12:		printf("&#189;"); break;
+ 	   case CHAR34:		printf("&#190;"); break;
+ 	   case CHARMUL:		printf("&#215;"); break;
+ 	   case CHARDIV:		printf("&#247;"); break;
+	   default:
+		break;
+	}
+
+	/* while in pre mode... */
+	if (pre) {
+		switch (cmd) {
+		   case ENDLINE:	I=0; CurLine++; if (!fPara && scnt) printf("<BR>"); printf("\n"); break;
+		   case ENDTABLE:
+			if (fSource) {
+			  printf("</TABLE>\n");
+			} else {
+			  printf("</PRE><BR>\n"); pre=0; fQS=fIQS=fPara=1;
+			}
+			break;
+		   case ENDCODEBLOCK: printf("</PRE>"); pre=0; break;
+		   case SHORTLINE:
+		   case ENDBODY:
+			printf("\n");
+			break;
+	   	   case BEGINBOLD:		printf("<B>"); break;
+	   	   case ENDBOLD:		printf("</B>"); break;
+	   	   case BEGINITALICS:	printf("<I>"); break;
+	   	   case ENDITALICS:		printf("</I>"); break;
+		   default:
+			/* nothing */
+			break;
+		}
+		return;
+	}
+
+	/* usual operation */
+	switch (cmd) {
+	   case BEGINDOC:
+		/* escchars = ...  => HTML doesn't backslash-quote metacharacters */
+		printf("<!-- %s, -->\n",provenance);
+		printf("<!-- %s -->\n\n",anonftp);
+		printf("<HTML>\n<HEAD>\n");
+/*		printf("<ISINDEX>\n");*/
+		/* better title possible? */
+		printf("<TITLE>"); printf(manTitle, manName, manSect); printf("</TITLE>\n");
+#ifdef XFree86
+		printf("</HEAD>\n<BODY BGCOLOR=\"#efefef\" TEXT=\"black\" "
+			"LINK=\"blue\" VLINK=\"#551A8B\" ALINK=\"red\">\n");
+#else
+		printf("</HEAD>\n<BODY bgcolor=white>\n");
+#endif
+		printf("<A HREF=\"#toc\">%s</A><P>\n", TABLEOFCONTENTS);
+		I=0;
+		break;
+	   case ENDDOC:
+		/* header and footer wanted? */
+		printf("<P>\n");
+		if (fHeadfoot) {
+			printf("<HR><H2>%s</H2>\n", HEADERANDFOOTER);
+			for (i=0; i<CRUFTS; i++) if (*cruft[i]) printf("%s<BR>\n",cruft[i]);
+		}
+
+		if (!tocc) {
+			/*printf("\n<H1>ERROR: Empty man page</H1>\n");*/
+		} else {
+			printf("\n<HR><P>\n");
+			printf("<A NAME=\"toc\"><B>%s</B></A><P>\n", TABLEOFCONTENTS);
+			printf("<UL>\n");
+			for (i=0, lasttoc=BEGINSECTION; i<tocc; lasttoc=toc[i].type, i++) {
+				if (lasttoc!=toc[i].type) {
+					if (toc[i].type==BEGINSUBSECTION) printf("<UL>\n");
+					else printf("</UL>\n");
+				}
+				printf("<LI><A NAME=\"toc%d\" HREF=\"#sect%d\">%s</A></LI>\n", i, i, toc[i].text);
+			}
+			if (lasttoc==BEGINSUBSECTION) printf("</UL>");
+			printf("</UL>\n");
+		}
+		printf("</BODY></HTML>\n");
+		break;
+	   case BEGINBODY:
+		printf("<P>\n");
+		break;
+	   case ENDBODY:		break;
+
+	   case BEGINCOMMENT: printf("\n<!--\n"); break;
+	   case ENDCOMMENT: printf("\n-->\n"); break;
+	   case COMMENTLINE: break;
+
+	   case BEGINSECTHEAD:
+		printf("\n<H2><A NAME=\"sect%d\" HREF=\"#toc%d\">", tocc, tocc);
+		break;
+	   case ENDSECTHEAD:
+		printf("</A></H2>\n");
+		/* useful extraction from FILES, ENVIRONMENT? */
+		break;
+	   case BEGINSUBSECTHEAD:
+		printf("\n<H3><A NAME=\"sect%d\" HREF=\"#toc%d\">", tocc, tocc);
+		break;
+	   case ENDSUBSECTHEAD:
+		printf("</A></H3>\n");
+		break;
+	   case BEGINSECTION:	break;
+	   case ENDSECTION:
+		if (sectheadid==NAME && message!=NULL) printf(message);
+		break;
+	   case BEGINSUBSECTION:	break;
+	   case ENDSUBSECTION:	break;
+
+	   case BEGINBULPAIR:
+		if (listtype==OL) printf("\n<OL>\n");
+		else if (listtype==UL) printf("\n<UL>\n");
+		else printf("\n<DL>\n");
+		break;
+	   case ENDBULPAIR:
+		if (listtype==OL) printf("\n</OL>\n");
+		else if (listtype==UL) printf("\n</UL>\n");
+		else printf("</DL>\n");
+		break;
+	   case BEGINBULLET:
+		if (listtype==OL || listtype==UL) fcharout=0;
+		else printf("\n<DT>");
+		break;
+	   case ENDBULLET:
+		if (listtype==OL || listtype==UL) fcharout=1;
+		else printf("</DT>");
+		break;
+	   case BEGINBULTXT:
+		if (listtype==OL || listtype==UL) printf("<LI>");
+		else printf("\n<DD>");
+		break;
+	   case ENDBULTXT:
+		if (listtype==OL || listtype==UL) printf("</LI>");
+		else printf("</DD>\n");
+		break;
+
+	   case BEGINLINE:
+		/*		if (ncnt) printf("<P>\n"); -- if haven't already generated structural tag */
+		if (ncnt) printf("<P>\n");
+
+		/* trailing spaces already trimmed off, so look for eol now */
+		if (fCodeline) {
+		  printf("<CODE>");
+		  for (i=0; i<scnt-indent; i++) printf("&nbsp;"/*&#160;*/);		/* ? */
+		  tagc=0;
+
+		  /* already have .tag=BOLDITALICS, .first=0 */
+		  /* would be more elegant, but can't print initial spaces before first tag
+		  tags[0].last = linelen;
+		  tagc=1;
+		  fIQS=0;
+		  */
+		}
+
+		break;
+
+	   case ENDLINE:
+		/*if (fCodeline) { fIQS=1; fCodeline=0; }*/
+		if (fCodeline) { printf("</CODE><BR>"); fCodeline=0; }
+		I=0; CurLine++; if (!fPara && scnt) printf("<BR>"); printf("\n");
+		break;
+
+	   case SHORTLINE:
+		if (fCodeline) { printf("</CODE>"); fCodeline=0; }
+		if (!fIP) printf("<BR>\n");
+		break;
+
+
+	   case BEGINTABLE:
+		if (fSource) {
+		  /*printf("<CENTER><TABLE BORDER>\n");*/
+		  printf("<TABLE BORDER=0>\n");
+		} else {
+		  printf("<BR><PRE>\n"); pre=1; fQS=fIQS=fPara=0;
+		}
+		break;
+	   case ENDTABLE:
+		if (fSource) {
+		  printf("</TABLE>\n");
+		} else {
+		  printf("</PRE><BR>\n"); pre=0; fQS=fIQS=fPara=1;
+		}
+		break;
+	   case BEGINTABLELINE:		printf("<TR>"); break;
+	   case ENDTABLELINE:		printf("</TR>\n"); break;
+	   case BEGINTABLEENTRY:
+		printf("<TD ALIGN=");
+		switch (tblcellformat[0]) {
+		case 'c':	printf("CENTER"); break;
+		case 'n':	/*printf("DECIMAL"); break;  -- fall through to right for now */
+		case 'r':	printf("RIGHT"); break;
+		case 'l':
+		default:
+		  printf("LEFT");
+		}
+		if (tblcellspan>1) printf(" COLSPAN=%d", tblcellspan);
+		printf(">");
+		break;
+	   case ENDTABLEENTRY:
+		printf("</TD>");
+		break;
+
+	   /* something better with CSS */
+	   case BEGININDENT:		printf("<blockquote>"); break;
+	   case ENDINDENT:			printf("</blockquote>\n"); break;
+
+	   case FONTSIZE:
+		/* HTML font step sizes are bigger than troff's */
+		if ((fontdelta+=intArg)!=0) printf("<FONT SIZE=%c1>", (intArg>0)?'+':'-'); else printf("</FONT>\n");
+		break;
+
+	   case BEGINBOLD:		printf("<B>"); break;
+	   case ENDBOLD:		printf("</B>"); break;
+	   case BEGINITALICS:	printf("<I>"); break;
+	   case ENDITALICS:		printf("</I>"); break;
+	   case BEGINBOLDITALICS:
+	   case BEGINCODE:		printf("<CODE>"); break;
+	   case ENDBOLDITALICS:
+	   case ENDCODE:		printf("</CODE>"); break;
+	   case BEGINCODEBLOCK:	printf("<PRE>"); pre=1; break;	/* wrong for two-column lists in kermit.1, pine.1, perl4.1 */
+	   case ENDCODEBLOCK:	printf("</PRE>"); pre=0; break;
+	   case BEGINCENTER:		printf("<CENTER>"); break;
+	   case ENDCENTER:		printf("</CENTER>"); break;
+	   case BEGINMANREF:
+		manrefextract(hitxt);
+		if (fmanRef) { printf("<A HREF=\""); printf(href, manrefname, manrefsect); printf("\">"); }
+		else printf("<I>");
+		break;
+	   case ENDMANREF:
+		if (fmanRef) printf("</A>\n"); else printf("</I>");
+		break;
+	   case HR:		printf("\n<HR>\n"); break;
+
+		/* U (was B, I), strike -- all temporary until HTML 4.0's INS and DEL widespread */
+	   case BEGINDIFFA: printf("<INS><U>"); break;
+	   case ENDDIFFA: printf("</U></INS>"); break;
+	   case BEGINDIFFD: printf("<DEL><strike>"); break;
+	   case ENDDIFFD: printf("</strike></DEL>"); break;
+
+	   case BEGINSC: case ENDSC:
+	   case BEGINY: case ENDY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case CHANGEBAR:
+		/* nothing */
+		break;
+	   default:
+		DefaultPara(cmd);
+	}
+}
+
+
+
+/*
+ * SGML
+ */
+
+/* same as HTML but just has man page-specific DTD */
+/* follows the Davenport DocBook DTD v2.3, availble from ftp.ora.com */
+
+/*char *docbookpath = "docbook.dtd";*/
+
+static void
+SGML(enum command cmd)
+{
+	static int pre=0;
+	int i;
+	char *p;
+	static int fRefEntry=0;
+	static int fRefPurpose=0;
+	/*static char *bads => SGML doesn't backslash-quote metacharacters */
+
+/*
+	fprintf(stderr,
+		   "The framework for SGML is in place but not done.  If you\n"
+		   "are familiar with the DocBook DTD, however, it shouldn't be\n"
+ 		   "too difficult to finish it.  If you do so, please send your\n"
+		   "code to me so that I may share the wealth in the next release.\n"
+		   );
+	exit(1);
+*/
+
+	/* always respond to these signals */
+	switch (cmd) {
+	   case CHARLQUOTE:
+	   case CHARRQUOTE:
+		printf("&quot;");
+		break;
+	   case CHARLSQUOTE:
+	   case CHARRSQUOTE:
+	   case CHARPERIOD:
+	   case CHARTAB:
+	   case CHARHAT:
+	   case CHARVBAR:
+	   case CHARBULLET:
+	   case CHARDAGGER:
+	   case CHARPLUSMINUS:
+	   case CHARNBSP:
+ 	   case CHARCENT:
+ 	   case CHARSECT:
+ 	   case CHARCOPYR:
+ 	   case CHARNOT:
+ 	   case CHARREGTM:
+ 	   case CHARDEG:
+ 	   case CHARACUTE:
+ 	   case CHAR14:
+ 	   case CHAR12:
+ 	   case CHAR34:
+ 	   case CHARMUL:
+ 	   case CHARDIV:
+		putchar(cmd); break;
+	   case CHARAMP:		printf("&amp;"); break;
+	   case CHARDASH:
+		if (sectheadid==NAME && !fRefPurpose) {
+			printf("</RefEntry><RefPurpose>");
+			fRefPurpose=1;
+		} else putchar('-');
+		break;
+	   case CHARBACKSLASH:	putchar('\\'); break;
+	   case CHARGT:		printf("&gt;"); break;
+	   case CHARLT:		printf("&lt;"); break;
+	   default:
+		break;
+	}
+
+	/* while in pre mode... */
+	if (pre) {
+		switch (cmd) {
+		   case ENDLINE:	I=0; CurLine++; if (!fPara && scnt) printf("<BR>"); printf("\n"); break;
+		   case ENDTABLE:
+			if (fSource) {
+			  printf("</TABLE>\n");
+			} else {
+			  printf("</PRE><BR>\n"); pre=0; fQS=fIQS=fPara=1;
+			}
+			break;
+		   default:
+			/* nothing */
+			break;
+		}
+		return;
+	}
+
+	/* usual operation */
+	switch (cmd) {
+	   case BEGINDOC:
+		/*printf("<!DOCTYPE chapter SYSTEM \"%s\">\n", docbookpath);*/
+		printf("<!--\n\n\tI am looking for help to finish SGML.\n\n-->\n");
+
+		printf("<!-- %s\n",provenance);
+		printf("     %s -->\n\n",anonftp);
+		/* better title possible? */
+		printf("<RefEntry ID=%s.%s>\n", manName, manSect);
+		printf("<RefMeta><RefEntryTitle>%s</RefEntryTitle>", manName);
+		printf("<ManVolNum>%s</ManVolNum></RefMeta>\n\n", manSect);
+
+		I=0;
+		break;
+
+	   case ENDDOC:
+		/* header and footer wanted? */
+		if (fHeadfoot) {
+			printf("<RefSect1><Title>%s</Title>\n", HEADERANDFOOTER);
+			for (i=0; i<CRUFTS; i++) if (*cruft[i]) printf("<Para>%s\n",cruft[i]);
+			printf("</RefSect1>");
+		}
+
+		/* table of contents, such as found in HTML, can be generated automatically by SGML software */
+
+		printf("</RefEntry>\n");
+		break;
+	   case BEGINBODY:		printf("\n\n<Para>"); break;
+	   case ENDBODY:		break;
+
+	   case BEGINCOMMENT: printf("\n<!--\n"); break;
+	   case ENDCOMMENT: printf("\n-->\n"); break;
+	   case COMMENTLINE: break;
+
+	   case BEGINSECTHEAD:
+	   case BEGINSUBSECTHEAD:
+		printf("<Title>");
+		break;
+	   case ENDSECTHEAD:
+	   case ENDSUBSECTHEAD:
+		printf("</Title>");
+		break;
+
+	   case BEGINSECTION:
+		if (sectheadid==NAME) printf("<RefNameDiv>");
+			/*printf("<RefEntry>");  -- do lotsa parsing here for RefName, RefPurpose*/
+		else if (sectheadid==SYNOPSIS) printf("<RefSynopsisDiv>");
+		else printf("<RefSect1>");
+		break;
+	   case ENDSECTION:
+		if (oldsectheadid==NAME) printf("</RefNameDiv>\n\n");
+		else if (oldsectheadid==SYNOPSIS) printf("</RefSynopsisDiv>\n\n");
+		else printf("</RefSect1>\n\n");
+		break;
+
+	   case BEGINSUBSECTION:	printf("<RefSect2>"); break;
+	   case ENDSUBSECTION:	printf("</RefSect2>"); break;
+
+	   /* need to update this for enumerated and plain lists */
+	   case BEGINBULPAIR:	printf("<ItemizedList MARK=Bullet>\n"); break;
+	   case ENDBULPAIR:		printf("</ItemizedList>\n"); break;
+	   case BEGINBULLET:	printf("<Term>"); break;
+	   case ENDBULLET:		printf("</Term>"); break;
+	   case BEGINBULTXT:	printf("<ListItem><Para>"); break;
+	   case ENDBULTXT:		printf("</Para></ListItem>\n"); break;
+
+	   case BEGINLINE:
+		/* remember, get BEGINBODY call at start of paragraph */
+		if (fRefEntry) {
+			if (fRefPurpose) {
+				for (p=plain; *p!='-'; p++) {
+					/* nothing?! */
+				}
+			}
+		}
+
+		break;
+
+	   case ENDLINE:
+		/*if (fCodeline) { fIQS=1; fCodeline=0; }*/
+		if (fCodeline) { printf("</CODE><BR>"); fCodeline=0; }
+		I=0; CurLine++; if (!fPara && scnt) printf("<BR>"); printf("\n");
+		break;
+
+	   case SHORTLINE:
+		if (fCodeline) { printf("</CODE>"); fCodeline=0; }
+		if (!fIP) printf("<BR>\n");
+		break;
+
+	   case BEGINTABLE:
+		if (fSource) {
+		  printf("<TABLE>\n");
+		} else {
+		  printf("<BR><PRE>\n"); pre=1; fQS=fIQS=fPara=0;
+		}
+		break;
+	   case ENDTABLE:
+		if (fSource) {
+		  printf("</TABLE>\n");
+		} else {
+		  printf("</PRE><BR>\n"); pre=0; fQS=fIQS=fPara=1;
+		}
+		break;
+	   case BEGINTABLELINE:		printf("<TR>"); break;
+	   case ENDTABLELINE:		printf("</TR>\n"); break;
+	   case BEGINTABLEENTRY:		printf("<TD>"); break;
+	   case ENDTABLEENTRY:		printf("</TD>"); break;
+
+	   case BEGININDENT: case ENDINDENT:
+	   case FONTSIZE:
+		break;
+
+	   /* have to make some guess about bold and italics */
+	   case BEGINBOLD:		printf("<B>"); break;
+	   case ENDBOLD:		printf("</B>"); break;
+	   case BEGINITALICS:	printf("<I>"); break;
+	   case ENDITALICS:		printf("</I>"); break;
+	   case BEGINBOLDITALICS:
+	   case BEGINCODE:		printf("<CODE>"); break;
+	   case ENDBOLDITALICS:	
+	   case ENDCODE:		printf("</CODE>"); break;
+	   case BEGINMANREF:
+/*
+		manrefextract(hitxt);
+		if (fmanRef) { printf("<LINK LINKEND=\""); printf(href, manrefname, manrefsect); printf("\">\n"); }
+		else printf("<I>");
+		break;
+*/
+		printf("<Command>");
+		break;
+	   case ENDMANREF:
+/*		if (fmanRef) printf("</LINK>"); else printf("</I>");*/
+		printf("</Command>");
+		break;
+
+	   case HR:		/*printf("\n<HR>\n", horizontalrule);*/ break;
+
+	   case BEGINSC: case ENDSC:
+	   case BEGINY: case ENDY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case CHANGEBAR:
+		/* nothing */
+		break;
+	   default:
+		DefaultPara(cmd);
+	}
+}
+
+#if 0
+/*
+ * GNU Texinfo -- somebody should finish this up
+ */
+
+static void
+Texinfo(enum command cmd)
+{
+	static int pre=0;
+	int i;
+
+	/* always respond to these signals */
+	switch (cmd) {
+	   case CHARNBSP:		printf("&nbsp;"); I++; break;
+	   case CHARLQUOTE:		printf("&laquo;");		break;
+	   case CHARRQUOTE:		printf("&raquo;");		break;
+	   case CHARTAB:		printf("<tt> </tt>&nbsp;<tt> </tt>&nbsp;");		break;
+	  /* old browsers--who uses these?--don't understand symbolic codes */
+	  /*
+ 	   case CHARNBSP:		printf("&#160;"); I++; break;
+ 	   case CHARLQUOTE:		printf("&#171;"); break;
+ 	   case CHARRQUOTE:		printf("&#187;"); break;
+ 	   case CHARTAB:		printf("<tt> </tt>&#160;<tt> </tt>&#160;"); break;
+		*/
+	   case CHARLSQUOTE:
+	   case CHARRSQUOTE:
+	   case CHARPERIOD:
+	   case CHARDASH:
+	   case CHARBACKSLASH:
+	   case CHARVBAR:		/*printf("&brvbar;"); -- broken bar no good */
+	   case CHARHAT:
+		putchar(cmd); break;
+	   case CHARDAGGER:		printf("*"); break;
+	   case CHARBULLET:		printf("&#183;"/*"&middot;"*//*&sect;--middot hardly visible*/); break;
+	   case CHARPLUSMINUS:	printf("&#177;"/*"&plusmn;"*/); break;
+	   case CHARGT:		printf("&gt;"); break;
+	   case CHARLT:		printf("&lt;"); break;
+	   case CHARAMP:		printf("&amp;"); break;
+	   case CHARCENT:		printf("&#162;"); break;	/* translate these to symbolic forms, sometime */
+ 	   case CHARSECT:		printf("&#167;"); break;
+ 	   case CHARCOPYR:		printf("&#169;"); break;
+ 	   case CHARNOT:		printf("&#172;"); break;
+ 	   case CHARREGTM:		printf("&#174;"); break;
+ 	   case CHARDEG:		printf("&#176;"); break;
+ 	   case CHARACUTE:		printf("&#180;"); break;
+ 	   case CHAR14:		printf("&#188;"); break;
+ 	   case CHAR12:		printf("&#189;"); break;
+ 	   case CHAR34:		printf("&#190;"); break;
+ 	   case CHARMUL:		printf("&#215;"); break;
+ 	   case CHARDIV:		printf("&#247;"); break;
+	   default:
+		break;
+	}
+
+	/* while in pre mode... */
+	if (pre) {
+		switch (cmd) {
+		   case ENDLINE:	I=0; CurLine++; if (!fPara && scnt) printf("<BR>"); printf("\n"); break;
+		   case ENDTABLE:
+			if (fSource) {
+			  printf("</TABLE>\n");
+			} else {
+			  printf("</PRE><BR>\n"); pre=0; fQS=fIQS=fPara=1;
+			}
+			break;
+		   default:
+			/* nothing */
+			break;
+		}
+		return;
+	}
+
+	/* usual operation */
+	switch (cmd) {
+	   case BEGINDOC:
+		/* escchars = ...  => HTML doesn't backslash-quote metacharacters */
+		printf("<!-- %s, -->\n",provenance);
+		printf("<!-- %s -->\n\n",anonftp);
+		printf("<HTML>\n<HEAD>\n");
+/*		printf("<ISINDEX>\n");*/
+		/* better title possible? */
+		printf("<TITLE>"); printf(manTitle, manName, manSect); printf("</TITLE>\n");
+		printf("</HEAD>\n<BODY>\n");
+		printf("<A HREF=\"#toc\">%s</A><P>\n", TABLEOFCONTENTS);
+		I=0;
+		break;
+	   case ENDDOC:
+		/* header and footer wanted? */
+		printf("<P>\n");
+		if (fHeadfoot) {
+			printf("<HR><H2>%s</H2>\n", HEADERANDFOOTER);
+			for (i=0; i<CRUFTS; i++) if (*cruft[i]) printf("%s<BR>\n",cruft[i]);
+		}
+
+		if (!tocc) {
+			/*printf("\n<H1>ERROR: Empty man page</H1>\n");*/
+		} else {
+			printf("\n<HR><P>\n");
+			printf("<A NAME=\"toc\"><B>%s</B></A><P>\n", TABLEOFCONTENTS);
+			printf("<UL>\n");
+			for (i=0, lasttoc=BEGINSECTION; i<tocc; lasttoc=toc[i].type, i++) {
+				if (lasttoc!=toc[i].type) {
+					if (toc[i].type==BEGINSUBSECTION) printf("<UL>\n");
+					else printf("</UL>\n");
+				}
+				printf("<LI><A NAME=\"toc%d\" HREF=\"#sect%d\">%s</A></LI>\n", i, i, toc[i].text);
+			}
+			if (lasttoc==BEGINSUBSECTION) printf("</UL>");
+			printf("</UL>\n");
+		}
+		printf("</BODY></HTML>\n");
+		break;
+	   case BEGINBODY:
+		printf("<P>\n");
+		break;
+	   case ENDBODY:		break;
+
+	   case BEGINCOMMENT:
+	   case ENDCOMMENT:
+		break;
+	   case COMMENTLINE: printf("@c ");	break;
+
+	   case BEGINSECTHEAD:
+		break;
+	   case ENDSECTHEAD:
+		printf("\n@node %s\n", toc[tocc].text);
+		printf("\n@section %s\n\n", toc[tocc].text);
+		/* useful extraction from FILES, ENVIRONMENT? */
+		break;
+	   case BEGINSUBSECTHEAD:
+		break;
+	   case ENDSUBSECTHEAD:
+		printf("\n@node %s\n", toc[tocc].text);
+		printf("\n@subsection %s\n\n", toc[tocc].text);
+		break;
+	   case BEGINSECTION:	break;
+	   case ENDSECTION:		break;
+	   case BEGINSUBSECTION:	break;
+	   case ENDSUBSECTION:	break;
+
+	   case BEGINBULPAIR:
+		if (listtype==OL) printf("\n<OL>\n");
+		else if (listtype==UL) printf("\n<UL>\n");
+		else printf("\n<DL>\n");
+		break;
+	   case ENDBULPAIR:
+		if (listtype==OL) printf("\n</OL>\n");
+		else if (listtype==UL) printf("\n</UL>\n");
+		else printf("</DL>\n");
+		break;
+	   case BEGINBULLET:
+		if (listtype==OL || listtype==UL) fcharout=0;
+		else printf("\n<DT>");
+		break;
+	   case ENDBULLET:
+		if (listtype==OL || listtype==UL) fcharout=1;
+		else printf("</DT>");
+		break;
+	   case BEGINBULTXT:
+		if (listtype==OL || listtype==UL) printf("<LI>");
+		else printf("\n<DD>");
+		break;
+	   case ENDBULTXT:
+		if (listtype==OL || listtype==UL) printf("</LI>");
+		else printf("</DD>\n");
+		break;
+
+	   case BEGINLINE:
+		/*		if (ncnt) printf("<P>\n");*/
+
+		/* trailing spaces already trimmed off, so look for eol now */
+		if (fCodeline) {
+		  printf("<CODE>");
+		  for (i=0; i<scnt-indent; i++) printf("&nbsp;"/*&#160;*/);		/* ? */
+		  tagc=0;
+
+		  /* already have .tag=BOLDITALICS, .first=0 */
+		  /* would be more elegant, but can't print initial spaces before first tag
+		  tags[0].last = linelen;
+		  tagc=1;
+		  fIQS=0;
+		  */
+		}
+
+		break;
+
+	   case ENDLINE:
+		/*if (fCodeline) { fIQS=1; fCodeline=0; }*/
+		if (fCodeline) { printf("</CODE><BR>"); fCodeline=0; }
+		I=0; CurLine++; if (!fPara && scnt) printf("<BR>"); printf("\n");
+		break;
+
+	   case SHORTLINE:
+		if (fCodeline) { printf("</CODE>"); fCodeline=0; }
+		if (!fIP) printf("<BR>\n");
+		break;
+
+
+	   case BEGINTABLE:
+		if (fSource) {
+		  /*printf("<CENTER><TABLE BORDER>\n");*/
+		  printf("<TABLE BORDER=0>\n");
+		} else {
+		  printf("<BR><PRE>\n"); pre=1; fQS=fIQS=fPara=0;
+		}
+		break;
+	   case ENDTABLE:
+		if (fSource) {
+		  printf("</TABLE>\n");
+		} else {
+		  printf("</PRE><BR>\n"); pre=0; fQS=fIQS=fPara=1;
+		}
+		break;
+	   case BEGINTABLELINE:		printf("<TR>"); break;
+	   case ENDTABLELINE:		printf("</TR>\n"); break;
+	   case BEGINTABLEENTRY:
+		printf("<TD ALIGN=");
+		switch (tblcellformat[0]) {
+		case 'c':	printf("CENTER"); break;
+		case 'n':	/*printf("DECIMAL"); break;  -- fall through to right for now */
+		case 'r':	printf("RIGHT"); break;
+		case 'l':
+		default:
+		  printf("LEFT");
+		}
+		if (tblcellspan>1) printf(" COLSPAN=%d", tblcellspan);
+		printf(">");
+		break;
+	   case ENDTABLEENTRY:
+		printf("</TD>");
+		break;
+
+	   /* something better with CSS */
+	   case BEGININDENT:		printf("<blockquote>"); break;
+	   case ENDINDENT:			printf("</blockquote>\n"); break;
+
+	   case FONTSIZE:
+		/* HTML font step sizes are bigger than troff's */
+		if ((fontdelta+=intArg)!=0) printf("<FONT SIZE=%c1>", (intArg>0)?'+':'-'); else printf("</FONT>\n");
+		break;
+
+	   case BEGINBOLD:		printf("@b{"); break; /* } */
+	   case BEGINITALICS:	printf("@i{"); break;
+	   case BEGINSC:		printf("@sc{"); break; /* } */
+	   case ENDITALICS:
+	   case ENDBOLD:
+	   case ENDSC: /* { */
+		printf("}");
+		break;
+	   case BEGINBOLDITALICS:
+	   case BEGINCODE:		printf("<CODE>"); break;
+	   case ENDBOLDITALICS:
+	   case ENDCODE:		printf("</CODE>"); break;
+	   case BEGINMANREF:
+		manrefextract(hitxt);
+		if (fmanRef) { printf("@xref{}"); }
+/*<A HREF=\""); printf(href, manrefname, manrefsect); printf("\">"); }*/
+		else printf("<I>");
+		break;
+	   case ENDMANREF:
+		if (fmanRef) printf("</A>\n"); else printf("</I>");
+		break;
+	   case HR:		printf("\n<HR>\n"); break;
+
+	   case BEGINY: case ENDY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case CHANGEBAR:
+		/* nothing */
+		break;
+	   default:
+		DefaultPara(cmd);
+	}
+}
+#endif
+
+
+
+/* generates MIME compliant to RFC 1563 */
+
+static void
+MIME(enum command cmd)
+{
+	static int pre=0;
+	int i;
+
+	/* always respond to these signals */
+	switch (cmd) {
+	   case CHARDASH:
+	   case CHARAMP:
+	   case CHARPERIOD:
+	   case CHARTAB:
+		putchar(cmd); break;
+	   case CHARLSQUOTE:	putchar('`'); break;
+	   case CHARACUTE:
+	   case CHARRSQUOTE:	putchar('\''); break;
+	   case CHARBULLET:		putchar('*'); break;
+	   case CHARDAGGER:		putchar('|'); break;
+	   case CHARPLUSMINUS:	printf("+-"); break;
+	   case CHARNBSP:		putchar(' '); break;
+ 	   case CHARCENT:	putchar('c'); break;
+ 	   case CHARSECT:	putchar('S'); break;
+ 	   case CHARCOPYR:	printf("(C)"); break;
+ 	   case CHARNOT:	putchar('~'); break;
+ 	   case CHARREGTM:	printf("(R)"); break;
+ 	   case CHARDEG:	putchar('o'); break;
+ 	   case CHAR14:		printf("1/4"); break;
+ 	   case CHAR12:		printf("1/2"); break;
+ 	   case CHAR34:		printf("3/4"); break;
+ 	   case CHARMUL:	putchar('X'); break;
+ 	   case CHARDIV:	putchar('/'); break;
+	   case CHARLQUOTE:
+	   case CHARRQUOTE:
+		putchar('"');
+		break;
+	   case CHARBACKSLASH:	/* these should be caught as escaped chars */
+	   case CHARGT:
+	   case CHARLT:
+#if 0
+		assert(1);
+#endif
+		break;
+	   default:
+		break;
+	}
+
+	/* while in pre mode... */
+	if (pre) {
+		switch (cmd) {
+		   case ENDLINE:	I=0; CurLine++; if (!fPara && scnt) printf("\n\n"); break;
+		   case ENDTABLE:	printf("</fixed>\n\n"); pre=0; fQS=fIQS=fPara=1; break;
+		   default:
+			/* nothing */
+			break;
+		}
+		return;
+	}
+
+	/* usual operation */
+	switch (cmd) {
+	   case BEGINDOC:
+		printf("Content-Type: text/enriched\n");
+		printf("Text-Width: 60\n");
+		escchars = "<>\\";
+
+		I=0;
+		break;
+	   case ENDDOC:
+		/* header and footer wanted? */
+		printf("\n\n");
+		if (fHeadfoot) {
+			printf("\n");
+			MIME(BEGINSECTHEAD); printf("%s",HEADERANDFOOTER); MIME(ENDSECTHEAD);
+			for (i=0; i<CRUFTS; i++) if (*cruft[i]) printf("\n%s\n",cruft[i]);
+		}
+
+/*
+		printf("\n<comment>\n");
+		printf("%s\n%s\n", provenance, anonftp);
+		printf("</comment>\n\n");
+*/
+
+/*
+		printf("\n<HR><P>\n");
+		printf("<A NAME=\"toc\"><B>%s</B></A><P>\n", TABLEOFCONTENTS);
+		printf("<UL>\n");
+		for (i=0, lasttoc=BEGINSECTION; i<tocc; lasttoc=toc[i].type, i++) {
+		  if (lasttoc!=toc[i].type) {
+		    if (toc[i].type==BEGINSUBSECTION) printf("<UL>\n");
+		    else printf("</UL>\n");
+		  }
+		  printf("<LI><A NAME=\"toc%d\" HREF=\"#sect%d\">%s</A></LI>\n", i, i, toc[i].text);
+		}
+		if (lasttoc==BEGINSUBSECTION) printf("</UL>");
+		printf("</UL>\n");
+		printf("</BODY></HTML>\n");
+*/
+		break;
+	   case BEGINBODY:
+		printf("\n\n");
+		break;
+	   case ENDBODY:		break;
+
+	   case BEGINCOMMENT: fcharout=0; break;
+	   case ENDCOMMENT: fcharout=1; break;
+	   case COMMENTLINE: break;
+
+	   case BEGINSECTHEAD:
+		printf("\n<bigger><bigger><underline>");
+		/*A NAME=\"sect%d\" HREF=\"#toc%d\"><H2>", tocc, tocc);*/
+		break;
+	   case ENDSECTHEAD:
+		printf("</underline></bigger></bigger>\n\n<indent>");
+		/* useful extraction from files, environment? */
+		break;
+	   case BEGINSUBSECTHEAD:
+		printf("<bigger>");
+		/*\n<A NAME=\"sect%d\" HREF=\"#toc%d\"><H3>", tocc, tocc);*/
+		break;
+	   case ENDSUBSECTHEAD:
+		printf("</bigger>\n\n</indent>");
+		break;
+	   case BEGINSECTION:
+	   case BEGINSUBSECTION:
+		break;
+	   case ENDSECTION:
+	   case ENDSUBSECTION:
+		printf("</indent>\n");
+		break;
+
+	   case BEGINBULPAIR:	break;
+	   case ENDBULPAIR:		break;
+	   case BEGINBULLET:	printf("<bold>"); break;
+	   case ENDBULLET:		printf("</bold>\t"); break;
+	   case BEGINBULTXT:
+	   case BEGININDENT:
+		printf("<indent>");
+		break;
+	   case ENDBULTXT:
+	   case ENDINDENT:
+		printf("</indent>\n");
+		break;
+
+	   case FONTSIZE:
+		if ((fontdelta+=intArg)==0) {
+		  if (intArg>0) printf("</smaller>"); else printf("</bigger>");
+		} else {
+		  if (intArg>0) printf("<bigger>"); else printf("<smaller>");
+		}
+		break;
+
+	   case BEGINLINE:		/*if (ncnt) printf("\n\n");*/ break;
+	   case ENDLINE:		I=0; CurLine++; printf("\n"); break;
+	   case SHORTLINE:		if (!fIP) printf("\n\n"); break;
+	   case BEGINTABLE:		printf("<nl><fixed>\n"); pre=1; fQS=fIQS=fPara=0; break;
+	   case ENDTABLE:		printf("</fixed><nl>\n"); pre=0; fQS=fIQS=fPara=1; break;
+	   case BEGINTABLELINE: case ENDTABLELINE: case BEGINTABLEENTRY: case ENDTABLEENTRY:
+		break;
+		/* could use a new list type */
+
+	   case BEGINBOLD:		printf("<bold>"); break;
+	   case ENDBOLD:		printf("</bold>"); break;
+	   case BEGINITALICS:	printf("<italics>"); break;
+	   case ENDITALICS:		printf("</italics>"); break;
+	   case BEGINCODE:
+	   case BEGINBOLDITALICS:printf("<bold><italics>"); break;
+	   case ENDCODE:
+	   case ENDBOLDITALICS:	printf("</bold></italics>"); break;
+	   case BEGINMANREF:
+		printf("<x-color><param>blue</param>");
+/* how to make this hypertext?
+   		manrefextract(hitxt);
+		if (fmanRef) { printf("<A HREF=\""); printf(href, manrefname, manrefsect); printf("\">\n"); }
+		else printf("<I>");
+		break;
+*/
+		break;
+	   case ENDMANREF:
+		printf("</x-color>");
+		break;
+
+	   case HR:		printf("\n\n%s\n\n", horizontalrule); break;
+
+	   case BEGINSC: case ENDSC:
+	   case BEGINY: case ENDY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case CHANGEBAR:
+		/* nothing */
+		break;
+	   default:
+		DefaultPara(cmd);
+	}
+}
+
+
+
+/*
+ * LaTeX
+ */
+
+static void
+LaTeX(enum command cmd)
+{
+
+	switch (cmd) {
+	   case BEGINDOC:
+		escchars = "$&%#_{}"; /* and more to come? */
+		printf("%% %s,\n", provenance);
+		printf("%% %s\n\n", anonftp);
+		/* definitions */
+		printf(
+		  "\\documentstyle{article}\n"
+		  "\\def\\thefootnote{\\fnsymbol{footnote}}\n"
+		  "\\setlength{\\parindent}{0pt}\n"
+		  "\\setlength{\\parskip}{0.5\\baselineskip plus 2pt minus 1pt}\n"
+		  "\\begin{document}\n"
+			  );
+		I=0;
+		break;
+	   case ENDDOC:
+		/* header and footer wanted? */
+		printf("\n\\end{document}\n");
+
+		break;
+	   case BEGINBODY:
+		printf("\n\n");
+		break;
+	   case ENDBODY:		break;
+
+	   case BEGINCOMMENT:
+	   case ENDCOMMENT:
+		break;
+	   case COMMENTLINE: printf("%% "); break;
+
+
+	   case BEGINSECTION:	break;
+	   case ENDSECTION:		break;
+	   case BEGINSECTHEAD:	printf("\n\\section{"); tagc=0; break;
+	   case ENDSECTHEAD:
+		printf("}");
+/*
+		if (CurLine==1) printf("\\footnote{"
+		  "\\it conversion to \\LaTeX\ format by PolyglotMan "
+		  "available via anonymous ftp from {\\tt ftp.berkeley.edu:/ucb/people/phelps/tcltk}}"
+			  );
+*/
+		/* useful extraction from files, environment? */
+		printf("\n");
+		break;
+	   case BEGINSUBSECTHEAD:printf("\n\\subsection{"); break;
+	   case ENDSUBSECTHEAD:
+		printf("}");
+		break;
+	   case BEGINSUBSECTION:	break;
+	   case ENDSUBSECTION:	break;
+	   case BEGINBULPAIR:	printf("\\begin{itemize}\n"); break;
+	   case ENDBULPAIR:		printf("\\end{itemize}\n"); break;
+	   case BEGINBULLET:	printf("\\item ["); break;
+	   case ENDBULLET:		printf("] "); break;
+	   case BEGINLINE:		/*if (ncnt) printf("\n\n");*/ break;
+	   case ENDLINE:		I=0; putchar('\n'); CurLine++; break;
+	   case BEGINTABLE:		printf("\\begin{verbatim}\n"); break;
+	   case ENDTABLE:		printf("\\end{verbatim}\n"); break;
+	   case BEGINTABLELINE: case ENDTABLELINE: case BEGINTABLEENTRY: case ENDTABLEENTRY:
+		break;
+	   case BEGININDENT: case ENDINDENT:
+	   case FONTSIZE:
+		break;
+	   case SHORTLINE:		if (!fIP) printf("\n\n"); break;
+	   case BEGINBULTXT:	break;
+	   case ENDBULTXT:		putchar('\n'); break;
+
+	   case CHARLQUOTE:		printf("``"); break;
+	   case CHARRQUOTE:		printf("''"); break;
+	   case CHARLSQUOTE:
+	   case CHARRSQUOTE:
+	   case CHARPERIOD:
+	   case CHARTAB:
+	   case CHARDASH:
+	   case CHARNBSP:
+		putchar(cmd); break;
+	   case CHARBACKSLASH:	printf("$\\backslash$"); break;
+	   case CHARGT:		printf("$>$"); break;
+	   case CHARLT:		printf("$<$"); break;
+	   case CHARHAT:		printf("$\\char94{}$"); break;
+	   case CHARVBAR:		printf("$|$"); break;
+	   case CHARAMP:		printf("\\&"); break;
+	   case CHARBULLET:		printf("$\\bullet$ "); break;
+	   case CHARDAGGER:		printf("\\dag "); break;
+	   case CHARPLUSMINUS:	printf("\\pm "); break;
+ 	   case CHARCENT:		printf("\\hbox{\\rm\\rlap/c}"); break;
+ 	   case CHARSECT:		printf("\\S "); break;
+ 	   case CHARCOPYR:		printf("\\copyright "); break;
+ 	   case CHARNOT:		printf("$\\neg$"); break;
+ 	   case CHARREGTM:		printf("(R)"); break;
+ 	   case CHARDEG:		printf("$^\\circ$"); break;
+ 	   case CHARACUTE:		putchar('\''); break;
+ 	   case CHAR14:		printf("$\\frac{1}{4}$"); break;
+ 	   case CHAR12:		printf("$\\frac{1}{2}$"); break;
+ 	   case CHAR34:		printf("$\\frac{3}{4}$"); break;
+ 	   case CHARMUL:		printf("\\times "); break;
+ 	   case CHARDIV:		printf("\\div "); break;
+
+	   case BEGINCODE:
+	   case BEGINBOLD:		printf("{\\bf "); break; /* } */
+	   case BEGINSC:		printf("{\\sc "); break; /* } */
+	   case BEGINITALICS:	printf("{\\it "); break; /* } */
+	   case BEGINBOLDITALICS:printf("{\\bf\\it "); break; /* } */
+	   case BEGINMANREF:	printf("{\\sf "); break; /* } */
+	   case ENDCODE:
+	   case ENDBOLD:
+	   case ENDSC:
+	   case ENDITALICS:
+	   case ENDBOLDITALICS:
+	   case ENDMANREF: /* { */
+		putchar('}');
+		break;
+	   case HR:		/*printf("\n%s\n", horizontalrule);*/ break;
+
+	   case BEGINY: case ENDY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case CHANGEBAR:
+		/* nothing */
+		break;
+	   default:
+		DefaultPara(cmd);
+	}
+}
+
+
+static void
+LaTeX2e(enum command cmd)
+{
+	switch (cmd) {
+		/* replace selected commands ... */
+	   case BEGINDOC:
+		escchars = "$&%#_{}";
+		printf("%% %s,\n", provenance);
+		printf("%% %s\n\n", anonftp);
+		/* definitions */
+		printf(
+		  "\\documentclass{article}\n"
+		  "\\def\\thefootnote{\\fnsymbol{footnote}}\n"
+		  "\\setlength{\\parindent}{0pt}\n"
+		  "\\setlength{\\parskip}{0.5\\baselineskip plus 2pt minus 1pt}\n"
+		  "\\begin{document}\n"
+			  );
+		I=0;
+		break;
+	   case BEGINCODE:
+	   case BEGINBOLD:		printf("\\textbf{"); break; /* } */
+	   case BEGINSC:		printf("\\textsc{"); break; /* } */
+	   case BEGINITALICS:	printf("\\textit{"); break; /* } */
+	   case BEGINBOLDITALICS:printf("\\textbf{\\textit{"); break; /* }} */
+	   case BEGINMANREF:	printf("\\textsf{"); break; /* } {{ */
+	   case ENDBOLDITALICS:	printf("}}"); break;
+
+		/* ... rest same as old LaTeX */
+	   default:
+		LaTeX(cmd);
+	}
+}
+
+
+
+/*
+ * Rich Text Format (RTF)
+ */
+
+/* RTF could use more work */
+
+static void
+RTF(enum command cmd)
+{
+
+	switch (cmd) {
+	   case BEGINDOC:
+		escchars = "{}";
+		/* definitions */
+		printf(
+		  /* fonts */
+		  "{\\rtf1\\deff2 {\\fonttbl"
+		  "{\\f20\\froman Times;}{\\f150\\fnil I Times Italic;}"
+		  "{\\f151\\fnil B Times Bold;}{\\f152\\fnil BI Times BoldItalic;}"
+		  "{\\f22\\fmodern Courier;}{\\f23\\ftech Symbol;}"
+		  "{\\f135\\fnil I Courier Oblique;}{\\f136\\fnil B Courier Bold;}{\\f137\\fnil BI Courier BoldOblique;}"
+		  "{\\f138\\fnil I Helvetica Oblique;}{\\f139\\fnil B Helvetica Bold;}}"
+		  "\n"
+
+		  /* style sheets */
+		  "{\\stylesheet{\\li720\\sa120 \\f20 \\sbasedon222\\snext0 Normal;}"
+		  "{\\s2\\sb200\\sa120 \\b\\f3\\fs20 \\sbasedon0\\snext2 section head;}"
+		  "{\\s3\\li180\\sa120 \\b\\f20 \\sbasedon0\\snext3 subsection head;}"
+		  "{\\s4\\fi-1440\\li2160\\sa240\\tx2160 \\f20 \\sbasedon0\\snext4 detailed list;}}"
+		  "\n"
+
+/* more header to come--do undefined values default to nice values? */
+			   );
+		I=0;
+		break;
+	   case ENDDOC:
+		/* header and footer wanted? */
+		printf("\\par{\\f150 %s,\n%s}", provenance, anonftp);
+		printf("}\n");
+		break;
+	   case BEGINBODY:
+		printf("\n\n");
+		break;
+	   case ENDBODY:
+		CurLine++;
+		printf("\\par\n");
+		tagc=0;
+		break;
+
+	   case BEGINCOMMENT: fcharout=0; break;
+	   case ENDCOMMENT: fcharout=1; break;
+	   case COMMENTLINE: break;
+
+	   case BEGINSECTION:	break;
+	   case ENDSECTION:		printf("\n\\par\n"); break;
+	   case BEGINSECTHEAD:	printf("{\\s2 "); tagc=0; break;
+	   case ENDSECTHEAD:
+		printf("}\\par");
+		/* useful extraction from files, environment? */
+		printf("\n");
+		break;
+	   case BEGINSUBSECTHEAD:printf("{\\s3 "); break;
+	   case ENDSUBSECTHEAD:
+		printf("}\\par\n");
+		break;
+	   case BEGINSUBSECTION:	break;
+	   case ENDSUBSECTION:	break;
+	   case BEGINLINE:		/*if (ncnt) printf("\n\n");*/ break;
+	   case ENDLINE:		I=0; putchar(' '); /*putchar('\n'); CurLine++;*/ break;
+	   case SHORTLINE:		if (!fIP) printf("\\line\n"); break;
+	   case BEGINBULPAIR:	printf("{\\s4 "); break;
+	   case ENDBULPAIR:		printf("}\\par\n"); break;
+	   case BEGINBULLET:	break;
+	   case ENDBULLET:		printf("\\tab "); fcharout=0; break;
+	   case BEGINBULTXT:	fcharout=1; break;
+	   case ENDBULTXT:		break;
+
+	   case CHARLQUOTE:		printf("``"); break;
+	   case CHARRQUOTE:		printf("''"); break;
+	   case CHARLSQUOTE:
+	   case CHARRSQUOTE:
+	   case CHARPERIOD:
+	   case CHARTAB:
+	   case CHARDASH:
+	   case CHARBACKSLASH:
+	   case CHARGT:
+	   case CHARLT:
+	   case CHARHAT:
+	   case CHARVBAR:
+	   case CHARAMP:
+	   case CHARNBSP:
+ 	   case CHARCENT:
+ 	   case CHARSECT:
+ 	   case CHARCOPYR:
+ 	   case CHARNOT:
+ 	   case CHARREGTM:
+ 	   case CHARDEG:
+ 	   case CHARACUTE:
+ 	   case CHAR14:
+ 	   case CHAR12:
+ 	   case CHAR34:
+ 	   case CHARMUL:
+ 	   case CHARDIV:
+		putchar(cmd); break;
+	   case CHARBULLET:		printf("\\bullet "); break;
+	   case CHARDAGGER:		printf("\\dag "); break;
+	   case CHARPLUSMINUS:	printf("\\pm "); break;
+
+	   case BEGINCODE:
+	   case BEGINBOLD:		printf("{\\b "); break; /* } */
+	   case BEGINSC:		printf("{\\fs20 "); break; /* } */
+	   case BEGINITALICS:	printf("{\\i "); break; /* } */
+	   case BEGINBOLDITALICS:printf("{\\b \\i "); break; /* } */
+	   case BEGINMANREF:	printf("{\\f22 "); break; /* } */
+	   case ENDBOLD:
+	   case ENDCODE:
+	   case ENDSC:
+	   case ENDITALICS:
+	   case ENDBOLDITALICS:
+	   case ENDMANREF: /* { */
+		putchar('}');
+		break;
+	   case HR:		printf("\n%s\n", horizontalrule); break;
+
+	   case BEGINY: case ENDY:
+	   case BEGINHEADER: case ENDHEADER:
+	   case BEGINFOOTER: case ENDFOOTER:
+	   case BEGINTABLE: case ENDTABLE:
+	   case BEGINTABLELINE: case ENDTABLELINE: case BEGINTABLEENTRY: case ENDTABLEENTRY:
+	   case BEGININDENT: case ENDINDENT:
+	   case FONTSIZE:
+	   case CHANGEBAR:
+		/* nothing */
+		break;
+	   default:
+		DefaultPara(cmd);
+	}
+}
+
+
+
+/*
+ * pointers to existing tools
+ */
+
+static void
+PostScript(enum command cmd)
+{
+	fprintf(stderr, "Use groff or psroff to generate PostScript.\n");
+	exit(1);
+}
+
+
+static void
+FrameMaker(enum command cmd)
+{
+	fprintf(stderr, "FrameMaker comes with filters that convert from roff to MIF.\n");
+	exit(1);
+}
+
+
+
+
+/*
+ * Utilities common to both parses
+ */
+
+
+/*
+ level 0: DOC - need match
+ level 1: SECTION - need match
+ level 2: SUBSECTION | BODY | BULLETPAIR
+ level 3: BODY (within SUB) | BULLETPAIR (within SUB) | BULTXT (within BULLETPAIR)
+ level 4: BULTXT (within BULLETPAIR within SUBSECTION)
+
+ never see: SECTHEAD, SUBSECTHEAD, BULLET
+*/
+
+int Psect=0, Psub=0, Pbp=0, Pbt=0, Pb=0, Pbul=0;
+
+static void
+pop(enum command cmd)
+{
+	assert(cmd==ENDINDENT || cmd==BEGINBULLET || cmd==BEGINBULTXT || cmd==BEGINBULPAIR || cmd==BEGINBODY || cmd==BEGINSECTION || cmd==BEGINSUBSECTION || cmd==ENDDOC);
+/*
+	int i;
+	int p;
+	int match;
+
+	p=cmdp-1;
+	for (i=cmdp-1;i>=0; i--)
+		if (cmd==cmdstack[i]) { match=i; break; }
+*/
+
+	/* if match, pop off all up to and including match */
+	/* otherwise, pop off one level*/
+
+	if (Pbul) {
+	  (*fn)(ENDBULLET); Pbul=0;
+	  if (cmd==BEGINBULLET) return;
+	} /* else close off ENDBULTXT */
+
+	if (Pbt) { (*fn)(ENDBULTXT); Pbt=0; }
+	if (cmd==BEGINBULTXT || cmd==BEGINBULLET) return;
+
+	if (Pb && cmd==BEGINBULPAIR) { (*fn)(ENDBODY); Pb=0; }	/* special */
+	if (Pbp) { (*fn)(ENDBULPAIR); Pbp=0; }
+	if (cmd==BEGINBULPAIR || cmd==ENDINDENT) return;
+
+	if (Pb) { (*fn)(ENDBODY); Pb=0; }
+	if (cmd==BEGINBODY) return;
+
+	if (Psub) { (*fn)(ENDSUBSECTION); Psub=0; }
+	if (cmd==BEGINSUBSECTION) return;
+
+	if (Psect) { (*fn)(ENDSECTION); Psect=0; }
+	if (cmd==BEGINSECTION) return;
+}
+
+
+static void
+poppush(enum command cmd)
+{
+	assert(cmd==ENDINDENT || cmd==BEGINBULLET || cmd==BEGINBULTXT || cmd==BEGINBULPAIR || cmd==BEGINBODY || cmd==BEGINSECTION || cmd==BEGINSUBSECTION);
+
+	pop(cmd);
+
+	switch (cmd) {
+	   case BEGINBULLET: Pbul=1; break;
+	   case BEGINBULTXT: Pbt=1; break;
+	   case BEGINBULPAIR: Pbp=1; break;
+	   case BEGINBODY: Pb=1; break;
+	   case BEGINSECTION: Psect=1; break;
+	   case BEGINSUBSECTION: Psub=1; break;
+	   default:
+		if (!fQuiet) fprintf(stderr, "poppush: unrecognized code %d\n", cmd);
+	}
+
+	(*fn)(cmd);
+	prevcmd = cmd;
+}
+
+
+
+/*
+ * PREFORMATTED PAGES PARSING
+ */
+
+/* wrapper for getchar() that expands tabs, and sends maximum of n=40 consecutive spaces */
+
+static int
+getchartab(void)
+{
+	static int tabexp = 0;
+	static int charinline = 0;
+	static int cspccnt = 0;
+	char c;
+
+	c = lookahead;
+	if (tabexp) tabexp--;
+	else if (c=='\n') {
+		charinline=0;
+		cspccnt=0;
+	} else if (c=='\t') {
+		tabexp = TabStops-(charinline%TabStops); if (tabexp==TabStops) tabexp=0;
+		lookahead = c = ' ';
+	} else if (cspccnt>=40) {
+		if (*in==' ') {
+			while (*in==' '||*in=='\t') in++;
+			in--;
+		}
+		cspccnt=0;
+	}
+
+	if (!tabexp && lookahead) lookahead = *in++;
+	if (c=='\b') charinline--; else charinline++;
+	if (c==' ') cspccnt++;
+	return c;
+}
+
+
+/* replace gets.  handles hyphenation too */
+static char *
+la_gets(char *buf)
+{
+	static char la_buf[MAXBUF];	/* can lookahead a full line, but nobody does now */
+	static int fla=0, hy=0;
+	char *ret,*p;
+	int c,i;
+
+	assert(buf!=NULL);
+
+	if (fla) {
+		/* could avoid copying if callers used return value */
+		strcpy(buf,la_buf); fla=0;
+		ret=buf;	/* correct? */
+	} else {
+		/*ret=gets(buf); -- gets is deprecated (since it can read too much?) */
+		/* could do this...
+		ret=fgets(buf, MAXBUF, stdin);
+		buf[strlen(buf)-1]='\0';
+		... but don't want to have to rescan line with strlen, so... */
+
+		i=0; p=buf;
+
+		/* recover spaces if re-linebreaking */
+		for (; hy; hy--) { *p++=' '; i++; }
+
+		while (lookahead && (c=getchartab())!='\n' && i<MAXBUF) { *p++=c; i++; }
+		assert(i<MAXBUF);
+
+#if 0
+		lookahead=ungetc(getchar(), stdin);	/* only looking ahead one character for now */
+#endif
+
+		/* very special case: if in SEE ALSO section, re-linebreak so references aren't linebroken
+		   (also do this if fNOHY flag is set) -- doesn't affect lookahead */
+		/* 0xad is an en dash on Linux? */
+		if ((fPara || sectheadid==SEEALSO || fNOHY) && p>buf && p[-1]=='-' && isspace(lookahead)) {
+			p--;	/* zap hyphen */
+			/* zap boldfaced hyphens, gr! */
+			while (p[-1]=='\b' && p[-2]=='-') p-=2;
+
+			/* start getting next line, spaces first ... */
+			while (lookahead && isspace(lookahead) && lookahead!='\n') { getchartab(); hy++; }
+
+			/* ... append next nonspace string to previous ... */
+			while (lookahead && !isspace(lookahead) && i++<MAXBUF) *p++=getchartab();
+
+			/* gobble following spaces (until, perhaps including, end of line) */
+			while (lookahead && isspace(lookahead) && lookahead!='\n') getchartab();
+			if (lookahead=='\n') { getchartab(); hy=0; }
+		}
+
+		*p='\0';
+		ret=(lookahead)?buf:NULL;
+	}
+
+	AbsLine++;
+	return ret;	/* change this to line length? (-1==old NULL) */
+}
+
+
+/*** Kong ***/
+/*
+  I hope the compiler has good common subexpression elimination
+     for all the pointer arithmetic.
+*/
+
+
+char phrase[MAXBUF];	/* first "phrase" (space of >=3 spaces) */
+int phraselen;
+
+static void
+filterline(char *buf, char *plain)
+{
+	char *p,*q,*r;
+	char *ph;
+	int iq;
+	int i,j;
+	int hl=-1, hl2=-1;
+	int iscnt=0;	/* interword space count */
+	int tagci;
+	int I0;
+	int etype;
+	int efirst;
+	enum tagtype tag = NOTAG;
+
+	assert(buf!=NULL && plain!=NULL);
+
+	etype=NOTAG;
+	efirst=-1;
+	tagci=tagc;
+	ph=phrase; phraselen=0;
+	scnt=scnt2=0;
+	s_sum=s_cnt=0;
+	bs_sum=bs_cnt=0;
+	ccnt=0;
+	spcsqz=0;
+
+	/* strip only certain \x1b's and only at very beginning of line */
+	for (p=buf; *p=='\x1b' && (p[1]=='8'||p[1]=='9'); p+=2)
+		/* nop */;
+
+	strcpy(plain,p);
+	q=&plain[strlen(p)];
+
+	/*** spaces and change bars ***/
+	for (scnt=0,p=plain; *p==' '; p++) scnt++;	/* initial space count */
+	if (scnt>200) scnt=130-(q-p);
+
+	assert(*q=='\0');
+	q--;
+	if (fChangeleft)
+		for (; q-40>plain && *q=='|'; q--)	{	/* change bars */
+			if (fChangeleft!=-1) ccnt++;
+			while (q-2>=plain && q[-1]=='\b' && q[-2]=='|') q-=2;	/* boldface changebars! */
+		}
+
+	/*if (q!=&plain[scnt-1])*/			/* zap trailing spaces */
+		for (; *q==' ' && q>plain; q--) /* nop */;
+
+	/* second changebar way out east! HACK HACK HACK */
+	if (q-plain>100 && *q=='|') {
+	  while (*q=='|' && q>plain) { q--; if (fChangeleft!=-1) ccnt++; }
+	  while ((*q==' ' || *q=='_' || *q=='-') && q>plain) q--;
+	}
+
+	for (r=q; (*r&0xff)==CHARDAGGER; r--) *r='-';	/* convert daggers at end of line to hyphens */
+
+	if (q-plain < scnt) scnt = q-plain+1;
+	q[1]='\0';
+
+	/* set I for tags below */
+	if (indent>=0 && scnt>=indent) scnt-=indent;
+	if (!fPara && !fIQS) {
+		if (fChangeleft) I+=(scnt>ccnt)?scnt:ccnt;
+		else I+=scnt;
+	}
+	I0=I;
+
+	/*** tags and filler spaces ***/
+
+	iq=0; falluc=1;
+	for (q=plain; *p; p++) {
+
+		iscnt=0;
+		if (*p==' ') {
+			for (r=p; *r==' '; r++) { iscnt++; spcsqz++; }
+			s_sum+=iscnt; s_cnt++;
+			if (iscnt>1 && !scnt2 && *p==' ') scnt2=iscnt;
+			if (iscnt>2) { bs_cnt++; bs_sum+=iscnt; }	/* keep track of large gaps */
+			iscnt--;		/* leave last space for tail portion of loop */
+
+			/* write out spaces */
+			if (fQS && iscnt<3) { p=r-1;	iscnt=0; } /* reduce strings of <3 spaces to 1 */
+			/* else if (fQS && iscnt>=3) { replace with tab? } */
+			else {
+				for (i=0; i<iscnt; i++) { p++; *q++=' '; }
+			}
+		} /* need to go through if chain for closing off annotations */
+
+		/** backspace-related filtering **/
+
+		if (*p=='\b' && p[1]=='_' && q>plain && q[-1]=='+') {
+			/* bold plus/minus(!) */
+			q[-1]=c_plusminus;
+			while (*p=='\b' && p[1]=='_') p+=2;
+			continue;
+		} else if ((*p=='_' && p[1]=='\b' && p[2]!='_' && p[3]!='\b')
+			|| (*p=='\b' && p[1]=='_')) {
+			/* italics */
+			if (tag!=ITALICS && hl>=0) { tagadd(tag, hl, I+iq); hl=-1; }
+			if (hl==-1) hl=I+iq;
+			tag=ITALICS;
+			p+=2;
+		} else if (*p=='_' && p[2]==p[4] && p[1]=='\b' && p[3]=='\b' && p[2]!='_') {
+			/* bold italics (for Solaris) */
+			for (p+=2; *p==p[2] && p[1]=='\b';) p+=2;
+			if (tag!=BOLDITALICS && hl>=0) { tagadd(tag, hl, I+iq); hl=-1; }
+			if (hl==-1) hl=I+iq;
+			tag=BOLDITALICS;
+		} else if (*p==p[2] && p[1]=='\b') {
+			/* boldface */
+			while (*p==p[2] && p[1]=='\b') p+=2;
+			if (tag!=BOLD && hl>=0) { tagadd(tag, hl, I+iq); hl=-1; }
+			if (hl==-1) hl=I+iq;
+			tag=BOLD;
+		} else if (p[1]=='\b' &&
+				 ((*p=='o' && p[2]=='+') ||
+				  (*p=='+' && p[2]=='o')) ) {
+			/* bullets */
+			p+=2;
+			while (p[1]=='\b' && (*p=='o' || p[2]=='+') ) p+=2;		/* bold bullets(!) */
+			*q++=c_bullet; iq++;
+			continue;
+		} else if (*p=='\b' && p>plain && p[-1]=='o' && p[1]=='+') {
+			/* OSF bullets */
+			while (*p=='\b' && p[1]=='+') p+=2;	/* bold bullets(!) */
+			q[-1]=c_bullet; p--;
+			continue;
+		} else if (p[1]=='\b' && *p=='+' && p[2]=='_') {
+			/* plus/minus */
+			p+=2;
+			*q++=c_plusminus; iq++;
+			continue;
+		} else if (p[1]=='\b' && *p=='|' && p[2]=='-') {
+			/* dagger */
+			*q++=c_dagger; iq++;
+			p+=2; continue;
+		} else if (*p=='\b') {
+			/* supress unattended backspaces */
+			continue;
+		} else if (*p=='\x1b' /*&& (p[1]=='9'||p[1]=='8')*/) {
+			p++;
+			if (*p=='[') {
+				p++;
+				if (*p=='1' && hl==-1) {
+					/* stash attributes in "invalid" array element */
+					efirst=I+iq; etype=BOLD;
+					/*hl=I+iq; tag=BOLD; -- faces immediate end of range */
+				} else if (*p=='0' /*&& hl>=0 && hl2==-1 && tags[MAXTAGS].first<I+iq*/) {
+					/* doesn't catch tag if spans line -- just make tag and hl static? */
+					/*tagadd(tags[MAXTAGS].type, tags[MAXTAGS].first, I+iq);*/
+					if (hl==-1 && hl2==-1 && efirst!=-1/*<I+iq*/)
+						tagadd(etype, efirst, I+iq);
+					efirst=-1;
+				} /* else skip unrecognized escape codes like 8/9 */
+			}
+			p+=2;	/* gobble 0/1 and mysterious following 'm' */
+			/* following 'm' (why?) gobbled in overarching for */
+			/*continue;*/
+		} else if ((isupper(*p) /*|| *p=='_' || *p=='&'*/) &&
+				 (hl>=0 || isupper(p[1]) || (p[1]=='_' && p[2]!='\b') || p[1]=='&')) {
+			if (hl==-1 && efirst==-1) { hl=I+iq; tag=SMALLCAPS; }
+		} else {
+			/* end of tag, one way or another */
+			/* collect tags in this pass, interspersed later if need be */
+			/* can't handle overlapping tags */
+			if (hl>=0) {
+				if (hl2==-1) tagadd(tag, hl, I+iq);
+				hl=-1;
+			}
+		}
+
+		/** non-backspace related filtering **/
+		/* case statement here in place of if chain? */
+/* Tk 3.x's text widget tabs too crazy
+		if (*p==' ' && strncmp("     ",p,5)==0) {
+			xputchar('\t'); i+=5-1; ci++; continue;
+		} else
+*/
+/* copyright symbol: too much work for so little
+		if (p[i]=='o' && (strncmp("opyright (C) 19",&p[i],15)==0
+				    || strncmp("opyright (c) 19",&p[i],15)==0)) {
+			printf("opyright \xd3 19");
+			tagadd(SYMBOL, ci+9, ci+10);
+			i+=15-1; ci+=13; continue;
+		} else
+*/
+		if (*p=='(' && q>plain && (isalnum(q[-1])||strchr(manvalid/*"._-+"*/,q[-1])!=NULL)
+		    && strcoloncmp(&p[1],')',vollist)
+		    /* && p[1]!='s' && p[-1]!='`' && p[-1]!='\'' && p[-1]!='"'*/ ) {
+			hl2=I+iq;
+			for (r=q-1; r>=plain && (isalnum(*r)||strchr(manvalid/*"._-+:"*/,*r)!=NULL); r--)
+				hl2--;
+			/* else ref to a function? */
+			/* maybe save position of opening paren so don't highlight it later */
+		} else if (*p==')' && hl2!=-1) {
+			/* don't overlap tags on man page referenes */
+			while (tagc>0 && tags[tagc-1].last>hl2) tagc--;
+			tagadd(MANREF, hl2, I+iq+1);
+			hl2=hl=-1;
+		} else if (hl2!=-1) {
+			/* section names are alphanumic or '+' for C++ */
+			if (!isalnum(*p) && *p!='+') hl2=-1;
+		}
+
+
+		/*assert(*p!='\0');*/
+		if (!*p) break;	/* not just safety check -- check out sgmls.1 */
+
+		*q++=*p;
+/*		falluc = falluc && (isupper(*p) || isspace(*p) || isdigit(*p) || strchr("-+&_'/()?!.,;",*p)!=NULL);*/
+		falluc = falluc && !islower(*p);
+		if (!scnt2) { *ph++=*p; phraselen++; }
+		iq+=iscnt+1;
+	}
+	if (hl>=0) tagadd(tag, hl, I+iq);
+	else if (efirst>=0) tagadd(etype, efirst, I+iq);
+	*q=*ph='\0';
+	linelen=iq+ccnt;
+
+
+	/* special case for Solaris:
+	   if line has ONLY <CODE> tags AND they SPAN line, convert to one tag */
+	fCodeline=0;
+	if (tagc && tags[0].first==0 && tags[tagc-1].last==linelen) {
+		fCodeline=1;
+		j=0;
+		/* invariant: at start of a tag */
+		for (i=0; fCodeline && i<tagc; i++) {
+			if (tags[i].type!=BOLDITALICS /*&& tags[i].type!=BOLD*/) fCodeline=0;
+			else if ((j=tags[i].last)<linelen) {
+			  for (; j < tags[i+1].first ; j++)
+			  	if (!isspace(plain[j])) { fCodeline=0; break; }
+			}
+		}
+	}
+
+
+	/* verify tag lists -- in production, compiler should kill with dead code elimination */
+	for (i=tagci; i<tagc; i++) {
+		/* verify valid ranges */
+		assert(tags[i].type>NOTAG && tags[i].type<=MANREF);
+		assert(tags[i].first>=I0 && tags[i].last<=linelen+I0);
+		assert(tags[i].first<=tags[i].last);
+
+		/* verify for no overlap with other tags */
+		for (j=i+1; j<tagc; j++) {
+			assert(tags[i].last<=tags[j].first /*|| tags[i].first>=tags[j].last*/);
+		}
+	}
+}
+
+
+/*
+  buf[] == input text (read only)
+  plain[] == output (initial, trailing spaces stripped; tabs=>spaces;
+     underlines, overstrikes => tag array; spaces squeezed, if requested)
+  ccnt = count of changebars
+  scnt = count of initial spaces
+  linelen = length result in plain[]
+*/
+
+/*#define MAXINDENT 15*/
+/*#define HEADFOOTMATCH 20*/
+
+int fHead=0;
+int fFoot=0;
+
+static void
+preformatted_filter(void)
+{
+	const int MINRM=50;		/* minimum column for right margin */
+	const int MINMID=20;
+	const int HEADFOOTSKIP=20;
+	const int HEADFOOTMAX=25;
+	int curtag;
+	char *p,*r;
+	char head[MAXBUF]="";		/* first "word" */
+	char foot[MAXBUF]="";
+	int header_m=0, footer_m=0;
+	int headlen=0, footlen=0;
+/*	int line=1-1; */
+	int i,j,k,l,off;
+	int sect=0,subsect=0,bulpair=0,osubsect=0;
+	int title=1;
+	int oscnt=-1;
+	int empty=0,oempty;
+	int fcont=0;
+	int Pnew=0,I0;
+	float s_avg=0.0;
+	int spaceout;
+	int skiplines=0;
+	int c;
+
+	/* try to keep tabeginend[][] in parallel with enum tagtype */
+	assert(tagbeginend[ITALICS][0]==BEGINITALICS);
+	assert(tagbeginend[MANREF][1]==ENDMANREF);
+	in++;	/* lookahead = current character, in points to following */
+
+	/*	for (i=0; i<MAXBUF; i++) tabgram[i]=0;*/
+
+	/*if (fMan) */indent=-1;
+	I=1;
+	CurLine=1;
+	(*fn)(BEGINDOC); I0=I;
+
+	/* run through each line */
+	while (la_gets(buf)!=NULL) {
+		if (title) I=I0;
+		/* strip out Ousterhout box: it's confusing the section line counts in TkMan outlining */
+		if (fNORM && *buf=='_'
+		    && strncmp(buf,"_________________________________________________________________",65)==0) {
+			fTclTk = 1;
+			if (fChangeleft==0) fChangeleft=1;
+			skiplines = 2;
+		}
+		if (skiplines) { skiplines--; AbsLine++; continue; }
+		filterline(buf,plain);	/* ALL LINES ARE FILTERED */
+
+#if 0
+		/* dealing with tables in formatted pages is hopeless */
+		finTable = fTable &&
+			((!ncnt && fotable) ||
+			(ncnt && bs_cnt>=2 && bs_cnt<=5 && ((float) bs_sum / (float) bs_cnt)>3.0));
+		if (finTable) {
+			if (!fotable) (*fn)(BEGINTABLE);
+		} else if (fotable) {
+			(*fn)(ENDTABLE);
+			I=I0; tagc=0; filterline(buf,plain);	/* rescan first line out of table */
+		}
+#endif
+
+		s_avg=(float) s_sum;
+		if (s_cnt>=2) {
+			/* don't count large second space gap */
+			if (scnt2) s_avg= (float) (s_sum - scnt2) / (float) (s_cnt-1);
+			else s_avg= (float) (s_sum) / (float) (s_cnt);
+		}
+
+		p=plain;	/* points to current character in plain */
+
+		/*** determine header and global indentation ***/
+		if (/*fMan && (*/!fHead || indent==-1/*)*/) {
+			if (!linelen) continue;
+			if (!*header) {
+				/* check for missing first header--but this doesn't catch subsequent pages */
+				if (stricmp(p,"NAME")==0 || stricmp(p,"NOMBRE")==0) {	/* works because line already filtered */
+					indent=scnt; /*filterline(buf,plain);*/ scnt=0; I=I0; fHead=1;
+				} else {
+					fHead=1;
+					(*fn)(BEGINHEADER);
+					/* grab header and its first word */
+					strcpy(header,p);
+					if ((header_m=HEADFOOTSKIP)>linelen) header_m=0;
+					strcpy(head,phrase); headlen=phraselen;
+					la_gets(buf); filterline(buf,plain);
+					if (linelen) {
+						strcpy(header2,plain);
+						if (strincmp(plain,"Digital",7)==0 || strincmp(plain,"OSF",3)==0) {
+							fFoot=1;
+							fSubsections=0;
+						}
+					}
+					(*fn)(ENDHEADER); tagc=0;
+					continue;
+				}
+			} else {
+				/* some idiot pages have a *third* header line, possibly after a null line */
+				if (*header && scnt>MINMID) { strcpy(header3,p); ncnt=0; continue; }
+				/* indent of first line ("NAME") after header sets global indent */
+				/* check '<' for Plan 9(?) */
+				if (*p!='<') {
+					indent=scnt; I=I0; scnt=0;
+				} else continue;
+			}
+/*			if (indent==-1) continue;*/
+		}
+		if (!lindent && scnt) lindent=scnt;
+/*printf("lindent = %d, scnt=%d\n",lindent,scnt);*/
+
+
+		/**** for each ordinary line... *****/
+
+		/*** skip over global indentation */
+		oempty=empty; empty=(linelen==0);
+		if (empty) {ncnt++; continue;}
+
+		/*** strip out per-page titles ***/
+
+		if (/*fMan && (*/scnt==0 || scnt>MINMID/*)*/) {
+/*printf("***ncnt = %d, fFoot = %d, line = %d***", ncnt,fFoot,AbsLine);*/
+			if (!fFoot && !isspace(*p) && (scnt>5 || (*p!='-' && *p!='_')) &&
+			    /* don't add ncnt -- AbsLine gets absolute line number */
+			    (((ncnt>=2 && AbsLine/*+ncnt*/>=61/*was 58*/ && AbsLine/*+ncnt*/<70)
+				 || (ncnt>=4 && AbsLine/*+ncnt*/>=59 && AbsLine/*+ncnt*/<74)
+				 || (ncnt && AbsLine/*+ncnt*/>=61 && AbsLine/*+ncnt*/<=66))
+				 && (/*lookahead!=' ' ||*/ (s_cnt>=1 && s_avg>1.1) || !falluc) )
+			    ) {
+				(*fn)(BEGINFOOTER);
+				/* grab footer and its first word */
+				strcpy(footer,p);
+/*				if ((footer_m=linelen-HEADFOOTSKIP)<0) footer_m=0;*/
+				if ((footer_m=HEADFOOTSKIP)>linelen) footer_m=0;
+				/*grabphrase(p);*/ strcpy(foot,phrase); footlen=phraselen;
+				/* permit variations at end, as for SGI "Page N", but keep minimum length */
+				if (footlen>3) footlen--;
+				la_gets(buf); filterline(buf,plain); if (linelen) strcpy(footer2,plain);
+				title=1;
+				(*fn)(ENDFOOTER); tagc=0;
+
+				/* if no header on first page, try again after first footer */
+				if (!fFoot && *header=='\0') fHead=0;	/* this is dangerous */
+				fFoot=1;
+				continue;
+			} else
+				/* a lot of work, but only for a few lines (about 4%) */
+				if (fFoot && (scnt==0 || scnt+indent>MINMID) &&
+					 (   (headlen && strncmp(head,p,headlen)==0)
+					  || strcmp(header2,p)==0 || strcmp(header3,p)==0
+					  || (footlen && strncmp(foot,p,footlen)==0)
+					  || strcmp(footer2,p)==0
+					  /* try to recognize lines with dates and page numbers */
+					  /* skip into line */
+					  || (header_m && header_m<linelen &&
+						 strncmp(&header[header_m],&p[header_m],HEADFOOTMAX)==0)
+					  || (footer_m && footer_m<linelen &&
+						 strncmp(&footer[footer_m],&p[footer_m],HEADFOOTMAX)==0)
+					  /* skip into line allowing for off-by-one */
+					  || (header_m && header_m<linelen &&
+						 strncmp(&header[header_m],&p[header_m+1],HEADFOOTMAX)==0)
+					  || (footer_m && footer_m<linelen &&
+						 strncmp(&footer[footer_m],&p[footer_m+1],HEADFOOTMAX)==0)
+					  /* or two */
+					  || (header_m && header_m<linelen &&
+						 strncmp(&header[header_m],&p[header_m+2],HEADFOOTMAX)==0)
+					  || (footer_m && footer_m<linelen &&
+						 strncmp(&footer[footer_m],&p[footer_m+2],HEADFOOTMAX)==0)
+					  /* or with reflected odd and even pages */
+					  || (headlen && headlen<linelen &&
+						 strncmp(head,&p[linelen-headlen],headlen)==0)
+					  || (footlen && footlen<linelen &&
+						 strncmp(foot,&p[linelen-footlen],footlen)==0)
+					  )) {
+				tagc=0; title=1; continue;
+			}
+
+			/* page numbers at end of line */
+			for(i=0; p[i] && isdigit(p[i]); i++)
+				/* empty */;
+			if (&p[i]!=plain && !p[i]) {title=1; fFoot=1; continue;}
+		}
+
+		/*** interline spacing ***/
+		/* multiple \n: paragraph mode=>new paragraph, line mode=>blank lines */
+		/* need to chop up lines for Roff */
+
+		/*tabgram[scnt]++;*/
+		if (title) ncnt=(scnt!=oscnt || (/*scnt<4 &&*/ isupper(*p)));
+		itabcnt = scnt/5;
+		if (CurLine==1) {ncnt=0; tagc=0;} /* gobble all newlines before first text line */
+		sect = (scnt==0 && isupper(*p));
+		subsect = (fSubsections && (scnt==2||scnt==3));
+		if ((sect || subsect) && ncnt>1) ncnt=1; /* single blank line between sections */
+		(*fn)(BEGINLINE);
+		if (/*fPara &&*/ ncnt) Pnew=1;
+		title=0; /*ncnt=0;--moved down*/
+		/*if (finTable) (*fn)(BEGINTABLELINE);*/
+		oscnt=scnt; /*fotable=finTable;*/
+
+/* let output modules decide what to do at the start of a paragraph
+		if (fPara && !Pnew && (prevcmd==BEGINBODY || prevcmd==BEGINBULTXT)) {
+			putchar(' '); I++;
+		}
+*/
+
+		/*** identify structural sections and notify fn */
+
+		/*if (fMan) {*/
+/*			bulpair = (scnt<7 && (*p==c_bullet || *p=='-'));*/
+			/* decode the below */
+			bulpair = ((!auxindent || scnt!=lindent+auxindent) /*!bulpair*/
+					 && ((scnt>=2 && scnt2>5) || scnt>=5 || (tagc>0 && tags[0].first==scnt) ) /* scnt>=2?? */
+					 && (((*p==c_bullet || strchr("-+.",*p)!=NULL || falluc) && (ncnt || scnt2>4)) || 
+					  (scnt2-s_avg>=2 && phrase[phraselen-1]!='.') ||
+					  (scnt2>3 && s_cnt==1)
+					  ));
+			if (bulpair) {
+				if (tagc>0 && tags[0].first==scnt) {
+					k=tags[0].last;
+					for (l=1; l<tagc; l++) {
+						if (tags[l].first - k <=3)
+							k=tags[l].last;
+						else break;
+					}
+					phraselen=k-scnt;
+					for (k=phraselen; plain[k]==' ' && k<linelen; k++) /* nothing */;
+					if (k>=5 && k<linelen) hanging=k; else hanging=-1;
+				} else if (scnt2) hanging=phraselen+scnt2;
+				else hanging=5;
+			} else hanging=0;
+
+/*			hanging = bulpair? phraselen+scnt2 : 0;*/
+/*if (bulpair) printf("hanging = %d\n",hanging);*/
+			/* maybe, bulpair=0 would be best */
+			/*end fMan}*/
+
+		/* certain sections (subsections too?) special, like SEE ALSO */
+		/* to make canonical name as plain, all lowercase */
+		if (sect /*||subsect -- no widespread subsection names*/) {
+		  for (j=0; (sectheadid=j)<RANDOM; j++) if (strcoloncmp2(plain,'\0',sectheadname[j],0)) break;
+		}
+
+		/* normalized section headers are put into mixed case */
+		if (/*fNORM &&*/falluc && (sect || subsect)) casify(plain);
+
+		if (sect) {
+			poppush(BEGINSECTION); (*fn)(BEGINSECTHEAD);
+			tocadd(plain, BEGINSECTION, CurLine);
+		} else if (subsect && !osubsect) {
+			poppush(BEGINSUBSECTION); (*fn)(BEGINSUBSECTHEAD);
+			tocadd(plain, BEGINSUBSECTION, CurLine);
+		} else if (bulpair) {
+			/* used to be just poppush(BEGINBULPAIR); */
+			if (!Pbp) poppush(BEGINBULPAIR);
+			(poppush)(BEGINBULLET);
+			fIP=1; /*grabphrase(plain);*/
+		} else if (Pnew) {
+			poppush(BEGINBODY);
+		}
+		Pnew=0;
+		oldsectheadid = sectheadid;
+
+
+		/* move change bars to left */
+		if (fChangeleft && !fNORM) {
+			if (fPara) (*fn)(CHANGEBAR);
+			/* replace initial spaces with changebars */
+			else for (i=0; i<ccnt; i++) { /*xputchar('|'); */ (*fn)(CHANGEBAR); }
+		}
+
+		/* show initial spaces */
+		if (!fIQS && fcharout) {
+			spaceout = (scnt>ccnt)?(scnt-ccnt):0;
+			if (fILQS) { if (spaceout>=lindent) spaceout-=lindent; else spaceout=0; }
+			if (auxindent) { if (spaceout>=auxindent) spaceout-=auxindent; else spaceout=0; }
+			if (fNORM) {
+			  	if (itabcnt>0) (*fn)(ITAB);
+				for (i=0; i<(scnt%5); i++) putchar(' ');
+			} else printf("%*s",spaceout,"");
+		}
+
+
+		/*** iterate over each character in line, ***/
+		/*** handling underlining, tabbing, copyrights ***/
+
+		off=(!fIQS&&!fPara)?scnt:0;
+		for (i=0, p=plain, curtag=0, fcont=0; *p; p++,i++,fcont=0) {
+			/* interspersed presentation signals */
+			/* start tags in reverse order of addition (so structural first) */
+			if (curtag<tagc && i+I0+off==tags[curtag].first) {
+				for (r=hitxt, j=tags[curtag].last-tags[curtag].first, hitxt[j]='\0'; j; j--)
+					hitxt[j-1]=p[j-1];
+				(*fn)(tagbeginend[tags[curtag].type][0]);
+			}
+
+			/* special characters */
+			switch(*p) {
+			   case '"':
+				if (p==plain || isspace(p[-1])) { (*fn)(CHARLQUOTE); fcont=1; }
+				else if (isspace(p[1])) { (*fn)(CHARRQUOTE); fcont=1; }
+				break;
+			   case '\'':
+				if (p==plain || isspace(p[-1])) { (*fn)(CHARLSQUOTE); fcont=1; }
+				else if (isspace(p[1])) { (*fn)(CHARRSQUOTE); fcont=1; }
+				break;
+			   case '-':
+				/* check for -opt => \-opt */
+				if (p==plain || (isspace(p[-1]) && !isspace(p[1]))) {
+				  (*fn)(CHARDASH); fcont=1;
+				}
+				break;
+			}
+
+			/* troublemaker characters */
+			c = (*p)&0xff;
+			if (!fcont && fcharout) {
+				if (strchr(escchars,c)!=NULL) {
+					putchar('\\'); putchar(c); I++;
+				} else if (strchr((char *)trouble,c)!=NULL) {
+					(*fn)(c); fcont=1;
+				} else {
+					putchar(c); I++;
+				}
+			}
+
+/*default:*/
+			if (curtag<tagc && i+I0+off+1==tags[curtag].last) {
+				(*fn)(tagbeginend[tags[curtag].type][1]);
+				curtag++;
+			}
+
+			if (fIP && ((*p==' ' && i==phraselen) || *p=='\0')) {
+				p++;  /* needed but why? */
+				(*fn)(ENDBULLET); fIP=0;
+				if (*p!='\0') {
+					/*oscnt+=phraselen;*/
+					oscnt+=i;
+					for (r=p; *r==' '; r++) {
+						oscnt++;
+/*
+						i++;
+						if (fQS || !fcharout) p++;
+*/
+					}
+				}
+				p--;	/* to counteract increment in loop */
+
+				poppush(BEGINBULTXT);
+			}
+		}
+
+
+		/*** end of line in buf[] ***/
+		/*** deal with section titles, hyperlinks ***/
+
+		if (sect) { (*fn)(ENDSECTHEAD); Pnew=1; }
+		else if (subsect) { (*fn)(ENDSUBSECTHEAD); Pnew=1; }
+		else if (fIP) { (*fn)(ENDBULLET); fIP=0; poppush(BEGINBULTXT); }
+/* oscnt not right here */
+		else if (scnt+linelen+spcsqz<MINRM /*&& ncnt*/ && lookahead!='\n'
+			    && prevcmd!=BEGINBULTXT && prevcmd!=ENDSUBSECTHEAD && prevcmd!=ENDSUBSECTHEAD)
+			(*fn)(SHORTLINE);
+		osubsect=subsect;
+
+		/*if (finTable) (*fn)(ENDTABLELINE);*/
+		/*if (!fPara)*/ (*fn)(ENDLINE); tagc=0;
+		ncnt=0;
+		I0=I;	/* save I here in case skipping lines screws it up */
+	}
+
+	/* wrap up at end */
+	pop(ENDDOC);	/* clear up all tags on stack */
+	(*fn)(ENDDOC);
+}
+
+
+
+/*
+ * SOURCE CODE PARSING
+ *    for better transcription short of full nroff interpreter
+ *
+ *    Macros derived empirically, except for weird register ones that were looked up in groff
+ *
+ * to do
+ *   X fix up output modules to be aware of Source: they need to do own formatting (Tk, ASCII, ...)
+ *	X profile if's and reorder, or centralized id (fast enough already?),
+ *   X how to format tables for Tk?
+ *   + coalese lists, distinguish DL vs OL vs UL,
+ *   + recognize more table ops (differences across flavors)
+ *   make lines with tabs into tables (tabs make no sense to HTML)
+ *
+ * buffer usage
+ *    buf = incoming text from man page file
+ *    plain = "second pass" buffer used to identify man page references
+ *
+ * test pages
+ *    Solaris: fdisk.1m, fcntl.2, curs_getwch.3x, locale.5 (numbered lists),
+ *		getservbyname.3n (font size changes)
+ */
+
+/* macros */
+/* put as much in here, as opposed to in code, as possible.
+   less expensive and here they can be overridden by other macros */
+/*const int macromax=100; -- dumb compiler */
+#define MACROMAX 1000
+struct { char *key; char *subst; } macro[MACROMAX] = {
+  /* Solaris */
+  {"NA", ".SH NAME"},
+  {"SB", "\\s-2\\fB\\$1\\fR\\s0"},
+  /* HP-UX */
+#if 0
+  {"SM", "\\s-2\\$1\\s0"},
+  {"C", "\\f3\\$1\\fR"},
+  {"CR", "\\f3\\$1\\fR\\$2"},
+  {"CI", "\\f3\\$1\\fI\\$2\\fR"},
+  {"RC", "\\fR\\$1\\f3\\$2\\fR"},
+#endif
+  /* SGI -- doesn't ship man page source */
+
+  /* 4.4BSD  -  http://intergate.sonyinteractive.com/cgi-bin/manlink/7/mdoc */
+  /* scads more, but for them definition in -mandoc is sufficient */
+#if 0
+  {"Dt", ".TH \\$1 \\$2 \\$3"},
+  {"Sh", ".SH \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9"},
+  {"Ss", ".SS \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9"},
+  {"Pp", ".P"},
+  {"Nm", ".BR \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9"},	/* name */
+  {"Ar", ".IR \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9"},
+#endif
+  { NULL, NULL }
+};
+/* what all can be represented as a macro? */
+int macrocnt=-1;	/* length of table counted at start */
+
+char *macnotfound[MACROMAX];
+int macnotcnt=0;
+
+#define SUBSTMAX 1000
+/* "*" or "*(" prefixed */
+struct { char *key; char *subst; } subst[SUBSTMAX] = {
+  {"rq", "'"}, {"lq", "`"}, {"L\"", "``"}, {"R\"", "''"},
+  {"L", "\\f3"}, {"E", "\\f2"}, {"V", "\\f4"}, {"O", "\\f1"}
+};
+int substcnt=8;
+
+#define REGISTERMAX 1000
+struct { char *name; char *value; } reg[REGISTERMAX];
+int regcnt=0;
+
+/* special characters */
+const struct { char key[4]; unsigned char subst[4]; } spec[] = {
+  { "**", "*" },
+  { "+-", { CHARPLUSMINUS, '\0' }},
+  { "12", { CHAR12, '\0' }},
+  { "14", { CHAR14, '\0' }},
+  { "34", { CHAR34, '\0' }},
+  { "aa", { CHARACUTE, '\0' }},
+  { "ap", "~" },
+  { "br", "|" },
+  { "bu", { CHARBULLET, '\0' }},
+  { "bv", "|" },
+  { "ci", "O" },
+  { "co", { CHARCOPYR, '\0' }},
+  { "ct", { CHARCENT, '\0' }},
+  { "de", { CHARDEG, '\0' }},
+  { "dg", { CHARDAGGER, '\0' }},
+  { "di", { CHARDIV, '\0' }},
+  { "em", "--" },
+  { "eq", "=" },
+  { "hy", "-" },
+  { "mi", "-" },
+  { "mu", { CHARMUL, '\0' }},
+  { "no", { CHARNOT, '\0' }},
+  { "or", "|" },
+  { "pl", "+" },
+  { "rg", { CHARREGTM, '\0' }},
+  { "ru", "_" },
+  { "sc", { CHARSECT, '\0' }},
+  { "sl", "/" },
+  { "ua", "^" },
+  { "ul", "_" }
+};
+#define speccnt (sizeof spec / sizeof spec[0])
+ 
+/* tbl line descriptions */
+char *tbl[20][20];	/* space enough for twenty description lines, twenty parts each */
+int tblc=0;
+int tbli;
+
+int fsourceTab = 0, fosourceTab=0;
+int supresseol=0;
+int finitDoc=0;
+int finlist=0;
+int sublevel=0;
+
+static char *
+source_gets(void)
+{
+  char *p,*q;
+  char *ret = (*in)?buf:NULL;
+  int i;
+  char *begin;
+  char tmpbuf[MAXBUF];
+  char name[3];
+
+  if (!sublevel) AbsLine++;
+
+  p = tmpbuf;
+  falluc = 1;
+  while (1) {
+    /* collect characters in line */
+    while (*in && *in!='\n') {
+	 if (p[0]=='\\' && p[1]=='\n') p+=2;	/* \<newline> */
+	 falluc = falluc && !islower(*in);
+	 *p++ = *in++;
+    }
+    if (*in) in++;
+    *p='\0';
+
+    /* normalize commands */
+    p=tmpbuf; q=buf;	/* copy from tmpbuf to buf */
+    /* no spaces between command-initiating period and command letters */
+    if (*p=='\'') { *p='.'; }	/* what's the difference? */
+    if (*p=='.') { *q++ = *p++; while (isspace(*p)) p++; }
+
+
+    /* convert lines with tabs to tables? */
+    fsourceTab=0;
+
+    /* if comment at start of line, OK */
+    /* dynamically determine iff Tcl/Tk page by scanning comments */
+    begin = p;
+    if (*p=='\\' && *(p+1)=='"') {
+	if (!fTclTk && strstr(p+1,"supplemental macros used in Tcl/Tk")!=NULL) fTclTk=1;
+	if (fTclTk)
+	    p+=2;
+    }
+
+    while (*p) {
+	 if (*p=='\t') fsourceTab++;
+	 if (*p=='\\') {
+	   p++;
+	   if (*p=='n') {
+		p++;
+		if (*p=='(') {
+		  p++; name[0]=*p++; name[1]=*p++; name[2]='\0';
+		} else {
+		  name[0]=*p++; name[1]='\0';
+		}
+		*q='0'; *(q+1)='\0';	/* defaults to 0, in case doesn't exist */
+		for (i=0; i<regcnt; i++) {
+		  if (strcmp(reg[i].name,name)==0) {
+		    strcpy(q, reg[i].value);
+		    break;
+		  }
+		}
+		q+=strlen(q);
+	   } else if (*p=='"' && (p != begin+1)) {	/* comment in Digital UNIX, OK elsewhere? */
+		*p='\0';
+		q--; while (q>buf && isspace(*q)) q--;	/* trim tailing whitespace */
+		q++; *q='\0';
+	   } else {
+		/* verbatim character (often a backslash) */
+		*q++ = '\\';	/* postpone interpretation (not the right thing but...) */
+		*q++ = *p++;
+	   }
+	 } else *q++ = *p++;
+    }
+
+    /* dumb Digital--later */
+    /*if (q-3>plain && q[-1]=='{' && q[-2]=='\\' && q[-3]==' ') q[-3]='\n'; }*/
+
+    /* close off buf */
+    *q='\0';
+
+#if 0
+    if (q>buf && q[-1]=='\\' && *in=='.') /* append next line * / else break;*/
+#endif
+    break;
+  }
+
+  /*printf("*ret = |%s|\n", ret!=NULL?ret : "NULL");*/
+  return ret;
+}
+
+
+/* dump characters from buffer, signalling right tags along the way */
+/* all this work to introduce an internal second pass to recognize man page references */
+/* now for HTTP references too */
+
+int sI=0;
+/* use int linelen from up top */
+int fFlush=1;
+
+static void
+source_flush(void)
+{
+  int i,j;
+  char *p,*q,*r;
+  int c;
+  int manoff,posn;
+
+  if (!sI) return;
+  plain[sI] = '\0';
+
+  /* flush called often enough that all man page references are at end of text to be flushed */
+  /* find man page ref */
+  if (sI>=4/*+1*/ && (plain[sI-(manoff=1)-1]==')' || plain[sI-(manoff=0)-1]==')')) {
+    for (q=&plain[sI-manoff-1-1]; q>plain && isalnum(*q) && *q!='('; q--) /* nada */;
+    if (*q=='(' && strcoloncmp(&q[1],')',vollist)) {
+	 r=q-1;
+	 if (*r==' ' && (sectheadid==SEEALSO || /*single letter volume */ *(q+2)==')' || *(q+3)==')')) r--;	/* permitted single intervening space */
+	 for ( ; r>=plain && (isalnum(*r) || strchr(manvalid,*r)!=NULL); r--) /* nada */;
+	 r++;
+	 if (isalpha(*r) && r<q) {
+	   /* got one: clear out tags and spaces to make normalized form */
+	   posn = r-plain;
+	   /*while (tagc && tags[tagc-1].first >= posn) tagc--;*/
+
+	   /* add MANREF tags */
+	   strcpy(hitxt,r);
+	   tagadd(BEGINMANREF, posn, 0);
+	   tagadd(ENDMANREF, sI-manoff-1+1, 0);
+	 }
+    }
+
+  /* HTML hyperlinks */
+  } else if (fURL && sI>=4 && (p=strstr(plain,"http"))!=NULL) {
+    i = p-plain;
+    tagadd(BEGINMANREF, i, 0);
+    for (j=0; i<sI && !isspace(*p) && *p!='"' && *p!='>'; i++,j++) hitxt[j] = *p++;
+    hitxt[j]='\0';
+    tagadd(ENDMANREF, i, 0);
+  }
+
+  if (!fFlush) return;
+
+  /* output text */
+  for (i=0,j=0,p=plain; i<sI && *p; i++,p++) {
+    if (!linelen) (*fn)(BEGINLINE);	/* issue BEGINLINE when know will be chars on line */
+
+    /* dump tags */
+    /*for ( ; j<tagc && tags[j].first == i; j++) (*fn)(tags[j].type);*/
+    for (j=0 ; j<tagc; j++) if (tags[j].first == i) (*fn)((enum command)tags[j].type);
+
+    /* dump text */
+    c = (*p)&0xff;	/* just make c unsigned? */
+    if (strchr(escchars,c)!=NULL) {
+	 xputchar('\\'); xputchar(c);
+	 if (fcharout) linelen++;
+    } else if (strchr((char *)trouble,c)!=NULL) {
+	 (*fn)(c);
+    } else if (linelen>=LINEBREAK && c==' ') { (*fn)(ENDLINE); linelen=0;
+    } else {		/* normal character */
+	 xputchar(c);
+	 if (fcharout) linelen++;
+    }
+
+    /*if (linelen>=LINEBREAK && c==' ') { (*fn)(ENDLINE); linelen=0; } -- leaves space at end of line*/
+  }
+  /* dump tags at end */
+  /*for ( ; j<tagc && tags[j].first == sI; j++) (*fn)(tags[j].type);*/
+    for (j=0 ; j<tagc; j++) if (tags[j].first==sI) (*fn)((enum command)tags[j].type);
+
+  sI=0; tagc=0;
+}
+
+
+/* source_out stuffs characters in a buffer */
+static char *
+source_out0(const char *pin, char end)
+{
+  /* stack of character formattings */
+  static enum tagtype styles[20];
+  static int style=-1;
+  int funwind=0;
+  int i, j;
+  int len;
+  int sign;
+  char *p, *pstart;
+
+  pstart = p = mystrdup(pin);
+  while (*p && *p!=end) {
+    if (*p=='\\') {	/* escape character */
+	 switch (*++p) {
+ 
+ 	 case '&':	/* no space.  used as a no-op sometimes */
+ 	 case '^':	/* 1/12 em space */
+ 	 case '|':      /* 1/6 em space */
+ 	 case '%':      /* hyphenation indicator */
+ 	   /* just ignore it */
+ 	   p++;
+ 	   break;
+ 	 case '0':	/* digit width space */
+ 	   p++;
+ 	   sputchar(' ');
+ 	   break;
+ 	 case ' ':	/* unpaddable space */
+ 	   stagadd(CHARNBSP);	/* nonbreaking space */
+ 	   /*sputchar(' ');*/
+ 	   p++;
+ 	   break;
+ 	 case 's':	/* font size change */
+	   p++;
+	   sign=1;
+	   if (*p=='-' || *p=='+') if (*p++=='-') sign=-1;
+	   intArg = sign * ((*p++)-'0');
+	   if (intArg==0) intArg = -fontdelta;	/* s0 returns to normal height */
+	   if (fontdelta || intArg) { source_flush(); (*fn)(FONTSIZE); }
+	   break;
+ 	 case 'v':	/* vertical motion */
+ 	 case 'h':	/* horizontal motion */
+ 	 case 'L':	/* vertical line */
+ 	 case 'l':	/* horizontal line */
+	   /* ignore */
+	   p++;
+	   if (*p=='\'') { p++; while (*p++!='\''); }
+	   break;
+	 case '"':	/* comment */
+	   *p='\0';	/* rest of line is comment */
+	   break;
+	 case 'f':
+	   p++;
+	   switch (*p++) {
+	   case '3': case 'B':		/* boldface */
+		styles[++style] = BOLD;
+		stagadd(BEGINBOLD);
+		break;
+	   case '2': case 'I':		/* italics */
+		styles[++style] = ITALICS;
+		stagadd(BEGINITALICS);
+		break;
+	   case '4':	 /* bolditalics mode => program code */
+		styles[++style] = BOLDITALICS;
+		stagadd(BEGINBOLDITALICS);
+		break;
+	   case '1': case '0': case 'R': case 'P':	/* back to Roman */
+		/*sputchar(' '); -- taken out; not needed, I hope */
+		funwind=1;
+		break;
+	   case '-':
+		p++;
+		break;
+	   }
+	   break;
+	 case '(':	/* multicharacter macros */
+	   p++;
+	   for (i=0; (unsigned)i<speccnt; i++) {
+		if (p[0]==spec[i].key[0] && p[1]==spec[i].key[1]) {
+		  p+=2;
+		  for (j=0; spec[i].subst[j]; j++) sputchar(spec[i].subst[j]);
+		  break;
+		}
+	   }
+	   break;
+	 case '*':	/* strings */
+	   p++;
+ 	   if (*p!='(') {	/* single character */
+ 	     for (i=0; i<substcnt; i++) {
+		  if (*p==subst[i].key[0] && subst[i].key[1]=='\0') {
+		    source_out0(subst[i].subst,'\0');
+		    break;
+		  }
+ 	     }
+ 	     p++;
+	   } else {	/* multicharacter macros */
+		p++;
+		for (i=0; i<substcnt; i++) {
+		  len = strlen(subst[i].key);
+		  if (strncmp(p,subst[i].key,len)==0) {
+		    source_out0(subst[i].subst,'\0');
+		    p+=len;
+		    break;
+		  }
+		}
+	   }
+	   break;
+#if 0
+	 case '|':
+	   stagadd(CHARNBSP);	/* nonbreaking space */
+#if 0
+	   sputchar(' ');
+#endif
+	   p++;
+#endif
+	 case 'e':		/* escape */
+	   sputchar('\\');
+	   p++;
+	   break;
+	 case 'c':
+		/* supress following carriage return-induced space */
+	   /* handled in source_gets(); ignore within line => can't because next line might start with a command */
+	   supresseol=1;
+	   p++;
+	   break;
+	 case '-':		/* minus sign */
+	   sputchar(CHARDASH);
+	   p++;
+	   break;
+#if 0
+	 case '^':
+	   /* end stylings? (found in Solaris) */
+	   p++;
+#endif
+	 case 'N':
+	   p++;
+	   if (*p == '\'') {
+	     char *tmp;
+	     p++;
+	     if ((tmp = strchr(p, '\'')) != NULL) {
+	       sputchar(atoi(p));
+	       p = tmp + 1;
+	     }
+	   }
+	   break;
+	 default:		/* unknown escaped character */
+	   sputchar(*p++);
+	 }
+
+    } else {		/* normal character */
+	 if (*p) sputchar(*p++);
+    }
+
+
+    /* unwind character formatting stack */
+    if (funwind) {
+	 for ( ; style>=0; style--) {
+	   if (styles[style]==BOLD) {
+		stagadd(ENDBOLD);
+	   } else if (styles[style]==ITALICS) {
+		stagadd(ENDITALICS);
+	   } else {
+		stagadd(ENDBOLDITALICS);
+	   }
+	 } /* else error */
+	 assert(style==-1);
+
+	 funwind=0;
+    }
+
+    /* check for man page reference and flush buffer if safe */
+    /* postpone check until after following character so catch closing tags */
+    if ((sI>=4+1 && plain[sI-1-1]==')') ||
+	   /*  (plain[sI-1]==' ' && (q=strchr(plain,' '))!=NULL && q<&plain[sI-1])) */
+	 (plain[sI-1]==' ' && !isalnum(plain[sI-1-1]))) {
+	 /* regardless, flush buffer */
+	 source_flush();
+    }
+  }
+
+  if (*p && *p!=' ') p++;		/* skip over end character */
+  free(pstart);
+  return (char *)pin + (p - pstart);
+
+}
+
+/* oh, for function overloading.  inlined by compiler, probably */
+static char *
+source_out(const char *p)
+{
+  return source_out0(p,'\0');
+}
+
+
+static char *
+source_out_word(const char *p)
+{
+  char end = ' ';
+
+  while (*p && isspace(*p)) p++;
+  if (*p=='"' /* || *p=='`' ? */) {
+    end = *p;
+    p++;
+  }
+  p = source_out0(p,end);
+  /*while (*p && isspace(*p)) p++;*/
+  return (char *)p;
+}
+
+
+static void
+source_struct(enum command cmd)
+{
+  source_out("\\fR\\s0");	/* don't let run-on stylings run past structural units */
+  source_flush();
+  if (cmd==SHORTLINE) linelen=0;
+  (*fn)(cmd);
+}
+
+#define checkcmd(str)	strcmp(cmd,str)==0
+
+int finnf=0;
+
+static void source_line(char *p);
+
+static void
+source_subfile(char *newin)
+{
+  char *p;
+  char *oldin = in;
+
+  sublevel++;
+
+  in = newin;
+  while ((p=source_gets())!=NULL) {
+    source_line(p);
+  }
+  in = oldin;
+
+  sublevel--;
+}
+
+/* have to delay acquisition of list tag */
+static void
+source_list(void)
+{
+  static int oldlisttype;	/* OK to have just one because nested lists done with RS/RE */
+  char *q;
+  int i;
+
+  /* guard against empty bullet */
+  for (i=0, q=plain; i<sI && isspace(*q); q++,i++) /* empty */;
+  if (i==sI) return;
+
+  assert(finlist);
+
+  fFlush=1;
+
+  /* try to determine type of list: DL, OL, UL */
+  q=plain; plain[sI]='\0';
+  if (((int)*q&0xff)==CHARBULLET /*||*/) {
+    listtype=UL;
+    q+=4;
+  } else {
+    if (strchr("[(",*q)) q++;
+    while (isdigit(*q)) { listtype=OL; q++; }	/* I hope this gives the right number */
+    if (*q=='.') q++;
+    if (strchr(")]",*q)) q++;
+    if (*q=='.') q++;
+    while (isspace(*q)) q++;
+    if (*q) listtype=DL;
+  }
+  oldlisttype = listtype;
+
+  /* interpretation left to output formats based on listtype (HTML: DL, OL, UL) */
+  i = sI; sI=0;
+  if (!Pbp || listtype!=oldlisttype) poppush(BEGINBULPAIR);
+  poppush(BEGINBULLET);
+  /*if (tphp) source_line(p); else source_out_word(p);*/
+  /*if (listtype!=OL && listtype!=UL)*/ sI=i;
+  source_struct(ENDBULLET); Pbul=0; /* handled immediately below */
+  poppush(BEGINBULTXT);
+
+  finlist=0;
+}
+
+static int inComment=0;
+static int isComment=0;
+
+static void
+source_command(char *p)
+{
+  static int lastif=1;
+  int mylastif;
+  char *cmd=p;
+  char *q;
+  int i,j,endch;
+  int fid;
+  struct stat fileinfo;
+  char *sobuf;
+  char *macroArg[9];
+  char endig[10];
+  int err=0;
+  char ch;
+  int tphp=0;
+  int ie=0;
+  int cond,invcond=0;
+  char delim,op;
+  char if0[80], if1[80];
+  float nif0, nif1;
+  int insertat;
+  char macrobuf[MAXBUF];		/* local so can have nested macros */
+  static char ft='\0';
+  static int fTableCenter=0;
+
+  /* should centralize command matching (binary search?), pointer bumping here
+     if for no other reason than to catch conflicts -- and allow overrides? */
+  /* parse out command */
+  while (*p && !isspace(*p)) p++;
+  if (*p) { *p='\0'; p++; }
+  /* should set up argv, argc for command arguments--it's regular enough that everyone doesn't have to do it itself */
+
+  isComment = (/*checkcmd("") ||*/ !strncmp(cmd, "\\\"", 2) || /*DEC triple dot*/checkcmd(".."));
+  if (inComment && !isComment) { source_struct(ENDCOMMENT); inComment=0; }	/* special case to handle transition */
+
+  if (isComment) {
+    /* maybe have BEGINCOMMENT, ENDCOMMENT, COMMENTLINE */
+    supresseol=0;
+    if (!inComment) { source_flush(); source_struct(BEGINCOMMENT); inComment=1; }
+    source_struct(COMMENTLINE);
+    printf("%s\n", p);	/* could contain --> or other comment closer, but unlikely */
+
+  /* structural commands */
+  } else if (checkcmd("TH")) {
+    /* sample: .TH CC 1 "Dec 1990" */
+    /* overrides command line -- should fix this */
+    if (!finitDoc) {
+	 while (isspace(*p)) p++;
+	 if (*p) {
+	   q=strchr(p, ' ');
+	   if (q!=NULL)
+	   {
+	     *q++='\0';
+	     strcpy(manName, p);
+	     for (p=q; isspace(*p); p++) /*nada*/;
+	     if (*p) {
+		   q=strchr(p,' ');
+		   if (q!=NULL) *q++='\0';
+		   strcpy(manSect, p);
+	     }
+	   }
+	 }
+	 sI=0;
+	 finitDoc=1;
+	 (*fn)(BEGINDOC);
+	 /* emit information in .TH line? */
+    } /* else complain about multiple definitions? */
+
+  } else if (checkcmd("SH") || checkcmd("Sh")) {	/* section title */
+    while (indent) { source_command("RE"); }
+    source_flush();
+
+    pop(BEGINSECTION);	/* before reset sectheadid */
+
+    if (*p) {
+	 if (*p=='"') { p++; q=p; while (*q && *q!='"') q++; *q='\0'; }
+	 finnf=0;
+	 for (j=0; (sectheadid=j)<RANDOM; j++) if (strcoloncmp2(p,'\0',sectheadname[j],0)) break;
+	 if (!finitDoc) {
+	   /* handle missing .TH */
+	   /* if secthead!=NAME -- insist on this?
+	   fprintf(stderr, "Bogus man page: no .TH or \".SH NAME\" lines\n");
+	   exit(1);
+	   */
+	   (*fn)(BEGINDOC);
+	   finitDoc=1;
+	 }
+	 poppush(BEGINSECTION); source_struct(BEGINSECTHEAD);
+	 fFlush=0;
+	 if (falluc) casify(p);
+	 source_out(p);		/* people forget the quotes around multiple words */
+	 while (isspace(plain[--sI])) /*nada*/;
+	 plain[++sI]='\0'; tocadd(plain, BEGINSECTION, CurLine);	/* flushed with source_struct above */
+	 fFlush=1;
+	 source_struct(ENDSECTHEAD);
+    }
+  } else if (checkcmd("SS")) {	/* subsection title */
+    while (indent) { source_command("RE"); }
+    source_flush();
+
+    if (*p) {
+	 if (*p=='"') { p++; q=p; while (*q && *q!='"') q++; *q='\0'; }
+	 finnf=0;
+	 source_flush();
+	 poppush(BEGINSUBSECTION); source_struct(BEGINSUBSECTHEAD);
+	 fFlush=0;
+
+	 if (falluc) casify(p);
+	 source_out(p);		/* people forget the quotes around multiple words */
+	 while (isspace(plain[--sI])) /*nada*/;
+	 plain[++sI]='\0'; tocadd(plain, BEGINSUBSECTION, CurLine);
+	 fFlush=1;
+	 source_struct(ENDSUBSECTHEAD);
+    }
+
+  } else if (checkcmd("P") || checkcmd("PP") || checkcmd("LP")) {	 /* new paragraph */
+    source_flush();
+    poppush(BEGINBODY);
+
+  } else if ((tphp=checkcmd("TP")) || (tphp=checkcmd("HP")) || checkcmd("IP") || checkcmd("LI")) {
+    /* TP, HP: indented paragraph, tag on next line (DL list) */
+    /* IP, LI: tag as argument */
+    source_flush();
+    fFlush=0;
+    finlist=1;
+    if (!tphp) { source_out_word(p); source_list(); }
+    /* lists terminated only at start of non-lists */
+  } else if (checkcmd("RS")) {	/* set indent */
+    source_struct(BEGININDENT);
+    indent++;
+  } else if (checkcmd("RE")) {
+    if (indent) indent--;
+    pop(ENDINDENT);
+    source_struct(ENDINDENT);
+#if 0
+  } else if (checkcmd("Xr")) {
+    /* 4.4BSD man ref */
+    supresseol=0;
+    p=source_out_word(p);
+    source_out("(");
+    p=source_out_word(p);
+    source_out(")");
+#endif
+
+  } else if (checkcmd("nf")) {
+    source_struct(SHORTLINE); 
+    finnf=1;
+    source_struct(BEGINCODEBLOCK);
+  } else if (checkcmd("fi")) {
+    source_struct(ENDCODEBLOCK);
+    finnf=0;
+  } else if (checkcmd("br")) {
+    source_struct(SHORTLINE);
+  } else if (checkcmd("sp") || checkcmd("SP")) {	/* blank lines */
+    /*if (!finTable) {*/
+	 if (finnf) source_struct(SHORTLINE); else source_struct(BEGINBODY);
+	 /*}*/
+  } else if (checkcmd("ta")) {	/* set tab stop(s?) */
+    /* argument is tab stop -- handle these as tables => leave to output format */
+    /* HTML handles tables but not tabs, Tk's text tabs but not tables */
+    /* does cause a linebreak */
+    stagadd(BEGINBODY);
+  } else if (checkcmd("ce")) {
+	  /* get line count, recursively filter for that many lines */
+	  if (sscanf(p, "%d", &i)) {
+		  source_struct(BEGINCENTER);
+		  for (; i>0 && (p=source_gets())!=NULL; i--) source_line(p);
+		  source_struct(ENDCENTER);
+	  }
+
+  /* limited selection of control structures */
+  } else if (checkcmd("if") || (checkcmd("ie"))) {	/* if <test> cmd, if <test> command and else on next line */
+    supresseol=1;
+    ie = checkcmd("ie");
+    mylastif=lastif;
+
+    if (*p=='!') { invcond=1; p++; }
+
+    if (*p=='n') { cond=1; p++; }		/* masquerading as nroff the right thing to do? */
+    else if (*p=='t') { cond=0; p++; }
+    else if (*p=='(' || *p=='-' || *p=='+' || isdigit(*p)) {
+	 if (*p=='(') p++;
+	 nif0=atof(p);
+	 if (*p=='-' || *p=='+') p++; while (isdigit(*p)) p++;
+	 op = *p++;	/* operator: =, >, < */
+	 if (op==' ') {
+	   cond = (nif0!=0);
+	 } else {
+	   nif1=atoi(p);
+	   while (isdigit(*p)) p++;
+	   if (*p==')') p++;
+	   if (op=='=') cond = (nif0==nif1);
+	   else if (op=='<') cond = (nif0<nif1);
+	   else /* op=='>' -- ignore >=, <= */ cond = (nif0>nif1);
+	 }
+    } else if (!isalpha(*p)) {	/* usually quote, ^G in Digital UNIX */
+	 /* gobble up comparators between delimiters */
+	 delim = *p++;
+	 q = if0; while (*p!=delim) { *q++=*p++; } *q='\0'; p++;
+	 q = if1; while (*p!=delim) { *q++=*p++; } *q='\0'; p++;
+	 cond = (strcmp(if0,if1)==0);
+    } else cond=0;	/* a guess, seems to be right bettern than half the time */
+    if (invcond) cond=1-cond;
+    while (isspace(*p)) p++;
+
+    lastif = cond;
+    if (strncmp(p,"\\{",2)==0) {	/* rather than handle groups here, have turn on/off output flag? */
+	    p+=2; while (isspace(*p)) p++; /* {{ */
+	    while (strncmp(p,".\\}",3)!=0 || strncmp(p,"\\}",2)!=0 /*Solaris*/) {
+		    if (cond) source_line(p);
+		    if ((p=source_gets())==NULL) break;
+	    }
+    } else if (cond) source_line(p);
+
+    if (ie) source_line(source_gets());		/* do else part with prevailing lastif */
+
+    lastif=mylastif;
+
+  } else if (checkcmd("el")) {
+    mylastif=lastif;
+
+    /* should centralize gobbling of groups */
+    cond = lastif = !lastif;
+    if (strncmp(p,"\\{",2)==0) {
+	 p+=2; while (isspace(*p)) p++;
+	 while (strncmp(p,".\\}",3)!=0 || strncmp(p,"\\}",2)!=0 /*Solaris*/) {
+	   if (cond) source_line(p);
+	   if ((p=source_gets())==NULL) break;
+	 }
+    } else if (cond) source_line(p);
+
+    lastif=mylastif;
+
+  } else if (checkcmd("ig")) {	/* "ignore group" */
+    strcpy(endig,".."); if (*p) { endig[0]='.'; strcpy(&endig[1],p); }
+    while ((p=source_gets())!=NULL) {
+	 if (strcmp(p,endig)==0) break;
+	 if (!lastif) source_line(p);		/* usually ignore line, except in one weird case */
+    }
+
+
+  /* macros and substitutions */
+  } else if (checkcmd("de")) {
+    /* grab key */
+    q=p; while (*q && !isspace(*q)) q++; *q='\0';
+
+    /* if already have a macro of that name, override it */
+    /* could use a good dictionary class */
+    for (insertat=0; insertat<macrocnt; insertat++) {
+	 if (strcmp(p,macro[insertat].key)==0) break;
+    }
+    if (insertat==macrocnt) macrocnt++;
+
+    /* should replace one with same name, if one exists */
+    macro[insertat].key = mystrdup(p);
+
+    /* build up macro in plain[] ... */
+    /* everything until ".." line part of macro */
+    q=plain; i=0;
+    while ((p=source_gets())!=NULL) {
+	 if (strcmp(p,"..")==0) break;
+	 while (*p) {	/* append string, interpreting quotes along the way--just double backslash to single now */
+	   if (*p=='\\' && p[1]=='\\') p++;
+	   *q++=*p++;
+	 }
+	 *q++='\n';
+    }
+    *q='\0';
+
+    /* ... then copy once have whole thing */
+    macro[insertat].subst = mystrdup(plain);
+    /*fprintf(stderr, "defining macro %s as %s\n", macro[insertat].key, macro[insertat].subst);*/
+    sI=0;
+
+  } else if (checkcmd("rm")) {	/* remove macro definition, can have multiple arguments */
+    for (i=0; i<macrocnt; i++) {	/* moot as new definitions replace old when conflicts */
+	 if (strcmp(p,macro[i].key)) {
+	   macro[i] = macro[--macrocnt];
+	   break;
+	 }
+    }
+
+  } else if (checkcmd("ds")) {	/* text substitutions (like macros) */
+    /* /usr/sww/man/man1/CC.1 a good test of this */
+    q = strchr(p,' ');
+    if (q!=NULL) {
+	 *q='\0'; q++;
+#if 0
+	 while (*++q) /*nada*/;
+#endif
+	 if (*q=='"') q++;
+	 if (substcnt<SUBSTMAX) {
+	   subst[substcnt].key = mystrdup(p); subst[substcnt].subst = mystrdup(q); substcnt++;
+	 }
+	 /*fprintf(stderr, "defining substitution: name=%s, body=%s\n", p, q);*/
+    }
+
+  } else if (checkcmd("so")) {
+    /* assuming in .../man like nroff, source in file and execute it as nested file, */
+    /* so nested .so's OK */
+
+	err = 1;	/* assume error unless successful */
+	if (fTclTk) {
+		err=0;
+	} else if (stat(p, &fileinfo)==0) {
+		sobuf = malloc(fileinfo.st_size + 1);
+		if (sobuf!=NULL) {
+			/* suck in entire file */
+			fid = open(p, O_RDONLY);
+			if (fid!=-1) {
+				if (read(fid, sobuf, fileinfo.st_size) == fileinfo.st_size) {
+				  sobuf[fileinfo.st_size]='\0';
+				  /* dumb Digital puts \\} closers on same line */
+				  /* {{ */
+				  for (q=sobuf; (q=strstr(q," \\}"))!=NULL; q+=3) *q='\n';
+				  source_subfile(sobuf);
+				  err = 0;
+				}
+				close(fid);
+			}
+			free(sobuf);
+		}
+	}
+
+	if (err) {
+		fprintf(stderr, "%s: couldn't read in referenced file %s.\n", argv0, p);
+		if (strchr(p,'/')==NULL) {
+		  fprintf(stderr, "\tTry cd'ing into same directory of man page first.\n");
+		} else if (strchr(p,'/')==strrchr(p,'.')) {
+		  fprintf(stderr, "\tTry cd'ing into parent directory of man page first.\n");
+		} else {
+		  fprintf(stderr, "\tTry cd'ing into ancestor directory that makes relative path valid first.\n");
+		}
+		exit(1);
+	}
+
+
+  /* character formatting */
+  /* reencode m/any as macro definitions? would like to but the below don't have "words" */
+  } else if (checkcmd("ft")) {	/* change font, next char is R,I,B.  P=previous not supported */
+    if (ft=='B') stagadd(ENDBOLD); else if (ft=='I') stagadd(ENDITALICS);
+    ft = *p++;
+    if (ft=='B') stagadd(BEGINBOLD); else if (ft=='I') stagadd(BEGINITALICS);
+  } else if (checkcmd("B")) {
+    supresseol=0;
+    stagadd(BEGINBOLD); p = source_out_word(p); source_out(p); stagadd(ENDBOLD);
+    if (finnf) source_struct(SHORTLINE);
+  } else if (checkcmd("I")) {
+    supresseol=0;
+    stagadd(BEGINITALICS); p = source_out_word(p); stagadd(ENDITALICS);
+    source_out(p);
+    if (finnf) source_struct(SHORTLINE);
+  } else if (checkcmd("BI")) {
+    supresseol=0;
+    while (*p) {
+	 stagadd(BEGINBOLD); p = source_out_word(p); stagadd(ENDBOLD);
+	 if (*p) { stagadd(BEGINITALICS); p = source_out_word(p); stagadd(ENDITALICS); }
+    }
+    if (finnf) source_struct(SHORTLINE);
+  } else if (checkcmd("IB")) {
+    supresseol=0;
+    while (*p) {
+	 stagadd(BEGINITALICS); p = source_out_word(p); stagadd(ENDITALICS);
+	 if (*p) { stagadd(BEGINBOLD); p = source_out_word(p); stagadd(ENDBOLD); }
+    }
+    if (finnf) source_struct(SHORTLINE);
+  } else if (checkcmd("RB")) {
+    supresseol=0;
+    while (*p) {
+	 p = source_out_word(p);
+	 if (*p) { stagadd(BEGINBOLD); p = source_out_word(p); stagadd(ENDBOLD); }
+    }
+    if (finnf) source_struct(SHORTLINE);
+  } else if (checkcmd("BR")) {
+    supresseol=0;
+    while (*p) {
+	 stagadd(BEGINBOLD); p = source_out_word(p); stagadd(ENDBOLD);
+	 p = source_out_word(p);
+    }
+    if (finnf) source_struct(SHORTLINE);
+  } else if (checkcmd("IR")) {
+    supresseol=0;
+    while (*p) {
+	 stagadd(BEGINITALICS); p=source_out_word(p); stagadd(ENDITALICS);
+	 p=source_out_word(p);
+    }
+    if (finnf) source_struct(SHORTLINE);
+  } else if (checkcmd("RI")) {
+    supresseol=0;
+    while (*p) {
+	 p=source_out_word(p);
+	 stagadd(BEGINITALICS); p=source_out_word(p); stagadd(ENDITALICS);
+    }
+    if (finnf) source_struct(SHORTLINE);
+
+
+  /* HP-UX */
+  } else if (checkcmd("SM")) {
+    supresseol=0; source_out("\\s-1"); while (*p) p=source_out(p); source_out("\\s0");
+  } else if (checkcmd("C")) {
+    supresseol=0;
+    stagadd(BEGINCODE); while (*p) p=source_out_word(p); stagadd(ENDCODE);
+  } else if (checkcmd("CR")) {
+    supresseol=0;
+    while (*p) {
+	 stagadd(BEGINCODE); p=source_out_word(p); stagadd(ENDCODE);
+	 if (*p) p=source_out_word(p);
+    }
+  } else if (checkcmd("RC")) {
+    supresseol=0;
+    while (*p) {
+	 p=source_out_word(p);
+	 if (*p) { stagadd(BEGINCODE); p=source_out_word(p); stagadd(ENDCODE); }
+    }
+  } else if (checkcmd("CI")) {
+    supresseol=0;
+    while (*p) {
+	 stagadd(BEGINCODE); p=source_out_word(p); stagadd(ENDCODE);
+	 if (*p) { stagadd(BEGINITALICS); p=source_out_word(p); stagadd(ENDITALICS); }
+    }
+
+
+  /* tables */
+  } else if (checkcmd("TS")) {
+    tblc=0; /*tblspanmax=0;*/ tableSep='\0';		/* need to reset each time because tabbed lines (.ta) made into tables too */
+    while ((p = source_gets())!=NULL) {
+	 if ((q=strstr(p,"tab"))!=NULL) {	/* "tab(" or "tab (".  table entry separator */
+	   p=(q+3); while (isspace(*p)) p++;
+	   p++;	/* jump over '(' */
+	   tableSep=*p;
+	   continue;
+	 }
+	 if (strincmp(p,"center",strlen("center"))==0) {	/* center entire table; should look for "left" and "right", probably */
+	   fTableCenter=1; source_struct(BEGINCENTER);
+	   p+=strlen("center"); while (isspace(*p)) p++;
+	   continue;
+	 }
+	 if (p[strlen(p)-1]==';') { tblc=0; continue; }	/* HP has a prequel terminated by ';' */
+
+	 for (i=0; *p; i++,p=q) {
+	   if (*p=='.') break;
+	   if (*p=='f') p+=2;	/* DEC sets font here */
+	   q=p+1;
+	   if (strchr("lrcn",*q)==NULL) {	/* dumb DEC doesn't put spaces between them */
+		while (*q && *q!='.' && !isspace(*q)) q++;
+	   }
+	   ch=*q; *q='\0';
+	   tbl[tblc][i] = mystrdup(p);
+	   tbl[tblc][i+1] = "";	/* mark end */
+	   *q=ch;
+	   while (*q && isspace(*q)) q++;
+	 }
+	 /*if (i>tblspanmax) tblspanmax=i;*/
+	 tbl[tblc++][i]="";		/* mark end */
+	 if (*p=='.') break;
+    }
+    tbli=0;
+    source_struct(BEGINTABLE);
+
+    while ((p=source_gets())!=NULL) {
+	 if (strncmp(p,".TE",3)==0) break;
+	 if (*p=='.') { source_line(p); continue; }
+
+	 /* count number of entries on line.  if >1, can use to set tableSep */
+	 insertat=0; for (j=0; *tbl[tbli][j]; j++) if (*tbl[tbli][j]!='s') insertat++;
+	 if (!tableSep && insertat>1) { if (fsourceTab) tableSep='\t'; else tableSep='@'; }
+	 source_struct(BEGINTABLELINE);
+	 if (strcmp(p,"_")==0 || /* double line */ strcmp(p,"=")==0) {
+	   source_out(" ");
+	   /*stagadd(HR);*/	/* empty row -- need ROWSPAN for HTML */
+	   continue;
+	 }
+
+	 for (i=0; *tbl[tbli][i] && *p; i++) {
+	   tblcellspan=1;
+	   tblcellformat = tbl[tbli][i];
+	   if (*tblcellformat=='^') {	/* vertical span => blank entry */
+		tblcellformat="l";
+	   } else if (*tblcellformat=='|') {
+		/* stagadd(VBAR); */
+		continue;
+	   } else if (strchr("lrcn", *tblcellformat)==NULL) {
+		tblcellformat="l";
+		/*continue;*/
+	   }
+
+	   while (strncmp(tbl[tbli][i+1],"s",1)==0) { tblcellspan++; i++; }
+
+	   source_struct(BEGINTABLEENTRY);
+	   if (toupper(tblcellformat[1])=='B') stagadd(BEGINBOLD);
+	   else if (toupper(tblcellformat[1])=='I') stagadd(BEGINITALICS);
+	   /* not supporting DEC's w(<num><unit>) */
+
+	   if (strcmp(p,"T{")==0) {	/* DEC, HP */
+		while (strncmp(p=source_gets(),"T}",2)!=0) source_line(p);
+		p+=2; if (*p) p++;
+	   } else {
+		p = source_out0(p, tableSep);
+	   }
+	   if (toupper(tblcellformat[1])=='B') stagadd(ENDBOLD);
+	   else if (toupper(tblcellformat[1])=='I') stagadd(ENDITALICS);
+	   source_struct(ENDTABLEENTRY);
+	 }
+	 if (tbli+1<tblc) tbli++;
+	 source_struct(ENDTABLELINE);
+    }
+    source_struct(ENDTABLE);
+    if (fTableCenter) { source_struct(ENDCENTER); fTableCenter=0; }
+
+
+  } else if (checkcmd("nr")) {
+    q=p; while (*q && !isspace(*q)) q++; *q='\0'; q++;
+
+    for (insertat=0; insertat<regcnt; insertat++) {
+	 if (strcmp(reg[insertat].name,p)==0) break;
+    }
+    if (insertat==regcnt) { regcnt++; reg[insertat].name = mystrdup(p); } /* else use same name */
+    p=q;
+    if (*q=='+' || *q=='-') q++;	/* accept signed, floating point numbers */
+    if (*q=='.') q++;
+    if (!*q || isspace(*q)) { *q++='0'; *q++='\0'; }
+    while (isdigit(*q)) { q++; } *q='\0'; /* ignore units */
+    reg[insertat].value = mystrdup(p);
+
+  } else if (checkcmd("EQ")) {	/* eqn not supported */
+    source_out("\\s-1\\fBeqn not supported\\fR\\s0");
+    while ((p=source_gets())!=NULL) {
+	 if (strncmp(p,".EN",3)==0) break;
+    }
+
+
+
+  /* Tcl/Tk macros */
+  } else if (fTclTk && (checkcmd("VS") || checkcmd("VE"))) {
+	  /* nothing for sidebars */
+  } else if (fTclTk && checkcmd("OP")) {
+    source_struct(BEGINBODY);
+    for (i=0; i<3; i++) {
+	 if (fcharout) { source_out(tcltkOP[i]); source_out(": "); }
+	 stagadd(BEGINBOLD); p=source_out_word(p); stagadd(ENDBOLD); 
+	 source_struct(SHORTLINE);
+    }
+    source_struct(BEGINBODY);
+
+  } else if (fTclTk && checkcmd("BS")) {	/* box */
+    /*source_struct(HR); -- ugh, no Ouster box */
+  } else if (fTclTk && checkcmd("BE")) {
+    /*source_struct(HR);*/
+
+  } else if (fTclTk && (checkcmd("CS")||checkcmd("DS"))) {	/* code excerpt */
+    /* respect line ends, set in teletype */
+    /* source_struct(SHORTLINE); -- done as part of CS's ENDLINE */
+    finnf=1;
+    source_struct(SHORTLINE);
+    if (checkcmd("DS")) source_line(".P");
+    stagadd(BEGINCODE);
+  } else if (fTclTk && (checkcmd("CE")||checkcmd("DE"))) {
+    stagadd(ENDCODE);
+    finnf=0;
+
+  } else if (fTclTk && checkcmd("SO")) {
+    source_struct(BEGINSECTION);
+    source_struct(BEGINSECTHEAD); source_out("STANDARD OPTIONS"); source_struct(ENDSECTHEAD);
+    tblc=1; tbl[0][0]=tbl[0][1]=tbl[0][2]="l"; tbl[0][3]="";
+    source_struct(BEGINTABLE);
+    while (1) {
+	 p = source_gets();
+	 if ((strncmp(p,".SE",3))==0) break;
+	 tblcellformat = "l";
+	 source_struct(BEGINTABLELINE);
+	 if (*p=='.') {
+	   source_command(p);
+	 } else {
+	   while (*p) {
+		source_struct(BEGINTABLEENTRY);
+		p = source_out0(p, '\t');
+		source_struct(ENDTABLEENTRY);
+	   }
+	 }
+	 source_struct(ENDTABLELINE);
+    }
+    source_struct(ENDTABLE);
+    source_struct(ENDSECTION);
+
+  } else if (fTclTk && checkcmd("AP")) {	/* arguments */
+    source_struct(BEGINBODY);
+    p = source_out_word(p); source_out("   ");
+    stagadd(BEGINITALICS); p = source_out_word(p); stagadd(ENDITALICS); source_out("\t");
+    source_out("("); p = source_out_word(p); source_out(")");
+    source_struct(SHORTLINE);
+    source_out("\t");
+  } else if (fTclTk && checkcmd("AS")) {	/* arguments */
+
+#if 0
+/* let these be defined as macros.  if they're not, they're just caught as unrecognized macros */
+  } else if (checkcmd("ll") || checkcmd("IX") ||
+		   checkcmd("nh")||checkcmd("hy")||checkcmd("hc")||checkcmd("hw")	/* hyphenation */
+	) {	/* unsupported macros -- usually roff specific */
+
+    fprintf(stderr, "macro \"%s\" not supported -- ignoring\n", cmd);
+#endif
+
+  } else {		/* could be a macro definition */
+    supresseol=0;
+
+    for (i=0; i<macrocnt; i++) {
+	 if (macro[i].key == NULL) continue;	/* !!! how does this happen? */
+	 if (checkcmd(macro[i].key)) {
+
+	   /* it is, collect arguments */
+	   for (j=0; j<9; j++) macroArg[j]="";
+	   for (j=0; p!=NULL && *p && j<9; j++, p=q) {
+		endch=' '; if (*p=='"') { endch='"'; p++; }
+		q = strchr(p,endch);
+		if (q!=NULL) {
+		  *q++='\0';
+		  if (*q && endch!=' ') q++;
+		}
+		macroArg[j] = p;
+	   }
+
+	   /* instantiate that text, substituting \\[1-9]'s */
+	   p = macro[i].subst;
+	   q = macrobuf;	/* allocated on stack */
+	   while (*p) {
+		if (*p=='\\') {
+		  p++;
+		  if (*p=='t') {
+		    *q++ = '\t';
+		    p++;
+		  } else if (*p=='$' && isdigit(p[1])) {
+		    j = p[1]-'0'-1;	/* convert to ASCII and align with macroArg array */
+		    p+=2;
+		    /* *q++='"'; -- no */
+		    strcpy(q, macroArg[j]); q += strlen(q);
+		    /* *q++='"'; -- no */
+
+		  } else {
+		    *q++ = '\\';
+		  }
+		} else {
+		  *q++ = *p++;
+		}
+	   }
+	   *q='\0';
+
+	   /* execute that text */
+	   /*fprintf(stderr, "for macro %s, substituted text is \n%s\n", macro[i].key, macrobuf);*/
+	   source_subfile(macrobuf);
+
+	   break;
+	 }
+    }
+
+    /* macro not found */
+    if (i==macrocnt) {
+	   /* report missing macros only once */
+	   for (j=0; j<macnotcnt; j++) if (strcmp(macnotfound[j],cmd)==0) break;
+	   if (j==macnotcnt) {
+		  if (!fQuiet) fprintf(stderr, "macro \"%s\" not recognized -- ignoring\n", cmd);
+		  q = malloc(strlen(cmd)+1); strcpy(q,cmd);
+		  macnotfound[macnotcnt++] = q;
+	   }
+    }
+  } /* else command is unrecognized -- ignore it: we're not a complete [tn]roff implementation */
+
+  /* popular but meaningless commands: .ne (need <n> lines--on infinite scroll */
+}
+
+
+static void
+source_line(char *p)
+{
+  /*stagadd(BEGINLINE);*/
+  char *cmd=p;
+  if (p==NULL) return;	/* bug somewhere else, but where? */
+
+#if 0
+  if (*p!='.' && *p!='\'' && !finlist) {
+    if (fsourceTab && !fosourceTab) {
+	 tblc=1; tbli=0; tableSep='\t';
+	 tbl[0][0]=tbl[0][1]=tbl[0][2]=tbl[0][3]=tbl[0][4]=tbl[0][5]=tbl[0][6]=tbl[0][7]=tbl[0][8]="l";
+	 source_struct(BEGINTABLE); finTable=1;
+    } else if (!fsourceTab && fosourceTab) {
+	 source_struct(ENDTABLE); finTable=0;
+    }
+    fosourceTab=fsourceTab;
+  }
+#endif
+
+  if (*p=='.' /*|| *p=='\''  -- normalized */) {	/* command == starts with "." */
+    p++;
+    supresseol=1;
+    source_command(p);
+
+  } else if (!*p) {		/* blank line */
+    /*source_command("P");*/
+    ncnt=1; source_struct(BEGINLINE); ncnt=0;	/* empty line => paragraph break */
+
+#if 0
+  } else if (fsourceTab && !finlist /* && pmode */) {	/* can't handle tabs, so try tables */
+    source_struct(BEGINTABLE);
+    tblcellformat = "l";
+    do {
+	 source_struct(BEGINTABLELINE);
+	 while (*p) {
+	   source_struct(BEGINTABLEENTRY);
+	   p = source_out0(p, '\t');
+	   source_struct(ENDTABLEENTRY);
+	 }
+	 source_struct(ENDTABLELINE);
+    } while ((p=source_gets())!=NULL && fsourceTab);
+    source_struct(ENDTABLE);
+    source_line(p);
+#endif
+
+  } else {			/* otherwise normal text */
+    source_out(p);
+    if (finnf || isspace(*cmd)) source_struct(SHORTLINE);
+  }
+
+  if (!supresseol && !finnf) { source_out(" "); if (finlist) source_list(); }
+  supresseol=0;
+  /*stagadd(ENDLINE);*/
+}
+
+
+static void
+source_filter(void)
+{
+  char *p = in, *q;
+  char *oldv,*newv,*shiftp,*shiftq,*endq;
+  int lenp,lenq;
+  int i,on1,on2,nn1,nn2,first;
+  int insertcnt=0, deletecnt=0, insertcnt0;
+  int nextDiffLine=-1;
+  char diffcmd, tmpc, tmpendq;
+
+  AbsLine=0;
+
+  /* just count length of macro table! */
+  for (i=0; macro[i].key!=NULL; i++) /*empty*/;
+  macrocnt = i;
+
+  /* {{ dumb Digital puts \\} closers on same line */
+  for (p=in; (p=strstr(p," \\}"))!=NULL; p+=3) *p='\n';
+
+  sI=0;
+  /* (*fn)(BEGINDOC); -- done at .TH or first .SH */
+
+
+  /* was: source_subfile(in); */
+  while (fDiff && fgets(diffline, MAXBUF, difffd)!=NULL) {
+	  /* requirements: no context lines, no errors in files, ...
+		 change-command: 8a12,15 or 5,7c8,10 or 5,7d3
+		 < from-file-line
+		 < from-file-line...
+		 --
+		 > to-file-line
+		 > to-file-line...
+	  */
+	  for (q=diffline; ; q++) { diffcmd=*q; if (diffcmd=='a'||diffcmd=='c'||diffcmd=='d') break; }
+	  if (sscanf(diffline, "%d,%d", &on1,&on2)==1) on2=on1-1+(diffcmd=='d'||diffcmd=='c');
+	  if (sscanf(++q, "%d,%d", &nn1,&nn2)==1) nn2=nn1-1+(diffcmd=='a'||diffcmd=='c');
+
+	  deletecnt = on2-on1+1;
+	  insertcnt = nn2-nn1+1;
+
+	  nextDiffLine = nn1;
+	  /*assert(nextDiffLine>=AbsLine); -- can happen if inside a macro? */
+	  if (nextDiffLine<AbsLine) continue;
+
+	  while (AbsLine<nextDiffLine && (p=source_gets())!=NULL) {
+		  source_line(p);
+	  }
+
+	  insertcnt0=insertcnt+1;	/* eat duplicate insert lines and '---' too */
+	  diffline2[0] = '\0';
+	  while (insertcnt && deletecnt) {
+		  if (ungetc(fgetc(difffd),difffd)=='<') { fgetc(difffd); fgetc(difffd); }	/* skip '<' */		  
+		  /* fill buffer with old line -- but replace if command */
+		  /* stay away from commands -- too careful if .B <word> */
+		  do {
+			  p = oldv = fgets(diffline, MAXBUF, difffd);
+			  p[strlen(p)-1]='\0';	/* fgets's \n ending => \0 */
+			  deletecnt--;
+		  } while (deletecnt && *p=='.');	/* throw out commands in old version */
+
+		  q = newv = source_gets();
+		  insertcnt--;
+		  while (insertcnt && *q=='.') {
+			  source_line(q);
+			  insertcnt--;
+		  }
+
+		  if (*p=='.' || *q=='.') break;
+
+
+		  /* make larger chunk for better diff -- but still keep away from commands */
+		  lenp=strlen(p); lenq=strlen(q);
+		  while (deletecnt && MAXBUF-lenq>80*2) {
+			  fgetc(difffd); fgetc(difffd);	/* skip '<' */
+			  if (ungetc(fgetc(difffd),difffd)=='.') break;
+			  p=&diffline[lenp]; *p++=' '; lenp++;
+			  fgets(p, MAXBUF-lenp, difffd); p[strlen(p)-1]='\0'; lenp+=strlen(p);
+			  deletecnt--;
+		  }
+
+		  while (insertcnt && *in!='.' && MAXBUF-lenq>80*2) {
+			  if (newv!=diffline2) { strcpy(diffline2,q); newv=diffline2; }
+			  q=source_gets(); diffline2[lenq]=' '; lenq++;
+			  strcpy(&diffline2[lenq],q); lenq+=strlen(q);
+			  insertcnt--;
+		  }
+
+		  /* common endings */
+		  p = &p[strlen(oldv)]; q=&q[strlen(newv)];
+		  while (p>oldv && q>newv && p[-1]==q[-1]) { p--; q--; }
+		  if ((p>oldv && p[-1]=='\\') || (q>newv && q[-1]=='\\'))
+			  while (*p && *q && !isspace(*p)) { p++; q++; }	/* steer clear of escapes */
+		  tmpendq=*q; *p=*q='\0'; endq=q;
+
+		  p=oldv; q=newv;
+		  while (*p && *q) {
+			  /* common starts */
+			  newv=q; while (*p && *q && *p==*q) { p++; q++; }
+			  if (q>newv) {
+				  tmpc=*q; *q='\0'; source_line(newv); *q=tmpc;
+			  }
+
+			  /* too hard to read */
+			  /* difference: try to find hunk of p in remainder of q */
+			  if (strlen(p)<15 || (shiftp=strchr(&p[15],' ') /*|| shiftp-p>30*/)==NULL) break;
+			  shiftp++; /* include the space */
+			  tmpc=*shiftp; *shiftp='\0'; shiftq=strstr(q,p); *shiftp=tmpc;	/* includes space */
+			  if (shiftq!=NULL) {
+			  	/* call that part of q inserted */
+				tmpc=*shiftq; *shiftq='\0';
+				stagadd(BEGINDIFFA); source_line(q); stagadd(ENDDIFFA); source_line(" ");
+				*shiftq=tmpc; q=shiftq;
+			  } else {
+				/* call that part of p deleted */
+				shiftp--;	*shiftp='\0';	/* squash the trailing space */
+				stagadd(BEGINDIFFD); source_line(p); stagadd(ENDDIFFD); source_line(" ");
+				p=shiftp+1;
+			  }
+/*#endif*/
+		  }
+
+		  if (*p) { stagadd(BEGINDIFFD); source_line(p); stagadd(ENDDIFFD); }
+		  if (*q) { stagadd(BEGINDIFFA); source_line(q); stagadd(ENDDIFFA); }
+		  if (tmpendq!='\0') { *endq=tmpendq; source_line(endq); }
+		  source_line(" ");
+	  }
+
+	  /* even if diffcmd=='c', could still have remaining old version lines */
+	  first=1;
+	  while (deletecnt--) {
+		  fgets(diffline, MAXBUF, difffd);
+		  if (diffline[2]!='.') {
+			  if (first) { stagadd(BEGINDIFFD); first=0; }
+			  source_line(&diffline[2]);	/* don't do commands; skip initial '<' */
+		  }
+	  }
+	  if (!first) { stagadd(ENDDIFFD); source_line(" "); }
+
+	  /* skip over duplicated from old */
+	  if (diffcmd=='c') while (insertcnt0--) fgets(diffline, MAXBUF, difffd);
+
+	  /* even if diffcmd=='c', could still have remaining new version lines */
+	  first=1;
+	  nextDiffLine = AbsLine + insertcnt;
+	  while (insertcnt--) fgets(diffline, MAXBUF, difffd);	/* eat duplicate text of above */
+	  while (/*insertcnt--*/AbsLine<nextDiffLine && (p=source_gets())!=NULL) {
+		  if (first && *p!='.') { stagadd(BEGINDIFFA); first=0; }
+		  source_line(p);
+	  }
+	  if (!first) { stagadd(ENDDIFFA); source_line(" "); }
+  }
+  /* finish up remainder (identical to both) */
+  while ((p=source_gets())!=NULL) {
+	  source_line(p);
+  }
+
+  source_flush();
+  pop(ENDDOC); (*fn)(ENDDOC);
+}
+
+
+
+/*
+ * STARTUP
+ */
+
+static int
+setFilterDefaults(char *outputformat)
+{
+	static struct {
+		void (*fn)(enum command);
+		int fPara; int fQS; int fIQS; int fNOHY; int fChangeleft; int fURL; char *names;
+		/* (could set parameters at BEGINDOC call...) */
+	} format[] = {
+		/*{default	0par 0qs	0iqs	0hy	0cl	0url	"name"},*/
+		{ ASCII,		0,	0,	0,	0,	0,	0,	"ASCII" },
+		{ TkMan,		0,	0,	0,	0,	0,	0,	"TkMan" },
+		{ Tk,		0,	0,	0,	0,	0,	0,	"Tk:Tcl" },
+		{ Sections,	0,	0,	0,	0,	0,	0,	"sections" },
+		{ Roff,		0,	1,	1,	1,	-1,	0,	"roff:troff:nroff" },
+		{ HTML,		1,	1,	1,	1,	1,	1,	"HTML:WWW:htm" },
+		{ SGML,		1,	1,	1,	1,	1,	1,	"SGML:XML" },
+/*		{ Texinfo,	1,	1,	1,	1,	1,	1,	"Texinfo:info:GNU" },*/
+		{ MIME,		1,	1,	1,	1,	1,	0,	"MIME:Emacs:enriched" },
+		{ LaTeX,		1,	1,	1,	1,	1,	0,	"LaTeX:LaTeX209:209:TeX" },
+		{ LaTeX2e,	1,	1,	1,	1,	1,	0,	"LaTeX2e:2e" },
+		{ RTF,		1,	1,	1,	1,	1,	0,	"RTF" },
+		{ pod,		0,	0,	1,	0,	-1,	0,	"pod:Perl" },
+		/*{ Ensemble,	1,	1,	1,	1,	1,	0,	"Ensemble" },*/
+
+		{ PostScript,	0,	0,	0,	0,	0,	0,	"PostScript:ps" },
+		{ FrameMaker,	0,	0,	0,	0,	0,	0,	"FrameMaker:Frame:Maker:MIF" },
+
+		{ NULL,		0,	0,	0,	0,	0,	0,	NULL }
+	};
+
+	int i, found=0;
+	for (i=0; format[i].fn!=NULL; i++) {
+		if (strcoloncmp2(outputformat,'\0',format[i].names,0)) {
+			fn = format[i].fn;
+			fPara = format[i].fPara;
+			fQS = format[i].fQS;
+			fIQS = format[i].fIQS;
+			fNOHY = format[i].fNOHY;
+			fChangeleft = format[i].fChangeleft;
+			fURL = format[i].fURL;
+			found=1;
+			break;
+		}
+	}
+
+	return (found==0);
+}
+
+
+/* read in whole file.  caller responsible for freeing memory */
+static char *
+filesuck(FILE *in)
+{
+  const int inc=1024*100;	/* what's 100K these days? */
+  int len=0,cnt;
+  char *file = malloc(1);  /*NULL -- relloc on NULL not reducing to malloc on some machines? */
+
+  do {
+    file = realloc(file, len+inc+1);	/* what's the ANSI way to find the file size? */
+    cnt = fread(&file[len], 1, inc, in);
+    len+=cnt;
+  } while (cnt==inc);
+  file[len]='\0';
+
+  return file;
+}
+
+int
+main(int argc, char *argv[])
+{
+	int c;
+	int i,j;
+	char *p,*oldp;
+	int fname=0;
+	const int helpbreak=75;
+	const int helpispace=4;
+	int helplen=0;
+	int desclen;
+	char **argvch;	/* remapped argv */
+	char *argvbuf;
+	char *processing = "stdin";
+/*	FILE *macros; -- interpret -man macros? */
+
+	char strgetopt[80];
+	/* options with an arg must have a '<' in the description */
+	static struct { char letter; int arg; char *longnames; char *desc; } option[] = {
+		{ 'f', 1, "filter", " <ASCII|roff|TkMan|Tk|Sections|HTML|SGML|MIME|LaTeX|LaTeX2e|RTF|pod>" },
+		{ 'S', 0, "source", "(ource of man page passed in)" },	/* autodetected */
+		{ 'F', 0, "formatted:format", "(ormatted man page passed in)" },	/* autodetected */
+
+		{ 'r', 1, "reference:manref:ref", " <man reference printf string>" },
+		{ 'l', 1, "title", " <title printf string>" },
+		{ 'V', 1, "volumes:vol", "(olume) <colon-separated list>" },
+		{ 'U', 0, "url:urls", "(RLs as hyperlinks)" },
+
+		/* following options apply to formatted pages only */
+		{ 'b', 0, "subsections:sub", " (show subsections)" },
+		{ 'k', 0, "keep:head:foot:header:footer", "(eep head/foot)" },
+		{ 'n', 1, "name", "(ame of man page) <string>" },
+		{ 's', 1, "section:sect", "(ection) <string>" },
+		{ 'p', 0, "paragraph:para", "(aragraph mode toggle)" },
+		{ 't', 1, "tabstop:tabstops", "(abstops spacing) <number>" },
+		{ 'N', 0, "normalize:normal", "(ormalize spacing, changebars)" },
+		{ 'y', 0, "zap:nohyphens", " (zap hyphens toggle)" },
+		{ 'K', 0, "nobreak", " (declare that page has no breaks)" },	/* autodetected */
+		{ 'd', 1, "diff", "(iff) <file> (diff of old page source to incorporate)" },
+		{ 'M', 1, "message", "(essage) <text> (included verbatim at end of Name section)" },
+		/*{ 'l', 0, "number lines", "... can number lines in a pipe" } */
+		/*{ 'T', 0, "tables", "(able agressive parsing ON)" },*/
+/*		{ 'c', 0, "changeleft:changebar", "(hangebarstoleft toggle)" }, -- default is perfect */
+		/*{ 'R', 0, "reflow", "(eflow text lines)" },*/
+		{ 'R', 1, "rebus", "(ebus words for TkMan)" },
+		{ 'C', 0, "TclTk", " (enable Tcl/Tk formatting)" },	/* autodetected */
+
+		/*{ 'D', 0, "debug", "(ebugging mode)" }, -- dump unrecognized macros, e.g.*/
+		{ 'o', 0, "noop", " (no op)" },
+		{ 'O', 0, "noop", " <arg> (no op with arg)" },
+		{ 'q', 0, "quiet", "(uiet--don't report warnings)" },
+		{ 'h', 0, "help", "(elp)" },
+		/*{ '?', 0, "help", " (help)" },	-- getopt returns '?' as error flag */
+		{ 'v', 0, "version", "(ersion)" },
+		{ '\0', 0, "", NULL }
+	};
+
+	/* calculate strgetopt from options list */
+	for (i=0,p=strgetopt; option[i].letter!='\0'; i++) {
+		*p++ = option[i].letter;
+		/* check for duplicate option letters */
+		assert(strchr(strgetopt,option[i].letter)==&p[-1]);
+		if (option[i].arg) *p++=':';
+	}
+	*p='\0';
+
+	/* spot check construction of strgetopt */
+	assert(p<strgetopt+80);
+	assert(strlen(strgetopt)>10);
+	assert(strchr(strgetopt,'f')!=NULL);
+	assert(strchr(strgetopt,'v')!=NULL);
+	assert(strchr(strgetopt,':')!=NULL);
+
+#ifdef macintosh
+	extern void InitToolbox();
+	InitToolbox();
+#endif
+
+	/* count, sort exception strings */
+	for (lcexceptionslen=0; (p=lcexceptions[lcexceptionslen])!=NULL; lcexceptionslen++) /*empty*/;
+	qsort(lcexceptions, lcexceptionslen, sizeof(char*), lcexceptionscmp);
+
+	/* map long option names to single letters for switching */
+	/* (GNU probably has a reusable function to do this...) */
+	/* deep six getopt in favor of integrated long names + letters? */
+	argvch = malloc(argc * sizeof(char*));
+	p = argvbuf = malloc(argc*3 * sizeof(char));	/* either -<char>'\0' or no space used */
+	for (i=0; i<argc; i++) argvch[i]=argv[i];	/* need argvch[0] for getopt? */
+	argv0 = mystrdup(argv[0]);
+	for (i=1; i<argc; i++) {
+		if (argv[i][0]=='-' && argv[i][1]=='-') {
+			if (argv[i][2]=='\0') break;	/* end of options */
+			for (j=0; option[j].letter!='\0'; j++) {
+				if (strcoloncmp2(&argv[i][2],'\0',option[j].longnames,0)) {
+					argvch[i] = p;
+					*p++ = '-'; *p++ = option[j].letter; *p++ = '\0';
+					if (option[j].arg) i++;	/* skip arguments of options */
+					break;
+				}
+			}
+			if (option[j].letter=='\0') fprintf(stderr, "%s: unknown option %s\n", argv[0], argv[i]);
+		}
+	}
+
+
+
+	/* pass through options to set defaults for chosen format */
+	setFilterDefaults("ASCII");		/* default to ASCII (used by TkMan's Glimpse indexing */
+
+	/* initialize header/footer buffers (save room in binary) */
+	for (i=0; i<CRUFTS; i++) { *cruft[i] = '\0'; }	/* automatically done, guaranteed? */
+	/*for (i=0; i<MAXLINES; i++) { linetabcnt[i] = 0; } */
+
+	while ((c=getopt(argc,argvch,strgetopt))!=-1) {
+
+		switch (c) {
+		   case 'k': fHeadfoot=1; break;
+		   case 'b': fSubsections=1; break;
+/*		   case 'c': fChangeleft=1; break; -- obsolete */
+			/* case 'R': fReflow=1; break;*/
+		   case 'n': strcpy(manName,optarg); fname=1; break;	/* name & section for when using stdin */
+		   case 's': strcpy(manSect,optarg); break;
+		   /*case 'D': docbookpath = optarg; break;*/
+		   case 'V': vollist = optarg; break;
+		   case 'l': manTitle = optarg; break;
+		   case 'r': manRef = optarg;
+			if (strlen(manRef)==0 || strcmp(manRef,"-")==0 || strcmp(manRef,"off")==0) fmanRef=0;
+			break;
+		   case 't': TabStops=atoi(optarg); break;
+		   /*case 'T': fTable=1; break;	-- if preformatted doesn't work, if source automatic */
+		   case 'p': fPara=!fPara; break;
+		   case 'K': fFoot=1; break;
+		   case 'y': fNOHY=1; break;
+		   case 'N': fNORM=1; break;
+
+		   case 'f': /* set format */
+			if (setFilterDefaults(optarg)) {
+				fprintf(stderr, "%s: unknown format: %s\n", argv0, optarg);
+				exit(1);
+			}
+			break;
+		   case 'F': fSource=0; break;
+		   case 'S': fSource=1; break;
+
+		   case 'd':
+			difffd = fopen(optarg, "r");
+			if (difffd==NULL) { fprintf(stderr, "%s: can't open %s\n", argv0, optarg); exit(1); }
+/* read in a line at a time
+			diff = filesuck(fd);
+			fclose(fd);
+*/
+			fDiff=1;
+			break;
+
+		   case 'M': message = optarg; break;
+
+		   case 'C': fTclTk=1; break;
+		   case 'R':
+			p = malloc(strlen(optarg)+1);
+			strcpy(p, optarg);	/* string may not be in writable address space */
+			oldp = "";
+			for (; *p; oldp=p, p++) {
+				if (*oldp=='\0') rebuspat[rebuspatcnt++] = p;
+				if (*p=='|') *p='\0';
+			}
+			for (i=0; i<rebuspatcnt; i++) rebuspatlen[i] = strlen(rebuspat[i]);	/* for strnlen() */
+			break;
+
+		   case 'q': fQuiet=1; break;
+		   case 'o': /*no op*/ break;
+		   case 'O': /* no op with arg */ break;
+		   case 'h':
+			printf("rman"); helplen=strlen("rman");
+
+			/* linebreak options */
+			assert(helplen>0);
+			for (i=0; option[i].letter!='\0'; i++) {
+			  desclen = strlen(option[i].desc);
+			  if (helplen+desclen+5 > helpbreak) { printf("\n%*s",helpispace,""); helplen=helpispace; }
+			  printf(" [-%c%s]", option[i].letter, option[i].desc);
+			  helplen += desclen+5;
+			}
+			if (helplen>helpispace) printf("\n");
+			printf("%*s [<filename>]\n",helpispace,"");
+			exit(0);
+
+		   case 'v': /*case '?':*/
+			printf("PolyglotMan v" POLYGLOTMANVERSION "\n");
+			exit(0);
+
+		   default:
+			fprintf(stderr, "%s: unidentified option -%c (-h for help)\n",argvch[0],c);
+			exit(2);
+		}
+	}
+
+
+
+	/* read from given file name(s) */
+	if (optind<argc) {
+		processing = argvch[optind];
+
+		if (!fname) {	/* if no name given, create from file name */
+			/* take name from tail of path */
+			if ((p=strrchr(argvch[optind],'/'))!=NULL) p++; else p=argvch[optind];
+			strcpy(manName,p);
+
+			/* search backward from end for final dot. split there */
+			if ((p=strrchr(manName,'.'))!=NULL) {
+				strcpy(manSect,p+1);
+				*p='\0';
+			}
+		}
+
+		strcpy(plain,argvch[optind]);
+
+		if (freopen(argvch[optind], "r", stdin)==NULL) {
+			fprintf(stderr, "%s: can't open %s\n", argvch[0],argvch[optind]);
+			exit(1);
+		}
+	}
+
+	/* need to read macros, ok if fail; from /usr/lib/tmac/an => needs to be set in Makefile, maybe a searchpath */
+	/*
+	if ((macros=fopen("/usr/lib/tmac/an", "r"))!=NULL) {
+		in = File = filesuck(macros);
+		lookahead = File[0];
+		source_filter();
+		free(File);
+	}
+	*/
+
+	/* suck in whole file and just operate on pointers */
+	in = File = filesuck(stdin);
+
+
+	/* minimal check for roff source: first character dot command or apostrophe comment */
+	/* MUST initialize lookahead here, BEFORE first call to la_gets */
+	if (fSource==-1) {
+		lookahead = File[0];
+		fSource = (lookahead=='.' || lookahead=='\'' || /*dumb HP*/lookahead=='/'
+		    /* HP needs this too but causes problems || isalpha(lookahead)--use --source flag*/);
+	}
+
+	if (fDiff && (!fSource || fn!=HTML)) {
+		fprintf(stderr, "diff incorporation supported for man page source, generating HTML\n");
+		exit(1);
+	}
+
+	if (fSource) source_filter(); else preformatted_filter();
+	if (fDiff) fclose(difffd);
+	/*free(File);	-- let system clean up, perhaps more efficiently */
+
+	return 0;
+}
Index: xc/extras/rman/rman.html
diff -u /dev/null xc/extras/rman/rman.html:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/rman.html	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,322 @@
+<HTML><HEAD><TITLE>PolyglotMan Manual Page</TITLE></HEAD>
+<BODY>
+<H1>Name</H1>
+
+PolyglotMan, rman - reverse compile man pages from formatted form to a number of source formats
+
+<H1>Synopsis</H1>
+
+rman [<I>options</I>] [<I>file</I>]
+
+<H1>Description</H1>
+
+<P><I>PolyglotMan</I> takes man pages from most of the
+popular flavors of UNIX and transforms them into any of a number of
+text source formats.  PolyglotMan was formerly known as RosettaMan. 
+The name of the binary is still called <tt>rman</tt>, for scripts
+that depend on that name; mnemonically, just think "reverse man".
+Previously <I>PolyglotMan</I> required pages to
+be formatted by nroff prior to its processing.  With version 3.0, it <i>prefers
+[tn]roff source</i> and usually produces results that are better yet.
+And source processing is the only way to translate tables.
+Source format translation is not as mature as formatted, however, so 
+try formatted translation as a backup.
+
+<P>In parsing [tn]roff source, one could implement an arbitrarily
+large subset of [tn]roff, which I did not and will not do, so the
+results can be off.  I did implement a significant subset of those use
+in man pages, however, including tbl (but not eqn), if tests, and
+general macro definitions, so usually the results look great.  If they
+don't, format the page with nroff before sending it to PolyglotMan.  If
+PolyglotMan doesn't recognize a key macro used by a large class of
+pages, however, e-mail me the source and a uuencoded nroff-formatted
+page and I'll see what I can do.  When running PolyglotMan with man
+page source that includes or redirects to other [tn]roff source using
+the .so (source or inclusion) macro, you should be in the parent
+directory of the page, since pages are written with this assumption.
+For example, if you are translating /usr/man/man1/ls.1, first cd into
+/usr/man.
+
+<P><I>PolyglotMan</I> accepts man pages from: SunOS, Sun Solaris, Hewlett-Packard HP-UX, 
+AT&amp;T System V, OSF/1 aka Digital UNIX, DEC Ultrix, SGI IRIX, Linux, 
+FreeBSD, SCO.    Source processing works for: SunOS, Sun Solaris, Hewlett-Packard HP-UX, 
+AT&amp;T System V, OSF/1 aka Digital UNIX, DEC Ultrix.
+It can produce printable ASCII-only (control characters
+stripped), section headers-only,
+Tk, TkMan, [tn]roff (traditional man page source), <!--Ensemble,--> SGML, HTML, MIME, 
+LaTeX, LaTeX2e, RTF, Perl 5 POD.  
+A modular architecture permits easy addition of additional output
+formats.</P>
+
+<P>The latest version of PolyglotMan is always available from 
+<tt>ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/rman.tar.Z</tt>.
+
+
+<H1>Options</H1>
+
+<P>The following options should not be used with any others and exit PolyglotMan 
+without processing any input.
+
+<DL>
+<DT>-h|--help</DT>
+<DD>Show list of command line options and exit.</DD>
+
+<DT>-v|--version</DT>
+<DD>Show version number and exit.</DD>
+</DL>
+
+
+<P><em>You should specify the filter first, as this sets a number of parameters,
+and then specify other options.</em>
+
+<DL>
+<DT>-f|--filter &lt;ASCII|roff|TkMan|Tk|<!--Ensemble|-->Sections|HTML|SGML|MIME|LaTeX|LaTeX2e|RTF|POD&gt;</DT>
+
+<DD>Set the output filter.  Defaults to ASCII.
+<!--  If you are converting
+from formatted roff source, it is recommended that you prevent hyphenation by using
+groff, making file with the contents ".hpm 20", can reading this in
+before the roff source, e.g., groff -Tascii -man <hpm-file> <roff-source>.
+-->
+</DD>
+
+<DT>-S|--source</DT>
+<DD>PolyglotMan tries to automatically determine whether its input is source or formatted;
+use this option to declare source input.</DD>
+
+<DT>-F|--format|--formatted</DT>
+<DD>PolyglotMan tries to automatically determine whether its input is source or formatted;
+use this option to declare formatted input.</DD>
+
+<DT>-l|--title <I>printf-string</I></DT>
+<DD>In HTML mode this sets the &lt;TITLE&gt; of the man pages, given the same
+parameters as <tt>-r</tt>.</DD>
+
+<DT>-r|--reference|--manref <I>printf-string</I></DT>
+<DD>In HTML and SGML modes this sets the URL form by which to retrieve other man pages.
+The string can use two supplied parameters: the man page name and its section.
+(See the Examples section.)  If the string is null (as if set from a shell
+by "-r ''"), `-' or `off', then man page references will not be HREFs, just set in italics.
+If your printf supports XPG3 positions specifier, this can be quite flexible.</DD>
+
+<DT>-V|--volumes <I>&lt;colon-separated list&gt;</I></DT>
+<DD>Set the list of valid volumes to check against when looking for 
+cross-references to other man pages.  Defaults to <tt>1:2:3:4:5:6:7:8:9:o:l:n:p</tt>
+(volume names can be multicharacter).
+If an non-whitespace string in the page is immediately followed by a left
+parenthesis, then one of the valid volumes, and ends with optional other
+characters and then a right parenthesis--then that string is reported as
+a reference to another manual page.  If this -V string starts with an equals
+sign, then no optional characters are allowed between the match to the list of
+valids and the right parenthesis.  (This option is needed for SCO UNIX.)
+</DD>
+
+</DL>
+
+
+<P>The following options apply only when formatted pages are given as input.
+They do not apply or are always handled correctly with the source.
+
+<DL>
+<DT>-b|--subsections</DT>
+<DD>Try to recognize subsection titles in addition to section titles.
+This can cause problems on some UNIX flavors.</DD>
+
+<DT>-K|--nobreak</DT>
+<DD>Indicate manual pages don't have page breaks, so don't look for footers and headers
+around them.  (Older nroff -man macros always put in page breaks, but lately
+some vendors have realized that printout are made through troff, whereas
+nroff -man is used to format pages for reading on screen, and so have eliminated
+page breaks.)  <I>PolyglotMan</I> usually gets this right even without this flag.</DD>
+
+<DT>-k|--keep</DT>
+<DD>Keep headers and footers, as a canonical report at the end of the page.</DD>
+
+<!-- this done automatically for Tcl/Tk pages; doesn't apply for others
+<DT>-c|--changeleft</DT>
+<DD>Move changebars, such as those found in the Tcl/Tk manual pages,
+to the left.</DD>
+-->
+
+<!-- agressive parsing works so well that this option has been removed
+<DT>-m|--notaggressive</DT>
+<DD><I>Disable</I> aggressive man page parsing.  Aggressive manual,
+which is on by default, page parsing elides headers and footers,
+identifies sections and more.</DD>
+-->
+
+<DT>-n|--name <I>name</I></DT>
+<DD>Set name of man page (used in roff format).
+If the filename is given in the form "<I>name</I>.<I>section</I>", the name
+and section are automatically determined.  If the page is being parsed from
+[tn]roff source and it has a .TH line, this information is extracted from that line.</DD>
+
+<DT>-p|--paragraph</DT>
+<DD>paragraph mode toggle.  The filter determines whether lines should be linebroken
+as they were by nroff, or whether lines should be flowed together into paragraphs.
+Mainly for internal use.</DD>
+
+<DT>-s|section <I>#</I></DT>
+<DD>Set volume (aka section) number of man page (used in roff format).</DD>
+
+<!-- if in source automatic, if in preformatted really doesn't work
+<DT>-T|--tables</DT>
+<DD>Turn on aggressive table parsing.</DD>
+-->
+
+<DT>-t|--tabstops <I>#</I></DT>
+<DD>For those macros sets that use tabs in place of spaces where
+possible in order to reduce the number of characters used, set
+tabstops every <I>#</I> columns.  Defaults to 8.</DD>
+
+
+</DL>
+
+
+<H1>Notes on Filter Types</H1>
+
+<H2>ROFF</H2>
+<P>Some flavors of UNIX ship man page without [tn]roff source, making one's laser printer
+little more than a laser-powered daisy wheel.  This filer tries to intuit
+the original [tn]roff directives, which can then be recompiled by [tn]roff.</P>
+
+<H2>TkMan</H2>
+<P>TkMan, a hypertext man page browser, uses <I>PolyglotMan</I> to show
+man pages without the (usually) useless headers and footers on each
+pages.  It also collects section and (optionally) subsection heads for
+direct access from a pulldown menu.  TkMan and Tcl/Tk, the toolkit in
+which it's written, are available via anonymous ftp from
+<tt>ftp://ftp.smli.com/pub/tcl/</tt></P>
+
+<H2>Tk</H2>
+
+<P>This option outputs the text in a series of Tcl lists consisting of
+text-tags pairs, where tag names roughly correspond to HTML.  This
+output can be inserted into a Tk text widget by doing an <tt>eval
+&lt;textwidget&gt; insert end &lt;text&gt;</tt>.  This format should be relatively
+easily parsible by other programs that want both the text and the
+tags.  Also see ASCII.</P>
+
+<!-- hard to track what Ensemble's input format is
+<H2>Ensemble</H2>
+<P>Ensemble, a multimedia editor of structured documents, is currently
+being developed by the research groups of Professors Michael A. Harrison and
+Susan L. Graham at the University of California, Berkeley.  With proper
+structure and presentation specifications (schemas), the appearance of
+a manual page can be radically transformed by Ensemble.</P>
+-->
+
+<H2>ASCII</H2>
+<P>When printed on a line printer, man pages try to produce special text effects
+by overstriking characters with themselves (to produce bold) and underscores
+(underlining).  Other text processing software, such as text editors, searchers,
+and indexers, must counteract this.  The ASCII filter strips away this formatting.
+Piping nroff output through <tt>col -b</tt> also strips away this formatting,
+but it leaves behind unsightly page headers and footers.  Also see Tk.</P>
+
+<H2>Sections</H2>
+<P>Dumps section and (optionally) subsection titles.  This might be useful for
+another program that processes man pages.</P>
+
+<H2>HTML</H2>
+<P>With a simple extention to an HTTP server for Mosaic or other World Wide Web
+browser, <I>PolyglotMan</I> can produce high quality HTML on the fly.
+Several such extensions and pointers to several others are included in <I>PolyglotMan</I>'s
+<tt>contrib</tt> directory.</P>
+
+<H2>SGML</H2>
+<P>This is appoaching the Docbook DTD, but I'm hoping that someone that someone
+with a real interest in this will polish the tags generated.  Try it to see
+how close the tags are now.</P>
+
+<H2>MIME</H2>
+<P>MIME (Multipurpose Internet Mail Extensions) as defined by RFC 1563,
+good for consumption by MIME-aware e-mailers or as Emacs (>=19.29)
+enriched documents.</P>
+
+<H2>LaTeX and LaTeX2e</H2>
+Why not?
+
+<H2>RTF</H2>
+<P>Use output on Mac or NeXT or whatever.  Maybe take random man pages
+and integrate with NeXT's documentation system better.  Maybe NeXT has
+own man page macros that do this.</P>
+
+<H2>PostScript and FrameMaker</H2>
+<P>To produce PostScript, use <tt>groff</tt> or <tt>psroff</tt>.  To produce FrameMaker MIF,
+use FrameMaker's builtin filter.  In both cases you need <tt>[tn]roff</tt> source,
+so if you only have a formatted version of the manual page, use <I>PolyglotMan</I>'s
+roff filter first.</P>
+
+
+<H1>Examples</H1>
+
+<P>To convert the <I>formatted</I> man page named <tt>ls.1</tt> back into
+[tn]roff source form:</P>
+
+<P>
+    <tt>rman -f roff /usr/local/man/cat1/ls.1 > /usr/local/man/man1/ls.1</tt><BR>
+
+<P>Long man pages are often compressed to conserve space (compression is
+especially effective on formatted man pages as many of the characters
+are spaces).  As it is a long man page, it probably has subsections,
+which we try to separate out (some macro sets don't distinguish
+subsections well enough for <I>PolyglotMan</I> to detect them).  Let's convert
+this to LaTeX format:<BR>
+
+<P>
+    <tt>pcat /usr/catman/a_man/cat1/automount.z | rman -b -n automount -s 1 -f latex > automount.man</tt><BR>
+
+<P>Alternatively,
+
+    <tt>man 1 automount | rman -b -n automount -s 1 -f latex > automount.man</tt><BR>
+
+<P>For HTML/Mosaic users, <I>PolyglotMan</I> can, without modification of the
+source code, produce HTML links that point to other HTML man pages
+either pregenerated or generated on the fly.  First let's assume
+pregenerated HTML versions of man pages stored in <I>/usr/man/html</I>.
+Generate these one-by-one with the following form:<BR>
+
+    <tt>rman -f html -r 'http:/usr/man/html/%s.%s.html' /usr/man/cat1/ls.1 > /usr/man/html/ls.1.html</tt><BR>
+
+<P>If you've extended your HTML client to generate HTML on the fly you should use
+something like:<BR>
+
+    <tt>rman -f html -r 'http:~/bin/man2html?%s:%s' /usr/man/cat1/ls.1</tt><BR>
+
+when generating HTML.</P>
+
+
+<H1>Bugs/Incompatibilities</H1>
+
+<P><I>PolyglotMan</I> is not perfect in all cases, but it usually does a
+good job, and in any case reduces the problem of converting man pages
+to light editing.</P>
+
+<P>Tables in formatted pages, especially H-P's, aren't handled very well.
+Be sure to pass in source for the page to recognize tables.</P>
+
+<P>The man pager <I>woman</I> applies its own idea of formatting for
+man pages, which can confuse <I>PolyglotMan</I>.  Bypass <I>woman</I>
+by passing the formatted manual page text directly into
+<I>PolyglotMan</I>.</P>
+
+<P>The [tn]roff output format uses fB to turn on boldface.  If your macro set
+requires .B, you'll have to a postprocess the <I>PolyglotMan</I> output.</P>
+
+
+<H1>See Also</H1>
+
+<tt>tkman(1)</tt>, <tt>xman(1)</tt>, <tt>man(1)</tt>, <tt>man(7)</tt> or <tt>man(5)</tt> depending on your flavor of UNIX
+
+<H1>Author</H1>
+
+<P>PolyglotMan<BR>
+by Thomas A. Phelps  (<tt>phelps@ACM.org</tt>)<BR>
+developed at the<BR>
+University of California, Berkeley<BR>
+Computer Science Division
+
+<P>Manual page last updated on $Date: 1998/07/13 09:47:28 $
+
+</BODY></HTML>
Index: xc/extras/rman/contrib/README-contrib
diff -u /dev/null xc/extras/rman/contrib/README-contrib:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/README-contrib	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,147 @@
+This directory contains files contributed by PolyglotMan users.  These
+files are not installed, supported or regularly updated to work with
+new versions of PolyglotMan.  They are included because some may find
+them useful, and if so they prevent duplication of effort.
+
+--
+
+* sutter.txt - "Edward L. Sutter" <els@sage.sage.att.com>
+
+"...converting "man" directories with their typical sub-directories of
+man1, man2, etc... to an equivalently structured "html" directory with
+the same sub-directory heirarchy."
+
+"I added an option to rman that allows it to search for the files over
+a specified set of directories.  This allows (for example) manpages under
+man1 that reference something under man3 to be properly linked."
+
+--
+
+* bennett.txt - Anne Bennett <anne@alcor.concordia.ca>
+
+"... I applied the mods in contrib/sutter.txt, and then amplified
+them.  I append the relevant context diffs.  In short, I added options
+"-P" (a URL prefix for use with the paths found by "-S"), and "-H" and
+"-F" (header and footer HTML files to help adjust the style of the
+resulting page, for example by adding company logos,
+return-to-home-page buttons, etc.)."
+
+--
+
+* authried.txt -  Erwin Authried <eauth@mail4u.atnet.at>
+
+"I wrote a small perl script (it's a quick hack) to view man-pages
+with the web-browser."
+
+--
+
+* gzip.patch - Todd Larason <jtl@molehill.org>
+
+"I keep several manpage hierarchies locally, for easy comparison when
+programming for multiple unix machines, most of which are across a
+relatively slow link.  To save disk space, I keep them gzipped.
+
+"Here's a small patch to make .so handling work against gzipped files.
+It's a late-night-after-a-long-day hack, but it seems clean enough.  If
+you think there might be any interest, feel free to include it either in
+rman itself or the contrib directory.  It's against 3.0a3."
+
+--
+
+* man2html - Marc Donner (donner@fid.morgan.com)
+
+A Korn Shell script that is moderately generic.  It takes all the
+files in a directory or a set of directories and does them one at a
+time, putting the html output somewhere appropriate.  The only
+infelicity in the script is the stuff with localeo (local electronic
+office) which is a hack put together to tweak the URLs not to refer to
+localhost, which is broken right now, but directly to the local
+server's alias.
+
+---
+
+* sco-wrapper.sh - Dag Nygren <dag@newtech.fi>
+
+SCO puts the names of valid man page sections in the file /etc/default/man.
+This wrapper extracts the names from this file and passes them on to 
+PolyglotMan for use in determining man page cross references.
+
+---
+
+* http-rman.{c,html} - Fredrik Lundh <fredrik@kalle.teragon.ivab.se>
+
+An HTTP server using PolyglotMan to produce hypertext renditions of
+man-pages on the fly.
+
+---
+
+* lewis.pl - Herb Lewis <herb@chomps.engr.sgi.com>
+
+CGI bin script written in Perl.
+
+---
+
+* hman.{cgi,ksh,pl} by teto@geocities.com
+A more recent version may be available at http://www.geocities.com/SiliconValley/Lakes/8777/hman.html
+
+    hman.cgi		An example of a cgi-bin wrapper to launch hman.pl
+			Ideally, all customization should occur here
+    hman.ksh		A stand-alone (non-browser) version of hman.cgi
+    hman.pl		The core of the PolyglotMan front-end
+
+"I've written a man to html front-end that appears to have unique features:
+A second attempt to locate related man pages is made if the original
+inquiry fails
+
+"Since PolyglotMan can filter nroff's output or can work with raw
+nroff files, this viewer allows selection of the actual man page
+file.  Thus either raw or cooked man pages can be selected directly.
+
+"The program is basic perl, but the implementation allows all customization
+to be embodied in enviroment variables that should be set in a cgi-bin
+wrapper."
+
+--
+
+* youki.pl - Youki Kadobayashi <youki@center.osaka-u.ac.jp>
+
+CGI bin script written in Perl 5, and using CGI.pm
+and thus "it can be accelerated with mod_perl".
+
+---
+
+rman_html_split - Robert Moniot <moniot@fordham.edu>
+rman_html_split.1
+
+Breaks up rman HTML output in file (or standard input) into separate
+section files, placing them into a directory.  With manual page.
+
+---
+
+Other converters are not included in this directory, but rather are
+available over the net:
+
+* bsdi-man.pl - Fritz Heinrichmeyer
+
+Available at:  http://ES-sun2.fernuni-hagen.de
+
+
+* bbc_man2html - Brooks Cutter (brooks@paradyne.com)
+
+Available at:  http://www.stuff.com/~bcutter/home/programs/bbc_man2html.html
+
+
+* rman.pl - Alex Gagin
+
+Available at: http://www.jinr.dubna.su/~gagin/rman.pl.html
+
+(Be aware that the communications link is slow.)
+
+
+* manner.pl - Ray W. Hiltbrand
+
+Available at:  ftp://ftp.eng.auburn.edu/pub/rayh/man2html/manner.pl
+
+
+The active list kept at http://http.cs.berkeley.edu/~phelps/tcltk/polyglotmen.html
+
Index: xc/extras/rman/contrib/authried.txt
diff -u /dev/null xc/extras/rman/contrib/authried.txt:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/authried.txt	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,36 @@
+#!/usr/local/bin/perl
+
+require "common.pl";
+
+$webmaster="webadmin\@domain";
+$man_path="/usr/local/man:/usr/man:/usr/X11/man:/usr/lib/teTeX/man";
+$manpage_and_section = $ENV{"QUERY_STRING"};
+$rman="/usr/local/bin/rman -f HTML";
+
+($manpage,$section)=split("[&]",$manpage_and_section);
+
+
+ split(":",$man_path);
+ foreach(@_){
+   $file=join("", $_, "/man", $section,"/",$manpage,".",$section);
+
+#   printf("try %s\n", $file);
+
+   if (-e $file) {
+ 	exec "echo Content-Type:text/html; echo; cat $file | $rman";
+   }
+   elsif (-e join("",$file,".gz")){
+ 	exec "echo Content-Type:text/html; echo; zcat $file | $rman";
+   }
+
+   $file=join("",$file,"x");
+   if (-e $file) {
+ 	exec "echo Content-Type:text/html; echo; cat $file | $rman";
+   }
+   elsif (-e join("",$file,".gz")){
+ 	exec "echo Content-Type:text/html; echo; zcat $file | $rman";
+   }
+
+ } 
+  
+&return_error(500,"man2html error","could not find manual page.");
Index: xc/extras/rman/contrib/bennett.txt
diff -u /dev/null xc/extras/rman/contrib/bennett.txt:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/bennett.txt	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,371 @@
+*** rman.c.original	Tue Jul 16 21:19:49 1996
+--- rman.c	Tue Aug 27 15:59:38 1996
+***************
+*** 1,5 ****
+--- 1,9 ----
+  static char rcsid[] = "$Header: /home/orodruin/h/bair/phelps/spine/rman/RCS/rman.c,v 1.70 1996/07/17 01:18:19 phelps Exp phelps $";
+  
++ /* ELS: SearchDirs by "Edward L. Sutter" <els@sage.sage.att.com> */
++ /* AB:  HTMLHeader and HTMLFooter by Anne Bennett <anne@alcor.concordia.ca> */
++ /* AB:  SearchDirsPrefix by Anne Bennett <anne@alcor.concordia.ca> */
++ 
+  /*
+    RosettaMan
+  
+***************
+*** 265,271 ****
+--- 269,278 ----
+  
+  /*** utility functions ***/
+  
++ /* 1996/08/26 Anne Bennett patched */
++ int HrefSearch(char *manname, char *section);
+  
++ 
+  /* case insensitive versions of strcmp and strncmp */
+  
+  int
+***************
+*** 1338,1343 ****
+--- 1345,1355 ----
+  char *manTitle = MANTITLEPRINTF;
+  char *manRef = MANREFPRINTF;
+  int fmanRef=1;	/* valid man ref? */
++                           /* 1996/08/26 Anne Bennett patched */
++ char *SearchDirs=0;       /* ELS: added for smarter external reference generator. */
++ char *SearchDirsPrefix=0; /* AB:  added for HREF prefix to manpage path.  */
++ char *HTMLHeader=0;       /* AB:  added for HTML header and footer files. */
++ char *HTMLFooter=0;       /* AB:  added for HTML header and footer files. */
+  
+  /*
+   * HTML
+***************
+*** 1349,1354 ****
+--- 1361,1373 ----
+  	int i,j;
+  	int lasttoc;
+  	char *p, *p0;
++ /* 1996/08/26 Anne Bennett patched */
++ /* AB:  To support HTMLHeader and HTMLFooter */
++ #define SUB_MANNAME "@@MANPAGE_NAME@@"
++ #define SUB_MANSECT "@@MANPAGE_SECTION@@"
++ #define STRING_SIZE 1024
++         char line[STRING_SIZE];
++         FILE *fp;
+  
+  	/* always respond to these signals */
+  	switch (cmd) {
+***************
+*** 1397,1402 ****
+--- 1416,1474 ----
+  		/* better title possible? */
+  		printf("<TITLE>"); printf(manTitle, manName, manSect); printf("</TITLE>\n");
+  		printf("</HEAD>\n<BODY>\n");
++ /* 1996/08/26 Anne Bennett patched */
++ /* AB:  added HTMLHeader file, if -H option is set */
++                 if (HTMLHeader) {
++                       if ((fp = fopen(HTMLHeader,"r")) == NULL) {
++                         fprintf(stderr,"Could not open HTMLHeader file\n");
++                       }
++                       else {
++                         /* Output the header file, replacing strings as needed */
++                         while (fgets(line, STRING_SIZE, fp) != (char *)NULL) {
++                            char *walker, *found;
++                            int i;
++ 
++                            /* replace man section */
++                            walker = line;
++                            while ( ( found = strstr(walker, SUB_MANSECT) ) != NULL ) {
++                               if ( (  strlen(line) + strlen(manSect) 
++                                     - strlen (SUB_MANSECT)          ) > sizeof(line) ) {
++                                  fprintf(stderr,"Cannot substitute %s for %s; "
++                                                 "line would be too long:\n "
++                                                 "%s\n", manSect, SUB_MANSECT, line);
++                               walker = found + strlen(SUB_MANSECT);
++                               }
++                               else {
++                               (void) memmove(found+strlen(manSect),
++                                              found+strlen(SUB_MANSECT),
++                                              strlen(found+strlen(SUB_MANSECT))+1);
++                               memcpy(found, manSect, strlen(manSect));
++                               walker = found + strlen(manSect);
++                               }
++                            }
++                            /* replace man name    */
++                            walker = line;
++                            while ( ( found = strstr(walker, SUB_MANNAME) ) != NULL ) {
++                               if ( (  strlen(line) + strlen(manName) 
++                                     - strlen (SUB_MANNAME)          ) > sizeof(line) ) {
++                                  fprintf(stderr,"Cannot substitute %s for %s; "
++                                                 "line would be too long:\n "
++                                                 "%s\n", manName, SUB_MANNAME, line);
++                               walker = found + strlen(SUB_MANNAME);
++                               }
++                               else {
++                               (void) memmove(found+strlen(manName),
++                                              found+strlen(SUB_MANNAME),
++                                              strlen(found+strlen(SUB_MANNAME))+1);
++                               memcpy(found, manName, strlen(manName));
++                               walker = found + strlen(manName);
++                               }
++                            }
++                            printf("%s", line);
++                         }
++                         fclose(fp);
++                       }
++                 }
+  		printf("<A HREF=\"#toc\">%s</A><P>\n", TABLEOFCONTENTS);
+  		I=0;
+  		break;
+***************
+*** 1424,1429 ****
+--- 1496,1514 ----
+  			if (lasttoc==BEGINSUBSECTION) printf("</UL>");
+  			printf("</UL>\n");
+  		}
++ /* 1996/08/26 Anne Bennett patched */
++ /* AB:  added HTMLFooter file, if -F option is set */
++                 if (HTMLFooter) {
++                       if ((fp = fopen(HTMLFooter,"r")) == NULL) {
++                         fprintf(stderr,"Could not open HTMLFooter file\n");
++                       }
++                       else {
++                         /* Output the footer file */
++                         while (fgets(line, STRING_SIZE, fp) != (char *)NULL)
++                            printf("%s", line);
++                         fclose(fp);
++                       }
++                 }
+  		printf("</BODY></HTML>\n");
+  		break;
+  	   case BEGINBODY:		break;
+***************
+*** 1500,1510 ****
+  		*p++='\0'; p0=p;
+  		for (; *p && *p!=')'; p++) /* empty */;
+  		*p='\0';
+! 		if (fmanRef) { printf("<A HREF=\""); printf(manRef, hitxt, p0); printf("\">"); }
+  		else printf("<I>");
+  		break;
+  	   case ENDMANREF:
+! 		if (fmanRef) printf("</A>"); else printf("</I>");
+  		break;
+  
+  	   case BEGINSC: case ENDSC:
+--- 1585,1604 ----
+  		*p++='\0'; p0=p;
+  		for (; *p && *p!=')'; p++) /* empty */;
+  		*p='\0';
+! /* 1996/08/26 Anne Bennett patched */
+! /* ELS: added a call to HrefSearch() if the -S option is set.. */
+!                 if (SearchDirs)
+!                         HrefSearch(hitxt,p0);
+!                 else if (fmanRef) {
+!                         printf("<A HREF=\"");
+!                         printf(manRef, hitxt, p0);
+!                         printf("\">");
+!                 }
+  		else printf("<I>");
+  		break;
+  	   case ENDMANREF:
+! /* 1996/08/26 Anne Bennett patched */
+! 		if (fmanRef || SearchDirs) printf("</A>"); else printf("</I>");
+  		break;
+  
+  	   case BEGINSC: case ENDSC:
+***************
+*** 2744,2754 ****
+--- 2838,2856 ----
+  	extern char *optarg;
+  	extern int optind, opterr;
+  
++ /* 1996/08/26 Anne Bennett patched */
++ /* ELS: added the -S option: */
++ /* AB:  added the -H and -F options */
++ /* AB:  added the -P option */
+  	char strgetopt[80];
+  	/* options with an arg must have a '<' in the description */
+  	struct { char letter; int arg; char *longnames; char *desc; } option[] = {
+  		{ 'f', 1, "filter", " <ASCII|roff|TkMan|Tk|Ensemble|Sections|HTML|SGML|MIME|LaTeX|LaTeX2e|RTF|pod>" },
+  		{ 'r', 1, "reference:manref:ref", " <man reference printf string>" },
++ 		{ 'S', 1, "searchdirs", " <man reference search directories>" },
++ 		{ 'P', 1, "prefix", " <prefix for manpage paths in -S>" },
++ 		{ 'H', 1, "header", " <HTML header file>" },
++ 		{ 'F', 1, "footer", " <HTML footer file>" },
+  		{ 'l', 1, "title", " <title printf string>" },
+  		{ 'b', 0, "subsections:sub", " (show subsections)" },
+  		{ 'n', 1, "name", "(ame of man page) <string>" },
+***************
+*** 2830,2835 ****
+--- 2932,2953 ----
+  		   case 'r': manRef = optarg;
+  			if (strlen(manRef)==0 || strcmp(manRef,"-")==0 || strcmp(manRef,"off")==0) fmanRef=0;
+  			break;
++ /* 1996/08/26 Anne Bennett patched */
++ /* ELS: added the -S option: */
++ /* AB:  added the -H and -F options */
++ /* AB:  added the -P option */
++ 		   case 'S': SearchDirs = optarg;
++ 			if (strlen(SearchDirs)==0 ) SearchDirs=0;
++ 			break;
++ 		   case 'P': SearchDirsPrefix = optarg;
++ 			if (strlen(SearchDirsPrefix)==0 ) SearchDirsPrefix=0;
++ 			break;
++ 		   case 'H': HTMLHeader = optarg;
++ 			if (strlen(HTMLHeader)==0 ) HTMLHeader=0;
++ 			break;
++ 		   case 'F': HTMLFooter = optarg;
++ 			if (strlen(HTMLFooter)==0 ) HTMLFooter=0;
++ 			break;
+  		   case 't': TabStops=atoi(optarg); break;
+  		   case 'm': fMan=0; break;
+  		   case 'T': fTable=1; break;
+***************
+*** 2904,2906 ****
+--- 3022,3126 ----
+  	filter();
+  	return 0;
+  }
++ 
++ 
++ /* 1996/08/26 Anne Bennett patched */
++ /* ELS... 
++    HrefSearch():
++ 	Active only with command line option -S...
++ 	Called when rman -fHTML has determined that it is going to add a
++ 	hypertext link.  The user tells rman where to search for the hypertext
++ 	links (local machine search only) and if HrefSearch() finds the file
++ 
++ 			SRCHDIR/manname.section
++ 
++ 	where
++ 		SRCHDIR is one of the colon-delimited paths specified with
++ 			the -S option;
++ 		manname is the text that rman found preceding a "manname(##)"
++ 			detection;
++ 		section is the string within the parens of the manname spec;
++ 
++ 
++ 	then it will use that path to build the HREF line.  If not found,
++ 	then <A> is all that is inserted.
++ 	This is generally only helpful when you are simply attempting to
++ 	turn a man directory into an html directory.
++ 
++ 	Note that if the first char of SearchDirs is a colon, then if
++ 	HrefSearch does not find the reference, it defaults to what rman
++ 	used to do (use manRef, -r option); otherwise, it will not add
++ 	a hypertext link at all.
++ */
++ int HrefSearch(char *manname, char *section)
++ {
++ 	char	*dir, *colon, tmp;
++ 	int	DefaultToManRef;
++ 	FILE	*fp;
++ 	static char	path[256];
++ 
++ 	tmp = 0;
++ 
++ again:
++ 	if (SearchDirs[0] == ':') {
++ 		dir = &SearchDirs[1];
++ 		DefaultToManRef = 1;
++ 	}
++ 	else {
++ 		dir = SearchDirs;
++ 		DefaultToManRef = 0;
++ 	}
++ 
++ 	/* Make 2 passes on all search directories... */
++ 	/* First pass is with the path dir/manname.section */
++ 	/* Second pass is with the path dir/manname.section[0] */
++ 	/* This allows the spec manname(3x) to be found as manname.3 */
++ 	/* just in cast manname.3x doesn't exist. */
++ 	/* Note that the second pass is only necessary if the section */
++ 	/* string is more than one character in length. */
++ 	while(1) {
++ 		colon =  strchr(dir,':');
++ 		if (colon) *colon = 0;
++ 		sprintf(path,"%s/%s.%s.html",dir,manname,section); 
++                 /* 1996/08/26 Anne: read-only, not rw, please. */
++ 		if ((fp = fopen(path,"r")) != NULL) {
++ 			printf("<A HREF=\"");
++                         /* AB:  Put in the manpage location prefix */
++                         if (SearchDirsPrefix)
++                                 printf("%s",SearchDirsPrefix);
++ 			printf("%s",path);
++ 			printf("\">");
++ 			fclose(fp);
++ 			if (colon) *colon = ':';
++ 			fprintf(stderr,"HREF @ %s\n",path);
++ 			return(1);
++ 		}
++ 		if (colon) {
++ 			*colon = ':';
++ 			dir = colon+1;
++ 		}
++ 		else
++ 			break;
++ 	}
++ 	if (section[1]) {
++ 		tmp = section[1];
++ 		section[1] = 0;
++ 		dir = SearchDirs;
++ 		goto again;
++ 	}
++ 	if (tmp)
++ 		section[1] = tmp;
++ 
++         /* 1996/08/27 Anne Bennett: use manRef only if set */
++ 	if (DefaultToManRef && manRef) {
++ 		printf("<A HREF=\"");
++ 		printf(manRef, manname, section);
++ 		printf("\">");
++ 	}
++ 	else
++ 		printf("<A>");
++ 	return(1);
++ }
++ 
++ /* End ELS additions. */
++ 
+*** rman.1.original	Tue Jul 16 21:19:49 1996
+--- rman.1	Tue Aug 27 15:16:29 1996
+***************
+*** 75,80 ****
+--- 75,109 ----
+  or `off', then man page references will not be HREFs, just set 
+  in italics. 
+  .TP 15
++ -S|--searchDirs \fIcolon-separated-directories \fR
++ Valid only with \fI-fHTML \fR, this option modifies the behaviour of
++ rman when inserting a hyperlink to a referenced manpage. 
++ The directories indicate where to look
++ for a pre-HTMLized version of the referenced manpage under the name 
++ " \fIname \fR. \fIsection \fR. \fIhtml \fR".  If the file is not
++ found, no hypertext link is added, except if the first character of
++ the directories list is a colon, in which case a link is added using
++ manRef, ( \fI-r \fR option).
++ .TP 15
++ -P|--prefix \fIstring \fR
++ Valid only with \fI-S \fR, the string indicates what prefix to add to
++ the path when constructing the hyperlink for a referenced manpage.
++ The string will usually be
++ similar to that given with \fI-r \fR, except that there will be no
++ printf-style escapes, for example "http://localhost/manpages".
++ .TP 15
++ -H|--header \fIfilename \fR
++ Valid only with \fI-fHTML \fR, the filename refers to a file
++ containing an HTML "header", which might consist of, for example, a
++ company logo, or body color specifications.  If the strings
++ "@@MANPAGE_NAME@@" or "@@MANPAGE_SECTION@@" are found in this file,
++ they are replaced by the appropriate manpage name and section.
++ .TP 15
++ -F|--footer \fIfilename \fR
++ Valid only with \fI-fHTML \fR, the filename refers to a file
++ containing an HTML "footer", which might consist of, for example, a
++ link back to the site's home page.
++ .TP 15
+  -s|section \fI# \fR
+  Set volume (aka section) number of man page (used in roff format). 
+  .TP 15
+
Index: xc/extras/rman/contrib/gzip.patch
diff -u /dev/null xc/extras/rman/contrib/gzip.patch:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/gzip.patch	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,46 @@
+--- rman.c.~1~	Wed Nov 20 13:33:52 1996
++++ rman.c	Fri Oct 24 00:10:56 1997
+@@ -3583,6 +3583,43 @@
+ 			}
+ 			free(sobuf);
+ 		}
++	} else {
++#define GZIP "/bin/gzip"
++		char * gz = malloc(strlen(p)+3+1);
++		sprintf(gz, "%s.gz", p);
++		if (stat(gz, &fileinfo)==0) {
++			/* first, figure out how big */
++			char * cmd = malloc(strlen(gz) + strlen(GZIP) + 7 + 1);
++			char buffer[512];
++			unsigned long compr, uncomp;
++			FILE * proc;
++			sprintf(cmd, "%s -l \"%s\"", GZIP, gz);
++			proc = popen(cmd, "r");
++			fgets(buffer, sizeof buffer, proc); /* label line */
++			fgets(buffer, sizeof buffer, proc); /* length line */
++			sscanf(buffer, "%lu %lu", &compr, &uncomp);
++			fclose(proc);
++			/* Boy, don't you wish stat would do that? */
++			sobuf = malloc(uncomp + 1);
++			if (sobuf!=NULL) {
++				/* suck in entire file, as above */
++				sprintf(cmd, "%s -dc \"%s\"", GZIP, gz);
++				proc = popen(cmd, "r");
++				if (proc!=NULL) {
++					if(fread(sobuf, 1, uncomp, proc)) {
++						sobuf[uncomp]='\0';
++						for (q=sobuf; (q=strstr(q," \\}"))!=NULL; q+=3) *q='\n';
++						source_subfile(sobuf);
++						err = 0;
++					}
++					fclose(proc);
++				}
++				free(sobuf);
++			}
++			free(cmd);
++		}
++		free(gz);
++
+ 	}
+ 
+ 	if (err) {
Index: xc/extras/rman/contrib/hman.cgi
diff -u /dev/null xc/extras/rman/contrib/hman.cgi:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/hman.cgi	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,7 @@
+#!/bin/ksh
+##########
+export MANPATH=/trane/mach/man:/trane/share/man:/usr/man:/usr/X11/man:/usr/openwin/man:/var/man
+export PATH=/trane/mach/bin:/trane/share/bin:$PATH
+export HMANPRG=rman
+export HMANOPT='-b -f html'
+exec /home/teto/dev/hman/hman.pl
Index: xc/extras/rman/contrib/hman.ksh
diff -u /dev/null xc/extras/rman/contrib/hman.ksh:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/hman.ksh	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,9 @@
+#!/bin/ksh
+##########
+export MANPATH=/trane/mach/man:/trane/share/man:/usr/man:/usr/X11/man:/usr/openwin/man:/var/man
+export PATH=/trane/mach/bin:/trane/share/bin:$PATH
+export HMANPRG=rman
+export HMANOPT='-b -f html'
+export QUERY_STRING='DirectPath=/usr/man/cat4.Z/cdf.4'
+export QUERY_STRING='ManTopic=test&ManSection=key'
+perl -d /home/teto/dev/hman/hman.pl
Index: xc/extras/rman/contrib/hman.pl
diff -u /dev/null xc/extras/rman/contrib/hman.pl:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/hman.pl	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,261 @@
+#!/usr/bin/perl -w
+#!/citi/gtfd/mach/bin/perl -w
+###############
+# $Id: hman.pl,v 1.7 1997/11/04 21:56:13 teto Exp teto $
+# $Source: /pub/src/dev/hman/RCS/hman.pl,v $
+############################################
+# TODO:
+#	reorganize location of man pages - move 3x stuff from man3 to man3x
+#	recurse - if 'man 3x curses' does not work try 'man 3 curses'
+#	display more STDERR
+#	Fix broken whatis entries - instead of
+#		manpage section - description
+#		manpage description section -
+#	highlite keywords found
+#	pass MANPATH as a command line argument
+############################################
+# Inspired by:
+#	http://www.jinr.dubna.su/~gagin
+#	http://thsun1.jinr.dubna.su/~gagin/rman.pl
+#	http://thsun1.jinr.dubna.su/cgi-bin/rman.pl
+#	http://www.jinr.dubna.su/~gagin/rman.pl.html
+#
+# CGI form interface to PolyglotMan program, which is available as
+#	ftp://ftp.cs.berkeley.edu:/ucb/people/phelps/tcltk/rman.tar.Z
+#
+# The most recent version of this program available as
+#	http://www.geocities.com/SiliconValley/Lakes/8777/hman.html
+#---------------------------------------------------------------------
+#  This is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+# 
+#  hman is distributed in the hope that
+#  it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+#  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the GNU General Public License for more details.
+# 
+#  You should have received a copy of the GNU General Public License
+#  along with this software; see the file COPYING.  If not, write to the
+#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+#  Boston, MA 02111-1307, USA.
+# 
+#  THIS SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE OR RESALE AS ON-LINE
+#  CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE
+#  PERFOHMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT
+#  NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE
+#  SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE
+#  SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE
+#  PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES").
+#  ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES
+#  IS SPECIFICALLY DISCLAIMED.
+#---------------------------------------------------------------------
+# Request form: hman.pl?ManTopic=SOMETOPIC&ManSection=SECTION
+# Request form: hman.pl?DirectPath=filename
+#
+#---------------------------------------------------------------------
+# Stuff to change
+
+# path to PolyglotMan program. "-b" is not nessesary
+$hman="$ENV{HMANPRG} $ENV{HMANOPT}";
+
+# path to man program
+$ManPrg='/usr/bin/man';
+
+# path to cat program
+$ENV{PAGER} = '/bin/cat';
+
+# path to man directories
+($ManPathFind = $ENV{MANPATH}) =~ s/:/ /g;
+
+# URL to this program
+$hmanpl='/cgi-bin/hman';
+
+# if man produced number of lines less then follows,
+# I assume that request failed
+$emptyman=5;
+
+# tail of every produced html document
+$HtmlTail='<hr><A HREF="' . $hmanpl . '">Back to Hman</a>';
+# $HtmlTitle="<title>CGI form interface to PolyglotMan</title>\n";
+$HtmlHdr="Content-type: text/html\n\n";
+
+# end changable things
+#----------------------------------------------------------------------
+@ManSections = (
+    '1', 'user commands',
+    '2', 'system calls',
+    '3', 'subroutines',
+    '4', 'devices',
+    '5', 'file formats',
+    '6', 'games',
+    '7', 'miscellanious',
+    '8', 'sys. admin.',
+    '9', 'Linux Internals',
+    'n', 'section n'
+);
+
+#   Set unbuffered I/O.  Prevents buffering problems with
+#   "system()" calls.
+select((select(STDOUT), $| = 1)[0]);
+print $HtmlHdr;
+
+$string = $ENV{QUERY_STRING};
+#
+#	Initial Form
+#
+if($string eq "") { initialForm(); }
+
+#
+#	Generic parameter parsing ...
+#
+$DirectPath = $ManSection = $ManTopic = "";
+$string =~ s/&/'; \$/g;
+$string =~ s/=/='/g;
+$string =~ s/^(.*)$/\$$1';/;
+eval $string;
+
+hmanDirect($DirectPath) if ($DirectPath ne "");
+
+if ($ManTopic eq "") { badness("<code>Topic for man search needed</code>\n"); }
+
+if ($ManSection eq "") { badness("<code>No section specified</code>\n"); }
+
+$ManSection =~ s/all//;
+if ($ManSection =~ /key/) { manKey($ManTopic); }
+
+findIt($ManTopic);
+open(MANOUT, "$ManPrg $ManSection $ManTopic |")
+    || die "$hmanpl: can't run \"$ManPrg Section $ManTopic |\", $!\n";
+for (0..$emptyman) {
+    $temp = <MANOUT> || last;
+    push @temp, $temp;
+}
+#
+if (@temp < $emptyman) {
+    close(MANOUT);
+    print"<strong>Request failed for topic $ManTopic:</strong>\n<code>";
+    for (@temp) {print;}
+    print "</code><br><h3>Let's try a keyword search:</h3><hr>\n";
+    manKey($ManTopic);
+}
+#
+$cmd = "$hman -r \"$hmanpl?ManTopic=%s&ManSection=%s\" -l \"Man page for $ManTopic";
+if ($ManSection eq "") {
+    $cmd .= '"';
+} else {
+    $cmd .= "($ManSection)\"";
+}
+#
+open(HMANIN, "| $cmd") || die "$hmanpl: can't open $cmd: $!\n";
+for (@temp) {print HMANIN;}
+while(<MANOUT>){print HMANIN;}
+close(MANOUT);
+close(HMANIN);
+
+exitIt();
+###############################################################################
+sub initialForm {
+    print <<EOF;
+<h1>Select a manual page:</h1>
+    <FORM METHOD="GET" action="$hmanpl">
+	<table border=0>
+	    <tr>
+		<td align=right>Section:</td>
+		<td>
+		    <select name=ManSection>
+			<OPTION value=all>All</option>
+			<OPTION value=key>Keyword Search</option>
+EOF
+    for ($ndx = 0; $ndx < @ManSections; $ndx += 2) {
+	print '			<OPTION value=' . $ManSections[$ndx] . '>'
+	    . "$ManSections[$ndx] - $ManSections[$ndx + 1] "
+	    . '</option>' . "\n";
+    }
+    print <<EOF;
+		    </SELECT>
+		</td>
+	    </tr>
+	    <tr>
+		<td align=right>Topic:</td>
+		<td><input type="TEXT" name="ManTopic"></td>
+	    </tr>
+	    <tr>
+		<td align=right><INPUT TYPE="submit" VALUE="Search">
+		<td align=left><input type="reset" value="Reset">
+		</td>
+	    </tr>
+	</table>
+    </FORM>
+EOF
+    exitIt();
+}
+sub findIt {
+    my($topic) = ($_[0]);
+    my($cmd, $mixedCase, $navigation, $zcat);
+    $mixedCase = '';
+    foreach (split(/\s*/, $topic)) {
+	$mixedCase .= "[" . $_ . uc($_) . "]";
+    }
+    $cmd = 'find ' . $ManPathFind . ' \( -type f -o -type l \) -name '
+	. $mixedCase .'\* | sort -t. +1';
+    open(FINDIN, "$cmd |") || die "can't open pipe \"$cmd |\": $!";
+    $navigation = 0;
+    while (<FINDIN>) {
+	if ($navigation == 0) {
+	    print "<UL>\n";
+	    $navigation = 1;
+	}
+	$_ =~ s/[\n\r]*$//;
+	print "<li><A HREF=\"$hmanpl?DirectPath=$_\">$_</a>\n";
+    }
+    close(FINDIN);
+    print "</UL><hr>\n" if ($navigation == 1);
+}
+sub hmanDirect {
+    my($path) = ($_[0], $_[1]);
+    my($cmd, $dir, $topic, $section);
+    ($dir = $path) =~ s/\.(gz|z|Z)$//;
+    ($topic = $dir) =~ s,^.*/,,;
+    $dir =~ s,/[^/]*/[^/]*$,,;
+    # $dir =~ s,/[^/]*$,,;
+    ($section=$topic)=~s/^.*\.([^\.]*)$/$1/;
+    $topic =~ s/\.[^\.]*$//;
+    findIt($topic);
+    $cmd = "cd $dir; (gzip -dc < $path 2>/dev/null || cat < $path) | $hman -r '"
+	. $hmanpl . '?ManTopic=%s&ManSection=%s' ."' -l 'Man page for $topic($section)'";
+    system($cmd) || warn "can't run command \"$cmd\": $!";
+    print $HtmlTail;
+    exit 0;
+}
+sub exitIt {
+    print $HtmlTail;
+    exit 0;
+}
+sub badness {
+    my($text) = ($_[0]);
+    print "<strong>Request failed:</strong> $text, Try again<hr>\n";
+    initialForm();
+}
+sub manKey {
+    my($topic) = ($_[0]);
+    open(TMPHTML,"$ManPrg -k $topic | sort -u |")
+	|| die "can't open pipe \"$ManPrg -k $topic | sort -u |\": $!\n";
+    print "<title>Keyword search results for \"$topic\"</title>\n";
+    print "<h1>Keyword search results for \"$topic\"</h1><hr>\n";
+    while(<TMPHTML>) {
+	s/\( \)//g;
+	next if (! /^([^(]+)\s*\(([^)]+)[^-]+-\s(.*)[\n\r]*$/);
+	@topics=split(/, /,$1);
+	next if ($2 eq "");
+	print "<h2>$3:</h2>\n";
+	print "<UL>\n";
+	for $topic (@topics) {
+	    print "<li><A HREF=\"$hmanpl?ManSection=$2&ManTopic=$topic\">$topic</a>($2)\n";
+	}
+	print "</UL>\n";
+    }
+    close(TMPHTML);
+    exitIt();
+}
Index: xc/extras/rman/contrib/http-rman.c
diff -u /dev/null xc/extras/rman/contrib/http-rman.c:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/http-rman.c	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,200 @@
+/* $Id: http-rman.c,v 1.2 1994/05/15 14:55:12 fredrik Exp $
+ *
+ * Name:
+ *	http-rman.c -- a rudimentary man-page HTTP server
+ *
+ * Description:
+ *	This is a minimal HTTP server using RosettaMan by T.A. Phelps
+ *	(phelps@ACM.org) to produce hypertext renditions
+ *	of man-pages on the fly.
+ *
+ *	This server processes URLs with the following syntax:
+ *
+ *		[/man] ?<command> [ ?<section> ]
+ *
+ *	For URLs matching this format, it pipes the output of
+ *	man <section> <command> through rman and sends it to
+ *	the HTTP client. For other URLs, it returns the document
+ *	given as argv[1] (using cat(1). The leading /man is
+ *	optional, but is strongly recommended.
+ *
+ *	This server is shipped as two files, the http-rman.c
+ *	sources and the http-rman.html sample frontpage. I have
+ *	not included a Makefile; you can write your own or just
+ *	type [g]cc -o http-rman http-rman.c
+ *
+ * What do I need to run this:
+ *	If you don't have it, pick up RosettaMan by anonymous ftp
+ *	from ftp.cs.berkeley.edu: /ucb/people/phelps/tcl/rman.tar.Z
+ *
+ *	You'll also need an HTTP client such as NCSA Mosaic to talk
+ *	to this server. Mosaic is available by anonymous FTP from
+ *	ftp://ftp.ncsa.uiuc.edu/Mosaic 
+ *
+ *	Both RosettaMan (rman) and Mosaic are available from many
+ *	other sites. Try Archie, or check your local or national net
+ *	archive.
+ *
+ * How do I get it running:
+ *	First, compile the server (see above), and install it
+ *	somewhere.
+ *
+ *	The server runs under inetd(8). Add a service to
+ *	/etc/services, say:
+ *
+ *		http-rman 4080/tcp
+ *
+ *	If you're not about to install another HTTP server on your
+ *	machine, you may use the default HTTP port, 80, instead.
+ *
+ *	Then add an entry to /etc/inetd.conf, such as (on a single line):
+ *
+ *		http-rman stream tcp nowait root /usr/local/bin/http-rman
+ *			http-rman /usr/local/lib/rman/http-rman.html
+ *
+ *	Change /usr/local/bin and /usr/local/lib/rman to where you
+ *	installed the two files. In addition, you may wish to run
+ *	the server as something other than root...
+ *
+ *	Restart inetd(8) (use kill -HUP or kill it and start it again)
+ *	and try the following:
+ *
+ *	$ Mosaic http://localhost:4080
+ *
+ *	If you don't have Mosaic, try the following instead:
+ *
+ *	$ telnet localhost 4080
+ *	Trying 127.0.0.1...
+ *	Connected to localhost.
+ *	Escape character is '^]'.
+ *	GET /man?ls <return>
+ *	<return>
+ *	HTTP/1.0 200 OK
+ *	...
+ *
+ * Portability:
+ *	You'll need an ANSI compiler (or an editor and some patience).
+ *	As it stands right now, this code has been successfully
+ *	compiled on OSF/1 AXP using cc, and on SunOS 4.1 using gcc.
+ *	Might need some tuning for other platforms.
+ *
+ * Legal Issues:
+ *	Check the external visibility of the http-rman service
+ *	you choose. This server gives a user access to ALL man-
+ *	pages on your machine. You may have installed copyrighted
+ *	software (your operating system, for example) with
+ *	man-pages that you are NOT allowed to make visible for
+ *	anyone out there...
+ *
+ * History:
+ *	94-04-30 fl: created
+ *	94-05-13 fl: stripped away everything but rman support
+ *
+ * Copyright (c) Fredrik Lundh 1994 (fredrik_lundh@ivab.se)
+ * All rights reserved.
+ */
+
+
+#include <stdio.h>		/* printf(), fflush(stdio) etc */
+#include <string.h>		/* strrchr(), strcmp() etc */
+
+
+static int
+http_error(int error)
+{
+    char *p;
+
+    switch (error) {
+    case 400:
+	p = "Bad Request";
+	break;
+    case 404:
+	p = "Not Found";
+	break;
+    default:
+	p = "Error";
+    }
+    printf("HTTP/1.0 %d %s\r\n", error, p);
+    printf("MIME-version: 1.0\r\n");
+    printf("Content-Type: text/html\r\n\r\n");
+    printf("<head><title>%d %s</title></head>\r\n", error, p);
+    printf("<body><h1>%d %s</h1></body>\r\n", error, p);
+    return 0;
+}
+
+
+static int
+http_rman(char *url)
+{
+    char *pName;
+    char *pSection;
+    char buf[200];
+
+    /* parse URL: should be /man?command[?section] */
+    pSection = strrchr(url, '?');
+    if (!pSection) {
+	return -1;
+    }
+    pName = pSection-1;
+    *pSection++ = '\0';
+
+    pName = strrchr(url, '?');
+    if (!pName) {
+	pName = pSection;
+	pSection = "";
+    }
+    else
+	pName++;
+
+    sprintf(buf, "man %s %s | rman -r \"man?%%s?%%s\" -n %s -f html",
+	    pSection, pName, pName);
+
+    return system(buf);
+}
+
+
+int
+main(int ac, char **av)
+{
+    char buf[200];
+    char url[200];
+    int status;
+    char *sFrontpage = "/usr/local/lib/rman/http-rman.html";
+
+/* check arguments */
+
+    if (ac > 1)
+	sFrontpage = av[1];
+
+/* just read in one line from stdin and make sure it is a GET
+command */
+
+    if (gets(buf)) {
+
+	/* read rest of command (just for the sake of it) */
+	while (gets(url) && url[0] != '\r')
+	    ;
+
+	/* command should be GET <url> [HTTP/1.0] */
+	if (sscanf(buf, "GET %s", url) == 1) {
+
+	    status  = http_rman(url);
+
+	    if (status < 0) {
+		sprintf(buf, "cat %s", sFrontpage);
+		if (system(buf) == 0)
+		    status = 0;
+	    }
+
+	    if (status < 0)
+		http_error(404);
+
+	} else
+
+	    http_error(400);
+    }
+
+    fflush(stdout);
+
+    exit(0);
+}
Index: xc/extras/rman/contrib/http-rman.html
diff -u /dev/null xc/extras/rman/contrib/http-rman.html:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/http-rman.html	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,21 @@
+HTTP/1.0 200 OK
+Server: http-rman 1.0
+MIME-Version: 1.0
+Content-Type: text/html
+Content-Transfer-Encoding: binary
+
+<html>
+<!-- this is a sample frontpage for the http-rman man-page server -->
+<!-- Copyright (c) 1994 Fredrik Lundh (fredrik_lundh@ivab.se) -->
+<head><title>RosettaMan Gateway</title></head>
+<h1>RosettaMan Gateway</h1>
+
+This is a gateway to the man pages on this machine. Please enter the
+function or command you want to know more about.
+<p>
+<isindex>
+<p>
+The hypertext man-pages are generated on the fly using the excellent
+<A HREF="/man?rman">RosettaMan</A> utility by T.A. Phelps. This minimal
+HTTP-server was written by Fredrik Lundh.
+</html>
Index: xc/extras/rman/contrib/lewis.pl
diff -u /dev/null xc/extras/rman/contrib/lewis.pl:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/lewis.pl	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,17 @@
+#!/usr/bin/perl
+
+# Syntax: man2html <topic> <section>
+
+# Print out a content-type for HTTP/1.0 compatibility
+print "Content-type: text/html\n\n";
+
+if( $ENV{'REQUEST_METHOD'} eq "GET" )
+{
+   $buffer=$ENV{'QUERY_STRING'} ;
+   @ARGV = split(/&/,$buffer) ;
+}
+
+@manpage = `man @ARGV[1] @ARGV[0] | rman -f html -n @ARGV[0] -s
+@ARGV[1]`;
+
+print "@manpage";
Index: xc/extras/rman/contrib/man2html
diff -u /dev/null xc/extras/rman/contrib/man2html:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/man2html	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,108 @@
+#!/bin/ksh
+
+# Take a man tree and make an html tree out of it
+
+DOMAIN=$(domainname)
+ARCH=$(arch)
+ 
+case ${DOMAIN} in
+   acf)     localeo=reo1 ;;
+   bwfid)   localeo=reo1 ;;
+   chfid)   localeo=neo1 ;;
+   hkfid)   localeo=teo1 ;;
+   lnfid)   localeo=leo1 ;;
+   nyfid)   localeo=neo1 ;;
+   psfid)   localeo=leo1 ;;
+   sffid)   localeo=neo1 ;;
+   tkfid)   localeo=teo1 ;;
+   esac
+
+sections="{1,2,3,4,5,6,7,8}"
+from=/usr/man
+to=/u/eo/repository/system/unix/man
+
+function disambiguate
+{
+newbase=${1}
+newname="${newbase}.1"
+dis=2
+while [ -a "${newname}" ]
+   do
+      newname=$newbase"."$dis
+      dis=$(expr $dis + 1)
+      done
+}
+
+while getopts f:t:l:is:v c
+   do
+      case $c in
+         f) from=$OPTARG ;;
+         t) to=$OPTARG ;;
+         l) localeo=$OPTARG ;;
+         i) indexonly=1 ;;
+         s) sections=$OPTARG ;;
+         v) verbose=1 ;;
+         esac
+      done
+shift OPTIND-1
+
+if [ "${verbose}" ]
+   then
+      print "from: $from"
+      print "to: $to"
+      print "localeo: $localeo"
+      print "sections: $sections"
+      if [ "${indexonly}" ]
+	 then
+	    print "indexonly: 1"
+	 fi
+   fi
+
+cd $from
+
+if [ ! "${indexonly}" ]
+   then
+      print "Processing the man pages ..."
+      for i in man${sections}/*
+	 do
+	    if [ "$verbose" ]
+	       then
+		  print $i
+	       fi
+	    # n=${i%.*}
+	    name=${to}/${i}
+	    if [ -a "${name}" ]
+	       then
+		  oldname=$name
+		  disambiguate $name
+		  name=$newname
+		  print "Collision - ${oldname} will be stored as ${name}"
+	       fi
+	    eqn $i | tbl | nroff -man | rman -f HTML | sed -e "s/MS_LOCAL_HOST/${localeo}/g" > ${name}
+	    done
+   fi
+
+print "Building the index.html files ..."
+cd $to
+for i in man${sections}
+   do
+      if [ "$verbose" ]
+	 then
+	    print $i
+	 fi
+      cd $i
+      rm -f index.html
+      echo '<ul>' > ../new.html
+      for j in *
+	 do
+	    if [ "$verbose" ]
+	       then
+		  print -n "$j "
+	       fi
+	    print
+	    print "<li> <a href=$j>$j</a>" >> ../new.html
+	    done
+      echo '</ul>' >> ../new.html
+      mv ../new.html index.html
+      cd ..
+      done
Index: xc/extras/rman/contrib/rman_html_split
diff -u /dev/null xc/extras/rman/contrib/rman_html_split:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/rman_html_split	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,324 @@
+#!/bin/sh
+#
+# Script to break up rman html output into separate sections in a directory.
+#
+# Author: Robert Moniot <moniot@fordham.edu>
+# Date:   4 Aug 1998
+#
+
+version="rman_html_split V1.0 (c) 1998 Robert K. Moniot"
+
+	    # Usage function prints synopsis and exits
+Usage(){
+  myname=`echo $0 | sed -e 's,.*/,,'`
+cat <<EOF
+
+Usage: $myname [ options ] [ file ]
+
+Breaks up rman HTML output in file (or standard input) into separate
+section files, placing them into a directory.
+
+Options:
+    -d | --html-dir dir   Place output into directory dir (default = html).
+    -m | --merge #        Merge sections 0 thru # (default 1) into one file.
+    -t | --toc-first      Link index.html to table of contents instead
+                          of to sect0.html.
+    -T | --title "title"  Use "title" as title on top of each page
+                          instead of rman's title.  "title" may be empty.
+    -h | --help           Print synopsis and exit.
+    -V | --version        Print version information and exit.
+EOF
+  exit 0
+}
+
+	    # Version function prints version number and exits
+Version(){
+  echo "$version"
+  exit 0
+}
+
+	    # This function puts out header needed by all but 1st page.
+do_header(){
+cat <<EOF
+<HTML>
+<HEAD>
+<TITLE>$*</TITLE>
+</HEAD>
+<BODY>
+EOF
+do_title
+}
+
+	    # This function puts out the title with name of manpage
+do_title(){
+  if [ -n "$title" ]
+  then
+    echo "<H2>$title</H2>"
+  fi
+}
+
+	    # This function puts out ref to table of contents that
+	    # follows header for all but 1st and toc page.
+do_href_toc(){
+cat <<EOF
+<A HREF="toc.html">Table of Contents</A><P>
+EOF
+}
+
+	    # This function puts out ref to previous section
+do_href_prev(){
+  echo "<P>Previous: <A HREF=\"$1.html\">$2</A><HR><P>"
+}
+
+	    # This function puts out footer needed by all but last page.
+do_footer(){
+cat <<EOF
+</BODY></HTML>
+EOF
+}
+
+	    # This function changes the trailing NAME anchor
+	    # of a section into an href to the next section.
+	    # The first edit is for sections.  The second edit
+	    # handles the toc anchor, which has no href and so
+	    # is missed by the first edit.
+do_href_next(){
+ sed -e '$s,^.*<A NAME="\([^"]*\)" HREF=[^>]*>\([^<]*\).*$,<P><HR><P>Next: <A HREF="\1.html">\2</A>,' \
+     -e '$s,<A NAME="\(toc[^"]*\)",Next: <A HREF="\1.html",'
+}
+
+	    # This function adapts internal refs from one-big-file
+	    # form into multi-file format.
+	    # First edit changes "#tocn" into "toc.html#tocn"
+	    # Second edit changes "#sectn" into "sectn.html#sectn"
+	    # Third edit changes "#toc" into "toc.html"
+change_hrefs(){
+    sed -e 's,HREF="#toc\([0-9][0-9]*\)",HREF="toc.html#toc\1",g' \
+	-e 's,HREF="#sect\([0-9][0-9]*\)",HREF="sect\1.html#sect\1",g' \
+        -e 's,HREF="#\(toc\)",HREF="\1.html",g'
+}
+
+
+#  Execution begins here.
+
+				# Process the command-line options.
+htmldir="html"
+mergesect="1"
+
+while [ $# != 0 ]
+do
+  case $1 in
+
+    -d | --html-dir)
+	shift
+	if [ $# != 0 ]
+	then
+	    htmldir="$1"
+	    shift
+	fi
+	;;
+
+    -m | --merge)
+	shift
+	if [ $# != 0 ]
+	then
+	    mergesect="$1"
+	    shift
+	fi
+	case $mergesect in
+	    [0-9])
+		;;
+	    *)
+		echo "ERROR: merge section must be a digit from 0 to 9."
+		Usage
+		;;
+	esac
+	;;
+
+    -t | --toc-first)
+	shift
+	tocfirst="t"
+	;;
+
+    -T | --title)
+	shift
+	if [ $# != 0 ]
+	then
+	    title="$1"
+	    shift
+	fi
+	if [ -z "$title" ]	# If title is the null string, set notitle
+	then
+	    notitle="t"
+	fi
+	;;
+
+    -h | --help)
+	Usage
+	;;
+
+    -V | --version)
+	Version
+	;;
+
+				# Unrecognized flag.
+    -*)
+	echo "Unrecognized option: $1"
+	Usage
+	;;
+
+				# Non-flag: go to process file.
+    *)
+	break
+	;;
+  esac
+done
+
+				# At this point we should have at most one
+				# argument, the file name.  Check it.
+if [ $# -gt 1 ]
+then
+  Usage
+fi
+
+if [ $# = 1 ]
+then
+  if [ ! -r "$1" ]
+  then
+    echo "ERROR: Cannot open file $1."
+    exit 1
+  fi
+fi
+
+		# Filter the input (file arg or stdin) thru a sed script
+		# that fixes cases where an anchor for a section has
+		# had its section title split across two or more lines.
+		# Put the result in a tmp file so it can be re-read.
+
+filename="/tmp/rman_html_split_$$.html"
+trap "rm -f $filename" 0
+sed -e ':top' \
+    -e '/^<H[1-9]><A NAME="sect.*[^>]$/N' \
+    -e '/^<LI><A NAME="toc.*[^>]$/N' \
+    -e 's/\n/ /' \
+    -e 't top' $1 > $filename
+
+		# If user did not supply title, get title for top of
+		# each page from rman-generated <TITLE> line.  If user
+		# gave a blank title then leave it blank.
+if [ -z "$title" -a -z "$notitle" ]
+then
+  title=`sed -e '/^<TITLE>/q'  $filename |
+         sed -n -e 's,^<TITLE>\([^<]*\).*$,\1,p'`
+fi
+
+		# Get a list of all the sections.  Separate it into a
+		# list of merged sections and a list of all other sections.
+		# Merged sects are combined and get special treatment besides.
+allsects=`sed -n 's,^.*<A NAME="\(sect[0-9][0-9]*\)".*$,\1,p' $filename`
+
+mergesects=`echo $allsects | \
+	    awk '{for(i=1; i<=NF && i<'"$mergesect"+2'; i++) print \$i;}'`
+
+sectlist=`echo $allsects |
+	    awk '{for(i='"$mergesect"'+2; i<=NF; i++) print \$i;}'`
+
+
+# This little bit, copied from GNU configure, sets ac_n and ac_c such
+# that echo $ac_n "stuff $ac_c" yields "stuff " w/o following newline.
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+		# Create html directory if it does not exist.
+if [ -d $htmldir ]
+then
+  echo "Re-using directory $htmldir."
+else
+  echo "Creating directory $htmldir..."
+  if mkdir $htmldir
+  then
+    true
+  else
+    echo "Failed!"
+    exit 1
+  fi
+fi
+
+echo "Creating section pages..."
+
+		# Produce index page.  It is special, since it combines
+		# merged sections and uses the rman-generated header.
+nextsect=`echo $sectlist | awk '{print $1;}'`
+echo $ac_n $mergesects "$ac_c"
+(do_title ;
+ sed -n -e "1,/^<H[23]><A NAME=\"$nextsect\"/p"  $filename | \
+ do_href_next | \
+ change_hrefs ;
+ do_footer) > $htmldir/sect0.html
+
+		# Produce pages for all other sections except toc.
+prevsect="sect$mergesect"
+prevtext=`sed -n 's,^<H[23]><A NAME="'$prevsect'" HREF="#toc[0-9][0-9]*">\([^<]*\).*$,\1,p' $filename | sed -e 's/ *$//'`
+for sect in $sectlist;
+do
+    echo $ac_n "$sect $ac_c"
+    headtext=`sed -n 's,^<H[23]><A NAME="'$sect'" HREF="#toc[0-9][0-9]*">\([^<]*\).*$,\1,p' $filename | sed -e 's/ *$//'`
+    (do_header $headtext ;
+     do_href_toc ;
+     do_href_prev "$prevsect" "$prevtext" ;
+     sed -n -e '/<A NAME="'$sect'"/,/<A NAME=/p' $filename |
+     do_href_next |
+     change_hrefs ;
+     do_footer) > $htmldir/$sect.html
+     prevsect="$sect"
+     prevtext="$headtext"
+done
+
+
+		# Produce table of contents
+echo "toc"
+(do_header Table of Contents ;
+ sed -n -e '/<A NAME="toc">/,$p' $filename | \
+ change_hrefs ;
+) > $htmldir/toc.html
+
+
+		# Finally, make sure the symlinks index.html and
+		# sect1.html -> sect0.html are in place, and if not,
+		# create them.  If --tocfirst is not specified, then
+		# link index.html to section 0, otherwise link it to
+		# index.html
+
+echo "Doing symlinks..."
+cd $htmldir
+
+rm -f index.html
+if [ -z "$tocfirst" ]
+then
+    echo "Linking index.html -> sect0.html"
+    ln -s sect0.html index.html
+else
+    echo "Linking index.html -> toc.html"
+    ln -s toc.html index.html
+fi
+
+for sect in $mergesects
+do
+  if [ "$sect" != "sect0" ]
+  then
+    echo "Linking $sect.html -> sect0.html"
+    rm -f $sect.html
+    ln -fs sect0.html $sect.html
+  fi
+done
+
+echo "Done."
Index: xc/extras/rman/contrib/rman_html_split.1
diff -u /dev/null xc/extras/rman/contrib/rman_html_split.1:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/rman_html_split.1	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,71 @@
+.TH rman_html_split 1 "4 Aug 1998"
+.SH NAME
+rman_html_split \-  split rman html output into separate sections
+.SH SYNOPSIS
+.B rman_html_split
+[
+.I options
+] [
+.I file
+]
+.SH DESCRIPTION
+The \fBrman_html_split\fP script reads a file containing HTML produced
+from a manual page by the \fBrman\fP(1) program, and splits it into a
+set of files, each containing one section or subsection of the manual.
+Each section file has added to it an optional header identifying the
+program described by the manual page, a link to the table of contents,
+and links to the previous section and the next section.  The separate
+section files are placed in a subdirectory.  A symbolic link named
+\fIindex.\|html\fP is created in this subdirectory, linked to either
+\fIsect0.\|html\fP (the first section) or \fItoc.\|html\fP (the table
+of contents section).
+.PP
+Use this script to split a large manual page into smaller, more
+manageable parts for use as online web-based documentation.
+.SH OPTIONS
+.TP
+.BR  "\-d \fIdir\fP" " | "  "\-\-html\-dir \fIdir\fP"
+Place output into directory \fIdir\fP.  The default directory name is
+\fIhtml\fP.
+.TP
+.BR "\-m \fInum\fP" " | "  "\-\-merge \fInum\fP"
+Merge sections 0 thru \fInum\fP into one file.  The default for
+\fInum\fP is 1, since usually section 0 is the NAME section and
+section 1 is SYNOPSIS, which are usually both short and go well
+together.  Set
+.I num
+to 0 to prevent merging, or set it to a larger number to merge more
+initial sections.  Maximum value of \fInum\fP is 9. There is no
+provision for merging sections other than consecutive numbers from
+section 0.
+.TP
+.BR \-t " | "  \-\-toc\-first
+Link \fIindex.\|html\fP to the table of contents.  By default, it is
+linked to \fIsect0.\|html\fP.  Use this if you prefer the initial page
+to be the table of contents rather than the first section of the
+manual page.
+.TP
+.BR "\-T \fItitle\fP" " | "  "\-\-title \fItitle\fP"
+Use \fItitle\fP as a header on top of each page.  This header is
+displayed using the H2 HTML tag.  By default, \fBrman_html_split\fP uses
+the title generated by \fBrman\fP.  By making \fItitle\fP the empty
+string (""), the header can be suppressed entirely.
+.TP
+.BR \-h " | "  \-\-help
+Print synopsis and exit.
+.TP
+.BR \-V " | "  \-\-version
+Print version information and exit.
+.SH SEE ALSO
+.BR man (1),
+.BR rman (1).
+.SH BUGS
+You tell me.
+.SH AUTHOR
+Robert K. Moniot <moniot@fordham.edu>
+.br
+Fordham University
+.br
+Department of Computer and Information Sciences
+.br
+New York, NY
Index: xc/extras/rman/contrib/sco-wrapper.sh
diff -u /dev/null xc/extras/rman/contrib/sco-wrapper.sh:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/sco-wrapper.sh	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,6 @@
+#
+REALRMAN=/usr/local/bin/rman.real
+VOLLISTFILE=/etc/default/man
+
+VOLLIST=`grep '^ORDER' $VOLLISTFILE | cut -f2 -d=`
+exec $REALRMAN -V "=$VOLLIST" $*
Index: xc/extras/rman/contrib/sutter.txt
diff -u /dev/null xc/extras/rman/contrib/sutter.txt:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/sutter.txt	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,155 @@
+"Edward L. Sutter" <els@sage.sage.att.com>
+
+Perhaps there is already a better way to do this, but since I couldn'd find
+one, I'd like to make a suggestion that has helped me quite a bit for getting
+the proper hypertext links.  Keep in mind that this is under the context of
+me converting "man" directories with their typical sub-directories of
+man1, man2, etc... to an equivalently structured "html" directory with
+the same sub-directory heirarchy.
+
+I added an option to rman that allows it to search for the files over
+a specified set of directories.  This allows (for example) manpages under
+man1 that reference something under man3 to be properly linked.
+
+rman.c v2.4 ...
+
+...
+
+/* ELS: added to support a smarter external reference generator. */
+char	*SearchDirs=0;
+int 	HrefSearch();
+
+...
+
+/* ELS: added the -S option: */
+	while ((c=getopt(argc,argv,"Kh?f:l:r:bckmTpvn:t:s:yS:"))!=-1)
+		switch (c) {
+		   case 'k': fHeadfoot=1; break;
+		   case 'b': fSubsections=1; break;
+		   case 'c': fChangeleft=1; break;
+		   case 'S': SearchDirs=optarg; break;
+
+
+...
+
+
+void
+HTML(enum command cmd) {
+
+...
+
+	
+	   case BEGINMANREF:
+		for (p=hitxt; *p && *p!='('; p++) /* empty */;
+		*p++='\0'; p0=p;
+		for (; *p && *p!=')'; p++) /* empty */;
+		*p='\0';
+/* ELS: added a call to HrefSearch() if the -S option is set.. */
+		if (SearchDirs)
+			HrefSearch(hitxt,p0);
+		else {
+			printf("<A HREF=\"");
+			printf(manRef, hitxt, p0);
+			printf("\">");
+		}
+		break;
+
+
+...
+
+
+/* ELS... 
+   HrefSearch():
+	Active only with command line option -S...
+	Called when rman -fHTML has determined that it is going to add a
+	hypertext link.  The user tells rman where to search for the hypertext
+	links (local machine search only) and if HrefSearch() finds the file
+
+			SRCHDIR/manname.section
+
+	where
+		SRCHDIR is one of the colon-delimited paths specified with
+			the -S option;
+		manname is the text that rman found preceding a "manname(##)"
+			detection;
+		section is the string within the parens of the manname spec;
+
+
+	then it will use that path to build the HREF line.  If not found,
+	then <A> is all that is inserted.
+	This is generally only helpful when you are simply attempting to
+	turn a man directory into an html directory.
+
+	Note that if the first char of SearchDirs is a colon, then if
+	HrefSearch does not find the reference, it defaults to what rman
+	used to do (use manRef, -r option); otherwise, it will not add
+	a hypertext link at all.
+*/
+HrefSearch(manname,section)
+char	*manname, *section;
+{
+	char	*dir, *colon, tmp;
+	int	DefaultToManRef;
+	FILE	*fp;
+	static char	path[256];
+
+	tmp = 0;
+
+again:
+	if (SearchDirs[0] == ':') {
+		dir = &SearchDirs[1];
+		DefaultToManRef = 1;
+	}
+	else {
+		dir = SearchDirs;
+		DefaultToManRef = 0;
+	}
+
+	/* Make 2 passes on all search directories... */
+	/* First pass is with the path dir/manname.section */
+	/* Second pass is with the path dir/manname.section[0] */
+	/* This allows the spec manname(3x) to be found as manname.3 */
+	/* just in cast manname.3x doesn't exist. */
+	/* Note that the second pass is only necessary if the section */
+	/* string is more than one character in length. */
+	while(1) {
+		colon =  strchr(dir,':');
+		if (colon) *colon = 0;
+		sprintf(path,"%s/%s.%s.html",dir,manname,section); 
+		if ((fp = fopen(path,"rw")) != NULL) {
+			printf("<A HREF=\"");
+			printf("%s",path);
+			printf("\">");
+			fclose(fp);
+			if (colon) *colon = ':';
+			fprintf(stderr,"HREF @ %s\n",path);
+			return(1);
+		}
+		if (colon) {
+			*colon = ':';
+			dir = colon+1;
+		}
+		else
+			break;
+	}
+	if (section[1]) {
+		tmp = section[1];
+		section[1] = 0;
+		dir = SearchDirs;
+		goto again;
+	}
+	if (tmp)
+		section[1] = tmp;
+
+	if (DefaultToManRef) {
+		printf("<A HREF=\"");
+		printf(manRef, manname, section);
+		printf("\">");
+	}
+	else
+		printf("<A>");
+	return(1);
+}
+
+/* End ELS additions. */
+
Index: xc/extras/rman/contrib/youki.pl
diff -u /dev/null xc/extras/rman/contrib/youki.pl:1.1.1.1
--- /dev/null	Sat Jul  1 20:46:20 2000
+++ xc/extras/rman/contrib/youki.pl	Mon Mar 20 16:47:35 2000
@@ -0,0 +1,195 @@
+#!/usr/local/bin/perl5
+#
+# CGI script for translating manpage into html on the fly.
+# Front-end for PolyglotMan (formerly called RosettaMan)
+#
+# Author: Youki Kadobayashi  <youki@center.osaka-u.ac.jp>
+#
+# NOTE: Replace 'CGI::Apache' with just 'CGI' for systems without mod_perl.
+#
+# ALSO: You may want to recompile rman like this:
+#	MANREFPRINTF = "/mod-bin/cgi-rman.pl?keyword=%s&section=%s"
+#
+
+use CGI::Apache font;			# for people with mod_perl and apache
+## use CGI font;			# for people without mod_perl
+$par = "<P>\n";
+$brk = "<BR>\n";
+$bg = '#c0ffff';
+
+$query = new CGI::Apache;		# for people with mod_perl and apache
+## $query = new CGI;			# for people without mod_perl
+
+%mandatory = ('keyword' => 'Name or keyword',
+	      'section' => 'Manual page section');
+
+@given = $query->param;
+if ($#given < 0) {
+	&request_page;
+	exit 0;
+}
+
+foreach $field (keys %mandatory) {
+	if ($query->param($field) eq '') {
+		push(@missing, $mandatory{$field});
+	}
+}
+if ($#missing >= 0) {
+    &info_missing_page(@missing);
+} else {
+    if ($query->param('type') eq 'apropos') {
+	&apropos_page;
+    } else {
+	&manual_page;
+    }
+}
+exit 0;
+
+sub standout {
+    my ($level, $color, $string) = @_;
+
+    # As per CGI.pm documentation "Generating new HTML tags"
+    return $query->font({color => "$color"}, "<$level>$string</$level>");
+}
+
+sub error_page {
+    my ($message) = @_;
+
+#    print $query->header,
+#		$query->start_html(-title=>$message, -BGCOLOR=>$bg);
+
+    print &standout("H2", "brown", $message),
+		"The above error occured during the manual page generation",
+		" process.  Please check keyword and section number,",
+		" then try again.", $par;
+
+#    print $query->end_html;
+}
+
+sub info_missing_page {
+    my (@missing) = @_;
+
+    print $query->header,
+		$query->start_html(-title=>"Information is missing",
+				   -BGCOLOR=>$bg);
+
+    print &standout("H2", "brown", "Information is missing"),
+		"Sorry but your request was not fulfilled because",
+		" the following information is missing in your entry:", $par,
+		join(' ', @missing), $par,
+		"Please go back and make sure to enter data on the missing field.";
+
+    print $query->end_html;
+}
+
+sub request_page {
+    print $query->header,
+		$query->start_html(-title=>'Hypertext Manual Page',
+				   -author=>'Youki Kadobayashi',
+				   -BGCOLOR=>$bg);
+
+    print &standout("H2", "green", "Hypertext Manual Page");
+
+    print $query->start_form,
+	"Type of Search: ",
+		$query->radio_group(-name=>'type',
+				    -values=>['man', 'apropos'],
+				    -default=>'man'), $brk,
+	"Name or Keyword: ",
+		$query->textfield(-name=>'keyword'), $brk,
+	"Manpage Section: ",
+		$query->popup_menu(-name=>'section',
+				   -labels=>{
+				       0 => 'All Sections',
+				       1 => '1 - General Commands',
+				       2 => '2 - System Calls',
+				       3 => '3 - Library Functions',
+				       4 => '4 - Device Special Files',
+				       5 => '5 - File Formats',
+				       6 => '6 - Games',
+				       7 => '7 - Macros and Conventions',
+				       8 => '8 - System Administration',
+				       'pgsql' => 'PostgreSQL',
+				       'tcl' => 'Tcl/Tk',
+				       'mh' => 'Message Handler',
+				       'isode' => 'ISODE',
+				       'X11' => 'X Window System'},
+				   -values=>[0, 1, 2, 3, 4, 5, 6, 7, 8,
+					     'pgsql', 'tcl', 'mh',
+					     'isode', 'X11'],
+				   -default=>0), $brk;
+
+    print $query->submit(-name=>'Submit'), $query->reset,
+		$query->end_form, $par;
+
+    print $query->end_html;
+}
+
+sub manual_page {
+    my $keyword = $query->param('keyword');
+    my $section = $query->param('section');
+    my $man = "man";
+    my $ok = "-a-zA-Z0-9._";
+
+    # sanitize for security
+    $section =~ s/[^$ok]+/_/go;
+    $keyword =~ s/[^$ok]+/_/go;
+
+    if ($section =~ /^[A-Za-z]/) {
+	$man .= " -M$section";
+    }
+    elsif ($section =~ /^\d/) {
+	$section =~ s/^(\d)\w*/\1/go;
+	$man .= " -s $section";
+    }
+    $man .= ' ' . $keyword;
+    open (MAN, "$man | /usr/local/bin/rman -f html -n $keyword -s $section |");
+
+    print $query->header;
+	# start_html and end_html not needed here, since rman tacks them.
+    print "<!-- text generated with '$man' by cgi-rman.pl -->\n";
+    while (<MAN>) {
+	print $_;
+    }
+    if ($? != 0 || $. < 15) {
+	&error_page("Your request for manual page '$keyword' failed.");
+#	print "return code $?  line $.\n";
+	close(MAN);
+	return;
+    }
+    close(MAN);
+}
+
+sub apropos_page {
+    my $keyword = $query->param('keyword');
+    my $section = $query->param('section');	# igored
+    my $man = "man -k";
+    my $matches = 0;
+
+    $man .= ' ' . $keyword;
+    open (MAN, "$man |");
+
+    $url = $query->url;
+    print $query->header, $query->start_html(-title=>$man);
+
+    while (<MAN>) {
+	if (/^([a-zA-Z0-9_.-]+)[, ][a-zA-Z0-9_., -]*\((\d)\w*\)/) {
+	    print $`, qq{ <A HREF="$url?keyword=$1&section=$2&type=man"> },
+		$&, "</A>", $';
+	    ++$matches;
+	} else {
+	    print $_;
+	}
+	print $brk;
+    }
+    if ($? != 0 || $matches == 0) {
+	&error_page("Your search request with keyword '$keyword' failed.");
+#	print "return code $?  matches $matches\n";
+	close(MAN);
+	return;
+    }
+    close(MAN);
+
+    print $query->end_html;
+}
+
Index: xc/extras/x86emu/src/x86emu/debug.c
diff -u xc/extras/x86emu/src/x86emu/debug.c:1.1.1.1 xc/extras/x86emu/src/x86emu/debug.c:1.4
--- xc/extras/x86emu/src/x86emu/debug.c:1.1.1.1	Sat Jan 22 20:23:52 2000
+++ xc/extras/x86emu/src/x86emu/debug.c	Mon Apr 17 09:29:45 2000
@@ -36,10 +36,15 @@
 *				emulator.
 *
 ****************************************************************************/
+/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.4 2000/04/17 16:29:45 eich Exp $ */
 
 #include "x86emu/x86emui.h"
+#ifdef IN_MODULE
+#include "xf86_ansic.h"
+#else
 #include <stdarg.h>
 #include <stdlib.h>
+#endif
 
 /*----------------------------- Implementation ----------------------------*/
 
@@ -231,6 +236,7 @@
     int ntok;
     int cmd;
     int done;
+		int segment;
     int offset;
     static int breakpoint;
     static int noDecode = 1;
@@ -259,14 +265,21 @@
 			disassemble_forward(M.x86.saved_cs,(u16)offset,10);
             break;
           case 'd':  
-            if (ntok == 2) {
-                offset = ps[1];
-				X86EMU_dump_memory(M.x86.saved_cs,(u16)offset,16);
-				offset += 16;
-			} else {
-				X86EMU_dump_memory(M.x86.saved_cs,(u16)offset,16);
-                offset += 16;
-            }
+							if (ntok == 2) {
+									segment = M.x86.saved_cs;
+									offset = ps[1];
+									X86EMU_dump_memory(segment,(u16)offset,16);
+									offset += 16;
+							} else if (ntok == 3) {
+									segment = ps[1];
+									offset = ps[2];
+									X86EMU_dump_memory(segment,(u16)offset,16);
+									offset += 16;
+							} else {
+									segment = M.x86.saved_cs;
+									X86EMU_dump_memory(segment,(u16)offset,16);
+									offset += 16;
+							}
             break;
           case 'c':
 			M.x86.debug ^= DEBUG_TRACECALL_F;
@@ -332,17 +345,18 @@
         cmd = *s;
         *n += 1;
     }
-
-    while (*s != ' ' && *s != '\t' && *s != '\n')  s++;
 
-    if (*s == '\n')
-      return cmd;
-
-	while(*s == ' ' || *s == '\t') s++;
-
-    sscanf(s,"%x",&ps[*n]);
-    *n += 1;
-    return cmd;
+	while (1) {
+		while (*s != ' ' && *s != '\t' && *s != '\n')  s++;
+		
+		if (*s == '\n')
+			return cmd;
+		
+		while(*s == ' ' || *s == '\t') s++;
+		
+		sscanf(s,"%x",&ps[*n]);
+		*n += 1;
+	}
 }
 
 #endif /* DEBUG */
Index: xc/extras/x86emu/src/x86emu/decode.c
diff -u xc/extras/x86emu/src/x86emu/decode.c:1.2 xc/extras/x86emu/src/x86emu/decode.c:1.6
--- xc/extras/x86emu/src/x86emu/decode.c:1.2	Sun Jan 23 17:44:38 2000
+++ xc/extras/x86emu/src/x86emu/decode.c	Wed Jun  7 14:58:25 2000
@@ -37,7 +37,7 @@
 *
 ****************************************************************************/
 
-/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.2 2000/01/24 01:44:38 dawes Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.6 2000/06/07 21:58:25 tsi Exp $ */
 
 #include "x86emu/x86emui.h"
 
Index: xc/extras/x86emu/src/x86emu/ops.c
diff -u xc/extras/x86emu/src/x86emu/ops.c:1.3 xc/extras/x86emu/src/x86emu/ops.c:1.4
--- xc/extras/x86emu/src/x86emu/ops.c:1.3	Sun Jan 23 17:44:38 2000
+++ xc/extras/x86emu/src/x86emu/ops.c	Mon Apr 17 09:29:45 2000
@@ -70,7 +70,7 @@
 *
 ****************************************************************************/
 
-/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.3 2000/01/24 01:44:38 dawes Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.4 2000/04/17 16:29:45 eich Exp $ */
 
 #include "x86emu/x86emui.h"
 
@@ -3904,11 +3904,14 @@
         DECODE_PRINTF("PUSH\tSP\n");
     }
     TRACE_AND_STEP();
-    /* Always push SP-2, since this *IS* how a 8088 does this */
-    if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-        push_long(M.x86.R_ESP - 2);
-    } else {
-        push_word((u16)(M.x86.R_SP - 2));
+	/* Always push (E)SP, since we are emulating an i386 and above
+	 * processor. This is necessary as some BIOS'es use this to check
+	 * what type of processor is in the system.
+	 */
+	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+		push_long(M.x86.R_ESP);
+	} else {
+		push_word((u16)(M.x86.R_SP));
     }
     DECODE_CLEAR_SEGOVR();
     END_OF_INSTR();
@@ -6559,7 +6562,7 @@
  *
  * lea  eax,[eax+ebx*2] ??
  */
-
+    
     START_OF_INSTR();
     DECODE_PRINTF("LEA\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
@@ -11006,7 +11009,7 @@
 void x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
 {
     int mod, rh, rl;
-    uint destoffset;
+    uint destoffset = 0;
 	u16 *destreg;
 	u16 destval,destval2;
 
Index: xc/extras/x86emu/src/x86emu/ops2.c
diff -u xc/extras/x86emu/src/x86emu/ops2.c:1.1.1.1 xc/extras/x86emu/src/x86emu/ops2.c:1.3
--- xc/extras/x86emu/src/x86emu/ops2.c:1.1.1.1	Sat Jan 22 20:23:52 2000
+++ xc/extras/x86emu/src/x86emu/ops2.c	Wed Apr 19 08:48:13 2000
@@ -37,6 +37,7 @@
 *               instructions.
 *
 ****************************************************************************/
+/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.3 2000/04/19 15:48:13 tsi Exp $ */
 
 #include "x86emu/x86emui.h"
 
@@ -1730,6 +1731,256 @@
 
 /****************************************************************************
 REMARKS:
+Handles opcode 0x0f,0xba
+****************************************************************************/
+void x86emuOp2_btX_I(u8 X86EMU_UNUSED(op2))
+{
+    int mod, rl, rh;
+    uint srcoffset;
+    int bit;
+
+    START_OF_INSTR();
+    FETCH_DECODE_MODRM(mod, rh, rl);
+    switch (rh) {
+    case 3:
+	DECODE_PRINTF("BT\t");
+	break;
+    case 4:
+	DECODE_PRINTF("BTS\t");
+	break;
+    case 5:
+	DECODE_PRINTF("BTR\t");
+	break;
+    case 6:
+	DECODE_PRINTF("BTC\t");
+	break;
+    default:
+	DECODE_PRINTF("ILLEGAL EXTENDED X86 OPCODE\n");
+	TRACE_REGS();
+	printk("%04x:%04x: %02X%02X ILLEGAL EXTENDED X86 OPCODE EXTENSION!\n",
+		M.x86.R_CS, M.x86.R_IP-3,op2, (mod<<6)|(rh<<3)|rl);
+	HALT_SYS();
+    }
+    switch (mod) {
+    case 0:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, mask;
+            u8 shift;
+
+            srcoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            shift = fetch_byte_imm();
+            TRACE_AND_STEP();
+            bit = shift & 0x1F;
+            srcval = fetch_data_long(srcoffset);
+	    mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_long(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_long(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_long(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+        } else {
+            u16 srcval, mask;
+            u8 shift;
+
+            srcoffset = decode_rm00_address(rl);
+            DECODE_PRINTF(",");
+            shift = fetch_byte_imm();
+            TRACE_AND_STEP();
+            bit = shift & 0xF;
+            srcval = fetch_data_word(srcoffset);
+	    mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_word(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_word(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_word(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+        }
+        break;
+    case 1:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, mask;
+            u8 shift;
+
+            srcoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            shift = fetch_byte_imm();
+            TRACE_AND_STEP();
+            bit = shift & 0x1F;
+            srcval = fetch_data_long(srcoffset);
+	    mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_long(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_long(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_long(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+        } else {
+            u16 srcval, mask;
+            u8 shift;
+
+            srcoffset = decode_rm01_address(rl);
+            DECODE_PRINTF(",");
+            shift = fetch_byte_imm();
+            TRACE_AND_STEP();
+            bit = shift & 0xF;
+            srcval = fetch_data_word(srcoffset);
+	    mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_word(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_word(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_word(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+        }
+        break;
+    case 2:
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 srcval, mask;
+            u8 shift;
+
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            shift = fetch_byte_imm();
+            TRACE_AND_STEP();
+            bit = shift & 0x1F;
+            srcval = fetch_data_long(srcoffset);
+	    mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_long(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_long(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_long(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+        } else {
+            u16 srcval, mask;
+            u8 shift;
+
+            srcoffset = decode_rm10_address(rl);
+            DECODE_PRINTF(",");
+            shift = fetch_byte_imm();
+            TRACE_AND_STEP();
+            bit = shift & 0xF;
+            srcval = fetch_data_word(srcoffset);
+	    mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		store_data_word(srcoffset, srcval | mask);
+		break;
+	    case 5:
+		store_data_word(srcoffset, srcval & ~mask);
+		break;
+	    case 6:
+		store_data_word(srcoffset, srcval ^ mask);
+		break;
+	    default:
+		break;
+	    }
+        }
+        break;
+    case 3:                     /* register to register */
+        if (M.x86.mode & SYSMODE_PREFIX_DATA) {
+            u32 *srcreg;
+	    u32 mask;
+	    u8 shift;
+
+            srcreg = DECODE_RM_LONG_REGISTER(rl);
+            DECODE_PRINTF(",");
+            shift = fetch_byte_imm();
+            TRACE_AND_STEP();
+            bit = shift & 0x1F;
+	    mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		*srcreg |= mask;
+		break;
+	    case 5:
+		*srcreg &= ~mask;
+		break;
+	    case 6:
+		*srcreg ^= mask;
+		break;
+	    default:
+		break;
+	    }
+        } else {
+            u16 *srcreg;
+	    u16 mask;
+	    u8 shift;
+
+            srcreg = DECODE_RM_WORD_REGISTER(rl);
+            DECODE_PRINTF(",");
+            shift = fetch_byte_imm();
+            TRACE_AND_STEP();
+            bit = shift & 0xF;
+	    mask = (0x1 << bit);
+            CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
+	    switch (rh) {
+	    case 4:
+		*srcreg |= mask;
+		break;
+	    case 5:
+		*srcreg &= ~mask;
+		break;
+	    case 6:
+		*srcreg ^= mask;
+		break;
+	    default:
+		break;
+	    }
+        }
+        break;
+    }
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
 Handles opcode 0x0f,0xbb
 ****************************************************************************/
 void x86emuOp2_btc_R(u8 X86EMU_UNUSED(op2))
@@ -2241,7 +2492,7 @@
 /*  0xb7 */ x86emuOp2_movzx_word_R_RM,
 /*  0xb8 */ x86emuOp2_illegal_op,
 /*  0xb9 */ x86emuOp2_illegal_op,
-/*  0xba */ x86emuOp2_illegal_op,  /* TOOD: Group H (bts,btr,btc,bt etc) */
+/*  0xba */ x86emuOp2_btX_I,
 /*  0xbb */ x86emuOp2_btc_R,
 /*  0xbc */ x86emuOp2_illegal_op,  /* TODO: bsf */
 /*  0xbd */ x86emuOp2_illegal_op,  /* TODO: bsr */
Index: xc/extras/x86emu/src/x86emu/sys.c
diff -u xc/extras/x86emu/src/x86emu/sys.c:1.1.1.1 xc/extras/x86emu/src/x86emu/sys.c:1.4
--- xc/extras/x86emu/src/x86emu/sys.c:1.1.1.1	Sat Jan 22 20:23:52 2000
+++ xc/extras/x86emu/src/x86emu/sys.c	Mon Apr 17 09:29:46 2000
@@ -39,13 +39,17 @@
 *				user library.
 *
 ****************************************************************************/
+/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.4 2000/04/17 16:29:46 eich Exp $ */
 
 #include "x86emu.h"
 #include "x86emu/regs.h"
 #include "x86emu/debug.h"
 #include "x86emu/prim_ops.h"
+#ifdef IN_MODULE
+#include "xf86_ansic.h"
+#else
 #include <string.h>
-
+#endif                                                                                           
 /*------------------------- Global Variables ------------------------------*/
 
 X86EMU_sysEnv		_X86EMU_env;		/* Global emulator machine state */
@@ -260,7 +264,7 @@
 	else
 #endif
 #ifdef __alpha__
-		val = ldw_u(M.mem_base + addr);
+		val = ldw_u((u16*)(M.mem_base + addr));
 #else
 		val = *(u16*)(M.mem_base + addr);
 #endif
@@ -297,7 +301,7 @@
 	else
 #endif
 #ifdef __alpha__
-		val = ldl_u(M.mem_base + addr);
+		val = ldl_u((u32*)(M.mem_base + addr));
 #else
 		val = *(u32*)(M.mem_base + addr);
 #endif
@@ -353,7 +357,7 @@
 	else
 #endif
 #ifdef __alpha__
-	 stw_u(val,M.mem_base + addr);
+	 stw_u(val,(u16*)(M.mem_base + addr));
 #else
 	 *(u16*)(M.mem_base + addr) = val;
 #endif
@@ -387,7 +391,7 @@
 	else
 #endif
 #ifdef __alpha__
-	 stl_u(val,M.mem_base + addr);
+	 stl_u(val,(u32*)(M.mem_base + addr));
 #else
 	 *(u32*)(M.mem_base + addr) = val;
 #endif
Index: xc/extras/x86emu/src/x86emu/x86emu/debug.h
diff -u xc/extras/x86emu/src/x86emu/x86emu/debug.h:1.1.1.1 xc/extras/x86emu/src/x86emu/x86emu/debug.h:1.3
--- xc/extras/x86emu/src/x86emu/x86emu/debug.h:1.1.1.1	Sat Jan 22 20:23:53 2000
+++ xc/extras/x86emu/src/x86emu/x86emu/debug.h	Wed Apr 19 08:48:15 2000
@@ -35,6 +35,7 @@
 * Description:  Header file for debug definitions.
 *
 ****************************************************************************/
+/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */
 
 #ifndef __X86EMU_DEBUG_H
 #define __X86EMU_DEBUG_H
@@ -68,6 +69,8 @@
 # define DEBUG_DISASSEMBLE()   	(M.x86.debug & DEBUG_DISASSEMBLE_F)
 # define DEBUG_BREAK()         	(M.x86.debug & DEBUG_BREAK_F)
 # define DEBUG_SVC()           	(M.x86.debug & DEBUG_SVC_F)
+# define DEBUG_SAVE_IP_CS()     (M.x86.debug & DEBUG_SAVE_CS_IP)
+
 # define DEBUG_FS()            	(M.x86.debug & DEBUG_FS_F)
 # define DEBUG_PROC()          	(M.x86.debug & DEBUG_PROC_F)
 # define DEBUG_SYSINT()        	(M.x86.debug & DEBUG_SYSINT_F)
@@ -85,6 +88,7 @@
 # define DEBUG_DISASSEMBLE()   	0
 # define DEBUG_BREAK()         	0
 # define DEBUG_SVC()           	0
+# define DEBUG_SAVE_IP_CS()     0
 # define DEBUG_FS()            	0
 # define DEBUG_PROC()          	0
 # define DEBUG_SYSINT()        	0
@@ -114,7 +118,8 @@
 		x86emu_inc_decoded_inst_len(x)
 
 #define SAVE_IP_CS(x,y)                               			\
-	if (DEBUG_DECODE() | DEBUG_TRACECALL() | DEBUG_BREAK() | DEBUG_IO_TRACE()) { \
+	if (DEBUG_DECODE() | DEBUG_TRACECALL() | DEBUG_BREAK() \
+              | DEBUG_IO_TRACE() | DEBUG_SAVE_IP_CS()) { \
 		M.x86.saved_cs = x;                          			\
 		M.x86.saved_ip = y;                          			\
 	}
Index: xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h
diff -u xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h:1.1.1.1 xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h:1.3
--- xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h:1.1.1.1	Sat Jan 22 20:23:53 2000
+++ xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h	Wed Apr 19 08:48:15 2000
@@ -39,6 +39,7 @@
 *				platform.
 *
 ****************************************************************************/
+/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */
 
 #ifndef	__X86EMU_PRIM_ASM_H
 #define	__X86EMU_PRIM_ASM_H
@@ -890,7 +891,7 @@
 	"pop	[edi]"            		\
 	"mov	[esi],eax"				\
 	"mov	[ecx],edx"				\
-	parm [edi] [esi] [edi] [eax] [ebx] \
+	parm [edi] [esi] [ecx] [eax] [ebx] \
 	modify exact [esi edi eax ebx edx];
 
 void	idiv_byte_asm(u32 *flags,u8 *al,u8 *ah,u16 d,u8 s);
Index: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h
diff -u xc/extras/x86emu/src/x86emu/x86emu/x86emui.h:1.1.1.1 xc/extras/x86emu/src/x86emu/x86emu/x86emui.h:1.3
--- xc/extras/x86emu/src/x86emu/x86emu/x86emui.h:1.1.1.1	Sat Jan 22 20:23:53 2000
+++ xc/extras/x86emu/src/x86emu/x86emu/x86emui.h	Mon Apr 17 09:29:47 2000
@@ -38,6 +38,8 @@
 *
 ****************************************************************************/
 
+/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h,v 1.3 2000/04/17 16:29:47 eich Exp $ */
+
 #ifndef __X86EMU_X86EMUI_H
 #define __X86EMU_X86EMUI_H
 
@@ -68,9 +70,13 @@
 #include "x86emu/prim_ops.h"
 #include "x86emu/fpu.h"
 #include "x86emu/fpu_regs.h"
+
+#ifdef IN_MODULE
+#include <xf86_ansic.h>
+#else
 #include <stdio.h>
 #include <string.h>
-
+#endif                                                                                           
 /*--------------------------- Inline Functions ----------------------------*/
 
 #ifdef  __cplusplus